From fecb444e18c2d655d7de4253047e664873b42cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Aug 2018 10:17:08 +0200
Subject: [PATCH 0001/3942] lib/strings: guard against an easy mistake

This would catch the bad `fwknop` flags fixed in 580cab57e4,
during evaluation already.
---
 lib/strings.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 7cd09a109396..1dba455628df 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -412,7 +412,9 @@ rec {
        enableFeature false "shared"
        => "--disable-shared"
   */
-  enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}";
+  enableFeature = enable: feat:
+    assert isString feat; # e.g. passing openssl instead of "openssl"
+    "--${if enable then "enable" else "disable"}-${feat}";
 
   /* Create an --{enable-<feat>=<value>,disable-<feat>} string that can be passed to
      standard GNU Autoconf scripts.
@@ -434,7 +436,9 @@ rec {
        withFeature false "shared"
        => "--without-shared"
   */
-  withFeature = with_: feat: "--${if with_ then "with" else "without"}-${feat}";
+  withFeature = with_: feat:
+    assert isString feat; # e.g. passing openssl instead of "openssl"
+    "--${if with_ then "with" else "without"}-${feat}";
 
   /* Create an --{with-<feat>=<value>,without-<feat>} string that can be passed to
      standard GNU Autoconf scripts.

From 2ab19787ce2ac77f7b33e85247b9b28159b4bb95 Mon Sep 17 00:00:00 2001
From: Mauro Bieg <mb21@users.noreply.github.com>
Date: Mon, 26 Aug 2019 14:38:18 +0200
Subject: [PATCH 0002/3942] Docs: clarify Rust overlay on non-NixOS

---
 doc/languages-frameworks/rust.section.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 2d9338f2e89b..fe2a71c35ef8 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -384,12 +384,13 @@ in the `~/.config/nixpkgs/overlays` directory.
 
 The latest version can be installed with the following command:
 
-    $ nix-env -Ai nixos.latest.rustChannels.stable.rust
+    $ nix-env -Ai nixpkgs.latest.rustChannels.stable.rust
 
 Or using the attribute with nix-shell:
 
-    $ nix-shell -p nixos.latest.rustChannels.stable.rust
+    $ nix-shell -p nixpkgs.latest.rustChannels.stable.rust
 
+Substitute the `nixpkgs` prefix with `nixos` on NixOS.
 To install the beta or nightly channel, "stable" should be substituted by
 "nightly" or "beta", or
 use the function provided by this overlay to pull a version based on a

From 1b77edf66465105bc3996d3aaaf939b6bf06ce24 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Wed, 27 Nov 2019 16:32:48 +0200
Subject: [PATCH 0003/3942] muon: init at 2019-11-27

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

diff --git a/pkgs/development/compilers/muon/default.nix b/pkgs/development/compilers/muon/default.nix
new file mode 100644
index 000000000000..275e308235cd
--- /dev/null
+++ b/pkgs/development/compilers/muon/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "muon";
+  version = "2019-11-27";
+
+  src = fetchFromGitHub {
+    owner = "nickmqb";
+    repo = pname;
+    rev = "6d3a5054ae75b0e5a0ae633cf8cbc3e2a054f8b3";
+    sha256 = "1sb1i08421jxlx791g8nh4l239syaj730hagkzc159g0z65614zz";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildPhase = ''
+    mkdir -p $out/bin $out/share/mu
+    cp -r lib $out/share/mu
+    gcc -O3 -o $out/bin/mu-unwrapped bootstrap/mu64.c
+  '';
+
+  installPhase = ''
+    makeWrapper $out/bin/mu-unwrapped $out/bin/mu \
+      --add-flags $out/share/mu/lib/core.mu
+  '';
+
+  meta = with lib; {
+    description = "Modern low-level programming language";
+    homepage = "https://github.com/nickmqb/muon";
+    license = licenses.mit;
+    maintainers = with maintainers; [ filalex77 ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f49075972e0..4845d9f67237 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8525,6 +8525,8 @@ in
 
   mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
 
+  muon = callPackage ../development/compilers/muon { };
+
   nim = callPackage ../development/compilers/nim { };
   nrpl = callPackage ../development/tools/nrpl { };
 

From 1b099f9d6c21734359215aeeead2576187e81a8e Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 4 Mar 2020 00:37:41 +0100
Subject: [PATCH 0004/3942] slimserver: 7.9.1 -> 7.9.2

---
 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 d755f864d4e3..c2ce873f3c31 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -3,11 +3,11 @@
 
 perlPackages.buildPerlPackage rec {
   pname = "slimserver";
-  version = "7.9.1";
+  version = "7.9.2";
 
   src = fetchurl {
     url = "https://github.com/Logitech/slimserver/archive/${version}.tar.gz";
-    sha256 = "0szp5zkmx2b5lncsijf97asjnl73fyijkbgbwkl1i7p8qnqrb4mp";
+    sha256 = "1rn9y7xvg5aqmgcbfpi7lcqy8d7hgwqx8b2llzpzrv7854zm1wcw";
   };
 
   buildInputs = [

From 2b0ee787dd38414101d4b76b5a1818c9a21c57cd Mon Sep 17 00:00:00 2001
From: snicket2100 <57048005+snicket2100@users.noreply.github.com>
Date: Mon, 13 Apr 2020 10:43:32 +0200
Subject: [PATCH 0005/3942] mosquitto: systemd service sandboxing

running the service in a sandbox. read-only root file system,
with tmpfs mounted in /tmp, hidden /root and /home,
temporary /dev. the only writeable path is the data directory,
which according to my experiments is enough for the service
to work correctly.
---
 nixos/modules/services/networking/mosquitto.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index d2feb93e2b72..ec109c4e6347 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -204,6 +204,16 @@ in
         Restart = "on-failure";
         ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${mosquittoConf}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+
+        ProtectSystem = "strict";
+        ProtectHome = true;
+        PrivateDevices = true;
+        PrivateTmp = true;
+        ReadWritePaths = "${cfg.dataDir}";
+        ProtectControlGroups = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        NoNewPrivileges = true;
       };
       preStart = ''
         rm -f ${cfg.dataDir}/passwd

From b920bf3d618cb7e0e9b29db9774274b12b75a974 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Sat, 2 May 2020 18:05:07 +0200
Subject: [PATCH 0006/3942] libgpiod: add patch fixing cross-compilation

Fixes "undefined reference to `rpl_malloc'".
---
 ...LOC-and-_REALLOC-and-check-for-them-.patch | 31 +++++++++++++++++++
 .../libraries/libgpiod/default.nix            |  6 ++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch

diff --git a/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch b/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch
new file mode 100644
index 000000000000..f2ee8e8d3d73
--- /dev/null
+++ b/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch
@@ -0,0 +1,31 @@
+From 2cc80dc06ea42087788cf27b31821ffa99a22f89 Mon Sep 17 00:00:00 2001
+From: Johannes Lode <johannes.lode@dynainstruments.com>
+Date: Thu, 14 Nov 2019 10:44:00 +0100
+Subject: [PATCH] Drop AC_FUNC_MALLOC and _REALLOC and check for them as
+ regular functions.
+
+While cross-compiling there occurred "undefined reference to
+`rpl_malloc'", the suggested change fixes the problem.
+
+Tested for native X86_64 and armv7a-unknown-linux-gnueabihf.
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 008499d..b492dc4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,7 +81,8 @@ AC_DEFUN([HEADER_NOT_FOUND_CXX],
+ 
+ # This is always checked (library needs this)
+ AC_HEADER_STDC
+-AC_FUNC_MALLOC
++# AC_FUNC_MALLOC -- does not work while cross-compiling
++AC_CHECK_FUNC([malloc realloc])
+ AC_CHECK_FUNC([ioctl], [], [FUNC_NOT_FOUND_LIB([ioctl])])
+ AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])])
+ AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])])
+-- 
+2.25.1
+
diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
index 6d77a28d55f3..9d8737d15be3 100644
--- a/pkgs/development/libraries/libgpiod/default.nix
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "14iv8iwyvfznyifhkqz1bjh24dvb03gmpjn8v3fs6h734l93vvw5";
   };
 
+  patches = [
+    # cross compiling fix
+    # https://github.com/brgl/libgpiod/pull/45
+    ./0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch
+  ];
+
   buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ];
   nativeBuildInputs = [
     autoconf-archive

From 09852dfc4cad0b18226ff329086d8844daaed4fe Mon Sep 17 00:00:00 2001
From: marius david <mariusdavid@laposte.net>
Date: Mon, 4 May 2020 12:00:33 +0200
Subject: [PATCH 0007/3942] ctrtool: 0.16 -> 0.7 and fix cross compiling

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

diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/tools/archivers/ctrtool/default.nix
index 97abeadffc09..4b8eb4dfab2e 100644
--- a/pkgs/tools/archivers/ctrtool/default.nix
+++ b/pkgs/tools/archivers/ctrtool/default.nix
@@ -2,22 +2,23 @@
 
 stdenv.mkDerivation rec {
   pname = "ctrtool";
-  version = "0.16";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner  = "jakcron";
     repo   = "Project_CTR";
-    rev    = "v${version}";
-    sha256 = "1n3j3fd1bqd39v5bdl9mhq4qdrcl1k4ib1yzl3qfckaz3y8bkrap";
+    rev    = "ctrtool-v${version}";
+    sha256 = "07aayck82w5xcp3si35d7ghybmrbqw91fqqvmbpjrjcixc6m42z7";
   };
 
   sourceRoot = "source/ctrtool";
 
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++"];
   enableParallelBuilding = true;
 
   installPhase = "
     mkdir $out/bin -p
-    cp ctrtool $out/bin/ctrtool
+    cp ctrtool${stdenv.hostPlatform.extensions.executable} $out/bin/
   ";
 
   meta = with stdenv.lib; {

From 296987361b1b6f7a77712749ec42f32fea3782e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 9 May 2020 12:19:07 +0000
Subject: [PATCH 0008/3942] python37Packages.logilab_common: 1.5.2 -> 1.6.1

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

diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix
index 9c4b6dbd7919..3da263757cc6 100644
--- a/pkgs/development/python-modules/logilab/common.nix
+++ b/pkgs/development/python-modules/logilab/common.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "logilab-common";
-  version = "1.5.2";
+  version = "1.6.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1n20znamai7jksimbdshy03rgw235qwa9vbx3lyajzwysblq4s4d";
+    sha256 = "0h0b2vg2xpfbnynrkg2yki4zjpscm6wgm6nhaahb088v98zxqbrk";
   };
 
   propagatedBuildInputs = [ unittest2 six ];

From 50a487d8fe922e8cfc13303d6604508c4884f920 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 12 May 2020 02:46:47 +0100
Subject: [PATCH 0009/3942] weechat-matrix: 0.1.0 -> 0.2.0

---
 .../irc/weechat/scripts/weechat-matrix/default.nix        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
index aca9a9a111d6..0b60617cbb38 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@@ -20,15 +20,17 @@ let
     requests
     python_magic
   ]);
+
+  version = "0.2.0";
 in buildPythonPackage {
   pname = "weechat-matrix";
-  version = "0.1.0";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "poljar";
     repo = "weechat-matrix";
-    rev = "65a5db7291439b6132e35e8cc09ed901614fabf6";
-    sha256 = "0m3k5vrv5ab1aw1mjd0r8d71anwqzvncvv9v5zx9xp1i188sdm8x";
+    rev = version;
+    hash = "sha256-qsTdF9mGHac4rPs53mgoOElcujicRNXbJ7GsoptWSGc=";
   };
 
   propagatedBuildInputs = [

From 181dfe306f262e8e44f0952efa531f9e3c482ec5 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 26 Apr 2020 11:03:11 +0300
Subject: [PATCH 0010/3942] todoman: format inputs and arguments

---
 pkgs/applications/office/todoman/default.nix | 57 +++++++++++++++-----
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index e18a11a7448b..ca733f5fad16 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, python3, glibcLocales, installShellFiles, jq }:
+{ stdenv
+, python3
+, glibcLocales
+, installShellFiles
+, jq
+}:
 
 let
   inherit (python3.pkgs) buildPythonApplication fetchPypi;
@@ -12,22 +17,46 @@ buildPythonApplication rec {
     sha256 = "16brw2zhm5vamffin6qjb0lxjlj3ba40vaficl851nw2xh2mrdhy";
   };
 
-    LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
-      "${glibcLocales}/lib/locale/locale-archive";
-    LANG = "en_US.UTF-8";
-    LC_TYPE = "en_US.UTF-8";
+  LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
+    "${glibcLocales}/lib/locale/locale-archive";
+  LANG = "en_US.UTF-8";
+  LC_TYPE = "en_US.UTF-8";
 
-  nativeBuildInputs = [ installShellFiles ];
-  buildInputs = [ glibcLocales ];
-  propagatedBuildInputs = with python3.pkgs;
-    [ atomicwrites click click-log click-repl configobj humanize icalendar parsedatetime
-      python-dateutil pyxdg tabulate urwid ];
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+  buildInputs = [
+    glibcLocales
+  ];
+  propagatedBuildInputs = with python3.pkgs; [
+    atomicwrites
+    click
+    click-log
+    click-repl
+    configobj
+    humanize
+    icalendar
+    parsedatetime
+    python-dateutil
+    pyxdg
+    tabulate
+    urwid
+  ];
 
-  checkInputs = with python3.pkgs;
-    [ flake8 flake8-import-order freezegun hypothesis pytest pytestrunner pytestcov ];
+  checkInputs = with python3.pkgs; [
+    flake8
+    flake8-import-order
+    freezegun
+    hypothesis
+    pytest
+    pytestrunner
+    pytestcov
+  ];
 
-  makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
-                      "--set CHARSET en_us.UTF-8" ];
+  makeWrapperArgs = [
+    "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
+    "--set CHARSET en_us.UTF-8"
+  ];
 
   postInstall = ''
     installShellCompletion --bash contrib/completion/bash/_todo

From c011a6b32193e94954e2b262866619525fa0b93e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 26 Apr 2020 11:06:01 +0300
Subject: [PATCH 0011/3942] todoman: remove glibLocale when it's not needed

Don't know why they were there in the first place :/.
---
 pkgs/applications/office/todoman/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index ca733f5fad16..163673afb253 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -17,17 +17,9 @@ buildPythonApplication rec {
     sha256 = "16brw2zhm5vamffin6qjb0lxjlj3ba40vaficl851nw2xh2mrdhy";
   };
 
-  LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
-    "${glibcLocales}/lib/locale/locale-archive";
-  LANG = "en_US.UTF-8";
-  LC_TYPE = "en_US.UTF-8";
-
   nativeBuildInputs = [
     installShellFiles
   ];
-  buildInputs = [
-    glibcLocales
-  ];
   propagatedBuildInputs = with python3.pkgs; [
     atomicwrites
     click
@@ -51,12 +43,10 @@ buildPythonApplication rec {
     pytest
     pytestrunner
     pytestcov
+    glibcLocales
   ];
 
-  makeWrapperArgs = [
-    "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
-    "--set CHARSET en_us.UTF-8"
-  ];
+  LC_ALL = "en_US.UTF-8";
 
   postInstall = ''
     installShellCompletion --bash contrib/completion/bash/_todo

From 03f116eaa037ce30670da482f12006d24c49206e Mon Sep 17 00:00:00 2001
From: Cody Allen <ceedubs@gmail.com>
Date: Fri, 22 May 2020 08:18:51 -0700
Subject: [PATCH 0012/3942] unison-ucm: 1.0.M1l-alpha -> 1.0.M1m-alpha

[Release notes](https://github.com/unisonweb/unison/releases/tag/release%2FM1m)
---
 pkgs/development/compilers/unison/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix
index c17f85b4936a..c7266614e494 100644
--- a/pkgs/development/compilers/unison/default.nix
+++ b/pkgs/development/compilers/unison/default.nix
@@ -4,18 +4,18 @@
 
 stdenv.mkDerivation rec {
   pname = "unison-code-manager";
-  milestone_id = "M1l";
+  milestone_id = "M1m";
   version = "1.0.${milestone_id}-alpha";
 
   src = if (stdenv.isDarwin) then
     fetchurl {
       url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
-      sha256 = "0qbxakrp3p3k3k8a1m2g24ivs3c8j5rj7ij84i7k548505rva9qr";
+      sha256 = "06pxvp753j8pr0pn02l7cswmmas5pk1vlkw83yd04h3f2rx1s61v";
     }
   else
     fetchurl {
       url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
-      sha256 = "152yzv7j4nyp228ngzbhki9fid1xdqrjvl1rwxc05wq30jwwqx0x";
+      sha256 = "1qspvfq805d34kz031pf9sqw8kzz7h637kc8lnbjlgvwixxkxc7c";
     };
 
   # The tarball is just the prebuilt binary, in the archive root.

From f55568dc35343cd45afa38fdb34275fcfc4b012c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 25 May 2020 00:04:55 +0200
Subject: [PATCH 0013/3942] pim6sd: init at unstable-2019-05-31

---
 pkgs/servers/pim6sd/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/servers/pim6sd/default.nix

diff --git a/pkgs/servers/pim6sd/default.nix b/pkgs/servers/pim6sd/default.nix
new file mode 100644
index 000000000000..6752a8089af3
--- /dev/null
+++ b/pkgs/servers/pim6sd/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, lib, autoreconfHook, yacc, flex }:
+
+stdenv.mkDerivation rec {
+  pname = "pim6sd";
+  version = "unstable-2019-05-31";
+
+  src = fetchFromGitHub {
+    owner = "troglobit";
+    repo = "pim6sd";
+    rev = "fa3909529981dd705ba9ead0517222c30c581a4e";
+    sha256 = "0x7dyark2mp9xqz9cnmmgaf0z143vxn2835clllpji4ylg77zdjw";
+  };
+
+  nativeBuildInputs = [ autoreconfHook yacc flex ];
+
+  meta = with lib; {
+    description = "PIM for IPv6 sparse mode daemon";
+    homepage = "https://github.com/troglobit/pim6sd";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ hexa ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ed66b372678..dac207212394 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5955,6 +5955,8 @@ in
 
   phodav = callPackage ../tools/networking/phodav { };
 
+  pim6sd = callPackage ../servers/pim6sd { };
+
   pinentry = libsForQt5.callPackage ../tools/security/pinentry {
     libcap = if stdenv.isDarwin then null else libcap;
   };

From 4ead8259b6a413c6e2255002d5584d77d9f8411c Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 1 Jun 2020 22:27:39 +0200
Subject: [PATCH 0014/3942] gcc-arm-embedded: 9-2019-q4-major ->
 9-2020-q2-update

---
 .../compilers/gcc-arm-embedded/9/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
index 8ded47d6e370..98b126e85f88 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
@@ -6,8 +6,8 @@
 
 stdenv.mkDerivation rec {
   pname = "gcc-arm-embedded";
-  version = "9-2019-q4-major";
-  subdir = "9-2019q4/RC2.1";
+  version = "9-2020-q2-update";
+  subdir = "9-2020q2";
 
   suffix = {
     aarch64-linux = "aarch64-linux";
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2";
     sha256 = {
-      aarch64-linux = "1f5b9309006737950b2218250e6bb392e2d68d4f1a764fe66be96e2a78888d83";
-      x86_64-darwin = "1249f860d4155d9c3ba8f30c19e7a88c5047923cea17e0d08e633f12408f01f0";
-      x86_64-linux  = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a";
+      aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z";
+      x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv";
+      x86_64-linux  = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s";
     }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
 

From d557de50338ea872e4223da749bc8271fca12c98 Mon Sep 17 00:00:00 2001
From: Dominik Michael Rauh <dmrauh@posteo.de>
Date: Mon, 2 Dec 2019 18:45:42 +0100
Subject: [PATCH 0015/3942] dsf2flac: init at 0.1Rev54

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

diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/applications/audio/dsf2flac/default.nix
new file mode 100644
index 000000000000..031203dda756
--- /dev/null
+++ b/pkgs/applications/audio/dsf2flac/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, boost, flac, id3lib, pkg-config
+, taglib, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "dsf2flac";
+  version = "unstable-2018-01-02";
+
+  src = fetchFromGitHub {
+    owner = "hank";
+    repo = pname;
+    rev = "b0cf5aa6ddc60df9bbfeed25548e443c99f5cb16";
+    sha256 = "15j5f82v7lgs0fkgyyynl82cb1rsxyr9vw3bpzra63nacbi9g8lc";
+  };
+
+  buildInputs = [ boost flac id3lib taglib zlib ];
+
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    export LIBS="$LIBS -lz"
+  '';
+
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
+
+  meta = with stdenv.lib; {
+    description = "A DSD to FLAC transcoding tool";
+    homepage = "https://github.com/hank/dsf2flac";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ dmrauh ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47f8ceb07e05..9aa53d2be828 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19225,6 +19225,8 @@ in
 
   drumgizmo = callPackage ../applications/audio/drumgizmo { };
 
+  dsf2flac = callPackage ../applications/audio/dsf2flac { };
+
   dunst = callPackage ../applications/misc/dunst { };
 
   du-dust = callPackage ../tools/misc/dust { };

From e12768b0fed2c45630eea6d1f3c39ac9fd47b602 Mon Sep 17 00:00:00 2001
From: SCOTT-HAMILTON <sgn.hamilton@protonmail.com>
Date: Mon, 1 Jun 2020 17:33:04 +0200
Subject: [PATCH 0016/3942] vim-async: Init at 2020-03-17

---
 pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index dd105b8e74cb..962c0eb9a034 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3853,6 +3853,18 @@ let
     meta.homepage = "https://github.com/haya14busa/vim-asterisk/";
   };
 
+  vim-async = buildVimPluginFrom2Nix {
+    pname = "vim-async";
+    version = "2020-03-17";
+    src = fetchFromGitHub {
+      owner = "prabirshrestha";
+      repo = "async.vim";
+      rev = "42371b5fb2cc07254295ff6beb3ca7cf235b7ede";
+      sha256 = "1c6ymxm28hpai1ki5y5a2m6qh5129nqn1fxiq9xnlzfrlbjl8vil";
+    };
+    meta.homepage = "https://github.com/prabirshrestha/async.vim";
+  };
+
   vim-auto-save = buildVimPluginFrom2Nix {
     pname = "vim-auto-save";
     version = "2019-03-19";

From 224e56bc6e27b60fdcab1e652f0751189a0cd68b Mon Sep 17 00:00:00 2001
From: Matt Snider <matt.snider@protonmail.com>
Date: Sat, 6 Jun 2020 12:06:24 +0200
Subject: [PATCH 0017/3942] vimPlugins.investigate-vim: init at 2020-02-29

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4ecfa222de74..0251c4032c16 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1822,6 +1822,18 @@ let
     meta.homepage = "https://github.com/parsonsmatt/intero-neovim/";
   };
 
+  investigate-vim = buildVimPluginFrom2Nix {
+    pname = "investigate-vim";
+    version = "2020-02-29";
+    src = fetchFromGitHub {
+      owner = "keith";
+      repo = "investigate.vim";
+      rev = "aef9332ba3cfc070fb59fd7a4ac82bae2b42cd7b";
+      sha256 = "1jiipch8jr66h1cywwj0zdlx45p70d359s8ljdwcndjwicrqslmk";
+    };
+    meta.homepage = "https://github.com/keith/investigate.vim/";
+  };
+
   iosvkem = buildVimPluginFrom2Nix {
     pname = "iosvkem";
     version = "2020-01-18";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index e22ddc50ddd1..2e23c9499625 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -212,6 +212,7 @@ kbenzie/vim-spirv
 kchmck/vim-coffee-script
 KeitaNakamura/neodark.vim
 keith/swift.vim
+keith/investigate.vim
 kien/rainbow_parentheses.vim
 knubie/vim-kitty-navigator
 konfekt/fastfold

From 99466da0384e334da46ab681a91365433a0e09e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 1 Jun 2020 14:56:04 +0100
Subject: [PATCH 0018/3942] svox: 2017-07-18 -> 2018-02-14

---
 pkgs/applications/audio/svox/default.nix | 33 +++++++-----------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
index 0f8e51438830..d5b67819cb07 100644
--- a/pkgs/applications/audio/svox/default.nix
+++ b/pkgs/applications/audio/svox/default.nix
@@ -1,37 +1,24 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub, autoreconfHook, popt }:
 
 stdenv.mkDerivation {
   pname = "svox";
-  version = "2017-07-18";
+  version = "2018-02-14";
 
-  src = fetchgit {
-    url = "https://android.googlesource.com/platform/external/svox";
-    rev = "7e68d0e9aac1b5d2ad15e92ddaa3bceb27973fcb";
-    sha256 = "1bqj12w23nn27x64ianm2flrqvkskpvgrnly7ah8gv6k8s8chh3r";
+  # basically took the source code from android and borrowed autotool patches from debian
+  src = fetchFromGitHub {
+    owner = "naggety";
+    repo = "picotts";
+    rev = "e3ba46009ee868911fa0b53db672a55f9cc13b1c";
+    sha256 = "0k3m7vh1ak9gmxd83x29cvhzfkybgz5hnlhd9xj19l1bjyx84s8v";
   };
 
   postPatch = ''
     cd pico
   '';
 
-  buildPhase = ''
-    cd lib
-    for i in *.c; do
-      $CC -O2 -fPIC -c -o ''${i%.c}.o $i
-    done
-    $CC -shared -o libttspico.so *.o
-    cd ..
-  '';
+  buildInputs = [ popt ];
 
-  installPhase = ''
-    install -Dm755 lib/libttspico.so $out/lib/libttspico.so
-    mkdir -p $out/include
-    cp lib/*.h $out/include
-    mkdir -p $out/share/pico/lang
-    cp lang/*.bin $out/share/pico/lang
-  '';
-
-  NIX_CFLAGS_COMPILE = "-include stdint.h";
+  nativeBuildInputs = [ autoreconfHook ];
 
   meta = with stdenv.lib; {
     description = "Text-to-speech engine";

From e896c5a9f3b276aeee7158c7edb573a6e15b5762 Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Wed, 10 Jun 2020 12:15:41 -0700
Subject: [PATCH 0019/3942] urjtag: 0.10 -> 2019.2

---
 pkgs/tools/misc/urjtag/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index 2056fb9d0a5a..63b809d6e9fa 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -1,5 +1,5 @@
 { stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison
-, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb-compat-0_1, readline
+, flex, which, subversion, fetchurl, makeWrapper, libftdi, libusb-compat-0_1, readline
 , python3
 , svfSupport ? true
 , bsdlSupport ? true
@@ -7,14 +7,13 @@
 , jedecSupport ? true
 }:
 
-stdenv.mkDerivation {
-  version = "0.10";
+stdenv.mkDerivation rec {
+  version = "2019.12";
   pname = "urjtag";
 
-  src = fetchsvn {
-    url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag";
-    rev = "2051";
-    sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f";
+  src = fetchurl {
+    url = "https://downloads.sourceforge.net/project/urjtag/urjtag/${version}/urjtag-${version}.tar.xz";
+    sha256 = "1k2vmvvarik0q3llbfbk8ad35mcns7w1ln9gla1mn7z9c6x6x90r";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -28,8 +27,6 @@ stdenv.mkDerivation {
     (stdenv.lib.enableFeature jedecSupport "jedec-exp")
   ];
 
-  preConfigure = "./autogen.sh";
-
   meta = {
     description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more";
     homepage = "http://urjtag.org/";

From 0448356c2ef9fb008989662d32683b4376387efc Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Wed, 10 Jun 2020 12:19:10 -0700
Subject: [PATCH 0020/3942] urjtag: upgrade libftdi -> libftdi1

Without this change, it has been observed to crash trying to connect to
a device.
---
 pkgs/tools/misc/urjtag/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index 63b809d6e9fa..f058f2cb8dde 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -1,5 +1,5 @@
 { stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison
-, flex, which, subversion, fetchurl, makeWrapper, libftdi, libusb-compat-0_1, readline
+, flex, which, subversion, fetchurl, makeWrapper, libftdi1, libusb-compat-0_1, readline
 , python3
 , svfSupport ? true
 , bsdlSupport ? true
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ gettext autoconf automake libtool bison flex which
-    subversion makeWrapper readline libftdi libusb-compat-0_1 python3 ];
+    subversion makeWrapper readline libftdi1 libusb-compat-0_1 python3 ];
 
   configureFlags = [
     (stdenv.lib.enableFeature svfSupport   "svf")

From 73dd8a73a48d54a9d75a1df8e4d3dc6ef92d57fb Mon Sep 17 00:00:00 2001
From: Pasquale <p3dimaria@hotmail.it>
Date: Sun, 14 Jun 2020 13:27:30 +0200
Subject: [PATCH 0021/3942] mantainers: add pasqui23

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b75cb49467a0..493a975aae14 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5972,6 +5972,12 @@
     githubId = 131844;
     name = "Igor Pashev";
   };
+  pasqui23 = {
+    email = "p3dimaria@hotmail.it";
+    github = "pasqui23";
+    githubId = 6931743;
+    name = "pasqui23";
+  };
   patryk27 = {
     email = "wychowaniec.patryk@gmail.com";
     github = "Patryk27";

From 79f4822a30ae5522ad66229527d04241e22a6722 Mon Sep 17 00:00:00 2001
From: Pasquale <p3dimaria@hotmail.it>
Date: Sun, 14 Jun 2020 13:28:27 +0200
Subject: [PATCH 0022/3942] zplugin: init at 2.3

---
 pkgs/shells/zsh/zplugin/default.nix | 40 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/shells/zsh/zplugin/default.nix

diff --git a/pkgs/shells/zsh/zplugin/default.nix b/pkgs/shells/zsh/zplugin/default.nix
new file mode 100644
index 000000000000..c148f60b2eef
--- /dev/null
+++ b/pkgs/shells/zsh/zplugin/default.nix
@@ -0,0 +1,40 @@
+{ stdenvNoCC, lib, fetchFromGitHub, installShellFiles }:
+stdenvNoCC.mkDerivation rec {
+  pname = "zplugin";
+  version = "2.3";
+  src = fetchFromGitHub {
+    owner = "zdharma";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0qqv5p19s8jb06d6h55dm4acji9x2rpxb2ni3h7fb0q43iz6y85w";
+  };
+  # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git
+  dontBuild = true;
+  nativeBuildInputs = [ installShellFiles ];
+  installPhase = ''
+    outdir="$out/share/$pname"
+
+    cd "$src"
+
+    # Zplugin's source files
+    install -dm0755 "$outdir"
+    install -m0644 zplugin{,-side,-install,-autoload}.zsh "$outdir"
+    install -m0755 git-process-output.zsh "$outdir"
+
+    # Zplugin autocompletion
+    installShellCompletion --zsh _zplugin
+
+    #TODO:Zplugin-module files
+    # find zmodules/ -type d -exec install -dm 755 "{}" "$outdir/{}" \;
+    # find zmodules/ -type f -exec install -m 744 "{}" "$outdir/{}" \;
+
+  '';
+  #TODO:doc output
+
+  meta = with lib; {
+    homepage = "https://github.com/zdharma/zplugin";
+    description = "Flexible zsh plugin manager";
+    license = licenses.mit;
+    maintainers = with maintainers; [ pasqui23 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3760114301e0..a1e3fad9242b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7886,6 +7886,8 @@ in
 
   zplug = callPackage ../shells/zsh/zplug { };
 
+  zplugin = callPackage ../shells/zsh/zplugin {} ;
+
   zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { };
 
   zsh-bd = callPackage ../shells/zsh/zsh-bd { };

From d269844bb007f7f265e8d5f14b1babe57328c0a0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Jun 2020 00:53:09 +0000
Subject: [PATCH 0023/3942] phraseapp-client: 1.11.0 -> 1.17.1

---
 pkgs/tools/misc/phraseapp-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix
index 35bd84005b5f..df471e2c0bc6 100644
--- a/pkgs/tools/misc/phraseapp-client/default.nix
+++ b/pkgs/tools/misc/phraseapp-client/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "phraseapp-client";
-  version = "1.11.0";
+  version = "1.17.1";
 
   goPackagePath = "github.com/phrase/phraseapp-client";
   subPackages = [ "." ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "phrase";
     repo = "phraseapp-client";
     rev = version;
-    sha256 = "0lfx0wv95hgczi74qnkw2cripwgvl53z2gi5i6nyflisy4r7vvkr";
+    sha256 = "0j8fygp9bw68p1736hq7n7qv86rghchxbdm1xibvk5jpgph1nzl7";
   };
 
   postInstall = ''

From 44de48a59c0676ddc9c5ef139b94cefc24c22d71 Mon Sep 17 00:00:00 2001
From: Sebastien Bariteau <bariteau@tehama.io>
Date: Tue, 23 Jun 2020 10:42:18 -0400
Subject: [PATCH 0024/3942] adguardhome: 0.101.0 -> 0.102.0

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

diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
index 54000a81b67d..27a1d55a6c14 100644
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "adguardhome";
-  version = "0.101.0";
+  version = "0.102.0";
 
   src = fetchurl {
     url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v${version}/AdGuardHome_linux_amd64.tar.gz";
-    sha256 = "17k37hh04zhy5csl0p9g4hybfc403i38n754in1xrkzxi81r8dh5";
+    sha256 = "192v3k0q8qdr52a34bf48i8rvm41wgi6an8a4rcsgyq5j8l7v76i";
   };
 
   installPhase = ''

From 88de3d02314ec069fb8cc66c6e8d87e598174804 Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Sun, 28 Jun 2020 13:42:11 +0000
Subject: [PATCH 0025/3942] python-jsonrpc-server: make version overridable

---
 .../python-modules/python-jsonrpc-server/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index 586c6edfa829..d5535a328e26 100644
--- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix
+++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    sed -i 's/version=versioneer.get_version(),/version="${version}",/g' setup.py
+    sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py
     # https://github.com/palantir/python-jsonrpc-server/issues/36
     sed -i -e 's!ujson<=!ujson>=!' setup.py
   '';

From 3b6a1c231eff85968175ff14cfd607766ad8ff8c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jul 2020 17:32:24 +0000
Subject: [PATCH 0026/3942] tpm2-pkcs11: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix
index a089488b0e02..0ace1e82a420 100644
--- a/pkgs/misc/tpm2-pkcs11/default.nix
+++ b/pkgs/misc/tpm2-pkcs11/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tpm2-pkcs11";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = pname;
     rev = version;
-    sha256 = "0ydd88jc4pyf1v7008h2gf0napv6xpw4jn5w87slj9fphjdkwjiz";
+    sha256 = "12zj8jfm8jrwbqm3cnay8gx28ladmpyv5d29lp8qlfjqgflvhkwh";
   };
 
   patches = lib.singleton (

From dea3f0c8414b7ea736ff70d85e9091ade1904027 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Mon, 1 Jun 2020 15:37:34 +0800
Subject: [PATCH 0027/3942] swapview: init at 0.1.0

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

diff --git a/pkgs/os-specific/linux/swapview/default.nix b/pkgs/os-specific/linux/swapview/default.nix
new file mode 100644
index 000000000000..c88c8757db3c
--- /dev/null
+++ b/pkgs/os-specific/linux/swapview/default.nix
@@ -0,0 +1,23 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "swapview";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "lilydjwg";
+    repo = "swapview";
+    rev = "v${version}";
+    sha256 = "0339biydk997j5r72vzp7djwkscsz89xr3936nshv23fmxjh2rzj";
+  };
+
+  cargoSha256 = "0z99pqd41y8cci3yvwsnm5zbq7pzli62z8qqqghmz1hcq5pb5q7g";
+
+  meta = with lib; {
+    description = "A simple program to view processes' swap usage on Linux";
+    homepage = "https://github.com/lilydjwg/swapview";
+    platforms = platforms.linux;
+    license = with licenses; [ bsd3 ];
+    maintainers = with maintainers; [ oxalica ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5e9837455ea..11aac6c3ecbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6989,6 +6989,8 @@ in
 
   swagger-codegen = callPackage ../tools/networking/swagger-codegen { };
 
+  swapview = callPackage ../os-specific/linux/swapview/default.nix { };
+
   swec = callPackage ../tools/networking/swec { };
 
   swfdec = callPackage ../tools/graphics/swfdec {};

From 82d0986c456cd6c35dfd970d2f5e951af55ec588 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Tue, 21 Jul 2020 21:04:47 -0700
Subject: [PATCH 0028/3942] kernelPackages.r8168: 8.047.04 -> 8.048.03

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

diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix
index b3d8965704fd..91e15db2eeb6 100644
--- a/pkgs/os-specific/linux/r8168/default.nix
+++ b/pkgs/os-specific/linux/r8168/default.nix
@@ -6,7 +6,7 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
 in stdenv.mkDerivation rec {
   name = "r8168-${kernel.version}-${version}";
   # on update please verify that the source matches the realtek version
-  version = "8.047.04";
+  version = "8.048.03";
 
   # This is a mirror. The original website[1] doesn't allow non-interactive
   # downloads, instead emailing you a download link.
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
     owner = "mtorromeo";
     repo = "r8168";
     rev = version;
-    sha256 = "1rni8jimwdhyx75603mdcylrdxgfwfpyprf1lf5x5cli2i4bbijg";
+    sha256 = "1l8llpcnapcaafxp7wlyny2ywh7k6q5zygwwjl9h0l6p04cghss4";
   };
 
   hardeningDisable = [ "pic" ];
@@ -29,8 +29,8 @@ in stdenv.mkDerivation rec {
   # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168
   preBuild = ''
     makeFlagsArray+=("-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build")
-    makeFlagsArray+=("SUBDIRS=$PWD/src")
-    makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN")
+    makeFlagsArray+=("M=$PWD/src")
+    makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN -DCONFIG_ASPM -DENABLE_S5WOL -DENABLE_EEE")
     makeFlagsArray+=("modules")
   '';
 

From 51af90bc627f074c7422f6fc30415021c0d66b47 Mon Sep 17 00:00:00 2001
From: MetaDark <kira.bruneau@gmail.com>
Date: Sat, 27 Jun 2020 12:52:38 -0400
Subject: [PATCH 0029/3942] cxxtest: package includes and run tests

---
 .../development/libraries/cxxtest/default.nix | 24 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index 00629339e086..e1898044efaf 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -1,10 +1,8 @@
-{ stdenv, fetchFromGitHub, python2Packages}:
+{ stdenv, buildPythonApplication, fetchFromGitHub }:
 
-let
+buildPythonApplication rec {
   pname = "cxxtest";
   version = "4.4";
-in python2Packages.buildPythonApplication {
-  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "CxxTest";
@@ -13,16 +11,26 @@ in python2Packages.buildPythonApplication {
     sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17";
   };
 
-  setSourceRoot = ''
-    sourceRoot=$(echo */python)
+  sourceRoot = "source/python";
+
+  postCheck = ''
+    python scripts/cxxtestgen --error-printer -o build/GoodSuite.cpp ../test/GoodSuite.h
+    $CXX -I.. -o build/GoodSuite build/GoodSuite.cpp
+    build/GoodSuite
   '';
 
+  postInstall = ''
+    mkdir -p "$out/include"
+    cp -r ../cxxtest "$out/include"
+  '';
+
+  dontWrapPythonPrograms = true;
+
   meta = with stdenv.lib; {
     homepage = "http://cxxtest.com";
     description = "Unit testing framework for C++";
-    platforms = platforms.unix ;
+    platforms = platforms.unix;
     license = licenses.lgpl3;
     maintainers = [ maintainers.juliendehos ];
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcbbf5f5663c..403e934f323c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11736,7 +11736,7 @@ in
 
   cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { };
 
-  cxxtest = callPackage ../development/libraries/cxxtest { };
+  cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { };
 
   cypress = callPackage ../development/web/cypress { };
 

From 68559e2820ece9eef44753441bd24b6de6947e56 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Sun, 16 Aug 2020 23:04:18 +0200
Subject: [PATCH 0030/3942] xdg-utils: add missing dependencies

- Add coreutils to PATH, because the xdg scripts use other not yet
  provided coreutils like head.
  This makes the custom 'cut' and 'sort' functions obsolete.
  Remove double quotes around $out because $out contains no Bash field separators.
- Replace all instances of 'which' with 'type -P'.
  The previous sed command only replaced instances with a leading space.
---
 pkgs/tools/X11/xdg-utils/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index ccea6a2233cc..85d87d9e36d6 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -36,17 +36,15 @@ stdenv.mkDerivation rec {
     cp ${mimisrc}/xdg-open $out/bin/xdg-open
   '' + ''
     sed  '2s#.#\
-    cut()   { ${coreutils}/bin/cut  "$@"; }\
     sed()   { ${gnused}/bin/sed     "$@"; }\
     grep()  { ${gnugrep}/bin/grep   "$@"; }\
     egrep() { ${gnugrep}/bin/egrep  "$@"; }\
     file()  { ${file}/bin/file      "$@"; }\
     awk()   { ${gawk}/bin/awk       "$@"; }\
-    sort()  { ${coreutils}/bin/sort "$@"; }\
     xset()  { ${xset}/bin/xset      "$@"; }\
     perl()  { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\
     mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\
-    PATH=$PATH:'"$out"'/bin\
+    PATH=$PATH:'$out'/bin:${coreutils}/bin\
     &#' -i "$out"/bin/*
 
     substituteInPlace $out/bin/xdg-open \
@@ -58,7 +56,7 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/xdg-email \
       --replace "/bin/echo" "${coreutils}/bin/echo"
 
-    sed 's# which # type -P #g' -i "$out"/bin/*
+    sed 's|\bwhich\b|type -P|g' -i "$out"/bin/*
   '';
 
   meta = with stdenv.lib; {

From 990e2f210b95549e441cbaef91fe3787a264ea35 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Thu, 20 Aug 2020 23:41:37 +0800
Subject: [PATCH 0031/3942] systembus-notify: 1.0 -> 1.1

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

diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/applications/misc/systembus-notify/default.nix
index 28c1be4219d6..374adc6c89bf 100644
--- a/pkgs/applications/misc/systembus-notify/default.nix
+++ b/pkgs/applications/misc/systembus-notify/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "systembus-notify";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = "systembus-notify";
     rev = "v${version}";
-    sha256 = "11zq84qfmbyl51d3r6294l2bjhlgwa9bx7d263g9fkqrwsg0si0y";
+    sha256 = "1pdn45rfpwhrf20hs87qmk2j8sr7ab8161f81019wnypnb1q2fsv";
   };
 
   buildInputs = [ systemd ];

From fcc7272cc03f9c9ff118af7a5e1a4fdd62793602 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Mon, 24 Aug 2020 19:58:24 +0300
Subject: [PATCH 0032/3942] multimc: remove unneeded flag

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

diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index bcdd950de4ad..43f86fc10df9 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -24,7 +24,7 @@ in mkDerivation rec {
     install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop
 
     # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
-    wrapProgram $out/bin/multimc --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/
+    wrapProgram $out/bin/multimc --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/
   '';
 
   meta = with stdenv.lib; {

From 54210573c1e2db45d5abbda4c3ce1afc25210889 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 25 Aug 2020 17:54:27 -0500
Subject: [PATCH 0033/3942] stdenv/native: provide patchelf on linux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This provides consistency with the pure stdenv, which provides
patchelf this way. Native stdenv can always just manually install
patchelf on their system, but like xz, it’s unlikely to be provided in
/usr/bin/. In addition, it’s not even in the RHEL7 repos.
---
 pkgs/stdenv/native/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index f6e0df161ad0..b79b81253ad5 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -78,7 +78,7 @@ let
   # A function that builds a "native" stdenv (one that uses tools in
   # /usr etc.).
   makeStdenv =
-    { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }) }:
+    { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }), extraNativeBuildInputs ? [] }:
 
     import ../generic {
       buildPlatform = localSystem;
@@ -94,10 +94,10 @@ let
         if system == "x86_64-cygwin" then prehookCygwin else
         prehookBase;
 
-      extraNativeBuildInputs =
-        if system == "i686-cygwin" then extraNativeBuildInputsCygwin else
+      extraNativeBuildInputs = extraNativeBuildInputs ++
+        (if system == "i686-cygwin" then extraNativeBuildInputsCygwin else
         if system == "x86_64-cygwin" then extraNativeBuildInputsCygwin else
-        [];
+        []);
 
       initialPath = extraPath ++ path;
 
@@ -163,6 +163,7 @@ in
       inherit (prevStage.stdenv) cc fetchurl;
       extraPath = [ prevStage.xz ];
       overrides = self: super: { inherit (prevStage) xz; };
+      extraNativeBuildInputs = if localSystem.isLinux then [ prevStage.patchelf ] else [];
     };
   })
 

From 0d64cc340b96f394e784b4821d4173e9d0972748 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 26 Aug 2020 07:21:04 +0000
Subject: [PATCH 0034/3942] ktlint: 0.37.2 -> 0.38.1

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

diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix
index fce25903aca9..3b5233d88951 100644
--- a/pkgs/development/tools/ktlint/default.nix
+++ b/pkgs/development/tools/ktlint/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ktlint";
-  version = "0.37.2";
+  version = "0.38.1";
 
   src = fetchurl {
     url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint";
-    sha256 = "1hhycvvp21gy6g71hwf3pk2jnccpnhcf2z7c85shzffhddy1wc0v";
+    sha256 = "0wz839ikvqjxpx2rzaxaji12pcqxcgmmb91xypz2dzlplxvzxvdj";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 10ffa340b7fab53a3cf04359d1b22cc077e541b2 Mon Sep 17 00:00:00 2001
From: _ <a@b.co>
Date: Wed, 26 Aug 2020 18:28:37 +0530
Subject: [PATCH 0035/3942] fcitx: Add test (Unicode input, table input, m17n)

---
 nixos/tests/all-tests.nix     |   1 +
 nixos/tests/fcitx/config      | 147 ++++++++++++++++++++++++++++++++
 nixos/tests/fcitx/default.nix | 154 ++++++++++++++++++++++++++++++++++
 nixos/tests/fcitx/profile     |  22 +++++
 4 files changed, 324 insertions(+)
 create mode 100644 nixos/tests/fcitx/config
 create mode 100644 nixos/tests/fcitx/default.nix
 create mode 100644 nixos/tests/fcitx/profile

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 66fa435da719..aa87221c9f00 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -99,6 +99,7 @@ in
   etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};
   etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};
   fancontrol = handleTest ./fancontrol.nix {};
+  fcitx = handleTest ./fcitx {};
   ferm = handleTest ./ferm.nix {};
   firefox = handleTest ./firefox.nix {};
   firefox-esr = handleTest ./firefox.nix { esr = true; };
diff --git a/nixos/tests/fcitx/config b/nixos/tests/fcitx/config
new file mode 100644
index 000000000000..0bf657e8620a
--- /dev/null
+++ b/nixos/tests/fcitx/config
@@ -0,0 +1,147 @@
+[Hotkey]
+# Trigger Input Method
+#TriggerKey=CTRL_SPACE
+# Use extra trigger key only after using it to inactivate
+# Available Value:
+# True False
+#UseExtraTriggerKeyOnlyWhenUseItToInactivate=True
+# Extra key for trigger input method
+# Available Value:
+# R_CTRL
+# R_SHIFT
+# L_SHIFT
+# L_CTRL
+# ALT_L_SHIFT
+# ALT_R_SHIFT
+# CTRL Both
+# SHIFT Both
+# L_ALT
+# R_ALT
+# ALT Both
+# Left Super
+# Right Super
+# Super Both
+# Ctrl+Left Super
+# Ctrl+Right Super
+# Super+Left Ctrl
+# Super+Right Ctrl
+# Disabled
+# Custom
+SwitchKey=Disabled
+# Custom switch key
+#CustomSwitchKey=
+# Activate input method
+#ActivateKey=
+# Inactivate Input Method
+#InactivateKey=
+# Enable Hotkey to scroll Between Input Method
+# Available Value:
+# True False
+#IMSwitchKey=True
+# Include Inactivate when scrolling between Input Method
+# Available Value:
+# True False
+#IMSwitchIncludeInactive=False
+# Scroll between Input Method
+# Available Value:
+# CTRL_SHIFT
+# ALT_SHIFT
+# CTRL_SUPER
+# ALT_SUPER
+IMSwitchHotkey=ALT_SHIFT
+# Reload configuration
+#ReloadConfig=CTRL_5
+# Interval of Two Key Input
+TimeInterval=240
+# Switching Virtual Keyboard
+#VKSwitchKey=CTRL_ALT_B
+# Switching Remind Mode
+#RemindSwitchKey=
+# Switching Full Width Character Mode
+#FullWidthSwitchKey=
+# Switch Full Width Punc Mode
+#PuncSwitchKey=CTRL_.
+# Prev Page
+#PrevPageKey=- UP
+# Next Page
+#NextPageKey== DOWN
+# Choose Second and Third Candidate Word
+#SecondThirdCandWordKey=
+# Saving All Config and Input History
+#SaveAllKey=CTRL_ALT_S
+# Switch Embeded Preedit
+#SwitchPreedit=CTRL_ALT_P
+# Previous Candidate Word
+#PrevWord=SHIFT_TAB
+# Next Candidate Word
+#NextWord=TAB
+
+[Program]
+# Seconds sleep before fcitx really start
+DelayStart=5
+# Share State Among Window
+# Available Value:
+# No
+# All
+# PerProgram
+#ShareStateAmongWindow=No
+# Default Input Method State
+# Available Value:
+# Inactive
+# Active
+#DefaultInputMethodState=Inactive
+
+[Output]
+# Type half width Punc After a Number
+# Available Value:
+# True False
+#HalfPuncAfterNumber=True
+# Disable Paging in Remind Mode
+# Available Value:
+# True False
+#RemindModeDisablePaging=True
+# Commit when toggle state
+# Available Value:
+# True False
+#SendTextWhenSwitchEng=True
+# Candidate Word Number
+#CandidateWordNumber=5
+# Give the tips of Phrase
+# Available Value:
+# True False
+#PhraseTips=True
+# Do not commit preedit text when unfocus a window
+# Available Value:
+# True False
+#DontCommitPreeditWhenUnfocus=False
+
+[Appearance]
+# Show Input Method Hint After Input method changed
+# Available Value:
+# True False
+#ShowInputWindowAfterTriggering=True
+# Show Input Method Hint After Input method changed and Focus in
+# Available Value:
+# True False
+#ShowInputWindowWhenFocusIn=False
+# Input Method Hint will be only shown when state is active
+# Available Value:
+# True False
+#ShowInputWindowOnlyWhenActive=True
+# Show Input Speed
+# Available Value:
+# True False
+#ShowInputSpeed=False
+# Show Version
+# Available Value:
+# True False
+#ShowVersion=False
+# Do not show input window if there is only preedit string
+# Available Value:
+# True False
+#HideInputWindowWhenOnlyPreeditString=False
+# Do not show input window if there is only one candidate and preedit
+# Available Value:
+# True False
+#HideInputWindowWhenOnlyOneCandidate=False
+
diff --git a/nixos/tests/fcitx/default.nix b/nixos/tests/fcitx/default.nix
new file mode 100644
index 000000000000..7c53d42fae45
--- /dev/null
+++ b/nixos/tests/fcitx/default.nix
@@ -0,0 +1,154 @@
+import ../make-test-python.nix ( 
+  {
+    pkgs, ...
+  }: 
+    # copy_from_host works only for store paths
+    let 
+      fcitx_profile_file_host = pkgs.writeTextFile { 
+        name = "fcitx_profile";
+        text = builtins.readFile ./profile;
+      };
+      
+      fcitx_config_file_host = pkgs.writeTextFile { 
+        name = "fcitx_config";
+        text = builtins.readFile ./config;
+      };
+    in
+
+    rec {
+        name = "fcitx";
+        machine = 
+        { 
+          pkgs, 
+          ... 
+        }: 
+          {
+            virtualisation.memorySize = 1024;
+
+            imports = [
+              ../common/user-account.nix
+            ];
+
+            environment.systemPackages = [
+              # To avoid clashing with xfce4-terminal
+              pkgs.alacritty 
+            ];
+
+
+            services.xserver = 
+            {
+              enable = true;
+
+              displayManager = {
+                lightdm.enable = true;
+                autoLogin = {
+                  enable = true;
+                  user = "alice";
+                };
+              };
+
+              desktopManager.xfce.enable = true;
+            };
+              
+            i18n = {
+              inputMethod = {
+                enabled = "fcitx";
+                fcitx.engines = [
+                  pkgs.fcitx-engines.m17n
+                  pkgs.fcitx-engines.table-extra
+                ];
+              };
+            };
+          }
+        ;
+
+        testScript = { nodes, ... }: 
+        let 
+            user = nodes.machine.config.users.users.alice;
+            userName      = user.name;
+            userHome      = user.home;
+            xauth         = "${userHome}/.Xauthority";
+            fcitx_confdir = "${userHome}/.config/fcitx";
+        in 
+        ''
+            # We need config files before login session
+            # So copy first thing
+
+            # Point and click would be expensive,
+            # So configure using files
+            machine.copy_from_host(
+                "${fcitx_profile_file_host}",
+                "${fcitx_confdir}/profile",
+            )
+            machine.copy_from_host(
+                "${fcitx_config_file_host}",
+                "${fcitx_confdir}/config",
+            )
+
+            start_all()
+
+            machine.wait_for_file("${xauth}")
+            machine.succeed("xauth merge ${xauth}")
+
+            machine.sleep(5)
+
+            machine.succeed("su - ${userName} -c 'alacritty&'")
+            machine.succeed("su - ${userName} -c 'fcitx&'")
+            machine.sleep(10)
+
+            ### Type on terminal
+            machine.send_chars("echo ")
+            machine.sleep(1)
+
+            ### Start fcitx Unicode input
+            machine.send_key("ctrl-alt-shift-u")
+            machine.sleep(5)
+            machine.sleep(1)
+            
+            ### Search for smiling face
+            machine.send_chars("smil")
+            machine.sleep(1)
+
+            ### Navigate to the second one
+            machine.send_key("tab")
+            machine.sleep(1)
+
+            ### Choose it
+            machine.send_key("\n")
+            machine.sleep(1)
+
+            ### Start fcitx language input
+            machine.send_key("ctrl-spc")
+            machine.sleep(1)
+
+            ### Default zhengma, enter 一下
+            machine.send_chars("a2")
+            machine.sleep(1)
+
+            ### Switch to Harvard Kyoto
+            machine.send_key("alt-shift")
+            machine.sleep(1)
+
+            ### Enter क
+            machine.send_chars("ka ")
+            machine.sleep(1)
+
+            machine.send_key("alt-shift")
+            machine.sleep(1)
+
+            ### Turn off Fcitx
+            machine.send_key("ctrl-spc")
+            machine.sleep(1)
+
+            ### Redirect typed characters to a file
+            machine.send_chars(" > fcitx_test.out\n")
+            machine.sleep(1)
+            machine.screenshot("terminal_chars")
+
+            ### Verify that file contents are as expected
+            file_content = machine.succeed("cat ${userHome}/fcitx_test.out")
+            assert file_content == "☺一下क\n"
+            ''
+    ;
+  }
+)
diff --git a/nixos/tests/fcitx/profile b/nixos/tests/fcitx/profile
new file mode 100644
index 000000000000..85898e74c07d
--- /dev/null
+++ b/nixos/tests/fcitx/profile
@@ -0,0 +1,22 @@
+[Profile]
+# 使用全角字符
+# 可选值：
+# True False
+#FullWidth=False
+# 使用全角标点
+# 可选值：
+# True False
+#WidePunc=True
+# 输入后联想词组
+# 可选值：
+# True False
+#UseRemind=False
+# 当前输入法名称
+IMName=zhengma-large
+# 当前启用的输入法列表
+EnabledIMList=fcitx-keyboard-us:True,zhengma-large:True,m17n_sa_harvard-kyoto:True,boshiamy:False,zhengma:False,pinyin:False,shuangpin:False,wubi:False,wubi-large:False,wbpy:False,cangjie-big:False,cangjie3:False,cangjie5:False,quick-classic:False,quick3:False,quick5:False,array30:False,array30-big:False,bingchan:False,cantonese:False,cantonhk:False,dianbaoma:False,easy-big:False,erbi:False,fcitx-keyboard-af:False,fcitx-keyboard-af-fa-olpc:False,fcitx-keyboard-af-olpc-ps:False,fcitx-keyboard-af-ps:False,fcitx-keyboard-af-uz:False,fcitx-keyboard-af-uz-olpc:False,fcitx-keyboard-al:False,fcitx-keyboard-al-plisi:False,fcitx-keyboard-am:False,fcitx-keyboard-am-eastern:False,fcitx-keyboard-am-eastern-alt:False,fcitx-keyboard-am-olpc-phonetic:False,fcitx-keyboard-am-phonetic:False,fcitx-keyboard-am-phonetic-alt:False,fcitx-keyboard-am-western:False,fcitx-keyboard-apl:False,fcitx-keyboard-apl-apl2:False,fcitx-keyboard-apl-aplplusII:False,fcitx-keyboard-apl-aplx:False,fcitx-keyboard-apl-dyalog:False,fcitx-keyboard-apl-sax:False,fcitx-keyboard-apl-unified:False,fcitx-keyboard-ara:False,fcitx-keyboard-ara-azerty:False,fcitx-keyboard-ara-azerty_digits:False,fcitx-keyboard-ara-basic_ext:False,fcitx-keyboard-ara-basic_ext_digits:False,fcitx-keyboard-ara-buckwalter:False,fcitx-keyboard-ara-digits:False,fcitx-keyboard-ara-mac:False,fcitx-keyboard-ara-olpc:False,fcitx-keyboard-ara-qwerty:False,fcitx-keyboard-ara-qwerty_digits:False,fcitx-keyboard-ara-sun_type6:False,fcitx-keyboard-ara-uga:False,fcitx-keyboard-at:False,fcitx-keyboard-at-mac:False,fcitx-keyboard-at-nodeadkeys:False,fcitx-keyboard-at-sundeadkeys:False,fcitx-keyboard-au:False,fcitx-keyboard-az:False,fcitx-keyboard-az-cyrillic:False,fcitx-keyboard-ba:False,fcitx-keyboard-ba-alternatequotes:False,fcitx-keyboard-ba-unicode:False,fcitx-keyboard-ba-unicodeus:False,fcitx-keyboard-ba-us:False,fcitx-keyboard-bd:False,fcitx-keyboard-bd-probhat:False,fcitx-keyboard-be:False,fcitx-keyboard-be-iso-alternate:False,fcitx-keyboard-be-nodeadkeys:False,fcitx-keyboard-be-oss:False,fcitx-keyboard-be-oss_latin9:False,fcitx-keyboard-be-oss_sundeadkeys:False,fcitx-keyboard-be-sun_type6:False,fcitx-keyboard-be-sundeadkeys:False,fcitx-keyboard-be-wang:False,fcitx-keyboard-bg:False,fcitx-keyboard-bg-bas_phonetic:False,fcitx-keyboard-bg-phonetic:False,fcitx-keyboard-br:False,fcitx-keyboard-br-dvorak:False,fcitx-keyboard-br-nativo:False,fcitx-keyboard-br-nativo-epo:False,fcitx-keyboard-br-nativo-us:False,fcitx-keyboard-br-nodeadkeys:False,fcitx-keyboard-br-sun_type6:False,fcitx-keyboard-br-thinkpad:False,fcitx-keyboard-brai:False,fcitx-keyboard-brai-left_hand:False,fcitx-keyboard-brai-left_hand_invert:False,fcitx-keyboard-brai-right_hand:False,fcitx-keyboard-brai-right_hand_invert:False,fcitx-keyboard-bt:False,fcitx-keyboard-bw:False,fcitx-keyboard-by:False,fcitx-keyboard-by-latin:False,fcitx-keyboard-by-legacy:False,fcitx-keyboard-ca:False,fcitx-keyboard-ca-eng:False,fcitx-keyboard-ca-fr-dvorak:False,fcitx-keyboard-ca-fr-legacy:False,fcitx-keyboard-ca-ike:False,fcitx-keyboard-ca-kut:False,fcitx-keyboard-ca-multi:False,fcitx-keyboard-ca-multi-2gr:False,fcitx-keyboard-ca-multix:False,fcitx-keyboard-ca-shs:False,fcitx-keyboard-ca-sun_type6:False,fcitx-keyboard-cd:False,fcitx-keyboard-ch:False,fcitx-keyboard-ch-de_mac:False,fcitx-keyboard-ch-de_nodeadkeys:False,fcitx-keyboard-ch-de_sundeadkeys:False,fcitx-keyboard-ch-fr:False,fcitx-keyboard-ch-fr_mac:False,fcitx-keyboard-ch-fr_nodeadkeys:False,fcitx-keyboard-ch-fr_sundeadkeys:False,fcitx-keyboard-ch-legacy:False,fcitx-keyboard-ch-sun_type6_de:False,fcitx-keyboard-ch-sun_type6_fr:False,fcitx-keyboard-cm:False,fcitx-keyboard-cm-azerty:False,fcitx-keyboard-cm-dvorak:False,fcitx-keyboard-cm-french:False,fcitx-keyboard-cm-mmuock:False,fcitx-keyboard-cm-qwerty:False,fcitx-keyboard-cn:False,fcitx-keyboard-cn-altgr-pinyin:False,fcitx-keyboard-cn-tib:False,fcitx-keyboard-cn-tib_asciinum:False,fcitx-keyboard-cn-ug:False,fcitx-keyboard-cz:False,fcitx-keyboard-cz-bksl:False,fcitx-keyboard-cz-dvorak-ucw:False,fcitx-keyboard-cz-prog:False,fcitx-keyboard-cz-qwerty:False,fcitx-keyboard-cz-qwerty_bksl:False,fcitx-keyboard-cz-rus:False,fcitx-keyboard-cz-sun_type6:False,fcitx-keyboard-cz-typo:False,fcitx-keyboard-cz-ucw:False,fcitx-keyboard-de:False,fcitx-keyboard-de-T3:False,fcitx-keyboard-de-adnw:False,fcitx-keyboard-de-bone:False,fcitx-keyboard-de-bone_eszett_home:False,fcitx-keyboard-de-deadacute:False,fcitx-keyboard-de-deadgraveacute:False,fcitx-keyboard-de-deadtilde:False,fcitx-keyboard-de-dsb:False,fcitx-keyboard-de-dsb_qwertz:False,fcitx-keyboard-de-dvorak:False,fcitx-keyboard-de-hu:False,fcitx-keyboard-de-koy:False,fcitx-keyboard-de-lld:False,fcitx-keyboard-de-mac:False,fcitx-keyboard-de-mac_nodeadkeys:False,fcitx-keyboard-de-neo:False,fcitx-keyboard-de-neo_qwerty:False,fcitx-keyboard-de-neo_qwertz:False,fcitx-keyboard-de-nodeadkeys:False,fcitx-keyboard-de-pl:False,fcitx-keyboard-de-qwerty:False,fcitx-keyboard-de-ro:False,fcitx-keyboard-de-ro_nodeadkeys:False,fcitx-keyboard-de-ru:False,fcitx-keyboard-de-ru-recom:False,fcitx-keyboard-de-ru-translit:False,fcitx-keyboard-de-sun_type6:False,fcitx-keyboard-de-sundeadkeys:False,fcitx-keyboard-de-tr:False,fcitx-keyboard-de-us:False,fcitx-keyboard-dk:False,fcitx-keyboard-dk-dvorak:False,fcitx-keyboard-dk-mac:False,fcitx-keyboard-dk-mac_nodeadkeys:False,fcitx-keyboard-dk-nodeadkeys:False,fcitx-keyboard-dk-sun_type6:False,fcitx-keyboard-dk-winkeys:False,fcitx-keyboard-dz:False,fcitx-keyboard-dz-ar:False,fcitx-keyboard-dz-ber:False,fcitx-keyboard-ee:False,fcitx-keyboard-ee-dvorak:False,fcitx-keyboard-ee-nodeadkeys:False,fcitx-keyboard-ee-sun_type6:False,fcitx-keyboard-ee-us:False,fcitx-keyboard-epo:False,fcitx-keyboard-epo-legacy:False,fcitx-keyboard-es:False,fcitx-keyboard-es-ast:False,fcitx-keyboard-es-cat:False,fcitx-keyboard-es-deadtilde:False,fcitx-keyboard-es-dvorak:False,fcitx-keyboard-es-mac:False,fcitx-keyboard-es-nodeadkeys:False,fcitx-keyboard-es-sun_type6:False,fcitx-keyboard-es-sundeadkeys:False,fcitx-keyboard-es-winkeys:False,fcitx-keyboard-et:False,fcitx-keyboard-eu:False,fcitx-keyboard-fi:False,fcitx-keyboard-fi-classic:False,fcitx-keyboard-fi-das:False,fcitx-keyboard-fi-fidvorak:False,fcitx-keyboard-fi-mac:False,fcitx-keyboard-fi-nodeadkeys:False,fcitx-keyboard-fi-smi:False,fcitx-keyboard-fi-sun_type6:False,fcitx-keyboard-fi-winkeys:False,fcitx-keyboard-fo:False,fcitx-keyboard-fo-nodeadkeys:False,fcitx-keyboard-fr:False,fcitx-keyboard-fr-azerty:False,fcitx-keyboard-fr-bepo:False,fcitx-keyboard-fr-bepo_latin9:False,fcitx-keyboard-fr-bre:False,fcitx-keyboard-fr-dvorak:False,fcitx-keyboard-fr-geo:False,fcitx-keyboard-fr-latin9:False,fcitx-keyboard-fr-latin9_nodeadkeys:False,fcitx-keyboard-fr-latin9_sundeadkeys:False,fcitx-keyboard-fr-mac:False,fcitx-keyboard-fr-nodeadkeys:False,fcitx-keyboard-fr-oci:False,fcitx-keyboard-fr-oss:False,fcitx-keyboard-fr-oss_latin9:False,fcitx-keyboard-fr-oss_nodeadkeys:False,fcitx-keyboard-fr-oss_sundeadkeys:False,fcitx-keyboard-fr-sun_type6:False,fcitx-keyboard-fr-sundeadkeys:False,fcitx-keyboard-fr-us:False,fcitx-keyboard-fr-us-alt:False,fcitx-keyboard-fr-us-azerty:False,fcitx-keyboard-gb:False,fcitx-keyboard-gb-colemak:False,fcitx-keyboard-gb-dvorak:False,fcitx-keyboard-gb-dvorakukp:False,fcitx-keyboard-gb-extd:False,fcitx-keyboard-gb-intl:False,fcitx-keyboard-gb-mac:False,fcitx-keyboard-gb-mac_intl:False,fcitx-keyboard-gb-pl:False,fcitx-keyboard-gb-sun_type6:False,fcitx-keyboard-ge:False,fcitx-keyboard-ge-ergonomic:False,fcitx-keyboard-ge-mess:False,fcitx-keyboard-ge-os:False,fcitx-keyboard-ge-ru:False,fcitx-keyboard-gh:False,fcitx-keyboard-gh-akan:False,fcitx-keyboard-gh-avn:False,fcitx-keyboard-gh-ewe:False,fcitx-keyboard-gh-fula:False,fcitx-keyboard-gh-ga:False,fcitx-keyboard-gh-generic:False,fcitx-keyboard-gh-gillbt:False,fcitx-keyboard-gh-hausa:False,fcitx-keyboard-gn:False,fcitx-keyboard-gr:False,fcitx-keyboard-gr-colemak:False,fcitx-keyboard-gr-extended:False,fcitx-keyboard-gr-nodeadkeys:False,fcitx-keyboard-gr-polytonic:False,fcitx-keyboard-gr-simple:False,fcitx-keyboard-gr-sun_type6:False,fcitx-keyboard-hr:False,fcitx-keyboard-hr-alternatequotes:False,fcitx-keyboard-hr-unicode:False,fcitx-keyboard-hr-unicodeus:False,fcitx-keyboard-hr-us:False,fcitx-keyboard-hu:False,fcitx-keyboard-hu-101_qwerty_comma_dead:False,fcitx-keyboard-hu-101_qwerty_comma_nodead:False,fcitx-keyboard-hu-101_qwerty_dot_dead:False,fcitx-keyboard-hu-101_qwerty_dot_nodead:False,fcitx-keyboard-hu-101_qwertz_comma_dead:False,fcitx-keyboard-hu-101_qwertz_comma_nodead:False,fcitx-keyboard-hu-101_qwertz_dot_dead:False,fcitx-keyboard-hu-101_qwertz_dot_nodead:False,fcitx-keyboard-hu-102_qwerty_comma_dead:False,fcitx-keyboard-hu-102_qwerty_comma_nodead:False,fcitx-keyboard-hu-102_qwerty_dot_dead:False,fcitx-keyboard-hu-102_qwerty_dot_nodead:False,fcitx-keyboard-hu-102_qwertz_comma_dead:False,fcitx-keyboard-hu-102_qwertz_comma_nodead:False,fcitx-keyboard-hu-102_qwertz_dot_dead:False,fcitx-keyboard-hu-102_qwertz_dot_nodead:False,fcitx-keyboard-hu-nodeadkeys:False,fcitx-keyboard-hu-oldhun:False,fcitx-keyboard-hu-qwerty:False,fcitx-keyboard-hu-standard:False,fcitx-keyboard-id:False,fcitx-keyboard-ie:False,fcitx-keyboard-ie-CloGaelach:False,fcitx-keyboard-ie-UnicodeExpert:False,fcitx-keyboard-ie-ogam:False,fcitx-keyboard-ie-ogam_is434:False,fcitx-keyboard-il:False,fcitx-keyboard-il-biblical:False,fcitx-keyboard-il-biblicalSIL:False,fcitx-keyboard-il-lyx:False,fcitx-keyboard-il-phonetic:False,fcitx-keyboard-in:False,fcitx-keyboard-in-ben:False,fcitx-keyboard-in-ben_baishakhi:False,fcitx-keyboard-in-ben_bornona:False,fcitx-keyboard-in-ben_gitanjali:False,fcitx-keyboard-in-ben_inscript:False,fcitx-keyboard-in-ben_probhat:False,fcitx-keyboard-in-bolnagri:False,fcitx-keyboard-in-eeyek:False,fcitx-keyboard-in-eng:False,fcitx-keyboard-in-guj:False,fcitx-keyboard-in-guru:False,fcitx-keyboard-in-hin-kagapa:False,fcitx-keyboard-in-hin-wx:False,fcitx-keyboard-in-jhelum:False,fcitx-keyboard-in-kan:False,fcitx-keyboard-in-kan-kagapa:False,fcitx-keyboard-in-mal:False,fcitx-keyboard-in-mal_enhanced:False,fcitx-keyboard-in-mal_lalitha:False,fcitx-keyboard-in-mar-kagapa:False,fcitx-keyboard-in-olck:False,fcitx-keyboard-in-ori:False,fcitx-keyboard-in-san-kagapa:False,fcitx-keyboard-in-tam:False,fcitx-keyboard-in-tam_tamilnet:False,fcitx-keyboard-in-tam_tamilnet_TAB:False,fcitx-keyboard-in-tam_tamilnet_TSCII:False,fcitx-keyboard-in-tam_tamilnet_with_tam_nums:False,fcitx-keyboard-in-tel:False,fcitx-keyboard-in-tel-kagapa:False,fcitx-keyboard-in-tel-sarala:False,fcitx-keyboard-in-urd-phonetic:False,fcitx-keyboard-in-urd-phonetic3:False,fcitx-keyboard-in-urd-winkeys:False,fcitx-keyboard-iq:False,fcitx-keyboard-iq-ku:False,fcitx-keyboard-iq-ku_alt:False,fcitx-keyboard-iq-ku_ara:False,fcitx-keyboard-iq-ku_f:False,fcitx-keyboard-ir:False,fcitx-keyboard-ir-ave:False,fcitx-keyboard-ir-ku:False,fcitx-keyboard-ir-ku_alt:False,fcitx-keyboard-ir-ku_ara:False,fcitx-keyboard-ir-ku_f:False,fcitx-keyboard-ir-pes_keypad:False,fcitx-keyboard-is:False,fcitx-keyboard-is-Sundeadkeys:False,fcitx-keyboard-is-dvorak:False,fcitx-keyboard-is-mac:False,fcitx-keyboard-is-mac_legacy:False,fcitx-keyboard-is-nodeadkeys:False,fcitx-keyboard-it:False,fcitx-keyboard-it-fur:False,fcitx-keyboard-it-geo:False,fcitx-keyboard-it-ibm:False,fcitx-keyboard-it-intl:False,fcitx-keyboard-it-lld:False,fcitx-keyboard-it-mac:False,fcitx-keyboard-it-nodeadkeys:False,fcitx-keyboard-it-scn:False,fcitx-keyboard-it-sun_type6:False,fcitx-keyboard-it-us:False,fcitx-keyboard-it-winkeys:False,fcitx-keyboard-jp:False,fcitx-keyboard-jp-OADG109A:False,fcitx-keyboard-jp-dvorak:False,fcitx-keyboard-jp-kana:False,fcitx-keyboard-jp-kana86:False,fcitx-keyboard-jp-mac:False,fcitx-keyboard-jp-sun_type6:False,fcitx-keyboard-jp-sun_type7:False,fcitx-keyboard-jp-sun_type7_suncompat:False,fcitx-keyboard-ke:False,fcitx-keyboard-ke-kik:False,fcitx-keyboard-kg:False,fcitx-keyboard-kg-phonetic:False,fcitx-keyboard-kh:False,fcitx-keyboard-kr:False,fcitx-keyboard-kr-kr104:False,fcitx-keyboard-kr-sun_type6:False,fcitx-keyboard-kz:False,fcitx-keyboard-kz-ext:False,fcitx-keyboard-kz-kazrus:False,fcitx-keyboard-kz-latin:False,fcitx-keyboard-kz-ruskaz:False,fcitx-keyboard-la:False,fcitx-keyboard-la-stea:False,fcitx-keyboard-latam:False,fcitx-keyboard-latam-colemak:False,fcitx-keyboard-latam-colemak-gaming:False,fcitx-keyboard-latam-deadtilde:False,fcitx-keyboard-latam-dvorak:False,fcitx-keyboard-latam-nodeadkeys:False,fcitx-keyboard-latam-sundeadkeys:False,fcitx-keyboard-lk:False,fcitx-keyboard-lk-tam_TAB:False,fcitx-keyboard-lk-tam_unicode:False,fcitx-keyboard-lk-us:False,fcitx-keyboard-lt:False,fcitx-keyboard-lt-ibm:False,fcitx-keyboard-lt-lekp:False,fcitx-keyboard-lt-lekpa:False,fcitx-keyboard-lt-std:False,fcitx-keyboard-lt-sun_type6:False,fcitx-keyboard-lt-us:False,fcitx-keyboard-lt-us_dvorak:False,fcitx-keyboard-lv:False,fcitx-keyboard-lv-adapted:False,fcitx-keyboard-lv-apostrophe:False,fcitx-keyboard-lv-apostrophecolemak:False,fcitx-keyboard-lv-colemak:False,fcitx-keyboard-lv-dvorak:False,fcitx-keyboard-lv-dvorakprogr:False,fcitx-keyboard-lv-ergonomic:False,fcitx-keyboard-lv-fkey:False,fcitx-keyboard-lv-minuskeydvorak:False,fcitx-keyboard-lv-minuskeydvorakprogr:False,fcitx-keyboard-lv-modern:False,fcitx-keyboard-lv-sun_type6:False,fcitx-keyboard-lv-tilde:False,fcitx-keyboard-lv-ykeydvorak:False,fcitx-keyboard-lv-ykeydvorakprogr:False,fcitx-keyboard-ma:False,fcitx-keyboard-ma-french:False,fcitx-keyboard-ma-tifinagh:False,fcitx-keyboard-ma-tifinagh-alt:False,fcitx-keyboard-ma-tifinagh-alt-phonetic:False,fcitx-keyboard-ma-tifinagh-extended:False,fcitx-keyboard-ma-tifinagh-extended-phonetic:False,fcitx-keyboard-ma-tifinagh-phonetic:False,fcitx-keyboard-mao:False,fcitx-keyboard-md:False,fcitx-keyboard-md-gag:False,fcitx-keyboard-me:False,fcitx-keyboard-me-cyrillic:False,fcitx-keyboard-me-cyrillicalternatequotes:False,fcitx-keyboard-me-cyrillicyz:False,fcitx-keyboard-me-latinalternatequotes:False,fcitx-keyboard-me-latinunicode:False,fcitx-keyboard-me-latinunicodeyz:False,fcitx-keyboard-me-latinyz:False,fcitx-keyboard-mk:False,fcitx-keyboard-mk-nodeadkeys:False,fcitx-keyboard-ml:False,fcitx-keyboard-ml-fr-oss:False,fcitx-keyboard-ml-us-intl:False,fcitx-keyboard-ml-us-mac:False,fcitx-keyboard-mm:False,fcitx-keyboard-mm-zawgyi:False,fcitx-keyboard-mn:False,fcitx-keyboard-mt:False,fcitx-keyboard-mt-alt-gb:False,fcitx-keyboard-mt-alt-us:False,fcitx-keyboard-mt-us:False,fcitx-keyboard-mv:False,fcitx-keyboard-my:False,fcitx-keyboard-my-phonetic:False,fcitx-keyboard-nec_vndr/jp:False,fcitx-keyboard-ng:False,fcitx-keyboard-ng-hausa:False,fcitx-keyboard-ng-igbo:False,fcitx-keyboard-ng-yoruba:False,fcitx-keyboard-nl:False,fcitx-keyboard-nl-mac:False,fcitx-keyboard-nl-std:False,fcitx-keyboard-nl-sun_type6:False,fcitx-keyboard-nl-sundeadkeys:False,fcitx-keyboard-no:False,fcitx-keyboard-no-colemak:False,fcitx-keyboard-no-dvorak:False,fcitx-keyboard-no-mac:False,fcitx-keyboard-no-mac_nodeadkeys:False,fcitx-keyboard-no-nodeadkeys:False,fcitx-keyboard-no-smi:False,fcitx-keyboard-no-smi_nodeadkeys:False,fcitx-keyboard-no-sun_type6:False,fcitx-keyboard-no-winkeys:False,fcitx-keyboard-np:False,fcitx-keyboard-ph:False,fcitx-keyboard-ph-capewell-dvorak:False,fcitx-keyboard-ph-capewell-dvorak-bay:False,fcitx-keyboard-ph-capewell-qwerf2k6:False,fcitx-keyboard-ph-capewell-qwerf2k6-bay:False,fcitx-keyboard-ph-colemak:False,fcitx-keyboard-ph-colemak-bay:False,fcitx-keyboard-ph-dvorak:False,fcitx-keyboard-ph-dvorak-bay:False,fcitx-keyboard-ph-qwerty-bay:False,fcitx-keyboard-pk:False,fcitx-keyboard-pk-ara:False,fcitx-keyboard-pk-snd:False,fcitx-keyboard-pk-urd-crulp:False,fcitx-keyboard-pk-urd-nla:False,fcitx-keyboard-pl:False,fcitx-keyboard-pl-colemak:False,fcitx-keyboard-pl-csb:False,fcitx-keyboard-pl-dvorak:False,fcitx-keyboard-pl-dvorak_altquotes:False,fcitx-keyboard-pl-dvorak_quotes:False,fcitx-keyboard-pl-dvp:False,fcitx-keyboard-pl-glagolica:False,fcitx-keyboard-pl-intl:False,fcitx-keyboard-pl-legacy:False,fcitx-keyboard-pl-qwertz:False,fcitx-keyboard-pl-ru_phonetic_dvorak:False,fcitx-keyboard-pl-sun_type6:False,fcitx-keyboard-pl-szl:False,fcitx-keyboard-pt:False,fcitx-keyboard-pt-colemak:False,fcitx-keyboard-pt-mac:False,fcitx-keyboard-pt-mac_nodeadkeys:False,fcitx-keyboard-pt-mac_sundeadkeys:False,fcitx-keyboard-pt-nativo:False,fcitx-keyboard-pt-nativo-epo:False,fcitx-keyboard-pt-nativo-us:False,fcitx-keyboard-pt-nodeadkeys:False,fcitx-keyboard-pt-sun_type6:False,fcitx-keyboard-pt-sundeadkeys:False,fcitx-keyboard-ro:False,fcitx-keyboard-ro-cedilla:False,fcitx-keyboard-ro-crh_dobruja:False,fcitx-keyboard-ro-ergonomic:False,fcitx-keyboard-ro-std:False,fcitx-keyboard-ro-std_cedilla:False,fcitx-keyboard-ro-sun_type6:False,fcitx-keyboard-ro-winkeys:False,fcitx-keyboard-rs:False,fcitx-keyboard-rs-alternatequotes:False,fcitx-keyboard-rs-combiningkeys:False,fcitx-keyboard-rs-latin:False,fcitx-keyboard-rs-latinalternatequotes:False,fcitx-keyboard-rs-latinunicode:False,fcitx-keyboard-rs-latinunicodeyz:False,fcitx-keyboard-rs-latinyz:False,fcitx-keyboard-rs-rue:False,fcitx-keyboard-rs-yz:False,fcitx-keyboard-ru:False,fcitx-keyboard-ru-bak:False,fcitx-keyboard-ru-chm:False,fcitx-keyboard-ru-chu:False,fcitx-keyboard-ru-cv:False,fcitx-keyboard-ru-cv_latin:False,fcitx-keyboard-ru-dos:False,fcitx-keyboard-ru-kom:False,fcitx-keyboard-ru-legacy:False,fcitx-keyboard-ru-mac:False,fcitx-keyboard-ru-os_legacy:False,fcitx-keyboard-ru-os_winkeys:False,fcitx-keyboard-ru-phonetic:False,fcitx-keyboard-ru-phonetic_azerty:False,fcitx-keyboard-ru-phonetic_dvorak:False,fcitx-keyboard-ru-phonetic_fr:False,fcitx-keyboard-ru-phonetic_winkeys:False,fcitx-keyboard-ru-phonetic_yazherty:False,fcitx-keyboard-ru-prxn:False,fcitx-keyboard-ru-rulemak:False,fcitx-keyboard-ru-ruu:False,fcitx-keyboard-ru-sah:False,fcitx-keyboard-ru-srp:False,fcitx-keyboard-ru-sun_type6:False,fcitx-keyboard-ru-tt:False,fcitx-keyboard-ru-typewriter:False,fcitx-keyboard-ru-typewriter-legacy:False,fcitx-keyboard-ru-udm:False,fcitx-keyboard-ru-unipunct:False,fcitx-keyboard-ru-xal:False,fcitx-keyboard-se:False,fcitx-keyboard-se-dvorak:False,fcitx-keyboard-se-dvorak_a5:False,fcitx-keyboard-se-mac:False,fcitx-keyboard-se-nodeadkeys:False,fcitx-keyboard-se-ovd:False,fcitx-keyboard-se-rus:False,fcitx-keyboard-se-rus_nodeadkeys:False,fcitx-keyboard-se-smi:False,fcitx-keyboard-se-sun_type6:False,fcitx-keyboard-se-svdvorak:False,fcitx-keyboard-se-swl:False,fcitx-keyboard-se-us:False,fcitx-keyboard-se-us_dvorak:False,fcitx-keyboard-si:False,fcitx-keyboard-si-alternatequotes:False,fcitx-keyboard-si-us:False,fcitx-keyboard-sk:False,fcitx-keyboard-sk-bksl:False,fcitx-keyboard-sk-qwerty:False,fcitx-keyboard-sk-qwerty_bksl:False,fcitx-keyboard-sk-sun_type6:False,fcitx-keyboard-sn:False,fcitx-keyboard-sy:False,fcitx-keyboard-sy-ku:False,fcitx-keyboard-sy-ku_alt:False,fcitx-keyboard-sy-ku_f:False,fcitx-keyboard-sy-syc:False,fcitx-keyboard-sy-syc_phonetic:False,fcitx-keyboard-tg:False,fcitx-keyboard-th:False,fcitx-keyboard-th-pat:False,fcitx-keyboard-th-tis:False,fcitx-keyboard-tj:False,fcitx-keyboard-tj-legacy:False,fcitx-keyboard-tm:False,fcitx-keyboard-tm-alt:False,fcitx-keyboard-tr:False,fcitx-keyboard-tr-alt:False,fcitx-keyboard-tr-crh:False,fcitx-keyboard-tr-crh_alt:False,fcitx-keyboard-tr-crh_f:False,fcitx-keyboard-tr-f:False,fcitx-keyboard-tr-intl:False,fcitx-keyboard-tr-ku:False,fcitx-keyboard-tr-ku_alt:False,fcitx-keyboard-tr-ku_f:False,fcitx-keyboard-tr-sun_type6:False,fcitx-keyboard-tr-sundeadkeys:False,fcitx-keyboard-trans:False,fcitx-keyboard-tw:False,fcitx-keyboard-tw-indigenous:False,fcitx-keyboard-tw-saisiyat:False,fcitx-keyboard-tz:False,fcitx-keyboard-ua:False,fcitx-keyboard-ua-homophonic:False,fcitx-keyboard-ua-legacy:False,fcitx-keyboard-ua-phonetic:False,fcitx-keyboard-ua-rstu:False,fcitx-keyboard-ua-rstu_ru:False,fcitx-keyboard-ua-sun_type6:False,fcitx-keyboard-ua-typewriter:False,fcitx-keyboard-ua-winkeys:False,fcitx-keyboard-us-3l:False,fcitx-keyboard-us-3l-cros:False,fcitx-keyboard-us-alt-intl:False,fcitx-keyboard-us-alt-intl-unicode:False,fcitx-keyboard-us-altgr-intl:False,fcitx-keyboard-us-ats:False,fcitx-keyboard-us-carpalx:False,fcitx-keyboard-us-carpalx-altgr-intl:False,fcitx-keyboard-us-carpalx-full:False,fcitx-keyboard-us-carpalx-full-altgr-intl:False,fcitx-keyboard-us-carpalx-full-intl:False,fcitx-keyboard-us-carpalx-intl:False,fcitx-keyboard-us-chr:False,fcitx-keyboard-us-colemak:False,fcitx-keyboard-us-crd:False,fcitx-keyboard-us-cz_sk_de:False,fcitx-keyboard-us-dvorak:False,fcitx-keyboard-us-dvorak-alt-intl:False,fcitx-keyboard-us-dvorak-classic:False,fcitx-keyboard-us-dvorak-intl:False,fcitx-keyboard-us-dvorak-l:False,fcitx-keyboard-us-dvorak-r:False,fcitx-keyboard-us-dvp:False,fcitx-keyboard-us-euro:False,fcitx-keyboard-us-hbs:False,fcitx-keyboard-us-ibm238l:False,fcitx-keyboard-us-intl:False,fcitx-keyboard-us-intl-unicode:False,fcitx-keyboard-us-mac:False,fcitx-keyboard-us-norman:False,fcitx-keyboard-us-olpc2:False,fcitx-keyboard-us-rus:False,fcitx-keyboard-us-scn:False,fcitx-keyboard-us-sun_type6:False,fcitx-keyboard-us-workman:False,fcitx-keyboard-us-workman-intl:False,fcitx-keyboard-uz:False,fcitx-keyboard-uz-latin:False,fcitx-keyboard-vn:False,fcitx-keyboard-vn-aderty:False,fcitx-keyboard-vn-fr:False,fcitx-keyboard-vn-qderty:False,fcitx-keyboard-vn-us:False,fcitx-keyboard-za:False,jyutping:False,m17n_am_sera:False,m17n_ar_kbd:False,m17n_ar_translit:False,m17n_as_inscript:False,m17n_as_itrans:False,m17n_as_phonetic:False,m17n_ath_phonetic:False,m17n_be_kbd:False,m17n_bla_phonetic:False,m17n_bn_disha:False,m17n_bn_inscript:False,m17n_bn_itrans:False,m17n_bn_probhat:False,m17n_bn_unijoy:False,m17n_bo_ewts:False,m17n_bo_tcrc:False,m17n_bo_wylie:False,m17n_cmc_kbd:False,m17n_cr_western:False,m17n_cs_kbd:False,m17n_da_post:False,m17n_dv_phonetic:False,m17n_el_kbd:False,m17n_eo_h-fundamente:False,m17n_eo_h-sistemo:False,m17n_eo_plena:False,m17n_eo_q-sistemo:False,m17n_eo_vi-sistemo:False,m17n_eo_x-sistemo:False,m17n_fa_isiri:False,m17n_fr_azerty:False,m17n_grc_mizuochi:False,m17n_gu_inscript:False,m17n_gu_itrans:False,m17n_gu_phonetic:False,m17n_he_kbd:False,m17n_hi_inscript:False,m17n_hi_itrans:False,m17n_hi_optitransv2:False,m17n_hi_phonetic:False,m17n_hi_remington:False,m17n_hi_typewriter:False,m17n_hi_vedmata:False,m17n_hr_kbd:False,m17n_hu_rovas-post:False,m17n_hy_kbd:False,m17n_ii_phonetic:False,m17n_iu_phonetic:False,m17n_ja_tcode:False,m17n_ja_trycode:False,m17n_ka_kbd:False,m17n_kk_arabic:False,m17n_kk_kbd:False,m17n_km_yannis:False,m17n_kn_inscript:False,m17n_kn_itrans:False,m17n_kn_kgp:False,m17n_kn_optitransv2:False,m17n_kn_typewriter:False,m17n_ko_han2:False,m17n_ko_romaja:False,m17n_ks_inscript:False,m17n_ks_kbd:False,m17n_lo_kbd:False,m17n_lo_lrt:False,m17n_mai_inscript:False,m17n_ml_enhanced-inscript:False,m17n_ml_inscript:False,m17n_ml_itrans:False,m17n_ml_mozhi:False,m17n_ml_remington:False,m17n_ml_swanalekha:False,m17n_mr_inscript:False,m17n_mr_itrans:False,m17n_mr_phonetic:False,m17n_mr_remington:False,m17n_mr_typewriter:False,m17n_my_kbd:False,m17n_ne_rom:False,m17n_ne_rom-translit:False,m17n_ne_trad:False,m17n_ne_trad-ttf:False,m17n_nsk_phonetic:False,m17n_oj_phonetic:False,m17n_or_inscript:False,m17n_or_itrans:False,m17n_or_phonetic:False,m17n_pa_anmollipi:False,m17n_pa_inscript:False,m17n_pa_itrans:False,m17n_pa_jhelum:False,m17n_pa_phonetic:False,m17n_ps_phonetic:False,m17n_ru_kbd:False,m17n_ru_phonetic:False,m17n_ru_translit:False,m17n_ru_yawerty:False,m17n_sa_IAST:False,m17n_sa_itrans:False,m17n_sd_inscript:False,m17n_si_phonetic-dynamic:False,m17n_si_samanala:False,m17n_si_singlish:False,m17n_si_sumihiri:False,m17n_si_transliteration:False,m17n_si_wijesekera:False,m17n_sk_kbd:False,m17n_sr_kbd:False,m17n_sv_post:False,m17n_t_latn-post:False,m17n_t_latn-pre:False,m17n_t_latn1-pre:False,m17n_t_lsymbol:False,m17n_t_math-latex:False,m17n_t_rfc1345:False,m17n_t_ssymbol:False,m17n_t_syrc-phonetic:False,m17n_t_unicode:False,m17n_ta_inscript:False,m17n_ta_itrans:False,m17n_ta_lk-renganathan:False,m17n_ta_phonetic:False,m17n_ta_tamil99:False,m17n_ta_typewriter:False,m17n_ta_vutam:False,m17n_tai_sonla-kbd:False,m17n_te_apple:False,m17n_te_inscript:False,m17n_te_itrans:False,m17n_te_pothana:False,m17n_te_rts:False,m17n_te_sarala:False,m17n_th_kesmanee:False,m17n_th_pattachote:False,m17n_th_tis820:False,m17n_ug_kbd:False,m17n_uk_kbd:False,m17n_ur_phonetic:False,m17n_uz_kbd:False,m17n_vi_han:False,m17n_vi_nomtelex:False,m17n_vi_nomvni:False,m17n_vi_tcvn:False,m17n_vi_telex:False,m17n_vi_viqr:False,m17n_vi_vni:False,m17n_yi_yivo:False,m17n_zh_bopomofo:False,m17n_zh_cangjie:False,m17n_zh_pinyin:False,m17n_zh_pinyin-vi:False,m17n_zh_py:False,m17n_zh_quick:False,m17n_zh_tonepy:False,m17n_zh_zhuyin:False,scj6:False,stroke5:False,t9:False,wanfeng:False,wu:False,ziranma:False,fcitx-keyboard-in-tam_TAB:False,fcitx-keyboard-in-tam_TSCII:False,fcitx-keyboard-in-tam_keyboard_with_numerals:False,fcitx-keyboard-in-tam_unicode:False,m17n_ua_kbd:False,fcitx-keyboard-bn:False
+# 在客户端窗口中显示预编辑字符串
+# 可选值：
+# True False
+PreeditStringInClientWindow=False
+

From 4c8a8800d3fc49f0f2f04b1b6200173dec10d8a6 Mon Sep 17 00:00:00 2001
From: _ <a@b.co>
Date: Wed, 26 Aug 2020 22:27:26 +0530
Subject: [PATCH 0036/3942] Copy config file, no via-store, short config

---
 nixos/tests/fcitx/config      | 135 ----------------------------------
 nixos/tests/fcitx/default.nix |  16 +---
 nixos/tests/fcitx/profile     |  20 +----
 3 files changed, 3 insertions(+), 168 deletions(-)

diff --git a/nixos/tests/fcitx/config b/nixos/tests/fcitx/config
index 0bf657e8620a..169768994e28 100644
--- a/nixos/tests/fcitx/config
+++ b/nixos/tests/fcitx/config
@@ -1,147 +1,12 @@
 [Hotkey]
-# Trigger Input Method
-#TriggerKey=CTRL_SPACE
-# Use extra trigger key only after using it to inactivate
-# Available Value:
-# True False
-#UseExtraTriggerKeyOnlyWhenUseItToInactivate=True
-# Extra key for trigger input method
-# Available Value:
-# R_CTRL
-# R_SHIFT
-# L_SHIFT
-# L_CTRL
-# ALT_L_SHIFT
-# ALT_R_SHIFT
-# CTRL Both
-# SHIFT Both
-# L_ALT
-# R_ALT
-# ALT Both
-# Left Super
-# Right Super
-# Super Both
-# Ctrl+Left Super
-# Ctrl+Right Super
-# Super+Left Ctrl
-# Super+Right Ctrl
-# Disabled
-# Custom
 SwitchKey=Disabled
-# Custom switch key
-#CustomSwitchKey=
-# Activate input method
-#ActivateKey=
-# Inactivate Input Method
-#InactivateKey=
-# Enable Hotkey to scroll Between Input Method
-# Available Value:
-# True False
-#IMSwitchKey=True
-# Include Inactivate when scrolling between Input Method
-# Available Value:
-# True False
-#IMSwitchIncludeInactive=False
-# Scroll between Input Method
-# Available Value:
-# CTRL_SHIFT
-# ALT_SHIFT
-# CTRL_SUPER
-# ALT_SUPER
 IMSwitchHotkey=ALT_SHIFT
-# Reload configuration
-#ReloadConfig=CTRL_5
-# Interval of Two Key Input
 TimeInterval=240
-# Switching Virtual Keyboard
-#VKSwitchKey=CTRL_ALT_B
-# Switching Remind Mode
-#RemindSwitchKey=
-# Switching Full Width Character Mode
-#FullWidthSwitchKey=
-# Switch Full Width Punc Mode
-#PuncSwitchKey=CTRL_.
-# Prev Page
-#PrevPageKey=- UP
-# Next Page
-#NextPageKey== DOWN
-# Choose Second and Third Candidate Word
-#SecondThirdCandWordKey=
-# Saving All Config and Input History
-#SaveAllKey=CTRL_ALT_S
-# Switch Embeded Preedit
-#SwitchPreedit=CTRL_ALT_P
-# Previous Candidate Word
-#PrevWord=SHIFT_TAB
-# Next Candidate Word
-#NextWord=TAB
 
 [Program]
-# Seconds sleep before fcitx really start
 DelayStart=5
-# Share State Among Window
-# Available Value:
-# No
-# All
-# PerProgram
-#ShareStateAmongWindow=No
-# Default Input Method State
-# Available Value:
-# Inactive
-# Active
-#DefaultInputMethodState=Inactive
 
 [Output]
-# Type half width Punc After a Number
-# Available Value:
-# True False
-#HalfPuncAfterNumber=True
-# Disable Paging in Remind Mode
-# Available Value:
-# True False
-#RemindModeDisablePaging=True
-# Commit when toggle state
-# Available Value:
-# True False
-#SendTextWhenSwitchEng=True
-# Candidate Word Number
-#CandidateWordNumber=5
-# Give the tips of Phrase
-# Available Value:
-# True False
-#PhraseTips=True
-# Do not commit preedit text when unfocus a window
-# Available Value:
-# True False
-#DontCommitPreeditWhenUnfocus=False
 
 [Appearance]
-# Show Input Method Hint After Input method changed
-# Available Value:
-# True False
-#ShowInputWindowAfterTriggering=True
-# Show Input Method Hint After Input method changed and Focus in
-# Available Value:
-# True False
-#ShowInputWindowWhenFocusIn=False
-# Input Method Hint will be only shown when state is active
-# Available Value:
-# True False
-#ShowInputWindowOnlyWhenActive=True
-# Show Input Speed
-# Available Value:
-# True False
-#ShowInputSpeed=False
-# Show Version
-# Available Value:
-# True False
-#ShowVersion=False
-# Do not show input window if there is only preedit string
-# Available Value:
-# True False
-#HideInputWindowWhenOnlyPreeditString=False
-# Do not show input window if there is only one candidate and preedit
-# Available Value:
-# True False
-#HideInputWindowWhenOnlyOneCandidate=False
 
diff --git a/nixos/tests/fcitx/default.nix b/nixos/tests/fcitx/default.nix
index 7c53d42fae45..d28a5801f97f 100644
--- a/nixos/tests/fcitx/default.nix
+++ b/nixos/tests/fcitx/default.nix
@@ -3,18 +3,6 @@ import ../make-test-python.nix (
     pkgs, ...
   }: 
     # copy_from_host works only for store paths
-    let 
-      fcitx_profile_file_host = pkgs.writeTextFile { 
-        name = "fcitx_profile";
-        text = builtins.readFile ./profile;
-      };
-      
-      fcitx_config_file_host = pkgs.writeTextFile { 
-        name = "fcitx_config";
-        text = builtins.readFile ./config;
-      };
-    in
-
     rec {
         name = "fcitx";
         machine = 
@@ -77,11 +65,11 @@ import ../make-test-python.nix (
             # Point and click would be expensive,
             # So configure using files
             machine.copy_from_host(
-                "${fcitx_profile_file_host}",
+                "${./profile}",
                 "${fcitx_confdir}/profile",
             )
             machine.copy_from_host(
-                "${fcitx_config_file_host}",
+                "${./config}",
                 "${fcitx_confdir}/config",
             )
 
diff --git a/nixos/tests/fcitx/profile b/nixos/tests/fcitx/profile
index 85898e74c07d..77497a1496bd 100644
--- a/nixos/tests/fcitx/profile
+++ b/nixos/tests/fcitx/profile
@@ -1,22 +1,4 @@
 [Profile]
-# 使用全角字符
-# 可选值：
-# True False
-#FullWidth=False
-# 使用全角标点
-# 可选值：
-# True False
-#WidePunc=True
-# 输入后联想词组
-# 可选值：
-# True False
-#UseRemind=False
-# 当前输入法名称
 IMName=zhengma-large
-# 当前启用的输入法列表
-EnabledIMList=fcitx-keyboard-us:True,zhengma-large:True,m17n_sa_harvard-kyoto:True,boshiamy:False,zhengma:False,pinyin:False,shuangpin:False,wubi:False,wubi-large:False,wbpy:False,cangjie-big:False,cangjie3:False,cangjie5:False,quick-classic:False,quick3:False,quick5:False,array30:False,array30-big:False,bingchan:False,cantonese:False,cantonhk:False,dianbaoma:False,easy-big:False,erbi:False,fcitx-keyboard-af:False,fcitx-keyboard-af-fa-olpc:False,fcitx-keyboard-af-olpc-ps:False,fcitx-keyboard-af-ps:False,fcitx-keyboard-af-uz:False,fcitx-keyboard-af-uz-olpc:False,fcitx-keyboard-al:False,fcitx-keyboard-al-plisi:False,fcitx-keyboard-am:False,fcitx-keyboard-am-eastern:False,fcitx-keyboard-am-eastern-alt:False,fcitx-keyboard-am-olpc-phonetic:False,fcitx-keyboard-am-phonetic:False,fcitx-keyboard-am-phonetic-alt:False,fcitx-keyboard-am-western:False,fcitx-keyboard-apl:False,fcitx-keyboard-apl-apl2:False,fcitx-keyboard-apl-aplplusII:False,fcitx-keyboard-apl-aplx:False,fcitx-keyboard-apl-dyalog:False,fcitx-keyboard-apl-sax:False,fcitx-keyboard-apl-unified:False,fcitx-keyboard-ara:False,fcitx-keyboard-ara-azerty:False,fcitx-keyboard-ara-azerty_digits:False,fcitx-keyboard-ara-basic_ext:False,fcitx-keyboard-ara-basic_ext_digits:False,fcitx-keyboard-ara-buckwalter:False,fcitx-keyboard-ara-digits:False,fcitx-keyboard-ara-mac:False,fcitx-keyboard-ara-olpc:False,fcitx-keyboard-ara-qwerty:False,fcitx-keyboard-ara-qwerty_digits:False,fcitx-keyboard-ara-sun_type6:False,fcitx-keyboard-ara-uga:False,fcitx-keyboard-at:False,fcitx-keyboard-at-mac:False,fcitx-keyboard-at-nodeadkeys:False,fcitx-keyboard-at-sundeadkeys:False,fcitx-keyboard-au:False,fcitx-keyboard-az:False,fcitx-keyboard-az-cyrillic:False,fcitx-keyboard-ba:False,fcitx-keyboard-ba-alternatequotes:False,fcitx-keyboard-ba-unicode:False,fcitx-keyboard-ba-unicodeus:False,fcitx-keyboard-ba-us:False,fcitx-keyboard-bd:False,fcitx-keyboard-bd-probhat:False,fcitx-keyboard-be:False,fcitx-keyboard-be-iso-alternate:False,fcitx-keyboard-be-nodeadkeys:False,fcitx-keyboard-be-oss:False,fcitx-keyboard-be-oss_latin9:False,fcitx-keyboard-be-oss_sundeadkeys:False,fcitx-keyboard-be-sun_type6:False,fcitx-keyboard-be-sundeadkeys:False,fcitx-keyboard-be-wang:False,fcitx-keyboard-bg:False,fcitx-keyboard-bg-bas_phonetic:False,fcitx-keyboard-bg-phonetic:False,fcitx-keyboard-br:False,fcitx-keyboard-br-dvorak:False,fcitx-keyboard-br-nativo:False,fcitx-keyboard-br-nativo-epo:False,fcitx-keyboard-br-nativo-us:False,fcitx-keyboard-br-nodeadkeys:False,fcitx-keyboard-br-sun_type6:False,fcitx-keyboard-br-thinkpad:False,fcitx-keyboard-brai:False,fcitx-keyboard-brai-left_hand:False,fcitx-keyboard-brai-left_hand_invert:False,fcitx-keyboard-brai-right_hand:False,fcitx-keyboard-brai-right_hand_invert:False,fcitx-keyboard-bt:False,fcitx-keyboard-bw:False,fcitx-keyboard-by:False,fcitx-keyboard-by-latin:False,fcitx-keyboard-by-legacy:False,fcitx-keyboard-ca:False,fcitx-keyboard-ca-eng:False,fcitx-keyboard-ca-fr-dvorak:False,fcitx-keyboard-ca-fr-legacy:False,fcitx-keyboard-ca-ike:False,fcitx-keyboard-ca-kut:False,fcitx-keyboard-ca-multi:False,fcitx-keyboard-ca-multi-2gr:False,fcitx-keyboard-ca-multix:False,fcitx-keyboard-ca-shs:False,fcitx-keyboard-ca-sun_type6:False,fcitx-keyboard-cd:False,fcitx-keyboard-ch:False,fcitx-keyboard-ch-de_mac:False,fcitx-keyboard-ch-de_nodeadkeys:False,fcitx-keyboard-ch-de_sundeadkeys:False,fcitx-keyboard-ch-fr:False,fcitx-keyboard-ch-fr_mac:False,fcitx-keyboard-ch-fr_nodeadkeys:False,fcitx-keyboard-ch-fr_sundeadkeys:False,fcitx-keyboard-ch-legacy:False,fcitx-keyboard-ch-sun_type6_de:False,fcitx-keyboard-ch-sun_type6_fr:False,fcitx-keyboard-cm:False,fcitx-keyboard-cm-azerty:False,fcitx-keyboard-cm-dvorak:False,fcitx-keyboard-cm-french:False,fcitx-keyboard-cm-mmuock:False,fcitx-keyboard-cm-qwerty:False,fcitx-keyboard-cn:False,fcitx-keyboard-cn-altgr-pinyin:False,fcitx-keyboard-cn-tib:False,fcitx-keyboard-cn-tib_asciinum:False,fcitx-keyboard-cn-ug:False,fcitx-keyboard-cz:False,fcitx-keyboard-cz-bksl:False,fcitx-keyboard-cz-dvorak-ucw:False,fcitx-keyboard-cz-prog:False,fcitx-keyboard-cz-qwerty:False,fcitx-keyboard-cz-qwerty_bksl:False,fcitx-keyboard-cz-rus:False,fcitx-keyboard-cz-sun_type6:False,fcitx-keyboard-cz-typo:False,fcitx-keyboard-cz-ucw:False,fcitx-keyboard-de:False,fcitx-keyboard-de-T3:False,fcitx-keyboard-de-adnw:False,fcitx-keyboard-de-bone:False,fcitx-keyboard-de-bone_eszett_home:False,fcitx-keyboard-de-deadacute:False,fcitx-keyboard-de-deadgraveacute:False,fcitx-keyboard-de-deadtilde:False,fcitx-keyboard-de-dsb:False,fcitx-keyboard-de-dsb_qwertz:False,fcitx-keyboard-de-dvorak:False,fcitx-keyboard-de-hu:False,fcitx-keyboard-de-koy:False,fcitx-keyboard-de-lld:False,fcitx-keyboard-de-mac:False,fcitx-keyboard-de-mac_nodeadkeys:False,fcitx-keyboard-de-neo:False,fcitx-keyboard-de-neo_qwerty:False,fcitx-keyboard-de-neo_qwertz:False,fcitx-keyboard-de-nodeadkeys:False,fcitx-keyboard-de-pl:False,fcitx-keyboard-de-qwerty:False,fcitx-keyboard-de-ro:False,fcitx-keyboard-de-ro_nodeadkeys:False,fcitx-keyboard-de-ru:False,fcitx-keyboard-de-ru-recom:False,fcitx-keyboard-de-ru-translit:False,fcitx-keyboard-de-sun_type6:False,fcitx-keyboard-de-sundeadkeys:False,fcitx-keyboard-de-tr:False,fcitx-keyboard-de-us:False,fcitx-keyboard-dk:False,fcitx-keyboard-dk-dvorak:False,fcitx-keyboard-dk-mac:False,fcitx-keyboard-dk-mac_nodeadkeys:False,fcitx-keyboard-dk-nodeadkeys:False,fcitx-keyboard-dk-sun_type6:False,fcitx-keyboard-dk-winkeys:False,fcitx-keyboard-dz:False,fcitx-keyboard-dz-ar:False,fcitx-keyboard-dz-ber:False,fcitx-keyboard-ee:False,fcitx-keyboard-ee-dvorak:False,fcitx-keyboard-ee-nodeadkeys:False,fcitx-keyboard-ee-sun_type6:False,fcitx-keyboard-ee-us:False,fcitx-keyboard-epo:False,fcitx-keyboard-epo-legacy:False,fcitx-keyboard-es:False,fcitx-keyboard-es-ast:False,fcitx-keyboard-es-cat:False,fcitx-keyboard-es-deadtilde:False,fcitx-keyboard-es-dvorak:False,fcitx-keyboard-es-mac:False,fcitx-keyboard-es-nodeadkeys:False,fcitx-keyboard-es-sun_type6:False,fcitx-keyboard-es-sundeadkeys:False,fcitx-keyboard-es-winkeys:False,fcitx-keyboard-et:False,fcitx-keyboard-eu:False,fcitx-keyboard-fi:False,fcitx-keyboard-fi-classic:False,fcitx-keyboard-fi-das:False,fcitx-keyboard-fi-fidvorak:False,fcitx-keyboard-fi-mac:False,fcitx-keyboard-fi-nodeadkeys:False,fcitx-keyboard-fi-smi:False,fcitx-keyboard-fi-sun_type6:False,fcitx-keyboard-fi-winkeys:False,fcitx-keyboard-fo:False,fcitx-keyboard-fo-nodeadkeys:False,fcitx-keyboard-fr:False,fcitx-keyboard-fr-azerty:False,fcitx-keyboard-fr-bepo:False,fcitx-keyboard-fr-bepo_latin9:False,fcitx-keyboard-fr-bre:False,fcitx-keyboard-fr-dvorak:False,fcitx-keyboard-fr-geo:False,fcitx-keyboard-fr-latin9:False,fcitx-keyboard-fr-latin9_nodeadkeys:False,fcitx-keyboard-fr-latin9_sundeadkeys:False,fcitx-keyboard-fr-mac:False,fcitx-keyboard-fr-nodeadkeys:False,fcitx-keyboard-fr-oci:False,fcitx-keyboard-fr-oss:False,fcitx-keyboard-fr-oss_latin9:False,fcitx-keyboard-fr-oss_nodeadkeys:False,fcitx-keyboard-fr-oss_sundeadkeys:False,fcitx-keyboard-fr-sun_type6:False,fcitx-keyboard-fr-sundeadkeys:False,fcitx-keyboard-fr-us:False,fcitx-keyboard-fr-us-alt:False,fcitx-keyboard-fr-us-azerty:False,fcitx-keyboard-gb:False,fcitx-keyboard-gb-colemak:False,fcitx-keyboard-gb-dvorak:False,fcitx-keyboard-gb-dvorakukp:False,fcitx-keyboard-gb-extd:False,fcitx-keyboard-gb-intl:False,fcitx-keyboard-gb-mac:False,fcitx-keyboard-gb-mac_intl:False,fcitx-keyboard-gb-pl:False,fcitx-keyboard-gb-sun_type6:False,fcitx-keyboard-ge:False,fcitx-keyboard-ge-ergonomic:False,fcitx-keyboard-ge-mess:False,fcitx-keyboard-ge-os:False,fcitx-keyboard-ge-ru:False,fcitx-keyboard-gh:False,fcitx-keyboard-gh-akan:False,fcitx-keyboard-gh-avn:False,fcitx-keyboard-gh-ewe:False,fcitx-keyboard-gh-fula:False,fcitx-keyboard-gh-ga:False,fcitx-keyboard-gh-generic:False,fcitx-keyboard-gh-gillbt:False,fcitx-keyboard-gh-hausa:False,fcitx-keyboard-gn:False,fcitx-keyboard-gr:False,fcitx-keyboard-gr-colemak:False,fcitx-keyboard-gr-extended:False,fcitx-keyboard-gr-nodeadkeys:False,fcitx-keyboard-gr-polytonic:False,fcitx-keyboard-gr-simple:False,fcitx-keyboard-gr-sun_type6:False,fcitx-keyboard-hr:False,fcitx-keyboard-hr-alternatequotes:False,fcitx-keyboard-hr-unicode:False,fcitx-keyboard-hr-unicodeus:False,fcitx-keyboard-hr-us:False,fcitx-keyboard-hu:False,fcitx-keyboard-hu-101_qwerty_comma_dead:False,fcitx-keyboard-hu-101_qwerty_comma_nodead:False,fcitx-keyboard-hu-101_qwerty_dot_dead:False,fcitx-keyboard-hu-101_qwerty_dot_nodead:False,fcitx-keyboard-hu-101_qwertz_comma_dead:False,fcitx-keyboard-hu-101_qwertz_comma_nodead:False,fcitx-keyboard-hu-101_qwertz_dot_dead:False,fcitx-keyboard-hu-101_qwertz_dot_nodead:False,fcitx-keyboard-hu-102_qwerty_comma_dead:False,fcitx-keyboard-hu-102_qwerty_comma_nodead:False,fcitx-keyboard-hu-102_qwerty_dot_dead:False,fcitx-keyboard-hu-102_qwerty_dot_nodead:False,fcitx-keyboard-hu-102_qwertz_comma_dead:False,fcitx-keyboard-hu-102_qwertz_comma_nodead:False,fcitx-keyboard-hu-102_qwertz_dot_dead:False,fcitx-keyboard-hu-102_qwertz_dot_nodead:False,fcitx-keyboard-hu-nodeadkeys:False,fcitx-keyboard-hu-oldhun:False,fcitx-keyboard-hu-qwerty:False,fcitx-keyboard-hu-standard:False,fcitx-keyboard-id:False,fcitx-keyboard-ie:False,fcitx-keyboard-ie-CloGaelach:False,fcitx-keyboard-ie-UnicodeExpert:False,fcitx-keyboard-ie-ogam:False,fcitx-keyboard-ie-ogam_is434:False,fcitx-keyboard-il:False,fcitx-keyboard-il-biblical:False,fcitx-keyboard-il-biblicalSIL:False,fcitx-keyboard-il-lyx:False,fcitx-keyboard-il-phonetic:False,fcitx-keyboard-in:False,fcitx-keyboard-in-ben:False,fcitx-keyboard-in-ben_baishakhi:False,fcitx-keyboard-in-ben_bornona:False,fcitx-keyboard-in-ben_gitanjali:False,fcitx-keyboard-in-ben_inscript:False,fcitx-keyboard-in-ben_probhat:False,fcitx-keyboard-in-bolnagri:False,fcitx-keyboard-in-eeyek:False,fcitx-keyboard-in-eng:False,fcitx-keyboard-in-guj:False,fcitx-keyboard-in-guru:False,fcitx-keyboard-in-hin-kagapa:False,fcitx-keyboard-in-hin-wx:False,fcitx-keyboard-in-jhelum:False,fcitx-keyboard-in-kan:False,fcitx-keyboard-in-kan-kagapa:False,fcitx-keyboard-in-mal:False,fcitx-keyboard-in-mal_enhanced:False,fcitx-keyboard-in-mal_lalitha:False,fcitx-keyboard-in-mar-kagapa:False,fcitx-keyboard-in-olck:False,fcitx-keyboard-in-ori:False,fcitx-keyboard-in-san-kagapa:False,fcitx-keyboard-in-tam:False,fcitx-keyboard-in-tam_tamilnet:False,fcitx-keyboard-in-tam_tamilnet_TAB:False,fcitx-keyboard-in-tam_tamilnet_TSCII:False,fcitx-keyboard-in-tam_tamilnet_with_tam_nums:False,fcitx-keyboard-in-tel:False,fcitx-keyboard-in-tel-kagapa:False,fcitx-keyboard-in-tel-sarala:False,fcitx-keyboard-in-urd-phonetic:False,fcitx-keyboard-in-urd-phonetic3:False,fcitx-keyboard-in-urd-winkeys:False,fcitx-keyboard-iq:False,fcitx-keyboard-iq-ku:False,fcitx-keyboard-iq-ku_alt:False,fcitx-keyboard-iq-ku_ara:False,fcitx-keyboard-iq-ku_f:False,fcitx-keyboard-ir:False,fcitx-keyboard-ir-ave:False,fcitx-keyboard-ir-ku:False,fcitx-keyboard-ir-ku_alt:False,fcitx-keyboard-ir-ku_ara:False,fcitx-keyboard-ir-ku_f:False,fcitx-keyboard-ir-pes_keypad:False,fcitx-keyboard-is:False,fcitx-keyboard-is-Sundeadkeys:False,fcitx-keyboard-is-dvorak:False,fcitx-keyboard-is-mac:False,fcitx-keyboard-is-mac_legacy:False,fcitx-keyboard-is-nodeadkeys:False,fcitx-keyboard-it:False,fcitx-keyboard-it-fur:False,fcitx-keyboard-it-geo:False,fcitx-keyboard-it-ibm:False,fcitx-keyboard-it-intl:False,fcitx-keyboard-it-lld:False,fcitx-keyboard-it-mac:False,fcitx-keyboard-it-nodeadkeys:False,fcitx-keyboard-it-scn:False,fcitx-keyboard-it-sun_type6:False,fcitx-keyboard-it-us:False,fcitx-keyboard-it-winkeys:False,fcitx-keyboard-jp:False,fcitx-keyboard-jp-OADG109A:False,fcitx-keyboard-jp-dvorak:False,fcitx-keyboard-jp-kana:False,fcitx-keyboard-jp-kana86:False,fcitx-keyboard-jp-mac:False,fcitx-keyboard-jp-sun_type6:False,fcitx-keyboard-jp-sun_type7:False,fcitx-keyboard-jp-sun_type7_suncompat:False,fcitx-keyboard-ke:False,fcitx-keyboard-ke-kik:False,fcitx-keyboard-kg:False,fcitx-keyboard-kg-phonetic:False,fcitx-keyboard-kh:False,fcitx-keyboard-kr:False,fcitx-keyboard-kr-kr104:False,fcitx-keyboard-kr-sun_type6:False,fcitx-keyboard-kz:False,fcitx-keyboard-kz-ext:False,fcitx-keyboard-kz-kazrus:False,fcitx-keyboard-kz-latin:False,fcitx-keyboard-kz-ruskaz:False,fcitx-keyboard-la:False,fcitx-keyboard-la-stea:False,fcitx-keyboard-latam:False,fcitx-keyboard-latam-colemak:False,fcitx-keyboard-latam-colemak-gaming:False,fcitx-keyboard-latam-deadtilde:False,fcitx-keyboard-latam-dvorak:False,fcitx-keyboard-latam-nodeadkeys:False,fcitx-keyboard-latam-sundeadkeys:False,fcitx-keyboard-lk:False,fcitx-keyboard-lk-tam_TAB:False,fcitx-keyboard-lk-tam_unicode:False,fcitx-keyboard-lk-us:False,fcitx-keyboard-lt:False,fcitx-keyboard-lt-ibm:False,fcitx-keyboard-lt-lekp:False,fcitx-keyboard-lt-lekpa:False,fcitx-keyboard-lt-std:False,fcitx-keyboard-lt-sun_type6:False,fcitx-keyboard-lt-us:False,fcitx-keyboard-lt-us_dvorak:False,fcitx-keyboard-lv:False,fcitx-keyboard-lv-adapted:False,fcitx-keyboard-lv-apostrophe:False,fcitx-keyboard-lv-apostrophecolemak:False,fcitx-keyboard-lv-colemak:False,fcitx-keyboard-lv-dvorak:False,fcitx-keyboard-lv-dvorakprogr:False,fcitx-keyboard-lv-ergonomic:False,fcitx-keyboard-lv-fkey:False,fcitx-keyboard-lv-minuskeydvorak:False,fcitx-keyboard-lv-minuskeydvorakprogr:False,fcitx-keyboard-lv-modern:False,fcitx-keyboard-lv-sun_type6:False,fcitx-keyboard-lv-tilde:False,fcitx-keyboard-lv-ykeydvorak:False,fcitx-keyboard-lv-ykeydvorakprogr:False,fcitx-keyboard-ma:False,fcitx-keyboard-ma-french:False,fcitx-keyboard-ma-tifinagh:False,fcitx-keyboard-ma-tifinagh-alt:False,fcitx-keyboard-ma-tifinagh-alt-phonetic:False,fcitx-keyboard-ma-tifinagh-extended:False,fcitx-keyboard-ma-tifinagh-extended-phonetic:False,fcitx-keyboard-ma-tifinagh-phonetic:False,fcitx-keyboard-mao:False,fcitx-keyboard-md:False,fcitx-keyboard-md-gag:False,fcitx-keyboard-me:False,fcitx-keyboard-me-cyrillic:False,fcitx-keyboard-me-cyrillicalternatequotes:False,fcitx-keyboard-me-cyrillicyz:False,fcitx-keyboard-me-latinalternatequotes:False,fcitx-keyboard-me-latinunicode:False,fcitx-keyboard-me-latinunicodeyz:False,fcitx-keyboard-me-latinyz:False,fcitx-keyboard-mk:False,fcitx-keyboard-mk-nodeadkeys:False,fcitx-keyboard-ml:False,fcitx-keyboard-ml-fr-oss:False,fcitx-keyboard-ml-us-intl:False,fcitx-keyboard-ml-us-mac:False,fcitx-keyboard-mm:False,fcitx-keyboard-mm-zawgyi:False,fcitx-keyboard-mn:False,fcitx-keyboard-mt:False,fcitx-keyboard-mt-alt-gb:False,fcitx-keyboard-mt-alt-us:False,fcitx-keyboard-mt-us:False,fcitx-keyboard-mv:False,fcitx-keyboard-my:False,fcitx-keyboard-my-phonetic:False,fcitx-keyboard-nec_vndr/jp:False,fcitx-keyboard-ng:False,fcitx-keyboard-ng-hausa:False,fcitx-keyboard-ng-igbo:False,fcitx-keyboard-ng-yoruba:False,fcitx-keyboard-nl:False,fcitx-keyboard-nl-mac:False,fcitx-keyboard-nl-std:False,fcitx-keyboard-nl-sun_type6:False,fcitx-keyboard-nl-sundeadkeys:False,fcitx-keyboard-no:False,fcitx-keyboard-no-colemak:False,fcitx-keyboard-no-dvorak:False,fcitx-keyboard-no-mac:False,fcitx-keyboard-no-mac_nodeadkeys:False,fcitx-keyboard-no-nodeadkeys:False,fcitx-keyboard-no-smi:False,fcitx-keyboard-no-smi_nodeadkeys:False,fcitx-keyboard-no-sun_type6:False,fcitx-keyboard-no-winkeys:False,fcitx-keyboard-np:False,fcitx-keyboard-ph:False,fcitx-keyboard-ph-capewell-dvorak:False,fcitx-keyboard-ph-capewell-dvorak-bay:False,fcitx-keyboard-ph-capewell-qwerf2k6:False,fcitx-keyboard-ph-capewell-qwerf2k6-bay:False,fcitx-keyboard-ph-colemak:False,fcitx-keyboard-ph-colemak-bay:False,fcitx-keyboard-ph-dvorak:False,fcitx-keyboard-ph-dvorak-bay:False,fcitx-keyboard-ph-qwerty-bay:False,fcitx-keyboard-pk:False,fcitx-keyboard-pk-ara:False,fcitx-keyboard-pk-snd:False,fcitx-keyboard-pk-urd-crulp:False,fcitx-keyboard-pk-urd-nla:False,fcitx-keyboard-pl:False,fcitx-keyboard-pl-colemak:False,fcitx-keyboard-pl-csb:False,fcitx-keyboard-pl-dvorak:False,fcitx-keyboard-pl-dvorak_altquotes:False,fcitx-keyboard-pl-dvorak_quotes:False,fcitx-keyboard-pl-dvp:False,fcitx-keyboard-pl-glagolica:False,fcitx-keyboard-pl-intl:False,fcitx-keyboard-pl-legacy:False,fcitx-keyboard-pl-qwertz:False,fcitx-keyboard-pl-ru_phonetic_dvorak:False,fcitx-keyboard-pl-sun_type6:False,fcitx-keyboard-pl-szl:False,fcitx-keyboard-pt:False,fcitx-keyboard-pt-colemak:False,fcitx-keyboard-pt-mac:False,fcitx-keyboard-pt-mac_nodeadkeys:False,fcitx-keyboard-pt-mac_sundeadkeys:False,fcitx-keyboard-pt-nativo:False,fcitx-keyboard-pt-nativo-epo:False,fcitx-keyboard-pt-nativo-us:False,fcitx-keyboard-pt-nodeadkeys:False,fcitx-keyboard-pt-sun_type6:False,fcitx-keyboard-pt-sundeadkeys:False,fcitx-keyboard-ro:False,fcitx-keyboard-ro-cedilla:False,fcitx-keyboard-ro-crh_dobruja:False,fcitx-keyboard-ro-ergonomic:False,fcitx-keyboard-ro-std:False,fcitx-keyboard-ro-std_cedilla:False,fcitx-keyboard-ro-sun_type6:False,fcitx-keyboard-ro-winkeys:False,fcitx-keyboard-rs:False,fcitx-keyboard-rs-alternatequotes:False,fcitx-keyboard-rs-combiningkeys:False,fcitx-keyboard-rs-latin:False,fcitx-keyboard-rs-latinalternatequotes:False,fcitx-keyboard-rs-latinunicode:False,fcitx-keyboard-rs-latinunicodeyz:False,fcitx-keyboard-rs-latinyz:False,fcitx-keyboard-rs-rue:False,fcitx-keyboard-rs-yz:False,fcitx-keyboard-ru:False,fcitx-keyboard-ru-bak:False,fcitx-keyboard-ru-chm:False,fcitx-keyboard-ru-chu:False,fcitx-keyboard-ru-cv:False,fcitx-keyboard-ru-cv_latin:False,fcitx-keyboard-ru-dos:False,fcitx-keyboard-ru-kom:False,fcitx-keyboard-ru-legacy:False,fcitx-keyboard-ru-mac:False,fcitx-keyboard-ru-os_legacy:False,fcitx-keyboard-ru-os_winkeys:False,fcitx-keyboard-ru-phonetic:False,fcitx-keyboard-ru-phonetic_azerty:False,fcitx-keyboard-ru-phonetic_dvorak:False,fcitx-keyboard-ru-phonetic_fr:False,fcitx-keyboard-ru-phonetic_winkeys:False,fcitx-keyboard-ru-phonetic_yazherty:False,fcitx-keyboard-ru-prxn:False,fcitx-keyboard-ru-rulemak:False,fcitx-keyboard-ru-ruu:False,fcitx-keyboard-ru-sah:False,fcitx-keyboard-ru-srp:False,fcitx-keyboard-ru-sun_type6:False,fcitx-keyboard-ru-tt:False,fcitx-keyboard-ru-typewriter:False,fcitx-keyboard-ru-typewriter-legacy:False,fcitx-keyboard-ru-udm:False,fcitx-keyboard-ru-unipunct:False,fcitx-keyboard-ru-xal:False,fcitx-keyboard-se:False,fcitx-keyboard-se-dvorak:False,fcitx-keyboard-se-dvorak_a5:False,fcitx-keyboard-se-mac:False,fcitx-keyboard-se-nodeadkeys:False,fcitx-keyboard-se-ovd:False,fcitx-keyboard-se-rus:False,fcitx-keyboard-se-rus_nodeadkeys:False,fcitx-keyboard-se-smi:False,fcitx-keyboard-se-sun_type6:False,fcitx-keyboard-se-svdvorak:False,fcitx-keyboard-se-swl:False,fcitx-keyboard-se-us:False,fcitx-keyboard-se-us_dvorak:False,fcitx-keyboard-si:False,fcitx-keyboard-si-alternatequotes:False,fcitx-keyboard-si-us:False,fcitx-keyboard-sk:False,fcitx-keyboard-sk-bksl:False,fcitx-keyboard-sk-qwerty:False,fcitx-keyboard-sk-qwerty_bksl:False,fcitx-keyboard-sk-sun_type6:False,fcitx-keyboard-sn:False,fcitx-keyboard-sy:False,fcitx-keyboard-sy-ku:False,fcitx-keyboard-sy-ku_alt:False,fcitx-keyboard-sy-ku_f:False,fcitx-keyboard-sy-syc:False,fcitx-keyboard-sy-syc_phonetic:False,fcitx-keyboard-tg:False,fcitx-keyboard-th:False,fcitx-keyboard-th-pat:False,fcitx-keyboard-th-tis:False,fcitx-keyboard-tj:False,fcitx-keyboard-tj-legacy:False,fcitx-keyboard-tm:False,fcitx-keyboard-tm-alt:False,fcitx-keyboard-tr:False,fcitx-keyboard-tr-alt:False,fcitx-keyboard-tr-crh:False,fcitx-keyboard-tr-crh_alt:False,fcitx-keyboard-tr-crh_f:False,fcitx-keyboard-tr-f:False,fcitx-keyboard-tr-intl:False,fcitx-keyboard-tr-ku:False,fcitx-keyboard-tr-ku_alt:False,fcitx-keyboard-tr-ku_f:False,fcitx-keyboard-tr-sun_type6:False,fcitx-keyboard-tr-sundeadkeys:False,fcitx-keyboard-trans:False,fcitx-keyboard-tw:False,fcitx-keyboard-tw-indigenous:False,fcitx-keyboard-tw-saisiyat:False,fcitx-keyboard-tz:False,fcitx-keyboard-ua:False,fcitx-keyboard-ua-homophonic:False,fcitx-keyboard-ua-legacy:False,fcitx-keyboard-ua-phonetic:False,fcitx-keyboard-ua-rstu:False,fcitx-keyboard-ua-rstu_ru:False,fcitx-keyboard-ua-sun_type6:False,fcitx-keyboard-ua-typewriter:False,fcitx-keyboard-ua-winkeys:False,fcitx-keyboard-us-3l:False,fcitx-keyboard-us-3l-cros:False,fcitx-keyboard-us-alt-intl:False,fcitx-keyboard-us-alt-intl-unicode:False,fcitx-keyboard-us-altgr-intl:False,fcitx-keyboard-us-ats:False,fcitx-keyboard-us-carpalx:False,fcitx-keyboard-us-carpalx-altgr-intl:False,fcitx-keyboard-us-carpalx-full:False,fcitx-keyboard-us-carpalx-full-altgr-intl:False,fcitx-keyboard-us-carpalx-full-intl:False,fcitx-keyboard-us-carpalx-intl:False,fcitx-keyboard-us-chr:False,fcitx-keyboard-us-colemak:False,fcitx-keyboard-us-crd:False,fcitx-keyboard-us-cz_sk_de:False,fcitx-keyboard-us-dvorak:False,fcitx-keyboard-us-dvorak-alt-intl:False,fcitx-keyboard-us-dvorak-classic:False,fcitx-keyboard-us-dvorak-intl:False,fcitx-keyboard-us-dvorak-l:False,fcitx-keyboard-us-dvorak-r:False,fcitx-keyboard-us-dvp:False,fcitx-keyboard-us-euro:False,fcitx-keyboard-us-hbs:False,fcitx-keyboard-us-ibm238l:False,fcitx-keyboard-us-intl:False,fcitx-keyboard-us-intl-unicode:False,fcitx-keyboard-us-mac:False,fcitx-keyboard-us-norman:False,fcitx-keyboard-us-olpc2:False,fcitx-keyboard-us-rus:False,fcitx-keyboard-us-scn:False,fcitx-keyboard-us-sun_type6:False,fcitx-keyboard-us-workman:False,fcitx-keyboard-us-workman-intl:False,fcitx-keyboard-uz:False,fcitx-keyboard-uz-latin:False,fcitx-keyboard-vn:False,fcitx-keyboard-vn-aderty:False,fcitx-keyboard-vn-fr:False,fcitx-keyboard-vn-qderty:False,fcitx-keyboard-vn-us:False,fcitx-keyboard-za:False,jyutping:False,m17n_am_sera:False,m17n_ar_kbd:False,m17n_ar_translit:False,m17n_as_inscript:False,m17n_as_itrans:False,m17n_as_phonetic:False,m17n_ath_phonetic:False,m17n_be_kbd:False,m17n_bla_phonetic:False,m17n_bn_disha:False,m17n_bn_inscript:False,m17n_bn_itrans:False,m17n_bn_probhat:False,m17n_bn_unijoy:False,m17n_bo_ewts:False,m17n_bo_tcrc:False,m17n_bo_wylie:False,m17n_cmc_kbd:False,m17n_cr_western:False,m17n_cs_kbd:False,m17n_da_post:False,m17n_dv_phonetic:False,m17n_el_kbd:False,m17n_eo_h-fundamente:False,m17n_eo_h-sistemo:False,m17n_eo_plena:False,m17n_eo_q-sistemo:False,m17n_eo_vi-sistemo:False,m17n_eo_x-sistemo:False,m17n_fa_isiri:False,m17n_fr_azerty:False,m17n_grc_mizuochi:False,m17n_gu_inscript:False,m17n_gu_itrans:False,m17n_gu_phonetic:False,m17n_he_kbd:False,m17n_hi_inscript:False,m17n_hi_itrans:False,m17n_hi_optitransv2:False,m17n_hi_phonetic:False,m17n_hi_remington:False,m17n_hi_typewriter:False,m17n_hi_vedmata:False,m17n_hr_kbd:False,m17n_hu_rovas-post:False,m17n_hy_kbd:False,m17n_ii_phonetic:False,m17n_iu_phonetic:False,m17n_ja_tcode:False,m17n_ja_trycode:False,m17n_ka_kbd:False,m17n_kk_arabic:False,m17n_kk_kbd:False,m17n_km_yannis:False,m17n_kn_inscript:False,m17n_kn_itrans:False,m17n_kn_kgp:False,m17n_kn_optitransv2:False,m17n_kn_typewriter:False,m17n_ko_han2:False,m17n_ko_romaja:False,m17n_ks_inscript:False,m17n_ks_kbd:False,m17n_lo_kbd:False,m17n_lo_lrt:False,m17n_mai_inscript:False,m17n_ml_enhanced-inscript:False,m17n_ml_inscript:False,m17n_ml_itrans:False,m17n_ml_mozhi:False,m17n_ml_remington:False,m17n_ml_swanalekha:False,m17n_mr_inscript:False,m17n_mr_itrans:False,m17n_mr_phonetic:False,m17n_mr_remington:False,m17n_mr_typewriter:False,m17n_my_kbd:False,m17n_ne_rom:False,m17n_ne_rom-translit:False,m17n_ne_trad:False,m17n_ne_trad-ttf:False,m17n_nsk_phonetic:False,m17n_oj_phonetic:False,m17n_or_inscript:False,m17n_or_itrans:False,m17n_or_phonetic:False,m17n_pa_anmollipi:False,m17n_pa_inscript:False,m17n_pa_itrans:False,m17n_pa_jhelum:False,m17n_pa_phonetic:False,m17n_ps_phonetic:False,m17n_ru_kbd:False,m17n_ru_phonetic:False,m17n_ru_translit:False,m17n_ru_yawerty:False,m17n_sa_IAST:False,m17n_sa_itrans:False,m17n_sd_inscript:False,m17n_si_phonetic-dynamic:False,m17n_si_samanala:False,m17n_si_singlish:False,m17n_si_sumihiri:False,m17n_si_transliteration:False,m17n_si_wijesekera:False,m17n_sk_kbd:False,m17n_sr_kbd:False,m17n_sv_post:False,m17n_t_latn-post:False,m17n_t_latn-pre:False,m17n_t_latn1-pre:False,m17n_t_lsymbol:False,m17n_t_math-latex:False,m17n_t_rfc1345:False,m17n_t_ssymbol:False,m17n_t_syrc-phonetic:False,m17n_t_unicode:False,m17n_ta_inscript:False,m17n_ta_itrans:False,m17n_ta_lk-renganathan:False,m17n_ta_phonetic:False,m17n_ta_tamil99:False,m17n_ta_typewriter:False,m17n_ta_vutam:False,m17n_tai_sonla-kbd:False,m17n_te_apple:False,m17n_te_inscript:False,m17n_te_itrans:False,m17n_te_pothana:False,m17n_te_rts:False,m17n_te_sarala:False,m17n_th_kesmanee:False,m17n_th_pattachote:False,m17n_th_tis820:False,m17n_ug_kbd:False,m17n_uk_kbd:False,m17n_ur_phonetic:False,m17n_uz_kbd:False,m17n_vi_han:False,m17n_vi_nomtelex:False,m17n_vi_nomvni:False,m17n_vi_tcvn:False,m17n_vi_telex:False,m17n_vi_viqr:False,m17n_vi_vni:False,m17n_yi_yivo:False,m17n_zh_bopomofo:False,m17n_zh_cangjie:False,m17n_zh_pinyin:False,m17n_zh_pinyin-vi:False,m17n_zh_py:False,m17n_zh_quick:False,m17n_zh_tonepy:False,m17n_zh_zhuyin:False,scj6:False,stroke5:False,t9:False,wanfeng:False,wu:False,ziranma:False,fcitx-keyboard-in-tam_TAB:False,fcitx-keyboard-in-tam_TSCII:False,fcitx-keyboard-in-tam_keyboard_with_numerals:False,fcitx-keyboard-in-tam_unicode:False,m17n_ua_kbd:False,fcitx-keyboard-bn:False
-# 在客户端窗口中显示预编辑字符串
-# 可选值：
-# True False
+EnabledIMList=fcitx-keyboard-us:True,zhengma-large:True,m17n_sa_harvard-kyoto:True
 PreeditStringInClientWindow=False
-

From 48309677368e3fac5489326e00f1d6b0513d2b8e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 21 Aug 2020 22:20:10 -0500
Subject: [PATCH 0037/3942] Fix cc-wrapper in native stdenv

---
 pkgs/build-support/cc-wrapper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 6ee287e287bc..ecde89ac9450 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -57,7 +57,7 @@ let
   suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config;
 
   expand-response-params =
-    if buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null"
+    if (buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null"
     then import ../expand-response-params { inherit (buildPackages) stdenv; }
     else "";
 

From bcc93f02d20cf0885bbcc69984b0319b50ab2c02 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Sat, 29 Aug 2020 22:28:05 +0200
Subject: [PATCH 0038/3942] nixos/availableKernelModules: add microsoft hid

This adds support for Microsoft USB keyboards at boot.
---
 nixos/modules/system/boot/kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 43871f439f7f..ed7226331d70 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -227,7 +227,7 @@ in
             "xhci_pci"
             "usbhid"
             "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
-            "hid_logitech_hidpp" "hid_logitech_dj"
+            "hid_logitech_hidpp" "hid_logitech_dj" "hid_microsoft"
 
           ] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
             # Misc. x86 keyboard stuff.

From 815eaa5206dcc9ffefb2d8dacf10aca1f89c45f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 31 Aug 2020 05:28:05 +0000
Subject: [PATCH 0039/3942] stm32cubemx: 5.6.1 -> 6.0.1

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

diff --git a/pkgs/development/tools/misc/stm32cubemx/default.nix b/pkgs/development/tools/misc/stm32cubemx/default.nix
index 80549d8848f3..9fe34aecade2 100644
--- a/pkgs/development/tools/misc/stm32cubemx/default.nix
+++ b/pkgs/development/tools/misc/stm32cubemx/default.nix
@@ -1,7 +1,7 @@
 { stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }:
 
 let
-  version = "5.6.1";
+  version = "6.0.1";
   desktopItem = makeDesktopItem {
     name = "stm32CubeMX";
     exec = "stm32cubemx";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}.zip";
-    sha256 = "1y4a340wcjl88kjw1f1x85ffp4b5g1psryn9mgkd717w2bfpf29l";
+    sha256 = "15vxca1pgpgxgiz4wisrw0lylffdwnn4n46z9n0q37f8hmzlrk8f";
     stripRoot= false;
   };
 
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
       microcontrollers and microprocessors, as well as the generation of the
       corresponding initialization C code for the Arm® Cortex®-M core or a
       partial Linux® Device Tree for Arm® Cortex®-A core), through a
-      step-by-step process.        
+      step-by-step process.
     '';
     homepage = "https://www.st.com/en/development-tools/stm32cubemx.html";
     license = licenses.unfree;

From f6f3baff2a183679dea37f70f6f38391d99b8234 Mon Sep 17 00:00:00 2001
From: V <v@anomalous.eu>
Date: Fri, 4 Sep 2020 07:08:37 +0200
Subject: [PATCH 0040/3942] icon-lang: 9.5.1 -> 9.5.20i

---
 .../interpreters/icon-lang/default.nix        | 46 ++++++++-----------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix
index d85448a9677c..8190dc0f29f4 100644
--- a/pkgs/development/interpreters/icon-lang/default.nix
+++ b/pkgs/development/interpreters/icon-lang/default.nix
@@ -1,45 +1,37 @@
-{ stdenv, fetchFromGitHub, fetchpatch, libX11, libXt, withGraphics ? true }:
+{ stdenv, fetchFromGitHub
+, libX11, libXt
+, withGraphics ? true
+}:
 
 stdenv.mkDerivation rec {
   pname = "icon-lang";
-  version = "9.5.1";
+  version = "9.5.20i";
+
   src = fetchFromGitHub {
     owner = "gtownsend";
     repo = "icon";
-    rev = "rel${builtins.replaceStrings ["."] [""] version}";
-    sha256 = "1gkvj678ldlr1m5kjhx6zpmq11nls8kxa7pyy64whgakfzrypynw";
+    rev = "v${version}";
+    sha256 = "0072b3jk8mc94w818z8bklhjdf9rf0d9a7lkvw40pz3niy7zv84s";
   };
 
   buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ];
 
-  patches = [
-    # Patch on git master, likely won't be necessary in future release
-    (fetchpatch {
-      url = "https://github.com/gtownsend/icon/commit/bfc4a6004d0d3984c8066289b8d8e563640c4ddd.patch";
-      sha256 = "1pqapjghk10rb73a1mfflki2wipjy4kvnravhmrilkqzb9hd6v8m";
-      excludes = [
-        "doc/relnotes.htm"
-        "src/h/version.h"
-      ];
-    })
-  ];
+  configurePhase = let
+    target = if withGraphics then "X-Configure" else "Configure";
+    platform = if stdenv.isLinux  then "linux"
+          else if stdenv.isDarwin then "macintosh"
+          else if stdenv.isBSD    then "bsd"
+          else if stdenv.isCygwin then "cygwin"
+          else if stdenv.isSunOS  then "solaris"
+          else throw "unsupported system";
+  in "make ${target} name=${platform}";
 
-  configurePhase =
-    let
-      _name = if stdenv.isDarwin then "macintosh" else "linux";
-    in
-    ''
-      make ${stdenv.lib.optionalString withGraphics "X-"}Configure name=${_name}
-    '';
-
-  installPhase = ''
-    make Install dest=$out
-  '';
+  installPhase = "make Install dest=$out";
 
   meta = with stdenv.lib; {
     description = ''A very high level general-purpose programming language'';
     maintainers = with maintainers; [ vrthra yurrriq ];
-    platforms = with platforms; linux ++ darwin;
+    platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos;
     license = licenses.publicDomain;
     homepage = "https://www.cs.arizona.edu/icon/";
   };

From a9def8ddbc71033476fe68c358d81524b820d7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Sun, 6 Sep 2020 04:04:19 +0100
Subject: [PATCH 0041/3942] rainloop: allow multiple instances to use the same
 package

---
 pkgs/servers/rainloop/default.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix
index bff5d2ea3062..42c68d5608ed 100644
--- a/pkgs/servers/rainloop/default.nix
+++ b/pkgs/servers/rainloop/default.nix
@@ -24,7 +24,8 @@
          */
         function __get_custom_data_full_path()
         {
-          return '${dataPath}'; // custom data folder path
+          $v = getenv('RAINLOOP_DATA_DIR', TRUE);
+          return $v === FALSE ? '${dataPath}' : $v;
         }
       '';
 
@@ -33,6 +34,8 @@
         cp -r rainloop/* $out
         rm -rf $out/data
         cp ${includeScript} $out/include.php
+        mkdir $out/data
+        chmod 700 $out/data
       '';
 
       meta = with stdenv.lib; {
@@ -44,13 +47,13 @@
         maintainers = with maintainers; [ das_j ];
       };
     });
-  in {
-    rainloop-community = common {
-      edition = "community";
-      sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y";
-    };
-    rainloop-standard = common {
-      edition = "";
-      sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch";
-    };
-  }
+in {
+  rainloop-community = common {
+    edition = "community";
+    sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y";
+  };
+  rainloop-standard = common {
+    edition = "";
+    sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch";
+  };
+}

From f54612264edd7d743488e6469b5f774dbc07e7b7 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Sat, 18 Jul 2020 13:32:48 +0200
Subject: [PATCH 0042/3942] nixos/jack,pulseaudio: fix pulse connection to
 jackd service

This fixes the case when Jack Audio Daemon is running
as a service via `services.jack.jackd` and Pulseaudio
running as a *user* service.

Two issues prevented connecting `pulse` with `jackd`:
* Missing `JACK_PROMISCUOUS_SERVER` environment variable for `pulse` user service,
  resulting in `pulse` trying to access `jackd` as if it was running as part of
  the users session.
* `jackd` not being able to access socket created by `pulse` due to socket
  created using user ID and `users` group. Change allows `jackd` to access
  the socket created by `pulse` correctly.

`pulse` now also autoloads `module-jack-sink` and `module-jack-source`
if `services.jack.jackd.enable` is set.

The default `pulse` package is now set to `pulseaudioFull` automatically
if `services.jack.jackd.enable` is set.
---
 nixos/modules/config/pulseaudio.nix   | 8 +++++++-
 nixos/modules/services/audio/jack.nix | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 408d0a9c33f2..044fa48853db 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -36,6 +36,8 @@ let
         ${addModuleIf cfg.zeroconf.discovery.enable "module-zeroconf-discover"}
         ${addModuleIf cfg.tcp.enable (concatStringsSep " "
            ([ "module-native-protocol-tcp" ] ++ allAnon ++ ipAnon))}
+        ${addModuleIf config.services.jack.jackd.enable "module-jack-sink"}
+        ${addModuleIf config.services.jack.jackd.enable "module-jack-source"}
         ${cfg.extraConfig}
       '';
     };
@@ -144,7 +146,9 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.pulseaudio;
+        default = if config.services.jack.jackd.enable
+                  then pkgs.pulseaudioFull
+                  else pkgs.pulseaudio;
         defaultText = "pkgs.pulseaudio";
         example = literalExample "pkgs.pulseaudioFull";
         description = ''
@@ -284,6 +288,8 @@ in {
             RestartSec = "500ms";
             PassEnvironment = "DISPLAY";
           };
+        } // optionalAttrs config.services.jack.jackd.enable {
+          environment.JACK_PROMISCUOUS_SERVER = "jackaudio";
         };
         sockets.pulseaudio = {
           wantedBy = [ "sockets.target" ];
diff --git a/nixos/modules/services/audio/jack.nix b/nixos/modules/services/audio/jack.nix
index ceff366d0bbb..bee97dbfc6b3 100644
--- a/nixos/modules/services/audio/jack.nix
+++ b/nixos/modules/services/audio/jack.nix
@@ -246,6 +246,9 @@ in {
         description = "JACK Audio Connection Kit";
         serviceConfig = {
           User = "jackaudio";
+          SupplementaryGroups = lib.optional
+            (config.hardware.pulseaudio.enable
+            && !config.hardware.pulseaudio.systemWide) "users";
           ExecStart = "${cfg.jackd.package}/bin/jackd ${lib.escapeShellArgs cfg.jackd.extraOptions}";
           LimitRTPRIO = 99;
           LimitMEMLOCK = "infinity";

From 0a6703019eb72080018e00a4b4ff1bf818de74fb Mon Sep 17 00:00:00 2001
From: Reed <mrnitsuj1@gmail.com>
Date: Wed, 9 Sep 2020 07:18:44 -0400
Subject: [PATCH 0043/3942] noisetorch: 0.5.2-beta -> 0.7.2-beta

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

diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix
index 1739d27870a0..4b6bd07e7432 100644
--- a/pkgs/applications/audio/noisetorch/default.nix
+++ b/pkgs/applications/audio/noisetorch/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "NoiseTorch";
-  version = "0.5.2-beta";
+  version = "0.7.2-beta";
 
   src = fetchFromGitHub {
     owner = "lawl";
     repo = "NoiseTorch";
     rev = version;
-    sha256 = "1q0gfpqczlpybxcjjkiybcy6yc0gnrq8x27r0mpg4pvgwy7mps47";
+    sha256 = "06xlqjma8h7lcnqgc9226blps6m9dp487hk71lslfxj0jkay548k";
   };
 
   patches = [ ./version.patch ./config.patch ./embedlibrnnoise.patch ];

From 24aedc9a1437a048fb14386010e6a0f6bda6b74b Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 10 Sep 2020 16:44:28 +0200
Subject: [PATCH 0044/3942] perlPackages: init
 Catalyst::Authentication::Store::LDAP at 1.016 (and dependencies)

This is part of and effort of adding LDAP support to hydra.
---
 pkgs/top-level/perl-packages.nix | 56 ++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d89bcdf43102..8e329b3e88a5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1674,6 +1674,21 @@ let
     buildInputs = [ TestWarn ];
   };
 
+  CatalystAuthenticationStoreLDAP = buildPerlPackage {
+    pname = "Catalyst-Authentication-Store-LDAP";
+    version = "1.016";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz";
+      sha256 = "0cm399vxqqf05cjgs1j5v3sk4qc6nmws5nfhf52qvpbwc4m82mq8";
+    };
+    propagatedBuildInputs = [ NetLDAP CatalystPluginAuthentication ClassAccessorFast ];
+    buildInputs = [ TestMore TestMockObject TestException NetLDAPServerTest ];
+    meta = {
+      description= "Authentication from an LDAP Directory";
+      license = with stdenv.lib.licenses; [ artistic1 ];
+    };
+  };
+
   CatalystComponentInstancePerContext = buildPerlPackage {
     pname = "Catalyst-Component-InstancePerContext";
     version = "0.001001";
@@ -14584,6 +14599,47 @@ let
     };
   };
 
+  NetLDAPServer = buildPerlPackage {
+    pname = "Net-LDAP-Server";
+    version = "0.43";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz";
+      sha256 = "0qmh3cri3fpccmwz6bhwp78yskrb3qmalzvqn0a23hqbsfs4qv6x";
+    };
+    propagatedBuildInputs = [ NetLDAP ConvertASN1 ];
+    meta = {
+      description = "LDAP server side protocol handling";
+      license = with stdenv.lib.licenses; [ artistic1 ];
+    };
+  };
+
+  NetLDAPSID = buildPerlPackage {
+    pname = "Net-LDAP-SID";
+    version = "0.0001";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-SID-0.001.tar.gz";
+      sha256 = "1mnnpkmj8kpb7qw50sm8h4sd8py37ssy2xi5hhxzr5whcx0cvhm8";
+    };
+    meta = {
+      description= "Active Directory Security Identifier manipulation";
+      license = with stdenv.lib.licenses; [ artistic2 ];
+    };
+  };
+
+  NetLDAPServerTest = buildPerlPackage {
+    pname = "Net-LDAP-Server-Test";
+    version = "0.22";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-Server-Test-0.22.tar.gz";
+      sha256 = "13idip7jky92v4adw60jn2gcc3zf339gsdqlnc9nnvqzbxxp285i";
+    };
+    propagatedBuildInputs = [ NetLDAP NetLDAPServer TestMore DataDump NetLDAPSID ];
+    meta = {
+      description= "test Net::LDAP code";
+      license = with stdenv.lib.licenses; [ artistic1 ];
+    };
+  };
+
   NetNetmask = buildPerlPackage {
     pname = "Net-Netmask";
     version = "1.9104";

From 5a558ea4d9a99f10440dfdb738e726ea09be51dd Mon Sep 17 00:00:00 2001
From: Nicolas Berbiche <nicolas@normie.dev>
Date: Mon, 14 Sep 2020 12:48:14 -0400
Subject: [PATCH 0045/3942] build-erlang-mk: add support for buildFlags

---
 pkgs/development/beam-modules/build-erlang-mk.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix
index 4dedf782b753..4ea8a52601c6 100644
--- a/pkgs/development/beam-modules/build-erlang-mk.nix
+++ b/pkgs/development/beam-modules/build-erlang-mk.nix
@@ -12,6 +12,7 @@
 , configurePhase ? null
 , meta ? {}
 , enableDebugInfo ? false
+, buildFlags ? []
 , ... }@attrs:
 
 with stdenv.lib;
@@ -42,6 +43,10 @@ let
     buildInputs = [ erlang perl which gitMinimal wget ];
     propagatedBuildInputs = beamDeps;
 
+    buildFlags = [ "SKIP_DEPS=1" ]
+      ++ lib.optional (enableDebugInfo || erlang.debugInfo) ''ERL_OPTS="$ERL_OPTS +debug_info"''
+      ++ buildFlags;
+
     configurePhase = if configurePhase == null
     then ''
       runHook preConfigure
@@ -58,7 +63,7 @@ let
     then ''
         runHook preBuild
 
-        make SKIP_DEPS=1 ERL_OPTS="$ERL_OPTS ${debugInfoFlag}"
+        make $buildFlags "''${buildFlagsArray[@]}"
 
         runHook postBuild
     ''

From 8ddc83c67fb5d962cdf898aa21e77bad6860c894 Mon Sep 17 00:00:00 2001
From: Nicolas Berbiche <nicolas@normie.dev>
Date: Tue, 15 Sep 2020 16:47:55 -0400
Subject: [PATCH 0046/3942] build-erlang-mk: preserve passed buildInputs

---
 pkgs/development/beam-modules/build-erlang-mk.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix
index 4ea8a52601c6..c2d1ebabae27 100644
--- a/pkgs/development/beam-modules/build-erlang-mk.nix
+++ b/pkgs/development/beam-modules/build-erlang-mk.nix
@@ -40,7 +40,7 @@ let
     ''
     else setupHook;
 
-    buildInputs = [ erlang perl which gitMinimal wget ];
+    buildInputs = buildInputs ++ [ erlang perl which gitMinimal wget ];
     propagatedBuildInputs = beamDeps;
 
     buildFlags = [ "SKIP_DEPS=1" ]

From a323331e6ad6a82a276966330057a294cb6b0ab3 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 17 Sep 2020 15:33:17 -0300
Subject: [PATCH 0047/3942] dart: Fix dart2native by patching all ELFs

Before:

   $ /nix/store/ihlzjcxahcack6chfzphb74bkccmq6br-dart-2.7.2/bin/dart2native hello.dart
   Failed to generate native files:
   ProcessException: No such file or directory
     Command: /nix/store/ihlzjcxahcack6chfzphb74bkccmq6br-dart-2.7.2/bin/utils/gen_snapshot --snapshot-kind=app-aot-elf --elf=/tmp/HSHJQU/snapshot.aot /tmp/HSHJQU/kernel.dill

After:
   $ /nix/store/czw7kpdmcqa76a9j00v2pjygrq7gy4c7-dart-2.7.2/bin/dart2native hello.dart
   Generated: /home/thiagoko/hello.exe

   $ ./hello.exe
   Hello, World!
---
 pkgs/development/interpreters/dart/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index 050e7f14979c..6ce43d55173b 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -69,9 +69,7 @@ stdenv.mkDerivation {
     mkdir -p $out
     cp -R * $out/
     echo $libPath
-    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-             --set-rpath $libPath \
-             $out/bin/dart
+    find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \;
   '';
 
   libPath = makeLibraryPath [ stdenv.cc.cc ];

From f6464bcad1e68c3cc6c7b96f358dcf8a3d3ce183 Mon Sep 17 00:00:00 2001
From: Alvar Penning <post@0x21.biz>
Date: Sat, 19 Sep 2020 11:48:32 +0200
Subject: [PATCH 0048/3942] dmenu: 4.9 -> 5.0

---
 pkgs/applications/misc/dmenu/default.nix |  6 ++---
 pkgs/applications/misc/dmenu/xim.patch   | 31 ------------------------
 2 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/applications/misc/dmenu/xim.patch

diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index e4d0c82c4176..f83c5fc7f01f 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? [ ./xim.patch ] }:
+{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dmenu-4.9";
+  name = "dmenu-5.0";
 
   src = fetchurl {
     url = "https://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk";
+    sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y";
   };
 
   buildInputs = [ libX11 libXinerama zlib libXft ];
diff --git a/pkgs/applications/misc/dmenu/xim.patch b/pkgs/applications/misc/dmenu/xim.patch
deleted file mode 100644
index f77d48324da4..000000000000
--- a/pkgs/applications/misc/dmenu/xim.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Revert https://git.suckless.org/dmenu/commit/377bd37e212b1ec4c03a481245603c6560d0be22.html
-
-Upstream has reverted it after v4.9 in https://git.suckless.org/dmenu/commit/db6093f6ec1bb884f7540f2512935b5254750b30.html
---- a/dmenu.c
-+++ b/dmenu.c
-@@ -552,7 +552,7 @@ run(void)
- 	XEvent ev;
- 
- 	while (!XNextEvent(dpy, &ev)) {
--		if (XFilterEvent(&ev, None))
-+		if (XFilterEvent(&ev, win))
- 			continue;
- 		switch(ev.type) {
- 		case Expose:
-@@ -664,7 +664,6 @@ setup(void)
- 	                XNClientWindow, win, XNFocusWindow, win, NULL);
- 
- 	XMapRaised(dpy, win);
--	XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
- 	if (embed) {
- 		XSelectInput(dpy, parentwin, FocusChangeMask);
- 		if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
-@@ -730,8 +729,6 @@ main(int argc, char *argv[])
- 
- 	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
- 		fputs("warning: no locale support\n", stderr);
--	if (!XSetLocaleModifiers(""))
--		fputs("warning: no locale modifiers support\n", stderr);
- 	if (!(dpy = XOpenDisplay(NULL)))
- 		die("cannot open display");
- 	screen = DefaultScreen(dpy);

From d784ae8cc2ae9e31468539e8aa75b6e20e5d263e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 21 Sep 2020 18:15:08 +0300
Subject: [PATCH 0049/3942] bump: init at 0.2.2

---
 .../development/tools/github/bump/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/github/bump/default.nix

diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/development/tools/github/bump/default.nix
new file mode 100644
index 000000000000..791b8b7aa916
--- /dev/null
+++ b/pkgs/development/tools/github/bump/default.nix
@@ -0,0 +1,29 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+  pname = "bump";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "mroth";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0092jn7nxnr64fyb2yy9amrd8gl7q9p70a2yq9jrgr1pyrlrazbq";
+  };
+
+  vendorSha256 = "0w5sqg1ii4vp7iijs6ffbskkj2xqggbr40j6wxrjrbjr1qisl8r1";
+
+  doCheck = false;
+
+  buildFlagsArray = [
+    "-ldflags=-X main.buildVersion=${version} -X main.buildCommit=${version} -X main.buildDate=1970-01-01"
+  ];
+
+  meta = with lib; {
+    license = licenses.mit;
+    homepage = "https://github.com/mroth/bump";
+    description = "CLI tool to draft a GitHub Release for the next semantic version";
+    maintainers = with maintainers; [ doronbehar ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86a06d852b67..6aedf982a111 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10696,6 +10696,8 @@ in
 
   buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { };
 
+  bump = callPackage ../development/tools/github/bump { };
+
   libbpf = callPackage ../os-specific/linux/libbpf { };
 
   bpftool = callPackage ../os-specific/linux/bpftool { };

From 2ced276567a6bb40f5de0daa9804373070b7829d Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 22 Sep 2020 14:26:58 +0200
Subject: [PATCH 0050/3942] gem: 2020-03-26 -> 2020-09-22

removing the need for a patch, as that PR has now been merged.
---
 .../audio/pd-plugins/gem/default.nix           | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix
index 2c0d0a24c573..a44ba689a618 100644
--- a/pkgs/applications/audio/pd-plugins/gem/default.nix
+++ b/pkgs/applications/audio/pd-plugins/gem/default.nix
@@ -15,27 +15,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gem-unstable";
-  # The patch below applies to the latest release (v0.94), but then the build
-  # fails. I didn't track down what changed between that version and the
-  # current master that fixes the build on Nix
-  version = "2020-03-26";
+  version = "2020-09-22";
 
   src = fetchFromGitHub {
     owner = "umlaeute";
     repo = "Gem";
-    rev = "f38748d71bfca00e4d2b2f31d6c4e3759c03d599";
-    sha256 = "0bkky5fk0a836bapslrgzil272iq9y704y7hw254cfq5ffjd4qjy";
+    rev = "2edfde4f0587e72ef325e7f53681936dcc19655b";
+    sha256 = "0k5sq128wxi2qhaidspkw310pdgysxs47agv09pkjgvch2n4d5dq";
   };
 
-  patches = [
-    # Update autoconf OpenGL/GLU/GLUT detection scripts
-    # https://github.com/umlaeute/Gem/pull/251
-    (fetchpatch {
-      url = "https://github.com/umlaeute/Gem/commit/343a486c2b5c3427696f77aeabdff440e6590fc7.diff";
-      sha256 = "0gkzxv80rgg8lgp9av5qp6xng3ldhnbjz9d6r7ym784fw8yx41yj";
-    })
-  ];
-
   nativeBuildInputs = [
     autoreconfHook
     file

From ed16fb06cef1fbcf055d7877fa129c8e08b27cae Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 21 Sep 2020 13:24:04 +0300
Subject: [PATCH 0051/3942] qrupdate: Add @doronbehar as maintainer

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

diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index 424502dce0d4..33d98a492cd8 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation {
     description = "Library for fast updating of qr and cholesky decompositions";
     homepage = "https://sourceforge.net/projects/qrupdate/";
     license = licenses.gpl3;
+    maintainers = with maintainers; [ doronbehar ];
     platforms = platforms.unix;
   };
 }

From 9c3f7ad85bf9f823a11d69c41c188135b2ebe7a8 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 21 Sep 2020 13:21:13 +0300
Subject: [PATCH 0052/3942] qrupdate: Add `which` to native build inputs

The build won't fail without it, but it's needed according to:
https://sourceforge.net/p/qrupdate/code/HEAD/tree/test/report_results
---
 pkgs/development/libraries/qrupdate/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index 33d98a492cd8..99fe1289eae5 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -3,6 +3,7 @@
 , gfortran
 , blas
 , lapack
+, which
 }:
 stdenv.mkDerivation {
   name = "qrupdate-1.1.2";
@@ -33,6 +34,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ gfortran blas lapack ];
 
+  nativeBuildInputs = [ which ];
+
   meta = with stdenv.lib; {
     description = "Library for fast updating of qr and cholesky decompositions";
     homepage = "https://sourceforge.net/projects/qrupdate/";

From 81093774683e63f82c63f05784cd39bc4d3f53ab Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 23 Sep 2020 00:20:47 +0300
Subject: [PATCH 0053/3942] qrupdate: refactor & assert compatible blas &&
 lapack

Use `pname` and `version`. Use my preferred indentation style. Use
makeFlagsArray in preBuild instead of overriding configurePhase, per:
https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/explicit-phases.md

Assert that lapack and blas are compatible regarding 64 bit indexing, do
it near evaluation of preBuild, per jtojnar's explanation:
https://github.com/NixOS/nixpkgs/pull/94892#discussion_r471110250

Use gpl3Plus, as gpl3 is unclear and deprecated.
---
 .../libraries/qrupdate/default.nix            | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index 99fe1289eae5..90d4cb45ce2a 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -5,24 +5,33 @@
 , lapack
 , which
 }:
-stdenv.mkDerivation {
-  name = "qrupdate-1.1.2";
+
+stdenv.mkDerivation rec {
+  pname = "qrupdate";
+  version = "1.1.2";
   src = fetchurl {
-    url = "mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz";
+    url = "mirror://sourceforge/qrupdate/${pname}-${version}.tar.gz";
     sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2";
   };
 
-  configurePhase =
-    ''
-      export PREFIX=$out
-      sed -i -e 's,^BLAS=.*,BLAS=-L${blas}/lib -lblas,' \
-          -e 's,^LAPACK=.*,LAPACK=-L${lapack}/lib -llapack,' \
-          Makeconf
-    ''
-    + stdenv.lib.optionalString blas.isILP64
-    ''
-      sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/'
-    '';
+  preBuild =
+    # Check that blas and lapack are compatible
+    assert (blas.isILP64 == lapack.isILP64);
+  # We don't have structuredAttrs yet implemented, and we need to use space
+  # seprated values in makeFlags, so only this works.
+  ''
+    makeFlagsArray+=(
+      "LAPACK=-L${lapack}/lib -llapack"
+      "BLAS=-L${blas}/lib -lblas"
+      "PREFIX=${placeholder "out"}"
+      ${stdenv.lib.optionalString blas.isILP64
+      # Use their FFLAGS along with `-fdefault-integer-8`. If another
+      # application intends to use arpack, it should add this to it's FFLAGS as
+      # well. Otherwise (e.g): https://savannah.gnu.org/bugs/?50339
+      "FFLAGS=-fimplicit-none -O3 -funroll-loops -fdefault-integer-8"
+      }
+    )
+  '';
 
   doCheck = true;
 
@@ -32,14 +41,14 @@ stdenv.mkDerivation {
 
   installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ];
 
-  buildInputs = [ gfortran blas lapack ];
+  buildInputs = [ gfortran ];
 
   nativeBuildInputs = [ which ];
 
   meta = with stdenv.lib; {
     description = "Library for fast updating of qr and cholesky decompositions";
     homepage = "https://sourceforge.net/projects/qrupdate/";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ doronbehar ];
     platforms = platforms.unix;
   };

From 4d9db3bd4a081a13e5f02b015e8dfa7611e73705 Mon Sep 17 00:00:00 2001
From: Thomas Friese <tasmo@tasmo.de>
Date: Wed, 23 Sep 2020 08:53:44 +0200
Subject: [PATCH 0054/3942] bitwig-studio3: 3.2.7 -> 3.2.8

---
 pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index 7e5099f3c318..46c1ce60573a 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
@@ -2,11 +2,11 @@
 
 bitwig-studio1.overrideAttrs (oldAttrs: rec {
   name = "bitwig-studio-${version}";
-  version = "3.2.7";
+  version = "3.2.8";
 
   src = fetchurl {
     url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
-    sha256 = "1mj9kii4bnk5w2p18hypwy8swkpzkaqw98q5fsjq362x4qm0b3py";
+    sha256 = "18ldgmnv7bigb4mch888kjpf4abalpiwmlhwd7rjb9qf6p72fhpj";
   };
 
   buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ];

From 52bdb3eb7bc853873d68187494c2a683ce3084bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 23 Sep 2020 10:44:59 +0200
Subject: [PATCH 0055/3942] nixos/update-users-group: treat all file as utf-8

Ideally we would treat everything as bytes however our database is
already utf-8 encoded so we need to stay compatible.
---
 nixos/modules/config/update-users-groups.pl | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index e1c7a46e4304..979f6464f089 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -98,7 +98,7 @@ sub parseGroup {
     return ($f[0], { name => $f[0], password => $f[1], gid => $gid, members => $f[3] });
 }
 
-my %groupsCur = -f "/etc/group" ? map { parseGroup } read_file("/etc/group") : ();
+my %groupsCur = -f "/etc/group" ? map { parseGroup } read_file("/etc/group", { binmode => ":utf8" }) : ();
 
 # Read the current /etc/passwd.
 sub parseUser {
@@ -109,20 +109,19 @@ sub parseUser {
     return ($f[0], { name => $f[0], fakePassword => $f[1], uid => $uid,
         gid => $f[3], description => $f[4], home => $f[5], shell => $f[6] });
 }
-
-my %usersCur = -f "/etc/passwd" ? map { parseUser } read_file("/etc/passwd") : ();
+my %usersCur = -f "/etc/passwd" ? map { parseUser } read_file("/etc/passwd", { binmode => ":utf8" }) : ();
 
 # Read the groups that were created declaratively (i.e. not by groups)
 # in the past. These must be removed if they are no longer in the
 # current spec.
 my $declGroupsFile = "/var/lib/nixos/declarative-groups";
 my %declGroups;
-$declGroups{$_} = 1 foreach split / /, -e $declGroupsFile ? read_file($declGroupsFile) : "";
+$declGroups{$_} = 1 foreach split / /, -e $declGroupsFile ? read_file($declGroupsFile, { binmode => ":utf8" }) : "";
 
 # Idem for the users.
 my $declUsersFile = "/var/lib/nixos/declarative-users";
 my %declUsers;
-$declUsers{$_} = 1 foreach split / /, -e $declUsersFile ? read_file($declUsersFile) : "";
+$declUsers{$_} = 1 foreach split / /, -e $declUsersFile ? read_file($declUsersFile, { binmode => ":utf8" }) : "";
 
 
 # Generate a new /etc/group containing the declared groups.
@@ -260,7 +259,7 @@ system("nscd --invalidate passwd");
 my @shadowNew;
 my %shadowSeen;
 
-foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow") : ()) {
+foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow", { binmode => ":utf8" }) : ()) {
     chomp $line;
     my ($name, $hashedPassword, @rest) = split(':', $line, -9);
     my $u = $usersOut{$name};;

From f072d4dadcee0b616927f14baf3feb18591a1d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 23 Sep 2020 10:46:02 +0200
Subject: [PATCH 0056/3942] nixos/update-users-groups: fix encoding of json
 database

The issue here is that updateFile expects a unicode string while
encode_json returns a binary string unlike to_json.
---
 nixos/modules/config/update-users-groups.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index 979f6464f089..ddd7efd82f76 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -174,7 +174,7 @@ foreach my $name (keys %groupsCur) {
 # Rewrite /etc/group. FIXME: acquire lock.
 my @lines = map { join(":", $_->{name}, $_->{password}, $_->{gid}, $_->{members}) . "\n" }
     (sort { $a->{gid} <=> $b->{gid} } values(%groupsOut));
-updateFile($gidMapFile, encode_json($gidMap));
+updateFile($gidMapFile, to_json($gidMap));
 updateFile("/etc/group", \@lines);
 system("nscd --invalidate group");
 
@@ -250,7 +250,7 @@ foreach my $name (keys %usersCur) {
 # Rewrite /etc/passwd. FIXME: acquire lock.
 @lines = map { join(":", $_->{name}, $_->{fakePassword}, $_->{uid}, $_->{gid}, $_->{description}, $_->{home}, $_->{shell}) . "\n" }
     (sort { $a->{uid} <=> $b->{uid} } (values %usersOut));
-updateFile($uidMapFile, encode_json($uidMap));
+updateFile($uidMapFile, to_json($uidMap));
 updateFile("/etc/passwd", \@lines);
 system("nscd --invalidate passwd");
 

From 99406adaaee52706201c4277051f4226c1160583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 23 Sep 2020 10:47:39 +0200
Subject: [PATCH 0057/3942] nixos/update-users-groups: write files truly atomic

Having the .tmp suffix is broken w.r.t. to multiple writers,
as they would overwrite existing files. using the atomic flag
will make write_file to create a unique temporary file it gets renamed
to its target.
---
 nixos/modules/config/update-users-groups.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index ddd7efd82f76..86107abae36c 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -16,8 +16,7 @@ my $gidMap = -e $gidMapFile ? decode_json(read_file($gidMapFile)) : {};
 
 sub updateFile {
     my ($path, $contents, $perms) = @_;
-    write_file("$path.tmp", { binmode => ':utf8', perms => $perms // 0644 }, $contents);
-    rename("$path.tmp", $path) or die;
+    write_file($path, { atomic => 1, binmode => ':utf8', perms => $perms // 0644 }, $contents) or die;
 }
 
 

From 522400ed19f72c02b6cea2f29ded402b94990055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= <kuba@kadziolka.net>
Date: Thu, 24 Sep 2020 09:39:03 +0200
Subject: [PATCH 0058/3942] rgbds: add NieDzejkob as maintainer

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

diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index d1a9a7742a86..499a0a5f9369 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
         This is a fork of the original RGBDS which aims to make the programs more like other UNIX tools.
       '';
-    maintainers = with maintainers; [ matthewbauer ];
+    maintainers = with maintainers; [ matthewbauer NieDzejkob ];
     platforms = platforms.all;
   };
 }

From d134095d673ddcb96c1db92bd675f6e36f357040 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Thu, 24 Sep 2020 20:16:16 +0200
Subject: [PATCH 0059/3942] tpm2-tss: 2.4.1 -> 3.0.1

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

diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index 2421d3f88990..c9160083d60f 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tpm2-tss";
-  version = "2.4.1";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = pname;
     rev = version;
-    sha256 = "09x5czaj4a8cyf8cxavcasx3yy1kik1s45a90c7zvxb7y1kfp9zs";
+    sha256 = "10wayqk7h1v3hdyd09rkjjs9989r968dpgf8m0xjqgn7q3y78n61";
   };
 
   nativeBuildInputs = [

From cd2dab91d69aa4987b1d9d5c06f811e7fcd588dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20B=C3=A4renz?= <programming@manuelbaerenz.de>
Date: Tue, 11 Aug 2020 12:21:25 +0200
Subject: [PATCH 0060/3942] Doc -> Languages & Frameworks -> Rust: Update

Add information on declarative overlay usage
---
 doc/languages-frameworks/rust.section.md | 46 ++++++++++++++++++++----
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 0e1d59e1a952..400f39c345cd 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -16,9 +16,9 @@ cargo
 into the `environment.systemPackages` or bring them into
 scope with `nix-shell -p rustc cargo`.
 
-For daily builds (beta and nightly) use either rustup from
-nixpkgs or use the [Rust nightlies
-overlay](#using-the-rust-nightlies-overlay).
+For other versions such as daily builds (beta and nightly),
+use either `rustup` from nixpkgs (which will manage the rust installation in your home directory),
+or use Mozilla's [Rust nightlies overlay](#using-the-rust-nightlies-overlay).
 
 ## Compiling Rust applications with Cargo
 
@@ -478,8 +478,15 @@ Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into
 This overlay can _also_ be used to install recent unstable or stable versions
 of Rust, if desired.
 
-To use this overlay, clone
-[nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla),
+### Rust overlay installation
+
+You can use this overlay by either changing your local nixpkgs configuration,
+or by adding the overlay declaratively in a nix expression,  e.g. in `configuration.nix`.
+For more information see [#sec-overlays-install](the manual on installing overlays).
+
+#### Imperative rust overlay installation
+
+Clone [nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla),
 and create a symbolic link to the file
 [rust-overlay.nix](https://github.com/mozilla/nixpkgs-mozilla/blob/master/rust-overlay.nix)
 in the `~/.config/nixpkgs/overlays` directory.
@@ -488,7 +495,34 @@ in the `~/.config/nixpkgs/overlays` directory.
     $ mkdir -p ~/.config/nixpkgs/overlays
     $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix
 
-The latest version can be installed with the following command:
+### Declarative rust overlay installation
+
+Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar:
+
+```
+  nixpkgs = {
+    overlays = [
+      (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))
+      # Further overlays go here
+    ];
+  };
+```
+
+Note that this will fetch the latest overlay version when rebuilding your system.
+
+### Rust overlay usage
+
+The overlay contains attribute sets corresponding to different versions of the rust toolchain, such as:
+
+* `latest.rustChannels.stable`
+* `latest.rustChannels.nightly`
+* a function `rustChannelOf`, called as `(rustChannelOf { date = "2018-04-11"; channel = "nightly"; })`, or...
+* `(nixpkgs.rustChannelOf { rustToolchain = ./rust-toolchain; })` if you have a local `rust-toolchain` file (see https://github.com/mozilla/nixpkgs-mozilla#using-in-nix-expressions for an example)
+
+Each of these contain packages such as `rust`, which contains your usual rust development tools with the respective toolchain chosen.
+For example, you might want to add `latest.rustChannels.stable.rust` to the list of packages in your configuration.
+
+Imperatively, the latest stable version can be installed with the following command:
 
     $ nix-env -Ai nixos.latest.rustChannels.stable.rust
 

From dc070dd78ab13edc1dc22b38a8c2e04170422783 Mon Sep 17 00:00:00 2001
From: Daniel Duan <daniel@duan.ca>
Date: Sat, 26 Sep 2020 02:03:09 -0700
Subject: [PATCH 0061/3942] tre-command: 0.3.2 -> 0.3.3

---
 pkgs/tools/system/tre-command/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix
index d0f814147414..c3241a04587b 100644
--- a/pkgs/tools/system/tre-command/default.nix
+++ b/pkgs/tools/system/tre-command/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tre-command";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "dduan";
     repo = "tre";
     rev = "v${version}";
-    sha256 = "1kb8jwmjhlp9bk08rb6gq3j810cv9bidm28sa417vyykp9a8p2ky";
+    sha256 = "10c8mpqzpw7m3vrm2vl2rx678z3c37hxpqyh3fn83dlh9f4f0j87";
   };
 
-  cargoSha256 = "0cqkpvq8b2vnqpkd819cdgh4fqr9yns337fgzah4m40ygs25n9iv";
+  cargoSha256 = "0jd6cfs2zi2n34kirpsy12l76whaqwm1pkqa57w1ms5z658z07wj";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 14245d48a433f9470cb9a2072cc2c433078b6f35 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sun, 27 Sep 2020 21:36:20 -0700
Subject: [PATCH 0062/3942] openafs_1_8: Add upstream patches for Linux kernel
 5.8 and 5.9

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/servers/openafs/1.8/module.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index db44dbe2200d..8cb04ea7cdb5 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -18,6 +18,25 @@ in stdenv.mkDerivation {
 
   buildInputs = [ kerberos ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/d7fc5bf9bf031089d80703c48daf30d5b15a80ca.patch";
+      sha256 = "0469ydzgvyvrl1b2s1qbl9cd8c5c1nb99c3z52z5i685da5z6pab";
+    })
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/335f37be13d2ff954e4aeea617ee66502170805e.patch";
+      sha256 = "0jr6cgplnip61cjlcd3fvgsc6n3jhfk93mm9m7ak04w1vc26dk9x";
+    })
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/facff58b840a47853592510617ba7a1da2e3eaa9.patch";
+      sha256 = "0izafg6bi5iaigq3jjx0zlg1cxwaddz3238hk0s08fcb6nyhkvx1";
+    })
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/e7902252f15acfc28453c531f6fa3b29c9c91b92.patch";
+      sha256 = "1jy4v8yx8p6mhma6b3h3g94mb38bw7hg7q6lnyc8bijkbnl0d1rl";
+    })
+  ];
+
   hardeningDisable = [ "pic" ];
 
   configureFlags = [

From 634927a402363d5c155a873d1c70becf7918a559 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Wed, 30 Sep 2020 09:38:30 +1000
Subject: [PATCH 0063/3942] mosdepth: 0.2.9 -> 0.3.1

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

diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
index 1ce6357d2e81..9fdac5fd6a6e 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -17,13 +17,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "mosdepth";
-  version = "0.2.9";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "brentp";
     repo = "mosdepth";
     rev = "v${version}";
-    sha256 = "01gm9gj2x2zs4yx6wk761fi1papi7qr3gp4ln1kkn8n2f9y9h849";
+    sha256 = "1kcrvamrafz1m0s7mlbhaay8jyg97l1w37p6syl36r2m1plmwxjd";
   };
 
   nativeBuildInputs = [ nim ];

From f60fc7f61f6dc0a1b4631e3c5f913d53d7863293 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 30 Sep 2020 10:28:58 -0400
Subject: [PATCH 0064/3942] meson: Remove propagated native C compiler

Now that we have a Meson release containting [1], Meson will work fine
without a native compiler, so we don't need this trick anymore.

Fixes #58831

[1]: https://github.com/mesonbuild/meson/pull/6512
---
 pkgs/development/tools/build-managers/meson/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index aa11ba7638bb..91d618113584 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -3,7 +3,6 @@
 , stdenv
 , writeTextDir
 , substituteAll
-, pkgsHostHost
 , fetchpatch
 }:
 
@@ -63,10 +62,6 @@ python3.pkgs.buildPythonApplication rec {
 
   setupHook = ./setup-hook.sh;
 
-  # Ensure there will always be a native C compiler when meson is used, as a
-  # workaround until https://github.com/mesonbuild/meson/pull/6512 lands.
-  depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ];
-
   # 0.45 update enabled tests but they are failing
   doCheck = false;
   # checkInputs = [ ninja pkgconfig ];

From 5b934ffccace237cdc1a64b2b9f972efe6ab668d Mon Sep 17 00:00:00 2001
From: Bernard Fortz <bernard.fortz@gmail.com>
Date: Wed, 30 Sep 2020 21:26:27 +0200
Subject: [PATCH 0065/3942] bitwig-studio3: jack dependency fixed

---
 pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index 7e5099f3c318..b3ada14ad8ad 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
@@ -1,4 +1,4 @@
-{ fetchurl, bitwig-studio1, pulseaudio, xorg }:
+{ fetchurl, bitwig-studio1, pulseaudio, libjack2, xorg }:
 
 bitwig-studio1.overrideAttrs (oldAttrs: rec {
   name = "bitwig-studio-${version}";
@@ -11,7 +11,7 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec {
 
   buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ];
 
-  runtimeDependencies = [ pulseaudio ];
+  runtimeDependencies = [ pulseaudio libjack2 ];
 
   installPhase = ''
     ${oldAttrs.installPhase}

From 43b32e6f487619a916f71d30dff8d66eacda236a Mon Sep 17 00:00:00 2001
From: Nicolas Berbiche <nicolas@normie.dev>
Date: Wed, 30 Sep 2020 16:35:34 -0400
Subject: [PATCH 0066/3942] fractal: mark broken on Darwin

---
 .../networking/instant-messengers/fractal/default.nix            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 68e7282870ba..67a40b1dc33c 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -92,6 +92,7 @@ rustPlatform.buildRustPackage rec {
     description = "Matrix group messaging app";
     homepage = "https://gitlab.gnome.org/GNOME/fractal";
     license = licenses.gpl3;
+    broken = stdenv.isDarwin;
     maintainers = with maintainers; [ dtzWill worldofpeace ];
   };
 }

From 8c72cf16fa2713aa808d5a3d37103e76b929d8db Mon Sep 17 00:00:00 2001
From: Sumner Evans <me@sumnerevans.com>
Date: Mon, 28 Sep 2020 11:01:38 -0600
Subject: [PATCH 0067/3942] nixos/redshift: add executable option

Added ability to configure the executable that the redshift service
uses.
---
 nixos/modules/services/x11/redshift.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 21b0b33553ac..60d80a28762b 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -82,6 +82,15 @@ in {
       '';
     };
 
+    executable = mkOption {
+      type = types.str;
+      default = "/bin/redshift";
+      example = "/bin/redshift-gtk";
+      description = ''
+        Redshift executable to use within the package.
+      '';
+    };
+
     extraOptions = mkOption {
       type = types.listOf types.str;
       default = [];
@@ -114,7 +123,7 @@ in {
       partOf = [ "graphical-session.target" ];
       serviceConfig = {
         ExecStart = ''
-          ${cfg.package}/bin/redshift \
+          ${cfg.package}${cfg.executable} \
             -l ${providerString} \
             -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
             -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \

From 5204792cad55b2ba1dda3ee5515526e865ce792b Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch+nixos@orlives.de>
Date: Thu, 1 Oct 2020 02:35:05 +0200
Subject: [PATCH 0068/3942] mplayer: allow enabling v4l2 driver for e.g webcams

- add flag for enabling v4l2 support for the tv backend
- required for some webcams
- off by default as no other package seems to be relying on it so far
---
 pkgs/applications/video/mplayer/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index f00b5aabf977..86047239cc56 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -21,6 +21,7 @@
 , jackaudioSupport ? false, libjack2 ? null
 , pulseSupport ? config.pulseaudio or false, libpulseaudio ? null
 , bs2bSupport ? false, libbs2b ? null
+, v4lSupport ? false, libv4l ? null
 # For screenshots
 , libpngSupport ? true, libpng ? null
 , libjpegSupport ? true, libjpeg ? null
@@ -53,6 +54,7 @@ assert pulseSupport -> libpulseaudio != null;
 assert bs2bSupport -> libbs2b != null;
 assert libpngSupport -> libpng != null;
 assert libjpegSupport -> libjpeg != null;
+assert v4lSupport -> libv4l != null;
 
 let
 
@@ -132,6 +134,7 @@ stdenv.mkDerivation rec {
     ++ optional libpngSupport libpng
     ++ optional libjpegSupport libjpeg
     ++ optional bs2bSupport libbs2b
+    ++ optional v4lSupport libv4l
     ++ (with darwin.apple_sdk.frameworks; optionals stdenv.isDarwin [ Cocoa OpenGL ])
     ;
 
@@ -156,6 +159,7 @@ stdenv.mkDerivation rec {
     (if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc")
     (if jackaudioSupport then "" else "--disable-jack")
     (if pulseSupport then "--enable-pulse" else "--disable-pulse")
+    (if v4lSupport then "--enable-v4l2 --enable-tv-v4l2" else "--disable-v4l2 --disable-tv-v4l2")
     "--disable-xanim"
     "--disable-ivtv"
     "--disable-xvid --disable-xvid-lavc"

From ce07fef9f4cadd7fcc3adfc4b25ccdad187d1336 Mon Sep 17 00:00:00 2001
From: yihuang <yi.codeplayer@gmail.com>
Date: Thu, 1 Oct 2020 07:16:27 +0800
Subject: [PATCH 0069/3942] openethereum: linux -> unix, remove systemd from
 buildInputs

---
 pkgs/applications/blockchains/openethereum/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix
index 7d5acc62050d..8ff65ec92a9d 100644
--- a/pkgs/applications/blockchains/openethereum/default.nix
+++ b/pkgs/applications/blockchains/openethereum/default.nix
@@ -5,7 +5,9 @@
 , llvmPackages
 , openssl
 , pkg-config
+, stdenv
 , systemd
+, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -31,7 +33,9 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs = [ openssl systemd ];
+  buildInputs = [ openssl ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ systemd ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
 
   cargoBuildFlags = [ "--features final" ];
 
@@ -43,6 +47,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "http://parity.io/ethereum";
     license = licenses.gpl3;
     maintainers = with maintainers; [ akru xrelkd ];
-    platforms = platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From c41302d262e7cc6f27abbc5b942384bb02ea901a Mon Sep 17 00:00:00 2001
From: Joe Lancaster <joe.a.lancas@gmail.com>
Date: Thu, 1 Oct 2020 10:34:23 +0100
Subject: [PATCH 0070/3942] maintainers: add joelancaster

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 33e34fbab333..39ca5a000c9d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4035,6 +4035,12 @@
     githubId = 60272884;
     name = "Jonathan Jeppener-Haltenhoff";
   };
+  joelancaster = {
+    email = "joe.a.lancas@gmail.com";
+    github = "joelancaster";
+    githubId = 16760945;
+    name = "Joe Lancaster";
+  };
   joelburget = {
     email = "joelburget@gmail.com";
     github = "joelburget";

From 59c4870a9691d23fd4372af53fff740e4e66cfab Mon Sep 17 00:00:00 2001
From: Denys Pavlov <me@denys.me>
Date: Thu, 1 Oct 2020 19:19:49 -0400
Subject: [PATCH 0071/3942] maintainers: add meatcar

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 33e34fbab333..35cf19572e24 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5452,6 +5452,12 @@
       fingerprint = "D709 03C8 0BE9 ACDC 14F0  3BFB 77BF E531 397E DE94";
     }];
   };
+  meatcar = {
+    email = "nixpkgs@denys.me";
+    github = "meatcar";
+    githubId = 191622;
+    name = "Denys Pavlov";
+  };
   meditans = {
     email = "meditans@gmail.com";
     github = "meditans";

From b91277425762884b19a003c6dfc8ec122df914c0 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 2 Oct 2020 13:53:35 +0200
Subject: [PATCH 0072/3942] pt2-clone: only build on little-endian systems

---
 pkgs/applications/audio/pt2-clone/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix
index eaabcf4bef7d..58538108e63f 100644
--- a/pkgs/applications/audio/pt2-clone/default.nix
+++ b/pkgs/applications/audio/pt2-clone/default.nix
@@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
     homepage = "https://16-bits.org/pt2.php";
     license = licenses.bsd3;
     maintainers = with maintainers; [ fgaz ];
-    platforms = platforms.all;
+    # From HOW-TO-COMPILE.txt:
+    # > This code is NOT big-endian compatible
+    platforms = platforms.littleEndian;
   };
 }
 

From 672ab0d63a45a04d89afc3369da2bc52fcb54473 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 2 Oct 2020 13:53:45 +0200
Subject: [PATCH 0073/3942] ft2-clone: only build on little-endian systems

---
 pkgs/applications/audio/ft2-clone/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index aa4f12268916..ac18547acae5 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -24,7 +24,9 @@ stdenv.mkDerivation rec {
     homepage = "https://16-bits.org/ft2.php";
     license = licenses.bsd3;
     maintainers = with maintainers; [ fgaz ];
-    platforms = platforms.all;
+    # From HOW-TO-COMPILE.txt:
+    # > This code is NOT big-endian compatible
+    platforms = platforms.littleEndian;
   };
 }
 

From 5778446619ef4fd1b73e0274d98c387f1151d3ae Mon Sep 17 00:00:00 2001
From: Pawel Kruszewski <kruszewsky@gmail.com>
Date: Sat, 3 Oct 2020 23:00:35 +0200
Subject: [PATCH 0074/3942] bcompare: 4.3.5.24893 -> 4.3.7.25118

---
 pkgs/applications/version-management/bcompare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix
index 1af64f8e6df5..5da3aee5d7b6 100644
--- a/pkgs/applications/version-management/bcompare/default.nix
+++ b/pkgs/applications/version-management/bcompare/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bcompare";
-  version = "4.3.5.24893";
+  version = "4.3.7.25118";
 
   src = fetchurl {
     url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
-    sha256 = "1gm8d6hgdg8f3hd83wqac28gkvz5nyn62wj7x44vmr60dh4i2jfn";
+    sha256 = "165d6d81vy29pr62y4rcvl4abqqhfwdzcsx77p0dqlzgqswj88v8";
   };
 
   unpackPhase = ''

From 024f5b30e0a3231dbe99c30192f92ba0058d95f5 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sun, 4 Oct 2020 14:54:37 +0100
Subject: [PATCH 0075/3942] conftest: fix version command

---
 pkgs/development/tools/conftest/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index ee048466a3d5..4f2ee6e612d0 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -15,10 +15,12 @@ buildGoModule rec {
 
   doCheck = false;
 
-  buildFlagsArray = ''
-    -ldflags=
-        -X main.version=${version}
-  '';
+  buildFlagsArray = [
+    "-ldflags="
+    "-s"
+    "-w"
+    "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}"
+  ];
 
   meta = with lib; {
     description = "Write tests against structured configuration data";

From 94fd56594a6543fac73e972952d87ed635cfbda4 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sun, 4 Oct 2020 14:58:32 +0100
Subject: [PATCH 0076/3942] conftest: add longDescription

---
 pkgs/development/tools/conftest/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index 4f2ee6e612d0..c49cd8685fb6 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -24,6 +24,16 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "Write tests against structured configuration data";
+    longDescription = ''
+      Conftest helps you write tests against structured configuration data.
+      Using Conftest you can write tests for your Kubernetes configuration,
+      Tekton pipeline definitions, Terraform code, Serverless configs or any
+      other config files.
+
+      Conftest uses the Rego language from Open Policy Agent for writing the
+      assertions. You can read more about Rego in 'How do I write policies' in
+      the Open Policy Agent documentation.
+    '';
     inherit (src.meta) homepage;
     license = licenses.asl20;
     maintainers = with maintainers; [ yurrriq ];

From 4bf5dd0d3c0ecb0af528dc3846ac71f3c3f296e0 Mon Sep 17 00:00:00 2001
From: Frank Doepper <fd@taz.de>
Date: Wed, 23 Oct 2019 19:09:33 +0200
Subject: [PATCH 0077/3942] fdroidserver: fix gradlew-fdroid interpreter

---
 pkgs/development/tools/fdroidserver/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix
index 2b96830b0022..1b0c44f57548 100644
--- a/pkgs/development/tools/fdroidserver/default.nix
+++ b/pkgs/development/tools/fdroidserver/default.nix
@@ -23,6 +23,7 @@ python.pkgs.buildPythonApplication rec {
     ${python.interpreter} setup.py compile_catalog
   '';
   postInstall = ''
+    patchShebangs gradlew-fdroid
     install -m 0755 gradlew-fdroid $out/bin
   '';
 

From 674c9afb727e4558e3b6162bb164e847606b105c Mon Sep 17 00:00:00 2001
From: Benjamin Andresen <b@lambda.icu>
Date: Tue, 14 Jul 2020 21:11:37 +0200
Subject: [PATCH 0078/3942] graalvm{8,11}-ce: init at 20.2.0

---
 .../compilers/graalvm/community-edition.nix   | 167 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +
 2 files changed, 171 insertions(+)
 create mode 100644 pkgs/development/compilers/graalvm/community-edition.nix

diff --git a/pkgs/development/compilers/graalvm/community-edition.nix b/pkgs/development/compilers/graalvm/community-edition.nix
new file mode 100644
index 000000000000..71f3b1560c67
--- /dev/null
+++ b/pkgs/development/compilers/graalvm/community-edition.nix
@@ -0,0 +1,167 @@
+{ stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath }:
+
+let
+  common = javaVersion:
+    let
+      graalvmXXX-ce = stdenv.mkDerivation rec {
+        pname = "graalvm${javaVersion}-ce";
+        version = "20.2.0";
+        srcs = [
+          (fetchurl {
+             sha256 = {  "8" = "1s64zkkrns1ykh6dwpjrqy0hs9m1bb08cf7ss7msx33h9ivir5b0";
+                        "11" = "0aaf0sjsnlckhgsh3j4lph0shahw6slf4yndqcm2swc8i1dlpdsx";
+                      }.${javaVersion};
+             url    = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersion}-linux-amd64-${version}.tar.gz";
+          })
+          (fetchurl {
+             sha256 = {  "8" = "1cisyyzab4pdvzavnivhy9w6dwn36ybaxw40w767m142fbi06m3b";
+                        "11" = "0p4j6mxajmb0xl41c79154pk4vb8bffgg1nmwislahqjky9jkd4j";
+                      }.${javaVersion};
+             url    = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersion}-linux-amd64-${version}.jar";
+          })
+          (fetchurl {
+             sha256 = {  "8" = "0rwwvk1mkfnl0b50xg7kh6015kjmsw2ra0ckrzmabl88z4bnzh2y";
+                        "11" = "0lc9as2a00j74lp7jby4p10vn5bbkiydzvzk28zfcbsp28p4wvwn";
+                      }.${javaVersion};
+             url    = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersion}-linux-amd64-${version}.jar";
+          })
+          (fetchurl {
+             sha256 = {  "8" = "0mj8p72qgvvrwpsbk0bsqldynlz1wq07icf951wq5xdbr0whj1gz";
+                        "11" = "1lkszqn4islsza011iabayv6riym0dwnkv83pkmk06b230qjfhzb";
+                      }.${javaVersion};
+             url    = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersion}-linux-amd64-${version}.jar";
+          })
+          (fetchurl {
+             sha256 = {  "8" = "1br7camk7y8ych43ws57096100f9kzjvqznh2flmws78ipcrrb66";
+                        "11" = "10swxspjvzh0j82lbpy38dckk69lw1pawqkhnj1hxd05ls36fwq5";
+                      }.${javaVersion};
+             url    = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersion}-linux-amd64-${version}.jar";
+          })
+        ];
+        nativeBuildInputs = [ unzip perl ];
+        unpackPhase = ''
+           unpack_jar() {
+             jar=$1
+             unzip -o $jar -d $out
+             perl -ne 'use File::Path qw(make_path);
+                       use File::Basename qw(dirname);
+                       if (/^(.+) = (.+)$/) {
+                         make_path dirname("$ENV{out}/$1");
+                         system "ln -s $2 $ENV{out}/$1";
+                       }' $out/META-INF/symlinks
+             perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) {
+                         my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4  eq 'x' ? 0100 : 0) +
+                                    ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7  eq 'x' ? 0010 : 0) +
+                                    ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0);
+                         chmod $mode, "$ENV{out}/$1";
+                       }' $out/META-INF/permissions
+             rm -rf $out/META-INF
+           }
+
+           mkdir -p $out
+           arr=($srcs)
+           tar xf ''${arr[0]} -C $out --strip-components=1
+           unpack_jar ''${arr[1]}
+           unpack_jar ''${arr[2]}
+           unpack_jar ''${arr[3]}
+           unpack_jar ''${arr[4]}
+        '';
+
+        installPhase = {
+          "8" = ''
+            # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
+            substituteInPlace $out/jre/lib/security/java.security \
+              --replace file:/dev/random    file:/dev/./urandom \
+              --replace NativePRNGBlocking  SHA1PRNG
+
+            # provide libraries needed for static compilation
+            for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do
+              ln -s $f $out/jre/lib/svm/clibraries/linux-amd64/$(basename $f)
+            done
+
+            # allow using external truffle-api.jar and languages not included in the distrubution
+            rm $out/jre/lib/jvmci/parentClassLoader.classpath
+          '';
+          "11" = ''
+            # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
+            substituteInPlace $out/conf/security/java.security \
+              --replace file:/dev/random    file:/dev/./urandom \
+              --replace NativePRNGBlocking  SHA1PRNG
+
+            # provide libraries needed for static compilation
+            for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do
+              ln -s $f $out/lib/svm/clibraries/linux-amd64/$(basename $f)
+            done
+           '';
+        }.${javaVersion};
+
+        dontStrip = true;
+
+        # copy-paste openjdk's preFixup
+        preFixup = ''
+          # Set JAVA_HOME automatically.
+          mkdir -p $out/nix-support
+          cat <<EOF > $out/nix-support/setup-hook
+            if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
+          EOF
+        '';
+
+        postFixup = ''
+          rpath="${ {  "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64";
+                      "11" = "$out/lib/jli:$out/lib/server:$out/lib";
+                    }.${javaVersion}
+                 }:${
+            stdenv.lib.makeLibraryPath [
+              stdenv.cc.cc.lib # libstdc++.so.6
+              zlib             # libz.so.1
+            ]}"
+
+          for f in $(find $out -type f -perm -0100); do
+            patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
+            patchelf --set-rpath   "$rpath"                                    "$f" || true
+
+            if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi
+          done
+        '';
+
+        propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables
+
+        doInstallCheck = true;
+        installCheckPhase = ''
+          echo ${stdenv.lib.escapeShellArg ''
+                   public class HelloWorld {
+                     public static void main(String[] args) {
+                       System.out.println("Hello World");
+                     }
+                   }
+                 ''} > HelloWorld.java
+          $out/bin/javac HelloWorld.java
+
+          # run on JVM with Graal Compiler
+          $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
+
+          # Ahead-Of-Time compilation
+          $out/bin/native-image --no-server HelloWorld
+          ./helloworld | fgrep 'Hello World'
+
+          # Ahead-Of-Time compilation with --static
+          $out/bin/native-image --no-server --static HelloWorld
+          ./helloworld | fgrep 'Hello World'
+        '';
+
+        passthru.home = graalvmXXX-ce;
+
+        meta = with stdenv.lib; {
+          homepage = "https://www.graalvm.org/";
+          description = "High-Performance Polyglot VM";
+          license = with licenses; [ upl gpl2Classpath bsd3 ];
+          maintainers = with maintainers; [ bandresen volth hlolli glittershark ];
+          platforms = [ "x86_64-linux" ];
+        };
+      };
+    in
+      graalvmXXX-ce;
+in {
+  graalvm8-ce  = common  "8";
+  graalvm11-ce = common "11";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7bc4f4b2c3b0..911c1004a5e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9265,6 +9265,10 @@ in
     inherit (darwin) libiconv libobjc libresolv;
   }) mx jvmci8 graalvm8;
 
+  inherit (callPackages ../development/compilers/graalvm/community-edition.nix { })
+    graalvm8-ce
+    graalvm11-ce;
+
   inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { })
     graalvm8-ee
     graalvm11-ee;

From 3a5b3ef85e8ef3cf7ecfa3ae7b1823d068e04933 Mon Sep 17 00:00:00 2001
From: Joe Lancaster <joe.a.lancas@gmail.com>
Date: Thu, 1 Oct 2020 10:35:05 +0100
Subject: [PATCH 0079/3942] dnadd: init at v1.0.0

---
 pkgs/tools/nix/dnadd/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/nix/dnadd/default.nix

diff --git a/pkgs/tools/nix/dnadd/default.nix b/pkgs/tools/nix/dnadd/default.nix
new file mode 100644
index 000000000000..eff99743f1e1
--- /dev/null
+++ b/pkgs/tools/nix/dnadd/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "dnadd";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "JoeLancaster";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1vzbgz8y9gj4lszsx4iczfbrj373sl4wi43j7rp46zfcbw323d4r";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/joelancaster/dnadd";
+    description = "Adds packages declaratively on the command line";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ joelancaster ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d1f7f042558..1f2ccc9dd65f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27243,6 +27243,8 @@ in
 
   nixdoc = callPackage ../tools/nix/nixdoc {};
 
+  dnadd = callPackage ../tools/nix/dnadd { };
+
   nix-doc = callPackage ../tools/package-management/nix-doc { };
 
   nix-bundle = callPackage ../tools/package-management/nix-bundle { };

From a3022613181fb1f1ef4e3ea7a45fa9c6b877715a Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Tue, 6 Oct 2020 16:46:50 +0200
Subject: [PATCH 0080/3942] key: init at 2.6.3

---
 .../science/logic/key/default.nix             | 74 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 76 insertions(+)
 create mode 100644 pkgs/applications/science/logic/key/default.nix

diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix
new file mode 100644
index 000000000000..b08c4d84d1fc
--- /dev/null
+++ b/pkgs/applications/science/logic/key/default.nix
@@ -0,0 +1,74 @@
+{ stdenv
+, fetchurl
+, unzip
+, jdk
+, ant
+, jre
+, makeWrapper
+, runCommand
+, key
+}:
+
+# get this from the download URL when changing version
+let gitRevision = "7d3deab0763c88edee4f7a08e604661e0dbdd450";
+
+in stdenv.mkDerivation rec {
+  pname = "key";
+  version = "2.6.3";
+
+  src = fetchurl {
+    url = "https://formal.iti.kit.edu/key/releases/${version}/key-src-${version}_${gitRevision}.zip";
+    sha256 = "1dr5jmrqs0iy76wdsfiv5hx929i24yzm1xypzqqvx7afc7apyawy";
+  };
+
+  sourceRoot = "key";
+
+  nativeBuildInputs = [
+    unzip
+    jdk
+    ant
+    makeWrapper
+  ];
+
+  buildPhase = ''
+    ant -buildfile scripts/build.xml \
+      -Dgit.revision=${gitRevision} \
+      compileAll deployAll
+  '';
+
+  postCheck = ''
+    ant -buildfile scripts/build.xml \
+      -Dgit.revision=${gitRevision} \
+      compileAllTests runAllTests test-deploy-all
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/java
+    # Wrong version in the code. On next version change 2.5 to ${version}:
+    unzip deployment/key-2.5_${gitRevision}.zip -d $out/share/java
+    mkdir -p $out/bin
+    makeWrapper ${jre}/bin/java $out/bin/KeY \
+      --add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main"
+  '';
+
+  passthru.tests.check-version = runCommand "key-help" {} ''
+    ${key}/bin/KeY --help | grep 2.5 # Wrong version in the code. On next version change to ${version}
+    touch $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Java formal verification tool";
+    homepage = "https://www.key-project.org"; # also https://formal.iti.kit.edu/key/
+    longDescription = ''
+      The KeY System is a formal software development tool that aims to
+      integrate design, implementation, formal specification, and formal
+      verification of object-oriented software as seamlessly as possible.
+      At the core of the system is a novel theorem prover for the first-order
+      Dynamic Logic for Java with a user-friendly graphical interface.
+    '';
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ fgaz ];
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa293f56ba94..885f00ef08e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26166,6 +26166,8 @@ in
       else smlnj;
   };
 
+  key = callPackage ../applications/science/logic/key { };
+
   lean = callPackage ../applications/science/logic/lean {};
   lean2 = callPackage ../applications/science/logic/lean2 {};
   lean3 = lean;

From b125b88783c6d7aa39e98cd4d9d8f857c257c398 Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <ignat.loskutov@gmail.com>
Date: Tue, 6 Oct 2020 22:47:34 +0300
Subject: [PATCH 0081/3942] datagrip: remove loskutov from maintainers

I haven't been actively maintaining this derivation; provided that updates are made by scripts, it looks like it's time to finally abandon it.
---
 pkgs/applications/editors/jetbrains/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index d54513971a8a..ed2720ffa6ed 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -90,7 +90,7 @@ let
           It allows you to quickly migrate and refactor relational databases,
           construct efficient, statically checked SQL queries and much more.
         '';
-        maintainers = with maintainers; [ loskutov ];
+        maintainers = with maintainers; [ ];
         platforms = platforms.linux;
       };
     });

From 69ef15309ddd50dee55e22a9e0a8bea68c273232 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Oct 2020 01:03:01 +0200
Subject: [PATCH 0082/3942] python3Packages.irctokens: init at 2.0.0

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

diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix
new file mode 100644
index 000000000000..037a5f0520fd
--- /dev/null
+++ b/pkgs/development/python-modules/irctokens/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pyyaml
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "irctokens";
+  version = "2.0.0";
+  disabled = pythonOlder "3.6";  # f-strings
+
+  src = fetchFromGitHub {
+    owner = "jesopo";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0kpxn5paailm4xpdlnzxrhjrfgvvg5pp327wd8kl41a0wbqkj4zb";
+  };
+
+  checkInputs = [ pyyaml ];
+  checkPhase = ''
+    ${python.interpreter} -m unittest test
+  '';
+
+  pythonImportsCheck = [ "irctokens" ];
+
+  meta = with lib; {
+    description = "RFC1459 and IRCv3 protocol tokeniser library for python3";
+    license = licenses.mit;
+    homepage = "https://github.com/jesopo/irctokens";
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4928fdd7c16e..8e7a9247edbd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2965,6 +2965,8 @@ in {
 
   irc = callPackage ../development/python-modules/irc { };
 
+  irctokens = callPackage ../development/python-modules/irctokens { };
+
   isbnlib = callPackage ../development/python-modules/isbnlib { };
 
   islpy = callPackage ../development/python-modules/islpy { };

From 11ce4d215d619d6b0fc7a9f716a106fff2e38731 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Oct 2020 01:11:43 +0200
Subject: [PATCH 0083/3942] python3Packages.ircstates: init at 0.11.3

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

diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix
new file mode 100644
index 000000000000..857b0358aff2
--- /dev/null
+++ b/pkgs/development/python-modules/ircstates/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, pythonOlder
+, irctokens
+, pendulum
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "ircstates";
+  version = "0.11.3";
+  disabled = pythonOlder "3.6";  # f-strings
+
+  src = fetchFromGitHub {
+    owner = "jesopo";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1v8r6ma8gzvn5ym3xx9qlb0rc4l67pxr3z8njzk1ffxn1x3mxd3i";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "relax-pendulum-version.patch";
+      url = "https://github.com/jesopo/ircstates/commit/f51f1b689e592020d1c91ccab6c03927aadb9f94.patch";
+      sha256 = "0qbp3b9hlqbbx7b474q1mcgnzzzwcm4g89x26iqgmlgxzmv3y5xp";
+    })
+  ];
+
+  propagatedBuildInputs = [
+    irctokens
+    pendulum
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest test
+  '';
+
+  pythonImportsCheck = [ "ircstates" ];
+
+  meta = with lib; {
+    description = "sans-I/O IRC session state parsing library";
+    license = licenses.mit;
+    homepage = "https://github.com/jesopo/ircstates";
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8e7a9247edbd..aeec113524bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2965,6 +2965,8 @@ in {
 
   irc = callPackage ../development/python-modules/irc { };
 
+  ircstates = callPackage ../development/python-modules/ircstates { };
+
   irctokens = callPackage ../development/python-modules/irctokens { };
 
   isbnlib = callPackage ../development/python-modules/isbnlib { };

From 13d1db923c293ec76a1ad8c5251a4d4b9305f678 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Oct 2020 01:34:35 +0200
Subject: [PATCH 0084/3942] python3Packages.anyio: init at 2.0.2

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

diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
new file mode 100644
index 000000000000..516b8520f00e
--- /dev/null
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, idna
+, sniffio
+, typing-extensions
+, curio
+, hypothesis
+, pytestCheckHook
+, trio
+, trustme
+, uvloop
+}:
+
+buildPythonPackage rec {
+  pname = "anyio";
+  version = "2.0.2";
+  format = "pyproject";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "agronholm";
+    repo = pname;
+    rev = version;
+    sha256 = "06nazfrm2sclp3lpgsn9wl8vmqxvx36s3gr2gnqz3zhjpf3glkxv";
+  };
+
+  propagatedBuildInputs = [
+    idna
+    sniffio
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    typing-extensions
+  ];
+
+  checkInputs = [
+    curio
+    hypothesis
+    pytestCheckHook
+    trio
+    trustme
+    uvloop
+  ];
+
+  pytestFlagsArray = [
+    # lots of DNS lookups
+    "--ignore=tests/test_sockets.py"
+  ];
+
+  pythonImportsCheck = [ "anyio" ];
+
+  meta = with lib; {
+    description = "High level compatibility layer for multiple asynchronous event loop implementations on Python";
+    homepage = "https://github.com/agronholm/anyio";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aeec113524bb..3f7524840f86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -320,6 +320,8 @@ in {
 
   antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; };
 
+  anyio = callPackage ../development/python-modules/anyio { };
+
   anyjson = callPackage ../development/python-modules/anyjson { };
 
   anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; };

From e364d10db536eeef51a0d63a7570e251dc9d757d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Oct 2020 01:44:16 +0200
Subject: [PATCH 0085/3942] python3Packages.asyncio-throttle: init at 1.0.1

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

diff --git a/pkgs/development/python-modules/asyncio-throttle/default.nix b/pkgs/development/python-modules/asyncio-throttle/default.nix
new file mode 100644
index 000000000000..bf08aec41a5b
--- /dev/null
+++ b/pkgs/development/python-modules/asyncio-throttle/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "asyncio-throttle";
+  version = "1.0.1";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "hallazzang";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0raqnrnp42cn1c7whbm7ajbgaczx33k6hbxsj30nh998pqxhh4sj";
+  };
+
+  checkInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "asyncio_throttle" ];
+
+  meta = with lib; {
+    description = "Simple, easy-to-use throttler for asyncio";
+    homepage = "https://github.com/hallazzang/asyncio-throttle";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f7524840f86..86da89347193 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -426,6 +426,8 @@ in {
 
   async_generator = callPackage ../development/python-modules/async_generator { };
 
+  asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { };
+
   asyncpg = callPackage ../development/python-modules/asyncpg { };
 
   asyncssh = callPackage ../development/python-modules/asyncssh { };

From c70681f33429c524210c6bfbd8d5337d679294f6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Oct 2020 02:23:27 +0200
Subject: [PATCH 0086/3942] python3Packages.async_stagger: init at 0.3.0

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

diff --git a/pkgs/development/python-modules/async_stagger/default.nix b/pkgs/development/python-modules/async_stagger/default.nix
new file mode 100644
index 000000000000..034a8329b121
--- /dev/null
+++ b/pkgs/development/python-modules/async_stagger/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, pythonOlder
+, pytestCheckHook
+, pytest-asyncio
+, pytest-mock
+}:
+
+buildPythonPackage rec {
+  pname = "async_stagger";
+  version = "0.3.0";
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "007l54fbk2dfzv3vmqz98m1i37mzxkkva5r4fiwq2pg8nb61fy0w";
+  };
+
+  patches = [
+    (fetchpatch {
+      # Fix test failures on Python 3.8
+      # https://github.com/twisteroidambassador/async_stagger/issues/4
+      url = "https://github.com/twisteroidambassador/async_stagger/commit/736ab20ff9c172628d911f1e6f72420399ec9631.patch";
+      sha256 = "1ygqd9n56sj83lvgmv6nrx3m0sp3646s5k7z697qx43xslixj731";
+    })
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    pytest-asyncio
+    pytest-mock
+  ];
+
+  pythonImportsCheck = [ "async_stagger" ];
+
+  meta = with lib; {
+    description = "Happy Eyeballs connection algorithm and underlying scheduling logic in asyncio";
+    homepage = "https://github.com/twisteroidambassador/async_stagger";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86da89347193..1c8fee71e3e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -432,6 +432,8 @@ in {
 
   asyncssh = callPackage ../development/python-modules/asyncssh { };
 
+  async_stagger = callPackage ../development/python-modules/async_stagger { };
+
   asynctest = callPackage ../development/python-modules/asynctest { };
 
   async-timeout = callPackage ../development/python-modules/async_timeout { };

From f31f1020bc9b823dc54d8c5018c4e0454f5fe0c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Oct 2020 02:39:44 +0200
Subject: [PATCH 0087/3942] python3Packages.ircrobots: init at 0.3.3

---
 .../python-modules/ircrobots/default.nix      | 52 +++++++++++++++++++
 .../ircrobots/relax-dependencies.patch        | 14 +++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/python-modules/ircrobots/default.nix
 create mode 100644 pkgs/development/python-modules/ircrobots/relax-dependencies.patch

diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix
new file mode 100644
index 000000000000..359cf3e6934f
--- /dev/null
+++ b/pkgs/development/python-modules/ircrobots/default.nix
@@ -0,0 +1,52 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, anyio
+, asyncio-throttle
+, dataclasses
+, ircstates
+, async_stagger
+, async-timeout
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "ircrobots";
+  version = "0.3.3";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "jesopo";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ykn6ch7aazv2cx13q2gr94arh6f96d8hwjwnrcjai3i3x4q2pkq";
+  };
+
+  patches = [
+    ./relax-dependencies.patch
+  ];
+
+  propagatedBuildInputs = [
+    anyio
+    asyncio-throttle
+    ircstates
+    async_stagger
+    async-timeout
+  ] ++ lib.optionals (pythonOlder "3.7") [
+    dataclasses
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest test
+  '';
+
+  pythonImportsCheck = [ "ircrobots" ];
+
+  meta = with lib; {
+    description = "Asynchronous bare-bones IRC bot framework for python3";
+    license = licenses.mit;
+    homepage = "https://github.com/jesopo/ircrobots";
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/development/python-modules/ircrobots/relax-dependencies.patch b/pkgs/development/python-modules/ircrobots/relax-dependencies.patch
new file mode 100644
index 000000000000..9aed3577f63d
--- /dev/null
+++ b/pkgs/development/python-modules/ircrobots/relax-dependencies.patch
@@ -0,0 +1,14 @@
+diff --git a/requirements.txt b/requirements.txt
+index 87a2d31..4e0efb1 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,6 +1,6 @@
+-anyio            ==1.3.0
++anyio
+ asyncio-throttle ==1.0.1
+-dataclasses      ==0.6
+-ircstates        ==0.11.2
++dataclasses; python_version < "3.7"
++ircstates        >=0.11.2
+ async_stagger    ==0.3.0
+ async_timeout    ==3.0.1
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1c8fee71e3e5..e7ee2c82dda8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2971,6 +2971,8 @@ in {
 
   irc = callPackage ../development/python-modules/irc { };
 
+  ircrobots = callPackage ../development/python-modules/ircrobots { };
+
   ircstates = callPackage ../development/python-modules/ircstates { };
 
   irctokens = callPackage ../development/python-modules/irctokens { };

From 799e0f1a2a8fc56ebf83cab5d5fbf8140b6e7bf5 Mon Sep 17 00:00:00 2001
From: Jiehong Ma <email@majiehong.com>
Date: Wed, 7 Oct 2020 15:40:11 +0200
Subject: [PATCH 0088/3942] ttf-tw-moe: first version

---
 maintainers/maintainer-list.nix        |  6 ++++++
 pkgs/data/fonts/ttf-tw-moe/default.nix | 27 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/data/fonts/ttf-tw-moe/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8dd51baed531..a2da8f870e6f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3951,6 +3951,12 @@
     githubId = 2502736;
     name = "James Hillyerd";
   };
+  jiehong = {
+    email = "nixos@majiehong.com";
+    github = "Jiehong";
+    githubId = 1061229;
+    name = "Jiehong Ma";
+  };
   jirkamarsik = {
     email = "jiri.marsik89@gmail.com";
     github = "jirkamarsik";
diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/data/fonts/ttf-tw-moe/default.nix
new file mode 100644
index 000000000000..aeda5cd695d6
--- /dev/null
+++ b/pkgs/data/fonts/ttf-tw-moe/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchzip }:
+
+fetchzip {
+  name = "ttf-tw-moe";
+
+  url = "https://github.com/Jiehong/TW-fonts/archive/b30ae75e9dc299afd61e31cfd43f7a0a157dfb1f.zip";
+
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile TW-fonts-b30ae75e9dc299afd61e31cfd43f7a0a157dfb1f/\*.ttf -d $out/share/fonts/truetype
+  '';
+
+  sha256 = "0khgxih9z6pqf7pdp21xjp24wb9ygsrdcmzpjb7vr9x8n78i1fbs";
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.moe.gov.tw/";
+    description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan";
+    longDescription = ''
+      Installs 2 TTF fonts: MOESongUN and TW-MOE-Std-Kai.
+      Both are provided by the Ministry of Education of Taiwan; each character's shape
+      closely follows the official recommendation, and can be used as for teaching purposes.
+    '';
+    license = licenses.cc-by-nd-30;
+    maintainers = [ maintainers.jiehong ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26f04573ddef..0e7019ff2a56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19476,6 +19476,8 @@ in
 
   ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r {};
 
+  ttf-tw-moe = callPackage ../data/fonts/ttf-tw-moe { };
+
   twemoji-color-font = callPackage ../data/fonts/twemoji-color-font {
     inherit (nodePackages) svgo;
   };

From 921b15efe75dbde8b6f2e3bb85fe648cba73f0db Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 7 Oct 2020 13:49:17 -0400
Subject: [PATCH 0089/3942] python3Packages.nipype: remove Python 2 support
 (dependency nibabel already unsupported)

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

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 80ee7691a1a5..c621341b2f8b 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -1,23 +1,19 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, isPy3k
-, isPy38
+, isPy27
 # python dependencies
 , click
-, configparser ? null
 , dateutil
 , etelemetry
 , filelock
 , funcsigs
 , future
-, futures
 , mock
 , networkx
 , nibabel
 , numpy
 , packaging
-, pathlib2
 , prov
 , psutil
 , pybids
@@ -39,8 +35,6 @@
 , callPackage
 }:
 
-assert !isPy3k -> configparser != null;
-
 let
 
  # This is a temporary convenience package for changes waiting to be merged into the primary rdflib repo.
@@ -51,6 +45,7 @@ in
 buildPythonPackage rec {
   pname = "nipype";
   version = "1.5.1";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
@@ -85,10 +80,6 @@ buildPythonPackage rec {
     simplejson
     traits
     xvfbwrapper
-  ] ++ stdenv.lib.optionals (!isPy3k) [
-    configparser
-    futures
-    pathlib2 # darwin doesn't receive this transitively, but it is in install_requires
   ];
 
   checkInputs = [

From f31be2ec2576f787811ae1ddd900c322b84a5ab2 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 7 Oct 2020 14:02:26 -0400
Subject: [PATCH 0090/3942] python3Packages.nipype: avoid use of neurdflib by
 default since it causes a package collision when rdflib is in the closure

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

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index c621341b2f8b..2d8eaecf7753 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -21,6 +21,7 @@
 , pytest
 , pytest_xdist
 , pytest-forked
+, rdflib
 , scipy
 , simplejson
 , traits
@@ -33,6 +34,10 @@
 , bash
 , glibcLocales
 , callPackage
+# causes Python packaging conflict with any package requiring rdflib,
+# so use the unpatched rdflib by default (disables Nipype provenance tracking);
+# see https://github.com/nipy/nipype/issues/2888:
+, useNeurdflib ? false
 }:
 
 let
@@ -69,7 +74,6 @@ buildPythonPackage rec {
     funcsigs
     future
     networkx
-    neurdflib
     nibabel
     numpy
     packaging
@@ -80,7 +84,7 @@ buildPythonPackage rec {
     simplejson
     traits
     xvfbwrapper
-  ];
+  ] ++ [ (if useNeurdflib then neurdflib else rdflib) ];
 
   checkInputs = [
     pybids

From 8eced948be92bcc2b68279f3639dbef42209daf1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Oct 2020 03:20:11 +0200
Subject: [PATCH 0091/3942] ircdog: init at 0.2.1

---
 .../networking/irc/ircdog/default.nix         | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/networking/irc/ircdog/default.nix

diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix
new file mode 100644
index 000000000000..5badc69a3a27
--- /dev/null
+++ b/pkgs/applications/networking/irc/ircdog/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildGoPackage
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  pname = "ircdog";
+  version = "0.2.1";
+
+  goPackagePath = "github.com/goshuirc/ircdog";
+
+  src = fetchFromGitHub {
+    owner = "goshuirc";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1ppbznlkv7vajfbimxbyiq5y6pkfhm6ylhl408rwq1bawl28hpkl";
+    fetchSubmodules = true;
+  };
+
+  meta = with lib; {
+    description = "ircdog is a simple wrapper over the raw IRC protocol that can respond to pings, and interprets formatting codes";
+    homepage = "https://github.com/goshuirc/ircdog";
+    license = licenses.isc;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2bb1badd8f6..caea93ce22db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16536,6 +16536,8 @@ in
 
   imgproxy = callPackage ../servers/imgproxy { };
 
+  ircdog = callPackage ../applications/networking/irc/ircdog { };
+
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
 
   jboss = callPackage ../servers/http/jboss { };

From b1073f27d9a9370c2c5e40a2e11144130f08624d Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Thu, 8 Oct 2020 12:55:29 +0200
Subject: [PATCH 0092/3942] pythonPackage.openrouteservice: init at 2.3.0

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

diff --git a/pkgs/development/python-modules/openrouteservice/default.nix b/pkgs/development/python-modules/openrouteservice/default.nix
new file mode 100644
index 000000000000..c35405f417b2
--- /dev/null
+++ b/pkgs/development/python-modules/openrouteservice/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchFromGitHub, requests, responses, pytestCheckHook }:
+
+buildPythonPackage rec {
+  pname = "openrouteservice";
+  version = "2.3.0";
+
+  src = fetchFromGitHub {
+    owner = "GIScience";
+    repo = "${pname}-py";
+    rev = "v${version}";
+    sha256 = "ySXzOQI9NcF1W/otbL7i3AY628/74ZkJjDMQ9ywVEPc=";
+  };
+
+  checkInputs = [ pytestCheckHook responses ];
+
+  disabledTests = [
+    # touches network
+    "test_optimized_waypoints"
+    "test_invalid_api_key"
+    "test_raise_timeout_retriable_requests"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/GIScience/openrouteservice-py";
+    description = "The Python API to consume openrouteservice(s) painlessly";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ Scriptkiddi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d8980eb8add..e0b6f81704db 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4191,6 +4191,8 @@ in {
 
   openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { };
 
+  openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { };
+
   opentimestamps = callPackage ../development/python-modules/opentimestamps { };
 
   opentracing = callPackage ../development/python-modules/opentracing { };

From 8094b8a95331c97552e3eae54e2ebbeb6e0e2326 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Thu, 8 Oct 2020 14:41:36 +0200
Subject: [PATCH 0093/3942] ikiwiki: add highlight dependency

IkiWiki's highlight plugin requires this.

Note that the current highlight version (3.57) is not compatible with
ikiwiki version in nixpkgs. This will be fixed in the next commit.
---
 pkgs/applications/misc/ikiwiki/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 0c2abbd9f588..20e271bc58d1 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which
+{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight
 , gitSupport ? false, git ? null
 , docutilsSupport ? false, python ? null, docutils ? null
 , monotoneSupport ? false, monotone ? null
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh";
   };
 
-  buildInputs = [ which ]
+  buildInputs = [ which highlight ]
     ++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
           TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
           RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase

From b06290ffd0c3efe2d9ee0de8f9a6c22336e7f998 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Thu, 8 Oct 2020 14:48:22 +0200
Subject: [PATCH 0094/3942] ikiwiki: 3.20190228 -> 3.20200202.3

This fixes (among others) incompatibility with highlight from nixpkgs.
See http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce
---
 pkgs/applications/misc/ikiwiki/default.nix    |  4 +-
 .../misc/ikiwiki/remove-markdown-tests.patch  | 46 +++++++++----------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 20e271bc58d1..105e1d59b36c 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -19,7 +19,7 @@ assert mercurialSupport -> (mercurial != null);
 
 let
   name = "ikiwiki";
-  version = "3.20190228";
+  version = "3.20200202.3";
 
   lib = stdenv.lib;
 in
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz";
-    sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh";
+    sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr";
   };
 
   buildInputs = [ which highlight ]
diff --git a/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch b/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
index c981857a248b..bae63a10bf67 100644
--- a/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
+++ b/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
@@ -1,10 +1,28 @@
 diff --git a/t/mdwn.t b/t/mdwn.t
-index ca3180139..d64750403 100755
+index 966aad2..2756173 100755
 --- a/t/mdwn.t
 +++ b/t/mdwn.t
-@@ -16,32 +16,17 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn",
- 	"C. S. Lewis wrote books\n"),
- 	"<p>C. S. Lewis wrote books</p>\n", "alphalist off by default");
+@@ -22,30 +22,13 @@ foreach my $multimarkdown (qw(1 0)) {
+ 		"<p>C. S. Lewis wrote books</p>\n",
+ 		"alphalist off by default for multimarkdown = $multimarkdown");
+ 
+-	like(IkiWiki::htmlize("foo", "foo", "mdwn",
+-		"This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
+-		qr{<p>This works.*fnref:1.*},
+-		"footnotes on by default for multimarkdown = $multimarkdown");
+-
+ 	$config{mdwn_footnotes} = 0;
+ 	unlike(IkiWiki::htmlize("foo", "foo", "mdwn",
+ 		"An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
+ 		qr{<p>An unusual link label: .*fnref:1.*},
+ 		"footnotes can be disabled for multimarkdown = $multimarkdown");
+-
+-	$config{mdwn_footnotes} = 1;
+-	like(IkiWiki::htmlize("foo", "foo", "mdwn",
+-		"This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
+-		qr{<p>This works.*fnref:1.*},
+-		"footnotes can be enabled for multimarkdown = $multimarkdown");
+ }
  
 -$config{mdwn_alpha_lists} = 1;
 -like(IkiWiki::htmlize("foo", "foo", "mdwn",
@@ -15,23 +33,3 @@ index ca3180139..d64750403 100755
  $config{mdwn_alpha_lists} = 0;
  like(IkiWiki::htmlize("foo", "foo", "mdwn",
  	"A. One\n".
- 	"B. Two\n"),
- 	qr{<p>A. One\sB. Two</p>\n}, "alphalist can be disabled");
- 
--like(IkiWiki::htmlize("foo", "foo", "mdwn",
--	"This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
--	qr{<p>This works<sup\W}, "footnotes on by default");
--
- $config{mdwn_footnotes} = 0;
- like(IkiWiki::htmlize("foo", "foo", "mdwn",
- 	"An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
- 	qr{<a href="http://example\.com/">\^1</a>}, "footnotes can be disabled");
- 
--$config{mdwn_footnotes} = 1;
--like(IkiWiki::htmlize("foo", "foo", "mdwn",
--	"This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
--	qr{<p>This works<sup\W}, "footnotes can be enabled");
--
- SKIP: {
- 	skip 'set $IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT if you have Discount 2.2.0+', 4
- 		unless $ENV{IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT};

From 7e63308148107b70ca3c1aa70b969d1ab2858856 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Thu, 8 Oct 2020 14:54:19 +0200
Subject: [PATCH 0095/3942] ikiwiki: Fix postInstall script to work with
 optional dependencies

The line-continuation backslash should not be a part of optional
string because it can lead to errors like this:

    /nix/store/333six1faw9bhccsx9qw5718k6b1wiq2-stdenv-linux/setup: line 90: --prefix: command not found
    builder for '/nix/store/lb07r900fpg7r1555zpf0j8n1n7g3wlx-ikiwiki-3.20200202.3.drv' failed with exit code 127
---
 pkgs/applications/misc/ikiwiki/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 105e1d59b36c..c940f824f37a 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -62,13 +62,13 @@ stdenv.mkDerivation {
   postInstall = ''
     for a in "$out/bin/"*; do
       wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \
-      ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''}
-      ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''}
-      ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin \''}
-      ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''}
-      ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''}
-      ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''}
-      ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''}
+      ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin ''} \
+      ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin ''} \
+      ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin ''} \
+      ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin ''} \
+      ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \
+      ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \
+      ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \
       ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
     done
   '';

From 40a5a4c46ed512423685f9ab8ae25ec88d675496 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Thu, 8 Oct 2020 15:00:30 +0200
Subject: [PATCH 0096/3942] ikiwiki: Fix docutils support

Without this, the rst plugin complains as follows:

    cannot import docutils.core

Also, python3 is needed for the rst plugin to work.
---
 pkgs/applications/misc/ikiwiki/default.nix | 1 +
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index c940f824f37a..c97ea3d4b772 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -69,6 +69,7 @@ stdenv.mkDerivation {
       ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \
       ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \
       ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \
+      ${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \
       ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
     done
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc1ab0f1c081..f3eaa4536779 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21310,6 +21310,7 @@ in
   ike = callPackage ../applications/networking/ike { };
 
   ikiwiki = callPackage ../applications/misc/ikiwiki {
+    python = python3;
     inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
   };
 

From d5d543d26364a232e31747171d62119e09f8b187 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+nixpkgs@sourcephile.fr>
Date: Thu, 8 Oct 2020 15:26:03 +0200
Subject: [PATCH 0097/3942] gnupg: put libexec tools (eg.
 gpg-preset-passphrase) in PATH

---
 pkgs/tools/security/gnupg/22.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 7c095cffa311..f7f35d659c45 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -69,6 +69,9 @@ stdenv.mkDerivation rec {
 
     # add gpg2 symlink to make sure git does not break when signing commits
     ln -s $out/bin/gpg $out/bin/gpg2
+
+    # Make libexec tools available in PATH
+    ln -s -t $out/bin $out/libexec/*
   '';
 
   meta = with stdenv.lib; {

From a68766978de8f4e9d83d89f6a3512a6183555079 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 9 Oct 2020 10:56:17 -0400
Subject: [PATCH 0098/3942] python3Packages.scikit-fuzzy: init at
 unstable-2020-10-03

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

diff --git a/pkgs/development/python-modules/scikit-fuzzy/default.nix b/pkgs/development/python-modules/scikit-fuzzy/default.nix
new file mode 100644
index 000000000000..7923565c3f4f
--- /dev/null
+++ b/pkgs/development/python-modules/scikit-fuzzy/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchFromGitHub
+, matplotlib
+, networkx
+, nose
+, numpy
+, scipy
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "scikit-fuzzy";
+  version = "unstable-2020-10-03";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "eecf303b701e3efacdc9b9066207ef605d4facaa";
+    sha256 = "18dl0017iqwc7446hqgabhibgjwdakhmycpis6zpvvkkv4ip5062";
+  };
+
+  propagatedBuildInputs = [ networkx numpy scipy ];
+  checkInputs = [ matplotlib nose pytestCheckHook ];
+
+  meta = with lib; {
+    homepage = "https://github.com/scikit-fuzzy/scikit-fuzzy";
+    description = "Fuzzy logic toolkit for scientific Python";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c334f9ab1a3b..ecaa1d8892a2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6341,6 +6341,8 @@ in {
 
   scikit-fmm = callPackage ../development/python-modules/scikit-fmm { };
 
+  scikit-fuzzy = callPackage ../development/python-modules/scikit-fuzzy { };
+
   scikitimage = callPackage ../development/python-modules/scikit-image { };
 
   scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; };

From bb61cce82abc6f692548d6831960e455766c898c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Sat, 10 Oct 2020 10:05:15 +0200
Subject: [PATCH 0099/3942] nixos-install: pass through impure flag

---
 nixos/doc/manual/man-nixos-install.xml         | 6 ++++++
 nixos/modules/installer/tools/nixos-install.sh | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index b205e2309687..12d015971999 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -49,6 +49,12 @@
     <option>--flake</option> <replaceable>flake-uri</replaceable>
    </arg>
 
+   <arg>
+    <group choice='req'>
+     <arg choice='plain'><option>--impure</option></arg>
+    </group>
+   </arg>
+
    <arg>
      <arg choice='plain'>
        <option>--channel</option>
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 90555f145803..9279f11b4f32 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -64,7 +64,7 @@ while [ "$#" -gt 0 ]; do
         --no-bootloader)
             noBootLoader=1
             ;;
-        --show-trace)
+        --show-trace|--impure)
             extraBuildFlags+=("$i")
             ;;
         --help)

From 6048a3c1f593fd99b1b5b46a81b2930b3c2f99c1 Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Fri, 10 Jan 2020 15:44:58 +1100
Subject: [PATCH 0100/3942] xen: Remove unsupported Xen version (4.8)

---
 pkgs/applications/virtualization/xen/4.8.nix  | 198 ------------------
 .../virtualization/xen/packages.nix           |  54 +----
 pkgs/top-level/all-packages.nix               |   5 -
 3 files changed, 4 insertions(+), 253 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/xen/4.8.nix

diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
deleted file mode 100644
index 6fa30462df08..000000000000
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ /dev/null
@@ -1,198 +0,0 @@
-{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit
-, ocaml-ng
-, withInternalQemu ? true
-, withInternalTraditionalQemu ? true
-, withInternalSeabios ? true
-, withSeabios ? !withInternalSeabios, seabios ? null
-, withInternalOVMF ? false # FIXME: tricky to build
-, withOVMF ? false, OVMF
-, withLibHVM ? true
-
-# qemu
-, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir
-, alsaLib
-, ... } @ args:
-
-assert withInternalSeabios -> !withSeabios;
-assert withInternalOVMF -> !withOVMF;
-
-with stdenv.lib;
-
-# Patching XEN? Check the XSAs at
-# https://xenbits.xen.org/xsa/
-# and try applying all the ones we don't have yet.
-
-let
-  xsa = import ./xsa-patches.nix { inherit fetchpatch; };
-
-  xenlockprofpatch = (fetchpatch {
-    name = "xenlockprof-gcc7.patch";
-    url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=f49fa658b53580cf2ad354d2bf1796766cc11222";
-    sha256 = "1lvzfvkqirknivm8q4cg5byfqz49s16zjk65fkwl3kwb03chky70";
-  });
-
-  xenpmdpatch = (fetchpatch {
-    name = "xenpmd-gcc7.patch";
-    url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=2d78f78a14528752266982473c07118f1bc336e3";
-    sha256 = "1ki295pymbcfc64sjb9wqfwpv19p8vwgmnxankada3vm4fxg2rhq";
-  });
-
-  qemuMemfdBuildFix = fetchpatch {
-    name = "xen-4.8-memfd-build-fix.patch";
-    url = "https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch";
-    sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa";
-  };
-
-  # Ported from
-  #"https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=patch;h=e014dbe74e0484188164c61ff6843f8a04a8cb9d";
-  #"https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=patch;h=0e3b891fefacc0e49f3c8ffa3a753b69eb7214d2";
-  qemuGlusterfs6Fix = ./qemu-gluster-6-compat.diff;
-
-  qemuDeps = [
-    udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
-    alsaLib
-  ];
-in
-
-callPackage (import ./generic.nix (rec {
-  version = "4.8.5";
-
-  src = fetchurl {
-    url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
-    sha256 = "04xcf01jad1lpqnmjblzhnjzp0bss9fjd9awgcycjx679arbaxqz";
-  };
-
-  # Sources needed to build tools and firmwares.
-  xenfiles = optionalAttrs withInternalQemu {
-    qemu-xen = {
-      src = fetchgit {
-        url = "https://xenbits.xen.org/git-http/qemu-xen.git";
-        rev = "refs/tags/qemu-xen-${version}";
-        sha256 = "0lb7zd5nvr6znx47z93nbq4gj8xfb3622s8r2cvmpqmwnmlc3nd4";
-      };
-      patches = [
-        qemuMemfdBuildFix
-        qemuGlusterfs6Fix
-      ];
-      buildInputs = qemuDeps;
-      meta.description = "Xen's fork of upstream Qemu";
-    };
-  } // optionalAttrs withInternalTraditionalQemu {
-    qemu-xen-traditional = {
-      src = fetchgit {
-        url = "https://xenbits.xen.org/git-http/qemu-xen-traditional.git";
-        rev = "refs/tags/xen-${version}";
-        sha256 = "0mryap5y53r09m7qc0b821f717ghwm654r8c3ik1w7adzxr0l5qk";
-      };
-      buildInputs = qemuDeps;
-      patches = [
-      ];
-      postPatch = ''
-        substituteInPlace xen-hooks.mak \
-          --replace /usr/include/pci ${pciutils}/include/pci
-      '';
-      meta.description = "Xen's fork of upstream Qemu that uses old device model";
-    };
-  } // optionalAttrs withInternalSeabios {
-    "firmware/seabios-dir-remote" = {
-      src = fetchgit {
-        url = "https://xenbits.xen.org/git-http/seabios.git";
-        rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df";
-        sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm";
-      };
-      patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
-      meta.description = "Xen's fork of Seabios";
-    };
-  } // optionalAttrs withInternalOVMF {
-    "firmware/ovmf-dir-remote" = {
-      src = fetchgit {
-        url = "https://xenbits.xen.org/git-http/ovmf.git";
-        rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8";
-        sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr";
-      };
-      meta.description = "Xen's fork of OVMF";
-    };
-  } // {
-    # TODO: patch Xen to make this optional?
-    "firmware/etherboot/ipxe.git" = {
-      src = fetchgit {
-        url = "https://git.ipxe.org/ipxe.git";
-        rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d";
-        sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09";
-      };
-      meta.description = "Xen's fork of iPXE";
-    };
-  } // optionalAttrs withLibHVM {
-    xen-libhvm-dir-remote = {
-      src = fetchgit {
-        name = "xen-libhvm";
-        url = "https://github.com/michalpalka/xen-libhvm";
-        rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c";
-        sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd";
-      };
-      buildPhase = ''
-        make
-        cd biospt
-        cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm
-      '';
-      installPhase = ''
-        make install
-        cp biospt/biospt $out/bin/
-      '';
-      meta = {
-        description = ''
-          Helper library for reading ACPI and SMBIOS firmware values
-          from the host system for use with the HVM guest firmware
-          pass-through feature in Xen'';
-        license = licenses.bsd2;
-      };
-    };
-  };
-
-  configureFlags = []
-    ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH
-    ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional"
-    ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional"
-
-    ++ optional (withSeabios) "--with-system-seabios=${seabios}"
-    ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios"
-
-    ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
-    ++ optional (withInternalOVMF) "--enable-ovmf";
-
-  patches = with xsa; flatten [
-    # 253: 4.8 not affected
-    # 254: no patch supplied by xen project (Meltdown/Spectre)
-    xenlockprofpatch
-    xenpmdpatch
-  ];
-
-  NIX_CFLAGS_COMPILE = toString [
-    # Fix build on Glibc 2.24
-    "-Wno-error=deprecated-declarations"
-    # Fix build with GCC8
-    "-Wno-error=maybe-uninitialized"
-    "-Wno-error=stringop-truncation"
-    "-Wno-error=format-truncation"
-    "-Wno-error=array-bounds"
-    # Fix build with GCC9
-    "-Wno-error=address-of-packed-member"
-    "-Wno-error=format-overflow"
-    "-Wno-error=absolute-value"
-  ];
-
-  postPatch = ''
-    # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
-    sed 1i'#include <sys/sysmacros.h>' \
-      -i tools/blktap2/control/tap-ctl-allocate.c \
-      -i tools/libxl/libxl_device.c \
-      ${optionalString withInternalQemu "-i tools/qemu-xen/hw/9pfs/9p.c"}
-
-    sed -i -e '/sys\/sysctl\.h/d' tools/blktap2/drivers/block-remus.c
-  '';
-
-  passthru.qemu-system-i386 = if withInternalQemu
-      then "lib/xen/bin/qemu-system-i386"
-      else throw "this xen has no qemu builtin";
-
-})) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_05; } // args)
diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
index e30006fbcc1a..55e3b12c3b7e 100644
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/pkgs/applications/virtualization/xen/packages.nix
@@ -1,57 +1,11 @@
 { callPackage
-, stdenv, overrideCC
+, stdenv
 }:
 
 # TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim
 # light] for each ./<version>.nix.
 
 rec {
-  xen_4_8-vanilla = callPackage ./4.8.nix {
-    meta = {
-      description = "vanilla";
-      longDescription = ''
-        Vanilla version of Xen. Uses forks of Qemu and Seabios bundled
-        with Xen. This gives vanilla experince, but wastes space and
-        build time: typical NixOS setup that runs lots of VMs will
-        build three different versions of Qemu when using this (two
-        forks and upstream).
-      '';
-    };
-  };
-
-  xen_4_8-slim = xen_4_8-vanilla.override {
-    withInternalQemu = false;
-    withInternalTraditionalQemu = true;
-    withInternalSeabios = false;
-    withSeabios = true;
-
-    meta = {
-      description = "slim";
-      longDescription = ''
-        Slimmed-down version of Xen that reuses nixpkgs packages as
-        much as possible. Different parts may get out of sync, but
-        this builds faster and uses less space than vanilla. Use with
-        `qemu_xen` from nixpkgs.
-      '';
-    };
-  };
-
-  xen_4_8-light = xen_4_8-vanilla.override {
-    withInternalQemu = false;
-    withInternalTraditionalQemu = false;
-    withInternalSeabios = false;
-    withSeabios = true;
-
-    meta = {
-      description = "light";
-      longDescription = ''
-        Slimmed-down version of Xen without `qemu-traditional` (you
-        don't need it if you don't know what it is). Use with
-        `qemu_xen-light` from nixpkgs.
-      '';
-    };
-  };
-
   xen_4_10-vanilla = callPackage ./4.10.nix {
     meta = {
       description = "vanilla";
@@ -98,8 +52,8 @@ rec {
     };
   };
 
-  xen-vanilla = xen_4_8-vanilla;
-  xen-slim = xen_4_8-slim;
-  xen-light = xen_4_8-light;
+  xen-vanilla = xen_4_10-vanilla;
+  xen-slim = xen_4_10-slim;
+  xen-light = xen_4_10-light;
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2371e455b0f..20fa3c866dce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18502,8 +18502,6 @@ in
   # Building with `xen` instead of `xen-slim` is possible, but makes no sense.
   qemu_xen = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-slim; });
   qemu_xen-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-light; });
-  qemu_xen_4_8 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-slim; });
-  qemu_xen_4_8-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-light; });
   qemu_xen_4_10 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-slim; });
   qemu_xen_4_10-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-light; });
 
@@ -24408,9 +24406,6 @@ in
   xen-slim = xenPackages.xen-slim;
   xen-light = xenPackages.xen-light;
 
-  xen_4_8 = xenPackages.xen_4_8-vanilla;
-  xen_4_8-slim = xenPackages.xen_4_8-slim;
-  xen_4_8-light = xenPackages.xen_4_8-light;
   xen_4_10 = xenPackages.xen_4_10-vanilla;
   xen_4_10-slim = xenPackages.xen_4_10-slim;
   xen_4_10-light = xenPackages.xen_4_10-light;

From 22fdd2465cb463fe685caae107e3785fadb5b276 Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Tue, 30 Apr 2019 12:22:53 +1000
Subject: [PATCH 0101/3942] xen: Build Xen EFI binary

---
 .../xen/0004-makefile-use-efi-ld.patch        | 36 +++++++++++++++++++
 .../0005-makefile-fix-efi-mountdir-use.patch  | 35 ++++++++++++++++++
 .../virtualization/xen/generic.nix            | 26 +++++++++++---
 3 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch
 create mode 100644 pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch

diff --git a/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch b/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch
new file mode 100644
index 000000000000..a103cb161710
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch
@@ -0,0 +1,36 @@
+diff -Naur xen-4.10.4-orig/xen/arch/x86/Makefile xen-4.10.4-patched/xen/arch/x86/Makefile
+--- xen-4.10.4-orig/xen/arch/x86/Makefile	2019-07-04 01:28:50.000000000 +1000
++++ xen-4.10.4-patched/xen/arch/x86/Makefile	2020-03-03 13:32:34.607951507 +1100
+@@ -166,7 +166,7 @@
+ # Check if the compiler supports the MS ABI.
+ export XEN_BUILD_EFI := $(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c efi/check.c -o efi/check.o 2>/dev/null && echo y)
+ # Check if the linker supports PE.
+-XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y))
++XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(EFI_LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y))
+ CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI
+ 
+ $(TARGET).efi: VIRT_BASE = 0x$(shell $(NM) efi/relocs-dummy.o | sed -n 's, A VIRT_START$$,,p')
+@@ -188,20 +188,20 @@
+ 
+ $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc
+ 	$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
+-	          $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
++	          $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
+ 	                $(BASEDIR)/common/symbols-dummy.o $(note_file) -o $(@D)/.$(@F).$(base).0 &&) :
+ 	$(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S
+ 	$(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \
+ 		| $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S
+ 	$(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o
+ 	$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
+-	          $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
++	          $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
+ 	                $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file) -o $(@D)/.$(@F).$(base).1 &&) :
+ 	$(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S
+ 	$(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \
+ 		| $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S
+ 	$(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o
+-	$(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
++	$(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
+ 	                $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file) -o $@
+ 	if $(guard) false; then rm -f $@; echo 'EFI support disabled'; \
+ 	else $(NM) -pa --format=sysv $(@D)/$(@F) \
diff --git a/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch b/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch
new file mode 100644
index 000000000000..11989e86c770
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch
@@ -0,0 +1,35 @@
+EFI_MOUNTPOINT is conventionally /boot/efi or /boot/EFI or something
+like that, and (on my machine) has directories within that called
+{Boot, nixos, gummiboot}.
+
+This patch does two things:
+
+1) Xen apparently wants to put files in
+$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR) - we remove the duplicate 'efi' name
+because I can't see why we have it
+
+2) Ensures the said directory exists
+
+
+--- a/xen/Makefile	2016-01-08 01:50:58.028045657 +0000
++++ b/xen/Makefile	2016-01-08 01:51:33.560268718 +0000
+@@ -49,7 +49,9 @@
+ 		ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \
+ 		ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \
+ 		if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \
+-			$(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \
++			[ -d $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ] || \
++			  $(INSTALL_DIR) $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ;\
++			$(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \
+ 		elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then \
+ 			echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \
+ 		fi; \
+@@ -69,7 +69,7 @@
+ 	rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi
+ 	rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi
+ 	rm -f $(D)$(EFI_DIR)/$(T).efi
+-	rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi
++	rm -f $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi
+ 
+ .PHONY: _debug
+ _debug:
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 854debc458a3..f19d25ac431d 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -20,6 +20,8 @@ config:
 # python2Packages.markdown
 , transfig, ghostscript, texinfo, pandoc
 
+, binutils-unwrapped
+
 , ...} @ args:
 
 with stdenv.lib;
@@ -42,6 +44,17 @@ let
     }
     ( __do )
   '');
+
+  # We don't want to use the wrapped version, because this version of ld is
+  # only used for linking the Xen EFI binary, and the build process really
+  # needs control over the LDFLAGS used
+  efiBinutils = binutils-unwrapped.overrideAttrs (oldAttrs: {
+    name = "efi-binutils";
+    configureFlags = oldAttrs.configureFlags ++ [
+      "--enable-targets=x86_64-pep"
+    ];
+    doInstallCheck = false; # We get a spurious failure otherwise, due to host/target mis-match
+  });
 in
 
 stdenv.mkDerivation (rec {
@@ -119,10 +132,12 @@ stdenv.mkDerivation (rec {
     '')}
   '';
 
-  patches = [ ./0000-fix-ipxe-src.patch
-              ./0000-fix-install-python.patch
-            ] ++ optional (versionOlder version "4.8.5") ./acpica-utils-20180427.patch
-            ++ (config.patches or []);
+  patches = [
+    ./0000-fix-ipxe-src.patch
+    ./0000-fix-install-python.patch
+    ./0004-makefile-use-efi-ld.patch
+    ./0005-makefile-fix-efi-mountdir-use.patch
+  ] ++ (config.patches or []);
 
   postPatch = ''
     ### Hacks
@@ -186,6 +201,9 @@ stdenv.mkDerivation (rec {
       --replace /bin/ls ls
   '';
 
+  EFI_LD = "${efiBinutils}/bin/ld";
+  EFI_VENDOR = "nixos";
+
   # TODO: Flask needs more testing before enabling it by default.
   #makeFlags = [ "XSM_ENABLE=y" "FLASK_ENABLE=y" "PREFIX=$(out)" "CONFIG_DIR=/etc" "XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files" ];
   makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ]

From 2699d3f2a7bba23c694279e26f82745d487bb999 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Sun, 11 Oct 2020 05:09:01 +0200
Subject: [PATCH 0102/3942] halide: 2019.08.27 -> 10.0.0

---
 pkgs/development/compilers/halide/default.nix | 48 ++++++----------
 pkgs/development/compilers/halide/nix.patch   | 56 -------------------
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 21 insertions(+), 87 deletions(-)
 delete mode 100644 pkgs/development/compilers/halide/nix.patch

diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix
index 356ebe231729..c3e1c2af1d4f 100644
--- a/pkgs/development/compilers/halide/default.nix
+++ b/pkgs/development/compilers/halide/default.nix
@@ -1,42 +1,43 @@
-{ llvmPackages, lib, fetchFromGitHub, cmake
-, libpng, libjpeg, mesa, eigen
-, openblas, blas, lapack
+{ llvmPackages
+, lib
+, fetchFromGitHub
+, cmake
+, libpng
+, libjpeg
+, mesa
+, eigen
+, openblas
+, blas
+, lapack
 }:
 
 assert blas.implementation == "openblas" && lapack.implementation == "openblas";
 
-let
-  version = "2019_08_27";
-
-in llvmPackages.stdenv.mkDerivation {
-
-  name = "halide-${builtins.replaceStrings ["_"] ["."] version}";
+llvmPackages.stdenv.mkDerivation rec {
+  pname = "halide";
+  version = "10.0.0";
 
   src = fetchFromGitHub {
     owner = "halide";
     repo = "Halide";
-    rev = "release_${version}";
-    sha256 = "09xf8v9zyxx2fn6s1yzjkyzcf9zyzrg3x5vivgd2ljzbfhm8wh7n";
+    rev = "v${version}";
+    sha256 = "0il71rppjp76m7zd420siidvhs76sqiq26h60ywk812sj9mmgxj6";
   };
 
-  patches = [ ./nix.patch ];
-
   # clang fails to compile intermediate code because
   # of unused "--gcc-toolchain" option
   postPatch = ''
     sed -i "s/-Werror//" src/CMakeLists.txt
   '';
 
-  cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" ];
+  cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" ];
 
   # To handle the lack of 'local' RPATH; required, as they call one of
   # their built binaries requiring their libs, in the build process.
   preBuild = ''
-    export LD_LIBRARY_PATH="$(pwd)/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="$(pwd)/src''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
   '';
 
-  enableParallelBuilding = true;
-
   # Note: only openblas and not atlas part of this Nix expression
   # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix
   # to get a hint howto setup atlas instead of openblas
@@ -44,19 +45,6 @@ in llvmPackages.stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  # No install target for cmake available.
-  # Calling install target in Makefile causes complete rebuild
-  # and the library rpath is broken, because libncursesw.so.6 is missing.
-  # Another way is using "make halide_archive", but the tarball is not easy
-  # to disassemble.
-  installPhase = ''
-    find
-    mkdir -p "$out/lib" "$out/bin"
-    cp bin/HalideTrace* "$out/bin"
-    cp lib/libHalide.so "$out/lib"
-    cp -r include "$out"
-  '';
-
   meta = with lib; {
     description = "C++ based language for image processing and computational photography";
     homepage = "https://halide-lang.org";
diff --git a/pkgs/development/compilers/halide/nix.patch b/pkgs/development/compilers/halide/nix.patch
deleted file mode 100644
index fb9bbf1a4cf7..000000000000
--- a/pkgs/development/compilers/halide/nix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ba384324..7e23038f7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -75,10 +75,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
- 
- set(LLVM_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}")
- 
--file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-as${CMAKE_EXECUTABLE_SUFFIX}" LLVM_AS)
--file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-nm${CMAKE_EXECUTABLE_SUFFIX}" LLVM_NM)
--file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" CLANG)
--file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-config${CMAKE_EXECUTABLE_SUFFIX}" LLVM_CONFIG)
-+find_program(LLVM_AS llvm-as HINTS ${LLVM_TOOLS_BINARY_DIR})
-+find_program(LLVM_NM llvm-nm HINTS ${LLVM_TOOLS_BINARY_DIR})
-+find_program(CLANG clang HINTS ${LLVM_TOOLS_BINARY_DIR})
-+find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_TOOLS_BINARY_DIR})
- 
- # LLVM doesn't appear to expose --system-libs via its CMake interface,
- # so we must shell out to llvm-config to find this info
-diff --git a/apps/linear_algebra/CMakeLists.txt b/apps/linear_algebra/CMakeLists.txt
-index 132c80e6a..36ce865f2 100644
---- a/apps/linear_algebra/CMakeLists.txt
-+++ b/apps/linear_algebra/CMakeLists.txt
-@@ -26,7 +26,7 @@ if (CBLAS_FOUND)
-   #  Atlas requires also linking against its provided libcblas for cblas symbols
-   set(ATLAS_EXTRA_LIBS cblas) # XXX fragile
-   set(OpenBLAS_EXTRA_LIBS)
--  set(BLAS_VENDORS OpenBLAS ATLAS)
-+  set(BLAS_VENDORS OpenBLAS)
- 
-   # TODO
-   # there are more vendors we could add here that support the cblas interface
-@@ -41,6 +41,7 @@ if (CBLAS_FOUND)
-       message(STATUS " ${BLAS_VENDOR}: Missing")
-     else()
-       message(STATUS " ${BLAS_VENDOR}: Found")
-+      set(BLAS_LIBRARIES "${BLAS_LIBRARIES}" CACHE FILEPATH "BLAS library to use")
-       list(APPEND BLAS_VENDORS ${NAME})
-     endif()
-   endforeach()
-diff --git a/apps/linear_algebra/tests/CMakeLists.txt b/apps/linear_algebra/tests/CMakeLists.txt
-index cc02eb0a4..c20419a0d 100644
---- a/apps/linear_algebra/tests/CMakeLists.txt
-+++ b/apps/linear_algebra/tests/CMakeLists.txt
-@@ -19,7 +19,7 @@ target_compile_options(test_halide_blas PRIVATE -Wno-unused-variable)
- target_link_libraries(test_halide_blas
-   PRIVATE
-    halide_blas
--   cblas # XXX fragile
-+   ${BLAS_LIBRARIES}
-    ${HALIDE_COMPILER_LIB}
- )
- 
--- 
-2.23.0
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3932caa83cec..bb63c29d2e3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4356,7 +4356,9 @@ in
 
   halibut = callPackage ../tools/typesetting/halibut { };
 
-  halide = callPackage ../development/compilers/halide { };
+  halide = callPackage ../development/compilers/halide {
+    llvmPackages = llvmPackages_9;
+  };
 
   ham = pkgs.perlPackages.ham;
 

From 0a24ff069e4bbfbca84e03a23ae998660cdf251f Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Sun, 11 Oct 2020 05:12:39 +0200
Subject: [PATCH 0103/3942] halide: enable on aarch64-linux

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

diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix
index c3e1c2af1d4f..1ff821edf800 100644
--- a/pkgs/development/compilers/halide/default.nix
+++ b/pkgs/development/compilers/halide/default.nix
@@ -49,7 +49,7 @@ llvmPackages.stdenv.mkDerivation rec {
     description = "C++ based language for image processing and computational photography";
     homepage = "https://halide-lang.org";
     license = licenses.mit;
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
     maintainers = [ maintainers.ck3d ];
   };
 }

From 01762fec0ab7576e3b371eda3dd3fd576e640798 Mon Sep 17 00:00:00 2001
From: Justinas Stankevicius <justinas@justinas.org>
Date: Mon, 3 Aug 2020 17:48:19 +0300
Subject: [PATCH 0104/3942] prometheus-sql-exporter: init at 0.3.0

---
 .../monitoring/prometheus/sql-exporter.nix    | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/sql-exporter.nix

diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
new file mode 100644
index 000000000000..c689cc1ed793
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
+
+buildGoModule rec {
+  pname = "sql_exporter";
+  version = "0.3.0";
+
+  vendorSha256 = null;
+
+  src = fetchFromGitHub {
+    owner = "justwatchcom";
+    repo = "sql_exporter";
+    rev = "v${version}";
+    sha256 = "125brlxgwhkn3z5v0522gpm0sk6v905ghh05c4c3wf1hlm7bhnrc";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Flexible SQL exporter for Prometheus";
+    homepage = "https://github.com/justwatchcom/sql_exporter";
+    license = licenses.mit;
+    maintainers = with maintainers; [ justinas ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c540fc45b971..ee0946f5d028 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17048,6 +17048,7 @@ in
   prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { };
   prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { };
   prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
+  prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { };
   prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { };
   prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { };
   prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };

From 8d8cd8908b58cb7018220d20dd33bea7404fe843 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Tue, 13 Oct 2020 14:19:38 +0100
Subject: [PATCH 0105/3942] pasystray: ayatana appindicators instead of
 libappindicator

---
 pkgs/tools/audio/pasystray/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index 8b0580ba98c4..d80f1af4182a 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
-, gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio
+{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
+, gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio
 , xlibsWrapper, gsettings-desktop-schemas
 }:
 
@@ -17,12 +17,18 @@ stdenv.mkDerivation rec {
   patches = [
     # https://github.com/christophgysin/pasystray/issues/90#issuecomment-306190701
     ./fix-wayland.patch
+
+    # https://github.com/christophgysin/pasystray/issues/98
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/p/pasystray/0.7.1-1/debian/patches/0001-Build-against-ayatana-appindicator.patch";
+      sha256 = "0hijphrf52n2zfwdnrmxlp3a7iwznnkb79awvpzplz0ia2lqywpw";
+    })
   ];
 
   nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
   buildInputs = [
     gnome3.adwaita-icon-theme
-    avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper
+    avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper
     gsettings-desktop-schemas
   ];
 

From 65c9bb252dcfab942fb52038dd0f514479177d4a Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Sun, 24 May 2020 16:30:25 +0100
Subject: [PATCH 0106/3942] clipit: enable appindicator support

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

diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix
index 02207fb95806..cc6d7d29fcd4 100644
--- a/pkgs/applications/misc/clipit/default.nix
+++ b/pkgs/applications/misc/clipit/default.nix
@@ -1,6 +1,6 @@
 { fetchFromGitHub, fetchpatch, stdenv
 , autoreconfHook, intltool, pkgconfig
-, gtk3, xdotool, which, wrapGAppsHook }:
+, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "clipit";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook intltool ];
-  configureFlags = [ "--with-gtk3" ];
-  buildInputs = [ gtk3 ];
+  configureFlags = [ "--with-gtk3" "--enable-appindicator=yes" ];
+  buildInputs = [ gtk3 libayatana-appindicator ];
 
   gappsWrapperArgs = [
     "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}"

From 9de5bf446a55936dfd8b2abbfd38eadff6aa0aed Mon Sep 17 00:00:00 2001
From: Marcos Benevides <marcos.schonfinkel@protonmail.com>
Date: Sun, 11 Oct 2020 21:48:39 -0300
Subject: [PATCH 0107/3942] ugtrain: init at v0.4.1

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

diff --git a/pkgs/tools/misc/ugtrain/default.nix b/pkgs/tools/misc/ugtrain/default.nix
new file mode 100644
index 000000000000..0645645ae2bf
--- /dev/null
+++ b/pkgs/tools/misc/ugtrain/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, scanmem
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.4.1";
+  pname = "ugtrain";
+
+  src = fetchFromGitHub {
+    owner  = "ugtrain";
+    repo   = "ugtrain";
+    rev    = "v${version}";
+    sha256 = "0pw9lm8y83mda7x39874ax2147818h1wcibi83pd2x4rp1hjbkkn";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkg-config scanmem ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/ugtrain/ugtrain";
+    description = "The Universal Elite Game Trainer for CLI (Linux game trainer research project)";
+    maintainers = with maintainers; [ mtrsk ];
+    platforms = platforms.linux;
+    license = licenses.gpl3Only;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f636f0fd894e..cd275c5baaa3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18640,6 +18640,8 @@ in
 
   udisks_glue = callPackage ../os-specific/linux/udisks-glue { };
 
+  ugtrain = callPackage ../tools/misc/ugtrain { };
+
   untie = callPackage ../os-specific/linux/untie { };
 
   upower = callPackage ../os-specific/linux/upower { };

From 32535c94a03d6893cf30f990b171c122c816635b Mon Sep 17 00:00:00 2001
From: Narice <narice@tutanota.com>
Date: Wed, 14 Oct 2020 10:39:33 +0200
Subject: [PATCH 0108/3942] added out-of-date package reports to templates

---
 .../ISSUE_TEMPLATE/out_of_date_package_report.md   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/out_of_date_package_report.md

diff --git a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md
new file mode 100644
index 000000000000..0dcdf52513df
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md
@@ -0,0 +1,14 @@
+---
+name: Out-of-date package reports
+about: For packages that are out-of-date
+title: ''
+labels: '0.kind: out-of-date package'
+assignees: ''
+
+---
+
+**Project name**
+_give the name of the project_
+
+**Notify maintainers**
+

From 46633c2abd48ba20be6b204925debc654db32397 Mon Sep 17 00:00:00 2001
From: Nicolas Martin <penguwin@penguwin.eu>
Date: Wed, 14 Oct 2020 15:10:12 +0200
Subject: [PATCH 0109/3942] charm: 0.8.3 -> 0.8.4

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

diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix
index 98e04e81c124..0799226866e1 100644
--- a/pkgs/applications/misc/charm/default.nix
+++ b/pkgs/applications/misc/charm/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "charm";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "charm";
     rev = "v${version}";
-    sha256 = "1nbix7fi6g9jadak5zyx7fdz7d6367aly6fnrs0v98zsl1kxyvx3";
+    sha256 = "0wsh83kchqakvx7kgs2s31rzsvnfr47jk6pbmqzjv1kqmnlhc3rh";
   };
 
-  vendorSha256 = "0lhml6m0j9ksn09j7z4d9pix5aszhndpyqajycwj3apvi3ic90il";
+  vendorSha256 = "1lg4bbdzgnw50v6m6p7clibwm8m82kdr1jizgbmhfmzy15d5sfll";
 
   doCheck = false;
 

From dde7b88ceacc7e70988c401b4d98be88bbf9ac87 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 14 Oct 2020 14:22:56 -0300
Subject: [PATCH 0110/3942] mons: 20200107 -> 20200320

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

diff --git a/pkgs/tools/misc/mons/default.nix b/pkgs/tools/misc/mons/default.nix
index c1dbfa0aa49a..71a12c887968 100644
--- a/pkgs/tools/misc/mons/default.nix
+++ b/pkgs/tools/misc/mons/default.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation rec {
   pname = "mons";
-  version = "20200107";
+  version = "20200320";
 
   src = fetchFromGitHub {
     owner = "Ventto";
     repo = pname;
-    rev = "0c9e1a1dddff23a0525ed8e4ec9af8f9dd8cad4c";
-    sha256 = "02c41mw3g1mgl91hhpz1n45iaqk9s7mdk1ixm8yv6sv17hy8rr4w";
+    rev = "375bbba3aa700c8b3b33645a7fb70605c8b0ff0c";
+    sha256 = "19r5y721yrxhd9jp99s29jjvm0p87vl6xfjlcj38bljq903f21cl";
     fetchSubmodules = true;
   };
 
-  # PR: https://github.com/Ventto/mons/pull/36
-  preConfigure = ''sed -i 's/usr\///' Makefile'';
-  
   nativeBuildInputs = [ help2man ];
-  makeFlags = [ "DESTDIR=$(out)" ];
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+  ];
 
   meta = with lib; {
     description = "POSIX Shell script to quickly manage 2-monitors display";

From bf422f5892e9f3dad6d55693652346850e2645a1 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 14 Oct 2020 22:09:22 +0100
Subject: [PATCH 0111/3942] starboard: 0.5.0 -> 0.6.0

Also set subPackages to "cmd/starboard" as there is now also
starboard-operator and starboard-scanner-aqua.
---
 .../applications/networking/cluster/starboard/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix
index 20861769d8c8..bc42bf13666a 100644
--- a/pkgs/applications/networking/cluster/starboard/default.nix
+++ b/pkgs/applications/networking/cluster/starboard/default.nix
@@ -2,16 +2,18 @@
 
 buildGoModule rec {
   pname = "starboard";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     rev = "v${version}";
-    sha256 = "12vfxnny3giirdf1xhacy24dvy5zm7iil6h019s0l63876vingnc";
+    sha256 = "00d3cnd3n6laa6rphw5w9xk8slpp4a603vzhixzg01sghq26gy22";
   };
 
-  vendorSha256 = "0hj7h58j0v98plrqfldq59d084j76aiy82mfm8zi0vcqg6gxf4pb";
+  vendorSha256 = "0y816r75rp1a4rp7j0a8wzrfi2mdf4ji1vz2vaj5s7x9ik6rc13r";
+
+  subPackages = [ "cmd/starboard" ];
 
   doCheck = false;
 

From 0f69d69dc4ea411ff1841e669de82df75d783dc7 Mon Sep 17 00:00:00 2001
From: Kyle Sferrazza <kyle.sferrazza@gmail.com>
Date: Mon, 5 Oct 2020 22:49:56 -0400
Subject: [PATCH 0112/3942] multilockscreen: init at 1.0.0

closes #99637
---
 .../screensavers/multilockscreen/default.nix  | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/misc/screensavers/multilockscreen/default.nix

diff --git a/pkgs/misc/screensavers/multilockscreen/default.nix b/pkgs/misc/screensavers/multilockscreen/default.nix
new file mode 100644
index 000000000000..3fa6dbc725e9
--- /dev/null
+++ b/pkgs/misc/screensavers/multilockscreen/default.nix
@@ -0,0 +1,47 @@
+{
+  stdenv, makeWrapper, fetchFromGitHub, writeShellScriptBin,
+  imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh, procps, xrdb, xset,
+  gnused, gnugrep, coreutils
+}:
+let
+  i3lock = writeShellScriptBin "i3lock" ''
+    ${i3lock-color}/bin/i3lock-color "$@"
+  '';
+  binPath = stdenv.lib.makeBinPath [
+    imagemagick i3lock
+    xdpyinfo xrandr xset
+    bc feh procps xrdb
+    gnused gnugrep coreutils
+  ];
+in
+stdenv.mkDerivation rec {
+  pname = "multilockscreen";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "jeffmhubbard";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0gmnrq7ibbhiwsn7mfi2r71fwm6nvhiwf4wsyz44cscm474z83p0";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp multilockscreen $out/bin/multilockscreen
+    wrapProgram "$out/bin/multilockscreen" --prefix PATH : "${binPath}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Wrapper script for i3lock-color";
+    longDescription = ''
+      multilockscreen is a wrapper script for i3lock-color.
+      It allows you to cache background images for i3lock-color with a variety of different effects and adds a stylish indicator.
+    '';
+    homepage = "https://github.com/jeffmhubbard/multilockscreen";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ kylesferrazza ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb139e7a8908..a9f237141aae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21367,6 +21367,8 @@ in
     inherit (xorg) xrdb;
   };
 
+  multilockscreen = callPackage ../misc/screensavers/multilockscreen { };
+
   i3minator = callPackage ../tools/misc/i3minator { };
 
   i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { };

From ec34ce96d089badcb5113cd89d5b844e0704dfd3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 15 Oct 2020 04:27:07 +0000
Subject: [PATCH 0113/3942] pyditz: 0.10.3 -> 0.11

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

diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix
index 05338b38dfef..d8b2b2ec602e 100644
--- a/pkgs/applications/misc/pyditz/default.nix
+++ b/pkgs/applications/misc/pyditz/default.nix
@@ -6,11 +6,11 @@ let
   cerberus_1_1 = callPackage ./cerberus.nix { };
 in buildPythonApplication rec {
   pname = "pyditz";
-  version = "0.10.3";
+  version = "0.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0hxxz7kxv9gsrr86ccsc31g7bc2agw1ihbxhd659c2m6nrqq5qaf";
+    sha256 = "da0365ae9064e30c4a27526fb0d7a802fda5c8651cda6990d17be7ede89a2551";
   };
   nativeBuildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ];

From 372ee06f5a76189d1f7e6833b94100f49b50f8c5 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Thu, 15 Oct 2020 13:07:55 +0800
Subject: [PATCH 0114/3942] earlyoom: 1.6.1 -> 1.6.2

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

diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix
index 575da8aca732..1eecacad60c0 100644
--- a/pkgs/os-specific/linux/earlyoom/default.nix
+++ b/pkgs/os-specific/linux/earlyoom/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "earlyoom";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = "earlyoom";
     rev = "v${version}";
-    sha256 = "1cn0bgbgiq69i8mk8zxly1f7j01afm82g672qzccz6swsi2637j4";
+    sha256 = "16iyn51xlrsbshc7p5xl2338yyfzknaqc538sa7mamgccqwgyvvq";
   };
 
   nativeBuildInputs = stdenv.lib.optionals withManpage [ pandoc installShellFiles ];

From e14a3598962dbe5d7eac89d8f4759807f1847aa1 Mon Sep 17 00:00:00 2001
From: piegames <git@piegames.de>
Date: Thu, 15 Oct 2020 01:24:45 +0200
Subject: [PATCH 0115/3942] treewide: Fix broken desktop files and mark
 packages as broken

This fixes all packages that are failed `nixpkgs-review` in #91790.
Packages that were broken prior to that PR were marked as broken.
Packages that failed because of #75729 were fixed.
---
 pkgs/applications/misc/toggldesktop/default.nix   | 1 +
 pkgs/applications/networking/ostinato/default.nix | 1 +
 pkgs/applications/networking/termius/default.nix  | 1 +
 pkgs/applications/science/math/sage/sage.nix      | 1 +
 pkgs/games/frogatto/default.nix                   | 1 +
 pkgs/games/tdm/default.nix                        | 1 +
 pkgs/games/tome2/default.nix                      | 1 +
 7 files changed, 7 insertions(+)

diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix
index 410c17be803a..eb49853885b0 100644
--- a/pkgs/applications/misc/toggldesktop/default.nix
+++ b/pkgs/applications/misc/toggldesktop/default.nix
@@ -139,6 +139,7 @@ buildEnv {
   paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ];
 
   meta = with lib; {
+    broken = true; # libtoggl is broken
     description = "Client for Toggl time tracking service";
     homepage = "https://github.com/toggl/toggldesktop";
     license = licenses.bsd3;
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index aa9d94ad5b6e..dd1a7481d463 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
       GenericName[it]=Generatore ed Analizzatore di pacchetti di rete
       Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole
     '';
+    fileValidation = false;
   };
 
   postInstall = ''
diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix
index 09b9bfa571b8..92f667a4362d 100644
--- a/pkgs/applications/networking/termius/default.nix
+++ b/pkgs/applications/networking/termius/default.nix
@@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    broken = true;
     description = "A cross-platform SSH client with cloud data sync and more";
     homepage = "https://termius.com/";
     downloadPage = "https://termius.com/linux/";
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
index 4fa8ae6270ba..e130d5f4cdcc 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
+    broken = true;
     description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab";
     license = licenses.gpl2;
     maintainers = with maintainers; [ timokau ];
diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix
index efcff024a542..f6d4789c30b1 100644
--- a/pkgs/games/frogatto/default.nix
+++ b/pkgs/games/frogatto/default.nix
@@ -34,6 +34,7 @@ in buildEnv {
   '';
 
   meta = with stdenv.lib; {
+    broken = true;
     homepage = "https://frogatto.com";
     description = description;
     license = with licenses; [ cc-by-30 unfree ];
diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix
index 055ab9d38e8c..98b7ecdc4778 100644
--- a/pkgs/games/tdm/default.nix
+++ b/pkgs/games/tdm/default.nix
@@ -16,6 +16,7 @@ let
     type = "Application";
     categories = "Game;";
     genericName = pname;
+    fileValidation = false;
   };
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
diff --git a/pkgs/games/tome2/default.nix b/pkgs/games/tome2/default.nix
index fa73697ab42a..1fc80b1764d5 100644
--- a/pkgs/games/tome2/default.nix
+++ b/pkgs/games/tome2/default.nix
@@ -14,6 +14,7 @@ let
     type = "Application";
     categories = "Game;RolePlaying;";
     genericName = pname;
+    fileValidation = false;
   };
 
 in stdenv.mkDerivation {

From 24883ec6e75676ac92f4a211cfa4a6839d635751 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Thu, 15 Oct 2020 21:27:18 +0200
Subject: [PATCH 0116/3942] electrum: 4.0.3 -> 4.0.4

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

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index ad26a912e781..f2d779c8a650 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -19,7 +19,7 @@
 }:
 
 let
-  version = "4.0.3";
+  version = "4.0.4";
 
   # electrum is not compatible with dnspython 2.0.0 yet
   # use the latest 1.x release instead
@@ -43,7 +43,7 @@ let
     owner = "spesmilo";
     repo = "electrum";
     rev = version;
-    sha256 = "1r40i0v7nm35m3pzbd0l5z4qphl13s31l9v5njmyvpfjirdmhjbv";
+    sha256 = "0bzvyfqnd0r0l8syf95hr3nsh8rmmmcs74bvc7v04v0nm5m0fmf1";
 
     extraPostFetch = ''
       mv $out ./all
@@ -58,7 +58,7 @@ py.pkgs.buildPythonApplication {
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "0q891fgzxvyzjxfczynx92hvclfs8i3nr5nr9sgbvz13hsg4s6lg";
+    sha256 = "03dc5jwgp18sism5v4lbqfyn2zljchng8j2yi07yf8i01ivy2mmv";
   };
 
   postUnpack = ''

From 600d0c978a2188e60e89236395f5e3eecb2d29ce Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 16 Oct 2020 04:20:00 +0000
Subject: [PATCH 0117/3942] xonsh: 0.9.23 -> 0.9.24

https://github.com/xonsh/xonsh/releases/tag/0.9.24
---
 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 8ff2b4d270ee..711d7060fa55 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "xonsh";
-  version = "0.9.23";
+  version = "0.9.24";
 
   # fetch from github because the pypi package ships incomplete tests
   src = fetchFromGitHub {
     owner  = "xonsh";
     repo   = "xonsh";
     rev    = version;
-    sha256 = "1by13ryq9ldc9wln3fk5mm6zvjp4aim57ikw49v0dfmz8irnpglp";
+    sha256 = "1nk7kbiv7jzmr6narsnr0nyzkhlc7xw3b2bksyq2j6nda67b9b3y";
   };
 
   LC_ALL = "en_US.UTF-8";

From 47a1abdd21073e99256619cc925e7fbc7c807e55 Mon Sep 17 00:00:00 2001
From: Anatolii Prylutskyi <anpryl@gmail.com>
Date: Fri, 16 Oct 2020 11:08:43 +0300
Subject: [PATCH 0118/3942] operator-sdk: 1.0.1 -> 1.1.0

---
 pkgs/development/tools/operator-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix
index 79baecd74f55..01485a5d27ea 100644
--- a/pkgs/development/tools/operator-sdk/default.nix
+++ b/pkgs/development/tools/operator-sdk/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "operator-sdk";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "operator-framework";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1p2ra7mqn7crip6sjgq2j49782ncvs4qahjwg6jk5rdvvi4hbyc7";
+    sha256 = "11xlay3sk5nr9pfbqifcrfi5h81qnhs3hg5b75zgqysgr4d2m987";
   };
 
-  vendorSha256 = "0zy540cbfm1kfc5sp802a9a5l2gkpgqprn8mlh9zg4d4shni61wa";
+  vendorSha256 = "1bbj23rwghqfw9vsgj9i9zrxvl480adsmjg1zb06cdhh5j1hl0vy";
 
   doCheck = false;
 

From 5f6707d1b5420cf2826202ccae9b11aefef72277 Mon Sep 17 00:00:00 2001
From: Vincent Haupert <mail@vincent-haupert.de>
Date: Fri, 16 Oct 2020 13:47:11 +0200
Subject: [PATCH 0119/3942] Revert "python3.pkgs.yq: make stdin a tty for
 tests"

This reverts commit 40a58cc65bec0ed5b784178239e55f7c7ac969f5.
---
 pkgs/development/python-modules/yq/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix
index 05f608ff4e9c..389cdbd26a0a 100644
--- a/pkgs/development/python-modules/yq/default.nix
+++ b/pkgs/development/python-modules/yq/default.nix
@@ -10,7 +10,6 @@
 , flake8
 , jq
 , pytest
-, unixtools
 , toml
 }:
 
@@ -23,6 +22,10 @@ buildPythonPackage rec {
     sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl";
   };
 
+  postPatch = ''
+    substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}"
+  '';
+
   propagatedBuildInputs = [
     pyyaml
     xmltodict
@@ -32,7 +35,6 @@ buildPythonPackage rec {
   doCheck = true;
 
   checkInputs = [
-   unixtools.script
    pytest
    coverage
    flake8
@@ -40,8 +42,7 @@ buildPythonPackage rec {
    toml
   ];
 
-  # tests fails if stdin is not a tty
-  checkPhase = "echo | script -c 'pytest ./test/test.py'";
+  checkPhase = "pytest ./test/test.py";
 
   pythonImportsCheck = [ "yq" ];
 

From 40d972a6f659ff4e21a34fd11bbc9f1b6794cab6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 16 Oct 2020 13:17:49 +0000
Subject: [PATCH 0120/3942] python37Packages.nbsmoke: 0.4.1 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix
index 8f263246893b..b7ddf35caec6 100644
--- a/pkgs/development/python-modules/nbsmoke/default.nix
+++ b/pkgs/development/python-modules/nbsmoke/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "nbsmoke";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06as8vh17m0nkp3fpkp42m990a5zjfl2iaa17da99ksh7886mjpc";
+    sha256 = "2400d7878e97714e822ab200a71fc71ede487e671f42b4b411745dba95f9cb32";
   };
 
   propagatedBuildInputs = [

From e94e19655a1d325b8bda6351ec1f0f57ca5e7147 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Oct 2020 13:20:17 -0500
Subject: [PATCH 0121/3942] agave: 22 -> 30

https://github.com/agarick/agave/releases/tag/v30
(see also notes for other releases, not linked here)
---
 pkgs/data/fonts/agave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix
index 0c2cd1609f61..ea64cf34578d 100644
--- a/pkgs/data/fonts/agave/default.nix
+++ b/pkgs/data/fonts/agave/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "agave";
-  version = "22";
+  version = "30";
 in fetchurl {
   name = "${pname}-${version}";
   url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf";
@@ -13,7 +13,7 @@ in fetchurl {
     install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf
   '';
 
-  sha256 = "1jb8f0xcv5z0l5nyx733b6zclswi82vrh2nwyyhbqzgqrl4y1h6s";
+  sha256 = "1f2f1fycwi8xbf8x03yfq78nv11b2msl4ll9flw8rkg023h9vwg7";
 
   meta = with lib; {
     description = "truetype monospaced typeface designed for X environments";

From f31eb8731a31f91582170b30ae88aef3afcaa51f Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Sat, 17 Oct 2020 02:26:46 +0800
Subject: [PATCH 0122/3942] osu-lazer: 2020.925.0 -> 2020.1017.0

---
 pkgs/games/osu-lazer/default.nix | 4 ++--
 pkgs/games/osu-lazer/deps.nix    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index 4cde785bb6c8..9cd6475d1274 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -13,13 +13,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "osu-lazer";
-  version = "2020.925.0";
+  version = "2020.1017.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     rev = version;
-    sha256 = "0838i3pdc1c44jm7mp86kvw5164w8f3faci73bzkq84g20ixwj2g";
+    sha256 = "0sz3l8cxi9vlryjd7cb86dh3gcanim2pvhag3cg5sslqzrrinp2v";
   };
 
   patches = [ ./bypass-tamper-detection.patch ];
diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix
index 6660034e625f..eb9fa617d5be 100644
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/games/osu-lazer/deps.nix
@@ -586,8 +586,8 @@
   })
   (fetchNuGet {
     name = "ppy.osu.Framework";
-    version = "2020.925.0";
-    sha256 = "1244fxm7x4rqi43kp6l98bsbjc2yvv7dmpbajdr9fapqm37fdbdj";
+    version = "2020.1009.0";
+    sha256 = "0mqx9wjp639k56f0cjlrk67mq7c4h4vlglvss93dnvbb20ljn54r";
   })
   (fetchNuGet {
     name = "ppy.osu.Framework.NativeLibs";
@@ -596,8 +596,8 @@
   })
   (fetchNuGet {
     name = "ppy.osu.Game.Resources";
-    version = "2020.904.0";
-    sha256 = "0n0alpyxpf65mmnqidh044sh4nibsfj0m5n8hfmpjwq11wnpmbih";
+    version = "2020.1016.0";
+    sha256 = "1zsqmmlxbb2ncrlvha33cz0inbd6ijbcvxn0y0cysfkg7zb9iisy";
   })
   (fetchNuGet {
     name = "ppy.osuTK.NS20";

From 0597e648db13b6119c4f75e3de6fb9943882d036 Mon Sep 17 00:00:00 2001
From: Sam Hofius <sam@samhofi.us>
Date: Fri, 16 Oct 2020 23:28:02 -0400
Subject: [PATCH 0123/3942] keybase,keybase-gui,kbfs: 5.5.1 -> 5.5.2

---
 pkgs/tools/security/keybase/default.nix | 4 ++--
 pkgs/tools/security/keybase/gui.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index ee1cfa9d2a41..af7bc311798e 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -6,7 +6,7 @@
 
 buildGoPackage rec {
   pname = "keybase";
-  version = "5.5.1";
+  version = "5.5.2";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/kbnm" "go/keybase" ];
@@ -17,7 +17,7 @@ buildGoPackage rec {
     owner = "keybase";
     repo = "client";
     rev = "v${version}";
-    sha256 = "03y69zmzbnfay173xkbzvnhh8zjjd2rfnqmpgr0wvh1psn7mgpsh";
+    sha256 = "01k50mank6cdc7q3yd8m7xi8vmyklsqlmz7hw17a35lqcsjzy9zj";
   };
 
   patches = [
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 20c1bb8f7f16..0d2928a29c83 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -4,17 +4,17 @@
 , runtimeShell, gsettings-desktop-schemas }:
 
 let
-  versionSuffix = "20200527202541.39ca0071e5";
+  versionSuffix = "20201016183637.d4ebf7d999";
 in
 
 stdenv.mkDerivation rec {
   pname = "keybase-gui";
-  version = "5.5.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
+  version = "5.5.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
 
   src = fetchurl {
 
     url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
-    sha256 = "1n54a86491aqazqa4rgljbji638nj83ciibqxq46sa2m1php9dfd";
+    sha256 = "0qwbqnc6dhfnx3gdwl1lyhdsbclaxpkv3zr3dmxfx1242s64v0c1";
   };
 
   nativeBuildInputs = [

From 39e33a47b3dd73c96136bf33f886477c154fef47 Mon Sep 17 00:00:00 2001
From: Luke Bentley-Fox <git@lukebentleyfox.net>
Date: Sat, 17 Oct 2020 01:18:07 +0100
Subject: [PATCH 0124/3942] mpvScripts.mpris: Use mpv-unwrapped

Needed after #88620 to fix evaluation in some cases. Fixes #100771
---
 pkgs/applications/video/mpv/scripts/mpris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix
index f19db554d045..5f2a21ea7e44 100644
--- a/pkgs/applications/video/mpv/scripts/mpris.nix
+++ b/pkgs/applications/video/mpv/scripts/mpris.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv }:
+{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv-unwrapped }:
 
 stdenv.mkDerivation rec {
   pname = "mpv-mpris";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ glib mpv ];
+  buildInputs = [ glib mpv-unwrapped ];
 
   installFlags = [ "SCRIPTS_DIR=$(out)/share/mpv/scripts" ];
 

From c69dd49995325723280851dd70eda359cbc9d8ce Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sat, 17 Oct 2020 18:44:39 +0200
Subject: [PATCH 0125/3942] waifu2x-converter-cpp: 5.2.4 -> 5.3.3

---
 pkgs/tools/graphics/waifu2x-converter-cpp/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
index 66c8b1d5cc74..79fdd9c77778 100644
--- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
+++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
@@ -1,16 +1,16 @@
-{ cmake, fetchFromGitHub, opencv3, stdenv, opencl-headers
+{ cmake, fetchFromGitHub, opencv3, stdenv, ocl-icd, opencl-headers
 , cudaSupport ? false, cudatoolkit ? null
 }:
 
 stdenv.mkDerivation rec {
   pname = "waifu2x-converter-cpp";
-  version = "5.2.4";
+  version = "5.3.3";
 
   src = fetchFromGitHub {
     owner = "DeadSix27";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0r7xcjqbyaa20gsgmjj7645640g3nb2bn1pc1nlfplwlzjxmz213";
+    sha256 = "04r0xyjknvcwk70ilj1p3qwlcz3i6sqgcp0qbc9qwxnsgrrgz09w";
   };
 
   patchPhase = ''
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    opencv3 opencl-headers
+    opencv3 opencl-headers ocl-icd
   ] ++ stdenv.lib.optional cudaSupport cudatoolkit;
 
   nativeBuildInputs = [ cmake ];

From ca3dd4b52f6ffdb9310a9fca2be8a41e413ba857 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sat, 17 Oct 2020 20:05:13 +0200
Subject: [PATCH 0126/3942] waifu2x-converter-cpp: add OpenCL support

---
 pkgs/tools/graphics/waifu2x-converter-cpp/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
index 79fdd9c77778..fa2088ca297b 100644
--- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
+++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
@@ -1,4 +1,4 @@
-{ cmake, fetchFromGitHub, opencv3, stdenv, ocl-icd, opencl-headers
+{ cmake, fetchFromGitHub, makeWrapper, opencv3, stdenv, ocl-icd, opencl-headers
 , cudaSupport ? false, cudatoolkit ? null
 }:
 
@@ -19,10 +19,14 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    opencv3 opencl-headers ocl-icd
+    ocl-icd opencv3 opencl-headers
   ] ++ stdenv.lib.optional cudaSupport cudatoolkit;
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake makeWrapper ];
+
+  preFixup = ''
+    wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib"
+  '';
 
   meta = {
     description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV";

From e373dd9821aace6f2f6e94d03333ec2703ee65ae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 17 Oct 2020 18:49:08 +0000
Subject: [PATCH 0127/3942] bitwarden_rs: 1.16.3 -> 1.17.0

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

diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix
index c2bb83241861..57e865ef596a 100644
--- a/pkgs/tools/security/bitwarden_rs/default.nix
+++ b/pkgs/tools/security/bitwarden_rs/default.nix
@@ -8,13 +8,13 @@ let
 
 in rustPlatform.buildRustPackage rec {
   pname = "bitwarden_rs";
-  version = "1.16.3";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "dani-garcia";
     repo = pname;
     rev = version;
-    sha256 = "1scy8abzy6j1jsms84cg2nqkn1zsxr5mjikp2xh0yl0ckkk13ffn";
+    sha256 = "0hi29vy23a5r23pgzdssd2gvim8vw2vmykck5cl5phq11a3az31p";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec {
 
   RUSTC_BOOTSTRAP = 1;
 
-  cargoSha256 = "112mvgq581cms0war5dbni7f7yryjr5agryzn5qx835qkznzar8s";
+  cargoSha256 = "0hv3k5l85nz4syzamranhi237fiwkjnda8v5ssnm2nsmcm7ih9k8";
   cargoBuildFlags = [ featuresFlag ];
 
   checkPhase = ''

From 4627d7617da4291eb06d1f5c1a4da008c62ad4be Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 17 Oct 2020 19:12:17 +0000
Subject: [PATCH 0128/3942] bitwarden_rs-vault: 2.16.0b -> 2.16.1

---
 pkgs/tools/security/bitwarden_rs/vault.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix
index 8efa1e4bfd3b..786ff5784557 100644
--- a/pkgs/tools/security/bitwarden_rs/vault.nix
+++ b/pkgs/tools/security/bitwarden_rs/vault.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bitwarden_rs-vault";
-  version = "2.16.0b";
+  version = "2.16.1";
 
   src = fetchurl {
     url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
-    sha256 = "1p10a5rp2ymx675sbigwrkkfjvpk1lz3d43l2p2i1vbw153py3p1";
+    sha256 = "1c4fcf8jzgd6636wv903r5msc9z5l56l2i4k93kvb2zvg7qj014w";
   };
 
   buildCommand = ''

From 41e9a5305bd805ba227377d1b572c1ac30211c0b Mon Sep 17 00:00:00 2001
From: Luke Bentley-Fox <git@lukebentleyfox.net>
Date: Sat, 17 Oct 2020 22:43:23 +0100
Subject: [PATCH 0129/3942] powertop: strip hcitool FSH path

Fixes #99492
---
 pkgs/os-specific/linux/powertop/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index 4bf318d743ea..22e70fc0b658 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
     substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset"
+    substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool"
   '';
 
   meta = with stdenv.lib; {

From 26093e5f5677a4b7a8f4a46ba9dc7b0d737380a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 18 Oct 2020 02:01:45 +0200
Subject: [PATCH 0130/3942] Literate: 2019-01-01 -> unstable-2020-09-02

Fixes #100902
---
 .../tools/literate-programming/Literate/default.nix        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix
index c418c16b6704..428e6e444a21 100644
--- a/pkgs/development/tools/literate-programming/Literate/default.nix
+++ b/pkgs/development/tools/literate-programming/Literate/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchgit, dmd, dub }:
 
 stdenv.mkDerivation {
-  name = "Literate-2019-01-08";
+  pname = "Literate";
+  version = "unstable-2020-09-02";
 
   src = fetchgit {
     url = "https://github.com/zyedidia/Literate.git";
-    rev = "e20c5c86713701d4d17fd2881779d758a27a3e5a";
-    sha256 = "1pr7iipcnp6jxi13341p5b3szdrvs7aixpfbwifj6lgbb45vg9sm";
+    rev = "533991cca6ec7a608a778396d32d51b35182d944";
+    sha256 = "09h1as01z0fw0bj0kf1g9nlhvinya7sqq2x8qb6zmhvqqm6v4n49";
   };
 
   buildInputs = [ dmd dub ];

From 48c7d89f74e200d848d7a944f9da3365b35b0d20 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Oct 2020 00:44:26 +0000
Subject: [PATCH 0131/3942] cppzmq: 4.6.0 -> 4.7.1

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

diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index 240710b5a50f..fdd98cb00bf0 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cppzmq";
-  version = "4.6.0";
+  version = "4.7.1";
 
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "cppzmq";
     rev = "v${version}";
-    sha256 = "19acx2bzi4n6fdnfgkja1nds7m1bwg8lw5vfcijrx9fv75pa7m8h";
+    sha256 = "00lb3pv923nbpaf7ric2cv6lbpspknj0pxj6yj5jyah7r3zw692m";
   };
 
   nativeBuildInputs = [ cmake ];

From ed93d1de80e431a7f4c910507495f4e5c8d72296 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Oct 2020 03:15:17 +0000
Subject: [PATCH 0132/3942] elementary-planner: 2.4.6 -> 2.5.4

---
 pkgs/applications/office/elementary-planner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix
index c1d459a2df58..671613ddd32e 100644
--- a/pkgs/applications/office/elementary-planner/default.nix
+++ b/pkgs/applications/office/elementary-planner/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-planner";
-  version = "2.4.6";
+  version = "2.5.4";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planner";
     rev = version;
-    sha256 = "0z0997yq809wbsk3w21xv4fcrgqcb958qdlksf4rhzhfnwbiii6y";
+    sha256 = "0q5zmjh0d1mapgqb2a38spss280jkkc2n835kc7grzvs9jgq1k1k";
   };
 
   nativeBuildInputs = [

From e6e8e7282f1a48aa49b4772bf4f582c5a5dbf9d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Oct 2020 09:51:08 +0000
Subject: [PATCH 0133/3942] go-migrate: 4.12.2 -> 4.13.0

---
 pkgs/development/tools/go-migrate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix
index ee942beb92cc..e1e0d8c897c1 100644
--- a/pkgs/development/tools/go-migrate/default.nix
+++ b/pkgs/development/tools/go-migrate/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "go-migrate";
-  version = "4.12.2";
+  version = "4.13.0";
 
   src = fetchFromGitHub {
     owner = "golang-migrate";
     repo = "migrate";
     rev = "v${version}";
-    sha256 = "0vrc9y90aamj618sfipq2sgzllhdr4hmicj4yvl147klwb1rxlz6";
+    sha256 = "0rzx974cxsipbnggl3n4q6zsvm313svrg718gscydygk41m9nql9";
   };
 
-  vendorSha256 = "0jpz5xvwsw4l7nmi7s1grvbfy4xjp50hrjycwicgv2ll719gz5v0";
+  vendorSha256 = "1107syipynlfibzljyfgz81v1avi8axvsjpmrpj990pm83r9svc6";
 
   subPackages = [ "cmd/migrate" ];
 

From 29dcb8276c2069485418292c06c0a7af99486b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 16 Oct 2020 21:05:26 +0200
Subject: [PATCH 0134/3942] clintermission: init at 0.2.0

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

diff --git a/pkgs/development/python-modules/clintermission/default.nix b/pkgs/development/python-modules/clintermission/default.nix
new file mode 100644
index 000000000000..04e97f4c6693
--- /dev/null
+++ b/pkgs/development/python-modules/clintermission/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, prompt_toolkit }:
+
+buildPythonApplication rec {
+  pname = "clintermission";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "sebageek";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "09wl0rpw6c9hab51rs957z64b0v9j4fcbqbn726wnapf4z5w6yxv";
+  };
+
+  propagatedBuildInputs = [ prompt_toolkit ];
+
+  disabled = !isPy3k;
+
+  # repo contains no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "clintermission" ];
+
+  meta = with lib; {
+    description = "Non-fullscreen command-line selection menu";
+    homepage = "https://github.com/sebageek/clintermission";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 28092b35d84c..925439627f86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1208,6 +1208,8 @@ in {
 
   clint = callPackage ../development/python-modules/clint { };
 
+  clintermission = callPackage ../development/python-modules/clintermission { };
+
   clize = callPackage ../development/python-modules/clize { };
 
   clldutils = callPackage ../development/python-modules/clldutils { };

From 28bb32ff9e7385ca75e597488296477c9aeca1ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 16 Oct 2020 21:05:49 +0200
Subject: [PATCH 0135/3942] git-delete-merged-branches: init at 6.0.5

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-delete-merged-branches/default.nix    | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 130ace63b4bb..f18f919daf3d 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -82,6 +82,8 @@ let
 
   git-crypt = callPackage ./git-crypt { };
 
+  git-delete-merged-branches = callPackage ./git-delete-merged-branches { };
+
   git-dit = callPackage ./git-dit {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
diff --git a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix
new file mode 100644
index 000000000000..d5abd0a59761
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix
@@ -0,0 +1,28 @@
+{ lib, python3Packages, fetchFromGitHub, git }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "git-delete-merged-branches";
+  version = "6.0.5";
+
+  src = fetchFromGitHub {
+    owner = "hartwork";
+    repo = pname;
+    rev = version;
+    sha256 = "1mlmikcpm94nymid35v9rx9dyprhwidgwbdfd5zhsw502d40v0xp";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    colorama
+    clintermission
+  ];
+
+  checkInputs = [ git ]
+    ++ (with python3Packages; [ parameterized ]);
+
+  meta = with lib; {
+    description = "Command-line tool to delete merged Git branches";
+    homepage = "https://pypi.org/project/git-delete-merged-branches/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}

From a54f2e42eac289374f9df1f76d1a46c96c7aa5e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Oct 2020 11:05:26 +0000
Subject: [PATCH 0136/3942] gtk-layer-shell: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix
index 14f822432ee3..086f6472ee0a 100644
--- a/pkgs/development/libraries/gtk-layer-shell/default.nix
+++ b/pkgs/development/libraries/gtk-layer-shell/default.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gtk-layer-shell";
-  version = "0.2.0";
+  version = "0.3.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "wmww";
     repo = "gtk-layer-shell";
     rev = "v${version}";
-    sha256 = "0kas84z44p3vz92sljbnahh43wfj69knqsy1za729j8phrlwqdmg";
+    sha256 = "1f7hfwik7a9kzw0q1k3xc1yisrgg8lbp5pjr337phc9hm38lhq3c";
   };
 
   nativeBuildInputs = [

From aff604993fbc67300455b2ad90fefb7d837bfbe4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Oct 2020 12:28:47 +0000
Subject: [PATCH 0137/3942] hpx: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index b6d6b6887525..ba7da8f5b774 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hpx";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "STEllAR-GROUP";
     repo = "hpx";
     rev = version;
-    sha256 = "10hgjavhvn33y3k5j3l1326x13bxffghg2arxjrh7i7zd3qprfv5";
+    sha256 = "1ld2k00500p107jarw379hsd1nlnm33972nv9c3ssfq619bj01c9";
   };
 
   buildInputs = [ boost hwloc gperftools ];

From d22229eda33d8e55518fad2b31171d9aae4d9b1b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Oct 2020 13:23:55 +0000
Subject: [PATCH 0138/3942] ibus: 1.5.22 -> 1.5.23

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

diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 238e133495c9..32db48503919 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -60,13 +60,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "ibus";
-  version = "1.5.22";
+  version = "1.5.23";
 
   src = fetchFromGitHub {
     owner = "ibus";
     repo = "ibus";
     rev = version;
-    sha256 = "09ynn7gq84q18hhbg6wq2yrliwil42qbzxbwbpggry1s955jg5xb";
+    sha256 = "0qnblqhz8wyhchnm36zrxhbvi9g4fcwcgmw7p60yjybdlhq4asc7";
   };
 
   patches = [

From adbe903c9fc73d96892274eb0ee9129c784d1a2e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Oct 2020 14:59:06 +0000
Subject: [PATCH 0139/3942] jdupes: 1.18.2 -> 1.19.0

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

diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index 7d559a1468e3..a22fcc77dd96 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jdupes";
-  version = "1.18.2";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "jbruchon";
     repo  = "jdupes";
     rev   = "v${version}";
-    sha256 = "1gaqdcz0s31qncar9dzlr8izv50zlk4y6dgdm9xjk6as2g8b0fkk";
+    sha256 = "1f6qv701c4c9s4hliha7kp8wraq4jfx1jdk86ii10akkm07fkdlz";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
     # directories have such files and will be removed.

From 58ab512af3993dd993da3a983ac4badf4098330d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Oct 2020 17:53:39 +0000
Subject: [PATCH 0140/3942] libdigidocpp: 3.14.3 -> 3.14.4

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

diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index 940093ed4ba4..d966631dc276 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -2,12 +2,12 @@
 , xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }:
 
 stdenv.mkDerivation rec {
-  version = "3.14.3";
+  version = "3.14.4";
   pname = "libdigidocpp";
 
   src = fetchurl {
      url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
-     sha256 = "1hq1q2frqnm4wxcfr7vn8kqwyfdz3hx22w40kn69zh140pig6jc5";
+     sha256 = "1x72icq5lp5cfv6kyxqc3863wa164s0g41nbi6gldr8syprzdk1l";
   };
 
   nativeBuildInputs = [ cmake pkgconfig xxd ];

From 8a788b858799fc4ac8492eb544041483b75a1a66 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Sat, 17 Oct 2020 11:14:32 +1100
Subject: [PATCH 0141/3942] singularity: 3.6.3 -> 3.6.4

Important security release addressing CVE-2020-15229.
---
 pkgs/applications/virtualization/singularity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 2f2d66f3b2f5..a6d6cf76041d 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -18,11 +18,11 @@ with lib;
 
 buildGoPackage rec {
   pname = "singularity";
-  version = "3.6.3";
+  version = "3.6.4";
 
   src = fetchurl {
     url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
-    sha256 = "1zd29s8lggv4x5xracgzywayg1skl9qc2bqh1zdxh1wrg9sqbadi";
+    sha256 = "17z7v7pjq1ibl64ir4h183sp58v2x7iv6dn6imnnhkdvss0kl8vi";
   };
 
   goPackagePath = "github.com/sylabs/singularity";

From 8ad56944fa000006a057e191f70ff7752c6d540b Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Sun, 18 Oct 2020 23:06:49 -0400
Subject: [PATCH 0142/3942] imgbrd-grabber: init at 7.3.2

---
 .../graphics/imgbrd-grabber/default.nix       | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/applications/graphics/imgbrd-grabber/default.nix

diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix
new file mode 100644
index 000000000000..994f2a10e6cd
--- /dev/null
+++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, cmake
+, fetchzip
+, openssl
+, autoPatchelfHook
+, makeWrapper
+, qtmultimedia
+, wrapQtAppsHook
+}:
+stdenv.mkDerivation rec {
+  name = "imgbrd-grabber";
+  version = "7.3.2";
+
+  buildInputs = [
+    stdenv.cc.cc.lib
+    openssl
+    qtmultimedia
+  ];
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeWrapper
+    wrapQtAppsHook
+  ];
+
+  installPhase = ''
+    mkdir -p $out/share/grabber
+    cp -R * $out/share/grabber
+
+    mkdir -p $out/bin
+    ln -s $out/share/grabber/Grabber /$out/bin/grabber
+
+    mkdir -p $out/share/applications
+    mv $out/share/grabber/Grabber.desktop $out/share/applications/
+
+  '';
+
+  src = fetchzip {
+    url = "https://github.com/Bionus/imgbrd-grabber/releases/download/v${version}/Grabber_v${version}.tar.gz";
+    sha256 = "05isnqhvcp8ycaj8hx6wn0c3la729mb36dzpmlpxfb1p5dj8p49k";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/Bionus/imgbrd-grabber";
+    description = "Very customizable imageboard/booru downloader with powerful filenaming features.";
+    license = licenses.asl20;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ evanjs ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 850c4243b0d4..166cf8e079dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21429,6 +21429,8 @@ in
 
   img2pdf = with python3Packages; toPythonApplication img2pdf;
 
+  imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { };
+
   imgcat = callPackage ../applications/graphics/imgcat { };
 
   imgp = python3Packages.callPackage ../applications/graphics/imgp { };

From d38d3ef514c7721feb5171b765c527a4caee2cbb Mon Sep 17 00:00:00 2001
From: Jos van Bakel <jos@codeaddict.org>
Date: Fri, 20 Mar 2020 10:23:24 +0100
Subject: [PATCH 0143/3942] goreleaser: init at 0.132.0

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

diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
new file mode 100644
index 000000000000..da82da129e33
--- /dev/null
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "goreleaser";
+  version = "0.132.0";
+
+  src = fetchFromGitHub {
+    owner = "goreleaser";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1iwxlvwsmasp8gq1yh84hl9rys0hgm9fwpmsqh2mx9ln4prm7sgq";
+  };
+
+  modSha256 = "0a4qr8xsi4szggvzapw2ljvvvqjbyi15i4mi8myfhknlpxf65kcl";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+
+  meta = with lib; {
+    description = "Deliver Go binaries as fast and easily as possible";
+    homepage = "https://goreleaser.com";
+    maintainers = [ maintainers.c0deaddict ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43b69bae1003..7aeac7b2e610 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4143,6 +4143,8 @@ in
 
   gopro = callPackage ../tools/video/gopro { };
 
+  goreleaser = callPackage ../tools/misc/goreleaser { };
+
   goreplay = callPackage ../tools/networking/goreplay { };
 
   gource = callPackage ../applications/version-management/gource { };

From 580f0faa7512f09a7a6fd63282603111a0d48723 Mon Sep 17 00:00:00 2001
From: V <v@anomalous.eu>
Date: Mon, 19 Oct 2020 14:25:36 +0200
Subject: [PATCH 0144/3942] nixos/caddy: remove services.caddy.agree

This option is no longer referenced anywhere as of #99371.
---
 nixos/modules/services/web-servers/caddy.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index 72bf9a9a1f44..63ba75e660cb 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -24,6 +24,10 @@ let
     ${pkgs.jq}/bin/jq -s '.[0] * .[1]' ${adaptedConfig} ${tlsJSON} > $out
   '';
 in {
+  imports = [
+    (mkRemovedOptionModule [ "services" "caddy" "agree" ] "this option is no longer necessary for Caddy 2")
+  ];
+
   options.services.caddy = {
     enable = mkEnableOption "Caddy web server";
 
@@ -66,12 +70,6 @@ in {
       description = "Email address (for Let's Encrypt certificate)";
     };
 
-    agree = mkOption {
-      default = false;
-      type = types.bool;
-      description = "Agree to Let's Encrypt Subscriber Agreement";
-    };
-
     dataDir = mkOption {
       default = "/var/lib/caddy";
       type = types.path;

From 5584227701fe81130a3dcad35a9caf06676d6521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 20 Oct 2020 01:14:53 +0200
Subject: [PATCH 0145/3942] =?UTF-8?q?lib3mf:=201.8.1=20=E2=86=92=202.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix
index 5d1894da5799..10732a14e488 100644
--- a/pkgs/development/libraries/lib3mf/default.nix
+++ b/pkgs/development/libraries/lib3mf/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lib3mf";
-  version = "1.8.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "3MFConsortium";
     repo = pname;
     rev = "v${version}";
-    sha256 = "11wpk6n9ga2p57h1dcrp37w77mii0r7r6mlrgmykf7rvii1rzgqd";
+    sha256 = "0w4d9zvl95g1x3r5nyd6cr27g6fwhhwaivh8a5r1xs5l6if21x19";
   };
 
   nativeBuildInputs = [ cmake ninja ];
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   buildInputs = if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ];
 
   postPatch = ''
-    rmdir UnitTests/googletest
-    ln -s ${gtest.src} UnitTests/googletest
+    rmdir Tests/googletest
+    ln -s ${gtest.src} Tests/googletest
 
     # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
     sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in

From 99e2f6cb8eb52bc37771f1354e74e419efc7827d Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Mon, 19 Oct 2020 20:29:30 -0400
Subject: [PATCH 0146/3942] imgbrd-grabber: build from source

---
 .../graphics/imgbrd-grabber/default.nix       | 91 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix
index 994f2a10e6cd..259f40567072 100644
--- a/pkgs/applications/graphics/imgbrd-grabber/default.nix
+++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix
@@ -1,50 +1,87 @@
 { stdenv
 , cmake
-, fetchzip
-, openssl
-, autoPatchelfHook
-, makeWrapper
-, qtmultimedia
+, fetchFromGitHub
 , wrapQtAppsHook
+, qtmultimedia
+, qttools
+, qtscript
+, qtdeclarative
+, qtbase
+, autogen
+, automake
+, makeWrapper
+, catch2
+, nodejs
+, libpulseaudio
+, openssl
+, rsync
+, typescript
 }:
 stdenv.mkDerivation rec {
   name = "imgbrd-grabber";
+
   version = "7.3.2";
+  src = fetchFromGitHub {
+    owner = "Bionus";
+    repo = "imgbrd-grabber";
+    rev = "v${version}";
+    sha256 = "053rwvcr88fcba0447a6r115cgnqsm9rl066z8d5jacqnhdij58k";
+    fetchSubmodules = true;
+  };
 
   buildInputs = [
-    stdenv.cc.cc.lib
     openssl
-    qtmultimedia
+    makeWrapper
+    libpulseaudio
+    typescript
   ];
 
   nativeBuildInputs = [
-    autoPatchelfHook
-    makeWrapper
+    qtmultimedia
+    qtbase
+    qtdeclarative
+    qttools
+    nodejs
+    cmake
     wrapQtAppsHook
   ];
 
-  installPhase = ''
-    mkdir -p $out/share/grabber
-    cp -R * $out/share/grabber
+  extraOutputsToLink = [ "doc" ];
 
-    mkdir -p $out/bin
-    ln -s $out/share/grabber/Grabber /$out/bin/grabber
+  postPatch = ''
+    # the package.sh script provides some install helpers
+    # using this might make it easier to maintain/less likely for the
+    # install phase to fail across version bumps
+    patchShebangs ./scripts/package.sh
 
-    mkdir -p $out/share/applications
-    mv $out/share/grabber/Grabber.desktop $out/share/applications/
+    # ensure the script uses the rsync package from nixpkgs
+    substituteInPlace ../scripts/package.sh --replace "rsync" "${rsync}/bin/rsync"
 
+
+    # the npm build step only runs typescript
+    # run this step directly so it doesn't try and fail to download the unnecessary node_modules, etc.
+    substituteInPlace ./sites/CMakeLists.txt --replace "npm install" "npm run build"
+
+    # remove the vendored catch2
+    rm -rf tests/src/vendor/catch
+
+    # link the catch2 sources from nixpkgs
+    ln -sf ${catch2.src} tests/src/vendor/catch
   '';
 
-  src = fetchzip {
-    url = "https://github.com/Bionus/imgbrd-grabber/releases/download/v${version}/Grabber_v${version}.tar.gz";
-    sha256 = "05isnqhvcp8ycaj8hx6wn0c3la729mb36dzpmlpxfb1p5dj8p49k";
-  };
+  postInstall = ''
+    # move the binaries to the share/Grabber folder so 
+    # some relative links can be resolved (e.g. settings.ini)
+    mv $out/bin/* $out/share/Grabber/
+    
+    cd ../..
+    # run the package.sh with $out/share/Grabber as the $APP_DIR 
+    sh ./scripts/package.sh $out/share/Grabber
 
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/Bionus/imgbrd-grabber";
-    description = "Very customizable imageboard/booru downloader with powerful filenaming features.";
-    license = licenses.asl20;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ evanjs ];
-  };
+    # add symlinks for the binaries to $out/bin
+    ln -s $out/share/Grabber/Grabber $out/bin/Grabber
+    ln -s $out/share/Grabber/Grabber-cli $out/bin/Grabber-cli
+  '';
+
+  sourceRoot = "source/src";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 166cf8e079dd..fbac860828b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21429,7 +21429,9 @@ in
 
   img2pdf = with python3Packages; toPythonApplication img2pdf;
 
-  imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { };
+  imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix { 
+    typescript = nodePackages.typescript;
+  };
 
   imgcat = callPackage ../applications/graphics/imgcat { };
 

From 80d34ab9a4822c2ede2642274ce2af5cc25d2897 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Mon, 19 Oct 2020 20:52:25 -0400
Subject: [PATCH 0147/3942] Remove trailing whitespace

---
 pkgs/applications/graphics/imgbrd-grabber/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix
index 259f40567072..883279511162 100644
--- a/pkgs/applications/graphics/imgbrd-grabber/default.nix
+++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix
@@ -70,10 +70,10 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    # move the binaries to the share/Grabber folder so 
+    # move the binaries to the share/Grabber folder so
     # some relative links can be resolved (e.g. settings.ini)
     mv $out/bin/* $out/share/Grabber/
-    
+
     cd ../..
     # run the package.sh with $out/share/Grabber as the $APP_DIR 
     sh ./scripts/package.sh $out/share/Grabber
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbac860828b8..54fd9d260d87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21429,7 +21429,7 @@ in
 
   img2pdf = with python3Packages; toPythonApplication img2pdf;
 
-  imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix { 
+  imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix {
     typescript = nodePackages.typescript;
   };
 

From 3835f35f2b965b78204344ab50dbba23fb9e48ff Mon Sep 17 00:00:00 2001
From: V <v@anomalous.eu>
Date: Tue, 20 Oct 2020 03:27:03 +0200
Subject: [PATCH 0148/3942] uemacs: remove

This crashes with a buffer overflow upon running it. It has likely been
broken for some time. It has no maintainers. It is also unfree.
---
 pkgs/applications/editors/uemacs/default.nix | 38 --------------------
 pkgs/top-level/all-packages.nix              |  2 --
 2 files changed, 40 deletions(-)
 delete mode 100644 pkgs/applications/editors/uemacs/default.nix

diff --git a/pkgs/applications/editors/uemacs/default.nix b/pkgs/applications/editors/uemacs/default.nix
deleted file mode 100644
index e14a07eb6835..000000000000
--- a/pkgs/applications/editors/uemacs/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchgit, ncurses }:
-
-stdenv.mkDerivation {
-  pname = "uemacs";
-  version = "2014-12-08";
-
-  src = fetchgit {
-    url = "git://git.kernel.org/pub/scm/editors/uemacs/uemacs.git";
-    rev = "8841922689769960fa074fbb053cb8507f2f3ed9";
-    sha256 = "14yq7kpkax111cg6k7i3mnqk7sq7a65krq6qizzj7vvnm7bsj3sd";
-  };
-
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace "-lcurses" "-lncurses" \
-      --replace "CFLAGS=-O2" "CFLAGS+=" \
-      --replace "BINDIR=/usr/bin" "BINDIR=$out/bin" \
-      --replace "LIBDIR=/usr/lib" "LIBDIR=$out/share/uemacs"
-    substituteInPlace epath.h \
-      --replace "/usr/global/lib/" "$out/share/uemacs/" \
-      --replace "/usr/local/bin/" "$out/bin/" \
-      --replace "/usr/local/lib/" "$out/share/uemacs/" \
-      --replace "/usr/local/" "$out/bin/" \
-      --replace "/usr/lib/" "$out/share/uemacs/"
-    mkdir -p $out/bin $out/share/uemacs
-  '';
-
-  buildInputs = [ ncurses ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://git.kernel.org/cgit/editors/uemacs/uemacs.git";
-    description = "Torvalds Micro-emacs fork";
-    longDescription = ''
-      uEmacs/PK 4.0 is a full screen editor based on MicroEMACS 3.9e
-    '';
-    license = licenses.unfree;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c74f2249fc89..870a7fe39d14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7939,8 +7939,6 @@ in
 
   udunits = callPackage ../development/libraries/udunits { };
 
-  uemacs = callPackage ../applications/editors/uemacs { };
-
   uftp = callPackage ../servers/uftp {};
 
   uhttpmock = callPackage ../development/libraries/uhttpmock { };

From 04bac4958cd5034df19709e4bdd1954326b1f583 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Mon, 19 Oct 2020 22:42:34 -0400
Subject: [PATCH 0149/3942] Remove trailing whitespace

---
 pkgs/applications/graphics/imgbrd-grabber/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix
index 883279511162..f07db4c5c4a6 100644
--- a/pkgs/applications/graphics/imgbrd-grabber/default.nix
+++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     mv $out/bin/* $out/share/Grabber/
 
     cd ../..
-    # run the package.sh with $out/share/Grabber as the $APP_DIR 
+    # run the package.sh with $out/share/Grabber as the $APP_DIR
     sh ./scripts/package.sh $out/share/Grabber
 
     # add symlinks for the binaries to $out/bin

From 6a1a32071ca582212d25ec88000f39a8904ed2c0 Mon Sep 17 00:00:00 2001
From: Dirk Osburg <git@dirk-osburg.de>
Date: Tue, 20 Oct 2020 11:55:46 +0200
Subject: [PATCH 0150/3942] keepassrpc: 1.8.0 -> 1.14.0

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

diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
index 3d41c45f6dc5..b28914a44a81 100644
--- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
@@ -1,13 +1,13 @@
 { stdenv, buildEnv, fetchurl, mono }:
 
 let
-  version = "1.8.0";
+  version = "1.14.0";
   drv = stdenv.mkDerivation {
     pname = "keepassrpc";
     inherit version;
     src = fetchurl {
       url    = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx";
-      sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd";
+      sha256 = "1c410cc93c0252e7cfdb02507b8172c13e18d12c97f08630b721d897dc9b8b24";
     };
 
     meta = with stdenv.lib; {

From fdc5b324d66a276ea5615e05afbc2b3854a6b573 Mon Sep 17 00:00:00 2001
From: JesusMtnez <jesusmartinez93@gmail.com>
Date: Wed, 7 Oct 2020 10:01:53 +0200
Subject: [PATCH 0151/3942] slack: 4.9.0 -> 4.10.3

---
 .../networking/instant-messengers/slack/default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 2edccd8c019e..bd41fc562bfc 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -40,8 +40,8 @@ let
 
   pname = "slack";
   version = {
-    x86_64-darwin = "4.9.0";
-    x86_64-linux = "4.9.1";
+    x86_64-darwin = "4.10.3";
+    x86_64-linux = "4.10.3";
   }.${system} or throwSystem;
 
   src = let
@@ -49,11 +49,11 @@ let
   in {
     x86_64-darwin = fetchurl {
       url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
-      sha256 = "007fflncvvclj4agb6g5hc5k9j5hhz1rpvlcfd8w31rn1vad4abk";
+      sha256 = "0r77l57vr603xamich4h4gbdd5vdcj0sjs6yjpymfx9s0f98v8bb";
     };
     x86_64-linux = fetchurl {
       url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
-      sha256 = "1n8br5vlcnf13b8m6727hy4bkmd6wayss96ck4ba9zsjiyj7v74i";
+      sha256 = "1gnjj2iyk8cwjajg8h9qpmzx10j4qjxjzciq8csg45qfzwkr3drf";
     };
   }.${system} or throwSystem;
 

From 323b47d96e26963c0a3d7aa4724af88c02096e32 Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Sun, 4 Oct 2020 20:38:11 +0900
Subject: [PATCH 0152/3942] epgstation: add updateScript

---
 .../services/video/epgstation/generate        |  31 ----
 .../applications/video/epgstation/default.nix | 143 +++++++++++-------
 .../applications/video/epgstation/generate.sh |  34 -----
 pkgs/applications/video/epgstation/update.nix |  66 ++++++++
 4 files changed, 156 insertions(+), 118 deletions(-)
 delete mode 100755 nixos/modules/services/video/epgstation/generate
 delete mode 100755 pkgs/applications/video/epgstation/generate.sh
 create mode 100644 pkgs/applications/video/epgstation/update.nix

diff --git a/nixos/modules/services/video/epgstation/generate b/nixos/modules/services/video/epgstation/generate
deleted file mode 100755
index 2940768b6d2c..000000000000
--- a/nixos/modules/services/video/epgstation/generate
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env -S nix-build --no-out-link
-
-# Script to generate default streaming configurations for EPGStation. There's
-# no need to run this script directly since generate.sh in the EPGStation
-# package directory would run this script for you.
-#
-# Usage: ./generate | xargs cat > streaming.json
-
-{ pkgs ? (import ../../../../.. {}) }:
-
-let
-  sampleConfigPath = "${pkgs.epgstation.src}/config/config.sample.json";
-  sampleConfig = builtins.fromJSON (builtins.readFile sampleConfigPath);
-  streamingConfig = {
-    inherit (sampleConfig)
-      mpegTsStreaming
-      mpegTsViewer
-      liveHLS
-      liveMP4
-      liveWebM
-      recordedDownloader
-      recordedStreaming
-      recordedViewer
-      recordedHLS;
-  };
-in
-pkgs.runCommand "streaming.json" { nativeBuildInputs = [ pkgs.jq ]; } ''
-  jq . <<<'${builtins.toJSON streamingConfig}' > $out
-''
-
-# vim:set ft=nix:
diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix
index e57f46c8c6ad..6a2876c1ed7e 100644
--- a/pkgs/applications/video/epgstation/default.nix
+++ b/pkgs/applications/video/epgstation/default.nix
@@ -1,6 +1,27 @@
-{ stdenv, fetchFromGitHub, makeWrapper, bash, nodejs, nodePackages, gzip }:
+{ stdenv
+, fetchFromGitHub
+, common-updater-scripts
+, genericUpdater
+, writers
+, makeWrapper
+, bash
+, nodejs
+, nodePackages
+, gzip
+, jq
+}:
 
 let
+  # NOTE: use updateScript to bump the package version
+  pname = "EPGStation";
+  version = "1.7.4";
+  src = fetchFromGitHub {
+    owner = "l3tnun";
+    repo = "EPGStation";
+    rev = "v${version}";
+    sha256 = "15z1kdbamj97frp3dfnbm0h8krihmv2xdab4id0rxin29ibrw1k2";
+  };
+
   workaround-opencollective-buildfailures = stdenv.mkDerivation {
     # FIXME: This should be removed when a complete fix is available
     # https://github.com/svanderburg/node2nix/issues/145
@@ -12,67 +33,73 @@ let
       chmod +x $out/bin/opencollective-postinstall
     '';
   };
-in
-nodePackages.epgstation.override (drv: {
-  src = fetchFromGitHub {
-    owner = "l3tnun";
-    repo = "EPGStation";
-    rev = "v${drv.version}"; # version specified in ./generate.sh
-    sha256 = "15z1kdbamj97frp3dfnbm0h8krihmv2xdab4id0rxin29ibrw1k2";
-  };
 
-  buildInputs = [ bash ];
-  nativeBuildInputs = [
-    workaround-opencollective-buildfailures
-    makeWrapper
-    nodePackages.node-pre-gyp
-  ];
+  pkg = nodePackages.epgstation.override (drv: {
+    inherit src;
 
-  preRebuild = ''
-    # Fix for not being able to connect to mysql using domain sockets.
-    patch -p1 ${./use-mysql-over-domain-socket.patch}
-  '';
+    buildInputs = [ bash ];
+    nativeBuildInputs = [
+      workaround-opencollective-buildfailures
+      makeWrapper
+      nodePackages.node-pre-gyp
+    ];
 
-  postInstall = let
-    runtimeDeps = [ nodejs bash ];
-  in
-  ''
-    mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1}
+    preRebuild = ''
+      # Fix for not being able to connect to mysql using domain sockets.
+      patch -p1 ${./use-mysql-over-domain-socket.patch}
+    '';
 
-    pushd $out/lib/node_modules/EPGStation
+    postInstall = let
+      runtimeDeps = [ nodejs bash ];
+    in
+    ''
+      mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1}
 
-    npm run build
-    npm prune --production
+      pushd $out/lib/node_modules/EPGStation
 
-    mv config/{enc.sh,enc.js} $out/libexec
-    mv LICENSE Readme.md $out/share/doc/epgstation
-    mv doc/* $out/share/doc/epgstation
-    sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \
-      | ${gzip}/bin/gzip > $out/share/man/man1/epgstation.1.gz
-    rm -rf doc
+      npm run build
+      npm prune --production
 
-    # just log to stdout and let journald do its job
-    rm -rf logs
+      mv config/{enc.sh,enc.js} $out/libexec
+      mv LICENSE Readme.md $out/share/doc/epgstation
+      mv doc/* $out/share/doc/epgstation
+      sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \
+        | ${gzip}/bin/gzip > $out/share/man/man1/epgstation.1.gz
+      rm -rf doc
 
-    # Replace the existing configuration and runtime state directories with
-    # symlinks. Without this, they would all be non-writable because they reside
-    # in the Nix store. Note that the source path won't be accessible at build
-    # time.
-    rm -r config data recorded thumbnail
-    ln -sfT /etc/epgstation config
-    ln -sfT /var/lib/epgstation data
-    ln -sfT /var/lib/epgstation/recorded recorded
-    ln -sfT /var/lib/epgstation/thumbnail thumbnail
+      # just log to stdout and let journald do its job
+      rm -rf logs
 
-    makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \
-     --run "cd $out/lib/node_modules/EPGStation" \
-     --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}
+      # Replace the existing configuration and runtime state directories with
+      # symlinks. Without this, they would all be non-writable because they
+      # reside in the Nix store. Note that the source path won't be accessible
+      # at build time.
+      rm -r config data recorded thumbnail
+      ln -sfT /etc/epgstation config
+      ln -sfT /var/lib/epgstation data
+      ln -sfT /var/lib/epgstation/recorded recorded
+      ln -sfT /var/lib/epgstation/thumbnail thumbnail
 
-    popd
-  '';
+      makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \
+       --run "cd $out/lib/node_modules/EPGStation" \
+       --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}
 
-  meta = with stdenv.lib; drv.meta // {
-    maintainers = with maintainers; [ midchildan ];
+      popd
+    '';
+
+    # NOTE: this may take a while since it has to update all packages in
+    # nixpkgs.nodePackages
+    passthru.updateScript = import ./update.nix {
+      inherit (stdenv) lib;
+      inherit (src.meta) homepage;
+      inherit
+        pname
+        version
+        common-updater-scripts
+        genericUpdater
+        writers
+        jq;
+    };
 
     # nodePackages.epgstation is a stub package to fetch npm dependencies and
     # is marked as broken to prevent users from installing it directly. This
@@ -80,6 +107,16 @@ nodePackages.epgstation.override (drv: {
     # nixpkgs while still allowing us to heavily customize the build. It also
     # allows us to provide devDependencies for the epgstation build process
     # without doing the same for all the other node packages.
-    broken = false;
+    meta = drv.meta // { broken = false; };
+  });
+in
+pkg // {
+  name = "${pname}-${version}";
+
+  meta = with stdenv.lib; pkg.meta // {
+    maintainers = with maintainers; [ midchildan ];
+
+    # NOTE: updateScript relies on this being correct
+    position = toString ./default.nix + ":1";
   };
-})
+}
diff --git a/pkgs/applications/video/epgstation/generate.sh b/pkgs/applications/video/epgstation/generate.sh
deleted file mode 100755
index d193a015064c..000000000000
--- a/pkgs/applications/video/epgstation/generate.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-# Script to generate the Nix package definition for EPGStation. Run this script
-# when bumping the package version.
-
-VERSION="1.7.4"
-URL="https://raw.githubusercontent.com/l3tnun/EPGStation/v$VERSION/package.json"
-JQ_BIN="$(nix-build ../../../.. --no-out-link -A jq)/bin/jq"
-
-set -eu -o pipefail
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-main() {
-    # update package.json
-    curl -sSfL "$URL" \
-        | jq '. + {"dependencies": (.devDependencies + .dependencies)} | del(.devDependencies)' \
-        > package.json
-
-    # regenerate node packages to update the actual Nix package
-    pushd ../../../development/node-packages \
-        && ./generate.sh
-    popd
-
-    # generate default streaming settings for EPGStation
-    pushd ../../../../nixos/modules/services/video/epgstation \
-        && cat "$(./generate)" > streaming.json
-    popd
-}
-
-jq() {
-    "$JQ_BIN" "$@"
-}
-
-main "@"
diff --git a/pkgs/applications/video/epgstation/update.nix b/pkgs/applications/video/epgstation/update.nix
new file mode 100644
index 000000000000..9faa83c64f9e
--- /dev/null
+++ b/pkgs/applications/video/epgstation/update.nix
@@ -0,0 +1,66 @@
+{ pname
+, version
+, homepage
+, lib
+, common-updater-scripts
+, genericUpdater
+, writers
+, jq
+}:
+
+let
+  updater = genericUpdater {
+    inherit pname version;
+    attrPath = lib.toLower pname;
+    rev-prefix = "v";
+    versionLister = "${common-updater-scripts}/bin/list-git-tags ${homepage}";
+  };
+  updateScript = builtins.elemAt updater 0;
+  updateArgs = map (lib.escapeShellArg) (builtins.tail updater);
+in writers.writeBash "update-epgstation" ''
+  set -euxo pipefail
+
+  # bump the version
+  ${updateScript} ${lib.concatStringsSep " " updateArgs}
+
+  cd "${toString ./.}"
+
+  # Get the path to the latest source. Note that we can't just pass the value
+  # of epgstation.src directly because it'd be evaluated before we can run
+  # updateScript.
+  SRC="$(nix-build ../../../.. --no-out-link -A epgstation.src)"
+  if [[ "${version}" == "$(${jq}/bin/jq -r .version "$SRC/package.json")" ]]; then
+    echo "[INFO] Already using the latest version of ${pname}" >&2
+    exit
+  fi
+
+  # Regenerate package.json from the latest source.
+  ${jq}/bin/jq '. + {
+      dependencies: (.dependencies + .devDependencies),
+    } | del(.devDependencies, .main, .scripts)' \
+    "$SRC/package.json" \
+    > package.json
+
+  # Regenerate node packages to update the pre-overriden epgstation derivation.
+  # This must come *after* package.json has been regenerated.
+  pushd ../../../development/node-packages
+  ./generate.sh
+  popd
+
+  # Generate default streaming settings for the nixos module.
+  pushd ../../../../nixos/modules/services/video/epgstation
+  ${jq}/bin/jq '
+    { liveHLS
+    , liveMP4
+    , liveWebM
+    , mpegTsStreaming
+    , mpegTsViewer
+    , recordedDownloader
+    , recordedStreaming
+    , recordedHLS
+    , recordedViewer
+    }' \
+    "$SRC/config/config.sample.json" \
+    > streaming.json
+  popd
+''

From c82aa7580cd2160d07c97ec5a07a809079b47d65 Mon Sep 17 00:00:00 2001
From: Lucas Denefle <lucas.denefle@converge.io>
Date: Tue, 20 Oct 2020 15:23:46 +0100
Subject: [PATCH 0153/3942] maintainers: add ldenefle

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 52262d6e3ab1..cf7b8566ec9c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4778,6 +4778,12 @@
     githubId = 20250323;
     name = "Lucio Delelis";
   };
+  ldenefle = {
+    email = "ldenefle@gmail.com";
+    github = "ldenefle";
+    githubId = 20558127;
+    name = "Lucas Denefle";
+  };
   ldesgoui = {
     email = "ldesgoui@gmail.com";
     github = "ldesgoui";

From cba7a74806edfb9f16fc077086ec5a0b32485d77 Mon Sep 17 00:00:00 2001
From: Lucas Denefle <lucas.denefle@converge.io>
Date: Tue, 20 Oct 2020 15:26:35 +0100
Subject: [PATCH 0154/3942] gitAndTools.git-chglog: init at 0.9.1

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-chglog/default.nix      | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-chglog/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 130ace63b4bb..14ce96a75eac 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -72,6 +72,8 @@ let
   # support for bugzilla
   git-bz = callPackage ./git-bz { };
 
+  git-chglog = callPackage ./git-chglog { };
+
   git-cinnabar = callPackage ./git-cinnabar { };
 
   git-codeowners = callPackage ./git-codeowners { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix
new file mode 100644
index 000000000000..05d5dfe96056
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "git-chglog";
+  version = "0.9.1";
+
+  goPackagePath = "github.com/git-chglog/git-chglog";
+
+  src = fetchFromGitHub {
+    owner = "git-chglog";
+    repo = "git-chglog";
+    rev = version;
+    sha256 = "08x7w1jlvxxvwnz6pvkjmfd3nqayd8n15r9jbqi2amrp31z0gq0p";
+  };
+
+  meta = with lib; {
+    description = "CHANGELOG generator implemented in Go (Golang)";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ldenefle ];
+  };
+}
+

From e2a3a02b9b3b3f252f087655618db2244487555c Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Mon, 5 Oct 2020 21:34:32 +0900
Subject: [PATCH 0155/3942] epgstation: 1.7.4 -> 1.7.5

---
 .../services/video/epgstation/streaming.json  |  130 +-
 .../applications/video/epgstation/default.nix |    4 +-
 .../video/epgstation/package.json             |  106 +-
 .../node-packages/node-packages.nix           | 1477 ++++++++++-------
 4 files changed, 981 insertions(+), 736 deletions(-)

diff --git a/nixos/modules/services/video/epgstation/streaming.json b/nixos/modules/services/video/epgstation/streaming.json
index 37957f6cb6a2..8eb99cf85584 100644
--- a/nixos/modules/services/video/epgstation/streaming.json
+++ b/nixos/modules/services/video/epgstation/streaming.json
@@ -1,119 +1,119 @@
 {
   "liveHLS": [
     {
-      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%",
-      "name": "720p"
+      "name": "720p",
+      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%"
     },
     {
-      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%",
-      "name": "480p"
+      "name": "480p",
+      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%"
     },
     {
-      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 48k -ac 2 -c:v libx264 -vf yadif,scale=-2:180 -b:v 100k -preset veryfast -maxrate 110k -bufsize 1000k -flags +loop-global_header %OUTPUT%",
-      "name": "180p"
+      "name": "180p",
+      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 48k -ac 2 -c:v libx264 -vf yadif,scale=-2:180 -b:v 100k -preset veryfast -maxrate 110k -bufsize 1000k -flags +loop-global_header %OUTPUT%"
     }
   ],
   "liveMP4": [
     {
-      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1",
-      "name": "720p"
+      "name": "720p",
+      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1"
     },
     {
-      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1",
-      "name": "480p"
+      "name": "480p",
+      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1"
     }
   ],
   "liveWebM": [
     {
-      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1",
-      "name": "720p"
+      "name": "720p",
+      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1"
     },
     {
-      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1",
-      "name": "480p"
+      "name": "480p",
+      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1"
     }
   ],
   "mpegTsStreaming": [
     {
-      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1",
-      "name": "720p"
+      "name": "720p",
+      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1"
     },
     {
-      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1",
-      "name": "480p"
+      "name": "480p",
+      "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1"
     },
     {
       "name": "Original"
     }
   ],
   "mpegTsViewer": {
-    "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end",
-    "ios": "vlc-x-callback://x-callback-url/stream?url=http://ADDRESS"
+    "ios": "vlc-x-callback://x-callback-url/stream?url=http://ADDRESS",
+    "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end"
   },
   "recordedDownloader": {
-    "android": "intent://ADDRESS#Intent;package=com.dv.adm;type=video;scheme=http;end",
-    "ios": "vlc-x-callback://x-callback-url/download?url=http://ADDRESS&filename=FILENAME"
+    "ios": "vlc-x-callback://x-callback-url/download?url=http://ADDRESS&filename=FILENAME",
+    "android": "intent://ADDRESS#Intent;package=com.dv.adm;type=video;scheme=http;end"
   },
-  "recordedHLS": [
-    {
-      "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%",
-      "name": "720p"
-    },
-    {
-      "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%",
-      "name": "480p"
-    },
-    {
-      "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_type fmp4 -hls_fmp4_init_filename stream%streamNum%-init.mp4 -hls_segment_filename stream%streamNum%-%09d.m4s -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx265 -vf yadif,scale=-2:480 -b:v 350k -preset veryfast -tag:v hvc1 %OUTPUT%",
-      "name": "480p(h265)"
-    }
-  ],
   "recordedStreaming": {
-    "mp4": [
+    "webm": [
       {
-        "ab": "192k",
-        "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1",
         "name": "720p",
-        "vb": "3000k"
+        "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1",
+        "vb": "3000k",
+        "ab": "192k"
       },
       {
-        "ab": "128k",
-        "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1",
         "name": "360p",
-        "vb": "1500k"
+        "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1",
+        "vb": "1500k",
+        "ab": "128k"
+      }
+    ],
+    "mp4": [
+      {
+        "name": "720p",
+        "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1",
+        "vb": "3000k",
+        "ab": "192k"
+      },
+      {
+        "name": "360p",
+        "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1",
+        "vb": "1500k",
+        "ab": "128k"
       }
     ],
     "mpegTs": [
       {
-        "ab": "192k",
-        "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1",
         "name": "720p (H.264)",
-        "vb": "3000k"
+        "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1",
+        "vb": "3000k",
+        "ab": "192k"
       },
       {
-        "ab": "128k",
-        "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1",
         "name": "360p (H.264)",
-        "vb": "1500k"
-      }
-    ],
-    "webm": [
-      {
-        "ab": "192k",
-        "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1",
-        "name": "720p",
-        "vb": "3000k"
-      },
-      {
-        "ab": "128k",
-        "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1",
-        "name": "360p",
-        "vb": "1500k"
+        "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1",
+        "vb": "1500k",
+        "ab": "128k"
       }
     ]
   },
+  "recordedHLS": [
+    {
+      "name": "720p",
+      "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%"
+    },
+    {
+      "name": "480p",
+      "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%"
+    },
+    {
+      "name": "480p(h265)",
+      "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_type fmp4 -hls_fmp4_init_filename stream%streamNum%-init.mp4 -hls_segment_filename stream%streamNum%-%09d.m4s -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx265 -vf yadif,scale=-2:480 -b:v 350k -preset veryfast -tag:v hvc1 %OUTPUT%"
+    }
+  ],
   "recordedViewer": {
-    "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end",
-    "ios": "infuse://x-callback-url/play?url=http://ADDRESS"
+    "ios": "infuse://x-callback-url/play?url=http://ADDRESS",
+    "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end"
   }
 }
diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix
index 6a2876c1ed7e..62aa54ca7844 100644
--- a/pkgs/applications/video/epgstation/default.nix
+++ b/pkgs/applications/video/epgstation/default.nix
@@ -14,12 +14,12 @@
 let
   # NOTE: use updateScript to bump the package version
   pname = "EPGStation";
-  version = "1.7.4";
+  version = "1.7.5";
   src = fetchFromGitHub {
     owner = "l3tnun";
     repo = "EPGStation";
     rev = "v${version}";
-    sha256 = "15z1kdbamj97frp3dfnbm0h8krihmv2xdab4id0rxin29ibrw1k2";
+    sha256 = "06yaf5yb5rp3q0kdhw33df7px7vyfby885ckb6bdzw3wnams5d8m";
   };
 
   workaround-opencollective-buildfailures = stdenv.mkDerivation {
diff --git a/pkgs/applications/video/epgstation/package.json b/pkgs/applications/video/epgstation/package.json
index 96525ec809ec..53b1ebca2da7 100644
--- a/pkgs/applications/video/epgstation/package.json
+++ b/pkgs/applications/video/epgstation/package.json
@@ -1,23 +1,7 @@
 {
   "name": "EPGStation",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "DTV Software in Japan.",
-  "main": "dist/server/index.js",
-  "scripts": {
-    "start": "node dist/server/index.js",
-    "dev-start": "node dist/server/index.js --env development",
-    "clean": "gulp clean",
-    "build": "gulp build --max_old_space_size=768 --env production",
-    "dev-build": "gulp build --max_old_space_size=512 --env development",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "task": "gulp --max_old_space_size=512",
-    "install-win-service": "winser -i -a",
-    "uninstall-win-service": "winser -r -x",
-    "backup": "node dist/server/DBTools.js -m backup -o",
-    "restore": "node dist/server/DBTools.js -m restore -o",
-    "move-log": "node dist/server/LogFileMoveTools.js",
-    "convert-str": "node dist/server/ConvertDBStrTools.js"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/l3tnun/EPGStation.git"
@@ -32,23 +16,53 @@
     "node": "^10.x.x < 11 || ^12.14.0 < 13 || ^14.5.0 < 15"
   },
   "dependencies": {
+    "aribts": "^2.1.12",
+    "b24.js": "1.0.3",
+    "basic-auth": "2.0.1",
+    "body-parser": "1.19.0",
+    "chart.js": "2.9.3",
+    "css-ripple-effect": "1.0.5",
+    "diskusage": "1.1.3",
+    "express": "4.17.1",
+    "express-openapi": "7.0.1",
+    "fs-extra": "9.0.1",
+    "hls-b24.js": "0.12.3",
+    "js-yaml": "3.14.0",
+    "lodash": "4.17.20",
+    "log4js": "6.3.0",
+    "material-design-icons": "3.0.1",
+    "material-design-lite": "1.3.0",
+    "minimist": "1.2.5",
+    "mirakurun": "3.3.1",
+    "mithril": "2.0.4",
+    "mkdirp": "1.0.4",
+    "multer": "1.4.2",
+    "mysql": "2.18.1",
+    "openapi-types": "7.0.1",
+    "pg": "8.3.3",
+    "request": "2.88.2",
+    "socket.io": "2.3.0",
+    "socket.io-client": "2.3.0",
+    "sqlite3": "5.0.0",
+    "swagger-ui-dist": "3.34.0",
+    "url-join": "4.0.1",
     "@types/basic-auth": "1.1.3",
     "@types/body-parser": "1.19.0",
-    "@types/chart.js": "2.9.23",
-    "@types/express": "4.17.7",
-    "@types/hls.js": "0.13.0",
+    "@types/chart.js": "2.9.24",
+    "@types/express": "4.17.8",
+    "@types/hls.js": "0.13.1",
     "@types/js-yaml": "3.12.5",
-    "@types/lodash": "4.14.158",
+    "@types/lodash": "4.14.161",
     "@types/material-design-lite": "1.1.16",
     "@types/minimist": "1.2.0",
     "@types/mithril": "2.0.3",
     "@types/mkdirp": "1.0.1",
-    "@types/multer": "1.4.3",
+    "@types/multer": "1.4.4",
     "@types/mysql": "2.15.15",
-    "@types/node": "14.0.26",
-    "@types/pg": "7.14.4",
+    "@types/node": "14.11.1",
+    "@types/pg": "7.14.5",
     "@types/request": "2.48.5",
-    "@types/socket.io": "2.1.10",
+    "@types/socket.io": "2.1.11",
     "@types/socket.io-client": "1.4.33",
     "@types/sqlite3": "3.1.6",
     "@types/url-join": "4.0.0",
@@ -61,41 +75,11 @@
     "gulp-sourcemaps": "2.6.5",
     "gulp-tslint": "8.1.4",
     "gulp-typescript": "5.0.1",
-    "terser-webpack-plugin": "3.0.7",
-    "ts-loader": "8.0.1",
-    "tslint": "6.1.2",
-    "typescript": "3.9.7",
-    "webpack": "4.44.0",
-    "webpack-stream": "5.2.1",
-    "aribts": "^2.1.12",
-    "b24.js": "1.0.3",
-    "basic-auth": "2.0.1",
-    "body-parser": "1.19.0",
-    "chart.js": "2.9.3",
-    "css-ripple-effect": "1.0.5",
-    "diskusage": "1.1.3",
-    "express": "4.17.1",
-    "express-openapi": "7.0.0",
-    "fs-extra": "9.0.1",
-    "hls-b24.js": "0.12.3",
-    "js-yaml": "3.14.0",
-    "lodash": "4.17.19",
-    "log4js": "6.3.0",
-    "material-design-icons": "3.0.1",
-    "material-design-lite": "1.3.0",
-    "minimist": "1.2.5",
-    "mirakurun": "3.2.0",
-    "mithril": "2.0.4",
-    "mkdirp": "1.0.4",
-    "multer": "1.4.2",
-    "mysql": "2.18.1",
-    "openapi-types": "7.0.0",
-    "pg": "8.3.0",
-    "request": "2.88.2",
-    "socket.io": "2.3.0",
-    "socket.io-client": "2.3.0",
-    "sqlite3": "5.0.0",
-    "swagger-ui-dist": "3.30.2",
-    "url-join": "4.0.1"
+    "terser-webpack-plugin": "4.2.2",
+    "ts-loader": "8.0.4",
+    "tslint": "6.1.3",
+    "typescript": "4.0.3",
+    "webpack": "4.44.2",
+    "webpack-stream": "6.1.0"
   }
 }
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 4c4359a1783e..ff9a7acc77c8 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -391,13 +391,13 @@ let
         sha512 = "5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg==";
       };
     };
-    "@babel/helper-builder-react-jsx-experimental-7.12.1" = {
+    "@babel/helper-builder-react-jsx-experimental-7.12.4" = {
       name = "_at_babel_slash_helper-builder-react-jsx-experimental";
       packageName = "@babel/helper-builder-react-jsx-experimental";
-      version = "7.12.1";
+      version = "7.12.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.1.tgz";
-        sha512 = "82to8lR7TofZWbTd3IEZT1xNHfeU/Ef4rDm/GLXddzqDh+yQ19QuGSzqww51aNxVH8rwfRIzL0EUQsvODVhtyw==";
+        url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz";
+        sha512 = "AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og==";
       };
     };
     "@babel/helper-compilation-targets-7.12.1" = {
@@ -1597,6 +1597,24 @@ let
         sha512 = "HilPrVrCosYWqSyjfpDtaaN1kJwdlBpS+IAflP3z+e7nsEgk3JGJf1Vg0NgHJooTf5HDfXSyZqMVg+5jvXCK0g==";
       };
     };
+    "@emmetio/abbreviation-2.0.2" = {
+      name = "_at_emmetio_slash_abbreviation";
+      packageName = "@emmetio/abbreviation";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.0.2.tgz";
+        sha512 = "kpWg6jyR1YEj/yWceruvDj/fe1BhXqA0tGH3Z2ZiPFo8SDMH4JHg6FChqon5x0CCfLf4zVswrQa0gcZ4XtdRBQ==";
+      };
+    };
+    "@emmetio/css-abbreviation-2.1.2" = {
+      name = "_at_emmetio_slash_css-abbreviation";
+      packageName = "@emmetio/css-abbreviation";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.2.tgz";
+        sha512 = "CvYTzJltVpLqJaCZ1Qn97LVAKsl2Uwl2fzir1EX/WuMY3xWxgc3BWRCheL6k65km6GyDrLVl6RhrrNb/pxOiAQ==";
+      };
+    };
     "@emmetio/extract-abbreviation-0.1.6" = {
       name = "_at_emmetio_slash_extract-abbreviation";
       packageName = "@emmetio/extract-abbreviation";
@@ -1606,13 +1624,13 @@ let
         sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw==";
       };
     };
-    "@emmetio/extract-abbreviation-0.2.0" = {
-      name = "_at_emmetio_slash_extract-abbreviation";
-      packageName = "@emmetio/extract-abbreviation";
-      version = "0.2.0";
+    "@emmetio/scanner-1.0.0" = {
+      name = "_at_emmetio_slash_scanner";
+      packageName = "@emmetio/scanner";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@emmetio/extract-abbreviation/-/extract-abbreviation-0.2.0.tgz";
-        sha512 = "eWIRoybKwQ0LkZw7aSULPFS+r2kp0+HdJlnw0HaE6g3AKbMNL4Ogwm2OTA9gNWZ5zdp6daOAOHFqjDqqhE5y/g==";
+        url = "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.0.tgz";
+        sha512 = "8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA==";
       };
     };
     "@emotion/is-prop-valid-0.8.8" = {
@@ -1732,13 +1750,13 @@ let
         sha512 = "fQRc4+RG+rEw1IdjFx/5t2AvOlJT8ktv2dfObD3aW838ohZxCx1QvFUY/Gdx5JA1JY/KrHRGuEqQLH9ayiexyg==";
       };
     };
-    "@expo/config-3.3.10" = {
+    "@expo/config-3.3.11" = {
       name = "_at_expo_slash_config";
       packageName = "@expo/config";
-      version = "3.3.10";
+      version = "3.3.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/config/-/config-3.3.10.tgz";
-        sha512 = "+ZBOWaIgBhrNKds93pGFQzXAHxu7uqCYyIZsg7EBKFc1gV2TRxwHUKnuespdEQANx6PrshNVzfC95Kbd4jIBPA==";
+        url = "https://registry.npmjs.org/@expo/config/-/config-3.3.11.tgz";
+        sha512 = "+WrAc5pZbgUMGpBMwF/rBw5igngaouWIyFSVlmYbrp0wV2Y/T99uqgylPzNA/Ei14X+34ucZNj2IaLs9Z4Krew==";
       };
     };
     "@expo/config-types-40.0.0-beta.1" = {
@@ -1759,22 +1777,22 @@ let
         sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ==";
       };
     };
-    "@expo/dev-server-0.1.35" = {
+    "@expo/dev-server-0.1.36" = {
       name = "_at_expo_slash_dev-server";
       packageName = "@expo/dev-server";
-      version = "0.1.35";
+      version = "0.1.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.35.tgz";
-        sha512 = "QiOKOQf7IrgXjQPISO0wwncHSLwrtwGg5FC5ewfHbrJSV7KdZXNZT30uWinOVz5by5BB4z0lKXy5E8jIfonc5w==";
+        url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.36.tgz";
+        sha512 = "VaAh7bcDgNFXZlwW8MR7tvCrUs8txcBylA96+dzPCUh2kBf8rpubrYyLzriZR4LPIizANCwZjom3GBP6cwbDRg==";
       };
     };
-    "@expo/dev-tools-0.13.53" = {
+    "@expo/dev-tools-0.13.54" = {
       name = "_at_expo_slash_dev-tools";
       packageName = "@expo/dev-tools";
-      version = "0.13.53";
+      version = "0.13.54";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.53.tgz";
-        sha512 = "vDEnu4cy6pxq6ra7UsB2+Qa8s1M3eF+jUFuvlTcdqJL3tlxbh3WXn63+ZKZWv9TjUdzc0vFx50N/ywBn9S9DoQ==";
+        url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.54.tgz";
+        sha512 = "S1DW+QRLDd0rKOE9miQ+xu5cNKTGw+2LEwoIZ2Z2u345WPok7TUlH0MXXdd7CpgiCqXTloznRxuuq6QB8pPyWA==";
       };
     };
     "@expo/eas-build-job-0.1.1" = {
@@ -1804,13 +1822,13 @@ let
         sha512 = "i34lfcMVt5Wv2Cf5apZUj3o9JlFt8WOPSZjrECryunBQ9/BsQQYY5NHgGjhhZnnRE+6JFf0CPQTjXdoQ1w3w0w==";
       };
     };
-    "@expo/metro-config-0.1.35" = {
+    "@expo/metro-config-0.1.36" = {
       name = "_at_expo_slash_metro-config";
       packageName = "@expo/metro-config";
-      version = "0.1.35";
+      version = "0.1.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.35.tgz";
-        sha512 = "aGAVNXtCMOEVVytOvE0WiuxXT491v0NV+tcZ2+WZC2DBmulor+G+n61Er+4OL0Ke7uXfMk6CLXJA76ZYkBvW/w==";
+        url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.36.tgz";
+        sha512 = "6uZa3dLqk6zpF5D5TsTBl+SH8VkpdwQ8AJppJHMxwsass12XbVZ0SH7tsfYN/+YQ8cXQO1K6YmhrWERxrixwbg==";
       };
     };
     "@expo/ngrok-2.4.3" = {
@@ -2011,22 +2029,22 @@ let
         sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg==";
       };
     };
-    "@expo/webpack-config-0.12.39" = {
+    "@expo/webpack-config-0.12.40" = {
       name = "_at_expo_slash_webpack-config";
       packageName = "@expo/webpack-config";
-      version = "0.12.39";
+      version = "0.12.40";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.39.tgz";
-        sha512 = "I2mqVwjjXR8/DAfqzSYwwIrDfnzTEok6dqsJa3D19Du8S0sPv6MjHrbS/U+UCUnR+ccu8j8lb/ovN3RZzUIwVw==";
+        url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.40.tgz";
+        sha512 = "d2rVf+diOnmwfcLxTF9+9tlUA+XgBLYOMUipAZdo+1Y5Otp7Q8f9qz9jMjf1FGPqr6IJnmIxJx4orA+OFrsaag==";
       };
     };
-    "@expo/xdl-58.0.14" = {
+    "@expo/xdl-58.0.15" = {
       name = "_at_expo_slash_xdl";
       packageName = "@expo/xdl";
-      version = "58.0.14";
+      version = "58.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.14.tgz";
-        sha512 = "CCVg/+Ys8ZI42oESDD2I2KNQWw35+qjltQaY1AyVSV7ZQRbqfViy+vjpDlBuKLre+iUFmHMI5cP1HvS7dc7NPg==";
+        url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.15.tgz";
+        sha512 = "1o4i+fALj5JzzNFqjFGqAP7iI0uwB0cGW/tXjs0s8FU/RzuMTGEWRcSbjhNUjyUDZ487Rutl2OtdBt67z27xTw==";
       };
     };
     "@fluentui/date-time-utilities-7.9.0" = {
@@ -3460,58 +3478,58 @@ let
         sha512 = "FQM/59HXMAKp9k4z6rXDA/FBKFSUaU3n5SFpF2/jScmpCmHBpF+pYIWZmVB4fY17cvq3KIcuSfzf9PqD1B73XQ==";
       };
     };
-    "@node-red/editor-api-1.2.1" = {
+    "@node-red/editor-api-1.2.2" = {
       name = "_at_node-red_slash_editor-api";
       packageName = "@node-red/editor-api";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.1.tgz";
-        sha512 = "Jhf56SKXafBKdnf0HIegmTC3bu23OD1NvIVfWln38DBLMnAptjGGgqEDnB/sv13MJ8CrcNgvoH3XZtQ5FvBqcw==";
+        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.2.tgz";
+        sha512 = "5bKIH2lPYiYMYLQIpBplwu4tkuFk4JI24sCOyYsPTkT1EB2zx4qxQndwc+crKjBCMbMvHdh2D3zw9mc1Av9B7g==";
       };
     };
-    "@node-red/editor-client-1.2.1" = {
+    "@node-red/editor-client-1.2.2" = {
       name = "_at_node-red_slash_editor-client";
       packageName = "@node-red/editor-client";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.1.tgz";
-        sha512 = "KO67cvvORLJY1eI2LqcjcZ92jKYmXmkFDcuYnItdQYu1h3g8RcIQwqqU9ZPo16QcjQLdIh1OMEOUxilY404o9w==";
+        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.2.tgz";
+        sha512 = "bkNPwzTFhe1AYVydmgqHNfhUsdHfJx261PGLOS9ZJYf9Ww2jVDKXGxHz25qd4lgeRqnUcT7b6T2bOzqVs1zMWA==";
       };
     };
-    "@node-red/nodes-1.2.1" = {
+    "@node-red/nodes-1.2.2" = {
       name = "_at_node-red_slash_nodes";
       packageName = "@node-red/nodes";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.1.tgz";
-        sha512 = "YHYuxeIiy1v5aBrmHpbiYH2763satuH6DEGYn7hpLgwR+PCcks4AaXAQFPTAwYJ+2r224m9WHkyHGgcvU59QhA==";
+        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.2.tgz";
+        sha512 = "cbHfjdV5QGEQtwYpqZh7ylUnI3zbXmfvcIoGRMXVyhHTgok00ltAgJtJ3PGHSSOsd/OWshPKO2OPoM0xenepTw==";
       };
     };
-    "@node-red/registry-1.2.1" = {
+    "@node-red/registry-1.2.2" = {
       name = "_at_node-red_slash_registry";
       packageName = "@node-red/registry";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.1.tgz";
-        sha512 = "2lm60rATnuWNgvMVh+dHS0T6xIJzwuESrMZjowhzdDr5MvUrYcqVq6NEbPWsjCaqjoQyLGJNKPcdJVySRvdvmw==";
+        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.2.tgz";
+        sha512 = "HTpv/5OmptMkXYzlGfwQZl8lb+e5ta72z0nexNgbox5nc1Cg65CaFvhwcjC9UVK7ROblwDlVnutBG03eZvyOoA==";
       };
     };
-    "@node-red/runtime-1.2.1" = {
+    "@node-red/runtime-1.2.2" = {
       name = "_at_node-red_slash_runtime";
       packageName = "@node-red/runtime";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.1.tgz";
-        sha512 = "iUJTNFIdmpJ8nh+bkd4h3eO6tS8Kmg9EiAgfWVdnRVftBc0RlYsX/d36QPGE05vq9WZlPhzjfwSUbHXkciU0bw==";
+        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.2.tgz";
+        sha512 = "a4dGwF4BgAYAFyKGGyeLjashn1hstl1i7g2nwGFfnI2hJvF05fzj2lGy8dWE6wYq6c2FZQv4OetAwBfN1akxsg==";
       };
     };
-    "@node-red/util-1.2.1" = {
+    "@node-red/util-1.2.2" = {
       name = "_at_node-red_slash_util";
       packageName = "@node-red/util";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.1.tgz";
-        sha512 = "BQZeeUbkleDh2KG4NMiByHS2FuJXefR9/mMXh1FrF6R1f73VjR6YSifF/knaq5ZR8HAZmFnY0ACep3pb9blUmg==";
+        url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.2.tgz";
+        sha512 = "7rj3qb/puqcNaHIz12wtLjuJ1pHWsZzPZ+vEubs116SxAas6OVYYLuBGEPhHWeE3zg3t6Erv7wYNaDZeyUm/CQ==";
       };
     };
     "@nodelib/fs.scandir-2.1.3" = {
@@ -4315,13 +4333,13 @@ let
         sha512 = "zTJBhzjWtDBogLFnzoz6NYiQ6CThsxuvHQxSbBLcNK4+VQPIkrZOxaQ+dNCNLeLN1Tb3NnZDPNGkoThvgGwq3Q==";
       };
     };
-    "@serverless/platform-client-china-2.0.4" = {
+    "@serverless/platform-client-china-2.0.5" = {
       name = "_at_serverless_slash_platform-client-china";
       packageName = "@serverless/platform-client-china";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.4.tgz";
-        sha512 = "RNxz22NENCiw1pGPnwYRWVhDSj/4bkLNrsdMvxfv5iao/rFzY01y5HwUjPGKSDwdRQN26d4YiV8ejhFUIV7owA==";
+        url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.5.tgz";
+        sha512 = "AiIPHv1Dzxxh5lB8FCyumsP7hQL+JsN8AxMUEVMTN21IKZC+MvQI6dpYaKgE8EXfQdWq+wuV0xRsgadlHycmkw==";
       };
     };
     "@serverless/platform-sdk-2.3.2" = {
@@ -4936,13 +4954,13 @@ let
         sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==";
       };
     };
-    "@types/chart.js-2.9.23" = {
+    "@types/chart.js-2.9.24" = {
       name = "_at_types_slash_chart.js";
       packageName = "@types/chart.js";
-      version = "2.9.23";
+      version = "2.9.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.23.tgz";
-        sha512 = "4QQNE/b+digosu3mnj4E7aNQGKnlpzXa9JvQYPtexpO7v9gnDeqwc1DxF8vLJWLDCNoO6hH0EgO8K/7PtJl8wg==";
+        url = "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.24.tgz";
+        sha512 = "AQI7X+ow3SaONl44JrHoL/5B+lCsJyG31UHZ5RP98Uh15hI/zjEkDsAb4EIm4P9TGfNhZLXw/nMc5w0u10+/fQ==";
       };
     };
     "@types/clone-2.1.0" = {
@@ -5125,6 +5143,15 @@ let
         sha512 = "dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ==";
       };
     };
+    "@types/express-4.17.8" = {
+      name = "_at_types_slash_express";
+      packageName = "@types/express";
+      version = "4.17.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.8.tgz";
+        sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ==";
+      };
+    };
     "@types/express-serve-static-core-4.17.13" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
@@ -5233,13 +5260,13 @@ let
         sha512 = "0TRyJD2o8vbkmJF8InppFcPVcXKk+Rvlg/xvpHBIndSJYpmDWfmtx/ZAtl4f3jR2vfarpTqYgj8MZuJssSoU7Q==";
       };
     };
-    "@types/hls.js-0.13.0" = {
+    "@types/hls.js-0.13.1" = {
       name = "_at_types_slash_hls.js";
       packageName = "@types/hls.js";
-      version = "0.13.0";
+      version = "0.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.0.tgz";
-        sha512 = "zeW+kWWUvMF7x8/M1kLRCX6C41UcKyDZC/Xy6biGqLhd+rkpv2juVO+tCwPSQPQuqL1VtseoQYdONCOxUZ38Sw==";
+        url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.1.tgz";
+        sha512 = "5sr71YcHBVHJY8DhM+L6O9WjAGS3jrie2hpBldVpd8sqvRvNTgIikTE6RxKya1ZvJCvUkZR2ewQarZaC4TRZLg==";
       };
     };
     "@types/hosted-git-info-2.7.0" = {
@@ -5422,13 +5449,13 @@ let
         sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ==";
       };
     };
-    "@types/lodash-4.14.158" = {
+    "@types/lodash-4.14.161" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
-      version = "4.14.158";
+      version = "4.14.161";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.158.tgz";
-        sha512 = "InCEXJNTv/59yO4VSfuvNrZHt7eeNtWQEgnieIA+mIC+MOWM9arOWG2eQ8Vhk6NbOre6/BidiXhkZYeDY9U35w==";
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz";
+        sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==";
       };
     };
     "@types/lodash-4.14.162" = {
@@ -5521,13 +5548,13 @@ let
         sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==";
       };
     };
-    "@types/multer-1.4.3" = {
+    "@types/multer-1.4.4" = {
       name = "_at_types_slash_multer";
       packageName = "@types/multer";
-      version = "1.4.3";
+      version = "1.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.3.tgz";
-        sha512 = "tWsKbF5LYtXrJ7eOfI0aLBgEv9B7fnJe1JRXTj5+Z6EMfX0yHVsRFsNGnKyN8Bs0gtDv+JR37xAqsPnALyVTqg==";
+        url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.4.tgz";
+        sha512 = "wdfkiKBBEMTODNbuF3J+qDDSqJxt50yB9pgDiTcFew7f97Gcc7/sM4HR66ofGgpJPOALWOqKAch4gPyqEXSkeQ==";
       };
     };
     "@types/mysql-2.15.15" = {
@@ -5557,31 +5584,31 @@ let
         sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==";
       };
     };
-    "@types/node-13.13.26" = {
+    "@types/node-13.13.27" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.13.26";
+      version = "13.13.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.13.26.tgz";
-        sha512 = "+48LLqolaKj/WnIY1crfLseaGQMIDISBy3PTXVOZ7w/PBaRUv+H8t94++atzfoBAvorbUYz6Xq9vh1fHrg33ig==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.13.27.tgz";
+        sha512 = "IeZlpkPnUqO45iBxJocIQzwV+K6phdSVaCxRwlvHHQ0YL+Gb1fvuv9GmIMYllZcjyzqoRKDNJeNo6p8dNWSPSQ==";
       };
     };
-    "@types/node-14.0.26" = {
+    "@types/node-14.11.1" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.0.26";
+      version = "14.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.0.26.tgz";
-        sha512 = "W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz";
+        sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==";
       };
     };
-    "@types/node-14.11.10" = {
+    "@types/node-14.14.0" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.11.10";
+      version = "14.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.11.10.tgz";
-        sha512 = "yV1nWZPlMFpoXyoknm4S56y2nlTAuFYaJuQtYRAOU7xA/FJ9RY0Xm7QOkaYMMmr8ESdHIuUb6oQgR/0+2NqlyA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.0.tgz";
+        sha512 = "BfbIHP9IapdupGhq/hc+jT5dyiBVZ2DdeC5WwJWQWDb0GijQlzUFAeIQn/2GtvZcd2HVUU7An8felIICFTC2qg==";
       };
     };
     "@types/node-6.14.13" = {
@@ -5647,13 +5674,13 @@ let
         sha512 = "kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==";
       };
     };
-    "@types/pg-7.14.4" = {
+    "@types/pg-7.14.5" = {
       name = "_at_types_slash_pg";
       packageName = "@types/pg";
-      version = "7.14.4";
+      version = "7.14.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/pg/-/pg-7.14.4.tgz";
-        sha512 = "yCKVMCcFPZSFHGg+8qjY368uf3ruyDBPjxvOU2ZcGa/vRFo5Ti5Y6z6vl+2hxtwm9VMWUGb6TWkIk3cIV8C0Cw==";
+        url = "https://registry.npmjs.org/@types/pg/-/pg-7.14.5.tgz";
+        sha512 = "wqTKZmqkqXd1YiVRBT2poRrMIojwEi2bKTAAjUX6nEbzr98jc3cfR/7o7ZtubhH5xT7YJ6LRdRr1GZOgs8OUjg==";
       };
     };
     "@types/pg-types-1.11.5" = {
@@ -5764,13 +5791,13 @@ let
         sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==";
       };
     };
-    "@types/serve-static-1.13.5" = {
+    "@types/serve-static-1.13.6" = {
       name = "_at_types_slash_serve-static";
       packageName = "@types/serve-static";
-      version = "1.13.5";
+      version = "1.13.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz";
-        sha512 = "6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==";
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.6.tgz";
+        sha512 = "nuRJmv7jW7VmCVTn+IgYDkkbbDGyIINOeu/G0d74X3lm6E5KfMeQPJhxIt1ayQeQB3cSxvYs1RA/wipYoFB4EA==";
       };
     };
     "@types/sizzle-2.3.2" = {
@@ -5782,13 +5809,13 @@ let
         sha512 = "7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==";
       };
     };
-    "@types/socket.io-2.1.10" = {
+    "@types/socket.io-2.1.11" = {
       name = "_at_types_slash_socket.io";
       packageName = "@types/socket.io";
-      version = "2.1.10";
+      version = "2.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.10.tgz";
-        sha512 = "1fQMaDU/x2LPljEI/QI5IKl8sBYHM/zv32YYKvNrVEor7/1+MLqMqmWt8Bb8Vpf+PlIPBiTTC0BnrRx7ju3xOw==";
+        url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.11.tgz";
+        sha512 = "bVprmqPhJMLb9ZCm8g0Xy8kwBFRbnanOWSxzWkDkkIwxTvud5tKMfAJymXX6LQbizUKCS1yima7JM4BeLqjNqA==";
       };
     };
     "@types/socket.io-client-1.4.33" = {
@@ -7177,13 +7204,13 @@ let
         sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1";
       };
     };
-    "addons-linter-2.7.0" = {
+    "addons-linter-2.9.0" = {
       name = "addons-linter";
       packageName = "addons-linter";
-      version = "2.7.0";
+      version = "2.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.7.0.tgz";
-        sha512 = "kH+0fAKSc461PnCyYQ0/SeKcxEQ2zxCZwG2GB6xjvfkMiMAwwic87VP62Cffc8H/zHEfYuT8uFmy42ayH5mqEQ==";
+        url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.9.0.tgz";
+        sha512 = "OrkDQ9S/GAJzMe+izsFMFOtRq9geFFt3O5c7Fi6pehGi7RY2PSMpPmKjMK1j/rPa9jrG0e9zocptMrOi11uvug==";
       };
     };
     "addr-to-ip-port-1.5.1" = {
@@ -7402,15 +7429,6 @@ let
         sha512 = "eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==";
       };
     };
-    "ajv-6.12.5" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "6.12.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz";
-        sha512 = "lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==";
-      };
-    };
     "ajv-6.12.6" = {
       name = "ajv";
       packageName = "ajv";
@@ -9373,13 +9391,13 @@ let
         sha512 = "kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==";
       };
     };
-    "atomically-1.5.0" = {
+    "atomically-1.6.0" = {
       name = "atomically";
       packageName = "atomically";
-      version = "1.5.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/atomically/-/atomically-1.5.0.tgz";
-        sha512 = "BTkqh410x70yF7iFtJxnL7N5j6HU0JYrJpvLUbZNM4u9rvCPveqKo6nFM9aFrjAOOpzPBnxKVncJ8o/GfEx18g==";
+        url = "https://registry.npmjs.org/atomically/-/atomically-1.6.0.tgz";
+        sha512 = "mu394MH+yY2TSKMyH+978PcGMZ8sRNks2PuVeH6c2ED4mimR2LEE039MVcIGVhtmG54cKEMh4gKhxKL/CLaX/w==";
       };
     };
     "attach-ware-1.1.1" = {
@@ -9463,13 +9481,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.773.0" = {
+    "aws-sdk-2.774.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.773.0";
+      version = "2.774.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.773.0.tgz";
-        sha512 = "bwqEm/x3HMUd/xfcUeTjCQFi904oSNcwl2ZNz3mwAdEIqt3sQ9aE3GYoZQxKXw/XHQlF7hPiKO07GDGmS6x4AQ==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.774.0.tgz";
+        sha512 = "3a/fM1E3nCPwT4AVbysOWCMmsu/TOdJDD3urjywWE/qO1JShxRwLSdRLD1xRkacR9JcnydfkmdU0qk+VsM3nqg==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -18663,6 +18681,15 @@ let
         sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==";
       };
     };
+    "emmet-2.1.5" = {
+      name = "emmet";
+      packageName = "emmet";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emmet/-/emmet-2.1.5.tgz";
+        sha512 = "u0RR8qb067EELZ8t+LtxbhLXvfJ4nklbxcoFrHcvs61r7rk8SgJwgcVSM/Xa/4/tlq2jKdunGbVp5Nqz8MZYOg==";
+      };
+    };
     "emoji-named-characters-1.0.2" = {
       name = "emoji-named-characters";
       packageName = "emoji-named-characters";
@@ -18942,13 +18969,13 @@ let
         sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==";
       };
     };
-    "enhanced-resolve-5.2.0" = {
+    "enhanced-resolve-5.3.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "5.2.0";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.2.0.tgz";
-        sha512 = "NZlGLl8DxmZoq0uqPPtJfsCAir68uR047+Udsh1FH4+5ydGQdMurn/A430A1BtxASVmMEuS7/XiJ5OxJ9apAzQ==";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.3.0.tgz";
+        sha512 = "EENz3E701+77g0wfbOITeI8WLPNso2kQNMBIBEi/TH/BEa9YXtS01X7sIEk5XXsfFq1jNkhIpu08hBPH1TRLIQ==";
       };
     };
     "enquirer-2.3.6" = {
@@ -19527,22 +19554,13 @@ let
         sha512 = "G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==";
       };
     };
-    "eslint-7.9.0" = {
-      name = "eslint";
-      packageName = "eslint";
-      version = "7.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz";
-        sha512 = "V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==";
-      };
-    };
-    "eslint-plugin-no-unsanitized-3.1.2" = {
+    "eslint-plugin-no-unsanitized-3.1.4" = {
       name = "eslint-plugin-no-unsanitized";
       packageName = "eslint-plugin-no-unsanitized";
-      version = "3.1.2";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-3.1.2.tgz";
-        sha512 = "KPShfliA3Uy9qqwQx35P1fwIOeJjZkb0FbMMUFztRYRposzaynsM8JCEb952fqkidROl1kpqY80uSvn+TcWkQQ==";
+        url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-3.1.4.tgz";
+        sha512 = "WF1+eZo2Sh+bQNjZuVNwT0dA61zuJORsLh+1Sww7+O6GOPw+WPWIIRfTWNqrmaXaDMhM4SXAqYPcNlhRMiH13g==";
       };
     };
     "eslint-plugin-vue-6.2.2" = {
@@ -20319,13 +20337,13 @@ let
         sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929";
       };
     };
-    "expo-pwa-0.0.45" = {
+    "expo-pwa-0.0.46" = {
       name = "expo-pwa";
       packageName = "expo-pwa";
-      version = "0.0.45";
+      version = "0.0.46";
       src = fetchurl {
-        url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.45.tgz";
-        sha512 = "1q0t+5L4JEb8iCAaN0ME6/P/h83HVrOXBU8AzDRtrTXPWC0R0IvHr9cm1DCnzWTHtBcy6kA+H0rIvxledllaBQ==";
+        url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.46.tgz";
+        sha512 = "Ikb0VIo2T0cMWmMT+VFa+aSrG7lmtHcJCLsZAaxUgta2IhYJxSqRHqXrKYimPb/q2hagspsd2Hyzf7HF92qs3g==";
       };
     };
     "express-2.5.11" = {
@@ -20409,13 +20427,13 @@ let
         sha512 = "WQGmghzn+loQsIQUEnLZ0HVKCLhIBVcURvrAhyt6mOqsFsG2tBYhaNKX728EOz2aMXRhEQhkQ+RXQsIFpbS6IA==";
       };
     };
-    "express-openapi-7.0.0" = {
+    "express-openapi-7.0.1" = {
       name = "express-openapi";
       packageName = "express-openapi";
-      version = "7.0.0";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.0.0.tgz";
-        sha512 = "ryjUF/MuYEh13jXKNOD7kw/o6n1MTywDP08n5/BqFRd9IaTX33vZEKhk9NlsvGfD63lNre/84CN0hPLvWEe7qQ==";
+        url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.0.1.tgz";
+        sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ==";
       };
     };
     "express-session-1.17.1" = {
@@ -20841,6 +20859,15 @@ let
         sha512 = "0LkHpTLyadJavq9sRzzyqIoMZemWli77K2/MGOkafrR64B9ItrvZ9aT+jluvNDsv0YEHjSNhlMBtbokuoqii4A==";
       };
     };
+    "fast-redact-3.0.0" = {
+      name = "fast-redact";
+      packageName = "fast-redact";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.0.0.tgz";
+        sha512 = "a/S/Hp6aoIjx7EmugtzLqXmcNsyFszqbt6qQ99BdG61QjBZF6shNis0BYR6TsZOQ1twYc0FN2Xdhwwbv6+KD0w==";
+      };
+    };
     "fast-safe-stringify-1.2.3" = {
       name = "fast-safe-stringify";
       packageName = "fast-safe-stringify";
@@ -26711,6 +26738,15 @@ let
         sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345";
       };
     };
+    "is-core-module-2.0.0" = {
+      name = "is-core-module";
+      packageName = "is-core-module";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz";
+        sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==";
+      };
+    };
     "is-data-descriptor-0.1.4" = {
       name = "is-data-descriptor";
       packageName = "is-data-descriptor";
@@ -30141,6 +30177,15 @@ let
         sha512 = "5lMmsPc9ZtMjBk8rJ8ADKIj6AOgYvRtAuNfboO2TVPZsmcn6gSRyijUsA8KG6DUcJ89/hyQ3cnVRyzO1hbDavw==";
       };
     };
+    "line-column-1.0.2" = {
+      name = "line-column";
+      packageName = "line-column";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/line-column/-/line-column-1.0.2.tgz";
+        sha1 = "d25af2936b6f4849172b312e4792d1d987bc34a2";
+      };
+    };
     "line-reader-0.4.0" = {
       name = "line-reader";
       packageName = "line-reader";
@@ -30465,15 +30510,6 @@ let
         sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
       };
     };
-    "lodash-4.17.19" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz";
-        sha512 = "JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==";
-      };
-    };
     "lodash-4.17.20" = {
       name = "lodash";
       packageName = "lodash";
@@ -32904,13 +32940,13 @@ let
         sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8";
       };
     };
-    "mdn-browser-compat-data-1.0.39" = {
+    "mdn-browser-compat-data-1.0.40" = {
       name = "mdn-browser-compat-data";
       packageName = "mdn-browser-compat-data";
-      version = "1.0.39";
+      version = "1.0.40";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.39.tgz";
-        sha512 = "1U5Lt+pjYxJ1mosBIdK5fr3guzV4v81f8yy0rLAj/cu7ki3ciCe85LVJJ0RLK0lP6VwFtjpXSOESfwAEpz0FyQ==";
+        url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.40.tgz";
+        sha512 = "yjM/OG0krZIgi+XrhJWS3CJ9UQuGM4FfjIUIt2f65er6qczkM+WjtNEv/9ZF9DxDs/2GR3SO6hDaZLplTRrrfw==";
       };
     };
     "mdn-data-2.0.4" = {
@@ -33912,13 +33948,13 @@ let
         sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==";
       };
     };
-    "mirakurun-3.2.0" = {
+    "mirakurun-3.3.1" = {
       name = "mirakurun";
       packageName = "mirakurun";
-      version = "3.2.0";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.2.0.tgz";
-        sha512 = "zRMza+rxE5XUgUDy8lbt1qAKA9TKcApnwmP+06chBZXinxwEiaRbto7vE8is7ky6+qCS9Q7Erf91kbhAsLwydw==";
+        url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.3.1.tgz";
+        sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA==";
       };
     };
     "mired-0.0.0" = {
@@ -35831,13 +35867,13 @@ let
         sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg==";
       };
     };
-    "node-releases-1.1.63" = {
+    "node-releases-1.1.64" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.63";
+      version = "1.1.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.63.tgz";
-        sha512 = "ukW3iCfQaoxJkSPN+iK7KznTeqDGVJatAEuXsJERYHa9tn/KaT5lBdIyxQjLEVTzSkyjJEuQ17/vaEjrOauDkg==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.64.tgz";
+        sha512 = "Iec8O9166/x2HRMJyLLLWkd0sFFLrFNy+Xf+JQfSQsdBJzPcHpNl3JQ9gD4j+aJxmCa25jNsIbM4bmACtSbkSg==";
       };
     };
     "node-source-walk-4.2.0" = {
@@ -37371,15 +37407,6 @@ let
         sha512 = "11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg==";
       };
     };
-    "openapi-types-7.0.0" = {
-      name = "openapi-types";
-      packageName = "openapi-types";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.0.0.tgz";
-        sha512 = "AikFLY/joHpJz+6OcyWUfXR0xjsh0jXR+oxcB1oosjH3YFZI3uPTJcmuf7koBFQyjd9GYmClmCSK8mGZ7thsOQ==";
-      };
-    };
     "openapi-types-7.0.1" = {
       name = "openapi-types";
       packageName = "openapi-types";
@@ -39378,13 +39405,13 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
-    "pg-8.3.0" = {
+    "pg-8.3.3" = {
       name = "pg";
       packageName = "pg";
-      version = "8.3.0";
+      version = "8.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg/-/pg-8.3.0.tgz";
-        sha512 = "jQPKWHWxbI09s/Z9aUvoTbvGgoj98AU7FDCcQ7kdejupn/TcNpx56v2gaOTzXkzOajmOEJEdi9eTh9cA2RVAjQ==";
+        url = "https://registry.npmjs.org/pg/-/pg-8.3.3.tgz";
+        sha512 = "wmUyoQM/Xzmo62wgOdQAn5tl7u+IA1ZYK7qbuppi+3E+Gj4hlUxVHjInulieWrd0SfHi/ADriTb5ILJ/lsJrSg==";
       };
     };
     "pg-connection-string-2.4.0" = {
@@ -39594,6 +39621,15 @@ let
         sha512 = "DOgm7rn6ctBkBYemHXSLj7+j3o3U1q1FWBXbHcprur8mA93QcJSycEkEqhqKiFB9Mx/3Qld2FGr6+9yfQza0kA==";
       };
     };
+    "pino-6.7.0" = {
+      name = "pino";
+      packageName = "pino";
+      version = "6.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pino/-/pino-6.7.0.tgz";
+        sha512 = "vPXJ4P9rWCwzlTJt+f0Ni4THc3DWyt8iDDCO4edQ8narTu6hnpzdXu8FqeSJCGndl1W6lfbYQUQihUO54y66Lw==";
+      };
+    };
     "pino-std-serializers-2.5.0" = {
       name = "pino-std-serializers";
       packageName = "pino-std-serializers";
@@ -40018,6 +40054,15 @@ let
         sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==";
       };
     };
+    "postcss-8.1.1" = {
+      name = "postcss";
+      packageName = "postcss";
+      version = "8.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss/-/postcss-8.1.1.tgz";
+        sha512 = "9DGLSsjooH3kSNjTZUOt2eIj2ZTW0VI2PZ/3My+8TC7KIbH2OKwUlISfDsf63EP4aiRUt3XkEWMWvyJHvJelEg==";
+      };
+    };
     "postcss-calc-7.0.5" = {
       name = "postcss-calc";
       packageName = "postcss-calc";
@@ -42817,13 +42862,13 @@ let
         sha512 = "XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ==";
       };
     };
-    "react-devtools-core-4.8.2" = {
+    "react-devtools-core-4.9.0" = {
       name = "react-devtools-core";
       packageName = "react-devtools-core";
-      version = "4.8.2";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.8.2.tgz";
-        sha512 = "3Lv3nI8FPAwKqUco35oOlgf+4j8mgYNnIcDv2QTfxEqg2G69q17ZJ8ScU9aBnymS28YC1OW+kTxLmdIQeTN8yg==";
+        url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.9.0.tgz";
+        sha512 = "3NyHXW1ClqxEXdHunawAytDxiIxs620oP3wB8DHsbx1fkGgqjMkwlyHVf0zmES/b4ffqzJySowRwSYds/uAHzw==";
       };
     };
     "react-dom-16.14.0" = {
@@ -44212,6 +44257,15 @@ let
         sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==";
       };
     };
+    "resolve-1.18.1" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.18.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz";
+        sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==";
+      };
+    };
     "resolve-2.0.0-next.1" = {
       name = "resolve";
       packageName = "resolve";
@@ -49711,13 +49765,13 @@ let
         sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb";
       };
     };
-    "swagger-ui-dist-3.30.2" = {
+    "swagger-ui-dist-3.34.0" = {
       name = "swagger-ui-dist";
       packageName = "swagger-ui-dist";
-      version = "3.30.2";
+      version = "3.34.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.30.2.tgz";
-        sha512 = "hAu/ig5N8i0trXXbrC7rwbXV4DhpEAsZhYXDs1305OjmDgjGC0thINbb0197idy3Pp+B6w7u426SUM43GAP7qw==";
+        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.34.0.tgz";
+        sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw==";
       };
     };
     "swagger-ui-dist-3.35.2" = {
@@ -50333,13 +50387,13 @@ let
         sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==";
       };
     };
-    "terser-5.3.6" = {
+    "terser-5.3.7" = {
       name = "terser";
       packageName = "terser";
-      version = "5.3.6";
+      version = "5.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-5.3.6.tgz";
-        sha512 = "145ap5v1HYx69HfLuwWaxTIlXyiSr+nSTb7ZWlJCgJn2JptuJRKziNa/zwFx9B1IU99Q055jHni74nLuuEC78w==";
+        url = "https://registry.npmjs.org/terser/-/terser-5.3.7.tgz";
+        sha512 = "lJbKdfxWvjpV330U4PBZStCT9h3N9A4zZVA5Y4k9sCWXknrpdyxi1oMsRKLmQ/YDMDxSBKIh88v0SkdhdqX06w==";
       };
     };
     "terser-webpack-plugin-1.4.5" = {
@@ -50351,15 +50405,6 @@ let
         sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==";
       };
     };
-    "terser-webpack-plugin-3.0.7" = {
-      name = "terser-webpack-plugin";
-      packageName = "terser-webpack-plugin";
-      version = "3.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.7.tgz";
-        sha512 = "5JqibUOctE6Ou4T00IVGYTQJBOhu24jz0PpqYeitQJJ3hlZY2ZKSwzzuqjmBH8MzbdWMgIefpmHwTkvwm6Q4CQ==";
-      };
-    };
     "terser-webpack-plugin-3.1.0" = {
       name = "terser-webpack-plugin";
       packageName = "terser-webpack-plugin";
@@ -50369,6 +50414,15 @@ let
         sha512 = "cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA==";
       };
     };
+    "terser-webpack-plugin-4.2.2" = {
+      name = "terser-webpack-plugin";
+      packageName = "terser-webpack-plugin";
+      version = "4.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.2.tgz";
+        sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ==";
+      };
+    };
     "terser-webpack-plugin-5.0.0" = {
       name = "terser-webpack-plugin";
       packageName = "terser-webpack-plugin";
@@ -51548,13 +51602,13 @@ let
         sha512 = "HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ==";
       };
     };
-    "ts-loader-8.0.1" = {
+    "ts-loader-8.0.4" = {
       name = "ts-loader";
       packageName = "ts-loader";
-      version = "8.0.1";
+      version = "8.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.1.tgz";
-        sha512 = "I9Nmly0ufJoZRMuAT9d5ijsC2B7oSPvUnOJt/GhgoATlPGYfa17VicDKPcqwUCrHpOkCxr/ybLYwbnS4cOxmvQ==";
+        url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.4.tgz";
+        sha512 = "5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ==";
       };
     };
     "ts-log-2.2.3" = {
@@ -51665,13 +51719,13 @@ let
         sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==";
       };
     };
-    "tslint-6.1.2" = {
+    "tslint-6.1.3" = {
       name = "tslint";
       packageName = "tslint";
-      version = "6.1.2";
+      version = "6.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz";
-        sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA==";
+        url = "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz";
+        sha512 = "IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==";
       };
     };
     "tsscmp-1.0.6" = {
@@ -53123,6 +53177,15 @@ let
         sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==";
       };
     };
+    "upath-2.0.0" = {
+      name = "upath";
+      packageName = "upath";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upath/-/upath-2.0.0.tgz";
+        sha512 = "ghi1XxsVYPOZPDsOZrfOJIwQU5I3JVYB3Q6IbBGn1KFeOa89i0nUy5tCEkY9pVm83U83qZ1QG40RQKGknllV4w==";
+      };
+    };
     "update-check-1.5.2" = {
       name = "update-check";
       packageName = "update-check";
@@ -54635,13 +54698,13 @@ let
         sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow==";
       };
     };
-    "vscode-emmet-helper-2.0.5" = {
+    "vscode-emmet-helper-2.0.7" = {
       name = "vscode-emmet-helper";
       packageName = "vscode-emmet-helper";
-      version = "2.0.5";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.0.5.tgz";
-        sha512 = "lDP+soFnJgEkUrdAWqdUYRFfXRFnmXhjzyzca+fy9vCUorr3lp32IKIys8mYwnlAUencmyXmF5JwN0VikUXj/Q==";
+        url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.0.7.tgz";
+        sha512 = "Rzr3A2/8t0b3kJPdWA4B52Fu0ZNMUjgfnJ8j2QVSn5Y1mZp8wejNlkOSojWipP+J26FAF0/q2zMpB6uTHrIIJg==";
       };
     };
     "vscode-html-languageservice-2.1.12" = {
@@ -55337,15 +55400,6 @@ let
         sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==";
       };
     };
-    "webpack-4.44.0" = {
-      name = "webpack";
-      packageName = "webpack";
-      version = "4.44.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-4.44.0.tgz";
-        sha512 = "wAuJxK123sqAw31SpkPiPW3iKHgFUiKvO7E7UZjtdExcsRe3fgav4mvoMM7vvpjLHVoJ6a0Mtp2fzkoA13e0Zw==";
-      };
-    };
     "webpack-4.44.1" = {
       name = "webpack";
       packageName = "webpack";
@@ -55463,13 +55517,13 @@ let
         sha512 = "A9oYz7ANQBK5EN19rUXbvNgfdfZf5U2gP0769OXsj9CvYkCR6OHOsd6OKyEy4H38GGxpsQPKIL83NC64QY6Xmw==";
       };
     };
-    "webpack-stream-5.2.1" = {
+    "webpack-stream-6.1.0" = {
       name = "webpack-stream";
       packageName = "webpack-stream";
-      version = "5.2.1";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-stream/-/webpack-stream-5.2.1.tgz";
-        sha512 = "WvyVU0K1/VB1NZ7JfsaemVdG0PXAQUqbjUNW4A58th4pULvKMQxG+y33HXTL02JvD56ko2Cub+E2NyPwrLBT/A==";
+        url = "https://registry.npmjs.org/webpack-stream/-/webpack-stream-6.1.0.tgz";
+        sha512 = "kFMnDzFTzyvVmn4ajaj0xEJavvYizd3I/KmQ6C5aUstcAkNwZUidxkk/uEaEPSydaAn66v8ZcP1+bhKSshNJUQ==";
       };
     };
     "webpackbar-4.0.0" = {
@@ -55580,15 +55634,6 @@ let
         sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==";
       };
     };
-    "whatwg-url-8.2.2" = {
-      name = "whatwg-url";
-      packageName = "whatwg-url";
-      version = "8.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz";
-        sha512 = "PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==";
-      };
-    };
     "whatwg-url-8.4.0" = {
       name = "whatwg-url";
       packageName = "whatwg-url";
@@ -57619,6 +57664,7 @@ in
       sources."inquirer-7.3.3"
       sources."ip-1.1.5"
       sources."is-callable-1.2.2"
+      sources."is-core-module-2.0.0"
       sources."is-date-object-1.0.2"
       sources."is-docker-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -57749,7 +57795,7 @@ in
           sources."uuid-3.4.0"
         ];
       })
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."restore-cursor-3.1.0"
       sources."retry-0.10.1"
       sources."rimraf-3.0.2"
@@ -58412,7 +58458,7 @@ in
       sources."@types/anymatch-1.3.1"
       sources."@types/json-schema-7.0.6"
       sources."@types/json5-0.0.29"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/parse-json-4.0.0"
       sources."@types/source-list-map-0.1.2"
       sources."@types/tapable-1.0.6"
@@ -58684,11 +58730,13 @@ in
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.1.3"
+      sources."function-bind-1.1.1"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."graceful-fs-4.2.4"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
@@ -58735,6 +58783,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-2.1.0"
       sources."is-buffer-1.1.6"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
@@ -58919,7 +58968,7 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-from-4.0.0"
       sources."resolve-url-0.2.1"
       sources."restore-cursor-3.1.0"
@@ -59463,7 +59512,7 @@ in
       sources."@types/long-4.0.1"
       sources."@types/mime-2.0.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       (sources."@types/node-fetch-2.5.7" // {
         dependencies = [
           sources."form-data-3.0.0"
@@ -59472,7 +59521,7 @@ in
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
-      sources."@types/serve-static-1.13.5"
+      sources."@types/serve-static-1.13.6"
       sources."@types/through-0.0.30"
       sources."@types/ws-7.2.7"
       sources."@types/zen-observable-0.8.1"
@@ -60184,6 +60233,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-ci-1.2.1"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -60391,7 +60441,7 @@ in
           sources."is-wsl-2.2.0"
         ];
       })
-      sources."node-releases-1.1.63"
+      sources."node-releases-1.1.64"
       (sources."nodemon-1.19.4" // {
         dependencies = [
           sources."debug-3.2.6"
@@ -60601,7 +60651,7 @@ in
       sources."request-2.88.2"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-from-3.0.0"
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
@@ -61253,6 +61303,7 @@ in
       sources."homedir-polyfill-1.0.3"
       sources."ini-1.3.5"
       sources."is-3.3.0"
+      sources."is-core-module-2.0.0"
       sources."is-windows-1.0.2"
       sources."isexe-2.0.0"
       sources."js-tokens-4.0.0"
@@ -61276,7 +61327,7 @@ in
       sources."parse-passwd-1.0.0"
       sources."path-parse-1.0.6"
       sources."pkginfo-0.4.1"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."safe-buffer-5.1.2"
       sources."sax-0.5.8"
       sources."semver-5.7.1"
@@ -61313,7 +61364,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
@@ -61531,15 +61582,18 @@ in
         ];
       })
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."get-stdin-4.0.1"
       sources."glob-6.0.4"
       sources."graceful-fs-3.0.12"
+      sources."has-1.0.3"
       sources."hosted-git-info-2.8.8"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."intersect-1.0.1"
       sources."is-arrayish-0.2.1"
+      sources."is-core-module-2.0.0"
       sources."is-finite-1.1.0"
       sources."is-plain-obj-1.1.0"
       sources."is-utf8-0.2.1"
@@ -61590,7 +61644,7 @@ in
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       (sources."rimraf-2.7.1" // {
         dependencies = [
           sources."glob-7.1.6"
@@ -61741,6 +61795,7 @@ in
       sources."is-arguments-1.0.4"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
+      sources."is-core-module-2.0.0"
       sources."is-date-object-1.0.2"
       sources."is-generator-function-1.0.7"
       sources."is-negative-zero-2.0.0"
@@ -61800,7 +61855,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."ripemd160-2.0.2"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
@@ -61875,7 +61930,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.26"
+      sources."@types/node-13.13.27"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
       sources."ajv-6.12.6"
@@ -61991,6 +62046,7 @@ in
         ];
       })
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."get-browser-rtc-1.0.2"
       sources."get-stdin-4.0.1"
       sources."getpass-0.1.7"
@@ -61999,6 +62055,7 @@ in
       sources."graceful-fs-4.2.4"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
+      sources."has-1.0.3"
       sources."has-ansi-1.0.3"
       sources."hat-0.0.3"
       sources."hosted-git-info-2.8.8"
@@ -62014,6 +62071,7 @@ in
       sources."ip-set-1.0.2"
       sources."ipaddr.js-2.0.0"
       sources."is-arrayish-0.2.1"
+      sources."is-core-module-2.0.0"
       sources."is-finite-1.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
@@ -62156,7 +62214,7 @@ in
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
       sources."request-2.88.2"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."rimraf-2.7.1"
       sources."router-0.6.2"
       sources."run-parallel-1.1.9"
@@ -63133,6 +63191,7 @@ in
       sources."for-own-0.1.5"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       sources."get-caller-file-1.0.3"
       sources."get-stdin-5.0.1"
@@ -63159,6 +63218,7 @@ in
       sources."gonzales-pe-4.3.0"
       sources."got-6.7.1"
       sources."graceful-fs-4.2.4"
+      sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -63217,6 +63277,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-ci-1.2.1"
+      sources."is-core-module-2.0.0"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -63520,7 +63581,7 @@ in
       sources."require-from-string-2.0.2"
       sources."require-main-filename-1.0.1"
       sources."require-relative-0.8.7"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       (sources."resolve-cwd-2.0.0" // {
         dependencies = [
           sources."resolve-from-3.0.0"
@@ -63852,10 +63913,10 @@ in
   coc-rust-analyzer = nodeEnv.buildNodePackage {
     name = "coc-rust-analyzer";
     packageName = "coc-rust-analyzer";
-    version = "0.9.0";
+    version = "0.10.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.9.0.tgz";
-      sha512 = "//DKmHGTR4u7tPoFBU+8apTuaXidWIJf+squdnVb/DX6J1fO9BSI6M6TBTlfY6IC1V1FOa6bUE6GNcQDyH1hYQ==";
+      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.10.1.tgz";
+      sha512 = "aSQyW+Ceum86wXxIyKdv2T7Qv4EmflQvbytaJxN1boR0RS16cEccZScxVI/7pkFnh+Tkp+rVXItmNmNU5ByrjA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64036,6 +64097,7 @@ in
       sources."flat-cache-2.0.1"
       sources."flatted-2.0.2"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.1"
       sources."get-stdin-8.0.0"
       sources."glob-7.1.6"
@@ -64047,6 +64109,7 @@ in
       sources."globjoin-0.1.4"
       sources."gonzales-pe-4.3.0"
       sources."hard-rejection-2.1.0"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."hosted-git-info-2.8.8"
       sources."html-tags-3.1.0"
@@ -64069,6 +64132,7 @@ in
       sources."is-alphanumerical-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-2.0.4"
+      sources."is-core-module-2.0.0"
       sources."is-decimal-1.0.4"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -64111,7 +64175,7 @@ in
       })
       sources."mkdirp-0.5.5"
       sources."ms-2.1.2"
-      sources."node-releases-1.1.63"
+      sources."node-releases-1.1.64"
       sources."normalize-package-data-2.5.0"
       sources."normalize-range-0.1.2"
       sources."normalize-selector-0.2.0"
@@ -64169,7 +64233,7 @@ in
       sources."remark-stringify-8.1.1"
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-from-5.0.0"
       sources."reusify-1.0.4"
       sources."rimraf-2.6.3"
@@ -64301,10 +64365,13 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."glob-7.1.6"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
+      sources."is-core-module-2.0.0"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.0"
       sources."minimatch-3.0.4"
@@ -64313,7 +64380,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."semver-5.7.1"
       sources."sprintf-js-1.0.3"
       sources."supports-color-5.5.0"
@@ -64399,7 +64466,9 @@ in
       sources."@babel/code-frame-7.10.4"
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/highlight-7.10.4"
-      sources."@emmetio/extract-abbreviation-0.2.0"
+      sources."@emmetio/abbreviation-2.0.2"
+      sources."@emmetio/css-abbreviation-2.1.2"
+      sources."@emmetio/scanner-1.0.0"
       (sources."@eslint/eslintrc-0.1.3" // {
         dependencies = [
           sources."debug-4.3.0"
@@ -64442,7 +64511,7 @@ in
       sources."@types/json-schema-7.0.6"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.0"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
@@ -64671,6 +64740,7 @@ in
       sources."duplexer3-0.1.4"
       sources."editorconfig-0.15.3"
       sources."element-helper-json-2.0.6"
+      sources."emmet-2.1.5"
       sources."emoji-regex-7.0.3"
       sources."end-of-stream-1.4.4"
       sources."enquirer-2.3.6"
@@ -64878,6 +64948,7 @@ in
       sources."is-binary-path-2.1.0"
       sources."is-buffer-2.0.4"
       sources."is-ci-2.0.0"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-decimal-1.0.4"
       sources."is-descriptor-1.0.2"
@@ -65149,7 +65220,7 @@ in
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."require-relative-0.8.7"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-from-5.0.0"
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
@@ -65406,7 +65477,7 @@ in
           sources."vscode-languageserver-types-3.16.0-next.2"
         ];
       })
-      (sources."vscode-emmet-helper-2.0.5" // {
+      (sources."vscode-emmet-helper-2.0.7" // {
         dependencies = [
           sources."vscode-languageserver-types-3.15.1"
         ];
@@ -65878,6 +65949,7 @@ in
       sources."fresh-0.5.2"
       sources."fs-extra-9.0.1"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."get-stream-5.2.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
@@ -65892,6 +65964,7 @@ in
       sources."graceful-fs-4.2.4"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
+      sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
       sources."hosted-git-info-3.0.7"
@@ -65942,6 +66015,7 @@ in
       sources."ip-regex-2.1.0"
       sources."ipaddr.js-1.9.1"
       sources."is-ci-2.0.0"
+      sources."is-core-module-2.0.0"
       sources."is-docker-2.1.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
@@ -66079,7 +66153,7 @@ in
           sources."tough-cookie-2.5.0"
         ];
       })
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-from-4.0.0"
       sources."responselike-1.0.2"
       (sources."restore-cursor-2.0.0" // {
@@ -66222,7 +66296,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.0"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/normalize-package-data-2.4.0"
       sources."aggregate-error-3.1.0"
       sources."ansi-styles-3.2.1"
@@ -66329,6 +66403,7 @@ in
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."get-value-2.0.6"
       sources."glob-7.1.6"
       (sources."glob-parent-3.1.0" // {
@@ -66340,6 +66415,7 @@ in
       sources."globby-9.2.0"
       sources."graceful-fs-4.2.4"
       sources."hard-rejection-2.1.0"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
       (sources."has-glob-1.0.0" // {
         dependencies = [
@@ -66360,6 +66436,7 @@ in
       sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
@@ -66469,7 +66546,7 @@ in
       sources."regex-not-1.0.2"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
       sources."safe-regex-1.1.0"
@@ -66590,7 +66667,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.2"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -67712,7 +67789,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.773.0"
+      sources."aws-sdk-2.774.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.10.1"
       sources."base64-js-1.3.1"
@@ -67860,7 +67937,7 @@ in
       sources."@babel/generator-7.12.1"
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-react-jsx-7.10.4"
-      sources."@babel/helper-builder-react-jsx-experimental-7.12.1"
+      sources."@babel/helper-builder-react-jsx-experimental-7.12.4"
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-member-expression-to-functions-7.12.1"
@@ -67890,7 +67967,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
       sources."@types/minimist-1.2.0"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/responselike-1.0.0"
       sources."@types/yoga-layout-1.9.2"
@@ -67905,7 +67982,7 @@ in
       sources."arch-2.1.2"
       sources."arrify-1.0.1"
       sources."astral-regex-2.0.0"
-      sources."atomically-1.5.0"
+      sources."atomically-1.6.0"
       sources."auto-bind-4.0.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
@@ -67971,12 +68048,14 @@ in
       sources."find-cache-dir-3.3.1"
       sources."find-up-3.0.0"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.1"
       sources."get-stream-4.1.0"
       sources."glob-7.1.6"
       sources."globals-11.12.0"
       sources."got-11.7.0"
       sources."hard-rejection-2.1.0"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."hosted-git-info-2.8.8"
       sources."http-cache-semantics-4.1.0"
@@ -68008,6 +68087,7 @@ in
       })
       sources."is-arrayish-0.2.1"
       sources."is-ci-2.0.0"
+      sources."is-core-module-2.0.0"
       sources."is-docker-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-obj-2.0.0"
@@ -68086,7 +68166,7 @@ in
       sources."punycode-2.1.1"
       sources."quick-lru-5.1.1"
       sources."react-16.14.0"
-      sources."react-devtools-core-4.8.2"
+      sources."react-devtools-core-4.9.0"
       sources."react-is-16.13.1"
       sources."react-reconciler-0.24.0"
       (sources."read-pkg-5.2.0" // {
@@ -68104,7 +68184,7 @@ in
         ];
       })
       sources."redent-3.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-alpn-1.0.0"
       sources."resolve-from-3.0.0"
       sources."responselike-2.0.0"
@@ -68197,12 +68277,18 @@ in
   "epgstation-../../applications/video/epgstation" = nodeEnv.buildNodePackage {
     name = "EPGStation";
     packageName = "EPGStation";
-    version = "1.7.4";
+    version = "1.7.5";
     src = ../../applications/video/epgstation;
     dependencies = [
       sources."@babel/code-frame-7.10.4"
       sources."@babel/helper-validator-identifier-7.10.4"
-      sources."@babel/highlight-7.10.4"
+      (sources."@babel/highlight-7.10.4" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
+          sources."supports-color-5.5.0"
+        ];
+      })
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
@@ -68213,7 +68299,6 @@ in
       (sources."@gulp-sourcemaps/identity-map-1.0.2" // {
         dependencies = [
           sources."normalize-path-2.1.1"
-          sources."source-map-0.6.1"
         ];
       })
       (sources."@gulp-sourcemaps/map-sources-1.0.0" // {
@@ -68231,33 +68316,37 @@ in
       sources."@types/basic-auth-1.1.3"
       sources."@types/body-parser-1.19.0"
       sources."@types/caseless-0.12.2"
-      sources."@types/chart.js-2.9.23"
+      sources."@types/chart.js-2.9.24"
       sources."@types/connect-3.4.33"
       sources."@types/engine.io-3.1.4"
-      sources."@types/express-4.17.7"
+      sources."@types/express-4.17.8"
       sources."@types/express-serve-static-core-4.17.13"
       sources."@types/fancy-log-1.3.0"
       sources."@types/glob-7.1.3"
-      sources."@types/hls.js-0.13.0"
+      sources."@types/hls.js-0.13.1"
       sources."@types/js-yaml-3.12.5"
       sources."@types/json-schema-7.0.6"
-      sources."@types/lodash-4.14.158"
+      sources."@types/lodash-4.14.161"
       sources."@types/material-design-lite-1.1.16"
       sources."@types/mime-2.0.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.0"
       sources."@types/mithril-2.0.3"
       sources."@types/mkdirp-1.0.1"
-      sources."@types/multer-1.4.3"
+      sources."@types/multer-1.4.4"
       sources."@types/mysql-2.15.15"
-      sources."@types/node-14.0.26"
-      sources."@types/pg-7.14.4"
+      sources."@types/node-14.11.1"
+      sources."@types/pg-7.14.5"
       sources."@types/pg-types-1.11.5"
       sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
-      sources."@types/request-2.48.5"
-      sources."@types/serve-static-1.13.5"
-      sources."@types/socket.io-2.1.10"
+      (sources."@types/request-2.48.5" // {
+        dependencies = [
+          sources."form-data-2.5.1"
+        ];
+      })
+      sources."@types/serve-static-1.13.6"
+      sources."@types/socket.io-2.1.11"
       sources."@types/socket.io-client-1.4.33"
       sources."@types/sqlite3-3.1.6"
       sources."@types/tough-cookie-4.0.0"
@@ -68303,7 +68392,7 @@ in
       sources."ansi-gray-0.1.1"
       sources."ansi-red-0.1.1"
       sources."ansi-regex-2.1.1"
-      sources."ansi-styles-3.2.1"
+      sources."ansi-styles-2.2.1"
       sources."ansi-wrap-0.1.0"
       (sources."anymatch-2.0.0" // {
         dependencies = [
@@ -68331,7 +68420,13 @@ in
       sources."append-field-1.0.0"
       sources."aproba-1.2.0"
       sources."archy-1.0.0"
-      sources."are-we-there-yet-1.1.5"
+      (sources."are-we-there-yet-1.1.5" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."argparse-1.0.10"
       sources."aribts-2.1.12"
       sources."arr-diff-4.0.0"
@@ -68426,12 +68521,12 @@ in
       })
       (sources."browserify-sign-4.2.1" // {
         dependencies = [
-          sources."readable-stream-3.6.0"
+          sources."inherits-2.0.4"
           sources."safe-buffer-5.2.1"
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."buffer-4.9.2"
+      sources."buffer-5.6.0"
       sources."buffer-equal-1.0.0"
       sources."buffer-from-1.1.1"
       sources."buffer-writer-2.0.0"
@@ -68440,7 +68535,6 @@ in
       sources."builtin-status-codes-3.0.0"
       (sources."busboy-0.2.14" // {
         dependencies = [
-          sources."isarray-0.0.1"
           sources."readable-stream-1.1.14"
           sources."string_decoder-0.10.31"
         ];
@@ -68448,7 +68542,14 @@ in
       sources."bytes-3.1.0"
       (sources."cacache-15.0.5" // {
         dependencies = [
+          sources."chownr-2.0.0"
+          sources."fs-minipass-2.1.0"
+          sources."minipass-3.1.3"
+          sources."minizlib-2.1.2"
           sources."p-map-4.0.0"
+          sources."rimraf-3.0.2"
+          sources."tar-6.0.5"
+          sources."yallist-4.0.0"
         ];
       })
       sources."cache-base-1.0.1"
@@ -68456,13 +68557,12 @@ in
         dependencies = [
           sources."get-stream-5.2.0"
           sources."lowercase-keys-2.0.0"
-          sources."pump-3.0.0"
         ];
       })
       sources."callsite-1.0.0"
       sources."camelcase-3.0.0"
       sources."caseless-0.12.0"
-      sources."chalk-2.4.2"
+      sources."chalk-1.1.3"
       sources."chardet-0.4.2"
       sources."chart.js-2.9.3"
       sources."chartjs-color-2.4.1"
@@ -68482,7 +68582,7 @@ in
           sources."to-regex-range-2.1.1"
         ];
       })
-      sources."chownr-2.0.0"
+      sources."chownr-1.1.4"
       sources."chrome-trace-event-1.0.2"
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
@@ -68502,20 +68602,27 @@ in
           sources."kind-of-5.1.0"
         ];
       })
-      (sources."clean-css-4.2.3" // {
-        dependencies = [
-          sources."source-map-0.6.1"
-        ];
-      })
+      sources."clean-css-4.2.3"
       sources."clean-stack-2.2.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.1"
-      sources."cliui-3.2.0"
+      (sources."cliui-3.2.0" // {
+        dependencies = [
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+        ];
+      })
       sources."clone-2.1.2"
       sources."clone-buffer-1.0.0"
       sources."clone-response-1.0.2"
       sources."clone-stats-1.0.0"
-      sources."cloneable-readable-1.1.3"
+      (sources."cloneable-readable-1.1.3" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."code-point-at-1.1.0"
       sources."collection-map-1.0.0"
       sources."collection-visit-1.0.0"
@@ -68527,15 +68634,17 @@ in
       sources."commander-2.20.3"
       sources."commondir-1.0.1"
       sources."component-bind-1.0.0"
-      sources."component-emitter-1.3.0"
+      sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
-      (sources."concat-with-sourcemaps-1.1.0" // {
+      (sources."concat-stream-1.6.2" // {
         dependencies = [
-          sources."source-map-0.6.1"
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
         ];
       })
+      sources."concat-with-sourcemaps-1.1.0"
       sources."console-browserify-1.2.0"
       sources."console-control-strings-1.1.0"
       sources."constants-browserify-1.0.0"
@@ -68547,18 +68656,13 @@ in
       (sources."copy-concurrently-1.0.5" // {
         dependencies = [
           sources."mkdirp-0.5.5"
-          sources."rimraf-2.7.1"
         ];
       })
       sources."copy-descriptor-0.1.1"
       sources."copy-props-2.0.4"
       sources."core-js-2.6.11"
       sources."core-util-is-1.0.2"
-      (sources."crc-3.8.0" // {
-        dependencies = [
-          sources."buffer-5.6.0"
-        ];
-      })
+      sources."crc-3.8.0"
       (sources."create-ecdh-4.0.4" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -68567,11 +68671,7 @@ in
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
-      (sources."css-2.2.4" // {
-        dependencies = [
-          sources."source-map-0.6.1"
-        ];
-      })
+      sources."css-2.2.4"
       sources."css-ripple-effect-1.0.5"
       sources."cyclist-1.0.1"
       sources."d-1.0.1"
@@ -68597,7 +68697,11 @@ in
       sources."defer-to-connect-1.1.3"
       sources."define-properties-1.1.3"
       sources."define-property-2.0.2"
-      sources."del-5.1.0"
+      (sources."del-5.1.0" // {
+        dependencies = [
+          sources."rimraf-3.0.2"
+        ];
+      })
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
@@ -68608,7 +68712,6 @@ in
       sources."detect-newline-2.1.0"
       (sources."dicer-0.2.5" // {
         dependencies = [
-          sources."isarray-0.0.1"
           sources."readable-stream-1.1.14"
           sources."string_decoder-0.10.31"
         ];
@@ -68625,7 +68728,13 @@ in
       sources."domain-browser-1.2.0"
       sources."dotenv-8.2.0"
       sources."duplexer3-0.1.4"
-      sources."duplexify-3.7.1"
+      (sources."duplexify-3.7.1" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."each-props-1.3.2"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
@@ -68651,6 +68760,7 @@ in
       })
       (sources."engine.io-client-3.4.4" // {
         dependencies = [
+          sources."component-emitter-1.3.0"
           sources."debug-3.1.0"
           sources."parseqs-0.0.6"
           sources."parseuri-0.0.6"
@@ -68704,7 +68814,7 @@ in
       sources."expand-tilde-2.0.2"
       sources."express-4.17.1"
       sources."express-normalize-query-params-middleware-0.5.1"
-      sources."express-openapi-7.0.0"
+      sources."express-openapi-7.0.1"
       (sources."ext-1.4.0" // {
         dependencies = [
           sources."type-2.1.0"
@@ -68751,36 +68861,54 @@ in
       sources."fined-1.2.0"
       sources."flagged-respawn-1.0.1"
       sources."flatted-2.0.2"
-      sources."flush-write-stream-1.1.1"
+      (sources."flush-write-stream-1.1.1" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."for-in-1.0.2"
       sources."for-own-1.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.5.1"
+      sources."form-data-2.3.3"
       sources."forwarded-0.1.2"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
-      sources."from2-2.3.0"
+      (sources."from2-2.3.0" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."fs-extra-9.0.1"
-      sources."fs-minipass-2.1.0"
+      sources."fs-minipass-1.2.7"
       sources."fs-mkdirp-stream-1.0.0"
       sources."fs-routes-7.0.1"
-      sources."fs-write-stream-atomic-1.0.10"
+      (sources."fs-write-stream-atomic-1.0.10" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.13"
       (sources."fstream-1.0.12" // {
         dependencies = [
           sources."mkdirp-0.5.5"
-          sources."rimraf-2.7.1"
         ];
       })
       sources."function-bind-1.1.1"
-      sources."gauge-2.7.4"
-      sources."get-caller-file-1.0.3"
-      (sources."get-stream-4.1.0" // {
+      (sources."gauge-2.7.4" // {
         dependencies = [
-          sources."pump-3.0.0"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
         ];
       })
+      sources."get-caller-file-1.0.3"
+      sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
@@ -68789,6 +68917,9 @@ in
         dependencies = [
           sources."glob-parent-3.1.0"
           sources."is-glob-3.1.0"
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
         ];
       })
       sources."glob-watcher-5.0.5"
@@ -68809,31 +68940,28 @@ in
       (sources."gulp-dart-sass-1.0.2" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
           sources."strip-ansi-4.0.0"
+          sources."supports-color-5.5.0"
         ];
       })
       (sources."gulp-plumber-1.2.1" // {
         dependencies = [
-          sources."ansi-styles-2.2.1"
           sources."arr-diff-1.1.0"
           sources."arr-union-2.1.0"
           sources."array-slice-0.2.3"
-          sources."chalk-1.1.3"
           sources."extend-shallow-1.1.4"
           sources."kind-of-1.1.0"
           sources."plugin-error-0.1.2"
-          sources."supports-color-2.0.0"
-        ];
-      })
-      (sources."gulp-sourcemaps-2.6.5" // {
-        dependencies = [
-          sources."source-map-0.6.1"
         ];
       })
+      sources."gulp-sourcemaps-2.6.5"
       sources."gulp-tslint-8.1.4"
       (sources."gulp-typescript-5.0.1" // {
         dependencies = [
           sources."ansi-colors-3.2.4"
+          sources."inherits-2.0.4"
           sources."source-map-0.7.3"
           sources."through2-3.0.2"
         ];
@@ -68865,7 +68993,7 @@ in
       })
       (sources."hash-base-3.1.0" // {
         dependencies = [
-          sources."readable-stream-3.6.0"
+          sources."inherits-2.0.4"
           sources."safe-buffer-5.2.1"
         ];
       })
@@ -68879,11 +69007,7 @@ in
       sources."homedir-polyfill-1.0.3"
       sources."hosted-git-info-2.8.8"
       sources."http-cache-semantics-4.1.0"
-      (sources."http-errors-1.7.2" // {
-        dependencies = [
-          sources."inherits-2.0.3"
-        ];
-      })
+      sources."http-errors-1.7.2"
       sources."http-signature-1.2.0"
       sources."https-browserify-1.0.0"
       sources."iconv-lite-0.4.24"
@@ -68896,22 +69020,9 @@ in
       sources."indexof-0.0.1"
       sources."infer-owner-1.0.4"
       sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
+      sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      (sources."inquirer-3.0.6" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."ansi-styles-2.2.1"
-          sources."chalk-1.1.3"
-          sources."is-fullwidth-code-point-2.0.0"
-          (sources."string-width-2.1.1" // {
-            dependencies = [
-              sources."strip-ansi-4.0.0"
-            ];
-          })
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."inquirer-3.0.6"
       sources."interpret-1.4.0"
       sources."invert-kv-1.0.0"
       sources."ip-1.1.5"
@@ -68922,13 +69033,14 @@ in
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
       sources."is-dir-1.0.0"
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-negated-glob-1.0.0"
       sources."is-negative-zero-2.0.0"
@@ -68947,7 +69059,7 @@ in
       sources."is-valid-glob-1.0.0"
       sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
-      sources."isarray-1.0.0"
+      sources."isarray-0.0.1"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
@@ -68974,7 +69086,13 @@ in
       sources."kind-of-6.0.3"
       sources."last-run-1.1.1"
       sources."latest-version-5.1.0"
-      sources."lazystream-1.0.0"
+      (sources."lazystream-1.0.0" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."lcid-1.0.0"
       sources."lead-1.0.0"
       sources."liftoff-3.1.0"
@@ -68982,7 +69100,7 @@ in
       sources."loader-runner-2.4.0"
       sources."loader-utils-1.4.0"
       sources."locate-path-5.0.0"
-      sources."lodash-4.17.19"
+      sources."lodash-4.17.20"
       sources."lodash.clone-4.5.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.merge-4.6.2"
@@ -68995,7 +69113,11 @@ in
       })
       sources."loose-envify-1.4.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      (sources."lru-cache-6.0.0" // {
+        dependencies = [
+          sources."yallist-4.0.0"
+        ];
+      })
       sources."lru-queue-0.1.0"
       (sources."make-dir-3.1.0" // {
         dependencies = [
@@ -69024,7 +69146,13 @@ in
       sources."md5.js-1.3.5"
       sources."media-typer-0.3.0"
       sources."memoizee-0.4.14"
-      sources."memory-fs-0.5.0"
+      (sources."memory-fs-0.5.0" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."merge-descriptors-1.0.1"
       sources."merge-stream-2.0.0"
       sources."merge2-1.4.1"
@@ -69044,12 +69172,27 @@ in
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      sources."minipass-3.1.3"
-      sources."minipass-collect-1.0.2"
-      sources."minipass-flush-1.0.5"
-      sources."minipass-pipeline-1.2.4"
-      sources."minizlib-2.1.2"
-      (sources."mirakurun-3.2.0" // {
+      sources."minipass-2.9.0"
+      (sources."minipass-collect-1.0.2" // {
+        dependencies = [
+          sources."minipass-3.1.3"
+          sources."yallist-4.0.0"
+        ];
+      })
+      (sources."minipass-flush-1.0.5" // {
+        dependencies = [
+          sources."minipass-3.1.3"
+          sources."yallist-4.0.0"
+        ];
+      })
+      (sources."minipass-pipeline-1.2.4" // {
+        dependencies = [
+          sources."minipass-3.1.3"
+          sources."yallist-4.0.0"
+        ];
+      })
+      sources."minizlib-1.3.3"
+      (sources."mirakurun-3.3.1" // {
         dependencies = [
           sources."aribts-1.3.5"
           sources."eventemitter3-4.0.7"
@@ -69072,16 +69215,9 @@ in
             ];
           })
           sources."openapi-types-1.3.5"
-          sources."readable-stream-3.6.0"
-          sources."semver-7.3.2"
-          sources."stream-http-3.1.1"
-        ];
-      })
-      (sources."mississippi-3.0.0" // {
-        dependencies = [
-          sources."pump-3.0.0"
         ];
       })
+      sources."mississippi-3.0.0"
       sources."mithril-2.0.4"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
@@ -69098,7 +69234,6 @@ in
       (sources."move-concurrently-1.0.1" // {
         dependencies = [
           sources."mkdirp-0.5.5"
-          sources."rimraf-2.7.1"
         ];
       })
       sources."ms-2.0.0"
@@ -69110,7 +69245,13 @@ in
       sources."munin-plugin-0.0.9"
       sources."mute-stdout-1.0.1"
       sources."mute-stream-0.0.7"
-      sources."mysql-2.18.1"
+      (sources."mysql-2.18.1" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."nan-2.14.2"
       sources."nanomatch-1.2.13"
       (sources."needle-2.5.2" // {
@@ -69128,30 +69269,35 @@ in
         dependencies = [
           sources."mkdirp-0.5.5"
           sources."nopt-3.0.6"
-          sources."rimraf-2.7.1"
           sources."semver-5.3.0"
           sources."tar-2.2.2"
         ];
       })
       (sources."node-libs-browser-2.2.1" // {
         dependencies = [
+          sources."buffer-4.9.2"
+          sources."isarray-1.0.0"
           sources."punycode-1.4.1"
+          (sources."readable-stream-2.3.7" // {
+            dependencies = [
+              sources."string_decoder-1.1.1"
+            ];
+          })
+          sources."stream-http-2.8.3"
         ];
       })
       (sources."node-pre-gyp-0.11.0" // {
         dependencies = [
-          sources."chownr-1.1.4"
-          sources."fs-minipass-1.2.7"
-          sources."minipass-2.9.0"
-          sources."minizlib-1.3.3"
           sources."mkdirp-0.5.5"
-          sources."rimraf-2.7.1"
-          sources."tar-4.4.13"
-          sources."yallist-3.1.1"
+          sources."semver-5.7.1"
         ];
       })
       sources."nopt-4.0.3"
-      sources."normalize-package-data-2.5.0"
+      (sources."normalize-package-data-2.5.0" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
       sources."normalize-path-3.0.0"
       sources."normalize-url-4.5.0"
       sources."now-and-later-2.0.1"
@@ -69189,58 +69335,29 @@ in
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      (sources."openapi-default-setter-7.0.1" // {
-        dependencies = [
-          sources."openapi-types-7.0.1"
-        ];
-      })
-      (sources."openapi-framework-7.0.2" // {
-        dependencies = [
-          sources."openapi-types-7.0.1"
-        ];
-      })
-      (sources."openapi-jsonschema-parameters-7.0.2" // {
-        dependencies = [
-          sources."openapi-types-7.0.1"
-        ];
-      })
-      (sources."openapi-request-coercer-7.0.1" // {
-        dependencies = [
-          sources."openapi-types-7.0.1"
-        ];
-      })
-      (sources."openapi-request-validator-7.0.2" // {
-        dependencies = [
-          sources."openapi-types-7.0.1"
-        ];
-      })
-      (sources."openapi-response-validator-7.0.1" // {
-        dependencies = [
-          sources."openapi-types-7.0.1"
-        ];
-      })
-      (sources."openapi-schema-validator-7.0.1" // {
-        dependencies = [
-          sources."openapi-types-7.0.1"
-        ];
-      })
-      (sources."openapi-security-handler-7.0.1" // {
-        dependencies = [
-          sources."openapi-types-7.0.1"
-        ];
-      })
-      sources."openapi-types-7.0.0"
+      sources."openapi-default-setter-7.0.1"
+      sources."openapi-framework-7.0.2"
+      sources."openapi-jsonschema-parameters-7.0.2"
+      sources."openapi-request-coercer-7.0.1"
+      sources."openapi-request-validator-7.0.2"
+      sources."openapi-response-validator-7.0.1"
+      sources."openapi-schema-validator-7.0.1"
+      sources."openapi-security-handler-7.0.1"
+      sources."openapi-types-7.0.1"
       (sources."opencollective-1.0.3" // {
         dependencies = [
-          sources."ansi-styles-2.2.1"
-          sources."chalk-1.1.3"
           sources."minimist-1.2.0"
-          sources."supports-color-2.0.0"
         ];
       })
       sources."opencollective-postinstall-2.0.3"
       sources."opn-4.0.2"
-      sources."ordered-read-streams-1.0.1"
+      (sources."ordered-read-streams-1.0.1" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."os-browserify-0.3.0"
       sources."os-homedir-1.0.2"
       sources."os-locale-1.4.0"
@@ -69262,7 +69379,13 @@ in
       })
       sources."packet-reader-1.0.0"
       sources."pako-1.0.11"
-      sources."parallel-transform-1.2.0"
+      (sources."parallel-transform-1.2.0" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."parse-asn1-5.1.6"
       sources."parse-filepath-1.0.2"
       sources."parse-json-2.2.0"
@@ -69283,7 +69406,7 @@ in
       sources."path-type-4.0.0"
       sources."pbkdf2-3.1.1"
       sources."performance-now-2.1.0"
-      (sources."pg-8.3.0" // {
+      (sources."pg-8.3.3" // {
         dependencies = [
           sources."semver-4.3.2"
         ];
@@ -69325,8 +69448,12 @@ in
           sources."bn.js-4.11.9"
         ];
       })
-      sources."pump-2.0.1"
-      sources."pumpify-1.5.1"
+      sources."pump-3.0.0"
+      (sources."pumpify-1.5.1" // {
+        dependencies = [
+          sources."pump-2.0.1"
+        ];
+      })
       sources."punycode-2.1.1"
       sources."qs-6.7.0"
       sources."querystring-0.2.0"
@@ -69345,15 +69472,18 @@ in
         ];
       })
       sources."read-pkg-up-1.0.1"
-      sources."readable-stream-2.3.7"
+      sources."readable-stream-3.6.0"
       (sources."readdirp-2.2.1" // {
         dependencies = [
           sources."braces-2.3.2"
           sources."extend-shallow-2.0.1"
           sources."fill-range-4.0.0"
           sources."is-number-3.0.0"
+          sources."isarray-1.0.0"
           sources."kind-of-3.2.2"
           sources."micromatch-3.1.10"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
           sources."to-regex-range-2.1.1"
         ];
       })
@@ -69371,13 +69501,12 @@ in
       sources."replace-homedir-1.0.0"
       (sources."request-2.88.2" // {
         dependencies = [
-          sources."form-data-2.3.3"
           sources."qs-6.5.2"
         ];
       })
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-dir-1.0.1"
       sources."resolve-options-1.1.0"
       sources."resolve-url-0.2.1"
@@ -69386,7 +69515,7 @@ in
       sources."ret-0.1.15"
       sources."reusify-1.0.4"
       sources."rfdc-1.1.4"
-      sources."rimraf-3.0.2"
+      sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
       sources."run-async-2.4.1"
       sources."run-parallel-1.1.9"
@@ -69399,14 +69528,14 @@ in
       sources."sax-1.2.4"
       sources."scheduler-0.19.1"
       sources."schema-utils-2.7.1"
-      sources."semver-5.7.1"
+      sources."semver-7.3.2"
       sources."semver-greatest-satisfied-range-1.1.0"
       (sources."send-0.17.1" // {
         dependencies = [
           sources."ms-2.1.1"
         ];
       })
-      sources."serialize-javascript-4.0.0"
+      sources."serialize-javascript-5.0.1"
       sources."serve-static-1.14.1"
       sources."set-blocking-2.0.0"
       (sources."set-value-2.0.1" // {
@@ -69436,6 +69565,7 @@ in
           })
           sources."is-descriptor-0.1.6"
           sources."kind-of-5.1.0"
+          sources."source-map-0.5.7"
         ];
       })
       (sources."snapdragon-node-2.1.1" // {
@@ -69458,7 +69588,6 @@ in
       (sources."socket.io-client-2.3.0" // {
         dependencies = [
           sources."base64-arraybuffer-0.1.5"
-          sources."component-emitter-1.2.1"
           sources."debug-4.1.1"
           sources."isarray-2.0.1"
           sources."ms-2.1.2"
@@ -69473,20 +69602,15 @@ in
       })
       (sources."socket.io-parser-3.4.1" // {
         dependencies = [
-          sources."component-emitter-1.2.1"
           sources."debug-4.1.1"
           sources."isarray-2.0.1"
           sources."ms-2.1.2"
         ];
       })
       sources."source-list-map-2.0.1"
-      sources."source-map-0.5.7"
+      sources."source-map-0.6.1"
       sources."source-map-resolve-0.5.3"
-      (sources."source-map-support-0.5.19" // {
-        dependencies = [
-          sources."source-map-0.6.1"
-        ];
-      })
+      sources."source-map-support-0.5.19"
       sources."source-map-url-0.4.0"
       sources."sparkles-1.0.1"
       sources."spdx-correct-3.1.1"
@@ -69499,7 +69623,12 @@ in
       sources."sqlite3-5.0.0"
       sources."sqlstring-2.3.1"
       sources."sshpk-1.16.1"
-      sources."ssri-8.0.0"
+      (sources."ssri-8.0.0" // {
+        dependencies = [
+          sources."minipass-3.1.3"
+          sources."yallist-4.0.0"
+        ];
+      })
       sources."stack-trace-0.0.10"
       (sources."static-extend-0.1.2" // {
         dependencies = [
@@ -69519,10 +69648,20 @@ in
         ];
       })
       sources."statuses-1.5.0"
-      sources."stream-browserify-2.0.2"
+      (sources."stream-browserify-2.0.2" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."stream-each-1.2.3"
       sources."stream-exhaust-1.0.2"
-      sources."stream-http-2.8.3"
+      (sources."stream-http-3.1.1" // {
+        dependencies = [
+          sources."inherits-2.0.4"
+        ];
+      })
       sources."stream-shift-1.0.1"
       (sources."streamroller-2.2.4" // {
         dependencies = [
@@ -69535,7 +69674,12 @@ in
         ];
       })
       sources."streamsearch-0.1.2"
-      sources."string-width-1.0.2"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       (sources."string.prototype.trimend-1.0.1" // {
         dependencies = [
           sources."es-abstract-1.17.7"
@@ -69546,30 +69690,40 @@ in
           sources."es-abstract-1.17.7"
         ];
       })
-      sources."string_decoder-1.1.1"
+      (sources."string_decoder-1.3.0" // {
+        dependencies = [
+          sources."safe-buffer-5.2.1"
+        ];
+      })
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
       sources."strip-bom-string-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-5.5.0"
+      sources."supports-color-2.0.0"
       sources."sver-compat-1.5.0"
       sources."swagger-schema-official-2.0.0-bab6bed"
-      sources."swagger-ui-dist-3.30.2"
+      sources."swagger-ui-dist-3.34.0"
       sources."tail-2.0.4"
       sources."tapable-1.1.3"
-      sources."tar-6.0.5"
-      (sources."terser-4.8.0" // {
+      (sources."tar-4.4.13" // {
         dependencies = [
-          sources."source-map-0.6.1"
+          sources."mkdirp-0.5.5"
         ];
       })
-      (sources."terser-webpack-plugin-3.0.7" // {
+      (sources."terser-5.3.7" // {
         dependencies = [
-          sources."source-map-0.6.1"
+          sources."source-map-0.7.3"
         ];
       })
+      sources."terser-webpack-plugin-4.2.2"
       sources."through-2.3.8"
-      sources."through2-2.0.5"
+      (sources."through2-2.0.5" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."through2-filter-3.0.0"
       sources."time-stamp-1.1.0"
       sources."timers-browserify-2.0.11"
@@ -69589,16 +69743,23 @@ in
       sources."to-through-2.0.0"
       sources."toidentifier-1.0.0"
       sources."tough-cookie-2.5.0"
-      (sources."ts-loader-8.0.1" // {
+      (sources."ts-loader-8.0.4" // {
         dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
           sources."semver-6.3.0"
+          sources."supports-color-5.5.0"
         ];
       })
       sources."ts-log-2.2.3"
       sources."tslib-1.14.1"
-      (sources."tslint-6.1.2" // {
+      (sources."tslint-6.1.3" // {
         dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
           sources."mkdirp-0.5.5"
+          sources."semver-5.7.1"
+          sources."supports-color-5.5.0"
         ];
       })
       sources."tsutils-2.29.0"
@@ -69608,7 +69769,7 @@ in
       sources."type-1.2.0"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      sources."typescript-3.9.7"
+      sources."typescript-4.0.3"
       sources."unc-path-regex-0.1.2"
       sources."undertaker-1.3.0"
       sources."undertaker-registry-1.0.1"
@@ -69626,6 +69787,7 @@ in
             ];
           })
           sources."has-values-0.1.4"
+          sources."isarray-1.0.0"
         ];
       })
       sources."upath-1.2.0"
@@ -69640,11 +69802,7 @@ in
       sources."url-parse-lax-3.0.0"
       sources."url-toolkit-2.2.1"
       sources."use-3.1.1"
-      (sources."util-0.11.1" // {
-        dependencies = [
-          sources."inherits-2.0.3"
-        ];
-      })
+      sources."util-0.11.1"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
@@ -69654,13 +69812,23 @@ in
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."vinyl-2.2.1"
-      sources."vinyl-fs-3.0.3"
+      (sources."vinyl-fs-3.0.3" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       (sources."vinyl-sourcemap-1.1.0" // {
         dependencies = [
           sources."normalize-path-2.1.1"
         ];
       })
-      sources."vinyl-sourcemaps-apply-0.2.1"
+      (sources."vinyl-sourcemaps-apply-0.2.1" // {
+        dependencies = [
+          sources."source-map-0.5.7"
+        ];
+      })
       sources."vm-browserify-1.1.2"
       (sources."watchpack-1.7.4" // {
         dependencies = [
@@ -69673,17 +69841,17 @@ in
         ];
       })
       sources."watchpack-chokidar2-2.0.0"
-      (sources."webpack-4.44.0" // {
+      (sources."webpack-4.44.2" // {
         dependencies = [
           sources."acorn-6.4.2"
           sources."braces-2.3.2"
           sources."cacache-12.0.4"
-          sources."chownr-1.1.4"
           sources."extend-shallow-2.0.1"
           sources."fill-range-4.0.0"
           sources."find-cache-dir-2.1.0"
           sources."find-up-3.0.0"
           sources."is-number-3.0.0"
+          sources."isarray-1.0.0"
           sources."kind-of-3.2.2"
           sources."locate-path-3.0.0"
           sources."lru-cache-5.1.1"
@@ -69696,38 +69864,47 @@ in
           sources."path-exists-3.0.0"
           sources."pify-4.0.1"
           sources."pkg-dir-3.0.0"
-          sources."rimraf-2.7.1"
+          sources."readable-stream-2.3.7"
           sources."schema-utils-1.0.0"
-          sources."source-map-0.6.1"
+          sources."semver-5.7.1"
+          sources."serialize-javascript-4.0.0"
           sources."ssri-6.0.1"
+          sources."string_decoder-1.1.1"
+          sources."terser-4.8.0"
           sources."terser-webpack-plugin-1.4.5"
           sources."to-regex-range-2.1.1"
           sources."y18n-4.0.0"
-          sources."yallist-3.1.1"
         ];
       })
-      (sources."webpack-sources-1.4.3" // {
+      sources."webpack-sources-1.4.3"
+      (sources."webpack-stream-6.1.0" // {
         dependencies = [
-          sources."source-map-0.6.1"
-        ];
-      })
-      (sources."webpack-stream-5.2.1" // {
-        dependencies = [
-          sources."memory-fs-0.4.1"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.2.0"
         ];
       })
       sources."which-1.3.1"
       sources."which-module-1.0.0"
       sources."wide-align-1.1.3"
       sources."worker-farm-1.7.0"
-      sources."wrap-ansi-2.1.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+        ];
+      })
       sources."wrappy-1.0.2"
       sources."ws-7.3.1"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."xtend-4.0.2"
       sources."y18n-3.2.1"
-      sources."yallist-4.0.0"
-      sources."yargs-7.1.1"
+      sources."yallist-3.1.1"
+      (sources."yargs-7.1.1" // {
+        dependencies = [
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+        ];
+      })
       sources."yargs-parser-5.0.0-security.0"
       sources."yeast-0.1.2"
     ];
@@ -70065,10 +70242,10 @@ in
   expo-cli = nodeEnv.buildNodePackage {
     name = "expo-cli";
     packageName = "expo-cli";
-    version = "3.28.0";
+    version = "3.28.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.0.tgz";
-      sha512 = "1fz44bGoM3jfit1gPYW1JuShX2DQva6SHZT1Rnx06UOeWJeofHO0ki/4J3InI8tob+XnktXo3cYW0HEXpJwVGg==";
+      url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.1.tgz";
+      sha512 = "m0+d3uvO7sopcI0mlpLjYYAKaWx1FCPNlbxQxkRZHdhbdCVhrPcAdmZHJGfBNW1N4szMac6LiLZFWxDjECU1bA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -70078,7 +70255,7 @@ in
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
       sources."@babel/helper-builder-react-jsx-7.10.4"
-      sources."@babel/helper-builder-react-jsx-experimental-7.12.1"
+      sources."@babel/helper-builder-react-jsx-experimental-7.12.4"
       sources."@babel/helper-compilation-targets-7.12.1"
       sources."@babel/helper-create-class-features-plugin-7.12.1"
       sources."@babel/helper-create-regexp-features-plugin-7.12.1"
@@ -70214,7 +70391,7 @@ in
           sources."uuid-3.4.0"
         ];
       })
-      (sources."@expo/config-3.3.10" // {
+      (sources."@expo/config-3.3.11" // {
         dependencies = [
           sources."semver-7.3.2"
           sources."uuid-3.4.0"
@@ -70228,7 +70405,7 @@ in
           sources."pngjs-5.0.0"
         ];
       })
-      (sources."@expo/dev-server-0.1.35" // {
+      (sources."@expo/dev-server-0.1.36" // {
         dependencies = [
           sources."body-parser-1.19.0"
           sources."bytes-3.1.0"
@@ -70244,7 +70421,7 @@ in
           sources."statuses-1.5.0"
         ];
       })
-      sources."@expo/dev-tools-0.13.53"
+      sources."@expo/dev-tools-0.13.54"
       sources."@expo/eas-build-job-0.1.1"
       (sources."@expo/image-utils-0.3.7" // {
         dependencies = [
@@ -70256,7 +70433,7 @@ in
           sources."json5-1.0.1"
         ];
       })
-      sources."@expo/metro-config-0.1.35"
+      sources."@expo/metro-config-0.1.36"
       (sources."@expo/ngrok-2.4.3" // {
         dependencies = [
           sources."uuid-3.4.0"
@@ -70304,14 +70481,14 @@ in
       sources."@expo/spawn-async-1.5.0"
       sources."@expo/traveling-fastlane-darwin-1.15.1"
       sources."@expo/traveling-fastlane-linux-1.15.1"
-      (sources."@expo/webpack-config-0.12.39" // {
+      (sources."@expo/webpack-config-0.12.40" // {
         dependencies = [
           sources."@babel/runtime-7.9.0"
           sources."is-wsl-2.2.0"
           sources."react-refresh-0.8.3"
         ];
       })
-      (sources."@expo/xdl-58.0.14" // {
+      (sources."@expo/xdl-58.0.15" // {
         dependencies = [
           sources."chownr-1.1.4"
           sources."es6-error-4.1.1"
@@ -71090,7 +71267,7 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."expo-pwa-0.0.45" // {
+      (sources."expo-pwa-0.0.46" // {
         dependencies = [
           sources."commander-2.20.0"
         ];
@@ -71369,6 +71546,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-color-stop-1.1.0"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -71641,7 +71819,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.63"
+      sources."node-releases-1.1.64"
       sources."nopt-5.0.0"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
@@ -72144,7 +72322,7 @@ in
       sources."require-from-string-2.0.2"
       sources."require-main-filename-2.0.0"
       sources."requires-port-1.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-alpn-1.0.0"
       (sources."resolve-cwd-2.0.0" // {
         dependencies = [
@@ -72838,11 +73016,13 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."fs-extra-1.0.0"
+      sources."function-bind-1.1.1"
       sources."get-stdin-4.0.1"
       sources."getpass-0.1.7"
       sources."graceful-fs-4.2.4"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."hasha-2.2.0"
@@ -72851,6 +73031,7 @@ in
       sources."indent-string-2.1.0"
       sources."inherits-2.0.4"
       sources."is-arrayish-0.2.1"
+      sources."is-core-module-2.0.0"
       sources."is-finite-1.1.0"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
@@ -72924,7 +73105,7 @@ in
       sources."repeating-2.0.1"
       sources."request-2.88.2"
       sources."request-progress-2.0.1"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."restore-cursor-1.0.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -73026,8 +73207,10 @@ in
           sources."ps-list-7.2.0"
         ];
       })
+      sources."function-bind-1.1.1"
       sources."get-stream-5.2.0"
       sources."hard-rejection-2.1.0"
+      sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."hosted-git-info-2.8.8"
       sources."human-signals-1.1.1"
@@ -73044,6 +73227,7 @@ in
         ];
       })
       sources."is-arrayish-0.2.1"
+      sources."is-core-module-2.0.0"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-plain-obj-1.1.0"
       sources."is-stream-2.0.0"
@@ -73114,7 +73298,7 @@ in
         ];
       })
       sources."redent-3.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."restore-cursor-3.1.0"
       sources."run-async-2.4.1"
       sources."rxjs-6.6.3"
@@ -73904,7 +74088,7 @@ in
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."arrify-1.0.1"
-      sources."atomically-1.5.0"
+      sources."atomically-1.6.0"
       (sources."boxen-4.2.0" // {
         dependencies = [
           sources."chalk-3.0.0"
@@ -73958,6 +74142,7 @@ in
       sources."fast-json-stable-stringify-2.1.0"
       sources."figures-3.2.0"
       sources."find-up-3.0.0"
+      sources."function-bind-1.1.1"
       sources."fuse.js-6.4.1"
       sources."get-stream-5.2.0"
       sources."global-dirs-2.0.1"
@@ -73968,6 +74153,7 @@ in
       })
       sources."graceful-fs-4.2.4"
       sources."hard-rejection-2.1.0"
+      sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
       sources."hosted-git-info-2.8.8"
@@ -73982,6 +74168,7 @@ in
       sources."inquirer-autocomplete-prompt-1.2.0"
       sources."is-arrayish-0.2.1"
       sources."is-ci-2.0.0"
+      sources."is-core-module-2.0.0"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-installed-globally-0.3.2"
       sources."is-interactive-1.0.0"
@@ -74080,7 +74267,7 @@ in
       sources."redent-3.0.0"
       sources."registry-auth-token-4.2.0"
       sources."registry-url-5.1.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."responselike-1.0.2"
       sources."restore-cursor-3.1.0"
       sources."run-async-2.4.1"
@@ -74182,7 +74369,7 @@ in
       sources."@nodelib/fs.walk-1.2.4"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/parse-json-4.0.0"
       sources."@types/websocket-1.0.1"
       sources."aggregate-error-3.1.0"
@@ -74782,10 +74969,12 @@ in
       sources."for-in-1.0.2"
       sources."for-own-1.0.0"
       sources."fragment-cache-0.2.1"
+      sources."function-bind-1.1.1"
       sources."get-value-2.0.6"
       sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
       sources."grunt-known-options-1.1.1"
+      sources."has-1.0.3"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -74798,6 +74987,7 @@ in
       sources."is-absolute-1.0.0"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-buffer-1.1.6"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
@@ -74860,7 +75050,7 @@ in
       sources."regex-not-1.0.2"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-dir-1.0.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
@@ -75278,6 +75468,7 @@ in
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -75396,7 +75587,7 @@ in
       sources."replace-homedir-1.0.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-dir-1.0.1"
       sources."resolve-options-1.1.0"
       sources."resolve-url-0.2.1"
@@ -75686,6 +75877,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
+      sources."is-core-module-2.0.0"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -75802,7 +75994,7 @@ in
       sources."replace-homedir-1.0.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-dir-1.0.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
@@ -76921,6 +77113,7 @@ in
       sources."fs-extra-9.0.1"
       sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       (sources."gauge-2.7.4" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -76935,6 +77128,7 @@ in
       sources."graceful-fs-4.2.4"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
       sources."hashish-0.0.4"
@@ -76944,6 +77138,7 @@ in
       sources."inherits-2.0.4"
       sources."invert-kv-1.0.0"
       sources."is-arrayish-0.2.1"
+      sources."is-core-module-2.0.0"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
@@ -77058,7 +77253,7 @@ in
       sources."request-2.88.2"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-url-0.2.1"
       sources."restore-cursor-3.1.0"
       sources."resumer-0.0.0"
@@ -77344,7 +77539,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.773.0" // {
+      (sources."aws-sdk-2.774.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -79372,7 +79567,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.0"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/normalize-package-data-2.4.0"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
@@ -79778,6 +79973,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-ci-2.0.0"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -80035,7 +80231,7 @@ in
       sources."request-2.88.2"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       (sources."resolve-cwd-2.0.0" // {
         dependencies = [
           sources."resolve-from-3.0.0"
@@ -81287,7 +81483,7 @@ in
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-0.0.8"
       sources."@types/yargs-15.0.9"
@@ -81759,6 +81955,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-ci-2.0.0"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-deflate-1.0.0"
@@ -81897,7 +82094,7 @@ in
         ];
       })
       sources."node-modules-regexp-1.0.0"
-      sources."node-releases-1.1.63"
+      sources."node-releases-1.1.64"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-2.0.2"
@@ -82012,7 +82209,7 @@ in
       sources."request-2.88.2"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       (sources."resolve-cwd-2.0.0" // {
         dependencies = [
           sources."resolve-from-3.0.0"
@@ -82555,6 +82752,7 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."generate-function-2.3.1"
       sources."generate-object-property-1.2.0"
       sources."getpass-0.1.7"
@@ -82575,6 +82773,7 @@ in
           sources."ajv-6.12.6"
         ];
       })
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-gulplog-0.1.0"
       sources."http-signature-1.2.0"
@@ -82584,6 +82783,7 @@ in
       sources."inherits-2.0.4"
       sources."inquirer-0.12.0"
       sources."interpret-1.4.0"
+      sources."is-core-module-2.0.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-my-ip-valid-1.0.0"
       sources."is-my-json-valid-2.20.5"
@@ -82660,7 +82860,7 @@ in
       sources."replace-ext-0.0.1"
       sources."request-2.88.0"
       sources."require-uncached-1.0.3"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-from-1.0.1"
       sources."restore-cursor-1.0.1"
       sources."rimraf-2.6.3"
@@ -82792,7 +82992,7 @@ in
       sha512 = "X9I7gwvqKVdqVvqi9AVfUWXnHQQYjssWJ2asKfhBDAkQn0vPagKkx6EjzKcRgyIroWGXN6ZpwkQ/gMvTPFlx7g==";
     };
     dependencies = [
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/yauzl-2.9.1"
       sources."agent-base-5.1.1"
       sources."ansi-styles-4.3.0"
@@ -83717,7 +83917,7 @@ in
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/node-fetch-2.5.7"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-1.17.1"
@@ -83786,7 +83986,7 @@ in
       sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
-      (sources."aws-sdk-2.773.0" // {
+      (sources."aws-sdk-2.774.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."uuid-3.3.2"
@@ -84418,6 +84618,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-ci-2.0.0"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -84662,7 +84863,7 @@ in
       sources."netlify-redirector-0.2.0"
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.1"
-      sources."node-releases-1.1.63"
+      sources."node-releases-1.1.64"
       sources."node-source-walk-4.2.0"
       sources."noop2-2.0.0"
       (sources."normalize-package-data-2.5.0" // {
@@ -84863,7 +85064,7 @@ in
       sources."require-main-filename-2.0.0"
       sources."require-package-name-2.0.1"
       sources."requires-port-1.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
       (sources."restore-cursor-2.0.0" // {
@@ -85067,7 +85268,7 @@ in
         ];
       })
       sources."term-size-2.2.0"
-      (sources."terser-5.3.6" // {
+      (sources."terser-5.3.7" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -85465,6 +85666,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.12"
       sources."fstream-ignore-1.0.5"
+      sources."function-bind-1.1.1"
       sources."gauge-2.7.4"
       sources."get-stdin-4.0.1"
       (sources."getpass-0.1.7" // {
@@ -85476,6 +85678,7 @@ in
       sources."graceful-fs-4.2.4"
       sources."har-schema-1.0.5"
       sources."har-validator-4.2.1"
+      sources."has-1.0.3"
       sources."has-unicode-2.0.1"
       sources."hawk-3.1.3"
       sources."headless-0.1.7"
@@ -85491,6 +85694,7 @@ in
       sources."invert-kv-1.0.0"
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.2.1"
+      sources."is-core-module-2.0.0"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
@@ -85575,7 +85779,7 @@ in
           sources."qs-6.4.0"
         ];
       })
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."rimraf-2.2.8"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -85764,16 +85968,16 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "1.2.1";
+    version = "1.2.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-1.2.1.tgz";
-      sha512 = "ZgxnaEMp2bJbsludpt3elaw/5yMznqjYklZE7eBwGErbNUVT3SmiSd0wNBO5j1QPiaqtGdSzqT2e45qzDzyiOg==";
+      url = "https://registry.npmjs.org/node-red/-/node-red-1.2.2.tgz";
+      sha512 = "/cGajoUjpCgP1Plqjtvupm8gE+19Vzm/z31M25f50XIuLpy3wieTki+e2oIPPyuzTD7Gz04JMySbcB8tx0voNA==";
     };
     dependencies = [
       sources."@babel/runtime-7.12.1"
-      sources."@node-red/editor-api-1.2.1"
-      sources."@node-red/editor-client-1.2.1"
-      (sources."@node-red/nodes-1.2.1" // {
+      sources."@node-red/editor-api-1.2.2"
+      sources."@node-red/editor-client-1.2.2"
+      (sources."@node-red/nodes-1.2.2" // {
         dependencies = [
           sources."cookie-0.4.1"
           sources."http-errors-1.7.3"
@@ -85787,9 +85991,9 @@ in
           })
         ];
       })
-      sources."@node-red/registry-1.2.1"
-      sources."@node-red/runtime-1.2.1"
-      sources."@node-red/util-1.2.1"
+      sources."@node-red/registry-1.2.2"
+      sources."@node-red/runtime-1.2.2"
+      sources."@node-red/util-1.2.2"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       (sources."agent-base-6.0.1" // {
@@ -86328,18 +86532,21 @@ in
         ];
       })
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."gauge-2.7.4"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."graceful-fs-4.2.4"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
+      sources."has-1.0.3"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.8.8"
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
+      sources."is-core-module-2.0.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
@@ -86404,7 +86611,7 @@ in
         ];
       })
       sources."request-2.88.2"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."retry-0.10.1"
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.2.1"
@@ -86462,10 +86669,10 @@ in
   nodemon = nodeEnv.buildNodePackage {
     name = "nodemon";
     packageName = "nodemon";
-    version = "2.0.5";
+    version = "2.0.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.5.tgz";
-      sha512 = "6/jqtZvJdk092pVnD2AIH19KQ9GQZAKOZVy/yT1ueL6aoV+Ix7a1lVZStXzvEh0fP4zE41DDWlkVoHjR6WlozA==";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.6.tgz";
+      sha512 = "4I3YDSKXg6ltYpcnZeHompqac4E6JeAMpGm8tJnB9Y3T0ehasLa4139dJOcCrB93HHrUMsCrKtoAlXTqT5n4AQ==";
     };
     dependencies = [
       sources."@sindresorhus/is-0.14.0"
@@ -87208,7 +87415,7 @@ in
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
       sources."@babel/helper-builder-react-jsx-7.10.4"
-      sources."@babel/helper-builder-react-jsx-experimental-7.12.1"
+      sources."@babel/helper-builder-react-jsx-experimental-7.12.4"
       sources."@babel/helper-compilation-targets-7.12.1"
       sources."@babel/helper-create-class-features-plugin-7.12.1"
       sources."@babel/helper-create-regexp-features-plugin-7.12.1"
@@ -87683,6 +87890,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-color-stop-1.1.0"
+      sources."is-core-module-2.0.0"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -87801,7 +88009,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.63"
+      sources."node-releases-1.1.64"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
       sources."nth-check-1.0.2"
@@ -87971,7 +88179,7 @@ in
       sources."request-2.88.2"
       sources."request-promise-core-1.1.4"
       sources."request-promise-native-1.0.9"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-from-3.0.0"
       sources."resolve-url-0.2.1"
       sources."restore-cursor-2.0.0"
@@ -88872,6 +89080,7 @@ in
       sources."is-arguments-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-callable-1.2.2"
+      sources."is-core-module-2.0.0"
       sources."is-date-object-1.0.2"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
@@ -88973,7 +89182,7 @@ in
         ];
       })
       sources."repeating-2.0.1"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."restore-cursor-2.0.0"
       sources."reverse-http-1.3.0"
       sources."rimraf-2.7.1"
@@ -89587,6 +89796,7 @@ in
           sources."readable-stream-1.1.14"
         ];
       })
+      sources."function-bind-1.1.1"
       (sources."get-uri-2.0.4" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -89595,6 +89805,7 @@ in
       })
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
+      sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."http-errors-1.7.3"
       (sources."http-proxy-agent-2.1.0" // {
@@ -89613,6 +89824,7 @@ in
       sources."inherits-2.0.4"
       sources."ip-1.1.5"
       sources."is-binary-path-2.1.0"
+      sources."is-core-module-2.0.0"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
@@ -89677,7 +89889,7 @@ in
       })
       sources."readdirp-3.5.0"
       sources."require-in-the-middle-5.0.3"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."run-series-1.1.8"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -90057,6 +90269,7 @@ in
         ];
       })
       sources."is-buffer-1.1.6"
+      sources."is-core-module-2.0.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."json-stable-stringify-0.0.1"
@@ -90127,7 +90340,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
       sources."safe-buffer-5.2.1"
@@ -90261,10 +90474,10 @@ in
   pyright = nodeEnv.buildNodePackage {
     name = "pyright";
     packageName = "pyright";
-    version = "1.1.79";
+    version = "1.1.80";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.79.tgz";
-      sha512 = "WriY7VGjg9CzhxMUfDf8bIBRfXWeVj/kgiAAJ783wiQuUwy5IwMlZgR4ZyAGYBztMH+uRdiG4HCgt30ELYeeNg==";
+      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.80.tgz";
+      sha512 = "B0Ygy3F6EjpEAWPb+nrjTVVoLnpm4ZZqNsEAPOWpse41+Dh4dj+YklKXaej7hpMt02JM2IxzcbwrVg6xoGAD6g==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -91176,12 +91389,14 @@ in
       sources."form-data-3.0.0"
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.1.3"
+      sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       sources."get-caller-file-2.0.5"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."globals-12.4.0"
       sources."growl-1.10.5"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."he-1.2.0"
       sources."htmlparser2-3.10.1"
@@ -91202,6 +91417,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-binary-path-2.1.0"
+      sources."is-core-module-2.0.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
@@ -91282,7 +91498,7 @@ in
       sources."regexpp-3.1.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-from-4.0.0"
       sources."rimraf-2.6.3"
       sources."rollup-2.32.0"
@@ -91745,7 +91961,7 @@ in
       sources."@serverless/enterprise-plugin-4.1.1"
       sources."@serverless/event-mocks-1.1.1"
       sources."@serverless/platform-client-3.1.2"
-      sources."@serverless/platform-client-china-2.0.4"
+      sources."@serverless/platform-client-china-2.0.5"
       (sources."@serverless/platform-sdk-2.3.2" // {
         dependencies = [
           sources."chalk-2.4.2"
@@ -91774,7 +91990,7 @@ in
       sources."@types/keyv-3.1.1"
       sources."@types/lodash-4.14.162"
       sources."@types/long-4.0.1"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/request-2.48.5"
       sources."@types/request-promise-native-1.0.17"
       sources."@types/responselike-1.0.0"
@@ -91831,7 +92047,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.773.0" // {
+      (sources."aws-sdk-2.774.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."uuid-3.3.2"
@@ -92326,7 +92542,7 @@ in
       sources."promise-queue-2.2.5"
       (sources."protobufjs-6.10.1" // {
         dependencies = [
-          sources."@types/node-13.13.26"
+          sources."@types/node-13.13.27"
           sources."long-4.0.0"
         ];
       })
@@ -93161,10 +93377,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.415.0";
+    version = "1.419.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.415.0.tgz";
-      sha512 = "zpqUIizBSYTaZA1DvPf2xIOQSmutVDNxOkSM4CQkqk9xHf2W6ltq8NcxErVXUGYmsUmGfrNe0LIBaKP9lzyMbQ==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.419.0.tgz";
+      sha512 = "IglViQz+KprJcHoY/ot42gBgX27OPlvm2enBbg/MaH7pgh4glA+h2Wyxc9y6Sxbh+NE3TgbSswimOIg+lEGhWg==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -93194,7 +93410,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/js-yaml-3.12.5"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/responselike-1.0.0"
       sources."@types/semver-5.5.0"
       sources."@yarnpkg/lockfile-1.1.0"
@@ -93894,10 +94110,12 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."execa-0.7.0"
       sources."find-up-2.1.0"
+      sources."function-bind-1.1.1"
       sources."get-stream-3.0.0"
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
       sources."graceful-fs-4.2.4"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."hosted-git-info-2.8.8"
       sources."http-proxy-agent-2.1.0"
@@ -93908,6 +94126,7 @@ in
       sources."ini-1.3.5"
       sources."is-arrayish-0.2.1"
       sources."is-ci-1.2.1"
+      sources."is-core-module-2.0.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
@@ -93964,7 +94183,7 @@ in
       sources."redent-2.0.0"
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."restore-cursor-2.0.0"
       sources."round-to-3.0.0"
       sources."safe-buffer-5.2.1"
@@ -94947,7 +95166,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.773.0" // {
+      (sources."aws-sdk-2.774.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -95142,6 +95361,7 @@ in
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."generate-function-2.3.1"
       sources."generate-object-property-1.2.0"
       sources."get-caller-file-1.0.3"
@@ -95161,6 +95381,7 @@ in
       sources."graphlib-2.1.8"
       sources."har-schema-2.0.0"
       sources."har-validator-2.0.6"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       (sources."has-binary2-1.0.3" // {
         dependencies = [
@@ -95200,6 +95421,7 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
+      sources."is-core-module-2.0.0"
       (sources."is-expression-3.0.0" // {
         dependencies = [
           sources."acorn-4.0.13"
@@ -95440,7 +95662,7 @@ in
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."requires-port-1.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."ret-0.2.2"
       sources."rethinkdb-2.4.2"
       sources."retry-0.9.0"
@@ -96689,6 +96911,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
+      sources."is-core-module-2.0.0"
       sources."is-date-object-1.0.2"
       sources."is-decimal-1.0.4"
       sources."is-file-1.0.0"
@@ -96766,7 +96989,7 @@ in
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
       sources."require-from-string-2.0.2"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.1.2"
       sources."semver-5.7.1"
@@ -97020,6 +97243,7 @@ in
       sources."format-0.2.2"
       sources."from-0.1.7"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       (sources."get-stream-4.1.0" // {
         dependencies = [
           sources."pump-3.0.0"
@@ -97032,6 +97256,7 @@ in
       sources."got-9.6.0"
       sources."graceful-fs-4.2.4"
       sources."hard-rejection-2.1.0"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."has-yarn-2.1.0"
       sources."hast-util-embedded-1.0.5"
@@ -97060,6 +97285,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-2.0.4"
       sources."is-ci-2.0.0"
+      sources."is-core-module-2.0.0"
       sources."is-decimal-1.0.4"
       sources."is-empty-1.2.0"
       sources."is-fullwidth-code-point-2.0.0"
@@ -97184,7 +97410,7 @@ in
       sources."remark-stringify-8.1.1"
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-from-5.0.0"
       sources."responselike-1.0.2"
       sources."retext-english-3.0.4"
@@ -97733,7 +97959,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
@@ -98701,7 +98927,7 @@ in
       sources."@primer/octicons-11.0.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."after-0.8.2"
@@ -99066,15 +99292,18 @@ in
       sources."escalade-3.1.1"
       sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."gauge-2.7.4"
       sources."get-caller-file-2.0.5"
       sources."glob-7.1.6"
+      sources."has-1.0.3"
       sources."has-unicode-2.0.1"
       sources."iconv-lite-0.4.24"
       sources."ignore-walk-3.0.3"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
+      sources."is-core-module-2.0.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."isarray-1.0.0"
       sources."mimic-response-2.1.0"
@@ -99105,7 +99334,7 @@ in
       sources."rc-1.2.8"
       sources."readable-stream-2.3.7"
       sources."require-directory-2.1.1"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."rimraf-2.7.1"
       sources."rw-1.3.3"
       sources."safe-buffer-5.1.2"
@@ -100499,7 +100728,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -100850,6 +101079,7 @@ in
       sources."is-binary-path-2.1.0"
       sources."is-buffer-2.0.4"
       sources."is-ci-2.0.0"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-decimal-1.0.4"
       sources."is-descriptor-1.0.2"
@@ -101118,7 +101348,7 @@ in
           sources."resolve-from-1.0.1"
         ];
       })
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-from-5.0.0"
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
@@ -101428,10 +101658,10 @@ in
   web-ext = nodeEnv.buildNodePackage {
     name = "web-ext";
     packageName = "web-ext";
-    version = "5.2.0";
+    version = "5.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/web-ext/-/web-ext-5.2.0.tgz";
-      sha512 = "o/s206JW2U/vXHTe/XeBnsUQhIcuphsSVNVrJU+MoMFq8JlU9vI1VdS2RCW+u5NuqAsMvTyV+pA+4hLGB9CGCw==";
+      url = "https://registry.npmjs.org/web-ext/-/web-ext-5.3.0.tgz";
+      sha512 = "LlOmVSddfBVHd9Liv3SL1Cvftr+YS6GNiKVIugDotUm3jVT9otHsw1SrCi11MGaGBw4g0s8ndjcbuttr1ZQjwg==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -101462,13 +101692,13 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."JSONSelect-0.2.1"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
-      sources."addons-linter-2.7.0"
+      sources."addons-linter-2.9.0"
       sources."adm-zip-0.4.16"
-      sources."ajv-6.12.5"
+      sources."ajv-6.12.6"
       sources."ajv-merge-patch-4.1.0"
       sources."ansi-align-3.0.0"
       sources."ansi-colors-4.1.1"
@@ -101515,6 +101745,7 @@ in
       (sources."base-0.11.2" // {
         dependencies = [
           sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
         ];
       })
       sources."base64-js-1.3.1"
@@ -101542,7 +101773,11 @@ in
       sources."buffer-equal-constant-time-1.0.1"
       sources."buffer-from-1.1.1"
       sources."bunyan-1.8.14"
-      sources."cache-base-1.0.1"
+      (sources."cache-base-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
           sources."lowercase-keys-2.0.0"
@@ -101575,6 +101810,7 @@ in
             ];
           })
           sources."is-descriptor-0.1.6"
+          sources."isobject-3.0.1"
           sources."kind-of-5.1.0"
         ];
       })
@@ -101593,6 +101829,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
+      sources."colorette-1.2.1"
       sources."colors-0.5.1"
       sources."columnify-1.5.4"
       sources."combined-stream-1.0.8"
@@ -101632,11 +101869,16 @@ in
       sources."defaults-1.0.3"
       sources."defer-to-connect-1.1.3"
       sources."define-properties-1.1.3"
-      sources."define-property-2.0.2"
+      (sources."define-property-2.0.2" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."delayed-stream-1.0.0"
       (sources."dispensary-0.57.0" // {
         dependencies = [
           sources."async-3.2.0"
+          sources."pino-6.6.1"
         ];
       })
       sources."doctrine-3.0.0"
@@ -101661,16 +101903,15 @@ in
       sources."es6-promisify-6.1.1"
       sources."escape-goat-2.1.1"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-7.9.0" // {
+      (sources."eslint-7.11.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."debug-4.3.0"
-          sources."eslint-visitor-keys-1.3.0"
           sources."ms-2.1.2"
           sources."strip-ansi-6.0.0"
         ];
       })
-      sources."eslint-plugin-no-unsanitized-3.1.2"
+      sources."eslint-plugin-no-unsanitized-3.1.4"
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
         dependencies = [
@@ -101798,7 +102039,11 @@ in
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.1"
-      sources."has-value-1.0.0"
+      (sources."has-value-1.0.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       (sources."has-values-1.0.0" // {
         dependencies = [
           (sources."is-number-3.0.0" // {
@@ -101846,7 +102091,11 @@ in
       sources."is-number-7.0.0"
       sources."is-obj-2.0.0"
       sources."is-path-inside-3.0.2"
-      sources."is-plain-object-2.0.4"
+      (sources."is-plain-object-2.0.4" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."is-regex-1.1.1"
       sources."is-relative-0.1.3"
       sources."is-stream-2.0.0"
@@ -101858,7 +102107,7 @@ in
       sources."is-yarn-global-0.3.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."isobject-3.0.1"
+      sources."isobject-2.1.0"
       sources."isstream-0.1.2"
       sources."jed-1.1.1"
       sources."jetpack-id-1.0.0"
@@ -101898,6 +102147,7 @@ in
       sources."lcid-3.1.1"
       sources."levn-0.4.1"
       sources."lighthouse-logger-1.2.0"
+      sources."line-column-1.0.2"
       sources."lines-and-columns-1.1.6"
       sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
@@ -101923,7 +102173,7 @@ in
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."marky-1.2.1"
-      sources."mdn-browser-compat-data-1.0.39"
+      sources."mdn-browser-compat-data-1.0.40"
       sources."mem-5.1.1"
       sources."merge-stream-2.0.0"
       (sources."micromatch-3.1.10" // {
@@ -101943,6 +102193,7 @@ in
               sources."kind-of-3.2.2"
             ];
           })
+          sources."isobject-3.0.1"
           sources."to-regex-range-2.1.1"
         ];
       })
@@ -101970,6 +102221,7 @@ in
       })
       sources."mz-2.7.0"
       sources."nan-2.14.2"
+      sources."nanoid-3.1.12"
       sources."nanomatch-1.2.13"
       sources."natural-compare-1.4.0"
       sources."natural-compare-lite-1.4.0"
@@ -102004,9 +102256,17 @@ in
       sources."object-inspect-1.8.0"
       sources."object-is-1.1.3"
       sources."object-keys-1.1.1"
-      sources."object-visit-1.0.1"
+      (sources."object-visit-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."object.assign-4.1.1"
-      sources."object.pick-1.3.0"
+      (sources."object.pick-1.3.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."once-1.4.0"
       sources."onetime-5.1.2"
       sources."open-7.3.0"
@@ -102036,23 +102296,14 @@ in
       sources."pend-1.2.0"
       sources."performance-now-2.1.0"
       sources."picomatch-2.2.2"
-      sources."pino-6.6.1"
-      sources."pino-std-serializers-2.5.0"
-      sources."posix-character-classes-0.1.1"
-      (sources."postcss-7.0.35" // {
+      (sources."pino-6.7.0" // {
         dependencies = [
-          sources."ansi-styles-3.2.1"
-          (sources."chalk-2.4.2" // {
-            dependencies = [
-              sources."supports-color-5.5.0"
-            ];
-          })
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."supports-color-6.1.0"
+          sources."fast-redact-3.0.0"
         ];
       })
+      sources."pino-std-serializers-2.5.0"
+      sources."posix-character-classes-0.1.1"
+      sources."postcss-8.1.1"
       sources."prelude-ls-1.2.1"
       sources."prepend-http-2.0.0"
       sources."probe-image-size-5.0.0"
@@ -102160,6 +102411,7 @@ in
       (sources."snapdragon-node-2.1.1" // {
         dependencies = [
           sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
         ];
       })
       (sources."snapdragon-util-3.0.1" // {
@@ -102267,9 +102519,10 @@ in
             ];
           })
           sources."has-values-0.1.4"
+          sources."isobject-3.0.1"
         ];
       })
-      sources."upath-1.2.0"
+      sources."upath-2.0.0"
       sources."update-notifier-5.0.0"
       sources."uri-js-4.4.0"
       sources."urix-0.1.0"
@@ -102293,6 +102546,7 @@ in
           sources."is-binary-path-1.0.1"
           sources."is-glob-3.1.0"
           sources."is-number-3.0.0"
+          sources."isobject-3.0.1"
           sources."kind-of-3.2.2"
           sources."normalize-path-2.1.1"
           sources."readable-stream-2.3.7"
@@ -102300,11 +102554,12 @@ in
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
           sources."to-regex-range-2.1.1"
+          sources."upath-1.2.0"
         ];
       })
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-6.1.0"
-      sources."whatwg-url-8.2.2"
+      sources."whatwg-url-8.4.0"
       sources."when-3.7.7"
       sources."which-2.0.2"
       sources."which-module-2.0.0"
@@ -102387,7 +102642,7 @@ in
       sources."@types/eslint-scope-3.7.0"
       sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
       sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -102417,7 +102672,7 @@ in
       sources."chrome-trace-event-1.0.2"
       sources."commander-2.20.3"
       sources."electron-to-chromium-1.3.582"
-      sources."enhanced-resolve-5.2.0"
+      sources."enhanced-resolve-5.3.0"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"
       (sources."esrecurse-4.3.0" // {
@@ -102442,7 +102697,7 @@ in
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
       sources."neo-async-2.6.2"
-      sources."node-releases-1.1.63"
+      sources."node-releases-1.1.64"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
@@ -102458,7 +102713,7 @@ in
       sources."source-map-support-0.5.19"
       sources."supports-color-7.2.0"
       sources."tapable-2.0.0"
-      (sources."terser-5.3.6" // {
+      (sources."terser-5.3.7" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -102512,11 +102767,14 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."execa-4.0.3"
       sources."find-up-4.1.0"
+      sources."function-bind-1.1.1"
       sources."get-stream-5.2.0"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."human-signals-1.1.1"
       sources."import-local-3.0.2"
       sources."interpret-2.2.0"
+      sources."is-core-module-2.0.0"
       sources."is-stream-2.0.0"
       sources."isexe-2.0.0"
       sources."locate-path-5.0.0"
@@ -102536,7 +102794,7 @@ in
       sources."pump-3.0.0"
       sources."rechoir-0.7.0"
       sources."reduce-flatten-2.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-cwd-3.0.0"
       sources."resolve-from-5.0.0"
       sources."shebang-command-2.0.0"
@@ -102574,7 +102832,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
       sources."ajv-errors-1.0.1"
@@ -103297,7 +103555,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.26"
+      sources."@types/node-13.13.27"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
       sources."balanced-match-1.0.0"
@@ -103714,7 +103972,7 @@ in
       sources."@sindresorhus/is-0.7.0"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.0"
       sources."@types/normalize-package-data-2.4.0"
       sources."JSONStream-1.3.5"
       sources."aggregate-error-3.1.0"
@@ -103944,6 +104202,7 @@ in
       sources."from2-2.3.0"
       sources."fs.realpath-1.0.0"
       sources."fullname-4.0.1"
+      sources."function-bind-1.1.1"
       sources."gauge-1.2.7"
       sources."get-stdin-4.0.1"
       sources."get-stream-4.1.0"
@@ -103984,6 +104243,7 @@ in
       sources."grouped-queue-1.1.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
+      sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -104025,6 +104285,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-ci-1.2.1"
+      sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-docker-1.1.0"
@@ -104303,7 +104564,7 @@ in
           sources."tough-cookie-2.5.0"
         ];
       })
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"

From 1ed7d0e6298f4466151f9b08df2d37ee77c44310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 20 Oct 2020 17:01:09 +0200
Subject: [PATCH 0156/3942] gitAndTools.lab: wrap xdg-open to fix `lab mr
 browse`

---
 .../version-management/git-and-tools/lab/default.nix       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix
index 2413019ebc7b..3459f5099c97 100644
--- a/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils }:
 
 buildGoModule rec {
   pname = "lab";
@@ -17,6 +17,8 @@ buildGoModule rec {
 
   doCheck = false;
 
+  buildInputs = [ makeWrapper ];
+
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
   postInstall = ''
@@ -24,9 +26,10 @@ buildGoModule rec {
     export LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c
     $out/bin/lab completion bash > $out/share/bash-completion/completions/lab
     $out/bin/lab completion zsh > $out/share/zsh/site-functions/_lab
+    wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ xdg_utils ]}";
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
     homepage = "https://zaquestion.github.io/lab";
     license = licenses.cc0;

From 3e28aad1624b491d4a48509729ad69c9cbaaf344 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Fri, 4 Sep 2020 16:49:12 -0400
Subject: [PATCH 0157/3942] pythonPackages.pdoc3: init at 0.9.1

Seems broken on 3.6, hence the disabled = pythonOlder "3.7".
---
 .../python-modules/pdoc3/default.nix          | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/pdoc3/default.nix

diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix
new file mode 100644
index 000000000000..e1f68109c055
--- /dev/null
+++ b/pkgs/development/python-modules/pdoc3/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi
+, pythonOlder
+, Mako
+, markdown
+, setuptools-git
+, setuptools_scm
+}:
+
+buildPythonPackage rec {
+  pname = "pdoc3";
+  version = "0.9.1";
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15482rvpg5r70gippj3nbl58x9plgmgvp0rg4xi4dpdqhma8v171";
+  };
+
+  nativeBuildInputs = [ setuptools-git setuptools_scm ];
+  propagatedBuildInputs = [ Mako markdown ];
+
+  meta = with lib; {
+    description = "Auto-generate API documentation for Python projects.";
+    homepage = "https://pdoc3.github.io/pdoc/";
+    license = with licenses; [ agpl3Plus ];
+    maintainers = with maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6d2d7bed26f1..2543eced3bec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4392,6 +4392,8 @@ in {
 
   pdfx = callPackage ../development/python-modules/pdfx { };
 
+  pdoc3 = callPackage ../development/python-modules/pdoc3 { };
+
   pecan = callPackage ../development/python-modules/pecan { };
 
   peewee = callPackage ../development/python-modules/peewee { };

From 173bf39cc28caffc034bba1800bcdb709ce90a98 Mon Sep 17 00:00:00 2001
From: Imran Hossain <contact@imranhossa.in>
Date: Tue, 6 Oct 2020 15:41:30 -0400
Subject: [PATCH 0158/3942] todoist-electron: 1.23.0 -> 1.24.0

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

diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix
index e1d578edb0f5..6c361e7dca49 100644
--- a/pkgs/applications/misc/todoist-electron/default.nix
+++ b/pkgs/applications/misc/todoist-electron/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "todoist-electron";
-  version = "1.23.0";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}_amd64.deb";
-    sha256 = "1yxa0fdc3fnffny6jf1hm7545792pw7828mc27il17l4kn346g98";
+    sha256 = "0g35518z6nf6pnfyx4ax75rq8b8br72mi6wv6jzgac9ric1q4h2s";
   };
 
   desktopItem = makeDesktopItem {

From 59455622b6543c66eed12f372d7cba43c1d79ca6 Mon Sep 17 00:00:00 2001
From: Imran Hossain <contact@imranhossa.in>
Date: Tue, 6 Oct 2020 17:06:27 -0400
Subject: [PATCH 0159/3942] todoist-electron: Switch to MIT license

---
 pkgs/applications/misc/todoist-electron/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix
index 6c361e7dca49..463aeac9349a 100644
--- a/pkgs/applications/misc/todoist-electron/default.nix
+++ b/pkgs/applications/misc/todoist-electron/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/KryDos/todoist-linux";
     description = "The Linux wrapper for Todoist web version";
     platforms = [ "x86_64-linux" ];
-    license = licenses.isc;
+    license = licenses.mit;
     maintainers = with maintainers; [ i077 ];
   };
 }

From 8cfeba2bbca84010ef9fa20800efe25d7024a708 Mon Sep 17 00:00:00 2001
From: Imran Hossain <contact@imranhossa.in>
Date: Tue, 20 Oct 2020 17:22:41 -0400
Subject: [PATCH 0160/3942] todoist-electron: Use desktop icon

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

diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix
index 463aeac9349a..9e70bf881625 100644
--- a/pkgs/applications/misc/todoist-electron/default.nix
+++ b/pkgs/applications/misc/todoist-electron/default.nix
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
 
   desktopItem = makeDesktopItem {
     name = "Todoist";
-    exec = "todoist";
+    exec = "todoist %U";
+    icon = "todoist";
+    comment = "Todoist for Linux";
     desktopName = "Todoist";
     categories = "Utility";
   };
@@ -35,6 +37,7 @@ stdenv.mkDerivation rec {
   in ''
     mkdir -p "$out/bin"
     mv opt "$out/"
+    mv usr/share "$out/share"
 
     # Patch binary
     patchelf \
@@ -48,7 +51,8 @@ stdenv.mkDerivation rec {
 
     # Desktop item
     mkdir -p "$out/share"
-    ln -s "${desktopItem}/share/applications" "$out/share/applications"
+    rm -r "$out/share/applications"
+    cp -r "${desktopItem}/share/applications" "$out/share/applications"
   '';
 
   meta = with lib; {

From 0931ebd00a6be40ddc2c6e93695ab06d76b628eb Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Thu, 15 Oct 2020 16:51:55 -0700
Subject: [PATCH 0161/3942] rufo: init at 0.12.0

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/development/tools/rufo/Gemfile      |  3 +++
 pkgs/development/tools/rufo/Gemfile.lock | 13 +++++++++++++
 pkgs/development/tools/rufo/default.nix  | 16 ++++++++++++++++
 pkgs/development/tools/rufo/gemset.nix   | 12 ++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 5 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/tools/rufo/Gemfile
 create mode 100644 pkgs/development/tools/rufo/Gemfile.lock
 create mode 100644 pkgs/development/tools/rufo/default.nix
 create mode 100644 pkgs/development/tools/rufo/gemset.nix

diff --git a/pkgs/development/tools/rufo/Gemfile b/pkgs/development/tools/rufo/Gemfile
new file mode 100644
index 000000000000..5db4a68b13ca
--- /dev/null
+++ b/pkgs/development/tools/rufo/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'rufo'
diff --git a/pkgs/development/tools/rufo/Gemfile.lock b/pkgs/development/tools/rufo/Gemfile.lock
new file mode 100644
index 000000000000..f63ff520e687
--- /dev/null
+++ b/pkgs/development/tools/rufo/Gemfile.lock
@@ -0,0 +1,13 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rufo (0.12.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rufo
+
+BUNDLED WITH
+   2.1.4
diff --git a/pkgs/development/tools/rufo/default.nix b/pkgs/development/tools/rufo/default.nix
new file mode 100644
index 000000000000..d64173700e77
--- /dev/null
+++ b/pkgs/development/tools/rufo/default.nix
@@ -0,0 +1,16 @@
+{ bundlerApp, bundlerUpdateScript, lib }:
+
+bundlerApp {
+  pname = "rufo";
+  gemdir = ./.;
+  exes = [ "rufo" ];
+
+  passthru.updateScript = bundlerUpdateScript "rufo";
+
+  meta = with lib; {
+    description = "Ruby formatter";
+    homepage = "https://github.com/ruby-formatter/rufo";
+    license = licenses.mit;
+    maintainers = with maintainers; [ andersk ];
+  };
+}
diff --git a/pkgs/development/tools/rufo/gemset.nix b/pkgs/development/tools/rufo/gemset.nix
new file mode 100644
index 000000000000..cd5c2c462a98
--- /dev/null
+++ b/pkgs/development/tools/rufo/gemset.nix
@@ -0,0 +1,12 @@
+{
+  rufo = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nwasskcm0nrf7f52019x4fvxa5zckj4fcvf4cdl0qflrcwb1l9f";
+      type = "gem";
+    };
+    version = "0.12.0";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9534a53d612b..884efc6bede8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11568,6 +11568,8 @@ in
   rr = callPackage ../development/tools/analysis/rr { };
   rr-unstable = callPackage ../development/tools/analysis/rr/unstable.nix { }; # This is a temporary attribute, please see the corresponding file for details.
 
+  rufo = callPackage ../development/tools/rufo { };
+
   samurai = callPackage ../development/tools/build-managers/samurai { };
 
   saleae-logic = callPackage ../development/tools/misc/saleae-logic { };

From 1168e13bb0f38c06f09b1431b741179d067cc659 Mon Sep 17 00:00:00 2001
From: Justin Lovinger <git@justinlovinger.com>
Date: Tue, 20 Oct 2020 21:21:37 -0400
Subject: [PATCH 0162/3942] nixos/nfs: add idmapd.settings option

Co-authored-by: Aaron Andersen <aaron@fosslib.net>
---
 nixos/modules/tasks/filesystems/nfs.nix | 48 ++++++++++++++++++-------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index ddcc0ed8f5a4..fd35c35d32ad 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -10,20 +10,9 @@ let
 
   rpcMountpoint = "${nfsStateDir}/rpc_pipefs";
 
-  idmapdConfFile = pkgs.writeText "idmapd.conf" ''
-    [General]
-    Pipefs-Directory = ${rpcMountpoint}
-    ${optionalString (config.networking.domain != null)
-      "Domain = ${config.networking.domain}"}
-
-    [Mapping]
-    Nobody-User = nobody
-    Nobody-Group = nogroup
-
-    [Translation]
-    Method = nsswitch
-  '';
+  format = pkgs.formats.ini {};
 
+  idmapdConfFile = format.generate "idmapd.conf" cfg.idmapd.settings;
   nfsConfFile = pkgs.writeText "nfs.conf" cfg.extraConfig;
   requestKeyConfFile = pkgs.writeText "request-key.conf" ''
     create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d
@@ -38,6 +27,25 @@ in
 
   options = {
     services.nfs = {
+      idmapd.settings = mkOption {
+        type = format.type;
+        default = {};
+        description = ''
+          libnfsidmap configuration. Refer to
+          <link xlink:href="https://linux.die.net/man/5/idmapd.conf"/>
+          for details.
+        '';
+        example = literalExample ''
+          {
+            Translation = {
+              GSS-Methods = "static,nsswitch";
+            };
+            Static = {
+              "root/hostname.domain.com@REALM.COM" = "root";
+            };
+          }
+        '';
+      };
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -54,6 +62,20 @@ in
 
     services.rpcbind.enable = true;
 
+    services.nfs.idmapd.settings = {
+      General = mkMerge [
+        { Pipefs-Directory = rpcMountpoint; }
+        (mkIf (config.networking.domain != null) { Domain = config.networking.domain; })
+      ];
+      Mapping = {
+        Nobody-User = "nobody";
+        Nobody-Group = "nogroup";
+      };
+      Translation = {
+        Method = "nsswitch";
+      };
+    };
+
     system.fsPackages = [ pkgs.nfs-utils ];
 
     boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];

From 5837209891ba6e4218196e2cd4b6fafa50219e39 Mon Sep 17 00:00:00 2001
From: Narice <narice@tutanota.com>
Date: Wed, 21 Oct 2020 13:13:59 +0200
Subject: [PATCH 0163/3942] improved out-of-date template

---
 .../out_of_date_package_report.md             | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md
index 0dcdf52513df..edb21d2b8e59 100644
--- a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md
+++ b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md
@@ -7,8 +7,42 @@ assignees: ''
 
 ---
 
-**Project name**
-_give the name of the project_
 
-**Notify maintainers**
+###### Checklist
 
+<!-- Note that these are hard requirements -->
+
+<!--
+You can use the "Go to file" functionality on github to find the package
+Then you can go to the history for this package
+Find the latest "package_name: old_version -> new_version" commit
+The "new_version" is the the current version of the package
+-->
+- [ ] Checked the [nixpkgs master branch](https://github.com/NixOS/nixpkgs)
+<!--
+Type the name of your package and try to find an open pull request for the package
+If you find an open pull request, you can review it!
+You will probably have the new version of the package while helping the community!
+-->
+- [ ] Checked the [nixpkgs pull requests](https://github.com/NixOS/nixpkgs/pulls)
+
+###### Project name
+`nix search` name: 
+<!--
+The current version can be found easily with the same process than above for checking the master branch
+If an open PR is present for the package, take this version as the current one and link to the PR
+-->
+current version: 
+desired version: 
+
+###### Notify maintainers
+<!--
+Search your package here: https://search.nixos.org/packages?channel=unstable
+If no maintainer is listed for your package, tag the person that last updated the package
+-->
+
+maintainers: 
+
+###### Note for maintainers
+
+Please tag this issue in your PR.

From d59bfded58b63611b0f9d929c446bd03c5ae3630 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Wed, 21 Oct 2020 14:16:44 +0300
Subject: [PATCH 0164/3942] nixos/dhcpcd: if disabled IPv6 don't solicit or
 accept IPv6

---
 nixos/modules/services/networking/dhcpcd.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 0507b739d499..d10bffd91474 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -69,6 +69,11 @@ let
         if-carrier-up = "";
       }.${cfg.wait}}
 
+      ${optionalString (config.networking.enableIPv6 == false) ''
+        # Don't solicit or accept IPv6 Router Advertisements and DHCPv6 if disabled IPv6
+        noipv6
+      ''}
+
       ${cfg.extraConfig}
     '';
 

From 443f42c7f2bdaa5932748d0c7be3755ea621fec2 Mon Sep 17 00:00:00 2001
From: IvarWithoutBones <ivar.scholten@protonmail.com>
Date: Wed, 21 Oct 2020 14:19:52 +0200
Subject: [PATCH 0165/3942] ryujinx: 1.0.5346 -> 1.0.5551

---
 pkgs/misc/emulators/ryujinx/default.nix |  6 +++---
 pkgs/misc/emulators/ryujinx/deps.nix    | 14 ++++++++++++--
 pkgs/misc/emulators/ryujinx/log.patch   |  4 ++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix
index d1fa03898231..0e6784e69eab 100644
--- a/pkgs/misc/emulators/ryujinx/default.nix
+++ b/pkgs/misc/emulators/ryujinx/default.nix
@@ -13,13 +13,13 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "ryujinx";
-  version = "1.0.5346";
+  version = "1.0.5551"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
 
   src = fetchFromGitHub {
     owner = "Ryujinx";
     repo = "Ryujinx";
-    rev = "2ce59c44bcb2d789f4d6312b26cf41f36915d73c";
-    sha256 = "0hk8jdacg8ryhh0mpnfjbzrrpy8gv87f4hp0hybyypglmaxz8grm";
+    rev = "2dcc6333f8cbb959293832f52857bdaeab1918bf";
+    sha256 = "1hfa498fr9mdxas9s02y25ncb982wa1sqhl06jpnkhqsiicbkgcf";
   };
 
   nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ];
diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix
index 94093e1e29c6..4f30b159a280 100644
--- a/pkgs/misc/emulators/ryujinx/deps.nix
+++ b/pkgs/misc/emulators/ryujinx/deps.nix
@@ -14,6 +14,11 @@
     version = "1.1.7";
     sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0";
   })
+  (fetchNuGet {
+    name = "Crc32.NET";
+    version = "1.2.0";
+    sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h";
+  })
   (fetchNuGet {
     name = "DiscordRichPresence";
     version = "1.0.150";
@@ -236,8 +241,8 @@
   })
   (fetchNuGet {
     name = "OpenTK.NetStandard";
-    version = "1.0.5.12";
-    sha256 = "1n8j6k47189l5b6rnhyq391d84v6zkpiiqq41cccb6qizvrcgl69";
+    version = "1.0.5.22";
+    sha256 = "10bdhc4qbffac862zg03ab5j3iqrr33bydxmnmrxn82brldahm23";
   })
   (fetchNuGet {
     name = "PangoSharp";
@@ -489,6 +494,11 @@
     version = "4.3.0";
     sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll";
   })
+  (fetchNuGet {
+    name = "SharpZipLib";
+    version = "1.2.0";
+    sha256 = "0ynhx1qkjm723bwjwsrdviw1d2s9azndpa12dagrjshhma3igqm5";
+  })
   (fetchNuGet {
     name = "System.AppContext";
     version = "4.1.0";
diff --git a/pkgs/misc/emulators/ryujinx/log.patch b/pkgs/misc/emulators/ryujinx/log.patch
index d25e22fbd373..7283ef9e7d5d 100644
--- a/pkgs/misc/emulators/ryujinx/log.patch
+++ b/pkgs/misc/emulators/ryujinx/log.patch
@@ -1,5 +1,5 @@
 diff --git a/Ryujinx.Common/Configuration/LoggerModule.cs b/Ryujinx.Common/Configuration/LoggerModule.cs
-index 20c0fb46..ce933730 100644
+index 20c0fb46..534576bc 100644
 --- a/Ryujinx.Common/Configuration/LoggerModule.cs
 +++ b/Ryujinx.Common/Configuration/LoggerModule.cs
 @@ -75,7 +75,7 @@ namespace Ryujinx.Configuration
@@ -7,7 +7,7 @@ index 20c0fb46..ce933730 100644
              {
                  Logger.AddTarget(new AsyncLogTargetWrapper(
 -                    new FileLogTarget(AppDomain.CurrentDomain.BaseDirectory, "file"),
-+		      new FileLogTarget(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx"), "file"),
++                    new FileLogTarget(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx"), "file"),
                      1000,
                      AsyncLogTargetOverflowAction.Block
                  ));

From 3e5c7bd09d0b04a177f649d1a4e2adb1dc3cd6a8 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 21 Oct 2020 13:53:21 -0400
Subject: [PATCH 0166/3942] simpleitk: 2.0.0 -> 2.0.1

---
 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 319f955b9584..bfc1c55d2c4d 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "simpleitk";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "SimpleITK";
     repo = "SimpleITK";
     rev = "v${version}";
-    sha256 = "1nf3cl3ywqg04446xhkb97kcashrgibsihxn2sqrs81i9d0rw5kn";
+    sha256 = "0yijli538hd96pfg4vpfk983y6d5bw9dlbs9nsq4rp83r08qdcc5";
   };
 
   nativeBuildInputs = [ cmake swig ];

From 1c2ee215abdf98065f5011bcbc0e156688926b9d Mon Sep 17 00:00:00 2001
From: Will Young <lost.networking@gmail.com>
Date: Mon, 19 Oct 2020 20:32:49 +0200
Subject: [PATCH 0167/3942] ghc:8.10.2Binary bootstrap for 8.8 on aarch64
 (NixOS#97407)

---
 .../compilers/ghc/8.10.2-binary.nix           | 53 +++++++++++++++----
 pkgs/development/compilers/ghc/8.8.4.nix      |  6 ++-
 pkgs/top-level/haskell-packages.nix           | 14 +++--
 3 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix
index baa1d879b53e..37238bb13bda 100644
--- a/pkgs/development/compilers/ghc/8.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix
@@ -82,7 +82,6 @@ stdenv.mkDerivation rec {
       patchShebangs ghc-${version}/utils/
       patchShebangs ghc-${version}/configure
     '' +
-
     # We have to patch the GMP paths for the integer-gmp package.
     ''
       find . -name integer-gmp.buildinfo \
@@ -91,6 +90,12 @@ stdenv.mkDerivation rec {
       find . -name base.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
     '' +
+    # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
+    # FFI_LIB_DIR is a good indication of places it must be needed.
+    stdenv.lib.optionalString stdenv.hostPlatform.isAarch64 ''
+      find . -name package.conf.in \
+          -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
+    '' +
     # Rename needed libraries and binaries, fix interpreter
     stdenv.lib.optionalString stdenv.isLinux ''
       find . -type f -perm -0100 -exec patchelf \
@@ -128,14 +133,35 @@ stdenv.mkDerivation rec {
 
   # On Linux, use patchelf to modify the executables so that they can
   # find editline/gmp.
-  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
-    for p in $(find "$out" -type f -executable); do
-      if isELF "$p"; then
-        echo "Patchelfing $p"
-        patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
-      fi
-    done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  postFixup = stdenv.lib.optionalString stdenv.isLinux
+    (if stdenv.hostPlatform.isAarch64 then
+      # Keep rpath as small as possible on aarch64 for patchelf#244.  All Elfs
+      # are 2 directories deep from $out/lib, so pooling symlinks there makes
+      # a short rpath.
+      ''
+      (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6)
+      (cd $out/lib; ln -s ${gmp.out}/lib/libgmp.so.10)
+      (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1)
+      for p in $(find "$out/lib" -type f -name "*\.so*"); do
+        (cd $out/lib; ln -s $p)
+      done
+
+      for p in $(find "$out/lib" -type f -executable); do
+        if isELF "$p"; then
+          echo "Patchelfing $p"
+          patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p
+        fi
+      done
+      ''
+    else
+      ''
+      for p in $(find "$out" -type f -executable); do
+        if isELF "$p"; then
+          echo "Patchelfing $p"
+          patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
+        fi
+      done
+    '') + stdenv.lib.optionalString stdenv.isDarwin ''
     # not enough room in the object files for the full path to libiconv :(
     for exe in $(find "$out" -type f -executable); do
       isScript $exe && continue
@@ -169,6 +195,11 @@ stdenv.mkDerivation rec {
     enableShared = true;
   };
 
-  meta.license = stdenv.lib.licenses.bsd3;
-  meta.platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
+    maintainers = with stdenv.lib.maintainers; [ lostnet ];
+  };
 }
diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix
index 22a9e6e25f9f..cd579c05ec54 100644
--- a/pkgs/development/compilers/ghc/8.8.4.nix
+++ b/pkgs/development/compilers/ghc/8.8.4.nix
@@ -119,7 +119,11 @@ stdenv.mkDerivation (rec {
   postPatch = "patchShebangs .";
 
   # GHC is a bit confused on its cross terminology.
-  preConfigure = ''
+  preConfigure = stdenv.lib.optionalString stdenv.isAarch64 ''
+    # Aarch64 allow backward bootstrapping since earlier versions are unstable.
+    find . -name \*\.cabal\* -exec sed -i -e 's/\(base.*\)4.14/\14.16/' {} \; \
+      -exec sed -i -e 's/\(prim.*\)0.6/\10.8/' {} \;
+  '' + ''
     for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
       export "''${env#TARGET_}=''${!env}"
     done
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 693f8fe8276b..0db955c2ae48 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1,4 +1,4 @@
-{ buildPackages, pkgs, newScope }:
+{ buildPackages, pkgs, newScope, stdenv }:
 
 let
   # These are attributes in compiler and packages that don't support integer-simple.
@@ -73,7 +73,11 @@ in {
       llvmPackages = pkgs.llvmPackages_7;
     };
     ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix {
-      bootPkgs = packages.ghc865Binary;
+      # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
+      bootPkgs = if stdenv.isAarch64 then
+          packages.ghc8102Binary
+        else
+          packages.ghc865Binary;
       inherit (buildPackages.python3Packages) sphinx;
       buildLlvmPackages = buildPackages.llvmPackages_7;
       llvmPackages = pkgs.llvmPackages_7;
@@ -85,7 +89,11 @@ in {
       llvmPackages = pkgs.llvmPackages_9;
     };
     ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix {
-      bootPkgs = packages.ghc865Binary;
+      # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
+      bootPkgs = if stdenv.isAarch64 then
+          packages.ghc8102Binary
+        else
+          packages.ghc865Binary;
       inherit (buildPackages.python3Packages) sphinx;
       buildLlvmPackages = buildPackages.llvmPackages_9;
       llvmPackages = pkgs.llvmPackages_9;

From d43ce2c699c358e67144fa20cf0e6ee7d80ed63e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 21 Oct 2020 20:15:57 +0000
Subject: [PATCH 0168/3942] alsa-topology-conf: 1.2.3 -> 1.2.4

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

diff --git a/pkgs/os-specific/linux/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-topology-conf/default.nix
index 54340d017ade..4b6678d09b23 100644
--- a/pkgs/os-specific/linux/alsa-topology-conf/default.nix
+++ b/pkgs/os-specific/linux/alsa-topology-conf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "alsa-topology-conf-${version}";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchurl {
     url = "mirror://alsa/lib/${name}.tar.bz2";
-    sha256 = "1zwxc9zhfcmyffjjbibzpdvf4kx7wv9g2zl6xz7y0d6srfr9jgw3";
+    sha256 = "01zdg6q4s6d01k39z96wi4vbhrfw1i2g4yi5dijwfk6a5vjfdq2m";
   };
 
   dontBuild = true;

From bdfe55d7180b617cfbc5e4d6bddbd1181c8e152f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 21 Oct 2020 20:47:23 +0000
Subject: [PATCH 0169/3942] bindfs: 1.14.7 -> 1.14.8

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

diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index f8968260ce79..e69f76e16304 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, fuse, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "1.14.7";
+  version = "1.14.8";
   pname = "bindfs";
 
   src = fetchurl {
     url    = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
-    sha256 = "1lbqyc9vpgck05n0q3qsvsr34142iv721z6iwxhc5j98370ff9i8";
+    sha256 = "15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5";
   };
 
   dontStrip = true;

From cfeca3278464cf6eff7d3620c921a8d238b44404 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Wed, 21 Oct 2020 23:03:48 +0200
Subject: [PATCH 0170/3942] jabref: 3.8.1 -> 5.1

---
 pkgs/applications/office/jabref/default.nix | 52 +++++++++++++++------
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index 7ab53b19ce04..03da2170b3d3 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings-desktop-schemas }:
+{ stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas
+, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, libav, cairo, freetype, pango, gdk-pixbuf, glib }:
 
 stdenv.mkDerivation rec {
-  version = "3.8.1";
+  version = "5.1";
   pname = "jabref";
 
   src = fetchurl {
-    url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar";
-    sha256 = "11asfym74zdq46i217z5n6vc79gylcx8xn7nvwacfqmym0bz79cg";
+    url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}-portable_linux.tar.gz";
+    sha256 = "04f612byrq3agzy26byg1sgrjyhcpa8xfj0ssh8dl8d8vnhx9742";
   };
 
+  preferLocalBuild = true;
+
   desktopItem = makeDesktopItem {
     comment =  meta.description;
     name = "jabref";
@@ -19,21 +22,44 @@ stdenv.mkDerivation rec {
     exec = "jabref";
   };
 
-  buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings-desktop-schemas ];
+  nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+  buildInputs = [ gsettings-desktop-schemas ] ++ systemLibs;
 
-  dontUnpack = true;
+  systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib libav cairo freetype pango gdk-pixbuf glib ];
+  systemLibPaths = stdenv.lib.makeLibraryPath systemLibs;
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/java $out/share/icons
+    mkdir -p $out/share/java $out/share/icons
+
+    cp -r lib $out/lib
+
+    for f in $out/lib/runtime/bin/j*; do
+      patchelf \
+        --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "${ stdenv.lib.makeLibraryPath [ zlib ]}:$out/lib/runtime/lib:$out/lib/runtime/lib/server" $f
+    done
+
+    for f in $out/lib/runtime/lib/*.so; do
+      patchelf \
+        --set-rpath "${systemLibPaths}:$out/lib/runtime/lib:$out/lib/runtime/lib/server" $f
+    done
+
+    # patching the libs in the JImage runtime image is quite impossible as there is no documented way
+    # of rebuilding the image after it has been extracted
+    # the image format itself is "intendedly not documented" - maybe one of the reasons the
+    # devolpers constantly broke "jimage recreate" and dropped it in OpenJDK 9 Build 116 Early Access
+    # so, for now just copy the image and provide our lib paths through the wrapper
+
+    makeWrapper $out/lib/runtime/bin/java $out/bin/jabref \
+      --add-flags '-Djava.library.path=${systemLibPaths}' --add-flags "-p $out/lib/app -m org.jabref/org.jabref.JabRefLauncher" \
+      --run 'export LD_LIBRARY_PATH=${systemLibPaths}:$LD_LIBRARY_PATH'
 
     cp -r ${desktopItem}/share/applications $out/share/
 
-    jar xf $src images/icons/JabRef-icon-mac.svg
-    cp images/icons/JabRef-icon-mac.svg $out/share/icons/jabref.svg
-
-    ln -s $src $out/share/java/jabref-${version}.jar
-    makeWrapper ${jre}/bin/java $out/bin/jabref \
-      --add-flags "-jar $out/share/java/jabref-${version}.jar"
+    # we still need to unpack the runtime image to get the icon
+    mkdir unpacked
+    $out/lib/runtime/bin/jimage extract --dir=./unpacked lib/runtime/lib/modules
+    cp unpacked/org.jabref/icons/jabref.svg $out/share/icons/jabref.svg
   '';
 
   meta = with stdenv.lib; {

From 7d613cd80c1509c11a0d7874d8ad08ce7c701cdf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 22 Oct 2020 00:16:04 +0000
Subject: [PATCH 0171/3942] alsa-ucm-conf: 1.2.3 -> 1.2.4

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

diff --git a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix
index 2a9f28c855a5..3ee800438175 100644
--- a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix
+++ b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "alsa-ucm-conf-${version}";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchurl {
     url = "mirror://alsa/lib/${name}.tar.bz2";
-    sha256 = "000db5yla7dljidjbbwbiaxvc1a7wh1zpw694gipaymj9fh4vhhv";
+    sha256 = "0h6kzi1cfdqyxp4pwpqh5wb89c8s9wrgix315bvamffwfxf56frc";
   };
 
   dontBuild = true;

From 7fc50eae84af76c06fb63a4a59f9ca16d60f20f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 22 Oct 2020 00:22:40 +0000
Subject: [PATCH 0172/3942] bacula: 9.6.5 -> 9.6.6

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

diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index 8bf253a7b121..96fe33bea269 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "bacula-9.6.5";
+  name = "bacula-9.6.6";
 
   src = fetchurl {
     url    = "mirror://sourceforge/bacula/${name}.tar.gz";
-    sha256 = "0yn7qwkzix78bs811vmrn5gbywy7ggnsv72mdjz2lirqc6w3a3si";
+    sha256 = "10c25igfvff09nz5ll8rxc46f659rnwimj1v9cdhr67lwdswk1k2";
   };
 
   buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]

From ca2562af84bfe89e74c4cfe75e38c4f68531fe6a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 22 Oct 2020 01:15:35 +0000
Subject: [PATCH 0173/3942] pantheon.appcenter: 3.4.2 -> 3.5.1

---
 pkgs/desktops/pantheon/apps/appcenter/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index 18ee7bdd844a..29fa4ea41603 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -31,7 +31,7 @@
 
 stdenv.mkDerivation rec {
   pname = "appcenter";
-  version = "3.4.2";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "elementary";

From 67630ea1fb99cd560aef689b28041d64d2ef2014 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 22 Oct 2020 07:22:32 +0000
Subject: [PATCH 0174/3942] cockroachdb: 20.1.4 -> 20.1.7

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

diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index a5071efb486f..3418335d418f 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -14,13 +14,13 @@ let
 in
 buildGoPackage rec {
   pname = "cockroach";
-  version = "20.1.4";
+  version = "20.1.7";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
 
   src = fetchurl {
     url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
-    sha256 = "1m82m776axyf7b5f1lzlv5y7zslyhikfxjgagqy7ci5zwn8j4i0n";
+    sha256 = "1m1jziby0mzfbpwsak1marh1k9sx8vhc17ix6lgikxip4dpf52qg";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ];

From 7f271858cd32c67d5802e70ed574fbeef70374dc Mon Sep 17 00:00:00 2001
From: Narice <narice@tutanota.com>
Date: Thu, 22 Oct 2020 11:29:39 +0200
Subject: [PATCH 0175/3942] modified out-of-date template

Changed the label to '9.needs: package (update)'
Removed trailing spaces
Modified formulation of a sentence
---
 .github/ISSUE_TEMPLATE/out_of_date_package_report.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md
index edb21d2b8e59..72c09a19c0e6 100644
--- a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md
+++ b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md
@@ -2,7 +2,7 @@
 name: Out-of-date package reports
 about: For packages that are out-of-date
 title: ''
-labels: '0.kind: out-of-date package'
+labels: '9.needs: package (update)'
 assignees: ''
 
 ---
@@ -22,18 +22,18 @@ The "new_version" is the the current version of the package
 <!--
 Type the name of your package and try to find an open pull request for the package
 If you find an open pull request, you can review it!
-You will probably have the new version of the package while helping the community!
+There's a high chance that you'll have the new version right away while helping the community!
 -->
 - [ ] Checked the [nixpkgs pull requests](https://github.com/NixOS/nixpkgs/pulls)
 
 ###### Project name
-`nix search` name: 
+`nix search` name:
 <!--
 The current version can be found easily with the same process than above for checking the master branch
 If an open PR is present for the package, take this version as the current one and link to the PR
 -->
-current version: 
-desired version: 
+current version:
+desired version:
 
 ###### Notify maintainers
 <!--
@@ -41,7 +41,7 @@ Search your package here: https://search.nixos.org/packages?channel=unstable
 If no maintainer is listed for your package, tag the person that last updated the package
 -->
 
-maintainers: 
+maintainers:
 
 ###### Note for maintainers
 

From 501cffe2f9afd4ce73d09901fb08ea5cab36cc2a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 22 Oct 2020 11:28:57 +0000
Subject: [PATCH 0176/3942] circleci-cli: 0.1.10993 -> 0.1.11146

---
 pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index 255403a0c279..adfcdbb1ffdb 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.10993";
+  version = "0.1.11146";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1pi31zcg4nvrsyb66znf7g51z51qfw56kml6l2vgg4dbpwmzg87h";
+    sha256 = "1pn421sc3ipdqvdwl6fvlvwcddck3v23j8rfk5lq5a2n4ip5r8z8";
   };
 
   vendorSha256 = "0fjj8hh0s0jcgz48japbcfpl4ihba2drvvxlyg69j8hrcb9lmi4l";

From 47fe9a30f2c88daa0179c8904a6fb41975459264 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 22 Oct 2020 12:59:54 +0000
Subject: [PATCH 0177/3942] commonsIo: 2.6 -> 2.8.0

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

diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix
index c545ad68e727..10587a72ecda 100644
--- a/pkgs/development/libraries/java/commons/io/default.nix
+++ b/pkgs/development/libraries/java/commons/io/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.6";
+  version = "2.8.0";
   pname = "commons-io";
 
   src = fetchurl {
     url    = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz";
-    sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn";
+    sha256 = "02c54cjf3sdwbc9rcgg3xkx1f3yk8p5iv3iwvq78f5vfxsj53lkk";
   };
 
   installPhase = ''

From ef13bb70892224b58e3e235f20eec337b9c359e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 22 Oct 2020 14:31:26 +0000
Subject: [PATCH 0178/3942] bluez: 5.54 -> 5.55

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

diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index 401ab39bca36..8e110fb13ace 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -19,11 +19,11 @@
   ];
 in stdenv.mkDerivation rec {
   pname = "bluez";
-  version = "5.54";
+  version = "5.55";
 
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";
-    sha256 = "1p2ncvjz6alr9n3l5wvq2arqgc7xjs6dqyar1l9jp0z8cfgapkb8";
+    sha256 = "124v9s4y1s7s6klx5vlmzpk1jlr4x84ch7r7scm7x2f42dqp2qw8";
   };
 
   buildInputs = [

From 52d5ebe0671e90a66689136124486f2a7eba19c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 22 Oct 2020 15:36:30 +0000
Subject: [PATCH 0179/3942] clamav: 0.102.4 -> 0.103.0

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

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index fb523c5299ce..3c09951f24f8 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clamav";
-  version = "0.102.4";
+  version = "0.103.0";
 
   src = fetchurl {
     url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
-    sha256 = "06rrzyrhnr0rswryijpbbzywr6387rv8qjq8sb8cl3h2d1m45ggf";
+    sha256 = "0ih5x1rscg2m64y0z20njj7435q8k7ss575cfw7aipdzfx979a9j";
   };
 
   # don't install sample config files into the absolute sysconfdir folder

From 479c17818f0f8c58b9020e1d55aa3acae0579385 Mon Sep 17 00:00:00 2001
From: Moritz Scheuren <m.scheuren@oyra.eu>
Date: Thu, 22 Oct 2020 19:03:15 +0200
Subject: [PATCH 0180/3942] gtg: unstable-2020-09-16 -> unstable-2020-10-22

---
 pkgs/applications/office/gtg/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix
index 2cc3e8eb9221..31266bf6142b 100644
--- a/pkgs/applications/office/gtg/default.nix
+++ b/pkgs/applications/office/gtg/default.nix
@@ -11,17 +11,18 @@
 , pango
 , gdk-pixbuf
 , gobject-introspection
+, xvfb_run
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "gtg";
-  version = "unstable-2020-09-16";
+  version = "unstable-2020-10-22";
 
   src = fetchFromGitHub {
     owner = "getting-things-gnome";
     repo = "gtg";
-    rev = "1be991c6d7f7b2e4b8ac16f82e8a07f9dce4272f";
-    sha256 = "1f5acpjwnp08c78dds7xm22qjzcfnx2qs121yvm3rswkh27s4n23";
+    rev = "144814c16723fa9d00e17e047df5d79ab443fc5f";
+    sha256 = "1lpanfbj8y8b6cqp92lgbvfs8irrc5bsdffzcjcycazv19qm7z2n";
   };
 
 
@@ -45,7 +46,6 @@ python3Packages.buildPythonApplication rec {
     pycairo
     pygobject3
     lxml
-    dbus-python
     gst-python
     liblarch
   ];
@@ -53,12 +53,13 @@ python3Packages.buildPythonApplication rec {
   checkInputs = with python3Packages; [
     nose
     mock
+    xvfb_run
   ];
 
   format = "other";
   strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943)
 
-  checkPhase = "python3 ../run-tests";
+  checkPhase = "xvfb-run python3 ../run-tests";
 
   meta = with stdenv.lib; {
     description = " A personal tasks and TODO-list items organizer";

From be59b76eb66b1de88ebc9b282f36efe9cbf15f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 23 Oct 2020 00:13:15 +0200
Subject: [PATCH 0181/3942] minio: 2020-08-08T04-50-06Z -> 2020-10-18T21-54-12Z

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 4a14dca660b3..11e97f01e4bf 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "minio";
-  version = "2020-08-08T04-50-06Z";
+  version = "2020-10-18T21-54-12Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "0l5yd3k154h3q9sc5psv80n9wpnhpj5sb3r9v9gsqcam46ljwpna";
+    sha256 = "0yva6hwfczq0apg8cl0xvm5xzyazxnic4bh2xxm1nq4iqw2p2177";
   };
 
-  vendorSha256 = "1xxhvgawkj2lq39cxgl4l5v41m6nsask79n2cxfpcgb00fqq147x";
+  vendorSha256 = "185njxpaynnq8yydmkdh1sf6x924p69w7brqwl42ny1gylwv2chp";
 
   doCheck = false;
 

From e186f0e161407a9a781d235b21991ca82004fee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 22 Oct 2020 17:57:02 +0200
Subject: [PATCH 0182/3942] pitivi: Fix .svg loading at startup, see #56943
 #89691

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

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index b1c1dd285e20..ee07a5c7cc89 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -147,6 +147,12 @@ in python3Packages.buildPythonApplication rec {
     mv data/org.pitivi.Pitivi-mime.xml data/org.pitivi.Pitivi-mime.xml.in
   '';
 
+  # Fixes error
+  #     Couldn’t recognize the image file format for file ".../share/pitivi/pixmaps/asset-proxied.svg"
+  # at startup, see https://github.com/NixOS/nixpkgs/issues/56943
+  # and https://github.com/NixOS/nixpkgs/issues/89691#issuecomment-714398705.
+  strictDeps = false;
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "pitivi";

From 0332c423cece35839a6fa7be08b17c76426faac0 Mon Sep 17 00:00:00 2001
From: IvarWithoutBones <ivar.scholten@protonmail.com>
Date: Fri, 23 Oct 2020 03:59:42 +0200
Subject: [PATCH 0183/3942] discordpy: 1.3.4 -> 1.5.1

---
 .../python-modules/discordpy/default.nix            | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
index fd31bb40a92c..e2a4625c60e4 100644
--- a/pkgs/development/python-modules/discordpy/default.nix
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -5,12 +5,11 @@
 , withVoice ? true, libopus
 , aiohttp
 , websockets
-, pynacl
 }:
 
 buildPythonPackage rec {
   pname = "discord.py";
-  version = "1.3.4";
+  version = "1.5.1";
   disabled = pythonOlder "3.5.3";
 
   # only distributes wheels on pypi now
@@ -18,7 +17,7 @@ buildPythonPackage rec {
     owner = "Rapptz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1i4h6vq681x8s05wi0n3ykavsxjh9hxdxn6banwjcqzhxzkyhsxi";
+    sha256 = "1bidyclwv20p1kfphj21r5gm3kr2vxx0zd151wg7fcngbbx7gmza";
   };
 
   propagatedBuildInputs = [ aiohttp websockets ];
@@ -31,7 +30,6 @@ buildPythonPackage rec {
       --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'"
   '';
 
-
   # only have integration tests with discord
   doCheck = false;
 
@@ -46,9 +44,10 @@ buildPythonPackage rec {
     "discord.ext.commands.bot"
   ];
 
-  meta = {
+  meta = with lib; {
     description = "A python wrapper for the Discord API";
-    homepage    = "https://discordpy.rtfd.org/";
-    license     = lib.licenses.mit;
+    homepage = "https://discordpy.rtfd.org/";
+    maintainers = [ maintainers.ivar ];
+    license = licenses.mit;
   };
 }

From c57affcc3ff20e48297b3a6779cdbadabcb488d7 Mon Sep 17 00:00:00 2001
From: Nora Puchreiner <71534864+nora-puchreiner@users.noreply.github.com>
Date: Fri, 23 Oct 2020 02:13:07 +0000
Subject: [PATCH 0184/3942] graalvm8-ee, graalvm11-ee: 20.0.0 -> 20.2.1

---
 .../compilers/graalvm/enterprise-edition.nix  | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix
index 89896c556efa..690bfdb425cf 100644
--- a/pkgs/development/compilers/graalvm/enterprise-edition.nix
+++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix
@@ -1,44 +1,51 @@
-{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg_3, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
+{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
 
 let
   common = javaVersion:
     let
       graalvmXXX-ee = stdenv.mkDerivation rec {
         pname = "graalvm${javaVersion}-ee";
-        version = "20.0.0";
+        version = "20.2.1";
         srcs = [
           (requireFile {
              name   = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz";
-             sha256 = {  "8" = "2df9b31b96f7a24b6a2fe3ecea0b5e819d5d058fde6320016dba1787ce59e99e";
-                        "11" = "b704fd27b5993584a1ad659b41f42ff0ae8893c066b64a6f6a1719fbee382536";
+             sha256 = {  "8" = "e0bb182146283a43824dd2c2ceeb89b6ff7a93f9a85da889f8663ce1c2bd3002";
+                        "11" = "e5d92d361e7859fe5f88c92d7bb466e285e07f1e4e2d9944948f85fa0e3aee2b";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
           (requireFile {
              name   = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "a9f3f86d880d133bd24ad3b1d95129a96e80ea1d8fbc865d09e9410b921e6897";
-                        "11" = "57086123a95f1e9d4e67b92f830bad9325431908c69a40ef10f28ed586d8bd35";
+             sha256 = {  "8" = "37ac6a62f68adad513057a60513ba75749adf98cc73999b3918afe159900428d";
+                        "11" = "f62df715ad529f8b84854644ac99e0a9a349232c7f03985d20a2a8be20edaa44";
+                      }.${javaVersion};
+             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
+          })
+          (requireFile {
+             name   = "llvm-toolchain-installable-java${javaVersion}-linux-amd64-${version}.jar";
+             sha256 = {  "8" = "da98a8c17b0c724b41d1596b57e282a1ecfcbf9140404dfb04b0d4d9fb159d8a";
+                        "11" = "fc442c396e92f59d034a69175104cb3565c3d128426bd939cc94c6ceccbb720f";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
           (requireFile {
              name   = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "28b2910736f41070c84b97f1b1a3c5fa43ebdcd926ec92c8f145550b5b975b3c";
-                        "11" = "27ff1befa67fe5cc9eb0216b6b1105876f44d13eff6137f36f29f13377ea687b";
+             sha256 = {  "8" = "44f6887249f2eb54cba98dd4d9de019da5463d92982e03bf655fffe4bb520daf";
+                        "11" = "941f3752ccb097958f49250586f04c305092ded3ea4c1b7d9a0f7632e47fa335";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
           (requireFile {
              name   = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "9c83bcd71e316805c2914c9002ce348ae44829606adc2375d9188b1eaaaf82f9";
-                        "11" = "5ca51478bcb5ea5bd9be35856dd7fb2ef03b888cd1b7284a8c15531979025fb4";
+             sha256 = {  "8" = "5c3993c701bd09c6064dcf4a6d9c7489620d0654b03c74682398c788c0211c09";
+                        "11" = "de3ebf35ce47dc399d7976cbd09fde0e85f2c10f85bc3fe8f32bb9e2b500ab70";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
           (requireFile {
              name   = "wasm-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "e8bd14d3f9bf652104e4346e0899a0351afaecae030a9c0ce0f91b1f93d9e660";
-                        "11" = "d24eeb84625bb7a5e330b897fd6dde7fc579a687997b64625199c33fa83c40b4";
+             sha256 = {  "8" = "c0a334b271fd32c098bb3c42eada7eafb9f536becaa756097eebe4682915b067";
+                        "11" = "9e801071992a0ff976bc40b640a8b9368fd8ea890ba986543658fcbaa3a7fd68";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
@@ -47,7 +54,7 @@ let
         unpackPhase = ''
           unpack_jar() {
             jar=$1
-            unzip $jar -d $out
+            unzip -o $jar -d $out
             perl -ne 'use File::Path qw(make_path);
                       use File::Basename qw(dirname);
                       if (/^(.+) = (.+)$/) {
@@ -70,6 +77,7 @@ let
           unpack_jar ''${arr[2]}
           unpack_jar ''${arr[3]}
           unpack_jar ''${arr[4]}
+          unpack_jar ''${arr[5]}
         '';
 
         installPhase = {
@@ -117,7 +125,7 @@ let
                     }.${javaVersion}
                  }:${
             stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
-                                                 glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg_3 libGL ]}"
+                                                 glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}"
 
           for f in $(find $out -type f -perm -0100); do
             patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true

From 863ae4a768a8f7f2b1a89391f452917b7aaff039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 22 Oct 2020 11:24:14 +0200
Subject: [PATCH 0185/3942] gitlab-triage: init at 1.13.0

---
 .../version-management/gitlab-triage/Gemfile  |   3 +
 .../gitlab-triage/Gemfile.lock                |  35 ++++++
 .../gitlab-triage/default.nix                 |  14 +++
 .../gitlab-triage/gemset.nix                  | 118 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 172 insertions(+)
 create mode 100644 pkgs/applications/version-management/gitlab-triage/Gemfile
 create mode 100644 pkgs/applications/version-management/gitlab-triage/Gemfile.lock
 create mode 100644 pkgs/applications/version-management/gitlab-triage/default.nix
 create mode 100644 pkgs/applications/version-management/gitlab-triage/gemset.nix

diff --git a/pkgs/applications/version-management/gitlab-triage/Gemfile b/pkgs/applications/version-management/gitlab-triage/Gemfile
new file mode 100644
index 000000000000..7549ada64050
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab-triage/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org' do
+  gem 'gitlab-triage'
+end
diff --git a/pkgs/applications/version-management/gitlab-triage/Gemfile.lock b/pkgs/applications/version-management/gitlab-triage/Gemfile.lock
new file mode 100644
index 000000000000..adec5b524f34
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab-triage/Gemfile.lock
@@ -0,0 +1,35 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.2.4.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    concurrent-ruby (1.1.7)
+    gitlab-triage (1.13.0)
+      activesupport (~> 5.1)
+      httparty (~> 0.17)
+    httparty (0.18.1)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.0512)
+    minitest (5.14.2)
+    multi_xml (0.6.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  gitlab-triage!
+
+BUNDLED WITH
+   2.1.4
diff --git a/pkgs/applications/version-management/gitlab-triage/default.nix b/pkgs/applications/version-management/gitlab-triage/default.nix
new file mode 100644
index 000000000000..09dfbcbc368b
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab-triage/default.nix
@@ -0,0 +1,14 @@
+{ lib, bundlerApp }:
+
+bundlerApp {
+  pname = "gitlab-triage";
+  gemdir = ./.;
+  exes = [ "gitlab-triage" ];
+
+  meta = with lib; {
+    description = "GitLab's issues and merge requests triage, automated!";
+    homepage = "https://gitlab.com/gitlab-org/gitlab-triage";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/applications/version-management/gitlab-triage/gemset.nix b/pkgs/applications/version-management/gitlab-triage/gemset.nix
new file mode 100644
index 000000000000..1ce8450bba1c
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab-triage/gemset.nix
@@ -0,0 +1,118 @@
+{
+  activesupport = {
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd";
+      type = "gem";
+    };
+    version = "5.2.4.4";
+  };
+  concurrent-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
+      type = "gem";
+    };
+    version = "1.1.7";
+  };
+  gitlab-triage = {
+    dependencies = ["activesupport" "httparty"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11sas3h3n638gni1mysck1ahyakqnl8gg6g21pc3krs6jrg9qxj9";
+      type = "gem";
+    };
+    version = "1.13.0";
+  };
+  httparty = {
+    dependencies = ["mime-types" "multi_xml"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17gpnbf2a7xkvsy20jig3ljvx8hl5520rqm9pffj2jrliq1yi3w7";
+      type = "gem";
+    };
+    version = "0.18.1";
+  };
+  i18n = {
+    dependencies = ["concurrent-ruby"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
+      type = "gem";
+    };
+    version = "1.8.5";
+  };
+  mime-types = {
+    dependencies = ["mime-types-data"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
+      type = "gem";
+    };
+    version = "3.3.1";
+  };
+  mime-types-data = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
+      type = "gem";
+    };
+    version = "3.2020.0512";
+  };
+  minitest = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
+      type = "gem";
+    };
+    version = "5.14.2";
+  };
+  multi_xml = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  thread_safe = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+      type = "gem";
+    };
+    version = "1.2.7";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e124b645259..3b3c4538cf83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4006,6 +4006,8 @@ in
 
   gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };
 
+  gitlab-triage = callPackage ../applications/version-management/gitlab-triage { };
+
   gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { };
 
   gitaly = callPackage ../applications/version-management/gitlab/gitaly { };

From 1321ae850c12ae223b4ca8468ecb14519e1d69f8 Mon Sep 17 00:00:00 2001
From: Anton Plotnikov <plotnikovanton@gmail.com>
Date: Tue, 13 Oct 2020 12:01:23 +0300
Subject: [PATCH 0186/3942] fido2luks: 0.2.3 -> 0.2.15

Also remove interactive flag from initrd, because of broken io.
---
 nixos/modules/system/boot/luksroot.nix    |  2 +-
 pkgs/tools/security/fido2luks/default.nix | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 88190e8200b1..8dd2ea20519a 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -404,7 +404,7 @@ let
           echo "Please move your mouse to create needed randomness."
         ''}
           echo "Waiting for your FIDO2 device..."
-          fido2luks -i open ${device} ${name} ${fido2.credential} --await-dev ${toString fido2.gracePeriod} --salt string:$passphrase
+          fido2luks open ${device} ${name} ${fido2.credential} --await-dev ${toString fido2.gracePeriod} --salt string:$passphrase
         if [ $? -ne 0 ]; then
           echo "No FIDO2 key found, falling back to normal open procedure"
           open_normally
diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix
index 729a3f7297cb..d2a5d91467a8 100644
--- a/pkgs/tools/security/fido2luks/default.nix
+++ b/pkgs/tools/security/fido2luks/default.nix
@@ -3,23 +3,29 @@
 , fetchFromGitHub
 , cryptsetup
 , pkg-config
+, clang
+, llvmPackages
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "fido2luks";
-  version = "0.2.3";
+  version = "0.2.15";
 
   src = fetchFromGitHub {
     owner = "shimunn";
     repo = pname;
     rev = version;
-    sha256 = "0340xp7q6f0clb7wmqpgllllwsixmsy37k1f5kj3hwvb730rz93x";
+    sha256 = "1v5gxcz4zbc673i5kbsnjq8bikf7jdbn3wjfz1wppjrgwnkgvsh9";
   };
 
   buildInputs = [ cryptsetup ];
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config clang ];
 
-  cargoSha256 = "0rp4f6xnwmvf3pv6h0qwsg01jrndf77yn67675ac39kxzmrzfy2f";
+  configurePhase = ''
+    export LIBCLANG_PATH="${llvmPackages.libclang}/lib"
+  '';
+
+  cargoSha256 = "19drjql13z8bw257z10kjppxm25jlfgrpc9g1jf68ka5j2b3nx7k";
 
   meta = with stdenv.lib; {
     description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";

From 2eda0fbc5b11e8646e7ad31e98485d102a6350a9 Mon Sep 17 00:00:00 2001
From: Moritz Schaefer <mail@moritzs.de>
Date: Fri, 23 Oct 2020 11:19:52 +0200
Subject: [PATCH 0187/3942] fix package path for bioc server
 (http://mirrors.ustc.edu.cn/bioc/3.11/bioc/src/contrib/Archive/)

---
 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 6e98ef83e011..7eae62d1149d 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -44,6 +44,7 @@ let
   deriveBioc = mkDerive {
     mkHomepage = {name, biocVersion, ...}: "https://bioconductor.org/packages/${biocVersion}/bioc/html/${name}.html";
     mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/bioc/src/contrib/${name}_${version}.tar.gz"
+                                             "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}/${name}_${version}.tar.gz"
                                              "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}_${version}.tar.gz" ];
   };
   deriveBiocAnn = mkDerive {

From f06ef735a334a0254f6d887bb46ae7b8cf94851a Mon Sep 17 00:00:00 2001
From: Scott Dier <scott@dier.name>
Date: Fri, 23 Oct 2020 12:26:31 +0200
Subject: [PATCH 0188/3942] igmpproxy: init at version 0.2.1

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

diff --git a/pkgs/tools/networking/igmpproxy/default.nix b/pkgs/tools/networking/igmpproxy/default.nix
new file mode 100644
index 000000000000..83b35c098669
--- /dev/null
+++ b/pkgs/tools/networking/igmpproxy/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  pname = "igmpproxy";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "pali";
+    repo = "igmpproxy";
+    rev = version;
+    sha256 = "13zn4q24drbhpqmcmqh1jg7ind5iqn11wj3xvczlc8w35vyqssyf";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    description = "A daemon that routes multicast using IGMP forwarding";
+    homepage = "https://github.com/pali/igmpproxy/";
+    changelog = "https://github.com/pali/igmpproxy/releases/tag/${version}";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.sdier ];
+    # The maintainer is using this on linux, but if you test it on other platforms
+    # please add them here!
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97037a1f873f..f3bb53b48857 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4569,6 +4569,8 @@ in
       irods
       irods-icommands;
 
+  igmpproxy = callPackage ../tools/networking/igmpproxy { };
+
   ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
     inherit (haskellPackages) ghcWithPackages;
 

From 919df81df148c244ca1bcf946997b76d95ff77e0 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 23 Oct 2020 14:45:25 +0300
Subject: [PATCH 0189/3942] yed: wrap With wrapGAppsHook - fixes #101135

Use preFixup to setup the wrapper properly, without double wrapping.
---
 pkgs/applications/graphics/yed/default.nix     | 15 ++++++++++++---
 pkgs/development/compilers/openjdk/default.nix |  4 ++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index f92e910eacce..7eb0851834fc 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, makeWrapper, unzip, jre }:
+{ stdenv, fetchzip, makeWrapper, unzip, jre, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "yEd";
@@ -9,16 +9,25 @@ stdenv.mkDerivation rec {
     sha256 = "0sd73s700f3gqq5zq1psrqjg6ff2gv49f8vd37v6bv65vdxqxryq";
   };
 
-  nativeBuildInputs = [ makeWrapper unzip ];
+  nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ];
+  # For wrapGAppsHook setup hook
+  buildInputs = [ jre.gtk3 ];
 
-  installPhase = ''
+  dontConfigure = true;
+  dontBuild = true;
+  dontInstall = true;
+
+  preFixup = ''
     mkdir -p $out/yed
     cp -r * $out/yed
     mkdir -p $out/bin
 
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
     makeWrapper ${jre}/bin/java $out/bin/yed \
+      ''${makeWrapperArgs[@]} \
       --add-flags "-jar $out/yed/yed.jar --"
   '';
+  dontWrapGApps = true;
 
   meta = with stdenv.lib; {
     license = licenses.unfree;
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 3dd74f73a7ec..fa96f7b3b0d9 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -31,6 +31,10 @@ let
       gtk3 gnome_vfs GConf glib
     ];
 
+    passthru = {
+      inherit gtk3;
+    };
+
     patches = [
       ./fix-java-home-jdk10.patch
       ./read-truststore-from-env-jdk10.patch

From 67f70f9bcfce7f5435f43201254469b5246139c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= <git@samuelgrf.com>
Date: Wed, 21 Oct 2020 13:38:53 +0200
Subject: [PATCH 0190/3942] fmt: 6.2.1 -> 7.0.3

---
 pkgs/development/libraries/fmt/default.nix | 27 ++--------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index eb9ecea7a182..a52211682ba1 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "fmt";
-  version = "6.2.1";
+  version = "7.0.3";
 
   outputs = [ "out" "dev" ];
 
@@ -10,32 +10,9 @@ stdenv.mkDerivation rec {
     owner = "fmtlib";
     repo = "fmt";
     rev = version;
-    sha256 = "1i6nfxazq4d05r3sxyc3ziwkqq7s8rdbv9p16afv66aqmsbqqqic";
+    sha256 = "17q2fdzakk5p0s3fx3724gs5k2b5ylp8f1d6j2m3wgvlfldx9k9a";
   };
 
-  patches = [
-    # Fix BC break breaking Kodi
-    # https://github.com/xbmc/xbmc/issues/17629
-    # https://github.com/fmtlib/fmt/issues/1620
-    (fetchpatch {
-      url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch";
-      sha256 = "0v8hm5958ih1bmnjr16fsbcmdnq4ykyf6b0hg6dxd5hxd126vnxx";
-    })
-
-    # Fix paths in pkg-config file
-    # https://github.com/fmtlib/fmt/pull/1657
-    (fetchpatch {
-      url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch";
-      sha256 = "1hqp96zl9l3qyvsm7pxl6ah8c26z035q2mz2pqhqa0wvzd1klcc6";
-    })
-
-    # Fix cmake config paths.
-    (fetchpatch {
-      url = "https://github.com/fmtlib/fmt/pull/1702.patch";
-      sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3";
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [

From 0c10d50caaf8c9bfc2ba444d4d174064abf56382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= <git@samuelgrf.com>
Date: Fri, 23 Oct 2020 15:39:26 +0200
Subject: [PATCH 0191/3942] fmt_6, fmt_7: init

---
 pkgs/development/libraries/fmt/default.nix | 99 +++++++++++++++-------
 pkgs/top-level/all-packages.nix            |  5 +-
 2 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index a52211682ba1..6cb3ec5a2b30 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -1,37 +1,76 @@
 { stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }:
 
-stdenv.mkDerivation rec {
-  pname = "fmt";
-  version = "7.0.3";
+let
+  generic = { version, sha256, patches ? [ ] }:
+    stdenv.mkDerivation {
+      pname = "fmt";
+      inherit version;
 
-  outputs = [ "out" "dev" ];
+      outputs = [ "out" "dev" ];
 
-  src = fetchFromGitHub {
-    owner = "fmtlib";
-    repo = "fmt";
-    rev = version;
+      src = fetchFromGitHub {
+        owner = "fmtlib";
+        repo = "fmt";
+        rev = version;
+        inherit sha256;
+      };
+
+      inherit patches;
+
+      nativeBuildInputs = [ cmake ];
+
+      cmakeFlags = [
+        "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}"
+        "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
+      ];
+
+      doCheck = true;
+
+      meta = with stdenv.lib; {
+        description = "Small, safe and fast formatting library";
+        longDescription = ''
+          fmt (formerly cppformat) is an open-source formatting library. It can be
+          used as a fast and safe alternative to printf and IOStreams.
+        '';
+        homepage = "http://fmtlib.net/";
+        downloadPage = "https://github.com/fmtlib/fmt/";
+        maintainers = [ maintainers.jdehaas ];
+        license = licenses.bsd2;
+        platforms = platforms.all;
+      };
+    };
+in
+{
+  fmt_6 = generic {
+    version = "6.2.1";
+    sha256 = "1i6nfxazq4d05r3sxyc3ziwkqq7s8rdbv9p16afv66aqmsbqqqic";
+
+    patches = [
+      # Fix BC break breaking Kodi
+      # https://github.com/xbmc/xbmc/issues/17629
+      # https://github.com/fmtlib/fmt/issues/1620
+      (fetchpatch {
+        url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch";
+        sha256 = "0v8hm5958ih1bmnjr16fsbcmdnq4ykyf6b0hg6dxd5hxd126vnxx";
+      })
+
+      # Fix paths in pkg-config file
+      # https://github.com/fmtlib/fmt/pull/1657
+      (fetchpatch {
+        url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch";
+        sha256 = "1hqp96zl9l3qyvsm7pxl6ah8c26z035q2mz2pqhqa0wvzd1klcc6";
+      })
+
+      # Fix cmake config paths.
+      (fetchpatch {
+        url = "https://github.com/fmtlib/fmt/pull/1702.patch";
+        sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3";
+      })
+    ];
+  };
+
+  fmt_7 = generic {
+    version = "7.0.3";
     sha256 = "17q2fdzakk5p0s3fx3724gs5k2b5ylp8f1d6j2m3wgvlfldx9k9a";
   };
-
-  nativeBuildInputs = [ cmake ];
-
-  cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}"
-    "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
-  ];
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "Small, safe and fast formatting library";
-    longDescription = ''
-      fmt (formerly cppformat) is an open-source formatting library. It can be
-      used as a fast and safe alternative to printf and IOStreams.
-    '';
-    homepage = "http://fmtlib.net/";
-    downloadPage = "https://github.com/fmtlib/fmt/";
-    maintainers = [ maintainers.jdehaas ];
-    license = licenses.bsd2;
-    platforms = platforms.all;
-  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56856208c5b3..6fa8a46d4fa5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12461,7 +12461,10 @@ in
 
   flyway = callPackage ../development/tools/flyway { };
 
-  fmt = callPackage ../development/libraries/fmt/default.nix { };
+  inherit (callPackages ../development/libraries/fmt { })
+    fmt_6 fmt_7;
+
+  fmt = fmt_7;
 
   fplll = callPackage ../development/libraries/fplll {};
   fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};

From e8c80d8a2606989dc43a5f3662fd13ef54e67ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= <git@samuelgrf.com>
Date: Fri, 23 Oct 2020 14:31:05 +0200
Subject: [PATCH 0192/3942] gerbera, waybar: build with fmt_6

---
 pkgs/top-level/all-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fa8a46d4fa5..ef13e74892ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16547,7 +16547,9 @@ in
 
   grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { };
 
-  gerbera = callPackage ../servers/gerbera { };
+  gerbera = callPackage ../servers/gerbera {
+    fmt = fmt_6;
+  };
 
   gobetween = callPackage ../servers/gobetween { };
 
@@ -21301,7 +21303,9 @@ in
 
   swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { };
 
-  waybar = callPackage ../applications/misc/waybar { };
+  waybar = callPackage ../applications/misc/waybar {
+    fmt = fmt_6;
+  };
 
   hikari = callPackage ../applications/window-managers/hikari { };
 

From a2472ebfb18d5857c07bb92dfb1c44f03fc4b44e Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Thu, 22 Oct 2020 23:07:10 +0300
Subject: [PATCH 0193/3942] geogebra: 5-0-593-0 -> 5-0-609-0, geogebra6:
 6-0-600-0 -> 6-0-609-0

---
 .../science/math/geogebra/default.nix         |  92 ++++++++++------
 .../science/math/geogebra/geogebra6.nix       | 100 +++++++++++-------
 2 files changed, 121 insertions(+), 71 deletions(-)

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index 5cebef83a4a9..a6950ad3451c 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -1,18 +1,7 @@
-{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, language ? "en_US" }:
-
-stdenv.mkDerivation rec {
+{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }:
+let
   pname = "geogebra";
-  version = "5-0-593-0";
-
-  preferLocalBuild = true;
-
-  src = fetchurl {
-    urls = [
-      "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
-      "http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
-    ];
-    sha256 = "d84c27a3299e6df08881733d22215a18decedcba4c2d97a9e5424c39cd57db35";
-  };
+  version = "5-0-609-0";
 
   srcIcon = fetchurl {
     url = "http://static.geogebra.org/images/geogebra-logo.svg";
@@ -30,23 +19,6 @@ stdenv.mkDerivation rec {
     mimeType = "application/vnd.geogebra.file;application/vnd.geogebra.tool;";
   };
 
-  buildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    install -D geogebra/* -t "$out/libexec/geogebra/"
-
-    makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \
-      --set JAVACMD "${jre}/bin/java" \
-      --set GG_PATH "$out/libexec/geogebra" \
-      --add-flags "--language=${language}"
-
-    install -Dm644 "${desktopItem}/share/applications/"* \
-      -t $out/share/applications/
-
-    install -Dm644 "${srcIcon}" \
-      "$out/share/icons/hicolor/scalable/apps/geogebra.svg"
-  '';
-
   meta = with stdenv.lib; {
     description = "Dynamic mathematics software with graphics, algebra and spreadsheets";
     longDescription = ''
@@ -57,7 +29,61 @@ stdenv.mkDerivation rec {
     homepage = "https://www.geogebra.org/";
     maintainers = with maintainers; [ ma27 ];
     license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ];
-    platforms = platforms.all;
+    platforms = with platforms; linux ++ darwin;
     hydraPlatforms = [];
   };
-}
+
+  linuxPkg = stdenv.mkDerivation {
+    inherit pname version meta srcIcon desktopItem;
+
+    preferLocalBuild = true;
+
+    src = fetchurl {
+      urls = [
+        "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
+        "http://web.archive.org/web/20201022200454/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
+      ];
+      sha256 = "0xbhg8hm3dqm3qkraj48pqwslrnjyxpq9mcgylr2m8i1gmqw7xwf";
+    };
+
+    nativeBuildInputs = [ makeWrapper ];
+
+    installPhase = ''
+      install -D geogebra/* -t "$out/libexec/geogebra/"
+
+      makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \
+        --set JAVACMD "${jre}/bin/java" \
+        --set GG_PATH "$out/libexec/geogebra" \
+        --add-flags "--language=${language}"
+
+      install -Dm644 "${desktopItem}/share/applications/"* \
+        -t $out/share/applications/
+
+      install -Dm644 "${srcIcon}" \
+        "$out/share/icons/hicolor/scalable/apps/geogebra.svg"
+    '';
+  };
+
+  darwinPkg = stdenv.mkDerivation {
+    inherit pname version meta;
+
+    preferLocalBuild = true;
+
+    src = fetchurl {
+      url = "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip";
+      sha256 = "16fgqwxz31cfmia0pyzpk05aqzrqr11sjbw37q9zb3xfh3p1r4gz";
+    };
+
+    dontUnpack = true;
+
+    nativeBuildInputs = [ unzip ];
+
+    installPhase = ''
+      install -dm755 $out/Applications
+      unzip $src -d $out/Applications
+    '';
+  };
+in
+if stdenv.isDarwin
+then darwinPkg
+else linuxPkg
diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix
index 65caff82ead1..7bd582648937 100644
--- a/pkgs/applications/science/math/geogebra/geogebra6.nix
+++ b/pkgs/applications/science/math/geogebra/geogebra6.nix
@@ -1,46 +1,70 @@
 { stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }:
-stdenv.mkDerivation rec{
-
-  name = "geogebra-${version}";
-  version = "6-0-600-0";
-
-  src = fetchurl {
-    urls = [
-        "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
-        "https://web.archive.org/web/20200904093945/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
-      ];
-    sha256 = "1l49rvfkil2cz6r7sa2mi0p6hvb6p66jv3x6xj8hjqls4l3sfhkm";
-  };
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  nativeBuildInputs = [
-    unzip
-    makeWrapper
-  ];
-
-  unpackPhase = ''
-    unzip $src
-  '';
-
-  installPhase = ''
-    mkdir -p $out/libexec/geogebra/ $out/bin
-    cp -r GeoGebra-linux-x64/{resources,locales} "$out/"
-    makeWrapper ${stdenv.lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app"
-    install -Dm644 "${desktopItem}/share/applications/"* \
-      -t $out/share/applications/
-
-    install -Dm644 "${srcIcon}" \
-      "$out/share/icons/hicolor/scalable/apps/geogebra.svg"
-  '';
+let
+  pname = "geogebra";
+  version = "6-0-609-0";
 
   srcIcon = geogebra.srcIcon;
-
   desktopItem = geogebra.desktopItem;
+
   meta = with stdenv.lib; geogebra.meta // {
     license = licenses.geogebra;
     maintainers = with maintainers; [ voidless ];
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
   };
-}
+
+  linuxPkg = stdenv.mkDerivation {
+    inherit pname version meta;
+
+    src = fetchurl {
+      urls = [
+          "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
+          "https://web.archive.org/web/20201022200156/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
+        ];
+      sha256 = "0rzcbq587x8827g9v03awa9hz27vyfjc0cz45ymbchqp31lsx49b";
+    };
+
+    dontConfigure = true;
+    dontBuild = true;
+
+    nativeBuildInputs = [
+      unzip
+      makeWrapper
+    ];
+
+    unpackPhase = ''
+      unzip $src
+    '';
+
+    installPhase = ''
+      mkdir -p $out/libexec/geogebra/ $out/bin
+      cp -r GeoGebra-linux-x64/{resources,locales} "$out/"
+      makeWrapper ${stdenv.lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app"
+      install -Dm644 "${desktopItem}/share/applications/"* \
+        -t $out/share/applications/
+
+      install -Dm644 "${srcIcon}" \
+        "$out/share/icons/hicolor/scalable/apps/geogebra.svg"
+    '';
+  };
+
+  darwinPkg = stdenv.mkDerivation {
+    inherit pname version meta;
+
+    src = fetchurl {
+      url = "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip";
+      sha256 = "0275869zgwbl1qjj593q6629hnxbwk9c15rkm29a3lh10pinb099";
+    };
+
+    dontUnpack = true;
+
+    nativeBuildInputs = [ unzip ];
+
+    installPhase = ''
+      install -dm755 $out/Applications
+      unzip $src -d $out/Applications
+    '';
+  };
+in
+if stdenv.isDarwin
+then darwinPkg
+else linuxPkg

From 69f31f3fe6f477f3cf2cd37dcc034264b80ac323 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 2 Oct 2020 13:24:55 -0700
Subject: [PATCH 0194/3942] catfs: init at unstable-2020-03-21

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

diff --git a/pkgs/os-specific/linux/catfs/default.nix b/pkgs/os-specific/linux/catfs/default.nix
new file mode 100644
index 000000000000..0ca585fab47b
--- /dev/null
+++ b/pkgs/os-specific/linux/catfs/default.nix
@@ -0,0 +1,47 @@
+{ lib, rustPlatform, fetchFromGitHub
+, fetchpatch
+, fuse
+, pkg-config
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "catfs";
+  version = "unstable-2020-03-21";
+
+  src = fetchFromGitHub {
+    owner = "kahing";
+    repo = pname;
+    rev = "daa2b85798fa8ca38306242d51cbc39ed122e271";
+    sha256 = "0zca0c4n2p9s5kn8c9f9lyxdf3df88a63nmhprpgflj86bh8wgf5";
+  };
+
+  cargoSha256 = "0v6lxwj4vcph32np68awpncafvf1dwcik9a2asa0lkb7kmfdjsjk";
+
+  cargoPatches = [
+    # update cargo lock
+    (fetchpatch {
+      url = "https://github.com/kahing/catfs/commit/f838c1cf862cec3f1d862492e5be82b6dbe16ac5.patch";
+      sha256 = "1r1p0vbr3j9xyj9r1ahipg4acii3m4ni4m9mp3avbi1rfgzhblhw";
+    })
+  ];
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ fuse ];
+
+  # require fuse module to be active to run tests
+  # instead, run command
+  doCheck = false;
+  doInstallCheck = true;
+  installCheckPhase = ''
+    $out/bin/catfs --help > /dev/null
+  '';
+
+  meta = with lib; {
+    description = "Caching filesystem written in Rust";
+    homepage = "https://github.com/kahing/catfs";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba9b59be461b..49e550bd27ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19924,6 +19924,8 @@ in
 
   castor = callPackage ../applications/networking/browsers/castor { };
 
+  catfs = callPackage ../os-specific/linux/catfs { };
+
   catimg = callPackage ../tools/misc/catimg { };
 
   catt = callPackage ../applications/video/catt { };

From a89b8422713e1b77f5bd5482e9b53f23d6c9d62d Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 23 Oct 2020 20:02:19 +0200
Subject: [PATCH 0195/3942] pango: 1.45.3 -> 1.47.0

---
 pkgs/development/libraries/pango/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index e3bdba9b3b1b..45edbee1be49 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -9,26 +9,15 @@ with stdenv.lib;
 
 let
   pname = "pango";
-  version = "1.45.3";
+  version = "1.47.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0zg6gvzk227q997jf1c9p7j5ra87nm008hlgq6q8na9xmgmw2x8z";
+    sha256 = "0ry3j9n0lvdfmjwi2w7wa4gkalnip56kghqq6bh8hcf45xjvh3bk";
   };
 
-  patches = [
-    # Fix issue with Pango loading unsupported formats that
-    # breaks mixed x11/opentype font packages.
-    # See https://gitlab.gnome.org/GNOME/pango/issues/457
-    # Remove on next release.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/pango/commit/fe1ee773310bac83d8e5d3c062b13a51fb5fb4ad.patch";
-      sha256 = "1px66g31l2jx4baaqi4md59wlmvw0ywgspn6zr919fxl4h1kkh0h";
-    })
-  ];
-
   # FIXME: docs fail on darwin
   outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc";
 
@@ -50,6 +39,7 @@ in stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
+    "-Dlibthai=disabled" # Not packaged in Nixpkgs
   ];
 
   enableParallelBuilding = true;

From b622f7fe80f8f0b7799e821abc345df1403a99e3 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Fri, 23 Oct 2020 18:01:06 -0400
Subject: [PATCH 0196/3942] angle-grinder: init at 0.15.0

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

diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/tools/text/angle-grinder/default.nix
new file mode 100644
index 000000000000..a8702553c4b3
--- /dev/null
+++ b/pkgs/tools/text/angle-grinder/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "angle-grinder";
+  version = "0.15.0";
+
+  src = fetchFromGitHub {
+    owner = "rcoh";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1m5yj9412kjlnqi1nwh44i627ip0kqcbhvwgh87gl5vgd2a0m091";
+  };
+
+  cargoSha256 = "0y4c1gja0i3h2whjpm74yf3z1y85pkwmpmrl2fjsyy0mn493hzv8";
+
+  meta = with stdenv.lib; {
+    description = "Slice and dice logs on the command line";
+    homepage = "https://github.com/rcoh/angle-grinder";
+    license = licenses.mit;
+    maintainers = with maintainers; [ bbigras ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd731dd97561..bebd7a29698b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -701,6 +701,8 @@ in
 
   analog = callPackage ../tools/admin/analog {};
 
+  angle-grinder = callPackage ../tools/text/angle-grinder {};
+
   ansifilter = callPackage ../tools/text/ansifilter {};
 
   antora = callPackage ../development/tools/documentation/antora {};

From 3b7f2b006eed39d14213470fec54350a96d694bd Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 23 Oct 2020 22:12:18 +0000
Subject: [PATCH 0197/3942] nasm: 2.14.02 -> 2.15.05

https://nasm.us/doc/nasmdocc.html
https://nvd.nist.gov/vuln/detail/CVE-2019-6290
https://nvd.nist.gov/vuln/detail/CVE-2019-6291
https://nvd.nist.gov/vuln/detail/CVE-2019-8343
https://nvd.nist.gov/vuln/detail/CVE-2019-14248
https://nvd.nist.gov/vuln/detail/CVE-2019-20334
---
 pkgs/development/compilers/nasm/default.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index 67665c3bab18..89217db6818f 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -1,27 +1,25 @@
-{ stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
+{ stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   pname = "nasm";
-  version = "2.14.02";
+  version = "2.15.05";
 
-  src = fetchFromRepoOrCz {
-    repo = "nasm";
-    rev = "${pname}-${version}";
-    sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa";
+  src = fetchurl {
+    url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz";
+    sha256 = "0gqand86b0r86k3h46dh560lykxmxqqywz5m55kgjfq7q4lngbrw";
   };
 
-  nativeBuildInputs = [ autoreconfHook perl asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
+  nativeBuildInputs = [ perl ];
 
-  postBuild = "make manpages";
+  enableParallelBuilding = true;
 
   doCheck = true;
 
   checkPhase = ''
-    make golden && make test
+    make golden
+    make test
   '';
 
-  NIX_CFLAGS_COMPILE="-Wno-error=attributes";
-
   meta = with stdenv.lib; {
     homepage = "https://www.nasm.us/";
     description = "An 80x86 and x86-64 assembler designed for portability and modularity";

From d595f39fa5506e044c8f224a2c6911ccfd4bb7e7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 20 Sep 2020 13:39:55 +0300
Subject: [PATCH 0198/3942] gtk-doc: 1.32 -> 1.33.0

---
 pkgs/development/tools/documentation/gtk-doc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index c93ee954ceab..d7779540f97d 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -14,7 +14,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gtk-doc";
-  version = "1.32";
+  version = "1.33.0";
 
   format = "other";
 
@@ -22,8 +22,8 @@ python3.pkgs.buildPythonApplication rec {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = pname;
-    rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }";
-    sha256 = "14fihxj662gg4ln1ngff6s52zzkpbcc58qa0nxysxypnhp0h4ypk";
+    rev = version;
+    sha256 = "ahOTEWwVVwHt8TDWBnPKHIAUq0GXllEvMRmaKul1Tq0=";
   };
 
   patches = [

From f64862159f68268bb215e0d1326c2689251d8caf Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 20 Sep 2020 13:41:19 +0300
Subject: [PATCH 0199/3942] glib: 2.64.5 -> 2.66.0

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

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 88848deec412..797547cadd22 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -45,11 +45,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "glib";
-  version = "2.64.5";
+  version = "2.66.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "04fczq693wivkqd2qxvvi3sncqgznsvzfiiwsll1rbayf795pgcw";
+    sha256 = "0v0m268qichkh0sirj8gd4awwg6258yr8k6s6p0lhmh68gqnp9n5";
   };
 
   patches = optionals stdenv.isDarwin [

From fedcd9f42a64d0df6ad2e73ad51b7a35dc268d9c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 20 Sep 2020 13:41:53 +0300
Subject: [PATCH 0200/3942] dconf: 0.36 -> 0.38

---
 pkgs/development/libraries/dconf/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix
index 444b1430dd5c..c9c1b9be9228 100644
--- a/pkgs/development/libraries/dconf/default.nix
+++ b/pkgs/development/libraries/dconf/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, fetchpatch
 , meson
 , ninja
 , python3
@@ -19,24 +18,15 @@
 
 stdenv.mkDerivation rec {
   pname = "dconf";
-  version = "0.36.0";
+  version = "0.38.0";
 
   outputs = [ "out" "lib" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz";
+    sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5";
   };
 
-  patches = [
-    # Fix bash-completion installation
-    # https://gitlab.gnome.org/GNOME/dconf/merge_requests/58
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/dconf/commit/b3c9423c6151f3c28e526083ea2f04987a780fdf.patch";
-      sha256 = "0kdapiw3zq041jhzsx90kk08vqfgzr6vy2k541iav984d0m0zcnf";
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja

From 469db7ce0ec62294d31cb571107576d233584810 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 20 Sep 2020 14:15:34 +0300
Subject: [PATCH 0201/3942] gobject-introspection: 1.64.1 -> 1.66.0

---
 .../libraries/gobject-introspection/default.nix       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 03b0d1767d9f..9bac8bc71a19 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gobject-introspection";
-  version = "1.64.1";
+  version = "1.66.0";
 
   # outputs TODO: share/gobject-introspection-1.0/tests is needed during build
   # by pygobject3 (and maybe others), but it's only searched in $out
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0";
+    sha256 = "0q00llz0p7qik19a9fxq4bf6mqqqivkv77fqhcgqygvwxhxflrix";
   };
 
   patches = [
@@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
     bison
     gtk-doc
     docbook-xsl-nons
-    docbook_xml_dtd_43 # FIXME: remove in next release
     docbook_xml_dtd_45
     python3
     setupHook # move .gir files
@@ -91,6 +90,12 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isAarch64;
 
+  # During configurePhase, two python scripts are generated and need this. See
+  # https://github.com/NixOS/nixpkgs/pull/98316#issuecomment-695785692
+  postConfigure = ''
+    patchShebangs tools/*
+  '';
+
   preCheck = ''
     # Our gobject-introspection patches make the shared library paths absolute
     # in the GIR files. When running tests, the library is not yet installed,

From 0166eb0794c521bec3133f6596119b0762a6ea40 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 20 Sep 2020 16:40:37 +0300
Subject: [PATCH 0202/3942] gtk3: 3.24.21 -> 3.24.23

Use xmllint in docs generation. Remove an old patch. Remove an old
postPatch workaround.
---
 pkgs/development/libraries/gtk/3.x.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index bf78d15d39c6..2cae9546b74c 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -25,6 +25,7 @@
 , epoxy
 , json-glib
 , libxkbcommon
+, libxml2
 , gmp
 , gnome3
 , gsettings-desktop-schemas
@@ -48,7 +49,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "gtk+3";
-  version = "3.24.21";
+  version = "3.24.23";
 
   outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
   outputBin = "dev";
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
-    sha256 = "0llgq2adzn9p3bfq9rv2dhscmvzs35jp3glrfvy3vs1mrpknmsmf";
+    sha256 = "1cg2vbwbcp7bc84ky0b69ipgdr9djhspnf5k8lajb8jphcj4v1jx";
   };
 
   patches = [
@@ -71,8 +72,8 @@ stdenv.mkDerivation rec {
       sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
     })
 
-    # Fix path handling in pkg-config
-    # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1793
+    # Fix path handling in pkg-config. MR for the gtk-3-24 branch:
+    # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2605
     (fetchpatch {
       url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch";
       sha256 = "0rd1kjh0m4mrj2hkcqlsq1j0d6ahn5c237fd211r158gd1jiwys0";
@@ -97,11 +98,6 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
 
   postPatch = ''
-    # TODO: Remove in 3.24.21
-    # https://gitlab.gnome.org/GNOME/gtk/issues/2669
-    echo "${stdenv.shell}" > check-version.py
-    chmod +x check-version.py
-
     files=(
       build-aux/meson/post-install.py
       demos/gtk-demo/geninclude.py
@@ -130,6 +126,8 @@ stdenv.mkDerivation rec {
     docbook_xml_dtd_43
     docbook_xsl
     gtk-doc
+    # For xmllint
+    libxml2
   ];
 
   buildInputs = [

From ad344c1529341186196f95ea875bba8fff725b6f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 20 Sep 2020 17:24:43 +0300
Subject: [PATCH 0203/3942] gusb: 0.3.3 -> 0.3.5

---
 pkgs/development/libraries/gusb/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 204c9d8dd743..a2e157691459 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -1,20 +1,26 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobject-introspection
-, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44
+, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3
 , glib, systemd, libusb1, vala, hwdata
 }:
+
+let
+  pythonEnv = python3.withPackages(ps: with ps; [
+    setuptools
+  ]);
+in
 stdenv.mkDerivation rec {
   pname = "gusb";
-  version = "0.3.3";
+  version = "0.3.5";
 
   outputs = [ "bin" "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
-    sha256 = "14pbd0812151ga7jrpzi88fcrwkckx6m07ay84l7dzkxbdc44fgr";
+    sha256 = "1pv5ivbwxb9anq2j34i68r8fgs8nwsi4hmss7h9v1i3wk7300ajv";
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext
+    meson ninja pkgconfig gettext pythonEnv
     gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44
     gobject-introspection vala
   ];

From 10944d9701efb509d31bcee45c3213081d364cdd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 20 Sep 2020 18:54:22 +0300
Subject: [PATCH 0204/3942] vala_0_48: 0.48.7 -> 0.48.9

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

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 3b4cd1a5a790..1964d74cf3af 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -123,8 +123,8 @@ in rec {
   };
 
   vala_0_48 = generic {
-    version = "0.48.7";
-    sha256 = "0lswkb7gj0chas9n3l3dbrm9l71hs77adhvm2v600id2ipi37pi8";
+    version = "0.48.9";
+    sha256 = "1agyrvslv2yh9ikiw7k5nw6j6il1l2zrzfan0pzdpb9xpg9idslw";
   };
 
   vala = vala_0_48;

From 431c2c3faf242ea21d459b75a431d7d87ab00f1d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 3 Jul 2020 14:05:30 -0400
Subject: [PATCH 0205/3942] libhandy: 0.0.13 -> 1.0.0

* adapt for the move under the gnome project
  The gnome team now maintains this
* format
* cleanup meson flags
  The auto features are enabled automatically
* drop gnome3.gnome-desktop
  It doesn't seem to be neeeded in meson.build

https://gitlab.gnome.org/GNOME/libhandy/-/tags/v0.80.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.81.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.82.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.83.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.84.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.85.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.90.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.91.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/1.0.0
---
 .../libraries/libhandy/default.nix            | 85 ++++++++++++-------
 1 file changed, 54 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index 2923f2da25d0..835eaeac2bf4 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -1,66 +1,89 @@
-{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala
-, gtk-doc, docbook_xsl, docbook_xml_dtd_43
-, gtk3, gnome3, glade
-, dbus, xvfb_run, libxml2
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, gobject-introspection
+, vala
+, gtk-doc
+, docbook_xsl
+, docbook_xml_dtd_43
+, gtk3
+, gnome3
+, glade
+, dbus
+, xvfb_run
+, libxml2
+, gdk-pixbuf
+, librsvg
 , hicolor-icon-theme
 }:
 
 stdenv.mkDerivation rec {
   pname = "libhandy";
-  version = "0.0.13";
+  version = "1.0.0";
 
   outputs = [ "out" "dev" "devdoc" "glade" ];
   outputBin = "dev";
 
-  src = fetchFromGitLab {
-    domain = "source.puri.sm";
-    owner = "Librem5";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    hash = "sha256-qTmFgvR7fXKSBdbqwMBo/vNarySf3Vfuo3JPhRjSZpk=";
   };
 
-  patches = [
-    # Fix build with Glade 3.36.0
-    # https://source.puri.sm/Librem5/libhandy/merge_requests/451
-    (fetchpatch {
-      url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch";
-      sha256 = "0qgh4i0l1028qxqmig4x2c10yj5s80skl70qnc5wnp71s45alvk5";
-      excludes = [ "glade/glade-hdy-header-bar.c" ];
-    })
+  nativeBuildInputs = [
+    docbook_xml_dtd_43
+    docbook_xsl
+    gobject-introspection
+    gtk-doc
+    libxml2
+    meson
+    ninja
+    pkgconfig
+    vala
   ];
 
-  nativeBuildInputs = [
-    meson ninja pkgconfig gobject-introspection vala libxml2
-    gtk-doc docbook_xsl docbook_xml_dtd_43
+  buildInputs = [
+    gdk-pixbuf
+    glade
+    gtk3
+    libxml2
+  ];
+
+  checkInputs = [
+    dbus
+    hicolor-icon-theme
+    xvfb_run
   ];
-  buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ];
-  checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
 
   mesonFlags = [
     "-Dgtk_doc=true"
-    "-Dglade_catalog=enabled"
-    "-Dintrospection=enabled"
   ];
 
+  # Uses define_variable in pkgconfig, but we still need it to use the glade output
   PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
   PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
 
-  doCheck = true;
+  # Bail out! dbind-FATAL-WARNING:
+  # AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown:
+  # The name org.a11y.Bus was not provided by any .service files
+  doCheck = false;
 
   checkPhase = ''
     NO_AT_BRIDGE=1 \
-    XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \
+    XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share"
+    GDK_PIXBUF_MODULE_FILE="${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
     xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
       --config-file=${dbus.daemon}/share/dbus-1/session.conf \
       meson test --print-errorlogs
   '';
 
   meta = with stdenv.lib; {
-    description = "A library full of GTK widgets for mobile phones";
-    homepage = "https://source.puri.sm/Librem5/libhandy";
+    changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}";
+    description = "Building blocks for modern adaptive GNOME apps";
+    homepage = "https://gitlab.gnome.org/GNOME/libhandy";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ jtojnar ];
+    maintainers = teams.gnome.members;
     platforms = platforms.linux;
   };
 }

From f90473785f674c12cad5f1c9b02b66a085a58be4 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 13:08:46 -0400
Subject: [PATCH 0206/3942] libhandy_0: init at 0.0.13

---
 pkgs/development/libraries/libhandy/0.x.nix | 66 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  3 +
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/development/libraries/libhandy/0.x.nix

diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix
new file mode 100644
index 000000000000..2923f2da25d0
--- /dev/null
+++ b/pkgs/development/libraries/libhandy/0.x.nix
@@ -0,0 +1,66 @@
+{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43
+, gtk3, gnome3, glade
+, dbus, xvfb_run, libxml2
+, hicolor-icon-theme
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libhandy";
+  version = "0.0.13";
+
+  outputs = [ "out" "dev" "devdoc" "glade" ];
+  outputBin = "dev";
+
+  src = fetchFromGitLab {
+    domain = "source.puri.sm";
+    owner = "Librem5";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
+  };
+
+  patches = [
+    # Fix build with Glade 3.36.0
+    # https://source.puri.sm/Librem5/libhandy/merge_requests/451
+    (fetchpatch {
+      url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch";
+      sha256 = "0qgh4i0l1028qxqmig4x2c10yj5s80skl70qnc5wnp71s45alvk5";
+      excludes = [ "glade/glade-hdy-header-bar.c" ];
+    })
+  ];
+
+  nativeBuildInputs = [
+    meson ninja pkgconfig gobject-introspection vala libxml2
+    gtk-doc docbook_xsl docbook_xml_dtd_43
+  ];
+  buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ];
+  checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
+
+  mesonFlags = [
+    "-Dgtk_doc=true"
+    "-Dglade_catalog=enabled"
+    "-Dintrospection=enabled"
+  ];
+
+  PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
+  PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
+
+  doCheck = true;
+
+  checkPhase = ''
+    NO_AT_BRIDGE=1 \
+    XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \
+    xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      meson test --print-errorlogs
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A library full of GTK widgets for mobile phones";
+    homepage = "https://source.puri.sm/Librem5/libhandy";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd731dd97561..6426540f5196 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5190,6 +5190,9 @@ in
 
   libhandy = callPackage ../development/libraries/libhandy { };
 
+  # Needed for apps that still depend on the unstable verison of the library (not libhandy-1)
+  libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { };
+
   libgumath = callPackage ../development/libraries/libgumath { };
 
   libinsane = callPackage ../development/libraries/libinsane { };

From ed71430c448bfea2322e406507a8df5dde1bbc58 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 20 Sep 2020 20:53:15 +0300
Subject: [PATCH 0207/3942] sysprof: 3.36.0 -> 3.38.0

---
 .../tools/profiling/sysprof/default.nix            | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index ce7313098822..8fe19b5e31a3 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -2,7 +2,6 @@
 , lib
 , desktop-file-utils
 , fetchurl
-, fetchpatch
 , gettext
 , glib
 , gtk3
@@ -21,24 +20,15 @@
 
 stdenv.mkDerivation rec {
   pname = "sysprof";
-  version = "3.36.0";
+  version = "3.38.0";
 
   outputs = [ "out" "lib" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "024i0gzqnm79rpr4gqxdvcj6gvf82xdlcp2p1k9ikcppmi6xnw46";
+    sha256 = "1kj1yb7sfd874jm0666cnf5lc0c83gxhsdqhjic6ykppqa6p5kcb";
   };
 
-  patches = [
-    # Fix 32-bit builds
-    # https://gitlab.gnome.org/GNOME/sysprof/merge_requests/24
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/sysprof/commit/5dea152c7728f5a37370ad8a229115833e36b4f6.patch";
-      sha256 = "0c76s7r329pbdlmgvm3grn89iylrxv5wg87craqp937nwk3wb80g";
-    })
-  ];
-
   nativeBuildInputs = [
     desktop-file-utils
     gettext

From 37f72d1ad63296239f1b6f5791ced25a25785312 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 20 Sep 2020 20:56:43 +0300
Subject: [PATCH 0208/3942] libsoup: 2.70.0 -> 2.72.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It adds support for profiling using Sysprof but we do not support Sysprof on Darwin
so we need to disable it there. Otherwise it breaks eval of Darwin package set
through “sysprof ← libsoup ← inkscape” chain.
---
 .../development/libraries/libsoup/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index a497661725b1..d316df15643b 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3
+{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, sysprof
 , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
 , libpsl, python3, brotli }:
 
 stdenv.mkDerivation rec {
   pname = "libsoup";
-  version = "2.70.0";
+  version = "2.72.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0hjk9lgppc5435my0lyywbpmj7ib5vvcylwfin8ki97g9bvj1c2l";
+    sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p";
   };
 
   postPatch = ''
@@ -17,7 +17,14 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ python3 sqlite libpsl brotli ];
+  buildInputs = [
+    python3
+    sqlite
+    libpsl
+    brotli
+  ] ++ lib.optionals stdenv.isLinux [
+    sysprof
+  ];
   nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ];
   propagatedBuildInputs = [ glib libxml2 ];
 
@@ -27,6 +34,8 @@ stdenv.mkDerivation rec {
     "-Dvapi=enabled"
     "-Dgnome=${if gnomeSupport then "true" else "false"}"
     "-Dntlm=disabled"
+  ] ++ lib.optionals (!stdenv.isLinux) [
+    "-Dsysprof=disabled"
   ];
 
   doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200)
@@ -41,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "HTTP client/server library for GNOME";
     homepage = "https://wiki.gnome.org/Projects/libsoup";
-    license = stdenv.lib.licenses.gpl2;
+    license = stdenv.lib.licenses.lgpl2Plus;
     inherit (glib.meta) maintainers platforms;
   };
 }

From cdc3ce564d290992dcbb5ac726300ef80fce9e0a Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 14:40:34 -0400
Subject: [PATCH 0209/3942] gnome-tour: 0.0.1 -> 3.38.0

* updateScript
* use rust vendor (there's actually no isuse with doing that)
* add libhandy
* Values from /etc/os-release are now used (https://gitlab.gnome.org/GNOME/gnome-tour/-/issues/10)

Signed-off-by: Jan Tojnar <jtojnar@gmail.com>
---
 .../gnome-3/core/gnome-tour/default.nix       | 38 ++++++++-----------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
index 719e97647f7a..ec2007e0ee4a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
@@ -3,7 +3,7 @@
 , gettext
 , meson
 , ninja
-, fetchFromGitLab
+, fetchurl
 , pkg-config
 , gtk3
 , glib
@@ -13,34 +13,26 @@
 , wrapGAppsHook
 , python3
 , gnome3
-, config
+, libhandy
+, librsvg
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "gnome-tour";
-  version = "0.0.1";
+  version = "3.38.0";
 
-  # We don't use the uploaded tar.xz because it comes pre-vendored
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = "gnome-tour";
-    rev = version;
-    sha256 = "0lbkspnlziq3z177071w3jpghmdwflzra1krdwchzmkfmrhy50ch";
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    hash = "sha256-hV/C/Lyz6e9zhe3FRw4Sox5gMqThDP57wVCTgcekjng=";
   };
 
-  cargoSha256 = "0k1wp9wswr57fv2d9bysxn97fchd4vz29n5r8gfyp0gcm8rclmij";
-
-  mesonFlags = [
-    "-Ddistro_name=NixOS"
-    "-Ddistro_icon_name=nix-snowflake"
-    "-Ddistro_version=20.09"
-  ];
+  cargoVendorDir = "vendor";
 
   nativeBuildInputs = [
     appstream-glib
     desktop-file-utils
     gettext
+    glib # glib-compile-resources
     meson
     ninja
     pkg-config
@@ -52,6 +44,8 @@ rustPlatform.buildRustPackage rec {
     gdk-pixbuf
     glib
     gtk3
+    libhandy
+    librsvg
   ];
 
   # Don't use buildRustPackage phases, only use it for rust deps setup
@@ -65,11 +59,11 @@ rustPlatform.buildRustPackage rec {
     patchShebangs build-aux/meson_post_install.py
   '';
 
-  # passthru = {
-  #   updateScript = gnome3.updateScript {
-  #     packageName = pname;
-  #   };
-  # };
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = "https://gitlab.gnome.org/GNOME/gnome-tour";

From dde31ed48ede3ca60ee59988548dd7169c8c8806 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 21 Sep 2020 00:46:56 +0300
Subject: [PATCH 0210/3942] gjs: 1.64.4 -> 1.66.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Installed tests execdir was moved: https://gitlab.gnome.org/GNOME/gjs/-/issues/318

Changelogs:
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.1.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.2.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.3.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.4.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.90.news
    - libsysprof-capture-4 ← libsysprof-capture-3
        - We did not depend on it previously either.
    - SpiderMonkey 78
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.91.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.65/gjs-1.65.92.news
- https://ftp.gnome.org/pub/GNOME/sources/gjs/1.66/gjs-1.66.0.news

Changes reviewed by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/development/libraries/gjs/default.nix    | 20 +++++++++----------
 .../libraries/gjs/installed-tests-path.patch  | 12 +++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index 1cad5c0deb96..0630a6aed95e 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -8,7 +8,7 @@
 , gtk3
 , atk
 , gobject-introspection
-, spidermonkey_68
+, spidermonkey_78
 , pango
 , cairo
 , readline
@@ -29,11 +29,11 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "gjs";
-  version = "1.64.4";
+  version = "1.66.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0k6l2qc2vkws34zrgdhl57qxf0jjkar2iziz6qn4n1w7va73mk53";
+    sha256 = "1y5m7as3jwhb3svb4xgk443hyxhijralk5q5s3ywidkd047gj37k";
   };
 
   outputs = [ "out" "dev" "installedTests" ];
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
     gobject-introspection
     cairo
     readline
-    spidermonkey_68
+    spidermonkey_78
     dbus # for dbus-run-session
   ];
 
@@ -88,22 +88,22 @@ in stdenv.mkDerivation rec {
     # in the GIR files. When running tests, the library is not yet installed,
     # though, so we need to replace the absolute path with a local one during build.
     # We are using a symlink that will be overridden during installation.
-    mkdir -p $out/lib $installedTests/libexec/gjs/installed-tests
+    mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs
     ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0
-    ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/gjs/installed-tests/libgimarshallingtests.so
-    ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/gjs/installed-tests/libregress.so
-    ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/gjs/installed-tests/libwarnlib.so
+    ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so
+    ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so
+    ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so
   '';
 
   postInstall = ''
-    # TODO: make the glib setup hook handle this
+    # TODO: make the glib setup hook handle moving the schemas in other outputs.
     installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/${pname}-${version}"
     mkdir -p "$installedTestsSchemaDatadir"
     mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir"
   '';
 
   postFixup = ''
-    wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \
+    wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \
       --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \
       --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}"
   '';
diff --git a/pkgs/development/libraries/gjs/installed-tests-path.patch b/pkgs/development/libraries/gjs/installed-tests-path.patch
index f9b1515b68e3..09cd8eaff434 100644
--- a/pkgs/development/libraries/gjs/installed-tests-path.patch
+++ b/pkgs/development/libraries/gjs/installed-tests-path.patch
@@ -1,22 +1,22 @@
 diff --git a/installed-tests/meson.build b/installed-tests/meson.build
-index 7e842025..1e5029e0 100644
+index 04c7910f..9647908c 100644
 --- a/installed-tests/meson.build
 +++ b/installed-tests/meson.build
 @@ -1,7 +1,7 @@
  ### Installed tests ############################################################
  
--installed_tests_execdir = get_option('prefix') / pkglibexecdir / 'installed-tests'
+-installed_tests_execdir = get_option('prefix') / get_option('libexecdir') / 'installed-tests' / meson.project_name()
 -installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name()
-+installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / meson.project_name() / 'installed-tests'
++installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name()
 +installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name()
  
  # Simple shell script tests #
  
 diff --git a/meson.build b/meson.build
-index 084d5396..e5d73fcd 100644
+index 9ab29475..42ffe07f 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -540,7 +540,7 @@ install_data('installed-tests/extra/lsan.supp',
+@@ -557,7 +557,7 @@ install_data('installed-tests/extra/lsan.supp',
      install_dir: get_option('datadir') / api_name / 'lsan')
  
  if get_option('installed_tests')
@@ -26,7 +26,7 @@ index 084d5396..e5d73fcd 100644
      meson.add_install_script('build/compile-gschemas.py', schemadir)
  endif
 diff --git a/meson_options.txt b/meson_options.txt
-index 66f66024..008687cb 100644
+index 825ba77a..21f0323c 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false,

From 11053b6fd1fd55e5a95823916683e75dc5195d9d Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Wed, 19 Aug 2020 18:34:04 +0100
Subject: [PATCH 0211/3942] cogl: 1.22.6 -> 1.22.8

The dropped patch is now included in the upstream release.

https://gitlab.gnome.org/GNOME/cogl/-/blob/1.22.8/NEWS
---
 pkgs/development/libraries/cogl/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 08b3b96784a9..f2a69e87d85e 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -7,11 +7,11 @@ let
   pname = "cogl";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "1.22.6";
+  version = "1.22.8";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd";
+    sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8";
   };
 
   patches = [
@@ -29,12 +29,6 @@ in stdenv.mkDerivation rec {
       url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056";
       sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490";
     })
-
-    # Fix build with libglvnd headers (these headers used to be provided by mesa)
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/cogl/commit/9c4764224aded552fb855b1c2b85b26d2b894adf.patch";
-      sha256 = "1v9drpzgcd5pq2shhdcw5px7mdiggk6ga13qjbklq8xpd92ac0i1";
-    })
   ];
 
   outputs = [ "out" "dev" ];

From b49e45e8dbd67494dd96855a01246960b4b6e539 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Wed, 19 Aug 2020 19:46:46 +0100
Subject: [PATCH 0212/3942] gnome-online-accounts: 3.36.0 -> 2.37.90

https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/blob/3.37.90/NEWS
---
 pkgs/development/libraries/gnome-online-accounts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix
index 7b254b922bcc..b8369db59fbc 100644
--- a/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/pkgs/development/libraries/gnome-online-accounts/default.nix
@@ -30,7 +30,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-online-accounts";
-  version = "3.36.0";
+  version = "3.37.90";
 
   # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
   src = fetchFromGitLab {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "GNOME";
     repo = "gnome-online-accounts";
     rev = version;
-    sha256 = "15j3xh93rqjphjw56j00g40m684nr4zy3hs7dsngm6a21l87fkfd";
+    sha256 = "05ahib6bjbfyj2gbqjijzg9i7x1q0r67hyph0fbrgnnadlpk2cv8";
   };
 
   outputs = [ "out" "man" "dev" "devdoc" ];

From f6c93ff4dd1354de2fc07cb6f1f073f0838b2616 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Wed, 19 Aug 2020 19:59:50 +0100
Subject: [PATCH 0213/3942] gnome3.adwaita-icon-theme: 3.36.1 -> 3.38.0

https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 68c09cc9180c..fa489e7695c1 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "adwaita-icon-theme";
-  version = "3.36.1";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0kgiq712lfidd81yzx0yk7qwlj3q8cymp6npnxyzsk844y353674";
+    sha256 = "15xgz9wzk07442x3s3052as95g0223z4pp9qlsgcs323yama30v6";
   };
 
   # For convenience, we can specify adwaita-icon-theme only in packages

From eb0d0182235285f859786e72a43130d3310f0454 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 15:33:17 +0100
Subject: [PATCH 0214/3942] gnome3.gnome-desktop: 3.36.5 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-desktop/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index e558eb66d40f..8e0311e5967c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib
+{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, gnome3, gtk3, glib
 , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland
 , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-desktop";
-  version = "3.36.5";
+  version = "3.38.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0lxpgb199hn37vq822qg9g43pwixbki3x5lkazqa77qhjhlj98gf";
+    sha256 = "143bvnsqdx8wy8bz6k836zv9rndvskaqb8x4b5b5grbgqvivp788";
   };
 
   nativeBuildInputs = [
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     gtk-doc docbook_xsl glib
   ];
   buildInputs = [
-    libX11 bubblewrap xkeyboard_config isocodes wayland
+    bubblewrap xkeyboard_config isocodes wayland
     gtk3 glib libseccomp systemd
   ];
 

From 727fc5249ac60a9ea6dd1b76a6f5aa6f4642fa4b Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 20 Aug 2020 14:24:51 +0100
Subject: [PATCH 0215/3942] gnome3.gnome-clocks: 3.36.2 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-clocks/-/blob/3.80/NEWS
---
 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 5e3ff58b2901..1ffd15cfc14f 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-clocks";
-  version = "3.36.2";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1rjicycgh9jvkqir2m8hx9m4jlaa3w5lqs43k185wa0zxhi1n6zi";
+    sha256 = "0f24g76ax59qnms1rjfyf1i0sa84nadgbr0r6m26p90w1w2wnmnr";
   };
 
   nativeBuildInputs = [

From 920b91d760ee73dd17058221ce2e06d85f0d38db Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 20 Aug 2020 15:35:57 +0100
Subject: [PATCH 0216/3942] gnome3.evolution-data-server: 3.36.5 -> 3.38.0

https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/3.38.0/NEWS
---
 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 721b38d85641..4c2b8fa2bc12 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.36.5";
+  version = "3.38.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1nbzzqxlck3jz42wnxl281yfzpylcvbsbb0fvkh7nibdaj654mf5";
+    sha256 = "1bxh2gdjr6nh5l629ncygfazj2sbqbv5xc7ksp20cn3namxrls0k";
   };
 
   patches = [

From 3d11dd8fad9c1a735b798e31388fcc5457a8d69b Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 20 Aug 2020 15:38:49 +0100
Subject: [PATCH 0217/3942] gnome3.gnome-settings-daemon: 3.36.1 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/blob/GNOME_SETTINGS_DAEMON_3_38_0/NEWS
---
 pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index 2ee07fb09aa8..1dee170bd0a2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -40,11 +40,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-settings-daemon";
-  version = "3.36.1";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0jzf2nznpcrjqq7fjwk66kw8a6x87kgbdjidc2msaqmm379xncry";
+    sha256 = "0bkrsqzyrxvnw2x1p2a67k3f692ih3i5pafnxqn1kbcsmdgmpvdp";
   };
 
   patches = [

From c085cd90e5b812e65f1436e9fd271ad7bd867512 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 20 Aug 2020 15:40:13 +0100
Subject: [PATCH 0218/3942] gnome3.yelp-xsl: 3.36.0 -> 3.38.0

https://gitlab.gnome.org/GNOME/yelp-xsl/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 09019e6758c1..91ba11947de2 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "yelp-xsl";
-  version = "3.36.0";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag";
+    sha256 = "1mxhg9z1drzjd9j3ykyjxw26pa8m00ppp36ifi0khmac3h0w5g0k";
   };
 
   nativeBuildInputs = [

From 4269abc2646e4652182b019fdc103395a58f12f3 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 20 Aug 2020 15:41:21 +0100
Subject: [PATCH 0219/3942] yelp-tools: 3.32.2 -> 3.38.0

https://gitlab.gnome.org/GNOME/yelp-tools/-/blob/3.38.0/NEWS
---
 pkgs/development/misc/yelp-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix
index 7714ef046b7b..19e345b3c2fd 100644
--- a/pkgs/development/misc/yelp-tools/default.nix
+++ b/pkgs/development/misc/yelp-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "yelp-tools";
-  version = "3.32.2";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q";
+    sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30";
   };
 
   passthru = {

From 9b296eb146637f7b2ae7bcd4da2dc497f4919056 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 20 Aug 2020 15:44:51 +0100
Subject: [PATCH 0220/3942] libdazzle: 3.36.0 -> 3.38.0

https://gitlab.gnome.org/GNOME/libdazzle/-/blob/3.38.0/NEWS
---
 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 5351b2c9fcbd..6c430682251f 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -3,14 +3,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libdazzle";
-  version = "3.36.0";
+  version = "3.38.0";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0n6r16a07in82cnzw91vl675pbjzbvazkxwbqxq2kihganzipcw2";
+    sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1";
   };
 
   nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ];

From 719892a69a304f3794ac72b7a9ed9f6154abe409 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 20 Aug 2020 15:49:22 +0100
Subject: [PATCH 0221/3942] gnome3.mutter: 3.36.5 -> 3.38.0

https://gitlab.gnome.org/GNOME/mutter/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/mutter/default.nix        |  4 ++--
 .../gnome-3/core/mutter/drop-inheritable.patch       | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 79cbbb9f5a8c..28e8608db4f4 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -42,13 +42,13 @@
 
 let self = stdenv.mkDerivation rec {
   pname = "mutter";
-  version = "3.36.5";
+  version = "3.38.0";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1py7sqrpvg2qvswxclshysx7hd9jk65i6cwqsagd6rg6rnjhblp0";
+    sha256 = "1aqfv7f3vsjghjy5bk50ck1pi92hc3368mgsnvlx719020yx33h5";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch b/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch
index 1600db1e705b..7374e1b86935 100644
--- a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch
+++ b/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch
@@ -102,18 +102,18 @@ index 7f4f666d2..b27968f13 100644
  #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND)
  #include <systemd/sd-login.h>
  #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */
-@@ -673,6 +677,12 @@ meta_run (void)
-   if (!meta_display_open ())
-     meta_exit (META_EXIT_ERROR);
- 
+@@ -670,5 +674,12 @@ int
+ meta_run (void)
+ {
+   meta_start ();
++
 +#ifdef HAVE_LIBCAPNG
 +  capng_clear(CAPNG_SELECT_BOTH);
 +  capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE);
 +  capng_apply(CAPNG_SELECT_BOTH);
 +#endif
 +
-   g_main_loop_run (meta_main_loop);
- 
+   meta_run_main_loop ();
    meta_finalize ();
 diff --git a/src/meson.build b/src/meson.build
 index 90d80734f..a9fffa2c2 100644

From a17b2aa43dc69c1e0a3588a1966ee14daa6ddbb5 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 15:34:06 +0100
Subject: [PATCH 0222/3942] gnome3.gnome-shell: 3.36.5 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/3.38.0/NEWS

- Screencasting service has been factored out:
  https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1372
---
 .../gnome-3/core/gnome-shell/default.nix      | 24 ++++++++++---------
 .../gnome-3/core/gnome-shell/fix-paths.patch  |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 8f2e78c639c2..4d578160c8cb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -51,6 +51,7 @@
 , gtk3
 , sassc
 , systemd
+, pipewire
 , gst_all_1
 , adwaita-icon-theme
 , gnome-bluetooth
@@ -67,13 +68,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gnome-shell";
-  version = "3.36.5";
+  version = "3.38.0";
 
   outputs = [ "out" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1hj7gmjmy92xndlgw7pzk5m6j2fbzcgfd1pxc32k38gml8qg19d4";
+    url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "15qabakial0jcsqkq1xg4fsssarixq6aqqksikdfcpl7q0xl09n6";
   };
 
   patches = [
@@ -84,13 +85,6 @@ stdenv.mkDerivation rec {
       gsettings = "${glib.bin}/bin/gsettings";
     })
 
-    # Install bash-completions to correct prefix.
-    # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/9f1ad5d86ddbabaa840eb2860279d53f4e635453.patch";
-      sha256 = "18amnqw342vllcrjpfcq232z9xr28vgjsf2z8k73xx70nwah7hvz";
-    })
-
     # Use absolute path for libshew installation to make our patched gobject-introspection
     # aware of the location to hardcode in the generated GIR file.
     ./shew-gir-path.patch
@@ -105,6 +99,13 @@ stdenv.mkDerivation rec {
       revert = true;
       sha256 = "14h7ahlxgly0n3sskzq9dhxzbyb04fn80pv74vz1526396676dzl";
     })
+
+    # Remove include of missing file preventing docs from building.
+    # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1448
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/84cff8920509f99be47c017bd8bdf8e45ea90535.patch";
+      sha256 = "9bFfT7bHMdxPjDUvjoIrFQ3eddQv/kXyeTOAM+7eUm8=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -160,6 +161,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
 
     # recording
+    pipewire
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good
@@ -197,7 +199,7 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     # The services need typelibs.
-    for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications; do
+    for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do
       wrapGApp $out/share/gnome-shell/$svc
     done
   '';
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 7b93475619b2..e17a608a2d85 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
@@ -19,8 +19,8 @@
 +        Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
      }
  });
---- a/data/gnome-shell-disable-extensions.service
-+++ b/data/gnome-shell-disable-extensions.service
+--- a/data/org.gnome.Shell-disable-extensions.service
++++ b/data/org.gnome.Shell-disable-extensions.service
 @@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer
  [Service]
  Type=simple

From 493fa5224969559f2bf908d1a34f95639fcb5db8 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 20 Aug 2020 19:08:30 +0100
Subject: [PATCH 0223/3942] gnome3.gnome-session: 3.36.0 -> 3.38.0

* regenerate fix-paths.patch
* set systemd_session to default

https://gitlab.gnome.org/GNOME/gnome-session/-/blob/3.38.0/NEWS
---
 .../gnome-3/core/gnome-session/default.nix       |  6 +++---
 .../gnome-3/core/gnome-session/fix-paths.patch   | 16 +++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index b25688ea5a9d..3be0a51016db 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-session";
-  version = "3.36.0";
+  version = "3.38.0";
 
   outputs = ["out" "sessions"];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0ymvf1bap35348rpjqp63qwnwnnawdwi4snch95zc4n832w3hjym";
+    sha256 = "0rrxjk3vbqy3cdgnl7rw71dvcyrvhwq3m6s53dnkyjxsrnr0xk3v";
   };
 
   patches = [
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  mesonFlags = [ "-Dsystemd=true" ];
+  mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ];
 
   nativeBuildInputs = [
     meson ninja pkgconfig gettext makeWrapper
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
index 2399c656016a..320b3024deee 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
@@ -1,6 +1,8 @@
+diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
+index ddd1a591..46a3488b 100755
 --- a/gnome-session/gnome-session.in
 +++ b/gnome-session/gnome-session.in
-@@ -3,11 +3,13 @@
+@@ -3,17 +3,19 @@
  if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
     [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
     [  -n "$SHELL" ] &&
@@ -12,24 +14,24 @@
 +   ! (echo "$SHELL" | @grep@ -q "nologin"); then
    if [ "$1" != '-l' ]; then
 -    exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
-+    # Make sure the shell actually sets up the environment
++    # Make sure the shell actually sets up the environment.
 +    unset __NIXOS_SET_ENVIRONMENT_DONE
 +    exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'"
    else
      shift
    fi
-@@ -13,7 +13,7 @@
-   fi
  fi
  
--SETTING=$(G_MESSAGES_DEBUG= gsettings get org.gnome.system.locale region)
-+SETTING=$(G_MESSAGES_DEBUG= @gsettings@ get org.gnome.system.locale region)
+-SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region)
++SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region)
  REGION=${SETTING#\'}
  REGION=${REGION%\'}
  
+diff --git a/gnome-session/main.c b/gnome-session/main.c
+index 84edfbe5..e5285489 100644
 --- a/gnome-session/main.c
 +++ b/gnome-session/main.c
-@@ -203,7 +203,7 @@
+@@ -215,7 +215,7 @@ require_dbus_session (int      argc,
          }
          new_argv[i + 2] = NULL;
          

From 937828c2a4e5449188de42d0af7b1c798b05aa8a Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 20 Aug 2020 19:11:06 +0100
Subject: [PATCH 0224/3942] gnome3.yelp: 3.36.0 -> 3.38.0

https://gitlab.gnome.org/GNOME/yelp/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/yelp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 1235447c032a..f70f31b0db89 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "yelp";
-  version = "3.36.0";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "097djjyl096zmicjpxlb858yz6rd5cj813xc8azbxlhsscikwjzx";
+    sha256 = "0n4n9xa39pvy5iwrw3fhyjrqpw6bzxzgmh89y56knldsdl7cxkfp";
   };
 
   nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];

From 57dad9ec8d7a1f26054dd589e6663f132fd4c19c Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 20 Aug 2020 19:57:15 +0100
Subject: [PATCH 0225/3942] gnome3.evince: 3.36.7 -> 3.38.0

https://gitlab.gnome.org/GNOME/evince/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/evince/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 11a5bcbd0f78..a2c7c52a1ccd 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -43,13 +43,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evince";
-  version = "3.36.7";
+  version = "3.38.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0clg9fhgjyj23mmcmw7dp512wzgv5m18fppn05qf1frz7r11mmk5";
+    sha256 = "0j0ry0y9qi1mlm7dcjwrmrw45s1225ri8sv0s9vb8ibm85x8kpr6";
   };
 
   postPatch = ''

From 971d1baa372314845cd58fd32fdd6626c54507db Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Thu, 20 Aug 2020 20:02:36 +0100
Subject: [PATCH 0226/3942] gnome3.nautilus: 3.36.3 -> 3.38.0

https://gitlab.gnome.org/GNOME/nautilus/-/blob/3.37.80/NEWS

- tracker3 program is required for migration of favourites.
---
 .../gnome-3/core/nautilus/default.nix         | 19 +++++++++++++------
 .../gnome-3/core/nautilus/fix-paths.patch     | 13 +++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch

diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 6145178de1e0..aca5a27e6349 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -32,13 +32,24 @@
 
 stdenv.mkDerivation rec {
   pname = "nautilus";
-  version = "3.36.3";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1y0fsd7j48v4qkc051cg41mz7jycgw4vd4g37lw682p7n5xgrjmn";
+    sha256 = "1h6adh474rmjva06g3wcj9g5vrvffi5hkhkfzddg7nzpygwk1wy6";
   };
 
+  patches = [
+    # Allow changing extension directory using environment variable.
+    ./extension_dir.patch
+
+    # Hardcode required paths.
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit tracker;
+    })
+  ];
+
   nativeBuildInputs = [
     desktop-file-utils
     gettext
@@ -86,10 +97,6 @@ stdenv.mkDerivation rec {
     patchShebangs build-aux/meson/postinstall.py
   '';
 
-  patches = [
-    ./extension_dir.patch
-  ];
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch
new file mode 100644
index 000000000000..dc9874359b23
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
+index 28b96c996..0b1fad9ab 100644
+--- a/src/nautilus-tag-manager.c
++++ b/src/nautilus-tag-manager.c
+@@ -962,7 +962,7 @@ child_watch_cb (GPid     pid,
+ static void
+ export_tracker2_data (NautilusTagManager *self)
+ {
+-    gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
++    gchar *argv[] = {"@tracker@/bin/tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+     gint stdout_fd;
+     GPid child_pid;
+     g_autoptr (GError) error = NULL;

From cec6f45ff62324e6c4f0aa67574a52c424168793 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 16:09:11 +0100
Subject: [PATCH 0227/3942] gnome3.gnome-music: 3.36.4.1 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-music/-/blob/3.38.0/NEWS
---
 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 92c40f4a0086..4ec4417e603c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -30,13 +30,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "3.36.4.1";
+  version = "3.38.0";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0zdpjgwf48bqb66wrl6k33pzcmc2g3m1046ma7z8xaj9idpi37jh";
+    sha256 = "01fpmkgqnr8r4dgnvgvhb1k5byihrv4yb4gnp2s123b1wizaj2ip";
   };
 
   nativeBuildInputs = [

From 60ce1c8bef7027a2fffc819342ce1d4ef13064f6 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 16:25:31 +0100
Subject: [PATCH 0228/3942] gnome3.gnome-disk-utility: 3.36.3 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/blob/3.38.0/NEWS
---
 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 40085e501b62..444fcfc4f685 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 {
   pname = "gnome-disk-utility";
-  version = "3.36.3";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0yhnjmjzkixj29vcw6rzaijpg4mlwm2k1kqp4g3hn1xb6qzks0yx";
+    sha256 = "08sj1csd1jsmph2lyw2lpj7jh40236alz56pmf315hwyimkcwd3p";
   };
 
   nativeBuildInputs = [

From 0da84dc12b878d07dfaada9b2aa2ee0085314d11 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 16:27:22 +0100
Subject: [PATCH 0229/3942] gnome3.file-roller: 3.36.3 -> 3.38.0

https://gitlab.gnome.org/GNOME/file-roller/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/apps/file-roller/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 7c518c4acd9f..29e482135a2b 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "file-roller";
-  version = "3.36.3";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1dw1vfnfc44k57b6mip8fv565d2xv5wrigi4js044x3sbl5f2n89";
+    sha256 = "06ikvjjcgb8nxabkn2rywy76a1c7s6w8dszaxvaxldbxarp1qgbj";
   };
 
   LANG = "en_US.UTF-8"; # postinstall.py

From 61c41d85b2c2927320ab612b349a3ec653a0d1ac Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 16:33:20 +0100
Subject: [PATCH 0230/3942] gnome3.gnome-control-center: 3.36.4 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/3.38.0/NEWS
---
 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 ea28d651eba9..4d2e363a1466 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -68,11 +68,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-control-center";
-  version = "3.36.4";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0m7pxjgymc7aqqz0vcmlq91nxnwzd1v7v1gdhrfam49krxmk80mc";
+    sha256 = "1nmi5mf7bffjyb7sd6kcv151j0mfmlqpzy2spaaxhf4wxywbbdpn";
   };
 
   nativeBuildInputs = [

From 9586d1b031137e58d3f5fe56154d0f646e46c211 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 16:35:02 +0100
Subject: [PATCH 0231/3942] gnome3.gnome-calculator: 3.36.0 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-calculator/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index e14d8d136cd8..0c8725f5a366 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-calculator";
-  version = "3.36.0";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1cqd4b25qp1i0p04m669jssg1l5sdapc1mniv9jssvw5r7wk1s52";
+    sha256 = "1zjpbf4ymb9gwn7dkw2akwx6cw5nm2xnwkg1b4jb14h6apzj6blh";
   };
 
   nativeBuildInputs = [

From 58f5bdafd4b333a35bf329bc815f9d234bfc2606 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 16:38:00 +0100
Subject: [PATCH 0232/3942] gnome3.baobab: 3.34.1 -> 3.38.0

https://gitlab.gnome.org/GNOME/baobab/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/baobab/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index dce14d6d1de9..274989bf3b86 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -1,19 +1,19 @@
 { stdenv, gettext, fetchurl, vala, desktop-file-utils
-, meson, ninja, pkgconfig, gtk3, glib, libxml2
+, meson, ninja, pkgconfig, python3, gtk3, glib, libxml2
 , wrapGAppsHook, itstool, gnome3 }:
 
 let
   pname = "baobab";
-  version = "3.34.1";
+  version = "3.38.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1i90gc1cpw5507zn54k46hj4mjgdxsq8cvpnlgxq0ksy2d7iv63z";
+    sha256 = "0ac3fbl15l836yvgw724q4whbkws9v4b6l2xy6bnp0b0g0a6i104";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook python3 ];
   buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ];
 
   doCheck = true;

From 23a439bd245074e9aab32b6cc82bc446ad1572f4 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 16:39:49 +0100
Subject: [PATCH 0233/3942] gnome3.simple-scan: 3.36.4 -> 3.38.0

https://gitlab.gnome.org/GNOME/simple-scan/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index eebd307a3064..dc8e7769e844 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation rec {
   pname = "simple-scan";
-  version = "3.36.4";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "09gmzrlljdqkj3w6wa1c27wypy6j8z9dw3jzv9izfqvp38liibsn";
+    sha256 = "04f30kjbq2dzcy1xr2s9rgy0ww08k3yyz69131xsa0az0gysymj3";
   };
 
   nativeBuildInputs = [

From 4d173cf1a711d6689cdc4b77d710dff26fe00ee1 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 16:52:08 +0100
Subject: [PATCH 0234/3942] gnome3.gnome-photos: 3.34.2 -> 3.37.2

https://gitlab.gnome.org/GNOME/gnome-photos/-/blob/3.37.2/NEWS
---
 pkgs/applications/graphics/gnome-photos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index 337b8f4cba6c..9ce176033af1 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-photos";
-  version = "3.34.2";
+  version = "3.37.2";
 
   outputs = [ "out" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "06ml5sf8xhpan410msqz085hmfc7082d368pb82yq646y9pcfn9w";
+    sha256 = "13wspx5kgnn1ir8q521ja0d21r1dsnh73qb8k27nkgc4zyhmm5fc";
   };
 
   patches = [

From 08e633d354a961d71454413d0caa2b531e86ee47 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 17:03:23 +0100
Subject: [PATCH 0235/3942] gnome3.geary: 3.36.2 -> 3.38.0.1

https://gitlab.gnome.org/GNOME/geary/-/blob/3.38.0.1/NEWS

- add new dependencies gnome3.sound and glade
- include a local copy of the test timeout patch, Debian hasn't yet
  updated theirs
- reformat
- fix build with patch for https://gitlab.gnome.org/GNOME/geary/-/issues/985

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
---
 .../Bump-client-test-timeout-to-300s.patch    |  10 ++
 pkgs/desktops/gnome-3/misc/geary/default.nix  | 104 +++++++++++++++---
 2 files changed, 96 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch

diff --git a/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch b/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch
new file mode 100644
index 000000000000..abd8772cf31e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch
@@ -0,0 +1,10 @@
+diff --git a/test/meson.build b/test/meson.build
+index 6ea5e27a..450c03e3 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -167,4 +167,4 @@ test_integration_bin = executable('test-integration',
+ )
+ 
+ test('engine-tests', test_engine_bin)
+-test('client-tests', test_client_bin)
++test('client-tests', test_client_bin, timeout: 300)
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 0326e38aba76..4625f405c3d9 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,44 +1,112 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
-, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
-, libpeas, libsecret, gmime3, isocodes, libxml2, gettext, fetchpatch
-, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
-, xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking
-, gobject-introspection, gspell, appstream-glib, libytnef, libhandy }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, pkgconfig
+, gtk3
+, vala
+, enchant2
+, wrapGAppsHook
+, meson
+, ninja
+, desktop-file-utils
+, gnome-online-accounts
+, gsettings-desktop-schemas
+, adwaita-icon-theme
+, libpeas
+, libsecret
+, gmime3
+, isocodes
+, libxml2
+, gettext
+, sqlite
+, gcr
+, json-glib
+, itstool
+, libgee
+, gnome3
+, webkitgtk
+, python3
+, xvfb_run
+, dbus
+, shared-mime-info
+, libunwind
+, folks
+, glib-networking
+, gobject-introspection
+, gspell
+, appstream-glib
+, libytnef
+, libhandy
+, gsound
+}:
 
 stdenv.mkDerivation rec {
   pname = "geary";
-  version = "3.36.2";
+  version = "3.38.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "09l2lbcn3ar3scw6iylmdqi1lhpb408iqs6056d0wzx2l9nkmqis";
+    sha256 = "0xbhzjn6sp9qj0iqfgq4q25is3wgjz1c090i8y60azgi9hyjkh79";
   };
 
   nativeBuildInputs = [
-    desktop-file-utils gettext itstool libxml2 meson ninja
-    pkgconfig vala wrapGAppsHook python3 appstream-glib
+    appstream-glib
+    desktop-file-utils
+    gettext
     gobject-introspection
+    itstool
+    libxml2
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala
+    wrapGAppsHook
   ];
 
   buildInputs = [
-    adwaita-icon-theme enchant2 gcr gmime3 gnome-online-accounts
-    gsettings-desktop-schemas gtk3 isocodes json-glib libpeas
-    libgee libsecret sqlite webkitgtk glib-networking
-    libunwind folks gspell libytnef libhandy
+    adwaita-icon-theme
+    enchant2
+    folks
+    gcr
+    glib-networking
+    gmime3
+    gnome-online-accounts
+    gsettings-desktop-schemas
+    gsound
+    gspell
+    gtk3
+    isocodes
+    json-glib
+    libgee
+    libhandy
+    libpeas
+    libsecret
+    libunwind
+    libytnef
+    sqlite
+    webkitgtk
   ];
 
-  checkInputs = [ xvfb_run dbus ];
+  checkInputs = [
+    dbus
+    xvfb_run
+  ];
 
   mesonFlags = [
     "-Dcontractor=true" # install the contractor file (Pantheon specific)
   ];
 
   patches = [
-    # Longer timeout for client test.
+    # https://gitlab.gnome.org/GNOME/geary/-/issues/985
+    # drop in 3.38.1
     (fetchpatch {
-      url = "https://salsa.debian.org/gnome-team/geary/raw/04be1e058a2e65075dd8cf8843d469ee45a9e09a/debian/patches/Bump-client-test-timeout-to-300s.patch";
-      sha256 = "1zvnq8bgla160531bjdra8hcg15mp8r1j1n53m1xfgm0ssnj5knx";
+      url = "https://gitlab.gnome.org/GNOME/geary/-/commit/b5abd3f9664c396ad57f177750973695c58e8b7f.patch";
+      sha256 = "zBPhlz8Zujt9tmZrIUkvZSOpD7/UhTeokE9U/704qSE=";
     })
+
+    # Longer timeout for client test.
+    ./Bump-client-test-timeout-to-300s.patch
   ];
 
   # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see:

From c18b44974514e1547ba84374fdcce1f9c7afea86 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 17:05:27 +0100
Subject: [PATCH 0236/3942] gnome3.gnome-shell-extensions: 3.36.3 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 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 ba1b0faedb20..63971cbc9530 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 {
   pname = "gnome-shell-extensions";
-  version = "3.36.3";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1cg3dqvvxg8zrdqs2rci8sds2hxjahbhm87f0xpy8b3gq56lqrrb";
+    sha256 = "17wisc069xjxfyyihzwci4jmvliby83d7pm716nq5c4qnddzh9pp";
   };
 
   passthru = {

From 3ae75ad4c83531a920c6ad960be982b7bb88c275 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 15:35:59 +0100
Subject: [PATCH 0237/3942] gnome3.eog: 3.36.3 -> 3.38.0

* add libportal dependency

https://gitlab.gnome.org/GNOME/eog/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/eog/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 6ad0834724d1..1e965b80528d 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -8,6 +8,7 @@
 , libxml2
 , libjpeg
 , libpeas
+, libportal
 , gnome3
 , gtk3
 , glib
@@ -27,11 +28,11 @@
 
 stdenv.mkDerivation rec {
   pname = "eog";
-  version = "3.36.3";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1p1lrnsgk5iyw7h02qzax4s74dqqsh5lk85b0qsj7hwx91qm61xp";
+    sha256 = "0qyrs9cp4hsh64jfdpdi2v1hag8izw77qqnsvqwdb33871ya98z1";
   };
 
   nativeBuildInputs = [
@@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libjpeg
+    libportal
     gtk3
     gdk-pixbuf
     glib

From 19fc60226455746102878495e679fd635d6f6c56 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 17:09:53 +0100
Subject: [PATCH 0238/3942] gnome3.seahorse: 3.36.2 -> 3.37.2

* use libhandy_0

https://gitlab.gnome.org/GNOME/seahorse/-/blob/3.37.2/NEWS
---
 pkgs/desktops/gnome-3/apps/seahorse/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 3668fc171b36..370b7a07acf2 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -22,16 +22,16 @@
 , p11-kit
 , openssh
 , gsettings-desktop-schemas
-, libhandy
+, libhandy_0
 }:
 
 stdenv.mkDerivation rec {
   pname = "seahorse";
-  version = "3.36.2";
+  version = "3.37.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "16wmxxppgcgfj8zkagcny5af1c81x32ysm9d6j9f2k7bmik21ss5";
+    hash = "sha256-flpBYSYDDDTONYZuRR3V2sx637Mp1dMQJ79fUGLtRio=";
   };
 
   doCheck = true;
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     openssh
     openldap
     libpwquality
-    libhandy
+    libhandy_0 # not yet ported to libhandy-1
   ];
 
   postPatch = ''

From d15d1faf66f179765b1edfba2dbd9e340a47ab53 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 17:20:12 +0100
Subject: [PATCH 0239/3942] gnome3.gnome-system-monitor: 3.36.1 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/blob/3.38.0/NEWS
---
 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 2dd4ae9e7f7b..d9e652de5f6d 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 {
   pname = "gnome-system-monitor";
-  version = "3.36.1";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "18dwwwmw4m2kzvfmxyaxmnm66d1plwvh6c6naznb0xac1ymlfsw6";
+    sha256 = "1x5gd30g87im7fnqj63njlac69zywfd1r0vgsxkjag2hsns7mgvk";
   };
 
   doCheck = true;

From 269c2ade9737b1c4e0306a2b6f0c513f392c8472 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 17:21:47 +0100
Subject: [PATCH 0240/3942] gnome3.gnome-contacts: 3.36.2 -> 3.38

---
 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 5372552a7208..d9337629b3f9 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-contacts";
-  version = "3.36.2";
+  version = "3.38";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "048l07biy8xrfidfyzrjd5lrnfzqhb767ih2gl7w6c4mmhj4g2dy";
+    sha256 = "f8LuaJwfOcLmN163YLlOFlHOSoKK1AggbToD4TPaGa8=";
   };
 
   propagatedUserEnvPkgs = [ evolution-data-server ];

From f6b85b9f9284ac84d2a3259964703541760ffb73 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 17:31:40 +0100
Subject: [PATCH 0241/3942] gsettings-desktop-schemas: 3.36.1 -> 3.38.0

* add metadata
* reformat

https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/blob/3.38.0/NEWS

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
---
 .../gsettings-desktop-schemas/default.nix     | 50 +++++++++++++------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
index 6a94944e9f18..1032f15196cc 100644
--- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
@@ -1,22 +1,41 @@
-{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection
+{ stdenv
+, fetchurl
+, pkgconfig
+, glib
+, gobject-introspection
 , meson
 , ninja
 , python3
   # just for passthru
-, gnome3 }:
+, gnome3
+}:
 
 stdenv.mkDerivation rec {
   pname = "gsettings-desktop-schemas";
-  version = "3.36.1";
+  version = "3.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1nf97vq07gadwdla6kws8z510xlmv0a7wlyqwwnhyagq7kjdnjq0";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; };
-  };
+  nativeBuildInputs = [
+    glib
+    meson
+    ninja
+    pkgconfig
+    python3
+  ];
+
+  buildInputs = [
+    glib
+    gobject-introspection
+  ];
+
+  postPatch = ''
+    chmod +x build-aux/meson/post-install.py
+    patchShebangs build-aux/meson/post-install.py
+  '';
 
   # meson installs the schemas to share/glib-2.0/schemas
   # We add the override file there too so it will be compiled and later moved by
@@ -32,16 +51,15 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  postPatch = ''
-    chmod +x build-aux/meson/post-install.py
-    patchShebangs build-aux/meson/post-install.py
-  '';
-
-  buildInputs = [ glib gobject-introspection ];
-
-  nativeBuildInputs = [ pkgconfig python3 meson ninja glib ];
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
 
   meta = with stdenv.lib; {
+    description = "Collection of GSettings schemas for settings shared by various components of a desktop";
+    license = licenses.lgpl21Plus;
     maintainers = teams.gnome.members;
   };
 }

From 8ddf4e9bc27dd15afcf02f5fc15f374db84ef79f Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 15:36:46 +0100
Subject: [PATCH 0242/3942] orca: 3.36.5 -> 3.38.0

https://gitlab.gnome.org/GNOME/orca/-/blob/ORCA_3_38_0/NEWS
---
 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 ccb7f3e47c86..29ee6213a650 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -35,13 +35,13 @@
 
 buildPythonApplication rec {
   pname = "orca";
-  version = "3.36.5";
+  version = "3.38.0";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0nyb33p4y6nmln41pi70c8hiyjyasaryy10mazi7b2s6fy9pk25x";
+    sha256 = "1vkg6p1dlrgx1yyscmy0m58inaq4ljshbdxw0nhi1nwqk3bpjchw";
   };
 
   patches = [

From c92d81a115f05dbb279485460da94ac1c4075f02 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 18:25:18 +0100
Subject: [PATCH 0243/3942] gnome3.accerciser: 3.36.3 -> 3.38.0

https://gitlab.gnome.org/GNOME/accerciser/-/blob/3.38.0/NEWS

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
---
 pkgs/desktops/gnome-3/apps/accerciser/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index c0ca54d6fec8..f05eb41d35e2 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -15,15 +15,15 @@
 , adwaita-icon-theme
 }:
 
- python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "accerciser";
-  version = "3.36.3";
+  version = "3.38.0";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0zfhmpaqqwm89k8p4apq4la191icjvqh0097p5aig3yhy87fahp9";
+    sha256 = "0fd9vv2abd2if2qj4nlfy7mpd7rc4sx18zhmxd5ijlnfhkpggbp5";
   };
 
   nativeBuildInputs = [

From 58c74c3cb2049b352940658ed3d35dcd450d9860 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 18:27:05 +0100
Subject: [PATCH 0244/3942] gnome3.evolution: 3.36.5 -> 3.38.0

https://gitlab.gnome.org/GNOME/evolution/-/blob/3.38.0/NEWS
---
 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 f27050cd68f7..9587e992ad5c 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution";
-  version = "3.36.5";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1hpjd5d3z52xcjcc1hg5z8ypnx2y6ml9snyrlpflg9bx16yhxm1x";
+    sha256 = "0pbwjp4bk5bqr90lm5vc609ibs32jfq4xagkljfhabdaah7w877q";
   };
 
   nativeBuildInputs = [

From e586e4da268f6dc4b56053a50546b25f96a80e17 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 15:37:28 +0100
Subject: [PATCH 0245/3942] gnome3.gnome-notes: 3.36.3 -> 3.38.0

* fix build by using libhandy_0

https://gitlab.gnome.org/GNOME/gnome-notes/-/blob/BIJIBEN_3_37_90/NEWS
---
 pkgs/desktops/gnome-3/apps/gnome-notes/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index c32289d70d79..fab4c491a6b5 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
@@ -13,7 +13,7 @@
 , evolution-data-server
 , gnome-online-accounts
 , libuuid
-, libhandy
+, libhandy_0
 , webkitgtk
 , zeitgeist
 , gnome3
@@ -22,16 +22,13 @@
 , tracker
 }:
 
-let
-  version = "3.36.3";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "gnome-notes";
-  inherit version;
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
-    sha256 = "1midnphyg038s94ahhzv0pvbzzzn62ccky28c9nazxqvw4hvdsbh";
+    sha256 = "H/bMCsbGKQe/KgmhchXt0vF7dNrKs6XIminDBJFyvis=";
   };
 
   doCheck = true;
@@ -57,7 +54,7 @@ stdenv.mkDerivation {
     glib
     gtk3
     libuuid
-    libhandy
+    libhandy_0 # doesn't support libhandy-1 yet
     webkitgtk
     tracker
     gnome-online-accounts

From f629e0b14992a845beca722f0162241fff7395b7 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 18:38:36 +0100
Subject: [PATCH 0246/3942] gnome3.polari: 3.36.3 -> 3.38.0

https://gitlab.gnome.org/GNOME/polari/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/apps/polari/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index 514eecc17365..c16b1f2ab124 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "polari";
-  version = "3.36.3";
+  version = "3.38.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0fpmrvhd40yay051bzn4x3gsrzdv42nav0pm5ps0np8wk1z689jg";
+    sha256 = "1l82nmb5qk4h69rsdhzlcmjjdhwh9jzfs4cnw8hy39sg5v9ady1s";
   };
 
   patches = [

From cf5f2212981c097847d9fc7372847b686fefe452 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 18:39:53 +0100
Subject: [PATCH 0247/3942] gnome3.gnome-backgrounds: 3.36.0 -> 3.38.0

---
 pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index e8463c5b704e..8df32a1486eb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-backgrounds";
-  version = "3.36.0";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "02xvfwfi3133mjljl731z2hj9hfmjas3a1jl4fxmy24xrzj83jxq";
+    sha256 = "1qqygm15rcdgm36vz2iy7b9axndjzvpi29lmygyakjc07a3jlwgp";
   };
 
   passthru = {

From 4f2e1353069bf5f252603e233945847c93af0f9c Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 18:42:45 +0100
Subject: [PATCH 0248/3942] gnome3.devhelp: 3.36.2 -> 3.38.0

https://gitlab.gnome.org/GNOME/devhelp/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 11bad7b89d1d..52d0cefdc872 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "devhelp";
-  version = "3.36.2";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0phcjdxnwgg0a0z9kyidp977jy365pny6bh2qhdyzcpvkqqq8nlb";
+    sha256 = "0s938p1snkskn8np5xh5fzp3zrjrnsh99haiz92nvci264bzp3li";
   };
 
   nativeBuildInputs = [

From adee6a827b0428c29a42e2bda35ba767e3ce474f Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 19:29:07 +0100
Subject: [PATCH 0249/3942] gnome3.gnome-maps: 3.36.4 -> 3.38.0

* reformat

https://gitlab.gnome.org/GNOME/gnome-maps/-/blob/v3.38.0/NEWS

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
---
 .../gnome-3/apps/gnome-maps/default.nix       | 74 +++++++++++++++----
 1 file changed, 58 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 57ba6fd0766f..f66b8385da46 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -1,29 +1,71 @@
-{ stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3
-, gobject-introspection, gdk-pixbuf, librsvg, libgweather
-, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup, gsettings-desktop-schemas
-, webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }:
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, gettext
+, python3
+, pkgconfig
+, gnome3
+, gtk3
+, gobject-introspection
+, gdk-pixbuf
+, librsvg
+, libgweather
+, geoclue2
+, wrapGAppsHook
+, folks
+, libchamplain
+, gfbgraph
+, libsoup
+, gsettings-desktop-schemas
+, webkitgtk
+, gjs
+, libgee
+, libhandy
+, geocode-glib
+, evolution-data-server
+, gnome-online-accounts
+}:
 
-let
+stdenv.mkDerivation rec {
   pname = "gnome-maps";
-  version = "3.36.4";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "3.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1ila7li9yi4lyjc84a787qr33wr7ayppphxn451jzg410pfcamhz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "16bzv7qzwbd2av09k1pbhshmj984dkn6y7xzhc16316hxd086xam";
   };
 
   doCheck = true;
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext python3 wrapGAppsHook ];
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkgconfig
+    python3
+    wrapGAppsHook
+  ];
+
   buildInputs = [
+    evolution-data-server
+    folks
+    gdk-pixbuf
+    geoclue2
+    geocode-glib
+    gfbgraph
+    gjs
+    gnome-online-accounts
+    gnome3.adwaita-icon-theme
     gobject-introspection
-    gtk3 geoclue2 gjs libgee folks gfbgraph
-    geocode-glib libchamplain libsoup
-    gdk-pixbuf librsvg libgweather
-    gsettings-desktop-schemas evolution-data-server
-    gnome-online-accounts gnome3.adwaita-icon-theme
+    gsettings-desktop-schemas
+    gtk3
+    libchamplain
+    libgee
+    libgweather
+    libhandy
+    librsvg
+    libsoup
     webkitgtk
   ];
 

From 9582a74fcc9d3997e5f8f20a6aff674476e5abd6 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 19:31:48 +0100
Subject: [PATCH 0250/3942] gnome3.gnome-screenshot: 3.36.0 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-screenshot/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index 2eacfc2de777..05bb189c0e29 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3
+{ stdenv, gettext, libxml2, libhandy, fetchurl, pkgconfig, libcanberra-gtk3
 , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils
 , gnome3, gsettings-desktop-schemas }:
 
 let
   pname = "gnome-screenshot";
-  version = "3.36.0";
+  version = "3.38.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0rhj6fkpxfm26jv3vsn7yb2ybkc2k86ggy23nxa945q74y4msj9k";
+    sha256 = "1h4zsaybjrlkfcrvriyybg4gfr7v9d1ndh2p516k94ad2gfx6mp5";
   };
 
   doCheck = true;
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ];
   buildInputs = [
-    gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme
+    gtk3 glib libcanberra-gtk3 libhandy gnome3.adwaita-icon-theme
     gsettings-desktop-schemas
   ];
 

From 281ac3d3710066d82ba942c9a9584ce40f949864 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 19:37:26 +0100
Subject: [PATCH 0251/3942] vte: 0.60.2 -> 0.62.0

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

diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index 811921df3e7c..ac3d7158178c 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vte";
-  version = "0.60.2";
+  version = "0.62.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m";
+    sha256 = "05mhvcwmini97x1hrjvx1xyqp6bqyglsh6j7yrrwq23zsip28bad";
   };
 
   passthru = {

From 041b5bba4550df1fecac0b1f2af55e080961fee7 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 19:43:21 +0100
Subject: [PATCH 0252/3942] gnome3.gnome-terminal: 3.36.2 -> 3.38.0

---
 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 821d5707c7c9..0f5ae6a97f73 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus
 , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala
-, desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 }:
+, desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2
+, libxslt, docbook-xsl-nons }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-terminal";
-  version = "3.36.2";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0inzmkmxv8xw4px2zjfw7236d08yjcv7znxcjki6dh4pvjivdla1";
+    sha256 = "1xalmvic4h5dgw77h899h6nzyg56bgm1vgk92kbgzil3nflcf3qa";
   };
 
   buildInputs = [
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    pkgconfig gettext itstool which libxml2
+    pkgconfig gettext itstool which libxml2 libxslt docbook-xsl-nons
     vala desktop-file-utils wrapGAppsHook pcre2
   ];
 

From c1307a041a20a93ce7eea0025dd253dc6ed12b39 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 15:39:54 +0100
Subject: [PATCH 0253/3942] webkitgtk: 2.29.91 -> 2.30.0

https://webkitgtk.org/2020/08/14/webkitgtk2.29.90-released.html
https://webkitgtk.org/2020/08/14/webkitgtk2.29.91-released.html
https://webkitgtk.org/2020/07/29/webkitgtk2.29.4-released.html
https://webkitgtk.org/2020/09/11/webkitgtk2.30.0-released.html
---
 pkgs/development/libraries/webkitgtk/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index d60e56763a17..ff5e24624dca 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -49,6 +49,7 @@
 , woff2
 , bubblewrap
 , libseccomp
+, systemd
 , xdg-dbus-proxy
 , substituteAll
 , glib
@@ -62,13 +63,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "webkitgtk";
-  version = "2.28.4";
+  version = "2.30.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "0r4lkk21pny2g4mmsw0ds14m5hhjys1l47gvy59dfgihr7l546c2";
+    sha256 = "04axfmzsb9gnyqaz5v7ljapiycxnzwpiya1l9rhp4c1qsbrdpwya";
   };
 
   patches = optionals stdenv.isLinux [
@@ -140,6 +141,7 @@ stdenv.mkDerivation rec {
   ] ++ optionals stdenv.isLinux [
     bubblewrap
     libseccomp
+    systemd
     wayland
     xdg-dbus-proxy
   ] ++ optional enableGeoLocation geoclue2

From c19cf7a6b9c9d28b129aadb2ea18b378478afe9e Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 20:58:07 +0100
Subject: [PATCH 0254/3942] gnome3.epiphany: 3.36.4 -> 3.38.0

https://gitlab.gnome.org/GNOME/epiphany/-/blob/3.38.0/NEWS

Currently broken :-(, loading google.com shows:

Cannot get default EGL display: EGL_BAD_PARAMETER
Cannot create EGL context: invalid display (last error: EGL_SUCCESS)

This might be related to:

- https://bugs.webkit.org/show_bug.cgi?id=202362
- https://bugs.webkit.org/show_bug.cgi?id=201507

Also this seems to happen to me even before the package update.
---
 pkgs/desktops/gnome-3/core/epiphany/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index ad2d67972a97..9b99cb0b91f5 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -9,6 +9,7 @@
 , icu
 , wrapGAppsHook
 , gnome3
+, libportal
 , libxml2
 , libxslt
 , itstool
@@ -35,11 +36,11 @@
 
 stdenv.mkDerivation rec {
   pname = "epiphany";
-  version = "3.36.4";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1gs2a94fzpciv58rljgbirsc2kqgiaiyc2yg6ff50nlgb2qpb2jq";
+    sha256 = "0ln5i5wnyi1qbx5awz513sdxx2x8nn0nrk2yvgj431bzgh6q53i2";
   };
 
   # Tests need an X display
@@ -80,6 +81,7 @@ stdenv.mkDerivation rec {
     json-glib
     libdazzle
     libhandy
+    libportal
     libnotify
     libsecret
     libsoup

From 7206a1426036f26623cbbb017bb6571b33ac804f Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 21:11:26 +0100
Subject: [PATCH 0255/3942] amtk: add gobject-introspection to generate the
 bindings

This is now needed by the development version of tepl.
---
 pkgs/development/libraries/amtk/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix
index b33c45adb41c..db97b0aa6f55 100644
--- a/pkgs/development/libraries/amtk/default.nix
+++ b/pkgs/development/libraries/amtk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gtk3
-, pkgconfig, gnome3, dbus, xvfb_run }:
+, pkgconfig, gobject-introspection, gnome3, dbus, xvfb_run }:
 let
   version = "5.1.1";
   pname = "amtk";
@@ -14,6 +14,7 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [
     pkgconfig
     dbus
+    gobject-introspection
   ];
 
   buildInputs = [

From ca51986f03c3353044b4030dd1c0122dc5202f9e Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 21:11:55 +0100
Subject: [PATCH 0256/3942] tepl: 4.4.0 -> 5.0.0

---
 pkgs/development/libraries/tepl/default.nix | 35 ++++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix
index 008f0f5b424e..aa055b2dc279 100644
--- a/pkgs/development/libraries/tepl/default.nix
+++ b/pkgs/development/libraries/tepl/default.nix
@@ -1,28 +1,39 @@
-{ stdenv, fetchurl
-, amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
-let
-  version = "4.4.0";
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, amtk
+, gnome3
+, gobject-introspection
+, gtk3
+, gtksourceview4
+, icu
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
   pname = "tepl";
-in stdenv.mkDerivation {
-  name = "${pname}-${version}";
+  version = "5.0.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0mm2z849hnni7597an05mrv0dckrxjngpf2xfa0g5s17i8x6gxp6";
+    sha256 = "0x2s0ks575b57jdqnp9r9miz40pm705n2dlj2k8bfj1hyl22kgf6";
   };
 
   nativeBuildInputs = [
-    pkgconfig
+    meson
+    ninja
+    gobject-introspection
+    pkg-config
   ];
 
   buildInputs = [
-    libxml2
+    icu
   ];
 
   propagatedBuildInputs = [
     amtk
     gtksourceview4
-    libuchardet
     gtk3
   ];
 
@@ -38,8 +49,8 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = "https://wiki.gnome.org/Projects/Tepl";
     description = "Text editor product line";
-    maintainers = [ maintainers.manveru ];
-    license = licenses.lgpl21Plus;
+    maintainers = teams.gnome.members ++ [ maintainers.manveru ];
+    license = licenses.lgpl3Plus;
     platforms = platforms.linux;
   };
 }

From 37405d384a6c5bd0d533191aea12780762cb5a45 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 21 Aug 2020 21:12:22 +0100
Subject: [PATCH 0257/3942] gnome3.gedit: 3.36.2 -> 3.38.0

* Add vala for vapigen
* reformat

https://gitlab.gnome.org/GNOME/gedit/-/blob/3.38.0/NEWS

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
---
 pkgs/desktops/gnome-3/apps/gedit/default.nix | 53 +++++++++++++++-----
 1 file changed, 40 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index ea33bc29324f..78dc7623e34e 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -1,29 +1,56 @@
-{ stdenv, meson, fetchurl, python3
-, pkgconfig, gtk3, glib, adwaita-icon-theme
-, libpeas, gtksourceview4, gsettings-desktop-schemas
-, wrapGAppsHook, ninja, libsoup, tepl
-, gnome3, gspell, perl, itstool, desktop-file-utils
+{ stdenv
+, meson
+, fetchurl
+, python3
+, pkgconfig
+, gtk3
+, glib
+, adwaita-icon-theme
+, libpeas
+, gtksourceview4
+, gsettings-desktop-schemas
+, wrapGAppsHook
+, ninja
+, libsoup
+, tepl
+, gnome3
+, gspell
+, perl
+, itstool
+, desktop-file-utils
+, vala
 }:
 
 stdenv.mkDerivation rec {
   pname = "gedit";
-  version = "3.36.2";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "15s1almlhjlgl3m8lxg6jpzln8jhgdxxjr635a3b7cf58d35b1v8";
+    sha256 = "1y2n3325qvfiaz526vdf7l5wbh5js25djkz3jmg6x3z5dn00dks6";
   };
 
   nativeBuildInputs = [
-    pkgconfig wrapGAppsHook meson ninja
-    python3 perl itstool desktop-file-utils
+    desktop-file-utils
+    itstool
+    meson
+    ninja
+    perl
+    pkgconfig
+    python3
+    vala
+    wrapGAppsHook
   ];
 
   buildInputs = [
-    gtk3 glib
-    adwaita-icon-theme libsoup
-    libpeas gtksourceview4
-    gsettings-desktop-schemas gspell
+    adwaita-icon-theme
+    glib
+    gsettings-desktop-schemas
+    gspell
+    gtk3
+    gtksourceview4
+    libpeas
+    libsoup
     tepl
   ];
 

From 7e406e74201825ca810aa35d245ec508b45b4652 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:25:36 +0100
Subject: [PATCH 0258/3942] gnome3.gnome-boxes: 3.36.6 -> 3.38.0

Use tracker-2 and libhandy_0. Add appstream-glib for appstream-util.

Add new dependencies:
- libhandy
- gtksourceview4

https://gitlab.gnome.org/GNOME/gnome-boxes/-/blob/v3.38.0/NEWS
---
 .../gnome-3/apps/gnome-boxes/default.nix       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 4acc687da8ba..8d2997ea3f38 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -11,17 +11,20 @@
 , gobject-introspection
 , libxml2
 , gtk3
+, gtksourceview4
 , gtk-vnc
 , freerdp
 , libvirt
 , spice-gtk
 , python3
+, appstream-glib
 , spice-protocol
+, libhandy_0
 , libsoup
 , libosinfo
 , systemd
-, tracker
-, tracker-miners
+, tracker_2
+, tracker-miners-2
 , vala
 , libcap
 , yajl
@@ -51,16 +54,17 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-boxes";
-  version = "3.36.6";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0c3cw90xqqcpacc2z06ljs0gg8saxizfgjzg9alhpwgz3gl4c5pg";
+    sha256 = "12x38780j52bv46q2i6468va1zww28mmy83rasbl3y8sqagmjsv9";
   };
 
   doCheck = true;
 
   nativeBuildInputs = [
+    appstream-glib # for appstream-util
     desktop-file-utils
     gettext
     gobject-introspection
@@ -89,12 +93,14 @@ stdenv.mkDerivation rec {
     gnome3.adwaita-icon-theme
     gtk-vnc
     gtk3
+    gtksourceview4
     json-glib
     libapparmor
     libarchive
     libcap
     libcap_ng
     libgudev
+    libhandy_0
     libosinfo
     librsvg
     libsecret
@@ -107,8 +113,8 @@ stdenv.mkDerivation rec {
     spice-gtk
     spice-protocol
     systemd
-    tracker
-    tracker-miners
+    tracker_2
+    tracker-miners-2
     vte
     webkitgtk
     xen

From 00fa875eb4f7ae1d3075dac4eb1cf0d61d8d56ac Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:29:47 +0100
Subject: [PATCH 0259/3942] gnome3.four-in-a-row: 3.36.4 -> 3.38.0

---
 pkgs/desktops/gnome-3/games/four-in-a-row/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 3960f233003c..d25db1cfc070 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "four-in-a-row";
-  version = "3.36.4";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1y1ihh72zk0bgyj197dpwgwj1q91dhvp0rasrib8k18sisrdq31h";
+    sha256 = "0bjc6ay7jya0l7c2mha71i7kj1wianij1fim48qzjr3675s5g8yw";
   };
 
   nativeBuildInputs = [

From 24d3f90c8dedb113200473f639d2f1fe0ccdfc41 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:30:05 +0100
Subject: [PATCH 0260/3942] gnome3.gnome-chess: 3.36.1 -> 3.38.0

---
 pkgs/desktops/gnome-3/games/gnome-chess/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index 7747676f09e3..d2f9cfaa2dd1 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-chess";
-  version = "3.36.1";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "165bk8s3nngyqbikggspj4rff5nxxfkfcmgzjb4grmsrgbqwk5di";
+    sha256 = "10y248xdjx9b0izxii9fjyvkra65jxfx66ivwznmn0cadda9gdqg";
   };
 
   nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];

From a0024ddc42cb094170a7cd0a82e2b3be519b28de Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:30:22 +0100
Subject: [PATCH 0261/3942] gnome3.gnome-klotski: 3.36.3 -> 3.38.0

---
 pkgs/desktops/gnome-3/games/gnome-klotski/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index eb6f4b10dbd6..2cec028d5075 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "gnome-klotski";
-  version = "3.36.3";
+  version = "3.38.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0fj1hlkqpjdb4hxd0di16ahm5j2r5j218ckyk88pmhjf8whb2g6z";
+    sha256 = "08mcgwjfgi2fsfargidvl0328w22v3ax9rvjh8mkp5d70zvbb0l2";
   };
 
   nativeBuildInputs = [

From 9d016e63937b71935de0d23c1ad537c53b450365 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:30:47 +0100
Subject: [PATCH 0262/3942] gnome3.gnome-mahjongg: 3.36.2 -> 3.38.1

Changelogs:
- https://ftp.gnome.org/pub/GNOME/sources/gnome-mahjongg/3.38/gnome-mahjongg-3.38.0.news
- https://ftp.gnome.org/pub/GNOME/sources/gnome-mahjongg/3.38/gnome-mahjongg-3.38.1.news

Signed-off-by: Jan Tojnar <jtojnar@gmail.com>
---
 .../gnome-3/games/gnome-mahjongg/default.nix  | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index fc706b89f1dc..5a0a5873e26d 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -1,41 +1,45 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
 , librsvg, gettext, itstool, libxml2
-, meson, ninja, python3, vala, desktop-file-utils
+, meson, ninja, glib, vala, desktop-file-utils
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-mahjongg";
-  version = "3.36.2";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "15xfp2acqdnn0pcwg5d77dpv758jjyclwb042wm12gg07rbg3s6j";
-  };
-
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-mahjongg"; attrPath = "gnome3.gnome-mahjongg"; };
+    sha256 = "N0LcYxD8M/NewYfwJpnfIDzVb27pS0Hz7vJdrinutkc=";
   };
 
   nativeBuildInputs = [
-    meson ninja vala python3 desktop-file-utils
+    meson ninja vala desktop-file-utils
     pkgconfig gnome3.adwaita-icon-theme
     libxml2 itstool gettext wrapGAppsHook
+    glib # for glib-compile-schemas
   ];
   buildInputs = [
-    gtk3 librsvg
+    glib
+    gtk3
+    librsvg
   ];
 
-  postPatch = ''
-    chmod +x data/meson_post_install.py
-    patchShebangs data/meson_post_install.py
-  '';
+  mesonFlags = [
+    "-Dcompile-schemas=enabled"
+  ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = "https://wiki.gnome.org/Apps/Mahjongg";
     description = "Disassemble a pile of tiles by removing matching pairs";
     maintainers = teams.gnome.members;
-    license = licenses.gpl2;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
 }

From e067177022000a53cebf8bc438109ae80daa1557 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:31:05 +0100
Subject: [PATCH 0263/3942] gnome3.gnome-nibbles: 3.36.1 -> 3.38.0

---
 pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index a9757de63938..6d532d7ed930 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-nibbles";
-  version = "3.36.1";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "17n6ji6yr521kzxfbfm0yxvrlnw4hlzacbwn0jqmw7xf3pdq35z6";
+    sha256 = "0nh8mxcrmkwzn9m9lbmvi2m53ikkmkxsklcn0bij2dkav5kdbiz5";
   };
 
   nativeBuildInputs = [

From 4ab91e7bb81e92edb67c5b549063d43ceaf9ba36 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:31:22 +0100
Subject: [PATCH 0264/3942] gnome3.gnome-robots: 3.36.1 -> 3.38.0

---
 pkgs/desktops/gnome-3/games/gnome-robots/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 2ba6d4e7044c..1d9beca36670 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-robots";
-  version = "3.36.1";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0qmdwrl70ccs3blgwmpcf3sg9k8mcvsl1dr1gds4ba3fq9ca8ipb";
+    sha256 = "1qpzpsyj9i5dsfy7anfb2dcm602bjkcgqj86fxvnxy6llx56ks0z";
   };
 
   passthru = {

From ddfeea9c89a9572b53e192844f4838a584bd7a80 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:31:37 +0100
Subject: [PATCH 0265/3942] gnome3.gnome-sudoku: 3.36.0 -> 3.38.0

---
 pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index 0a84e1065f3a..a46cfeee5060 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-sudoku";
-  version = "3.36.0";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "17a1r2jk5yygrxil1dycmamxyvyi64mr29mbyfgcx5hm2fylxxwm";
+    sha256 = "0cpxx63liczmax6ry06r5k0f221xpg2rqh49vkdj2snmqq61swrq";
   };
 
   nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];

From eaaaf825188b7006d24839a50cbe1980eb296e14 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:31:54 +0100
Subject: [PATCH 0266/3942] gnome3.gnome-taquin: 3.36.4 -> 3.38.0

---
 pkgs/desktops/gnome-3/games/gnome-taquin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 99bdffe16ade..72094cb08894 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-taquin";
-  version = "3.36.4";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0awfssqpswsyla4gn80ifj53biwq34hcadxlknnlm7jpz0z38cp0";
+    sha256 = "07xpvyks1r5wxvjz1n07g7khxa02smhq4kykc4d22fmzr3yka077";
   };
 
   passthru = {

From 6d4499c30975b878a49ea5a7a6ef1bc0187f5a69 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:32:10 +0100
Subject: [PATCH 0267/3942] gnome3.gnome-tetravex: 3.36.4 -> 3.38.0

---
 pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index f80012e22bb9..e0a94d2e7d7c 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-tetravex";
-  version = "3.36.4";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0amnmd12mpny3vnf946wnphlsnbvjrvkx29sarplm57m1571qdc5";
+    sha256 = "0m7p6i7lnmwnr3lnwzcmzrr8f07zfgvl0pg6f88s8l2dmql08gsa";
   };
 
   passthru = {

From 56c0d94541bd7f62bde6394fb10d93795bc18c86 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:32:23 +0100
Subject: [PATCH 0268/3942] gnome3.hitori: 3.36.0 -> 3.38.0

---
 pkgs/desktops/gnome-3/games/hitori/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix
index 8d1c9e3dd65b..7dac364dcb29 100644
--- a/pkgs/desktops/gnome-3/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/games/hitori/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hitori";
-  version = "3.36.0";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0mq1jv8rbmvksnhbm1d25kcvcfr9lq58qipcacn7wa26xpx7cvs5";
+    sha256 = "0gjbbh4gym8wwa4jjg7wwifjh2h7bf6m0x23c5jjxvrf3vln9gfq";
   };
 
   nativeBuildInputs = [

From 4f04811f7ff1a36ea44fccc2ad2f51b5ffd13f1c Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:32:42 +0100
Subject: [PATCH 0269/3942] gnome3.lightsoff: 3.36.0 -> 3.38.0

---
 pkgs/desktops/gnome-3/games/lightsoff/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index fd44bbece996..f5425205db60 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lightsoff";
-  version = "3.36.0";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0qvafpciqbqmpan9i8ans3lqs29v02zblz6k0hzj4p3qq4sch3a3";
+    sha256 = "0dpnnw8v1yk1p0y08f9c9xkgswqlm8x83dfn96798nif2zbypdnh";
   };
 
   nativeBuildInputs = [

From c8394b82ecb598d03029361b090cde9382a5332a Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:32:54 +0100
Subject: [PATCH 0270/3942] gnome3.tali: 3.36.4 -> 3.38.0

Changelogs:
- https://ftp.gnome.org/pub/GNOME/sources/tali/3.37/tali-3.37.1.news
- https://ftp.gnome.org/pub/GNOME/sources/tali/3.37/tali-3.37.3.news
- https://ftp.gnome.org/pub/GNOME/sources/tali/3.37/tali-3.37.90.news
- https://ftp.gnome.org/pub/GNOME/sources/tali/3.37/tali-3.37.91.news
- https://ftp.gnome.org/pub/GNOME/sources/tali/3.37/tali-3.37.92.news
- https://ftp.gnome.org/pub/GNOME/sources/tali/3.38/tali-3.38.0.news

Signed-off-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/desktops/gnome-3/games/tali/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index 2fd1d034db3e..fea6ce571e0b 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf
-, librsvg, gettext, itstool, libxml2, wrapGAppsHook
+, librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook
 , meson, ninja, python3, desktop-file-utils
 }:
 
 stdenv.mkDerivation rec {
   pname = "tali";
-  version = "3.36.4";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "12h6783m4634zzprlk31j0dmvgzrfjklhl0z49fdwcziw5bszr3c";
+    sha256 = "196f6hiap61sdqr7kvywk74yl0m2j7fvqml37p6cgfm7gfrhrvi9";
   };
 
   passthru = {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     pkgconfig gnome3.adwaita-icon-theme
     libxml2 itstool gettext wrapGAppsHook
   ];
-  buildInputs = [ gtk3 gdk-pixbuf librsvg ];
+  buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ];
 
   postPatch = ''
     chmod +x build-aux/meson_post_install.py

From 51597e64358e3f57917c2143fa0654a9104ce5b5 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:33:12 +0100
Subject: [PATCH 0271/3942] gnome3.gnome-applets: 3.36.4 -> 3.37.2

Add patch to set gnome panel's modules dir, during configurePhase.
---
 .../gnome-3/misc/gnome-applets/default.nix    | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
index a33376618c2c..c2ed5b61977a 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
@@ -1,10 +1,9 @@
 { stdenv
 , fetchurl
-, intltool
+, gettext
 , itstool
 , libxml2
-, libxslt
-, pkgconfig
+, pkg-config
 , gnome-panel
 , gtk3
 , glib
@@ -17,28 +16,25 @@
 , adwaita-icon-theme
 , libgweather
 , gucharmap
-, tracker
+, tracker_2
 , polkit
 , gnome3
 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "gnome-applets";
-  version = "3.36.4";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "3.37.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1cd7y2air9cjznqmnynadbsayvq4dpsi39avnz46vv0bavx1aiwz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0l1mc9ymjg0bgk92a08zd85hx1vaqrzdj0dwzmna20rp51vf0l4a";
   };
 
   nativeBuildInputs = [
-    intltool
+    gettext
     itstool
-    pkgconfig
+    pkg-config
     libxml2
-    libxslt
   ];
 
   buildInputs = [
@@ -53,7 +49,7 @@ in stdenv.mkDerivation rec {
     adwaita-icon-theme
     libgweather
     gucharmap
-    tracker
+    tracker_2
     polkit
     wirelesstools
     linuxPackages.cpupower
@@ -63,9 +59,8 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  configureFlags = [
-    "--with-libpanel-applet-dir=${placeholder "out"}/share/gnome-panel/applets"
-  ];
+  # Don't try to install modules to gnome panel's directory, as it's read only
+  PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules";
 
   passthru = {
     updateScript = gnome3.updateScript {

From 9deacb776b39ec2bc07c948754b204823bd3865b Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:33:38 +0100
Subject: [PATCH 0272/3942] gnome3.gnome-flashback: 3.36.3 -> 3.37.2

* reformat

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
---
 .../gnome-3/misc/gnome-flashback/default.nix  | 80 ++++++++++---------
 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index cde21551a8a3..936ad3559c30 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
@@ -27,10 +27,9 @@
 , xkeyboard_config
 , runCommand
 }:
-
 let
   pname = "gnome-flashback";
-  version = "3.36.3";
+  version = "3.37.2";
 
   # From data/sessions/Makefile.am
   requiredComponentsCommon = [
@@ -55,13 +54,13 @@ let
     "org.gnome.SettingsDaemon.Wacom"
     "org.gnome.SettingsDaemon.XSettings"
   ];
-  requiredComponents = wmName: "RequiredComponents=${stdenv.lib.concatStringsSep ";" ([wmName] ++ requiredComponentsCommon ++ requiredComponentsGsd)};";
+  requiredComponents = wmName: "RequiredComponents=${stdenv.lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon ++ requiredComponentsGsd)};";
   gnome-flashback = stdenv.mkDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchurl {
       url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-      sha256 = "19y1a4kq6db6a19basss76l4rypiz0lwr32ajli1ra1d1yj9xfid";
+      sha256 = "0lz6icgng8ri4sdi3lkdsyvxzfvlkayn85b5346g76vc1w5y03db";
     };
 
     # make .desktop Execs absolute
@@ -143,44 +142,46 @@ let
             '';
           };
 
-        gnomeSession = writeTextFile {
-          name = "gnome-flashback-${wmName}-gnome-session";
-          destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session";
-          text = ''
-            [GNOME Session]
-            Name=GNOME Flashback (${wmLabel})
-            ${requiredComponents wmName}
+          gnomeSession = writeTextFile {
+            name = "gnome-flashback-${wmName}-gnome-session";
+            destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session";
+            text = ''
+              [GNOME Session]
+              Name=GNOME Flashback (${wmLabel})
+              ${requiredComponents wmName}
+            '';
+          };
+
+          executable = writeShellScriptBin "gnome-flashback-${wmName}" ''
+            if [ -z $XDG_CURRENT_DESKTOP ]; then
+              export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"
+            fi
+
+            export XDG_DATA_DIRS=${wmApplication}/share:${gnomeSession}/share:${gnome-flashback}/share:${gnome-panel}/share:$XDG_DATA_DIRS
+
+            exec ${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName} "$@"
           '';
+
+        in
+        writeTextFile
+          {
+            name = "gnome-flashback-${wmName}-xsession";
+            destination = "/share/xsessions/gnome-flashback-${wmName}.desktop";
+            text = ''
+              [Desktop Entry]
+              Name=GNOME Flashback (${wmLabel})
+              Comment=This session logs you into GNOME Flashback with ${wmLabel}
+              Exec=${executable}/bin/gnome-flashback-${wmName}
+              TryExec=${wmCommand}
+              Type=Application
+              DesktopNames=GNOME-Flashback;GNOME;
+            '';
+          } // {
+          providedSessions = [ "gnome-flashback-${wmName}" ];
         };
 
-        executable = writeShellScriptBin "gnome-flashback-${wmName}" ''
-          if [ -z $XDG_CURRENT_DESKTOP ]; then
-            export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"
-          fi
-
-          export XDG_DATA_DIRS=${wmApplication}/share:${gnomeSession}/share:${gnome-flashback}/share:${gnome-panel}/share:$XDG_DATA_DIRS
-
-          exec ${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName} "$@"
-        '';
-
-      in writeTextFile {
-        name = "gnome-flashback-${wmName}-xsession";
-        destination = "/share/xsessions/gnome-flashback-${wmName}.desktop";
-        text = ''
-          [Desktop Entry]
-          Name=GNOME Flashback (${wmLabel})
-          Comment=This session logs you into GNOME Flashback with ${wmLabel}
-          Exec=${executable}/bin/gnome-flashback-${wmName}
-          TryExec=${wmCommand}
-          Type=Application
-          DesktopNames=GNOME-Flashback;GNOME;
-        '';
-      } // {
-        providedSessions = [ "gnome-flashback-${wmName}" ];
-      };
-
       mkSystemdTargetForWm = { wmName }:
-        runCommand "gnome-flashback-${wmName}.target" {} ''
+        runCommand "gnome-flashback-${wmName}.target" { } ''
           mkdir -p $out/lib/systemd/user
           cp "${gnome-flashback}/lib/systemd/user/gnome-session-x11@gnome-flashback-metacity.target" \
             "$out/lib/systemd/user/gnome-session-x11@gnome-flashback-${wmName}.target"
@@ -195,4 +196,5 @@ let
       platforms = platforms.linux;
     };
   };
-  in gnome-flashback
+in
+gnome-flashback

From 284ee7b70baf9f88ae45d9d5a43aeed8771917b2 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:33:50 +0100
Subject: [PATCH 0273/3942] gnome3.gnome-panel: 3.36.2 -> 3.37.1

* reformat

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
---
 pkgs/desktops/gnome-3/misc/gnome-panel/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
index 037c7812105c..b06bf1bcbea7 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
@@ -18,19 +18,18 @@
 , pkgconfig
 , polkit
 , systemd
-, wrapGAppsHook }:
+, wrapGAppsHook
+}:
 
-let
+stdenv.mkDerivation rec {
   pname = "gnome-panel";
-  version = "3.36.2";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "3.37.1";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0z0f64rgcwkv48kfd1ifzjvnmg3c386hwi9cj11mr5198rah0p4p";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    hash = "sha256-HVmP1okz52AY8vsRanhxy8ADPB8Qm/v+CKHstWBn0VI=";
   };
 
   # make .desktop Exec absolute

From 9db93f06ac0a0b6a4441d689cb1132c4ec44223d Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:34:28 +0100
Subject: [PATCH 0274/3942] gnome3.metacity: 3.36.1 -> 3.37.1

* add libXres to buildInputs.
* reformat

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
---
 pkgs/desktops/gnome-3/misc/metacity/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix
index e62c6fe7fee3..49fb911c60d2 100644
--- a/pkgs/desktops/gnome-3/misc/metacity/default.nix
+++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix
@@ -5,6 +5,7 @@
 , gnome3
 , gsettings-desktop-schemas
 , gtk3
+, xorg
 , libcanberra-gtk3
 , libgtop
 , libstartup_notification
@@ -12,17 +13,16 @@
 , pkgconfig
 , substituteAll
 , wrapGAppsHook
-, zenity }:
+, zenity
+}:
 
-let
+stdenv.mkDerivation rec {
   pname = "metacity";
-  version = "3.36.1";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "3.37.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "08xkq5i6czvms0ygbj7ywzl70q1l0z44nfh6b43q8rmjwa9pdw0i";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "09m102lpy68730y8y7vjyaw3cavlbdbiyix6s0kgna23bbcz7ml0";
   };
 
   patches = [
@@ -40,6 +40,7 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    xorg.libXres
     glib
     gsettings-desktop-schemas
     gtk3

From ecd7a3aa58596428776397033dde0c5f53504830 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 25 Aug 2020 08:34:09 +0100
Subject: [PATCH 0275/3942] gnome3.libgnome-games-support: 1.6.1 -> 1.8.0

* reformat

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
---
 .../misc/libgnome-games-support/default.nix   | 43 ++++++++++++++-----
 1 file changed, 32 insertions(+), 11 deletions(-)

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 1f9afefd2e48..fb472ffff1db 100644
--- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
@@ -1,22 +1,43 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, gettext, vala, gnome3
-, libintl, meson, ninja }:
+{ stdenv
+, fetchurl
+, pkgconfig
+, glib
+, gtk3
+, libgee
+, gettext
+, vala
+, gnome3
+, libintl
+, meson
+, ninja
+}:
 
-let
+stdenv.mkDerivation rec {
   pname = "libgnome-games-support";
-  version = "1.6.1";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "1.8.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1gq8p38k92lsr6dbav6pgmw0adnzzhcs06jqdkr37p145vv6ls7v";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1pdk9hc30xdlv0ba24f7pvcr2d5370zykrmpws7hgmjgl4wfbpdb";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext vala ];
-  buildInputs = [ libintl ];
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkgconfig
+    vala
+  ];
+
+  buildInputs = [
+    libintl
+  ];
+
   propagatedBuildInputs = [
     # Required by libgnome-games-support-1.pc
-    glib gtk3 libgee
+    glib
+    gtk3
+    libgee
   ];
 
   passthru = {

From 0bfec2ed818a11a546e2316c1addc1ddd7a1111a Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 15:59:46 +0100
Subject: [PATCH 0276/3942] gnome-usage: 3.33.2 -> 3.38.0

* add libhandy

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
---
 pkgs/applications/misc/gnome-usage/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix
index 17aa7e9aa060..44d4727edba0 100644
--- a/pkgs/applications/misc/gnome-usage/default.nix
+++ b/pkgs/applications/misc/gnome-usage/default.nix
@@ -14,15 +14,16 @@
 , libdazzle
 , gnome3
 , tracker
+, libhandy
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-usage";
-  version = "3.33.2";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0w3ppfaf15il8mad64qyc9hj1rmlvzs5dyzrxhq7r50k4kyiwmk4";
+    sha256 = "0mqs39yi2cqwkzlmmgzrszsva5hbdpws6zk4lbi4w2cjzl185mcl";
   };
 
   nativeBuildInputs = [
@@ -43,6 +44,7 @@ stdenv.mkDerivation rec {
     libdazzle
     libgtop
     tracker
+    libhandy
   ];
 
   postPatch = ''

From 47dc5607b428817b58247108ea8c6bf57471c731 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:01:11 +0100
Subject: [PATCH 0277/3942] gnome-user-docs: 3.36.2 -> 3.38.0

---
 pkgs/data/documentation/gnome-user-docs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix
index 294f210c21ff..91abb04116a9 100644
--- a/pkgs/data/documentation/gnome-user-docs/default.nix
+++ b/pkgs/data/documentation/gnome-user-docs/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-user-docs";
-  version = "3.36.2";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0n4rbrq5zww6gjjmicyw5hlvzi8azc6m4sisak15snkp6v4f93qr";
+    sha256 = "12pfvivsgz4qvx3y6zndxln28fgvbdv2kjy6l892i4f5bmdxplrq";
   };
 
   nativeBuildInputs = [

From 2409fd48c495a91bfc72b883001a03baaec3a92b Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:01:55 +0100
Subject: [PATCH 0278/3942] gnome3.cheese: 3.34.0 -> 3.38.0

* reformat

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
---
 pkgs/desktops/gnome-3/apps/cheese/default.nix | 89 +++++++++++++++----
 1 file changed, 73 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index 05a1cdbc088e..c4998cc451fe 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -1,17 +1,46 @@
-{ stdenv, gettext, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3
-, pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool
-, libgudev, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib
-, libxslt, yelp-tools, gnome-common, gtk-doc
-, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2
-, meson, ninja, dbus, python3 }:
+{ stdenv
+, gettext
+, fetchurl
+, wrapGAppsHook
+, gnome-video-effects
+, libcanberra-gtk3
+, pkgconfig
+, gtk3
+, glib
+, clutter-gtk
+, clutter-gst
+, udev
+, gst_all_1
+, itstool
+, libgudev
+, vala
+, docbook_xml_dtd_43
+, docbook_xsl
+, appstream-glib
+, libxslt
+, yelp-tools
+, gnome-common
+, gtk-doc
+, adwaita-icon-theme
+, librsvg
+, totem
+, gdk-pixbuf
+, gnome3
+, gnome-desktop
+, libxml2
+, meson
+, ninja
+, dbus
+, python3
+}:
 
 stdenv.mkDerivation rec {
   pname = "cheese";
-  version = "3.34.0";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0wvyc9wb0avrprvm529m42y5fkv3lirdphqydc9jw0c8mh05d1ni";
+    sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8";
   };
 
   postPatch = ''
@@ -24,15 +53,43 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext itstool vala wrapGAppsHook libxml2 appstream-glib
-    libxslt docbook_xml_dtd_43 docbook_xsl
-    gtk-doc yelp-tools gnome-common python3
+    appstream-glib
+    docbook_xml_dtd_43
+    docbook_xsl
+    gettext
+    gnome-common
+    gtk-doc
+    itstool
+    libxml2
+    libxslt
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala
+    wrapGAppsHook
+    yelp-tools
+  ];
+
+  buildInputs = [
+    adwaita-icon-theme
+    clutter-gst
+    clutter-gtk
+    dbus
+    gdk-pixbuf
+    glib
+    gnome-desktop
+    gnome-video-effects
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gstreamer
+    gtk3
+    libcanberra-gtk3
+    libgudev
+    librsvg
+    udev
   ];
-  buildInputs = [ gtk3 glib gnome-video-effects
-                  gdk-pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer
-                  gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop
-                  gst_all_1.gst-plugins-bad clutter-gtk clutter-gst
-                  libcanberra-gtk3 libgudev dbus ];
 
   outputs = [ "out" "man" "devdoc" ];
 

From 0be93b1febf871cc6de4c3b4f9ef47974dd5d388 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:04:20 +0100
Subject: [PATCH 0279/3942] gnome3.gnome-calendar: 3.36.2 -> 3.38.0

* reformat

https://gitlab.gnome.org/GNOME/gnome-calendar/-/blob/3.38.0/NEWS

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
---
 .../gnome-3/apps/gnome-calendar/default.nix   | 70 +++++++++++++++----
 1 file changed, 58 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 988cb1ed2a33..8b1c66e43e17 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -1,18 +1,45 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3
-, gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup
-, glib, gnome-online-accounts, gsettings-desktop-schemas, libhandy }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, meson
+, ninja
+, pkgconfig
+, wrapGAppsHook
+, libdazzle
+, libgweather
+, geoclue2
+, geocode-glib
+, python3
+, gettext
+, libxml2
+, gnome3
+, gtk3
+, evolution-data-server
+, libsoup
+, glib
+, gnome-online-accounts
+, gsettings-desktop-schemas
+, libhandy
+, adwaita-icon-theme
+}:
 
-let
+stdenv.mkDerivation rec {
   pname = "gnome-calendar";
-  version = "3.36.2";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "3.38.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "07sc1kn65dzxsxpv0vl5dj1a5awljjsfl9jldrg0hnjmq12m7c6h";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0cs7ggj88n8sira5vzsijmzl3fmflic48lbis24r1d9blx944s63";
   };
 
+  patches = [
+    # Port to libhandy-1
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch";
+      sha256 = "Ue0pWwcbYyCZPHPPoR0dXW5n948/AZ3wVDMTIZDOnyE=";
+    })
+  ];
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
@@ -20,10 +47,29 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkgconfig
+    gettext
+    libxml2
+    wrapGAppsHook
+    python3
+  ];
+
   buildInputs = [
-    gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
-    gsettings-desktop-schemas gnome3.adwaita-icon-theme libhandy
+    gtk3
+    evolution-data-server
+    libsoup
+    glib
+    gnome-online-accounts
+    libdazzle
+    libgweather
+    geoclue2
+    geocode-glib
+    gsettings-desktop-schemas
+    adwaita-icon-theme
+    libhandy
   ];
 
   postPatch = ''

From edb4fbd7419e74108bd0fcfdecda9911ff46169b Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:08:08 +0100
Subject: [PATCH 0280/3942] gnome3.dconf-editor: 3.36.4 -> 3.38.0

https://gitlab.gnome.org/GNOME/dconf-editor/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/dconf-editor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index c6b02917ce42..00c9d3a4c905 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "dconf-editor";
-  version = "3.36.4";
+  version = "3.38.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0y9yll77wkvr9ly132icfsl12sdz5aba9qc3aqm5rc90r6xhkhry";
+    sha256 = "1d1y33c6fm86xz9xbh3bfz4y2pyas01a58lmirmdx0lh6yd292bd";
   };
 
   nativeBuildInputs = [

From 733aebb1c6885733526b4733062ad0a7b2d729df Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:14:14 +0100
Subject: [PATCH 0281/3942] gnome3.gnome-software: 3.36.1 -> 3.38.0

* add sysprof dependency

https://gitlab.gnome.org/GNOME/gnome-software/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/core/gnome-software/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 9f51227f235a..c83f3e3268e0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
 , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd
 , gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts
-, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }:
+, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils
+, sysprof }:
 
 let
 
@@ -11,11 +12,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gnome-software";
-  version = "3.36.1";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0vkgpy2afb33rrk94zqlm2q728xhzjj8s24n9wh9ylw00z3nckad";
+    sha256 = "0rjm486vgn6gi9mv1rqdcvr9cilmw6in4r6djqkxbxqll89cp2l7";
   };
 
   patches = [
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
     gtk3 glib packagekit appstream-glib libsoup
     gsettings-desktop-schemas gnome-desktop
     gspell json-glib libsecret ostree
-    polkit flatpak libxmlb gnome-online-accounts
+    polkit flatpak libxmlb gnome-online-accounts sysprof
   ] ++ stdenv.lib.optionals withFwupd [
     fwupd
   ];

From b08184bbc1bb925f32ee0ec4c850efbd3ee5770f Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:16:17 +0100
Subject: [PATCH 0282/3942] gnome3.rygel: 0.38.4 -> 0.40.0

* add gst_all_1.gst-editing-services dependency
---
 .../rygel/add-option-for-installation-sysconfdir.patch    | 8 ++++----
 pkgs/desktops/gnome-3/core/rygel/default.nix              | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch
index 4259f93eb24c..6fe651b9cbb4 100644
--- a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch
+++ b/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch
@@ -1,5 +1,5 @@
 diff --git a/meson.build b/meson.build
-index 209d4187..58580980 100644
+index 4aa683d6..a930d533 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -20,7 +20,11 @@ if not get_option('uninstalled')
@@ -14,7 +14,7 @@ index 209d4187..58580980 100644
 +    endif
      rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins')
      rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines')
-     rygel_presetdir = join_paths(rygel_datadir, 'rygel', 'presets')
+     rygel_presetdir = join_paths(rygel_datadir, 'presets')
 @@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir)
  conf.set_quoted('PLUGIN_DIR', rygel_plugindir)
  conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir)
@@ -25,7 +25,7 @@ index 209d4187..58580980 100644
  conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract'))
  conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications'))
 diff --git a/meson_options.txt b/meson_options.txt
-index f09cac58..ff11c548 100644
+index cb604c4e..1b049b77 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -1,6 +1,7 @@
@@ -33,6 +33,6 @@ index f09cac58..ff11c548 100644
  option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation')
  option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path')
 +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
- option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker'])
+ option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3'])
  option('engines', type : 'array', choices : ['simple', 'gstreamer'])
  option('examples', type : 'boolean', value : 'true')
diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix
index 529091e5fd61..f7ce3387fc07 100644
--- a/pkgs/desktops/gnome-3/core/rygel/default.nix
+++ b/pkgs/desktops/gnome-3/core/rygel/default.nix
@@ -28,14 +28,14 @@
 
 stdenv.mkDerivation rec {
   pname = "rygel";
-  version = "0.38.4";
+  version = "0.40.0";
 
   # TODO: split out lib
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0rm1m1z8rcvyj9873wqcz5i3qdg8j6gv6k1p01xifk0y9phg7rzc";
+    sha256 = "0xrbdsgm78h3g4qcvq2p8k70q31x9xdbb35bixz36q6h9s1wqznn";
   };
 
   nativeBuildInputs = [
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
     shared-mime-info
   ] ++ (with gst_all_1; [
     gstreamer
+    gst-editing-services
     gst-plugins-base
     gst-plugins-good
     gst-plugins-bad
@@ -77,6 +78,8 @@ stdenv.mkDerivation rec {
     "-Dapi-docs=false"
     "--sysconfdir=/etc"
     "-Dsysconfdir_install=${placeholder "out"}/etc"
+    # Build all plug-ins except for tracker 2
+    "-Dplugins=external,gst-launch,lms,media-export,mpris,playbin,ruih,tracker3"
   ];
 
   doCheck = true;

From a4b5fc6925bf3c66be7f755b1ad558927fe5ce96 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:16:57 +0100
Subject: [PATCH 0283/3942] gnome3.totem: 3.34.1 -> 3.38.0

https://gitlab.gnome.org/GNOME/totem/-/blob/V_3_38_0/NEWS
---
 pkgs/desktops/gnome-3/core/totem/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 50ab50e58b2c..e59265e79de6 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "totem";
-  version = "3.34.1";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "028sc6xbyi7rs884862d8f3di6zhcm0lhvlpc3r69ifzjsq9my3b";
+    sha256 = "0bs33ijvxbr2prb9yj4dxglsszslsn9k258n311sld84masz4ad8";
   };
 
   doCheck = true;
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
     python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins
   ];
 
+  mesonFlags = [
+    # TODO: https://github.com/NixOS/nixpkgs/issues/36468
+    "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
+  ];
+
   postPatch = ''
     chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file
     patchShebangs .

From 697eb066789c49e04033c4a99b5104fe24578adf Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:18:50 +0100
Subject: [PATCH 0284/3942] gnome3.gnome-devel-docs: 3.32.1 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-devel-docs/-/blob/3.38.0/NEWS
---
 pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index 3a53e592b5fc..e2b613bacfd4 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-devel-docs";
-  version = "3.32.1";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0xqpgf975rws60qxilq635pblbpgwspyykgzxnb4awd9zrs5lbx0";
+    sha256 = "0hzbmz6ji2g94353az5i9iqaq66jn09lhac9af9b85qykx4zfj3z";
   };
 
   passthru = {

From 71ea5b388bbf80c01afa125867345ae5cc5d6f66 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:22:55 +0100
Subject: [PATCH 0285/3942] gnome3.iagno: 3.36.4 -> 3.38.0

---
 pkgs/desktops/gnome-3/games/iagno/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 06831ecd0a9d..1814da85ae26 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iagno";
-  version = "3.36.4";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1fh2cvyqbz8saf2wij0bz2r9bja2k4gy6fqvbvig4gv0lx66gl29";
+    sha256 = "0fd7bmym35b43d2gp6ngablry85gb2j52gp4lgqd098hbn5ziaf4";
   };
 
   patches = [

From 2fa58d86cba8bf74efca3924c7910b0311602e68 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:27:56 +0100
Subject: [PATCH 0286/3942] grilo-plugins: 0.3.11 -> 0.3.12

https://gitlab.gnome.org/GNOME/grilo-plugins/-/blob/grilo-plugins-0.3.12/NEWS
---
 pkgs/development/libraries/grilo-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix
index 3dced2d62116..9073a501c09f 100644
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/pkgs/development/libraries/grilo-plugins/default.nix
@@ -31,11 +31,11 @@
 
 stdenv.mkDerivation rec {
   pname = "grilo-plugins";
-  version = "0.3.11";
+  version = "0.3.12";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0wyd3n5mn7b77hxylkc3f62v01mlavh96901pz342hwrn42ydqnx";
+    sha256 = "0xr59gzb8gw2bgj14mjllgn8y7srh373j0fp0v16ak8nd84dzdn6";
   };
 
   patches = [

From 7e54d67bc7fba1aa444e1075e2ba9debea69a45a Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:29:03 +0100
Subject: [PATCH 0287/3942] grilo: 0.3.12 -> 0.3.13

https://gitlab.gnome.org/GNOME/grilo/-/blob/grilo-0.3.13/NEWS
---
 pkgs/development/libraries/grilo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix
index 12f069891e88..858e8d81fd42 100644
--- a/pkgs/development/libraries/grilo/default.nix
+++ b/pkgs/development/libraries/grilo/default.nix
@@ -4,7 +4,7 @@
 
 let
   pname = "grilo";
-  version = "0.3.12"; # if you change minor, also change ./setup-hook.sh
+  version = "0.3.13"; # if you change minor, also change ./setup-hook.sh
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0w8sq5g6g1rg85h53vbll8va70fcp6082mlpmy98aa03444ddyyv";
+    sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i";
   };
 
   setupHook = ./setup-hook.sh;

From 55538b063c4c0503480cac8d549949c8e95dca5a Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:30:21 +0100
Subject: [PATCH 0288/3942] gspell: 1.8.3 -> 1.8.4

https://gitlab.gnome.org/GNOME/gspell/-/blob/1.8.4/NEWS
---
 pkgs/development/libraries/gspell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index 17e98b8e4092..582244f4f497 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "gspell";
-  version = "1.8.3";
+  version = "1.8.4";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1s1dns070pz8dg04ppshdbx1r86n9406vkxcfs8hdghn0bfi9ras";
+    sha256 = "1d23pl9956dkpy52pbndp0vrba0y030msh1issdl84z82skickfg";
   };
 
   propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig

From 7a8b86318a1a2ec89ba13bc8d221d106e3c9ea6e Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:32:12 +0100
Subject: [PATCH 0289/3942] gtksourceview: 4.6.1 -> 4.8.0

https://gitlab.gnome.org/GNOME/gtksourceview/-/blob/4.8.0/NEWS
---
 pkgs/development/libraries/gtksourceview/4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 565b7f782d57..2041e83fb0c3 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gtksourceview";
-  version = "4.6.1";
+  version = "4.8.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0x7q9lwgrc4kkciy7vgwd80v2ji7plyqiqbvkvx2yqarmfkqgx33";
+    sha256 = "06jfbfbi73j9i3qsr7sxg3yl3643bn3aydbzx6xg3v8ca0hr3880";
   };
 
   propagatedBuildInputs = [

From 476de544071afab92af07598f650692f527de602 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:33:38 +0100
Subject: [PATCH 0290/3942] gvfs: 1.44.1 -> 1.46.0

https://gitlab.gnome.org/GNOME/gvfs/-/blob/1.46.0/NEWS
---
 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 cff6569be50b..71bd77a2a42c 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -41,11 +41,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gvfs";
-  version = "1.44.1";
+  version = "1.46.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0ipv0jgzim6glsgizmfjkx0m3gd1l9lr242m0jj6cdmhs52k5vsh";
+    sha256 = "1sbhv7smfah5nijmv9k3chhylnyx4rnb8xn7mkiir8h9vak77fkq";
   };
 
   postPatch = ''

From 016d36dde699937dfa7e9078d52c9da699beaff8 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:35:08 +0100
Subject: [PATCH 0291/3942] libgdata: 0.17.12 -> 0.17.13

https://gitlab.gnome.org/GNOME/libgdata/-/blob/0.17.13/NEWS
---
 pkgs/development/libraries/libgdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
index 162b5d233951..50eac4057062 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/pkgs/development/libraries/libgdata/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libgdata";
-  version = "0.17.12";
+  version = "0.17.13";
 
   outputs = [ "out" "dev" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0613nihsvwvdnmlbjnwi8zqxgmpwyxdapzznq4cy1fp84246zzd0";
+    sha256 = "0bj7ij6k3lxjn62jgh8vabr8vfjs48aylnnl3779warw5iwyzfga";
   };
 
   patches = [

From d2bc3de380daf9802c8095c57d721066b4124e92 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:36:07 +0100
Subject: [PATCH 0292/3942] libgudev: 233 -> 234

https://gitlab.gnome.org/GNOME/libgudev/-/blob/234/NEWS
---
 pkgs/development/libraries/libgudev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index 439dd3827ec3..c7c3064acb8d 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libgudev";
-  version = "233";
+  version = "234";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "00xvva04lgqamhnf277lg32phjn971wgpc9cxvgf5x13xdq4jz2q";
+    sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv";
   };
 
   nativeBuildInputs = [ pkgconfig gobject-introspection ];

From a53efa17c59d07f059a1a6ad99cac3b05637fa84 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 16:37:00 +0100
Subject: [PATCH 0293/3942] libpeas: 1.26.0 -> 1.28.0

https://gitlab.gnome.org/GNOME/libpeas/-/blob/libpeas-1.28.0/NEWS
---
 pkgs/development/libraries/libpeas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix
index 6c2276a08ccb..1d360b45052a 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/pkgs/development/libraries/libpeas/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libpeas";
-  version = "1.26.0";
+  version = "1.28.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0xkk9zhkw8f2fm7g9nb4ry4xxig5n27s7rjmx6l7jr2941zdfxm9";
+    sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2";
   };
 
   nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ];

From 12ea15c6d0e93950c7fe69627e3cbfe8ad321401 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 18 Sep 2020 20:21:52 +0100
Subject: [PATCH 0294/3942] glib-networking: 2.64.3 -> 2.66.0

https://gitlab.gnome.org/GNOME/glib-networking/-/blob/2.66.0/NEWS
---
 pkgs/development/libraries/glib-networking/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 59bf8485971f..fc85b50e07f3 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "glib-networking";
-  version = "2.64.3";
+  version = "2.66.0";
 
   outputs = [ "out" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0s518l4bwvdvcp51lbjqcw8g0vq18bznpf5hq2zi6a054jqhcylk";
+    sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5";
   };
 
   patches = [

From f1f85419d22d55c64412bd3aec806d895ef9550e Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sun, 20 Sep 2020 20:27:07 +0100
Subject: [PATCH 0295/3942] nixos/gdm: add gdm to systemd.packages

GDM now provides gnome-session@gnome-login.target.d/session.conf though I'm not even sure if it's needed.
---
 nixos/modules/services/x11/display-managers/gdm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index eae70a57c781..31e4cff438ac 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -160,7 +160,7 @@ in
     ];
 
     # Otherwise GDM will not be able to start correctly and display Wayland sessions
-    systemd.packages = with pkgs.gnome3; [ gnome-session gnome-shell ];
+    systemd.packages = with pkgs.gnome3; [ gdm gnome-session gnome-shell ];
     environment.systemPackages = [ pkgs.gnome3.adwaita-icon-theme ];
 
     systemd.services.display-manager.wants = [

From 10e74f17028c01bfb6d39baf143e5cc877ed4ca9 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 20:11:42 -0400
Subject: [PATCH 0296/3942] gnome3.gnome-books: format

---
 .../gnome-3/apps/gnome-books/default.nix      | 62 +++++++++++++++----
 1 file changed, 50 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
index 7432e8e96ed2..37840560837e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
@@ -1,9 +1,30 @@
-{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs
-, pkgconfig, gtk3, glib, tracker, tracker-miners, libxslt
-, webkitgtk, gnome-desktop, libgepub, gnome3, gdk-pixbuf
-, gsettings-desktop-schemas, adwaita-icon-theme, docbook_xsl
-, docbook_xml_dtd_42, desktop-file-utils, python3
-, gobject-introspection, wrapGAppsHook }:
+{ stdenv
+, meson
+, ninja
+, gettext
+, fetchurl
+, evince
+, gjs
+, pkgconfig
+, gtk3
+, glib
+, tracker
+, tracker-miners
+, libxslt
+, webkitgtk
+, gnome-desktop
+, libgepub
+, gnome3
+, gdk-pixbuf
+, gsettings-desktop-schemas
+, adwaita-icon-theme
+, docbook_xsl
+, docbook_xml_dtd_42
+, desktop-file-utils
+, python3
+, gobject-introspection
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "gnome-books";
@@ -15,15 +36,32 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext libxslt desktop-file-utils
-    docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3
+    meson
+    ninja
+    pkgconfig
+    gettext
+    libxslt
+    desktop-file-utils
+    docbook_xsl
+    docbook_xml_dtd_42
+    wrapGAppsHook
+    python3
   ];
 
   buildInputs = [
-    gtk3 glib gsettings-desktop-schemas
-    gdk-pixbuf adwaita-icon-theme evince
-    webkitgtk gjs gobject-introspection tracker
-    tracker-miners gnome-desktop libgepub
+    gtk3
+    glib
+    gsettings-desktop-schemas
+    gdk-pixbuf
+    adwaita-icon-theme
+    evince
+    webkitgtk
+    gjs
+    gobject-introspection
+    tracker
+    tracker-miners
+    gnome-desktop
+    libgepub
   ];
 
   postPatch = ''

From 05318e22b306f2043e88d9fd8566029301ba8f26 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 20:19:39 -0400
Subject: [PATCH 0297/3942] amtk: reformat

---
 pkgs/development/libraries/amtk/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix
index db97b0aa6f55..df8a5838705c 100644
--- a/pkgs/development/libraries/amtk/default.nix
+++ b/pkgs/development/libraries/amtk/default.nix
@@ -1,10 +1,16 @@
-{ stdenv, fetchurl, gtk3
-, pkgconfig, gobject-introspection, gnome3, dbus, xvfb_run }:
-let
-  version = "5.1.1";
+{ stdenv
+, fetchurl
+, gtk3
+, pkgconfig
+, gobject-introspection
+, gnome3
+, dbus
+, xvfb_run
+}:
+
+stdenv.mkDerivation rec {
   pname = "amtk";
-in stdenv.mkDerivation {
-  name = "${pname}-${version}";
+  version = "5.1.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

From d8d4cdc496777f91263a517fd832abb300e82ce4 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 20:51:38 -0400
Subject: [PATCH 0298/3942] tracker: 2.3.4 -> 3.0.0

---
 .../development/libraries/tracker/default.nix | 28 +++++++++++--------
 .../libraries/tracker/fix-paths.patch         | 25 +++++++++--------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index fb111829c7e1..cde81146d4c4 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -4,6 +4,7 @@
 , meson
 , ninja
 , pkgconfig
+, asciidoc
 , gobject-introspection
 , python3
 , gtk-doc
@@ -31,19 +32,19 @@
 
 stdenv.mkDerivation rec {
   pname = "tracker";
-  version = "2.3.4";
+  version = "3.0.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0vai0qz9jn3z5dlzysynwhbbmslp84ygdql81f5wfxxr98j54yap";
+    sha256 = "0drqsfqc4smfbpjk74iap114yww5cpldfhn4z6b0aavmylalb1kh";
   };
 
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
-      gdbus = "${glib.bin}/bin/gdbus";
+      inherit asciidoc;
     })
   ];
 
@@ -52,6 +53,7 @@ stdenv.mkDerivation rec {
     ninja
     vala
     pkgconfig
+    asciidoc
     gettext
     libxslt
     wrapGAppsHook
@@ -83,8 +85,6 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
-    # "-Dfunctional_tests=true"
     "-Ddocs=true"
   ];
 
@@ -106,9 +106,17 @@ stdenv.mkDerivation rec {
     # though, so we need to replace the absolute path with a local one during build.
     # We are using a symlink that will be overridden during installation.
     mkdir -p $out/lib
-    ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0
-    ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0
-    ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so
+    ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0.so $out/lib/libtracker-sparql-3.0.so.0
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+
+    dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      meson test --print-errorlogs
+
+    runHook postCheck
   '';
 
   postCheck = ''
@@ -116,10 +124,6 @@ stdenv.mkDerivation rec {
     rm -r $out/lib
   '';
 
-  postInstall = ''
-    glib-compile-schemas "$out/share/glib-2.0/schemas"
-  '';
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/pkgs/development/libraries/tracker/fix-paths.patch b/pkgs/development/libraries/tracker/fix-paths.patch
index f5c13c3fcdaf..5e4d8657f7bc 100644
--- a/pkgs/development/libraries/tracker/fix-paths.patch
+++ b/pkgs/development/libraries/tracker/fix-paths.patch
@@ -1,12 +1,13 @@
---- a/src/tracker-store/tracker-store.desktop.in
-+++ b/src/tracker-store/tracker-store.desktop.in
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Name=Tracker Store
- Comment=Metadata database store and lookup manager
--Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
-+Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
- Terminal=false
- Type=Application
- Categories=Utility;
- X-GNOME-Autostart-enabled=true
+diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
+index f90c757cf..40d9c939d 100644
+--- a/docs/manpages/meson.build
++++ b/docs/manpages/meson.build
+@@ -32,7 +32,7 @@ foreach m : manpages
+     command: [xsltproc,
+               '--output', '@OUTPUT@',
+               '--stringparam', 'man.authors.section.enabled', '0',
+-              '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
++              '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
+     input: xml,
+     output: manpage,
+     install: true,

From d2cba8af0aca198beea57090dcabfc4663b2757e Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 20:53:32 -0400
Subject: [PATCH 0299/3942] tracker_2: init at 2.3.4

The following apps still need the old tracker:
- photos
- games
- books
- documents
---
 .../libraries/tracker/2.x/default.nix         | 137 ++++++++++++++++++
 .../libraries/tracker/2.x/fix-paths.patch     |  12 ++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 151 insertions(+)
 create mode 100644 pkgs/development/libraries/tracker/2.x/default.nix
 create mode 100644 pkgs/development/libraries/tracker/2.x/fix-paths.patch

diff --git a/pkgs/development/libraries/tracker/2.x/default.nix b/pkgs/development/libraries/tracker/2.x/default.nix
new file mode 100644
index 000000000000..fb111829c7e1
--- /dev/null
+++ b/pkgs/development/libraries/tracker/2.x/default.nix
@@ -0,0 +1,137 @@
+{ stdenv
+, fetchurl
+, gettext
+, meson
+, ninja
+, pkgconfig
+, gobject-introspection
+, python3
+, gtk-doc
+, docbook_xsl
+, docbook_xml_dtd_412
+, docbook_xml_dtd_43
+, docbook_xml_dtd_45
+, libxml2
+, glib
+, wrapGAppsHook
+, vala
+, sqlite
+, libxslt
+, libstemmer
+, gnome3
+, icu
+, libuuid
+, networkmanager
+, libsoup
+, json-glib
+, systemd
+, dbus
+, substituteAll
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tracker";
+  version = "2.3.4";
+
+  outputs = [ "out" "dev" "devdoc" ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0vai0qz9jn3z5dlzysynwhbbmslp84ygdql81f5wfxxr98j54yap";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      gdbus = "${glib.bin}/bin/gdbus";
+    })
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    vala
+    pkgconfig
+    gettext
+    libxslt
+    wrapGAppsHook
+    gobject-introspection
+    gtk-doc
+    docbook_xsl
+    docbook_xml_dtd_412
+    docbook_xml_dtd_43
+    docbook_xml_dtd_45
+    python3 # for data-generators
+    systemd # used for checks to install systemd user service
+    dbus # used for checks and pkgconfig to install dbus service/s
+  ];
+
+  buildInputs = [
+    glib
+    libxml2
+    sqlite
+    icu
+    networkmanager
+    libsoup
+    libuuid
+    json-glib
+    libstemmer
+  ];
+
+  checkInputs = [
+    python3.pkgs.pygobject3
+  ];
+
+  mesonFlags = [
+    # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
+    # "-Dfunctional_tests=true"
+    "-Ddocs=true"
+  ];
+
+  doCheck = true;
+
+  postPatch = ''
+    patchShebangs utils/g-ir-merge/g-ir-merge
+    patchShebangs utils/data-generators/cc/generate
+    patchShebangs tests/functional-tests/test-runner.sh.in
+    patchShebangs tests/functional-tests/*.py
+  '';
+
+  preCheck = ''
+    # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file
+    export HOME=$(mktemp -d)
+
+    # Our gobject-introspection patches make the shared library paths absolute
+    # in the GIR files. When running functional tests, the library is not yet installed,
+    # though, so we need to replace the absolute path with a local one during build.
+    # We are using a symlink that will be overridden during installation.
+    mkdir -p $out/lib
+    ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0
+    ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0
+    ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so
+  '';
+
+  postCheck = ''
+    # Clean up out symlinks
+    rm -r $out/lib
+  '';
+
+  postInstall = ''
+    glib-compile-schemas "$out/share/glib-2.0/schemas"
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      versionPolicy = "none";
+    };
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://wiki.gnome.org/Projects/Tracker";
+    description = "Desktop-neutral user information store, search tool and indexer";
+    maintainers = teams.gnome.members;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/tracker/2.x/fix-paths.patch b/pkgs/development/libraries/tracker/2.x/fix-paths.patch
new file mode 100644
index 000000000000..f5c13c3fcdaf
--- /dev/null
+++ b/pkgs/development/libraries/tracker/2.x/fix-paths.patch
@@ -0,0 +1,12 @@
+--- a/src/tracker-store/tracker-store.desktop.in
++++ b/src/tracker-store/tracker-store.desktop.in
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Name=Tracker Store
+ Comment=Metadata database store and lookup manager
+-Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
++Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
+ Terminal=false
+ Type=Application
+ Categories=Utility;
+ X-GNOME-Autostart-enabled=true
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6426540f5196..b08c48227300 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3400,6 +3400,8 @@ in
 
   tracker = callPackage ../development/libraries/tracker { };
 
+  tracker_2 = callPackage ../development/libraries/tracker/2.x { };
+
   tracker-miners = callPackage ../development/libraries/tracker-miners { };
 
   tracy = callPackage ../development/tools/tracy {

From b2e2b8cb2b819a3833acb4d55eae7a7a6e943329 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 20:57:09 -0400
Subject: [PATCH 0300/3942] tracker-miners: 2.3.3 -> 3.0.0

- The ontologies were moved to tracker-miners
---
 .../libraries/tracker-miners/default.nix      | 31 +++++++++----------
 .../libraries/tracker-miners/fix-paths.patch  | 24 +++++++-------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix
index f93721bdfc17..73598470eedf 100644
--- a/pkgs/development/libraries/tracker-miners/default.nix
+++ b/pkgs/development/libraries/tracker-miners/default.nix
@@ -1,7 +1,10 @@
 { stdenv
 , fetchurl
 , substituteAll
-, intltool
+, asciidoc
+, docbook-xsl-nons
+, docbook_xml_dtd_45
+, gettext
 , itstool
 , libxslt
 , gexiv2
@@ -15,7 +18,6 @@
 , dbus
 , evolution-data-server
 , exempi
-, flac
 , giflib
 , glib
 , gnome3
@@ -35,9 +37,10 @@
 , libsoup
 , libtiff
 , libuuid
-, libvorbis
 , libxml2
+, networkmanager
 , poppler
+, systemd
 , taglib
 , upower
 , totem-pl-parser
@@ -45,15 +48,18 @@
 
 stdenv.mkDerivation rec {
   pname = "tracker-miners";
-  version = "2.3.3";
+  version = "3.0.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "06abxrnrz7xayykrabn135rpsm6z0fqw7gibrb9j09l6swlalwkl";
+    sha256 = "0hj0ixrladm7sxcmi0hr6d7wdlg9zcq0cyk22prg9pn54dy1lj5v";
   };
 
   nativeBuildInputs = [
-    intltool
+    asciidoc
+    docbook-xsl-nons
+    docbook_xml_dtd_45
+    gettext
     itstool
     libxslt
     meson
@@ -69,7 +75,6 @@ stdenv.mkDerivation rec {
     dbus
     evolution-data-server
     exempi
-    flac
     giflib
     glib
     gexiv2
@@ -92,9 +97,10 @@ stdenv.mkDerivation rec {
     libsoup
     libtiff
     libuuid
-    libvorbis
     libxml2
+    networkmanager
     poppler
+    systemd
     taglib
     upower
   ];
@@ -102,19 +108,12 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     # TODO: tests do not like our sandbox
     "-Dfunctional_tests=false"
-    "-Ddbus_services=${placeholder "out"}/share/dbus-1/services"
-    "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user"
   ];
 
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
-      inherit tracker;
-    })
-    # https://bugzilla.gnome.org/show_bug.cgi?id=795576
-    (fetchurl {
-      url = "https://bugzilla.gnome.org/attachment.cgi?id=371427";
-      sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf";
+      inherit asciidoc;
     })
   ];
 
diff --git a/pkgs/development/libraries/tracker-miners/fix-paths.patch b/pkgs/development/libraries/tracker-miners/fix-paths.patch
index ce44416055c4..8661648eacdf 100644
--- a/pkgs/development/libraries/tracker-miners/fix-paths.patch
+++ b/pkgs/development/libraries/tracker-miners/fix-paths.patch
@@ -1,11 +1,13 @@
---- a/src/libtracker-miners-common/tracker-domain-ontology.c
-+++ b/src/libtracker-miners-common/tracker-domain-ontology.c
-@@ -323,7 +323,7 @@
- 			goto end;
- 		}
- 	} else {
--		path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies",
-+		path = g_build_filename ("@tracker@", "share", "tracker", "domain-ontologies",
- 		                         DEFAULT_RULE, NULL);
- 
- 		if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
+diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
+index 0b8a64863..a09db59f0 100644
+--- a/docs/manpages/meson.build
++++ b/docs/manpages/meson.build
+@@ -43,7 +43,7 @@ foreach m : daemon_manpages + cli_manpages
+     command: [xsltproc,
+               '--output', '@OUTPUT@',
+               '--stringparam', 'man.authors.section.enabled', '0',
+-              '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
++              '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
+     input: xml,
+     output: manpage,
+     install: true,

From 620c1ef3a087102f95a5d95abe7b358f4c287bd4 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 20:57:35 -0400
Subject: [PATCH 0301/3942] tracker-miners-2: init at 2.3.3

---
 .../libraries/tracker-miners/2.x/default.nix  | 139 ++++++++++++++++++
 .../tracker-miners/2.x/fix-paths.patch        |  11 ++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 152 insertions(+)
 create mode 100644 pkgs/development/libraries/tracker-miners/2.x/default.nix
 create mode 100644 pkgs/development/libraries/tracker-miners/2.x/fix-paths.patch

diff --git a/pkgs/development/libraries/tracker-miners/2.x/default.nix b/pkgs/development/libraries/tracker-miners/2.x/default.nix
new file mode 100644
index 000000000000..f588fbf25812
--- /dev/null
+++ b/pkgs/development/libraries/tracker-miners/2.x/default.nix
@@ -0,0 +1,139 @@
+{ stdenv
+, fetchurl
+, substituteAll
+, intltool
+, itstool
+, libxslt
+, gexiv2
+, tracker_2
+, meson
+, ninja
+, pkgconfig
+, vala
+, wrapGAppsHook
+, bzip2
+, dbus
+, evolution-data-server
+, exempi
+, flac
+, giflib
+, glib
+, gnome3
+, gst_all_1
+, icu
+, json-glib
+, libcue
+, libexif
+, libgrss
+, libgsf
+, libgxps
+, libiptcdata
+, libjpeg
+, libosinfo
+, libpng
+, libseccomp
+, libsoup
+, libtiff
+, libuuid
+, libvorbis
+, libxml2
+, poppler
+, taglib
+, upower
+, totem-pl-parser
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tracker-miners";
+  version = "2.3.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "06abxrnrz7xayykrabn135rpsm6z0fqw7gibrb9j09l6swlalwkl";
+  };
+
+  nativeBuildInputs = [
+    intltool
+    itstool
+    libxslt
+    meson
+    ninja
+    pkgconfig
+    vala
+    wrapGAppsHook
+  ];
+
+  # TODO: add libenca, libosinfo
+  buildInputs = [
+    bzip2
+    dbus
+    evolution-data-server
+    exempi
+    flac
+    giflib
+    glib
+    gexiv2
+    totem-pl-parser
+    tracker_2
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+    icu
+    json-glib
+    libcue
+    libexif
+    libgrss
+    libgsf
+    libgxps
+    libiptcdata
+    libjpeg
+    libosinfo
+    libpng
+    libseccomp
+    libsoup
+    libtiff
+    libuuid
+    libvorbis
+    libxml2
+    poppler
+    taglib
+    upower
+  ];
+
+  mesonFlags = [
+    # TODO: tests do not like our sandbox
+    "-Dfunctional_tests=false"
+    "-Ddbus_services=${placeholder "out"}/share/dbus-1/services"
+    "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user"
+  ];
+
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit tracker_2;
+    })
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795576
+    (fetchurl {
+      url = "https://bugzilla.gnome.org/attachment.cgi?id=371427";
+      sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf";
+    })
+  ];
+
+  postInstall = ''
+    glib-compile-schemas "$out/share/glib-2.0/schemas"
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      versionPolicy = "none";
+    };
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://wiki.gnome.org/Projects/Tracker";
+    description = "Desktop-neutral user information store, search tool and indexer";
+    maintainers = teams.gnome.members;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/tracker-miners/2.x/fix-paths.patch b/pkgs/development/libraries/tracker-miners/2.x/fix-paths.patch
new file mode 100644
index 000000000000..f0c4449f0458
--- /dev/null
+++ b/pkgs/development/libraries/tracker-miners/2.x/fix-paths.patch
@@ -0,0 +1,11 @@
+--- a/src/libtracker-miners-common/tracker-domain-ontology.c
++++ b/src/libtracker-miners-common/tracker-domain-ontology.c
+@@ -323,7 +323,7 @@
+ 			goto end;
+ 		}
+ 	} else {
+-		path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies",
++		path = g_build_filename ("@tracker_2@", "share", "tracker", "domain-ontologies",
+ 		                         DEFAULT_RULE, NULL);
+
+ 		if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b08c48227300..70db6da4bc3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3404,6 +3404,8 @@ in
 
   tracker-miners = callPackage ../development/libraries/tracker-miners { };
 
+  tracker-miners-2 = callPackage ../development/libraries/tracker-miners/2.x { };
+
   tracy = callPackage ../development/tools/tracy {
     inherit (darwin.apple_sdk.frameworks) Carbon AppKit;
   };

From 7186dd6a0127fc859207e9eb073e7bee42f334f9 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 20:59:56 -0400
Subject: [PATCH 0302/3942] gnome3.gnome-photos: use tracker_2

---
 pkgs/applications/graphics/gnome-photos/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index 9ce176033af1..671311d10fd1 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -28,8 +28,8 @@
 , nixosTests
 , pkgconfig
 , python3
-, tracker
-, tracker-miners
+, tracker_2
+, tracker-miners-2
 , wrapGAppsHook
 }:
 
@@ -84,8 +84,8 @@ stdenv.mkDerivation rec {
     gtk3
     libdazzle
     libgdata
-    tracker
-    tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
+    tracker_2
+    tracker-miners-2 # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
 
     at-spi2-core # for tests
   ];

From fff50fd7ca6b410927cd2a815ccda02f1c0bd5c4 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 21:00:14 -0400
Subject: [PATCH 0303/3942] gnome3.gnome-books: use tracker_2

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
index 37840560837e..9685ffbd35cf 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
@@ -8,8 +8,8 @@
 , pkgconfig
 , gtk3
 , glib
-, tracker
-, tracker-miners
+, tracker_2
+, tracker-miners-2
 , libxslt
 , webkitgtk
 , gnome-desktop
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
     webkitgtk
     gjs
     gobject-introspection
-    tracker
-    tracker-miners
+    tracker_2
+    tracker-miners-2
     gnome-desktop
     libgepub
   ];

From fafb12ce3f1464ab054b921709bb01e98167c657 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 21:00:30 -0400
Subject: [PATCH 0304/3942] gnome3.gnome-documents: use tracker_2

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 8d5501537a0f..2983e0adca41 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -8,8 +8,8 @@
 , pkgconfig
 , gtk3
 , glib
-, tracker
-, tracker-miners
+, tracker_2
+, tracker-miners-2
 , itstool
 , libxslt
 , webkitgtk
@@ -69,8 +69,8 @@ stdenv.mkDerivation rec {
     webkitgtk
     gjs
     gobject-introspection
-    tracker
-    tracker-miners
+    tracker_2
+    tracker-miners-2
     libgdata
     gnome-desktop
     libzapojit

From f0712e782cafefdd69ad9cd5be1cd8499fcdfc6b Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 22:07:35 -0400
Subject: [PATCH 0305/3942] gnome-builder: 3.36.1 -> 3.38.0

https://gitlab.gnome.org/GNOME/gnome-builder/-/blob/3.38.0/NEWS
---
 pkgs/applications/editors/gnome-builder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index a94ab58a78fe..bee059ecd2d2 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -40,11 +40,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-builder";
-  version = "3.36.1";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "17pvmd5jypar8dkr6w56hvf7jnq4l1wih2wwgkrv7sblr7rkkar2";
+    sha256 = "1olTi6+O+xrPfqYHJosaqhQY1VF9ktT2lGo9v4FOrlU=";
   };
 
   nativeBuildInputs = [

From f0c3fa3a067feb95c1e27b1bf038576b0669f277 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 22:10:25 -0400
Subject: [PATCH 0306/3942] gnome3.gnome-sound-recorder: 3.34.0 -> 3.38.0

* add libhandy
* cleanup

https://gitlab.gnome.org/GNOME/gnome-sound-recorder/-/blob/3.38.0/data/appdata/org.gnome.SoundRecorder.metainfo.xml.in.in
---
 .../apps/gnome-sound-recorder/default.nix     | 52 +++++++++++++++----
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
index f4a72fdfb482..6875b2ec814a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
@@ -1,30 +1,60 @@
-{ stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk-pixbuf, gst_all_1, gnome3
-, meson, ninja, python3, desktop-file-utils }:
+{ stdenv
+, fetchurl
+, pkgconfig
+, gettext
+, gobject-introspection
+, wrapGAppsHook
+, gjs
+, glib
+, gtk3
+, gdk-pixbuf
+, gst_all_1
+, gnome3
+, meson
+, ninja
+, python3
+, desktop-file-utils
+, libhandy
+}:
 
 stdenv.mkDerivation rec {
   pname = "gnome-sound-recorder";
-  version = "3.34.0";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1i442qas2dkp5d9j9j1z1jicb4cb7jkgbcl4c36bmhvaq3hddwa9";
+    sha256 = "I5A/c2G+QQhw+6lHIJFnuW9JB2MGQdM8y6qOQvV0tpk=";
   };
 
   nativeBuildInputs = [
-    pkgconfig gettext meson ninja gobject-introspection
-    wrapGAppsHook python3 desktop-file-utils
+    pkgconfig
+    gettext
+    meson
+    ninja
+    gobject-introspection
+    wrapGAppsHook
+    python3
+    desktop-file-utils
   ];
-  buildInputs = [ gjs glib gtk3 gdk-pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]);
+
+  buildInputs = [
+    gjs
+    glib
+    gtk3
+    gdk-pixbuf
+    libhandy
+  ] ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad # for gstreamer-player-1.0
+  ]);
 
   postPatch = ''
     chmod +x build-aux/meson_post_install.py
     patchShebangs build-aux/meson_post_install.py
   '';
 
-  # TODO: fix this in gstreamer
-  # TODO: make stdenv.lib.getBin respect outputBin
-  PKG_CONFIG_GSTREAMER_1_0_TOOLSDIR = "${gst_all_1.gstreamer.dev}/bin";
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;

From 0a9ef8c75a877b61223d3b153042ecfd9e2b51ee Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 22:14:04 -0400
Subject: [PATCH 0307/3942] at-spi2-atk: 2.34.2 -> 2.38.0

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

diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index 6a1ca6d24d36..04f8c266131b 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "at-spi2-atk";
-  version = "2.34.2";
+  version = "2.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1w7l4xg00qx3dwhn0zaa64daiv5f073hdvjdxh0mrw7fw37264wh";
+    sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8=";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];

From d048c43ccd26ed682b0225f60d370d68c68371c5 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 22:15:04 -0400
Subject: [PATCH 0308/3942] at-spi2-core: 2.36.0 -> 2.38.0

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

diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 2c959434f01d..ba77020ec703 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "at-spi2-core";
-  version = "2.36.1";
+  version = "2.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0m3crrdbc9vdn9dr4lssdwrjmm8z5wxs2qhhnbkh1w5vkn87nhcp";
+    sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU=";
   };
 
   outputs = [ "out" "dev" ];

From da420c0c9b8d8be1f3b71357eb4ef795308130ad Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 22:16:05 -0400
Subject: [PATCH 0309/3942] gtksourceview3: drop updateScript

this is frozen
---
 pkgs/development/libraries/gtksourceview/3.x.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index d882d3b1a6c1..d32a0eebf137 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala
-, libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
+, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
 
 stdenv.mkDerivation rec {
   pname = "gtksourceview";
@@ -42,13 +42,6 @@ stdenv.mkDerivation rec {
       make check
   '';
 
-  passthru = {
-    updateScript = gnome3.updateScript {
-      packageName = "gtksourceview";
-      attrPath = "gtksourceview3";
-    };
-  };
-
   meta = with stdenv.lib; {
     homepage = "https://wiki.gnome.org/Projects/GtkSourceView";
     platforms = with platforms; linux ++ darwin;

From 667cf4acc401246746c90b261da8aee02102d0f1 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 22:16:56 -0400
Subject: [PATCH 0310/3942] jsonrpc-glib: 3.34.0 -> 3.38.0

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

diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix
index b641a5473023..61f357689c4d 100644
--- a/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
 stdenv.mkDerivation rec {
   pname = "jsonrpc-glib";
-  version = "3.34.0";
+  version = "3.38.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0j05x4xv2cp3cbmp30m68z8g4rdw7b030ip4wszyfj9ya15v5kni";
+    sha256 = "3F8ZFKkRUrcPqPyaEe3hMUirSvZE2yejZjI4jJJ6ioI=";
   };
 
   mesonFlags = [

From 37ad803693bef71c1afedd55156b6382aeca0fea Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 22:17:39 -0400
Subject: [PATCH 0311/3942] libmanette: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix
index eb3cbf4bfef0..83ee19075de5 100644
--- a/pkgs/development/libraries/libmanette/default.nix
+++ b/pkgs/development/libraries/libmanette/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libmanette";
-  version = "0.2.4";
+  version = "0.2.5";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1xrc6rh73v5w3kbkflzv1yg8sbxk4wf06hfk95raxhxlssza9q2g";
+    sha256 = "gAbghIDAy9T3SewVWCfRAER88jkD+tgkCnxMMhqgmis=";
   };
 
   nativeBuildInputs = [

From 1cd0c14b29de3c67ad662c4bd132bcfe4c7c29e9 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 22:18:55 -0400
Subject: [PATCH 0312/3942] librsvg: 2.48.8 -> 2.50.0

---
 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 fb61b50346d1..59e56f20703f 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -4,14 +4,14 @@
 
 let
   pname = "librsvg";
-  version = "2.48.8";
+  version = "2.50.0";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "14i6xzghcidv64cyd3g0wdjbl82rph737yxn9s3x29nzpcjs707l";
+    sha256 = "s/rbokDwm5yYmKsgy3MRRnJD5gfPj5KLfF+EJHTuPfQ=";
   };
 
   outputs = [ "out" "dev" "installedTests" ];

From 4854814042507049e01bfbc88d2b1572ca2ce3fc Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 22:21:46 -0400
Subject: [PATCH 0313/3942] python3.pkgs.pygobject3: 3.36.1 -> 3.38.0

This no longer supports python3.
We should mark projects that use python2 pygobject3
as broken.

https://gitlab.gnome.org/GNOME/pygobject/-/blob/3.38.0/NEWS
---
 pkgs/development/python-modules/pygobject/3.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 9e38d6403970..6e34e7f91007 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -3,21 +3,19 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
 
 buildPythonPackage rec {
   pname = "pygobject";
-  version = "3.36.1";
+  version = "3.38.0";
+
+  disabled = ! isPy3k;
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8=";
+    sha256 = "A3LRu5Ei/Bn1AKJJsfOMK7Z0hQAPWIdJe0sgWz5whNU=";
   };
 
   outputs = [ "out" "dev" ];
 
-  mesonFlags = [
-    "-Dpython=python${if isPy3k then "3" else "2" }"
-  ];
-
   nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ];
   buildInputs = [ glib gobject-introspection ]
                  ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];

From 7c74d280c6b574073993ab57f27db5111e6feab5 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 22:23:34 -0400
Subject: [PATCH 0314/3942] python3.pkgs.pyatspi: 2.36.0 -> 2.38.0

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

diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index 74b9f7dfdebe..232e44d0999e 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyatspi";
-  version = "2.36.0";
+  version = "2.38.0";
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1pg1zzjl167iavin6xzzm20mh3m6dvl7d8h1r571s44yj6zw2dji";
+    sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0=";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From cb2786380a9b445fa7f33829e8068d4c30ca6ab0 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 22:27:04 -0400
Subject: [PATCH 0315/3942] gtranslator: 3.36.0 -> 3.38.0

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

diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix
index 5f217e69ea56..f091d867503b 100644
--- a/pkgs/tools/text/gtranslator/default.nix
+++ b/pkgs/tools/text/gtranslator/default.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gtranslator";
-  version = "3.36.0";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1lxd2nkji4jk8g2xmyc1a1r3ww710ddk91zh9psmx8xlb4xivaid";
+    sha256 = "282puBoi2SM74Y6Z/VxEj2qwV1nR6UwQWAu4McotdjU=";
   };
 
   nativeBuildInputs = [

From 0d69234cdebd15c6388329f699ab5d169236f9a6 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 20 Sep 2020 22:51:56 -0400
Subject: [PATCH 0316/3942] gnome3.gnome-initial-setup: 3.36.4 -> 3.38.0

* use gnome-tour
* update patch and maintain with git-series
* add gsettings-desktops-schemas
---
 .../{fix-paths.patch => 0001-fix-paths.patch} | 42 ++++++++++++-------
 .../core/gnome-initial-setup/default.nix      | 13 +++---
 2 files changed, 36 insertions(+), 19 deletions(-)
 rename pkgs/desktops/gnome-3/core/gnome-initial-setup/{fix-paths.patch => 0001-fix-paths.patch} (66%)

diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch
similarity index 66%
rename from pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch
rename to pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch
index 94e14f688b3c..d4065c144996 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch
@@ -1,25 +1,35 @@
+From 1ae0eca39ba6af27f37e2fe81395b91a2761a408 Mon Sep 17 00:00:00 2001
+Message-Id: <1ae0eca39ba6af27f37e2fe81395b91a2761a408.1600627676.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE <worldofpeace@protonmail.ch>
+Date: Sun, 20 Sep 2020 14:46:59 -0400
+Subject: [PATCH] fix paths
+
+---
+ data/gnome-welcome-tour                               | 4 ++--
+ gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 6 +++---
+ gnome-initial-setup/pages/timezone/tz.h               | 4 ++--
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
 diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour
-index c479296..3dd629c 100755
+index 51c9b59..68ab0c4 100755
 --- a/data/gnome-welcome-tour
 +++ b/data/gnome-welcome-tour
-@@ -3,7 +3,7 @@
+@@ -3,11 +3,11 @@
  cfgdir=${XDG_CONFIG_DIR:-$HOME/.config}
  
- # Don't do anything if yelp isn't installed
--yelp_path=$(which yelp 2>/dev/null)
-+yelp_path=@yelp@
- if test -z "${yelp_path}"; then
+ # Don't do anything if gnome-tour isn't installed
+-gnome_tour_path=$(which gnome-tour 2>/dev/null)
++gnome_tour_path="@gnome_tour@"
+ if test -z "${gnome_tour_path}"; then
      rm -f $cfgdir/run-welcome-tour
      exit
-@@ -17,5 +17,5 @@ geometry=(1024, 709)
- EOF
  fi
  
--yelp help:gnome-help/getting-started
-+$yelp_path help:gnome-help/getting-started
+-gnome-tour
++@gnome_tour@
  rm -f $cfgdir/run-welcome-tour
 diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
-index 1c34ef7..a1e7f93 100644
+index 196abf6..613d0e5 100644
 --- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
 +++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
 @@ -177,9 +177,9 @@ preview_cb (GtkLabel       *label,
@@ -34,7 +44,7 @@ index 1c34ef7..a1e7f93 100644
  	g_spawn_command_line_async (commandline, NULL);
  	g_free (commandline);
  
-@@ -829,7 +829,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass)
+@@ -831,7 +831,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass)
                  g_param_spec_string ("showing-extra", "", "", "",
                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
  
@@ -44,7 +54,7 @@ index 1c34ef7..a1e7f93 100644
  			      G_TYPE_FROM_CLASS (object_class),
  			      G_SIGNAL_RUN_FIRST,
 diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h
-index 93905b3..e7ee785 100644
+index a2376f8..5cb7bc9 100644
 --- a/gnome-initial-setup/pages/timezone/tz.h
 +++ b/gnome-initial-setup/pages/timezone/tz.h
 @@ -4,7 +4,7 @@
@@ -57,7 +67,7 @@ index 93905b3..e7ee785 100644
   *
   * This program is free software; you can redistribute it and/or modify
 @@ -28,7 +28,7 @@
- #include <glib.h>
+ G_BEGIN_DECLS
  
  #ifndef __sun
 -#  define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
@@ -65,3 +75,7 @@ index 93905b3..e7ee785 100644
  #else
  #  define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
  #endif
+
+base-commit: 5132e206a6bf81964450561d68473ac015760455
+-- 
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
index ff7b1f45e454..446851833dbe 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
@@ -32,15 +32,17 @@
 , tzdata
 , yelp
 , libgnomekbd
+, gsettings-desktop-schemas
+, gnome-tour
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-initial-setup";
-  version = "3.36.4";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "17szzz2a5wpi7kwjnhimiwf8vg0bfliyk3k0adgv1pw2mcfpxp5s";
+    hash = "sha256-OoV67177aJ9AhjLbhGmtJ2IPdi2XcHCjYDXFIsb4J1k=";
   };
 
   nativeBuildInputs = [
@@ -62,10 +64,12 @@ stdenv.mkDerivation rec {
     gnome-desktop
     gnome-getting-started-docs
     gnome-online-accounts
+    gsettings-desktop-schemas
     gtk3
     json-glib
     krb5
     libgweather
+    libnma
     libpwquality
     librest
     libsecret
@@ -73,14 +77,13 @@ stdenv.mkDerivation rec {
     pango
     polkit
     webkitgtk
-    libnma
   ];
 
   patches = [
     (substituteAll {
-      src = ./fix-paths.patch;
+      src = ./0001-fix-paths.patch;
       inherit tzdata libgnomekbd;
-      yelp = "${yelp}/bin/yelp"; # gnome-welcome-tour
+      gnome_tour = "${gnome-tour}/bin/gnome-tour";
     })
   ];
 

From c87e6738df0283d87a17e0af7c1105bd030c754b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 21 Sep 2020 13:49:40 +0200
Subject: [PATCH 0317/3942] networkmanager: fix build

Not sure why this is an issue now, likely a gtk-doc or gobject-introspection bump.
---
 pkgs/tools/networking/network-manager/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index f5b12a6cf373..c02275ef5b81 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -62,6 +62,13 @@ in stdenv.mkDerivation rec {
     # Meson does not support using different directories during build and
     # for installation like Autotools did with flags passed to make install.
     ./fix-install-paths.patch
+
+    # Fix build
+    # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/620
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/54e25f23f53af889703dfc50d51a8afeeea8a439.patch";
+      sha256 = "oy/AZhOC15anWeIMYJfDBcITqJ7CiU715he68XvPRxk=";
+    })
   ];
 
   buildInputs = [

From de1af76f0dec274f504829e116daeeb7f394b7cf Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Mon, 21 Sep 2020 17:55:03 +0100
Subject: [PATCH 0318/3942] glib: Fix tests on some FSs

By applying https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1648
---
 pkgs/development/libraries/glib/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 797547cadd22..d719c5037df6 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -83,6 +83,12 @@ stdenv.mkDerivation rec {
     # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out)
     #    * gio-launch-desktop
     ./split-dev-programs.patch
+
+    # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1648
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/glib/-/commit/642baa50fa561f7abfbbfe5ac9a10351a706b95a.patch";
+      sha256 = "0mrin6x6iy9x2bplz6q7ljdq677nmvcwhns7nkahj719h0qpzn0z";
+    })
   ] ++ optional doCheck ./skip-timer-test.patch;
 
   outputs = [ "bin" "out" "dev" "devdoc" ];

From 8ae59fa5c9b536136856ec6a2d96dcc1886595b6 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 25 Sep 2020 15:56:28 +0300
Subject: [PATCH 0319/3942] gnome3.gnome-control-center: Remove now unneeded
 libexecdir mesonFlag

They started to use regular `get_option('libexecdir')`. See
https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/2007a5b2406b48277fd9628bf00cb28e16109ed9
-> https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/2007a5b2406b48277fd9628bf00cb28e16109ed9/meson.build#L11
---
 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ----
 1 file changed, 4 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 4d2e363a1466..fe1583127719 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -150,10 +150,6 @@ stdenv.mkDerivation rec {
     patchShebangs build-aux/meson/meson_post_install.py
   '';
 
-  mesonFlags = [
-    "-Dgnome_session_libexecdir=${gnome-session}/libexec"
-  ];
-
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"

From bdbf92601749277cf5db56210feff3eeffd065ef Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 25 Sep 2020 16:22:37 +0300
Subject: [PATCH 0320/3942] gnome3.gnome-<several>: Use a gvc suitable for
 modern laptops

Address:
https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html

gnome3.gnome-{control-center,settings-daemon,shell} ship within their
tarball a copy of lignome-volume-control in the `subprojects/gvc/`. This
commit makes them use an updated version of it, which supports Modern
laptops with SOF for audio. Close #98470.
---
 .../core/gnome-control-center/default.nix       |  5 +++++
 .../core/gnome-settings-daemon/default.nix      |  6 ++++++
 .../gnome-3/core/gnome-shell/default.nix        |  6 ++++++
 .../gnome-3/core/gvc-with-ucm-prePatch.nix      | 17 +++++++++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix

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 fe1583127719..6c2713ee7f55 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,4 +1,5 @@
 { fetchurl
+, fetchFromGitLab
 , stdenv
 , substituteAll
 , accountsservice
@@ -74,6 +75,10 @@ stdenv.mkDerivation rec {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1nmi5mf7bffjyb7sd6kcv151j0mfmlqpzy2spaaxhf4wxywbbdpn";
   };
+  # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
+  prePatch = (import ../gvc-with-ucm-prePatch.nix {
+    inherit fetchFromGitLab;
+  });
 
   nativeBuildInputs = [
     docbook_xsl
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index 1dee170bd0a2..0be77e56f6e7 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, fetchFromGitLab
 , substituteAll
 , fetchurl
 , meson
@@ -47,6 +48,11 @@ stdenv.mkDerivation rec {
     sha256 = "0bkrsqzyrxvnw2x1p2a67k3f692ih3i5pafnxqn1kbcsmdgmpvdp";
   };
 
+  # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
+  prePatch = (import ../gvc-with-ucm-prePatch.nix {
+    inherit fetchFromGitLab;
+  });
+
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 4d578160c8cb..cc8430d0b8a5 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -1,4 +1,5 @@
 { fetchurl
+, fetchFromGitLab
 , fetchpatch
 , substituteAll
 , stdenv
@@ -77,6 +78,11 @@ stdenv.mkDerivation rec {
     sha256 = "15qabakial0jcsqkq1xg4fsssarixq6aqqksikdfcpl7q0xl09n6";
   };
 
+  # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
+  prePatch = (import ../gvc-with-ucm-prePatch.nix {
+    inherit fetchFromGitLab;
+  });
+
   patches = [
     # Hardcode paths to various dependencies so that they can be found at runtime.
     (substituteAll {
diff --git a/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix b/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix
new file mode 100644
index 000000000000..b2db2baf025d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix
@@ -0,0 +1,17 @@
+{ fetchFromGitLab }:
+
+let
+  # We need a gvc different then that which is shipped in the source tarball of
+  # whatever package that imports this file
+  gvc-src-with-ucm = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "libgnome-volume-control";
+    rev = "7a621180b46421e356b33972e3446775a504139c";
+    sha256 = "07rkgh9f7qcmlpy6jqh944axzh3z38f47g48ii842f2i3a1mrbw9";
+  };
+in
+''
+  rm -r ./subprojects/gvc
+  cp -r ${gvc-src-with-ucm} ./subprojects/gvc
+''

From 00d2ae41c5e2d645be0561c39470d57503609990 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 25 Sep 2020 19:12:59 -0400
Subject: [PATCH 0321/3942] gnome3.gnome-session-ctl: init at 3.38.0

---
 .../gnome-3/core/gnome-session/ctl.nix        | 41 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-session/ctl.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix b/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix
new file mode 100644
index 000000000000..6bc18d5379f4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, glib
+, systemd
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gnome-session-ctl";
+  version = "3.38.0";
+
+  src = fetchFromGitHub {
+    owner = "nix-community";
+    repo = pname;
+    rev = "c20907fea27fa96568b8375a6756c40d0bfb9e40"; # main
+    hash = "sha256-y9/yOH6N8wf93+gPqnqzRzV/lPXYD0M6v7dsLFF8lWo=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    glib
+    systemd
+  ];
+
+  meta = with stdenv.lib; {
+    description = "gnome-session-ctl extracted from gnome-session for nixpkgs";
+    homepage = "https://github.com/nix-community/gnome-session-ctl";
+    license = licenses.gpl2Plus;
+    maintainers = teams.gnome.members;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 846eefa9fa98..302ad2c21aa9 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -79,6 +79,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gnome-session = callPackage ./core/gnome-session { };
 
+  gnome-session-ctl = callPackage ./core/gnome-session/ctl.nix { };
+
   gnome-shell = callPackage ./core/gnome-shell { };
 
   gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };

From f971cbe31d65608a64acd4c4f6a420a5885ef5fd Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 25 Sep 2020 19:18:27 -0400
Subject: [PATCH 0322/3942] gnome3.gnome-settings-daemon: use nixpkgs
 gnome-session-ctl

Using https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 for this.
---
 .../gnome-3/core/gnome-settings-daemon/default.nix       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index 0be77e56f6e7..59833f83f6e9 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchFromGitLab
+, fetchpatch
 , substituteAll
 , fetchurl
 , meson
@@ -37,6 +38,7 @@
 , tzdata
 , nss
 , gcr
+, gnome-session-ctl
 }:
 
 stdenv.mkDerivation rec {
@@ -54,6 +56,12 @@ stdenv.mkDerivation rec {
   });
 
   patches = [
+    # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/aae1e774dd9de22fe3520cf9eb2bfbf7216f5eb0.patch";
+      sha256 = "O4m0rOW8Zrgu3Q0p0OA8b951VC0FjYbOUk9MLzB9icI=";
+    })
+
     (substituteAll {
       src = ./fix-paths.patch;
       inherit tzdata;
@@ -101,6 +109,7 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dudev_dir=${placeholder "out"}/lib/udev"
+    "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl"
   ];
 
   # Default for release buildtype but passed manually because

From 934b20866a05b46f8d7ca889e0983874476bd365 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 25 Sep 2020 19:50:47 -0400
Subject: [PATCH 0323/3942] gnome3.gnome-session: use provided
 gnome-session-ctl

---
 .../desktops/gnome-3/core/gnome-session/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 3be0a51016db..4684f3ebee0b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas
 , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
-, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
+, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-session";
@@ -39,6 +39,14 @@ stdenv.mkDerivation rec {
   postPatch = ''
     chmod +x meson_post_install.py # patchShebangs requires executable file
     patchShebangs meson_post_install.py
+
+    # Use our provided `gnome-session-ctl`
+    original="@libexecdir@/gnome-session-ctl"
+    replacement="${gnome-session-ctl}/libexec/gnome-session-ctl"
+
+    find data/ -type f -name "*.service.in" -exec sed -i \
+      -e s,$original,$replacement,g \
+      {} +
   '';
 
   # `bin/gnome-session` will reset the environment when run in wayland, we
@@ -59,6 +67,9 @@ stdenv.mkDerivation rec {
     mkdir $sessions
     moveToOutput share/wayland-sessions "$sessions"
     moveToOutput share/xsessions "$sessions"
+
+    # Our provided one is being used
+    rm -rf $out/libexec/gnome-session-ctl
   '';
 
   passthru = {

From 6b7bb526448b92bebed8237b3e62c9112129fd02 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 25 Sep 2020 21:09:23 -0400
Subject: [PATCH 0324/3942] gnome3.mutter334: 3.34.5 -> 3.34.6, update patches

Now managing patches using my git-series.

* drop xwayland-path
  It now uses find_program.path()

* add 0007-build-bump-ABI-to-sysprof-capture-4.patch
  This allows us to build with the sysprof in nixpkgs.
---
 .../0001-EGL-Include-EGL-eglmesaext.h.patch   |  74 +++++++++++++
 ...able.patch => 0002-drop-inheritable.patch} |  51 ++++-----
 ....patch => 0003-Fix-glitches-in-gala.patch} |  16 +--
 ...er-track-changes-in-GLib-and-Sysprof.patch |  58 ++++++++++
 ...isplay.h-to-meta-workspace-manager.h.patch |  32 ++++++
 ...-build-bump-ABI-to-sysprof-capture-4.patch | 102 ++++++++++++++++++
 .../core/mutter/3.34/0007-fix-paths.patch     |  27 +++++
 .../gnome-3/core/mutter/3.34/default.nix      |  50 ++-------
 .../gnome-3/core/mutter/3.34/fix-paths.patch  |  13 ---
 .../core/mutter/3.34/fix-sysprof.patch        |  25 -----
 10 files changed, 339 insertions(+), 109 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch
 rename pkgs/desktops/gnome-3/core/mutter/3.34/{drop-inheritable.patch => 0002-drop-inheritable.patch} (82%)
 rename pkgs/desktops/gnome-3/core/mutter/3.34/{0001-Fix-glitches-in-gala.patch => 0003-Fix-glitches-in-gala.patch} (60%)
 create mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch
 create mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch
 create mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch
 create mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch
 delete mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/fix-paths.patch
 delete mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch

diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch
new file mode 100644
index 000000000000..3691c034d1ee
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch
@@ -0,0 +1,74 @@
+From 7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d Mon Sep 17 00:00:00 2001
+Message-Id: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE <worldofpeace@protonmail.ch>
+Date: Sun, 20 Oct 2019 12:04:31 +0200
+Subject: [PATCH 1/7] EGL: Include EGL/eglmesaext.h
+
+From: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+The eglext.h shipped by libglvnd does not include the Mesa extensions,
+unlike the header shipped in Mesa.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
+
+(cherry picked from commit a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90)
+---
+ cogl/cogl/meson.build       | 2 +-
+ src/backends/meta-egl-ext.h | 1 +
+ src/backends/meta-egl.c     | 1 +
+ src/backends/meta-egl.h     | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
+index 1057ef9..9a64294 100644
+--- a/cogl/cogl/meson.build
++++ b/cogl/cogl/meson.build
+@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file(
+ built_headers += [cogl_gl_header_h]
+ 
+ if have_egl
+-  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>'
++  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>'
+ else
+   cogl_egl_includes_string = ''
+ endif
+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
+index 8705e7d..db0b74f 100644
+--- a/src/backends/meta-egl-ext.h
++++ b/src/backends/meta-egl-ext.h
+@@ -29,6 +29,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ 
+ /*
+  * This is a little different to the tests shipped with EGL implementations,
+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
+index 6554be9..fdeff4f 100644
+--- a/src/backends/meta-egl.c
++++ b/src/backends/meta-egl.c
+@@ -27,6 +27,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <gio/gio.h>
+ #include <glib.h>
+ #include <glib-object.h>
+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
+index f2a8164..4591e7d 100644
+--- a/src/backends/meta-egl.h
++++ b/src/backends/meta-egl.h
+@@ -28,6 +28,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <glib-object.h>
+ 
+ #define META_EGL_ERROR meta_egl_error_quark ()
+
+base-commit: 48ffbb582404c1d52196eb6cc5f082c31ca4910c
+-- 
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch
similarity index 82%
rename from pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch
rename to pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch
index 0f60be3a1217..28f89ac7c0c6 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch
@@ -1,36 +1,40 @@
-From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
+From 14cee101882e65a57dcd66ea0f8399477b23ce7e Mon Sep 17 00:00:00 2001
+Message-Id: <14cee101882e65a57dcd66ea0f8399477b23ce7e.1601082838.git-series.worldofpeace@protonmail.ch>
+In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE <worldofpeace@protonmail.ch>
 Date: Sat, 19 Oct 2019 13:26:05 +0200
-Subject: [PATCH] drop inheritable
+Subject: [PATCH 2/7] drop inheritable
+
+From: Tor Hedin Brønner <torhedinbronner@gmail.com>
 
 Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01
 
 We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell.
-
 ---
  config.h.meson    |  3 +++
  meson.build       |  5 +++++
  meson_options.txt |  6 ++++++
- src/core/main.c   | 11 +++++++++++
+ src/core/main.c   | 10 ++++++++++
  src/meson.build   |  1 +
- 5 files changed, 26 insertions(+)
+ 5 files changed, 25 insertions(+)
 
 diff --git a/config.h.meson b/config.h.meson
-index 0bab71848..202fb7ed1 100644
+index 0bab718..202fb7e 100644
 --- a/config.h.meson
 +++ b/config.h.meson
 @@ -58,6 +58,9 @@
  /* Xwayland applications allowed to issue keyboard grabs */
  #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES
-
+ 
 +/* Defined if libcap-ng is available */
 +#mesondefine HAVE_LIBCAPNG
 +
  /* XKB base prefix */
  #mesondefine XKB_BASE
-
+ 
 diff --git a/meson.build b/meson.build
-index 3322bd3b1..01c8020fa 100644
+index 29d495b..86970df 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7'
@@ -38,7 +42,7 @@ index 3322bd3b1..01c8020fa 100644
  libwacom_req = '>= 0.13'
  atk_req = '>= 2.5.3'
 +libcapng_req = '>= 0.7.9'
-
+ 
  # optional version requirements
  udev_req = '>= 228'
 @@ -125,6 +126,7 @@ xau_dep = dependency('xau')
@@ -46,7 +50,7 @@ index 3322bd3b1..01c8020fa 100644
  atk_dep = dependency('atk', version: atk_req)
  libcanberra_dep = dependency('libcanberra', version: libcanberra_req)
 +libcapng_dep = dependency('libcap-ng', required: get_option('libcapng'))
-
+ 
  # For now always require X11 support
  have_x11 = true
 @@ -256,6 +258,7 @@ have_core_tests = false
@@ -54,7 +58,7 @@ index 3322bd3b1..01c8020fa 100644
  have_clutter_tests = false
  have_installed_tests = false
 +have_libcapng = libcapng_dep.found()
-
+ 
  if have_tests
    have_core_tests = get_option('core_tests')
 @@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom)
@@ -63,7 +67,7 @@ index 3322bd3b1..01c8020fa 100644
  cdata.set('HAVE_INTROSPECTION', have_introspection)
 +cdata.set('HAVE_LIBCAPNG', have_libcapng)
  cdata.set('HAVE_PROFILER', have_profiler)
-
+ 
  xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base')
 @@ -443,6 +447,7 @@ output = [
    '        Startup notification..... ' + have_startup_notification.to_string(),
@@ -74,7 +78,7 @@ index 3322bd3b1..01c8020fa 100644
    '    Tests:',
    '',
 diff --git a/meson_options.txt b/meson_options.txt
-index 73aa7adde..8bfaacd9a 100644
+index 73aa7ad..8bfaacd 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules',
@@ -88,13 +92,13 @@ index 73aa7adde..8bfaacd9a 100644
 +  description: 'Enable libcap-ng support'
 +)
 diff --git a/src/core/main.c b/src/core/main.c
-index 7f4f666d2..b27968f13 100644
+index 3935f35..ecf3cb2 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
 @@ -66,6 +66,10 @@
  #include <girepository.h>
  #endif
-
+ 
 +#ifdef HAVE_LIBCAPNG
 +#include <cap-ng.h>
 +#endif
@@ -105,7 +109,7 @@ index 7f4f666d2..b27968f13 100644
 @@ -673,6 +677,12 @@ meta_run (void)
    if (!meta_display_open ())
      meta_exit (META_EXIT_ERROR);
-
+ 
 +#ifdef HAVE_LIBCAPNG
 +  capng_clear(CAPNG_SELECT_BOTH);
 +  capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE);
@@ -113,10 +117,10 @@ index 7f4f666d2..b27968f13 100644
 +#endif
 +
    g_main_loop_run (meta_main_loop);
-
+ 
    meta_finalize ();
 diff --git a/src/meson.build b/src/meson.build
-index 90d80734f..a9fffa2c2 100644
+index 90d8073..a9fffa2 100644
 --- a/src/meson.build
 +++ b/src/meson.build
 @@ -18,6 +18,7 @@ mutter_pkg_deps = [
@@ -126,7 +130,6 @@ index 90d80734f..a9fffa2c2 100644
 +  libcapng_dep,
    pango_dep,
  ]
-
---
-2.23.0
-
+ 
+-- 
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch
similarity index 60%
rename from pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch
rename to pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch
index 7be00b33bba5..9f78a324d9da 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch
@@ -1,7 +1,12 @@
-From e10186284103d3ad8e425980b096eac813cae631 Mon Sep 17 00:00:00 2001
+From 5d2b9a03f24b4dbc423adff52b2eeb478c4b5913 Mon Sep 17 00:00:00 2001
+Message-Id: <5d2b9a03f24b4dbc423adff52b2eeb478c4b5913.1601082838.git-series.worldofpeace@protonmail.ch>
+In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE <worldofpeace@protonmail.ch>
+Date: Sun,  5 Apr 2020 23:06:03 -0400
+Subject: [PATCH 3/7] Fix glitches in gala
+
 From: worldofpeace <worldofpeace@protonmail.ch>
-Date: Sun, 5 Apr 2020 23:06:03 -0400
-Subject: [PATCH] Fix glitches in gala
 
 This fixes issues for users of mutter like in gala[0].
 
@@ -12,7 +17,7 @@ Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
-index ecf9a597d..07b8b7155 100644
+index ecf9a59..07b8b71 100644
 --- a/clutter/clutter/clutter-actor.c
 +++ b/clutter/clutter/clutter-actor.c
 @@ -17831,7 +17831,7 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
@@ -25,5 +30,4 @@ index ecf9a597d..07b8b7155 100644
      }
    else
 -- 
-2.25.1
-
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch
new file mode 100644
index 000000000000..cd98d3950415
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch
@@ -0,0 +1,58 @@
+From 5a9f9fbaa1322b2ad0a52fcdd171d4f44d031918 Mon Sep 17 00:00:00 2001
+Message-Id: <5a9f9fbaa1322b2ad0a52fcdd171d4f44d031918.1601082838.git-series.worldofpeace@protonmail.ch>
+In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE <worldofpeace@protonmail.ch>
+Date: Wed, 30 Oct 2019 15:23:24 -0700
+Subject: [PATCH 4/7] profiler: track changes in GLib and Sysprof
+
+From: Christian Hergert <chergert@redhat.com>
+
+This tracks the changes to gdbus-codegen in terms of how GUnixFDList is
+done to use the UnixFD annotation.
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/908
+(cherry picked from commit 605171291993460f31d470a8143d6438d0c6169c)
+---
+ src/backends/meta-profiler.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/backends/meta-profiler.c b/src/backends/meta-profiler.c
+index 10d433a..0d62701 100644
+--- a/src/backends/meta-profiler.c
++++ b/src/backends/meta-profiler.c
+@@ -51,13 +51,12 @@ G_DEFINE_TYPE_WITH_CODE (MetaProfiler,
+ static gboolean
+ handle_start (MetaDBusSysprof3Profiler *dbus_profiler,
+               GDBusMethodInvocation    *invocation,
++              GUnixFDList              *fd_list,
+               GVariant                 *options,
+               GVariant                 *fd_variant)
+ {
+   MetaProfiler *profiler = META_PROFILER (dbus_profiler);
+   GMainContext *main_context = g_main_context_default ();
+-  GDBusMessage *message;
+-  GUnixFDList *fd_list;
+   const char *group_name;
+   int position;
+   int fd = -1;
+@@ -73,8 +72,6 @@ handle_start (MetaDBusSysprof3Profiler *dbus_profiler,
+ 
+   g_variant_get (fd_variant, "h", &position);
+ 
+-  message = g_dbus_method_invocation_get_message (invocation);
+-  fd_list = g_dbus_message_get_unix_fd_list (message);
+   if (fd_list)
+     fd = g_unix_fd_list_get (fd_list, position, NULL);
+ 
+@@ -98,7 +95,7 @@ handle_start (MetaDBusSysprof3Profiler *dbus_profiler,
+ 
+   g_debug ("Profiler running");
+ 
+-  meta_dbus_sysprof3_profiler_complete_start (dbus_profiler, invocation);
++  meta_dbus_sysprof3_profiler_complete_start (dbus_profiler, invocation, NULL);
+   return TRUE;
+ }
+ 
+-- 
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch
new file mode 100644
index 000000000000..138970ddda0a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch
@@ -0,0 +1,32 @@
+From 2caa072dd8e283a8e43febeab55fe8b76dda69b7 Mon Sep 17 00:00:00 2001
+Message-Id: <2caa072dd8e283a8e43febeab55fe8b76dda69b7.1601082838.git-series.worldofpeace@protonmail.ch>
+In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE <worldofpeace@protonmail.ch>
+Date: Wed, 29 Jan 2020 11:02:33 +0100
+Subject: [PATCH 5/7] meta: Add missing display.h to meta-workspace-manager.h
+
+From: Corentin Noël <corentin@elementary.io>
+
+This is required because MetaDisplayCorner is only defined in display.h
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/1025
+(cherry picked from commit 9d390ee49fb1f6300336e82ae94cc8061c6bae12)
+---
+ src/meta/meta-workspace-manager.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/meta/meta-workspace-manager.h b/src/meta/meta-workspace-manager.h
+index 0390c44..92cd681 100644
+--- a/src/meta/meta-workspace-manager.h
++++ b/src/meta/meta-workspace-manager.h
+@@ -26,6 +26,7 @@
+ #include <glib-object.h>
+ 
+ #include <meta/common.h>
++#include <meta/display.h>
+ #include <meta/prefs.h>
+ #include <meta/types.h>
+ 
+-- 
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch
new file mode 100644
index 000000000000..6d88f0f5e766
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch
@@ -0,0 +1,102 @@
+From 0c95e5a5b31eab93f149b90982680f38e8977063 Mon Sep 17 00:00:00 2001
+Message-Id: <0c95e5a5b31eab93f149b90982680f38e8977063.1601082838.git-series.worldofpeace@protonmail.ch>
+In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE <worldofpeace@protonmail.ch>
+Date: Sat,  4 Jul 2020 12:01:28 -0700
+Subject: [PATCH 6/7] build: bump ABI to sysprof-capture-4
+
+From: Christian Hergert <chergert@redhat.com>
+
+GLib will now be linking against sysprof-capture-4.a. To support that,
+sysprof had to remove the GLib dependency from sysprof-capture-4 which
+had the side-effect of breaking ABi.
+
+This bumps the dependency and includes a fallback to compile just the
+libsysprof-capture-4.a using a subproject wrap.
+
+https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1352
+(cherry picked from commit 2c08eb6d163b6758efec9eafe1d5c17fc1ab3692)
+---
+ meson.build              | 20 ++++++++++++++++++--
+ src/meson.build          |  8 ++++++--
+ subprojects/sysprof.wrap |  4 ++++
+ 3 files changed, 28 insertions(+), 4 deletions(-)
+ create mode 100644 subprojects/sysprof.wrap
+
+diff --git a/meson.build b/meson.build
+index 86970df..3dc0098 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,6 +1,6 @@
+ project('mutter', 'c',
+   version: '3.34.6',
+-  meson_version: '>= 0.50.0',
++  meson_version: '>= 0.51.0',
+   license: 'GPLv2+'
+ )
+ 
+@@ -52,6 +52,9 @@ gbm_req = '>= 10.3'
+ # screen cast version requirements
+ libpipewire_req = '>= 0.2.5'
+ 
++# profiler requirements
++sysprof_req = '>= 3.37.2'
++
+ gnome = import('gnome')
+ pkg = import('pkgconfig')
+ i18n  = import('i18n')
+@@ -275,7 +278,20 @@ endif
+ 
+ have_profiler = get_option('profiler')
+ if have_profiler
+-  sysprof_dep = dependency('sysprof-capture-3')
++  # libsysprof-capture support
++  sysprof_dep = dependency('sysprof-capture-4',
++    required: true,
++    default_options: [
++      'enable_examples=false',
++      'enable_gtk=false',
++      'enable_tests=false',
++      'enable_tools=false',
++      'libsysprof=false',
++      'with_sysprofd=none',
++      'help=false',
++    ],
++    fallback: ['sysprof', 'libsysprof_capture_dep'],
++  )
+ endif
+ 
+ required_functions = [
+diff --git a/src/meson.build b/src/meson.build
+index a9fffa2..a91baa1 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -711,9 +711,13 @@ if have_profiler
+     'backends/meta-profiler.h',
+   ]
+ 
+-  dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces')
+-  sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
++  if sysprof_dep.type_name() == 'pkgconfig'
++    sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces')
++  else
++    sysprof_dbus_interfaces_dir = join_paths(meson.source_root(), 'subprojects', 'sysprof', 'src')
++  endif
+ 
++  sysprof3_dbus_file = join_paths(sysprof_dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
+   dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
+       sysprof3_dbus_file,
+       interface_prefix: 'org.gnome.',
+diff --git a/subprojects/sysprof.wrap b/subprojects/sysprof.wrap
+new file mode 100644
+index 0000000..c8f5883
+--- /dev/null
++++ b/subprojects/sysprof.wrap
+@@ -0,0 +1,4 @@
++[wrap-git]
++directory=sysprof
++url=https://gitlab.gnome.org/GNOME/sysprof.git
++revision=cae28263ff5dd4a510d82f3dc2e3a3b3d9b386fb
+-- 
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch
new file mode 100644
index 000000000000..8376fc649b5f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch
@@ -0,0 +1,27 @@
+From 7bbbf082599ec786f64f2135c9acc0b4fe2ecbf4 Mon Sep 17 00:00:00 2001
+Message-Id: <7bbbf082599ec786f64f2135c9acc0b4fe2ecbf4.1601082838.git-series.worldofpeace@protonmail.ch>
+In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch>
+From: WORLDofPEACE <worldofpeace@protonmail.ch>
+Date: Fri, 25 Sep 2020 20:48:33 -0400
+Subject: [PATCH 7/7] fix paths
+
+---
+ src/core/util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/util.c b/src/core/util.c
+index 79bcfdc..87ce549 100644
+--- a/src/core/util.c
++++ b/src/core/util.c
+@@ -623,7 +623,7 @@ meta_show_dialog (const char *type,
+ 
+   args = g_ptr_array_new ();
+ 
+-  append_argument (args, "zenity");
++  append_argument (args, "@zenity@/bin/zenity");
+   append_argument (args, type);
+ 
+   if (display)
+-- 
+git-series 0.9.1
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
index 876969878506..6afded766716 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
@@ -43,20 +43,19 @@
 
 stdenv.mkDerivation rec {
   pname = "mutter";
-  version = "3.34.5";
+  version = "3.34.6";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1i3r51ghfld1rf1rczzi3jhybz3mhywqcj2jyiqhfcyp1svlklfi";
+    hash = "sha256-I73ofTO4mBNYgxzsiRW7X/Hq+cHedMkM0WYLG5WINSY=";
   };
 
   mesonFlags = [
     "-Degl_device=true"
     "-Dinstalled_tests=false" # TODO: enable these
     "-Dwayland_eglstream=true"
-    "-Dxwayland-path=${xwayland}/bin/Xwayland"
   ];
 
   propagatedBuildInputs = [
@@ -105,45 +104,14 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    # Fix build with libglvnd provided headers
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch";
-      sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd";
-    })
-
-    # gnome-3-34 2020-04-24
-    # also fixes https://mail.gnome.org/archives/distributor-list/2020-April/msg00001.html
-    (fetchpatch {
-      url = "https://github.com/GNOME/mutter/compare/3.34.5..3bafd234248fdcd84bc62fef5e31c29fbb613909.patch";
-      sha256 = "1a7krbdfmvx204p6av44rbp4ckp6ddg1mms8wkixxh2p871zq1pi";
-    })
-
-    # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
-    # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
-    ./drop-inheritable.patch
-
-    # See commit message for details
-    ./0001-Fix-glitches-in-gala.patch
-
-    # https://gitlab.gnome.org/GNOME/mutter/merge_requests/1094
-    # https://gitlab.gnome.org/GNOME/mutter/merge_requests/957
-    ./fix-sysprof.patch
-
-    # profiler: track changes in GLib and Sysprof
-    # https://gitlab.gnome.org/GNOME/mutter/merge_requests/908
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/605171291993460f31d470a8143d6438d0c6169c.patch";
-      sha256 = "10fxzj0lmic2sp57w26w3r0bv1szngjjs50p3ka22wr9pxqmzl7l";
-    })
-
-    # Fixes https://github.com/elementary/wingpanel/issues/305
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/9d390ee49fb1f6300336e82ae94cc8061c6bae12.patch";
-      sha256 = "12hmi07rvspwhp8h1y1vmcvmvbh8fihcrb07ja5g0qnh28ip5qfi";
-    })
-
+    ./0001-EGL-Include-EGL-eglmesaext.h.patch
+    ./0002-drop-inheritable.patch
+    ./0003-Fix-glitches-in-gala.patch
+    ./0004-profiler-track-changes-in-GLib-and-Sysprof.patch
+    ./0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch
+    ./0006-build-bump-ABI-to-sysprof-capture-4.patch
     (substituteAll {
-      src = ./fix-paths.patch;
+      src = ./0007-fix-paths.patch;
       inherit zenity;
     })
   ];
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/fix-paths.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/fix-paths.patch
deleted file mode 100644
index 1986c65e8f49..000000000000
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/fix-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/util.c b/src/core/util.c
-index 57b73747d..f424cc81c 100644
---- a/src/core/util.c
-+++ b/src/core/util.c
-@@ -636,7 +636,7 @@ meta_show_dialog (const char *type,
-
-   args = g_ptr_array_new ();
-
--  append_argument (args, "zenity");
-+  append_argument (args, "@zenity@/bin/zenity");
-   append_argument (args, type);
-
-   if (display)
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch
deleted file mode 100644
index 481a0ab89cb0..000000000000
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 71acfd5258b4d12323fc51dda48e83830e62e696 Mon Sep 17 00:00:00 2001
-From: worldofpeace <worldofpeace@protonmail.ch>
-Date: Mon, 16 Sep 2019 11:18:27 -0400
-Subject: [PATCH] build: use get_pkgconfig_variable for sysprof dbusdir
-
----
- src/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 182f7f5f5..43060865b 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -710,7 +710,7 @@ if have_profiler
-     'backends/meta-profiler.h',
-   ]
-
--  dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces')
-+  dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('prefix'), 'share', 'dbus-1', 'interfaces')
-   sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
-
-   dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
---
-2.22.1
-

From a9785c51fb3289d0ceaab0747f6358b055255943 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 25 Sep 2020 21:44:57 -0400
Subject: [PATCH 0325/3942] pantheon.appcenter: use libhandy_0

---
 pkgs/desktops/pantheon/apps/appcenter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index 18ee7bdd844a..21ffef71ca47 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -25,7 +25,7 @@
 , python3
 , vala
 , polkit
-, libhandy
+, libhandy_0
 , wrapGAppsHook
 }:
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     gtk3
     json-glib
     libgee
-    libhandy
+    libhandy_0 # doesn't support libhandy-1 yet
     libsoup
     libxml2
     packagekit

From e2fb659c1f70a07552b2702c673217be4f3fd4fe Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 25 Sep 2020 21:45:11 -0400
Subject: [PATCH 0326/3942] pantheon.elementary-onboarding: port to libhandy-1

---
 .../desktop/elementary-onboarding/default.nix         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
index 31ed7f3672a9..73de43594bdd 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
@@ -32,6 +32,17 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-tLTwXA2miHqYqCUbIiBjb2nQB+uN/WzuE4F9m3fVCbM=";
   };
 
+  patches = [
+    # Port to Libhandy-1
+    (fetchpatch {
+      url = "https://github.com/elementary/onboarding/commit/8af6b7d9216f8cbf725f708b36ef4d4f6c400c78.patch";
+      sha256 = "cnSCSSFEQlNd9Ncw5VCJ32stZ8D4vhl3f+derAk/Cas=";
+      excludes = [
+        ".github/workflows/main.yml"
+      ];
+    })
+  ];
+
   passthru = {
     updateScript = nix-update-script {
       attrPath = "pantheon.${pname}";

From dd7862f187f13683ec40269dc1fb4219abfca4af Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 25 Sep 2020 21:45:33 -0400
Subject: [PATCH 0327/3942] pantheon.wingpanel-applications-menu: port to
 libhandy-1

---
 .../wingpanel-indicators/applications-menu/default.nix     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 94d91329e3d8..27e6215b7873 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchFromGitHub
+, fetchpatch
 , nix-update-script
 , pantheon
 , substituteAll
@@ -82,6 +83,12 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
+    # Port to Libhandy-1
+    (fetchpatch {
+      url = "https://github.com/elementary/applications-menu/commit/8eb2430e8513e9d37f875c5c9b8b15a968c27127.patch";
+      sha256 = "8Uw9mUw7U5nrAwUDGVpAwoRqb9ah503wQCr9kPbBJIo=";
+    })
+
     (substituteAll {
       src = ./fix-paths.patch;
       bc = "${bc}/bin/bc";

From c189b238d8c5b44e34bb527636fb1a9640e1ac8c Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 25 Sep 2020 22:14:18 -0400
Subject: [PATCH 0328/3942] pantheon.switchboard-plug-onlineaccounts: fix build
 with vala

---
 .../apps/switchboard-plugs/onlineaccounts/default.nix       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index 16e8c7e66c17..913fa58e2871 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -62,6 +62,12 @@ stdenv.mkDerivation rec {
       url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/5fa2882f765076d20c6ef4886198a34a05159f8a.patch";
       sha256 = "1szryyy7shdmbvx9yhpi0bhzaayg7hl6pq2c456j1qf9kfv0m4hf";
     })
+
+    # fix build with vala 0.48.9
+    (fetchpatch {
+      url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b1853b7427102b8dd94774e1e2cc455f50902263.patch";
+      sha256 = "J3C71GyEHEZWSghGXlwXPHFJRhrvx6i0yvi8NIDb4WE=";
+    })
   ];
 
   PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers";

From caf4b9fe5ec36c7aba740ca53a8e8469c1e0f522 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 25 Sep 2020 23:30:37 -0400
Subject: [PATCH 0329/3942] gnome3.gnome-online-miners: use tracker_2

Not ported yet https://gitlab.gnome.org/GNOME/gnome-online-miners/-/merge_requests/3.
---
 pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index ede2f2792483..496899f38409 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
 , libgdata, grilo, libzapojit, grilo-plugins, gnome-online-accounts, libmediaart
-, tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
+, tracker_2, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-online-miners";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     glib libgdata libxml2 libsoup gmp openssl
     grilo libzapojit grilo-plugins
     gnome-online-accounts libmediaart
-    tracker gfbgraph json-glib librest
+    tracker_2 gfbgraph json-glib librest
     dleyna-server
   ];
 

From af2465acb9d82134fc0a9eb27eacee2e321e4035 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 26 Sep 2020 11:30:41 -0400
Subject: [PATCH 0330/3942] webkitgtk: add separateDebugInfo, add
 platforms.darwin

Very strange that stdenv.isDarwin is in this expression but without
platforms including darwin.
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index ff5e24624dca..ffbc785d0972 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -67,6 +67,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
+  separateDebugInfo = stdenv.isLinux;
+
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
     sha256 = "04axfmzsb9gnyqaz5v7ljapiycxnzwpiya1l9rhp4c1qsbrdpwya";
@@ -180,7 +182,7 @@ stdenv.mkDerivation rec {
     description = "Web content rendering engine, GTK port";
     homepage = "https://webkitgtk.org/";
     license = licenses.bsd2;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = teams.gnome.members;
   };
 }

From 13dfd7464e8d88b1d058b00a99cdb473efdd667b Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 26 Sep 2020 12:53:19 -0400
Subject: [PATCH 0331/3942] freerdp: build tweaks

* use latest ffmpeg_4
* add libjpeg_turbo support
* add cairo support
* add ffmpeg vaapi support
---
 .../networking/remote/freerdp/default.nix        | 16 +++++++++++-----
 pkgs/top-level/all-packages.nix                  |  1 -
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 52f8decf170f..a81356da252d 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg_3, glib, openssl
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl
 , pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama
 , libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland
-, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt
-, libusb1, libpulseaudio ? null, cups ? null, pcsclite ? null, systemd ? null
-, buildServer ? true, nocaps ? false }:
+, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo
+, libusb1, libpulseaudio, cups, pcsclite, systemd, libjpeg_turbo
+, buildServer ? true, nocaps ? false
+}:
 
 let
   cmFlag = flag: if flag then "ON" else "OFF";
@@ -49,8 +50,9 @@ in stdenv.mkDerivation rec {
   buildInputs = with lib;
     [
       alsaLib
+      cairo
       cups
-      ffmpeg_3
+      ffmpeg
       glib
       gst-plugins-base
       gst-plugins-good
@@ -65,6 +67,7 @@ in stdenv.mkDerivation rec {
       libXrender
       libXtst
       libXv
+      libjpeg_turbo
       libpulseaudio
       libunwind
       libusb1
@@ -93,6 +96,9 @@ in stdenv.mkDerivation rec {
       WITH_PULSE = (libpulseaudio != null);
       WITH_SERVER = buildServer;
       WITH_SSE2 = stdenv.isx86_64;
+      WITH_VAAPI = true;
+      WITH_JPEG = (libjpeg_turbo != null);
+      WITH_CAIRO = (cairo != null);
     };
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70db6da4bc3c..5b3f00c96be7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20902,7 +20902,6 @@ in
   xrdp = callPackage ../applications/networking/remote/xrdp { };
 
   freerdp = callPackage ../applications/networking/remote/freerdp {
-    inherit libpulseaudio;
     inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
   };
 

From c6caf98331c037d91b17b41de971306a0195f0d4 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 26 Sep 2020 12:56:35 -0400
Subject: [PATCH 0332/3942] pipewire_0_2: use ffmpeg_4

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

diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix
index 1dbfe0647f47..eaedc2c0ac3e 100644
--- a/pkgs/development/libraries/pipewire/0.2.nix
+++ b/pkgs/development/libraries/pipewire/0.2.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
-, glib, dbus, gst_all_1, alsaLib, ffmpeg_3, libjack2, udev, libva, xorg
+, glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg
 , sbc, SDL2, makeFontsConf
 }:
 
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
   ];
   buildInputs = [
     glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer
-    alsaLib ffmpeg_3 libjack2 udev libva xorg.libX11 sbc SDL2
+    alsaLib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2
   ];
 
   mesonFlags = [

From 7f155324865e9d9677f7a68671c9a24e642e4e4f Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 26 Sep 2020 12:57:45 -0400
Subject: [PATCH 0333/3942] gnome3.gnome-remote-desktop: 0.1.8 -> 0.1.9

* now under GNOME namespace
* add cairo and freerdp
---
 .../core/gnome-remote-desktop/default.nix     | 47 ++++++++++++++-----
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
index a77aee4b890c..87c0d1efc84c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
@@ -1,23 +1,48 @@
-{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, python3, wrapGAppsHook
-, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk-pixbuf }:
+{ stdenv
+, fetchurl
+, cairo
+, meson
+, ninja
+, pkgconfig
+, python3
+, wrapGAppsHook
+, glib
+, pipewire
+, systemd
+, libvncserver
+, libsecret
+, libnotify
+, gdk-pixbuf
+, freerdp
+}:
 
 stdenv.mkDerivation rec {
   pname = "gnome-remote-desktop";
-  version = "0.1.8";
+  version = "0.1.9";
 
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "jadahl";
-    repo = "gnome-remote-desktop";
-    rev = version;
-    sha256 = "1wcvk0w4p0wnqnrjkbwvqcby9dd4nj0cm9cz0fqna31qfjrvb913";
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    hash = "sha256-8iZtp4tBRT7NNRKuzwop3rcMvq16RG/I2sAlEIsJ0M8=";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig python3 wrapGAppsHook ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkgconfig
+    python3
+    wrapGAppsHook
+  ];
 
   buildInputs = [
-    glib pipewire systemd libvncserver libsecret libnotify
+    cairo
+    freerdp
     gdk-pixbuf # For libnotify
+    glib
+    libnotify
+    libsecret
+    libvncserver
+    pipewire
+    systemd
   ];
 
   postPatch = ''

From 7e359f1ef1b9fb04caf759e6d9f9a48f40e4e820 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 2 Oct 2020 14:18:23 +0300
Subject: [PATCH 0334/3942] gnome3.gnome-documents: Fix build

Add appstream-glib to native build inputs, for appstream-util. Add patch
for inkscape 1.0 CLI arguments. Silence an inkscape warning regarding
profile directory.
---
 .../gnome-3/apps/gnome-documents/default.nix    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 2983e0adca41..7b0c6f0ac2f6 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -3,6 +3,7 @@
 , ninja
 , gettext
 , fetchurl
+, fetchpatch
 , evince
 , gjs
 , pkgconfig
@@ -28,6 +29,7 @@
 , desktop-file-utils
 , wrapGAppsHook
 , python3
+, appstream-glib
 , gsettings-desktop-schemas
 }:
 
@@ -40,6 +42,14 @@ stdenv.mkDerivation rec {
     sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq";
   };
 
+  patches = [
+    # Fix inkscape 1.0 usage
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/0f55a18c40a61e6ae4ec4652604775f139892350.diff";
+      sha256 = "1yrisq69dl1dn7639drlbza20a5ic6xg04ksr9iq4sxdx3xj3d8s";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
@@ -52,6 +62,7 @@ stdenv.mkDerivation rec {
     docbook_xml_dtd_42
     wrapGAppsHook
     python3
+    appstream-glib
 
     # building getting started
     inkscape
@@ -92,6 +103,12 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.bin}/bin/gapplication"
   '';
 
+  preConfigure =
+    # To silence inkscape warnings regarding profile directory
+  ''
+    export INKSCAPE_PROFILE_DIR="$(mktemp -d)"
+  '';
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;

From b2ff70917913abb59eec84946801293b37fc8662 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 2 Oct 2020 17:16:23 +0200
Subject: [PATCH 0335/3942] meld: Fix build on Darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Meld’s post install script requires gtk-update-icon-cache program on PATH.
Because Meld is a Python app, it uses strictDeps so we need to explicitly
add the program to nativeBuildInputs.

For some reason, Linux version has the program available, though,
which hides the missing dependency. Perhaps it is propagated by something
but I do not know how to determine it.
---
 pkgs/applications/version-management/meld/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 07af9341646a..5068dc15f48a 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec {
     desktop-file-utils
     gobject-introspection
     wrapGAppsHook
+    gtk3 # for gtk-update-icon-cache
   ];
 
   buildInputs = [

From bcf3872cba1a83235a4785bd512676d65c54e9a8 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 2 Oct 2020 21:47:00 +0300
Subject: [PATCH 0336/3942] gnome3.gdm: 3.34.1 -> 3.38

* build with meson
* remove libxml2 and libtool
* sync patches
* unset enableParallelBuilding
  with meson it's the default
---
 pkgs/desktops/gnome-3/core/gdm/default.nix    | 150 ++++++++++++++----
 .../desktops/gnome-3/core/gdm/fix-paths.patch |  48 ++++--
 2 files changed, 153 insertions(+), 45 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 58c898a5f0dd..f068ab531d98 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,7 +1,35 @@
-{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
-, accountsservice, libX11, gnome3, systemd, autoreconfHook, dconf
-, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
-, librsvg, coreutils, xwayland, nixos-icons, fetchpatch }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, substituteAll
+, meson
+, ninja
+, python3
+, rsync
+, pkg-config
+, glib
+, itstool
+, libxml2
+, xorg
+, accountsservice
+, libX11
+, gnome3
+, systemd
+, dconf
+, gtk3
+, libcanberra-gtk3
+, pam
+, libselinux
+, keyutils
+, audit
+, gobject-introspection
+, plymouth
+, librsvg
+, coreutils
+, xwayland
+, dbus
+, nixos-icons
+}:
 
 let
 
@@ -19,44 +47,64 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gdm";
-  version = "3.34.1";
+  version = "3.38.0";
+
+  outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1lyqvcwxhwxklbxn4xjswjzr6fhjix6h28mi9ypn34wdm9bzcpg8";
+    sha256 = "1fimhklb204rflz8k345756jikgbw8113hms3zlcwk6975f43m26";
   };
 
-  # Only needed to make it build
-  preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
-  '';
-
-  initialVT = "7";
-
-  configureFlags = [
+  mesonFlags = [
+    "-Dgdm-xsession=true"
+    # TODO: Setup a default-path? https://gitlab.gnome.org/GNOME/gdm/-/blob/6fc40ac6aa37c8ad87c32f0b1a5d813d34bf7770/meson_options.txt#L6
+    "-Dinitial-vt=${passthru.initialVT}"
+    "-Dudev-dir=${placeholder "out"}/lib/udev/rules.d"
+    "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+    "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
     "--sysconfdir=/etc"
     "--localstatedir=/var"
-    "--with-plymouth=yes"
-    "--enable-gdm-xsession"
-    "--with-initial-vt=${initialVT}"
-    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-    "--with-udevdir=$(out)/lib/udev"
   ];
 
-  nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool dconf ];
+  nativeBuildInputs = [
+    dconf
+    glib # for glib-compile-schemas
+    itstool
+    meson
+    ninja
+    pkg-config
+    python3
+    rsync
+  ];
+
   buildInputs = [
-    glib accountsservice systemd
-    gobject-introspection libX11 gtk3
-    libcanberra-gtk3 pam plymouth librsvg
+    accountsservice
+    audit
+    glib
+    gobject-introspection
+    gtk3
+    keyutils
+    libX11
+    libcanberra-gtk3
+    libselinux
+    pam
+    plymouth
+    systemd
+    xorg.libXdmcp
   ];
 
-  enableParallelBuilding = true;
-
   patches = [
+    # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/112
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/1d28d4b3568381b8590d2235737b924aefd1746c.patch";
+      sha256 = "ZUXKZS4T0o0hzrApxaqcR0txCRv5zBgqeQ9K9fLNX1o=";
+    })
+
     # Change hardcoded paths to nix store paths.
     (substituteAll {
       src = ./fix-paths.patch;
-      inherit coreutils plymouth xwayland;
+      inherit coreutils plymouth xwayland dbus;
     })
 
     # The following patches implement certain environment variables in GDM which are set by
@@ -74,23 +122,61 @@ stdenv.mkDerivation rec {
     # Set up the environment properly when launching sessions
     # https://github.com/NixOS/nixpkgs/issues/48255
     ./reset-environment.patch
+
+    # Fix runtime patch location.
+    # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/114
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/9d841d681f3d1c58e3df51a98421257f774cd185.patch";
+      sha256 = "0lf5kpz9ghylqlbybc0mpfsvr4i29z1ag8wf6j1918hjrfcipnxj";
+    })
   ];
 
-  installFlags = [
-    "sysconfdir=$(out)/etc"
-    "dbusconfdir=$(out)/etc/dbus-1/system.d"
-  ];
+  postPatch = ''
+    patchShebangs build-aux/meson_post_install.py
+
+    # Upstream checks some common paths to find an `X` binary. We already know it.
+    echo #!/bin/sh > build-aux/find-x-server.sh
+    echo "echo ${stdenv.lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh
+    patchShebangs build-aux/find-x-server.sh
+  '';
 
   preInstall = ''
-    schema_dir=${glib.makeSchemaPath "$out" "${pname}-${version}"}
-    install -D ${override} $schema_dir/org.gnome.login-screen.gschema.override
+    install -D ${override} ${DESTDIR}/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override
   '';
 
+  postInstall = ''
+    # Move stuff from DESTDIR to proper location.
+    # We use rsync to merge the directories.
+    rsync --archive "${DESTDIR}/etc" "$out"
+    rm --recursive "${DESTDIR}/etc"
+    for o in $outputs; do
+        rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")"
+        rm --recursive "${DESTDIR}/''${!o}"
+    done
+    # Ensure the DESTDIR is removed.
+    rmdir "${DESTDIR}/nix/store" "${DESTDIR}/nix" "${DESTDIR}"
+
+    # We are setting DESTDIR so the post-install script does not compile the schemas.
+    glib-compile-schemas "$out/share/glib-2.0/schemas"
+  '';
+
+  # HACK: We want to install configuration files to $out/etc
+  # but GDM should read them from /etc on a NixOS system.
+  # With autotools, it was possible to override Make variables
+  # at install time but Meson does not support this
+  # so we need to convince it to install all files to a temporary
+  # location using DESTDIR and then move it to proper one in postInstall.
+  DESTDIR = "${placeholder "out"}/dest";
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "gdm";
       attrPath = "gnome3.gdm";
     };
+
+    # Used in GDM NixOS module
+    # Don't remove.
+    initialVT = "7";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
index 6b5bd6152bd6..d649556fe9e6 100644
--- a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
@@ -13,48 +13,70 @@
 +++ b/daemon/gdm-manager.c
 @@ -145,7 +145,7 @@
          GError  *error;
- 
+
          error = NULL;
--        res = g_spawn_command_line_sync ("/bin/plymouth --ping",
+-        res = g_spawn_command_line_sync ("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);
 @@ -163,7 +163,7 @@
          GError  *error;
- 
+
          error = NULL;
--        res = g_spawn_command_line_sync ("/bin/plymouth deactivate",
+-        res = g_spawn_command_line_sync ("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);
 @@ -178,7 +178,7 @@
          GError  *error;
- 
+
          error = NULL;
--        res = g_spawn_command_line_async ("/bin/plymouth quit --retain-splash", &error);
+-        res = g_spawn_command_line_async ("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);
 @@ -194,7 +194,7 @@
          GError  *error;
- 
+
          error = NULL;
--        res = g_spawn_command_line_async ("/bin/plymouth quit", &error);
+-        res = g_spawn_command_line_async ("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 @@ BusName=org.gnome.DisplayManager
- StandardOutput=syslog
- StandardError=inherit
- EnvironmentFile=-@LANG_CONFIG_FILE@
+@@ -26,7 +26,7 @@ Restart=always
+ IgnoreSIGPIPE=no
+ BusName=org.gnome.DisplayManager
+ EnvironmentFile=-${LANG_CONFIG_FILE}
 -ExecReload=/bin/kill -SIGHUP $MAINPID
 +ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID
  KeyringMode=shared
- 
+
  [Install]
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -2916,16 +2916,16 @@ gdm_session_start_session (GdmSession *self,
+                  */
+                 if (run_launcher) {
+                         if (is_x11) {
+-                                program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"dbus-run-session -- %s\"",
++                                program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"",
+                                                            register_session ? "--register-session " : "",
+                                                            self->selected_program);
+                         } else {
+-                                program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s\"",
++                                program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"",
+                                                            register_session ? "--register-session " : "",
+                                                            self->selected_program);
+                         }
+                 } else {
+-                        program = g_strdup_printf ("dbus-run-session -- %s",
++                        program = g_strdup_printf ("@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s",
+                                                    self->selected_program);
+                 }
+         }

From cb1a410de64a4250c56b22dd86a86c129b157136 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 3 Oct 2020 15:59:22 -0400
Subject: [PATCH 0337/3942] gnome-connections: init at 3.38.0

---
 .../apps/gnome-connections/default.nix        | 74 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 76 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/apps/gnome-connections/default.nix

diff --git a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix
new file mode 100644
index 000000000000..676e2359995d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix
@@ -0,0 +1,74 @@
+{ stdenv
+, fetchurl
+, gnome3
+, meson
+, ninja
+, vala
+, pkg-config
+, glib
+, gtk3
+, python3
+, libxml2
+, gtk-vnc
+, gettext
+, desktop-file-utils
+, appstream-glib
+, gobject-introspection
+, freerdp
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gnome-connections";
+  version = "3.38.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/connections/${stdenv.lib.versions.majorMinor version}/connections-${version}.tar.xz";
+    hash = "sha256-Eob36/zoWIGdYMpWks280FoIHGL7AHUhinFA4cEqels=";
+  };
+
+  nativeBuildInputs = [
+    desktop-file-utils
+    gettext
+    glib # glib-compile-resources
+    meson
+    appstream-glib
+    ninja
+    pkg-config
+    python3
+    vala
+    wrapGAppsHook
+
+    # for gtk-frdp subproject
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    glib
+    gtk-vnc
+    gtk3
+    libxml2
+
+    # for gtk-frdp subproject
+    freerdp
+  ];
+
+  postPatch = ''
+    chmod +x build-aux/meson/postinstall.py
+    patchShebangs build-aux/meson/postinstall.py
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://gitlab.gnome.org/GNOME/connections";
+    description = "A remote desktop client for the GNOME desktop environment";
+    maintainers = teams.gnome.members;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b3f00c96be7..27e7730883ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25862,6 +25862,8 @@ in
     mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
   };
 
+  gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { };
+
   gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { };
 
   hsetroot = callPackage ../tools/X11/hsetroot { };

From 0b767c8b3d5a9de3e55b8196f8f0984a70dc61fa Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 3 Oct 2020 16:02:33 -0400
Subject: [PATCH 0338/3942] nixos/gnome3: add gnome-connections to
 core-utilities

When we redid the default apps we didn't add gnome-boxes for
rdp/vnc. (plus it doesn't really work well in nixos). With gnome-connections
we can now have this functionality, as file sharing is a default function
in g-c-c Sharing.
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index acccbdb9950a..1fd7797a873a 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -393,11 +393,10 @@ in
         gnome-system-monitor
         gnome-weather
         nautilus
+        pkgs.gnome-connections
         simple-scan
         totem
         yelp
-        # Unsure if sensible for NixOS
-        /* gnome-boxes */
       ] config.environment.gnome3.excludePackages);
 
       # Enable default program modules

From cd48c50e35831c5c3f5e51d02433bb18ac09c24a Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 3 Oct 2020 16:03:16 -0400
Subject: [PATCH 0339/3942] nixos/gnome3: update links

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 1fd7797a873a..93a46f005bf3 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -323,7 +323,7 @@ in
         source-sans-pro
       ];
 
-      # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-36/elements/core/meta-gnome-core-shell.bst
+      # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst
       environment.systemPackages = with pkgs.gnome3; [
         adwaita-icon-theme
         gnome-backgrounds
@@ -368,7 +368,7 @@ in
       };
     })
 
-    # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-36/elements/core/meta-gnome-core-utilities.bst
+    # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst
     (mkIf serviceCfg.core-utilities.enable {
       environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
         baobab

From 11d6c2fb3557b8f7f5efc5d4eda657509cd5dee8 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 3 Oct 2020 16:04:14 -0400
Subject: [PATCH 0340/3942] nixos/gnome3: long lists

---
 .../services/x11/desktop-managers/gnome3.nix  | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 93a46f005bf3..e072a4d56f28 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -425,10 +425,25 @@ in
 
     (mkIf serviceCfg.games.enable {
       environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
-        aisleriot atomix five-or-more four-in-a-row gnome-chess gnome-klotski
-        gnome-mahjongg gnome-mines gnome-nibbles gnome-robots gnome-sudoku
-        gnome-taquin gnome-tetravex hitori iagno lightsoff quadrapassel
-        swell-foop tali
+        aisleriot
+        atomix
+        five-or-more
+        four-in-a-row
+        gnome-chess
+        gnome-klotski
+        gnome-mahjongg
+        gnome-mines
+        gnome-nibbles
+        gnome-robots
+        gnome-sudoku
+        gnome-taquin
+        gnome-tetravex
+        hitori
+        iagno
+        lightsoff
+        quadrapassel
+        swell-foop
+        tali
       ] config.environment.gnome3.excludePackages);
     })
   ];

From 9c9e519318b9ff61899f64de180d70bfa7b28a37 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sat, 3 Oct 2020 16:14:55 -0400
Subject: [PATCH 0341/3942] nixos/gnome3: add core-developer-tools

See these issues/PRs in gnome-build-meta:
https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/588
https://gitlab.gnome.org/GNOME/gnome-build-meta/-/issues/143

I'm unsure if devhelp gets API docs in a straightforward way in NixOS.
---
 .../services/x11/desktop-managers/gnome3.nix    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index e072a4d56f28..54d9c6bdc8c2 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -69,6 +69,7 @@ in
       core-os-services.enable = mkEnableOption "essential services for GNOME3";
       core-shell.enable = mkEnableOption "GNOME Shell services";
       core-utilities.enable = mkEnableOption "GNOME core utilities";
+      core-developer-tools.enable = mkEnableOption "GNOME core developer tools";
       games.enable = mkEnableOption "GNOME games";
 
       experimental-features = {
@@ -446,6 +447,22 @@ in
         tali
       ] config.environment.gnome3.excludePackages);
     })
+
+    # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst
+    (mkIf serviceCfg.core-developer-tools.enable {
+      environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
+        dconf-editor
+        devhelp
+        pkgs.gnome-builder
+        # boxes would make sense in this option, however
+        # it doesn't function well enough to be included
+        # in default configurations.
+        # https://github.com/NixOS/nixpkgs/issues/60908
+        /* gnome-boxes */
+      ] config.environment.gnome3.excludePackages);
+
+      services.sysprof.enable = true;
+    })
   ];
 
 }

From e1317b8b7bb297ce80a0265ae742a141b5d20d9a Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 4 Oct 2020 01:39:23 -0400
Subject: [PATCH 0342/3942] nixos/telepathy: add sessionPath

---
 nixos/modules/services/desktops/telepathy.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix
index 34596bf78184..8c50d860e5bb 100644
--- a/nixos/modules/services/desktops/telepathy.nix
+++ b/nixos/modules/services/desktops/telepathy.nix
@@ -38,6 +38,11 @@ with lib;
 
     services.dbus.packages = [ pkgs.telepathy-mission-control ];
 
+    # Enable runtime optional telepathy in gnome-shell
+    services.xserver.desktopManager.gnome3.sessionPath = with pkgs; [
+      telepathy-glib
+      telepathy-logger
+    ];
   };
 
 }

From 4d61e42de4fc38d772e57d6b68927c771a20934e Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 4 Oct 2020 01:45:04 -0400
Subject: [PATCH 0343/3942] zeitgeist: drop dbus-glib and telepathy

---
 pkgs/development/libraries/zeitgeist/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index 98c94cfeccaa..a17a65885aba 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -11,11 +11,9 @@
 , libtool
 , gettext
 , dbus
-, telepathy-glib
 , gtk3
 , json-glib
 , librdf_raptor2
-, dbus-glib
 , pythonSupport ? true
 , python2Packages
 }:
@@ -57,8 +55,6 @@ stdenv.mkDerivation rec {
     glib
     sqlite
     dbus
-    telepathy-glib
-    dbus-glib
     gtk3
     json-glib
     librdf_raptor2
@@ -67,6 +63,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-session-bus-services-dir=${placeholder "out"}/share/dbus-1/services"
+    "--disable-telepathy"
   ];
 
   enableParallelBuilding = true;

From 9aaad83e4301bcbb8ffe85896ed97a605f37c883 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 4 Oct 2020 01:45:24 -0400
Subject: [PATCH 0344/3942] zeitgeist: switch to Python 3

---
 pkgs/development/libraries/zeitgeist/default.nix | 8 ++++----
 pkgs/top-level/python-packages.nix               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index a17a65885aba..100501108730 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -15,7 +15,7 @@
 , json-glib
 , librdf_raptor2
 , pythonSupport ? true
-, python2Packages
+, python3
 }:
 
 stdenv.mkDerivation rec {
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     gettext
     gobject-introspection
     vala
-    python2Packages.python
+    python3
   ];
 
   buildInputs = [
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     gtk3
     json-glib
     librdf_raptor2
-    python2Packages.rdflib
+    python3.pkgs.rdflib
   ];
 
   configureFlags = [
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = stdenv.lib.optionalString pythonSupport ''
-    moveToOutput lib/${python2Packages.python.libPrefix} "$py"
+    moveToOutput lib/${python3.libPrefix} "$py"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 72b60ba902c3..fd62503a714a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7778,7 +7778,7 @@ in {
 
   zeep = callPackage ../development/python-modules/zeep { };
 
-  zeitgeist = disabledIf isPy3k (toPythonModule (pkgs.zeitgeist.override { python2Packages = self; })).py;
+  zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py;
 
   zerobin = callPackage ../development/python-modules/zerobin { };
 

From 2517a751079a6f884fb213d7cf63c3ead56492d4 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 4 Oct 2020 01:49:15 -0400
Subject: [PATCH 0345/3942] gnome3.gnome-contacts: drop telepathy-glib

---
 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 2 --
 1 file changed, 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 d9337629b3f9..23e3821ac8cc 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -3,7 +3,6 @@
 , libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
 , wrapGAppsHook, folks, libxml2, gnome3
 , vala, meson, ninja, libhandy, gsettings-desktop-schemas
-# , telepathy-glib
 }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +25,6 @@ stdenv.mkDerivation rec {
     folks gnome-desktop libhandy
     libxml2 gnome-online-accounts cheese
     gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib
-    # telepathy-glib 3.35.90 fails to build with telepathy
   ];
 
   mesonFlags = [

From 93f93c84b4e17ce0d079ea71be871ab61503f49f Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Sun, 4 Oct 2020 01:55:15 -0400
Subject: [PATCH 0346/3942] gnome3.gnome-shell: drop direct telepathy support

It is now runtime optional
---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 ----
 1 file changed, 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 cc8430d0b8a5..4dba3fb76768 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -17,8 +17,6 @@
 , docbook-xsl-nons
 , at-spi2-core
 , libstartup_notification
-, telepathy-glib
-, telepathy-logger
 , unzip
 , shared-mime-info
 , libgweather
@@ -146,7 +144,6 @@ stdenv.mkDerivation rec {
     librsvg
     networkmanager
     libstartup_notification
-    telepathy-glib
     gjs
     mutter
     libpulseaudio
@@ -162,7 +159,6 @@ stdenv.mkDerivation rec {
     upower
     ibus
     gnome-desktop
-    telepathy-logger
     gnome-settings-daemon
     gobject-introspection
 

From 8cfb2ead47180aaa87f9a70d56ef236b48969ade Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 4 Oct 2020 00:57:54 +0200
Subject: [PATCH 0347/3942] contrast: use libhandy_0

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

diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix
index 192bf041c64e..8f70f632cd6e 100644
--- a/pkgs/applications/accessibility/contrast/default.nix
+++ b/pkgs/applications/accessibility/contrast/default.nix
@@ -6,7 +6,7 @@
 , gettext
 , glib
 , gtk3
-, libhandy
+, libhandy_0
 , meson
 , ninja
 , pango
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
     dbus
     glib
     gtk3
-    libhandy
+    libhandy_0
     pango
   ];
 

From 703a72f4d3d6da9f617ac7d4ac679708037bd9ee Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 4 Oct 2020 00:58:12 +0200
Subject: [PATCH 0348/3942] gnome-podcasts: use libhandy_0

---
 pkgs/applications/audio/gnome-podcasts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index c7df55118c7a..cf3a8ae4197b 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -10,7 +10,7 @@
 , python3
 , pkgconfig
 , glib
-, libhandy
+, libhandy_0
 , gtk3
 , dbus
 , openssl
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     glib
     gtk3
-    libhandy
+    libhandy_0
     dbus
     openssl
     sqlite

From 58e08f2407c85362c1c83c348eae0788eb5eaa68 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 4 Oct 2020 00:58:29 +0200
Subject: [PATCH 0349/3942] shortwave: use libhandy_0

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

diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix
index 055694fb40f5..3572bbf88abb 100644
--- a/pkgs/applications/audio/shortwave/default.nix
+++ b/pkgs/applications/audio/shortwave/default.nix
@@ -8,7 +8,7 @@
 , glib
 , gst_all_1
 , gtk3
-, libhandy
+, libhandy_0
 , meson
 , ninja
 , openssl
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
     gdk-pixbuf
     glib
     gtk3
-    libhandy
+    libhandy_0
     openssl
     sqlite
   ] ++ (with gst_all_1; [

From 50047bf4ecfda6659f51c3fa8d52c9531ed33b83 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 4 Oct 2020 00:58:42 +0200
Subject: [PATCH 0350/3942] deja-dup: use libhandy_0

---
 pkgs/applications/backup/deja-dup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index ad4fc9728be2..c65d5bbc09aa 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -12,7 +12,7 @@
 , coreutils
 , libsoup
 , libsecret
-, libhandy
+, libhandy_0
 , wrapGAppsHook
 , libgpgerror
 , json-glib
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     glib
     gtk3
     libsecret
-    libhandy
+    libhandy_0
     libgpgerror
     json-glib
   ];

From 9d8c238b5c4551bde6cac8988ad7ce4795a1791d Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 4 Oct 2020 00:58:51 +0200
Subject: [PATCH 0351/3942] calls: use libhandy_0

---
 pkgs/applications/networking/calls/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
index 39ad9ef1d15f..e57cf810491c 100644
--- a/pkgs/applications/networking/calls/default.nix
+++ b/pkgs/applications/networking/calls/default.nix
@@ -3,7 +3,7 @@
 , meson
 , ninja
 , pkgconfig
-, libhandy
+, libhandy_0
 , modemmanager
 , gtk3
 , gom
@@ -43,13 +43,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     modemmanager
-    libhandy
+    libhandy_0
     evolution-data-server
     folks
     gom
     gsound
     gtk3
-    libhandy
     libpeas
   ];
 

From edbad936cf0db23779bcbe1a181646e49e73ea97 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 4 Oct 2020 00:59:00 +0200
Subject: [PATCH 0352/3942] newsflash: use libhandy_0

---
 .../applications/networking/feedreaders/newsflash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix
index 896904b0cac2..441a80fc071b 100644
--- a/pkgs/applications/networking/feedreaders/newsflash/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix
@@ -8,7 +8,7 @@
 , gdk-pixbuf
 , glib
 , gtk3
-, libhandy
+, libhandy_0
 , openssl
 , sqlite
 , webkitgtk
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     gtk3
-    libhandy
+    libhandy_0
     openssl
     sqlite
     webkitgtk

From 4704cec55b71bdfc1e46d938a5ec52b69b5cce1c Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 4 Oct 2020 00:59:08 +0200
Subject: [PATCH 0353/3942] fractal: use libhandy_0

---
 .../networking/instant-messengers/fractal/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 68e7282870ba..2bcd13744b66 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -12,7 +12,7 @@
 , pkg-config
 , gtksourceview4
 , glib
-, libhandy
+, libhandy_0
 , gtk3
 , dbus
 , openssl
@@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec {
     gst_all_1.gst-validate
     gtk3
     gtksourceview4
-    libhandy
+    libhandy_0
     openssl
     sqlite
   ];

From 5a3749e3b3426d42051cc6af7f742c3b9d3b2092 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 07:38:13 +0200
Subject: [PATCH 0354/3942] tepl: split to multiple outputs

So that gtk3.dev is not pulled into the closure.
---
 pkgs/development/libraries/tepl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix
index aa055b2dc279..77cf9fd0247d 100644
--- a/pkgs/development/libraries/tepl/default.nix
+++ b/pkgs/development/libraries/tepl/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
   pname = "tepl";
   version = "5.0.0";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0x2s0ks575b57jdqnp9r9miz40pm705n2dlj2k8bfj1hyl22kgf6";

From 3c4de3121053b327965f4ec844e4602d71136fc6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 08:23:35 +0200
Subject: [PATCH 0355/3942] tracker: clean up dependencies

---
 pkgs/development/libraries/tracker/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index cde81146d4c4..8073188ceb95 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -8,9 +8,7 @@
 , gobject-introspection
 , python3
 , gtk-doc
-, docbook_xsl
-, docbook_xml_dtd_412
-, docbook_xml_dtd_43
+, docbook-xsl-nons
 , docbook_xml_dtd_45
 , libxml2
 , glib
@@ -22,7 +20,6 @@
 , gnome3
 , icu
 , libuuid
-, networkmanager
 , libsoup
 , json-glib
 , systemd
@@ -59,9 +56,7 @@ stdenv.mkDerivation rec {
     wrapGAppsHook
     gobject-introspection
     gtk-doc
-    docbook_xsl
-    docbook_xml_dtd_412
-    docbook_xml_dtd_43
+    docbook-xsl-nons
     docbook_xml_dtd_45
     python3 # for data-generators
     systemd # used for checks to install systemd user service
@@ -73,7 +68,6 @@ stdenv.mkDerivation rec {
     libxml2
     sqlite
     icu
-    networkmanager
     libsoup
     libuuid
     json-glib

From da146f2efddfe5e0e13cdac0f8d9ba31211dad33 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 09:09:36 +0200
Subject: [PATCH 0356/3942] =?UTF-8?q?amtk:=205.1.1=20=E2=86=92=205.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/amtk/5.1/amtk-5.1.2.news
https://ftp.gnome.org/pub/GNOME/sources/amtk/5.2/amtk-5.2.0.news
---
 pkgs/development/libraries/amtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix
index df8a5838705c..e514b8b5c31b 100644
--- a/pkgs/development/libraries/amtk/default.nix
+++ b/pkgs/development/libraries/amtk/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "amtk";
-  version = "5.1.1";
+  version = "5.2.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1wax6mim8dj0m21k8ima7ysm3bzzp54r00jganwbzakq8bfnnrgr";
+    sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2";
   };
 
   nativeBuildInputs = [

From 2c7d0b5362a1aaed77c684e2f4d39cd21ae2db2e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 09:06:45 +0200
Subject: [PATCH 0357/3942] =?UTF-8?q?gnome-latex:=203.36.0=20=E2=86=92=203?=
 =?UTF-8?q?.38.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-latex/3.37/gnome-latex-3.37.1.news
https://ftp.gnome.org/pub/GNOME/sources/gnome-latex/3.37/gnome-latex-3.37.2.news
https://ftp.gnome.org/pub/GNOME/sources/gnome-latex/3.38/gnome-latex-3.38.0.news
---
 pkgs/applications/editors/gnome-latex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix
index 695a13eecabd..ffdeb21de7f3 100644
--- a/pkgs/applications/editors/gnome-latex/default.nix
+++ b/pkgs/applications/editors/gnome-latex/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee
 , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
 let
-  version = "3.36.0";
+  version = "3.38.0";
   pname = "gnome-latex";
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1869kr1zhcp04mzbi67lwgk497w840dbbc7427i9yh9b9s7j6mqn";
+    sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

From bd2b324906a0619e4c6b298d1bbacd9ba553f5e3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 13:21:26 +0000
Subject: [PATCH 0358/3942] =?UTF-8?q?glib:=202.66.0=20=E2=86=92=202.66.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/glib/2.66/glib-2.66.1.news
---
 pkgs/development/libraries/glib/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index d719c5037df6..f3ff51459c1c 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -45,11 +45,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "glib";
-  version = "2.66.0";
+  version = "2.66.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0v0m268qichkh0sirj8gd4awwg6258yr8k6s6p0lhmh68gqnp9n5";
+    sha256 = "0q7g70j6vjvcw4xf6bbfkm4j6mradcabdcdcy4gs5hxwkzkgysd2";
   };
 
   patches = optionals stdenv.isDarwin [
@@ -83,12 +83,6 @@ stdenv.mkDerivation rec {
     # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out)
     #    * gio-launch-desktop
     ./split-dev-programs.patch
-
-    # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1648
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/glib/-/commit/642baa50fa561f7abfbbfe5ac9a10351a706b95a.patch";
-      sha256 = "0mrin6x6iy9x2bplz6q7ljdq677nmvcwhns7nkahj719h0qpzn0z";
-    })
   ] ++ optional doCheck ./skip-timer-test.patch;
 
   outputs = [ "bin" "out" "dev" "devdoc" ];

From af9d19eceb91a9aad4e5b8829f5d817c14faccd5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:31 +0000
Subject: [PATCH 0359/3942] =?UTF-8?q?gnome3.epiphany:=203.38.0=20=E2=86=92?=
 =?UTF-8?q?=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/epiphany/3.38/epiphany-3.38.1.news
---
 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 9b99cb0b91f5..7b9c439b247c 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -36,11 +36,11 @@
 
 stdenv.mkDerivation rec {
   pname = "epiphany";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0ln5i5wnyi1qbx5awz513sdxx2x8nn0nrk2yvgj431bzgh6q53i2";
+    sha256 = "0hr87nl8pc7h8w65i8jwj5fdwr46wbygdnx6mhpbbyqirdm5gdsr";
   };
 
   # Tests need an X display

From bf7a38f6e44aa2f2674b0172bd4a7dbf282da00d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:32 +0000
Subject: [PATCH 0360/3942] =?UTF-8?q?gnome3.evolution-data-server:=203.38.?=
 =?UTF-8?q?0=20=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.38/evolution-data-server-3.38.1.news
---
 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 4c2b8fa2bc12..9c73bf0e182c 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.38.0";
+  version = "3.38.1";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1bxh2gdjr6nh5l629ncygfazj2sbqbv5xc7ksp20cn3namxrls0k";
+    sha256 = "1dz4ybhq5rf1hnaf1d6h60ldn9xpdaj9nw42c4iqbw9lqglpiwlg";
   };
 
   patches = [

From f8a343a48a508b4926cb53a4d312c12a699356a1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:32 +0000
Subject: [PATCH 0361/3942] =?UTF-8?q?gnome3.evolution:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/evolution/3.38/evolution-3.38.1.news
---
 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 9587e992ad5c..2390498ce78d 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0pbwjp4bk5bqr90lm5vc609ibs32jfq4xagkljfhabdaah7w877q";
+    sha256 = "1z68vhbqnm34axx4zcrds45nz2ppwzr4z1lczxrdiq0zf0cmxyfh";
   };
 
   nativeBuildInputs = [

From 00aedd87ad66b21dcba627515db831395b333152 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:35 +0000
Subject: [PATCH 0362/3942] =?UTF-8?q?gnome3.four-in-a-row:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/four-in-a-row/3.38/four-in-a-row-3.38.1.news
---
 pkgs/desktops/gnome-3/games/four-in-a-row/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index d25db1cfc070..7ed3a0d478ca 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "four-in-a-row";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0bjc6ay7jya0l7c2mha71i7kj1wianij1fim48qzjr3675s5g8yw";
+    sha256 = "10ji60bdfdzb6wk5dkwjc3yww7hqi3yjcx1k1z7x2521h2dpdli1";
   };
 
   nativeBuildInputs = [

From f55ce0fbff977ac336d94414b6932927aa6e4b4f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:36 +0000
Subject: [PATCH 0363/3942] =?UTF-8?q?gnome3.geary:=203.38.0.1=20=E2=86=92?=
 =?UTF-8?q?=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/geary/3.38/geary-3.38.1.news
---
 pkgs/desktops/gnome-3/misc/geary/default.nix | 21 +++++++-------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 4625f405c3d9..4d649bdfbe9f 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -42,13 +42,18 @@
 
 stdenv.mkDerivation rec {
   pname = "geary";
-  version = "3.38.0.1";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0xbhzjn6sp9qj0iqfgq4q25is3wgjz1c090i8y60azgi9hyjkh79";
+    sha256 = "04p8fjkz4xp5afp0ld1m09pnv0zkcx51l7hf23amfrjkk0kj2bp7";
   };
 
+  patches = [
+    # Longer timeout for client test.
+    ./Bump-client-test-timeout-to-300s.patch
+  ];
+
   nativeBuildInputs = [
     appstream-glib
     desktop-file-utils
@@ -97,18 +102,6 @@ stdenv.mkDerivation rec {
     "-Dcontractor=true" # install the contractor file (Pantheon specific)
   ];
 
-  patches = [
-    # https://gitlab.gnome.org/GNOME/geary/-/issues/985
-    # drop in 3.38.1
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/geary/-/commit/b5abd3f9664c396ad57f177750973695c58e8b7f.patch";
-      sha256 = "zBPhlz8Zujt9tmZrIUkvZSOpD7/UhTeokE9U/704qSE=";
-    })
-
-    # Longer timeout for client test.
-    ./Bump-client-test-timeout-to-300s.patch
-  ];
-
   # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see:
   # https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa
   postPatch = ''

From 7ad37e2c59eab9bc870fb4923b778564be74963c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:40 +0000
Subject: [PATCH 0364/3942] =?UTF-8?q?gnome3.gnome-bluetooth:=203.34.1=20?=
 =?UTF-8?q?=E2=86=92=203.34.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/3.34/gnome-bluetooth-3.34.2.news
https://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/3.34/gnome-bluetooth-3.34.3.news
---
 pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index ed647bb87d81..fa5b5abf0ffd 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -6,14 +6,14 @@ let
   pname = "gnome-bluetooth";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "3.34.1";
+  version = "3.34.3";
 
   # TODO: split out "lib"
   outputs = [ "out" "dev" "devdoc" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "11nk8nvz5yrbx7wp75vsiaf4rniv7ik2g3nwmgwx2b42q9v11j9y";
+    sha256 = "08k4jak4r72pvn5kjhm21planyc514j6c7jjj5lv9nmvvlxqw1ha";
   };
 
   nativeBuildInputs = [

From 6eef604f8dd06973c209ee1a5c7ac1f8f37784ff Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:41 +0000
Subject: [PATCH 0365/3942] =?UTF-8?q?gnome3.gnome-boxes:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ported to Tracker 3.

https://ftp.gnome.org/pub/GNOME/sources/gnome-boxes/3.38/gnome-boxes-3.38.1.news
---
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 8d2997ea3f38..014ad123b412 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -23,8 +23,8 @@
 , libsoup
 , libosinfo
 , systemd
-, tracker_2
-, tracker-miners-2
+, tracker
+, tracker-miners
 , vala
 , libcap
 , yajl
@@ -54,11 +54,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-boxes";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "12x38780j52bv46q2i6468va1zww28mmy83rasbl3y8sqagmjsv9";
+    sha256 = "0zrm4mihkx5i42h3pvk9lmsqf983dqz4rnfcbccwhx4ml2s4w3qv";
   };
 
   doCheck = true;
@@ -113,8 +113,8 @@ stdenv.mkDerivation rec {
     spice-gtk
     spice-protocol
     systemd
-    tracker_2
-    tracker-miners-2
+    tracker
+    tracker-miners
     vte
     webkitgtk
     xen

From cd66846f9e7779373562b36a75f0eec607d1d49f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:42 +0000
Subject: [PATCH 0366/3942] =?UTF-8?q?gnome3.gnome-calculator:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-calculator/3.38/gnome-calculator-3.38.1.news
---
 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 0c8725f5a366..e92333642d40 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-calculator";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1zjpbf4ymb9gwn7dkw2akwx6cw5nm2xnwkg1b4jb14h6apzj6blh";
+    sha256 = "0jajgdl2338nwym980gqw77pcjkprzhnfg8asdjksiksgz8gzzvw";
   };
 
   nativeBuildInputs = [

From 66315a8c75a735210da427094287f426958f4888 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:45 +0000
Subject: [PATCH 0367/3942] =?UTF-8?q?gnome3.gnome-calendar:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-calendar/3.38/gnome-calendar-3.38.1.news
---
 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 8b1c66e43e17..1311bea08d43 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-calendar";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0cs7ggj88n8sira5vzsijmzl3fmflic48lbis24r1d9blx944s63";
+    sha256 = "04pmjzwcy1lswkri30rnvac99dff8zajs41as0j1cqrd1058i03j";
   };
 
   patches = [

From 1370ed0a1270a51f2b24ba776bc569a34406396d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:49 +0000
Subject: [PATCH 0368/3942] =?UTF-8?q?gnome3.gnome-desktop:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.38/gnome-desktop-3.38.1.news
---
 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 8e0311e5967c..a397ffe86d2c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-desktop";
-  version = "3.38.0";
+  version = "3.38.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "143bvnsqdx8wy8bz6k836zv9rndvskaqb8x4b5b5grbgqvivp788";
+    sha256 = "1q1vri9vsrdwhhl26dk1f79a3dhwfn9dhbaiczli826nzq9kb40p";
   };
 
   nativeBuildInputs = [

From 08af99b9ce8ce7401796f5ab29ca83f51f9b944a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:50 +0000
Subject: [PATCH 0369/3942] =?UTF-8?q?gnome3.gnome-control-center:=203.38.0?=
 =?UTF-8?q?=20=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.38/gnome-control-center-3.38.1.news
---
 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 6c2713ee7f55..047133dd1543 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -69,11 +69,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-control-center";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1nmi5mf7bffjyb7sd6kcv151j0mfmlqpzy2spaaxhf4wxywbbdpn";
+    sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d";
   };
   # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
   prePatch = (import ../gvc-with-ucm-prePatch.nix {

From d2687f571ff55c55e85b443f1d695c0e5734d395 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:51 +0000
Subject: [PATCH 0370/3942] =?UTF-8?q?gnome3.gnome-devel-docs:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-devel-docs/3.38/gnome-devel-docs-3.38.1.news
---
 pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index e2b613bacfd4..f42d1a93e012 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-devel-docs";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0hzbmz6ji2g94353az5i9iqaq66jn09lhac9af9b85qykx4zfj3z";
+    sha256 = "07849yhpc4l4jscskpsbjwsp5qs8f0jz3rmh3p1nj13vxmvgm5j5";
   };
 
   passthru = {

From 4dc0285842ef829ab9b80c297bf0ba36b6731d08 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:55 +0000
Subject: [PATCH 0371/3942] =?UTF-8?q?gnome3.gnome-klotski:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-klotski/3.38/gnome-klotski-3.38.1.news
---
 pkgs/desktops/gnome-3/games/gnome-klotski/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index 2cec028d5075..a51b79e0f883 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "gnome-klotski";
-  version = "3.38.0";
+  version = "3.38.1";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "08mcgwjfgi2fsfargidvl0328w22v3ax9rvjh8mkp5d70zvbb0l2";
+    sha256 = "00rwi6z0068pbq01sq2d389ffcqsh3ylq3i8zkrqvblqid1hvnlv";
   };
 
   nativeBuildInputs = [

From 216a8a11a33baa30da02a5541be413911e647004 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:56 +0000
Subject: [PATCH 0372/3942] =?UTF-8?q?gnome3.gnome-initial-setup:=203.38.0?=
 =?UTF-8?q?=20=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-initial-setup/3.38/gnome-initial-setup-3.38.1.news
---
 pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
index 446851833dbe..b4771641adb8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
@@ -38,11 +38,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-initial-setup";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-OoV67177aJ9AhjLbhGmtJ2IPdi2XcHCjYDXFIsb4J1k=";
+    hash = "sha256-5V1PQHOZjg+3s9/MRw4qTH2VCpa+2rFQEbkITryBNnY=";
   };
 
   nativeBuildInputs = [

From b4360968ac9ce5c940106c3999d1cb7b18be3302 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:38:58 +0000
Subject: [PATCH 0373/3942] =?UTF-8?q?gnome3.gnome-mahjongg:=203.38.1=20?=
 =?UTF-8?q?=E2=86=92=203.38.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-mahjongg/3.38/gnome-mahjongg-3.38.2.news
---
 pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index 5a0a5873e26d..7a97002bc569 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-mahjongg";
-  version = "3.38.1";
+  version = "3.38.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "N0LcYxD8M/NewYfwJpnfIDzVb27pS0Hz7vJdrinutkc=";
+    sha256 = "1wslwhr782pdzrvca7wa6smvyid5yr42kjlra6qd9ji5qss0i1wj";
   };
 
   nativeBuildInputs = [

From e812c88fc316f11ffe5f2884a845b774aa855cd6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:39:00 +0000
Subject: [PATCH 0374/3942] =?UTF-8?q?gnome3.gnome-maps:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-maps/3.38/gnome-maps-3.38.1.news
https://ftp.gnome.org/pub/GNOME/sources/gnome-maps/3.38/gnome-maps-3.38.1.1.news
---
 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 f66b8385da46..ffc9c7cb4437 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-maps";
-  version = "3.38.0";
+  version = "3.38.1.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "16bzv7qzwbd2av09k1pbhshmj984dkn6y7xzhc16316hxd086xam";
+    sha256 = "1y59afvfrylkikqd0ax0nj41zs6b54219l7k5bp5gzh9lxq06xgk";
   };
 
   doCheck = true;

From c258f2df7682c0d182b30191d3786bdeda0c42f8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:39:01 +0000
Subject: [PATCH 0375/3942] =?UTF-8?q?gnome3.gnome-music:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-music/3.38/gnome-music-3.38.1.news
---
 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 4ec4417e603c..ca59c5556fe1 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -30,13 +30,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "3.38.0";
+  version = "3.38.1";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "01fpmkgqnr8r4dgnvgvhb1k5byihrv4yb4gnp2s123b1wizaj2ip";
+    sha256 = "1sda943nd646nq2y5anj0d7aaxxddznva5bh5gsx6qx0mxhi5jrv";
   };
 
   nativeBuildInputs = [

From 2d99c5c607a4f1cf916ad370273b5602825ffecd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:39:02 +0000
Subject: [PATCH 0376/3942] =?UTF-8?q?gnome3.gnome-nibbles:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-nibbles/3.38/gnome-nibbles-3.38.1.news
---
 pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index 6d532d7ed930..770b8dde0c6e 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-nibbles";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0nh8mxcrmkwzn9m9lbmvi2m53ikkmkxsklcn0bij2dkav5kdbiz5";
+    sha256 = "096mk2hsa1za002rk4cnhm0h8ps99jzl47kap27i16s4m2ny71vk";
   };
 
   nativeBuildInputs = [

From 803f883f6358c5fd7834cdc44bd3425b2cfb072e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:39:07 +0000
Subject: [PATCH 0377/3942] =?UTF-8?q?gnome3.gnome-settings-daemon:=203.38.?=
 =?UTF-8?q?0=20=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Uses fresh g-v-c.

https://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/3.38/gnome-settings-daemon-3.38.1.news
---
 .../gnome-3/core/gnome-settings-daemon/default.nix     | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index 59833f83f6e9..3c039bc63108 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -1,5 +1,4 @@
 { stdenv
-, fetchFromGitLab
 , fetchpatch
 , substituteAll
 , fetchurl
@@ -43,18 +42,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-settings-daemon";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0bkrsqzyrxvnw2x1p2a67k3f692ih3i5pafnxqn1kbcsmdgmpvdp";
+    sha256 = "0r010wzw3dj87mapzvq15zv93i86wg0x0rpii3x2wapq3bcj30g2";
   };
 
-  # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
-  prePatch = (import ../gvc-with-ucm-prePatch.nix {
-    inherit fetchFromGitLab;
-  });
-
   patches = [
     # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202
     (fetchpatch {

From 4e6c9ed2ed20d0adbed615369e15b0852e1c8faa Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:39:08 +0000
Subject: [PATCH 0378/3942] =?UTF-8?q?gnome3.gnome-shell-extensions:=203.38?=
 =?UTF-8?q?.0=20=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-shell-extensions/3.38/gnome-shell-extensions-3.38.1.news
---
 pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 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 63971cbc9530..4b4901cab66f 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 {
   pname = "gnome-shell-extensions";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "17wisc069xjxfyyihzwci4jmvliby83d7pm716nq5c4qnddzh9pp";
+    sha256 = "150c0jgjhbb59wf7lzcnp1f22lvrigw95mg5ad3jh15qzwqqd8wx";
   };
 
   passthru = {

From 6fd69ba58d4f6062ac7b3043afdd09af9f12b23e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:39:09 +0000
Subject: [PATCH 0379/3942] =?UTF-8?q?gnome3.gnome-shell:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Uses fresh g-v-c

https://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.38/gnome-shell-3.38.1.news
---
 .../gnome-3/core/gnome-shell/default.nix      | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 4dba3fb76768..3ebf409f0308 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -1,5 +1,4 @@
 { fetchurl
-, fetchFromGitLab
 , fetchpatch
 , substituteAll
 , stdenv
@@ -23,7 +22,6 @@
 , librsvg
 , geoclue2
 , perl
-, docbook_xml_dtd_412
 , docbook_xml_dtd_42
 , docbook_xml_dtd_43
 , desktop-file-utils
@@ -67,20 +65,15 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gnome-shell";
-  version = "3.38.0";
+  version = "3.38.1";
 
   outputs = [ "out" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "15qabakial0jcsqkq1xg4fsssarixq6aqqksikdfcpl7q0xl09n6";
+    sha256 = "1d0br74gxwnqbh102yjkszkc6fc4yd6p5lcs6bxcpi33chly72dp";
   };
 
-  # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
-  prePatch = (import ../gvc-with-ucm-prePatch.nix {
-    inherit fetchFromGitLab;
-  });
-
   patches = [
     # Hardcode paths to various dependencies so that they can be found at runtime.
     (substituteAll {
@@ -103,13 +96,6 @@ stdenv.mkDerivation rec {
       revert = true;
       sha256 = "14h7ahlxgly0n3sskzq9dhxzbyb04fn80pv74vz1526396676dzl";
     })
-
-    # Remove include of missing file preventing docs from building.
-    # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1448
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/84cff8920509f99be47c017bd8bdf8e45ea90535.patch";
-      sha256 = "9bFfT7bHMdxPjDUvjoIrFQ3eddQv/kXyeTOAM+7eUm8=";
-    })
   ];
 
   nativeBuildInputs = [
@@ -118,7 +104,7 @@ stdenv.mkDerivation rec {
     pkg-config
     gettext
     docbook-xsl-nons
-    docbook_xml_dtd_412
+    # Switch to 4.5 in the 40.
     docbook_xml_dtd_42
     docbook_xml_dtd_43
     gtk-doc

From d6222eb855dd57e2df63def93ed9e1bb50d0a306 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:39:13 +0000
Subject: [PATCH 0380/3942] =?UTF-8?q?gnome3.gnome-terminal:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reverts back to using VM’s environment, systemd --user/D-Bus activation environment might be incomplete if the desktop does not properly update it.

https://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/3.38/gnome-terminal-3.38.1.changes
---
 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 0f5ae6a97f73..8c8cc88301d8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-terminal";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1xalmvic4h5dgw77h899h6nzyg56bgm1vgk92kbgzil3nflcf3qa";
+    sha256 = "1lgkvla0fadg76j898p2x2fipqf8kkqbbmmsfkfpz11q9y1d966r";
   };
 
   buildInputs = [

From aad938e5d399edf70f0e4ec59fae151f2b26565b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:39:14 +0000
Subject: [PATCH 0381/3942] =?UTF-8?q?gnome3.gnome-taquin:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-taquin/3.38/gnome-taquin-3.38.1.news
---
 pkgs/desktops/gnome-3/games/gnome-taquin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 72094cb08894..fc73ef1397ef 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-taquin";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "07xpvyks1r5wxvjz1n07g7khxa02smhq4kykc4d22fmzr3yka077";
+    sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn";
   };
 
   passthru = {

From 8b2a2a4e3b6903b1edbe98f9d0ed141cb8e2866f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:39:14 +0000
Subject: [PATCH 0382/3942] =?UTF-8?q?gnome3.gnome-tetravex:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-tetravex/3.38/gnome-tetravex-3.38.1.news
---
 pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index e0a94d2e7d7c..afa12f1cf17c 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-tetravex";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0m7p6i7lnmwnr3lnwzcmzrr8f07zfgvl0pg6f88s8l2dmql08gsa";
+    sha256 = "0s70swm2acgydz77nxyzn9xv8p03la7sl3cq87s7b8g7lyw943mv";
   };
 
   passthru = {

From d843d7b3d7b86580c87e93923b66dffcd6f035d2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:39:20 +0000
Subject: [PATCH 0383/3942] =?UTF-8?q?gnome3.gvfs:=201.46.0=20=E2=86=92=201?=
 =?UTF-8?q?.46.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gvfs/1.46/gvfs-1.46.1.news
---
 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 71bd77a2a42c..f79ffa579c87 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -41,11 +41,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gvfs";
-  version = "1.46.0";
+  version = "1.46.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1sbhv7smfah5nijmv9k3chhylnyx4rnb8xn7mkiir8h9vak77fkq";
+    sha256 = "00r56kp8dhdn1ypyap66klymlwlh646n4f1ri797w2x6p70sc7k2";
   };
 
   postPatch = ''

From 990cb913ee3399f326e35cfb5d3487cfa3282f22 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:39:21 +0000
Subject: [PATCH 0384/3942] =?UTF-8?q?gnome3.iagno:=203.38.0=20=E2=86=92=20?=
 =?UTF-8?q?3.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/iagno/3.38/iagno-3.38.1.news
---
 pkgs/desktops/gnome-3/games/iagno/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 1814da85ae26..08d402ead574 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iagno";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0fd7bmym35b43d2gp6ngablry85gb2j52gp4lgqd098hbn5ziaf4";
+    sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4";
   };
 
   patches = [

From cd441a5d31f443db94faf1464f0d4aab70aad1fd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:39:25 +0000
Subject: [PATCH 0385/3942] =?UTF-8?q?gnome3.metacity:=203.37.1=20=E2=86=92?=
 =?UTF-8?q?=203.38.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/metacity/3.38/metacity-3.38.0.news
---
 pkgs/desktops/gnome-3/misc/metacity/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix
index 49fb911c60d2..04008f4c84bb 100644
--- a/pkgs/desktops/gnome-3/misc/metacity/default.nix
+++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "metacity";
-  version = "3.37.1";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "09m102lpy68730y8y7vjyaw3cavlbdbiyix6s0kgna23bbcz7ml0";
+    sha256 = "1b0i9sq6qa540f2006cv1p8i6lxg1h6w00apxwzwjpfqn0hk26c1";
   };
 
   patches = [
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     xorg.libXres
+    xorg.libXpresent
     glib
     gsettings-desktop-schemas
     gtk3

From d1eeb643e21fa5ed00cb892df181791920d2b94a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:40:55 +0000
Subject: [PATCH 0386/3942] =?UTF-8?q?gnome3.mutter:=203.38.0=20=E2=86=92?=
 =?UTF-8?q?=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/mutter/3.38/mutter-3.38.1.news

It requires some udev rules on some devices.
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 6 ++++++
 pkgs/desktops/gnome-3/core/mutter/default.nix          | 7 +++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 54d9c6bdc8c2..4ace32dc96a1 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -295,6 +295,12 @@ in
         gnome-shell
       ];
 
+      services.udev.packages = with pkgs.gnome3; [
+        # Force enable KMS modifiers for devices that require them.
+        # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443
+        mutter
+      ];
+
       services.avahi.enable = mkDefault true;
 
       xdg.portal.extraPortals = [
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 28e8608db4f4..35d2822e8fb0 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -42,13 +42,13 @@
 
 let self = stdenv.mkDerivation rec {
   pname = "mutter";
-  version = "3.38.0";
+  version = "3.38.1";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1aqfv7f3vsjghjy5bk50ck1pi92hc3368mgsnvlx719020yx33h5";
+    sha256 = "0cvs47h7xhalkh8xcchllaws212ml3d23aj0pmfq0qyzkw65f8g9";
   };
 
   patches = [
@@ -124,6 +124,9 @@ let self = stdenv.mkDerivation rec {
     ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas"
   '';
 
+  # Install udev files into our own tree.
+  PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
+
   passthru = {
     libdir = "${self}/lib/mutter-6";
 

From 73c6cfb3b07ef198eb3465e84a988dc497ba6ffe Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:40:56 +0000
Subject: [PATCH 0387/3942] =?UTF-8?q?gnome3.nautilus:=203.38.0=20=E2=86=92?=
 =?UTF-8?q?=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/nautilus/3.38/nautilus-3.38.1.news
---
 pkgs/desktops/gnome-3/core/nautilus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index aca5a27e6349..2107cad4a5b9 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -32,11 +32,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nautilus";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1h6adh474rmjva06g3wcj9g5vrvffi5hkhkfzddg7nzpygwk1wy6";
+    sha256 = "1zfh48ibap6jnw20rxls7nbv4zzqs6n5abr2dzyvfx5p2cmq2gha";
   };
 
   patches = [

From b8e6470f1b4d9baa7df5bc257b361f57f760ca3f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:41:00 +0000
Subject: [PATCH 0388/3942] =?UTF-8?q?gnome3.quadrapassel:=203.36.05=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/quadrapassel/3.38/quadrapassel-3.38.1.news
---
 pkgs/desktops/gnome-3/games/quadrapassel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index a5302fee7abb..9bc1c5ee73ab 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "quadrapassel";
-  version = "3.36.05";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "04abxmimh5npw8rhz1sfi6wxilgc6i1wka9mlnfwp8v1p1cb00cv";
+    sha256 = "033plabc6q3sk6qjr5nml8z6p07vcw57gxddxjk9b65wgg0rzzhr";
   };
 
   nativeBuildInputs = [

From 40e3468ece971c1d89e7e93dd4e0e36fef1222c6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:41:01 +0000
Subject: [PATCH 0389/3942] =?UTF-8?q?gnome3.simple-scan:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/simple-scan/3.38/simple-scan-3.38.1.news
---
 pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index dc8e7769e844..66846876faef 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation rec {
   pname = "simple-scan";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "04f30kjbq2dzcy1xr2s9rgy0ww08k3yyz69131xsa0az0gysymj3";
+    sha256 = "0grscz96bwj79ka4qvxh8h75avdx6824k8k38ylmaj6xbl6gi0hy";
   };
 
   nativeBuildInputs = [

From 1e76bdd56b2ef12341ad8afb6ba67d5e70b22060 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:41:06 +0000
Subject: [PATCH 0390/3942] =?UTF-8?q?gnome3.yelp:=203.38.0=20=E2=86=92=203?=
 =?UTF-8?q?.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/yelp/3.38/yelp-3.38.1.news
---
 pkgs/desktops/gnome-3/core/yelp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index f70f31b0db89..147809de9ef6 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "yelp";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0n4n9xa39pvy5iwrw3fhyjrqpw6bzxzgmh89y56knldsdl7cxkfp";
+    sha256 = "102z8khj82vdp12c3y86hhxwm1x89xpkpc5zs63c7gg21cbrwdbl";
   };
 
   nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];

From da85646164515f675bfdf1ef294858d4eecbd0ed Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 16:41:08 +0000
Subject: [PATCH 0391/3942] =?UTF-8?q?gnome3.yelp-xsl:=203.38.0=20=E2=86=92?=
 =?UTF-8?q?=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/yelp-xsl/3.38/yelp-xsl-3.38.1.news
---
 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 91ba11947de2..a29a292b3d74 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "yelp-xsl";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1mxhg9z1drzjd9j3ykyjxw26pa8m00ppp36ifi0khmac3h0w5g0k";
+    sha256 = "0ryzvkcgxp7xi0icmpdl2rinjn904s8imbxdi6wshzxblqymc8dk";
   };
 
   nativeBuildInputs = [

From 4c83a97c8ca4e24301680bd324dfa742380aa56e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 20:48:43 +0200
Subject: [PATCH 0392/3942] zeitgeist: clean up

Remove unused configure flag and change license to LGPL2.1+ (used since 0.7.0).
---
 pkgs/development/libraries/zeitgeist/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index 100501108730..95f09f595048 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -62,7 +62,6 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-session-bus-services-dir=${placeholder "out"}/share/dbus-1/services"
     "--disable-telepathy"
   ];
 
@@ -84,7 +83,7 @@ stdenv.mkDerivation rec {
     description = "A service which logs the users’s activities and events";
     homepage = "https://zeitgeist.freedesktop.org/";
     maintainers = with maintainers; [ lethalman worldofpeace ];
-    license = licenses.gpl2;
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
   };
 }

From 06929e3f286118783e59fbf7e8ac71124f5048b7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Oct 2020 23:59:51 +0200
Subject: [PATCH 0393/3942] =?UTF-8?q?gnome3.gpaste:=203.36.3=20=E2=86=92?=
 =?UTF-8?q?=203.38.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.imagination-land.org/posts/2020-09-15-gpaste-3.38.0-released.html
https://www.imagination-land.org/posts/2020-10-01-gpaste-3.38.1-released.html
https://www.imagination-land.org/posts/2020-10-03-gpaste-3.38.2-released.html
---
 pkgs/desktops/gnome-3/misc/gpaste/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index 59b87c3367f5..0f4b8174405f 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -17,14 +17,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.36.3";
+  version = "3.38.2";
   pname = "gpaste";
 
   src = fetchFromGitHub {
     owner = "Keruspe";
     repo = "GPaste";
     rev = "v${version}";
-    sha256 = "1p1p2ng095lkly5fp9120b23wlvkj1xf4fhivzsd72css0szy7mi";
+    sha256 = "1dnvwsmlayrhh9zd4v57kc9k03jhv7i0zyv0fbspzp4msmnb1w2x";
   };
 
   patches = [

From 297bac601aa4dc14cf44ca88bd6ea60e56921b67 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 12 Oct 2020 02:11:04 +0200
Subject: [PATCH 0394/3942] =?UTF-8?q?webkitgtk:=202.30.0=20=E2=86=92=202.3?=
 =?UTF-8?q?0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index ffbc785d0972..de3d8da0bc38 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -63,7 +63,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "webkitgtk";
-  version = "2.30.0";
+  version = "2.30.1";
 
   outputs = [ "out" "dev" ];
 
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "04axfmzsb9gnyqaz5v7ljapiycxnzwpiya1l9rhp4c1qsbrdpwya";
+    sha256 = "1cfnsl5kvwrbclmp7v9q9ynrz702i9ncb6xmx6972dxpmpyrvi8p";
   };
 
   patches = optionals stdenv.isLinux [

From bf9edc9e3831b20c9d15a5bb228505411d4d72a5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Oct 2020 02:23:16 +0200
Subject: [PATCH 0395/3942] gnome3.geary: fix tests

We forgot about this in 3.36 bump.
---
 pkgs/desktops/gnome-3/misc/geary/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 4d649bdfbe9f..6390b03efa31 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -26,7 +26,10 @@
 , gnome3
 , webkitgtk
 , python3
+, gnutls
+, cacert
 , xvfb_run
+, glibcLocales
 , dbus
 , shared-mime-info
 , libunwind
@@ -95,7 +98,10 @@ stdenv.mkDerivation rec {
 
   checkInputs = [
     dbus
+    gnutls # for certtool
+    cacert # trust store for glib-networking
     xvfb_run
+    glibcLocales # required by Geary.ImapDb.DatabaseTest/utf8_case_insensitive_collation
   ];
 
   mesonFlags = [
@@ -115,12 +121,12 @@ stdenv.mkDerivation rec {
     chmod +x desktop/geary-attach
   '';
 
-  # FIXME: fix tests
-  doCheck = false;
+  doCheck = true;
 
   checkPhase = ''
     NO_AT_BRIDGE=1 \
-    XDG_DATA_DIRS=:$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share \
+    GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules \
+    XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \
     xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
       --config-file=${dbus.daemon}/share/dbus-1/session.conf \
       meson test -v --no-stdsplit

From 94ed06e3fadcc6a9c7fdaea123b09877a40c503f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Oct 2020 03:09:10 +0000
Subject: [PATCH 0396/3942] =?UTF-8?q?vte:=200.62.0=20=E2=86=92=200.62.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index ac3d7158178c..014b2615d5bf 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vte";
-  version = "0.62.0";
+  version = "0.62.1";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "05mhvcwmini97x1hrjvx1xyqp6bqyglsh6j7yrrwq23zsip28bad";
+    sha256 = "139had0zcggzrxx9rjy0a67mahzm474amafh168y11421iyfhsf3";
   };
 
   passthru = {

From 948edf8f2662d7f1b5445aaf6d291edc029bb27b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Oct 2020 22:43:45 +0200
Subject: [PATCH 0397/3942] gnome3.gnome-control-center: Fix crash after
 leaving user-accounts

---
 .../gnome-3/core/gnome-control-center/default.nix    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 047133dd1543..1300f7a75035 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,5 +1,6 @@
 { fetchurl
 , fetchFromGitLab
+, fetchpatch
 , stdenv
 , substituteAll
 , accountsservice
@@ -148,6 +149,17 @@ stdenv.mkDerivation rec {
       inherit glibc libgnomekbd tzdata;
       inherit cups networkmanagerapplet;
     })
+
+    # Fix double free when leaving user accounts panel.
+    # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/853
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/e80b4b5f58f448c5a3d38721f7bba32c413d46e7.patch";
+      sha256 = "GffsSU/uNS0Fg2lXbOuD/BrWBT4D2VKgWNGifG0FBUw=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/64686cfee330849945f6ff4dcc43393eb1a6e59c.patch";
+      sha256 = "4VJU0q6qOtGzd/hmDncckInfEjCkC8+lXmDgxwc4VJU=";
+    })
   ];
 
   postPatch = ''

From 0703985bef52771c9381520832476e147e4006bb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Oct 2020 22:57:48 +0200
Subject: [PATCH 0398/3942] =?UTF-8?q?gnomeExtensions.gsconnect:=2041=20?=
 =?UTF-8?q?=E2=86=92=2043?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/andyholmes/gnome-shell-extension-gsconnect/releases/tag/v42
https://github.com/andyholmes/gnome-shell-extension-gsconnect/releases/tag/v43

- Added installed tests.
- Corrected license.
---
 nixos/tests/installed-tests/default.nix       |  1 +
 nixos/tests/installed-tests/gsconnect.nix     |  7 +++
 .../gnome-3/extensions/gsconnect/default.nix  | 58 ++++++++++++++++---
 .../gsconnect/installed-tests-path.patch      | 30 ++++++++++
 4 files changed, 89 insertions(+), 7 deletions(-)
 create mode 100644 nixos/tests/installed-tests/gsconnect.nix
 create mode 100644 pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch

diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix
index 50ca8ad2b50f..e5d7009bb7b9 100644
--- a/nixos/tests/installed-tests/default.nix
+++ b/nixos/tests/installed-tests/default.nix
@@ -94,6 +94,7 @@ in
   glib-networking = callInstalledTest ./glib-networking.nix {};
   gnome-photos = callInstalledTest ./gnome-photos.nix {};
   graphene = callInstalledTest ./graphene.nix {};
+  gsconnect = callInstalledTest ./gsconnect.nix {};
   ibus = callInstalledTest ./ibus.nix {};
   libgdata = callInstalledTest ./libgdata.nix {};
   glib-testing = callInstalledTest ./glib-testing.nix {};
diff --git a/nixos/tests/installed-tests/gsconnect.nix b/nixos/tests/installed-tests/gsconnect.nix
new file mode 100644
index 000000000000..ac39f7435786
--- /dev/null
+++ b/nixos/tests/installed-tests/gsconnect.nix
@@ -0,0 +1,7 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+  tested = pkgs.gnomeExtensions.gsconnect;
+
+  withX11 = true;
+}
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index 98827fd3f6a2..e2159e2e3865 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -1,16 +1,41 @@
-{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, gsound
-, meson, ninja, libxml2, pkgconfig, gobject-introspection, wrapGAppsHook
-, glib, gtk3, at-spi2-core, upower, openssh, gnome3, gjs }:
+{ stdenv
+, fetchFromGitHub
+, substituteAll
+, python3
+, openssl
+, gsound
+, meson
+, ninja
+, libxml2
+, pkgconfig
+, gobject-introspection
+, wrapGAppsHook
+, glib
+, gtk3
+, at-spi2-core
+, upower
+, openssh
+, gnome3
+, gjs
+, nixosTests
+, atk
+, harfbuzz
+, pango
+, gdk-pixbuf
+, gsettings-desktop-schemas
+}:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-gsconnect";
-  version = "41";
+  version = "43";
+
+  outputs = [ "out" "installedTests" ];
 
   src = fetchFromGitHub {
     owner = "andyholmes";
     repo = "gnome-shell-extension-gsconnect";
     rev = "v${version}";
-    sha256 = "0lcj7k16jki54bsyh01j4ss4hhfddnahcw02zlmlkl637qdv1b5j";
+    sha256 = "0hm14hg4nhv9hrmjcf9dgm7dsvzpjfifihjmb6yc78y9yjw0i3v7";
   };
 
   patches = [
@@ -19,6 +44,9 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       gapplication = "${glib.bin}/bin/gapplication";
     })
+
+    # Allow installing installed tests to a separate output
+    ./installed-tests-path.patch
   ];
 
   nativeBuildInputs = [
@@ -51,11 +79,13 @@ stdenv.mkDerivation rec {
     "-Dsshkeygen_path=${openssh}/bin/ssh-keygen"
     "-Dsession_bus_services_dir=${placeholder "out"}/share/dbus-1/services"
     "-Dpost_install=true"
+    "-Dinstalled_test_prefix=${placeholder ''installedTests''}"
   ];
 
   postPatch = ''
     patchShebangs meson/nmh.sh
     patchShebangs meson/post-install.sh
+    patchShebangs installed-tests/prepare-tests.sh
 
     # TODO: do not include every typelib everywhere
     # for example, we definitely do not need nautilus
@@ -65,20 +95,34 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  postFixup = ''
+  postFixup = let
+    testDeps = [
+      gtk3 harfbuzz atk pango.out gdk-pixbuf
+    ];
+  in ''
     # Let’s wrap the daemons
     for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{daemon,nativeMessagingHost}.js; do
       echo "Wrapping program $file"
       wrapGApp "$file"
     done
+
+    wrapProgram "$installedTests/libexec/installed-tests/gsconnect/minijasmine" \
+      --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
+      --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}"
   '';
 
   uuid = "gsconnect@andyholmes.github.io";
 
+  passthru = {
+    tests = {
+      installedTests = nixosTests.installed-tests.gsconnect;
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "KDE Connect implementation for Gnome Shell";
     homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ etu ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch b/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch
new file mode 100644
index 000000000000..78e1ad96d74c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch
@@ -0,0 +1,30 @@
+diff --git a/installed-tests/meson.build b/installed-tests/meson.build
+index c7eff2fb..ef4f6052 100644
+--- a/installed-tests/meson.build
++++ b/installed-tests/meson.build
+@@ -1,5 +1,5 @@
+-installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name())
+-installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name())
++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
+ 
+ installed_tests_srcdir = meson.current_source_dir()
+ installed_tests_builddir = meson.current_build_dir()
+diff --git a/meson_options.txt b/meson_options.txt
+index 8912e052..ca6ee5eb 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -116,6 +116,13 @@ option(
+   description: 'Native Messaging Host directory for Mozilla'
+ )
+ 
++option(
++  'installed_test_prefix',
++  type: 'string',
++  value: '',
++  description: 'Prefix for installed tests'
++)
++
+ option(
+   'installed_tests',
+   type: 'boolean',

From 9c33a3ff21571fe83c07eb20bada89da0b3b5acc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Oct 2020 01:03:02 +0200
Subject: [PATCH 0399/3942] gnomeExtensions.gsconnect: Clean up

* Caribou dependency was removed in v27 (https://github.com/andyholmes/gnome-shell-extension-gsconnect/commit/fd1a771ef4c5d96c55a6919f491d394bfd8ea2e5)
* Atspi is optional since then, when Mutter is built with Pipewire support.
* Nautilus stuff does not actually seem to be used directly, the Python script will be eventually loaded by nautilus-python.
* UPower is used through D-Bus now (https://github.com/andyholmes/gnome-shell-extension-gsconnect/commit/c53491f97d95b7799482e9148b289842a8242769)
* xmllint does not seem to be used (maybe it was used for building GResource in the past)
* use pkg-config instead of alias
---
 .../gnome-3/extensions/gsconnect/default.nix     | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index e2159e2e3865..5e51b995a54b 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -1,19 +1,15 @@
 { stdenv
 , fetchFromGitHub
 , substituteAll
-, python3
 , openssl
 , gsound
 , meson
 , ninja
-, libxml2
-, pkgconfig
+, pkg-config
 , gobject-introspection
 , wrapGAppsHook
 , glib
 , gtk3
-, at-spi2-core
-, upower
 , openssh
 , gnome3
 , gjs
@@ -50,21 +46,17 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    meson ninja pkgconfig
+    meson
+    ninja
+    pkg-config
     gobject-introspection # for locating typelibs
     wrapGAppsHook # for wrapping daemons
-    libxml2 # xmllint
   ];
 
   buildInputs = [
     glib # libgobject
     gtk3
-    at-spi2-core # atspi
-    gnome3.nautilus # TODO: this contaminates the package with nautilus and gnome-autoar typelibs but it is only needed for the extension
-    gnome3.nautilus-python
     gsound
-    upower
-    gnome3.caribou
     gjs # for running daemon
     gnome3.evolution-data-server # for libebook-contacts typelib
   ];

From 06fc53857aa20db7cfcfdc330a4ce5308025437f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Oct 2020 21:49:12 +0200
Subject: [PATCH 0400/3942] python2.pkgs.dbus-python: disable tests

PyGObject no longer supports Python 2.
---
 pkgs/development/python-modules/dbus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index 5d1fd9ef0be4..aadf53e99255 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -1,5 +1,5 @@
 { lib, fetchPypi, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy
-, ncurses, pygobject3 }:
+, ncurses, pygobject3, isPy3k }:
 
 buildPythonPackage rec {
   pname = "dbus-python";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     # It seems not to retain the dependency anyway.
     ++ lib.optional (! python ? modules) ncurses;
 
-  doCheck = true;
+  doCheck = isPy3k;
   checkInputs = [ dbus.out pygobject3 ];
 
   meta = {

From 9b64ebbeb7e5ff96cfd72cb132f0804d794575d7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Oct 2020 21:56:21 +0200
Subject: [PATCH 0401/3942] onioncircuits: Switch to Python 3

PyGObject no longer supports Python 2.
---
 pkgs/tools/security/onioncircuits/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix
index 0eb0f7b401ee..92888a8de2a1 100644
--- a/pkgs/tools/security/onioncircuits/default.nix
+++ b/pkgs/tools/security/onioncircuits/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }:
+{ stdenv, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }:
 
-pythonPackages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "onioncircuits";
   version = "0.5";
 
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
 
   nativeBuildInputs = [ intltool ];
   buildInputs = [ intltool gtk3 gobject-introspection ];
-  propagatedBuildInputs =  with pythonPackages; [ stem distutils_extra pygobject3 ];
+  propagatedBuildInputs =  with python3.pkgs; [ stem distutils_extra pygobject3 ];
 
   postFixup = ''
     wrapProgram "$out/bin/onioncircuits" \

From 330ac8b3dcf1fbd76c21e05d4d88826799327d9c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Oct 2020 22:14:13 +0200
Subject: [PATCH 0402/3942] syncthing-gtk: mark as broken

It does not seem to support Python 3 and pygobject no longer supports Python 2.

https://github.com/kozec/syncthing-gtk/issues/487
---
 pkgs/applications/networking/syncthing-gtk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index cf1e053dd53c..e432b3795172 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -59,6 +59,7 @@ buildPythonApplication rec {
     description = "GTK3 & python based GUI for Syncthing";
     homepage = "https://github.com/syncthing/syncthing-gtk";
     license = licenses.gpl2;
+    broken = true;
     maintainers = with maintainers; [ ];
     platforms = syncthing.meta.platforms;
   };

From 268f2d1478c53f125cd8f4f53e8d2bae375591fe Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Oct 2020 22:16:58 +0200
Subject: [PATCH 0403/3942] volctl: switch to Python 3

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

diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix
index dd58671824db..2a55015be105 100644
--- a/pkgs/tools/audio/volctl/default.nix
+++ b/pkgs/tools/audio/volctl/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pythonPackages, libpulseaudio, glib, gtk3, gobject-introspection, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, python3, libpulseaudio, glib, gtk3, gobject-introspection, wrapGAppsHook }:
 
-pythonPackages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "volctl";
   version = "0.6.3";
 
@@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec {
     libpulseaudio
   ];
 
-  pythonPath = with pythonPackages; [
+  pythonPath = with python3.pkgs; [
     pygobject3
   ];
 

From eaeafe60f41ccf862165c03fc72dd49f13efa5a1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Oct 2020 22:22:39 +0200
Subject: [PATCH 0404/3942] sc-controller: mark as broken

Python 3 is not supported but PyGObject no longer supports Python 2.

https://github.com/kozec/sc-controller/issues/498
---
 pkgs/misc/drivers/sc-controller/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index ff5fb6e5ee76..23c5e3f9dc8c 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -55,6 +55,7 @@ buildPythonApplication rec {
   meta = with lib; {
     homepage    = "https://github.com/kozec/sc-controller";
     # donations: https://www.patreon.com/kozec
+    broken = true;
     description = "User-mode driver and GUI for Steam Controller and other controllers";
     license     = licenses.gpl2;
     platforms   = platforms.linux;

From f0584c52fe74ad7ac7b0c6a0b800203880490977 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Oct 2020 22:26:45 +0200
Subject: [PATCH 0405/3942] pdf-quench: Switch to Python 3

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

diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index d364074d4450..c84c09e59a7e 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}:
+{ stdenv, fetchFromGitHub, pkgs, python3, wrapGAppsHook}:
 
-pythonPackages.buildPythonApplication {
+python3.pkgs.buildPythonApplication {
   pname = "pdf-quench";
   version = "1.0.5";
 
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication {
     goocanvas2
     poppler_gi
   ];
-  propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ];
+  propagatedBuildInputs = with python3.pkgs; [ pygobject3 pypdf2 ];
 
   format = "other";
   doCheck = false;

From 0e5492a72c0fce516502a1fb1e2c81e2f67065e9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Oct 2020 22:27:47 +0200
Subject: [PATCH 0406/3942] gramps: Do not use gnome3.gexiv2 alias

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

diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 09717cd64265..4315af94f6b6 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3,
+{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2,
   pango, gobject-introspection, wrapGAppsHook, gettext,
 # Optional packages:
  enableOSM ? true, osm-gps-map,
@@ -13,7 +13,7 @@ in buildPythonApplication rec {
   pname = "gramps";
 
   nativeBuildInputs = [ wrapGAppsHook gettext ];
-  buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ]
+  buildInputs = [ intltool gtk3 gobject-introspection pango gexiv2 ]
     # Map support
     ++ stdenv.lib.optional enableOSM osm-gps-map
     # Graphviz support

From 09924245424478db1c5d28b7d0ff8a54e33713bc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Oct 2020 22:45:22 +0200
Subject: [PATCH 0407/3942] =?UTF-8?q?vala-lint:=202019-10-11=20=E2=86=92?=
 =?UTF-8?q?=202020-08-18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix build.

https://github.com/vala-lang/vala-lint/compare/a077bbec30dea128616a23583ce3f8364ff2ef11...fc5dd9e95bc61540b404d5bc070c0629903baad9
---
 pkgs/development/tools/vala-lint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix
index 199f1626c891..378bc935e22a 100644
--- a/pkgs/development/tools/vala-lint/default.nix
+++ b/pkgs/development/tools/vala-lint/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vala-lint-unstable";
-  version = "2019-10-11";
+  version = "2020-08-18";
 
   src = fetchFromGitHub {
     owner = "vala-lang";
     repo = "vala-lint";
-    rev = "a077bbec30dea128616a23583ce3f8364ff2ef11";
-    sha256 = "0w0rmaj4v42wc4vq2lfjnj6airag5ahv6522xkw3j1nmccxq3s72";
+    rev = "fc5dd9e95bc61540b404d5bc070c0629903baad9";
+    sha256 = "n6pp6vYGaRF8B3phWp/e9KnpKGf0Op+xGVdT6HHe0rM=";
   };
 
   nativeBuildInputs = [

From 6d94553dde873a44a5d44bd5bb95c7b517cee478 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 19 Oct 2020 00:00:05 +0200
Subject: [PATCH 0408/3942] xmonad_log_applet: Mark as broken

libpanel-applet was removed in favour of libgnome-applet
---
 pkgs/applications/window-managers/xmonad/log-applet/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
index 7c6041b576e3..ffd804eaba0e 100644
--- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "https://github.com/kalj/xmonad-log-applet";
     license = licenses.bsd3;
+    broken = desktopSupport == "gnomeflashback";
     description = "An applet that will display XMonad log information (${desktopSupport} version)";
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];

From 346e1f020e4aab6cb899ed483593cf2a5c77dd4d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Oct 2020 19:07:48 +0200
Subject: [PATCH 0409/3942] release-notes: Mention GNOME 3.38

---
 nixos/doc/manual/release-notes/rl-2103.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index c160ab5783d3..c6b0753ff9a2 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -23,6 +23,9 @@
      Support is planned until the end of October 2021, handing over to 21.09.
     </para>
    </listitem>
+   <listitem>
+    <para>GNOME desktop environment was upgraded to 3.38, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.38/">release notes</link>.</para>
+   </listitem>
   </itemizedlist>
  </section>
 

From 5e385615923059c8ca36b342b09806f1d3a66dd1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Oct 2020 19:28:05 +0200
Subject: [PATCH 0410/3942] gnome3.gnome-online-miners: clean up

* format
* do not use aliases
* correct license
---
 .../core/gnome-online-miners/default.nix      | 52 +++++++++++++++----
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index 496899f38409..779e77fdabce 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -1,6 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
-, libgdata, grilo, libzapojit, grilo-plugins, gnome-online-accounts, libmediaart
-, tracker_2, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
+{ stdenv
+, fetchurl
+, pkg-config
+, glib
+, gnome3
+, libxml2
+, libgdata
+, grilo
+, libzapojit
+, grilo-plugins
+, gnome-online-accounts
+, libmediaart
+, tracker_2
+, gfbgraph
+, librest
+, libsoup
+, json-glib
+, gmp
+, openssl
+, dleyna-server
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "gnome-online-miners";
@@ -11,12 +30,27 @@ stdenv.mkDerivation rec {
     sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44";
   };
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook
+  ];
+
   buildInputs = [
-    glib libgdata libxml2 libsoup gmp openssl
-    grilo libzapojit grilo-plugins
-    gnome-online-accounts libmediaart
-    tracker_2 gfbgraph json-glib librest
+    glib
+    libgdata
+    libxml2
+    libsoup
+    gmp
+    openssl
+    grilo
+    libzapojit
+    grilo-plugins
+    gnome-online-accounts
+    libmediaart
+    tracker_2
+    gfbgraph
+    json-glib
+    librest
     dleyna-server
   ];
 
@@ -33,7 +67,7 @@ stdenv.mkDerivation rec {
     homepage = "https://wiki.gnome.org/Projects/GnomeOnlineMiners";
     description = "A set of crawlers that go through your online content and index them locally in Tracker";
     maintainers = teams.gnome.members;
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
 }

From c9f3736a209b2b98201a8d67e24c2bb14ede9999 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Oct 2020 19:49:33 +0200
Subject: [PATCH 0411/3942] gnome3.gnome-online-miners: Apply some pending
 patches

Mainly to support Tracker 3.
---
 .../core/gnome-online-miners/default.nix      | 47 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index 779e77fdabce..9a940458679f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -1,5 +1,8 @@
 { stdenv
 , fetchurl
+, fetchpatch
+, autoconf-archive
+, autoreconfHook
 , pkg-config
 , glib
 , gnome3
@@ -10,7 +13,7 @@
 , grilo-plugins
 , gnome-online-accounts
 , libmediaart
-, tracker_2
+, tracker
 , gfbgraph
 , librest
 , libsoup
@@ -30,7 +33,43 @@ stdenv.mkDerivation rec {
     sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44";
   };
 
+  patches = [
+    # Fix use after free
+    # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/4
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/9eb57c6a8cd1a925c508646edae936eee0a8e46b.patch";
+      sha256 = "O1GRnzs33I0mFzrNDFkTGiBKstq5krYg7fwj60367TA=";
+    })
+
+    # Port to Tracker 3
+    # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/2d3798252807cad9eb061ed2b37e35170c1a1daf.patch";
+      sha256 = "hwrkxroMpTfOwJAPkYQFdDCroZ2qSsvOgDetrJDig20=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/1548c0c527f0e4389047448d7d3b6cff55278c8e.patch";
+      sha256 = "U9w81c9Kze7kv5KHeGqvDeSNHzSayVrUG0XYsYMa1sg=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/941ebd8890c9ac4f75a1f58ccbea9731f46ad912.patch";
+      sha256 = "JHtDlZ54/BlSiUA3ROHfCTtTKSin3g6JNm8NS6pYML8=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/d1681a64bc3f65894af2549e3ba2bffbaf6f539a.patch";
+      sha256 = "9ZEatz5I81UAnjS1qCGWYDQQOxg/qp9Tg3xG/a+3goc=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/3d2af8785c84d6e50d8a8e6a2569a4b709184e94.patch";
+      sha256 = "7bdUE2k6g3Z8sdGYEb6pUm1/wbKDe4BHbylXUzfuTG0=";
+    })
+  ];
+
   nativeBuildInputs = [
+    # patch changes configure.ac
+    autoconf-archive
+    autoreconfHook
+
     pkg-config
     wrapGAppsHook
   ];
@@ -47,13 +86,17 @@ stdenv.mkDerivation rec {
     grilo-plugins
     gnome-online-accounts
     libmediaart
-    tracker_2
+    tracker
     gfbgraph
     json-glib
     librest
     dleyna-server
   ];
 
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-error=format-security" # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3/diffs#note_942747
+  ];
+
   enableParallelBuilding = true;
 
   passthru = {

From a737f6eee17574dfd2d375e6b80fce4853ed7b87 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Oct 2020 20:13:39 +0200
Subject: [PATCH 0412/3942] =?UTF-8?q?tracker=5F2:=202.3.4=20=E2=86=92=202.?=
 =?UTF-8?q?3.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Disables autostart.
---
 pkgs/development/libraries/tracker/2.x/default.nix   | 12 ++----------
 .../libraries/tracker/2.x/fix-paths.patch            | 12 ------------
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/tracker/2.x/fix-paths.patch

diff --git a/pkgs/development/libraries/tracker/2.x/default.nix b/pkgs/development/libraries/tracker/2.x/default.nix
index fb111829c7e1..4c6f2292244b 100644
--- a/pkgs/development/libraries/tracker/2.x/default.nix
+++ b/pkgs/development/libraries/tracker/2.x/default.nix
@@ -26,27 +26,19 @@
 , json-glib
 , systemd
 , dbus
-, substituteAll
 }:
 
 stdenv.mkDerivation rec {
   pname = "tracker";
-  version = "2.3.4";
+  version = "2.3.6";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0vai0qz9jn3z5dlzysynwhbbmslp84ygdql81f5wfxxr98j54yap";
+    sha256 = "1wpfgzwzazyi1d6m73hbdk8gfb30xnh3y73vnnknya9m449b87mx";
   };
 
-  patches = [
-    (substituteAll {
-      src = ./fix-paths.patch;
-      gdbus = "${glib.bin}/bin/gdbus";
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/development/libraries/tracker/2.x/fix-paths.patch b/pkgs/development/libraries/tracker/2.x/fix-paths.patch
deleted file mode 100644
index f5c13c3fcdaf..000000000000
--- a/pkgs/development/libraries/tracker/2.x/fix-paths.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/tracker-store/tracker-store.desktop.in
-+++ b/src/tracker-store/tracker-store.desktop.in
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Name=Tracker Store
- Comment=Metadata database store and lookup manager
--Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
-+Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
- Terminal=false
- Type=Application
- Categories=Utility;
- X-GNOME-Autostart-enabled=true

From 63c7390174eb4c35df44f3841bd38661775fb2dc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Oct 2020 20:22:32 +0200
Subject: [PATCH 0413/3942] =?UTF-8?q?tracker-miners-2:=202.3.3=20=E2=86=92?=
 =?UTF-8?q?=202.3.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/tracker-miners/2.x/default.nix b/pkgs/development/libraries/tracker-miners/2.x/default.nix
index f588fbf25812..60c4b0a9edac 100644
--- a/pkgs/development/libraries/tracker-miners/2.x/default.nix
+++ b/pkgs/development/libraries/tracker-miners/2.x/default.nix
@@ -45,11 +45,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tracker-miners";
-  version = "2.3.3";
+  version = "2.3.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "06abxrnrz7xayykrabn135rpsm6z0fqw7gibrb9j09l6swlalwkl";
+    sha256 = "1ymrwpgm3gwdgdgjxg26z732lsab4g8mppzlb0q27kcsn9zx62cm";
   };
 
   nativeBuildInputs = [

From ea1923841ac09ece72a810bb522c8fefe41828c3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Oct 2020 21:11:39 +0200
Subject: [PATCH 0414/3942] nixos/gnome3: re-add tracker 2 dbus services

They are still needed by Photos, Books and Documents.
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 4ace32dc96a1..28cd5ede36af 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -406,6 +406,15 @@ in
         yelp
       ] config.environment.gnome3.excludePackages);
 
+      # Temporary hack until we can drop tracker 2.
+      services.dbus.packages = with pkgs.gnome3;
+        let
+          tracker2needed = removePackagesByName [ pkgs.gnome-photos gnome-documents gnome-books ] config.environment.gnome3.excludePackages == [];
+        in
+          lib.optionals tracker2needed [
+            tracker_2
+          ];
+
       # Enable default program modules
       # Since some of these have a corresponding package, we only
       # enable that program module if the package hasn't been excluded

From 87e3d553cf645b2a3abb178d1baa66ae1a33eef1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Oct 2020 17:58:53 +0000
Subject: [PATCH 0415/3942] =?UTF-8?q?gnome-photos:=203.37.2=20=E2=86=92=20?=
 =?UTF-8?q?3.38.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-photos/3.37/gnome-photos-3.37.91.news
https://ftp.gnome.org/pub/GNOME/sources/gnome-photos/3.37/gnome-photos-3.37.91.1.news
https://ftp.gnome.org/pub/GNOME/sources/gnome-photos/3.38/gnome-photos-3.38.0.news
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 +++-
 pkgs/applications/graphics/gnome-photos/default.nix    | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 28cd5ede36af..65e5a851dfc0 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -413,7 +413,9 @@ in
         in
           lib.optionals tracker2needed [
             tracker_2
-          ];
+          ] ++ removePackagesByName [
+            pkgs.gnome-photos
+          ] config.environment.gnome3.excludePackages;
 
       # Enable default program modules
       # Since some of these have a corresponding package, we only
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index 671311d10fd1..b4bb6e03d3c3 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-photos";
-  version = "3.37.2";
+  version = "3.38.0";
 
   outputs = [ "out" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "13wspx5kgnn1ir8q521ja0d21r1dsnh73qb8k27nkgc4zyhmm5fc";
+    sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6";
   };
 
   patches = [
@@ -103,6 +103,11 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py"
+
+    # Upstream now uses a private tracker 2 instance.
+    # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/146
+    # Let’s install them after fixup since they are already wrapped.
+    ln -s ${tracker-miners-2}/libexec/tracker-extract ${tracker-miners-2}/libexec/tracker-miner-fs ${tracker_2}/libexec/tracker-store $out/libexec
   '';
 
   passthru = {

From 20e21721c81a5b60f12c751d4af19b0355c8d5d3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Oct 2020 22:16:01 +0200
Subject: [PATCH 0416/3942] gnome3: do not use alias for gnome-photos

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 65e5a851dfc0..b3d3246cb97b 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -394,7 +394,7 @@ in
         gnome-logs
         gnome-maps
         gnome-music
-        gnome-photos
+        pkgs.gnome-photos
         gnome-screenshot
         gnome-software
         gnome-system-monitor

From 4dd243706813549330244c2191fb6573883f1945 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Oct 2020 23:09:27 +0200
Subject: [PATCH 0417/3942] gnome-photos: use Tracker 3

---
 .../services/x11/desktop-managers/gnome3.nix  |  8 ++---
 .../graphics/gnome-photos/default.nix         | 29 +++++++++++++------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index b3d3246cb97b..9f531d1bcc56 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -409,13 +409,11 @@ in
       # Temporary hack until we can drop tracker 2.
       services.dbus.packages = with pkgs.gnome3;
         let
-          tracker2needed = removePackagesByName [ pkgs.gnome-photos gnome-documents gnome-books ] config.environment.gnome3.excludePackages == [];
+          tracker2needed = removePackagesByName [ gnome-documents gnome-books ] config.environment.systemPackages != config.environment.systemPackages;
         in
           lib.optionals tracker2needed [
-            tracker_2
-          ] ++ removePackagesByName [
-            pkgs.gnome-photos
-          ] config.environment.gnome3.excludePackages;
+            pkgs.tracker_2
+          ];
 
       # Enable default program modules
       # Since some of these have a corresponding package, we only
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index b4bb6e03d3c3..0d4b06c8c6d5 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchurl
+, fetchpatch
 , at-spi2-core
 , babl
 , dbus
@@ -28,8 +29,8 @@
 , nixosTests
 , pkgconfig
 , python3
-, tracker_2
-, tracker-miners-2
+, tracker
+, tracker-miners
 , wrapGAppsHook
 }:
 
@@ -46,6 +47,21 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./installed-tests-path.patch
+
+    # Port to Tracker 3
+    # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/135
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/f39a85bb1a82093f4ba615494ff7e95609674fc2.patch";
+      sha256 = "M5r5WuB1JpUBVN3KxNvpMiPWj0pIpT+ImQMOiGtUgT4=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/3d847ff80d429cadf0bc59aa50caa37bf27c0201.patch";
+      sha256 = "zGjSL1qpWVJ/5Ifgh2CbhFSBR/WDAra8F+YUOemyxyU=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/2eb923726147b05c936dee64b205d833525db1df.patch";
+      sha256 = "vCA6NXHzmNf2GoLqzWwIyziC6puJgJ0QTLeKWsAEFAE=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -84,8 +100,8 @@ stdenv.mkDerivation rec {
     gtk3
     libdazzle
     libgdata
-    tracker_2
-    tracker-miners-2 # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
+    tracker
+    tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
 
     at-spi2-core # for tests
   ];
@@ -103,11 +119,6 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py"
-
-    # Upstream now uses a private tracker 2 instance.
-    # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/146
-    # Let’s install them after fixup since they are already wrapped.
-    ln -s ${tracker-miners-2}/libexec/tracker-extract ${tracker-miners-2}/libexec/tracker-miner-fs ${tracker_2}/libexec/tracker-store $out/libexec
   '';
 
   passthru = {

From 61afd7f80e8da3174917bdff0ea2eafbf205d910 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Oct 2020 23:57:59 +0200
Subject: [PATCH 0418/3942] tracker_2: drop

It does not seem to work and only semi-broken apps like Books and Documents depend on it.
---
 .../services/x11/desktop-managers/gnome3.nix  |   9 --
 .../gnome-3/apps/gnome-books/default.nix      |   9 +-
 .../gnome-3/apps/gnome-documents/default.nix  |   9 +-
 .../gnome-3/misc/gnome-applets/default.nix    |   4 +-
 .../libraries/tracker-miners/2.x/default.nix  | 139 ------------------
 .../tracker-miners/2.x/fix-paths.patch        |  11 --
 .../libraries/tracker/2.x/default.nix         | 129 ----------------
 pkgs/top-level/all-packages.nix               |   4 -
 8 files changed, 12 insertions(+), 302 deletions(-)
 delete mode 100644 pkgs/development/libraries/tracker-miners/2.x/default.nix
 delete mode 100644 pkgs/development/libraries/tracker-miners/2.x/fix-paths.patch
 delete mode 100644 pkgs/development/libraries/tracker/2.x/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 9f531d1bcc56..91492d561ba8 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -406,15 +406,6 @@ in
         yelp
       ] config.environment.gnome3.excludePackages);
 
-      # Temporary hack until we can drop tracker 2.
-      services.dbus.packages = with pkgs.gnome3;
-        let
-          tracker2needed = removePackagesByName [ gnome-documents gnome-books ] config.environment.systemPackages != config.environment.systemPackages;
-        in
-          lib.optionals tracker2needed [
-            pkgs.tracker_2
-          ];
-
       # Enable default program modules
       # Since some of these have a corresponding package, we only
       # enable that program module if the package hasn't been excluded
diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
index 9685ffbd35cf..e7ea02a27495 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
@@ -8,8 +8,8 @@
 , pkgconfig
 , gtk3
 , glib
-, tracker_2
-, tracker-miners-2
+, tracker
+, tracker-miners
 , libxslt
 , webkitgtk
 , gnome-desktop
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
     webkitgtk
     gjs
     gobject-introspection
-    tracker_2
-    tracker-miners-2
+    tracker
+    tracker-miners
     gnome-desktop
     libgepub
   ];
@@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
+    broken = true; # Tracker 3 not supported and it cannot start Tracker 2.
     homepage = "https://wiki.gnome.org/Apps/Books";
     description = "An e-book manager application for GNOME";
     maintainers = teams.gnome.members;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 7b0c6f0ac2f6..ec1268f07701 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -9,8 +9,8 @@
 , pkgconfig
 , gtk3
 , glib
-, tracker_2
-, tracker-miners-2
+, tracker
+, tracker-miners
 , itstool
 , libxslt
 , webkitgtk
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
     webkitgtk
     gjs
     gobject-introspection
-    tracker_2
-    tracker-miners-2
+    tracker
+    tracker-miners
     libgdata
     gnome-desktop
     libzapojit
@@ -117,6 +117,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
+    broken = true; # Tracker 3 not supported and it cannot start Tracker 2.
     homepage = "https://wiki.gnome.org/Apps/Documents";
     description = "Document manager application designed to work with GNOME 3";
     maintainers = teams.gnome.members;
diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
index c2ed5b61977a..f07d93d421cb 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
@@ -16,7 +16,7 @@
 , adwaita-icon-theme
 , libgweather
 , gucharmap
-, tracker_2
+, tracker
 , polkit
 , gnome3
 }:
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     adwaita-icon-theme
     libgweather
     gucharmap
-    tracker_2
+    # tracker # Tracker 3 not supported.
     polkit
     wirelesstools
     linuxPackages.cpupower
diff --git a/pkgs/development/libraries/tracker-miners/2.x/default.nix b/pkgs/development/libraries/tracker-miners/2.x/default.nix
deleted file mode 100644
index 60c4b0a9edac..000000000000
--- a/pkgs/development/libraries/tracker-miners/2.x/default.nix
+++ /dev/null
@@ -1,139 +0,0 @@
-{ stdenv
-, fetchurl
-, substituteAll
-, intltool
-, itstool
-, libxslt
-, gexiv2
-, tracker_2
-, meson
-, ninja
-, pkgconfig
-, vala
-, wrapGAppsHook
-, bzip2
-, dbus
-, evolution-data-server
-, exempi
-, flac
-, giflib
-, glib
-, gnome3
-, gst_all_1
-, icu
-, json-glib
-, libcue
-, libexif
-, libgrss
-, libgsf
-, libgxps
-, libiptcdata
-, libjpeg
-, libosinfo
-, libpng
-, libseccomp
-, libsoup
-, libtiff
-, libuuid
-, libvorbis
-, libxml2
-, poppler
-, taglib
-, upower
-, totem-pl-parser
-}:
-
-stdenv.mkDerivation rec {
-  pname = "tracker-miners";
-  version = "2.3.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1ymrwpgm3gwdgdgjxg26z732lsab4g8mppzlb0q27kcsn9zx62cm";
-  };
-
-  nativeBuildInputs = [
-    intltool
-    itstool
-    libxslt
-    meson
-    ninja
-    pkgconfig
-    vala
-    wrapGAppsHook
-  ];
-
-  # TODO: add libenca, libosinfo
-  buildInputs = [
-    bzip2
-    dbus
-    evolution-data-server
-    exempi
-    flac
-    giflib
-    glib
-    gexiv2
-    totem-pl-parser
-    tracker_2
-    gst_all_1.gst-plugins-base
-    gst_all_1.gstreamer
-    icu
-    json-glib
-    libcue
-    libexif
-    libgrss
-    libgsf
-    libgxps
-    libiptcdata
-    libjpeg
-    libosinfo
-    libpng
-    libseccomp
-    libsoup
-    libtiff
-    libuuid
-    libvorbis
-    libxml2
-    poppler
-    taglib
-    upower
-  ];
-
-  mesonFlags = [
-    # TODO: tests do not like our sandbox
-    "-Dfunctional_tests=false"
-    "-Ddbus_services=${placeholder "out"}/share/dbus-1/services"
-    "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user"
-  ];
-
-  patches = [
-    (substituteAll {
-      src = ./fix-paths.patch;
-      inherit tracker_2;
-    })
-    # https://bugzilla.gnome.org/show_bug.cgi?id=795576
-    (fetchurl {
-      url = "https://bugzilla.gnome.org/attachment.cgi?id=371427";
-      sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf";
-    })
-  ];
-
-  postInstall = ''
-    glib-compile-schemas "$out/share/glib-2.0/schemas"
-  '';
-
-  passthru = {
-    updateScript = gnome3.updateScript {
-      packageName = pname;
-      versionPolicy = "none";
-    };
-  };
-
-  meta = with stdenv.lib; {
-    homepage = "https://wiki.gnome.org/Projects/Tracker";
-    description = "Desktop-neutral user information store, search tool and indexer";
-    maintainers = teams.gnome.members;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/tracker-miners/2.x/fix-paths.patch b/pkgs/development/libraries/tracker-miners/2.x/fix-paths.patch
deleted file mode 100644
index f0c4449f0458..000000000000
--- a/pkgs/development/libraries/tracker-miners/2.x/fix-paths.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/libtracker-miners-common/tracker-domain-ontology.c
-+++ b/src/libtracker-miners-common/tracker-domain-ontology.c
-@@ -323,7 +323,7 @@
- 			goto end;
- 		}
- 	} else {
--		path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies",
-+		path = g_build_filename ("@tracker_2@", "share", "tracker", "domain-ontologies",
- 		                         DEFAULT_RULE, NULL);
-
- 		if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
diff --git a/pkgs/development/libraries/tracker/2.x/default.nix b/pkgs/development/libraries/tracker/2.x/default.nix
deleted file mode 100644
index 4c6f2292244b..000000000000
--- a/pkgs/development/libraries/tracker/2.x/default.nix
+++ /dev/null
@@ -1,129 +0,0 @@
-{ stdenv
-, fetchurl
-, gettext
-, meson
-, ninja
-, pkgconfig
-, gobject-introspection
-, python3
-, gtk-doc
-, docbook_xsl
-, docbook_xml_dtd_412
-, docbook_xml_dtd_43
-, docbook_xml_dtd_45
-, libxml2
-, glib
-, wrapGAppsHook
-, vala
-, sqlite
-, libxslt
-, libstemmer
-, gnome3
-, icu
-, libuuid
-, networkmanager
-, libsoup
-, json-glib
-, systemd
-, dbus
-}:
-
-stdenv.mkDerivation rec {
-  pname = "tracker";
-  version = "2.3.6";
-
-  outputs = [ "out" "dev" "devdoc" ];
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1wpfgzwzazyi1d6m73hbdk8gfb30xnh3y73vnnknya9m449b87mx";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    vala
-    pkgconfig
-    gettext
-    libxslt
-    wrapGAppsHook
-    gobject-introspection
-    gtk-doc
-    docbook_xsl
-    docbook_xml_dtd_412
-    docbook_xml_dtd_43
-    docbook_xml_dtd_45
-    python3 # for data-generators
-    systemd # used for checks to install systemd user service
-    dbus # used for checks and pkgconfig to install dbus service/s
-  ];
-
-  buildInputs = [
-    glib
-    libxml2
-    sqlite
-    icu
-    networkmanager
-    libsoup
-    libuuid
-    json-glib
-    libstemmer
-  ];
-
-  checkInputs = [
-    python3.pkgs.pygobject3
-  ];
-
-  mesonFlags = [
-    # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
-    # "-Dfunctional_tests=true"
-    "-Ddocs=true"
-  ];
-
-  doCheck = true;
-
-  postPatch = ''
-    patchShebangs utils/g-ir-merge/g-ir-merge
-    patchShebangs utils/data-generators/cc/generate
-    patchShebangs tests/functional-tests/test-runner.sh.in
-    patchShebangs tests/functional-tests/*.py
-  '';
-
-  preCheck = ''
-    # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file
-    export HOME=$(mktemp -d)
-
-    # Our gobject-introspection patches make the shared library paths absolute
-    # in the GIR files. When running functional tests, the library is not yet installed,
-    # though, so we need to replace the absolute path with a local one during build.
-    # We are using a symlink that will be overridden during installation.
-    mkdir -p $out/lib
-    ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0
-    ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0
-    ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so
-  '';
-
-  postCheck = ''
-    # Clean up out symlinks
-    rm -r $out/lib
-  '';
-
-  postInstall = ''
-    glib-compile-schemas "$out/share/glib-2.0/schemas"
-  '';
-
-  passthru = {
-    updateScript = gnome3.updateScript {
-      packageName = pname;
-      versionPolicy = "none";
-    };
-  };
-
-  meta = with stdenv.lib; {
-    homepage = "https://wiki.gnome.org/Projects/Tracker";
-    description = "Desktop-neutral user information store, search tool and indexer";
-    maintainers = teams.gnome.members;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27e7730883ad..363a513e5e0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3400,12 +3400,8 @@ in
 
   tracker = callPackage ../development/libraries/tracker { };
 
-  tracker_2 = callPackage ../development/libraries/tracker/2.x { };
-
   tracker-miners = callPackage ../development/libraries/tracker-miners { };
 
-  tracker-miners-2 = callPackage ../development/libraries/tracker-miners/2.x { };
-
   tracy = callPackage ../development/tools/tracy {
     inherit (darwin.apple_sdk.frameworks) Carbon AppKit;
   };

From dfc6578fc1c97419e73819fe9d39321c2781a65c Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 23 Oct 2020 19:36:33 -0400
Subject: [PATCH 0419/3942] folks: disable telepathy backend by default

---
 pkgs/development/libraries/folks/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix
index e9df0ef4016b..6181cb45e19e 100644
--- a/pkgs/development/libraries/folks/default.nix
+++ b/pkgs/development/libraries/folks/default.nix
@@ -16,7 +16,6 @@
 , nss
 , dbus
 , libgee
-, telepathy-glib
 , evolution-data-server
 , libsecret
 , db
@@ -26,6 +25,8 @@
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_43
+, telepathy-glib
+, telepathySupport ? false
 }:
 
 # TODO: enable more folks backends
@@ -43,6 +44,7 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Ddocs=true"
+    "-Dtelepathy_backend=${stdenv.lib.boolToString telepathySupport}"
   ];
 
   nativeBuildInputs = [
@@ -69,8 +71,7 @@ stdenv.mkDerivation rec {
     nspr
     nss
     readline
-    telepathy-glib
-  ];
+  ] ++ stdenv.lib.optional telepathySupport telepathy-glib;
 
   propagatedBuildInputs = [
     glib
@@ -109,6 +110,6 @@ stdenv.mkDerivation rec {
     homepage = "https://wiki.gnome.org/Projects/Folks";
     license = licenses.lgpl2Plus;
     maintainers = teams.gnome.members;
-    platforms = platforms.gnu ++ platforms.linux;  # arbitrary choice
+    platforms = platforms.gnu ++ platforms.linux; # arbitrary choice
   };
 }

From 625fb27d68c103a6007b4b762ae814c08f9fc217 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 23 Oct 2020 19:37:59 -0400
Subject: [PATCH 0420/3942] empathy: use folks with telepathySupport

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

diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 83c1f5d4a56f..ce5ca16eb745 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [
-    folks
+    (folks.override { telepathySupport = true; })
     telepathy-logger
     evolution-data-server
     telepathy-mission-control

From 8ccd765d3775f80566bf19e48a21f527f0aa7e29 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 01:42:06 +0200
Subject: [PATCH 0421/3942] webkitgtk: clean up

Remove gtk2 flag, which is no longer supported.
---
 pkgs/development/libraries/webkitgtk/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index de3d8da0bc38..814a1f22592f 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -41,8 +41,6 @@
 , enableGeoLocation ? true
 , geoclue2
 , sqlite
-, enableGtk2Plugins ? false
-, gtk2 ? null
 , enableGLES ? true
 , gst-plugins-base
 , gst-plugins-bad
@@ -56,8 +54,6 @@
 }:
 
 assert enableGeoLocation -> geoclue2 != null;
-assert enableGtk2Plugins -> gtk2 != null;
-assert stdenv.isDarwin -> !enableGtk2Plugins;
 
 with stdenv.lib;
 
@@ -146,8 +142,7 @@ stdenv.mkDerivation rec {
     systemd
     wayland
     xdg-dbus-proxy
-  ] ++ optional enableGeoLocation geoclue2
-    ++ optional enableGtk2Plugins gtk2;
+  ] ++ optional enableGeoLocation geoclue2;
 
   propagatedBuildInputs = [
     gtk3
@@ -171,8 +166,7 @@ stdenv.mkDerivation rec {
     "-DENABLE_X11_TARGET=OFF"
     "-DUSE_ACCELERATE=0"
     "-DUSE_SYSTEM_MALLOC=ON"
-  ] ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
-    ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON";
+  ] ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON";
 
   postPatch = ''
     patchShebangs .

From 0672de5b894a15e97da9cf82bf3052bde7919691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 2 Oct 2020 00:31:58 +0200
Subject: [PATCH 0422/3942] gstreamer: 1.16.2 -> 1.18.0

Fixes #98769.

Important changes from https://gstreamer.freedesktop.org/releases/1.18/:

* `gst-validate` was renamed to `gst-devtools` upstream:

    > * the `gst-validate` tarball has been superseded by
    >   the `gst-devtools` tarball for consistency with the git module name.

* `gst-python` is now Python 3 only:

    > * Python 2.x is no longer supported
---
 .../instant-messengers/fractal/default.nix    |  2 +-
 pkgs/applications/video/pitivi/default.nix    |  2 +-
 .../libraries/gstreamer/bad/default.nix       | 33 ++++++++++---------
 .../libraries/gstreamer/bad/opencv-4.3.patch  | 13 --------
 .../libraries/gstreamer/base/default.nix      | 24 ++++----------
 .../libraries/gstreamer/core/default.nix      | 31 ++++++++---------
 .../core/fix_pkgconfig_includedir.patch       |  2 ++
 .../libraries/gstreamer/default.nix           |  6 ++--
 .../{validate => devtools}/default.nix        | 27 ++++++++++++---
 .../fix_pkgconfig_includedir.patch            | 14 ++++----
 .../libraries/gstreamer/ges/default.nix       | 29 +++++++++++-----
 .../libraries/gstreamer/good/default.nix      | 20 ++++++++---
 .../libraries/gstreamer/libav/default.nix     | 13 ++++++--
 .../gstreamer/rtsp-server/default.nix         | 21 ++++++++++--
 .../libraries/gstreamer/ugly/default.nix      | 11 +++++--
 .../libraries/gstreamer/vaapi/default.nix     | 23 ++++++++++---
 .../python-modules/gst-python/default.nix     | 30 +++++------------
 17 files changed, 173 insertions(+), 128 deletions(-)
 delete mode 100644 pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch
 rename pkgs/development/libraries/gstreamer/{validate => devtools}/default.nix (59%)
 rename pkgs/development/libraries/gstreamer/{good => devtools}/fix_pkgconfig_includedir.patch (67%)

diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 68e7282870ba..440628160ec0 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec {
       gtkSupport = true;
     })
     gst_all_1.gstreamer
-    gst_all_1.gst-validate
+    gst_all_1.gst-devtools
     gtk3
     gtksourceview4
     libhandy
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index ee07a5c7cc89..1b7625d1c740 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -127,7 +127,7 @@ in python3Packages.buildPythonApplication rec {
     gst-plugins-bad
     gst-plugins-ugly
     gst-libav
-    gst-validate
+    gst-devtools
   ]);
 
   pythonPath = with python3Packages; [
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 903ca661486f..760936a85e8f 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -29,6 +29,7 @@
 , libbs2b
 , libmodplug
 , mpeg2dec
+, libmicrodns
 , openjpeg
 , libopus
 , librsvg
@@ -65,6 +66,7 @@
 , wayland-protocols
 , wildmidi
 , fluidsynth
+, libva
 , libvdpau
 , wayland
 , libwebp
@@ -87,25 +89,17 @@ let
   inherit (stdenv.lib) optional optionals;
 in stdenv.mkDerivation rec {
   pname = "gst-plugins-bad";
-  version = "1.16.2";
+  version = "1.18.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi";
+    sha256 = "0pqqq5bs9fjwcmbwgsgxs2dx6gznhxs7ii5pmjkslr6xmlfap0pk";
   };
 
   patches = [
-    # Fix build with neon 0.31
-    # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1165
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/f10b424418e448211e3427a76fcd046e157ef0b7.patch";
-      sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p";
-    })
     ./fix_pkgconfig_includedir.patch
-    # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235
-    ./opencv-4.3.patch
   ];
 
   nativeBuildInputs = [
@@ -130,6 +124,7 @@ in stdenv.mkDerivation rec {
     libbs2b
     libmodplug
     mpeg2dec
+    libmicrodns
     openjpeg
     libopus
     librsvg
@@ -154,6 +149,7 @@ in stdenv.mkDerivation rec {
     soundtouch
     srtp
     fluidsynth
+    libva
     libvdpau
     libwebp
     xvidcore
@@ -215,11 +211,14 @@ in stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
+    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
 
+    "-Davtp=disabled"
     "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development"
     "-Dzbar=${if enableZbar then "enabled" else "disabled"}"
     "-Dfaac=${if faacSupport then "enabled" else "disabled"}"
     "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing
+    "-Dmagicleap=disabled" # required `ml_audio` library not packaged in nixpkgs as of writing
     "-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support
     # As of writing, with `libmpcdec` in `buildInputs` we get
     #   "Could not find libmpcdec header files, but Musepack was enabled via options"
@@ -236,19 +235,16 @@ in stdenv.mkDerivation rec {
     "-Dopenni2=disabled" # not packaged in nixpkgs as of writing
     "-Dopensles=disabled" # not packaged in nixpkgs as of writing
     "-Dsctp=disabled" # required `usrsctp` library not packaged in nixpkgs as of writing
+    "-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing
     "-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing
     "-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing
     "-Dvoaacenc=disabled" # required `vo-aacenc` library not packaged in nixpkgs as of writing
     "-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing
     "-Dvulkan=disabled" # Linux-only, and we haven't figured out yet which of the vulkan nixpkgs it needs
     "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support
+    "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support
     "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing
-
-    # Requires CUDA and we haven't figured out how to make Meson find CUDA yet;
-    # it probably searches via pkgconfig, for which we have no .pc files,
-    # see https://github.com/NixOS/nixpkgs/issues/54395
-    "-Dnvdec=disabled"
-    "-Dnvenc=disabled"
+    "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing
   ]
   ++ optionals stdenv.isDarwin [
     "-Dbluez=disabled"
@@ -276,6 +272,11 @@ in stdenv.mkDerivation rec {
     "-Dapplemedia=disabled"
   ];
 
+  postPatch = ''
+    patchShebangs \
+      scripts/extract-release-date-from-doap-file.py
+  '';
+
   # This package has some `_("string literal")` string formats
   # that trip up clang with format security enabled.
   hardeningDisable = [ "format" ];
diff --git a/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch b/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch
deleted file mode 100644
index 55155d5c5e77..000000000000
--- a/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
-index f38b55d..05b142e 100644
---- a/ext/opencv/meson.build
-+++ b/ext/opencv/meson.build
-@@ -65,7 +65,7 @@ if opencv_found
-     endif
-   endforeach
- else
--  opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false)
-+  opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false)
-   opencv_found = opencv_dep.found()
-   if opencv_found
-     foreach h : libopencv4_headers
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 79405e5077e0..00f3ecd449d1 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -19,9 +19,6 @@
 , libvisual
 , tremor # provides 'virbisidec'
 , libGL
-, gtk-doc
-, docbook_xsl
-, docbook_xml_dtd_43
 , enableX11 ? stdenv.isLinux
 , libXv
 , enableWayland ? stdenv.isLinux
@@ -42,13 +39,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gst-plugins-base";
-  version = "1.16.2";
+  version = "1.18.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0sl1hxlyq46r02k7z70v09vx1gi4rcypqmzra9jid93lzvi76gmi";
+    sha256 = "15vqvcy842vhbic3w7l4yvannzazdgwggzv2x8f9m02hm78vsakn";
   };
 
   patches = [
@@ -66,9 +63,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
 
     # docs
-    gtk-doc
-    docbook_xsl
-    docbook_xml_dtd_43
+    # TODO add hotdoc here
   ] ++ lib.optional enableWayland wayland;
 
   buildInputs = [
@@ -103,17 +98,10 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
+    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
     "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing
     # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
     "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}"
-    # We must currently disable gtk_doc API docs generation,
-    # because it is not compatible with some features being disabled.
-    # See for example
-    #     https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/564
-    # for it failing because some Wayland symbols are missing.
-    # This problem appeared between 1.15.1 and 1.16.0.
-    # In 1.18 they should switch to hotdoc, which should make this issue irrelevant.
-    "-Dgtk_doc=disabled"
   ]
   ++ lib.optional (!enableX11) "-Dx11=disabled"
   # TODO How to disable Wayland?
@@ -125,7 +113,9 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    patchShebangs common/scangobj-merge.py
+    patchShebangs \
+      common/scangobj-merge.py \
+      scripts/extract-release-date-from-doap-file.py
   '';
 
   # This package has some `_("string literal")` string formats
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 9c4f3ee0251d..be4d19f8d0df 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, fetchpatch
 , meson
 , ninja
 , pkgconfig
@@ -16,34 +15,30 @@
 , darwin
 , elfutils # for libdw
 , bash-completion
-, docbook_xsl
-, docbook_xml_dtd_43
-, gtk-doc
 , lib
 , CoreServices
 }:
 
 stdenv.mkDerivation rec {
   pname = "gstreamer";
-  version = "1.16.2";
+  version = "1.18.0";
 
-  outputs = [ "out" "dev" "devdoc" ];
+  outputs = [
+    "out"
+    "dev"
+    # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs, see:
+    # - https://github.com/NixOS/nixpkgs/pull/98767
+    # - https://github.com/NixOS/nixpkgs/issues/98769#issuecomment-702296551
+  ];
   outputBin = "dev";
 
   src = fetchurl {
     url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0kp93622y29pck8asvil1fmzf55s2gx76wv475a6izc3cwj49w73";
+    sha256 = "01bq1k0gj603zyhq975zl09q4zla12mxqvhmk9fyn2kcn12r5w0g";
   };
 
   patches = [
     ./fix_pkgconfig_includedir.patch
-
-    # Fix build with bash-completion 2.10
-    # https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/436
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/commit/dd2ec3681e2d38e13e01477efa36e851650690fb.patch";
-      sha256 = "07hwf67vndsibm1khvs4rfq30sbs9fss8k5vs502xc0kccbi1ih8";
-    })
   ];
 
   nativeBuildInputs = [
@@ -60,9 +55,7 @@ stdenv.mkDerivation rec {
     bash-completion
 
     # documentation
-    gtk-doc
-    docbook_xsl
-    docbook_xml_dtd_43
+    # TODO add hotdoc here
   ];
 
   buildInputs = [
@@ -82,6 +75,7 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those
     "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
+    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
   ] ++ lib.optionals stdenv.isDarwin [
     # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it.
     "-Dlibunwind=disabled"
@@ -93,7 +87,8 @@ stdenv.mkDerivation rec {
       gst/parse/get_flex_version.py \
       gst/parse/gen_grammar.py.in \
       gst/parse/gen_lex.py.in \
-      libs/gst/helpers/ptp_helper_post_install.sh
+      libs/gst/helpers/ptp_helper_post_install.sh \
+      scripts/extract-release-date-from-doap-file.py
   '';
 
   postInstall = ''
diff --git a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
index c388a82fa2a8..db1684269350 100644
--- a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
+++ b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
@@ -7,8 +7,10 @@ index edb0586c2..7ed46dfce 100644
  pkgconf.set('prefix', join_paths(get_option('prefix')))
  pkgconf.set('exec_prefix', '${prefix}')
 -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
+-pkgconf.set('libexecdir', '${prefix}/@0@'.format(get_option('libexecdir')))
 -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
 +pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
++pkgconf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir')))
 +pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
  pkgconf.set('GST_API_VERSION', apiversion)
  pkgconf.set('VERSION', gst_version)
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index e7e11db61298..1fdd67d836e7 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -17,13 +17,13 @@ rec {
 
   gst-libav = callPackage ./libav { inherit gst-plugins-base; };
 
-  gst-editing-services = callPackage ./ges { inherit gst-plugins-base; };
+  gst-devtools = callPackage ./devtools { inherit gstreamer gst-plugins-base; };
+
+  gst-editing-services = callPackage ./ges { inherit gst-plugins-base gst-plugins-bad gst-devtools; };
 
   gst-vaapi = callPackage ./vaapi {
     inherit gst-plugins-base gstreamer gst-plugins-bad;
   };
 
-  gst-validate = callPackage ./validate { inherit gstreamer gst-plugins-base; };
-
   # note: gst-python is in ./python/default.nix - called under pythonPackages
 }
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix
similarity index 59%
rename from pkgs/development/libraries/gstreamer/validate/default.nix
rename to pkgs/development/libraries/gstreamer/devtools/default.nix
index 74e898481634..f865b3adf26b 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -1,5 +1,7 @@
 { stdenv
 , fetchurl
+, meson
+, ninja
 , pkgconfig
 , gstreamer
 , gst-plugins-base
@@ -9,19 +11,32 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "gst-validate";
-  version = "1.16.2";
+  pname = "gst-devtools";
+  version = "1.18.0";
 
   src = fetchurl {
     url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "1jpfrzg3yc6kp66bgq3jy14xsj3x71mk2zh0k16yf0326awwqqa8";
+    sha256 = "05jzjkkdr5hg01mjihlqdcxqnjfrm4mqk0zp83212kv5nm0p2cw2";
   };
 
-  outputs = [ "out" "dev" ];
+  patches = [
+    ./fix_pkgconfig_includedir.patch
+  ];
+
+  outputs = [
+    "out"
+    "dev"
+    # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs
+  ];
 
   nativeBuildInputs = [
+    meson
+    ninja
     pkgconfig
     gobject-introspection
+
+    # documentation
+    # TODO add hotdoc here
   ];
 
   buildInputs = [
@@ -34,6 +49,10 @@ stdenv.mkDerivation rec {
     gst-plugins-base
   ];
 
+  mesonFlags = [
+    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
+  ];
+
   meta = with stdenv.lib; {
     description = "Integration testing infrastructure for the GStreamer framework";
     homepage = "https://gstreamer.freedesktop.org";
diff --git a/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch
similarity index 67%
rename from pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
rename to pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch
index f68ad603a37c..ff19c7cbf6f8 100644
--- a/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
+++ b/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch
@@ -1,15 +1,15 @@
-diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
-index b3bf0d4d4..3e6e576c0 100644
---- a/pkgconfig/meson.build
-+++ b/pkgconfig/meson.build
+diff --git a/validate/pkgconfig/meson.build b/validate/pkgconfig/meson.build
+index a612b21b..c017eaff 100644
+--- a/validate/pkgconfig/meson.build
++++ b/validate/pkgconfig/meson.build
 @@ -2,8 +2,8 @@ pkgconf = configuration_data()
- 
+
  pkgconf.set('prefix', get_option('prefix'))
  pkgconf.set('exec_prefix', '${prefix}')
 -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
 -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
 +pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
 +pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
- pkgconf.set('GST_API_VERSION', api_version)
+ pkgconf.set('GST_API_VERSION', apiversion)
  pkgconf.set('VERSION', gst_version)
- 
+
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index af2579d0594b..ae217c428257 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -1,11 +1,13 @@
 { stdenv
 , fetchurl
-, fetchpatch
 , meson
 , ninja
 , pkgconfig
 , python3
+, bash-completion
 , gst-plugins-base
+, gst-plugins-bad
+, gst-devtools
 , libxml2
 , flex
 , gettext
@@ -13,14 +15,18 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "gstreamer-editing-services";
-  version = "1.16.2";
+  pname = "gst-editing-services";
+  version = "1.18.0";
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+    # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs
+  ];
 
   src = fetchurl {
     url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "05hcf3prna8ajjnqd53221gj9syarrrjbgvjcbhicv0c38csc1hf";
+    sha256 = "1a00f07v0yjqz1hydhgkjjarm4rk99yjicbz5wkfl5alhzag1bjd";
   };
 
   patches = [
@@ -33,26 +39,31 @@ stdenv.mkDerivation rec {
     pkgconfig
     gettext
     gobject-introspection
+    gst-devtools
     python3
     flex
+
+    # documentation
+    # TODO add hotdoc here
   ];
 
   buildInputs = [
+    bash-completion
     libxml2
   ];
 
   propagatedBuildInputs = [
     gst-plugins-base
+    gst-plugins-bad
   ];
 
   mesonFlags = [
-    "-Dgtk_doc=disabled"
+    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
   ];
 
   postPatch = ''
-    # for some reason, gst-plugins-bad cannot be found
-    # fortunately, they are only used by tests, which we do not run
-    sed -i -r -e 's/p(bad|good) = .*/p\1 = pbase/' tests/check/meson.build
+    patchShebangs \
+      scripts/extract-release-date-from-doap-file.py
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 100d270673fc..e8c885411bdc 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , fetchurl
 , meson
+, nasm
 , ninja
 , pkgconfig
 , python3
@@ -34,6 +35,8 @@
 , libXext
 , libXfixes
 , ncurses
+, wayland
+, wayland-protocols
 , xorg
 , libgudev
 , wavpack
@@ -46,23 +49,24 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gst-plugins-good";
-  version = "1.16.2";
+  version = "1.18.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "068k3cbv1yf3gbllfdzqsg263kzwh21y8dpwr0wvgh15vapkpfs0";
+    sha256 = "1b4b3a6fm2wyqpnx300pg1sz01m9qhfajadk3b7sbzisg8vvqab3";
   };
 
-  patches = [ ./fix_pkgconfig_includedir.patch ];
-
   nativeBuildInputs = [
     pkgconfig
     python3
     meson
     ninja
     gettext
+    nasm
+  ] ++ optionals stdenv.isLinux [
+    wayland-protocols
   ];
 
   buildInputs = [
@@ -102,12 +106,14 @@ stdenv.mkDerivation rec {
     libavc1394
     libiec61883
     libgudev
+    wayland
   ] ++ optionals enableJack [
     libjack2
   ];
 
   mesonFlags = [
     "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
+    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
     "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps
   ] ++ optionals (!gtkSupport) [
     "-Dgtk3=disabled"
@@ -122,8 +128,14 @@ stdenv.mkDerivation rec {
     "-Dv4l2=disabled" # Linux-only
     "-Dximagesrc=disabled" # Linux-only
     "-Dpulse=disabled" # TODO check if we can keep this enabled
+  ] ++ optionals (!(stdenv.isLinux && stdenv.hostPlatform.isAarch64)) [
+    "-Drpicamsrc=disabled" # only works on Linux aarch64, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/blob/428c9b60532917c0ac49c9d48b15bdcd00a1370b/sys/rpicamsrc/meson.build#L10
   ];
 
+  postPatch = ''
+    patchShebangs \
+      scripts/extract-release-date-from-doap-file.py
+  '';
 
   NIX_LDFLAGS = [
     # linking error on Darwin
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index e36eba370071..648ee8bab35b 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gst-libav";
-  version = "1.16.2";
+  version = "1.18.0";
 
   src = fetchurl {
     url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "1wpfilc98bad9nsv3y1qapxp35dvn2mvwvrmqwrsj58cf09gc967";
+    sha256 = "0sm0sfdlalimpkf7a7rk7whvyvmmfi2kly2z3q2j5z53x5f3zya2";
   };
 
   outputs = [ "out" "dev" ];
@@ -37,6 +37,15 @@ stdenv.mkDerivation rec {
     libav
   ];
 
+  mesonFlags = [
+    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
+  ];
+
+  postPatch = ''
+    patchShebangs \
+      scripts/extract-release-date-from-doap-file.py
+  '';
+
   meta = with lib; {
     description = "FFmpeg/libav plugin for GStreamer";
     homepage = "https://gstreamer.freedesktop.org";
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 92e8a45a4f6f..e1ee9222cc8c 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -3,6 +3,7 @@
 , meson
 , ninja
 , pkgconfig
+, python3
 , gettext
 , gobject-introspection
 , gst-plugins-base
@@ -11,14 +12,18 @@
 
 stdenv.mkDerivation rec {
   pname = "gst-rtsp-server";
-  version = "1.16.2";
+  version = "1.18.0";
 
   src = fetchurl {
     url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0vn23nxwvs96g7gcxw5zbnw23hkhky8a8r42wq68411vgf1s41yy";
+    sha256 = "03y7nyjaagis7mmg8vbhxmnc1v9xf2y3cab2s3q2vgsc0l8r7l9a";
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+    # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs
+  ];
 
   patches = [
     # To use split outputs, we need this so double prefix won't be used in the
@@ -35,6 +40,10 @@ stdenv.mkDerivation rec {
     gettext
     gobject-introspection
     pkgconfig
+    python3
+
+    # documentation
+    # TODO add hotdoc here
   ];
 
   buildInputs = [
@@ -44,8 +53,14 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
+    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
   ];
 
+  postPatch = ''
+    patchShebangs \
+      scripts/extract-release-date-from-doap-file.py
+  '';
+
   meta = with stdenv.lib; {
     description = "GStreamer RTSP server";
     homepage = "https://gstreamer.freedesktop.org";
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index d8c36fa40705..ae1e2dd1b314 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gst-plugins-ugly";
-  version = "1.16.2";
+  version = "1.18.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m";
+    sha256 = "10p0nyzighvkciaspxnhlr7d7n4acrv96lf483i8l988bvj48rk8";
   };
 
   nativeBuildInputs = [
@@ -56,10 +56,15 @@ stdenv.mkDerivation rec {
   ]);
 
   mesonFlags = [
-    "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
+    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
     "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing
   ];
 
+  postPatch = ''
+    patchShebangs \
+      scripts/extract-release-date-from-doap-file.py
+  '';
+
   meta = with lib; {
     description = "Gstreamer Ugly Plugins";
     homepage = "https://gstreamer.freedesktop.org";
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index cac56f64cc91..1b2efa630b92 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -16,25 +16,32 @@
 , gst-plugins-bad
 , nasm
 , libvpx
-, python
+, python3
 }:
 
 stdenv.mkDerivation rec {
   pname = "gstreamer-vaapi";
-  version = "1.16.2";
+  version = "1.18.0";
 
   src = fetchurl {
     url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "00f6sx700qm1ximi1ag2c27m35dywwhhg6awhz85va34mfqff78r";
+    sha256 = "0ccyzv15jzf0pi0ndrmfww016cn4c0y4265bacdvnxbgff6fpvy6";
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+    # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs
+  ];
 
   nativeBuildInputs = [
     meson
     ninja
     pkgconfig
     bzip2
+
+    # documentation
+    # TODO add hotdoc here
   ];
 
   buildInputs = [
@@ -55,13 +62,19 @@ stdenv.mkDerivation rec {
     libGLU
     nasm
     libvpx
-    python
+    python3
   ];
 
   mesonFlags = [
     "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
+    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
   ];
 
+  postPatch = ''
+    patchShebangs \
+      scripts/extract-release-date-from-doap-file.py
+  '';
+
   meta = with stdenv.lib; {
     description = "Set of VAAPI GStreamer Plug-ins";
     homepage = "https://gstreamer.freedesktop.org";
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 00d05e189126..c66ceedc3cee 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -4,17 +4,16 @@
 , ninja
 , stdenv
 , pkgconfig
-, python
+, python3
 , pygobject3
 , gobject-introspection
 , gst-plugins-base
 , isPy3k
-, fetchpatch
 }:
 
 buildPythonPackage rec {
   pname = "gst-python";
-  version = "1.16.2";
+  version = "1.18.0";
 
   format = "other";
 
@@ -22,14 +21,17 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz";
-    sha256 = "1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390";
+    sha256 = "0ifx2s2j24sj2w5jm7cxyg1kinnhbxiz4x0qp3gnsjlwbawfigvn";
   };
 
+  # Python 2.x is not supported.
+  disabled = !isPy3k;
+
   nativeBuildInputs = [
     meson
     ninja
     pkgconfig
-    python
+    python3
     gobject-introspection
     gst-plugins-base
   ];
@@ -39,24 +41,8 @@ buildPythonPackage rec {
     pygobject3
   ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
-    # Fix configure python lib detection in macOS. Remove with the next release
-    (fetchpatch {
-      url = "https://github.com/GStreamer/gst-python/commit/f98c206bdf01529f8ea395a719b10baf2bdf717f.patch";
-      sha256 = "04n4zrnfivgr7iaqw4sjlbd882s8halc2bbbhfxqf0sg2lqwmrxg";
-    })
-  ] ++ [
-    # Fix linking against Python 3.8
-    # https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/30
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/gstreamer/gst-python/commit/22f28155d86e27c4134de4ed2861264003fcfd23.patch";
-      sha256 = "Y70qVguHUBmmRVMFBKAP0d6anBQw5W0TKyu2bAwxbQg=";
-    })
-  ];
-
   mesonFlags = [
-    "-Dpython=python${if isPy3k then "3" else "2"}"
-    "-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides"
+    "-Dpygi-overrides-dir=${placeholder "out"}/${python3.sitePackages}/gi/overrides"
   ];
 
   doCheck = true;

From 7fddef376e31782ae8e7b41870d7db48cef3da53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 2 Oct 2020 03:58:20 +0200
Subject: [PATCH 0423/3942] gst_all_1.gst-plugins-bad: Add upstream patch to
 fix SRT usage

---
 pkgs/development/libraries/gstreamer/bad/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 760936a85e8f..88c9f9a385a1 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -100,6 +100,16 @@ in stdenv.mkDerivation rec {
 
   patches = [
     ./fix_pkgconfig_includedir.patch
+    # Fixes srt usage failing with
+    #     Failed to open SRT: failed to set SRTO_LINGER (reason: Operation not supported: Bad parameters)
+    # see https://github.com/Haivision/srt/issues/1374
+    # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/84f8dbd932029220ee86154dd85b241911ea3891
+    # is shown as being in a release tag that nixpkgs uses.
+    (fetchpatch {
+      name = "gstreamer-srtobject-typecast-SRTO_LINGER-to-linger.patch";
+      url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/84f8dbd932029220ee86154dd85b241911ea3891.patch";
+      sha256 = "0596lvgi93sj3yn98grgmsrhnqhhq7fnjk91qi4xc6618fpqmp9x";
+    })
   ];
 
   nativeBuildInputs = [

From 9ba3714f10eb51d79f67f1db36efea1d54c05634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 22 Oct 2020 12:18:29 +0200
Subject: [PATCH 0424/3942] pitivi: Use `gst-transcoder` from `gst-plugins-bad`

---
 pkgs/applications/video/pitivi/default.nix | 41 ++++------------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 1b7625d1c740..36de120fb6a7 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -20,32 +20,7 @@
 , gsettings-desktop-schemas
 }:
 
-let
-  # gst-transcoder was merged with gst-plugins-bad 1.18.
-  # TODO: switch to that once available.
-  gst-transcoder = stdenv.mkDerivation rec {
-    version = "1.14.1";
-    pname = "gst-transcoder";
-    src = fetchFromGitHub {
-      owner = "pitivi";
-      repo = "gst-transcoder";
-      rev = version;
-      sha256 = "16skiz9akavssii529v9nr8zd54w43livc14khdyzv164djg9q8f";
-    };
-    nativeBuildInputs = [
-      pkg-config
-      meson
-      ninja
-      gobject-introspection
-      python3
-    ];
-    buildInputs = with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-    ];
-  };
-
-in python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pitivi";
   version = "0.999";
 
@@ -70,13 +45,12 @@ in python3Packages.buildPythonApplication rec {
       excludes = [ "po/POTFILES.in" ];
     })
 
-    # Complete switching to gst-transcoder in gst-plugins-bad.
-    # Otherwise there will likely be conflics.
-    # TODO: Apply this patch once we are using gst-transcoder from gst-plugins-bad.
-    # (fetchpatch {
-    #   url = "https://gitlab.gnome.org/GNOME/pitivi/commit/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch";
-    #   sha256 = "zxJm+E5o+oZ3lW6wYNY/ERo2g4NmCjoY8oV+uScq8j8=";
-    # })
+    # Compatibility with using gst-transcoder from gst-plugins-bad.
+    # TODO Remove with version 2020.09
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/pitivi/commit/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch";
+      sha256 = "zxJm+E5o+oZ3lW6wYNY/ERo2g4NmCjoY8oV+uScq8j8=";
+    })
 
     # Generate renderer.so on macOS instead of dylib.
     # Needed for the following patch to apply.
@@ -118,7 +92,6 @@ in python3Packages.buildPythonApplication rec {
     gnome3.adwaita-icon-theme
     gsettings-desktop-schemas
     libnotify
-    gst-transcoder
   ] ++ (with gst_all_1; [
     gstreamer
     gst-editing-services

From 38c52994a6334fb37b9009a638b1e5904ca4cb7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 22 Oct 2020 12:25:26 +0200
Subject: [PATCH 0425/3942] pitivi: 0.999 -> 2020.09.1

---
 pkgs/applications/video/pitivi/default.nix | 45 ++--------------------
 1 file changed, 4 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 36de120fb6a7..535913c6f2b2 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchFromGitHub
 , fetchurl
-, fetchpatch
 , pkg-config
 , gettext
 , itstool
@@ -11,6 +10,7 @@
 , gst_all_1
 , gtk3
 , gobject-introspection
+, libpeas
 , librsvg
 , gnome3
 , libnotify
@@ -22,13 +22,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pitivi";
-  version = "0.999";
+  version = "2020.09.1";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0mxp2p4gg976fp1vj3rb5rmpl5mqfzncm9vw2719irl32f1qlvyb";
+    sha256 = "1by52b56s9c3h23n40iccygkazwlhii2gb28zhnj2xz5805j05y2";
   };
 
   patches = [
@@ -36,41 +36,6 @@ python3Packages.buildPythonApplication rec {
     # 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
-
-    # Port from intltool to gettext.
-    # Needed for the following patches to apply.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/pitivi/commit/89b1053f2516c594f414c5c67c835471bce44b67.patch";
-      sha256 = "8yhArzAtZC+WjHftcSDrstBlT8j6WlGHffU9Nj+ny+c=";
-      excludes = [ "po/POTFILES.in" ];
-    })
-
-    # Compatibility with using gst-transcoder from gst-plugins-bad.
-    # TODO Remove with version 2020.09
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/pitivi/commit/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch";
-      sha256 = "zxJm+E5o+oZ3lW6wYNY/ERo2g4NmCjoY8oV+uScq8j8=";
-    })
-
-    # Generate renderer.so on macOS instead of dylib.
-    # Needed for the following patch to apply.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/pitivi/commit/bcacadcafabf8911efb0fddc8d57329237d08cd1.patch";
-      sha256 = "2BM5acIwOgdr1L9vhtMMN4trrLuqCg/K6v6ZYtD1Fjw=";
-      postFetch = ''
-        sed -i -e "s/1.90.0.1/0.999/g" "$out"
-      '';
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/pitivi/commit/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch";
-      sha256 = "6DhqRlxFWFFdLwGoFem+vPt8x7v732KMVjMF9fypMK4=";
-      postFetch = ''
-        sed "$out" -i \
-          -e "s/1.90.0.1/0.999/g" \
-          -e "s/\(-python_dep.*\)/\1\n /" \
-          -e "s/-1,9 +1,16/-1,10 +1,17/"
-      '';
-    })
   ];
 
   nativeBuildInputs = [
@@ -86,6 +51,7 @@ python3Packages.buildPythonApplication rec {
   buildInputs = [
     gobject-introspection
     gtk3
+    libpeas
     librsvg
     gnome3.gnome-desktop
     gsound
@@ -115,9 +81,6 @@ python3Packages.buildPythonApplication rec {
 
   postPatch = ''
     patchShebangs ./getenvvar.py
-
-    # fetchpatch does not support renamings
-    mv data/org.pitivi.Pitivi-mime.xml data/org.pitivi.Pitivi-mime.xml.in
   '';
 
   # Fixes error

From d126f0b8c6a8b50786d21ed0da0b7343779a6e00 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 24 Oct 2020 10:15:33 +1000
Subject: [PATCH 0426/3942] libpsl: disable valgrind tests on darwin

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

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index fb9e5b12bc61..67e87a5faab4 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -31,8 +31,9 @@ stdenv.mkDerivation rec {
     lzip
     pkgconfig
     python3
-    (stdenv.lib.optionalString (!stdenv.isDarwin) valgrind)
     libxslt
+  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+    valgrind
   ];
 
   buildInputs = [
@@ -56,15 +57,16 @@ stdenv.mkDerivation rec {
   configureFlags = [
     # "--enable-gtk-doc"
     "--enable-man"
-    "--enable-valgrind-tests"
     "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
     "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
     "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt"
+  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+    "--enable-valgrind-tests"
   ];
 
   enableParallelBuilding = true;
 
-  doCheck = !stdenv.isDarwin;
+  doCheck = true;
 
   meta = with stdenv.lib; {
     description = "C library for the Publix Suffix List";

From 07e63834beb419e00c5f64dfaa3724ed55a4a9f6 Mon Sep 17 00:00:00 2001
From: Roberto Di Remigio <robertodr@users.noreply.github.com>
Date: Fri, 16 Oct 2020 13:10:37 +0200
Subject: [PATCH 0427/3942] gnome-shell-extension-paperwm: 36.0 -> 38.0

---
 pkgs/desktops/gnome-3/extensions/paperwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix
index f5ffac9b2f34..fb6ce614119b 100644
--- a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-paperwm";
-  version = "36.0";
+  version = "38.0";
 
   src = fetchFromGitHub {
     owner = "paperwm";
     repo = "PaperWM";
     rev = version;
-    sha256 = "1ssnabwxrns36c61ppspjkr9i3qifv08pf2jpwl7cjv3pvyn4kly";
+    sha256 = "01r2ifwrl8w735d0ckzlwhvclax9dxd2ld5y2svv5bp444zbjsag";
   };
 
   uuid = "paperwm@hedning:matrix.org";

From bc72f674c9e3d5d3977ae344e409976d68d9a944 Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Sun, 18 Oct 2020 20:29:50 -0700
Subject: [PATCH 0428/3942] Update to 0.145.0 release

---
 pkgs/tools/misc/goreleaser/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index da82da129e33..842eca80fd7b 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -2,23 +2,32 @@
 
 buildGoModule rec {
   pname = "goreleaser";
-  version = "0.132.0";
+  version = "0.145.0";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1iwxlvwsmasp8gq1yh84hl9rys0hgm9fwpmsqh2mx9ln4prm7sgq";
+    sha256 = "1w2mbyywr3zsn068cshkx502x0zrxrbrgaw23x4spfri0nk6v4fd";
   };
 
-  modSha256 = "0a4qr8xsi4szggvzapw2ljvvvqjbyi15i4mi8myfhknlpxf65kcl";
+  vendorSha256 = "0drk58bhcvx75cd6s0xnyh6swph1vlvpzp2nngr7agvjdcrbady6";
 
-  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+  buildFlagsArray = [
+    "-ldflags="
+    "-s"
+    "-w"
+    "-X main.version=${version}"
+    "-X main.builtBy=nixpkgs"
+  ];
+
+  # tests expect the source files to be a build repo
+  doCheck = false;
 
   meta = with lib; {
     description = "Deliver Go binaries as fast and easily as possible";
     homepage = "https://goreleaser.com";
-    maintainers = [ maintainers.c0deaddict ];
+    maintainers = with maintainers; [ c0deaddict sarcasticadmin ];
     license = licenses.mit;
   };
 }

From 0e195e5262162f88b0f73f17a298c9ca3eb34a0d Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Fri, 23 Oct 2020 17:46:13 -0700
Subject: [PATCH 0429/3942] Adding endocrimes as maintainer for goreleaser

---
 pkgs/tools/misc/goreleaser/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index 842eca80fd7b..652dce15c42a 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Deliver Go binaries as fast and easily as possible";
     homepage = "https://goreleaser.com";
-    maintainers = with maintainers; [ c0deaddict sarcasticadmin ];
+    maintainers = with maintainers; [ c0deaddict endocrimes sarcasticadmin ];
     license = licenses.mit;
   };
 }

From 1e314c363d6c477200f14a4b9bfc5df6833552fd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 01:45:18 +0000
Subject: [PATCH 0430/3942] =?UTF-8?q?gobject-introspection:=201.66.0=20?=
 =?UTF-8?q?=E2=86=92=201.66.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix vips build.
---
 pkgs/development/libraries/gobject-introspection/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 9bac8bc71a19..97b3ea9a8f10 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gobject-introspection";
-  version = "1.66.0";
+  version = "1.66.1";
 
   # outputs TODO: share/gobject-introspection-1.0/tests is needed during build
   # by pygobject3 (and maybe others), but it's only searched in $out
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0q00llz0p7qik19a9fxq4bf6mqqqivkv77fqhcgqygvwxhxflrix";
+    sha256 = "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x";
   };
 
   patches = [

From 7665d285678c357cdcf7d887584d8d677aa1115d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 02:57:11 +0000
Subject: [PATCH 0431/3942] =?UTF-8?q?gnome3.gdm:=203.38.0=20=E2=86=92=203.?=
 =?UTF-8?q?38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gdm/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index f068ab531d98..98257c80f0f0 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -47,13 +47,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gdm";
-  version = "3.38.0";
+  version = "3.38.1";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1fimhklb204rflz8k345756jikgbw8113hms3zlcwk6975f43m26";
+    sha256 = "0wkzy5mrxq963fm4pmn6bhml73zmc8bq61frm77a175046c590q8";
   };
 
   mesonFlags = [
@@ -122,13 +122,6 @@ stdenv.mkDerivation rec {
     # Set up the environment properly when launching sessions
     # https://github.com/NixOS/nixpkgs/issues/48255
     ./reset-environment.patch
-
-    # Fix runtime patch location.
-    # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/114
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/9d841d681f3d1c58e3df51a98421257f774cd185.patch";
-      sha256 = "0lf5kpz9ghylqlbybc0mpfsvr4i29z1ag8wf6j1918hjrfcipnxj";
-    })
   ];
 
   postPatch = ''

From 1e70d8d5366908e1617d498379e76509bc39b265 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 02:57:18 +0000
Subject: [PATCH 0432/3942] =?UTF-8?q?gnome3.gnome-applets:=203.37.2=20?=
 =?UTF-8?q?=E2=86=92=203.38.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/misc/gnome-applets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
index f07d93d421cb..cc9e0a29d8fd 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-applets";
-  version = "3.37.2";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0l1mc9ymjg0bgk92a08zd85hx1vaqrzdj0dwzmna20rp51vf0l4a";
+    sha256 = "04qrzycwm7pz556agl08xw3d0r1mmr4ja9n9jfijjxs9inrhp5yc";
   };
 
   nativeBuildInputs = [

From f7bfb52a60247120b118ccd68e2db926502d64a7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 02:57:25 +0000
Subject: [PATCH 0433/3942] =?UTF-8?q?gnome3.gnome-flashback:=203.37.2=20?=
 =?UTF-8?q?=E2=86=92=203.38.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index 936ad3559c30..93b8fc2251b3 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
@@ -29,7 +29,7 @@
 }:
 let
   pname = "gnome-flashback";
-  version = "3.37.2";
+  version = "3.38.0";
 
   # From data/sessions/Makefile.am
   requiredComponentsCommon = [
@@ -60,7 +60,7 @@ let
 
     src = fetchurl {
       url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-      sha256 = "0lz6icgng8ri4sdi3lkdsyvxzfvlkayn85b5346g76vc1w5y03db";
+      sha256 = "1r51yqdqichp4jv54kiaqrh0xhykngr4ymlvrkjhzdhivwadsg4m";
     };
 
     # make .desktop Execs absolute

From 71064f875f948c05f1c86e363e21adf7e51282dd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 02:57:31 +0000
Subject: [PATCH 0434/3942] =?UTF-8?q?gnome3.gnome-panel:=203.37.1=20?=
 =?UTF-8?q?=E2=86=92=203.38.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/misc/gnome-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
index b06bf1bcbea7..518d8e198343 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-panel";
-  version = "3.37.1";
+  version = "3.38.0";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-HVmP1okz52AY8vsRanhxy8ADPB8Qm/v+CKHstWBn0VI=";
+    hash = "sha256-GosVrvCgKmyqm5IJyNP7Q+e5h6OAB2aRwj8DFOwwLxU=";
   };
 
   # make .desktop Exec absolute

From 98706710da017fd6c2407604c508fac858965354 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 03:20:30 +0000
Subject: [PATCH 0435/3942] =?UTF-8?q?gnome3.sushi:=203.34.0=20=E2=86=92=20?=
 =?UTF-8?q?3.38.0?=
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 4bdc409d8166..f0ddaef081b3 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sushi";
-  version = "3.34.0";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1zcr8wi5bgvvpb5ha1v96aiaz4vqqrsn6cvvalwzah6am85k78m8";
+    sha256 = "0vlqqk916dymv4asbyvalp1m096a5hh99nx23i4xavzvgygh4h2h";
   };
 
   nativeBuildInputs = [

From bfd818e711d8ad7d6e8d790da50f5e2483052ee3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 03:26:45 +0000
Subject: [PATCH 0436/3942] =?UTF-8?q?gnome-builder:=203.38.0=20=E2=86=92?=
 =?UTF-8?q?=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/editors/gnome-builder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index bee059ecd2d2..6704702837a6 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -40,11 +40,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-builder";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1olTi6+O+xrPfqYHJosaqhQY1VF9ktT2lGo9v4FOrlU=";
+    sha256 = "06wcyfrwcjyj2vcqyw0z3sy1r4qxpcdpwqq1qmpsaphpz8acycjn";
   };
 
   nativeBuildInputs = [

From dd39a88951395695f8e1697e74051c69b37374c0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 03:27:59 +0000
Subject: [PATCH 0437/3942] =?UTF-8?q?gcr:=203.36.0=20=E2=86=92=203.38.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix
index 55827b1ad0bc..212b087fbe2c 100644
--- a/pkgs/development/libraries/gcr/default.nix
+++ b/pkgs/development/libraries/gcr/default.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gcr";
-  version = "3.36.0";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "00b6bzpr8rj8mvj66r2273r417wg2y21m6n88mhkq9m22z8bxyda";
+    sha256 = "1q97pba4bzjndm1vlvicyv8mrl0n589qsw71dp8jrz2payvcfk56";
   };
 
   postPatch = ''

From 8edc951ce1b80047fbefddc30013254c2bcd7b36 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 03:28:18 +0000
Subject: [PATCH 0438/3942] =?UTF-8?q?gjs:=201.66.0=20=E2=86=92=201.66.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index 0630a6aed95e..9437d76335d0 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -29,11 +29,11 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "gjs";
-  version = "1.66.0";
+  version = "1.66.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1y5m7as3jwhb3svb4xgk443hyxhijralk5q5s3ywidkd047gj37k";
+    sha256 = "0k1ld2bc4c3zbyjpfgx15v5n02iywdvm106rys5jqr7zbr2l0hld";
   };
 
   outputs = [ "out" "dev" "installedTests" ];

From 1ca1e27b442ee1c9595a75b18a1c71e8fe084e36 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 03:33:04 +0000
Subject: [PATCH 0439/3942] =?UTF-8?q?librsvg:=202.50.0=20=E2=86=92=202.50.?=
 =?UTF-8?q?1?=
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 59e56f20703f..ecf518d04dae 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -4,14 +4,14 @@
 
 let
   pname = "librsvg";
-  version = "2.50.0";
+  version = "2.50.1";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "s/rbokDwm5yYmKsgy3MRRnJD5gfPj5KLfF+EJHTuPfQ=";
+    sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv";
   };
 
   outputs = [ "out" "dev" "installedTests" ];

From 6472c6c76f0a05b98585e0b9cf25e0beac96e1d8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 03:33:04 +0000
Subject: [PATCH 0440/3942] =?UTF-8?q?sysprof:=203.38.0=20=E2=86=92=203.38.?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/tools/profiling/sysprof/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 8fe19b5e31a3..49b8e88486ca 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sysprof";
-  version = "3.38.0";
+  version = "3.38.1";
 
   outputs = [ "out" "lib" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1kj1yb7sfd874jm0666cnf5lc0c83gxhsdqhjic6ykppqa6p5kcb";
+    sha256 = "1z2i9187f2jx456l7h07wy8m9a0p7pj3xiv1aji3snq7rjb1lkj0";
   };
 
   nativeBuildInputs = [

From a632699e7136fffb36dde40880b05b4f1c263903 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 03:33:16 +0000
Subject: [PATCH 0441/3942] =?UTF-8?q?tracker:=203.0.0=20=E2=86=92=203.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index 8073188ceb95..40ab73405ae4 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tracker";
-  version = "3.0.0";
+  version = "3.0.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0drqsfqc4smfbpjk74iap114yww5cpldfhn4z6b0aavmylalb1kh";
+    sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr";
   };
 
   patches = [

From 43b034d25dbd3b0098ce584825ef18af4ee8792c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 03:33:24 +0000
Subject: [PATCH 0442/3942] =?UTF-8?q?tracker-miners:=203.0.0=20=E2=86=92?=
 =?UTF-8?q?=203.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix
index 73598470eedf..0670fdcdbd15 100644
--- a/pkgs/development/libraries/tracker-miners/default.nix
+++ b/pkgs/development/libraries/tracker-miners/default.nix
@@ -48,11 +48,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tracker-miners";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0hj0ixrladm7sxcmi0hr6d7wdlg9zcq0cyk22prg9pn54dy1lj5v";
+    sha256 = "1kfi5d6pccqx28hbnja6k1mpwjd53k5zs704sg01rlzmbshz1zn6";
   };
 
   nativeBuildInputs = [

From 8e52dfa09e2e4f766d74baa663af9d72327132fe Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 03:33:29 +0000
Subject: [PATCH 0443/3942] =?UTF-8?q?mm-common:=201.0.1=20=E2=86=92=201.0.?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix
index 3c02e537d2a3..3981e05ef067 100644
--- a/pkgs/development/libraries/mm-common/default.nix
+++ b/pkgs/development/libraries/mm-common/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mm-common";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1jasx9a9g7nqf7jcv3mrg4qh5cp9sq724jxjaz4wa1dzmxsxg8i8";
+    sha256 = "07b4s5ckcz9q5gwx8vchim19mhfgl8wysqwi30pndks3m4zrzad2";
   };
 
   nativeBuildInputs = [

From c7c4c236e063a4ef1c5255e6d326eb32d9852047 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 06:45:50 +0200
Subject: [PATCH 0444/3942] libsysprof-capture: init

This will allow us to use sysprof-capture as a dependency of other libraries like GLib.
---
 .../tools/profiling/sysprof/capture.nix       | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/tools/profiling/sysprof/capture.nix

diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix
new file mode 100644
index 000000000000..a1f5d00332c4
--- /dev/null
+++ b/pkgs/development/tools/profiling/sysprof/capture.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, meson
+, ninja
+, sysprof
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libsysprof-capture";
+
+  inherit (sysprof) src version;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+  ];
+
+  mesonFlags = [
+    "-Dwith_sysprofd=none"
+    "-Dlibsysprof=false"
+    "-Dhelp=false"
+    "-Denable_tools=false"
+    "-Denable_tests=false"
+    "-Denable_examples=false"
+  ];
+
+  meta = sysprof.meta // {
+    description = "Static library for Sysprof capture data generation";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 741f08dadc2c..dc38e86d5c2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18621,6 +18621,8 @@ in
 
   sysprof = callPackage ../development/tools/profiling/sysprof { };
 
+  libsysprof-capture = callPackage ../development/tools/profiling/sysprof/capture.nix { };
+
   sysklogd = callPackage ../os-specific/linux/sysklogd { };
 
   syslinux = callPackage ../os-specific/linux/syslinux { };

From 9124947ae6286f68c204a0cbe9f8de650847a944 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 06:49:57 +0200
Subject: [PATCH 0445/3942] libsoup: do not depend on full sysprof

It just wants libsysprof-capture.
---
 pkgs/development/libraries/libsoup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index d316df15643b..daea8d4d3c30 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, sysprof
+{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, libsysprof-capture
 , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
 , libpsl, python3, brotli }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     libpsl
     brotli
   ] ++ lib.optionals stdenv.isLinux [
-    sysprof
+    libsysprof-capture
   ];
   nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ];
   propagatedBuildInputs = [ glib libxml2 ];

From 932c4df710fbcfe56505b3b17e10db7e7e6dd48e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 06:55:23 +0200
Subject: [PATCH 0446/3942] gnome3.gnome-software: do not depend on full
 sysprof

It just wants libsysprof-capture.
---
 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 c83f3e3268e0..71744ab84a3c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -2,7 +2,7 @@
 , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd
 , gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts
 , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils
-, sysprof }:
+, libsysprof-capture }:
 
 let
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     gtk3 glib packagekit appstream-glib libsoup
     gsettings-desktop-schemas gnome-desktop
     gspell json-glib libsecret ostree
-    polkit flatpak libxmlb gnome-online-accounts sysprof
+    polkit flatpak libxmlb gnome-online-accounts libsysprof-capture
   ] ++ stdenv.lib.optionals withFwupd [
     fwupd
   ];

From 56b944156340a6e1967143887165f2119ebd17bb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Oct 2020 06:57:20 +0200
Subject: [PATCH 0447/3942] gnome3.mutter: do not depend on full sysprof

It just wants libsysprof-capture.
---
 pkgs/desktops/gnome-3/core/mutter/3.34/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/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
index 6afded766716..0581695d288a 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
@@ -35,7 +35,7 @@
 , xorgserver
 , python3
 , wrapGAppsHook
-, sysprof
+, libsysprof-capture
 , desktop-file-utils
 , libcap_ng
 , egl-wayland
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
     libxkbfile
     pango
     pipewire_0_2 # TODO: backport pipewire 0.3 support
-    sysprof
+    libsysprof-capture
     upower
     xkeyboard_config
     xwayland
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 35d2822e8fb0..f57bb4812ce5 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -32,7 +32,7 @@
 , xorgserver
 , python3
 , wrapGAppsHook
-, sysprof
+, libsysprof-capture
 , desktop-file-utils
 , libcap_ng
 , egl-wayland
@@ -110,7 +110,7 @@ let self = stdenv.mkDerivation rec {
     libxkbfile
     pango
     pipewire
-    sysprof
+    libsysprof-capture
     xkeyboard_config
     xwayland
     wayland-protocols

From f6bfc2c38be89d26f2aa60823656355049ffe621 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sat, 24 Oct 2020 12:29:52 +0200
Subject: [PATCH 0448/3942] wordgrinder: 0.7.2 -> 0.8

https://github.com/davidgiven/wordgrinder/releases/tag/0.8
---
 pkgs/applications/office/wordgrinder/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix
index 6438bed48285..e50e319f319c 100644
--- a/pkgs/applications/office/wordgrinder/default.nix
+++ b/pkgs/applications/office/wordgrinder/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wordgrinder";
-  version = "0.7.2";
+  version = "0.8";
 
   src = fetchFromGitHub {
     repo = "wordgrinder";
     owner = "davidgiven";
     rev = version;
-    sha256 = "08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal";
+    sha256 = "124d1bnn2aqs6ik8pdazzni6a0583prz9lfdjrbwyb97ipqga9pm";
   };
 
   makeFlags = [
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
 
   dontUseNinjaBuild = true;
   dontUseNinjaInstall = true;
+  dontConfigure = true;
 
   nativeBuildInputs = [
     pkgconfig
@@ -33,11 +34,12 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libXft
     lua52Packages.lua
     ncurses
     readline
     zlib
+  ] ++ stdenv.lib.optionals stdenv.isLinux [
+    libXft
   ];
 
   # To be able to find <Xft.h>

From 4eb42a4f1d1f45d8715775fa38e31946ae95e21c Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sat, 24 Oct 2020 16:43:05 +0530
Subject: [PATCH 0449/3942] fetchfossil: Depend on cacert

Without it, it'll not able to verify SSL certificates, rendering
it mostly useless
---
 pkgs/build-support/fetchfossil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchfossil/default.nix b/pkgs/build-support/fetchfossil/default.nix
index 27933b47178a..3a4876bc5de3 100644
--- a/pkgs/build-support/fetchfossil/default.nix
+++ b/pkgs/build-support/fetchfossil/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fossil}:
+{stdenv, fossil, cacert}:
 
 {name ? null, url, rev, sha256}:
 
 stdenv.mkDerivation {
   name = "fossil-archive" + (if name != null then "-${name}" else "");
   builder = ./builder.sh;
-  nativeBuildInputs = [fossil];
+  nativeBuildInputs = [fossil cacert];
 
   # Envvar docs are hard to find. A link for the future:
   # https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md

From 26b7e792468c0c0ea6c726506f9f9c66778b146e Mon Sep 17 00:00:00 2001
From: Benedikt Morbach <benedikt.morbach@googlemail.com>
Date: Sat, 24 Oct 2020 14:45:05 +0200
Subject: [PATCH 0450/3942] ceph: Fix build with glibc 2.32

This adds a patch from upstream ceph to avoid using the deprecated
sys_siglist if sigdescr_np is available.
---
 .../ceph/ceph-glibc-2-32-sigdescr_np.patch    | 63 +++++++++++++++++++
 pkgs/tools/filesystems/ceph/default.nix       |  1 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch

diff --git a/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch b/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch
new file mode 100644
index 000000000000..f78c7af9e35a
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch
@@ -0,0 +1,63 @@
+From b9b6faf66ae67648626470cb4fc3f0850ac4d842 Mon Sep 17 00:00:00 2001
+From: David Disseldorp <ddiss@suse.de>
+Date: Tue, 1 Sep 2020 13:49:21 +0200
+Subject: [PATCH] cmake: detect and use sigdescr_np() if available
+
+sys_siglist is deprecated with glibc 2.32. A new thread-safe and
+async-signal safe sigdescr_np() function is provided, so use it if
+available.
+
+Fixes: https://tracker.ceph.com/issues/47187
+Signed-off-by: David Disseldorp <ddiss@suse.de>
+---
+ cmake/modules/CephChecks.cmake | 1 +
+ src/global/signal_handler.h    | 8 +++++---
+ src/include/config-h.in.cmake  | 3 +++
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/CephChecks.cmake b/cmake/modules/CephChecks.cmake
+index 23687283a7c6..ca86dcbc73de 100644
+--- a/cmake/modules/CephChecks.cmake
++++ b/cmake/modules/CephChecks.cmake
+@@ -24,6 +24,7 @@ check_function_exists(strerror_r HAVE_Strerror_R)
+ check_function_exists(name_to_handle_at HAVE_NAME_TO_HANDLE_AT)
+ check_function_exists(pipe2 HAVE_PIPE2)
+ check_function_exists(accept4 HAVE_ACCEPT4)
++check_function_exists(sigdescr_np HAVE_SIGDESCR_NP)
+ 
+ include(CMakePushCheckState)
+ cmake_push_check_state(RESET)
+diff --git a/src/global/signal_handler.h b/src/global/signal_handler.h
+index 476724201aa9..c101b2e28733 100644
+--- a/src/global/signal_handler.h
++++ b/src/global/signal_handler.h
+@@ -20,10 +20,12 @@
+ 
+ typedef void (*signal_handler_t)(int);
+ 
+-#ifndef HAVE_REENTRANT_STRSIGNAL
+-# define sig_str(signum) sys_siglist[signum]
+-#else
++#ifdef HAVE_SIGDESCR_NP
++# define sig_str(signum) sigdescr_np(signum)
++#elif HAVE_REENTRANT_STRSIGNAL
+ # define sig_str(signum) strsignal(signum)
++#else
++# define sig_str(signum) sys_siglist[signum]
+ #endif
+ 
+ void install_sighandler(int signum, signal_handler_t handler, int flags);
+diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
+index 1ea3703f620c..59bd4273511a 100644
+--- a/src/include/config-h.in.cmake
++++ b/src/include/config-h.in.cmake
+@@ -220,6 +220,9 @@
+ /* Define to 1 if you have sched.h. */
+ #cmakedefine HAVE_SCHED 1
+ 
++/* Define to 1 if you have sigdescr_np. */
++#cmakedefine HAVE_SIGDESCR_NP 1
++
+ /* Support SSE (Streaming SIMD Extensions) instructions */
+ #cmakedefine HAVE_SSE
+ 
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 9b9fe9a5aaf0..b221025f85b8 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -133,6 +133,7 @@ in rec {
 
     patches = [
       ./0000-fix-SPDK-build-env.patch
+      ./ceph-glibc-2-32-sigdescr_np.patch
     ];
 
     nativeBuildInputs = [

From 3cf12aa9c601514be923a5a1b5f5d1675a585c5d Mon Sep 17 00:00:00 2001
From: Louis <louis@bettens.info>
Date: Thu, 22 Oct 2020 19:25:58 +0200
Subject: [PATCH 0451/3942] xkeyboard-config: 2.27 -> 2.31

---
 pkgs/servers/x11/xorg/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 81ce111ecacc..37858983220f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2522,16 +2522,19 @@ lib.makeScope newScope (self: with self; {
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
 
-  xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
-    name = "xkeyboard-config-2.27";
+  xkeyboardconfig = callPackage ({ stdenv, python3, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
+    name = "xkeyboard-config-2.31";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2";
-      sha256 = "07wh443lhwv1j0q6xnxnji7f7ahh7xphxj90fv02cdd6zv4aw3b9";
+      url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2";
+      sha256 = "18xddaxh83zm698syh50w983jg6b7b8zgv0dfaf7ha485hgihi6s";
     };
     hardeningDisable = [ "bindnow" "relro" ];
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgconfig python3 ];
     buildInputs = [ libX11 xorgproto ];
+    prePatch = ''
+      patchShebangs rules/merge.py
+    '';
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
 

From 6d2cad8a4ed76e42407546bc6b4c717fd9e1a535 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Sat, 24 Oct 2020 19:22:36 +0100
Subject: [PATCH 0452/3942] gdb: 9.2 -> 10.1

See https://lists.gnu.org/archive/html/info-gnu/2020-10/msg00009.html
for release announcement
---
 pkgs/development/tools/misc/gdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index a4806634432d..d9bac6e3c83c 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -26,11 +26,11 @@ assert pythonSupport -> python3 != null;
 
 stdenv.mkDerivation rec {
   pname = targetPrefix + basename;
-  version = "9.2";
+  version = "10.1";
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}-${version}.tar.xz";
-    sha256 = "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n";
+    sha256 = "1h32dckz1y8fnyxh22iyw8h3hnhxr79v1ng85px3ljn1xv71wbzq";
   };
 
   postPatch = if stdenv.isDarwin then ''

From 55d047fc0e65a29f9cfb4e109f650b79725b02fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Wed, 21 Oct 2020 15:50:12 +0200
Subject: [PATCH 0453/3942] python3Packages.pygtrie: init at 2.3

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

diff --git a/pkgs/development/python-modules/pygtrie/default.nix b/pkgs/development/python-modules/pygtrie/default.nix
new file mode 100644
index 000000000000..5bfd991b4841
--- /dev/null
+++ b/pkgs/development/python-modules/pygtrie/default.nix
@@ -0,0 +1,15 @@
+{ lib, fetchPypi, buildPythonPackage, ... }:
+buildPythonPackage rec {
+  pname = "pygtrie";
+  version = "2.3";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "00x7q4p9r75zdnw3a8vd0d0w0i5l28w408g5bsfl787yv6b1h9i8";
+  };
+  meta = {
+    homepage = "https://github.com/mina86/pygtrie";
+    description = "Trie data structure implementation";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ kmein ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4928fdd7c16e..b46637236ebd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5023,6 +5023,8 @@ in {
 
   pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkgconfig; };
 
+  pygtrie = callPackage ../development/python-modules/pygtrie { };
+
   pyhamcrest = if isPy3k then
     callPackage ../development/python-modules/pyhamcrest { }
   else

From cd63b94b0d96cd9dd2add5d150d2b3b4ea397b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Wed, 21 Oct 2020 15:50:29 +0200
Subject: [PATCH 0454/3942] python3Packages.betacode: init at 1.0

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

diff --git a/pkgs/development/python-modules/betacode/default.nix b/pkgs/development/python-modules/betacode/default.nix
new file mode 100644
index 000000000000..8bd78fb49d2b
--- /dev/null
+++ b/pkgs/development/python-modules/betacode/default.nix
@@ -0,0 +1,19 @@
+{ fetchPypi, buildPythonPackage, pygtrie, isPy3k, lib, }:
+buildPythonPackage rec {
+  pname = "betacode";
+  version = "1.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0s84kd9vblbjz61q7zchx64a6hmdqb4lillna5ryh0g9ij76g6r5";
+  };
+  preBuild = ''echo > README.rst'';
+  # setup.py uses a python3 os.path.join
+  disabled = !isPy3k;
+  propagatedBuildInputs = [ pygtrie ];
+  meta = {
+    homepage = "https://github.com/matgrioni/betacode";
+    description = "A small python package to flexibly convert from betacode to unicode and back.";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kmein ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b46637236ebd..21eaab0dd9ae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -817,6 +817,8 @@ in {
 
   bespon = callPackage ../development/python-modules/bespon { };
 
+  betacode = callPackage ../development/python-modules/betacode { };
+
   betamax = callPackage ../development/python-modules/betamax { };
 
   betamax-matchers = callPackage ../development/python-modules/betamax-matchers { };

From 803ca85c209b930b33a371178717801dc0d3a99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 25 Oct 2020 08:07:15 +0100
Subject: [PATCH 0455/3942] coreutils: fix aarch64 build by upstream patch

https://hydra.nixos.org/build/128781441
We can't use fetchpatch here, unfortunately.
---
 pkgs/tools/misc/coreutils/default.nix         |   4 +-
 .../coreutils/sys-getdents-undeclared.patch   | 100 ++++++++++++++++++
 2 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/coreutils/sys-getdents-undeclared.patch

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index c4ce510c6421..e3e2e167e33a 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -29,7 +29,9 @@ stdenv.mkDerivation (rec {
     sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo=";
   };
 
-  patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
+  patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
+    # included on coreutils master; TODO: apply unconditionally, I guess
+    ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch;
 
   postPatch = ''
     # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems.
diff --git a/pkgs/tools/misc/coreutils/sys-getdents-undeclared.patch b/pkgs/tools/misc/coreutils/sys-getdents-undeclared.patch
new file mode 100644
index 000000000000..0af5de68415a
--- /dev/null
+++ b/pkgs/tools/misc/coreutils/sys-getdents-undeclared.patch
@@ -0,0 +1,100 @@
+From 10fcb97bd728f09d4a027eddf8ad2900f0819b0a Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 5 Mar 2020 17:25:29 -0800
+Subject: ls: restore 8.31 behavior on removed directories
+
+* NEWS: Mention this.
+* src/ls.c: Do not include <sys/sycall.h>
+(print_dir): Don't worry about whether the directory is removed.
+* tests/ls/removed-directory.sh: Adjust to match new (i.e., old)
+behavior.
+---
+ NEWS (removed diff in nixpkgs)|  6 ++++++
+ src/ls.c                      | 22 ----------------------
+ tests/ls/removed-directory.sh | 10 ++--------
+ 3 files changed, 8 insertions(+), 30 deletions(-)
+
+diff --git a/src/ls.c b/src/ls.c
+index 24b983287..4acf5f44d 100644
+--- a/src/ls.c
++++ b/src/ls.c
+@@ -49,10 +49,6 @@
+ # include <sys/ptem.h>
+ #endif
+ 
+-#ifdef __linux__
+-# include <sys/syscall.h>
+-#endif
+-
+ #include <stdio.h>
+ #include <assert.h>
+ #include <setjmp.h>
+@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+   struct dirent *next;
+   uintmax_t total_blocks = 0;
+   static bool first = true;
+-  bool found_any_entries = false;
+ 
+   errno = 0;
+   dirp = opendir (name);
+@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+       next = readdir (dirp);
+       if (next)
+         {
+-          found_any_entries = true;
+           if (! file_ignored (next->d_name))
+             {
+               enum filetype type = unknown;
+@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+           if (errno != EOVERFLOW)
+             break;
+         }
+-#ifdef __linux__
+-      else if (! found_any_entries)
+-        {
+-          /* If readdir finds no directory entries at all, not even "." or
+-             "..", then double check that the directory exists.  */
+-          if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
+-              && errno != EINVAL)
+-            {
+-              /* We exclude EINVAL as that pertains to buffer handling,
+-                 and we've passed NULL as the buffer for simplicity.
+-                 ENOENT is returned if appropriate before buffer handling.  */
+-              file_failure (command_line_arg, _("reading directory %s"), name);
+-            }
+-          break;
+-        }
+-#endif
+       else
+         break;
+ 
+diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh
+index e8c835dab..fe8f929a1 100755
+--- a/tests/ls/removed-directory.sh
++++ b/tests/ls/removed-directory.sh
+@@ -26,20 +26,14 @@ case $host_triplet in
+   *) skip_ 'non linux kernel' ;;
+ esac
+ 
+-LS_FAILURE=2
+-
+-cat <<\EOF >exp-err || framework_failure_
+-ls: reading directory '.': No such file or directory
+-EOF
+-
+ cwd=$(pwd)
+ mkdir d || framework_failure_
+ cd d || framework_failure_
+ rmdir ../d || framework_failure_
+ 
+-returns_ $LS_FAILURE ls >../out 2>../err || fail=1
++ls >../out 2>../err || fail=1
+ cd "$cwd" || framework_failure_
+ compare /dev/null out || fail=1
+-compare exp-err err || fail=1
++compare /dev/null err || fail=1
+ 
+ Exit $fail
+-- 
+cgit v1.2.1
+

From 8d6bd565a108cc7bc6d6dc5b6c5758162051ec16 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 26 Aug 2020 07:55:59 +0000
Subject: [PATCH 0456/3942] libcap_ng: 0.7.10 -> 0.7.11

---
 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 c9b061fe03bf..cfcaea694e51 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 {
   pname = "libcap-ng";
   # When updating make sure to test that the version with
   # all of the python bindings still works
-  version = "0.7.10";
+  version = "0.7.11";
 
   src = fetchurl {
     url = "${meta.homepage}/${pname}-${version}.tar.gz";
-    sha256 = "1gzzy12agfa9ddipdf72h9y68zqqnvsjjylv4vnq6hj4w2safk58";
+    sha256 = "1s8akhnnazk0b5c6z5i3x54rjb26p8pz2wdl1m21ml3231qmr0c5";
   };
 
   nativeBuildInputs = [ swig ];

From 3d38fae90df5d2a4e203096fb55e86f63cc34fbf Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sun, 25 Oct 2020 10:02:27 +0100
Subject: [PATCH 0457/3942] darling-dmg: 1.0.4+git20180914 -> 1.0.4+git20200427

---
 pkgs/tools/filesystems/darling-dmg/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
index 43823e5b51a3..6dca72057776 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -2,25 +2,23 @@
 
 stdenv.mkDerivation rec {
   pname = "darling-dmg";
-  version = "1.0.4+git20180914";
+  version = "1.0.4+git20200427";
 
   src = fetchFromGitHub {
     owner = "darlinghq";
     repo = "darling-dmg";
-    rev = "97a92a6930e43cdbc9dedaee62716e3223deb027";
-    sha256 = "1bngr4827qnl4s2f7z39wjp13nfm3zzzykjshb43wvjz536bnqdj";
+    rev = "71cc76c792db30328663272788c0b64aca27fdb0";
+    sha256 = "08iphkxlmjddrxpbm13gxyqwcrd0k65z3l1944n4pccb6qbyj8gv";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ fuse openssl zlib bzip2 libxml2 icu ];
 
-  # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
-  CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://www.darlinghq.org/";
     description = "Darling lets you open macOS dmgs on Linux";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl3;
+    platforms = platforms.linux;
+    license = licenses.gpl3;
   };
 }

From 9dbf2d600a2ab0cd0deee38cfd25ebd96f465947 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sun, 25 Oct 2020 10:03:38 +0100
Subject: [PATCH 0458/3942] darling-dmg: enable LZFSE support

This allows decompressing DMGs which are compressed with LZFSE.
---
 pkgs/tools/filesystems/darling-dmg/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
index 6dca72057776..0dd41335b648 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
+{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu, lzfse }:
 
 stdenv.mkDerivation rec {
   pname = "darling-dmg";
@@ -12,8 +12,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ fuse openssl zlib bzip2 libxml2 icu ];
+  buildInputs = [ fuse openssl zlib bzip2 libxml2 icu lzfse ];
 
+  CXXFLAGS = [
+    "-DCOMPILE_WITH_LZFSE=1"
+    "-llzfse"
+  ];
 
   meta = with stdenv.lib; {
     homepage = "https://www.darlinghq.org/";

From 7087cf925f9fbc8563f03a5a3a5c0a36831ac118 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sun, 25 Oct 2020 10:04:26 +0100
Subject: [PATCH 0459/3942] darling-dmg: add Luflosi as maintainer

---
 pkgs/tools/filesystems/darling-dmg/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
index 0dd41335b648..42853eb8ff97 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     description = "Darling lets you open macOS dmgs on Linux";
     platforms = platforms.linux;
     license = licenses.gpl3;
+    maintainers = with maintainers; [ Luflosi ];
   };
 }

From a974fa3727f3affd8e94624424a3bfe5216db52b Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 25 Oct 2020 15:28:30 +0300
Subject: [PATCH 0460/3942] gpscorrelate: wrap to avoid crashing due to lack of
 schemas

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

diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index 07918d3d599d..42f522175b04 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -1,5 +1,5 @@
 { fetchFromGitHub, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3
-, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils }:
+, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "gpscorrelate";
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
     docbook_xsl
     libxslt
     pkgconfig
+    wrapGAppsHook
   ];
 
   buildInputs = [

From 8be875622e9189cba2a17de66cf1fa3591b16d79 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 13:47:08 +0100
Subject: [PATCH 0461/3942] libsoup: fix eval

---
 pkgs/development/libraries/libsoup/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 8cb0064a70ac..65e0ced1d9bd 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, libsysprof-capture
 , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
-, libpsl, python3, brotli, lib }:
+, libpsl, python3, brotli
+}:
 
 stdenv.mkDerivation rec {
   pname = "libsoup";

From cdfbc896a5f575ca678b9d84d63ca942ce26faf8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 18:16:44 +0000
Subject: [PATCH 0462/3942] libndctl: 69 -> 70.1

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

diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index be5c75806d8c..c0800c991c45 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libndctl";
-  version = "69";
+  version = "70.1";
 
   src = fetchFromGitHub {
     owner  = "pmem";
     repo   = "ndctl";
     rev    = "v${version}";
-    sha256 = "1l7p0ycj27d4z07gf9qp796xpg16kfsg3rwx6plhilbhip1as4w7";
+    sha256 = "09ymdibcr18vpmyf2n0xrnzgccfvr7iy3p2l5lbh7cgz7djyl5wq";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];

From 47b8d564de57d582b5c7f97ca2cf8faf099b4750 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 19:19:16 +0000
Subject: [PATCH 0463/3942] libquotient: 0.6.0 -> 0.6.2

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

diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix
index c1cd3ca8d59f..4971e37a4272 100644
--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "libquotient";
-  version = "0.6.0";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "quotient-im";
     repo = "libQuotient";
     rev = version;
-    sha256 = "1wpjrihi2gci3kwq9b3i3avd6bk3x7g22r0n6hvlphapkaf1ig6y";
+    sha256 = "1721cy6zaq086nrwh9x4d7k1jiaygg1wkvyx486i9bj9z53lc3wd";
   };
 
   buildInputs = [ qtbase qtmultimedia ];

From 835ba5b069433facbe40661160d56b34dc012212 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 19:38:14 +0000
Subject: [PATCH 0464/3942] liquibase: 4.0.0 -> 4.1.1

---
 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 75ccca43a690..93698e8d8e97 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -10,11 +10,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "liquibase";
-  version = "4.0.0";
+  version = "4.1.1";
 
   src = fetchurl {
     url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "06wpvqyv7w749l3ndvzg1p774rv1apbmbpwbdlad57pih4nqa7mm";
+    sha256 = "0gq3y2cgqb1dky5baqjydwmnaimczvsfg8dqc55c7aqcgy7hp3pg";
   };
 
   buildInputs = [ jre makeWrapper ];

From 5c79b3dda06744a55869cae2cba6873fbbd64394 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 25 Oct 2020 21:34:08 +0100
Subject: [PATCH 0465/3942] metasploit: 5.0.90 -> 6.0.12

---
 pkgs/tools/security/metasploit/Gemfile      |   2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 257 +++++++-------
 pkgs/tools/security/metasploit/default.nix  |   4 +-
 pkgs/tools/security/metasploit/gemset.nix   | 358 ++++++++++++--------
 4 files changed, 351 insertions(+), 270 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 457c6249ca00..4df0d2235a05 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.90"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.12"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 7142983f98cc..8ef6d3b3148a 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,16 +1,16 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 592eedc5584953fb94b01a9aae48ec04d2cf153a
-  ref: refs/tags/5.0.90
+  revision: 8ba313ed85b03ef54bec32086c2a8708a7e1df58
+  ref: refs/tags/6.0.12
   specs:
-    metasploit-framework (5.0.90)
-      actionpack (~> 4.2.6)
-      activerecord (~> 4.2.6)
-      activesupport (~> 4.2.6)
+    metasploit-framework (6.0.12)
+      actionpack (~> 5.2.2)
+      activerecord (~> 5.2.2)
+      activesupport (~> 5.2.2)
       aws-sdk-ec2
       aws-sdk-iam
       aws-sdk-s3
-      bcrypt (= 3.1.12)
+      bcrypt
       bcrypt_pbkdf
       bit-struct
       bson
@@ -24,15 +24,16 @@ GIT
       faye-websocket
       filesize
       hrr_rb_ssh (= 0.3.0.pre2)
+      irb
       jsobfu
       json
       metasm
-      metasploit-concern (~> 2.0.0)
-      metasploit-credential (~> 3.0.0)
-      metasploit-model (~> 2.0.4)
-      metasploit-payloads (= 1.4.2)
-      metasploit_data_models (~> 3.0.10)
-      metasploit_payloads-mettle (= 0.5.21)
+      metasploit-concern
+      metasploit-credential
+      metasploit-model
+      metasploit-payloads (= 2.0.22)
+      metasploit_data_models
+      metasploit_payloads-mettle (= 1.0.2)
       mqtt
       msgpack
       nessus_rest
@@ -48,7 +49,7 @@ GIT
       patch_finder
       pcaprub
       pdf-reader
-      pg (~> 0.20)
+      pg
       railties
       rb-readline
       recog
@@ -72,7 +73,7 @@ GIT
       rex-text
       rex-zip
       ruby-macho
-      ruby_smb
+      ruby_smb (~> 2.0)
       rubyntlm
       rubyzip
       sinatra
@@ -90,73 +91,72 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actionpack (4.2.11.3)
-      actionview (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (5.2.4.4)
+      actionview (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.11.3)
-      activesupport (= 4.2.11.3)
+    actionview (5.2.4.4)
+      activesupport (= 5.2.4.4)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (4.2.11.3)
-      activesupport (= 4.2.11.3)
-      builder (~> 3.1)
-    activerecord (4.2.11.3)
-      activemodel (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
-      arel (~> 6.0)
-    activesupport (4.2.11.3)
-      i18n (~> 0.7)
+    activemodel (5.2.4.4)
+      activesupport (= 5.2.4.4)
+    activerecord (5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
+      arel (>= 9.0)
+    activesupport (5.2.4.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     afm (0.2.2)
-    arel (6.0.4)
+    arel (9.0.0)
     arel-helpers (2.11.0)
       activerecord (>= 3.1.0, < 7)
     aws-eventstream (1.1.0)
-    aws-partitions (1.319.0)
-    aws-sdk-core (3.96.1)
+    aws-partitions (1.385.0)
+    aws-sdk-core (3.109.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.162.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-ec2 (1.202.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.37.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-iam (1.46.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.31.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-kms (1.39.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.66.0)
-      aws-sdk-core (~> 3, >= 3.96.1)
+    aws-sdk-s3 (1.83.1)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.3)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-    bcrypt (3.1.12)
+    aws-sigv4 (1.2.2)
+      aws-eventstream (~> 1, >= 1.0.2)
+    bcrypt (3.1.16)
     bcrypt_pbkdf (1.0.1)
-    bindata (2.4.7)
+    bindata (2.4.8)
     bit-struct (0.16)
-    bson (4.8.2)
+    bson (4.11.0)
     builder (3.2.4)
     concurrent-ruby (1.0.5)
     cookiejar (0.3.3)
     crass (1.0.6)
     daemons (1.3.1)
-    dnsruby (1.61.3)
-      addressable (~> 2.5)
+    dnsruby (1.61.4)
+      simpleidn (~> 0.1)
     ed25519 (1.2.4)
-    em-http-request (1.1.5)
+    em-http-request (1.1.7)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
       em-socksify (>= 0.3)
@@ -164,13 +164,14 @@ GEM
       http_parser.rb (>= 0.6.0)
     em-socksify (0.3.2)
       eventmachine (>= 1.0.0.beta.4)
-    erubis (2.7.0)
+    erubi (1.9.0)
     eventmachine (1.2.7)
-    faker (2.2.1)
-      i18n (>= 0.8)
-    faraday (1.0.1)
+    faker (2.14.0)
+      i18n (>= 1.6, < 2)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
-    faye-websocket (0.10.9)
+      ruby2_keywords
+    faye-websocket (0.11.0)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     filesize (0.2.0)
@@ -178,21 +179,24 @@ GEM
     hrr_rb_ssh (0.3.0.pre2)
       ed25519 (~> 1.2)
     http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
+    io-console (0.5.6)
+    irb (1.2.7)
+      reline (>= 0.1.5)
     jmespath (1.4.0)
     jsobfu (0.4.2)
       rkelly-remix
-    json (2.3.0)
-    loofah (2.5.0)
+    json (2.3.1)
+    loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     metasm (1.0.4)
-    metasploit-concern (2.0.5)
-      activemodel (~> 4.2.6)
-      activesupport (~> 4.2.6)
-      railties (~> 4.2.6)
-    metasploit-credential (3.0.4)
+    metasploit-concern (3.0.0)
+      activemodel (~> 5.2.2)
+      activesupport (~> 5.2.2)
+      railties (~> 5.2.2)
+    metasploit-credential (4.0.2)
       metasploit-concern
       metasploit-model
       metasploit_data_models (>= 3.0.0)
@@ -202,79 +206,77 @@ GEM
       rex-socket
       rubyntlm
       rubyzip
-    metasploit-model (2.0.4)
-      activemodel (~> 4.2.6)
-      activesupport (~> 4.2.6)
-      railties (~> 4.2.6)
-    metasploit-payloads (1.4.2)
-    metasploit_data_models (3.0.10)
-      activerecord (~> 4.2.6)
-      activesupport (~> 4.2.6)
+    metasploit-model (3.1.2)
+      activemodel (~> 5.2.2)
+      activesupport (~> 5.2.2)
+      railties (~> 5.2.2)
+    metasploit-payloads (2.0.22)
+    metasploit_data_models (4.1.0)
+      activerecord (~> 5.2.2)
+      activesupport (~> 5.2.2)
       arel-helpers
       metasploit-concern
-      metasploit-model
+      metasploit-model (>= 3.1)
       pg
-      postgres_ext
-      railties (~> 4.2.6)
+      railties (~> 5.2.2)
       recog (~> 2.0)
-    metasploit_payloads-mettle (0.5.21)
+    metasploit_payloads-mettle (1.0.2)
+    method_source (1.0.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     mqtt (0.5.0)
     msgpack (1.3.3)
     multipart-post (2.1.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
     nessus_rest (0.1.6)
-    net-ldap (0.16.2)
-    net-ssh (6.0.2)
+    net-ldap (0.16.3)
+    net-ssh (6.1.0)
     network_interface (0.0.2)
     nexpose (7.2.1)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    octokit (4.18.0)
+    octokit (4.19.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     openssl-ccm (1.2.2)
+    openssl-cmac (2.0.1)
     openvas-omp (0.0.4)
     packetfu (1.1.13)
       pcaprub
     patch_finder (1.0.2)
     pcaprub (0.13.0)
-    pdf-reader (2.4.0)
+    pdf-reader (2.4.1)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (0.21.0)
-    pg_array_parser (0.0.9)
-    postgres_ext (3.0.1)
-      activerecord (~> 4.0)
-      arel (>= 4.0.1)
-      pg_array_parser (~> 0.0.9)
-    public_suffix (4.0.5)
-    rack (1.6.13)
-    rack-protection (1.5.5)
+    pg (1.2.3)
+    public_suffix (4.0.6)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (4.2.11.3)
-      actionpack (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
+    railties (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rake (13.0.1)
     rb-readline (0.5.5)
-    recog (2.3.7)
+    recog (2.3.15)
       nokogiri
     redcarpet (3.5.0)
+    reline (0.1.6)
+      io-console (~> 0.5)
     rex-arch (0.1.13)
       rex-text
     rex-bin_tools (0.1.6)
@@ -312,21 +314,24 @@ GEM
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.23)
+    rex-socket (0.1.24)
       rex-core
     rex-sslscan (0.1.5)
       rex-core
       rex-socket
       rex-text
     rex-struct2 (0.1.2)
-    rex-text (0.2.26)
+    rex-text (0.2.28)
     rex-zip (0.1.3)
       rex-text
     rkelly-remix (0.0.7)
-    ruby-macho (2.2.0)
+    ruby-macho (2.3.0)
     ruby-rc4 (0.1.5)
-    ruby_smb (1.1.0)
+    ruby2_keywords (0.0.2)
+    ruby_smb (2.0.6)
       bindata
+      openssl-ccm
+      openssl-cmac
       rubyntlm
       windows_error
     rubyntlm (0.6.2)
@@ -334,10 +339,13 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
+    simpleidn (0.1.1)
+      unf (~> 0.1.4)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
     sqlite3 (1.4.2)
     sshkey (2.0.0)
     thin (1.7.2)
@@ -350,17 +358,20 @@ GEM
     ttfunk (1.6.2.1)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2020.1)
+    tzinfo-data (1.2020.4)
       tzinfo (>= 1.0.0)
-    warden (1.2.7)
-      rack (>= 1.0)
-    websocket-driver (0.7.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    warden (1.2.9)
+      rack (>= 2.0.9)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     windows_error (0.1.2)
-    xdr (2.0.0)
-      activemodel (>= 4.2.7)
-      activesupport (>= 4.2.7)
+    xdr (3.0.2)
+      activemodel (>= 4.2, < 7.0)
+      activesupport (>= 4.2, < 7.0)
     xmlrpc (0.3.0)
 
 PLATFORMS
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index cc3d26fbee0b..a51ccde13703 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -17,13 +17,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "5.0.90";
+  version = "6.0.12";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "1z3m8pvf1r8rz0snfkr9svhgjl2xn2qjgf8qswszzplsccqx1rss";
+    sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index cd3b2a336bda..4879eb922846 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -4,50 +4,50 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1955wx9m2g776sinamanzlk1jx2dzd34ci3sk22xicp0rmglps37";
+      sha256 = "0d8gxymshjhva5fyv33iy2hzp4jm3i44asdbma9pv9wzpl5fwhn0";
       type = "gem";
     };
-    version = "4.2.11.3";
+    version = "5.2.4.4";
   };
   actionview = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0glnaq3jx4m9q6vn55xqlsg8dbflqzm99fgsl9fl267mc2mz3qrv";
+      sha256 = "0k8dgkplqj76i3q1f8897m8svj2xggd1knhy3bcwfl4nh7998kw6";
       type = "gem";
     };
-    version = "4.2.11.3";
+    version = "5.2.4.4";
   };
   activemodel = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1z3777xsm82i7ggkg74mg21sqz8m5dfl8ykjm7xcrhd2nj843fcp";
+      sha256 = "1g79l7v0ddpxcj5r2s9kii6h4r4nbpy5bksbqi5lxvivrb3pkz1m";
       type = "gem";
     };
-    version = "4.2.11.3";
+    version = "5.2.4.4";
   };
   activerecord = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fpw9vyf2frkxkc6jbq9g78lhhflwz04j89qxj4krvmlq12q8v6d";
+      sha256 = "05b9l85a31cq6g7v4b4ifrj798q49rlidcvvfasmb3bk412wlp03";
       type = "gem";
     };
-    version = "4.2.11.3";
+    version = "5.2.4.4";
   };
   activesupport = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i";
+      sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd";
       type = "gem";
     };
-    version = "4.2.11.3";
+    version = "5.2.4.4";
   };
   addressable = {
     groups = ["default"];
@@ -74,10 +74,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4";
+      sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0";
       type = "gem";
     };
-    version = "6.0.4";
+    version = "9.0.0";
   };
   arel-helpers = {
     groups = ["default"];
@@ -114,80 +114,80 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11gr3pkd0cq034jdmvmi32sb99hkh91qjrpvc6jchi4lsaiaiqgc";
+      sha256 = "04i4bry59c3g1anbjpsz9g1pz7yy23kh4vvhg7z611amlcr48zvb";
       type = "gem";
     };
-    version = "1.319.0";
+    version = "1.385.0";
   };
   aws-sdk-core = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jdnzynjrpp2jyg8vrbfbaad16k8ni1520xah1z2ckl5779x9fi6";
+      sha256 = "0xmppcxq7jm8lffqibkhq257hfwfbv82zm2y1fbhwm3icgxzwlfx";
       type = "gem";
     };
-    version = "3.96.1";
+    version = "3.109.1";
   };
   aws-sdk-ec2 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xp9kp90ixk1ywd0d8ssbk8dl5kxqnz942yr2qq00m7fd60pihh7";
+      sha256 = "0fsf9qhlxczz8cz755xlcdpfqn384d4kr3ybx2p54n377wamdq08";
       type = "gem";
     };
-    version = "1.162.0";
+    version = "1.202.0";
   };
   aws-sdk-iam = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09l3g5a2r7gnc6pwln409b9ahwcs6xpnjx2qaj70cbllanyxbw0c";
+      sha256 = "1j0llz7m9qymfn54vim99k0fjg6vsw71ylcagz1csay6qkjxipg7";
       type = "gem";
     };
-    version = "1.37.0";
+    version = "1.46.0";
   };
   aws-sdk-kms = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1czxr6yi8p9gma4dwgygp1jn0i289hwa2vw69kzfscgbn118c3mm";
+      sha256 = "0ly1m631qm2ciif7sysbzrgczjvz95ga3g6w6vrzvfdv31jjnl9a";
       type = "gem";
     };
-    version = "1.31.0";
+    version = "1.39.0";
   };
   aws-sdk-s3 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x1d1azxwanvm0d7qppw41x5nx2zv0bcz41yk9vqi5lvr7apaq13";
+      sha256 = "021yqghdb1i980vn249hv44jajr0v3hq4ik4r6fqh9kwp04fsbqv";
       type = "gem";
     };
-    version = "1.66.0";
+    version = "1.83.1";
   };
   aws-sigv4 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kysxyw1zkvggbmcj4xnscdh15kxli8mx07hv447h74g9x02drsd";
+      sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5";
       type = "gem";
     };
-    version = "1.1.3";
+    version = "1.2.2";
   };
   bcrypt = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy";
+      sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb";
       type = "gem";
     };
-    version = "3.1.12";
+    version = "3.1.16";
   };
   bcrypt_pbkdf = {
     groups = ["default"];
@@ -204,10 +204,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "033vd169q751qn3zrsv8j5f80k6wg5yhsy8z3clds6py4vqm6xl8";
+      sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic";
       type = "gem";
     };
-    version = "2.4.7";
+    version = "2.4.8";
   };
   bit-struct = {
     groups = ["default"];
@@ -224,10 +224,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06h8sk2wl7pgrwl15xb1bd6l9ws8sz006rf9cy6n6q7g0iwdalkh";
+      sha256 = "1bm64q413wrrm3pda6ha2kn1yipyl0qp5240fwsdw1hkqhbjdnjm";
       type = "gem";
     };
-    version = "4.8.2";
+    version = "4.11.0";
   };
   builder = {
     groups = ["default"];
@@ -284,10 +284,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "139cbl2k934q7d50g7hi8r4im69ca3iv16y9plq9yc6mgjq1cgfk";
+      sha256 = "0i4mq4zm8bqd0ik908gnn8nm3kph268af7q173wlq4krg3nw562x";
       type = "gem";
     };
-    version = "1.61.3";
+    version = "1.61.4";
   };
   ed25519 = {
     groups = ["default"];
@@ -304,10 +304,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx";
+      sha256 = "1azx5rgm1zvx7391sfwcxzyccs46x495vb34ql2ch83f58mwgyqn";
       type = "gem";
     };
-    version = "1.1.5";
+    version = "1.1.7";
   };
   em-socksify = {
     groups = ["default"];
@@ -319,15 +319,15 @@
     };
     version = "0.3.2";
   };
-  erubis = {
+  erubi = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+      sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
       type = "gem";
     };
-    version = "2.7.0";
+    version = "1.9.0";
   };
   eventmachine = {
     groups = ["default"];
@@ -344,30 +344,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wpzpqzpqd9jjzm3ap8182sfbnhdahcxpbg0dssbwq13qdf1s5xs";
+      sha256 = "06sh8492k03p9lsfzv5zifzn51ilb4734vrvwl30vzmzg1apzml6";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.14.0";
   };
   faraday = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq";
+      sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.1.0";
   };
   faye-websocket = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kbp3rjwm74zdj0wy2n1cyyvd7ak4k8i8zva6ib4vqfcv8d2j11a";
+      sha256 = "1cwngdb41zh842y3nzz3cr7z2100pjsl7m3i05yjc1wlyrdk2sm3";
       type = "gem";
     };
-    version = "0.10.9";
+    version = "0.11.0";
   };
   filesize = {
     groups = ["default"];
@@ -414,10 +414,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
+      sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
       type = "gem";
     };
-    version = "0.9.5";
+    version = "1.8.5";
+  };
+  io-console = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vbn4nvnr1pcmjsn0gghc3bz2md89njxq4801zi5dv5niypdxlsp";
+      type = "gem";
+    };
+    version = "0.5.6";
+  };
+  irb = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10d9xr1hdpkqhljxhvdm44c2qbxdjfqm5x00d4v6aw0fym1w7r2g";
+      type = "gem";
+    };
+    version = "1.2.7";
   };
   jmespath = {
     groups = ["default"];
@@ -444,20 +464,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
+      sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.3.1";
   };
   loofah = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040";
+      sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.7.0";
   };
   metasm = {
     groups = ["default"];
@@ -474,72 +494,82 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0v9lm225fhzhnbjcc0vwb38ybikxwzlv8116rrrkndzs8qy79297";
+      sha256 = "10a9dr0pi25vsnk7x1bavx2ja62lqswdkym0hvhjsds6awvx1cf2";
       type = "gem";
     };
-    version = "2.0.5";
+    version = "3.0.0";
   };
   metasploit-credential = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jh1mzvjpsmqamhwjqs6x2bx550mxkqjvl0f1gl1g87w5qvg3w69";
+      sha256 = "03339i3v6lgz0cymn2i7y0sylpw2nihsc8h75c4yn3bq9p6wk6sx";
       type = "gem";
     };
-    version = "3.0.4";
+    version = "4.0.2";
   };
   metasploit-framework = {
     groups = ["default"];
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "592eedc5584953fb94b01a9aae48ec04d2cf153a";
-      sha256 = "1z3m8pvf1r8rz0snfkr9svhgjl2xn2qjgf8qswszzplsccqx1rss";
+      rev = "8ba313ed85b03ef54bec32086c2a8708a7e1df58";
+      sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "5.0.90";
+    version = "6.0.12";
   };
   metasploit-model = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05pnai1cv00xw87rrz38dz4s3ss45s90290d0knsy1mq6rp8yvmw";
+      sha256 = "0szwqs6djh882alpnmnnkx46s548jg3vb0ya61hibw3kqcw3i1ig";
       type = "gem";
     };
-    version = "2.0.4";
+    version = "3.1.2";
   };
   metasploit-payloads = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kddir54jnzl64nsawnvkzdabnmqncq9vav49i1cfschnf4cxc4g";
+      sha256 = "1yiwwyc12f9jln58l4j26yjbixij1v5h3spp4ci3ik4dxyk2r4zb";
       type = "gem";
     };
-    version = "1.4.2";
+    version = "2.0.22";
   };
   metasploit_data_models = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1h59lblfrx8gsnqr10wk958zp6rsjy3qib3hb87s3nm6m1zhm2bc";
+      sha256 = "1n7vb6pg446jadjsgrc29kxnc9b6ga29hw8pg52dnrzhp7rwhiyl";
       type = "gem";
     };
-    version = "3.0.10";
+    version = "4.1.0";
   };
   metasploit_payloads-mettle = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1419z6z0j69zdlkfx3kqgqygsm0ysigwccgn82z5lz82i16krhca";
+      sha256 = "147s4jd2hckls76binsskb6rvnh1crd2agmf1lk7fsj1n55dhkvk";
       type = "gem";
     };
-    version = "0.5.21";
+    version = "1.0.2";
+  };
+  method_source = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp";
+      type = "gem";
+    };
+    version = "1.0.0";
   };
   mini_portile2 = {
     groups = ["default"];
@@ -556,10 +586,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g";
+      sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
       type = "gem";
     };
-    version = "5.14.1";
+    version = "5.14.2";
   };
   mqtt = {
     groups = ["default"];
@@ -591,6 +621,16 @@
     };
     version = "2.1.1";
   };
+  mustermann = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a";
+      type = "gem";
+    };
+    version = "1.1.1";
+  };
   nessus_rest = {
     groups = ["default"];
     platforms = [];
@@ -606,20 +646,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg";
+      sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv";
       type = "gem";
     };
-    version = "0.16.2";
+    version = "0.16.3";
   };
   net-ssh = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kf4am0mz8mwqhif4iqh5yz9pcbbmja5w707j00sfsgrq19nxqld";
+      sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9";
       type = "gem";
     };
-    version = "6.0.2";
+    version = "6.1.0";
   };
   network_interface = {
     groups = ["default"];
@@ -646,20 +686,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
+      sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
       type = "gem";
     };
-    version = "1.10.9";
+    version = "1.10.10";
   };
   octokit = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6";
+      sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24";
       type = "gem";
     };
-    version = "4.18.0";
+    version = "4.19.0";
   };
   openssl-ccm = {
     groups = ["default"];
@@ -671,6 +711,16 @@
     };
     version = "1.2.2";
   };
+  openssl-cmac = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k69p0p0ilvqnwskhc0bfax8rwvyk6n4wzarg8qsjdvm13xwx508";
+      type = "gem";
+    };
+    version = "2.0.1";
+  };
   openvas-omp = {
     groups = ["default"];
     platforms = [];
@@ -716,100 +766,70 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1g3gr2m46275hjv6fv4jwq3qlvdbnhf1jxir9vzgxhv45ncnhffy";
+      sha256 = "0987glcd02mqglplmp1camivqx61jsyik21n99vrmi8s2p7h4mbh";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.4.1";
   };
   pg = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00vhasqwc4f98qb4wxqn2h07fjwzhp5lwyi41j2gndi2g02wrdqh";
+      sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj";
       type = "gem";
     };
-    version = "0.21.0";
-  };
-  pg_array_parser = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1034dhg8h53j48sfm373js54skg4vpndjga6hzn2zylflikrrf3s";
-      type = "gem";
-    };
-    version = "0.0.9";
-  };
-  postgres_ext = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ni1ajzxvc17ba4rgl27cd3645ddbpqpfckv7m08sfgk015hh7dq";
-      type = "gem";
-    };
-    version = "3.0.1";
+    version = "1.2.3";
   };
   public_suffix = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g";
+      sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
       type = "gem";
     };
-    version = "4.0.5";
+    version = "4.0.6";
   };
   rack = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0";
+      sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
       type = "gem";
     };
-    version = "1.6.13";
+    version = "2.2.3";
   };
   rack-protection = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
+      sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz";
       type = "gem";
     };
-    version = "1.5.5";
+    version = "2.1.0";
   };
   rack-test = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
+      sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m";
       type = "gem";
     };
-    version = "0.6.3";
-  };
-  rails-deprecated_sanitizer = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
-      type = "gem";
-    };
-    version = "1.0.3";
+    version = "1.1.0";
   };
   rails-dom-testing = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6";
+      sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i";
       type = "gem";
     };
-    version = "1.0.9";
+    version = "2.0.3";
   };
   rails-html-sanitizer = {
     groups = ["default"];
@@ -826,10 +846,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12f7g5iw1gqjwl2rvfmbgxipds5c475ggalw6qskzzrx9vyc2fpk";
+      sha256 = "089kiwmv8fxyfk0zp57q74nyd5i6d5x5ihlrzbzwl041v94s2zx9";
       type = "gem";
     };
-    version = "4.2.11.3";
+    version = "5.2.4.4";
   };
   rake = {
     groups = ["default"];
@@ -856,10 +876,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1j65iary8qkgyrjc3vnjd7dbyjs2bsz2hcg7ndibjk623faxb1wk";
+      sha256 = "0vxnm9ld3rn8xxccq9jyhzz6558bqfxdb3sd4na20frg9f5pflb7";
       type = "gem";
     };
-    version = "2.3.7";
+    version = "2.3.15";
   };
   redcarpet = {
     groups = ["default"];
@@ -871,6 +891,16 @@
     };
     version = "3.5.0";
   };
+  reline = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sspfd5x8aq80pmkdj0dzd20iclhrdjan1ibkrivgk7j8af23hbk";
+      type = "gem";
+    };
+    version = "0.1.6";
+  };
   rex-arch = {
     groups = ["default"];
     platforms = [];
@@ -1006,10 +1036,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07vm17w791vdpr23aqp45kqsjbqgwpqj92a535h6n4fckxgzhg94";
+      sha256 = "1y6p1sw0wiw4x4dk89lwhf7vzsb0cjgpbr8hf7m119lg2kzm5g8y";
       type = "gem";
     };
-    version = "0.1.23";
+    version = "0.1.24";
   };
   rex-sslscan = {
     groups = ["default"];
@@ -1036,10 +1066,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17m5zwca15qsd7mqqhi2q530iwsrb7wkqh8qff7pxjxwlxbvsrxx";
+      sha256 = "0wx8pncrk7yb2zxxqaycm4ikvb577zj7rma8jdfi74a0c5119c44";
       type = "gem";
     };
-    version = "0.2.26";
+    version = "0.2.28";
   };
   rex-zip = {
     groups = ["default"];
@@ -1066,10 +1096,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1k5vvk9d13pixhbram6fs74ibgmr2dngv7bks13npcjb42q275if";
+      sha256 = "12khgv5hx90a4dxqca2hzbksalx9czb51bsz0bhq0czsql9pwby8";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   ruby-rc4 = {
     groups = ["default"];
@@ -1081,15 +1111,25 @@
     };
     version = "0.1.5";
   };
+  ruby2_keywords = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
   ruby_smb = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "125pimmaskp13nkk5j138nfk1kd8n91sfdlx4dhj2j9zk342wsf4";
+      sha256 = "0fsdnvisswchk27knii6ijq8sjsc7qm9jiffdsf71q195ga2qi66";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "2.0.6";
   };
   rubyntlm = {
     groups = ["default"];
@@ -1121,15 +1161,25 @@
     };
     version = "0.8.2";
   };
+  simpleidn = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b9v0xs4ksd68zckamv6rbrrqllpa9am0p29bycq9fxvlkqd7w2w";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
   sinatra = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
+      sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk";
       type = "gem";
     };
-    version = "1.4.8";
+    version = "2.1.0";
   };
   sqlite3 = {
     groups = ["default"];
@@ -1216,40 +1266,60 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kjywciambyhlkc8ijp3kkx4r24pi9zs7plmxw003mxr6mrhah1w";
+      sha256 = "02anabncgfjwsqn07ra9jdqvmi0a4yngzp6dfiz2yxb1m9qpdm4a";
       type = "gem";
     };
-    version = "1.2020.1";
+    version = "1.2020.4";
+  };
+  unf = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  unf_ext = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
+      type = "gem";
+    };
+    version = "0.0.7.7";
   };
   warden = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12";
+      sha256 = "1l7gl7vms023w4clg02pm4ky9j12la2vzsixi2xrv9imbn44ys26";
       type = "gem";
     };
-    version = "1.2.7";
+    version = "1.2.9";
   };
   websocket-driver = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
+      sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh";
       type = "gem";
     };
-    version = "0.7.1";
+    version = "0.7.3";
   };
   websocket-extensions = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
+      sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw";
       type = "gem";
     };
-    version = "0.1.4";
+    version = "0.1.5";
   };
   windows_error = {
     groups = ["default"];
@@ -1266,10 +1336,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0c5cp1k4ij3xq1q6fb0f6xv5b65wy18y7bhwvsdx8wd0zyg3x96m";
+      sha256 = "019yzxddyndc7m7basars0m380m27sfcq99vr5hk1ag4ymayqkwr";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "3.0.2";
   };
   xmlrpc = {
     groups = ["default"];

From f3fa188c02e4d1f8df77a07b762c270a32baa135 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 25 Oct 2020 21:35:33 +0100
Subject: [PATCH 0466/3942] metasploit: add passthru.updateScript

---
 pkgs/tools/security/metasploit/default.nix | 12 +++---------
 pkgs/tools/security/metasploit/update.sh   | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100755 pkgs/tools/security/metasploit/update.sh

diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index a51ccde13703..a2a0a28bbff6 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -1,14 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, ruby, bundlerEnv }:
 
-# Maintainer notes for updating:
-# 1. increment version number in expression and in Gemfile
-# 2. run $ nix-shell --command "bundler install && bundix"
-#    in metasploit in nixpkgs
-# 3. run $ sed -i '/[ ]*dependencies =/d' gemset.nix
-# 4. run $ nix-build -A metasploit ../../../../
-# 5. update sha256sum in expression
-# 6. run step 3 again
-
 let
   env = bundlerEnv {
     inherit ruby;
@@ -45,6 +36,9 @@ in stdenv.mkDerivation rec {
 
   '';
 
+  # run with: nix-shell maintainers/scripts/update.nix --argstr path metasploit
+  passthru.updateScript = ./update.sh;
+
   meta = with stdenv.lib; {
     description = "Metasploit Framework - a collection of exploits";
     homepage = "https://github.com/rapid7/metasploit-framework/wiki";
diff --git a/pkgs/tools/security/metasploit/update.sh b/pkgs/tools/security/metasploit/update.sh
new file mode 100755
index 000000000000..e4da457c6f57
--- /dev/null
+++ b/pkgs/tools/security/metasploit/update.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl bundix git libiconv libpcap libxml2 libxslt pkg-config postgresql ruby.devEnv sqlite xmlstarlet nix-update
+
+set -eu -o pipefail
+cd "$(dirname "$(readlink -f "$0")")"
+
+latest=$(curl https://github.com/rapid7/metasploit-framework/releases.atom | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | head -n1)
+echo "Updating metasploit to $latest"
+
+sed -i "s#refs/tags/.*#refs/tags/$latest\"#" Gemfile
+
+bundler install
+bundix
+sed -i '/[ ]*dependencies =/d' gemset.nix
+
+cd "../../../../"
+nix-update metasploit --version "$latest"

From b4a51441b80f1e5d4032e427669b6d4301c8515b Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Wed, 13 May 2020 13:55:45 +0200
Subject: [PATCH 0467/3942] ipfs-cluster: remove unused variables

---
 pkgs/applications/networking/ipfs-cluster/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index 09ab75aae94c..39f4d0d23343 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, fetchgx, gx-go }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "ipfs-cluster";

From 0e111847bc0c0d7061d2802cc3b38a871c7f42cf Mon Sep 17 00:00:00 2001
From: Serg Nesterov <i.am.cust0dian@gmail.com>
Date: Mon, 26 Oct 2020 00:24:00 +0300
Subject: [PATCH 0468/3942] pueue: 0.7.1 -> 0.8.1

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

diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix
index f5c237da440a..21cc9d7cf720 100644
--- a/pkgs/applications/misc/pueue/default.nix
+++ b/pkgs/applications/misc/pueue/default.nix
@@ -2,20 +2,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pueue";
-  version = "0.7.1";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "Nukesor";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ksks8c35q9aq5vnjxh480vqjyaa8c1fz1fb465vngnlyw762b22";
+    sha256 = "0rqnbils0r98qglhm2jafw5d119fqdzszmk825yc0bma4icm7xzp";
   };
 
-  cargoSha256 = "0v1h4jhrzfb55zmpnbq18188rdvx7a7lvnjqh0w7cy90kvxssian";
+  cargoSha256 = "1f3g5i0yh82qll1hyihrvv08pbd4h9vzs6jy6bf94bzabyjsgnzv";
 
   nativeBuildInputs = [ installShellFiles ];
 
-  checkFlagsArray = [ "--skip=test_single_huge_payload" ];
+  checkFlags = [ "--skip=test_single_huge_payload" "--skip=test_create_unix_socket" ];
 
   postInstall = ''
     # zsh completion generation fails. See: https://github.com/Nukesor/pueue/issues/57

From 29c5b32632f6f290eb6eb3637a85f1b4df8b510b Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sat, 29 Aug 2020 16:57:37 +0300
Subject: [PATCH 0469/3942] lsd2dsl: 0.5.1 -> 0.5.2

---
 pkgs/applications/misc/lsd2dsl/default.nix | 7 +++----
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix
index 335279c7084a..b30d652584f5 100644
--- a/pkgs/applications/misc/lsd2dsl/default.nix
+++ b/pkgs/applications/misc/lsd2dsl/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "lsd2dsl";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "nongeneric";
     repo = pname;
     rev = "v${version}";
-    sha256 = "100qd9i0x6r0nkw1ic2p0xjr16jlhinxkn1x7i98s4xmw4wyb8n8";
+    sha256 = "0s0la6zkg584is93p4nj1ha3pbnvadq84zgsv8nym3r35n7k8czi";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -19,8 +19,7 @@ mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces";
 
   installPhase = ''
-    install -Dm755 console/lsd2dsl $out/bin/lsd2dsl
-    install -m755 gui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui
+    install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin
   '' + lib.optionalString stdenv.isDarwin ''
     wrapQtApp $out/bin/lsd2dsl
     wrapQtApp $out/bin/lsd2dsl-qtgui
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9efc75240c02..487c5fa26b95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21898,7 +21898,7 @@ in
 
   loxodo = callPackage ../applications/misc/loxodo { };
 
-  lsd2dsl = libsForQt514.callPackage ../applications/misc/lsd2dsl { };
+  lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { };
 
   lrzsz = callPackage ../tools/misc/lrzsz { };
 

From 753f5ee01dcd50cacb9c353fcdd117b16e4d0e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 24 Oct 2020 15:37:59 +0200
Subject: [PATCH 0470/3942] nextcloud: 20.0.0 -> 20.0.1

---
 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 fa17e10da7b9..a072536dbfd8 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -51,7 +51,7 @@ in {
   };
 
   nextcloud20 = generic {
-    version = "20.0.0";
-    sha256 = "1n2cv1i56g6qpzkbl5xaf420zzr4y7isg0lskmr7ymk83way0wx2";
+    version = "20.0.1";
+    sha256 = "1z1fzz1i41k4dhdhi005l3gzkvnmmgqqz3rdr374cvk73q7bbiln";
   };
 }

From b7a2a5f967a75bba3a39b709e0053b30b93779cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 24 Oct 2020 15:22:12 +0200
Subject: [PATCH 0471/3942] nixos/nextcloud: fix several php endpoints

---
 nixos/modules/services/web-apps/nextcloud.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index bad1bd9c767d..53c2ab76fdfa 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -549,9 +549,7 @@ in {
           };
           "/" = {
             priority = 900;
-            extraConfig = if major < 20
-              then "rewrite ^ /index.php;"
-              else "try_files $uri $uri/ /index.php$request_uri;";
+            extraConfig = "rewrite ^ /index.php;";
           };
           "~ ^/store-apps" = {
             priority = 201;
@@ -575,7 +573,7 @@ in {
           "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)".extraConfig = ''
             return 404;
           '';
-          ${if major < 20 then "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" else "~ \\.php(?:$|/)"} = {
+          "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" = {
             priority = 500;
             extraConfig = ''
               include ${config.services.nginx.package}/conf/fastcgi.conf;

From 336bc8283bd4ef288e60c5fdb1b67196b9ea5c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 26 Oct 2020 08:17:14 +0100
Subject: [PATCH 0472/3942] Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"

This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
---
 doc/stdenv/stdenv.xml                         |    7 +-
 .../graphics/graphicsmagick/default.nix       |    6 +-
 pkgs/applications/misc/klayout/default.nix    |    2 +-
 .../applications/science/logic/z3/default.nix |    3 +-
 .../git-and-tools/git/default.nix             |    4 +-
 .../install-shell-files/default.nix           |   12 +-
 .../setup-hooks/install-shell-files.sh        |  127 +-
 pkgs/data/misc/tzdata/default.nix             |    6 +-
 pkgs/development/compilers/dmd/binary.nix     |    3 +-
 pkgs/development/compilers/gcc/builder.sh     |    7 +-
 pkgs/development/compilers/ldc/binary.nix     |    3 +-
 .../compilers/llvm/10/clang/default.nix       |    6 +-
 .../compilers/llvm/10/libc++/default.nix      |    5 +-
 .../compilers/llvm/11/clang/default.nix       |    6 +-
 .../compilers/llvm/5/clang/default.nix        |    6 +-
 .../compilers/llvm/5/libc++/default.nix       |    6 +-
 .../compilers/llvm/6/clang/default.nix        |    6 +-
 .../compilers/llvm/6/libc++/default.nix       |    6 +-
 .../compilers/llvm/7/clang/default.nix        |    6 +-
 .../compilers/llvm/7/libc++/default.nix       |    7 +-
 .../compilers/llvm/8/clang/default.nix        |    6 +-
 .../compilers/llvm/8/libc++/default.nix       |    5 +-
 .../compilers/llvm/9/clang/default.nix        |    6 +-
 .../compilers/llvm/9/libc++/default.nix       |    5 +-
 .../purescript/psc-package/default.nix        |   10 +-
 .../compilers/rust/{1_46.nix => 1_47.nix}     |   20 +-
 pkgs/development/compilers/rust/binary.nix    |   12 +-
 .../interpreters/ruby/rubygems/default.nix    |    4 +-
 pkgs/development/libraries/atk/default.nix    |    5 +-
 pkgs/development/libraries/boost/generic.nix  |    4 +-
 .../libraries/cyrus-sasl/default.nix          |    3 +-
 pkgs/development/libraries/enchant/2.x.nix    |    4 +-
 pkgs/development/libraries/expat/default.nix  |   12 +-
 .../libraries/freetype/default.nix            |    4 +-
 .../gamin/abstract-socket-namespace.patch     |   73 ++
 pkgs/development/libraries/gamin/default.nix  |   10 +-
 .../libraries/gdk-pixbuf/default.nix          |    4 +-
 pkgs/development/libraries/glfw/3.x.nix       |    5 +-
 .../libraries/harfbuzz/default.nix            |    4 +-
 pkgs/development/libraries/icu/base.nix       |    2 +-
 .../libraries/jbig2dec/default.nix            |    6 +-
 .../libraries/json-glib/default.nix           |    4 +-
 .../development/libraries/leveldb/default.nix |    2 +-
 pkgs/development/libraries/libLAS/default.nix |    4 +-
 .../development/libraries/libcbor/default.nix |   10 +-
 .../libraries/libevent/default.nix            |    5 +-
 .../libraries/libinput/default.nix            |   15 +-
 ...019-9325.CVE-2019-9371.CVE-2019-9433.patch |  211 ---
 pkgs/development/libraries/libvpx/default.nix |   22 +-
 .../development/libraries/libwebp/default.nix |   15 +-
 pkgs/development/libraries/mesa/default.nix   |    7 +-
 ...include-dri-driver-path-in-cache-key.patch |   29 +-
 .../link-radv-with-ld_args_build_id.patch     |   25 -
 .../libraries/mesa/missing-includes.patch     |   12 -
 pkgs/development/libraries/nss/3.44.nix       |    6 +-
 pkgs/development/libraries/nss/default.nix    |    5 +-
 pkgs/development/libraries/odpic/default.nix  |    2 +-
 .../development/libraries/openssl/default.nix |    4 +-
 .../development/libraries/p11-kit/default.nix |    7 +
 pkgs/development/libraries/tiledb/default.nix |    4 +-
 pkgs/development/libraries/zeromq/4.x.nix     |   10 +-
 .../python-modules/arrow/default.nix          |    4 +-
 .../python-modules/pycairo/default.nix        |   24 +-
 .../tools/build-managers/cmake/default.nix    |   19 +-
 ...boost-Do-not-add-system-paths-on-nix.patch |   40 +
 .../tools/build-managers/meson/default.nix    |    5 +
 pkgs/development/tools/misc/ycmd/default.nix  |    5 +-
 ...2364-Fix-missing-echogs-dependencies.patch |  835 ------------
 pkgs/misc/ghostscript/default.nix             |   24 +-
 pkgs/misc/sndio/default.nix                   |    4 +-
 pkgs/os-specific/linux/apparmor/default.nix   |   13 +-
 pkgs/os-specific/linux/iproute/default.nix    |    8 +-
 pkgs/os-specific/linux/libcap/default.nix     |    5 +-
 pkgs/os-specific/linux/systemd/default.nix    |  106 +-
 pkgs/servers/sql/mariadb/default.nix          |    5 +-
 pkgs/servers/x11/xorg/default.nix             |   36 +-
 pkgs/servers/x11/xorg/overrides.nix           |    7 -
 pkgs/servers/x11/xorg/tarballs.list           |   12 +-
 pkgs/shells/bash/bash-completion/default.nix  |    4 +-
 pkgs/stdenv/darwin/default.nix                |    5 +-
 pkgs/test/default.nix                         |    2 +
 pkgs/test/install-shell-files/default.nix     |  125 ++
 pkgs/tools/compression/brotli/default.nix     |   13 +-
 ...id-false-positive-in-date-debug-test.patch |   52 -
 .../coreutils-8.31-android-cross.patch        |   51 -
 .../coreutils/coreutils-8.31-musl-cross.patch | 1153 -----------------
 pkgs/tools/misc/coreutils/default.nix         |   11 +-
 pkgs/tools/networking/curl/default.nix        |    4 +-
 pkgs/tools/networking/unbound/default.nix     |    4 +-
 pkgs/tools/security/sudolikeaboss/default.nix |    5 +-
 pkgs/top-level/all-packages.nix               |   37 +-
 pkgs/top-level/python-packages.nix            |    2 +-
 92 files changed, 771 insertions(+), 2686 deletions(-)
 rename pkgs/development/compilers/rust/{1_46.nix => 1_47.nix} (58%)
 create mode 100644 pkgs/development/libraries/gamin/abstract-socket-namespace.patch
 delete mode 100644 pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
 delete mode 100644 pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch
 create mode 100644 pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch
 delete mode 100644 pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch
 create mode 100644 pkgs/test/install-shell-files/default.nix
 delete mode 100644 pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch
 delete mode 100644 pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch
 delete mode 100644 pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch

diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml
index 4c069b57edd7..46ee97927eac 100644
--- a/doc/stdenv/stdenv.xml
+++ b/doc/stdenv/stdenv.xml
@@ -2070,7 +2070,7 @@ nativeBuildInputs = [ breakpointHook ];
        The <literal>installManPage</literal> function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with <literal>.gz</literal> suffix). This function will place them into the correct directory.
       </para>
       <para>
-       The <literal>installShellCompletion</literal> function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of <literal>--bash</literal>, <literal>--fish</literal>, or <literal>--zsh</literal>. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag <literal>--name NAME</literal> before the path. If this flag is not provided, zsh completions will be renamed automatically such that <literal>foobar.zsh</literal> becomes <literal>_foobar</literal>.
+       The <literal>installShellCompletion</literal> function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of <literal>--bash</literal>, <literal>--fish</literal>, or <literal>--zsh</literal>. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag <literal>--name NAME</literal> before the path. If this flag is not provided, zsh completions will be renamed automatically such that <literal>foobar.zsh</literal> becomes <literal>_foobar</literal>. A root name may be provided for all paths using the flag <literal>--cmd NAME</literal>; this synthesizes the appropriate name depending on the shell (e.g. <literal>--cmd foo</literal> will synthesize the name <literal>foo.bash</literal> for bash and <literal>_foo</literal> for zsh). The path may also be a fifo or named fd (such as produced by <literal>&lt;(cmd)</literal>), in which case the shell and name must be provided.
 <programlisting>
 nativeBuildInputs = [ installShellFiles ];
 postInstall = ''
@@ -2081,6 +2081,11 @@ postInstall = ''
   installShellCompletion --zsh --name _foobar share/completions.zsh
   # implicit behavior
   installShellCompletion share/completions/foobar.{bash,fish,zsh}
+  # using named fd
+  installShellCompletion --cmd foobar \
+    --bash &lt;($out/bin/foobar --bash-completion) \
+    --fish &lt;($out/bin/foobar --fish-completion) \
+    --zsh &lt;($out/bin/foobar --zsh-completion)
 '';
 </programlisting>
       </para>
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index b7a1a8c4a6f9..b8b21e71c930 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2
       zlib libtool libwebp
-    ]
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    ];
 
-  nativeBuildInputs = [ xz ];
+  nativeBuildInputs = [ xz ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   postInstall = ''
     sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix
index 5f6c679f3ba1..0a8d7ce547f3 100644
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -1,6 +1,6 @@
 { lib, mkDerivation, fetchFromGitHub, fetchpatch
 , python, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns
-, which, perl, makeWrapper, fixDarwinDylibNames
+, which, perl, makeWrapper
 }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 88aafcdae222..dd71cf2cb1a8 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx";
   };
 
-  buildInputs = [ python fixDarwinDylibNames ]
+  nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  buildInputs = [ python ]
   ++ optional javaBindings jdk
   ++ optionals ocamlBindings [ ocaml findlib zarith ]
   ;
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 7e40366142a9..c54a9160f6de 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -22,7 +22,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.28.0";
+  version = "2.29.1";
   svn = subversionClient.override { perlBindings = perlSupport; };
 
   gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "17a311vzimqn1glc9d7x82rhb1mb81m5rr4g8xji8idaafid39fz";
+    sha256 = "1cxd2h0k6bhv25avnk40h0pahgc7vgs37dc6kmln3pfhjyb6019h";
   };
 
   outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc";
diff --git a/pkgs/build-support/install-shell-files/default.nix b/pkgs/build-support/install-shell-files/default.nix
index e1f2e24dd875..d50661ddc65d 100644
--- a/pkgs/build-support/install-shell-files/default.nix
+++ b/pkgs/build-support/install-shell-files/default.nix
@@ -1,4 +1,12 @@
-{ makeSetupHook }:
+{ makeSetupHook, tests }:
 
 # See the header comment in ../setup-hooks/install-shell-files.sh for example usage.
-makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh
+let
+  setupHook = makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh;
+in
+
+setupHook.overrideAttrs (oldAttrs: {
+  passthru = (oldAttrs.passthru or {}) // {
+    tests = tests.install-shell-files;
+  };
+})
diff --git a/pkgs/build-support/setup-hooks/install-shell-files.sh b/pkgs/build-support/setup-hooks/install-shell-files.sh
index e0ea1f7f30a7..194b408b1050 100644
--- a/pkgs/build-support/setup-hooks/install-shell-files.sh
+++ b/pkgs/build-support/setup-hooks/install-shell-files.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+# shellcheck shell=bash
 # Setup hook for the `installShellFiles` package.
 #
 # Example usage in a derivation:
@@ -19,8 +19,8 @@
 # installManPage <path> [...<path>]
 #
 # Each argument is checked for its man section suffix and installed into the appropriate
-# share/man<n>/ directory. The function returns an error if any paths don't have the man section
-# suffix (with optional .gz compression).
+# share/man/man<n>/ directory. The function returns an error if any paths don't have the man
+# section suffix (with optional .gz compression).
 installManPage() {
     local path
     for path in "$@"; do
@@ -49,7 +49,7 @@ installManPage() {
     done
 }
 
-# installShellCompletion [--bash|--fish|--zsh] ([--name <name>] <path>)...
+# installShellCompletion [--cmd <name>] ([--bash|--fish|--zsh] [--name <name>] <path>)...
 #
 # Each path is installed into the appropriate directory for shell completions for the given shell.
 # If one of `--bash`, `--fish`, or `--zsh` is given the path is assumed to belong to that shell.
@@ -61,9 +61,20 @@ installManPage() {
 # If the shell completion needs to be renamed before installing the optional `--name <name>` flag
 # may be given. Any name provided with this flag only applies to the next path.
 #
+# If all shell completions need to be renamed before installing the optional `--cmd <name>` flag
+# may be given. This will synthesize a name for each file, unless overridden with an explicit
+# `--name` flag. For example, `--cmd foobar` will synthesize the name `_foobar` for zsh and
+# `foobar.bash` for bash.
+#
 # For zsh completions, if the `--name` flag is not given, the path will be automatically renamed
 # such that `foobar.zsh` becomes `_foobar`.
 #
+# A path may be a named fd, such as produced by the bash construct `<(cmd)`. When using a named fd,
+# the shell type flag must be provided, and either the `--name` or `--cmd` flag must be provided.
+# This might look something like:
+#
+#   installShellCompletion --zsh --name _foobar <($out/bin/foobar --zsh-completion)
+#
 # This command accepts multiple shell flags in conjunction with multiple paths if you wish to
 # install them all in one command:
 #
@@ -76,9 +87,16 @@ installManPage() {
 #   installShellCompletion --fish --name foobar.fish share/completions.fish
 #   installShellCompletion --zsh --name _foobar share/completions.zsh
 #
+# Or to use shell newline escaping to split a single invocation across multiple lines:
+#
+#   installShellCompletion --cmd foobar \
+#     --bash <($out/bin/foobar --bash-completion) \
+#     --fish <($out/bin/foobar --fish-completion) \
+#     --zsh <($out/bin/foobar --zsh-completion)
+#
 # If any argument is `--` the remaining arguments will be treated as paths.
 installShellCompletion() {
-    local shell='' name='' retval=0 parseArgs=1 arg
+    local shell='' name='' cmdname='' retval=0 parseArgs=1 arg
     while { arg=$1; shift; }; do
         # Parse arguments
         if (( parseArgs )); then
@@ -97,6 +115,17 @@ installShellCompletion() {
                 # treat `--name=foo` the same as `--name foo`
                 name=${arg#--name=}
                 continue;;
+            --cmd)
+                cmdname=$1
+                shift || {
+                    echo 'installShellCompletion: error: --cmd flag expected an argument' >&2
+                    return 1
+                }
+                continue;;
+            --cmd=*)
+                # treat `--cmd=foo` the same as `--cmd foo`
+                cmdname=${arg#--cmd=}
+                continue;;
             --?*)
                 echo "installShellCompletion: warning: unknown flag ${arg%%=*}" >&2
                 retval=2
@@ -110,39 +139,67 @@ installShellCompletion() {
         if (( "${NIX_DEBUG:-0}" >= 1 )); then
             echo "installShellCompletion: installing $arg${name:+ as $name}"
         fi
-        # if we get here, this is a path
-        # Identify shell
-        local basename
-        basename=$(stripHash "$arg")
+        # if we get here, this is a path or named pipe
+        # Identify shell and output name
         local curShell=$shell
-        if [[ -z "$curShell" ]]; then
-            # auto-detect the shell
-            case "$basename" in
-            ?*.bash) curShell=bash;;
-            ?*.fish) curShell=fish;;
-            ?*.zsh) curShell=zsh;;
-            *)
-                if [[ "$basename" = _* && "$basename" != *.* ]]; then
-                    # probably zsh
-                    echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2
-                    curShell=zsh
-                else
-                    echo "installShellCompletion: warning: unknown shell for path: $arg" >&2
-                    retval=2
-                    continue
-                fi;;
-            esac
+        local outName=''
+        if [[ -z "$arg" ]]; then
+            echo "installShellCompletion: error: empty path is not allowed" >&2
+            return 1
+        elif [[ -p "$arg" ]]; then
+            # this is a named fd or fifo
+            if [[ -z "$curShell" ]]; then
+                echo "installShellCompletion: error: named pipe requires one of --bash, --fish, or --zsh" >&2
+                return 1
+            elif [[ -z "$name" && -z "$cmdname" ]]; then
+                echo "installShellCompletion: error: named pipe requires one of --cmd or --name" >&2
+                return 1
+            fi
+        else
+            # this is a path
+            local argbase
+            argbase=$(stripHash "$arg")
+            if [[ -z "$curShell" ]]; then
+                # auto-detect the shell
+                case "$argbase" in
+                ?*.bash) curShell=bash;;
+                ?*.fish) curShell=fish;;
+                ?*.zsh) curShell=zsh;;
+                *)
+                    if [[ "$argbase" = _* && "$argbase" != *.* ]]; then
+                        # probably zsh
+                        echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2
+                        curShell=zsh
+                    else
+                        echo "installShellCompletion: warning: unknown shell for path: $arg" >&2
+                        retval=2
+                        continue
+                    fi;;
+                esac
+            fi
+            outName=$argbase
         fi
         # Identify output path
-        local outName sharePath
-        outName=${name:-$basename}
+        if [[ -n "$name" ]]; then
+            outName=$name
+        elif [[ -n "$cmdname" ]]; then
+            case "$curShell" in
+            bash|fish) outName=$cmdname.$curShell;;
+            zsh) outName=_$cmdname;;
+            *)
+                # Our list of shells is out of sync with the flags we accept or extensions we detect.
+                echo 'installShellCompletion: internal error' >&2
+                return 1;;
+            esac
+        fi
+        local sharePath
         case "$curShell" in
         bash) sharePath=bash-completion/completions;;
         fish) sharePath=fish/vendor_completions.d;;
         zsh)
             sharePath=zsh/site-functions
             # only apply automatic renaming if we didn't have a manual rename
-            if test -z "$name"; then
+            if [[ -z "$name" && -z "$cmdname" ]]; then
                 # convert a name like `foo.zsh` into `_foo`
                 outName=${outName%.zsh}
                 outName=_${outName#_}
@@ -153,8 +210,16 @@ installShellCompletion() {
             return 1;;
         esac
         # Install file
-        install -Dm644 -T "$arg" "${!outputBin:?}/share/$sharePath/$outName" || return
-        # Clear the name, it only applies to one path
+        local outDir="${!outputBin:?}/share/$sharePath"
+        local outPath="$outDir/$outName"
+        if [[ -p "$arg" ]]; then
+            # install handles named pipes on NixOS but not on macOS
+            mkdir -p "$outDir" \
+            && cat "$arg" > "$outPath"
+        else
+            install -Dm644 -T "$arg" "$outPath"
+        fi || return
+        # Clear the per-path flags
         name=
     done
     if [[ -n "$name" ]]; then
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 367ee06390cd..dc80580ff5ec 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "tzdata";
-  version = "2019c";
+  version = "2020c";
 
   srcs =
     [ (fetchurl {
         url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
-        sha256 = "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr";
+        sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q";
       })
       (fetchurl {
         url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
-        sha256 = "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn";
+        sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs";
       })
     ];
 
diff --git a/pkgs/development/compilers/dmd/binary.nix b/pkgs/development/compilers/dmd/binary.nix
index cd3a15889b21..2ff2b35060b8 100644
--- a/pkgs/development/compilers/dmd/binary.nix
+++ b/pkgs/development/compilers/dmd/binary.nix
@@ -17,7 +17,8 @@ in mkDerivation {
   dontConfigure = true;
   dontBuild = true;
 
-  nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ];
+  nativeBuildInputs = [ autoPatchelfHook ]
+    ++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames;
   propagatedBuildInputs = [ curl tzdata ] ++ lib.optional hostPlatform.isLinux glibc;
 
   installPhase = ''
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index 2204744a4b59..e1c4768413f4 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -287,7 +287,12 @@ postInstall() {
     done
 
     # Two identical man pages are shipped (moving and compressing is done later)
-    ln -sf gcc.1 "$out"/share/man/man1/g++.1
+    for i in "$out"/share/man/man1/*g++.1; do
+        if test -e "$i"; then
+            man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"`
+            ln -sf "$man_prefix"gcc.1 "$i"
+        fi
+    done
 }
 
 genericBuild
diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix
index 56d40be86194..cbdb56efb17f 100644
--- a/pkgs/development/compilers/ldc/binary.nix
+++ b/pkgs/development/compilers/ldc/binary.nix
@@ -17,7 +17,8 @@ in mkDerivation {
   dontConfigure = true;
   dontBuild = true;
 
-  nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ];
+  nativeBuildInputs = [ autoPatchelfHook ]
+    ++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxml2 stdenv.cc.cc ];
 
diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix
index a3d6e7e402ab..fef7720d726d 100644
--- a/pkgs/development/compilers/llvm/10/clang/default.nix
+++ b/pkgs/development/compilers/llvm/10/clang/default.nix
@@ -19,10 +19,10 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 lld ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
+      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
+      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-    buildInputs = [ libxml2 llvm ]
-      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    buildInputs = [ libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++14"
diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix
index 651f1887553d..95711903932e 100644
--- a/pkgs/development/compilers/llvm/10/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/10/libc++/default.nix
@@ -21,9 +21,10 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3;
+    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  buildInputs = [ libcxxabi ];
 
   cmakeFlags = [
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix
index 4f5e20cfe770..2de5f65b4a13 100644
--- a/pkgs/development/compilers/llvm/11/clang/default.nix
+++ b/pkgs/development/compilers/llvm/11/clang/default.nix
@@ -20,10 +20,10 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 lld ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
+      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
+      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-    buildInputs = [ libxml2 llvm ]
-      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    buildInputs = [ libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++14"
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index cd7d952243ce..b5e7b54fa5be 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -19,10 +19,10 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
+      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
+      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-    buildInputs = [ libxml2 llvm ]
-      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    buildInputs = [ libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index f8185fc3ff4b..9bebedbc0442 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -25,9 +25,11 @@ stdenv.mkDerivation {
   '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patchShebangs utils/cat_files.py
   '';
-  nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3;
+  nativeBuildInputs = [ cmake ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  buildInputs = [ libcxxabi ];
 
   cmakeFlags = [
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 8f6479fe2f4e..ec3effebfd77 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -19,10 +19,10 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
+      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
+      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-    buildInputs = [ libxml2 llvm ]
-      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    buildInputs = [ libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index a922bcfaf0ea..727a32260872 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -25,9 +25,11 @@ stdenv.mkDerivation {
   '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patchShebangs utils/cat_files.py
   '';
-  nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3;
+  nativeBuildInputs = [ cmake ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  buildInputs = [ libcxxabi ];
 
   cmakeFlags = [
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix
index 905ec862ad7e..969938681fe9 100644
--- a/pkgs/development/compilers/llvm/7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/7/clang/default.nix
@@ -20,10 +20,10 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
+      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
+      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-    buildInputs = [ libxml2 llvm lld ]
-      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    buildInputs = [ libxml2 llvm lld ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index 83c05cf0e634..76baadf1c6e9 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -24,9 +24,12 @@ stdenv.mkDerivation {
   '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     patchShebangs utils/cat_files.py
   '';
-  nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3;
 
-  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ cmake ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+
+  buildInputs = [ libcxxabi ] ;
 
   cmakeFlags = [
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix
index 2d7fc8068900..5c1dca5e33b1 100644
--- a/pkgs/development/compilers/llvm/8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/8/clang/default.nix
@@ -20,10 +20,10 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
+      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
+      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-    buildInputs = [ libxml2 llvm lld ]
-      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    buildInputs = [ libxml2 llvm lld ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix
index 9c0c7951c794..01e0d8e008cb 100644
--- a/pkgs/development/compilers/llvm/8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/8/libc++/default.nix
@@ -25,9 +25,10 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3;
+    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  buildInputs = [ libcxxabi ];
 
   cmakeFlags = [
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix
index 81117e904d82..cfaee05944ca 100644
--- a/pkgs/development/compilers/llvm/9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/9/clang/default.nix
@@ -20,10 +20,10 @@ let
     '';
 
     nativeBuildInputs = [ cmake python3 ]
-      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
+      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
+      ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-    buildInputs = [ libxml2 llvm lld ]
-      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    buildInputs = [ libxml2 llvm lld ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix
index cec6de61ca99..c9f0e6254ab4 100644
--- a/pkgs/development/compilers/llvm/9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/9/libc++/default.nix
@@ -21,9 +21,10 @@ stdenv.mkDerivation {
     patchShebangs utils/cat_files.py
   '';
   nativeBuildInputs = [ cmake ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3;
+    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  buildInputs = [ libcxxabi ];
 
   cmakeFlags = [
     "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix
index 0bebd5d2f50d..88f7adce5a1a 100644
--- a/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/pkgs/development/compilers/purescript/psc-package/default.nix
@@ -44,12 +44,10 @@ stdenv.mkDerivation rec {
   '' + ''
     chmod u-w $PSC_PACKAGE
 
-    $PSC_PACKAGE --bash-completion-script $PSC_PACKAGE > psc-package.bash
-    $PSC_PACKAGE --fish-completion-script $PSC_PACKAGE > psc-package.fish
-    $PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE > _psc-package
-    installShellCompletion \
-      psc-package.{bash,fish} \
-      --zsh _psc-package
+    installShellCompletion --cmd psc-package \
+      --bash <($PSC_PACKAGE --bash-completion-script $PSC_PACKAGE) \
+      --fish <($PSC_PACKAGE --fish-completion-script $PSC_PACKAGE) \
+      --zsh <($PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE)
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/compilers/rust/1_46.nix b/pkgs/development/compilers/rust/1_47.nix
similarity index 58%
rename from pkgs/development/compilers/rust/1_46.nix
rename to pkgs/development/compilers/rust/1_47.nix
index c999b346ee6f..e5cbae193bf1 100644
--- a/pkgs/development/compilers/rust/1_46.nix
+++ b/pkgs/development/compilers/rust/1_47.nix
@@ -19,24 +19,24 @@
 } @ args:
 
 import ./default.nix {
-  rustcVersion = "1.46.0";
-  rustcSha256 = "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid";
+  rustcVersion = "1.47.0";
+  rustcSha256 = "sha256-MYXfBkxHR/LIubuMRGjt1Y/0rW0HiAyHmsGxc7do2B0=";
 
   # Note: the version MUST be one version prior to the version we're
   # building
-  bootstrapVersion = "1.45.2";
+  bootstrapVersion = "1.46.0";
 
   # fetch hashes by running `print-hashes.sh 1.45.2`
   bootstrapHashes = {
-    i686-unknown-linux-gnu = "5b2050dde23152750de89f7e59acaab6bf088d0beb5854c69c9a545fd254b936";
-    x86_64-unknown-linux-gnu = "860feed955726a4d96ffe40758a110053326b9ae11c9e1ee059e9c6222f25643";
-    arm-unknown-linux-gnueabihf = "ddb5f59bbdef84e0b7c83049461e003ed031dd881a4622365c3d475102535c60";
-    armv7-unknown-linux-gnueabihf = "7a556581f87602705f9c89b04cce621cfbba9050b6fbe478166e91d164567531";
-    aarch64-unknown-linux-gnu = "151fad66442d28a4e4786753d1afb559c4a3d359081c64769273a31c2f0f4d30";
-    x86_64-apple-darwin = "6e8067624ede10aa23081d62e0086c6f42f7228cc0d00fb5ff24d4dac65249d6";
+    i686-unknown-linux-gnu = "6ebd7e04dc18a36d08b9731cdb42d5caf8460e1eb41b75f3a8596c39f5e71206";
+    x86_64-unknown-linux-gnu = "e3b98bc3440fe92817881933f9564389eccb396f5f431f33d48b979fa2fbdcf5";
+    arm-unknown-linux-gnueabihf = "bb8af68565321f54608e918597083eb016ed0f9f4f3cc23f7cc5f467b934ce7f";
+    armv7-unknown-linux-gnueabihf = "7c0640879d7f2c38db60352e3c0f09e3fc6fa3bac6ca8f22cbccb1eb5e950121";
+    aarch64-unknown-linux-gnu = "f0c6d630f3dedb3db69d69ed9f833aa6b472363096f5164f1068c7001ca42aeb";
+    x86_64-apple-darwin = "82d61582a3772932432a99789c3b3bd4abe6baca339e355048ca9efb9ea5b4db";
   };
 
-  selectRustPackage = pkgs: pkgs.rust_1_46;
+  selectRustPackage = pkgs: pkgs.rust_1_47;
 
   rustcPatches = [
   ];
diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix
index 9ae7e51e5fef..b84e390e0b0d 100644
--- a/pkgs/development/compilers/rust/binary.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, bash, curl, darwin
+{ stdenv, makeWrapper, bash, curl, darwin, zlib
 , version
 , src
 , platform
@@ -42,17 +42,23 @@ rec {
       ./install.sh --prefix=$out \
         --components=${installComponents}
 
-      ${optionalString (stdenv.isLinux && bootstrapping) ''
+      ${optionalString (stdenv.isLinux && bootstrapping) (''
         patchelf \
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
           "$out/bin/rustc"
+        '' + optionalString (stdenv.lib.versionAtLeast version "1.46")
+        # rustc bootstrap needs libz starting from 1.46
+        ''
+          ln -s ${zlib}/lib/libz.so.1 $out/lib/libz.so.1
+          ln -s ${zlib}/lib/libz.so $out/lib/libz.so
+        '' + ''
         patchelf \
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
           "$out/bin/rustdoc"
         patchelf \
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
           "$out/bin/cargo"
-      ''}
+      '')}
 
       # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
       # (or similar) here. It causes strange effects where rustc loads
diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index 0bbcadba3f51..8263a987d639 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "rubygems";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchurl {
     url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
-    sha256 = "0h7ij4jpj8rgnpkl63cwh2lnav73pw5wpfqra3va7077lsyadlgd";
+    sha256 = "181wjclxnq5lrwnr53famy9pg8911hi9w2v0vy7dqgjqnc4iy1hp";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index b54ba5313011..aa132515b3e9 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -17,9 +17,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
-
-  nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [
     # Required by atk.pc
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 8295be238fc5..a195a2c7bb98 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -146,11 +146,11 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ which ];
+  nativeBuildInputs = [ which ]
+    ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   buildInputs = [ expat zlib bzip2 libiconv ]
     ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu
-    ++ optional stdenv.isDarwin fixDarwinDylibNames
     ++ optional enablePython python
     ++ optional enableNumpy python.pkgs.numpy;
 
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 1ffb53599924..cd3fa3bb7fd2 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames pruneLibtoolFiles ];
+  nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs =
     [ openssl db gettext kerberos ]
     ++ lib.optional enableLdap openldap
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index b7b86de92c01..cbc3f2173260 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "enchant";
-  version = "2.2.11";
+  version = "2.2.12";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "opxXd8TkX8rCWVwVxJ1tKqQ0+l58mT3/P582e2X+Ryo=";
+    sha256 = "0zi20s62gax9rkhwj318kqrxa62pmks6dsdd6m9pzvhlwy5cb6vb";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index a356d7be1a9e..29d2c2b3acb9 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, lib }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-stdenv.mkDerivation rec {
-  name = "expat-2.2.8";
+let
+  version = "2.2.10";
+in stdenv.mkDerivation rec {
+  name = "expat-${version}";
 
   src = fetchurl {
-    url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_8/${name}.tar.xz";
-    sha256 = "16vpj5mk3lps3x7fr8cs03rffx3ir4jilyqw0frayn6q94daijk1";
+    url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${name}.tar.xz";
+    sha256 = "sha256-Xf5Tj4tbY/A+mO2sUg19mmpNIuSC5cltTQb8xUhcJfI=";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 24757af09e3d..b87e64c2afbf 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -14,7 +14,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "freetype";
-  version = "2.10.2";
+  version = "2.10.4";
 
   meta = with stdenv.lib; {
     description = "A font rendering engine";
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "12rd181yzz6952cyjqaa4253f5szam93cmhw18p33rnj4l8dchqm";
+    sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46";
   };
 
   propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
diff --git a/pkgs/development/libraries/gamin/abstract-socket-namespace.patch b/pkgs/development/libraries/gamin/abstract-socket-namespace.patch
new file mode 100644
index 000000000000..ff1610559721
--- /dev/null
+++ b/pkgs/development/libraries/gamin/abstract-socket-namespace.patch
@@ -0,0 +1,73 @@
+From 737452159d521aef2041a2767f3ebf9f68f4b6a9 Mon Sep 17 00:00:00 2001
+From: Christian Kampka <christian@kampka.net>
+Date: Tue, 1 Sep 2020 13:54:35 +0200
+Subject: [PATCH] Pin abstract namespace sockets to host_os
+
+Running programs with AC_RUN_IFELSE fails when cross-compiling.
+Since abstract namespace sockets are linux feature, we can easily
+assume it is available for linux and not for darwin.
+---
+ configure.in | 47 ++++++-----------------------------------------
+ 1 file changed, 6 insertions(+), 41 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index eb129db..0ed82ba 100644
+--- a/configure.in
++++ b/configure.in
+@@ -387,47 +387,12 @@ fi
+ 
+ #### Abstract sockets
+ 
+-AC_MSG_CHECKING(abstract socket namespace)
+-AC_LANG_PUSH(C)
+-AC_RUN_IFELSE([AC_LANG_PROGRAM(
+-[[
+-#include <sys/types.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <stdio.h>
+-#include <sys/socket.h>
+-#include <sys/un.h>
+-#include <errno.h>
+-]],
+-[[
+-  int listen_fd;
+-  struct sockaddr_un addr;
+-  
+-  listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
+-  
+-  if (listen_fd < 0)
+-    {
+-      fprintf (stderr, "socket() failed: %s\n", strerror (errno));
+-      exit (1);
+-    }
+-
+-  memset (&addr, '\0', sizeof (addr));
+-  addr.sun_family = AF_UNIX;
+-  strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test");
+-  addr.sun_path[0] = '\0'; /* this is what makes it abstract */
+-  
+-  if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0)
+-    {
+-       fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", 
+-                strerror (errno));
+-       exit (1);
+-    }
+-  else 
+-    exit (0);
+-]])],
+-              [have_abstract_sockets=yes],
+-              [have_abstract_sockets=no])
+-AC_LANG_POP(C)
++AC_MSG_CHECKING([whether target os has abstract socket namespace])
++if test x$target_os = xlinux-gnu ; then
++    have_abstract_sockets=yes
++else
++    have_abstract_sockets=no
++fi	
+ AC_MSG_RESULT($have_abstract_sockets)
+ 
+ if test x$enable_abstract_sockets = xyes; then
+-- 
+2.25.4
+
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index 38451571d8b6..89096c887450 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, glib }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }:
 
-stdenv.mkDerivation (rec {
+let
+  cross = stdenv.hostPlatform != stdenv.buildPlatform;
+in stdenv.mkDerivation (rec {
   name = "gamin-0.1.10";
 
   src = fetchurl {
@@ -8,7 +10,7 @@ stdenv.mkDerivation (rec {
     sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
 
   buildInputs = [ glib ];
 
@@ -27,7 +29,7 @@ stdenv.mkDerivation (rec {
       name = "fix-pthread-mutex.patch";
       url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8";
       sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz";
-    });
+    }) ++ stdenv.lib.optional (cross) ./abstract-socket-namespace.patch ;
 
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 1f4bc5c12ada..9b2fd0b778bf 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -61,9 +61,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
     makeWrapper
     glib
-  ] ++ stdenv.lib.optional stdenv.isDarwin [
-    fixDarwinDylibNames
-  ];
+  ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [
     glib
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index 1b9fcb9586b3..fbc1cb818ca8 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -18,10 +18,11 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ libGL ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ]
+    ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ libX11 libXrandr libXinerama libXcursor libXi libXext ]
-    ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel fixDarwinDylibNames ];
+    ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ];
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
 
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 8110f13d14ca..6c5703f521d7 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -11,7 +11,7 @@
 }:
 
 let
-  version = "2.7.1";
+  version = "2.7.2";
   inherit (stdenv.lib) optional optionals optionalString;
   mesonFeatureFlag = opt: b:
     "-D${opt}=${if b then "enabled" else "disabled"}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     owner  = "harfbuzz";
     repo   = "harfbuzz";
     rev    = version;
-    sha256 = "172jmwp666xbs6yy1pc2495gnkz8xw11b8zkz3j19jxlvvp4mxcs";
+    sha256 = "0vfyxr3lvzp80j1347nrwpr1ndv265p15rj2q8rj31lb26nyz4dm";
   };
 
   postPatch = ''
diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix
index 81f75ad526a7..d8e9bd16ab89 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -57,7 +57,7 @@ let
 
     # FIXME: This fixes dylib references in the dylibs themselves, but
     # not in the programs in $out/bin.
-    buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+    nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
     # remove dependency on bootstrap-tools in early stdenv build
     postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index a6eb56423954..4004c9f387ef 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jbig2dec";
-  version = "0.18";
+  version = "0.19";
 
   src = fetchurl {
-    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/${pname}-${version}.tar.gz";
-    sha256 = "0pigfw2v0ppvr0lbysm69gx0zsa5q2q92yrb8af2j3im6x97f6cy";
+    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/${pname}-${version}.tar.gz";
+    sha256 = "0dwa24kjqyg9hmm40fh048sdxfpnasz43l2rm8wlkw1qbdlpd517";
   };
 
   postPatch = ''
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 4ae4a71091e4..f89d4bc45341 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -14,8 +14,8 @@ in stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ glib ];
-  nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ];
-  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   outputs = [ "out" "dev" ];
 
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index 33eca603c267..14d426701ba3 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ snappy ];
 
   nativeBuildInputs = []
-    ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ];
+    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   buildPhase = ''
     make all
diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix
index 95569c0a8132..27db14e71660 100644
--- a/pkgs/development/libraries/libLAS/default.nix
+++ b/pkgs/development/libraries/libLAS/default.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
   };
 
-  buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ]
-                ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ];
 
   cmakeFlags = [
     "-DGDAL_CONFIG=${gdal}/bin/gdal-config"
diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix
index 9b6a54d92f97..ae5154eac034 100644
--- a/pkgs/development/libraries/libcbor/default.nix
+++ b/pkgs/development/libraries/libcbor/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libcbor";
-  version = "unstable-2019-07-25";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "PJK";
     repo = pname;
-    rev = "82512d851205fbc7f65d96a0b4a8e1bad2e4f3c6";
-    sha256 = "01hy7n21gxz4gp3gdwm2ywz822p415bj2k9ccxgwz3plvncs4xa1";
+    rev = "v${version}";
+    sha256 = "01dv4vxcmbvpphqy16vqiwh25wx11x630js5wfnx7cryarsh9ld7";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error
 
-  cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
-
-  NIX_CFLAGS_COMPILE = "-fno-lto";
+  cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ];
 
   meta = with stdenv.lib; {
     description = "CBOR protocol implementation for C and others";
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index e23c7d55c5ed..cbde32067172 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -23,10 +23,13 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional sslSupport "openssl"
     ;
 
+  nativeBuildInputs = []
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
+    ;
+
   buildInputs = []
     ++ stdenv.lib.optional sslSupport openssl
     ++ stdenv.lib.optional stdenv.isCygwin findutils
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames
     ;
 
   doCheck = false; # needs the net
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 576a2fec921a..3a651087510b 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, meson, ninja
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja
 , libevdev, mtdev, udev, libwacom
 , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
 , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
@@ -27,11 +27,14 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libinput";
-  version = "1.16.1";
+  version = "1.16.2";
 
-  src = fetchurl {
-    url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
-    sha256 = "e6fRru3RUWi7IdF+nmKKocJ5V5Y6Qjo/6jk4pQF1hTk=";
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "0qii6yh3dlhgv9z970cpzbz19ii8zjvq4k7pg75sy2gmia7smwd1";
   };
 
   outputs = [ "bin" "out" "dev" ];
@@ -80,7 +83,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
-    homepage    = "http://www.freedesktop.org/wiki/Software/libinput";
+    homepage    = "https://www.freedesktop.org/wiki/Software/libinput/";
     license     = licenses.mit;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ codyopel ];
diff --git a/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch b/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
deleted file mode 100644
index 552c4e08d5f9..000000000000
--- a/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-Backports of
-
-From 46e17f0cb4a80b36755c84b8bf15731d3386c08f Mon Sep 17 00:00:00 2001
-From: kyslov <kyslov@google.com>
-Date: Fri, 4 Jan 2019 17:04:09 -0800
-Subject: [PATCH] Fix OOB memory access on fuzzed data
-
-From 0681cff1ad36b3ef8ec242f59b5a6c4234ccfb88 Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-Date: Tue, 24 Jul 2018 21:36:50 -0700
-Subject: [PATCH] vp9: fix OOB read in decoder_peek_si_internal
-
-From f00890eecdf8365ea125ac16769a83aa6b68792d Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-Date: Tue, 11 Dec 2018 18:06:20 -0800
-Subject: [PATCH] update libwebm to libwebm-1.0.0.27-352-g6ab9fcf
-
-From 34d54b04e98dd0bac32e9aab0fbda0bf501bc742 Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-Date: Tue, 9 Apr 2019 18:37:44 -0700
-Subject: [PATCH] update libwebm to libwebm-1.0.0.27-358-gdbf1d10
-
-From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001
-From: Jerome Jiang <jianj@google.com>
-Date: Wed, 23 May 2018 15:43:00 -0700
-Subject: [PATCH] VP8: Fix use-after-free in postproc.
-
-to address CVE-2019-9232 CVE-2019-9325 CVE-2019-9371 CVE-2019-9433
-
---- libvpx-1.7.0.orig/test/decode_api_test.cc
-+++ libvpx-1.7.0/test/decode_api_test.cc
-@@ -138,8 +138,30 @@ TEST(DecodeAPI, Vp9InvalidDecode) {
-   EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
- }
- 
--TEST(DecodeAPI, Vp9PeekSI) {
-+void TestPeekInfo(const uint8_t *const data, uint32_t data_sz,
-+                  uint32_t peek_size) {
-   const vpx_codec_iface_t *const codec = &vpx_codec_vp9_dx_algo;
-+  // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get
-+  // to decoder_peek_si_internal on frames of size < 8.
-+  if (data_sz >= 8) {
-+    vpx_codec_ctx_t dec;
-+    EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0));
-+    EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM
-+                                    : VPX_CODEC_CORRUPT_FRAME,
-+              vpx_codec_decode(&dec, data, data_sz, NULL, 0));
-+    vpx_codec_iter_t iter = NULL;
-+    EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter));
-+    EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
-+  }
-+
-+  // Verify behavior of vpx_codec_peek_stream_info.
-+  vpx_codec_stream_info_t si;
-+  si.sz = sizeof(si);
-+  EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK,
-+            vpx_codec_peek_stream_info(codec, data, data_sz, &si));
-+}
-+
-+TEST(DecodeAPI, Vp9PeekStreamInfo) {
-   // The first 9 bytes are valid and the rest of the bytes are made up. Until
-   // size 10, this should return VPX_CODEC_UNSUP_BITSTREAM and after that it
-   // should return VPX_CODEC_CORRUPT_FRAME.
-@@ -150,24 +172,18 @@ TEST(DecodeAPI, Vp9PeekSI) {
-   };
- 
-   for (uint32_t data_sz = 1; data_sz <= 32; ++data_sz) {
--    // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get
--    // to decoder_peek_si_internal on frames of size < 8.
--    if (data_sz >= 8) {
--      vpx_codec_ctx_t dec;
--      EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0));
--      EXPECT_EQ(
--          (data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_CORRUPT_FRAME,
--          vpx_codec_decode(&dec, data, data_sz, NULL, 0));
--      vpx_codec_iter_t iter = NULL;
--      EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter));
--      EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
--    }
--
--    // Verify behavior of vpx_codec_peek_stream_info.
--    vpx_codec_stream_info_t si;
--    si.sz = sizeof(si);
--    EXPECT_EQ((data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK,
--              vpx_codec_peek_stream_info(codec, data, data_sz, &si));
-+    TestPeekInfo(data, data_sz, 10);
-+  }
-+}
-+
-+TEST(DecodeAPI, Vp9PeekStreamInfoTruncated) {
-+  // This profile 1 header requires 10.25 bytes, ensure
-+  // vpx_codec_peek_stream_info doesn't over read.
-+  const uint8_t profile1_data[10] = { 0xa4, 0xe9, 0x30, 0x68, 0x53,
-+                                      0xe9, 0x30, 0x68, 0x53, 0x04 };
-+
-+  for (uint32_t data_sz = 1; data_sz <= 10; ++data_sz) {
-+    TestPeekInfo(profile1_data, data_sz, 11);
-   }
- }
- #endif  // CONFIG_VP9_DECODER
---- libvpx-1.7.0.orig/third_party/libwebm/mkvparser/mkvparser.cc
-+++ libvpx-1.7.0/third_party/libwebm/mkvparser/mkvparser.cc
-@@ -5307,8 +5307,8 @@ long VideoTrack::Parse(Segment* pSegment
- 
-   const long long stop = pos + s.size;
- 
--  Colour* colour = NULL;
--  Projection* projection = NULL;
-+  std::unique_ptr<Colour> colour_ptr;
-+  std::unique_ptr<Projection> projection_ptr;
- 
-   while (pos < stop) {
-     long long id, size;
-@@ -5357,11 +5357,19 @@ long VideoTrack::Parse(Segment* pSegment
-       if (rate <= 0)
-         return E_FILE_FORMAT_INVALID;
-     } else if (id == libwebm::kMkvColour) {
--      if (!Colour::Parse(pReader, pos, size, &colour))
-+      Colour* colour = NULL;
-+      if (!Colour::Parse(pReader, pos, size, &colour)) {
-         return E_FILE_FORMAT_INVALID;
-+      } else {
-+        colour_ptr.reset(colour);
-+      }
-     } else if (id == libwebm::kMkvProjection) {
--      if (!Projection::Parse(pReader, pos, size, &projection))
-+      Projection* projection = NULL;
-+      if (!Projection::Parse(pReader, pos, size, &projection)) {
-         return E_FILE_FORMAT_INVALID;
-+      } else {
-+        projection_ptr.reset(projection);
-+      }
-     }
- 
-     pos += size;  // consume payload
-@@ -5392,8 +5400,8 @@ long VideoTrack::Parse(Segment* pSegment
-   pTrack->m_display_unit = display_unit;
-   pTrack->m_stereo_mode = stereo_mode;
-   pTrack->m_rate = rate;
--  pTrack->m_colour = colour;
--  pTrack->m_projection = projection;
-+  pTrack->m_colour = colour_ptr.release();
-+  pTrack->m_projection = projection_ptr.release();
- 
-   pResult = pTrack;
-   return 0;  // success
---- libvpx-1.7.0.orig/vp8/common/postproc.c
-+++ libvpx-1.7.0/vp8/common/postproc.c
-@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BU
-   double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
-   int ppl = (int)(level + .5);
- 
--  const MODE_INFO *mode_info_context = cm->show_frame_mi;
-+  const MODE_INFO *mode_info_context = cm->mi;
-   int mbr, mbc;
- 
-   /* The pixel thresholds are adjusted according to if or not the macroblock
---- libvpx-1.7.0.orig/vp8/decoder/dboolhuff.h
-+++ libvpx-1.7.0/vp8/decoder/dboolhuff.h
-@@ -76,7 +76,7 @@ static int vp8dx_decode_bool(BOOL_DECODE
-   }
- 
-   {
--    register int shift = vp8_norm[range];
-+    const unsigned char shift = vp8_norm[(unsigned char)range];
-     range <<= shift;
-     value <<= shift;
-     count -= shift;
---- libvpx-1.7.0.orig/vp9/vp9_dx_iface.c
-+++ libvpx-1.7.0/vp9/vp9_dx_iface.c
-@@ -97,7 +97,7 @@ static vpx_codec_err_t decoder_peek_si_i
-     const uint8_t *data, unsigned int data_sz, vpx_codec_stream_info_t *si,
-     int *is_intra_only, vpx_decrypt_cb decrypt_cb, void *decrypt_state) {
-   int intra_only_flag = 0;
--  uint8_t clear_buffer[10];
-+  uint8_t clear_buffer[11];
- 
-   if (data + data_sz <= data) return VPX_CODEC_INVALID_PARAM;
- 
-@@ -158,6 +158,9 @@ static vpx_codec_err_t decoder_peek_si_i
-         if (profile > PROFILE_0) {
-           if (!parse_bitdepth_colorspace_sampling(profile, &rb))
-             return VPX_CODEC_UNSUP_BITSTREAM;
-+          // The colorspace info may cause vp9_read_frame_size() to need 11
-+          // bytes.
-+          if (data_sz < 11) return VPX_CODEC_UNSUP_BITSTREAM;
-         }
-         rb.bit_offset += REF_FRAMES;  // refresh_frame_flags
-         vp9_read_frame_size(&rb, (int *)&si->w, (int *)&si->h);
---- libvpx-1.7.0.orig/vpx_dsp/bitreader.h
-+++ libvpx-1.7.0/vpx_dsp/bitreader.h
-@@ -94,7 +94,7 @@ static INLINE int vpx_read(vpx_reader *r
-   }
- 
-   {
--    register int shift = vpx_norm[range];
-+    const unsigned char shift = vpx_norm[(unsigned char)range];
-     range <<= shift;
-     value <<= shift;
-     count -= shift;
---- libvpx-1.7.0.orig/vpx_dsp/bitreader_buffer.c
-+++ libvpx-1.7.0/vpx_dsp/bitreader_buffer.c
-@@ -23,7 +23,7 @@ int vpx_rb_read_bit(struct vpx_read_bit_
-     rb->bit_offset = off + 1;
-     return bit;
-   } else {
--    rb->error_handler(rb->error_handler_data);
-+    if (rb->error_handler != NULL) rb->error_handler(rb->error_handler_data);
-     return 0;
-   }
- }
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 007df403ff73..83e60466c146 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -56,20 +56,16 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
 
 stdenv.mkDerivation rec {
   pname = "libvpx";
-  version = "1.7.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "webmproject";
-    repo = "libvpx";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6";
+    sha256 = "16xv6ambc82g14h1y0q1vyy57wp6j9fbp0nk0wd5csnrw407rhry";
   };
 
-  patches = [
-    ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
-  ];
-
-  postPatch = ''patchShebangs .'';
+  postPatch = "patchShebangs .";
 
   outputs = [ "bin" "dev" "out" ];
   setOutputFlags = false;
@@ -135,6 +131,12 @@ stdenv.mkDerivation rec {
                     experimentalFpMbStatsSupport ||
                     experimentalEmulateHardwareSupport) "experimental")
   ] ++ 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
@@ -159,6 +161,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ ]
     ++ optionals unitTestsSupport [ coreutils curl ];
 
+  NIX_LDFLAGS = [
+    "-lpthread" # fixes linker errors
+  ];
+
   enableParallelBuilding = true;
 
   postInstall = ''moveToOutput bin "$bin" '';
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index d2a98c4a8476..6d24ba7f2ed2 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool
 , threadingSupport ? true # multi-threading
 , openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp)
 , pngSupport ? true, libpng ? null # PNG image format
@@ -27,13 +27,17 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libwebp";
-  version = "1.0.3";
+  version = "1.1.0";
 
-  src = fetchurl {
-    url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz";
-    sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2";
+  src = fetchFromGitHub {
+    owner  = "webmproject";
+    repo   = pname;
+    rev    = version;
+    sha256 = "1kl6qqa29ygqb2fpv140y59v539gdqx4vcf3mlaxhca2bks98qgm";
   };
 
+  prePatch = "patchShebangs .";
+
   configureFlags = [
     (mkFlag threadingSupport "threading")
     (mkFlag openglSupport "gl")
@@ -50,6 +54,7 @@ stdenv.mkDerivation rec {
     (mkFlag libwebpdecoderSupport "libwebpdecoder")
   ];
 
+  nativeBuildInputs = [ autoreconfHook libtool ];
   buildInputs = [ ]
     ++ optionals openglSupport [ freeglut libGL libGLU ]
     ++ optional pngSupport libpng
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index aeeb0514fabb..aa180b94d747 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -8,7 +8,7 @@
 , galliumDrivers ? ["auto"]
 , driDrivers ? ["auto"]
 , vulkanDrivers ? ["auto"]
-, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
+, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ]
 , OpenGL, Xplugin
 , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
 , enableGalliumNine ? stdenv.isLinux
@@ -31,7 +31,7 @@ with stdenv.lib;
 let
   # Release calendar: https://www.mesa3d.org/release-calendar.html
   # Release frequency: https://www.mesa3d.org/releasing.html#schedule
-  version = "20.1.9";
+  version = "20.2.1";
   branch  = versions.major version;
 in
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "10kk8a8k7f4ip8yaiqdyrx162nbw8pw4h3b4hs4ha8mpd43wlldj";
+    sha256 = "0ji4s1gwcvx3fbj9h0x5zbma6kw4b75vs0266zhc06r97yd6v96i";
   };
 
   prePatch = "patchShebangs .";
@@ -58,7 +58,6 @@ stdenv.mkDerivation {
     ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
     ./opencl-install-dir.patch
     ./disk_cache-include-dri-driver-path-in-cache-key.patch
-    ./link-radv-with-ld_args_build_id.patch
   ]
     ++ lib.optionals stdenv.hostPlatform.isMusl [
       # Fix `-Werror=int-conversion` pthread warnings on musl.
diff --git a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
index acf3d827c562..fa78f4ae730a 100644
--- a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
+++ b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
@@ -1,4 +1,4 @@
-From 46b10f2bc28fd79d561c8c49bbae3aee6a4cf0e6 Mon Sep 17 00:00:00 2001
+From 980164fd92f5c2302624cd046d30ff21e6e4ba8a Mon Sep 17 00:00:00 2001
 From: David McFarland <corngood@gmail.com>
 Date: Mon, 6 Aug 2018 15:52:11 -0300
 Subject: [PATCH] disk_cache: include dri driver path in cache key
@@ -12,10 +12,10 @@ timestamps in /nix/store are zero.
  3 files changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/meson_options.txt b/meson_options.txt
-index 1a2dd8ebd12..2ac741af5a6 100644
+index 2d39d13b6ad..daf06480a60 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -348,6 +348,12 @@ option(
+@@ -368,6 +368,12 @@ option(
    value : true,
    description : 'Enable direct rendering in GLX and EGL for DRI',
  )
@@ -26,13 +26,13 @@ index 1a2dd8ebd12..2ac741af5a6 100644
 +  description : 'Mesa cache key.'
 +)
  option(
-   'I-love-half-baked-turnips',
+   'prefer-iris',
    type : 'boolean',
 diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
-index d1f14736725..2ed328f292e 100644
+index a92d621927a..3bd65c6890c 100644
 --- a/src/util/disk_cache.c
 +++ b/src/util/disk_cache.c
-@@ -402,8 +402,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
+@@ -401,8 +401,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
  
     /* Create driver id keys */
     size_t id_size = strlen(driver_id) + 1;
@@ -43,7 +43,7 @@ index d1f14736725..2ed328f292e 100644
     cache->driver_keys_blob_size += gpu_name_size;
  
     /* We sometimes store entire structs that contains a pointers in the cache,
-@@ -424,6 +426,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
+@@ -423,6 +425,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
     uint8_t *drv_key_blob = cache->driver_keys_blob;
     DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size)
     DRV_KEY_CPY(drv_key_blob, driver_id, id_size)
@@ -52,22 +52,23 @@ index d1f14736725..2ed328f292e 100644
     DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size)
     DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size)
 diff --git a/src/util/meson.build b/src/util/meson.build
-index 9da29cc7390..5f549bb1d99 100644
+index 0893f64793b..d46ce85a85f 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
-@@ -170,7 +170,12 @@ _libmesa_util = static_library(
-   include_directories : inc_common,
+@@ -179,7 +179,12 @@ _libmesa_util = static_library(
+   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
    dependencies : deps_for_libmesa_util,
    link_with: libmesa_format,
--  c_args : [c_msvc_compat_args, c_vis_args],
+-  c_args : [c_msvc_compat_args],
 +  c_args : [
-+    c_msvc_compat_args, c_vis_args,
++    c_msvc_compat_args,
 +    '-DDISK_CACHE_KEY="@0@"'.format(
 +      get_option('disk-cache-key')
 +    ),
 +  ],
+   gnu_symbol_visibility : 'hidden',
    build_by_default : false
  )
- 
 -- 
-2.25.1
+2.28.0
+
diff --git a/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch b/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch
deleted file mode 100644
index 0a660332392d..000000000000
--- a/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b49bcb6eece322b70fc2e8b0c8498f5a38ea7b82 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Sun, 26 Jul 2020 17:29:49 -0300
-Subject: [PATCH] link radv with ld_args_build_id
-
-This is needed for radv_device_get_cache_uuid to work correctly.
----
- src/amd/vulkan/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
-index eec026e8f60..a07a0821938 100644
---- a/src/amd/vulkan/meson.build
-+++ b/src/amd/vulkan/meson.build
-@@ -183,7 +183,7 @@ libvulkan_radeon = shared_library(
-   ],
-   c_args : [c_vis_args, no_override_init_args, radv_flags],
-   cpp_args : [cpp_vis_args, radv_flags],
--  link_args : [ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args],
-+  link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args],
-   link_depends : [libvulkan_radeon_link_depends,],
-   install : true,
- )
---
-2.28.0
diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch
index 9685a1619a58..72488893c6b6 100644
--- a/pkgs/development/libraries/mesa/missing-includes.patch
+++ b/pkgs/development/libraries/mesa/missing-includes.patch
@@ -9,18 +9,6 @@
  #include "pipe/p_compiler.h"
  #include "pipe/p_state.h"
  
---- ./src/util/rand_xor.c.orig	2017-06-20 00:38:57.199474067 +0200
-+++ ./src/util/rand_xor.c	2017-06-20 00:40:31.351279557 +0200
-@@ -23,7 +23,9 @@
-  */
- 
- #if defined(__linux__)
-+#include <sys/types.h>
- #include <sys/file.h>
-+#include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
- #else
 --- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
 +++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
 @@ -28,6 +28,8 @@
diff --git a/pkgs/development/libraries/nss/3.44.nix b/pkgs/development/libraries/nss/3.44.nix
index ad58bfccaee6..1c89dd793316 100644
--- a/pkgs/development/libraries/nss/3.44.nix
+++ b/pkgs/development/libraries/nss/3.44.nix
@@ -19,10 +19,10 @@ in stdenv.mkDerivation rec {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [ perl ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
-  buildInputs = [ zlib sqlite ]
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  buildInputs = [ zlib sqlite ];
 
   propagatedBuildInputs = [ nspr ];
 
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index e9ca475802d6..395617aa7bce 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -20,10 +20,9 @@ in stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
-    ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
+    ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
 
-  buildInputs = [ zlib sqlite ]
-    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  buildInputs = [ zlib sqlite ];
 
   propagatedBuildInputs = [ nspr ];
 
diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
index 6c3744493d21..7f27f7d1c179 100644
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
     sha256 = "1g2wdchlwdihqj0ynx58nwyrpncxanghlnykgir97p0wimg3hnxl";
   };
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ];
+  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   buildInputs = [ oracle-instantclient ]
     ++ stdenv.lib.optionals stdenv.isLinux [ libaio ];
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 1fc38dd8aaa8..c4a9a4a01808 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -160,8 +160,8 @@ in {
   };
 
   openssl_1_1 = common {
-    version = "1.1.1g";
-    sha256 = "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x";
+    version = "1.1.1h";
+    sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w";
     patches = [
       ./1.1/nix-ssl-cert-file.patch
 
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 46f520e41e4a..31a7e7e90867 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -36,6 +36,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # Tests run in fakeroot for non-root users
+  preCheck = ''
+    if [ "$(id -u)" != "0" ]; then
+      export FAKED_MODE=1
+    fi
+  '';
+
   doCheck = !stdenv.isDarwin;
 
   installFlags = [
diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix
index 2726ed7f237b..89318dd4e75b 100644
--- a/pkgs/development/libraries/tiledb/default.nix
+++ b/pkgs/development/libraries/tiledb/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     cmake
     python
     doxygen
-  ];
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   checkInputs = [
     gtest
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     openssl
     boost
     libpqxx
-  ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  ];
 
   # emulate the process of pulling catch down
   postPatch = ''
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 8302ebbd1e80..d5819ff7ee9a 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }:
+{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium
+, enableDrafts ? false }:
 
 stdenv.mkDerivation rec {
   pname = "zeromq";
-  version = "4.3.2";
+  version = "4.3.3";
 
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "libzmq";
     rev = "v${version}";
-    sha256 = "1q37z05i76ili31j6jlw8988iy6vxadlmd306f99phxfdpqa6bn9";
+    sha256 = "155kb0ih0xj4jvd39bq8d04bgvhy9143r3632ks1m04455z4qdzd";
   };
 
-  nativeBuildInputs = [ cmake asciidoc ];
+  nativeBuildInputs = [ cmake asciidoc pkg-config ];
+  buildInputs = [ libsodium ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix
index bc3de37526a1..7dbe3b98fca3 100644
--- a/pkgs/development/python-modules/arrow/default.nix
+++ b/pkgs/development/python-modules/arrow/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "arrow";
-  version = "0.15.8";
+  version = "0.17.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "edc31dc051db12c95da9bac0271cd1027b8e36912daf6d4580af53b23e62721a";
+    sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4";
   };
 
   propagatedBuildInputs = [ python-dateutil ]
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index d61279e38d5d..24e0f9792d7a 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,4 +1,13 @@
-{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }:
+{ lib
+, fetchFromGitHub
+, meson
+, ninja
+, buildPythonPackage
+, pytestCheckHook
+, pkg-config
+, cairo
+, isPy3k
+}:
 
 buildPythonPackage rec {
   pname = "pycairo";
@@ -16,22 +25,25 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
     cairo
-    xlibsWrapper
   ];
 
-  checkInputs = [ pytest ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  mesonFlags = [ "-Dpython=${if isPy3k then "python3" else "python"}" ];
+  mesonFlags = [
+    "-Dpython=${if isPy3k then "python3" else "python"}"
+  ];
 
   meta = with lib; {
     description = "Python 2/3 bindings for cairo";
     homepage = "https://pycairo.readthedocs.io/";
-    license = with licenses; [ lgpl2 mpl11 ];
+    license = with licenses; [ lgpl21Only mpl11 ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 559a4c191b68..010f1d9c6c2c 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -5,6 +5,7 @@
 , ps
 , isBootstrap ? false
 , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
+, useOpenSSL ? !isBootstrap, openssl
 , useNcurses ? false, ncurses
 , useQt4 ? false, qt4
 , withQt5 ? false, qtbase
@@ -44,15 +45,17 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  buildInputs =
-    [ setupHook pkgconfig ]
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  nativeBuildInputs = [ setupHook pkgconfig ];
+
+  buildInputs = []
     ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
+    ++ lib.optional useOpenSSL openssl
     ++ lib.optional useNcurses ncurses
     ++ lib.optional useQt4 qt4
     ++ lib.optional withQt5 qtbase;
 
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-
   propagatedBuildInputs = lib.optional stdenv.isDarwin ps;
 
   preConfigure = ''
@@ -91,13 +94,15 @@ stdenv.mkDerivation rec {
     "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
     "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
     "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
-  ]
+
+    "-DCMAKE_USE_OPENSSL=${if useOpenSSL then "ON" else "OFF"}"
     # Avoid depending on frameworks.
-    ++ lib.optional (!useNcurses) "-DBUILD_CursesDialog=OFF";
+    "-DBUILD_CursesDialog=${if useNcurses then "ON" else "OFF"}"
+  ];
 
   # make install attempts to use the just-built cmake
   preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ''
-    sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile
+    sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile
   '';
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch b/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch
new file mode 100644
index 000000000000..5b9020b3d540
--- /dev/null
+++ b/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch
@@ -0,0 +1,40 @@
+From 536108b10271f2f42d41c7d9ddb4ce2ea1851f4f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
+Date: Sat, 17 Oct 2020 19:27:08 +0200
+Subject: [PATCH] boost: Do not add system paths on nix
+
+---
+ mesonbuild/dependencies/boost.py | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
+index 907c0c275..ecaf11b18 100644
+--- a/mesonbuild/dependencies/boost.py
++++ b/mesonbuild/dependencies/boost.py
+@@ -643,22 +643,7 @@ class BoostDependency(ExternalDependency):
+             roots += [x for x in candidates if x.name.lower().startswith('boost') and x.is_dir()]
+         else:
+             tmp = []  # type: T.List[Path]
+-
+-            # Homebrew
+-            brew_boost = Path('/usr/local/Cellar/boost')
+-            if brew_boost.is_dir():
+-                tmp += [x for x in brew_boost.iterdir()]
+-
+-            # Add some default system paths
+-            tmp += [Path('/opt/local')]
+-            tmp += [Path('/usr/local/opt/boost')]
+-            tmp += [Path('/usr/local')]
+-            tmp += [Path('/usr')]
+-
+-            # Cleanup paths
+-            tmp = [x for x in tmp if x.is_dir()]
+-            tmp = [x.resolve() for x in tmp]
+-            roots += tmp
++            # Do not add any non-explicit paths on nix
+ 
+         return roots
+ 
+-- 
+2.25.4
+
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 8421fb7d70a0..1b9c3ef64774 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -52,6 +52,11 @@ python3.pkgs.buildPythonApplication rec {
     # cut-in-half-by-\0 store path references.
     # Let’s just clear the whole rpath and hope for the best.
     ./clear-old-rpath.patch
+
+    # Patch out default boost search paths to avoid impure builds on
+    # unsandboxed non-NixOS builds, see:
+    # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
+    ./boost-Do-not-add-system-paths-on-nix.patch
   ];
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 02298d93b8af..4bbff3ca33f8 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -18,9 +18,10 @@ stdenv.mkDerivation {
     sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs = [ boost llvmPackages.libclang ]
-    ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames Cocoa ];
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin Cocoa;
 
   buildPhase = ''
     export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
diff --git a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch
deleted file mode 100644
index dd31260302c6..000000000000
--- a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch
+++ /dev/null
@@ -1,835 +0,0 @@
---- a/contrib/contrib.mak	2020-03-19 09:21:42.000000000 +0100
-+++ b/contrib/contrib.mak	2020-05-14 13:41:03.202258445 +0200
-@@ -22,6 +22,10 @@
- CONTRIB_MAK=$(CONTRIBDIR)$(D)contrib.mak $(TOP_MAKEFILES)
- CONTRIBSRC=$(CONTRIBDIR)$(D)
- 
-+# Almost all device drivers depend on the following:
-+CONTDEVH=$(gserrors_h) $(gx_h) $(gxdevice_h)
-+CONTDEV=$(AK) $(ECHOGS_XE) $(GDEVH)
-+
- ###### --------------------------- Catalog -------------------------- ######
- 
- # The following drivers are user-contributed, and maintained (if at all) by
-@@ -185,19 +189,19 @@
- 	$(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c
- 
- $(DD)bjcmono.dev : $(bjc_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bjcmono $(bjc_)
- 
- $(DD)bjcgray.dev : $(bjc_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bjcgray $(bjc_)
- 
- $(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bjccmyk $(bjc_)
- 
- $(DD)bjccolor.dev : $(bjc_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bjccolor $(bjc_)
- 
- 
-@@ -208,25 +212,25 @@
- # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
- # Printer: HP 670
- $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdj670 $(cdeskjet8_)
- 
- # Author: Uli Wortmann (uliw@erdw.ethz.ch)
- # Printer: HP 850
- $(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdj850 $(cdeskjet8_)
- 
- # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
- # Printer: HP 890
- $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdj890 $(cdeskjet8_)
- 
- # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
- # Printer: HP 1600
- $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
- 
- $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\
-@@ -244,7 +248,8 @@
- 
- # Author: Matthew Gelhaus (mgelhaus@proaxis.com)
- # Printer: HP 880c
--$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev
-+$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev $(CONTDEV) \
-+                  $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdj880 $(cdeskjet8_)
- 
- 
-@@ -255,7 +260,7 @@
- # Author: Rene Harsch (rene@harsch.net)
- # Printer: HP 970Cxi
- $(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdj970 $(cdeskjet9_)
- 
- $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\
-@@ -268,7 +273,7 @@
- ### NOTE:  Same as chp2200 (some PJL and CRD changes).
- 
- $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_)
- 
- 
-@@ -277,7 +282,7 @@
- ### NOTE:  Depends on the presence of the cdj850 section.
- 
- $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)chp2200 $(cdeskjet8_)
- 
- 
-@@ -288,11 +293,11 @@
- GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL)
- 
- $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)gdi $(GDIMONO)
- 
- $(DD)samsunggdi.dev : $(GDIMONO) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)samsunggdi $(GDIMONO)
- 
- $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \
-@@ -306,17 +311,17 @@
- 
- hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM)
- $(DD)hl1250.dev : $(hl1250_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hl1250 $(hl1250_)
- 
- $(DD)hl1240.dev : $(hl1250_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hl1240 $(hl1250_)
- 
- # Author: Marek Michalkiewicz <marekm@linux.org.pl>
- # Printer: Brother HL-1250 (may work with some other models too)
- $(DEVOBJ)gdevhl12.$(OBJ) : $(CONTRIBSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h) \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c
- 
- 
-@@ -327,37 +332,37 @@
- # Author: Ulrich Mueller (ulm@vsnhd1.cern.ch)
- # Printer: DEC LN03
- $(DD)ln03.dev : $(ln03_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)ln03 $(ln03_)
- 
- # Author: Nick Brown (nick.brown@coe.int)
- # Printer: DEClaser 2100
- $(DD)dl2100.dev : $(ln03_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)dl2100 $(ln03_)
- 
- # Author: Ian MacPhedran (macphed@dvinci.USask.CA)
- # Printer: DEC LA50
- $(DD)la50.dev : $(ln03_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                          $(CONTDEV)  $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)la50 $(ln03_)
- 
- # Author: Bruce Lowekamp (lowekamp@csugrad.cs.vt.edu)
- # Printer: DEC LA70
- $(DD)la70.dev : $(ln03_) $(DD)page.dev \
--                         $(CONTRIB_MAK) $(MAKEDIRS)
-+                         $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)la70 $(ln03_)
- 
- # Author: Ian MacPhedran (macphed@dvinci.USask.CA)
- # Printer: DEC LA75
- $(DD)la75.dev : $(ln03_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)la75 $(ln03_)
- 
- # Author: Andre' Beck (Andre_Beck@IRS.Inf.TU-Dresden.de)
- # Printer: DEC LA75plus
- $(DD)la75plus.dev : $(ln03_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)la75plus $(ln03_)
- 
- $(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH) \
-@@ -380,233 +385,233 @@
- 	$(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c
- 
- $(DD)alc1900.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc1900 $(escv_)
- 
- $(DD)alc2000.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc2000 $(escv_)
- 
- $(DD)alc4000.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc4000 $(escv_)
- 
- $(DD)alc4100.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc4100 $(escv_)
- 
- $(DD)alc8500.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc8500 $(escv_)
- 
- $(DD)alc8600.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc8600 $(escv_)
- 
- $(DD)alc9100.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc9100 $(escv_)
- 
- $(DD)lp3000c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp3000c $(escv_)
- 
- $(DD)lp8000c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8000c $(escv_)
- 
- $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8200c $(escv_)
- 
- $(DD)lp8300c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8300c $(escv_)
- 
- $(DD)lp8500c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8500c $(escv_)
- 
- $(DD)lp8800c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8800c $(escv_)
- 
- $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9000c $(escv_)
- 
- $(DD)lp9200c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9200c $(escv_)
- 
- $(DD)lp9500c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9500c $(escv_)
- 
- $(DD)lp9800c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9800c $(escv_)
- 
- $(DD)lps6500.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lps6500 $(escv_)
- 
- $(DD)epl2050.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl2050 $(escv_)
- 
- $(DD)epl2050p.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl2050p $(escv_)
- 
- $(DD)epl2120.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl2120 $(escv_)
- 
- $(DD)epl2500.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl2500 $(escv_)
- 
- $(DD)epl2750.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl2750 $(escv_)
- 
- $(DD)epl5800.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl5800 $(escv_)
- 
- $(DD)epl5900.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl5900 $(escv_)
- 
- $(DD)epl6100.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl6100 $(escv_)
- 
- $(DD)epl6200.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl6200 $(escv_)
- 
- $(DD)lp1800.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp1800 $(escv_)
- 
- $(DD)lp1900.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp1900 $(escv_)
- 
- $(DD)lp2200.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp2200 $(escv_)
- 
- $(DD)lp2400.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp2400 $(escv_)
- 
- $(DD)lp2500.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp2500 $(escv_)
- 
- $(DD)lp7500.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp7500 $(escv_)
- 
- $(DD)lp7700.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp7700 $(escv_)
- 
- $(DD)lp7900.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                          $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp7900 $(escv_)
- 
- $(DD)lp8100.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8100 $(escv_)
- 
- $(DD)lp8300f.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8300f $(escv_)
- 
- $(DD)lp8400f.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8400f $(escv_)
- 
- $(DD)lp8600.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8600 $(escv_)
- 
- $(DD)lp8600f.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8600f $(escv_)
- 
- $(DD)lp8700.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8700 $(escv_)
- 
- $(DD)lp8900.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8900 $(escv_)
- 
- $(DD)lp9000b.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9000b $(escv_)
- 
- $(DD)lp9100.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9100 $(escv_)
- 
- $(DD)lp9200b.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9200b $(escv_)
- 
- $(DD)lp9300.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9300 $(escv_)
- 
- $(DD)lp9400.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9400 $(escv_)
- 
- $(DD)lp9600.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9600 $(escv_)
- 
- $(DD)lp9600s.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9600s $(escv_)
- 
- $(DD)lps4500.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lps4500 $(escv_)
- 
- $(DD)eplcolor.dev: $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)eplcolor $(escv_)
- 
- $(DD)eplmono.dev: $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)eplmono $(escv_)
- 
- # ------ The Lexmark 5700 and 7000 devices ------ #
- 
- lex7000_=$(DEVOBJ)gdevlx7.$(OBJ)
- $(DD)lex7000.dev : $(lex7000_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lex7000 $(lex7000_)
- 
- lex5700_=$(DEVOBJ)gdevlx7.$(OBJ)
- $(DD)lex5700.dev : $(lex5700_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lex5700 $(lex5700_)
- 
- lex3200_=$(DEVOBJ)gdevlx7.$(OBJ)
- $(DD)lex3200.dev : $(lex3200_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lex3200 $(lex3200_)
- 
- lex2050_=$(DEVOBJ)gdevlx7.$(OBJ)
- $(DD)lex2050.dev : $(lex2050_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lex2050 $(lex2050_)
- 
- $(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH) \
-@@ -623,7 +628,7 @@
- 	$(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c
- 
- $(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lxm3200 $(lxm3200_)
- 
- 
-@@ -649,13 +654,13 @@
- 	$(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c
- 
- $(DD)lips4.dev : $(lipsr_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lips4 $(lipsr_)
- 
- lipsv_=$(DEVOBJ)gdevl4v.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ)
- 
- $(DD)lips4v.dev : $(ECHOGS_XE) $(lipsv_) $(DD)vector.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETDEV) $(DD)lips4v $(lipsv_)
- 	$(ADDMOD) $(DD)lips4v -include $(GLD)vector
- 
-@@ -668,11 +673,11 @@
- ### --------------- Some extra devices: lips2p, bjc880j ---------------- ###
- 
- $(DD)lips2p.dev : $(lipsr_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lips2p $(lipsr_)
- 
- $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bjc880j $(lipsr_)
- 
- 
-@@ -681,15 +686,15 @@
- md2k_=$(DEVOBJ)gdevmd2k.$(OBJ)
- 
- $(DD)md2k.dev : $(md2k_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)md2k $(md2k_)
- 
- $(DD)md5k.dev : $(md2k_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)md5k $(md2k_)
- 
- $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c
-  
- 
-@@ -697,7 +702,7 @@
- 
- oki4w_=$(DEVOBJ)gdevop4w.$(OBJ)
- $(DD)oki4w.dev : $(oki4w_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)oki4w $(oki4w_)
- 
- # Author: Ivan Schreter (ivan@shadow.sk)
-@@ -720,11 +725,11 @@
- 	$(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c
- 
- $(DD)opvp.dev : $(opvp_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)opvp $(opvp_)
- 
- $(DD)oprp.dev : $(opvp_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)oprp $(opvp_)
- 
- 
-@@ -901,78 +906,78 @@
- 
- # The generic pcl3 device with selectable subdevices
- $(DD)pcl3.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)pcl3 $(pcl3_)
- 
- # Fixed devices for specific printers
- $(DD)hpdjplus.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdjplus $(pcl3_)
- $(DD)hpdjportable.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdjportable $(pcl3_)
- $(DD)hpdj310.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj310 $(pcl3_)
- $(DD)hpdj320.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj320 $(pcl3_)
- $(DD)hpdj340.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj340 $(pcl3_)
- $(DD)hpdj400.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj400 $(pcl3_)
- $(DD)hpdj500.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj500 $(pcl3_)
- $(DD)hpdj500c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj500c $(pcl3_)
- $(DD)hpdj510.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj510 $(pcl3_)
- $(DD)hpdj520.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj520 $(pcl3_)
- $(DD)hpdj540.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj540 $(pcl3_)
- $(DD)hpdj550c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj550c $(pcl3_)
- $(DD)hpdj560c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj560c $(pcl3_)
- $(DD)hpdj600.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj600 $(pcl3_)
- $(DD)hpdj660c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj660c $(pcl3_)
- $(DD)hpdj670c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj670c $(pcl3_)
- $(DD)hpdj680c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj680c $(pcl3_)
- $(DD)hpdj690c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj690c $(pcl3_)
- $(DD)hpdj850c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj850c $(pcl3_)
- $(DD)hpdj855c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj855c $(pcl3_)
- $(DD)hpdj870c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj870c $(pcl3_)
- $(DD)hpdj890c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj890c $(pcl3_)
- $(DD)hpdj1120c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj1120c $(pcl3_)
- 
- #------------------------------------------------------------------------------
-@@ -1009,7 +1014,7 @@
- 
- xes_=$(DEVOBJ)gdevxes.$(OBJ)
- $(DD)xes.dev : $(xes_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)xes $(xes_)
- 
- # Author: Peter Flass (flass@lbdrscs.bitnet)
-@@ -1029,16 +1034,16 @@
- 
- pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
--$(DD)pr201.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
-+$(DD)pr201.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)pr201 $(pr201_)
- 
--$(DD)pr150.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
-+$(DD)pr150.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)pr150 $(pr201_)
- 
--$(DD)pr1000.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
-+$(DD)pr1000.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)pr1000 $(pr201_)
- 
--$(DD)pr1000_4.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
-+$(DD)pr1000_4.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)pr1000_4 $(pr201_)
- 
- $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \
-@@ -1049,7 +1054,7 @@
- 
- jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
--$(DD)jj100.dev : $(jj100_) $(CONTRIB_MAK) $(MAKEDIRS)
-+$(DD)jj100.dev : $(jj100_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)jj100 $(jj100_)
- 
- $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \
-@@ -1061,11 +1066,11 @@
- bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
- $(DD)bj10v.dev : $(bj10v_) \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bj10v $(bj10v_)
- 
- $(DD)bj10vh.dev : $(bj10v_) \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bj10vh $(bj10v_)
- 
- # Uncomment the following line if you are using MS-DOS on PC9801 series.
-@@ -1080,7 +1085,7 @@
- dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
- $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETDEV) $(DD)dmprt $(dmprt_)
- 	$(ADDMOD) $(DD)dmprt -ps dmp_init
- 
-@@ -1110,19 +1115,19 @@
- 	$(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c
- 
- $(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)mj700v2c $(mj700v2c_)
- 
- $(DD)mj500c.dev : $(mj700v2c_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)mj500c $(mj700v2c_)
- 
- $(DD)mj6000c.dev : $(mj700v2c_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)mj6000c $(mj700v2c_)
- 
- $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)mj8000c $(mj700v2c_)
- 
- ### ----------------- The Fujitsu FMPR printer device ----------------- ###
-@@ -1130,7 +1135,7 @@
- fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
- $(DD)fmpr.dev : $(fmpr_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)fmpr $(fmpr_)
- 
- $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \
-@@ -1142,7 +1147,7 @@
- fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
- $(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)fmlbp $(fmlbp_)
- 
- $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \
-@@ -1159,7 +1164,7 @@
- ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
- $(DD)ml600.dev : $(ml6_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)ml600 $(ml6_)
- 
- $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \
-@@ -1172,11 +1177,11 @@
- lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ)
- 
- $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lbp310 $(lbp3x0_)
- 
- $(DD)lbp320.dev :$(lbp3x0_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lbp320 $(lbp3x0_)
- 
- $(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH)
-@@ -1191,7 +1196,7 @@
- 	$(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c
- 
- $(DD)npdl.dev : $(npdl_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)npdl $(npdl_)
- 
- ### ------- EPSON ESC/Page printer device ----------------- ###
-@@ -1203,11 +1208,11 @@
- 	$(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c
- 
- $(DD)escpage.dev : $(escpage_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)escpage $(escpage_)
- 
- $(DD)lp2000.dev : $(escpage_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp2000 $(escpage_)
- 
- ### --- The RICOH RPDL language printer device ------ ###
-@@ -1218,7 +1223,7 @@
- 	$(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c
- 
- $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)rpdl $(rpdl_)
- 
- ### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ###
-@@ -1240,15 +1245,15 @@
- alps_=$(DEVOBJ)gdevalps.$(OBJ)
- 
- $(DD)md50Mono.dev : $(alps_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)md50Mono $(alps_)
- 
- $(DD)md50Eco.dev : $(alps_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)md50Eco $(alps_)
- 
- $(DD)md1xMono.dev : $(alps_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)md1xMono $(alps_)
- 
- $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index d3d06d98cb13..5a7762640f73 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf
+{ config, stdenv, lib, fetchurl, pkg-config, zlib, expat, openssl, autoconf
 , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec
 , libiconv, ijs, lcms2, fetchpatch
 , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null
@@ -9,10 +9,6 @@ assert x11Support -> xlibsWrapper != null;
 assert cupsSupport -> cups != null;
 
 let
-  version = "9.${ver_min}";
-  ver_min = "52";
-  sha512 = "1ksm3v4nw8acc4j817n44l1c65ijk0mr3mp4kryy17jz41bmzzql5d8vr40h59n9dmf8b2wmnbq45bj3an1zrpfagavlf0i9s436jjc";
-
   fonts = stdenv.mkDerivation {
     name = "ghostscript-fonts";
 
@@ -37,31 +33,27 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ghostscript";
-  inherit version;
+  version = "9.53.3";
 
   src = fetchurl {
-    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${pname}-${version}.tar.xz";
-    inherit sha512;
+    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/${pname}-${version}.tar.xz";
+    sha512 = "2vif3vgxa5wma16yxvhhkymk4p309y5204yykarq94r5rk890556d2lj5w7acnaa2ymkym6y0zd4vq9sy9ca2346igg2c6dxqkjr0zb";
   };
 
   patches = [
     (fetchpatch {
-      name = "CVE-2020-15900.patch";
-      url = "https://github.com/ArtifexSoftware/ghostpdl/commit/5d499272b95a6b890a1397e11d20937de000d31b.patch";
-      sha256 = "1nnnrn8q33x7nc8227ygc60f3mj4bjzrhj40sxp6dah58rb5x5jz";
+      url = "https://github.com/ArtifexSoftware/ghostpdl/commit/41ef9a0bc36b9db7115fbe9623f989bfb47bbade.patch";
+      sha256 = "1qpc6q1fpxshqc0mqgg36kng47kgljk50bmr8p7wn21jgfkh7m8w";
     })
     ./urw-font-files.patch
     ./doc-no-ref.diff
-    # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c,
-    # Remove on update to version > 9.52
-    ./0001-Bug-702364-Fix-missing-echogs-dependencies.patch
   ];
 
   outputs = [ "out" "man" "doc" ];
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig autoconf ];
+  nativeBuildInputs = [ pkg-config autoconf ];
   buildInputs =
     [ zlib expat openssl
       libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec
@@ -115,8 +107,6 @@ stdenv.mkDerivation rec {
     install_name_tool -change libgs.dylib.${version} $out/lib/libgs.dylib.${version} $out/bin/gs
   '';
 
-  passthru = { inherit version; };
-
   meta = {
     homepage = "https://www.ghostscript.com/";
     description = "PostScript interpreter (mainline version)";
diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix
index 46c505ed439c..34e60b8a4bb7 100644
--- a/pkgs/misc/sndio/default.nix
+++ b/pkgs/misc/sndio/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   pname = "sndio";
   version = "1.7.0";
   enableParallelBuilding = true;
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
+  nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isLinux alsaLib;
 
   src = fetchurl {
     url = "http://www.sndio.org/sndio-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index 0e10add55613..64fa92be8658 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -14,7 +14,7 @@
 
 let
   apparmor-series = "2.13";
-  apparmor-patchver = "4";
+  apparmor-patchver = "5";
   apparmor-version = apparmor-series + "." + apparmor-patchver;
 
   apparmor-meta = component: with stdenv.lib; {
@@ -27,19 +27,10 @@ let
 
   apparmor-sources = fetchurl {
     url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
-    sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh";
-  };
-
-  # See <https://gitlab.com/apparmor/apparmor/-/issues/74> This and the
-  # accompanying application in prePatchCommon should be removed in 2.13.5
-  gnumake43Patch = fetchpatch {
-    url = "https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch";
-    name = "2-23-fix-build-with-make-4.3.patch";
-    sha256 = "0xw028iqp69j9mxv0kbwraplgkj5i5djdlgf0anpkc5cdbsf96r9";
+    sha256 = "05x7r99k00r97v1cq2f711lv6yqzhbl8zp1i1c7kxra4v0a2lzk3";
   };
 
   prePatchCommon = ''
-    patch -p1 < ${gnumake43Patch}
     chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh
     patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh
     substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man"
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index a9fcf455ee43..b3de7ceedaad 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -5,19 +5,19 @@
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "5.8.0";
+  version = "5.9.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0vk4vickrpahdhl3zazr2qn2bf99v5549ncirjpwiy4h0a4izkfg";
+    sha256 = "1kys6dmhrl43iaq95n5sh02p39d7bq8i5y672qrzgwnwpjaaqpd2";
   };
 
   preConfigure = ''
     # Don't try to create /var/lib/arpd:
     sed -e '/ARPDDIR/d' -i Makefile
-    # TODO: Drop temporary version fix for 5.8 (53159d81) once 5.9 is out:
+    # TODO: Drop temporary version fix for 5.9 once 5.10 is out:
     substituteInPlace include/version.h \
-      --replace "v5.7.0-77-gb687d1067169" "5.8.0"
+      --replace "5.8.0" "${version}"
   '';
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 174f1be99dba..7931e35a8441 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libcap";
-  version = "2.27";
+  version = "2.44";
 
   src = fetchurl {
     url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz";
-    sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs";
+    sha256 = "1qf80lifygbnxwvqjf8jz5j24n6fqqx4ixnkbf76xs2vrmcq664j";
   };
 
   outputs = [ "out" "dev" "lib" "man" "doc" "pam" ];
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Library for working with POSIX capabilities";
+    homepage = "https://sites.google.com/site/fullycapable";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.bsd3;
   };
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index cef9d96ae6e1..da99280f63b8 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,27 +1,61 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, intltool, gperf, libcap
-, curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, e2fsprogs, utillinux, libffi
-, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
-, audit, lz4, bzip2, pcre2
-, linuxHeaders ? stdenv.cc.libc.linuxHeaders
-, iptables, gnu-efi, bashInteractive
-, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
-, ninja, meson, python3Packages, glibcLocales
-, patchelf
-, substituteAll
-, getent
-, cryptsetup, lvm2
+{ stdenv, lib, fetchFromGitHub
 , buildPackages
-, perl
+, ninja, meson, m4, pkgconfig, coreutils, gperf, getent
+, patchelf, perl, glibcLocales, glib, substituteAll
+, gettext, python3Packages
+
+# Mandatory dependencies
+, libcap
+, utillinux
+, kbd
+, kmod
+
+# Optional dependencies
+, pam, cryptsetup, lvm2, audit, acl
+, lz4, libgcrypt, libgpgerror, libidn2
+, curl, gnutar, gnupg, zlib
+, xz, libuuid, libffi
+, libapparmor, intltool
+, bzip2, pcre2, e2fsprogs
+, linuxHeaders ? stdenv.cc.libc.linuxHeaders
+, gnu-efi
+, iptables
 , withSelinux ? false, libselinux
 , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
 , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
+, bashInteractive
+
+, withResolved ? true
+, withLogind ? true
+, withHostnamed ? true
+, withLocaled ? true
+, withNetworkd ? true
+, withTimedated ? true
+, withTimesyncd ? true
+, withHwdb ? true
+, withEfi ? stdenv.hostPlatform.isEfi
+, withImportd ? true
+, withCryptsetup ? true
+
+# name argument
+, pname ? "systemd"
+
+
+, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
 }:
 
+assert withResolved -> (libgcrypt != null && libgpgerror != null);
+assert withImportd ->
+  ( curl.dev != null && zlib != null && xz != null && libgcrypt != null
+  && gnutar != null && gnupg != null);
+
+assert withCryptsetup ->
+  ( cryptsetup != null );
+
 let
   version = "246.6";
 in stdenv.mkDerivation {
-  inherit version;
-  pname = "systemd";
+  inherit version pname;
 
   # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly
   # This has proven to be less error-prone than the previous systemd fork.
@@ -71,13 +105,17 @@ in stdenv.mkDerivation {
   outputs = [ "out" "man" "dev" ];
 
   nativeBuildInputs =
-    [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
+    [ pkgconfig gperf
       ninja meson
       coreutils # meson calls date, stat etc.
       glibcLocales
       patchelf getent m4
       perl # to patch the libsystemd.so and remove dependencies on aarch64
 
+      intltool
+      gettext
+
+      libxslt docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
       (buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]))
     ];
   buildInputs =
@@ -86,9 +124,10 @@ in stdenv.mkDerivation {
       pcre2 ] ++
       stdenv.lib.optional withKexectools kexectools ++
       stdenv.lib.optional withLibseccomp libseccomp ++
-    [ libffi audit lz4 bzip2 libapparmor
-      iptables gnu-efi
-    ] ++ stdenv.lib.optional withSelinux libselinux;
+      [ libffi audit lz4 bzip2 libapparmor iptables ] ++
+      stdenv.lib.optional withEfi gnu-efi ++
+      stdenv.lib.optional withSelinux libselinux ++
+      stdenv.lib.optional withCryptsetup cryptsetup.dev;
 
   #dontAddPrefix = true;
 
@@ -106,19 +145,23 @@ in stdenv.mkDerivation {
     "-Ddebug-shell=${bashInteractive}/bin/bash"
     # while we do not run tests we should also not build them. Removes about 600 targets
     "-Dtests=false"
-    "-Dimportd=true"
+    "-Dimportd=${stdenv.lib.boolToString withImportd}"
     "-Dlz4=true"
     "-Dhomed=false"
-    "-Dhostnamed=true"
-    "-Dnetworkd=true"
+    "-Dlogind=${stdenv.lib.boolToString withLogind}"
+    "-Dlocaled=${stdenv.lib.boolToString withLocaled}"
+    "-Dhostnamed=${stdenv.lib.boolToString withHostnamed}"
+    "-Dnetworkd=${stdenv.lib.boolToString withNetworkd}"
+    "-Dcryptsetup=${stdenv.lib.boolToString withCryptsetup}"
     "-Dportabled=false"
+    "-Dhwdb=${stdenv.lib.boolToString withHwdb}"
     "-Dremote=false"
     "-Dsysusers=false"
-    "-Dtimedated=true"
-    "-Dtimesyncd=true"
+    "-Dtimedated=${stdenv.lib.boolToString withTimedated}"
+    "-Dtimesyncd=${stdenv.lib.boolToString withTimesyncd}"
     "-Dfirstboot=false"
     "-Dlocaled=true"
-    "-Dresolve=true"
+    "-Dresolve=${stdenv.lib.boolToString withResolved}"
     "-Dsplit-usr=false"
     "-Dlibcurl=true"
     "-Dlibidn=false"
@@ -141,11 +184,6 @@ in stdenv.mkDerivation {
     "-Dsystem-gid-max=999"
     # "-Dtime-epoch=1"
 
-    (if !stdenv.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"
-
     "-Dsysvinit-path="
     "-Dsysvrcnd-path="
 
@@ -161,6 +199,12 @@ in stdenv.mkDerivation {
     # Upstream defaulted to disable manpages since they optimize for the much
     # more frequent development builds
     "-Dman=true"
+
+    "-Dgnu-efi=${stdenv.lib.boolToString (withEfi && gnu-efi != null)}"
+  ] ++ stdenv.lib.optionals (withEfi && gnu-efi != null) [
+    "-Defi-libdir=${toString gnu-efi}/lib"
+    "-Defi-includedir=${toString gnu-efi}/include/efi"
+    "-Defi-ldsdir=${toString gnu-efi}/lib"
   ];
 
   preConfigure = ''
@@ -284,6 +328,6 @@ in stdenv.mkDerivation {
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     priority = 10;
-    maintainers = with maintainers; [ andir eelco flokli ];
+    maintainers = with maintainers; [ andir eelco flokli kloenk ];
   };
 }
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 0b91e2d4fd21..3b86d8a7394e 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -34,12 +34,13 @@ common = rec { # attributes common to both builds
     name   = "mariadb-${version}.tar.gz";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ]
+    ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs = [
     ncurses openssl zlib pcre libiconv curl
   ] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ]
-    ++ optionals stdenv.hostPlatform.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]
+    ++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ]
     ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ jemalloc450 ]
     ++ optional (!stdenv.hostPlatform.isDarwin && !withStorageToku) [ jemalloc ];
 
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index efc2cb2acbdd..96f40649c0f2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation {
-    name = "libX11-1.6.8";
+    name = "libX11-1.6.12";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2";
-      sha256 = "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj";
+      url = "mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2";
+      sha256 = "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
@@ -1054,11 +1054,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation {
-    name = "libXvMC-1.0.11";
+    name = "libXvMC-1.0.12";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2";
-      sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja";
+      url = "mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2";
+      sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
@@ -1158,11 +1158,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python }: stdenv.mkDerivation {
-    name = "libxcb-1.13.1";
+    name = "libxcb-1.14";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2";
-      sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8";
+      url = "mirror://xorg/individual/lib/libxcb-1.14.tar.xz";
+      sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig python ];
@@ -1431,11 +1431,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation {
-    name = "xcb-proto-1.13";
+    name = "xcb-proto-1.14.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2";
-      sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v";
+      url = "mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz";
+      sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig python ];
@@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation {
-    name = "xf86-input-libinput-0.28.2";
+    name = "xf86-input-libinput-0.30.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2";
-      sha256 = "0818vr0yhk9j1y1wcbxzcd458vrvp06rrhi8k43bhqkb5jb4dcxq";
+      url = "mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2";
+      sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
@@ -2679,11 +2679,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation {
-    name = "xorgproto-2019.1";
+    name = "xorgproto-2020.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2";
-      sha256 = "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6";
+      url = "mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2";
+      sha256 = "1llrnrkq6iprgiqakmwlv89745s9h02xsiaq0xn3fnh377qm78al";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 80ea5553ad6b..e6047458cf27 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -82,13 +82,6 @@ self: super:
 
   libX11 = super.libX11.overrideAttrs (attrs: {
     outputs = [ "out" "dev" "man" ];
-    patches = [
-      # Fixes an issue that happens when cross-compiling for us.
-      (fetchpatch {
-        url = "https://cgit.freedesktop.org/xorg/lib/libX11/patch/?id=0327c427d62f671eced067c6d9b69f4e216a8cac";
-        sha256 = "11k2mx56hjgw886zf1cdf2nhv7052d5rggimfshg6lq20i38vpza";
-      })
-    ];
     configureFlags = attrs.configureFlags or []
       ++ malloc0ReturnsNullCrossFlag;
     depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ecc477980b8a..cd2946048847 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -1,7 +1,5 @@
 https://invisible-mirror.net/archives/luit/luit-20190106.tgz
 https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
-https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2
-https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
 https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2
 https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2
 https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2
@@ -83,7 +81,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2
+mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
@@ -177,10 +175,11 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2
 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2
 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2
+mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2
 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2
+mirror://xorg/individual/lib/libxcb-1.14.tar.xz
 mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2
 mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2
 mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2
@@ -206,12 +205,13 @@ mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2
 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2
 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2
-mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2
+mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2
 mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2
 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2
 mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2
 mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2
-mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2
+mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz
+mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2
 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
 mirror://xorg/individual/util/imake-1.0.8.tar.bz2
 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix
index eeb175a5e789..5fda57048121 100644
--- a/pkgs/shells/bash/bash-completion/default.nix
+++ b/pkgs/shells/bash/bash-completion/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bash-completion";
-  version = "2.10";
+  version = "2.11";
 
   src = fetchFromGitHub {
     owner = "scop";
     repo = "bash-completion";
     rev = version;
-    sha256 = "047yjryy9d6hp18wkigbfrw9r0sm31inlsp8l28fhxg8ii032sgq";
+    sha256 = "0m3brd5jx7w07h8vxvvcmbyrlnadrx6hra3cvx6grzv6rin89liv";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index a040e6ab2424..58da8b71b650 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -190,10 +190,7 @@ in rec {
 
   stage1 = prevStage: let
     persistent = self: super: with prevStage; {
-      cmake = super.cmake.override {
-        isBootstrap = true;
-        useSharedLibraries = false;
-      };
+      cmake = super.cmakeMinimal;
 
       python3 = super.python3Minimal;
 
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 85142090dd42..d9befb9350ad 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -27,6 +27,8 @@ with pkgs;
   cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
   cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
 
+  install-shell-files = callPackage ./install-shell-files {};
+
   kernel-config = callPackage ./kernel.nix {};
 
   ld-library-path = callPackage ./ld-library-path {};
diff --git a/pkgs/test/install-shell-files/default.nix b/pkgs/test/install-shell-files/default.nix
new file mode 100644
index 000000000000..e3729c7d2504
--- /dev/null
+++ b/pkgs/test/install-shell-files/default.nix
@@ -0,0 +1,125 @@
+{ stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }:
+
+let
+  runTest = name: env: buildCommand:
+    runCommandLocal "install-shell-files--${name}" ({
+      nativeBuildInputs = [ installShellFiles ];
+      meta.platforms = stdenv.lib.platforms.all;
+    } // env) buildCommand;
+in
+
+recurseIntoAttrs {
+  # installManPage
+
+  install-manpage = runTest "install-manpage" {} ''
+    mkdir -p doc
+    echo foo > doc/foo.1
+    echo bar > doc/bar.2.gz
+    echo baz > doc/baz.3
+
+    installManPage doc/*
+
+    cmp doc/foo.1 $out/share/man/man1/foo.1
+    cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz
+    cmp doc/baz.3 $out/share/man/man3/baz.3
+  '';
+  install-manpage-outputs = runTest "install-manpage-outputs" {
+    outputs = [ "out" "man" "devman" ];
+  } ''
+    mkdir -p doc
+    echo foo > doc/foo.1
+    echo bar > doc/bar.3
+
+    installManPage doc/*
+
+    # assert they didn't go into $out
+    [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]]
+
+    # foo.1 alone went into man
+    cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1
+    [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]]
+
+    # bar.3 alone went into devman
+    cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3
+    [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]]
+
+    touch $out
+  '';
+
+  # installShellCompletion
+
+  install-completion = runTest "install-completion" {} ''
+    echo foo > foo
+    echo bar > bar
+    echo baz > baz
+    echo qux > qux.zsh
+    echo quux > quux
+
+    installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux
+
+    cmp foo $out/share/bash-completion/completions/foo
+    cmp bar $out/share/bash-completion/completions/bar
+    cmp baz $out/share/zsh/site-functions/_baz
+    cmp qux.zsh $out/share/zsh/site-functions/_qux
+    cmp quux $out/share/fish/vendor_completions.d/quux
+  '';
+  install-completion-output = runTest "install-completion-output" {
+    outputs = [ "out" "bin" ];
+  } ''
+    echo foo > foo
+
+    installShellCompletion --bash foo
+
+    # assert it didn't go into $out
+    [[ ! -f $out/share/bash-completion/completions/foo ]]
+
+    cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo
+
+    touch $out
+  '';
+  install-completion-name = runTest "install-completion-name" {} ''
+    echo foo > foo
+    echo bar > bar
+    echo baz > baz
+
+    installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz
+
+    cmp foo $out/share/bash-completion/completions/foobar.bash
+    cmp bar $out/share/zsh/site-functions/_foobar
+    cmp baz $out/share/fish/vendor_completions.d/baz
+  '';
+  install-completion-inference = runTest "install-completion-inference" {} ''
+    echo foo > foo.bash
+    echo bar > bar.zsh
+    echo baz > baz.fish
+
+    installShellCompletion foo.bash bar.zsh baz.fish
+
+    cmp foo.bash $out/share/bash-completion/completions/foo.bash
+    cmp bar.zsh $out/share/zsh/site-functions/_bar
+    cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish
+  '';
+  install-completion-cmd = runTest "install-completion-cmd" {} ''
+    echo foo > foo.bash
+    echo bar > bar.zsh
+    echo baz > baz.fish
+    echo qux > qux.fish
+
+    installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish
+
+    cmp foo.bash $out/share/bash-completion/completions/foobar.bash
+    cmp bar.zsh $out/share/zsh/site-functions/_foobar
+    cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish
+    cmp qux.fish $out/share/fish/vendor_completions.d/qux
+  '';
+  install-completion-fifo = runTest "install-completion-fifo" {} ''
+    installShellCompletion \
+      --bash --name foo.bash <(echo foo) \
+      --zsh --name _foo <(echo bar) \
+      --fish --name foo.fish <(echo baz)
+
+    [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; }
+    [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; }
+    [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; }
+  '';
+}
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index bf20e0119ec6..fd4872cf8442 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "brotli";
-  version = "1.0.7";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "brotli";
     rev = "v" + version;
-    sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw";
+    sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -32,7 +32,14 @@ stdenv.mkDerivation rec {
 
   # This breaks on Darwin because our cmake hook tries to make a build folder
   # and the wonderful bazel BUILD file is already there (yay case-insensitivity?)
-  prePatch = "rm BUILD";
+  prePatch = ''
+      rm BUILD
+
+      # Upstream fixed this reference to runtime-path after the release
+      # and with this references g++ complains about invalid option -R
+      sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in
+      cat scripts/libbrotli*.pc.in
+    '';
 
   # Don't bother with "man" output for now,
   # it currently only makes the manpages hard to use.
diff --git a/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch b/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch
deleted file mode 100644
index ae1a02d4d202..000000000000
--- a/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0251229bfd9617e8a35cf9dd7d338d63fff74a0c Mon Sep 17 00:00:00 2001
-From: Assaf Gordon <assafgordon@gmail.com>
-Date: Mon, 13 May 2019 16:37:40 -0600
-Subject: [PATCH] tests: avoid false-positive in date-debug test
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When debugging an invalid date due to DST switching, the intermediate
-'normalized time' should not be checked - its value can differ between
-systems (e.g. glibc vs musl).
-
-Reported by Niklas Hambüchen in
-https://lists.gnu.org/r/coreutils/2019-05/msg00031.html
-Analyzed by Rich Felker in
-https://lists.gnu.org/r/coreutils/2019-05/msg00039.html
-
-* tests/misc/date-debug.sh: Replace the exact normalized time
-with 'XX:XX:XX' so different values would not trigger test failure.
----
- tests/misc/date-debug.sh | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/tests/misc/date-debug.sh b/tests/misc/date-debug.sh
-index aa47f1abb..2ce6f4ce8 100755
---- a/tests/misc/date-debug.sh
-+++ b/tests/misc/date-debug.sh
-@@ -71,7 +71,7 @@ date: input timezone: TZ="America/Edmonton" in date string
- date: using specified time as starting value: '02:30:00'
- date: error: invalid date/time value:
- date:     user provided time: '(Y-M-D) 2006-04-02 02:30:00'
--date:        normalized time: '(Y-M-D) 2006-04-02 03:30:00'
-+date:        normalized time: '(Y-M-D) 2006-04-02 XX:XX:XX'
- date:                                             --
- date:      possible reasons:
- date:        non-existing due to daylight-saving time;
-@@ -81,7 +81,14 @@ date: invalid date 'TZ="America/Edmonton" 2006-04-02 02:30:00'
- EOF
- 
- # date should return 1 (error) for invalid date
--returns_ 1 date --debug -d "$in2" >out2 2>&1 || fail=1
-+returns_ 1 date --debug -d "$in2" >out2-t 2>&1 || fail=1
-+
-+# The output line of "normalized time" can differ between systems
-+# (e.g. glibc vs musl) and should not be checked.
-+# See: https://lists.gnu.org/archive/html/coreutils/2019-05/msg00039.html
-+sed '/normalized time:/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]/ XX:XX:XX/' \
-+    out2-t > out2 || framework_failure_
-+
- compare exp2 out2 || fail=1
- 
- ##
diff --git a/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch b/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch
deleted file mode 100644
index 97d95d1c5b19..000000000000
--- a/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3bd82a82cf4ba693d2c31c7b95aaec4e56dc92a4 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 11 Mar 2019 16:40:29 -0700
-Subject: [PATCH 1/1] strtod: fix clash with strtold
-
-Problem reported for RHEL 5 by Jesse Caldwell (Bug#34817).
-* lib/strtod.c (compute_minus_zero, minus_zero):
-Simplify by remving the macro / external variable,
-and having just a function.  User changed.  This avoids
-the need for an external variable that might clash.
----
- ChangeLog    |  9 +++++++++
- lib/strtod.c | 11 +++++------
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/lib/strtod.c b/lib/strtod.c
-index b9eaa51..69b1564 100644
---- a/lib/strtod.c
-+++ b/lib/strtod.c
-@@ -294,16 +294,15 @@ parse_number (const char *nptr,
-    ICC 10.0 has a bug when optimizing the expression -zero.
-    The expression -MIN * MIN does not work when cross-compiling
-    to PowerPC on Mac OS X 10.5.  */
--#if defined __hpux || defined __sgi || defined __ICC
- static DOUBLE
--compute_minus_zero (void)
-+minus_zero (void)
- {
-+#if defined __hpux || defined __sgi || defined __ICC
-   return -MIN * MIN;
--}
--# define minus_zero compute_minus_zero ()
- #else
--DOUBLE minus_zero = -0.0;
-+  return -0.0;
- #endif
-+}
- 
- /* Convert NPTR to a DOUBLE.  If ENDPTR is not NULL, a pointer to the
-    character after the last one used in the number is put in *ENDPTR.  */
-@@ -479,6 +478,6 @@ STRTOD (const char *nptr, char **endptr)
-   /* Special case -0.0, since at least ICC miscompiles negation.  We
-      can't use copysign(), as that drags in -lm on some platforms.  */
-   if (!num && negative)
--    return minus_zero;
-+    return minus_zero ();
-   return negative ? -num : num;
- }
--- 
-1.9.1
-
diff --git a/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch b/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch
deleted file mode 100644
index 02b0b85db312..000000000000
--- a/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch
+++ /dev/null
@@ -1,1153 +0,0 @@
-From 453ff940449bbbde9ec00f0bbf82a359c5598fc7 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Sat, 23 Mar 2019 23:00:52 +0100
-Subject: [PATCH 1/1] Support cross-compilation to musl libc.
-
-Reported by Necktwi Ozfguah <necktwi@ferryfair.com>.
-
-* m4/calloc.m4 (_AC_FUNC_CALLOC_IF): Add cross-compilation guesses for
-musl libc.
-* m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): Likewise.
-* m4/chown.m4 (gl_FUNC_CHOWN): Likewise.
-* m4/d-ino.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_INO): Likewise.
-* m4/fdopendir.m4 (gl_FUNC_FDOPENDIR): Likewise.
-* m4/fnmatch.m4 (gl_FUNC_FNMATCH_POSIX): Likewise.
-* m4/fpurge.m4 (gl_FUNC_FPURGE): Likewise.
-* m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): Likewise.
-* m4/getcwd-abort-bug.m4 (gl_FUNC_GETCWD_ABORT_BUG): Likewise.
-* m4/getdelim.m4 (gl_FUNC_GETDELIM): Likewise.
-* m4/getgroups.m4 (AC_FUNC_GETGROUPS, gl_FUNC_GETGROUPS): Likewise.
-* m4/getline.m4 (gl_FUNC_GETLINE): Likewise.
-* m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY_CLOBBER): Likewise.
-* m4/hypot.m4 (gl_FUNC_HYPOT): Likewise.  // removed
-* m4/hypotf.m4 (gl_FUNC_HYPOTF): Likewise.  // removed
-* m4/hypotl.m4 (gl_FUNC_HYPOTL): Likewise.  // removed
-* m4/iconv_open-utf.m4 (gl_FUNC_ICONV_OPEN_UTF_SUPPORT): Likewise.  // removed
-* m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): Likewise.
-* m4/log.m4 (gl_FUNC_LOG): Likewise.  // removed
-* m4/logf.m4 (gl_FUNC_LOGF): Likewise.  // removed
-* m4/logl.m4 (gl_FUNC_LOGL_WORKS): Likewise.  // removed
-* m4/log10.m4 (gl_FUNC_LOG10): Likewise.  // removed
-* m4/log10f.m4 (gl_FUNC_LOG10F): Likewise.  // removed
-* m4/log10l.m4 (gl_FUNC_LOG10L): Likewise.  // removed
-* m4/log1p.m4 (gl_FUNC_LOG1P): Likewise.  // removed
-* m4/log1pf.m4 (gl_FUNC_LOG1PF): Likewise.  // removed
-* m4/log1pl.m4 (gl_FUNC_LOG1PL): Likewise.  // removed
-* m4/log2.m4 (gl_FUNC_LOG2): Likewise.  // removed
-* m4/log2f.m4 (gl_FUNC_LOG2F): Likewise.  // removed
-* m4/malloc.m4 (_AC_FUNC_MALLOC_IF): Likewise.
-* m4/mkdir.m4 (gl_FUNC_MKDIR): Likewise.
-* m4/mkstemp.m4 (gl_FUNC_MKSTEMP): Likewise.
-* m4/modf.m4 (gl_FUNC_MODF): Likewise.  // removed
-* m4/modff.m4 (gl_FUNC_MODFF): Likewise.  // removed
-* m4/modfl.m4 (gl_FUNC_MODFL): Likewise.  // removed
-* m4/perror.m4 (gl_FUNC_PERROR): Likewise.
-* m4/printf.m4 (gl_PRINTF_SIZES_C99, gl_PRINTF_INFINITE,
-gl_PRINTF_INFINITE_LONG_DOUBLE, gl_PRINTF_DIRECTIVE_A,
-gl_PRINTF_DIRECTIVE_F, gl_PRINTF_FLAG_ZERO, gl_SNPRINTF_TRUNCATION_C99,
-gl_SNPRINTF_RETVAL_C99, gl_SNPRINTF_DIRECTIVE_N,
-gl_VSNPRINTF_ZEROSIZE_C99): Likewise.
-* m4/ptsname.m4 (gl_FUNC_PTSNAME): Likewise.  // removed
-* m4/putenv.m4 (gl_FUNC_PUTENV): Likewise.
-* m4/realloc.m4 (_AC_FUNC_REALLOC_IF): Likewise.
-* m4/remainder.m4 (gl_FUNC_REMAINDER): Likewise.  // removed
-* m4/remainderf.m4 (gl_FUNC_REMAINDERF): Likewise.  // removed
-* m4/remainderl.m4 (gl_FUNC_REMAINDERL): Likewise.  // removed
-* m4/rintl.m4 (gl_FUNC_RINTL): Likewise.  // removed
-* m4/round.m4 (gl_FUNC_ROUND): Likewise.  // removed
-* m4/roundf.m4 (gl_FUNC_ROUNDF): Likewise.  // removed
-* m4/roundl.m4 (gl_FUNC_ROUNDL): Likewise.  // removed
-* m4/setenv.m4 (gl_FUNC_SETENV): Likewise.
-* m4/signbit.m4 (gl_SIGNBIT): Likewise.
-* m4/sleep.m4 (gl_FUNC_SLEEP): Likewise.
-* m4/stpncpy.m4 (gl_FUNC_STPNCPY): Likewise.
-* m4/strerror.m4 (gl_FUNC_STRERROR, gl_FUNC_STRERROR_0): Likewise.
-* m4/strtod.m4 (gl_FUNC_STRTOD): Likewise.
-* m4/strtold.m4 (gl_FUNC_STRTOLD): Likewise.
-* m4/trunc.m4 (gl_FUNC_TRUNC): Likewise.    // removed
-* m4/truncf.m4 (gl_FUNC_TRUNCF): Likewise.  // removed
-* m4/truncl.m4 (gl_FUNC_TRUNCL): Likewise.  // removed
-* m4/tzset.m4 (gl_FUNC_TZSET_CLOBBER): Likewise.
-* m4/ungetc.m4 (gl_FUNC_UNGETC_WORKS): Likewise.
-* m4/usleep.m4 (gl_FUNC_USLEEP): Likewise.
-* m4/utimes.m4 (gl_FUNC_UTIMES): Likewise.
-* m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise.
----
- m4/calloc.m4           |  4 ++-
- m4/canonicalize.m4     |  4 ++-
- m4/chown.m4            | 22 +++++++------
- m4/d-ino.m4            | 16 +++++-----
- m4/fdopendir.m4        | 12 ++++---
- m4/fnmatch.m4          | 18 ++++++++---
- m4/fpurge.m4           | 24 +++++++++-----
- m4/getcwd-abort-bug.m4 | 11 +++++--
- m4/getcwd.m4           |  4 ++-
- m4/getdelim.m4         | 40 ++++++++++++++----------
- m4/getgroups.m4        |  6 +++-
- m4/getline.m4          | 38 +++++++++++++---------
- m4/gettimeofday.m4     |  4 ++-
- m4/link-follow.m4      |  4 ++-
- m4/malloc.m4           |  4 +--
- m4/mkdir.m4            |  4 ++-
- m4/mkstemp.m4          |  4 ++-
- m4/perror.m4           | 12 ++++---
- m4/printf.m4           | 22 ++++++++++++-
- m4/putenv.m4           |  4 ++-
- m4/realloc.m4          |  4 +--
- m4/setenv.m4           |  4 ++-
- m4/signbit.m4          |  6 +++-
- m4/sleep.m4            |  4 ++-
- m4/stpncpy.m4          | 14 +++++++--
- m4/strerror.m4         |  6 +++-
- m4/strtod.m4           | 10 +++---
- m4/strtold.m4          |  9 ++++--
- m4/tzset.m4            |  4 ++-
- m4/ungetc.m4           | 18 ++++++-----
- m4/usleep.m4           |  4 ++-
- m4/utimes.m4           | 10 +++---
- m4/wcwidth.m4          | 12 ++++---
- 76 files changed, 461 insertions(+), 157 deletions(-)
-
-diff --git a/m4/calloc.m4 b/m4/calloc.m4
-index 012a5bf..d76535d 100644
---- a/m4/calloc.m4
-+++ b/m4/calloc.m4
-@@ -1,4 +1,4 @@
--# calloc.m4 serial 18
-+# calloc.m4 serial 19
-
- # Copyright (C) 2004-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -40,6 +40,8 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF],
-        [case "$host_os" in
-                          # Guess yes on glibc systems.
-           *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;;
-+                         # Guess yes on musl systems.
-+          *-musl*)       ac_cv_func_calloc_0_nonnull="guessing yes" ;;
-                          # Guess yes on native Windows.
-           mingw*)        ac_cv_func_calloc_0_nonnull="guessing yes" ;;
-                          # If we don't know, assume the worst.
-diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
-index 5b6e25d..b61747b 100644
---- a/m4/canonicalize.m4
-+++ b/m4/canonicalize.m4
-@@ -1,4 +1,4 @@
--# canonicalize.m4 serial 29
-+# canonicalize.m4 serial 30
-
- dnl Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc.
-
-@@ -113,6 +113,8 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS],
-      [case "$host_os" in
-                        # Guess yes on glibc systems.
-         *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;;
-+                       # Guess yes on musl systems.
-+        *-musl*)       gl_cv_func_realpath_works="guessing yes" ;;
-                        # Guess no on native Windows.
-         mingw*)        gl_cv_func_realpath_works="guessing no" ;;
-                        # If we don't know, assume the worst.
-diff --git a/m4/chown.m4 b/m4/chown.m4
-index ecfc0c0..b798325 100644
---- a/m4/chown.m4
-+++ b/m4/chown.m4
-@@ -1,4 +1,4 @@
--# serial 30
-+# serial 32
- # Determine whether we need the chown wrapper.
-
- dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2019 Free Software
-@@ -109,10 +109,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN],
-         [gl_cv_func_chown_slash_works=yes],
-         [gl_cv_func_chown_slash_works=no],
-         [case "$host_os" in
--                   # Guess yes on glibc systems.
--           *-gnu*) gl_cv_func_chown_slash_works="guessing yes" ;;
--                   # If we don't know, assume the worst.
--           *)      gl_cv_func_chown_slash_works="guessing no" ;;
-+                    # Guess yes on glibc systems.
-+           *-gnu*)  gl_cv_func_chown_slash_works="guessing yes" ;;
-+                    # Guess yes on musl systems.
-+           *-musl*) gl_cv_func_chown_slash_works="guessing yes" ;;
-+                    # If we don't know, assume the worst.
-+           *)       gl_cv_func_chown_slash_works="guessing no" ;;
-          esac
-         ])
-       rm -f conftest.link conftest.file])
-@@ -145,10 +147,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN],
-         [gl_cv_func_chown_ctime_works=yes],
-         [gl_cv_func_chown_ctime_works=no],
-         [case "$host_os" in
--                   # Guess yes on glibc systems.
--           *-gnu*) gl_cv_func_chown_ctime_works="guessing yes" ;;
--                   # If we don't know, assume the worst.
--           *)      gl_cv_func_chown_ctime_works="guessing no" ;;
-+                    # Guess yes on glibc systems.
-+           *-gnu*)  gl_cv_func_chown_ctime_works="guessing yes" ;;
-+                    # Guess yes on musl systems.
-+           *-musl*) gl_cv_func_chown_ctime_works="guessing yes" ;;
-+                    # If we don't know, assume the worst.
-+           *)       gl_cv_func_chown_ctime_works="guessing no" ;;
-          esac
-         ])
-       rm -f conftest.file])
-diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
-index f1420cc..87dcacc 100644
---- a/m4/d-ino.m4
-+++ b/m4/d-ino.m4
-@@ -1,4 +1,4 @@
--# serial 18
-+# serial 19
-
- dnl From Jim Meyering.
- dnl
-@@ -40,12 +40,14 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO],
-            [gl_cv_struct_dirent_d_ino=yes],
-            [gl_cv_struct_dirent_d_ino=no],
-            [case "$host_os" in
--                           # Guess yes on glibc systems with Linux kernel.
--              linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
--                           # Guess no on native Windows.
--              mingw*)      gl_cv_struct_dirent_d_ino="guessing no" ;;
--                           # If we don't know, assume the worst.
--              *)           gl_cv_struct_dirent_d_ino="guessing no" ;;
-+                            # Guess yes on glibc systems with Linux kernel.
-+              linux*-gnu*)  gl_cv_struct_dirent_d_ino="guessing yes" ;;
-+                            # Guess yes on musl systems with Linux kernel.
-+              linux*-musl*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
-+                            # Guess no on native Windows.
-+              mingw*)       gl_cv_struct_dirent_d_ino="guessing no" ;;
-+                            # If we don't know, assume the worst.
-+              *)            gl_cv_struct_dirent_d_ino="guessing no" ;;
-             esac
-            ])])
-    case "$gl_cv_struct_dirent_d_ino" in
-diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4
-index 0490551..b2b3b03 100644
---- a/m4/fdopendir.m4
-+++ b/m4/fdopendir.m4
-@@ -1,4 +1,4 @@
--# serial 10
-+# serial 11
- # See if we need to provide fdopendir.
-
- dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
-@@ -45,10 +45,12 @@ DIR *fdopendir (int);
-          [gl_cv_func_fdopendir_works=yes],
-          [gl_cv_func_fdopendir_works=no],
-          [case "$host_os" in
--                    # Guess yes on glibc systems.
--            *-gnu*) gl_cv_func_fdopendir_works="guessing yes" ;;
--                    # If we don't know, assume the worst.
--            *)      gl_cv_func_fdopendir_works="guessing no" ;;
-+                     # Guess yes on glibc systems.
-+            *-gnu*)  gl_cv_func_fdopendir_works="guessing yes" ;;
-+                     # Guess yes on musl systems.
-+            *-musl*) gl_cv_func_fdopendir_works="guessing yes" ;;
-+                     # If we don't know, assume the worst.
-+            *)       gl_cv_func_fdopendir_works="guessing no" ;;
-           esac
-          ])])
-     case "$gl_cv_func_fdopendir_works" in
-diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
-index c264ca7..75ba55b 100644
---- a/m4/fnmatch.m4
-+++ b/m4/fnmatch.m4
-@@ -1,4 +1,4 @@
--# Check for fnmatch - serial 13.  -*- coding: utf-8 -*-
-+# Check for fnmatch - serial 14.  -*- coding: utf-8 -*-
-
- # Copyright (C) 2000-2007, 2009-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
-   m4_divert_text([DEFAULTS], [gl_fnmatch_required=POSIX])
-
-   AC_REQUIRE([gl_FNMATCH_H])
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-   gl_fnmatch_required_lowercase=`
-     echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]'
-   `
-@@ -117,12 +118,19 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
-             ]])],
-          [eval "$gl_fnmatch_cache_var=yes"],
-          [eval "$gl_fnmatch_cache_var=no"],
--         [eval "$gl_fnmatch_cache_var=\"guessing no\""])
-+         [case "$host_os" in
-+                     # Guess yes on musl systems.
-+            *-musl*) eval "$gl_fnmatch_cache_var=\"guessing yes\"" ;;
-+                     # Guess no otherwise, even on glibc systems.
-+            *)       eval "$gl_fnmatch_cache_var=\"guessing no\"" ;;
-+          esac
-+         ])
-       ])
-     eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\""
--    if test "$gl_fnmatch_result" != yes; then
--      REPLACE_FNMATCH=1
--    fi
-+    case "$gl_fnmatch_result" in
-+      *yes) ;;
-+      *) REPLACE_FNMATCH=1 ;;
-+    esac
-   fi
-   if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then
-     gl_REPLACE_FNMATCH_H
-diff --git a/m4/fpurge.m4 b/m4/fpurge.m4
-index cb21f56..6c5b3e9 100644
---- a/m4/fpurge.m4
-+++ b/m4/fpurge.m4
-@@ -1,4 +1,4 @@
--# fpurge.m4 serial 8
-+# fpurge.m4 serial 9
- dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -7,12 +7,13 @@ dnl with or without modifications, as long as this notice is preserved.
- AC_DEFUN([gl_FUNC_FPURGE],
- [
-   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-   AC_CHECK_FUNCS_ONCE([fpurge])
-   AC_CHECK_FUNCS_ONCE([__fpurge])
-   AC_CHECK_DECLS([fpurge], , , [[#include <stdio.h>]])
-   if test "x$ac_cv_func_fpurge" = xyes; then
-     HAVE_FPURGE=1
--    # Detect BSD bug.  Only cygwin 1.7 is known to be immune.
-+    # Detect BSD bug.  Only cygwin 1.7 and musl are known to be immune.
-     AC_CACHE_CHECK([whether fpurge works], [gl_cv_func_fpurge_works],
-       [AC_RUN_IFELSE(
-          [AC_LANG_PROGRAM(
-@@ -48,11 +49,20 @@ AC_DEFUN([gl_FUNC_FPURGE],
-                return 13;
-              return 0;
-             ])],
--      [gl_cv_func_fpurge_works=yes], [gl_cv_func_fpurge_works=no],
--      [gl_cv_func_fpurge_works='guessing no'])])
--    if test "x$gl_cv_func_fpurge_works" != xyes; then
--      REPLACE_FPURGE=1
--    fi
-+         [gl_cv_func_fpurge_works=yes],
-+         [gl_cv_func_fpurge_works=no],
-+         [case "$host_os" in
-+                     # Guess yes on musl systems.
-+            *-musl*) gl_cv_func_fpurge_works="guessing yes" ;;
-+                     # Guess no otherwise.
-+            *)       gl_cv_func_fpurge_works="guessing no" ;;
-+          esac
-+         ])
-+      ])
-+    case "$gl_cv_func_fpurge_works" in
-+      *yes) ;;
-+      *) REPLACE_FPURGE=1 ;;
-+    esac
-   else
-     HAVE_FPURGE=0
-   fi
-diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4
-index f0f24a5..7227f08 100644
---- a/m4/getcwd-abort-bug.m4
-+++ b/m4/getcwd-abort-bug.m4
-@@ -1,4 +1,4 @@
--# serial 9
-+# serial 11
- # Determine whether getcwd aborts when the length of the working directory
- # name is unusually large.  Any length between 4k and 16k trigger the bug
- # when using glibc-2.4.90-9 or older.
-@@ -13,6 +13,7 @@
- # gl_FUNC_GETCWD_ABORT_BUG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
- AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG],
- [
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-   AC_CHECK_DECLS_ONCE([getcwd])
-   AC_CHECK_HEADERS_ONCE([unistd.h])
-   AC_REQUIRE([gl_PATHMAX_SNIPPET_PREREQ])
-@@ -142,7 +143,13 @@ main ()
-         else
-           gl_cv_func_getcwd_abort_bug=no
-         fi],
--       [gl_cv_func_getcwd_abort_bug=yes])
-+       [case "$host_os" in
-+                   # Guess no on musl systems.
-+          *-musl*) gl_cv_func_getcwd_abort_bug="guessing no" ;;
-+                   # Guess yes otherwise, even on glibc systems.
-+          *)       gl_cv_func_getcwd_abort_bug="guessing yes"
-+        esac
-+       ])
-     ])
-   AS_IF([test $gl_cv_func_getcwd_abort_bug = yes], [$1], [$2])
- ])
-diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
-index 4929b51..625171a 100644
---- a/m4/getcwd.m4
-+++ b/m4/getcwd.m4
-@@ -6,7 +6,7 @@
- # with or without modifications, as long as this notice is preserved.
-
- # Written by Paul Eggert.
--# serial 16
-+# serial 17
-
- AC_DEFUN([gl_FUNC_GETCWD_NULL],
-   [
-@@ -50,6 +50,8 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
-         [[case "$host_os" in
-                            # Guess yes on glibc systems.
-             *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";;
-+                           # Guess yes on musl systems.
-+            *-musl*)       gl_cv_func_getcwd_null="guessing yes";;
-                            # Guess yes on Cygwin.
-             cygwin*)       gl_cv_func_getcwd_null="guessing yes";;
-                            # If we don't know, assume the worst.
-diff --git a/m4/getdelim.m4 b/m4/getdelim.m4
-index bf17c57..e77c379 100644
---- a/m4/getdelim.m4
-+++ b/m4/getdelim.m4
-@@ -1,4 +1,4 @@
--# getdelim.m4 serial 12
-+# getdelim.m4 serial 13
-
- dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
- dnl
-@@ -11,6 +11,7 @@ AC_PREREQ([2.59])
- AC_DEFUN([gl_FUNC_GETDELIM],
- [
-   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-   dnl Persuade glibc <stdio.h> to declare getdelim().
-   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-@@ -21,9 +22,10 @@ AC_DEFUN([gl_FUNC_GETDELIM],
-   if test $ac_cv_func_getdelim = yes; then
-     HAVE_GETDELIM=1
-     dnl Found it in some library.  Verify that it works.
--    AC_CACHE_CHECK([for working getdelim function], [gl_cv_func_working_getdelim],
--    [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
--    AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+    AC_CACHE_CHECK([for working getdelim function],
-+      [gl_cv_func_working_getdelim],
-+      [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
-+       AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #    include <stdio.h>
- #    include <stdlib.h>
- #    include <string.h>
-@@ -53,25 +55,31 @@ AC_DEFUN([gl_FUNC_GETDELIM],
-       fclose (in);
-       return 0;
-     }
--    ]])], [gl_cv_func_working_getdelim=yes] dnl The library version works.
--    , [gl_cv_func_working_getdelim=no] dnl The library version does NOT work.
--    , dnl We're cross compiling. Assume it works on glibc2 systems.
--      [AC_EGREP_CPP([Lucky GNU user],
--         [
-+    ]])],
-+         [gl_cv_func_working_getdelim=yes],
-+         [gl_cv_func_working_getdelim=no],
-+         [dnl We're cross compiling.
-+          dnl Guess it works on glibc2 systems and musl systems.
-+          AC_EGREP_CPP([Lucky GNU user],
-+            [
- #include <features.h>
- #ifdef __GNU_LIBRARY__
-  #if (__GLIBC__ >= 2) && !defined __UCLIBC__
-   Lucky GNU user
-  #endif
- #endif
--         ],
--         [gl_cv_func_working_getdelim="guessing yes"],
--         [gl_cv_func_working_getdelim="guessing no"])]
--    )])
-+            ],
-+            [gl_cv_func_working_getdelim="guessing yes"],
-+            [case "$host_os" in
-+               *-musl*) gl_cv_func_working_getdelim="guessing yes" ;;
-+               *)       gl_cv_func_working_getdelim="guessing no" ;;
-+             esac
-+            ])
-+         ])
-+      ])
-     case "$gl_cv_func_working_getdelim" in
--      *no)
--        REPLACE_GETDELIM=1
--        ;;
-+      *yes) ;;
-+      *) REPLACE_GETDELIM=1 ;;
-     esac
-   else
-     HAVE_GETDELIM=0
-diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
-index 2ce986e..c93447b 100644
---- a/m4/getgroups.m4
-+++ b/m4/getgroups.m4
-@@ -1,4 +1,4 @@
--# serial 21
-+# serial 22
-
- dnl From Jim Meyering.
- dnl A wrapper around AC_FUNC_GETGROUPS.
-@@ -42,6 +42,8 @@ AC_DEFUN([AC_FUNC_GETGROUPS],
-          [case "$host_os" in # ((
-                            # Guess yes on glibc systems.
-             *-gnu* | gnu*) ac_cv_func_getgroups_works="guessing yes" ;;
-+                           # Guess yes on musl systems.
-+            *-musl*)       ac_cv_func_getgroups_works="guessing yes" ;;
-                            # If we don't know, assume the worst.
-             *)             ac_cv_func_getgroups_works="guessing no" ;;
-           esac
-@@ -95,6 +97,8 @@ AC_DEFUN([gl_FUNC_GETGROUPS],
-           [case "$host_os" in
-                             # Guess yes on glibc systems.
-              *-gnu* | gnu*) gl_cv_func_getgroups_works="guessing yes" ;;
-+                            # Guess yes on musl systems.
-+             *-musl*)       gl_cv_func_getgroups_works="guessing yes" ;;
-                             # If we don't know, assume the worst.
-              *)             gl_cv_func_getgroups_works="guessing no" ;;
-            esac
-diff --git a/m4/getline.m4 b/m4/getline.m4
-index 5b2ead2..32f771c 100644
---- a/m4/getline.m4
-+++ b/m4/getline.m4
-@@ -1,4 +1,4 @@
--# getline.m4 serial 28
-+# getline.m4 serial 29
-
- dnl Copyright (C) 1998-2003, 2005-2007, 2009-2019 Free Software Foundation,
- dnl Inc.
-@@ -16,6 +16,7 @@ dnl to do with the function we need.
- AC_DEFUN([gl_FUNC_GETLINE],
- [
-   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-   dnl Persuade glibc <stdio.h> to declare getline().
-   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-@@ -28,9 +29,10 @@ AC_DEFUN([gl_FUNC_GETLINE],
-                  gl_getline_needs_run_time_check=yes],
-                 [am_cv_func_working_getline=no])
-   if test $gl_getline_needs_run_time_check = yes; then
--    AC_CACHE_CHECK([for working getline function], [am_cv_func_working_getline],
--    [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
--    AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+    AC_CACHE_CHECK([for working getline function],
-+      [am_cv_func_working_getline],
-+      [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
-+       AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #    include <stdio.h>
- #    include <stdlib.h>
- #    include <string.h>
-@@ -61,21 +63,28 @@ AC_DEFUN([gl_FUNC_GETLINE],
-       fclose (in);
-       return 0;
-     }
--    ]])], [am_cv_func_working_getline=yes] dnl The library version works.
--    , [am_cv_func_working_getline=no] dnl The library version does NOT work.
--    , dnl We're cross compiling. Assume it works on glibc2 systems.
--      [AC_EGREP_CPP([Lucky GNU user],
--         [
-+    ]])],
-+         [am_cv_func_working_getline=yes],
-+         [am_cv_func_working_getline=no],
-+         [dnl We're cross compiling.
-+          dnl Guess it works on glibc2 systems and musl systems.
-+          AC_EGREP_CPP([Lucky GNU user],
-+            [
- #include <features.h>
- #ifdef __GNU_LIBRARY__
-  #if (__GLIBC__ >= 2) && !defined __UCLIBC__
-   Lucky GNU user
-  #endif
- #endif
--         ],
--         [am_cv_func_working_getline="guessing yes"],
--         [am_cv_func_working_getline="guessing no"])]
--    )])
-+            ],
-+            [am_cv_func_working_getline="guessing yes"],
-+            [case "$host_os" in
-+               *-musl*) am_cv_func_working_getline="guessing yes" ;;
-+               *)       am_cv_func_working_getline="guessing no" ;;
-+             esac
-+            ])
-+         ])
-+      ])
-   fi
-
-   if test $ac_cv_have_decl_getline = no; then
-@@ -83,7 +92,8 @@ AC_DEFUN([gl_FUNC_GETLINE],
-   fi
-
-   case "$am_cv_func_working_getline" in
--    *no)
-+    *yes) ;;
-+    *)
-       dnl Set REPLACE_GETLINE always: Even if we have not found the broken
-       dnl getline function among $LIBS, it may exist in libinet and the
-       dnl executable may be linked with -linet.
-diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
-index d29b4bf..5e2ef6f 100644
---- a/m4/gettimeofday.m4
-+++ b/m4/gettimeofday.m4
-@@ -1,4 +1,4 @@
--# serial 25
-+# serial 26
-
- # Copyright (C) 2001-2003, 2005, 2007, 2009-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -105,6 +105,8 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
-       case "$host_os" in
-                        # Guess all is fine on glibc systems.
-         *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-+                       # Guess all is fine on musl systems.
-+        *-musl*)       gl_cv_func_gettimeofday_clobber="guessing no" ;;
-                        # Guess no on native Windows.
-         mingw*)        gl_cv_func_gettimeofday_clobber="guessing no" ;;
-                        # If we don't know, assume the worst.
-diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
-index cbd2dca..8ac7301 100644
---- a/m4/link-follow.m4
-+++ b/m4/link-follow.m4
-@@ -1,4 +1,4 @@
--# serial 20
-+# serial 21
- dnl Run a program to determine whether link(2) follows symlinks.
- dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
-
-@@ -88,6 +88,8 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK],
-             case "$host_os" in
-                                   # On glibc/Linux we know the result.
-               linux*-gnu* | gnu*) gl_cv_func_link_follows_symlink="guessing no" ;;
-+                                  # On musl/Linux we know the result.
-+              linux*-musl*)       gl_cv_func_link_follows_symlink="guessing no" ;;
-                                   # Otherwise, we don't know.
-               *)                  gl_cv_func_link_follows_symlink=unknown ;;
-             esac
-diff --git a/m4/malloc.m4 b/m4/malloc.m4
-index b9b8d4b..c469c45 100644
---- a/m4/malloc.m4
-+++ b/m4/malloc.m4
-@@ -1,4 +1,4 @@
--# malloc.m4 serial 17
-+# malloc.m4 serial 19
- dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF],
-        [ac_cv_func_malloc_0_nonnull=no],
-        [case "$host_os" in
-           # Guess yes on platforms where we know the result.
--          *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
-+          *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
-           | hpux* | solaris* | cygwin* | mingw*)
-             ac_cv_func_malloc_0_nonnull="guessing yes" ;;
-           # If we don't know, assume the worst.
-diff --git a/m4/mkdir.m4 b/m4/mkdir.m4
-index 4cd9590..366a3cd 100644
---- a/m4/mkdir.m4
-+++ b/m4/mkdir.m4
-@@ -1,4 +1,4 @@
--# serial 14
-+# serial 15
-
- # Copyright (C) 2001, 2003-2004, 2006, 2008-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -62,6 +62,8 @@ AC_DEFUN([gl_FUNC_MKDIR],
-       [case "$host_os" in
-                         # Guess yes on glibc systems.
-          *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
-+                        # Guess yes on musl systems.
-+         *-musl*)       gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
-                         # Guess no on native Windows.
-          mingw*)        gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
-                         # If we don't know, assume the worst.
-diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
-index ae24c3b..1b15c2e 100644
---- a/m4/mkstemp.m4
-+++ b/m4/mkstemp.m4
-@@ -1,4 +1,4 @@
--#serial 25
-+#serial 26
-
- # Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -59,6 +59,8 @@ AC_DEFUN([gl_FUNC_MKSTEMP],
-           [case "$host_os" in
-                             # Guess yes on glibc systems.
-              *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;;
-+                            # Guess yes on musl systems.
-+             *-musl*)       gl_cv_func_working_mkstemp="guessing yes" ;;
-                             # Guess no on native Windows.
-              mingw*)        gl_cv_func_working_mkstemp="guessing no" ;;
-                             # If we don't know, assume the worst.
-diff --git a/m4/perror.m4 b/m4/perror.m4
-index 335be72..08e2db1 100644
---- a/m4/perror.m4
-+++ b/m4/perror.m4
-@@ -1,4 +1,4 @@
--# perror.m4 serial 7
-+# perror.m4 serial 8
- dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -48,10 +48,12 @@ AC_DEFUN([gl_FUNC_PERROR],
-             rm -rf conftest.txt1 conftest.txt2],
-            [gl_cv_func_perror_works=no],
-            [case "$host_os" in
--                      # Guess yes on native Windows.
--              mingw*) gl_cv_func_perror_works="guessing yes" ;;
--                      # Otherwise guess no.
--              *)      gl_cv_func_perror_works="guessing no" ;;
-+                       # Guess yes on musl systems.
-+              *-musl*) gl_cv_func_perror_works="guessing yes" ;;
-+                       # Guess yes on native Windows.
-+              mingw*)  gl_cv_func_perror_works="guessing yes" ;;
-+                       # Otherwise guess no.
-+              *)       gl_cv_func_perror_works="guessing no" ;;
-             esac
-            ])
-         ])
-diff --git a/m4/printf.m4 b/m4/printf.m4
-index cbf6ae4..6d2280e 100644
---- a/m4/printf.m4
-+++ b/m4/printf.m4
-@@ -1,4 +1,4 @@
--# printf.m4 serial 60
-+# printf.m4 serial 61
- dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -62,6 +62,8 @@ int main ()
- changequote(,)dnl
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_printf_sizes_c99="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_printf_sizes_c99="guessing yes";;
-                                  # Guess yes on FreeBSD >= 5.
-            freebsd[1-4].*)       gl_cv_func_printf_sizes_c99="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
-@@ -240,6 +242,8 @@ int main ()
- changequote(,)dnl
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_printf_infinite="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_printf_infinite="guessing yes";;
-                                  # Guess yes on FreeBSD >= 6.
-            freebsd[1-5].*)       gl_cv_func_printf_infinite="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
-@@ -457,6 +461,8 @@ int main ()
- changequote(,)dnl
-                                          # Guess yes on glibc systems.
-                    *-gnu* | gnu*)        gl_cv_func_printf_infinite_long_double="guessing yes";;
-+                                         # Guess yes on musl systems.
-+                   *-musl*)              gl_cv_func_printf_infinite_long_double="guessing yes";;
-                                          # Guess yes on FreeBSD >= 6.
-                    freebsd[1-5].*)       gl_cv_func_printf_infinite_long_double="guessing no";;
-                    freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
-@@ -575,6 +581,8 @@ int main ()
-                [gl_cv_func_printf_directive_a="guessing yes"],
-                [gl_cv_func_printf_directive_a="guessing no"])
-              ;;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_printf_directive_a="guessing yes";;
-                                  # Guess no on Android.
-            linux*-android*)      gl_cv_func_printf_directive_a="guessing no";;
-                                  # Guess no on native Windows.
-@@ -625,6 +633,8 @@ int main ()
- changequote(,)dnl
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_printf_directive_f="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_printf_directive_f="guessing yes";;
-                                  # Guess yes on FreeBSD >= 6.
-            freebsd[1-5].*)       gl_cv_func_printf_directive_f="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
-@@ -960,6 +970,8 @@ changequote(,)dnl
-          case "$host_os" in
-                             # Guess yes on glibc systems.
-            *-gnu* | gnu*)   gl_cv_func_printf_flag_zero="guessing yes";;
-+                            # Guess yes on musl systems.
-+           *-musl*)         gl_cv_func_printf_flag_zero="guessing yes";;
-                             # Guess yes on BeOS.
-            beos*)           gl_cv_func_printf_flag_zero="guessing yes";;
-                             # Guess no on Android.
-@@ -1206,6 +1218,8 @@ changequote(,)dnl
-          case "$host_os" in
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_snprintf_truncation_c99="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                  # Guess yes on FreeBSD >= 5.
-            freebsd[1-4].*)       gl_cv_func_snprintf_truncation_c99="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
-@@ -1308,6 +1322,8 @@ int main ()
- changequote(,)dnl
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_snprintf_retval_c99="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                  # Guess yes on FreeBSD >= 5.
-            freebsd[1-4].*)       gl_cv_func_snprintf_retval_c99="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
-@@ -1400,6 +1416,8 @@ changequote(,)dnl
-          case "$host_os" in
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_snprintf_directive_n="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_snprintf_directive_n="guessing yes";;
-                                  # Guess yes on FreeBSD >= 5.
-            freebsd[1-4].*)       gl_cv_func_snprintf_directive_n="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
-@@ -1554,6 +1572,8 @@ changequote(,)dnl
-          case "$host_os" in
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                  # Guess yes on FreeBSD >= 5.
-            freebsd[1-4].*)       gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-diff --git a/m4/putenv.m4 b/m4/putenv.m4
-index f8960f6..342ba26 100644
---- a/m4/putenv.m4
-+++ b/m4/putenv.m4
-@@ -1,4 +1,4 @@
--# putenv.m4 serial 22
-+# putenv.m4 serial 23
- dnl Copyright (C) 2002-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -36,6 +36,8 @@ AC_DEFUN([gl_FUNC_PUTENV],
-              [case "$host_os" in
-                                # Guess yes on glibc systems.
-                 *-gnu* | gnu*) gl_cv_func_svid_putenv="guessing yes" ;;
-+                               # Guess yes on musl systems.
-+                *-musl*)       gl_cv_func_svid_putenv="guessing yes" ;;
-                                # Guess no on native Windows.
-                 mingw*)        gl_cv_func_svid_putenv="guessing no" ;;
-                                # If we don't know, assume the worst.
-diff --git a/m4/realloc.m4 b/m4/realloc.m4
-index f9f15ad..93066e8 100644
---- a/m4/realloc.m4
-+++ b/m4/realloc.m4
-@@ -1,4 +1,4 @@
--# realloc.m4 serial 15
-+# realloc.m4 serial 17
- dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF],
-        [ac_cv_func_realloc_0_nonnull=no],
-        [case "$host_os" in
-           # Guess yes on platforms where we know the result.
--          *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
-+          *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
-           | hpux* | solaris* | cygwin* | mingw*)
-             ac_cv_func_realloc_0_nonnull="guessing yes" ;;
-           # If we don't know, assume the worst.
-diff --git a/m4/setenv.m4 b/m4/setenv.m4
-index 6101274..a8f83d6 100644
---- a/m4/setenv.m4
-+++ b/m4/setenv.m4
-@@ -1,4 +1,4 @@
--# setenv.m4 serial 27
-+# setenv.m4 serial 28
- dnl Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -37,6 +37,8 @@ AC_DEFUN([gl_FUNC_SETENV],
-       [case "$host_os" in
-                         # Guess yes on glibc systems.
-          *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;;
-+                        # Guess yes on musl systems.
-+         *-musl*)       gl_cv_func_setenv_works="guessing yes" ;;
-                         # If we don't know, assume the worst.
-          *)             gl_cv_func_setenv_works="guessing no" ;;
-        esac
-diff --git a/m4/signbit.m4 b/m4/signbit.m4
-index bf5bce5..f7f2f3d 100644
---- a/m4/signbit.m4
-+++ b/m4/signbit.m4
-@@ -1,4 +1,4 @@
--# signbit.m4 serial 16
-+# signbit.m4 serial 17
- dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -31,6 +31,8 @@ AC_DEFUN([gl_SIGNBIT],
-         [case "$host_os" in
-                           # Guess yes on glibc systems.
-            *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;;
-+                          # Guess yes on musl systems.
-+           *-musl*)       gl_cv_func_signbit="guessing yes" ;;
-                           # Guess yes on native Windows.
-            mingw*)        gl_cv_func_signbit="guessing yes" ;;
-                           # If we don't know, assume the worst.
-@@ -62,6 +64,8 @@ AC_DEFUN([gl_SIGNBIT],
-         [case "$host_os" in
-                           # Guess yes on glibc systems.
-            *-gnu* | gnu*) gl_cv_func_signbit_gcc="guessing yes" ;;
-+                          # Guess yes on musl systems.
-+           *-musl*)       gl_cv_func_signbit_gcc="guessing yes" ;;
-                           # Guess yes on mingw, no on MSVC.
-            mingw*)        if test -n "$GCC"; then
-                             gl_cv_func_signbit_gcc="guessing yes"
-diff --git a/m4/sleep.m4 b/m4/sleep.m4
-index 5f71cc7..7bab467 100644
---- a/m4/sleep.m4
-+++ b/m4/sleep.m4
-@@ -1,4 +1,4 @@
--# sleep.m4 serial 9
-+# sleep.m4 serial 10
- dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -48,6 +48,8 @@ handle_alarm (int sig)
-       [case "$host_os" in
-                         # Guess yes on glibc systems.
-          *-gnu* | gnu*) gl_cv_func_sleep_works="guessing yes" ;;
-+                        # Guess yes on musl systems.
-+         *-musl*)       gl_cv_func_sleep_works="guessing yes" ;;
-                         # Guess no on native Windows.
-          mingw*)        gl_cv_func_sleep_works="guessing no" ;;
-                         # If we don't know, assume the worst.
-diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
-index 83425dd..f8e1a7c 100644
---- a/m4/stpncpy.m4
-+++ b/m4/stpncpy.m4
-@@ -1,4 +1,4 @@
--# stpncpy.m4 serial 16
-+# stpncpy.m4 serial 17
- dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation,
- dnl Inc.
- dnl This file is free software; the Free Software Foundation
-@@ -7,6 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
-
- AC_DEFUN([gl_FUNC_STPNCPY],
- [
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+
-   dnl Persuade glibc <string.h> to declare stpncpy().
-   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
-@@ -69,12 +71,18 @@ int main ()
- ]])],
-         [gl_cv_func_stpncpy=yes],
-         [gl_cv_func_stpncpy=no],
--        [AC_EGREP_CPP([Thanks for using GNU], [
-+        [dnl Guess yes on glibc systems and musl systems.
-+         AC_EGREP_CPP([Thanks for using GNU], [
- #include <features.h>
- #ifdef __GNU_LIBRARY__
-   Thanks for using GNU
- #endif
--], [gl_cv_func_stpncpy="guessing yes"], [gl_cv_func_stpncpy="guessing no"])
-+],         [gl_cv_func_stpncpy="guessing yes"],
-+           [case "$host_os" in
-+              *-musl*) gl_cv_func_stpncpy="guessing yes" ;;
-+              *)       gl_cv_func_stpncpy="guessing no" ;;
-+            esac
-+           ])
-         ])
-     ])
-     case "$gl_cv_func_stpncpy" in
-diff --git a/m4/strerror.m4 b/m4/strerror.m4
-index b452f7f..2c90f31 100644
---- a/m4/strerror.m4
-+++ b/m4/strerror.m4
-@@ -1,4 +1,4 @@
--# strerror.m4 serial 19
-+# strerror.m4 serial 20
- dnl Copyright (C) 2002, 2007-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -26,6 +26,8 @@ AC_DEFUN([gl_FUNC_STRERROR],
-         [case "$host_os" in
-                           # Guess yes on glibc systems.
-            *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
-+                          # Guess yes on musl systems.
-+           *-musl*)       gl_cv_func_working_strerror="guessing yes" ;;
-                           # If we don't know, assume the worst.
-            *)             gl_cv_func_working_strerror="guessing no" ;;
-          esac
-@@ -80,6 +82,8 @@ AC_DEFUN([gl_FUNC_STRERROR_0],
-       [case "$host_os" in
-                         # Guess yes on glibc systems.
-          *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
-+                        # Guess yes on musl systems.
-+         *-musl*)       gl_cv_func_strerror_0_works="guessing yes" ;;
-                         # Guess yes on native Windows.
-          mingw*)        gl_cv_func_strerror_0_works="guessing yes" ;;
-                         # If we don't know, assume the worst.
-diff --git a/m4/strtod.m4 b/m4/strtod.m4
-index 9912217..d68ab75 100644
---- a/m4/strtod.m4
-+++ b/m4/strtod.m4
-@@ -1,4 +1,4 @@
--# strtod.m4 serial 24
-+# strtod.m4 serial 25
- dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -115,9 +115,11 @@ numeric_equal (double x, double y)
-            ],
-            [gl_cv_func_strtod_works="guessing yes"],
-            [case "$host_os" in
--                      # Guess yes on native Windows.
--              mingw*) gl_cv_func_strtod_works="guessing yes" ;;
--              *)      gl_cv_func_strtod_works="guessing no" ;;
-+                       # Guess yes on musl systems.
-+              *-musl*) gl_cv_func_strtod_works="guessing yes" ;;
-+                       # Guess yes on native Windows.
-+              mingw*)  gl_cv_func_strtod_works="guessing yes" ;;
-+              *)       gl_cv_func_strtod_works="guessing no" ;;
-             esac
-            ])
-         ])
-diff --git a/m4/strtold.m4 b/m4/strtold.m4
-index 16b4eda..17125fe 100644
---- a/m4/strtold.m4
-+++ b/m4/strtold.m4
-@@ -1,4 +1,4 @@
--# strtold.m4 serial 2
-+# strtold.m4 serial 4
- dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -98,7 +98,12 @@ numeric_equal (long double x, long double y)
- #endif
-            ],
-            [gl_cv_func_strtold_works="guessing yes"],
--           [gl_cv_func_strtod_works="guessing no"])
-+           [case "$host_os" in
-+                       # Guess yes on musl systems.
-+              *-musl*) gl_cv_func_strtold_works="guessing yes" ;;
-+              *)       gl_cv_func_strtold_works="guessing no" ;;
-+            esac
-+           ])
-         ])
-       ])
-     case "$gl_cv_func_strtold_works" in
-diff --git a/m4/tzset.m4 b/m4/tzset.m4
-index 1278801..afdfa8e 100644
---- a/m4/tzset.m4
-+++ b/m4/tzset.m4
-@@ -1,4 +1,4 @@
--# serial 11
-+# serial 12
-
- # Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -70,6 +70,8 @@ main ()
-        [case "$host_os" in
-                          # Guess all is fine on glibc systems.
-           *-gnu* | gnu*) gl_cv_func_tzset_clobber="guessing no" ;;
-+                         # Guess all is fine on musl systems.
-+          *-musl*)       gl_cv_func_tzset_clobber="guessing no" ;;
-                          # Guess no on native Windows.
-           mingw*)        gl_cv_func_tzset_clobber="guessing no" ;;
-                          # If we don't know, assume the worst.
-diff --git a/m4/ungetc.m4 b/m4/ungetc.m4
-index ab8757b..08baf33 100644
---- a/m4/ungetc.m4
-+++ b/m4/ungetc.m4
-@@ -1,4 +1,4 @@
--# ungetc.m4 serial 6
-+# ungetc.m4 serial 7
- dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -41,12 +41,16 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS],
-            remove ("conftest.tmp");])],
-         [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no],
-         [case "$host_os" in
--                                       # Guess yes on glibc and bionic systems.
--           *-gnu* | gnu* | *-android*) gl_cv_func_ungetc_works="guessing yes" ;;
--                                       # Guess yes on native Windows.
--           mingw*)                     gl_cv_func_ungetc_works="guessing yes" ;;
--                                       # If we don't know, assume the worst.
--           *)                          gl_cv_func_ungetc_works="guessing no" ;;
-+                          # Guess yes on glibc systems.
-+           *-gnu* | gnu*) gl_cv_func_ungetc_works="guessing yes" ;;
-+                          # Guess yes on musl systems.
-+           *-musl*)       gl_cv_func_ungetc_works="guessing yes" ;;
-+                          # Guess yes on bionic systems.
-+           *-android*)    gl_cv_func_ungetc_works="guessing yes" ;;
-+                          # Guess yes on native Windows.
-+           mingw*)        gl_cv_func_ungetc_works="guessing yes" ;;
-+                          # If we don't know, assume the worst.
-+           *)             gl_cv_func_ungetc_works="guessing no" ;;
-          esac
-         ])
-     ])
-diff --git a/m4/usleep.m4 b/m4/usleep.m4
-index 59605a8..4a6bff0 100644
---- a/m4/usleep.m4
-+++ b/m4/usleep.m4
-@@ -1,4 +1,4 @@
--# usleep.m4 serial 5
-+# usleep.m4 serial 6
- dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -31,6 +31,8 @@ AC_DEFUN([gl_FUNC_USLEEP],
-         [case "$host_os" in
-                           # Guess yes on glibc systems.
-            *-gnu* | gnu*) gl_cv_func_usleep_works="guessing yes" ;;
-+                          # Guess yes on musl systems.
-+           *-musl*)       gl_cv_func_usleep_works="guessing yes" ;;
-                           # Guess no on native Windows.
-            mingw*)        gl_cv_func_usleep_works="guessing no" ;;
-                           # If we don't know, assume the worst.
-diff --git a/m4/utimes.m4 b/m4/utimes.m4
-index 7209b6d..5806d8f 100644
---- a/m4/utimes.m4
-+++ b/m4/utimes.m4
-@@ -1,5 +1,5 @@
- # Detect some bugs in glibc's implementation of utimes.
--# serial 5
-+# serial 6
-
- dnl Copyright (C) 2003-2005, 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
-@@ -143,9 +143,11 @@ main ()
-        [gl_cv_func_working_utimes=yes],
-        [gl_cv_func_working_utimes=no],
-        [case "$host_os" in
--                  # Guess no on native Windows.
--          mingw*) gl_cv_func_working_utimes="guessing no" ;;
--          *)      gl_cv_func_working_utimes="guessing no" ;;
-+                   # Guess yes on musl systems.
-+          *-musl*) gl_cv_func_working_utimes="guessing yes" ;;
-+                   # Guess no on native Windows.
-+          mingw*)  gl_cv_func_working_utimes="guessing no" ;;
-+          *)       gl_cv_func_working_utimes="guessing no" ;;
-         esac
-        ])
-     ])
-diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
-index baa2002..3952fd2 100644
---- a/m4/wcwidth.m4
-+++ b/m4/wcwidth.m4
-@@ -1,4 +1,4 @@
--# wcwidth.m4 serial 27
-+# wcwidth.m4 serial 28
- dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -98,9 +98,13 @@ int main ()
-           [
- changequote(,)dnl
-            case "$host_os" in
--                                        # Guess yes on glibc and AIX 7 systems.
--             *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
--             *)                         gl_cv_func_wcwidth_works="guessing no";;
-+                            # Guess yes on glibc systems.
-+             *-gnu* | gnu*) gl_cv_func_wcwidth_works="guessing yes";;
-+                            # Guess yes on musl systems.
-+             *-musl*)       gl_cv_func_wcwidth_works="guessing yes";;
-+                            # Guess yes on AIX 7 systems.
-+             aix[7-9]*)     gl_cv_func_wcwidth_works="guessing yes";;
-+             *)             gl_cv_func_wcwidth_works="guessing no";;
-            esac
- changequote([,])dnl
-           ])
---
-1.9.1
-
-
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index e7162673a785..b6faab741b56 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -22,21 +22,16 @@ with lib;
 
 stdenv.mkDerivation (rec {
   pname = "coreutils";
-  version = "8.31";
+  version = "8.32";
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz";
+    sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo=";
   };
 
   patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
          # included on coreutils master; TODO: apply unconditionally, I guess
-         ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch
-         ++ optional stdenv.hostPlatform.isMusl ./avoid-false-positive-in-date-debug-test.patch
-         # Fix compilation in musl-cross environments. To be removed in coreutils-8.32.
-         ++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch
-         # Fix compilation in android-cross environments. To be removed in coreutils-8.32.
-         ++ [ ./coreutils-8.31-android-cross.patch ];
+         ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch;
 
   postPatch = ''
     # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems.
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 8e151bc2ead0..c466a48434f2 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -34,14 +34,14 @@ assert gssSupport -> libkrb5 != null;
 
 stdenv.mkDerivation rec {
   pname = "curl";
-  version = "7.72.0";
+  version = "7.73.0";
 
   src = fetchurl {
     urls = [
       "https://curl.haxx.se/download/${pname}-${version}.tar.bz2"
       "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2"
     ];
-    sha256 = "1vq3ay87vayfrv67l7s7h79nm7gwdqhidki0brv5jahhch49g4dd";
+    sha256 = "sha256-zzT+Cwe4APHAGkmabosq9Uj20OBE3KSinYikvuFG0TE=";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 9b33d53e54f1..d2fa0deca007 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "unbound";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
-    sha256 = "1xqywn2qdmjjq0csrqxh9p2rnizdrr1f99zdx87z7f3fyyc0fbwz";
+    sha256 = "0daqxzvknvcz7sgag3wcrxhp4a39ik93lsrfpwcl9whjg2lm74jv";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix
index 97db4a28c458..639926578c7b 100644
--- a/pkgs/tools/security/sudolikeaboss/default.nix
+++ b/pkgs/tools/security/sudolikeaboss/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix, then modified by hand for Darwin support.
-{ stdenv, buildGoPackage, fetchFromGitHub, fixDarwinDylibNames, darwin }:
+{ stdenv, buildGoPackage, fetchFromGitHub, darwin }:
 
 buildGoPackage rec {
   pname = "sudolikeaboss-unstable";
@@ -17,9 +17,8 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  propagatedBuildInputs = with darwin.apple_sdk.frameworks; [
+  buildInputs = with darwin.apple_sdk.frameworks; [
     Cocoa
-    fixDarwinDylibNames
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85a07d01343a..c801d335ab90 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8349,9 +8349,7 @@ in
   zssh = callPackage ../tools/networking/zssh { };
 
   zstd = callPackage ../tools/compression/zstd {
-    cmake = buildPackages.cmake.override {
-      libarchive = buildPackages.libarchive.override { zstd = null; };
-    };
+    cmake = buildPackages.cmakeMinimal;
   };
 
   zsync = callPackage ../tools/compression/zsync { };
@@ -9679,15 +9677,15 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
     llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10;
   };
-  rust_1_46 = callPackage ../development/compilers/rust/1_46.nix {
+  rust_1_47 = callPackage ../development/compilers/rust/1_47.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
-    llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10;
+    llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_11;
   };
-  rust = rust_1_46;
+  rust = rust_1_47;
 
   rustPackages_1_45 = rust_1_45.packages.stable;
-  rustPackages_1_46 = rust_1_46.packages.stable;
-  rustPackages = rustPackages_1_46;
+  rustPackages_1_47 = rust_1_47.packages.stable;
+  rustPackages = rustPackages_1_47;
 
   inherit (rustPackages) cargo clippy rustc rustPlatform;
 
@@ -10863,6 +10861,10 @@ in
 
   cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { };
 
+  cmakeMinimal = libsForQt5.callPackage ../development/tools/build-managers/cmake {
+    isBootstrap = true;
+  };
+
   cmakeCurses = cmake.override { useNcurses = true; };
 
   cmakeWithGui = cmakeCurses.override { withQt5 = true; };
@@ -18293,7 +18295,7 @@ in
     # udev is the same package as systemd which depends on cryptsetup
     # which depends on lvm2 again.  But we only need the libudev part
     # which does not depend on cryptsetup.
-    udev = udev.override { cryptsetup = null; };
+    udev = systemdMinimal;
   };
   lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 {
     enableDmeventd = true;
@@ -18646,8 +18648,23 @@ in
       bzip2 = null;
     };
   };
+  systemdMinimal = systemd.override {
+    pname = "systemd-minimal";
+    withResolved = false;
+    withLogind = false;
+    withHostnamed = false;
+    withLocaled = false;
+    withTimedated = false;
+    withHwdb = false;
+    withEfi = false;
+    withImportd = false;
+    withCryptsetup = false;
+    cryptsetup = null;
+    lvm2 = null;
+  };
 
-  udev = systemd; # TODO: move to aliases.nix
+
+  udev = systemd; # TODO: change to systemdMinimal
 
   systemd-wait = callPackage ../os-specific/linux/systemd-wait { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 04c37634a420..7181025f6d0e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4828,7 +4828,7 @@ in {
 
   pybullet = callPackage ../development/python-modules/pybullet { };
 
-  pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkgconfig; };
+  pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkg-config; };
 
   pycallgraph = callPackage ../development/python-modules/pycallgraph { };
 

From 89023c38fcef79ad135bf6070563be611c4c8d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 25 Oct 2020 22:17:24 +0100
Subject: [PATCH 0473/3942] Recover the complicated situation after my bad
 merge

I made a mistake merge.  Reverting it in c778945806b undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2b
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c209)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
---
 doc/stdenv/stdenv.xml                         |    7 +-
 .../git-and-tools/git/default.nix             |    4 +-
 .../install-shell-files/default.nix           |   12 +-
 .../setup-hooks/install-shell-files.sh        |  127 +-
 pkgs/data/misc/tzdata/default.nix             |    6 +-
 pkgs/development/compilers/gcc/builder.sh     |    7 +-
 .../purescript/psc-package/default.nix        |   10 +-
 .../compilers/rust/{1_46.nix => 1_47.nix}     |   20 +-
 pkgs/development/compilers/rust/binary.nix    |   12 +-
 .../interpreters/ruby/rubygems/default.nix    |    4 +-
 pkgs/development/libraries/enchant/2.x.nix    |    4 +-
 pkgs/development/libraries/expat/default.nix  |   12 +-
 .../libraries/freetype/default.nix            |    4 +-
 .../gamin/abstract-socket-namespace.patch     |   73 ++
 pkgs/development/libraries/gamin/default.nix  |   10 +-
 .../libraries/harfbuzz/default.nix            |    4 +-
 .../libraries/libinput/default.nix            |   15 +-
 ...019-9325.CVE-2019-9371.CVE-2019-9433.patch |  211 ---
 pkgs/development/libraries/libvpx/default.nix |   22 +-
 .../development/libraries/libwebp/default.nix |   15 +-
 pkgs/development/libraries/mesa/default.nix   |    7 +-
 ...include-dri-driver-path-in-cache-key.patch |   29 +-
 .../link-radv-with-ld_args_build_id.patch     |   25 -
 .../libraries/mesa/missing-includes.patch     |   12 -
 .../development/libraries/openssl/default.nix |    4 +-
 .../development/libraries/p11-kit/default.nix |    7 +
 pkgs/development/libraries/zeromq/4.x.nix     |   10 +-
 .../python-modules/arrow/default.nix          |    4 +-
 .../python-modules/pycairo/default.nix        |   24 +-
 .../tools/build-managers/cmake/default.nix    |   19 +-
 ...boost-Do-not-add-system-paths-on-nix.patch |   40 +
 .../tools/build-managers/meson/default.nix    |    5 +
 pkgs/os-specific/linux/apparmor/default.nix   |   13 +-
 pkgs/os-specific/linux/iproute/default.nix    |    8 +-
 pkgs/os-specific/linux/libcap/default.nix     |    5 +-
 pkgs/os-specific/linux/systemd/default.nix    |  106 +-
 pkgs/servers/x11/xorg/default.nix             |   36 +-
 pkgs/servers/x11/xorg/overrides.nix           |    7 -
 pkgs/servers/x11/xorg/tarballs.list           |   12 +-
 pkgs/shells/bash/bash-completion/default.nix  |    4 +-
 pkgs/stdenv/darwin/default.nix                |    5 +-
 pkgs/test/default.nix                         |    2 +
 pkgs/test/install-shell-files/default.nix     |  125 ++
 pkgs/tools/compression/brotli/default.nix     |   13 +-
 ...id-false-positive-in-date-debug-test.patch |   52 -
 .../coreutils-8.31-android-cross.patch        |   51 -
 .../coreutils/coreutils-8.31-musl-cross.patch | 1153 -----------------
 pkgs/tools/misc/coreutils/default.nix         |   13 +-
 pkgs/tools/networking/curl/default.nix        |    4 +-
 pkgs/tools/networking/unbound/default.nix     |    4 +-
 pkgs/top-level/all-packages.nix               |   37 +-
 pkgs/top-level/python-packages.nix            |    2 +-
 52 files changed, 667 insertions(+), 1750 deletions(-)
 rename pkgs/development/compilers/rust/{1_46.nix => 1_47.nix} (58%)
 create mode 100644 pkgs/development/libraries/gamin/abstract-socket-namespace.patch
 delete mode 100644 pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
 delete mode 100644 pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch
 create mode 100644 pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch
 create mode 100644 pkgs/test/install-shell-files/default.nix
 delete mode 100644 pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch
 delete mode 100644 pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch
 delete mode 100644 pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch

diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml
index 4c069b57edd7..46ee97927eac 100644
--- a/doc/stdenv/stdenv.xml
+++ b/doc/stdenv/stdenv.xml
@@ -2070,7 +2070,7 @@ nativeBuildInputs = [ breakpointHook ];
        The <literal>installManPage</literal> function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with <literal>.gz</literal> suffix). This function will place them into the correct directory.
       </para>
       <para>
-       The <literal>installShellCompletion</literal> function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of <literal>--bash</literal>, <literal>--fish</literal>, or <literal>--zsh</literal>. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag <literal>--name NAME</literal> before the path. If this flag is not provided, zsh completions will be renamed automatically such that <literal>foobar.zsh</literal> becomes <literal>_foobar</literal>.
+       The <literal>installShellCompletion</literal> function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of <literal>--bash</literal>, <literal>--fish</literal>, or <literal>--zsh</literal>. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag <literal>--name NAME</literal> before the path. If this flag is not provided, zsh completions will be renamed automatically such that <literal>foobar.zsh</literal> becomes <literal>_foobar</literal>. A root name may be provided for all paths using the flag <literal>--cmd NAME</literal>; this synthesizes the appropriate name depending on the shell (e.g. <literal>--cmd foo</literal> will synthesize the name <literal>foo.bash</literal> for bash and <literal>_foo</literal> for zsh). The path may also be a fifo or named fd (such as produced by <literal>&lt;(cmd)</literal>), in which case the shell and name must be provided.
 <programlisting>
 nativeBuildInputs = [ installShellFiles ];
 postInstall = ''
@@ -2081,6 +2081,11 @@ postInstall = ''
   installShellCompletion --zsh --name _foobar share/completions.zsh
   # implicit behavior
   installShellCompletion share/completions/foobar.{bash,fish,zsh}
+  # using named fd
+  installShellCompletion --cmd foobar \
+    --bash &lt;($out/bin/foobar --bash-completion) \
+    --fish &lt;($out/bin/foobar --fish-completion) \
+    --zsh &lt;($out/bin/foobar --zsh-completion)
 '';
 </programlisting>
       </para>
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 7e40366142a9..49dc7866dbd5 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -22,7 +22,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.28.0";
+  version = "2.29.0";
   svn = subversionClient.override { perlBindings = perlSupport; };
 
   gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "17a311vzimqn1glc9d7x82rhb1mb81m5rr4g8xji8idaafid39fz";
+    sha256 = "KEMtmVJXxGJv4PsgkfWI327tmOlXFBnnLIO8Izcua4k=";
   };
 
   outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc";
diff --git a/pkgs/build-support/install-shell-files/default.nix b/pkgs/build-support/install-shell-files/default.nix
index e1f2e24dd875..d50661ddc65d 100644
--- a/pkgs/build-support/install-shell-files/default.nix
+++ b/pkgs/build-support/install-shell-files/default.nix
@@ -1,4 +1,12 @@
-{ makeSetupHook }:
+{ makeSetupHook, tests }:
 
 # See the header comment in ../setup-hooks/install-shell-files.sh for example usage.
-makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh
+let
+  setupHook = makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh;
+in
+
+setupHook.overrideAttrs (oldAttrs: {
+  passthru = (oldAttrs.passthru or {}) // {
+    tests = tests.install-shell-files;
+  };
+})
diff --git a/pkgs/build-support/setup-hooks/install-shell-files.sh b/pkgs/build-support/setup-hooks/install-shell-files.sh
index e0ea1f7f30a7..194b408b1050 100644
--- a/pkgs/build-support/setup-hooks/install-shell-files.sh
+++ b/pkgs/build-support/setup-hooks/install-shell-files.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+# shellcheck shell=bash
 # Setup hook for the `installShellFiles` package.
 #
 # Example usage in a derivation:
@@ -19,8 +19,8 @@
 # installManPage <path> [...<path>]
 #
 # Each argument is checked for its man section suffix and installed into the appropriate
-# share/man<n>/ directory. The function returns an error if any paths don't have the man section
-# suffix (with optional .gz compression).
+# share/man/man<n>/ directory. The function returns an error if any paths don't have the man
+# section suffix (with optional .gz compression).
 installManPage() {
     local path
     for path in "$@"; do
@@ -49,7 +49,7 @@ installManPage() {
     done
 }
 
-# installShellCompletion [--bash|--fish|--zsh] ([--name <name>] <path>)...
+# installShellCompletion [--cmd <name>] ([--bash|--fish|--zsh] [--name <name>] <path>)...
 #
 # Each path is installed into the appropriate directory for shell completions for the given shell.
 # If one of `--bash`, `--fish`, or `--zsh` is given the path is assumed to belong to that shell.
@@ -61,9 +61,20 @@ installManPage() {
 # If the shell completion needs to be renamed before installing the optional `--name <name>` flag
 # may be given. Any name provided with this flag only applies to the next path.
 #
+# If all shell completions need to be renamed before installing the optional `--cmd <name>` flag
+# may be given. This will synthesize a name for each file, unless overridden with an explicit
+# `--name` flag. For example, `--cmd foobar` will synthesize the name `_foobar` for zsh and
+# `foobar.bash` for bash.
+#
 # For zsh completions, if the `--name` flag is not given, the path will be automatically renamed
 # such that `foobar.zsh` becomes `_foobar`.
 #
+# A path may be a named fd, such as produced by the bash construct `<(cmd)`. When using a named fd,
+# the shell type flag must be provided, and either the `--name` or `--cmd` flag must be provided.
+# This might look something like:
+#
+#   installShellCompletion --zsh --name _foobar <($out/bin/foobar --zsh-completion)
+#
 # This command accepts multiple shell flags in conjunction with multiple paths if you wish to
 # install them all in one command:
 #
@@ -76,9 +87,16 @@ installManPage() {
 #   installShellCompletion --fish --name foobar.fish share/completions.fish
 #   installShellCompletion --zsh --name _foobar share/completions.zsh
 #
+# Or to use shell newline escaping to split a single invocation across multiple lines:
+#
+#   installShellCompletion --cmd foobar \
+#     --bash <($out/bin/foobar --bash-completion) \
+#     --fish <($out/bin/foobar --fish-completion) \
+#     --zsh <($out/bin/foobar --zsh-completion)
+#
 # If any argument is `--` the remaining arguments will be treated as paths.
 installShellCompletion() {
-    local shell='' name='' retval=0 parseArgs=1 arg
+    local shell='' name='' cmdname='' retval=0 parseArgs=1 arg
     while { arg=$1; shift; }; do
         # Parse arguments
         if (( parseArgs )); then
@@ -97,6 +115,17 @@ installShellCompletion() {
                 # treat `--name=foo` the same as `--name foo`
                 name=${arg#--name=}
                 continue;;
+            --cmd)
+                cmdname=$1
+                shift || {
+                    echo 'installShellCompletion: error: --cmd flag expected an argument' >&2
+                    return 1
+                }
+                continue;;
+            --cmd=*)
+                # treat `--cmd=foo` the same as `--cmd foo`
+                cmdname=${arg#--cmd=}
+                continue;;
             --?*)
                 echo "installShellCompletion: warning: unknown flag ${arg%%=*}" >&2
                 retval=2
@@ -110,39 +139,67 @@ installShellCompletion() {
         if (( "${NIX_DEBUG:-0}" >= 1 )); then
             echo "installShellCompletion: installing $arg${name:+ as $name}"
         fi
-        # if we get here, this is a path
-        # Identify shell
-        local basename
-        basename=$(stripHash "$arg")
+        # if we get here, this is a path or named pipe
+        # Identify shell and output name
         local curShell=$shell
-        if [[ -z "$curShell" ]]; then
-            # auto-detect the shell
-            case "$basename" in
-            ?*.bash) curShell=bash;;
-            ?*.fish) curShell=fish;;
-            ?*.zsh) curShell=zsh;;
-            *)
-                if [[ "$basename" = _* && "$basename" != *.* ]]; then
-                    # probably zsh
-                    echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2
-                    curShell=zsh
-                else
-                    echo "installShellCompletion: warning: unknown shell for path: $arg" >&2
-                    retval=2
-                    continue
-                fi;;
-            esac
+        local outName=''
+        if [[ -z "$arg" ]]; then
+            echo "installShellCompletion: error: empty path is not allowed" >&2
+            return 1
+        elif [[ -p "$arg" ]]; then
+            # this is a named fd or fifo
+            if [[ -z "$curShell" ]]; then
+                echo "installShellCompletion: error: named pipe requires one of --bash, --fish, or --zsh" >&2
+                return 1
+            elif [[ -z "$name" && -z "$cmdname" ]]; then
+                echo "installShellCompletion: error: named pipe requires one of --cmd or --name" >&2
+                return 1
+            fi
+        else
+            # this is a path
+            local argbase
+            argbase=$(stripHash "$arg")
+            if [[ -z "$curShell" ]]; then
+                # auto-detect the shell
+                case "$argbase" in
+                ?*.bash) curShell=bash;;
+                ?*.fish) curShell=fish;;
+                ?*.zsh) curShell=zsh;;
+                *)
+                    if [[ "$argbase" = _* && "$argbase" != *.* ]]; then
+                        # probably zsh
+                        echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2
+                        curShell=zsh
+                    else
+                        echo "installShellCompletion: warning: unknown shell for path: $arg" >&2
+                        retval=2
+                        continue
+                    fi;;
+                esac
+            fi
+            outName=$argbase
         fi
         # Identify output path
-        local outName sharePath
-        outName=${name:-$basename}
+        if [[ -n "$name" ]]; then
+            outName=$name
+        elif [[ -n "$cmdname" ]]; then
+            case "$curShell" in
+            bash|fish) outName=$cmdname.$curShell;;
+            zsh) outName=_$cmdname;;
+            *)
+                # Our list of shells is out of sync with the flags we accept or extensions we detect.
+                echo 'installShellCompletion: internal error' >&2
+                return 1;;
+            esac
+        fi
+        local sharePath
         case "$curShell" in
         bash) sharePath=bash-completion/completions;;
         fish) sharePath=fish/vendor_completions.d;;
         zsh)
             sharePath=zsh/site-functions
             # only apply automatic renaming if we didn't have a manual rename
-            if test -z "$name"; then
+            if [[ -z "$name" && -z "$cmdname" ]]; then
                 # convert a name like `foo.zsh` into `_foo`
                 outName=${outName%.zsh}
                 outName=_${outName#_}
@@ -153,8 +210,16 @@ installShellCompletion() {
             return 1;;
         esac
         # Install file
-        install -Dm644 -T "$arg" "${!outputBin:?}/share/$sharePath/$outName" || return
-        # Clear the name, it only applies to one path
+        local outDir="${!outputBin:?}/share/$sharePath"
+        local outPath="$outDir/$outName"
+        if [[ -p "$arg" ]]; then
+            # install handles named pipes on NixOS but not on macOS
+            mkdir -p "$outDir" \
+            && cat "$arg" > "$outPath"
+        else
+            install -Dm644 -T "$arg" "$outPath"
+        fi || return
+        # Clear the per-path flags
         name=
     done
     if [[ -n "$name" ]]; then
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 367ee06390cd..dc80580ff5ec 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "tzdata";
-  version = "2019c";
+  version = "2020c";
 
   srcs =
     [ (fetchurl {
         url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
-        sha256 = "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr";
+        sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q";
       })
       (fetchurl {
         url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
-        sha256 = "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn";
+        sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs";
       })
     ];
 
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index 2204744a4b59..e1c4768413f4 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -287,7 +287,12 @@ postInstall() {
     done
 
     # Two identical man pages are shipped (moving and compressing is done later)
-    ln -sf gcc.1 "$out"/share/man/man1/g++.1
+    for i in "$out"/share/man/man1/*g++.1; do
+        if test -e "$i"; then
+            man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"`
+            ln -sf "$man_prefix"gcc.1 "$i"
+        fi
+    done
 }
 
 genericBuild
diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix
index 0bebd5d2f50d..88f7adce5a1a 100644
--- a/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/pkgs/development/compilers/purescript/psc-package/default.nix
@@ -44,12 +44,10 @@ stdenv.mkDerivation rec {
   '' + ''
     chmod u-w $PSC_PACKAGE
 
-    $PSC_PACKAGE --bash-completion-script $PSC_PACKAGE > psc-package.bash
-    $PSC_PACKAGE --fish-completion-script $PSC_PACKAGE > psc-package.fish
-    $PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE > _psc-package
-    installShellCompletion \
-      psc-package.{bash,fish} \
-      --zsh _psc-package
+    installShellCompletion --cmd psc-package \
+      --bash <($PSC_PACKAGE --bash-completion-script $PSC_PACKAGE) \
+      --fish <($PSC_PACKAGE --fish-completion-script $PSC_PACKAGE) \
+      --zsh <($PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE)
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/compilers/rust/1_46.nix b/pkgs/development/compilers/rust/1_47.nix
similarity index 58%
rename from pkgs/development/compilers/rust/1_46.nix
rename to pkgs/development/compilers/rust/1_47.nix
index c999b346ee6f..e5cbae193bf1 100644
--- a/pkgs/development/compilers/rust/1_46.nix
+++ b/pkgs/development/compilers/rust/1_47.nix
@@ -19,24 +19,24 @@
 } @ args:
 
 import ./default.nix {
-  rustcVersion = "1.46.0";
-  rustcSha256 = "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid";
+  rustcVersion = "1.47.0";
+  rustcSha256 = "sha256-MYXfBkxHR/LIubuMRGjt1Y/0rW0HiAyHmsGxc7do2B0=";
 
   # Note: the version MUST be one version prior to the version we're
   # building
-  bootstrapVersion = "1.45.2";
+  bootstrapVersion = "1.46.0";
 
   # fetch hashes by running `print-hashes.sh 1.45.2`
   bootstrapHashes = {
-    i686-unknown-linux-gnu = "5b2050dde23152750de89f7e59acaab6bf088d0beb5854c69c9a545fd254b936";
-    x86_64-unknown-linux-gnu = "860feed955726a4d96ffe40758a110053326b9ae11c9e1ee059e9c6222f25643";
-    arm-unknown-linux-gnueabihf = "ddb5f59bbdef84e0b7c83049461e003ed031dd881a4622365c3d475102535c60";
-    armv7-unknown-linux-gnueabihf = "7a556581f87602705f9c89b04cce621cfbba9050b6fbe478166e91d164567531";
-    aarch64-unknown-linux-gnu = "151fad66442d28a4e4786753d1afb559c4a3d359081c64769273a31c2f0f4d30";
-    x86_64-apple-darwin = "6e8067624ede10aa23081d62e0086c6f42f7228cc0d00fb5ff24d4dac65249d6";
+    i686-unknown-linux-gnu = "6ebd7e04dc18a36d08b9731cdb42d5caf8460e1eb41b75f3a8596c39f5e71206";
+    x86_64-unknown-linux-gnu = "e3b98bc3440fe92817881933f9564389eccb396f5f431f33d48b979fa2fbdcf5";
+    arm-unknown-linux-gnueabihf = "bb8af68565321f54608e918597083eb016ed0f9f4f3cc23f7cc5f467b934ce7f";
+    armv7-unknown-linux-gnueabihf = "7c0640879d7f2c38db60352e3c0f09e3fc6fa3bac6ca8f22cbccb1eb5e950121";
+    aarch64-unknown-linux-gnu = "f0c6d630f3dedb3db69d69ed9f833aa6b472363096f5164f1068c7001ca42aeb";
+    x86_64-apple-darwin = "82d61582a3772932432a99789c3b3bd4abe6baca339e355048ca9efb9ea5b4db";
   };
 
-  selectRustPackage = pkgs: pkgs.rust_1_46;
+  selectRustPackage = pkgs: pkgs.rust_1_47;
 
   rustcPatches = [
   ];
diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix
index 9ae7e51e5fef..b84e390e0b0d 100644
--- a/pkgs/development/compilers/rust/binary.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, bash, curl, darwin
+{ stdenv, makeWrapper, bash, curl, darwin, zlib
 , version
 , src
 , platform
@@ -42,17 +42,23 @@ rec {
       ./install.sh --prefix=$out \
         --components=${installComponents}
 
-      ${optionalString (stdenv.isLinux && bootstrapping) ''
+      ${optionalString (stdenv.isLinux && bootstrapping) (''
         patchelf \
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
           "$out/bin/rustc"
+        '' + optionalString (stdenv.lib.versionAtLeast version "1.46")
+        # rustc bootstrap needs libz starting from 1.46
+        ''
+          ln -s ${zlib}/lib/libz.so.1 $out/lib/libz.so.1
+          ln -s ${zlib}/lib/libz.so $out/lib/libz.so
+        '' + ''
         patchelf \
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
           "$out/bin/rustdoc"
         patchelf \
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
           "$out/bin/cargo"
-      ''}
+      '')}
 
       # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
       # (or similar) here. It causes strange effects where rustc loads
diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index 0bbcadba3f51..8263a987d639 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "rubygems";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchurl {
     url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
-    sha256 = "0h7ij4jpj8rgnpkl63cwh2lnav73pw5wpfqra3va7077lsyadlgd";
+    sha256 = "181wjclxnq5lrwnr53famy9pg8911hi9w2v0vy7dqgjqnc4iy1hp";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index b7b86de92c01..cbc3f2173260 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "enchant";
-  version = "2.2.11";
+  version = "2.2.12";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "opxXd8TkX8rCWVwVxJ1tKqQ0+l58mT3/P582e2X+Ryo=";
+    sha256 = "0zi20s62gax9rkhwj318kqrxa62pmks6dsdd6m9pzvhlwy5cb6vb";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index a356d7be1a9e..29d2c2b3acb9 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, lib }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-stdenv.mkDerivation rec {
-  name = "expat-2.2.8";
+let
+  version = "2.2.10";
+in stdenv.mkDerivation rec {
+  name = "expat-${version}";
 
   src = fetchurl {
-    url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_8/${name}.tar.xz";
-    sha256 = "16vpj5mk3lps3x7fr8cs03rffx3ir4jilyqw0frayn6q94daijk1";
+    url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${name}.tar.xz";
+    sha256 = "sha256-Xf5Tj4tbY/A+mO2sUg19mmpNIuSC5cltTQb8xUhcJfI=";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 24757af09e3d..b87e64c2afbf 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -14,7 +14,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "freetype";
-  version = "2.10.2";
+  version = "2.10.4";
 
   meta = with stdenv.lib; {
     description = "A font rendering engine";
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "12rd181yzz6952cyjqaa4253f5szam93cmhw18p33rnj4l8dchqm";
+    sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46";
   };
 
   propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
diff --git a/pkgs/development/libraries/gamin/abstract-socket-namespace.patch b/pkgs/development/libraries/gamin/abstract-socket-namespace.patch
new file mode 100644
index 000000000000..ff1610559721
--- /dev/null
+++ b/pkgs/development/libraries/gamin/abstract-socket-namespace.patch
@@ -0,0 +1,73 @@
+From 737452159d521aef2041a2767f3ebf9f68f4b6a9 Mon Sep 17 00:00:00 2001
+From: Christian Kampka <christian@kampka.net>
+Date: Tue, 1 Sep 2020 13:54:35 +0200
+Subject: [PATCH] Pin abstract namespace sockets to host_os
+
+Running programs with AC_RUN_IFELSE fails when cross-compiling.
+Since abstract namespace sockets are linux feature, we can easily
+assume it is available for linux and not for darwin.
+---
+ configure.in | 47 ++++++-----------------------------------------
+ 1 file changed, 6 insertions(+), 41 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index eb129db..0ed82ba 100644
+--- a/configure.in
++++ b/configure.in
+@@ -387,47 +387,12 @@ fi
+ 
+ #### Abstract sockets
+ 
+-AC_MSG_CHECKING(abstract socket namespace)
+-AC_LANG_PUSH(C)
+-AC_RUN_IFELSE([AC_LANG_PROGRAM(
+-[[
+-#include <sys/types.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <stdio.h>
+-#include <sys/socket.h>
+-#include <sys/un.h>
+-#include <errno.h>
+-]],
+-[[
+-  int listen_fd;
+-  struct sockaddr_un addr;
+-  
+-  listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
+-  
+-  if (listen_fd < 0)
+-    {
+-      fprintf (stderr, "socket() failed: %s\n", strerror (errno));
+-      exit (1);
+-    }
+-
+-  memset (&addr, '\0', sizeof (addr));
+-  addr.sun_family = AF_UNIX;
+-  strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test");
+-  addr.sun_path[0] = '\0'; /* this is what makes it abstract */
+-  
+-  if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0)
+-    {
+-       fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", 
+-                strerror (errno));
+-       exit (1);
+-    }
+-  else 
+-    exit (0);
+-]])],
+-              [have_abstract_sockets=yes],
+-              [have_abstract_sockets=no])
+-AC_LANG_POP(C)
++AC_MSG_CHECKING([whether target os has abstract socket namespace])
++if test x$target_os = xlinux-gnu ; then
++    have_abstract_sockets=yes
++else
++    have_abstract_sockets=no
++fi	
+ AC_MSG_RESULT($have_abstract_sockets)
+ 
+ if test x$enable_abstract_sockets = xyes; then
+-- 
+2.25.4
+
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index 38451571d8b6..89096c887450 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, glib }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }:
 
-stdenv.mkDerivation (rec {
+let
+  cross = stdenv.hostPlatform != stdenv.buildPlatform;
+in stdenv.mkDerivation (rec {
   name = "gamin-0.1.10";
 
   src = fetchurl {
@@ -8,7 +10,7 @@ stdenv.mkDerivation (rec {
     sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
 
   buildInputs = [ glib ];
 
@@ -27,7 +29,7 @@ stdenv.mkDerivation (rec {
       name = "fix-pthread-mutex.patch";
       url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8";
       sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz";
-    });
+    }) ++ stdenv.lib.optional (cross) ./abstract-socket-namespace.patch ;
 
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 8110f13d14ca..6c5703f521d7 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -11,7 +11,7 @@
 }:
 
 let
-  version = "2.7.1";
+  version = "2.7.2";
   inherit (stdenv.lib) optional optionals optionalString;
   mesonFeatureFlag = opt: b:
     "-D${opt}=${if b then "enabled" else "disabled"}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     owner  = "harfbuzz";
     repo   = "harfbuzz";
     rev    = version;
-    sha256 = "172jmwp666xbs6yy1pc2495gnkz8xw11b8zkz3j19jxlvvp4mxcs";
+    sha256 = "0vfyxr3lvzp80j1347nrwpr1ndv265p15rj2q8rj31lb26nyz4dm";
   };
 
   postPatch = ''
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 576a2fec921a..3a651087510b 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, meson, ninja
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja
 , libevdev, mtdev, udev, libwacom
 , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
 , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
@@ -27,11 +27,14 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libinput";
-  version = "1.16.1";
+  version = "1.16.2";
 
-  src = fetchurl {
-    url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
-    sha256 = "e6fRru3RUWi7IdF+nmKKocJ5V5Y6Qjo/6jk4pQF1hTk=";
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "0qii6yh3dlhgv9z970cpzbz19ii8zjvq4k7pg75sy2gmia7smwd1";
   };
 
   outputs = [ "bin" "out" "dev" ];
@@ -80,7 +83,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
-    homepage    = "http://www.freedesktop.org/wiki/Software/libinput";
+    homepage    = "https://www.freedesktop.org/wiki/Software/libinput/";
     license     = licenses.mit;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ codyopel ];
diff --git a/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch b/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
deleted file mode 100644
index 552c4e08d5f9..000000000000
--- a/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-Backports of
-
-From 46e17f0cb4a80b36755c84b8bf15731d3386c08f Mon Sep 17 00:00:00 2001
-From: kyslov <kyslov@google.com>
-Date: Fri, 4 Jan 2019 17:04:09 -0800
-Subject: [PATCH] Fix OOB memory access on fuzzed data
-
-From 0681cff1ad36b3ef8ec242f59b5a6c4234ccfb88 Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-Date: Tue, 24 Jul 2018 21:36:50 -0700
-Subject: [PATCH] vp9: fix OOB read in decoder_peek_si_internal
-
-From f00890eecdf8365ea125ac16769a83aa6b68792d Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-Date: Tue, 11 Dec 2018 18:06:20 -0800
-Subject: [PATCH] update libwebm to libwebm-1.0.0.27-352-g6ab9fcf
-
-From 34d54b04e98dd0bac32e9aab0fbda0bf501bc742 Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-Date: Tue, 9 Apr 2019 18:37:44 -0700
-Subject: [PATCH] update libwebm to libwebm-1.0.0.27-358-gdbf1d10
-
-From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001
-From: Jerome Jiang <jianj@google.com>
-Date: Wed, 23 May 2018 15:43:00 -0700
-Subject: [PATCH] VP8: Fix use-after-free in postproc.
-
-to address CVE-2019-9232 CVE-2019-9325 CVE-2019-9371 CVE-2019-9433
-
---- libvpx-1.7.0.orig/test/decode_api_test.cc
-+++ libvpx-1.7.0/test/decode_api_test.cc
-@@ -138,8 +138,30 @@ TEST(DecodeAPI, Vp9InvalidDecode) {
-   EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
- }
- 
--TEST(DecodeAPI, Vp9PeekSI) {
-+void TestPeekInfo(const uint8_t *const data, uint32_t data_sz,
-+                  uint32_t peek_size) {
-   const vpx_codec_iface_t *const codec = &vpx_codec_vp9_dx_algo;
-+  // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get
-+  // to decoder_peek_si_internal on frames of size < 8.
-+  if (data_sz >= 8) {
-+    vpx_codec_ctx_t dec;
-+    EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0));
-+    EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM
-+                                    : VPX_CODEC_CORRUPT_FRAME,
-+              vpx_codec_decode(&dec, data, data_sz, NULL, 0));
-+    vpx_codec_iter_t iter = NULL;
-+    EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter));
-+    EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
-+  }
-+
-+  // Verify behavior of vpx_codec_peek_stream_info.
-+  vpx_codec_stream_info_t si;
-+  si.sz = sizeof(si);
-+  EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK,
-+            vpx_codec_peek_stream_info(codec, data, data_sz, &si));
-+}
-+
-+TEST(DecodeAPI, Vp9PeekStreamInfo) {
-   // The first 9 bytes are valid and the rest of the bytes are made up. Until
-   // size 10, this should return VPX_CODEC_UNSUP_BITSTREAM and after that it
-   // should return VPX_CODEC_CORRUPT_FRAME.
-@@ -150,24 +172,18 @@ TEST(DecodeAPI, Vp9PeekSI) {
-   };
- 
-   for (uint32_t data_sz = 1; data_sz <= 32; ++data_sz) {
--    // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get
--    // to decoder_peek_si_internal on frames of size < 8.
--    if (data_sz >= 8) {
--      vpx_codec_ctx_t dec;
--      EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0));
--      EXPECT_EQ(
--          (data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_CORRUPT_FRAME,
--          vpx_codec_decode(&dec, data, data_sz, NULL, 0));
--      vpx_codec_iter_t iter = NULL;
--      EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter));
--      EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
--    }
--
--    // Verify behavior of vpx_codec_peek_stream_info.
--    vpx_codec_stream_info_t si;
--    si.sz = sizeof(si);
--    EXPECT_EQ((data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK,
--              vpx_codec_peek_stream_info(codec, data, data_sz, &si));
-+    TestPeekInfo(data, data_sz, 10);
-+  }
-+}
-+
-+TEST(DecodeAPI, Vp9PeekStreamInfoTruncated) {
-+  // This profile 1 header requires 10.25 bytes, ensure
-+  // vpx_codec_peek_stream_info doesn't over read.
-+  const uint8_t profile1_data[10] = { 0xa4, 0xe9, 0x30, 0x68, 0x53,
-+                                      0xe9, 0x30, 0x68, 0x53, 0x04 };
-+
-+  for (uint32_t data_sz = 1; data_sz <= 10; ++data_sz) {
-+    TestPeekInfo(profile1_data, data_sz, 11);
-   }
- }
- #endif  // CONFIG_VP9_DECODER
---- libvpx-1.7.0.orig/third_party/libwebm/mkvparser/mkvparser.cc
-+++ libvpx-1.7.0/third_party/libwebm/mkvparser/mkvparser.cc
-@@ -5307,8 +5307,8 @@ long VideoTrack::Parse(Segment* pSegment
- 
-   const long long stop = pos + s.size;
- 
--  Colour* colour = NULL;
--  Projection* projection = NULL;
-+  std::unique_ptr<Colour> colour_ptr;
-+  std::unique_ptr<Projection> projection_ptr;
- 
-   while (pos < stop) {
-     long long id, size;
-@@ -5357,11 +5357,19 @@ long VideoTrack::Parse(Segment* pSegment
-       if (rate <= 0)
-         return E_FILE_FORMAT_INVALID;
-     } else if (id == libwebm::kMkvColour) {
--      if (!Colour::Parse(pReader, pos, size, &colour))
-+      Colour* colour = NULL;
-+      if (!Colour::Parse(pReader, pos, size, &colour)) {
-         return E_FILE_FORMAT_INVALID;
-+      } else {
-+        colour_ptr.reset(colour);
-+      }
-     } else if (id == libwebm::kMkvProjection) {
--      if (!Projection::Parse(pReader, pos, size, &projection))
-+      Projection* projection = NULL;
-+      if (!Projection::Parse(pReader, pos, size, &projection)) {
-         return E_FILE_FORMAT_INVALID;
-+      } else {
-+        projection_ptr.reset(projection);
-+      }
-     }
- 
-     pos += size;  // consume payload
-@@ -5392,8 +5400,8 @@ long VideoTrack::Parse(Segment* pSegment
-   pTrack->m_display_unit = display_unit;
-   pTrack->m_stereo_mode = stereo_mode;
-   pTrack->m_rate = rate;
--  pTrack->m_colour = colour;
--  pTrack->m_projection = projection;
-+  pTrack->m_colour = colour_ptr.release();
-+  pTrack->m_projection = projection_ptr.release();
- 
-   pResult = pTrack;
-   return 0;  // success
---- libvpx-1.7.0.orig/vp8/common/postproc.c
-+++ libvpx-1.7.0/vp8/common/postproc.c
-@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BU
-   double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
-   int ppl = (int)(level + .5);
- 
--  const MODE_INFO *mode_info_context = cm->show_frame_mi;
-+  const MODE_INFO *mode_info_context = cm->mi;
-   int mbr, mbc;
- 
-   /* The pixel thresholds are adjusted according to if or not the macroblock
---- libvpx-1.7.0.orig/vp8/decoder/dboolhuff.h
-+++ libvpx-1.7.0/vp8/decoder/dboolhuff.h
-@@ -76,7 +76,7 @@ static int vp8dx_decode_bool(BOOL_DECODE
-   }
- 
-   {
--    register int shift = vp8_norm[range];
-+    const unsigned char shift = vp8_norm[(unsigned char)range];
-     range <<= shift;
-     value <<= shift;
-     count -= shift;
---- libvpx-1.7.0.orig/vp9/vp9_dx_iface.c
-+++ libvpx-1.7.0/vp9/vp9_dx_iface.c
-@@ -97,7 +97,7 @@ static vpx_codec_err_t decoder_peek_si_i
-     const uint8_t *data, unsigned int data_sz, vpx_codec_stream_info_t *si,
-     int *is_intra_only, vpx_decrypt_cb decrypt_cb, void *decrypt_state) {
-   int intra_only_flag = 0;
--  uint8_t clear_buffer[10];
-+  uint8_t clear_buffer[11];
- 
-   if (data + data_sz <= data) return VPX_CODEC_INVALID_PARAM;
- 
-@@ -158,6 +158,9 @@ static vpx_codec_err_t decoder_peek_si_i
-         if (profile > PROFILE_0) {
-           if (!parse_bitdepth_colorspace_sampling(profile, &rb))
-             return VPX_CODEC_UNSUP_BITSTREAM;
-+          // The colorspace info may cause vp9_read_frame_size() to need 11
-+          // bytes.
-+          if (data_sz < 11) return VPX_CODEC_UNSUP_BITSTREAM;
-         }
-         rb.bit_offset += REF_FRAMES;  // refresh_frame_flags
-         vp9_read_frame_size(&rb, (int *)&si->w, (int *)&si->h);
---- libvpx-1.7.0.orig/vpx_dsp/bitreader.h
-+++ libvpx-1.7.0/vpx_dsp/bitreader.h
-@@ -94,7 +94,7 @@ static INLINE int vpx_read(vpx_reader *r
-   }
- 
-   {
--    register int shift = vpx_norm[range];
-+    const unsigned char shift = vpx_norm[(unsigned char)range];
-     range <<= shift;
-     value <<= shift;
-     count -= shift;
---- libvpx-1.7.0.orig/vpx_dsp/bitreader_buffer.c
-+++ libvpx-1.7.0/vpx_dsp/bitreader_buffer.c
-@@ -23,7 +23,7 @@ int vpx_rb_read_bit(struct vpx_read_bit_
-     rb->bit_offset = off + 1;
-     return bit;
-   } else {
--    rb->error_handler(rb->error_handler_data);
-+    if (rb->error_handler != NULL) rb->error_handler(rb->error_handler_data);
-     return 0;
-   }
- }
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 007df403ff73..83e60466c146 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -56,20 +56,16 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
 
 stdenv.mkDerivation rec {
   pname = "libvpx";
-  version = "1.7.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "webmproject";
-    repo = "libvpx";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6";
+    sha256 = "16xv6ambc82g14h1y0q1vyy57wp6j9fbp0nk0wd5csnrw407rhry";
   };
 
-  patches = [
-    ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
-  ];
-
-  postPatch = ''patchShebangs .'';
+  postPatch = "patchShebangs .";
 
   outputs = [ "bin" "dev" "out" ];
   setOutputFlags = false;
@@ -135,6 +131,12 @@ stdenv.mkDerivation rec {
                     experimentalFpMbStatsSupport ||
                     experimentalEmulateHardwareSupport) "experimental")
   ] ++ 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
@@ -159,6 +161,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ ]
     ++ optionals unitTestsSupport [ coreutils curl ];
 
+  NIX_LDFLAGS = [
+    "-lpthread" # fixes linker errors
+  ];
+
   enableParallelBuilding = true;
 
   postInstall = ''moveToOutput bin "$bin" '';
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index d2a98c4a8476..6d24ba7f2ed2 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool
 , threadingSupport ? true # multi-threading
 , openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp)
 , pngSupport ? true, libpng ? null # PNG image format
@@ -27,13 +27,17 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libwebp";
-  version = "1.0.3";
+  version = "1.1.0";
 
-  src = fetchurl {
-    url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz";
-    sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2";
+  src = fetchFromGitHub {
+    owner  = "webmproject";
+    repo   = pname;
+    rev    = version;
+    sha256 = "1kl6qqa29ygqb2fpv140y59v539gdqx4vcf3mlaxhca2bks98qgm";
   };
 
+  prePatch = "patchShebangs .";
+
   configureFlags = [
     (mkFlag threadingSupport "threading")
     (mkFlag openglSupport "gl")
@@ -50,6 +54,7 @@ stdenv.mkDerivation rec {
     (mkFlag libwebpdecoderSupport "libwebpdecoder")
   ];
 
+  nativeBuildInputs = [ autoreconfHook libtool ];
   buildInputs = [ ]
     ++ optionals openglSupport [ freeglut libGL libGLU ]
     ++ optional pngSupport libpng
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index aeeb0514fabb..aa180b94d747 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -8,7 +8,7 @@
 , galliumDrivers ? ["auto"]
 , driDrivers ? ["auto"]
 , vulkanDrivers ? ["auto"]
-, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
+, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ]
 , OpenGL, Xplugin
 , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
 , enableGalliumNine ? stdenv.isLinux
@@ -31,7 +31,7 @@ with stdenv.lib;
 let
   # Release calendar: https://www.mesa3d.org/release-calendar.html
   # Release frequency: https://www.mesa3d.org/releasing.html#schedule
-  version = "20.1.9";
+  version = "20.2.1";
   branch  = versions.major version;
 in
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "10kk8a8k7f4ip8yaiqdyrx162nbw8pw4h3b4hs4ha8mpd43wlldj";
+    sha256 = "0ji4s1gwcvx3fbj9h0x5zbma6kw4b75vs0266zhc06r97yd6v96i";
   };
 
   prePatch = "patchShebangs .";
@@ -58,7 +58,6 @@ stdenv.mkDerivation {
     ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
     ./opencl-install-dir.patch
     ./disk_cache-include-dri-driver-path-in-cache-key.patch
-    ./link-radv-with-ld_args_build_id.patch
   ]
     ++ lib.optionals stdenv.hostPlatform.isMusl [
       # Fix `-Werror=int-conversion` pthread warnings on musl.
diff --git a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
index acf3d827c562..fa78f4ae730a 100644
--- a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
+++ b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
@@ -1,4 +1,4 @@
-From 46b10f2bc28fd79d561c8c49bbae3aee6a4cf0e6 Mon Sep 17 00:00:00 2001
+From 980164fd92f5c2302624cd046d30ff21e6e4ba8a Mon Sep 17 00:00:00 2001
 From: David McFarland <corngood@gmail.com>
 Date: Mon, 6 Aug 2018 15:52:11 -0300
 Subject: [PATCH] disk_cache: include dri driver path in cache key
@@ -12,10 +12,10 @@ timestamps in /nix/store are zero.
  3 files changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/meson_options.txt b/meson_options.txt
-index 1a2dd8ebd12..2ac741af5a6 100644
+index 2d39d13b6ad..daf06480a60 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -348,6 +348,12 @@ option(
+@@ -368,6 +368,12 @@ option(
    value : true,
    description : 'Enable direct rendering in GLX and EGL for DRI',
  )
@@ -26,13 +26,13 @@ index 1a2dd8ebd12..2ac741af5a6 100644
 +  description : 'Mesa cache key.'
 +)
  option(
-   'I-love-half-baked-turnips',
+   'prefer-iris',
    type : 'boolean',
 diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
-index d1f14736725..2ed328f292e 100644
+index a92d621927a..3bd65c6890c 100644
 --- a/src/util/disk_cache.c
 +++ b/src/util/disk_cache.c
-@@ -402,8 +402,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
+@@ -401,8 +401,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
  
     /* Create driver id keys */
     size_t id_size = strlen(driver_id) + 1;
@@ -43,7 +43,7 @@ index d1f14736725..2ed328f292e 100644
     cache->driver_keys_blob_size += gpu_name_size;
  
     /* We sometimes store entire structs that contains a pointers in the cache,
-@@ -424,6 +426,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
+@@ -423,6 +425,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
     uint8_t *drv_key_blob = cache->driver_keys_blob;
     DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size)
     DRV_KEY_CPY(drv_key_blob, driver_id, id_size)
@@ -52,22 +52,23 @@ index d1f14736725..2ed328f292e 100644
     DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size)
     DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size)
 diff --git a/src/util/meson.build b/src/util/meson.build
-index 9da29cc7390..5f549bb1d99 100644
+index 0893f64793b..d46ce85a85f 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
-@@ -170,7 +170,12 @@ _libmesa_util = static_library(
-   include_directories : inc_common,
+@@ -179,7 +179,12 @@ _libmesa_util = static_library(
+   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
    dependencies : deps_for_libmesa_util,
    link_with: libmesa_format,
--  c_args : [c_msvc_compat_args, c_vis_args],
+-  c_args : [c_msvc_compat_args],
 +  c_args : [
-+    c_msvc_compat_args, c_vis_args,
++    c_msvc_compat_args,
 +    '-DDISK_CACHE_KEY="@0@"'.format(
 +      get_option('disk-cache-key')
 +    ),
 +  ],
+   gnu_symbol_visibility : 'hidden',
    build_by_default : false
  )
- 
 -- 
-2.25.1
+2.28.0
+
diff --git a/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch b/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch
deleted file mode 100644
index 0a660332392d..000000000000
--- a/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b49bcb6eece322b70fc2e8b0c8498f5a38ea7b82 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Sun, 26 Jul 2020 17:29:49 -0300
-Subject: [PATCH] link radv with ld_args_build_id
-
-This is needed for radv_device_get_cache_uuid to work correctly.
----
- src/amd/vulkan/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
-index eec026e8f60..a07a0821938 100644
---- a/src/amd/vulkan/meson.build
-+++ b/src/amd/vulkan/meson.build
-@@ -183,7 +183,7 @@ libvulkan_radeon = shared_library(
-   ],
-   c_args : [c_vis_args, no_override_init_args, radv_flags],
-   cpp_args : [cpp_vis_args, radv_flags],
--  link_args : [ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args],
-+  link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args],
-   link_depends : [libvulkan_radeon_link_depends,],
-   install : true,
- )
---
-2.28.0
diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch
index 9685a1619a58..72488893c6b6 100644
--- a/pkgs/development/libraries/mesa/missing-includes.patch
+++ b/pkgs/development/libraries/mesa/missing-includes.patch
@@ -9,18 +9,6 @@
  #include "pipe/p_compiler.h"
  #include "pipe/p_state.h"
  
---- ./src/util/rand_xor.c.orig	2017-06-20 00:38:57.199474067 +0200
-+++ ./src/util/rand_xor.c	2017-06-20 00:40:31.351279557 +0200
-@@ -23,7 +23,9 @@
-  */
- 
- #if defined(__linux__)
-+#include <sys/types.h>
- #include <sys/file.h>
-+#include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
- #else
 --- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
 +++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
 @@ -28,6 +28,8 @@
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 1fc38dd8aaa8..c4a9a4a01808 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -160,8 +160,8 @@ in {
   };
 
   openssl_1_1 = common {
-    version = "1.1.1g";
-    sha256 = "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x";
+    version = "1.1.1h";
+    sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w";
     patches = [
       ./1.1/nix-ssl-cert-file.patch
 
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 46f520e41e4a..31a7e7e90867 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -36,6 +36,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # Tests run in fakeroot for non-root users
+  preCheck = ''
+    if [ "$(id -u)" != "0" ]; then
+      export FAKED_MODE=1
+    fi
+  '';
+
   doCheck = !stdenv.isDarwin;
 
   installFlags = [
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 8302ebbd1e80..d5819ff7ee9a 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }:
+{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium
+, enableDrafts ? false }:
 
 stdenv.mkDerivation rec {
   pname = "zeromq";
-  version = "4.3.2";
+  version = "4.3.3";
 
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "libzmq";
     rev = "v${version}";
-    sha256 = "1q37z05i76ili31j6jlw8988iy6vxadlmd306f99phxfdpqa6bn9";
+    sha256 = "155kb0ih0xj4jvd39bq8d04bgvhy9143r3632ks1m04455z4qdzd";
   };
 
-  nativeBuildInputs = [ cmake asciidoc ];
+  nativeBuildInputs = [ cmake asciidoc pkg-config ];
+  buildInputs = [ libsodium ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix
index bc3de37526a1..7dbe3b98fca3 100644
--- a/pkgs/development/python-modules/arrow/default.nix
+++ b/pkgs/development/python-modules/arrow/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "arrow";
-  version = "0.15.8";
+  version = "0.17.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "edc31dc051db12c95da9bac0271cd1027b8e36912daf6d4580af53b23e62721a";
+    sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4";
   };
 
   propagatedBuildInputs = [ python-dateutil ]
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index d61279e38d5d..24e0f9792d7a 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,4 +1,13 @@
-{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }:
+{ lib
+, fetchFromGitHub
+, meson
+, ninja
+, buildPythonPackage
+, pytestCheckHook
+, pkg-config
+, cairo
+, isPy3k
+}:
 
 buildPythonPackage rec {
   pname = "pycairo";
@@ -16,22 +25,25 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
   ];
 
   buildInputs = [
     cairo
-    xlibsWrapper
   ];
 
-  checkInputs = [ pytest ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  mesonFlags = [ "-Dpython=${if isPy3k then "python3" else "python"}" ];
+  mesonFlags = [
+    "-Dpython=${if isPy3k then "python3" else "python"}"
+  ];
 
   meta = with lib; {
     description = "Python 2/3 bindings for cairo";
     homepage = "https://pycairo.readthedocs.io/";
-    license = with licenses; [ lgpl2 mpl11 ];
+    license = with licenses; [ lgpl21Only mpl11 ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 559a4c191b68..010f1d9c6c2c 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -5,6 +5,7 @@
 , ps
 , isBootstrap ? false
 , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
+, useOpenSSL ? !isBootstrap, openssl
 , useNcurses ? false, ncurses
 , useQt4 ? false, qt4
 , withQt5 ? false, qtbase
@@ -44,15 +45,17 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  buildInputs =
-    [ setupHook pkgconfig ]
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  nativeBuildInputs = [ setupHook pkgconfig ];
+
+  buildInputs = []
     ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
+    ++ lib.optional useOpenSSL openssl
     ++ lib.optional useNcurses ncurses
     ++ lib.optional useQt4 qt4
     ++ lib.optional withQt5 qtbase;
 
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-
   propagatedBuildInputs = lib.optional stdenv.isDarwin ps;
 
   preConfigure = ''
@@ -91,13 +94,15 @@ stdenv.mkDerivation rec {
     "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
     "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
     "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
-  ]
+
+    "-DCMAKE_USE_OPENSSL=${if useOpenSSL then "ON" else "OFF"}"
     # Avoid depending on frameworks.
-    ++ lib.optional (!useNcurses) "-DBUILD_CursesDialog=OFF";
+    "-DBUILD_CursesDialog=${if useNcurses then "ON" else "OFF"}"
+  ];
 
   # make install attempts to use the just-built cmake
   preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ''
-    sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile
+    sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile
   '';
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch b/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch
new file mode 100644
index 000000000000..5b9020b3d540
--- /dev/null
+++ b/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch
@@ -0,0 +1,40 @@
+From 536108b10271f2f42d41c7d9ddb4ce2ea1851f4f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
+Date: Sat, 17 Oct 2020 19:27:08 +0200
+Subject: [PATCH] boost: Do not add system paths on nix
+
+---
+ mesonbuild/dependencies/boost.py | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
+index 907c0c275..ecaf11b18 100644
+--- a/mesonbuild/dependencies/boost.py
++++ b/mesonbuild/dependencies/boost.py
+@@ -643,22 +643,7 @@ class BoostDependency(ExternalDependency):
+             roots += [x for x in candidates if x.name.lower().startswith('boost') and x.is_dir()]
+         else:
+             tmp = []  # type: T.List[Path]
+-
+-            # Homebrew
+-            brew_boost = Path('/usr/local/Cellar/boost')
+-            if brew_boost.is_dir():
+-                tmp += [x for x in brew_boost.iterdir()]
+-
+-            # Add some default system paths
+-            tmp += [Path('/opt/local')]
+-            tmp += [Path('/usr/local/opt/boost')]
+-            tmp += [Path('/usr/local')]
+-            tmp += [Path('/usr')]
+-
+-            # Cleanup paths
+-            tmp = [x for x in tmp if x.is_dir()]
+-            tmp = [x.resolve() for x in tmp]
+-            roots += tmp
++            # Do not add any non-explicit paths on nix
+ 
+         return roots
+ 
+-- 
+2.25.4
+
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 8421fb7d70a0..1b9c3ef64774 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -52,6 +52,11 @@ python3.pkgs.buildPythonApplication rec {
     # cut-in-half-by-\0 store path references.
     # Let’s just clear the whole rpath and hope for the best.
     ./clear-old-rpath.patch
+
+    # Patch out default boost search paths to avoid impure builds on
+    # unsandboxed non-NixOS builds, see:
+    # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
+    ./boost-Do-not-add-system-paths-on-nix.patch
   ];
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index 0e10add55613..64fa92be8658 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -14,7 +14,7 @@
 
 let
   apparmor-series = "2.13";
-  apparmor-patchver = "4";
+  apparmor-patchver = "5";
   apparmor-version = apparmor-series + "." + apparmor-patchver;
 
   apparmor-meta = component: with stdenv.lib; {
@@ -27,19 +27,10 @@ let
 
   apparmor-sources = fetchurl {
     url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
-    sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh";
-  };
-
-  # See <https://gitlab.com/apparmor/apparmor/-/issues/74> This and the
-  # accompanying application in prePatchCommon should be removed in 2.13.5
-  gnumake43Patch = fetchpatch {
-    url = "https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch";
-    name = "2-23-fix-build-with-make-4.3.patch";
-    sha256 = "0xw028iqp69j9mxv0kbwraplgkj5i5djdlgf0anpkc5cdbsf96r9";
+    sha256 = "05x7r99k00r97v1cq2f711lv6yqzhbl8zp1i1c7kxra4v0a2lzk3";
   };
 
   prePatchCommon = ''
-    patch -p1 < ${gnumake43Patch}
     chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh
     patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh
     substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man"
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index a9fcf455ee43..b3de7ceedaad 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -5,19 +5,19 @@
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "5.8.0";
+  version = "5.9.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0vk4vickrpahdhl3zazr2qn2bf99v5549ncirjpwiy4h0a4izkfg";
+    sha256 = "1kys6dmhrl43iaq95n5sh02p39d7bq8i5y672qrzgwnwpjaaqpd2";
   };
 
   preConfigure = ''
     # Don't try to create /var/lib/arpd:
     sed -e '/ARPDDIR/d' -i Makefile
-    # TODO: Drop temporary version fix for 5.8 (53159d81) once 5.9 is out:
+    # TODO: Drop temporary version fix for 5.9 once 5.10 is out:
     substituteInPlace include/version.h \
-      --replace "v5.7.0-77-gb687d1067169" "5.8.0"
+      --replace "5.8.0" "${version}"
   '';
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 174f1be99dba..7931e35a8441 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libcap";
-  version = "2.27";
+  version = "2.44";
 
   src = fetchurl {
     url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz";
-    sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs";
+    sha256 = "1qf80lifygbnxwvqjf8jz5j24n6fqqx4ixnkbf76xs2vrmcq664j";
   };
 
   outputs = [ "out" "dev" "lib" "man" "doc" "pam" ];
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Library for working with POSIX capabilities";
+    homepage = "https://sites.google.com/site/fullycapable";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.bsd3;
   };
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index cef9d96ae6e1..da99280f63b8 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,27 +1,61 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, intltool, gperf, libcap
-, curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, e2fsprogs, utillinux, libffi
-, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
-, audit, lz4, bzip2, pcre2
-, linuxHeaders ? stdenv.cc.libc.linuxHeaders
-, iptables, gnu-efi, bashInteractive
-, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
-, ninja, meson, python3Packages, glibcLocales
-, patchelf
-, substituteAll
-, getent
-, cryptsetup, lvm2
+{ stdenv, lib, fetchFromGitHub
 , buildPackages
-, perl
+, ninja, meson, m4, pkgconfig, coreutils, gperf, getent
+, patchelf, perl, glibcLocales, glib, substituteAll
+, gettext, python3Packages
+
+# Mandatory dependencies
+, libcap
+, utillinux
+, kbd
+, kmod
+
+# Optional dependencies
+, pam, cryptsetup, lvm2, audit, acl
+, lz4, libgcrypt, libgpgerror, libidn2
+, curl, gnutar, gnupg, zlib
+, xz, libuuid, libffi
+, libapparmor, intltool
+, bzip2, pcre2, e2fsprogs
+, linuxHeaders ? stdenv.cc.libc.linuxHeaders
+, gnu-efi
+, iptables
 , withSelinux ? false, libselinux
 , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
 , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
+, bashInteractive
+
+, withResolved ? true
+, withLogind ? true
+, withHostnamed ? true
+, withLocaled ? true
+, withNetworkd ? true
+, withTimedated ? true
+, withTimesyncd ? true
+, withHwdb ? true
+, withEfi ? stdenv.hostPlatform.isEfi
+, withImportd ? true
+, withCryptsetup ? true
+
+# name argument
+, pname ? "systemd"
+
+
+, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
 }:
 
+assert withResolved -> (libgcrypt != null && libgpgerror != null);
+assert withImportd ->
+  ( curl.dev != null && zlib != null && xz != null && libgcrypt != null
+  && gnutar != null && gnupg != null);
+
+assert withCryptsetup ->
+  ( cryptsetup != null );
+
 let
   version = "246.6";
 in stdenv.mkDerivation {
-  inherit version;
-  pname = "systemd";
+  inherit version pname;
 
   # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly
   # This has proven to be less error-prone than the previous systemd fork.
@@ -71,13 +105,17 @@ in stdenv.mkDerivation {
   outputs = [ "out" "man" "dev" ];
 
   nativeBuildInputs =
-    [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
+    [ pkgconfig gperf
       ninja meson
       coreutils # meson calls date, stat etc.
       glibcLocales
       patchelf getent m4
       perl # to patch the libsystemd.so and remove dependencies on aarch64
 
+      intltool
+      gettext
+
+      libxslt docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
       (buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]))
     ];
   buildInputs =
@@ -86,9 +124,10 @@ in stdenv.mkDerivation {
       pcre2 ] ++
       stdenv.lib.optional withKexectools kexectools ++
       stdenv.lib.optional withLibseccomp libseccomp ++
-    [ libffi audit lz4 bzip2 libapparmor
-      iptables gnu-efi
-    ] ++ stdenv.lib.optional withSelinux libselinux;
+      [ libffi audit lz4 bzip2 libapparmor iptables ] ++
+      stdenv.lib.optional withEfi gnu-efi ++
+      stdenv.lib.optional withSelinux libselinux ++
+      stdenv.lib.optional withCryptsetup cryptsetup.dev;
 
   #dontAddPrefix = true;
 
@@ -106,19 +145,23 @@ in stdenv.mkDerivation {
     "-Ddebug-shell=${bashInteractive}/bin/bash"
     # while we do not run tests we should also not build them. Removes about 600 targets
     "-Dtests=false"
-    "-Dimportd=true"
+    "-Dimportd=${stdenv.lib.boolToString withImportd}"
     "-Dlz4=true"
     "-Dhomed=false"
-    "-Dhostnamed=true"
-    "-Dnetworkd=true"
+    "-Dlogind=${stdenv.lib.boolToString withLogind}"
+    "-Dlocaled=${stdenv.lib.boolToString withLocaled}"
+    "-Dhostnamed=${stdenv.lib.boolToString withHostnamed}"
+    "-Dnetworkd=${stdenv.lib.boolToString withNetworkd}"
+    "-Dcryptsetup=${stdenv.lib.boolToString withCryptsetup}"
     "-Dportabled=false"
+    "-Dhwdb=${stdenv.lib.boolToString withHwdb}"
     "-Dremote=false"
     "-Dsysusers=false"
-    "-Dtimedated=true"
-    "-Dtimesyncd=true"
+    "-Dtimedated=${stdenv.lib.boolToString withTimedated}"
+    "-Dtimesyncd=${stdenv.lib.boolToString withTimesyncd}"
     "-Dfirstboot=false"
     "-Dlocaled=true"
-    "-Dresolve=true"
+    "-Dresolve=${stdenv.lib.boolToString withResolved}"
     "-Dsplit-usr=false"
     "-Dlibcurl=true"
     "-Dlibidn=false"
@@ -141,11 +184,6 @@ in stdenv.mkDerivation {
     "-Dsystem-gid-max=999"
     # "-Dtime-epoch=1"
 
-    (if !stdenv.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"
-
     "-Dsysvinit-path="
     "-Dsysvrcnd-path="
 
@@ -161,6 +199,12 @@ in stdenv.mkDerivation {
     # Upstream defaulted to disable manpages since they optimize for the much
     # more frequent development builds
     "-Dman=true"
+
+    "-Dgnu-efi=${stdenv.lib.boolToString (withEfi && gnu-efi != null)}"
+  ] ++ stdenv.lib.optionals (withEfi && gnu-efi != null) [
+    "-Defi-libdir=${toString gnu-efi}/lib"
+    "-Defi-includedir=${toString gnu-efi}/include/efi"
+    "-Defi-ldsdir=${toString gnu-efi}/lib"
   ];
 
   preConfigure = ''
@@ -284,6 +328,6 @@ in stdenv.mkDerivation {
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     priority = 10;
-    maintainers = with maintainers; [ andir eelco flokli ];
+    maintainers = with maintainers; [ andir eelco flokli kloenk ];
   };
 }
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index efc2cb2acbdd..96f40649c0f2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation {
-    name = "libX11-1.6.8";
+    name = "libX11-1.6.12";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2";
-      sha256 = "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj";
+      url = "mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2";
+      sha256 = "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
@@ -1054,11 +1054,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation {
-    name = "libXvMC-1.0.11";
+    name = "libXvMC-1.0.12";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2";
-      sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja";
+      url = "mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2";
+      sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
@@ -1158,11 +1158,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python }: stdenv.mkDerivation {
-    name = "libxcb-1.13.1";
+    name = "libxcb-1.14";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2";
-      sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8";
+      url = "mirror://xorg/individual/lib/libxcb-1.14.tar.xz";
+      sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig python ];
@@ -1431,11 +1431,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation {
-    name = "xcb-proto-1.13";
+    name = "xcb-proto-1.14.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2";
-      sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v";
+      url = "mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz";
+      sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig python ];
@@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation {
-    name = "xf86-input-libinput-0.28.2";
+    name = "xf86-input-libinput-0.30.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2";
-      sha256 = "0818vr0yhk9j1y1wcbxzcd458vrvp06rrhi8k43bhqkb5jb4dcxq";
+      url = "mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2";
+      sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
@@ -2679,11 +2679,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation {
-    name = "xorgproto-2019.1";
+    name = "xorgproto-2020.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2";
-      sha256 = "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6";
+      url = "mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2";
+      sha256 = "1llrnrkq6iprgiqakmwlv89745s9h02xsiaq0xn3fnh377qm78al";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 80ea5553ad6b..e6047458cf27 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -82,13 +82,6 @@ self: super:
 
   libX11 = super.libX11.overrideAttrs (attrs: {
     outputs = [ "out" "dev" "man" ];
-    patches = [
-      # Fixes an issue that happens when cross-compiling for us.
-      (fetchpatch {
-        url = "https://cgit.freedesktop.org/xorg/lib/libX11/patch/?id=0327c427d62f671eced067c6d9b69f4e216a8cac";
-        sha256 = "11k2mx56hjgw886zf1cdf2nhv7052d5rggimfshg6lq20i38vpza";
-      })
-    ];
     configureFlags = attrs.configureFlags or []
       ++ malloc0ReturnsNullCrossFlag;
     depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ecc477980b8a..cd2946048847 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -1,7 +1,5 @@
 https://invisible-mirror.net/archives/luit/luit-20190106.tgz
 https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
-https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2
-https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
 https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2
 https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2
 https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2
@@ -83,7 +81,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2
+mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
@@ -177,10 +175,11 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2
 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2
 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2
+mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2
 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2
+mirror://xorg/individual/lib/libxcb-1.14.tar.xz
 mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2
 mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2
 mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2
@@ -206,12 +205,13 @@ mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2
 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2
 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2
-mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2
+mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2
 mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2
 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2
 mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2
 mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2
-mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2
+mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz
+mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2
 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
 mirror://xorg/individual/util/imake-1.0.8.tar.bz2
 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix
index eeb175a5e789..5fda57048121 100644
--- a/pkgs/shells/bash/bash-completion/default.nix
+++ b/pkgs/shells/bash/bash-completion/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bash-completion";
-  version = "2.10";
+  version = "2.11";
 
   src = fetchFromGitHub {
     owner = "scop";
     repo = "bash-completion";
     rev = version;
-    sha256 = "047yjryy9d6hp18wkigbfrw9r0sm31inlsp8l28fhxg8ii032sgq";
+    sha256 = "0m3brd5jx7w07h8vxvvcmbyrlnadrx6hra3cvx6grzv6rin89liv";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index a040e6ab2424..58da8b71b650 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -190,10 +190,7 @@ in rec {
 
   stage1 = prevStage: let
     persistent = self: super: with prevStage; {
-      cmake = super.cmake.override {
-        isBootstrap = true;
-        useSharedLibraries = false;
-      };
+      cmake = super.cmakeMinimal;
 
       python3 = super.python3Minimal;
 
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 85142090dd42..d9befb9350ad 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -27,6 +27,8 @@ with pkgs;
   cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
   cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
 
+  install-shell-files = callPackage ./install-shell-files {};
+
   kernel-config = callPackage ./kernel.nix {};
 
   ld-library-path = callPackage ./ld-library-path {};
diff --git a/pkgs/test/install-shell-files/default.nix b/pkgs/test/install-shell-files/default.nix
new file mode 100644
index 000000000000..e3729c7d2504
--- /dev/null
+++ b/pkgs/test/install-shell-files/default.nix
@@ -0,0 +1,125 @@
+{ stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }:
+
+let
+  runTest = name: env: buildCommand:
+    runCommandLocal "install-shell-files--${name}" ({
+      nativeBuildInputs = [ installShellFiles ];
+      meta.platforms = stdenv.lib.platforms.all;
+    } // env) buildCommand;
+in
+
+recurseIntoAttrs {
+  # installManPage
+
+  install-manpage = runTest "install-manpage" {} ''
+    mkdir -p doc
+    echo foo > doc/foo.1
+    echo bar > doc/bar.2.gz
+    echo baz > doc/baz.3
+
+    installManPage doc/*
+
+    cmp doc/foo.1 $out/share/man/man1/foo.1
+    cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz
+    cmp doc/baz.3 $out/share/man/man3/baz.3
+  '';
+  install-manpage-outputs = runTest "install-manpage-outputs" {
+    outputs = [ "out" "man" "devman" ];
+  } ''
+    mkdir -p doc
+    echo foo > doc/foo.1
+    echo bar > doc/bar.3
+
+    installManPage doc/*
+
+    # assert they didn't go into $out
+    [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]]
+
+    # foo.1 alone went into man
+    cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1
+    [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]]
+
+    # bar.3 alone went into devman
+    cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3
+    [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]]
+
+    touch $out
+  '';
+
+  # installShellCompletion
+
+  install-completion = runTest "install-completion" {} ''
+    echo foo > foo
+    echo bar > bar
+    echo baz > baz
+    echo qux > qux.zsh
+    echo quux > quux
+
+    installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux
+
+    cmp foo $out/share/bash-completion/completions/foo
+    cmp bar $out/share/bash-completion/completions/bar
+    cmp baz $out/share/zsh/site-functions/_baz
+    cmp qux.zsh $out/share/zsh/site-functions/_qux
+    cmp quux $out/share/fish/vendor_completions.d/quux
+  '';
+  install-completion-output = runTest "install-completion-output" {
+    outputs = [ "out" "bin" ];
+  } ''
+    echo foo > foo
+
+    installShellCompletion --bash foo
+
+    # assert it didn't go into $out
+    [[ ! -f $out/share/bash-completion/completions/foo ]]
+
+    cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo
+
+    touch $out
+  '';
+  install-completion-name = runTest "install-completion-name" {} ''
+    echo foo > foo
+    echo bar > bar
+    echo baz > baz
+
+    installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz
+
+    cmp foo $out/share/bash-completion/completions/foobar.bash
+    cmp bar $out/share/zsh/site-functions/_foobar
+    cmp baz $out/share/fish/vendor_completions.d/baz
+  '';
+  install-completion-inference = runTest "install-completion-inference" {} ''
+    echo foo > foo.bash
+    echo bar > bar.zsh
+    echo baz > baz.fish
+
+    installShellCompletion foo.bash bar.zsh baz.fish
+
+    cmp foo.bash $out/share/bash-completion/completions/foo.bash
+    cmp bar.zsh $out/share/zsh/site-functions/_bar
+    cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish
+  '';
+  install-completion-cmd = runTest "install-completion-cmd" {} ''
+    echo foo > foo.bash
+    echo bar > bar.zsh
+    echo baz > baz.fish
+    echo qux > qux.fish
+
+    installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish
+
+    cmp foo.bash $out/share/bash-completion/completions/foobar.bash
+    cmp bar.zsh $out/share/zsh/site-functions/_foobar
+    cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish
+    cmp qux.fish $out/share/fish/vendor_completions.d/qux
+  '';
+  install-completion-fifo = runTest "install-completion-fifo" {} ''
+    installShellCompletion \
+      --bash --name foo.bash <(echo foo) \
+      --zsh --name _foo <(echo bar) \
+      --fish --name foo.fish <(echo baz)
+
+    [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; }
+    [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; }
+    [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; }
+  '';
+}
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index bf20e0119ec6..fd4872cf8442 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "brotli";
-  version = "1.0.7";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "brotli";
     rev = "v" + version;
-    sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw";
+    sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -32,7 +32,14 @@ stdenv.mkDerivation rec {
 
   # This breaks on Darwin because our cmake hook tries to make a build folder
   # and the wonderful bazel BUILD file is already there (yay case-insensitivity?)
-  prePatch = "rm BUILD";
+  prePatch = ''
+      rm BUILD
+
+      # Upstream fixed this reference to runtime-path after the release
+      # and with this references g++ complains about invalid option -R
+      sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in
+      cat scripts/libbrotli*.pc.in
+    '';
 
   # Don't bother with "man" output for now,
   # it currently only makes the manpages hard to use.
diff --git a/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch b/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch
deleted file mode 100644
index ae1a02d4d202..000000000000
--- a/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0251229bfd9617e8a35cf9dd7d338d63fff74a0c Mon Sep 17 00:00:00 2001
-From: Assaf Gordon <assafgordon@gmail.com>
-Date: Mon, 13 May 2019 16:37:40 -0600
-Subject: [PATCH] tests: avoid false-positive in date-debug test
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When debugging an invalid date due to DST switching, the intermediate
-'normalized time' should not be checked - its value can differ between
-systems (e.g. glibc vs musl).
-
-Reported by Niklas Hambüchen in
-https://lists.gnu.org/r/coreutils/2019-05/msg00031.html
-Analyzed by Rich Felker in
-https://lists.gnu.org/r/coreutils/2019-05/msg00039.html
-
-* tests/misc/date-debug.sh: Replace the exact normalized time
-with 'XX:XX:XX' so different values would not trigger test failure.
----
- tests/misc/date-debug.sh | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/tests/misc/date-debug.sh b/tests/misc/date-debug.sh
-index aa47f1abb..2ce6f4ce8 100755
---- a/tests/misc/date-debug.sh
-+++ b/tests/misc/date-debug.sh
-@@ -71,7 +71,7 @@ date: input timezone: TZ="America/Edmonton" in date string
- date: using specified time as starting value: '02:30:00'
- date: error: invalid date/time value:
- date:     user provided time: '(Y-M-D) 2006-04-02 02:30:00'
--date:        normalized time: '(Y-M-D) 2006-04-02 03:30:00'
-+date:        normalized time: '(Y-M-D) 2006-04-02 XX:XX:XX'
- date:                                             --
- date:      possible reasons:
- date:        non-existing due to daylight-saving time;
-@@ -81,7 +81,14 @@ date: invalid date 'TZ="America/Edmonton" 2006-04-02 02:30:00'
- EOF
- 
- # date should return 1 (error) for invalid date
--returns_ 1 date --debug -d "$in2" >out2 2>&1 || fail=1
-+returns_ 1 date --debug -d "$in2" >out2-t 2>&1 || fail=1
-+
-+# The output line of "normalized time" can differ between systems
-+# (e.g. glibc vs musl) and should not be checked.
-+# See: https://lists.gnu.org/archive/html/coreutils/2019-05/msg00039.html
-+sed '/normalized time:/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]/ XX:XX:XX/' \
-+    out2-t > out2 || framework_failure_
-+
- compare exp2 out2 || fail=1
- 
- ##
diff --git a/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch b/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch
deleted file mode 100644
index 97d95d1c5b19..000000000000
--- a/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3bd82a82cf4ba693d2c31c7b95aaec4e56dc92a4 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 11 Mar 2019 16:40:29 -0700
-Subject: [PATCH 1/1] strtod: fix clash with strtold
-
-Problem reported for RHEL 5 by Jesse Caldwell (Bug#34817).
-* lib/strtod.c (compute_minus_zero, minus_zero):
-Simplify by remving the macro / external variable,
-and having just a function.  User changed.  This avoids
-the need for an external variable that might clash.
----
- ChangeLog    |  9 +++++++++
- lib/strtod.c | 11 +++++------
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/lib/strtod.c b/lib/strtod.c
-index b9eaa51..69b1564 100644
---- a/lib/strtod.c
-+++ b/lib/strtod.c
-@@ -294,16 +294,15 @@ parse_number (const char *nptr,
-    ICC 10.0 has a bug when optimizing the expression -zero.
-    The expression -MIN * MIN does not work when cross-compiling
-    to PowerPC on Mac OS X 10.5.  */
--#if defined __hpux || defined __sgi || defined __ICC
- static DOUBLE
--compute_minus_zero (void)
-+minus_zero (void)
- {
-+#if defined __hpux || defined __sgi || defined __ICC
-   return -MIN * MIN;
--}
--# define minus_zero compute_minus_zero ()
- #else
--DOUBLE minus_zero = -0.0;
-+  return -0.0;
- #endif
-+}
- 
- /* Convert NPTR to a DOUBLE.  If ENDPTR is not NULL, a pointer to the
-    character after the last one used in the number is put in *ENDPTR.  */
-@@ -479,6 +478,6 @@ STRTOD (const char *nptr, char **endptr)
-   /* Special case -0.0, since at least ICC miscompiles negation.  We
-      can't use copysign(), as that drags in -lm on some platforms.  */
-   if (!num && negative)
--    return minus_zero;
-+    return minus_zero ();
-   return negative ? -num : num;
- }
--- 
-1.9.1
-
diff --git a/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch b/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch
deleted file mode 100644
index 02b0b85db312..000000000000
--- a/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch
+++ /dev/null
@@ -1,1153 +0,0 @@
-From 453ff940449bbbde9ec00f0bbf82a359c5598fc7 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Sat, 23 Mar 2019 23:00:52 +0100
-Subject: [PATCH 1/1] Support cross-compilation to musl libc.
-
-Reported by Necktwi Ozfguah <necktwi@ferryfair.com>.
-
-* m4/calloc.m4 (_AC_FUNC_CALLOC_IF): Add cross-compilation guesses for
-musl libc.
-* m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): Likewise.
-* m4/chown.m4 (gl_FUNC_CHOWN): Likewise.
-* m4/d-ino.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_INO): Likewise.
-* m4/fdopendir.m4 (gl_FUNC_FDOPENDIR): Likewise.
-* m4/fnmatch.m4 (gl_FUNC_FNMATCH_POSIX): Likewise.
-* m4/fpurge.m4 (gl_FUNC_FPURGE): Likewise.
-* m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): Likewise.
-* m4/getcwd-abort-bug.m4 (gl_FUNC_GETCWD_ABORT_BUG): Likewise.
-* m4/getdelim.m4 (gl_FUNC_GETDELIM): Likewise.
-* m4/getgroups.m4 (AC_FUNC_GETGROUPS, gl_FUNC_GETGROUPS): Likewise.
-* m4/getline.m4 (gl_FUNC_GETLINE): Likewise.
-* m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY_CLOBBER): Likewise.
-* m4/hypot.m4 (gl_FUNC_HYPOT): Likewise.  // removed
-* m4/hypotf.m4 (gl_FUNC_HYPOTF): Likewise.  // removed
-* m4/hypotl.m4 (gl_FUNC_HYPOTL): Likewise.  // removed
-* m4/iconv_open-utf.m4 (gl_FUNC_ICONV_OPEN_UTF_SUPPORT): Likewise.  // removed
-* m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): Likewise.
-* m4/log.m4 (gl_FUNC_LOG): Likewise.  // removed
-* m4/logf.m4 (gl_FUNC_LOGF): Likewise.  // removed
-* m4/logl.m4 (gl_FUNC_LOGL_WORKS): Likewise.  // removed
-* m4/log10.m4 (gl_FUNC_LOG10): Likewise.  // removed
-* m4/log10f.m4 (gl_FUNC_LOG10F): Likewise.  // removed
-* m4/log10l.m4 (gl_FUNC_LOG10L): Likewise.  // removed
-* m4/log1p.m4 (gl_FUNC_LOG1P): Likewise.  // removed
-* m4/log1pf.m4 (gl_FUNC_LOG1PF): Likewise.  // removed
-* m4/log1pl.m4 (gl_FUNC_LOG1PL): Likewise.  // removed
-* m4/log2.m4 (gl_FUNC_LOG2): Likewise.  // removed
-* m4/log2f.m4 (gl_FUNC_LOG2F): Likewise.  // removed
-* m4/malloc.m4 (_AC_FUNC_MALLOC_IF): Likewise.
-* m4/mkdir.m4 (gl_FUNC_MKDIR): Likewise.
-* m4/mkstemp.m4 (gl_FUNC_MKSTEMP): Likewise.
-* m4/modf.m4 (gl_FUNC_MODF): Likewise.  // removed
-* m4/modff.m4 (gl_FUNC_MODFF): Likewise.  // removed
-* m4/modfl.m4 (gl_FUNC_MODFL): Likewise.  // removed
-* m4/perror.m4 (gl_FUNC_PERROR): Likewise.
-* m4/printf.m4 (gl_PRINTF_SIZES_C99, gl_PRINTF_INFINITE,
-gl_PRINTF_INFINITE_LONG_DOUBLE, gl_PRINTF_DIRECTIVE_A,
-gl_PRINTF_DIRECTIVE_F, gl_PRINTF_FLAG_ZERO, gl_SNPRINTF_TRUNCATION_C99,
-gl_SNPRINTF_RETVAL_C99, gl_SNPRINTF_DIRECTIVE_N,
-gl_VSNPRINTF_ZEROSIZE_C99): Likewise.
-* m4/ptsname.m4 (gl_FUNC_PTSNAME): Likewise.  // removed
-* m4/putenv.m4 (gl_FUNC_PUTENV): Likewise.
-* m4/realloc.m4 (_AC_FUNC_REALLOC_IF): Likewise.
-* m4/remainder.m4 (gl_FUNC_REMAINDER): Likewise.  // removed
-* m4/remainderf.m4 (gl_FUNC_REMAINDERF): Likewise.  // removed
-* m4/remainderl.m4 (gl_FUNC_REMAINDERL): Likewise.  // removed
-* m4/rintl.m4 (gl_FUNC_RINTL): Likewise.  // removed
-* m4/round.m4 (gl_FUNC_ROUND): Likewise.  // removed
-* m4/roundf.m4 (gl_FUNC_ROUNDF): Likewise.  // removed
-* m4/roundl.m4 (gl_FUNC_ROUNDL): Likewise.  // removed
-* m4/setenv.m4 (gl_FUNC_SETENV): Likewise.
-* m4/signbit.m4 (gl_SIGNBIT): Likewise.
-* m4/sleep.m4 (gl_FUNC_SLEEP): Likewise.
-* m4/stpncpy.m4 (gl_FUNC_STPNCPY): Likewise.
-* m4/strerror.m4 (gl_FUNC_STRERROR, gl_FUNC_STRERROR_0): Likewise.
-* m4/strtod.m4 (gl_FUNC_STRTOD): Likewise.
-* m4/strtold.m4 (gl_FUNC_STRTOLD): Likewise.
-* m4/trunc.m4 (gl_FUNC_TRUNC): Likewise.    // removed
-* m4/truncf.m4 (gl_FUNC_TRUNCF): Likewise.  // removed
-* m4/truncl.m4 (gl_FUNC_TRUNCL): Likewise.  // removed
-* m4/tzset.m4 (gl_FUNC_TZSET_CLOBBER): Likewise.
-* m4/ungetc.m4 (gl_FUNC_UNGETC_WORKS): Likewise.
-* m4/usleep.m4 (gl_FUNC_USLEEP): Likewise.
-* m4/utimes.m4 (gl_FUNC_UTIMES): Likewise.
-* m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise.
----
- m4/calloc.m4           |  4 ++-
- m4/canonicalize.m4     |  4 ++-
- m4/chown.m4            | 22 +++++++------
- m4/d-ino.m4            | 16 +++++-----
- m4/fdopendir.m4        | 12 ++++---
- m4/fnmatch.m4          | 18 ++++++++---
- m4/fpurge.m4           | 24 +++++++++-----
- m4/getcwd-abort-bug.m4 | 11 +++++--
- m4/getcwd.m4           |  4 ++-
- m4/getdelim.m4         | 40 ++++++++++++++----------
- m4/getgroups.m4        |  6 +++-
- m4/getline.m4          | 38 +++++++++++++---------
- m4/gettimeofday.m4     |  4 ++-
- m4/link-follow.m4      |  4 ++-
- m4/malloc.m4           |  4 +--
- m4/mkdir.m4            |  4 ++-
- m4/mkstemp.m4          |  4 ++-
- m4/perror.m4           | 12 ++++---
- m4/printf.m4           | 22 ++++++++++++-
- m4/putenv.m4           |  4 ++-
- m4/realloc.m4          |  4 +--
- m4/setenv.m4           |  4 ++-
- m4/signbit.m4          |  6 +++-
- m4/sleep.m4            |  4 ++-
- m4/stpncpy.m4          | 14 +++++++--
- m4/strerror.m4         |  6 +++-
- m4/strtod.m4           | 10 +++---
- m4/strtold.m4          |  9 ++++--
- m4/tzset.m4            |  4 ++-
- m4/ungetc.m4           | 18 ++++++-----
- m4/usleep.m4           |  4 ++-
- m4/utimes.m4           | 10 +++---
- m4/wcwidth.m4          | 12 ++++---
- 76 files changed, 461 insertions(+), 157 deletions(-)
-
-diff --git a/m4/calloc.m4 b/m4/calloc.m4
-index 012a5bf..d76535d 100644
---- a/m4/calloc.m4
-+++ b/m4/calloc.m4
-@@ -1,4 +1,4 @@
--# calloc.m4 serial 18
-+# calloc.m4 serial 19
-
- # Copyright (C) 2004-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -40,6 +40,8 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF],
-        [case "$host_os" in
-                          # Guess yes on glibc systems.
-           *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;;
-+                         # Guess yes on musl systems.
-+          *-musl*)       ac_cv_func_calloc_0_nonnull="guessing yes" ;;
-                          # Guess yes on native Windows.
-           mingw*)        ac_cv_func_calloc_0_nonnull="guessing yes" ;;
-                          # If we don't know, assume the worst.
-diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
-index 5b6e25d..b61747b 100644
---- a/m4/canonicalize.m4
-+++ b/m4/canonicalize.m4
-@@ -1,4 +1,4 @@
--# canonicalize.m4 serial 29
-+# canonicalize.m4 serial 30
-
- dnl Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc.
-
-@@ -113,6 +113,8 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS],
-      [case "$host_os" in
-                        # Guess yes on glibc systems.
-         *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;;
-+                       # Guess yes on musl systems.
-+        *-musl*)       gl_cv_func_realpath_works="guessing yes" ;;
-                        # Guess no on native Windows.
-         mingw*)        gl_cv_func_realpath_works="guessing no" ;;
-                        # If we don't know, assume the worst.
-diff --git a/m4/chown.m4 b/m4/chown.m4
-index ecfc0c0..b798325 100644
---- a/m4/chown.m4
-+++ b/m4/chown.m4
-@@ -1,4 +1,4 @@
--# serial 30
-+# serial 32
- # Determine whether we need the chown wrapper.
-
- dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2019 Free Software
-@@ -109,10 +109,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN],
-         [gl_cv_func_chown_slash_works=yes],
-         [gl_cv_func_chown_slash_works=no],
-         [case "$host_os" in
--                   # Guess yes on glibc systems.
--           *-gnu*) gl_cv_func_chown_slash_works="guessing yes" ;;
--                   # If we don't know, assume the worst.
--           *)      gl_cv_func_chown_slash_works="guessing no" ;;
-+                    # Guess yes on glibc systems.
-+           *-gnu*)  gl_cv_func_chown_slash_works="guessing yes" ;;
-+                    # Guess yes on musl systems.
-+           *-musl*) gl_cv_func_chown_slash_works="guessing yes" ;;
-+                    # If we don't know, assume the worst.
-+           *)       gl_cv_func_chown_slash_works="guessing no" ;;
-          esac
-         ])
-       rm -f conftest.link conftest.file])
-@@ -145,10 +147,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN],
-         [gl_cv_func_chown_ctime_works=yes],
-         [gl_cv_func_chown_ctime_works=no],
-         [case "$host_os" in
--                   # Guess yes on glibc systems.
--           *-gnu*) gl_cv_func_chown_ctime_works="guessing yes" ;;
--                   # If we don't know, assume the worst.
--           *)      gl_cv_func_chown_ctime_works="guessing no" ;;
-+                    # Guess yes on glibc systems.
-+           *-gnu*)  gl_cv_func_chown_ctime_works="guessing yes" ;;
-+                    # Guess yes on musl systems.
-+           *-musl*) gl_cv_func_chown_ctime_works="guessing yes" ;;
-+                    # If we don't know, assume the worst.
-+           *)       gl_cv_func_chown_ctime_works="guessing no" ;;
-          esac
-         ])
-       rm -f conftest.file])
-diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
-index f1420cc..87dcacc 100644
---- a/m4/d-ino.m4
-+++ b/m4/d-ino.m4
-@@ -1,4 +1,4 @@
--# serial 18
-+# serial 19
-
- dnl From Jim Meyering.
- dnl
-@@ -40,12 +40,14 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO],
-            [gl_cv_struct_dirent_d_ino=yes],
-            [gl_cv_struct_dirent_d_ino=no],
-            [case "$host_os" in
--                           # Guess yes on glibc systems with Linux kernel.
--              linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
--                           # Guess no on native Windows.
--              mingw*)      gl_cv_struct_dirent_d_ino="guessing no" ;;
--                           # If we don't know, assume the worst.
--              *)           gl_cv_struct_dirent_d_ino="guessing no" ;;
-+                            # Guess yes on glibc systems with Linux kernel.
-+              linux*-gnu*)  gl_cv_struct_dirent_d_ino="guessing yes" ;;
-+                            # Guess yes on musl systems with Linux kernel.
-+              linux*-musl*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
-+                            # Guess no on native Windows.
-+              mingw*)       gl_cv_struct_dirent_d_ino="guessing no" ;;
-+                            # If we don't know, assume the worst.
-+              *)            gl_cv_struct_dirent_d_ino="guessing no" ;;
-             esac
-            ])])
-    case "$gl_cv_struct_dirent_d_ino" in
-diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4
-index 0490551..b2b3b03 100644
---- a/m4/fdopendir.m4
-+++ b/m4/fdopendir.m4
-@@ -1,4 +1,4 @@
--# serial 10
-+# serial 11
- # See if we need to provide fdopendir.
-
- dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
-@@ -45,10 +45,12 @@ DIR *fdopendir (int);
-          [gl_cv_func_fdopendir_works=yes],
-          [gl_cv_func_fdopendir_works=no],
-          [case "$host_os" in
--                    # Guess yes on glibc systems.
--            *-gnu*) gl_cv_func_fdopendir_works="guessing yes" ;;
--                    # If we don't know, assume the worst.
--            *)      gl_cv_func_fdopendir_works="guessing no" ;;
-+                     # Guess yes on glibc systems.
-+            *-gnu*)  gl_cv_func_fdopendir_works="guessing yes" ;;
-+                     # Guess yes on musl systems.
-+            *-musl*) gl_cv_func_fdopendir_works="guessing yes" ;;
-+                     # If we don't know, assume the worst.
-+            *)       gl_cv_func_fdopendir_works="guessing no" ;;
-           esac
-          ])])
-     case "$gl_cv_func_fdopendir_works" in
-diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
-index c264ca7..75ba55b 100644
---- a/m4/fnmatch.m4
-+++ b/m4/fnmatch.m4
-@@ -1,4 +1,4 @@
--# Check for fnmatch - serial 13.  -*- coding: utf-8 -*-
-+# Check for fnmatch - serial 14.  -*- coding: utf-8 -*-
-
- # Copyright (C) 2000-2007, 2009-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
-   m4_divert_text([DEFAULTS], [gl_fnmatch_required=POSIX])
-
-   AC_REQUIRE([gl_FNMATCH_H])
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-   gl_fnmatch_required_lowercase=`
-     echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]'
-   `
-@@ -117,12 +118,19 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
-             ]])],
-          [eval "$gl_fnmatch_cache_var=yes"],
-          [eval "$gl_fnmatch_cache_var=no"],
--         [eval "$gl_fnmatch_cache_var=\"guessing no\""])
-+         [case "$host_os" in
-+                     # Guess yes on musl systems.
-+            *-musl*) eval "$gl_fnmatch_cache_var=\"guessing yes\"" ;;
-+                     # Guess no otherwise, even on glibc systems.
-+            *)       eval "$gl_fnmatch_cache_var=\"guessing no\"" ;;
-+          esac
-+         ])
-       ])
-     eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\""
--    if test "$gl_fnmatch_result" != yes; then
--      REPLACE_FNMATCH=1
--    fi
-+    case "$gl_fnmatch_result" in
-+      *yes) ;;
-+      *) REPLACE_FNMATCH=1 ;;
-+    esac
-   fi
-   if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then
-     gl_REPLACE_FNMATCH_H
-diff --git a/m4/fpurge.m4 b/m4/fpurge.m4
-index cb21f56..6c5b3e9 100644
---- a/m4/fpurge.m4
-+++ b/m4/fpurge.m4
-@@ -1,4 +1,4 @@
--# fpurge.m4 serial 8
-+# fpurge.m4 serial 9
- dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -7,12 +7,13 @@ dnl with or without modifications, as long as this notice is preserved.
- AC_DEFUN([gl_FUNC_FPURGE],
- [
-   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-   AC_CHECK_FUNCS_ONCE([fpurge])
-   AC_CHECK_FUNCS_ONCE([__fpurge])
-   AC_CHECK_DECLS([fpurge], , , [[#include <stdio.h>]])
-   if test "x$ac_cv_func_fpurge" = xyes; then
-     HAVE_FPURGE=1
--    # Detect BSD bug.  Only cygwin 1.7 is known to be immune.
-+    # Detect BSD bug.  Only cygwin 1.7 and musl are known to be immune.
-     AC_CACHE_CHECK([whether fpurge works], [gl_cv_func_fpurge_works],
-       [AC_RUN_IFELSE(
-          [AC_LANG_PROGRAM(
-@@ -48,11 +49,20 @@ AC_DEFUN([gl_FUNC_FPURGE],
-                return 13;
-              return 0;
-             ])],
--      [gl_cv_func_fpurge_works=yes], [gl_cv_func_fpurge_works=no],
--      [gl_cv_func_fpurge_works='guessing no'])])
--    if test "x$gl_cv_func_fpurge_works" != xyes; then
--      REPLACE_FPURGE=1
--    fi
-+         [gl_cv_func_fpurge_works=yes],
-+         [gl_cv_func_fpurge_works=no],
-+         [case "$host_os" in
-+                     # Guess yes on musl systems.
-+            *-musl*) gl_cv_func_fpurge_works="guessing yes" ;;
-+                     # Guess no otherwise.
-+            *)       gl_cv_func_fpurge_works="guessing no" ;;
-+          esac
-+         ])
-+      ])
-+    case "$gl_cv_func_fpurge_works" in
-+      *yes) ;;
-+      *) REPLACE_FPURGE=1 ;;
-+    esac
-   else
-     HAVE_FPURGE=0
-   fi
-diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4
-index f0f24a5..7227f08 100644
---- a/m4/getcwd-abort-bug.m4
-+++ b/m4/getcwd-abort-bug.m4
-@@ -1,4 +1,4 @@
--# serial 9
-+# serial 11
- # Determine whether getcwd aborts when the length of the working directory
- # name is unusually large.  Any length between 4k and 16k trigger the bug
- # when using glibc-2.4.90-9 or older.
-@@ -13,6 +13,7 @@
- # gl_FUNC_GETCWD_ABORT_BUG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
- AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG],
- [
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-   AC_CHECK_DECLS_ONCE([getcwd])
-   AC_CHECK_HEADERS_ONCE([unistd.h])
-   AC_REQUIRE([gl_PATHMAX_SNIPPET_PREREQ])
-@@ -142,7 +143,13 @@ main ()
-         else
-           gl_cv_func_getcwd_abort_bug=no
-         fi],
--       [gl_cv_func_getcwd_abort_bug=yes])
-+       [case "$host_os" in
-+                   # Guess no on musl systems.
-+          *-musl*) gl_cv_func_getcwd_abort_bug="guessing no" ;;
-+                   # Guess yes otherwise, even on glibc systems.
-+          *)       gl_cv_func_getcwd_abort_bug="guessing yes"
-+        esac
-+       ])
-     ])
-   AS_IF([test $gl_cv_func_getcwd_abort_bug = yes], [$1], [$2])
- ])
-diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
-index 4929b51..625171a 100644
---- a/m4/getcwd.m4
-+++ b/m4/getcwd.m4
-@@ -6,7 +6,7 @@
- # with or without modifications, as long as this notice is preserved.
-
- # Written by Paul Eggert.
--# serial 16
-+# serial 17
-
- AC_DEFUN([gl_FUNC_GETCWD_NULL],
-   [
-@@ -50,6 +50,8 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
-         [[case "$host_os" in
-                            # Guess yes on glibc systems.
-             *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";;
-+                           # Guess yes on musl systems.
-+            *-musl*)       gl_cv_func_getcwd_null="guessing yes";;
-                            # Guess yes on Cygwin.
-             cygwin*)       gl_cv_func_getcwd_null="guessing yes";;
-                            # If we don't know, assume the worst.
-diff --git a/m4/getdelim.m4 b/m4/getdelim.m4
-index bf17c57..e77c379 100644
---- a/m4/getdelim.m4
-+++ b/m4/getdelim.m4
-@@ -1,4 +1,4 @@
--# getdelim.m4 serial 12
-+# getdelim.m4 serial 13
-
- dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
- dnl
-@@ -11,6 +11,7 @@ AC_PREREQ([2.59])
- AC_DEFUN([gl_FUNC_GETDELIM],
- [
-   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-   dnl Persuade glibc <stdio.h> to declare getdelim().
-   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-@@ -21,9 +22,10 @@ AC_DEFUN([gl_FUNC_GETDELIM],
-   if test $ac_cv_func_getdelim = yes; then
-     HAVE_GETDELIM=1
-     dnl Found it in some library.  Verify that it works.
--    AC_CACHE_CHECK([for working getdelim function], [gl_cv_func_working_getdelim],
--    [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
--    AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+    AC_CACHE_CHECK([for working getdelim function],
-+      [gl_cv_func_working_getdelim],
-+      [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
-+       AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #    include <stdio.h>
- #    include <stdlib.h>
- #    include <string.h>
-@@ -53,25 +55,31 @@ AC_DEFUN([gl_FUNC_GETDELIM],
-       fclose (in);
-       return 0;
-     }
--    ]])], [gl_cv_func_working_getdelim=yes] dnl The library version works.
--    , [gl_cv_func_working_getdelim=no] dnl The library version does NOT work.
--    , dnl We're cross compiling. Assume it works on glibc2 systems.
--      [AC_EGREP_CPP([Lucky GNU user],
--         [
-+    ]])],
-+         [gl_cv_func_working_getdelim=yes],
-+         [gl_cv_func_working_getdelim=no],
-+         [dnl We're cross compiling.
-+          dnl Guess it works on glibc2 systems and musl systems.
-+          AC_EGREP_CPP([Lucky GNU user],
-+            [
- #include <features.h>
- #ifdef __GNU_LIBRARY__
-  #if (__GLIBC__ >= 2) && !defined __UCLIBC__
-   Lucky GNU user
-  #endif
- #endif
--         ],
--         [gl_cv_func_working_getdelim="guessing yes"],
--         [gl_cv_func_working_getdelim="guessing no"])]
--    )])
-+            ],
-+            [gl_cv_func_working_getdelim="guessing yes"],
-+            [case "$host_os" in
-+               *-musl*) gl_cv_func_working_getdelim="guessing yes" ;;
-+               *)       gl_cv_func_working_getdelim="guessing no" ;;
-+             esac
-+            ])
-+         ])
-+      ])
-     case "$gl_cv_func_working_getdelim" in
--      *no)
--        REPLACE_GETDELIM=1
--        ;;
-+      *yes) ;;
-+      *) REPLACE_GETDELIM=1 ;;
-     esac
-   else
-     HAVE_GETDELIM=0
-diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
-index 2ce986e..c93447b 100644
---- a/m4/getgroups.m4
-+++ b/m4/getgroups.m4
-@@ -1,4 +1,4 @@
--# serial 21
-+# serial 22
-
- dnl From Jim Meyering.
- dnl A wrapper around AC_FUNC_GETGROUPS.
-@@ -42,6 +42,8 @@ AC_DEFUN([AC_FUNC_GETGROUPS],
-          [case "$host_os" in # ((
-                            # Guess yes on glibc systems.
-             *-gnu* | gnu*) ac_cv_func_getgroups_works="guessing yes" ;;
-+                           # Guess yes on musl systems.
-+            *-musl*)       ac_cv_func_getgroups_works="guessing yes" ;;
-                            # If we don't know, assume the worst.
-             *)             ac_cv_func_getgroups_works="guessing no" ;;
-           esac
-@@ -95,6 +97,8 @@ AC_DEFUN([gl_FUNC_GETGROUPS],
-           [case "$host_os" in
-                             # Guess yes on glibc systems.
-              *-gnu* | gnu*) gl_cv_func_getgroups_works="guessing yes" ;;
-+                            # Guess yes on musl systems.
-+             *-musl*)       gl_cv_func_getgroups_works="guessing yes" ;;
-                             # If we don't know, assume the worst.
-              *)             gl_cv_func_getgroups_works="guessing no" ;;
-            esac
-diff --git a/m4/getline.m4 b/m4/getline.m4
-index 5b2ead2..32f771c 100644
---- a/m4/getline.m4
-+++ b/m4/getline.m4
-@@ -1,4 +1,4 @@
--# getline.m4 serial 28
-+# getline.m4 serial 29
-
- dnl Copyright (C) 1998-2003, 2005-2007, 2009-2019 Free Software Foundation,
- dnl Inc.
-@@ -16,6 +16,7 @@ dnl to do with the function we need.
- AC_DEFUN([gl_FUNC_GETLINE],
- [
-   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-   dnl Persuade glibc <stdio.h> to declare getline().
-   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-@@ -28,9 +29,10 @@ AC_DEFUN([gl_FUNC_GETLINE],
-                  gl_getline_needs_run_time_check=yes],
-                 [am_cv_func_working_getline=no])
-   if test $gl_getline_needs_run_time_check = yes; then
--    AC_CACHE_CHECK([for working getline function], [am_cv_func_working_getline],
--    [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
--    AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+    AC_CACHE_CHECK([for working getline function],
-+      [am_cv_func_working_getline],
-+      [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
-+       AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #    include <stdio.h>
- #    include <stdlib.h>
- #    include <string.h>
-@@ -61,21 +63,28 @@ AC_DEFUN([gl_FUNC_GETLINE],
-       fclose (in);
-       return 0;
-     }
--    ]])], [am_cv_func_working_getline=yes] dnl The library version works.
--    , [am_cv_func_working_getline=no] dnl The library version does NOT work.
--    , dnl We're cross compiling. Assume it works on glibc2 systems.
--      [AC_EGREP_CPP([Lucky GNU user],
--         [
-+    ]])],
-+         [am_cv_func_working_getline=yes],
-+         [am_cv_func_working_getline=no],
-+         [dnl We're cross compiling.
-+          dnl Guess it works on glibc2 systems and musl systems.
-+          AC_EGREP_CPP([Lucky GNU user],
-+            [
- #include <features.h>
- #ifdef __GNU_LIBRARY__
-  #if (__GLIBC__ >= 2) && !defined __UCLIBC__
-   Lucky GNU user
-  #endif
- #endif
--         ],
--         [am_cv_func_working_getline="guessing yes"],
--         [am_cv_func_working_getline="guessing no"])]
--    )])
-+            ],
-+            [am_cv_func_working_getline="guessing yes"],
-+            [case "$host_os" in
-+               *-musl*) am_cv_func_working_getline="guessing yes" ;;
-+               *)       am_cv_func_working_getline="guessing no" ;;
-+             esac
-+            ])
-+         ])
-+      ])
-   fi
-
-   if test $ac_cv_have_decl_getline = no; then
-@@ -83,7 +92,8 @@ AC_DEFUN([gl_FUNC_GETLINE],
-   fi
-
-   case "$am_cv_func_working_getline" in
--    *no)
-+    *yes) ;;
-+    *)
-       dnl Set REPLACE_GETLINE always: Even if we have not found the broken
-       dnl getline function among $LIBS, it may exist in libinet and the
-       dnl executable may be linked with -linet.
-diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
-index d29b4bf..5e2ef6f 100644
---- a/m4/gettimeofday.m4
-+++ b/m4/gettimeofday.m4
-@@ -1,4 +1,4 @@
--# serial 25
-+# serial 26
-
- # Copyright (C) 2001-2003, 2005, 2007, 2009-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -105,6 +105,8 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
-       case "$host_os" in
-                        # Guess all is fine on glibc systems.
-         *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-+                       # Guess all is fine on musl systems.
-+        *-musl*)       gl_cv_func_gettimeofday_clobber="guessing no" ;;
-                        # Guess no on native Windows.
-         mingw*)        gl_cv_func_gettimeofday_clobber="guessing no" ;;
-                        # If we don't know, assume the worst.
-diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
-index cbd2dca..8ac7301 100644
---- a/m4/link-follow.m4
-+++ b/m4/link-follow.m4
-@@ -1,4 +1,4 @@
--# serial 20
-+# serial 21
- dnl Run a program to determine whether link(2) follows symlinks.
- dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
-
-@@ -88,6 +88,8 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK],
-             case "$host_os" in
-                                   # On glibc/Linux we know the result.
-               linux*-gnu* | gnu*) gl_cv_func_link_follows_symlink="guessing no" ;;
-+                                  # On musl/Linux we know the result.
-+              linux*-musl*)       gl_cv_func_link_follows_symlink="guessing no" ;;
-                                   # Otherwise, we don't know.
-               *)                  gl_cv_func_link_follows_symlink=unknown ;;
-             esac
-diff --git a/m4/malloc.m4 b/m4/malloc.m4
-index b9b8d4b..c469c45 100644
---- a/m4/malloc.m4
-+++ b/m4/malloc.m4
-@@ -1,4 +1,4 @@
--# malloc.m4 serial 17
-+# malloc.m4 serial 19
- dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF],
-        [ac_cv_func_malloc_0_nonnull=no],
-        [case "$host_os" in
-           # Guess yes on platforms where we know the result.
--          *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
-+          *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
-           | hpux* | solaris* | cygwin* | mingw*)
-             ac_cv_func_malloc_0_nonnull="guessing yes" ;;
-           # If we don't know, assume the worst.
-diff --git a/m4/mkdir.m4 b/m4/mkdir.m4
-index 4cd9590..366a3cd 100644
---- a/m4/mkdir.m4
-+++ b/m4/mkdir.m4
-@@ -1,4 +1,4 @@
--# serial 14
-+# serial 15
-
- # Copyright (C) 2001, 2003-2004, 2006, 2008-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -62,6 +62,8 @@ AC_DEFUN([gl_FUNC_MKDIR],
-       [case "$host_os" in
-                         # Guess yes on glibc systems.
-          *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
-+                        # Guess yes on musl systems.
-+         *-musl*)       gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;;
-                         # Guess no on native Windows.
-          mingw*)        gl_cv_func_mkdir_trailing_dot_works="guessing no" ;;
-                         # If we don't know, assume the worst.
-diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
-index ae24c3b..1b15c2e 100644
---- a/m4/mkstemp.m4
-+++ b/m4/mkstemp.m4
-@@ -1,4 +1,4 @@
--#serial 25
-+#serial 26
-
- # Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -59,6 +59,8 @@ AC_DEFUN([gl_FUNC_MKSTEMP],
-           [case "$host_os" in
-                             # Guess yes on glibc systems.
-              *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;;
-+                            # Guess yes on musl systems.
-+             *-musl*)       gl_cv_func_working_mkstemp="guessing yes" ;;
-                             # Guess no on native Windows.
-              mingw*)        gl_cv_func_working_mkstemp="guessing no" ;;
-                             # If we don't know, assume the worst.
-diff --git a/m4/perror.m4 b/m4/perror.m4
-index 335be72..08e2db1 100644
---- a/m4/perror.m4
-+++ b/m4/perror.m4
-@@ -1,4 +1,4 @@
--# perror.m4 serial 7
-+# perror.m4 serial 8
- dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -48,10 +48,12 @@ AC_DEFUN([gl_FUNC_PERROR],
-             rm -rf conftest.txt1 conftest.txt2],
-            [gl_cv_func_perror_works=no],
-            [case "$host_os" in
--                      # Guess yes on native Windows.
--              mingw*) gl_cv_func_perror_works="guessing yes" ;;
--                      # Otherwise guess no.
--              *)      gl_cv_func_perror_works="guessing no" ;;
-+                       # Guess yes on musl systems.
-+              *-musl*) gl_cv_func_perror_works="guessing yes" ;;
-+                       # Guess yes on native Windows.
-+              mingw*)  gl_cv_func_perror_works="guessing yes" ;;
-+                       # Otherwise guess no.
-+              *)       gl_cv_func_perror_works="guessing no" ;;
-             esac
-            ])
-         ])
-diff --git a/m4/printf.m4 b/m4/printf.m4
-index cbf6ae4..6d2280e 100644
---- a/m4/printf.m4
-+++ b/m4/printf.m4
-@@ -1,4 +1,4 @@
--# printf.m4 serial 60
-+# printf.m4 serial 61
- dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -62,6 +62,8 @@ int main ()
- changequote(,)dnl
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_printf_sizes_c99="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_printf_sizes_c99="guessing yes";;
-                                  # Guess yes on FreeBSD >= 5.
-            freebsd[1-4].*)       gl_cv_func_printf_sizes_c99="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
-@@ -240,6 +242,8 @@ int main ()
- changequote(,)dnl
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_printf_infinite="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_printf_infinite="guessing yes";;
-                                  # Guess yes on FreeBSD >= 6.
-            freebsd[1-5].*)       gl_cv_func_printf_infinite="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
-@@ -457,6 +461,8 @@ int main ()
- changequote(,)dnl
-                                          # Guess yes on glibc systems.
-                    *-gnu* | gnu*)        gl_cv_func_printf_infinite_long_double="guessing yes";;
-+                                         # Guess yes on musl systems.
-+                   *-musl*)              gl_cv_func_printf_infinite_long_double="guessing yes";;
-                                          # Guess yes on FreeBSD >= 6.
-                    freebsd[1-5].*)       gl_cv_func_printf_infinite_long_double="guessing no";;
-                    freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
-@@ -575,6 +581,8 @@ int main ()
-                [gl_cv_func_printf_directive_a="guessing yes"],
-                [gl_cv_func_printf_directive_a="guessing no"])
-              ;;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_printf_directive_a="guessing yes";;
-                                  # Guess no on Android.
-            linux*-android*)      gl_cv_func_printf_directive_a="guessing no";;
-                                  # Guess no on native Windows.
-@@ -625,6 +633,8 @@ int main ()
- changequote(,)dnl
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_printf_directive_f="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_printf_directive_f="guessing yes";;
-                                  # Guess yes on FreeBSD >= 6.
-            freebsd[1-5].*)       gl_cv_func_printf_directive_f="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
-@@ -960,6 +970,8 @@ changequote(,)dnl
-          case "$host_os" in
-                             # Guess yes on glibc systems.
-            *-gnu* | gnu*)   gl_cv_func_printf_flag_zero="guessing yes";;
-+                            # Guess yes on musl systems.
-+           *-musl*)         gl_cv_func_printf_flag_zero="guessing yes";;
-                             # Guess yes on BeOS.
-            beos*)           gl_cv_func_printf_flag_zero="guessing yes";;
-                             # Guess no on Android.
-@@ -1206,6 +1218,8 @@ changequote(,)dnl
-          case "$host_os" in
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_snprintf_truncation_c99="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_snprintf_truncation_c99="guessing yes";;
-                                  # Guess yes on FreeBSD >= 5.
-            freebsd[1-4].*)       gl_cv_func_snprintf_truncation_c99="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
-@@ -1308,6 +1322,8 @@ int main ()
- changequote(,)dnl
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_snprintf_retval_c99="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_snprintf_retval_c99="guessing yes";;
-                                  # Guess yes on FreeBSD >= 5.
-            freebsd[1-4].*)       gl_cv_func_snprintf_retval_c99="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
-@@ -1400,6 +1416,8 @@ changequote(,)dnl
-          case "$host_os" in
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_snprintf_directive_n="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_snprintf_directive_n="guessing yes";;
-                                  # Guess yes on FreeBSD >= 5.
-            freebsd[1-4].*)       gl_cv_func_snprintf_directive_n="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
-@@ -1554,6 +1572,8 @@ changequote(,)dnl
-          case "$host_os" in
-                                  # Guess yes on glibc systems.
-            *-gnu* | gnu*)        gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-+                                 # Guess yes on musl systems.
-+           *-musl*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                  # Guess yes on FreeBSD >= 5.
-            freebsd[1-4].*)       gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-            freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-diff --git a/m4/putenv.m4 b/m4/putenv.m4
-index f8960f6..342ba26 100644
---- a/m4/putenv.m4
-+++ b/m4/putenv.m4
-@@ -1,4 +1,4 @@
--# putenv.m4 serial 22
-+# putenv.m4 serial 23
- dnl Copyright (C) 2002-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -36,6 +36,8 @@ AC_DEFUN([gl_FUNC_PUTENV],
-              [case "$host_os" in
-                                # Guess yes on glibc systems.
-                 *-gnu* | gnu*) gl_cv_func_svid_putenv="guessing yes" ;;
-+                               # Guess yes on musl systems.
-+                *-musl*)       gl_cv_func_svid_putenv="guessing yes" ;;
-                                # Guess no on native Windows.
-                 mingw*)        gl_cv_func_svid_putenv="guessing no" ;;
-                                # If we don't know, assume the worst.
-diff --git a/m4/realloc.m4 b/m4/realloc.m4
-index f9f15ad..93066e8 100644
---- a/m4/realloc.m4
-+++ b/m4/realloc.m4
-@@ -1,4 +1,4 @@
--# realloc.m4 serial 15
-+# realloc.m4 serial 17
- dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF],
-        [ac_cv_func_realloc_0_nonnull=no],
-        [case "$host_os" in
-           # Guess yes on platforms where we know the result.
--          *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
-+          *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
-           | hpux* | solaris* | cygwin* | mingw*)
-             ac_cv_func_realloc_0_nonnull="guessing yes" ;;
-           # If we don't know, assume the worst.
-diff --git a/m4/setenv.m4 b/m4/setenv.m4
-index 6101274..a8f83d6 100644
---- a/m4/setenv.m4
-+++ b/m4/setenv.m4
-@@ -1,4 +1,4 @@
--# setenv.m4 serial 27
-+# setenv.m4 serial 28
- dnl Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -37,6 +37,8 @@ AC_DEFUN([gl_FUNC_SETENV],
-       [case "$host_os" in
-                         # Guess yes on glibc systems.
-          *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;;
-+                        # Guess yes on musl systems.
-+         *-musl*)       gl_cv_func_setenv_works="guessing yes" ;;
-                         # If we don't know, assume the worst.
-          *)             gl_cv_func_setenv_works="guessing no" ;;
-        esac
-diff --git a/m4/signbit.m4 b/m4/signbit.m4
-index bf5bce5..f7f2f3d 100644
---- a/m4/signbit.m4
-+++ b/m4/signbit.m4
-@@ -1,4 +1,4 @@
--# signbit.m4 serial 16
-+# signbit.m4 serial 17
- dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -31,6 +31,8 @@ AC_DEFUN([gl_SIGNBIT],
-         [case "$host_os" in
-                           # Guess yes on glibc systems.
-            *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;;
-+                          # Guess yes on musl systems.
-+           *-musl*)       gl_cv_func_signbit="guessing yes" ;;
-                           # Guess yes on native Windows.
-            mingw*)        gl_cv_func_signbit="guessing yes" ;;
-                           # If we don't know, assume the worst.
-@@ -62,6 +64,8 @@ AC_DEFUN([gl_SIGNBIT],
-         [case "$host_os" in
-                           # Guess yes on glibc systems.
-            *-gnu* | gnu*) gl_cv_func_signbit_gcc="guessing yes" ;;
-+                          # Guess yes on musl systems.
-+           *-musl*)       gl_cv_func_signbit_gcc="guessing yes" ;;
-                           # Guess yes on mingw, no on MSVC.
-            mingw*)        if test -n "$GCC"; then
-                             gl_cv_func_signbit_gcc="guessing yes"
-diff --git a/m4/sleep.m4 b/m4/sleep.m4
-index 5f71cc7..7bab467 100644
---- a/m4/sleep.m4
-+++ b/m4/sleep.m4
-@@ -1,4 +1,4 @@
--# sleep.m4 serial 9
-+# sleep.m4 serial 10
- dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -48,6 +48,8 @@ handle_alarm (int sig)
-       [case "$host_os" in
-                         # Guess yes on glibc systems.
-          *-gnu* | gnu*) gl_cv_func_sleep_works="guessing yes" ;;
-+                        # Guess yes on musl systems.
-+         *-musl*)       gl_cv_func_sleep_works="guessing yes" ;;
-                         # Guess no on native Windows.
-          mingw*)        gl_cv_func_sleep_works="guessing no" ;;
-                         # If we don't know, assume the worst.
-diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
-index 83425dd..f8e1a7c 100644
---- a/m4/stpncpy.m4
-+++ b/m4/stpncpy.m4
-@@ -1,4 +1,4 @@
--# stpncpy.m4 serial 16
-+# stpncpy.m4 serial 17
- dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation,
- dnl Inc.
- dnl This file is free software; the Free Software Foundation
-@@ -7,6 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
-
- AC_DEFUN([gl_FUNC_STPNCPY],
- [
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+
-   dnl Persuade glibc <string.h> to declare stpncpy().
-   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-
-@@ -69,12 +71,18 @@ int main ()
- ]])],
-         [gl_cv_func_stpncpy=yes],
-         [gl_cv_func_stpncpy=no],
--        [AC_EGREP_CPP([Thanks for using GNU], [
-+        [dnl Guess yes on glibc systems and musl systems.
-+         AC_EGREP_CPP([Thanks for using GNU], [
- #include <features.h>
- #ifdef __GNU_LIBRARY__
-   Thanks for using GNU
- #endif
--], [gl_cv_func_stpncpy="guessing yes"], [gl_cv_func_stpncpy="guessing no"])
-+],         [gl_cv_func_stpncpy="guessing yes"],
-+           [case "$host_os" in
-+              *-musl*) gl_cv_func_stpncpy="guessing yes" ;;
-+              *)       gl_cv_func_stpncpy="guessing no" ;;
-+            esac
-+           ])
-         ])
-     ])
-     case "$gl_cv_func_stpncpy" in
-diff --git a/m4/strerror.m4 b/m4/strerror.m4
-index b452f7f..2c90f31 100644
---- a/m4/strerror.m4
-+++ b/m4/strerror.m4
-@@ -1,4 +1,4 @@
--# strerror.m4 serial 19
-+# strerror.m4 serial 20
- dnl Copyright (C) 2002, 2007-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -26,6 +26,8 @@ AC_DEFUN([gl_FUNC_STRERROR],
-         [case "$host_os" in
-                           # Guess yes on glibc systems.
-            *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
-+                          # Guess yes on musl systems.
-+           *-musl*)       gl_cv_func_working_strerror="guessing yes" ;;
-                           # If we don't know, assume the worst.
-            *)             gl_cv_func_working_strerror="guessing no" ;;
-          esac
-@@ -80,6 +82,8 @@ AC_DEFUN([gl_FUNC_STRERROR_0],
-       [case "$host_os" in
-                         # Guess yes on glibc systems.
-          *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
-+                        # Guess yes on musl systems.
-+         *-musl*)       gl_cv_func_strerror_0_works="guessing yes" ;;
-                         # Guess yes on native Windows.
-          mingw*)        gl_cv_func_strerror_0_works="guessing yes" ;;
-                         # If we don't know, assume the worst.
-diff --git a/m4/strtod.m4 b/m4/strtod.m4
-index 9912217..d68ab75 100644
---- a/m4/strtod.m4
-+++ b/m4/strtod.m4
-@@ -1,4 +1,4 @@
--# strtod.m4 serial 24
-+# strtod.m4 serial 25
- dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -115,9 +115,11 @@ numeric_equal (double x, double y)
-            ],
-            [gl_cv_func_strtod_works="guessing yes"],
-            [case "$host_os" in
--                      # Guess yes on native Windows.
--              mingw*) gl_cv_func_strtod_works="guessing yes" ;;
--              *)      gl_cv_func_strtod_works="guessing no" ;;
-+                       # Guess yes on musl systems.
-+              *-musl*) gl_cv_func_strtod_works="guessing yes" ;;
-+                       # Guess yes on native Windows.
-+              mingw*)  gl_cv_func_strtod_works="guessing yes" ;;
-+              *)       gl_cv_func_strtod_works="guessing no" ;;
-             esac
-            ])
-         ])
-diff --git a/m4/strtold.m4 b/m4/strtold.m4
-index 16b4eda..17125fe 100644
---- a/m4/strtold.m4
-+++ b/m4/strtold.m4
-@@ -1,4 +1,4 @@
--# strtold.m4 serial 2
-+# strtold.m4 serial 4
- dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -98,7 +98,12 @@ numeric_equal (long double x, long double y)
- #endif
-            ],
-            [gl_cv_func_strtold_works="guessing yes"],
--           [gl_cv_func_strtod_works="guessing no"])
-+           [case "$host_os" in
-+                       # Guess yes on musl systems.
-+              *-musl*) gl_cv_func_strtold_works="guessing yes" ;;
-+              *)       gl_cv_func_strtold_works="guessing no" ;;
-+            esac
-+           ])
-         ])
-       ])
-     case "$gl_cv_func_strtold_works" in
-diff --git a/m4/tzset.m4 b/m4/tzset.m4
-index 1278801..afdfa8e 100644
---- a/m4/tzset.m4
-+++ b/m4/tzset.m4
-@@ -1,4 +1,4 @@
--# serial 11
-+# serial 12
-
- # Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -70,6 +70,8 @@ main ()
-        [case "$host_os" in
-                          # Guess all is fine on glibc systems.
-           *-gnu* | gnu*) gl_cv_func_tzset_clobber="guessing no" ;;
-+                         # Guess all is fine on musl systems.
-+          *-musl*)       gl_cv_func_tzset_clobber="guessing no" ;;
-                          # Guess no on native Windows.
-           mingw*)        gl_cv_func_tzset_clobber="guessing no" ;;
-                          # If we don't know, assume the worst.
-diff --git a/m4/ungetc.m4 b/m4/ungetc.m4
-index ab8757b..08baf33 100644
---- a/m4/ungetc.m4
-+++ b/m4/ungetc.m4
-@@ -1,4 +1,4 @@
--# ungetc.m4 serial 6
-+# ungetc.m4 serial 7
- dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -41,12 +41,16 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS],
-            remove ("conftest.tmp");])],
-         [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no],
-         [case "$host_os" in
--                                       # Guess yes on glibc and bionic systems.
--           *-gnu* | gnu* | *-android*) gl_cv_func_ungetc_works="guessing yes" ;;
--                                       # Guess yes on native Windows.
--           mingw*)                     gl_cv_func_ungetc_works="guessing yes" ;;
--                                       # If we don't know, assume the worst.
--           *)                          gl_cv_func_ungetc_works="guessing no" ;;
-+                          # Guess yes on glibc systems.
-+           *-gnu* | gnu*) gl_cv_func_ungetc_works="guessing yes" ;;
-+                          # Guess yes on musl systems.
-+           *-musl*)       gl_cv_func_ungetc_works="guessing yes" ;;
-+                          # Guess yes on bionic systems.
-+           *-android*)    gl_cv_func_ungetc_works="guessing yes" ;;
-+                          # Guess yes on native Windows.
-+           mingw*)        gl_cv_func_ungetc_works="guessing yes" ;;
-+                          # If we don't know, assume the worst.
-+           *)             gl_cv_func_ungetc_works="guessing no" ;;
-          esac
-         ])
-     ])
-diff --git a/m4/usleep.m4 b/m4/usleep.m4
-index 59605a8..4a6bff0 100644
---- a/m4/usleep.m4
-+++ b/m4/usleep.m4
-@@ -1,4 +1,4 @@
--# usleep.m4 serial 5
-+# usleep.m4 serial 6
- dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -31,6 +31,8 @@ AC_DEFUN([gl_FUNC_USLEEP],
-         [case "$host_os" in
-                           # Guess yes on glibc systems.
-            *-gnu* | gnu*) gl_cv_func_usleep_works="guessing yes" ;;
-+                          # Guess yes on musl systems.
-+           *-musl*)       gl_cv_func_usleep_works="guessing yes" ;;
-                           # Guess no on native Windows.
-            mingw*)        gl_cv_func_usleep_works="guessing no" ;;
-                           # If we don't know, assume the worst.
-diff --git a/m4/utimes.m4 b/m4/utimes.m4
-index 7209b6d..5806d8f 100644
---- a/m4/utimes.m4
-+++ b/m4/utimes.m4
-@@ -1,5 +1,5 @@
- # Detect some bugs in glibc's implementation of utimes.
--# serial 5
-+# serial 6
-
- dnl Copyright (C) 2003-2005, 2009-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
-@@ -143,9 +143,11 @@ main ()
-        [gl_cv_func_working_utimes=yes],
-        [gl_cv_func_working_utimes=no],
-        [case "$host_os" in
--                  # Guess no on native Windows.
--          mingw*) gl_cv_func_working_utimes="guessing no" ;;
--          *)      gl_cv_func_working_utimes="guessing no" ;;
-+                   # Guess yes on musl systems.
-+          *-musl*) gl_cv_func_working_utimes="guessing yes" ;;
-+                   # Guess no on native Windows.
-+          mingw*)  gl_cv_func_working_utimes="guessing no" ;;
-+          *)       gl_cv_func_working_utimes="guessing no" ;;
-         esac
-        ])
-     ])
-diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
-index baa2002..3952fd2 100644
---- a/m4/wcwidth.m4
-+++ b/m4/wcwidth.m4
-@@ -1,4 +1,4 @@
--# wcwidth.m4 serial 27
-+# wcwidth.m4 serial 28
- dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -98,9 +98,13 @@ int main ()
-           [
- changequote(,)dnl
-            case "$host_os" in
--                                        # Guess yes on glibc and AIX 7 systems.
--             *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
--             *)                         gl_cv_func_wcwidth_works="guessing no";;
-+                            # Guess yes on glibc systems.
-+             *-gnu* | gnu*) gl_cv_func_wcwidth_works="guessing yes";;
-+                            # Guess yes on musl systems.
-+             *-musl*)       gl_cv_func_wcwidth_works="guessing yes";;
-+                            # Guess yes on AIX 7 systems.
-+             aix[7-9]*)     gl_cv_func_wcwidth_works="guessing yes";;
-+             *)             gl_cv_func_wcwidth_works="guessing no";;
-            esac
- changequote([,])dnl
-           ])
---
-1.9.1
-
-
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index e7162673a785..e3e2e167e33a 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -22,21 +22,16 @@ with lib;
 
 stdenv.mkDerivation (rec {
   pname = "coreutils";
-  version = "8.31";
+  version = "8.32";
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz";
+    sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo=";
   };
 
   patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
-         # included on coreutils master; TODO: apply unconditionally, I guess
-         ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch
-         ++ optional stdenv.hostPlatform.isMusl ./avoid-false-positive-in-date-debug-test.patch
-         # Fix compilation in musl-cross environments. To be removed in coreutils-8.32.
-         ++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch
-         # Fix compilation in android-cross environments. To be removed in coreutils-8.32.
-         ++ [ ./coreutils-8.31-android-cross.patch ];
+    # included on coreutils master; TODO: apply unconditionally, I guess
+    ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch;
 
   postPatch = ''
     # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems.
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 8e151bc2ead0..c466a48434f2 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -34,14 +34,14 @@ assert gssSupport -> libkrb5 != null;
 
 stdenv.mkDerivation rec {
   pname = "curl";
-  version = "7.72.0";
+  version = "7.73.0";
 
   src = fetchurl {
     urls = [
       "https://curl.haxx.se/download/${pname}-${version}.tar.bz2"
       "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2"
     ];
-    sha256 = "1vq3ay87vayfrv67l7s7h79nm7gwdqhidki0brv5jahhch49g4dd";
+    sha256 = "sha256-zzT+Cwe4APHAGkmabosq9Uj20OBE3KSinYikvuFG0TE=";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 9b33d53e54f1..d2fa0deca007 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "unbound";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
-    sha256 = "1xqywn2qdmjjq0csrqxh9p2rnizdrr1f99zdx87z7f3fyyc0fbwz";
+    sha256 = "0daqxzvknvcz7sgag3wcrxhp4a39ik93lsrfpwcl9whjg2lm74jv";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e53a98e0aa9a..12b0bc0a578d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8346,9 +8346,7 @@ in
   zssh = callPackage ../tools/networking/zssh { };
 
   zstd = callPackage ../tools/compression/zstd {
-    cmake = buildPackages.cmake.override {
-      libarchive = buildPackages.libarchive.override { zstd = null; };
-    };
+    cmake = buildPackages.cmakeMinimal;
   };
 
   zsync = callPackage ../tools/compression/zsync { };
@@ -9676,15 +9674,15 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
     llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10;
   };
-  rust_1_46 = callPackage ../development/compilers/rust/1_46.nix {
+  rust_1_47 = callPackage ../development/compilers/rust/1_47.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
-    llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10;
+    llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_11;
   };
-  rust = rust_1_46;
+  rust = rust_1_47;
 
   rustPackages_1_45 = rust_1_45.packages.stable;
-  rustPackages_1_46 = rust_1_46.packages.stable;
-  rustPackages = rustPackages_1_46;
+  rustPackages_1_47 = rust_1_47.packages.stable;
+  rustPackages = rustPackages_1_47;
 
   inherit (rustPackages) cargo clippy rustc rustPlatform;
 
@@ -10860,6 +10858,10 @@ in
 
   cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { };
 
+  cmakeMinimal = libsForQt5.callPackage ../development/tools/build-managers/cmake {
+    isBootstrap = true;
+  };
+
   cmakeCurses = cmake.override { useNcurses = true; };
 
   cmakeWithGui = cmakeCurses.override { withQt5 = true; };
@@ -18290,7 +18292,7 @@ in
     # udev is the same package as systemd which depends on cryptsetup
     # which depends on lvm2 again.  But we only need the libudev part
     # which does not depend on cryptsetup.
-    udev = udev.override { cryptsetup = null; };
+    udev = systemdMinimal;
   };
   lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 {
     enableDmeventd = true;
@@ -18641,8 +18643,23 @@ in
       bzip2 = null;
     };
   };
+  systemdMinimal = systemd.override {
+    pname = "systemd-minimal";
+    withResolved = false;
+    withLogind = false;
+    withHostnamed = false;
+    withLocaled = false;
+    withTimedated = false;
+    withHwdb = false;
+    withEfi = false;
+    withImportd = false;
+    withCryptsetup = false;
+    cryptsetup = null;
+    lvm2 = null;
+  };
 
-  udev = systemd; # TODO: move to aliases.nix
+
+  udev = systemd; # TODO: change to systemdMinimal
 
   systemd-wait = callPackage ../os-specific/linux/systemd-wait { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 945f55adc70d..0961e3c264d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4828,7 +4828,7 @@ in {
 
   pybullet = callPackage ../development/python-modules/pybullet { };
 
-  pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkgconfig; };
+  pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkg-config; };
 
   pycallgraph = callPackage ../development/python-modules/pycallgraph { };
 

From 4c812da8e5dd7d2615848f212eabbf7d4d9f6a33 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 26 Oct 2020 09:20:30 +0000
Subject: [PATCH 0474/3942] kube3d: add completion for fish

fish completion was added in 3.0.2
https://github.com/rancher/k3d/releases/tag/v3.0.2
---
 .../applications/networking/cluster/kube3d/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index bb3b7aedd8a4..57a41d266e76 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -22,11 +22,13 @@ buildGoModule rec {
   '';
 
   nativeBuildInputs = [ installShellFiles ];
+
+  # TODO: Move to enhanced installShellCompletion when in master: PR #83630
   postInstall = ''
-   for shell in bash zsh; do
-     $out/bin/k3d completion $shell > k3d.$shell
-     installShellCompletion k3d.$shell
-   done
+    $out/bin/k3d completion bash > k3d.bash
+    $out/bin/k3d completion fish > k3d.fish
+    $out/bin/k3d completion zsh  > _k3d
+    installShellCompletion k3d.{bash,fish} --zsh _k3d
   '';
 
   vendorSha256 = null;

From 31ae30a93256f659f1a1dd97b0a63b0807c2d4fd Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 6 Oct 2020 14:23:02 +0100
Subject: [PATCH 0475/3942] kube3d: 3.0.2 -> 3.1.0

Also bumped k3sVersion
---
 pkgs/applications/networking/cluster/kube3d/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 57a41d266e76..d0ff42a82d9e 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,8 +2,8 @@
 
 buildGoModule rec {
   pname = "kube3d";
-  version = "3.0.2";
-  k3sVersion = "1.18.6-k3s1";
+  version = "3.1.0";
+  k3sVersion = "1.18.9-k3s1";
 
   excludedPackages = ''tools'';
 
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "rancher";
     repo   = "k3d";
     rev    = "v${version}";
-    sha256 = "182n4kggwr6z75vsagfd0rl89ixcw5h13whf56jh4cd38dj8is5l";
+    sha256 = "1a3xspyyjp4vgh461q2l30i04ln2l2f7h46dxjrf25ysmlddq2za";
   };
 
   buildFlagsArray = ''

From caaca24a5758d5f74a0c83adfc6c17a80348e833 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 7 Oct 2020 09:57:44 +0100
Subject: [PATCH 0476/3942] kube3d: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index d0ff42a82d9e..1b3d1607a5e3 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "kube3d";
-  version = "3.1.0";
+  version = "3.1.1";
   k3sVersion = "1.18.9-k3s1";
 
   excludedPackages = ''tools'';
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "rancher";
     repo   = "k3d";
     rev    = "v${version}";
-    sha256 = "1a3xspyyjp4vgh461q2l30i04ln2l2f7h46dxjrf25ysmlddq2za";
+    sha256 = "08ia6qxzdm9snqkcy6g4l7m81yk5k8k940lyfq3czc62i0zc8vg3";
   };
 
   buildFlagsArray = ''

From f28030496dc980c2ed3ce9724e72d29e354d9e7a Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 7 Oct 2020 20:41:07 +0100
Subject: [PATCH 0477/3942] kube3d: 3.1.1 -> 3.1.2

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

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 1b3d1607a5e3..9c4bddc359f6 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "kube3d";
-  version = "3.1.1";
+  version = "3.1.2";
   k3sVersion = "1.18.9-k3s1";
 
   excludedPackages = ''tools'';
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "rancher";
     repo   = "k3d";
     rev    = "v${version}";
-    sha256 = "08ia6qxzdm9snqkcy6g4l7m81yk5k8k940lyfq3czc62i0zc8vg3";
+    sha256 = "1qfmmglx57yhrrainxfrmmba54sgxj4is9fgpc3p5sr2babxqgnp";
   };
 
   buildFlagsArray = ''

From 56de13666482fb5fbf3d76e01ba83e87e8c12d77 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sat, 10 Oct 2020 16:49:57 +0100
Subject: [PATCH 0478/3942] kube3d: 3.1.2 -> 3.1.3

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

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 9c4bddc359f6..92307b0b79fb 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "kube3d";
-  version = "3.1.2";
+  version = "3.1.3";
   k3sVersion = "1.18.9-k3s1";
 
   excludedPackages = ''tools'';
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "rancher";
     repo   = "k3d";
     rev    = "v${version}";
-    sha256 = "1qfmmglx57yhrrainxfrmmba54sgxj4is9fgpc3p5sr2babxqgnp";
+    sha256 = "1qwy5h2kgqmyffvnb6q4l4jbavj0lacp46mm2wxrixspadkxg3wm";
   };
 
   buildFlagsArray = ''

From ba708de8819b6518a38d8b2d89e7119f3d1d8754 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 20 Oct 2020 11:09:18 +0100
Subject: [PATCH 0479/3942] kube3d: 3.1.3 -> 3.1.4

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

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 92307b0b79fb..c943a585b319 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "kube3d";
-  version = "3.1.3";
+  version = "3.1.4";
   k3sVersion = "1.18.9-k3s1";
 
   excludedPackages = ''tools'';
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "rancher";
     repo   = "k3d";
     rev    = "v${version}";
-    sha256 = "1qwy5h2kgqmyffvnb6q4l4jbavj0lacp46mm2wxrixspadkxg3wm";
+    sha256 = "05895wgikjqs8myn6qachwjapxbra0n4h5n8a05519hvmniv7fnv";
   };
 
   buildFlagsArray = ''

From 797a3421cd870d52fbe4244c9db5012b2a92ff77 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 22 Oct 2020 09:49:49 +0100
Subject: [PATCH 0480/3942] kube3d: 3.1.4 -> 3.1.5

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

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index c943a585b319..2d71960814ec 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "kube3d";
-  version = "3.1.4";
+  version = "3.1.5";
   k3sVersion = "1.18.9-k3s1";
 
   excludedPackages = ''tools'';
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "rancher";
     repo   = "k3d";
     rev    = "v${version}";
-    sha256 = "05895wgikjqs8myn6qachwjapxbra0n4h5n8a05519hvmniv7fnv";
+    sha256 = "0aspkar9im323d8117k48fvh1yylyspi2p2l2f5rdg1ilpa6hm53";
   };
 
   buildFlagsArray = ''

From aaa2cf6b267cf394bcd15e20c36abdc00fb8c43d Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 22 Oct 2020 12:44:18 +0100
Subject: [PATCH 0481/3942] kube3d: add jk as a maintainer

Add jk (myself) as a maintainer to help keeping kube3d working and
up-to-date.
---
 pkgs/applications/networking/cluster/kube3d/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 2d71960814ec..0f39fc5281ed 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -40,6 +40,6 @@ buildGoModule rec {
     description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ kuznero jlesquembre ngerstle ];
+    maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ];
   };
 }

From e0fecf442cd126bf4aab4d310fc75bcb935b3713 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Thu, 22 Oct 2020 22:47:50 +0900
Subject: [PATCH 0482/3942] linbox: backport upstream fixes

References:
https://github.com/linbox-team/linbox/commit/f78117d9c365efd46f5ea2903b553a08c4029aeb
https://github.com/linbox-team/linbox/commit/4ff828e20053ab2ef9adc4ce6931d159fd513cef

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 pkgs/development/libraries/linbox/default.nix   | 17 +++++++++++++++--
 .../linbox/patches/linbox-pr256-part2.patch     | 13 +++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch

diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index 09bd7e120911..4072dcd1d251 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -14,8 +14,7 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation rec {
   pname = "linbox";
-  version = "1.6.3";
-
+  version = "1.6.3"; # TODO: Check postPatch script on update
 
   src = fetchFromGitHub {
     owner = "linbox-team";
@@ -36,6 +35,20 @@ stdenv.mkDerivation rec {
     fflas-ffpack
   ];
 
+  patches = [
+    # Remove inappropriate `const &` qualifiers on data members that can be
+    # modified via member functions.
+    # See also: https://github.com/linbox-team/linbox/pull/256
+    ./patches/linbox-pr256-part2.patch # TODO: Remove on 1.7.0 update
+  ];
+
+  postPatch = ''
+    # Remove @LINBOXSAGE_LIBS@ that is actually undefined.
+    # See also: https://github.com/linbox-team/linbox/pull/249
+    # TODO: Remove on 1.7.0 update
+    find . -type f -exec sed -e 's/@LINBOXSAGE_LIBS@//' -i {} \;
+  '';
+
   configureFlags = [
     "--with-blas-libs=-lblas"
     "--disable-optimization"
diff --git a/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch b/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch
new file mode 100644
index 000000000000..ec8571a7d710
--- /dev/null
+++ b/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch
@@ -0,0 +1,13 @@
+--- a/linbox/algorithms/det-rational.h
++++ b/linbox/algorithms/det-rational.h
+@@ -79,8 +79,8 @@
+ 	struct MyRationalModularDet {
+ 		const Blackbox &A;
+ 		const MyMethod &M;
+-		const Integer &mul;//multiplicative prec;
+-		const Integer &div;
++		Integer mul;//multiplicative prec;
++		Integer div;
+ 
+ 		MyRationalModularDet(const Blackbox& b, const MyMethod& n,
+ 				     const Integer & p1, const Integer & p2) :

From 1083cdd279dc71b8aebb1e600fe9ad52d9e47b70 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 26 Oct 2020 11:49:18 +0100
Subject: [PATCH 0483/3942] python3Packages.cryptography: 3.1.1 -> 3.2
 (security, CVE-2020-25659)

SECURITY ISSUE: Attempted to make RSA PKCS#1v1.5 decryption more
constant time, to protect against Bleichenbacher vulnerabilities. Due to
limitations imposed by our API, we cannot completely mitigate this
vulnerability and a future release will contain a new API which is
designed to be resilient to these for contexts where it is required.
Credit to Hubert Kario for reporting the issue. CVE-2020-25659
---
 pkgs/development/python-modules/cryptography/default.nix | 4 ++--
 pkgs/development/python-modules/cryptography/vectors.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 426f6af7aa61..b9d66203d8d7 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -22,11 +22,11 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "3.1.1"; # Also update the hash in vectors.nix
+  version = "3.2"; # Also update the hash in vectors.nix
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0z81q4d1nangw3r0v5f41mfl4d9r04qnbayl5ll5v5jpcfhwd7wx";
+    sha256 = "1afcw79yg4bvw4v4l6dvkhnphi3jzrdpq7s4900ikpyyz229ny74";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index c7b244ff0417..90fbda940b38 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xp2j79c1y8qj4b97ygx451gzp8l4cp830hnvg3zw8j134bcaaam";
+    sha256 = "1r4qzmm15mrmlblrmxxvqg3jfy3s5bbn9cfhd7fkpixvs3zhcpvq";
   };
 
   # No tests included

From bc3556546341f70801d6bba652b3955f312e0bad Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 26 Oct 2020 13:33:12 +0100
Subject: [PATCH 0484/3942] nixos/activation-script: make scripts well-typed

---
 .../system/activation/activation-script.nix   | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index ddfd1af4a319..18c77948cb90 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -28,6 +28,20 @@ let
       utillinux # needed for mount and mountpoint
     ];
 
+  scriptType = with types;
+    let scriptOptions =
+      { deps = mkOption
+          { type = types.listOf types.str;
+            default = [ ];
+            description = "List of dependencies. The script will run after these.";
+          };
+        text = mkOption
+          { type = types.lines;
+            description = "The content of the script.";
+          };
+      };
+    in either str (submodule { options = scriptOptions; });
+
 in
 
 {
@@ -40,16 +54,14 @@ in
       default = {};
 
       example = literalExample ''
-        { stdio = {
-            text = '''
-              # Needed by some programs.
-              ln -sfn /proc/self/fd /dev/fd
-              ln -sfn /proc/self/fd/0 /dev/stdin
-              ln -sfn /proc/self/fd/1 /dev/stdout
-              ln -sfn /proc/self/fd/2 /dev/stderr
-            ''';
-            deps = [];
-          };
+        { stdio.text =
+          '''
+            # Needed by some programs.
+            ln -sfn /proc/self/fd /dev/fd
+            ln -sfn /proc/self/fd/0 /dev/stdin
+            ln -sfn /proc/self/fd/1 /dev/stdout
+            ln -sfn /proc/self/fd/2 /dev/stderr
+          ''';
         }
       '';
 
@@ -62,7 +74,7 @@ in
         idempotent and fast.
       '';
 
-      type = types.attrsOf types.unspecified; # FIXME
+      type = types.attrsOf scriptType;
 
       apply = set: {
         script =
@@ -125,7 +137,7 @@ in
         idempotent and fast.
       '';
 
-      type = types.attrsOf types.unspecified;
+      type = with types; attrsOf scriptType;
 
       apply = set: {
         script = ''

From 038793bd1e9d661dea67b78a0bd66219d0ab35b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 26 Oct 2020 14:10:29 +0100
Subject: [PATCH 0485/3942] asterisk_18: Init at 18.0.0

I hope I bumped all attributes correctly.
---
 pkgs/servers/asterisk/default.nix | 18 ++++++++++++++----
 pkgs/top-level/all-packages.nix   |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index b0e7d6aec56c..4c2bd80f42ed 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -91,17 +91,18 @@ let
   };
 
 in rec {
-  # Supported releases (as of 2020-10-07).
+  # Supported releases (as of 2020-10-26).
   # Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions
   # Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/
   #
   # Series  Type       Rel. Date   Sec. Fixes  EOL
   # 13.x    LTS        2014-10-24  2020-10-24  2021-10-24
   # 16.x    LTS        2018-10-09  2022-10-09  2023-10-09
-  asterisk-lts = asterisk_16;
+  # 18.x    LTS        2020-10-20  2024-10-20  2025-10-20
+  asterisk-lts = asterisk_18;
   # 17.x    Standard   2019-10-28  2020-10-28  2021-10-28
-  asterisk-stable = asterisk_17;
-  asterisk = asterisk_17;
+  asterisk-stable = asterisk_18;
+  asterisk = asterisk_18;
 
   asterisk_13 = common {
     version = "13.36.0";
@@ -129,4 +130,13 @@ in rec {
       "addons/mp3" = mp3-202;
     };
   };
+
+  asterisk_18 = common {
+    version = "18.0.0";
+    sha256 = "174zasx8d7ragy2fz4vwc4pbra9wl471mnisz1z0a3b2qsbh4y4v";
+    externals = {
+      "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
+      "addons/mp3" = mp3-202;
+    };
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f1cb87dcc5c..37c00d7dca15 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16409,7 +16409,7 @@ in
 
   inherit (callPackages ../servers/asterisk { })
     asterisk asterisk-stable asterisk-lts
-    asterisk_13 asterisk_16 asterisk_17;
+    asterisk_13 asterisk_16 asterisk_17 asterisk_18;
 
   asterisk-module-sccp = callPackage ../servers/asterisk/sccp { };
 

From 03faeaa8b37b9ab4fb08bb352cb4432c1e166fab Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Mon, 26 Oct 2020 10:00:28 -0400
Subject: [PATCH 0486/3942] kakounePlugins.rep: inherit from rep

---
 pkgs/applications/editors/kakoune/plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix
index 3926973f7ead..93241b93b04d 100644
--- a/pkgs/applications/editors/kakoune/plugins/default.nix
+++ b/pkgs/applications/editors/kakoune/plugins/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, parinfer-rust }:
+{ pkgs, parinfer-rust, rep }:
 
 {
-  inherit parinfer-rust;
+  inherit parinfer-rust rep;
 
   case-kak = pkgs.callPackage ./case.kak.nix { };
   kak-ansi = pkgs.callPackage ./kak-ansi.nix { };

From 976af38df650ee6c8d9e39ff3ccc27075e75e98c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 26 Oct 2020 16:18:04 +0100
Subject: [PATCH 0487/3942] libva: 2.9.0 -> 2.9.1 (#101750)

---
 pkgs/development/libraries/libva/default.nix | 4 ++--
 pkgs/development/libraries/libva/utils.nix   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index d3578283737a..f6c8c9d0bb8c 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   name = "libva-${lib.optionalString minimal "minimal-"}${version}";
-  version = "2.9.0"; # Also update the hash for libva-utils!
+  version = "2.9.1"; # Also update the hash for libva-utils!
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "libva";
     rev    = version;
-    sha256 = "17m8k8fn41vzi1lzh9idf2mn4x73bwlkw60kl5zj396kpw4n1z1r";
+    sha256 = "1c9rwrz30q2p47spzb9gsakwci9c5mw6i309z7p7hr2d8233ay4x";
   };
 
   outputs = [ "dev" "out" ];
diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix
index 71a1d085d121..675d85508b53 100644
--- a/pkgs/development/libraries/libva/utils.nix
+++ b/pkgs/development/libraries/libva/utils.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner  = "intel";
     repo   = "libva-utils";
     rev    = version;
-    sha256 = "1xylc940ffhqay9lyy48872cfw61ziky8dw21vm69psngfz3zs9n";
+    sha256 = "1viqxq9r424hvbfgjlw4zb1idsq24fqr5cz6rk47j37rcnqclj2k";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config ];

From 5ef5d96c0849bcb2760d7e3d2a7653c894a6e13a Mon Sep 17 00:00:00 2001
From: bb2020 <bb2020@users.noreply.github.com>
Date: Mon, 26 Oct 2020 18:34:37 +0300
Subject: [PATCH 0488/3942] discrete-scroll: added myself as maintainer

---
 maintainers/maintainer-list.nix                     | 6 ++++++
 pkgs/os-specific/darwin/discrete-scroll/default.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 23d3d4b589a2..c5328419d128 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9874,4 +9874,10 @@
     github = "wilsonehusin";
     githubId = 14004487;
   };
+  bb2020 = {
+    email = "bb2020@users.noreply.github.com";
+    github = "bb2020";
+    githubId = 19290397;
+    name = "Tunc Uzlu";
+  };
 }
diff --git a/pkgs/os-specific/darwin/discrete-scroll/default.nix b/pkgs/os-specific/darwin/discrete-scroll/default.nix
index e72402b77933..f38bf8d81322 100644
--- a/pkgs/os-specific/darwin/discrete-scroll/default.nix
+++ b/pkgs/os-specific/darwin/discrete-scroll/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/emreyolcu/discrete-scroll";
     platforms = platforms.darwin;
     license = licenses.mit;
+    maintainers = with lib.maintainers; [ bb2020 ];
   };
 }

From a03c8a8f35613b4ca501d09c788545d1fd7376ec Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Fri, 23 Oct 2020 14:09:39 +0200
Subject: [PATCH 0489/3942] vector: add sinks, sources and transforms as
 nixpkgs default features

Don't include transform-geoip unless this feature is explicitly selected
---
 pkgs/tools/misc/vector/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 37595702b686..701e86dbf901 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -4,9 +4,11 @@
 , tzdata
 
 , features ?
-    (if stdenv.isAarch64
+    ((if stdenv.isAarch64
      then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
      else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
+     ++
+     [ "sinks" "sources" "transforms" ])
 , coreutils
 , CoreServices
 }:
@@ -38,9 +40,20 @@ rustPlatform.buildRustPackage rec {
   # vector.dev during the checkPhase, which obviously isn't going to work.
   # these tests in the DNS module are trivial though, so stubbing them out is
   # fine IMO.
+  #
+  # the geoip transform yields maxmindb.so which contains references to rustc.
+  # neither figured out why the shared object is included in the output
+  # (it doesn't seem to be a runtime dependencies of the geoip transform),
+  # nor do I know why it depends on rustc.
+  # However, in order for the closure size to stay at a reasonable level,
+  # transforms-geoip is patched out of Cargo.toml for now - unless explicitly asked for.
   patchPhase = ''
     substituteInPlace ./src/dns.rs \
       --replace "#[test]" ""
+
+    ${lib.optionalString (!builtins.elem "transforms-geoip" features) ''
+        substituteInPlace ./Cargo.toml --replace '"transforms-geoip",' ""
+    ''}
   '';
 
   meta = with stdenv.lib; {

From 4deb3a51df0701551e6ede217a1b0417d5113250 Mon Sep 17 00:00:00 2001
From: elseym <elseym@me.com>
Date: Mon, 26 Oct 2020 18:59:52 +0100
Subject: [PATCH 0490/3942] plex: 1.20.2.3402 -> 1.20.3.3483

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

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index c816f314863a..f06b0a486985 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.20.2.3402-0fec14d92";
+  version = "1.20.3.3483-211702a9f";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "0vylajkk6424cnxx4kg0yl53pg6w271pp71zgg1f4p2nhkbxd91c";
+    sha256 = "0b05mxmvjn2sr0aqy8s2c41gz0vlpmwjwx42jpqddk3qzidvwkbd";
   };
 
   outputs = [ "out" "basedb" ];

From 00c68337f5944a76ed6a10ff20d02bfb263912ea Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 26 Oct 2020 21:26:40 +0100
Subject: [PATCH 0491/3942] systemd: fix 0019-*.patch

This was introduced in https://github.com/NixOS/nixpkgs/pull/99621, but
didn't follow the process documented in
pkgs/os-specific/linux/systemd/default.nix, namely, the `git am` and
`git format-patch` workflow, which caused
`0019-revert-get-rid-of-seat_can_multi_session.patch` to not apply with
`git am` due to missing authorship information.

I did apply this patch manually, and copied authorship information from
4e384ddc113f25aa00f96c96368cb8382981ddc7.
---
 ...ind-seat-debus-show-CanMultiSession-again.patch} | 13 +++++++++++++
 pkgs/os-specific/linux/systemd/default.nix          |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 rename pkgs/os-specific/linux/systemd/{0019-revert-get-rid-of-seat_can_multi_session.patch => 0019-logind-seat-debus-show-CanMultiSession-again.patch} (72%)

diff --git a/pkgs/os-specific/linux/systemd/0019-revert-get-rid-of-seat_can_multi_session.patch b/pkgs/os-specific/linux/systemd/0019-logind-seat-debus-show-CanMultiSession-again.patch
similarity index 72%
rename from pkgs/os-specific/linux/systemd/0019-revert-get-rid-of-seat_can_multi_session.patch
rename to pkgs/os-specific/linux/systemd/0019-logind-seat-debus-show-CanMultiSession-again.patch
index 6ed82a42e700..4f8cc0822d36 100644
--- a/pkgs/os-specific/linux/systemd/0019-revert-get-rid-of-seat_can_multi_session.patch
+++ b/pkgs/os-specific/linux/systemd/0019-logind-seat-debus-show-CanMultiSession-again.patch
@@ -1,3 +1,13 @@
+From 3999d8949ddaf9296928f603661abcea13576d83 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@mailbox.org>
+Date: Mon, 26 Oct 2020 21:21:38 +0100
+Subject: [PATCH 19/19] logind-seat-debus: show CanMultiSession again
+
+Fixes the "switch user" function in Plasma < 5.20.
+---
+ src/login/logind-seat-dbus.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
 index a91765205c..742aeb1064 100644
 --- a/src/login/logind-seat-dbus.c
@@ -11,3 +21,6 @@ index a91765205c..742aeb1064 100644
          SD_BUS_PROPERTY("CanTTY", "b", property_get_can_tty, 0, SD_BUS_VTABLE_PROPERTY_CONST),
          SD_BUS_PROPERTY("CanGraphical", "b", property_get_can_graphical, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
          SD_BUS_PROPERTY("Sessions", "a(so)", property_get_sessions, 0, 0),
+-- 
+2.28.0
+
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index da99280f63b8..3621414af9ac 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -88,7 +88,7 @@ in stdenv.mkDerivation {
     ./0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
     ./0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
     ./0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
-    ./0019-revert-get-rid-of-seat_can_multi_session.patch
+    ./0019-logind-seat-debus-show-CanMultiSession-again.patch
   ];
 
   postPatch = ''

From 5f8a741abfde56cd94fc9171d1a485131050828a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 26 Oct 2020 21:57:01 +0100
Subject: [PATCH 0492/3942] systemdMinimal: build without glib

This takes glib (and by this, gtk-doc) out of systemdMinimal's build
closure.
---
 pkgs/os-specific/linux/systemd/default.nix | 1 +
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index da99280f63b8..f1da382bfa56 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -143,6 +143,7 @@ in stdenv.mkDerivation {
     "-Dsetfont-path=${kbd}/bin/setfont"
     "-Dtty-gid=3" # tty in NixOS has gid 3
     "-Ddebug-shell=${bashInteractive}/bin/bash"
+    "-Dglib=${stdenv.lib.boolToString (glib != null)}"
     # while we do not run tests we should also not build them. Removes about 600 targets
     "-Dtests=false"
     "-Dimportd=${stdenv.lib.boolToString withImportd}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c801d335ab90..1838908b1dd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18660,6 +18660,7 @@ in
     withImportd = false;
     withCryptsetup = false;
     cryptsetup = null;
+    glib = null;
     lvm2 = null;
   };
 

From aa2602987957d4bd0705353d6b872cb3eef1581d Mon Sep 17 00:00:00 2001
From: Max Hausch <cheriimoya@googlemail.com>
Date: Mon, 26 Oct 2020 22:55:21 +0100
Subject: [PATCH 0493/3942] minetime: 1.7.3 -> 1.8.10

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

diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix
index 8f90973e5f8e..1241b97b427f 100644
--- a/pkgs/applications/office/minetime/default.nix
+++ b/pkgs/applications/office/minetime/default.nix
@@ -3,10 +3,10 @@
 let
   name = "${pname}-${version}";
   pname = "minetime";
-  version = "1.7.3";
+  version = "1.8.10";
   appimage = fetchurl {
     url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}.AppImage";
-    sha256 = "0zz6p3mwxg9gm1sqzs582pq2nkb10lv0c3r542b9llqyzk9qv5aa";
+    sha256 = "1a80lgk6v9kv9xb2y3i08gk25jm0pqyl57kfr5p1rbc33prhmcgw";
   };
   extracted = appimageTools.extractType2 {
     inherit name;

From 00527506a5c0b2aea18e113980c68fd0a34ae21c Mon Sep 17 00:00:00 2001
From: Max Hausch <cheriimoya@googlemail.com>
Date: Mon, 26 Oct 2020 23:18:17 +0100
Subject: [PATCH 0494/3942] ndpi: 2.8 -> 3.4

---
 pkgs/development/libraries/ndpi/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix
index c10b396fe0b1..43da97c2edd8 100644
--- a/pkgs/development/libraries/ndpi/default.nix
+++ b/pkgs/development/libraries/ndpi/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }:
+{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap
+, pkg-config }:
 
-let version = "2.8"; in
+let version = "3.4"; in
 
 stdenv.mkDerivation {
   pname = "ndpi";
@@ -10,13 +11,16 @@ stdenv.mkDerivation {
     owner = "ntop";
     repo = "nDPI";
     rev = version;
-    sha256 = "0lc4vga89pm954vf92g9fa6xwsjkb13jd6wrcc35zy5j04nf9rzf";
+    sha256 = "0xjh9gv0mq0213bjfs5ahrh6m7l7g99jjg8104c0pw54hz0p5pq1";
   };
 
   configureScript = "./autogen.sh";
 
   nativeBuildInputs = [which autoconf automake libtool];
-  buildInputs = [libpcap];
+  buildInputs = [
+    libpcap
+    pkg-config
+  ];
 
   meta = with stdenv.lib; {
     description = "A library for deep-packet inspection";

From 3b4cd4f4dacd7db4011e88d819a1ae5acc3f3aff Mon Sep 17 00:00:00 2001
From: Griffin Smith <root@gws.fyi>
Date: Mon, 26 Oct 2020 13:08:56 -0400
Subject: [PATCH 0495/3942] openblas: 0.3.10 -> 0.3.12

---
 ...mised-aarch64-dgemm_beta-pending-fix.patch | 26 -------------------
 .../science/math/openblas/default.nix         |  8 +-----
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch

diff --git a/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch b/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
deleted file mode 100644
index 1da1f3fb3190..000000000000
--- a/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6cb9aa7c69c20a677ca9fb1bc5fa1580e3236fbd Mon Sep 17 00:00:00 2001
-From: Tom Hall <tahall256@protonmail.ch>
-Date: Sat, 14 Mar 2020 11:55:45 +0000
-Subject: [PATCH] Disable optimised aarch64 dgemm_beta pending fix
-
-Identified as source of https://github.com/xianyi/OpenBLAS/issues/2496,
-but not yet fixed.
----
- kernel/arm64/KERNEL.ARMV8 | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/kernel/arm64/KERNEL.ARMV8 b/kernel/arm64/KERNEL.ARMV8
-index fe32d313..33d12f94 100644
---- a/kernel/arm64/KERNEL.ARMV8
-+++ b/kernel/arm64/KERNEL.ARMV8
-@@ -102,7 +102,6 @@ CDOTKERNEL     = zdot.S
- ZDOTKERNEL     = zdot.S
- DSDOTKERNEL    = dot.S
- 
--DGEMM_BETA     = dgemm_beta.S
- SGEMM_BETA     = sgemm_beta.S
- 
- SGEMMKERNEL    =  sgemm_kernel_$(SGEMM_UNROLL_M)x$(SGEMM_UNROLL_N).S
--- 
-2.24.1
-
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index b03e2b3a8ca8..5d6dbd4a65c1 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
     owner = "xianyi";
     repo = "OpenBLAS";
     rev = "v${version}";
-    sha256 = "174id98ga82bhz2v7sy9yj6pqy0h0088p3mkdikip69p9rh3d17b";
+    sha256 = "0mk1kjkr96bvvcq2zigzjrs0cnhwsf6gfi0855mp9yifn8lvp20y";
   };
 
   inherit blas64;
@@ -144,12 +144,6 @@ stdenv.mkDerivation rec {
     buildPackages.stdenv.cc
   ];
 
-  # Disable an optimisation which seems to cause issues, pending an
-  # upstream fix: https://github.com/xianyi/OpenBLAS/issues/2496
-  patches = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [
-    ./0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
-  ];
-
   makeFlags = mkMakeFlagsFromConfig (config // {
     FC = "${stdenv.cc.targetPrefix}gfortran";
     CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}";

From 8fb91897f48ad063c48519edb3d8b6c52934022d Mon Sep 17 00:00:00 2001
From: Max Hausch <cheriimoya@googlemail.com>
Date: Tue, 27 Oct 2020 01:10:37 +0100
Subject: [PATCH 0496/3942] pspp 1.2.0 -> 1.4.1

---
 pkgs/applications/science/math/pspp/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix
index 95c2c3931b3c..d6c5b58f0d56 100644
--- a/pkgs/applications/science/math/pspp/default.nix
+++ b/pkgs/applications/science/math/pspp/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl
 , pkgconfig, gtksourceview, pango, gettext, dconf
 , makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme
-, texinfo, ssw
+, texinfo, ssw, python3
 }:
 
 stdenv.mkDerivation rec {
   pname = "pspp";
-  version = "1.2.0";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "mirror://gnu/pspp/${pname}-${version}.tar.gz";
-    sha256 = "07pp27zycrb5x927jwaj9r3q7hy915jh51xs85zxby6gfiwl63m5";
+    sha256 = "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan";
   };
 
-  nativeBuildInputs = [ pkgconfig texinfo ];
+  nativeBuildInputs = [ pkgconfig texinfo python3 ];
   buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl
     gtksourceview pango gettext
     makeWrapper gsettings-desktop-schemas hicolor-icon-theme ssw

From ff3dca56ede5b2c4baedbbba627d8c6f9f91815e Mon Sep 17 00:00:00 2001
From: Denys Pavlov <me@denys.me>
Date: Thu, 1 Oct 2020 19:20:04 -0400
Subject: [PATCH 0497/3942] pythonPackages.sqlite-utils: init at 2.22

---
 .../python-modules/sqlite-utils/default.nix   | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/sqlite-utils/default.nix

diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix
new file mode 100644
index 000000000000..9fc4c328b2c9
--- /dev/null
+++ b/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, click
+, click-default-group
+, tabulate
+, pytestCheckHook
+, pytestrunner
+, black
+}:
+
+buildPythonPackage rec {
+  pname = "sqlite-utils";
+  version = "2.22";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0g8zzp4qw6miijirykjcd78ib027k7dmg6lb9m4xysvah5jh8vfv";
+  };
+
+  propagatedBuildInputs = [
+    click
+    click-default-group
+    tabulate
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    pytestrunner
+    black
+  ];
+
+  meta = with lib; {
+    description = "Python CLI utility and library for manipulating SQLite databases";
+    homepage = "https://github.com/simonw/sqlite-utils";
+    license = licenses.asl20;
+    maintainers = [ maintainers.meatcar ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51b344f622b3..09eaa48b9fec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11612,6 +11612,8 @@ in
 
   sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };
 
+  sqlite-utils = with python3Packages; toPythonApplication sqlite-utils;
+
   sqlite-web = callPackage ../development/tools/database/sqlite-web { };
 
   sqlmap = with python3Packages; toPythonApplication sqlmap;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 10ab7ea94979..eaf30e0e8998 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6734,6 +6734,8 @@ in {
 
   sqlitedict = callPackage ../development/python-modules/sqlitedict { };
 
+  sqlite-utils = callPackage ../development/python-modules/sqlite-utils { };
+
   sqlmap = callPackage ../development/python-modules/sqlmap { };
 
   sqlobject = callPackage ../development/python-modules/sqlobject { };

From 4a26f177c93099e551ed5cd949a89f631da53a52 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Tue, 27 Oct 2020 10:01:32 +0100
Subject: [PATCH 0498/3942] stdenv/check-meta: add hint to NIXPKGS_ALLOW_* for
 unfree/broken/unsupported system

---
 pkgs/stdenv/generic/check-meta.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index c06f17b6fc19..b93ea558eac2 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -88,13 +88,28 @@ let
     broken-outputs = remediateOutputsToInstall;
     unknown-meta = x: "";
   };
+  remediation_env_var = allow_attr: {
+    Unfree = "NIXPKGS_ALLOW_UNFREE";
+    Broken = "NIXPKGS_ALLOW_BROKEN";
+    UnsupportedSystem = "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM";
+  }.${allow_attr};
+  remediation_phrase = allow_attr: {
+    Unfree = "unfree packages";
+    Broken = "broken packages";
+    UnsupportedSystem = "packages that are unsupported for this system";
+  }.${allow_attr};
   remediate_whitelist = allow_attr: attrs:
     ''
-      a) For `nixos-rebuild` you can set
+      a) To temporarily allow ${remediation_phrase allow_attr}, you can use an environment variable
+         for a single invocation of the nix tools.
+
+           $ export ${remediation_env_var allow_attr}=1
+
+      b) For `nixos-rebuild` you can set
         { nixpkgs.config.allow${allow_attr} = true; }
       in configuration.nix to override this.
 
-      b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
+      c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
         { allow${allow_attr} = true; }
       to ~/.config/nixpkgs/config.nix.
     '';

From e300f0fd6959227843a49efb48005aa5ba460fa5 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 27 Oct 2020 13:24:20 +0300
Subject: [PATCH 0499/3942] php: fix on darwin

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index dd296eb10d84..ff9388699175 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -29,7 +29,7 @@ let
     , embedSupport ? false
     , ipv6Support ? true
     , systemdSupport ? stdenv.isLinux
-    , valgrindSupport ? true
+    , valgrindSupport ? !stdenv.isDarwin
     , ztsSupport ? apxs2Support
     }@args:
       let

From 1e3f24f5f44c40bc752d55134142fa1df676f27a Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Thu, 8 Oct 2020 12:47:43 +0200
Subject: [PATCH 0500/3942] pythonPackages.googlemaps: init at 4.4.2

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

diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix
new file mode 100644
index 000000000000..7e13aedec475
--- /dev/null
+++ b/pkgs/development/python-modules/googlemaps/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, requests
+, responses, pytestCheckHook, pytest, pytestcov, isPy27
+}:
+
+buildPythonPackage rec {
+  pname = "googlemaps";
+  version = "4.4.2";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "googlemaps";
+    repo = "google-maps-services-python";
+    rev = "v${version}";
+    sha256 = "DYhW1OGce/0gY7Jmwq6iM45PxLyXIYo4Cfg2u6Xuyg4=";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [ pytestCheckHook responses pytestcov ];
+
+  disabledTests = [
+    # touches network
+    "test_elevation_along_path_single"
+    "test_transit_without_time"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/googlemaps/google-maps-services-python";
+    description = "Python client library for Google Maps API Web Services";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ Scriptkiddi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d8980eb8add..f0e9de879807 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2498,6 +2498,8 @@ in {
 
   google-i18n-address = callPackage ../development/python-modules/google-i18n-address { };
 
+  googlemaps = callPackage ../development/python-modules/googlemaps { };
+
   google-music = callPackage ../development/python-modules/google-music { };
 
   google-music-proto = callPackage ../development/python-modules/google-music-proto { };

From 922af1cd2d11715433b58dd06f66dabecd418d17 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 27 Oct 2020 13:51:04 +0100
Subject: [PATCH 0501/3942] python3Packages.trezor: make udev rules dependency
 linux-only

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

diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 0e0c6da021fb..bb85ca6b6f3c 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , buildPythonPackage
 , fetchPypi
 , isPy3k
@@ -49,6 +50,7 @@ buildPythonPackage rec {
     rlp
     shamir-mnemonic
     typing-extensions
+  ] ++ lib.optionals stdenv.isLinux [
     trezor-udev-rules
   ];
 

From 3f381d579d8bca5a54acb8d72e1720949ee93dd1 Mon Sep 17 00:00:00 2001
From: Louis <louis@bettens.info>
Date: Tue, 27 Oct 2020 13:59:14 +0100
Subject: [PATCH 0502/3942] setxkbmap: include xkeyboard-config manpage

---
 pkgs/servers/x11/xorg/overrides.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 018b44a663dd..d67cdb06e6d6 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -325,8 +325,9 @@ self: super:
   setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
     postInstall =
       ''
-        mkdir -p $out/share
+        mkdir -p $out/share/man/man7
         ln -sfn ${self.xkeyboardconfig}/etc/X11 $out/share/X11
+        ln -sfn ${self.xkeyboardconfig}/share/man/man7/xkeyboard-config.7.gz $out/share/man/man7
       '';
   });
 

From 7aee32121aab12571a3d9b20992d1b61c76d3f58 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 25 Oct 2020 15:48:37 +0100
Subject: [PATCH 0503/3942] ruby: make the build reproducible

ext/io/console/io-console.gemspec was embedding a timestamp which made
the build not reproducible. Gems respect SOURCE_DATE_EPOCH so it's
enough to just delete that line if it exists.

This file has been fixed in
https://github.com/ruby/io-console/commit/679a941d05d869f5e575730f6581c027203b7b26#diff-d8422f096931c58d4463e2489f62a228b0f24f0492950ba88c8c89a0d741cfe6
And then ruby regularly merges that gem into their own repository. Ruby
master is fixed but none of the ruby releases have been fixed yet.

lib/ruby/gems/2.6.0/specifications/default/io-console-0.4.7.gemspec now
contains:

    s.date = "1980-01-01"
---
 pkgs/development/interpreters/ruby/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 7b36b04d1143..189be8945fa9 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -108,6 +108,9 @@ let
           sed -i configure.ac -e '/config.guess/d'
           cp --remove-destination ${config}/config.guess tool/
           cp --remove-destination ${config}/config.sub tool/
+          # Make the build reproducible for ruby <= 2.7
+          # See https://github.com/ruby/io-console/commit/679a941d05d869f5e575730f6581c027203b7b26#diff-d8422f096931c58d4463e2489f62a228b0f24f0492950ba88c8c89a0d741cfe6
+          sed -i ext/io/console/io-console.gemspec -e '/s\.date/d'
         '';
 
         # Force the revision.h generation. Somehow `revision.tmp` is an empty

From c3357d2cd919ae6b0d055ad04738bef3a2309231 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 25 Oct 2020 16:58:05 +0100
Subject: [PATCH 0504/3942] buildRubyGem: remove Makefiles

The generated Makefile is not reproducible. The HDRS section is inode
dependent. "sitearchdir" and "sitelibdir" contains a timestamp and
random postfix. See https://r13y.com/diff/8350ec80865096f84705f3e000d97f151760e768bf626e52c84570413c5e1093-f9dea788fe62d683e90e12e166f29b778c39c699a5be39f9262e5cffb77d3e45.html

Instead of trying to make it reproducible, remove it entirely. It was
only useful for generating the .so file and it no longer needed.

See also https://bugs.ruby-lang.org/issues/15304

Fixes the rubyPackages.nokogiry reproducibility for example.
---
 pkgs/development/ruby-modules/gem/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index 158d5891ec3a..910949d847cc 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -207,7 +207,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
     # looks like useless files which break build repeatability and consume space
     pushd $out/${ruby.gemPath}
     rm -fv doc/*/*/created.rid || true
-    rm -fv {gems/*/ext/*,extensions/*/*/*}/{mkmf.log,gem_make.out} || true
+    rm -fv {gems/*/ext/*,extensions/*/*/*}/{Makefile,mkmf.log,gem_make.out} || true
     rm -fvr cache
     popd
 

From da46f4ecc5ba8487fcf65e7250154d8106674705 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 27 Oct 2020 15:33:12 +0100
Subject: [PATCH 0505/3942] batman-adv: v2020.3 -> v2020.4

also updates batctl and alfred.
---
 pkgs/os-specific/linux/batman-adv/version.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix
index e617881a570c..d93f8a6c46ed 100644
--- a/pkgs/os-specific/linux/batman-adv/version.nix
+++ b/pkgs/os-specific/linux/batman-adv/version.nix
@@ -1,9 +1,9 @@
 {
-  version = "2020.3";
+  version = "2020.4";
 
   sha256 = {
-    batman-adv = "0wrzh0k44zzjx2s5zj65hjkh4jm9y38qpis1s5cbx9cyj756slb5";
-    alfred = "13bvccz90pkjl09jyw68gj23pbrw9b05w1vhds9sjggwf3jkj5w2";
-    batctl = "0r2w2v4sy6wgr7mp9lc7yj9k4ldsbsm3425rjil7p0b17zmzf4rm";
+    batman-adv = "1cxr0zmn9nzisawkrfk0gzd9fx0pg6261c889kz47hwp4f545v6d";
+    alfred = "1ay69nifzghpbvy11fdca5cllkn852h6rg045lci4vzgqf7b2bd2";
+    batctl = "05rrpfbpdhxn5zgdps849qls2ifis6a94cjryb60d4y1nc2n0d7w";
   };
 }

From 8c9bb91c348884964e64440867311ea234b9680e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 27 Oct 2020 20:46:29 +1000
Subject: [PATCH 0506/3942] go_bootstrap: disable failing timezone tests

---
 pkgs/development/compilers/go/1.4.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index af125d60ed0a..efea9d0eb826 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
     cd go
     patchShebangs ./ # replace /bin/bash
 
+    # Disable timezone tests (these fail when `tzdata` is updated)
+    rm src/time/{example,format}_test.go
     # Disabling the 'os/http/net' tests (they want files not available in
     # chroot builds)
     rm src/net/{multicast_test.go,parse_test.go,port_test.go}
@@ -56,8 +58,6 @@ stdenv.mkDerivation rec {
     sed -i '/TestDialTimeout/areturn' src/net/dial_test.go
     # Disable the hostname test
     sed -i '/TestHostname/areturn' src/os/os_test.go
-    # ParseInLocation fails the test
-    sed -i '/TestParseInSydney/areturn' src/time/format_test.go
 
     sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
   '' + lib.optionalString stdenv.isLinux ''
@@ -119,13 +119,6 @@ stdenv.mkDerivation rec {
   patches = [
     ./remove-tools-1.4.patch
     ./creds-test-1.4.patch
-
-    # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
-    # actually works on old versions too.
-    (fetchpatch {
-      url    = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
-      sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
-    })
   ];
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";

From 35f812848eb988736c965f3d32380c7846483c82 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Tue, 27 Oct 2020 12:55:39 +0700
Subject: [PATCH 0507/3942] exifprobe: init at unstable-2018-06-19

---
 pkgs/tools/graphics/exifprobe/default.nix | 31 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/graphics/exifprobe/default.nix

diff --git a/pkgs/tools/graphics/exifprobe/default.nix b/pkgs/tools/graphics/exifprobe/default.nix
new file mode 100644
index 000000000000..93a9be58b72a
--- /dev/null
+++ b/pkgs/tools/graphics/exifprobe/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "exifprobe";
+  version = "unstable-2018-06-19";
+
+  src = fetchFromGitHub {
+    owner = "hfiguiere";
+    repo = "exifprobe";
+    rev = "ce1ea2bc3dbbe8092b26f41cd89831cafe633d69";
+    sha256 = "1c1fhc0v1m452lgnfcijnvrc0by06qfbhn3zkliqi60kv8l2isbp";
+  };
+
+  CFLAGS = [ "-O2" ];
+
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  postInstall = ''
+    mv $out/usr/bin $out/bin
+    mv $out/usr/share $out/share
+    rm -r $out/usr
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tool for reading EXIF data from image files produced by digital cameras";
+    homepage = "https://github.com/hfiguiere/exifprobe";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ siraben ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f1cb87dcc5c..3e29adc249be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3586,6 +3586,8 @@ in
 
   exif = callPackage ../tools/graphics/exif { };
 
+  exifprobe = callPackage ../tools/graphics/exifprobe { };
+
   exiftags = callPackage ../tools/graphics/exiftags { };
 
   exiftool = perlPackages.ImageExifTool;

From 74c6afa7d2bcd4996e963c22946b195fc1452e6a Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Mon, 26 Oct 2020 21:00:01 +0700
Subject: [PATCH 0508/3942] ncrack: init at 0.7

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

diff --git a/pkgs/tools/security/ncrack/default.nix b/pkgs/tools/security/ncrack/default.nix
new file mode 100644
index 000000000000..e377d9748645
--- /dev/null
+++ b/pkgs/tools/security/ncrack/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "ncrack";
+  version = "0.7";
+
+  src = fetchFromGitHub {
+    owner = "nmap";
+    repo = "ncrack";
+    rev = version;
+    sha256 = "1gnv5xdd7n04glcpy7q1mkb6f8gdhdrhlrh8z6k4g2pjdhxlz26g";
+  };
+
+  buildInputs = [ openssl zlib ];
+
+  meta = with stdenv.lib; {
+    description = "Network authentication tool";
+    homepage = "https://nmap.org/ncrack/";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ siraben ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f1cb87dcc5c..9114f3adcb85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5072,6 +5072,8 @@ in
 
   nbench = callPackage ../tools/misc/nbench { };
 
+  ncrack = callPackage ../tools/security/ncrack { };
+
   netdata = callPackage ../tools/system/netdata {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
   };

From b016ae02e6f5b3ed76c043d65da6deec1b89d801 Mon Sep 17 00:00:00 2001
From: David Arnold <dar@xoe.solutions>
Date: Thu, 8 Oct 2020 15:02:07 -0500
Subject: [PATCH 0509/3942] hostctl: init at 1.0.14

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

diff --git a/pkgs/tools/system/hostctl/default.nix b/pkgs/tools/system/hostctl/default.nix
new file mode 100644
index 000000000000..6f557e05cd12
--- /dev/null
+++ b/pkgs/tools/system/hostctl/default.nix
@@ -0,0 +1,36 @@
+{ buildGoModule, fetchFromGitHub, lib, installShellFiles }:
+
+buildGoModule rec {
+  pname = "hostctl";
+  version = "1.0.14";
+
+  src = fetchFromGitHub {
+    owner = "guumaster";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "02bjii97l4fy43v2rb93m9b0ad8y6mjvbvp4sz6a5n0w9dm1z1q9";
+  };
+
+  vendorSha256 = "1lqk3cda0frqp2vwkqa4b3xkdw814wgkbr7g9r2mwxn85fpdcq5c";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ];
+
+  nativeBuildInputs = [ installShellFiles ];
+  postInstall = ''
+    installShellCompletion --cmd hostctl \
+      --bash <($out/bin/hostctl completion bash) \
+      --zsh <($out/bin/hostctl completion zsh)
+  '';
+
+  meta = with lib; {
+    description = "Your dev tool to manage /etc/hosts like a pro!";
+    longDescription = ''
+      This tool gives you more control over the use of your hosts file.
+      You can have multiple profiles and switch them on/off as you need.
+    '';
+    homepage = "https://guumaster.github.io/hostctl/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ blaggacao ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12b0bc0a578d..7b360ab48f1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1108,6 +1108,8 @@ in
 
   hime = callPackage ../tools/inputmethods/hime {};
 
+  hostctl = callPackage ../tools/system/hostctl { };
+
   hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { };
 
   http2tcp = callPackage ../tools/networking/http2tcp { };

From 513599a6d783d2a76d5e0d9759d6b18ce4b9d71b Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Mon, 5 Oct 2020 15:58:44 +0200
Subject: [PATCH 0510/3942] nixos/keycloak: Init

---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/web-apps/keycloak.nix | 465 +++++++++++++++++++
 pkgs/servers/keycloak/default.nix            |  40 +-
 3 files changed, 499 insertions(+), 7 deletions(-)
 create mode 100644 nixos/modules/services/web-apps/keycloak.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ed6201237b3d..c0c8429608b5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -863,6 +863,7 @@
   ./services/web-apps/ihatemoney
   ./services/web-apps/jirafeau.nix
   ./services/web-apps/jitsi-meet.nix
+  ./services/web-apps/keycloak.nix
   ./services/web-apps/limesurvey.nix
   ./services/web-apps/mattermost.nix
   ./services/web-apps/mediawiki.nix
diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix
new file mode 100644
index 000000000000..766df48d55fb
--- /dev/null
+++ b/nixos/modules/services/web-apps/keycloak.nix
@@ -0,0 +1,465 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.services.keycloak;
+in
+{
+  options.services.keycloak = {
+
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = ''
+        Whether to enable the Keycloak identity and access management
+        server.
+      '';
+    };
+
+    bindAddress = lib.mkOption {
+      type = lib.types.str;
+      default = "\${jboss.bind.address:0.0.0.0}";
+      example = "127.0.0.1";
+      description = ''
+        On which address Keycloak should accept new connections.
+
+        A special syntax can be used to allow command line Java system
+        properties to override the value: ''${property.name:value}
+      '';
+    };
+
+    httpPort = lib.mkOption {
+      type = lib.types.str;
+      default = "\${jboss.http.port:80}";
+      example = "8080";
+      description = ''
+        On which port Keycloak should listen for new HTTP connections.
+
+        A special syntax can be used to allow command line Java system
+        properties to override the value: ''${property.name:value}
+      '';
+    };
+
+    httpsPort = lib.mkOption {
+      type = lib.types.str;
+      default = "\${jboss.https.port:443}";
+      example = "8443";
+      description = ''
+        On which port Keycloak should listen for new HTTPS connections.
+
+        A special syntax can be used to allow command line Java system
+        properties to override the value: ''${property.name:value}
+      '';
+    };
+
+    frontendUrl = lib.mkOption {
+      type = lib.types.str;
+      example = "keycloak.example.com/auth";
+      description = ''
+        The public URL used as base for all frontend requests. Should
+        normally include a trailing <literal>/auth</literal>.
+
+        See <link xlink:href="https://www.keycloak.org/docs/latest/server_installation/#_hostname">the
+        Hostname section of the Keycloak server installation
+        manual</link> for more information.
+      '';
+    };
+
+    forceBackendUrlToFrontendUrl = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = ''
+        Whether Keycloak should force all requests to go through the
+        frontend URL configured in <xref
+        linkend="opt-services.keycloak.frontendUrl" />. By default,
+        Keycloak allows backend requests to instead use its local
+        hostname or IP address and may also advertise it to clients
+        through its OpenID Connect Discovery endpoint.
+
+        See <link
+        xlink:href="https://www.keycloak.org/docs/latest/server_installation/#_hostname">the
+        Hostname section of the Keycloak server installation
+        manual</link> for more information.
+      '';
+    };
+
+    certificatePrivateKeyBundle = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      default = null;
+      example = "/run/keys/ssl_cert";
+      description = ''
+        The path to a PEM formatted bundle of the private key and
+        certificate to use for TLS connections.
+
+        This should be a string, not a Nix path, since Nix paths are
+        copied into the world-readable Nix store.
+      '';
+    };
+
+    databaseHost = lib.mkOption {
+      type = lib.types.str;
+      default = "localhost";
+      description = ''
+        Hostname of the PostgreSQL database to connect to.
+      '';
+    };
+
+    databaseCreateLocally = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = ''
+        Whether a database should be automatically created on the
+        local host. Set this to false if you plan on provisioning a
+        local database yourself. This has no effect if
+        services.keycloak.databaseHost is customized.
+      '';
+    };
+
+    databaseUsername = lib.mkOption {
+      type = lib.types.str;
+      default = "keycloak";
+      description = ''
+        Username to use when connecting to an external or manually
+        provisioned database; has no effect when a local database is
+        automatically provisioned.
+      '';
+    };
+
+    databasePasswordFile = lib.mkOption {
+      type = lib.types.path;
+      example = "/run/keys/db_password";
+      description = ''
+        File containing the database password.
+
+        This should be a string, not a Nix path, since Nix paths are
+        copied into the world-readable Nix store.
+      '';
+    };
+
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.keycloak;
+      description = ''
+        Keycloak package to use.
+      '';
+    };
+
+    initialAdminPassword = lib.mkOption {
+      type = lib.types.str;
+      default = "changeme";
+      description = ''
+        Initial password set for the <literal>admin</literal>
+        user. The password is not stored safely and should be changed
+        immediately in the admin panel.
+      '';
+    };
+
+    extraConfig = lib.mkOption {
+      type = lib.types.attrs;
+      default = { };
+      example = lib.literalExample ''
+        {
+          "subsystem=keycloak-server" = {
+            "spi=hostname" = {
+              "provider=default" = null;
+              "provider=fixed" = {
+                enabled = true;
+                properties.hostname = "keycloak.example.com";
+              };
+              default-provider = "fixed";
+            };
+          };
+        }
+      '';
+      description = ''
+        Additional Keycloak configuration options to set in
+        <literal>standalone.xml</literal>.
+
+        Options are expressed as a Nix attribute set which matches the
+        structure of the jboss-cli configuration. The configuration is
+        effectively overlayed on top of the default configuration
+        shipped with Keycloak. To remove existing nodes and undefine
+        attributes from the default configuration, set them to
+        <literal>null</literal>.
+
+        The example configuration does the equivalent of the following
+        script, which removes the hostname provider
+        <literal>default</literal>, adds the deprecated hostname
+        provider <literal>fixed</literal> and defines it the default:
+
+        <programlisting>
+        /subsystem=keycloak-server/spi=hostname/provider=default:remove()
+        /subsystem=keycloak-server/spi=hostname/provider=fixed:add(enabled = true, properties = { hostname = "keycloak.example.com" })
+        /subsystem=keycloak-server/spi=hostname:write-attribute(name=default-provider, value="fixed")
+        </programlisting>
+
+        You can discover available options by using the <link
+        xlink:href="http://docs.wildfly.org/21/Admin_Guide.html#Command_Line_Interface">jboss-cli.sh</link>
+        program and by referring to the <link
+        xlink:href="https://www.keycloak.org/docs/latest/server_installation/index.html">Keycloak
+        Server Installation and Configuration Guide</link>.
+      '';
+    };
+
+  };
+
+  config =
+    let
+      # We only want to create a database if we're actually going to connect to it.
+      databaseActuallyCreateLocally = cfg.databaseCreateLocally && cfg.databaseHost == "localhost";
+
+      keycloakConfig' = builtins.foldl' lib.recursiveUpdate {
+        "interface=public".inet-address = cfg.bindAddress;
+        "socket-binding-group=standard-sockets"."socket-binding=http".port = cfg.httpPort;
+        "subsystem=keycloak-server"."spi=hostname" = {
+          "provider=default" = {
+            enabled = true;
+            properties = {
+              inherit (cfg) frontendUrl forceBackendUrlToFrontendUrl;
+            };
+          };
+        };
+        "subsystem=datasources"."jdbc-driver=postgresql" = {
+          driver-module-name = "org.postgresql";
+          driver-name = "postgresql";
+          driver-xa-datasource-class-name = "org.postgresql.xa.PGXADataSource";
+        };
+        "subsystem=datasources"."data-source=KeycloakDS" = {
+          connection-url = "jdbc:postgresql://${cfg.databaseHost}/keycloak";
+          driver-name = "postgresql";
+          max-pool-size = "20";
+          user-name = if databaseActuallyCreateLocally then "keycloak" else cfg.databaseUsername;
+          password = "@db-password@";
+        };
+      } [
+        (lib.optionalAttrs (cfg.certificatePrivateKeyBundle != null) {
+          "socket-binding-group=standard-sockets"."socket-binding=https".port = cfg.httpsPort;
+          "core-service=management"."security-realm=UndertowRealm"."server-identity=ssl" = {
+            keystore-path = "/run/keycloak/ssl/certificate_private_key_bundle.p12";
+            keystore-password = "notsosecretpassword";
+          };
+          "subsystem=undertow"."server=default-server"."https-listener=https".security-realm = "UndertowRealm";
+        })
+        cfg.extraConfig
+      ];
+
+      mkJbossScript = attrs:
+        let
+          writeAttributes = path: set:
+            let
+              prefixExpression = string:
+                let
+                  match = (builtins.match ''"\$\{.*}"'' string);
+                in
+                  if match != null then
+                    "expression " + string
+                  else
+                    string;
+
+              writeAttribute = attribute: value:
+                let
+                  type = builtins.typeOf value;
+                in
+                  if type == "set" then
+                    let
+                      names = builtins.attrNames value;
+                    in
+                      builtins.foldl' (text: name: text + (writeAttribute "${attribute}.${name}" value.${name})) "" names
+                  else if value == null then ''
+                    if (outcome == success) of ${path}:read-attribute(name="${attribute}")
+                        ${path}:undefine-attribute(name="${attribute}")
+                    end-if
+                  ''
+                  else if builtins.elem type [ "string" "path" "bool" ] then
+                    let
+                      value' = if type == "bool" then lib.boolToString value else ''"${value}"'';
+                    in ''
+                      if (result != ${prefixExpression value'}) of ${path}:read-attribute(name="${attribute}")
+                        ${path}:write-attribute(name=${attribute}, value=${value'})
+                      end-if
+                    ''
+                  else throw "Unsupported type '${type}' for path '${path}'!";
+            in
+              lib.concatStrings
+                (lib.mapAttrsToList
+                  (attribute: value: (writeAttribute attribute value))
+                  set);
+
+          makeArgList = set:
+            let
+              makeArg = attribute: value:
+                let
+                  type = builtins.typeOf value;
+                in
+                  if type == "set" then
+                    "${attribute} = { " + (makeArgList value) + " }"
+                  else if builtins.elem type [ "string" "path" "bool" ] then
+                    "${attribute} = ${if type == "bool" then lib.boolToString value else ''"${value}"''}"
+                  else if value == null then
+                    ""
+                  else
+                    throw "Unsupported type '${type}' for attribute '${attribute}'!";
+            in
+              lib.concatStringsSep ", " (lib.mapAttrsToList makeArg set);
+
+          recurse = state: node:
+            let
+              path = state.path ++ (lib.optional (node != null) node);
+              isPath = name:
+                let
+                  value = lib.getAttrFromPath (path ++ [ name ]) attrs;
+                in
+                  if (builtins.match ".*([=]).*" name) == [ "=" ] then
+                    if builtins.isAttrs value || value == null then
+                      true
+                    else
+                      throw "Parsing path '${lib.concatStringsSep "." (path ++ [ name ])}' failed: JBoss attributes cannot contain '='!"
+                  else
+                    false;
+              jbossPath = "/" + (lib.concatStringsSep "/" path);
+              nodeValue = lib.getAttrFromPath path attrs;
+              children = if !builtins.isAttrs nodeValue then {} else nodeValue;
+              subPaths = builtins.filter isPath (builtins.attrNames children);
+              jbossAttrs = lib.filterAttrs (name: _: !(isPath name)) children;
+            in
+              state // {
+                text = state.text + (
+                  if nodeValue != null then ''
+                    if (outcome != success) of ${jbossPath}:read-resource()
+                        ${jbossPath}:add(${makeArgList jbossAttrs})
+                    end-if
+                  '' + (writeAttributes jbossPath jbossAttrs)
+                  else ''
+                    if (outcome == success) of ${jbossPath}:read-resource()
+                        ${jbossPath}:remove()
+                    end-if
+                  '') + (builtins.foldl' recurse { text = ""; inherit path; } subPaths).text;
+              };
+        in
+          (recurse { text = ""; path = []; } null).text;
+
+
+      jbossCliScript = pkgs.writeText "jboss-cli-script" (mkJbossScript keycloakConfig');
+
+      keycloakConfig = pkgs.runCommand "keycloak-config" {} ''
+        export JBOSS_BASE_DIR="$(pwd -P)";
+        export JBOSS_MODULEPATH="${cfg.package}/modules";
+        export JBOSS_LOG_DIR="$JBOSS_BASE_DIR/log";
+
+        cp -r ${cfg.package}/standalone/configuration .
+        chmod -R u+rwX ./configuration
+
+        mkdir -p {deployments,ssl}
+
+        "${cfg.package}/bin/standalone.sh"&
+
+        attempt=1
+        max_attempts=30
+        while ! ${cfg.package}/bin/jboss-cli.sh --connect ':read-attribute(name=server-state)'; do
+            if [[ "$attempt" == "$max_attempts" ]]; then
+                echo "ERROR: Could not connect to Keycloak after $attempt attempts! Failing.." >&2
+                exit 1
+            fi
+            echo "Keycloak not fully started yet, retrying.. ($attempt/$max_attempts)"
+            sleep 1
+            (( attempt++ ))
+        done
+
+        ${cfg.package}/bin/jboss-cli.sh --connect --file=${jbossCliScript} --echo-command
+
+        cp configuration/standalone.xml $out
+      '';
+    in
+      lib.mkIf cfg.enable {
+
+        environment.systemPackages = [ cfg.package ];
+
+        systemd.services.keycloakDatabaseInit = lib.mkIf databaseActuallyCreateLocally {
+          after = [ "postgresql.service" ];
+          before = [ "keycloak.service" ];
+          bindsTo = [ "postgresql.service" ];
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+            User = "postgres";
+            Group = "postgres";
+          };
+          script = ''
+            set -eu
+
+            PSQL=${config.services.postgresql.package}/bin/psql
+
+            db_password="$(<'${cfg.databasePasswordFile}')"
+            $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || $PSQL -tAc "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB"
+            $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"'
+          '';
+        };
+
+        systemd.services.keycloak = {
+          after = lib.optionals databaseActuallyCreateLocally [
+            "keycloakDatabaseInit.service" "postgresql.service"
+          ];
+          bindsTo = lib.optionals databaseActuallyCreateLocally [
+            "keycloakDatabaseInit.service" "postgresql.service"
+          ];
+          wantedBy = [ "multi-user.target" ];
+          environment = {
+            JBOSS_LOG_DIR = "/var/log/keycloak";
+            JBOSS_BASE_DIR = "/run/keycloak";
+            JBOSS_MODULEPATH = "${cfg.package}/modules";
+          };
+          serviceConfig = {
+            ExecStartPre = let
+              startPreFullPrivileges = ''
+                set -eu
+
+                install -T -m 0400 -o keycloak -g keycloak '${cfg.databasePasswordFile}' /run/keycloak/secrets/db_password
+              '' + lib.optionalString (cfg.certificatePrivateKeyBundle != null) ''
+                install -T -m 0400 -o keycloak -g keycloak '${cfg.certificatePrivateKeyBundle}' /run/keycloak/secrets/ssl_cert_pk_bundle
+              '';
+              startPre = ''
+                set -eu
+
+                install -m 0600 ${cfg.package}/standalone/configuration/*.properties /run/keycloak/configuration
+                install -T -m 0600 ${keycloakConfig} /run/keycloak/configuration/standalone.xml
+
+                db_password="$(</run/keycloak/secrets/db_password)"
+                ${pkgs.replace}/bin/replace-literal -fe '@db-password@' "$db_password" /run/keycloak/configuration/standalone.xml
+
+                export JAVA_OPTS=-Djboss.server.config.user.dir=/run/keycloak/configuration
+                ${cfg.package}/bin/add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}'
+              '' + lib.optionalString (cfg.certificatePrivateKeyBundle != null) ''
+                pushd /run/keycloak/ssl/
+                cat /run/keycloak/secrets/ssl_cert_pk_bundle <(echo) /etc/ssl/certs/ca-certificates.crt > allcerts.pem
+                ${pkgs.openssl}/bin/openssl pkcs12 -export -in /run/keycloak/secrets/ssl_cert_pk_bundle -chain \
+                                                   -name "${cfg.frontendUrl}" -out certificate_private_key_bundle.p12 \
+                                                   -CAfile allcerts.pem -passout pass:notsosecretpassword
+                popd
+              '';
+            in [
+              "+${pkgs.writeShellScript "keycloak-start-pre-full-privileges" startPreFullPrivileges}"
+              "${pkgs.writeShellScript "keycloak-start-pre" startPre}"
+            ];
+            ExecStart = "${cfg.package}/bin/standalone.sh";
+            User = "keycloak";
+            Group = "keycloak";
+            DynamicUser = true;
+            RuntimeDirectory = map (p: "keycloak/" + p) [
+              "secrets"
+              "configuration"
+              "deployments"
+              "data"
+              "ssl"
+              "log"
+              "tmp"
+            ];
+            RuntimeDirectoryMode = 0700;
+            LogsDirectory = "keycloak";
+            AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+          };
+        };
+
+        services.postgresql.enable = lib.mkDefault databaseActuallyCreateLocally;
+      };
+}
diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
index 614eb2a46798..c694b6a419f5 100644
--- a/pkgs/servers/keycloak/default.nix
+++ b/pkgs/servers/keycloak/default.nix
@@ -1,5 +1,21 @@
-{ stdenv, fetchzip, makeWrapper, jre }:
+{ stdenv, fetchzip, makeWrapper, jre, writeText
+, postgresql_jdbc ? null
+}:
 
+let
+  mkModuleXml = name: jarFile: writeText "module.xml" ''
+    <?xml version="1.0" ?>
+    <module xmlns="urn:jboss:module:1.3" name="org.${name}">
+        <resources>
+            <resource-root path="${jarFile}"/>
+        </resources>
+        <dependencies>
+            <module name="javax.api"/>
+            <module name="javax.transaction.api"/>
+        </dependencies>
+    </module>
+  '';
+in
 stdenv.mkDerivation rec {
   pname   = "keycloak";
   version = "11.0.2";
@@ -16,12 +32,22 @@ stdenv.mkDerivation rec {
     cp -r * $out
 
     rm -rf $out/bin/*.{ps1,bat}
-    rm -rf $out/bin/add-user-keycloak.sh
-    rm -rf $out/bin/jconsole.sh
 
-    chmod +x $out/bin/standalone.sh
-    wrapProgram $out/bin/standalone.sh \
-      --prefix PATH ":" ${jre}/bin ;
+    module_path=$out/modules/system/layers/keycloak/org
+    if ! [[ -d $module_path ]]; then
+        echo "The module path $module_path not found!"
+        exit 1
+    fi
+
+    ${if postgresql_jdbc != null then ''
+      mkdir -p $module_path/postgresql/main
+      ln -s ${postgresql_jdbc}/share/java/postgresql-jdbc.jar $module_path/postgresql/main
+      ln -s ${mkModuleXml "postgresql" "postgresql-jdbc.jar"} $module_path/postgresql/main/module.xml
+    '' else ""}
+
+    wrapProgram $out/bin/standalone.sh --set JAVA_HOME ${jre}
+    wrapProgram $out/bin/add-user-keycloak.sh --set JAVA_HOME ${jre}
+    wrapProgram $out/bin/jboss-cli.sh --set JAVA_HOME ${jre}
   '';
 
   meta = with stdenv.lib; {
@@ -29,7 +55,7 @@ stdenv.mkDerivation rec {
     description = "Identity and access management for modern applications and services";
     license     = licenses.asl20;
     platforms   = jre.meta.platforms;
-    maintainers = [ maintainers.ngerstle ];
+    maintainers = with maintainers; [ ngerstle talyz ];
   };
 
 }

From 3f92a7e12380f9373e382c5c383905bae407bdca Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Tue, 27 Oct 2020 14:49:47 -0400
Subject: [PATCH 0511/3942] groff: fix PDF manpage building with -Tpdf/gropdf

These files are pure data, just fonts; they shouldn't have been moved
to the "perl" output, because the Perl programs (namely, gropdf) use
them from the main "out" output.

These files don't contain any references to more dependencies (Perl or
otherwise), so they don't bloat the closure. And the files themselves
are small; 276K total as of this commit.
---
 pkgs/tools/text/groff/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 8c98a4aba465..20052f6c4cef 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -82,10 +82,6 @@ stdenv.mkDerivation rec {
     moveToOutput bin/afmtodit $perl
     moveToOutput bin/gperl $perl
     moveToOutput bin/chem $perl
-    moveToOutput share/groff/${version}/font/devpdf $perl
-
-    # idk if this is needed, but Fedora does it
-    moveToOutput share/groff/${version}/tmac/pdf.tmac $perl
 
     moveToOutput bin/gpinyin $perl
     moveToOutput lib/groff/gpinyin $perl

From 91b55655edf763da49e90a837a14ef8fee7b6812 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Tue, 27 Oct 2020 20:05:34 +0100
Subject: [PATCH 0512/3942] nginxMainline: 1.19.3 -> 1.19.4

---
 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 934506c45ca9..7b7de1a00f4a 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.19.3";
-  sha256 = "1w4dkq7bl5gyix3x0ap3d9lndh7zyvc3mscl693d4ybql57vgrci";
+  version = "1.19.4";
+  sha256 = "03h0hhrbfy3asla9gki2cp97zjn7idxbp5lk9xi0snlh4xlm9pv1";
 }

From aa86d488cf8343f5efd53897bad2c69829aa3b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Sat, 24 Oct 2020 14:10:36 +0200
Subject: [PATCH 0513/3942] python3Packages.lyricwikia: init at 0.1.11

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

diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix
new file mode 100644
index 000000000000..35c4b8439b62
--- /dev/null
+++ b/pkgs/development/python-modules/lyricwikia/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }:
+buildPythonPackage rec {
+  pname = "lyricwikia";
+  version = "0.1.11";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0l5lkvr3299x79i7skdiggp67rzgax3s00psd1zqkxfysq27jvc8";
+  };
+  buildInputs = [ pytestrunner ];
+  propagatedBuildInputs = [ six beautifulsoup4 requests ];
+  # upstream has no code tests
+  doCheck = false;
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/enricobacis/lyricwikia";
+    maintainers = [ maintainers.kmein ];
+    description = "LyricWikia API for song lyrics";
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4928fdd7c16e..7a4060728320 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3516,6 +3516,8 @@ in {
 
   lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; };
 
+  lyricwikia = callPackage ../development/python-modules/lyricwikia { };
+
   lz4 = self.python-lz4; # alias 2018-12-05
 
   lzstring = callPackage ../development/python-modules/lzstring { };

From 8d830311ecd536e0c0b60bb39b4dc4b669ad8993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Sat, 24 Oct 2020 14:14:26 +0200
Subject: [PATCH 0514/3942] spotify-cli-linux: init at 1.6.0

---
 .../audio/spotify-cli-linux/default.nix       | 29 +++++++++++++++++++
 .../python-modules/lyricwikia/default.nix     |  3 ++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/audio/spotify-cli-linux/default.nix

diff --git a/pkgs/applications/audio/spotify-cli-linux/default.nix b/pkgs/applications/audio/spotify-cli-linux/default.nix
new file mode 100644
index 000000000000..da41fb6b64ed
--- /dev/null
+++ b/pkgs/applications/audio/spotify-cli-linux/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, python3Packages, dbus }:
+python3Packages.buildPythonApplication rec {
+  pname = "spotify-cli-linux";
+  version = "1.6.0";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "0slyc3jfrj3rwq8rv6p5aqkw487aw7a87kmf1fb6n4vnvcf08v7w";
+  };
+
+  preBuild = ''
+    substituteInPlace spotifycli/spotifycli.py \
+      --replace dbus-send ${dbus}/bin/dbus-send
+  '';
+
+  disabled = !python3Packages.isPy3k;
+  propagatedBuildInputs = with python3Packages; [ lyricwikia dbus-python ];
+
+  # upstream has no code tests, but uses its "tests" for linting and formatting checks
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = "https://pwittchen.github.io/spotify-cli-linux/";
+    maintainers = [ maintainers.kmein ];
+    description = "A command line interface to Spotify on Linux.";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix
index 35c4b8439b62..4e58c6a7d676 100644
--- a/pkgs/development/python-modules/lyricwikia/default.nix
+++ b/pkgs/development/python-modules/lyricwikia/default.nix
@@ -2,14 +2,17 @@
 buildPythonPackage rec {
   pname = "lyricwikia";
   version = "0.1.11";
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "0l5lkvr3299x79i7skdiggp67rzgax3s00psd1zqkxfysq27jvc8";
   };
+
   buildInputs = [ pytestrunner ];
   propagatedBuildInputs = [ six beautifulsoup4 requests ];
   # upstream has no code tests
   doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/enricobacis/lyricwikia";
     maintainers = [ maintainers.kmein ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26f04573ddef..1efb266f85b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21210,6 +21210,8 @@ in
 
   spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { };
 
+  spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { };
+
   spotifyd = callPackage ../applications/audio/spotifyd {
     withALSA = stdenv.isLinux;
     withPulseAudio = config.pulseaudio or stdenv.isLinux;

From 5475bdc4b1d29c7b42aa7fa77f0a7edbc90860ac Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Tue, 27 Oct 2020 00:08:39 +0800
Subject: [PATCH 0515/3942] sftpman: init at 1.1.3

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

diff --git a/pkgs/tools/filesystems/sftpman/default.nix b/pkgs/tools/filesystems/sftpman/default.nix
new file mode 100644
index 000000000000..e89012b76f63
--- /dev/null
+++ b/pkgs/tools/filesystems/sftpman/default.nix
@@ -0,0 +1,25 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "sftpman";
+  version = "1.1.3";
+
+  src = fetchFromGitHub {
+    owner = "spantaleev";
+    repo = pname;
+    rev = version;
+    sha256 = "04awwwfw51fi1q18xdysp54jyhr0rhb4kfyrgv0vhhrlpwwyhnqy";
+  };
+
+  checkPhase = ''
+    $out/bin/sftpman help
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/spantaleev/sftpman";
+    description = "Application that handles sshfs/sftp file systems mounting";
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ contrun ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e83fdf3eba0..4d3c74a8d89e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6947,6 +6947,8 @@ in
 
   sewer = callPackage ../tools/admin/sewer { };
 
+  sftpman = callPackage ../tools/filesystems/sftpman { };
+
   screenfetch = callPackage ../tools/misc/screenfetch { };
 
   sg3_utils = callPackage ../tools/system/sg3_utils { };

From 9b1a86f4d84b246c9a3862b49410c12aca92f1f3 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Wed, 7 Oct 2020 19:41:09 +0700
Subject: [PATCH 0516/3942] spasm-ng: init at unstable-2020-08-03

---
 .../compilers/spasm-ng/default.nix            | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/compilers/spasm-ng/default.nix

diff --git a/pkgs/development/compilers/spasm-ng/default.nix b/pkgs/development/compilers/spasm-ng/default.nix
new file mode 100644
index 000000000000..8eb0ddb59ef7
--- /dev/null
+++ b/pkgs/development/compilers/spasm-ng/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, gcc, gmp, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "spasm-ng";
+
+  version = "unstable-2020-08-03";
+
+  src = fetchFromGitHub {
+    owner = "alberthdev";
+    repo = "spasm-ng";
+    rev = "221898beff2442f459b80ab89c8e1035db97868e";
+    sha256 = "0xspxmp2fir604b4xsk4hi1gjv61rnq2ypppr7cj981jlhicmvjj";
+  };
+
+  nativeBuildInputs = [ gcc ];
+
+  buildInputs = [ gmp openssl zlib ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    install -Dm755 spasm -t $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage    = "https://github.com/alberthdev/spasm-ng";
+    description = "Z80 assembler with extra features to support development for TI calculators";
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ siraben ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b08c9fbfe0b3..e2ce4171526b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9789,6 +9789,8 @@ in
 
   souffle = callPackage ../development/compilers/souffle { };
 
+  spasm-ng = callPackage ../development/compilers/spasm-ng { };
+
   spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { };
 
   sqldeveloper = callPackage ../development/tools/database/sqldeveloper {

From 52366ba8cadb1d634494cabdc2e0bf9d6a55da4a Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Tue, 27 Oct 2020 15:54:11 +0700
Subject: [PATCH 0517/3942] snow: init at 20130616

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

diff --git a/pkgs/tools/security/snow/default.nix b/pkgs/tools/security/snow/default.nix
new file mode 100644
index 000000000000..db52d853b7a3
--- /dev/null
+++ b/pkgs/tools/security/snow/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "snow";
+  version = "20130616";
+
+  src = fetchurl {
+    url = "https://web.archive.org/web/20200304125913if_/http://darkside.com.au/snow/snow-${version}.tar.gz";
+    sha256 = "0r9q45y55z4i0askkxmxrx0jr1620ypd870vz0hx2a6n9skimdy0";
+  };
+
+  makeFlags = [ "CFLAGS=-O2" ];
+
+  installPhase = ''
+    install -Dm755 snow -t $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Conceal messages in ASCII text by appending whitespace to the end of lines";
+    homepage = "http://www.darkside.com.au/snow/";
+    license = licenses.apsl20;
+    maintainers = with maintainers; [ siraben ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f1cb87dcc5c..e855cd387eff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15487,6 +15487,8 @@ in
 
   snappy = callPackage ../development/libraries/snappy { };
 
+  snow = callPackage ../tools/security/snow { };
+
   soapyairspy = callPackage ../applications/radio/soapyairspy { };
 
   soapybladerf = callPackage ../applications/radio/soapybladerf { };

From 4e29151910288bf478248d793f77d18226bf3f6d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 28 Oct 2020 09:46:59 +0100
Subject: [PATCH 0518/3942] Revert "Merge pull request #101780 from
 glittershark/bump-openblas"

Hash is updated but not the version.

This reverts commit 8b98955451a7175e61b2a0aa2f289acbc98ad10a, reversing
changes made to 5e2fde0a4f31f34887966d43c72894a1807079c1.
---
 ...mised-aarch64-dgemm_beta-pending-fix.patch | 26 +++++++++++++++++++
 .../science/math/openblas/default.nix         |  8 +++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch

diff --git a/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch b/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
new file mode 100644
index 000000000000..1da1f3fb3190
--- /dev/null
+++ b/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
@@ -0,0 +1,26 @@
+From 6cb9aa7c69c20a677ca9fb1bc5fa1580e3236fbd Mon Sep 17 00:00:00 2001
+From: Tom Hall <tahall256@protonmail.ch>
+Date: Sat, 14 Mar 2020 11:55:45 +0000
+Subject: [PATCH] Disable optimised aarch64 dgemm_beta pending fix
+
+Identified as source of https://github.com/xianyi/OpenBLAS/issues/2496,
+but not yet fixed.
+---
+ kernel/arm64/KERNEL.ARMV8 | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/kernel/arm64/KERNEL.ARMV8 b/kernel/arm64/KERNEL.ARMV8
+index fe32d313..33d12f94 100644
+--- a/kernel/arm64/KERNEL.ARMV8
++++ b/kernel/arm64/KERNEL.ARMV8
+@@ -102,7 +102,6 @@ CDOTKERNEL     = zdot.S
+ ZDOTKERNEL     = zdot.S
+ DSDOTKERNEL    = dot.S
+ 
+-DGEMM_BETA     = dgemm_beta.S
+ SGEMM_BETA     = sgemm_beta.S
+ 
+ SGEMMKERNEL    =  sgemm_kernel_$(SGEMM_UNROLL_M)x$(SGEMM_UNROLL_N).S
+-- 
+2.24.1
+
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 5d6dbd4a65c1..b03e2b3a8ca8 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
     owner = "xianyi";
     repo = "OpenBLAS";
     rev = "v${version}";
-    sha256 = "0mk1kjkr96bvvcq2zigzjrs0cnhwsf6gfi0855mp9yifn8lvp20y";
+    sha256 = "174id98ga82bhz2v7sy9yj6pqy0h0088p3mkdikip69p9rh3d17b";
   };
 
   inherit blas64;
@@ -144,6 +144,12 @@ stdenv.mkDerivation rec {
     buildPackages.stdenv.cc
   ];
 
+  # Disable an optimisation which seems to cause issues, pending an
+  # upstream fix: https://github.com/xianyi/OpenBLAS/issues/2496
+  patches = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [
+    ./0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
+  ];
+
   makeFlags = mkMakeFlagsFromConfig (config // {
     FC = "${stdenv.cc.targetPrefix}gfortran";
     CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}";

From e1a59dddd0885b98bae3339beb7061b3898168b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 26 Oct 2020 00:28:20 +0000
Subject: [PATCH 0519/3942] openblas: 0.3.10 -> 0.3.12

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

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 5d6dbd4a65c1..d670a40f321d 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -106,7 +106,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openblas";
-  version = "0.3.10";
+  version = "0.3.12";
 
   outputs = [ "out" "dev" ];
 

From f715602febcd3fd4e0a551618511d8b5c22b5625 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 28 Oct 2020 10:00:54 +0100
Subject: [PATCH 0520/3942] Revert "openblas: 0.3.10 -> 0.3.12"

This reverts commit e1a59dddd0885b98bae3339beb7061b3898168b9. Testing
the PR succeeded for me as The previously half-done changes were already
reverted without me merging.
---
 pkgs/development/libraries/science/math/openblas/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 524ab6dfbf0c..b03e2b3a8ca8 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -106,7 +106,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openblas";
-  version = "0.3.12";
+  version = "0.3.10";
 
   outputs = [ "out" "dev" ];
 

From 4ac0258cd7ac445e35db3868e7a912cd4818d3c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 28 Oct 2020 11:58:55 +0100
Subject: [PATCH 0521/3942] python3Packages.pytorch: 1.6.0 -> 1.7.0

Changelog:

https://github.com/pytorch/pytorch/releases/tag/v1.7.0
---
 .../python-modules/pytorch/default.nix        | 46 +++++++++++--------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 4635f813c3a6..fc18c6e516c1 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -4,8 +4,18 @@
   openMPISupport ? false, openmpi ? null,
   buildDocs ? false,
   cudaArchList ? null,
-  numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, psutil,
-  linkFarm, symlinkJoin,
+
+  # Native build inputs
+  cmake, utillinux, linkFarm, symlinkJoin, which,
+
+  # Build inputs
+  numactl,
+
+  # Propagated build inputs
+  dataclasses, numpy, pyyaml, cffi, click, typing-extensions,
+
+  # Unit tests
+  hypothesis, psutil,
 
   # virtual pkg that consistently instantiates blas across nixpkgs
   # See https://github.com/NixOS/nixpkgs/pull/83888
@@ -17,7 +27,7 @@
   # dependencies for torch.utils.tensorboard
   pillow, six, future, tensorflow-tensorboard, protobuf,
 
-  utillinux, which, isPy3k }:
+  isPy3k, pythonOlder }:
 
 assert !openMPISupport || openmpi != null;
 
@@ -102,7 +112,7 @@ let
 in buildPythonPackage rec {
   pname = "pytorch";
   # Don't forget to update pytorch-bin to the same version.
-  version = "1.6.0";
+  version = "1.7.0";
 
   disabled = !isPy3k;
 
@@ -117,23 +127,10 @@ in buildPythonPackage rec {
     repo   = "pytorch";
     rev    = "v${version}";
     fetchSubmodules = true;
-    sha256 = "14hhjsi6fnpaw9m1a3bhvdinsks6fhss6bbcrfk6jgns64abqdaz";
+    sha256 = "0hb11m5kvs4nsi5bc9ijnv6k07593p9dw40rcn33s9vspinrcjd4";
   };
 
-  patches = lib.optionals stdenv.isAarch64 [
-    # GNU aarch64 assembler does not support 4s on neon mov:
-    # https://github.com/pytorch/pytorch/issues/33124
-    #
-    # Fix from:
-    # https://github.com/pytorch/pytorch/pull/40584
-    #
-    # This patch can be removed with the next major version (1.7.0).
-    (fetchpatch {
-      name = "qnnpack-neon-fix.patch";
-      url = "https://github.com/pytorch/pytorch/commit/7676682584d0caf9243bce74ea0a88711ec4a807.diff";
-      sha256 = "13spncaqlpsp8qk2850yly7xqwmhhfwznhmzkk8jgpslkbx75vgq";
-    })
-  ] ++ lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     # pthreadpool added support for Grand Central Dispatch in April
     # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO)
     # that is available starting with macOS 10.13. However, our current
@@ -142,6 +139,13 @@ in buildPythonPackage rec {
     ./pthreadpool-disable-gcd.diff
   ];
 
+  # The dataclasses module is included with Python >= 3.7. This should
+  # be fixed with the next PyTorch release.
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'dataclasses'" "'dataclasses; python_version < \"3.7\"'"
+  '';
+
   preConfigure = lib.optionalString cudaSupport ''
     export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}"
     export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
@@ -217,9 +221,11 @@ in buildPythonPackage rec {
     click
     numpy
     pyyaml
+    typing-extensions
     # the following are required for tensorboard support
     pillow six future tensorflow-tensorboard protobuf
-  ] ++ lib.optionals openMPISupport [ openmpi ];
+  ] ++ lib.optionals openMPISupport [ openmpi ]
+    ++ lib.optionals (pythonOlder "3.7") [ dataclasses ];
 
   checkInputs = [ hypothesis ninja psutil ];
 

From c46b2a31bbe6eaa9876540c2c0292241d34be732 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Thu, 15 Oct 2020 11:18:25 +0200
Subject: [PATCH 0522/3942] electron: remove extra output from print-hashes
 script

to make it more usable for automated update
---
 pkgs/development/tools/electron/print-hashes.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/electron/print-hashes.sh b/pkgs/development/tools/electron/print-hashes.sh
index 45656a8f7b2b..de380fd52233 100755
--- a/pkgs/development/tools/electron/print-hashes.sh
+++ b/pkgs/development/tools/electron/print-hashes.sh
@@ -21,8 +21,8 @@ SYSTEMS=(
 
 hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null | tail -n1)"
 
-echo "Entry similar to the following goes in default.nix:"
-echo
+# Entry similar to the following goes in default.nix:
+
 echo "  electron_${VERSION%%.*} = mkElectron \"${VERSION}\" {"
 
 for S in "${!SYSTEMS[@]}"; do

From c0743013169ac4fcf0c69ca711009b5b370f4fe8 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 2 Oct 2020 22:30:13 +0200
Subject: [PATCH 0523/3942] electron: 8.5.1 -> 8.5.2

---
 pkgs/development/tools/electron/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index c9df28e5cded..f3a066a87ad1 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -47,12 +47,12 @@ rec {
     aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066";
   };
 
-  electron_8 = mkElectron "8.5.1" {
-    x86_64-linux = "e58bf26ba52e43de77115b6e6844eba8a8cec2ac8aae500cf48fe862014202d9";
-    x86_64-darwin = "cf0d42ecde7ca374ddf1b440aaaf441e16a02890112fcbffc03f37f8ec3b1958";
-    i686-linux = "4c7ff6225b1ac4b710c454072d9fb8c04a66bb0353e7d6cffb89bcf6d4458d81";
-    armv7l-linux = "13afd8b2e36eb8d1582687e16fac5394d6d3b9734d73f94d0d6ef843ba14cec2";
-    aarch64-linux = "ff39e5e0e644cbf4ff1d29fc25e94b9eced7ea45d787d1b86fa4e50513336b7b";
+  electron_8 = mkElectron "8.5.2" {
+    x86_64-linux = "c5b8c95b410436066b06165e9759b31336c907268339433db4f8610ccf644a51";
+    x86_64-darwin = "079d951a28cfb7d1e0d3660e0fcb2dab85bd9e9f6848df5a06a7ac88ab3aa14c";
+    i686-linux = "0d108ac2420a437100f7a8d06aa019cd8138da4372fb94039b6d23c6253a6aea";
+    armv7l-linux = "f06ed475d1b206c3aa31e768add3517a64aabce5e2946e4d9707e615e6f398c0";
+    aarch64-linux = "e9765584bbedad8a806f96ac1381c114a357fdbed8c67573decefde2d15d9cd7";
   };
 
   electron_9 = mkElectron "9.3.0" {

From 2d3059624b1277898dd1a29afebc1381cb843bd5 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 2 Oct 2020 22:30:39 +0200
Subject: [PATCH 0524/3942] electron: 9.3.0 -> 9.3.3

---
 pkgs/development/tools/electron/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index f3a066a87ad1..373138902b42 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -55,12 +55,12 @@ rec {
     aarch64-linux = "e9765584bbedad8a806f96ac1381c114a357fdbed8c67573decefde2d15d9cd7";
   };
 
-  electron_9 = mkElectron "9.3.0" {
-    x86_64-linux = "0c34fa1dbf7708bd4a3f08fde50eafb9903b1c467104dca3e3ced5e7f764b302";
-    x86_64-darwin = "25057470c2f3a1c40fa1c25086256041fa70419378fa3d41eeb805ebd3919b20";
-    i686-linux = "ea09d10e496450d2d7bb7a37cab7124cc5484117dd7d7d6c4106586ff675d1d5";
-    armv7l-linux = "a8b46d6c98546d605a02850c906408dc11104e8ee4366c3d8a956896fafdfcd3";
-    aarch64-linux = "791d898d02e45975657ed15f2d83af31d5688e7db0075a6e20021db3420eb320";
+  electron_9 = mkElectron "9.3.3" {
+    x86_64-linux = "17f4db5e040ea20ce89d1d492ac575ed0b9ba451ef9cb0e8cd50918505c85243";
+    x86_64-darwin = "bb6188178ed1250ddaf29a2f232758c0f7878f1541ddb2ae2a0d20298599c7f4";
+    i686-linux = "e413b0879247b32bfbcc114e8d49109267137b2ece97db13eaf0ce3ac6187881";
+    armv7l-linux = "313abeb91efbc29d4f807a01937640580940a5fb2699c70b1c303b184ac7bec4";
+    aarch64-linux = "263eb89ccb47920baef43898d373531d369d2adc8b2f9e5ebc6429fe44b2fd5a";
   };
 
   electron_10 = mkElectron "10.1.1" {

From 0743d1591fee55aee74d98b1395b17e102dc98bc Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 2 Oct 2020 22:31:15 +0200
Subject: [PATCH 0525/3942] electron: 10.1.1 -> 10.1.5

---
 pkgs/development/tools/electron/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 373138902b42..1c024ee4e5b5 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -63,11 +63,11 @@ rec {
     aarch64-linux = "263eb89ccb47920baef43898d373531d369d2adc8b2f9e5ebc6429fe44b2fd5a";
   };
 
-  electron_10 = mkElectron "10.1.1" {
-    x86_64-linux = "4147e88bdbec6893bf9927f0d4f3dd090d26705f5b7f688223bc65253a8b0220";
-    x86_64-darwin = "5b6814ae1064cc337efcdb2ad01ab9daa003a6a1d6e05d79288ede0a3665b991";
-    i686-linux = "d29682b7ea44dcdca5e7265bd1e28046275295a9ac23982af3d216a7f47a7a57";
-    armv7l-linux = "341a2eacb0381c1f409b8e28cf2c0fe6f75a61410614baf80309f51dd4201a34";
-    aarch64-linux = "d5e5b069f3173ed89f4cca7e9723f28a5f7a720637b7addac02972c5db042b6c";
+  electron_10 = mkElectron "10.1.5" {
+    x86_64-linux = "9db65dfe26d4fa9524b3005c6002d858ab256722cefb6a058de8e72e2d5c4083";
+    x86_64-darwin = "30dc5d5a913c38c6ae7fa6913b1a907545f0230157efc066e2d5a7affd26cd1e";
+    i686-linux = "bf8e1731e8b9b972c9054964b219d9b1b6baae9612afc8a5edf3503b815dd8c3";
+    armv7l-linux = "e270eab1a87283d7ae25c8127d904a52f130d53cc399bd288af7f99563273f33";
+    aarch64-linux = "03fa2418472f762377149fdd45d1e6ff0a324be3eb1b04e58c63d41df3dd0f16";
   };
 }

From 801104bdc5f746dc2a26f54a4e019c5c50d31430 Mon Sep 17 00:00:00 2001
From: Maxime Guerreiro <maxime.guerreiro@gmail.com>
Date: Wed, 28 Oct 2020 15:20:41 +0100
Subject: [PATCH 0526/3942] nodePackages: Switch to 14.x

12.x is still maintained by Node, but 14.15.0 became the new LTS version of Node.js.
As per #89184, `nodejs` should point to the current LTS.

Bump the default `nodejs` version from 12 to 14.
---
 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 1a81c1fcf146..fbf6b1bd75ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5095,9 +5095,9 @@ in
 
   nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { };
 
-  nodejs = hiPrio nodejs-12_x;
+  nodejs = hiPrio nodejs-14_x;
 
-  nodejs-slim = nodejs-slim-12_x;
+  nodejs-slim = nodejs-slim-14_x;
 
 
   nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { };

From 3c122da4a5bd8916215af8e6d208725104706255 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Wed, 28 Oct 2020 10:14:18 -0400
Subject: [PATCH 0527/3942] gnomeExtensions.clipboard-indicator: 34 -> 37

clipboard-indicator has a new release. Most notably, this adds support
for GNOME 3.38 and drops support for 3.36 (note that while the extension
no longer lists 3.36 as a supported version, it does still work).

[Full changelog](https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator/compare/v34...v37)
---
 .../gnome-3/extensions/clipboard-indicator/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
index 3e6903c56423..dbeb08af224e 100644
--- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-clipboard-indicator";
-  version = "34";
+  version = "37";
 
   src = fetchFromGitHub {
     owner = "Tudmotu";
     repo = "gnome-shell-extension-clipboard-indicator";
     rev = "v${version}";
-    sha256 = "0i00psc1ky70zljd14jzr627y7nd8xwnwrh4xpajl1f6djabh12s";
+    sha256 = "0npxhaam2ra2b9zh2gk2q0n5snlhx6glz86m3jf8hz037w920k41";
   };
 
   uuid = "clipboard-indicator@tudmotu.com";

From 8eeaad9129e265d36c7879765865793e66eee9a0 Mon Sep 17 00:00:00 2001
From: Matthew Piziak <matthew.piziak@gmail.com>
Date: Wed, 28 Oct 2020 12:12:04 -0400
Subject: [PATCH 0528/3942] tdlib: 1.6.0 -> 1.6.9

fix hash

version 1.6.9 is not released, so use revision hash
---
 pkgs/development/libraries/tdlib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index 4bf49e297e33..06909c078609 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -1,14 +1,14 @@
 { fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.0";
+  version = "1.6.9";
   pname = "tdlib";
 
   src = fetchFromGitHub {
     owner = "tdlib";
     repo = "td";
-    rev = "v${version}";
-    sha256 = "0zlzpl6fgszg18kwycyyyrnkm255dvc6fkq0b0y32m5wvwwl36cv";
+    rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01";
+    sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n";
   };
 
   buildInputs = [ gperf openssl readline zlib ];

From 235bf5ad7dd5554b101d97c5f4ee1e62169d0170 Mon Sep 17 00:00:00 2001
From: IvarWithoutBones <ivar.scholten@protonmail.com>
Date: Wed, 28 Oct 2020 18:00:54 +0100
Subject: [PATCH 0529/3942] pythonPackages.tmdb3: disable on python3

---
 pkgs/development/python-modules/tmdb3/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tmdb3/default.nix b/pkgs/development/python-modules/tmdb3/default.nix
index 47247c6911d6..36a88ea22e49 100644
--- a/pkgs/development/python-modules/tmdb3/default.nix
+++ b/pkgs/development/python-modules/tmdb3/default.nix
@@ -1,8 +1,9 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "tmdb3";
   version = "0.7.2";
+  disabled = isPy3k; # Upstream has not received any updates since 2015, and importing from python3 does not work.
 
   src = fetchPypi {
     inherit pname version;
@@ -12,6 +13,8 @@ buildPythonPackage rec {
   # no tests implemented
   doCheck = false;
 
+  pythonImportsCheck = [ "tmdb3" ];
+
   meta = with lib; {
     description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";
     homepage = "https://pypi.python.org/pypi/tmdb3";

From 6f829d2cd92e800ed5f29e8d3f49321dd6b6deee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Str=C3=B6ger?= <florian@florianstroeger.com>
Date: Tue, 27 Oct 2020 21:05:16 +0100
Subject: [PATCH 0530/3942] maintainers: add preisschild

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c0b1ae06abe5..a11fb4f577f0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6889,6 +6889,12 @@
       fingerprint = "240B 57DE 4271 2480 7CE3  EAC8 4F74 D536 1C4C A31E";
     }];
   };
+  preisschild = {
+    email = "florian@florianstroeger.com";
+    github = "Preisschild";
+    githubId = 11898437;
+    name = "Florian Ströger";
+  };
   priegger = {
     email = "philipp@riegger.name";
     github = "priegger";

From 09edea6af9004da2ecb2a65c40faea4304450728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Str=C3=B6ger?= <florian@florianstroeger.com>
Date: Tue, 27 Oct 2020 19:56:13 +0100
Subject: [PATCH 0531/3942] jsonnet-bundler: init at 0.4.0

---
 .../tools/jsonnet-bundler/default.nix         | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/jsonnet-bundler/default.nix

diff --git a/pkgs/development/tools/jsonnet-bundler/default.nix b/pkgs/development/tools/jsonnet-bundler/default.nix
new file mode 100644
index 000000000000..4286a454ff02
--- /dev/null
+++ b/pkgs/development/tools/jsonnet-bundler/default.nix
@@ -0,0 +1,26 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+  pname = "jsonnet-bundler";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "jsonnet-bundler";
+    repo = "jsonnet-bundler";
+    rev = "v${version}";
+    sha256 = "0pk6nf8r0wy7lnsnzyjd3vgq4b2kb3zl0xxn01ahpaqgmwpzajlk";
+  };
+
+  vendorSha256 = null;
+
+  subPackages = [ "cmd/jb" ];
+
+  buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
+
+  meta = with lib; {
+    description = "A jsonnet package manager";
+    homepage = "https://github.com/jsonnet-bundler/jsonnet-bundler";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ preisschild ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a81c1fcf146..fe314664b353 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13221,6 +13221,8 @@ in
 
   jsonnet = callPackage ../development/compilers/jsonnet { };
 
+  jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { };
+
   go-jsonnet = callPackage ../development/compilers/go-jsonnet { };
 
   jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { };

From 11f9033305c6f88dcd1e24688159f0245bd36096 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
Date: Tue, 27 Oct 2020 22:28:41 +0100
Subject: [PATCH 0532/3942] python3.pkgs.pyosmium: 2.15.3 -> 3.0.1

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

diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix
index e63fd00bb57f..ffcd3569e0a3 100644
--- a/pkgs/development/python-modules/pyosmium/default.nix
+++ b/pkgs/development/python-modules/pyosmium/default.nix
@@ -1,16 +1,18 @@
 { lib, buildPythonPackage, fetchFromGitHub, cmake, python
 , libosmium, protozero, boost, expat, bzip2, zlib, pybind11
-, nose, shapely, mock, isPy3k }:
+, nose, shapely, pythonOlder, isPyPy }:
 
 buildPythonPackage rec {
   pname = "pyosmium";
-  version = "2.15.3";
+  version = "3.0.1";
+
+  disabled = pythonOlder "3.4" || isPyPy;
 
   src = fetchFromGitHub {
     owner = "osmcode";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1523ym9i4rnwi5kcp7n2lm67kxlhar8xlv91s394ixzwax9bgg7w";
+    sha256 = "06jngbmmmswhyi5q5bjph6gwss28d2azn5414zf0arik5bcvz128";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -18,7 +20,7 @@ buildPythonPackage rec {
 
   preBuild = "cd ..";
 
-  checkInputs = [ nose shapely ] ++ lib.optionals (!isPy3k) [ mock ];
+  checkInputs = [ nose shapely ];
 
   checkPhase = "(cd test && ${python.interpreter} run_tests.py)";
 

From 63caecee7d9a77ae9a645d269bca06981f7666bf Mon Sep 17 00:00:00 2001
From: Thomas Depierre <depierre.thomas@gmail.com>
Date: Wed, 14 Oct 2020 14:59:42 +0200
Subject: [PATCH 0533/3942] riak-cs: delete

---
 nixos/doc/manual/release-notes/rl-2103.xml    |  10 +
 nixos/modules/misc/ids.nix                    |   8 +-
 nixos/modules/module-list.nix                 |   2 -
 nixos/modules/services/databases/riak-cs.nix  | 202 ------------------
 .../modules/services/databases/stanchion.nix  | 194 -----------------
 pkgs/servers/nosql/riak-cs/2.1.1.nix          |  70 ------
 pkgs/servers/nosql/riak-cs/stanchion.nix      |  65 ------
 pkgs/top-level/aliases.nix                    |   2 +
 pkgs/top-level/all-packages.nix               |  10 -
 9 files changed, 16 insertions(+), 547 deletions(-)
 delete mode 100644 nixos/modules/services/databases/riak-cs.nix
 delete mode 100644 nixos/modules/services/databases/stanchion.nix
 delete mode 100644 pkgs/servers/nosql/riak-cs/2.1.1.nix
 delete mode 100644 pkgs/servers/nosql/riak-cs/stanchion.nix

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 374ea1cbd165..44c81cd673d8 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -109,6 +109,16 @@
       <literal>/var/lib/powerdns</literal> to <literal>/run/pdns</literal>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+    <package>riak-cs</package> package removed along with <varname>services.riak-cs</varname> module.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+    <package>stanchion</package> package removed along with <varname>services.stanchion</varname> module.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index cd21a1609c91..c24150bba705 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -290,8 +290,8 @@ in
       hound = 259;
       leaps = 260;
       ipfs  = 261;
-      stanchion = 262;
-      riak-cs = 263;
+      # stanchion = 262; # unused, removed 2020-10-14
+      # riak-cs = 263; # unused, removed 2020-10-14
       infinoted = 264;
       sickbeard = 265;
       headphones = 266;
@@ -593,8 +593,8 @@ in
       hound = 259;
       leaps = 260;
       ipfs = 261;
-      stanchion = 262;
-      riak-cs = 263;
+      # stanchion = 262; # unused, removed 2020-10-14
+      # riak-cs = 263; # unused, removed 2020-10-14
       infinoted = 264;
       sickbeard = 265;
       headphones = 266;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index aa3b71a61241..69954f04adee 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -296,8 +296,6 @@
   ./services/databases/postgresql.nix
   ./services/databases/redis.nix
   ./services/databases/riak.nix
-  ./services/databases/riak-cs.nix
-  ./services/databases/stanchion.nix
   ./services/databases/victoriametrics.nix
   ./services/databases/virtuoso.nix
   ./services/desktops/accountsservice.nix
diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixos/modules/services/databases/riak-cs.nix
deleted file mode 100644
index fa6ac8863318..000000000000
--- a/nixos/modules/services/databases/riak-cs.nix
+++ /dev/null
@@ -1,202 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.riak-cs;
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.riak-cs = {
-
-      enable = mkEnableOption "riak-cs";
-
-      package = mkOption {
-        type = types.package;
-        default = pkgs.riak-cs;
-        defaultText = "pkgs.riak-cs";
-        example = literalExample "pkgs.riak-cs";
-        description = ''
-          Riak package to use.
-        '';
-      };
-
-      nodeName = mkOption {
-        type = types.str;
-        default = "riak-cs@127.0.0.1";
-        description = ''
-          Name of the Erlang node.
-        '';
-      };
-
-      anonymousUserCreation = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Anonymous user creation.
-        '';
-      };
-
-      riakHost = mkOption {
-        type = types.str;
-        default = "127.0.0.1:8087";
-        description = ''
-          Name of riak hosting service.
-        '';
-      };
-
-      listener = mkOption {
-        type = types.str;
-        default = "127.0.0.1:8080";
-        description = ''
-          Name of Riak CS listening service.
-        '';
-      };
-
-      stanchionHost = mkOption {
-        type = types.str;
-        default = "127.0.0.1:8085";
-        description = ''
-          Name of stanchion hosting service.
-        '';
-      };
-
-      stanchionSsl = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Tell stanchion to use SSL.
-        '';
-      };
-
-      distributedCookie = mkOption {
-        type = types.str;
-        default = "riak";
-        description = ''
-          Cookie for distributed node communication.  All nodes in the
-          same cluster should use the same cookie or they will not be able to
-          communicate.
-        '';
-      };
-
-      dataDir = mkOption {
-        type = types.path;
-        default = "/var/db/riak-cs";
-        description = ''
-          Data directory for Riak CS.
-        '';
-      };
-
-      logDir = mkOption {
-        type = types.path;
-        default = "/var/log/riak-cs";
-        description = ''
-          Log directory for Riak CS.
-        '';
-      };
-
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Additional text to be appended to <filename>riak-cs.conf</filename>.
-        '';
-      };
-
-      extraAdvancedConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Additional text to be appended to <filename>advanced.config</filename>.
-        '';
-      };
-    };
-
-  };
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    environment.systemPackages = [ cfg.package ];
-    environment.etc."riak-cs/riak-cs.conf".text = ''
-      nodename = ${cfg.nodeName}
-      distributed_cookie = ${cfg.distributedCookie}
-
-      platform_log_dir = ${cfg.logDir}
-
-      riak_host = ${cfg.riakHost}
-      listener = ${cfg.listener}
-      stanchion_host = ${cfg.stanchionHost}
-
-      anonymous_user_creation = ${if cfg.anonymousUserCreation then "on" else "off"}
-
-      ${cfg.extraConfig}
-    '';
-
-    environment.etc."riak-cs/advanced.config".text = ''
-      ${cfg.extraAdvancedConfig}
-    '';
-
-    users.users.riak-cs = {
-      name = "riak-cs";
-      uid = config.ids.uids.riak-cs;
-      group = "riak";
-      description = "Riak CS server user";
-    };
-
-  systemd.services.riak-cs = {
-      description = "Riak CS Server";
-
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-
-      path = [
-        pkgs.utillinux # for `logger`
-        pkgs.bash
-      ];
-
-      environment.HOME = "${cfg.dataDir}";
-      environment.RIAK_CS_DATA_DIR = "${cfg.dataDir}";
-      environment.RIAK_CS_LOG_DIR = "${cfg.logDir}";
-      environment.RIAK_CS_ETC_DIR = "/etc/riak";
-
-      preStart = ''
-        if ! test -e ${cfg.logDir}; then
-          mkdir -m 0755 -p ${cfg.logDir}
-          chown -R riak-cs ${cfg.logDir}
-        fi
-
-        if ! test -e ${cfg.dataDir}; then
-          mkdir -m 0700 -p ${cfg.dataDir}
-          chown -R riak-cs ${cfg.dataDir}
-        fi
-      '';
-
-      serviceConfig = {
-        ExecStart = "${cfg.package}/bin/riak-cs console";
-        ExecStop = "${cfg.package}/bin/riak-cs stop";
-        StandardInput = "tty";
-        User = "riak-cs";
-        Group = "riak-cs";
-        PermissionsStartOnly = true;
-        # Give Riak a decent amount of time to clean up.
-        TimeoutStopSec = 120;
-        LimitNOFILE = 65536;
-      };
-
-      unitConfig.RequiresMountsFor = [
-        "${cfg.dataDir}"
-        "${cfg.logDir}"
-        "/etc/riak"
-      ];
-    };
-  };
-}
diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix
deleted file mode 100644
index 97e55bc70c47..000000000000
--- a/nixos/modules/services/databases/stanchion.nix
+++ /dev/null
@@ -1,194 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.stanchion;
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.stanchion = {
-
-      enable = mkEnableOption "stanchion";
-
-      package = mkOption {
-        type = types.package;
-        default = pkgs.stanchion;
-        defaultText = "pkgs.stanchion";
-        example = literalExample "pkgs.stanchion";
-        description = ''
-          Stanchion package to use.
-        '';
-      };
-
-      nodeName = mkOption {
-        type = types.str;
-        default = "stanchion@127.0.0.1";
-        description = ''
-          Name of the Erlang node.
-        '';
-      };
-
-      adminKey = mkOption {
-        type = types.str;
-        default = "";
-        description = ''
-          Name of admin user.
-        '';
-      };
-
-      adminSecret = mkOption {
-        type = types.str;
-        default = "";
-        description = ''
-          Name of admin secret
-        '';
-      };
-
-      riakHost = mkOption {
-        type = types.str;
-        default = "127.0.0.1:8087";
-        description = ''
-          Name of riak hosting service.
-        '';
-      };
-
-      listener = mkOption {
-        type = types.str;
-        default = "127.0.0.1:8085";
-        description = ''
-          Name of Riak CS listening service.
-        '';
-      };
-
-      stanchionHost = mkOption {
-        type = types.str;
-        default = "127.0.0.1:8085";
-        description = ''
-          Name of stanchion hosting service.
-        '';
-      };
-
-      distributedCookie = mkOption {
-        type = types.str;
-        default = "riak";
-        description = ''
-          Cookie for distributed node communication.  All nodes in the
-          same cluster should use the same cookie or they will not be able to
-          communicate.
-        '';
-      };
-
-      dataDir = mkOption {
-        type = types.path;
-        default = "/var/db/stanchion";
-        description = ''
-          Data directory for Stanchion.
-        '';
-      };
-
-      logDir = mkOption {
-        type = types.path;
-        default = "/var/log/stanchion";
-        description = ''
-          Log directory for Stanchion.
-        '';
-      };
-
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Additional text to be appended to <filename>stanchion.conf</filename>.
-        '';
-      };
-    };
-  };
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    environment.systemPackages = [ cfg.package ];
-
-    environment.etc."stanchion/advanced.config".text = ''
-      [{stanchion, []}].
-    '';
-
-    environment.etc."stanchion/stanchion.conf".text = ''
-      listener = ${cfg.listener}
-
-      riak_host = ${cfg.riakHost}
-
-      ${optionalString (cfg.adminKey == "") "#"} admin.key=${optionalString (cfg.adminKey != "") cfg.adminKey}
-      ${optionalString (cfg.adminSecret == "") "#"} admin.secret=${optionalString (cfg.adminSecret != "") cfg.adminSecret}
-
-      platform_bin_dir = ${pkgs.stanchion}/bin
-      platform_data_dir = ${cfg.dataDir}
-      platform_etc_dir = /etc/stanchion
-      platform_lib_dir = ${pkgs.stanchion}/lib
-      platform_log_dir = ${cfg.logDir}
-
-      nodename = ${cfg.nodeName}
-
-      distributed_cookie = ${cfg.distributedCookie}
-
-      ${cfg.extraConfig}
-    '';
-
-    users.users.stanchion = {
-      name = "stanchion";
-      uid = config.ids.uids.stanchion;
-      group = "stanchion";
-      description = "Stanchion server user";
-    };
-
-    users.groups.stanchion.gid = config.ids.gids.stanchion;
-
-    systemd.tmpfiles.rules = [
-      "d '${cfg.logDir}' - stanchion stanchion --"
-      "d '${cfg.dataDir}' 0700 stanchion stanchion --"
-    ];
-
-    systemd.services.stanchion = {
-      description = "Stanchion Server";
-
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-
-      path = [
-        pkgs.utillinux # for `logger`
-        pkgs.bash
-      ];
-
-      environment.HOME = "${cfg.dataDir}";
-      environment.STANCHION_DATA_DIR = "${cfg.dataDir}";
-      environment.STANCHION_LOG_DIR = "${cfg.logDir}";
-      environment.STANCHION_ETC_DIR = "/etc/stanchion";
-
-      serviceConfig = {
-        ExecStart = "${cfg.package}/bin/stanchion console";
-        ExecStop = "${cfg.package}/bin/stanchion stop";
-        StandardInput = "tty";
-        User = "stanchion";
-        Group = "stanchion";
-        # Give Stanchion a decent amount of time to clean up.
-        TimeoutStopSec = 120;
-        LimitNOFILE = 65536;
-      };
-
-      unitConfig.RequiresMountsFor = [
-        "${cfg.dataDir}"
-        "${cfg.logDir}"
-        "/etc/stanchion"
-      ];
-    };
-  };
-}
diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix
deleted file mode 100644
index 4ebcbafde5dc..000000000000
--- a/pkgs/servers/nosql/riak-cs/2.1.1.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam
-, Carbon ? null, Cocoa ? null }:
-
-stdenv.mkDerivation {
-  name = "riak_cs-2.1.1";
-
-  buildInputs = [
-    which unzip erlang git wget
-  ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]
-    ++ lib.optional stdenv.isLinux [ pam ];
-
-  src = fetchurl {
-    url = "https://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz";
-    sha256 = "115cac127aac6d759c1b429a52e0d18e491c0719a6530b1b88aa52c4efdbedd5";
-  };
-
-
-  postPatch = ''
-    sed -i deps/node_package/priv/base/env.sh \
-      -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak-cs}@' \
-      -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \
-      -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \
-      -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak-cs}@' \
-      -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@'
-
-    sed -i ./Makefile \
-      -e 's@rel: deps compile@rel: deps compile-src@'
-  '';
-
-  preBuild = ''
-    patchShebangs .
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-
-    make locked-deps
-    make rel
-
-    runHook postBuild
-  '';
-
-  doCheck = false;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir $out
-    mv rel/riak-cs/etc rel/riak-cs/riak-etc
-    mkdir -p rel/riak-cs/etc
-    mv rel/riak-cs/riak-etc rel/riak-cs/etc/riak-cs
-    mv rel/riak-cs/* $out
-
-    for prog in $out/bin/*; do
-      substituteInPlace $prog \
-        --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \
-                  ". $out/lib/env.sh"
-    done
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility";
-    platforms   = [ "x86_64-linux" "x86_64-darwin" ];
-    license     = licenses.asl20;
-    maintainers = with maintainers; [ mdaiter ];
-    knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ];
-  };
-}
diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix
deleted file mode 100644
index 5fe4ce45f84b..000000000000
--- a/pkgs/servers/nosql/riak-cs/stanchion.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam 
-, Carbon ? null, Cocoa ? null }:
-
-stdenv.mkDerivation {
-  name = "stanchion-2.1.1";
-
-  buildInputs = [
-    which unzip erlang git wget
-  ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]
-    ++ lib.optional stdenv.isLinux [ pam ];
-
-  src = fetchurl {
-    url = "https://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz";
-    sha256 = "1443arwgg7qvlx3msyg99qvvhck7qxphdjslcp494i60fhr2g8ja";
-  };
-
-
-  postPatch = ''
-    sed -i deps/node_package/priv/base/env.sh \
-      -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/stanchion}@' \
-      -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \
-      -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \
-      -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/stanchion}@' \
-      -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@'
-  '';
-
-  preBuild = ''
-    patchShebangs .
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-
-    make rel
-
-    runHook postBuild
-  '';
-
-  doCheck = false;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir $out
-    mv rel/stanchion/etc rel/stanchion/riak-etc
-    mkdir -p rel/stanchion/etc
-    mv rel/stanchion/riak-etc rel/stanchion/etc/stanchion
-    mv rel/stanchion/* $out
-
-    for prog in $out/bin/*; do
-      substituteInPlace $prog \
-        --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \
-                  ". $out/lib/env.sh"
-    done
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    maintainers = with maintainers; [ mdaiter ];
-    description = "Manager for Riak CS";
-    platforms   = [ "x86_64-linux" "x86_64-darwin" ];
-    license = licenses.asl20;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3538ac56ecfa..6c7b6e8ab8a6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -482,6 +482,7 @@ mapAliases ({
   gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
   qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
   rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
+  riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
   rkt = throw "rkt was archived by upstream"; # added 2020-05-16
   ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby";
   ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby";
@@ -572,6 +573,7 @@ mapAliases ({
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   squid4 = squid;  # added 2019-08-22
   sshfsFuse = sshfs-fuse; # added 2016-09
+  stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14
   surf-webkit2 = surf; # added 2017-04-02
   sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream";
   swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a81c1fcf146..2d953ffc9ec1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16915,16 +16915,6 @@ in
     erlang = erlang_basho_R16B02;
   };
 
-  riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    erlang = erlang_basho_R16B02;
-  };
-
-  stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    erlang = erlang_basho_R16B02;
-  };
-
   influxdb = callPackage ../servers/nosql/influxdb { };
 
   mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {

From bf713800d0a86e8664cd8e491a5561fddf2a6bf1 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Wed, 28 Oct 2020 21:09:11 +0100
Subject: [PATCH 0534/3942] fedora-coreos-config-transpiler: 0.6.0 -> 0.7.0

---
 .../tools/fedora-coreos-config-transpiler/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix
index 7ff7af7d18e7..0d9bad0e41fa 100644
--- a/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix
+++ b/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 buildGoModule rec {
   pname = "fcct";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "coreos";
     repo = "fcct";
     rev = "v${version}";
-    sha256 = "18hmnip1s0smp58q500p8dfbrmi4i3nsyq22ri5cs53wbvz3ih1l";
+    sha256 = "1ffjn0l38szpkgd11mfaiynf9n8ljndv122l8amwiwp5mrh3hsl6";
   };
 
   vendorSha256 = null;

From 5a6acc6a7fc89ef0f7d92751d3da71a195d5bc3f Mon Sep 17 00:00:00 2001
From: Matthew Piziak <matthew.piziak@gmail.com>
Date: Wed, 28 Oct 2020 17:38:40 -0400
Subject: [PATCH 0535/3942] tdlib: 1.6.0 -> 1.6.9

fix hash

version 1.6.9 is not released, so use revision hash

add a comment to the rev about why we are not using `v${version}` anymore
---
 pkgs/development/libraries/tdlib/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index 06909c078609..80defd4a5439 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -7,7 +7,13 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tdlib";
     repo = "td";
+
+    # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 uses an explicit revision hash because 1.6.9
+    # is not a tdlib GitHub release, and is therefore not hosted at `https://github.com/tdlib/td/releases/tag/v1.6.9`.
+    # Please return to the `rev = "v${version}"` style on the next version bump if you can, since that will allow
+    # `nixpkgs-update` to update the package automatically.
     rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01";
+
     sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n";
   };
 

From c6bbc945b4286681f23cafa16e63fd560dd8cfae Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 27 Oct 2020 23:20:54 +0100
Subject: [PATCH 0536/3942] systemd: stdenv.lib -> lib

This is a no-op and makes things a bit smaller.
---
 pkgs/os-specific/linux/systemd/default.nix | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index ffb6da3c0577..6ded933e280f 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -122,12 +122,12 @@ in stdenv.mkDerivation {
     [ linuxHeaders libcap curl.dev kmod xz pam acl
       cryptsetup libuuid glib libgcrypt libgpgerror libidn2
       pcre2 ] ++
-      stdenv.lib.optional withKexectools kexectools ++
-      stdenv.lib.optional withLibseccomp libseccomp ++
+      lib.optional withKexectools kexectools ++
+      lib.optional withLibseccomp libseccomp ++
       [ libffi audit lz4 bzip2 libapparmor iptables ] ++
-      stdenv.lib.optional withEfi gnu-efi ++
-      stdenv.lib.optional withSelinux libselinux ++
-      stdenv.lib.optional withCryptsetup cryptsetup.dev;
+      lib.optional withEfi gnu-efi ++
+      lib.optional withSelinux libselinux ++
+      lib.optional withCryptsetup cryptsetup.dev;
 
   #dontAddPrefix = true;
 
@@ -143,26 +143,26 @@ in stdenv.mkDerivation {
     "-Dsetfont-path=${kbd}/bin/setfont"
     "-Dtty-gid=3" # tty in NixOS has gid 3
     "-Ddebug-shell=${bashInteractive}/bin/bash"
-    "-Dglib=${stdenv.lib.boolToString (glib != null)}"
+    "-Dglib=${lib.boolToString (glib != null)}"
     # while we do not run tests we should also not build them. Removes about 600 targets
     "-Dtests=false"
-    "-Dimportd=${stdenv.lib.boolToString withImportd}"
+    "-Dimportd=${lib.boolToString withImportd}"
     "-Dlz4=true"
     "-Dhomed=false"
-    "-Dlogind=${stdenv.lib.boolToString withLogind}"
-    "-Dlocaled=${stdenv.lib.boolToString withLocaled}"
-    "-Dhostnamed=${stdenv.lib.boolToString withHostnamed}"
-    "-Dnetworkd=${stdenv.lib.boolToString withNetworkd}"
-    "-Dcryptsetup=${stdenv.lib.boolToString withCryptsetup}"
+    "-Dlogind=${lib.boolToString withLogind}"
+    "-Dlocaled=${lib.boolToString withLocaled}"
+    "-Dhostnamed=${lib.boolToString withHostnamed}"
+    "-Dnetworkd=${lib.boolToString withNetworkd}"
+    "-Dcryptsetup=${lib.boolToString withCryptsetup}"
     "-Dportabled=false"
-    "-Dhwdb=${stdenv.lib.boolToString withHwdb}"
+    "-Dhwdb=${lib.boolToString withHwdb}"
     "-Dremote=false"
     "-Dsysusers=false"
-    "-Dtimedated=${stdenv.lib.boolToString withTimedated}"
-    "-Dtimesyncd=${stdenv.lib.boolToString withTimesyncd}"
+    "-Dtimedated=${lib.boolToString withTimedated}"
+    "-Dtimesyncd=${lib.boolToString withTimesyncd}"
     "-Dfirstboot=false"
     "-Dlocaled=true"
-    "-Dresolve=${stdenv.lib.boolToString withResolved}"
+    "-Dresolve=${lib.boolToString withResolved}"
     "-Dsplit-usr=false"
     "-Dlibcurl=true"
     "-Dlibidn=false"
@@ -201,8 +201,8 @@ in stdenv.mkDerivation {
     # more frequent development builds
     "-Dman=true"
 
-    "-Dgnu-efi=${stdenv.lib.boolToString (withEfi && gnu-efi != null)}"
-  ] ++ stdenv.lib.optionals (withEfi && gnu-efi != null) [
+    "-Dgnu-efi=${lib.boolToString (withEfi && gnu-efi != null)}"
+  ] ++ lib.optionals (withEfi && gnu-efi != null) [
     "-Defi-libdir=${toString gnu-efi}/lib"
     "-Defi-includedir=${toString gnu-efi}/include/efi"
     "-Defi-ldsdir=${toString gnu-efi}/lib"
@@ -323,7 +323,7 @@ in stdenv.mkDerivation {
   # runtime; otherwise we can't and we need to reboot.
   passthru.interfaceVersion = 2;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.freedesktop.org/wiki/Software/systemd/";
     description = "A system and service manager for Linux";
     license = licenses.lgpl21Plus;

From 229184f6b53bae4fe6f9f05abd36bb6184d87f6a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 27 Oct 2020 23:23:41 +0100
Subject: [PATCH 0537/3942] systemd: reorder buildInputs

These are all unconditianally anyways.
---
 pkgs/os-specific/linux/systemd/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 6ded933e280f..e0e124aed31f 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -121,10 +121,9 @@ in stdenv.mkDerivation {
   buildInputs =
     [ linuxHeaders libcap curl.dev kmod xz pam acl
       cryptsetup libuuid glib libgcrypt libgpgerror libidn2
-      pcre2 ] ++
+      pcre2 libffi audit lz4 bzip2 libapparmor iptables ] ++
       lib.optional withKexectools kexectools ++
       lib.optional withLibseccomp libseccomp ++
-      [ libffi audit lz4 bzip2 libapparmor iptables ] ++
       lib.optional withEfi gnu-efi ++
       lib.optional withSelinux libselinux ++
       lib.optional withCryptsetup cryptsetup.dev;

From 6456e24d570728bc81fa8b070c5e34f83c7425f0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 27 Oct 2020 23:28:29 +0100
Subject: [PATCH 0538/3942] systemd: nixpkgs-fmt

---
 pkgs/os-specific/linux/systemd/default.nix | 139 +++++++++++++++------
 1 file changed, 102 insertions(+), 37 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index e0e124aed31f..36eda6d2a873 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,28 +1,59 @@
-{ stdenv, lib, fetchFromGitHub
+{ stdenv
+, lib
+, fetchFromGitHub
 , buildPackages
-, ninja, meson, m4, pkgconfig, coreutils, gperf, getent
-, patchelf, perl, glibcLocales, glib, substituteAll
-, gettext, python3Packages
+, ninja
+, meson
+, m4
+, pkgconfig
+, coreutils
+, gperf
+, getent
+, patchelf
+, perl
+, glibcLocales
+, glib
+, substituteAll
+, gettext
+, python3Packages
 
-# Mandatory dependencies
+  # Mandatory dependencies
 , libcap
 , utillinux
 , kbd
 , kmod
 
-# Optional dependencies
-, pam, cryptsetup, lvm2, audit, acl
-, lz4, libgcrypt, libgpgerror, libidn2
-, curl, gnutar, gnupg, zlib
-, xz, libuuid, libffi
-, libapparmor, intltool
-, bzip2, pcre2, e2fsprogs
+  # Optional dependencies
+, pam
+, cryptsetup
+, lvm2
+, audit
+, acl
+, lz4
+, libgcrypt
+, libgpgerror
+, libidn2
+, curl
+, gnutar
+, gnupg
+, zlib
+, xz
+, libuuid
+, libffi
+, libapparmor
+, intltool
+, bzip2
+, pcre2
+, e2fsprogs
 , linuxHeaders ? stdenv.cc.libc.linuxHeaders
 , gnu-efi
 , iptables
-, withSelinux ? false, libselinux
-, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
-, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
+, withSelinux ? false
+, libselinux
+, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms
+, libseccomp
+, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms
+, kexectools
 , bashInteractive
 
 , withResolved ? true
@@ -37,24 +68,27 @@
 , withImportd ? true
 , withCryptsetup ? true
 
-# name argument
+  # name argument
 , pname ? "systemd"
 
 
-, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
+, libxslt
+, docbook_xsl
+, docbook_xml_dtd_42
+, docbook_xml_dtd_45
 }:
 
 assert withResolved -> (libgcrypt != null && libgpgerror != null);
 assert withImportd ->
-  ( curl.dev != null && zlib != null && xz != null && libgcrypt != null
+(curl.dev != null && zlib != null && xz != null && libgcrypt != null
   && gnutar != null && gnupg != null);
 
 assert withCryptsetup ->
-  ( cryptsetup != null );
-
+(cryptsetup != null);
 let
   version = "246.6";
-in stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
   inherit version pname;
 
   # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly
@@ -105,28 +139,56 @@ in stdenv.mkDerivation {
   outputs = [ "out" "man" "dev" ];
 
   nativeBuildInputs =
-    [ pkgconfig gperf
-      ninja meson
+    [
+      pkgconfig
+      gperf
+      ninja
+      meson
       coreutils # meson calls date, stat etc.
       glibcLocales
-      patchelf getent m4
+      patchelf
+      getent
+      m4
       perl # to patch the libsystemd.so and remove dependencies on aarch64
 
       intltool
       gettext
 
-      libxslt docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
-      (buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]))
+      libxslt
+      docbook_xsl
+      docbook_xml_dtd_42
+      docbook_xml_dtd_45
+      (buildPackages.python3Packages.python.withPackages (ps: with ps; [ python3Packages.lxml ]))
     ];
+
   buildInputs =
-    [ linuxHeaders libcap curl.dev kmod xz pam acl
-      cryptsetup libuuid glib libgcrypt libgpgerror libidn2
-      pcre2 libffi audit lz4 bzip2 libapparmor iptables ] ++
-      lib.optional withKexectools kexectools ++
-      lib.optional withLibseccomp libseccomp ++
-      lib.optional withEfi gnu-efi ++
-      lib.optional withSelinux libselinux ++
-      lib.optional withCryptsetup cryptsetup.dev;
+    [
+      acl
+      audit
+      bzip2
+      cryptsetup
+      curl.dev
+      glib
+      iptables
+      kmod
+      libapparmor
+      libcap
+      libffi
+      libgcrypt
+      libgpgerror
+      libidn2
+      libuuid
+      linuxHeaders
+      lz4
+      pam
+      pcre2
+      xz
+    ] ++ lib.optional withKexectools kexectools
+    ++ lib.optional withLibseccomp libseccomp
+    ++ lib.optional withEfi gnu-efi
+    ++ lib.optional withSelinux libselinux
+    ++ lib.optional withCryptsetup cryptsetup.dev
+  ;
 
   #dontAddPrefix = true;
 
@@ -271,14 +333,17 @@ in stdenv.mkDerivation {
   NIX_CFLAGS_COMPILE = toString [
     # Can't say ${polkit.bin}/bin/pkttyagent here because that would
     # lead to a cyclic dependency.
-    "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
+    "-UPOLKIT_AGENT_BINARY_PATH"
+    "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
 
     # Set the release_agent on /sys/fs/cgroup/systemd to the
     # currently running systemd (/run/current-system/systemd) so
     # that we don't use an obsolete/garbage-collected release agent.
-    "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""
+    "-USYSTEMD_CGROUP_AGENT_PATH"
+    "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""
 
-    "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
+    "-USYSTEMD_BINARY_PATH"
+    "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
   ];
 
   doCheck = false; # fails a bunch of tests

From 8434da57154823b06889257f81a5fa44aeb84dc4 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 27 Oct 2020 23:30:32 +0100
Subject: [PATCH 0539/3942] systemd: remove perl from nativeBuildInputs

This was only used to patch a circular output reference from lib to out
on aarch64, but was removed in b68bddfbda2092c5fde2c4cece2f4bcf0eb214a1,

This commit forgot to remove perl, so remove it now.
---
 pkgs/os-specific/linux/systemd/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 36eda6d2a873..6ecfe26edef5 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -10,7 +10,6 @@
 , gperf
 , getent
 , patchelf
-, perl
 , glibcLocales
 , glib
 , substituteAll
@@ -149,7 +148,6 @@ stdenv.mkDerivation {
       patchelf
       getent
       m4
-      perl # to patch the libsystemd.so and remove dependencies on aarch64
 
       intltool
       gettext

From 39e733336cc0841dca9a869b4527f33b49c80ea4 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 27 Oct 2020 23:37:01 +0100
Subject: [PATCH 0540/3942] systemd: build without iptables when networkd is
 disabled

upstreams TODO mentions iptables-dev (libiptc) is also used for nspawn,
but it seems like it only makes use of this via networkd anyways (or
does these days) - at least systemdMinimal compiles successfully without
iptables in the build closure.
---
 pkgs/os-specific/linux/systemd/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 6ecfe26edef5..665b330aa9e8 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -167,7 +167,6 @@ stdenv.mkDerivation {
       cryptsetup
       curl.dev
       glib
-      iptables
       kmod
       libapparmor
       libcap
@@ -181,7 +180,9 @@ stdenv.mkDerivation {
       pam
       pcre2
       xz
-    ] ++ lib.optional withKexectools kexectools
+    ]
+    ++ lib.optional withNetworkd iptables
+    ++ lib.optional withKexectools kexectools
     ++ lib.optional withLibseccomp libseccomp
     ++ lib.optional withEfi gnu-efi
     ++ lib.optional withSelinux libselinux

From e1e01fa85e1a8cd5e4b6a0fa0cdaf51115d6eb49 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 27 Oct 2020 23:48:19 +0100
Subject: [PATCH 0541/3942] systemd: add withRemote option (default to false),
 make curl optional

This makes curl optional if both remote and importd are disabled, and
makes some assertions more robust by switching from curl.dev != null to
lib.getDev curl != null.
---
 pkgs/os-specific/linux/systemd/default.nix | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 665b330aa9e8..4a501e8872bf 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -55,17 +55,18 @@
 , kexectools
 , bashInteractive
 
-, withResolved ? true
-, withLogind ? true
+, withCryptsetup ? true
+, withEfi ? stdenv.hostPlatform.isEfi
 , withHostnamed ? true
+, withHwdb ? true
+, withImportd ? true
 , withLocaled ? true
+, withLogind ? true
 , withNetworkd ? true
+, withRemote ? false  # has always been disabled on NixOS, upstream version appears broken anyway
+, withResolved ? true
 , withTimedated ? true
 , withTimesyncd ? true
-, withHwdb ? true
-, withEfi ? stdenv.hostPlatform.isEfi
-, withImportd ? true
-, withCryptsetup ? true
 
   # name argument
 , pname ? "systemd"
@@ -82,9 +83,13 @@ assert withImportd ->
 (curl.dev != null && zlib != null && xz != null && libgcrypt != null
   && gnutar != null && gnupg != null);
 
+assert withRemote -> lib.getDev curl != null;
+
 assert withCryptsetup ->
 (cryptsetup != null);
 let
+  wantCurl = withRemote || withImportd;
+
   version = "246.6";
 in
 stdenv.mkDerivation {
@@ -165,7 +170,6 @@ stdenv.mkDerivation {
       audit
       bzip2
       cryptsetup
-      curl.dev
       glib
       kmod
       libapparmor
@@ -181,6 +185,7 @@ stdenv.mkDerivation {
       pcre2
       xz
     ]
+    ++ lib.optional wantCurl (lib.getDev curl)
     ++ lib.optional withNetworkd iptables
     ++ lib.optional withKexectools kexectools
     ++ lib.optional withLibseccomp libseccomp
@@ -216,7 +221,7 @@ stdenv.mkDerivation {
     "-Dcryptsetup=${lib.boolToString withCryptsetup}"
     "-Dportabled=false"
     "-Dhwdb=${lib.boolToString withHwdb}"
-    "-Dremote=false"
+    "-Dremote=${lib.boolToString withRemote}"
     "-Dsysusers=false"
     "-Dtimedated=${lib.boolToString withTimedated}"
     "-Dtimesyncd=${lib.boolToString withTimesyncd}"
@@ -224,7 +229,7 @@ stdenv.mkDerivation {
     "-Dlocaled=true"
     "-Dresolve=${lib.boolToString withResolved}"
     "-Dsplit-usr=false"
-    "-Dlibcurl=true"
+    "-Dlibcurl=${lib.boolToString wantCurl}"
     "-Dlibidn=false"
     "-Dlibidn2=true"
     "-Dquotacheck=false"

From 5f257d7d2cd66cd5bcf832245e6d2734e2798381 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 27 Oct 2020 23:52:28 +0100
Subject: [PATCH 0542/3942] systemd: cleanup cryptsetup input

use lib.getDev to retrieve the dev output. Don't pass it to buildInputs
if we don't build with withCryptsetup set to true.
---
 pkgs/os-specific/linux/systemd/default.nix | 3 +--
 pkgs/top-level/all-packages.nix            | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 4a501e8872bf..4b64c8d523ee 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -169,7 +169,6 @@ stdenv.mkDerivation {
       acl
       audit
       bzip2
-      cryptsetup
       glib
       kmod
       libapparmor
@@ -191,7 +190,7 @@ stdenv.mkDerivation {
     ++ lib.optional withLibseccomp libseccomp
     ++ lib.optional withEfi gnu-efi
     ++ lib.optional withSelinux libselinux
-    ++ lib.optional withCryptsetup cryptsetup.dev
+    ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
   ;
 
   #dontAddPrefix = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd5facef8271..456b43a9c1e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18671,7 +18671,6 @@ in
     withEfi = false;
     withImportd = false;
     withCryptsetup = false;
-    cryptsetup = null;
     glib = null;
     lvm2 = null;
   };

From ff07c6b47d770ef110e7f2e6d8fc35ae020681e5 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 00:02:24 +0100
Subject: [PATCH 0543/3942] systemd: introduce withCompression flag

This will build systemd without some compression utils, useful for
systemdMinimal.
---
 pkgs/os-specific/linux/systemd/default.nix | 9 ++++-----
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 4b64c8d523ee..f9c12ca9b862 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -55,6 +55,7 @@
 , kexectools
 , bashInteractive
 
+, withCompression ? true  # adds bzip2, lz4 and xz
 , withCryptsetup ? true
 , withEfi ? stdenv.hostPlatform.isEfi
 , withHostnamed ? true
@@ -81,7 +82,7 @@
 assert withResolved -> (libgcrypt != null && libgpgerror != null);
 assert withImportd ->
 (curl.dev != null && zlib != null && xz != null && libgcrypt != null
-  && gnutar != null && gnupg != null);
+  && gnutar != null && gnupg != null && withCompression );
 
 assert withRemote -> lib.getDev curl != null;
 
@@ -168,7 +169,6 @@ stdenv.mkDerivation {
     [
       acl
       audit
-      bzip2
       glib
       kmod
       libapparmor
@@ -179,12 +179,11 @@ stdenv.mkDerivation {
       libidn2
       libuuid
       linuxHeaders
-      lz4
       pam
       pcre2
-      xz
     ]
     ++ lib.optional wantCurl (lib.getDev curl)
+    ++ lib.optionals withCompression [ bzip2 lz4 xz ]
     ++ lib.optional withNetworkd iptables
     ++ lib.optional withKexectools kexectools
     ++ lib.optional withLibseccomp libseccomp
@@ -211,7 +210,7 @@ stdenv.mkDerivation {
     # while we do not run tests we should also not build them. Removes about 600 targets
     "-Dtests=false"
     "-Dimportd=${lib.boolToString withImportd}"
-    "-Dlz4=true"
+    "-Dlz4=${lib.boolToString withCompression}"
     "-Dhomed=false"
     "-Dlogind=${lib.boolToString withLogind}"
     "-Dlocaled=${lib.boolToString withLocaled}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 456b43a9c1e6..6d2eb4253d8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18670,6 +18670,7 @@ in
     withHwdb = false;
     withEfi = false;
     withImportd = false;
+    withCompression = false;
     withCryptsetup = false;
     glib = null;
     lvm2 = null;

From c6aada2835d91573f4572aa078fb353bf4dd69e0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 00:03:10 +0100
Subject: [PATCH 0544/3942] =?UTF-8?q?systemd:=20drop=20duplicate=20-Dlocal?=
 =?UTF-8?q?ed=3D=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is already configurable above.
---
 pkgs/os-specific/linux/systemd/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index f9c12ca9b862..be21219b7d9e 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -224,7 +224,6 @@ stdenv.mkDerivation {
     "-Dtimedated=${lib.boolToString withTimedated}"
     "-Dtimesyncd=${lib.boolToString withTimesyncd}"
     "-Dfirstboot=false"
-    "-Dlocaled=true"
     "-Dresolve=${lib.boolToString withResolved}"
     "-Dsplit-usr=false"
     "-Dlibcurl=${lib.boolToString wantCurl}"

From 8d18be9cdc9efbeee1c017ae6c7e884de386948f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 00:04:54 +0100
Subject: [PATCH 0545/3942] systemdMinimal: sort feature flags

---
 pkgs/top-level/all-packages.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d2eb4253d8d..f5276178f76c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18662,16 +18662,16 @@ in
   };
   systemdMinimal = systemd.override {
     pname = "systemd-minimal";
-    withResolved = false;
-    withLogind = false;
-    withHostnamed = false;
-    withLocaled = false;
-    withTimedated = false;
-    withHwdb = false;
-    withEfi = false;
-    withImportd = false;
     withCompression = false;
     withCryptsetup = false;
+    withEfi = false;
+    withHostnamed = false;
+    withHwdb = false;
+    withImportd = false;
+    withLocaled = false;
+    withLogind = false;
+    withResolved = false;
+    withTimedated = false;
     glib = null;
     lvm2 = null;
   };

From b027cf264c1a3e6a3e5974dce988bced95560368 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 00:12:27 +0100
Subject: [PATCH 0546/3942] systemdMinimal: disable networkd

This was missed.
---
 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 f5276178f76c..860674cf118e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18670,6 +18670,7 @@ in
     withImportd = false;
     withLocaled = false;
     withLogind = false;
+    withNetworkd = false;
     withResolved = false;
     withTimedated = false;
     glib = null;

From 987906aa5861a56437975fa8c09cb92f354de631 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 00:12:45 +0100
Subject: [PATCH 0547/3942] systemd: add withCoredump flag
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… and default it to false for systemdMinimal
---
 pkgs/os-specific/linux/systemd/default.nix | 3 +++
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index be21219b7d9e..7e2d457bcfa2 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -55,6 +55,7 @@
 , kexectools
 , bashInteractive
 
+, withCoredump ? true
 , withCompression ? true  # adds bzip2, lz4 and xz
 , withCryptsetup ? true
 , withEfi ? stdenv.hostPlatform.isEfi
@@ -85,6 +86,7 @@ assert withImportd ->
   && gnutar != null && gnupg != null && withCompression );
 
 assert withRemote -> lib.getDev curl != null;
+assert withCoredump -> withCompression;
 
 assert withCryptsetup ->
 (cryptsetup != null);
@@ -223,6 +225,7 @@ stdenv.mkDerivation {
     "-Dsysusers=false"
     "-Dtimedated=${lib.boolToString withTimedated}"
     "-Dtimesyncd=${lib.boolToString withTimesyncd}"
+    "-Dcoredump=${lib.boolToString withCoredump}"
     "-Dfirstboot=false"
     "-Dresolve=${lib.boolToString withResolved}"
     "-Dsplit-usr=false"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 860674cf118e..e802a6d403bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18663,6 +18663,7 @@ in
   systemdMinimal = systemd.override {
     pname = "systemd-minimal";
     withCompression = false;
+    withCoredump = false;
     withCryptsetup = false;
     withEfi = false;
     withHostnamed = false;

From 585f4a140b40959733903ab6fcba3ee2b5586af7 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 00:29:07 +0100
Subject: [PATCH 0548/3942] systemd: add withAnalyze flag

---
 pkgs/os-specific/linux/systemd/default.nix | 2 ++
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7e2d457bcfa2..e5d4e0e1402c 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -55,6 +55,7 @@
 , kexectools
 , bashInteractive
 
+, withAnalyze ? true
 , withCoredump ? true
 , withCompression ? true  # adds bzip2, lz4 and xz
 , withCryptsetup ? true
@@ -211,6 +212,7 @@ stdenv.mkDerivation {
     "-Dglib=${lib.boolToString (glib != null)}"
     # while we do not run tests we should also not build them. Removes about 600 targets
     "-Dtests=false"
+    "-Danalyze=${lib.boolToString withAnalyze}"
     "-Dimportd=${lib.boolToString withImportd}"
     "-Dlz4=${lib.boolToString withCompression}"
     "-Dhomed=false"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e802a6d403bb..1c45d22b4180 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18662,6 +18662,7 @@ in
   };
   systemdMinimal = systemd.override {
     pname = "systemd-minimal";
+    withAnalyze = false;
     withCompression = false;
     withCoredump = false;
     withCryptsetup = false;

From 13a910e3f6e50ff3d1946e75cce6fde64656bba0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 00:29:34 +0100
Subject: [PATCH 0549/3942] systemd: make gcrypt optional

---
 pkgs/os-specific/linux/systemd/default.nix | 1 +
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index e5d4e0e1402c..09b828f58751 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -213,6 +213,7 @@ stdenv.mkDerivation {
     # while we do not run tests we should also not build them. Removes about 600 targets
     "-Dtests=false"
     "-Danalyze=${lib.boolToString withAnalyze}"
+    "-Dgcrypt=${lib.boolToString (libgcrypt != null)}"
     "-Dimportd=${lib.boolToString withImportd}"
     "-Dlz4=${lib.boolToString withCompression}"
     "-Dhomed=false"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c45d22b4180..ee0d9d80934d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18676,6 +18676,7 @@ in
     withResolved = false;
     withTimedated = false;
     glib = null;
+    libgcrypt = null;
     lvm2 = null;
   };
 

From 54c35f0940921ad43b49686f18e80634ff62d306 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 00:33:26 +0100
Subject: [PATCH 0550/3942] systemd: withEfi: move gnu-efi check into assertion

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 09b828f58751..e4c07baeecc9 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -86,6 +86,7 @@ assert withImportd ->
 (curl.dev != null && zlib != null && xz != null && libgcrypt != null
   && gnutar != null && gnupg != null && withCompression );
 
+assert withEfi -> (gnu-efi != null);
 assert withRemote -> lib.getDev curl != null;
 assert withCoredump -> withCompression;
 
@@ -269,8 +270,8 @@ stdenv.mkDerivation {
     # more frequent development builds
     "-Dman=true"
 
-    "-Dgnu-efi=${lib.boolToString (withEfi && gnu-efi != null)}"
-  ] ++ lib.optionals (withEfi && gnu-efi != null) [
+    "-Dgnu-efi=${lib.boolToString withEfi}"
+  ] ++ lib.optionals withEfi [
     "-Defi-libdir=${toString gnu-efi}/lib"
     "-Defi-includedir=${toString gnu-efi}/include/efi"
     "-Defi-ldsdir=${toString gnu-efi}/lib"

From 0b762c02ee2a0a7a047c8ff5d2a1885ae04d4553 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 00:35:00 +0100
Subject: [PATCH 0551/3942] systemd: disable efi if we don't build with withEfi
 is set to false

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index e4c07baeecc9..21ac82081559 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -270,6 +270,7 @@ stdenv.mkDerivation {
     # more frequent development builds
     "-Dman=true"
 
+    "-Defi=${lib.boolToString withEfi}"
     "-Dgnu-efi=${lib.boolToString withEfi}"
   ] ++ lib.optionals withEfi [
     "-Defi-libdir=${toString gnu-efi}/lib"

From 1f9347431c153ffa3b61e0677782678bfce4bae3 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 00:48:51 +0100
Subject: [PATCH 0552/3942] systemd: add withPolkit option

---
 pkgs/os-specific/linux/systemd/default.nix | 2 ++
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 21ac82081559..e8a38bce8823 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -66,6 +66,7 @@
 , withLocaled ? true
 , withLogind ? true
 , withNetworkd ? true
+, withPolkit ? true
 , withRemote ? false  # has always been disabled on NixOS, upstream version appears broken anyway
 , withResolved ? true
 , withTimedated ? true
@@ -222,6 +223,7 @@ stdenv.mkDerivation {
     "-Dlocaled=${lib.boolToString withLocaled}"
     "-Dhostnamed=${lib.boolToString withHostnamed}"
     "-Dnetworkd=${lib.boolToString withNetworkd}"
+    "-Dpolkit=${lib.boolToString withPolkit}"
     "-Dcryptsetup=${lib.boolToString withCryptsetup}"
     "-Dportabled=false"
     "-Dhwdb=${lib.boolToString withHwdb}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee0d9d80934d..d308ac7015cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18673,6 +18673,7 @@ in
     withLocaled = false;
     withLogind = false;
     withNetworkd = false;
+    withPolkit = false;
     withResolved = false;
     withTimedated = false;
     glib = null;

From f142493a6a4e2ef9851884d482d14fba1de375a6 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 00:51:39 +0100
Subject: [PATCH 0553/3942] systemd: add withShellCompletions flag

---
 pkgs/os-specific/linux/systemd/default.nix | 4 ++++
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index e8a38bce8823..49279c4b578b 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -69,6 +69,7 @@
 , withPolkit ? true
 , withRemote ? false  # has always been disabled on NixOS, upstream version appears broken anyway
 , withResolved ? true
+, withShellCompletions ? true
 , withTimedated ? true
 , withTimesyncd ? true
 
@@ -278,6 +279,9 @@ stdenv.mkDerivation {
     "-Defi-libdir=${toString gnu-efi}/lib"
     "-Defi-includedir=${toString gnu-efi}/include/efi"
     "-Defi-ldsdir=${toString gnu-efi}/lib"
+  ] ++ lib.optionals (withShellCompletions == false) [
+    "-Dbashcompletiondir=no"
+    "-Dzshcompletiondir=no"
   ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d308ac7015cd..760deb470134 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18675,6 +18675,7 @@ in
     withNetworkd = false;
     withPolkit = false;
     withResolved = false;
+    withShellCompletions = false;
     withTimedated = false;
     glib = null;
     libgcrypt = null;

From e77326208e0ce78492366a9c6c5b21d591047b0c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 00:54:08 +0100
Subject: [PATCH 0554/3942] systemd: add withDocumentation flag

---
 pkgs/os-specific/linux/systemd/default.nix | 5 ++++-
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 49279c4b578b..4d5a5121a454 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -59,6 +59,7 @@
 , withCoredump ? true
 , withCompression ? true  # adds bzip2, lz4 and xz
 , withCryptsetup ? true
+, withDocumentation ? true
 , withEfi ? stdenv.hostPlatform.isEfi
 , withHostnamed ? true
 , withHwdb ? true
@@ -390,7 +391,9 @@ stdenv.mkDerivation {
 
     # "kernel-install" shouldn't be used on NixOS.
     find $out -name "*kernel-install*" -exec rm {} \;
-  ''; # */
+  '' + lib.optionalString (!withDocumentation) ''
+    rm -rf $out/share/doc
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 760deb470134..48ec0679fc6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18666,6 +18666,7 @@ in
     withCompression = false;
     withCoredump = false;
     withCryptsetup = false;
+    withDocumentation = false;
     withEfi = false;
     withHostnamed = false;
     withHwdb = false;

From a079a6f02697d4d5d12c6627136f425cd7da5598 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 01:00:44 +0100
Subject: [PATCH 0555/3942] systemd: add withUserDb flag

---
 pkgs/os-specific/linux/systemd/default.nix | 2 ++
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 4d5a5121a454..cd0968b42189 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -73,6 +73,7 @@
 , withShellCompletions ? true
 , withTimedated ? true
 , withTimesyncd ? true
+, withUserDb ? true
 
   # name argument
 , pname ? "systemd"
@@ -233,6 +234,7 @@ stdenv.mkDerivation {
     "-Dsysusers=false"
     "-Dtimedated=${lib.boolToString withTimedated}"
     "-Dtimesyncd=${lib.boolToString withTimesyncd}"
+    "-Duserdb=${lib.boolToString withUserDb}"
     "-Dcoredump=${lib.boolToString withCoredump}"
     "-Dfirstboot=false"
     "-Dresolve=${lib.boolToString withResolved}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48ec0679fc6f..00462f38c19f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18678,6 +18678,7 @@ in
     withResolved = false;
     withShellCompletions = false;
     withTimedated = false;
+    withUserDb = false;
     glib = null;
     libgcrypt = null;
     lvm2 = null;

From 8526662a33beee8b344ec668c02529ee5b5cfbb5 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 01:05:14 +0100
Subject: [PATCH 0556/3942] systemd: add withNss flag

---
 pkgs/os-specific/linux/systemd/default.nix | 6 ++++++
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 7 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index cd0968b42189..90df8a57ff19 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -67,6 +67,7 @@
 , withLocaled ? true
 , withLogind ? true
 , withNetworkd ? true
+, withNss ? true
 , withPolkit ? true
 , withRemote ? false  # has always been disabled on NixOS, upstream version appears broken anyway
 , withResolved ? true
@@ -285,6 +286,11 @@ stdenv.mkDerivation {
   ] ++ lib.optionals (withShellCompletions == false) [
     "-Dbashcompletiondir=no"
     "-Dzshcompletiondir=no"
+  ] ++ lib.optionals (!withNss) [
+    "-Dnss-myhostname=false"
+    "-Dnss-mymachines=false"
+    "-Dnss-resolve=false"
+    "-Dnss-systemd=false"
   ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00462f38c19f..e2e83dc103f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18674,6 +18674,7 @@ in
     withLocaled = false;
     withLogind = false;
     withNetworkd = false;
+    withNss = false;
     withPolkit = false;
     withResolved = false;
     withShellCompletions = false;

From e10a9a850602fc7f3044c845ab61de18a4315b74 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 01:08:29 +0100
Subject: [PATCH 0557/3942] systemd: add withMachined flag

---
 pkgs/os-specific/linux/systemd/default.nix | 2 ++
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 90df8a57ff19..59c9451debe3 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -66,6 +66,7 @@
 , withImportd ? true
 , withLocaled ? true
 , withLogind ? true
+, withMachined ? true
 , withNetworkd ? true
 , withNss ? true
 , withPolkit ? true
@@ -226,6 +227,7 @@ stdenv.mkDerivation {
     "-Dlogind=${lib.boolToString withLogind}"
     "-Dlocaled=${lib.boolToString withLocaled}"
     "-Dhostnamed=${lib.boolToString withHostnamed}"
+    "-Dmachined=${lib.boolToString withMachined}"
     "-Dnetworkd=${lib.boolToString withNetworkd}"
     "-Dpolkit=${lib.boolToString withPolkit}"
     "-Dcryptsetup=${lib.boolToString withCryptsetup}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2e83dc103f0..5a23b7ba9cfb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18673,6 +18673,7 @@ in
     withImportd = false;
     withLocaled = false;
     withLogind = false;
+    withMachined = false;
     withNetworkd = false;
     withNss = false;
     withPolkit = false;

From 961663a1b3236be22e7a22592ff8c51d2f0af3c9 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 01:09:44 +0100
Subject: [PATCH 0558/3942] systemdMinimal: disable timesyncd

---
 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 5a23b7ba9cfb..3af884f5edc8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18680,6 +18680,7 @@ in
     withResolved = false;
     withShellCompletions = false;
     withTimedated = false;
+    withTimesyncd = false;
     withUserDb = false;
     glib = null;
     libgcrypt = null;

From e6dff1d666d6645828f4381882540d1512a76b9e Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 01:17:30 +0100
Subject: [PATCH 0559/3942] systemd: drop libffi from buildInputs

This isn't used anywhere.
---
 pkgs/os-specific/linux/systemd/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 59c9451debe3..1df3c8ab2ee3 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -38,7 +38,6 @@
 , zlib
 , xz
 , libuuid
-, libffi
 , libapparmor
 , intltool
 , bzip2
@@ -183,7 +182,6 @@ stdenv.mkDerivation {
       kmod
       libapparmor
       libcap
-      libffi
       libgcrypt
       libgpgerror
       libidn2

From 065f057d0c2286fc0dc1c7b92b5d9f2929d97866 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 01:22:23 +0100
Subject: [PATCH 0560/3942] systemd: add libgpgerror only to buildInputs if we
 build with resolved support

---
 pkgs/os-specific/linux/systemd/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 1df3c8ab2ee3..b608ae72ffc4 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -183,7 +183,6 @@ stdenv.mkDerivation {
       libapparmor
       libcap
       libgcrypt
-      libgpgerror
       libidn2
       libuuid
       linuxHeaders
@@ -192,13 +191,14 @@ stdenv.mkDerivation {
     ]
     ++ lib.optional wantCurl (lib.getDev curl)
     ++ lib.optionals withCompression [ bzip2 lz4 xz ]
-    ++ lib.optional withNetworkd iptables
+    ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
+    ++ lib.optional withEfi gnu-efi
     ++ lib.optional withKexectools kexectools
     ++ lib.optional withLibseccomp libseccomp
-    ++ lib.optional withEfi gnu-efi
+    ++ lib.optional withNetworkd iptables
+    ++ lib.optional withResolved libgpgerror
     ++ lib.optional withSelinux libselinux
-    ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
-  ;
+    ;
 
   #dontAddPrefix = true;
 

From 93dcbbf69d778e0cea16eaa010d68cc55526d5b0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 01:26:24 +0100
Subject: [PATCH 0561/3942] systemd: add withApparmor option

---
 pkgs/os-specific/linux/systemd/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index b608ae72ffc4..9c1b1fee7c89 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -55,6 +55,7 @@
 , bashInteractive
 
 , withAnalyze ? true
+, withApparmor ? true
 , withCoredump ? true
 , withCompression ? true  # adds bzip2, lz4 and xz
 , withCryptsetup ? true
@@ -180,7 +181,6 @@ stdenv.mkDerivation {
       audit
       glib
       kmod
-      libapparmor
       libcap
       libgcrypt
       libidn2
@@ -189,6 +189,7 @@ stdenv.mkDerivation {
       pam
       pcre2
     ]
+    ++ lib.optional withApparmor libapparmor
     ++ lib.optional wantCurl (lib.getDev curl)
     ++ lib.optionals withCompression [ bzip2 lz4 xz ]
     ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3af884f5edc8..0f7610cad467 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18663,6 +18663,7 @@ in
   systemdMinimal = systemd.override {
     pname = "systemd-minimal";
     withAnalyze = false;
+    withApparmor = false;
     withCompression = false;
     withCoredump = false;
     withCryptsetup = false;

From 959cea2e8096b69901a4d48b9352b39aaf8e7545 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 01:36:02 +0100
Subject: [PATCH 0562/3942] systemd: add withPCRE2 option

---
 pkgs/os-specific/linux/systemd/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 9c1b1fee7c89..7327e9065e5c 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -69,6 +69,7 @@
 , withMachined ? true
 , withNetworkd ? true
 , withNss ? true
+, withPCRE2 ? true
 , withPolkit ? true
 , withRemote ? false  # has always been disabled on NixOS, upstream version appears broken anyway
 , withResolved ? true
@@ -187,8 +188,8 @@ stdenv.mkDerivation {
       libuuid
       linuxHeaders
       pam
-      pcre2
     ]
+
     ++ lib.optional withApparmor libapparmor
     ++ lib.optional wantCurl (lib.getDev curl)
     ++ lib.optionals withCompression [ bzip2 lz4 xz ]
@@ -197,6 +198,7 @@ stdenv.mkDerivation {
     ++ lib.optional withKexectools kexectools
     ++ lib.optional withLibseccomp libseccomp
     ++ lib.optional withNetworkd iptables
+    ++ lib.optional withPCRE2 pcre2
     ++ lib.optional withResolved libgpgerror
     ++ lib.optional withSelinux libselinux
     ;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f7610cad467..a663714db318 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18677,6 +18677,7 @@ in
     withMachined = false;
     withNetworkd = false;
     withNss = false;
+    withPCRE2 = false;
     withPolkit = false;
     withResolved = false;
     withShellCompletions = false;

From 6dbc23e75ddcf3f462f6a8b30f1ceea0a06c1403 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 28 Oct 2020 01:48:23 +0100
Subject: [PATCH 0563/3942] systemd: stop substituting inside fsck.c, stop
 substituting mke2fs

fsck.c doesn't refer to any of these binaries anymore, and the whole
systmed codebase not to /sbin/mke2fs.
---
 pkgs/os-specific/linux/systemd/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7327e9065e5c..8aaeddd1e81d 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -305,7 +305,6 @@ stdenv.mkDerivation {
       src/core/mount.c \
       src/core/swap.c \
       src/cryptsetup/cryptsetup-generator.c \
-      src/fsck/fsck.c \
       src/journal/cat.c \
       src/nspawn/nspawn.c \
       src/remount-fs/remount-fs.c \
@@ -322,8 +321,6 @@ stdenv.mkDerivation {
         --replace /sbin/mkswap ${lib.getBin utillinux}/sbin/mkswap \
         --replace /sbin/swapon ${lib.getBin utillinux}/sbin/swapon \
         --replace /sbin/swapoff ${lib.getBin utillinux}/sbin/swapoff \
-        --replace /sbin/mke2fs ${lib.getBin e2fsprogs}/sbin/mke2fs \
-        --replace /sbin/fsck ${lib.getBin utillinux}/sbin/fsck \
         --replace /bin/echo ${coreutils}/bin/echo \
         --replace /bin/cat ${coreutils}/bin/cat \
         --replace /sbin/sulogin ${lib.getBin utillinux}/sbin/sulogin \

From 12314c6299b3f6370279246c01994663c7a96f93 Mon Sep 17 00:00:00 2001
From: Matthew Piziak <matthew.piziak@gmail.com>
Date: Wed, 28 Oct 2020 18:44:02 -0400
Subject: [PATCH 0564/3942] tdlib: 1.6.0 -> 1.6.9

fix hash

version 1.6.9 is not released, so use revision hash

add a comment to the rev about why we are not using `v${version}` anymore

use unstable-2020-10-25
---
 pkgs/development/libraries/tdlib/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index 80defd4a5439..f430b10c64c0 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
     owner = "tdlib";
     repo = "td";
 
-    # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 uses an explicit revision hash because 1.6.9
-    # is not a tdlib GitHub release, and is therefore not hosted at `https://github.com/tdlib/td/releases/tag/v1.6.9`.
-    # Please return to the `rev = "v${version}"` style on the next version bump if you can, since that will allow
+    # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 uses an explicit revision because 1.6.9 is not
+    # a tdlib GitHub release, and is therefore not hosted at `https://github.com/tdlib/td/releases/tag/v1.6.9`. Please
+    # return to the `rev = "v${version}"` style on the next version bump if you can, since that will allow
     # `nixpkgs-update` to update the package automatically.
-    rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01";
+    rev = "unstable-2020-10-25";
 
     sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n";
   };

From 190a17a4b407a55caec8a594e492c3fb0e54a456 Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Wed, 28 Oct 2020 22:52:58 +0000
Subject: [PATCH 0565/3942] maintainers: add ronanmacf

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5b06fe102f6f..feb00b35211c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7407,6 +7407,12 @@
     githubId = 1217934;
     name = "José Romildo Malaquias";
   };
+  ronanmacf = {
+    email = "macfhlar@tcd.ie";
+    github = "ronanmacf";
+    githubId = 25930627;
+    name = "Ronan Mac Fhlannchadha";
+  };
   rongcuid = {
     email = "rongcuid@outlook.com";
     github = "rongcuid";

From 09bbd4017fa5a6c76cc586b331a439c2ab7c9556 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 29 Oct 2020 01:13:01 +0100
Subject: [PATCH 0566/3942] grafana-loki: 1.6.1 -> 2.0.0

Convert to use buildGoModule and add a patch for a test failing on
golang>=1.15.
---
 pkgs/servers/monitoring/loki/default.nix | 30 ++++++++++++++----------
 pkgs/top-level/all-packages.nix          |  4 +---
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index ec9d56f2cbb7..c4bfeed8c88d 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -1,24 +1,28 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }:
+{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, systemd, fetchpatch }:
 
-buildGoPackage rec {
-  version = "1.6.1";
+buildGoModule rec {
+  version = "2.0.0";
   pname = "grafana-loki";
-  goPackagePath = "github.com/grafana/loki";
-
-  doCheck = true;
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "grafana";
     repo = "loki";
-    sha256 = "0bakskzizazc5cd6km3n6facc5val5567zinnxg3yjy29xdi64ww";
+    sha256 = "09a0mqdmk754vigd1xqijzwazwrmfaqcgdr2c6dz25p7a65568hj";
   };
 
-  postPatch = ''
-    substituteInPlace pkg/distributor/distributor_test.go --replace \
-      '"eth0", "en0", "lo0"' \
-      '"lo"'
-  '';
+  vendorSha256 = null;
+
+  subPackages = [ "..." ];
+
+  patches = [
+    (fetchpatch {
+      # Fix expected return value in Test_validateDropConfig
+      # https://github.com/grafana/loki/issues/2519
+      url = "https://github.com/grafana/loki/commit/1316c0f0c5cda7c272c4873ea910211476fc1db8.patch";
+      sha256 = "06hwga58qpmivbhyjgyqzb75602hy8212a4b5vh99y9pnn6c913h";
+    })
+  ];
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ];
@@ -28,6 +32,8 @@ buildGoPackage rec {
       --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"
   '';
 
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "Like Prometheus, but for logs";
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a81c1fcf146..09687d62f7c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16565,9 +16565,7 @@ in
 
   grafana = callPackage ../servers/monitoring/grafana { };
 
-  grafana-loki = callPackage ../servers/monitoring/loki {
-    buildGoPackage = buildGo114Package;
-  };
+  grafana-loki = callPackage ../servers/monitoring/loki { };
 
   grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { };
 

From e37914988735833d5b7d6152d5f9940fc142a3b8 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Wed, 28 Oct 2020 20:18:16 -0400
Subject: [PATCH 0567/3942] nanopb: 0.4.1 -> 0.4.3

Upstream changes allow us to remove most of the hacks from the package.
---
 pkgs/development/libraries/nanopb/default.nix | 36 ++++++-------------
 .../libraries/nanopb/protoc-gen-nanopb        |  3 --
 2 files changed, 10 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/nanopb/protoc-gen-nanopb

diff --git a/pkgs/development/libraries/nanopb/default.nix b/pkgs/development/libraries/nanopb/default.nix
index cafc5c85f21a..b90a8ba13aae 100644
--- a/pkgs/development/libraries/nanopb/default.nix
+++ b/pkgs/development/libraries/nanopb/default.nix
@@ -7,20 +7,20 @@
 , stdenv
 }:
 
-let
-  pythonRuntime = python3.withPackages(ps: [ ps.protobuf ]);
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "nanopb";
-  version = "0.4.1";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "16zxk42wzn519bpxf4578qn97k0h1cnbkvqqkqvka9sl0n3lz2dp";
+    sha256 = "sha256-32YU6LfPojvEVA2Z3DRZdGzDkSpAUgo1BueC/pl9qlY=";
   };
 
-  nativeBuildInputs = [ cmake python3 ];
+  nativeBuildInputs = [ cmake python3 python3.pkgs.wrapPython ];
+
+  pythonPath = with python3.pkgs; [ python3.pkgs.protobuf six ];
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,}
@@ -28,32 +28,16 @@ in stdenv.mkDerivation rec {
     "-Dnanopb_PROTOC_PATH=${protobuf}/bin/protoc"
   ];
 
-  # On a case-insensitive filesystem (such as on Darwin), CMake fails to create
-  # the build directory because of the existence of the BUILD file.
-  # TODO: This can be removed once https://github.com/nanopb/nanopb/pull/537 is merged.
-  preConfigure = "rm BUILD";
-
-  # install the generator which requires Python3 with the protobuf package. It
-  # also requires the nanopb module that's generated by CMake to be in a
-  # relative location to the generator itself so we move it out of the
-  # python.sitePackages into the shared generator folder.
   postInstall = ''
     mkdir -p $out/share/nanopb/generator/proto
-    cp ../generator/nanopb_generator.py $out/share/nanopb/generator/nanopb_generator.py
-    cp ../generator/proto/_utils.py $out/share/nanopb/generator/proto/_utils.py
     cp ../generator/proto/nanopb.proto $out/share/nanopb/generator/proto/nanopb.proto
-    mv $out/${python3.sitePackages}/nanopb_pb2.py $out/share/nanopb/generator/proto
-    rm -rf $out/${python3.sitePackages}
-
-    mkdir $out/bin
-    substitute ${./protoc-gen-nanopb} $out/bin/protoc-gen-nanopb \
-      --subst-var-by python ${pythonRuntime}/bin/python \
-      --subst-var-by out $out
-    chmod +x $out/bin/protoc-gen-nanopb
-
     cp ../pb_common.c ../pb_decode.c ../pb_encode.c $out/include/
   '';
 
+  postFixup = ''
+    wrapPythonPrograms
+  '';
+
   passthru.tests = {
     simple-proto2 = callPackage ./test-simple-proto2 {};
     simple-proto3 = callPackage ./test-simple-proto3 {};
diff --git a/pkgs/development/libraries/nanopb/protoc-gen-nanopb b/pkgs/development/libraries/nanopb/protoc-gen-nanopb
deleted file mode 100644
index 764e6614b18a..000000000000
--- a/pkgs/development/libraries/nanopb/protoc-gen-nanopb
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-exec @python@ @out@/share/nanopb/generator/nanopb_generator.py --protoc-plugin

From 322aaa9b19a0a7d09cf783c8e103dce508297bee Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 29 Oct 2020 04:20:00 +0000
Subject: [PATCH 0568/3942] fraunces: init at 1.000

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

diff --git a/pkgs/data/fonts/fraunces/default.nix b/pkgs/data/fonts/fraunces/default.nix
new file mode 100644
index 000000000000..d5879d6c2bc4
--- /dev/null
+++ b/pkgs/data/fonts/fraunces/default.nix
@@ -0,0 +1,25 @@
+{ lib, fetchzip }:
+let
+  version = "1.000";
+in
+fetchzip {
+  name = "fraunces-${version}";
+
+  url = "https://github.com/undercasetype/Fraunces/releases/download/${version}/UnderCaseType_Fraunces_${version}.zip";
+
+  sha256 = "0qgl140qkn9p87x7pk60fd3lj206y5h0fq2xkcj2qiv3sxbqxwqb";
+
+  postFetch = ''
+    mkdir -p $out/share/fonts/
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
+  '';
+
+  meta = with lib; {
+    description = "A display, “Old Style” soft-serif typeface inspired by early 20th century typefaces";
+    homepage = "https://github.com/undercasetype/Fraunces";
+    license = licenses.ofl;
+    maintainers = [ maintainers.marsam ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6269c16b5cf7..46a50d77412d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19183,6 +19183,8 @@ in
   font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5;
   font-awesome = font-awesome_5;
 
+  fraunces = callPackage ../data/fonts/fraunces { };
+
   freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
 
   freepats = callPackage ../data/misc/freepats { };

From 438a67de33a02724d995c33fd9d46c59305582f3 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Thu, 29 Oct 2020 15:38:47 +0800
Subject: [PATCH 0569/3942] electrum-ltc: enable hardware wallets

---
 pkgs/applications/misc/electrum/ltc.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index 2c6fb39fa433..7d6480b4696c 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -27,6 +27,8 @@ python3Packages.buildPythonApplication rec {
     dnspython
     jsonrpclib-pelix
     pysocks
+    trezor
+    btchip
   ];
 
   preBuild = ''

From 3b3fe0744d705a75bf36474b50f2566ee1e2a78b Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <sebastian.neubauer@amd.com>
Date: Thu, 29 Oct 2020 10:15:16 +0100
Subject: [PATCH 0570/3942] amdvlk: 2020.Q4.1 -> 2020.Q4.2

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

diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index 3e8c9a24a6ee..fdbff329c147 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -21,13 +21,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "amdvlk";
-  version = "2020.Q4.1";
+  version = "2020.Q4.2";
 
   src = fetchRepoProject {
     name = "${pname}-src";
     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
     rev = "refs/tags/v-${version}";
-    sha256 = "UxUsXngsMbLNSmg0a7gqCqw30ckZ8IlDrSZMMnKHlh4=";
+    sha256 = "qqP95+K8G9Z3Da1pUT9EGAUi83IM50qI9eZxpp7Vlqg=";
   };
 
   buildInputs = [

From 31fe90d6effeb480057b400a9d7bf976021626a0 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Tue, 13 Oct 2020 11:44:02 +0200
Subject: [PATCH 0571/3942] nixos/keycloak: Add test

---
 nixos/tests/all-tests.nix         |   1 +
 nixos/tests/keycloak.nix          | 139 ++++++++++++++++++++++++++++++
 pkgs/servers/keycloak/default.nix |   4 +-
 3 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/keycloak.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9ffeba27a7fe..5a10f60fc9a3 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -175,6 +175,7 @@ in
   kernel-latest = handleTest ./kernel-latest.nix {};
   kernel-lts = handleTest ./kernel-lts.nix {};
   kernel-testing = handleTest ./kernel-testing.nix {};
+  keycloak = handleTest ./keycloak.nix {};
   keymap = handleTest ./keymap.nix {};
   knot = handleTest ./knot.nix {};
   krb5 = discoverTests (import ./krb5 {});
diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix
new file mode 100644
index 000000000000..e5e31b038e9c
--- /dev/null
+++ b/nixos/tests/keycloak.nix
@@ -0,0 +1,139 @@
+# This tests Keycloak: it starts the service, creates a realm with an
+# OIDC client and a user, and simulates the user logging in to the
+# client using their Keycloak login.
+
+import ./make-test-python.nix (
+  { pkgs, ... }:
+  let
+    frontendUrl = "http://keycloak/auth";
+    initialAdminPassword = "h4IhoJFnt2iQIR9";
+  in
+    {
+      name = "keycloak";
+      meta = with pkgs.stdenv.lib.maintainers; {
+        maintainers = [ talyz ];
+      };
+
+      nodes = {
+        keycloak = { ... }: {
+          virtualisation.memorySize = 1024;
+          services.keycloak = {
+            enable = true;
+            inherit frontendUrl initialAdminPassword;
+            databasePasswordFile = pkgs.writeText "dbPassword" "wzf6vOCbPp6cqTH";
+          };
+          environment.systemPackages = with pkgs; [
+            xmlstarlet
+            libtidy
+            jq
+          ];
+        };
+      };
+
+      testScript =
+        let
+          client = {
+            clientId = "test-client";
+            name = "test-client";
+            redirectUris = [ "urn:ietf:wg:oauth:2.0:oob" ];
+          };
+
+          user = {
+            firstName = "Chuck";
+            lastName = "Testa";
+            username = "chuck.testa";
+            email = "chuck.testa@example.com";
+          };
+
+          password = "password1234";
+
+          realm = {
+            enabled = true;
+            realm = "test-realm";
+            clients = [ client ];
+            users = [(
+              user // {
+                enabled = true;
+                credentials = [{
+                  type = "password";
+                  temporary = false;
+                  value = password;
+                }];
+              }
+            )];
+          };
+
+          realmDataJson = pkgs.writeText "realm-data.json" (builtins.toJSON realm);
+
+          jqCheckUserinfo = pkgs.writeText "check-userinfo.jq" ''
+            if {
+              "firstName": .given_name,
+              "lastName": .family_name,
+              "username": .preferred_username,
+              "email": .email
+            } != ${builtins.toJSON user} then
+              error("Wrong user info!")
+            else
+              empty
+            end
+          '';
+        in ''
+          keycloak.start()
+          keycloak.wait_for_unit("keycloak.service")
+          keycloak.wait_until_succeeds("curl -sSf ${frontendUrl}")
+
+
+          ### Realm Setup ###
+
+          # Get an admin interface access token
+          keycloak.succeed(
+              "curl -sSf -d 'client_id=admin-cli' -d 'username=admin' -d 'password=${initialAdminPassword}' -d 'grant_type=password' '${frontendUrl}/realms/master/protocol/openid-connect/token' | jq -r '\"Authorization: bearer \" + .access_token' >admin_auth_header"
+          )
+
+          # Publish the realm, including a test OIDC client and user
+          keycloak.succeed(
+              "curl -sSf -H @admin_auth_header -X POST -H 'Content-Type: application/json' -d @${realmDataJson} '${frontendUrl}/admin/realms/'"
+          )
+
+          # Generate and save the client secret. To do this we need
+          # Keycloak's internal id for the client.
+          keycloak.succeed(
+              "curl -sSf -H @admin_auth_header '${frontendUrl}/admin/realms/${realm.realm}/clients?clientId=${client.name}' | jq -r '.[].id' >client_id",
+              "curl -sSf -H @admin_auth_header -X POST '${frontendUrl}/admin/realms/${realm.realm}/clients/'$(<client_id)'/client-secret' | jq -r .value >client_secret",
+          )
+
+
+          ### Authentication Testing ###
+
+          # Start the login process by sending an initial request to the
+          # OIDC authentication endpoint, saving the returned page. Tidy
+          # up the HTML (XmlStarlet is picky) and extract the login form
+          # post url.
+          keycloak.succeed(
+              "curl -sSf -c cookie '${frontendUrl}/realms/${realm.realm}/protocol/openid-connect/auth?client_id=${client.name}&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&scope=openid+email&response_type=code&response_mode=query&nonce=qw4o89g3qqm' >login_form",
+              "tidy -q -m login_form || true",
+              "xml sel -T -t -m \"_:html/_:body/_:div/_:div/_:div/_:div/_:div/_:div/_:form[@id='kc-form-login']\" -v @action login_form >form_post_url",
+          )
+
+          # Post the login form and save the response. Once again tidy up
+          # the HTML, then extract the authorization code.
+          keycloak.succeed(
+              "curl -sSf -L -b cookie -d 'username=${user.username}' -d 'password=${password}' -d 'credentialId=' \"$(<form_post_url)\" >auth_code_html",
+              "tidy -q -m auth_code_html || true",
+              "xml sel -T -t -m \"_:html/_:body/_:div/_:div/_:div/_:div/_:div/_:input[@id='code']\" -v @value auth_code_html >auth_code",
+          )
+
+          # Exchange the authorization code for an access token.
+          keycloak.succeed(
+              "curl -sSf -d grant_type=authorization_code -d code=$(<auth_code) -d client_id=${client.name} -d client_secret=$(<client_secret) -d redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob '${frontendUrl}/realms/${realm.realm}/protocol/openid-connect/token' | jq -r '\"Authorization: bearer \" + .access_token' >auth_header"
+          )
+
+          # Use the access token on the OIDC userinfo endpoint and check
+          # that the returned user info matches what we initialized the
+          # realm with.
+          keycloak.succeed(
+              "curl -sSf -H @auth_header '${frontendUrl}/realms/${realm.realm}/protocol/openid-connect/userinfo' | jq -f ${jqCheckUserinfo}"
+          )
+        '';
+    }
+)
diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
index c694b6a419f5..95935ce8f8ae 100644
--- a/pkgs/servers/keycloak/default.nix
+++ b/pkgs/servers/keycloak/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, makeWrapper, jre, writeText
+{ stdenv, fetchzip, makeWrapper, jre, writeText, nixosTests
 , postgresql_jdbc ? null
 }:
 
@@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/jboss-cli.sh --set JAVA_HOME ${jre}
   '';
 
+  passthru.tests = nixosTests.keycloak;
+
   meta = with stdenv.lib; {
     homepage    = "https://www.keycloak.org/";
     description = "Identity and access management for modern applications and services";

From fe5a16aee67d20cea73bf2ec862fdde2a7524859 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Thu, 15 Oct 2020 18:36:37 +0200
Subject: [PATCH 0572/3942] nixos/keycloak: Document internal functions

---
 nixos/modules/services/web-apps/keycloak.nix | 102 +++++++++++++++++++
 1 file changed, 102 insertions(+)

diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix
index 766df48d55fb..c1020690299e 100644
--- a/nixos/modules/services/web-apps/keycloak.nix
+++ b/nixos/modules/services/web-apps/keycloak.nix
@@ -244,10 +244,88 @@ in
         cfg.extraConfig
       ];
 
+
+      /* Produces a JBoss CLI script that creates paths and sets
+         attributes matching those described by `attrs`. When the
+         script is run, the existing settings are effectively overlayed
+         by those from `attrs`. Existing attributes can be unset by
+         defining them `null`.
+
+         JBoss paths and attributes / maps are distinguished by their
+         name, where paths follow a `key=value` scheme.
+
+         Example:
+           mkJbossScript {
+             "subsystem=keycloak-server"."spi=hostname" = {
+               "provider=fixed" = null;
+               "provider=default" = {
+                 enabled = true;
+                 properties = {
+                   inherit frontendUrl;
+                   forceBackendUrlToFrontendUrl = false;
+                 };
+               };
+             };
+           }
+           => ''
+             if (outcome != success) of /:read-resource()
+                 /:add()
+             end-if
+             if (outcome != success) of /subsystem=keycloak-server:read-resource()
+                 /subsystem=keycloak-server:add()
+             end-if
+             if (outcome != success) of /subsystem=keycloak-server/spi=hostname:read-resource()
+                 /subsystem=keycloak-server/spi=hostname:add()
+             end-if
+             if (outcome != success) of /subsystem=keycloak-server/spi=hostname/provider=default:read-resource()
+                 /subsystem=keycloak-server/spi=hostname/provider=default:add(enabled = true, properties = { forceBackendUrlToFrontendUrl = false, frontendUrl = "https://keycloak.example.com/auth" })
+             end-if
+             if (result != true) of /subsystem=keycloak-server/spi=hostname/provider=default:read-attribute(name="enabled")
+               /subsystem=keycloak-server/spi=hostname/provider=default:write-attribute(name=enabled, value=true)
+             end-if
+             if (result != false) of /subsystem=keycloak-server/spi=hostname/provider=default:read-attribute(name="properties.forceBackendUrlToFrontendUrl")
+               /subsystem=keycloak-server/spi=hostname/provider=default:write-attribute(name=properties.forceBackendUrlToFrontendUrl, value=false)
+             end-if
+             if (result != "https://keycloak.example.com/auth") of /subsystem=keycloak-server/spi=hostname/provider=default:read-attribute(name="properties.frontendUrl")
+               /subsystem=keycloak-server/spi=hostname/provider=default:write-attribute(name=properties.frontendUrl, value="https://keycloak.example.com/auth")
+             end-if
+             if (outcome != success) of /subsystem=keycloak-server/spi=hostname/provider=fixed:read-resource()
+                 /subsystem=keycloak-server/spi=hostname/provider=fixed:remove()
+             end-if
+           ''
+      */
       mkJbossScript = attrs:
         let
+          /* From a JBoss path and an attrset, produces a JBoss CLI
+             snippet that writes the corresponding attributes starting
+             at `path`. Recurses down into subattrsets as necessary,
+             producing the variable name from its full path in the
+             attrset.
+
+             Example:
+               writeAttributes "/subsystem=keycloak-server/spi=hostname/provider=default" {
+                 enabled = true;
+                 properties = {
+                   forceBackendUrlToFrontendUrl = false;
+                   frontendUrl = "https://keycloak.example.com/auth";
+                 };
+               }
+               => ''
+                 if (result != true) of /subsystem=keycloak-server/spi=hostname/provider=default:read-attribute(name="enabled")
+                   /subsystem=keycloak-server/spi=hostname/provider=default:write-attribute(name=enabled, value=true)
+                 end-if
+                 if (result != false) of /subsystem=keycloak-server/spi=hostname/provider=default:read-attribute(name="properties.forceBackendUrlToFrontendUrl")
+                   /subsystem=keycloak-server/spi=hostname/provider=default:write-attribute(name=properties.forceBackendUrlToFrontendUrl, value=false)
+                 end-if
+                 if (result != "https://keycloak.example.com/auth") of /subsystem=keycloak-server/spi=hostname/provider=default:read-attribute(name="properties.frontendUrl")
+                   /subsystem=keycloak-server/spi=hostname/provider=default:write-attribute(name=properties.frontendUrl, value="https://keycloak.example.com/auth")
+                 end-if
+               ''
+          */
           writeAttributes = path: set:
             let
+              # JBoss expressions like `${var}` need to be prefixed
+              # with `expression` to evaluate.
               prefixExpression = string:
                 let
                   match = (builtins.match ''"\$\{.*}"'' string);
@@ -286,6 +364,23 @@ in
                   (attribute: value: (writeAttribute attribute value))
                   set);
 
+
+          /* Produces an argument list for the JBoss `add()` function,
+             which adds a JBoss path and takes as its arguments the
+             required subpaths and attributes.
+
+             Example:
+               makeArgList {
+                 enabled = true;
+                 properties = {
+                   forceBackendUrlToFrontendUrl = false;
+                   frontendUrl = "https://keycloak.example.com/auth";
+                 };
+               }
+               => ''
+                 enabled = true, properties = { forceBackendUrlToFrontendUrl = false, frontendUrl = "https://keycloak.example.com/auth" }
+               ''
+          */
           makeArgList = set:
             let
               makeArg = attribute: value:
@@ -303,6 +398,13 @@ in
             in
               lib.concatStringsSep ", " (lib.mapAttrsToList makeArg set);
 
+
+          /* Recurses into the `attrs` attrset, beginning at the path
+             resolved from `state.path ++ node`; if `node` is `null`,
+             starts from `state.path`. Only subattrsets that are JBoss
+             paths, i.e. follows the `key=value` format, are recursed
+             into - the rest are considered JBoss attributes / maps.
+          */
           recurse = state: node:
             let
               path = state.path ++ (lib.optional (node != null) node);

From c6e4388449a108ed5dcc64315111edb8d0f33cb5 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Mon, 19 Oct 2020 11:53:55 +0200
Subject: [PATCH 0573/3942] nixos/keycloak: Add documentation

---
 nixos/modules/services/web-apps/keycloak.nix |   2 +
 nixos/modules/services/web-apps/keycloak.xml | 190 +++++++++++++++++++
 2 files changed, 192 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/keycloak.xml

diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix
index c1020690299e..9c6a5ca305cb 100644
--- a/nixos/modules/services/web-apps/keycloak.nix
+++ b/nixos/modules/services/web-apps/keycloak.nix
@@ -564,4 +564,6 @@ in
 
         services.postgresql.enable = lib.mkDefault databaseActuallyCreateLocally;
       };
+
+  meta.doc = ./keycloak.xml;
 }
diff --git a/nixos/modules/services/web-apps/keycloak.xml b/nixos/modules/services/web-apps/keycloak.xml
new file mode 100644
index 000000000000..6b97d48e0bd8
--- /dev/null
+++ b/nixos/modules/services/web-apps/keycloak.xml
@@ -0,0 +1,190 @@
+<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-keycloak">
+ <title>Keycloak</title>
+ <para>
+   <link xlink:href="https://www.keycloak.org/">Keycloak</link> is an
+   open source identity and access management server with support for
+   <link xlink:href="https://openid.net/connect/">OpenID
+   Connect</link>, <link xlink:href="https://oauth.net/2/">OAUTH
+   2.0</link> and <link
+   xlink:href="https://en.wikipedia.org/wiki/SAML_2.0">SAML
+   2.0</link>.
+ </para>
+   <section xml:id="module-services-keycloak-admin">
+     <title>Administration</title>
+     <para>
+       An administrative user with the username
+       <literal>admin</literal> is automatically created in the
+       <literal>master</literal> realm. Its initial password can be
+       configured by setting <xref linkend="opt-services.keycloak.initialAdminPassword" />
+       and defaults to <literal>changeme</literal>. The password is
+       not stored safely and should be changed immediately in the
+       admin panel.
+     </para>
+
+     <para>
+       Refer to the <link
+       xlink:href="https://www.keycloak.org/docs/latest/server_admin/index.html#admin-console">Admin
+       Console section of the Keycloak Server Administration Guide</link> for
+       information on how to administer your
+       <productname>Keycloak</productname> instance.
+     </para>
+   </section>
+
+   <section xml:id="module-services-keycloak-database">
+     <title>Database access</title>
+     <para>
+       <productname>Keycloak</productname> depends on
+       <productname>PostgreSQL</productname> and will automatically
+       enable it and create a database and role unless configured not
+       to, either by changing <xref linkend="opt-services.keycloak.databaseHost" />
+       from its default of <literal>localhost</literal> or setting
+       <xref linkend="opt-services.keycloak.databaseCreateLocally" />
+       to <literal>false</literal>.
+     </para>
+
+     <para>
+       <xref linkend="opt-services.keycloak.databasePasswordFile" />
+       must be set to the path to a file containing the password used
+       to log in to the database. If <xref linkend="opt-services.keycloak.databaseHost" />
+       and <xref linkend="opt-services.keycloak.databaseCreateLocally" />
+       are kept at their defaults, the database role
+       <literal>keycloak</literal> with that password is provisioned
+       on the local database instance.
+     </para>
+
+     <warning>
+       <para>
+         The path should be provided as a string, not a Nix path, since Nix
+         paths are copied into the world readable Nix store.
+       </para>
+     </warning>
+   </section>
+
+   <section xml:id="module-services-keycloak-frontendurl">
+     <title>Frontend URL</title>
+     <para>
+       The frontend URL is used as base for all frontend requests and
+       must be configured through <xref linkend="opt-services.keycloak.frontendUrl" />.
+       It should normally include a trailing <literal>/auth</literal>
+       (the default web context).
+     </para>
+
+     <para>
+       <xref linkend="opt-services.keycloak.forceBackendUrlToFrontendUrl" />
+       determines whether Keycloak should force all requests to go
+       through the frontend URL. By default,
+       <productname>Keycloak</productname> allows backend requests to
+       instead use its local hostname or IP address and may also
+       advertise it to clients through its OpenID Connect Discovery
+       endpoint.
+     </para>
+
+     <para>
+       See the <link
+       xlink:href="https://www.keycloak.org/docs/latest/server_installation/#_hostname">Hostname
+       section of the Keycloak Server Installation and Configuration
+       Guide</link> for more information.
+     </para>
+   </section>
+
+   <section xml:id="module-services-keycloak-tls">
+     <title>Setting up TLS/SSL</title>
+     <para>
+       By default, <productname>Keycloak</productname> won't accept
+       unsecured HTTP connections originating from outside its local
+       network.
+     </para>
+
+     <para>
+       For HTTPS support, a TLS certificate and private key is
+       required. They should be <link
+       xlink:href="https://en.wikipedia.org/wiki/Privacy-Enhanced_Mail">PEM
+       formatted</link> and concatenated into a single file. The path
+       to this file should be configured in
+       <xref linkend="opt-services.keycloak.certificatePrivateKeyBundle" />.
+     </para>
+
+     <warning>
+       <para>
+         The path should be provided as a string, not a Nix path,
+         since Nix paths are copied into the world readable Nix store.
+       </para>
+     </warning>
+   </section>
+
+   <section xml:id="module-services-keycloak-extra-config">
+     <title>Additional configuration</title>
+     <para>
+       Additional Keycloak configuration options, for which no
+       explicit <productname>NixOS</productname> options are provided,
+       can be set in <xref linkend="opt-services.keycloak.extraConfig" />.
+     </para>
+
+     <para>
+       Options are expressed as a Nix attribute set which matches the
+       structure of the jboss-cli configuration. The configuration is
+       effectively overlayed on top of the default configuration
+       shipped with Keycloak. To remove existing nodes and undefine
+       attributes from the default configuration, set them to
+       <literal>null</literal>.
+     </para>
+     <para>
+       For example, the following script, which removes the hostname
+       provider <literal>default</literal>, adds the deprecated
+       hostname provider <literal>fixed</literal> and defines it the
+       default:
+
+<programlisting>
+/subsystem=keycloak-server/spi=hostname/provider=default:remove()
+/subsystem=keycloak-server/spi=hostname/provider=fixed:add(enabled = true, properties = { hostname = "keycloak.example.com" })
+/subsystem=keycloak-server/spi=hostname:write-attribute(name=default-provider, value="fixed")
+</programlisting>
+
+       would be expressed as
+
+<programlisting>
+services.keycloak.extraConfig = {
+  "subsystem=keycloak-server" = {
+    "spi=hostname" = {
+      "provider=default" = null;
+      "provider=fixed" = {
+        enabled = true;
+        properties.hostname = "keycloak.example.com";
+      };
+      default-provider = "fixed";
+    };
+  };
+};
+</programlisting>
+     </para>
+     <para>
+       You can discover available options by using the <link
+       xlink:href="http://docs.wildfly.org/21/Admin_Guide.html#Command_Line_Interface">jboss-cli.sh</link>
+       program and by referring to the <link
+       xlink:href="https://www.keycloak.org/docs/latest/server_installation/index.html">Keycloak
+       Server Installation and Configuration Guide</link>.
+     </para>
+   </section>
+
+   <section xml:id="module-services-keycloak-example-config">
+     <title>Example configuration</title>
+     <para>
+       A basic configuration with some custom settings could look like this:
+<programlisting>
+services.keycloak = {
+  <link linkend="opt-services.keycloak.enable">enable</link> = true;
+  <link linkend="opt-services.keycloak.initialAdminPassword">initialAdminPassword</link> = "e6Wcm0RrtegMEHl";  # change on first login
+  <link linkend="opt-services.keycloak.frontendUrl">frontendUrl</link> = "https://keycloak.example.com/auth";
+  <link linkend="opt-services.keycloak.forceBackendUrlToFrontendUrl">forceBackendUrlToFrontendUrl</link> = true;
+  <link linkend="opt-services.keycloak.certificatePrivateKeyBundle">certificatePrivateKeyBundle</link> = "/run/keys/ssl_cert";
+  <link linkend="opt-services.keycloak.databasePasswordFile">databasePasswordFile</link> = "/run/keys/db_password";
+};
+</programlisting>
+     </para>
+
+   </section>
+ </chapter>

From d1d3c86c70cad38944f50f7be544326133fff292 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Fri, 23 Oct 2020 17:01:10 +0200
Subject: [PATCH 0574/3942] rl-2103: Note the addition of the Keycloak service

---
 nixos/doc/manual/release-notes/rl-2103.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index c160ab5783d3..76019e00dbec 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -39,7 +39,19 @@
 
   <itemizedlist>
    <listitem>
-    <para />
+     <para>
+       <link xlink:href="https://www.keycloak.org/">Keycloak</link>,
+       an open source identity and access management server with
+       support for <link
+       xlink:href="https://openid.net/connect/">OpenID Connect</link>,
+       <link xlink:href="https://oauth.net/2/">OAUTH 2.0</link> and
+       <link xlink:href="https://en.wikipedia.org/wiki/SAML_2.0">SAML
+       2.0</link>.
+     </para>
+     <para>
+       See the <link linkend="module-services-keycloak">Keycloak
+       section of the NixOS manual</link> for more information.
+     </para>
    </listitem>
   </itemizedlist>
 

From cb28da0a0ca6681a63bd1a785051cae2bac8fb36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 11:12:50 +0000
Subject: [PATCH 0575/3942] checksec: 2.2.3 -> 2.4.0

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

diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
index 5a66e536956f..eb33aedd1d49 100644
--- a/pkgs/os-specific/linux/checksec/default.nix
+++ b/pkgs/os-specific/linux/checksec/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "checksec";
-  version = "2.2.3";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "slimm609";
     repo = "checksec.sh";
     rev = version;
-    sha256 = "0hw8bd7dj71m1ml9zvfab2j87jacs542z7a89nziapckmg6kmh6f";
+    sha256 = "1gbbq85d3g3mnm3xvgvi2085aba7qc3cmsbwn76al50ax1518j2q";
   };
 
   patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ];

From a4bcdfb37786238d31f91cbba7b5d6bb5938faa7 Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Sun, 5 Jul 2020 09:47:18 +0800
Subject: [PATCH 0576/3942] vimPlugins.MatchTagAlways: init at 2017-05-20

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index ded185a30e77..ce6323c6c497 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1990,6 +1990,18 @@ let
     meta.homepage = "https://github.com/vim-scripts/matchit.zip/";
   };
 
+  MatchTagAlways = buildVimPluginFrom2Nix {
+    pname = "MatchTagAlways";
+    version = "2017-05-20";
+    src = fetchFromGitHub {
+      owner = "Valloric";
+      repo = "MatchTagAlways";
+      rev = "352eb479a4ad1608e0880b79ab2357aac2cf4bed";
+      sha256 = "0y8gq4cs0wm2ijagc2frpmm664z355iridxyl5893576v5aqp8z1";
+    };
+    meta.homepage = "https://github.com/Valloric/MatchTagAlways/";
+  };
+
   mattn-calendar-vim = buildVimPluginFrom2Nix {
     pname = "mattn-calendar-vim";
     version = "2019-11-24";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0d0eec878e08..ef1c22dee699 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -548,6 +548,7 @@ udalov/kotlin-vim
 ujihisa/neco-look
 unblevable/quick-scope
 urbit/hoon.vim
+Valloric/MatchTagAlways
 Valodim/deoplete-notmuch
 vhda/verilog_systemverilog.vim
 vim-airline/vim-airline

From 82b35843255a7694921b36cf157cf152dd5dd5c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 11:37:49 +0000
Subject: [PATCH 0577/3942] cloudflared: 2020.10.0 -> 2020.10.2

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

diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 47e2cc04b398..d61d32e40e95 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2020.10.0";
+  version = "2020.10.2";
 
   src = fetchFromGitHub {
     owner  = "cloudflare";
     repo   = "cloudflared";
     rev    = version;
-    sha256 = "1ssmyll13pf19fxq34iw4x7ps8p4mcg9nwlx00hp5sahhwx4iz01";
+    sha256 = "0ppl74gb46r2x65hl7z1hjdqlr8la0pvhy8af8isk11sbxmprqjj";
   };
 
   vendorSha256 = null;

From 89e83833af35bd0ec3fdc65c435358a676a41d89 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Mon, 26 Oct 2020 15:33:57 +0100
Subject: [PATCH 0578/3942] nixos/keycloak: Add support for MySQL and external
 DBs with SSL

- Add support for using MySQL as an option to PostgreSQL.
- Enable connecting to external DBs with SSL
- Add a database port config option
---
 nixos/modules/services/web-apps/keycloak.nix | 265 ++++++++++++++-----
 nixos/modules/services/web-apps/keycloak.xml |  27 +-
 nixos/tests/all-tests.nix                    |   2 +-
 nixos/tests/keycloak.nix                     |  21 +-
 pkgs/servers/keycloak/default.nix            |  23 +-
 5 files changed, 243 insertions(+), 95 deletions(-)

diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix
index 9c6a5ca305cb..bbb0c8d04831 100644
--- a/nixos/modules/services/web-apps/keycloak.nix
+++ b/nixos/modules/services/web-apps/keycloak.nix
@@ -97,11 +97,59 @@ in
       '';
     };
 
+    databaseType = lib.mkOption {
+      type = lib.types.enum [ "mysql" "postgresql" ];
+      default = "postgresql";
+      example = "mysql";
+      description = ''
+        The type of database Keycloak should connect to.
+      '';
+    };
+
     databaseHost = lib.mkOption {
       type = lib.types.str;
       default = "localhost";
       description = ''
-        Hostname of the PostgreSQL database to connect to.
+        Hostname of the database to connect to.
+      '';
+    };
+
+    databasePort =
+      let
+        dbPorts = {
+          postgresql = 5432;
+          mysql = 3306;
+        };
+      in
+        lib.mkOption {
+          type = lib.types.port;
+          default = dbPorts.${cfg.databaseType};
+          description = ''
+            Port of the database to connect to.
+          '';
+        };
+
+    databaseUseSSL = lib.mkOption {
+      type = lib.types.bool;
+      default = cfg.databaseHost != "localhost";
+      description = ''
+        Whether the database connection should be secured by SSL /
+        TLS.
+      '';
+    };
+
+    databaseCaCert = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      default = null;
+      description = ''
+        The SSL / TLS CA certificate that verifies the identity of the
+        database server.
+
+        Required when PostgreSQL is used and SSL is turned on.
+
+        For MySQL, if left at <literal>null</literal>, the default
+        Java keystore is used, which should suffice if the server
+        certificate is issued by an official CA.
       '';
     };
 
@@ -208,6 +256,12 @@ in
     let
       # We only want to create a database if we're actually going to connect to it.
       databaseActuallyCreateLocally = cfg.databaseCreateLocally && cfg.databaseHost == "localhost";
+      createLocalPostgreSQL = databaseActuallyCreateLocally && cfg.databaseType == "postgresql";
+      createLocalMySQL = databaseActuallyCreateLocally && cfg.databaseType == "mysql";
+
+      mySqlCaKeystore = pkgs.runCommandNoCC "mysql-ca-keystore" {} ''
+        ${pkgs.jre}/bin/keytool -importcert -trustcacerts -alias MySQLCACert -file ${cfg.databaseCaCert} -keystore $out -storepass notsosecretpassword -noprompt
+      '';
 
       keycloakConfig' = builtins.foldl' lib.recursiveUpdate {
         "interface=public".inet-address = cfg.bindAddress;
@@ -220,19 +274,52 @@ in
             };
           };
         };
-        "subsystem=datasources"."jdbc-driver=postgresql" = {
-          driver-module-name = "org.postgresql";
-          driver-name = "postgresql";
-          driver-xa-datasource-class-name = "org.postgresql.xa.PGXADataSource";
-        };
         "subsystem=datasources"."data-source=KeycloakDS" = {
-          connection-url = "jdbc:postgresql://${cfg.databaseHost}/keycloak";
-          driver-name = "postgresql";
           max-pool-size = "20";
           user-name = if databaseActuallyCreateLocally then "keycloak" else cfg.databaseUsername;
           password = "@db-password@";
         };
       } [
+        (lib.optionalAttrs (cfg.databaseType == "postgresql") {
+          "subsystem=datasources" = {
+            "jdbc-driver=postgresql" = {
+              driver-module-name = "org.postgresql";
+              driver-name = "postgresql";
+              driver-xa-datasource-class-name = "org.postgresql.xa.PGXADataSource";
+            };
+            "data-source=KeycloakDS" = {
+              connection-url = "jdbc:postgresql://${cfg.databaseHost}:${builtins.toString cfg.databasePort}/keycloak";
+              driver-name = "postgresql";
+              "connection-properties=ssl".value = lib.boolToString cfg.databaseUseSSL;
+            } // (lib.optionalAttrs (cfg.databaseCaCert != null) {
+              "connection-properties=sslrootcert".value = cfg.databaseCaCert;
+              "connection-properties=sslmode".value = "verify-ca";
+            });
+          };
+        })
+        (lib.optionalAttrs (cfg.databaseType == "mysql") {
+          "subsystem=datasources" = {
+            "jdbc-driver=mysql" = {
+              driver-module-name = "com.mysql";
+              driver-name = "mysql";
+              driver-class-name = "com.mysql.jdbc.Driver";
+            };
+            "data-source=KeycloakDS" = {
+              connection-url = "jdbc:mysql://${cfg.databaseHost}:${builtins.toString cfg.databasePort}/keycloak";
+              driver-name = "mysql";
+              "connection-properties=useSSL".value = lib.boolToString cfg.databaseUseSSL;
+              "connection-properties=requireSSL".value = lib.boolToString cfg.databaseUseSSL;
+              "connection-properties=verifyServerCertificate".value = lib.boolToString cfg.databaseUseSSL;
+              "connection-properties=characterEncoding".value = "UTF-8";
+              valid-connection-checker-class-name = "org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker";
+              validate-on-match = true;
+              exception-sorter-class-name = "org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter";
+            } // (lib.optionalAttrs (cfg.databaseCaCert != null) {
+              "connection-properties=trustCertificateKeyStoreUrl".value = "file:${mySqlCaKeystore}";
+              "connection-properties=trustCertificateKeyStorePassword".value = "notsosecretpassword";
+            });
+          };
+        })
         (lib.optionalAttrs (cfg.certificatePrivateKeyBundle != null) {
           "socket-binding-group=standard-sockets"."socket-binding=https".port = cfg.httpsPort;
           "core-service=management"."security-realm=UndertowRealm"."server-identity=ssl" = {
@@ -444,7 +531,7 @@ in
 
       jbossCliScript = pkgs.writeText "jboss-cli-script" (mkJbossScript keycloakConfig');
 
-      keycloakConfig = pkgs.runCommand "keycloak-config" {} ''
+      keycloakConfig = pkgs.runCommandNoCC "keycloak-config" {} ''
         export JBOSS_BASE_DIR="$(pwd -P)";
         export JBOSS_MODULEPATH="${cfg.package}/modules";
         export JBOSS_LOG_DIR="$JBOSS_BASE_DIR/log";
@@ -475,9 +562,16 @@ in
     in
       lib.mkIf cfg.enable {
 
+        assertions = [
+          {
+            assertion = (cfg.databaseUseSSL && cfg.databaseType == "postgresql") -> (cfg.databaseCaCert != null);
+            message = ''A CA certificate must be specified (in 'services.keycloak.databaseCaCert') when PostgreSQL is used with SSL'';
+          }
+        ];
+
         environment.systemPackages = [ cfg.package ];
 
-        systemd.services.keycloakDatabaseInit = lib.mkIf databaseActuallyCreateLocally {
+        systemd.services.keycloakPostgreSQLInit = lib.mkIf createLocalPostgreSQL {
           after = [ "postgresql.service" ];
           before = [ "keycloak.service" ];
           bindsTo = [ "postgresql.service" ];
@@ -498,71 +592,100 @@ in
           '';
         };
 
-        systemd.services.keycloak = {
-          after = lib.optionals databaseActuallyCreateLocally [
-            "keycloakDatabaseInit.service" "postgresql.service"
-          ];
-          bindsTo = lib.optionals databaseActuallyCreateLocally [
-            "keycloakDatabaseInit.service" "postgresql.service"
-          ];
-          wantedBy = [ "multi-user.target" ];
-          environment = {
-            JBOSS_LOG_DIR = "/var/log/keycloak";
-            JBOSS_BASE_DIR = "/run/keycloak";
-            JBOSS_MODULEPATH = "${cfg.package}/modules";
-          };
+        systemd.services.keycloakMySQLInit = lib.mkIf createLocalMySQL {
+          after = [ "mysql.service" ];
+          before = [ "keycloak.service" ];
+          bindsTo = [ "mysql.service" ];
           serviceConfig = {
-            ExecStartPre = let
-              startPreFullPrivileges = ''
-                set -eu
-
-                install -T -m 0400 -o keycloak -g keycloak '${cfg.databasePasswordFile}' /run/keycloak/secrets/db_password
-              '' + lib.optionalString (cfg.certificatePrivateKeyBundle != null) ''
-                install -T -m 0400 -o keycloak -g keycloak '${cfg.certificatePrivateKeyBundle}' /run/keycloak/secrets/ssl_cert_pk_bundle
-              '';
-              startPre = ''
-                set -eu
-
-                install -m 0600 ${cfg.package}/standalone/configuration/*.properties /run/keycloak/configuration
-                install -T -m 0600 ${keycloakConfig} /run/keycloak/configuration/standalone.xml
-
-                db_password="$(</run/keycloak/secrets/db_password)"
-                ${pkgs.replace}/bin/replace-literal -fe '@db-password@' "$db_password" /run/keycloak/configuration/standalone.xml
-
-                export JAVA_OPTS=-Djboss.server.config.user.dir=/run/keycloak/configuration
-                ${cfg.package}/bin/add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}'
-              '' + lib.optionalString (cfg.certificatePrivateKeyBundle != null) ''
-                pushd /run/keycloak/ssl/
-                cat /run/keycloak/secrets/ssl_cert_pk_bundle <(echo) /etc/ssl/certs/ca-certificates.crt > allcerts.pem
-                ${pkgs.openssl}/bin/openssl pkcs12 -export -in /run/keycloak/secrets/ssl_cert_pk_bundle -chain \
-                                                   -name "${cfg.frontendUrl}" -out certificate_private_key_bundle.p12 \
-                                                   -CAfile allcerts.pem -passout pass:notsosecretpassword
-                popd
-              '';
-            in [
-              "+${pkgs.writeShellScript "keycloak-start-pre-full-privileges" startPreFullPrivileges}"
-              "${pkgs.writeShellScript "keycloak-start-pre" startPre}"
-            ];
-            ExecStart = "${cfg.package}/bin/standalone.sh";
-            User = "keycloak";
-            Group = "keycloak";
-            DynamicUser = true;
-            RuntimeDirectory = map (p: "keycloak/" + p) [
-              "secrets"
-              "configuration"
-              "deployments"
-              "data"
-              "ssl"
-              "log"
-              "tmp"
-            ];
-            RuntimeDirectoryMode = 0700;
-            LogsDirectory = "keycloak";
-            AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+            Type = "oneshot";
+            RemainAfterExit = true;
+            User = config.services.mysql.user;
+            Group = config.services.mysql.group;
           };
+          script = ''
+            set -eu
+
+            db_password="$(<'${cfg.databasePasswordFile}')"
+            ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';"
+              echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
+              echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';"
+            ) | ${config.services.mysql.package}/bin/mysql -N
+          '';
         };
 
-        services.postgresql.enable = lib.mkDefault databaseActuallyCreateLocally;
+        systemd.services.keycloak =
+          let
+            databaseServices =
+              if createLocalPostgreSQL then [
+                "keycloakPostgreSQLInit.service" "postgresql.service"
+              ]
+              else if createLocalMySQL then [
+                "keycloakMySQLInit.service" "mysql.service"
+              ]
+              else [ ];
+          in {
+            after = databaseServices;
+            bindsTo = databaseServices;
+            wantedBy = [ "multi-user.target" ];
+            environment = {
+              JBOSS_LOG_DIR = "/var/log/keycloak";
+              JBOSS_BASE_DIR = "/run/keycloak";
+              JBOSS_MODULEPATH = "${cfg.package}/modules";
+            };
+            serviceConfig = {
+              ExecStartPre = let
+                startPreFullPrivileges = ''
+                  set -eu
+
+                  install -T -m 0400 -o keycloak -g keycloak '${cfg.databasePasswordFile}' /run/keycloak/secrets/db_password
+                '' + lib.optionalString (cfg.certificatePrivateKeyBundle != null) ''
+                  install -T -m 0400 -o keycloak -g keycloak '${cfg.certificatePrivateKeyBundle}' /run/keycloak/secrets/ssl_cert_pk_bundle
+                '';
+                startPre = ''
+                  set -eu
+
+                  install -m 0600 ${cfg.package}/standalone/configuration/*.properties /run/keycloak/configuration
+                  install -T -m 0600 ${keycloakConfig} /run/keycloak/configuration/standalone.xml
+
+                  db_password="$(</run/keycloak/secrets/db_password)"
+                  ${pkgs.replace}/bin/replace-literal -fe '@db-password@' "$db_password" /run/keycloak/configuration/standalone.xml
+
+                  export JAVA_OPTS=-Djboss.server.config.user.dir=/run/keycloak/configuration
+                  ${cfg.package}/bin/add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}'
+                '' + lib.optionalString (cfg.certificatePrivateKeyBundle != null) ''
+                  pushd /run/keycloak/ssl/
+                  cat /run/keycloak/secrets/ssl_cert_pk_bundle <(echo) /etc/ssl/certs/ca-certificates.crt > allcerts.pem
+                  ${pkgs.openssl}/bin/openssl pkcs12 -export -in /run/keycloak/secrets/ssl_cert_pk_bundle -chain \
+                                                     -name "${cfg.frontendUrl}" -out certificate_private_key_bundle.p12 \
+                                                     -CAfile allcerts.pem -passout pass:notsosecretpassword
+                  popd
+                '';
+              in [
+                "+${pkgs.writeShellScript "keycloak-start-pre-full-privileges" startPreFullPrivileges}"
+                "${pkgs.writeShellScript "keycloak-start-pre" startPre}"
+              ];
+              ExecStart = "${cfg.package}/bin/standalone.sh";
+              User = "keycloak";
+              Group = "keycloak";
+              DynamicUser = true;
+              RuntimeDirectory = map (p: "keycloak/" + p) [
+                "secrets"
+                "configuration"
+                "deployments"
+                "data"
+                "ssl"
+                "log"
+                "tmp"
+              ];
+              RuntimeDirectoryMode = 0700;
+              LogsDirectory = "keycloak";
+              AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+            };
+          };
+
+        services.postgresql.enable = lib.mkDefault createLocalPostgreSQL;
+        services.mysql.enable = lib.mkDefault createLocalMySQL;
+        services.mysql.package = lib.mkIf createLocalMySQL pkgs.mysql;
       };
 
   meta.doc = ./keycloak.xml;
diff --git a/nixos/modules/services/web-apps/keycloak.xml b/nixos/modules/services/web-apps/keycloak.xml
index 6b97d48e0bd8..ca5e223eee46 100644
--- a/nixos/modules/services/web-apps/keycloak.xml
+++ b/nixos/modules/services/web-apps/keycloak.xml
@@ -37,15 +37,30 @@
    <section xml:id="module-services-keycloak-database">
      <title>Database access</title>
      <para>
-       <productname>Keycloak</productname> depends on
-       <productname>PostgreSQL</productname> and will automatically
-       enable it and create a database and role unless configured not
-       to, either by changing <xref linkend="opt-services.keycloak.databaseHost" />
-       from its default of <literal>localhost</literal> or setting
-       <xref linkend="opt-services.keycloak.databaseCreateLocally" />
+       <productname>Keycloak</productname> can be used with either
+       <productname>PostgreSQL</productname> or
+       <productname>MySQL</productname>. Which one is used can be
+       configured in <xref
+       linkend="opt-services.keycloak.databaseType" />. The selected
+       database will automatically be enabled and a database and role
+       created unless <xref
+       linkend="opt-services.keycloak.databaseHost" /> is changed from
+       its default of <literal>localhost</literal> or <xref
+       linkend="opt-services.keycloak.databaseCreateLocally" /> is set
        to <literal>false</literal>.
      </para>
 
+     <para>
+       External database access can also be configured by setting
+       <xref linkend="opt-services.keycloak.databaseHost" />, <xref
+       linkend="opt-services.keycloak.databaseUsername" />, <xref
+       linkend="opt-services.keycloak.databaseUseSSL" /> and <xref
+       linkend="opt-services.keycloak.databaseCaCert" /> as
+       appropriate. Note that you need to manually create a database
+       called <literal>keycloak</literal> and allow the configured
+       database user full access to it.
+     </para>
+
      <para>
        <xref linkend="opt-services.keycloak.databasePasswordFile" />
        must be set to the path to a file containing the password used
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5a10f60fc9a3..d49357cb463c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -175,7 +175,7 @@ in
   kernel-latest = handleTest ./kernel-latest.nix {};
   kernel-lts = handleTest ./kernel-lts.nix {};
   kernel-testing = handleTest ./kernel-testing.nix {};
-  keycloak = handleTest ./keycloak.nix {};
+  keycloak = discoverTests (import ./keycloak.nix);
   keymap = handleTest ./keymap.nix {};
   knot = handleTest ./knot.nix {};
   krb5 = discoverTests (import ./krb5 {});
diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix
index e5e31b038e9c..f448a0f7095f 100644
--- a/nixos/tests/keycloak.nix
+++ b/nixos/tests/keycloak.nix
@@ -2,12 +2,12 @@
 # OIDC client and a user, and simulates the user logging in to the
 # client using their Keycloak login.
 
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  let
-    frontendUrl = "http://keycloak/auth";
-    initialAdminPassword = "h4IhoJFnt2iQIR9";
-  in
+let
+  frontendUrl = "http://keycloak/auth";
+  initialAdminPassword = "h4IhoJFnt2iQIR9";
+
+  keycloakTest = import ./make-test-python.nix (
+    { pkgs, databaseType, ... }:
     {
       name = "keycloak";
       meta = with pkgs.stdenv.lib.maintainers; {
@@ -19,7 +19,7 @@ import ./make-test-python.nix (
           virtualisation.memorySize = 1024;
           services.keycloak = {
             enable = true;
-            inherit frontendUrl initialAdminPassword;
+            inherit frontendUrl databaseType initialAdminPassword;
             databasePasswordFile = pkgs.writeText "dbPassword" "wzf6vOCbPp6cqTH";
           };
           environment.systemPackages = with pkgs; [
@@ -136,4 +136,9 @@ import ./make-test-python.nix (
           )
         '';
     }
-)
+  );
+in
+{
+  postgres = keycloakTest { databaseType = "postgresql"; };
+  mysql = keycloakTest { databaseType = "mysql"; };
+}
diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
index 95935ce8f8ae..67d3d9bd45a2 100644
--- a/pkgs/servers/keycloak/default.nix
+++ b/pkgs/servers/keycloak/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchzip, makeWrapper, jre, writeText, nixosTests
-, postgresql_jdbc ? null
+{ stdenv, lib, fetchzip, makeWrapper, jre, writeText, nixosTests
+, postgresql_jdbc ? null, mysql_jdbc ? null
 }:
 
 let
   mkModuleXml = name: jarFile: writeText "module.xml" ''
     <?xml version="1.0" ?>
-    <module xmlns="urn:jboss:module:1.3" name="org.${name}">
+    <module xmlns="urn:jboss:module:1.3" name="${name}">
         <resources>
             <resource-root path="${jarFile}"/>
         </resources>
@@ -33,17 +33,22 @@ stdenv.mkDerivation rec {
 
     rm -rf $out/bin/*.{ps1,bat}
 
-    module_path=$out/modules/system/layers/keycloak/org
+    module_path=$out/modules/system/layers/keycloak
     if ! [[ -d $module_path ]]; then
         echo "The module path $module_path not found!"
         exit 1
     fi
 
-    ${if postgresql_jdbc != null then ''
-      mkdir -p $module_path/postgresql/main
-      ln -s ${postgresql_jdbc}/share/java/postgresql-jdbc.jar $module_path/postgresql/main
-      ln -s ${mkModuleXml "postgresql" "postgresql-jdbc.jar"} $module_path/postgresql/main/module.xml
-    '' else ""}
+    ${lib.optionalString (postgresql_jdbc != null) ''
+      mkdir -p $module_path/org/postgresql/main
+      ln -s ${postgresql_jdbc}/share/java/postgresql-jdbc.jar $module_path/org/postgresql/main/
+      ln -s ${mkModuleXml "org.postgresql" "postgresql-jdbc.jar"} $module_path/org/postgresql/main/module.xml
+    ''}
+    ${lib.optionalString (mysql_jdbc != null) ''
+      mkdir -p $module_path/com/mysql/main
+      ln -s ${mysql_jdbc}/share/java/mysql-connector-java.jar $module_path/com/mysql/main/
+      ln -s ${mkModuleXml "com.mysql" "mysql-connector-java.jar"} $module_path/com/mysql/main/module.xml
+    ''}
 
     wrapProgram $out/bin/standalone.sh --set JAVA_HOME ${jre}
     wrapProgram $out/bin/add-user-keycloak.sh --set JAVA_HOME ${jre}

From e369c0c0309ed06e30df353a7ea09fb0b1ed3ef9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 11:54:51 +0000
Subject: [PATCH 0579/3942] cordless: 2020-08-30 -> 2020-10-24

---
 .../networking/instant-messengers/cordless/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/applications/networking/instant-messengers/cordless/default.nix
index a262b0487464..1b475bdee846 100644
--- a/pkgs/applications/networking/instant-messengers/cordless/default.nix
+++ b/pkgs/applications/networking/instant-messengers/cordless/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "cordless";
-  version = "2020-08-30";
+  version = "2020-10-24";
 
   src = fetchFromGitHub {
     owner = "Bios-Marcel";
     repo = pname;
     rev = version;
-    sha256 = "sha256-CwOI7Ah4+sxD9We+Va5a6jYat5mjOeBk2EsOfwskz6k=";
+    sha256 = "18j8yrnipiivc49jwbb0ipgqwdi249fs9zxxz8qx8jfq77imvwbq";
   };
 
   subPackages = [ "." ];
 
-  vendorSha256 = "sha256-01I7GrZkaskuz20kVK2YwqvP7ViPMlQ3BFaoLHwgvOE=";
+  vendorSha256 = "1h47aqf8bmyqvaayfj16br1402qzy7kf8rk96f3vnsyvsnkg5gw5";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/Bios-Marcel/cordless";

From dfe75b97ca68ddc4a6e5eb000904ecd53432c1fe Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 29 Oct 2020 12:20:21 +0000
Subject: [PATCH 0580/3942] wayland: make reproducible

Upstream MR:
https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/93
---
 pkgs/development/libraries/wayland/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 1821d7a72374..cd84495d870a 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, meson, pkgconfig, ninja
+{ lib, stdenv, fetchurl, fetchpatch, meson, pkgconfig, ninja
 , libffi, libxml2, wayland
 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
 , withDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform
@@ -20,6 +20,14 @@ in stdenv.mkDerivation rec {
     sha256 = "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6";
   };
 
+  patches = [
+    # Fix documentation to be reproducible.
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/wayland/wayland/-/commit/e53e0edf0f892670f3e8c5dd527b3bb22335d32d.patch";
+      sha256 = "15sbhi86m9k72lsj56p7zr20ph2b0y4svl639snsbafn2ir1zdb2";
+    })
+  ];
+
   outputs = [ "out" ] ++ lib.optionals withDocumentation [ "doc" "man" ];
   separateDebugInfo = true;
 

From 2537e1169c7955448bc26f5b1b7aa15773c57ffa Mon Sep 17 00:00:00 2001
From: Christian Stewart <christian@paral.in>
Date: Thu, 29 Oct 2020 04:23:24 -0700
Subject: [PATCH 0581/3942] gstreamer: needs Xext build input when x11 is
 enabled

Fixes #102023

Signed-off-by: Christian Stewart <christian@paral.in>
---
 pkgs/development/libraries/gstreamer/base/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 00f3ecd449d1..db964c5c43f8 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -21,6 +21,7 @@
 , libGL
 , enableX11 ? stdenv.isLinux
 , libXv
+, libXext
 , enableWayland ? stdenv.isLinux
 , wayland
 , wayland-protocols
@@ -84,6 +85,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals enableAlsa [
     alsaLib
   ] ++ lib.optionals enableX11 [
+    libXext
     libXv
     pango
   ] ++ lib.optionals enableWayland [

From 4df7857cfd19b691a9ba4526bae9eee179621d8d Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Wed, 28 Oct 2020 12:03:02 +0100
Subject: [PATCH 0582/3942] convbin: init at 3.0

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

diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/tools/misc/convbin/default.nix
new file mode 100644
index 000000000000..0abf10710caa
--- /dev/null
+++ b/pkgs/tools/misc/convbin/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "convbin";
+  version = "3.0";
+
+  src = fetchFromGitHub {
+    owner = "mateoconlechuga";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9";
+  };
+
+  makeFlags = [ "CC=cc" ];
+
+  checkPhase = ''
+    pushd test
+    patchShebangs test.sh
+    ./test.sh
+    popd
+  '';
+
+  doCheck = true;
+
+  installPhase = ''
+    install -Dm755 bin/convbin $out/bin/convbin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Converts files to other formats";
+    longDescription = ''
+      This program is used to convert files to other formats,
+      specifically for the TI84+CE and related calculators.
+    '';
+    homepage = "https://github.com/mateoconlechuga/convbin";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ luc65r ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11a8a1ccae33..7cb0ac859007 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3072,6 +3072,8 @@ in
 
   console-bridge = callPackage ../development/libraries/console-bridge { };
 
+  convbin = callPackage ../tools/misc/convbin { };
+
   convmv = callPackage ../tools/misc/convmv { };
 
   convoy = callPackage ../tools/filesystems/convoy { };

From 069e485c189e4815fbb463c7dc0dfbfa7b1e4686 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Thu, 29 Oct 2020 11:00:13 -0400
Subject: [PATCH 0583/3942] OSCAR: init at 1.2.0

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

diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/applications/misc/OSCAR/default.nix
new file mode 100644
index 000000000000..e619ad8c6971
--- /dev/null
+++ b/pkgs/applications/misc/OSCAR/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }:
+mkDerivation rec {
+  pname = "OSCAR";
+  version = "1.2.0";
+
+  src = fetchFromGitLab {
+    owner = "pholy";
+    repo = "OSCAR-code";
+    rev = "v${version}";
+    sha256 = "10r37d8c2avr167n2s9lhld1c9hmckm444fq163z1jsy9jpid6mg";
+  };
+
+  buildInputs = [ qtbase qttools qtserialport libGLU ];
+  nativeBuildInputs = [ qmake ];
+  postPatch = ''
+    substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}"
+  '';
+
+  qmakeFlags = [ "OSCAR_QT.pro" ];
+
+  installPhase = ''
+    install -d $out/bin
+    install -d $out/share/OSCAR/Help
+    install -d $out/share/OSCAR/Html
+    install -d $out/share/OSCAR/Translations
+    install -d $out/share/icons/OSCAR
+    install -d $out/share/applications
+    install -T oscar/OSCAR $out/bin/OSCAR
+    # help browser was removed 'temporarily' in https://gitlab.com/pholy/OSCAR-code/-/commit/57c3e4c33ccdd2d0eddedbc24c0e4f2969da3841
+    # install oscar/Help/* $out/share/OSCAR/Help
+    install oscar/Html/* $out/share/OSCAR/Html
+    install oscar/Translations/* $out/share/OSCAR/Translations
+    install -T Building/Linux/OSCAR.png $out/share/icons/OSCAR/OSCAR.png
+    install -T Building/Linux/OSCAR.desktop $out/share/applications/OSCAR.desktop
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.sleepfiles.com/OSCAR/";
+    description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.roconnor ];
+    # Someone needs to create a suitable installPhase for Darwin and Windows.
+    # See https://gitlab.com/pholy/OSCAR-code/-/tree/master/Building.
+    broken = !stdenv.hostPlatform.isLinux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04e0f41e13ee..466dc88e05f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27196,6 +27196,8 @@ in
 
   opkg-utils = callPackage ../tools/package-management/opkg-utils { };
 
+  OSCAR = qt5.callPackage ../applications/misc/OSCAR { };
+
   pgmanage = callPackage ../applications/misc/pgmanage { };
 
   pgadmin = callPackage ../applications/misc/pgadmin {

From 2a184865c54db013f6937fcedc99b23eb832495f Mon Sep 17 00:00:00 2001
From: Matthew Piziak <matthew.piziak@gmail.com>
Date: Thu, 29 Oct 2020 11:17:57 -0400
Subject: [PATCH 0584/3942] tdlib: 1.6.0 -> 1.6.9

fix hash

version 1.6.9 is not released, so use revision hash

add a comment to the rev about why we are not using `v${version}` anymore

use unstable-2020-10-25

update version, not revision
---
 pkgs/development/libraries/tdlib/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index f430b10c64c0..165506f96472 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -1,18 +1,18 @@
 { fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.9";
+  version = "unstable-2020-10-25";
   pname = "tdlib";
 
   src = fetchFromGitHub {
     owner = "tdlib";
     repo = "td";
 
-    # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 uses an explicit revision because 1.6.9 is not
-    # a tdlib GitHub release, and is therefore not hosted at `https://github.com/tdlib/td/releases/tag/v1.6.9`. Please
-    # return to the `rev = "v${version}"` style on the next version bump if you can, since that will allow
-    # `nixpkgs-update` to update the package automatically.
-    rev = "unstable-2020-10-25";
+    # At version 1.6.0, this line was `rev = "v${version}". Version 1.6.9 (here called `unstable-2020-10-25`) uses an
+    # explicit revision because 1.6.9 is not a tdlib GitHub release, and is therefore not hosted at
+    # `https://github.com/tdlib/td/releases/tag/v1.6.9`. Please return to the `rev = "v${version}"` style on the next
+    # version bump if you can, since that will allow `nixpkgs-update` to update the package automatically.
+    rev = "32f2338bd199dd06a1b4b5f1ad14f2d4f2868f01";
 
     sha256 = "0wv03hlgzrsc04kcwnwz6dsmkdzvhb0i1wjs08gzivwxw06pkq4n";
   };

From a28e5b0a4f5799e14ed3079e10d481e5b5b4faa9 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Sat, 17 Oct 2020 12:26:20 +0200
Subject: [PATCH 0585/3942] samtools: 1.10 -> 1.11

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

diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index e750eea89ac9..27ed79a1f6ca 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "samtools";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchurl {
     url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "119ms0dpydw8dkh3zc4yyw9zhdzgv12px4l2kayigv31bpqcb7kv";
+    sha256 = "1dp5wknak4arnw5ghhif9mmljlfnw5bgm91wib7z0j8wdjywx0z2";
   };
 
   nativeBuildInputs = [ perl ];
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     homepage = "http://www.htslib.org/";
     platforms = platforms.unix;
-    maintainers = [ maintainers.mimame ];
+    maintainers = with maintainers; [ mimame unode ];
   };
 }

From 02390ed7256d7a98449d368be9148be3ec5dd41f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Wed, 7 Oct 2020 17:08:52 +0200
Subject: [PATCH 0586/3942] openssh: 8.3p1 -> 8.4p1

Fixes CVE-2020-15778, CVE-2020-14145
---
 pkgs/tools/networking/openssh/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 64e6757891e3..1a96cc58d58a 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -19,13 +19,13 @@
 
 let
 
-  version = "8.3p1";
+  version = "8.4p1";
 
   # **please** update this patch when you update to a new openssh release.
   gssapiPatch = fetchpatch {
     name = "openssh-gssapi.patch";
-    url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-1/debian/patches/gssapi.patch";
-    sha256 = "0j22ccg6msyi88mpsb6x0il5cg8v2b7qdah57ninbwx5isyld80l";
+    url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch";
+    sha256 = "1z1ckzimlkm1dmr9f5fqjnjg28gsqcwx6xka0klak857548d2lp2";
   };
 
 in
@@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
   src = if hpnSupport then
       fetchurl {
         url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz";
-        sha256 = "1ssdwgdxnvjwigisqi8c053znps5a4jf7bzsi99y0xyfzbw0x55k";
+        sha256 = "06mr2q8d9kbj145r7mzmpm3a4ilnssibwlbjyy0bjsqrqnrll3zl";
       }
     else
       fetchurl {
         url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz";
-        sha256 = "1cl74ghi9y21dc3f4xa0qamb7dhwacbynh1ks9syprrg8zhgpgpj";
+        sha256 = "091b3pxdlj47scxx6kkf4agkx8c8sdacdxx8m1dw1cby80pd40as";
       };
 
   patches =

From 3118fb3c7eed0b78e18e2d5f59facf9f1b563e90 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 19:01:47 +0000
Subject: [PATCH 0587/3942] bctoolbox: 4.4.0 -> 4.4.6

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

diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix
index d99ee57ef9e0..e9b561e16860 100644
--- a/pkgs/development/libraries/bctoolbox/default.nix
+++ b/pkgs/development/libraries/bctoolbox/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "bctoolbox";
-  version = "4.4.0";
+  version = "4.4.6";
 
   nativeBuildInputs = [ cmake bcunit ];
   buildInputs = [ mbedtls ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     group = "BC";
     repo = pname;
     rev = version;
-    sha256 = "1r3ymwk10ry6mz4zd08q7l5msq7h15931l7f0clw2siqs8r81x7c";
+    sha256 = "1vlvnpkks5mm6ppdmp88mdn39f3ynig6qas83nkjn7x47z2zr6x0";
   };
 
   # Do not build static libraries

From 0f03d8f0d94c9cf5b0540336fcb7e141b89efcc8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 19:19:05 +0000
Subject: [PATCH 0588/3942] _1password-gui: 0.9.0 -> 0.9.1

---
 pkgs/tools/security/1password-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix
index c3d406ce3aad..b9e668aaa403 100644
--- a/pkgs/tools/security/1password-gui/default.nix
+++ b/pkgs/tools/security/1password-gui/default.nix
@@ -13,11 +13,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "1password";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchurl {
     url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
-    sha256 = "109jsls4515y78zhhsxqlgms30i5rzhi60p3b9wx6y8v0iq331wp";
+    sha256 = "04hv7hw4s3f65kf3ggh9l0nrx25k5yj2kqv83nl7pvam5lvnv8sz";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c2694ef30d948562fbcbf48676afb6b536e5fe9d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 29 Oct 2020 17:16:12 +0100
Subject: [PATCH 0589/3942] python3Packages.cryptography: 3.2 -> 3.2.1

Changelog:
- Disable blinding on RSA public keys to address an error with some
  versions of OpenSSL.
---
 pkgs/development/python-modules/cryptography/default.nix | 4 ++--
 pkgs/development/python-modules/cryptography/vectors.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index b9d66203d8d7..8774b181fcfc 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -22,11 +22,11 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "3.2"; # Also update the hash in vectors.nix
+  version = "3.2.1"; # Also update the hash in vectors.nix
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1afcw79yg4bvw4v4l6dvkhnphi3jzrdpq7s4900ikpyyz229ny74";
+    sha256 = "1qxz02kfsrihq1h4afyqwcsv9nh3s9mmrr6y9lhi4angw05y3mfk";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 90fbda940b38..567ce23783ea 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1r4qzmm15mrmlblrmxxvqg3jfy3s5bbn9cfhd7fkpixvs3zhcpvq";
+    sha256 = "12dq1grn0bjj7c6sj6apd6328525n7xq4kbbmww63sn3x7081vls";
   };
 
   # No tests included

From 5f4c238ea5e1efb872ffeecfb6fc80c76cf86a48 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Wed, 9 Sep 2020 22:50:24 -0400
Subject: [PATCH 0590/3942] python3Packages.pytest-timeout: 1.3.3 -> 1.4.2

* Update version
* switch to pytestCheckHook
* Update meta: hompage & changelog
* explicit runtime dependency on pytest

Based on work by @jpgu-epam in #97527.
---
 .../python-modules/pytest-timeout/default.nix | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix
index 30bd93e433dc..6bf3483d40f9 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -1,34 +1,36 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchPypi
-, fetchpatch
-, lib
-, pexpect
 , pytest
+, pytestCheckHook
+, pexpect
+, pytestcov
 }:
 
 buildPythonPackage rec {
   pname = "pytest-timeout";
-  version = "1.3.3";
+  version = "1.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cczcjhw4xx5sjkhxlhc5c1bkr7x6fcyx12wrnvwfckshdvblc2a";
+    sha256 = "0xnsigs0kmpq1za0d4i522sp3f71x5bgpdh3ski0rs74yqy13cr0";
   };
 
-  patches = fetchpatch {
-    url = "https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw";
-    sha256 = "05zc2w7mjgv8rm8i1cbxp7k09vlscmay5iy78jlzgjqkrx3wkf46";
-  };
+  propagatedBuildInputs = [ pytest ];
 
-  checkInputs = [ pytest pexpect ];
-  checkPhase = ''
-    # test_suppresses_timeout_when_pdb_is_entered fails under heavy load
-    pytest -ra -k 'not test_suppresses_timeout_when_pdb_is_entered'
-  '';
+  checkInputs = [ pytestCheckHook pexpect pytestcov ];
 
-  meta = with lib;{
+  disabledTests = [
+    "test_suppresses_timeout_when_pdb_is_entered"
+  ];
+  pytestFlagsArray = [
+    "-ra"
+  ];
+
+  meta = with lib; {
     description = "py.test plugin to abort hanging tests";
-    homepage = "https://bitbucket.org/pytest-dev/pytest-timeout/";
+    homepage = "https://github.com/pytest-dev/pytest-timeout/";
+    changelog = "https://github.com/pytest-dev/pytest-timeout/#changelog";
     license = licenses.mit;
     maintainers = with maintainers; [ makefu costrouc ];
   };

From 56d5df28469dd57841aca3bab7d6a176b13c8a0e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 19:56:19 +0000
Subject: [PATCH 0591/3942] armadillo: 10.1.0 -> 10.1.1

---
 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 169777f2b42c..a306a02be069 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "10.1.0";
+  version = "10.1.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "15c3amyrk496v0s6r2pn8dw4v82f4ld347nbv5qdzd6injsg3qvj";
+    sha256 = "13hwynp1dnk3flw8ly00wjj12x2wsvj2da39bzay8c08m3dj3q4m";
   };
 
   nativeBuildInputs = [ cmake ];

From d1cf7bd44ebf7dd8f0c889f56e5095ee0953df0b Mon Sep 17 00:00:00 2001
From: Stephane Raux <stephaneyfx@gmail.com>
Date: Thu, 29 Oct 2020 00:05:44 -0700
Subject: [PATCH 0592/3942] numix-cursor-theme: patch inkscape command

The generated cursor files were previously empty due to inkscape rejecting the command line argument. See #98481.
---
 pkgs/data/icons/numix-cursor-theme/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix
index d0411a8c5697..7ff3c4ca23c4 100644
--- a/pkgs/data/icons/numix-cursor-theme/default.nix
+++ b/pkgs/data/icons/numix-cursor-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, inkscape, xcursorgen }:
+{ stdenv, fetchFromGitHub, fetchpatch, inkscape, xcursorgen }:
 
 stdenv.mkDerivation rec {
   version = "1.1";
@@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ inkscape xcursorgen ];
 
+  patches = [
+    # Remove when https://github.com/numixproject/numix-cursor-theme/pull/7 is merged
+    (fetchpatch {
+      url = "https://github.com/stephaneyfx/numix-cursor-theme/commit/3b647bf768cebb8f127b88e3786f6a9640460197.patch";
+      sha256 = "174kmhlvv76wwvndkys78aqc32051sqg3wzc0xg6b7by4agrbg76";
+      name = "support-inkscape-1-in-numix-cursor-theme.patch";
+    })
+  ];
+
   buildPhase = ''
     patchShebangs .
     HOME=$TMP ./build.sh

From 345f1d11d3f8d65d8ee7a84993a64c22b7dd804c Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Thu, 29 Oct 2020 19:22:04 +0100
Subject: [PATCH 0593/3942] unicorn(-emu): 1.0.2-rc4 -> 1.0.2

---
 .../libraries/unicorn-emu/default.nix         | 34 -------------------
 .../development/libraries/unicorn/default.nix | 27 +++++++++++++++
 .../python-modules/unicorn/default.nix        |  2 +-
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/python-packages.nix            |  4 ++-
 6 files changed, 34 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/libraries/unicorn-emu/default.nix
 create mode 100644 pkgs/development/libraries/unicorn/default.nix

diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix
deleted file mode 100644
index 3e10f492eb98..000000000000
--- a/pkgs/development/libraries/unicorn-emu/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, python, cmocka, hexdump, writeScriptBin, binutils-unwrapped }:
-
-stdenv.mkDerivation rec {
-  pname = "unicorn-emulator";
-  version = "1.0.2-rc4";
-
-  src = fetchurl {
-    url    = "https://github.com/unicorn-engine/unicorn/archive/${version}.tar.gz";
-    sha256 = "05w43jq3r97l3c8ggc745ai8m5l93p1b6q6cfp1zwzz6hl5kifiv";
-  };
-
-  PREFIX = placeholder "out";
-  MACOS_UNIVERSAL = stdenv.lib.optionalString stdenv.isDarwin "no";
-  NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  doCheck = !stdenv.isDarwin;
-
-  checkInputs = [
-    cmocka
-    hexdump
-    python.pkgs.setuptools
-  ];
-
-  nativeBuildInputs = [ pkgconfig python ];
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Lightweight multi-platform CPU emulator library";
-    homepage    = "http://www.unicorn-engine.org";
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
-  };
-}
diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix
new file mode 100644
index 000000000000..cea35519ad87
--- /dev/null
+++ b/pkgs/development/libraries/unicorn/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "unicorn";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "unicorn-engine";
+    repo = pname;
+    rev = version;
+    sha256 = "0jgnyaq6ykpbg5hrwc0p3pargmr9hpzqfsj6ymp4k07pxnqal76j";
+  };
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Lightweight multi-platform CPU emulator library";
+    homepage = "http://www.unicorn-engine.org";
+    license = licenses.gpl2Only;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice luc65r ];
+  };
+}
diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix
index e8f4b05916ec..8bd6507bb5ba 100644
--- a/pkgs/development/python-modules/unicorn/default.nix
+++ b/pkgs/development/python-modules/unicorn/default.nix
@@ -5,7 +5,7 @@ buildPythonPackage rec {
   version = stdenv.lib.getVersion unicorn-emu;
 
   src = unicorn-emu.src;
-  sourceRoot = "unicorn-${version}/bindings/python";
+  sourceRoot = "source/bindings/python";
 
   prePatch = ''
     ln -s ${unicorn-emu}/lib/libunicorn${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3538ac56ecfa..25e7eb515ff5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -624,6 +624,7 @@ mapAliases ({
   ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
   ucsFonts = ucs-fonts; # added 2016-07-15
   ultrastardx-beta = ultrastardx; # added 2017-08-12
+  unicorn-emu = unicorn; # added 2020-10-29
   usb_modeswitch = usb-modeswitch; # added 2016-05-10
   usbguard-nox = usbguard; # added 2019-09-04
   uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a37fab7ec3db..3108974b7cbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1649,7 +1649,6 @@ in
   candle = libsForQt5.callPackage ../applications/misc/candle { };
 
   capstone = callPackage ../development/libraries/capstone { };
-  unicorn-emu = callPackage ../development/libraries/unicorn-emu { };
 
   casync = callPackage ../applications/networking/sync/casync {
     sphinx = python3Packages.sphinx;
@@ -8072,6 +8071,8 @@ in
 
   unbound = callPackage ../tools/networking/unbound { };
 
+  unicorn = callPackage ../development/libraries/unicorn { };
+
   units = callPackage ../tools/misc/units {
     enableCurrenciesUpdater = true;
     pythonPackages = python3Packages;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c93931fe0ab7..4691e2b6bd57 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7360,7 +7360,9 @@ in {
 
   unicode-slugify = callPackage ../development/python-modules/unicode-slugify { };
 
-  unicorn = callPackage ../development/python-modules/unicorn { };
+  unicorn = callPackage ../development/python-modules/unicorn {
+    unicorn-emu = pkgs.unicorn;
+  };
 
   unidecode = callPackage ../development/python-modules/unidecode { };
 

From 16357a697fac56c6fcd743bfb8fd9a8a7f6b6532 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 21 Oct 2020 08:23:10 -0700
Subject: [PATCH 0594/3942] libtapi: add homepage and description, use pname

---
 pkgs/os-specific/darwin/libtapi/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix
index 1f1e00d13f9a..a6bc16d42f91 100644
--- a/pkgs/os-specific/darwin/libtapi/default.nix
+++ b/pkgs/os-specific/darwin/libtapi/default.nix
@@ -1,7 +1,9 @@
 { lib, stdenv, fetchFromGitHub, cmake, python3, ncurses }:
 
-stdenv.mkDerivation {
-  name = "libtapi-1000.10.8";
+stdenv.mkDerivation rec {
+  pname = "libtapi";
+  version = "1000.10.8"; # determined by looking at VERSION.txt
+
   src = fetchFromGitHub {
     owner = "tpoechtrager";
     repo = "apple-libtapi";
@@ -33,11 +35,13 @@ stdenv.mkDerivation {
 
   installTargets = [ "install-libtapi" "install-tapi-headers" ];
 
-  postInstall = ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     install_name_tool -id $out/lib/libtapi.dylib $out/lib/libtapi.dylib
   '';
 
   meta = with lib; {
+    description = "Replaces the Mach-O Dynamic Library Stub files in Apple's SDKs to reduce the size";
+    homepage = "https://github.com/tpoechtrager/apple-libtapi";
     license = licenses.apsl20;
     maintainers = with maintainers; [ matthewbauer ];
   };

From 490a760b66f10ae73f8822aefcd8df64d58e95f4 Mon Sep 17 00:00:00 2001
From: Konstantin Alekseev <mail@kalekseev.com>
Date: Thu, 29 Oct 2020 23:53:41 +0300
Subject: [PATCH 0595/3942] ssm-session-manager-plugin: 1.1.61.0 -> 1.2.7.0,
 add macos support

---
 .../ssm-session-manager-plugin/default.nix    | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
index 7c948fbcdfc7..15a3b0ac24c7 100644
--- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
+++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
@@ -1,28 +1,38 @@
-{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli }:
+{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }:
+let
+  ver = "1.2.7.0";
+  source = if stdenv.isDarwin then {
+    url =
+      "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip";
+    sha256 = "sha256-HP+opNjS53zR9eUxpNUHGD9rZN1z7lDc6+nONR8fa/s=";
+  } else {
+    url =
+      "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb";
+    sha256 = "sha256-EZ9ncj1YYlod1RLfXOpZFijnKjLYWYVBb+C6yd42l34=";
+  };
+  platformBuildInput = if stdenv.isDarwin then [ unzip ] else [ dpkg ];
+  unpackCmd = if stdenv.isDarwin then "unzip $src" else "dpkg-deb -x $src .";
+  archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin";
+in
 stdenv.mkDerivation rec {
   pname = "ssm-session-manager-plugin";
-  version = "1.1.61.0";
+  version = ver;
 
-  src = fetchurl {
-    url =
-      "https://s3.amazonaws.com/session-manager-downloads/plugin/${version}/ubuntu_64bit/session-manager-plugin.deb";
-    sha256 = "0z59irrpwhjjhn379454xyraqs590hij2n6n6k25w5hh8ak7imfl";
-  };
+  src = fetchurl source;
 
-  nativeBuildInputs = [ autoPatchelfHook dpkg ];
+  nativeBuildInputs = [ autoPatchelfHook ] ++ platformBuildInput;
 
   buildInputs = [ awscli ];
 
-  unpackPhase = "dpkg-deb -x $src .";
+  unpackPhase = unpackCmd;
 
-  installPhase =
-    "install -m755 -D usr/local/sessionmanagerplugin/bin/session-manager-plugin $out/bin/session-manager-plugin";
+  installPhase = "install -m755 -D ${archivePath}/bin/session-manager-plugin $out/bin/session-manager-plugin";
 
   meta = with lib; {
     homepage =
       "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html";
     description = "Amazon SSM Session Manager Plugin";
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
     license = licenses.unfree;
     maintainers = with maintainers; [ mbaillie ];
   };

From 6e19ed0a526598087c08bd4ea389394115a6360f Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Thu, 29 Oct 2020 13:27:45 +0100
Subject: [PATCH 0596/3942] lumpy: 0.3.0 -> 0.3.1

---
 pkgs/applications/science/biology/lumpy/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/biology/lumpy/default.nix b/pkgs/applications/science/biology/lumpy/default.nix
index 04512e8e372e..f6267a2e017f 100644
--- a/pkgs/applications/science/biology/lumpy/default.nix
+++ b/pkgs/applications/science/biology/lumpy/default.nix
@@ -7,13 +7,14 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "lumpy";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "arq5x";
     repo = "lumpy-sv";
-    rev = version;
-    sha256 = "0azhzvmh9az9jcq0xprlzdz6w16azgszv4kshb903bwbnqirmk18";
+    rev = "v${version}";
+    sha256 = "0r71sg7qch8r6p6dw995znrqdj6q49hjdylhzbib2qmv8nvglhs9";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ which ];
@@ -26,6 +27,8 @@ in stdenv.mkDerivation rec {
     # Use Nix htslib over bundled version
     sed -i 's/lumpy_filter: htslib/lumpy_filter:/' Makefile
     sed -i 's|../../lib/htslib/libhts.a|-lhts|' src/filter/Makefile
+    # Also make sure we use the includes from Nix's htslib
+    sed -i 's|../../lib/htslib/|${htslib}|' src/filter/Makefile
   '';
 
   # Upstream's makefile doesn't have an install target

From 459c5ec3b19767b96ef11225d60b0964c467f3b1 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Thu, 29 Oct 2020 16:20:23 +0100
Subject: [PATCH 0597/3942] pythonPackages.pysam: Disable failing tests
 unrelated to packaging

These will be fixed upstream and are due to format changes introduced
in samtools and htslib 1.11
---
 pkgs/development/python-modules/pysam/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix
index 2802b6d0e0ff..2f40a2973332 100644
--- a/pkgs/development/python-modules/pysam/default.nix
+++ b/pkgs/development/python-modules/pysam/default.nix
@@ -80,13 +80,19 @@ buildPythonPackage rec {
       --deselect tests/AlignmentFileHeader_test.py::TestHeaderBAM::test_header_content_is_as_expected \
       --deselect tests/AlignmentFileHeader_test.py::TestHeaderCRAM::test_dictionary_access_works \
       --deselect tests/AlignmentFileHeader_test.py::TestHeaderCRAM::test_header_content_is_as_expected \
-      --deselect tests/AlignmentFile_test.py::TestIO::testBAM2SAM \
-      --deselect tests/AlignmentFile_test.py::TestIO::testSAM2BAM \
-      --deselect tests/AlignmentFile_test.py::TestIO::testWriteUncompressedBAMFile \
       --deselect tests/AlignmentFile_test.py::TestDeNovoConstruction::testBAMWholeFile \
       --deselect tests/AlignmentFile_test.py::TestEmptyHeader::testEmptyHeader \
       --deselect tests/AlignmentFile_test.py::TestHeaderWithProgramOptions::testHeader \
+      --deselect tests/AlignmentFile_test.py::TestIO::testBAM2BAM \
+      --deselect tests/AlignmentFile_test.py::TestIO::testBAM2CRAM \
+      --deselect tests/AlignmentFile_test.py::TestIO::testBAM2SAM \
+      --deselect tests/AlignmentFile_test.py::TestIO::testFetchFromClosedFileObject \
+      --deselect tests/AlignmentFile_test.py::TestIO::testOpenFromFilename \
+      --deselect tests/AlignmentFile_test.py::TestIO::testSAM2BAM \
+      --deselect tests/AlignmentFile_test.py::TestIO::testWriteUncompressedBAMFile \
+      --deselect tests/AlignmentFile_test.py::TestIteratorRowAllBAM::testIterate \
       --deselect tests/StreamFiledescriptors_test.py::StreamTest::test_text_processing \
+      --deselect tests/compile_test.py::BAMTest::testCount \
       tests/
   '';
 

From 69f235c3aa229ad4e1fa3f7500974caad2a1e982 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 30 Oct 2020 01:22:13 +0000
Subject: [PATCH 0598/3942] bpytop: 1.0.44 -> 1.0.47

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

diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix
index 8788080e998a..e395b3c5d611 100644
--- a/pkgs/tools/system/bpytop/default.nix
+++ b/pkgs/tools/system/bpytop/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bpytop";
-  version = "1.0.44";
+  version = "1.0.47";
 
   src = fetchFromGitHub {
     owner = "aristocratos";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1fb7n0p364sj8pzsg35lrgl5wga3v4d0b4nynkfs5g8rfnmb0rr0";
+    sha256 = "1zsxqnisb9zyji6xwl4b7r722mr0g4hs3a74xsfghd5kafvgzj24";
   };
 
   buildInputs = [ makeWrapper ];

From f195c8f7ace3dd5bd1790ab52923f3eb9b7398cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 29 Oct 2020 16:14:48 +0100
Subject: [PATCH 0599/3942] pango: fix building on darwin

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

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 45edbee1be49..eec30d16b8cc 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -40,6 +40,8 @@ in stdenv.mkDerivation rec {
   mesonFlags = [
     "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
     "-Dlibthai=disabled" # Not packaged in Nixpkgs
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    "-Dxft=disabled"  # only works with x11
   ];
 
   enableParallelBuilding = true;

From 8b0aa74128f75c1c4702eb1c1d9293694b36af1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 29 Oct 2020 11:22:53 +0100
Subject: [PATCH 0600/3942] ssh-audit: 2.3.0 -> 2.3.1

---
 pkgs/tools/security/ssh-audit/default.nix | 24 ++---------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/tools/security/ssh-audit/default.nix
index 6a3dbfb615be..2fdc42e52803 100644
--- a/pkgs/tools/security/ssh-audit/default.nix
+++ b/pkgs/tools/security/ssh-audit/default.nix
@@ -2,39 +2,19 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ssh-audit";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "jtesta";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1k5nv2cdnzd3j2p729vjw6ya0gwwkxhqijs2b7p68wvp0n3y3m77";
+    sha256 = "1h739r5nv5zkmjyyjwkw8r6d4avddjjxsamc5rffwfxi1kjavpxm";
   };
 
-  postPatch = ''
-    cp ./README.md packages/sshaudit/
-    cp ./ssh-audit.py packages/sshaudit/sshaudit.py
-    mv packages/* .
-    ls -lah
-  '';
-
   checkInputs = with python3Packages; [
     pytestCheckHook
   ];
 
-  disabledTests = [
-    "test_resolve_error"
-    "test_resolve_hostname_without_records"
-    "test_resolve_ipv4"
-    "test_resolve_ipv6"
-    "test_resolve_ipv46_both"
-    "test_resolve_ipv46_order"
-    "test_invalid_host"
-    "test_invalid_port"
-    "test_not_connected_socket"
-    "test_ssh2_server_simple"
-  ];
-
   meta = with lib; {
     description = "Tool for ssh server auditing";
     homepage = "https://github.com/jtesta/ssh-audit";

From 2c82b84fcf9718f5184fbb545d6a6452e95f801e Mon Sep 17 00:00:00 2001
From: "Bryan A. S" <bryanasdev000@gmail.com>
Date: Fri, 30 Oct 2020 00:24:34 -0300
Subject: [PATCH 0601/3942] velero: 1.5.1 -> 1.5.2

Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
---
 pkgs/applications/networking/cluster/velero/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix
index 0d5835a8cde1..415031d27718 100644
--- a/pkgs/applications/networking/cluster/velero/default.nix
+++ b/pkgs/applications/networking/cluster/velero/default.nix
@@ -2,20 +2,20 @@
 
 buildGoModule rec {
   pname = "velero";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "vmware-tanzu";
     repo = "velero";
-    sha256 = "1rmymwmglcia5j0c692g34hlffba1yqs2s0iyjpafma2zabrcnai";
+    sha256 = "1hfi1iipbval0c0c0nnf6fz5n76za0vwczm5lq86sddqnznbvsrz";
   };
 
   buildFlagsArray = ''
     -ldflags=
       -s -w
       -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}
-      -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=87d86a45a6ca66c6c942c7c7f08352e26809426c
+      -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=456eb19668f8da603756353d9179b59b5a7bfa04
       -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean
   '';
 

From c79ef4eacf367f85f36aa194a2e0a2d1abb3117c Mon Sep 17 00:00:00 2001
From: Riley Inman <rileyminman@gmail.com>
Date: Fri, 30 Oct 2020 00:16:19 -0400
Subject: [PATCH 0602/3942] syncplay: 1.6.5 -> 1.6.6

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

diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index ac242eb9dc9f..da4551d7f555 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "syncplay";
-  version = "1.6.5";
+  version = "1.6.6";
 
   format = "other";
 
@@ -10,7 +10,7 @@ buildPythonApplication rec {
     owner = "Syncplay";
     repo = "syncplay";
     rev = "v${version}";
-    sha256 = "107dgsrjv95ww6gj77q89dirl604b2ljlpjg79gffm9c4gkmjj2m";
+    sha256 = "1wkxdp7dv5y1100awy949higvs5035ylfyl83qrp4lnimy3imw09";
   };
 
   propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls;

From 4897591ab17f05754e8ab94e5a35396c30c84fbe Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Fri, 30 Oct 2020 08:48:15 +0100
Subject: [PATCH 0603/3942] thunderbird: set build timeout at eight hours

This matches a similar change made to Firefox in #96767.
A lot of code is shared between Firefox and Thunderbird
so it makes sense to increase timeouts for Thunderbird
as well.
---
 pkgs/applications/networking/mailreaders/thunderbird/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 7494c1138058..d284ca140902 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -332,5 +332,6 @@ stdenv.mkDerivation rec {
     ];
     platforms = platforms.linux;
     license = licenses.mpl20;
+    timeout = 28800; # eight hours
   };
 }

From fa20999c64d72085dabdece091914914da0b7617 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Fri, 30 Oct 2020 08:52:57 +0100
Subject: [PATCH 0604/3942] wire-desktop: linux 3.20.2934 -> 3.21.2936

---
 .../networking/instant-messengers/wire-desktop/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 44aa3a6ac66f..385f491f495c 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -23,12 +23,12 @@ let
 
   version = {
     x86_64-darwin = "3.20.3912";
-    x86_64-linux = "3.20.2934";
+    x86_64-linux = "3.21.2936";
   }.${system} or throwSystem;
 
   sha256 = {
     x86_64-darwin = "1crkdqzq3iccxbrqlrar4ai43qzjsgd4hvcajgzmz2y33f30xgqr";
-    x86_64-linux = "0z6vrhzrhrrnl3swjbxrbl1dhk2fx86s45n2z2in2shdlv08dcx7";
+    x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6";
   }.${system} or throwSystem;
 
   meta = with stdenv.lib; {

From e6a44b2fc418e24e647f45756df6608df2aacd50 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Fri, 30 Oct 2020 08:54:19 +0100
Subject: [PATCH 0605/3942] wire-desktop: mac 3.20.3912 -> 3.21.3959

---
 .../networking/instant-messengers/wire-desktop/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 385f491f495c..b198b954bd40 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -22,12 +22,12 @@ let
   pname = "wire-desktop";
 
   version = {
-    x86_64-darwin = "3.20.3912";
+    x86_64-darwin = "3.21.3959";
     x86_64-linux = "3.21.2936";
   }.${system} or throwSystem;
 
   sha256 = {
-    x86_64-darwin = "1crkdqzq3iccxbrqlrar4ai43qzjsgd4hvcajgzmz2y33f30xgqr";
+    x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1";
     x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6";
   }.${system} or throwSystem;
 

From 79251b539428db5aacc093e75e1b04877e052782 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Fri, 30 Oct 2020 02:20:24 -0700
Subject: [PATCH 0606/3942] klipper: 0.8.0 -> 0.9.1

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

diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index 0b4fa745460e..9c44dabe3df9 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -5,13 +5,13 @@
 }:
 stdenv.mkDerivation rec {
   name = "klipper";
-  version = "0.8.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "KevinOConnor";
     repo = "klipper";
     rev = "v${version}";
-    sha256 = "1ijy2ij9yii5hms10914i614wkjpsy0k4rbgnm6l594gphivdfm7";
+    sha256 = "1wgklngsz6xxl25qxi9fkqhbyhwy61iyyk76ycq68b3miayrkgpj";
   };
 
   sourceRoot = "source/klippy";

From f80fb9cb87d08e466c7237b818ce56b599d8f4c8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 30 Oct 2020 10:27:51 +0100
Subject: [PATCH 0607/3942] =?UTF-8?q?meson:=200.55.3=20=E2=86=92=200.56.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://mesonbuild.com/Release-notes-for-0-56-0.html
https://github.com/mesonbuild/meson/releases/tag/0.56.0
---
 pkgs/development/tools/build-managers/meson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 1b9c3ef64774..32948adfb6c0 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -9,11 +9,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "0.55.3";
+  version = "0.56.0";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "19cjy24mfaswxyvqmns6rd7hx05ybqb663zlgklspfr8l4jjmvbb";
+    sha256 = "04vj250bwrzq7c0z1r96b0z0vgirvn0m367wm3ygqmfdy67x6799";
   };
 
   patches = [

From bbf96d898b96ea2d1ff19a09e545499e4f32d8d0 Mon Sep 17 00:00:00 2001
From: Sebastien Braun <sebastien@sebbraun.de>
Date: Thu, 29 Oct 2020 09:17:13 +0100
Subject: [PATCH 0608/3942] git: Use asciidoctor instead of asciidoc for
 manpages

Asciidoc is severely outdated and is replaced by asciidoctor.
Eliminating asciidoc gets rid of a python2 dependency, see
https://github.com/NixOS/nixpkgs/issues/101964
---
 .../version-management/git-and-tools/git/default.nix   | 10 +++++-----
 1 file changed, 5 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 c54a9160f6de..e40debf76c03 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -2,7 +2,7 @@
 , curl, openssl, zlib, expat, perlPackages, python3, 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
+, asciidoctor, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xsl_ns, docbook_xml_dtd_45
 , libxslt, tcl, tk, makeWrapper, libiconv
 , svnSupport, subversionClient, perlLibs, smtpPerlLibs
 , perlSupport ? true
@@ -65,8 +65,8 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ gettext perlPackages.perl ]
-    ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
-         docbook_xsl docbook_xml_dtd_45 libxslt ];
+    ++ stdenv.lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x
+         docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ];
   buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv]
     ++ stdenv.lib.optionals perlSupport [ perlPackages.perl ]
     ++ stdenv.lib.optionals guiSupport [tcl tk]
@@ -145,7 +145,7 @@ stdenv.mkDerivation {
       }
 
       # Install git-subtree.
-      make -C contrib/subtree install ${stdenv.lib.optionalString withManual "install-doc"}
+      make -C contrib/subtree install ${stdenv.lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"}
       rm -rf contrib/subtree
 
       # Install contrib stuff.
@@ -230,7 +230,7 @@ stdenv.mkDerivation {
       '')
 
    + stdenv.lib.optionalString withManual ''# Install man pages and Info manual
-       make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html install-info \
+       make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html install-info \
          -C Documentation ''
 
    + (if guiSupport then ''

From 85ce8025883e102594bd50881085c57e9a509e62 Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Wed, 25 Mar 2020 11:14:46 +0100
Subject: [PATCH 0609/3942] mate.mate-tweak: init at 20.10.0

---
 pkgs/desktops/mate/default.nix            |  1 +
 pkgs/desktops/mate/mate-tweak/default.nix | 83 +++++++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 pkgs/desktops/mate/mate-tweak/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 3970b2b2921c..10c278c8bf9a 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -39,6 +39,7 @@ let
     mate-system-monitor = callPackage ./mate-system-monitor { };
     mate-terminal = callPackage ./mate-terminal { };
     mate-themes = callPackage ./mate-themes { };
+    mate-tweak = callPackage ./mate-tweak { };
     mate-user-guide = callPackage ./mate-user-guide { };
     mate-user-share = callPackage ./mate-user-share { };
     mate-utils = callPackage ./mate-utils { };
diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix
new file mode 100644
index 000000000000..9609d832f6b1
--- /dev/null
+++ b/pkgs/desktops/mate/mate-tweak/default.nix
@@ -0,0 +1,83 @@
+{ stdenv
+, fetchFromGitHub
+, python3Packages
+, intltool
+, mate
+, libnotify
+, gtk3
+, gdk-pixbuf
+, gobject-introspection
+, wrapGAppsHook
+, glib
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "mate-tweak";
+  version = "20.10.0";
+
+  src = fetchFromGitHub {
+    owner = "ubuntu-mate";
+    repo = pname;
+    rev = version;
+    sha256 = "08gw5i5wjxmzn92h9fv6g7q9i00n8shv1wlpy6cb31xy9wbmjph6";
+  };
+
+  nativeBuildInputs = [
+    wrapGAppsHook
+    intltool
+    python3Packages.distutils_extra
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    gtk3
+    gdk-pixbuf
+    libnotify
+    glib
+    mate.mate-applets
+    mate.mate-panel
+    mate.marco
+    mate.libmatekbd
+    mate.mate-session-manager
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    distro
+    pygobject3
+    psutil
+    setproctitle
+  ];
+
+  strictDeps = false;
+
+  dontWrapGApps = true;
+
+  postPatch = ''
+    # mate-tweak hardcodes absolute paths everywhere. Nuke from orbit.
+    find . -type f -exec sed -i \
+      -e s,/usr/lib/mate-tweak,$out/lib/mate-tweak,g \
+      {} +
+
+    sed -i 's,{prefix}/,,g' setup.py
+  '';
+
+  # Arguments to be passed to `makeWrapper`, only used by buildPython*
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  postFixup = ''
+    for i in bin/.mate-tweak-wrapped lib/mate-tweak/mate-tweak-helper; do
+      sed -i "s,usr,run/current-system/sw,g" $out/$i
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tweak tool for the MATE Desktop";
+    homepage = "https://github.com/ubuntu-mate/mate-tweak";
+    changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}";
+    license = [ licenses.gpl2Plus ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ luc65r ];
+  };
+}

From 14368df9f6ee8e76f0ff5103a231082076c788d0 Mon Sep 17 00:00:00 2001
From: Sebastien Braun <sebastien@sebbraun.de>
Date: Fri, 30 Oct 2020 13:54:16 +0100
Subject: [PATCH 0610/3942] gsoap: 2.8.53 -> 2.8.108

Fixes CVE-2019-7659
---
 pkgs/development/libraries/gsoap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix
index fd9e327c1bc9..2614c50cca78 100644
--- a/pkgs/development/libraries/gsoap/default.nix
+++ b/pkgs/development/libraries/gsoap/default.nix
@@ -5,11 +5,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "gsoap";
-  version = "${majorVersion}.53";
+  version = "${majorVersion}.108";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip";
-    sha256 = "0n35dh32gidi65c36cwjd91304pwiabfblvd64kg21djpjl06qcr";
+    sha256 = "0x58bwlclk7frv03kg8bp0pm7zl784samvbzskrnr7dl5v866nvl";
   };
 
   buildInputs = [ openssl zlib ];

From 6a1782986d54fa2c87853780e7464b489455c447 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 30 Oct 2020 13:56:54 +0100
Subject: [PATCH 0611/3942] git: 2.29.1 -> 2.29.2

---
 .../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 e40debf76c03..b6efb78513cd 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -22,7 +22,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.29.1";
+  version = "2.29.2";
   svn = subversionClient.override { perlBindings = perlSupport; };
 
   gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1cxd2h0k6bhv25avnk40h0pahgc7vgs37dc6kmln3pfhjyb6019h";
+    sha256 = "1h87yv117ypnc0yi86941089c14n91gixk8b6shj2y35prp47z7j";
   };
 
   outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc";

From 1d4dc932d53bf66e7e2500f7ca1951a9de0717af Mon Sep 17 00:00:00 2001
From: ymeister <47071325+ymeister@users.noreply.github.com>
Date: Fri, 30 Oct 2020 02:13:54 +0700
Subject: [PATCH 0612/3942] rss-bridge-cli: init

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 .../misc/rss-bridge-cli/default.nix           | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/misc/rss-bridge-cli/default.nix

diff --git a/pkgs/applications/misc/rss-bridge-cli/default.nix b/pkgs/applications/misc/rss-bridge-cli/default.nix
new file mode 100644
index 000000000000..f481f0953f81
--- /dev/null
+++ b/pkgs/applications/misc/rss-bridge-cli/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, writeShellScriptBin, rss-bridge, php }:
+
+let
+  phpWithExts = (php.withExtensions
+    ({ all, ... }: with all; [
+      curl
+      filter
+      iconv
+      json
+      mbstring
+      openssl
+      simplexml
+      sqlite3
+    ])
+  );
+  phpBin = "${phpWithExts}/bin/php";
+in (writeShellScriptBin "rss-bridge-cli" ''
+  ${phpBin} ${rss-bridge}/index.php "$@"
+'').overrideAttrs (oldAttrs: rec {
+  version = rss-bridge.version;
+
+  meta = with stdenv.lib; {
+    description = "Command-line interface for RSS-Bridge";
+    homepage = "https://github.com/RSS-Bridge/rss-bridge";
+    license = licenses.unlicense;
+    maintainers = with maintainers; [ ymeister ];
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a37fab7ec3db..4719e300de48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6879,6 +6879,8 @@ in
 
   rsibreak = libsForQt514.callPackage ../applications/misc/rsibreak { };
 
+  rss-bridge-cli = callPackage ../applications/misc/rss-bridge-cli { };
+
   rss2email = callPackage ../applications/networking/feedreaders/rss2email {
     pythonPackages = python3Packages;
   };

From 33a9c38483db48ba051a55a81b01b318f7afb181 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Fri, 30 Oct 2020 21:17:18 +0800
Subject: [PATCH 0613/3942] ledger-live-desktop: 2.14.0 -> 2.15.0

---
 pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 3bd379ce27c8..da0449f41d1f 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.14.0";
+  version = "2.15.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
-    sha256 = "057g77nd8qxi8dw9sp7x068wsxmrpnsdfrca876f0bpw7lpb0bqq";
+    sha256 = "06sm4ah05j0f3bxb1sbdi8mazmxk166y2gaycll6p2xhd105ins3";
   };
 
   appimageContents = appimageTools.extractType2 {

From 4e6820a2307d526711ecf801f03e37346f2a6c13 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Oct 2020 13:52:00 +0100
Subject: [PATCH 0614/3942] homeassistant: 0.117.0 -> 0.117.1

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 4 ++--
 pkgs/servers/home-assistant/frontend.nix           | 4 ++--
 3 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 326cc480fddc..cc3736ac7de6 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.117.0";
+  version = "0.117.1";
   components = {
     "abode" = ps: with ps; [ abodepy ];
     "accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 98f5fe943247..31b48060b4f6 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.117.0";
+  hassVersion = "0.117.1";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    sha256 = "1f5axspj5hffmaqhpmrrflyd0c62lww36yvd2wr999yix7jhsfnc";
+    sha256 = "1ifkxgsdm6bvrf573z75ry7vvrb3zi67x5j2nlsb44igfmk0nj1v";
   };
 
   postPatch = ''
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 2ca94066dbcb..ce3403b8f537 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20201021.3";
+  version = "20201021.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04z8rvmnpmy7xx90pvqcr58hsxjsc10mrrjcx7ppspglb91b9cpb";
+    sha256 = "138h4cgvkn26xlr53ziz6d0zc00zw4wk40cpi4c4nia1lv6cqkxd";
   };
 
   # no Python tests implemented

From 5f2ef2da298518d1973fc77e9d37940a1c20e683 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Fri, 30 Oct 2020 14:19:52 +0100
Subject: [PATCH 0615/3942] palemoon: 28.14.2 -> 28.15.0

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

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 8bfbf98b1983..542d43294815 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -16,13 +16,14 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "palemoon";
-  version = "28.14.2";
+  version = "28.15.0";
 
   src = fetchFromGitHub {
+    githubBase = "repo.palemoon.org";
     owner = "MoonchildProductions";
     repo = "Pale-Moon";
     rev = "${version}_Release";
-    sha256 = "1qz2sqc8rcg5z5kncabgmpl6v4i6wrs9dlgmna69255qrmsshwgm";
+    sha256 = "1sbs3gcwfx58mxc0x1g6jklmvpa9dw2bq3i8y9645gfa1s12p8wy";
     fetchSubmodules = true;
   };
 

From 207804705d4c51fe68684c97625abe94f7849484 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Fri, 30 Oct 2020 14:53:59 +0100
Subject: [PATCH 0616/3942] grafana: 7.3.0 -> 7.3.1

https://github.com/grafana/grafana/releases/tag/v7.3.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 fe915e7adc0a..7679cd88649d 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "grafana";
-  version = "7.3.0";
+  version = "7.3.1";
 
   excludedPackages = [ "release_publisher" ];
 
@@ -10,12 +10,12 @@ buildGoModule rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0sxl06xaz474ir94ng0iak57qpcbh19hs3yjh1g44vf52k5cs70i";
+    sha256 = "02by07d0h07zvws2yj71qa84sgp3x49p5ib0bahh0iyr50xqb3yj";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "1338x2sj11mzqqpb43dw2lxjpnv9q7zrwksyvj8ghjp4fad4pi9g";
+    sha256 = "0rqipwiz8bsqkhiv30k9jmk5szhabk9rgl37n7y8l0yk2avbq895";
   };
 
   vendorSha256 = "0shaxm2y5i29rb0k5bfpcsxbw3ap913l1rb5qbr9hrx7l142dbx8";

From 489c73671ab957fdbb547c9c175d2530fb0d307e Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Tue, 27 Oct 2020 04:56:21 +0800
Subject: [PATCH 0617/3942] perlPackages.NetAsyncHTTP: init at 0.47

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 76e391213c3e..c14e1424c8ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14570,6 +14570,27 @@ let
     };
   };
 
+  NetAsyncHTTP = buildPerlModule {
+    pname = "Net-Async-HTTP";
+    version = "0.47";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-0.47.tar.gz";
+      sha256 = "1lwy1ijrhibi087p3q5zvadhkq0slfrzfhb76cmkx4mpyv5v4l8f";
+    };
+    buildInputs = [ HTTPCookies TestIdentity TestMetricsAny TestRefcount ];
+    propagatedBuildInputs = [ Future HTTPMessage IOAsync MetricsAny StructDumb URI ];
+    preCheck = stdenv.lib.optionalString stdenv.isDarwin ''
+      # network tests fail on Darwin/sandbox, so disable these
+      rm -f t/20local-connect.t t/22local-connect-pipeline.t t/23local-connect-redir.t
+      rm -f t/90rt75615.t t/90rt75616.t t/90rt93232.t
+    '';
+    meta = {
+      description = "Use HTTP with IO::Async";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.zakame ];
+    };
+  };
+
   NetAsyncPing = buildPerlPackage {
     pname = "Net-Async-Ping";
     version = "0.004001";

From 7a09bb523ba60e1504e35d7eb226b8fdc99bae9c Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Fri, 30 Oct 2020 13:14:25 +0100
Subject: [PATCH 0618/3942] versus: init at 1.0

---
 .../networking/versus/default.nix             | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/networking/versus/default.nix

diff --git a/pkgs/applications/networking/versus/default.nix b/pkgs/applications/networking/versus/default.nix
new file mode 100644
index 000000000000..1d2875e44e64
--- /dev/null
+++ b/pkgs/applications/networking/versus/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "versus";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "INFURA";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0j5mj9gwwvgx7r1svlg14dpcqlj8mhwlf7sampkkih6bv92qfzcd";
+  };
+
+  vendorSha256 = "1d12jcd8crxcgp5m8ga691wivim4cg8cbz4pzgxp0jhzg9jplpbv";
+
+  meta = with stdenv.lib; {
+    description = "Benchmark multiple API endpoints against each other";
+    homepage = "https://github.com/INFURA/versus";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mmahut ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d0fc9f2aa6e..5d4744319874 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7835,6 +7835,8 @@ in
 
   verilog = callPackage ../applications/science/electronics/verilog {};
 
+  versus = callPackage ../applications/networking/versus { };
+
   vgrep = callPackage ../tools/text/vgrep { };
 
   vhd2vl = callPackage ../applications/science/electronics/vhd2vl { };

From 5949927de45d5ae3bdd253b700843c48eede2e16 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 30 Oct 2020 02:52:34 +0100
Subject: [PATCH 0619/3942] jackmix: 0.5.2 -> 0.6.0

also qt4 -> qt5
---
 pkgs/applications/audio/jackmix/default.nix   | 28 +++++++++++--------
 .../applications/audio/jackmix/no_error.patch | 18 ++++++------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index 405217675a3e..14cda8a81b52 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2, alsaLib }:
+{ mkDerivation, lib, fetchFromGitHub, pkgconfig, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }:
 
-stdenv.mkDerivation {
-  name = "jackmix-0.5.2";
-  src = fetchurl {
-    url = "https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz";
-    sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j";
+mkDerivation rec {
+  pname = "jackmix";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "kampfschlaefer";
+    repo = "jackmix";
+    rev = version;
+    sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
   };
 
   patches = [ ./no_error.patch ];
 
   nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ];
   buildInputs = [
-    qt4
+    qtbase
     lash
     jack
     alsaLib
@@ -21,11 +25,11 @@ stdenv.mkDerivation {
     install -D jackmix/jackmix $out/bin/jackmix
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Matrix-Mixer for the Jack-Audio-connection-Kit";
-    homepage = "http://www.arnoldarts.de/jackmix/";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.kampfschlaefer ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://github.com/kampfschlaefer/jackmix";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ kampfschlaefer ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/jackmix/no_error.patch b/pkgs/applications/audio/jackmix/no_error.patch
index d1a714ded9ca..593800134e1f 100644
--- a/pkgs/applications/audio/jackmix/no_error.patch
+++ b/pkgs/applications/audio/jackmix/no_error.patch
@@ -1,13 +1,13 @@
 diff --git a/SConstruct b/SConstruct
-index 4290fa5..0a7a679 100644
+index 8bf6517..a432aa9 100644
 --- a/SConstruct
 +++ b/SConstruct
 @@ -16,7 +16,7 @@ env = Environment(
- env.Replace( LIBS="" )
- env.Replace( LIBPATH="" )
-
--env.MergeFlags( ['-Wall', '-Werror', '-g', '-fpic'] )
-+env.MergeFlags( ['-g', '-fpic'] )
-
- tests = { }
- tests.update( env['PKGCONFIG_TESTS'] )
+ env.Replace(LIBS="")
+ env.Replace(LIBPATH="")
+ 
+-env.MergeFlags(['-Wall', '-Werror', '-g', '-fpic', '-std=c++11'])
++env.MergeFlags(['-g', '-fpic', '-std=c++11'])
+ 
+ tests = {}
+ tests.update(env['PKGCONFIG_TESTS'])
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f5c62ac0bd5..b16eba0f7f4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21625,7 +21625,7 @@ in
 
   jackmeter = callPackage ../applications/audio/jackmeter { };
 
-  jackmix = callPackage ../applications/audio/jackmix { };
+  jackmix = libsForQt5.callPackage ../applications/audio/jackmix { };
   jackmix_jack1 = jackmix.override { jack = jack1; };
 
   jalv = callPackage ../applications/audio/jalv { };

From 52c05c879135d9c189831f3805330b5904e2823a Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Wed, 28 Oct 2020 05:30:02 +0800
Subject: [PATCH 0620/3942] perlPackages.NetAsyncWebSocket: init at 0.13

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 76e391213c3e..8cf13ad08691 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14586,6 +14586,25 @@ let
     };
   };
 
+  NetAsyncWebSocket = buildPerlModule {
+    pname = "Net-Async-WebSocket";
+    version = "0.13";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-WebSocket-0.13.tar.gz";
+      sha256 = "000nw7gnj7ks55nib3fiikxx9bfmbla6fimxrbn2z2n7sd187b0d";
+    };
+    propagatedBuildInputs = [ IOAsync ProtocolWebSocket URI ];
+    preCheck = stdenv.lib.optionalString stdenv.isDarwin ''
+      # network tests fail on Darwin/sandbox, so disable these
+      rm -f t/02server.t t/03cross.t
+    '';
+    meta = {
+      description = "Use WebSockets with IO::Async";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.zakame ];
+    };
+  };
+
   NetAMQP = buildPerlModule {
     pname = "Net-AMQP";
     version = "0.06";

From c76692192ad25dbbfc9db9cf239f69a8c80a1062 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Oct 2020 13:57:19 -0400
Subject: [PATCH 0621/3942] nixos ec2/create-amis.sh: shellcheck: quote region
 references

---
 nixos/maintainers/scripts/ec2/create-amis.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 89e24f2ccfd9..0a0b07577c26 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -p awscli -p jq -p qemu -i bash
+# shellcheck shell=bash
 
 # Uploads and registers NixOS images built from the
 # <nixos/release.nix> amazonImage attribute. Images are uploaded and
@@ -111,7 +112,7 @@ wait_for_import() {
     log "Waiting for import task $task_id to be completed"
     while true; do
         read state progress snapshot_id < <(
-            aws ec2 describe-import-snapshot-tasks --region $region --import-task-ids "$task_id" | \
+            aws ec2 describe-import-snapshot-tasks --region "$region" --import-task-ids "$task_id" | \
                 jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail | "\(.Status) \(.Progress) \(.SnapshotId)"'
         )
         log " ... state=$state progress=$progress snapshot_id=$snapshot_id"
@@ -139,7 +140,7 @@ wait_for_image() {
 
     while true; do
         read state < <(
-            aws ec2 describe-images --image-ids "$ami_id" --region $region | \
+            aws ec2 describe-images --image-ids "$ami_id" --region "$region" | \
                 jq -r ".Images[].State"
         )
         log " ... state=$state"
@@ -163,7 +164,7 @@ make_image_public() {
     local region=$1
     local ami_id=$2
 
-    wait_for_image $region "$ami_id"
+    wait_for_image "$region" "$ami_id"
 
     log "Making image $ami_id public"
 
@@ -185,7 +186,7 @@ upload_image() {
         log "Checking for image on S3"
         if ! aws s3 ls --region "$region" "s3://${bucket}/${aws_path}" >&2; then
             log "Image missing from aws, uploading"
-            aws s3 cp --region $region "$image_file" "s3://${bucket}/${aws_path}" >&2
+            aws s3 cp --region "$region" "$image_file" "s3://${bucket}/${aws_path}" >&2
         fi
 
         log "Importing image from S3 path s3://$bucket/$aws_path"
@@ -197,7 +198,7 @@ upload_image() {
               \"S3Bucket\": \"$bucket\",
               \"S3Key\": \"$aws_path\"
           }
-        }" --region $region | jq -r '.ImportTaskId')
+        }" --region "$region" | jq -r '.ImportTaskId')
 
         write_state "$state_key" task_id "$task_id"
     fi
@@ -230,7 +231,7 @@ upload_image() {
             aws ec2 register-image \
                 --name "$image_name" \
                 --description "$image_description" \
-                --region $region \
+                --region "$region" \
                 --architecture $amazon_arch \
                 --block-device-mappings "${block_device_mappings[@]}" \
                 "${extra_flags[@]}" \
@@ -240,7 +241,7 @@ upload_image() {
         write_state "$state_key" ami_id "$ami_id"
     fi
 
-    make_image_public $region "$ami_id"
+    make_image_public "$region" "$ami_id"
 
     echo "$ami_id"
 }
@@ -268,7 +269,7 @@ copy_to_region() {
         write_state "$state_key" ami_id "$ami_id"
     fi
 
-    make_image_public $region "$ami_id"
+    make_image_public "$region" "$ami_id"
 
     echo "$ami_id"
 }

From f5994c208df64f3db0f4f69efffb3a2868e688b3 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Oct 2020 13:58:37 -0400
Subject: [PATCH 0622/3942] nixos ec2/create-amis.sh: shellcheck: quote
 state_dir reference

---
 nixos/maintainers/scripts/ec2/create-amis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 0a0b07577c26..6be9cd594006 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -101,7 +101,7 @@ write_state() {
     local type=$2
     local val=$3
 
-    mkdir -p $state_dir
+    mkdir -p "$state_dir"
     echo "$val" > "$state_dir/$state_key.$type"
 }
 

From baf7ed3f2446c433885d0b99ace294b333358183 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Oct 2020 13:59:34 -0400
Subject: [PATCH 0623/3942] nixos ec2/create-amis.sh: shellcheck: SC2155:
 Declare and assign separately to avoid masking return values.

---
 nixos/maintainers/scripts/ec2/create-amis.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 6be9cd594006..085de5a647d6 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -178,9 +178,12 @@ upload_image() {
     local aws_path=${image_file#/}
 
     local state_key="$region.$image_label.$image_system"
-    local task_id=$(read_state "$state_key" task_id)
-    local snapshot_id=$(read_state "$state_key" snapshot_id)
-    local ami_id=$(read_state "$state_key" ami_id)
+    local task_id
+    task_id=$(read_state "$state_key" task_id)
+    local snapshot_id
+    snapshot_id=$(read_state "$state_key" snapshot_id)
+    local ami_id
+    ami_id=$(read_state "$state_key" ami_id)
 
     if [ -z "$task_id" ]; then
         log "Checking for image on S3"

From a66a22ca545ce94a7b69aefe163fea2c20241f9d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Oct 2020 14:01:22 -0400
Subject: [PATCH 0624/3942] nixos ec2/create-amis.sh: shellcheck: read without
 -r mangles backslashes

---
 nixos/maintainers/scripts/ec2/create-amis.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 085de5a647d6..6e2836a7a97d 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -111,7 +111,7 @@ wait_for_import() {
     local state snapshot_id
     log "Waiting for import task $task_id to be completed"
     while true; do
-        read state progress snapshot_id < <(
+        read -r state progress snapshot_id < <(
             aws ec2 describe-import-snapshot-tasks --region "$region" --import-task-ids "$task_id" | \
                 jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail | "\(.Status) \(.Progress) \(.SnapshotId)"'
         )
@@ -139,7 +139,7 @@ wait_for_image() {
     log "Waiting for image $ami_id to be available"
 
     while true; do
-        read state < <(
+        read -r state < <(
             aws ec2 describe-images --image-ids "$ami_id" --region "$region" | \
                 jq -r ".Images[].State"
         )

From 7dac8470cf69d10bcea3a61b1919cebf12a94fe6 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Oct 2020 14:01:43 -0400
Subject: [PATCH 0625/3942] nixos ec2/create-amis.sh: shellcheck: explicitly
 make the additions to block_device_mappings single strings

---
 nixos/maintainers/scripts/ec2/create-amis.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 6e2836a7a97d..16aa5ce35f45 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -225,10 +225,10 @@ upload_image() {
             --virtualization-type hvm
         )
 
-        block_device_mappings+=(DeviceName=/dev/sdb,VirtualName=ephemeral0)
-        block_device_mappings+=(DeviceName=/dev/sdc,VirtualName=ephemeral1)
-        block_device_mappings+=(DeviceName=/dev/sdd,VirtualName=ephemeral2)
-        block_device_mappings+=(DeviceName=/dev/sde,VirtualName=ephemeral3)
+        block_device_mappings+=("DeviceName=/dev/sdb,VirtualName=ephemeral0")
+        block_device_mappings+=("DeviceName=/dev/sdc,VirtualName=ephemeral1")
+        block_device_mappings+=("DeviceName=/dev/sdd,VirtualName=ephemeral2")
+        block_device_mappings+=("DeviceName=/dev/sde,VirtualName=ephemeral3")
 
         ami_id=$(
             aws ec2 register-image \

From f92a883ddb2e26e34244cf764fbfa63a4e580afa Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Oct 2020 14:02:11 -0400
Subject: [PATCH 0626/3942] nixos ec2/create-amis.sh: shellcheck: $ is not
 needed in arithmetic

---
 nixos/maintainers/scripts/ec2/create-amis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 16aa5ce35f45..6cac4bb58d51 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -65,7 +65,7 @@ image_logical_bytes=$(read_image_info .logical_bytes)
 
 # Derived attributes
 
-image_logical_gigabytes=$((($image_logical_bytes-1)/1024/1024/1024+1)) # Round to the next GB
+image_logical_gigabytes=$(((image_logical_bytes-1)/1024/1024/1024+1)) # Round to the next GB
 
 case "$image_system" in
     aarch64-linux)

From e253de8a772d8c73173807fef2e82ebce59c5153 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Oct 2020 11:40:58 -0400
Subject: [PATCH 0627/3942] create-amis.sh: log the full response if describing
 the import snapshot tasks fails

---
 nixos/maintainers/scripts/ec2/create-amis.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 6cac4bb58d51..d8bdf022d616 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -126,6 +126,8 @@ wait_for_import() {
                 ;;
             *)
                 log "Unexpected snapshot import state: '${state}'"
+                log "Full response: "
+                aws ec2 describe-import-snapshot-tasks --region "$region" --import-task-ids "$task_id" >&2
                 exit 1
                 ;;
         esac

From e79ac7b3d6638e3234262649018e3b11d3284332 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 30 Oct 2020 17:08:35 +0100
Subject: [PATCH 0628/3942] bdf2psf: 1.197 -> 1.198

---
 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 2b3445ac6c33..0316a9b08a40 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bdf2psf";
-  version = "1.197";
+  version = "1.198";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "023zj08rk8pmvpr8zybxn2ibrl5qsarkn8rb908mxhhlwpp12f7n";
+    sha256 = "1b57pk10wf667aag3mhh397sfra44gilnyyg7fm532qaw3xapv2i";
   };
 
   nativeBuildInputs = [ dpkg ];

From 2bf1fc034502dd89f1026f8cf7bbdcf250d82550 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Oct 2020 11:59:09 -0400
Subject: [PATCH 0629/3942] create-amis: allow customizing the service role
 name

The complete setup on the AWS end can be configured
with the following Terraform configuration. It generates
a ./credentials.sh which I just copy/pasted in to the
create-amis.sh script near the top. Note: the entire stack
of users and bucket can be destroyed at the end of the
import.

    variable "region" {
      type = string
    }
    variable "availability_zone" {
      type = string
    }

    provider "aws" {
      region = var.region
    }

    resource "aws_s3_bucket" "nixos-amis" {
      bucket_prefix = "nixos-amis-"
      lifecycle_rule {
        enabled = true
        abort_incomplete_multipart_upload_days = 1
        expiration {
          days = 7
        }
      }
    }

    resource "local_file" "credential-file" {
      file_permission = "0700"
      filename = "${path.module}/credentials.sh"
      sensitive_content = <<SCRIPT
    export service_role_name="${aws_iam_role.vmimport.name}"
    export bucket="${aws_s3_bucket.nixos-amis.bucket}"
    export AWS_ACCESS_KEY_ID="${aws_iam_access_key.uploader.id}"
    export AWS_SECRET_ACCESS_KEY="${aws_iam_access_key.uploader.secret}"
    SCRIPT
    }

    # The following resources are for the *uploader*
    resource "aws_iam_user" "uploader" {
      name = "nixos-amis-uploader"
    }

    resource "aws_iam_access_key" "uploader" {
      user = aws_iam_user.uploader.name
    }

    resource "aws_iam_user_policy" "upload-to-nixos-amis" {
      user = aws_iam_user.uploader.name

      policy = data.aws_iam_policy_document.upload-policy-document.json
    }

    data "aws_iam_policy_document" "upload-policy-document" {
      statement {
        effect = "Allow"

        actions = [
          "s3:ListBucket",
          "s3:GetBucketLocation",
        ]

        resources = [
          aws_s3_bucket.nixos-amis.arn
        ]
      }

      statement {
        effect = "Allow"

        actions = [
          "s3:PutObject",
          "s3:GetObject",
          "s3:DeleteObject",
        ]

        resources = [
          "${aws_s3_bucket.nixos-amis.arn}/*"
        ]
      }

      statement {
        effect = "Allow"
        actions = [
          "ec2:ImportSnapshot",
          "ec2:DescribeImportSnapshotTasks",
          "ec2:DescribeImportSnapshotTasks",
          "ec2:RegisterImage",
          "ec2:DescribeImages"
        ]
        resources = [
          "*"
        ]
      }
    }

    # The following resources are for the *vmimport service user*
    # See: https://docs.aws.amazon.com/vm-import/latest/userguide/vmie_prereqs.html#vmimport-role
    resource "aws_iam_role" "vmimport" {
      assume_role_policy = data.aws_iam_policy_document.vmimport-trust.json
    }

    resource "aws_iam_role_policy" "vmimport-access" {
      role = aws_iam_role.vmimport.id
      policy = data.aws_iam_policy_document.vmimport-access.json
    }

    data "aws_iam_policy_document" "vmimport-access" {
      statement {
        effect = "Allow"
        actions = [
          "s3:GetBucketLocation",
          "s3:GetObject",
          "s3:ListBucket",
        ]
        resources = [
          aws_s3_bucket.nixos-amis.arn,
          "${aws_s3_bucket.nixos-amis.arn}/*"
        ]
      }
      statement {
        effect = "Allow"
        actions = [
          "ec2:ModifySnapshotAttribute",
          "ec2:CopySnapshot",
          "ec2:RegisterImage",
          "ec2:Describe*"
        ]
        resources = [
          "*"
        ]
      }
    }

    data "aws_iam_policy_document" "vmimport-trust" {
      statement {
        effect = "Allow"
        principals {
          type = "Service"
          identifiers = [ "vmie.amazonaws.com" ]
        }

        actions = [
          "sts:AssumeRole"
        ]

        condition {
          test = "StringEquals"
          variable = "sts:ExternalId"
          values = [ "vmimport" ]
        }
      }
    }
---
 nixos/maintainers/scripts/ec2/create-amis.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index d8bdf022d616..fdcaba4e2e7a 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -6,9 +6,10 @@
 # <nixos/release.nix> amazonImage attribute. Images are uploaded and
 # registered via a home region, and then copied to other regions.
 
-# The home region requires an s3 bucket, and a "vmimport" IAM role
-# with access to the S3 bucket.  Configuration of the vmimport role is
-# documented in
+# The home region requires an s3 bucket, and an IAM role named, by default,
+# "vmimport" IAM role with access to the S3 bucket. The name can be
+# configured with the "service_role_name" variable. Configuration of the
+# vmimport role is documented in
 # https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html
 
 # set -x
@@ -18,6 +19,7 @@ set -euo pipefail
 state_dir=$HOME/amis/ec2-images
 home_region=eu-west-1
 bucket=nixos-amis
+service_role_name=vmimport
 
 regions=(eu-west-1 eu-west-2 eu-west-3 eu-central-1 eu-north-1
          us-east-1 us-east-2 us-west-1 us-west-2
@@ -196,7 +198,7 @@ upload_image() {
 
         log "Importing image from S3 path s3://$bucket/$aws_path"
 
-        task_id=$(aws ec2 import-snapshot --disk-container "{
+        task_id=$(aws ec2 import-snapshot --role-name "$service_role_name" --disk-container "{
           \"Description\": \"nixos-image-${image_label}-${image_system}\",
           \"Format\": \"vhd\",
           \"UserBucket\": {

From 45d88250f23c4e02dcdf84113eab9fc064dba60b Mon Sep 17 00:00:00 2001
From: Max Hausch <cheriimoya@googlemail.com>
Date: Fri, 30 Oct 2020 17:12:37 +0100
Subject: [PATCH 0630/3942] motion 4.3.1 -> 4.3.2

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

diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index 7f101c41edbd..e25101250411 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "motion";
-  version = "4.3.1";
+  version = "4.3.2";
 
   src = fetchFromGitHub {
     owner  = "Motion-Project";
     repo   = "motion";
     rev    = "release-${version}";
-    sha256 = "01yy4pdgd4wa97bpw27zn5zik9iz719m1jiwkk9lb7m2a2951dhc";
+    sha256 = "09xs815jsivcilpmnrx2jkcxirj4lg5kp99fkr0p2sdxw03myi95";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From a179781696271602ee317455aff5e7fa051f5218 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Oct 2020 11:05:48 -0400
Subject: [PATCH 0631/3942] stage-1: add datestamps to logs

When the stage-1 logs get imported in to the journal, they all get
loaded with the same timestamp. This makes it difficult to identify
what might be taking a long time in early boot.
---
 nixos/modules/system/boot/stage-1-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index f7c2940049e5..2339267d5c22 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -120,7 +120,7 @@ eval "exec $logOutFd>&1 $logErrFd>&2"
 if test -w /dev/kmsg; then
     tee -i < /tmp/stage-1-init.log.fifo /proc/self/fd/"$logOutFd" | while read -r line; do
         if test -n "$line"; then
-            echo "<7>stage-1-init: $line" > /dev/kmsg
+            echo "<7>stage-1-init: [$(date)] $line" > /dev/kmsg
         fi
     done &
 else

From ece5c0f30425c09ec5d531c808031db69e28b4cf Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Oct 2020 11:20:00 -0400
Subject: [PATCH 0632/3942] stage-1: modprobe ext{2,3,4} before resizing

I noticed booting a system with an ext4 root which expanded to 5T took
quite a long time (12 minutes in some cases, 43(!) in others.)

I changed stage-1 to run `resize2fs -d 62` for extra debug output and
timing information. It revealed the adjust_superblock step taking
almost all of the time:

    [Fri Oct 30 11:10:15 UTC 2020] zero_high_bits_in_metadata: Memory used: 132k/0k (63k/70k), time:  0.00/ 0.00/ 0.00
    [Fri Oct 30 11:21:09 UTC 2020] adjust_superblock: Memory used: 396k/4556k (295k/102k), time: 654.21/ 0.59/ 5.13

but when I ran resize2fs on a disk with the identical content growing
to the identical target size, it would only take about 30 seconds. I
looked at what happened between those two steps in the fast case with
strace and found:

```
   235	getrusage(RUSAGE_SELF, {ru_utime={tv_sec=0, tv_usec=1795}, ru_stime={tv_sec=0, tv_usec=3590}, ...}) = 0
   236	write(1, "zero_high_bits_in_metadata: Memo"..., 84zero_high_bits_in_metadata: Memory used: 132k/0k (72k/61k), time:  0.00/ 0.00/ 0.00
   237	) = 84
   238	gettimeofday({tv_sec=1604061278, tv_usec=480147}, NULL) = 0
   239	getrusage(RUSAGE_SELF, {ru_utime={tv_sec=0, tv_usec=1802}, ru_stime={tv_sec=0, tv_usec=3603}, ...}) = 0
   240	gettimeofday({tv_sec=1604061278, tv_usec=480192}, NULL) = 0
   241	mmap(NULL, 2564096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7fa3c7355000
   242	access("/sys/fs/ext4/features/lazy_itable_init", F_OK) = 0
   243	brk(0xf85000)                           = 0xf85000
   244	brk(0xfa6000)                           = 0xfa6000
   245	gettimeofday({tv_sec=1604061278, tv_usec=538828}, NULL) = 0
   246	getrusage(RUSAGE_SELF, {ru_utime={tv_sec=0, tv_usec=58720}, ru_stime={tv_sec=0, tv_usec=3603}, ...}) = 0
   247	write(1, "adjust_superblock: Memory used: "..., 79adjust_superblock: Memory used: 396k/2504k (305k/92k), time:  0.06/ 0.06/ 0.00
   248	) = 79
   249	gettimeofday({tv_sec=1604061278, tv_usec=539119}, NULL) = 0
   250	getrusage(RUSAGE_SELF, {ru_utime={tv_sec=0, tv_usec=58812}, ru_stime={tv_sec=0, tv_usec=3603}, ...}) = 0
   251	gettimeofday({tv_sec=1604061279, tv_usec=939}, NULL) = 0
   252	getrusage(RUSAGE_SELF, {ru_utime={tv_sec=0, tv_usec=520411}, ru_stime={tv_sec=0, tv_usec=3603}, ...}) = 0
   253	write(1, "fix_uninit_block_bitmaps 2: Memo"..., 88fix_uninit_block_bitmaps 2: Memory used: 396k/2504k (305k/92k), time:  0.46/ 0.46/ 0.00
   254	) = 88
```

In particular the access to /sys/fs seemed interesting. Looking
at the source of resize2fs:

```
[root@ip-172-31-22-182:~/e2fsprogs-1.45.5]# rg -B2 -A1 /sys/fs/ext4/features/lazy_itable_init .
./resize/resize2fs.c
923-	if (getenv("RESIZE2FS_FORCE_LAZY_ITABLE_INIT") ||
924-	    (!getenv("RESIZE2FS_FORCE_ITABLE_INIT") &&
925:	     access("/sys/fs/ext4/features/lazy_itable_init", F_OK) == 0))
926-		lazy_itable_init = 1;
```

I confirmed /sys is mounted, and then found a bug suggesting the
ext4 module is maybe not loaded:
https://bugzilla.redhat.com/show_bug.cgi?id=1071909

My home server doesn't have ext4 loaded and had 3T to play with, so
I tried (and succeeded with) replicating the issue locally:

```
[root@kif:/scratch]# lsmod | grep -i ext

[root@kif:/scratch]# zfs create -V 3G rpool/scratch/ext4

[root@kif:/scratch]# time mkfs.ext4 /dev/zvol/rpool/scratch/ext4
mke2fs 1.45.5 (07-Jan-2020)
Discarding device blocks: done
Creating filesystem with 786432 4k blocks and 196608 inodes
Filesystem UUID: 560a4a8f-93dc-40cc-97a5-f10049bf801f
Superblock backups stored on blocks:
	32768, 98304, 163840, 229376, 294912

Allocating group tables: done
Writing inode tables: done
Creating journal (16384 blocks): done
Writing superblocks and filesystem accounting information: done

real	0m2.261s
user	0m0.000s
sys	0m0.025s

[root@kif:/scratch]# zfs set volsize=3T rpool/scratch/ext4

[root@kif:/scratch]# time resize2fs -d 62 /dev/zvol/rpool/scratch/ext4
resize2fs 1.45.5 (07-Jan-2020)
fs has 11 inodes, 1 groups required.
fs requires 16390 data blocks.
With 1 group(s), we have 22234 blocks available.
Last group's overhead is 10534
Need 16390 data blocks in last group
Final size of last group is 26924
Estimated blocks needed: 26924
Extents safety margin: 49
Resizing the filesystem on /dev/zvol/rpool/scratch/ext4 to 805306368 (4k) blocks.
read_bitmaps: Memory used: 132k/0k (63k/70k), time:  0.00/ 0.00/ 0.00
read_bitmaps: I/O read: 1MB, write: 0MB, rate: 3802.28MB/s
fix_uninit_block_bitmaps 1: Memory used: 132k/0k (63k/70k), time:  0.00/ 0.00/ 0.00
resize_group_descriptors: Memory used: 132k/0k (68k/65k), time:  0.00/ 0.00/ 0.00
move_bg_metadata: Memory used: 132k/0k (68k/65k), time:  0.00/ 0.00/ 0.00
zero_high_bits_in_metadata: Memory used: 132k/0k (68k/65k), time:  0.00/ 0.00/ 0.00
```

here it got stuck for quite some time ... straceing this 20 minutes in revealed this in a tight loop:

```
getuid()                                = 0
geteuid()                               = 0
getgid()                                = 0
getegid()                               = 0
prctl(PR_GET_DUMPABLE)                  = 1 (SUID_DUMP_USER)
fallocate(3, FALLOC_FL_ZERO_RANGE, 2222649901056, 2097152) = 0
fsync(3)                                = 0
```

it finally ended 43(!) minutes later:

```
adjust_superblock: Memory used: 264k/3592k (210k/55k), time: 2554.03/ 0.16/15.07
fix_uninit_block_bitmaps 2: Memory used: 264k/3592k (210k/55k), time:  0.16/ 0.16/ 0.00
blocks_to_move: Memory used: 264k/3592k (211k/54k), time:  0.00/ 0.00/ 0.00
Number of free blocks: 755396/780023556, Needed: 0
block_mover: Memory used: 264k/3592k (216k/49k), time:  0.05/ 0.01/ 0.00
block_mover: I/O read: 1MB, write: 0MB, rate: 18.68MB/s
inode_scan_and_fix: Memory used: 264k/3592k (216k/49k), time:  0.00/ 0.00/ 0.00
inode_ref_fix: Memory used: 264k/3592k (216k/49k), time:  0.00/ 0.00/ 0.00
move_itables: Memory used: 264k/3592k (216k/49k), time:  0.00/ 0.00/ 0.00
calculate_summary_stats: Memory used: 264k/3592k (216k/49k), time: 16.35/16.35/ 0.00
fix_resize_inode: Memory used: 264k/3592k (222k/43k), time:  0.04/ 0.00/ 0.00
fix_resize_inode: I/O read: 1MB, write: 0MB, rate: 22.80MB/s
fix_sb_journal_backup: Memory used: 264k/3592k (222k/43k), time:  0.00/ 0.00/ 0.00
overall resize2fs: Memory used: 264k/3592k (222k/43k), time: 2570.90/16.68/15.07
overall resize2fs: I/O read: 1MB, write: 1MB, rate: 0.00MB/s
The filesystem on /dev/zvol/rpool/scratch/ext4 is now 805306368 (4k) blocks long.

real	43m1.943s
user	0m16.761s
sys	0m15.069s
```

I then cleaned up and recreated the zvol, loaded the ext4 module, created the ext4 fs,
resized the volume, and resize2fs'd and it went quite quickly:

```
[root@kif:/scratch]# zfs destroy rpool/scratch/ext4

[root@kif:/scratch]# zfs create -V 3G rpool/scratch/ext4

[root@kif:/scratch]# modprobe ext4

[root@kif:/scratch]# time resize2fs -d 62 /dev/zvol/rpool/scratch/ext4

[root@kif:/scratch]# time mkfs.ext4 /dev/zvol/rpool/scratch/ext4
mke2fs 1.45.5 (07-Jan-2020)
Discarding device blocks: done
Creating filesystem with 786432 4k blocks and 196608 inodes
Filesystem UUID: 5b415f2f-a8c4-4ba0-ac1d-78860de77610
Superblock backups stored on blocks:
	32768, 98304, 163840, 229376, 294912

Allocating group tables: done
Writing inode tables: done
Creating journal (16384 blocks): done
Writing superblocks and filesystem accounting information: done

real	0m1.013s
user	0m0.001s
sys	0m0.023s

[root@kif:/scratch]# zfs set volsize=3T rpool/scratch/ext4

[root@kif:/scratch]# time resize2fs -d 62 /dev/zvol/rpool/scratch/ext4
resize2fs 1.45.5 (07-Jan-2020)
fs has 11 inodes, 1 groups required.
fs requires 16390 data blocks.
With 1 group(s), we have 22234 blocks available.
Last group's overhead is 10534
Need 16390 data blocks in last group
Final size of last group is 26924
Estimated blocks needed: 26924
Extents safety margin: 49
Resizing the filesystem on /dev/zvol/rpool/scratch/ext4 to 805306368 (4k) blocks.
read_bitmaps: Memory used: 132k/0k (63k/70k), time:  0.00/ 0.00/ 0.00
read_bitmaps: I/O read: 1MB, write: 0MB, rate: 3389.83MB/s
fix_uninit_block_bitmaps 1: Memory used: 132k/0k (63k/70k), time:  0.00/ 0.00/ 0.00
resize_group_descriptors: Memory used: 132k/0k (68k/65k), time:  0.00/ 0.00/ 0.00
move_bg_metadata: Memory used: 132k/0k (68k/65k), time:  0.00/ 0.00/ 0.00
zero_high_bits_in_metadata: Memory used: 132k/0k (68k/65k), time:  0.00/ 0.00/ 0.00
adjust_superblock: Memory used: 264k/1540k (210k/55k), time:  0.02/ 0.02/ 0.00
fix_uninit_block_bitmaps 2: Memory used: 264k/1540k (210k/55k), time:  0.15/ 0.15/ 0.00
blocks_to_move: Memory used: 264k/1540k (211k/54k), time:  0.00/ 0.00/ 0.00
Number of free blocks: 755396/780023556, Needed: 0
block_mover: Memory used: 264k/3592k (216k/49k), time:  0.01/ 0.01/ 0.00
block_mover: I/O read: 1MB, write: 0MB, rate: 157.11MB/s
inode_scan_and_fix: Memory used: 264k/3592k (216k/49k), time:  0.00/ 0.00/ 0.00
inode_ref_fix: Memory used: 264k/3592k (216k/49k), time:  0.00/ 0.00/ 0.00
move_itables: Memory used: 264k/3592k (216k/49k), time:  0.00/ 0.00/ 0.00

calculate_summary_stats: Memory used: 264k/3592k (216k/49k), time: 16.20/16.20/ 0.00
fix_resize_inode: Memory used: 264k/3592k (222k/43k), time:  0.00/ 0.00/ 0.00
fix_resize_inode: I/O read: 1MB, write: 0MB, rate: 5319.15MB/s
fix_sb_journal_backup: Memory used: 264k/3592k (222k/43k), time:  0.00/ 0.00/ 0.00
overall resize2fs: Memory used: 264k/3592k (222k/43k), time: 16.45/16.38/ 0.00
overall resize2fs: I/O read: 1MB, write: 1MB, rate: 0.06MB/s
The filesystem on /dev/zvol/rpool/scratch/ext4 is now 805306368 (4k) blocks long.

real	0m17.908s
user	0m16.386s
sys	0m0.079s
```

Success!
---
 nixos/modules/system/boot/stage-1-init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index f7c2940049e5..8558c7546d7e 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -356,6 +356,7 @@ mountFS() {
     case $options in
         *x-nixos.autoresize*)
             if [ "$fsType" = ext2 -o "$fsType" = ext3 -o "$fsType" = ext4 ]; then
+                modprobe "$fsType"
                 echo "resizing $device..."
                 e2fsck -fp "$device"
                 resize2fs "$device"

From 3eb034db8ce7bed0098c07d438d58cde7eb6de1b Mon Sep 17 00:00:00 2001
From: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
Date: Fri, 30 Oct 2020 09:33:00 -0500
Subject: [PATCH 0633/3942] broadlink-cli: 0.9.0 -> 0.15.0 and use python3

Helps #101964
---
 pkgs/tools/misc/broadlink-cli/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix
index c40ccad5e396..96b13c060e4b 100644
--- a/pkgs/tools/misc/broadlink-cli/default.nix
+++ b/pkgs/tools/misc/broadlink-cli/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, python2Packages, fetchFromGitHub }:
+{ stdenv, python3Packages, fetchFromGitHub }:
 
-python2Packages.buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "broadlink-cli";
-  inherit (python2Packages.broadlink) version;
+  inherit (python3Packages.broadlink) version;
 
   # the tools are available as part of the source distribution from GH but
   # not pypi, so we have to fetch them here.
   src = fetchFromGitHub {
     owner  = "mjg59";
     repo   = "python-broadlink";
-    # this rev is version 0.9
-    rev    = "766b7b00fb1cec868e3d5fca66f1aada208959ce";
-    sha256 = "0j0idzxmpwkb1lbgvi9df2hbxafm5hxjc6mgg5481lq7z4z1r4nb";
+    # this rev is version 0.15.0
+    rev    = "99add9e6feea6e47be4f3a58783556d7838b759c";
+    sha256 = "1q1q62brvfjcb18i0j4ca5cxqzjwv1iywdrdby0yjqa4wm6ywq6b";
   };
 
   format = "other";
 
-  propagatedBuildInputs = with python2Packages; [
+  propagatedBuildInputs = with python3Packages; [
     broadlink
   ];
 
@@ -32,6 +32,6 @@ python2Packages.buildPythonApplication {
   meta = with stdenv.lib; {
     description = "Tools for interfacing with Broadlink RM2/3 (Pro) remote controls, A1 sensor platforms and SP2/3 smartplugs";
     maintainers = with maintainers; [ peterhoeg ];
-    inherit (python2Packages.broadlink.meta) homepage license;
+    inherit (python3Packages.broadlink.meta) homepage license;
   };
 }

From e6db435973160591fe7348876a5567c729495175 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 29 Oct 2020 01:15:05 -0700
Subject: [PATCH 0634/3942] linux: add flavor metadata

---
 pkgs/os-specific/linux/kernel/generic.nix     | 9 ++++++++-
 pkgs/os-specific/linux/kernel/linux-libre.nix | 1 +
 pkgs/os-specific/linux/kernel/linux-zen.nix   | 1 +
 pkgs/top-level/all-packages.nix               | 5 +++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index cab11cc87ae2..dd3050a93eef 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -45,6 +45,11 @@
                        stdenv.hostPlatform != stdenv.buildPlatform
 , extraMeta ? {}
 
+, isXen      ? features.xen_dom0 or false
+, isZen      ? false
+, isLibre    ? false
+, isHardened ? false
+
 # easy overrides to stdenv.hostPlatform.platform members
 , autoModules ? stdenv.hostPlatform.platform.kernelAutoModules
 , preferBuiltin ? stdenv.hostPlatform.platform.kernelPreferBuiltin or false
@@ -175,7 +180,9 @@ let
 
   passthru = {
     features = kernelFeatures;
-    inherit commonStructuredConfig;
+    inherit commonStructuredConfig isXen isZen isHardened isLibre;
+    kernelOlder = lib.versionOlder version;
+    kernelAtLeast = lib.versionAtLeast version;
     passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
   };
 
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 7a831e61ae49..1e8514e9c2c8 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -17,6 +17,7 @@ let
 in linux.override {
   argsOverride = {
     modDirVersion = "${linux.modDirVersion}-gnu";
+    isLibre = true;
 
     src = stdenv.mkDerivation {
       name = "${linux.name}-libre-src";
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 947aa7c19ab3..f4b0f3870f29 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -7,6 +7,7 @@ in
 buildLinux (args // {
   modDirVersion = "${version}-zen1";
   inherit version;
+  isZen = true;
 
   src = fetchFromGitHub {
     owner = "zen-kernel";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 319d24d2e25d..d017efe6dfb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18014,6 +18014,10 @@ in
     inherit kernel;
     inherit (kernel) stdenv; # in particular, use the same compiler by default
 
+    # to help determine module compatibility
+    inherit (kernel) isXen isZen isHardened isLibre;
+    inherit (kernel) kernelOlder kernelAtLeast;
+
     # Obsolete aliases (these packages do not depend on the kernel).
     inherit (pkgs) odp-dpdk pktgen; # added 2018-05
 
@@ -18277,6 +18281,7 @@ in
         kernelPatches.hardened.${kernel.meta.branch}
       ];
       modDirVersionArg = kernel.modDirVersion + "-hardened";
+      isHardened = true;
   });
 
   linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { });

From f24fa1e6f51a072be983b0fa78647c9c777c37b7 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 29 Oct 2020 01:15:31 -0700
Subject: [PATCH 0635/3942] linuxPackages.usbip: disable < 4.10

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

diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix
index ffd33b6ff854..9a009b74f083 100644
--- a/pkgs/os-specific/linux/usbip/default.nix
+++ b/pkgs/os-specific/linux/usbip/default.nix
@@ -1,11 +1,11 @@
-{ lib, stdenv, kernel, udev, autoconf, automake, libtool }:
+{ lib, stdenv, kernel, udev, autoconf, automake, libtool, kernelOlder }:
 
 stdenv.mkDerivation {
   name = "usbip-${kernel.name}";
 
   src = kernel.src;
 
-  patches = lib.optionals (lib.versionAtLeast "5.4" kernel.version) [
+  patches = lib.optionals (kernelOlder "5.4") [
     # fixes build with gcc8
     ./fix-snprintf-truncation.patch
     # fixes build with gcc9
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
     description = "allows to pass USB device from server to client over the network";
     license = licenses.gpl2;
     platforms = platforms.linux;
+    broken = kernelOlder "4.10";
   };
 }

From 74a577b2936180508a129aafd75b88489e6fd730 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Oct 2020 12:40:17 -0400
Subject: [PATCH 0636/3942] create-amis: improve wording around the service
 name's IAM role

Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
---
 nixos/maintainers/scripts/ec2/create-amis.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index fdcaba4e2e7a..ec2eb5366790 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -6,8 +6,8 @@
 # <nixos/release.nix> amazonImage attribute. Images are uploaded and
 # registered via a home region, and then copied to other regions.
 
-# The home region requires an s3 bucket, and an IAM role named, by default,
-# "vmimport" IAM role with access to the S3 bucket. The name can be
+# The home region requires an s3 bucket, and an IAM role named "vmimport"
+# (by default) with access to the S3 bucket. The name can be
 # configured with the "service_role_name" variable. Configuration of the
 # vmimport role is documented in
 # https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html

From b5faf8e4c62bceb0318f80d7abbdb5d6815e0316 Mon Sep 17 00:00:00 2001
From: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
Date: Fri, 30 Oct 2020 10:07:23 -0500
Subject: [PATCH 0637/3942] amazon-glacier-cmd-interface: remove package

Last real upstream activity appears to be ~6 years ago and depends on
python2 packages that will soon be vulnerable

Helps #101964
---
 .../amazon-glacier-cmd-interface/default.nix  | 33 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix

diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
deleted file mode 100644
index a872060ce212..000000000000
--- a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchFromGitHub, python2Packages  }:
-
-python2Packages.buildPythonApplication rec {
-  pname = "amazon-glacier-cmd-interface";
-  version  = "2016-09-01";
-
-  src = fetchFromGitHub {
-    owner  = "uskudnik";
-    repo   = "amazon-glacier-cmd-interface";
-    rev    = "9f28132f9872e1aad9e956e5613b976504e930c8";
-    sha256 = "1k5z8kda9v6klr4536pf5qbq9zklxvyysv7nc48gllschl09jywc";
-  };
-
-  # argparse is part of the standardlib
-  prePatch = ''
-    substituteInPlace setup.py --replace "'argparse'," ""
-  '';
-
-  propagatedBuildInputs = with python2Packages; [
-    boto
-    dateutil
-    prettytable
-    pytz
-  ];
-
-  meta = {
-    description = "Command line interface for Amazon Glacier";
-    homepage    = "https://github.com/uskudnik/amazon-glacier-cmd-interface";
-    license     = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.lovek323 ];
-  };
-
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3538ac56ecfa..1c65974bfe84 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -41,6 +41,7 @@ mapAliases ({
   ag = silver-searcher; # added 2018-04-25
   aircrackng = aircrack-ng; # added 2016-01-14
   alienfx = throw "alienfx has been removed."; # added 2019-12-08
+  amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30
   ammonite-repl = ammonite; # added 2017-05-02
   antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06
   arduino_core = arduino-core;  # added 2015-02-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a37fab7ec3db..319d015707bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -784,8 +784,6 @@ in
 
   amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { };
 
-  amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
-
   amber = callPackage ../tools/text/amber {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From 2a9e33374b943089f4271fc274493ed0ecc0de54 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 30 Oct 2020 00:40:50 +0100
Subject: [PATCH 0638/3942] up: 0.3.2 -> 0.4.0

https://github.com/akavel/up/releases/tag/v0.4
---
 pkgs/tools/misc/up/default.nix |  8 +++-----
 pkgs/tools/misc/up/gomod.patch | 23 -----------------------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/tools/misc/up/gomod.patch

diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix
index b3d275d3081d..47c504cd1a71 100644
--- a/pkgs/tools/misc/up/default.nix
+++ b/pkgs/tools/misc/up/default.nix
@@ -2,18 +2,16 @@
 
 buildGoModule rec {
   pname = "up";
-  version = "0.3.2";
-
-  patches = [ ./gomod.patch ];
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner = "akavel";
     repo = "up";
     rev = "v${version}";
-    sha256 = "1psixyymk98z52yy92lwb75yfins45dw6rif9cxwd7yiascwg2if";
+    sha256 = "1j8fi14fiwjscfzdfjqxgavjadwvcm5mqr8fb7hx3jmxs4kl58bp";
   };
 
-  vendorSha256 = "1h3w4i7dyh6yagqmdclvflfq6fx0z880jdnpf28assv7fxd9rjsx";
+  vendorSha256 = "1q8wfsfl3rz698ck5q5s5z6iw9k134fxxvwipcp2b052n998rcrx";
 
   doCheck = false;
 
diff --git a/pkgs/tools/misc/up/gomod.patch b/pkgs/tools/misc/up/gomod.patch
deleted file mode 100644
index f894f14d21f1..000000000000
--- a/pkgs/tools/misc/up/gomod.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/go.mod b/go.mod
-index ecbfe90..56a1409 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,11 +1,14 @@
- module github.com/akavel/up
- 
-+go 1.14
-+
- require (
--	github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635
-+	github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 // indirect
- 	github.com/gdamore/tcell v0.0.0-20180924055237-493f3b46b3c2
--	github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856
-+	github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856 // indirect
- 	github.com/mattn/go-isatty v0.0.3
--	github.com/mattn/go-runewidth v0.0.2
-+	github.com/mattn/go-runewidth v0.0.2 // indirect
- 	github.com/spf13/pflag v1.0.3
--	golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38
-+	golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect
-+	golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38 // indirect
- )

From 93a00bec3e51e9a484468e1d3c9a68886d5c6fc0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 30 Oct 2020 18:33:35 +0100
Subject: [PATCH 0639/3942] citrix_workspace: remove attributes for old
 versions; fix i686 build

---
 .../networking/remote/citrix-workspace/generic.nix        | 8 ++++----
 .../networking/remote/citrix-workspace/sources.nix        | 2 +-
 pkgs/top-level/all-packages.nix                           | 4 ----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index a2ad8b8129a6..19165184d252 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -146,8 +146,8 @@ stdenv.mkDerivation rec {
     export HOME=$(mktemp -d)
 
     # Run upstream installer in the store-path.
-    sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./linuxx64/hinst
-    ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)"
+    sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./${prefix}/hinst
+    ${stdenv.shell} ${prefix}/hinst CDROM "$(pwd)"
 
     if [ -f "$ICAInstDir/util/setlog" ]; then
       chmod +x "$ICAInstDir/util/setlog"
@@ -169,8 +169,8 @@ stdenv.mkDerivation rec {
 
     # See https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/reference-information/#library-files
     # Those files are fallbacks to support older libwekit.so and libjpeg.so
-    rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so
-    rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so
+    rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so || true
+    rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so || true
 
     # We support only Gstreamer 1.0
     rm $ICAInstDir/util/{gst_aud_{play,read},gst_*0.10,libgstflatstm0.10.so}
diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index abdd54f4af6e..ea4f46c05196 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -52,7 +52,7 @@ let
   #
   # The lifespans of Citrix products can be found here:
   # https://www.citrix.com/support/product-lifecycle/milestones/receiver.html
-  unsupportedVersions = [ "19.6.0" "19.8.0" "19.10.0" "19.12.0" ];
+  unsupportedVersions = [ ];
 in {
   inherit supportedVersions unsupportedVersions;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d017efe6dfb1..efeafe1cd00f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2857,10 +2857,6 @@ in
   citrix_workspace = citrix_workspace_20_09_0;
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })
-    citrix_workspace_19_6_0
-    citrix_workspace_19_8_0
-    citrix_workspace_19_10_0
-    citrix_workspace_19_12_0
     citrix_workspace_20_04_0
     citrix_workspace_20_06_0
     citrix_workspace_20_09_0

From 6928309c5147b4b2579f0a25d78cd81bcaa4e38b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 30 Oct 2020 18:34:32 +0100
Subject: [PATCH 0640/3942] citrix_workspace: add 20.10.0

ChangeLog: https://docs.citrix.com/en-us/citrix-workspace-app-for-linux/whats-new.html#whats-new-in-2010
---
 .../networking/remote/citrix-workspace/generic.nix    |  4 +++-
 .../networking/remote/citrix-workspace/sources.nix    | 11 +++++++++++
 pkgs/top-level/all-packages.nix                       |  3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 19165184d252..35085d422f26 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -3,6 +3,7 @@
 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
 , gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
+, libpulseaudio
 
 , homepage, version, prefix, hash
 
@@ -97,7 +98,8 @@ stdenv.mkDerivation rec {
     xorg.libXScrnSaver
     xorg.libXtst
     zlib
-  ] ++ lib.optional (lib.versionOlder version "20.04") e2fsprogs;
+  ] ++ lib.optional (lib.versionOlder version "20.04") e2fsprogs
+    ++ lib.optional (lib.versionAtLeast version "20.10") libpulseaudio;
 
   runtimeDependencies = [
     glib
diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index ea4f46c05196..bbeed5b779c2 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -43,6 +43,17 @@ let
       x86hash   = "1b4gdmnnpa61ydiv2fnmap8cnfhskrq6swcs6i1nqrp5zvvkqrv4";
       x64suffix = "15";
       x86suffix = "15";
+      homepage  = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2009.html";
+    };
+
+    "20.10.0" = {
+      major     = "20";
+      minor     = "10";
+      patch     = "0";
+      x64hash   = "13g7r92mhwqwqkm6a4k4yn232ighkmxifs7j8wdi1yva0dvklqdf";
+      x86hash   = "04cr2da25v8x098ccyjwa47d4krk3jpldqkyf4kk2j3hwzbqh9yx";
+      x64suffix = "6";
+      x86suffix = "6";
       homepage  = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efeafe1cd00f..b4b0d24ec720 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2854,12 +2854,13 @@ in
 
   circus = callPackage ../tools/networking/circus { };
 
-  citrix_workspace = citrix_workspace_20_09_0;
+  citrix_workspace = citrix_workspace_20_10_0;
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })
     citrix_workspace_20_04_0
     citrix_workspace_20_06_0
     citrix_workspace_20_09_0
+    citrix_workspace_20_10_0
   ;
 
   citra = libsForQt5.callPackage ../misc/emulators/citra { };

From c85103076353fc690b844e9125d6e628b2ca9ac4 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Oct 2020 13:16:19 -0400
Subject: [PATCH 0641/3942] amazon-image: random.trust_cpu=on to cut 10s from
 boot

Ubuntu and other distros already have this set via kernel config.
---
 nixos/modules/virtualisation/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 20d48add7129..44cb60809452 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -48,7 +48,7 @@ in
     ];
     boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ];
     boot.initrd.availableKernelModules = [ "ixgbevf" "ena" "nvme" ];
-    boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ];
+    boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" "random.trust_cpu=on" ];
 
     # Prevent the nouveau kernel module from being loaded, as it
     # interferes with the nvidia/nvidia-uvm modules needed for CUDA.

From c268484e05e4dc8c74f3ed02ec110b91a0823acb Mon Sep 17 00:00:00 2001
From: pablo1107 <dealberapablo07@gmail.com>
Date: Thu, 21 May 2020 17:41:08 -0300
Subject: [PATCH 0642/3942] ledger2beancount: init at 2.1

---
 pkgs/tools/text/ledger2beancount/default.nix | 58 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/tools/text/ledger2beancount/default.nix

diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix
new file mode 100644
index 000000000000..00cc996ed60c
--- /dev/null
+++ b/pkgs/tools/text/ledger2beancount/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchFromGitHub, makeWrapper, perlPackages, beancount }:
+
+with stdenv.lib;
+
+let
+  perlDeps = with perlPackages; [
+    ConfigOnion DateCalc
+    FileBaseDir YAMLLibYAML
+    GetoptLongDescriptive DateTimeFormatStrptime
+    StringInterpolate
+  ];
+
+in stdenv.mkDerivation rec {
+  pname = "ledger2beancount";
+  version = "2.1";
+
+  src = fetchFromGitHub {
+    owner = "zacchiro";
+    repo = "ledger2beancount";
+    rev = "${version}";
+    sha256 = "0w88jb1x0w02jwwf6ipx3cxr89kzffrrdqws3556zrvvs01bh84j";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+    "fixupPhase"
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ perlPackages.perl beancount ] ++ perlDeps;
+
+  makeFlags = [ "prefix=$(out)" ];
+  installFlags = [ "INSTALL=install" ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r $src/bin $out/bin
+  '';
+
+  postFixup = ''
+    wrapProgram "$out/bin/ledger2beancount" \
+      --set PERL5LIB "${perlPackages.makeFullPerlPath perlDeps}"
+  '';
+
+  meta = {
+    description = "Ledger to Beancount text-based converter";
+    longDescription = ''
+      A script to automatically convert Ledger-based textual ledgers to Beancount ones.
+
+      Conversion is based on (concrete) syntax, so that information that is not meaningful for accounting reasons but still valuable (e.g., comments, formatting, etc.) can be preserved.
+    '';
+    homepage = "https://github.com/zacchiro/ledger2beancount";
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ pablovsky ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4b0d24ec720..86fec0608a20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21965,6 +21965,8 @@ in
 
   ledger-web = callPackage ../applications/office/ledger-web { };
 
+  ledger2beancount = callPackage ../tools/text/ledger2beancount { };
+
   lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { };
 
   lighthouse = callPackage ../applications/misc/lighthouse { };

From c172f144f4059fceeedf31c05afa2a5f065389a8 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 22 Oct 2020 15:59:13 +0300
Subject: [PATCH 0643/3942] kdeApplications: Use latest qt515 by default

Fixes #100707 - Since KDE's maintainers don't allow non official kde
applications under the `kdeApplications` path, many packages that depend
on KDE libraries and applications are defined in all-packages.nix.
Overriding all kdeApplications to use qt514 while all other
`libsForQt5.callPackage` in all-packages.nix are using qt515, causes
collisions.
---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4b0d24ec720..d0d1072477e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13326,7 +13326,7 @@ in
     let
       mkFrameworks = import ../development/libraries/kde-frameworks;
       attrs = {
-        libsForQt5 = libsForQt514;
+        inherit libsForQt5;
         inherit lib fetchurl;
       };
     in
@@ -21692,7 +21692,7 @@ in
     let
       mkApplications = import ../applications/kde;
       attrs = {
-        libsForQt5 = libsForQt514;
+        inherit libsForQt5;
         inherit lib fetchurl;
         inherit okteta;
       };
@@ -25947,7 +25947,7 @@ in
     let
       mkPlasma5 = import ../desktops/plasma-5;
       attrs = {
-        libsForQt5 = libsForQt514;
+        inherit libsForQt5;
         inherit lib fetchurl;
         gconf = gnome2.GConf;
         inherit gsettings-desktop-schemas;

From d44460b52ef242ef510682ddfd3c227c6ed1b159 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 23 Oct 2020 09:09:44 +0300
Subject: [PATCH 0644/3942] kpmcore: Use kio directly - from the scope of
 libsForQt5 used

Make sure only compatible qt versions are used for it (#101369) -
kdeFrameworks is always using `libsForQt5` where e.g
`libsForQt514.kpmcore` would have otherwise used a kio compiled with
qt515.
---
 pkgs/development/libraries/kpmcore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix
index 7903fc746390..8cda52c4aecd 100644
--- a/pkgs/development/libraries/kpmcore/default.nix
+++ b/pkgs/development/libraries/kpmcore/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, extra-cmake-modules
-, qtbase, kdeFrameworks
+, qtbase, kio
 , libatasmart, parted
 , utillinux }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     libatasmart
     parted # we only need the library
 
-    kdeFrameworks.kio
+    kio
 
     utillinux # needs blkid (note that this is not provided by utillinux-compat)
   ];

From cb29abf3a99fa13cae065ba79e1562fc7ee18264 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 23 Oct 2020 09:16:25 +0300
Subject: [PATCH 0645/3942] all-packages.nix: Inherit kdesu in a different
 scope

Part of #101369: In order to avoid packages using the default `kdesu`
always built with qt515, we put it in scope only for packages defined
with a `libsForQt5`, to avoid incompatible qt versions used together in
inputs of a package.
---
 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 d0d1072477e6..ae65a3e235eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15196,7 +15196,7 @@ in
       kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
       networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet
       syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose
-      kcontacts kquickcharts kdoctools kapidox;
+      kcontacts kquickcharts kdoctools kapidox kdesu;
 
     ### KDE PLASMA 5
 
@@ -21735,8 +21735,6 @@ in
 
   k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
 
-  inherit (kdeFrameworks) kdesu;
-
   kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
 
   kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix {

From 62318eb816820e5778388d1cfd5ffb1e08dd6748 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 30 Oct 2020 20:26:30 +0200
Subject: [PATCH 0646/3942] kf5gpgmepp: Define in libsForQt5

Since it's a qt library, we can't guarantee every package using it as a
dependency will need it compiled with the same qt version, we put it in
all `libsForQt5*` scopes (#101369).
---
 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 ae65a3e235eb..80e69da5a621 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13341,8 +13341,6 @@ in
     automake = automake111x;
   };
 
-  kf5gpgmepp = libsForQt5.callPackage ../development/libraries/kf5gpgmepp { };
-
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
     inherit (buildPackages.darwin) bootstrap_cmds;
   };
@@ -15230,6 +15228,8 @@ in
 
     kdsoap = callPackage ../development/libraries/kdsoap { };
 
+    kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { };
+
     kproperty = callPackage ../development/libraries/kproperty { };
 
     kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { };

From 0126c86672b7d14843225df16ddfefd7091eabe7 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 30 Oct 2020 16:33:10 +0100
Subject: [PATCH 0647/3942] linuxstopmotion: 0.8.0 -> 0.8.5

and qt4 -> qt5
---
 .../video/linuxstopmotion/default.nix         | 32 ++++++++----------
 ...stopmotion-fix-wrong-isProcess-logic.patch | 33 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 14 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch

diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix
index 3a2d1b79e9e0..365fb1ea417a 100644
--- a/pkgs/applications/video/linuxstopmotion/default.nix
+++ b/pkgs/applications/video/linuxstopmotion/default.nix
@@ -1,32 +1,26 @@
-{ stdenv, fetchgit, pkgconfig, qt4, SDL, SDL_image, libvorbis, libtar, libxml2
-, gamin, qmake4Hook
-}:
+{ mkDerivation, lib, fetchgit, pkgconfig, qmake, qtbase, qttools, qtmultimedia, libvorbis, libtar, libxml2 }:
 
-stdenv.mkDerivation rec {
-  version = "0.8";
+mkDerivation rec {
+  version = "0.8.5";
   pname = "linuxstopmotion";
-  
+
   src = fetchgit {
-    url = "git://git.code.sf.net/p/linuxstopmotion/code";
-    rev = "refs/tags/${version}";
-    sha256 = "19v9d0v3laiwi0f1n92lvj2s5s1mxsrfygna0xyw9pkcnk3b26q6";
+    url = "https://git.code.sf.net/p/linuxstopmotion/code";
+    rev = version;
+    sha256 = "1612lkwsfzc59wvdj2zbj5cwsyw66bwn31jrzjrxvygxdh4ab069";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ];
+  nativeBuildInputs = [ qmake pkgconfig ];
+  buildInputs = [ qtbase qttools qtmultimedia libvorbis libtar libxml2 ];
 
-  patches = [ ./linuxstopmotion-fix-wrong-isProcess-logic.patch ];
-
-  # Installation breaks without this
-  preInstall = ''
-    mkdir -p "$out/share/stopmotion/translations/"
-    cp -v build/*.qm "$out/share/stopmotion/translations/"
+  postPatch = ''
+    substituteInPlace stopmotion.pro --replace '$$[QT_INSTALL_BINS]' '${lib.getDev qttools}/bin'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Create stop-motion animation movies";
     homepage = "http://linuxstopmotion.org/";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch b/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch
deleted file mode 100644
index caab48d0e2d9..000000000000
--- a/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b23b7dab1d540b0710fcb9ded1c6256a49844906 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
-Date: Wed, 20 Aug 2014 22:22:00 +0200
-Subject: [PATCH] Fix wrong "isProcess" logic
-
-Stopmotion wrongly thinks that uvccapture should be run as a daemon,
-even though configuration for uvccapture has no "daemon-like" command
-line to be run (according to "preferences"). The result is an error
-popup instead of video/image grabbing.
-
-This brings back the "isProcess" logic that was in stopmotion v0.7.2,
-because it seems to work, while the current logic (v0.8.0) seems to
-fail.
----
- src/presentation/frontends/qtfrontend/frameview.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/presentation/frontends/qtfrontend/frameview.cpp b/src/presentation/frontends/qtfrontend/frameview.cpp
-index e44dca7..d2c41fd 100644
---- a/src/presentation/frontends/qtfrontend/frameview.cpp
-+++ b/src/presentation/frontends/qtfrontend/frameview.cpp
-@@ -270,7 +270,7 @@ bool FrameView::on() {
- 	Preference device(QString("device%1")
- 			.arg(activeDev).toLatin1().constData(), "");
- 	QString pre = QString(prepoll.get()).replace("$VIDEODEVICE", device.get());
--	bool isProcess = startDaemon.get();
-+	bool isProcess = (strcmp(startDaemon.get(), "") == 0) ? false : true;
- 
- 	bool isCameraReady = true;
- 	this->grabber = new CommandLineGrabber(capturedFile.path(), isProcess);
--- 
-2.0.2
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4b0d24ec720..f88d9acc932a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23403,7 +23403,7 @@ in
 
   stella = callPackage ../misc/emulators/stella { };
 
-  linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
+  linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { };
 
   sweethome3d = recurseIntoAttrs (  (callPackage ../applications/misc/sweethome3d {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731

From 460a30c15b58fadd7c022a3877bb5f4e544003fd Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 30 Oct 2020 19:26:47 +0100
Subject: [PATCH 0648/3942] matrix-synapse: 1.22.0 -> 1.22.1

https://github.com/matrix-org/synapse/releases/tag/v1.22.1
---
 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 04700a9e209e..fbdce3a2220e 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -10,11 +10,11 @@ let
 in
 buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dl4a5zirrjabbfibl9vj4zb16md11kqkz2v9l299gxbwwvzqc39";
+    sha256 = "1pbxdqpfa7wzdz61p6x58x7841vng1g65qayxgcw73bn1shl50jb";
   };
 
   patches = [

From 2df527228f83d502a6a59d8d22200b1ef269cf41 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 30 Oct 2020 20:30:34 +0200
Subject: [PATCH 0649/3942] all-packages: Put all libsForQt5 near each other

---
 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 80e69da5a621..28ec0bc20d2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15136,8 +15136,6 @@ in
       inherit llvmPackages_5;
     });
 
-  libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5);
-
   qt514 = recurseIntoAttrs (makeOverridable
     (import ../development/libraries/qt-5/5.14) {
       inherit newScope;
@@ -15168,6 +15166,8 @@ in
       inherit llvmPackages_5;
     });
 
+  libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5);
+
   libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5);
 
   libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5);

From b5c6505e63d800d044923d7c8459cd085cd16a49 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 30 Oct 2020 20:32:19 +0200
Subject: [PATCH 0650/3942] treewide: Safer libsForQt5.callPackage

Intro:

Part of #101369: Every attribute from kdeApplications and kdeFrameworks
can be built with a few different qt5 versions. It's hard to tell the
difference between an application and a library and some applications
rely on inputs from kdeApplications and libsForQt5 alike.

Before this change, some applications that were defined with
`libsForQt5.callPackage` used libraries from the kde* sets compiled with
a specific qt5 version,

Due to `inherit (kde*) <lib or app>;` used in the widest scope, we had
issues with packages that depended on packages defined by this
`inherit`. This led to mismatched qt versions used in the same inputs,
or the inputs of inputs etc.

Hence, we added to all libsForQt5* sets, packages that will be used from
the correct libsForQt5 set, in accordance to the
`libsForQt5*.callPackage` used. All `inherit (kdeApplications) <pkgs>`
and similar inheritance was moved out of all-packages.nix to aliases.nix
only for backwards compatibility.

Now some KDE applications show up in the attribute sets `libsForQt5*`
which didn't show up there previously. This is sort of misleading, as
these are not necessary libraries, but they show up in the wider scope
thanks to them in aliases.nix. Hence it's the best that can be done
considering the circumstances and the urgency of the issue.
---
 pkgs/top-level/aliases.nix      |  53 +++++++++++++
 pkgs/top-level/all-packages.nix | 130 +++++++++++++-------------------
 2 files changed, 105 insertions(+), 78 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eeb5519233ce..50aa36745ddc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -750,4 +750,57 @@ mapAliases ({
 
   ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula.";
 
+  /* If these are in the scope of all-packages.nix, they cause collisions
+  between mixed versions of qt. See:
+  https://github.com/NixOS/nixpkgs/pull/101369 */
+
+  inherit (kdeFrameworks) breeze-icons oxygen-icons5;
+  inherit (kdeApplications)
+    akonadi akregator ark
+    bomber bovo
+    dolphin dragon
+    elisa
+    ffmpegthumbs filelight
+    granatier gwenview
+    k3b
+    kaddressbook kalzium kapptemplate kapman kate katomic
+    kblackbox kblocks kbounce
+    kcachegrind kcalc kcharselect kcolorchooser
+    kdenlive kdf kdialog kdiamond
+    keditbookmarks
+    kfind kfloppy
+    kget kgpg
+    khelpcenter
+    kig kigo killbots kitinerary
+    kleopatra klettres klines
+    kmag kmail kmines kmix kmplot
+    knavalbattle knetwalk knights
+    kollision kolourpaint kompare konsole kontact korganizer
+    kpkpass
+    krdc kreversi krfb
+    kshisen ksquares ksystemlog
+    kteatime ktimer ktouch kturtle
+    kwalletmanager kwave
+    marble minuet
+    okular
+    picmi
+    spectacle
+    yakuake
+  ;
+  inherit (plasma5)
+    bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover
+    kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
+    kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
+    kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration
+    plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
+    plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
+    systemsettings user-manager xdg-desktop-portal-kde
+  ;
+  inherit (plasma5.thirdParty)
+    plasma-applet-caffeine-plus
+    kwin-dynamic-workspaces
+    kwin-tiling
+    krohnkite
+  ;
+
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28ec0bc20d2d..accfcd4e9ba3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15194,17 +15194,41 @@ in
       kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
       networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet
       syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose
-      kcontacts kquickcharts kdoctools kapidox kdesu;
+      kcontacts kquickcharts kdoctools kapidox kdesu kinit kded frameworkintegration
+      kdewebkit breeze-icons
+    ;
 
     ### KDE PLASMA 5
 
     inherit (plasma5.override { libsForQt5 = self; })
-      kdecoration khotkeys libkscreen libksysguard;
+      kdecoration khotkeys libkscreen libksysguard bluedevil
+      breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover kactivitymanagerd
+      kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit
+      kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration
+      kwin kwrited milou oxygen plasma-browser-integration plasma-desktop
+      plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
+      plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
+      systemsettings user-manager xdg-desktop-portal-kde
+    ;
+
+    inherit ((plasma5.override { libsForQt5 = self; }).thirdParty)
+      plasma-applet-caffeine-plus kwin-dynamic-workspaces kwin-tiling krohnkite
+    ;
 
     ### KDE APPLICATIONS
 
     inherit (kdeApplications.override { libsForQt5 = self; })
-      libkdcraw libkexiv2 libkipi libkomparediff2 libksane;
+      libkdcraw libkexiv2 libkipi libkomparediff2 libksane libkcddb akonadi-contacts
+      akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface
+      kldap akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight
+      granatier gwenview k3b kaddressbook kalzium kapptemplate kapman kate katomic
+      kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser
+      kdenlive kdf kdialog kdiamond keditbookmarks kfind kfloppy kget kgpg khelpcenter
+      kig kigo killbots kitinerary kleopatra klettres klines kmag kmail kmines kmix kmplot
+      knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact korganizer
+      kpkpass krdc kreversi krfb kshisen ksquares ksystemlog kteatime ktimer ktouch kturtle
+      kwalletmanager kwave marble minuet okular picmi spectacle yakuake
+    ;
 
     ### LIBRARIES
 
@@ -18968,8 +18992,6 @@ in
 
   brise = callPackage ../data/misc/brise { };
 
-  inherit (kdeFrameworks) breeze-icons;
-
   cacert = callPackage ../data/misc/cacert { };
 
   caladea = callPackage ../data/fonts/caladea {};
@@ -19135,7 +19157,9 @@ in
 
   fira-mono = callPackage ../data/fonts/fira-mono { };
 
-  flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { };
+  flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme {
+    inherit (kdeFrameworks) breeze-icons;
+  };
 
   font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4;
   font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5;
@@ -19294,7 +19318,9 @@ in
 
   luculent = callPackage ../data/fonts/luculent { };
 
-  luna-icons = callPackage ../data/icons/luna-icons { };
+  luna-icons = callPackage ../data/icons/luna-icons {
+    inherit (kdeFrameworks) breeze-icons;
+  };
 
   maia-icon-theme = callPackage ../data/icons/maia-icon-theme { };
 
@@ -19415,15 +19441,17 @@ in
 
   oxygenfonts = callPackage ../data/fonts/oxygenfonts { };
 
-  inherit (kdeFrameworks) oxygen-icons5;
-
   paper-gtk-theme = callPackage ../data/themes/paper-gtk { };
 
   paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };
 
-  papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { };
+  papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme {
+    inherit (kdeFrameworks) breeze-icons;
+  };
 
-  papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { };
+  papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme {
+    inherit (kdeFrameworks) breeze-icons;
+  };
 
   papis = with python3Packages; toPythonApplication papis;
 
@@ -19453,7 +19481,9 @@ in
 
   pop-gtk-theme = callPackage ../data/themes/pop-gtk { };
 
-  pop-icon-theme = callPackage ../data/icons/pop-icon-theme { };
+  pop-icon-theme = callPackage ../data/icons/pop-icon-theme {
+    inherit (kdeFrameworks) breeze-icons;
+  };
 
   posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
 
@@ -19733,7 +19763,9 @@ in
 
   yaru-theme = callPackage ../data/themes/yaru {};
 
-  zafiro-icons = callPackage ../data/icons/zafiro-icons { };
+  zafiro-icons = callPackage ../data/icons/zafiro-icons {
+    inherit (kdeFrameworks) breeze-icons;
+  };
 
   zeal = libsForQt514.callPackage ../data/documentation/zeal { };
 
@@ -20114,9 +20146,12 @@ in
   calibre = calibre-py3;
 
   calligra = libsForQt514.callPackage ../applications/office/calligra {
-    inherit (kdeApplications) akonadi-calendar akonadi-contacts;
     openjpeg = openjpeg_1;
-    poppler = poppler_0_61;
+    poppler = poppler_0_61.override {
+      qt5Support = true;
+      # Must be using the same qt version as calligra itself.
+      qtbase = qt514.qtbase;
+    };
   };
 
   perkeep = callPackage ../applications/misc/perkeep { };
@@ -21699,38 +21734,6 @@ in
     in
       recurseIntoAttrs (makeOverridable mkApplications attrs);
 
-  inherit (kdeApplications)
-    akonadi akregator ark
-    bomber bovo
-    dolphin dragon
-    elisa
-    ffmpegthumbs filelight
-    granatier gwenview
-    k3b
-    kaddressbook kalzium kapptemplate kapman kate katomic
-    kblackbox kblocks kbounce
-    kcachegrind kcalc kcharselect kcolorchooser
-    kdeconnect-kde kdenlive kdf kdialog kdiamond
-    keditbookmarks
-    kfind kfloppy
-    kget kgpg
-    khelpcenter
-    kig kigo killbots kitinerary
-    kleopatra klettres klines
-    kmag kmail kmines kmix kmplot
-    knavalbattle knetwalk knights
-    kollision kolourpaint kompare konsole kontact korganizer
-    kpkpass
-    krdc kreversi krfb
-    kshisen ksquares ksystemlog
-    kteatime ktimer ktouch kturtle
-    kwalletmanager kwave
-    marble minuet
-    okular
-    picmi
-    spectacle
-    yakuake;
-
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 
   k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
@@ -21787,10 +21790,7 @@ in
 
   kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
 
-  kmymoney = libsForQt5.callPackage ../applications/office/kmymoney {
-    inherit (kdeApplications) kidentitymanagement;
-    inherit (kdeFrameworks) kdewebkit;
-  };
+  kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { };
 
   kodestudio = callPackage ../applications/editors/kodestudio { };
 
@@ -23867,9 +23867,7 @@ in
 
   tribler = callPackage ../applications/networking/p2p/tribler { };
 
-  trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita {
-    inherit (kdeApplications) akonadi-contacts;
-  };
+  trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { };
 
   tudu = callPackage ../applications/office/tudu { };
 
@@ -24686,8 +24684,6 @@ in
   zam-plugins = callPackage ../applications/audio/zam-plugins { };
 
   zanshin = libsForQt514.callPackage ../applications/office/zanshin {
-    inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap;
-    inherit (kdeFrameworks) krunner kwallet kcalendarcore;
     boost = boost160;
   };
 
@@ -25029,9 +25025,6 @@ in
   dhewm3 = callPackage ../games/dhewm3 {};
 
   digikam = libsForQt514.callPackage ../applications/graphics/digikam {
-    inherit (plasma5) oxygen;
-    inherit (kdeApplications) akonadi-contacts;
-    inherit (kdeFrameworks) kcalendarcore;
     opencv3 = opencv3WithoutCuda;
   };
 
@@ -25953,25 +25946,6 @@ in
     in
       recurseIntoAttrs (makeOverridable mkPlasma5 attrs);
 
-  inherit (kdeFrameworks) kded kinit frameworkintegration;
-
-  inherit (plasma5)
-    bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover
-    kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
-    kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
-    kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration
-    plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
-    plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
-    systemsettings user-manager xdg-desktop-portal-kde;
-
-  inherit (plasma5.thirdParty)
-    plasma-applet-caffeine-plus
-    kwin-dynamic-workspaces
-    kwin-tiling
-    krohnkite;
-
-  ### SCIENCE
-
   ### SCIENCE/CHEMISTY
 
   avogadro = callPackage ../applications/science/chemistry/avogadro {

From ea9de43bf41fac821b530d5342ffea4031de9804 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 30 Oct 2020 20:34:14 +0200
Subject: [PATCH 0651/3942] tellico: Use libkcddb from libsForQt5's scope.

Part of (#101369): kdeApplications points to a set of derivations built
with a specific qt version, where libkcddb is available in libsForQt5's
callPackage scope, thanks to the parent commit of this commit.
---
 pkgs/applications/misc/tellico/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix
index 6425be004186..fa725ad9c96c 100644
--- a/pkgs/applications/misc/tellico/default.nix
+++ b/pkgs/applications/misc/tellico/default.nix
@@ -1,7 +1,7 @@
 { lib
 , fetchurl
 , mkDerivation
-, kdeApplications
+, libkcddb
 , kinit
 , kdelibs4support
 , solid
@@ -46,7 +46,7 @@ mkDerivation rec {
     exempi
     extra-cmake-modules
     karchive
-    kdeApplications.libkcddb
+    libkcddb
     kdelibs4support
     kfilemetadata
     khtml

From cf9f00b56d445b3443dc0d779f97e40dde0bb18d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 23 Oct 2020 09:43:27 +0300
Subject: [PATCH 0652/3942] maia-icon-theme: Don't import kdeApplications

Use libsForQt5.callPackage (#101369).
---
 pkgs/data/icons/maia-icon-theme/default.nix | 14 +++++++++++---
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix
index ee539981fbca..2a6dbc512acc 100644
--- a/pkgs/data/icons/maia-icon-theme/default.nix
+++ b/pkgs/data/icons/maia-icon-theme/default.nix
@@ -1,4 +1,12 @@
-{ stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }:
+{ stdenv
+, fetchFromGitLab
+, cmake
+, extra-cmake-modules
+, gtk3
+, plasma-framework
+, kwindowsystem
+, hicolor-icon-theme
+}:
 
 stdenv.mkDerivation {
   pname = "maia-icon-theme";
@@ -17,8 +25,8 @@ stdenv.mkDerivation {
     cmake
     extra-cmake-modules
     gtk3
-    kdeFrameworks.plasma-framework
-    kdeFrameworks.kwindowsystem
+    plasma-framework
+    kwindowsystem
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index accfcd4e9ba3..bd0e43862eef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19322,7 +19322,7 @@ in
     inherit (kdeFrameworks) breeze-icons;
   };
 
-  maia-icon-theme = callPackage ../data/icons/maia-icon-theme { };
+  maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { };
 
   mailcap = callPackage ../data/misc/mailcap { };
 

From 2508fa525226f7b4a91fba44b47fade7a69a2c27 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 23 Oct 2020 10:44:42 +0300
Subject: [PATCH 0653/3942] lxqt.compton-conf: Use compatible qt5 versions

Slightly related to #101369, a follow up to:
https://github.com/NixOS/nixpkgs/commit/4fd58aa4e18c06ead397ad45d68b76d0930c6cbb
---
 pkgs/desktops/lxqt/default.nix  | 2 +-
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 90e466f7471e..1292da151acf 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -43,7 +43,7 @@ let
 
     ### OPTIONAL
     qterminal = callPackage ./qterminal {};
-    compton-conf = pkgs.qt5.callPackage ./compton-conf {};
+    compton-conf = qt5.callPackage ./compton-conf {};
     obconf-qt = callPackage ./obconf-qt {};
     lximage-qt = callPackage ./lximage-qt {};
     qps = callPackage ./qps {};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd0e43862eef..22f23571a3b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25900,6 +25900,7 @@ in
   lumina = recurseIntoAttrs (callPackage ../desktops/lumina { });
 
   lxqt = recurseIntoAttrs (import ../desktops/lxqt {
+    # TODO: Update these to qt515 at some point
     qt5 = qt514;
     libsForQt5 = libsForQt514;
     inherit pkgs;

From c8a7e4da0aac942485aad983a806840660fc9660 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 23 Oct 2020 14:49:45 +0300
Subject: [PATCH 0654/3942] firefox/wrapper: Use plasma-browser-integration
 correctly

Don't rely on the attribute from the aliases.nix, as ofborg checks that
in PRs.
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 9c8625495b20..cc6cc72e27be 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -4,7 +4,7 @@
 , flashplayer, hal-flash
 , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd
 , gnome3/*.gnome-shell*/
-, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
+, browserpass, chrome-gnome-shell, uget-integrator, plasma5, bukubrow
 , tridactyl-native
 , fx_cast_bridge
 , udev
@@ -65,7 +65,7 @@ let
           ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native
           ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
           ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
-          ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
+          ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5.plasma-browser-integration
           ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge
           ++ extraNativeMessagingHosts
         );

From 3ce9e203c3d0e4f38d14a894d1313d3cb62d998b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 23 Oct 2020 17:20:42 +0300
Subject: [PATCH 0655/3942] drumstick: Define in libsForQt5 scope.

Since it is used in minuet and kde's metronome and kmetronome, it's
safer this way to make sure the same qt version is used there.
---
 pkgs/development/libraries/drumstick/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index 0d3e2913ce8e..7cd826b1fe39 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, alsaLib, cmake, docbook_xsl, docbook_xml_dtd_45, doxygen
-, fluidsynth, pkgconfig, qt5
+, fluidsynth, pkgconfig, qtbase, qtsvg
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ];
   buildInputs = [
-    alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg
+    alsaLib doxygen fluidsynth qtbase qtsvg
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22f23571a3b5..bb74671de32a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8751,8 +8751,6 @@ in
 
   dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;};
 
-  drumstick = callPackage ../development/libraries/drumstick { };
-
   ecl = callPackage ../development/compilers/ecl { };
   ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { };
 
@@ -15240,6 +15238,8 @@ in
 
     dxflib = callPackage ../development/libraries/dxflib {};
 
+    drumstick = callPackage ../development/libraries/drumstick { };
+
     fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
 
     qgpgme = callPackage ../development/libraries/gpgme { };

From 9f9bdaba97221afb86dbaf3f7288378a37455156 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 23 Oct 2020 17:26:47 +0300
Subject: [PATCH 0656/3942] packagekit-qt: Move to libsForQt5 scope.

Since it's a dependency of kde's "discover", it's best to define it
there to avoid a possible mixed qt5 versions usage (#101369).
---
 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 bb74671de32a..254258dbf131 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6216,8 +6216,6 @@ in
 
   packagekit = callPackage ../tools/package-management/packagekit { };
 
-  packagekit-qt = libsForQt5.callPackage ../tools/package-management/packagekit/qt.nix { };
-
   packetdrill = callPackage ../tools/networking/packetdrill { };
 
   pacman = callPackage ../tools/package-management/pacman { };
@@ -15274,6 +15272,8 @@ in
 
     libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { };
 
+    packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { };
+
     libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };
 
     libqglviewer = callPackage ../development/libraries/libqglviewer {

From e681f442c98ac653ffcc50f014b66b686c2e9470 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 23 Oct 2020 19:44:17 +0300
Subject: [PATCH 0657/3942] nixos/plasma: Fix attribute path to kinit

---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index ad0385ddeed2..b4f45a24efd3 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -200,7 +200,7 @@ in
 
       security.wrappers = {
         kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/libexec/kcheckpass";
-        start_kdeinit.source = "${lib.getBin pkgs.kinit}/libexec/kf5/start_kdeinit";
+        start_kdeinit.source = "${lib.getBin pkgs.kdeFrameworks.kinit}/libexec/kf5/start_kdeinit";
         kwin_wayland = {
           source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";
           capabilities = "cap_sys_nice+ep";

From 368302af0d616699ffd1a6cb032daa506d613c91 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 25 Oct 2020 22:00:19 +0200
Subject: [PATCH 0658/3942] Revert "plasma5: mark broken with Qt >= 5.15"

This reverts commit 575b3a053aacd5630b44cc73c4e5505baebfe6d5.

We don't know why ttuegel did it, and we suspect it was due to packages
breaking due to mixed qt5 versions used together, and not plasma itself
with qt5.15 - (#101369).
---
 pkgs/desktops/plasma-5/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 8ab4b60156c6..265c22b55655 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -36,7 +36,6 @@ let
   };
 
   mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
-  qtbase = libsForQt5.callPackage ({ qtbase }: qtbase) {};
 
   packages = self: with self;
     let
@@ -83,7 +82,6 @@ let
             setupHook = args.setupHook or defaultSetupHook;
 
             meta = {
-              broken = lib.versionAtLeast qtbase.version "5.15";
               license = with lib.licenses; [
                 lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
               ];

From a728279d7050bad8e45f5ff64b7e660a74cda3cd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 26 Oct 2020 22:41:35 +0200
Subject: [PATCH 0659/3942] sddm: Move to libsForQt5*

Part of #101369: Inherit it in aliases.nix, for backwards compatibility.
---
 pkgs/top-level/aliases.nix      | 3 +++
 pkgs/top-level/all-packages.nix | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 50aa36745ddc..2655ecbfe305 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -802,5 +802,8 @@ mapAliases ({
     kwin-tiling
     krohnkite
   ;
+  inherit (libsForQt5)
+    sddm
+  ;
 
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 254258dbf131..4ac1911cbab9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15344,6 +15344,9 @@ in
 
     qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };
 
+    # Not a library, but we do want it to be built for every qt version there
+    # is, to allow users to choose the right build if needed.
+    sddm = callPackage ../applications/display-managers/sddm { };
   };
 
   qtEnv = qt5.env;
@@ -23485,8 +23488,6 @@ in
 
   robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
 
-  sddm = libsForQt514.callPackage ../applications/display-managers/sddm { };
-
   skrooge = libsForQt514.callPackage ../applications/office/skrooge {};
 
   smartgithg = callPackage ../applications/version-management/smartgithg {

From 77e081bb2b82a412b901abffb347ca4eb2e75eec Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 26 Oct 2020 22:48:27 +0200
Subject: [PATCH 0660/3942] nixos/sddm: Use libsForQt514.sddm if needed (for
 lxqt)

Currently lxqt is a desktop environment that's compiled against qt514.
To avoid possible issues (#101369), we (hopefully) use the same qt
version as the desktop environment at hand. LXQT should move to qt515,
and for the long term the correct qt version should be inherited by the
sddm module.
---
 nixos/modules/services/x11/display-managers/sddm.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix                      | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 4040b903426b..a39bb55b38c4 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -9,7 +9,12 @@ let
   cfg = dmcfg.sddm;
   xEnv = config.systemd.services.display-manager.environment;
 
-  inherit (pkgs) sddm;
+  sddm = if config.services.xserver.desktopManager.lxqt.enable then
+    # TODO: Move lxqt to libsForQt515
+    pkgs.libsForQt514.sddm
+  else
+    pkgs.libsForQt5.sddm
+  ;
 
   xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
     #!/bin/sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ac1911cbab9..93a0f316b1b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25901,7 +25901,8 @@ in
   lumina = recurseIntoAttrs (callPackage ../desktops/lumina { });
 
   lxqt = recurseIntoAttrs (import ../desktops/lxqt {
-    # TODO: Update these to qt515 at some point
+    # TODO: Update these to qt515 at some point. When doing it, please remove
+    # the choice of libsForQt5*.sddm in sddm's module.
     qt5 = qt514;
     libsForQt5 = libsForQt514;
     inherit pkgs;

From 09fd4270d7cc8f1ea408d40a37e79f57dcb2eb3a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 30 Oct 2020 20:39:19 +0200
Subject: [PATCH 0661/3942] kile: some slight improvements/fixes

Use `buildInputs` instead of `propagatedBuildInputs` - should reduce
closure size a bit. Don't wrap executables twice. Move `kdoctools` to
native. Use libsForQt5 - default version (works).

Co-authored-by: Frederik Rietdijk <fridh@fridh.nl>
---
 pkgs/applications/editors/kile/default.nix | 13 ++++++++++---
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index 1f1e43d196ce..6819c4337f4c 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -29,14 +29,17 @@ mkDerivation rec {
     sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA=";
   };
 
-  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
+  nativeBuildInputs = [
+    extra-cmake-modules
+    wrapGAppsHook
+    kdoctools
+  ];
 
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig
     kcrash
     kdbusaddons
     kdelibs4support
-    kdoctools
     kguiaddons
     kiconthemes
     kinit
@@ -48,6 +51,10 @@ mkDerivation rec {
     poppler
     qtscript
   ];
+  dontWrapGApps = true;
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
 
   propagatedUserEnvPkgs = [ konsole ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93a0f316b1b7..554847673eb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21778,7 +21778,7 @@ in
 
   kid3 = libsForQt5.callPackage ../applications/audio/kid3 { };
 
-  kile = libsForQt514.callPackage ../applications/editors/kile { };
+  kile = libsForQt5.callPackage ../applications/editors/kile { };
 
   kino = callPackage ../applications/video/kino {
     inherit (gnome2) libglade;

From 1f75b60c56688d79366ceb7cd11b597fc680dbfd Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 30 Oct 2020 16:44:08 +0100
Subject: [PATCH 0662/3942] doxygen: 1.8.19 -> 1.8.20

also move doxygen_gui to qt5 and modernize the expression a bit

enableParallel was disabled, since it reproducably failed on my
dual-socket Xeon machine
---
 .../tools/documentation/doxygen/default.nix   | 26 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 +--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 772b654df935..613dec86d7cd 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, cmake, fetchurl, python3, flex, bison, qt4, CoreServices, libiconv }:
+{ stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }:
 
 stdenv.mkDerivation rec {
+  pname = "doxygen";
+  version = "1.8.20";
 
-  name = "doxygen-1.8.19";
-
-  src = fetchurl {
-    urls = [
-      "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc.
-      "http://doxygen.nl/files/${name}.src.tar.gz"
-    ];
-    sha256 = "1lvqfw2yzba588c5ggl8yhw7aw4xkk44mrghsd9yqlajc48x25dc";
+  src = fetchFromGitHub {
+    owner = "doxygen";
+    repo = "doxygen";
+    rev = "Release_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
+    sha256 = "17chvi3i80rj4750smpizf562xjzd2xcv5rfyh997pyvc1zbq5rh";
   };
 
   nativeBuildInputs = [
@@ -20,19 +19,18 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-       stdenv.lib.optional (qt4 != null) qt4
+       stdenv.lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ])
     ++ stdenv.lib.optional stdenv.isSunOS libiconv
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
 
   cmakeFlags =
     [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++
-    stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES";
+    stdenv.lib.optional (qt5 != null) "-Dbuild_wizard=YES";
 
   NIX_CFLAGS_COMPILE =
     stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
 
-  enableParallelBuilding = true;
-  doCheck = false; # fails
+  enableParallelBuilding = false;
 
   meta = {
     license = stdenv.lib.licenses.gpl2Plus;
@@ -47,6 +45,6 @@ stdenv.mkDerivation rec {
       manual (in LaTeX) from a set of documented source files.
     '';
 
-    platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
+    platforms = if qt5 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd5facef8271..e133e2c2c4b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11024,11 +11024,11 @@ in
   dot2tex = with python3.pkgs; toPythonApplication dot2tex;
 
   doxygen = callPackage ../development/tools/documentation/doxygen {
-    qt4 = null;
+    qt5 = null;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  doxygen_gui = lowPrio (doxygen.override { inherit qt4; });
+  doxygen_gui = lowPrio (doxygen.override { inherit qt5; });
 
   drake = callPackage ../development/tools/build-managers/drake { };
 

From 35078d9918d3c628fa136a2845b8561535ba09eb Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 30 Oct 2020 21:03:39 +0200
Subject: [PATCH 0663/3942] kdiagram: 2.6.0 -> 2.7.0

Use fetchFromGitLab as it seems to be unavailable in the previous url.
---
 pkgs/development/libraries/kdiagram/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix
index 50f3e6a6c025..b9f16d3cfaef 100644
--- a/pkgs/development/libraries/kdiagram/default.nix
+++ b/pkgs/development/libraries/kdiagram/default.nix
@@ -1,14 +1,18 @@
 {
-  mkDerivation, fetchurl, lib,
+  mkDerivation, fetchFromGitLab, lib,
   extra-cmake-modules, qttools,
   qtbase, qtsvg,
 }:
 
-mkDerivation {
-  name = "kdiagram-2.6.0";
-  src = fetchurl {
-    url = "https://download.kde.org/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz";
-    sha256 = "10hqk12wwgbiq4q5145s8v7v96j621ckq1yil9s4pihmgsnqsy02";
+mkDerivation rec {
+  pname = "kdiagram";
+  version = "2.7.0";
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    owner = "graphics";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "NSBNHPr8JzBn3y3ivhL0RjiXjDuPwZsTTOeI22pq3vc=";
   };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ qtbase qtsvg ];

From 936ef7525dcfdb455f241e017d225f6c4886f6dd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 06:24:33 +0100
Subject: [PATCH 0664/3942] ocamlPackages.bistro: use Dune 2

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

diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix
index 9603f283ee4f..78ca63ab90c2 100644
--- a/pkgs/development/ocaml-modules/bistro/default.nix
+++ b/pkgs/development/ocaml-modules/bistro/default.nix
@@ -5,6 +5,9 @@
 buildDunePackage rec {
   pname = "bistro";
   version = "0.5.0";
+
+  useDune2 = true;
+
   src = fetchFromGitHub {
     owner = "pveber";
     repo = pname;

From 4afd690197df232cdad74de21a4c55ec2254d8e0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 06:24:39 +0100
Subject: [PATCH 0665/3942] ocamlPackages.webmachine: use Dune 2

---
 pkgs/development/ocaml-modules/webmachine/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix
index 3bf163607cd2..afb26cfb354b 100644
--- a/pkgs/development/ocaml-modules/webmachine/default.nix
+++ b/pkgs/development/ocaml-modules/webmachine/default.nix
@@ -6,6 +6,7 @@
 buildDunePackage rec {
   pname = "webmachine";
   version = "0.6.2";
+  useDune2 = true;
 
   minimumOCamlVersion = "4.04";
 

From 8b1ceeb896fd9d77abb9751eeabaf8a50d61a168 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 06:24:43 +0100
Subject: [PATCH 0666/3942] ocamlPackages.cohttp: use Dune 2

---
 pkgs/development/ocaml-modules/cohttp/default.nix | 2 ++
 pkgs/development/ocaml-modules/cohttp/lwt.nix     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 6cb802e437d7..3fed7c55d452 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -7,6 +7,8 @@ buildDunePackage rec {
 	pname = "cohttp";
 	version = "2.5.4";
 
+	useDune2 = true;
+
 	minimumOCamlVersion = "4.04.1";
 
 	src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix
index 1f261be62022..8357d748ce8f 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix
@@ -8,7 +8,7 @@ else
 
 buildDunePackage {
 	pname = "cohttp-lwt";
-	inherit (cohttp) version src meta;
+	inherit (cohttp) version src useDune2 meta;
 
 	buildInputs = [ uri ppx_sexp_conv ];
 

From fb1c52641fad8d422c4a0c0aa3e03419296ea873 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 06:24:47 +0100
Subject: [PATCH 0667/3942] ocamlPackages.jwto: use Dune 2

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

diff --git a/pkgs/development/ocaml-modules/jwto/default.nix b/pkgs/development/ocaml-modules/jwto/default.nix
index a4cf0aae6918..1c7622f2805a 100644
--- a/pkgs/development/ocaml-modules/jwto/default.nix
+++ b/pkgs/development/ocaml-modules/jwto/default.nix
@@ -5,6 +5,8 @@ buildDunePackage rec {
   pname = "jwto";
   version = "0.3.0";
 
+  useDune2 = true;
+
   minimumOCamlVersion = "4.05";
 
   src = fetchFromGitHub {

From b709b7ac3d375da6a33a6b7961f6ec3efffe5b77 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 06:24:51 +0100
Subject: [PATCH 0668/3942] ocamlPackages.biocaml: use Dune 2

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

diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix
index be62a1c6d2cd..b7cab4cef6d1 100644
--- a/pkgs/development/ocaml-modules/biocaml/default.nix
+++ b/pkgs/development/ocaml-modules/biocaml/default.nix
@@ -6,12 +6,12 @@ buildDunePackage rec {
   pname = "biocaml";
   version = "0.10.1";
 
-  owner = "biocaml";
+  useDune2 = true;
 
   minimumOCamlVersion = "4.07";
 
   src = fetchFromGitHub {
-    inherit owner;
+    owner = "biocaml";
     repo   = pname;
     rev    = "v${version}";
     sha256 = "1f19nc8ld0iv45jjnsvaah3ddj88s2n9wj8mrz726kzg85cfr8xj";

From 5b8a0f09787c3204277cb15d21f7f17b6fb6beee Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Oct 2020 06:24:55 +0100
Subject: [PATCH 0669/3942] =?UTF-8?q?ocamlPackages.base64:=203.2.0=20?=
 =?UTF-8?q?=E2=86=92=203.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/base64/default.nix          | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix
index b2e3e0c5e74d..de0bc13e2833 100644
--- a/pkgs/development/ocaml-modules/base64/default.nix
+++ b/pkgs/development/ocaml-modules/base64/default.nix
@@ -1,25 +1,17 @@
-{ lib, fetchpatch, fetchzip, buildDunePackage, alcotest, bos }:
-
-let version = "3.2.0"; in
+{ lib, fetchurl, buildDunePackage, alcotest, bos, dune-configurator }:
 
 buildDunePackage rec {
   pname = "base64";
-  inherit version;
+  version = "3.4.0";
 
-  src = fetchzip {
-    url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz";
-    sha256 = "1ilw3zj0w6cq7i4pvr8m2kv5l5f2y9aldmv72drlwwns013b1gwy";
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz";
+    sha256 = "0d0n5gd4nkdsz14jnxq13f1f7rzxmndg5xql039a8wfppmazd70w";
   };
 
-  minimumOCamlVersion = "4.03";
-
-  buildInputs = [ bos ];
-
-  # Fix test-suite for alcotest ≥ 1.0
-  patches = [(fetchpatch {
-    url = "https://github.com/mirage/ocaml-base64/commit/8d334d02aa52875158fae3e2fb8fe0a5596598d0.patch";
-    sha256 = "0lvqdp98qavpzis1wgwh3ijajq79hq47898gsrk37fpyjbrdzf5q";
-  })];
+  buildInputs = [ bos dune-configurator ];
 
   doCheck = true;
   checkInputs = [ alcotest ];

From d78aa080f5ba5f0920dd3e8a212c8c02cde411a3 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 28 Oct 2020 15:53:10 -0400
Subject: [PATCH 0670/3942] make-disk-image: support legacy+gpt

---
 nixos/lib/make-disk-image.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 8aa606a56af8..a4a488a1b3ea 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -28,6 +28,9 @@
   #   partition of reasonable size is created in addition to the root partition.
   # For "legacy", the msdos partition table is used and a single large root
   #   partition is created.
+  # For "legacy+gpt", the GPT partition table is used, a 1MiB no-fs partition for
+  #   use by the bootloader is created, and a single large root partition is
+  #   created.
   # For "hybrid", the GPT partition table is used and a mandatory ESP
   #   partition of reasonable size is created in addition to the root partition.
   #   Also a legacy MBR will be present.
@@ -54,7 +57,7 @@
   format ? "raw"
 }:
 
-assert partitionTableType == "legacy" || partitionTableType == "efi" || partitionTableType == "hybrid" || partitionTableType == "none";
+assert partitionTableType == "legacy" || partitionTableType == "legacy+gpt" || partitionTableType == "efi" || partitionTableType == "hybrid" || partitionTableType == "none";
 # We use -E offset=X below, which is only supported by e2fsprogs
 assert partitionTableType != "none" -> fsType == "ext4";
 
@@ -75,6 +78,7 @@ let format' = format; in let
 
   rootPartition = { # switch-case
     legacy = "1";
+    "legacy+gpt" = "2";
     efi = "2";
     hybrid = "3";
   }.${partitionTableType};
@@ -85,6 +89,16 @@ let format' = format; in let
         mklabel msdos \
         mkpart primary ext4 1MiB -1
     '';
+    "legacy+gpt" = ''
+      parted --script $diskImage -- \
+        mklabel gpt \
+        mkpart no-fs 1MB 2MB \
+        set 1 bios_grub on \
+        align-check optimal 1 \
+        mkpart primary ext4 2MB -1 \
+        align-check optimal 2 \
+        print
+    '';
     efi = ''
       parted --script $diskImage -- \
         mklabel gpt \

From d77ddf2a40641f346d9286e29f78ca9dfc64d533 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 28 Oct 2020 15:54:38 -0400
Subject: [PATCH 0671/3942] nixos.amazonAmi: use legacy+gpt disk images to
 support partitions >2T

---
 nixos/maintainers/scripts/ec2/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index b09f4ca47a3f..0ecf07669a11 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -57,7 +57,7 @@ in {
     inherit (cfg) contents format name;
     pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
     partitionTableType = if config.ec2.efi then "efi"
-                         else if config.ec2.hvm then "legacy"
+                         else if config.ec2.hvm then "legacy+gpt"
                          else "none";
     diskSize = cfg.sizeMB;
     fsType = "ext4";

From 35b3a1f43a9621a88e906a839f99d8252500152b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Oct 2020 09:22:09 +0100
Subject: [PATCH 0672/3942] LTS Haskell 16.20

---
 .../configuration-hackage2nix.yaml            | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8a2e787038db..0963bbca111e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -75,7 +75,7 @@ default-package-overrides:
   # haskell-language-server 0.5.0.0 doesn't accept newer versions
   - fourmolu ==0.2.*
   - refinery ==0.2.*
-  # LTS Haskell 16.19
+  # LTS Haskell 16.20
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -91,7 +91,7 @@ default-package-overrides:
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.2.0.0
-  - aeson-combinators ==0.0.3.0
+  - aeson-combinators ==0.0.4.0
   - aeson-compat ==0.3.9
   - aeson-default ==0.9.1.0
   - aeson-diff ==1.1.0.9
@@ -214,12 +214,12 @@ default-package-overrides:
   - annotated-wl-pprint ==0.7.0
   - ansi-terminal ==0.10.3
   - ansi-wl-pprint ==0.6.9
-  - antiope-core ==7.5.1
-  - antiope-dynamodb ==7.5.1
-  - antiope-messages ==7.5.1
-  - antiope-s3 ==7.5.1
-  - antiope-sns ==7.5.1
-  - antiope-sqs ==7.5.1
+  - antiope-core ==7.5.3
+  - antiope-dynamodb ==7.5.3
+  - antiope-messages ==7.5.3
+  - antiope-s3 ==7.5.3
+  - antiope-sns ==7.5.3
+  - antiope-sqs ==7.5.3
   - ANum ==0.2.0.2
   - apecs ==0.9.2
   - apecs-gloss ==0.2.4
@@ -814,7 +814,7 @@ default-package-overrides:
   - fmlist ==0.9.4
   - fmt ==0.6.1.2
   - fn ==0.3.0.2
-  - focus ==1.0.1.3
+  - focus ==1.0.1.4
   - focuslist ==0.1.0.2
   - foldable1 ==0.1.0.0
   - fold-debounce ==0.2.0.9
@@ -975,7 +975,7 @@ default-package-overrides:
   - hackage-db ==2.1.0
   - hackage-security ==0.6.0.1
   - haddock-library ==1.8.0
-  - hadolint ==1.18.0
+  - hadolint ==1.18.2
   - hadoop-streaming ==0.2.0.3
   - hakyll ==4.13.4.0
   - half ==0.3
@@ -1275,7 +1275,7 @@ default-package-overrides:
   - JuicyPixels-blurhash ==0.1.0.3
   - JuicyPixels-extra ==0.4.1
   - JuicyPixels-scale-dct ==0.1.2
-  - junit-xml ==0.1.0.1
+  - junit-xml ==0.1.0.2
   - justified-containers ==0.3.0.0
   - jwt ==0.10.0
   - kan-extensions ==5.2.1
@@ -1302,7 +1302,7 @@ default-package-overrides:
   - language-bash ==0.9.2
   - language-c ==0.8.3
   - language-c-quote ==0.12.2.1
-  - language-docker ==9.1.1
+  - language-docker ==9.1.2
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.7.1.0
@@ -1651,7 +1651,7 @@ default-package-overrides:
   - password-instances ==2.0.0.1
   - path ==0.7.0
   - path-extra ==0.2.0
-  - path-io ==1.6.1
+  - path-io ==1.6.2
   - path-pieces ==0.2.1
   - path-text-utf8 ==0.0.1.6
   - pathtype ==0.8.1.1
@@ -1818,7 +1818,7 @@ default-package-overrides:
   - range ==0.3.0.2
   - Ranged-sets ==0.4.0
   - range-set-list ==0.1.3.1
-  - rank1dynamic ==0.4.0
+  - rank1dynamic ==0.4.1
   - rank2classes ==1.3.2.1
   - Rasterific ==0.7.5.3
   - rasterific-svg ==0.3.3.2
@@ -2478,7 +2478,7 @@ default-package-overrides:
   - xdg-userdirs ==0.1.0.2
   - xeno ==0.4.2
   - xls ==0.1.3
-  - xlsx ==0.8.1
+  - xlsx ==0.8.2
   - xlsx-tabular ==0.2.2.1
   - xml ==1.3.14
   - xml-basic ==0.1.3.1
@@ -2507,7 +2507,7 @@ default-package-overrides:
   - yesod-auth-fb ==1.10.1
   - yesod-auth-hashdb ==1.7.1.2
   - yesod-bin ==1.6.0.6
-  - yesod-core ==1.6.18.4
+  - yesod-core ==1.6.18.5
   - yesod-fb ==0.6.1
   - yesod-form ==1.6.7
   - yesod-form-bootstrap4 ==3.0.0

From 035ba1797d3a7d19dcc6e764cf8a5f1024a48cfc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Oct 2020 20:15:35 +0100
Subject: [PATCH 0673/3942] hackage2nix: disable broken builds to fix
 evaluation

---
 .../haskell-modules/configuration-hackage2nix.yaml           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0963bbca111e..c6812370e826 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8746,7 +8746,11 @@ broken-packages:
   - polydata-core
   - polynomial
   - polysemy-chronos
+  - polysemy-extra
+  - polysemy-fskvstore
   - polysemy-http
+  - polysemy-kvstore-jsonfile
+  - polysemy-methodology
   - polysemy-optics
   - polysemy-RandomFu
   - polysemy-resume
@@ -11115,6 +11119,7 @@ broken-packages:
   - windns
   - windowslive
   - winerror
+  - winery
   - winio
   - Wired
   - wires

From 857d62462a64af23acdf5b27f3e40c111765dd35 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 24 Oct 2020 14:36:06 +0200
Subject: [PATCH 0674/3942] haskellPackages.flat: unbreak

flat builds fine again as is.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c6812370e826..3a31056fd12f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5066,7 +5066,6 @@ broken-packages:
   - flamethrower
   - flamingra
   - flashblast
-  - flat
   - flat-maybe
   - flatbuffers
   - flay

From a2c9fb0aaa124edbb5b5ebcc20a4ee4b9169eaa5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 Oct 2020 02:30:32 +0200
Subject: [PATCH 0675/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-26-gcfec46d from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/950856114c6c691a0b33763d8ee677e5361923a6.
---
 .../haskell-modules/hackage-packages.nix      | 1353 ++++++++++-------
 1 file changed, 786 insertions(+), 567 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f48e90b187bf..6169d134ddaa 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -836,8 +836,8 @@ self: {
      }:
      mkDerivation {
        pname = "Agda";
-       version = "2.6.1.1";
-       sha256 = "0d4j3n96wyc2crz238q49sb31ll6dfddllb82ry0jnsk8f0ypx2p";
+       version = "2.6.1.2";
+       sha256 = "0b872fi12j316zcbwnablkg45p252a4sqca9lsgfig55qirk0w08";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -2775,7 +2775,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "Cabal_3_2_0_0" = callPackage
+  "Cabal_3_2_1_0" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, binary
      , bytestring, containers, deepseq, Diff, directory, filepath
      , integer-logarithms, mtl, optparse-applicative, parsec, pretty
@@ -2785,8 +2785,10 @@ self: {
      }:
      mkDerivation {
        pname = "Cabal";
-       version = "3.2.0.0";
-       sha256 = "0vz6bl1ia7wjc62sj5iw5jhigdwfz6yz01mripjcymv4qrbkl1gj";
+       version = "3.2.1.0";
+       sha256 = "1xfn9q6jnbp3jc6swn4hapa83f5m66pjz8fqbqmffydagf36fkzy";
+       revision = "1";
+       editedCabalFile = "07brbxkjlf1yqs9bjdwcwq1gx853kh600qnrf6bnya92q1p0fhw7";
        setupHaskellDepends = [ mtl parsec ];
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
@@ -21914,8 +21916,8 @@ self: {
      }:
      mkDerivation {
        pname = "Z-IO";
-       version = "0.1.6.1";
-       sha256 = "1cd84n434i2l13xziys0rm7wx5iqw2xqydf96yj6fwkaysh3hrps";
+       version = "0.1.7.0";
+       sha256 = "0xvl0xgqcwqvsvqhdysgh3i2lhp1vi7sglgzzmzxz3142a67xpgd";
        libraryHaskellDepends = [
          base exceptions primitive stm time unix-time Z-Data
        ];
@@ -23936,8 +23938,8 @@ self: {
      }:
      mkDerivation {
        pname = "addy";
-       version = "0.1.0.0";
-       sha256 = "10p7q0infa1bawhg7hxw8rqjqdj3w737j5s3g41hy4in2nfp5ji0";
+       version = "0.1.0.1";
+       sha256 = "1mvxnbb1118f26581zqyh0id4g1qnn44f8q3h0sfpijf0g1v9vg5";
        libraryHaskellDepends = [
          attoparsec base bytestring ip lens relude text text-icu
          validation-selective
@@ -24411,8 +24413,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-combinators";
-       version = "0.0.3.0";
-       sha256 = "0x8bk7jxrg8j1zk5047sf5i6fy6hahjzrfnyzgwv1l443z4v445n";
+       version = "0.0.4.0";
+       sha256 = "01gsrm6glr2axcls4hxs740z8lxf39cvdhvidf360mnijai4sgl6";
        libraryHaskellDepends = [
          aeson base bytestring containers fail scientific text time
          time-compat unordered-containers uuid-types vector void
@@ -25513,6 +25515,28 @@ self: {
        broken = true;
      }) {};
 
+  "agda-unused" = callPackage
+    ({ mkDerivation, aeson, Agda, base, containers, directory, filepath
+     , hspec, megaparsec, mtl, optparse-applicative, text
+     }:
+     mkDerivation {
+       pname = "agda-unused";
+       version = "0.1.0";
+       sha256 = "1g0iyv9x46ql8j9ggb6nw58274vqb6z850x26glaqcdwa3wvn1i1";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         Agda base containers directory filepath megaparsec mtl text
+       ];
+       executableHaskellDepends = [
+         aeson base directory filepath mtl optparse-applicative text
+       ];
+       testHaskellDepends = [ base containers filepath hspec text ];
+       description = "Check for unused code in an Agda project";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "agentx" = callPackage
     ({ mkDerivation, base, binary, bitwise, bytestring, containers
      , data-default, Diff, fclabels, mtl, network, pipes
@@ -30297,32 +30321,6 @@ self: {
      }) {};
 
   "antiope-core" = callPackage
-    ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base
-     , bytestring, exceptions, generic-lens, hedgehog, hspec
-     , hspec-discover, http-client, http-types, hw-hspec-hedgehog, lens
-     , mtl, resourcet, scientific, text, transformers, unliftio-core
-     }:
-     mkDerivation {
-       pname = "antiope-core";
-       version = "7.5.1";
-       sha256 = "068dsdag8bng2ddzr0vxipmzrfa5x3jq80pmrmc0l86bjvnlsdjr";
-       libraryHaskellDepends = [
-         aeson amazonka amazonka-core base bytestring exceptions
-         generic-lens http-client http-types lens mtl resourcet text
-         transformers unliftio-core
-       ];
-       testHaskellDepends = [
-         aeson aeson-lens amazonka amazonka-core base bytestring exceptions
-         generic-lens hedgehog hspec http-client http-types
-         hw-hspec-hedgehog lens mtl resourcet scientific text transformers
-         unliftio-core
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "antiope-core_7_5_3" = callPackage
     ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base
      , bytestring, exceptions, generic-lens, hedgehog, hspec
      , hspec-discover, http-client, http-types, hw-hspec-hedgehog, lens
@@ -30346,34 +30344,9 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antiope-dynamodb" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
-     , antiope-core, base, generic-lens, hspec-discover, lens, text
-     , unliftio-core, unordered-containers
-     }:
-     mkDerivation {
-       pname = "antiope-dynamodb";
-       version = "7.5.1";
-       sha256 = "19d7rbz4qqq3pd9nncydgvda798a5ziw21zkpa5d0smfna71zckp";
-       libraryHaskellDepends = [
-         aeson amazonka amazonka-core amazonka-dynamodb antiope-core base
-         generic-lens lens text unliftio-core unordered-containers
-       ];
-       testHaskellDepends = [
-         amazonka amazonka-core amazonka-dynamodb antiope-core base
-         generic-lens lens text unliftio-core unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "antiope-dynamodb_7_5_3" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
      , antiope-core, base, generic-lens, hspec-discover, lens, text
      , unliftio-core, unordered-containers
@@ -30417,30 +30390,6 @@ self: {
      }) {};
 
   "antiope-messages" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring
-     , generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
-     , lens, lens-aeson, monad-loops, network-uri, scientific, text
-     , unliftio-core
-     }:
-     mkDerivation {
-       pname = "antiope-messages";
-       version = "7.5.1";
-       sha256 = "01hkq4n5jpfnb9i8ysaj73zknvkhpxb3mnq7csv2dc29ral4vzdp";
-       libraryHaskellDepends = [
-         aeson amazonka amazonka-core base bytestring generic-lens lens
-         lens-aeson monad-loops network-uri text unliftio-core
-       ];
-       testHaskellDepends = [
-         aeson amazonka amazonka-core base bytestring generic-lens hedgehog
-         hspec hw-hspec-hedgehog lens lens-aeson monad-loops network-uri
-         scientific text unliftio-core
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "antiope-messages_7_5_3" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring
      , generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
      , lens, lens-aeson, monad-loops, network-uri, scientific, text
@@ -30462,7 +30411,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antiope-optparse-applicative" = callPackage
@@ -30487,34 +30435,6 @@ self: {
      }) {};
 
   "antiope-s3" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
-     , antiope-core, antiope-messages, attoparsec, base, bytestring
-     , conduit, conduit-extra, deepseq, dlist, exceptions, generic-lens
-     , hedgehog, hspec, hspec-discover, http-types, hw-hspec-hedgehog
-     , lens, mtl, network-uri, resourcet, text, time, unliftio-core
-     }:
-     mkDerivation {
-       pname = "antiope-s3";
-       version = "7.5.1";
-       sha256 = "0nqs90pqk8dfjbrc55f4gdw4ybw2fslbx9z2x8k45mqpri3xwc0y";
-       libraryHaskellDepends = [
-         aeson amazonka amazonka-core amazonka-s3 antiope-core
-         antiope-messages attoparsec base bytestring conduit conduit-extra
-         deepseq dlist exceptions generic-lens http-types lens mtl
-         network-uri resourcet text time unliftio-core
-       ];
-       testHaskellDepends = [
-         aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec
-         base bytestring conduit conduit-extra exceptions generic-lens
-         hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri
-         resourcet text time unliftio-core
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "antiope-s3_7_5_3" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
      , antiope-core, antiope-messages, attoparsec, base, bytestring
      , conduit, conduit-extra, deepseq, dlist, exceptions, generic-lens
@@ -30540,7 +30460,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antiope-shell" = callPackage
@@ -30573,29 +30492,6 @@ self: {
      }) {};
 
   "antiope-sns" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base
-     , bytestring, generic-lens, hedgehog, hspec, hspec-discover
-     , hw-hspec-hedgehog, lens, text, time, unliftio-core
-     }:
-     mkDerivation {
-       pname = "antiope-sns";
-       version = "7.5.1";
-       sha256 = "13wzfjqihsi0xw7j869knj82a6k1fi74fywhlqc3bh1xc6wcir7q";
-       libraryHaskellDepends = [
-         aeson amazonka amazonka-core amazonka-sns base bytestring
-         generic-lens lens text time unliftio-core
-       ];
-       testHaskellDepends = [
-         aeson amazonka amazonka-core amazonka-sns base bytestring
-         generic-lens hedgehog hspec hw-hspec-hedgehog lens text time
-         unliftio-core
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "antiope-sns_7_5_3" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base
      , bytestring, generic-lens, hedgehog, hspec, hspec-discover
      , hw-hspec-hedgehog, lens, text, time, unliftio-core
@@ -30616,36 +30512,9 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antiope-sqs" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base
-     , bytestring, conduit, generic-lens, hedgehog, hspec
-     , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, monad-loops
-     , mtl, network-uri, split, text, time, unliftio-core
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "antiope-sqs";
-       version = "7.5.1";
-       sha256 = "1y3fxqx5595agcnr157q3jap0dmcss8lyij187j9f29y0wkbkzv6";
-       libraryHaskellDepends = [
-         aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
-         generic-lens lens lens-aeson monad-loops mtl network-uri split text
-         unliftio-core unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
-         generic-lens hedgehog hspec hw-hspec-hedgehog lens lens-aeson
-         monad-loops mtl network-uri text time unliftio-core
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "antiope-sqs_7_5_3" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base
      , bytestring, conduit, generic-lens, hedgehog, hspec
      , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, monad-loops
@@ -30669,7 +30538,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antiope-swf" = callPackage
@@ -35407,6 +35275,26 @@ self: {
        broken = true;
      }) {};
 
+  "aur_7_0_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hashable, http-client
+     , http-client-tls, http-types, tasty, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "aur";
+       version = "7.0.5";
+       sha256 = "16c4q0w6qpn4gg6xlggkcs92fcvm58a3qmykfm1dgcfsjhwwhxkx";
+       libraryHaskellDepends = [
+         aeson base bytestring hashable http-client http-types text
+       ];
+       testHaskellDepends = [
+         base http-client http-client-tls tasty tasty-hunit
+       ];
+       description = "Access metadata from the Arch Linux User Repository";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "aur-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, hspec
      , http-client, http-client-tls, mtl, text
@@ -35461,6 +35349,42 @@ self: {
        broken = true;
      }) {};
 
+  "aura_3_2_2" = callPackage
+    ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring
+     , containers, filepath, hashable, http-client, http-client-tls
+     , http-types, language-bash, megaparsec, network-uri
+     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
+     , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers
+     , typed-process, versions
+     }:
+     mkDerivation {
+       pname = "aura";
+       version = "3.2.2";
+       sha256 = "07ska8w2k3sl084aadjclw8v0ykrp8hiwhim5zd6wd7q95njyk2f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson algebraic-graphs aur base bytestring containers filepath
+         hashable http-client http-types language-bash megaparsec
+         network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler
+         stm text time transformers typed-process versions
+       ];
+       executableHaskellDepends = [
+         aeson aur base bytestring containers http-client http-client-tls
+         megaparsec optparse-applicative prettyprinter
+         prettyprinter-ansi-terminal rio scheduler text transformers
+         typed-process versions
+       ];
+       testHaskellDepends = [
+         base bytestring containers megaparsec rio tasty tasty-hunit text
+         versions
+       ];
+       description = "A secure package manager for Arch Linux and the AUR";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "authenticate" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , case-insensitive, conduit, containers, html-conduit, http-conduit
@@ -37648,8 +37572,8 @@ self: {
     ({ mkDerivation, barbies, base, split, template-haskell }:
      mkDerivation {
        pname = "barbies-th";
-       version = "0.1.5";
-       sha256 = "0bjbvamihrwh4l5zs8fnk2iq98fd1d2xkfbsvp6spfcp1ynqlj6k";
+       version = "0.1.7";
+       sha256 = "1wzy8j4i9mp1vlfkrixc49nv1c6prqspvhkjdwp16bvdz4fgbvpq";
        libraryHaskellDepends = [ barbies base split template-haskell ];
        testHaskellDepends = [ barbies base ];
        description = "Create strippable HKD via TH";
@@ -45879,8 +45803,8 @@ self: {
        pname = "broadcast-chan-tests";
        version = "0.2.1.1";
        sha256 = "0qx8j9sfky5qvrxrn4is9sja4qh6jh7jahq3zkyyq3a54jkwc8d3";
-       revision = "2";
-       editedCabalFile = "0dc7drwischhs0k95hjrlssxlqdg3ickrbbrki7wjslmk8k00bki";
+       revision = "3";
+       editedCabalFile = "1x34m1wk5m9ryfhp86wm4bmvwdghrknsmir356nnb3y3xm8558b4";
        libraryHaskellDepends = [
          async base broadcast-chan clock containers optparse-applicative
          paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis
@@ -47120,22 +47044,23 @@ self: {
      }) {};
 
   "byline" = callPackage
-    ({ mkDerivation, ansi-terminal, base, colour, exceptions, free
-     , haskeline, mtl, relude, tasty, tasty-hunit, terminfo-hs, text
+    ({ mkDerivation, ansi-terminal, attoparsec, base, colour
+     , exceptions, free, haskeline, mtl, optparse-applicative, relude
+     , tasty, tasty-hunit, terminfo-hs, text
      }:
      mkDerivation {
        pname = "byline";
-       version = "1.0.0.0";
-       sha256 = "1jwjdjiraq37pr2ysc9h5qqlma6j7rd2dkip2y2f6bx07d1v7fpr";
+       version = "1.1.0.1";
+       sha256 = "1vj17x2czfks5bdns8181iw7rbfghk9pgx5f75xwzn9p6xycg9hy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal base colour exceptions free haskeline mtl relude
-         terminfo-hs text
+         ansi-terminal attoparsec base colour exceptions free haskeline mtl
+         optparse-applicative relude terminfo-hs text
        ];
        testHaskellDepends = [
-         ansi-terminal base colour exceptions free haskeline mtl relude
-         tasty tasty-hunit terminfo-hs text
+         ansi-terminal attoparsec base colour exceptions free haskeline mtl
+         optparse-applicative relude tasty tasty-hunit terminfo-hs text
        ];
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
@@ -47572,8 +47497,8 @@ self: {
        pname = "bytestring-handle";
        version = "0.1.0.6";
        sha256 = "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y";
-       revision = "1";
-       editedCabalFile = "0x11aj6w1lijh84jcdq1qgyvdnc7i9ivbyq4wf9rxicg57viisz9";
+       revision = "2";
+       editedCabalFile = "1x1sy3dz2ph9v6jk22wmcv5gk2bka5fv4s68i8q0j9m9pk085w37";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -48676,8 +48601,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-fmt";
-       version = "0.1.4";
-       sha256 = "0akc63g7h21nyyr9m0dwjlnxqw8k26zx5s2mzn8zak2q9i88ds1b";
+       version = "0.1.5";
+       sha256 = "1fsnjipd3j4vx77pmslkrdkf2wzqalqhwpcp5drxksl68nnxy8ad";
        isLibrary = false;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50648,8 +50573,8 @@ self: {
      }:
      mkDerivation {
        pname = "capnp";
-       version = "0.6.0.3";
-       sha256 = "0zrga41zk41881kr79grdwzl5caawv3khnvpbkhmhfzq3snmnhgd";
+       version = "0.7.0.0";
+       sha256 = "1mzs7f50840jbyzdipff47rwjmxv7i0rk6w4rdljzkw36yz4kj4v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51677,8 +51602,8 @@ self: {
      }:
      mkDerivation {
        pname = "cassava-streams";
-       version = "0.3.0.4";
-       sha256 = "17g3qrinzfpmbcqyjrnwaycplmys0p93hb6841cp5rr1pjramb55";
+       version = "0.3.0.5";
+       sha256 = "1zv5y5jnzbpm407zz3lhfzsf7hr923dzshb2w2xyh5y3v427rwn5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55488,8 +55413,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.26.2.2";
-       sha256 = "1m6a043y72da9nyr8x35v5lrh12is49rwarj5dlrm8clp8n987dp";
+       version = "0.26.2.3";
+       sha256 = "1bark213l3kx5gbr5nxnlhnrif5sg9z5v3igpcl47yisy99695p4";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
@@ -55669,8 +55594,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-page";
-       version = "0.4.3.23";
-       sha256 = "0mk6vz98l2xxhk8w457mbgbcjslnbv34swjrwfjjqk9jhmcnmxss";
+       version = "0.4.3.24";
+       sha256 = "0zsf8j8l99cxskjql8zh407ar7920ph6xn42j8nxnh6qir16wdar";
        libraryHaskellDepends = [
          acid-state aeson attoparsec base clckwrks containers directory
          filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
@@ -61760,6 +61685,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "configurator-pg_0_2_5" = callPackage
+    ({ mkDerivation, base, bytestring, containers, filepath, HUnit
+     , megaparsec, protolude, scientific, test-framework
+     , test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "configurator-pg";
+       version = "0.2.5";
+       sha256 = "1wmdg9zxfz8vhhsq5rraynhrhqc8fjrdhfrky2mfajzbp8dpaqsm";
+       libraryHaskellDepends = [
+         base containers megaparsec protolude scientific text
+       ];
+       testHaskellDepends = [
+         base bytestring filepath HUnit protolude test-framework
+         test-framework-hunit text
+       ];
+       description = "Reduced parser for configurator-ng config files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "confsolve" = callPackage
     ({ mkDerivation, attoparsec, base, cmdargs, process, system-fileio
      , system-filepath, text, time, unordered-containers
@@ -62573,8 +62519,8 @@ self: {
      }:
      mkDerivation {
        pname = "context";
-       version = "0.1.0.0";
-       sha256 = "17w0narhg25ls1rs2xp8x0yxh5jhw52b0c3zgi9ivn99j7c8qrhd";
+       version = "0.1.1.1";
+       sha256 = "0zn8hnyf04q7brchll3xnk0ifxadl050wric191irmnl29m6p5k8";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ async base ghc-prim hspec ];
        testToolDepends = [ hspec-discover ];
@@ -64839,6 +64785,21 @@ self: {
        broken = true;
      }) {};
 
+  "crdt-event-fold" = callPackage
+    ({ mkDerivation, base, binary, containers, data-default-class
+     , data-dword
+     }:
+     mkDerivation {
+       pname = "crdt-event-fold";
+       version = "1.0.0.2";
+       sha256 = "0bhfbzxb7s49x6nk1gg1n5nf26h8xqgy41ln7d5j59zp0lri5c04";
+       libraryHaskellDepends = [
+         base binary containers data-default-class data-dword
+       ];
+       description = "Garbage collected event folding CRDT";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "creatur" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, cereal, cond
      , directory, exceptions, filepath, gray-extended, hdaemonize
@@ -67358,8 +67319,8 @@ self: {
      }:
      mkDerivation {
        pname = "cut-the-crap";
-       version = "2.1.1";
-       sha256 = "0w0ir436gmh3d9ycdcjyxkgblrah7ij5njqmm44lx1kyhih6bk2x";
+       version = "2.2.0";
+       sha256 = "19i1wmh9163fb8wggnla4c8r51j71wiwyzhhh3mznckhaws40fqa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72727,6 +72688,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "deriving-show-simple" = callPackage
+    ({ mkDerivation, base, HUnit }:
+     mkDerivation {
+       pname = "deriving-show-simple";
+       version = "0";
+       sha256 = "0m0sill0h6k651l1il6g4g5ypinwq77x9xy01jbj5gawcs9mln0i";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base HUnit ];
+       description = "Derive a Show instance without field selector names";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "derp" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -75133,8 +75106,8 @@ self: {
      }:
      mkDerivation {
        pname = "digit";
-       version = "0.9";
-       sha256 = "0xyghgg8kzjrvhrcjizqnbprcyq5a3ma3x0dfijrdvbyd3lzghvm";
+       version = "0.10";
+       sha256 = "1qvz2gj4f2fcq8m8s4h6q5r2y3z55dhk4zxxijxha3mqfiybh4ky";
        libraryHaskellDepends = [
          base lens parsers scientific semigroupoids semigroups
          template-haskell
@@ -81306,7 +81279,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "egison_4_1_1" = callPackage
+  "egison_4_1_2" = callPackage
     ({ mkDerivation, array, base, containers, criterion, directory
      , exceptions, filepath, ghc, ghc-paths, Glob, hashable, haskeline
      , HUnit, megaparsec, mtl, optparse-applicative, parsec
@@ -81316,8 +81289,8 @@ self: {
      }:
      mkDerivation {
        pname = "egison";
-       version = "4.1.1";
-       sha256 = "16z2zp3gjm3gwp884ab86g0vhkxkkfxma0p9h1as5fyc6kvnsdbn";
+       version = "4.1.2";
+       sha256 = "1h388s7pagjipzgxyy1l3w3f03vl17bg9vl0afidjdmqm294mp8m";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -81333,10 +81306,10 @@ self: {
          regex-tdfa split text transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         base filepath Glob HUnit mtl test-framework test-framework-hunit
-         transformers
+         base filepath Glob HUnit mtl process test-framework
+         test-framework-hunit transformers
        ];
-       benchmarkHaskellDepends = [ base criterion ];
+       benchmarkHaskellDepends = [ base criterion transformers ];
        description = "Programming language with non-linear pattern-matching against non-free data";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84729,6 +84702,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "esqueleto_3_4_0_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
+     , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql
+     , mysql-simple, persistent, persistent-mysql, persistent-postgresql
+     , persistent-sqlite, persistent-template, postgresql-libpq
+     , postgresql-simple, resourcet, tagged, text, time, transformers
+     , unliftio, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "esqueleto";
+       version = "3.4.0.0";
+       sha256 = "0a4wrkcwlzgw0mds1pnxspv6ddzy9mz0md0qdx0x9s51z9ldswaj";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-html bytestring conduit containers
+         monad-logger persistent resourcet tagged text time transformers
+         unliftio unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base blaze-html bytestring conduit containers
+         exceptions hspec monad-logger mtl mysql mysql-simple persistent
+         persistent-mysql persistent-postgresql persistent-sqlite
+         persistent-template postgresql-libpq postgresql-simple resourcet
+         tagged text time transformers unliftio unordered-containers vector
+       ];
+       description = "Type-safe EDSL for SQL queries on persistent backends";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ess" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -86208,6 +86210,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exception-via" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "exception-via";
+       version = "0.1.0.0";
+       sha256 = "046f787jw3v1c61q9c9canq0m266wv39rsk0613fyrhl96sss66m";
+       libraryHaskellDepends = [ base template-haskell ];
+       description = "DerivingVia for your hierarchical exceptions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "exceptional" = callPackage
     ({ mkDerivation, base, exceptions }:
      mkDerivation {
@@ -88037,8 +88050,8 @@ self: {
      }:
      mkDerivation {
        pname = "faktory";
-       version = "1.0.1.2";
-       sha256 = "12pabsmy21il88qmdbg91152y9nzqci9y2cn9ljizlcndnsy7s5l";
+       version = "1.0.1.3";
+       sha256 = "1mxgkf54hxlj753dva21gxdqamq4mgfslcq5gqhp154gi0xmm79w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89748,10 +89761,8 @@ self: {
      }:
      mkDerivation {
        pname = "ffmpeg-light";
-       version = "0.12.2.2";
-       sha256 = "0yn1qhj2kzicxpjmy09lb660psjavbrfib29q0m1b8zx0fvn5xzk";
-       revision = "1";
-       editedCabalFile = "1wwfbrpr5hz1a9lppn73j2gpal3l2jnn554k6w9n181fbk67xvjd";
+       version = "0.13.0";
+       sha256 = "1xvhpzd3kf2xn6s94lmpkxp9nv1jy20pr3x2qmqhc2gjxx9vcqg1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91739,8 +91750,6 @@ self: {
        ];
        description = "Principled and efficient bit-oriented binary serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flat-maybe" = callPackage
@@ -92795,23 +92804,6 @@ self: {
      }) {};
 
   "focus" = callPackage
-    ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
-     , tasty, tasty-hunit, tasty-quickcheck, transformers
-     }:
-     mkDerivation {
-       pname = "focus";
-       version = "1.0.1.3";
-       sha256 = "1g10fzy76k5bjn8ysym8ywvrqrvxvhdi4b99wabhzznhzmankddx";
-       libraryHaskellDepends = [ base transformers ];
-       testHaskellDepends = [
-         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       description = "A general abstraction for manipulating elements of container data structures";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "focus_1_0_1_4" = callPackage
     ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
      , tasty, tasty-hunit, tasty-quickcheck, transformers
      }:
@@ -92826,7 +92818,6 @@ self: {
        ];
        description = "A general abstraction for manipulating elements of container data structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "focuslist" = callPackage
@@ -103889,6 +103880,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "githash_0_1_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, hspec
+     , process, template-haskell, temporary, unliftio
+     }:
+     mkDerivation {
+       pname = "githash";
+       version = "0.1.5.0";
+       sha256 = "1m2dhmddn9k75j5wyjilbh40n7fkgi7cyic9l0k2s7g9z93yyvql";
+       libraryHaskellDepends = [
+         base bytestring directory filepath process template-haskell
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath hspec process template-haskell
+         temporary unliftio
+       ];
+       description = "Compile git revision info into Haskell projects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , binary, binary-instances, bytestring, containers, cryptohash-sha1
@@ -108424,8 +108435,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-server-api";
-       version = "0.3.2.1";
-       sha256 = "1bvj8pihsz4w53lax5k234p58v9r2k1gpkvdgjwl6n0vkqbw1qy8";
+       version = "0.3.3.1";
+       sha256 = "17lsjlfkr3crxyxhj7w77ga7h7c6va6z5qmyvmhwapmym1zmsqrs";
        libraryHaskellDepends = [
          aeson aeson-casing base base64-bytestring bytestring HsOpenSSL
          http-api-data http-client http-client-tls http-media mime-mail
@@ -108565,8 +108576,8 @@ self: {
      }:
      mkDerivation {
        pname = "gopro-plus";
-       version = "0.4.1.0";
-       sha256 = "1xim8kr58nnpfh1sj66p73alm1l8wwxqafx5b77wc51dwrjyz1p8";
+       version = "0.4.1.1";
+       sha256 = "1vcy9r4jnnrfc6xp34b4w5z4xgxhcnsv5sy26iazw6g07mg1v73p";
        libraryHaskellDepends = [
          aeson base bytestring containers exceptions filepath
          generic-deriving lens lens-aeson mtl random retry text time
@@ -112983,8 +112994,8 @@ self: {
        pname = "hackage-security-HTTP";
        version = "0.1.1";
        sha256 = "0chkrn4d33qjh50fpbkrkqj6jsxd5y5c2mrgqgwsdx3x08kaq8nd";
-       revision = "1";
-       editedCabalFile = "11k2jqnkqywdm2rzvcgib0p9i11z5g4d2yikfn932mjfr4ss51bj";
+       revision = "3";
+       editedCabalFile = "1nsvfqg2k1yj8pvbfx1083m29v1c9kcb9h389r380ga1b32v89nl";
        libraryHaskellDepends = [
          base bytestring hackage-security HTTP mtl network network-uri zlib
        ];
@@ -113492,34 +113503,6 @@ self: {
      }) {};
 
   "hadolint" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, gitrev, hspec, HsYAML, HUnit, language-docker
-     , megaparsec, mtl, optparse-applicative, ShellCheck, split, text
-     , void
-     }:
-     mkDerivation {
-       pname = "hadolint";
-       version = "1.18.0";
-       sha256 = "1pvf1wr8sg2yv439yyd08jz75jzmpys5629pcii1kdx5vh2rp1yx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath HsYAML
-         language-docker megaparsec mtl ShellCheck split text void
-       ];
-       executableHaskellDepends = [
-         base containers gitrev language-docker megaparsec
-         optparse-applicative text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec HsYAML HUnit language-docker megaparsec
-         ShellCheck split text
-       ];
-       description = "Dockerfile Linter JavaScript API";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "hadolint_1_18_2" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, filepath, gitrev, hspec, HsYAML, HUnit
      , language-docker, megaparsec, mtl, optparse-applicative, parallel
@@ -113545,7 +113528,6 @@ self: {
        ];
        description = "Dockerfile Linter JavaScript API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hadoop-formats" = callPackage
@@ -115525,8 +115507,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-clientsession";
-       version = "7.3.1";
-       sha256 = "1sl67wdzaf6j773iapjnc1v2k19ycd18irkdpb4px1a1mq6ym0sv";
+       version = "7.3.2";
+       sha256 = "0kl4g1y68hnj188n5a7hkj4a9s70943f837yyijanwahnmkgi1nc";
        libraryHaskellDepends = [
          base bytestring cereal clientsession happstack-server monad-control
          mtl safecopy transformers-base
@@ -115759,8 +115741,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-hsp";
-       version = "7.3.7.4";
-       sha256 = "188fqqpq7m921qkfv2b64pikcx8zzsy376l4py4wxlkabl7fkydr";
+       version = "7.3.7.5";
+       sha256 = "1krjas0id8an3ry83xrgxl9cb18n17r394ivz05c45mwan6sbpqf";
        libraryHaskellDepends = [
          base bytestring happstack-server harp hsp hsx2hs mtl syb text
          utf8-string
@@ -115813,8 +115795,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-jmacro";
-       version = "7.0.12.2";
-       sha256 = "0zgmh75z59g6hs8n924sbnhswjdd6b947ywiird2a3y6d2zwqj3v";
+       version = "7.0.12.3";
+       sha256 = "1phhy9sq7hiz3c50k5wyclrsjqacw8mcdyg80h3xi43zgjmff23w";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cereal digest happstack-server
          jmacro text utf8-string wl-pprint-text
@@ -125509,12 +125491,12 @@ self: {
      }:
      mkDerivation {
        pname = "hex-text";
-       version = "0.1.0.0";
-       sha256 = "0if46jkzd67jwp56vmvd021qq2vfzpmaf1v2w07cy0w61icfvjxr";
+       version = "0.1.0.2";
+       sha256 = "0wgqm1ziblgljrh679i44gvdq7bqym37y1lnnpb1mk7qlv664c9h";
        libraryHaskellDepends = [ base base16-bytestring bytestring text ];
        testHaskellDepends = [ base doctest ];
        description = "ByteString-Text hexidecimal conversions";
-       license = stdenv.lib.licenses.asl20;
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "hexchat" = callPackage
@@ -126820,6 +126802,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hie-compat" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , filepath, ghc, ghc-boot, transformers
+     }:
+     mkDerivation {
+       pname = "hie-compat";
+       version = "0.1.0.0";
+       sha256 = "00wnb7ylahglw167n2n1b2a6b0b75ay167zzrl10jsskivxwx3h3";
+       libraryHaskellDepends = [
+         array base bytestring containers directory filepath ghc ghc-boot
+         transformers
+       ];
+       description = "HIE files for GHC 8.6 and other HIE file backports";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "hie-core" = callPackage
     ({ mkDerivation, aeson, async, base, binary, bytestring, containers
      , data-default, deepseq, directory, extra, filepath, ghc, ghc-boot
@@ -135651,14 +135649,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hslua-module-doclayout_0_2_0" = callPackage
+  "hslua-module-doclayout_0_2_0_1" = callPackage
     ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit
      , tasty-lua, text
      }:
      mkDerivation {
        pname = "hslua-module-doclayout";
-       version = "0.2.0";
-       sha256 = "1ilkyv0wscz2kv0jkn45qc8ng5l1hvvbkwh972zvisys1m3hri4y";
+       version = "0.2.0.1";
+       sha256 = "1fwzx85lv2547gs42lp7mx9w7b0vl4hpc0ql7ip5yqp17q58a08y";
        libraryHaskellDepends = [ base doclayout hslua text ];
        testHaskellDepends = [
          base doclayout hslua tasty tasty-hunit tasty-lua
@@ -138698,6 +138696,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client-openssl_0_3_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system
+     , hspec, http-client, http-types, network
+     }:
+     mkDerivation {
+       pname = "http-client-openssl";
+       version = "0.3.2.0";
+       sha256 = "114aci8nvbzvhscla6172y7s47yp689rslhg8h7y3hmkh2zq7r65";
+       libraryHaskellDepends = [
+         base bytestring HsOpenSSL HsOpenSSL-x509-system http-client network
+       ];
+       testHaskellDepends = [
+         base HsOpenSSL hspec http-client http-types
+       ];
+       doCheck = false;
+       description = "http-client backend using the OpenSSL library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-client-overrides" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, network-uri, tasty, tasty-hunit
@@ -138821,10 +138839,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client-websockets";
-       version = "0.1.0.0";
-       sha256 = "1wx1dx3n8vjz3qa9l2a7l6i2scwbwxavjh0ss6awwphyirfl0v6p";
-       revision = "1";
-       editedCabalFile = "0wj1b817w8c0cjpqkbganvrbhz99hnr5gcj47l3g4bv4n90ygrpn";
+       version = "0.1.1.0";
+       sha256 = "1kmvwhfsp1l672km2a06pww0a3wmwbxcwwg1k78xcnc767wj0g1m";
        libraryHaskellDepends = [
          base bytestring http-client network-uri utf8-string websockets
        ];
@@ -139107,8 +139123,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-io-streams";
-       version = "0.1.5.0";
-       sha256 = "0c8x4iyvg2yjsvvfvvp96ddw9fpmjiaql4c7kpf93f9i5rkyxjy5";
+       version = "0.1.6.0";
+       sha256 = "03wndmw1pblnjqhni76s5lyyw3l8zbl1csydzl8bp0h1g5vmfpmp";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder
          brotli-streams bytestring case-insensitive containers
@@ -140381,8 +140397,8 @@ self: {
      }:
      mkDerivation {
        pname = "hurl";
-       version = "1.4.2.0";
-       sha256 = "19qf4akwx7aazzy86zhkm5z60342hz07msqxir6ism98dd33fpwl";
+       version = "1.4.2.1";
+       sha256 = "158p0fnlvz03vj29q4b5lzv4070d3l64wa1zsg9v2xlcrr6lrp87";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145053,8 +145069,8 @@ self: {
      }:
      mkDerivation {
        pname = "in-other-words";
-       version = "0.1.0.0";
-       sha256 = "06ipmkbgncsgcq5rfyn0v4plhbbrzrcx3r4xr1f3f6xv760pfyra";
+       version = "0.1.1.0";
+       sha256 = "0f11si2bnxw2bm5mfnnqh9cfwhlzdcqkw5dfjql1y618db808am9";
        libraryHaskellDepends = [
          async base exceptions monad-control mtl stm transformers
          transformers-base
@@ -145579,8 +145595,8 @@ self: {
      }:
      mkDerivation {
        pname = "indigo";
-       version = "0.3.0";
-       sha256 = "1xga3i9rdd2y53m6c8v4c2r44clhs2f82nyynf81n8zjqfgxybkl";
+       version = "0.3.1";
+       sha256 = "1xc2gk7bihgpv78cl1c15x1izwsazmdpdsagan4d6yd0zw30xci4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -149599,8 +149615,8 @@ self: {
      }:
      mkDerivation {
        pname = "j";
-       version = "0.1.1.0";
-       sha256 = "0a3xl4sr5s7436z8fnjg6vknk7wi202b8ryvswxrv1ks49h2zg8s";
+       version = "0.1.2.0";
+       sha256 = "053n10j75mv2iwrra51nv4vf48ki8q5aksqjbrlnzbhbm125jhf3";
        libraryHaskellDepends = [ base bytestring repa unix ];
        testHaskellDepends = [ base bytestring repa tasty tasty-hunit ];
        description = "J in Haskell";
@@ -152276,8 +152292,8 @@ self: {
     ({ mkDerivation, base, tasty, tasty-golden, text, xml-conduit }:
      mkDerivation {
        pname = "junit-xml";
-       version = "0.1.0.1";
-       sha256 = "1r75ncsmr5yj7xbgrw4sipjii7l3v7hj6nfi1lidc26n4m7r8ib1";
+       version = "0.1.0.2";
+       sha256 = "0sm738irwvmdnn8cvf0rnvp8s5gmr0ih241l27sasqq18nra2v04";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base text xml-conduit ];
        testHaskellDepends = [ base tasty tasty-golden ];
@@ -153957,22 +153973,24 @@ self: {
 
   "keycloak-hs" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring
-     , bytestring, containers, exceptions, hslogger, http-api-data
-     , http-client, http-types, jwt, lens, mtl, safe, string-conversions
-     , text, word8, wreq
+     , bytestring, containers, exceptions, hashable, hslogger
+     , http-api-data, http-client, http-types, jose, lens, lens-aeson
+     , mtl, safe, string-conversions, text, unordered-containers, word8
+     , wreq
      }:
      mkDerivation {
        pname = "keycloak-hs";
-       version = "1.1.1";
-       sha256 = "1ycr1q7sfr68zbx1jxnfv0c19w2nv2rxczi5aixd01ck8v1kx798";
+       version = "2.1.0";
+       sha256 = "0yki4fqbgirnvcaf5p00pskh91abspivgkkdi9m93andz56vl23v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-casing base base64-bytestring bytestring containers
-         exceptions hslogger http-api-data http-client http-types jwt lens
-         mtl safe string-conversions text word8 wreq
+         exceptions hashable hslogger http-api-data http-client http-types
+         jose lens lens-aeson mtl safe string-conversions text
+         unordered-containers word8 wreq
        ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [ base hslogger ];
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -156505,27 +156523,6 @@ self: {
      }) {};
 
   "language-docker" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default-class
-     , hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text
-     , time
-     }:
-     mkDerivation {
-       pname = "language-docker";
-       version = "9.1.1";
-       sha256 = "1smrayjp8d8vqvn7lg2mg3lzsqqslysj6syh1ckbn1a5fmjpzfv2";
-       libraryHaskellDepends = [
-         base bytestring containers data-default-class megaparsec
-         prettyprinter split text time
-       ];
-       testHaskellDepends = [
-         base bytestring containers data-default-class hspec HUnit
-         megaparsec prettyprinter QuickCheck split text time
-       ];
-       description = "Dockerfile parser, pretty-printer and embedded DSL";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "language-docker_9_1_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
      , hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text
      , time
@@ -156544,7 +156541,6 @@ self: {
        ];
        description = "Dockerfile parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-dockerfile" = callPackage
@@ -160509,8 +160505,8 @@ self: {
      }:
      mkDerivation {
        pname = "liboath-hs";
-       version = "0.0.1.1";
-       sha256 = "0ikh4rch2zdv9xan70qkf68m9hdz8k86ji7jw9xci1cvg318zd1k";
+       version = "0.0.1.2";
+       sha256 = "08wnzsk82ahyb3fy2sd1ci6aw0h3wiiad2j4kxs1j90wbrwkd3ri";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164445,6 +164441,8 @@ self: {
        pname = "log-postgres";
        version = "0.7.1.4";
        sha256 = "1m96d5486xadypm5iby8rkb979k82md394j5iaik6xk5aavcn6xx";
+       revision = "1";
+       editedCabalFile = "0yyaxibkq8c9bwhaday8ijmfbm8k3i14wd9zsgfby99b6rxra351";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring deepseq
          hpqtypes http-client lifted-base log-base mtl semigroups split text
@@ -165427,19 +165425,19 @@ self: {
     ({ mkDerivation, aeson-pretty, base, bimap, bytestring, constraints
      , containers, data-default, first-class-families, fmt, interpolate
      , lens, morley, morley-prelude, mtl, named, optparse-applicative
-     , pretty-terminal, QuickCheck, singletons, template-haskell, text
-     , text-manipulate, unordered-containers, vinyl, with-utf8
+     , singletons, template-haskell, text, text-manipulate
+     , unordered-containers, vinyl, with-utf8
      }:
      mkDerivation {
        pname = "lorentz";
-       version = "0.6.2";
-       sha256 = "13xl9f538h729zn9dqjcj10qav1ggbma9rp4pyj0cdgj5mq8mv8w";
+       version = "0.7.0";
+       sha256 = "1nwz7cdjy0s1fa64q4ymyds2m6yhqx8vxjp0p9qn7b4l7civhk9c";
        libraryHaskellDepends = [
          aeson-pretty base bimap bytestring constraints containers
          data-default first-class-families fmt interpolate lens morley
-         morley-prelude mtl named optparse-applicative pretty-terminal
-         QuickCheck singletons template-haskell text text-manipulate
-         unordered-containers vinyl with-utf8
+         morley-prelude mtl named optparse-applicative singletons
+         template-haskell text text-manipulate unordered-containers vinyl
+         with-utf8
        ];
        description = "EDSL for the Michelson Language";
        license = stdenv.lib.licenses.mit;
@@ -170559,15 +170557,15 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_9_0_0" = callPackage
+  "megaparsec_9_0_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, mtl, parser-combinators, scientific, text
      , transformers, weigh
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "9.0.0";
-       sha256 = "1x10f2b14ww306am9w06s23va26ab3vwdh0jk67ql6ybigxh0asi";
+       version = "9.0.1";
+       sha256 = "00953zvxfyjibw8c1ssmixxh0cwn59pz24zbh6s34rk3v14vqa3j";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -170606,7 +170604,7 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec-tests_9_0_0" = callPackage
+  "megaparsec-tests_9_0_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , hspec, hspec-discover, hspec-expectations, hspec-megaparsec
      , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text
@@ -170614,8 +170612,8 @@ self: {
      }:
      mkDerivation {
        pname = "megaparsec-tests";
-       version = "9.0.0";
-       sha256 = "0zm246r8k48mj5v2dxjan7dsrcnw54bcm27swi5mh8c0yb3vcvab";
+       version = "9.0.1";
+       sha256 = "0synm14x1k9r5q7xmv21z0y95b42g7lvwn78mcnc3cx62x6393ng";
        libraryHaskellDepends = [
          base bytestring containers hspec hspec-expectations
          hspec-megaparsec megaparsec mtl QuickCheck text transformers
@@ -173881,8 +173879,8 @@ self: {
     ({ mkDerivation, base, vector }:
      mkDerivation {
        pname = "mmsyn2";
-       version = "0.2.0.0";
-       sha256 = "1lxfl6gr42x9rhy4jpig9hwl0bnbidrv65i8f4fr39ifrx43fgxw";
+       version = "0.3.1.0";
+       sha256 = "06n8vxqafc698ahml782klb41g9bfsvqdrl4k0blnn3m3vavnzxy";
        libraryHaskellDepends = [ base vector ];
        description = "The library that can be used for multiple (Ord a) => a -> b transformations";
        license = stdenv.lib.licenses.mit;
@@ -173904,8 +173902,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmsyn4";
-       version = "0.4.0.0";
-       sha256 = "0qfr2dlzigggbwgznh1sxxkp7qwvcba2rlhwdqs4rzaz53sx2xzj";
+       version = "0.5.0.0";
+       sha256 = "05r33lx2cxsf7a14809dgs7lhfqlglshpv22jfzrl2xy0rl3x4qz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173924,8 +173922,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "mmsyn5";
-       version = "0.4.4.0";
-       sha256 = "1yvsx82x7m5y2swxllhb7zzgspb3lfdhrbw6n5v3xsa9vxhwa35l";
+       version = "0.5.0.0";
+       sha256 = "0xbdmlq71pjnsls67mydrfzajnnyyzp0dvzgrg2lms3pssvzs6f1";
        libraryHaskellDepends = [ base ];
        description = "Various additional operations on lists (some with intermediate Monads)";
        license = stdenv.lib.licenses.mit;
@@ -173937,8 +173935,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmsyn6ukr";
-       version = "0.8.1.0";
-       sha256 = "0r5lnx1m57kjfb1cfm9a22l9kn552y6vpfbkxpffi03ni407q65q";
+       version = "0.8.3.0";
+       sha256 = "017q1jf9490sddb0f6wjizcsv423izjqirgq7ymzpxcd4sbcdhyn";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -174116,8 +174114,8 @@ self: {
      }:
      mkDerivation {
        pname = "mock-httpd";
-       version = "0.0.0.0";
-       sha256 = "0mv669gvn61by4j7sd4w2hvzr3vpa0szrhgzdciv5g1a0gsh3kk7";
+       version = "1.0.0";
+       sha256 = "1dn680lpvh2ww0ab4wgp9a7k2w309zymkjlp3igwk01q4cbjpsg2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -174265,6 +174263,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "modern-uri_0_3_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, contravariant
+     , criterion, deepseq, exceptions, hspec, hspec-discover
+     , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
+     , reflection, tagged, template-haskell, text, weigh
+     }:
+     mkDerivation {
+       pname = "modern-uri";
+       version = "0.3.3.0";
+       sha256 = "184vhcnpwjsvxwbdsipz7kc2xylfwfqflbbbyipag610w07a3qk2";
+       libraryHaskellDepends = [
+         base bytestring containers contravariant deepseq exceptions
+         megaparsec mtl profunctors QuickCheck reflection tagged
+         template-haskell text
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq megaparsec text weigh
+       ];
+       description = "Modern library for working with URIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "modify-fasta" = callPackage
     ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
      , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
@@ -176818,15 +176843,14 @@ self: {
      , generic-deriving, gitrev, haskeline, hex-text, interpolate, lens
      , megaparsec, memory, morley-prelude, mtl, named
      , optparse-applicative, parser-combinators, pretty-simple
-     , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances
      , semigroups, show-type, singletons, syb, template-haskell, text
      , th-lift, th-lift-instances, time, timerep, transformers-compat
      , unordered-containers, vector, vinyl, with-utf8, wl-pprint-text
      }:
      mkDerivation {
        pname = "morley";
-       version = "1.7.1";
-       sha256 = "0za05qqx64zx92fsrnlk78m0d2g3ircw0k67fym7k5a9mck6bxg0";
+       version = "1.8.1";
+       sha256 = "1lchr282394vjwgi5l0innc7szxkp7pibrbma0yza37l3q295xz2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -176834,15 +176858,15 @@ self: {
          bytestring constraints containers cryptonite data-default
          first-class-families fmt generic-deriving gitrev hex-text
          interpolate lens megaparsec memory morley-prelude mtl named
-         optparse-applicative parser-combinators QuickCheck
-         quickcheck-arbitrary-adt quickcheck-instances semigroups show-type
+         optparse-applicative parser-combinators semigroups show-type
          singletons syb template-haskell text th-lift th-lift-instances time
          timerep transformers-compat unordered-containers vector vinyl
          with-utf8 wl-pprint-text
        ];
        executableHaskellDepends = [
-         aeson base bytestring fmt haskeline megaparsec morley-prelude named
-         optparse-applicative pretty-simple text vinyl with-utf8
+         aeson base bytestring data-default fmt haskeline megaparsec
+         morley-prelude named optparse-applicative pretty-simple text vinyl
+         with-utf8
        ];
        description = "Developer tools for the Michelson Language";
        license = stdenv.lib.licenses.mit;
@@ -178467,8 +178491,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-protobuf";
-       version = "0.4.0.0";
-       sha256 = "13323mk6maj4fn1vg98nkb80k1975mqaszbj67a4mr5n2s9vrlz2";
+       version = "0.4.0.1";
+       sha256 = "1dr2vgxkzxpkz0iiwzwbficm65flwfmcs5xbxx5mg5gwf7x0qz3l";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -178503,17 +178527,18 @@ self: {
      }) {};
 
   "mu-schema" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, sop-core
-     , template-haskell, text, th-abstraction, unordered-containers
-     , uuid, vector
+    ({ mkDerivation, aeson, base, bytestring, containers
+     , first-class-families, sop-core, template-haskell, text
+     , th-abstraction, unordered-containers, uuid, vector
      }:
      mkDerivation {
        pname = "mu-schema";
-       version = "0.3.1.0";
-       sha256 = "1kl62ask8cvjimjcb9f3y3vpvk544m3zlzp4jn1yrvbmzn3px0d1";
+       version = "0.3.1.1";
+       sha256 = "0n30xn2z1dl4n28mbfnif8csvz0namll0hab1r7mhnamp0yc3gs8";
        libraryHaskellDepends = [
-         aeson base bytestring containers sop-core template-haskell text
-         th-abstraction unordered-containers uuid vector
+         aeson base bytestring containers first-class-families sop-core
+         template-haskell text th-abstraction unordered-containers uuid
+         vector
        ];
        description = "Format-independent schemas for serialization";
        license = stdenv.lib.licenses.asl20;
@@ -179813,8 +179838,8 @@ self: {
      }:
      mkDerivation {
        pname = "musicw";
-       version = "0.3.5.2";
-       sha256 = "0mn5vnjxqkpd2pgjxmchlih74a1m52v06h6f08kyb26l0sjpbfx7";
+       version = "0.3.6";
+       sha256 = "0bi57x087r22547z90n58faz78ha6z6pfmf2chwrfdys48lr8wfq";
        libraryHaskellDepends = [
          array base bytestring containers data-default file-embed ghcjs-base
          ghcjs-dom ghcjs-prim json monad-loops mtl safe text time
@@ -180504,6 +180529,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mysql;};
 
+  "mysql_0_1_7_2" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
+     }:
+     mkDerivation {
+       pname = "mysql";
+       version = "0.1.7.2";
+       sha256 = "0vkc39hx55hqwgkhqm80ckabbjaq4f9840msznf71glzihzg8k0n";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base bytestring containers ];
+       librarySystemDepends = [ mysql ];
+       testHaskellDepends = [ base bytestring hspec ];
+       description = "A low-level MySQL client library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) mysql;};
+
   "mysql-effect" = callPackage
     ({ mkDerivation, base, bytestring, extensible-effects, mysql
      , mysql-simple
@@ -181608,8 +181649,8 @@ self: {
        pname = "natural-transformation";
        version = "0.4";
        sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
-       revision = "8";
-       editedCabalFile = "007vgw2zaf2z9fyi9f0spmqn6fd8j438r3vnkgmazzvb43szmi0n";
+       revision = "9";
+       editedCabalFile = "1db5ln24wcn4fcf92096iff8jp7q531ccm8pgbqincrbxayahl1s";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
@@ -184489,8 +184530,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools-extra";
-       version = "0.5.6.0";
-       sha256 = "08a13v1fx7lad7wdibij79vdcbqn10lcb2n6lhzq70097f8a06vm";
+       version = "0.5.7.0";
+       sha256 = "0dhw68vkrwfgv9q4skml8kq6zgrg7awjq4vxqp541szvamwvgh6y";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base base64 binary bytestring
          case-insensitive containers ede enclosed-exceptions http-client
@@ -186203,8 +186244,8 @@ self: {
      }:
      mkDerivation {
        pname = "nri-env-parser";
-       version = "0.1.0.1";
-       sha256 = "1v6984ndlalrvdff10frik8bxqskmzf8cr13q6095jl6krjivkay";
+       version = "0.1.0.2";
+       sha256 = "0cl9f6p83k0r7ha6hzgmrv0abi9rw5p0wr838jyhazk179g37rrn";
        libraryHaskellDepends = [
          base modern-uri network-uri nri-prelude text
        ];
@@ -186223,8 +186264,8 @@ self: {
      }:
      mkDerivation {
        pname = "nri-prelude";
-       version = "0.1.0.4";
-       sha256 = "0x8jvrp2kcj9a23g370fj9v6mmp3c3vi05dg3arq1ri5in4y6psa";
+       version = "0.2.0.0";
+       sha256 = "061klliw29a8kkbwgqkhqbil7jq85pxgmqn21xwszi0g16jb8ayx";
        libraryHaskellDepends = [
          aeson ansi-terminal async auto-update base bytestring
          concurrent-output containers directory exceptions filepath hedgehog
@@ -191940,6 +191981,8 @@ self: {
        pname = "pam";
        version = "0.2.0.0";
        sha256 = "0j4hm7ph0iszf8wyqpy5jiplr14jj37z2yvgcgy7p5ab5p5r38gx";
+       revision = "1";
+       editedCabalFile = "09d6acii3gimk3f04scy9k5f7di4sdam753ddi587px530pwdigb";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ pam ];
        libraryToolDepends = [ c2hs ];
@@ -192048,7 +192091,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_11_0_2" = callPackage
+  "pandoc_2_11_0_4" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , case-insensitive, citeproc, commonmark, commonmark-extensions
@@ -192067,8 +192110,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.11.0.2";
-       sha256 = "0lnzypad3jfix7h78gk4fvyl0x3n7f77i8bn6dn2lzdsf6wasy8x";
+       version = "2.11.0.4";
+       sha256 = "18nqdhvk0rgrzmbhab9vb05g8w9hvwx0ncf5cqp5ijxycilcskb8";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -193668,8 +193711,8 @@ self: {
     ({ mkDerivation, base, parallel, tree-monad }:
      mkDerivation {
        pname = "parallel-tree-search";
-       version = "0.4.1";
-       sha256 = "1x2k649q6gqz9z16vwg1j59ajf2wp59lfwb65g8819fz4rwimncr";
+       version = "0.4.2";
+       sha256 = "08r8xl3x5zvsy3d3ss9m9l7kb0dyp7hjrwxlnz7g2jl7p5x8rjbd";
        libraryHaskellDepends = [ base parallel tree-monad ];
        description = "Parallel Tree Search";
        license = stdenv.lib.licenses.publicDomain;
@@ -193734,8 +193777,8 @@ self: {
        pname = "paramtree";
        version = "0.1.1.1";
        sha256 = "0ls9wzmz5lk7gyl8lx9cjs49zpwhrv955fs5q6ypv7bpbvjbchs1";
-       revision = "2";
-       editedCabalFile = "17wyi6q6azm2s04pm1alc183yp01a8qbvj1nymjxdzvrl2dkk2g6";
+       revision = "3";
+       editedCabalFile = "1nd342xk0sm9dlh5915b9kbksyd87wpji1mw8m8phm8d72prcxmi";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-hunit temporary
@@ -195057,26 +195100,6 @@ self: {
      }) {};
 
   "path-io" = callPackage
-    ({ mkDerivation, base, containers, directory, dlist, exceptions
-     , filepath, hspec, path, temporary, time, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "path-io";
-       version = "1.6.1";
-       sha256 = "1qbnjwx72idbqwi5gkhnphf2phdszdf6y1aqf77y17kks3992vmn";
-       libraryHaskellDepends = [
-         base containers directory dlist exceptions filepath path temporary
-         time transformers unix-compat
-       ];
-       testHaskellDepends = [
-         base directory exceptions filepath hspec path transformers
-         unix-compat
-       ];
-       description = "Interface to ‘directory’ package for users of ‘path’";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "path-io_1_6_2" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, exceptions
      , filepath, hspec, path, temporary, time, transformers, unix-compat
      }:
@@ -195094,7 +195117,6 @@ self: {
        ];
        description = "Interface to ‘directory’ package for users of ‘path’";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "path-like" = callPackage
@@ -196669,8 +196691,8 @@ self: {
      }:
      mkDerivation {
        pname = "periodic-client";
-       version = "1.1.7.1";
-       sha256 = "0d9ngiq064fajiy2c4sddpgr93ia13iv83rdnvbk05x7agi0srjb";
+       version = "1.1.7.2";
+       sha256 = "0ldjxfq8p4spv4vgqjyklmcd8k3n2mrinma5w6k29d1wvyf5kxz5";
        libraryHaskellDepends = [
          base binary byteable bytestring hslogger metro metro-socket mtl
          periodic-common resource-pool transformers unliftio
@@ -197672,7 +197694,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "persistent-test_2_0_3_2" = callPackage
+  "persistent-test_2_0_3_3" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit
      , containers, exceptions, hspec, hspec-expectations, HUnit
      , monad-control, monad-logger, mtl, path-pieces, persistent
@@ -197682,8 +197704,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-test";
-       version = "2.0.3.2";
-       sha256 = "0d7a6m4qm6xzyv7h2fqn9hgv7r7q6dwh7x04ddsrygjxdgpwgqf3";
+       version = "2.0.3.3";
+       sha256 = "0ry6inln7grmcj58k3sfjid24069n4kmph6sikvm352b9ffw6h5x";
        libraryHaskellDepends = [
          aeson base blaze-html bytestring conduit containers exceptions
          hspec hspec-expectations HUnit monad-control monad-logger mtl
@@ -197722,13 +197744,13 @@ self: {
 
   "persistent-vector" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck
-     , test-framework, test-framework-quickcheck2
+     , test-framework, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "persistent-vector";
-       version = "0.1.1";
-       sha256 = "1l5v02pjb24gk4hw28knjp55l7z6jzcfiklfikd2nqbl7866c2j2";
-       libraryHaskellDepends = [ base deepseq ];
+       version = "0.2.0";
+       sha256 = "07fxfmkgjszssagj4miw1sx9vi782hwsf6gay7z6mb96mygbld5y";
+       libraryHaskellDepends = [ base deepseq transformers ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -198319,6 +198341,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "phonetic-languages-common" = callPackage
+    ({ mkDerivation, base, subG, vector }:
+     mkDerivation {
+       pname = "phonetic-languages-common";
+       version = "0.1.0.0";
+       sha256 = "12al80szl9mxapwq6b0kp6bnhnwqxjqzyf72ycxvpx1xlppsfza9";
+       libraryHaskellDepends = [ base subG vector ];
+       description = "A generalization of the uniqueness-periods-vector-common package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "phonetic-languages-plus" = callPackage
+    ({ mkDerivation, base, bytestring, lists-flines, parallel
+     , uniqueness-periods-vector-stats
+     }:
+     mkDerivation {
+       pname = "phonetic-languages-plus";
+       version = "0.1.0.0";
+       sha256 = "1yzqrqkikkx6ii1n7zs5vf1k5m26v8bj8m0h43zmxb1j30klh2ir";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base lists-flines ];
+       executableHaskellDepends = [
+         base bytestring lists-flines parallel
+         uniqueness-periods-vector-stats
+       ];
+       description = "Some common shared between different packages functions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "phonetic-languages-rhythmicity" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -198341,6 +198393,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "phonetic-languages-vector" = callPackage
+    ({ mkDerivation, base, vector }:
+     mkDerivation {
+       pname = "phonetic-languages-vector";
+       version = "0.1.0.0";
+       sha256 = "12mhmrfpdkxl00yfvy5jc74c7xnrj10pcydnn3xdhzj0fvp1zrll";
+       libraryHaskellDepends = [ base vector ];
+       description = "A generalization of the functionality of the uniqueness-periods-vector package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "phooey" = callPackage
     ({ mkDerivation, array, base, mtl, reactive, TypeCompose, wx
      , wxcore
@@ -200752,25 +200815,23 @@ self: {
      }) {};
 
   "playlists" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, doctest, filepath
-     , hspec, optparse-applicative, text, word8
+    ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
+     , optparse-applicative, text, word8
      }:
      mkDerivation {
        pname = "playlists";
-       version = "0.5.0.0";
-       sha256 = "0653aifikinz69wq3d6sfkchcchhwlndh1lf40qrk96941qss0d6";
-       revision = "1";
-       editedCabalFile = "19vwlvva12p4r3ch1ik7m6h5r7cy0f35qn8smd41pv47v29dsxiq";
+       version = "0.5.1";
+       sha256 = "1hrxmp33pzmvpg9j102hjradnlq261hs9amqkivqjfn9y4pb8inm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring filepath text word8
        ];
        executableHaskellDepends = [
-         base bytestring optparse-applicative text
+         attoparsec base bytestring filepath optparse-applicative text word8
        ];
        testHaskellDepends = [
-         base bytestring doctest filepath hspec text
+         attoparsec base bytestring filepath hspec text word8
        ];
        description = "Library and executable for working with playlist files";
        license = stdenv.lib.licenses.bsd3;
@@ -201997,6 +202058,36 @@ self: {
        broken = true;
      }) {};
 
+  "polysemy-extra" = callPackage
+    ({ mkDerivation, base, containers, polysemy, polysemy-zoo }:
+     mkDerivation {
+       pname = "polysemy-extra";
+       version = "0.1.0.0";
+       sha256 = "1y5k935jh6dfs87kdih1ibb61ljkp39wyrkg1n2zss020cdhbi7g";
+       libraryHaskellDepends = [ base containers polysemy polysemy-zoo ];
+       description = "Run a KVStore as a filesystem in polysemy";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "polysemy-fskvstore" = callPackage
+    ({ mkDerivation, base, bytestring, path, polysemy, polysemy-zoo
+     , rio, unliftio-path
+     }:
+     mkDerivation {
+       pname = "polysemy-fskvstore";
+       version = "0.1.0.0";
+       sha256 = "1hg552w21hgq5jvcbrw1kn1870xdyf44a3xqd87nrj9s9k2j4pk2";
+       libraryHaskellDepends = [
+         base bytestring path polysemy polysemy-zoo rio unliftio-path
+       ];
+       description = "Run a KVStore as a filesystem in polysemy";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "polysemy-http" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring
      , case-insensitive, co-log-core, co-log-polysemy, composition
@@ -202031,6 +202122,39 @@ self: {
        broken = true;
      }) {};
 
+  "polysemy-kvstore-jsonfile" = callPackage
+    ({ mkDerivation, aeson, base, containers, exceptions, extra, path
+     , polysemy, polysemy-zoo, unliftio-path
+     }:
+     mkDerivation {
+       pname = "polysemy-kvstore-jsonfile";
+       version = "0.1.0.0";
+       sha256 = "1lbjq1hlq6cf6px5f6zqi04sl0yz0rpyq2m2y16zknjz3wi7zqvi";
+       libraryHaskellDepends = [
+         aeson base containers exceptions extra path polysemy polysemy-zoo
+         unliftio-path
+       ];
+       description = "Run a KVStore as a single json file in polysemy";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "polysemy-methodology" = callPackage
+    ({ mkDerivation, base, polysemy, polysemy-plugin, polysemy-zoo }:
+     mkDerivation {
+       pname = "polysemy-methodology";
+       version = "0.1.2.1";
+       sha256 = "0is4jnmfn2gx78ijxwvhm8qwk2gqz31hh9pg5r8y43hyx7im40ay";
+       libraryHaskellDepends = [
+         base polysemy polysemy-plugin polysemy-zoo
+       ];
+       description = "Domain modelling algebra for polysemy";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "polysemy-optics" = callPackage
     ({ mkDerivation, base, optics, polysemy, polysemy-zoo }:
      mkDerivation {
@@ -204778,28 +204902,30 @@ self: {
 
   "predicate-typed" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
-     , comonad, containers, deepseq, directory, doctest, hashable, lens
-     , mtl, pcre-heavy, pcre-light, pretty, pretty-terminal, QuickCheck
-     , safe, stm, string-conversions, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, th-lift, these, time
-     , tree-view
+     , comonad, constraints, containers, deepseq, directory, doctest
+     , hashable, lens, lens-action, pcre-heavy, pcre-light
+     , pretty-terminal, QuickCheck, random, safe, stm
+     , string-conversions, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, th-lift, these, time
      }:
      mkDerivation {
        pname = "predicate-typed";
-       version = "0.7.3.0";
-       sha256 = "124f9bdvq30xaadg6020q0pmfv56mpkw25ws306xp8mfs61g1src";
+       version = "0.7.4.0";
+       sha256 = "04vxyw4bgzbkk56dw7p8b4x12m4wymxwh83537hvphdv9qj71ph9";
+       revision = "1";
+       editedCabalFile = "064zfd03nw1bd0p8vwymk0kscbpvxrgzbwmqys3ys1rqzjpnfdrp";
        libraryHaskellDepends = [
-         aeson aeson-pretty base binary bytestring comonad containers
-         deepseq directory hashable lens mtl pcre-heavy pcre-light pretty
-         pretty-terminal QuickCheck safe string-conversions template-haskell
-         text th-lift these time tree-view
+         aeson aeson-pretty base binary bytestring comonad constraints
+         containers deepseq directory hashable lens lens-action pcre-heavy
+         pcre-light pretty-terminal QuickCheck random safe
+         string-conversions template-haskell text th-lift these time
        ];
        testHaskellDepends = [
-         aeson aeson-pretty base binary bytestring comonad containers
-         deepseq directory doctest hashable lens mtl pcre-heavy pcre-light
-         pretty pretty-terminal QuickCheck safe stm string-conversions tasty
-         tasty-hunit tasty-quickcheck template-haskell text th-lift these
-         time tree-view
+         aeson aeson-pretty base binary bytestring comonad constraints
+         containers deepseq directory doctest hashable lens lens-action
+         pcre-heavy pcre-light pretty-terminal QuickCheck random safe stm
+         string-conversions tasty tasty-hunit tasty-quickcheck
+         template-haskell text th-lift these time
        ];
        description = "Predicates, Refinement types and Dsl";
        license = stdenv.lib.licenses.bsd3;
@@ -205301,8 +205427,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-diff";
-       version = "0.2.0.2";
-       sha256 = "0nz6shwyw6pkwd8n4rvix4fn0f5mvxx1xkc6q4k1xrg2ylg73ksv";
+       version = "0.2.0.3";
+       sha256 = "1pnq05zw7zyfikga8y27pkya4wrf0m3mrksmzi8l7jp9qdhkyia1";
        libraryHaskellDepends = [ base data-default Diff text ];
        testHaskellDepends = [
          base data-default Diff tasty tasty-hunit tasty-test-reporter text
@@ -213165,10 +213291,8 @@ self: {
      }:
      mkDerivation {
        pname = "rank1dynamic";
-       version = "0.4.0";
-       sha256 = "07dbfp0sc32q1p8xh4ap8m3b287r9hh4r8vfsrppdm5pabz4nhiw";
-       revision = "1";
-       editedCabalFile = "1idh1iz15pzdhrhy19584i9ahz41ijbmf56wbb2wns2kipy6w9lr";
+       version = "0.4.1";
+       sha256 = "19x2w44f31589vf4s428m7g3dz75qykr7mv599rf3gls4zjx781r";
        libraryHaskellDepends = [ base binary ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -214811,7 +214935,7 @@ self: {
        broken = true;
      }) {};
 
-  "reanimate_1_1_1_0" = callPackage
+  "reanimate_1_1_2_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base
      , base64-bytestring, bytestring, cassava, cereal, colour
      , containers, cryptohash-sha256, cubicbezier, directory, filelock
@@ -214826,8 +214950,8 @@ self: {
      }:
      mkDerivation {
        pname = "reanimate";
-       version = "1.1.1.0";
-       sha256 = "05illhid0nnypkl7znzkmc7b3wc7lmv8jn2sdcj39xr1yr8hji7f";
+       version = "1.1.2.1";
+       sha256 = "043jpim33pliymnks47i39hz36wp61rvwjyk9f0k89whsi74bkd6";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal array attoparsec base base64-bytestring
@@ -216581,6 +216705,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reform-happstack_0_2_5_4" = callPackage
+    ({ mkDerivation, base, bytestring, happstack-server, mtl, random
+     , reform, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "reform-happstack";
+       version = "0.2.5.4";
+       sha256 = "1xknj906vr0q6vrxrvna1777v7hsdg1l3r0wwnga7k1yn5hcfc76";
+       libraryHaskellDepends = [
+         base bytestring happstack-server mtl random reform text utf8-string
+       ];
+       description = "Happstack support for reform";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reform-hsp" = callPackage
     ({ mkDerivation, base, hsp, hsx2hs, reform, text }:
      mkDerivation {
@@ -224663,17 +224803,17 @@ self: {
      , containers, crackNum, deepseq, directory, doctest, filepath
      , gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random
      , silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
-     , template-haskell, time, transformers, z3
+     , template-haskell, time, transformers, uniplate, z3
      }:
      mkDerivation {
        pname = "sbv";
-       version = "8.8";
-       sha256 = "0xm05g9kxh38jjbssnhyw6c8q4rsyjndm2b8r36cqwx0n607zvgy";
+       version = "8.9";
+       sha256 = "1h8bhi1pjlg0v16wwqcvil7gq98b6dn8ckzmrsgb8sc3qz0nxj51";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum deepseq directory filepath mtl
          pretty process QuickCheck random syb template-haskell time
-         transformers
+         transformers uniplate
        ];
        testHaskellDepends = [
          base bytestring containers crackNum directory doctest filepath Glob
@@ -238081,6 +238221,49 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "snap-server_1_1_2_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, clock
+     , containers, criterion, deepseq, directory, filepath, HsOpenSSL
+     , http-common, http-streams, HUnit, io-streams, io-streams-haproxy
+     , lifted-base, monad-control, mtl, network, old-locale
+     , openssl-streams, parallel, QuickCheck, random, snap-core
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, threads, time, transformers, unix, unix-compat, vector
+     }:
+     mkDerivation {
+       pname = "snap-server";
+       version = "1.1.2.0";
+       sha256 = "0w4yv9a5ilpma0335ariwap2iscmdbaaif88lq3cm7px910nyc4j";
+       configureFlags = [ "-fopenssl" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         case-insensitive clock containers filepath HsOpenSSL io-streams
+         io-streams-haproxy lifted-base mtl network old-locale
+         openssl-streams snap-core text time transformers unix unix-compat
+         vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base16-bytestring blaze-builder bytestring
+         bytestring-builder case-insensitive clock containers deepseq
+         directory filepath HsOpenSSL http-common http-streams HUnit
+         io-streams io-streams-haproxy lifted-base monad-control mtl network
+         old-locale openssl-streams parallel QuickCheck random snap-core
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         threads time transformers unix unix-compat vector
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         criterion io-streams io-streams-haproxy snap-core transformers
+         vector
+       ];
+       description = "A web server for the Snap Framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "snap-stream" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, io-streams
      , snap-core
@@ -242501,8 +242684,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack-clean-old";
-       version = "0.1";
-       sha256 = "12q3x0lj8mjhfr6zrizl7995qca28qccjfqwhriciv35l4sny9md";
+       version = "0.2";
+       sha256 = "1mk92hgh1prnw0piwccxb1nf1383yap7csx03abnwp8anl8xw5dc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -242774,10 +242957,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack2cabal";
-       version = "1.0.11";
-       sha256 = "1lm4dl743xscrksgqg1v1ylm4bb3i8j470yih8si968k7xzcdvx2";
-       revision = "1";
-       editedCabalFile = "1ga8z004rvrvi58yfr7vmikngn3q8134z87nzaj0lll39kljni83";
+       version = "1.0.12";
+       sha256 = "0424qz4fy8218a0zr8pw5kbaldrb3wddvsb87sjqbb4q5qcm7rj7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -243997,27 +244178,28 @@ self: {
 
   "staversion" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
-     , containers, directory, filepath, heredoc, hspec, http-client
-     , http-client-tls, http-types, megaparsec, optparse-applicative
-     , pretty, process, QuickCheck, semigroups, text, transformers
-     , transformers-compat, unordered-containers, yaml
+     , containers, directory, filepath, hashable, heredoc, hspec
+     , http-client, http-client-tls, http-types, megaparsec
+     , optparse-applicative, pretty, process, QuickCheck, semigroups
+     , text, transformers, transformers-compat, unordered-containers
+     , yaml
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.2.3.7";
-       sha256 = "0mrkm7gr6s27dngws7p3mcfyp9pdvyr25mg9nd3ygklaql74jmng";
+       version = "0.2.4.0";
+       sha256 = "1n6f7ka4ncadp4svd3bc81qxdgiff85mws5apx7wdhcwfn8wbsib";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base bytestring Cabal containers directory
-         filepath http-client http-client-tls http-types megaparsec
+         filepath hashable http-client http-client-tls http-types megaparsec
          optparse-applicative pretty process semigroups text transformers
          transformers-compat unordered-containers yaml
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base bytestring Cabal filepath heredoc hspec QuickCheck semigroups
-         text
+         text unordered-containers
        ];
        description = "What version is the package X in stackage lts-Y.ZZ?";
        license = stdenv.lib.licenses.bsd3;
@@ -245511,6 +245693,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming-bytestring_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim
+     , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit
+     , tasty-smallcheck, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "streaming-bytestring";
+       version = "0.2.0";
+       sha256 = "1vmbg84xc7ix7ihs96ia13gdpi7z3grrkq9qai6j8s1klnzpljhi";
+       libraryHaskellDepends = [
+         base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet
+         streaming transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base bytestring resourcet smallcheck streaming tasty tasty-hunit
+         tasty-smallcheck transformers
+       ];
+       description = "Fast, effectful byte streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-cassava" = callPackage
     ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck
      , quickcheck-instances, streaming, streaming-bytestring, text
@@ -246532,6 +246736,8 @@ self: {
        pname = "string-interpolate";
        version = "0.3.0.2";
        sha256 = "1dkw4q2fxnr7gnish45lryxwrmdy93ffa1010qdnjlnz5m3dxbyl";
+       revision = "1";
+       editedCabalFile = "1rwylfxa821260mxfsr6l6grcyz7gxk18mvjijfhg5sm53v4c1ka";
        libraryHaskellDepends = [
          base bytestring haskell-src-exts haskell-src-meta split
          template-haskell text text-conversions utf8-string
@@ -251871,15 +252077,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty_1_3_1" = callPackage
+  "tasty_1_4" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
      , optparse-applicative, stm, tagged, unbounded-delays, unix
      , wcwidth
      }:
      mkDerivation {
        pname = "tasty";
-       version = "1.3.1";
-       sha256 = "1p8lq0yd1880knnygv4spgjj3j2mi8bawd018vcxy9rml7sdzm8w";
+       version = "1.4";
+       sha256 = "0jkia4zg01936gm2klpn3c4grlmdgiq0qnqq1cz7xg4baza14q3b";
        libraryHaskellDepends = [
          ansi-terminal async base clock containers mtl optparse-applicative
          stm tagged unbounded-delays unix wcwidth
@@ -252460,6 +252666,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-rerun_1_1_18" = callPackage
+    ({ mkDerivation, base, containers, mtl, optparse-applicative, split
+     , stm, tagged, tasty, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-rerun";
+       version = "1.1.18";
+       sha256 = "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s";
+       libraryHaskellDepends = [
+         base containers mtl optparse-applicative split stm tagged tasty
+         transformers
+       ];
+       description = "Rerun only tests which failed in a previous test run";
+       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
@@ -252534,8 +252757,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-test-reporter";
-       version = "0.1.1.2";
-       sha256 = "1v6s3dd3ynzw0690hz1abi8l2j6zlpfj61g072w176n7is6x7p73";
+       version = "0.1.1.4";
+       sha256 = "0aail968niiy4yicbb0nfd7z46vxgp5zf1k9ndh4smskihz8kjin";
        libraryHaskellDepends = [
          ansi-terminal base concurrent-output containers directory filepath
          junit-xml mtl safe-exceptions stm tagged tasty text
@@ -253146,8 +253369,8 @@ self: {
      }:
      mkDerivation {
        pname = "telegram-bot-simple";
-       version = "0.3.1";
-       sha256 = "09r64kgvgc5xx4wa5mxlc6fi4cf5qa81j7334wr7niv88fs659yb";
+       version = "0.3.3";
+       sha256 = "0lbk7j6y2hzkd5hhd1wsdvsixgnim1xzy1nram2msm5jin9wy9rb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -256568,16 +256791,21 @@ self: {
      }) {};
 
   "th-lego" = callPackage
-    ({ mkDerivation, base, template-haskell
+    ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell
      , template-haskell-compat-v0208, text
      }:
      mkDerivation {
        pname = "th-lego";
-       version = "0.1.0.4";
-       sha256 = "16pls283c6r4rx9aiyqacfrq5cy8d1q964fnzzk62517nicb9xyv";
+       version = "0.2.2";
+       sha256 = "0z9bpycyayvjr01pl704yhmchdfiyfi58drkq9ccxahgrwa0gpfc";
        libraryHaskellDepends = [
          base template-haskell template-haskell-compat-v0208 text
        ];
+       testHaskellDepends = [
+         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+         tasty-quickcheck template-haskell
+       ];
        description = "Template Haskell construction utilities";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -256932,8 +257160,8 @@ self: {
      }:
      mkDerivation {
        pname = "themoviedb";
-       version = "1.2.0.0";
-       sha256 = "1dchnsk9mx2v01apj5ilnsl3w9vj6f5pkqrm9701zw7rcp7xds0w";
+       version = "1.2.0.1";
+       sha256 = "1n6raffsjn9iq427nyh7hnnx1jvgvilisfy6dz72hl4ry5198sdq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -261761,8 +261989,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "tree-monad";
-       version = "0.3";
-       sha256 = "1zs1qgp908d0y7dm9mhzwl529z2aw24zr8balsvn1lzl1aynzslm";
+       version = "0.3.1";
+       sha256 = "0ny57rygkgwn8i733gz2zb12i5niq5q7lrqvzfwsnjd0b40yighf";
        libraryHaskellDepends = [ base ];
        description = "Non-Determinism Monad for Tree Search";
        license = stdenv.lib.licenses.bsd3;
@@ -265853,8 +266081,8 @@ self: {
     ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }:
      mkDerivation {
        pname = "ukrainian-phonetics-basic";
-       version = "0.1.1.0";
-       sha256 = "0k7lv4lzmkjyfk5r664gmdaqbj08s1kp7n4w8lw7kn7fmxvwkraf";
+       version = "0.1.7.0";
+       sha256 = "0rjyy6yxwd799svqd34wjjz5wvxzlkr7bl65s1wmvdfbs9dvfk95";
        libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ];
        description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
        license = stdenv.lib.licenses.mit;
@@ -266925,8 +267153,8 @@ self: {
      }) {};
 
   "uniqueness-periods-vector-examples" = callPackage
-    ({ mkDerivation, base, bytestring, lists-flines, mmsyn6ukr
-     , parallel, phonetic-languages-ukrainian, print-info
+    ({ mkDerivation, base, mmsyn6ukr, parallel, phonetic-languages-plus
+     , phonetic-languages-ukrainian, print-info
      , uniqueness-periods-vector, uniqueness-periods-vector-common
      , uniqueness-periods-vector-filters
      , uniqueness-periods-vector-general
@@ -266935,17 +267163,16 @@ self: {
      }:
      mkDerivation {
        pname = "uniqueness-periods-vector-examples";
-       version = "0.13.1.0";
-       sha256 = "0z6jglwli11845x4nlk8b3wk4d6j6i1m7jr3vhgri64g34qj1767";
+       version = "0.14.1.0";
+       sha256 = "191ihc62lzgdnzr0z0skgrxb5zg1jbnv2g6faafy9krla3j4rn4s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base lists-flines uniqueness-periods-vector
-         uniqueness-periods-vector-common
-         uniqueness-periods-vector-properties vector
+         base uniqueness-periods-vector uniqueness-periods-vector-common
+         uniqueness-periods-vector-properties
        ];
        executableHaskellDepends = [
-         base bytestring lists-flines mmsyn6ukr parallel
+         base mmsyn6ukr parallel phonetic-languages-plus
          phonetic-languages-ukrainian print-info uniqueness-periods-vector
          uniqueness-periods-vector-common uniqueness-periods-vector-filters
          uniqueness-periods-vector-general
@@ -266973,8 +267200,8 @@ self: {
      }:
      mkDerivation {
        pname = "uniqueness-periods-vector-general";
-       version = "0.5.1.0";
-       sha256 = "1abqcxrlchhi5jag6rvaar48ip356p9r1zcndbja72z4dxg9b9q0";
+       version = "0.5.2.0";
+       sha256 = "08jprdi4rlq6i923q9lg6mjbiyphh26ray6kbi1pk84im3y0s6bm";
        libraryHaskellDepends = [
          base print-info uniqueness-periods-vector-common vector
        ];
@@ -267561,6 +267788,8 @@ self: {
        pname = "unjson";
        version = "0.15.3";
        sha256 = "1p2bk9j5ww0zbkaw1wvl2122h763zn4ddjzg5rka948q3d6zivvi";
+       revision = "1";
+       editedCabalFile = "1jgin4v0j5siyrchrlkp8y5abs30mk8j9d5ah3r0b84683whnnrx";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable invariant
          pretty primitive scientific semigroups text time
@@ -267629,6 +267858,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "unliftio_0_2_13_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
+     , transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.13.1";
+       sha256 = "08q00kqg934y9cpj18kcgzcw3a2wgs6kjvgldgvr2a3vndwn95m0";
+       libraryHaskellDepends = [
+         async base bytestring deepseq directory filepath process stm time
+         transformers unix unliftio-core
+       ];
+       testHaskellDepends = [
+         async base bytestring containers deepseq directory filepath hspec
+         process QuickCheck stm time transformers unix unliftio-core
+       ];
+       benchmarkHaskellDepends = [
+         async base bytestring deepseq directory filepath gauge process stm
+         time transformers unix unliftio-core
+       ];
+       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 {
@@ -269387,11 +269642,11 @@ self: {
      }:
      mkDerivation {
        pname = "uuagc";
-       version = "0.9.53";
-       sha256 = "0cij4kf8f2151xz2q935bn9bhrqig9alc008vds7cw6pkb32ngz6";
+       version = "0.9.53.1";
+       sha256 = "0agmvc1ng1dpnl0z8njilc2r51rgl9fh3lmxgprwc0y5dqqrn6zr";
        isLibrary = true;
        isExecutable = true;
-       setupHaskellDepends = [ base Cabal ];
+       setupHaskellDepends = [ base Cabal uuagc-cabal ];
        libraryHaskellDepends = [
          array base containers directory filepath ghc-prim haskell-src-exts
          mtl uuagc-cabal uulib
@@ -269635,15 +269890,15 @@ self: {
      }:
      mkDerivation {
        pname = "uusi";
-       version = "0.0.0.0";
-       sha256 = "0wii4azq5aj8d1c8n5plsfqqvf9x5s4qw82mhvjhnzja3d6cck4f";
+       version = "0.0.1.0";
+       sha256 = "1kxhrkfsw6n2ic5f41bw2cjpix1k9ij5s3fhvsxgfiiwn7h5g7x2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base Cabal colourista directory microlens optparse-applicative
          process text
        ];
-       description = "A program removing all version constraints of dependencies in .cabal file";
+       description = "Remove all version constraints of dependencies in .cabal file";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -271864,8 +272119,8 @@ self: {
      }:
      mkDerivation {
        pname = "vimeta";
-       version = "0.3.0.0";
-       sha256 = "0npz5mx9w6srz5p0is3yzgfwssakdycv8h0h38ff7q0sivq3pfnv";
+       version = "0.3.0.1";
+       sha256 = "0i834y50b4820109asrzp61bqprxs9rfgr9b8310zhsisrlbxgl3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -272665,8 +272920,8 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "vulkan";
-       version = "3.6.10";
-       sha256 = "028c6n6f62nnwszb4px5mhg2spqb2z4psm06fbc2r1qw6vpqhxn6";
+       version = "3.6.11";
+       sha256 = "065l0nk4w3if01aavfzgnalpp39xz1j8xw022l9w9pmdmb2y0fjm";
        libraryHaskellDepends = [ base bytestring transformers vector ];
        librarySystemDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
@@ -274368,8 +274623,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-saml2";
-       version = "0.2.1.0";
-       sha256 = "0yljqfrrp426pn17fq28arw3ygrb3i84fr28r0hns0cv4a4sz4gx";
+       version = "0.2.1.2";
+       sha256 = "1hd408fs4w0lpqg0shnrwpx98fh6idzk8la3gn8xghhml189xgwl";
        libraryHaskellDepends = [
          base base64-bytestring bytestring c14n cryptonite
          data-default-class http-types mtl text time vault wai wai-extra
@@ -275505,8 +275760,8 @@ self: {
      }:
      mkDerivation {
        pname = "web-routes-happstack";
-       version = "0.23.12";
-       sha256 = "0p5fa2cdpk6s9n0wa7nllhk1naa3a8a8vx63q6da8ifk6x8jn68a";
+       version = "0.23.12.1";
+       sha256 = "06gifknfv6g9rd9f83r75hc3sld4xb4f1czxs9k5ca7n1l1vlccy";
        libraryHaskellDepends = [
          base bytestring happstack-server text web-routes
        ];
@@ -276669,6 +276924,8 @@ self: {
        pname = "what4";
        version = "1.0";
        sha256 = "0yyyq2gzl7srjq6inj1dqdhpxd58r1rhjajwxi0gr5pmxfzv7k8w";
+       revision = "1";
+       editedCabalFile = "04ab8nvnngb3bjv94mkcr17hh2m943m4pyk3klbnmpwyp9ip6pmf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -276734,8 +276991,8 @@ self: {
     ({ mkDerivation, base, shelly, template-haskell, text }:
      mkDerivation {
        pname = "which";
-       version = "0.1.0.0";
-       sha256 = "0w1jik9bkndx8ssd00i1ii686kb0fd2sc0slr7ki561g5z1xa7dz";
+       version = "0.2";
+       sha256 = "1c1l79bdpqfg4n3p5gkc3x362m9k11hmyydr2y3j0xs4hhm3d5aa";
        libraryHaskellDepends = [ base shelly template-haskell text ];
        description = "Determine the full path to an executable";
        license = stdenv.lib.licenses.bsd3;
@@ -277090,33 +277347,33 @@ self: {
      }) {};
 
   "winery" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, cereal
-     , containers, cpu, deepseq, directory, fast-builder, gauge
-     , hashable, HUnit, megaparsec, mtl, prettyprinter
-     , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
-     , scientific, semigroups, serialise, store, text, time
-     , transformers, unordered-containers, vector
+    ({ mkDerivation, aeson, barbies, barbies-th, base, binary
+     , bytestring, cereal, containers, cpu, deepseq, directory
+     , fast-builder, gauge, hashable, HUnit, megaparsec, mtl
+     , prettyprinter, prettyprinter-ansi-terminal, QuickCheck
+     , quickcheck-instances, scientific, semigroups, serialise, store
+     , text, time, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "winery";
-       version = "1.3.1";
-       sha256 = "0p504hglnih3gxc8x2iqqq9sih1l6chq53nijlv8f6wy15j9p5hh";
+       version = "1.3.2";
+       sha256 = "0ll6zm6zmhl9xmlbhj8is33zny4l7hwvf8lpvgqw0jcvz7j955a2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers cpu fast-builder hashable HUnit
-         megaparsec mtl prettyprinter prettyprinter-ansi-terminal QuickCheck
-         scientific semigroups text time transformers unordered-containers
-         vector
+         aeson barbies barbies-th base bytestring containers cpu
+         fast-builder hashable HUnit megaparsec mtl prettyprinter
+         prettyprinter-ansi-terminal QuickCheck scientific semigroups text
+         time transformers unordered-containers vector
        ];
        executableHaskellDepends = [
          aeson base bytestring megaparsec prettyprinter
          prettyprinter-ansi-terminal text
        ];
        testHaskellDepends = [
-         base bytestring containers fast-builder QuickCheck
-         quickcheck-instances scientific text time unordered-containers
-         vector
+         barbies barbies-th base bytestring containers fast-builder
+         QuickCheck quickcheck-instances scientific text time
+         unordered-containers vector
        ];
        benchmarkHaskellDepends = [
          aeson base binary bytestring cereal deepseq directory gauge
@@ -277124,6 +277381,8 @@ self: {
        ];
        description = "A compact, well-typed seralisation format for Haskell values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "winio" = callPackage
@@ -279928,8 +280187,8 @@ self: {
      }:
      mkDerivation {
        pname = "xlsx";
-       version = "0.8.1";
-       sha256 = "1prb6369af2w0rni2ha32yzd9r17yi0xnyn1dzwdzq03maxikgy9";
+       version = "0.8.2";
+       sha256 = "0kjfnp24nc97qqla1z65wzy59cch336pjncz1kdfakmgv27mv38a";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary-search bytestring conduit
          containers data-default deepseq errors extra filepath lens mtl
@@ -283594,43 +283853,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, bytestring, case-insensitive, cereal, clientsession
-     , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
-     , gauge, hspec, hspec-expectations, http-types, HUnit, memory
-     , monad-logger, mtl, network, parsec, path-pieces, primitive
-     , random, resourcet, 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.18.4";
-       sha256 = "1i69k0782prgf3wzi714fx0g3jsd654kncn62c7sijsbs0zc6h5h";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq fast-logger http-types memory
-         monad-logger mtl parsec path-pieces primitive random resourcet
-         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 random resourcet shakespeare streaming-commons
-         template-haskell text transformers unliftio wai wai-extra warp
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text
-       ];
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_18_5" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, bytestring, case-insensitive, cereal, clientsession
      , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
@@ -283665,7 +283887,6 @@ self: {
        ];
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -287695,36 +287916,34 @@ self: {
      }) {};
 
   "zxcvbn-hs" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
      , binary-instances, containers, criterion, fgl, hedgehog, lens
      , math-functions, tasty, tasty-hedgehog, tasty-hunit, text, time
      , unordered-containers, vector, zlib
      }:
      mkDerivation {
        pname = "zxcvbn-hs";
-       version = "0.2.1.0";
-       sha256 = "1gvarz005nlz9q5bkdwvplvsmwwchhx0arpq1grmh39r706lh4d8";
-       revision = "2";
-       editedCabalFile = "05l4pni4264rcivixzakjkph5qr4jr8qb4jbfj2nw106n1zhjaka";
+       version = "0.3.0.0";
+       sha256 = "13rz0bjvcj9hrxnxqbw7bl6529yz4aqawq6abssj4nmxbmgrj7xf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base base64-bytestring binary binary-instances
+         aeson attoparsec base base64-bytestring binary binary-instances
          containers fgl lens math-functions text time unordered-containers
          vector zlib
        ];
        executableHaskellDepends = [
-         attoparsec base base64-bytestring binary binary-instances
+         aeson attoparsec base base64-bytestring binary binary-instances
          containers fgl lens math-functions text time unordered-containers
          vector zlib
        ];
        testHaskellDepends = [
-         attoparsec base base64-bytestring binary binary-instances
+         aeson attoparsec base base64-bytestring binary binary-instances
          containers fgl hedgehog lens math-functions tasty tasty-hedgehog
          tasty-hunit text time unordered-containers vector zlib
        ];
        benchmarkHaskellDepends = [
-         attoparsec base base64-bytestring binary binary-instances
+         aeson attoparsec base base64-bytestring binary binary-instances
          containers criterion fgl lens math-functions text time
          unordered-containers vector zlib
        ];

From 718aafa5f7e17e47fd8eef6c5070a58cbea20a74 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Oct 2020 09:20:34 +0100
Subject: [PATCH 0676/3942] pandoc: update overrides for the new release

---
 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 1e694a8801b7..ce3093763966 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1467,7 +1467,7 @@ self: super: {
   skylighting-core = doDistribute super.skylighting-core_0_10_0_3;
   hslua = doDistribute self.hslua_1_1_2;
   jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2;
-  pandoc = doDistribute self.pandoc_2_11_0_2;
+  pandoc = doDistribute self.pandoc_2_11_0_4;
   # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
   pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2);
   pandoc-types = doDistribute self.pandoc-types_1_22;

From ed41afe60a75bb284ff5fe8c9038f99efa22a63f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Oct 2020 14:53:45 +0100
Subject: [PATCH 0677/3942] haskell: update Cabal overrides for the new 3.2.1.0
 release

---
 .../haskell-modules/configuration-ghc-8.2.x.nix           | 2 +-
 .../haskell-modules/configuration-ghc-8.4.x.nix           | 4 ++--
 .../haskell-modules/configuration-ghc-8.6.x.nix           | 8 ++++----
 .../haskell-modules/configuration-ghc-8.8.x.nix           | 8 ++++----
 4 files changed, 11 insertions(+), 11 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 f1260735479b..bd9f43e90c9d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -44,7 +44,7 @@ self: super: {
   text = self.text_1_2_4_0;
 
   # Needs Cabal 3.0.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_1_0; };
 
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
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 d5ae77e8246e..27bf04b914e7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -41,8 +41,8 @@ self: super: {
   xhtml = null;
 
   # Needs Cabal 3.2.x.
-  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
+  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_1_0; };
 
   # Restricts aeson to <1.4
   # https://github.com/purescript/purescript/pull/3537
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 339fda5d6fbf..f2da20426ace 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -42,8 +42,8 @@ self: super: {
   xhtml = null;
 
   # Needs Cabal 3.0.x.
-  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
+  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_1_0; };
 
   # https://github.com/tibbe/unordered-containers/issues/214
   unordered-containers = dontCheck super.unordered-containers;
@@ -77,10 +77,10 @@ self: super: {
 
   # cabal2nix needs the latest version of Cabal, and the one
   # hackage-db uses must match, so take the latest
-  cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
+  cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
 
   # cabal2spec needs a recent version of Cabal
-  cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
+  cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
 
   # Builds only with ghc-8.8.x and beyond.
   policeman = markBroken super.policeman;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index a2562e44527b..220a8e5c207a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -53,8 +53,8 @@ self: super: {
   haddock-api = self.haddock-api_2_23_1;
 
   # These builds need Cabal 3.2.x.
-  cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; };
-  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
+  cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; };
+  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
 
   # Ignore overly restrictive upper version bounds.
   aeson-diff = doJailbreak super.aeson-diff;
@@ -109,10 +109,10 @@ self: super: {
   apply-refact = super.apply-refact_0_7_0_0;
 
   # The package needs the latest Cabal version.
-  cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
+  cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
 
   # cabal-fmt requires Cabal3
-  cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; };
+  cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; };
 
   # liquidhaskell does not support ghc version 8.8.x.
   liquid = markBroken super.liquid;

From d3025ee8c62cba6e92de8d3900beb73889ca01ca Mon Sep 17 00:00:00 2001
From: V <v@anomalous.eu>
Date: Fri, 22 May 2020 00:44:58 +0200
Subject: [PATCH 0678/3942] iosevka-bin: add support for variants

This adds the ability to select a specific prebuilt variant. It also adds
an updater script for generating their hashes. Additionally, switching
to TTC files reduces the package size by an order of magnitude.

Example usage:

	fonts.fonts = with pkgs; [
	  (iosevka-bin.override { variant = "ss10"; })
	  (iosevka-bin.override { variant = "sparkle"; })
	  (iosevka-bin.override { variant = "aile"; })
	];
---
 pkgs/data/fonts/iosevka/bin.nix      | 37 ++++++++++++++++++++--------
 pkgs/data/fonts/iosevka/update.sh    | 28 +++++++++++++++++++++
 pkgs/data/fonts/iosevka/variants.nix | 24 ++++++++++++++++++
 3 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100755 pkgs/data/fonts/iosevka/update.sh
 create mode 100644 pkgs/data/fonts/iosevka/variants.nix

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 0f88aa05e4cf..c3e77c1051fb 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -1,20 +1,35 @@
-{ stdenv, fetchzip }:
+{ stdenv, lib, fetchurl, unzip
+, variant ? ""
+}:
 
 let
-  version = "3.4.6";
-in fetchzip {
-  name = "iosevka-bin-${version}";
+  name = "iosevka" + lib.optionalString (variant != "") "-" + variant;
 
-  url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip";
+  variantHashes = import ./variants.nix;
+  validVariants = map (lib.removePrefix "iosevka-")
+    (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
+in stdenv.mkDerivation rec {
+  pname = "${name}-bin";
+  version = "3.7.1";
 
-  postFetch = ''
+  src = fetchurl {
+    url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
+    sha256 = variantHashes.${name} or (throw ''
+      No such variant "${variant}" for package iosevka-bin.
+      Valid variants are: ${lib.concatStringsSep ", " validVariants}.
+    '');
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  phases = [ "unpackPhase" ];
+
+  unpackPhase = ''
     mkdir -p $out/share/fonts
-    unzip -j $downloadedFile \*.ttc -d $out/share/fonts/truetype
+    unzip -d $out/share/fonts/truetype $src
   '';
 
-  sha256 = "1nab49gkpxahwvvw39xcc32q425qkccr7ffmz87jbcdv71qy7pp9";
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://be5invis.github.io/Iosevka/";
     downloadPage = "https://github.com/be5invis/Iosevka/releases";
     description = ''
@@ -25,4 +40,6 @@ in fetchzip {
     platforms = platforms.all;
     maintainers = [ maintainers.cstrahan ];
   };
+
+  passthru.updateScript = ./update.sh;
 }
diff --git a/pkgs/data/fonts/iosevka/update.sh b/pkgs/data/fonts/iosevka/update.sh
new file mode 100755
index 000000000000..df78c62a6ce8
--- /dev/null
+++ b/pkgs/data/fonts/iosevka/update.sh
@@ -0,0 +1,28 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p curl jq
+
+set -e
+
+release=$(curl -s https://api.github.com/repos/be5invis/Iosevka/releases/latest)
+
+oldVersion=$(nix-instantiate --eval -E 'with import ./. {}; lib.getVersion iosevka-bin' | tr -d '"')
+version=$(echo "$release" | jq -r .tag_name | tr -d v)
+
+if test "$oldVersion" = "$version"; then
+	echo "New version same as old version, nothing to do." >&2
+	exit 0
+fi
+
+file=$(nix-instantiate --eval -A iosevka-bin.meta.position | sed -r 's/^"(.*):[0-9]+"$/\1/')
+sed -i "s/$oldVersion/$version/" "$file"
+
+{
+	echo '# This file was autogenerated. DO NOT EDIT!'
+	echo '{'
+	for asset in $(echo "$release" | jq -r '.assets[].name | select(startswith("ttc"))'); do
+		printf '  %s = "%s";\n' \
+			$(echo "$asset" | sed -r "s/^ttc-(.*)-$version.zip$/\1/") \
+			$(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset")
+	done
+	echo '}'
+} >$(dirname "$file")/variants.nix
diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix
new file mode 100644
index 000000000000..b3fd986c4caf
--- /dev/null
+++ b/pkgs/data/fonts/iosevka/variants.nix
@@ -0,0 +1,24 @@
+# This file was autogenerated. DO NOT EDIT!
+{
+  iosevka = "0h226f32nwlqnsdc86bwk2wcdl2hsq5q1s2ln6dsf9m7w8ajn0nr";
+  iosevka-aile = "05k3h7n7mkpdsjcxha27vjj503b4129jd90wj8qyk5h0nrgy1rc6";
+  iosevka-curly = "0fxcc99n9ghkdjmfxba9mg4fc0dwlvnnxlmc618jv6s3k2xn7sza";
+  iosevka-curly-slab = "1qgxyw5v91l4cw3mvqzagk9amyy63iqh72bnsz63daxgss3fpsab";
+  iosevka-etoile = "184rjidnjayv5wsrxxxf39mvdcjafdwcvp0h4rfniy9s0ifrwjvf";
+  iosevka-slab = "1cbrv5pyhnvwrdaj8r011igw2yjgzzigd82g1r10d348lk64wja1";
+  iosevka-sparkle = "124jnjzffnfw58b78svw8rzgal10z5nspwc267pvq7q0f2ak1wpp";
+  iosevka-ss01 = "18ckb0ch4za4vgwqz8azx8vhg9v9a922ffbckrbmy8n5bi03dl7w";
+  iosevka-ss02 = "0cwm2jdni5m9z0xagpmq9vvjp3yvin7c7bnavsj15yfvpq8b8qsp";
+  iosevka-ss03 = "1yzbvkr726f8mm024qzy2hdd7nz4kymgjm0cj5208c57bln0byr2";
+  iosevka-ss04 = "1kpz84a1cb39rxc87whw0fh0k9ak2qbcq59hm425da2acf27a648";
+  iosevka-ss05 = "1xnnm96jnw90mhwylsw1ad6m8pr4r1bd02l7g82m5hmr7bc4b7dd";
+  iosevka-ss06 = "1raw01ijiawaqxfmj0m8z8jrb2ns7vzy68lak63mss8j35xzg1l5";
+  iosevka-ss07 = "0bjhjwjif7qw6wyyrzfg2pdvy1b070k053ndmjard6sh1rcln02d";
+  iosevka-ss08 = "1qwgk8riff57np4hlmd0kcl9bx511x9zmnlrjq3ilfn6abdwgm7i";
+  iosevka-ss09 = "0sfnhmcrsv1v7l756hx70y1mrp35fbs6wrsczw4vxfbbaigs767r";
+  iosevka-ss10 = "10n70z7588h8y2z274vjn6hvzc7lg87znibcmkk2brmx2g5bw2wl";
+  iosevka-ss11 = "0mnyd04vdqr8jm3syv6ddrn61f27k91kxkdy86pp34xaac2ipmm0";
+  iosevka-ss12 = "1f8pn2220s6r566b40ncnqrfmfdhnlr0nkvzj9swgvx66jr8mlhj";
+  iosevka-ss13 = "1py5qgfqm9wp9pzcxg83mydvf3r6nhrqi21d0fvmnk04ghk1psd6";
+  iosevka-ss14 = "0z47kqicd26x5v94zy97xyl277v0s6856pbllfn1gv92ax2dg5cy";
+}

From 76cd5444557b02efd98d6143d779a0c76b22b1ac Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Thu, 22 Oct 2020 16:15:06 +0200
Subject: [PATCH 0679/3942] among-sus: init at 2020-10-29

---
 pkgs/games/among-sus/default.nix | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/games/among-sus/default.nix

diff --git a/pkgs/games/among-sus/default.nix b/pkgs/games/among-sus/default.nix
new file mode 100644
index 000000000000..c422ed1c8e52
--- /dev/null
+++ b/pkgs/games/among-sus/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, port ? "1234" }:
+
+stdenv.mkDerivation {
+  pname = "among-sus-unstable";
+  version = "2020-10-29";
+
+  src = fetchgit {
+    url = "https://git.sr.ht/~martijnbraam/among-sus";
+    rev = "1f4c8d800d025d36ac66826937161be3252fbc57";
+    sha256 = "19jq7ygh9l11dl1h6702bg57m04y35nqd6yqx1rgp1kxwhp45xyh";
+  };
+
+  patchPhase = ''
+    sed -i 's/port = 1234/port = ${port}/g' main.c
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -Dm755 among-sus $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://git.sr.ht/~martijnbraam/among-sus";
+    description = "Among us, but it's a text adventure";
+    license = licenses.agpl3Plus;
+    maintainers = [ maintainers.eyjhb ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9fb3029c693..b635f4518058 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -140,6 +140,8 @@ in
 
   alda = callPackage ../development/interpreters/alda { };
 
+  among-sus = callPackage ../games/among-sus { };
+
   ankisyncd = callPackage ../servers/ankisyncd { };
 
   avro-tools = callPackage ../development/tools/avro-tools { };

From 79e81e840415651f4470942f86f19c3fd254efab Mon Sep 17 00:00:00 2001
From: Florian Pester <florian.pester@cyberus-technology.de>
Date: Fri, 30 Oct 2020 21:30:32 +0100
Subject: [PATCH 0680/3942] python-miio: fix

---
 .../python-modules/python-miio/default.nix      | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix
index abce18c8841a..6bd140ae5b4c 100644
--- a/pkgs/development/python-modules/python-miio/default.nix
+++ b/pkgs/development/python-modules/python-miio/default.nix
@@ -4,8 +4,11 @@
 , appdirs
 , click
 , construct
+, croniter
 , cryptography
+, importlib-metadata
 , pytest
+, pytest-mock
 , zeroconf
 , attrs
 , pytz
@@ -13,6 +16,7 @@
 , netifaces
 }:
 
+
 buildPythonPackage rec {
   pname = "python-miio";
   version = "0.5.3";
@@ -22,8 +26,17 @@ buildPythonPackage rec {
     sha256 = "3be5275b569844dfa267c80a1e23dc0957411dd501cae0ed3cccf43467031ceb";
   };
 
-  checkInputs = [ pytest ];
-  propagatedBuildInputs = [ appdirs click construct cryptography zeroconf attrs pytz tqdm netifaces ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace  "zeroconf>=0.25.1,<0.26.0" "zeroconf"
+    substituteInPlace setup.py \
+      --replace  "pytz>=2019.3,<2020.0" "pytz"
+    substituteInPlace setup.py \
+      --replace  "cryptography>=2.9,<3.0" "cryptography"
+    '';
+
+  checkInputs = [ pytest pytest-mock];
+  propagatedBuildInputs = [ appdirs click construct croniter cryptography importlib-metadata zeroconf attrs pytz tqdm netifaces ];
 
   checkPhase = ''
     pytest

From 822edc571c26ce6149901d6a92c4bbe5db7c1e22 Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 30 Oct 2020 16:49:57 -0400
Subject: [PATCH 0681/3942] maintainers: my name should be stylized

---
 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 d81993d59669..d02d06f9b95a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9334,7 +9334,7 @@
     email = "worldofpeace@protonmail.ch";
     github = "worldofpeace";
     githubId = 28888242;
-    name = "worldofpeace";
+    name = "WORLDofPEACE";
   };
   wscott = {
     email = "wsc9tt@gmail.com";

From ef5268bcab5d5272a8622bf429ece73dd3fe05c1 Mon Sep 17 00:00:00 2001
From: Mira Ressel <aranea@aixah.de>
Date: Tue, 1 Sep 2020 17:00:14 +0200
Subject: [PATCH 0682/3942] nixos/qemu-vm: Fix condition in
 requiredKernelConfig

'optional' just takes a single item rather than a list
---
 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 191d7c758c0d..068d448c9335 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -751,7 +751,7 @@ in
         (isYes "NET_CORE")
         (isYes "INET")
         (isYes "NETWORK_FILESYSTEMS")
-      ] ++ optional (!cfg.graphics) [
+      ] ++ optionals (!cfg.graphics) [
         (isYes "SERIAL_8250_CONSOLE")
         (isYes "SERIAL_8250")
       ];

From 8ee970442b27d7163ca218d58c763309fccded3c Mon Sep 17 00:00:00 2001
From: Mira Ressel <aranea@aixah.de>
Date: Tue, 1 Sep 2020 17:05:36 +0200
Subject: [PATCH 0683/3942] nixos/qemu-vm: Don't require CONFIG_EXPERIMENTAL

The kernel stopped using this config option with version 3.9 (back in
2013!).
---
 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 068d448c9335..7534fd744fd8 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -746,7 +746,6 @@ in
         (isEnabled "EXT4_FS")
         (isYes "BLK_DEV")
         (isYes "PCI")
-        (isYes "EXPERIMENTAL")
         (isYes "NETDEVICES")
         (isYes "NET_CORE")
         (isYes "INET")

From a7de454a762cd6bda49a33c8531a553d67bce231 Mon Sep 17 00:00:00 2001
From: Mira Ressel <aranea@aixah.de>
Date: Tue, 1 Sep 2020 17:08:01 +0200
Subject: [PATCH 0684/3942] nixos/qemu-vm: Update system.requiredKernelConfig

Verify that all kernel modules which are required for mounting
/nix/store in the VM are present.
---
 nixos/modules/virtualisation/qemu-vm.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 7534fd744fd8..33da920e94cc 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -744,6 +744,8 @@ in
         (isEnabled "VIRTIO_PCI")
         (isEnabled "VIRTIO_NET")
         (isEnabled "EXT4_FS")
+        (isEnabled "NET_9P_VIRTIO")
+        (isEnabled "9P_FS")
         (isYes "BLK_DEV")
         (isYes "PCI")
         (isYes "NETDEVICES")
@@ -753,6 +755,8 @@ in
       ] ++ optionals (!cfg.graphics) [
         (isYes "SERIAL_8250_CONSOLE")
         (isYes "SERIAL_8250")
+      ] ++ optionals (cfg.writableStore) [
+        (isEnabled "OVERLAY_FS")
       ];
 
   };

From 4e6f5a305492be4d373f4a05e49b238a812f5dc6 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Fri, 30 Oct 2020 16:37:32 -0400
Subject: [PATCH 0685/3942] chrony: 3.5.1 -> 4.0

---
 .../chrony/allow-clock_adjtime.patch          | 26 -------------------
 pkgs/tools/networking/chrony/default.nix      | 13 +++-------
 .../networking/chrony/fix-seccomp-build.patch | 13 ----------
 3 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/tools/networking/chrony/allow-clock_adjtime.patch
 delete mode 100644 pkgs/tools/networking/chrony/fix-seccomp-build.patch

diff --git a/pkgs/tools/networking/chrony/allow-clock_adjtime.patch b/pkgs/tools/networking/chrony/allow-clock_adjtime.patch
deleted file mode 100644
index 2fa3baca7221..000000000000
--- a/pkgs/tools/networking/chrony/allow-clock_adjtime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0cf506c92967c84f9ed83ba9e1be946a7fda6425 Mon Sep 17 00:00:00 2001
-From: Miroslav Lichvar <mlichvar@redhat.com>
-Date: Mon, 2 Dec 2019 12:47:13 +0100
-Subject: sys_linux: allow clock_adjtime in seccomp filter
-
-The adjtimex() function in glibc was switched to the clock_adjtime
-system call.
-
-diff --git a/sys_linux.c b/sys_linux.c
-index 63eb8f1..fcf89c2 100644
---- a/sys_linux.c
-+++ b/sys_linux.c
-@@ -478,8 +478,8 @@ SYS_Linux_EnableSystemCallFilter(int level)
- {
-   const int syscalls[] = {
-     /* Clock */
--    SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday),
--    SCMP_SYS(settimeofday), SCMP_SYS(time),
-+    SCMP_SYS(adjtimex), SCMP_SYS(clock_adjtime), SCMP_SYS(clock_gettime),
-+    SCMP_SYS(gettimeofday), SCMP_SYS(settimeofday), SCMP_SYS(time),
-     /* Process */
-     SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getpid),
-     SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn),
--- 
-cgit v0.10.2
-
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 6c8254c797b7..374036d11a44 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -1,27 +1,22 @@
 { stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr
-, libseccomp, pps-tools }:
+, libseccomp, pps-tools, gnutls }:
 
 assert stdenv.isLinux -> libcap != null;
 
 stdenv.mkDerivation rec {
   pname = "chrony";
-  version = "3.5.1";
+  version = "4.0";
 
   src = fetchurl {
     url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz";
-    sha256 = "19ywl8a3lb2id7lcna5hp2g4pjnfwdc9ihr0fk6i9m45vdq2za0v";
+    sha256 = "09f6w2x5h5kamb4rhcbaz911q1f730qdalgsn8s48yjyqlafl9xy";
   };
 
-  patches = [
-    ./allow-clock_adjtime.patch
-    ./fix-seccomp-build.patch
-  ];
-
   postPatch = ''
     patchShebangs test
   '';
 
-  buildInputs = [ readline texinfo nss nspr ]
+  buildInputs = [ readline texinfo nss nspr gnutls ]
     ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ];
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/tools/networking/chrony/fix-seccomp-build.patch b/pkgs/tools/networking/chrony/fix-seccomp-build.patch
deleted file mode 100644
index 6888e7efeb72..000000000000
--- a/pkgs/tools/networking/chrony/fix-seccomp-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sys_linux.c b/sys_linux.c
-index 898dc7a7f75..fcd334ecf03 100644
---- a/sys_linux.c
-+++ b/sys_linux.c
-@@ -503,7 +503,7 @@ SYS_Linux_EnableSystemCallFilter(int level)
-     SCMP_SYS(socketcall),
-     /* General I/O */
-     SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe),
--    SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(ppoll), SCMP_SYS(pselect6), SCMP_SYS(read),
-+    SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(pselect6), SCMP_SYS(read),
-     SCMP_SYS(futex), SCMP_SYS(select), SCMP_SYS(set_robust_list), SCMP_SYS(write),
-     /* Miscellaneous */
-     SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname),

From 3e1652f8f07e7f0e346317a813369a44c430f008 Mon Sep 17 00:00:00 2001
From: V <v@anomalous.eu>
Date: Fri, 30 Oct 2020 23:15:07 +0100
Subject: [PATCH 0686/3942] lib/sources.nix: fix incorrect inherit

split comes from builtins, not lib.

	error: attribute 'split' missing, at /nix/path/nixpkgs/lib/sources.nix:4:4
	(use '--show-trace' to show detailed location information)
---
 lib/sources.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sources.nix b/lib/sources.nix
index 702a0ef88921..1a3afcae67da 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -6,6 +6,7 @@ let
     hasContext
     match
     readDir
+    split
     storeDir
     tryEval
     ;
@@ -15,7 +16,6 @@ let
     isString
     pathExists
     readFile
-    split
     ;
 in
 rec {

From 21b2619ee600261d8fe69c739ec7b4a8115000ac Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 31 Oct 2020 08:35:39 +1000
Subject: [PATCH 0687/3942] buildah: 1.16.5 -> 1.17.0

https://github.com/containers/buildah/releases/tag/v1.17.0
---
 pkgs/development/tools/buildah/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 5f4f2a479285..ecd714176330 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -14,13 +14,13 @@
 
 buildGoModule rec {
   pname = "buildah";
-  version = "1.16.5";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "buildah";
     rev = "v${version}";
-    sha256 = "1d2k7n1d9mpkyjy7hp1svl34ssai62df3mp5awsill092dlwn8p2";
+    sha256 = "1bghi5m1rg42a781sgh194hqmqiflhwdrnxxn7cbb2b6jfiik08l";
   };
 
   outputs = [ "out" "man" ];

From 9b813793ef9f2c4e9d717a919125f8f44e43cb05 Mon Sep 17 00:00:00 2001
From: Ivan Petkov <ivanppetkov@gmail.com>
Date: Fri, 30 Oct 2020 16:32:09 -0700
Subject: [PATCH 0688/3942] topgrade: 5.7.0 -> 5.8.1

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

diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index b7b38766db38..9da96dd352f5 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -1,21 +1,25 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation }:
+{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "topgrade";
-  version = "5.7.0";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "r-darwish";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0nxqi2rykfxhvn8jzprklsc47iilxp1pmm2f17ikfyf5dgi69whb";
+    sha256 = "0m3kqk0ghlpzysyql777jlk5c0nb36z44vabw6r0484fh5vncwrh";
   };
 
-  cargoSha256 = "05afmz2n006331hc8yi2mq9kj574xi1iq6gr983jj75ix7n40rgg";
+  cargoSha256 = "1h5cyiyhpagdin9a8gfsccbl4jahw33nbkg5m74axyp4qrfc1mkz";
 
   buildInputs = lib.optional stdenv.isDarwin Foundation;
 
-  # TODO: add manpage (topgrade.8) to postInstall on next update
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installManPage topgrade.8
+  '';
 
   meta = with lib; {
     description = "Upgrade all the things";

From a5bce15b5dc04e5e32abde659db79e4e1859d655 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 30 Oct 2020 16:07:53 +0100
Subject: [PATCH 0689/3942] skype_call_recorder: drop

hasn't worked since 2017: https://atdot.ch/scr/2017/06/important-information-regarding-skype-version-5/
the version packaged here is also from 2008, as far as I can tell
the last upstream release was 2016
---
 .../skype-call-recorder/conference.patch      | 148 ------------------
 .../skype-call-recorder/default.nix           |  28 ----
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 -
 4 files changed, 1 insertion(+), 178 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
 delete mode 100644 pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch b/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
deleted file mode 100644
index 8b8ce8fd7bbf..000000000000
--- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From abd67f1d44eef81baf2e9729f95e002c4ecc7350 Mon Sep 17 00:00:00 2001
-From: jlh <jlh@gmx.ch>
-Date: Fri, 16 Oct 2009 17:40:54 +0200
-Subject: [PATCH] Rudimentary support for recording hosted conference calls
-
----
- call.cpp |   37 +++++++++++++++++++++++++++++++++++--
- call.h   |   11 ++++++++++-
- 2 files changed, 45 insertions(+), 3 deletions(-)
-
-diff --git a/call.cpp b/call.cpp
-index c2b02f2..663c1c1 100644
---- a/call.cpp
-+++ b/call.cpp
-@@ -90,9 +90,10 @@ void AutoSync::reset() {
- 
- // Call class
- 
--Call::Call(QObject *p, Skype *sk, CallID i) :
--	QObject(p),
-+Call::Call(CallHandler *h, Skype *sk, CallID i) :
-+	QObject(h),
- 	skype(sk),
-+	handler(h),
- 	id(i),
- 	status("UNKNOWN"),
- 	writer(NULL),
-@@ -119,6 +120,13 @@ Call::Call(QObject *p, Skype *sk, CallID i) :
- 		debug(QString("Call %1: cannot get partner display name").arg(id));
- 		displayName = "Unnamed Caller";
- 	}
-+
-+	// Skype does not properly send updates when the CONF_ID property
-+	// changes.  since we need this information, check it now on all calls
-+	handler->updateConfIDs();
-+	// this call isn't yet in the list of calls, thus we need to
-+	// explicitely check its CONF_ID
-+	updateConfID();
- }
- 
- Call::~Call() {
-@@ -134,6 +142,10 @@ Call::~Call() {
- 	// QT takes care of deleting servers and sockets
- }
- 
-+void Call::updateConfID() {
-+	confID = skype->getObject(QString("CALL %1 CONF_ID").arg(id)).toLong();
-+}
-+
- bool Call::okToDelete() const {
- 	// this is used for checking whether past calls may now be deleted.
- 	// when a past call hasn't been decided yet whether it should have been
-@@ -270,6 +282,11 @@ void Call::startRecording(bool force) {
- 	if (isRecording)
- 		return;
- 
-+	if (handler->isConferenceRecording(confID)) {
-+		debug(QString("Call %1: call is part of a conference that is already being recorded").arg(id));
-+		return;
-+	}
-+
- 	if (force) {
- 		emit showLegalInformation();
- 	} else {
-@@ -589,6 +606,22 @@ CallHandler::~CallHandler() {
- 	delete legalInformationDialog;
- }
- 
-+void CallHandler::updateConfIDs() {
-+	QList<Call *> list = calls.values();
-+	for (int i = 0; i < list.size(); i++)
-+		list.at(i)->updateConfID();
-+}
-+
-+bool CallHandler::isConferenceRecording(CallID id) const {
-+	QList<Call *> list = calls.values();
-+	for (int i = 0; i < list.size(); i++) {
-+		Call *c = list.at(i);
-+		if (c->getConfID() == id && c->getIsRecording())
-+			return true;
-+	}
-+	return false;
-+}
-+
- void CallHandler::callCmd(const QStringList &args) {
- 	CallID id = args.at(0).toInt();
- 
-diff --git a/call.h b/call.h
-index cb8396d..b746f46 100644
---- a/call.h
-+++ b/call.h
-@@ -43,6 +43,8 @@ class QTcpServer;
- class QTcpSocket;
- class LegalInformationDialog;
- 
-+class CallHandler;
-+
- typedef int CallID;
- 
- class AutoSync {
-@@ -68,18 +70,21 @@ private:
- class Call : public QObject {
- 	Q_OBJECT
- public:
--	Call(QObject *, Skype *, CallID);
-+	Call(CallHandler *, Skype *, CallID);
- 	~Call();
- 	void startRecording(bool = false);
- 	void stopRecording(bool = true);
-+	void updateConfID();
- 	bool okToDelete() const;
- 	void setStatus(const QString &);
- 	QString getStatus() const { return status; }
- 	bool statusDone() const;
- 	bool statusActive() const;
- 	CallID getID() const { return id; }
-+	CallID getConfID() const { return confID; }
- 	void removeFile();
- 	void hideConfirmation(int);
-+	bool getIsRecording() const { return isRecording; }
- 
- signals:
- 	void startedCall(int, const QString &);
-@@ -99,10 +104,12 @@ private:
- 
- private:
- 	Skype *skype;
-+	CallHandler *handler;
- 	CallID id;
- 	QString status;
- 	QString skypeName;
- 	QString displayName;
-+	CallID confID;
- 	AudioFileWriter *writer;
- 	bool isRecording;
- 	int stereo;
-@@ -140,6 +147,8 @@ class CallHandler : public QObject {
- public:
- 	CallHandler(QObject *, Skype *);
- 	~CallHandler();
-+	void updateConfIDs();
-+	bool isConferenceRecording(CallID) const;
- 	void callCmd(const QStringList &);
- 
- signals:
--- 
-1.6.5.GIT
-
diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
deleted file mode 100644
index 57d1ffece71a..000000000000
--- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, cmake, lame, id3lib, libvorbis, qt4, libogg }:
-
-stdenv.mkDerivation {
-  name = "skype-call-recorder-0.8";
-  src = fetchurl {
-    url = "https://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz";
-    sha256 = "1iijkhq3aj9gr3bx6zl8ryvzkqcdhsm9yisimakwq0lnw0lgf5di";
-  };
-
-  # Keep an rpath reference to the used libogg
-  prePatch = ''
-    sed -i -e '/ADD_EXECUTABLE/aSET(LIBRARIES ''${LIBRARIES} ogg)' CMakeLists.txt
-  '';
-
-  # Better support for hosted conferences
-  patches = [ ./conference.patch ];
-
-  buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ];
-  NIX_LDFLAGS = "-lvorbis";
-
-  meta = {
-    homepage = "http://atdot.ch/scr/";
-    description = "Open source tool to record your Skype calls on Linux";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [viric];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eeb5519233ce..7a498f69d748 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -527,6 +527,7 @@ mapAliases ({
   skrooge2 = skrooge; # added 2017-02-18
   sky = throw "sky has been removed from nixpkgs (2020-09-16)";
   skype = skypeforlinux; # added 2017-07-27
+  skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # added 2020-10-31
   skydive = throw "skydive has been removed from nixpkgs (2019-09-10)";
   slack-dark = slack; # added 2020-03-27
   slic3r-prusa3d = prusa-slicer; # added 2019-05-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 319d24d2e25d..302ba3807827 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23343,8 +23343,6 @@ in
 
   skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };
 
-  skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };
-
   SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { };
 
   slmenu = callPackage ../applications/misc/slmenu {};

From 32573f4b6e15e57c6260b1973a4f802f3a6e1b68 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Sat, 31 Oct 2020 10:59:02 +1100
Subject: [PATCH 0690/3942] last: 1066 -> 1133

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

diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix
index 13f6a23913fc..775852931163 100644
--- a/pkgs/applications/science/biology/last/default.nix
+++ b/pkgs/applications/science/biology/last/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "last";
-  version = "1066";
+  version = "1133";
 
   src = fetchurl {
     url = "http://last.cbrc.jp/last-${version}.zip";
-    sha256 = "098j3f3a80rmhd01ds7rnb9y1xykmll2yh5ivpnvskssd8z2vc4r";
+    sha256 = "0a600p1fymm1ylaxzjwg46zdwz6ilaaak1f4n8xr3hp3ir9rgfjq";
   };
 
   nativeBuildInputs = [ unzip ];

From 703010347ffff5a5280965512b357e4a74efa9ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 30 Oct 2020 23:18:53 +0100
Subject: [PATCH 0691/3942] shfmt: 3.1.2 -> 3.2.0

---
 pkgs/tools/text/shfmt/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index ec58cbdd1a94..694b1db58f5f 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -1,30 +1,22 @@
-{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "shfmt";
-  version = "3.1.2";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "sh";
     rev = "v${version}";
-    sha256 = "03zgi0rlra3gz8cbqwmhpjxsg5048anfc6ccd2w50fjhx6farsnv";
+    sha256 = "1ybrx82c4djp7izyqhvzk0rcf9ac7nv5g5ahxr0k0jhm752ba5z2";
   };
 
-  vendorSha256 = "1jq2x4yxshsy4ahp7nrry8dc9cyjj46mljs447rq57sgix4ndpq8";
+  vendorSha256 = "1ma7nvyn6ylbi8bd7x900i94pzs877kfy9xh0nf1bbify1vcpd29";
 
   subPackages = [ "cmd/shfmt" ];
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
-  patches = [
-    # fix failing test on go 1.15, remove with > 3.1.2
-    (fetchpatch {
-      url = "https://github.com/mvdan/sh/commit/88956f97dae1f268af6c030bf2ba60762ebb488a.patch";
-      sha256 = "1zg8i7kklr12zjkaxh8djd2bzkdx8klgfj271r2wivkc2x61shgv";
-    })
-  ];
-
   meta = with lib; {
     homepage = "https://github.com/mvdan/sh";
     description = "A shell parser and formatter";

From 1e20b2dce4213b6a79e7fb7d3e1c5dad0ef5430f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 31 Oct 2020 09:22:22 +1000
Subject: [PATCH 0692/3942] shfmt: install man page

---
 pkgs/tools/text/shfmt/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 694b1db58f5f..1d1def43177c 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, scdoc }:
 
 buildGoModule rec {
   pname = "shfmt";
@@ -17,6 +17,13 @@ buildGoModule rec {
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
+  nativeBuildInputs = [ installShellFiles scdoc ];
+
+  postBuild = ''
+    scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
+    installManPage shfmt.1
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/mvdan/sh";
     description = "A shell parser and formatter";

From 9a8d6011aacf22cb12b371978eb89ee5f49ae1f0 Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Fri, 21 Aug 2020 04:07:41 +0000
Subject: [PATCH 0693/3942] nixos/tailscale: add tailscale to
 environment.systemPackages.

Use of Tailscale requires using the `tailscale` CLI to talk to the
daemon. If the CLI isn't in systemPackages, the resulting user experience
is confusing as the Tailscale daemon does nothing.

Signed-off-by: David Anderson <dave@natulte.net>
---
 nixos/modules/services/networking/tailscale.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index 4d6aeb75ebd1..9a692f12b3d4 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -17,6 +17,7 @@ in {
   };
 
   config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.tailscale ]; # for the CLI
     systemd.services.tailscale = {
       description = "Tailscale client daemon";
 

From f5ac1c66f05f76fac6847452bc6346af71287faa Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Fri, 30 Oct 2020 12:13:25 -0700
Subject: [PATCH 0694/3942] zoxide: 0.4.3 -> 0.5.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/ajeetdsouza/zoxide/compare/v0.4.3...v0.5.0

Tests are disabled on darwin because they fail and I can't troubleshoot
(since I don't have a darwin system).

Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
---
 pkgs/tools/misc/zoxide/default.nix | 32 +++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix
index 3e4cbfd84334..c5ca2965e9dd 100644
--- a/pkgs/tools/misc/zoxide/default.nix
+++ b/pkgs/tools/misc/zoxide/default.nix
@@ -1,11 +1,20 @@
 { lib
+, stdenv
 , fetchFromGitHub
 , rustPlatform
 , withFzf ? true
 , fzf
+
+  # checkInputs
+, fish
+, powershell
+, shellcheck
+, shfmt
+, xonsh
+, zsh
 }:
 let
-  version = "0.4.3";
+  version = "0.5.0";
 in
 rustPlatform.buildRustPackage {
   pname = "zoxide";
@@ -15,15 +24,32 @@ rustPlatform.buildRustPackage {
     owner = "ajeetdsouza";
     repo = "zoxide";
     rev = "v${version}";
-    sha256 = "1ghdal6pqkp56rqawhj26ch1x4cvnjj032xz3626aiddqgn134zj";
+    sha256 = "143lh94mw31pm9q7ib63h2k842g3h222mdabhf25hpb19lka2w5y";
   };
 
+  # tests are broken on darwin
+  doCheck = !stdenv.isDarwin;
+
+  # fish needs a writable HOME for whatever reason
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  checkInputs = [
+    fish
+    powershell
+    shellcheck
+    shfmt
+    xonsh
+    zsh
+  ];
+
   postPatch = lib.optionalString withFzf ''
     substituteInPlace src/fzf.rs \
       --replace '"fzf"' '"${fzf}/bin/fzf"'
   '';
 
-  cargoSha256 = "0klnjmda77bq9i9f0rz48jzaw4rcf7hafcjjpb0i570d7hlxnwsr";
+  cargoSha256 = "05mp101yk1zkjj1gwbkldizq6f9f8089gqgvq42c4ngq88pc7v9a";
 
   meta = with lib; {
     description = "A fast cd command that learns your habits";

From 43effbbc59d177f152f83a2cd0d4183b0e201e9b Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Fri, 30 Oct 2020 19:03:42 -0700
Subject: [PATCH 0695/3942] nixos/transmission: point at the settings dir in
 cfg.home.

Without this, transmission starts with an empty config when using
a custom home location.

Signed-off-by: David Anderson <dave@natulte.net>
---
 nixos/modules/services/torrent/transmission.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 014a22bb5a8d..aeb58a7194f9 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -197,7 +197,7 @@ in
           install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' /dev/stdin \
            '${cfg.home}/${settingsDir}/settings.json'
         '')];
-        ExecStart="${pkgs.transmission}/bin/transmission-daemon -f";
+        ExecStart="${pkgs.transmission}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         User = cfg.user;
         Group = cfg.group;

From c959631b11a85041370054d490f9b5ba324eddee Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 31 Oct 2020 04:20:00 +0000
Subject: [PATCH 0696/3942] grpc: 1.32.0 -> 1.33.2

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

diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index e7d1aa4bf92b..98117c7ae410 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.32.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
+  version = "1.33.2"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
   pname = "grpc";
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    sha256 = "0v48h0j0gxcp9s63z1ibwgz4416qd6iq728la80y6gl8rklrqf0c";
+    sha256 = "0cc7yfa37ngrr0q9k3lm2yi4i57bfsyxwbblwc0f801k6wvgavcy";
     fetchSubmodules = true;
   };
   patches = [
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp libnsl ];
+  buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libnsl ];
 
   cmakeFlags =
     [ "-DgRPC_ZLIB_PROVIDER=package"

From d703bf0a9bd7627ce56f6f98461e4ca728477b4f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 31 Oct 2020 04:20:00 +0000
Subject: [PATCH 0697/3942] skim: 0.9.1 -> 0.9.2

https://github.com/lotabout/skim/releases/tag/v0.9.2
---
 pkgs/tools/misc/skim/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix
index 1c8dc40de1b7..6a613869e148 100644
--- a/pkgs/tools/misc/skim/default.nix
+++ b/pkgs/tools/misc/skim/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "1r8zf56kb9rhh8nlh8w684srr8jfhndf8742x8byw374my9xn8pb";
+    sha256 = "0k101ymr6shi8hivf7kv52vwgcad2dwhyma0yg2pnp9q3ll0iszb";
   };
 
   outputs = [ "out" "vim" ];
 
-  cargoSha256 = "0wjlkyngrc03a92fwmavgj90h0kakww38bfc1wapn2my7p3b6nc1";
+  cargoSha256 = "0b4pj30w07p67zvpn5af23ddkvknmfp5a33sy6ai8argfi73bf4c";
 
   postPatch = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim

From 661f6bf2c95ad46c38af07526df8272456069e30 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 31 Oct 2020 04:20:00 +0000
Subject: [PATCH 0698/3942] lxc: 4.0.4 -> 4.0.5

---
 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 21c1eede9d7a..ade4299eaa7a 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 {
   pname = "lxc";
-  version = "4.0.4";
+  version = "4.0.5";
 
   src = fetchurl {
     url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
-    sha256 = "15frszz5am9bnr8vh1zpg89x0xigcfm19jax0z16cazd42xahr9w";
+    sha256 = "1976l9308rx1ria1gazasypk5rmmf5jiqdh54dfrws5bslbdcb5g";
   };
 
   nativeBuildInputs = [

From 4346b1a27612d867d442d7759cd90160480a623f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 31 Oct 2020 04:20:00 +0000
Subject: [PATCH 0699/3942] pythonPackages.grpcio-tools: 1.32.0 -> 1.33.2

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

diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index c60acb2d1f16..fe0fc9d3f8ea 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.32.0";
+  version = "1.33.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "28547272c51e1d2d343685b9f531e85bb90ad7bd93e726ba646b5627173cbc47";
+    sha256 = "af40774c0275f5465f49fd92bfcd9831b19b013de4cc77b8fb38aea76fa6dce3";
   };
 
   enableParallelBuilding = true;

From ed047f80bf36cf6c53239bc9b840959188f8ebd7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 31 Oct 2020 04:20:00 +0000
Subject: [PATCH 0700/3942] =?UTF-8?q?emacs:=20make=20ImageMagick=20depende?=
 =?UTF-8?q?ncy=20optional=20in=20Emacs=E2=89=A527?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Emacs 27 doesn't use ImageMagick by default to display images [1]:

    ** Emacs no longer defaults to using ImageMagick to display images.
    This is due to security and stability concerns with ImageMagick.  To
    override the default, use 'configure --with-imagemagick'.

[1] https://github.com/emacs-mirror/emacs/blob/emacs-27.1/etc/NEWS#L96-L98
---
 pkgs/applications/editors/emacs/generic.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix
index f2904f3e012b..2de45d03dd6a 100644
--- a/pkgs/applications/editors/emacs/generic.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@@ -22,6 +22,7 @@
 , srcRepo ? false, autoreconfHook ? null, texinfo ? null
 , siteStart ? ./site-start.el
 , nativeComp ? false
+, withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
 , toolkit ? (
   if withGTK2 then "gtk2"
   else if withGTK3 then "gtk3"
@@ -101,7 +102,8 @@ in stdenv.mkDerivation {
     ++ lib.optionals withX
       [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft
         gconf cairo ]
-    ++ lib.optionals (withX || withNS) [ imagemagick librsvg ]
+    ++ lib.optionals (withX || withNS) [ librsvg ]
+    ++ lib.optionals withImageMagick [ imagemagick ]
     ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ]
     ++ lib.optional (withX && withGTK2) gtk2-x11
     ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
@@ -126,6 +128,7 @@ in stdenv.mkDerivation {
              "--with-gif=no" "--with-tiff=no" ])
     ++ lib.optional withXwidgets "--with-xwidgets"
     ++ lib.optional nativeComp "--with-nativecomp"
+    ++ lib.optional withImageMagick "--with-imagemagick"
     ;
 
   installTargets = [ "tags" "install" ];

From 5c4342674b7e13e583bcb52ee328c719962cd313 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Fri, 30 Oct 2020 21:20:52 -0700
Subject: [PATCH 0701/3942] hugo: 0.76.5 -> 0.77.0

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 72ebefb98e73..4b2a4c464573 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.76.5";
+  version = "0.77.0";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0p7zz9cif1vihhs21nvh4n3y1p2cwpga59rilpam7yvza4nzx7ay";
+    sha256 = "1vjqddcbk8afqkjzrj9wwvz697bxhv9vz0rk2vj2ji6lz1slhc56";
   };
 
-  vendorSha256 = "0kiqy8n2df52gsgsbmr96rph8lpnw06g622123hlwk7kqg0z9ifh";
+  vendorSha256 = "03xv188jw5scqd6a8xd2s13vkn721d37bgs6a6rik7pgqmjh46c6";
 
   doCheck = false;
 

From a32ede5635cf13eda25aef12eed0d3d0c3309621 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Sat, 31 Oct 2020 14:02:35 +0900
Subject: [PATCH 0702/3942] kmscon: add omasanori as a maintainer (#102206)

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 pkgs/os-specific/linux/kmscon/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix
index 29f99629df87..8b01fe94d4c7 100644
--- a/pkgs/os-specific/linux/kmscon/default.nix
+++ b/pkgs/os-specific/linux/kmscon/default.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
     description = "KMS/DRM based System Console";
     homepage = "http://www.freedesktop.org/wiki/Software/kmscon/";
     license = licenses.mit;
+    maintainers = with maintainers; [ omasanori ];
     platforms = platforms.linux;
   };
 }

From ec38df81a9c189c5d5cd1286bba1f43dc0ed978d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 28 Oct 2020 13:00:17 -0700
Subject: [PATCH 0703/3942] buildFHSUserEnvBubblewrap: fix whitespace with root
 directories

---
 pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
index c7cfd27d3faa..83d5d371b397 100644
--- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
+++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
@@ -77,13 +77,13 @@ let
       done
     fi
 
-    auto_mounts=""
+    declare -a auto_mounts
     # loop through all directories in the root
     for dir in /*; do
       # if it is a directory and it is not in the blacklist
       if [[ -d "$dir" ]] && grep -v "$dir" <<< "$blacklist" >/dev/null; then
         # add it to the mount list
-        auto_mounts="$auto_mounts --bind $dir $dir"
+        auto_mounts+=(--bind "$dir" "$dir")
       fi
     done
 
@@ -97,7 +97,7 @@ let
       --ro-bind /nix /nix \
       ${etcBindFlags} \
       $ro_mounts \
-      $auto_mounts \
+      "''${auto_mounts[@]}" \
       ${init runScript}/bin/${name}-init ${initArgs}
   '';
 

From b8f45c32f89931b68fda102649d3cb6f4e17fa6a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 20 Oct 2020 09:10:16 -0700
Subject: [PATCH 0704/3942] python3Packages.tensorflow: break if gast not
 correct

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

diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix
index 5df3ad32afb4..599f809f8646 100644
--- a/pkgs/development/python-modules/tensorflow/1/default.nix
+++ b/pkgs/development/python-modules/tensorflow/1/default.nix
@@ -445,5 +445,7 @@ in buildPythonPackage {
     libtensorflow = bazel-build.out;
   };
 
-  inherit (bazel-build) meta;
+  meta = bazel-build.meta // {
+    broken = gast.version != "0.3.2";
+  };
 }

From 0544a7f672749c88b7569f49b33ed5f2437a2e15 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 25 Oct 2020 22:07:10 -0700
Subject: [PATCH 0705/3942] scripts/mark-broken: improve

This improves on the previous verison of this script.

Previously it only accepted one attr, and required
explicit passing of the "broken" value.

This script is meant to be used to mark failing hydra builds as broken in the meta attrs
To use the script, you should pass the list of failing attrs as arguments to the script.

Example: `cat failing-attrs | xargs ./pkgs/common-update/scripts/mark-broken`

Generating a list of failing attrs: (this should be improved at a later date)
  - Go to the most recent hydra evaluation with all builds completed
  - Select the "builds still failing" tab
  - Highlight and select all packages, should be prefixed with `nixpkgs.`
  - Use regex and editor foo to leave only the attr names
  - Use the above example command to then execute the script

OTHER NOTES:
  - The `denyFileList` and `denyAttrList` will likely need to be updated slightly
    to align with the conventions used in nixpkgs at execution time
  - Any attrs which failed for any reason will be written to `failed-marks.txt`.
    Those attrs will likely need manual attention as disablement will likely be conditional.
---
 pkgs/common-updater/scripts/mark-broken | 152 ++++++++++++++----------
 1 file changed, 86 insertions(+), 66 deletions(-)

diff --git a/pkgs/common-updater/scripts/mark-broken b/pkgs/common-updater/scripts/mark-broken
index d128d0d458ba..ee80616d0cbe 100755
--- a/pkgs/common-updater/scripts/mark-broken
+++ b/pkgs/common-updater/scripts/mark-broken
@@ -1,86 +1,106 @@
 #!/usr/bin/env bash
-set -e
+
+# This script is meant to be used to mark failing hydra builds as broken in the meta attrs
+# To use the script, you should pass the list of failing attrs as arguments to the script.
+#
+# Example: `cat failing-attrs | xargs ./pkgs/common-update/scripts/mark-broken`
+#
+# Generating a list of failing attrs: (this should be improved at a later date)
+#   - Go to the most recent hydra evaluation with all builds completed
+#   - Select the "builds still failing" tab
+#   - Highlight and select all packages, should be prefixed with `nixpkgs.`
+#   - Use regex and editor foo to leave only the attr names
+#   - Use the above example command to then execute the script
+#
+# OTHER NOTES:
+#   - The `denyFileList` and `denyAttrList` will likely need to be updated slightly
+#     to align with the conventions used in nixpkgs at execution time
+#   - Any attrs which failed for any reason will be written to `failed-marks.txt`.
+#     Those attrs will likely need manual attention as disablement will likely be conditional.
 
 scriptName=mark-broken # do not use the .wrapped name
 
-die() {
-    echo "$scriptName: error: $1" >&2
-    exit 1
+failMark() {
+        local attr=$1
+        shift 1
+
+        echo "$attr: $@" >&2
+        echo $attr >> failed-marks.txt
 }
 
 usage() {
-    echo "Usage: $scriptName <attr> [--new-value=<new-value>]"
+    echo "Usage: $scriptName <attrs>"
 }
 
-args=()
-
-for arg in "$@"; do
-    case $arg in
-        --new-value=*)
-            newValue="${arg#*=}"
-        ;;
-        --help)
-            usage
-            exit 0
-        ;;
-        --*)
-            echo "$scriptName: Unknown argument: $arg"
-            usage
-            exit 1
-        ;;
-        *)
-            args["${#args[*]}"]=$arg
-        ;;
-    esac
-done
-
-attr=${args[0]}
-
-if (( "${#args[*]}" < 1 )); then
+if (( "${#@}" < 1 )); then
     echo "$scriptName: Too few arguments"
     usage
     exit 1
 fi
 
-if (( "${#args[*]}" > 1 )); then
-    echo "$scriptName: Too many arguments"
-    usage
-    exit 1
-fi
+# in case we resolve to an auto-generated file, just skip these entries
+denyFileList=(
+        node-packages.nix # node, it will mark all node packages as broken
+        generic-builder.nix # haskell, it will mark all haskell packages as broken
+)
 
-if [ -z $newValue ]; then
-  newValue="true"
-fi
+# ignore older versions of parameterized packages sets, these likely need
+# to be conditionally disabled
+denyAttrList=(
+        python27Packages
+        python37Packages
+        libsForQt512
+        linuxPackages_
+        rubyPackages_
+)
 
-nixFile=$(nix-instantiate --eval --json -E "with import ./. {}; (builtins.unsafeGetAttrPos \"description\" $attr.meta).file" | jq -r .)
-if [[ ! -f "$nixFile" ]]; then
-    die "Couldn't evaluate 'builtins.unsafeGetAttrPos \"description\" $attr.meta' to locate the .nix file!"
-fi
+function attemptToMarkBroken() {
+        local attr=$1
 
-# Insert broken attribute
-sed -i.bak "$nixFile" -r \
-  -e "/^\s*broken\s*=.*$/d" \
-  -e "s/(\s*)meta\s*=.*\{/&\n\1  broken = $newValue;/"
+        # skip likely to be noisy attrs
+        for badAttr in ${denyAttrList[@]};do
+                if [[ $attr =~ $badAttr ]]; then
+                        failMark $attr "attr contained $badAttr, skipped."
+                        return
+                fi
+        done
 
-if cmp -s "$nixFile" "$nixFile.bak"; then
-    mv "$nixFile.bak" "$nixFile"
-    die "Failed to mark the package as broken! Does it have a meta attribute?"
-fi
+        nixFile=$(nix-instantiate --eval --json -E "with import ./. {}; (builtins.unsafeGetAttrPos \"description\" $attr.meta).file" 2>/dev/null | jq -r .)
+        if [[ ! -f "$nixFile" ]]; then
+            failMark $attr "Couldn't locate correct file"
+            return
+        fi
 
-if [[ "$newValue" == "true" ]]; then
-    # broken should evaluate to true in any case now
-    markedSuccessfully=$(nix-instantiate --eval -E "with import ./. {}; $attr.meta.broken" || true)
-    if [[ ! "$markedSuccessfully" == "true" ]]; then
-        mv "$nixFile.bak" "$nixFile"
-        die "Couldn't verify the broken attribute to be set correctly, restoring backup!"
-    fi
-else
-    # we can not check if broken evaluates to the correct value, but we can check that it does evaluate
-    if ! nix-instantiate --eval -E "with import ./. {}; $attr.meta.broken" >/dev/null; then
-        mv "$nixFile.bak" "$nixFile"
-        die "Couldn't verify the broken attribute to be set correctly, restoring backup!"
-    fi
-fi
+        # skip files which are auto-generated
+        for filename in ${denyFileList[@]};do
+                if [[ "$filename" == $(basename $nixFile) ]]; then
+                        failMark $attr "filename matched $filename, skipped."
+                        return
+                fi
+        done
 
-rm -f "$nixFile.bak"
-rm -f "$attr.fetchlog"
+        # Insert broken attribute
+        sed -i.bak "$nixFile" -r \
+          -e "/^\s*broken\s*=.*$/d" \
+          -e "s/(\s*)meta\s*=.*\{/&\n\1  broken = true;/"
+
+        if cmp -s "$nixFile" "$nixFile.bak"; then
+            mv "$nixFile.bak" "$nixFile"
+            failMark $attr "Does it have a meta attribute?"
+            return
+        fi
+
+        # broken should evaluate to true in any case now
+        markedSuccessfully=$(nix-instantiate --eval -E "with import ./. {}; $attr.meta.broken")
+        if [[ "$markedSuccessfully" != "true" ]]; then
+            mv "$nixFile.bak" "$nixFile"
+            failMark $attr "$attr.meta.broken doesn't evaluate to true."
+            return
+        fi
+
+        rm -f "$nixFile.bak"
+}
+
+for attr in $@; do
+        attemptToMarkBroken $attr
+done

From 2df221ec8a95566ba771f102fd421c12b41d875c Mon Sep 17 00:00:00 2001
From: Jade <software@lfcode.ca>
Date: Sat, 31 Oct 2020 00:35:19 -0700
Subject: [PATCH 0706/3942] nixos/postgresql: fix inaccurate docs for
 authentication (#97622)

* nixos/postgresql: fix inaccurate docs for authentication

We actually use peer authentication, then md5 based authentication.
trust is not used.

* Use a link for mkForce docs

Co-authored-by: aszlig <aszlig@redmoonstudios.org>

Co-authored-by: lf- <lf-@users.noreply.github.com>
Co-authored-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/databases/postgresql.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 5056d50153f6..f582b0592774 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -69,11 +69,16 @@ in
         type = types.lines;
         default = "";
         description = ''
-          Defines how users authenticate themselves to the server. By
-          default, "trust" access to local users will always be granted
-          along with any other custom options. If you do not want this,
-          set this option using "lib.mkForce" to override this
-          behaviour.
+          Defines how users authenticate themselves to the server. See the
+          <link xlink:href="https://www.postgresql.org/docs/current/auth-pg-hba-conf.html">
+          PostgreSQL documentation for pg_hba.conf</link>
+          for details on the expected format of this option. By default,
+          peer based authentication will be used for users connecting
+          via the Unix socket, and md5 password authentication will be
+          used for users connecting via TCP. Any added rules will be
+          inserted above the default rules. If you'd like to replace the
+          default rules entirely, you can use <function>lib.mkForce</function> in your
+          module.
         '';
       };
 

From 8cab21b48b46086d5240dcee4dd018cb4a78c074 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 28 Oct 2020 17:25:40 +0100
Subject: [PATCH 0707/3942] Revert "coq: propagate and install ocaml and
 findlib"

This reverts commit 5d0e2dedd5594cdf3ebbda8bc61310e227235a9c.
---
 pkgs/applications/science/logic/coq/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 9b7e007ce503..946cba41b143 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -109,7 +109,7 @@ self = stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ]
   ++ stdenv.lib.optional (!versionAtLeast "8.6") gnumake42
   ;
-  buildInputs = [ ncurses ]
+  buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ]
   ++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5
   ++ stdenv.lib.optional (!versionAtLeast "8.12") ocamlPackages.num
   ++ stdenv.lib.optionals buildIde
@@ -117,10 +117,7 @@ self = stdenv.mkDerivation {
      then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
      else [ ocamlPackages.lablgtk ]);
 
-  propagatedBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
-    ++ stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;
-
-  propagatedUserEnvPkgs = [ ocamlPackages.ocaml ocamlPackages.findlib ];
+  propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;
 
   postPatch = ''
     UNAME=$(type -tp uname)

From b37bbca521556d30e564896eea56b41d63324fdf Mon Sep 17 00:00:00 2001
From: lf- <lf-@users.noreply.github.com>
Date: Wed, 9 Sep 2020 00:31:27 -0700
Subject: [PATCH 0708/3942] nixos/modules: fix systemd start rate-limits

These were broken since 2016:
https://github.com/systemd/systemd/commit/f0367da7d1a61ad698a55d17b5c28ddce0dc265a
since StartLimitIntervalSec got moved into [Unit] from [Service].
StartLimitBurst has also been moved accordingly, so let's fix that one
too.

NixOS systems have been producing logs such as:
/nix/store/wf98r55aszi1bkmln1lvdbp7znsfr70i-unit-caddy.service/caddy.service:31:
Unknown key name 'StartLimitIntervalSec' in section 'Service', ignoring.

I have also removed some unnecessary duplication in units disabling
rate limiting since setting either interval or burst to zero disables it
(https://github.com/systemd/systemd/blob/ad16158c10dfc3258831a9ff2f1a988214f51653/src/basic/ratelimit.c#L16)
---
 .../hercules-ci-agent/default.nix                |  3 +--
 .../services/databases/victoriametrics.nix       |  2 +-
 nixos/modules/services/hardware/lcd.nix          |  5 ++---
 nixos/modules/services/mail/dovecot.nix          |  2 +-
 nixos/modules/services/misc/autorandr.nix        |  4 ++--
 nixos/modules/services/misc/cgminer.nix          |  2 +-
 nixos/modules/services/misc/safeeyes.nix         |  4 ++--
 nixos/modules/services/monitoring/teamviewer.nix |  4 ++--
 .../services/network-filesystems/ceph.nix        |  8 +++-----
 nixos/modules/services/networking/cjdns.nix      |  2 +-
 nixos/modules/services/networking/dnsdist.nix    |  1 +
 .../modules/services/networking/mullvad-vpn.nix  |  4 ++--
 nixos/modules/services/networking/namecoind.nix  |  4 ++--
 nixos/modules/services/networking/nextdns.nix    |  4 ++--
 .../services/networking/nix-store-gcs-proxy.nix  |  2 +-
 nixos/modules/services/networking/nsd.nix        |  4 ++--
 nixos/modules/services/networking/supybot.nix    |  4 ++--
 nixos/modules/services/networking/tailscale.nix  |  5 +----
 nixos/modules/services/security/vault.nix        |  4 ++--
 nixos/modules/services/web-apps/moinmoin.nix     |  3 ++-
 nixos/modules/services/web-servers/caddy.nix     |  4 ++--
 .../services/web-servers/nginx/default.nix       |  3 ++-
 nixos/modules/services/web-servers/traefik.nix   |  4 ++--
 nixos/modules/services/x11/xserver.nix           |  8 ++++----
 .../modules/system/boot/systemd-unit-options.nix | 16 ++++++++++++----
 nixos/modules/system/boot/systemd.nix            |  2 ++
 26 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix
index d2e7e8e18f94..79d1ce580545 100644
--- a/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix
+++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix
@@ -25,19 +25,18 @@ in
   ];
 
   config = mkIf cfg.enable {
-
     systemd.services.hercules-ci-agent = {
       wantedBy = [ "multi-user.target" ];
       after = [ "network-online.target" ];
       wants = [ "network-online.target" ];
       path = [ config.nix.package ];
+      startLimitBurst = 30 * 1000000; # practically infinite
       serviceConfig = {
         User = "hercules-ci-agent";
         ExecStart = command;
         ExecStartPre = testCommand;
         Restart = "on-failure";
         RestartSec = 120;
-        StartLimitBurst = 30 * 1000000; # practically infinite
       };
     };
 
diff --git a/nixos/modules/services/databases/victoriametrics.nix b/nixos/modules/services/databases/victoriametrics.nix
index 0af5d2adf372..5b09115bb2fb 100644
--- a/nixos/modules/services/databases/victoriametrics.nix
+++ b/nixos/modules/services/databases/victoriametrics.nix
@@ -40,10 +40,10 @@ let cfg = config.services.victoriametrics; in
     systemd.services.victoriametrics = {
       description = "VictoriaMetrics time series database";
       after = [ "network.target" ];
+      startLimitBurst = 5;
       serviceConfig = {
         Restart = "on-failure";
         RestartSec = 1;
-        StartLimitBurst = 5;
         StateDirectory = "victoriametrics";
         DynamicUser = true;
         ExecStart = ''
diff --git a/nixos/modules/services/hardware/lcd.nix b/nixos/modules/services/hardware/lcd.nix
index d78d742cd318..dc8595ea60cd 100644
--- a/nixos/modules/services/hardware/lcd.nix
+++ b/nixos/modules/services/hardware/lcd.nix
@@ -151,14 +151,13 @@ in with lib; {
         description = "LCDproc - client";
         after = [ "lcdd.service" ];
         wantedBy = [ "lcd.target" ];
+        # Allow restarting for eternity
+        startLimitIntervalSec = lib.mkIf cfg.client.restartForever 0;
         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";
         };
       };
     };
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index f5c5f795dc1b..03e7e40e388e 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -427,12 +427,12 @@ in
       wantedBy = [ "multi-user.target" ];
       restartTriggers = [ cfg.configFile modulesDir ];
 
+      startLimitIntervalSec = 60;  # 1 min
       serviceConfig = {
         ExecStart = "${dovecotPkg}/sbin/dovecot -F";
         ExecReload = "${dovecotPkg}/sbin/doveadm reload";
         Restart = "on-failure";
         RestartSec = "1s";
-        StartLimitInterval = "1min";
         RuntimeDirectory = [ "dovecot2" ];
       };
 
diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix
index cf7fb5f78d3d..dfb418af6ede 100644
--- a/nixos/modules/services/misc/autorandr.nix
+++ b/nixos/modules/services/misc/autorandr.nix
@@ -37,9 +37,9 @@ in {
       description = "Autorandr execution hook";
       after = [ "sleep.target" ];
 
+      startLimitIntervalSec = 5;
+      startLimitBurst = 1;
       serviceConfig = {
-        StartLimitInterval = 5;
-        StartLimitBurst = 1;
         ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default ${cfg.defaultTarget}";
         Type = "oneshot";
         RemainAfterExit = false;
diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix
index 7635c2a0f4e9..fa9c8c54509e 100644
--- a/nixos/modules/services/misc/cgminer.nix
+++ b/nixos/modules/services/misc/cgminer.nix
@@ -126,12 +126,12 @@ in
         GPU_USE_SYNC_OBJECTS = "1";
       };
 
+      startLimitIntervalSec = 60;  # 1 min
       serviceConfig = {
         ExecStart = "${pkgs.cgminer}/bin/cgminer --syslog --text-only --config ${cgminerConfig}";
         User = cfg.user;
         RestartSec = "30s";
         Restart = "always";
-        StartLimitInterval = "1m";
       };
     };
 
diff --git a/nixos/modules/services/misc/safeeyes.nix b/nixos/modules/services/misc/safeeyes.nix
index 6ecb0d13187c..1e748195e41a 100644
--- a/nixos/modules/services/misc/safeeyes.nix
+++ b/nixos/modules/services/misc/safeeyes.nix
@@ -32,14 +32,14 @@ in
       wantedBy = [ "graphical-session.target" ];
       partOf   = [ "graphical-session.target" ];
 
+      startLimitIntervalSec = 350;
+      startLimitBurst = 10;
       serviceConfig = {
         ExecStart = ''
           ${pkgs.safeeyes}/bin/safeeyes
         '';
         Restart = "on-failure";
         RestartSec = 3;
-        StartLimitInterval = 350;
-        StartLimitBurst = 10;
       };
     };
 
diff --git a/nixos/modules/services/monitoring/teamviewer.nix b/nixos/modules/services/monitoring/teamviewer.nix
index 8d781d82d086..ce9e57a187cd 100644
--- a/nixos/modules/services/monitoring/teamviewer.nix
+++ b/nixos/modules/services/monitoring/teamviewer.nix
@@ -31,14 +31,14 @@ in
       after = [ "NetworkManager-wait-online.service" "network.target" ];
       preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer";
 
+      startLimitIntervalSec = 60;
+      startLimitBurst = 10;
       serviceConfig = {
         Type = "forking";
         ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -d";
         PIDFile = "/run/teamviewerd.pid";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         Restart = "on-abort";
-        StartLimitInterval = "60";
-        StartLimitBurst = "10";
       };
     };
   };
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
index d17959a6a305..f2dc740fd88e 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -28,6 +28,9 @@ let
 
     # Don't start services that are not yet initialized
     unitConfig.ConditionPathExists = "/var/lib/${stateDirectory}/keyring";
+    startLimitBurst =
+      if daemonType == "osd" then 30 else if lib.elem daemonType ["mgr" "mds"] then 3 else 5;
+    startLimitIntervalSec = 60 * 30;  # 30 mins
 
     serviceConfig = {
       LimitNOFILE = 1048576;
@@ -39,8 +42,6 @@ let
       ProtectHome = "true";
       ProtectSystem = "full";
       Restart = "on-failure";
-      StartLimitBurst = "5";
-      StartLimitInterval = "30min";
       StateDirectory = stateDirectory;
       User = "ceph";
       Group = if daemonType == "osd" then "disk" else "ceph";
@@ -48,13 +49,10 @@ let
                     -f --cluster ${clusterName} --id ${daemonId}'';
     } // optionalAttrs (daemonType == "osd") {
       ExecStartPre = ''${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}'';
-      StartLimitBurst = "30";
       RestartSec = "20s";
       PrivateDevices = "no"; # osd needs disk access
     } // optionalAttrs ( daemonType == "mon") {
       RestartSec = "10";
-    } // optionalAttrs (lib.elem daemonType ["mgr" "mds"]) {
-      StartLimitBurst = "3";
     };
   });
 
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 5f8ac96b2292..f116d6392ea7 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -264,10 +264,10 @@ in
          ''
       );
 
+      startLimitIntervalSec = 0;
       serviceConfig = {
         Type = "forking";
         Restart = "always";
-        StartLimitInterval = 0;
         RestartSec = 1;
         CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID";
         ProtectSystem = true;
diff --git a/nixos/modules/services/networking/dnsdist.nix b/nixos/modules/services/networking/dnsdist.nix
index c48835e73612..05c2bdef83e7 100644
--- a/nixos/modules/services/networking/dnsdist.nix
+++ b/nixos/modules/services/networking/dnsdist.nix
@@ -41,6 +41,7 @@ in {
     systemd.services.dnsdist = {
       wantedBy = [ "multi-user.target" ];
 
+      startLimitIntervalSec = 0;
       serviceConfig = {
         DynamicUser = true;
 
diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix
index cc98414257ca..d9e6e57c92cc 100644
--- a/nixos/modules/services/networking/mullvad-vpn.nix
+++ b/nixos/modules/services/networking/mullvad-vpn.nix
@@ -29,9 +29,9 @@ with lib;
         # Needed for ping
         "/run/wrappers"
       ];
+      startLimitBurst = 5;
+      startLimitIntervalSec = 20;
       serviceConfig = {
-        StartLimitBurst = 5;
-        StartLimitIntervalSec = 20;
         ExecStart = "${pkgs.mullvad-vpn}/bin/mullvad-daemon -v --disable-stdout-timestamps";
         Restart = "always";
         RestartSec = 1;
diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix
index 16f85df2e77c..4966ed2cac8d 100644
--- a/nixos/modules/services/networking/namecoind.nix
+++ b/nixos/modules/services/networking/namecoind.nix
@@ -165,6 +165,8 @@ in
       after    = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
+      startLimitIntervalSec = 120;
+      startLimitBurst = 5;
       serviceConfig = {
         User  = "namecoin";
         Group = "namecoin";
@@ -176,8 +178,6 @@ in
         TimeoutStopSec     = "60s";
         TimeoutStartSec    = "2s";
         Restart            = "always";
-        StartLimitInterval = "120s";
-        StartLimitBurst    = "5";
       };
 
       preStart = optionalString (cfg.wallet != "${dataDir}/wallet.dat")  ''
diff --git a/nixos/modules/services/networking/nextdns.nix b/nixos/modules/services/networking/nextdns.nix
index a633bff62ec7..b070eeec894f 100644
--- a/nixos/modules/services/networking/nextdns.nix
+++ b/nixos/modules/services/networking/nextdns.nix
@@ -28,9 +28,9 @@ in {
       environment = {
         SERVICE_RUN_MODE = "1";
       };
+      startLimitIntervalSec = 5;
+      startLimitBurst = 10;
       serviceConfig = {
-        StartLimitInterval = 5;
-        StartLimitBurst = 10;
         ExecStart = "${pkgs.nextdns}/bin/nextdns run ${escapeShellArgs config.services.nextdns.arguments}";
         RestartSec = 120;
         LimitMEMLOCK = "infinity";
diff --git a/nixos/modules/services/networking/nix-store-gcs-proxy.nix b/nixos/modules/services/networking/nix-store-gcs-proxy.nix
index 3f2ce5bca4da..0012302db2e3 100644
--- a/nixos/modules/services/networking/nix-store-gcs-proxy.nix
+++ b/nixos/modules/services/networking/nix-store-gcs-proxy.nix
@@ -42,9 +42,9 @@ in
       description = "A HTTP nix store that proxies requests to Google Storage";
       wantedBy = ["multi-user.target"];
 
+      startLimitIntervalSec = 10;
       serviceConfig = {
         RestartSec = 5;
-        StartLimitInterval = 10;
         ExecStart = ''
           ${pkgs.nix-store-gcs-proxy}/bin/nix-store-gcs-proxy \
             --bucket-name ${cfg.bucketName} \
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 3ecbd06ee416..f33c350a257a 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -916,14 +916,14 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
+      startLimitBurst = 4;
+      startLimitIntervalSec = 5 * 60;  # 5 mins
       serviceConfig = {
         ExecStart = "${nsdPkg}/sbin/nsd -d -c ${nsdEnv}/nsd.conf";
         StandardError = "null";
         PIDFile = pidFile;
         Restart = "always";
         RestartSec = "4s";
-        StartLimitBurst = 4;
-        StartLimitInterval = "5min";
       };
 
       preStart = ''
diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix
index dc9fb31ffd0b..7a62e04ec7c4 100644
--- a/nixos/modules/services/networking/supybot.nix
+++ b/nixos/modules/services/networking/supybot.nix
@@ -103,6 +103,8 @@ in
         rm -f '${cfg.stateDir}/supybot.cfg.bak'
       '';
 
+      startLimitIntervalSec = 5 * 60;  # 5 min
+      startLimitBurst = 1;
       serviceConfig = {
         ExecStart = "${pyEnv}/bin/supybot ${cfg.stateDir}/supybot.cfg";
         PIDFile = "/run/supybot.pid";
@@ -110,8 +112,6 @@ in
         Group = "supybot";
         UMask = "0007";
         Restart = "on-abort";
-        StartLimitInterval = "5m";
-        StartLimitBurst = "1";
 
         NoNewPrivileges = true;
         PrivateDevices = true;
diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index 9a692f12b3d4..4419c8a0602f 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -25,10 +25,7 @@ in {
       wants = [ "network-pre.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      unitConfig = {
-        StartLimitIntervalSec = 0;
-        StartLimitBurst = 0;
-      };
+      startLimitIntervalSec = 0;
 
       serviceConfig = {
         ExecStart =
diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index 6a8a3a93327e..64622454b9de 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -131,6 +131,8 @@ in
 
       restartIfChanged = false; # do not restart on "nixos-rebuild switch". It would seal the storage and disrupt the clients.
 
+      startLimitIntervalSec = 60;
+      startLimitBurst = 3;
       serviceConfig = {
         User = "vault";
         Group = "vault";
@@ -145,8 +147,6 @@ in
         KillSignal = "SIGINT";
         TimeoutStopSec = "30s";
         Restart = "on-failure";
-        StartLimitInterval = "60s";
-        StartLimitBurst = 3;
       };
 
       unitConfig.RequiresMountsFor = optional (cfg.storagePath != null) cfg.storagePath;
diff --git a/nixos/modules/services/web-apps/moinmoin.nix b/nixos/modules/services/web-apps/moinmoin.nix
index dc7abce2a5cb..3a876f75f4a4 100644
--- a/nixos/modules/services/web-apps/moinmoin.nix
+++ b/nixos/modules/services/web-apps/moinmoin.nix
@@ -224,6 +224,8 @@ in
               chmod -R u+w ${dataDir}/${wikiIdent}/underlay
             '';
 
+            startLimitIntervalSec = 30;
+
             serviceConfig = {
               User = user;
               Group = group;
@@ -237,7 +239,6 @@ in
 
               Restart = "on-failure";
               RestartSec = "2s";
-              StartLimitIntervalSec = "30s";
 
               StateDirectory = "moin/${wikiIdent}";
               StateDirectoryMode = "0750";
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index 63ba75e660cb..297b73273392 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -101,6 +101,8 @@ in {
       after = [ "network-online.target" ];
       wants = [ "network-online.target" ]; # systemd-networkd-wait-online.service
       wantedBy = [ "multi-user.target" ];
+      startLimitIntervalSec = 14400;
+      startLimitBurst = 10;
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/caddy run --config ${configJSON}";
         ExecReload = "${cfg.package}/bin/caddy reload --config ${configJSON}";
@@ -108,8 +110,6 @@ in {
         User = "caddy";
         Group = "caddy";
         Restart = "on-abnormal";
-        StartLimitIntervalSec = 14400;
-        StartLimitBurst = 10;
         AmbientCapabilities = "cap_net_bind_service";
         CapabilityBoundingSet = "cap_net_bind_service";
         NoNewPrivileges = true;
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 631e92fd6e95..c0c2f27a00ef 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -693,6 +693,8 @@ in
         ${cfg.preStart}
         ${execCommand} -t
       '';
+
+      startLimitIntervalSec = 60;
       serviceConfig = {
         ExecStart = execCommand;
         ExecReload = [
@@ -701,7 +703,6 @@ in
         ];
         Restart = "always";
         RestartSec = "10s";
-        StartLimitInterval = "1min";
         # User and group
         User = cfg.user;
         Group = cfg.group;
diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix
index 4ab7307c3b67..3d29199dd454 100644
--- a/nixos/modules/services/web-servers/traefik.nix
+++ b/nixos/modules/services/web-servers/traefik.nix
@@ -136,6 +136,8 @@ in {
       description = "Traefik web server";
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
+      startLimitIntervalSec = 86400;
+      startLimitBurst = 5;
       serviceConfig = {
         ExecStart =
           "${cfg.package}/bin/traefik --configfile=${staticConfigFile}";
@@ -143,8 +145,6 @@ in {
         User = "traefik";
         Group = cfg.group;
         Restart = "on-failure";
-        StartLimitInterval = 86400;
-        StartLimitBurst = 5;
         AmbientCapabilities = "cap_net_bind_service";
         CapabilityBoundingSet = "cap_net_bind_service";
         NoNewPrivileges = true;
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 55d3e742ef7c..9e971671c474 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -678,14 +678,14 @@ in
 
         script = "${cfg.displayManager.job.execCmd}";
 
+        # Stop restarting if the display manager stops (crashes) 2 times
+        # in one minute. Starting X typically takes 3-4s.
+        startLimitIntervalSec = 30;
+        startLimitBurst = 3;
         serviceConfig = {
           Restart = "always";
           RestartSec = "200ms";
           SyslogIdentifier = "display-manager";
-          # Stop restarting if the display manager stops (crashes) 2 times
-          # in one minute. Starting X typically takes 3-4s.
-          StartLimitInterval = "30s";
-          StartLimitBurst = "3";
         };
       };
 
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 5addc6f9ca44..4154389b2ce5 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -210,12 +210,21 @@ in rec {
       '';
     };
 
+    startLimitBurst = mkOption {
+       type = types.int;
+       description = ''
+         Configure unit start rate limiting. Units which are started
+         more than startLimitBurst times within an interval time
+         interval are not permitted to start any more.
+       '';
+    };
+
     startLimitIntervalSec = mkOption {
        type = types.int;
        description = ''
          Configure unit start rate limiting. Units which are started
-         more than burst times within an interval time interval are
-         not permitted to start any more.
+         more than startLimitBurst times within an interval time
+         interval are not permitted to start any more.
        '';
     };
 
@@ -245,8 +254,7 @@ in rec {
     serviceConfig = mkOption {
       default = {};
       example =
-        { StartLimitInterval = 10;
-          RestartSec = 5;
+        { RestartSec = 5;
         };
       type = types.addCheck (types.attrsOf unitOption) checkService;
       description = ''
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 74d6957678f5..a8ff5614862b 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -243,6 +243,8 @@ let
           OnFailure = toString config.onFailure; }
         // optionalAttrs (options.startLimitIntervalSec.isDefined) {
           StartLimitIntervalSec = toString config.startLimitIntervalSec;
+        } // optionalAttrs (options.startLimitBurst.isDefined) {
+          StartLimitBurst = toString config.startLimitBurst;
         };
     };
   };

From 0989b93cf892fe7dd8b53974747a12794391bdca Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 16 Oct 2020 12:03:31 +0300
Subject: [PATCH 0709/3942] rtsp-simple-server: init at 0.10.0

---
 pkgs/servers/rtsp-simple-server/default.nix | 35 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/rtsp-simple-server/default.nix

diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix
new file mode 100644
index 000000000000..72cebb95b6bd
--- /dev/null
+++ b/pkgs/servers/rtsp-simple-server/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, fetchFromGitHub
+, buildGoModule
+}:
+
+buildGoModule rec {
+  pname = "rtsp-simple-server";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner = "aler9";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "rnUmPyT9jAqm7Vf2TokgRGPTn7rTBUvrpJU21IopFsM=";
+  };
+
+  vendorSha256 = "jAWDz/TclfCKQR/Gh99zSiGAsraciNU+yzFe5DGTeQI=";
+
+  # Tests need docker
+  doCheck = false;
+
+  buildFlagsArray = [
+    "-ldflags=-X main.Version=${version}"
+  ];
+
+  meta = with stdenv.lib; {
+    description =
+      "Ready-to-use RTSP server and RTSP proxy that allows to read and publish video and audio streams"
+    ;
+    inherit (src.meta) homepage;
+    license = licenses.mit;
+    maintainers = with maintainers; [ doronbehar ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5e96c702485..211f5d5b8df5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18527,6 +18527,8 @@ in
 
   roccat-tools = callPackage ../os-specific/linux/roccat-tools { };
 
+  rtsp-simple-server = callPackage ../servers/rtsp-simple-server { };
+
   rtkit = callPackage ../os-specific/linux/rtkit { };
 
   rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { };

From b51bc901f1b5a64c9a05df2d18c41d39ef65b66f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Oct 2020 23:40:36 +0100
Subject: [PATCH 0710/3942] python3Packages.anyio: disable all socket-related
 tests on darwin

They don't work in their sandbox.
---
 pkgs/development/python-modules/anyio/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 516b8520f00e..f79bf23896fd 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
@@ -45,6 +46,9 @@ buildPythonPackage rec {
   pytestFlagsArray = [
     # lots of DNS lookups
     "--ignore=tests/test_sockets.py"
+  ] ++ lib.optionals stdenv.isDarwin [
+    # darwin sandboxing limitations
+    "--ignore=tests/streams/test_tls.py"
   ];
 
   pythonImportsCheck = [ "anyio" ];

From f433d25ea0e9e9256fb350878d3fd346977c3b16 Mon Sep 17 00:00:00 2001
From: Philipp Kern <pkern@google.com>
Date: Sat, 31 Oct 2020 10:57:46 +0100
Subject: [PATCH 0711/3942] exim: unconditionally build with dsearch lookups
 enabled

dsearch is required to do untainted lookups in directories. There's
no reason not to build it in and it's a standard feature in other
distributions.
---
 pkgs/servers/mail/exim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 210863aa0078..8bd197f46c1d 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
       s:^# \(RM_COMMAND\)=.*:\1=${coreutils}/bin/rm:
       s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch:
       s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl:
+      s:^# \(LOOKUP_DSEARCH=yes\)$:\1:
       ${stdenv.lib.optionalString enableLDAP ''
         s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1:
         s:^# \(LOOKUP_LDAP=yes\)$:\1:

From d7ea5189581352d448e36f01efdcd5d9dee472d1 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkins <jonathan@wilkins.tech>
Date: Sat, 31 Oct 2020 00:05:20 +0000
Subject: [PATCH 0712/3942] i3status-rust: 0.14.1 -> 0.14.2

---
 pkgs/applications/window-managers/i3/status-rust.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 8bd3d581434e..f6acf5698f4c 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "i3status-rust";
-  version = "0.14.1";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "greshake";
     repo = pname;
     rev = "v${version}";
-    sha256 = "11qhzjml04njhfa033v98m4yd522zj91s6ffvrm0m6sk7m0wyjsc";
+    sha256 = "1f1gvgb1zk8gw596vaz9iihbpybwzs5shd25qq7bn2bhr4hqlbb9";
   };
 
-  cargoSha256 = "0jmmxld4rsjj6p5nazi3d8j1hh7r34q6kyfqq4wv0sjc77gcpaxd";
+  cargoSha256 = "1dcfclk8lbqvq2hywr80jm63p1i1kz3893zq99ipgryia46vd397";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 0cf43ed2a0e70d4e0e9651c43df8822c97f995e8 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 31 Oct 2020 12:00:00 +0000
Subject: [PATCH 0713/3942] python3.pkgs.getkey: init at 0.6.5

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

diff --git a/pkgs/development/python-modules/getkey/default.nix b/pkgs/development/python-modules/getkey/default.nix
new file mode 100644
index 000000000000..c0cbec29145a
--- /dev/null
+++ b/pkgs/development/python-modules/getkey/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, flake8
+}:
+
+buildPythonPackage rec {
+  pname = "getkey";
+  version = "0.6.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ng0ihfagh9g8hral0bq5nhjlp3csqghyv3z8b7ylkdkqc1cgiv8";
+  };
+
+  # disable coverage, because we don't care and python-coveralls is not in nixpkgs
+  postPatch = ''
+    sed -e '/python-coveralls/d' -e '/pytest-cov/d' -i setup.py
+    rm setup.cfg
+  '';
+
+  checkInputs = [
+    flake8
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    description = "Read single characters and key-strokes";
+    homepage = "https://github.com/kcsaff/getkey";
+    license = licenses.mit;
+    maintainers = [ maintainers.symphorien ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bcbc6a9ba987..73f844f2d63f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2344,6 +2344,8 @@ in {
 
   getmac = callPackage ../development/python-modules/getmac { };
 
+  getkey = callPackage ../development/python-modules/getkey { };
+
   gevent = callPackage ../development/python-modules/gevent { };
 
   geventhttpclient = callPackage ../development/python-modules/geventhttpclient { };

From f28c4a120f5cacdad318782ccdd5b3599cea7e65 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 31 Oct 2020 21:22:09 +1000
Subject: [PATCH 0714/3942] vgrep: 2.4.0 -> 2.5.0

https://github.com/vrothberg/vgrep/releases/tag/v2.5.0
---
 pkgs/tools/text/vgrep/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/vgrep/default.nix b/pkgs/tools/text/vgrep/default.nix
index 12880b2e4eca..c51fce43467e 100644
--- a/pkgs/tools/text/vgrep/default.nix
+++ b/pkgs/tools/text/vgrep/default.nix
@@ -1,20 +1,28 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, go-md2man, installShellFiles }:
 
 buildGoModule rec {
   pname = "vgrep";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "vrothberg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "109j04my2xib8m52a0337996a27nvfgzackpg20zs3nzn66dmvb7";
+    sha256 = "1waxp66286q325avvsq58s8qkfjqa39s5p8c3z59scpm0244nr80";
   };
 
   vendorSha256 = null;
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
+  nativeBuildInputs = [ go-md2man installShellFiles ];
+
+  postBuild = ''
+    sed -i '/SHELL= /d' Makefile
+    make docs
+    installManPage docs/*.[1-9]
+  '';
+
   meta = with lib; {
     description = "User-friendly pager for grep/git-grep/ripgrep";
     homepage = "https://github.com/vrothberg/vgrep";

From 42a9cfe540687fd32cfd23ff511c9e197f2fcc72 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Fri, 25 Sep 2020 11:40:46 +0200
Subject: [PATCH 0715/3942] mlterm: stdenv.lib -> lib

---
 .../terminal-emulators/mlterm/default.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index 7c7906fc841f..0ec8d7a47404 100644
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, autoconf, makeDesktopItem
+{ stdenv, lib, fetchurl, pkgconfig, autoconf, makeDesktopItem
 , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte
 , harfbuzz #substituting glyphs with opentype fonts
 , fribidi, m17n_lib #bidi and encoding
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
     -L${stdenv.cc.cc.lib}/lib
     -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft
     -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n
-  " + stdenv.lib.optionalString (openssl != null) "
+  " + lib.optionalString (openssl != null) "
     -lcrypto
-  " + stdenv.lib.optionalString (libssh2 != null) "
+  " + lib.optionalString (libssh2 != null) "
     -lssh2
   ";
 
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc"
      #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core
      #and configuring ~/.mlterm/key correctly.
- ] ++ stdenv.lib.optional (libssh2 == null) "--disable-ssh2";
+ ] ++ lib.optional (libssh2 == null) "--disable-ssh2";
 
   postInstall = ''
     install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg"
@@ -80,13 +80,13 @@ stdenv.mkDerivation rec {
     comment = "Terminal emulator";
     desktopName = "mlterm";
     genericName = "Terminal emulator";
-    categories = stdenv.lib.concatStringsSep ";" [
+    categories = lib.concatStringsSep ";" [
       "Application" "System" "TerminalEmulator"
     ];
     startupNotify = "false";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Multi Lingual TERMinal emulator on X11";
     homepage = "http://mlterm.sourceforge.net/";
     license = licenses.bsd3;

From 534b0f19f37050cfff206cc049752aba6785b609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 31 Oct 2020 13:38:22 +0100
Subject: [PATCH 0716/3942] rubocop: 0.77.0 -> 1.1.0

---
 pkgs/development/tools/rubocop/Gemfile.lock | 25 ++++----
 pkgs/development/tools/rubocop/gemset.nix   | 65 ++++++++++++++-------
 2 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock
index 0e6e3a7f3610..6b6a3a995918 100644
--- a/pkgs/development/tools/rubocop/Gemfile.lock
+++ b/pkgs/development/tools/rubocop/Gemfile.lock
@@ -1,21 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    jaro_winkler (1.5.4)
-    parallel (1.19.1)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
+    ast (2.4.1)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
     rainbow (3.0.0)
-    rubocop (0.77.0)
-      jaro_winkler (~> 1.5.1)
+    regexp_parser (1.8.2)
+    rexml (3.2.4)
+    rubocop (1.1.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 1.0.1)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.1.0)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix
index d7e1b9328dc1..c1f55f7aca27 100644
--- a/pkgs/development/tools/rubocop/gemset.nix
+++ b/pkgs/development/tools/rubocop/gemset.nix
@@ -4,30 +4,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
+      sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a";
       type = "gem";
     };
-    version = "2.4.0";
-  };
-  jaro_winkler = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
-      type = "gem";
-    };
-    version = "1.5.4";
+    version = "2.4.1";
   };
   parallel = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";
+      sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
       type = "gem";
     };
-    version = "1.19.1";
+    version = "1.19.2";
   };
   parser = {
     dependencies = ["ast"];
@@ -35,10 +25,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw";
+      sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z";
       type = "gem";
     };
-    version = "2.6.5.0";
+    version = "2.7.2.0";
   };
   rainbow = {
     groups = ["default"];
@@ -50,16 +40,47 @@
     };
     version = "3.0.0";
   };
-  rubocop = {
-    dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
+  regexp_parser = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0m88b1bgbhmmbdnz2xv6n0il0j4q5qm9jbc0vf1zsaxmxqp06nx9";
+      sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm";
       type = "gem";
     };
-    version = "0.77.0";
+    version = "1.8.2";
+  };
+  rexml = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
+      type = "gem";
+    };
+    version = "3.2.4";
+  };
+  rubocop = {
+    dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nw87ngw4a9r3dpgykb872zcm640m7k0nk17qv537fmss2hl8shl";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  rubocop-ast = {
+    dependencies = ["parser"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ami6n3vnpm9y5z6wd4c6y2infijajizjjwv8fq0wrcjvr3zivzz";
+      type = "gem";
+    };
+    version = "1.1.0";
   };
   ruby-progressbar = {
     groups = ["default"];
@@ -76,9 +97,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
+      sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.7.0";
   };
 }
\ No newline at end of file

From 9c5154b5aaee073eeca7f94359d69c93d4dbf5b3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 31 Oct 2020 13:45:32 +0100
Subject: [PATCH 0717/3942] libical: skip timezone tests

They are incompatible with tzdata2020c.

There are still some other failing tests but I am not sure if they are also due to timezones.
---
 pkgs/development/libraries/libical/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index c03367da97ba..5741a121c463 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     runHook preInstallCheck
 
     export TZDIR=${tzdata}/share/zoneinfo
-    ctest --output-on-failure
+    ctest --output-on-failure --exclude-regex 'timezones|libical-glib-array|libical-glib-component|libical-glib-timezone'
 
     runHook postInstallCheck
   '';

From 8c00acab27a3fef3d21e0d9eaa2e7c7de851e78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denny=20Sch=C3=A4fer?= <denny.schaefer@tuxinaut.de>
Date: Sat, 31 Oct 2020 14:02:09 +0100
Subject: [PATCH 0718/3942] vimPlugins.SudoEdit-vim: init at 2020-02-27

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 91cbb9d83cb6..4b6713e2ba2a 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3251,6 +3251,18 @@ let
     meta.homepage = "https://github.com/darfink/starsearch.vim/";
   };
 
+  SudoEdit-vim = buildVimPluginFrom2Nix {
+    pname = "SudoEdit-vim";
+    version = "2020-02-27";
+    src = fetchFromGitHub {
+      owner = "chrisbra";
+      repo = "SudoEdit.vim";
+      rev = "e203eada5b563e9134ce2aae26b09edae0904fd7";
+      sha256 = "0pf9iix50pw3p430ky51rv11ra1hppdpwa5flzcd5kciybr76n0n";
+    };
+    meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/";
+  };
+
   supertab = buildVimPluginFrom2Nix {
     pname = "supertab";
     version = "2020-10-01";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index de4cd959dee4..4ea974402ecc 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -48,6 +48,7 @@ chrisbra/CheckAttach
 chrisbra/csv.vim
 chrisbra/NrrwRgn
 chrisbra/Recover.vim
+chrisbra/SudoEdit.vim
 chrisbra/unicode.vim
 chrisgeo/sparkup
 chriskempson/base16-vim

From 680d3201230c7864755bff80fcdef30d7487500a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 31 Oct 2020 13:57:22 +0100
Subject: [PATCH 0719/3942] tdesktop: 2.4.4 -> 2.4.5

---
 .../telegram/tdesktop/default.nix             |   4 +-
 .../telegram/tdesktop/tg_owt-install.patch    | 159 ------------------
 .../telegram/tdesktop/tg_owt.nix              |   6 +-
 3 files changed, 4 insertions(+), 165 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 379922ee5855..ed1b643960c9 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -22,12 +22,12 @@ let
 
 in mkDerivation rec {
   pname = "telegram-desktop";
-  version = "2.4.4";
+  version = "2.4.5";
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "09lhikaybf57rki62miqcaxxrdg1ni2rj9aj4w9mrbzdv849fyc8";
+    sha256 = "0nhzypgc45f5gqy53azj7mljnj7p9p0m7bil02f9cih1dg5sdxx5";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch
deleted file mode 100644
index bc8a23eb31e5..000000000000
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6fbc0da..6cbff3c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1856,3 +1856,41 @@ configure_file(
-     "${CMAKE_CURRENT_BINARY_DIR}/tg_owtConfig.cmake"
-     COPYONLY
- )
-+
-+install(
-+TARGETS
-+    tg_owt
-+    libabsl
-+    libopenh264
-+    libpffft
-+    librnnoise
-+    libsrtp
-+    libusrsctp
-+    libvpx
-+    ${vpx_export}
-+    libwebrtcbuild
-+    libyuv
-+    ${platform_export}
-+EXPORT tg_owtTargets
-+RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+)
-+
-+install(
-+    DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/src/
-+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+    FILES_MATCHING PATTERN "*.h"
-+)
-+
-+install(
-+    EXPORT tg_owtTargets
-+    NAMESPACE tg_owt::
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tg_owt
-+)
-+
-+install(
-+    FILES ${CMAKE_CURRENT_BINARY_DIR}/tg_owtConfig.cmake
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tg_owt
-+)
-diff --git a/cmake/libabsl.cmake b/cmake/libabsl.cmake
-index 2fb3b8c..4a4f85b 100644
---- a/cmake/libabsl.cmake
-+++ b/cmake/libabsl.cmake
-@@ -123,5 +123,6 @@ PRIVATE
-
- target_include_directories(libabsl
- PUBLIC
--    ${libabsl_loc}
-+    $<BUILD_INTERFACE:${libabsl_loc}>
-+    $<INSTALL_INTERFACE:include/third_party/abseil-cpp>
- )
-diff --git a/cmake/libpffft.cmake b/cmake/libpffft.cmake
-index a6ceb3e..435d3a3 100644
---- a/cmake/libpffft.cmake
-+++ b/cmake/libpffft.cmake
-@@ -24,5 +24,6 @@ endif()
-
- target_include_directories(libpffft
- PUBLIC
--    ${libpffft_loc}
-+    $<BUILD_INTERFACE:${libpffft_loc}>
-+    $<INSTALL_INTERFACE:include/third_party/pffft/src>
- )
-diff --git a/cmake/libsrtp.cmake b/cmake/libsrtp.cmake
-index 57c54b5..26b3466 100644
---- a/cmake/libsrtp.cmake
-+++ b/cmake/libsrtp.cmake
-@@ -30,6 +30,8 @@ PRIVATE
-
- target_include_directories(libsrtp
- PUBLIC
--    ${libsrtp_loc}/include
--    ${libsrtp_loc}/crypto/include
-+    $<BUILD_INTERFACE:${libsrtp_loc}/include>
-+    $<BUILD_INTERFACE:${libsrtp_loc}/crypto/include>
-+    $<INSTALL_INTERFACE:include/third_party/libsrtp/include>
-+    $<INSTALL_INTERFACE:include/third_party/libsrtp/crypto/include>
- )
-diff --git a/cmake/libusrsctp.cmake b/cmake/libusrsctp.cmake
-index caa0529..38d2ef6 100644
---- a/cmake/libusrsctp.cmake
-+++ b/cmake/libusrsctp.cmake
-@@ -67,6 +67,8 @@ endif()
-
- target_include_directories(libusrsctp
- PUBLIC
--    ${third_party_loc}/usrsctp/usrsctplib
--    ${libusrsctp_loc}
-+    $<BUILD_INTERFACE:${third_party_loc}/usrsctp/usrsctplib>
-+    $<BUILD_INTERFACE:${libusrsctp_loc}>
-+    $<INSTALL_INTERFACE:include/third_party/usrsctp/usrsctplib/usrsctplib>
-+    $<INSTALL_INTERFACE:include/third_party/usrsctp/usrsctplib>
- )
-diff --git a/cmake/libvpx.cmake b/cmake/libvpx.cmake
-index e192e7e..78cf25b 100644
---- a/cmake/libvpx.cmake
-+++ b/cmake/libvpx.cmake
-@@ -68,6 +68,11 @@ else()
-     set(ASM_SUFFIX ".asm.S")
- endif()
-
-+foreach(dir ${include_directories})
-+    string(REPLACE ${libvpx_loc} include/third_party/libvpx install_include_dir ${dir})
-+    list(APPEND install_include_directories ${install_include_dir})
-+endforeach()
-+
- function(add_sublibrary postfix)
-     add_library(libvpx_${postfix} OBJECT)
-     init_feature_target(libvpx_${postfix} ${postfix})
-@@ -75,6 +80,8 @@ function(add_sublibrary postfix)
-     target_include_directories(libvpx_${postfix}
-     PRIVATE
-         ${include_directories}
-+        "$<BUILD_INTERFACE:${include_directories}>"
-+        "$<INSTALL_INTERFACE:${install_include_directories}>"
-     )
-     set(sources_list ${ARGV})
-     list(REMOVE_AT sources_list 0)
-@@ -725,5 +732,6 @@ endif()
-
- target_include_directories(libvpx
- PUBLIC
--    ${include_directories}
-+    "$<BUILD_INTERFACE:${include_directories}>"
-+    "$<INSTALL_INTERFACE:${install_include_directories}>"
- )
-diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake
-index c3520b8..9b4b543 100644
---- a/cmake/libwebrtcbuild.cmake
-+++ b/cmake/libwebrtcbuild.cmake
-@@ -44,5 +44,6 @@ endif()
-
- target_include_directories(libwebrtcbuild
- INTERFACE
--    ${webrtc_loc}
-+    $<BUILD_INTERFACE:${webrtc_loc}>
-+    $<INSTALL_INTERFACE:include>
- )
-diff --git a/cmake/libyuv.cmake b/cmake/libyuv.cmake
-index ebfc6f0..18e70ef 100644
---- a/cmake/libyuv.cmake
-+++ b/cmake/libyuv.cmake
-@@ -126,7 +126,8 @@ endif()
-
- target_include_directories(libyuv
- PUBLIC
--    ${libyuv_loc}/include
-+    $<BUILD_INTERFACE:${libyuv_loc}/include>
-+    $<INSTALL_INTERFACE:include/third_party/libyuv/include>
- )
-
- target_compile_definitions(libyuv
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
index 47e9b6787e3e..4695e61f7d5b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
@@ -3,8 +3,8 @@
 }:
 
 let
-  rev = "c73a4718cbff7048373a63db32068482e5fd11ef";
-  sha256 = "0nr20mvvmmg8ii8f2rljd7iv2szplcfjn40rpy6llkmf705mwr1k";
+  rev = "1d4f7d74ff1a627db6e45682efd0e3b85738e426";
+  sha256 = "1w03xmjn693ff489pg368jv21478vr4ldxyya4lsrx87fn88caj3";
 
 in stdenv.mkDerivation {
   pname = "tg_owt";
@@ -16,8 +16,6 @@ in stdenv.mkDerivation {
     inherit rev sha256;
   };
 
-  patches = [ ./tg_owt-install.patch ];
-
   nativeBuildInputs = [ pkg-config cmake ninja yasm ];
 
   buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio ];

From 95702fe6d2ed934146b0cc8b81efd9fac5ac6e29 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Sat, 31 Oct 2020 14:24:52 +0100
Subject: [PATCH 0720/3942] neovim: revert change to extraMakeWrapperArgs

wrapNeovim incited users to use a list instead of a string. Revert that:
the change is not super useful while breaking home-manager.
---
 pkgs/applications/editors/neovim/utils.nix   | 12 ++++--------
 pkgs/applications/editors/neovim/wrapper.nix | 10 +++++-----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index 1c49f6e0fbe1..15d3f214057f 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -118,7 +118,7 @@ let
 
   # to keep backwards compatibility
   legacyWrapper = neovim: {
-    extraMakeWrapperArgs ? []
+    extraMakeWrapperArgs ? ""
     , withPython ? true
     /* the function you would have passed to python.withPackages */
     , extraPythonPackages ? (_: [])
@@ -147,13 +147,9 @@ let
       };
     in
     wrapNeovimUnstable neovim (res // {
-      wrapperArgs = res.wrapperArgs
-      ++ [
-        "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}"
-      ]
-      ++ (if builtins.isList extraMakeWrapperArgs then extraMakeWrapperArgs
-      else lib.warn "Passing a string as extraMakeWrapperArgs to the neovim wrapper is
-        deprecated, please use a list instead")
+      wrapperArgs = lib.escapeShellArgs (
+        res.wrapperArgs ++ [ "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}" ])
+        + " " + extraMakeWrapperArgs
       ;
   });
 in
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index 06ef920e2767..d18d13a050fe 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -14,7 +14,7 @@ neovim:
 let
   wrapper = {
       # should contain all args but the binary
-      wrapperArgs ? []
+      wrapperArgs ? ""
     , manifestRc ? null
     , withPython2 ? true, python2Env ? null
     , withPython3 ? true,  python3Env ? null
@@ -33,7 +33,7 @@ let
   # wrapper with most arguments we need, excluding those that cause problems to
   # generate rplugin.vim, but still required for the final wrapper.
   finalMakeWrapperArgs =
-    [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ wrapperArgs ++
+    [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++
       [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ];
   in
   symlinkJoin {
@@ -66,11 +66,11 @@ let
       ''
       + optionalString (manifestRc != null) (let
         manifestWrapperArgs =
-          [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ] ++ wrapperArgs;
+          [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ];
       in ''
         echo "Generating remote plugin manifest"
         export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim
-        makeWrapper ${lib.escapeShellArgs manifestWrapperArgs}
+        makeWrapper ${lib.escapeShellArgs manifestWrapperArgs} ${wrapperArgs}
 
         # Some plugins assume that the home directory is accessible for
         # initializing caches, temporary files, etc. Even if the plugin isn't
@@ -100,7 +100,7 @@ let
       '')
       + ''
         rm $out/bin/nvim
-        makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs}
+        makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgs}
       '';
 
     paths = [ neovim ];

From be9313766be5d957ea7c1eeeb6d0932a538afca2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 31 Oct 2020 15:49:52 +0100
Subject: [PATCH 0721/3942] packer: 1.6.4 -> 1.6.5

https://github.com/hashicorp/packer/releases/tag/v1.6.5
---
 pkgs/development/tools/packer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index d6df39e7a23a..b44f50a37ad8 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
   pname = "packer";
-  version = "1.6.4";
+  version = "1.6.5";
 
   goPackagePath = "github.com/hashicorp/packer";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "packer";
     rev = "v${version}";
-    sha256 = "0nkbm5iamkzi5x64107apnwmqxs4a75pxw935pwpm69ry4535r7w";
+    sha256 = "sha256-M4PZnqdU5+w/B821cs1bJYzeilqdZ93fh5PErVgqBOQ=";
   };
 
   meta = with stdenv.lib; {

From db157224ef26d088b66d30b62a50f602ef526545 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Sat, 31 Oct 2020 15:52:24 +0100
Subject: [PATCH 0722/3942] neovim: restore neovim.override

the compatibility layer for `wrapNeovim` introduced in https://github.com/NixOS/nixpkgs/pull/101265
broke the recommended way of configuration:
https://nixos.org/manual/nixpkgs/stable/#custom-configuration
https://nixos.wiki/wiki/Vim#Customizations

restore the old ways.
---
 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 82bf8bc78cab..7cf33ee0a740 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23984,7 +23984,7 @@ in
   # more usecases when wrapping neovim. The interface is being actively worked on
   # so expect breakage. use wrapNeovim instead if you want a stable alternative
   wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
-  wrapNeovim = neovimUtils.legacyWrapper;
+  wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
   neovim-unwrapped = callPackage ../applications/editors/neovim {
     lua =
       # neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879

From 0ad1519ad9b7cd0fa9222014f1f3eb7f36be022b Mon Sep 17 00:00:00 2001
From: Alvar Penning <post@0x21.biz>
Date: Sat, 31 Oct 2020 16:33:45 +0100
Subject: [PATCH 0723/3942] nixos/tlp: Fix deprecation hint

The deprecated extraConfig option refers to the config option, which
does not exists. The settings option should be used.
---
 nixos/modules/services/hardware/tlp.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 4230f2edd279..eb53f565a67f 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -39,7 +39,7 @@ in
         default = "";
         description = ''
           Verbatim additional configuration variables for TLP.
-          DEPRECATED: use services.tlp.config instead.
+          DEPRECATED: use services.tlp.settings instead.
         '';
       };
     };

From 916c7ee66a459d38290d92c2ab2a8a90444ac36f Mon Sep 17 00:00:00 2001
From: Alvar Penning <post@0x21.biz>
Date: Sat, 31 Oct 2020 16:40:10 +0100
Subject: [PATCH 0724/3942] platformio: 5.0.1 -> 5.0.2

---
 pkgs/development/arduino/platformio/chrootenv.nix | 4 ++--
 pkgs/development/arduino/platformio/core.nix      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix
index 91300bda8f1c..81cc8f371f4f 100644
--- a/pkgs/development/arduino/platformio/chrootenv.nix
+++ b/pkgs/development/arduino/platformio/chrootenv.nix
@@ -22,8 +22,8 @@ let
   src = fetchFromGitHub {
     owner = "platformio";
     repo = "platformio-core";
-    rev = "v5.0.1";
-    sha256 = "01xh61ldilg6fg95l1p870rld2xffhnl9f9ndvbi5jdn8q634pmw";
+    rev = "v5.0.2";
+    sha256 = "1hbw8nbllyj0xyx1rz2chx9vyqf9949dcdx4v9hnfbsjwwpcfi0a";
   };
 
 
diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix
index 835e0c692e4b..42e1e49b41fb 100644
--- a/pkgs/development/arduino/platformio/core.nix
+++ b/pkgs/development/arduino/platformio/core.nix
@@ -75,14 +75,14 @@ let
 
 in buildPythonApplication rec {
   pname = "platformio";
-  version = "5.0.1";
+  version = "5.0.2";
 
   # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
   src = fetchFromGitHub {
     owner = "platformio";
     repo = "platformio-core";
     rev = "v${version}";
-    sha256 = "01xh61ldilg6fg95l1p870rld2xffhnl9f9ndvbi5jdn8q634pmw";
+    sha256 = "1hbw8nbllyj0xyx1rz2chx9vyqf9949dcdx4v9hnfbsjwwpcfi0a";
   };
 
   propagatedBuildInputs =  [

From fb25f00cbb638fe182958597bbbeada044afe0ed Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 31 Oct 2020 18:50:24 +0300
Subject: [PATCH 0725/3942] unit: 1.19.0 -> 1.20.0

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

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index cbe17cdb8064..318fcd498abe 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -30,14 +30,14 @@ let
   php74-unit = php74.override phpConfig;
 
 in stdenv.mkDerivation rec {
-  version = "1.19.0";
+  version = "1.20.0";
   pname = "unit";
 
   src = fetchFromGitHub {
     owner = "nginx";
     repo = "unit";
     rev = version;
-    sha256 = "0k3q42q198sb0w6hyyymw92dbhz67axn6w6vnzr0d883xw3sva7k";
+    sha256 = "1qmcz01ifmd80qgpvf1y8nhad6yk56772xdhqvwfxn3mdjfqvcs8";
   };
 
   nativeBuildInputs = [ which ];

From c178fe4bbb9e55f2a67260238b975264497d0f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 31 Oct 2020 16:50:25 +0100
Subject: [PATCH 0726/3942] nixos/modules: Reformat `warnings` section

---
 nixos/modules/system/boot/systemd.nix | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a8ff5614862b..a66176aff45f 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -886,14 +886,21 @@ in
 
   config = {
 
-    warnings = concatLists (mapAttrsToList (name: service:
-      let
-        type = service.serviceConfig.Type or "";
-        restart = service.serviceConfig.Restart or "no";
-      in optional
-      (type == "oneshot" && (restart == "always" || restart == "on-success"))
-      "Service '${name}.service' with 'Type=oneshot' cannot have 'Restart=always' or 'Restart=on-success'")
-      cfg.services);
+    warnings = concatLists (
+      mapAttrsToList
+        (name: service:
+          let
+            type = service.serviceConfig.Type or "";
+            restart = service.serviceConfig.Restart or "no";
+          in
+            concatLists [
+              (optional (type == "oneshot" && (restart == "always" || restart == "on-success"))
+                "Service '${name}.service' with 'Type=oneshot' cannot have 'Restart=always' or 'Restart=on-success'"
+              )
+            ]
+        )
+        cfg.services
+    );
 
     system.build.units = cfg.units;
 

From 644079e707a1673f0f69508b5378e06949c7c61e Mon Sep 17 00:00:00 2001
From: lf- <lf-@users.noreply.github.com>
Date: Sat, 31 Oct 2020 01:25:51 -0700
Subject: [PATCH 0727/3942] nixos/modules: deprecation warning for
 StartLimitInterval in [Service]

This implements
https://github.com/NixOS/nixpkgs/issues/45786#issuecomment-440091879
---
 nixos/modules/system/boot/systemd.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a66176aff45f..c22264b3e92d 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -892,11 +892,15 @@ in
           let
             type = service.serviceConfig.Type or "";
             restart = service.serviceConfig.Restart or "no";
+            hasDeprecated = builtins.hasAttr "StartLimitInterval" service.serviceConfig;
           in
             concatLists [
               (optional (type == "oneshot" && (restart == "always" || restart == "on-success"))
                 "Service '${name}.service' with 'Type=oneshot' cannot have 'Restart=always' or 'Restart=on-success'"
               )
+              (optional hasDeprecated
+                "Service '${name}.service' uses the attribute 'StartLimitInterval' in the Service section, which is deprecated. See https://github.com/NixOS/nixpkgs/issues/45786."
+              )
             ]
         )
         cfg.services

From 1338647a8c9e6ad2459f90b3c462d497544e96be Mon Sep 17 00:00:00 2001
From: hyperfekt <git@hyperfekt.net>
Date: Wed, 14 Oct 2020 20:45:22 +0000
Subject: [PATCH 0728/3942] nixos-install: pass through keep-going flag

---
 nixos/doc/manual/man-nixos-install.xml         | 17 +++++++++++++++++
 nixos/modules/installer/tools/nixos-install.sh |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index 12d015971999..91542d37cbd5 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -106,6 +106,12 @@
     </arg>
    </arg>
 
+   <arg>
+    <arg choice='plain'>
+     <option>--keep-going</option>
+    </arg>
+   </arg>
+
    <arg>
     <arg choice='plain'>
      <option>--help</option>
@@ -301,6 +307,17 @@
      </para>
     </listitem>
    </varlistentry>
+   <varlistentry>
+    <term>
+     <option>--keep-going</option>
+    </term>
+    <listitem>
+     <para>
+      Causes Nix to continue building derivations as far as possible
+      in the face of failed builds.
+     </para>
+    </listitem>
+   </varlistentry>
    <varlistentry>
     <term>
      <option>--help</option>
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 9279f11b4f32..9d49d4055e43 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -64,7 +64,7 @@ while [ "$#" -gt 0 ]; do
         --no-bootloader)
             noBootLoader=1
             ;;
-        --show-trace|--impure)
+        --show-trace|--impure|--keep-going)
             extraBuildFlags+=("$i")
             ;;
         --help)

From 7dcbc0ebd51bb2be66f228405d87678ecbe406ff Mon Sep 17 00:00:00 2001
From: Badi' Abdul-Wahid <github@badi.sh>
Date: Sat, 31 Oct 2020 11:49:31 -0500
Subject: [PATCH 0729/3942] vivaldi: 3.3.2022.47-1 -> 3.4.2066.90-1

---
 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 29a48939facc..aa4dd7f8e443 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -18,11 +18,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "3.3.2022.47-1";
+  version = "3.4.2066.90-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "0lraliqb5r8akh8lfmw2sy90s58sbghcpc598nlz2d89f91yq7vz";
+    sha256 = "059vcr2j0vr8szqcxfqnzxwy5i8z53g71fwhm22nc0477jbrsxz1";
   };
 
   unpackPhase = ''

From c1cf4abe6d53aa9b905714f48d46737d10380997 Mon Sep 17 00:00:00 2001
From: Nicolai Kellerer <nicolai@kellerer.me>
Date: Fri, 30 Oct 2020 18:05:26 +0100
Subject: [PATCH 0730/3942] pythonPackages.toolz: create Python 2 package

---
 pkgs/development/python-modules/toolz/2.nix | 28 +++++++++++++++++++++
 pkgs/top-level/python-packages.nix          |  5 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/toolz/2.nix

diff --git a/pkgs/development/python-modules/toolz/2.nix b/pkgs/development/python-modules/toolz/2.nix
new file mode 100644
index 000000000000..8c8a64db3a5e
--- /dev/null
+++ b/pkgs/development/python-modules/toolz/2.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "toolz";
+  version = "0.10.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560";
+  };
+
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    nosetests toolz/tests
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/pytoolz/toolz";
+    description = "List processing tools and functional utilities";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7326f6194ea5..47c9f2f60c1a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7189,7 +7189,10 @@ in {
 
   tomlkit = callPackage ../development/python-modules/tomlkit { };
 
-  toolz = callPackage ../development/python-modules/toolz { };
+  toolz = if isPy3k then
+    callPackage ../development/python-modules/toolz { }
+  else
+    callPackage ../development/python-modules/toolz/2.nix { };
 
   toposort = callPackage ../development/python-modules/toposort { };
 

From a103c58bab1bdbf29871fa897e847382d25221ab Mon Sep 17 00:00:00 2001
From: Nicolai Kellerer <nicolai@kellerer.me>
Date: Thu, 22 Oct 2020 14:17:27 +0200
Subject: [PATCH 0731/3942] python3Packages.toolz: 0.10.0 -> 0.11.1

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

diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix
index e0039057d828..6100d2a7c53d 100644
--- a/pkgs/development/python-modules/toolz/default.nix
+++ b/pkgs/development/python-modules/toolz/default.nix
@@ -6,18 +6,16 @@
 
 buildPythonPackage rec {
   pname = "toolz";
-  version = "0.10.0";
+  version = "0.11.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560";
+    sha256 = "1grz3zvw5ixwqqlbv0n7j11mlcxb66cirh5i9x9zw8kqy0hpk967";
   };
 
   checkInputs = [ nose ];
 
   checkPhase = ''
-    # https://github.com/pytoolz/toolz/issues/357
-    rm toolz/tests/test_serialization.py
     nosetests toolz/tests
   '';
 

From bb6dfa91c456781ce64412768d8eb0190cd14846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denny=20Sch=C3=A4fer?= <denny.schaefer@tuxinaut.de>
Date: Sat, 31 Oct 2020 13:35:37 +0100
Subject: [PATCH 0732/3942] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 180 ++++++++++++++--------------
 1 file changed, 90 insertions(+), 90 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 91cbb9d83cb6..e3680918fd15 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -389,12 +389,12 @@ let
 
   coc-explorer = buildVimPluginFrom2Nix {
     pname = "coc-explorer";
-    version = "2020-10-27";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "weirongxu";
       repo = "coc-explorer";
-      rev = "9e3fdc4079255b7e77207011119bf47aae8c08f5";
-      sha256 = "0jkm2qf01w8m5x50h24y79l5qmxvwpv2hrl8v34bqhz6jvm10zz4";
+      rev = "a8a3cf41638e5b7b128086888e2dead665407beb";
+      sha256 = "19a3blvfzqjzd5y3l4g03h3c8yxfl9fsdvc6mir0n76krpnk647l";
     };
     meta.homepage = "https://github.com/weirongxu/coc-explorer/";
   };
@@ -461,12 +461,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2020-10-27";
+    version = "2020-10-28";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "6a903340710a808401120bd1a32f204529f00935";
-      sha256 = "1cznyvwgdgbg60hfd423h0fqdyzxhwwy5w88b5rmf44maspjr41i";
+      rev = "ad1793dce0a59afcf8b324b45a1168c032deb162";
+      sha256 = "1khmmvba6cg0pff37nkbm7zmp3mnvpc889pql6dm6xjqrhpqsda7";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -594,12 +594,12 @@ let
 
   Coqtail = buildVimPluginFrom2Nix {
     pname = "Coqtail";
-    version = "2020-10-23";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "whonore";
       repo = "Coqtail";
-      rev = "2aa48079243de581b498f11bb3c4e8aba9e09f71";
-      sha256 = "07bxcvvxrfvifxk9yyg0vnisj0fsrb1mzlrrzg8qjrr571cjvj6x";
+      rev = "778f5f5868aec79bb5415f790c8f18b8253fd99c";
+      sha256 = "1p7lg6ln9vkw6ds3bllyf1rlpnlhb5cyly6cab1v9zgjz4xagx80";
     };
     meta.homepage = "https://github.com/whonore/Coqtail/";
   };
@@ -738,12 +738,12 @@ let
 
   defx-nvim = buildVimPluginFrom2Nix {
     pname = "defx-nvim";
-    version = "2020-10-27";
+    version = "2020-10-28";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "defx.nvim";
-      rev = "77956f66722f3a8b7d7e1c86092a3ac84af70b90";
-      sha256 = "0iqib5fgz2hal3qm4az4glikml6i33sfk7fgwmdy5kgkx512vqb8";
+      rev = "152c61f409d6a58b4c10bbd70b51bedd3db11a3c";
+      sha256 = "02izychnj48gb108a4npk8v1nfhw99x5368jv2yqrxaixqmykkrs";
     };
     meta.homepage = "https://github.com/Shougo/defx.nvim/";
   };
@@ -932,12 +932,12 @@ let
 
   deoplete-lsp = buildVimPluginFrom2Nix {
     pname = "deoplete-lsp";
-    version = "2020-09-18";
+    version = "2020-10-28";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete-lsp";
-      rev = "17cd3fae3044eb8148bc22167257d4ae13165eb1";
-      sha256 = "1xag51j71ifjn64xyaz7whml796pdl8vsw0ad22wndwzb95kyxdm";
+      rev = "fb51bfebd8ac57282154d119f80368b4b94199b7";
+      sha256 = "09k2i02vrgn0qc3bhjz3hzaiab3h2cwqvk619a1xp5bpxr9qc78w";
     };
     meta.homepage = "https://github.com/Shougo/deoplete-lsp/";
   };
@@ -1028,12 +1028,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2020-10-23";
+    version = "2020-10-29";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "c09da81e9824fc113323573abea3a2ec13c04409";
-      sha256 = "0b8sp5kj6nnv3wlkpy2q14k9v9qxsf8lskb11rssrjwhfys12bn0";
+      rev = "3c94074f71faac00a7d8f4eef2c4bdea96212cd5";
+      sha256 = "1g5bll38gw1bpmhss398s1lj9jhvszv1xzbi5qc698y2zi5cm87z";
     };
     meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
   };
@@ -1331,12 +1331,12 @@ let
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2020-10-27";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "7d45724fdd323d5eb7d39c8caa2e38e63c5e84a7";
-      sha256 = "1v9ry3k8si26h2f9as7dnxrh5qihl3a1spinqqlwsk9faq7d511w";
+      rev = "bd3a021ec11617c56e6aa95578fee619445b029d";
+      sha256 = "1jd0bs7v28za6sba6f2i49mvjcnicid25ab3jljcax18c4kd6dl1";
     };
     meta.homepage = "https://github.com/junegunn/fzf.vim/";
   };
@@ -1920,12 +1920,12 @@ let
 
   lightline-bufferline = buildVimPluginFrom2Nix {
     pname = "lightline-bufferline";
-    version = "2020-09-04";
+    version = "2020-10-29";
     src = fetchFromGitHub {
       owner = "mengelbrecht";
       repo = "lightline-bufferline";
-      rev = "6417dd8c864ccd6fb2b79882d30ca0227bfd2204";
-      sha256 = "0aars37arix00l63kn5p4gq3dvzpmrzxz1ap20k1mr2dy7pmval5";
+      rev = "3933dcda3630474ba448cb486e8c630dade7b2ce";
+      sha256 = "09p759i41acyyyqk629sbcp36v66xf5y369xagjy8n2gzczj0mwa";
     };
     meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
   };
@@ -1956,12 +1956,12 @@ let
 
   lsp_extensions-nvim = buildVimPluginFrom2Nix {
     pname = "lsp_extensions-nvim";
-    version = "2020-10-19";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "lsp_extensions.nvim";
-      rev = "85ce064c36b93cd8856d6dfc41ea5089764ec1c6";
-      sha256 = "0vljxb9cvq042f70cq01n5mf2vd2wg2qpj75nlva9rjhiw9q3qw8";
+      rev = "8740c4b52dd6f9c2a564209db466ae72a3412dcc";
+      sha256 = "0sakmg4fkzji3rl9qmfx2rphz3ma5b6sysf7h7sag4n4lykinayj";
     };
     meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/";
   };
@@ -2424,12 +2424,12 @@ let
 
   nerdcommenter = buildVimPluginFrom2Nix {
     pname = "nerdcommenter";
-    version = "2020-06-08";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "nerdcommenter";
-      rev = "fade3d4b26f5a0d58f256a06ba7b0a04d9fb4f3b";
-      sha256 = "1vb5n4g5x3hpnc013gjf8frxxdrcq1zdcm3mpx90b0cjxi252cn3";
+      rev = "85750560a680907c50c1545abc4dd0e0b2452ff4";
+      sha256 = "1395m95ry4c52bj2zpxryks70c3abfwhb140kpx4rifl2ccpnwwp";
     };
     meta.homepage = "https://github.com/preservim/nerdcommenter/";
   };
@@ -2580,12 +2580,12 @@ let
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2020-10-27";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "d9454afd93b8396fb72ff15179b5c59df21713c3";
-      sha256 = "0kx2ljal46fj2pgvv2cpflxp6s0qzlry8i5mk0in27qs8bix79jn";
+      rev = "dd7900fc44b9cc6773bd4f8b5c0175887991520c";
+      sha256 = "0nfdvmlzqfga596n5awdhz9mc6gwnys73ixxkqi49f2g9x215ksd";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -3337,12 +3337,12 @@ let
 
   tagbar = buildVimPluginFrom2Nix {
     pname = "tagbar";
-    version = "2020-10-27";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "tagbar";
-      rev = "aa8c59220148640d66e779c1da495e6c5dfa78a9";
-      sha256 = "17ll4hgf67pc24r0bf9zz4l4g5xd3bchgh8i7acd2svsxckjjy3z";
+      rev = "99c22f1bb209e3393053a4dfb38039534b6b8a8d";
+      sha256 = "1bj7qi36yakxqds43fqp2876za4aq3bbb9444yvna2l0n504iy9j";
     };
     meta.homepage = "https://github.com/preservim/tagbar/";
   };
@@ -3373,24 +3373,24 @@ let
 
   tcomment_vim = buildVimPluginFrom2Nix {
     pname = "tcomment_vim";
-    version = "2020-10-09";
+    version = "2020-10-28";
     src = fetchFromGitHub {
       owner = "tomtom";
       repo = "tcomment_vim";
-      rev = "cfd1360119f5d41ed161cdf8a3e8502680f2fb4c";
-      sha256 = "040vwmgqlhnvjc8d32d9lw3a5lr7flgj4h6gnz6m1zw9jw5l68gh";
+      rev = "c28fdd5c59144a4725a31f011738991696896170";
+      sha256 = "03nqhdnq4i4r75ma7gslr5mlfxia7xscykdywc70glrdqfrpsa5g";
     };
     meta.homepage = "https://github.com/tomtom/tcomment_vim/";
   };
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2020-10-28";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "telescope.nvim";
-      rev = "78cf7ebd7f2dcfcf6fec1d0195ccf46cb479d72c";
-      sha256 = "1wl30nqdbl90a9zky524k1cszwii4vg5rhlrrvg4n6hdw9kkyi4m";
+      rev = "37c4f1b355d843e95ba41f2a73d83de58fb74dae";
+      sha256 = "0ly9vcnmf1b881fh1r5v4231h5n8kld2k9q1bxzvy87p2wsfb5sn";
     };
     meta.homepage = "https://github.com/nvim-lua/telescope.nvim/";
   };
@@ -3626,12 +3626,12 @@ let
 
   vim-abolish = buildVimPluginFrom2Nix {
     pname = "vim-abolish";
-    version = "2020-09-26";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-abolish";
-      rev = "1329f888a777cc1f8228f048a532502a30f1df01";
-      sha256 = "1jxwvqpiliq57mddbdbrspfv60vw0gzvh677mabnryg6wb94adds";
+      rev = "68bc80c88617672fd41da7a6ace87d29cd3fe1e3";
+      sha256 = "1cgaf8nhprm8sligmq4km2p374a2x08fg3isl1k0mac1iz9vz1z8";
     };
     meta.homepage = "https://github.com/tpope/vim-abolish/";
   };
@@ -3878,12 +3878,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2020-10-18";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "8608270bd39e9aa31bbdb8cd22b2ba776037feb6";
-      sha256 = "1g9nq313zdmklwcnn4lakyndc96qiq2zp9l3cg119i5470y7i1lz";
+      rev = "44b7b729381738cef0fc28a35fbe78fc2abe4d48";
+      sha256 = "09kvdm8yakqg0pjv1zbq5yy2wzzl3ax639mykk833b7g8hi6115q";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
   };
@@ -3902,12 +3902,12 @@ let
 
   vim-airline-themes = buildVimPluginFrom2Nix {
     pname = "vim-airline-themes";
-    version = "2020-10-08";
+    version = "2020-10-29";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
-      rev = "e1b0d9f86cf89e84b15c459683fd72730e51a054";
-      sha256 = "1mlp2yvam11cyscqy6ifn4chhm4w9ccf5hvjd4g3v2nb31zw5h3f";
+      rev = "5307367693f770a6b06d1a498c9bc9bf4cf9a884";
+      sha256 = "14iyfihlirp5adih8v117nz02wskaap4qlbrkgb7w0x87gfa3yqp";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
   };
@@ -3962,12 +3962,12 @@ let
 
   vim-autoformat = buildVimPluginFrom2Nix {
     pname = "vim-autoformat";
-    version = "2020-10-18";
+    version = "2020-10-28";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
-      rev = "ba41779884d23fc1f865c5077dfea7b53377e7b2";
-      sha256 = "1qfq3clgizk7h992x0j3khh53snxm4jjdaq46cy1mgapw4za7d2a";
+      rev = "ff16950ba5e07353f25ee33732982a67af451eb2";
+      sha256 = "12h6dznfwpifyr6ahk1b45pb59nlm6wkrfhgh65g1clnpzvchkiw";
     };
     meta.homepage = "https://github.com/Chiel92/vim-autoformat/";
   };
@@ -4070,12 +4070,12 @@ let
 
   vim-carbon-now-sh = buildVimPluginFrom2Nix {
     pname = "vim-carbon-now-sh";
-    version = "2020-10-25";
+    version = "2020-10-28";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-carbon-now-sh";
-      rev = "f348932f5b65bfccaaa54cfc018fbd251240434f";
-      sha256 = "17hj0mfl636hdw4m37xgjg8lahiir3g8bh9rfyq0avqqscjhzc58";
+      rev = "f4a3e5c9be2e587511f79e46fb0b48d6d646d719";
+      sha256 = "1ldv9l0swh6wk3wpyy0apnmg9gfcdzkgfdv8p0qm7j7pqdz981br";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/";
   };
@@ -4106,12 +4106,12 @@ let
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2020-10-27";
+    version = "2020-10-31";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "6bf6a490c27737f04b92082a5859357ad43887c9";
-      sha256 = "1nl3bzkqkzxya5a4wpqiads7xyx4prxyzllp9anyg0imbvqd54ms";
+      rev = "f7f800f59bb1e199993c5554f014c7e8e2685165";
+      sha256 = "1ka6q9fqzhjxzi0n803mk9f6rwnlbrjsjzjq52b8dghc9n0359a1";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -4526,12 +4526,12 @@ let
 
   vim-elm-syntax = buildVimPluginFrom2Nix {
     pname = "vim-elm-syntax";
-    version = "2020-06-10";
+    version = "2020-10-29";
     src = fetchFromGitHub {
       owner = "andys8";
       repo = "vim-elm-syntax";
-      rev = "68cd8988fe9eaa190052fadaee0fea2c21338d4c";
-      sha256 = "0yhvx8k83xfzmgy10r9mz0rjagbyzx5rrmn8123vw49ncksvw49q";
+      rev = "998ef67262dcbeadd596458d7ff40079b5bc5cbb";
+      sha256 = "0gja4ifdpl6wfq3n897h1h635kf92v5c44jzr0ixbv3i924xqjhj";
     };
     meta.homepage = "https://github.com/andys8/vim-elm-syntax/";
   };
@@ -4610,12 +4610,12 @@ let
 
   vim-fireplace = buildVimPluginFrom2Nix {
     pname = "vim-fireplace";
-    version = "2020-10-11";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fireplace";
-      rev = "a465d598b23b4fa04f0cd61895918cca498f1c9b";
-      sha256 = "0ydpx8x931wix35fv9hamms4bl4s1hvzawsalhfi4cg4qnp3dkj8";
+      rev = "433ff6468d8ee0be5cbcf5bbd940f9ce2acf0f79";
+      sha256 = "1mjiwzl631v4yxgfbvgc66rxbyn3w1shy7836ksd2xnbd0m6kx8h";
     };
     meta.homepage = "https://github.com/tpope/vim-fireplace/";
   };
@@ -4778,12 +4778,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2020-10-27";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "e480eb2b63e337b07e7e5fef288df0b77c06cac5";
-      sha256 = "16vidy7kws3n29x9cm4pvb8cvam183wnv2ybvr8iyn8y3p9w3l2j";
+      rev = "696a6ed389e5b54c8bf480f44ee4e8fc59e6f903";
+      sha256 = "1x38qi9kzhvhfyrzhfbzj8xvgmi02prqg6zcvpnwdmxcs5asgj39";
     };
     meta.homepage = "https://github.com/airblade/vim-gitgutter/";
   };
@@ -5415,12 +5415,12 @@ let
 
   vim-lsp = buildVimPluginFrom2Nix {
     pname = "vim-lsp";
-    version = "2020-10-24";
+    version = "2020-10-29";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "fdb69ab91317ce37c167b9820fcce2c35bce47ef";
-      sha256 = "13jxzdi3yp4qhlrx9fk0591db1gx3kzmwrmlq3bvicaziip2izsy";
+      rev = "eba0839b79b7f036f492b2b8c4a62269f72b3dab";
+      sha256 = "0fbz5yfjcjslpwkw81x1x2i6gd3p5rbssfqw13rbvj6ivf5qgglh";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
   };
@@ -5439,12 +5439,12 @@ let
 
   vim-manpager = buildVimPluginFrom2Nix {
     pname = "vim-manpager";
-    version = "2017-05-08";
+    version = "2020-10-28";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-manpager";
-      rev = "25bdd9448651a7669659b1b8d8d7a82acdfbf8af";
-      sha256 = "0d7rg4lvyxr4v34bimxpdkynmvs606fqvv0qpi7g139ng9hv6wqm";
+      rev = "c23c02dd79b0a5cabe140d1f10f9aa2591cf55ed";
+      sha256 = "0g61qbp4vl010isigp6j3jjb3vb2kxalcbb56xzfa6c9k5zap5j9";
     };
     meta.homepage = "https://github.com/lambdalisue/vim-manpager/";
   };
@@ -6435,12 +6435,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2020-10-27";
+    version = "2020-10-29";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "d48c1e2dae8f40391b2bd4b4daf97527c4d75130";
-      sha256 = "04dmcikkxlx2vm3lnhw94nw59wi4x1yf27k6j85a0lifwgra1a2m";
+      rev = "0161732b61a60a8dc8dd80db7ff678197fc2c2aa";
+      sha256 = "1hyinjg9x80i6zpmf1l6lwnv58amkd5bw26w27xakd74c4am2603";
     };
     meta.homepage = "https://github.com/honza/vim-snippets/";
   };
@@ -6916,12 +6916,12 @@ let
 
   vim-visual-multi = buildVimPluginFrom2Nix {
     pname = "vim-visual-multi";
-    version = "2020-09-30";
+    version = "2020-10-27";
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "61855432df721f01e5b64fec07bf7a9077ff32b5";
-      sha256 = "017pydd4yzkz3s8ncpy99mh35f1pdk1ql7v7grm31ccqwsn8h565";
+      rev = "812ca5cff230cc0a21cce6b9d71db3868a6d6f85";
+      sha256 = "1si42l80axlilbr65x8zw2ivyn9f8y9x1yg77xi4rjqpqj7af5ka";
     };
     meta.homepage = "https://github.com/mg979/vim-visual-multi/";
   };
@@ -7217,12 +7217,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-10-24";
+    version = "2020-10-29";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "eb7d89178319fd21601d2fe057e3f7cae2130b74";
-      sha256 = "14gj3n54q475cw9j6h12ir3lynn048829zjrb6nyhrzplikhpc9n";
+      rev = "982185bb454942a5c04d41b647ab58fceb4e7683";
+      sha256 = "16vy97k6lgl62pibhdfdigfv2gp16hvzlfywv1i6wx46hycb3swq";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
@@ -7385,12 +7385,12 @@ let
 
   yats-vim = buildVimPluginFrom2Nix {
     pname = "yats-vim";
-    version = "2020-10-27";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "0635a855ff1c56073d5e372001a3843e15c8aedb";
-      sha256 = "0883lz5sv4w38awwxgff8lx2n1fcy6lw6dd1f8zkambvd7n4v19l";
+      rev = "2c1dce274988814102aafc57c4e0675c2d130e6c";
+      sha256 = "10kzqzm587nz1qgscgwrvjs77vk6grck28g5z1lhrxhpn1jng943";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";
@@ -7398,12 +7398,12 @@ let
 
   YouCompleteMe = buildVimPluginFrom2Nix {
     pname = "YouCompleteMe";
-    version = "2020-10-25";
+    version = "2020-10-30";
     src = fetchFromGitHub {
       owner = "ycm-core";
       repo = "YouCompleteMe";
-      rev = "dd61ad7a101e0c0467f2c9942c7cbd3f31f6a06b";
-      sha256 = "0xjy6zpz02db5fcwwpdw3kp7kjgrvhlm3bk62syn0hxjghgd7pyb";
+      rev = "fa8c985dee864d33e48e3b3e803b541bdc433ffa";
+      sha256 = "1cc9wyp3dbh4fvic9zvh2bxqw0nrb3zwzlfj106cs2qbrpkiqszd";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";

From 441abe994939503fd3ef23c55060a83a86ad32aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 31 Oct 2020 18:11:03 +0100
Subject: [PATCH 0733/3942] release notes: Document deprecation warning for
 StartLimitInterval in [Service]

---
 nixos/doc/manual/release-notes/rl-2103.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 374ea1cbd165..85eedfe0ec72 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -132,6 +132,14 @@
      to <package>nextcloud20</package>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     NixOS now emits a deprecation warning if systemd's <literal>StartLimitInterval</literal> setting is used in a <literal>serviceConfig</literal> section instead of in a <literal>unitConfig</literal>; that setting is deprecated and now undocumented for the service section by systemd upstream, but still effective and somewhat buggy there, which can be confusing. See <link xlink:href="https://github.com/NixOS/nixpkgs/issues/45785">#45785</link> for details.
+    </para>
+    <para>
+     All services should use <xref linkend="opt-systemd.services._name_.startLimitIntervalSec" /> or <literal>StartLimitIntervalSec</literal> in <xref linkend="opt-systemd.services._name_.unitConfig" /> instead.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>

From 2aaf9630191349b9d634323d9e4a46adf0609b9f Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 29 Oct 2020 15:54:52 +0100
Subject: [PATCH 0734/3942] cshatag: init at 2019-12-03

---
 pkgs/os-specific/linux/cshatag/default.nix | 32 ++++++++++++++++++++++
 pkgs/os-specific/linux/cshatag/deps.nix    | 21 ++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 3 files changed, 55 insertions(+)
 create mode 100644 pkgs/os-specific/linux/cshatag/default.nix
 create mode 100644 pkgs/os-specific/linux/cshatag/deps.nix

diff --git a/pkgs/os-specific/linux/cshatag/default.nix b/pkgs/os-specific/linux/cshatag/default.nix
new file mode 100644
index 000000000000..bc1b7f7ecf54
--- /dev/null
+++ b/pkgs/os-specific/linux/cshatag/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "cshatag";
+  version = "2019-12-03";
+
+  goPackagePath = "github.com/rfjakob/cshatag";
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "rfjakob";
+    repo = pname;
+    rev = "b169f0a9dd35a7381774eb176d4badf64d403560";
+    sha256 = "16kam3w75avh8khkk6jfdnxwggz2pw6ccv6v7d064j0fbb9y8x0v";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" "GITVERSION=${version}" ];
+
+  postInstall = ''
+    # Install man page
+    cd go/src/${goPackagePath}
+    make install $makeFlags
+  '';
+
+  meta = with lib; {
+    description = "A tool to detect silent data corruption";
+    homepage = "https://github.com/rfjakob/cshatag";
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/os-specific/linux/cshatag/deps.nix b/pkgs/os-specific/linux/cshatag/deps.nix
new file mode 100644
index 000000000000..6daad9856782
--- /dev/null
+++ b/pkgs/os-specific/linux/cshatag/deps.nix
@@ -0,0 +1,21 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+  {
+    goPackagePath = "github.com/pkg/xattr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/xattr";
+      rev = "d304131d5e58ca76d8b31ceefbb0c85c7b2d2a36";
+      sha256 = "0bxskiai283zfra13z5f7q7f77zz2cgswaj6l6jr2nwnc3l5m80i";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "201ba4db2418b54b698efb4d8082dcb504617cdb";
+      sha256 = "1cqaiwp19kl38g4d6brfhi32822rhnh2q8x1j0i6yg7a8dzfvbz6";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2711b47b0895..ce76eb1585ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17507,6 +17507,8 @@ in
 
   crda = callPackage ../os-specific/linux/crda { };
 
+  cshatag = callPackage ../os-specific/linux/cshatag { };
+
   # Darwin package set
   #
   # Even though this is a set of packages not single package, use `callPackage`

From 04640b31e5a3f20ef575683790839db4304a2340 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 18:04:36 +0000
Subject: [PATCH 0735/3942] datovka: 4.15.2 -> 4.15.5

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

diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix
index f004a807aa79..2e598b1a7639 100644
--- a/pkgs/applications/networking/datovka/default.nix
+++ b/pkgs/applications/networking/datovka/default.nix
@@ -11,11 +11,11 @@
 
 mkDerivation rec {
   pname = "datovka";
-  version = "4.15.2";
+  version = "4.15.5";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0vna3vaivi6w7nlkwpqhwmyly0s1d5y2yg51br2f918pjhp2cp7q";
+    sha256 = "1mnw1m3wjkw8rfh6fwwrhfmkna6j19pza9cs7kyp8qj1fzzqi8my";
   };
 
   buildInputs = [ libisds qmake qtbase qtsvg libxml2 ];

From f4490bb28afb4ae21a5adc73df2f58e438a4eb1f Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 31 Oct 2020 19:34:23 +0100
Subject: [PATCH 0736/3942] firefox: 82.0 -> 82.0.2

---
 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 79391887608c..e7dd034a8ac4 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,10 +7,10 @@ in
 rec {
   firefox = common rec {
     pname = "firefox";
-    ffversion = "82.0";
+    ffversion = "82.0.2";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "3lbvlb6yggd5v0pkr0x6j350jc5dpclqz7bv4i06r97a5ijdgfc7c6y605966hvw24v17byxr120xc7a39ikl1wnls7a9gyzyqcwyw8";
+      sha512 = "25wkgsqnafmq30m1kd1axkm454dhl2bmz6100i3ccqnn31vw3nyy6k3k1apsn62siqswpm55iclzcb10y4dfyyqcszvflim47c8i37k";
     };
 
     patches = [

From fdbdd72f5f9ec9c2e4d4775dfd2960a41ec2a4aa Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 31 Oct 2020 19:53:34 +0100
Subject: [PATCH 0737/3942] firefox-bin: 82.0 -> 82.0.2

---
 .../browsers/firefox-bin/release_sources.nix  | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 0ae220a75f2b..a69f288be587 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "82.0";
+  version = "82.0.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ach/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ach/firefox-82.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "beebf265e84b2bd961dcedaf82ed0cb6b89ef9ea37a0ec7ce1e6abfb78c44b23";
+      sha256 = "7850a7cdf7f842d8ebac2d7d24f0823b1743b7fe139987554bc3f54af47c31f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/af/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/af/firefox-82.0.2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "c58bc5dab361ccc70a94268e1dcb444524145ab9f53a6aa3b186dd806ac111bf";
+      sha256 = "c43b0e976a553840da783139ecf2c8a59823da6a31a1d3b5588c496c270260e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/an/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/an/firefox-82.0.2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "75092675363111128ab808211747276c2cadae6a4ea5c8b28807acebb73cf733";
+      sha256 = "4f9103c6043e2fa7ceb0021e09e8616a4e4484d19641e6fc67cde0b60136d8aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ar/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ar/firefox-82.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "52adca504f18d6adfb02f346622a5b2b7e417cd6f243c566b79a01014efca53f";
+      sha256 = "7f8bddc573ca33cd48b6e29709c80d8dd617a46f1435303fa0931ecc413b69e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ast/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ast/firefox-82.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "fa4133422e8d1969c111e7d066f51710f3b53b7e5e3a88de5dd84b8e6faaea89";
+      sha256 = "d0bac8231fd4e9e777754378ff5b2e697379666b682c512d4d4d17a3bd82ad10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/az/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/az/firefox-82.0.2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "0adc103451ac0d6671f62f3e1940d8d1fb5a6ed2544d015de9a02d75ffaca02c";
+      sha256 = "3d0a5facfdce39e798ef72d22e737860327a669f1752deee7192877a2635ce97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/be/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/be/firefox-82.0.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "df27f72cc733bac439ed3dba89443286dfb2ca3af4efa33db161964c84293223";
+      sha256 = "70606a5e490c3a0dcd1bf9b291c5d16525e044eca667166abbf1d75b58f3922b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/bg/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/bg/firefox-82.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "34190a84296246c3aa159067a9d575be628963c5c2e193512b8754524fa94503";
+      sha256 = "501ba77092a68b32ba6048360f8695f52756593241f4a8d210a072260792cde2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/bn/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/bn/firefox-82.0.2.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "5eadf29b34dad12f373e675d349f093562b7e38a817f7faa76fcad273ababe2d";
+      sha256 = "f465d794e887b6867bae0e9f768e468876ae7f31a78e91725ccc8f7d965ebfd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/br/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/br/firefox-82.0.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "53c6f9a4c5185ebf62c087dbe78163dcd46fe8bd3bf764a133a37116dbdf96a0";
+      sha256 = "977beb4edf63e823087ce9e62ebb1c1d122991de4a350cfcfc93427b3f381608";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/bs/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/bs/firefox-82.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "260419497fa79e176558f0a5ee43e1bf717ec4782742969bbaaea39cba04c908";
+      sha256 = "3951d25f3f1eeadde330e0a68fd581595fa56fc5e98bb4baa3fa707879377674";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ca-valencia/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ca-valencia/firefox-82.0.2.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "b2de05d651de2096559b9c40c75212baeff759632aabe70fa9c82283b5ae02d2";
+      sha256 = "466fe1080eac737ed87cd83580f585fe5e685090b0d5b6a4c2c5a01ca33175bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ca/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ca/firefox-82.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "bb3ce2ca6c6d536bdabab8ad549623aaf287a6b7dc708a7888961d8aa72271a1";
+      sha256 = "6e13af5bdbbe50b8101e60a15d22f9f561d1846e67689a23a933f6fffa73b9ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/cak/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/cak/firefox-82.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "8c918ef50f2e1db8e5e51420e6dcf6fad0a4f3f4e7054b9f3292a98ee804cfe9";
+      sha256 = "a96ca82a2723e90595b76279b3b2a902cf4f121afa448784bf684cf26c514c8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/cs/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/cs/firefox-82.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "b8a4557ce44275e471e028c7fdac7259914cea670116991dfffb3a85fd111149";
+      sha256 = "bfeac431918060b210d35ac74e7333b0c0f851435275c81f2ae76af34e3a05e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/cy/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/cy/firefox-82.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "45f3438b6218655c26ef846923af9860b5957f0cd1f3f0407a2aa80c20b54519";
+      sha256 = "7f81dd91072ff34551394ef969c62baae625c648f5d880f5754862855f71dc74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/da/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/da/firefox-82.0.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "d015f6abed9728bdf06b922ba9edae3272950dc795cef120179ed21ed633b136";
+      sha256 = "b21dcd0ecd9f0010852a143a38d5d0a77dc9240a49d959b00f101491d3a01e10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/de/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/de/firefox-82.0.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "29748fa89f1b0995f23cddec986379c9ddd89fc158d56591288eedd3345e52ef";
+      sha256 = "56429f714fc1bb06efded1c601741ba3cc98788ed54ae345518328f9dcdf7f5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/dsb/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/dsb/firefox-82.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "cae1494636a96530e01c58d8a8914c2f2866eee16f96356dc89dd4cf98b67fe6";
+      sha256 = "bafc42263929851718a7cf38163aa3c020b0631b0a0e5ce8fe238849f7cd76e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/el/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/el/firefox-82.0.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "28b09aed5ae0f9d7454d4e43955675535b7bcaf6a79d157aec1f3dc3fd6b922f";
+      sha256 = "e1e8bb8cf866ea69465250a3f760a3cf9e9b06fe15ad03737c6739da5a5df2be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/en-CA/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/en-CA/firefox-82.0.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "d9fd41938262b2b43f91898b6509e11095ff851e249f066de4728d1c53edc1e2";
+      sha256 = "f3a252002ceae09c56334010167861abb84840466c939fc87f0ce39aa1537566";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/en-GB/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/en-GB/firefox-82.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "45385629837dca1afd1d9e6cf24aa3a656c180350e86740a47896cea612af934";
+      sha256 = "2f384fdadb06254d12aa1c39b7cff6c26be4b7617d0b845a0efef2c92515cbf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/en-US/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/en-US/firefox-82.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "4305f43e72aa46ae42882eaa4e436b22c5142a4c9b2dc9f9ccc3292e18a5e39a";
+      sha256 = "d95758297ac2db1a050e6431b637855c4a58222db7d9014c3a8322448083a4d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/eo/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/eo/firefox-82.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "a7a9c9b927b590e6140967dc8988e63534bcecd68cbed7262af77826d4dcb65f";
+      sha256 = "0591aa9225572cdce7036eff924dd3337b85625bdeb6d59aacdc7a06c5af1f71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/es-AR/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-AR/firefox-82.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "e675a8d221812e8642f4d67449df2fed72412197c997acda804fa11aa3032ab6";
+      sha256 = "455b211bf85363089721803255829e4e7891cb43b2b6f35f85bf8a7242c360b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/es-CL/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-CL/firefox-82.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "63968f8e55e9bc24ef220546aaff53a6a2ee93f395e4af4543515fddfbb8d175";
+      sha256 = "b5d22bbd082eb5b6df2ab8002b465f64afdfb2c06b352a90c72e491aeab81336";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/es-ES/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-ES/firefox-82.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "fbc9948bf2e18ec24e1989592b755050177fc2e505610dfff23d775cbc8c394b";
+      sha256 = "678c9ecf360ad9231f31a8f761a48e793b6438b598d200619e5fd54a3296e1d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/es-MX/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-MX/firefox-82.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "e30cd73dafda4e54a27f6201738ed355fee2c4b7672765362d2d37dfd3aaf316";
+      sha256 = "daf28e88dacd3202c759caec279244aa9bf418420df9ea11896658e53c966061";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/et/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/et/firefox-82.0.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "39b2575e2e8b6799b3d646c357aa119cefbcaaa0f8645437a1e5b9ced78d154b";
+      sha256 = "c42572576da4d6fd4cfbe5cc518b2c7dc68353141f952eaeadbd9b8679b98d95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/eu/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/eu/firefox-82.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "b68837bea81a4018eb298ed2ea567f5367165a83e3233064c49b4d77bae30500";
+      sha256 = "5945c782ae8d23473ec1d4682d7fc5a0c524e494393e96c98e3202061fa6551a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/fa/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fa/firefox-82.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "28edeeef1bee9b87e7aad6fa76b10bb83eafd90933487389aa7e1c3ca268bb0c";
+      sha256 = "8b5f607d7726333fa9f012d5d9e74170350e205717f7ad0bd7aceec60620ab16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ff/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ff/firefox-82.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "21651607d2b7555996292e31a9fb0245c44e557333eb16c4b8c63f895872e9a8";
+      sha256 = "996f0efe4c3eab9152a254077a53e994888fb20345302ed1718f8edba67a9bf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/fi/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fi/firefox-82.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "2138da6e55db8fc9e90736b81fd0aec3f81a8b3882eb7aa78d816afd303f423e";
+      sha256 = "2830c7775e54f3adbda827b5fae13fdde7fb4b3c8b37644273a88da33db78f2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/fr/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fr/firefox-82.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "ea18177416ca979820721b44cfc735ce7a47a6cdd0480d2f72c5b72dac559967";
+      sha256 = "bec556a28a30c478e36c3ea1463950039458d1a7442bd7a9807f31cc4ca003fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/fy-NL/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fy-NL/firefox-82.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "152f3f1cebd0d6b94348bdbab74676faa605155c2020c32aca26c8ef2004dea2";
+      sha256 = "b549eb7900d15f8606face90c521aac596230b25705f7dc459c039e8ef559698";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ga-IE/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ga-IE/firefox-82.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "9e125c8c28854bd8ba25088b5b3b9b5aca3370dbb385200efe09c2d747cb78c5";
+      sha256 = "5a69d9bd67dbae5e8659bf3980d373c485bc67d5719c3b37948d2054f92ecdfe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/gd/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gd/firefox-82.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "3568f741bc94e1c600158fc37d699d2b3f72ea5b8dc78c804e734dbd0c8ebd06";
+      sha256 = "6d76b0659f3d0b0793cbc963dfbd6d20c7c91aa46aec1ab9cf9192d003eda3dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/gl/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gl/firefox-82.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "f3b1437772a66728f999ed0827e6cd14f13b08773bab21aa530e04212867c6bc";
+      sha256 = "4cdfa36bd0d880135ff959a04eed53b958684253f99469c45aea39cb4a25d1ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/gn/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gn/firefox-82.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "08b6c72f58d47e2442b6bd72c20025d2c23e9a4899a359ab48382e0088b68ac2";
+      sha256 = "3cd0ffe9756155181cf68d2fdbc858a93be41104cfbac408adc98b72bcbb215d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/gu-IN/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gu-IN/firefox-82.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "cf8d0967d9b16bdb8b0ed4ab0f572187003e861fe544b4d258a8b757c68733c8";
+      sha256 = "083ee03240b7b1f4238a464844bfad31334a21a8dd025f1d12a252c2cca1049a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/he/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/he/firefox-82.0.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "42698b6833f395124fdd85307985827574a779ca00b71b4d9713e6f1348e93f3";
+      sha256 = "36f8951cb387fb733d689ff2a77b563e8315f76b434c283867aaedc264b227c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hi-IN/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hi-IN/firefox-82.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "141c53b0ac4c9d14c3a8579be7dff6a194fa3926a388387fdf0fa82ae94ddf78";
+      sha256 = "6d041154437f97a0dc4b3ec3125f2cbebc10dd2089ed0f98df1c1a6a85b7a536";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hr/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hr/firefox-82.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "1159742531dc262a764a3bcaba7c15d4384846adc2df25b367dd3709dff3e2bc";
+      sha256 = "4c5b7921cba2d915240d6d9b0bf515f9299827e75a84eb089626561cc9042db3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hsb/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hsb/firefox-82.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "c412cb345c588af3f7d462bef0f28e9d47550eb341f667b21ddcd9de3970dbec";
+      sha256 = "4123ec9fda1e94d4433107999905d7cca0dc2b6cfa5c5c78d3a1d29983a5960b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hu/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hu/firefox-82.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "1fa586fa875235e397479ec1a4f25e25a3b5abbec5ba524ce90caabd9c1d8b4b";
+      sha256 = "4c0afb928ad0b87a3efb26f09da8c5ef1ac415e14ac47b30463663ddb1955376";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hy-AM/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hy-AM/firefox-82.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "f50e5258073bfe6f72918853e15c083c64f427aa858ca04a35d4b230ca496da0";
+      sha256 = "a2676e1450d88ab97b41cb4ee012da2a6240b739eca68e53d9607bbe0f7a313b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ia/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ia/firefox-82.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "523a8c9d5b76efbf7b9525cb83a1ddb3f3b096ce442815a0fec632550a0d848f";
+      sha256 = "8494561d37a9d41d0c8683e793419d51ba3780b8229fe98a819ce675f8dc6aa3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/id/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/id/firefox-82.0.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "394966ef0c7d5d203f37cc41fd2bdbd3569921c17b6b0baeef2c93386f50409a";
+      sha256 = "3bbc1f1acba6fe029ef1a526e3e16f6000cac1ff226be21850e9e52348b5fe49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/is/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/is/firefox-82.0.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "8dccf799cdc1af733382d9a9f96f3dd4d774a8e481a0a465af788b646c964d81";
+      sha256 = "16fa5428d2a467bbe458c82544a3859386cfd8051de266d7af5656430a408535";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/it/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/it/firefox-82.0.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "bd9cfba5a4006b8ab1b1c7fb75ea54d92c3e8f88fb33ea203655486c31d40078";
+      sha256 = "5b891f5a9bd4362c6b00cbcd846d724926f2862887c3db2d6fa55f968c7e0d3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ja/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ja/firefox-82.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "c2f4b1361bef84be0b4409147617f701cfe19741ce7d1b70ffff292ab4b4394b";
+      sha256 = "a3469c0b8fa55dd271768ddd491ddf1730d732d9abd697dbf779fa820f4b6d4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ka/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ka/firefox-82.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "956eea50eb32e150c95a1fad99ee4f9fa05d80919612ac7c276af7d830612594";
+      sha256 = "8115d086a7330139f03a25209384651209b0e998a3b754ba1f79f26beddd28ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/kab/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/kab/firefox-82.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "7d4b30c299083d0fc3b3c0f2efd9bee1d3bd05ca29b3b291de05816304b54e20";
+      sha256 = "c2a7cf201875831fad0eec3b558a4be41c847279f7a66fb8e1006084a385c5d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/kk/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/kk/firefox-82.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "8c781741557932663a68f0d3d52e1e5f1fd2a25617645ff8aca986c1ba638bb2";
+      sha256 = "33aecd099402158a1fd6dc47ccdddc1476f21e31a1f25c6cd8518226de7f5d23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/km/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/km/firefox-82.0.2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "60e71694edf19046a2c0ac474daa40157d3ff9a974c9924b5278ba889e680c18";
+      sha256 = "060686475df4e47104229d02d42760e5762fc1a9d8d785a8116670a24b7cb897";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/kn/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/kn/firefox-82.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "2beabb264e3247a35e16a08d428799a62f9d50297e3824f31eb8f5341f85319a";
+      sha256 = "3b86716fd6da73f439593a3915d24710176d9be1aa3d19313c2554962e55dc51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ko/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ko/firefox-82.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "d3bc2f79ee0e2a15a56d9c2a29d78daa1ba28abbd2fd7a2eb7f4a8810bdc61bb";
+      sha256 = "5fd1b0b428c57886552aabdaea3f691227f40cc19d18f851a2c880b1a1c8141f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/lij/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/lij/firefox-82.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "4d723edcb08c066d4ff5eae520ad27aea85e6287bc37e656a7ccdf3f09d0722b";
+      sha256 = "227f8dfd5b861f9e8edf1037c8f374dcae3aceefc61effab0e51907603fc21d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/lt/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/lt/firefox-82.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "56282e57b79c0ed78fe839b4c5d444d6c8ccec001b3f16bd566ec8c2f9f0520c";
+      sha256 = "9ef7177b9fa3965a394dde8a39503fd8975829faca86e281d046f8fed50bdf27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/lv/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/lv/firefox-82.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "6748371e3a52387dfde06d1a623528a117a686b7252199a63dc166348a0f219b";
+      sha256 = "ac98c34657aca401de5943724a7f8607d1370b78f80c211547010911a11be498";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/mk/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/mk/firefox-82.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "eaa8fde559b53b533d0b7275b5b79fba9cb42d31118a281f1b7fe17cc0f0e3c7";
+      sha256 = "457fd0ccb4d43e99f39c89db76dc5d4cd79c560a578d1ff3229cd1d49493356d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/mr/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/mr/firefox-82.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "674ba4962bd455793b99f07a9f40709220d40a55e6ebd516bc15b54bf04655b7";
+      sha256 = "3bad6fb96f29a3fac72eef3f53b48e9ff10a273da069eda050fa24bdf3ee8ec1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ms/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ms/firefox-82.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "91291fcff394f30b4f60968f183c3125961fb593eef5a9e839024d83d001cdab";
+      sha256 = "20573511691d2615c9095988cea73d7fbb522a0b4ae958da1749ae8ee1ff31d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/my/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/my/firefox-82.0.2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "1634f5d90130dfa27301588856c4f49bce0bb33c047d653bd46e255ce07e2414";
+      sha256 = "4f4a7abd9a1409ab49ad956cc1cad0adb9254b3203d9d19b7fc967284d051554";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/nb-NO/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/nb-NO/firefox-82.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "e35752e9fe37cd3a8518b042f2e287f29aa91213be680b111948e9115e5da523";
+      sha256 = "c0480f74895deecbad2f58b1b4876fdfc2c920269f4c91143c9cac41d67162f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ne-NP/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ne-NP/firefox-82.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "17c5d7c04727b775ea544b4e6203e181b4f26d7fd833900fd3dbae853a8dede9";
+      sha256 = "11fff99c2bf87ce9b5c315ffab4a305bed0d5170ffc4f65d00d5b5b380687214";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/nl/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/nl/firefox-82.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "d9ff2809b7d4b1fb30f0c61b5ab7c776bd4096940908afcc25472f4b4f78407c";
+      sha256 = "a19b8a18022f9317303e7aba19415f45133b19849fae440ec41ec5e9016a532c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/nn-NO/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/nn-NO/firefox-82.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "0da44925c235fb19bd823464046150a57ce710be8f8f2593612e97bd0bd3d591";
+      sha256 = "cc68e10b523681110a597c7583ede6ae08d20529bc001fa5059c9056287f3587";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/oc/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/oc/firefox-82.0.2.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "62a0679bfbdf27055924753661b20b2a022ba60e50bcbcca89ea7ec28394d3c0";
+      sha256 = "a54056be66f78421a7f70cd5860ad5e804abd35017b02ca600c459c86c82ef50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/pa-IN/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pa-IN/firefox-82.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "f3f51aaeec650043cf70d2dccddd18ef8d184b61061a42b2d5ca4b06e891c8e1";
+      sha256 = "6a64174c90146c52b462a2e8b921880927774b6d9b6478df26ea194735c6eb6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/pl/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pl/firefox-82.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "a1a6ec0eebab8905dc53e58d781369ebce792f1a34e8702c7d9bea082238a1ff";
+      sha256 = "558f08956b019d8046ac6c0e3a9922f79176d9997129e795901f40ce04651e55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/pt-BR/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pt-BR/firefox-82.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "76a3ee37676ad9260dfe8d434fde3eafe4d9615568056164058344bfec11bcaa";
+      sha256 = "bcc8c4d9a55c8669cd378b2f89cfa61da82e54be360fb754be78289c2ab8434f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/pt-PT/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pt-PT/firefox-82.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "6d0a39416ea8fa33b53f6aa886bff4cf35f0eeacd622c0572abf1b62ab067fb1";
+      sha256 = "29ef81f9675b589122d311dd0f3075d48c99fb34aee9f9906d490585bd407468";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/rm/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/rm/firefox-82.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "cf66f96c69b89879ec2ee51050640f5e18aabc3c1ef14f6ee8479f4f12ff2d96";
+      sha256 = "390bd332f1fae6f5a48cc7b8bdd285b282689446977d859e37d8a097920dec9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ro/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ro/firefox-82.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "d4a70b102a860cc7f1556eb63d03ad64bebc5e0f22be5fb1ac3d833527b38964";
+      sha256 = "1398529679e4220844a0b1880c0ff174fe2faa8b1c30c6041c1cd790d16a83fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ru/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ru/firefox-82.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "e57613ab5c57551721cad739b025a9c998fe79f3a354ec626dc9bc5f88943550";
+      sha256 = "a9ba4ded0a67ae842896aa75de3dda2b427d0748244649aa9c2db17dd35a9d02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/si/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/si/firefox-82.0.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "9565b8bfdf98c0e8b04c7fc6af23af2b04fee815ce6faab3188756e7b30985b5";
+      sha256 = "a95b03c4085c096207a895d3ad193be7823da4e894793c0378391da5faaf01e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sk/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sk/firefox-82.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "05e190e6ced4d275a93da20e9922a631628db467e4a5dcf7c94cb7d728ffcbef";
+      sha256 = "ce09728fc05f18a549c9083d383c58d4a62371d69a01d30f5aba782a60ec70b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sl/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sl/firefox-82.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "6fa4092cfa0d20f01a0e746a2adec4a31091579de08c5adaba186743cadaf04e";
+      sha256 = "c344aa40296d249f2c6c85718fd6a9b30be0407b7df7eb73f1810cc873f03477";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/son/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/son/firefox-82.0.2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "4ad179b62c19de8171299301a312c4b4aec4805c4d255308d8a2ec840cc3058b";
+      sha256 = "3356b16e9174c90cc8e1deee262b8381fbfc34e9cd03e6f7bd48072861de5be5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sq/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sq/firefox-82.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "0dab51efdbb69e6cbb1aeca8fae9d82709238b54bc40141335ff790f7ca91ff6";
+      sha256 = "a90e1dada0ef38114f1a8ba7236d8bc97285dc46f81334c86ee7a9a03c8d2b0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sr/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sr/firefox-82.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "59523733a24aa0bab201560711a8a47cc684e8027eb5c06f814b0d59c6a985ad";
+      sha256 = "d44891e53c9a41770dffb2fa744e3cea0a655194e218b70881e1f070aef07d69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sv-SE/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sv-SE/firefox-82.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "53cbef7e2eba73d2ad27ec6ed717f1c69c71281d4e33a1d7e721ec30c372663b";
+      sha256 = "e53a4ca8a04d7858c30260999b6acc09b8146ae8a8f4e558d62cca1ce18e7689";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ta/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ta/firefox-82.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "7d866f79b6e80c76c2ddfdca477962f1b37dc3eeacd5270a90e4a0a0ee461cf2";
+      sha256 = "a89ab7047cbbabde8a03e301f8067b130d37eb0ad7ddaf750051175dd721b6d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/te/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/te/firefox-82.0.2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "846fadf4e10bc6f89db7b9a3ad06c17a85695779cd5f1c06414d6f4baef52921";
+      sha256 = "6f80b934ff3bf696b4753f2cbf146d9151f40def404d6d749cf8de022be194ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/th/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/th/firefox-82.0.2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "e2087d50eb61ba597a67af0cc3460ed3ac7e8af218b374e4c5294463aac8ce44";
+      sha256 = "c37a9708768ddf723a2423ba0999e88b09a51028d7736234ffcaf8a32f56df8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/tl/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/tl/firefox-82.0.2.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "60a05602462133f36d29942dc5123aa0c71b1aaf2ab142efff6f7abc9cadcad6";
+      sha256 = "5ab670b24e2ee1c4b4c7fe518e9d3967c85f0e27ea2c7a4ba82bbdaabc6c4fd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/tr/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/tr/firefox-82.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "5cfc8cc8945f4a177af80df37653a61f310f413cd4ab3e5df55ed4457d7318b8";
+      sha256 = "7e51ae3fca81e691675196b298a9b03de9e798f4fc032da8e5da295820a7d2c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/trs/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/trs/firefox-82.0.2.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "2cf90e62d2e1272aaa8d7acfb7ac51b35e9a3aef23f12aea2213146db324ac66";
+      sha256 = "60263ac369cdc9aa9a8ab0dcb60219f3e14563fed709b99d8352c1b0469e9433";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/uk/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/uk/firefox-82.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "bf0503793d0887754b2c4b87b92c4dcf111d8f5fcc27a288af3686fce2201366";
+      sha256 = "38f8e0ed748427991ee9c45694460d3eee28a5f94ee1ff59eafcf9eb93fab9c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ur/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ur/firefox-82.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "015e0e28477896710481a925c4bec0ceefd0c9f39179a13441b673031854ab1e";
+      sha256 = "65e19c2395ff45bff79beb1aa4d9c18faaceb5a7000c6de672f6c1d6964571e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/uz/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/uz/firefox-82.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "0c372b3f8d98f41f2a69a62ffefa6181bb9d7d1a74c7a60a2603ee3a8883d635";
+      sha256 = "d3967c3bbbd0ddd880a7cab3a359b946a7b99515c9b82bba044a33138822d864";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/vi/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/vi/firefox-82.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "96b1a4aa05e054a7ec78bf314d151385b2a7a6f6ea3225993242ba798772e100";
+      sha256 = "a142d7ddc06c688666811ace6a9c32f28e74006f29eff4aa4aaae105f64a34ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/xh/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/xh/firefox-82.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "68d69dc60b730b5ffe7a54943bc9404d0915b3730f840711a3c078bc8b71396a";
+      sha256 = "a696daecebfb59e8a798dcc6eb241ce10562438a013f243dd60ac8671091f585";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/zh-CN/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/zh-CN/firefox-82.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "b21aedfb3eb7cb8fac85fa9d9f8741ff182ada6635bbb669ec95c0cefc0edb5a";
+      sha256 = "d1167e254dc6c16d5d4e38cd8b98bbc065e369d7bd7414e6871b028c601118a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/zh-TW/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/zh-TW/firefox-82.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "81963acd1e8a92ab416fe4dae6f1c14f554d6d6a83fcd1d5021e5796bf5d7a98";
+      sha256 = "453ebd33173b2ae4a5120d73e3e0fdde57b480e3f66ef2fffaba27390ae945ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ach/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ach/firefox-82.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "12b85628724e5c5acc545ba462b7f916d775dedde3eeb4141799f0f3d65ba6c2";
+      sha256 = "c7840623cb65c9c28285d41694a85990e0bda181697e229ad4b71478dec8bf2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/af/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/af/firefox-82.0.2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "66f1e12cbabfcaa3c51e68d06b213dcdf29292e981b18ace9ce6df9bfe3f9dd8";
+      sha256 = "24915613ccc58840ccb1564ebacc906b96c7f171822f722265e02b8ee41b0dca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/an/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/an/firefox-82.0.2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "6b61f6db8cd323371f8a4949ff455c79374a2efa0c327611128aaa397a02a025";
+      sha256 = "d7acf25c0fce89775827a1e8198fccd117b94dafe5fd9820f557cee88379da8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ar/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ar/firefox-82.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "180633af5e8cfd13d832c9268d4b0eb44b2292b549d3d1093364db9967fc3e82";
+      sha256 = "d24c74365c1b9384e8954f9b6ce4f2742bea269de7a20f448971a957f096ecf2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ast/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ast/firefox-82.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "aa95f2894bbaf61fd74bcfb00218f73e77b83250c25b472e9938ce0e94403583";
+      sha256 = "0b858a243143f6afa68bb14f836fbf4a7245cb2856432004222422ceeb4c4d57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/az/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/az/firefox-82.0.2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "3c42220f655d6d8785b0763d5d829744d0e579acff44cd146ec85378ef2800a9";
+      sha256 = "80ef7662e88c0fc1711bf385443917b325dfa46252b837f043f41fab0139967b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/be/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/be/firefox-82.0.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "02fd047e0808ccdcaf484ab6fcc6d306ce97c6a401be4a0071eb310f31ccd45c";
+      sha256 = "93c087192c67e074ab3b00fdf55d485f39c7b86cba4fd801e61d2f61e511a191";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/bg/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/bg/firefox-82.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "556fbaef8fac39cebf0152e0c5945c6179aa013a724c4903b5553c12518913ca";
+      sha256 = "19afb87d93e3a01305c24b725b8ed764f8ae2e31e72a8ce4132f1d6451589321";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/bn/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/bn/firefox-82.0.2.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "3a30215151a6e937a1555f28333b2763e5bcb825e4159267c4897f666206737f";
+      sha256 = "e607dd2195d4a19d366de1f084bcdc91d4832287752c4a449d445eb7aaaff463";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/br/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/br/firefox-82.0.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "9db07dc18e3925f20d1cdd668eb26dc279f7ee38bd71e0085e47ca9400938974";
+      sha256 = "dbd5fa26f0b9b20933820005022af238a5f72c8688dc10a4aafa0318af67b342";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/bs/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/bs/firefox-82.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "7ad72fb89ac7ae6f453e5476759319b3e46a814a5ea3b74fa95350a20aeec2a1";
+      sha256 = "7d3d4e3bc630e69b655f4668365359996266d15864b776fbe2e6a8773e212410";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ca-valencia/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ca-valencia/firefox-82.0.2.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "73f45df139c85e6b583fe0f5c5e429631154d02c7de5832e85366fceccec2854";
+      sha256 = "a14d58cd78c72c29307887a91b534a7553ad2b4e81da5615bfb8a918d4abce60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ca/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ca/firefox-82.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "53f64671ca7527147f91fe2ec72053420866ec15f7d8f6175d88cde75f574514";
+      sha256 = "2aac2aa56702b1269b5b5755da2663621da1603e6ad956afe07d86ff54d3e64e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/cak/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/cak/firefox-82.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "93471086769bbdedf2a6a7a63ed2fecaa785c9c1f337bb1e726462976604dfff";
+      sha256 = "333cf7d04c22f644f0286102b498727dc448339de26fa1a1cfd353ad1b05a1ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/cs/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/cs/firefox-82.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "e9e1d7f0a0a5766d0ef1ec8f9eb747fcd28333425d139fa1f78891142f1aa91c";
+      sha256 = "3d3756f69b0acfc95abd5ab21b9b77cd2272afdcb7056fa4b961c1528e467447";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/cy/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/cy/firefox-82.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "60caa6cb482ff870572551605e1b644d79901f1852b0bcd7ba64f926eb923bfe";
+      sha256 = "97d16b2b8def95897751397a8f5293931e1620d2b17b6a6f036d47abc79ae822";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/da/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/da/firefox-82.0.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "726f620abbf287fb03d68127a7985e52a8e4ee176994bc7b0e8d10e7f3dd42a1";
+      sha256 = "f97a2ded9c529e992df15b797afe0622a1d02cdf3e01fa46794b4ddddcfed0ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/de/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/de/firefox-82.0.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "ebc0cffa8a0300165a39ee1fdfaf4c404d2204683117c6b5d7ae708a4a495053";
+      sha256 = "4d9aba854f86075d29772957d7f31804ecdc1bc465315afbf0bd807a40f39bc5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/dsb/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/dsb/firefox-82.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "e296964d066ab5799b0974c1841f36352040d9f6ad769e730f801a0b77eaaed8";
+      sha256 = "bdf18303c3e67f6bda97c709460214bcad60dc11c35fb996bb628f79bb7d0a9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/el/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/el/firefox-82.0.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "f1282eff07c147d33b114a76335cb4c6bfddc66518d2749d65d5613899a3cda3";
+      sha256 = "29e9a29e97fea8cb4eb03c8ad67c8fb37e534199073202f381c6a9c50a9d6572";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/en-CA/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/en-CA/firefox-82.0.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "51ab497caf7a529e8b430280b8015ab3b8a5df3486ef81f3ffe721d1f0c2d752";
+      sha256 = "7fd41cc61c01491048cd37db223007a568a8470eea693e76e3f3394901b1af5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/en-GB/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/en-GB/firefox-82.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "1a4f64d190155f3b090828261ec2ce0f61e4b3b2662a3f445291ee201c0fdfe0";
+      sha256 = "818d44931c9ed4b4c258de26b33040409ebfe9a4856eb1f80715d15687ea9fdb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/en-US/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/en-US/firefox-82.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "2039a8e94fcda9bcad97d62059579d64744da522c7d65beac0edcbd2e128a06f";
+      sha256 = "54a64c8fbb263df7e05b8532f0d6f50bd34f6b3cf3080ffc99c123b6b7009210";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/eo/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/eo/firefox-82.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "1abf7e1a14264220bf83b998c71ae8d1cb7e5187c09a9ae2be1424761760955b";
+      sha256 = "87e497515f1a90d315e58f592d9360baef382bb986cc17a1a20e9ea9013550fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/es-AR/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-AR/firefox-82.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "83bc86693bbb7dfaeae244c1120f5426b85b13f56756f299e3e3c902a0700851";
+      sha256 = "3306113b2e5249c9bef8cbe3ee30a76855402f39385ef730725fe19c650248fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/es-CL/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-CL/firefox-82.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "b2ff29fe620aaa62e9b20ae1576574b2e4c7893eb664fb7c6f722a80093d81bf";
+      sha256 = "72fc2f9c4269255c5c9b6c65f11ce8613dd68a1b382c53cab159c56af91d4f12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/es-ES/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-ES/firefox-82.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "47f526244e2d7426d7a9d2faa1e114032bd43309c480a21523645c415ac54a17";
+      sha256 = "720687e90a863bc08a79e7b98f52439efbf655cc170397095dcf2212839eeb77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/es-MX/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-MX/firefox-82.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "f2f7f4e251574d11ea69854d0f5a9f7b078aa220d5fb1ef8275e25e4e75389a6";
+      sha256 = "32db50431886cf3e181a440eb40e4d9e93ebb0dd6c7e9eb3f6bb4cb203530d37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/et/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/et/firefox-82.0.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "88ac5af23fa85690fe992ff457f79c991d4802e54a5a3a73682b3b1c6d444856";
+      sha256 = "21c2de424dad554b4e74509df0b40a49c23b77c406d44c611ea0e08eb98d1886";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/eu/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/eu/firefox-82.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "2fa7483b6be6503a5aa584895d6b177b51f94c344e0869638f6dc065437d69ff";
+      sha256 = "96e3609f488fc8bdf899f07333121893dc5f74f520856536facb1a5b376773f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/fa/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fa/firefox-82.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "f9cf6f19e3faf9c206a4286224089855aa2fad94bb99250855925e167aa65943";
+      sha256 = "572a6fe2bc5c0751077344e327ff11d434eeb26eade478dd79578822bc8ea167";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ff/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ff/firefox-82.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "b6171880f459eed455cab78fbf9a695168f23bb26c361099cd23f682a99704c6";
+      sha256 = "08daf54db1c3927ff10c38ae462c806b0968abe89509e2a7251b39e2f3e3e43d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/fi/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fi/firefox-82.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "6f5d5eaa2e4a60122a18b998932645f6abe7542e04298d13cf5004804de12bb8";
+      sha256 = "c2bfa5646d0f39262c79dbae82f2a443e145b0b318d4213e42f265dd378a0a73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/fr/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fr/firefox-82.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "1d239e0c59c17c3e8de5f88df643a2b59b55a1816f8d2779c115311c6729bf89";
+      sha256 = "3e8ae367878e625b796e68fdc413ed4fa32a06260db7ecb000f3c089f7755a6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/fy-NL/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fy-NL/firefox-82.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "7307baffe92d133f2b3b957c8592d7ef18e1129aebadb9c1a26b8f462ecb9b84";
+      sha256 = "29dcf0040b32d2a183cc79f220ff37c6b8059a399fd111b9c4ab8f851b638acc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ga-IE/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ga-IE/firefox-82.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "1ae40826795c01e45921cee1293990a227f219ed20398b77cb8cf382207ed0d2";
+      sha256 = "d2f0c91780ef7dd353d58e41e539b917e6c957231579517d1d75cef89769a5b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/gd/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gd/firefox-82.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "108f11cade989829a103e67090f03dec890b371004fe047215fe2feda8217a7b";
+      sha256 = "1c305c577072a792aee284559202b4ca8108df8f96b1ef17c20d6918498b3599";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/gl/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gl/firefox-82.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "3be9987167773e448d194bcde682242576968ca04cdba2b3728e454b965a9b21";
+      sha256 = "86c829c97c30e5c49081283cc8ff5073d357ab09520194c56df63ab56858b083";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/gn/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gn/firefox-82.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "be87dc9ecfe75423c59fd189896a508040f5f962828855f50a01fb4a46a6beb1";
+      sha256 = "11a41052cb779cd11fa2e9c1f2f4367a190e78e36dce900f2fd84c451a6001be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/gu-IN/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gu-IN/firefox-82.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "c2b1290375af17d0d63dfa90b006025dd8f9e7b35628caa782c849826df2fb53";
+      sha256 = "6dfb8e60f2225a8db6a2b1ce31b23b51803d5fe9642cb85ff9f440e53c887616";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/he/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/he/firefox-82.0.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "9579aa350b3cc6c0814c24361a5b7a7b3ec75245f050ad994ab20e850b520f41";
+      sha256 = "8d2f9ed875b38e6d19776c0bfb3a66fe030215d43ee247c9f1a5b85c7dcf0105";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hi-IN/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hi-IN/firefox-82.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "25a037775d64ceaa137fde2367e26f846e755f98edaf0fd04526b4afc80b17cb";
+      sha256 = "cf160dc3ff74855a206882e045395dc1ddd69d545184d7f02acb20289465842a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hr/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hr/firefox-82.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "c84de35ed70512cd608de909ce887f0bbf79d5894a82facd94af478b1cc54764";
+      sha256 = "e62b04dba13d6d8dfada3976f23715cd221d5a9f0c9d2ea9a0b828c87222b8db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hsb/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hsb/firefox-82.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "2d5ce7160c14b3770d19c3d32a068c1a08623ac2c3b0036d5f18ba7645463fbb";
+      sha256 = "fbf8420109b4b7470bf8e5b889cbb51b5a9d827b9cedb2aeb5089f31e74b0211";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hu/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hu/firefox-82.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "bf0fa325c588eacb758697ed13a4aba6416ce35f6cae31891ff4b5ea0296e094";
+      sha256 = "161c7f91df6806310a10631f6d338cf86138f5056d265e4dfcc2823634a1cc79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hy-AM/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hy-AM/firefox-82.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "f45b28645f8dc656d291cbea9e969cca090014f1c4d508f2a0d8f500ce949066";
+      sha256 = "a35885c431f6b160716355766c5e8f60ac94dc86675e91905c4781071de6c2a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ia/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ia/firefox-82.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "ac1ee6f6450f62fd4e0de61366b83a0fc8d7b7be5731591e83c4393ba2a6e9f6";
+      sha256 = "e162f166587a94aaaf9a6419fdd9da21f949c7db0d1ad223016d470841e124cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/id/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/id/firefox-82.0.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "8117c5e493362fba30de0cb27cd5a8ef7ab9b31655701b44c9ab06a6b73af60a";
+      sha256 = "bee0a6a4a0a9fa3c13650bcb4fefaaa07cce21211d2d4fc0030f4f9133781eab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/is/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/is/firefox-82.0.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "118b2dac91511e0e68a7dee939f586a9d9b31cc117d6295053a6125fe7e3bf57";
+      sha256 = "8994bc2da81e1b17ac112e7ca7a43be9f578c049e879651a4014730937c83283";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/it/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/it/firefox-82.0.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "8680148fda005fd63ce5af1230060f7510a4b7b096da1f5dd864b9824990faff";
+      sha256 = "7fa77ed489b07954543ba117dc3cf67fc70341a5e486d35596cc8f80f630482f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ja/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ja/firefox-82.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "eedf01ce82bce136c03a62de3437b42e52280e87c8491133116926ec7481b7a0";
+      sha256 = "76d299e4d71a82e72bc2e446bcafcc1b1d63b54c57e9aeb7ff11e7bff8611811";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ka/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ka/firefox-82.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "63c060cb338ee1a0bec05fa8b3749f21503dd3d78548b5673fa4b44b64ef0536";
+      sha256 = "6c027f7dbdff43c097a73ecad83aec6c7d623cfc8cdd77049d4dcab70984b403";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/kab/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/kab/firefox-82.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "ba10887d808f197cffa458ba50d3cc7696be176dd088747a50adf676a0d1d666";
+      sha256 = "ebd32284e83a0df7228f34263ea03b5b3f418fa5db193e01d20ef15f7ccc393d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/kk/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/kk/firefox-82.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "c93f19c29f0a47854ec1b90e8e4e5e77a08f5c2a3589fd3753c9aa6ceb6d515e";
+      sha256 = "39dcaefc6135f51157802878702debd14950a82a32b57862c9428236425de620";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/km/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/km/firefox-82.0.2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "7066bcd6a37faaf5db2ff5eca5c1049cdd4a9a1c034133de866b7d9d97913c03";
+      sha256 = "30b0fc4885498d9453dd3179a82d7fd12bcdb5a2b1f3d6227d7a7a68123544eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/kn/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/kn/firefox-82.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "04d941f96c92525298e391a38ef24ee2d31411bd9f3d36ca2f667e3d400513e3";
+      sha256 = "ab0f33c172a47fd5fe1e3caa014938647dc870a97e9db0d1ed7e9b09a3fc920b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ko/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ko/firefox-82.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "b8fbf8316f2a3d93303ce52f63a08d7604ba8143d7bfbed6782912ab19609436";
+      sha256 = "7e20d1d2c16e6278e1e8290c18b39833e23b12cc9bbcfcf3135e52d3c155118d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/lij/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/lij/firefox-82.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "a655f743a2397f808fe514e0e86f6297c3a8ff113bdd360249309d449ff5444c";
+      sha256 = "5da50a6a54b1ce15af8ca26bdb2756449622f6d441593bae4f558c079ef732ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/lt/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/lt/firefox-82.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "dd4f654d1c8dfaf0a318c5633865649a8298fa92fb71b7c66ed9369710df2ea8";
+      sha256 = "a4bf43fd06f915720f3050750f226629a602aed690b74df728cfd616f8d1d063";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/lv/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/lv/firefox-82.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "820f1c5d3da3ae84b0a0c80dca3210ee61024a23141fb2111b5e609843aeb55d";
+      sha256 = "8f8eaf80606a140616cfa17fb69bc611ac631a8ec1e4d204fb0de1c073b767aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/mk/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/mk/firefox-82.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "51991978ac9db66b157b6921941219ed6f2be3ed2ec9a1fd74933117a5708743";
+      sha256 = "869715dd3d72c48db3007557aabc96fee78b73ecdc747ec0f361365eb1072111";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/mr/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/mr/firefox-82.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "1012cc8a38bb7a3250d2328af5c3afef05b8316137ecea20e3941bb1428a4d4f";
+      sha256 = "ae921995425812eb2b70a479dc1d6bc319d397c7c16e020460d2d1f65cdc9305";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ms/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ms/firefox-82.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "584504c48e0f0f28ba8b6dc5341743293b7f1795ea5c1c9a31c348c76cc62313";
+      sha256 = "55fc6ca427864cd885fa8da786f50f4e88ef2d9adf331e55a6f8e781fe5f7838";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/my/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/my/firefox-82.0.2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "5c4aa84945631ddb576f1a75120d5ccba9ec6d37f2ca7fa74fd673bfd3d4bd5b";
+      sha256 = "26377b5108cd1208d111792dad61cf521fda0f4c4206d17e4907b06e4ab5e7d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/nb-NO/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/nb-NO/firefox-82.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "d35d5cdf2b5ebb145c1c54a5e0d95501a38783a207d47e01eec4cf85a64541b5";
+      sha256 = "19bcb61803f6d6bbecfd94eb769b3d302a951ac5d7f337b6937f9282cbb8222a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ne-NP/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ne-NP/firefox-82.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "af2f8135a7913914752a0f759c98a078823c6824a76625a6be4077563dafd3f2";
+      sha256 = "4575f7730e5964fa5be7ec351907d97794c06bf101bea5a98785238304d1fea9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/nl/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/nl/firefox-82.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "beac8d7493bca8319c04f36d8e60985ebefa8af716db9aedf253d7b1bca496d2";
+      sha256 = "f22f33b1a1127a4dc91781031c0112b05e8cd5fbbb8c732a6e18b5beeb5627ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/nn-NO/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/nn-NO/firefox-82.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "62e2abdda830a869247220edc5d623dd40d463d96458980f2b1aa70352f45dc8";
+      sha256 = "d59e605d47601c18d12e6a2a57cfb8c8752fea2711e8cb0d822b18a4f7a2c049";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/oc/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/oc/firefox-82.0.2.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "d670d46d4641e4b89b3e9fd09e226ebc9822d43c8611020e410c0a239ee6d3d6";
+      sha256 = "859b0b3b7317a4b94292edcb8f159d4c42404efcf67a170f435131b0b2331422";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/pa-IN/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pa-IN/firefox-82.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "244fd49efcb7579813b493904e63a889eaa832fa326b2da3fd4e5988bcee0294";
+      sha256 = "b8553bcc65ce5a075875849508876f34478a0d8166b048b4b8d0b37aacad359e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/pl/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pl/firefox-82.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "31c4cbc76456d9e0d76ab98c997049d17940cc5f461941c72ba85e07b0859516";
+      sha256 = "8428f5438edadd7f3e531aeb905bd46f52a3a624e1a36706b3e0e79d29366b94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/pt-BR/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pt-BR/firefox-82.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "8c73c44493d265291f253ae7e739613a1cec1e82678021f3ee1738990eb101bd";
+      sha256 = "021cb4431781ef19cf7be1f987b6859c2c8b7db67f1428cec475d4de82d38118";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/pt-PT/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pt-PT/firefox-82.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "934e69f1c07b69c59c3e680ec7ab6d5e8bcf54e5a1e4bc32ef5782c15222544c";
+      sha256 = "e55fe5ebb512e184e2c67dc6b866a0f727fa89bda6fb2ed763195761b67bc79c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/rm/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/rm/firefox-82.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "a825c9319954997f285370b4f13e20fe1b0eda62621b71570b2d7606e5a5668c";
+      sha256 = "30bc0d66c940ddaeaff516e900f85c652a3dee07d2ede81710efd31c5858e72e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ro/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ro/firefox-82.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "df1de4c7dd186bd8b6558c6c4e902a1721ad3f73a40dd5163b82e98323931436";
+      sha256 = "e467c27dafce634f4e507ba5520ea4dfc3d3fca2f751a8ae55fb3fb26a073b3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ru/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ru/firefox-82.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "4c02fa376103c6fb69f2610045a5f922a6a305b11f92899e9d7f42725cfe9ad2";
+      sha256 = "d0ea589f932e1dd4a1f6d12a758210e22213794f5d45ec5bb85621aa1ba206d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/si/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/si/firefox-82.0.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "bc429d437ede468610dfb4f807d7107a6a0f60b32c425d61cf13cbfb4f1aceed";
+      sha256 = "6a22d47d1c193a2a048c7535ec49f2198bd2616e123353af0391272db9decd3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sk/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sk/firefox-82.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "6e6620e108c4e6c0acafec1921ec4d99912dd0ca4d36d62cc5bef6127ca04c33";
+      sha256 = "c38f8f2f172c0de6d526be926c874a765116f14af5f50cb65cd7771a46cdcfe0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sl/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sl/firefox-82.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "7aa6392e83496ebfba7b5ea4576aab2d28088c88558d88af74a588954bc5af20";
+      sha256 = "f39c27bb7d334f20e09fed97c3589db6aae988d3e538d7e2dbae690ab4b4e521";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/son/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/son/firefox-82.0.2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "3134725ede0ba297dc895b3682cc6ecf73931c0779a0fc979166f2ed652b6d4e";
+      sha256 = "7edcdcb248e6cb9a78fd4061a2ab54e03692834f87c6d565ed9b777c952ba5fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sq/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sq/firefox-82.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "33d3a6bcdcfb199360770c677849e064d3727f3629b34f9913faccd5f173c6bb";
+      sha256 = "db3a6edc2a4008c09ba931e965e9853404dd272455ec8d6b20bf86e14a095bea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sr/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sr/firefox-82.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "b9ea179cc648bfb7688e5b21a0a5d128bd0247171b9e9114459a4ed7fe352281";
+      sha256 = "aa6bf3ed3402813f56b6d6c53a70da8c7decad3f9d3c3af66336aadc632e334c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sv-SE/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sv-SE/firefox-82.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "18227f53b7317262270f4ed973b080649d3011ea52ab434d56a09e91d750c8e3";
+      sha256 = "8ffe039f7ed159150c6ad804e980c597741439dcc339841e464589ebd535eb38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ta/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ta/firefox-82.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "8c70c66802d6966e04462f934bfe16c94007209b4b6ecccbfe1cc044cd3c19d0";
+      sha256 = "a46c944cc5b22fefe8503cf079be32cc5aeb2cd1b78e5642f5ec55f8baf28586";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/te/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/te/firefox-82.0.2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "c36cd994a88688e3af5360f24bdc6a69960723bc2dd196f3d42ab8d6099abbfb";
+      sha256 = "a7ce32a838d4add3123116628301fb6642311fd3f6fffe0ca4ed6cb314c162fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/th/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/th/firefox-82.0.2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "2ded98d2d5957ee42c665a1789ae4fbc549af60a08adf1e51baf7022db5f03cb";
+      sha256 = "3ed82ac4d015d397cb53149f30e2842614092413d84dd6add365428b80c40cdd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/tl/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/tl/firefox-82.0.2.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "14135d1ae961084d7979bb3ee13fa50bb2f59d8ea9fe18400084aedcd6ca5388";
+      sha256 = "cdd9b16ad2fefdccbdea8bad3863e3177bd166fb595609f74b1afb7d279c4390";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/tr/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/tr/firefox-82.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "4ac2f0a8729427e508f9aaf3c6606145b84ea47009724a1d07c3182fbeb4678b";
+      sha256 = "4b75d68d159ee4463854b53d0f68364648c2b36e6c0fc8937573cf2a1262ad0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/trs/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/trs/firefox-82.0.2.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "c7bf44d74cead7b7a5d44bb16331a113d8fb630c0bfa9740045ecc5d6858a099";
+      sha256 = "b0947e9e8f45d848093805ff34a59d6c74a5559df91da5bf2255e2a24d386f95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/uk/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/uk/firefox-82.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "7a796554c241f21c16573f20b2b1907a4f7af4cccf441739b9826e2140f640cf";
+      sha256 = "a4ff8ded991f00825e10ebe69be7183899d8bca0692eae4e2c60049e80d6710d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ur/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ur/firefox-82.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "8d5bdda725bad1479c32a18504fb584ac290f94e994b4c00a0686bb09bfb6913";
+      sha256 = "ee50b6ac2818824211c5fb871f19eb0582a5f50c3873139d6aed613d9a853197";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/uz/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/uz/firefox-82.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "699bf3bd19bc7f4f213791ef2bd7ce8db0693928be611b952c6c8b34861efae1";
+      sha256 = "6c530bd3bb2d1a3072513b203afd44affadd4cd3e8f9136f2b7e4e942d7cbd27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/vi/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/vi/firefox-82.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "731e97ab6e96cf3da549b1cd954fbd4c48112ba12792bf1b94f9ce5628505c47";
+      sha256 = "ebfba78fe1778b0e724822adf1f448f005f4575c4c47eaf4d7347c808d2fe5a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/xh/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/xh/firefox-82.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "0078f3303b80aa63b1f664c49255077632729a5461b74a875e8cfb0ce3a23bb9";
+      sha256 = "e9e9b4b5cf377ab18c857242d1915ec0198393d35fd93c4ead4ac1d790db4d97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/zh-CN/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/zh-CN/firefox-82.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "fe9cb3a43e12c64aa12e40e8f52651e1c4ef09a52bbb51a3492acf8a535172c1";
+      sha256 = "c7d8459ff0eaaac129f168c54454af90f9618c8515f9df2a35de578611700372";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/zh-TW/firefox-82.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/zh-TW/firefox-82.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "020b7887120b134c127d444b59a5ce052fffd7653fffacaec9b0e4902e86158a";
+      sha256 = "b9a3074700de458cd43721b683597f95f2ad81834a15d5ebde22dfc324d92fb3";
     }
     ];
 }

From 6f8621dea6f458eb018f1efc7d220490f10c3d8c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 28 Oct 2020 06:30:56 +0100
Subject: [PATCH 0738/3942] ocamlPackages.fiat-p256: use Dune 2

---
 pkgs/development/ocaml-modules/fiat-p256/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/fiat-p256/default.nix b/pkgs/development/ocaml-modules/fiat-p256/default.nix
index ac7e6640eeab..3ebe98ab775d 100644
--- a/pkgs/development/ocaml-modules/fiat-p256/default.nix
+++ b/pkgs/development/ocaml-modules/fiat-p256/default.nix
@@ -5,6 +5,7 @@
 buildDunePackage rec {
   pname = "fiat-p256";
   version = "0.2.1";
+  useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/mirage/fiat/releases/download/v${version}/${pname}-v${version}.tbz";

From 39dbc77b99a1b98f98bc168b294033a4253b7337 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 28 Oct 2020 06:31:05 +0100
Subject: [PATCH 0739/3942] =?UTF-8?q?ocamlPackages.hex:=201.3.0=20?=
 =?UTF-8?q?=E2=86=92=201.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix
index 8e9dd2db2500..526989734abd 100644
--- a/pkgs/development/ocaml-modules/hex/default.nix
+++ b/pkgs/development/ocaml-modules/hex/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, buildDunePackage, cstruct }:
+{ stdenv, fetchurl, buildDunePackage, bigarray-compat, cstruct }:
 
 buildDunePackage rec {
   pname = "hex";
-  version = "1.3.0";
+  version = "1.4.0";
+
+  useDune2 = true;
 
   minimumOCamlVersion = "4.02";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/hex-v${version}.tbz";
-    sha256 = "193567pn58df3b824vmfanncdfgf9cxzl7q3rq39zl9szvzhvkja";
+    sha256 = "07b9y0lmnflsslkrm6xilkj40n8sf2hjqkyqghnk7sw5l0plkqsp";
   };
 
-  propagatedBuildInputs = [ cstruct ];
+  propagatedBuildInputs = [ bigarray-compat cstruct ];
   doCheck = true;
 
   meta = {

From a7a7641e19698cd5e9d76611679a25d11a826dea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 19:16:58 +0000
Subject: [PATCH 0740/3942] fio: 3.22 -> 3.23

---
 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 77a85e014734..2a945c78f821 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fio";
-  version = "3.22";
+  version = "3.23";
 
   src = fetchFromGitHub {
     owner  = "axboe";
     repo   = "fio";
     rev    = "fio-${version}";
-    sha256 = "16p17l1xbqqkgppvwmfaywknhk4ybafnx8hm56ffd8bls9vaqw5m";
+    sha256 = "0xr1d1jh7zhdhf0zfv8w6r99hk8h5d22v36h13hrd8mqyaz1g8m0";
   };
 
   buildInputs = [ python zlib ]

From ec6b0950efcafeb6b431de068a7f61eca7797a85 Mon Sep 17 00:00:00 2001
From: Philipp Kern <phil@philkern.de>
Date: Sat, 31 Oct 2020 20:52:13 +0100
Subject: [PATCH 0741/3942] nixos/prometheus: Support environmentFile (#97933)

For the same reason Alertmanager supports environmentFile to pass
secrets along, it is useful to support the same for Prometheus'
configuration to store bearer tokens outside the Nix store.
---
 .../monitoring/prometheus/default.nix         | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index 98aaa9c0f030..72428957109c 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -45,7 +45,7 @@ let
 
   cmdlineArgs = cfg.extraFlags ++ [
     "--storage.tsdb.path=${workingDir}/data/"
-    "--config.file=${prometheusYml}"
+    "--config.file=/run/prometheus/prometheus-substituted.yaml"
     "--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}"
     "--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}"
     "--alertmanager.timeout=${toString cfg.alertmanagerTimeout}s"
@@ -522,6 +522,45 @@ in {
       '';
     };
 
+    environmentFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      example = "/root/prometheus.env";
+      description = ''
+        Environment file as defined in <citerefentry>
+        <refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum>
+        </citerefentry>.
+
+        Secrets may be passed to the service without adding them to the
+        world-readable Nix store, by specifying placeholder variables as
+        the option value in Nix and setting these variables accordingly in the
+        environment file.
+
+        Environment variables from this file will be interpolated into the
+        config file using envsubst with this syntax:
+        <literal>$ENVIRONMENT ''${VARIABLE}</literal>
+
+        <programlisting>
+          # Example scrape config entry handling an OAuth bearer token
+          {
+            job_name = "home_assistant";
+            metrics_path = "/api/prometheus";
+            scheme = "https";
+            bearer_token = "\''${HOME_ASSISTANT_BEARER_TOKEN}";
+            [...]
+          }
+        </programlisting>
+
+        <programlisting>
+          # Content of the environment file
+          HOME_ASSISTANT_BEARER_TOKEN=someoauthbearertoken
+        </programlisting>
+
+        Note that this file needs to be available on the host on which
+        <literal>Prometheus</literal> is running.
+      '';
+    };
+
     configText = mkOption {
       type = types.nullOr types.lines;
       default = null;
@@ -662,12 +701,19 @@ in {
     systemd.services.prometheus = {
       wantedBy = [ "multi-user.target" ];
       after    = [ "network.target" ];
+      preStart = ''
+         ${lib.getBin pkgs.envsubst}/bin/envsubst -o "/run/prometheus/prometheus-substituted.yaml" \
+                                                  -i "${prometheusYml}"
+      '';
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/prometheus" +
           optionalString (length cmdlineArgs != 0) (" \\\n  " +
             concatStringsSep " \\\n  " cmdlineArgs);
         User = "prometheus";
         Restart  = "always";
+        EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
+        RuntimeDirectory = "prometheus";
+        RuntimeDirectoryMode = "0700";
         WorkingDirectory = workingDir;
         StateDirectory = cfg.stateDir;
       };

From f7904ca45b9cb9e9cec61d090e66d7207ab6d422 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 31 Oct 2020 18:24:11 +0100
Subject: [PATCH 0742/3942] nixos/tests/firefox: add audio subtest

---
 nixos/tests/firefox.nix | 91 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 85 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 7071baceba73..07e25bd4ca72 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -11,26 +11,105 @@ import ./make-test-python.nix ({ pkgs, esr ? false, ... }: {
       environment.systemPackages =
         (if esr then [ pkgs.firefox-esr ] else [ pkgs.firefox ])
         ++ [ pkgs.xdotool ];
+
+      # Need some more memory to record audio.
+      virtualisation.memorySize = "500";
+
+      # Create a virtual sound device, with mixing
+      # and all, for recording audio.
+      boot.kernelModules = [ "snd-aloop" ];
+      sound.enable = true;
+      sound.extraConfig = ''
+        pcm.!default {
+          type plug
+          slave.pcm pcm.dmixer
+        }
+        pcm.dmixer {
+          type dmix
+          ipc_key 1
+          slave {
+            pcm "hw:Loopback,0,0"
+            rate 48000
+            periods 128
+            period_time 0
+            period_size 1024
+            buffer_size 8192
+          }
+        }
+        pcm.recorder {
+          type hw
+          card "Loopback"
+          device 1
+          subdevice 0
+        }
+      '';
+
+      systemd.services.audio-recorder = {
+        description = "Record NixOS test audio to /tmp/record.wav";
+        script = "${pkgs.alsaUtils}/bin/arecord -D recorder -f S16_LE -r48000 /tmp/record.wav";
+      };
+
     };
 
   testScript = ''
+      from contextlib import contextmanager
+
+
+      @contextmanager
+      def audio_recording(machine: Machine) -> None:
+          """
+          Perform actions while recording the
+          machine audio output.
+          """
+          machine.systemctl("start audio-recorder")
+          yield
+          machine.systemctl("stop audio-recorder")
+
+
+      def wait_for_sound(machine: Machine) -> None:
+          """
+          Wait until any sound has been emitted.
+          """
+          machine.wait_for_file("/tmp/record.wav")
+          while True:
+              # Get at most 2M of the recording
+              machine.execute("tail -c 2M /tmp/record.wav > /tmp/last")
+              # Get the exact size
+              size = int(machine.succeed("stat -c '%s' /tmp/last").strip())
+              # Compare it against /dev/zero using `cmp` (skipping 50B of WAVE header).
+              # If some non-NULL bytes are found it returns 1.
+              status, output = machine.execute(
+                  f"cmp -i 50 -n {size - 50} /tmp/last /dev/zero 2>&1"
+              )
+              if status == 1:
+                  break
+              machine.sleep(2)
+
+
       machine.wait_for_x()
 
-      with subtest("wait until Firefox has finished loading the Valgrind docs page"):
+      with subtest("Wait until Firefox has finished loading the Valgrind docs page"):
           machine.execute(
               "xterm -e 'firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' &"
           )
           machine.wait_for_window("Valgrind")
           machine.sleep(40)
 
+      with subtest("Check whether Firefox can play sound"):
+          with audio_recording(machine):
+              machine.succeed(
+                  "firefox file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga &"
+              )
+              wait_for_sound(machine)
+          machine.copy_from_vm("/tmp/record.wav")
+
+      with subtest("Close sound test tab"):
+          machine.execute("xdotool key ctrl+w")
+
       with subtest("Close default browser prompt"):
           machine.execute("xdotool key space")
 
-      with subtest("Hide default browser window"):
-          machine.sleep(2)
-          machine.execute("xdotool key F12")
-
-      with subtest("wait until Firefox draws the developer tool panel"):
+      with subtest("Wait until Firefox draws the developer tool panel"):
           machine.sleep(10)
           machine.succeed("xwininfo -root -tree | grep Valgrind")
           machine.screenshot("screen")

From 8f2be9ac36081fd1e9b2395e1662a5189bf917fb Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 31 Oct 2020 21:17:26 +0100
Subject: [PATCH 0743/3942] nss: make reproducible (#102156)

According to
https://hg.mozilla.org/projects/nss/file/c1fad130dce2081a5d6ce9f539c72d999f59afce/build.sh#l129
the FIPS mode is not enabled by default. Yet we generate the .chk files
that are only meant to be used for that mode. I have a sense that those
have been cargo-culted around.

Adding FIPS is still possible but you have to explictily build the lib
with `pkgs.nss.override { enableFIPS = true; }`

More info on what FIPS is:
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6

Other distros wrangling with the same issue:
https://bugzilla.opensuse.org/show_bug.cgi?id=1081723
---
 pkgs/development/libraries/nss/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 395617aa7bce..0c51fda53822 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja }:
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja
+, # allow FIPS mode. Note that this makes the output non-reproducible.
+  # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6
+  enableFIPS ? false
+}:
 
 let
   nssPEM = fetchurl {
@@ -83,6 +87,7 @@ in stdenv.mkDerivation rec {
       -Dhost_arch=${host} \
       -Duse_system_zlib=1 \
       --enable-libpkix \
+      ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \
       ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \
       ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}
 
@@ -128,7 +133,8 @@ in stdenv.mkDerivation rec {
   postFixup = let
     isCross = stdenv.hostPlatform != stdenv.buildPlatform;
     nss = if isCross then buildPackages.nss.tools else "$out";
-  in ''
+  in
+  (stdenv.lib.optionalString enableFIPS ''
     for libname in freebl3 nssdbm3 softokn3
     do '' +
     (if stdenv.isDarwin
@@ -141,7 +147,8 @@ in stdenv.mkDerivation rec {
      '') + ''
         ${nss}/bin/shlibsign -v -i "$libfile"
     done
-
+  '') +
+  ''
     moveToOutput bin "$tools"
     moveToOutput bin/nss-config "$dev"
     moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example

From 7d834eff6c027e1efada11ef8b6c63db289a6a12 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 31 Oct 2020 21:18:16 +0100
Subject: [PATCH 0744/3942] nixos/manual: make reproducible (#102234)

---
 nixos/doc/manual/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 6ca75f869f45..af7a2e08220c 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -63,6 +63,7 @@ let
     "--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'"
     "--param xref.with.number.and.title 1"
     "--param toc.section.depth 0"
+    "--param generate.consistent.ids 1"
     "--stringparam admon.style ''"
     "--stringparam callout.graphics.extension .svg"
     "--stringparam current.docid manual"

From c409f694807e8cd16db8e2affb630073c1aadc48 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 31 Oct 2020 21:24:36 +0100
Subject: [PATCH 0745/3942] pythonPackages.pip: make reproducible (#102222)

The previous attempt wasn't covering all of the bases. It relied on
invoking that pip-install-hook, and didn't apply to pip itself.

The core issue is that the generated .pyc files embed some of the
temporary paths, which are randomly generated. See
https://r13y.com/diff/bf8c3ca3148ebff9ecf41f294cc60b9f209c006d49699e356969ff32d736f1c6-8806a7cca91fdd300e48736bfcd57c4d0b54c1cc2fd61609f35143170862b59c.html

In this new attempt, the approach is to patch the TempFile
implementation directly, so that it creates stable temporary
directories. We also assume that if SOURCE_DATE_EPOCH is set, we are in
a scenario where reproducible builds are desirable and enter that
branch.

See also https://github.com/pypa/pip/issues/7808
---
 .../python/hooks/pip-install-hook.sh          |  2 +-
 .../bootstrapped-pip/default.nix              |  5 +++
 .../python-modules/pip/default.nix            |  2 +-
 .../python-modules/pip/reproducible.patch     | 38 ++++++++++++-------
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
index 770739b36bde..73d3c3cbbffa 100644
--- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
@@ -12,7 +12,7 @@ pipInstallPhase() {
 
     pushd dist || return 1
     mkdir tmpbuild
-    NIX_PIP_INSTALL_TMPDIR=tmpbuild @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags
+    @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags
     rm -rf tmpbuild
     popd || return 1
 
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 8bb713b76416..2b1a7dc8786c 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
+    # Apply the pip reproducible patch
+    pushd "${pip.src.name}"
+      patch -p1 < ${../pip/reproducible.patch}
+    popd
+
     mkdir -p $out/bin
   '';
 
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index fa566c8951ab..8dbf2c54a7fe 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   };
 
   # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441
-  # Also update pkgs/development/interpreters/python/hooks/pip-install-hook.sh accordingly
+  # See also https://github.com/pypa/pip/issues/7808
   patches = [ ./reproducible.patch ];
 
   nativeBuildInputs = [ bootstrapped-pip ];
diff --git a/pkgs/development/python-modules/pip/reproducible.patch b/pkgs/development/python-modules/pip/reproducible.patch
index 528ac2b49b03..69001f0ef278 100644
--- a/pkgs/development/python-modules/pip/reproducible.patch
+++ b/pkgs/development/python-modules/pip/reproducible.patch
@@ -1,13 +1,25 @@
-diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
-index e7315ee4..4e36b03d 100644
---- a/src/pip/_internal/operations/install/wheel.py
-+++ b/src/pip/_internal/operations/install/wheel.py
-@@ -615,6 +615,8 @@ def install_wheel(
-     direct_url=None,  # type: Optional[DirectUrl]
- ):
-     # type: (...) -> None
-+    _temp_dir_for_testing = (
-+        _temp_dir_for_testing or os.environ.get("NIX_PIP_INSTALL_TMPDIR"))
-     with TempDirectory(
-         path=_temp_dir_for_testing, kind="unpacked-wheel"
-     ) as unpacked_dir, ZipFile(wheel_path, allowZip64=True) as z:
+diff --git a/src/pip/_internal/utils/temp_dir.py b/src/pip/_internal/utils/temp_dir.py
+index 201ba6d98..f1569fecd 100644
+--- a/src/pip/_internal/utils/temp_dir.py
++++ b/src/pip/_internal/utils/temp_dir.py
+@@ -3,6 +3,7 @@ from __future__ import absolute_import
+ import errno
+ import itertools
+ import logging
++import os
+ import os.path
+ import tempfile
+ from contextlib import contextmanager
+@@ -181,6 +182,11 @@ class TempDirectory(object):
+         # symlinked to another directory.  This tends to confuse build
+         # scripts, so we canonicalize the path by traversing potential
+         # symlinks here.
++        if "SOURCE_DATE_EPOCH" in os.environ:
++            path = os.path.join(tempfile.gettempdir(), "pip-{}-immobile".format(kind))
++            os.mkdir(path)
++            return path
++
+         path = os.path.realpath(
+             tempfile.mkdtemp(prefix="pip-{}-".format(kind))
+         )
+

From dd9240e6b09a638ea450c427dd8dfd8f0fa1aa27 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Tue, 23 Jun 2020 12:49:01 +0200
Subject: [PATCH 0746/3942] tuptime: correct to meta.license = gpl2Plus

---
 pkgs/tools/system/tuptime/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix
index abfc8ae5ac87..21529ac76778 100644
--- a/pkgs/tools/system/tuptime/default.nix
+++ b/pkgs/tools/system/tuptime/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Total uptime & downtime statistics utility";
     homepage = "https://github.com/rfrail3/tuptime";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.all;
     maintainers = [ maintainers.evils ];
   };

From 88ba207d53f654d1dff98e1936d2d615d2537049 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Sat, 31 Oct 2020 21:30:59 +0100
Subject: [PATCH 0747/3942] tuptime: 5.0.0 -> 5.0.1

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

diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix
index 21529ac76778..213a79fe2700 100644
--- a/pkgs/tools/system/tuptime/default.nix
+++ b/pkgs/tools/system/tuptime/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tuptime";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "rfrail3";
     repo = "tuptime";
     rev = version;
-    sha256 = "0izps85p8pxidfrzp7l4hp221fx3dcgapapsix1zavq6jrsl2qyh";
+    sha256 = "0nk3yyjavgmc435vj3f0siw4y5nwipsbcsvsf5m7mgvq0xi8f3ls";
   };
 
   nativeBuildInputs = [ makeWrapper installShellFiles ];

From 43776fb11e17781ebffb3bd110b83af224aa5624 Mon Sep 17 00:00:00 2001
From: Benjamin Andresen <b@lambda.icu>
Date: Sat, 31 Oct 2020 21:42:24 +0100
Subject: [PATCH 0748/3942] clojure: 1.10.1.645 -> 1.10.1.727

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

diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 39db54babe44..bebb5376b8a2 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clojure";
-  version = "1.10.1.645";
+  version = "1.10.1.727";
 
   src = fetchurl {
     url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "1z6a9an8ls992y4japmzdxay7c5d2z9s2q1xl4g615r23jwpcsf9";
+    sha256 = "1mnxvy4n7g72vcwhvrgr0xqri3p9d9w76c8a78kphhmd8lq0m92q";
   };
 
   nativeBuildInputs = [
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       cp clojure-tools-${version}.jar $out/libexec
       cp example-deps.edn $out
       cp deps.edn $out
-      cp clj_exec.clj $out
+      cp exec.jar $out
 
       substituteInPlace clojure --replace PREFIX $out
 

From 497b7018e4d92b512d1c097cf4dee6e2ee05faf7 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 31 Oct 2020 21:46:42 +0100
Subject: [PATCH 0749/3942] nixos/bluetooth: disable restart on unit changes

---
 nixos/modules/services/hardware/bluetooth.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index dfa39e7f6024..230492c6b091 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -87,6 +87,8 @@ in {
       bluetooth = {
         wantedBy = [ "bluetooth.target" ];
         aliases  = [ "dbus-org.bluez.service" ];
+        # restarting can leave people without a mouse/keyboard
+        unitConfig.X-RestartIfChanged = false;
       };
     };
 

From ddefc7778251d6a45a64d9b9ca0b9993550d83d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 21:38:01 +0000
Subject: [PATCH 0750/3942] ffsend: 0.2.65 -> 0.2.68

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

diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 8b9f79aaa7fd..a8c7fce68cc8 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -16,16 +16,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   pname = "ffsend";
-  version = "0.2.65";
+  version = "0.2.68";
 
   src = fetchFromGitLab {
     owner = "timvisee";
     repo = "ffsend";
     rev = "v${version}";
-    sha256 = "02yw129rw072jlf36k60jbhfdv9ayx2wb5il61fc0v07h1nd7i0d";
+    sha256 = "0ga1v4s8ks2v632mim8ljya0gi2j8bbwj98yfm3g00p0z1i526qk";
   };
 
-  cargoSha256 = "04waki61b5pjlgznbhbrjpi9rxgdwg9mjbx2apfh9swvfip602r6";
+  cargoSha256 = "1n9pf29xid6jcas5yx94k4cpmqgx0kpqq7gwf83jisjywxzygh6w";
 
   nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
   buildInputs =

From ac207159482b5df38da8a92d0d88c7b855fa9331 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 21:59:10 +0000
Subject: [PATCH 0751/3942] geekbench: 5.2.3 -> 5.2.5

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

diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix
index 4d9434e9fb50..56292f3ad7dd 100644
--- a/pkgs/tools/misc/geekbench/default.nix
+++ b/pkgs/tools/misc/geekbench/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "geekbench";
-  version = "5.2.3";
+  version = "5.2.5";
 
   src = fetchurl {
     url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
-    sha256 = "03hasbibw79vbcrpdf2fnm42i2mxc0ia7k96xv012wn6d4dfvr4w";
+    sha256 = "0mq33khmsay646csr7j7mqb1fr2dlacb58hjqyxfbh83r0a1q67p";
   };
 
   dontConfigure = true;

From 6cc483b6c23821158c0f9310b6f5bacd9d3bfa58 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 31 Oct 2020 23:27:12 +0100
Subject: [PATCH 0752/3942] autogen: make reproducible (#102280)

---
 .../tools/misc/autogen/default.nix            | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 3e634bedfd19..87b8bde58add 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -42,13 +42,23 @@ stdenv.mkDerivation rec {
     guile libxml2
   ];
 
-  configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    "--with-libxml2=${libxml2.dev}"
-    "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2"
-    # the configure check for regcomp wants to run a host program
-    "libopts_cv_with_libregex=yes"
-    #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo"
-  ];
+  configureFlags =
+    [
+      # Make sure to use a static value for the timeout. If we do not set a value
+      # here autogen will select one based on the execution time of the configure
+      # phase which is not really reproducible.
+      #
+      # If you are curious about the number 78, it has been cargo-culted from
+      # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21
+      "--enable-timeout=78"
+    ]
+    ++ (stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+      "--with-libxml2=${libxml2.dev}"
+      "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2"
+      # the configure check for regcomp wants to run a host program
+      "libopts_cv_with_libregex=yes"
+      #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo"
+    ]);
 
   #doCheck = true; # not reliable
 

From 172f396f7bf420d66b96c4c78a9a119b39f460fa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 22:53:19 +0000
Subject: [PATCH 0753/3942] fet-sh: 1.7 -> 1.8

---
 pkgs/tools/misc/fet-sh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/tools/misc/fet-sh/default.nix
index 4041a9abdbad..e53c51c33e94 100644
--- a/pkgs/tools/misc/fet-sh/default.nix
+++ b/pkgs/tools/misc/fet-sh/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "fet-sh";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchFromGitHub {
     owner = "6gk";
     repo = "fet.sh";
     rev = "v${version}";
-    sha256 = "02izkwfph4i62adwns4q4w1pfcmdsczm8ghagx5yb9315ww3adzn";
+    sha256 = "1czjsyagwzbf8l023l1saz9ssb1hc245a64nfwc8wl0cn4h9byky";
   };
 
   dontBuild = true;

From 6b72fd5c3bb220788b1912a7ad4d08159d3744d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 29 Oct 2020 18:06:04 +0100
Subject: [PATCH 0754/3942] libdatrie: init at 0.2.12

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

diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix
new file mode 100644
index 000000000000..0d3faf69e3b7
--- /dev/null
+++ b/pkgs/development/libraries/libdatrie/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libiconv }:
+
+stdenv.mkDerivation rec {
+  pname = "libdatrie";
+  version = "0.2.12";
+
+  src = fetchurl {
+    url = "https://github.com/tlwg/libdatrie/releases/download/v${version}/libdatrie-${version}.tar.xz";
+    sha256 = "0jdi01pcxv0b24zbjy7zahawsqqqw4mv94f2yy01zh4n796wqba5";
+  };
+
+  nativeBuildInputs = [ installShellFiles pkg-config ];
+
+  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+
+  postInstall = ''
+    installManPage man/trietool.1
+  '';
+
+  meta = with stdenv.lib;{
+    homepage = "https://linux.thai.net/~thep/datrie/datrie.html";
+    description = "This is an implementation of double-array structure for representing trie";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd5facef8271..8a8343b990d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13500,6 +13500,8 @@ in
 
   libdap = callPackage ../development/libraries/libdap { };
 
+  libdatrie = callPackage ../development/libraries/libdatrie { };
+
   libdazzle = callPackage ../development/libraries/libdazzle { };
 
   libdbi = callPackage ../development/libraries/libdbi { };

From e0e37f42612c90144ab441f0fd7191271a8e4838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 29 Oct 2020 18:06:48 +0100
Subject: [PATCH 0755/3942] libthai: init at 0.1.28

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

diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix
new file mode 100644
index 000000000000..6179ad0f6bda
--- /dev/null
+++ b/pkgs/development/libraries/libthai/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }:
+
+stdenv.mkDerivation rec {
+  pname = "libthai";
+  version = "0.1.28";
+
+  src = fetchurl {
+    url = "https://github.com/tlwg/libthai/releases/download/v${version}/libthai-${version}.tar.xz";
+    sha256 = "04g93bgxrcnay9fglpq2lj9nr7x1xh06i60m7haip8as9dxs3q7z";
+  };
+
+  nativeBuildInputs = [ installShellFiles pkg-config ];
+
+  buildInputs = [ libdatrie ];
+
+  postInstall = ''
+    installManPage man/man3/*.3
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://linux.thai.net/projects/libthai/";
+    description = "Set of Thai language support routines";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a8343b990d4..b755b1edfe0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14218,6 +14218,8 @@ in
 
   libtcod = callPackage ../development/libraries/libtcod { };
 
+  libthai = callPackage ../development/libraries/libthai { };
+
   libtheora = callPackage ../development/libraries/libtheora { };
 
   libthreadar = callPackage ../development/libraries/libthreadar { };

From 0b884cec25bdf211f9f687e0945dbd0da363f1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 29 Oct 2020 21:31:24 +0100
Subject: [PATCH 0756/3942] ibus-engines.libthai: init at 0.1.4

---
 .../ibus-engines/ibus-libthai/default.nix     | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix
new file mode 100644
index 000000000000..9c5f2cefb517
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, makeWrapper, pkg-config, ibus, gtk3, libthai }:
+
+stdenv.mkDerivation rec {
+  pname = "ibus-libthai";
+  version = "0.1.4";
+
+  src = fetchurl {
+    url = "https://linux.thai.net/pub/ThaiLinux/software/libthai/ibus-libthai-${version}.tar.xz";
+    sha256 = "0iam7308rxkx2xwaabc5wyj7vrxgd4cr95pvwrkm8fr9gh2xnwgv";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ gtk3 ibus libthai ];
+
+  meta = with stdenv.lib; {
+    isIbusEngine = true;
+    homepage = "https://linux.thai.net/projects/ibus-libthai";
+    description = "Thai input method engine for IBus";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b755b1edfe0c..9bc2812f7cc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2876,6 +2876,8 @@ in
 
     libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { };
 
+    libthai = callPackage ../tools/inputmethods/ibus-engines/ibus-libthai { };
+
     m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
 
     mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {

From dfe9e0e4584de3392311947053100898aea92cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 30 Oct 2020 00:53:42 +0100
Subject: [PATCH 0757/3942] pango: build with libthai

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

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index eec30d16b8cc..b3dd2062ca0b 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, cairo, harfbuzz
-, libintl, gobject-introspection, darwin, fribidi, gnome3
+, libintl, libthai, gobject-introspection, darwin, fribidi, gnome3
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
 , meson, ninja, glib
 , x11Support? !stdenv.isDarwin, libXft
@@ -28,6 +28,7 @@ in stdenv.mkDerivation rec {
   ];
   buildInputs = [
     fribidi
+    libthai
   ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     ApplicationServices
     Carbon
@@ -39,7 +40,6 @@ in stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
-    "-Dlibthai=disabled" # Not packaged in Nixpkgs
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     "-Dxft=disabled"  # only works with x11
   ];

From a70df2c2ccf5317f1ecbf5f1716364947b5b96b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 23:18:01 +0000
Subject: [PATCH 0758/3942] fnotifystat: 0.02.06 -> 0.02.07

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

diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix
index f01c96259a80..baa92decd9fc 100644
--- a/pkgs/os-specific/linux/fnotifystat/default.nix
+++ b/pkgs/os-specific/linux/fnotifystat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "fnotifystat";
-  version = "0.02.06";
+  version = "0.02.07";
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz";
-    sha256 = "1mr2qzh8r8qq7haz4qgci2k5lcrcy493fm0m3ri40a81vaajfniy";
+    sha256 = "0ipfg2gymbgx7bqlx1sq5p2y89k5j18iqnb0wa27n5s3kh9sh8w0";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''

From db986689cac8b65598cb21aae0e98b1ecc6aeef4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 23:36:02 +0000
Subject: [PATCH 0759/3942] facter: 3.14.13 -> 3.14.14

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

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 170f3109a0a6..f9ea99432bf0 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "facter";
-  version = "3.14.13";
+  version = "3.14.14";
 
   src = fetchFromGitHub {
-    sha256 = "1rink4xxh7f2ckqfl4pc3ljm9rfb5c4npsqzlys4f2snmq4d0h39";
+    sha256 = "07pfa11i3nn2dk5g3c1qj3g7d2s8gd2fr0lmfijndaqxm7gjrn1a";
     rev = version;
     repo = pname;
     owner = "puppetlabs";

From 1a130e752ab0ca5c1d9b582378c501602143eb3c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 23:47:06 +0000
Subject: [PATCH 0760/3942] flyway: 6.5.5 -> 7.1.1

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

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index c89b7acc51d8..2d8814dd2f72 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, jre_headless, makeWrapper }:
   let
-    version = "6.5.5";
+    version = "7.1.1";
   in
     stdenv.mkDerivation {
       pname = "flyway";
       inherit version;
       src = fetchurl {
         url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
-        sha256 = "0g40lgrm9cslkdr4yn0h737djdr9fdyrc4hkq7wsrj0wx6d819dn";
+        sha256 = "0ssspvgikn5avb49aldljx9avplhj33isbmwijk3548dg6dvh2da";
       };
       nativeBuildInputs = [ makeWrapper ];
       dontBuild = true;

From e65953742b43433e1adc227dbbf9003f2fa2bd2b Mon Sep 17 00:00:00 2001
From: Benjamin Asbach <asbachb@users.noreply.github.com>
Date: Sun, 1 Nov 2020 01:00:13 +0100
Subject: [PATCH 0761/3942] openjdk: 11.0.8 -> 11.0.9

---
 pkgs/development/compilers/openjdk/11.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 30b56ecba11c..92320f5eac04 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -11,8 +11,8 @@
 let
   major = "11";
   minor = "0";
-  update = "8";
-  build = "10";
+  update = "9";
+  build = "11";
 
   openjdk = stdenv.mkDerivation rec {
     pname = "openjdk" + lib.optionalString headless "-headless";
@@ -20,7 +20,7 @@ let
 
     src = fetchurl {
       url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1sdncn1bk4h8xxfnmrl1125maqy6mc0v0y1dyifwsa04wasj9hbz";
+      sha256 = "fc2ee2ee5822f2440e66114c8fa76888fea7ddd351282940c222d34b5f871858";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf ];

From 3408bddacfe6a76a1e317ba9bd3ca0e638ee89df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 00:15:25 +0000
Subject: [PATCH 0762/3942] gitAndTools.git-extras: 6.0.0 -> 6.1.0

---
 .../version-management/git-and-tools/git-extras/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index ed9e1cd4bdfa..d322a141cd94 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "git-extras";
-  version = "6.0.0";
+  version = "6.1.0";
 
   src = fetchzip {
     url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
-    sha256 = "0mxb3c5lb5n7c76bp10bw7bid564vjxi5f7cvzaj2ss93v5rr11g";
+    sha256 = "12ff9rhgqd71xm72r385hx0h8g75hz0ag0adzqcwfa54k0lhrrrz";
   };
 
   nativeBuildInputs = [ unixtools.column which ];

From afa6047e12169f14d9b761124975d7e145ed4519 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 00:24:33 +0000
Subject: [PATCH 0763/3942] gromacs: 2020.3 -> 2020.4

---
 .../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 151abb099f5b..bfa4a1f43391 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -9,11 +9,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "gromacs-2020.3";
+  name = "gromacs-2020.4";
 
   src = fetchurl {
-    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.3.tar.gz";
-    sha256 = "1acjrhcfzpqy2dncblhj97602jbg9gdha4q1bgji9nrj25lq6cch";
+    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.4.tar.gz";
+    sha256 = "1rplvgna60nqyb8nspaz3bfkwb044kv3zxdaa5whql5m441nj6am";
   };
 
   nativeBuildInputs = [ cmake ];

From 155896c0cdc2ee128c044eee8b74b5c6ebcf00b7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 00:41:26 +0000
Subject: [PATCH 0764/3942] gnu-pw-mgr: 2.4.2 -> 2.7.4

---
 pkgs/tools/security/gnu-pw-mgr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix
index de5234961d25..af6893b26e86 100644
--- a/pkgs/tools/security/gnu-pw-mgr/default.nix
+++ b/pkgs/tools/security/gnu-pw-mgr/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "gnu-pw-mgr";
-  version = "2.4.2";
+  version = "2.7.4";
   src = fetchurl {
     url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${pname}-${version}.tar.xz";
-    sha256 = "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17";
+    sha256 = "0fhwvsmsqpw0vnivarfg63l8pgwqfv7d5wi6l80jpb41dj6qpjz8";
   };
 
   buildInputs = [ gnulib ];

From e2ade56177190015025cc78d50880d08ac461f22 Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Sat, 31 Oct 2020 17:56:10 -0700
Subject: [PATCH 0765/3942] prosody: install prosody-migrator tool

---
 pkgs/servers/xmpp/prosody/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index c9cd09bb748d..9b7ed2ac41d0 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -59,6 +59,10 @@ stdenv.mkDerivation rec {
     "--with-lua=${lua5}"
   ];
 
+  postBuild = ''
+    make -C tools/migration
+  '';
+
   postInstall = ''
       ${concatMapStringsSep "\n" (module: ''
         cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
@@ -70,6 +74,11 @@ stdenv.mkDerivation rec {
         --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \
         --prefix LUA_PATH ';' "$LUA_PATH" \
         --prefix LUA_CPATH ';' "$LUA_CPATH"
+
+      make -C tools/migration install
+      wrapProgram $out/bin/prosody-migrator \
+        --prefix LUA_PATH ';' "$LUA_PATH" \
+        --prefix LUA_CPATH ';' "$LUA_CPATH"
     '';
 
   passthru = {

From e687a4d233b3b8800805484d3f1df5a269c8fcfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sun, 1 Nov 2020 00:56:18 +0000
Subject: [PATCH 0766/3942] genpass: 0.4.1 -> 0.4.9

* caught up with the newest released version
* genpass main repo moved to sourcehut
---
 pkgs/tools/security/genpass/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix
index 4310d3a8919f..6818af194b3a 100644
--- a/pkgs/tools/security/genpass/default.nix
+++ b/pkgs/tools/security/genpass/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchFromGitHub
+, fetchgit
 , rustPlatform
 , CoreFoundation
 , libiconv
@@ -7,22 +7,21 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "genpass";
-  version = "0.4.1";
+  version = "0.4.9";
 
-  src = fetchFromGitHub {
-    owner = "cyplo";
-    repo = pname;
+  src = fetchgit {
+    url = "https://git.sr.ht/~cyplo/genpass";
     rev = "v${version}";
-    sha256 = "1b22m7g55k5ry0vwyd8pakh8rmfkhk37qy5r74cn3n5pv3fcwini";
+    sha256 = "1dpv2iyd48xd8yw9bmymjjrkhsgmpwvsl5b9zx3lpaaq59ypi9g9";
   };
 
-  cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m";
+  cargoSha256 = "1cwxpc3xkw673wiamr4v7clrzwxl8ma1vdr6bw0hixm37gxdxz7x";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
 
   meta = with stdenv.lib; {
     description = "A simple yet robust commandline random password generator";
-    homepage = "https://github.com/cyplo/genpass";
+    homepage = "https://sr.ht/~cyplo/genpass/";
     license = licenses.agpl3;
     maintainers = with maintainers; [ cyplo ];
   };

From 0c77c156424557f72cb68a7b43dcc21f24b6fa76 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 01:10:34 +0000
Subject: [PATCH 0767/3942] gitAndTools.git-trim: 0.4.0 -> 0.4.2

---
 .../version-management/git-and-tools/git-trim/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix
index 137e6eb71589..33534334bea7 100644
--- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-trim";
-  version = "0.4.0";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "foriequal0";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0w6qrr53wal4p4jvz35f9mpqwz1vfcymj17sz418n9p9lw45f24n";
+    sha256 = "1rb9dhj7b7mjrhsvm9vw5gzjfxj10idnzv488jkfdz7sfhd3fcvz";
   };
 
-  cargoSha256 = "1mlvkvgcln59bi249z87v8i0ixq1a7walkzsjml6d219rmy5550h";
+  cargoSha256 = "1q62gqqhf78ljcvzp7yrnr0vk65rif2f7axzjq0b87prbcsr7ij4";
 
   nativeBuildInputs = [ pkg-config ];
 

From 5535343769815d988c60927ddc45c1542d59b18f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 02:35:57 +0000
Subject: [PATCH 0768/3942] gitAndTools.git-gone: 0.3.6 -> 0.3.7

---
 .../version-management/git-and-tools/git-gone/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
index 46decaf3cc12..13411ed4c41b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-gone";
-  version = "0.3.6";
+  version = "0.3.7";
 
   src = fetchFromGitHub {
     owner = "lunaryorn";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0wpmabd5lshsga3dhv1hix7i99f1f82rpl6kjmpi315whg11kki3";
+    sha256 = "0hhy1yazda9r4n753a5m9jf31fbzmm4v8wvl3pksspj2syglmll8";
   };
 
-  cargoSha256 = "0ayqsrhy6hpi20gfryhnwl2c1na4nnmzxkp7him104cc07vsdllq";
+  cargoSha256 = "1g2jijx8y34lid9qwa26v4svab5v9ki6gn9vcfiy61dqa964c3l9";
 
   nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ];
 

From f6863c9f5d7f1198a6d0258ab4e76b111ca7806d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 03:09:39 +0000
Subject: [PATCH 0769/3942] gitlab-pages: 1.21.0 -> 1.28.0

---
 pkgs/servers/http/gitlab-pages/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix
index 441dba9fb7b5..bef6744d1312 100644
--- a/pkgs/servers/http/gitlab-pages/default.nix
+++ b/pkgs/servers/http/gitlab-pages/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "1.21.0";
+  version = "1.28.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    sha256 = "0f317lx4iarlsbnq2ipcm4lpx66xzl8wfilj8xajq1csz19ws24z";
+    sha256 = "15q32blkhmc5w1b2xh45y7cag8f6bw9bgiwin5ykrzj5d305wd16";
   };
 
-  vendorSha256 = "186rxvl523n1d87jz4zzbj83ikzw9d0c1wrj78xs4iqzm8z3snh0";
+  vendorSha256 = "1gzkb2j2hl6ln8i5wjk2n9g8agpdzy1pzghb4sy1r8pdfp0i28r3";
   subPackages = [ "." ];
   doCheck = false; # Broken
 

From bb1b9c501df8fff9aab67453d5a5d71d3e5dfe88 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 03:50:30 +0000
Subject: [PATCH 0770/3942] tmuxp: 1.5.6 -> 1.5.8

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

diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index a118195d4706..515d7001fbc7 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -4,11 +4,11 @@ with python.pkgs;
 
 buildPythonApplication rec {
   pname = "tmuxp";
-  version = "1.5.6";
+  version = "1.5.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c305fc45bbf1093561e03cdcd37b2ab1f2efb9e208e74b2dc294cf414859bd8a";
+    sha256 = "09b403c9e1ef50695fab1e72376ff5674906b485fbcaad50c7cafec1ba775087";
   };
 
   postPatch = ''

From 7bbbfc47fdf72be598c6a9c4eb0b778b28a8d3c9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Nov 2020 04:20:00 +0000
Subject: [PATCH 0771/3942] vault: 1.5.4 -> 1.5.5

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

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 9e5f48c46f10..b8fa53a057e1 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "vault";
-  version = "1.5.4";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "0bin0r0qmyz8xal910csbclzc6ng2xv69jszyi69gd6n6f43vqw8";
+    sha256 = "144v7vmp2amv29y6d50jzc21zrcw0g6qlwks16mvqy2hnbsnzdwa";
   };
 
   goPackagePath = "github.com/hashicorp/vault";

From dc2e926ba3487679b76dc87b74740d97f80ded1c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Nov 2020 04:20:00 +0000
Subject: [PATCH 0772/3942] mkcert: 1.4.1 -> 1.4.2

https://github.com/FiloSottile/mkcert/releases/tag/v1.4.2
---
 pkgs/development/tools/misc/mkcert/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix
index ec4042a2a276..5cb1d9a38ace 100644
--- a/pkgs/development/tools/misc/mkcert/default.nix
+++ b/pkgs/development/tools/misc/mkcert/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "mkcert";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "FiloSottile";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0w1ji96hbd3anzsz82xjcafsqhgyz7c7n41rsq60yrllwbj5946f";
+    sha256 = "0g85vpkfgkc7nzjl3asl2f4ncsh12naf2fkr0mvyihfmfy9fz0fw";
   };
 
   vendorSha256 = "0b8ggdpbyxx5n2myhchhlwmm5nndwpykp1ylnzdyw12mdskfvn9h";
@@ -16,7 +16,7 @@ buildGoModule rec {
   doCheck = false;
 
   buildFlagsArray = ''
-    -ldflags=-X main.Version=v${version}
+    -ldflags=-s -w -X main.Version=v${version}
   '';
 
   meta = with lib; {

From 9578b4a66c8f7381c31b20f766f2d9286c2d80e8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Nov 2020 04:20:00 +0000
Subject: [PATCH 0773/3942] vault-bin: 1.5.4 -> 1.5.5

---
 pkgs/tools/security/vault/vault-bin.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index 457d45111a07..6cc6e170302c 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -1,30 +1,30 @@
 { stdenv, fetchurl, unzip }:
 
 let
-  version = "1.5.4";
+  version = "1.5.5";
 
   sources = let
     base = "https://releases.hashicorp.com/vault/${version}";
   in {
     x86_64-linux = fetchurl {
       url = "${base}/vault_${version}_linux_amd64.zip";
-      sha256 = "1cyk9v70w0px2sxg8dichqgk38br9hc4kdl37jk57ci5gdl6w5ah";
+      sha256 = "1vg1c34d2ck2a96p800gblq06jakg29yzrczaa6nsmnnr3k5hs9a";
     };
     i686-linux = fetchurl {
       url = "${base}/vault_${version}_linux_386.zip";
-      sha256 = "1n6hmhd4g2c6zzbimslxpghma5dyqwb96w60srbf9gn2vrimg4l4";
+      sha256 = "1hf46mm7shvq9gpi50b6hcp2cydhzbkwigqcnl527y4cvc9iv7in";
     };
     x86_64-darwin = fetchurl {
       url = "${base}/vault_${version}_darwin_amd64.zip";
-      sha256 = "05d5m8kdwl6mcx3swkasm5zcmddlyl6m9lwj26vbg9pllx9zxvqm";
+      sha256 = "1jna9rmdhqi7j8p67y9dzq716dv8fn4rjsn76mbvlgc5wylky6gz";
     };
     i686-darwin = fetchurl {
       url = "${base}/vault_${version}_darwin_386.zip";
-      sha256 = "109hisdwd58za541qhw61bscfrh3szzfn8vdmr4c7nh5praiqznb";
+      sha256 = "1qv02zd5dwaw1i52pnbyshbd8cy0x5nr3f2s9l3p9ci5rzad4rjn";
     };
     aarch64-linux = fetchurl {
       url = "${base}/vault_${version}_linux_arm64.zip";
-      sha256 = "0q8icl5ncvixrdmsd2ilzvpa6c1pswa6zgh3vccsj7sg8mxprjmr";
+      sha256 = "1y4i62qq5cx2bv18dnbgys2qa5xx0acn8j3hdh0dbsw0zyms4qv7";
     };
   };
 

From dbc3eda9d910acc48251c057f8295b6be1c84ba4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Nov 2020 04:20:00 +0000
Subject: [PATCH 0774/3942] sudo-font: 0.51 -> 0.52

---
 pkgs/data/fonts/sudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix
index fab252af458b..f21fdb184161 100644
--- a/pkgs/data/fonts/sudo/default.nix
+++ b/pkgs/data/fonts/sudo/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchzip }:
 
 let
-  version = "0.51";
+  version = "0.52";
 in fetchzip {
   name = "sudo-font-${version}";
   url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
-  sha256 = "19m132183w5hrc5qvlb6cj38hir2302cqiljlfc72qdlb8al6fwi";
+  sha256 = "1j5p7apclyy5gfj2kklmgcncdsp5iik4gd6mdl29anzijknd0kja";
 
   postFetch = ''
     mkdir -p $out/share/fonts/

From 5da63dd70dfab4161449ccf980cd3357ebebdd14 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 1 Nov 2020 06:04:50 +0100
Subject: [PATCH 0775/3942] geonkick: 2.4.0 -> 2.5.0

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

diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix
index 0da00d319720..8064c7607466 100644
--- a/pkgs/applications/audio/geonkick/default.nix
+++ b/pkgs/applications/audio/geonkick/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "geonkick";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitLab {
     owner = "iurie-sw";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ibsfyzkvzijv929p91db56gaxm582b7nikbn10wbbjvv4f46mmj";
+    sha256 = "19zbz4v2n5ph4af721xls7ignmis2q2yqyd0m97g9b3njrgnfy3n";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 682d96df88cfb6230be95cd00a241a61987c7ed8 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 31 Oct 2020 21:44:05 -0300
Subject: [PATCH 0776/3942] cde: update expression

The old Github repository (pgbovine/CDE) was deleted; usnistgov/corr-CDE is an
alternative fork.
---
 pkgs/tools/package-management/cde/default.nix | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix
index ec6ad6eb55ab..957919e26001 100644
--- a/pkgs/tools/package-management/cde/default.nix
+++ b/pkgs/tools/package-management/cde/default.nix
@@ -5,10 +5,10 @@ stdenv.mkDerivation rec {
   version = "0.1";
 
   src = fetchFromGitHub {
-    owner = "pgbovine";
-    repo = "CDE";
-    sha256 = "0raiz7pczkbnzxpg7g59v7gdp1ipkwgms2vh3431snw1va1gjzmk";
+    owner = "usnistgov";
+    repo = "corr-CDE";
     rev = "v${version}";
+    sha256 = "sha256-s375gtqBWx0GGXALXR+fN4bb3tmpvPNu/3bNz+75UWU=";
   };
 
   # The build is small, so there should be no problem
@@ -18,19 +18,22 @@ stdenv.mkDerivation rec {
   preferLocalBuild = true;
 
   patchBuild = ''
-    sed '/install/d' $src/Makefile > $src/Makefile
+    sed -i -e '/install/d' $src/Makefile
   '';
-  
+
+  preBuild = ''
+    patchShebangs .
+  '';
+
   installPhase = ''
-    mkdir -p $out/bin
-    cp cde $out/bin
-    cp cde-exec $out/bin
+    install -d $out/bin
+    install -t $out/bin cde cde-exec
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/pgbovine/CDE";
+    homepage = "https://pg.ucsd.edu/cde/manual/";
     description = "A packaging tool for building portable packages";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     maintainers = [ maintainers.rlupton20 ];
     platforms = platforms.linux;
     # error: architecture aarch64 is not supported by strace

From 89fb549f7caf936a32ec33f09f62b86f4d559896 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 05:44:56 +0000
Subject: [PATCH 0777/3942] bdf2sfd: 1.1.4 -> 1.1.5

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

diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix
index 096164990458..728967ec3da8 100644
--- a/pkgs/tools/misc/bdf2sfd/default.nix
+++ b/pkgs/tools/misc/bdf2sfd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bdf2sfd";
-  version = "1.1.4";
+  version = "1.1.5";
 
   src = fetchFromGitHub {
     owner = "fcambus";
     repo = pname;
     rev = version;
-    sha256 = "1lg3yabnf26lghlrmhpq7hbhydmw85q0k64246b8fwv1dnxc7afd";
+    sha256 = "1bpadw25barzmmsz9bkrsj3iwbgf945zqfakbgq1yscfb85bfgsp";
   };
 
   nativeBuildInputs = [ cmake ];

From a98a24fe1525f2c4fe87cd0bd4e96d3685ac47e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 07:07:58 +0000
Subject: [PATCH 0778/3942] cargo-outdated: 0.9.11 -> 0.9.13

---
 pkgs/tools/package-management/cargo-outdated/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix
index 5d4eef2fbe5a..185cba66e311 100644
--- a/pkgs/tools/package-management/cargo-outdated/default.nix
+++ b/pkgs/tools/package-management/cargo-outdated/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-outdated";
-  version = "0.9.11";
+  version = "0.9.13";
 
   src = fetchFromGitHub {
     owner = "kbknapp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "11fdh24366czb3vv2szf5bl0mhsilwvpfc1h4qxq18z2dpb0y18m";
+    sha256 = "1dbhaaw1c3ww0s33r7z8kxks00f9gxv1ppcbmk2fbflhp7caf7fy";
   };
 
-  cargoSha256 = "0sr3ijq6vh2269xav03d117kzmg68xiwqsq48xjdrsnn4dx5lizy";
+  cargoSha256 = "0nlfn9g7hrzz72lya2p5qb8wwj66300d33hjhnw2ambpj4347rh4";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ]

From 4f8477a28f8c033e2ae710f46116c5593af2cdad Mon Sep 17 00:00:00 2001
From: "Bryan A. S" <bryanasdev000@gmail.com>
Date: Sun, 1 Nov 2020 04:10:08 -0300
Subject: [PATCH 0779/3942] popeye: 0.8.10 -> 0.9.0

Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
---
 .../applications/networking/cluster/popeye/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix
index ff180bdc9b2f..6e7eccac2063 100644
--- a/pkgs/applications/networking/cluster/popeye/default.nix
+++ b/pkgs/applications/networking/cluster/popeye/default.nix
@@ -2,24 +2,24 @@
 
 buildGoModule rec {
   pname = "popeye";
-  version = "0.8.10";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "derailed";
     repo = "popeye";
-    sha256 = "1cx39xipvvhb12nhvg7kfssnqafajni662b070ynlw8p870bj0sn";
+    sha256 = "1rslmcdjs53zvv0xaf00vxqsfc3jh2p584j3q6nfgrghc978xmpf";
   };
 
   buildFlagsArray = ''
     -ldflags=
       -s -w
       -X github.com/derailed/popeye/cmd.version=${version}
-      -X github.com/derailed/popeye/cmd.commit=b7a876eafd4f7ec5683808d8d6880c41c805056a
-      -X github.com/derailed/popeye/cmd.date=2020-08-25T23:02:30Z
+      -X github.com/derailed/popeye/cmd.commit=022c3104b642aab6bdb287468fb79068a33e1b0d
+      -X github.com/derailed/popeye/cmd.date=2020-10-31T16:44:45Z
   '';
 
-  vendorSha256 = "0b2bawc9wnqwgvrv614rq5y4ns9di65zqcbb199y2ijpsaw5d9a7";
+  vendorSha256 = "08195dnka7rs38py3kjii9zh9nifg2fnbi1wzjl0pc38i2bbrz0k";
 
   doCheck = false;
 

From d6ba21adf4fb175d6cd4d3ce753f4fe2315c0907 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 07:31:26 +0000
Subject: [PATCH 0780/3942] checkstyle: 8.36.2 -> 8.37

---
 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 7e468f44b1ae..1e2b435fd082 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "8.36.2";
+  version = "8.37";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "05yb3020q0r75ggh0nm56yj45ha2ppyhbnjn34wqpadi842pzpfh";
+    sha256 = "1xhindlq46d5878mkbxc3f6fx6i00kqbj2aymlg0022v9h6r1p9p";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From de694b3a14dc9787c87cae53933fbf7ccb6eb463 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Sun, 1 Nov 2020 16:34:16 +0900
Subject: [PATCH 0781/3942] sozu: 0.11.46 -> 0.11.50; fix Darwin build

---
 pkgs/servers/sozu/default.nix | 36 +++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix
index 1e8083587055..16561da7d297 100644
--- a/pkgs/servers/sozu/default.nix
+++ b/pkgs/servers/sozu/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, rustPlatform, fetchFromGitHub }:
+{ stdenv, rustPlatform, fetchFromGitHub, darwin }:
 
 rustPlatform.buildRustPackage rec {
-    pname = "sozu";
-    version = "0.11.46";
+  pname = "sozu";
+  version = "0.11.50";
 
-    src = fetchFromGitHub {
-        owner = "sozu-proxy";
-        repo = pname;
-        rev = version;
-        sha256 = "0anng5qvdx9plxs9qqr5wmjjz0gx5113jq28xwbxaaklvd4ni7cm";
-    };
+  src = fetchFromGitHub {
+    owner = "sozu-proxy";
+    repo = pname;
+    rev = version;
+    sha256 = "1srg2b8vwc4vp07kg4fizqj1rbm9hvf6hj1mjdh6yvb9cpbw3jz7";
+  };
 
-    cargoSha256 = "19c2s9h4jk9pff72wdqw384mvrf40d8x4sx7qysnpb4hayq2ijh3";
+  cargoSha256 = "5WOigCiQZQ5DaTd15vV8pUh8Xl3UIe9yLG1ptUtY+iA=";
 
-    meta = with stdenv.lib; {
-        description = "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures";
-        homepage = "https://sozu.io";
-        license = licenses.agpl3;
-        maintainers = with maintainers; [ filalex77 ];
-    };
+  buildInputs =
+    stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+
+  meta = with stdenv.lib; {
+    description =
+      "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures";
+    homepage = "https://www.sozu.io";
+    license = licenses.agpl3;
+    maintainers = with maintainers; [ filalex77 ];
+  };
 }

From 0444c91a3b289c4ea5de46eef2dbe98fe66f5c63 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Oct 2020 21:35:17 +0800
Subject: [PATCH 0782/3942] pev: 2018-07-22 -> 2020-05-23

---
 .../tools/analysis/pev/default.nix            | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix
index c7e2e27bece4..42e382c8bcad 100644
--- a/pkgs/development/tools/analysis/pev/default.nix
+++ b/pkgs/development/tools/analysis/pev/default.nix
@@ -1,24 +1,30 @@
 { stdenv, openssl, fetchFromGitHub }:
+
 stdenv.mkDerivation {
-  name = "pev-unstable-2018-07-22";
-  buildInputs = [ openssl ];
+  pname = "pev";
+  version = "unstable-2020-05-23";
+
   src = fetchFromGitHub {
     owner = "merces";
     repo = "pev";
-    rev = "aa4ef7f";
-    sha256 = "00a3g486343lhqcsf4vrdy5xif6v3cgcf2y8yp5b96x15c0wid36";
+    rev = "beec2b4f09585fea919ed41ce466dee06be0b6bf";
+    sha256 = "sha256-HrMbk9YbuqkoBBM7+rfXpqVEnd1rDl2rMePdcfU1WDg=";
     fetchSubmodules = true;
   };
 
+  buildInputs = [ openssl ];
+
+  enableParallelBuilding = true;
+
   makeFlags = [ "prefix=$(out)" ];
+
   installFlags = [ "prefix=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "A full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries";
-    homepage = "http://pev.sourceforge.net/";
+    homepage = "https://pev.sourceforge.net/";
     license = licenses.gpl2;
+    maintainers = with maintainers; [ jeschli ];
     platforms = platforms.linux;
-    maintainers = [ maintainers.jeschli ];
   };
-
 }

From 1ab35e7e64ea7d5b4b15711fde3350685ba016ff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 07:37:17 +0000
Subject: [PATCH 0783/3942] chezmoi: 1.8.7 -> 1.8.8

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

diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index 448c0859c575..95e1f0592eef 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "chezmoi";
-  version = "1.8.7";
+  version = "1.8.8";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     rev = "v${version}";
-    sha256 = "1inmrcp01rxrjylkj9vzgw3q713q6jsqbnqllbzvp8q6kqfliayg";
+    sha256 = "1ax0rq341k8mi7lghw1rkmlg802fd22zpql5v3g6lhgy6s1xq9wk";
   };
 
-  vendorSha256 = "0m946g6iw42q5ggki2j1lqdshpsxjmdsm1snnyzjzyy8gd88m4cx";
+  vendorSha256 = "08x81r9y2x1xcld1s6maspq94wr817w9aqjdv226058ran0492s8";
 
   doCheck = false;
 

From e945bd753c49bdd5fd285f52c66b9e2cc01c21d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 07:54:34 +0000
Subject: [PATCH 0784/3942] compactor: 0.12.2 -> 1.0.0

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

diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index 5d9a658972c3..97a2f6992f9a 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "compactor";
-  version = "0.12.2";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "dns-stats";
     repo = pname;
     rev = version;
-    sha256 = "17p9wsslsh6ifnadvyygr0cgir4q4iirxfz9zpkpbhh76cx2qnay";
+    sha256 = "0x5rwbv0ndf9zcvnsbd78ic6shh9hd0bh3gh0lzz9wlb99lslbkk";
   };
 
   # cbor-diag, cddl and wireshark-cli are only used for tests.

From f3370e061b36483937256d238b38a46feb637bbb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 08:47:11 +0000
Subject: [PATCH 0785/3942] doppler: 3.15.0 -> 3.16.0

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

diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix
index 8858fb15758c..2492390bdd83 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/tools/security/doppler/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "doppler";
-  version = "3.15.0";
+  version = "3.16.0";
 
   src = fetchFromGitHub {
     owner = "dopplerhq";
     repo = "cli";
     rev = version;
-    sha256 = "06icddb99ahmi5djrslpqsjjd38agvkhnfls5wqahclf0j4dylr6";
+    sha256 = "1hypi62bzdpa55bd9z9lvisw7ybcn8jlk0kyck9h7wc2ll59jzwx";
   };
 
-  vendorSha256 = "0wqbwk72k4r30a3vnf0gnx3k97y8xgnr2iavk5bc8f8vkjv0bsv6";
+  vendorSha256 = "1s8zwjfk9kcddn8cywr7llh9v5m140kvmi5lmy2glvwh3rwccgxf";
 
   buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}";
 

From 2029ca3791cd2fcd293d4b05620b3559eba4c785 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Tue, 20 Oct 2020 21:11:57 +0000
Subject: [PATCH 0786/3942] ghostscript: 9.52 -> 9.53.3

https://www.ghostscript.com/doc/9.53.3/News.htm
---
 ...2364-Fix-missing-echogs-dependencies.patch | 835 ------------------
 pkgs/misc/ghostscript/default.nix             |  17 +-
 2 files changed, 7 insertions(+), 845 deletions(-)
 delete mode 100644 pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch

diff --git a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch
deleted file mode 100644
index dd31260302c6..000000000000
--- a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch
+++ /dev/null
@@ -1,835 +0,0 @@
---- a/contrib/contrib.mak	2020-03-19 09:21:42.000000000 +0100
-+++ b/contrib/contrib.mak	2020-05-14 13:41:03.202258445 +0200
-@@ -22,6 +22,10 @@
- CONTRIB_MAK=$(CONTRIBDIR)$(D)contrib.mak $(TOP_MAKEFILES)
- CONTRIBSRC=$(CONTRIBDIR)$(D)
- 
-+# Almost all device drivers depend on the following:
-+CONTDEVH=$(gserrors_h) $(gx_h) $(gxdevice_h)
-+CONTDEV=$(AK) $(ECHOGS_XE) $(GDEVH)
-+
- ###### --------------------------- Catalog -------------------------- ######
- 
- # The following drivers are user-contributed, and maintained (if at all) by
-@@ -185,19 +189,19 @@
- 	$(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c
- 
- $(DD)bjcmono.dev : $(bjc_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bjcmono $(bjc_)
- 
- $(DD)bjcgray.dev : $(bjc_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bjcgray $(bjc_)
- 
- $(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bjccmyk $(bjc_)
- 
- $(DD)bjccolor.dev : $(bjc_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bjccolor $(bjc_)
- 
- 
-@@ -208,25 +212,25 @@
- # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
- # Printer: HP 670
- $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdj670 $(cdeskjet8_)
- 
- # Author: Uli Wortmann (uliw@erdw.ethz.ch)
- # Printer: HP 850
- $(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdj850 $(cdeskjet8_)
- 
- # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
- # Printer: HP 890
- $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdj890 $(cdeskjet8_)
- 
- # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
- # Printer: HP 1600
- $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
- 
- $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\
-@@ -244,7 +248,8 @@
- 
- # Author: Matthew Gelhaus (mgelhaus@proaxis.com)
- # Printer: HP 880c
--$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev
-+$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev $(CONTDEV) \
-+                  $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdj880 $(cdeskjet8_)
- 
- 
-@@ -255,7 +260,7 @@
- # Author: Rene Harsch (rene@harsch.net)
- # Printer: HP 970Cxi
- $(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdj970 $(cdeskjet9_)
- 
- $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\
-@@ -268,7 +273,7 @@
- ### NOTE:  Same as chp2200 (some PJL and CRD changes).
- 
- $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_)
- 
- 
-@@ -277,7 +282,7 @@
- ### NOTE:  Depends on the presence of the cdj850 section.
- 
- $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV2) $(DD)chp2200 $(cdeskjet8_)
- 
- 
-@@ -288,11 +293,11 @@
- GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL)
- 
- $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)gdi $(GDIMONO)
- 
- $(DD)samsunggdi.dev : $(GDIMONO) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)samsunggdi $(GDIMONO)
- 
- $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \
-@@ -306,17 +311,17 @@
- 
- hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM)
- $(DD)hl1250.dev : $(hl1250_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hl1250 $(hl1250_)
- 
- $(DD)hl1240.dev : $(hl1250_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hl1240 $(hl1250_)
- 
- # Author: Marek Michalkiewicz <marekm@linux.org.pl>
- # Printer: Brother HL-1250 (may work with some other models too)
- $(DEVOBJ)gdevhl12.$(OBJ) : $(CONTRIBSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h) \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c
- 
- 
-@@ -327,37 +332,37 @@
- # Author: Ulrich Mueller (ulm@vsnhd1.cern.ch)
- # Printer: DEC LN03
- $(DD)ln03.dev : $(ln03_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)ln03 $(ln03_)
- 
- # Author: Nick Brown (nick.brown@coe.int)
- # Printer: DEClaser 2100
- $(DD)dl2100.dev : $(ln03_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)dl2100 $(ln03_)
- 
- # Author: Ian MacPhedran (macphed@dvinci.USask.CA)
- # Printer: DEC LA50
- $(DD)la50.dev : $(ln03_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                          $(CONTDEV)  $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)la50 $(ln03_)
- 
- # Author: Bruce Lowekamp (lowekamp@csugrad.cs.vt.edu)
- # Printer: DEC LA70
- $(DD)la70.dev : $(ln03_) $(DD)page.dev \
--                         $(CONTRIB_MAK) $(MAKEDIRS)
-+                         $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)la70 $(ln03_)
- 
- # Author: Ian MacPhedran (macphed@dvinci.USask.CA)
- # Printer: DEC LA75
- $(DD)la75.dev : $(ln03_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)la75 $(ln03_)
- 
- # Author: Andre' Beck (Andre_Beck@IRS.Inf.TU-Dresden.de)
- # Printer: DEC LA75plus
- $(DD)la75plus.dev : $(ln03_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)la75plus $(ln03_)
- 
- $(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH) \
-@@ -380,233 +385,233 @@
- 	$(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c
- 
- $(DD)alc1900.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc1900 $(escv_)
- 
- $(DD)alc2000.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc2000 $(escv_)
- 
- $(DD)alc4000.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc4000 $(escv_)
- 
- $(DD)alc4100.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc4100 $(escv_)
- 
- $(DD)alc8500.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc8500 $(escv_)
- 
- $(DD)alc8600.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc8600 $(escv_)
- 
- $(DD)alc9100.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)alc9100 $(escv_)
- 
- $(DD)lp3000c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp3000c $(escv_)
- 
- $(DD)lp8000c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8000c $(escv_)
- 
- $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8200c $(escv_)
- 
- $(DD)lp8300c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8300c $(escv_)
- 
- $(DD)lp8500c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8500c $(escv_)
- 
- $(DD)lp8800c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8800c $(escv_)
- 
- $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9000c $(escv_)
- 
- $(DD)lp9200c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9200c $(escv_)
- 
- $(DD)lp9500c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9500c $(escv_)
- 
- $(DD)lp9800c.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9800c $(escv_)
- 
- $(DD)lps6500.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lps6500 $(escv_)
- 
- $(DD)epl2050.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl2050 $(escv_)
- 
- $(DD)epl2050p.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl2050p $(escv_)
- 
- $(DD)epl2120.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl2120 $(escv_)
- 
- $(DD)epl2500.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl2500 $(escv_)
- 
- $(DD)epl2750.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl2750 $(escv_)
- 
- $(DD)epl5800.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl5800 $(escv_)
- 
- $(DD)epl5900.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl5900 $(escv_)
- 
- $(DD)epl6100.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl6100 $(escv_)
- 
- $(DD)epl6200.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)epl6200 $(escv_)
- 
- $(DD)lp1800.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp1800 $(escv_)
- 
- $(DD)lp1900.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp1900 $(escv_)
- 
- $(DD)lp2200.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp2200 $(escv_)
- 
- $(DD)lp2400.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp2400 $(escv_)
- 
- $(DD)lp2500.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp2500 $(escv_)
- 
- $(DD)lp7500.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp7500 $(escv_)
- 
- $(DD)lp7700.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp7700 $(escv_)
- 
- $(DD)lp7900.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                          $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp7900 $(escv_)
- 
- $(DD)lp8100.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8100 $(escv_)
- 
- $(DD)lp8300f.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8300f $(escv_)
- 
- $(DD)lp8400f.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8400f $(escv_)
- 
- $(DD)lp8600.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8600 $(escv_)
- 
- $(DD)lp8600f.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8600f $(escv_)
- 
- $(DD)lp8700.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8700 $(escv_)
- 
- $(DD)lp8900.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp8900 $(escv_)
- 
- $(DD)lp9000b.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9000b $(escv_)
- 
- $(DD)lp9100.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9100 $(escv_)
- 
- $(DD)lp9200b.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9200b $(escv_)
- 
- $(DD)lp9300.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9300 $(escv_)
- 
- $(DD)lp9400.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9400 $(escv_)
- 
- $(DD)lp9600.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9600 $(escv_)
- 
- $(DD)lp9600s.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp9600s $(escv_)
- 
- $(DD)lps4500.dev : $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lps4500 $(escv_)
- 
- $(DD)eplcolor.dev: $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)eplcolor $(escv_)
- 
- $(DD)eplmono.dev: $(escv_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)eplmono $(escv_)
- 
- # ------ The Lexmark 5700 and 7000 devices ------ #
- 
- lex7000_=$(DEVOBJ)gdevlx7.$(OBJ)
- $(DD)lex7000.dev : $(lex7000_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lex7000 $(lex7000_)
- 
- lex5700_=$(DEVOBJ)gdevlx7.$(OBJ)
- $(DD)lex5700.dev : $(lex5700_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lex5700 $(lex5700_)
- 
- lex3200_=$(DEVOBJ)gdevlx7.$(OBJ)
- $(DD)lex3200.dev : $(lex3200_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lex3200 $(lex3200_)
- 
- lex2050_=$(DEVOBJ)gdevlx7.$(OBJ)
- $(DD)lex2050.dev : $(lex2050_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lex2050 $(lex2050_)
- 
- $(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH) \
-@@ -623,7 +628,7 @@
- 	$(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c
- 
- $(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lxm3200 $(lxm3200_)
- 
- 
-@@ -649,13 +654,13 @@
- 	$(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c
- 
- $(DD)lips4.dev : $(lipsr_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lips4 $(lipsr_)
- 
- lipsv_=$(DEVOBJ)gdevl4v.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ)
- 
- $(DD)lips4v.dev : $(ECHOGS_XE) $(lipsv_) $(DD)vector.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETDEV) $(DD)lips4v $(lipsv_)
- 	$(ADDMOD) $(DD)lips4v -include $(GLD)vector
- 
-@@ -668,11 +673,11 @@
- ### --------------- Some extra devices: lips2p, bjc880j ---------------- ###
- 
- $(DD)lips2p.dev : $(lipsr_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lips2p $(lipsr_)
- 
- $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bjc880j $(lipsr_)
- 
- 
-@@ -681,15 +686,15 @@
- md2k_=$(DEVOBJ)gdevmd2k.$(OBJ)
- 
- $(DD)md2k.dev : $(md2k_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)md2k $(md2k_)
- 
- $(DD)md5k.dev : $(md2k_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)md5k $(md2k_)
- 
- $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c
-  
- 
-@@ -697,7 +702,7 @@
- 
- oki4w_=$(DEVOBJ)gdevop4w.$(OBJ)
- $(DD)oki4w.dev : $(oki4w_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)oki4w $(oki4w_)
- 
- # Author: Ivan Schreter (ivan@shadow.sk)
-@@ -720,11 +725,11 @@
- 	$(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c
- 
- $(DD)opvp.dev : $(opvp_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)opvp $(opvp_)
- 
- $(DD)oprp.dev : $(opvp_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)oprp $(opvp_)
- 
- 
-@@ -901,78 +906,78 @@
- 
- # The generic pcl3 device with selectable subdevices
- $(DD)pcl3.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)pcl3 $(pcl3_)
- 
- # Fixed devices for specific printers
- $(DD)hpdjplus.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdjplus $(pcl3_)
- $(DD)hpdjportable.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdjportable $(pcl3_)
- $(DD)hpdj310.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj310 $(pcl3_)
- $(DD)hpdj320.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj320 $(pcl3_)
- $(DD)hpdj340.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj340 $(pcl3_)
- $(DD)hpdj400.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj400 $(pcl3_)
- $(DD)hpdj500.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj500 $(pcl3_)
- $(DD)hpdj500c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj500c $(pcl3_)
- $(DD)hpdj510.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj510 $(pcl3_)
- $(DD)hpdj520.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj520 $(pcl3_)
- $(DD)hpdj540.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj540 $(pcl3_)
- $(DD)hpdj550c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj550c $(pcl3_)
- $(DD)hpdj560c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj560c $(pcl3_)
- $(DD)hpdj600.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj600 $(pcl3_)
- $(DD)hpdj660c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj660c $(pcl3_)
- $(DD)hpdj670c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj670c $(pcl3_)
- $(DD)hpdj680c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj680c $(pcl3_)
- $(DD)hpdj690c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj690c $(pcl3_)
- $(DD)hpdj850c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj850c $(pcl3_)
- $(DD)hpdj855c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj855c $(pcl3_)
- $(DD)hpdj870c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj870c $(pcl3_)
- $(DD)hpdj890c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj890c $(pcl3_)
- $(DD)hpdj1120c.dev : $(pcl3_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)hpdj1120c $(pcl3_)
- 
- #------------------------------------------------------------------------------
-@@ -1009,7 +1014,7 @@
- 
- xes_=$(DEVOBJ)gdevxes.$(OBJ)
- $(DD)xes.dev : $(xes_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)xes $(xes_)
- 
- # Author: Peter Flass (flass@lbdrscs.bitnet)
-@@ -1029,16 +1034,16 @@
- 
- pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
--$(DD)pr201.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
-+$(DD)pr201.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)pr201 $(pr201_)
- 
--$(DD)pr150.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
-+$(DD)pr150.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)pr150 $(pr201_)
- 
--$(DD)pr1000.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
-+$(DD)pr1000.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)pr1000 $(pr201_)
- 
--$(DD)pr1000_4.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
-+$(DD)pr1000_4.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)pr1000_4 $(pr201_)
- 
- $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \
-@@ -1049,7 +1054,7 @@
- 
- jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
--$(DD)jj100.dev : $(jj100_) $(CONTRIB_MAK) $(MAKEDIRS)
-+$(DD)jj100.dev : $(jj100_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)jj100 $(jj100_)
- 
- $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \
-@@ -1061,11 +1066,11 @@
- bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
- $(DD)bj10v.dev : $(bj10v_) \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bj10v $(bj10v_)
- 
- $(DD)bj10vh.dev : $(bj10v_) \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)bj10vh $(bj10v_)
- 
- # Uncomment the following line if you are using MS-DOS on PC9801 series.
-@@ -1080,7 +1085,7 @@
- dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
- $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETDEV) $(DD)dmprt $(dmprt_)
- 	$(ADDMOD) $(DD)dmprt -ps dmp_init
- 
-@@ -1110,19 +1115,19 @@
- 	$(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c
- 
- $(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)mj700v2c $(mj700v2c_)
- 
- $(DD)mj500c.dev : $(mj700v2c_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)mj500c $(mj700v2c_)
- 
- $(DD)mj6000c.dev : $(mj700v2c_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)mj6000c $(mj700v2c_)
- 
- $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)mj8000c $(mj700v2c_)
- 
- ### ----------------- The Fujitsu FMPR printer device ----------------- ###
-@@ -1130,7 +1135,7 @@
- fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
- $(DD)fmpr.dev : $(fmpr_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)fmpr $(fmpr_)
- 
- $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \
-@@ -1142,7 +1147,7 @@
- fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
- $(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)fmlbp $(fmlbp_)
- 
- $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \
-@@ -1159,7 +1164,7 @@
- ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
- 
- $(DD)ml600.dev : $(ml6_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)ml600 $(ml6_)
- 
- $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \
-@@ -1172,11 +1177,11 @@
- lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ)
- 
- $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lbp310 $(lbp3x0_)
- 
- $(DD)lbp320.dev :$(lbp3x0_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lbp320 $(lbp3x0_)
- 
- $(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH)
-@@ -1191,7 +1196,7 @@
- 	$(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c
- 
- $(DD)npdl.dev : $(npdl_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)npdl $(npdl_)
- 
- ### ------- EPSON ESC/Page printer device ----------------- ###
-@@ -1203,11 +1208,11 @@
- 	$(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c
- 
- $(DD)escpage.dev : $(escpage_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)escpage $(escpage_)
- 
- $(DD)lp2000.dev : $(escpage_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)lp2000 $(escpage_)
- 
- ### --- The RICOH RPDL language printer device ------ ###
-@@ -1218,7 +1223,7 @@
- 	$(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c
- 
- $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)rpdl $(rpdl_)
- 
- ### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ###
-@@ -1240,15 +1245,15 @@
- alps_=$(DEVOBJ)gdevalps.$(OBJ)
- 
- $(DD)md50Mono.dev : $(alps_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)md50Mono $(alps_)
- 
- $(DD)md50Eco.dev : $(alps_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)md50Eco $(alps_)
- 
- $(DD)md1xMono.dev : $(alps_) $(DD)page.dev \
--                           $(CONTRIB_MAK) $(MAKEDIRS)
-+                           $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
- 	$(SETPDEV) $(DD)md1xMono $(alps_)
- 
- $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index d3d06d98cb13..573b7a80346f 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -9,9 +9,10 @@ assert x11Support -> xlibsWrapper != null;
 assert cupsSupport -> cups != null;
 
 let
-  version = "9.${ver_min}";
-  ver_min = "52";
-  sha512 = "1ksm3v4nw8acc4j817n44l1c65ijk0mr3mp4kryy17jz41bmzzql5d8vr40h59n9dmf8b2wmnbq45bj3an1zrpfagavlf0i9s436jjc";
+  version = "9.${ver_min}.${ver_patch}";
+  ver_min = "53";
+  ver_patch = "3";
+  sha512 = "2vif3vgxa5wma16yxvhhkymk4p309y5204yykarq94r5rk890556d2lj5w7acnaa2ymkym6y0zd4vq9sy9ca2346igg2c6dxqkjr0zb";
 
   fonts = stdenv.mkDerivation {
     name = "ghostscript-fonts";
@@ -40,21 +41,17 @@ stdenv.mkDerivation rec {
   inherit version;
 
   src = fetchurl {
-    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${pname}-${version}.tar.xz";
+    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}${ver_patch}/${pname}-${version}.tar.xz";
     inherit sha512;
   };
 
   patches = [
     (fetchpatch {
-      name = "CVE-2020-15900.patch";
-      url = "https://github.com/ArtifexSoftware/ghostpdl/commit/5d499272b95a6b890a1397e11d20937de000d31b.patch";
-      sha256 = "1nnnrn8q33x7nc8227ygc60f3mj4bjzrhj40sxp6dah58rb5x5jz";
+      url = "https://github.com/ArtifexSoftware/ghostpdl/commit/41ef9a0bc36b9db7115fbe9623f989bfb47bbade.patch";
+      sha256 = "1qpc6q1fpxshqc0mqgg36kng47kgljk50bmr8p7wn21jgfkh7m8w";
     })
     ./urw-font-files.patch
     ./doc-no-ref.diff
-    # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c,
-    # Remove on update to version > 9.52
-    ./0001-Bug-702364-Fix-missing-echogs-dependencies.patch
   ];
 
   outputs = [ "out" "man" "doc" ];

From 6b76a2d0043cb9ce7024d957e79394873dd86226 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Oct 2020 21:04:04 +0200
Subject: [PATCH 0787/3942] ghostscript: clean up

* Do not use pkgconfig alias.
* Move version & hash inline.
---
 pkgs/misc/ghostscript/default.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 573b7a80346f..5a7762640f73 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf
+{ config, stdenv, lib, fetchurl, pkg-config, zlib, expat, openssl, autoconf
 , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec
 , libiconv, ijs, lcms2, fetchpatch
 , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null
@@ -9,11 +9,6 @@ assert x11Support -> xlibsWrapper != null;
 assert cupsSupport -> cups != null;
 
 let
-  version = "9.${ver_min}.${ver_patch}";
-  ver_min = "53";
-  ver_patch = "3";
-  sha512 = "2vif3vgxa5wma16yxvhhkymk4p309y5204yykarq94r5rk890556d2lj5w7acnaa2ymkym6y0zd4vq9sy9ca2346igg2c6dxqkjr0zb";
-
   fonts = stdenv.mkDerivation {
     name = "ghostscript-fonts";
 
@@ -38,11 +33,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ghostscript";
-  inherit version;
+  version = "9.53.3";
 
   src = fetchurl {
-    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}${ver_patch}/${pname}-${version}.tar.xz";
-    inherit sha512;
+    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/${pname}-${version}.tar.xz";
+    sha512 = "2vif3vgxa5wma16yxvhhkymk4p309y5204yykarq94r5rk890556d2lj5w7acnaa2ymkym6y0zd4vq9sy9ca2346igg2c6dxqkjr0zb";
   };
 
   patches = [
@@ -58,7 +53,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig autoconf ];
+  nativeBuildInputs = [ pkg-config autoconf ];
   buildInputs =
     [ zlib expat openssl
       libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec
@@ -112,8 +107,6 @@ stdenv.mkDerivation rec {
     install_name_tool -change libgs.dylib.${version} $out/lib/libgs.dylib.${version} $out/bin/gs
   '';
 
-  passthru = { inherit version; };
-
   meta = {
     homepage = "https://www.ghostscript.com/";
     description = "PostScript interpreter (mainline version)";

From d18c016c2a1744ed6ae26d43a819a695a6fbbc5d Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Tue, 20 Oct 2020 21:05:28 +0000
Subject: [PATCH 0788/3942] jbig2dec: 0.18 -> 0.19

https://github.com/ArtifexSoftware/jbig2dec/blob/0.19/CHANGES
---
 pkgs/development/libraries/jbig2dec/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index a6eb56423954..4004c9f387ef 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jbig2dec";
-  version = "0.18";
+  version = "0.19";
 
   src = fetchurl {
-    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/${pname}-${version}.tar.gz";
-    sha256 = "0pigfw2v0ppvr0lbysm69gx0zsa5q2q92yrb8af2j3im6x97f6cy";
+    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/${pname}-${version}.tar.gz";
+    sha256 = "0dwa24kjqyg9hmm40fh048sdxfpnasz43l2rm8wlkw1qbdlpd517";
   };
 
   postPatch = ''

From efa79e6e535a56d6943ae6379f6a27138727b0a3 Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@speicherleck.de>
Date: Sun, 1 Nov 2020 10:33:06 +0100
Subject: [PATCH 0789/3942] agda-categories: fix hash

Apparently, v0.1.4 was released twice. The current version of the build
points to the first edition of v0.1.4, which is no longer attached to
the tag "v0.1.4" on GitHub. Hence currently, downloading fails.
This commit adjusts the hash to appropriately refer to the second
edition of v0.1.4
---
 pkgs/development/libraries/agda/agda-categories/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix
index f2215b9b9844..fb6cc7279671 100644
--- a/pkgs/development/libraries/agda/agda-categories/default.nix
+++ b/pkgs/development/libraries/agda/agda-categories/default.nix
@@ -8,7 +8,7 @@ mkDerivation rec {
     owner = "agda";
     repo = "agda-categories";
     rev = "v${version}";
-    sha256 = "0n6y9xarqhj95i4h56klx10gy0fyckxbfwgiissfknpfq6l0m7r6";
+    sha256 = "1bcvmxcnl1ig38fxqkx8ydidhxq6a0kn2k9waf0lygh4ap928sgk";
   };
 
   buildInputs = [ standard-library ];

From d54027f95c9bb56a4bfb54f86171e311954993c4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 09:39:21 +0000
Subject: [PATCH 0790/3942] flameshot: 0.8.4 -> 0.8.5

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

diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix
index de7d56e5584a..3dcf1e962691 100644
--- a/pkgs/tools/misc/flameshot/default.nix
+++ b/pkgs/tools/misc/flameshot/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "flameshot";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "flameshot-org";
     repo = "flameshot";
     rev = "v${version}";
-    sha256 = "0nr50ma8l612drl2br084kb3xac7jqkqr41b26d4p9y7ylwk05yq";
+    sha256 = "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191";
   };
 
   nativeBuildInputs = [ cmake qttools qtsvg ];

From fa45e8792dc6abe7649c09af38004000825ee326 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 09:49:56 +0000
Subject: [PATCH 0791/3942] fly: 6.6.0 -> 6.7.0

---
 pkgs/development/tools/continuous-integration/fly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix
index 1dcb247a4c8a..405ac1e26b06 100644
--- a/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "fly";
-  version = "6.6.0";
+  version = "6.7.0";
 
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
     rev = "v${version}";
-    sha256 = "09cfsq8vfjhavhqcydg0l3bi1g12y2p160yi2v0y5vk7ipiqyzrd";
+    sha256 = "0jc0hr0h1xya7avzxdwmvhnsm5cr3g21pig52draz5vjaya7bg55";
   };
 
   vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4";

From d1d536cc07f570b0322c2a49fb708b9c6df19034 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 30 Oct 2020 02:35:27 +0000
Subject: [PATCH 0792/3942] openblas: 0.3.10 -> 0.3.12

https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.11
https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.12
---
 ...mised-aarch64-dgemm_beta-pending-fix.patch | 26 -------------------
 .../science/math/openblas/default.nix         | 10 ++-----
 2 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch

diff --git a/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch b/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
deleted file mode 100644
index 1da1f3fb3190..000000000000
--- a/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6cb9aa7c69c20a677ca9fb1bc5fa1580e3236fbd Mon Sep 17 00:00:00 2001
-From: Tom Hall <tahall256@protonmail.ch>
-Date: Sat, 14 Mar 2020 11:55:45 +0000
-Subject: [PATCH] Disable optimised aarch64 dgemm_beta pending fix
-
-Identified as source of https://github.com/xianyi/OpenBLAS/issues/2496,
-but not yet fixed.
----
- kernel/arm64/KERNEL.ARMV8 | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/kernel/arm64/KERNEL.ARMV8 b/kernel/arm64/KERNEL.ARMV8
-index fe32d313..33d12f94 100644
---- a/kernel/arm64/KERNEL.ARMV8
-+++ b/kernel/arm64/KERNEL.ARMV8
-@@ -102,7 +102,6 @@ CDOTKERNEL     = zdot.S
- ZDOTKERNEL     = zdot.S
- DSDOTKERNEL    = dot.S
- 
--DGEMM_BETA     = dgemm_beta.S
- SGEMM_BETA     = sgemm_beta.S
- 
- SGEMMKERNEL    =  sgemm_kernel_$(SGEMM_UNROLL_M)x$(SGEMM_UNROLL_N).S
--- 
-2.24.1
-
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index b03e2b3a8ca8..d670a40f321d 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -106,7 +106,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openblas";
-  version = "0.3.10";
+  version = "0.3.12";
 
   outputs = [ "out" "dev" ];
 
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
     owner = "xianyi";
     repo = "OpenBLAS";
     rev = "v${version}";
-    sha256 = "174id98ga82bhz2v7sy9yj6pqy0h0088p3mkdikip69p9rh3d17b";
+    sha256 = "0mk1kjkr96bvvcq2zigzjrs0cnhwsf6gfi0855mp9yifn8lvp20y";
   };
 
   inherit blas64;
@@ -144,12 +144,6 @@ stdenv.mkDerivation rec {
     buildPackages.stdenv.cc
   ];
 
-  # Disable an optimisation which seems to cause issues, pending an
-  # upstream fix: https://github.com/xianyi/OpenBLAS/issues/2496
-  patches = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [
-    ./0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
-  ];
-
   makeFlags = mkMakeFlagsFromConfig (config // {
     FC = "${stdenv.cc.targetPrefix}gfortran";
     CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}";

From 7bf3d77ed667e9186dbe05526a60518c7340be68 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 28 Oct 2020 11:32:50 +0000
Subject: [PATCH 0793/3942] groff: set "operating system" for mdoc pages

Prior to this change, man pages from Nixpkgs written using the mdoc(7)
macros would start like this:

    NC(1)                   BSD General Commands Manual                   NC(1)

and end like this:

    BSD                          December 27, 2018                          BSD

No matter what operating system they were run on.

It's far more accurate to say "Nixpkgs General Commands Manual", so
with this patch we configure groff to do just that.  The variable is
called "operating-system", but I think it makes more sense to say
"Nixpkgs" than "NixOS" or something, because packages from Nixpkgs can
run on lots of operating systems, and the important thing is that the
package is from Nixpkgs.
---
 pkgs/tools/text/groff/site.tmac | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/text/groff/site.tmac b/pkgs/tools/text/groff/site.tmac
index 8ef1040ca4a0..776a7abb1da7 100644
--- a/pkgs/tools/text/groff/site.tmac
+++ b/pkgs/tools/text/groff/site.tmac
@@ -14,3 +14,6 @@
 .  if '\V[GROFF_SGR]'' \
 .    output x X tty: sgr 0
 .\}
+.
+.ds doc-default-operating-system Nixpkgs
+.ds doc-volume-operating-system Nixpkgs

From cbe6c27d220ddae9c4b29bb45f0bc97a7d0bc767 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 28 Oct 2020 14:53:44 +0100
Subject: [PATCH 0794/3942] hidapi: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix
index 11cdd0ab7e0c..356a0fe349df 100644
--- a/pkgs/development/libraries/hidapi/default.nix
+++ b/pkgs/development/libraries/hidapi/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hidapi";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "libusb";
     repo = "hidapi";
     rev = "${pname}-${version}";
-    sha256 = "1p4g8lgwj4rki6lbn5l6rvwj0xlbn1xfh4d255bg5pvgczmwmc4i";
+    sha256 = "1n3xn1zvxgyzb84cjpw3i5alw0gkbrps11r4ijxzyqxqym0khagr";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Library for communicating with USB and Bluetooth HID devices";
     homepage = "https://github.com/libusb/hidapi";
+    maintainers = with maintainers; [ prusnak ];
     # Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal)
     license = licenses.bsd3;
     platforms = platforms.unix;

From b9222f51583f0553229d37ad0aeee1f7822ef656 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 28 Oct 2020 14:53:59 +0100
Subject: [PATCH 0795/3942] python3Packages.hidapi: 0.9.0.post3 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix
index 9e9e965d3368..df9ac9ebed6d 100644
--- a/pkgs/development/python-modules/hidapi/default.nix
+++ b/pkgs/development/python-modules/hidapi/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "hidapi";
-  version = "0.9.0.post3";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5a2442928f17ba742d9c53073f48b152051c5747d758d2fefd937543da5ab2e5";
+    sha256 = "2560ad8db212f54cf40ea8d78715adad7df803011cfdce9dabbac0e76acf31ef";
   };
 
   propagatedBuildInputs =
@@ -26,11 +26,11 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "hid" ];
 
   meta = with stdenv.lib; {
-    description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
+    description = "A Cython interface to the hidapi from https://github.com/libusb/hidapi";
     homepage = "https://github.com/trezor/cython-hidapi";
     # license can actually be either bsd3 or gpl3
     # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
     license = licenses.bsd3;
-    maintainers = with maintainers; [ np ];
+    maintainers = with maintainers; [ np prusnak ];
   };
 }

From f269e315ec6587b2a151a6908926df21e145b9f5 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 31 Oct 2020 12:00:00 +0000
Subject: [PATCH 0796/3942] python3.pkgs.fabulous: init at 0.3.0

---
 .../python-modules/fabulous/default.nix       | 39 +++++++++++++++++++
 .../fabulous/relative_import.patch            | 27 +++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/python-modules/fabulous/default.nix
 create mode 100644 pkgs/development/python-modules/fabulous/relative_import.patch

diff --git a/pkgs/development/python-modules/fabulous/default.nix b/pkgs/development/python-modules/fabulous/default.nix
new file mode 100644
index 000000000000..6079f22020a2
--- /dev/null
+++ b/pkgs/development/python-modules/fabulous/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pillow
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "fabulous";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "jart";
+    repo = pname;
+    rev = version;
+    sha256 = "0yxdaz6yayp1a57kdb2i8q7kwwdlwy4a3d0lr012h2ji9m89c8q7";
+  };
+
+  patches = [
+    ./relative_import.patch
+  ];
+
+  propagatedBuildInputs = [
+    pillow
+  ];
+
+  checkPhase = ''
+    for i in tests/*.py; do
+      ${python.interpreter} $i
+    done
+  '';
+
+  meta = with lib; {
+    description = "Make the output of terminal applications look fabulous";
+    homepage = "https://jart.github.io/fabulous";
+    license = licenses.asl20;
+    maintainers = [ maintainers.symphorien ];
+  };
+}
diff --git a/pkgs/development/python-modules/fabulous/relative_import.patch b/pkgs/development/python-modules/fabulous/relative_import.patch
new file mode 100644
index 000000000000..b12e3d9a7863
--- /dev/null
+++ b/pkgs/development/python-modules/fabulous/relative_import.patch
@@ -0,0 +1,27 @@
+diff --git a/fabulous/prompt.py b/fabulous/prompt.py
+index 531176f..e395ab4 100644
+--- a/fabulous/prompt.py
++++ b/fabulous/prompt.py
+@@ -18,8 +18,7 @@
+ import sys
+ import os
+ import os.path
+-import term
+-from term import stdout, stderr, display
++from .term import stdout, stderr, display
+ 
+ __all__ = ["input_object","query","file_chooser"]
+ 
+diff --git a/fabulous/widget.py b/fabulous/widget.py
+index 31a2547..7ad889a 100644
+--- a/fabulous/widget.py
++++ b/fabulous/widget.py
+@@ -24,7 +24,7 @@ import os
+ import math
+ from datetime import datetime
+ # import textwrap
+-from term import stdout, display
++from .term import stdout, display
+ 
+ class ProgressBar(object):
+     """A 3-line progress bar, which looks like::
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73f844f2d63f..62eb91840377 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1970,6 +1970,8 @@ in {
 
   Fabric = callPackage ../development/python-modules/Fabric { };
 
+  fabulous = callPackage ../development/python-modules/fabulous { };
+
   facebook-sdk = callPackage ../development/python-modules/facebook-sdk { };
 
   face = callPackage ../development/python-modules/face { };

From 790714af65bf03234efce4c6ec9237166697bf86 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 1 Nov 2020 11:15:55 +0100
Subject: [PATCH 0797/3942] kdeApplications.okteta: remove alias

After 3 years we can remove the alias.
---
 pkgs/applications/kde/default.nix | 4 ----
 pkgs/top-level/all-packages.nix   | 1 -
 2 files changed, 5 deletions(-)

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 4713c9ecf494..315a5b358855 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -27,7 +27,6 @@ still shows most of the available features is in `./gwenview.nix`.
 
 {
   lib, libsForQt5, fetchurl,
-  okteta
 }:
 
 let
@@ -210,9 +209,6 @@ let
       rocs = callPackage ./rocs.nix {};
       spectacle = callPackage ./spectacle.nix {};
       yakuake = callPackage ./yakuake.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 2f449f65d12d..32dbe8b164ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21734,7 +21734,6 @@ in
       attrs = {
         inherit libsForQt5;
         inherit lib fetchurl;
-        inherit okteta;
       };
     in
       recurseIntoAttrs (makeOverridable mkApplications attrs);

From 6719d4b5c882b41073e32c9245b8b1848e7b6aca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 10:24:59 +0000
Subject: [PATCH 0798/3942] gcsfuse: 0.30.0 -> 0.32.0

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

diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index 89fa3ebe33b6..d820e5e68e2a 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "gcsfuse";
-  version = "0.30.0";
+  version = "0.32.0";
 
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
     rev = "v${version}";
-    sha256 = "1ai1dgf07g2c08rp87kygrl67hyj7x793093wmnwaxfpylx5flv0";
+    sha256 = "09k7479gd9rlzmxhcvc1b3ajy8frzd6881vnlvk3z9818n4aq7qc";
   };
 
   goPackagePath = "github.com/googlecloudplatform/gcsfuse";

From 61040fa997191422631dc44dd0d5d6e5755efeaf Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 1 Nov 2020 12:41:33 +0300
Subject: [PATCH 0799/3942] iortcw: init at 1.51c

---
 pkgs/games/iortcw/default.nix   | 27 +++++++++++++++++
 pkgs/games/iortcw/sp.nix        | 52 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  4 +++
 3 files changed, 83 insertions(+)
 create mode 100644 pkgs/games/iortcw/default.nix
 create mode 100644 pkgs/games/iortcw/sp.nix

diff --git a/pkgs/games/iortcw/default.nix b/pkgs/games/iortcw/default.nix
new file mode 100644
index 000000000000..3aa459777ea7
--- /dev/null
+++ b/pkgs/games/iortcw/default.nix
@@ -0,0 +1,27 @@
+{ buildEnv, callPackage, makeWrapper }:
+
+let
+  sp = callPackage ./sp.nix {};
+  mp = sp.overrideAttrs (oldAttrs: rec {
+    sourceRoot = "source/MP";
+  });
+in buildEnv {
+  name = "iortcw";
+
+  paths = [ sp mp ];
+
+  pathsToLink = [ "/opt" ];
+
+  buildInputs = [ makeWrapper ];
+
+  # so we can launch sp from mp game and vice versa
+  postBuild = ''
+    for i in `find -L $out/opt/iortcw -maxdepth 1 -type f -executable`; do
+      makeWrapper $i $out/bin/`basename $i` --run "cd $out/opt/iortcw"
+    done
+  '';
+
+  meta = sp.meta // {
+    description = "Game engine for Return to Castle Wolfenstein";
+  };
+}
diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/games/iortcw/sp.nix
new file mode 100644
index 000000000000..71144ad0eb85
--- /dev/null
+++ b/pkgs/games/iortcw/sp.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchFromGitHub, opusfile, libogg, SDL2, openal, freetype
+, libjpeg, curl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "iortcw-sp";
+  version = "1.51c";
+
+  src = fetchFromGitHub {
+    owner = "iortcw";
+    repo = "iortcw";
+    rev = version;
+    sha256 = "0g5wgqb1gm34pd05dj2i8nj3qhsz0831p3m7bsgxpjcg9c00jpyw";
+  };
+
+  enableParallelBuilding = true;
+
+  sourceRoot = "source/SP";
+
+  makeFlags = [
+    "USE_INTERNAL_LIBS=0"
+    "COPYDIR=${placeholder "out"}/opt/iortcw"
+    "USE_OPENAL_DLOPEN=0"
+    "USE_CURL_DLOPEN=0"
+  ];
+
+  installTargets = [ "copyfiles" ];
+
+  buildInputs = [
+    opusfile libogg SDL2 freetype libjpeg openal curl
+  ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${SDL2.dev}/include/SDL2"
+    "-I${opusfile}/include/opus"
+  ];
+  NIX_CFLAGS_LINK = [ "-lSDL2" ];
+
+  postInstall = ''
+    for i in `find $out/opt/iortcw -maxdepth 1 -type f -executable`; do
+      makeWrapper $i $out/bin/`basename $i` --run "cd $out/opt/iortcw"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Single player version of game engine for Return to Castle Wolfenstein";
+    homepage = src.meta.homepage;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ gnidorah ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32dbe8b164ad..4226f35c7fa6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25224,6 +25224,10 @@ in
 
   instead-launcher = callPackage ../games/instead-launcher { };
 
+  iortcw = callPackage ../games/iortcw { };
+  # used as base package for iortcw forks
+  iortcw_sp = callPackage ../games/iortcw/sp.nix { };
+
   ivan = callPackage ../games/ivan { };
 
   ja2-stracciatella = callPackage ../games/ja2-stracciatella { };

From 8d6cac9e03eb22a72c9a9931e499c2d6ff8726cc Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Sun, 1 Nov 2020 11:56:06 +0100
Subject: [PATCH 0800/3942] filebot: 4.9.1 -> 4.9.2

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

diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix
index cdd70b4c8948..e9ae14e19aa2 100644
--- a/pkgs/applications/video/filebot/default.nix
+++ b/pkgs/applications/video/filebot/default.nix
@@ -10,11 +10,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "filebot";
-  version = "4.9.1";
+  version = "4.9.2";
 
   src = fetchurl {
     url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
-    sha256 = "0l496cz703mjymjhgmyrkqbfld1bz53pdsbkx00h9a267j22fkms";
+    sha256 = "0hcyam8l0fzc9fnp1dpawk0s3rwhfph78w99y7zlcv5l4l4h04lz";
   };
 
   unpackPhase = "tar xvf $src";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     cp -r filebot.sh lib/ jar/ $out/opt/
     # Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead.
     substituteInPlace $out/opt/filebot.sh \
-      --replace 'APP_DATA="$FILEBOT_HOME/data/$USER"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \
+      --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \
       --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license'
     wrapProgram $out/opt/filebot.sh \
       --prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]}

From e2ae423b3beecccbbb07924f8b7f99b59b2ca354 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 10:58:30 +0000
Subject: [PATCH 0801/3942] gllvm: 1.2.8 -> 1.2.9

---
 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 58416e30a8c9..efa7ae21c3a5 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "gllvm";
-  version = "1.2.8";
+  version = "1.2.9";
 
   goPackagePath = "github.com/SRI-CSL/gllvm";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "SRI-CSL";
     repo = "gllvm";
     rev = "v${version}";
-    sha256 = "090ghg7ivf6snkabba00pn8a9x5wj8dgpdq7qjhmw1lpijd0mq0y";
+    sha256 = "15cgngvd9mg057iz32fk5kcprcvvavahbvfvl5ds8x7shbm60g7s";
   };
 
   meta = with stdenv.lib; {

From 5219a3ade1939470f2965ad4d80c87f7fb33db3e Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 1 Nov 2020 11:38:54 +0100
Subject: [PATCH 0802/3942] rsync: disable the bundled zlib explicitly

We've been providing zlib as a buildInput for some time now but rsync
still builds (& links) it's own copy of zlib unless we disable it
explicitly. This cuts down on compilation time but otherwise shouldn't
have any side effects.
---
 pkgs/applications/networking/sync/rsync/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 7f384846c960..e07fecbf8936 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -35,7 +35,13 @@ stdenv.mkDerivation rec {
                 ++ stdenv.lib.optional enableXXHash xxHash;
   nativeBuildInputs = [perl];
 
-  configureFlags = ["--with-nobody-group=nogroup"]
+  configureFlags = [
+    "--with-nobody-group=nogroup"
+
+    # disable the included zlib explicitly as it otherwise still compiles and
+    # links them even.
+    "--with-included-zlib=no"
+  ]
     # Work around issue with cross-compilation:
     #     configure.sh: error: cannot run test program while cross compiling
     # Remove once 3.2.4 or more recent is released.

From 8c7ef10f716ca5983fd4bb69112aea0ae84e2d09 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 1 Nov 2020 11:23:39 +0300
Subject: [PATCH 0803/3942] vkquake: 1.04.1 -> 1.05.0

---
 pkgs/games/quakespasm/vulkan.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 39474715021e..49f9e6832354 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -1,25 +1,16 @@
-{ stdenv, fetchpatch, fetchFromGitHub, makeWrapper, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }:
+{ stdenv, fetchFromGitHub, makeWrapper, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }:
 
 stdenv.mkDerivation rec {
   pname = "vkquake";
-  version = "1.04.1";
+  version = "1.05.0";
 
   src = fetchFromGitHub {
     owner = "Novum";
     repo = "vkQuake";
     rev = version;
-    sha256 = "1ry861pk3z02hy7i0yi3xwmd1zma802qzcnlm09w6pslayd9rwbf";
+    sha256 = "16ryjfkmnhlxv7b6yvyk3247q7ih4g90a7c4z501xiyp7h0wlsw8";
   };
 
-  # patches and patchFlags can be deleted with the next release
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/Novum/vkQuake/commit/a869a22d9b51c68e57646fa20e4c40fc6db36760.patch";
-      sha256 = "sha256-ea5lcXTTlJZnuOdF1W+GCYvVgj/gW10tDNyTgfl3Kfs=";
-    })
-  ];
-  patchFlags = "-p2";
-
   sourceRoot = "source/Quake";
 
   nativeBuildInputs = [

From f074f6e3ac0a2b87252e5f586ce4f80bd8d1bbb1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Nov 2020 14:19:23 +0100
Subject: [PATCH 0804/3942] zigbee2mqtt: 1.15.0 -> 1.16.0

---
 pkgs/servers/zigbee2mqtt/default.nix       |    4 +-
 pkgs/servers/zigbee2mqtt/node-packages.nix | 2820 +++++++++-----------
 2 files changed, 1237 insertions(+), 1587 deletions(-)

diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix
index e28d9a73aea3..10fa4e3340c9 100644
--- a/pkgs/servers/zigbee2mqtt/default.nix
+++ b/pkgs/servers/zigbee2mqtt/default.nix
@@ -3,7 +3,7 @@ let
   package = (import ./node.nix { inherit pkgs system; }).package;
 in
 package.override rec {
-  version = "1.15.0";
+  version = "1.16.0";
   reconstructLock = true;
 
   postInstall = ''
@@ -20,7 +20,7 @@ package.override rec {
     owner = "Koenkk";
     repo = "zigbee2mqtt";
     rev = version;
-    sha256 = "1kbrkmam0x2mhqps58xwagp8y3q6zyz0qlx57ys2z2wcs12lpw4r";
+    sha256 = "0hahzvp3099g0i4jqbkcq6vndpjigx7b6mg1vjcs5v0wyllxdlwp";
   };
 
   passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;
diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix
index dfe00bd467bb..89f3be7119d4 100644
--- a/pkgs/servers/zigbee2mqtt/node-packages.nix
+++ b/pkgs/servers/zigbee2mqtt/node-packages.nix
@@ -4,13 +4,13 @@
 
 let
   sources = {
-    "@babel/cli-7.11.6" = {
+    "@babel/cli-7.12.1" = {
       name = "_at_babel_slash_cli";
       packageName = "@babel/cli";
-      version = "7.11.6";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.11.6.tgz";
-        sha512 = "+w7BZCvkewSmaRM6H4L2QM3RL90teqEIHDIFXAmrW33+0jhlymnDAEdqVeCZATvxhQuio1ifoGVlJJbIiH9Ffg==";
+        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.1.tgz";
+        sha512 = "eRJREyrfAJ2r42Iaxe8h3v6yyj1wu9OyosaUHW6UImjGf9ahGL9nsFNh7OCopvtcPL8WnEo7tp78wrZaZ6vG9g==";
       };
     };
     "@babel/code-frame-7.10.4" = {
@@ -22,31 +22,31 @@ let
         sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
       };
     };
-    "@babel/compat-data-7.11.0" = {
+    "@babel/compat-data-7.12.1" = {
       name = "_at_babel_slash_compat-data";
       packageName = "@babel/compat-data";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz";
-        sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==";
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz";
+        sha512 = "725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ==";
       };
     };
-    "@babel/core-7.11.6" = {
+    "@babel/core-7.12.3" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.11.6";
+      version = "7.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz";
-        sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz";
+        sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==";
       };
     };
-    "@babel/generator-7.11.6" = {
+    "@babel/generator-7.12.1" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.11.6";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz";
-        sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz";
+        sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==";
       };
     };
     "@babel/helper-annotate-as-pure-7.10.4" = {
@@ -67,31 +67,31 @@ let
         sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==";
       };
     };
-    "@babel/helper-compilation-targets-7.10.4" = {
+    "@babel/helper-compilation-targets-7.12.1" = {
       name = "_at_babel_slash_helper-compilation-targets";
       packageName = "@babel/helper-compilation-targets";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz";
-        sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==";
+        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz";
+        sha512 = "jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g==";
       };
     };
-    "@babel/helper-create-class-features-plugin-7.10.5" = {
+    "@babel/helper-create-class-features-plugin-7.12.1" = {
       name = "_at_babel_slash_helper-create-class-features-plugin";
       packageName = "@babel/helper-create-class-features-plugin";
-      version = "7.10.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz";
-        sha512 = "0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==";
+        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz";
+        sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==";
       };
     };
-    "@babel/helper-create-regexp-features-plugin-7.10.4" = {
+    "@babel/helper-create-regexp-features-plugin-7.12.1" = {
       name = "_at_babel_slash_helper-create-regexp-features-plugin";
       packageName = "@babel/helper-create-regexp-features-plugin";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz";
-        sha512 = "2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==";
+        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz";
+        sha512 = "rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==";
       };
     };
     "@babel/helper-define-map-7.10.5" = {
@@ -103,13 +103,13 @@ let
         sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==";
       };
     };
-    "@babel/helper-explode-assignable-expression-7.11.4" = {
+    "@babel/helper-explode-assignable-expression-7.12.1" = {
       name = "_at_babel_slash_helper-explode-assignable-expression";
       packageName = "@babel/helper-explode-assignable-expression";
-      version = "7.11.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz";
-        sha512 = "ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==";
+        url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz";
+        sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==";
       };
     };
     "@babel/helper-function-name-7.10.4" = {
@@ -139,31 +139,31 @@ let
         sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==";
       };
     };
-    "@babel/helper-member-expression-to-functions-7.11.0" = {
+    "@babel/helper-member-expression-to-functions-7.12.1" = {
       name = "_at_babel_slash_helper-member-expression-to-functions";
       packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz";
-        sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==";
+        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz";
+        sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==";
       };
     };
-    "@babel/helper-module-imports-7.10.4" = {
+    "@babel/helper-module-imports-7.12.1" = {
       name = "_at_babel_slash_helper-module-imports";
       packageName = "@babel/helper-module-imports";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz";
-        sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==";
+        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz";
+        sha512 = "ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==";
       };
     };
-    "@babel/helper-module-transforms-7.11.0" = {
+    "@babel/helper-module-transforms-7.12.1" = {
       name = "_at_babel_slash_helper-module-transforms";
       packageName = "@babel/helper-module-transforms";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz";
-        sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==";
+        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz";
+        sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
       };
     };
     "@babel/helper-optimise-call-expression-7.10.4" = {
@@ -193,40 +193,40 @@ let
         sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==";
       };
     };
-    "@babel/helper-remap-async-to-generator-7.11.4" = {
+    "@babel/helper-remap-async-to-generator-7.12.1" = {
       name = "_at_babel_slash_helper-remap-async-to-generator";
       packageName = "@babel/helper-remap-async-to-generator";
-      version = "7.11.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz";
-        sha512 = "tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==";
+        url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz";
+        sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==";
       };
     };
-    "@babel/helper-replace-supers-7.10.4" = {
+    "@babel/helper-replace-supers-7.12.1" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz";
-        sha512 = "sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==";
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz";
+        sha512 = "zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==";
       };
     };
-    "@babel/helper-simple-access-7.10.4" = {
+    "@babel/helper-simple-access-7.12.1" = {
       name = "_at_babel_slash_helper-simple-access";
       packageName = "@babel/helper-simple-access";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz";
-        sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==";
+        url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz";
+        sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==";
       };
     };
-    "@babel/helper-skip-transparent-expression-wrappers-7.11.0" = {
+    "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = {
       name = "_at_babel_slash_helper-skip-transparent-expression-wrappers";
       packageName = "@babel/helper-skip-transparent-expression-wrappers";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz";
-        sha512 = "0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==";
+        url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz";
+        sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==";
       };
     };
     "@babel/helper-split-export-declaration-7.11.0" = {
@@ -247,22 +247,31 @@ let
         sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==";
       };
     };
-    "@babel/helper-wrap-function-7.10.4" = {
-      name = "_at_babel_slash_helper-wrap-function";
-      packageName = "@babel/helper-wrap-function";
-      version = "7.10.4";
+    "@babel/helper-validator-option-7.12.1" = {
+      name = "_at_babel_slash_helper-validator-option";
+      packageName = "@babel/helper-validator-option";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz";
-        sha512 = "6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz";
+        sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==";
       };
     };
-    "@babel/helpers-7.10.4" = {
+    "@babel/helper-wrap-function-7.12.3" = {
+      name = "_at_babel_slash_helper-wrap-function";
+      packageName = "@babel/helper-wrap-function";
+      version = "7.12.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz";
+        sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==";
+      };
+    };
+    "@babel/helpers-7.12.1" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz";
-        sha512 = "L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz";
+        sha512 = "9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==";
       };
     };
     "@babel/highlight-7.10.4" = {
@@ -274,130 +283,130 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.11.5" = {
+    "@babel/parser-7.12.3" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.11.5";
+      version = "7.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz";
-        sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz";
+        sha512 = "kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==";
       };
     };
-    "@babel/plugin-proposal-async-generator-functions-7.10.5" = {
+    "@babel/plugin-proposal-async-generator-functions-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-async-generator-functions";
       packageName = "@babel/plugin-proposal-async-generator-functions";
-      version = "7.10.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz";
-        sha512 = "cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz";
+        sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==";
       };
     };
-    "@babel/plugin-proposal-class-properties-7.10.4" = {
+    "@babel/plugin-proposal-class-properties-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-class-properties";
       packageName = "@babel/plugin-proposal-class-properties";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz";
-        sha512 = "vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz";
+        sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==";
       };
     };
-    "@babel/plugin-proposal-dynamic-import-7.10.4" = {
+    "@babel/plugin-proposal-dynamic-import-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-dynamic-import";
       packageName = "@babel/plugin-proposal-dynamic-import";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz";
-        sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz";
+        sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==";
       };
     };
-    "@babel/plugin-proposal-export-namespace-from-7.10.4" = {
+    "@babel/plugin-proposal-export-namespace-from-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-export-namespace-from";
       packageName = "@babel/plugin-proposal-export-namespace-from";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz";
-        sha512 = "aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz";
+        sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==";
       };
     };
-    "@babel/plugin-proposal-json-strings-7.10.4" = {
+    "@babel/plugin-proposal-json-strings-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-json-strings";
       packageName = "@babel/plugin-proposal-json-strings";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz";
-        sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz";
+        sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==";
       };
     };
-    "@babel/plugin-proposal-logical-assignment-operators-7.11.0" = {
+    "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-logical-assignment-operators";
       packageName = "@babel/plugin-proposal-logical-assignment-operators";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz";
-        sha512 = "/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz";
+        sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==";
       };
     };
-    "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = {
+    "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator";
       packageName = "@babel/plugin-proposal-nullish-coalescing-operator";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz";
-        sha512 = "wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz";
+        sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==";
       };
     };
-    "@babel/plugin-proposal-numeric-separator-7.10.4" = {
+    "@babel/plugin-proposal-numeric-separator-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-numeric-separator";
       packageName = "@babel/plugin-proposal-numeric-separator";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz";
-        sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz";
+        sha512 = "MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA==";
       };
     };
-    "@babel/plugin-proposal-object-rest-spread-7.11.0" = {
+    "@babel/plugin-proposal-object-rest-spread-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-object-rest-spread";
       packageName = "@babel/plugin-proposal-object-rest-spread";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz";
-        sha512 = "wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz";
+        sha512 = "s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==";
       };
     };
-    "@babel/plugin-proposal-optional-catch-binding-7.10.4" = {
+    "@babel/plugin-proposal-optional-catch-binding-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-optional-catch-binding";
       packageName = "@babel/plugin-proposal-optional-catch-binding";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz";
-        sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz";
+        sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==";
       };
     };
-    "@babel/plugin-proposal-optional-chaining-7.11.0" = {
+    "@babel/plugin-proposal-optional-chaining-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-optional-chaining";
       packageName = "@babel/plugin-proposal-optional-chaining";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz";
-        sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz";
+        sha512 = "c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==";
       };
     };
-    "@babel/plugin-proposal-private-methods-7.10.4" = {
+    "@babel/plugin-proposal-private-methods-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-private-methods";
       packageName = "@babel/plugin-proposal-private-methods";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz";
-        sha512 = "wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz";
+        sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==";
       };
     };
-    "@babel/plugin-proposal-unicode-property-regex-7.10.4" = {
+    "@babel/plugin-proposal-unicode-property-regex-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-unicode-property-regex";
       packageName = "@babel/plugin-proposal-unicode-property-regex";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz";
-        sha512 = "H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz";
+        sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==";
       };
     };
     "@babel/plugin-syntax-async-generators-7.8.4" = {
@@ -418,13 +427,13 @@ let
         sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==";
       };
     };
-    "@babel/plugin-syntax-class-properties-7.10.4" = {
+    "@babel/plugin-syntax-class-properties-7.12.1" = {
       name = "_at_babel_slash_plugin-syntax-class-properties";
       packageName = "@babel/plugin-syntax-class-properties";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz";
-        sha512 = "GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz";
+        sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==";
       };
     };
     "@babel/plugin-syntax-dynamic-import-7.8.3" = {
@@ -517,328 +526,328 @@ let
         sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==";
       };
     };
-    "@babel/plugin-syntax-top-level-await-7.10.4" = {
+    "@babel/plugin-syntax-top-level-await-7.12.1" = {
       name = "_at_babel_slash_plugin-syntax-top-level-await";
       packageName = "@babel/plugin-syntax-top-level-await";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz";
-        sha512 = "ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz";
+        sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==";
       };
     };
-    "@babel/plugin-syntax-typescript-7.10.4" = {
+    "@babel/plugin-syntax-typescript-7.12.1" = {
       name = "_at_babel_slash_plugin-syntax-typescript";
       packageName = "@babel/plugin-syntax-typescript";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz";
-        sha512 = "oSAEz1YkBCAKr5Yiq8/BNtvSAPwkp/IyUnwZogd8p+F0RuYQQrLeRUzIQhueQTTBy/F+a40uS7OFKxnkRvmvFQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz";
+        sha512 = "UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA==";
       };
     };
-    "@babel/plugin-transform-arrow-functions-7.10.4" = {
+    "@babel/plugin-transform-arrow-functions-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-arrow-functions";
       packageName = "@babel/plugin-transform-arrow-functions";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz";
-        sha512 = "9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz";
+        sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==";
       };
     };
-    "@babel/plugin-transform-async-to-generator-7.10.4" = {
+    "@babel/plugin-transform-async-to-generator-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-async-to-generator";
       packageName = "@babel/plugin-transform-async-to-generator";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz";
-        sha512 = "F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz";
+        sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==";
       };
     };
-    "@babel/plugin-transform-block-scoped-functions-7.10.4" = {
+    "@babel/plugin-transform-block-scoped-functions-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-block-scoped-functions";
       packageName = "@babel/plugin-transform-block-scoped-functions";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz";
-        sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz";
+        sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==";
       };
     };
-    "@babel/plugin-transform-block-scoping-7.11.1" = {
+    "@babel/plugin-transform-block-scoping-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-block-scoping";
       packageName = "@babel/plugin-transform-block-scoping";
-      version = "7.11.1";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz";
-        sha512 = "00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz";
+        sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==";
       };
     };
-    "@babel/plugin-transform-classes-7.10.4" = {
+    "@babel/plugin-transform-classes-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-classes";
       packageName = "@babel/plugin-transform-classes";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz";
-        sha512 = "2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz";
+        sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==";
       };
     };
-    "@babel/plugin-transform-computed-properties-7.10.4" = {
+    "@babel/plugin-transform-computed-properties-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-computed-properties";
       packageName = "@babel/plugin-transform-computed-properties";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz";
-        sha512 = "JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz";
+        sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==";
       };
     };
-    "@babel/plugin-transform-destructuring-7.10.4" = {
+    "@babel/plugin-transform-destructuring-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-destructuring";
       packageName = "@babel/plugin-transform-destructuring";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz";
-        sha512 = "+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz";
+        sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==";
       };
     };
-    "@babel/plugin-transform-dotall-regex-7.10.4" = {
+    "@babel/plugin-transform-dotall-regex-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-dotall-regex";
       packageName = "@babel/plugin-transform-dotall-regex";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz";
-        sha512 = "ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz";
+        sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==";
       };
     };
-    "@babel/plugin-transform-duplicate-keys-7.10.4" = {
+    "@babel/plugin-transform-duplicate-keys-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-duplicate-keys";
       packageName = "@babel/plugin-transform-duplicate-keys";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz";
-        sha512 = "GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz";
+        sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==";
       };
     };
-    "@babel/plugin-transform-exponentiation-operator-7.10.4" = {
+    "@babel/plugin-transform-exponentiation-operator-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-exponentiation-operator";
       packageName = "@babel/plugin-transform-exponentiation-operator";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz";
-        sha512 = "S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz";
+        sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==";
       };
     };
-    "@babel/plugin-transform-for-of-7.10.4" = {
+    "@babel/plugin-transform-for-of-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-for-of";
       packageName = "@babel/plugin-transform-for-of";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz";
-        sha512 = "ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz";
+        sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==";
       };
     };
-    "@babel/plugin-transform-function-name-7.10.4" = {
+    "@babel/plugin-transform-function-name-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-function-name";
       packageName = "@babel/plugin-transform-function-name";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz";
-        sha512 = "OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz";
+        sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==";
       };
     };
-    "@babel/plugin-transform-literals-7.10.4" = {
+    "@babel/plugin-transform-literals-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-literals";
       packageName = "@babel/plugin-transform-literals";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz";
-        sha512 = "Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz";
+        sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==";
       };
     };
-    "@babel/plugin-transform-member-expression-literals-7.10.4" = {
+    "@babel/plugin-transform-member-expression-literals-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-member-expression-literals";
       packageName = "@babel/plugin-transform-member-expression-literals";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz";
-        sha512 = "0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz";
+        sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==";
       };
     };
-    "@babel/plugin-transform-modules-amd-7.10.5" = {
+    "@babel/plugin-transform-modules-amd-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-modules-amd";
       packageName = "@babel/plugin-transform-modules-amd";
-      version = "7.10.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz";
-        sha512 = "elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz";
+        sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==";
       };
     };
-    "@babel/plugin-transform-modules-commonjs-7.10.4" = {
+    "@babel/plugin-transform-modules-commonjs-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-modules-commonjs";
       packageName = "@babel/plugin-transform-modules-commonjs";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz";
-        sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz";
+        sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==";
       };
     };
-    "@babel/plugin-transform-modules-systemjs-7.10.5" = {
+    "@babel/plugin-transform-modules-systemjs-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-modules-systemjs";
       packageName = "@babel/plugin-transform-modules-systemjs";
-      version = "7.10.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz";
-        sha512 = "f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz";
+        sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==";
       };
     };
-    "@babel/plugin-transform-modules-umd-7.10.4" = {
+    "@babel/plugin-transform-modules-umd-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-modules-umd";
       packageName = "@babel/plugin-transform-modules-umd";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz";
-        sha512 = "mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz";
+        sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==";
       };
     };
-    "@babel/plugin-transform-named-capturing-groups-regex-7.10.4" = {
+    "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex";
       packageName = "@babel/plugin-transform-named-capturing-groups-regex";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz";
-        sha512 = "V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz";
+        sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==";
       };
     };
-    "@babel/plugin-transform-new-target-7.10.4" = {
+    "@babel/plugin-transform-new-target-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-new-target";
       packageName = "@babel/plugin-transform-new-target";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz";
-        sha512 = "YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz";
+        sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==";
       };
     };
-    "@babel/plugin-transform-object-super-7.10.4" = {
+    "@babel/plugin-transform-object-super-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-object-super";
       packageName = "@babel/plugin-transform-object-super";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz";
-        sha512 = "5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz";
+        sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==";
       };
     };
-    "@babel/plugin-transform-parameters-7.10.5" = {
+    "@babel/plugin-transform-parameters-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-parameters";
       packageName = "@babel/plugin-transform-parameters";
-      version = "7.10.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz";
-        sha512 = "xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz";
+        sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==";
       };
     };
-    "@babel/plugin-transform-property-literals-7.10.4" = {
+    "@babel/plugin-transform-property-literals-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-property-literals";
       packageName = "@babel/plugin-transform-property-literals";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz";
-        sha512 = "ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz";
+        sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==";
       };
     };
-    "@babel/plugin-transform-regenerator-7.10.4" = {
+    "@babel/plugin-transform-regenerator-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-regenerator";
       packageName = "@babel/plugin-transform-regenerator";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz";
-        sha512 = "3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz";
+        sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==";
       };
     };
-    "@babel/plugin-transform-reserved-words-7.10.4" = {
+    "@babel/plugin-transform-reserved-words-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-reserved-words";
       packageName = "@babel/plugin-transform-reserved-words";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz";
-        sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz";
+        sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==";
       };
     };
-    "@babel/plugin-transform-shorthand-properties-7.10.4" = {
+    "@babel/plugin-transform-shorthand-properties-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-shorthand-properties";
       packageName = "@babel/plugin-transform-shorthand-properties";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz";
-        sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz";
+        sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==";
       };
     };
-    "@babel/plugin-transform-spread-7.11.0" = {
+    "@babel/plugin-transform-spread-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-spread";
       packageName = "@babel/plugin-transform-spread";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz";
-        sha512 = "UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz";
+        sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==";
       };
     };
-    "@babel/plugin-transform-sticky-regex-7.10.4" = {
+    "@babel/plugin-transform-sticky-regex-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-sticky-regex";
       packageName = "@babel/plugin-transform-sticky-regex";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz";
-        sha512 = "Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz";
+        sha512 = "CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==";
       };
     };
-    "@babel/plugin-transform-template-literals-7.10.5" = {
+    "@babel/plugin-transform-template-literals-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-template-literals";
       packageName = "@babel/plugin-transform-template-literals";
-      version = "7.10.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz";
-        sha512 = "V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz";
+        sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==";
       };
     };
-    "@babel/plugin-transform-typeof-symbol-7.10.4" = {
+    "@babel/plugin-transform-typeof-symbol-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-typeof-symbol";
       packageName = "@babel/plugin-transform-typeof-symbol";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz";
-        sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz";
+        sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==";
       };
     };
-    "@babel/plugin-transform-typescript-7.11.0" = {
+    "@babel/plugin-transform-typescript-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-typescript";
       packageName = "@babel/plugin-transform-typescript";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz";
-        sha512 = "edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz";
+        sha512 = "VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw==";
       };
     };
-    "@babel/plugin-transform-unicode-escapes-7.10.4" = {
+    "@babel/plugin-transform-unicode-escapes-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-unicode-escapes";
       packageName = "@babel/plugin-transform-unicode-escapes";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz";
-        sha512 = "y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz";
+        sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==";
       };
     };
-    "@babel/plugin-transform-unicode-regex-7.10.4" = {
+    "@babel/plugin-transform-unicode-regex-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-unicode-regex";
       packageName = "@babel/plugin-transform-unicode-regex";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz";
-        sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz";
+        sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==";
       };
     };
-    "@babel/preset-env-7.11.5" = {
+    "@babel/preset-env-7.12.1" = {
       name = "_at_babel_slash_preset-env";
       packageName = "@babel/preset-env";
-      version = "7.11.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz";
-        sha512 = "kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==";
+        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz";
+        sha512 = "H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==";
       };
     };
     "@babel/preset-modules-0.1.4" = {
@@ -850,22 +859,22 @@ let
         sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==";
       };
     };
-    "@babel/preset-typescript-7.10.4" = {
+    "@babel/preset-typescript-7.12.1" = {
       name = "_at_babel_slash_preset-typescript";
       packageName = "@babel/preset-typescript";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.10.4.tgz";
-        sha512 = "SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ==";
+        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.1.tgz";
+        sha512 = "hNK/DhmoJPsksdHuI/RVrcEws7GN5eamhi28JkO52MqIxU8Z0QpmiSOQxZHWOHV7I3P4UjHV97ay4TcamMA6Kw==";
       };
     };
-    "@babel/runtime-7.11.2" = {
+    "@babel/runtime-7.12.1" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
-      version = "7.11.2";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz";
-        sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz";
+        sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==";
       };
     };
     "@babel/template-7.10.4" = {
@@ -877,22 +886,22 @@ let
         sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==";
       };
     };
-    "@babel/traverse-7.11.5" = {
+    "@babel/traverse-7.12.1" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.11.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz";
-        sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz";
+        sha512 = "MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==";
       };
     };
-    "@babel/types-7.11.5" = {
+    "@babel/types-7.12.1" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.11.5";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz";
-        sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz";
+        sha512 = "BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==";
       };
     };
     "@bcoe/v8-coverage-0.2.3" = {
@@ -922,13 +931,13 @@ let
         sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==";
       };
     };
-    "@eslint/eslintrc-0.1.3" = {
+    "@eslint/eslintrc-0.2.1" = {
       name = "_at_eslint_slash_eslintrc";
       packageName = "@eslint/eslintrc";
-      version = "0.1.3";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz";
-        sha512 = "4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==";
+        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz";
+        sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==";
       };
     };
     "@istanbuljs/load-nyc-config-1.1.0" = {
@@ -949,112 +958,112 @@ let
         sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==";
       };
     };
-    "@jest/console-26.3.0" = {
+    "@jest/console-26.6.1" = {
       name = "_at_jest_slash_console";
       packageName = "@jest/console";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/console/-/console-26.3.0.tgz";
-        sha512 = "/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w==";
+        url = "https://registry.npmjs.org/@jest/console/-/console-26.6.1.tgz";
+        sha512 = "cjqcXepwC5M+VeIhwT6Xpi/tT4AiNzlIx8SMJ9IihduHnsSrnWNvTBfKIpmqOOCNOPqtbBx6w2JqfoLOJguo8g==";
       };
     };
-    "@jest/core-26.4.2" = {
+    "@jest/core-26.6.1" = {
       name = "_at_jest_slash_core";
       packageName = "@jest/core";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/core/-/core-26.4.2.tgz";
-        sha512 = "sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg==";
+        url = "https://registry.npmjs.org/@jest/core/-/core-26.6.1.tgz";
+        sha512 = "p4F0pgK3rKnoS9olXXXOkbus1Bsu6fd8pcvLMPsUy4CVXZ8WSeiwQ1lK5hwkCIqJ+amZOYPd778sbPha/S8Srw==";
       };
     };
-    "@jest/environment-26.3.0" = {
+    "@jest/environment-26.6.1" = {
       name = "_at_jest_slash_environment";
       packageName = "@jest/environment";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/environment/-/environment-26.3.0.tgz";
-        sha512 = "EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA==";
+        url = "https://registry.npmjs.org/@jest/environment/-/environment-26.6.1.tgz";
+        sha512 = "GNvHwkOFJtNgSwdzH9flUPzF9AYAZhUg124CBoQcwcZCM9s5TLz8Y3fMtiaWt4ffbigoetjGk5PU2Dd8nLrSEw==";
       };
     };
-    "@jest/fake-timers-26.3.0" = {
+    "@jest/fake-timers-26.6.1" = {
       name = "_at_jest_slash_fake-timers";
       packageName = "@jest/fake-timers";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.3.0.tgz";
-        sha512 = "ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A==";
+        url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.1.tgz";
+        sha512 = "T/SkMLgOquenw/nIisBRD6XAYpFir0kNuclYLkse5BpzeDUukyBr+K31xgAo9M0hgjU9ORlekAYPSzc0DKfmKg==";
       };
     };
-    "@jest/globals-26.4.2" = {
+    "@jest/globals-26.6.1" = {
       name = "_at_jest_slash_globals";
       packageName = "@jest/globals";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/globals/-/globals-26.4.2.tgz";
-        sha512 = "Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow==";
+        url = "https://registry.npmjs.org/@jest/globals/-/globals-26.6.1.tgz";
+        sha512 = "acxXsSguuLV/CeMYmBseefw6apO7NuXqpE+v5r3yD9ye2PY7h1nS20vY7Obk2w6S7eJO4OIAJeDnoGcLC/McEQ==";
       };
     };
-    "@jest/reporters-26.4.1" = {
+    "@jest/reporters-26.6.1" = {
       name = "_at_jest_slash_reporters";
       packageName = "@jest/reporters";
-      version = "26.4.1";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.4.1.tgz";
-        sha512 = "aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ==";
+        url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.1.tgz";
+        sha512 = "J6OlXVFY3q1SXWJhjme5i7qT/BAZSikdOK2t8Ht5OS32BDo6KfG5CzIzzIFnAVd82/WWbc9Hb7SJ/jwSvVH9YA==";
       };
     };
-    "@jest/source-map-26.3.0" = {
+    "@jest/source-map-26.5.0" = {
       name = "_at_jest_slash_source-map";
       packageName = "@jest/source-map";
-      version = "26.3.0";
+      version = "26.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/source-map/-/source-map-26.3.0.tgz";
-        sha512 = "hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ==";
+        url = "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz";
+        sha512 = "jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==";
       };
     };
-    "@jest/test-result-26.3.0" = {
+    "@jest/test-result-26.6.1" = {
       name = "_at_jest_slash_test-result";
       packageName = "@jest/test-result";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.3.0.tgz";
-        sha512 = "a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg==";
+        url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.1.tgz";
+        sha512 = "wqAgIerIN2gSdT2A8WeA5+AFh9XQBqYGf8etK143yng3qYd0mF0ie2W5PVmgnjw4VDU6ammI9NdXrKgNhreawg==";
       };
     };
-    "@jest/test-sequencer-26.4.2" = {
+    "@jest/test-sequencer-26.6.1" = {
       name = "_at_jest_slash_test-sequencer";
       packageName = "@jest/test-sequencer";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz";
-        sha512 = "83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog==";
+        url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.1.tgz";
+        sha512 = "0csqA/XApZiNeTIPYh6koIDCACSoR6hi29T61tKJMtCZdEC+tF3PoNt7MS0oK/zKC6daBgCbqXxia5ztr/NyCQ==";
       };
     };
-    "@jest/transform-26.3.0" = {
+    "@jest/transform-26.6.1" = {
       name = "_at_jest_slash_transform";
       packageName = "@jest/transform";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/transform/-/transform-26.3.0.tgz";
-        sha512 = "Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A==";
+        url = "https://registry.npmjs.org/@jest/transform/-/transform-26.6.1.tgz";
+        sha512 = "oNFAqVtqRxZRx6vXL3I4bPKUK0BIlEeaalkwxyQGGI8oXDQBtYQBpiMe5F7qPs4QdvvFYB42gPGIMMcxXaBBxQ==";
       };
     };
-    "@jest/types-25.5.0" = {
+    "@jest/types-26.6.1" = {
       name = "_at_jest_slash_types";
       packageName = "@jest/types";
-      version = "25.5.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz";
-        sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==";
+        url = "https://registry.npmjs.org/@jest/types/-/types-26.6.1.tgz";
+        sha512 = "ywHavIKNpAVrStiRY5wiyehvcktpijpItvGiK72RAn5ctqmzvPk8OvKnvHeBqa1XdQr959CTWAJMqxI8BTibyg==";
       };
     };
-    "@jest/types-26.3.0" = {
-      name = "_at_jest_slash_types";
-      packageName = "@jest/types";
-      version = "26.3.0";
+    "@nicolo-ribaudo/chokidar-2-2.1.8" = {
+      name = "_at_nicolo-ribaudo_slash_chokidar-2";
+      packageName = "@nicolo-ribaudo/chokidar-2";
+      version = "2.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz";
-        sha512 = "BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==";
+        url = "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8.tgz";
+        sha512 = "FohwULwAebCUKi/akMFyGi7jfc7JXTeMHzKxuP3umRd9mK/2Y7/SMBSI2jX+YLopPXi+PF9l307NmpfxTdCegA==";
       };
     };
     "@nodelib/fs.scandir-2.1.3" = {
@@ -1084,31 +1093,31 @@ let
         sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==";
       };
     };
-    "@serialport/binding-abstract-9.0.1" = {
+    "@serialport/binding-abstract-9.0.2" = {
       name = "_at_serialport_slash_binding-abstract";
       packageName = "@serialport/binding-abstract";
-      version = "9.0.1";
+      version = "9.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.0.1.tgz";
-        sha512 = "ncUFSRyVdpyCRuah2dzrs99UfEWWMAhV31ae2FT6j4f8TypQ8OgAF8KkcHiD4M3wORDh3UKCCTS7n8aJWge1RA==";
+        url = "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.0.2.tgz";
+        sha512 = "kyMX6usn+VLpidt0YsDq5JwztIan9TPCX6skr0XcalOxI8I7w+/2qVZJzjgo2fSqDnPRcU2jMWTytwzEXFODvQ==";
       };
     };
-    "@serialport/binding-mock-9.0.1" = {
+    "@serialport/binding-mock-9.0.2" = {
       name = "_at_serialport_slash_binding-mock";
       packageName = "@serialport/binding-mock";
-      version = "9.0.1";
+      version = "9.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.1.tgz";
-        sha512 = "C01T6iX+nNKB7S6BhQEy5nfk4lUk/CkdFEfen9DDPYhtFtIsm5GCGvRB3Fjnp+8oDrGWJOrZfxFf3kWOOx665A==";
+        url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.2.tgz";
+        sha512 = "HfrvJ/LXULHk8w63CGxwDNiDidFgDX8BnadY+cgVS6yHMHikbhLCLjCmUKsKBWaGKRqOznl0w+iUl7TMi1lkXQ==";
       };
     };
-    "@serialport/bindings-9.0.1" = {
+    "@serialport/bindings-9.0.2" = {
       name = "_at_serialport_slash_bindings";
       packageName = "@serialport/bindings";
-      version = "9.0.1";
+      version = "9.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.1.tgz";
-        sha512 = "O5QuwCdnHuZygBKw7tVq2wHysfOnCbOyKtR/k9T9zHqptd89Tzy6xJQNtnrcbV/2D22noKX6yWj+1wqvNe6NRA==";
+        url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.2.tgz";
+        sha512 = "kQ3co4aGwwbUqkRdJ7UfdlbLB5dUQwNfSglexC8iv65D5HXfjSBR1bE0XUH8PH/v/6Dh6CSnwf6OP0I3H5vMWQ==";
       };
     };
     "@serialport/parser-byte-length-9.0.1" = {
@@ -1165,13 +1174,13 @@ let
         sha512 = "BHTV+Lkl+J8hSecFtDRENaR4fgA6tw44J+dmA1vEKEyum0iDN4bihbu8yvztYyo4PhBGUKDfm/PnD5EkJm0dPA==";
       };
     };
-    "@serialport/stream-9.0.1" = {
+    "@serialport/stream-9.0.2" = {
       name = "_at_serialport_slash_stream";
       packageName = "@serialport/stream";
-      version = "9.0.1";
+      version = "9.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.1.tgz";
-        sha512 = "S1xaf99vygbrMDNS/9GHYZYskWJHXJy6dCksW+ME2dzNXEXpz64vF0iug1tC1EIAhME9oD/s3ky2C9CUAd/GUg==";
+        url = "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.2.tgz";
+        sha512 = "0RkVe+gvwZu/PPfbb7ExQ+euGoCTGKD/B8TQ5fuhe+eKk1sh73RwjKmu9gp6veSNqx9Zljnh1dF6mhdEKWZpSA==";
       };
     };
     "@sinonjs/commons-1.8.1" = {
@@ -1192,13 +1201,13 @@ let
         sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==";
       };
     };
-    "@types/babel__core-7.1.10" = {
+    "@types/babel__core-7.1.11" = {
       name = "_at_types_slash_babel__core";
       packageName = "@types/babel__core";
-      version = "7.1.10";
+      version = "7.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz";
-        sha512 = "x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==";
+        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.11.tgz";
+        sha512 = "E5nSOzrjnvhURYnbOR2dClTqcyhPbPvtEwLHf7JJADKedPbcZsoJVfP+I2vBNfBjz4bnZIuhL/tNmRi5nJ7Jlw==";
       };
     };
     "@types/babel__generator-7.6.2" = {
@@ -1228,13 +1237,13 @@ let
         sha512 = "Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==";
       };
     };
-    "@types/color-name-1.1.1" = {
-      name = "_at_types_slash_color-name";
-      packageName = "@types/color-name";
-      version = "1.1.1";
+    "@types/debounce-1.2.0" = {
+      name = "_at_types_slash_debounce";
+      packageName = "@types/debounce";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz";
-        sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==";
+        url = "https://registry.npmjs.org/@types/debounce/-/debounce-1.2.0.tgz";
+        sha512 = "bWG5wapaWgbss9E238T0R6bfo5Fh3OkeoSt245CM7JJwVwpw6MEBCbIxLq5z8KzsE3uJhzcIuQkyiZmzV3M/Dw==";
       };
     };
     "@types/debug-4.1.5" = {
@@ -1246,13 +1255,13 @@ let
         sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==";
       };
     };
-    "@types/graceful-fs-4.1.3" = {
+    "@types/graceful-fs-4.1.4" = {
       name = "_at_types_slash_graceful-fs";
       packageName = "@types/graceful-fs";
-      version = "4.1.3";
+      version = "4.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz";
-        sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==";
+        url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.4.tgz";
+        sha512 = "mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg==";
       };
     };
     "@types/istanbul-lib-coverage-2.0.3" = {
@@ -1273,15 +1282,6 @@ let
         sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==";
       };
     };
-    "@types/istanbul-reports-1.1.2" = {
-      name = "_at_types_slash_istanbul-reports";
-      packageName = "@types/istanbul-reports";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz";
-        sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==";
-      };
-    };
     "@types/istanbul-reports-3.0.0" = {
       name = "_at_types_slash_istanbul-reports";
       packageName = "@types/istanbul-reports";
@@ -1291,13 +1291,13 @@ let
         sha512 = "nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==";
       };
     };
-    "@types/jest-26.0.14" = {
+    "@types/jest-26.0.15" = {
       name = "_at_types_slash_jest";
       packageName = "@types/jest";
-      version = "26.0.14";
+      version = "26.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz";
-        sha512 = "Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg==";
+        url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.15.tgz";
+        sha512 = "s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog==";
       };
     };
     "@types/json-schema-7.0.6" = {
@@ -1318,13 +1318,13 @@ let
         sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw==";
       };
     };
-    "@types/node-14.11.2" = {
+    "@types/node-14.14.6" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.11.2";
+      version = "14.14.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz";
-        sha512 = "jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.6.tgz";
+        sha512 = "6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw==";
       };
     };
     "@types/normalize-package-data-2.4.0" = {
@@ -1336,13 +1336,13 @@ let
         sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==";
       };
     };
-    "@types/prettier-2.1.1" = {
+    "@types/prettier-2.1.5" = {
       name = "_at_types_slash_prettier";
       packageName = "@types/prettier";
-      version = "2.1.1";
+      version = "2.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.1.tgz";
-        sha512 = "2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ==";
+        url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.5.tgz";
+        sha512 = "UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ==";
       };
     };
     "@types/serialport-8.0.1" = {
@@ -1354,22 +1354,22 @@ let
         sha512 = "IcKHq6b/ynKSF/x4al/Ce8+a0hpbYIEaIcK9Z3l4koLvQqAPSODZ37/hgemQx8dTu7fPZDMHN4bKmu89B3UaGA==";
       };
     };
-    "@types/stack-utils-1.0.1" = {
+    "@types/stack-utils-2.0.0" = {
       name = "_at_types_slash_stack-utils";
       packageName = "@types/stack-utils";
-      version = "1.0.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz";
-        sha512 = "l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==";
+        url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz";
+        sha512 = "RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==";
       };
     };
-    "@types/yargs-15.0.7" = {
+    "@types/yargs-15.0.9" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "15.0.7";
+      version = "15.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz";
-        sha512 = "Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz";
+        sha512 = "HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g==";
       };
     };
     "@types/yargs-parser-15.0.0" = {
@@ -1381,67 +1381,67 @@ let
         sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==";
       };
     };
-    "@typescript-eslint/eslint-plugin-4.2.0" = {
+    "@typescript-eslint/eslint-plugin-4.6.0" = {
       name = "_at_typescript-eslint_slash_eslint-plugin";
       packageName = "@typescript-eslint/eslint-plugin";
-      version = "4.2.0";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.2.0.tgz";
-        sha512 = "zBNRkzvLSwo6y5TG0DVcmshZIYBHKtmzD4N+LYnfTFpzc4bc79o8jNRSb728WV7A4Cegbs+MV5IRAj8BKBgOVQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.0.tgz";
+        sha512 = "1+419X+Ynijytr1iWI+/IcX/kJryc78YNpdaXR1aRO1sU3bC0vZrIAF1tIX7rudVI84W7o7M4zo5p1aVt70fAg==";
       };
     };
-    "@typescript-eslint/experimental-utils-4.2.0" = {
+    "@typescript-eslint/experimental-utils-4.6.0" = {
       name = "_at_typescript-eslint_slash_experimental-utils";
       packageName = "@typescript-eslint/experimental-utils";
-      version = "4.2.0";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.2.0.tgz";
-        sha512 = "5BBj6BjgHEndBaQQpUVzRIPERz03LBc0MCQkHwUaH044FJFL08SwWv/sQftk7gf0ShZ2xZysz0LTwCwNt4Xu3w==";
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.0.tgz";
+        sha512 = "pnh6Beh2/4xjJVNL+keP49DFHk3orDHHFylSp3WEjtgW3y1U+6l+jNnJrGlbs6qhAz5z96aFmmbUyKhunXKvKw==";
       };
     };
-    "@typescript-eslint/parser-4.2.0" = {
+    "@typescript-eslint/parser-4.6.0" = {
       name = "_at_typescript-eslint_slash_parser";
       packageName = "@typescript-eslint/parser";
-      version = "4.2.0";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.2.0.tgz";
-        sha512 = "54jJ6MwkOtowpE48C0QJF9iTz2/NZxfKVJzv1ha5imigzHbNSLN9yvbxFFH1KdlRPQrlR8qxqyOvLHHxd397VA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.6.0.tgz";
+        sha512 = "Dj6NJxBhbdbPSZ5DYsQqpR32MwujF772F2H3VojWU6iT4AqL4BKuoNWOPFCoSZvCcADDvQjDpa6OLDAaiZPz2Q==";
       };
     };
-    "@typescript-eslint/scope-manager-4.2.0" = {
+    "@typescript-eslint/scope-manager-4.6.0" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "4.2.0";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.2.0.tgz";
-        sha512 = "Tb402cxxObSxWIVT+PnBp5ruT2V/36yj6gG4C9AjkgRlZpxrLAzWDk3neen6ToMBGeGdxtnfFLoJRUecGz9mYQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.6.0.tgz";
+        sha512 = "uZx5KvStXP/lwrMrfQQwDNvh2ppiXzz5TmyTVHb+5TfZ3sUP7U1onlz3pjoWrK9konRyFe1czyxObWTly27Ang==";
       };
     };
-    "@typescript-eslint/types-4.2.0" = {
+    "@typescript-eslint/types-4.6.0" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "4.2.0";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.2.0.tgz";
-        sha512 = "xkv5nIsxfI/Di9eVwN+G9reWl7Me9R5jpzmZUch58uQ7g0/hHVuGUbbn4NcxcM5y/R4wuJIIEPKPDb5l4Fdmwg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.6.0.tgz";
+        sha512 = "5FAgjqH68SfFG4UTtIFv+rqYJg0nLjfkjD0iv+5O27a0xEeNZ5rZNDvFGZDizlCD1Ifj7MAbSW2DPMrf0E9zjA==";
       };
     };
-    "@typescript-eslint/typescript-estree-4.2.0" = {
+    "@typescript-eslint/typescript-estree-4.6.0" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "4.2.0";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.2.0.tgz";
-        sha512 = "iWDLCB7z4MGkLipduF6EOotdHNtgxuNKnYD54nMS/oitFnsk4S3S/TE/UYXQTra550lHtlv9eGmp+dvN9pUDtA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.0.tgz";
+        sha512 = "s4Z9qubMrAo/tw0CbN0IN4AtfwuehGXVZM0CHNMdfYMGBDhPdwTEpBrecwhP7dRJu6d9tT9ECYNaWDHvlFSngA==";
       };
     };
-    "@typescript-eslint/visitor-keys-4.2.0" = {
+    "@typescript-eslint/visitor-keys-4.6.0" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "4.2.0";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.2.0.tgz";
-        sha512 = "WIf4BNOlFOH2W+YqGWa6YKLcK/EB3gEj2apCrqLw6mme1RzBy0jtJ9ewJgnrZDB640zfnv8L+/gwGH5sYp/rGw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.0.tgz";
+        sha512 = "38Aa9Ztl0XyFPVzmutHXqDMCu15Xx8yKvUo38Gu3GhsuckCh3StPI5t2WIO9LHEsOH7MLmlGfKUisU8eW1Sjhg==";
       };
     };
     "abab-2.0.5" = {
@@ -1453,13 +1453,13 @@ let
         sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==";
       };
     };
-    "acorn-7.4.0" = {
+    "acorn-7.4.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "7.4.0";
+      version = "7.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz";
-        sha512 = "+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz";
+        sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";
       };
     };
     "acorn-globals-6.0.0" = {
@@ -1489,22 +1489,22 @@ let
         sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==";
       };
     };
-    "agent-base-6.0.1" = {
+    "agent-base-6.0.2" = {
       name = "agent-base";
       packageName = "agent-base";
-      version = "6.0.1";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz";
-        sha512 = "01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==";
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz";
+        sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==";
       };
     };
-    "ajv-6.12.5" = {
+    "ajv-6.12.6" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.12.5";
+      version = "6.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz";
-        sha512 = "lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz";
+        sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
       };
     };
     "ansi-colors-4.1.1" = {
@@ -1561,13 +1561,13 @@ let
         sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
-    "ansi-styles-4.2.1" = {
+    "ansi-styles-4.3.0" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
-      version = "4.2.1";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz";
-        sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz";
+        sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
       };
     };
     "anymatch-2.0.0" = {
@@ -1750,31 +1750,31 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.10.1" = {
+    "aws4-1.11.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.10.1";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz";
-        sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz";
+        sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
       };
     };
-    "axios-0.20.0" = {
+    "axios-0.21.0" = {
       name = "axios";
       packageName = "axios";
-      version = "0.20.0";
+      version = "0.21.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz";
-        sha512 = "ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==";
+        url = "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz";
+        sha512 = "fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==";
       };
     };
-    "babel-jest-26.3.0" = {
+    "babel-jest-26.6.1" = {
       name = "babel-jest";
       packageName = "babel-jest";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.3.0.tgz";
-        sha512 = "sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g==";
+        url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.1.tgz";
+        sha512 = "duMWEOKrSBYRVTTNpL2SipNIWnZOjP77auOBMPQ3zXAdnDbyZQWU8r/RxNWpUf9N6cgPFecQYelYLytTVXVDtA==";
       };
     };
     "babel-plugin-dynamic-import-node-2.3.3" = {
@@ -1795,31 +1795,31 @@ let
         sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==";
       };
     };
-    "babel-plugin-jest-hoist-26.2.0" = {
+    "babel-plugin-jest-hoist-26.5.0" = {
       name = "babel-plugin-jest-hoist";
       packageName = "babel-plugin-jest-hoist";
-      version = "26.2.0";
+      version = "26.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz";
-        sha512 = "B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA==";
+        url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz";
+        sha512 = "ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==";
       };
     };
-    "babel-preset-current-node-syntax-0.1.3" = {
+    "babel-preset-current-node-syntax-0.1.4" = {
       name = "babel-preset-current-node-syntax";
       packageName = "babel-preset-current-node-syntax";
-      version = "0.1.3";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz";
-        sha512 = "uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ==";
+        url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz";
+        sha512 = "5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==";
       };
     };
-    "babel-preset-jest-26.3.0" = {
+    "babel-preset-jest-26.5.0" = {
       name = "babel-preset-jest";
       packageName = "babel-preset-jest";
-      version = "26.3.0";
+      version = "26.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz";
-        sha512 = "5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw==";
+        url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz";
+        sha512 = "F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==";
       };
     };
     "balanced-match-1.0.0" = {
@@ -1867,6 +1867,15 @@ let
         sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
       };
     };
+    "binary-extensions-2.1.0" = {
+      name = "binary-extensions";
+      packageName = "binary-extensions";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz";
+        sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==";
+      };
+    };
     "bindings-1.5.0" = {
       name = "bindings";
       packageName = "bindings";
@@ -1939,13 +1948,22 @@ let
         sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==";
       };
     };
-    "buffer-5.6.0" = {
+    "buffer-5.7.0" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.6.0";
+      version = "5.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz";
-        sha512 = "/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.7.0.tgz";
+        sha512 = "cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg==";
+      };
+    };
+    "buffer-crc32-0.2.13" = {
+      name = "buffer-crc32";
+      packageName = "buffer-crc32";
+      version = "0.2.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz";
+        sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242";
       };
     };
     "buffer-from-1.1.1" = {
@@ -1966,6 +1984,15 @@ let
         sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
       };
     };
+    "call-bind-1.0.0" = {
+      name = "call-bind";
+      packageName = "call-bind";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz";
+        sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==";
+      };
+    };
     "callback-stream-1.1.0" = {
       name = "callback-stream";
       packageName = "callback-stream";
@@ -1993,22 +2020,22 @@ let
         sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
       };
     };
-    "camelcase-6.0.0" = {
+    "camelcase-6.2.0" = {
       name = "camelcase";
       packageName = "camelcase";
-      version = "6.0.0";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz";
-        sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==";
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz";
+        sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==";
       };
     };
-    "caniuse-lite-1.0.30001137" = {
+    "caniuse-lite-1.0.30001154" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001137";
+      version = "1.0.30001154";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz";
-        sha512 = "54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz";
+        sha512 = "y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org==";
       };
     };
     "capture-exit-2.0.0" = {
@@ -2038,15 +2065,6 @@ let
         sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
       };
     };
-    "chalk-3.0.0" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz";
-        sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==";
-      };
-    };
     "chalk-4.1.0" = {
       name = "chalk";
       packageName = "chalk";
@@ -2074,6 +2092,15 @@ let
         sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==";
       };
     };
+    "chokidar-3.4.3" = {
+      name = "chokidar";
+      packageName = "chokidar";
+      version = "3.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz";
+        sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==";
+      };
+    };
     "chownr-1.1.4" = {
       name = "chownr";
       packageName = "chownr";
@@ -2092,6 +2119,15 @@ let
         sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==";
       };
     };
+    "cjs-module-lexer-0.4.3" = {
+      name = "cjs-module-lexer";
+      packageName = "cjs-module-lexer";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.4.3.tgz";
+        sha512 = "5RLK0Qfs0PNDpEyBXIr3bIT1Muw3ojSlvpw6dAmkUcO0+uTrsBn7GuEIgx40u+OzbCBLDta7nvmud85P4EmTsQ==";
+      };
+    };
     "class-utils-0.3.6" = {
       name = "class-utils";
       packageName = "class-utils";
@@ -2191,13 +2227,13 @@ let
         sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
       };
     };
-    "color-string-1.5.3" = {
+    "color-string-1.5.4" = {
       name = "color-string";
       packageName = "color-string";
-      version = "1.5.3";
+      version = "1.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz";
-        sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==";
+        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz";
+        sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==";
       };
     };
     "colors-1.4.0" = {
@@ -2263,13 +2299,13 @@ let
         sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "concat-stream-1.6.2" = {
+    "concat-stream-2.0.0" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "1.6.2";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
-        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz";
+        sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==";
       };
     };
     "console-control-strings-1.1.0" = {
@@ -2362,15 +2398,6 @@ let
         sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==";
       };
     };
-    "d-1.0.1" = {
-      name = "d";
-      packageName = "d";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz";
-        sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==";
-      };
-    };
     "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
@@ -2425,13 +2452,13 @@ let
         sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
       };
     };
-    "decimal.js-10.2.0" = {
+    "decimal.js-10.2.1" = {
       name = "decimal.js";
       packageName = "decimal.js";
-      version = "10.2.0";
+      version = "10.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz";
-        sha512 = "vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==";
+        url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz";
+        sha512 = "KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==";
       };
     };
     "decode-uri-component-0.2.0" = {
@@ -2569,22 +2596,13 @@ let
         sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==";
       };
     };
-    "diff-sequences-25.2.6" = {
+    "diff-sequences-26.5.0" = {
       name = "diff-sequences";
       packageName = "diff-sequences";
-      version = "25.2.6";
+      version = "26.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz";
-        sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==";
-      };
-    };
-    "diff-sequences-26.3.0" = {
-      name = "diff-sequences";
-      packageName = "diff-sequences";
-      version = "26.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.3.0.tgz";
-        sha512 = "5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig==";
+        url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz";
+        sha512 = "ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==";
       };
     };
     "dir-glob-3.0.1" = {
@@ -2641,22 +2659,22 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
-    "electron-to-chromium-1.3.573" = {
+    "electron-to-chromium-1.3.585" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.573";
+      version = "1.3.585";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.573.tgz";
-        sha512 = "oypaNmexr8w0m2GX67fGLQ0Xgsd7uXz7GcwaHZ9eW3ZdQ8uA2+V/wXmLdMTk3gcacbqQGAN7CXWG3fOkfKYftw==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.585.tgz";
+        sha512 = "xoeqjMQhgHDZM7FiglJAb2aeOxHZWFruUc3MbAGTgE7GB8rr5fTn1Sdh5THGuQtndU3GuXlu91ZKqRivxoCZ/A==";
       };
     };
-    "emittery-0.7.1" = {
+    "emittery-0.7.2" = {
       name = "emittery";
       packageName = "emittery";
-      version = "0.7.1";
+      version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz";
-        sha512 = "d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==";
+        url = "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz";
+        sha512 = "A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==";
       };
     };
     "emoji-regex-7.0.3" = {
@@ -2722,94 +2740,13 @@ let
         sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
-    "es-abstract-1.17.6" = {
-      name = "es-abstract";
-      packageName = "es-abstract";
-      version = "1.17.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz";
-        sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==";
-      };
-    };
-    "es-abstract-1.18.0-next.0" = {
-      name = "es-abstract";
-      packageName = "es-abstract";
-      version = "1.18.0-next.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz";
-        sha512 = "elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==";
-      };
-    };
-    "es-to-primitive-1.2.1" = {
-      name = "es-to-primitive";
-      packageName = "es-to-primitive";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
-        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
-      };
-    };
-    "es5-ext-0.10.53" = {
-      name = "es5-ext";
-      packageName = "es5-ext";
-      version = "0.10.53";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz";
-        sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==";
-      };
-    };
-    "es6-iterator-2.0.3" = {
-      name = "es6-iterator";
-      packageName = "es6-iterator";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz";
-        sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
-      };
-    };
-    "es6-map-0.1.5" = {
-      name = "es6-map";
-      packageName = "es6-map";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz";
-        sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0";
-      };
-    };
-    "es6-set-0.1.5" = {
-      name = "es6-set";
-      packageName = "es6-set";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz";
-        sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1";
-      };
-    };
-    "es6-symbol-3.1.1" = {
-      name = "es6-symbol";
-      packageName = "es6-symbol";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
-        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
-      };
-    };
-    "es6-symbol-3.1.3" = {
-      name = "es6-symbol";
-      packageName = "es6-symbol";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz";
-        sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==";
-      };
-    };
-    "escalade-3.1.0" = {
+    "escalade-3.1.1" = {
       name = "escalade";
       packageName = "escalade";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz";
-        sha512 = "mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==";
+        url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz";
+        sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==";
       };
     };
     "escape-html-1.0.3" = {
@@ -2848,13 +2785,13 @@ let
         sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==";
       };
     };
-    "eslint-7.10.0" = {
+    "eslint-7.12.1" = {
       name = "eslint";
       packageName = "eslint";
-      version = "7.10.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz";
-        sha512 = "BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz";
+        sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==";
       };
     };
     "eslint-config-google-0.14.0" = {
@@ -2866,13 +2803,13 @@ let
         sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==";
       };
     };
-    "eslint-plugin-jest-24.0.2" = {
+    "eslint-plugin-jest-24.1.0" = {
       name = "eslint-plugin-jest";
       packageName = "eslint-plugin-jest";
-      version = "24.0.2";
+      version = "24.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.0.2.tgz";
-        sha512 = "DSBLNpkKDOpUJQkTGSs5sVJWsu0nDyQ2rYxkr0Eh7nrkc5bMUr/dlDbtTj3l8y6UaCVsem6rryF1OZrKnz1S5g==";
+        url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.1.0.tgz";
+        sha512 = "827YJ+E8B9PvXu/0eiVSNFfxxndbKv+qE/3GSMhdorCaeaOehtqHGX2YDW9B85TEOre9n/zscledkFW/KbnyGg==";
       };
     };
     "eslint-scope-5.1.1" = {
@@ -2983,15 +2920,6 @@ let
         sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
       };
     };
-    "event-emitter-0.3.5" = {
-      name = "event-emitter";
-      packageName = "event-emitter";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
-        sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
-      };
-    };
     "eventemitter3-4.0.7" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
@@ -3019,13 +2947,13 @@ let
         sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
       };
     };
-    "execa-4.0.3" = {
+    "execa-4.1.0" = {
       name = "execa";
       packageName = "execa";
-      version = "4.0.3";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz";
-        sha512 = "WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==";
+        url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz";
+        sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==";
       };
     };
     "exit-0.1.2" = {
@@ -3055,22 +2983,13 @@ let
         sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==";
       };
     };
-    "expect-26.4.2" = {
+    "expect-26.6.1" = {
       name = "expect";
       packageName = "expect";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/expect/-/expect-26.4.2.tgz";
-        sha512 = "IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA==";
-      };
-    };
-    "ext-1.4.0" = {
-      name = "ext";
-      packageName = "ext";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz";
-        sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==";
+        url = "https://registry.npmjs.org/expect/-/expect-26.6.1.tgz";
+        sha512 = "BRfxIBHagghMmr1D2MRY0Qv5d3Nc8HCqgbDwNXw/9izmM5eBb42a2YjLKSbsqle76ozGkAEPELQX4IdNHAKRNA==";
       };
     };
     "extend-3.0.2" = {
@@ -3163,13 +3082,13 @@ let
         sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==";
       };
     };
-    "fastq-1.8.0" = {
+    "fastq-1.9.0" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.8.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz";
-        sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz";
+        sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==";
       };
     };
     "fb-watchman-2.0.1" = {
@@ -3406,13 +3325,13 @@ let
         sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
       };
     };
-    "gensync-1.0.0-beta.1" = {
+    "gensync-1.0.0-beta.2" = {
       name = "gensync";
       packageName = "gensync";
-      version = "1.0.0-beta.1";
+      version = "1.0.0-beta.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz";
-        sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==";
+        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz";
+        sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
       };
     };
     "get-caller-file-2.0.5" = {
@@ -3424,6 +3343,15 @@ let
         sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
       };
     };
+    "get-intrinsic-1.0.1" = {
+      name = "get-intrinsic";
+      packageName = "get-intrinsic";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz";
+        sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==";
+      };
+    };
     "get-package-type-0.1.0" = {
       name = "get-package-type";
       packageName = "get-package-type";
@@ -3694,13 +3622,13 @@ let
         sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6";
       };
     };
-    "highlight.js-10.2.0" = {
+    "highlight.js-10.3.2" = {
       name = "highlight.js";
       packageName = "highlight.js";
-      version = "10.2.0";
+      version = "10.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.2.0.tgz";
-        sha512 = "OryzPiqqNCfO/wtFo619W+nPYALM6u7iCQkum4bqRmmlcTikOkmlL06i009QelynBPAlNByTQU6cBB2cOBQtCw==";
+        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz";
+        sha512 = "3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw==";
       };
     };
     "hosted-git-info-2.8.8" = {
@@ -3775,13 +3703,13 @@ let
         sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==";
       };
     };
-    "humanize-duration-3.23.1" = {
+    "humanize-duration-3.24.0" = {
       name = "humanize-duration";
       packageName = "humanize-duration";
-      version = "3.23.1";
+      version = "3.24.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.23.1.tgz";
-        sha512 = "aoOEkomAETmVuQyBx4E7/LfPlC9s8pAA/USl7vFRQpDjepo3aiyvFfOhtXSDqPowdBVPFUZ7onG/KyuolX0qPg==";
+        url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.24.0.tgz";
+        sha512 = "B3udnqisaDeRsvUSb+5n2hjxhABI9jotB+i1IEhgHhguTeM5LxIUKoVIu7UpeyaPOygr/Fnv7UhOi45kYYG+tg==";
       };
     };
     "iconv-lite-0.4.24" = {
@@ -3793,13 +3721,13 @@ let
         sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
       };
     };
-    "ieee754-1.1.13" = {
+    "ieee754-1.2.1" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.1.13";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz";
-        sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz";
+        sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==";
       };
     };
     "ignore-4.0.6" = {
@@ -3883,15 +3811,6 @@ let
         sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==";
       };
     };
-    "invariant-2.2.4" = {
-      name = "invariant";
-      packageName = "invariant";
-      version = "2.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz";
-        sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==";
-      };
-    };
     "ip-regex-2.1.0" = {
       name = "ip-regex";
       packageName = "ip-regex";
@@ -3955,6 +3874,15 @@ let
         sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
       };
     };
+    "is-binary-path-2.1.0" = {
+      name = "is-binary-path";
+      packageName = "is-binary-path";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz";
+        sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
+      };
+    };
     "is-buffer-1.1.6" = {
       name = "is-buffer";
       packageName = "is-buffer";
@@ -3964,15 +3892,6 @@ let
         sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
-    "is-callable-1.2.2" = {
-      name = "is-callable";
-      packageName = "is-callable";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
-        sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
-      };
-    };
     "is-ci-2.0.0" = {
       name = "is-ci";
       packageName = "is-ci";
@@ -3982,6 +3901,15 @@ let
         sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==";
       };
     };
+    "is-core-module-2.0.0" = {
+      name = "is-core-module";
+      packageName = "is-core-module";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz";
+        sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==";
+      };
+    };
     "is-data-descriptor-0.1.4" = {
       name = "is-data-descriptor";
       packageName = "is-data-descriptor";
@@ -4000,15 +3928,6 @@ let
         sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
       };
     };
-    "is-date-object-1.0.2" = {
-      name = "is-date-object";
-      packageName = "is-date-object";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
-        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
-      };
-    };
     "is-descriptor-0.1.6" = {
       name = "is-descriptor";
       packageName = "is-descriptor";
@@ -4126,15 +4045,6 @@ let
         sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2";
       };
     };
-    "is-negative-zero-2.0.0" = {
-      name = "is-negative-zero";
-      packageName = "is-negative-zero";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz";
-        sha1 = "9553b121b0fac28869da9ed459e20c7543788461";
-      };
-    };
     "is-number-3.0.0" = {
       name = "is-number";
       packageName = "is-number";
@@ -4171,15 +4081,6 @@ let
         sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397";
       };
     };
-    "is-regex-1.1.1" = {
-      name = "is-regex";
-      packageName = "is-regex";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz";
-        sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==";
-      };
-    };
     "is-relative-1.0.0" = {
       name = "is-relative";
       packageName = "is-relative";
@@ -4207,15 +4108,6 @@ let
         sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
       };
     };
-    "is-symbol-1.0.3" = {
-      name = "is-symbol";
-      packageName = "is-symbol";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
-        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
-      };
-    };
     "is-typedarray-1.0.0" = {
       name = "is-typedarray";
       packageName = "is-typedarray";
@@ -4342,58 +4234,49 @@ let
         sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==";
       };
     };
-    "jest-26.4.2" = {
+    "jest-26.6.1" = {
       name = "jest";
       packageName = "jest";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest/-/jest-26.4.2.tgz";
-        sha512 = "LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw==";
+        url = "https://registry.npmjs.org/jest/-/jest-26.6.1.tgz";
+        sha512 = "f+ahfqw3Ffy+9vA7sWFGpTmhtKEMsNAZiWBVXDkrpIO73zIz22iimjirnV78kh/eWlylmvLh/0WxHN6fZraZdA==";
       };
     };
-    "jest-changed-files-26.3.0" = {
+    "jest-changed-files-26.6.1" = {
       name = "jest-changed-files";
       packageName = "jest-changed-files";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.3.0.tgz";
-        sha512 = "1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g==";
+        url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.1.tgz";
+        sha512 = "NhSdZ5F6b/rIN5V46x1l31vrmukD/bJUXgYAY8VtP1SknYdJwjYDRxuLt7Z8QryIdqCjMIn2C0Cd98EZ4umo8Q==";
       };
     };
-    "jest-cli-26.4.2" = {
+    "jest-cli-26.6.1" = {
       name = "jest-cli";
       packageName = "jest-cli";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.4.2.tgz";
-        sha512 = "zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw==";
+        url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.1.tgz";
+        sha512 = "aPLoEjlwFrCWhiPpW5NUxQA1X1kWsAnQcQ0SO/fHsCvczL3W75iVAcH9kP6NN+BNqZcHNEvkhxT5cDmBfEAh+w==";
       };
     };
-    "jest-config-26.4.2" = {
+    "jest-config-26.6.1" = {
       name = "jest-config";
       packageName = "jest-config";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-config/-/jest-config-26.4.2.tgz";
-        sha512 = "QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A==";
+        url = "https://registry.npmjs.org/jest-config/-/jest-config-26.6.1.tgz";
+        sha512 = "mtJzIynIwW1d1nMlKCNCQiSgWaqFn8cH/fOSNY97xG7Y9tBCZbCSuW2GTX0RPmceSJGO7l27JgwC18LEg0Vg+g==";
       };
     };
-    "jest-diff-25.5.0" = {
+    "jest-diff-26.6.1" = {
       name = "jest-diff";
       packageName = "jest-diff";
-      version = "25.5.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz";
-        sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==";
-      };
-    };
-    "jest-diff-26.4.2" = {
-      name = "jest-diff";
-      packageName = "jest-diff";
-      version = "26.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.4.2.tgz";
-        sha512 = "6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ==";
+        url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.1.tgz";
+        sha512 = "BBNy/zin2m4kG5In126O8chOBxLLS/XMTuuM2+YhgyHk87ewPzKTuTJcqj3lOWOi03NNgrl+DkMeV/exdvG9gg==";
       };
     };
     "jest-docblock-26.0.0" = {
@@ -4405,40 +4288,31 @@ let
         sha512 = "RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==";
       };
     };
-    "jest-each-26.4.2" = {
+    "jest-each-26.6.1" = {
       name = "jest-each";
       packageName = "jest-each";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-each/-/jest-each-26.4.2.tgz";
-        sha512 = "p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA==";
+        url = "https://registry.npmjs.org/jest-each/-/jest-each-26.6.1.tgz";
+        sha512 = "gSn8eB3buchuq45SU7pLB7qmCGax1ZSxfaWuEFblCyNMtyokYaKFh9dRhYPujK6xYL57dLIPhLKatjmB5XWzGA==";
       };
     };
-    "jest-environment-jsdom-26.3.0" = {
+    "jest-environment-jsdom-26.6.1" = {
       name = "jest-environment-jsdom";
       packageName = "jest-environment-jsdom";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz";
-        sha512 = "zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA==";
+        url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.1.tgz";
+        sha512 = "A17RiXuHYNVlkM+3QNcQ6n5EZyAc6eld8ra9TW26luounGWpku4tj03uqRgHJCI1d4uHr5rJiuCH5JFRtdmrcA==";
       };
     };
-    "jest-environment-node-26.3.0" = {
+    "jest-environment-node-26.6.1" = {
       name = "jest-environment-node";
       packageName = "jest-environment-node";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.3.0.tgz";
-        sha512 = "c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw==";
-      };
-    };
-    "jest-get-type-25.2.6" = {
-      name = "jest-get-type";
-      packageName = "jest-get-type";
-      version = "25.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz";
-        sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==";
+        url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.1.tgz";
+        sha512 = "YffaCp6h0j1kbcf1NVZ7umC6CPgD67YS+G1BeornfuSkx5s3xdhuwG0DCxSiHPXyT81FfJzA1L7nXvhq50OWIg==";
       };
     };
     "jest-get-type-26.3.0" = {
@@ -4450,58 +4324,58 @@ let
         sha512 = "TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==";
       };
     };
-    "jest-haste-map-26.3.0" = {
+    "jest-haste-map-26.6.1" = {
       name = "jest-haste-map";
       packageName = "jest-haste-map";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.3.0.tgz";
-        sha512 = "DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA==";
+        url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.1.tgz";
+        sha512 = "9kPafkv0nX6ta1PrshnkiyhhoQoFWncrU/uUBt3/AP1r78WSCU5iLceYRTwDvJl67H3RrXqSlSVDDa/AsUB7OQ==";
       };
     };
-    "jest-jasmine2-26.4.2" = {
+    "jest-jasmine2-26.6.1" = {
       name = "jest-jasmine2";
       packageName = "jest-jasmine2";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz";
-        sha512 = "z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA==";
+        url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.1.tgz";
+        sha512 = "2uYdT32o/ZzSxYAPduAgokO8OlAL1YdG/9oxcEY138EDNpIK5XRRJDaGzTZdIBWSxk0aR8XxN44FvfXtHB+Fiw==";
       };
     };
-    "jest-leak-detector-26.4.2" = {
+    "jest-leak-detector-26.6.1" = {
       name = "jest-leak-detector";
       packageName = "jest-leak-detector";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz";
-        sha512 = "akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA==";
+        url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.1.tgz";
+        sha512 = "j9ZOtJSJKlHjrs4aIxWjiQUjyrffPdiAQn2Iw0916w7qZE5Lk0T2KhIH6E9vfhzP6sw0Q0jtnLLb4vQ71o1HlA==";
       };
     };
-    "jest-matcher-utils-26.4.2" = {
+    "jest-matcher-utils-26.6.1" = {
       name = "jest-matcher-utils";
       packageName = "jest-matcher-utils";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz";
-        sha512 = "KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q==";
+        url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.1.tgz";
+        sha512 = "9iu3zrsYlUnl8pByhREF9rr5eYoiEb1F7ymNKg6lJr/0qD37LWS5FSW/JcoDl8UdMX2+zAzabDs7sTO+QFKjCg==";
       };
     };
-    "jest-message-util-26.3.0" = {
+    "jest-message-util-26.6.1" = {
       name = "jest-message-util";
       packageName = "jest-message-util";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.3.0.tgz";
-        sha512 = "xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA==";
+        url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.1.tgz";
+        sha512 = "cqM4HnqncIebBNdTKrBoWR/4ufHTll0pK/FWwX0YasK+TlBQEMqw3IEdynuuOTjDPFO3ONlFn37280X48beByw==";
       };
     };
-    "jest-mock-26.3.0" = {
+    "jest-mock-26.6.1" = {
       name = "jest-mock";
       packageName = "jest-mock";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.3.0.tgz";
-        sha512 = "PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q==";
+        url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.1.tgz";
+        sha512 = "my0lPTBu1awY8iVG62sB2sx9qf8zxNDVX+5aFgoB8Vbqjb6LqIOsfyFA8P1z6H2IsqMbvOX9oCJnK67Y3yUIMA==";
       };
     };
     "jest-pnp-resolver-1.2.2" = {
@@ -4522,94 +4396,94 @@ let
         sha512 = "Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==";
       };
     };
-    "jest-resolve-26.4.0" = {
+    "jest-resolve-26.6.1" = {
       name = "jest-resolve";
       packageName = "jest-resolve";
-      version = "26.4.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.4.0.tgz";
-        sha512 = "bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg==";
+        url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.1.tgz";
+        sha512 = "hiHfQH6rrcpAmw9xCQ0vD66SDuU+7ZulOuKwc4jpbmFFsz0bQG/Ib92K+9/489u5rVw0btr/ZhiHqBpmkbCvuQ==";
       };
     };
-    "jest-resolve-dependencies-26.4.2" = {
+    "jest-resolve-dependencies-26.6.1" = {
       name = "jest-resolve-dependencies";
       packageName = "jest-resolve-dependencies";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz";
-        sha512 = "ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ==";
+        url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.1.tgz";
+        sha512 = "MN6lufbZJ3RBfTnJesZtHu3hUCBqPdHRe2+FhIt0yiqJ3fMgzWRqMRQyN/d/QwOE7KXwAG2ekZutbPhuD7s51A==";
       };
     };
-    "jest-runner-26.4.2" = {
+    "jest-runner-26.6.1" = {
       name = "jest-runner";
       packageName = "jest-runner";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.4.2.tgz";
-        sha512 = "FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g==";
+        url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.1.tgz";
+        sha512 = "DmpNGdgsbl5s0FGkmsInmqnmqCtliCSnjWA2TFAJS1m1mL5atwfPsf+uoZ8uYQ2X0uDj4NM+nPcDnUpbNTRMBA==";
       };
     };
-    "jest-runtime-26.4.2" = {
+    "jest-runtime-26.6.1" = {
       name = "jest-runtime";
       packageName = "jest-runtime";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.4.2.tgz";
-        sha512 = "4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ==";
+        url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.1.tgz";
+        sha512 = "7uOCNeezXDWgjEyzYbRN2ViY7xNZzusNVGAMmU0UHRUNXuY4j4GBHKGMqPo/cBPZA9bSYp+lwK2DRRBU5Dv6YQ==";
       };
     };
-    "jest-serializer-26.3.0" = {
+    "jest-serializer-26.5.0" = {
       name = "jest-serializer";
       packageName = "jest-serializer";
-      version = "26.3.0";
+      version = "26.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.3.0.tgz";
-        sha512 = "IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow==";
+        url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz";
+        sha512 = "+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==";
       };
     };
-    "jest-snapshot-26.4.2" = {
+    "jest-snapshot-26.6.1" = {
       name = "jest-snapshot";
       packageName = "jest-snapshot";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.4.2.tgz";
-        sha512 = "N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg==";
+        url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.1.tgz";
+        sha512 = "JA7bZp7HRTIJYAi85pJ/OZ2eur2dqmwIToA5/6d7Mn90isGEfeF9FvuhDLLEczgKP1ihreBzrJ6Vr7zteP5JNA==";
       };
     };
-    "jest-util-26.3.0" = {
+    "jest-util-26.6.1" = {
       name = "jest-util";
       packageName = "jest-util";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-util/-/jest-util-26.3.0.tgz";
-        sha512 = "4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw==";
+        url = "https://registry.npmjs.org/jest-util/-/jest-util-26.6.1.tgz";
+        sha512 = "xCLZUqVoqhquyPLuDXmH7ogceGctbW8SMyQVjD9o+1+NPWI7t0vO08udcFLVPLgKWcvc+zotaUv/RuaR6l8HIA==";
       };
     };
-    "jest-validate-26.4.2" = {
+    "jest-validate-26.6.1" = {
       name = "jest-validate";
       packageName = "jest-validate";
-      version = "26.4.2";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.4.2.tgz";
-        sha512 = "blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ==";
+        url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.1.tgz";
+        sha512 = "BEFpGbylKocnNPZULcnk+TGaz1oFZQH/wcaXlaXABbu0zBwkOGczuWgdLucUouuQqn7VadHZZeTvo8VSFDLMOA==";
       };
     };
-    "jest-watcher-26.3.0" = {
+    "jest-watcher-26.6.1" = {
       name = "jest-watcher";
       packageName = "jest-watcher";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.3.0.tgz";
-        sha512 = "XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ==";
+        url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.1.tgz";
+        sha512 = "0LBIPPncNi9CaLKK15bnxyd2E8OMl4kJg0PTiNOI+MXztXw1zVdtX/x9Pr6pXaQYps+eS/ts43O4+HByZ7yJSw==";
       };
     };
-    "jest-worker-26.3.0" = {
+    "jest-worker-26.6.1" = {
       name = "jest-worker";
       packageName = "jest-worker";
-      version = "26.3.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz";
-        sha512 = "Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==";
+        url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.1.tgz";
+        sha512 = "R5IE3qSGz+QynJx8y+ICEkdI2OJ3RJjRQVEyCcFAd3yVhQSEtquziPO29Mlzgn07LOVE8u8jhJ1FqcwegiXWOw==";
       };
     };
     "js-tokens-4.0.0" = {
@@ -4720,13 +4594,13 @@ let
         sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==";
       };
     };
-    "jsonfile-6.0.1" = {
+    "jsonfile-6.1.0" = {
       name = "jsonfile";
       packageName = "jsonfile";
-      version = "6.0.1";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz";
-        sha512 = "jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==";
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz";
+        sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==";
       };
     };
     "jsprim-1.4.1" = {
@@ -4810,15 +4684,6 @@ let
         sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==";
       };
     };
-    "levenary-1.1.1" = {
-      name = "levenary";
-      packageName = "levenary";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz";
-        sha512 = "mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==";
-      };
-    };
     "levn-0.3.0" = {
       name = "levn";
       packageName = "levn";
@@ -4882,15 +4747,6 @@ let
         sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==";
       };
     };
-    "loose-envify-1.4.0" = {
-      name = "loose-envify";
-      packageName = "loose-envify";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz";
-        sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==";
-      };
-    };
     "lunr-2.3.9" = {
       name = "lunr";
       packageName = "lunr";
@@ -4945,13 +4801,13 @@ let
         sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
       };
     };
-    "marked-1.1.1" = {
+    "marked-1.2.2" = {
       name = "marked";
       packageName = "marked";
-      version = "1.1.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz";
-        sha512 = "mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw==";
+        url = "https://registry.npmjs.org/marked/-/marked-1.2.2.tgz";
+        sha512 = "5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ==";
       };
     };
     "merge-stream-2.0.0" = {
@@ -5098,22 +4954,22 @@ let
         sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==";
       };
     };
-    "moment-2.29.0" = {
+    "moment-2.29.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.29.0";
+      version = "2.29.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz";
-        sha512 = "z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==";
+        url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz";
+        sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==";
       };
     };
-    "mqtt-4.2.1" = {
+    "mqtt-4.2.4" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "4.2.1";
+      version = "4.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.1.tgz";
-        sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg==";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.4.tgz";
+        sha512 = "g3tJt5UOS1Wqn/xntl4JhlJW51OM8CvgEmY8cwZ1zecE5G7uuwjSUUvgGeVDiEMWJ5vXCfZz2VMCQGNvKhzfEQ==";
       };
     };
     "mqtt-packet-6.6.0" = {
@@ -5152,13 +5008,13 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
-    "nan-2.14.1" = {
+    "nan-2.14.2" = {
       name = "nan";
       packageName = "nan";
-      version = "2.14.1";
+      version = "2.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz";
-        sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==";
+        url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz";
+        sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==";
       };
     };
     "nanomatch-1.2.13" = {
@@ -5197,15 +5053,6 @@ let
         sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==";
       };
     };
-    "next-tick-1.0.0" = {
-      name = "next-tick";
-      packageName = "next-tick";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz";
-        sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
-      };
-    };
     "nice-try-1.0.5" = {
       name = "nice-try";
       packageName = "nice-try";
@@ -5251,13 +5098,13 @@ let
         sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==";
       };
     };
-    "node-releases-1.1.61" = {
+    "node-releases-1.1.65" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.61";
+      version = "1.1.65";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz";
-        sha512 = "DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.65.tgz";
+        sha512 = "YpzJOe2WFIW0V4ZkJQd/DGR/zdVwc/pI4Nl1CZrBO19FdRcSTmsuhdttw9rsTzzJLrNcSloLiBbEYx1C4f6gpA==";
       };
     };
     "noop-logger-0.1.1" = {
@@ -5377,15 +5224,6 @@ let
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
-    "object-inspect-1.8.0" = {
-      name = "object-inspect";
-      packageName = "object-inspect";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz";
-        sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==";
-      };
-    };
     "object-keys-1.1.1" = {
       name = "object-keys";
       packageName = "object-keys";
@@ -5404,13 +5242,13 @@ let
         sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
       };
     };
-    "object.assign-4.1.1" = {
+    "object.assign-4.1.2" = {
       name = "object.assign";
       packageName = "object.assign";
-      version = "4.1.1";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz";
-        sha512 = "VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==";
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
+        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
       };
     };
     "object.pick-1.3.0" = {
@@ -5692,13 +5530,13 @@ let
         sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab";
       };
     };
-    "prebuild-install-5.3.5" = {
+    "prebuild-install-5.3.6" = {
       name = "prebuild-install";
       packageName = "prebuild-install";
-      version = "5.3.5";
+      version = "5.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.5.tgz";
-        sha512 = "YmMO7dph9CYKi5IR/BzjOJlRzpxGGVo1EsLSUZ0mt/Mq0HWZIHOKHHcHdT69yG54C9m6i45GpItwRHpk0Py7Uw==";
+        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz";
+        sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg==";
       };
     };
     "prelude-ls-1.1.2" = {
@@ -5719,22 +5557,13 @@ let
         sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==";
       };
     };
-    "pretty-format-25.5.0" = {
+    "pretty-format-26.6.1" = {
       name = "pretty-format";
       packageName = "pretty-format";
-      version = "25.5.0";
+      version = "26.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz";
-        sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==";
-      };
-    };
-    "pretty-format-26.4.2" = {
-      name = "pretty-format";
-      packageName = "pretty-format";
-      version = "26.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz";
-        sha512 = "zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==";
+        url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.1.tgz";
+        sha512 = "MeqqsP5PYcRBbGMvwzsyBdmAJ4EFX7pWFyl7x4+dMVg5pE0ZDdBIvEH2ergvIO+Gvwv1wh64YuOY9y5LuyY/GA==";
       };
     };
     "process-nextick-args-2.0.1" = {
@@ -5755,13 +5584,13 @@ let
         sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==";
       };
     };
-    "prompts-2.3.2" = {
+    "prompts-2.4.0" = {
       name = "prompts";
       packageName = "prompts";
-      version = "2.3.2";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz";
-        sha512 = "Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==";
+        url = "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz";
+        sha512 = "awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==";
       };
     };
     "psl-1.8.0" = {
@@ -5836,13 +5665,13 @@ let
         sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
       };
     };
-    "react-is-16.13.1" = {
+    "react-is-17.0.1" = {
       name = "react-is";
       packageName = "react-is";
-      version = "16.13.1";
+      version = "17.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz";
-        sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==";
+        url = "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz";
+        sha512 = "NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==";
       };
     };
     "read-pkg-5.2.0" = {
@@ -5890,6 +5719,15 @@ let
         sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==";
       };
     };
+    "readdirp-3.5.0" = {
+      name = "readdirp";
+      packageName = "readdirp";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz";
+        sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==";
+      };
+    };
     "rechoir-0.6.2" = {
       name = "rechoir";
       packageName = "rechoir";
@@ -6070,13 +5908,13 @@ let
         sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
       };
     };
-    "resolve-1.17.0" = {
+    "resolve-1.18.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.17.0";
+      version = "1.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz";
-        sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz";
+        sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==";
       };
     };
     "resolve-cwd-3.0.0" = {
@@ -6160,13 +5998,13 @@ let
         sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==";
       };
     };
-    "run-parallel-1.1.9" = {
+    "run-parallel-1.1.10" = {
       name = "run-parallel";
       packageName = "run-parallel";
-      version = "1.1.9";
+      version = "1.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
-        sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==";
+        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz";
+        sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -6268,13 +6106,13 @@ let
         sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==";
       };
     };
-    "serialport-9.0.1" = {
+    "serialport-9.0.2" = {
       name = "serialport";
       packageName = "serialport";
-      version = "9.0.1";
+      version = "9.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialport/-/serialport-9.0.1.tgz";
-        sha512 = "35Ms8dqjtAb73lptfEZG2l/nFZOxHt3hUjCHvl+g3Mu737gzFLDpSBrRywBJw4G4eS5ozZ3YcthwYnop1WO+ng==";
+        url = "https://registry.npmjs.org/serialport/-/serialport-9.0.2.tgz";
+        sha512 = "N++EVrc2F3kUJ6aCE6BLxHwTrelFAZM3LFw4lo8TV0fDtfrwTc3+aoDpSsvfQg3DxrRf3shCtA6WYEH4g8kapw==";
       };
     };
     "serve-static-1.14.1" = {
@@ -6691,24 +6529,6 @@ let
         sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==";
       };
     };
-    "string.prototype.trimend-1.0.1" = {
-      name = "string.prototype.trimend";
-      packageName = "string.prototype.trimend";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
-        sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==";
-      };
-    };
-    "string.prototype.trimstart-1.0.1" = {
-      name = "string.prototype.trimstart";
-      packageName = "string.prototype.trimstart";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
-        sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==";
-      };
-    };
     "string_decoder-1.1.1" = {
       name = "string_decoder";
       packageName = "string_decoder";
@@ -7033,13 +6853,13 @@ let
         sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==";
       };
     };
-    "tslib-1.13.0" = {
+    "tslib-1.14.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.13.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz";
-        sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
+        sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     };
     "tsutils-3.17.1" = {
@@ -7069,24 +6889,6 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
-    "type-1.2.0" = {
-      name = "type";
-      packageName = "type";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz";
-        sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==";
-      };
-    };
-    "type-2.1.0" = {
-      name = "type";
-      packageName = "type";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type/-/type-2.1.0.tgz";
-        sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==";
-      };
-    };
     "type-check-0.3.2" = {
       name = "type-check";
       packageName = "type-check";
@@ -7177,13 +6979,13 @@ let
         sha512 = "Y4Lf+qIb9NTydrexlazAM46SSLrmrQRqWiD52593g53SsmUFioAsMWt8m834J6qsp+7wHRjxCXSZeiiW5cMUdw==";
       };
     };
-    "typedoc-plugin-markdown-3.0.3" = {
+    "typedoc-plugin-markdown-3.0.11" = {
       name = "typedoc-plugin-markdown";
       packageName = "typedoc-plugin-markdown";
-      version = "3.0.3";
+      version = "3.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.0.3.tgz";
-        sha512 = "cVa9BUkJw5IeadihNDlTy4e5yq1T0ZpNXzc+/vkgxdVJwgt1BQVQHSZYUNDa2R8nrlYmP9yt3ZQDxG9nIg4++A==";
+        url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.0.11.tgz";
+        sha512 = "/BE/PqnIVbQJ525czM+T3CVaA1gVN9X1Le100z8TV/Lze8LZVkuAUiHRIgw9BKYFm9IQaB88W55k4EV6uUVwYQ==";
       };
     };
     "typedoc-plugin-no-inherit-1.2.0" = {
@@ -7204,22 +7006,22 @@ let
         sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA==";
       };
     };
-    "typescript-4.0.3" = {
+    "typescript-4.0.5" = {
       name = "typescript";
       packageName = "typescript";
-      version = "4.0.3";
+      version = "4.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz";
-        sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz";
+        sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==";
       };
     };
-    "uglify-js-3.10.4" = {
+    "uglify-js-3.11.4" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.10.4";
+      version = "3.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz";
-        sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.4.tgz";
+        sha512 = "FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw==";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -7294,6 +7096,15 @@ let
         sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==";
       };
     };
+    "universalify-2.0.0" = {
+      name = "universalify";
+      packageName = "universalify";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz";
+        sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==";
+      };
+    };
     "unix-dgram-2.0.3" = {
       name = "unix-dgram";
       packageName = "unix-dgram";
@@ -7375,31 +7186,31 @@ let
         sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
-    "uuid-8.3.0" = {
+    "uuid-8.3.1" = {
       name = "uuid";
       packageName = "uuid";
-      version = "8.3.0";
+      version = "8.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz";
-        sha512 = "fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz";
+        sha512 = "FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==";
       };
     };
-    "v8-compile-cache-2.1.1" = {
+    "v8-compile-cache-2.2.0" = {
       name = "v8-compile-cache";
       packageName = "v8-compile-cache";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz";
-        sha512 = "8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==";
+        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz";
+        sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==";
       };
     };
-    "v8-to-istanbul-5.0.1" = {
+    "v8-to-istanbul-6.0.1" = {
       name = "v8-to-istanbul";
       packageName = "v8-to-istanbul";
-      version = "5.0.1";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz";
-        sha512 = "mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==";
+        url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-6.0.1.tgz";
+        sha512 = "PzM1WlqquhBvsV+Gco6WSFeg1AGdD53ccMRkFeyHRE/KRZaVacPOmQYP3EeVgDBtKD2BJ8kgynBQ5OtKiHCH+w==";
       };
     };
     "validate-npm-package-license-3.0.4" = {
@@ -7483,13 +7294,13 @@ let
         sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==";
       };
     };
-    "whatwg-url-8.2.2" = {
+    "whatwg-url-8.4.0" = {
       name = "whatwg-url";
       packageName = "whatwg-url";
-      version = "8.2.2";
+      version = "8.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz";
-        sha512 = "PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ==";
+        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz";
+        sha512 = "vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==";
       };
     };
     "which-1.3.1" = {
@@ -7681,95 +7492,87 @@ let
         sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
       };
     };
-    "zigbee-herdsman-0.13.11" = {
+    "zigbee-herdsman-0.13.26" = {
       name = "zigbee-herdsman";
       packageName = "zigbee-herdsman";
-      version = "0.13.11";
+      version = "0.13.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.11.tgz";
-        sha512 = "VgsTcYE9lHyXCaHYgzo0Jbtx69YV34YshfqRrcmst59pMmcGN3Vco3TG9FW7SVIJrsZKtVNKTLaUsxzM/9VcIg==";
+        url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.26.tgz";
+        sha512 = "NNPNmcqP7SaSdwzPGF4IjXczBnwX6rHXwB89t9faLDOLxAJgNU4EtFnLQXVrKi1t6ItMMfWzE9YtNdopSWicig==";
       };
     };
-    "zigbee-herdsman-converters-12.0.194" = {
+    "zigbee-herdsman-converters-12.0.224" = {
       name = "zigbee-herdsman-converters";
       packageName = "zigbee-herdsman-converters";
-      version = "12.0.194";
+      version = "12.0.224";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.194.tgz";
-        sha512 = "0g4hZHKGKIgVNxYZ967tbmijMX/GAKt67dUXizFuMlt3bLTJbzDSfSG4b3XMRfvnDVbFU8gyEs841l7UbO1NzA==";
+        url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.224.tgz";
+        sha512 = "Iej1T5biRrXuKOdC6bsT8HDpayZSao/I4DWNstYlSyJhpa3QM0vZLbS4QexVmkG35gebrs1MSC7RVT4kUqizrw==";
       };
     };
-    "zigbee2mqtt-frontend-0.2.17" = {
+    "zigbee2mqtt-frontend-0.2.68" = {
       name = "zigbee2mqtt-frontend";
       packageName = "zigbee2mqtt-frontend";
-      version = "0.2.17";
+      version = "0.2.68";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.2.17.tgz";
-        sha512 = "t5Alx8m2aLq5lVWKzY3qc7+YwSE1noRyVTjVBTKL/DgbdwCsKZ/D1J1ZdKyAMAPM2GUsqgBGQU+XmDXZ5TDf8A==";
+        url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.2.68.tgz";
+        sha512 = "i89/EG+wQZ4m+O8I9VPuIgsAOxtft/e1pH5qqZeFcDvQg2iRuvRWR7CuEFJ4FnbakjOXU62eGldfzqsoq/m9Tw==";
       };
     };
   };
   args = {
     name = "zigbee2mqtt";
     packageName = "zigbee2mqtt";
-    version = "1.15.0";
+    version = "1.16.0";
     src = ./.;
     dependencies = [
       sources."@dabh/diagnostics-2.0.2"
-      sources."ajv-6.12.5"
+      sources."ajv-6.12.6"
       sources."argparse-1.0.10"
       sources."async-3.2.0"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.3.1"
       sources."bindings-1.5.0"
-      (sources."bl-4.0.3" // {
+      sources."bl-4.0.3"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-5.7.0"
+      sources."buffer-from-1.1.1"
+      (sources."callback-stream-1.1.0" // {
         dependencies = [
-          sources."readable-stream-3.6.0"
+          sources."readable-stream-2.3.7"
+          sources."safe-buffer-5.1.2"
+          sources."string_decoder-1.1.1"
         ];
       })
-      sources."brace-expansion-1.1.11"
-      sources."buffer-5.6.0"
-      sources."buffer-from-1.1.1"
-      sources."callback-stream-1.1.0"
       sources."color-3.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."color-string-1.5.3"
+      sources."color-string-1.5.4"
       sources."colors-1.4.0"
       sources."colorspace-1.1.2"
       sources."commist-1.1.0"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
+      sources."concat-stream-2.0.0"
       sources."core-util-is-1.0.2"
-      sources."d-1.0.1"
       sources."debounce-1.2.0"
       sources."debug-2.6.9"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
-      sources."duplexify-3.7.1"
+      (sources."duplexify-3.7.1" // {
+        dependencies = [
+          sources."readable-stream-2.3.7"
+          sources."safe-buffer-5.1.2"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."ee-first-1.1.1"
       sources."enabled-2.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      sources."es5-ext-0.10.53"
-      sources."es6-iterator-2.0.3"
-      sources."es6-map-0.1.5"
-      (sources."es6-set-0.1.5" // {
-        dependencies = [
-          sources."es6-symbol-3.1.1"
-        ];
-      })
-      sources."es6-symbol-3.1.3"
       sources."escape-html-1.0.3"
       sources."esprima-4.0.1"
       sources."etag-1.8.1"
-      sources."event-emitter-0.3.5"
       sources."eventemitter3-4.0.7"
-      (sources."ext-1.4.0" // {
-        dependencies = [
-          sources."type-2.1.0"
-        ];
-      })
       sources."extend-3.0.2"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
@@ -7784,13 +7587,19 @@ let
       sources."git-last-commit-1.0.0"
       sources."glob-7.1.6"
       sources."glob-parent-3.1.0"
-      sources."glob-stream-6.1.0"
+      (sources."glob-stream-6.1.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.7"
+          sources."safe-buffer-5.1.2"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."glossy-0.1.7"
       sources."help-me-1.1.0"
       sources."http-errors-1.7.3"
       sources."http-proxy-1.18.1"
-      sources."humanize-duration-3.23.1"
-      sources."ieee754-1.1.13"
+      sources."humanize-duration-3.24.0"
+      sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-absolute-1.0.0"
@@ -7817,8 +7626,8 @@ let
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."mkdir-recursive-0.4.0"
-      sources."moment-2.29.0"
-      (sources."mqtt-4.2.1" // {
+      sources."moment-2.29.1"
+      (sources."mqtt-4.2.4" // {
         dependencies = [
           sources."debug-4.2.0"
           sources."ms-2.1.2"
@@ -7831,13 +7640,18 @@ let
         ];
       })
       sources."ms-2.0.0"
-      sources."nan-2.14.1"
-      sources."next-tick-1.0.0"
+      sources."nan-2.14.2"
       sources."object-assign-deep-0.4.0"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."one-time-1.0.0"
-      sources."ordered-read-streams-1.0.1"
+      (sources."ordered-read-streams-1.0.1" // {
+        dependencies = [
+          sources."readable-stream-2.3.7"
+          sources."safe-buffer-5.1.2"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."parseurl-1.3.3"
       sources."path-dirname-1.0.2"
       sources."path-is-absolute-1.0.1"
@@ -7850,12 +7664,12 @@ let
       })
       sources."punycode-2.1.1"
       sources."range-parser-1.2.1"
-      sources."readable-stream-2.3.7"
+      sources."readable-stream-3.6.0"
       sources."reinterval-1.1.0"
       sources."remove-trailing-separator-1.1.0"
       sources."requires-port-1.0.0"
       sources."rimraf-3.0.2"
-      sources."safe-buffer-5.1.2"
+      sources."safe-buffer-5.2.1"
       sources."semver-7.3.2"
       (sources."send-0.17.1" // {
         dependencies = [
@@ -7865,23 +7679,24 @@ let
       sources."serve-static-1.14.1"
       sources."setprototypeof-1.1.1"
       sources."simple-swizzle-0.2.2"
-      (sources."split2-3.2.2" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-        ];
-      })
+      sources."split2-3.2.2"
       sources."sprintf-js-1.0.3"
       sources."stack-trace-0.0.10"
       sources."statuses-1.5.0"
       sources."stream-shift-1.0.1"
-      sources."string_decoder-1.1.1"
+      sources."string_decoder-1.3.0"
       sources."text-hex-1.0.0"
-      sources."through2-2.0.5"
+      (sources."through2-2.0.5" // {
+        dependencies = [
+          sources."readable-stream-2.3.7"
+          sources."safe-buffer-5.1.2"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."through2-filter-3.0.0"
       sources."to-absolute-glob-2.0.2"
       sources."toidentifier-1.0.0"
       sources."triple-beam-1.3.0"
-      sources."type-1.2.0"
       sources."typedarray-0.0.6"
       sources."unc-path-regex-0.1.2"
       sources."unique-stream-2.3.1"
@@ -7889,65 +7704,68 @@ let
       sources."unpipe-1.0.0"
       sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
-      (sources."winston-3.3.3" // {
+      sources."winston-3.3.3"
+      sources."winston-syslog-2.4.4"
+      (sources."winston-transport-4.4.0" // {
         dependencies = [
-          sources."readable-stream-3.6.0"
+          sources."readable-stream-2.3.7"
+          sources."safe-buffer-5.1.2"
+          sources."string_decoder-1.1.1"
         ];
       })
-      sources."winston-syslog-2.4.4"
-      sources."winston-transport-4.4.0"
       sources."wrappy-1.0.2"
       sources."ws-7.3.1"
       sources."xtend-4.0.2"
-      (sources."zigbee-herdsman-0.13.11" // {
+      (sources."zigbee-herdsman-0.13.26" // {
         dependencies = [
-          sources."@babel/cli-7.11.6"
+          sources."@babel/cli-7.12.1"
           sources."@babel/code-frame-7.10.4"
-          sources."@babel/compat-data-7.11.0"
-          sources."@babel/core-7.11.6"
-          sources."@babel/generator-7.11.6"
+          sources."@babel/compat-data-7.12.1"
+          sources."@babel/core-7.12.3"
+          sources."@babel/generator-7.12.1"
           sources."@babel/helper-annotate-as-pure-7.10.4"
           sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
-          sources."@babel/helper-compilation-targets-7.10.4"
-          sources."@babel/helper-create-class-features-plugin-7.10.5"
-          sources."@babel/helper-create-regexp-features-plugin-7.10.4"
+          sources."@babel/helper-compilation-targets-7.12.1"
+          sources."@babel/helper-create-class-features-plugin-7.12.1"
+          sources."@babel/helper-create-regexp-features-plugin-7.12.1"
           sources."@babel/helper-define-map-7.10.5"
-          sources."@babel/helper-explode-assignable-expression-7.11.4"
+          sources."@babel/helper-explode-assignable-expression-7.12.1"
           sources."@babel/helper-function-name-7.10.4"
           sources."@babel/helper-get-function-arity-7.10.4"
           sources."@babel/helper-hoist-variables-7.10.4"
-          sources."@babel/helper-member-expression-to-functions-7.11.0"
-          sources."@babel/helper-module-imports-7.10.4"
-          sources."@babel/helper-module-transforms-7.11.0"
+          sources."@babel/helper-member-expression-to-functions-7.12.1"
+          sources."@babel/helper-module-imports-7.12.1"
+          sources."@babel/helper-module-transforms-7.12.1"
           sources."@babel/helper-optimise-call-expression-7.10.4"
           sources."@babel/helper-plugin-utils-7.10.4"
           sources."@babel/helper-regex-7.10.5"
-          sources."@babel/helper-remap-async-to-generator-7.11.4"
-          sources."@babel/helper-replace-supers-7.10.4"
-          sources."@babel/helper-simple-access-7.10.4"
-          sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0"
+          sources."@babel/helper-remap-async-to-generator-7.12.1"
+          sources."@babel/helper-replace-supers-7.12.1"
+          sources."@babel/helper-simple-access-7.12.1"
+          sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
           sources."@babel/helper-split-export-declaration-7.11.0"
           sources."@babel/helper-validator-identifier-7.10.4"
-          sources."@babel/helper-wrap-function-7.10.4"
-          sources."@babel/helpers-7.10.4"
+          sources."@babel/helper-validator-option-7.12.1"
+          sources."@babel/helper-wrap-function-7.12.3"
+          sources."@babel/helpers-7.12.1"
           sources."@babel/highlight-7.10.4"
-          sources."@babel/parser-7.11.5"
-          sources."@babel/plugin-proposal-async-generator-functions-7.10.5"
-          sources."@babel/plugin-proposal-class-properties-7.10.4"
-          sources."@babel/plugin-proposal-dynamic-import-7.10.4"
-          sources."@babel/plugin-proposal-export-namespace-from-7.10.4"
-          sources."@babel/plugin-proposal-json-strings-7.10.4"
-          sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0"
-          sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4"
-          sources."@babel/plugin-proposal-numeric-separator-7.10.4"
-          sources."@babel/plugin-proposal-object-rest-spread-7.11.0"
-          sources."@babel/plugin-proposal-optional-catch-binding-7.10.4"
-          sources."@babel/plugin-proposal-optional-chaining-7.11.0"
-          sources."@babel/plugin-proposal-private-methods-7.10.4"
-          sources."@babel/plugin-proposal-unicode-property-regex-7.10.4"
+          sources."@babel/parser-7.12.3"
+          sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
+          sources."@babel/plugin-proposal-class-properties-7.12.1"
+          sources."@babel/plugin-proposal-dynamic-import-7.12.1"
+          sources."@babel/plugin-proposal-export-namespace-from-7.12.1"
+          sources."@babel/plugin-proposal-json-strings-7.12.1"
+          sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
+          sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
+          sources."@babel/plugin-proposal-numeric-separator-7.12.1"
+          sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
+          sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
+          sources."@babel/plugin-proposal-optional-chaining-7.12.1"
+          sources."@babel/plugin-proposal-private-methods-7.12.1"
+          sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
           sources."@babel/plugin-syntax-async-generators-7.8.4"
           sources."@babel/plugin-syntax-bigint-7.8.3"
-          sources."@babel/plugin-syntax-class-properties-7.10.4"
+          sources."@babel/plugin-syntax-class-properties-7.12.1"
           sources."@babel/plugin-syntax-dynamic-import-7.8.3"
           sources."@babel/plugin-syntax-export-namespace-from-7.8.3"
           sources."@babel/plugin-syntax-import-meta-7.10.4"
@@ -7958,51 +7776,51 @@ let
           sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
           sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
           sources."@babel/plugin-syntax-optional-chaining-7.8.3"
-          sources."@babel/plugin-syntax-top-level-await-7.10.4"
-          sources."@babel/plugin-syntax-typescript-7.10.4"
-          sources."@babel/plugin-transform-arrow-functions-7.10.4"
-          sources."@babel/plugin-transform-async-to-generator-7.10.4"
-          sources."@babel/plugin-transform-block-scoped-functions-7.10.4"
-          sources."@babel/plugin-transform-block-scoping-7.11.1"
-          sources."@babel/plugin-transform-classes-7.10.4"
-          sources."@babel/plugin-transform-computed-properties-7.10.4"
-          sources."@babel/plugin-transform-destructuring-7.10.4"
-          sources."@babel/plugin-transform-dotall-regex-7.10.4"
-          sources."@babel/plugin-transform-duplicate-keys-7.10.4"
-          sources."@babel/plugin-transform-exponentiation-operator-7.10.4"
-          sources."@babel/plugin-transform-for-of-7.10.4"
-          sources."@babel/plugin-transform-function-name-7.10.4"
-          sources."@babel/plugin-transform-literals-7.10.4"
-          sources."@babel/plugin-transform-member-expression-literals-7.10.4"
-          sources."@babel/plugin-transform-modules-amd-7.10.5"
-          sources."@babel/plugin-transform-modules-commonjs-7.10.4"
-          sources."@babel/plugin-transform-modules-systemjs-7.10.5"
-          sources."@babel/plugin-transform-modules-umd-7.10.4"
-          sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4"
-          sources."@babel/plugin-transform-new-target-7.10.4"
-          sources."@babel/plugin-transform-object-super-7.10.4"
-          sources."@babel/plugin-transform-parameters-7.10.5"
-          sources."@babel/plugin-transform-property-literals-7.10.4"
-          sources."@babel/plugin-transform-regenerator-7.10.4"
-          sources."@babel/plugin-transform-reserved-words-7.10.4"
-          sources."@babel/plugin-transform-shorthand-properties-7.10.4"
-          sources."@babel/plugin-transform-spread-7.11.0"
-          sources."@babel/plugin-transform-sticky-regex-7.10.4"
-          sources."@babel/plugin-transform-template-literals-7.10.5"
-          sources."@babel/plugin-transform-typeof-symbol-7.10.4"
-          sources."@babel/plugin-transform-typescript-7.11.0"
-          sources."@babel/plugin-transform-unicode-escapes-7.10.4"
-          sources."@babel/plugin-transform-unicode-regex-7.10.4"
-          sources."@babel/preset-env-7.11.5"
+          sources."@babel/plugin-syntax-top-level-await-7.12.1"
+          sources."@babel/plugin-syntax-typescript-7.12.1"
+          sources."@babel/plugin-transform-arrow-functions-7.12.1"
+          sources."@babel/plugin-transform-async-to-generator-7.12.1"
+          sources."@babel/plugin-transform-block-scoped-functions-7.12.1"
+          sources."@babel/plugin-transform-block-scoping-7.12.1"
+          sources."@babel/plugin-transform-classes-7.12.1"
+          sources."@babel/plugin-transform-computed-properties-7.12.1"
+          sources."@babel/plugin-transform-destructuring-7.12.1"
+          sources."@babel/plugin-transform-dotall-regex-7.12.1"
+          sources."@babel/plugin-transform-duplicate-keys-7.12.1"
+          sources."@babel/plugin-transform-exponentiation-operator-7.12.1"
+          sources."@babel/plugin-transform-for-of-7.12.1"
+          sources."@babel/plugin-transform-function-name-7.12.1"
+          sources."@babel/plugin-transform-literals-7.12.1"
+          sources."@babel/plugin-transform-member-expression-literals-7.12.1"
+          sources."@babel/plugin-transform-modules-amd-7.12.1"
+          sources."@babel/plugin-transform-modules-commonjs-7.12.1"
+          sources."@babel/plugin-transform-modules-systemjs-7.12.1"
+          sources."@babel/plugin-transform-modules-umd-7.12.1"
+          sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1"
+          sources."@babel/plugin-transform-new-target-7.12.1"
+          sources."@babel/plugin-transform-object-super-7.12.1"
+          sources."@babel/plugin-transform-parameters-7.12.1"
+          sources."@babel/plugin-transform-property-literals-7.12.1"
+          sources."@babel/plugin-transform-regenerator-7.12.1"
+          sources."@babel/plugin-transform-reserved-words-7.12.1"
+          sources."@babel/plugin-transform-shorthand-properties-7.12.1"
+          sources."@babel/plugin-transform-spread-7.12.1"
+          sources."@babel/plugin-transform-sticky-regex-7.12.1"
+          sources."@babel/plugin-transform-template-literals-7.12.1"
+          sources."@babel/plugin-transform-typeof-symbol-7.12.1"
+          sources."@babel/plugin-transform-typescript-7.12.1"
+          sources."@babel/plugin-transform-unicode-escapes-7.12.1"
+          sources."@babel/plugin-transform-unicode-regex-7.12.1"
+          sources."@babel/preset-env-7.12.1"
           sources."@babel/preset-modules-0.1.4"
-          sources."@babel/preset-typescript-7.10.4"
-          sources."@babel/runtime-7.11.2"
+          sources."@babel/preset-typescript-7.12.1"
+          sources."@babel/runtime-7.12.1"
           sources."@babel/template-7.10.4"
-          sources."@babel/traverse-7.11.5"
-          sources."@babel/types-7.11.5"
+          sources."@babel/traverse-7.12.1"
+          sources."@babel/types-7.12.1"
           sources."@bcoe/v8-coverage-0.2.3"
           sources."@cnakazawa/watch-1.0.4"
-          (sources."@eslint/eslintrc-0.1.3" // {
+          (sources."@eslint/eslintrc-0.2.1" // {
             dependencies = [
               sources."globals-12.4.0"
               sources."ignore-4.0.6"
@@ -8011,11 +7829,9 @@ let
           })
           sources."@istanbuljs/load-nyc-config-1.1.0"
           sources."@istanbuljs/schema-0.1.2"
-          (sources."@jest/console-26.3.0" // {
+          (sources."@jest/console-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
@@ -8024,12 +7840,10 @@ let
               sources."supports-color-7.2.0"
             ];
           })
-          (sources."@jest/core-26.4.2" // {
+          (sources."@jest/core-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
               sources."ansi-regex-5.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."braces-3.0.2"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
@@ -8045,47 +7859,12 @@ let
               sources."to-regex-range-5.0.1"
             ];
           })
-          (sources."@jest/environment-26.3.0" // {
+          sources."@jest/environment-26.6.1"
+          sources."@jest/fake-timers-26.6.1"
+          sources."@jest/globals-26.6.1"
+          (sources."@jest/reporters-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
-              sources."chalk-4.1.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
-              sources."has-flag-4.0.0"
-              sources."supports-color-7.2.0"
-            ];
-          })
-          (sources."@jest/fake-timers-26.3.0" // {
-            dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
-              sources."chalk-4.1.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
-              sources."has-flag-4.0.0"
-              sources."supports-color-7.2.0"
-            ];
-          })
-          (sources."@jest/globals-26.4.2" // {
-            dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
-              sources."chalk-4.1.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
-              sources."has-flag-4.0.0"
-              sources."supports-color-7.2.0"
-            ];
-          })
-          (sources."@jest/reporters-26.4.1" // {
-            dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
@@ -8095,29 +7874,16 @@ let
               sources."supports-color-7.2.0"
             ];
           })
-          (sources."@jest/source-map-26.3.0" // {
+          (sources."@jest/source-map-26.5.0" // {
             dependencies = [
               sources."source-map-0.6.1"
             ];
           })
-          (sources."@jest/test-result-26.3.0" // {
+          sources."@jest/test-result-26.6.1"
+          sources."@jest/test-sequencer-26.6.1"
+          (sources."@jest/transform-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
-              sources."chalk-4.1.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
-              sources."has-flag-4.0.0"
-              sources."supports-color-7.2.0"
-            ];
-          })
-          sources."@jest/test-sequencer-26.4.2"
-          (sources."@jest/transform-26.3.0" // {
-            dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."braces-3.0.2"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
@@ -8132,72 +7898,77 @@ let
               sources."to-regex-range-5.0.1"
             ];
           })
-          (sources."@jest/types-25.5.0" // {
+          (sources."@jest/types-26.6.1" // {
             dependencies = [
-              sources."ansi-styles-4.2.1"
-              sources."chalk-3.0.0"
+              sources."ansi-styles-4.3.0"
+              sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
               sources."has-flag-4.0.0"
               sources."supports-color-7.2.0"
             ];
           })
+          (sources."@nicolo-ribaudo/chokidar-2-2.1.8" // {
+            dependencies = [
+              sources."chokidar-2.1.8"
+            ];
+          })
           sources."@nodelib/fs.scandir-2.1.3"
           sources."@nodelib/fs.stat-2.0.3"
           sources."@nodelib/fs.walk-1.2.4"
-          sources."@serialport/binding-abstract-9.0.1"
-          sources."@serialport/binding-mock-9.0.1"
-          sources."@serialport/bindings-9.0.1"
+          sources."@serialport/binding-abstract-9.0.2"
+          sources."@serialport/binding-mock-9.0.2"
+          sources."@serialport/bindings-9.0.2"
           sources."@serialport/parser-byte-length-9.0.1"
           sources."@serialport/parser-cctalk-9.0.1"
           sources."@serialport/parser-delimiter-9.0.1"
           sources."@serialport/parser-readline-9.0.1"
           sources."@serialport/parser-ready-9.0.1"
           sources."@serialport/parser-regex-9.0.1"
-          sources."@serialport/stream-9.0.1"
+          sources."@serialport/stream-9.0.2"
           sources."@sinonjs/commons-1.8.1"
           sources."@sinonjs/fake-timers-6.0.1"
-          sources."@types/babel__core-7.1.10"
+          sources."@types/babel__core-7.1.11"
           sources."@types/babel__generator-7.6.2"
           sources."@types/babel__template-7.0.3"
           sources."@types/babel__traverse-7.0.15"
-          sources."@types/color-name-1.1.1"
+          sources."@types/debounce-1.2.0"
           sources."@types/debug-4.1.5"
-          sources."@types/graceful-fs-4.1.3"
+          sources."@types/graceful-fs-4.1.4"
           sources."@types/istanbul-lib-coverage-2.0.3"
           sources."@types/istanbul-lib-report-3.0.0"
-          sources."@types/istanbul-reports-1.1.2"
-          sources."@types/jest-26.0.14"
+          sources."@types/istanbul-reports-3.0.0"
+          sources."@types/jest-26.0.15"
           sources."@types/json-schema-7.0.6"
           sources."@types/nedb-1.8.11"
-          sources."@types/node-14.11.2"
+          sources."@types/node-14.14.6"
           sources."@types/normalize-package-data-2.4.0"
-          sources."@types/prettier-2.1.1"
+          sources."@types/prettier-2.1.5"
           sources."@types/serialport-8.0.1"
-          sources."@types/stack-utils-1.0.1"
-          sources."@types/yargs-15.0.7"
+          sources."@types/stack-utils-2.0.0"
+          sources."@types/yargs-15.0.9"
           sources."@types/yargs-parser-15.0.0"
-          (sources."@typescript-eslint/eslint-plugin-4.2.0" // {
+          (sources."@typescript-eslint/eslint-plugin-4.6.0" // {
             dependencies = [
               sources."semver-7.3.2"
             ];
           })
-          sources."@typescript-eslint/experimental-utils-4.2.0"
-          sources."@typescript-eslint/parser-4.2.0"
-          sources."@typescript-eslint/scope-manager-4.2.0"
-          sources."@typescript-eslint/types-4.2.0"
-          (sources."@typescript-eslint/typescript-estree-4.2.0" // {
+          sources."@typescript-eslint/experimental-utils-4.6.0"
+          sources."@typescript-eslint/parser-4.6.0"
+          sources."@typescript-eslint/scope-manager-4.6.0"
+          sources."@typescript-eslint/types-4.6.0"
+          (sources."@typescript-eslint/typescript-estree-4.6.0" // {
             dependencies = [
               sources."semver-7.3.2"
             ];
           })
-          sources."@typescript-eslint/visitor-keys-4.2.0"
+          sources."@typescript-eslint/visitor-keys-4.6.0"
           sources."abab-2.0.5"
-          sources."acorn-7.4.0"
+          sources."acorn-7.4.1"
           sources."acorn-globals-6.0.0"
           sources."acorn-jsx-5.3.1"
           sources."acorn-walk-7.2.0"
-          sources."ajv-6.12.5"
+          sources."ajv-6.12.6"
           sources."ansi-colors-4.1.1"
           (sources."ansi-escapes-4.3.1" // {
             dependencies = [
@@ -8228,12 +7999,10 @@ let
           sources."at-least-node-1.0.0"
           sources."atob-2.1.2"
           sources."aws-sign2-0.7.0"
-          sources."aws4-1.10.1"
-          (sources."babel-jest-26.3.0" // {
+          sources."aws4-1.11.0"
+          (sources."babel-jest-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
@@ -8244,9 +8013,9 @@ let
           })
           sources."babel-plugin-dynamic-import-node-2.3.3"
           sources."babel-plugin-istanbul-6.0.0"
-          sources."babel-plugin-jest-hoist-26.2.0"
-          sources."babel-preset-current-node-syntax-0.1.3"
-          sources."babel-preset-jest-26.3.0"
+          sources."babel-plugin-jest-hoist-26.5.0"
+          sources."babel-preset-current-node-syntax-0.1.4"
+          sources."babel-preset-jest-26.5.0"
           sources."balanced-match-1.0.0"
           (sources."base-0.11.2" // {
             dependencies = [
@@ -8276,19 +8045,34 @@ let
           sources."browser-process-hrtime-1.0.0"
           sources."browserslist-4.14.5"
           sources."bser-2.1.1"
-          sources."buffer-5.6.0"
+          sources."buffer-5.7.0"
           sources."buffer-from-1.1.1"
           sources."cache-base-1.0.1"
+          sources."call-bind-1.0.0"
           sources."callsites-3.1.0"
           sources."camelcase-5.3.1"
-          sources."caniuse-lite-1.0.30001137"
+          sources."caniuse-lite-1.0.30001154"
           sources."capture-exit-2.0.0"
           sources."caseless-0.12.0"
           sources."chalk-2.4.2"
           sources."char-regex-1.0.2"
-          sources."chokidar-2.1.8"
+          (sources."chokidar-3.4.3" // {
+            dependencies = [
+              sources."anymatch-3.1.1"
+              sources."binary-extensions-2.1.0"
+              sources."braces-3.0.2"
+              sources."fill-range-7.0.1"
+              sources."fsevents-2.1.3"
+              sources."glob-parent-5.1.1"
+              sources."is-binary-path-2.1.0"
+              sources."is-number-7.0.0"
+              sources."readdirp-3.5.0"
+              sources."to-regex-range-5.0.1"
+            ];
+          })
           sources."chownr-1.1.4"
           sources."ci-info-2.0.0"
+          sources."cjs-module-lexer-0.4.3"
           (sources."class-utils-0.3.6" // {
             dependencies = [
               sources."define-property-0.2.5"
@@ -8331,9 +8115,10 @@ let
           })
           sources."dashdash-1.14.1"
           sources."data-urls-2.0.0"
+          sources."debounce-1.2.0"
           sources."debug-4.2.0"
           sources."decamelize-1.2.0"
-          sources."decimal.js-10.2.0"
+          sources."decimal.js-10.2.1"
           sources."decode-uri-component-0.2.0"
           sources."decompress-response-4.2.1"
           sources."deep-extend-0.6.0"
@@ -8351,7 +8136,7 @@ let
           sources."delegates-1.0.0"
           sources."detect-libc-1.0.3"
           sources."detect-newline-3.1.0"
-          sources."diff-sequences-25.2.6"
+          sources."diff-sequences-26.5.0"
           sources."dir-glob-3.0.1"
           sources."doctrine-3.0.0"
           (sources."domexception-2.0.1" // {
@@ -8360,15 +8145,13 @@ let
             ];
           })
           sources."ecc-jsbn-0.1.2"
-          sources."electron-to-chromium-1.3.573"
-          sources."emittery-0.7.1"
+          sources."electron-to-chromium-1.3.585"
+          sources."emittery-0.7.2"
           sources."emoji-regex-7.0.3"
           sources."end-of-stream-1.4.4"
           sources."enquirer-2.3.6"
           sources."error-ex-1.3.2"
-          sources."es-abstract-1.18.0-next.0"
-          sources."es-to-primitive-1.2.1"
-          sources."escalade-3.1.0"
+          sources."escalade-3.1.1"
           sources."escape-string-regexp-1.0.5"
           (sources."escodegen-1.14.3" // {
             dependencies = [
@@ -8379,15 +8162,14 @@ let
               sources."type-check-0.3.2"
             ];
           })
-          (sources."eslint-7.10.0" // {
+          (sources."eslint-7.12.1" // {
             dependencies = [
               sources."ansi-regex-5.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
               sources."cross-spawn-7.0.3"
-              sources."eslint-visitor-keys-1.3.0"
               sources."glob-parent-5.1.1"
               sources."globals-12.4.0"
               sources."has-flag-4.0.0"
@@ -8439,17 +8221,11 @@ let
             ];
           })
           sources."expand-template-2.0.3"
-          (sources."expect-26.4.2" // {
+          (sources."expect-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
-              sources."chalk-4.1.0"
+              sources."ansi-styles-4.3.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
-              sources."has-flag-4.0.0"
-              sources."jest-get-type-26.3.0"
-              sources."supports-color-7.2.0"
             ];
           })
           sources."extend-3.0.2"
@@ -8481,7 +8257,7 @@ let
           })
           sources."fast-json-stable-stringify-2.1.0"
           sources."fast-levenshtein-2.0.6"
-          sources."fastq-1.8.0"
+          sources."fastq-1.9.0"
           sources."fb-watchman-2.0.1"
           sources."file-entry-cache-5.0.1"
           sources."file-uri-to-path-1.0.0"
@@ -8505,8 +8281,9 @@ let
           sources."function-bind-1.1.1"
           sources."functional-red-black-tree-1.0.1"
           sources."gauge-2.7.4"
-          sources."gensync-1.0.0-beta.1"
+          sources."gensync-1.0.0-beta.2"
           sources."get-caller-file-2.0.5"
+          sources."get-intrinsic-1.0.1"
           sources."get-package-type-0.1.0"
           sources."get-stream-4.1.0"
           sources."get-value-2.0.6"
@@ -8543,14 +8320,14 @@ let
               sources."kind-of-4.0.0"
             ];
           })
-          sources."highlight.js-10.2.0"
+          sources."highlight.js-10.3.2"
           sources."hosted-git-info-2.8.8"
           sources."html-encoding-sniffer-2.0.1"
           sources."html-escaper-2.0.2"
           sources."http-signature-1.2.0"
           sources."human-signals-1.1.1"
           sources."iconv-lite-0.4.24"
-          sources."ieee754-1.1.13"
+          sources."ieee754-1.2.1"
           sources."ignore-5.1.8"
           (sources."import-fresh-3.2.1" // {
             dependencies = [
@@ -8563,7 +8340,6 @@ let
           sources."inherits-2.0.4"
           sources."ini-1.3.5"
           sources."interpret-1.4.0"
-          sources."invariant-2.2.4"
           sources."ip-regex-2.1.0"
           (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
@@ -8573,14 +8349,13 @@ let
           sources."is-arrayish-0.2.1"
           sources."is-binary-path-1.0.1"
           sources."is-buffer-1.1.6"
-          sources."is-callable-1.2.2"
           sources."is-ci-2.0.0"
+          sources."is-core-module-2.0.0"
           (sources."is-data-descriptor-0.1.4" // {
             dependencies = [
               sources."kind-of-3.2.2"
             ];
           })
-          sources."is-date-object-1.0.2"
           (sources."is-descriptor-0.1.6" // {
             dependencies = [
               sources."kind-of-5.1.0"
@@ -8592,7 +8367,6 @@ let
           sources."is-fullwidth-code-point-1.0.0"
           sources."is-generator-fn-2.1.0"
           sources."is-glob-4.0.1"
-          sources."is-negative-zero-2.0.0"
           (sources."is-number-3.0.0" // {
             dependencies = [
               sources."kind-of-3.2.2"
@@ -8600,9 +8374,7 @@ let
           })
           sources."is-plain-object-2.0.4"
           sources."is-potential-custom-element-name-1.0.0"
-          sources."is-regex-1.1.1"
           sources."is-stream-1.1.0"
-          sources."is-symbol-1.0.3"
           sources."is-typedarray-1.0.0"
           sources."is-windows-1.0.2"
           sources."is-wsl-2.2.0"
@@ -8630,46 +8402,33 @@ let
             ];
           })
           sources."istanbul-reports-3.0.2"
-          (sources."jest-26.4.2" // {
+          (sources."jest-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
               sources."has-flag-4.0.0"
-              sources."jest-cli-26.4.2"
+              sources."jest-cli-26.6.1"
               sources."supports-color-7.2.0"
             ];
           })
-          (sources."jest-changed-files-26.3.0" // {
+          (sources."jest-changed-files-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
-              sources."chalk-4.1.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
               sources."cross-spawn-7.0.3"
-              sources."execa-4.0.3"
+              sources."execa-4.1.0"
               sources."get-stream-5.2.0"
-              sources."has-flag-4.0.0"
               sources."is-stream-2.0.0"
               sources."npm-run-path-4.0.1"
               sources."path-key-3.1.1"
               sources."shebang-command-2.0.0"
               sources."shebang-regex-3.0.0"
-              sources."supports-color-7.2.0"
               sources."which-2.0.2"
             ];
           })
-          (sources."jest-config-26.4.2" // {
+          (sources."jest-config-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-regex-5.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."braces-3.0.2"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
@@ -8677,17 +8436,15 @@ let
               sources."fill-range-7.0.1"
               sources."has-flag-4.0.0"
               sources."is-number-7.0.0"
-              sources."jest-get-type-26.3.0"
               sources."micromatch-4.0.2"
-              sources."pretty-format-26.4.2"
               sources."supports-color-7.2.0"
               sources."to-regex-range-5.0.1"
             ];
           })
-          (sources."jest-diff-25.5.0" // {
+          (sources."jest-diff-26.6.1" // {
             dependencies = [
-              sources."ansi-styles-4.2.1"
-              sources."chalk-3.0.0"
+              sources."ansi-styles-4.3.0"
+              sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
               sources."has-flag-4.0.0"
@@ -8695,26 +8452,9 @@ let
             ];
           })
           sources."jest-docblock-26.0.0"
-          (sources."jest-each-26.4.2" // {
+          (sources."jest-each-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-regex-5.0.0"
-              sources."ansi-styles-4.2.1"
-              sources."chalk-4.1.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
-              sources."has-flag-4.0.0"
-              sources."jest-get-type-26.3.0"
-              sources."pretty-format-26.4.2"
-              sources."supports-color-7.2.0"
-            ];
-          })
-          (sources."jest-environment-jsdom-26.3.0" // {
-            dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
@@ -8722,89 +8462,44 @@ let
               sources."supports-color-7.2.0"
             ];
           })
-          (sources."jest-environment-node-26.3.0" // {
+          sources."jest-environment-jsdom-26.6.1"
+          sources."jest-environment-node-26.6.1"
+          sources."jest-get-type-26.3.0"
+          (sources."jest-haste-map-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
-              sources."chalk-4.1.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
-              sources."has-flag-4.0.0"
-              sources."supports-color-7.2.0"
-            ];
-          })
-          sources."jest-get-type-25.2.6"
-          (sources."jest-haste-map-26.3.0" // {
-            dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
               sources."anymatch-3.1.1"
               sources."braces-3.0.2"
-              sources."chalk-4.1.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
               sources."fill-range-7.0.1"
               sources."fsevents-2.1.3"
-              sources."has-flag-4.0.0"
               sources."is-number-7.0.0"
               sources."micromatch-4.0.2"
-              sources."supports-color-7.2.0"
               sources."to-regex-range-5.0.1"
             ];
           })
-          (sources."jest-jasmine2-26.4.2" // {
+          (sources."jest-jasmine2-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-regex-5.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
               sources."has-flag-4.0.0"
-              sources."pretty-format-26.4.2"
               sources."supports-color-7.2.0"
             ];
           })
-          (sources."jest-leak-detector-26.4.2" // {
+          sources."jest-leak-detector-26.6.1"
+          (sources."jest-matcher-utils-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-regex-5.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
               sources."has-flag-4.0.0"
-              sources."jest-get-type-26.3.0"
-              sources."pretty-format-26.4.2"
               sources."supports-color-7.2.0"
             ];
           })
-          (sources."jest-matcher-utils-26.4.2" // {
+          (sources."jest-message-util-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-regex-5.0.0"
-              sources."ansi-styles-4.2.1"
-              sources."chalk-4.1.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
-              sources."diff-sequences-26.3.0"
-              sources."has-flag-4.0.0"
-              sources."jest-diff-26.4.2"
-              sources."jest-get-type-26.3.0"
-              sources."pretty-format-26.4.2"
-              sources."supports-color-7.2.0"
-            ];
-          })
-          (sources."jest-message-util-26.3.0" // {
-            dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."braces-3.0.2"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
@@ -8818,25 +8513,12 @@ let
               sources."to-regex-range-5.0.1"
             ];
           })
-          (sources."jest-mock-26.3.0" // {
-            dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
-              sources."chalk-4.1.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
-              sources."has-flag-4.0.0"
-              sources."supports-color-7.2.0"
-            ];
-          })
+          sources."jest-mock-26.6.1"
           sources."jest-pnp-resolver-1.2.2"
           sources."jest-regex-util-26.0.0"
-          (sources."jest-resolve-26.4.0" // {
+          (sources."jest-resolve-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
@@ -8845,11 +8527,10 @@ let
               sources."supports-color-7.2.0"
             ];
           })
-          (sources."jest-resolve-dependencies-26.4.2" // {
+          sources."jest-resolve-dependencies-26.6.1"
+          (sources."jest-runner-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
@@ -8857,23 +8538,9 @@ let
               sources."supports-color-7.2.0"
             ];
           })
-          (sources."jest-runner-26.4.2" // {
+          (sources."jest-runtime-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
-              sources."chalk-4.1.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
-              sources."has-flag-4.0.0"
-              sources."supports-color-7.2.0"
-            ];
-          })
-          (sources."jest-runtime-26.4.2" // {
-            dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
@@ -8882,30 +8549,21 @@ let
               sources."supports-color-7.2.0"
             ];
           })
-          sources."jest-serializer-26.3.0"
-          (sources."jest-snapshot-26.4.2" // {
+          sources."jest-serializer-26.5.0"
+          (sources."jest-snapshot-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-regex-5.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
-              sources."diff-sequences-26.3.0"
               sources."has-flag-4.0.0"
-              sources."jest-diff-26.4.2"
-              sources."jest-get-type-26.3.0"
-              sources."pretty-format-26.4.2"
               sources."semver-7.3.2"
               sources."supports-color-7.2.0"
             ];
           })
-          (sources."jest-util-26.3.0" // {
+          (sources."jest-util-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."braces-3.0.2"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
@@ -8918,27 +8576,10 @@ let
               sources."to-regex-range-5.0.1"
             ];
           })
-          (sources."jest-validate-26.4.2" // {
+          (sources."jest-validate-26.6.1" // {
             dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-regex-5.0.0"
-              sources."ansi-styles-4.2.1"
-              sources."camelcase-6.0.0"
-              sources."chalk-4.1.0"
-              sources."color-convert-2.0.1"
-              sources."color-name-1.1.4"
-              sources."has-flag-4.0.0"
-              sources."jest-get-type-26.3.0"
-              sources."pretty-format-26.4.2"
-              sources."supports-color-7.2.0"
-            ];
-          })
-          (sources."jest-watcher-26.3.0" // {
-            dependencies = [
-              sources."@jest/types-26.3.0"
-              sources."@types/istanbul-reports-3.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
+              sources."camelcase-6.2.0"
               sources."chalk-4.1.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
@@ -8946,7 +8587,17 @@ let
               sources."supports-color-7.2.0"
             ];
           })
-          (sources."jest-worker-26.3.0" // {
+          (sources."jest-watcher-26.6.1" // {
+            dependencies = [
+              sources."ansi-styles-4.3.0"
+              sources."chalk-4.1.0"
+              sources."color-convert-2.0.1"
+              sources."color-name-1.1.4"
+              sources."has-flag-4.0.0"
+              sources."supports-color-7.2.0"
+            ];
+          })
+          (sources."jest-worker-26.6.1" // {
             dependencies = [
               sources."has-flag-4.0.0"
               sources."supports-color-7.2.0"
@@ -8963,24 +8614,26 @@ let
           sources."json-stable-stringify-without-jsonify-1.0.1"
           sources."json-stringify-safe-5.0.1"
           sources."json5-2.1.3"
-          sources."jsonfile-6.0.1"
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.0"
+            ];
+          })
           sources."jsprim-1.4.1"
           sources."kind-of-6.0.3"
           sources."kleur-3.0.3"
           sources."leven-3.1.0"
-          sources."levenary-1.1.1"
           sources."levn-0.4.1"
           sources."lines-and-columns-1.1.6"
           sources."locate-path-5.0.0"
           sources."lodash-4.17.20"
           sources."lodash.sortby-4.7.0"
-          sources."loose-envify-1.4.0"
           sources."lunr-2.3.9"
           sources."make-dir-2.1.0"
           sources."makeerror-1.0.11"
           sources."map-cache-0.2.2"
           sources."map-visit-1.0.0"
-          sources."marked-1.1.1"
+          sources."marked-1.2.2"
           sources."merge-stream-2.0.0"
           sources."merge2-1.4.1"
           sources."micromatch-3.1.10"
@@ -8994,7 +8647,7 @@ let
           sources."mkdirp-0.5.5"
           sources."mkdirp-classic-0.5.3"
           sources."ms-2.1.2"
-          sources."nan-2.14.1"
+          sources."nan-2.14.2"
           sources."nanomatch-1.2.13"
           sources."napi-build-utils-1.0.2"
           sources."natural-compare-1.4.0"
@@ -9009,7 +8662,7 @@ let
               sources."which-2.0.2"
             ];
           })
-          sources."node-releases-1.1.61"
+          sources."node-releases-1.1.65"
           sources."noop-logger-0.1.1"
           sources."normalize-package-data-2.5.0"
           sources."normalize-path-3.0.0"
@@ -9025,10 +8678,9 @@ let
               sources."kind-of-3.2.2"
             ];
           })
-          sources."object-inspect-1.8.0"
           sources."object-keys-1.1.1"
           sources."object-visit-1.0.1"
-          sources."object.assign-4.1.1"
+          sources."object.assign-4.1.2"
           sources."object.pick-1.3.0"
           sources."once-1.4.0"
           sources."onetime-5.1.2"
@@ -9054,25 +8706,25 @@ let
           sources."pirates-4.0.1"
           sources."pkg-dir-4.2.0"
           sources."posix-character-classes-0.1.1"
-          sources."prebuild-install-5.3.5"
+          sources."prebuild-install-5.3.6"
           sources."prelude-ls-1.2.1"
-          (sources."pretty-format-25.5.0" // {
+          (sources."pretty-format-26.6.1" // {
             dependencies = [
               sources."ansi-regex-5.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
             ];
           })
           sources."process-nextick-args-2.0.1"
           sources."progress-2.0.3"
-          sources."prompts-2.3.2"
+          sources."prompts-2.4.0"
           sources."psl-1.8.0"
           sources."pump-3.0.0"
           sources."punycode-2.1.1"
           sources."qs-6.5.2"
           sources."rc-1.2.8"
-          sources."react-is-16.13.1"
+          sources."react-is-17.0.1"
           (sources."read-pkg-5.2.0" // {
             dependencies = [
               sources."type-fest-0.6.0"
@@ -9112,7 +8764,7 @@ let
           })
           sources."require-directory-2.1.1"
           sources."require-main-filename-2.0.0"
-          sources."resolve-1.17.0"
+          sources."resolve-1.18.1"
           sources."resolve-cwd-3.0.0"
           sources."resolve-from-5.0.0"
           sources."resolve-url-0.2.1"
@@ -9120,14 +8772,14 @@ let
           sources."reusify-1.0.4"
           sources."rimraf-2.6.3"
           sources."rsvp-4.8.5"
-          sources."run-parallel-1.1.9"
+          sources."run-parallel-1.1.10"
           sources."safe-buffer-5.1.2"
           sources."safe-regex-1.1.0"
           sources."safer-buffer-2.1.2"
           sources."sane-4.1.0"
           sources."saxes-5.0.1"
           sources."semver-5.7.1"
-          sources."serialport-9.0.1"
+          sources."serialport-9.0.2"
           sources."set-blocking-2.0.0"
           (sources."set-value-2.0.1" // {
             dependencies = [
@@ -9203,16 +8855,6 @@ let
             ];
           })
           sources."string-width-1.0.2"
-          (sources."string.prototype.trimend-1.0.1" // {
-            dependencies = [
-              sources."es-abstract-1.17.6"
-            ];
-          })
-          (sources."string.prototype.trimstart-1.0.1" // {
-            dependencies = [
-              sources."es-abstract-1.17.6"
-            ];
-          })
           sources."string_decoder-1.1.1"
           sources."strip-ansi-3.0.1"
           sources."strip-bom-4.0.0"
@@ -9256,7 +8898,7 @@ let
           sources."to-regex-range-2.1.1"
           sources."tough-cookie-3.0.1"
           sources."tr46-2.0.2"
-          sources."tslib-1.13.0"
+          sources."tslib-1.14.1"
           sources."tsutils-3.17.1"
           sources."tunnel-agent-0.6.0"
           sources."tweetnacl-0.14.5"
@@ -9270,11 +8912,11 @@ let
             ];
           })
           sources."typedoc-default-themes-0.11.4"
-          sources."typedoc-plugin-markdown-3.0.3"
+          sources."typedoc-plugin-markdown-3.0.11"
           sources."typedoc-plugin-no-inherit-1.2.0"
           sources."typedoc-plugin-sourcefile-url-1.0.6"
-          sources."typescript-4.0.3"
-          sources."uglify-js-3.10.4"
+          sources."typescript-4.0.5"
+          sources."uglify-js-3.11.4"
           sources."unicode-canonical-property-names-ecmascript-1.0.4"
           sources."unicode-match-property-ecmascript-1.0.4"
           sources."unicode-match-property-value-ecmascript-1.2.0"
@@ -9296,9 +8938,9 @@ let
           sources."urix-0.1.0"
           sources."use-3.1.1"
           sources."util-deprecate-1.0.2"
-          sources."uuid-8.3.0"
-          sources."v8-compile-cache-2.1.1"
-          (sources."v8-to-istanbul-5.0.1" // {
+          sources."uuid-8.3.1"
+          sources."v8-compile-cache-2.2.0"
+          (sources."v8-to-istanbul-6.0.1" // {
             dependencies = [
               sources."source-map-0.7.3"
             ];
@@ -9311,7 +8953,7 @@ let
           sources."webidl-conversions-6.1.0"
           sources."whatwg-encoding-1.0.5"
           sources."whatwg-mimetype-2.3.0"
-          sources."whatwg-url-8.2.2"
+          sources."whatwg-url-8.4.0"
           sources."which-1.3.1"
           sources."which-module-2.0.0"
           sources."which-pm-runs-1.0.0"
@@ -9321,7 +8963,7 @@ let
           (sources."wrap-ansi-6.2.0" // {
             dependencies = [
               sources."ansi-regex-5.0.0"
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
               sources."emoji-regex-8.0.0"
@@ -9349,41 +8991,41 @@ let
           sources."yargs-parser-18.1.3"
         ];
       })
-      (sources."zigbee-herdsman-converters-12.0.194" // {
+      (sources."zigbee-herdsman-converters-12.0.224" // {
         dependencies = [
           sources."@babel/code-frame-7.10.4"
-          (sources."@babel/core-7.11.6" // {
+          (sources."@babel/core-7.12.3" // {
             dependencies = [
               sources."semver-5.7.1"
               sources."source-map-0.5.7"
             ];
           })
-          (sources."@babel/generator-7.11.6" // {
+          (sources."@babel/generator-7.12.1" // {
             dependencies = [
               sources."source-map-0.5.7"
             ];
           })
           sources."@babel/helper-function-name-7.10.4"
           sources."@babel/helper-get-function-arity-7.10.4"
-          sources."@babel/helper-member-expression-to-functions-7.11.0"
-          sources."@babel/helper-module-imports-7.10.4"
-          sources."@babel/helper-module-transforms-7.11.0"
+          sources."@babel/helper-member-expression-to-functions-7.12.1"
+          sources."@babel/helper-module-imports-7.12.1"
+          sources."@babel/helper-module-transforms-7.12.1"
           sources."@babel/helper-optimise-call-expression-7.10.4"
           sources."@babel/helper-plugin-utils-7.10.4"
-          sources."@babel/helper-replace-supers-7.10.4"
-          sources."@babel/helper-simple-access-7.10.4"
+          sources."@babel/helper-replace-supers-7.12.1"
+          sources."@babel/helper-simple-access-7.12.1"
           sources."@babel/helper-split-export-declaration-7.11.0"
           sources."@babel/helper-validator-identifier-7.10.4"
-          sources."@babel/helpers-7.10.4"
+          sources."@babel/helpers-7.12.1"
           (sources."@babel/highlight-7.10.4" // {
             dependencies = [
               sources."chalk-2.4.2"
             ];
           })
-          sources."@babel/parser-7.11.5"
+          sources."@babel/parser-7.12.3"
           sources."@babel/plugin-syntax-async-generators-7.8.4"
           sources."@babel/plugin-syntax-bigint-7.8.3"
-          sources."@babel/plugin-syntax-class-properties-7.10.4"
+          sources."@babel/plugin-syntax-class-properties-7.12.1"
           sources."@babel/plugin-syntax-import-meta-7.10.4"
           sources."@babel/plugin-syntax-json-strings-7.8.3"
           sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4"
@@ -9393,73 +9035,68 @@ let
           sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
           sources."@babel/plugin-syntax-optional-chaining-7.8.3"
           sources."@babel/template-7.10.4"
-          (sources."@babel/traverse-7.11.5" // {
+          (sources."@babel/traverse-7.12.1" // {
             dependencies = [
               sources."globals-11.12.0"
             ];
           })
-          sources."@babel/types-7.11.5"
+          sources."@babel/types-7.12.1"
           sources."@bcoe/v8-coverage-0.2.3"
           sources."@cnakazawa/watch-1.0.4"
-          sources."@eslint/eslintrc-0.1.3"
+          sources."@eslint/eslintrc-0.2.1"
           (sources."@istanbuljs/load-nyc-config-1.1.0" // {
             dependencies = [
               sources."resolve-from-5.0.0"
             ];
           })
           sources."@istanbuljs/schema-0.1.2"
-          sources."@jest/console-26.3.0"
-          (sources."@jest/core-26.4.2" // {
+          sources."@jest/console-26.6.1"
+          (sources."@jest/core-26.6.1" // {
             dependencies = [
               sources."rimraf-3.0.2"
             ];
           })
-          sources."@jest/environment-26.3.0"
-          sources."@jest/fake-timers-26.3.0"
-          sources."@jest/globals-26.4.2"
-          sources."@jest/reporters-26.4.1"
-          sources."@jest/source-map-26.3.0"
-          sources."@jest/test-result-26.3.0"
-          sources."@jest/test-sequencer-26.4.2"
-          sources."@jest/transform-26.3.0"
-          sources."@jest/types-26.3.0"
+          sources."@jest/environment-26.6.1"
+          sources."@jest/fake-timers-26.6.1"
+          sources."@jest/globals-26.6.1"
+          sources."@jest/reporters-26.6.1"
+          sources."@jest/source-map-26.5.0"
+          sources."@jest/test-result-26.6.1"
+          sources."@jest/test-sequencer-26.6.1"
+          sources."@jest/transform-26.6.1"
+          sources."@jest/types-26.6.1"
           sources."@nodelib/fs.scandir-2.1.3"
           sources."@nodelib/fs.stat-2.0.3"
           sources."@nodelib/fs.walk-1.2.4"
           sources."@sinonjs/commons-1.8.1"
           sources."@sinonjs/fake-timers-6.0.1"
-          sources."@types/babel__core-7.1.10"
+          sources."@types/babel__core-7.1.11"
           sources."@types/babel__generator-7.6.2"
           sources."@types/babel__template-7.0.3"
           sources."@types/babel__traverse-7.0.15"
-          sources."@types/color-name-1.1.1"
-          sources."@types/graceful-fs-4.1.3"
+          sources."@types/graceful-fs-4.1.4"
           sources."@types/istanbul-lib-coverage-2.0.3"
           sources."@types/istanbul-lib-report-3.0.0"
           sources."@types/istanbul-reports-3.0.0"
           sources."@types/json-schema-7.0.6"
-          sources."@types/node-14.11.2"
+          sources."@types/node-14.14.6"
           sources."@types/normalize-package-data-2.4.0"
-          sources."@types/prettier-2.1.1"
-          sources."@types/stack-utils-1.0.1"
-          sources."@types/yargs-15.0.7"
+          sources."@types/prettier-2.1.5"
+          sources."@types/stack-utils-2.0.0"
+          sources."@types/yargs-15.0.9"
           sources."@types/yargs-parser-15.0.0"
-          sources."@typescript-eslint/experimental-utils-4.2.0"
-          sources."@typescript-eslint/scope-manager-4.2.0"
-          sources."@typescript-eslint/types-4.2.0"
-          sources."@typescript-eslint/typescript-estree-4.2.0"
-          (sources."@typescript-eslint/visitor-keys-4.2.0" // {
-            dependencies = [
-              sources."eslint-visitor-keys-2.0.0"
-            ];
-          })
+          sources."@typescript-eslint/experimental-utils-4.6.0"
+          sources."@typescript-eslint/scope-manager-4.6.0"
+          sources."@typescript-eslint/types-4.6.0"
+          sources."@typescript-eslint/typescript-estree-4.6.0"
+          sources."@typescript-eslint/visitor-keys-4.6.0"
           sources."abab-2.0.5"
-          sources."acorn-7.4.0"
+          sources."acorn-7.4.1"
           sources."acorn-globals-6.0.0"
           sources."acorn-jsx-5.3.1"
           sources."acorn-walk-7.2.0"
-          sources."agent-base-6.0.1"
-          sources."ajv-6.12.5"
+          sources."agent-base-6.0.2"
+          sources."ajv-6.12.6"
           sources."ansi-colors-4.1.1"
           (sources."ansi-escapes-4.3.1" // {
             dependencies = [
@@ -9482,13 +9119,13 @@ let
           sources."asynckit-0.4.0"
           sources."atob-2.1.2"
           sources."aws-sign2-0.7.0"
-          sources."aws4-1.10.1"
-          sources."axios-0.20.0"
-          sources."babel-jest-26.3.0"
+          sources."aws4-1.11.0"
+          sources."axios-0.21.0"
+          sources."babel-jest-26.6.1"
           sources."babel-plugin-istanbul-6.0.0"
-          sources."babel-plugin-jest-hoist-26.2.0"
-          sources."babel-preset-current-node-syntax-0.1.3"
-          sources."babel-preset-jest-26.3.0"
+          sources."babel-plugin-jest-hoist-26.5.0"
+          sources."babel-preset-current-node-syntax-0.1.4"
+          sources."babel-preset-jest-26.5.0"
           sources."balanced-match-1.0.0"
           (sources."base-0.11.2" // {
             dependencies = [
@@ -9505,7 +9142,8 @@ let
           sources."braces-3.0.2"
           sources."browser-process-hrtime-1.0.0"
           sources."bser-2.1.1"
-          sources."buffer-5.6.0"
+          sources."buffer-5.7.0"
+          sources."buffer-crc32-0.2.13"
           sources."buffer-from-1.1.1"
           sources."cache-base-1.0.1"
           sources."callsites-3.1.0"
@@ -9514,7 +9152,7 @@ let
           sources."caseless-0.12.0"
           (sources."chalk-4.1.0" // {
             dependencies = [
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
               sources."has-flag-4.0.0"
@@ -9523,6 +9161,7 @@ let
           })
           sources."char-regex-1.0.2"
           sources."ci-info-2.0.0"
+          sources."cjs-module-lexer-0.4.3"
           (sources."class-utils-0.3.6" // {
             dependencies = [
               sources."define-property-0.2.5"
@@ -9561,7 +9200,7 @@ let
           sources."data-urls-2.0.0"
           sources."debug-4.2.0"
           sources."decamelize-1.2.0"
-          sources."decimal.js-10.2.0"
+          sources."decimal.js-10.2.1"
           sources."decode-uri-component-0.2.0"
           sources."deep-is-0.1.3"
           sources."deepmerge-4.2.2"
@@ -9574,7 +9213,7 @@ let
           })
           sources."delayed-stream-1.0.0"
           sources."detect-newline-3.1.0"
-          sources."diff-sequences-26.3.0"
+          sources."diff-sequences-26.5.0"
           sources."dir-glob-3.0.1"
           sources."doctrine-3.0.0"
           (sources."domexception-2.0.1" // {
@@ -9583,7 +9222,7 @@ let
             ];
           })
           sources."ecc-jsbn-0.1.2"
-          sources."emittery-0.7.1"
+          sources."emittery-0.7.2"
           sources."emoji-regex-7.0.3"
           sources."end-of-stream-1.4.4"
           sources."enquirer-2.3.6"
@@ -9597,13 +9236,21 @@ let
               sources."type-check-0.3.2"
             ];
           })
-          sources."eslint-7.10.0"
+          sources."eslint-7.12.1"
           sources."eslint-config-google-0.14.0"
-          sources."eslint-plugin-jest-24.0.2"
+          sources."eslint-plugin-jest-24.1.0"
           sources."eslint-scope-5.1.1"
-          sources."eslint-utils-2.1.0"
-          sources."eslint-visitor-keys-1.3.0"
-          sources."espree-7.3.0"
+          (sources."eslint-utils-2.1.0" // {
+            dependencies = [
+              sources."eslint-visitor-keys-1.3.0"
+            ];
+          })
+          sources."eslint-visitor-keys-2.0.0"
+          (sources."espree-7.3.0" // {
+            dependencies = [
+              sources."eslint-visitor-keys-1.3.0"
+            ];
+          })
           sources."esprima-4.0.1"
           (sources."esquery-1.3.1" // {
             dependencies = [
@@ -9637,9 +9284,9 @@ let
               sources."ms-2.0.0"
             ];
           })
-          (sources."expect-26.4.2" // {
+          (sources."expect-26.6.1" // {
             dependencies = [
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
             ];
@@ -9664,7 +9311,7 @@ let
           sources."fast-glob-3.2.4"
           sources."fast-json-stable-stringify-2.1.0"
           sources."fast-levenshtein-2.0.6"
-          sources."fastq-1.8.0"
+          sources."fastq-1.9.0"
           sources."fb-watchman-2.0.1"
           sources."file-entry-cache-5.0.1"
           sources."fill-range-7.0.1"
@@ -9679,8 +9326,9 @@ let
           sources."fs-constants-1.0.0"
           sources."fs.realpath-1.0.0"
           sources."fsevents-2.1.3"
+          sources."function-bind-1.1.1"
           sources."functional-red-black-tree-1.0.1"
-          sources."gensync-1.0.0-beta.1"
+          sources."gensync-1.0.0-beta.2"
           sources."get-caller-file-2.0.5"
           sources."get-package-type-0.1.0"
           sources."get-stream-4.1.0"
@@ -9698,6 +9346,7 @@ let
           sources."growly-1.3.0"
           sources."har-schema-2.0.0"
           sources."har-validator-5.1.5"
+          sources."has-1.0.3"
           sources."has-flag-3.0.0"
           sources."has-value-1.0.0"
           (sources."has-values-1.0.0" // {
@@ -9717,7 +9366,7 @@ let
           sources."https-proxy-agent-5.0.0"
           sources."human-signals-1.1.1"
           sources."iconv-lite-0.4.24"
-          sources."ieee754-1.1.13"
+          sources."ieee754-1.2.1"
           sources."ignore-4.0.6"
           sources."import-fresh-3.2.1"
           sources."import-local-3.0.2"
@@ -9733,6 +9382,7 @@ let
           sources."is-arrayish-0.2.1"
           sources."is-buffer-1.1.6"
           sources."is-ci-2.0.0"
+          sources."is-core-module-2.0.0"
           (sources."is-data-descriptor-0.1.4" // {
             dependencies = [
               sources."kind-of-3.2.2"
@@ -9774,48 +9424,48 @@ let
           })
           sources."istanbul-lib-source-maps-4.0.0"
           sources."istanbul-reports-3.0.2"
-          (sources."jest-26.4.2" // {
+          (sources."jest-26.6.1" // {
             dependencies = [
-              sources."jest-cli-26.4.2"
+              sources."jest-cli-26.6.1"
             ];
           })
-          (sources."jest-changed-files-26.3.0" // {
+          (sources."jest-changed-files-26.6.1" // {
             dependencies = [
-              sources."execa-4.0.3"
+              sources."execa-4.1.0"
               sources."get-stream-5.2.0"
               sources."is-stream-2.0.0"
               sources."npm-run-path-4.0.1"
             ];
           })
-          sources."jest-config-26.4.2"
-          sources."jest-diff-26.4.2"
+          sources."jest-config-26.6.1"
+          sources."jest-diff-26.6.1"
           sources."jest-docblock-26.0.0"
-          sources."jest-each-26.4.2"
-          sources."jest-environment-jsdom-26.3.0"
-          sources."jest-environment-node-26.3.0"
+          sources."jest-each-26.6.1"
+          sources."jest-environment-jsdom-26.6.1"
+          sources."jest-environment-node-26.6.1"
           sources."jest-get-type-26.3.0"
-          sources."jest-haste-map-26.3.0"
-          sources."jest-jasmine2-26.4.2"
-          sources."jest-leak-detector-26.4.2"
-          sources."jest-matcher-utils-26.4.2"
-          sources."jest-message-util-26.3.0"
-          sources."jest-mock-26.3.0"
+          sources."jest-haste-map-26.6.1"
+          sources."jest-jasmine2-26.6.1"
+          sources."jest-leak-detector-26.6.1"
+          sources."jest-matcher-utils-26.6.1"
+          sources."jest-message-util-26.6.1"
+          sources."jest-mock-26.6.1"
           sources."jest-pnp-resolver-1.2.2"
           sources."jest-regex-util-26.0.0"
-          sources."jest-resolve-26.4.0"
-          sources."jest-resolve-dependencies-26.4.2"
-          sources."jest-runner-26.4.2"
-          sources."jest-runtime-26.4.2"
-          sources."jest-serializer-26.3.0"
-          sources."jest-snapshot-26.4.2"
-          sources."jest-util-26.3.0"
-          (sources."jest-validate-26.4.2" // {
+          sources."jest-resolve-26.6.1"
+          sources."jest-resolve-dependencies-26.6.1"
+          sources."jest-runner-26.6.1"
+          sources."jest-runtime-26.6.1"
+          sources."jest-serializer-26.5.0"
+          sources."jest-snapshot-26.6.1"
+          sources."jest-util-26.6.1"
+          (sources."jest-validate-26.6.1" // {
             dependencies = [
-              sources."camelcase-6.0.0"
+              sources."camelcase-6.2.0"
             ];
           })
-          sources."jest-watcher-26.3.0"
-          (sources."jest-worker-26.3.0" // {
+          sources."jest-watcher-26.6.1"
+          (sources."jest-worker-26.6.1" // {
             dependencies = [
               sources."has-flag-4.0.0"
               sources."supports-color-7.2.0"
@@ -9914,20 +9564,20 @@ let
           sources."pkg-dir-4.2.0"
           sources."posix-character-classes-0.1.1"
           sources."prelude-ls-1.2.1"
-          (sources."pretty-format-26.4.2" // {
+          (sources."pretty-format-26.6.1" // {
             dependencies = [
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
             ];
           })
           sources."progress-2.0.3"
-          sources."prompts-2.3.2"
+          sources."prompts-2.4.0"
           sources."psl-1.8.0"
           sources."pump-3.0.0"
           sources."punycode-2.1.1"
           sources."qs-6.5.2"
-          sources."react-is-16.13.1"
+          sources."react-is-17.0.1"
           (sources."read-pkg-5.2.0" // {
             dependencies = [
               sources."type-fest-0.6.0"
@@ -9954,7 +9604,7 @@ let
           })
           sources."require-directory-2.1.1"
           sources."require-main-filename-2.0.0"
-          sources."resolve-1.17.0"
+          sources."resolve-1.18.1"
           (sources."resolve-cwd-3.0.0" // {
             dependencies = [
               sources."resolve-from-5.0.0"
@@ -9966,7 +9616,7 @@ let
           sources."reusify-1.0.4"
           sources."rimraf-2.6.3"
           sources."rsvp-4.8.5"
-          sources."run-parallel-1.1.9"
+          sources."run-parallel-1.1.10"
           sources."safe-buffer-5.2.1"
           sources."safe-regex-1.1.0"
           sources."safer-buffer-2.1.2"
@@ -10090,7 +9740,7 @@ let
           sources."to-regex-range-5.0.1"
           sources."tough-cookie-3.0.1"
           sources."tr46-2.0.2"
-          sources."tslib-1.13.0"
+          sources."tslib-1.14.1"
           sources."tsutils-3.17.1"
           sources."tunnel-agent-0.6.0"
           sources."tweetnacl-0.14.5"
@@ -10113,9 +9763,9 @@ let
           sources."urix-0.1.0"
           sources."use-3.1.1"
           sources."util-deprecate-1.0.2"
-          sources."uuid-8.3.0"
-          sources."v8-compile-cache-2.1.1"
-          (sources."v8-to-istanbul-5.0.1" // {
+          sources."uuid-8.3.1"
+          sources."v8-compile-cache-2.2.0"
+          (sources."v8-to-istanbul-6.0.1" // {
             dependencies = [
               sources."source-map-0.7.3"
             ];
@@ -10128,13 +9778,13 @@ let
           sources."webidl-conversions-6.1.0"
           sources."whatwg-encoding-1.0.5"
           sources."whatwg-mimetype-2.3.0"
-          sources."whatwg-url-8.2.2"
+          sources."whatwg-url-8.4.0"
           sources."which-2.0.2"
           sources."which-module-2.0.0"
           sources."word-wrap-1.2.3"
           (sources."wrap-ansi-6.2.0" // {
             dependencies = [
-              sources."ansi-styles-4.2.1"
+              sources."ansi-styles-4.3.0"
               sources."color-convert-2.0.1"
               sources."color-name-1.1.4"
               sources."emoji-regex-8.0.0"
@@ -10159,7 +9809,7 @@ let
           sources."yargs-parser-18.1.3"
         ];
       })
-      sources."zigbee2mqtt-frontend-0.2.17"
+      sources."zigbee2mqtt-frontend-0.2.68"
     ];
     buildInputs = globalBuildInputs;
     meta = {

From e4865130cf41d9b703dabf1a58f952230a70c97d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 29 Oct 2020 16:01:23 +0100
Subject: [PATCH 0805/3942] nixos/tests/prometheus: remove invalid thanos
 config flag

Upstream has apparently changed the configuration format and is now
throwing an error when the `encrypt_sse` option is set. According to the
current version of the documentation encryption moved to the
`sse_config` option that (is optional and) offers all the features we do
not use or care about for this test.
---
 nixos/tests/prometheus.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix
index de1d10aa7ca9..6881c659e6d0 100644
--- a/nixos/tests/prometheus.nix
+++ b/nixos/tests/prometheus.nix
@@ -19,7 +19,6 @@ let
       secret_key = s3.secretKey;
       insecure = true;
       signature_version2 = false;
-      encrypt_sse =  false;
       put_user_metadata = {};
       http_config = {
         idle_conn_timeout = "0s";

From f4c229b2d6860d4c63abe0302735c367a2d697aa Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Wed, 28 Oct 2020 23:04:41 +0000
Subject: [PATCH 0806/3942] tmuxPlugins.continuum: unstable-2018-02-23 ->
 unstable-2020-10-16

---
 pkgs/misc/tmux-plugins/default.nix | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 8efa0000da7b..315b76a7f925 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -66,14 +66,32 @@ in rec {
 
   continuum = mkDerivation {
     pluginName = "continuum";
-    version = "unstable-2018-02-23";
+    version = "unstable-2020-10-16";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-continuum";
-      rev = "1531b3770a7cf7373d15fedd239c5331b99342d1";
-      sha256 = "1w3f7gzvv1k25yfr6d1snr2z88p8f87cahrbaslmyphdxpy0fa4m";
+      rev = "26eb5ffce0b559d682b9f98c8d4b6c370ecb639b";
+      sha256 = "1glwa89bv2r92qz579a49prk3jf612cpd5hw46j4wfb35xhnj3ab";
     };
     dependencies = [ resurrect ];
+    meta = {
+      homepage = "https://github.com/tmux-plugins/tmux-continuum";
+      description = "continous saving of tmux environment";
+      longDescription =
+      ''
+        Features:
+        * continuous saving of tmux environment
+        * automatic tmux start when computer/server is turned on
+        * automatic restore when tmux is started
+
+        Together, these features enable uninterrupted tmux usage. No matter the
+        computer or server restarts, if the machine is on, tmux will be there how
+        you left it off the last time it was used.
+      '';
+      license = stdenv.lib.licenses.mit;
+      platforms = stdenv.lib.platforms.unix;
+      maintainers = with stdenv.lib.maintainers; [ ronanmacf ];
+    };
   };
 
   copycat = mkDerivation {

From 90fd158c7998b04fd125d288badd1565bc7ea9ae Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Wed, 28 Oct 2020 23:10:21 +0000
Subject: [PATCH 0807/3942] tmuxPlugins.resurrect: unstable-2020-03-21 ->
 unstable-2020-09-18

---
 pkgs/misc/tmux-plugins/default.nix | 32 +++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 315b76a7f925..d47ab09e3c56 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -284,12 +284,38 @@ in rec {
 
   resurrect = mkDerivation {
     pluginName = "resurrect";
-    version = "unstable-2020-03-21";
+    version = "unstable-2020-09-18";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-resurrect";
-      rev = "327c0481ad20c429b4e692e092659f8b3346b08f";
-      sha256 = "0nxfqazww36wwv49dzd39kq4jfls20834hf1458sf5pvmv5cmbyw";
+      rev = "e4825055c92e54b0c6ec572afc9b6c4723aba6c8";
+      sha256 = "0a96drkx1kpadkbxabcnvb542p75xdh2dbizvlq2lac5ldpb4hmx";
+    };
+    meta = {
+      homepage = "https://github.com/tmux-plugins/tmux-resurrect";
+      description = "Restore tmux environment after system restart";
+      longDescription =
+        ''
+          This plugin goes to great lengths to save and restore all the details
+          from your tmux environment. Here's what's been taken care of:
+
+          * all sessions, windows, panes and their order
+          * current working directory for each pane
+          * exact pane layouts within windows (even when zoomed)
+          * active and alternative session
+          * active and alternative window for each session
+          * windows with focus
+          * active pane for each window
+          * "grouped sessions" (useful feature when using tmux with multiple monitors)
+          * programs running within a pane! More details in the restoring programs doc.
+
+          Optional:
+          * restoring vim and neovim sessions
+          * restoring pane contents
+      '';
+      license = stdenv.lib.licenses.mit;
+      platforms = stdenv.lib.platforms.unix;
+      maintainers = with stdenv.lib.maintainers; [ ronanmacf ];
     };
   };
 

From c6b754a67bf1408966509dcdb404c3dad43d2190 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 1 Nov 2020 14:27:03 +0100
Subject: [PATCH 0808/3942] pysideApiextractor: refactor to use python3

Also took the opportunity to split it to multiple outputs

(cherry picked from commit 2cd5cf624ae19fd7633a22ea3a3f7986dfb611af)
---
 .../python-modules/pyside/apiextractor.nix          | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix
index 452320e1d71c..07ddfb69fa0f 100644
--- a/pkgs/development/python-modules/pyside/apiextractor.nix
+++ b/pkgs/development/python-modules/pyside/apiextractor.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, cmake, libxml2, libxslt, python2, qt4 }:
+{ stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }:
 
 # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
 let
-  pythonEnv = python2.withPackages(ps: with ps; [  sphinx ]);
+  pythonEnv = python3.withPackages(ps: with ps; [  sphinx ]);
 in stdenv.mkDerivation {
   name = "pyside-apiextractor-0.10.10";
 
@@ -13,7 +13,14 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake qt4 pythonEnv libxml2 libxslt ];
+  outputs = [ "out" "dev" ];
+
+  preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
+  '';
+
+  nativeBuildInputs = [ cmake pythonEnv ];
+  buildInputs = [ qt4 libxml2 libxslt ];
 
   meta = {
     description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";

From 550389392a54a81e750aabb54b69a77c9e5d18af Mon Sep 17 00:00:00 2001
From: Daniel Gorin <jcpetruzza@gmail.com>
Date: Mon, 29 Jun 2020 21:25:16 +0100
Subject: [PATCH 0809/3942] kakoune: rework plugin support

The previous implementation of plugin-support for the kakoune derivation
was based on generating, at build time, a `plugins.kak` file that would
source all .kak files in the list of plugins, and wrap the `kak` binary
in a script that would add some command-line arguments so that this
file gets loaded on start-up. The main problem with this approach
is that the plugins' code get executed *after* the user's configuration
file is loaded, so effectively one cannot automatically activate/configure
these plugins.

The idiomatic way of loading plugins is ensuring they end up installed
somwhere under `share/kak/autoload`. Because plugins are already being
packaged to have their code in `share/kak/autoload/plugins/<name-of-plugin>`,
we can obtain a derivation that includes the plugins simply by doing a
`symlinkJoin` of `kakoune-unwrapped` and all the requested plugins.

For this to work, we need to fix two issues:

  1. By default, kakoune makes `share/kak/autoload` a symbolic link to
     `share/kak/rc`, which contains all builtin definitions. We need
     to patch this to put the symlink under `share/kak/autoload/rc`, so that
     the join works.

  2. By default kakoune expects the `autoload` directory to be in
     `../share/kak/autoload` relative to the location of the `kak` binary.
     We need to set the `KAKOUNE_RUNTIME` to point the symlinked
     share/kak for this to work.
---
 doc/builders/packages/kakoune.xml             |  4 +-
 pkgs/applications/editors/kakoune/default.nix |  9 ++++
 pkgs/applications/editors/kakoune/wrapper.nix | 54 ++++++-------------
 pkgs/applications/editors/kakoune/wrapper.sh  | 30 -----------
 pkgs/top-level/all-packages.nix               |  6 ++-
 5 files changed, 31 insertions(+), 72 deletions(-)
 delete mode 100644 pkgs/applications/editors/kakoune/wrapper.sh

diff --git a/doc/builders/packages/kakoune.xml b/doc/builders/packages/kakoune.xml
index 728d40dacc92..045dbd0a653b 100644
--- a/doc/builders/packages/kakoune.xml
+++ b/doc/builders/packages/kakoune.xml
@@ -6,9 +6,7 @@
  <para>
   Kakoune can be built to autoload plugins:
 <programlisting>(kakoune.override {
-  configure = {
-    plugins = with pkgs.kakounePlugins; [ parinfer-rust ];
-  };
+  plugins = with pkgs.kakounePlugins; [ parinfer-rust ];
 })</programlisting>
  </para>
 </section>
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index eec14f286ba7..f1f811066597 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -30,6 +30,15 @@ stdenv.mkDerivation rec {
     $out/bin/kak -ui json -E "kill 0"
   '';
 
+  postInstall = ''
+    # make share/kak/autoload a directory, so we can use symlinkJoin with plugins
+    cd "$out/share/kak"
+    autoload_target=$(readlink autoload)
+    rm autoload
+    mkdir autoload
+    ln -s --relative "$autoload_target" autoload
+  '';
+
   meta = {
     homepage = "http://kakoune.org/";
     description = "A vim inspired text editor";
diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/pkgs/applications/editors/kakoune/wrapper.nix
index b4cc823880e7..6d6e23f1dac9 100644
--- a/pkgs/applications/editors/kakoune/wrapper.nix
+++ b/pkgs/applications/editors/kakoune/wrapper.nix
@@ -1,44 +1,24 @@
-{ stdenv, bash }:
-with stdenv.lib;
-
-kakoune:
+{ symlinkJoin, makeWrapper, kakoune, plugins ? [], configure ? {} }:
 
 let
-  getPlugins = { plugins ? [] }: plugins;
+  # "plugins" is the preferred way, but some configurations may be
+  # using "configure.plugins", so accept both
+  requestedPlugins = plugins ++ (configure.plugins or []);
 
-  wrapper = { configure ? {} }:
-  stdenv.mkDerivation rec {
-    pname = "kakoune";
-    version = getVersion kakoune;
+in
+  symlinkJoin {
+    name = "kakoune-${kakoune.version}";
 
-    src = ./.;
-    buildCommand = ''
-      mkdir -p $out/share/kak
-      for plugin in ${strings.escapeShellArgs (getPlugins configure)}; do
-        if [[ -d $plugin/share/kak/autoload ]]; then
-          find "$plugin/share/kak/autoload" -type f -name '*.kak'| while read rcfile; do
-            printf 'source "%s"\n' "$rcfile"
-          done
-        fi
-      done >>$out/share/kak/plugins.kak
+    buildInputs = [ makeWrapper ];
 
-      mkdir -p $out/bin
-      substitute ${src}/wrapper.sh $out/bin/kak \
-        --subst-var-by bash "${bash}" \
-        --subst-var-by kakoune "${kakoune}" \
-        --subst-var-by out "$out"
-      chmod +x $out/bin/kak
+    paths = [ kakoune ] ++ requestedPlugins;
+
+    postBuild = ''
+      # location of kak binary is used to find ../share/kak/autoload,
+      # unless explicitly overriden with KAKOUNE_RUNTIME
+      rm "$out/bin/kak"
+      makeWrapper "${kakoune}/bin/kak" "$out/bin/kak" --set KAKOUNE_RUNTIME "$out/share/kak"
     '';
 
-    preferLocalBuild = true;
-    buildInputs = [ bash kakoune ];
-    passthru = { unwrapped = kakoune; };
-
-    meta = kakoune.meta // {
-      # prefer wrapper over the package
-      priority = (kakoune.meta.priority or 0) - 1;
-      hydraPlatforms = [];
-    };
-  };
-in
-  makeOverridable wrapper
+    meta = kakoune.meta // { priority = (kakoune.meta.priority or 0) - 1; };
+  }
diff --git a/pkgs/applications/editors/kakoune/wrapper.sh b/pkgs/applications/editors/kakoune/wrapper.sh
deleted file mode 100644
index 48a971a10c6e..000000000000
--- a/pkgs/applications/editors/kakoune/wrapper.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!@bash@/bin/bash
-
-# We use the -E option to load plugins.  This only makes sense when we are
-# starting a new session, so we detect that.  Also, Kakoune can only handle
-# one -E option, so we prepend loading plugins to an existing one.
-args=( "$@" )
-loadPlugins=true
-EValueOffset=-1
-pluginScript='@out@/share/kak/plugins.kak'
-
-for (( i = 0; i < ${#args[@]}; i++ )); do
-    case "${args[i]}" in
-        -n|-c|-l|-p|-clear|-version) loadPlugins=false;;
-        -E)                          EValueOffset=$(( i + 1 ));;
-        --)                          break;;
-    esac
-    case "${args[i]}" in
-        -E|-c|-e|-s|-p|-f|-i|-ui|-debug) i=$(( i + 1 ));;
-    esac
-done
-
-if [[ $loadPlugins = true ]]; then
-    if (( EValueOffset >= 0 )); then
-        args[EValueOffset]="source '$pluginScript'"$'\n'"${args[EValueOffset]}"
-    else
-        args=( "-E" "source '$pluginScript'" "${args[@]}" )
-    fi
-fi
-
-exec @kakoune@/bin/kak "${args[@]}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4226f35c7fa6..eba6da07d07c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4905,10 +4905,12 @@ in
 
   kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { };
 
-  wrapKakoune = callPackage ../applications/editors/kakoune/wrapper.nix { };
+  wrapKakoune = kakoune: attrs: callPackage ../applications/editors/kakoune/wrapper.nix (attrs // { inherit kakoune; });
   kakounePlugins = callPackage ../applications/editors/kakoune/plugins { };
   kakoune-unwrapped = callPackage ../applications/editors/kakoune { };
-  kakoune = wrapKakoune kakoune-unwrapped { };
+  kakoune = wrapKakoune kakoune-unwrapped {
+    plugins = [ ];  # override with the list of desired plugins
+  };
 
   kak-lsp = callPackage ../tools/misc/kak-lsp { };
 

From 464804b43f6e414d4a6eadcf220a43040640cc34 Mon Sep 17 00:00:00 2001
From: Daniel Gorin <jcpetruzza@gmail.com>
Date: Sun, 18 Oct 2020 16:19:09 +0100
Subject: [PATCH 0810/3942] kakoune: Fix :doc when using plugins

So, kakoune takes the documentation shown for `:doc` from
`$KAKOUNE_RUNTIME/share/kak/doc`. Unfortunately, it seems
that it will ignore files that are symlinks. This is arguably
a bug in kakoune, we workaround it for now by copying the
content of the docfiles.
---
 pkgs/applications/editors/kakoune/wrapper.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/pkgs/applications/editors/kakoune/wrapper.nix
index 6d6e23f1dac9..7ac56d9cb1e0 100644
--- a/pkgs/applications/editors/kakoune/wrapper.nix
+++ b/pkgs/applications/editors/kakoune/wrapper.nix
@@ -18,6 +18,13 @@ in
       # unless explicitly overriden with KAKOUNE_RUNTIME
       rm "$out/bin/kak"
       makeWrapper "${kakoune}/bin/kak" "$out/bin/kak" --set KAKOUNE_RUNTIME "$out/share/kak"
+
+      # currently kakoune ignores doc files if they are symlinks, so workaround by
+      # copying doc files over, so they become regular files...
+      mkdir "$out/DELETE_ME"
+      mv "$out/share/kak/doc" "$out/DELETE_ME"
+      cp -r --dereference "$out/DELETE_ME/doc" "$out/share/kak"
+      rm -Rf "$out/DELETE_ME"
     '';
 
     meta = kakoune.meta // { priority = (kakoune.meta.priority or 0) - 1; };

From c9b669a2839b9a559470362c6c3de4f5a3ac4b3b Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Sun, 27 Sep 2020 13:45:57 +0200
Subject: [PATCH 0811/3942] nixos.manual: introduce Wayland section

Co-Authored-By: Nicolas Berbiche <nicolas@normie.dev>
---
 .../manual/configuration/configuration.xml    |  1 +
 nixos/doc/manual/configuration/wayland.xml    | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 nixos/doc/manual/configuration/wayland.xml

diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 6eb8f50bacac..44ff1f1b571a 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -18,6 +18,7 @@
  <xi:include href="user-mgmt.xml" />
  <xi:include href="file-systems.xml" />
  <xi:include href="x-windows.xml" />
+ <xi:include href="wayland.xml" />
  <xi:include href="gpu-accel.xml" />
  <xi:include href="xfce.xml" />
  <xi:include href="networking.xml" />
diff --git a/nixos/doc/manual/configuration/wayland.xml b/nixos/doc/manual/configuration/wayland.xml
new file mode 100644
index 000000000000..231c219cf081
--- /dev/null
+++ b/nixos/doc/manual/configuration/wayland.xml
@@ -0,0 +1,23 @@
+<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="sec-wayland">
+ <title>Wayland</title>
+
+ <para>
+  While X11 (see <xref linkend="sec-x11"/>) is still the primary display
+  technology on NixOS, Wayland support is steadily improving.
+  Where X11 separates the X Server and the window manager, on Wayland those
+  are combined: a Wayland Compositor is like an X11 window manager, but also
+  embeds the Wayland 'Server' functionality. This means it is sufficient to
+  install a Wayland Compositor such as <package>sway</package> without
+  separately enabling a Wayland server:
+<programlisting>
+<xref linkend="opt-programs.sway.enable"/> = true;
+</programlisting>
+  This installs the <package>sway</package> compositor along with some
+  essential utilities. Now you can start <package>sway</package> from the TTY
+  console.
+ </para>
+</chapter>

From 495f9976b49df780b4eabdad7a68e3530fcd7866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Thu, 15 Oct 2020 22:18:59 +0100
Subject: [PATCH 0812/3942] linux_zen: 5.8.13 -> 5.9.3

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

diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 947aa7c19ab3..397e233a81f8 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildLinux, ... } @ args:
 
 let
-  version = "5.8.13";
+  version = "5.9.3";
 in
 
 buildLinux (args // {
@@ -12,11 +12,11 @@ buildLinux (args // {
     owner = "zen-kernel";
     repo = "zen-kernel";
     rev = "v${version}-zen1";
-    sha256 = "161bvrmic7gspkgkv0pqssk6dzv95vkxld69rir968khwlnpsnim";
+    sha256 = "0004fp3qnz2dpahnxkbc02yyijyqiavqmacyng1fi5wrw5kl2aj3";
   };
 
   extraMeta = {
-    branch = "5.8/master";
+    branch = "5.9/master";
     maintainers = with stdenv.lib.maintainers; [ atemu ];
   };
 

From c633a2e8fb85915d9044d5b170b55e0d74d31a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Sun, 25 Oct 2020 13:18:37 +0000
Subject: [PATCH 0813/3942] linux_zen: add maintainer

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

diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 397e233a81f8..73841aa9afac 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -17,7 +17,7 @@ buildLinux (args // {
 
   extraMeta = {
     branch = "5.9/master";
-    maintainers = with stdenv.lib.maintainers; [ atemu ];
+    maintainers = with stdenv.lib.maintainers; [ atemu andresilva ];
   };
 
 } // (args.argsOverride or {}))

From 335d21df857a02dbc2fc768bb2bdeee2957becdf Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 1 Nov 2020 15:20:17 +0100
Subject: [PATCH 0814/3942] pysideGeneratorrunner: refactor to use python3

---
 .../python-modules/pyside/generatorrunner.nix       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix
index 7cb132c1ad70..8fc505a89fc4 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, cmake, pysideApiextractor, python2, qt4 }:
+{ stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }:
 
 # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
 let
-  pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]);
+  pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]);
   pname = "pyside-generatorrunner";
   version = "0.6.16";
 in stdenv.mkDerivation {
@@ -15,7 +15,14 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake pysideApiextractor qt4 pythonEnv ];
+  outputs = [ "out" "dev" ];
+
+  preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
+  '';
+
+  nativeBuildInputs = [ cmake pythonEnv ];
+  buildInputs = [ pysideApiextractor qt4 ];
 
   meta = {
     description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";

From a3e20b8dbc6c20349c0bf64e79adf20591eae6b1 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 1 Nov 2020 16:22:00 +0100
Subject: [PATCH 0815/3942] python3Packages.pysideShiboken: refactor to use
 multiple outputs

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

diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix
index b0c3368e070b..cf7192f92ffb 100644
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -33,7 +33,10 @@ buildPythonPackage rec {
 
   buildInputs = [ python libxml2 libxslt ];
 
+  outputs = [ "out" "dev" ];
+
   preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
     echo "preConfigure: Fixing shiboken_generator install target."
     substituteInPlace generator/CMakeLists.txt --replace \
       \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/

From 5a03f8ba8054a1af6bf79857cc08d3a967815570 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 1 Nov 2020 16:22:13 +0100
Subject: [PATCH 0816/3942] python3Packages.pysideTools: refactor to use
 multiple outputs

---
 pkgs/development/python-modules/pyside/tools.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix
index 9698c09f3478..cc52a0502f28 100644
--- a/pkgs/development/python-modules/pyside/tools.nix
+++ b/pkgs/development/python-modules/pyside/tools.nix
@@ -12,6 +12,12 @@ buildPythonPackage rec {
     sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll";
   };
 
+  outputs = [ "out" "dev" ];
+
+  preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ qt4 ];

From b6a2387ddc9676db294bc657b3a8d495740851dc Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 1 Nov 2020 16:22:29 +0100
Subject: [PATCH 0817/3942] python3Packages.pyside: refactor to use multiple
 outputs

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

diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index 8eae5034a4f8..2bbeb7a1233f 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -13,6 +13,12 @@ buildPythonPackage rec {
 
   enableParallelBuilding = true;
 
+  outputs = [ "out" "dev" ];
+
+  preConfigure = ''
+    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
+  '';
+
   nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
 
   buildInputs = [ mesa libGL ];

From 8aa15a1a10b2de779bf7e06c2308cdd0599baa98 Mon Sep 17 00:00:00 2001
From: Evax Software <contact@evax.fr>
Date: Sun, 1 Nov 2020 15:38:39 +0100
Subject: [PATCH 0818/3942] python3Packages.ppscore: init at 1.1.1

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

diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix
new file mode 100644
index 000000000000..3fd047402ee7
--- /dev/null
+++ b/pkgs/development/python-modules/ppscore/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, pandas
+, scikitlearn
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "ppscore";
+  version = "1.1.1";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "8080labs";
+    repo = pname;
+    rev = version;
+    sha256 = "11y6axhj0nlagf7ax6gas1g06krrmddb1jlmf0mmrmyi7z0vldk2";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+
+  propagatedBuildInputs = [
+    pandas
+    scikitlearn
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A Python implementation of the Predictive Power Score (PPS)";
+    homepage = "https://github.com/8080labs/ppscore/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ evax ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 47c9f2f60c1a..28e548267258 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4640,6 +4640,8 @@ in {
 
   pproxy = callPackage ../development/python-modules/pproxy { };
 
+  ppscore = callPackage ../development/python-modules/ppscore { };
+
   pq = callPackage ../development/python-modules/pq { };
 
   prance = callPackage ../development/python-modules/prance { };

From 5db66b26785dd2206b750cb37418b60c164c1cad Mon Sep 17 00:00:00 2001
From: Benjamin Asbach <asbachb@users.noreply.github.com>
Date: Sun, 1 Nov 2020 17:02:02 +0100
Subject: [PATCH 0819/3942] openjdk:openjdk8: 1.8.0_265 -> 1.8.0_272

---
 pkgs/development/compilers/openjdk/8.nix | 36 ++++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index bcd3524bb862..a51b765fb602 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -19,8 +19,8 @@ let
     aarch64-linux = "aarch64";
   }.${stdenv.system} or (throw "Unsupported platform");
 
-  update = "265";
-  build = if stdenv.isAarch64 then "b01" else "ga";
+  update = "272";
+  build = if stdenv.isAarch64 then "b10" else "b10";
   baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah"
             else "https://hg.openjdk.java.net/jdk8u/jdk8u";
   repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-"
@@ -29,50 +29,50 @@ let
   jdk8 = fetchurl {
              name = "jdk8-${repover}.tar.gz";
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "1a2adw51af064rzlngsdlhs9gl47h3lv6dzvr8swqgl2n93nlbxa"
-                      else "02j1nbf3rxl581fqzc6i3ri6wwxx1dhkmj5klkh5xlp8dkhclr30";
+             sha256 = if stdenv.isAarch64 then "db98897d6fddce85996a9b0daf4352abce4578be0b51eada41702ee1469dd415"
+                      else "8f0e8324d3500432e8ed642b4cc7dff90a617dbb2a18a94c07c1020d32f93b7a";
           };
   langtools = fetchurl {
              name = "langtools-${repover}.tar.gz";
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "0hfrbz7421s2barfrfp0fvmh45iksw2zx1z4ykjg3giv8zbmswfm"
-                      else "1r2adp7sn3y45rb5h059qygz18bgmkqr2g2jc9mpzskl5vwsqiw4";
+             sha256 = if stdenv.isAarch64 then "6544c1cc455844bbbb3d2914ffc716b1cee7f19e6aa223764d41a7cddc41322c"
+                      else "632417b0b067c929eda6958341352e29c5810056a5fec138641eb3503f9635b7";
           };
   hotspot = fetchurl {
              name = "hotspot-${repover}.tar.gz";
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "0g5h74snfl2dj2xwlvb5hgfbqmnbhxax68axadz11mq7r2bhd0lk"
-                      else "10xj8qr499r6nla74bjh4dmq7pkj63iircijk1wyv9xz5v777pcc";
+             sha256 = if stdenv.isAarch64 then "37abb89e66641607dc6f372946bfc6bd413f23fec0b9c3baf75f41ce517e21d8"
+                      else "2142f3b769800a955613b51ffe192551bab1db95b0c219900cf34febc6f20245";
           };
   corba = fetchurl {
              name = "corba-${repover}.tar.gz";
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "0wfqrpr5m4gnavgsl6zcy2l3c7sgn3yl7yhp2crh9icp44ld2cj9"
-                      else "0lk4jimrafgphffsj5yyyhl6pib0y5xxqcr09bgr2w8sjkp4s04s";
+             sha256 = if stdenv.isAarch64 then "5da82f7b4aceff32e02d2f559033e3b62b9509d79f1a6891af871502e1d125b1"
+                      else "320098d64c843c1ff2ae62579817f9fb4a81772bc0313a543ce68976ad7a6d98";
           };
   jdk = fetchurl {
              name = "jdk-${repover}.tar.gz";
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "0ss49bv2dzb9vkabpv1ag04wli5722p0a8gqkzqmzw4nj67snfqw"
-                      else "0anbp4vq8bzhqsqxlgjd0dx0irf57x4i5ddbpljl36vy2pi9xsm7";
+             sha256 = if stdenv.isAarch64 then "ee613296d823605dcd1a0fe2f89b4c7393bdb8ae5f2659f48f5cbc0012bb1a47"
+                      else "957c24fc58ac723c8cd808ab60c77d7853710148944c8b9a59f470c4c809e1a0";
           };
   jaxws = fetchurl {
              name = "jaxws-${repover}.tar.gz";
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "1nwn6mz38app6pk5f1x3vya1x9qfckyl7z6bi62k6mj2c72ikfh5"
-                      else "113d5nx2mp30m6xy2m2wh0nixk45q8abimlszkiq09w1w1ckzpba";
+             sha256 = if stdenv.isAarch64 then "7c426b85f0d378125fa46e6d1b25ddc27ad29d93514d38c5935c84fc540b26ce"
+                      else "4efb0ee143dfe86c8ee06db2429fb81a0c8c65af9ea8fc18daa05148c8a1162f";
           };
   jaxp = fetchurl {
              name = "jaxp-${repover}.tar.gz";
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "1rhgbwvp7xls7r3f5jm69dw7x521vamchv917dwiz1byvm2bwn7s"
-                      else "0nvqidjssmamcrchq15cg3lfv5v3cnrw05a4h20xmhlpgb9im0vj";
+             sha256 = if stdenv.isAarch64 then "928e363877afa7e0ad0c350bb18be6ab056b23708c0624a0bd7f01c4106c2a14"
+                      else "25a651c670d5b036042f7244617a3eb11fec80c07745c1c8181a1cdebeda3d8e";
           };
   nashorn = fetchurl {
              name = "nashorn-${repover}.tar.gz";
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "14gp8q6jw1hq2wlmcalfwn1kgmnq5w9svqnbjww20f25phxkicij"
-                      else "0fm9ldps7ayk7r3wjqiyxp1s6hvi242kl7f92ydkmlxqyfajx60a";
+             sha256 = if stdenv.isAarch64 then "f060e08c5924457d4f5047c02ad6a987bdbdcd1cea53d2208322073ba4f398c3"
+                      else "a28b41d86f0c87ceacd2b686dd31c9bf391d851b1b5187a49ef5e565fc2cbc84";
           };
   openjdk8 = stdenv.mkDerivation {
     pname = "openjdk" + lib.optionalString headless "-headless";

From f53291425a9f19b7df19845f8e2cb134a5406ca5 Mon Sep 17 00:00:00 2001
From: Patryk Wychowaniec <wychowaniec.patryk@gmail.com>
Date: Sat, 20 Jun 2020 19:04:26 +0200
Subject: [PATCH 0820/3942] pcloud: init at 1.8.8

---
 .../networking/pcloud/default.nix             | 110 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 2 files changed, 112 insertions(+)
 create mode 100644 pkgs/applications/networking/pcloud/default.nix

diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix
new file mode 100644
index 000000000000..7db633737d99
--- /dev/null
+++ b/pkgs/applications/networking/pcloud/default.nix
@@ -0,0 +1,110 @@
+# Even though pCloud Drive is redistributed as a plug-n-play AppImage, it
+# requires a little bit more love because of the way Nix launches those types
+# of applications.
+#
+# What Nix does, simplifying a bit, is that it extracts an AppImage and starts
+# it via buildFHSUserEnv - this is totally fine for majority of apps, but makes
+# it by-design *impossible* to launch SUID wrappers [^1]; in case of pCloud,
+# it's fusermount.
+# (so pCloud starts, but silently fails to mount the FUSE drive.)
+#
+# To overcome this issue, we're manually extracting the AppImage and then treat
+# it as if it was a regular, good-ol' application requiring some standard path
+# fixes.
+#
+# ^1 https://github.com/NixOS/nixpkgs/issues/69338
+
+{
+  # Build dependencies
+  appimageTools, autoPatchelfHook, fetchzip, stdenv,
+
+  # Runtime dependencies;
+  # A few additional ones (e.g. Node) are already shipped together with the
+  # AppImage, so we don't have to duplicate them here.
+  alsaLib, dbus-glib, fuse, gnome3, libdbusmenu-gtk2, udev, nss
+}:
+
+let
+  pname = "pcloud";
+  version = "1.8.8";
+  name = "${pname}-${version}";
+
+  # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive
+  src = fetchzip {
+    url = "https://api.pcloud.com/getpubzip?code=XZpnMpXZPWyhRfdvXUhyY6XpdfmQmJiLRmmV&filename=${name}.zip";
+    hash = "sha256-z9OeFkH6EVthg5Dz2mN3jlBTMhiMt/6bUIYFeMO6EXk=";
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit name;
+    src = "${src}/pcloud";
+  };
+
+in stdenv.mkDerivation {
+  inherit pname version;
+
+  src = appimageContents;
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    alsaLib
+    dbus-glib
+    fuse
+    gnome3.gtk
+    libdbusmenu-gtk2
+    nss
+    udev
+  ];
+
+  installPhase = ''
+    mkdir "$out"
+    cp -ar . "$out/app"
+    cd "$out"
+
+    # Remove the AppImage runner, since users are not supposed to use it; the
+    # actual entry point is the `pcloud` binary
+    rm app/AppRun
+
+    # Adjust directory structure, so that the `.desktop` etc. files are
+    # properly detected
+    mkdir bin
+    mv app/usr/share .
+    mv app/usr/lib .
+
+    # Adjust the `.desktop` file
+    mkdir share/applications
+
+    substitute \
+      app/pcloud.desktop \
+      share/applications/pcloud.desktop \
+      --replace "Name=pcloud" "Name=pCloud" \
+      --replace "Exec=AppRun" "Exec=$out/bin/pcloud"
+
+    # Build the main executable
+    cat > bin/pcloud <<EOF
+    #! $SHELL -e
+
+    # This is required for the file picker dialog - otherwise pcloud just
+    # crashes
+    export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gnome3.gtk}/share/gsettings-schemas/${gnome3.gtk.name}:$XDG_DATA_DIRS"
+
+    exec "$out/app/pcloud"
+    EOF
+
+    chmod +x bin/pcloud
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Secure and simple to use cloud storage for your files; pCloud Drive, Electron Edition";
+    homepage = "https://www.pcloud.com/";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ patryk27 ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4226f35c7fa6..b616759febd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22802,6 +22802,8 @@ in
 
   pbrt = callPackage ../applications/graphics/pbrt { };
 
+  pcloud = callPackage ../applications/networking/pcloud { };
+
   pcsxr = callPackage ../misc/emulators/pcsxr {
     ffmpeg = ffmpeg_2;
   };

From 49bdf0daceb9035f96e267b12adc01f28928edc4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 31 Oct 2020 09:09:57 +0100
Subject: [PATCH 0821/3942] ocamlPackages.mirage-profile: init at 0.9.1

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

diff --git a/pkgs/development/ocaml-modules/mirage-profile/default.nix b/pkgs/development/ocaml-modules/mirage-profile/default.nix
new file mode 100644
index 000000000000..d4cf621ed118
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchurl, buildDunePackage
+, ppx_cstruct
+, cstruct, lwt
+}:
+
+buildDunePackage rec {
+  pname = "mirage-profile";
+  version = "0.9.1";
+
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/mirage/mirage-profile/releases/download/v${version}/mirage-profile-v${version}.tbz";
+    sha256 = "0lh3591ad4v7nxpd410b75idmgdq668mqdilvkg4avrwqw1wzdib";
+  };
+
+  buildInputs = [ ppx_cstruct ];
+  propagatedBuildInputs = [ cstruct lwt ];
+
+  meta = {
+    description = "Collect runtime profiling information in CTF format";
+    homepage = "https://github.com/mirage/mirage-profile";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 55658e70af9a..b623d65bb8b5 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -569,6 +569,8 @@ let
 
     mirage-net = callPackage ../development/ocaml-modules/mirage-net { };
 
+    mirage-profile = callPackage ../development/ocaml-modules/mirage-profile { };
+
     mirage-protocols = callPackage ../development/ocaml-modules/mirage-protocols { };
 
     mirage-random = callPackage ../development/ocaml-modules/mirage-random { };

From c386d3d211518e7bb6711333c44241496196a129 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Sat, 31 Oct 2020 14:43:59 +0100
Subject: [PATCH 0822/3942] Update
 pkgs/development/ocaml-modules/mirage-profile/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/ocaml-modules/mirage-profile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mirage-profile/default.nix b/pkgs/development/ocaml-modules/mirage-profile/default.nix
index d4cf621ed118..c6ca730bf3c5 100644
--- a/pkgs/development/ocaml-modules/mirage-profile/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix
@@ -17,10 +17,10 @@ buildDunePackage rec {
   buildInputs = [ ppx_cstruct ];
   propagatedBuildInputs = [ cstruct lwt ];
 
-  meta = {
+  meta = with lib; {
     description = "Collect runtime profiling information in CTF format";
     homepage = "https://github.com/mirage/mirage-profile";
-    license = lib.licenses.bsd2;
-    maintainers = [ lib.maintainers.vbgl ];
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ vbgl ];
   };
 }

From 73c60d64a2c55520e742fde18065885f9f7d8740 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 1 Nov 2020 07:49:29 +0100
Subject: [PATCH 0823/3942] ocamlPackages.imagelib: use Dune 2

---
 pkgs/development/ocaml-modules/imagelib/default.nix | 3 +++
 pkgs/development/ocaml-modules/imagelib/unix.nix    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix
index 12b8a757e16f..46bd4b962681 100644
--- a/pkgs/development/ocaml-modules/imagelib/default.nix
+++ b/pkgs/development/ocaml-modules/imagelib/default.nix
@@ -4,6 +4,9 @@ buildDunePackage rec {
   minimumOCamlVersion = "4.07";
   version = "20191011";
   pname = "imagelib";
+
+  useDune2 = true;
+
   src = fetchFromGitHub {
     owner = "rlepigre";
     repo = "ocaml-imagelib";
diff --git a/pkgs/development/ocaml-modules/imagelib/unix.nix b/pkgs/development/ocaml-modules/imagelib/unix.nix
index 48986b15a8f8..a188165a48fa 100644
--- a/pkgs/development/ocaml-modules/imagelib/unix.nix
+++ b/pkgs/development/ocaml-modules/imagelib/unix.nix
@@ -2,7 +2,7 @@
 
 buildDunePackage {
   pname = "imagelib-unix";
-  inherit (imagelib) version src meta;
+  inherit (imagelib) version src useDune2 meta;
 
   propagatedBuildInputs = [ imagelib ];
 }

From 371dce30240d769aea575d98718684efd6c9b953 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 1 Nov 2020 07:49:39 +0100
Subject: [PATCH 0824/3942] ocamlPackages.decompress: use Dune 2

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

diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix
index 753f894e0850..a3bf3456ed0d 100644
--- a/pkgs/development/ocaml-modules/decompress/default.nix
+++ b/pkgs/development/ocaml-modules/decompress/default.nix
@@ -7,6 +7,8 @@ buildDunePackage rec {
 	version = "0.9.0";
 	pname = "decompress";
 
+	useDune2 = true;
+
 	src = fetchurl {
 		url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
 		sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";

From 99ebf5ba5bfb936ea21d91e828736d8c473467e2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 1 Nov 2020 07:49:44 +0100
Subject: [PATCH 0825/3942] =?UTF-8?q?ocamlPackages.checkseum:=200.1.1=20?=
 =?UTF-8?q?=E2=86=92=200.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/checkseum/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix
index 731dd476c5d7..810099810470 100644
--- a/pkgs/development/ocaml-modules/checkseum/default.nix
+++ b/pkgs/development/ocaml-modules/checkseum/default.nix
@@ -1,19 +1,21 @@
-{ lib, fetchurl, buildDunePackage
+{ lib, fetchurl, buildDunePackage, dune-configurator
 , bigarray-compat, optint
-, cmdliner, fmt, rresult
+, fmt, rresult
 , alcotest
 }:
 
 buildDunePackage rec {
-  version = "0.1.1";
+  version = "0.2.1";
   pname = "checkseum";
 
+  useDune2 = true;
+
   src = fetchurl {
     url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-v${version}.tbz";
-    sha256 = "0aa2r1l65a5hcgciw6n8r5ij4gpgg0cf9k24isybxiaiz63k94d3";
+    sha256 = "1swb44c64pcs4dh9ka9lig6d398qwwkd3kkiajicww6qk7jbh3n5";
   };
 
-  buildInputs = [ cmdliner fmt rresult ];
+  buildInputs = [ dune-configurator fmt rresult ];
   propagatedBuildInputs = [ bigarray-compat optint ];
   checkInputs = lib.optionals doCheck [ alcotest ];
 

From 86c6683e6208103224da74ace3d89031b3e10ab1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Oct 2020 06:27:59 +0100
Subject: [PATCH 0826/3942] ocamlPackages.google-drive-ocamlfuse: disable for
 OCaml < 4.06

---
 pkgs/applications/networking/google-drive-ocamlfuse/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index b9b1c1f54a95..72ff8bd8b4be 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -8,6 +8,8 @@ buildDunePackage rec {
 
   useDune2 = true;
 
+  minimumOCamlVersion = "4.06";
+
   src = fetchFromGitHub {
     owner = "astrada";
     repo = "google-drive-ocamlfuse";

From 15812e11364ac8905cfc8b6804413143ae875e5b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Oct 2020 06:11:02 +0100
Subject: [PATCH 0827/3942] =?UTF-8?q?ocamlPackages.gapi=5Focaml:=200.3.19?=
 =?UTF-8?q?=20=E2=86=92=200.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/gapi-ocaml/default.nix      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index b01d4b4a04c2..348a70a0da9f 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,10 +1,13 @@
-{ stdenv, fetchFromGitHub, buildDunePackage
-, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm
+{ lib, fetchFromGitHub, buildDunePackage, ocaml
+, cryptokit, ocamlnet, ocurl, yojson
+, ounit
 }:
 
 buildDunePackage rec {
   pname = "gapi-ocaml";
-  version = "0.3.19";
+  version = "0.4.1";
+
+  useDune2 = true;
 
   minimumOCamlVersion = "4.02";
 
@@ -12,16 +15,18 @@ buildDunePackage rec {
     owner = "astrada";
     repo = pname;
     rev = "v${version}";
-    sha256 = "04arif1p1vj5yr24cwicj70b7yx17hrgf4pl47vqg8ngcrdh71v9";
+    sha256 = "0riax23grjnq9pczmp1yv02ji0svvs2kbiqskj6f6yjviamnpa31";
   };
 
-  propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib ocamlnet yojson ];
-  buildInputs = [ xmlm ];
+  propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];
+
+  doCheck = lib.versionAtLeast ocaml.version "4.04";
+  checkInputs = [ ounit ];
 
   meta = {
     description = "OCaml client for google services";
     homepage = "http://gapi-ocaml.forge.ocamlcore.org";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ bennofs ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bennofs ];
   };
 }

From c311bf1eb581145ced44436e76079a96f6de9f15 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 25 Jul 2020 14:50:18 +0000
Subject: [PATCH 0828/3942] ocamlPackages.bitstring: 3.0.0 -> 3.1.1

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

diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index 2f413d37352c..386503039e05 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -2,13 +2,13 @@
 
 buildDunePackage rec {
   pname = "bitstring";
-  version = "3.0.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "xguerin";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0r49qax7as48jgknzaq6p9rbpmrvnmlic713wzz5bj60j5h0396f";
+    sha256 = "1ys8xx174jf8v5sm0lbxvzhdlcs5p0fhy1gvf58gad2g4gvgpvxc";
   };
 
   buildInputs = [ ppx_tools_versioned ounit ];

From 546ef7afd7fc9a78f2eb3164d0815ce892b73fb9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 30 Oct 2020 06:24:37 +0100
Subject: [PATCH 0829/3942] =?UTF-8?q?ocamlPackages.lacaml:=2011.0.6=20?=
 =?UTF-8?q?=E2=86=92=2011.0.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/lacaml/default.nix          | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix
index 23b38e469b4b..b7f5cb44818b 100644
--- a/pkgs/development/ocaml-modules/lacaml/default.nix
+++ b/pkgs/development/ocaml-modules/lacaml/default.nix
@@ -1,31 +1,31 @@
-{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, lapack, blas }:
+{ stdenv, fetchurl, darwin, buildDunePackage, dune-configurator
+, lapack, blas
+}:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0";
 assert (!blas.isILP64) && (!lapack.isILP64);
 
-stdenv.mkDerivation rec {
-  pname = "ocaml${ocaml.version}-lacaml";
-  version = "11.0.6";
+buildDunePackage rec {
+  pname = "lacaml";
+  version = "11.0.8";
 
-  src = fetchFromGitHub {
-    owner = "mmottl";
-    repo = "lacaml";
-    rev = version;
-    sha256 = "1vn5441fg45d0ni9x87dhz2x4jrmvg3w7qk3vvcrd436snvh07g0";
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.08";
+
+  src = fetchurl {
+    url = "https://github.com/mmottl/lacaml/releases/download/${version}/lacaml-${version}.tbz";
+    sha256 = "1i47wqnd9iy6ndbi9zfahpb592gahp6im26rgpwch13vgzk3kifd";
   };
 
-  buildInputs = [ ocaml findlib dune base stdio ];
+  buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [ lapack blas ] ++
     stdenv.lib.optionals stdenv.isDarwin
       [ darwin.apple_sdk.frameworks.Accelerate ];
 
-  inherit (dune) installPhase;
-
   meta = with stdenv.lib; {
-    homepage = "http://mmottl.github.io/lacaml";
+    homepage = "https://mmottl.github.io/lacaml";
     description = "OCaml bindings for BLAS and LAPACK";
     license = licenses.lgpl21Plus;
-    platforms = ocaml.meta.platforms or [];
-    maintainers = [ maintainers.rixed ];
+    maintainers = [ maintainers.vbgl ];
   };
 }

From eae298212386bfd73c9c5c5b6fbccc2c64c566f7 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 1 Nov 2020 19:40:42 +0300
Subject: [PATCH 0830/3942] mame: 0.225 -> 0.226 (#102329)

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

diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix
index 3033ce8dc7b1..ddf0a129ab82 100644
--- a/pkgs/misc/emulators/mame/default.nix
+++ b/pkgs/misc/emulators/mame/default.nix
@@ -7,7 +7,7 @@ with stdenv;
 
 let
   majorVersion = "0";
-  minorVersion = "225";
+  minorVersion = "226";
 
   desktopItem = makeDesktopItem {
     name = "MAME";
@@ -26,7 +26,7 @@ in mkDerivation {
     owner = "mamedev";
     repo = "mame";
     rev = "mame${majorVersion}${minorVersion}";
-    sha256 = "0ln5z8xp81j2af2s94dixnk9n68qpi6b3plynp3pharg6dd55yac";
+    sha256 = "0pnsvz4vkjkqb1ac5wzwz31vx0iknyg5ffly90nhl13kcr656jrj";
   };
 
   hardeningDisable = [ "fortify" ];

From 70bddcf122d59de984366d7d9ff861c8a078d362 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 28 Oct 2020 23:34:36 +0000
Subject: [PATCH 0831/3942] python37Packages.css-parser: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/development/python-modules/css-parser/default.nix b/pkgs/development/python-modules/css-parser/default.nix
index 3874300cde94..7791c2b9a237 100644
--- a/pkgs/development/python-modules/css-parser/default.nix
+++ b/pkgs/development/python-modules/css-parser/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "css-parser";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "665b7965bef0c9b86955be7a3383ca44e519b46affc7c6bca5002cbdbd0bf19f";
+    sha256 = "4ed448a8a5622edb1d30d616bbc4bd3d30f11be922343d7a92d7e418e324af2e";
   };
 
   # Test suite not included in tarball yet

From 5dfc33cb3cd150a790262ead692cd2c65c81155f Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 31 Oct 2020 23:02:46 +0100
Subject: [PATCH 0832/3942] google-app-engine-go-sdk: refactor to use python3

---
 .../tools/google-app-engine-go-sdk/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index 001edf5c038e..485b2c3625fb 100644
--- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, python27, python27Packages, makeWrapper }:
+{ stdenv, fetchzip, python3Packages, makeWrapper }:
 
-with python27Packages;
+with python3Packages;
 
 stdenv.mkDerivation rec {
   pname = "google-app-engine-go-sdk";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
         sha256 = "0s8sqyc72lnc7dxd4cl559gyfx83x71jjpsld3i3nbp3mwwamczp";
       };
 
-  buildInputs = [python27 makeWrapper];
+  buildInputs = [ python makeWrapper ];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     # create wrappers with correct env
     for i in goapp go-app-stager *.py; do
       makeWrapper "$out/share/go_appengine/$i" "$out/bin/$i" \
-        --prefix PATH : "${python27}/bin" \
+        --prefix PATH : "${python}/bin" \
         --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl})"
     done
   '';

From 718d8bf9761ba56e9d4a3187e47f40f9fa7f42a5 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 31 Oct 2020 23:03:55 +0100
Subject: [PATCH 0833/3942] google-cloud-sdk: refactor to use python3

---
 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 4226f35c7fa6..05b06564456d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4231,7 +4231,9 @@ in
 
   google-authenticator = callPackage ../os-specific/linux/google-authenticator { };
 
-  google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
+  google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk {
+    python = python3;
+  };
   google-cloud-sdk-gce = google-cloud-sdk.override { with-gce = true; };
 
   google-fonts = callPackage ../data/fonts/google-fonts { };

From 4fe0ea478a0ce98ebd919ffa62506c6151ac7a98 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 31 Oct 2020 23:04:28 +0100
Subject: [PATCH 0834/3942] google-compute-engine: refactor to use python3

---
 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 05b06564456d..8ec8bcecef2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4240,7 +4240,7 @@ in
 
   google-clasp = callPackage ../development/misc/google-clasp { };
 
-  google-compute-engine = python2.pkgs.google-compute-engine;
+  google-compute-engine = with python3.pkgs; toPythonApplication google-compute-engine;
 
   google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { };
 

From 307abd9eae0d02de7a517a309145d0d9f162706f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Nov 2020 16:53:23 +0100
Subject: [PATCH 0835/3942] openldap: add patch to fix unauthenticated nullptr
 dereference in slapd

This vulnerability does not have a CVE yet.

https://security-tracker.debian.org/tracker/TEMP-0000000-DD4835
https://bugs.openldap.org/show_bug.cgi?id=9370
---
 pkgs/development/libraries/openldap/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 7f9c2dbf3ee9..1304799f56c9 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -8,6 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0qmy2jkk6v9iqwrsdsn8s7lwzaplr01a2mgf21r6nl66lig7g47l";
   };
 
+  patches = [
+    (fetchurl {
+      # Fix a null-ptr dereference for unauthenticated packet in slapd
+      # NO CVE yet
+      # https://bugs.openldap.org/show_bug.cgi?id=9370
+      url = "https://git.openldap.org/openldap/openldap/-/commit/4c774220a752bf8e3284984890dc0931fe73165d.patch";
+      sha256 = "1vkbb6szscnhch5zzf6iq104l3dkwd50rih8jk9y0s2vgyz76mil";
+    })
+  ];
+
   # TODO: separate "out" and "bin"
   outputs = [ "out" "dev" "man" "devdoc" ];
 

From 05eef8051b2c129e05973073b6772b2d36db76c1 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Mon, 28 Sep 2020 14:34:01 +0200
Subject: [PATCH 0836/3942] stunnel service: fix servers example

examples incorrectly had 'enable' set, the option is not defined
and reproducing would error out
---
 nixos/modules/services/networking/stunnel.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix
index ab51bba2f6ac..2720bcf10934 100644
--- a/nixos/modules/services/networking/stunnel.nix
+++ b/nixos/modules/services/networking/stunnel.nix
@@ -129,7 +129,6 @@ in
         type = with types; attrsOf (submodule serverConfig);
         example = {
           fancyWebserver = {
-            enable = true;
             accept = 443;
             connect = 8080;
             cert = "/path/to/pem/file";

From 175cf979b52c16a42799bd3f236c237d4db43712 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 1 Nov 2020 12:25:57 -0500
Subject: [PATCH 0837/3942] pythonPackages.plaid-python: 6.0.0 -> 7.1.0

There's been a new major version update of the server API, so the 6.X line no longer works.
---
 pkgs/development/python-modules/plaid-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix
index 96e733560472..6d9756d11fba 100644
--- a/pkgs/development/python-modules/plaid-python/default.nix
+++ b/pkgs/development/python-modules/plaid-python/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, fetchPypi, requests, pytest }:
 
 buildPythonPackage rec {
-  version = "6.0.0";
+  version = "7.1.0";
   pname = "plaid-python";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a0ay39k50hbxxaxz09m2azz5c08yqki2gincziv6g381yrlj68s";
+    sha256 = "04mm1iqpmd6qwxmkm85k263avd42xvsmjsa24r8ggfjcw0w4lq6j";
   };
 
   checkInputs = [ pytest ];

From 295948f40fea63cc7de2f37693dbda16d49ddeb1 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Sun, 1 Nov 2020 18:50:37 +0100
Subject: [PATCH 0838/3942] neovim: dont wrap when  is null

restore previous behavior
---
 pkgs/applications/editors/neovim/utils.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index 15d3f214057f..d3af8ca5d59a 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -148,8 +148,9 @@ let
     in
     wrapNeovimUnstable neovim (res // {
       wrapperArgs = lib.escapeShellArgs (
-        res.wrapperArgs ++ [ "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}" ])
-        + " " + extraMakeWrapperArgs
+        res.wrapperArgs ++ lib.optionals (configure != {}) [
+          "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}"
+        ]) + " " + extraMakeWrapperArgs
       ;
   });
 in

From d7a1f5e2016ebff780dc3ab86922b90d11160bac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Nov 2020 18:08:41 +0100
Subject: [PATCH 0839/3942] youtube-dl: 2020-09-20 -> 2020.11.01.1

---
 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 e3b64939a0a4..7de5f2369bc0 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2020.09.20";
+  version = "2020.11.01.1";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1pkw3hnkddk1kqv0in152q1k4jjgbmf2xvc9j3r5nd38z6f7j6mc";
+    sha256 = "06lhba4b9bm6f5yqrb5xvdr0l5shwd95djf9nlpg86prr5xihqks";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];

From e98e29ed3a00f1e4e9bba4f6b2be184a262949bd Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 1 Nov 2020 08:57:57 -0800
Subject: [PATCH 0840/3942] glslviewer: 2019-04-22 -> 1.6.8, use python3

---
 pkgs/development/tools/glslviewer/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix
index b9e46ca41e17..84b3d2a6b1ee 100644
--- a/pkgs/development/tools/glslviewer/default.nix
+++ b/pkgs/development/tools/glslviewer/default.nix
@@ -1,28 +1,28 @@
 { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage
 , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi
-, libX11, libGLU, python2Packages, ensureNewerSourcesForZipFilesHook
+, libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook
 , Cocoa
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "glslviewer";
-  version = "2019-04-22";
+  version = "1.6.8";
 
   src = fetchFromGitHub {
     owner = "patriciogonzalezvivo";
     repo = "glslViewer";
-    rev = "fa3e2ed4810927d189e480b704366cca22f281f3";
-    sha256 = "1888jxi84f2nnc0kpzqrn2cada1z4zqyq8ss4ppb5y3wy7d87qjn";
+    rev = version;
+    sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7";
   };
 
-  nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook ];
+  nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook python3Packages.six ];
   buildInputs = [
     glfw libGLU glfw libXrandr libXdamage
     libXext libXrender libXinerama libXcursor libXxf86vm
     libXi libX11
-  ] ++ (with python2Packages; [ python setuptools wrapPython ])
+  ] ++ (with python3Packages; [ python setuptools wrapPython ])
     ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
-  pythonPath = with python2Packages; [ requests ];
+  pythonPath = with python3Packages; [ pyyaml requests ];
 
   # Makefile has /usr/local/bin hard-coded for 'make install'
   preConfigure = ''
@@ -31,6 +31,7 @@ stdenv.mkDerivation {
         --replace '/usr/bin/clang++' 'clang++'
     substituteInPlace Makefile \
         --replace 'python setup.py install' "python setup.py install --prefix=$out"
+    2to3 -w bin/*
   '';
 
   preInstall = ''

From 36758a34a8d754b20d931e48e070aae5b4a7a786 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 31 Oct 2020 17:49:31 +0100
Subject: [PATCH 0841/3942] uutils-coreutils: Use Python3 sphinx for docs

---
 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 8ec8bcecef2d..9ee31bbe6bd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3516,7 +3516,7 @@ in
   uudeview = callPackage ../tools/misc/uudeview { };
 
   uutils-coreutils = callPackage ../tools/misc/uutils-coreutils {
-    inherit (pythonPackages) sphinx;
+    inherit (python3Packages) sphinx;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 

From ec4c848751339ba0d0694bdd1bd356d665f6c09d Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 31 Oct 2020 18:02:42 +0100
Subject: [PATCH 0842/3942] ndn-cxx: 0.6.3 -> 0.7.1

---
 .../development/libraries/ndn-cxx/default.nix | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix
index d461535ecef0..893f82a6d526 100644
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/pkgs/development/libraries/ndn-cxx/default.nix
@@ -1,24 +1,36 @@
-{ stdenv, fetchFromGitHub, openssl, doxygen
-, boost, sqlite, pkgconfig, python, pythonPackages, wafHook }:
-let
-  version = "0.6.3";
-in
-stdenv.mkDerivation {
+{ stdenv
+, fetchFromGitHub
+, doxygen
+, pkg-config
+, python3
+, python3Packages
+, wafHook
+, boost
+, openssl
+, sqlite
+}:
+
+stdenv.mkDerivation rec {
   pname = "ndn-cxx";
-  inherit version;
+  version = "0.7.1";
+
   src = fetchFromGitHub {
     owner = "named-data";
     repo = "ndn-cxx";
-    rev = "a3bf4319ed483a4a6fe2c96b79ec4491d7217f00";
-    sha256 = "076jhrjigisqz5n8dgxwd5fhimg69zhm834m7w9yvf9afgzrr50h";
+    rev = "${pname}-${version}";
+    sha256 = "1lcaqc79n3d9sip7knddblba17sz18b0w7nlxmj3fz3lb3z9qd51";
   };
-  nativeBuildInputs = [ pkgconfig wafHook ];
-  buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx];
+
+  nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ];
+
+  buildInputs = [ boost openssl sqlite ];
+
   wafConfigureFlags = [
     "--with-openssl=${openssl.dev}"
     "--boost-includes=${boost.dev}/include"
     "--boost-libs=${boost.out}/lib"
   ];
+
   meta = with stdenv.lib; {
     homepage = "http://named-data.net/";
     description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
@@ -36,7 +48,7 @@ stdenv.mkDerivation {
       and consuming less resources overall.
     '';
     license = licenses.lgpl3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ maintainers.sjmackenzie ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ sjmackenzie ];
   };
 }

From 9122b454f629558cdc97602a906bce3c97fc3ba3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 1 Nov 2020 10:31:36 -0800
Subject: [PATCH 0843/3942] csv_fast_export: use python3

---
 .../version-management/cvs-fast-export/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix
index 0592f6e545d8..cbd630094f0e 100644
--- a/pkgs/applications/version-management/cvs-fast-export/default.nix
+++ b/pkgs/applications/version-management/cvs-fast-export/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, makeWrapper, flex, bison,
  asciidoc, docbook_xml_dtd_45, docbook_xsl,
  libxml2, libxslt,
- python27, rcs, cvs, git,
+ python3, rcs, cvs, git,
  coreutils, rsync}:
 with stdenv; with lib;
 mkDerivation rec {
@@ -22,7 +22,7 @@ mkDerivation rec {
 
   buildInputs = [
     flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
-    python27 rcs cvs git makeWrapper
+    python3 rcs cvs git makeWrapper
   ];
 
   postPatch = "patchShebangs .";

From 78d51ab4786871ce2072528cc11594ee3a49c23f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 1 Nov 2020 20:57:40 +0200
Subject: [PATCH 0844/3942] tectonic: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index c46f5560fc77..e1af4ba81d77 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tectonic";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "tectonic-typesetting";
     repo = "tectonic";
     rev = "tectonic@${version}";
-    sha256 = "+kHp5qy0lzT5sLoxC1tlW6oaKZ11vQF+30zW0wXlQBU=";
+    sha256 = "yJzfymA4elyyeVR8FzTJe8wgs+vm3RWwcOh7IlmBYPE=";
   };
 
-  cargoSha256 = "bsuNHqr/8OTG3LXd+PYPKsXEBpbcwxP4A7SEqLYNKU0=";
+  cargoSha256 = "7zqr54H6GemiM/xuHOH6+s669IG2orj1neoqAH+wnV4=";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 07cb3351254e660479f0146e36fa4d34bda0c0d9 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 1 Nov 2020 20:56:15 +0200
Subject: [PATCH 0845/3942] musescore: 3.5.0 -> 3.5.2

Use fetchFromGitHub as it seems the only way to get the source now. Also
use libsForQt5 as it works.
---
 pkgs/applications/audio/musescore/default.nix | 13 +++++++------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 71c639ca4068..c9a1f44ec639 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, lib, fetchzip, cmake, pkgconfig
+{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
 , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
 , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects
 , qtquickcontrols2, qtscript, qtsvg, qttools
@@ -7,12 +7,13 @@
 
 mkDerivation rec {
   pname = "musescore";
-  version = "3.5.0";
+  version = "3.5.2";
 
-  src = fetchzip {
-    url = "https://github.com/musescore/MuseScore/releases/download/v3.5/MuseScore-${version}.zip";
-    sha256 = "0m598xh0s4f5m4l2ymy7g44bbvc14bcfi4gifhjnrg091rsk57c9";
-    stripRoot = false;
+  src = fetchFromGitHub {
+    owner = "musescore";
+    repo = "MuseScore";
+    rev = "v${version}";
+    sha256 = "VA0+npLUUXQJHalD01pmFTTum2Re7FiiyAwU1XvR93s=";
   };
 
   patches = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ec8bcecef2d..6730af2124ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22374,7 +22374,7 @@ in
     if stdenv.isDarwin then
       callPackage ../applications/audio/musescore/darwin.nix { }
     else
-      libsForQt514.callPackage ../applications/audio/musescore { };
+      libsForQt5.callPackage ../applications/audio/musescore { };
 
   mmh = callPackage ../applications/networking/mailreaders/mmh { };
   mutt = callPackage ../applications/networking/mailreaders/mutt { };

From e8b6c6780c4f1afcb3d9e5c776f23c4b10801cd2 Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Sun, 1 Nov 2020 20:20:18 +0100
Subject: [PATCH 0846/3942] nix-prefetch-github: v3.0 -> v4.0

---
 .../python-modules/nix-prefetch-github/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix
index 67873f929ad4..d4307c659804 100644
--- a/pkgs/development/python-modules/nix-prefetch-github/default.nix
+++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "nix-prefetch-github";
-  version = "3.0";
+  version = "4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-EN+EbVXUaf+id5UsK4EBm/9k9FYaH79g08kblvW60XA=";
+    sha256 = "sha256-STUyMUCWAHfDA6dkpiOqSRBL3/tubedUbWa94Kp/764=";
   };
 
   propagatedBuildInputs = [

From 955926a6207b42b08afd8b2dd3a40e3583fc1f34 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Wed, 28 Oct 2020 18:41:42 +0900
Subject: [PATCH 0847/3942] mrsh: 2020-01-08 -> 2020-07-27 etc.

- `doCheck` is enabled now.
- It marked as broken on Darwin due to [build failures][macos-issue].

[macos-issue]: https://github.com/NixOS/nixpkgs/pull/101910#issuecomment-719923175

Reference: https://github.com/emersion/mrsh/compare/ef21854fc9..0da902c0ee
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 pkgs/shells/mrsh/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix
index bbd56e510b7d..cc7e3e27be6d 100644
--- a/pkgs/shells/mrsh/default.nix
+++ b/pkgs/shells/mrsh/default.nix
@@ -2,23 +2,26 @@
 
 stdenv.mkDerivation rec {
   pname   = "mrsh";
-  version = "2020-01-08";
+  version = "2020-07-27";
 
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "mrsh";
-    rev = "ef21854fc9ce172fb1f7f580b19a89d030d67c65";
-    sha256 = "1iyxmwl61p2x9v9b22416n4lnrlwjqyxybq35x8bcbjxkwypp943";
+    rev = "0da902c0ee6f443fe703498e60f266af7f12537e";
+    sha256 = "1yr09ln5p1s48aj8xv2d6dy0pahqvd86fkiwyc6zrjfq80igxf05";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
   buildInputs = [ readline ];
 
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "A minimal POSIX shell";
     homepage = "https://mrsh.sh";
     license = licenses.mit;
     maintainers = with maintainers; [ matthiasbeyer ];
     platforms = platforms.unix;
+    broken = stdenv.isDarwin;
   };
 }

From 0d8f43c402360cbe6ea105d3e0c98d589fd396cf Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 31 Oct 2020 18:07:42 +0100
Subject: [PATCH 0848/3942] python3Packages.ovito: 3.0.0 -> 3.3.1

---
 .../python-modules/ovito/default.nix          | 39 ++++++++++++-------
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix
index c5dddd68fcf1..24af3a51255d 100644
--- a/pkgs/development/python-modules/ovito/default.nix
+++ b/pkgs/development/python-modules/ovito/default.nix
@@ -1,23 +1,33 @@
-{ stdenv, fetchgit
+{ stdenv
+, fetchFromGitLab
 , cmake
-, libav, netcdf, qscintilla, zlib, boost, git, fftw, hdf5, libssh
-, pythonPackages
+, ffmpeg
+, netcdf
+, qscintilla
+, zlib
+, boost
+, git
+, fftw
+, hdf5
+, libssh
+, qt5
+, python
 }:
 
-stdenv.mkDerivation {
-  # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40
-  # This is not the "released" 3.0.0 just a commit
-  version = "3.0.0";
+stdenv.mkDerivation rec {
+  version = "3.3.1";
   pname = "ovito";
 
-  src = fetchgit {
-    url = "https://gitlab.com/stuko/ovito";
-    rev = "a28c28182a879d2a1b511ec56f9845306dd8a4db";
-    sha256 = "1vqzv3gzwf8r0g05a7fj8hdyvnzq2h3wdfck7j6n1av6rvp7hi5r";
+  src = fetchFromGitLab {
+    owner = "stuko";
+    repo = "${pname}";
+    rev = "v${version}";
+    sha256 = "0rm1qxa0fanaaqg0idr6rf2s2xlbyn1dzjzwh3rddy9mgl60lj2h";
   };
 
-  buildInputs = [ cmake libav netcdf qscintilla zlib boost zlib git fftw hdf5 libssh ];
-  propagatedBuildInputs = with pythonPackages; [ sphinx numpy sip pyqt5 matplotlib ase ];
+  buildInputs = [ cmake ffmpeg netcdf qscintilla zlib boost zlib git fftw hdf5 libssh qt5.qtbase qt5.qtsvg ];
+
+  propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ];
 
   enableParallelBuilding = true;
 
@@ -25,10 +35,9 @@ stdenv.mkDerivation {
     description = "Scientific visualization and analysis software for atomistic simulation data";
     homepage = "https://www.ovito.org";
     license = licenses.gpl3;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
     # ensures not built on hydra
     # https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048
     hydraPlatforms = [ ];
-    broken = true; # cmake unable to find Qt5Core and other dependencies
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 47c9f2f60c1a..d209c34bdd8f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4272,7 +4272,7 @@ in {
 
   ovh = callPackage ../development/python-modules/ovh { };
 
-  ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; });
+  ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { inherit python; });
 
   owslib = callPackage ../development/python-modules/owslib { };
 

From 488251496048a0a70beb046f70dafc728aeffba3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 1 Nov 2020 22:30:44 +0200
Subject: [PATCH 0849/3942] tectonic: Install desktop file.

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

diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index e1af4ba81d77..965624a50987 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -19,6 +19,11 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ fontconfig harfbuzz openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);
 
+  postInstall = stdenv.lib.optionalString stdenv.isLinux ''
+    install -D dist/appimage/tectonic.desktop -t $out/share/applications/
+    install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/
+  '';
+
   doCheck = true;
 
   meta = with stdenv.lib; {

From de5875a4d3f8dcf2ceb9dbc65baf9019fc1b49af Mon Sep 17 00:00:00 2001
From: Philip Munksgaard <philip@munksgaard.me>
Date: Thu, 1 Oct 2020 16:42:03 +0200
Subject: [PATCH 0850/3942] libcef: 74.1.14 -> 75.1.14

Update libcef package to 75.1.14

This will allow us to enable browser source in the obs-studio build. It will
also mean that obs-linuxbrowser probably doesn't work, but it's not needed any
longer, so that shouldn't be a problem.
---
 pkgs/development/libraries/libcef/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index 4d08c2ba1fb3..93aaebc110e2 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -15,12 +15,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cef-binary";
-  version = "74.1.14-g50c3c5c";
+  version = "75.1.14-gc81164e";
 
   src = fetchurl {
-    name = "cef_binary_74.1.14+g50c3c5c+chromium-74.0.3729.131_linux64_minimal.tar.bz2";
-    url = "http://opensource.spotify.com/cefbuilds/cef_binary_74.1.19%2Bgb62bacf%2Bchromium-74.0.3729.157_linux64_minimal.tar.bz2";
-    sha256 = "0v3540kq4y68gq7mb4d8a9issm363lm5ngrd6d96pcc7vckkw4wn";
+    name = "cef_binary_75.1.14+gc81164e+chromium-75.0.3770.100_linux64_minimal.tar.bz2";
+    url = "http://opensource.spotify.com/cefbuilds/cef_binary_75.1.14%2Bgc81164e%2Bchromium-75.0.3770.100_linux64_minimal.tar.bz2";
+    sha256 = "0985b2bx505j0q693hifjgidzb597wqf5idql5aqxs8lfxhc2pgg";
   };
 
   nativeBuildInputs = [ cmake ];

From f0d31b3bd16e47009337b6e5fe3b36ae70dbcb46 Mon Sep 17 00:00:00 2001
From: Philip Munksgaard <philip@munksgaard.me>
Date: Thu, 1 Oct 2020 16:43:16 +0200
Subject: [PATCH 0851/3942] obs-studio: Enable builtin browser support

Since version 25, OBS Studio has shipped with a version of obs-browser that
includes linux support (which means that we don't need the obs-linuxbrowser any
more). This commit enables the builtin browser source.

Fixes #98035

Thanks to @mohe2015 for fixing a patchelf issue I had!
---
 .../applications/video/obs-studio/default.nix | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 0d0fce279bbd..518168b1587e 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -32,6 +32,7 @@
 , alsaLib
 , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
 , libpulseaudio
+, libcef
 }:
 
 let
@@ -44,8 +45,9 @@ in mkDerivation rec {
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-studio";
-    rev = version;
-    sha256 = "1d502f80whh686mvq0yn6zpa5nvmnlzxwp5sjz43vpbbvhpbrdqj";
+    rev = "refs/tags/${version}";
+    sha256 = "1bf56z2yb7gq1knqwcqj369c3wl9jr3wll5vlngmfy2gwqrczjmw";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ];
@@ -55,6 +57,7 @@ in mkDerivation rec {
     fdk_aac
     ffmpeg
     jansson
+    libcef
     libjack2
     libv4l
     libxkbcommon
@@ -73,6 +76,19 @@ in mkDerivation rec {
   ++ optional alsaSupport alsaLib
   ++ optional pulseaudioSupport libpulseaudio;
 
+  # Copied from the obs-linuxbrowser
+  postUnpack = ''
+    mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/
+    for i in ${libcef}/share/cef/*; do
+      cp -r $i cef/Release/
+      cp -r $i cef/Resources/
+    done
+    cp -r ${libcef}/lib/libcef.so cef/Release/
+    cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/
+    cp -r ${libcef}/include cef/
+    ls -R cef
+  '';
+
   # obs attempts to dlopen libobs-opengl, it fails unless we make sure
   # DL_OPENGL is an explicit path. Not sure if there's a better way
   # to handle this.
@@ -80,6 +96,9 @@ in mkDerivation rec {
     "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\""
     "-DOBS_VERSION_OVERRIDE=${version}"
     "-Wno-dev" # kill dev warnings that are useless for packaging
+    # Add support for browser source
+    "-DBUILD_BROWSER=ON"
+    "-DCEF_ROOT_DIR=../../cef"
   ];
 
   postInstall = ''

From cbcb8418746ee98598bcec0e8a8442531ad129a4 Mon Sep 17 00:00:00 2001
From: Philip Munksgaard <philip@munksgaard.me>
Date: Sat, 3 Oct 2020 20:11:17 +0200
Subject: [PATCH 0852/3942] Remove obs-linuxbrowser

No longer needed since #99284
---
 .../applications/video/obs-studio/default.nix |  1 -
 .../video/obs-studio/linuxbrowser.nix         | 49 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 52 deletions(-)
 delete mode 100644 pkgs/applications/video/obs-studio/linuxbrowser.nix

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 518168b1587e..cdecde6b869a 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -86,7 +86,6 @@ in mkDerivation rec {
     cp -r ${libcef}/lib/libcef.so cef/Release/
     cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/
     cp -r ${libcef}/include cef/
-    ls -R cef
   '';
 
   # obs attempts to dlopen libobs-opengl, it fails unless we make sure
diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix
deleted file mode 100644
index a33383937fb8..000000000000
--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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 {
-  pname = "obs-linuxbrowser";
-  version = "0.6.1-6-gf86dba6";
-
-  src = fetchFromGitHub {
-    owner = "bazukas";
-    repo = "obs-linuxbrowser";
-    rev = version;
-    sha256 = "08d7qz0721va88bcyia8p0ycw50f6x3yk97s3vzhsc9xpq691kpi";
-  };
-
-  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_ROOT_DIR=../../cef"
-    "-DOBS_INCLUDE_SEARCH_DIR=${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 2d0fc9f2aa6e..d691bb603791 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22656,8 +22656,6 @@ in
     inherit (gnome2) libglade;
   };
 
-  obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { };
-
   obs-studio = libsForQt514.callPackage ../applications/video/obs-studio { };
 
   obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };

From e87f9b1ee6380be5890dcaaecd76ff9d1a45cad8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 05:13:47 +0000
Subject: [PATCH 0853/3942] ansible-lint: 4.3.5 -> 4.3.6

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

diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
index bef31d1c1e58..2c324bc42710 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "ansible-lint";
-  version = "4.3.5";
+  version = "4.3.6";
   # pip is not able to import version info on raumel.yaml
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0mjn0drw3cx4pfl9qll5j7wib5r8msihs5yl8ri9fkfcbz7k1hmy";
+    sha256 = "1fn7mdykm4id78k4faibi92q9yxbjbyxb90ww0by03c31m8z5348";
   };
 
   format = "pyproject";

From 214d9cd72b53a6ae2c2c17409da00c2eff331c3b Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Sun, 1 Nov 2020 20:21:30 +0000
Subject: [PATCH 0854/3942] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 54 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e3680918fd15..f4fd509b752b 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -389,12 +389,12 @@ let
 
   coc-explorer = buildVimPluginFrom2Nix {
     pname = "coc-explorer";
-    version = "2020-10-30";
+    version = "2020-11-01";
     src = fetchFromGitHub {
       owner = "weirongxu";
       repo = "coc-explorer";
-      rev = "a8a3cf41638e5b7b128086888e2dead665407beb";
-      sha256 = "19a3blvfzqjzd5y3l4g03h3c8yxfl9fsdvc6mir0n76krpnk647l";
+      rev = "eb10e21721ee527d86cbc4422d4cdc5d53ea65fd";
+      sha256 = "10qgca7hncxmlmbcd0d9rmkdjd22qp88llz0dlsgm6ckng46nbpn";
     };
     meta.homepage = "https://github.com/weirongxu/coc-explorer/";
   };
@@ -461,12 +461,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2020-10-28";
+    version = "2020-11-01";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "ad1793dce0a59afcf8b324b45a1168c032deb162";
-      sha256 = "1khmmvba6cg0pff37nkbm7zmp3mnvpc889pql6dm6xjqrhpqsda7";
+      rev = "2adc879786ca65c3fdc3dd94743acbbed3f54465";
+      sha256 = "1j4kjxflm0ldaa0pgjm081x95hqxhhanv45mwwnmcg2lkpd6lnq5";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -570,12 +570,12 @@ let
 
   conjure = buildVimPluginFrom2Nix {
     pname = "conjure";
-    version = "2020-10-17";
+    version = "2020-11-01";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "0e63269e176232cdd9f1c20d94dfd3b8ad5702a1";
-      sha256 = "0ixryjfszx09g27awdaqf5xrc7yjb5mlpc57ph3w61hdv65yps7b";
+      rev = "a4c31e1c0136e943fa7dd48ecc11849158d3554e";
+      sha256 = "0xvz1s3lx75k9fgn319b0q6d8vj7cpw6mj2xkh73qmaqvvx3bni1";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
   };
@@ -1836,12 +1836,12 @@ let
 
   lean-vim = buildVimPluginFrom2Nix {
     pname = "lean-vim";
-    version = "2020-10-10";
+    version = "2020-11-01";
     src = fetchFromGitHub {
       owner = "leanprover";
       repo = "lean.vim";
-      rev = "c3a99f34a92af8a86e162134276222309e01e896";
-      sha256 = "09kz4iy0flwdawhd0phy6jl6zkxp3qdyhl8snl0n12sbskzq7i1b";
+      rev = "d1b3037680be79f114a87620844117e20ca7efcf";
+      sha256 = "0x3cz4is30jsrp7dym4rz4xngv9mimybl4kqnry9x0nkqzn55910";
     };
     meta.homepage = "https://github.com/leanprover/lean.vim/";
   };
@@ -2580,12 +2580,12 @@ let
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2020-10-30";
+    version = "2020-10-31";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "dd7900fc44b9cc6773bd4f8b5c0175887991520c";
-      sha256 = "0nfdvmlzqfga596n5awdhz9mc6gwnys73ixxkqi49f2g9x215ksd";
+      rev = "9327b113c2360d503ab183718c57e3e1b0819887";
+      sha256 = "1xgw0464563rc6wnjhf9m2f25wii80d78laa8ifjbjivrv4b0y1k";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -3385,12 +3385,12 @@ let
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2020-10-30";
+    version = "2020-11-01";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "telescope.nvim";
-      rev = "37c4f1b355d843e95ba41f2a73d83de58fb74dae";
-      sha256 = "0ly9vcnmf1b881fh1r5v4231h5n8kld2k9q1bxzvy87p2wsfb5sn";
+      rev = "54ef9d90d5a032906bfb007113930dac0f665f72";
+      sha256 = "0zh6dpxfibm0clafs2zsnb4ffmh3438qiccc60md2s7hwhzynvyq";
     };
     meta.homepage = "https://github.com/nvim-lua/telescope.nvim/";
   };
@@ -4814,12 +4814,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-10-19";
+    version = "2020-11-01";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "a5e2535d31aa1d7c0fa8a4e77ee96b92ad185be5";
-      sha256 = "0ixpy4vvvh7kgwq4wvyiw8cm3aj89mql2phf49rmi60d9kli3kn9";
+      rev = "35ea9acf5fc409d1eed341333789f18c2d135c66";
+      sha256 = "0n6yj1ql2c2kq9y407zr9d6pkpwp7jjzssbd0fyl68cb9rxzg3j8";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -6015,12 +6015,12 @@ let
 
   vim-prosession = buildVimPluginFrom2Nix {
     pname = "vim-prosession";
-    version = "2020-10-12";
+    version = "2020-11-01";
     src = fetchFromGitHub {
       owner = "dhruvasagar";
       repo = "vim-prosession";
-      rev = "e735468710a5cd6037b6d4c0e4c8c2bc1353cf4b";
-      sha256 = "0ava297hpm1cf8j18ypfrziwavqcv982hisvh1d8yjxal521pam1";
+      rev = "1be0c069a2b362369913ffaeed5293ffe1932ef6";
+      sha256 = "0hqfwlkz64kkh8w6w5k7gw2i0x7spddbgixjcrp1lr6n6bslkj2d";
     };
     meta.homepage = "https://github.com/dhruvasagar/vim-prosession/";
   };
@@ -7385,12 +7385,12 @@ let
 
   yats-vim = buildVimPluginFrom2Nix {
     pname = "yats-vim";
-    version = "2020-10-30";
+    version = "2020-11-01";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "2c1dce274988814102aafc57c4e0675c2d130e6c";
-      sha256 = "10kzqzm587nz1qgscgwrvjs77vk6grck28g5z1lhrxhpn1jng943";
+      rev = "fc97ad973a2bbf932dffb74c5560e97f60d21ce7";
+      sha256 = "07gx88vapcb579nvmkbmps16spvd1y8kvmi28955lw31rxi1n7b3";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";

From 6330a9a998ea822ea72e0ba208f86a38db5f543a Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Sun, 1 Nov 2020 20:22:08 +0000
Subject: [PATCH 0855/3942] vimPlugins.vim-LanguageTool: init at 2020-10-29

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index f4fd509b752b..80f27fd87ae1 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -5281,6 +5281,18 @@ let
     meta.homepage = "https://github.com/knubie/vim-kitty-navigator/";
   };
 
+  vim-LanguageTool = buildVimPluginFrom2Nix {
+    pname = "vim-LanguageTool";
+    version = "2020-10-29";
+    src = fetchFromGitHub {
+      owner = "dpelle";
+      repo = "vim-LanguageTool";
+      rev = "d1f94ef917dddfd8c82589957b7aa6a55f382964";
+      sha256 = "1y2y3rkhnj6xhzkm0snfkb08h6jmyjiicmk4j8lw2vhszsfgz6ns";
+    };
+    meta.homepage = "https://github.com/dpelle/vim-LanguageTool/";
+  };
+
   vim-lastplace = buildVimPluginFrom2Nix {
     pname = "vim-lastplace";
     version = "2020-01-20";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index de4cd959dee4..8af0e8cb1b8c 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -83,6 +83,7 @@ digitaltoad/vim-pug
 direnv/direnv.vim
 dleonard0/pony-vim-syntax
 dmix/elvish.vim
+dpelle/vim-LanguageTool
 dracula/vim as dracula-vim
 drewtempelmeyer/palenight.vim
 drmingdrmer/xptemplate

From 7698197323bca022727730b1e25c141237db6901 Mon Sep 17 00:00:00 2001
From: Caleb Land <caleb@land.fm>
Date: Sun, 1 Nov 2020 16:55:14 -0500
Subject: [PATCH 0856/3942] xmlsec: fix build on macOS (#101319)

* xmlsec: fix build on macOS

xmlsec detects the Darwin platform and uses the -D flag with base64, but nix uses GNU base64 which requires -d.

This patch removes the platform test and always uses the -d flag.
---
 pkgs/development/libraries/xmlsec/default.nix        |  2 +-
 .../xmlsec/remove_bsd_base64_decode_flag.patch       | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch

diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index 0d6fd9611c4e..6b3468e5d57c 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   patches = [
     ./lt_dladdsearchdir.patch
-  ];
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ];
   postPatch = ''
     substituteAllInPlace src/dl.c
   '';
diff --git a/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch b/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch
new file mode 100644
index 000000000000..700fad7e3dd4
--- /dev/null
+++ b/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch
@@ -0,0 +1,12 @@
+--- a/tests/testEnc.sh	2020-04-20 14:30:32.000000000 -0400
++++ b/tests/testEnc.sh	2020-10-21 22:09:25.000000000 -0400
+@@ -405,9 +405,6 @@
+             else
+                 # generate binary file out of base64
+                 DECODE="-d"
+-                if [ "`uname`" = "Darwin" ]; then
+-		    DECODE="-D"
+-                fi
+                 cat "$topfolder/$base_test_name.data" | base64 $DECODE > $tmpfile.3
+                 execEncTest "$res_success" \
+                     "" \

From 13ba2bc228491e07f62dcba0d867a365ea7f809e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 1 Nov 2020 22:58:43 +0100
Subject: [PATCH 0857/3942] homeassistant: 0.117.1 -> 0.117.2

---
 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 cc3736ac7de6..140d6841681d 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.117.1";
+  version = "0.117.2";
   components = {
     "abode" = ps: with ps; [ abodepy ];
     "accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 31b48060b4f6..9302a38f79e6 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.117.1";
+  hassVersion = "0.117.2";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    sha256 = "1ifkxgsdm6bvrf573z75ry7vvrb3zi67x5j2nlsb44igfmk0nj1v";
+    sha256 = "1mpvskr0zjvl065ldw05kc0x5yvibwfm2nmv478wznw3vwmbqrzn";
   };
 
   postPatch = ''

From 016bfce7d266ac9c8e44c776c86e8394474281a8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 1 Nov 2020 17:53:43 +0100
Subject: [PATCH 0858/3942] kdenlive: avoid double wrapping

---
 pkgs/applications/kde/kdenlive.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 795ba87ad5b5..8be6ef88e64a 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -84,12 +84,20 @@ mkDerivation {
       sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
       substituteAllInPlace src/kdenlivesettings.kcfg
     '';
+
+  dontWrapGApps = true;
+
   # Frei0r path needs to be set too or Kdenlive will complain. See:
   # https://github.com/NixOS/nixpkgs/issues/83885
   # https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325
   qtWrapperArgs = [
     "--set FREI0R_PATH ${frei0r}/lib/frei0r-1"
   ];
+
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   meta = {
     license = with lib.licenses; [ gpl2Plus ];
   };

From 2ff2ef1a52acb7264f014e6f77bfe2c4776a78e4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 1 Nov 2020 17:54:20 +0100
Subject: [PATCH 0859/3942] kdenlive: depend on qtmultimedia instead of
 unsupported qtwebkit

---
 pkgs/applications/kde/kdenlive.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 8be6ef88e64a..b2abee579396 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -25,9 +25,9 @@
 , frei0r
 , phonon-backend-gstreamer
 , qtdeclarative
+, qtmultimedia
 , qtquickcontrols2
 , qtscript
-, qtwebkit
 , rttr
 , kpurpose
 , kdeclarative
@@ -60,9 +60,9 @@ mkDerivation {
     mlt
     phonon-backend-gstreamer
     qtdeclarative
+    qtmultimedia
     qtquickcontrols2
     qtscript
-    qtwebkit
     shared-mime-info
     libv4l
     ffmpeg-full

From c3d017eee3976e283874fbe614054dc8d78fabb6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 1 Nov 2020 17:55:34 +0100
Subject: [PATCH 0860/3942] libsForQt515.mlt: is not broken

---
 pkgs/development/libraries/mlt/qt-5.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix
index 3dcbda68135f..f1ed04aa9bca 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@@ -69,6 +69,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
-    broken = versionAtLeast qtbase.version "5.15";
   };
 }

From 94364575423c7be57ef63d0e477797433679c56b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 1 Nov 2020 15:22:55 +0100
Subject: [PATCH 0861/3942] digikam: fix double wrapping

---
 pkgs/applications/graphics/digikam/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 52de023e1681..0654a2ed1a8d 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -118,9 +118,12 @@ mkDerivation rec {
     "-DENABLE_QWEBENGINE=on"
   ];
 
+  dontWrapGApps = true;
+
   preFixup = ''
-    gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
-    gappsWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname})
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
+    qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname})
     substituteInPlace $out/bin/digitaglinktree \
       --replace "/usr/bin/perl" "${perl}/bin/perl" \
       --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"

From e7b7e617f0c899c18f7b5ebd6849fd71ec25d88f Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 31 Oct 2020 20:50:33 +0100
Subject: [PATCH 0862/3942] wal_e: 0.6.10 -> 1.1.1

Also refactor to use python3
And add support for google-cloud-storage
---
 pkgs/tools/backup/wal-e/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix
index af1506bff6e9..a6d5b6b48010 100644
--- a/pkgs/tools/backup/wal-e/default.nix
+++ b/pkgs/tools/backup/wal-e/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }:
+{ stdenv, fetchurl, python3Packages, lzop, postgresql, pv }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "wal-e";
-  version = "0.6.10";
+  version = "1.1.1";
 
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/wal-e/wal-e/archive/v${version}.tar.gz";
-    sha256 = "1hms24xz7wx3b91vv56fhcc3j0cszwqwnmwhka4yl90202hvdir2";
+    sha256 = "5TTd7NTO73+MCJf3dHIcNojjHdoaKJ1T051iW7Kt9Ow=";
   };
 
   # needs tox
   doCheck = false;
 
-  propagatedBuildInputs = [
-    pythonPackages.boto
-    pythonPackages.gevent
+  propagatedBuildInputs = (with python3Packages; [
+    boto
+    gevent
+    google_cloud_storage
+  ]) ++ [
     postgresql
     lzop
     pv

From 8bb3603932122bbf09c6139d3e3a236e4c6f76fb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 30 Oct 2020 01:16:36 +0000
Subject: [PATCH 0863/3942] clipgrab: 3.8.14 -> 3.8.15

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

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index f8b74a175474..d53c189986d7 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -5,10 +5,10 @@
 
 mkDerivation rec {
   pname = "clipgrab";
-  version = "3.8.14";
+  version = "3.8.15";
 
   src = fetchurl {
-    sha256 = "19337qjxwlkpdnnh6q0y4b8askk17a8zb88gifznllrk06a6pgyf";
+    sha256 = "1anp8hhwbkirsvc7mn11k272f0d85vzb5ppiw3gg9ss2hdai563n";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
   };

From ee3acf3aa458463e2d8faf8367f49f711fd00ad4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 23:38:12 +0000
Subject: [PATCH 0864/3942] calligra: 3.2.0 -> 3.2.1

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

diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 40c4b77f1b6b..a8ca37df36ad 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -15,11 +15,11 @@
 
 mkDerivation rec {
   pname = "calligra";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-flViKGZdeeZ8Bi/RFz1mdvCw187v3W4bC8+aeB6nCVE=";
+    sha256 = "0iqi6z6gkck2afgy200dacgcspq7i7887alcj0pklm08hbmsdy5i";
   };
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];

From 50b663773f4bd23dc87720720ce13aac31f23422 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 18:44:45 +0000
Subject: [PATCH 0865/3942] gensio: 2.1.4 -> 2.1.7

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

diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix
index daca5fc0bdb1..e1da5a44ff08 100644
--- a/pkgs/development/libraries/gensio/default.nix
+++ b/pkgs/development/libraries/gensio/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gensio";
-  version = "2.1.4";
+  version = "2.1.7";
 
   src = fetchFromGitHub {
     owner = "cminyard";
     repo = "${pname}";
     rev = "v${version}";
-    sha256 = "0c44qhhrknjl7sp94q34z7nv7bvnlqs8wzm385661liy4mnfn4dc";
+    sha256 = "07m8rbdk05biarc9xskwcx9lghj0dff1msxasfc6hi3jywc3xaih";
   };
 
   configureFlags = [

From b3bd7bfe28fb44ec377a3b90f0de28a554ae5c1d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 20:32:11 +0000
Subject: [PATCH 0866/3942] flexibee: 2020.2.3.1 -> 2020.2.6

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

diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/applications/office/flexibee/default.nix
index f33eb98a48b4..52e58c5c9ccb 100644
--- a/pkgs/applications/office/flexibee/default.nix
+++ b/pkgs/applications/office/flexibee/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 let
-  version = "2020.2.3.1";
+  version = "2020.2.6";
   majorVersion = builtins.substring 0 6 version;
 in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz";
-    sha256 = "05wzg7f6mzz7r6azzb8k2g5fakkqh6762y4q9qkmrzbixvxh4lz9";
+    sha256 = "0vscz24sabk9xafywnx41rqhq6300ddsw1x95ibc7ghsgbkq80ja";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 468d0130436afa8482da0e22dcec20a60d993e3a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 19:45:09 +0000
Subject: [PATCH 0867/3942] fetchmail: 6.4.12 -> 6.4.13

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

diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index fab83b75e7c9..83d4103bc0c1 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, openssl }:
 
 let
-  version = "6.4.12";
+  version = "6.4.13";
 in
 stdenv.mkDerivation {
   pname = "fetchmail";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
-    sha256 = "11s83af63gs9nnrjb66yq58xriyvi8hzj4ykxp3kws5z3nby111b";
+    sha256 = "1qablzgwx3a516vdhckx3pv716x9r7nyfyr6fbncif861c3cya3x";
   };
 
   buildInputs = [ openssl ];

From a27100c77bdb7cebe6a6745fc8ce36418f96cda5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 18:56:08 +0000
Subject: [PATCH 0868/3942] fwts: 20.08.00 -> 20.09.00

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

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 5de0eea0beac..58d4bdbae855 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fwts";
-  version = "20.08.00";
+  version = "20.09.00";
 
   src = fetchzip {
     url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
-    sha256 = "098vxj5sd2nm88jmj6cxzcvid8w81m8fxdz881iki0pi7ysixa5q";
+    sha256 = "1vzzlb7xdrk8rhi27jdw9baskild4dmk7g5d0hhfh6z3fx4lfhgk";
     stripRoot = false;
   };
 

From 9d5b01eb5700c45f72c93b56e7d76a1ed2507f46 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 1 Nov 2020 14:45:03 -0800
Subject: [PATCH 0869/3942] python3Packages.google_cloud_pubsub: disable tests

tests fail due to file handle issues, then just loops
in an invalid state until timing out on hydra

https://hydra.nixos.org/build/129081889
---
 .../python-modules/google_cloud_pubsub/default.nix            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix
index b1e4eae52ad2..56a956928469 100644
--- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix
+++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix
@@ -20,10 +20,14 @@ buildPythonPackage rec {
   checkInputs = [ pytest mock ];
   propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
 
+  # tests don't clean up file descriptors correctly
+  doCheck = false;
   checkPhase = ''
     pytest tests/unit
   '';
 
+  pythonImportsCheck = [ "google.cloud.pubsub" ];
+
   meta = with stdenv.lib; {
     description = "Google Cloud Pub/Sub API client library";
     homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";

From 816ba1ec7f0fce64097668e467880ef5b0c99557 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 22:15:52 +0000
Subject: [PATCH 0870/3942] flmsg: 4.0.14 -> 4.0.17

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

diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix
index e437dffa4856..fa3f175fcc56 100644
--- a/pkgs/applications/radio/flmsg/default.nix
+++ b/pkgs/applications/radio/flmsg/default.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.14";
+  version = "4.0.17";
   pname = "flmsg";
 
   src = fetchurl {
     url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
-    sha256 = "0s1prawkpvr7xr7h8w7r0ly90ya3n8h6qsii0x6laqrkgjn9w9iy";
+    sha256 = "09xf3f65d3qi69frznf4fdznbfbc7kmgxw716q2c7ccsmh9c5q44";
   };
 
   buildInputs = [

From 6404b2571436f18b89d2b3601614de59fda46e1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 2 Nov 2020 01:35:47 +0100
Subject: [PATCH 0871/3942] dnsdist: Replace myself with SuperSandro2000

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

diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix
index b15b0bcd19fa..61fa164010e7 100644
--- a/pkgs/servers/dns/dnsdist/default.nix
+++ b/pkgs/servers/dns/dnsdist/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     description = "DNS Loadbalancer";
     homepage = "https://dnsdist.org";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ das_j ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }

From 6e386e1c4694cf750bfc2efd4326f3173499b025 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 02:08:16 +0100
Subject: [PATCH 0872/3942] emacs26Packages.prolog-mode: unbreak

Unfortunately this package doesn't contain the version number in the URL
so it might break easily again, but it is just a matter of updating the
sha256
---
 pkgs/applications/editors/emacs-modes/prolog/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix
index 7f5a097daa93..66ab98302375 100644
--- a/pkgs/applications/editors/emacs-modes/prolog/default.nix
+++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "prolog-mode-1.25";
+  pname = "prolog-mode";
+  version = "1.28";
 
   src = fetchurl {
     url = "http://bruda.ca/_media/emacs/prolog.el";
-    sha256 = "0hfd2dr3xc5qxgvc08nkb2l5a05hfldahdc6ymi9vd8798cc46yh";
+    sha256 = "oCMzks4xuor8Il8Ll8PXh1zIvMl5qN0RCFJ9yKiHOHU=";
   };
 
   buildCommand = ''
@@ -17,8 +18,5 @@ stdenv.mkDerivation {
     homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/";
     description = "Prolog mode for Emacs";
     license = stdenv.lib.licenses.gpl2Plus;
-
-    # Has wrong sha256
-    broken = true;
   };
 }

From ae55d235b1128ead1e0e28649d5edaa1badd3930 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 14:34:04 +0000
Subject: [PATCH 0873/3942] dgraph: 20.07.1 -> 20.07.2

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

diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix
index e23a1865209a..02c19e22e748 100644
--- a/pkgs/servers/dgraph/default.nix
+++ b/pkgs/servers/dgraph/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dgraph";
-  version = "20.07.1";
+  version = "20.07.2";
 
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "dgraph";
     rev = "v${version}";
-    sha256 = "0vkkzckk6095vkyl5yqhxqbjmvw7jzars8ymgv2zi55n26qzzvf0";
+    sha256 = "0cx2qqn8b7v0qvhrwzjqghymm8r2a0v86pyfgqxmmyfghjhykax4";
   };
 
-  vendorSha256 = "17bfavirx0lpy6ca86y2gm6kf8m388xbpda65dd2w71csbzbc2mi";
+  vendorSha256 = "111lixpqp8p2q4kg9342220i00dcp2lwp2j3hasdvwdrrf0971by";
 
   doCheck = false;
 

From eed13da0ae5dece46e973e42bbd26322b5e26a3a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 18:11:26 +0000
Subject: [PATCH 0874/3942] drumkv1: 0.9.16 -> 0.9.18

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

diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 7a6acb25e802..82a47b8173a2 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   pname = "drumkv1";
-  version = "0.9.16";
+  version = "0.9.18";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
-    sha256 = "1r55575w9r0ifysw9mgxjvv0fszvx8ykjgim3zczf3mb5s9ngavv";
+    sha256 = "1bzkaz7sqx1pvirja8zm7i2ckzl5ad6xspr4840389ik3l8qpnr5";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];

From 417457fd35a5ff9e0b042b425f2b3340f5003a36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 19:38:25 +0000
Subject: [PATCH 0875/3942] frostwire-bin: 6.8.5 -> 6.8.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 d38e9dc73365..b9ee526bbe50 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.8.5";
+  version = "6.8.7";
   pname = "frostwire";
 
   src = fetchurl {
     url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
-    sha256 = "1zdas93w1yqg9yx8wlk7pxpdmwvg4ykg54ai7iyq9ir1zha8fyif";
+    sha256 = "1m9v4abm8jbyz46hin63vi6irs32n1xzg85bdyb48vpdxh6iwv04";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 4205938c6e09a8fc18059568a565de909d52c935 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 22:40:07 +0000
Subject: [PATCH 0876/3942] tridactyl-native: 1.20.1 -> 1.20.2

---
 pkgs/tools/networking/tridactyl-native/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix
index f0d2cd9a0df6..c0a132b481e1 100644
--- a/pkgs/tools/networking/tridactyl-native/default.nix
+++ b/pkgs/tools/networking/tridactyl-native/default.nix
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
   pname = "tridactyl-native";
   # this is actually the version of tridactyl itself; the native messenger will
   # probably not change with every tridactyl version
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchFromGitHub {
     owner = "tridactyl";
     repo = "tridactyl";
     rev = version;
-    sha256 = "108zx2x5q23cq0fzxmix31xcw62k3r1wlb55612c15ilz9c5xm32";
+    sha256 = "0yz1vbqa3sppkjmny5ipnspsdi5gnix7wb6hzvdkm9h1rj2kb8ci";
   };
   sourceRoot = "source/native";
 

From 036cec187c1f079566c456d390c97c1deb412b42 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 20:07:21 +0000
Subject: [PATCH 0877/3942] ginac: 1.7.9 -> 1.8.0

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

diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index 701445f90100..3c129e8033bd 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }:
 
 stdenv.mkDerivation rec {
-  name = "ginac-1.7.9";
+  name = "ginac-1.8.0";
 
   src = fetchurl {
     url    = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "08cqc87qq4w6z3l053x5gfqsa4zkgkicq8skxsbsj39nli1zzkb7";
+    sha256 = "0l9byzfxq3f9az5pcdldnl95ws8mpirkqky46f973mvxi5541d24";
   };
 
   propagatedBuildInputs = [ cln ];

From 17ee53c4e3c0ecae827152e503dffc16c7fd2bbf Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 02:19:57 +0100
Subject: [PATCH 0878/3942] gimpPlugins.focusblur: remove

---
 .../graphics/gimp/plugins/default.nix            | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 0b5e6a7f379f..97c0429a996e 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -85,22 +85,6 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
     };
   };
 
-  focusblur = pluginDerivation rec {
-    /* menu:
-       Blur/Focus Blur
-    */
-    name = "focusblur-3.2.6";
-    buildInputs = with pkgs; [ fftwSinglePrec ];
-    patches = [ ./patches/focusblur-glib.patch ];
-    postInstall = "fail";
-    installPhase = "installPlugins src/focusblur";
-    src = fetchurl {
-      url = "http://registry.gimp.org/files/${name}.tar.bz2";
-      sha256 = "1gqf3hchz7n7v5kpqkhqh8kwnxbsvlb5cr2w2n7ngrvl56f5xs1h";
-    };
-    meta.broken = true;
-  };
-
   resynthesizer = pluginDerivation rec {
     /* menu:
       Edit/Fill with pattern seamless...

From c6edffbbe8205eb3229c57cd1733bda8bbc51a7b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 00:02:58 +0000
Subject: [PATCH 0879/3942] gphoto2: 2.5.23 -> 2.5.26

---
 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 1235a41ffc7b..cdfbe3f6dc1f 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.23";
+  name = "gphoto2-2.5.26";
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "1laqwhxr0xhbykmp0dhd3j4rr2lhj5y228s31afnqxp700hhk1yz";
+    sha256 = "0bxbcn31xalsvjp8fra324hf2105y3ps7zlyfz11v71j0lxj2lvn";
   };
 
   nativeBuildInputs = [ pkgconfig gettext libtool ];

From 0b0edb46c2426d604bdaa92baea2c1407e436bfb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 14:26:53 +0000
Subject: [PATCH 0880/3942] exodus: 20.8.28 -> 20.10.23

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

diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix
index 0c0b6a243010..c48cd7bb49c7 100644
--- a/pkgs/applications/blockchains/exodus/default.nix
+++ b/pkgs/applications/blockchains/exodus/default.nix
@@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }:
 
 stdenv.mkDerivation rec {
   pname = "exodus";
-  version = "20.8.28";
+  version = "20.10.23";
 
   src = fetchurl {
     url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
-    sha256 = "fde9165f71f0d641f6892ddce3ec26d200e8095a383f2b4c8f924de4041d65ef";
+    sha256 = "083hcxljqg36ilpy6xa4j455ngpc775qgam0dbj26kg7sh33dz2c";
   };
 
   sourceRoot = ".";

From 7afb8feb40aa65d8c86a1e682eac00746227af19 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 13:34:45 +0000
Subject: [PATCH 0881/3942] dolt: 0.21.0 -> 0.21.1

---
 pkgs/servers/sql/dolt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index 0ee6bd26c240..8d4e92551354 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
     pname = "dolt";
-    version = "0.21.0";
+    version = "0.21.1";
 
     src = fetchFromGitHub {
         owner = "liquidata-inc";
         repo = "dolt";
         rev = "v${version}";
-        sha256 = "0w9k48jxklhaql8qbbm9ay0md5nia6x3wr0zz3w44pw3gl5kvxyw";
+        sha256 = "03fg91r6lxfq58c5843vysaw8hbagiq4r2qxc4nh9w1b3mc71h7v";
     };
 
     modRoot = "./go";
     subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
-  vendorSha256 = "16xh4s7zmar0r3kwps5bbl168imyx252lvz9s3snvxzz5kd8wlnm";
+  vendorSha256 = "19755xbjxxva574mj0sc7kqqmr4k22bbvf4aj3d0hhcfjpyhn434";
 
   doCheck = false;
 

From bb2ce89f3a4bf5aa9a7227617d9da8198a9f85f1 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 02:31:26 +0100
Subject: [PATCH 0882/3942] plasma5.kdecoration: unbreak

---
 pkgs/desktops/plasma-5/kdecoration.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
index 3f2e9be462d8..569da3c70349 100644
--- a/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/pkgs/desktops/plasma-5/kdecoration.nix
@@ -2,11 +2,7 @@
 
 mkDerivation {
   name = "kdecoration";
-  meta = {
-    broken = builtins.compareVersions qtbase.version "5.12.0" < 0;
-  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ki18n ];
   outputs = [ "out" "dev" ];
-  broken = true;
 }

From af68adba47da1fff1bb67071a186fe8e19834a86 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Nov 2020 20:41:32 -0500
Subject: [PATCH 0883/3942] zeek: 3.2.1 -> 3.2.2 (#102404)

https://github.com/zeek/zeek/releases/tag/v3.2.2
---
 pkgs/applications/networking/ids/zeek/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index a6189da7ee3e..713156a66214 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -21,11 +21,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "zeek";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchurl {
     url = "https://download.zeek.org/zeek-${version}.tar.gz";
-    sha256 = "0rybs79h0sq12vsayah8dixqac404z84rlvqynvzf3dh2lwcgg0y";
+    sha256 = "00cxz7ad7p62s2glcagzcvwbnsivrv4bmz6rl1vij907jb24hmvc";
   };
 
   nativeBuildInputs = [ cmake flex bison file ];

From f848ac2010e6883360bb0799973c57ec6ccf2ac0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 01:51:54 +0000
Subject: [PATCH 0884/3942] f3: 7.2 -> 8.0

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

diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix
index e8d60f835bf0..b9817ecb05c0 100644
--- a/pkgs/tools/filesystems/f3/default.nix
+++ b/pkgs/tools/filesystems/f3/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "f3";
-  version = "7.2";
+  version = "8.0";
 
   src = fetchFromGitHub {
     owner = "AltraMayor";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1iwdg0r4wkgc8rynmw1qcqz62l0ldgc8lrazq33msxnk5a818jgy";
+    sha256 = "17l5vspfcgfbkqg7bakp3gql29yb05gzawm8n3im30ilzdr53678";
   };
 
   postPatch = ''

From 0e17599e8e6c38373c27ea2b2088f3c2604b5e69 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 02:58:54 +0100
Subject: [PATCH 0885/3942] liquidwar5: 5.6.4 -> 5.6.5, unbreak

---
 pkgs/games/liquidwar/5.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix
index 5c42b8ecaab2..3d8cf3840f8b 100644
--- a/pkgs/games/liquidwar/5.nix
+++ b/pkgs/games/liquidwar/5.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, allegro }:
 stdenv.mkDerivation rec {
-  version = "5.6.4";
+  version = "5.6.5";
   pname = "liquidwar5";
   src = fetchurl {
-    url = "https://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz";
-    sha256 = "18wkbfzp07yckg05b5gjy67rw06z9lxp0hzg0zwj7rz8i12jxi9j";
+    url = "http://www.ufoot.org/download/liquidwar/v5/${version}/liquidwar-${version}.tar.gz";
+    sha256 = "2tCqhN1BbK0FVCHtm0DfOe+ueNPfdZwFg8ZMVPfy/18=";
   };
 
   buildInputs = [ allegro ];
@@ -20,6 +20,5 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.raskin ];
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    broken = true;
   };
 }

From 209fbcb12193f6c99f3b00b49e44b2c16ba2964e Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 03:10:24 +0100
Subject: [PATCH 0886/3942] unarj: remove (broken since 2016, insecure since
 2015)

---
 pkgs/tools/archivers/unarj/default.nix | 23 -----------------------
 pkgs/top-level/all-packages.nix        |  2 --
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/tools/archivers/unarj/default.nix

diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix
deleted file mode 100644
index 61e60996e759..000000000000
--- a/pkgs/tools/archivers/unarj/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  pname = "unarj";
-  version = "2.65";
-
-  src = fetchurl {
-    sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p";
-    url = "https://src.fedoraproject.org/repo/pkgs/unarj/${pname}-${version}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${pname}-${version}.tar.gz";
-  };
-
-  preInstall = ''
-    mkdir -p $out/bin
-    sed -i -e s,/usr/local/bin,$out/bin, Makefile
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Unarchiver of ARJ files";
-    license = licenses.free;
-    # Vulnerable to CVE-2015-0557 & possibly CVE-2015-0556, CVE-2015-2782:
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a27ffd3e8229..65bd8a70d91d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8120,8 +8120,6 @@ in
 
   unar = callPackage ../tools/archivers/unar { stdenv = clangStdenv; };
 
-  unarj = callPackage ../tools/archivers/unarj { };
-
   unp = callPackage ../tools/archivers/unp { };
 
   unshield = callPackage ../tools/archivers/unshield { };

From 1f7e201e9e51a64ec9d1560cf782468d08c43209 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 03:24:16 +0100
Subject: [PATCH 0887/3942] plink: remove (broken since 2014)

---
 .../science/biology/plink/default.nix         | 25 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 27 deletions(-)
 delete mode 100644 pkgs/applications/science/biology/plink/default.nix

diff --git a/pkgs/applications/science/biology/plink/default.nix b/pkgs/applications/science/biology/plink/default.nix
deleted file mode 100644
index 009e12aa02f0..000000000000
--- a/pkgs/applications/science/biology/plink/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, zlib, unzip }:
-
-stdenv.mkDerivation {
-  name = "plink-1.07";
-
-  src = fetchurl {
-    url = "http://pngu.mgh.harvard.edu/~purcell/plink/dist/plink-1.07-src.zip";
-    sha256 = "4af56348443d0c6a1db64950a071b1fcb49cc74154875a7b43cccb4b6a7f482b";
-  };
-
-  buildInputs = [ zlib unzip ] ;
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp plink $out/bin
-  '';
-  
-  meta = {
-    description = "Whole genome association toolkit";
-    homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.all;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a27ffd3e8229..894c95f05630 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26154,8 +26154,6 @@ in
 
   platypus = callPackage ../applications/science/biology/platypus { };
 
-  plink = callPackage ../applications/science/biology/plink { };
-
   plink-ng = callPackage ../applications/science/biology/plink-ng { };
 
   prodigal = callPackage ../applications/science/biology/prodigal { };

From 8be87d0f992fb43492345e85864540965faed0ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 17:42:44 +0000
Subject: [PATCH 0888/3942] enet: 1.3.15 -> 1.3.16

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

diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index e1172870ede7..8a264d73b621 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "enet-1.3.15";
+  name = "enet-1.3.16";
 
   src = fetchurl {
     url = "http://enet.bespin.org/download/${name}.tar.gz";
-    sha256 = "1yxxf9bkx6dx3j8j70fj17c05likyfibb1419ls74hp58qrzdgas";
+    sha256 = "1lggc82rbzscci057dqqyhkbq4j6mr5k01hbrvn06jkzc2xpxdxv";
   };
 
   meta = {

From 613adb0e8809c51e02e6361c2e88068b6ec079bb Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 1 Nov 2020 14:05:38 -0800
Subject: [PATCH 0889/3942] kernel/linuxManualConfig: add variant metadata

---
 pkgs/os-specific/linux/kernel/manual-config.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 7a91705b617c..961bdab12b58 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -34,6 +34,13 @@ in {
   randstructSeed ? "",
   # Use defaultMeta // extraMeta
   extraMeta ? {},
+
+  # for module compatibility
+  isXen      ? features.xen_dom0 or false,
+  isZen      ? false,
+  isLibre    ? false,
+  isHardened ? false,
+
   # Whether to utilize the controversial import-from-derivation feature to parse the config
   allowImportFromDerivation ? false,
   # ignored
@@ -86,6 +93,9 @@ let
       passthru = {
         inherit version modDirVersion config kernelPatches configfile
           moduleBuildDependencies stdenv;
+        inherit isXen isZen isHardened isLibre;
+        kernelOlder = stdenv.lib.versionOlder version;
+        kernelAtLeast = stdenv.lib.versionAtLeast version;
       };
 
       inherit src;

From c6afa8820b528cec7e889e462cbcab84c0313b41 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 1 Nov 2020 14:08:37 -0800
Subject: [PATCH 0890/3942] anbox: kernel.features can be null

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

diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix
index 6eb74ca25f6b..896beaf3056e 100644
--- a/pkgs/os-specific/linux/anbox/kmod.nix
+++ b/pkgs/os-specific/linux/anbox/kmod.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/anbox/anbox-modules";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity);
+    broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity or false);
     maintainers = with maintainers; [ edwtjo ];
   };
 

From 2ada9b38063bf3bd1e90b6e2bab4732f98e86709 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Nov 2020 04:20:00 +0000
Subject: [PATCH 0891/3942] vault: add passthru.tests

---
 pkgs/tools/security/vault/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index b8fa53a057e1..b51542a8edde 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles }:
+{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }:
 
 buildGoPackage rec {
   pname = "vault";
@@ -24,6 +24,8 @@ buildGoPackage rec {
     installShellCompletion vault.bash
   '';
 
+  passthru.tests.vault = nixosTests.vault;
+
   meta = with stdenv.lib; {
     homepage = "https://www.vaultproject.io/";
     description = "A tool for managing secrets";

From 8c43d7e6e721646ef9ea1a7a20d1c2338ce44220 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Nov 2020 04:20:00 +0000
Subject: [PATCH 0892/3942] vault-bin: add passthru.tests

---
 pkgs/tools/security/vault/vault-bin.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index 6cc6e170302c..4960fe8fb018 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl, unzip, nixosTests }:
 
 let
   version = "1.5.5";
@@ -44,6 +44,8 @@ in stdenv.mkDerivation {
     echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
   '';
 
+  passthru.tests.vault = nixosTests.vault;
+
   meta = with stdenv.lib; {
     homepage = "https://www.vaultproject.io";
     description = "A tool for managing secrets, this binary includes the UI";

From eed2008a2de97454fd10a928c537c63acdb00b2c Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sun, 1 Nov 2020 20:29:29 -0800
Subject: [PATCH 0893/3942] nss: fix build on ppc64[le]

NSS configure scripts use the abbreviated form ppc64/ppc64le:
https://github.com/nss-dev/nss/blob/NSS_3_57_RTM/coreconf/config.gypi#L209

Whereas nixpkgs uses the longer form:
`nix eval nixpkgs.pkgsCross.powernv.hostPlatform.parsed.cpu.name`
`powerpc64le`
---
 pkgs/development/libraries/nss/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index e9ca475802d6..dad0d4cfe1b9 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -68,6 +68,9 @@ in stdenv.mkDerivation rec {
           else if platform.isx86_32 then "ia32"
           else if platform.isAarch32 then "arm"
           else if platform.isAarch64 then "arm64"
+          else if platform.isPower && platform.is64bit then (
+            if platform.isLittleEndian then "ppc64le" else "ppc64"
+          )
           else platform.parsed.cpu.name;
     # yes, this is correct. nixpkgs uses "host" for the platform the binary will run on whereas nss uses "host" for the platform that the build is running on
     target = getArch stdenv.hostPlatform;

From f33e4b4a0c72acd92b05ba687193a92eb2436ff5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 05:40:00 +0000
Subject: [PATCH 0894/3942] groonga: 10.0.6 -> 10.0.8

---
 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 a1fd39152075..2a937e27d2fb 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   pname = "groonga";
-  version = "10.0.6";
+  version = "10.0.8";
 
   src = fetchurl {
     url    = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
-    sha256 = "1q3xx6jc967nj7h8gvnrqxn8657dn3qy9j802rjzcg6iwlpjack9";
+    sha256 = "0ppjxgq7bwhzzlrl2jn7ybc132c8rg95yhwshxqgccbhbs8s6c29";
   };
 
   buildInputs = with stdenv.lib;

From 73e3b14503c7bc438f754b754619582aa41070e4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 05:48:03 +0000
Subject: [PATCH 0895/3942] gitAndTools.git-filter-repo: 2.28.0 -> 2.29.0

---
 .../git-and-tools/git-filter-repo/default.nix                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
index 5a7e5bd32afb..c642f062c7b6 100644
--- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "git-filter-repo";
-  version = "2.28.0";
+  version = "2.29.0";
 
   src = fetchurl {
     url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "0sa6h6k1mnhx8p8w5d88gx7cqbnxaazfj1dv47c107fk70hqvvpx";
+    sha256 = "00nn7k9jqrybb762486fmigsnbcn9lbvimgpfvvarz4ikdp9y9pb";
   };
 
   buildInputs = [ pythonPackages.python ];

From a5c0ebbd19435104405a961b19f8d851eb487002 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 06:17:40 +0000
Subject: [PATCH 0896/3942] python27Packages.hg-evolve: 10.0.2 -> 10.1.0

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

diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix
index 14cace859e92..434c6ffba2b9 100644
--- a/pkgs/development/python-modules/hg-evolve/default.nix
+++ b/pkgs/development/python-modules/hg-evolve/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "hg-evolve";
-  version = "10.0.2";
+  version = "10.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "75892623258339613528df45dcd1004786bf73e8d95407886d79bc4567fbde4d";
+    sha256 = "a386e6ee2d9a0e332a49f1cb210c4c11ba9844bcd52808270f48e688314783d8";
   };
 
   doCheck = false;

From 49531d9f6eccdffc8309cd128627cdf4db4ab257 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 06:33:01 +0000
Subject: [PATCH 0897/3942] k9s: 0.22.1 -> 0.23.3

---
 pkgs/applications/networking/cluster/k9s/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index 575bc5a50623..f26697f05611 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "k9s";
-  version = "0.22.1";
+  version = "0.23.3";
 
   src = fetchFromGitHub {
     owner  = "derailed";
     repo   = "k9s";
     rev    = "v${version}";
-    sha256 = "1qyibpvfbd8yahfmci431qd0zy4wwz03gwj1ak8rn3qxpv1cdbmk";
+    sha256 = "0jdrjsv6miprw0bj964rgkbci4xdwfi536z3px93i2n9zrhhawpn";
   };
 
   buildFlagsArray = ''
@@ -18,7 +18,7 @@ buildGoModule rec {
       -X github.com/derailed/k9s/cmd.commit=${src.rev}
   '';
 
-  vendorSha256 = "1432ppgd3lc0h83i6vzklfhp95s2xwaf41mv4xfryzzszjfndmvl";
+  vendorSha256 = "105vmy8agl3ppgi28wg7djx0jrfam7nxfvvlps9ycgyrv2qpjh2n";
 
   doCheck = false;
 

From 0f65faec308d38bb7051e95d30e8ade93a489683 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 06:42:51 +0000
Subject: [PATCH 0898/3942] jackett: 0.16.1883 -> 0.16.1964

---
 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 3058ef5a4a62..27f816b269ac 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jackett";
-  version = "0.16.1883";
+  version = "0.16.1964";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "1l16zzjyvwq6rd4q6dg4m0a81fiw50c7naksa43g3yhv7wg7wfll";
+    sha256 = "06mj9pahziwm77nqjiqcbg3zfxkjy7sp15h84iqcxp0lpz0w2z55";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 539c43b4a491f2cc8c411c7f694778853fef3d53 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 06:49:03 +0000
Subject: [PATCH 0899/3942] hdhomerun-config-gui: 20200521 -> 20200907

---
 pkgs/applications/video/hdhomerun-config-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/hdhomerun-config-gui/default.nix b/pkgs/applications/video/hdhomerun-config-gui/default.nix
index 91feb178ca05..e1631150b8be 100644
--- a/pkgs/applications/video/hdhomerun-config-gui/default.nix
+++ b/pkgs/applications/video/hdhomerun-config-gui/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hdhomerun-config-gui";
-  version = "20200521";
+  version = "20200907";
 
   src = fetchurl {
     url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz";
-    sha256 = "1r1rwfgi714nwblyg8nqjzkpm4n2lg7kqqqas47hvbn5waimz1ja";
+    sha256 = "17zf0hzw68b0xdkh1maqhl96jb7171mbhd29y64as29nps9x4fmz";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 2c931312ce6c7baf91ec98e164bef0241fc20aa6 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 1 Nov 2020 23:39:49 +0100
Subject: [PATCH 0900/3942] treewide: simplify rev/repo arguments in src

+ use fetchFromGithub where possible
---
 pkgs/applications/audio/bchoppr/default.nix     |  2 +-
 pkgs/applications/audio/bsequencer/default.nix  |  2 +-
 pkgs/applications/audio/bslizr/default.nix      |  2 +-
 pkgs/applications/editors/marker/default.nix    |  2 +-
 pkgs/applications/graphics/drawpile/default.nix |  2 +-
 pkgs/applications/misc/ausweisapp2/default.nix  |  2 +-
 pkgs/applications/misc/batsignal/default.nix    |  2 +-
 .../misc/chewing-editor/default.nix             |  4 ++--
 pkgs/applications/misc/dupeguru/default.nix     |  2 +-
 pkgs/applications/misc/effitask/default.nix     |  4 ++--
 pkgs/applications/misc/fuzzel/default.nix       |  2 +-
 .../keepass-plugins/keepasshttp/default.nix     |  2 +-
 pkgs/applications/misc/pwsafe/default.nix       |  2 +-
 pkgs/applications/misc/solaar/default.nix       |  2 +-
 .../networking/cluster/kubeval/default.nix      |  2 +-
 .../instant-messengers/quaternion/default.nix   |  2 +-
 .../networking/trebleshot/default.nix           |  2 +-
 .../science/electronics/flatcam/default.nix     |  2 +-
 .../science/logic/potassco/clingcon.nix         |  2 +-
 .../git-and-tools/bump2version/default.nix      |  6 +++---
 .../git-and-tools/ghorg/default.nix             |  2 +-
 pkgs/data/icons/zafiro-icons/default.nix        |  2 +-
 pkgs/data/themes/orion/default.nix              | 14 ++++++++------
 .../gnome-3/games/aisleriot/default.nix         |  4 ++--
 pkgs/development/compilers/llvm/11/default.nix  |  2 +-
 pkgs/development/interpreters/acl2/default.nix  |  2 +-
 .../interpreters/clojurescript/lumo/default.nix |  2 +-
 .../interpreters/wasmtime/default.nix           |  2 +-
 pkgs/development/libraries/gensio/default.nix   |  2 +-
 pkgs/development/libraries/libmkv/default.nix   |  7 ++++---
 .../libraries/pcaudiolib/default.nix            |  2 +-
 pkgs/development/libraries/wiiuse/default.nix   |  2 +-
 pkgs/development/libraries/x265/default.nix     |  2 +-
 .../ocaml-modules/dispatch/default.nix          |  2 +-
 .../ocaml-modules/lua-ml/default.nix            |  2 +-
 .../ocaml-modules/webmachine/default.nix        |  2 +-
 .../django-postgresql-netfields/default.nix     |  2 +-
 .../python-modules/hawkauthlib/default.nix      |  7 ++++---
 .../python-modules/ovito/default.nix            |  2 +-
 .../python-modules/pa-ringbuffer/default.nix    |  2 +-
 .../python-modules/pyfcm/default.nix            |  2 +-
 .../python-modules/pykka/default.nix            |  7 ++++---
 .../python-modules/pyramid_hawkauth/default.nix |  9 +++++----
 .../python-modules/rtmixer/default.nix          |  2 +-
 .../python-modules/sacremoses/default.nix       |  2 +-
 .../python-modules/signedjson/default.nix       |  7 ++++---
 .../tensorflow-probability/default.nix          |  2 +-
 .../python-modules/tokenlib/default.nix         |  7 ++++---
 .../python-modules/unpaddedbase64/default.nix   |  7 ++++---
 .../tools/analysis/cargo-tarpaulin/default.nix  |  2 +-
 .../tools/analysis/retdec/default.nix           |  3 +--
 pkgs/development/tools/eclipse-mat/default.nix  |  2 +-
 pkgs/development/tools/misc/argbash/default.nix |  2 +-
 .../tools/misc/editorconfig-checker/default.nix |  2 +-
 pkgs/development/tools/misc/fujprog/default.nix |  2 +-
 pkgs/development/tools/sourcetrail/default.nix  |  2 +-
 pkgs/development/tools/swiftformat/default.nix  |  2 +-
 pkgs/games/cockatrice/default.nix               |  2 +-
 pkgs/games/eidolon/default.nix                  |  2 +-
 pkgs/games/mari0/default.nix                    |  2 +-
 pkgs/games/the-butterfly-effect/default.nix     |  7 ++++---
 pkgs/games/wyvern/default.nix                   |  2 +-
 pkgs/misc/emulators/mednaffe/default.nix        |  2 +-
 pkgs/servers/monitoring/do-agent/default.nix    |  2 +-
 .../servers/monitoring/prometheus/promscale.nix |  2 +-
 pkgs/servers/ser2net/default.nix                |  2 +-
 pkgs/servers/web-apps/dokuwiki/default.nix      |  2 +-
 pkgs/servers/web-apps/jirafeau/default.nix      |  2 +-
 pkgs/servers/web-apps/rss-bridge/default.nix    |  2 +-
 pkgs/tools/X11/xwinmosaic/default.nix           |  9 +++++----
 pkgs/tools/backup/stenc/default.nix             |  2 +-
 pkgs/tools/misc/ddate/default.nix               | 17 ++++++++++-------
 pkgs/tools/misc/eva/default.nix                 |  2 +-
 pkgs/tools/misc/nix-direnv/default.nix          |  2 +-
 pkgs/tools/misc/rpcsvc-proto/default.nix        |  2 +-
 pkgs/tools/networking/goimapnotify/default.nix  |  2 +-
 .../network-manager/dmenu/default.nix           |  2 +-
 pkgs/tools/networking/nfstrace/default.nix      |  2 +-
 .../package-management/cargo-about/default.nix  |  2 +-
 pkgs/tools/package-management/gx/default.nix    | 10 +++++-----
 pkgs/tools/package-management/gx/go/default.nix | 10 +++++-----
 pkgs/tools/security/crackxls/default.nix        |  9 +++++----
 pkgs/tools/security/honggfuzz/default.nix       |  2 +-
 pkgs/tools/security/rbw/default.nix             |  2 +-
 pkgs/tools/security/rustscan/default.nix        |  2 +-
 pkgs/tools/text/ledger2beancount/default.nix    |  2 +-
 86 files changed, 148 insertions(+), 134 deletions(-)

diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix
index 7d4d53408d28..33827287712a 100644
--- a/pkgs/applications/audio/bchoppr/default.nix
+++ b/pkgs/applications/audio/bchoppr/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = pname;
-    rev = "${version}";
+    rev = version;
     sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j";
   };
 
diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix
index 2c9217183e4a..093e9450de8b 100644
--- a/pkgs/applications/audio/bsequencer/default.nix
+++ b/pkgs/applications/audio/bsequencer/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = pname;
-    rev = "${version}";
+    rev = version;
     sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29";
   };
 
diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix
index 5a2675187c02..e239a89b8995 100644
--- a/pkgs/applications/audio/bslizr/default.nix
+++ b/pkgs/applications/audio/bslizr/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = pname;
-    rev = "${version}";
+    rev = version;
     sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0";
   };
 
diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix
index 758cb0c30eba..19ffdbd2c2c1 100644
--- a/pkgs/applications/editors/marker/default.nix
+++ b/pkgs/applications/editors/marker/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fabiocolacio";
     repo = "Marker";
-    rev = "${version}";
+    rev = version;
     fetchSubmodules = true;
     sha256 = "1iy7izyprf050bix8am1krqivgyxnhx3jm775v8f80cgbqxy7m5r";
   };
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index e210d03406b7..cf37512ad9f5 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -74,7 +74,7 @@ in mkDerivation rec {
   src = fetchFromGitHub {
     owner = "drawpile";
     repo = "drawpile";
-    rev = "${version}";
+    rev = version;
     sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM=";
   };
 
diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix
index 9f157798a7d2..911a30ccf611 100644
--- a/pkgs/applications/misc/ausweisapp2/default.nix
+++ b/pkgs/applications/misc/ausweisapp2/default.nix
@@ -8,7 +8,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Governikus";
     repo = "AusweisApp2";
-    rev = "${version}";
+    rev = version;
     sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb";
   };
 
diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix
index 77eb32166fe4..18dbcc9ce26a 100644
--- a/pkgs/applications/misc/batsignal/default.nix
+++ b/pkgs/applications/misc/batsignal/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "electrickite";
     repo = "batsignal";
-    rev = "${version}";
+    rev = version;
     sha256 = "12hj0j18db34x0xzgj6xmhvxm966d05z0rl3d9rlrcd2q96lilwf";
   };
 
diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix
index b70f9a2e7d80..3a89773b8587 100644
--- a/pkgs/applications/misc/chewing-editor/default.nix
+++ b/pkgs/applications/misc/chewing-editor/default.nix
@@ -7,8 +7,8 @@ mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "chewing";
-    repo = "${pname}";
-    rev = "${version}";
+    repo = pname;
+    rev = version;
     sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w";
   };
 
diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix
index 41bfdb3fc5d9..51e1b77096d2 100644
--- a/pkgs/applications/misc/dupeguru/default.nix
+++ b/pkgs/applications/misc/dupeguru/default.nix
@@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "arsenetar";
     repo = "dupeguru";
-    rev = "${version}";
+    rev = version;
     sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/applications/misc/effitask/default.nix
index 4f3255551c21..26008c133b82 100644
--- a/pkgs/applications/misc/effitask/default.nix
+++ b/pkgs/applications/misc/effitask/default.nix
@@ -13,8 +13,8 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "sanpii";
-    repo = "${pname}";
-    rev = "${version}";
+    repo = pname;
+    rev = version;
     sha256 = "09bffxdp43s8b1rpmsgqr2kyz3i4jbd2yrwbxw21fj3sf3mwb9ig";
   };
 
diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix
index 717d4a3aab3f..337d68b4b20d 100644
--- a/pkgs/applications/misc/fuzzel/default.nix
+++ b/pkgs/applications/misc/fuzzel/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://codeberg.org/dnkl/fuzzel";
-    rev = "${version}";
+    rev = version;
     sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2";
   };
 
diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
index f9dbf14624f7..10e6996873a0 100644
--- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
@@ -8,7 +8,7 @@ let
     src = fetchFromGitHub {
       owner = "pfn";
       repo = "keepasshttp";
-      #rev = "${version}";
+      # rev = version;
       # for 1.8.4.2 the tag is at the wrong commit (they fixed stuff
       # afterwards and didn't move the tag), hence reference by commitid
       rev = "c2c4eb5388a02169400cba7a67be325caabdcc37";
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index 26bc6cc0a0bb..91f23f662af9 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "${version}";
+    rev = version;
     sha256 = "0nh5jnf5yls2qv5hpfhm6i854zsknyh7d93c987a0cg14sg820fv";
   };
 
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index 83a7e9d62165..f92fe87b9481 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pwr-Solaar";
     repo = "Solaar";
-    rev = "${version}";
+    rev = version;
     sha256 = "0k5z9dap6rawiafkg1x7zjx51ala7wra6j6lvc2nn0y8r79yp7a9";
   };
 
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 72dfe3ecc33f..d26f8ed5dc67 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -7,7 +7,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "instrumenta";
     repo = "kubeval";
-    rev = "${version}";
+    rev = version;
     sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index b1577a37844d..c031615a90bf 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -10,7 +10,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "QMatrixClient";
     repo = "Quaternion";
-    rev = "${version}";
+    rev = version;
     sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv";
   };
 
diff --git a/pkgs/applications/networking/trebleshot/default.nix b/pkgs/applications/networking/trebleshot/default.nix
index 56ebe1873ae6..82f91ddef8b4 100644
--- a/pkgs/applications/networking/trebleshot/default.nix
+++ b/pkgs/applications/networking/trebleshot/default.nix
@@ -10,7 +10,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "genonbeta";
     repo = "TrebleShot-Desktop";
-    rev = "${version}";
+    rev = version;
     sha256 = "1k8wagw6arsi1lqkhn1nl6j11mb122vi1qs0q2np6nznwfy7pn1k";
   };
 
diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix
index 360c6df7fe60..b8a80c5e9c11 100644
--- a/pkgs/applications/science/electronics/flatcam/default.nix
+++ b/pkgs/applications/science/electronics/flatcam/default.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
 
   src = fetchFromBitbucket {
     owner = "jpcgt";
-    repo = "${pname}";
+    repo = pname;
     rev = "533afd6a1772857cb633c011b5e0a15b60b1e92e"; # 8.5 with Red Hat packaging.
     sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m";
   };
diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix
index 1203822d86e9..b74583ca1a2c 100644
--- a/pkgs/applications/science/logic/potassco/clingcon.nix
+++ b/pkgs/applications/science/logic/potassco/clingcon.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "potassco";
-    repo = "${pname}";
+    repo = pname;
     rev = "v${version}";
     fetchSubmodules = true;
     sha256 = "1q7517h10jfvjdk2czq8d6y57r8kr1j1jj2k2ip2qxkpyfigk4rs";
diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix
index 69b44625f95a..eb44f6d412b5 100644
--- a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix
@@ -7,7 +7,7 @@ buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "c4urself";
-    repo = "${pname}";
+    repo = pname;
     rev = "refs/tags/v${version}";
     sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja";
   };
@@ -16,12 +16,12 @@ buildPythonApplication rec {
   # X's in pytest are git tests which won't run in sandbox
   checkPhase = ''
     pytest tests/ -k 'not usage_string_fork'
-  ''; 
+  '';
 
   meta = with stdenv.lib; {
     description = "Version-bump your software with a single command";
     longDescription = ''
-      A small command line tool to simplify releasing software by updating 
+      A small command line tool to simplify releasing software by updating
       all version strings in your source code by the correct increment.
     '';
     homepage = "https://github.com/c4urself/bump2version";
diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
index fc2e660fa7a7..30049e845877 100644
--- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
@@ -7,7 +7,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gabrie30";
     repo = "ghorg";
-    rev = "${version}";
+    rev = version;
     sha256 = "0diwndkckv6fga45j9zngizycn5m71r67cziv0zrx6c66ssbj49w";
   };
 
diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix
index a8dc4539a7dd..d406ae50e1c3 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/data/icons/zafiro-icons/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zayronxio";
     repo = pname;
-    rev = "${version}";
+    rev = version;
     sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv";
   };
 
diff --git a/pkgs/data/themes/orion/default.nix b/pkgs/data/themes/orion/default.nix
index b44cc857c629..740b34889227 100644
--- a/pkgs/data/themes/orion/default.nix
+++ b/pkgs/data/themes/orion/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchgit, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
 
-stdenv.mkDerivation {
-  name = "orion-1.5";
+stdenv.mkDerivation rec {
+  pname = "orion";
+  version = "1.5";
 
-  src = fetchgit {
-    url = "https://github.com/shimmerproject/Orion.git";
-    rev = "refs/tags/v1.5";
+  src = fetchFromGitHub {
+    owner = "shimmerproject";
+    repo = "Orion";
+    rev = "refs/tags/v${version}";
     sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index 9ea68b02ea87..d58e608c9576 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
   version = "3.22.11";
 
   src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = pname;
-    domain = "gitlab.gnome.org";
-    rev    = "${version}";
+    rev = version;
     sha256 = "1asm0y6485xqsysdg586y3hzz8bhxqwnc82k6vhfnxpxz7l62qa1";
   };
 
diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix
index a404d1606957..e6765ec68990 100644
--- a/pkgs/development/compilers/llvm/11/default.nix
+++ b/pkgs/development/compilers/llvm/11/default.nix
@@ -7,7 +7,7 @@
 
 let
   release_version = "11.0.0";
-  version = "${release_version}"; # differentiating these (variables) is important for RCs
+  version = release_version; # differentiating these (variables) is important for RCs
   targetConfig = stdenv.targetPlatform.config;
 
   fetch = name: sha256: fetchurl {
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 9ad95645240b..83b54e442aa3 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "acl2-devel";
     repo = "acl2-devel";
-    rev = "${version}";
+    rev = version;
     sha256 = "0c0wimaf16nrr3d6cxq6p7nr7rxffvpmn66hkpwc1m6zpcipf0y5";
   };
 
diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
index 122831e80cc0..61fd94c09bf4 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -145,7 +145,7 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "https://github.com/anmonteiro/lumo.git";
-    rev = "${version}";
+    rev = version;
     sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p";
   };
 
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index b725c3e6e503..75a022de912f 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
-    repo = "${pname}";
+    repo = pname;
     rev = "v${version}";
     sha256 = "01k1fpk2qp4kv0xr4f0xmrjkr98j5ws48r1aks8l80mffs4ynqfr";
     fetchSubmodules = true;
diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix
index e1da5a44ff08..b3bf33f0e881 100644
--- a/pkgs/development/libraries/gensio/default.nix
+++ b/pkgs/development/libraries/gensio/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "cminyard";
-    repo = "${pname}";
+    repo = pname;
     rev = "v${version}";
     sha256 = "07m8rbdk05biarc9xskwcx9lghj0dff1msxasfc6hi3jywc3xaih";
   };
diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix
index 190c573577a5..9a754eda592f 100644
--- a/pkgs/development/libraries/libmkv/default.nix
+++ b/pkgs/development/libraries/libmkv/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchgit, libtool, autoconf, automake }:
+{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   pname = "libmkv";
   version = "0.6.5.1";
 
-  src = fetchgit {
-    url = "https://github.com/saintdev/libmkv.git";
+  src = fetchFromGitHub {
+    owner = "saintdev";
+    repo = pname;
     rev = "refs/tags/${version}";
     sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl";
   };
diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix
index 952987447b22..12def747361b 100644
--- a/pkgs/development/libraries/pcaudiolib/default.nix
+++ b/pkgs/development/libraries/pcaudiolib/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rhdunn";
     repo = "pcaudiolib";
-    rev = "${version}";
+    rev = version;
     sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0";
   };
 
diff --git a/pkgs/development/libraries/wiiuse/default.nix b/pkgs/development/libraries/wiiuse/default.nix
index 4dcc8a47105e..738c6a430084 100644
--- a/pkgs/development/libraries/wiiuse/default.nix
+++ b/pkgs/development/libraries/wiiuse/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wiiuse";
     repo = "wiiuse";
-    rev = "${version}";
+    rev = version;
     sha256 = "05gc3s0wxx7ga4g32yyibyxdh46rm9bbslblrc72ynrjxq98sg13";
   };
 
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 9d501f47c3b1..3ad200cfc637 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -30,7 +30,7 @@ let
   src = fetchFromBitbucket {
     owner = "multicoreware";
     repo = "x265_git";
-    rev = "${version}";
+    rev = version;
     sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn";
   };
 
diff --git a/pkgs/development/ocaml-modules/dispatch/default.nix b/pkgs/development/ocaml-modules/dispatch/default.nix
index 5de61169c365..03f2afbd3141 100644
--- a/pkgs/development/ocaml-modules/dispatch/default.nix
+++ b/pkgs/development/ocaml-modules/dispatch/default.nix
@@ -7,7 +7,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = "ocaml-dispatch";
-    rev = "${version}";
+    rev = version;
     sha256 = "05kb9zcihk50r2haqz8vrlr7kmaka6vrs4j1z500lmnl877as6qr";
   };
 
diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix
index 6e69bc1e5c50..38ccaea65eba 100644
--- a/pkgs/development/ocaml-modules/lua-ml/default.nix
+++ b/pkgs/development/ocaml-modules/lua-ml/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lindig";
     repo = pname;
-    rev = "${version}";
+    rev = version;
     sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044";
   };
 
diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix
index afb26cfb354b..14b1d2d2321f 100644
--- a/pkgs/development/ocaml-modules/webmachine/default.nix
+++ b/pkgs/development/ocaml-modules/webmachine/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = "ocaml-webmachine";
-    rev = "${version}";
+    rev = version;
     sha256 = "1zi1vsm589y2njwzsqkmdbxvs9s4xlgbd62xqw2scp60mccp09nk";
   };
 
diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index 993647c3f232..73c15850d33c 100644
--- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jimfunk";
-    repo = "${pname}";
+    repo = pname;
     rev = "v${version}";
     sha256 = "1rrh38f3zl3jk5ijs6g75dxxvxygf4lczbgc7ahrgzf58g4a48lm";
   };
diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix
index a819bca362db..1a8ddacdd690 100644
--- a/pkgs/development/python-modules/hawkauthlib/default.nix
+++ b/pkgs/development/python-modules/hawkauthlib/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 , requests
 , webob
 }:
@@ -9,8 +9,9 @@ buildPythonPackage rec {
   pname = "hawkauthlib";
   version = "0.1.1";
 
-  src = fetchgit {
-    url = "https://github.com/mozilla-services/hawkauthlib.git";
+  src = fetchFromGitHub {
+    owner = "mozilla-services";
+    repo = pname;
     rev = "refs/tags/v${version}";
     sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi";
   };
diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix
index 24af3a51255d..5e5847dce033 100644
--- a/pkgs/development/python-modules/ovito/default.nix
+++ b/pkgs/development/python-modules/ovito/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitLab {
     owner = "stuko";
-    repo = "${pname}";
+    repo = pname;
     rev = "v${version}";
     sha256 = "0rm1qxa0fanaaqg0idr6rf2s2xlbyn1dzjzwh3rddy9mgl60lj2h";
   };
diff --git a/pkgs/development/python-modules/pa-ringbuffer/default.nix b/pkgs/development/python-modules/pa-ringbuffer/default.nix
index fd05e7e8052e..466d3937a1fb 100644
--- a/pkgs/development/python-modules/pa-ringbuffer/default.nix
+++ b/pkgs/development/python-modules/pa-ringbuffer/default.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spatialaudio";
     repo = "python-pa-ringbuffer";
-    rev = "${version}";
+    rev = version;
     sha256 = "0afpydy1l20hd1xncjppjhqa2c8dj5h9nlv4z8m55cs9hc9h1mxv";
   };
 
diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix
index 22afc793cde9..8fdb051a4846 100644
--- a/pkgs/development/python-modules/pyfcm/default.nix
+++ b/pkgs/development/python-modules/pyfcm/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "olucurious";
     repo = "pyfcm";
-    rev = "${version}";
+    rev = version;
     sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg";
   };
 
diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix
index a787b8695275..6f76ca9850fe 100644
--- a/pkgs/development/python-modules/pykka/default.nix
+++ b/pkgs/development/python-modules/pykka/default.nix
@@ -1,14 +1,15 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "pykka";
   version = "2.0.1";
 
-  src = fetchgit {
-    url = "https://github.com/jodal/pykka.git";
+  src = fetchFromGitHub {
+    owner = "jodal";
+    repo = pname;
     rev = "refs/tags/v${version}";
     sha256 = "011rvv3vzj9rpwaq6vfpz9hfwm6gx1jmad4iri6z12g8nnlpydhs";
   };
diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix
index ff966d906c88..fc76d9af68d9 100644
--- a/pkgs/development/python-modules/pyramid_hawkauth/default.nix
+++ b/pkgs/development/python-modules/pyramid_hawkauth/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 , pyramid
 , hawkauthlib
 , tokenlib
@@ -8,11 +8,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "pyramidhawkauth";
+  pname = "pyramid_hawkauth";
   version = "0.1.0";
 
-  src = fetchgit {
-    url = "https://github.com/mozilla-services/pyramid_hawkauth.git";
+  src = fetchFromGitHub {
+    owner = "mozilla-services";
+    repo = pname;
     rev = "refs/tags/v${version}";
     sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h";
   };
diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix
index e1115bd81800..1d9b8114df7b 100644
--- a/pkgs/development/python-modules/rtmixer/default.nix
+++ b/pkgs/development/python-modules/rtmixer/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spatialaudio";
     repo = "python-rtmixer";
-    rev = "${version}";
+    rev = version;
     sha256 = "1bvgzzxiypvvb3qacbcry6761x9sk3dnx7jga7pli63f69vakg4y";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix
index 3785ebcf86cf..f5c0ee715c3a 100644
--- a/pkgs/development/python-modules/sacremoses/default.nix
+++ b/pkgs/development/python-modules/sacremoses/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alvations";
     repo = pname;
-    rev = "${version}";
+    rev = version;
     sha256 = "1gzr56w8yx82mn08wax5m0xyg15ym4ri5l80gmagp8r53443j770";
   };
 
diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix
index 6916b704fcd4..69f7a93f509d 100644
--- a/pkgs/development/python-modules/signedjson/default.nix
+++ b/pkgs/development/python-modules/signedjson/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 , canonicaljson
 , unpaddedbase64
 , pynacl
@@ -11,8 +11,9 @@ buildPythonPackage rec {
   pname = "signedjson";
   version = "1.1.0";
 
-  src = fetchgit {
-    url = "https://github.com/matrix-org/python-signedjson.git";
+  src = fetchFromGitHub {
+    owner = "matrix-org";
+    repo = "python-${pname}";
     rev = "refs/tags/v${version}";
     sha256 = "18s388hm3babnvakbbgfqk0jzq25nnznvhygywd3azp9b4yzmd5c";
   };
diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix
index 763679190592..a89c6fa307ea 100644
--- a/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -31,7 +31,7 @@ let
     src = fetchFromGitHub {
       owner = "tensorflow";
       repo = "probability";
-      rev = "${version}";
+      rev = version;
       sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy";
     };
 
diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix
index 0ffb5ce0cb73..7c8e99cc399a 100644
--- a/pkgs/development/python-modules/tokenlib/default.nix
+++ b/pkgs/development/python-modules/tokenlib/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 , requests
 , webob
 }:
@@ -9,8 +9,9 @@ buildPythonPackage rec {
   pname = "tokenlib";
   version = "0.3.1";
 
-  src = fetchgit {
-    url = "https://github.com/mozilla-services/tokenlib.git";
+  src = fetchFromGitHub {
+    owner = "mozilla-services";
+    repo = pname;
     rev = "refs/tags/${version}";
     sha256 = "0bq6dqyfwh29pg8ngmrm4mx4q27an9lsj0p9l79p9snn4g2rxzc8";
   };
diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/pkgs/development/python-modules/unpaddedbase64/default.nix
index bcb902e5bfdb..386478cbb752 100644
--- a/pkgs/development/python-modules/unpaddedbase64/default.nix
+++ b/pkgs/development/python-modules/unpaddedbase64/default.nix
@@ -1,14 +1,15 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "unpaddedbase64";
   version = "1.1.0";
 
-  src = fetchgit {
-    url = "https://github.com/matrix-org/python-unpaddedbase64.git";
+  src = fetchFromGitHub {
+    owner = "matrix-org";
+    repo = "python-${pname}";
     rev = "refs/tags/v${version}";
     sha256 = "0if3fjfxga0bwdq47v77fs9hrcqpmwdxry2i2a7pdqsp95258nxd";
   };
diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
index 099837fbafa2..d2ad97141ca7 100644
--- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
+++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
@@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "xd009642";
     repo = "tarpaulin";
-    rev = "${version}";
+    rev = version;
     sha256 = "0ga2zfq4365hxvr3wd3isc146ibivy3bfcy24rb6cq3av3b90a8k";
   };
 
diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix
index 55c077f932d9..b0e5319df2d6 100644
--- a/pkgs/development/tools/analysis/retdec/default.nix
+++ b/pkgs/development/tools/analysis/retdec/default.nix
@@ -135,8 +135,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "avast-tl";
-    repo = "retdec";
-    name = "retdec-${version}";
+    repo = pname;
     rev = "refs/tags/v${version}";
     sha256 = "0chky656lsddn20bnm3pmz6ix20y4a0y8swwr42hrhi01vkhmzrp";
   };
diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix
index 44411d0db72c..600b2b0e56ce 100644
--- a/pkgs/development/tools/eclipse-mat/default.nix
+++ b/pkgs/development/tools/eclipse-mat/default.nix
@@ -31,7 +31,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "eclipse-mat";
-  version = "${pVersion}";
+  version = pVersion;
 
   src = fetchurl {
     url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip";
diff --git a/pkgs/development/tools/misc/argbash/default.nix b/pkgs/development/tools/misc/argbash/default.nix
index 0c0511ec7922..3efff5009439 100644
--- a/pkgs/development/tools/misc/argbash/default.nix
+++ b/pkgs/development/tools/misc/argbash/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matejak";
     repo = "argbash";
-    rev = "${version}";
+    rev = version;
     sha256 = "1xdhpbnc0xjv6ydcm122hhdjcl77jhiqnccjfqjp3cd1lfmzvg8v";
   };
 
diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix
index 741854a507dd..401bbdbee6ef 100644
--- a/pkgs/development/tools/misc/editorconfig-checker/default.nix
+++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix
@@ -7,7 +7,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "editorconfig-checker";
     repo = "editorconfig-checker";
-    rev = "${version}";
+    rev = version;
     sha256 = "18gz94h2x1z6g6r7v9cdixkbcaigd7cl08af6smlkaa89j0aki32";
   };
 
diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix
index e15e48b0f2a9..e5cd2e0e2ddf 100644
--- a/pkgs/development/tools/misc/fujprog/default.nix
+++ b/pkgs/development/tools/misc/fujprog/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "kost";
-    repo = "${pname}";
+    repo = pname;
     rev = "v${version}";
     sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5";
   };
diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix
index e6b86e4a85c1..91653d3773e1 100644
--- a/pkgs/development/tools/sourcetrail/default.nix
+++ b/pkgs/development/tools/sourcetrail/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CoatiSoftware";
     repo = "Sourcetrail";
-    rev = "${version}";
+    rev = version;
     sha256 = "0jp9y86xzkcxikc1cn4f6gqgg6zdssck08677ldagw25p1zadvzw";
   };
 
diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix
index c47955695f5c..cb3ed5217f08 100644
--- a/pkgs/development/tools/swiftformat/default.nix
+++ b/pkgs/development/tools/swiftformat/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nicklockwood";
     repo = "SwiftFormat";
-    rev = "${version}";
+    rev = version;
     sha256 = "0zajvbaf3r02k53lv5zdxf13apc6chnjmj69zkyac48lpnpbcxq6";
   };
 
diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix
index 848bf2ab8851..ac31de4e4c24 100644
--- a/pkgs/games/cockatrice/default.nix
+++ b/pkgs/games/cockatrice/default.nix
@@ -9,7 +9,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Cockatrice";
     repo = "Cockatrice";
-    rev = "${version}";
+    rev = version;
     sha256 = "1yaxm7q0ja3rgx197hh8ynjc6ncc4hm0qdn9v7f0l4fbv0bdpv34";
   };
 
diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix
index e982c95c4d66..4ae64df41437 100644
--- a/pkgs/games/eidolon/default.nix
+++ b/pkgs/games/eidolon/default.nix
@@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchgit {
     url = "https://git.sr.ht/~nicohman/eidolon";
-    rev = "${version}";
+    rev = version;
     sha256 = "1yn3k569pxzw43mmsk97088xpkdc714rks3ncchbb6ccx25kgxrr";
   };
   cargoPatches = [ ./cargo-lock.patch ];
diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix
index b8c4ea281dfd..c3fb66208b80 100644
--- a/pkgs/games/mari0/default.nix
+++ b/pkgs/games/mari0/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "Stabyourself";
     repo = pname;
-    rev = "${version}";
+    rev = version;
     sha256 = "1zqaq4w599scsjvy1rsb21fd2r8j3srx9vym4ir9bh666dp36gxa";
   };
 
diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index 14d51ee87bd1..99599b92dfa0 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, mkDerivation, fetchgit, qt5, box2d, which, cmake, gettext }:
+{ stdenv, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }:
 
 mkDerivation rec {
   pname = "tbe";
   version = "0.9.3.1";
 
-  src = fetchgit {
-    url = "https://github.com/kaa-ching/tbe";
+  src = fetchFromGitHub {
+    owner = "kaa-ching";
+    repo = pname;
     rev = "refs/tags/v${version}";
     sha256 = "1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj";
   };
diff --git a/pkgs/games/wyvern/default.nix b/pkgs/games/wyvern/default.nix
index 4723a6c52fa7..dcf81bc0985f 100644
--- a/pkgs/games/wyvern/default.nix
+++ b/pkgs/games/wyvern/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchgit {
     url = "https://git.sr.ht/~nicohman/wyvern";
-    rev = "${version}";
+    rev = version;
     sha256 = "1sl3yhash1527amc8rs4374fd7jbgnkyy7qpw94ms2gs80sdv3s5";
   };
   cargoPatches = [ ./cargo-lock.patch ];
diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix
index 7e231c5edd3a..60b0bfe1223b 100644
--- a/pkgs/misc/emulators/mednaffe/default.nix
+++ b/pkgs/misc/emulators/mednaffe/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AmatCoder";
     repo = "mednaffe";
-    rev = "${version}";
+    rev = version;
     sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7";
   };
 
diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix
index d7c7e042981f..c2527acc1cd4 100644
--- a/pkgs/servers/monitoring/do-agent/default.nix
+++ b/pkgs/servers/monitoring/do-agent/default.nix
@@ -7,7 +7,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "do-agent";
-    rev = "${version}";
+    rev = version;
     sha256 = "16mmh1kz6zbncfisd9qnb3ssgpkcb4hb7700jlzbdjqxyjmy0qsf";
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix
index 37e3ec0375cb..25ad49e7c8a8 100644
--- a/pkgs/servers/monitoring/prometheus/promscale.nix
+++ b/pkgs/servers/monitoring/prometheus/promscale.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "timescale";
     repo = pname;
-    rev = "${version}";
+    rev = version;
     sha256 = "sha256:00mhkp3nf6h2zsvmmwyza1lahvmm05isfi7rqkx24c0dmkmif3x9";
   };
 
diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix
index ef592420b118..466f07052b8c 100644
--- a/pkgs/servers/ser2net/default.nix
+++ b/pkgs/servers/ser2net/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "cminyard";
-    repo = "${pname}";
+    repo = pname;
     rev = "v${version}";
     sha256 = "01w82nrgffsfz2c80p4cyppg3bz56d90jm6i6356j0nva3784haw";
   };
diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix
index 8177e1d22262..2cb20e4932f5 100644
--- a/pkgs/servers/web-apps/dokuwiki/default.nix
+++ b/pkgs/servers/web-apps/dokuwiki/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "splitbrain";
-    repo = "${pname}";
+    repo = pname;
     rev = "release_stable_${version}";
     sha256 = "09swcqyd06l3481k190gmlr3b33dlv1lw1kk9nyh5b4sa5p3k7kk";
   };
diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/servers/web-apps/jirafeau/default.nix
index 1f3dd2e90124..33cde2c5922c 100644
--- a/pkgs/servers/web-apps/jirafeau/default.nix
+++ b/pkgs/servers/web-apps/jirafeau/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "mojo42";
     repo = "Jirafeau";
-    rev = "${version}";
+    rev = version;
     sha256 = "09gq5zhynygpqj0skq7ifnn9yjjg7qnc6kjvaas7f53av2707z4c";
   };
 
diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix
index 432f59564060..73c2fcce3476 100644
--- a/pkgs/servers/web-apps/rss-bridge/default.nix
+++ b/pkgs/servers/web-apps/rss-bridge/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "RSS-Bridge";
     repo = "rss-bridge";
-    rev = "${version}";
+    rev = version;
     sha256 = "075k4bylx9308d083ry5a9q4629ccnrnndqqdqp1g42rzlqrw79q";
   };
 
diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix
index 7b30e5c58155..7bd0c3e6dcd4 100644
--- a/pkgs/tools/X11/xwinmosaic/default.nix
+++ b/pkgs/tools/X11/xwinmosaic/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchgit, gtk2, cmake, pkgconfig, libXdamage }:
+{ stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }:
 
 stdenv.mkDerivation rec {
   version = "0.4.2";
   pname = "xwinmosaic";
 
-  src = fetchgit {
-    url = "https://github.com/soulthreads/xwinmosaic/";
-    rev = "refs/tags/v0.4.2";
+  src = fetchFromGitHub {
+    owner = "soulthreads";
+    repo = pname;
+    rev = "refs/tags/v${version}";
     sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr";
   };
 
diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/tools/backup/stenc/default.nix
index 11859c4f8be4..af5a33c2a6ee 100644
--- a/pkgs/tools/backup/stenc/default.nix
+++ b/pkgs/tools/backup/stenc/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "scsitape";
     repo = "stenc";
-    rev = "${version}";
+    rev = version;
     sha256 = "1778m1zcyzyf42k5m496yqh0gv6kqhb0sq5983dhky1fccjl905k";
   };
 
diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix
index 0987fb6d286f..04a89ec3dd0f 100644
--- a/pkgs/tools/misc/ddate/default.nix
+++ b/pkgs/tools/misc/ddate/default.nix
@@ -1,10 +1,13 @@
-{stdenv, fetchgit, cmake} :
+{stdenv, fetchFromGitHub, cmake} :
 
-stdenv.mkDerivation {
-  name = "ddate-0.2.2";
-  src = fetchgit {
-    url = "https://github.com/bo0ts/ddate";
-    rev = "refs/tags/v0.2.2";
+stdenv.mkDerivation rec {
+  pname = "ddate";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "bo0ts";
+    repo = pname;
+    rev = "refs/tags/v${version}";
     sha256 = "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f";
   };
 
@@ -14,7 +17,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/bo0ts/ddate";
     description = "Discordian version of the date program";
     license = stdenv.lib.licenses.publicDomain;
-    maintainers = with stdenv.lib.maintainers; [kovirobi];
+    maintainers = with stdenv.lib.maintainers; [ kovirobi ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix
index e59c2387a3ce..a40913343308 100644
--- a/pkgs/tools/misc/eva/default.nix
+++ b/pkgs/tools/misc/eva/default.nix
@@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "NerdyPepper";
-    repo = "${pname}";
+    repo = pname;
     rev = "6ce0fc0212a34ffb647b24d9d903029ac4518165";
     sha256 = "10242vnq2ph0g3p2hdacs4lmx3f474xm04nadplxbpv9xh4nbag3";
   };
diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix
index d92f2346563c..11cb0dcf554b 100644
--- a/pkgs/tools/misc/nix-direnv/default.nix
+++ b/pkgs/tools/misc/nix-direnv/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-direnv";
-    rev = "${version}";
+    rev = version;
     sha256 = "sha256-xMz6e0OLeB3eltGrLV3Hew0lMjH5LSgqJ1l7JT2Ho/M=";
   };
 
diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/tools/misc/rpcsvc-proto/default.nix
index 12885172080c..925dfde13a36 100644
--- a/pkgs/tools/misc/rpcsvc-proto/default.nix
+++ b/pkgs/tools/misc/rpcsvc-proto/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "thkukuk";
-    repo = "${pname}";
+    repo = pname;
     rev = "v${version}";
     sha256 = "006l1f824r9bcbwn1s1vbs33cdwhs66jn6v97yas597y884y40z9";
   };
diff --git a/pkgs/tools/networking/goimapnotify/default.nix b/pkgs/tools/networking/goimapnotify/default.nix
index fb64ff65cc15..4232a5a4fedd 100644
--- a/pkgs/tools/networking/goimapnotify/default.nix
+++ b/pkgs/tools/networking/goimapnotify/default.nix
@@ -9,7 +9,7 @@ buildGoPackage rec {
   src = fetchFromGitLab {
     owner = "shackra";
     repo = "goimapnotify";
-    rev = "${version}";
+    rev = version;
     sha256 = "1d42gd3m2rkvy985d181dbcm5i3f7xsg2z8z6s4bpvw24pfnzs42";
   };
 
diff --git a/pkgs/tools/networking/network-manager/dmenu/default.nix b/pkgs/tools/networking/network-manager/dmenu/default.nix
index 4b46d63ced5b..e17d4ebc0719 100644
--- a/pkgs/tools/networking/network-manager/dmenu/default.nix
+++ b/pkgs/tools/networking/network-manager/dmenu/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "networkmanager-dmenu";
-    rev = "${version}";
+    rev = version;
     sha256 = "1liidqh8c33pxyb07qyj0jkd0fdak73g9r2iwiq62vfzrpik09k0";
   };
 
diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix
index 2cb819caee98..6377f276af3f 100644
--- a/pkgs/tools/networking/nfstrace/default.nix
+++ b/pkgs/tools/networking/nfstrace/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "epam";
     repo = "nfstrace";
-    rev = "${version}";
+    rev = version;
     sha256 = "1djsyn7i3xp969rnmsdaf5vwjiik9wylxxrc5nm7by00i76c1vsg";
   };
 
diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix
index c4d9aae267e7..3f61fdd583ec 100644
--- a/pkgs/tools/package-management/cargo-about/default.nix
+++ b/pkgs/tools/package-management/cargo-about/default.nix
@@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-about";
-    rev = "${version}";
+    rev = version;
     sha256 = "00ing1v6vjqfvirp3mbayn8rwvxf72wnhz9249k2iifw8bl2r2hd";
   };
 
diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix
index 791dfe755ee4..f9b996b27761 100644
--- a/pkgs/tools/package-management/gx/default.nix
+++ b/pkgs/tools/package-management/gx/default.nix
@@ -1,16 +1,16 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "gx";
   version = "0.14.1";
-  rev = "refs/tags/v${version}";
 
   goPackagePath = "github.com/whyrusleeping/gx";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/whyrusleeping/gx";
+  src = fetchFromGitHub {
+    owner = "whyrusleeping";
+    repo = pname;
+    rev = "refs/tags/v${version}";
     sha256 = "0pfx2p59xdbmqzfbgaf8xvlnzh8m05hkg596glq5kvl8ib65i4ha";
   };
 
diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix
index 652edf95e550..8579ef574d55 100644
--- a/pkgs/tools/package-management/gx/go/default.nix
+++ b/pkgs/tools/package-management/gx/go/default.nix
@@ -1,18 +1,18 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchgit
+{ stdenv, buildGoPackage, fetchFromGitHub
 , gx
 }:
 
 buildGoPackage rec {
   pname = "gx-go";
   version = "1.9.0";
-  rev = "refs/tags/v${version}";
 
   goPackagePath = "github.com/whyrusleeping/gx-go";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/whyrusleeping/gx-go";
+  src = fetchFromGitHub {
+    owner = "whyrusleeping";
+    repo = pname;
+    rev = "refs/tags/v${version}";
     sha256 = "0fdy4b3ymqw6hzvvjwq37mfrdmizc8lxm53axw93n3x6118na9jc";
   };
 
diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix
index e861d70f7252..aff6bbd028ad 100644
--- a/pkgs/tools/security/crackxls/default.nix
+++ b/pkgs/tools/security/crackxls/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, pkgconfig, autoconf, automake, openssl, libgsf, gmp }:
+{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, openssl, libgsf, gmp }:
 
 stdenv.mkDerivation rec {
 
   pname = "crackxls";
   version = "0.4";
 
-  src = fetchgit {
-    url = "https://github.com/GavinSmith0123/crackxls2003.git";
-    rev = "refs/tags/v${version}";
+  src = fetchFromGitHub {
+    owner = "GavinSmith0123";
+    repo = "crackxls2003";
+    rev = "v${version}";
     sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz";
   };
 
diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix
index 71146b15ea3d..a46acef81d75 100644
--- a/pkgs/tools/security/honggfuzz/default.nix
+++ b/pkgs/tools/security/honggfuzz/default.nix
@@ -10,7 +10,7 @@ let
     src = fetchFromGitHub {
       owner = "google";
       repo = pname;
-      rev = "${version}";
+      rev = version;
       sha256 = "0dcl5a5jykgfmnfj42vl7kah9k26wg38l2g6yfh5pssmlf0nax33";
     };
 
diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix
index 9e778a636c15..e8c4b1f541bd 100644
--- a/pkgs/tools/security/rbw/default.nix
+++ b/pkgs/tools/security/rbw/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchCrate {
     inherit version;
-    crateName = "${pname}";
+    crateName = pname;
     sha256 = "0p37kwkp153mkns4bh7k7gnksk6c31214wlw3faf42daav32mmgw";
   };
 
diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix
index 4d154bbc96ff..f36565479512 100644
--- a/pkgs/tools/security/rustscan/default.nix
+++ b/pkgs/tools/security/rustscan/default.nix
@@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "RustScan";
     repo = pname;
-    rev = "${version}";
+    rev = version;
     sha256 = "0dhy7b73ipsxsr7wlc3r5yy39i3cjrdszhsw9xwjj31692s3b605";
   };
 
diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix
index 00cc996ed60c..8a521b751d4d 100644
--- a/pkgs/tools/text/ledger2beancount/default.nix
+++ b/pkgs/tools/text/ledger2beancount/default.nix
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zacchiro";
     repo = "ledger2beancount";
-    rev = "${version}";
+    rev = version;
     sha256 = "0w88jb1x0w02jwwf6ipx3cxr89kzffrrdqws3556zrvvs01bh84j";
   };
 

From 3c20b670dbe7c93e7f3ba8a3a2dfeef38776d508 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 07:07:25 +0000
Subject: [PATCH 0901/3942] istioctl: 1.7.3 -> 1.7.4

---
 pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix
index f6619c9f19f7..053035e629ea 100644
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "istioctl";
-  version = "1.7.3";
+  version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    sha256 = "1w0ddz2am053bpi0jrn5v3b76jf2z4nl7zv0i1z2v9xcx59bxkac";
+    sha256 = "1vy6y6gk7ljnrb7cxxaa60i4ycylsrd2yszbly1aaz5vnh1vsfz9";
   };
-  vendorSha256 = "02l13hzk5aikpylalsm35v27cljcl4z0qka9a4m125bc4rj2kp7k";
+  vendorSha256 = "0f2n8mwnj9i4qifs0f63jrgr61mjs3c1arxnny723i5pialj3zdl";
 
   doCheck = false;
 

From 138f9de4d502690a5f7d3eb7273e487ee8830b76 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 07:13:19 +0000
Subject: [PATCH 0902/3942] hikari: 2.1.2 -> 2.2.2

---
 pkgs/applications/window-managers/hikari/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix
index 9bf68adaef42..d23d6c07af0e 100644
--- a/pkgs/applications/window-managers/hikari/default.nix
+++ b/pkgs/applications/window-managers/hikari/default.nix
@@ -12,7 +12,7 @@
 
 let
   pname = "hikari";
-  version = "2.1.2";
+  version = "2.2.2";
 in
 
 stdenv.mkDerivation {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz";
-    sha256 = "1qzbwc8dgsvp5jb4faapcrg9npsl11gq8jvhbbk2h7hj52c5lgmv";
+    sha256 = "0sln1n5f67i3vxkybfi6xhzplb45djqyg272vqkv64m72rmm8875";
   };
 
   nativeBuildInputs = [ pkgconfig bmake ];

From 9217752561ec1f1d4d4c386cf355ffabd367d69a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 07:30:15 +0000
Subject: [PATCH 0903/3942] imagemagick7: 7.0.10-27 -> 7.0.10-35

---
 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 bd4fa4b531be..a1e39cfebe0e 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.10-27";
-    sha256 = "1fqwbg2ws6ix3bymx7ncb4k4f6bg8q44n9xnlvngjapflnrmhcph";
+    version = "7.0.10-35";
+    sha256 = "0hcqvn3n3ip2fia48d1nb1m4r5ir00vbaa62xqni30kglh3n2sfh";
     patches = [];
   };
 in

From eab501c27a377758cb9aa9830bedc815853d2acb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 07:46:46 +0000
Subject: [PATCH 0904/3942] icewm: 1.8.3 -> 1.9.0

---
 pkgs/applications/window-managers/icewm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index f361b27fdf8c..3e3065301d98 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -9,13 +9,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "icewm";
-  version = "1.8.3";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner  = "bbidulock";
     repo = pname;
     rev = version;
-    sha256 = "sha256-cTJQlUaGvbJmu1xYwFp5GPrM5NjfKBzaMc+l7FeMUP8=";
+    sha256 = "08prc9ip96bxbmkkab0ymma9yisgs5yzymg4gjcvr945bj4q7crb";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl asciidoc ];

From 71f4f9ac1e9776ca22332c0cf083c8e210a626ae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 08:04:05 +0000
Subject: [PATCH 0905/3942] jx: 2.1.138 -> 2.1.149

---
 pkgs/applications/networking/cluster/jx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix
index 72b365d01b47..1f1eb3e8548f 100644
--- a/pkgs/applications/networking/cluster/jx/default.nix
+++ b/pkgs/applications/networking/cluster/jx/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "jx";
-  version = "2.1.138";
+  version = "2.1.149";
 
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
     rev = "v${version}";
-    sha256 = "1i45gzaql6rfplliky56lrzwjnm2qzv25kgyq7gvn9c7hjaaq65b";
+    sha256 = "0jgny09wpfab8mkxkhv9swp1baqx3lxsx75a5i78cypkj6xadc69";
   };
 
-  vendorSha256 = "1wvggarakshpw7m8h0x2zvd6bshd2kzbrjynfa113z90pgksvjng";
+  vendorSha256 = "1fswrf14nwjm0z8qqgdx236w7w1m451lyfinhx9pyp89fw2h5mv6";
 
   doCheck = false;
 

From 859a44ebc0b4f54c8053884c9bf1d8496ada0bf8 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Sun, 1 Nov 2020 18:47:18 +0100
Subject: [PATCH 0906/3942] systemd: set withRemote true by default

This also adds the libmicrohttpd as a `buildInput` when `withRemote`
is true.
---
 pkgs/os-specific/linux/systemd/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 8aaeddd1e81d..0a89fe3720a5 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -53,6 +53,7 @@
 , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms
 , kexectools
 , bashInteractive
+, libmicrohttpd
 
 , withAnalyze ? true
 , withApparmor ? true
@@ -71,7 +72,7 @@
 , withNss ? true
 , withPCRE2 ? true
 , withPolkit ? true
-, withRemote ? false  # has always been disabled on NixOS, upstream version appears broken anyway
+, withRemote ? true
 , withResolved ? true
 , withShellCompletions ? true
 , withTimedated ? true
@@ -201,6 +202,7 @@ stdenv.mkDerivation {
     ++ lib.optional withPCRE2 pcre2
     ++ lib.optional withResolved libgpgerror
     ++ lib.optional withSelinux libselinux
+    ++ lib.optional withRemote libmicrohttpd
     ;
 
   #dontAddPrefix = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36c9cba90880..74b8e7ddce18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18812,6 +18812,7 @@ in
     withNss = false;
     withPCRE2 = false;
     withPolkit = false;
+    withRemote = false;
     withResolved = false;
     withShellCompletions = false;
     withTimedated = false;

From 81063ee414ecf461f697b54678dad3163fe37e38 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Sun, 1 Nov 2020 18:48:40 +0100
Subject: [PATCH 0907/3942] nixos.tests.systemd-journal: add basic
 systemd-journal-gatewayd test

This test allows to ensure the systemd-journal-gatewayd service is
responding correcly when the NixOS option `enableHttpGateway` is set.

The test has not been added into the main systemd test because a
graphical stack is not required (and rebuilding the graphical stack on
systemd change is huge).
---
 nixos/tests/all-tests.nix       |  1 +
 nixos/tests/systemd-journal.nix | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 nixos/tests/systemd-journal.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9ffeba27a7fe..02ac737dbe1b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -340,6 +340,7 @@ in
   systemd-binfmt = handleTestOn ["x86_64-linux"] ./systemd-binfmt.nix {};
   systemd-boot = handleTest ./systemd-boot.nix {};
   systemd-confinement = handleTest ./systemd-confinement.nix {};
+  systemd-journal = handleTest ./systemd-journal.nix {};
   systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
   systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {};
   systemd-networkd = handleTest ./systemd-networkd.nix {};
diff --git a/nixos/tests/systemd-journal.nix b/nixos/tests/systemd-journal.nix
new file mode 100644
index 000000000000..c50c151ae10d
--- /dev/null
+++ b/nixos/tests/systemd-journal.nix
@@ -0,0 +1,20 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+{
+  name = "systemd-journal";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ lewo ];
+  };
+
+  machine = { pkgs, lib, ... }: {
+    services.journald.enableHttpGateway = true;
+  };
+
+  testScript = ''
+    machine.wait_for_unit("multi-user.target")
+
+    machine.succeed(
+        "${pkgs.curl}/bin/curl -s localhost:19531/machine | ${pkgs.jq}/bin/jq -e '.hostname == \"machine\"'"
+    )
+  '';
+})

From a48b783061748b4b214e687545152d5ad3889ad5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 09:02:28 +0000
Subject: [PATCH 0908/3942] jamulus: 3.5.10 -> 3.6.0

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

diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix
index 7a5887d4f92b..1839aa9c7ada 100644
--- a/pkgs/applications/audio/jamulus/default.nix
+++ b/pkgs/applications/audio/jamulus/default.nix
@@ -3,12 +3,12 @@
 
 mkDerivation rec {
   pname = "jamulus";
-  version = "3.5.10";
+  version = "3.6.0";
   src = fetchFromGitHub {
     owner = "corrados";
     repo = "jamulus";
     rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "0bw2v40csjmlkvkhr3dh0g1a7mfqrs1xkqjsii61yfzy2ckbsi82";
+    sha256 = "06x9b2kjsgk8kddhif0x59nwzhnwjmq40x3w5nrphqaimqlrhlcf";
   };
 
   nativeBuildInputs = [ pkg-config qmake ];

From 657c6d38756da4ba7b47faa1a3f8a32c04115605 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 09:12:23 +0000
Subject: [PATCH 0909/3942] i3lock: 2.12 -> 2.13

---
 pkgs/applications/window-managers/i3/lock.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 2bca01eeefa7..7a2812c2cfe0 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "i3lock";
-  version = "2.12";
+  version = "2.13";
 
   src = fetchurl {
     url = "https://i3wm.org/i3lock/${pname}-${version}.tar.bz2";
-    sha256 = "02dwaqxpclcwiwvpvq7zwz4sxcv9c15dbf17ifalj1p8djls3cnh";
+    sha256 = "02szjsaz7rqrdkd0r2nwgwa85c4hwfrcskxw7ryk695kmjcfhzv3";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 3c8281324035ec33c3c6abed0d6c1272a74a6700 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 2 Nov 2020 09:30:17 +0000
Subject: [PATCH 0910/3942] deno: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index b932e1b550cf..0c60821102dd 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "deno";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1kl3s5kv3wwh4br6zf0f56bffzjwhgzga93zg39mqry8jvwxp6dx";
+    sha256 = "19ki9qyg9q26jq4jkcf8b6xhy4g4cn30zqccgl3324mnijhl33jk";
     fetchSubmodules = true;
   };
-  cargoSha256 = "1m3wd2gjy2b8a3x9wm49n9z02165afv4c3n13pnqsxcqmd9a764f";
+  cargoSha256 = "1q3gmilphkbh54y7m711ccr1gr5slk2nn91qq61rmmphyylwkgv2";
 
   # Install completions post-install
   nativeBuildInputs = [ installShellFiles ];

From 8fdbffdb92c0fc51785d80b443388d76bcf042f8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 09:37:15 +0000
Subject: [PATCH 0911/3942] hitch: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix
index d049317c031a..1576d940a7a6 100644
--- a/pkgs/servers/hitch/default.nix
+++ b/pkgs/servers/hitch/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, docutils, libev, openssl, pkgconfig, nixosTests }:
 stdenv.mkDerivation rec {
-  version = "1.6.0";
+  version = "1.7.0";
   pname = "hitch";
 
   src = fetchurl {
     url = "https://hitch-tls.org/source/${pname}-${version}.tar.gz";
-    sha256 = "01n70yf8hx42jb801jv5q1xhrpqxyjnqhd98hjf81lvxpd5fnisf";
+    sha256 = "1i75giwyr66ip8xsvk3gg5xdbxnmcabgxz8dqi06c58mw7qzhzn9";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 1fb299064b98f7867ef0c54939063ac71186379d Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Mon, 28 Sep 2020 15:37:44 +0200
Subject: [PATCH 0912/3942] stunnel: make servers accept more lenient

stunnel config's accept syntax is [host:]port -- this is required to e.g. listen on ipv6
where one would set :::port
---
 nixos/modules/services/networking/stunnel.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix
index 2720bcf10934..fe1616f411f0 100644
--- a/nixos/modules/services/networking/stunnel.nix
+++ b/nixos/modules/services/networking/stunnel.nix
@@ -16,8 +16,12 @@ let
   serverConfig = {
     options = {
       accept = mkOption {
-        type = types.int;
-        description = "On which port stunnel should listen for incoming TLS connections.";
+        type = types.either types.str types.int;
+        description = ''
+          On which [host:]port stunnel should listen for incoming TLS connections.
+          Note that unlike other softwares stunnel ipv6 address need no brackets,
+          so to listen on all IPv6 addresses on port 1234 one would use ':::1234'.
+        '';
       };
 
       connect = mkOption {

From 461e95e086088246abb1ba5c14132e4c82de0261 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 09:53:43 +0000
Subject: [PATCH 0913/3942] heimer: 1.20.0 -> 1.21.0

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

diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index 2a443303e203..444ee7ab5232 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "heimer";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "juzzlin";
     repo = pname;
     rev = version;
-    sha256 = "01pgmwq539a0z7xsgx60vz6hmnr0c72xp6apx75qkvjsqbwmzhjh";
+    sha256 = "03q3jn0j0cydw2mxfv7236lv4w9fh9slha0mphj33mk2f97b9hl6";
   };
 
   nativeBuildInputs = [ cmake ];

From 7e820842a902b3a24eb23ee537858747df6ef9ac Mon Sep 17 00:00:00 2001
From: Rakesh Gupta <rakesh.gupta@formbay.com.au>
Date: Mon, 2 Nov 2020 21:13:09 +1100
Subject: [PATCH 0914/3942] pythonPackages.xmljson: init at 0.2.1

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

diff --git a/pkgs/development/python-modules/xmljson/default.nix b/pkgs/development/python-modules/xmljson/default.nix
new file mode 100644
index 000000000000..dd5d84afacb4
--- /dev/null
+++ b/pkgs/development/python-modules/xmljson/default.nix
@@ -0,0 +1,26 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, lxml
+}:
+
+buildPythonPackage rec {
+  pname = "xmljson";
+  version = "0.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b4158e66aa1e62ee39f7f80eb2fe4f767670ba3c0d5de9804420dc53427fdec8";
+  };
+
+  checkInputs = [
+    lxml
+  ];
+
+  meta = with lib; {
+    description = "Converts XML into dictionary structures and vice-versa";
+    homepage = "https://github.com/sanand0/xmljson";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ rakesh4g ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d209c34bdd8f..a46c47a834fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7704,6 +7704,8 @@ in {
 
   xml2rfc = callPackage ../development/python-modules/xml2rfc { };
 
+  xmljson = callPackage ../development/python-modules/xmljson { };
+
   xmlschema = callPackage ../development/python-modules/xmlschema { };
 
   xmltodict = callPackage ../development/python-modules/xmltodict { };

From 8ef46be2a4a5dddd94e622021d3e173ca32bbd3c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 10:16:32 +0000
Subject: [PATCH 0915/3942] igv: 2.8.9 -> 2.8.11

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

diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index bc4f1677fc98..0b990dc541b5 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "igv";
-  version = "2.8.9";
+  version = "2.8.11";
   src = fetchzip {
     url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip";
-    sha256 = "1874w1xprv91caz1ymfxilq6inhj36xzx8j9m0mcyp0qfvfvyjp7";
+    sha256 = "1hiwnrrh42qzc7kdc7bypgcgn488pz8g462xzchbhgx7jjdbbwhm";
   };
 
   installPhase = ''

From 6c0cf31ebf1f9aa7915424177d0b2cc0335ee1d1 Mon Sep 17 00:00:00 2001
From: Evax Software <contact@evax.fr>
Date: Mon, 2 Nov 2020 11:07:44 +0100
Subject: [PATCH 0916/3942] python3Packages.mlxtend: init at 0.17.3

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

diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix
new file mode 100644
index 000000000000..2bfd12249101
--- /dev/null
+++ b/pkgs/development/python-modules/mlxtend/default.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, pytestCheckHook
+, scipy
+, numpy
+, scikitlearn
+, pandas
+, matplotlib
+, joblib
+}:
+
+buildPythonPackage rec {
+  pname = "mlxtend";
+  version = "0.17.3";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "rasbt";
+    repo = pname;
+    rev = version;
+    sha256 = "1515wgmj5rhwpmky7apmmvys1630sfg534fai6559s13hp11pdcl";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+  # image tests download files over the network
+  pytestFlagsArray = [ "-sv" "--ignore=mlxtend/image" ];
+  # Fixed in master, but failing in release version
+  # see: https://github.com/rasbt/mlxtend/pull/721
+  disabledTests = [ "test_variance_explained_ratio" ];
+
+  propagatedBuildInputs = [
+    scipy
+    numpy
+    scikitlearn
+    pandas
+    matplotlib
+    joblib
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A library of Python tools and extensions for data science";
+    homepage = "https://github.com/rasbt/mlxtend";
+    license= licenses.bsd3;
+    maintainers = with maintainers; [ evax ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d209c34bdd8f..94e7ec416517 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3754,6 +3754,8 @@ in {
 
   mlrose = callPackage ../development/python-modules/mlrose { };
 
+  mlxtend = callPackage ../development/python-modules/mlxtend { };
+
   mmh3 = callPackage ../development/python-modules/mmh3 { };
 
   mmpython = callPackage ../development/python-modules/mmpython { };

From b174be956ee298bafcff4cc8cb080cf2985055e5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 10:41:43 +0000
Subject: [PATCH 0917/3942] haproxy: 2.2.2 -> 2.2.4

---
 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 91112a2628e2..16670ea175f8 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
 
 stdenv.mkDerivation rec {
   pname = "haproxy";
-  version = "2.2.2";
+  version = "2.2.4";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
-    sha256 = "1mjld865p4f7i465fcc5c4jclih1c3345a3ylriql8668rd7071r";
+    sha256 = "1qhvaixns0xgxgd095kvqid0pi6jxsld9ghvnr60khwdzzadk947";
   };
 
   buildInputs = [ openssl zlib ]

From 5ff35fab0fc8dbdbebe34f36c0830578856e7398 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 2 Nov 2020 11:54:40 +0100
Subject: [PATCH 0918/3942] fixup! nss: make reproducible (#102156)

Fixes a precedence issue from fe9f55907e2a42b675e161de3d5e6a740385c479

`lib.optionalString <cond> 'text' + 'text2'` will always have 'text2' as
part of the result.
---
 pkgs/development/libraries/nss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 0c51fda53822..c7c87a436b51 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -134,7 +134,7 @@ in stdenv.mkDerivation rec {
     isCross = stdenv.hostPlatform != stdenv.buildPlatform;
     nss = if isCross then buildPackages.nss.tools else "$out";
   in
-  (stdenv.lib.optionalString enableFIPS ''
+  (stdenv.lib.optionalString enableFIPS (''
     for libname in freebl3 nssdbm3 softokn3
     do '' +
     (if stdenv.isDarwin
@@ -147,7 +147,7 @@ in stdenv.mkDerivation rec {
      '') + ''
         ${nss}/bin/shlibsign -v -i "$libfile"
     done
-  '') +
+  '')) +
   ''
     moveToOutput bin "$tools"
     moveToOutput bin/nss-config "$dev"

From 5e9dab5b2de86218547b98af1e0db95822230bc8 Mon Sep 17 00:00:00 2001
From: Sebastian Graf <sgraf1337@gmail.com>
Date: Mon, 2 Nov 2020 12:14:32 +0100
Subject: [PATCH 0919/3942] Update description of case.kak.nix

Probably Copy and pasted from `kak-buffers.nix`.
---
 pkgs/applications/editors/kakoune/plugins/case.kak.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/case.kak.nix b/pkgs/applications/editors/kakoune/plugins/case.kak.nix
index 20df2872628f..6a2ef200e6e1 100644
--- a/pkgs/applications/editors/kakoune/plugins/case.kak.nix
+++ b/pkgs/applications/editors/kakoune/plugins/case.kak.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    description = "Ease navigation between opened buffers in Kakoune";
+    description = "Case convention conversion for Kakoune";
     homepage = "https://gitlab.com/FlyingWombat/case.kak";
     license = licenses.unlicense;
     maintainers = with maintainers; [ eraserhd ];

From 92781c27bd16862e50f6e9b65a01d12d843cca59 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 2 Nov 2020 12:22:47 +0100
Subject: [PATCH 0920/3942] citrix_workspace: add pcsclite to
 `runtimeDependencies`

According to the vendor's documentation this is needed to enable
smartcard support[1].

[1] https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/customize/#smart-cards
---
 .../networking/remote/citrix-workspace/generic.nix             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 35085d422f26..c0dc438daacd 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -3,7 +3,7 @@
 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
 , gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
-, libpulseaudio
+, libpulseaudio, pcsclite
 
 , homepage, version, prefix, hash
 
@@ -103,6 +103,7 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = [
     glib
+    pcsclite
 
     xorg.libX11
     xorg.libXScrnSaver

From 8e4be5cb2fb9e2a4554912778d01210142f264d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 11:35:17 +0000
Subject: [PATCH 0921/3942] hr: 1.2 -> 1.3

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

diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix
index 91a66bc73781..a0555f9032e9 100644
--- a/pkgs/applications/misc/hr/default.nix
+++ b/pkgs/applications/misc/hr/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hr";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "LuRsT";
     repo = "hr";
     rev = version;
-    sha256 = "162vkip2772jl59lschpinimpg4ssiyg7fq0va5cx4d7wldpqmks";
+    sha256 = "068kq37lbqfjzh28rlvkprni38ii991naawylwvq6d43y9dpzs2b";
   };
 
   dontBuild = true;

From 3d40283367b16c5433d77327dc19b56107015a43 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 12:07:07 +0000
Subject: [PATCH 0922/3942] jmol: 14.31.3 -> 14.31.14

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

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index 6545472a5295..cba3f1d09463 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,14 +17,14 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "14.31.3";
+  version = "14.31.14";
   pname = "jmol";
 
   src = let
     baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
   in fetchurl {
     url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    sha256 = "067051wp9kgkgcy3mvqwxhim0h1qfcf4jk8vrbzd3y9pwmjismzy";
+    sha256 = "1qmy4iqn5xgd4m9hs4w9cn9rzkwmpgdb5azd93cypp05s4nmjsnm";
   };
 
   patchPhase = ''

From 41b0182e02665b2706fe7215cfc5a3f0297e177b Mon Sep 17 00:00:00 2001
From: nanashi0x74 <rian.lindenberger@mpq.se>
Date: Mon, 2 Nov 2020 13:19:43 +0100
Subject: [PATCH 0923/3942] openapi-generator-cli: 4.2.2 -> 4.3.1

---
 pkgs/tools/networking/openapi-generator-cli/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix
index 2b09fe901d07..4630342cf8ae 100644
--- a/pkgs/tools/networking/openapi-generator-cli/default.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "4.2.2";
+  version = "4.3.1";
   pname = "openapi-generator-cli";
 
   jarfilename = "${pname}-${version}.jar";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}";
-    sha256 = "1pafv432ll3pp52580pbnk0gnrm6byl5fkrf1rarhxfkpkr82yif";
+    sha256 = "1h9infspwbij9ahb376vc4ijakrqb7xww573ccrqvchxphbcsf7l";
   };
 
   phases = [ "installPhase" ];
@@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.shou ];
   };
 }
-

From 0c54b757e9c2eeeb086b0977b14dff4c456b7d4a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Nov 2020 14:01:01 +0100
Subject: [PATCH 0924/3942] qemu: apply patch for CVE-2020-27617

An assert(3) failure issue was found in the networking helper functions of QEMU. It could occur in the eth_get_gso_type() routine, if a packet does not have a valid networking L3 protocol (ex. IPv4, IPv6) value. A guest user may use this flaw to crash the QEMU process on the host resulting in DoS scenario.

Fixes: CVE-2020-27617
---
 .../virtualization/qemu/CVE-2020-27617.patch  | 43 +++++++++++++++++++
 .../virtualization/qemu/default.nix           |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/virtualization/qemu/CVE-2020-27617.patch

diff --git a/pkgs/applications/virtualization/qemu/CVE-2020-27617.patch b/pkgs/applications/virtualization/qemu/CVE-2020-27617.patch
new file mode 100644
index 000000000000..fa708b298365
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/CVE-2020-27617.patch
@@ -0,0 +1,43 @@
+From 6d19c0cc6c5a9bba308fc29d7c0edc2dc372c41b Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Wed, 21 Oct 2020 11:35:50 +0530
+Subject: [PATCH] net: remove an assert call in eth_get_gso_type
+
+eth_get_gso_type() routine returns segmentation offload type based on
+L3 protocol type. It calls g_assert_not_reached if L3 protocol is
+unknown, making the following return statement unreachable. Remove the
+g_assert call, it maybe triggered by a guest user.
+
+Reported-by: Gaoning Pan <pgn@zju.edu.cn>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+---
+ net/eth.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/net/eth.c b/net/eth.c
+index 0c1d413ee2..eee77071f9 100644
+--- a/net/eth.c
++++ b/net/eth.c
+@@ -16,6 +16,7 @@
+  */
+ 
+ #include "qemu/osdep.h"
++#include "qemu/log.h"
+ #include "net/eth.h"
+ #include "net/checksum.h"
+ #include "net/tap.h"
+@@ -71,9 +72,8 @@ eth_get_gso_type(uint16_t l3_proto, uint8_t *l3_hdr, uint8_t l4proto)
+             return VIRTIO_NET_HDR_GSO_TCPV6 | ecn_state;
+         }
+     }
+-
+-    /* Unsupported offload */
+-    g_assert_not_reached();
++    qemu_log_mask(LOG_GUEST_ERROR, "%s: probably not GSO frame, "
++        "unknown L3 protocol: 0x%04"PRIx16"\n", __func__, l3_proto);
+ 
+     return VIRTIO_NET_HDR_GSO_NONE | ecn_state;
+ }
+-- 
+2.28.0
+
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 3c8672057996..2bace4f258d7 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -82,6 +82,7 @@ stdenv.mkDerivation rec {
     ./no-etc-install.patch
     ./fix-qemu-ga.patch
     ./9p-ignore-noatime.patch
+    ./CVE-2020-27617.patch
   ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
     ++ optionals stdenv.hostPlatform.isMusl [
     (fetchpatch {

From 33cf4f0e8eea945984486d747cdf7c35b89ccf51 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 20 Oct 2020 14:06:37 +0000
Subject: [PATCH 0925/3942] nginx: factor out the generation of basic auth
 generation

---
 .../services/web-servers/nginx/default.nix       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index c0c2f27a00ef..ee1053698636 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -261,10 +261,7 @@ let
             ssl_trusted_certificate ${vhost.sslTrustedCertificate};
           ''}
 
-          ${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};
-          ''}
+          ${mkBasicAuth vhostName vhost}
 
           ${mkLocations vhost.locations}
 
@@ -295,7 +292,16 @@ let
       ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
     }
   '') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations)));
-  mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" (
+
+  mkBasicAuth = name: zone: optionalString (zone.basicAuthFile != null || zone.basicAuth != {}) (let
+    auth_file = if zone.basicAuthFile != null
+      then zone.basicAuthFile
+      else mkHtpasswd name zone.basicAuth;
+  in ''
+    auth_basic secured;
+    auth_basic_user_file ${auth_file};
+  '');
+  mkHtpasswd = name: authDef: pkgs.writeText "${name}.htpasswd" (
     concatStringsSep "\n" (mapAttrsToList (user: password: ''
       ${user}:{PLAIN}${password}
     '') authDef)

From c7bf3828f04e512a6ef2691f7e48d527961f3692 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 20 Oct 2020 14:11:21 +0000
Subject: [PATCH 0926/3942] nginx: add basic auth support for locations

---
 .../services/web-servers/nginx/default.nix    |  1 +
 .../web-servers/nginx/location-options.nix    | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index ee1053698636..e9630d379f36 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -290,6 +290,7 @@ let
       ${optionalString (config.return != null) "return ${config.return};"}
       ${config.extraConfig}
       ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
+      ${mkBasicAuth "sublocation" config}
     }
   '') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations)));
 
diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix
index 3d9e391ecf20..793f29f09fb1 100644
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixos/modules/services/web-servers/nginx/location-options.nix
@@ -9,6 +9,31 @@ with lib;
 
 {
   options = {
+    basicAuth = mkOption {
+      type = types.attrsOf types.str;
+      default = {};
+      example = literalExample ''
+        {
+          user = "password";
+        };
+      '';
+      description = ''
+        Basic Auth protection for a vhost.
+
+        WARNING: This is implemented to store the password in plain text in the
+        nix store.
+      '';
+    };
+
+    basicAuthFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        Basic Auth password file for a vhost.
+        Can be created via: <command>htpasswd -c &lt;filename&gt; &lt;username&gt;</command>
+      '';
+    };
+
     proxyPass = mkOption {
       type = types.nullOr types.str;
       default = null;

From a4b86b2bf5bd85f1695a8b47bd07657758de1722 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 20 Oct 2020 16:05:41 +0000
Subject: [PATCH 0927/3942] nginx: test basic auth

---
 nixos/tests/all-tests.nix  |  1 +
 nixos/tests/nginx-auth.nix | 47 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 nixos/tests/nginx-auth.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9ffeba27a7fe..4e4d8b5e6894 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -242,6 +242,7 @@ in
   nfs4 = handleTest ./nfs { version = 4; };
   nghttpx = handleTest ./nghttpx.nix {};
   nginx = handleTest ./nginx.nix {};
+  nginx-auth = handleTest ./nginx-auth.nix {};
   nginx-etag = handleTest ./nginx-etag.nix {};
   nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};
   nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {};
diff --git a/nixos/tests/nginx-auth.nix b/nixos/tests/nginx-auth.nix
new file mode 100644
index 000000000000..c0d24a20ddbc
--- /dev/null
+++ b/nixos/tests/nginx-auth.nix
@@ -0,0 +1,47 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+  name = "nginx-auth";
+
+  nodes = {
+    webserver = { pkgs, lib, ... }: {
+      services.nginx = let
+        root = pkgs.runCommand "testdir" {} ''
+          mkdir "$out"
+          echo hello world > "$out/index.html"
+        '';
+      in {
+        enable = true;
+
+        virtualHosts.lockedroot = {
+          inherit root;
+          basicAuth.alice = "jane";
+        };
+
+        virtualHosts.lockedsubdir = {
+          inherit root;
+          locations."/sublocation/" = {
+            alias = "${root}/";
+            basicAuth.bob = "john";
+          };
+        };
+      };
+    };
+  };
+
+  testScript = ''
+    webserver.wait_for_unit("nginx")
+    webserver.wait_for_open_port(80)
+
+    webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot")
+    webserver.succeed(
+        "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:jane@lockedroot"
+    )
+
+    webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir")
+    webserver.fail(
+        "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html"
+    )
+    webserver.succeed(
+        "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:john@lockedsubdir/sublocation/index.html"
+    )
+  '';
+})

From 3361a037b9c29254b611de76dbc14bded60a3bd8 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 2 Nov 2020 08:15:28 -0500
Subject: [PATCH 0928/3942] nginx: add a warning that nginx's basic auth isn't
 very good.

---
 .../services/web-servers/nginx/location-options.nix        | 7 +++++--
 nixos/modules/services/web-servers/nginx/vhost-options.nix | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix
index 793f29f09fb1..f2fc07255725 100644
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixos/modules/services/web-servers/nginx/location-options.nix
@@ -21,7 +21,7 @@ with lib;
         Basic Auth protection for a vhost.
 
         WARNING: This is implemented to store the password in plain text in the
-        nix store.
+        Nix store.
       '';
     };
 
@@ -30,7 +30,10 @@ with lib;
       default = null;
       description = ''
         Basic Auth password file for a vhost.
-        Can be created via: <command>htpasswd -c &lt;filename&gt; &lt;username&gt;</command>
+        Can be created via: <command>htpasswd -c &lt;filename&gt; &lt;username&gt;</command>.
+
+        WARNING: The generate file contains the users' passwords in a
+        non-cryptographically-securely hashed way.
       '';
     };
 
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 455854e2a965..cf211ea9a71b 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -198,7 +198,7 @@ with lib;
         Basic Auth protection for a vhost.
 
         WARNING: This is implemented to store the password in plain text in the
-        nix store.
+        Nix store.
       '';
     };
 
@@ -207,7 +207,10 @@ with lib;
       default = null;
       description = ''
         Basic Auth password file for a vhost.
-        Can be created via: <command>htpasswd -c &lt;filename&gt; &lt;username&gt;</command>
+        Can be created via: <command>htpasswd -c &lt;filename&gt; &lt;username&gt;</command>.
+
+        WARNING: The generate file contains the users' passwords in a
+        non-cryptographically-securely hashed way.
       '';
     };
 

From a41a6a8bb7abb65844c37920a01203456410178f Mon Sep 17 00:00:00 2001
From: IvarWithoutBones <ivar.scholten@protonmail.com>
Date: Mon, 2 Nov 2020 14:22:01 +0100
Subject: [PATCH 0929/3942] intel-media-sdk: 20.2.1 -> 20.3.1

---
 .../libraries/intel-media-sdk/default.nix            | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix
index 90f6b4d49b84..e59015832314 100644
--- a/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11
 , libXau, libXdmcp, libpthreadstubs }:
 
 stdenv.mkDerivation rec {
   pname = "intel-media-sdk";
-  version = "20.2.1";
+  version = "20.3.1";
 
-  src = fetchurl {
-    url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz";
-    sha256 = "0m3ipfdknpgrdwiywlinl4sfkfrvyv7wmq1j83pmbr54z067sgg1";
+  src = fetchFromGitHub {
+    owner = "Intel-Media-SDK";
+    repo = "MediaSDK";
+    rev = "intel-mediasdk-${version}";
+    sha256 = "13b698zp9b228x81yly0qx3zvj821niz3yad74b229i3z7rf8wzd";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From ef7fff6a49986fd67be37ef9cb1e7e0a84c589de Mon Sep 17 00:00:00 2001
From: Kir Ax <panswitcher@yandex.ru>
Date: Mon, 2 Nov 2020 21:13:09 +0700
Subject: [PATCH 0930/3942] textadept: moved to subdir for 10th version

---
 pkgs/applications/editors/textadept/{ => 10}/default.nix | 0
 pkgs/applications/editors/textadept/{ => 10}/deps.nix    | 0
 pkgs/top-level/all-packages.nix                          | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/applications/editors/textadept/{ => 10}/default.nix (100%)
 rename pkgs/applications/editors/textadept/{ => 10}/deps.nix (100%)

diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/10/default.nix
similarity index 100%
rename from pkgs/applications/editors/textadept/default.nix
rename to pkgs/applications/editors/textadept/10/default.nix
diff --git a/pkgs/applications/editors/textadept/deps.nix b/pkgs/applications/editors/textadept/10/deps.nix
similarity index 100%
rename from pkgs/applications/editors/textadept/deps.nix
rename to pkgs/applications/editors/textadept/10/deps.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6825cd25c2c..ac1cb1b88394 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7502,7 +7502,7 @@ in
 
   texstudio = libsForQt5.callPackage ../applications/editors/texstudio { };
 
-  textadept = callPackage ../applications/editors/textadept { };
+  textadept = callPackage ../applications/editors/textadept/10 { };
 
   texworks = libsForQt514.callPackage ../applications/editors/texworks { };
 

From 2f00a2b06660548f6a0fae97bbcb74b647de67d6 Mon Sep 17 00:00:00 2001
From: Kir Ax <panswitcher@yandex.ru>
Date: Mon, 2 Nov 2020 21:19:55 +0700
Subject: [PATCH 0931/3942] textadept-11: add textadept 11_beta

---
 .../editors/textadept/11/default.nix          | 53 +++++++++++++++++++
 .../editors/textadept/11/deps.nix             | 50 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 105 insertions(+)
 create mode 100644 pkgs/applications/editors/textadept/11/default.nix
 create mode 100644 pkgs/applications/editors/textadept/11/deps.nix

diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/11/default.nix
new file mode 100644
index 000000000000..487f1b3767f1
--- /dev/null
+++ b/pkgs/applications/editors/textadept/11/default.nix
@@ -0,0 +1,53 @@
+{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }:
+
+stdenv.mkDerivation rec {
+  version = "11.0_beta";
+  pname = "textadept11";
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    gtk2 ncurses glib unzip zip
+  ];
+
+  src = fetchFromGitHub {
+    name = "textadept11";
+    owner = "orbitalquark";
+    repo = "textadept";
+    rev = "8da5f6b4a13f14b9dd3cb9dc23ad4f7bf41e91c1";
+    sha256 = "0v11v3x8g6v696m3l1bm52zy2g9xzz7hlmn912sn30nhcag3raxs";
+  };
+
+  preConfigure =
+    lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params:
+      "ln -s ${fetchurl params} $PWD/src/${name}"
+    ) (import ./deps.nix)) + ''
+
+    cd src
+    make deps
+  '';
+
+  postBuild = ''
+    make curses
+  '';
+
+  preInstall = ''
+    mkdir -p $out/share/applications
+    mkdir -p $out/share/pixmaps
+  '';
+
+  postInstall = ''
+    make curses install PREFIX=$out MAKECMDGOALS=curses
+  '';
+
+  makeFlags = [
+    "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "An extensible text editor based on Scintilla with Lua scripting. Version 11_beta";
+    homepage = "http://foicica.com/textadept";
+    license = licenses.mit;
+    maintainers = with maintainers; [ raskin mirrexagon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/editors/textadept/11/deps.nix b/pkgs/applications/editors/textadept/11/deps.nix
new file mode 100644
index 000000000000..2ab72574bbd0
--- /dev/null
+++ b/pkgs/applications/editors/textadept/11/deps.nix
@@ -0,0 +1,50 @@
+{
+    "scintilla445.tgz" = {
+      url = "https://www.scintilla.org/scintilla445.tgz";
+      sha256 = "1v1kyxj7rv5rxadbg8gl8wh1jafpy7zj0wr6dcyxq9209dl6h8ag";
+    };
+    "9e2ffa159299899c9345aea15c17ba1941953871.zip" = {
+      url = "https://github.com/orbitalquark/scinterm/archive/9e2ffa159299899c9345aea15c17ba1941953871.zip";
+      sha256 = "12h7prgp689w45p4scxd8vvsyw8fkv27g6gvgis55xr44daa6122";
+    };
+    "scintillua_4.4.5-1.zip" = {
+      url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-1.zip";
+      sha256 = "095wpbid2kvr5xgkhd5bd4sd7ljgk6gd9palrjkmdcwfgsf1lp04";
+    };
+    "lua-5.3.5.tar.gz" = {
+      url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz";
+      sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc";
+    };
+    "lpeg-1.0.2.tar.gz" = {
+      url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
+      sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8";
+    };
+    "v1_7_0_2.zip" = {
+      url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip";
+      sha256 = "0y44ymc7higz5dd2w3c6ib7mwmpr6yvszcl7lm12nf8x3y4snx4i";
+    };
+    "64587546482a1a6324706d75c80b77d2f87118a4.zip" = {
+      url = "https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip";
+      sha256 = "10mglbnn8r1cakqn9h285pwfnh7kfa98v7j8qh83c24n66blyfh9";
+    };
+    "cdk-5.0-20150928.tgz" = {
+      url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz";
+      sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
+    };
+    "libtermkey-0.20.tar.gz" = {
+      url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz";
+      sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc";
+    };
+    "pdcurs39.zip" = {
+      url = "https://github.com/wmcbrine/PDCurses/archive/3.9.zip";
+      sha256 = "0ydsa15d6fgk15zcavbxsi4vj3knlr2495dc5v4f5xzvv2qwlb2w";
+    };
+    "bombay.zip" = {
+      url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip";
+      sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h";
+    };
+    "cloc-1.60.pl" = {
+      url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl";
+      sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a";
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac1cb1b88394..ac7cc62fc59c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7504,6 +7504,8 @@ in
 
   textadept = callPackage ../applications/editors/textadept/10 { };
 
+  textadept11 = callPackage ../applications/editors/textadept/11 { };
+
   texworks = libsForQt514.callPackage ../applications/editors/texworks { };
 
   thc-hydra = callPackage ../tools/security/thc-hydra { };

From f352109086994421bbd4bc09e9c0481d20fda70e Mon Sep 17 00:00:00 2001
From: CrystalGamma <user@talos-nixos.local>
Date: Tue, 20 Oct 2020 11:15:03 +0200
Subject: [PATCH 0932/3942] jsoncpp: 1.9.2 -> 1.9.4

Merges both patches previously applied. Also seems to change the path that the library is written to.
---
 .../development/libraries/jsoncpp/default.nix | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 5e361a09d357..73aaaec4e4c4 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -2,13 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "jsoncpp";
-  version = "1.9.2";
+  version = "1.9.4";
+
+  outputs = ["out" "dev"];
 
   src = fetchFromGitHub {
     owner = "open-source-parsers";
     repo = "jsoncpp";
     rev = version;
-    sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg";
+    sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
   };
 
   /* During darwin bootstrap, we have a cp that doesn't understand the
@@ -23,30 +25,17 @@ stdenv.mkDerivation rec {
   # Hack to be able to run the test, broken because we use
   # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install
   preBuild = if stdenv.isDarwin then ''
-    export DYLD_LIBRARY_PATH="`pwd`/src/lib_json''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
+    export DYLD_LIBRARY_PATH="$PWD/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
   '' else ''
-    export LD_LIBRARY_PATH="`pwd`/src/lib_json''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="$PWD/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
   '';
 
   nativeBuildInputs = [ cmake python validatePkgConfig ];
 
-  patches = [
-    # Fix generation of pkg-config file (https://github.com/open-source-parsers/jsoncpp/pull/1199)
-    (fetchpatch {
-      url = "https://github.com/open-source-parsers/jsoncpp/commit/b05a21342a646a986b11c28ba6b19665756d21d2.patch";
-      sha256 = "0dn4cvvkcp9mnxbzyaqb49z6bv5yqsx1wlf1lyki1n2rni2hn63p";
-    })
-  ] ++ stdenv.lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [
-    # fix inverted sense in isAnyCharRequiredQuoting on arm. See: https://github.com/open-source-parsers/jsoncpp/pull/1120
-    (fetchpatch {
-      url = "https://github.com/open-source-parsers/jsoncpp/commit/9093358efae9e5981aa60013487fc7215f040a59.patch";
-      sha256 = "1wiqp70sck2md14sfc0zdkblqk9750cl55ykf9d6b9vs1ifzzzq5";
-     })
-  ];
-
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
     "-DBUILD_STATIC_LIBS=OFF"
+    "-DBUILD_OBJECT_LIBS=OFF"
     "-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
   ];
 

From 9843da727bd3aa9ef1f079417ddc672ee8b19273 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Nov 2020 16:23:21 +0100
Subject: [PATCH 0933/3942] =?UTF-8?q?gnome3.gpaste:=203.38.2=20=E2=86=92?=
 =?UTF-8?q?=203.38.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.imagination-land.org/posts/2020-11-02-gpaste-3.38.3-released.html
---
 pkgs/desktops/gnome-3/misc/gpaste/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index 0f4b8174405f..0071d2415c14 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -17,14 +17,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.38.2";
+  version = "3.38.3";
   pname = "gpaste";
 
   src = fetchFromGitHub {
     owner = "Keruspe";
     repo = "GPaste";
     rev = "v${version}";
-    sha256 = "1dnvwsmlayrhh9zd4v57kc9k03jhv7i0zyv0fbspzp4msmnb1w2x";
+    sha256 = "10ag0mrr4r40414nyarghpgjawvf331asxgq47dqjfxr5w7bz6wc";
   };
 
   patches = [

From e0dfa4f786a6c1b9e3aef758f912ff1231955b26 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 15:44:31 +0000
Subject: [PATCH 0934/3942] kpt: 0.35.0 -> 0.36.1

---
 pkgs/applications/networking/cluster/kpt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix
index 9b43f143bdc9..e50f6e3462c1 100644
--- a/pkgs/applications/networking/cluster/kpt/default.nix
+++ b/pkgs/applications/networking/cluster/kpt/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kpt";
-  version = "0.35.0";
+  version = "0.36.1";
 
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0pk4j809hh4hkr58wx42vyzcn2g7l2lb60f4j1837hkk3rwrxkpm";
+    sha256 = "0j9a7lxspgw63xzz1f8r5fb67jxm5isdvfi5450v20virxch9afi";
   };
 
-  vendorSha256 = "0c5ycyjhzz18ny544ddrag39la0fl0d3zrbbv8szb5jx87jx67jj";
+  vendorSha256 = "06kx85bf8mjmyhz5gp0la4fr8psnfz6i2rchc22sz2pgmsng1dfr";
 
   subPackages = [ "." ];
 

From 4b6ad1bdf2f32f304c28683e53c4eede1e74ce70 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 26 Oct 2020 00:01:04 +0000
Subject: [PATCH 0935/3942] omnisharp-roslyn: 1.37.1 -> 1.37.3

---
 pkgs/development/tools/omnisharp-roslyn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
index c435d80b08fc..24631481fde2 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   pname = "omnisharp-roslyn";
-  version = "1.37.1";
+  version = "1.37.3";
 
   src = fetchurl {
     url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz";
-    sha256 = "04pyychzwhhcv0js0qyramz6nd0wz03qqqgvz1j9m9wxyiz0dv3c";
+    sha256 = "09h4yxswrpxw9w4wscarbv2gypk9bwwsmpqyjfp6b5bh1frx2i67";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ea2535cb8bb32509ec5c78b6c04383b5c3b73e25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 11:23:25 +0000
Subject: [PATCH 0936/3942] clevis: 14 -> 15

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

diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix
index 878e4fc9febf..0b8f50c11901 100644
--- a/pkgs/tools/security/clevis/default.nix
+++ b/pkgs/tools/security/clevis/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "clevis";
-  version = "14";
+  version = "15";
 
   src = fetchFromGitHub {
     owner = "latchset";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1j8id67jk3ikim2xh7vjg7j2ayrpm1a4n8v3n8r8pnr4rhqy76fd";
+    sha256 = "0wfgd2v1r47ckh5qp60b903191fx0fa27zyadxlsb8riqszhmwvz";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig asciidoc ];

From 4a8bbb98b49088228cc90d98b285acdb120c8e0c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 23:13:36 +0000
Subject: [PATCH 0937/3942] nix-build-uncached: 1.0.0 -> 1.0.1

---
 pkgs/development/tools/misc/nix-build-uncached/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix
index eca2dc966624..6f7c146558c1 100644
--- a/pkgs/development/tools/misc/nix-build-uncached/default.nix
+++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "nix-build-uncached";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-build-uncached";
     rev = "v${version}";
-    sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02";
+    sha256 = "1gfnlqh7ky0ynd6jwks2g3y04by10cad58chkddk1waq23j0a24v";
   };
 
   vendorSha256 = null;

From 3f1cd94a2431ad4dfa1bc2dbb373c30234d8b475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 26 Oct 2020 06:08:11 +0100
Subject: [PATCH 0938/3942] nix-build-uncached: 1.0.1 -> 1.0.2

---
 pkgs/development/tools/misc/nix-build-uncached/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix
index 6f7c146558c1..6450ee433857 100644
--- a/pkgs/development/tools/misc/nix-build-uncached/default.nix
+++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "nix-build-uncached";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-build-uncached";
     rev = "v${version}";
-    sha256 = "1gfnlqh7ky0ynd6jwks2g3y04by10cad58chkddk1waq23j0a24v";
+    sha256 = "0hjx2gdwzg02fzxhsf7akp03vqj2s7wmcv9xfqn765zbqnljz14v";
   };
 
   vendorSha256 = null;

From d1ca65eb68e106dc7ba6471cdac866b0a0838fdc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 26 Oct 2020 01:33:35 +0000
Subject: [PATCH 0939/3942] openxr-loader: 1.0.11 -> 1.0.12

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

diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix
index e03752872f9a..9e38f1e828df 100644
--- a/pkgs/development/libraries/openxr-loader/default.nix
+++ b/pkgs/development/libraries/openxr-loader/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openxr-loader";
-  version = "1.0.11";
+  version = "1.0.12";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenXR-SDK-Source";
     rev = "release-${version}";
-    sha256 = "0f3x5h0hdjiqgjf5mzzlprbhrbyabxllrjmlzgc9fv5rgqyyphj5";
+    sha256 = "0xcra2hcsm88rfd7zf52hccx3nvg9j65a595z7c0lrzv6jz04676";
   };
 
   nativeBuildInputs = [ cmake python3 ];

From 079523587df0c1c03f6d484c37ab6ed3883785ce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 06:45:48 +0000
Subject: [PATCH 0940/3942] python37Packages.telethon-session-sqlalchemy:
 0.2.15 -> 0.2.16

---
 .../python-modules/telethon-session-sqlalchemy/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
index ccacb9157e21..20fa793a8a63 100644
--- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "telethon-session-sqlalchemy";
-  version = "0.2.15";
+  version = "0.2.16";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2ba603d95d5be6ddecd8ecaeaffba00b75b49dd80eb77f6228dd7b793ca67fd2";
+    sha256 = "f847c57302a102eb88e29ed95b8f4efa69582db2966fd806c21376b9a66ad4a8";
   };
 
   propagatedBuildInputs = [

From 8b56e9daf5fc6f39b73026eddb5c639a2022a370 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 11:45:04 +0000
Subject: [PATCH 0941/3942] codeql: 2.3.1 -> 2.3.2

---
 pkgs/development/tools/analysis/codeql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index 811c2b2463f1..ba50f643ab40 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.3.1";
+  version = "2.3.2";
 
   dontConfigure = true;
   dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    sha256 = "1wbqccvj2a31b3h44rfanjrcv9gm4jl60a66mpxrbfjpmkd5hl35";
+    sha256 = "1fzybh21jw02gdmqkh54gin4chqxj5r5alkrqk1wcryhf73brsbb";
   };
 
   nativeBuildInputs = [

From 0b8ca5644aa61a185b0e6dc5f44286338f6c878e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 24 Oct 2020 19:44:42 +0000
Subject: [PATCH 0942/3942] cproto: 4.7p -> 4.7q

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

diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix
index ef0e2cab7771..e18196fe595f 100644
--- a/pkgs/development/tools/misc/cproto/default.nix
+++ b/pkgs/development/tools/misc/cproto/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "cproto";
-  version = "4.7p";
+  version = "4.7q";
 
   src = fetchurl {
     urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       # No version listings and apparently no versioned tarball over http(s).
       "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
     ];
-    sha256 = "0vm1784yw8gax1r7bzgq0chjgfzwxvmkala2awghmd3zyi7k60nj";
+    sha256 = "138n5j6lkanbbdcs63irzxny4nfgp0zk66z621xjbnybf920svpk";
   };
 
   # patch made by Joe Khoobyar copied from gentoo bugs

From dac94664e24a2eee86a32f3ffe8d20c0448bb500 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 21:09:36 +0000
Subject: [PATCH 0943/3942] minder: 1.9.2 -> 1.11.3

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

diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix
index 14b9ebfe4c7d..bf94ac429947 100644
--- a/pkgs/applications/misc/minder/default.nix
+++ b/pkgs/applications/misc/minder/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "minder";
-  version = "1.9.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "phase1geo";
     repo = pname;
     rev = version;
-    sha256 = "0lhwwx515f0ycpinkhgbjnik7dj2c7fckikbgzwkzzs25xqp9ayj";
+    sha256 = "137kyf82n5a2v0cm9q02rhv8rmbjgnj60h64prq90h0d42prj3gd";
   };
 
   nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ];

From de53dd6d6b646430d47d566fba9f0ab8a19e7246 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 17:10:52 +0000
Subject: [PATCH 0944/3942] leatherman: 1.12.1 -> 1.12.2

---
 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 4623e5ca70ef..75cb2db4f1b5 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "leatherman";
-  version = "1.12.1";
+  version = "1.12.2";
 
   src = fetchFromGitHub {
-    sha256 = "1mgd7jqfg6f0y2yrh2m1njlwrpd15kas88776jdd5fsl7gvb5khn";
+    sha256 = "1iz8w0q4m7dqshjqfbwxwrasabs4j8jlil4w3kxdr3v9ldkl4v3d";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";

From 9190daba45c50e7c704aedcfb7438ef4938c0343 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 16:05:31 +0000
Subject: [PATCH 0945/3942] i3-gaps: 4.18.2 -> 4.18.3

---
 pkgs/applications/window-managers/i3/gaps.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index fa1c97c14c1d..755ceb42161c 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -3,11 +3,11 @@
 i3.overrideAttrs (oldAttrs : rec {
 
   name = "i3-gaps-${version}";
-  version = "4.18.2";
+  version = "4.18.3";
 
   src = fetchurl {
     url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2";
-    sha256 = "0lz08wf4b0yprzqsmymn94kiyg885dcwmh0p64v2rnf52s165g2g";
+    sha256 = "1hcakwyz78lgp8mhqv7pw86jlb3m415pfql1q19rkijnhm3fn3ci";
   };
 
   nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];

From 1955ef11c937f731bb744307a553c7b866253d6c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 20:18:51 +0000
Subject: [PATCH 0946/3942] mandelbulber: 2.22 -> 2.23

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

diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix
index a3ab52ba8715..384ddac5b4c5 100644
--- a/pkgs/applications/graphics/mandelbulber/default.nix
+++ b/pkgs/applications/graphics/mandelbulber/default.nix
@@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null;
 
 mkDerivation rec {
   pname = "mandelbulber";
-  version = "2.22";
+  version = "2.23";
 
   src = fetchFromGitHub {
     owner = "buddhi1980";
     repo = "mandelbulber2";
     rev = version;
-    sha256 = "011y2nl0jakf29cxprjmj1ifqc9iva61q5f4kk47b03gq7jw8sl4";
+    sha256 = "08izphj7jyk3wsq3qbzaf2fplys80vr39wliqc1i4c5cr90nrq1l";
   };
 
   nativeBuildInputs = [

From 4f1639bc516f59e62be6b381e9cdbf7fdbdc55ac Mon Sep 17 00:00:00 2001
From: Frank Doepper <woffs@woffs.de>
Date: Sun, 27 Sep 2020 21:21:55 +0200
Subject: [PATCH 0947/3942] shotcut: 20.09.13 -> 20.10.31

see https://github.com/mltframework/shotcut/releases

also disable upgrade prompt
as suggested by @ddennedy in https://github.com/NixOS/nixpkgs/issues/99851
---
 pkgs/applications/video/shotcut/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index f1d77fb7d147..188d49a791ec 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -9,13 +9,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.22.1";
 
 mkDerivation rec {
   pname = "shotcut";
-  version = "20.09.13";
+  version = "20.10.31";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "1q7ba6j3b2yzn3y5z9s5ldh15wrvhi6vymhwm910nqa5379dcc21";
+    sha256 = "16ypq1v396pibhh33nm78p6hr5fz3h74l0ykg9f72b8whw23jyz6";
   };
 
   enableParallelBuilding = true;
@@ -27,7 +27,11 @@ mkDerivation rec {
   ];
 
   NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt";
-  qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" ];
+  qmakeFlags = [
+    "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease"
+    "SHOTCUT_VERSION=${version}"
+    "DEFINES+=SHOTCUT_NOUPGRADE"
+  ];
 
   prePatch = ''
     sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp

From c8f952fe546308470bc6d44e9b2cb75cb298d44a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 01:15:05 +0000
Subject: [PATCH 0948/3942] plex-mpv-shim: 1.8.0 -> 1.9.0

---
 pkgs/applications/video/plex-mpv-shim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix
index 16e6cd826ec8..e25c101b5dfb 100644
--- a/pkgs/applications/video/plex-mpv-shim/default.nix
+++ b/pkgs/applications/video/plex-mpv-shim/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonApplication rec {
   pname = "plex-mpv-shim";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "iwalton3";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0fi0glnl7nr6754r9jk7d7dsnjbdm7civvhcj2l009yxiv2rxzj3";
+    sha256 = "06i6pp4jg0f9h6ash60fj1l5mbsdw3zyx7c6anbsrn86802i7paa";
   };
 
   propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ];

From 51a5874231698a0d471b7a42f0be577113a91775 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 22 Oct 2020 13:30:32 +0000
Subject: [PATCH 0949/3942] byacc: 20200330 -> 20200910

---
 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 be526085b757..60e6796850c2 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "byacc";
-  version = "20200330";
+  version = "20200910";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz"
       "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz"
     ];
-    sha256 = "1c0zyn6v286i09jlc8gx6jyaa5438qyy985rqsd76kb8ibfy56g0";
+    sha256 = "0c6gbvlgzi6yflri22w7fa2w3k5m3jk0xb5a43f3vwpa783hcn8a";
   };
 
   configureFlags = [

From 56d0b47ae7417320b8b05064a849aab16ed59ca9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 21:25:36 +0000
Subject: [PATCH 0950/3942] minio-client: 2020-08-08T02-33-58Z ->
 2020-10-03T02-54-56Z

---
 pkgs/tools/networking/minio-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 505ecc4c2224..ba715571000f 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "minio-client";
-  version = "2020-08-08T02-33-58Z";
+  version = "2020-10-03T02-54-56Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "15bkl3q0jidrwy04l0cdmha43r9wlxmlqkhmwz98b57rjrq6grql";
+    sha256 = "0pc08w0xdkk9w8xya0q7d1601wprshq852419pwpi8hd7y3q381h";
   };
 
-  vendorSha256 = "1fsx8zl2qkyf1gx3s6giccd86xawx9d1h4jdnyn1m36clsq9jkpc";
+  vendorSha256 = "0bkidqcdfjyqjlzxy9w564c6s3vw850wgq6ksx5y1p8f5r4plzxs";
 
   doCheck = false;
 

From e6e6578623306610aa370ec5b5df883d9e68a278 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 16:13:59 +0000
Subject: [PATCH 0951/3942] keepalived: 2.1.3 -> 2.1.5

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

diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index 11ebe228be88..b773e116d8be 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "keepalived";
-  version = "2.1.3";
+  version = "2.1.5";
 
   src = fetchFromGitHub {
     owner = "acassen";
     repo = "keepalived";
     rev = "v${version}";
-    sha256 = "1zdfvicpll7a5iw6p12pmdcg8y30mr0j5miycn0nhjp8yzi9hdc5";
+    sha256 = "0zdh3g491mlc0x4g8q09vq62a7pb8n13a39jnfdgrm9k29khn0sj";
   };
 
   buildInputs = [

From 974d291dea06cd609a650f72030b58332b656f15 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 18:24:30 +0000
Subject: [PATCH 0952/3942] libp11: 0.4.10 -> 0.4.11

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

diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index 4bf0b020118d..a1e6d05440c0 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libp11";
-  version = "0.4.10";
+  version = "0.4.11";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "libp11";
     rev = "${pname}-${version}";
-    sha256 = "1m4aw45bqichhx7cn78d8l1r1v0ccvwzlfj09fay2l9rfic5jgfz";
+    sha256 = "0hcl706i04nw5c1sj7l6sj6m0yjq6qijz345v498jll58fp5wif8";
   };
 
   configureFlags = [

From d3a12ae060d0e5c9e242ae0489e659525c7bf89f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 06:30:47 +0000
Subject: [PATCH 0953/3942] python37Packages.sshtunnel: 0.1.5 -> 0.2.1

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

diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix
index ff9d77bc7820..f37ba1545748 100644
--- a/pkgs/development/python-modules/sshtunnel/default.nix
+++ b/pkgs/development/python-modules/sshtunnel/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.1.5";
+  version = "0.2.1";
   pname = "sshtunnel";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jcjppp6mdfsqrbfc3ddfxg1ybgvkjv7ri7azwv3j778m36zs4y8";
+    sha256 = "ce28bf9abe6c6b00c5d10343a68c1325f8409ebfb9bf1c1d863a31afa3983cd7";
   };
 
   propagatedBuildInputs = [ paramiko ];

From dd67766f543441efa13771fdcdac258554ac9d14 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 08:11:17 -0800
Subject: [PATCH 0954/3942] azure-cli: pin sshtunnel

---
 pkgs/tools/admin/azure-cli/python-packages.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index f13e37d89e97..ca094137d7f8 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -411,6 +411,17 @@ let
         };
       });
 
+      sshtunnel = super.sshtunnel.overridePythonAttrs(oldAttrs: rec {
+        name = "sshtunnel-${version}";
+        version = "0.1.5";
+
+        src = super.fetchPypi {
+          inherit (oldAttrs) pname;
+          inherit version;
+          sha256 = "0jcjppp6mdfsqrbfc3ddfxg1ybgvkjv7ri7azwv3j778m36zs4y8";
+        };
+      });
+
       websocket_client = super.websocket_client.overridePythonAttrs(oldAttrs: rec {
         version = "0.56.0";
 

From 2702aced5e9cfd404c1592555ceda0499f52762f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 11:06:29 +0000
Subject: [PATCH 0955/3942] charliecloud: 0.19 -> 0.20

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

diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix
index a7e8260765fe..d6cbc25d883b 100644
--- a/pkgs/applications/virtualization/charliecloud/default.nix
+++ b/pkgs/applications/virtualization/charliecloud/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
 
-  version = "0.19";
+  version = "0.20";
   pname = "charliecloud";
 
   src = fetchFromGitHub {
     owner = "hpc";
     repo = "charliecloud";
     rev = "v${version}";
-    sha256 = "1rmvm0s1jdpzfg32b3hwsbdkzws7gsy4xq227hmzv3n2dv64svm6";
+    sha256 = "15ihffwhpjnzgz0ir5vc9la4fwkqj91vmrcsb2r58ikq7h9sk45j";
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper ];

From 41e1c236bf7281c72b135fe037b1528d0f834761 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 12:55:33 +0000
Subject: [PATCH 0956/3942] cytoscape: 3.8.1 -> 3.8.2

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

diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
index 12cdeb453d7a..647492bbe318 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cytoscape";
-  version = "3.8.1";
+  version = "3.8.2";
 
   src = fetchurl {
     url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz";
-    sha256 = "006g0w29sccg5h0zlrxdp3lx4vx1bfdhx2cms6aah85r5b82wgkf";
+    sha256 = "0zgsq9qnyvmq96pgf7372r16rm034fd0r4qa72xi9zbd4f2r7z8w";
   };
 
   patches = [

From 3b70b694767d2a342a80b79a713cba7f3774e449 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 22 Oct 2020 13:40:18 +0000
Subject: [PATCH 0957/3942] catch2: 2.12.3 -> 2.13.2

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

diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index 49b2e9be02ca..6d6282debf97 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "2.12.3";
+  version = "2.13.2";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     rev = "v${version}";
-    sha256="0rp30754frp88wbl17ksr40mmffw5xibq73blgx9jj42d7nl891x";
+    sha256="100r0kmra8jmra2hv92lzvwcmphpaiccwvq3lpdsa5b7hailhach";
   };
 
   nativeBuildInputs = [ cmake ];

From f06af68d0f531aa8d822172f0616e0a181470eae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 12:03:37 +0000
Subject: [PATCH 0958/3942] coredns: 1.7.1 -> 1.8.0

---
 pkgs/servers/dns/coredns/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 6b3d35e36389..ff0211d37e7c 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "coredns";
-  version = "1.7.1";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "coredns";
     repo = "coredns";
     rev = "v${version}";
-    sha256 = "0ggkpdlwrmyaicn61qyx4m5svmw7px0gfwl8mhhif8dfmjznfkir";
+    sha256 = "04hkz70s5i7ndwyg39za3k83amvmi90rkjm8qp3w3a8fbmq4q4y6";
   };
 
-  vendorSha256 = "0fzgqgfmyqfyap0j81ihag0319cq34k3y0a9rxkg9cg23hn1d5gf";
+  vendorSha256 = "1zwrf2pshb9r3yvp7mqali47163nqhvs9ghflczfpigqswd1m0p0";
 
   doCheck = false;
 

From d390372c1964fdc5e18676ead1c87b646b2d4b58 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 15:08:22 +0000
Subject: [PATCH 0959/3942] fluent-bit: 1.6.0 -> 1.6.2

---
 pkgs/tools/misc/fluent-bit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 174c0f42684f..51b58a8102de 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "1.6.0";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "1m8ly2h52mw67kqc7qqpf7sxxnyk4fnw2qavjpj6zgw3i6dhj0p1";
+    sha256 = "0v2n43mn6n4nn6r2d4ksp98793xkx334xp078vhvgi01nsmd60x7";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From e99270812fe82647c214543901025713789aaaf6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 29 Oct 2020 12:48:33 +0000
Subject: [PATCH 0960/3942] cutelyst: 2.12.0 -> 2.13.0

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

diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix
index d5e83f0410c4..1befa89c7d05 100644
--- a/pkgs/development/libraries/cutelyst/default.nix
+++ b/pkgs/development/libraries/cutelyst/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cutelyst";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "cutelyst";
     repo = "cutelyst";
     rev = "v${version}";
-    sha256 = "1ngacc7ackp08hajby0xvzpvnqahwm2dbxmisw7j7qs1lqrx9k3n";
+    sha256 = "1xbw8ag3iwm69dhrsg54anrlzvvflj6pwsj42z6hrl0yckabn99z";
   };
 
   nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];

From ccabae32dd3ee4afab4d3dba3b469034d5c6a31b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 01:18:05 +0000
Subject: [PATCH 0961/3942] gtkwave: 3.3.106 -> 3.3.107

---
 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 36cc19142d19..ad5e9e55c575 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gtkwave";
-  version = "3.3.106";
+  version = "3.3.107";
 
   src = fetchurl {
     url    = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
-    sha256 = "0ma53s27735x16dq5qi91kvlypkiwkxh2jhw0gziyccnk1mkdsji";
+    sha256 = "0ma30jyc94iid3v3m8aw4i2lyiqfxkpsdvdmmaibynk400cbzivl";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From e07dc55964a2ba57afe03f654f1f70f1783436d7 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 2 Nov 2020 19:15:50 +0300
Subject: [PATCH 0962/3942] cdesktopenv: fix build w/glibc-2.32

---
 ...cated-sys_errlist-and-replace-with-A.patch | 336 ++++++++++++++++++
 pkgs/desktops/cdesktopenv/default.nix         |   6 +-
 2 files changed, 340 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch

diff --git a/pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch b/pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch
new file mode 100644
index 000000000000..4382cdcf35b0
--- /dev/null
+++ b/pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch
@@ -0,0 +1,336 @@
+From 67f62e5a8acd70d30f7067f1f44ac7b15c67011a Mon Sep 17 00:00:00 2001
+From: Peter Howkins <flibble@users.sf.net>
+Date: Mon, 2 Nov 2020 05:30:08 +0000
+Subject: [PATCH] all: remove deprecated sys_errlist[] and replace with ANSI C
+ strerror()
+
+---
+ cde/config/imake/imake.c                            | 13 -------------
+ cde/lib/tt/bin/dbck/spec.C                          |  8 --------
+ cde/lib/tt/lib/tt_options.h                         | 12 ------------
+ cde/programs/dtcm/dtcm/dnd.c                        |  4 ----
+ cde/programs/dtcm/libDtCmP/util.c                   |  5 +----
+ .../dthelp/parser.ccdf/volumegen/Volumegen.c        |  1 -
+ cde/programs/dtimsstart/remote.c                    |  4 ----
+ cde/programs/dtimsstart/start.c                     | 12 +++---------
+ cde/programs/dtinfo/dtinfo/src/external-api/comm.c  |  5 +----
+ .../dtksh/ksh93/src/lib/libast/string/fmterror.c    |  9 +--------
+ .../dtksh/ksh93/src/lib/libast/string/strerror.c    |  8 +-------
+ cde/programs/dtlogin/dm.h                           |  7 +------
+ 12 files changed, 8 insertions(+), 80 deletions(-)
+
+diff --git a/cde/config/imake/imake.c b/cde/config/imake/imake.c
+index 574af7c7..83834aa7 100644
+--- a/cde/config/imake/imake.c
++++ b/config/imake/imake.c
+@@ -242,19 +242,6 @@ extern int	errno;
+ #include <stdarg.h>
+ #include "imakemdep.h"
+ 
+-/*
+- * This define of strerror is copied from (and should be identical to)
+- * Xos.h, which we don't want to include here for bootstrapping reasons.
+- */
+-#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4))
+-# ifndef strerror
+-extern char *sys_errlist[];
+-extern int sys_nerr;
+-#  define strerror(n) \
+-    (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error")
+-# endif
+-#endif
+-
+ #define	TRUE		1
+ #define	FALSE		0
+ 
+diff --git a/cde/lib/tt/bin/dbck/spec.C b/cde/lib/tt/bin/dbck/spec.C
+index 18bba3fb..eaf2d6b7 100644
+--- a/cde/lib/tt/bin/dbck/spec.C
++++ b/lib/tt/bin/dbck/spec.C
+@@ -44,14 +44,6 @@
+ #include "ttdbck.h"
+ #include "tt_db_server_consts.h"
+ 
+-#if !defined(OPT_STRERROR)
+-// No strerror(), fake it
+-char *
+-strerror(int e)
+-{
+-	return ((e<sys_nerr) ? sys_errlist[e] : "unknown");
+-}
+-#endif
+ 
+ Spec::
+ Spec()     
+diff --git a/cde/lib/tt/lib/tt_options.h b/cde/lib/tt/lib/tt_options.h
+index e23bb9e5..de3a30e2 100644
+--- a/cde/lib/tt/lib/tt_options.h
++++ b/lib/tt/lib/tt_options.h
+@@ -107,10 +107,6 @@
+  * OPT_CPP_OPTIONS - string, options to pass to cpp. For example, on
+  *   some platforms -B is used so C++ comments are processed by cpp.
+  *
+- *
+- * OPT_STRERROR - set if strerror() is available, otherwise we assume
+- *   global symbol sys_errlist is defined in errno.h.
+- *
+  * OPT_SVR4_GETMNTENT - set to use new SVR4 flavor of getmntent.
+  *
+  * OPT_LOCKF_MNTTAB - set to hold a lockf lock on MNTTAB while doing
+@@ -242,7 +238,6 @@
+ # undef  OPT_SYSINFO
+ # define OPT_CPP_PATH		"/usr/ccs/lib/cpp"
+ # define OPT_CPP_OPTIONS	""
+-# define OPT_STRERROR
+ # undef  OPT_SVR4_GETMNTENT
+ # undef  OPT_LOCKF_MNTENT
+ # define OPT_DEFINE_SIG_PF
+@@ -273,7 +268,6 @@
+ # undef  OPT_SYSINFO
+ # define OPT_CPP_PATH		"/usr/lib/cpp"
+ # define OPT_CPP_OPTIONS	 "-B"
+-# undef  OPT_STRERROR
+ # undef  OPT_SVR4_GETMNTENT
+ # undef  OPT_LOCKF_MNTENT
+ # define OPT_LOCAL_MOUNT_TYPE	MNTTYPE_42
+@@ -302,7 +296,6 @@
+ # define OPT_CATGETS
+ # undef  OPT_GETDTABLESIZE
+ # define OPT_SYSINFO
+-# define OPT_STRERROR
+ # define OPT_CPP_PATH		"/usr/ccs/lib/cpp"
+ # define OPT_CPP_OPTIONS	"-B"
+ # define OPT_SVR4_GETMNTENT
+@@ -389,7 +382,6 @@
+ #  define OPT_CPP_PATH		"/opt/langtools/lbin/cpp"
+ # endif
+ # define OPT_CPP_OPTIONS	""
+-# define OPT_STRERROR
+ # undef  OPT_SVR4_GETMNTENT
+ # undef  OPT_LOCKF_MNTENT
+ # define OPT_LOCAL_MOUNT_TYPE	MNTTYPE_HFS
+@@ -415,7 +407,6 @@
+ # undef  OPT_SYSINFO
+ # define OPT_CPP_PATH		"/usr/bin/cpp"
+ # define OPT_CPP_OPTIONS	 ""
+-# define OPT_STRERROR
+ # undef  OPT_SVR4_GETMNTENT
+ # undef  OPT_LOCKF_MNTENT
+ # define OPT_LOCAL_MOUNT_TYPE	"ext2fs"
+@@ -446,7 +437,6 @@
+ # undef  OPT_SYSINFO
+ # define OPT_CPP_PATH		"/usr/libexec/cpp"
+ # define OPT_CPP_OPTIONS	""
+-# define OPT_STRERROR
+ # undef  OPT_SVR4_GETMNTENT
+ # undef  OPT_LOCKF_MNTENT
+ # define OPT_LOCAL_MOUNT_TYPE	MNTTYPE_UFS
+@@ -479,7 +469,6 @@
+ #  define OPT_CPP_PATH		"/usr/libexec/cpp"
+ # endif
+ # define OPT_CPP_OPTIONS	""
+-# define OPT_STRERROR
+ # undef  OPT_SVR4_GETMNTENT
+ # undef  OPT_LOCKF_MNTENT
+ # define OPT_LOCAL_MOUNT_TYPE	MNTTYPE_UFS
+@@ -509,7 +498,6 @@
+ # undef  OPT_SYSINFO
+ # define OPT_CPP_PATH		"/usr/bin/cpp"
+ # define OPT_CPP_OPTIONS	""
+-# define OPT_STRERROR
+ # undef  OPT_SVR4_GETMNTENT
+ # undef  OPT_LOCKF_MNTENT
+ # define OPT_LOCAL_MOUNT_TYPE	MNTTYPE_UFS
+diff --git a/cde/programs/dtcm/dtcm/dnd.c b/cde/programs/dtcm/dtcm/dnd.c
+index abc58c12..f37f19a6 100644
+--- a/cde/programs/dtcm/dtcm/dnd.c
++++ b/programs/dtcm/dtcm/dnd.c
+@@ -72,10 +72,6 @@
+ 
+ static Bool lookForButton(Display *, XEvent *, XPointer);
+ 
+-#if !defined(__linux__) && !defined(CSRG_BASED)
+-extern char	*sys_errlist[];
+-#endif
+-
+ extern int	drag_load_proc(char*, Calendar *);
+ static char	dnd_filename[20];
+ 
+diff --git a/cde/programs/dtcm/libDtCmP/util.c b/cde/programs/dtcm/libDtCmP/util.c
+index d33b8ba1..6de4739d 100644
+--- a/cde/programs/dtcm/libDtCmP/util.c
++++ b/programs/dtcm/libDtCmP/util.c
+@@ -306,10 +306,7 @@ syserr(char *msg, int a1, int a2, int a3)
+ #if 0
+ 	/* print the error, if any */
+ 	if (saveerr != 0) {
+-		if (saveerr < 0 || saveerr > sys_nerr) 
+-			(void) fprintf(stderr, ":Unknown error %d", saveerr);
+-		else 
+-			(void) fprintf(stderr, ":%s", sys_errlist[saveerr]);
++			(void) fprintf(stderr, ":%s", strerror(saveerr));
+ 	}
+ #endif
+ 
+diff --git a/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c b/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c
+index d9a42943..08de4809 100644
+--- a/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c
++++ b/programs/dthelp/parser.ccdf/volumegen/Volumegen.c
+@@ -56,7 +56,6 @@
+ typedef int Boolean;
+ 
+ /* extern int errno; */
+-/* extern char *sys_errlist[]; */
+ /* extern int sys_nerr; */
+ 
+ static void GenTopicList (
+diff --git a/cde/programs/dtimsstart/remote.c b/cde/programs/dtimsstart/remote.c
+index 68773673..71d32977 100644
+--- a/cde/programs/dtimsstart/remote.c
++++ b/programs/dtimsstart/remote.c
+@@ -37,10 +37,6 @@
+ #include	<X11/Xproto.h>		/* for X_ChangeHosts */
+ #include	<X11/Xatom.h>		/* for XA_STRING */
+ 
+-#if !defined(__linux__) && !defined(CSRG_BASED)
+-extern char	*sys_errlist[];
+-#endif
+-
+ static char	*conf_msg_id = STR_CONFDATA;
+ 
+ #define	CONF_MSG_ID_LEN		strlen(conf_msg_id)
+diff --git a/cde/programs/dtimsstart/start.c b/cde/programs/dtimsstart/start.c
+index 78fc2a38..1dafa189 100644
+--- a/cde/programs/dtimsstart/start.c
++++ b/programs/dtimsstart/start.c
+@@ -27,14 +27,10 @@
+ #include	<sys/wait.h>
+ #include	<setjmp.h>
+ #include	<unistd.h>
++#include    <errno.h>
+ 
+ #if (defined(__linux__) || defined(CSRG_BASED)) && !defined(_NFILE)
+ #define _NFILE FOPEN_MAX
+-#endif
+-
+-#if !defined(__linux__) && !defined(CSRG_BASED)
+-extern char	*sys_errlist[];
+-extern int	sys_nerr;
+ #endif
+ 
+     /* local functions */
+@@ -599,8 +595,7 @@ static int	invoke_ims(UserSelection *sel)
+ 
+     pid = fork();
+     if (pid == (pid_t) -1) {
+-	put_xims_log("fork failed [%s]",
+-		(errno <= sys_nerr) ? sys_errlist[errno] : NULL, 0, 0);
++	put_xims_log("fork failed [%s]", strerror(errno), 0, 0);
+ #ifdef	DEBUG
+ 	perror("fork");
+ #endif
+@@ -617,8 +612,7 @@ static int	invoke_ims(UserSelection *sel)
+ #endif
+ 	execl(SH_PATH, "sh", "-c", renv->cmdbuf, NULL);
+ 
+-	put_xims_log("%s: exec failed [%s]", SH_PATH,
+-		(errno <= sys_nerr) ? sys_errlist[errno] : NULL, 0, 0);
++	put_xims_log("%s: exec failed [%s]", SH_PATH, strerror(errno) , 0, 0);
+ 	/* perror(SH_PATH); */
+ 	sleep(1);
+ 	_exit(1);
+diff --git a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c b/cde/programs/dtinfo/dtinfo/src/external-api/comm.c
+index d61ccb7a..6aa2fc91 100644
+--- a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c
++++ b/programs/dtinfo/dtinfo/src/external-api/comm.c
+@@ -53,9 +53,6 @@
+ #include <sys/select.h>
+ #endif
+ 
+-extern char *sys_errlist[];
+-
+-
+ static OliasEvent *current_event;
+ static int reply_status;
+ #define NO_REPLY 0
+@@ -332,7 +329,7 @@ wait_for_reply (Widget toplevel)
+ 	      XtAppWarningMsg (XtWidgetToApplicationContext (toplevel),
+ 			       "communicationsError", "select",
+ 			       "Olias API", "Select failed: %s",
+-			       &sys_errlist[errno], &num_params);
++			       strerror(errno), &num_params);
+ 	      continue;
+ 	    }
+ 	  continue;
+diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c b/cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c
+index 313b67bc..8dd87ab8 100644
+--- a/cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c
++++ b/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c
+@@ -92,14 +92,7 @@
+ #endif
+ #include <ast.h>
+ 
+-extern __MANGLE__ int	sys_nerr;
+-extern __MANGLE__ char*	sys_errlist[];
+-
+ char*
+ fmterror __PARAM__((int err), (err)) __OTORP__(int err;){
+-	static char	msg[28];
+-
+-	if (err > 0 && err <= sys_nerr) return(sys_errlist[err]);
+-	sfsprintf(msg, sizeof(msg), "Error %d", err);
+-	return(msg);
++    return strerror(err);
+ }
+diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c b/cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c
+index 7686a54d..a6aa7ce8 100644
+--- a/cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c
++++ b/programs/dtksh/ksh93/src/lib/libast/string/strerror.c
+@@ -108,18 +108,12 @@ NoN(strerror)
+ 
+ #include <ast.h>
+ 
+-extern __MANGLE__ int	sys_nerr;
+-extern __MANGLE__ char*	sys_errlist[];
+ 
+ char*
+ strerror __PARAM__((int err), (err)) __OTORP__(int err;)
+ #line 25
+ {
+-	static char	msg[28];
+-
+-	if (err > 0 && err <= sys_nerr) return(sys_errlist[err]);
+-	sfsprintf(msg, sizeof(msg), "Error %d", err);
+-	return(msg);
++	return strerror(err);
+ }
+ 
+ #endif
+diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h
+index 3e0f2499..e67edc3c 100644
+--- a/cde/programs/dtlogin/dm.h
++++ b/programs/dtlogin/dm.h
+@@ -68,8 +68,7 @@
+ # include       <pwd.h>                 /* for passwd structure            */
+ # include	<stdio.h>
+ # include	<stdlib.h>		/* for exit(), malloc(), abort()   */
+-# include	<string.h>		/* for string functions, bcopy(),
+-					   sys_errlist			   */
++# include	<string.h>		/* for string functions, bcopy()   */
+ # include	<sys/param.h>		/* for NGROUPS			   */
+ # include	<sys/types.h>   	/* for fd_set			   */
+ # include	<netinet/in.h>		/* for Internet socket stuff	   */
+@@ -475,10 +474,6 @@ struct verify_info {
+  *
+  ***************************************************************************/
+ 
+-#if !defined(__linux__) && !defined(CSRG_BASED)
+-extern char	*sys_errlist[];		/* system error msgs		   */
+-extern int	sys_nerr;		/* system error msgs		   */
+-#endif
+ extern XrmDatabase  XresourceDB; 
+ 
+ 
+-- 
+2.28.0
+
diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix
index 7e6b49957b8e..7454603e7acd 100644
--- a/pkgs/desktops/cdesktopenv/default.nix
+++ b/pkgs/desktops/cdesktopenv/default.nix
@@ -2,7 +2,8 @@
 , libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps
 , libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf
 , ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales, gawk
-, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot }:
+, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot
+, rpcsvc-proto }:
 
 let
   x11ProjectRoot = symlinkJoin {
@@ -25,6 +26,7 @@ in stdenv.mkDerivation rec {
   # remove with next release
   patches = [
     ./2.3.2.patch
+    ./0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch
   ];
 
   buildInputs = [
@@ -33,6 +35,7 @@ in stdenv.mkDerivation rec {
   ];
   nativeBuildInputs = [
     bison ncompress gawk autoPatchelfHook makeWrapper fakeroot
+    rpcsvc-proto
   ];
 
   makeFlags = [
@@ -74,6 +77,5 @@ EOF
     license = licenses.lgpl2;
     maintainers = [ maintainers.gnidorah ];
     platforms = [ "i686-linux" "x86_64-linux" ];
-    broken = true; # not compatible with glibc 2.32
   };
 }

From b4ca4631eb31ef180721c3e6f1634a7b97a9b874 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 16:30:59 +0000
Subject: [PATCH 0963/3942] kpcli: 3.4 -> 3.6

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

diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix
index 09916f85f9e6..12e2bb03d38d 100644
--- a/pkgs/tools/security/kpcli/default.nix
+++ b/pkgs/tools/security/kpcli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  version = "3.4";
+  version = "3.6";
   pname = "kpcli";
 
   src = fetchurl {
     url = "mirror://sourceforge/kpcli/${pname}-${version}.pl";
-    sha256 = "0s46cni16ph93havmkrlai3k13mdppyca1s2bqm751a6rirmsgj0";
+    sha256 = "1srd6vrqgjlf906zdyxp4bg6gihkxn62cpzyfv0zzpsqsj13iwh1";
   };
 
   buildInputs = [ makeWrapper perl ];

From 426e0fbe9c19e96f7b62e7a28aba787f22f423b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 00:55:20 +0000
Subject: [PATCH 0964/3942] intel-gmmlib: 20.2.5 -> 20.3.2

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

diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index 89305baaee80..d271313f95de 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gmmlib";
-  version = "20.2.5";
+  version = "20.3.2";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "gmmlib";
     rev    = "${pname}-${version}";
-    sha256 = "0jg3kc74iqmbclx77a6dp4h85va8wi210x4zf5jypiq35c57r8hh";
+    sha256 = "0727pr7sknqi859gb5z472kgbbwx40574iyls8fgirm7lcz6gbd9";
   };
 
   nativeBuildInputs = [ cmake ];

From 9f9bc40e5770bc8b4b5442995578c86ca992642f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 16:41:45 +0000
Subject: [PATCH 0965/3942] keepass: 2.45 -> 2.46

---
 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 23f80eaa9cab..6164a60d6a86 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.45";
+  version = "2.46";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "07wyp3k2kiprr47mc4vxb7vmh7g5kshcqw0gq3qr87gi78c9i66m";
+    sha256 = "0zyclydgyg8nhwxrzw7x4f82975cqdmp12py33k6sballx6jhgiy";
   };
 
   sourceRoot = ".";

From a60aff6cb6e3f2f4b032e6353ee59d5624c3cd40 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 16:47:50 +0000
Subject: [PATCH 0966/3942] knightos-kpack: 1.1.0 -> 1.1.1

---
 pkgs/development/tools/knightos/kpack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/knightos/kpack/default.nix b/pkgs/development/tools/knightos/kpack/default.nix
index c1ecb963d243..657a1712ed24 100644
--- a/pkgs/development/tools/knightos/kpack/default.nix
+++ b/pkgs/development/tools/knightos/kpack/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   pname = "kpack";
 
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "kpack";
     rev = version;
-    sha256 = "0kakfbzdvq5ldv1gdzl473j73c9nfdyx4xzfkriglkrqmksqc329";
+    sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8";
   };
 
   nativeBuildInputs = [ cmake ];

From 679720063b09489d1e44ea45a2a9553430684102 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:39 -0800
Subject: [PATCH 0967/3942] python3Packages.azure-appconfiguration: 1.1.0 ->
 1.1.1

---
 .../python-modules/azure-appconfiguration/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix
index bea5fc4adcf6..5626b33462b5 100644
--- a/pkgs/development/python-modules/azure-appconfiguration/default.nix
+++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "azure-appconfiguration";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0mv053vl88nzpv701gnjdmbylc8qm0kkq87264rfhvrx3ydymf97";
+    sha256 = "b83cd2cb63d93225de84e27abbfc059212f8de27766f4c58dd3abb839dff0be4";
   };
 
   propagatedBuildInputs = [

From b7405dfc28e9c0f9b1ccf225ef87c719a0e5bf8b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:39 -0800
Subject: [PATCH 0968/3942] python3Packages.azure-core: 1.8.1 -> 1.8.2

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

diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix
index dfe346859421..16fc468d044e 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@@ -14,14 +14,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.8.1";
+  version = "1.8.2";
   pname = "azure-core";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "7efbeac3a6dfb634cb5323bc04e18ab609aeab6b03610808091aa0517373d626";
+    sha256 = "621b53271f7988b766f8a7d7f7a2c44241e3d2c1d8db13e68089d6da6241748e";
   };
 
   propagatedBuildInputs = [

From 7a64c2aac1e9677c80e0bee8b8aee7b445446f52 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:39 -0800
Subject: [PATCH 0969/3942] python3Packages.azure-datalake-store: 0.0.50 ->
 0.0.51

---
 .../python-modules/azure-datalake-store/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix
index fc9b98eae012..d7164affd9b8 100644
--- a/pkgs/development/python-modules/azure-datalake-store/default.nix
+++ b/pkgs/development/python-modules/azure-datalake-store/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "azure-datalake-store";
-  version = "0.0.50";
+  version = "0.0.51";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9b9b58dcf1d0d0e5aa499d5cb49dcf8f5432ca467a747b39167bb70ef901dbc2";
+    sha256 = "b871ebb3bcfd292e8a062dbbaacbc132793d98f1b60f549a8c3b672619603fc1";
   };
 
   propagatedBuildInputs = [

From 1a8936093cc702813fb313bb4f707c3f936f93a1 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:40 -0800
Subject: [PATCH 0970/3942] python3Packages.azure-identity: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix
index f607ab7a094f..4cea19742b9c 100644
--- a/pkgs/development/python-modules/azure-identity/default.nix
+++ b/pkgs/development/python-modules/azure-identity/default.nix
@@ -17,13 +17,13 @@
 
 buildPythonPackage rec {
   pname = "azure-identity";
-  version = "1.4.0";
+  version = "1.4.1";
   disabled = isPy38;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "820e1f3e21f90d36063239c6cb7ca9a6bb644cb120a6b1ead3081cafdf6ceaf8";
+    sha256 = "7b071089faf0789059ac24052e311e2b096a002c173d42b96896db09c6e2ba5d";
   };
 
   propagatedBuildInputs = [

From 7c0573192407f8262ca52c4a3a0c891f886c3f76 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:40 -0800
Subject: [PATCH 0971/3942] python3Packages.azure-mgmt-billing: 0.2.0 -> 1.0.0

---
 .../python-modules/azure-mgmt-billing/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix
index 6e9656950d5b..9aeaf50ce4ed 100644
--- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-billing";
-  version = "0.2.0"; #pypi's 0.2.0 doesn't build ootb
+  version = "1.0.0"; #pypi's 0.2.0 doesn't build ootb
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1li2bcdwdapwwx7xbvgfsq51f2mrwm0qyzih8cjhszcah2rkpxw5";
+    sha256 = "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0";
     extension = "zip";
   };
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   ];
 
   preBuild = ''
-    rm azure_bdist_wheel.py
+    rm -rf azure_bdist_wheel.py
     substituteInPlace setup.cfg \
       --replace "azure-namespace-package = azure-mgmt-nspkg" ""
   '';

From 0c8ee0fbafb8e64544e5df6cf8ad2ce1ce7566a0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:40 -0800
Subject: [PATCH 0972/3942] python3Packages.azure-mgmt-cognitiveservices: 6.2.0
 -> 6.3.0

---
 .../python-modules/azure-mgmt-cognitiveservices/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
index 98ca58e43407..f6ee7fce5216 100644
--- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-cognitiveservices";
-  version = "6.2.0";
+  version = "6.3.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "93503507ba87c18fe24cd3dfcd54e6e69a4daf7636f38b7537e09cee9a4c13ce";
+    sha256 = "1d029d5140152a36cc32f340e09f2b185ede2f54e577a44f3821878efb823415";
   };
 
   propagatedBuildInputs = [

From 079761d063de4d2d02c5464bd02b2271a620f6b0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:40 -0800
Subject: [PATCH 0973/3942] python3Packages.azure-mgmt-containerservice: 9.4.0
 -> 10.0.0

---
 .../python-modules/azure-mgmt-containerservice/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index d500ba0df8f1..9bc7207e1e2a 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerservice";
-  version = "9.4.0";
+  version = "10.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "d90684106c70779450b82067be4d3e449c799ca1f47d941e45f6d2b5c016dac9";
+    sha256 = "9b44b2d0b281fc1999324a715fb5cf4f47d392a35bc0a01f24bb8dbc4c123acd";
   };
 
   propagatedBuildInputs = [

From 0d96c45f2f407ccc5857f2a049db9f1813e91e0c Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:40 -0800
Subject: [PATCH 0974/3942] python3Packages.azure-mgmt-core: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix
index 17e7796b98ed..e7e8c91accab 100644
--- a/pkgs/development/python-modules/azure-mgmt-core/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.2.0";
+  version = "1.2.1";
   pname = "azure-mgmt-core";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998";
+    sha256 = "a3906fa77edfedfcc3229dc3b69489d5ed63b107c7eacbc50092e6cbfbfd83f0";
   };
 
   propagatedBuildInputs = [

From f4e45b84df9cfd0bf3519189191d4d035188ffdc Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:40 -0800
Subject: [PATCH 0975/3942] python3Packages.azure-mgmt-datafactory: 0.13.0 ->
 0.14.0

---
 .../python-modules/azure-mgmt-datafactory/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index e164dbd8f964..2601f829d908 100644
--- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-datafactory";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "3eabe34f49587840617747511a0aa25d08b0c1619677a1fdda24ce9e6b0f2c74";
+    sha256 = "47bb23fa6cc28f3f15dd7a404b7f9d7af469adf78f79a11eb01ff75ca10a75ba";
   };
 
   propagatedBuildInputs = [

From 247bf7ea6b16c355ac773f1d9968a4e2a840fbf7 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:41 -0800
Subject: [PATCH 0976/3942] python3Packages.azure-mgmt-hdinsight: 1.7.0 ->
 2.0.0

---
 .../python-modules/azure-mgmt-hdinsight/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
index b6f0dadf225c..08b9e73e66d2 100644
--- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.7.0";
+  version = "2.0.0";
   pname = "azure-mgmt-hdinsight";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9d1120bd9760687d87594ec5ce9257b7335504afbe55b3cda79462c1e07a095b";
+    sha256 = "fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8";
     extension = "zip";
   };
 

From 94888c09959214970a163472cdc897b73149fe67 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:41 -0800
Subject: [PATCH 0977/3942] python3Packages.azure-mgmt-media: 2.2.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix
index 018d7140a3d9..75d1159857e5 100644
--- a/pkgs/development/python-modules/azure-mgmt-media/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-media";
-  version = "2.2.0";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0adeee9e654a9011f5107def06fea6838864a3514a1e5a9ed495f3a56a687cc7";
+    sha256 = "8944775725c5253614d257576d841ee68afa34f570b05c0924a7f73f1db28a24";
   };
 
   propagatedBuildInputs = [

From d15b9488be00810330b463d8501df2107ff768b1 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:41 -0800
Subject: [PATCH 0978/3942] python3Packages.azure-mgmt-search: 2.1.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix
index 936a1b4269c4..6f0fd6f3b368 100644
--- a/pkgs/development/python-modules/azure-mgmt-search/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-search";
-  version = "2.1.0";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0085c7qi9z1ayxd8683ck79nfnldkrwl481hzav84flyg8d0m94j";
+    sha256 = "d4c78b14b48edd2e27e2068c9a448acfc84a18595be77fe483afe7bb447e1eb6";
   };
 
   propagatedBuildInputs = [

From f60b39700de15b569c2f23c9d96b6497061424de Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:41 -0800
Subject: [PATCH 0979/3942] python3Packages.azure-mgmt-security: 0.4.1 -> 0.5.0

---
 .../python-modules/azure-mgmt-security/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix
index 90a64ff098ae..5c437e472dd8 100644
--- a/pkgs/development/python-modules/azure-mgmt-security/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.4.1";
+  version = "0.5.0";
   pname = "azure-mgmt-security";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r";
+    sha256 = "c0d232cdb5ad74f4590db2e44df74c0872fcb9fded7f03c7b57188a63b54ecfa";
     extension = "zip";
   };
 

From b41c236297231ea6d2008dceee9425d90461289e Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:41 -0800
Subject: [PATCH 0980/3942] python3Packages.azure-mgmt-servicebus: 0.6.0 ->
 1.0.0

---
 .../python-modules/azure-mgmt-servicebus/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
index 72c363b3e669..e192a8f9d3e3 100644
--- a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-servicebus";
-  version = "0.6.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "f20920b8fb119ef4abeda4d2dac765a4fc48cd0bcf30c27f8c4cc6d890bc08b1";
+    sha256 = "bb37d97eb3798740a0bc1bfa37b04946a193a6d1a3b0849fdc5e1dc2a9f25d81";
   };
 
   propagatedBuildInputs = [

From 2b08bd3f862582cc6ed04656532dd8ee97a2bd59 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:42 -0800
Subject: [PATCH 0981/3942] python3Packages.azure-mgmt-sql: 0.22.0 -> 0.23.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
index dd80641a48aa..36432ccbc84f 100644
--- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-sql";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "01c82a1559f49e5f51021b8fbd35e738e08cbede1f39cf00da8085c853575f39";
+    sha256 = "acf7d4c83fb43152a809e3894528e561e601be543250c2824cc615cc88a70855";
   };
 
   propagatedBuildInputs = [

From 5d4fdf567ec436b68930c73b4b6249a506d07615 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:12:42 -0800
Subject: [PATCH 0982/3942] python3Packages.azure-servicefabric: 7.1.0.45 ->
 7.2.0.46

---
 .../python-modules/azure-servicefabric/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix
index ad89f23c3c29..f34d3d62ba3b 100644
--- a/pkgs/development/python-modules/azure-servicefabric/default.nix
+++ b/pkgs/development/python-modules/azure-servicefabric/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "azure-servicefabric";
-  version = "7.1.0.45";
+  version = "7.2.0.46";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "8dd0eb419ca62f2436c31982f6d236868f15f65bb062c4e5a98e50b16298dcda";
+    sha256 = "c15fd5e8fe33a12295435f16e007edcfd8f660547795742f9b74ef8fb3a431ba";
   };
 
   propagatedBuildInputs = [

From 54e3fbdecd890a7b8e5803d3775dd43fa2e7afb4 Mon Sep 17 00:00:00 2001
From: JesusMtnez <jesusmartinez93@gmail.com>
Date: Mon, 2 Nov 2020 18:34:22 +0100
Subject: [PATCH 0983/3942] coursier: 2.0.5 -> 2.0.6

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

diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index ac2338b4c184..d3c1cc50d0e1 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -8,11 +8,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "coursier";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchurl {
     url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
-    sha256 = "1j614pw8i2mfgrv3jb5q3ifrxkrb7apj13zdrbnvnh4bzwlg5jb2";
+    sha256 = "0zg07bi44a5p0zfc77i1vmjz9rwzxzf6p0xsybsv3n1saq884wij";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From f8d5953a0a9bd6888cd2d6177621f19b3c07a4e7 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:41:56 -0800
Subject: [PATCH 0984/3942] python3Packages.azure-synapse-artifacts: init at
 0.3.0

---
 .../azure-synapse-artifacts/default.nix       | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/azure-synapse-artifacts/default.nix

diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
new file mode 100644
index 000000000000..85ec70f704c7
--- /dev/null
+++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi
+, azure-common
+, azure-core
+, msrest
+}:
+
+buildPythonPackage rec {
+  pname = "azure-synapse-artifacts";
+  version = "0.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a";
+  };
+
+  propagatedBuildInputs = [
+    azure-common
+    azure-core
+    msrest
+  ];
+
+  pythonImportsCheck = [ "azure.synapse.artifacts" ];
+
+  meta = with lib; {
+    description = "CHANGE";
+    homepage = "https://github.com/CHANGE/azure-synapse-artifacts/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d209c34bdd8f..d8e75c660526 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -737,6 +737,8 @@ in {
 
   azure-synapse-accesscontrol = callPackage ../development/python-modules/azure-synapse-accesscontrol { };
 
+  azure-synapse-artifacts = callPackage ../development/python-modules/azure-synapse-artifacts { };
+
   azure-synapse-spark = callPackage ../development/python-modules/azure-synapse-spark { };
 
   b2sdk = callPackage ../development/python-modules/b2sdk { };

From a944acc33be2d8afb5fe2bfd7ff87eb6eeb887fa Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 09:45:29 -0800
Subject: [PATCH 0985/3942] azure-cli: 2.12.1 -> 2.14.0

---
 pkgs/tools/admin/azure-cli/default.nix        |  9 ++--
 .../tools/admin/azure-cli/python-packages.nix | 45 +++++++++++++------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index 8a9101cedd6d..a7dd4a6ae82c 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, python, fetchFromGitHub, installShellFiles }:
 
 let
-  version = "2.12.1";
+  version = "2.14.0";
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-cli";
     rev = "azure-cli-${version}";
-    sha256 = "14m2zjgaszrki34kva23vdsl0nxxifz8r9i54ld3idi8hj3nx0q3";
+    sha256 = "0rihxkdckfkqzrr3jc8jpdpjg3pgz5jymyz19lpva8qqln7cmzpy";
   };
 
   # put packages that needs to be overriden in the py package scope
@@ -113,6 +113,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
     azure-multiapi-storage
     azure-storage-blob
     azure-synapse-accesscontrol
+    azure-synapse-artifacts
     azure-synapse-spark
     colorama
     cryptography
@@ -164,9 +165,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
   # almost the entire test suite requires an azure account setup and networking
   # ensure that the azure namespaces are setup correctly and that azure.cli can be accessed
   checkPhase = ''
-    cd azure # avoid finding local copy
-    ${py.interpreter} -c 'import azure.cli.core; assert "${version}" == azure.cli.core.__version__'
-    HOME=$TMPDIR ${py.interpreter} -m azure.cli --help
+    HOME=$TMPDIR $out/bin/az --help > /dev/null
   '';
 
   # ensure these namespaces are able to be accessed
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index ca094137d7f8..ce3b3f657b8f 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -128,11 +128,14 @@ let
       azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip"
         "1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83";
 
+      azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "0.2.0" "zip"
+        "1li2bcdwdapwwx7xbvgfsq51f2mrwm0qyzih8cjhszcah2rkpxw5";
+
       azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip"
         "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd";
 
-      azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "3.0.0rc1" "zip"
-        "0afg5vmyiwqna9rnal9ir2vyg2mykllsf313gd3kn99jl21bgns1";
+      azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "3.1.0rc1" "zip"
+        "0jg242pjbxvcqskgrmw0q17mhafkip1d8p40hls0w0wn77cnic65";
 
       azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip"
         "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1";
@@ -146,11 +149,11 @@ let
       azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.6.0" "zip"
         "0pvc8f3g12q7als0pgy26kqi2i9grykwrjyiv2vijci9wxn22vpy";
 
-      azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.2.0" "zip"
-        "1khk9jdfx7706xsqpwrnfsplv6p6wracvpyk9ki8zhc7p83kal4k";
+      azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip"
+        "059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx";
 
-      azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "13.0.0" "zip"
-        "17ik8lfd74ki57rml2piswcanzbladsqy0s2m9jmvwpdrfpincvz";
+      azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "14.0.0" "zip"
+        "0bvqv56plcgmnfyj0apphlbsn2vfm1a22idvy8y5npbfjz4zwja9";
 
       azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
         "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
@@ -206,8 +209,8 @@ let
       azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip"
         "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6";
 
-      azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.47.0" "zip"
-        "1s6c477q2kpyiqkisw6l70ydyjkv3ay6zjjj4jl4ipv05a7356kq";
+      azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.48.0" "zip"
+        "1v41k9rsflbm9g06mhi6jsygv9542da53qwjpjkp532jawxrw3ys";
 
       azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip"
         "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn";
@@ -218,6 +221,9 @@ let
       azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip"
         "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3";
 
+      azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "2.0.0" "zip"
+        "14v8ja8har2xrb00v98610pqvakcdvnzw8hkd6wbr1np3f3dxi8f";
+
       azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.4.1" "zip"
         "08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r";
 
@@ -248,8 +254,8 @@ let
       azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip"
         "0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm";
 
-      azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc14" "zip"
-        "0w9hnxvk5pcsa21g3xrr089rfwgldghrbj8akzvh0gchqlzfjg6j";
+      azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc15" "zip"
+        "1fnmdl3m7kdn6c2ws5vrm7nwadcbq9mgc6g5bg4s1a4xjb23q6vb";
 
       azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.11.0" "zip"
         "05jhn66d4sl1qi6w34rqd8wl500jndismiwhdmzzmprdvn1zxqf6";
@@ -266,14 +272,17 @@ let
       azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "11.2.0" "zip"
         "0a05djzgwnd9lwj5mazmjfv91k72v9scf612kf6vkjjq7jzkr3pw";
 
+      azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip"
+        "1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj";
+
       azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip"
         "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap";
 
       azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.7.0" "zip"
-        "004q3d2kj1i1cx3sad1544n3pkindfm255sw19gdlhbw61wn5l5a";
+        "0nq9gbhc2qlllz6v6mdymw25acxpay9cxiafb63pss30jyyj04cx";
 
-      azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.4.1" "zip"
-        "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3";
+      azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.5.2" "tar.gz"
+        "09y075mc7kig4dlb0xdvdvl9xbr931bi7kv60xaqnf31pf4pb7gf";
 
       azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec {
         version = "0.60.0";
@@ -304,6 +313,16 @@ let
         };
       });
 
+      azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec {
+        version = "0.3.0";
+        src = super.fetchPypi {
+          inherit (oldAttrs) pname;
+          inherit version;
+          sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a";
+          extension = "zip";
+        };
+      });
+
       azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec {
         version = "0.2.0";
         src = super.fetchPypi {

From 7c1ff55c77d7432a21aea1577244b7c5c3e0cca9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 17:25:51 +0000
Subject: [PATCH 0986/3942] libfabric: 1.11.0 -> 1.11.1

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

diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix
index 52de79e1f2df..1911391c935c 100644
--- a/pkgs/os-specific/linux/libfabric/default.nix
+++ b/pkgs/os-specific/linux/libfabric/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libfabric";
-  version = "1.11.0";
+  version = "1.11.1";
 
   enableParallelBuilding = true;
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "ofiwg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1wgn6gsiy64rb76i46dsqlvp687lwqzxwg5lgj1y5y7lyqbq96wp";
+    sha256 = "17qq96mlfhbkbmsvbazhxzkjnh6x37xlh3r0ngp0rfqbl05z2pcr";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ] ;

From 6a8da1147b4fa43e15a25cdfcdcf78f2c2fc13f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 01:30:23 +0000
Subject: [PATCH 0987/3942] libgnurl: 7.70.0 -> 7.72.0

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

diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 25917c44bd02..5daeba2c06e6 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libgnurl";
-  version = "7.70.0";
+  version = "7.72.0";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
-    sha256 = "0px9la8v4bj1dzxb95fx3yxk0rcjqjrxpj733ga27cza45wwzkqa";
+    sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi";
   };
 
   nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];

From ceacafafbd1458b714d35a17db1725f8472a4e8b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 10:00:23 -0800
Subject: [PATCH 0988/3942] libsForQt.kpeoplevcard: fix homepage

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

diff --git a/pkgs/development/libraries/kpeoplevcard/default.nix b/pkgs/development/libraries/kpeoplevcard/default.nix
index c405532e4363..d2244a252347 100644
--- a/pkgs/development/libraries/kpeoplevcard/default.nix
+++ b/pkgs/development/libraries/kpeoplevcard/default.nix
@@ -32,7 +32,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "Pulseaudio bindings for Qt";
-    homepage    = "KPeople VCard Support";
+    homepage    = "https://github.com/KDE/kpeoplevcard";
     license     = with licenses; [ lgpl2 ];
     maintainers = with maintainers; [ doronbehar ];
   };

From 693f2aa17a5891b560e28c3f266084d6aaeeb9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Mon, 2 Nov 2020 13:56:46 +0100
Subject: [PATCH 0989/3942] python3Packages.srsly: 2.3.0 -> 2.3.1

Changelog:

https://github.com/explosion/srsly/releases/tag/v2.3.1
---
 pkgs/development/python-modules/srsly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix
index 0565973da40d..77bd9cdf5847 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/pkgs/development/python-modules/srsly/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "srsly";
-  version = "2.3.0";
+  version = "2.3.1";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f994a266f6e547c8ffe803cb90baed7ca566831f924e0491402564ba0d185e66";
+    sha256 = "3dcce93c69ff18e8a8d7decfdfdf8e1fd44c4446cdee8d0e5d545d6b172dc377";
   };
 
   nativeBuildInputs = [ cython ];

From 20d24d0b15dfb24975d88b0a19b2a7ecea624705 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Nov 2020 19:33:35 +0100
Subject: [PATCH 0990/3942] python3Packages.pyserial-asyncio: propagate
 pyserial

Fixes errors like this:

ERROR: Could not find a version that satisfies the requirement pyserial (from pyserial-asyncio>=0.4->pysml==0.0.2) (from versions: none)
---
 pkgs/development/python-modules/pyserial-asyncio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/pkgs/development/python-modules/pyserial-asyncio/default.nix
index c299ad8acae5..cf90275cd19c 100644
--- a/pkgs/development/python-modules/pyserial-asyncio/default.nix
+++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix
@@ -7,13 +7,13 @@ buildPythonPackage rec {
 
   disabled = !isPy3k; # Doesn't support python older than 3.4
 
-  buildInputs = [ pyserial ];
-
   src = fetchPypi {
     inherit pname version;
     sha256 = "1vlsb0d03krxlj7vpvyhpinnyxyy8s3lk5rs8ba2932dhyl7f1n4";
   };
 
+  propagatedBuildInputs = [ pyserial ];
+
   meta = with stdenv.lib; {
     description = "asyncio extension package for pyserial";
     homepage = "https://github.com/pyserial/pyserial-asyncio";

From 844665bdf353759d2a75df2393cec0636261b110 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 2 Nov 2020 19:15:37 +0100
Subject: [PATCH 0991/3942] tdesktop: 2.4.5 -> 2.4.6

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 .../instant-messengers/telegram/tdesktop/tg_owt.nix           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index ed1b643960c9..a754e544bc07 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -22,12 +22,12 @@ let
 
 in mkDerivation rec {
   pname = "telegram-desktop";
-  version = "2.4.5";
+  version = "2.4.6";
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "0nhzypgc45f5gqy53azj7mljnj7p9p0m7bil02f9cih1dg5sdxx5";
+    sha256 = "190k9ik678br5k892gj26bx4rbj5rn5ks4qgf2nrlgww0z59fvrc";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
index 4695e61f7d5b..48499bf9f2c7 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
@@ -3,8 +3,8 @@
 }:
 
 let
-  rev = "1d4f7d74ff1a627db6e45682efd0e3b85738e426";
-  sha256 = "1w03xmjn693ff489pg368jv21478vr4ldxyya4lsrx87fn88caj3";
+  rev = "e8fcae73947445db3d418fb7c20b964b59e14706";
+  sha256 = "0s2dd41r71aixhvympiqfks1liv7x78y60n0i87vmyxyfx449b5h";
 
 in stdenv.mkDerivation {
   pname = "tg_owt";

From da5d8f384d1f774f1079f87210e5ca0b5be45dfa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 18:59:50 +0000
Subject: [PATCH 0992/3942] libfprint: 1.90.2 -> 1.90.3

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

diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index 7c6168c3d3e4..cc4e7dfefeef 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libfprint";
-  version = "1.90.2";
+  version = "1.90.3";
   outputs = [ "out" "devdoc" ];
 
   src = fetchFromGitLab {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "libfprint";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0g890y49anqd7yfz86iyvywxgbfmfmj6813fy58m5n8jain7iy1b";
+    sha256 = "1fs0qrfrqnvc6kcsg81l5p89n8jnsx9dr1pzxpb8ghwas8c9v52i";
   };
 
   nativeBuildInputs = [

From 55be01a0a3250f2ea2b5b09445983ddf65270b69 Mon Sep 17 00:00:00 2001
From: Matt Layher <mdlayher@gmail.com>
Date: Mon, 2 Nov 2020 14:10:14 -0500
Subject: [PATCH 0993/3942] minecraft-server: 1.16.3 -> 1.16.4

Signed-off-by: Matt Layher <mdlayher@gmail.com>
---
 pkgs/games/minecraft-server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 7216a42b00f8..5cf39ec35b0e 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre_headless }:
 stdenv.mkDerivation {
   pname = "minecraft-server";
-  version = "1.16.3";
+  version = "1.16.4";
 
   src = fetchurl {
-    url = "https://launcher.mojang.com/v1/objects/f02f4473dbf152c23d7d484952121db0b36698cb/server.jar";
+    url = "https://launcher.mojang.com/v1/objects/35139deedbd5182953cf1caa23835da59ca3d7cd/server.jar";
     # sha1 because that comes from mojang via api
-    sha1 = "f02f4473dbf152c23d7d484952121db0b36698cb";
+    sha1 = "35139deedbd5182953cf1caa23835da59ca3d7cd";
   };
 
   preferLocalBuild = true;

From 85df0592c9a2c04b65033a3ea29e0a75f2186a88 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 19:12:45 +0000
Subject: [PATCH 0994/3942] libhdhomerun: 20200521 -> 20200907

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

diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix
index 73d53bdccd73..577457afdbf8 100644
--- a/pkgs/development/libraries/libhdhomerun/default.nix
+++ b/pkgs/development/libraries/libhdhomerun/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libhdhomerun";
-  version = "20200521";
+  version = "20200907";
 
   src = fetchurl {
     url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz";
-    sha256 = "0s0683bwyd10n3r2sanlyd07ii3fmi3vl9w9a2rwlpcclzq3h456";
+    sha256 = "1v80jk056ii2iv2w7sq24i3prjrbhxql5vqhafs7vq54qmwvgbnb";
   };
 
   patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''

From fb3d7972427875e9a550e4819476d24dd6c68793 Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Wed, 28 Oct 2020 12:03:48 +0100
Subject: [PATCH 0995/3942] convimg: init at 8.3

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

diff --git a/pkgs/tools/misc/convimg/default.nix b/pkgs/tools/misc/convimg/default.nix
new file mode 100644
index 000000000000..f9de88cb01e5
--- /dev/null
+++ b/pkgs/tools/misc/convimg/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "convimg";
+  version = "8.3";
+
+  src = fetchFromGitHub {
+    owner = "mateoconlechuga";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1k2fkzfg08y2gcm8jabmb2plgqmgw6y30m73ys4mmbskxgy7hc3s";
+    fetchSubmodules = true;
+  };
+
+  makeFlags = [ "CC=cc" ];
+
+  checkPhase = ''
+    pushd test
+    patchShebangs test.sh
+    ./test.sh
+    popd
+  '';
+
+  doCheck = true;
+
+  installPhase = ''
+    install -Dm755 bin/convimg $out/bin/convimg
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Image palette quantization";
+    longDescription = ''
+      This program is used to convert images to other formats,
+      specifically for the TI84+CE and related calculators.
+    '';
+    homepage = "https://github.com/mateoconlechuga/convimg";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ luc65r ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7cb0ac859007..97cd5391cca0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3074,6 +3074,8 @@ in
 
   convbin = callPackage ../tools/misc/convbin { };
 
+  convimg = callPackage ../tools/misc/convimg { };
+
   convmv = callPackage ../tools/misc/convmv { };
 
   convoy = callPackage ../tools/filesystems/convoy { };

From 448729ea16c179ab1e9cb69eb949d2f62ab2a0c1 Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Wed, 28 Oct 2020 12:04:04 +0100
Subject: [PATCH 0996/3942] convfont: init at 1.0

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

diff --git a/pkgs/tools/misc/convfont/default.nix b/pkgs/tools/misc/convfont/default.nix
new file mode 100644
index 000000000000..0cc181082a4f
--- /dev/null
+++ b/pkgs/tools/misc/convfont/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "convfont";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "drdnar";
+    repo = pname;
+    rev = "v20190438";
+    sha256 = "1lj24yq5gj9hxhy1srk73521q95zyqzkws0q4v271hf5wmqaxa2f";
+  };
+
+  makeFlags = [ "CC=cc" ];
+
+  installPhase = ''
+    install -Dm755 convfont $out/bin/convfont
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Converts font for use with FontLibC";
+    homepage = "https://github.com/drdnar/convfont";
+    license = licenses.wtfpl;
+    maintainers = with maintainers; [ luc65r ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97cd5391cca0..89fd39148de7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3076,6 +3076,8 @@ in
 
   convimg = callPackage ../tools/misc/convimg { };
 
+  convfont = callPackage ../tools/misc/convfont { };
+
   convmv = callPackage ../tools/misc/convmv { };
 
   convoy = callPackage ../tools/filesystems/convoy { };

From 5e4b485d865033cfbaeb98716588f8499f752fc3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 19:42:21 +0000
Subject: [PATCH 0997/3942] libratbag: 0.14 -> 0.15

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

diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix
index 48ee5d16c5c0..e9f090255f92 100644
--- a/pkgs/os-specific/linux/libratbag/default.nix
+++ b/pkgs/os-specific/linux/libratbag/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libratbag";
-  version = "0.14";
+  version = "0.15";
 
   src = fetchFromGitHub {
     owner  = "libratbag";
     repo   = "libratbag";
     rev    = "v${version}";
-    sha256 = "1fpwp2sj8mf98bqasq2h8qwgprxi7k3iw33gcfid3d1lbyiacw0x";
+    sha256 = "0z6ps5aqwjmbdvahs80fh9cdgcvp4q4w3kfycmzv4kzgzihjki7b";
   };
 
   nativeBuildInputs = [

From 94bf1da7e5911c4c085d51d32fe3aa3915cbfc69 Mon Sep 17 00:00:00 2001
From: Diego Rodriguez <diego@noteable.io>
Date: Mon, 2 Nov 2020 12:46:09 -0700
Subject: [PATCH 0998/3942] aws-okta: 1.0.5 -> 1.0.6

---
 pkgs/tools/security/aws-okta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix
index 7349f00e5b80..d4abe12d664c 100644
--- a/pkgs/tools/security/aws-okta/default.nix
+++ b/pkgs/tools/security/aws-okta/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "aws-okta";
-  version = "1.0.5";
+  version = "1.0.6";
 
   goPackagePath = "github.com/segmentio/aws-okta";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "segmentio";
     repo = "aws-okta";
     rev = "v${version}";
-    sha256 = "1xd73j6rbbdrnzj0m8dqwcvn62cz6bygdpxsx8g7117qbdzz2lj1";
+    sha256 = "1nhcqj3vhdgk0a0smmyqphjw2slcvqbb8xd8bx506j8h8x84p6yf";
   };
 
   buildFlags = [ "--tags" "release" ];

From 95381cf70514fd309479f09f3f7711456b0bd2f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= <kuba@kadziolka.net>
Date: Mon, 2 Nov 2020 19:49:52 +0100
Subject: [PATCH 0999/3942] pythonPackages.sumtypes: init at 0.1a5

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

diff --git a/pkgs/development/python-modules/sumtypes/default.nix b/pkgs/development/python-modules/sumtypes/default.nix
new file mode 100644
index 000000000000..4a3a22f2780c
--- /dev/null
+++ b/pkgs/development/python-modules/sumtypes/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchFromGitHub, attrs, pytestCheckHook }:
+
+buildPythonPackage rec {
+  pname = "sumtypes";
+  version = "0.1a5";
+
+  src = fetchFromGitHub {
+    owner = "radix";
+    repo = "sumtypes";
+    rev = version;
+    sha256 = "0wcw1624xxx2h6lliv13b59blg60j8sgf5v2ni3cwx3j4wld4csr";
+  };
+
+  propagatedBuildInputs = [ attrs ];
+  checkInputs = [ pytestCheckHook ];
+
+  meta = with lib; {
+    description = "Algebraic data types for Python";
+    homepage = "https://github.com/radix/sumtypes";
+    license = licenses.mit;
+    maintainers = with maintainers; [ NieDzejkob ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d209c34bdd8f..bdcbb6f2eaf9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6926,6 +6926,8 @@ in {
 
   sumo = callPackage ../development/python-modules/sumo { };
 
+  sumtypes = callPackage ../development/python-modules/sumtypes { };
+
   sunpy = callPackage ../development/python-modules/sunpy { };
 
   supervise_api = callPackage ../development/python-modules/supervise_api { };

From 1e9d2d2f12c2f7367f744107a9e68b64beb6beb0 Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Thu, 29 Oct 2020 19:58:28 +0100
Subject: [PATCH 1000/3942] keystone: init at 0.9.2

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

diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/development/libraries/keystone/default.nix
new file mode 100644
index 000000000000..dc83209c1479
--- /dev/null
+++ b/pkgs/development/libraries/keystone/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, fetchFromGitHub
+, pkg-config
+, cmake
+, python3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "keystone";
+  version = "0.9.2";
+
+  src = fetchFromGitHub {
+    owner = "keystone-engine";
+    repo = pname;
+    rev = version;
+    sha256 = "020d1l1aqb82g36l8lyfn2j8c660mm6sh1nl4haiykwgdl9xnxfa";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    python3
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Lightweight multi-platform, multi-architecture assembler framework";
+    homepage = "https://www.keystone-engine.org";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ luc65r ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a37fab7ec3db..111ed500554c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1651,6 +1651,8 @@ in
   capstone = callPackage ../development/libraries/capstone { };
   unicorn-emu = callPackage ../development/libraries/unicorn-emu { };
 
+  keystone = callPackage ../development/libraries/keystone { };
+
   casync = callPackage ../applications/networking/sync/casync {
     sphinx = python3Packages.sphinx;
   };

From 819b0f4bb864b21327672a5b9f2d94a75c312078 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 2 Nov 2020 21:18:57 +0100
Subject: [PATCH 1001/3942] nixos/initrd-network-ssh: fix test

The test relied on moving `initrd` secrets from the store into the
`initrd` which was fine here as it's only an integration test and not a
production environment.

However, this broke in 20.09 when support for this was dropped[1]. To make
sure that the snakeoil key used as hostkey for `sshd` here actually gets
copied into the VM, I added a small script for this that takes care of
this process while building the initial ramdisk.

[1] d930466b7728e5515991cb73c060fc3f32bdc001
---
 nixos/tests/initrd-network-ssh/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix
index 017de6882081..0ad0563b0ce1 100644
--- a/nixos/tests/initrd-network-ssh/default.nix
+++ b/nixos/tests/initrd-network-ssh/default.nix
@@ -22,6 +22,10 @@ import ../make-test-python.nix ({ lib, ... }:
             hostKeys = [ ./ssh_host_ed25519_key ];
           };
         };
+        boot.initrd.extraUtilsCommands = ''
+          mkdir -p $out/secrets/etc/ssh
+          cat "${./ssh_host_ed25519_key}" > $out/secrets/etc/ssh/sh_host_ed25519_key
+        '';
         boot.initrd.preLVMCommands = ''
           while true; do
             if [ -f fnord ]; then

From 48f8b85e1c108aac95d31729024c5869d4e2ce0f Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 2 Nov 2020 21:29:43 +0100
Subject: [PATCH 1002/3942] nixos/chrony: fix owner of chrony drift file

It had become owned by root due to #97546.
---
 nixos/modules/services/networking/ntp/chrony.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index 78de50583f34..e6fa48daf46c 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -6,6 +6,7 @@ let
   cfg = config.services.chrony;
 
   stateDir = "/var/lib/chrony";
+  driftFile = "${stateDir}/chrony.drift";
   keyFile = "${stateDir}/chrony.keys";
 
   configFile = pkgs.writeText "chrony.conf" ''
@@ -16,7 +17,7 @@ let
       "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.servers}"
     }
 
-    driftfile ${stateDir}/chrony.drift
+    driftfile ${driftFile}
     keyfile ${keyFile}
 
     ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"}
@@ -95,6 +96,7 @@ in
 
     systemd.tmpfiles.rules = [
       "d ${stateDir} 0755 chrony chrony - -"
+      "f ${driftFile} 0640 chrony chrony -"
       "f ${keyFile} 0640 chrony chrony -"
     ];
 

From ce7522223424b8431d5bfe8d5847ae0f888313b3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 20:47:51 +0000
Subject: [PATCH 1003/3942] libqalculate: 3.13.0 -> 3.14.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 11816beee040..bc142b0a57c2 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libqalculate";
-  version = "3.13.0";
+  version = "3.14.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     rev = "v${version}";
-    sha256 = "0nd0hrnp0a9p7hy6l6s45kfd267r7qg91aqn8g2dyam5hngskayk";
+    sha256 = "1j4sr9s7152xmci677pnz64spv8s3ia26fbp5cqx8ydv7swlivh2";
   };
 
   outputs = [ "out" "dev" "doc" ];

From f7fca06ef918343df846e02f8f0f8804f3e69b3e Mon Sep 17 00:00:00 2001
From: Ivar <ivar.scholten@protonmail.com>
Date: Mon, 2 Nov 2020 21:10:53 +0100
Subject: [PATCH 1004/3942] capitaine-cursors: fix build with inkscape => 1.0

---
 pkgs/data/icons/capitaine-cursors/default.nix | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/data/icons/capitaine-cursors/default.nix
index 09491b904ef1..e57482b191b7 100644
--- a/pkgs/data/icons/capitaine-cursors/default.nix
+++ b/pkgs/data/icons/capitaine-cursors/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fetchpatch, makeFontsConf
 , inkscape, xcursorgen, bc }:
 
 stdenv.mkDerivation rec {
@@ -12,11 +12,23 @@ stdenv.mkDerivation rec {
     sha256 = "0652ydy73x29z7wc6ccyqihmfg4bk0ksl7yryycln6c7i0iqfmc9";
   };
 
+  patches = [
+    # Fixes the build on inscape => 1.0, without this it generates empty cursor files
+    (fetchpatch {
+      name = "inkscape-1.0-compat";
+      url = "https://github.com/keeferrourke/capitaine-cursors/commit/9da0b53e6098ed023c5c24c6ef6bfb1f68a79924.patch";
+      sha256 = "0lx5i60ahy6a2pir4zzlqn5lqsv6claqg8mv17l1a028h9aha3cv";
+    })
+  ];
+
   postPatch = ''
     patchShebangs .
   '';
 
-  buildInputs  =[
+  # Complains about not being able to find the fontconfig config file otherwise
+  FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
+
+  buildInputs = [
     inkscape
     xcursorgen
     bc
@@ -36,14 +48,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = ''
-      An x-cursor theme inspired by macOS and based on KDE Breeze
-    '';
+    description = "An x-cursor theme inspired by macOS and based on KDE Breeze";
     homepage = "https://github.com/keeferrourke/capitaine-cursors";
     license = licenses.lgpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [
-      eadwu
-    ];
+    maintainers = with maintainers; [ eadwu ];
   };
 }

From f4f9f307a458a1f6b6c2383f7309408f2c4dab63 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 2 Nov 2020 16:02:59 -0500
Subject: [PATCH 1005/3942] nixUnstable: 3.0pre20201020_e0ca98c ->
 2.4pre20201102_550e11f

---
 pkgs/tools/package-management/nix/default.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 791780ae0951..2762a3df7381 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -32,8 +32,8 @@ common =
       inherit name src;
       version = lib.getVersion name;
 
-      is30 = lib.versionAtLeast version "3.0pre";
-      isExactly30 = lib.versionAtLeast version "2.3" && lib.versionOlder version "3.0";
+      is24 = lib.versionAtLeast version "2.4pre";
+      isExactly24 = lib.versionAtLeast version "2.4" && lib.versionOlder version "2.4";
 
       VERSION_SUFFIX = suffix;
 
@@ -41,7 +41,7 @@ common =
 
       nativeBuildInputs =
         [ pkgconfig ]
-        ++ lib.optionals is30
+        ++ lib.optionals is24
           [ autoreconfHook
             autoconf-archive
             bison flex
@@ -54,7 +54,7 @@ common =
           brotli boost editline
         ]
         ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-        ++ lib.optionals is30 [ libarchive gmock ]
+        ++ lib.optionals is24 [ libarchive gmock ]
         ++ lib.optional withLibseccomp libseccomp
         ++ lib.optional withAWS
             ((aws-sdk-cpp.override {
@@ -93,9 +93,9 @@ common =
             patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
           ''}
         '' +
-        # For Nix 3.0, patch around an issue where the Nix configure step pulls in the
+        # For Nix 2.4, patch around an issue where the Nix configure step pulls in the
         # build system's bash and other utilities when cross-compiling
-        lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly30) ''
+        lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly24) ''
           mkdir tmp/
           substitute corepkgs/config.nix.in tmp/config.nix.in \
             --subst-var-by bash ${bash}/bin/bash \
@@ -198,14 +198,14 @@ in rec {
   });
 
   nixUnstable = lib.lowPrio (callPackage common rec {
-    name = "nix-3.0${suffix}";
-    suffix = "pre20201020_e0ca98c";
+    name = "nix-2.4${suffix}";
+    suffix = "pre20201102_550e11f";
 
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "e0ca98c2071b815578470e280df8fdb750c7e23b";
-      hash = "sha256-KVS/Z6FzMBOl5XCyOLwfiVoX7G2LQRa9HMGNnJRPCoo=";
+      rev = "550e11f077ae508abde5a33998a9d4029880e7b2";
+      sha256 = "186grfxsfqg7r92wgwbma66xc7p3iywn43ff7s59m4g6bvb0qgcl";
     };
 
     inherit storeDir stateDir confDir boehmgc;

From 42cc40ddc8109e682a31ad1971c2f0450c5dd839 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Mon, 2 Nov 2020 21:59:00 +0100
Subject: [PATCH 1006/3942] neovim: fix nodejs and ruby generation

These were not translated correctly in the new wrapper.
---
 pkgs/applications/editors/neovim/utils.nix   | 7 ++++---
 pkgs/applications/editors/neovim/wrapper.nix | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index d3af8ca5d59a..906a726924f9 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -24,7 +24,7 @@ let
     withPython2 ? false
     /* the function you would have passed to python.withPackages */
     , extraPython2Packages ? (_: [ ])
-    ,  withPython3 ? true
+    , withPython3 ? true
     /* the function you would have passed to python3.withPackages */
     , extraPython3Packages ? (_: [ ])
     , withNodeJs ? false
@@ -45,7 +45,6 @@ let
         '';
       };
 
-
       requiredPlugins = vimUtils.requiredPlugins configure;
       getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ]));
 
@@ -104,9 +103,11 @@ let
       wrapperArgs = makeWrapperArgs;
       inherit neovimRcContent;
       inherit manifestRc;
-      inherit rubyEnv;
       inherit python2Env;
       inherit python3Env;
+      inherit withNodeJs;
+    } // lib.optionalAttrs withRuby {
+      inherit rubyEnv;
     };
 
     genProviderSettings = prog: withProg:
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index d18d13a050fe..71bc38eadcfb 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -18,8 +18,8 @@ let
     , manifestRc ? null
     , withPython2 ? true, python2Env ? null
     , withPython3 ? true,  python3Env ? null
-    , withNodeJs? false
-    , withRuby ? true, rubyEnv ? null
+    , withNodeJs ? false
+    , rubyEnv ? null
     , vimAlias ? false
     , viAlias ? false
     , ...
@@ -52,7 +52,7 @@ let
       + optionalString withPython3 ''
         makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH
       ''
-      + optionalString withRuby ''
+      + optionalString (rubyEnv != null) ''
         ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
       ''
       + optionalString withNodeJs ''

From 8edf9cf5d052743edf9581f1aa747f5991b63b3e Mon Sep 17 00:00:00 2001
From: Will Young <lost.networking@gmail.com>
Date: Mon, 2 Nov 2020 15:55:07 +0100
Subject: [PATCH 1007/3942] spidermonkey: 78.1.0 -> 78.4.0

---
 .../interpreters/spidermonkey/78.nix          | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix
index 84897ee84639..a3d7242f453d 100644
--- a/pkgs/development/interpreters/spidermonkey/78.nix
+++ b/pkgs/development/interpreters/spidermonkey/78.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "spidermonkey";
-  version = "78.1.0";
+  version = "78.4.0";
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
-    sha256 = "18k47dl9hbnpqw69csxjar5dhwa7r8k7j9kvcfgmwb1iv6ba601n";
+    sha256 = "1z3hj45bnd12z3g6ajv9qrgclca7fymi1sxj9l9nh9q6y6xz0g4f";
   };
 
   outputs = [ "out" "dev" ];
@@ -52,18 +52,6 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  patches = [
-    # https://mail.gnome.org/archives/distributor-list/2020-August/msg00000.html
-    (fetchpatch {
-      url = "https://github.com/ptomato/mozjs/commit/b2974f8a6558d2dc4517b49ee313a9900a853285.patch";
-      sha256 = "1bl5mbx7gmad6fmpc427263i1ychi2linpg69kxlr2w91r5m6ji3";
-    })
-    (fetchpatch {
-      url = "https://github.com/ptomato/mozjs/commit/e5a2eb99f653ae03c67e536df1d55d265a0a1605.patch";
-      sha256 = "0xhy63nw2byibmjc41yh6dwpg282nylganrs5aprn9pbqbcpsvif";
-    })
-  ];
-
   preConfigure = ''
     export CXXFLAGS="-fpermissive"
     export LIBXUL_DIST=$out
@@ -101,9 +89,9 @@ stdenv.mkDerivation rec {
 
   # Remove unnecessary static lib
   preFixup = ''
-    moveToOutput bin/js60-config "$dev"
+    moveToOutput bin/js78-config "$dev"
     rm $out/lib/libjs_static.ajs
-    ln -s $out/bin/js60 $out/bin/js
+    ln -s $out/bin/js78 $out/bin/js
   '';
 
   enableParallelBuilding = true;
@@ -112,7 +100,7 @@ stdenv.mkDerivation rec {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = "https://developer.mozilla.org/en/SpiderMonkey";
     license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
-    maintainers = [ maintainers.abbradar ];
+    maintainers = with maintainers; [ abbradar lostnet ];
     platforms = platforms.linux;
   };
 }

From 968348bd188315597c94e40b19442b45b2da4ec5 Mon Sep 17 00:00:00 2001
From: Yury Bulka <setthemfree@privacyrequired.com>
Date: Tue, 3 Nov 2020 00:27:54 +0200
Subject: [PATCH 1008/3942] tor-browser-bundle-bin: mark as broken

NoScript is missing / broken; Highest Security Level doesn't disable
JavaScript.

See issue #83096 for more info.
---
 .../networking/browsers/tor-browser-bundle-bin/default.nix       | 1 +
 1 file changed, 1 insertion(+)

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 d362e4c9b253..842ce9ba9a3b 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -409,5 +409,6 @@ stdenv.mkDerivation rec {
     # the compound is "libre" in a strict sense (some components place certain
     # restrictions on redistribution), it's free enough for our purposes.
     license = licenses.free;
+    broken = true;
   };
 }

From 66229110d15ec81a0c8a5949d67f167dcd2c0d80 Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Fri, 23 Oct 2020 16:59:19 -0600
Subject: [PATCH 1009/3942] timekeeper: init at v1.0

---
 maintainers/maintainer-list.nix               |  6 +++
 .../office/timekeeper/default.nix             | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 52 insertions(+)
 create mode 100644 pkgs/applications/office/timekeeper/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e0c9d2bdf189..d944b78b320b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1260,6 +1260,12 @@
     githubId = 7214361;
     name = "Roman Gerasimenko";
   };
+  bburdette = {
+    email = "bburdette@protonmail.com";
+    github = "bburdette";
+    githubId = 157330;
+    name = "Ben Burdette";
+  };
   bzizou = {
     email = "Bruno@bzizou.net";
     github = "bzizou";
diff --git a/pkgs/applications/office/timekeeper/default.nix b/pkgs/applications/office/timekeeper/default.nix
new file mode 100644
index 000000000000..60b4bad60bb4
--- /dev/null
+++ b/pkgs/applications/office/timekeeper/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, fetchFromGitHub
+, poco
+, pkg-config
+, gnome2
+, gtkmm2
+, lib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "timekeeper";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "bburdette";
+    repo = "TimeKeeper";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    sha256 = "03rvzkygnn7igcindbb5bcmfy0l83n0awkzprsnhlb6ndxax3k9w";
+  };
+
+  nativeBuildInputs = [
+    poco
+    pkg-config
+  ];
+
+  buildInputs = [
+    gtkmm2
+    gnome2.libglademm
+    gnome2.libglade
+  ];
+
+  installPhase = ''
+    install -Dm755 TimeKeeper/TimeKeeper $out/bin/timekeeper
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Log hours worked and make reports";
+    homepage = "https://github.com/bburdette/TimeKeeper";
+    maintainers = with maintainers; [ bburdette ];
+    platforms = [ "x86_64-linux" ];
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1128de292db6..e2cf0788ebb6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7379,6 +7379,8 @@ in
 
   timetable = callPackage ../applications/office/timetable { };
 
+  timekeeper = callPackage ../applications/office/timekeeper { };
+
   timezonemap = callPackage ../development/libraries/timezonemap { };
 
   tzupdate = callPackage ../applications/misc/tzupdate { };

From 255690f7183f64eae8673664c5ec12f3584507fb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 23:19:49 +0000
Subject: [PATCH 1010/3942] libfilezilla: 0.24.1 -> 0.25.0

---
 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 455d42e30502..e5b76b1435fa 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libfilezilla";
-  version = "0.24.1";
+  version = "0.25.0";
 
   src = fetchurl {
     url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-/dW07hkWr3sdQC591GfwXfdiS7ZfuVoIdaA3EuzC1v0=";
+    sha256 = "0akvki7n5rwmc52wss25i3h4nwl935flhjypf8dx3lvf4jszxxiv";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 2549a11c5834aaac383694050d5c01765185f4e2 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Tue, 3 Nov 2020 00:33:51 +0100
Subject: [PATCH 1011/3942] freepops: remove

this software has not received any update since 2014, the website
is stating that it is unmaintained:

http://freepops.sourceforge.net/

It is also marked broken since 6 years
---
 pkgs/servers/mail/freepops/default.nix | 29 --------------------------
 pkgs/top-level/all-packages.nix        |  2 --
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/servers/mail/freepops/default.nix

diff --git a/pkgs/servers/mail/freepops/default.nix b/pkgs/servers/mail/freepops/default.nix
deleted file mode 100644
index 5f027c89af8c..000000000000
--- a/pkgs/servers/mail/freepops/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{stdenv, fetchurl, pkgconfig, openssl, lua5, curl, readline, bison, expat}:
-
-stdenv.mkDerivation {
-  name = "freepops-0.2.9";
-  src = fetchurl {
-    url = "mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz";
-    sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae";
-  };
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl lua5 curl readline bison expat];
-  configurePhase =
-  ''
-    export WHERE=$prefix/
-    export LOCALEDIR=$prefix/share/locale/
-    ./configure.sh linux
-  '';
-
-  meta = {
-    description = "An extensible pop3 server";
-    longDescription = ''
-      FreePOPs is an extensible pop3 server. Its main purpose is to provide
-      a pop3 interface to a webmail.
-    '';
-    homepage = "http://www.freepops.org/";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [ pierron ];
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6269c16b5cf7..bf0c8d679af1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16674,8 +16674,6 @@ in
 
   frab = callPackage ../servers/web-apps/frab { };
 
-  freepops = callPackage ../servers/mail/freepops { };
-
   freeradius = callPackage ../servers/freeradius { };
 
   freeswitch = callPackage ../servers/sip/freeswitch {

From 89dd2293cc325592072bdf8007b58721dc10e39c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 23:35:04 +0000
Subject: [PATCH 1012/3942] libjcat: 0.1.3 -> 0.1.4

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

diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix
index bbf0db233821..1eca110f8cb5 100644
--- a/pkgs/development/libraries/libjcat/default.nix
+++ b/pkgs/development/libraries/libjcat/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libjcat";
-  version = "0.1.3";
+  version = "0.1.4";
 
   outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "libjcat";
     rev = version;
-    sha256 = "157bi1v9qqk45rkq7lg08l7g3bxwacl4h89vnr7msjmg0hri36kc";
+    sha256 = "156sykcdzdfmd7va59qld4gyzhbf2yk1dfgifi494g6i99zyigfh";
   };
 
   patches = [

From fe4c52b62883973650da8223e4848e372c9274d7 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Tue, 3 Nov 2020 00:46:09 +0100
Subject: [PATCH 1013/3942] gnomeExtensions.battery-status: remove (broken)

upsstream project is no more maintained for recent
gnome-shell releases
---
 .../extensions/battery-status/default.nix     | 30 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/extensions/battery-status/default.nix

diff --git a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
deleted file mode 100644
index c6518201da01..000000000000
--- a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "gnome-shell-extension-battery-status";
-  version = "6";
-
-  src = fetchFromGitHub {
-    owner = "milliburn";
-    repo = "gnome-shell-extension-battery_status";
-    rev = "v${version}";
-    sha256 = "1w83h863mzffjnmk322xq90qf3y9dzay1w9yw5r0qnbsq1ljl8p4";
-  };
-
-  uuid = "battery_status@milliburn.github.com";
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/gnome-shell/extensions
-    cp -r ${uuid} $out/share/gnome-shell/extensions/
-    runHook postInstall
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Configurable lightweight battery charge indicator and autohider";
-    license = licenses.gpl2;
-    broken = true; # not compatable with latest GNOME
-    maintainers = with maintainers; [ jonafato ];
-    homepage = "https://github.com/milliburn/gnome-shell-extension-battery_status";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6269c16b5cf7..d5ddd5877ebc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25875,7 +25875,6 @@ in
   gnomeExtensions = recurseIntoAttrs {
     appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { };
     arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { };
-    battery-status = callPackage ../desktops/gnome-3/extensions/battery-status { };
     caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };
     clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { };
     dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };

From 0876f3582347cac28a6b237c2f62b3aaff1e9031 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 3 Nov 2020 00:24:54 +0100
Subject: [PATCH 1014/3942] terraform-providers.hcloud: 1.16.0 -> 1.22.0

---
 .../cluster/terraform-providers/default.nix   |  1 +
 .../terraform-providers/hcloud/default.nix    | 32 +++++++++++++++++++
 .../terraform-providers/providers.json        |  7 ----
 3 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index a75500c8eb37..4467e8304db6 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -164,6 +164,7 @@ let
     cloudfoundry = callPackage ./cloudfoundry {};
     elasticsearch = callPackage ./elasticsearch {};
     gandi = callPackage ./gandi {};
+    hcloud = callPackage ./hcloud {};
     keycloak = callPackage ./keycloak {};
     libvirt = callPackage ./libvirt {};
     lxd = callPackage ./lxd {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix
new file mode 100644
index 000000000000..89a22c718efb
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "terraform-provider-hcloud";
+  version = "1.22.0";
+
+  src = fetchFromGitHub {
+    owner = "hetznercloud";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1h4kplrmpsbwa0nq3zyqa0cnvhv1s5avdrjyf1k1f2z6b6h4gynf";
+  };
+
+  vendorSha256 = "070p34g0ca55rmfdwf1l53yr8vyhmm5sb8hm8q036n066yp03yfs";
+
+  # Spends an awful time in other test folders, apparently tries to reach
+  # opencensus and fails.
+  checkPhase = ''
+    pushd hcloud
+    go test -v
+    popd
+  '';
+
+  postInstall = "mv $out/bin/terraform-provider-hcloud{,_v${version}}";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry";
+    description = "Terraform provider for cloudfoundry";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ ris ];
+  };
+}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 29bbac6f70bb..d779d898fd19 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -367,13 +367,6 @@
     "sha256": "00l3cwvyyjk0n3j535qfj3bsf1s5l07786gnxycj0f8vz3a06bcq",
     "version": "1.6.0"
   },
-  "hcloud": {
-    "owner": "terraform-providers",
-    "repo": "terraform-provider-hcloud",
-    "rev": "v1.16.0",
-    "sha256": "09v2bg4ffyh4ibz449dygxgd7mvjgh4b2r242l3cwi7pzn66imrz",
-    "version": "1.16.0"
-  },
   "hedvig": {
     "owner": "terraform-providers",
     "repo": "terraform-provider-hedvig",

From c02f2fc1148a22b78692bf2ac66d526e0b95e783 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 3 Nov 2020 01:05:11 +0100
Subject: [PATCH 1015/3942] terraform-providers.tls: 2.1.1 -> 3.0.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index d779d898fd19..d1107cdfee2c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -939,9 +939,9 @@
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/tls",
     "repo": "terraform-provider-tls",
-    "rev": "v2.1.1",
-    "sha256": "1qsx540pjcq4ra034q2dwnw5nmzab5h1c3vm20ppg5dkhhyiizq8",
-    "version": "2.1.1"
+    "rev": "v3.0.0",
+    "sha256": "1p9d5wrr4xwf2i930zlcarm1zl8ysj3nyc6rrbhpxk04kr6ap0wz",
+    "version": "3.0.0"
   },
   "triton": {
     "owner": "terraform-providers",

From 19fceb5c48f414f72b19a85d398605d61b29c2ad Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 3 Nov 2020 01:05:44 +0100
Subject: [PATCH 1016/3942] terraform-providers.local: 1.4.0 -> 2.0.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index d1107cdfee2c..a27459eb7266 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -506,9 +506,9 @@
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/local",
     "repo": "terraform-provider-local",
-    "rev": "v1.4.0",
-    "sha256": "1k1kbdn99ypn1pi6vqbs1l9a8vvf4vs32wl8waa16i26514sz1wk",
-    "version": "1.4.0"
+    "rev": "v2.0.0",
+    "sha256": "0c1mk63lh3qmj8pl80lyvvsgyg4gg7673abr8cfxrj45635h74z5",
+    "version": "2.0.0"
   },
   "logentries": {
     "owner": "terraform-providers",

From 2eade6cd1a5bf5d3e03bf0f90a8a3d5f8bbb92d6 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 3 Nov 2020 01:07:09 +0100
Subject: [PATCH 1017/3942] terraform-providers.archive: 1.3.0 -> 2.0.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a27459eb7266..50b9d30edbb9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -33,9 +33,9 @@
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/archive",
     "repo": "terraform-provider-archive",
-    "rev": "v1.3.0",
-    "sha256": "1hwg8ai4bvsmgnl669608lr4v940xnyig1xshps490f47c8hqy6y",
-    "version": "1.3.0"
+    "rev": "v2.0.0",
+    "sha256": "1d5n379zyjp2srg43g78a8h33qwcpkfkj7c35idvbyydi35vzlpl",
+    "version": "2.0.0"
   },
   "arukas": {
     "owner": "terraform-providers",

From 306ca0ddbdc30da125352c10fb4139e23e399711 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 3 Nov 2020 01:07:33 +0100
Subject: [PATCH 1018/3942] terraform-providers.external: 1.2.0 -> 2.0.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 50b9d30edbb9..ced3a317a515 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -293,9 +293,9 @@
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/external",
     "repo": "terraform-provider-external",
-    "rev": "v1.2.0",
-    "sha256": "1kx28bffhd1pg3m0cbldclc8l9zic16mqrk7gybcls9vyds5gbvc",
-    "version": "1.2.0"
+    "rev": "v2.0.0",
+    "sha256": "16wciz08gicicsirij2ql0gy8dg0372jjsqmaigkl2n07mqz2b6a",
+    "version": "2.0.0"
   },
   "fastly": {
     "owner": "terraform-providers",

From fb3f86c2b5634cc4ac5e3450a7a0b97965c9ca3b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 3 Nov 2020 01:08:21 +0100
Subject: [PATCH 1019/3942] terraform-providers.null: 2.1.2 -> 3.0.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index ced3a317a515..d60e6a909c57 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -612,9 +612,9 @@
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/null",
     "repo": "terraform-provider-null",
-    "rev": "v2.1.2",
-    "sha256": "0di1hxmd3s80sz8hl5q2i425by8fbk15f0r4jmnm6vra0cq89jw2",
-    "version": "2.1.2"
+    "rev": "v3.0.0",
+    "sha256": "0r1kvsc96922i85hdvf1pk8aicxjr6bc69gc63qi21hrl0jpvr7r",
+    "version": "3.0.0"
   },
   "nutanix": {
     "owner": "terraform-providers",

From 55dc43720f1be3f7e4d5ceabfa894487605327fb Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 3 Nov 2020 01:08:48 +0100
Subject: [PATCH 1020/3942] terraform-providers.random: 2.2.1 -> 3.0.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index d60e6a909c57..f87d115547a7 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -782,9 +782,9 @@
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/random",
     "repo": "terraform-provider-random",
-    "rev": "v2.2.1",
-    "sha256": "1qklsxj443vsj61lwl7qf7xwgnllwcvb2yk6s0kn9g3iq63pcv30",
-    "version": "2.2.1"
+    "rev": "v3.0.0",
+    "sha256": "00dkpcri9ckp0kxwgh3p8175cyd44m8z13cb013pm4mrr61n4wq9",
+    "version": "3.0.0"
   },
   "rightscale": {
     "owner": "terraform-providers",

From 86adcfa09225f6f32bb5e2e9fa74230b0026bbec Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 3 Nov 2020 01:09:10 +0100
Subject: [PATCH 1021/3942] terraform-providers.template: 2.1.2 -> 2.2.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index f87d115547a7..83843a82a669 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -902,9 +902,9 @@
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/template",
     "repo": "terraform-provider-template",
-    "rev": "v2.1.2",
-    "sha256": "18w1mmma81m9j7yf6q500w8v9ss28w6sw2ynssl99pyw2gwmd04q",
-    "version": "2.1.2"
+    "rev": "v2.2.0",
+    "sha256": "12pn1i06jz4xl50md94yfdggg3pg5bv1viwf35izizm5rnyksyv2",
+    "version": "2.2.0"
   },
   "tencentcloud": {
     "owner": "terraform-providers",

From 76acdc7bf4bbfc809306e07bb4e68cb102f16222 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 00:23:10 +0000
Subject: [PATCH 1022/3942] kubeseal: 0.12.6 -> 0.13.1

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

diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix
index 51b53ed8fa18..51ae1202a378 100644
--- a/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/pkgs/applications/networking/cluster/kubeseal/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "kubeseal";
-  version = "0.12.6";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "bitnami-labs";
     repo = "sealed-secrets";
     rev = "v${version}";
-    sha256 = "0h8v751jf8hws8zcai6vfsk5vmq6f9kwz2dg79l6xa0dfc2rv4zf";
+    sha256 = "1hlj7i7pjyvrf9cpx6s41sdn7wjwfk7c0akx45kw662vrxcqcgf2";
   };
 
   vendorSha256 = null;

From b55e44549444a676376ef3b2fc317be70659529f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 00:30:15 +0000
Subject: [PATCH 1023/3942] libgpiod: 1.5.2 -> 1.6

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

diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
index 68078bbc9a03..25eb4290e511 100644
--- a/pkgs/development/libraries/libgpiod/default.nix
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libgpiod";
-  version = "1.5.2";
+  version = "1.6";
 
   src = fetchurl {
     url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
-    sha256 = "1bknh7kn5gxc8xwf913lsdm9zgn1bwj42nsnp6kbkyn6ip7s6c4r";
+    sha256 = "0xcwrg4p4w925lijmz4ci4500z83kj5gs1n501q4vhi54bdzn2k5";
   };
 
   buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ];

From b7f975308597eff58c48407a155e0e67d04d7f44 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 00:50:00 +0000
Subject: [PATCH 1024/3942] libimagequant: 2.12.6 -> 2.13.0

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

diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix
index 44fa395204bb..2bfc9ec96cac 100644
--- a/pkgs/development/libraries/libimagequant/default.nix
+++ b/pkgs/development/libraries/libimagequant/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libimagequant";
-  version = "2.12.6";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = pname;
     rev = version;
-    sha256 = "00w7fny3xf14cfyhbdnmqyh9ddqdh1irvgzxd35a2z65kp7vnvj0";
+    sha256 = "12alfvq761nhdl927aj93yv3r6rzxlf7csdr28xgga7cz53fmrrp";
   };
 
   preConfigure = ''

From 573dde99db5a973b4caa07970741e73f70e13e70 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 00:54:29 +0000
Subject: [PATCH 1025/3942] libavif: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix
index 7b6d1ecfbb27..e8fdc6eb206b 100644
--- a/pkgs/development/libraries/libavif/default.nix
+++ b/pkgs/development/libraries/libavif/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libavif";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "AOMediaCodec";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1fs222cn1d60pv5fjsr92axk5dival70b6yqw0wng5ikk9zsdkhy";
+    sha256 = "0f0l8ywz2jhc9mkfrzdxdvr3q39a404yn9wcyvqshfbkbprsan4p";
   };
 
   # reco: encode libaom slowest but best, decode dav1d fastest

From 8565462e9beabdf462459646b3fe8d79ef4a644d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 01:00:24 +0000
Subject: [PATCH 1026/3942] rdkafka: 1.4.4 -> 1.5.2

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

diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 308fadbdfd8e..a7774d1e5951 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rdkafka";
-  version = "1.4.4";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "edenhill";
     repo = "librdkafka";
     rev = "v${version}";
-    sha256 = "0y4m29wyvhhxb7fap9z07zwgcqlr4ifwynf8a7yp5ldjpzfzxpix";
+    sha256 = "0qm9rvvkqypqh0vpgkrlqgaxkqdvs3finpr5niwxc6ypblc3ir1g";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 3024a74046cce1b16b2ea2c6078f5794969b5dd0 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Fri, 30 Oct 2020 15:23:54 -0400
Subject: [PATCH 1027/3942] wrangler: 1.10.3 -> 1.12.2

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

diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix
index fd84afb16175..8844ed255886 100644
--- a/pkgs/development/tools/wrangler/default.nix
+++ b/pkgs/development/tools/wrangler/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }:
 
 rustPlatform.buildRustPackage rec {
   pname = "wrangler";
-  version = "1.10.3";
+  version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0703zlrmv0if575rj1mrgfg1a5qbf98sqjhhj09hab69i96wbrk9";
+    sha256 = "1w0j6if1fnih1036hlb9a3c6wgjw4p057llhjf0f3d568ah1244a";
   };
 
-  cargoSha256 = "0znzyqzvbqcl4mmxpsvaf592xrs968x57czj45jibmafq033dbfa";
+  cargoSha256 = "0d9wvdjjakznz8dnqx4gqxh0xkxrh4229460hg6dr9qn492p7nfx";
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
+  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config perl ];
 
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [

From 6373a64873aeba391a5bea3d680583b3d571cf58 Mon Sep 17 00:00:00 2001
From: Travis CI <travis@travis-ci.org>
Date: Tue, 3 Nov 2020 01:53:25 +0000
Subject: [PATCH 1028/3942] gitAndTools.git-machete: 2.15.6 -> 2.15.7

###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  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 linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
---
 .../version-management/git-and-tools/git-machete/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index cbb69403531e..dac3c54a16a6 100644
--- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonApplication rec {
   pname = "git-machete";
-  version = "2.15.6";
+  version = "2.15.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ajb3m3i3pfc5v3gshglk7qphk1rpniwx8q8isgx1a6cyarzr9bd";
+    sha256 = "0djbl4s9i7bs7kkldr7453yayi38s8mx0i41mkd0j2cvv5r9himr";
   };
 
   nativeBuildInputs = [ installShellFiles pbr ];

From e2b32e0567551ca43471e1bf1923bb8c928ae6fa Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Nov 2020 17:48:26 -0800
Subject: [PATCH 1029/3942] .github/CODEOWNERS: add jonringer to neovim

---
 .github/CODEOWNERS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7d6d7205a144..0da1e4c91a77 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -176,6 +176,9 @@
 /pkgs/applications/editors/emacs       @adisbladis
 /pkgs/top-level/emacs-packages.nix     @adisbladis
 
+# Neovim
+/pkgs/applications/editors/neovim      @jonringer
+
 # VimPlugins
 /pkgs/misc/vim-plugins         @jonringer @softinio
 

From cc5cd81e5effbb5afe85ba6751e1a0bdfeafc8ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 02:13:44 +0000
Subject: [PATCH 1030/3942] mdds: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index a65e6b2153d7..c01e3fe6bc0f 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mdds";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchurl {
     url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2";
-    sha256 = "0zg0v9rfs92ff1gpnb06gzbxbnd9nqdar5fk8dnkmy0jpnf5qn7i";
+    sha256 = "1kzy70b18f2dsqarmdmzbj9nc9kf2lvc5xxgkg6wdax3jf12lsm6";
   };
 
   postInstall = ''

From ef16b3f77cbbe3b05e7ade61a9c6d3ecd3711953 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@gmail.com>
Date: Sun, 1 Nov 2020 13:14:53 -0500
Subject: [PATCH 1031/3942] linuxPackages.xpadneo: 0.8.3 -> 0.8.4

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

diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix
index 5f1018969212..e0e2bcc21d9b 100644
--- a/pkgs/os-specific/linux/xpadneo/default.nix
+++ b/pkgs/os-specific/linux/xpadneo/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, kernel, bluez }:
+{ lib, stdenv, fetchFromGitHub, kernel, bluez }:
 
 stdenv.mkDerivation rec {
   pname = "xpadneo";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "atar-axis";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1g3ml7vq0dzwl9815c3l0i0qz3a7v8c376c6dqbfkbj2f1d43vqs";
+    sha256 = "113xa2mxs2hc4fpjdk3jhhchy81kli6jxdd6vib7zz61n10cjb85";
   };
 
   setSourceRoot = ''
@@ -34,10 +34,11 @@ stdenv.mkDerivation rec {
   installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
   installTargets = [ "modules_install" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Advanced Linux driver for Xbox One wireless controllers";
     homepage = "https://atar-axis.github.io/xpadneo";
     license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ metadark ];
     platforms = platforms.linux;
   };
 }

From 76ff5a73c7ce67eab69258e0a31d907eb1d3a48b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Nov 2020 22:00:00 -0500
Subject: [PATCH 1032/3942] gitAndTools.git-absorb: 0.6.5 -> 0.6.6

---
 .../git-and-tools/git-absorb/default.nix               | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
index 46a6f817417f..d8e34f570058 100644
--- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
@@ -2,23 +2,27 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-absorb";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner  = "tummychow";
     repo   = pname;
     rev    = "refs/tags/${version}";
-    sha256 = "12ih0gm07ddi86jy612f029nzav345v57pjajyy9lw017g6n6mjb";
+    sha256 = "04v10bn24acify34vh5ayymsr1flcyb05f3az9k1s2m6nlxy5gb9";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
 
-  cargoSha256 = "0x2zcw0bpwqimvbb5xj8xawvl4jcvk5lj0y2mm5ncbdapzyqdsb2";
+  cargoSha256 = "0h0vlz4qd8i9bf1mgjr618zbdwfp6bmy7ql9a1xzjmfdpkl3cgk9";
 
   postInstall = ''
     installManPage Documentation/git-absorb.1
+    for shell in bash zsh fish; do
+      $out/bin/git-absorb --gen-completions $shell > git-absorb.$shell
+      installShellCompletion git-absorb.$shell
+    done
   '';
 
   meta = with stdenv.lib; {

From 428701ba392d7edf97b40a08516bd4663f8b2f80 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 13:31:57 +0000
Subject: [PATCH 1033/3942] krename: 5.0.0 -> 5.0.1

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

diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index 578c56a748a7..c1e031b7277d 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -7,14 +7,14 @@
 
 let
   pname = "krename";
-  version = "5.0.0";
+  version = "5.0.1";
 
 in mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "136j1dkqrhv458rjh5v3vzjhvq6dhz7k79zk6mmx8zvqacc7cq8a";
+    sha256 = "0zbadxjp13jqxgb58wslhm0wy2lhpdq1bgbvyhyn21mssfppib6a";
   };
 
   buildInputs = [ taglib exiv2 podofo ];

From b7718d5f410b6c06243a41291d33b1a1fcd67f6e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 03:46:26 +0000
Subject: [PATCH 1034/3942] mbuffer: 20200505 -> 20200929

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

diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index d86f824b87fa..4007a3f77388 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -3,12 +3,12 @@
  } :
 
 stdenv.mkDerivation rec {
-  version = "20200505";
+  version = "20200929";
   pname = "mbuffer";
 
   src = fetchurl {
     url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
-    sha256 = "02qzy3appah0llg6aa71isl2a5nc93bkzy5r4d682lcy2j1n216c";
+    sha256 = "1s6lxbqba2hwnvrdrwk0fpnff62gv0ynah4ql0c9y14s9v0y79jk";
   };
 
   buildInputs = [ openssl ];

From 08529284988c6b7487e53ea0f8604e9c96652a35 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 04:03:01 +0000
Subject: [PATCH 1035/3942] mdk: 1.2.10 -> 1.3.0

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

diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix
index 2a0b18806011..5c8924ee21be 100644
--- a/pkgs/development/tools/mdk/default.nix
+++ b/pkgs/development/tools/mdk/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib }:
 
 stdenv.mkDerivation {
-  name = "gnu-mdk-1.2.10";
+  name = "gnu-mdk-1.3.0";
   src = fetchurl {
-    url = "https://ftp.gnu.org/gnu/mdk/v1.2.10/mdk-1.2.10.tar.gz";
-    sha256 = "1rwcq2b5vvv7318j92nxc5dayj27dpfhzc4rjiv4ccvsc0x35x5h";
+    url = "https://ftp.gnu.org/gnu/mdk/v1.3.0/mdk-1.3.0.tar.gz";
+    sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ intltool glib ];

From 258bae917a76e393beb4d7409b616498aae39d91 Mon Sep 17 00:00:00 2001
From: Moises Nessim <moises.nessim@topmanage.com>
Date: Mon, 2 Nov 2020 23:10:37 -0500
Subject: [PATCH 1036/3942] Move to backup file to change LICENSE to lowercase.

---
 pkgs/development/tools/build-managers/msbuild/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix
index aea215cc927d..1b805df95a08 100644
--- a/pkgs/development/tools/build-managers/msbuild/default.nix
+++ b/pkgs/development/tools/build-managers/msbuild/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     nuget sources Add -Name nixos -Source $(pwd)/nixos
 
     # license check is case sensitive
-    mv LICENSE license
+    mv LICENSE license.bak && mv license.bak license
 
     mkdir -p artifacts
     unzip ${xplat} -d artifacts

From 1c9458a4856b14868512eb61607c1b2f5d9517f2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 3 Nov 2020 04:20:00 +0000
Subject: [PATCH 1037/3942] nvchecker: 2.1 -> 2.2

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

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index c85e45a239cd..b675fa6f06be 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "nvchecker";
-  version = "2.1";
+  version = "2.2";
 
   # Tests not included in PyPI tarball
   src = fetchFromGitHub {
     owner = "lilydjwg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0zf9vhf8ka0v1mf1xhbvkc2nr54m0rkiw1i68ps4sgx2mdj6qrfk";
+    sha256 = "0b17pikqyxcsid69lwnjl44n8z46ydjmxxdnbzasfdl7r83l7ijr";
   };
 
   nativeBuildInputs = [ installShellFiles docutils ];

From 88915f1e8ae27b3bc8bc00172fa2a19bfdff5016 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 04:24:59 +0000
Subject: [PATCH 1038/3942] libtins: 4.2 -> 4.3

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

diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix
index 60bb092c6fa4..bde1cbf44e1f 100644
--- a/pkgs/development/libraries/libtins/default.nix
+++ b/pkgs/development/libraries/libtins/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libtins";
-  version = "4.2";
+  version = "4.3";
 
   src = fetchFromGitHub {
     owner = "mfontanini";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0gv661gdf018zk1sr6fnvcmd5akqjihs4h6zzxv6881v6yhhglrz";
+    sha256 = "09ah1a7ska7xiki7625mn1d8i96il3hxbkc39ba8fn1a5383kmqa";
   };
 
   postPatch = ''

From aea6594c693750e5b0a747a2fad061a33f623dd5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 04:38:29 +0000
Subject: [PATCH 1039/3942] marvin: 20.17.0 -> 20.19.0

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

diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
index e8cd077afd20..84a1034849f7 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "marvin";
-  version = "20.17.0";
+  version = "20.19.0";
 
   src = fetchurl {
     name = "marvin-${version}.deb";
     url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
-    sha256 = "0ip6ma9ivk5b74s9najn2rrkiha7hya1rjhgyrc71kwsj5gqgli0";
+    sha256 = "0b9a0yl3mxfb2dfdkgs2wphhxsgwixqk6nl2hsn1ly3gz53cws1q";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper ];

From 809c4f6588feb120c500e161a7b079290f84cee7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 05:28:04 +0000
Subject: [PATCH 1040/3942] lxtask: 0.1.9 -> 0.1.10

---
 pkgs/desktops/lxde/core/lxtask/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index 2bb281494bd7..a1525ec8b734 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lxtask";
-  version = "0.1.9";
+  version = "0.1.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
-    sha256 = "0cv4hx5dg01hbyi5p10pl78n0a40xajpq4wx9c7886pkmpq8isj1";
+    sha256 = "0b2fxg8jjjpk219gh7qa18g45365598nd2bq7rrq0bdvqjdxy5i2";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From a8c7df420780970098c7df5d5bd8d4a9340ff8c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 3 Nov 2020 06:54:51 +0100
Subject: [PATCH 1041/3942] rocm-thunk: 3.8.0 -> 3.9.0

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

diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix
index ba780ae4bd6b..63e66f35f810 100644
--- a/pkgs/development/libraries/rocm-thunk/default.nix
+++ b/pkgs/development/libraries/rocm-thunk/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rocm-thunk";
-  version = "3.8.0";
+  version = "3.9.0";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
     repo = "ROCT-Thunk-Interface";
     rev = "rocm-${version}";
-    sha256 = "00xrwxndah2frdggqniz1j4s46ha3dav8qlnxm3gk9m4b80m774k";
+    sha256 = "0xkp50ik7miz9whywnmiiqiamc7g8flfr9g8c02kxr0cay1in6cj";
   };
 
   preConfigure = ''

From 94f5288d97d916dca193459be0e6bf4846bc6a4a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 06:14:23 +0000
Subject: [PATCH 1042/3942] limesuite: 20.07.2 -> 20.10.0

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

diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index 013b4978b56a..25f49c3a2d65 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "limesuite";
-  version = "20.07.2";
+  version = "20.10.0";
 
   src = fetchFromGitHub {
     owner = "myriadrf";
     repo = "LimeSuite";
     rev = "v${version}";
-    sha256 = "0v0w0f5ff1gwpfy13x1q1jsx9xfg4s3ccg05ikpnkzj4yg6sjps1";
+    sha256 = "04wzfhzqmxjsa6bgcr4zd518fln9rbwnbabf48kha84d70vzkdlx";
   };
 
   nativeBuildInputs = [ cmake ];

From ecd8d89c3620e6308c4a30a39f202759be110152 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 06:32:05 +0000
Subject: [PATCH 1043/3942] libsidplayfp: 2.0.4 -> 2.0.5

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

diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix
index 95f7beff88ad..5845916239c3 100644
--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/pkgs/development/libraries/libsidplayfp/default.nix
@@ -14,11 +14,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libsidplayfp";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/sidplay-residfp/${pname}/${majorMinor version}/${pname}-${version}.tar.gz";
-    sha256 = "0d866czmnmhnhb2j37rlrdphjdi2b75kak9barm9xqwg2z0nmmhz";
+    sha256 = "04vdrrkh5y9x9rrmj6gdp242ah70b4sslwqfby8wp2riis4hr9z0";
   };
 
   nativeBuildInputs = [ pkgconfig ]

From 97f43fb507e610e54bed5caa8a1ef88fb095fb4c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 06:39:32 +0000
Subject: [PATCH 1044/3942] lidarr: 0.7.1.1381 -> 0.7.2.1878

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

diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix
index 915e4233ebe0..8074329aa1df 100644
--- a/pkgs/servers/lidarr/default.nix
+++ b/pkgs/servers/lidarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lidarr";
-  version = "0.7.1.1381";
+  version = "0.7.2.1878";
 
   src = fetchurl {
     url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.linux.tar.gz";
-    sha256 = "1vk1rlsb48ckdc4421a2qs0v5gy7kc4fad24dm3k14znh7llwypr";
+    sha256 = "0kv0x3vvv4rp3i5k5985zp95mm8ca7gpm7kr82l11v3hm3n6yvqn";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c1115551136ee23db29e94b696faf991f07d91b1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 06:45:16 +0000
Subject: [PATCH 1045/3942] liquidprompt: 1.12.0 -> 1.12.1

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

diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix
index 783c07d16009..9893624eaf86 100644
--- a/pkgs/shells/liquidprompt/default.nix
+++ b/pkgs/shells/liquidprompt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liquidprompt";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "nojhan";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0ibp1bz9s4bp3y5anivg5gp31q78024w39v7hbfw05qy25ax5h60";
+    sha256 = "0vlwwkdbkxjsjcfmcspmq3f163kf0x4mwa8svxkzgnn2g4kl41ja";
   };
 
   installPhase = ''

From 8b0af5deaadec3a798c860abab4864bf5f0224ed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 06:51:31 +0000
Subject: [PATCH 1046/3942] lldpd: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index 8462d907a1f6..5d7c648b2205 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lldpd";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchurl {
     url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
-    sha256 = "16fbqrs3l976gdslx647nds8x7sz4h5h3h4l4yxzrayvyh9b5lrd";
+    sha256 = "1v5fd8vwxracvzvgrsswvhppwyx5c4srj89g1cnvy73w831mpq95";
   };
 
   configureFlags = [

From 1c63f359933b97e00dfc27478d669513ee836637 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 07:13:06 +0000
Subject: [PATCH 1047/3942] memcached: 1.6.6 -> 1.6.8

---
 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 b6c6031f1509..182ca6bcd90e 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.6";
+  version = "1.6.8";
   pname = "memcached";
 
   src = fetchurl {
     url = "https://memcached.org/files/${pname}-${version}.tar.gz";
-    sha256 = "1xrj7vy05nc6bky4wnrmrbxfibvk5vq4dp2fwk4jk4amzbn0x3wh";
+    sha256 = "0fbrrn7mkhv5xci4cffxxb8qzr9c0n3y58jymq2aqlpzyq8klfz2";
   };
 
   configureFlags = [

From b79bfc3b368281432d7437020090760415a72030 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 07:46:35 +0000
Subject: [PATCH 1048/3942] memtester: 4.3.0 -> 4.5.0

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

diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix
index 7b065c6cfa88..870d7e0dd1db 100644
--- a/pkgs/tools/system/memtester/default.nix
+++ b/pkgs/tools/system/memtester/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "memtester";
-  version = "4.3.0";
+  version = "4.5.0";
 
   preConfigure = ''
     echo "$CC" > conf-cc
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz";
-    sha256 = "127xymmyzb9r6dxqrwd69v7gf8csv8kv7fjvagbglf3wfgyy5pzr";
+    sha256 = "0dxfwayns3hjjplkxkpkm1409lmjlpi4chcrahcvdbnl0q6jpmcf";
   };
 
   installFlags = [ "INSTALLPATH=$(out)" ];

From adcf19774cbe7a40e1d0c6d5935dfd6cb2f7d95c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 3 Nov 2020 07:29:45 +0100
Subject: [PATCH 1049/3942] llvmPackages_rocm: 3.8.0 -> 3.9.0

Also fix lld path in the installed CMake files.
---
 pkgs/development/compilers/llvm/rocm/default.nix | 4 ++--
 pkgs/development/compilers/llvm/rocm/lld.nix     | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix
index 3e2c3cec0c1f..aae6f1682807 100644
--- a/pkgs/development/compilers/llvm/rocm/default.nix
+++ b/pkgs/development/compilers/llvm/rocm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, callPackage, wrapCCWith }:
 
 let
-  version = "3.8.0";
+  version = "3.9.0";
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
     repo = "llvm-project";
     rev = "rocm-${version}";
-    sha256 = "19771lxqbm7yhsy06s4bk7amiryrfdbc0jawribw063l7n599xs6";
+    sha256 = "01ljx6mhix3z2pgddgn0ymhrsbigs1nqlz3kkwkr6p2igprrly9f";
   };
 in rec {
   clang = wrapCCWith rec {
diff --git a/pkgs/development/compilers/llvm/rocm/lld.nix b/pkgs/development/compilers/llvm/rocm/lld.nix
index 052bfd1c62d8..34a094bf379c 100644
--- a/pkgs/development/compilers/llvm/rocm/lld.nix
+++ b/pkgs/development/compilers/llvm/rocm/lld.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
   postInstall = ''
     moveToOutput include "$dev"
     moveToOutput lib "$dev"
+
+    # Fix lld binary path for CMake.
+    substituteInPlace "$dev/lib/cmake/lld/LLDTargets-release.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/bin/lld" "$out/bin/lld"
   '';
 
   meta = with stdenv.lib; {

From ea37ad6cd06bdcf37910e2576b677025a206175a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 3 Nov 2020 07:31:05 +0100
Subject: [PATCH 1050/3942] rocm-device-libs: 3.8.0 -> 3.9.0

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

diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix
index bf302ff227c5..4dd96c2c7d9b 100644
--- a/pkgs/development/libraries/rocm-device-libs/default.nix
+++ b/pkgs/development/libraries/rocm-device-libs/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rocm-device-libs";
-  version = "3.8.0";
+  version = "3.9.0";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
     repo = "ROCm-Device-Libs";
     rev = "rocm-${version}";
-    sha256 = "0kgsp22rbg09q09n36j1vfs9v8x0liap3ycnqyn1g7dxy38kqmi4";
+    sha256 = "1nil0nhlkszslgvqhim5vmcp3flfafydviq0zk7db8i6z17kq090";
   };
 
   nativeBuildInputs = [ cmake ];

From dbbfdc0434a25da68b1c1f28927ca09ba4953139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 3 Nov 2020 07:53:32 +0100
Subject: [PATCH 1051/3942] rocm-runtime: 3.8.0 -> 3.9.0

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

diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix
index 57635a3470cb..d3e113b8ded5 100644
--- a/pkgs/development/libraries/rocm-runtime/default.nix
+++ b/pkgs/development/libraries/rocm-runtime/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rocm-runtime";
-  version = "3.8.0";
+  version = "3.9.0";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
     repo = "ROCR-Runtime";
     rev = "rocm-${version}";
-    sha256 = "1lm4cbx1d727zll85vjc1kykc72mk82nfhyyhjljv82gd4mnz00c";
+    sha256 = "034qbqznfligg4lwd95zmqa7lwcda720zbfv066nqvarlcml0kr6";
   };
 
   sourceRoot = "source/src";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ clang-unwrapped elfutils llvm ];
 
   cmakeFlags = [
-   "-DBITCODE_DIR=${rocm-device-libs}/lib"
+   "-DBITCODE_DIR=${rocm-device-libs}/amdgcn/bitcode"
    "-DCMAKE_PREFIX_PATH=${rocm-thunk}"
   ];
 

From b13def4cfbc98b83edfaf48924e3bb4744738d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 3 Nov 2020 08:04:17 +0100
Subject: [PATCH 1052/3942] rocm-comgr: 3.8.0 -> 3.9.0

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

diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix
index 916af5434996..7a122fae39e3 100644
--- a/pkgs/development/libraries/rocm-comgr/default.nix
+++ b/pkgs/development/libraries/rocm-comgr/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rocm-comgr";
-  version = "3.8.0";
+  version = "3.9.0";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
     repo = "ROCm-CompilerSupport";
     rev = "rocm-${version}";
-    sha256 = "05gs282kqnz7lf3b8r1908zk05dbzdx02ar2ns2900fas1l27qc1";
+    sha256 = "1lwgr6x2b6jisc2nxvr9m24zrc7f2vcgrbkj9sf2blpha61xgk14";
   };
 
   sourceRoot = "source/lib/comgr";

From 7b14f860ee6aa0f6344fa8d89f765b0d14ca23ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 3 Nov 2020 08:49:50 +0100
Subject: [PATCH 1053/3942] rocm-cmake: 3.8.0 -> 3.9.0

---
 pkgs/development/tools/build-managers/rocm-cmake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix
index ae2e63e040b1..77a424ae1688 100644
--- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix
+++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rocm-cmake";
-  version = "3.8.0";
+  version = "3.9.0";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
     repo = "rocm-cmake";
     rev = "rocm-${version}";
-    sha256 = "1x1mj1acarhin319zycms8sqm9ylw2mcdbkpqjlb8yfsgiaa99ja";
+    sha256 = "13j7gmcy1j6qsydgccmgiacg6sj38l5mlwn4ck8qizl0cpc14gfm";
   };
 
   nativeBuildInputs = [ cmake ];

From 74dcd27d780f3d57f5083c0f7c8ae9b6b562d9c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 07:55:26 +0000
Subject: [PATCH 1054/3942] mpd: 0.22.1 -> 0.22.2

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

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index d994ba99dfc3..c025da8752de 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -115,13 +115,13 @@ let
 
     in stdenv.mkDerivation rec {
       pname = "mpd";
-      version = "0.22.1";
+      version = "0.22.2";
 
       src = fetchFromGitHub {
         owner  = "MusicPlayerDaemon";
         repo   = "MPD";
         rev    = "v${version}";
-        sha256 = "16cdmr5w1ikz4ih1nwxnynfdf8qiz4k8bak1sazkkhyavzl3jrl4";
+        sha256 = "1pg3h3bvrsp24pv53yvwl5kr4m2csaxffdbrj5rm3b7w6pbqpfix";
       };
 
       buildInputs = [

From 95ae7ef7fde5317e4e43eda0612e6111cd493486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 3 Nov 2020 08:50:47 +0100
Subject: [PATCH 1055/3942] rocclr: 3.8.0 -> 3.9.0

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

diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix
index 2034b658dc7f..9b7d80a2240e 100644
--- a/pkgs/development/libraries/rocclr/default.nix
+++ b/pkgs/development/libraries/rocclr/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rocclr";
-  version = "3.8.0";
+  version = "3.9.0";
 
   src = fetchFromGitHub {
     owner = "ROCm-Developer-Tools";
     repo = "ROCclr";
     rev = "rocm-${version}";
-    sha256 = "05vh70qh6jb7038b1rcmz24bg4an0nw98bv2vn3jcyygj4dr3fmf";
+    sha256 = "193pd6lbnfjrmqsrlvkpadxxi908a9r0c41y8x1bkbbaviad39q0";
   };
 
   nativeBuildInputs = [ cmake rocm-cmake ];
@@ -46,7 +46,10 @@ stdenv.mkDerivation rec {
   ];
 
   preFixup = ''
+    # Work around broken cmake files
     ln -s $out/include/compiler/lib/include/* $out/include
+    ln -s $out/include/elf/elfio $out/include/elfio
+
     substituteInPlace $out/lib/cmake/rocclr/ROCclrConfig.cmake \
       --replace "/build/source/build" "$out"
   '';

From e3154db1078f16447ddb29b57d21aea0913594ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 3 Nov 2020 09:14:38 +0100
Subject: [PATCH 1056/3942] rocm-opencl-runtime: 3.8.0 -> 3.9.0

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

diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix
index 6504ae100434..69ca18318ac3 100644
--- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix
+++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rocm-opencl-runtime";
-  version = "3.8.0";
+  version = "3.9.0";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
     repo = "ROCm-OpenCL-Runtime";
     rev = "rocm-${version}";
-    sha256 = "07zc6ww92nsq1z0gcp1sfhqsk0jkrjnv9cnw5akh471f7n7jiznm";
+    sha256 = "1qsgswm1wl2wknhgy6c9l6dnj0z1kwddimdzjmvjcpyxq987y2gv";
   };
 
   nativeBuildInputs = [ cmake rocm-cmake ];

From 92719cca782cfde89867b47c7f344906712d2761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 3 Nov 2020 09:15:34 +0100
Subject: [PATCH 1057/3942] rocm-smi: 3.8.0 -> 3.9.0

---
 pkgs/tools/system/rocm-smi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix
index 69f523773107..1ef25fd08237 100644
--- a/pkgs/tools/system/rocm-smi/default.nix
+++ b/pkgs/tools/system/rocm-smi/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonApplication rec {
   pname = "rocm-smi";
-  version = "3.8.0";
+  version = "3.9.0";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
     repo = "ROC-smi";
     rev = "rocm-${version}";
-    sha256 = "00g9cbni73x9da05lx7hiffp303mdkj1wpxiavfylr4q4z84yhrz";
+    sha256 = "190x31s7mjpyp7hr6cgdnvn2s20qj3sqcxywycjm2i9ar429l2ni";
   };
 
   format = "other";

From 2ea47e98bb93beafe9b335de2b73cff5187bd457 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 08:24:49 +0000
Subject: [PATCH 1058/3942] nextdns: 1.8.3 -> 1.8.8

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

diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix
index 8cdacf6d8380..16f1d7ebd1bb 100644
--- a/pkgs/applications/networking/nextdns/default.nix
+++ b/pkgs/applications/networking/nextdns/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "nextdns";
-  version = "1.8.3";
+  version = "1.8.8";
 
   src = fetchFromGitHub {
     owner = "nextdns";
     repo = "nextdns";
     rev = "v${version}";
-    sha256 = "1bl6ky258hnai4v7d0gskn6nf5sdsc3xlwl959iwzqhpp0j3q9xg";
+    sha256 = "17grlia9vxjly7hnwdgw8xfrynibj9h839kxs3wbdgp86b4lf5xf";
   };
 
   vendorSha256 = "09whpzsn16znyrknfm5zlhla253r69j6d751czza4c83m4r36swj";

From 86d7ed8d107042fa577e5975f37e372998e56fd9 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Tue, 3 Nov 2020 09:26:59 +0100
Subject: [PATCH 1059/3942] neovim: take into account vi(m)Alias

restore feature broken by compatibility layer
---
 pkgs/applications/editors/neovim/utils.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index 906a726924f9..d992ccd3f6a4 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -35,7 +35,7 @@ let
 
     # for forward compability, when adding new environments, haskell etc.
     , ...
-    }:
+    }@args:
     let
       rubyEnv = bundlerEnv {
         name = "neovim-ruby-env";
@@ -99,7 +99,7 @@ let
       manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; });
       neovimRcContent = vimUtils.vimrcContent configure;
     in
-    {
+    args // {
       wrapperArgs = makeWrapperArgs;
       inherit neovimRcContent;
       inherit manifestRc;
@@ -142,8 +142,7 @@ let
         extraPythonPackages = compatFun extraPythonPackages;
         inherit withPython3;
         extraPython3Packages = compatFun extraPython3Packages;
-        inherit withNodeJs withRuby;
-
+        inherit withNodeJs withRuby viAlias vimAlias;
         inherit configure;
       };
     in

From cd6040869a9e785da28a7b592eb892b959c4d4f8 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Tue, 3 Nov 2020 09:38:14 +0100
Subject: [PATCH 1060/3942] .github/CODEOWNERS: add teto to neovim

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0da1e4c91a77..3ce1e940e5d5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -178,6 +178,7 @@
 
 # Neovim
 /pkgs/applications/editors/neovim      @jonringer
+/pkgs/applications/editors/neovim      @teto
 
 # VimPlugins
 /pkgs/misc/vim-plugins         @jonringer @softinio

From ee0e1e0bcbb0cdd7cbc7c403b57ce27c9f158570 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Tue, 3 Nov 2020 10:45:29 +0100
Subject: [PATCH 1061/3942] nixos(freepops): remove module

---
 nixos/modules/module-list.nix            |  1 -
 nixos/modules/services/mail/freepops.nix | 89 ------------------------
 2 files changed, 90 deletions(-)
 delete mode 100644 nixos/modules/services/mail/freepops.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index aa3b71a61241..6a47eb418ef3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -403,7 +403,6 @@
   ./services/mail/dovecot.nix
   ./services/mail/dspam.nix
   ./services/mail/exim.nix
-  ./services/mail/freepops.nix
   ./services/mail/mail.nix
   ./services/mail/mailcatcher.nix
   ./services/mail/mailhog.nix
diff --git a/nixos/modules/services/mail/freepops.nix b/nixos/modules/services/mail/freepops.nix
deleted file mode 100644
index 5b729ca50a5e..000000000000
--- a/nixos/modules/services/mail/freepops.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.mail.freepopsd;
-in
-
-{
-  options = {
-    services.mail.freepopsd = {
-      enable = mkOption {
-        default = false;
-        type = with types; bool;
-        description = ''
-          Enables Freepops, a POP3 webmail wrapper.
-        '';
-      };
-
-      port = mkOption {
-        default = 2000;
-        type = with types; uniq int;
-        description = ''
-          Port on which the pop server will listen.
-        '';
-      };
-
-      threads = mkOption {
-        default = 5;
-        type = with types; uniq int;
-        description = ''
-          Max simultaneous connections.
-        '';
-      };
-
-      bind = mkOption {
-        default = "0.0.0.0";
-        type = types.str;
-        description = ''
-          Bind over an IPv4 address instead of any.
-        '';
-      };
-
-      logFile = mkOption {
-        default = "/var/log/freepopsd";
-        example = "syslog";
-        type = types.str;
-        description = ''
-          Filename of the log file or syslog to rely on the logging daemon.
-        '';
-      };
-
-      suid = {
-        user = mkOption {
-          default = "nobody";
-          type = types.str;
-          description = ''
-            User name under which freepopsd will be after binding the port.
-          '';
-        };
-
-        group = mkOption {
-          default = "nogroup";
-          type = types.str;
-          description = ''
-            Group under which freepopsd will be after binding the port.
-          '';
-        };
-      };
-
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.freepopsd = {
-      description = "Freepopsd (webmail over POP3)";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      script = ''
-        ${pkgs.freepops}/bin/freepopsd \
-          -p ${toString cfg.port} \
-          -t ${toString cfg.threads} \
-          -b ${cfg.bind} \
-          -vv -l ${cfg.logFile} \
-          -s ${cfg.suid.user}.${cfg.suid.group}
-      '';
-    };
-  };
-}

From 531decc11d1e6e758b7d0f9d82f8c7c0f63c1bab Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 3 Nov 2020 11:10:03 +0100
Subject: [PATCH 1062/3942] chromium: 86.0.4240.111 -> 86.0.4240.183

https://chromereleases.googleblog.com/2020/11/stable-channel-update-for-desktop.html

This update includes 10 security fixes. Google is aware of reports that
an exploit for CVE-2020-16009 exists in the wild.

CVEs:
CVE-2020-16004 CVE-2020-16005 CVE-2020-16006 CVE-2020-16007
CVE-2020-16008 CVE-2020-16009 CVE-2020-16011
---
 .../browsers/chromium/upstream-info.json       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 5fded39c749a..d6971da2c0f4 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,17 +1,17 @@
 {
   "stable": {
-    "version": "86.0.4240.111",
-    "sha256": "05y7lwr89awkhvgmwkx3br9j4ap2aypg2wsc0nz8mi7kxc1dnyzj",
-    "sha256bin64": "10aqiiydw4i3jxnw8xxdgkgcqbfqc67n1fbrg40y54kg0v5dz8l6"
+    "version": "86.0.4240.183",
+    "sha256": "1g39i82js7fm4fqb8i66d6xs0kzqjxzi4vzvvwz5y9rkbikcc4ma",
+    "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9"
   },
   "beta": {
-    "version": "87.0.4280.27",
-    "sha256": "0w0asxj7jlsw69cssfia8km4q9cx1c2mliks2rmhf4jk0hsghasm",
-    "sha256bin64": "1lsx4mhy8nachfb8c9f3mrx5nqw2bi046dqirb4lnv7y80jjjs1k"
+    "version": "87.0.4280.40",
+    "sha256": "07xh76fl257np68way6i5rf64qbvirkfddy7m5gvqb0fzcqd7dp3",
+    "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41"
   },
   "dev": {
-    "version": "88.0.4298.4",
-    "sha256": "0ka11gmpkyrmifajaxm66c16hrj3xakdvhjqg04slyp2sv0nlhrl",
-    "sha256bin64": "0768y31jqbl1znp7yp6mvl5j12xl1nwjkh2l8zdga81q0wz52hh6"
+    "version": "88.0.4300.0",
+    "sha256": "00cfs2rp4h8ybn2snr1d8ygg635hx7q5gv2aqriy1j6f8a1pgh1b",
+    "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv"
   }
 }

From 055a9adabfe9ae165f109bb51e0784e0f2b911e3 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Wed, 28 Oct 2020 13:09:10 +0100
Subject: [PATCH 1063/3942] nextcloud19: 19.0.3 -> 19.0.4

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index a072536dbfd8..9babdb6f68fd 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -46,8 +46,8 @@ in {
   };
 
   nextcloud19 = generic {
-    version = "19.0.3";
-    sha256 = "0sc9cnsdh8kj60h7i3knh40ngdz1w1wmdqw2v2axfkmax22kjl7w";
+    version = "19.0.4";
+    sha256 = "0y5fccn61qf9fxjjpqdvhmxr9w5n4dgl1d7wcl2dzjv4bmqi2ms6";
   };
 
   nextcloud20 = generic {

From 7a36e413755a857a48d8ecb8075c78d05e61a0b8 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Wed, 28 Oct 2020 13:09:36 +0100
Subject: [PATCH 1064/3942] nextcloud18: 18.0.9 -> 18.0.10

---
 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 9babdb6f68fd..6b1e7de83245 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -40,8 +40,8 @@ in {
   '';
 
   nextcloud18 = generic {
-    version = "18.0.9";
-    sha256 = "0rigg5pv2vnxgmjznlvxfc41s00raxa8jhib5vsznhj55qn99jm1";
+    version = "18.0.10";
+    sha256 = "0kv9mdn36shr98kh27969b8xs7pgczbyjklrfskxy9mph7bbzir6";
     insecure = true;
   };
 

From d4ad2a87238218ecc20ce998707f379d1e932455 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 21:12:27 +0100
Subject: [PATCH 1065/3942] pdf2htmlEx: remove

This package is broken since 2018 and the project itself is abandonned
upstream since 2017, so there is no hope to see it evolve
---
 .../pdf2htmlEX/add-glib-cmake.patch           | 17 -------
 pkgs/tools/typesetting/pdf2htmlEX/default.nix | 48 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch
 delete mode 100644 pkgs/tools/typesetting/pdf2htmlEX/default.nix

diff --git a/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch b/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch
deleted file mode 100644
index 8e1d9dfc1914..000000000000
--- a/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3fdabb0..378621a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,6 +59,12 @@ include_directories(${FONTFORGE_INCLUDE_DIRS})
- link_directories(${FONTFORGE_LIBRARY_DIRS})
- set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FONTFORGE_LIBRARIES})
- 
-+# add glib dependency
-+pkg_check_modules(GLIB REQUIRED glib-2.0)
-+include_directories(${GLIB_INCLUDE_DIRS})
-+link_directories(${GLIB_INCLUDE_DIRS})
-+set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${GLIB_LIBRARIES})
-+
- # debug build flags (overwrite default cmake debug flags)
- set(CMAKE_C_FLAGS_DEBUG "-ggdb -pg")
- set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -pg")
diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
deleted file mode 100644
index dee6ec3c6fff..000000000000
--- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
-, poppler, xorg, pcre, python, glib, fontforge, cairo, pango, openjdk8
-
-}:
-
-stdenv.mkDerivation {
-  name = "pdf2htmlEX-0.14.6";
-
-  src = fetchFromGitHub {
-    repo   = "pdf2htmlEX";
-    owner  = "coolwanglu";
-    rev    = "v0.14.6";
-    sha256 = "1nh0ab8f11fsyi4ldknlkmdzcfvm1dfh8b9bmprjgq6q0vjj7f78";
-  };
-
-  patches = [ ./add-glib-cmake.patch ];
-
-  cmakeFlags = [ "-DENABLE_SVG=ON" ];
-
-  enableParallelBuilding = true;
-
-  nativeBuildInputs = [
-    cmake
-    pkgconfig
-  ];
-
-  buildInputs = [
-    xorg.libpthreadstubs
-    xorg.libXdmcp
-    pcre
-    python
-    glib
-    cairo
-    pango
-    poppler
-    fontforge
-    openjdk8
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Render PDF files to beautiful HTML";
-    homepage    = "https://github.com/coolwanglu/pdf2htmlEX";
-    license     = licenses.gpl3Plus;
-    maintainers = [ maintainers.taktoa ];
-    platforms   = with platforms; linux;
-    broken      = true; # 2018-09-08
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2386398f3c8d..3cd383587066 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -366,6 +366,7 @@ mapAliases ({
   parity = openethereum; # added 2020-08-01
   parquet-cpp = arrow-cpp; # added 2018-09-08
   pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04
+  pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03
   perlXMLParser = perlPackages.XMLParser; # added 2018-10-12
   perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12
   pgp-tools = signing-party; # added 2017-03-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 788a583ee3b7..b7d620c67329 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6332,8 +6332,6 @@ in
 
   pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { };
 
-  pdf2htmlEX = callPackage ../tools/typesetting/pdf2htmlEX { };
-
   pdf2odt = callPackage ../tools/typesetting/pdf2odt { };
 
   pdf-redact-tools = callPackage ../tools/graphics/pdfredacttools { };

From 2c233e06d816adab3d5d49916ff18845d85a5d99 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 02:05:12 +0100
Subject: [PATCH 1066/3942] flvtool2: remove (broken since 2018)

---
 pkgs/tools/video/flvtool2/default.nix | 17 -----------------
 pkgs/top-level/aliases.nix            |  1 +
 pkgs/top-level/all-packages.nix       |  2 --
 3 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 pkgs/tools/video/flvtool2/default.nix

diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix
deleted file mode 100644
index 9a1f9f121031..000000000000
--- a/pkgs/tools/video/flvtool2/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ lib, buildRubyGem, ruby }:
-
-buildRubyGem rec {
-  inherit ruby;
-  name = "${gemName}-${version}";
-  gemName = "flvtool2";
-  version = "1.0.6";
-  source.sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj";
-
-  meta = {
-    broken = true; # depends on ruby 2.2
-    homepage = "https://github.com/unnu/flvtool2";
-    description = "A tool to manipulate Macromedia Flash Video files";
-    platforms = ruby.meta.platforms;
-    license = lib.licenses.bsd3;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2386398f3c8d..d71672731471 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -141,6 +141,7 @@ mapAliases ({
 
   firestr = throw "firestr has been removed."; # added 2019-12-08
   flameGraph = flamegraph; # added 2018-04-25
+  flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03
   foldingathome = fahclient; # added 2020-09-03
   font-awesome-ttf = font-awesome; # 2018-02-25
   # 2019-10-31
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a27ffd3e8229..f046b5a472ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3878,8 +3878,6 @@ in
 
   flips = callPackage ../tools/compression/flips { };
 
-  flvtool2 = callPackage ../tools/video/flvtool2 { };
-
   fmbt = callPackage ../development/tools/fmbt {
     python = python2;
   };

From 516f48a84c66cfc3522a6810b1c834510a795d09 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 03:41:27 +0100
Subject: [PATCH 1067/3942] dvb_apps: remove (broken since 2018)

---
 pkgs/applications/video/dvb-apps/default.nix | 24 --------------------
 pkgs/top-level/aliases.nix                   |  1 +
 pkgs/top-level/all-packages.nix              |  2 --
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/applications/video/dvb-apps/default.nix

diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix
deleted file mode 100644
index 8fa88e324494..000000000000
--- a/pkgs/applications/video/dvb-apps/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, perl }:
-
-stdenv.mkDerivation {
-  name = "dvb-apps-7f68f9c8d311";
-
-  src = fetchurl {
-    url = "https://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz";
-    sha256 = "0a6c5jjq6ad98bj0r954l3n7zjb2syw9m19jksg06z4zg1z8yg82";
-  };
-
-  buildInputs = [ perl ];
-
-  dontConfigure = true; # skip configure
-
-  installPhase = "make prefix=$out install";
-
-  meta = {
-    description = "Linux DVB API applications and utilities";
-    homepage = "https://linuxtv.org/";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2;
-    broken = true; # 2018-04-10
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2386398f3c8d..0171ef2734ea 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -120,6 +120,7 @@ mapAliases ({
   double_conversion = double-conversion; # 2017-11-22
   docker_compose = docker-compose; # 2018-11-10
   draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14
+  dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03
   dwarf_fortress = dwarf-fortress; # added 2016-01-23
   emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
   emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a27ffd3e8229..17d208aba9e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20485,8 +20485,6 @@ in
 
   denemo = callPackage ../applications/audio/denemo { };
 
-  dvb_apps  = callPackage ../applications/video/dvb-apps { };
-
   dvdauthor = callPackage ../applications/video/dvdauthor { };
 
   dvdbackup = callPackage ../applications/video/dvdbackup { };

From c66e1a3e5c4b11fcd19e505e084c775a9e5a9746 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 10:53:05 +0000
Subject: [PATCH 1068/3942] minixml: 3.1 -> 3.2

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

diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index ec575aa08fd0..8938ab90fbc1 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mxml";
-  version = "3.1";
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner = "michaelrsweet";
     repo = "mxml";
     rev = "v${version}";
-    sha256 = "1kv36fxxh7bwfydhb90zjgsrvpyzvx1p5d0ayfvd3j8gip2rjhnp";
+    sha256 = "0zvib87rgsib0w9xp6bks5slq5ma1qbgyyyvr23cv7zkbgw3xgil";
   };
 
   enableParallelBuilding = true;

From f8ad73b9d82fd71897535b60713cd74944648153 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 3 Nov 2020 10:18:21 +0100
Subject: [PATCH 1069/3942] haskell.compiler.ghc8102BinaryMinimal: init

To stay within hydra limit of 2^31 output size on aarch64-linux
---
 .../compilers/ghc/8.10.2-binary.nix           | 26 +++++++++++++++++--
 pkgs/top-level/haskell-packages.nix           | 15 +++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix
index 37238bb13bda..cc9491ede240 100644
--- a/pkgs/development/compilers/ghc/8.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix
@@ -2,6 +2,14 @@
 , fetchurl, perl, gcc
 , ncurses6, gmp, glibc, libiconv, numactl
 , llvmPackages
+
+  # minimal = true; will remove files that aren't strictly necessary for
+  # regular builds and GHC bootstrapping.
+  # This is "useful" for staying within hydra's output limits for at least the
+  # aarch64-linux architecture.
+  # Examples of unnecessary files are the bundled documentation and files that
+  # are only needed for profiling builds.
+, minimal ? false
 }:
 
 # Prebuilt only does native
@@ -172,6 +180,13 @@ stdenv.mkDerivation rec {
     for file in $(find "$out" -name setup-config); do
       substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
     done
+  '' +
+  stdenv.lib.optionalString minimal ''
+    # Remove profiling objects
+    find $out -type f -name '*.p_o' -delete
+    rm $out/lib/ghc-*/bin/ghc-iserv-prof
+    # Remove docs
+    rm -r $out/share/{doc,man}
   '';
 
   doInstallCheck = true;
@@ -195,11 +210,18 @@ stdenv.mkDerivation rec {
     enableShared = true;
   };
 
-  meta = {
+  meta = let
+    platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
+  in {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     license = stdenv.lib.licenses.bsd3;
-    platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
+
+    # The minimal variation can not be distributed because it removes the
+    # documentation, including licensing information that is required for
+    # distribution.
+    inherit platforms;
+    hydraPlatforms = stdenv.lib.optionals (!minimal) platforms;
     maintainers = with stdenv.lib.maintainers; [ lostnet ];
   };
 }
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0db955c2ae48..da73a4a30518 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -54,6 +54,11 @@ in {
       llvmPackages = pkgs.llvmPackages_9;
     };
 
+    ghc8102BinaryMinimal = callPackage ../development/compilers/ghc/8.10.2-binary.nix {
+      llvmPackages = pkgs.llvmPackages_9;
+      minimal = true;
+    };
+
     ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix {
       bootPkgs = packages.ghc822Binary;
       inherit (buildPackages.python3Packages) sphinx;
@@ -75,7 +80,7 @@ in {
     ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix {
       # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
       bootPkgs = if stdenv.isAarch64 then
-          packages.ghc8102Binary
+          packages.ghc8102BinaryMinimal
         else
           packages.ghc865Binary;
       inherit (buildPackages.python3Packages) sphinx;
@@ -91,7 +96,7 @@ in {
     ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix {
       # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
       bootPkgs = if stdenv.isAarch64 then
-          packages.ghc8102Binary
+          packages.ghc8102BinaryMinimal
         else
           packages.ghc865Binary;
       inherit (buildPackages.python3Packages) sphinx;
@@ -164,6 +169,12 @@ in {
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
       packageSetConfig = bootstrapPackageSet;
     };
+    ghc8102BinaryMinimal = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc8102BinaryMinimal;
+      ghc = bh.compiler.ghc8102BinaryMinimal;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
+      packageSetConfig = bootstrapPackageSet;
+    };
     ghc865 = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc865;
       ghc = bh.compiler.ghc865;

From db0d5e59e72a768bf95553f429e99c0231e8f84c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 11:03:14 +0000
Subject: [PATCH 1070/3942] munin: 2.0.64 -> 2.0.65

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

diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 435e613a9894..cfc66a9a76aa 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.64";
+  version = "2.0.65";
   pname = "munin";
 
   src = fetchFromGitHub {
     owner = "munin-monitoring";
     repo = "munin";
     rev = version;
-    sha256 = "00gvvy7s2h1kxdxss7n63ir87fn66kq48lp94ackdyj49526maz4";
+    sha256 = "0gz9kp1x39xpklq77xpm8kldsc4w87732if90w5p9pw0ip4cn6df";
   };
 
   buildInputs = [

From 9035d97fd1de976d9fd71e0d8265c02571796fec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 11:09:23 +0000
Subject: [PATCH 1071/3942] monit: 5.27.0 -> 5.27.1

---
 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 8be921b385e0..3349749d62e8 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "monit-5.27.0";
+  name = "monit-5.27.1";
 
   src = fetchurl {
     url = "${meta.homepage}dist/${name}.tar.gz";
-    sha256 = "197w59wkg6izlj6p7xbx0n6ksvm6pym9pzh24nakl6agcbpxxh6q";
+    sha256 = "0lgdhif6x11fcpli0qn138rpdvrfnwmkzsy4lc9pas45c78hhx7m";
   };
 
   nativeBuildInputs = [ bison flex ];

From 24c5059468026eb8df4c77e98192567378656bc3 Mon Sep 17 00:00:00 2001
From: Michael <mickours@libr.fr>
Date: Tue, 3 Nov 2020 12:33:11 +0100
Subject: [PATCH 1072/3942] docker: Fix broken pipe on docker layer creation

Add `-p` to the `tee` command to avoid exiting on breaking pipe due to
tarsum finishing before tar which creating docker layers.
---
 pkgs/build-support/docker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 35382662cf81..ba76ce2b817d 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -340,7 +340,7 @@ rec {
       # Tar up the layer and throw it into 'layer.tar'.
       echo "Packing layer..."
       mkdir $out
-      tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee $out/layer.tar | tarsum)
+      tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee -p $out/layer.tar | tarsum)
 
       # Add a 'checksum' field to the JSON, with the value set to the
       # checksum of the tarball.
@@ -425,7 +425,7 @@ rec {
         echo "Packing layer..."
         mkdir -p $out
         tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf - . |
-                    tee $out/layer.tar |
+                    tee -p $out/layer.tar |
                     ${tarsum}/bin/tarsum)
 
         cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json

From 6ddd6b4914fb392c7085eeae458d549e1852dccf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 3 Nov 2020 12:50:05 +0100
Subject: [PATCH 1073/3942] Revert "Merge pull request #93083 from
 risicle/ris-cpython-debug"

This increase the closure size by 30 MB.

https://github.com/NixOS/nixpkgs/pull/93083#issuecomment-718025366

This reverts commit 4b340cbbb4903173741ab9676a35cf26e15b0d3f, reversing
changes made to 47e499f7a43bc5bc98d2b5f66204a5760642fb63.
---
 pkgs/development/interpreters/python/cpython/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index b25d613eb7f3..143662abcc93 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -291,13 +291,6 @@ in with passthru; stdenv.mkDerivation {
     find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i -
     '' + optionalString stripBytecode ''
     find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}"
-    '' + ''
-    # *strip* shebang from libpython gdb script - it should be dual-syntax and
-    # interpretable by whatever python the gdb in question is using, which may
-    # not even match the major version of this python. doing this after the
-    # bytecode compilations for the same reason.
-    mkdir -p $out/share/gdb
-    sed '/^#!/d' Tools/gdb/libpython.py > $out/share/gdb/libpython.py
   '';
 
   preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
@@ -315,8 +308,6 @@ in with passthru; stdenv.mkDerivation {
     pythonForBuild buildPackages.bash
   ];
 
-  separateDebugInfo = true;
-
   inherit passthru;
 
   enableParallelBuilding = true;

From e763a9fd703cddebb62e275d7620879957e5d91a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 11:55:51 +0000
Subject: [PATCH 1074/3942] nsd: 4.3.2 -> 4.3.3

---
 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 2dfdf108c4fa..35f76943e14c 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nsd";
-  version = "4.3.2";
+  version = "4.3.3";
 
   src = fetchurl {
     url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "0ac3mbn5z4nc18782m9aswdpi2m9f4665vidw0ciyigdh0pywp2v";
+    sha256 = "0lgdiqnkfvy245h6kkiqic586qjwmg51lsfs86vlc0kwjwddiijz";
   };
 
   prePatch = ''

From 12c3408b9c8886d1bd4011bcda85f5eae9875672 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 12:02:27 +0000
Subject: [PATCH 1075/3942] numix-icon-theme-square: 20.07.11 -> 20.09.19

---
 pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 51a2100d3aa3..b0b4e20073a4 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "numix-icon-theme-square";
-  version = "20.07.11";
+  version = "20.09.19";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "07jy8l2r6grn7pabn3dnkc8j7xdykl7k57br30c6v61ss8paf2rw";
+    sha256 = "0afraarfcd66mpidmn0l90wif8kmwzdj3s09g704kwszyijxs80z";
   };
 
   nativeBuildInputs = [ gtk3 ];

From c07ce093ecc6a62e10a9abff39e96a27540c3fbc Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 7 May 2020 13:12:38 +0200
Subject: [PATCH 1076/3942] unbound: allow building with systemd support

Systemd has to remain an optional (non-default) dependency as otherwise
we will have an unpleasant bootstrap cycle. Most (if not all) of the
(lib)unbound consumers will likely not care about unbound's systemd
integration that only affects the daemon mode, anyway.
---
 pkgs/tools/networking/unbound/default.nix | 40 ++++++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 9b33d53e54f1..72653b672ee3 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -1,4 +1,24 @@
-{ stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }:
+{ stdenv
+, lib
+, fetchurl
+, openssl
+, nettle
+, expat
+, libevent
+, dns-root-data
+, pkg-config
+  #
+  # By default unbound will not be built with systemd support. Unbound is a very
+  # commmon dependency. The transitive dependency closure of systemd also
+  # contains unbound.
+  # Since most (all?) (lib)unbound users outside of the unbound daemon usage do
+  # not need the systemd integration it is likely best to just default to no
+  # systemd integration.
+  # For the daemon use-case, that needs to notify systemd, use `unbound-with-systemd`.
+  #
+, withSystemd ? false
+, systemd ? null
+}:
 
 stdenv.mkDerivation rec {
   pname = "unbound";
@@ -11,7 +31,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
 
-  buildInputs = [ openssl nettle expat libevent ];
+  buildInputs = [ openssl nettle expat libevent ] ++ lib.optionals withSystemd [ pkg-config systemd ];
 
   configureFlags = [
     "--with-ssl=${openssl.dev}"
@@ -25,6 +45,8 @@ stdenv.mkDerivation rec {
     "--enable-relro-now"
   ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic [
     "--disable-flto"
+  ] ++ lib.optionals withSystemd [
+    "--enable-systemd"
   ];
 
   installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
@@ -33,7 +55,7 @@ stdenv.mkDerivation rec {
     make unbound-event-install
   '';
 
-  preFixup = stdenv.lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit
+  preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit
     # Build libunbound again, but only against nettle instead of openssl.
     # This avoids gnutls.out -> unbound.lib -> openssl.out.
     # There was some problem with this on Darwin; let's not complicate non-Linux.
@@ -43,17 +65,17 @@ stdenv.mkDerivation rec {
       buildPhase
       installPhase
     ''
-    # get rid of runtime dependencies on $dev outputs
+  # get rid of runtime dependencies on $dev outputs
   + ''substituteInPlace "$lib/lib/libunbound.la" ''
-    + stdenv.lib.concatMapStrings
-      (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'")
-      buildInputs;
+  + lib.concatMapStrings
+    (pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'")
+    (builtins.filter (p: p != null) buildInputs);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Validating, recursive, and caching DNS resolver";
     license = licenses.bsd3;
     homepage = "https://www.unbound.net";
     maintainers = with maintainers; [ ehmry fpletz globin ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }

From f6d570b2589b61c4605f19bca0cba2ce1f076d44 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 7 May 2020 13:15:04 +0200
Subject: [PATCH 1077/3942] unbound-with-systemd: init

This introduces an unbound variant that is built with systemd support.
That means it is able to signal readiness to systemd once it did start
or finished reloading. This likely allows us to close a small gap during
bootup where the service is assumed up but doesn't respond to DNS
queries just yet.
---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbad7d9145b2..3a75ed3c391a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8076,7 +8076,11 @@ in
 
   unclutter-xfixes = callPackage ../tools/misc/unclutter-xfixes { };
 
-  unbound = callPackage ../tools/networking/unbound { };
+  unbound = callPackage ../tools/networking/unbound {};
+
+  unbound-with-systemd = unbound.override {
+    withSystemd = true;
+  };
 
   unicorn = callPackage ../development/libraries/unicorn { };
 

From ea270c00b0b9085305cef180b4c8322362c02e16 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Tue, 3 Nov 2020 07:17:06 -0500
Subject: [PATCH 1078/3942] bug: fix libnvidia-container build (#101665)

---
 .../avoid-static-libtirpc-build.patch         | 21 ++++++++
 .../virtualization/nvidia-docker/libnvc.nix   | 54 +++++++++++++------
 2 files changed, 59 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch

diff --git a/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch b/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch
new file mode 100644
index 000000000000..d3f207de00b2
--- /dev/null
+++ b/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index 0070ada..802cef0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -202,7 +202,7 @@ $(BIN_NAME): $(BIN_OBJS)
+ ##### Public rules #####
+ 
+ all: CPPFLAGS += -DNDEBUG
+-all: shared static tools
++all: shared tools
+ 
+ # Run with ASAN_OPTIONS="protect_shadow_gap=0" to avoid CUDA OOM errors
+ debug: CFLAGS += -pedantic -fsanitize=undefined -fno-omit-frame-pointer -fno-common -fsanitize=address
+@@ -232,7 +232,6 @@ install: all
+ 	# Install header files
+ 	$(INSTALL) -m 644 $(LIB_INCS) $(DESTDIR)$(includedir)
+ 	# Install library files
+-	$(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir)
+ 	$(INSTALL) -m 755 $(LIB_SHARED) $(DESTDIR)$(libdir)
+ 	$(LN) -sf $(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SYMLINK)
+ 	$(LDCONFIG) -n $(DESTDIR)$(libdir)
diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
index 5b97d7fffa29..6079f215ec80 100644
--- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
+++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
@@ -1,17 +1,23 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, libelf, libcap, libseccomp }:
-
-with lib; let
-
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkgconfig
+, libelf
+, libcap
+, libseccomp
+, rpcsvc-proto
+, libtirpc
+}:
+let
   modp-ver = "396.51";
-
   nvidia-modprobe = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nvidia-modprobe";
     rev = modp-ver;
     sha256 = "1fw2qwc84k64agw6fx2v0mjf88aggph9c6qhs4cv7l3gmflv8qbk";
   };
-
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   pname = "libnvidia-container";
   version = "1.0.6";
 
@@ -22,19 +28,32 @@ in stdenv.mkDerivation rec {
     sha256 = "1pnpc9knwh8d1zqb28zc3spkjc00w0z10vd3jna8ksvpl35jl7w3";
   };
 
-  # locations of nvidia-driver libraries are not resolved via ldconfig which
-  # doesn't get used on NixOS. Additional support binaries like nvidia-smi are
-  # not resolved via the environment PATH but via the derivation output path.
-  patches = [ ./libnvc-ldconfig-and-path-fixes.patch ];
+  patches = [
+    # locations of nvidia-driver libraries are not resolved via ldconfig which
+    # doesn't get used on NixOS. Additional support binaries like nvidia-smi
+    # are not resolved via the environment PATH but via the derivation output
+    # path.
+    ./libnvc-ldconfig-and-path-fixes.patch
+
+    # the libnvidia-container Makefile wants to build and install static
+    # libtirpc libraries; this patch prevents that from happening
+    ./avoid-static-libtirpc-build.patch
+  ];
 
   makeFlags = [
     "WITH_LIBELF=yes"
     "prefix=$(out)"
+    # we can't use the WITH_TIRPC=yes flag that exists in the Makefile for the
+    # same reason we patch out the static library use of libtirpc so we set the
+    # define in CFLAGS
+    "CFLAGS=-DWITH_TIRPC"
   ];
 
   postPatch = ''
-    sed -i 's/^REVISION :=.*/REVISION = ${src.rev}/' mk/common.mk
-    sed -i 's/^COMPILER :=.*/COMPILER = $(CC)/' mk/common.mk
+    sed -i \
+      -e 's/^REVISION :=.*/REVISION = ${src.rev}/' \
+      -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
+      mk/common.mk
 
     mkdir -p deps/src/nvidia-modprobe-${modp-ver}
     cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver}
@@ -42,11 +61,14 @@ in stdenv.mkDerivation rec {
     touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
+  NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ];
 
-  buildInputs = [ libelf libcap libseccomp ];
+  nativeBuildInputs = [ pkgconfig rpcsvc-proto ];
 
-  meta = {
+  buildInputs = [ libelf libcap libseccomp libtirpc ];
+
+  meta = with lib; {
     homepage = "https://github.com/NVIDIA/libnvidia-container";
     description = "NVIDIA container runtime library";
     license = licenses.bsd3;

From 0af623e83fcfaab8658e4bb48ef4a02d65217e3f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 12:17:49 +0000
Subject: [PATCH 1079/3942] ncmpc: 0.39 -> 0.42

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

diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index ca61aa0cd6f0..97aa06453e52 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null;
 
 stdenv.mkDerivation rec {
   pname = "ncmpc";
-  version = "0.39";
+  version = "0.42";
 
   src = fetchFromGitHub {
     owner  = "MusicPlayerDaemon";
     repo   = "ncmpc";
     rev    = "v${version}";
-    sha256 = "08xrcinfm1a7hjycf8la7gnsxbp3six70ks987dr7j42kd42irfq";
+    sha256 = "1c21sbdm6pp3kwhnzc7c6ksna7madvsmfa7j91as2g8485symqv2";
   };
 
   buildInputs = [ glib ncurses mpd_clientlib boost ]

From 5190c86c159ddecb65a251e776fd129a3092af35 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 12:30:32 +0000
Subject: [PATCH 1080/3942] mosquitto: 1.6.11 -> 1.6.12

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

diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index b2c52d77df59..e956e3b7cfd4 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mosquitto";
-  version = "1.6.11";
+  version = "1.6.12";
 
   src = fetchFromGitHub {
     owner  = "eclipse";
     repo   = "mosquitto";
     rev    = "v${version}";
-    sha256 = "05mwghfmp459f7c0yph0xp1a5k6c0wghxzqm0n8jw7yfj7qixv88";
+    sha256 = "0y9jna2p7wg57vv2g6ls1dj6w89vaw828y9z1wb3vwz1yhvs35s8";
   };
 
   postPatch = ''

From 8bf29a60140d9a96996bec83afb4aa420328a4af Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 2 Nov 2020 06:37:02 +0100
Subject: [PATCH 1081/3942] ocamlPackages.mirage-channel: init at 4.0.1

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

diff --git a/pkgs/development/ocaml-modules/mirage-channel/default.nix b/pkgs/development/ocaml-modules/mirage-channel/default.nix
new file mode 100644
index 000000000000..5b639e6fdd6e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage-channel/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchurl, buildDunePackage
+, cstruct, logs, lwt, mirage-flow
+, alcotest, mirage-flow-combinators
+}:
+
+buildDunePackage rec {
+  pname = "mirage-channel";
+  version = "4.0.1";
+
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/mirage/mirage-channel/releases/download/v${version}/mirage-channel-v${version}.tbz";
+    sha256 = "0wmb2zhiyp8n78xgcspcsyd19bhcml3kyli2caw3778wc1gyvfpc";
+  };
+
+  propagatedBuildInputs = [ cstruct logs lwt mirage-flow ];
+
+  doCheck = true;
+  checkInputs = [ alcotest mirage-flow-combinators ];
+
+  meta = {
+    description = "Buffered channels for MirageOS FLOW types";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/mirage/mirage-channel";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index b623d65bb8b5..ee362e03a940 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -543,6 +543,8 @@ let
 
     mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { };
 
+    mirage-channel = callPackage ../development/ocaml-modules/mirage-channel { };
+
     mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { };
 
     mirage-clock-unix = callPackage ../development/ocaml-modules/mirage-clock/unix.nix { };

From 03cb3521f823df150e3a09488a3d9f080bfd480e Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 3 Nov 2020 14:11:26 +0100
Subject: [PATCH 1082/3942] tempo: init at 0.2.0

---
 pkgs/servers/tracing/tempo/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/servers/tracing/tempo/default.nix

diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix
new file mode 100644
index 000000000000..c97f8344c91b
--- /dev/null
+++ b/pkgs/servers/tracing/tempo/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  version = "0.2.0";
+  pname = "tempo";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "grafana";
+    repo = "tempo";
+    sha256 = "061l72il8arxa53zfbasiwyjdxc4bf498glxrdj5ijcwgvx14275";
+  };
+
+  vendorSha256 = null;
+
+  # tests use docker
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A high volume, minimal dependency trace storage";
+    license = licenses.asl20;
+    homepage = "https://grafana.com/oss/tempo/";
+    maintainers = with maintainers; [ willibutz ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f66f57699132..8ff3917ff2b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23730,6 +23730,8 @@ in
 
   teleprompter = callPackage ../applications/misc/teleprompter {};
 
+  tempo = callPackage ../servers/tracing/tempo {};
+
   tendermint = callPackage ../tools/networking/tendermint { };
 
   termdown = python3Packages.callPackage ../applications/misc/termdown { };

From ea03a3a194e5d0ec3b7843828388add2ccd14340 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 13:13:15 +0000
Subject: [PATCH 1083/3942] numix-icon-theme-circle: 20.07.11 -> 20.09.19

---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index f43ca473f0dd..ef06c2e2532a 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "numix-icon-theme-circle";
-  version = "20.07.11";
+  version = "20.09.19";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "0vj3d3wb12ksnkm99s32k7nrf9m5j83zzvkd0rwk8l0b30df975j";
+    sha256 = "1rqlq5ssxqj0nc0i8av7zprj94km5645xzqi5j5i0sxd3jbmyfjx";
   };
 
   nativeBuildInputs = [ gtk3 ];

From 973061f05b5dd5114cbcd0f51ac8a6b639371a54 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 02:02:42 +0000
Subject: [PATCH 1084/3942] libassuan: 2.5.3 -> 2.5.4

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

diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index e92db2ab87ee..aa798668f8ea 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libassuan";
-  version = "2.5.3";
+  version = "2.5.4";
 
   src = fetchurl {
     url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "00p7cpvzf0q3qwcgg51r9d0vbab4qga2xi8wpk2fgd36710b1g4i";
+    sha256 = "1w7vnnycq4z7gf4bk38pi4hrb8qrrzgfpz3cd7frwldxnfbfx060";
   };
 
   outputs = [ "out" "dev" "info" ];

From 54217cac698fdcf5c047e53054b7d3b039337f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 2 Nov 2020 23:35:34 +0100
Subject: [PATCH 1085/3942] nixos/promtail: Add a promtail module

---
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/services/logging/promtail.nix | 95 +++++++++++++++++++++
 nixos/tests/loki.nix                        | 31 +++++--
 3 files changed, 118 insertions(+), 9 deletions(-)
 create mode 100644 nixos/modules/services/logging/promtail.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index aa3b71a61241..45fb75d23b2c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -394,6 +394,7 @@
   ./services/logging/logcheck.nix
   ./services/logging/logrotate.nix
   ./services/logging/logstash.nix
+  ./services/logging/promtail.nix
   ./services/logging/rsyslogd.nix
   ./services/logging/syslog-ng.nix
   ./services/logging/syslogd.nix
diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix
new file mode 100644
index 000000000000..834bb99bb1d6
--- /dev/null
+++ b/nixos/modules/services/logging/promtail.nix
@@ -0,0 +1,95 @@
+{ config, lib, pkgs, ... }: with lib;
+let
+  cfg = config.services.promtail;
+
+  prettyJSON = conf: pkgs.runCommandLocal "promtail-config.json" {} ''
+    echo '${builtins.toJSON conf}' | ${pkgs.buildPackages.jq}/bin/jq 'del(._module)' > $out
+  '';
+
+in {
+  options.services.promtail = with types; {
+    enable = mkEnableOption "the Promtail ingresser";
+
+    configuration = mkOption {
+      type = with lib.types; let
+        valueType = nullOr (oneOf [
+          bool
+          int
+          float
+          str
+          (lazyAttrsOf valueType)
+          (listOf valueType)
+        ]) // {
+          description = "JSON value";
+          emptyValue.value = {};
+          deprecationMessage = null;
+        };
+      in valueType;
+      description = ''
+        Specify the configuration for Promtail in Nix.
+      '';
+    };
+
+    extraFlags = mkOption {
+      type = listOf str;
+      default = [];
+      example = [ "--server.http-listen-port=3101" ];
+      description = ''
+        Specify a list of additional command line flags,
+        which get escaped and are then passed to Loki.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.promtail.configuration.positions.filename = mkDefault "/var/cache/promtail/positions.yaml";
+
+    systemd.services.promtail = {
+      description = "Promtail log ingress";
+      wantedBy = [ "multi-user.target" ];
+      stopIfChanged = false;
+
+      serviceConfig = {
+        Restart = "on-failure";
+
+        ExecStart = "${pkgs.grafana-loki}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}";
+
+        ProtectSystem = "strict";
+        ProtectHome = true;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        ProtectKernelTunables = true;
+        ProtectControlGroups = true;
+        RestrictSUIDSGID = true;
+        PrivateMounts = true;
+        CacheDirectory = "promtail";
+
+        User = "promtail";
+        Group = "promtail";
+
+        CapabilityBoundingSet = "";
+        NoNewPrivileges = true;
+
+        ProtectKernelModules = true;
+        SystemCallArchitectures = "native";
+        ProtectKernelLogs = true;
+        ProtectClock = true;
+
+        LockPersonality = true;
+        ProtectHostname = true;
+        RestrictRealtime = true;
+        MemoryDenyWriteExecute = true;
+        PrivateUsers = true;
+      } // (optionalAttrs (!pkgs.stdenv.isAarch64) { # FIXME: figure out why this breaks on aarch64
+        SystemCallFilter = "@system-service";
+      });
+    };
+
+    users.groups.promtail = {};
+    users.users.promtail = {
+      description = "Promtail service user";
+      isSystemUser = true;
+      group = "promtail";
+    };
+  };
+}
diff --git a/nixos/tests/loki.nix b/nixos/tests/loki.nix
index dbf1e8a650f5..eaee717cf87d 100644
--- a/nixos/tests/loki.nix
+++ b/nixos/tests/loki.nix
@@ -12,15 +12,28 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
       enable = true;
       configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml";
     };
-    systemd.services.promtail = {
-      description = "Promtail service for Loki test";
-      wantedBy = [ "multi-user.target" ];
-
-      serviceConfig = {
-        ExecStart = ''
-          ${pkgs.grafana-loki}/bin/promtail --config.file ${pkgs.grafana-loki.src}/cmd/promtail/promtail-local-config.yaml
-        '';
-        DynamicUser = true;
+    services.promtail = {
+      enable = true;
+      configuration = {
+        server = {
+          http_listen_port = 9080;
+          grpc_listen_port = 0;
+        };
+        clients = [ { url = "http://localhost:3100/loki/api/v1/push"; } ];
+        scrape_configs = [
+          {
+            job_name = "system";
+            static_configs = [
+              {
+                targets = [ "localhost" ];
+                labels = {
+                  job = "varlogs";
+                  __path__ = "/var/log/*log";
+                };
+              }
+            ];
+          }
+        ];
       };
     };
   };

From 5030e5cdc7f4782e895c470e8ea9fa574274b223 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 Nov 2020 08:47:02 -0500
Subject: [PATCH 1086/3942] linux: 5.10-rc1 -> 5.10-rc2

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 29f1aad2e485..7931c5a05379 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.10-rc1";
+  version = "5.10-rc2";
   extraMeta.branch = "5.10";
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1s4ywf93xrlkjjq3c4142qhmsvx3kl0xwkbc09ss6gln8lwqnga8";
+    sha256 = "1qh353xd48mbvavpw61r2lz1cn8007yyc2xqiacbn8xsj7xdlxkj";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 156fe5442ef5e6fdf767dd64060c016c335e8f02 Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <sebastian.neubauer@amd.com>
Date: Wed, 28 Oct 2020 11:16:22 +0100
Subject: [PATCH 1087/3942] waffle: init at 1.6.1

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

diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix
new file mode 100644
index 000000000000..66a1b7ab1450
--- /dev/null
+++ b/pkgs/development/libraries/waffle/default.nix
@@ -0,0 +1,54 @@
+{ stdenv
+, fetchFromGitLab
+, lib
+, cmake
+, libGL
+, libglvnd
+, makeWrapper
+, pkg-config
+, wayland
+, libxcb
+, libX11
+}:
+
+stdenv.mkDerivation rec {
+  pname = "waffle";
+  version = "1.6.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "mesa";
+    repo = "waffle";
+    rev = "v${version}";
+    sha256 = "0s8gislmhccfa04zsj1yqk97lscbbnmxirr2zm4q3p8ybmpfhpqr";
+  };
+
+  buildInputs = [
+    libGL
+    libglvnd
+    libX11
+    libxcb
+    wayland
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    pkg-config
+  ];
+
+  cmakeFlags = [ "-Dplatforms=x11,wayland" ];
+
+  postInstall = ''
+    wrapProgram $out/bin/wflinfo \
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]}
+  '';
+
+  meta = with lib; {
+    description = "A cross-platform C library that allows one to defer selection of an OpenGL API and window system until runtime";
+    homepage = "http://www.waffle-gl.org/";
+    license = licenses.bsd2;
+    platforms = platforms.mesaPlatforms;
+    maintainers = with maintainers; [ Flakebi ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6269c16b5cf7..e15c6c512fd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16045,6 +16045,8 @@ in
     stdenv = gcc6Stdenv; # upstream code incompatible with gcc7
   };
 
+  waffle = callPackage ../development/libraries/waffle { };
+
   wally-cli = callPackage ../development/tools/wally-cli { };
 
   wavpack = callPackage ../development/libraries/wavpack { };

From 2907f280d3d966aeac091bb4bdb7a1b7a3767aa5 Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <sebastian.neubauer@amd.com>
Date: Wed, 28 Oct 2020 12:32:51 +0100
Subject: [PATCH 1088/3942] piglit: init at unstable-2020-10-23

piglit is a test runner for mesa.
To check that it is working, run `piglit run sanity results/sanity`
---
 pkgs/tools/graphics/piglit/default.nix | 77 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +
 2 files changed, 79 insertions(+)
 create mode 100644 pkgs/tools/graphics/piglit/default.nix

diff --git a/pkgs/tools/graphics/piglit/default.nix b/pkgs/tools/graphics/piglit/default.nix
new file mode 100644
index 000000000000..e2c2b6e6e972
--- /dev/null
+++ b/pkgs/tools/graphics/piglit/default.nix
@@ -0,0 +1,77 @@
+{ stdenv
+, fetchFromGitLab
+, lib
+, cmake
+, freeglut
+, libGL
+, libGLU
+, libglvnd
+, makeWrapper
+, ninja
+, pkg-config
+, python3
+, waffle
+, wayland
+, libX11
+, libXrender
+, libxcb
+, libxkbcommon
+}:
+
+stdenv.mkDerivation rec {
+  pname = "piglit";
+  version = "unstable-2020-10-23";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "mesa";
+    repo = "piglit";
+    rev = "59e695c16fdcdd4ea4f16365f0e397a93cef7b80";
+    sha256 = "kx0+2Sdvdc3SbpAIl2OuGCWCpaLJC/7cXG+ZLvf92g8=";
+  };
+
+  buildInputs = [
+    freeglut
+    libGL
+    libGLU
+    libglvnd
+    libX11
+    libXrender
+    libxcb
+    libxkbcommon
+    (python3.withPackages (ps: with ps; [
+      Mako
+      numpy
+    ]))
+    waffle
+    wayland
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    ninja
+    pkg-config
+  ];
+
+  # Find data dir: piglit searches for the data directory in some places, however as it is wrapped,
+  # it search in ../lib/.piglit-wrapped, we just replace the script name with "piglit" again.
+  prePatch = ''
+    substituteInPlace piglit \
+      --replace 'script_basename_noext = os.path.splitext(os.path.basename(__file__))[0]' 'script_basename_noext = "piglit"'
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/piglit \
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} \
+      --prefix PATH : "${waffle}/bin"
+  '';
+
+  meta = with lib; {
+    description = "An OpenGL test suite, and test-suite runner";
+    homepage = "https://gitlab.freedesktop.org/mesa/piglit";
+    license = licenses.free; # custom license. See COPYING in the source repo.
+    platforms = platforms.mesaPlatforms;
+    maintainers = with maintainers; [ Flakebi ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e15c6c512fd0..b6a62f91b224 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2465,6 +2465,8 @@ in
 
   photon = callPackage ../tools/networking/photon { };
 
+  piglit = callPackage ../tools/graphics/piglit { };
+
   playerctl = callPackage ../tools/audio/playerctl { };
 
   ps_mem = callPackage ../tools/system/ps_mem { };

From c5b04da595a52e5c41a5e0dc7cb94dacd538900d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 14:43:42 +0000
Subject: [PATCH 1089/3942] ocenaudio: 3.9.2 -> 3.9.5

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

diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix
index 19f6d7bfb5ae..0de043d35dba 100644
--- a/pkgs/applications/audio/ocenaudio/default.nix
+++ b/pkgs/applications/audio/ocenaudio/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ocenaudio";
-  version = "3.9.2";
+  version = "3.9.5";
 
   src = fetchurl {
     url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
-    sha256 = "1fvpba3dnzb7sm6gp0znbrima02ckfiy2zwb66x1gr05y9a56inv";
+    sha256 = "13hvdfydlgp2qf49ddhdzghz5jkyx1rhnsj8sf8khfxf9k8phkjd";
   };
 
 

From 6872c4df544cfe1504754e52aa3703819ea29396 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 14:48:05 +0000
Subject: [PATCH 1090/3942] ocamlPackages.qtest: 2.11 -> 2.11.1

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

diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix
index 3bbb542bcba5..e7f00803a19c 100644
--- a/pkgs/development/ocaml-modules/qtest/default.nix
+++ b/pkgs/development/ocaml-modules/qtest/default.nix
@@ -2,13 +2,13 @@
 
 buildDunePackage rec {
   pname = "qtest";
-  version = "2.11";
+  version = "2.11.1";
 
   src = fetchFromGitHub {
     owner = "vincent-hugot";
     repo = pname;
     rev = "v${version}";
-    sha256 = "10fi2093ny8pp3jsi1gdqsllp3lr4r5mfcs2hrm7qvbnhrdbb0g3";
+    sha256 = "01aaqnblpkrkv1b2iy5cwn92vxdj4yjiav9s2nvvrqz5m8b9hi1f";
   };
 
   propagatedBuildInputs = [ qcheck ];

From 63bc9d32fe4971b2fe61da9b8b77236777965963 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 15:26:59 +0100
Subject: [PATCH 1091/3942] backintime-common: 1.1.24 -> 1.2.1

---
 .../networking/sync/backintime/common.nix     | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index 6244cd661d0a..73b40ea111a7 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -1,34 +1,40 @@
-{stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfs-fuse, encfs }:
+{stdenv, lib, fetchFromGitHub, makeWrapper, gettext,
+python3, rsync, cron, openssh, sshfs-fuse, encfs }:
 
 let
-  inherit (python3Packages) python dbus-python keyring;
-in stdenv.mkDerivation rec {
-  version = "1.1.24";
+  python' = python3.withPackages (ps: with ps; [ dbus-python keyring ]);
 
+  apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ];
+in stdenv.mkDerivation rec {
   pname = "backintime-common";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "bit-team";
     repo = "backintime";
     rev = "v${version}";
-    sha256 = "0g6gabnr60ns8854hijdddbanks7319q4n3fj5l6rc4xsq0qck18";
+    sha256 = "mBjheLY7DHs995heZmxVnDdvABkAROCjRJ4a/uJmJcg=";
   };
 
-  buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ];
+  nativeBuildInputs = [ makeWrapper gettext ];
+  buildInputs = [ python' ];
 
   installFlags = [ "DEST=$(out)" ];
 
-  preConfigure = "cd common";
+  preConfigure = ''
+    cd common
+    substituteInPlace configure \
+      --replace "/.." "" \
+      --replace "share/backintime" "${python'.sitePackages}/backintime"
+    substituteInPlace "backintime" \
+      --replace "share" "${python'.sitePackages}"
+  '';
 
   dontAddPrefix = true;
 
-  preFixup =
-    ''
-    substituteInPlace "$out/bin/backintime" \
-      --replace "=\"/usr/share" "=\"$prefix/share"
+  preFixup = ''
     wrapProgram "$out/bin/backintime" \
-      --prefix PYTHONPATH : "$PYTHONPATH" \
-      --prefix PATH : "$prefix/bin:$PATH"
+      --prefix PATH : ${apps}
     '';
 
   meta = {

From 00e30c9e9e382fb40fc6dd817571d379af01fefc Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 03:04:29 +0100
Subject: [PATCH 1092/3942] backintime-qt: 1.1.24 -> 1.2.1

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
---
 .../networking/sync/backintime/qt.nix         | 26 +++++++++++++++++
 .../networking/sync/backintime/qt4.nix        | 28 -------------------
 pkgs/top-level/all-packages.nix               |  4 +--
 3 files changed, 28 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/applications/networking/sync/backintime/qt.nix
 delete mode 100644 pkgs/applications/networking/sync/backintime/qt4.nix

diff --git a/pkgs/applications/networking/sync/backintime/qt.nix b/pkgs/applications/networking/sync/backintime/qt.nix
new file mode 100644
index 000000000000..a48d6d8804fe
--- /dev/null
+++ b/pkgs/applications/networking/sync/backintime/qt.nix
@@ -0,0 +1,26 @@
+{ mkDerivation, backintime-common, python3 }:
+
+let
+  python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common ]);
+in
+mkDerivation {
+  inherit (backintime-common)
+    version src installFlags meta dontAddPrefix nativeBuildInputs;
+
+  pname = "backintime-qt";
+
+  buildInputs = [ python' backintime-common ];
+
+  preConfigure = ''
+    cd qt
+    substituteInPlace configure \
+      --replace '"/../etc' '"/etc'
+    substituteInPlace qttools.py \
+      --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"'
+  '';
+
+  preFixup = ''
+    wrapQtApp "$out/bin/backintime-qt" \
+      --prefix PATH : "${backintime-common}/bin:$PATH"
+  '';
+}
diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix
deleted file mode 100644
index b72ddc8bae63..000000000000
--- a/pkgs/applications/networking/sync/backintime/qt4.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }:
-
-stdenv.mkDerivation {
-  inherit (backintime-common) version src installFlags;
-
-  pname = "backintime-qt4";
-
-  buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ];
-
-  preConfigure = "cd qt4";
-  configureFlags = [  ];
-
-  dontAddPrefix = true;
-
-  preFixup =
-      ''
-      substituteInPlace "$out/bin/backintime-qt4" \
-        --replace "=\"/usr/share" "=\"$prefix/share"
-
-      wrapProgram "$out/bin/backintime-qt4" \
-        --prefix PYTHONPATH : "${backintime-common}/share/backintime/common:$PYTHONPATH" \
-        --prefix PATH : "${backintime-common}/bin:$PATH"
-    '';
-
-  meta = with stdenv.lib; {
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f66f57699132..870919b93802 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20007,9 +20007,9 @@ in
 
   backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { };
 
-  backintime-qt4 = callPackage ../applications/networking/sync/backintime/qt4.nix { };
+  backintime-qt = libsForQt5.callPackage ../applications/networking/sync/backintime/qt.nix { };
 
-  backintime = backintime-qt4;
+  backintime = backintime-qt;
 
   balsa = callPackage ../applications/networking/mailreaders/balsa { };
 

From 7543833ccf992cb199a4d9f9605cedd3963a546b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 1 Nov 2020 12:28:56 -0800
Subject: [PATCH 1093/3942] haxor-news: use python3, fix build

---
 pkgs/applications/misc/haxor-news/default.nix | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index 98f84ca68b8e..41aa71cb82e2 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -1,20 +1,35 @@
-{ stdenv, python, fetchpatch }:
+{ stdenv, fetchFromGitHub, python3, fetchpatch }:
 
-with python.pkgs;
+
+let
+  py = python3.override {
+    packageOverrides = self: super: {
+      self = py;
+
+      # not compatible with prompt_toolkit >=2.0
+      prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec {
+        name = "${oldAttrs.pname}-${version}";
+        version = "1.0.18";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "09h1153wgr5x2ny7ds0w2m81n3bb9j8hjb8sjfnrg506r01clkyx";
+        };
+      });
+    };
+  };
+in
+with py.pkgs;
 
 buildPythonApplication rec {
   pname = "haxor-news";
-  version = "0.4.3";
+  version = "unstable-2020-10-20";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "5b9af8338a0f8b95a8133b66ef106553823813ac171c0aefa3f3f2dbeb4d7f88";
-  };
-
-  # allow newer click version
-  patches = fetchpatch {
-    url = "${meta.homepage}/commit/5b0d3ef1775756ca15b6d83fba1fb751846b5427.patch";
-    sha256 = "1551knh2f7yarqzcpip16ijmbx8kzdna8cihxlxx49ww55f5sg67";
+  # haven't done a stable release in 3+ years, but actively developed
+  src = fetchFromGitHub {
+    owner = "donnemartin";
+    repo = pname;
+    rev = "811a5804c09406465b2b02eab638c08bf5c4fa7f";
+    sha256 = "1g3dfsyk4727d9jh9w6j5r51ag07851cls7v7a7hmdvdixpvbzp6";
   };
 
   propagatedBuildInputs = [
@@ -26,6 +41,7 @@ buildPythonApplication rec {
     six
   ];
 
+  # will fail without pre-seeded config files
   doCheck = false;
 
   checkInputs = [ mock ];

From 719cfc6cf0889cbab61e5619dbb4b7fb30a2a438 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Tue, 3 Nov 2020 11:43:14 +0900
Subject: [PATCH 1094/3942] pythonPackages.nix-kernel: disable on Python 2

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 pkgs/development/python-modules/nix-kernel/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/nix-kernel/default.nix b/pkgs/development/python-modules/nix-kernel/default.nix
index 81057308e6b5..5758e60fa3fc 100644
--- a/pkgs/development/python-modules/nix-kernel/default.nix
+++ b/pkgs/development/python-modules/nix-kernel/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, isPy3k
 , pexpect
 , notebook
 , nix
@@ -10,6 +11,8 @@ buildPythonPackage rec {
   pname = "nix-kernel";
   version = "unstable-2020-04-26";
 
+  disabled = !isPy3k;
+
   src = fetchFromGitHub {
     owner = "GTrunSec";
     repo = "nix-kernel";

From f249558f952bf46ec4bfbc840e0200a1fde818cd Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 Nov 2020 08:49:31 -0500
Subject: [PATCH 1095/3942] linux: 5.4.73 -> 5.4.74

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index ad3334d7c938..881e72f5cf17 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.73";
+  version = "5.4.74";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1cknwnzpimjfacjbb39ay9j4lv3767j2858xz9yvwsvj7d04nhjs";
+    sha256 = "1drs2pngr5w3rmpydljirmibp30qb4hdrhqsi92knshlw6nz817c";
   };
 } // (args.argsOverride or {}))

From 7e9c6235f163b452cb02283fafc87940a7679cbc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 Nov 2020 08:49:39 -0500
Subject: [PATCH 1096/3942] linux: 5.8.17 -> 5.8.18

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix
index ee58f02db876..dd11359dbf41 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.8.17";
+  version = "5.8.18";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "00rwvsrmklvkzch8bl6z29vch4dyvzxrs97pr1qd13afw7y6912n";
+    sha256 = "0d2mm16mjyl2d734ak0lj8vd76h3r0san7l7g2zczd5pjkva7d2a";
   };
 } // (args.argsOverride or {}))

From f652a024bb618a4e1e57351ef3a6141822ce6bfb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 Nov 2020 08:49:49 -0500
Subject: [PATCH 1097/3942] linux: 5.9.2 -> 5.9.3

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix
index 05c594f7efba..9d9f1eaa7f00 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.9.2";
+  version = "5.9.3";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0dh2ciyrm2ac7r4pybxa1cq3pfw3z3ilj50gdaa0clm9j7nyrx2i";
+    sha256 = "0wwa6557i9l4vyswz26ixz8c2ykxnzqrsc9pwkr76nyjx7gjibni";
   };
 } // (args.argsOverride or {}))

From b7880ce6ec0d601ee6d11749d033d5fc9e983c37 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 Nov 2020 08:49:59 -0500
Subject: [PATCH 1098/3942] linux-rt_5_4: 5.4.70-rt40 -> 5.4.74-rt41

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

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
index b1f40ac1c96c..3ea7d620595d 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "5.4.70-rt40"; # updated by ./update-rt.sh
+  version = "5.4.74-rt41"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -14,14 +14,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "01shqhibrxirl9bik8jwiag70n9n0l7782xh73gkb8jvbh4dicy0";
+    sha256 = "1drs2pngr5w3rmpydljirmibp30qb4hdrhqsi92knshlw6nz817c";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "19px04cmv1v65ad7dr3y0bjr9xviawhb26iijvnxiwyjvm0054kw";
+      sha256 = "0ap5zvdx6zxwqh2cy67rha4zgz3k8vqzd2vhll1mx81d10fmvmp8";
     };
   }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
 

From d92254fbebc909465fc5c394bf54201ea3242165 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 Nov 2020 11:16:05 -0500
Subject: [PATCH 1099/3942] sbt: Add update script

---
 .../tools/build-managers/sbt/default.nix      | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 2ff15d68871a..7cddc1acf736 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, autoPatchelfHook, zlib }:
+{ stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript, common-updater-scripts, git, nixfmt, nix, coreutils, gnused }:
 
 stdenv.mkDerivation rec {
   pname = "sbt";
@@ -34,4 +34,22 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nequissimus ];
     platforms = platforms.unix;
   };
+
+  passthru.updateScript = writeScript "update.sh" ''
+    #!${stdenv.shell}
+    set -o errexit
+    PATH=${stdenv.lib.makeBinPath [ common-updater-scripts git nixfmt nix coreutils gnused ]}
+
+    oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion sbt" | tr -d '"')"
+    latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:sbt/sbt.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
+
+    if [ ! "$oldVersion" = "$latestTag" ]; then
+      update-source-version sbt "$latestTag" --version-key=version --print-changes
+      nixpkgs="$(git rev-parse --show-toplevel)"
+      default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix"
+      nixfmt "$default_nix"
+    else
+      echo "sbt is already up-to-date"
+    fi
+  '';
 }

From 8d279bbf671ca1ab9fa9a610ec56a4f10a41cfe7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 Nov 2020 16:37:36 +0000
Subject: [PATCH 1100/3942] =?UTF-8?q?sbt:=201.4.0=20=E2=86=92=201.4.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/build-managers/sbt/default.nix       | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 7cddc1acf736..6f34ef03b00f 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript, common-updater-scripts, git, nixfmt, nix, coreutils, gnused }:
+{ stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript
+, common-updater-scripts, git, nixfmt, nix, coreutils, gnused }:
 
 stdenv.mkDerivation rec {
   pname = "sbt";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchurl {
     url =
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
-    sha256 = "1mgfs732w1c1p7dna7h47x8h073lvjs224fqlpkkvq10153mnxxl";
+    sha256 = "1dw4l91sw4ybqxjid1hsb6r33ka5bl85rfdrbsr9m5vxl82a3mmc";
   };
 
   patchPhase = ''
@@ -38,7 +39,16 @@ stdenv.mkDerivation rec {
   passthru.updateScript = writeScript "update.sh" ''
     #!${stdenv.shell}
     set -o errexit
-    PATH=${stdenv.lib.makeBinPath [ common-updater-scripts git nixfmt nix coreutils gnused ]}
+    PATH=${
+      stdenv.lib.makeBinPath [
+        common-updater-scripts
+        git
+        nixfmt
+        nix
+        coreutils
+        gnused
+      ]
+    }
 
     oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion sbt" | tr -d '"')"
     latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:sbt/sbt.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"

From 816da5c1d1e4ccd2f6bfe387023a9fe3b02042da Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 10:13:10 +0000
Subject: [PATCH 1101/3942] ft2-clone: 1.36 -> 1.37

---
 pkgs/applications/audio/ft2-clone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index 4eae53e05422..20618e3c5d5f 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ft2-clone";
-  version = "1.36";
+  version = "1.37";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
     rev = "v${version}";
-    sha256 = "0hsgzh7s2qgl8ah8hzmhfl74v5y8wc7f6z8ly9026h5r6pb09id0";
+    sha256 = "1lhpzd46mpr3bq13qhd0bq724db5fhc8jplfb684c2q7sc4v92nk";
   };
 
   nativeBuildInputs = [ cmake ];

From 2d9968f1aee4814daf5fa824a6ab0c209c99800d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 00:21:23 +0000
Subject: [PATCH 1102/3942] dropbear: 2020.80 -> 2020.81

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

diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index b80eba3f6cac..88217302915e 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2020.80";
+  name = "dropbear-2020.81";
 
   src = fetchurl {
     url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
-    sha256 = "0jbrbpdzyv11x5rkljdimzq9p6a7da5siw9k405ibnpjj4dr89yr";
+    sha256 = "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8";
   };
 
   dontDisableStatic = enableStatic;

From f2c96ec734064a9e24db571ed8a9dfc8e7ffceb8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 10:52:56 +0000
Subject: [PATCH 1103/3942] gleam: 0.11.2 -> 0.12.0

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

diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index a40065fe579c..00f1247f5da5 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gleam";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1g8yfp1xpkv1lqz8azam40cvrs5cggxlyrb72h8k88br75qmi6hj";
+    sha256 = "1hlbskpfqdh5avmqnry69s7x0wj6l6yaqkayx7lj6z99p58p9zrz";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ] ++
     stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "1gfr6c4i5kx8x3q23s4b4n25z2k6xkxpk12acr4ry97pyj2lr5wq";
+  cargoSha256 = "1djznh7v6ha4ks8l8arwwn301qclmb7iih774q5y7sbzqrv7sw0q";
 
   meta = with stdenv.lib; {
     description = "A statically typed language for the Erlang VM";

From fc44a0a48e8f27064cd43c594ebce60a2ad4c776 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Nov 2020 16:31:51 +0000
Subject: [PATCH 1104/3942] cloud-utils: 0.31 -> 0.32

---
 pkgs/tools/misc/cloud-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index afae939ef38a..bd6d59c8a0ce 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -17,10 +17,10 @@ in stdenv.mkDerivation rec {
   # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops
   # growpart is needed in initrd in nixos/system/boot/grow-partition.nix
   pname = "cloud-utils";
-  version = "0.31";
+  version = "0.32";
   src = fetchurl {
     url = "https://launchpad.net/cloud-utils/trunk/${version}/+download/cloud-utils-${version}.tar.gz";
-    sha256 = "07fl3dlqwdzw4xx7mcxhpkks6dnmaxha80zgs9f6wmibgzni8z0r";
+    sha256 = "0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ python3 ];

From f3096f34008b9d4dff0f893d10bea9de4bfd346a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 06:55:26 +0000
Subject: [PATCH 1105/3942] ipset: 7.6 -> 7.7

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

diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix
index 2c433ba8c29a..dada5c35f715 100644
--- a/pkgs/os-specific/linux/ipset/default.nix
+++ b/pkgs/os-specific/linux/ipset/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ipset";
-  version = "7.6";
+  version = "7.7";
 
   src = fetchurl {
     url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
-    sha256 = "1ny2spcm6bmpj8vnazssg99k59impr7n84jzkdmdjly1m7548z8f";
+    sha256 = "0ckc678l1431mb0q5ilfgy0ajjwi8n135c72h606imm43dc0v9a5";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 5f201c892d32242a3b9b8d50e7d26cd46015bfee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 07:52:23 +0000
Subject: [PATCH 1106/3942] python27Packages.kaitaistruct: 0.8 -> 0.9

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

diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix
index a1e795421b07..61892063278b 100644
--- a/pkgs/development/python-modules/kaitaistruct/default.nix
+++ b/pkgs/development/python-modules/kaitaistruct/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "kaitaistruct";
-  version = "0.8";
+  version = "0.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d1d17c7f6839b3d28fc22b21295f787974786c2201e8788975e72e2a1d109ff5";
+    sha256 = "3d5845817ec8a4d5504379cc11bd570b038850ee49c4580bc0998c8fb1d327ad";
   };
 
   meta = with stdenv.lib; {

From a765199f1ecff9668ae4bc9ba634849dc62dbf43 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 09:43:43 +0000
Subject: [PATCH 1107/3942] i2c-tools: 4.1 -> 4.2

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

diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix
index 3a00dbefa635..d1dc94290fab 100644
--- a/pkgs/os-specific/linux/i2c-tools/default.nix
+++ b/pkgs/os-specific/linux/i2c-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "i2c-tools";
-  version = "4.1";
+  version = "4.2";
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/utils/i2c-tools/${pname}-${version}.tar.xz";
-    sha256 = "1m97hpwqfaqjl9xvr4pvz2vdrsdvxbcn0nnx8pamnyc3s7pikcjp";
+    sha256 = "1mmc1n8awl3winyrp1rcxg94vjsx9dc1y7gj7y88blc2f2ydmwip";
   };
 
   buildInputs = [ perl ];

From f2e54ae2322168f9153f2470291d64fd0c587096 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 13:43:59 +0000
Subject: [PATCH 1108/3942] kapacitor: 1.5.6 -> 1.5.7

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

diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix
index 0a15daf71c61..2435d570cbb5 100644
--- a/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/pkgs/servers/monitoring/kapacitor/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "kapacitor";
-  version = "1.5.6";
+  version = "1.5.7";
 
   goPackagePath = "github.com/influxdata/kapacitor";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "kapacitor";
     rev = "v${version}";
-    sha256 = "1jb04lnxjrms7x5nlrsd1s465rramm9z4zkqpfw1vfdsqa2dd8rc";
+    sha256 = "0lzx25d4y5d8rsddgnypfskcxa5qlwc294sdzmn8dlq995yphpac";
   };
 
   meta = with lib; {

From f747312aeb1b08c08b53cfdfaa53bd4c096901f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 16:54:19 +0000
Subject: [PATCH 1109/3942] libsForQt5.kdsoap: 1.9.0 -> 1.9.1

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

diff --git a/pkgs/development/libraries/kdsoap/default.nix b/pkgs/development/libraries/kdsoap/default.nix
index dde2e5cb1a77..50ba2c300b3f 100644
--- a/pkgs/development/libraries/kdsoap/default.nix
+++ b/pkgs/development/libraries/kdsoap/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "1.9.0";
+  version = "1.9.1";
 in
 
 mkDerivation {
@@ -24,7 +24,7 @@ mkDerivation {
   };
   src = fetchurl {
     url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz";
-    sha256 = "0a28k48cmagqxhaayyrqnxsx1zbvw4f06dgs16kl33xhbinn5fg3";
+    sha256 = "09rxx7h98niawz7i94g279c2rgh7xmq1hqxwlyzwsaqsx4kfl850";
   };
   outputs = [ "out" "dev" ];
   nativeBuildInputs = [ cmake ];

From 00d6fff6303531fb9ee4ae9761e888407485ba22 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 11:54:00 +0000
Subject: [PATCH 1110/3942] i2pd: 2.33.0 -> 2.34.0

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 08c40a4ac827..1439b62bc94e 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null;
 
 stdenv.mkDerivation rec {
   pname = "i2pd";
-  version = "2.33.0";
+  version = "2.34.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "1zsp4pml5pq8p1ipvarnlcfwcscch13iz1gzza5qm0yl01dl9qpk";
+    sha256 = "0ibk222fwgjaxrmhrk5avcmmbj52ibcsydm2m02xnlpr8kcqsjnc";
   };
 
   buildInputs = with stdenv.lib; [ boost zlib openssl ]

From d6745c775146f63a6b5fd02dca52e22b65c37dc9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 03:25:31 +0000
Subject: [PATCH 1111/3942] mcabber: 1.1.0 -> 1.1.2

---
 .../networking/instant-messengers/mcabber/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index 98b326820b9f..23db7d1ce257 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mcabber";
-  version = "1.1.0";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "https://mcabber.com/files/mcabber-${version}.tar.bz2";
-    sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04";
+    sha256 = "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 99df4a6154db57ada0496509253c7ace77bb9c94 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 03:36:03 +0000
Subject: [PATCH 1112/3942] lombok: 1.18.12 -> 1.18.16

---
 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 5928d99b6c24..5a1210036056 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.18.12";
+  name = "lombok-1.18.16";
 
   src = fetchurl {
     url = "https://projectlombok.org/downloads/${name}.jar";
-    sha256 = "01jl6i5wzjxyk36fcq6ji90x9h143gvnwhv86cbkqaxhxh41af29";
+    sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj";
   };
 
   buildCommand = ''

From bc8715adbb67b45b438f41ae4eb715bdbfada444 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 04:17:33 +0000
Subject: [PATCH 1113/3942] lxcfs: 4.0.5 -> 4.0.6

---
 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 bcc8614bc6ab..0067f0881aea 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "lxcfs";
-  version = "4.0.5";
+  version = "4.0.6";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
     rev = "lxcfs-${version}";
-    sha256 = "12mk9hgqzzh1874389lrpvldlp87qxxa1sxzk5zr0d0n1857am5y";
+    sha256 = "1fp2q4y3ql4xd2lp4bpcl8s6xryr5xbb56da9d20w2cdr2d0lwyv";
   };
 
   nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];

From b9321adf1ea91bca9e2127ce4f0b428391745474 Mon Sep 17 00:00:00 2001
From: Farid Zakaria <fmzakari@google.com>
Date: Thu, 15 Oct 2020 16:36:11 -0700
Subject: [PATCH 1114/3942] documentation: add documentation for maven

Add nice markdown documentation for how to use mvn2nix plugin and the
buildMaven function within nixpkgs.

Update doc/languages-frameworks/maven.md

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>

Apply suggestions from code review

Co-authored-by: Doron Behar <doron.behar@gmail.com>

Apply suggestions from code review

Co-authored-by: Doron Behar <doron.behar@gmail.com>

Apply suggestions from code review

Co-authored-by: Doron Behar <doron.behar@gmail.com>
---
 doc/languages-frameworks/index.xml        |   1 +
 doc/languages-frameworks/maven.section.md | 354 ++++++++++++++++++++++
 2 files changed, 355 insertions(+)
 create mode 100644 doc/languages-frameworks/maven.section.md

diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 728a38c264a3..3366108cd938 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -19,6 +19,7 @@
  <xi:include href="ios.section.xml" />
  <xi:include href="java.xml" />
  <xi:include href="lua.section.xml" />
+ <xi:include href="maven.section.xml" />
  <xi:include href="node.section.xml" />
  <xi:include href="ocaml.xml" />
  <xi:include href="perl.xml" />
diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md
new file mode 100644
index 000000000000..fe183e7ba3cc
--- /dev/null
+++ b/doc/languages-frameworks/maven.section.md
@@ -0,0 +1,354 @@
+---
+title: Maven
+author: Farid Zakaria
+date: 2020-10-15
+---
+
+# Maven
+
+Maven is a well-known build tool for the Java ecosystem however it has some challenges when integrating into the Nix build system.
+
+The following provides a list of common patterns with how to package a Maven project (or any JVM language that can export to Maven) as a Nix package.
+
+For the purposes of this example let's consider a very basic Maven project with the following `pom.xml` with a single dependency on [emoji-java](https://github.com/vdurmont/emoji-java).
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.github.fzakaria</groupId>
+  <artifactId>maven-demo</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+  <name>NixOS Maven Demo</name>
+
+  <dependencies>
+    <dependency>
+        <groupId>com.vdurmont</groupId>
+        <artifactId>emoji-java</artifactId>
+        <version>5.1.1</version>
+      </dependency>
+  </dependencies>
+</project>
+```
+
+Our main class file will be very simple:
+
+```java
+import com.vdurmont.emoji.EmojiParser;
+
+public class Main {
+  public static void main(String[] args) {
+    String str = "NixOS :grinning: is super cool :smiley:!";
+    String result = EmojiParser.parseToUnicode(str);
+    System.out.println(result);
+  }
+}
+```
+
+You find this demo project at https://github.com/fzakaria/nixos-maven-example
+
+## Solving for dependencies
+
+### buildMaven with NixOS/mvn2nix-maven-plugin
+
+> ⚠️ Although `buildMaven` is the "blessed" way within nixpkgs, as of 2020, it hasn't seen much activity in quite a while.
+
+`buildMaven` is an alternative method that tries to follow similar patterns of other programming languages by generating a lock file. It relies on the maven plugin [mvn2nix-maven-plugin](https://github.com/NixOS/mvn2nix-maven-plugin).
+
+First you generate a `project-info.json` file using the maven plugin.
+
+> This should be executed in the project's source repository or be told which `pom.xml` to execute with.
+
+```bash
+# run this step within the project's source repository
+❯ mvn org.nixos.mvn2nix:mvn2nix-maven-plugin:mvn2nix
+
+❯ cat project-info.json | jq | head
+{
+  "project": {
+    "artifactId": "maven-demo",
+    "groupId": "org.nixos",
+    "version": "1.0",
+    "classifier": "",
+    "extension": "jar",
+    "dependencies": [
+      {
+        "artifactId": "maven-resources-plugin",
+```
+
+This file is then given to the `buildMaven` function, and it returns 2 attributes.
+
+**`repo`**:
+    A Maven repository that is a symlink farm of all the dependencies found in the `project-info.json`
+
+
+**`build`**:
+    A simple derivation that runs through `mvn compile` & `mvn package` to build the JAR. You may use this as inspiration for more complicated derivations.
+
+Here is an [example](https://github.com/fzakaria/nixos-maven-example/blob/main/build-maven-repository.nix) of building the Maven repository
+```nix
+{ pkgs ? import <nixpkgs> { } }:
+with pkgs;
+(buildMaven ./project-info.json).repo
+```
+
+The benefit over the _double invocation_ as we will see below, is that the _/nix/store_ entry is a _linkFarm_ of every package, so that changes to your dependency set doesn't involve downloading everything from scratch.
+
+```bash
+❯ tree $(nix-build --no-out-link build-maven-repository.nix) | head
+/nix/store/g87va52nkc8jzbmi1aqdcf2f109r4dvn-maven-repository
+├── antlr
+│   └── antlr
+│       └── 2.7.2
+│           ├── antlr-2.7.2.jar -> /nix/store/d027c8f2cnmj5yrynpbq2s6wmc9cb559-antlr-2.7.2.jar
+│           └── antlr-2.7.2.pom -> /nix/store/mv42fc5gizl8h5g5vpywz1nfiynmzgp2-antlr-2.7.2.pom
+├── avalon-framework
+│   └── avalon-framework
+│       └── 4.1.3
+│           ├── avalon-framework-4.1.3.jar -> /nix/store/iv5fp3955w3nq28ff9xfz86wvxbiw6n9-avalon-framework-4.1.3.jar
+```
+### Double Invocation
+
+> ⚠️ This pattern is the simplest but may cause unnecessary rebuilds due to the output hash changing.
+
+The double invocation is a _simple_ way to get around the problem that `nix-build` may be sandboxed and have no Internet connectivity.
+
+It treats the entire Maven repository as a single source to be downloaded, relying on Maven's dependency resolution to satisfy the output hash. This is similar to fetchers like `fetchgit`, except it has to run a Maven build to determine what to download.
+
+The first step will be to build the Maven project as a fixed-output derivation in order to collect the Maven repository -- below is an [example](https://github.com/fzakaria/nixos-maven-example/blob/main/double-invocation-repository.nix).
+
+> Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory.
+
+```nix
+{ stdenv, maven }:
+stdenv.mkDerivation {
+  name = "maven-repository";
+  buildInputs = [ maven ];
+  src = ./.; # or fetchFromGitHub, cleanSourceWith, etc
+  buildPhase = ''
+    mvn package -Dmaven.repo.local=$out
+  '';
+
+  # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
+  installPhase = ''
+    find $out -type f \
+      -name \*.lastUpdated -or \
+      -name resolver-status.properties -or \
+      -name _remote.repositories \
+      -delete
+  '';
+
+  # don't do any fixup
+  dontFixup = true;
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  # replace this with the correct SHA256
+  outputHash = stdenv.lib.fakeSha256;
+}
+```
+
+The build will fail, and tell you the expected `outputHash` to place. When you've set the hash, the build will return with a `/nix/store` entry whose contents are the full Maven repository.
+
+> Some additional files are deleted that would cause the output hash to change potentially on subsequent runs.
+
+```bash
+❯ tree $(nix-build --no-out-link double-invocation-repository.nix) | head
+/nix/store/8kicxzp98j68xyi9gl6jda67hp3c54fq-maven-repository
+├── backport-util-concurrent
+│   └── backport-util-concurrent
+│       └── 3.1
+│           ├── backport-util-concurrent-3.1.pom
+│           └── backport-util-concurrent-3.1.pom.sha1
+├── classworlds
+│   └── classworlds
+│       ├── 1.1
+│       │   ├── classworlds-1.1.jar
+```
+
+If your package uses _SNAPSHOT_ dependencies or _version ranges_; there is a strong likelihood that over-time your output hash will change since the resolved dependencies may change. Hence this method is less recommended then using `buildMaven`.
+
+## Building a JAR
+
+Regardless of which strategy is chosen above, the step to build the derivation is the same.
+
+```nix
+{ stdenv, lib, maven, callPackage }:
+# pick a repository derivation, here we will use buildMaven
+let repository = callPackage ./build-maven-repository.nix { };
+in stdenv.mkDerivation rec {
+  pname = "maven-demo";
+  version = "1.0";
+
+  src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
+  buildInputs = [ maven ];
+
+  buildPhase = ''
+    echo "Using repository ${repository}"
+    mvn --offline -Dmaven.repo.local=${repository} package;
+  '';
+
+  installPhase = ''
+    install -Dm644 target/${pname}-${version}.jar $out/share/java
+  '';
+}
+```
+
+> We place the library in `$out/share/java` since JDK package has a _stdenv setup hook_ that adds any JARs in the `share/java` directories of the build inputs to the CLASSPATH environment.
+
+```bash
+❯ tree $(nix-build --no-out-link build-jar.nix)
+/nix/store/7jw3xdfagkc2vw8wrsdv68qpsnrxgvky-maven-demo-1.0
+└── share
+    └── java
+        └── maven-demo-1.0.jar
+
+2 directories, 1 file
+```
+
+## Runnable JAR
+
+The previous example builds a `jar` file but that's not a file one can run.
+
+You need to use it with `java -jar $out/share/java/output.jar` and make sure to provide the required dependencies on the classpath.
+
+The following explains how to use `makeWrapper` in order to make the derivation produce an executable that will run the JAR file you created.
+
+We will use the same repository we built above (either _double invocation_ or _buildMaven_) to setup a CLASSPATH for our JAR.
+
+The following two methods are more suited to Nix then building an [UberJar](https://imagej.net/Uber-JAR) which may be the more traditional approach.
+
+### CLASSPATH
+
+> This is ideal if you are providing a derivation for _nixpkgs_ and don't want to patch the project's `pom.xml`.
+
+We will read the Maven repository and flatten it to a single list. This list will then be concatenated with the _CLASSPATH_ separator to create the full classpath.
+
+We make sure to provide this classpath to the `makeWrapper`.
+
+```nix
+{ stdenv, lib, maven, callPackage, makeWrapper, jre }:
+let
+  repository = callPackage ./build-maven-repository.nix { };
+in stdenv.mkDerivation rec {
+  pname = "maven-demo";
+  version = "1.0";
+
+  src = builtins.fetchTarball
+    "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
+  buildInputs = [ maven makeWrapper ];
+
+  buildPhase = ''
+    echo "Using repository ${repository}"
+    mvn --offline -Dmaven.repo.local=${repository} package;
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    classpath=$(find ${repository} -name "*.jar" -printf ':%h/%f');
+    install -Dm644 target/${pname}-${version}.jar $out/share/java
+    # create a wrapper that will automatically set the classpath
+    # this should be the paths from the dependency derivation
+    makeWrapper ${jre}/bin/java $out/bin/${pname} \
+          --add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \
+          --add-flags "Main"
+  '';
+}
+```
+
+### MANIFEST file via Maven Plugin
+
+> This is ideal if you are the project owner and want to change your `pom.xml` to set the CLASSPATH within it.
+
+Augment the `pom.xml` to create a JAR with the following manifest:
+```xml
+<build>
+  <plugins>
+    <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+            <archive>
+                <manifest>
+                    <addClasspath>true</addClasspath>
+                    <classpathPrefix>../../repository/</classpathPrefix>
+                    <classpathLayoutType>repository</classpathLayoutType>
+                    <mainClass>Main</mainClass>
+                </manifest>
+                <manifestEntries>
+                    <Class-Path>.</Class-Path>
+                </manifestEntries>
+            </archive>
+        </configuration>
+    </plugin>
+  </plugins>
+</build>
+```
+
+The above plugin instructs the JAR to look for the necessary dependencies in the `lib/` relative folder. The layout of the folder is also in the _maven repository_ style.
+
+```bash
+❯ unzip -q -c $(nix-build --no-out-link runnable-jar.nix)/share/java/maven-demo-1.0.jar META-INF/MANIFEST.MF
+
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Built-By: nixbld
+Class-Path: . ../../repository/com/vdurmont/emoji-java/5.1.1/emoji-jav
+ a-5.1.1.jar ../../repository/org/json/json/20170516/json-20170516.jar
+Created-By: Apache Maven 3.6.3
+Build-Jdk: 1.8.0_265
+Main-Class: Main
+```
+
+We will modify the derivation above to add a symlink to our repository so that it's accessible to our JAR during the `installPhase`.
+
+```nix
+{ stdenv, lib, maven, callPackage, makeWrapper, jre }:
+# pick a repository derivation, here we will use buildMaven
+let repository = callPackage ./build-maven-repository.nix { };
+in stdenv.mkDerivation rec {
+  pname = "maven-demo";
+  version = "1.0";
+
+  src = builtins.fetchTarball
+    "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
+  buildInputs = [ maven makeWrapper ];
+
+  buildPhase = ''
+    echo "Using repository ${repository}"
+    mvn --offline -Dmaven.repo.local=${repository} package;
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    # create a symbolic link for the repository directory
+    ln -s ${repository} $out/repository
+
+    install -Dm644 target/${pname}-${version}.jar $out/share/java
+    # create a wrapper that will automatically set the classpath
+    # this should be the paths from the dependency derivation
+    makeWrapper ${jre}/bin/java $out/bin/${pname} \
+          --add-flags "-jar $out/share/java/${pname}-${version}.jar"
+  '';
+}
+```
+
+> Our script produces a dependency on `jre` rather than `jdk` to restrict the runtime closure necessary to run the application.
+
+This will give you an executable shell-script that launches your JAR with all the dependencies available.
+
+```bash
+❯ tree $(nix-build --no-out-link runnable-jar.nix)
+/nix/store/8d4c3ibw8ynsn01ibhyqmc1zhzz75s26-maven-demo-1.0
+├── bin
+│   └── maven-demo
+├── repository -> /nix/store/g87va52nkc8jzbmi1aqdcf2f109r4dvn-maven-repository
+└── share
+    └── java
+        └── maven-demo-1.0.jar
+
+❯ $(nix-build --no-out-link --option tarball-ttl 1 runnable-jar.nix)/bin/maven-demo
+NixOS 😀 is super cool 😃!
+```

From fe3d25d8e0f169033fea967e397b8692c64c9f3d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 05:20:46 +0000
Subject: [PATCH 1115/3942] mgba: 0.8.3 -> 0.8.4

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

diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index 73845581b1bf..9efe47cc250e 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -15,13 +15,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "mgba";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "mgba-emu";
     repo = "mgba";
     rev = version;
-    sha256 = "0rwlfjdr0rzbq4kaplvwsgyb8xq6nrzxss2c8xrgw9hqw3ymx4s3";
+    sha256 = "0nqj4bnn5c2z1bq4bnbw1wznc0wpmq4sy3w8pipd6n6620b9m4qq";
   };
 
   enableParallelBuilding = true;

From e90cfc722dceae9ac947e51fe33f66e972beb0ea Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Tue, 3 Nov 2020 12:10:58 +0100
Subject: [PATCH 1116/3942] i3: 4.18.2 -> 4.18.3

---
 pkgs/applications/window-managers/i3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index b37a83648ae5..2ea2c8ac7766 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "i3";
-  version = "4.18.2";
+  version = "4.18.3";
 
   src = fetchurl {
     url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2";
-    sha256 = "030jym6b8b07yf4y6pb806hg8k77zsprv569gy0r72rh5zb1g1mj";
+    sha256 = "03dijnwv2n8ak9jq59fhq0rc80m5wjc9d54fslqaivnnz81pkbjk";
   };
 
   nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ];

From c5a7d5729d78369275210bbd9fbb3878a1653d97 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 18:01:56 +0000
Subject: [PATCH 1117/3942] libmwaw: 0.3.16 -> 0.3.17

---
 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 fbba02fcd0c5..2ab23015af32 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.16";
+    version="0.3.17";
     name="${baseName}-${version}";
-    hash="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc";
-    url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.16/libmwaw-0.3.16.tar.xz";
-    sha256="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc";
+    hash="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf";
+    url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.17/libmwaw-0.3.17.tar.xz";
+    sha256="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From a6540325f465be9cc7ac5ae2dc3bcdd73dfcfd87 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Nov 2020 19:04:53 +0100
Subject: [PATCH 1118/3942] salt: 3002 -> 3002.1

Fixes: CVE-2020-16846, CVE-2020-17490, CVE-2020-25592
---
 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 3796ec31d6a4..b66911c9325b 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -7,11 +7,11 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "salt";
-  version = "3002";
+  version = "3002.1";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "tiLJ3p/eVx25a/1lmhg76lU90m5xyshWWTh+k3IhquY=";
+    sha256 = "0pp7qcfwsvg4419hzfka1180pw3saa9mrhl0z9951zn9fw2nllsc";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 5e602f88d1e8ba97491dd60c794c2faca273eccf Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 7 May 2020 13:17:14 +0200
Subject: [PATCH 1119/3942] nixos/modules/services/networking/unbound: update
 systemd unit

Previously we just applied a very minimal set of restrictions and
trusted unbound to properly drop root privs and capabilities.

With this change I am (for the most part) just using the upstream
example unit file for unbound. The main difference is that we start
unbound was `unbound` user with the required capabilities instead of
letting unbound do the chroot & uid/gid changes.

The upstream unit configuration this is based on is a lot stricter with
all kinds of permissions then our previous variant. It also came with
the default of having the `Type` set to `notify`, therefore we are also
using the `unbound-with-systemd` package here. Unbound will start up,
read the configuration files and start listening on the configured ports
before systemd will declare the unit "running". This will likely help
with startup order and the occasional race condition during system
activation where the DNS service is started but not yet ready to answer
queries.

Aditionally to the much stricter runtime environmet I removed the
`/dev/urandom` mount lines we previously had in the code (that would
randomly fail during `stop`-phase).

The `preStart` script is now only required if we enabled the trust
anchor updates (which are still enabled by default).

Another beneefit of the refactoring is that we can now issue reloads via
either `pkill -HUP unbound` or `systemctl reload unbound` to reload the
running configuration without taking the daemon offline. A prerequisite
of this was that unbound configuration is available on a well known path
on the file system. I went for /etc/unbound/unbound.conf as that is the
default in the CLI tooling which in turn enables us to use
`unbound-control` without passing a custom configuration location.
---
 nixos/modules/services/networking/unbound.nix | 100 ++++++++++++------
 1 file changed, 68 insertions(+), 32 deletions(-)

diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index baed83591e1e..bcb48678b212 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -1,9 +1,7 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-
 let
-
   cfg = config.services.unbound;
 
   stateDir = "/var/lib/unbound";
@@ -17,12 +15,12 @@ let
   forward =
     optionalString (any isLocalAddress cfg.forwardAddresses) ''
       do-not-query-localhost: no
-    '' +
-    optionalString (cfg.forwardAddresses != []) ''
+    ''
+    + optionalString (cfg.forwardAddresses != []) ''
       forward-zone:
         name: .
-    '' +
-    concatMapStringsSep "\n" (x: "    forward-addr: ${x}") cfg.forwardAddresses;
+    ''
+    + concatMapStringsSep "\n" (x: "    forward-addr: ${x}") cfg.forwardAddresses;
 
   rootTrustAnchorFile = "${stateDir}/root.key";
 
@@ -31,19 +29,20 @@ let
 
   confFile = pkgs.writeText "unbound.conf" ''
     server:
+      ip-freebind: yes
       directory: "${stateDir}"
       username: unbound
-      chroot: "${stateDir}"
+      chroot: ""
       pidfile: ""
+      # when running under systemd there is no need to daemonize
+      do-daemonize: no
       ${interfaces}
       ${access}
       ${trustAnchor}
     ${cfg.extraConfig}
     ${forward}
   '';
-
 in
-
 {
 
   ###### interface
@@ -55,8 +54,8 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.unbound;
-        defaultText = "pkgs.unbound";
+        default = pkgs.unbound-with-systemd;
+        defaultText = "pkgs.unbound-with-systemd";
         description = "The unbound package to use";
       };
 
@@ -69,11 +68,14 @@ in
       interfaces = mkOption {
         default = [ "127.0.0.1" ] ++ optional config.networking.enableIPv6 "::1";
         type = types.listOf types.str;
-        description = "What addresses the server should listen on.";
+        description =  ''
+          What addresses the server should listen on. This supports the interface syntax documented in
+          <citerefentry><refentrytitle>unbound.conf</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+        '';
       };
 
       forwardAddresses = mkOption {
-        default = [ ];
+        default = [];
         type = types.listOf types.str;
         description = "What servers to forward queries to.";
       };
@@ -110,6 +112,9 @@ in
 
     networking.resolvconf.useLocalResolver = mkDefault true;
 
+
+    environment.etc."unbound/unbound.conf".source = confFile;
+
     systemd.services.unbound = {
       description = "Unbound recursive Domain Name Server";
       after = [ "network.target" ];
@@ -117,32 +122,63 @@ in
       wants = [ "nss-lookup.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      preStart = ''
-        mkdir -m 0755 -p ${stateDir}/dev/
-        cp ${confFile} ${stateDir}/unbound.conf
-        ${optionalString cfg.enableRootTrustAnchor ''
-          ${cfg.package}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!"
-          chown unbound ${stateDir} ${rootTrustAnchorFile}
-        ''}
-        touch ${stateDir}/dev/random
-        ${pkgs.utillinux}/bin/mount --bind -n /dev/urandom ${stateDir}/dev/random
+      preStart = lib.mkIf cfg.enableRootTrustAnchor ''
+        ${cfg.package}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!"
       '';
 
-      serviceConfig = {
-        ExecStart = "${cfg.package}/bin/unbound -d -c ${stateDir}/unbound.conf";
-        ExecStopPost="${pkgs.utillinux}/bin/umount ${stateDir}/dev/random";
+      restartTriggers = [
+        confFile
+      ];
 
-        ProtectSystem = true;
-        ProtectHome = true;
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/unbound -p -d -c /etc/unbound/unbound.conf";
+        ExecReload = "+/run/current-system/sw/bin/kill -HUP $MAINPID";
+
+        NotifyAccess = "main";
+        Type = "notify";
+
+        AmbientCapabilities = [
+          "CAP_NET_BIND_SERVICE"
+          "CAP_NET_RAW"
+          "CAP_SETGID"
+          "CAP_SETUID"
+          "CAP_SYS_CHROOT"
+          "CAP_SYS_RESOURCE"
+        ];
+
+        User = "unbound";
+
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
         PrivateDevices = true;
-        Restart = "always";
-        RestartSec = "5s";
+        PrivateTmp = true;
+        ProtectHome = true;
+        ProtectControlGroups = true;
+        ProtectKernelModules = true;
+        ProtectSystem = "strict";
+        RuntimeDirectory = "unbound";
+        ConfigurationDirectory = "unbound";
+        StateDirectory = "unbound";
+        RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
+        RestrictRealtime = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "~@clock"
+          "@cpu-emulation"
+          "@debug"
+          "@keyring"
+          "@module"
+          "mount"
+          "@obsolete"
+          "@resources"
+        ];
+        RestrictNamespaces = true;
+        LockPersonality = true;
+        RestrictSUIDSGID = true;
+        ReadWritePaths = [ "/run/unbound" "${stateDir}" ];
       };
     };
-
     # If networkmanager is enabled, ask it to interface with unbound.
     networking.networkmanager.dns = "unbound";
-
   };
-
 }

From 72fbf05c17374b01abd7b6b1927de4146a7251eb Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 1 Nov 2020 22:11:11 +0100
Subject: [PATCH 1120/3942] nixos/unbound: note about the AmbientCapabilities

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

diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index bcb48678b212..bc2d5e550ba1 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -137,6 +137,7 @@ in
         NotifyAccess = "main";
         Type = "notify";
 
+        # FIXME: Which of these do we actualy need, can we drop the chroot flag?
         AmbientCapabilities = [
           "CAP_NET_BIND_SERVICE"
           "CAP_NET_RAW"

From aadc07618aff8106f888c67383fb32e471dd817e Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 1 Nov 2020 22:22:08 +0100
Subject: [PATCH 1121/3942] nixos/unbound: drop ReadWritePaths from systemd
 unit configuration

Both of the configured paths should be implicit due to RuntimeDirectory
& StateDirectory.
---
 nixos/modules/services/networking/unbound.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index bc2d5e550ba1..07e58481a77a 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -176,7 +176,6 @@ in
         RestrictNamespaces = true;
         LockPersonality = true;
         RestrictSUIDSGID = true;
-        ReadWritePaths = [ "/run/unbound" "${stateDir}" ];
       };
     };
     # If networkmanager is enabled, ask it to interface with unbound.

From a040a8a2e3e598d24be81d36b66fd8c195c019da Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 21 Oct 2020 01:34:24 +0200
Subject: [PATCH 1122/3942] nixos/tests/unbound: init

---
 nixos/tests/all-tests.nix |   1 +
 nixos/tests/unbound.nix   | 247 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 248 insertions(+)
 create mode 100644 nixos/tests/unbound.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 4e4d8b5e6894..f1d14c9f2d5d 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -362,6 +362,7 @@ in
   trezord = handleTest ./trezord.nix {};
   trickster = handleTest ./trickster.nix {};
   tuptime = handleTest ./tuptime.nix {};
+  unbound = handleTest ./unbound.nix {};
   udisks2 = handleTest ./udisks2.nix {};
   unit-php = handleTest ./web-servers/unit-php.nix {};
   upnp = handleTest ./upnp.nix {};
diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix
new file mode 100644
index 000000000000..bbccfa9c043a
--- /dev/null
+++ b/nixos/tests/unbound.nix
@@ -0,0 +1,247 @@
+/*
+ Test that our unbound module indeed works as most users would expect.
+ There are a few settings that we must consider when modifying the test. The
+ ususal use-cases for unbound are
+   * running a recursive DNS resolver on the local machine
+   * running a recursive DNS resolver on the local machine, forwarding to a local DNS server via UDP/53 & TCP/53
+   * running a recursive DNS resolver on the local machine, forwarding to a local DNS server via TCP/853 (DoT)
+   * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/53 & UDP/53
+   * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/853 (DoT)
+
+  In the below test setup we are trying to implement all of those use cases
+  without creating a bazillion machines.
+*/
+import ./make-test-python.nix ({ pkgs, lib, ... }:
+  let
+    # common client configuration that we can just use for the multitude of
+    # clients we are constructing
+    common = { lib, pkgs, ... }: {
+      config = {
+        environment.systemPackages = [ pkgs.knot-dns ];
+
+        # disable the root anchor update as we do not have internet access during
+        # the test execution
+        services.unbound.enableRootTrustAnchor = false;
+      };
+    };
+
+    cert = pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
+      openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=dns.example.local'
+      mkdir -p $out
+      cp key.pem cert.pem $out
+    '';
+  in
+  {
+    name = "unbound";
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ andir ];
+    };
+
+    nodes = {
+
+      # The server that actually serves our zones, this tests unbounds authoriative mode
+      authoritative = { lib, pkgs, config, ... }: {
+        imports = [ common ];
+        networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
+          { address = "192.168.0.1"; prefixLength = 24; }
+        ];
+        networking.interfaces.eth1.ipv6.addresses = lib.mkForce [
+          { address = "fd21::1"; prefixLength = 64; }
+        ];
+        networking.firewall.allowedTCPPorts = [ 53 ];
+        networking.firewall.allowedUDPPorts = [ 53 ];
+
+        services.unbound = {
+          enable = true;
+          interfaces = [ "192.168.0.1" "fd21::1" "::1" "127.0.0.1" ];
+          allowedAccess = [ "192.168.0.0/24" "fd21::/64" "::1" "127.0.0.0/8" ];
+          extraConfig = ''
+            server:
+              local-data: "example.local. IN A 1.2.3.4"
+              local-data: "example.local. IN AAAA abcd::eeff"
+          '';
+        };
+      };
+
+      # The resolver that knows that fowards (only) to the authoritative server
+      # and listens on UDP/53, TCP/53 & TCP/853.
+      resolver = { lib, nodes, ... }: {
+        imports = [ common ];
+        networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
+          { address = "192.168.0.2"; prefixLength = 24; }
+        ];
+        networking.interfaces.eth1.ipv6.addresses = lib.mkForce [
+          { address = "fd21::2"; prefixLength = 64; }
+        ];
+        networking.firewall.allowedTCPPorts = [
+          53 # regular DNS
+          853 # DNS over TLS
+        ];
+        networking.firewall.allowedUDPPorts = [ 53 ];
+
+        services.unbound = {
+          enable = true;
+          allowedAccess = [ "192.168.0.0/24" "fd21::/64" "::1" "127.0.0.0/8" ];
+          interfaces = [ "::1" "127.0.0.1" "192.168.0.2" "fd21::2" "192.168.0.2@853" "fd21::2@853" "::1@853" "127.0.0.1@853" ];
+          forwardAddresses = [
+            (lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv6.addresses).address
+            (lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv4.addresses).address
+          ];
+          extraConfig = ''
+            server:
+              tls-service-pem: ${cert}/cert.pem
+              tls-service-key: ${cert}/key.pem
+          '';
+        };
+      };
+
+      # machine that runs a local unbound that will be reconfigured during test execution
+      local_resolver = { lib, nodes, ... }: {
+        imports = [ common ];
+        networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
+          { address = "192.168.0.3"; prefixLength = 24; }
+        ];
+        networking.interfaces.eth1.ipv6.addresses = lib.mkForce [
+          { address = "fd21::3"; prefixLength = 64; }
+        ];
+        networking.firewall.allowedTCPPorts = [
+          53 # regular DNS
+        ];
+        networking.firewall.allowedUDPPorts = [ 53 ];
+
+        services.unbound = {
+          enable = true;
+          allowedAccess = [ "::1" "127.0.0.0/8" ];
+          interfaces = [ "::1" "127.0.0.1" ];
+          extraConfig = ''
+            include: "/etc/unbound/extra*.conf"
+          '';
+        };
+
+        environment.etc = {
+          "unbound-extra1.conf".text = ''
+            forward-zone:
+              name: "example.local."
+              forward-addr: ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address}
+              forward-addr: ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}
+          '';
+          "unbound-extra2.conf".text = ''
+            auth-zone:
+              name: something.local.
+              zonefile: ${pkgs.writeText "zone" ''
+                something.local. IN A 3.4.5.6
+              ''}
+          '';
+        };
+      };
+
+
+      # plain node that only has network access and doesn't run any part of the
+      # resolver software locally
+      client = { lib, nodes, ... }: {
+        imports = [ common ];
+        networking.nameservers = [
+          (lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address
+          (lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address
+        ];
+        networking.interfaces.eth1.ipv4.addresses = [
+          { address = "192.168.0.10"; prefixLength = 24; }
+        ];
+        networking.interfaces.eth1.ipv6.addresses = [
+          { address = "fd21::10"; prefixLength = 64; }
+        ];
+      };
+    };
+
+    testScript = { nodes, ... }: ''
+      import typing
+      import json
+
+      zone = "example.local."
+      records = [("AAAA", "abcd::eeff"), ("A", "1.2.3.4")]
+
+
+      def query(
+          machine,
+          host: str,
+          query_type: str,
+          query: str,
+          expected: typing.Optional[str] = None,
+          args: typing.Optional[typing.List[str]] = None,
+      ):
+          """
+          Execute a single query and compare the result with expectation
+          """
+          text_args = ""
+          if args:
+              text_args = " ".join(args)
+
+          out = machine.succeed(
+              f"kdig {text_args} {query} {query_type} @{host} +short"
+          ).strip()
+          machine.log(f"{host} replied with {out}")
+          if expected:
+              assert expected == out, f"Expected `{expected}` but got `{out}`"
+
+
+      def test(machine, remotes, /, doh=False, zone=zone, records=records, args=[]):
+          """
+          Run queries for the given remotes on the given machine.
+          """
+          for query_type, expected in records:
+              for remote in remotes:
+                  query(machine, remote, query_type, zone, expected, args)
+                  query(machine, remote, query_type, zone, expected, ["+tcp"] + args)
+                  if doh:
+                      query(
+                          machine,
+                          remote,
+                          query_type,
+                          zone,
+                          expected,
+                          ["+tcp", "+tls"] + args,
+                      )
+
+
+      client.start()
+      authoritative.wait_for_unit("unbound.service")
+
+      # verify that we can resolve locally
+      with subtest("test the authoritative servers local responses"):
+          test(authoritative, ["::1", "127.0.0.1"])
+
+      resolver.wait_for_unit("unbound.service")
+
+      # verify that the resolver is able to resolve on all the local protocols
+      with subtest("test that the resolver resolves on all protocols and transports"):
+          test(resolver, ["::1", "127.0.0.1"], doh=True)
+
+      resolver.wait_for_unit("multi-user.target")
+
+      with subtest("client should be able to query the resolver"):
+          test(client, ["${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True)
+
+      # discard the client we do not need anymore
+      client.shutdown()
+
+      local_resolver.wait_for_unit("multi-user.target")
+
+      # link a new config file to /etc/unbound/extra.conf
+      local_resolver.succeed("ln -s /etc/unbound-extra1.conf /etc/unbound/extra1.conf")
+
+      # reload the server & ensure the forwarding works
+      with subtest("test that the local resolver resolves on all protocols and transports"):
+          local_resolver.succeed("systemctl reload unbound")
+          print(local_resolver.succeed("journalctl -u unbound -n 1000"))
+          test(local_resolver, ["::1", "127.0.0.1"], args=["+timeout=60"])
+
+      # link a new config file to /etc/unbound/extra.conf
+      local_resolver.succeed("ln -sf /etc/unbound-extra2.conf /etc/unbound/extra2.conf")
+
+      # reload the server & ensure the new local zone works
+      with subtest("test that we can query the new local zone"):
+          local_resolver.succeed("systemctl reload unbound")
+          r = [("A", "3.4.5.6")]
+          test(local_resolver, ["::1", "127.0.0.1"], zone="something.local.", records=r)
+    '';
+  })

From b67cc6298e366aae63a381a895cf21c3b75ed649 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Fri, 23 Oct 2020 22:14:28 +0200
Subject: [PATCH 1123/3942] nixos/tests/unbound: add test to verify control
 sockets work

---
 nixos/tests/unbound.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix
index bbccfa9c043a..9a7a652b4052 100644
--- a/nixos/tests/unbound.nix
+++ b/nixos/tests/unbound.nix
@@ -132,6 +132,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
                 something.local. IN A 3.4.5.6
               ''}
           '';
+          "unbound-extra3.conf".text = ''
+            remote-control:
+              control-enable: yes
+              control-interface: /run/unbound/unbound.ctl
+          '';
+
         };
       };
 
@@ -243,5 +249,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
           local_resolver.succeed("systemctl reload unbound")
           r = [("A", "3.4.5.6")]
           test(local_resolver, ["::1", "127.0.0.1"], zone="something.local.", records=r)
+
+      with subtest("test that we can enable unbound control sockets on the fly"):
+          local_resolver.succeed("ln -sf /etc/unbound-extra3.conf /etc/unbound/extra3.conf")
+          local_resolver.succeed("systemctl reload unbound")
+          local_resolver.succeed("unbound-control list_forwards")
     '';
   })

From 2aa64e5df5819f7ebeaacfdefb8324736f7f68ba Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 1 Nov 2020 22:15:42 +0100
Subject: [PATCH 1124/3942] nixos/unbound: add option to configure the local
 control socket path

This option allows users to specify a local UNIX control socket to
"remote control" the daemon. System users, that should be permitted to
access the daemon, must be in the `unbound` group in order to access the
socket. When a socket path is configured we are also creating the
required group.

Currently this only supports the UNIX socket mode while unbound actually
supports more advanced types. Users are still able to configure more
complex scenarios via the `extraConfig` attribute.

When this option is set to `null` (the default) it doesn't affect the
system configuration at all. The unbound defaults for control sockets
apply and no additional groups are created.
---
 nixos/modules/services/networking/unbound.nix | 36 +++++++++++++
 nixos/tests/unbound.nix                       | 50 +++++++++++++------
 2 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index 07e58481a77a..2650de4ebeba 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -39,6 +39,11 @@ let
       ${interfaces}
       ${access}
       ${trustAnchor}
+    ${lib.optionalString (cfg.localControlSocketPath != null) ''
+      remote-control:
+        control-enable: yes
+        control-interface: ${cfg.localControlSocketPath}
+    ''}
     ${cfg.extraConfig}
     ${forward}
   '';
@@ -86,6 +91,28 @@ in
         description = "Use and update root trust anchor for DNSSEC validation.";
       };
 
+      localControlSocketPath = mkOption {
+        default = null;
+        # FIXME: What is the proper type here so users can specify strings,
+        # paths and null?
+        # My guess would be `types.nullOr (types.either types.str types.path)`
+        # but I haven't verified yet.
+        type = types.nullOr types.str;
+        example = "/run/unbound/unbound.ctl";
+        description = ''
+          When not set to <literal>null</literal> this option defines the path
+          at which the unbound remote control socket should be created at. The
+          socket will be owned by the unbound user (<literal>unbound</literal>)
+          and group will be <literal>nogroup</literal>.
+
+          Users that should be permitted to access the socket must be in the
+          <literal>unbound</literal> group.
+
+          If this option is <literal>null</literal> remote control will not be
+          configured at all. Unbounds default values apply.
+        '';
+      };
+
       extraConfig = mkOption {
         default = "";
         type = types.lines;
@@ -108,6 +135,14 @@ in
     users.users.unbound = {
       description = "unbound daemon user";
       isSystemUser = true;
+      group = lib.mkIf (cfg.localControlSocketPath != null) (lib.mkDefault "unbound");
+    };
+
+    # We need a group so that we can give users access to the configured
+    # control socket. Unbound allows access to the socket only to the unbound
+    # user and the primary group.
+    users.groups = lib.mkIf (cfg.localControlSocketPath != null) {
+      unbound = {};
     };
 
     networking.resolvconf.useLocalResolver = mkDefault true;
@@ -148,6 +183,7 @@ in
         ];
 
         User = "unbound";
+        Group = lib.mkIf (cfg.localControlSocketPath != null) (lib.mkDefault "unbound");
 
         MemoryDenyWriteExecute = true;
         NoNewPrivileges = true;
diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix
index 9a7a652b4052..dc8e5a9d3ed8 100644
--- a/nixos/tests/unbound.nix
+++ b/nixos/tests/unbound.nix
@@ -8,8 +8,13 @@
    * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/53 & UDP/53
    * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/853 (DoT)
 
-  In the below test setup we are trying to implement all of those use cases
-  without creating a bazillion machines.
+ In the below test setup we are trying to implement all of those use cases.
+
+ Another aspect that we cover is access to the local control UNIX socket. It
+ can optionally be enabled and users can optionally be in a group to gain
+ access. Users that are not in the group (except for root) should not have
+ access to that socket. Also, when there is no socket configured, users
+ shouldn't be able to access the control socket at all. Not even root.
 */
 import ./make-test-python.nix ({ pkgs, lib, ... }:
   let
@@ -96,7 +101,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
       };
 
       # machine that runs a local unbound that will be reconfigured during test execution
-      local_resolver = { lib, nodes, ... }: {
+      local_resolver = { lib, nodes, config, ... }: {
         imports = [ common ];
         networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
           { address = "192.168.0.3"; prefixLength = 24; }
@@ -113,11 +118,22 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
           enable = true;
           allowedAccess = [ "::1" "127.0.0.0/8" ];
           interfaces = [ "::1" "127.0.0.1" ];
+          localControlSocketPath = "/run/unbound/unbound.ctl";
           extraConfig = ''
             include: "/etc/unbound/extra*.conf"
           '';
         };
 
+        users.users = {
+          # user that is permitted to access the unix socket
+          someuser.extraGroups = [
+            config.users.users.unbound.group
+          ];
+
+          # user that is not permitted to access the unix socket
+          unauthorizeduser = {};
+        };
+
         environment.etc = {
           "unbound-extra1.conf".text = ''
             forward-zone:
@@ -132,12 +148,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
                 something.local. IN A 3.4.5.6
               ''}
           '';
-          "unbound-extra3.conf".text = ''
-            remote-control:
-              control-enable: yes
-              control-interface: /run/unbound/unbound.ctl
-          '';
-
         };
       };
 
@@ -218,6 +228,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
 
       resolver.wait_for_unit("unbound.service")
 
+      with subtest("root is unable to use unbounc-control when the socket is not configured"):
+          resolver.succeed("which unbound-control")  # the binary must exist
+          resolver.fail("unbound-control list_forwards")  # the invocation must fail
+
       # verify that the resolver is able to resolve on all the local protocols
       with subtest("test that the resolver resolves on all protocols and transports"):
           test(resolver, ["::1", "127.0.0.1"], doh=True)
@@ -241,18 +255,24 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
           print(local_resolver.succeed("journalctl -u unbound -n 1000"))
           test(local_resolver, ["::1", "127.0.0.1"], args=["+timeout=60"])
 
+      with subtest("test that we can use the unbound control socket"):
+          out = local_resolver.succeed(
+              "sudo -u someuser -- unbound-control list_forwards"
+          ).strip()
+
+          # Thank you black! Can't really break this line into a readable version.
+          expected = "example.local. IN forward ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address} ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}"
+          assert out == expected, f"Expected `{expected}` but got `{out}` instead."
+          local_resolver.fail("sudo -u unauthorizeduser -- unbound-control list_forwards")
+
+
       # link a new config file to /etc/unbound/extra.conf
       local_resolver.succeed("ln -sf /etc/unbound-extra2.conf /etc/unbound/extra2.conf")
 
       # reload the server & ensure the new local zone works
       with subtest("test that we can query the new local zone"):
-          local_resolver.succeed("systemctl reload unbound")
+          local_resolver.succeed("unbound-control reload")
           r = [("A", "3.4.5.6")]
           test(local_resolver, ["::1", "127.0.0.1"], zone="something.local.", records=r)
-
-      with subtest("test that we can enable unbound control sockets on the fly"):
-          local_resolver.succeed("ln -sf /etc/unbound-extra3.conf /etc/unbound/extra3.conf")
-          local_resolver.succeed("systemctl reload unbound")
-          local_resolver.succeed("unbound-control list_forwards")
     '';
   })

From 5c16c31e067573616feda611858f742777af0555 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 3 Nov 2020 13:41:00 +0100
Subject: [PATCH 1125/3942] nixos/unbound: add release notes for the changes
 that were introduced

As part of this patch series a few changes have been made to the unbound
serivce the deserve proper documentation.
---
 nixos/doc/manual/release-notes/rl-2103.xml | 56 ++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 85eedfe0ec72..da20c9e80679 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -140,6 +140,62 @@
      All services should use <xref linkend="opt-systemd.services._name_.startLimitIntervalSec" /> or <literal>StartLimitIntervalSec</literal> in <xref linkend="opt-systemd.services._name_.unitConfig" /> instead.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The Unbound DNS resolver service (<literal>services.unbound</literal>) has been refactored to allow reloading, control sockets and to fix startup ordering issues.
+    </para>
+
+    <para>
+     It is now possible to enable a local UNIX control socket for unbound by setting the <xref linkend="opt-services.unbound.localControlSocketPath" />
+     option.
+    </para>
+
+    <para>
+     Previously we just applied a very minimal set of restrictions and
+     trusted unbound to properly drop root privs and capabilities.
+    </para>
+
+    <para>
+     As of this we are (for the most part) just using the upstream
+     example unit file for unbound. The main difference is that we start
+     unbound as <literal>unbound</literal> user with the required capabilities instead of
+     letting unbound do the chroot &amp; uid/gid changes.
+    </para>
+
+    <para>
+     The upstream unit configuration this is based on is a lot stricter with
+     all kinds of permissions then our previous variant. It also came with
+     the default of having the <literal>Type</literal> set to <literal>notify</literal>, therefore we are now also
+     using the <literal>unbound-with-systemd</literal> package here. Unbound will start up,
+     read the configuration files and start listening on the configured ports
+     before systemd will declare the unit <literal>active (running)</literal>.
+     This will likely help with startup order and the occasional race condition during system
+     activation where the DNS service is started but not yet ready to answer
+     queries. Services depending on <literal>nss-lookup.target</literal> or <literal>unbound.service</literal>
+     are now be able to use unbound when those targets have been reached.
+    </para>
+
+    <para>
+     Aditionally to the much stricter runtime environmet the
+     <literal>/dev/urandom</literal> mount lines we previously had in the code (that would
+     randomly failed during the stop-phase) have been removed as systemd will take care of those for us.
+    </para>
+
+    <para>
+     The <literal>preStart</literal> script is now only required if we enabled the trust
+      anchor updates (which are still enabled by default).
+    </para>
+
+    <para>
+     Another benefit of the refactoring is that we can now issue reloads via
+     either <literal>pkill -HUP unbound</literal> and <literal>systemctl reload unbound</literal> to reload the
+     running configuration without taking the daemon offline. A prerequisite
+     of this was that unbound configuration is available on a well known path
+     on the file system. We are using the path <literal>/etc/unbound/unbound.conf</literal> as that is the
+     default in the CLI tooling which in turn enables us to use
+     <literal>unbound-control</literal> without passing a custom configuration location.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>

From 5903ea539513c8ec2a1412d88465559b957b6483 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 3 Nov 2020 19:21:39 +0100
Subject: [PATCH 1126/3942] nixos/unbond: unbound should be required for
 nss-lookup.target

Other units depend on nss-lookup.target and expect the DNS resolution to
work once that target is reached. The previous version
`wants=nss-lookup.target` made this unit require the nss-lookup.target
to be reached before this was started.

Another change that we can probalby do is drop the before relationship
with the nss-lookup.target. That might just be implied with the current
version.
---
 nixos/modules/services/networking/unbound.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index 2650de4ebeba..9a46fa3075fa 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -154,8 +154,7 @@ in
       description = "Unbound recursive Domain Name Server";
       after = [ "network.target" ];
       before = [ "nss-lookup.target" ];
-      wants = [ "nss-lookup.target" ];
-      wantedBy = [ "multi-user.target" ];
+      wantedBy = [ "multi-user.target" "nss-lookup.target" ];
 
       preStart = lib.mkIf cfg.enableRootTrustAnchor ''
         ${cfg.package}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!"

From 97637b479d89ba0db3aae977abae7ad3dc4de7a4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 15:20:21 +0000
Subject: [PATCH 1127/3942] krita: 4.4.0 -> 4.4.1

---
 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 6ffe7f3c4fa0..9bb78d199968 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -10,11 +10,11 @@
 
 mkDerivation rec {
   pname = "krita";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0ydmxql8iym62q0nqwn9mnb94jz1nh84i6bni0mgzwjk8p4zfzw3";
+    sha256 = "1bmmfvmawnlihbqkksdrwxfkaip4nfsi97w83fmvkyxl4jk715vr";
   };
 
   # *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359

From 3fbb1f7e4c44ee09d4230653e7d8273697bab598 Mon Sep 17 00:00:00 2001
From: Thomas Depierre <depierre.thomas@gmail.com>
Date: Wed, 22 Jul 2020 11:30:19 +0200
Subject: [PATCH 1128/3942] python3Packages.credstash: fix nativeBuildInputs

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

diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index 1abd3f4ed203..1f9b4b28f294 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose
-, fetchpatch
-}:
+{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }:
 
 buildPythonPackage rec {
   pname = "credstash";
@@ -25,7 +23,7 @@ buildPythonPackage rec {
   # file ensures that Python imports the module from site-packages library.
   postInstall = "rm $out/bin/credstash.py";
 
-  nativeBuildInputs = [ nose ];
+  nativeBuildInputs = [ pytest ];
 
   propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ];
 

From d7f53864741aa0cb3a992e74ada3153a89a85f69 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 3 Nov 2020 13:08:09 +0100
Subject: [PATCH 1129/3942] chromium: Extend update.py to automatically update
 gn

The gn version depends on the channel and new gn versions aren't always
backward compatible. Therefore we should also include it in
upstream-info.json (I've scoped it under "deps" as we'll likely have to
add more like this in the future).
---
 .../networking/browsers/chromium/common.nix   |  7 ++++-
 .../networking/browsers/chromium/default.nix  | 15 ++--------
 .../networking/browsers/chromium/update.py    | 30 ++++++++++++++++++-
 .../browsers/chromium/upstream-info.json      | 30 +++++++++++++++++--
 4 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 60aca90a95e7..76f53dcecc87 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -316,7 +316,12 @@ let
       patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary"
     '';
 
-    passthru.updateScript = ./update.py;
+    passthru = {
+      updateScript = ./update.py;
+      chromiumDeps = {
+        gn = gnChromium;
+      };
+    };
   };
 
 # Remove some extraAttrs we supplied to the base attributes already.
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index f83cb1d209d7..0f64b859579d 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -35,26 +35,15 @@ let
     mkChromiumDerivation = callPackage ./common.nix ({
       inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs
               cupsSupport pulseSupport useOzone;
-      # TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
       gnChromium = gn.overrideAttrs (oldAttrs: {
-        version = "2020-07-20";
+        inherit (upstream-info.deps.gn) version;
         src = fetchgit {
-          url = "https://gn.googlesource.com/gn";
-          rev = "3028c6a426a4aaf6da91c4ebafe716ae370225fe";
-          sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q";
+          inherit (upstream-info.deps.gn) url rev sha256;
         };
       });
     } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") {
       useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/
       useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine)
-      gnChromium = gn.overrideAttrs (oldAttrs: {
-        version = "2020-08-17";
-        src = fetchgit {
-          url = "https://gn.googlesource.com/gn";
-          rev = "6f13aaac55a977e1948910942675c69f2b4f7a94";
-          sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251";
-        };
-      });
     });
 
     browser = callPackage ./browser.nix { inherit channel enableWideVine; };
diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py
index bfc7f0d2478c..b404ca555bff 100755
--- a/pkgs/applications/networking/browsers/chromium/update.py
+++ b/pkgs/applications/networking/browsers/chromium/update.py
@@ -1,13 +1,15 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i python -p python3 nix
+#! nix-shell -i python -p python3 nix nix-prefetch-git
 
 import csv
 import json
+import re
 import subprocess
 import sys
 
 from codecs import iterdecode
 from collections import OrderedDict
+from datetime import datetime
 from os.path import abspath, dirname
 from urllib.request import urlopen
 
@@ -26,6 +28,30 @@ def nix_prefetch_url(url, algo='sha256'):
     out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url])
     return out.decode('utf-8').rstrip()
 
+def nix_prefetch_git(url, rev):
+    print(f'nix-prefetch-git {url} {rev}')
+    out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev])
+    return json.loads(out)
+
+def get_file_revision(revision, file_path):
+    url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}'
+    with urlopen(url) as http_response:
+        return http_response.read()
+
+def get_channel_dependencies(channel):
+    deps = get_file_revision(channel['version'], 'DEPS')
+    gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'"
+    gn_commit = re.search(gn_pattern, deps).group(1).decode()
+    gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit)
+    return {
+        'gn': {
+            'version': datetime.fromisoformat(gn['date']).date().isoformat(),
+            'url': gn['url'],
+            'rev': gn['rev'],
+            'sha256': gn['sha256']
+        }
+    }
+
 channels = {}
 last_channels = load_json(JSON_PATH)
 
@@ -58,6 +84,8 @@ with urlopen(HISTORY_URL) as resp:
             # the next one.
             continue
 
+        channel['deps'] = get_channel_dependencies(channel)
+
         channels[channel_name] = channel
 
 with open(JSON_PATH, 'w') as out:
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index d6971da2c0f4..565f884c5102 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -2,16 +2,40 @@
   "stable": {
     "version": "86.0.4240.183",
     "sha256": "1g39i82js7fm4fqb8i66d6xs0kzqjxzi4vzvvwz5y9rkbikcc4ma",
-    "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9"
+    "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9",
+    "deps": {
+      "gn": {
+        "version": "2020-08-07",
+        "url": "https://gn.googlesource.com/gn",
+        "rev": "e327ffdc503815916db2543ec000226a8df45163",
+        "sha256": "0kvlfj3www84zp1vmxh76x8fdjm9hyk8lkh2vdsidafpmm75fphr"
+      }
+    }
   },
   "beta": {
     "version": "87.0.4280.40",
     "sha256": "07xh76fl257np68way6i5rf64qbvirkfddy7m5gvqb0fzcqd7dp3",
-    "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41"
+    "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41",
+    "deps": {
+      "gn": {
+        "version": "2020-09-09",
+        "url": "https://gn.googlesource.com/gn",
+        "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
+        "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
+      }
+    }
   },
   "dev": {
     "version": "88.0.4300.0",
     "sha256": "00cfs2rp4h8ybn2snr1d8ygg635hx7q5gv2aqriy1j6f8a1pgh1b",
-    "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv"
+    "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv",
+    "deps": {
+      "gn": {
+        "version": "2020-09-09",
+        "url": "https://gn.googlesource.com/gn",
+        "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
+        "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
+      }
+    }
   }
 }

From 4b2c7fb106789afcb563e2a8d9d46e96b19b99f9 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 3 Nov 2020 20:01:28 +0100
Subject: [PATCH 1130/3942] gn: Add myself as maintainer

Since I maintain Chromium (I'll have to make sure that gnChromium always
builds and it would be good to get notified on any PRs/issues).
---
 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 599e10af1a9a..3c0abb3edeab 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -59,6 +59,6 @@ in stdenv.mkDerivation {
     homepage = "https://gn.googlesource.com/gn";
     license = licenses.bsd3;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ stesie matthewbauer ];
+    maintainers = with maintainers; [ stesie matthewbauer primeos ];
   };
 }

From fef46b9281cfde685bfdea74572eae34b518d48e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 19:14:18 +0000
Subject: [PATCH 1131/3942] openfortivpn: 1.14.1 -> 1.15.0

---
 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 0a1680bfdb56..a8ce80f98382 100644
--- a/pkgs/tools/networking/openfortivpn/default.nix
+++ b/pkgs/tools/networking/openfortivpn/default.nix
@@ -8,13 +8,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openfortivpn";
-  version = "1.14.1";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "adrienverge";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1r9lp19fmqx9dw33j5967ydijbnacmr80mqnhbbxyqiw4k5c10ds";
+    sha256 = "1qsfgpxg553s8rc9cyrc4k96z0pislxsdxb9wyhp8fdprkak2mw2";
   };
 
   # we cannot write the config file to /etc and as we don't need the file, so drop it

From 30804e21c7bdc2403bbbb9e851c9a87f489ac8ab Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Tue, 3 Nov 2020 12:09:22 -0800
Subject: [PATCH 1132/3942] hugo: 0.77.0 -> 0.78.0

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 4b2a4c464573..58f0bc8978fa 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.77.0";
+  version = "0.78.0";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1vjqddcbk8afqkjzrj9wwvz697bxhv9vz0rk2vj2ji6lz1slhc56";
+    sha256 = "0la1c6yj9dq9rqxk6m8n8l4cabgzlk0r3was8mvgd80g3x3zn55v";
   };
 
-  vendorSha256 = "03xv188jw5scqd6a8xd2s13vkn721d37bgs6a6rik7pgqmjh46c6";
+  vendorSha256 = "09fvvs85rvvh0z4px2bj5908xf1mrcslkzsz09p0gy5i3zaqfnp9";
 
   doCheck = false;
 

From ec38b50c6779e2c39f96f00d1f384464e71760cf Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Tue, 3 Nov 2020 21:24:10 +0100
Subject: [PATCH 1133/3942] ptcollab: init at 0.3.4.1

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

diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix
new file mode 100644
index 000000000000..85890d8e83bf
--- /dev/null
+++ b/pkgs/applications/audio/ptcollab/default.nix
@@ -0,0 +1,34 @@
+{ mkDerivation
+, stdenv
+, fetchFromGitHub
+, qmake
+, qtbase
+, qtmultimedia
+, libvorbis
+}:
+
+mkDerivation rec {
+  pname = "ptcollab";
+  version = "0.3.4.1";
+
+  src = fetchFromGitHub {
+    owner = "yuxshao";
+    repo = "ptcollab";
+    rev = "v${version}";
+    sha256 = "0rjyhxfad864w84n0bxyhc1jjxhzwwdx26r6psba2582g90cv024";
+  };
+
+  nativeBuildInputs = [ qmake ];
+
+  buildInputs = [ qtbase qtmultimedia libvorbis ];
+
+  meta = with stdenv.lib; {
+    description = "Experimental pxtone editor where you can collaborate with friends";
+    homepage = "https://yuxshao.github.io/ptcollab/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ OPNA2608 ];
+    platforms = platforms.all;
+    # Requires Qt5.15
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97037a1f873f..6ce5d5091fda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19804,6 +19804,8 @@ in
 
   milkytracker = callPackage ../applications/audio/milkytracker { };
 
+  ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { };
+
   schismtracker = callPackage ../applications/audio/schismtracker { };
 
   jnetmap = callPackage ../applications/networking/jnetmap {};

From 5517b3b985cc204fd63f153d4c23e3a645077a7a Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Tue, 3 Nov 2020 19:36:34 +0000
Subject: [PATCH 1134/3942] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 124 ++++++++++++++--------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 80f27fd87ae1..9ec223b88d0c 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -389,12 +389,12 @@ let
 
   coc-explorer = buildVimPluginFrom2Nix {
     pname = "coc-explorer";
-    version = "2020-11-01";
+    version = "2020-11-02";
     src = fetchFromGitHub {
       owner = "weirongxu";
       repo = "coc-explorer";
-      rev = "eb10e21721ee527d86cbc4422d4cdc5d53ea65fd";
-      sha256 = "10qgca7hncxmlmbcd0d9rmkdjd22qp88llz0dlsgm6ckng46nbpn";
+      rev = "3530aaf09473366e3d21811a708d9cde7e1f4a02";
+      sha256 = "1qksmhgn71rax5gz5zjxp80wx3xabgv9k8y9pbldr19r777gb14r";
     };
     meta.homepage = "https://github.com/weirongxu/coc-explorer/";
   };
@@ -413,12 +413,12 @@ let
 
   coc-markdownlint = buildVimPluginFrom2Nix {
     pname = "coc-markdownlint";
-    version = "2020-10-27";
+    version = "2020-11-02";
     src = fetchFromGitHub {
       owner = "fannheyward";
       repo = "coc-markdownlint";
-      rev = "abdd6450aee119750ddb4dff4a7ab82355a89418";
-      sha256 = "1p0wafvn8xzi4bm9bn2fnp8kavw8s6hchpz81ms9770jrx02z5xi";
+      rev = "56af4992a9f48a5ae210a0bf346e00a08075908a";
+      sha256 = "0gjfs3mrxv88z8fvm4rc51hw8kghami80pbvz7jcz0bf9bfwgdaw";
     };
     meta.homepage = "https://github.com/fannheyward/coc-markdownlint/";
   };
@@ -461,12 +461,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2020-11-01";
+    version = "2020-11-02";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "2adc879786ca65c3fdc3dd94743acbbed3f54465";
-      sha256 = "1j4kjxflm0ldaa0pgjm081x95hqxhhanv45mwwnmcg2lkpd6lnq5";
+      rev = "0cbd225b922c3702e4828608bab1c6bf699a3eeb";
+      sha256 = "05r8nfbf702bsrzpps2gj04d62kjaa9h6h116c0ql0iwi2zi0kmi";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -738,12 +738,12 @@ let
 
   defx-nvim = buildVimPluginFrom2Nix {
     pname = "defx-nvim";
-    version = "2020-10-28";
+    version = "2020-11-02";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "defx.nvim";
-      rev = "152c61f409d6a58b4c10bbd70b51bedd3db11a3c";
-      sha256 = "02izychnj48gb108a4npk8v1nfhw99x5368jv2yqrxaixqmykkrs";
+      rev = "042c40816befafa2348d2268274a88d767850ba8";
+      sha256 = "1az0hwpvbrrwc0zd5ckap3vq2bk59br841dlhvcq1hpwgh431p0h";
     };
     meta.homepage = "https://github.com/Shougo/defx.nvim/";
   };
@@ -1100,12 +1100,12 @@ let
 
   dracula-vim = buildVimPluginFrom2Nix {
     pname = "dracula-vim";
-    version = "2020-10-19";
+    version = "2020-11-02";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "80d2667818492e2e7630894f2b3eb7fdae1e240f";
-      sha256 = "1bq52larf3bbhrrzqg2gx737zc1xrg8qa916ny2qh9w7lsjjwf4h";
+      rev = "261765405c07bfbf808c69cb6126e0e5a7c6ea4f";
+      sha256 = "03abvp7fhssgynm5405bx6qdnbv4j4hrwwz6npqnb5ajqwl6y4cm";
     };
     meta.homepage = "https://github.com/dracula/vim/";
   };
@@ -1271,12 +1271,12 @@ let
 
   float-preview-nvim = buildVimPluginFrom2Nix {
     pname = "float-preview-nvim";
-    version = "2020-04-19";
+    version = "2020-11-03";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "float-preview.nvim";
-      rev = "3c2e230a3fe34b3a5fb74519797c29daa5a6a69a";
-      sha256 = "1i5wj1hqimzrw3bwsf76w8l8yp654pdn8f61kp0v98xdgkab007d";
+      rev = "f9ed1c701d5ea41222509fc822cbdc5613b14b2d";
+      sha256 = "0r1pj80mnsr269d7mnxfagdp988gn3gnf5fix55z4qwim9cakrl8";
     };
     meta.homepage = "https://github.com/ncm2/float-preview.nvim/";
   };
@@ -1331,12 +1331,12 @@ let
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2020-10-30";
+    version = "2020-11-03";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "bd3a021ec11617c56e6aa95578fee619445b029d";
-      sha256 = "1jd0bs7v28za6sba6f2i49mvjcnicid25ab3jljcax18c4kd6dl1";
+      rev = "61c4b6d1ed30287edcbfd3dbaed4e43b5c251c93";
+      sha256 = "09fx5bg9kaw2zv98vvvx5pix0b0dn06kxk3mq9khiak2liyq96lv";
     };
     meta.homepage = "https://github.com/junegunn/fzf.vim/";
   };
@@ -1776,12 +1776,12 @@ let
 
   kotlin-vim = buildVimPluginFrom2Nix {
     pname = "kotlin-vim";
-    version = "2020-08-11";
+    version = "2020-11-02";
     src = fetchFromGitHub {
       owner = "udalov";
       repo = "kotlin-vim";
-      rev = "26970168ca88c62b271fbc0a275dbe31cda94bd6";
-      sha256 = "0mvwz8gwv619b4l7g3mafvd6q4khl0xis0a8v300d8i3pjhx4i40";
+      rev = "f338707b2aa658aef4c0d98fd9748240859cf2a9";
+      sha256 = "0wm9bkykvm89f966a8wxm5vvg9kjayy5iziahnch35hrmscs5x4b";
     };
     meta.homepage = "https://github.com/udalov/kotlin-vim/";
   };
@@ -2292,12 +2292,12 @@ let
 
   neoformat = buildVimPluginFrom2Nix {
     pname = "neoformat";
-    version = "2020-10-27";
+    version = "2020-11-02";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "2033ca4fa0a820658f07e6a2ffcfb0434d5be071";
-      sha256 = "0mz237rbymlq6ksmyakc6mqvskic72fgaw88jywg3cmnjjskqvi2";
+      rev = "2132bc678f5389593cea1b82ec1ea630cde0041a";
+      sha256 = "0h4ymq4jgxw48s2ccvsj5612pmb8vdsqq2hgx877rjji1chxk432";
     };
     meta.homepage = "https://github.com/sbdchd/neoformat/";
   };
@@ -2580,12 +2580,12 @@ let
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2020-10-31";
+    version = "2020-11-03";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "9327b113c2360d503ab183718c57e3e1b0819887";
-      sha256 = "1xgw0464563rc6wnjhf9m2f25wii80d78laa8ifjbjivrv4b0y1k";
+      rev = "f999dc41131c3c69f2411af13597932c042e8e5a";
+      sha256 = "0zn8lf290cm2pwjd4iawjrlbpcxqrgqj2agarvsqrlmdxhgq7a77";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -3337,12 +3337,12 @@ let
 
   tagbar = buildVimPluginFrom2Nix {
     pname = "tagbar";
-    version = "2020-10-30";
+    version = "2020-11-03";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "tagbar";
-      rev = "99c22f1bb209e3393053a4dfb38039534b6b8a8d";
-      sha256 = "1bj7qi36yakxqds43fqp2876za4aq3bbb9444yvna2l0n504iy9j";
+      rev = "53c8e196764ec74353c0e9c758daa108b9fe4c38";
+      sha256 = "07ayc60w86w4mnm49jh4h89pwz5ry2a5vagy8xsv5hy1r6wqirpy";
     };
     meta.homepage = "https://github.com/preservim/tagbar/";
   };
@@ -3385,12 +3385,12 @@ let
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2020-11-01";
+    version = "2020-11-03";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "telescope.nvim";
-      rev = "54ef9d90d5a032906bfb007113930dac0f665f72";
-      sha256 = "0zh6dpxfibm0clafs2zsnb4ffmh3438qiccc60md2s7hwhzynvyq";
+      rev = "1f3110bf54877b975956e42911e05d517d8f4993";
+      sha256 = "1172fj2vzf9p86pvl9b297xp9qmikwmcj7j3qv3dgk3rdh4f66mg";
     };
     meta.homepage = "https://github.com/nvim-lua/telescope.nvim/";
   };
@@ -4106,12 +4106,12 @@ let
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2020-10-31";
+    version = "2020-11-03";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "f7f800f59bb1e199993c5554f014c7e8e2685165";
-      sha256 = "1ka6q9fqzhjxzi0n803mk9f6rwnlbrjsjzjq52b8dghc9n0359a1";
+      rev = "d7bbe7529680662025f633954501a537ba226942";
+      sha256 = "042qzd3dg3y5m1sggsxhzhz2i4mnlv8sii817xx6vfif49pg7b0r";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -4382,12 +4382,12 @@ let
 
   vim-dirdiff = buildVimPluginFrom2Nix {
     pname = "vim-dirdiff";
-    version = "2020-10-12";
+    version = "2020-11-03";
     src = fetchFromGitHub {
       owner = "will133";
       repo = "vim-dirdiff";
-      rev = "6e4b04c252be6537b888e88e5bef959308a7c993";
-      sha256 = "0n5g78021xzswfnghhzfgv5acaqv6s9k10d8kp84b846bjxc5hb7";
+      rev = "0191693f0d3dfc624c61ac95ec951183a50b3b32";
+      sha256 = "0har8iri09nkjsvag4wgsynb9fxan2g8nlvlvd5zsalbnmlmdh9j";
     };
     meta.homepage = "https://github.com/will133/vim-dirdiff/";
   };
@@ -5955,12 +5955,12 @@ let
 
   vim-plug = buildVimPluginFrom2Nix {
     pname = "vim-plug";
-    version = "2020-10-22";
+    version = "2020-11-03";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
-      rev = "ab940f624ae1df24605a8ff1bf427de7a76e5911";
-      sha256 = "0v985v9a7kspchfvr2lvj5jqnlkg05agyay0wn0c6mg5bf2mw8q1";
+      rev = "2f4e28161e114cc4b34a9b8ff0f51f4906f37b0b";
+      sha256 = "1wfcyrjqqngnf4l9afc0342avkys8ipfrna7zlgiypwji926y2k7";
     };
     meta.homepage = "https://github.com/junegunn/vim-plug/";
   };
@@ -5979,12 +5979,12 @@ let
 
   vim-polyglot = buildVimPluginFrom2Nix {
     pname = "vim-polyglot";
-    version = "2020-10-27";
+    version = "2020-11-02";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
-      rev = "05e21a9e252b283b2d71568ad3b671d7f28fe0bc";
-      sha256 = "039wha51p2zwnjyjm0qxca63dgrp54l43ba74639gf0hp5h2wvfa";
+      rev = "cd768124020d3c565f1d400ea0537949351b26a2";
+      sha256 = "1wa8wk60vs9d3qflq4m49h15bwv86gwl2hqbcbfbqdq57y3l3r87";
     };
     meta.homepage = "https://github.com/sheerun/vim-polyglot/";
   };
@@ -6031,8 +6031,8 @@ let
     src = fetchFromGitHub {
       owner = "dhruvasagar";
       repo = "vim-prosession";
-      rev = "1be0c069a2b362369913ffaeed5293ffe1932ef6";
-      sha256 = "0hqfwlkz64kkh8w6w5k7gw2i0x7spddbgixjcrp1lr6n6bslkj2d";
+      rev = "ad008dbdcd04ee1758f4475263c2a37789d32702";
+      sha256 = "14fcvghqbv7mx2yi112vc9cq69mw98fgv0vc8x256v639bj1y5g9";
     };
     meta.homepage = "https://github.com/dhruvasagar/vim-prosession/";
   };
@@ -6099,12 +6099,12 @@ let
 
   vim-qml = buildVimPluginFrom2Nix {
     pname = "vim-qml";
-    version = "2020-10-24";
+    version = "2020-11-03";
     src = fetchFromGitHub {
       owner = "peterhoeg";
       repo = "vim-qml";
-      rev = "77853c3ff98a868dcbbdfa4eb8f0e659b57993ff";
-      sha256 = "14v90gchmpl1nkiic3f3kiz8akbw2wmpish794xakvz63iys703y";
+      rev = "50d2e737094c146195171b7d52e522384f15afe8";
+      sha256 = "1iz2l51c15ijkpzyk5qwmd8y0yy2z8f1jwxcwk16h63g4nmfm1zr";
     };
     meta.homepage = "https://github.com/peterhoeg/vim-qml/";
   };
@@ -6447,12 +6447,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2020-10-29";
+    version = "2020-11-02";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "0161732b61a60a8dc8dd80db7ff678197fc2c2aa";
-      sha256 = "1hyinjg9x80i6zpmf1l6lwnv58amkd5bw26w27xakd74c4am2603";
+      rev = "0f3d4d187c842419fe6e131fe20f5f3336418a62";
+      sha256 = "09phzarfakz5mv3jshsab60iiq8byv6xggb0qiasafvxfrcx8c2s";
     };
     meta.homepage = "https://github.com/honza/vim-snippets/";
   };
@@ -6988,12 +6988,12 @@ let
 
   vim-wakatime = buildVimPluginFrom2Nix {
     pname = "vim-wakatime";
-    version = "2020-02-12";
+    version = "2020-11-02";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "dd74c71cd2ea23b4a6cba4b05c873983c16e297c";
-      sha256 = "1dc04vmpv62x2rfnfad2y60l5xzpw0167pbii9kss6n6ra81gayr";
+      rev = "c725124ae8885ca6da4fe5cd03bda4bd77dc3fd1";
+      sha256 = "1mvvqbjszp6mc0rq6m1nj7cyy44z4xf2h4lc561wkfblhhk9j4i6";
     };
     meta.homepage = "https://github.com/wakatime/vim-wakatime/";
   };
@@ -7192,12 +7192,12 @@ let
 
   vimsence = buildVimPluginFrom2Nix {
     pname = "vimsence";
-    version = "2020-06-30";
+    version = "2020-11-02";
     src = fetchFromGitHub {
       owner = "hugolgst";
       repo = "vimsence";
-      rev = "d6bb167499b8e43e889b305c8670b2445f505ced";
-      sha256 = "0f6jzkfjcvaln61jbva2laws8aqhs5vk4314z900d3hb7rfclrfy";
+      rev = "433875b4a994582a28795f8944af10d935b64322";
+      sha256 = "117yxp3bzhrdi03r2d2zr1r2702czkxamdvgcxr62gysdgbz5i9z";
     };
     meta.homepage = "https://github.com/hugolgst/vimsence/";
   };

From 84884a4938b6f552db7a3aa5478521ce7bcbac5f Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Tue, 3 Nov 2020 19:37:11 +0000
Subject: [PATCH 1135/3942] vimPlugins.LanguageTool-nvim: init at 2020-10-19

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 9ec223b88d0c..e1d8171ea0cd 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1810,6 +1810,18 @@ let
     meta.homepage = "https://github.com/autozimu/LanguageClient-neovim/";
   };
 
+  LanguageTool-nvim = buildVimPluginFrom2Nix {
+    pname = "LanguageTool-nvim";
+    version = "2020-10-19";
+    src = fetchFromGitHub {
+      owner = "vigoux";
+      repo = "LanguageTool.nvim";
+      rev = "809e7d77fec834597f495fec737c59292a10025b";
+      sha256 = "1g12dz85xq8qd92dgna0a3w6zgxa74njlvmvly4k20610r63bzrn";
+    };
+    meta.homepage = "https://github.com/vigoux/LanguageTool.nvim/";
+  };
+
   last256 = buildVimPluginFrom2Nix {
     pname = "last256";
     version = "2017-06-10";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 8af0e8cb1b8c..d161392ef16d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -553,6 +553,7 @@ unblevable/quick-scope
 urbit/hoon.vim
 Valodim/deoplete-notmuch
 vhda/verilog_systemverilog.vim
+vigoux/LanguageTool.nvim
 vim-airline/vim-airline
 vim-airline/vim-airline-themes
 vim-pandoc/vim-pandoc

From 744ea3d9442184aba9294f2baceb6fdcbaebcda2 Mon Sep 17 00:00:00 2001
From: squalus <squalus@tuta.io>
Date: Sun, 1 Nov 2020 04:59:37 +0000
Subject: [PATCH 1136/3942] ungoogled-chromium: 85.0.4183.102-1 ->
 86.0.4240.111-1

based on chromium master@26d3fbf2
---
 .../browsers/ungoogled-chromium/browser.nix   |  13 +-
 .../browsers/ungoogled-chromium/common.nix    | 128 +++++++-----------
 .../browsers/ungoogled-chromium/default.nix   |  28 +---
 .../patches/dont-use-ANGLE-by-default.patch   |  26 ----
 .../enable-vdpau-support-for-nvidia.patch     |  65 ---------
 .../enable-video-acceleration-on-linux.patch  |  48 -------
 .../patches/nix_plugin_paths_68.patch         |  61 ---------
 .../patches/remove-webp-include-69.patch      |  11 --
 .../ungoogled-chromium/ungoogled-src.nix      |   6 +-
 .../ungoogled-chromium/upstream-info.json     |  18 +--
 10 files changed, 70 insertions(+), 334 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch
 delete mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch
 delete mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch
 delete mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch
 delete mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch

diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix
index f87acc8722e4..c5cbee196521 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix
@@ -13,7 +13,7 @@ mkChromiumDerivation (base: rec {
 
   installPhase = ''
     mkdir -p "$libExecPath"
-    cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
+    cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
     cp -v "$buildPath/icudtl.dat" "$libExecPath/"
     cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
     cp -v "$buildPath/chrome" "$libExecPath/$packageName"
@@ -78,17 +78,10 @@ mkChromiumDerivation (base: rec {
     '';
     homepage = "https://github.com/Eloston/ungoogled-chromium";
     maintainers = with maintainers; [ squalus ];
-    # Overview of the maintainer roles:
-    # nixos-unstable:
-    # - TODO: Need a new maintainer for x86_64 [0]
-    # - @thefloweringash: aarch64
-    # - @primeos: Provisional maintainer (x86_64)
-    # Stable channel:
-    # - TODO (need someone to test backports [0])
-    # [0]: https://github.com/NixOS/nixpkgs/issues/78450
     license = if enableWideVine then licenses.unfree else licenses.bsd3;
     platforms = platforms.linux;
     hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
-    timeout = 172800; # 48 hours
+    timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
+    broken = channel == "dev"; # Blocked on https://bugs.chromium.org/p/chromium/issues/detail?id=1141896
   };
 })
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
index 3df8fb3afdb6..de409f80370f 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
@@ -5,7 +5,7 @@
 , libevent, expat, libjpeg, snappy
 , libpng, libcap
 , xdg_utils, yasm, nasm, minizip, libwebp
-, libusb1, pciutils, nss, re2, zlib
+, libusb1, pciutils, nss, re2
 
 , python2Packages, perl, pkgconfig
 , nspr, systemd, kerberos
@@ -13,10 +13,9 @@
 , bison, gperf
 , glib, gtk3, dbus-glib
 , glibc
-, xorg
 , libXScrnSaver, libXcursor, libXtst, libGLU, libGL
 , protobuf, speechd, libXdamage, cups
-, ffmpeg_3, libxslt, libxml2, at-spi2-core
+, ffmpeg, libxslt, libxml2, at-spi2-core
 , jre8
 , pipewire_0_2
 
@@ -49,8 +48,6 @@ buildFun:
 
 with stdenv.lib;
 
-# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html
-
 let
   jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
 
@@ -66,7 +63,7 @@ let
   mkGnFlags =
     let
       # Serialize Nix types into GN types according to this document:
-      # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md
+      # https://source.chromium.org/gn/gn/+/master:docs/language.md
       mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\"";
       sanitize = value:
         if value == true then "true"
@@ -78,14 +75,17 @@ let
       toFlag = key: value: "${key}=${sanitize value}";
     in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
 
+  # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py
   gnSystemLibraries = [
-    "flac" "libwebp" "libxslt" "opus" "snappy" "libpng"
-    # "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config
-    # "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
-    # "re2" # fails with linker errors
-    # "ffmpeg" # https://crbug.com/731766
-    # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
-                    # so we can't build with one from system and other from source
+    "ffmpeg"
+    "flac"
+    "libjpeg"
+    "libpng"
+    "libwebp"
+    "libxslt"
+    "opus"
+    "snappy"
+    "zlib"
   ];
 
   opusWithCustomModes = libopus.override {
@@ -97,11 +97,9 @@ let
     libevent expat libjpeg snappy
     libpng libcap
     xdg_utils minizip libwebp
-    libusb1 re2 zlib
-    ffmpeg_3 libxslt libxml2
+    libusb1 re2
+    ffmpeg libxslt libxml2
     nasm
-    # harfbuzz # in versions over 63 harfbuzz and freetype are being built together
-               # so we can't build with one from system and other from source
   ];
 
   # build paths and release info
@@ -135,10 +133,10 @@ let
     };
 
     nativeBuildInputs = [
+      llvmPackages.lldClang.bintools
       ninja which python2Packages.python perl pkgconfig
       python2Packages.ply python2Packages.jinja2 nodejs
       gnutar python2Packages.setuptools
-      (xorg.xcbproto.override { python = python2Packages.python; })
     ];
 
     buildInputs = defaultDependencies ++ [
@@ -157,34 +155,35 @@ let
       ++ optional pulseSupport libpulseaudio
       ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
 
-    patches = optionals (versionRange "68" "86") [
-      ./patches/nix_plugin_paths_68.patch
-    ] ++ [
-      ./patches/remove-webp-include-69.patch
-      ./patches/no-build-timestamps.patch
-      ./patches/widevine-79.patch
-      ./patches/dont-use-ANGLE-by-default.patch
-      # Unfortunately, chromium regularly breaks on major updates and
-      # then needs various patches backported in order to be compiled with GCC.
-      # Good sources for such patches and other hints:
-      # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
-      # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
-      # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits
-      #
-      # ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
+    patches = [
+      ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
+      ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
       # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
-    ] ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build:
-      ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
-      ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
+    ] ++ optionals (useVaapi && versionRange "86" "87") [
+      # Check for enable-accelerated-video-decode on Linux:
+      (githubPatch "54deb9811ca9bd2327def5c05ba6987b8c7a0897" "11jvxjlkzz1hm0pvfyr88j7z3zbwzplyl5idkx92l2lzv4459c8d")
     ];
 
-    postPatch = optionalString (!versionRange "0" "86") ''
+    postPatch = ''
+      # remove unused third-party
+      for lib in ${toString gnSystemLibraries}; do
+        if [ -d "third_party/$lib" ]; then
+          find "third_party/$lib" -type f \
+            \! -path "third_party/$lib/chromium/*" \
+            \! -path "third_party/$lib/google/*" \
+            \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \
+            \! -regex '.*\.\(gn\|gni\|isolate\)' \
+            -delete
+        fi
+      done
+
       # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.):
-      substituteInPlace native_client/SConstruct \
-        --replace "#! -*- python -*-" ""
-      substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
-        --replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
-    '' + ''
+      substituteInPlace native_client/SConstruct --replace "#! -*- python -*-" ""
+      if [ -e third_party/harfbuzz-ng/src/src/update-unicode-tables.make ]; then
+        substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
+          --replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
+      fi
+
       # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
       substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
         --replace \
@@ -202,11 +201,6 @@ let
           '/usr/share/locale/' \
           '${glibc}/share/locale/'
 
-      substituteInPlace ui/gfx/x/BUILD.gn \
-        --replace \
-          '/usr/share/xcb' \
-          '${xorg.xcbproto}/share/xcb/'
-
       sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
         chrome/browser/shell_integration_linux.cc
 
@@ -216,42 +210,20 @@ let
       sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
         gpu/config/gpu_info_collector_linux.cc
 
-      sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \
-        chrome/browser/ui/webui/engagement/site_engagement_ui.cc
-
-      sed -i -e '/#include/ {
-        i #include <algorithm>
-        :l; n; bl
-      }' gpu/config/gpu_control_list.cc
-
       # Allow to put extensions into the system-path.
       sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc
 
       patchShebangs .
       # use our own nodejs
       mkdir -p third_party/node/linux/node-linux-x64/bin
-      ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node
+      ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node
+
+      # Allow building against system libraries in official builds
+      sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py
 
-      # 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/*"       \
-            \! -path "*base/third_party/libevent/*"  \
-            \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
-            -delete
-      done
     '' + optionalString stdenv.isAarch64 ''
       substituteInPlace build/toolchain/linux/BUILD.gn \
         --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
-    '' + optionalString stdenv.cc.isClang ''
-      mkdir -p third_party/llvm-build/Release+Asserts/bin
-      ln -s ${stdenv.cc}/bin/clang              third_party/llvm-build/Release+Asserts/bin/clang
-      ln -s ${stdenv.cc}/bin/clang++            third_party/llvm-build/Release+Asserts/bin/clang++
-      ln -s ${llvmPackages.llvm}/bin/llvm-ar    third_party/llvm-build/Release+Asserts/bin/llvm-ar
     '' + optionalString ungoogled ''
       ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors"
       ${ungoogler}/utils/patches.py . ${ungoogler}/patches
@@ -259,9 +231,9 @@ let
     '';
 
     gnFlags = mkGnFlags ({
-      use_lld = false;
-      use_gold = true;
-      gold_path = "${stdenv.cc}/bin";
+      custom_toolchain = "//build/toolchain/linux/unbundle:default";
+      host_toolchain = "//build/toolchain/linux/unbundle:default";
+      is_official_build = true;
       is_debug = false;
 
       proprietary_codecs = false;
@@ -283,6 +255,7 @@ let
       is_clang = stdenv.cc.isClang;
       clang_use_chrome_plugins = false;
       blink_symbol_level = 0;
+      symbol_level = 0;
       fieldtrial_testing_like_official_build = true;
 
       # Google API keys, see:
@@ -336,8 +309,7 @@ let
 
       # This is to ensure expansion of $out.
       libExecPath="${libExecPath}"
-      python build/linux/unbundle/replace_gn_files.py \
-        --system-libraries ${toString gnSystemLibraries}
+      python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
       ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
 
       # Fail if `gn gen` contains a WARNING.
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix
index 7c581ee633f6..3cd0ec34db1c 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix
@@ -1,5 +1,5 @@
 { newScope, config, stdenv, fetchurl, makeWrapper
-, llvmPackages_10, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils
+, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils
 , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
 , libva ? null
 , pipewire_0_2
@@ -14,8 +14,7 @@
 , proprietaryCodecs ? true
 , enablePepperFlash ? false
 , enableWideVine ? false
-, useVaapi ? false # Deprecated, use enableVaapi instead!
-, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon
+, enableVaapi ? false # Disabled by default due to unofficial support
 , ungoogled ? true
 , useOzone ? false
 , cupsSupport ? true
@@ -24,7 +23,7 @@
 }:
 
 let
-  llvmPackages = llvmPackages_10;
+  llvmPackages = llvmPackages_11;
   stdenv = llvmPackages.stdenv;
 
   callPackage = newScope chromium;
@@ -39,16 +38,6 @@ let
               cupsSupport pulseSupport useOzone;
       inherit ungoogled;
       # TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
-      gnChromium = gn.overrideAttrs (oldAttrs: {
-        version = "2020-05-19";
-        src = fetchgit {
-          url = "https://gn.googlesource.com/gn";
-          rev = "d0a6f072070988e7b038496c4e7d6c562b649732";
-          sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17";
-        };
-      });
-    } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") {
-      llvmPackages = llvmPackages_11;
       gnChromium = gn.overrideAttrs (oldAttrs: {
         version = "2020-07-20";
         src = fetchgit {
@@ -58,8 +47,8 @@ let
         };
       });
     } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") {
-      llvmPackages = llvmPackages_11;
       useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/
+      useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine)
       gnChromium = gn.overrideAttrs (oldAttrs: {
         version = "2020-08-17";
         src = fetchgit {
@@ -162,13 +151,6 @@ let
       ''
     else browser;
 
-  optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09:
-    then throw ''
-      Chromium's useVaapi was replaced by enableVaapi and you don't need to pass
-      "--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore).
-    '' else lib.optionalString
-      (!enableVaapi)
-      "--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode";
 in stdenv.mkDerivation {
   name = "ungoogled-chromium${suffix}-${version}";
   inherit version;
@@ -195,7 +177,7 @@ in stdenv.mkDerivation {
 
     eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
       --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \
-      ${optionalVaapiFlags} \
+      ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} \
       ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
 
     ed -v -s "$out/bin/chromium" << EOF
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch
deleted file mode 100644
index 9f14a304eb34..000000000000
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-A field trial currently enables the passthrough command decoder, which causes
-gl_factory.cc to try kGLImplementationEGLANGLE first, which causes Chromium to fail
-to load libGLESv2.so on NixOS.  It somehow does not try kGLImplementationDesktopGL,
-and so there is no GL support at all.
-
-Revert to using the validating command decoder, which prevents gl_factory.cc
-from touching allowed_impls, allowing it to successfully use kGLImplementationDesktopGL.
-
-diff --git a/ui/gl/gl_utils.cc b/ui/gl/gl_utils.cc
-index 697cbed5fe2d..8419bdb21a2f 100644
---- a/ui/gl/gl_utils.cc
-+++ b/ui/gl/gl_utils.cc
-@@ -71,9 +71,10 @@ bool UsePassthroughCommandDecoder(const base::CommandLine* command_line) {
-   } else if (switch_value == kCmdDecoderValidatingName) {
-     return false;
-   } else {
--    // Unrecognized or missing switch, use the default.
--    return base::FeatureList::IsEnabled(
--        features::kDefaultPassthroughCommandDecoder);
-+    // Ignore the field trial that enables it; disable it until
-+    // gl_factory.cc kGLImplementationEGLANGLE issues are sorted
-+    // out on NixOS.
-+    return false;
-   }
- }
- }
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch
deleted file mode 100644
index 8d879de7bfd8..000000000000
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
-   // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
-   // internal decoded frame.
-   if (buffer_allocation_mode_ != BufferAllocationMode::kNone &&
-+      buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau &&
-       !vpp_vaapi_wrapper_) {
-     vpp_vaapi_wrapper_ = VaapiWrapper::Create(
-         VaapiWrapper::kVideoProcess, VAProfileNone,
-@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
-     PictureBuffer buffer = buffers[i];
-     buffer.set_size(requested_pic_size_);
-     std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
--        (buffer_allocation_mode_ == BufferAllocationMode::kNone)
-+        ((buffer_allocation_mode_ == BufferAllocationMode::kNone) ||
-+         (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau))
-             ? vaapi_wrapper_
-             : vpp_vaapi_wrapper_,
-         make_context_current_cb_, bind_image_cb_, buffer);
-@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
-
- VaapiVideoDecodeAccelerator::BufferAllocationMode
- VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
-+  // NVIDIA blobs use VDPAU
-+  if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) {
-+    LOG(INFO) << "VA-API driver on VDPAU backend";
-+    return BufferAllocationMode::kWrapVdpau;
-+  }
-+
-   // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
-   // |output_mode_| as well.
-   if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h
-+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h
-@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
-     // Using |client_|s provided PictureBuffers and as many internally
-     // allocated.
-     kNormal,
-+    kWrapVdpau,
-   };
-
-   // Decides the concrete buffer allocation mode, depending on the hardware
---- a/media/gpu/vaapi/vaapi_wrapper.cc
-+++ b/media/gpu/vaapi/vaapi_wrapper.cc
-@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType(
-   } else if (base::StartsWith(va_vendor_string, "Intel iHD driver",
-                               base::CompareCase::SENSITIVE)) {
-     return media::VAImplementation::kIntelIHD;
-+  } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU",
-+                              base::CompareCase::SENSITIVE)) {
-+    return media::VAImplementation::kNVIDIAVDPAU;
-   }
-   return media::VAImplementation::kOther;
- }
---- a/media/gpu/vaapi/vaapi_wrapper.h
-+++ b/media/gpu/vaapi/vaapi_wrapper.h
-@@ -79,6 +79,7 @@ enum class VAImplementation {
-   kIntelIHD,
-   kOther,
-   kInvalid,
-+  kNVIDIAVDPAU,
- };
-
- // This class handles VA-API calls and ensures proper locking of VA-API calls
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch
deleted file mode 100644
index bd278633f67e..000000000000
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001
-From: Michael Weiss <dev.primeos@gmail.com>
-Date: Tue, 14 Apr 2020 14:16:10 +0200
-Subject: [PATCH] Enable accelerated video decode on Linux
-
-This will enable accelerated video decode on Linux by default (i.e.
-without "--ignore-gpu-blacklist"), but on NixOS we'll provide
-"--disable-accelerated-video-decode" and
-"--disable-accelerated-video-encode" by default to avoid regressions
-(e.g. VA-API doesn't work properly for some radeon drivers).
-
-Video acceleration can then be enabled via:
-chromium.override { enableVaapi = true; }
-without rebuilding Chromium.
----
- gpu/config/software_rendering_list.json | 16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
-index 22712bdbf38f..a06dd19a50e4 100644
---- a/gpu/config/software_rendering_list.json
-+++ b/gpu/config/software_rendering_list.json
-@@ -336,22 +336,6 @@
-       ]
-     },
-     {
--      "id": 48,
--      "description": "Accelerated video decode is unavailable on Linux",
--      "cr_bugs": [137247, 1032907],
--      "os": {
--        "type": "linux"
--      },
--      "exceptions": [
--        {
--          "machine_model_name": ["Chromecast"]
--        }
--      ],
--      "features": [
--        "accelerated_video_decode"
--      ]
--    },
--    {
-       "id": 50,
-       "description": "Disable VMware software renderer on older Mesa",
-       "cr_bugs": [145531, 332596, 571899, 629434],
--- 
-2.11.0
-
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch
deleted file mode 100644
index da6a4c92b460..000000000000
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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 base::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;
-@@ -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"));
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch
deleted file mode 100644
index 07572cf7ee94..000000000000
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
-+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
-@@ -13,7 +13,7 @@
-
- #include "jpeglib.h"  // for JPEG_MAX_DIMENSION
-
--#include "third_party/libwebp/src/webp/encode.h"  // for WEBP_MAX_DIMENSION
-+#define WEBP_MAX_DIMENSION 16383
-
- namespace blink {
-
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix
index 73f4e4c9e83d..abcb2ce391af 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix
@@ -1,6 +1,6 @@
 {
-  "85.0.4183.102" = {
-    rev = "85.0.4183.102-1";
-    sha256 = "1mdx4a5zcs3an9yx1jxx4amq8p9rcj0hv76r8y7nz6cpsfgd9n3y";
+  "86.0.4240.111" = {
+    rev = "86.0.4240.111-1";
+    sha256 = "0fkk0lxbvik8q8d5njxmwiam64qz5g74hlb56w24nh5mh1jm59a8";
   };
 }
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json
index dae7f741b357..5fded39c749a 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json
@@ -1,17 +1,17 @@
 {
   "stable": {
-    "version": "85.0.4183.102",
-    "sha256": "032yh1mfwins7a62zw8kwwq8xw1n52a0a93lqz7qlyjaf9sd8s4a",
-    "sha256bin64": "1i8xaxxnmg80vsia8hxnq58qi9k5nnbrl80d6d23g9lb7dbc9cpm"
+    "version": "86.0.4240.111",
+    "sha256": "05y7lwr89awkhvgmwkx3br9j4ap2aypg2wsc0nz8mi7kxc1dnyzj",
+    "sha256bin64": "10aqiiydw4i3jxnw8xxdgkgcqbfqc67n1fbrg40y54kg0v5dz8l6"
   },
   "beta": {
-    "version": "86.0.4240.30",
-    "sha256": "1isj0zngb72k1hhn3h0s8mccg1cdmppz1mjmg19f2h306farzmzl",
-    "sha256bin64": "10d8im2adqqnkd6265gngv6xlm5qsz6r13z6cbbchsss0ssr8fxa"
+    "version": "87.0.4280.27",
+    "sha256": "0w0asxj7jlsw69cssfia8km4q9cx1c2mliks2rmhf4jk0hsghasm",
+    "sha256bin64": "1lsx4mhy8nachfb8c9f3mrx5nqw2bi046dqirb4lnv7y80jjjs1k"
   },
   "dev": {
-    "version": "87.0.4252.0",
-    "sha256": "1lxlsdni63zh79hxvpwgmnfn67kgfzhz3yg9bkxghqchqykkz92y",
-    "sha256bin64": "130hf7b35wcxpw05ddbqq89x10c0kays1vb9qg6xhq3zx2mk6ijw"
+    "version": "88.0.4298.4",
+    "sha256": "0ka11gmpkyrmifajaxm66c16hrj3xakdvhjqg04slyp2sv0nlhrl",
+    "sha256bin64": "0768y31jqbl1znp7yp6mvl5j12xl1nwjkh2l8zdga81q0wz52hh6"
   }
 }

From fd12c2efcdb6f7a83cecd864eeb9ad133915da16 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 20:51:51 +0000
Subject: [PATCH 1137/3942] olm: 3.1.5 -> 3.2.1

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

diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index 66ed41e8eadb..9efe524b12d0 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "olm";
-  version = "3.1.5";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz";
-    sha256 = "15l6cf029ghfk5bf8ii6nyy86gc90ji8n5hspjhj1xmzmk61xb4j";
+    sha256 = "0iacbi9iibhzifh1bk6bi5xin557lvqmbf4ccsb8drj50dbxjiyr";
   };
 
   nativeBuildInputs = [ cmake ];

From 64cbf9f0deadc90709a3fc02f2191ce30b8b018f Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 3 Nov 2020 22:54:07 +0100
Subject: [PATCH 1138/3942] mlc: init at 3.9

https://software.intel.com/content/www/us/en/develop/articles/intelr-memory-latency-checker.html
---
 pkgs/tools/system/mlc/default.nix | 34 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/system/mlc/default.nix

diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/tools/system/mlc/default.nix
new file mode 100644
index 000000000000..fc9302e2698a
--- /dev/null
+++ b/pkgs/tools/system/mlc/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, patchelf, lib }:
+stdenv.mkDerivation rec {
+  pname = "mlc";
+  version = "3.9";
+
+  src = fetchurl {
+    url = "https://software.intel.com/content/dam/develop/external/us/en/protected/mlc_v${version}.tgz";
+    sha256 = "1x7abm9hbv9hkqa3cgxz6l04m3ycyl40i4zgx1w819pc10n6dhdb";
+  };
+
+  sourceRoot = "Linux";
+
+  nativeBuildInputs = [ patchelf ];
+
+  phases = [ "unpackPhase" "installPhase" "patchPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp mlc $out/bin/mlc
+    chmod +x $out/bin/mlc
+  '';
+
+  patchPhase = ''
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/mlc
+  '';
+
+  meta = {
+    homepage = "https://software.intel.com/content/www/us/en/develop/articles/intelr-memory-latency-checker.html";
+    description = "Intel Memory Latency Checker";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ basvandijk ];
+    platforms = with lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e65aa28b25b8..906513efb3f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14643,6 +14643,8 @@ in
     withGUI = false;
   };
 
+  mlc = callPackage ../tools/system/mlc { };
+
   mlt = callPackage ../development/libraries/mlt { };
 
   mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { };

From 93c4fad2c346c078b1ac5b0c56e12e36fb5b3039 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 4 Nov 2020 08:25:03 +1000
Subject: [PATCH 1139/3942] fzf: 0.24.1 -> 0.24.2

https://github.com/junegunn/fzf/releases/tag/0.24.2
---
 pkgs/tools/misc/fzf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 6bd7f1ac3ed4..fd9cea21a919 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.24.1";
+  version = "0.24.2";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = pname;
     rev = version;
-    sha256 = "03f9fdqicw1a2hcjiasya0dq72jvdz6fqw7dfig4kv5l14pwf3v9";
+    sha256 = "1s9ynpd158cddzppphqksml5v1csyi55ji0az8kz2p10iz89v1ry";
   };
 
   vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";

From d48026dc5b91ed27425c1d91940b38919ea91a35 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Tue, 3 Nov 2020 17:27:26 +0100
Subject: [PATCH 1140/3942] crun: 0.15 -> 0.15.1

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/applications/virtualization/crun/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index e52401ba35fc..62e5843d2439 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -35,13 +35,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "crun";
-  version = "0.15";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = version;
-    sha256 = "0cqzk2lm1w0g2v6qhiliq565cf4p7hzh839jb01p3i5cr9kx11kc";
+    sha256 = "0qy4159wirkwzb48kp1jsnimlr1fyvxvv02j6mdbhjdhkwjic8v4";
     fetchSubmodules = true;
   };
 

From cb764dbc24d5b386045a291d7e313ed97c938a53 Mon Sep 17 00:00:00 2001
From: Finn Behrens <me@kloenk.de>
Date: Sat, 10 Oct 2020 12:05:31 +0200
Subject: [PATCH 1141/3942] top-level: Use `systemdMinimal` in a few more
 places

---
 pkgs/development/libraries/hidapi/default.nix  |  4 ++--
 pkgs/development/libraries/libusb1/default.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix                | 13 +++++++++++--
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix
index 356a0fe349df..df8212cd5a65 100644
--- a/pkgs/development/libraries/hidapi/default.nix
+++ b/pkgs/development/libraries/hidapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb1
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb1
 , darwin }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   buildInputs = [ ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 systemd ];
+    ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index a3323c8e026b..8499e16c2910 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -2,14 +2,14 @@
 , fetchFromGitHub
 , autoreconfHook
 , pkgconfig
-, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
-, systemd ? null
+, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
+, udev ? null
 , libobjc
 , IOKit
 , withStatic ? false
 }:
 
-assert enableSystemd -> systemd != null;
+assert enableUdev -> udev != null;
 
 stdenv.mkDerivation rec {
   pname = "libusb";
@@ -26,15 +26,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   propagatedBuildInputs =
-    stdenv.lib.optional enableSystemd systemd ++
+    stdenv.lib.optional enableUdev udev ++
     stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
 
   dontDisableStatic = withStatic;
 
-  configureFlags = stdenv.lib.optional (!enableSystemd) "--disable-udev";
+  configureFlags = stdenv.lib.optional (!enableUdev) "--disable-udev";
 
-  preFixup = stdenv.lib.optionalString enableSystemd ''
-    sed 's,-ludev,-L${stdenv.lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la
+  preFixup = stdenv.lib.optionalString enableUdev ''
+    sed 's,-ludev,-L${stdenv.lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2846fb7373fd..e1e15cb5e9c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13126,7 +13126,10 @@ in
 
   herqq = libsForQt514.callPackage ../development/libraries/herqq { };
 
-  hidapi = callPackage ../development/libraries/hidapi { };
+  hidapi = callPackage ../development/libraries/hidapi {
+    # TODO: remove once `udev` is `systemdMinimal` everywhere.
+    udev = systemdMinimal;
+  };
 
   highfive = callPackage ../development/libraries/highfive { };
 
@@ -13703,7 +13706,9 @@ in
 
   libfakekey = callPackage ../development/libraries/libfakekey { };
 
-  libfido2 = callPackage ../development/libraries/libfido2 { };
+  libfido2 = callPackage ../development/libraries/libfido2 {
+    udev = systemdMinimal;
+  };
 
   libfilezilla = callPackage ../development/libraries/libfilezilla {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
@@ -14394,6 +14399,8 @@ in
   libusb1 = callPackage ../development/libraries/libusb1 {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) IOKit;
+    # TODO: remove once `udev` is `systemdMinimal` everywhere.
+    udev = systemdMinimal;
   };
 
   libusbmuxd = callPackage ../development/libraries/libusbmuxd { };
@@ -18834,6 +18841,8 @@ in
     glib = null;
     libgcrypt = null;
     lvm2 = null;
+    libfido2 = null;
+    p11-kit = null;
   };
 
 

From 7787fd2413c97f7828d8000207e8af221d3a1f83 Mon Sep 17 00:00:00 2001
From: Finn Behrens <me@kloenk.de>
Date: Sat, 10 Oct 2020 12:05:31 +0200
Subject: [PATCH 1142/3942] systemd: Add an option for homed

This is disabled by default to indicate that is hasn't been adiquately
tested with NixOS yet.
---
 ...configuration-into-out-share-factory.patch | 14 ++++++++-
 pkgs/os-specific/linux/systemd/default.nix    | 30 +++++++++++--------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch
index d1961d32f9fb..a2d08753d4df 100644
--- a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch
+++ b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch
@@ -16,6 +16,7 @@ store again, while having executables looking up files in /etc.
  network/meson.build            |  2 +-
  src/core/meson.build           | 10 +++++-----
  src/coredump/meson.build       |  2 +-
+ src/home/meson.build           |  2 +-
  src/journal-remote/meson.build |  4 ++--
  src/journal/meson.build        |  2 +-
  src/kernel-install/meson.build |  2 +-
@@ -28,7 +29,7 @@ store again, while having executables looking up files in /etc.
  sysctl.d/meson.build           |  2 +-
  tmpfiles.d/meson.build         |  2 +-
  units/meson.build              |  2 +-
- 17 files changed, 29 insertions(+), 26 deletions(-)
+ 18 files changed, 30 insertions(+), 27 deletions(-)
 
 diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build
 index 5c77387a26..6404bc01ba 100644
@@ -144,6 +145,17 @@ index 7fa5942697..34c865dfa0 100644
  endif
  
  tests += [
+diff --git a/src/home/meson.build b/src/home/meson.build
+index 797f3a3c6d..232904ab42 100644
+--- a/src/home/meson.build
++++ b/src/home/meson.build
+@@ -98,5 +98,5 @@ if conf.get('ENABLE_HOMED') == 1
+                      install_dir : polkitpolicydir)
+
+         install_data('homed.conf',
+-                     install_dir : pkgsysconfdir)
++                     install_dir : factoryconfdir)
+ endif
 diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
 index 87b8ba6495..daff8ec967 100644
 --- a/src/journal-remote/meson.build
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 0a89fe3720a5..85c78ce1421b 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -78,6 +78,8 @@
 , withTimedated ? true
 , withTimesyncd ? true
 , withUserDb ? true
+, withHomed ? false, p11-kit, libfido2
+# , withPortabled ? false TODO
 
   # name argument
 , pname ? "systemd"
@@ -98,8 +100,11 @@ assert withEfi -> (gnu-efi != null);
 assert withRemote -> lib.getDev curl != null;
 assert withCoredump -> withCompression;
 
+assert withHomed -> withCryptsetup;
+
 assert withCryptsetup ->
 (cryptsetup != null);
+
 let
   wantCurl = withRemote || withImportd;
 
@@ -191,18 +196,19 @@ stdenv.mkDerivation {
       pam
     ]
 
-    ++ lib.optional withApparmor libapparmor
-    ++ lib.optional wantCurl (lib.getDev curl)
+    ++ lib.optional  withApparmor libapparmor
+    ++ lib.optional  wantCurl (lib.getDev curl)
     ++ lib.optionals withCompression [ bzip2 lz4 xz ]
-    ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
-    ++ lib.optional withEfi gnu-efi
-    ++ lib.optional withKexectools kexectools
-    ++ lib.optional withLibseccomp libseccomp
-    ++ lib.optional withNetworkd iptables
-    ++ lib.optional withPCRE2 pcre2
-    ++ lib.optional withResolved libgpgerror
-    ++ lib.optional withSelinux libselinux
-    ++ lib.optional withRemote libmicrohttpd
+    ++ lib.optional  withCryptsetup (lib.getDev cryptsetup.dev)
+    ++ lib.optional  withEfi gnu-efi
+    ++ lib.optional  withKexectools kexectools
+    ++ lib.optional  withLibseccomp libseccomp
+    ++ lib.optional  withNetworkd iptables
+    ++ lib.optional  withPCRE2 pcre2
+    ++ lib.optional  withResolved libgpgerror
+    ++ lib.optional  withSelinux libselinux
+    ++ lib.optional  withRemote libmicrohttpd
+    ++ lib.optionals withHomed [ p11-kit libfido2 ]
     ;
 
   #dontAddPrefix = true;
@@ -226,7 +232,7 @@ stdenv.mkDerivation {
     "-Dgcrypt=${lib.boolToString (libgcrypt != null)}"
     "-Dimportd=${lib.boolToString withImportd}"
     "-Dlz4=${lib.boolToString withCompression}"
-    "-Dhomed=false"
+    "-Dhomed=${stdenv.lib.boolToString withHomed}"
     "-Dlogind=${lib.boolToString withLogind}"
     "-Dlocaled=${lib.boolToString withLocaled}"
     "-Dhostnamed=${lib.boolToString withHostnamed}"

From fdb8cb598bef090d12e4a40e0ddf2de0ba2e9385 Mon Sep 17 00:00:00 2001
From: Martin Hardselius <martin@hardselius.dev>
Date: Tue, 20 Oct 2020 23:13:36 +0200
Subject: [PATCH 1143/3942] nodePackages.fauna-shell: init at 0.11.5

---
 .../node-packages/node-packages.json          |    1 +
 .../node-packages/node-packages.nix           | 5782 ++++++++++-------
 2 files changed, 3405 insertions(+), 2378 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index ff07222506d4..479e28cfabeb 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -75,6 +75,7 @@
 , "eslint_d"
 , "expo-cli"
 , {"fast-cli": "1.x"}
+, "fauna-shell"
 , "fkill-cli"
 , "forever"
 , "fx"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index ff9a7acc77c8..5797af8215b1 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -22,13 +22,13 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.1001.7" = {
+    "@angular-devkit/architect-0.1002.0" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.1001.7";
+      version = "0.1002.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.7.tgz";
-        sha512 = "uFYIvMdewU44GbIyRfsUHNMLkx+C0kokpnj7eH5NbJfbyFpCfd3ijBHh+voPdPsDRWs9lLgjbxfHpswSPj4D8w==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1002.0.tgz";
+        sha512 = "twM8V03ujBIGVpgV1PBlSDodUdxtUb7WakutfWafAvEHUsgwzfvQz2VtKWvjNZ9AiYjnCuwkQaclqVv0VHNo9w==";
       };
     };
     "@angular-devkit/core-10.0.7" = {
@@ -40,13 +40,13 @@ let
         sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw==";
       };
     };
-    "@angular-devkit/core-10.1.7" = {
+    "@angular-devkit/core-10.2.0" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
-      version = "10.1.7";
+      version = "10.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.7.tgz";
-        sha512 = "RRyDkN2FByA+nlnRx/MzUMK1FXwj7+SsrzJcvZfWx4yA5rfKmJiJryXQEzL44GL1aoaXSuvOYu3H72wxZADN8Q==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz";
+        sha512 = "XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==";
       };
     };
     "@angular-devkit/core-9.1.12" = {
@@ -67,13 +67,13 @@ let
         sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg==";
       };
     };
-    "@angular-devkit/schematics-10.1.7" = {
+    "@angular-devkit/schematics-10.2.0" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
-      version = "10.1.7";
+      version = "10.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.7.tgz";
-        sha512 = "nk9RXA09b+7uq59HS/gyztNzUGHH/eQAUQhWHdDYSCG6v1lhJVCKx1HgDPELVxmeq9f+HArkAW7Y7c+ccdNQ7A==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.2.0.tgz";
+        sha512 = "TQI5NnE6iM3ChF5gZQ9qb+lZgMWa7aLoF5ksOyT3zrmOuICiQYJhA6SsjV95q7J4M55qYymwBib8KTqU/xuQww==";
       };
     };
     "@angular-devkit/schematics-9.1.12" = {
@@ -328,6 +328,15 @@ let
         sha512 = "725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ==";
       };
     };
+    "@babel/compat-data-7.12.5" = {
+      name = "_at_babel_slash_compat-data";
+      packageName = "@babel/compat-data";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz";
+        sha512 = "DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==";
+      };
+    };
     "@babel/core-7.12.3" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
@@ -364,6 +373,15 @@ let
         sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==";
       };
     };
+    "@babel/generator-7.12.5" = {
+      name = "_at_babel_slash_generator";
+      packageName = "@babel/generator";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz";
+        sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==";
+      };
+    };
     "@babel/helper-annotate-as-pure-7.10.4" = {
       name = "_at_babel_slash_helper-annotate-as-pure";
       packageName = "@babel/helper-annotate-as-pure";
@@ -409,6 +427,15 @@ let
         sha512 = "jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g==";
       };
     };
+    "@babel/helper-compilation-targets-7.12.5" = {
+      name = "_at_babel_slash_helper-compilation-targets";
+      packageName = "@babel/helper-compilation-targets";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz";
+        sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==";
+      };
+    };
     "@babel/helper-create-class-features-plugin-7.12.1" = {
       name = "_at_babel_slash_helper-create-class-features-plugin";
       packageName = "@babel/helper-create-class-features-plugin";
@@ -490,6 +517,15 @@ let
         sha512 = "ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==";
       };
     };
+    "@babel/helper-module-imports-7.12.5" = {
+      name = "_at_babel_slash_helper-module-imports";
+      packageName = "@babel/helper-module-imports";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz";
+        sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==";
+      };
+    };
     "@babel/helper-module-transforms-7.12.1" = {
       name = "_at_babel_slash_helper-module-transforms";
       packageName = "@babel/helper-module-transforms";
@@ -544,6 +580,15 @@ let
         sha512 = "zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==";
       };
     };
+    "@babel/helper-replace-supers-7.12.5" = {
+      name = "_at_babel_slash_helper-replace-supers";
+      packageName = "@babel/helper-replace-supers";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz";
+        sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==";
+      };
+    };
     "@babel/helper-simple-access-7.12.1" = {
       name = "_at_babel_slash_helper-simple-access";
       packageName = "@babel/helper-simple-access";
@@ -607,6 +652,15 @@ let
         sha512 = "9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==";
       };
     };
+    "@babel/helpers-7.12.5" = {
+      name = "_at_babel_slash_helpers";
+      packageName = "@babel/helpers";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz";
+        sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==";
+      };
+    };
     "@babel/highlight-7.10.4" = {
       name = "_at_babel_slash_highlight";
       packageName = "@babel/highlight";
@@ -625,6 +679,15 @@ let
         sha512 = "kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==";
       };
     };
+    "@babel/parser-7.12.5" = {
+      name = "_at_babel_slash_parser";
+      packageName = "@babel/parser";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz";
+        sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==";
+      };
+    };
     "@babel/plugin-external-helpers-7.8.3" = {
       name = "_at_babel_slash_plugin-external-helpers";
       packageName = "@babel/plugin-external-helpers";
@@ -715,6 +778,15 @@ let
         sha512 = "MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA==";
       };
     };
+    "@babel/plugin-proposal-numeric-separator-7.12.5" = {
+      name = "_at_babel_slash_plugin-proposal-numeric-separator";
+      packageName = "@babel/plugin-proposal-numeric-separator";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz";
+        sha512 = "UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==";
+      };
+    };
     "@babel/plugin-proposal-object-rest-spread-7.12.1" = {
       name = "_at_babel_slash_plugin-proposal-object-rest-spread";
       packageName = "@babel/plugin-proposal-object-rest-spread";
@@ -1165,6 +1237,15 @@ let
         sha512 = "RmKejwnT0T0QzQUzcbP5p1VWlpnP8QHtdhEtLG55ZDQnJNalbF3eeDyu3dnGKvGzFIQiBzFhBYTwvv435p9Xpw==";
       };
     };
+    "@babel/plugin-transform-react-jsx-7.12.5" = {
+      name = "_at_babel_slash_plugin-transform-react-jsx";
+      packageName = "@babel/plugin-transform-react-jsx";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz";
+        sha512 = "2xkcPqqrYiOQgSlM/iwto1paPijjsDbUynN13tI6bosDz/jOW3CRzYguIE8wKX32h+msbBM22Dv5fwrFkUOZjQ==";
+      };
+    };
     "@babel/plugin-transform-react-jsx-source-7.12.1" = {
       name = "_at_babel_slash_plugin-transform-react-jsx-source";
       packageName = "@babel/plugin-transform-react-jsx-source";
@@ -1354,6 +1435,15 @@ let
         sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==";
       };
     };
+    "@babel/runtime-7.12.5" = {
+      name = "_at_babel_slash_runtime";
+      packageName = "@babel/runtime";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz";
+        sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==";
+      };
+    };
     "@babel/runtime-7.9.0" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
@@ -1381,6 +1471,15 @@ let
         sha512 = "MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==";
       };
     };
+    "@babel/traverse-7.12.5" = {
+      name = "_at_babel_slash_traverse";
+      packageName = "@babel/traverse";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz";
+        sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==";
+      };
+    };
     "@babel/types-7.10.4" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
@@ -1399,13 +1498,22 @@ let
         sha512 = "BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==";
       };
     };
-    "@bugsnag/browser-7.4.0" = {
+    "@babel/types-7.12.5" = {
+      name = "_at_babel_slash_types";
+      packageName = "@babel/types";
+      version = "7.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.5.tgz";
+        sha512 = "gyTcvz7JFa4V45C0Zklv//GmFOAal5fL23OWpBLqc4nZ4Yrz67s4kCNwSK1Gu0MXGTU8mRY3zJYtacLdKXlzig==";
+      };
+    };
+    "@bugsnag/browser-7.5.1" = {
       name = "_at_bugsnag_slash_browser";
       packageName = "@bugsnag/browser";
-      version = "7.4.0";
+      version = "7.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.4.0.tgz";
-        sha512 = "WmBJLCFvM2dvj0ZUCCx2QO9xxKJ1V7qZC4zE3kzxBdEgG1UKmKe2MSOJv8Igr933t6gY7Wzd5e7j6EpRuyvIyg==";
+        url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.5.1.tgz";
+        sha512 = "NLWgSj3elYGSkdth666UxQ6r5Y/zAMidnQZRnOW2ZsW+4W/q+hr7zoN4v5IUnZuoSTQ9QxVYY99wA4hqlDyoJg==";
       };
     };
     "@bugsnag/core-7.3.5" = {
@@ -1426,13 +1534,13 @@ let
         sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg==";
       };
     };
-    "@bugsnag/js-7.4.0" = {
+    "@bugsnag/js-7.5.1" = {
       name = "_at_bugsnag_slash_js";
       packageName = "@bugsnag/js";
-      version = "7.4.0";
+      version = "7.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.4.0.tgz";
-        sha512 = "v+LA3d1DJf5Oxpy93K+/2TBGHNQoVldNaiN0du/9sUTuc8thkx9tgtaj/BiUWINIEX6y3j7y28cRKUhfffdsIQ==";
+        url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.5.1.tgz";
+        sha512 = "acbq392QYjZNtUHa5tTp+MLTBhNZhI4s6EBrEFqN1TdxrVVGEFfnQqrPISfKtOJ+FW1dZEZiQ0oEGJ127htqIQ==";
       };
     };
     "@bugsnag/node-7.3.5" = {
@@ -1453,13 +1561,13 @@ let
         sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA==";
       };
     };
-    "@chemzqm/neovim-5.2.6" = {
+    "@chemzqm/neovim-5.2.8" = {
       name = "_at_chemzqm_slash_neovim";
       packageName = "@chemzqm/neovim";
-      version = "5.2.6";
+      version = "5.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.6.tgz";
-        sha512 = "9R4k2fvsX79dsNjxEjJaAlhdAZKx/DBGPHOXR3TVwJhX0TFPi9fvmHqJ8YFkAOweAVTXaiOdHv/LMerSBsA5Pw==";
+        url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.8.tgz";
+        sha512 = "687yDuEK7A+aZ8PcJVD7xLWkbC1WMp41FcCg1SCHuBroEGn2cbIMl7zwM7LeHsPCDMSDyWfYPMqEgUiVgGfrsQ==";
       };
     };
     "@cliqz-oss/firefox-client-0.3.1" = {
@@ -1687,6 +1795,15 @@ let
         sha512 = "4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==";
       };
     };
+    "@eslint/eslintrc-0.2.1" = {
+      name = "_at_eslint_slash_eslintrc";
+      packageName = "@eslint/eslintrc";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz";
+        sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==";
+      };
+    };
     "@evocateur/libnpmaccess-3.1.2" = {
       name = "_at_evocateur_slash_libnpmaccess";
       packageName = "@evocateur/libnpmaccess";
@@ -1750,13 +1867,13 @@ let
         sha512 = "fQRc4+RG+rEw1IdjFx/5t2AvOlJT8ktv2dfObD3aW838ohZxCx1QvFUY/Gdx5JA1JY/KrHRGuEqQLH9ayiexyg==";
       };
     };
-    "@expo/config-3.3.11" = {
+    "@expo/config-3.3.13" = {
       name = "_at_expo_slash_config";
       packageName = "@expo/config";
-      version = "3.3.11";
+      version = "3.3.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/config/-/config-3.3.11.tgz";
-        sha512 = "+WrAc5pZbgUMGpBMwF/rBw5igngaouWIyFSVlmYbrp0wV2Y/T99uqgylPzNA/Ei14X+34ucZNj2IaLs9Z4Krew==";
+        url = "https://registry.npmjs.org/@expo/config/-/config-3.3.13.tgz";
+        sha512 = "ZFkMQxtk6Zobfc+BPy60rAAuiXFd5ybV7QFF3A7tTy7e6T0/YmuiSMyTM6fqs2c0O47F8/1eoaefXWUl7ppz3w==";
       };
     };
     "@expo/config-types-40.0.0-beta.1" = {
@@ -1777,31 +1894,31 @@ let
         sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ==";
       };
     };
-    "@expo/dev-server-0.1.36" = {
+    "@expo/dev-server-0.1.38" = {
       name = "_at_expo_slash_dev-server";
       packageName = "@expo/dev-server";
-      version = "0.1.36";
+      version = "0.1.38";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.36.tgz";
-        sha512 = "VaAh7bcDgNFXZlwW8MR7tvCrUs8txcBylA96+dzPCUh2kBf8rpubrYyLzriZR4LPIizANCwZjom3GBP6cwbDRg==";
+        url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.38.tgz";
+        sha512 = "LOLqo/SpjVfYuSEOicKgCnUzIvbV0oYvXTS9Rr/LBxw3Q/Smy8p8FbYZ/7RTbSnFbCW1oZWERJ+Qe1ghWKbAEw==";
       };
     };
-    "@expo/dev-tools-0.13.54" = {
+    "@expo/dev-tools-0.13.57" = {
       name = "_at_expo_slash_dev-tools";
       packageName = "@expo/dev-tools";
-      version = "0.13.54";
+      version = "0.13.57";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.54.tgz";
-        sha512 = "S1DW+QRLDd0rKOE9miQ+xu5cNKTGw+2LEwoIZ2Z2u345WPok7TUlH0MXXdd7CpgiCqXTloznRxuuq6QB8pPyWA==";
+        url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.57.tgz";
+        sha512 = "eRP49UYFVytfK7cHA6notnfmCiWvcQ2FOFJABeti2zUa3O55IDP0b/NDqdyLRDpuTxsRZl/K0MBLD5NAUsHMHQ==";
       };
     };
-    "@expo/eas-build-job-0.1.1" = {
+    "@expo/eas-build-job-0.1.2" = {
       name = "_at_expo_slash_eas-build-job";
       packageName = "@expo/eas-build-job";
-      version = "0.1.1";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.1.1.tgz";
-        sha512 = "V5zrRdz6qa45Aflh84CmsEyNcNHG95O7dyzQqpzEI73phB+Jr7ffM+AP0f3+POjy6mwNXIKHgbzH8VG3excPpA==";
+        url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.1.2.tgz";
+        sha512 = "hBYVWlEWi8Iu+jWmbzKy2bMsYoWvRwY7MZ+SdKpNvAl+sMpp8rwvxRyRs7cRTa6DuiQ2sdOxqemnw9MJ6S5cRA==";
       };
     };
     "@expo/image-utils-0.3.7" = {
@@ -1822,13 +1939,13 @@ let
         sha512 = "i34lfcMVt5Wv2Cf5apZUj3o9JlFt8WOPSZjrECryunBQ9/BsQQYY5NHgGjhhZnnRE+6JFf0CPQTjXdoQ1w3w0w==";
       };
     };
-    "@expo/metro-config-0.1.36" = {
+    "@expo/metro-config-0.1.38" = {
       name = "_at_expo_slash_metro-config";
       packageName = "@expo/metro-config";
-      version = "0.1.36";
+      version = "0.1.38";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.36.tgz";
-        sha512 = "6uZa3dLqk6zpF5D5TsTBl+SH8VkpdwQ8AJppJHMxwsass12XbVZ0SH7tsfYN/+YQ8cXQO1K6YmhrWERxrixwbg==";
+        url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.38.tgz";
+        sha512 = "t7BW8cgmm7nmxiY20g1ZMKvXFyDr5Kq+9Ppnskvhg+QffXcY3db/kYSOR0QswscqF5/jBPVGjox7m4+SBKHCDg==";
       };
     };
     "@expo/ngrok-2.4.3" = {
@@ -2029,22 +2146,22 @@ let
         sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg==";
       };
     };
-    "@expo/webpack-config-0.12.40" = {
+    "@expo/webpack-config-0.12.42" = {
       name = "_at_expo_slash_webpack-config";
       packageName = "@expo/webpack-config";
-      version = "0.12.40";
+      version = "0.12.42";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.40.tgz";
-        sha512 = "d2rVf+diOnmwfcLxTF9+9tlUA+XgBLYOMUipAZdo+1Y5Otp7Q8f9qz9jMjf1FGPqr6IJnmIxJx4orA+OFrsaag==";
+        url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.42.tgz";
+        sha512 = "VqQIzFiQQQLMQISdmIqBgJHeGD9LO8eP9sI5puW6y8oEB7Cd8asU+DOC3xJVS1MrqK2usQhW5EJhi2wV7RVG8g==";
       };
     };
-    "@expo/xdl-58.0.15" = {
+    "@expo/xdl-58.0.18" = {
       name = "_at_expo_slash_xdl";
       packageName = "@expo/xdl";
-      version = "58.0.15";
+      version = "58.0.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.15.tgz";
-        sha512 = "1o4i+fALj5JzzNFqjFGqAP7iI0uwB0cGW/tXjs0s8FU/RzuMTGEWRcSbjhNUjyUDZ487Rutl2OtdBt67z27xTw==";
+        url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.18.tgz";
+        sha512 = "CwwLtdEIj857iXwhc10V+gjuepOQ0S21wWM0oKny0TzGSmCz8uVvTCnKK+Geem5hsqyKkCsayirUKTeZ2ToMqA==";
       };
     };
     "@fluentui/date-time-utilities-7.9.0" = {
@@ -2074,40 +2191,40 @@ let
         sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ==";
       };
     };
-    "@fluentui/react-7.147.1" = {
+    "@fluentui/react-7.149.3" = {
       name = "_at_fluentui_slash_react";
       packageName = "@fluentui/react";
-      version = "7.147.1";
+      version = "7.149.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.147.1.tgz";
-        sha512 = "Zk3MygGDVEHrgKi1M12ETozWRxQ0Go8O9RP/mXqWQUHcXK++KfAO6xJZTpMKQ9o18Sb/ZQwjIrYPpYc6JwuyfA==";
+        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.149.3.tgz";
+        sha512 = "CmeTmPcqEy+lHCKsxg2Y0QnvU1dfyh8F/3Bkt48yo+B6/eCEUUCQW+Xl3ktp3tvlijdLaskKV68L9lNh3RZP4Q==";
       };
     };
-    "@fluentui/react-focus-7.16.13" = {
+    "@fluentui/react-focus-7.16.16" = {
       name = "_at_fluentui_slash_react-focus";
       packageName = "@fluentui/react-focus";
-      version = "7.16.13";
+      version = "7.16.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.13.tgz";
-        sha512 = "MWyI64GSEZigYe75aCy8VGGIr/tWwk+H8oqPxamoVOHef4kCqYm/70mhrDpBP1oAhJVmdY/Lia6dtkIz3J9wgw==";
+        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.16.tgz";
+        sha512 = "1YtdaoFUwQWiVfBnhIcMxb0U6ZH3uyk9asfjluW9d6GsUTWczY+PNKZWukIQT1dtpr4+LcOw+F5oSTnzux/Mpg==";
       };
     };
-    "@fluentui/react-window-provider-0.3.3" = {
+    "@fluentui/react-window-provider-1.0.1" = {
       name = "_at_fluentui_slash_react-window-provider";
       packageName = "@fluentui/react-window-provider";
-      version = "0.3.3";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-0.3.3.tgz";
-        sha512 = "MVPf2hqOQ17LAZsuvGcr3oOHksAskUm+fCYdXFhbVoAgsCDVTIuH6i8XgHFd6YjBtzjZmI4+k/3NTQfDqBX8EQ==";
+        url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-1.0.1.tgz";
+        sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w==";
       };
     };
-    "@fluentui/theme-1.5.1" = {
+    "@fluentui/theme-1.5.4" = {
       name = "_at_fluentui_slash_theme";
       packageName = "@fluentui/theme";
-      version = "1.5.1";
+      version = "1.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.5.1.tgz";
-        sha512 = "w5986/CN3hWuH44WmlQNxtndBx0khnb1xjISb/4bktRpehYxIlDBmQYRUOUYXr6zwdK7JXJaJPGjOJzSh2DCDg==";
+        url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.5.4.tgz";
+        sha512 = "f89jKHET6/f4Z+BzKzs1YXA3mAsBBIDSOtc5ZXfNwYcKPJ0ZqKYtplRz668LcvHdz1ysMR0XxtA0Y5eNUXyLxw==";
       };
     };
     "@graphql-cli/common-4.1.0" = {
@@ -2128,22 +2245,31 @@ let
         sha512 = "RNhQk0jMz6fZB4Ilu37PZj6YUQgSEZJrppXlaHpw/xYyDelcjYKZg/z9eMvYo6rxQPR2mGXjoj6by+zew1WgOw==";
       };
     };
-    "@graphql-tools/delegate-6.2.4" = {
-      name = "_at_graphql-tools_slash_delegate";
-      packageName = "@graphql-tools/delegate";
-      version = "6.2.4";
+    "@graphql-tools/batch-execute-7.0.0" = {
+      name = "_at_graphql-tools_slash_batch-execute";
+      packageName = "@graphql-tools/batch-execute";
+      version = "7.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.4.tgz";
-        sha512 = "mXe6DfoWmq49kPcDrpKHgC2DSWcD5q0YCaHHoXYPAOlnLH8VMTY8BxcE8y/Do2eyg+GLcwAcrpffVszWMwqw0w==";
+        url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-7.0.0.tgz";
+        sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q==";
       };
     };
-    "@graphql-tools/graphql-file-loader-6.2.4" = {
+    "@graphql-tools/delegate-7.0.3" = {
+      name = "_at_graphql-tools_slash_delegate";
+      packageName = "@graphql-tools/delegate";
+      version = "7.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.3.tgz";
+        sha512 = "BSRF/Wg9XNllWo3Kdt0QBBaFltexn3vAnTOWH1qLrNcmfQAvUMf17/TsAqH9ZLSKU1NW9XCOsd7YMHhhUuTCEg==";
+      };
+    };
+    "@graphql-tools/graphql-file-loader-6.2.5" = {
       name = "_at_graphql-tools_slash_graphql-file-loader";
       packageName = "@graphql-tools/graphql-file-loader";
-      version = "6.2.4";
+      version = "6.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.4.tgz";
-        sha512 = "IcdUZoOlkCGr0KO8QCO8G031CDDv5dzHBZeN5H1gzE2AVFFwn2AexysrUXBxftm2DQIOuV+Knap7dC4Ol54kNA==";
+        url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.5.tgz";
+        sha512 = "vYDn71FHqwCxWgw8swoVOsD5C0xGz/Lw4zUQnPcgZfAzhAAwl6e/rVWl/HF1UNNSf5CSZu+2oidjOWCI5Wl6Gg==";
       };
     };
     "@graphql-tools/import-6.2.4" = {
@@ -2155,13 +2281,13 @@ let
         sha512 = "Q6fk6hbtDevoEVcgwb3WRn7XOqGY4MnX3Mvc+x8/b8k4RZ4wT+0WSLRDXGAKiVKRxGhgouU2lZVnGE/LDrGSCg==";
       };
     };
-    "@graphql-tools/json-file-loader-6.2.4" = {
+    "@graphql-tools/json-file-loader-6.2.5" = {
       name = "_at_graphql-tools_slash_json-file-loader";
       packageName = "@graphql-tools/json-file-loader";
-      version = "6.2.4";
+      version = "6.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.4.tgz";
-        sha512 = "1iL6wwZrUt888hExlNEloSpNXuuUFYD2KV2FZ82t6yiq6bO9Iyg12SUuGd5xVXx9jUkdaHRZc0plMyuIA6gTGA==";
+        url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.5.tgz";
+        sha512 = "9LS7WuQdSHlRUvXD7ixt5aDpr3hWsueURHOaWe7T0xZ+KWMTw+LIRtWIliCRzbjNmZ+4ZhwHB3Vc1SO2bfYLgg==";
       };
     };
     "@graphql-tools/load-6.2.4" = {
@@ -2173,31 +2299,31 @@ let
         sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg==";
       };
     };
-    "@graphql-tools/merge-6.2.4" = {
+    "@graphql-tools/merge-6.2.5" = {
       name = "_at_graphql-tools_slash_merge";
       packageName = "@graphql-tools/merge";
-      version = "6.2.4";
+      version = "6.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.4.tgz";
-        sha512 = "hQbiSzCJgzUYG1Aspj5EAUY9DsbTI2OK30GLBOjUI16DWkoLVXLXy4ljQYJxq6wDc4fqixMOmvxwf8FoJ9okmw==";
+        url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.5.tgz";
+        sha512 = "T2UEm7L5MeS1ggbGKBkdV9kTqLqSHQM13RrjPzIAYzkFL/mK837sf+oq8h2+R8B+senuHX8akUhMTcU85kcMvw==";
       };
     };
-    "@graphql-tools/schema-6.2.4" = {
+    "@graphql-tools/schema-7.0.0" = {
       name = "_at_graphql-tools_slash_schema";
       packageName = "@graphql-tools/schema";
-      version = "6.2.4";
+      version = "7.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.4.tgz";
-        sha512 = "rh+14lSY1q8IPbEv2J9x8UBFJ5NrDX9W5asXEUlPp+7vraLp/Tiox4GXdgyA92JhwpYco3nTf5Bo2JDMt1KnAQ==";
+        url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.0.0.tgz";
+        sha512 = "yDKgoT2+Uf3cdLYmiFB9lRIGsB6lZhILtCXHgZigYgURExrEPmfj3ZyszfEpPKYcPmKaO9FI4coDhIN0Toxl3w==";
       };
     };
-    "@graphql-tools/url-loader-6.3.0" = {
+    "@graphql-tools/url-loader-6.3.2" = {
       name = "_at_graphql-tools_slash_url-loader";
       packageName = "@graphql-tools/url-loader";
-      version = "6.3.0";
+      version = "6.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.3.0.tgz";
-        sha512 = "lX6A22Rhbqj8FHmkCVSDflolOGy7UtCJGtGbfRuv8/VqD94JfJLnGVFxC1jODURFdj+yrs/97Wm/ntRcpy7nDA==";
+        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.3.2.tgz";
+        sha512 = "nrrZD33T7lFeOjIufCrwk2PAHYqFtdFcb1pe1ULWnvuFmFuhZnRCgIsfCsoy+WOMwmZHQ/eXBem//I/bewXlgw==";
       };
     };
     "@graphql-tools/utils-6.2.4" = {
@@ -2209,13 +2335,22 @@ let
         sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg==";
       };
     };
-    "@graphql-tools/wrap-6.2.4" = {
+    "@graphql-tools/utils-7.0.2" = {
+      name = "_at_graphql-tools_slash_utils";
+      packageName = "@graphql-tools/utils";
+      version = "7.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.0.2.tgz";
+        sha512 = "VQQ7krHeoXO0FS3qbWsb/vZb8c8oyiCYPIH4RSgeK9SKOUpatWYt3DW4jmLmyHZLVVMk0yjUbsOhKTBEMejKSA==";
+      };
+    };
+    "@graphql-tools/wrap-7.0.1" = {
       name = "_at_graphql-tools_slash_wrap";
       packageName = "@graphql-tools/wrap";
-      version = "6.2.4";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.4.tgz";
-        sha512 = "cyQgpybolF9DjL2QNOvTS1WDCT/epgYoiA8/8b3nwv5xmMBQ6/6nYnZwityCZ7njb7MMyk7HBEDNNlP9qNJDcA==";
+        url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-7.0.1.tgz";
+        sha512 = "0feqjgEJSRLm2V0kEUaV2dw7ukVPjRujYMqNdcqHsIyXmf0VO8PGF5hcva/+5U/9Yfbf3Fck+P5JTJ5MlXPlsQ==";
       };
     };
     "@gulp-sourcemaps/identity-map-1.0.2" = {
@@ -2335,6 +2470,15 @@ let
         sha512 = "tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==";
       };
     };
+    "@heroku-cli/color-1.1.14" = {
+      name = "_at_heroku-cli_slash_color";
+      packageName = "@heroku-cli/color";
+      version = "1.1.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@heroku-cli/color/-/color-1.1.14.tgz";
+        sha512 = "2JYy//YE2YINTe21hpdVMBNc7aYFkgDeY9JUz/BCjFZmYLn0UjGaCc4BpTcMGXNJwuqoUenw2WGOFGHsJqlIDw==";
+      };
+    };
     "@iarna/toml-2.2.5" = {
       name = "_at_iarna_slash_toml";
       packageName = "@iarna/toml";
@@ -3334,13 +3478,13 @@ let
         sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q==";
       };
     };
-    "@microsoft/load-themed-styles-1.10.114" = {
+    "@microsoft/load-themed-styles-1.10.125" = {
       name = "_at_microsoft_slash_load-themed-styles";
       packageName = "@microsoft/load-themed-styles";
-      version = "1.10.114";
+      version = "1.10.125";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.114.tgz";
-        sha512 = "baefCOffrEAN86rNBY5uVFt1hEH3DMhMVqeKwmbf1L0u51r0KhvMCdQVS9YRi4VHbiufiea2g7vlFf51RDatkQ==";
+        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.125.tgz";
+        sha512 = "qig3jfhrlwvK0tDQc3mrEbg6hUt432FDK4y3zJH9upT068Qrk40s6J62Kv7YW+lIMfX5h/tTi5Y/RyvqwcM+Nw==";
       };
     };
     "@mozilla/readability-0.3.0" = {
@@ -3370,13 +3514,13 @@ let
         sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg==";
       };
     };
-    "@nestjs/schematics-7.1.2" = {
+    "@nestjs/schematics-7.1.3" = {
       name = "_at_nestjs_slash_schematics";
       packageName = "@nestjs/schematics";
-      version = "7.1.2";
+      version = "7.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.1.2.tgz";
-        sha512 = "iUszxXz5cFEZFKKFQGyjx0+U5Emj7ix1rhXmHw1v63xhazlgTbT6XPxf247CTP0uyVkcflWkiVi+JawWWix16A==";
+        url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.1.3.tgz";
+        sha512 = "13YU6H8Cw+GwtIfclSBeiswlzdM2Z9tMN4ZWiveyok0Fmi/8t6mxGHDw3bWPv8wGkd1bWz0PVCC2CjUGkHmcGg==";
       };
     };
     "@netflix/nerror-1.1.3" = {
@@ -3388,22 +3532,22 @@ let
         sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
       };
     };
-    "@netlify/build-5.0.2" = {
+    "@netlify/build-5.2.1" = {
       name = "_at_netlify_slash_build";
       packageName = "@netlify/build";
-      version = "5.0.2";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/build/-/build-5.0.2.tgz";
-        sha512 = "onXVJtddOP16XuqDTMhorbOObx/z4kMT7E9+h/q1+530D7PNb0ld/38je/xFNjHuysF8nFCinokQIaTt1ySpzg==";
+        url = "https://registry.npmjs.org/@netlify/build/-/build-5.2.1.tgz";
+        sha512 = "o08VdNJmJvsxGvFkFScpgznrk+lkG72Rv7VHW+K4WkFXsYjbcitM5zjoQizSZwxgQ8/iee9EZn+8zWwjf/K1tw==";
       };
     };
-    "@netlify/cache-utils-1.0.4" = {
+    "@netlify/cache-utils-1.0.6" = {
       name = "_at_netlify_slash_cache-utils";
       packageName = "@netlify/cache-utils";
-      version = "1.0.4";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.4.tgz";
-        sha512 = "edIFfOTcJPlQSdJ5KF91ui7aHaYGzjmmdlWau1QHppym4AMajMKosWPoaOgl/SJ563oUNydYoEOP1nwP89//aw==";
+        url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.6.tgz";
+        sha512 = "Pz/TzLZhMUACT+X7Un6jZCXgEUwLPVNbx69DQtEOMZ6hNBE1b1ErTHFbSaHA0KfDn/yqCII5vS274DERvNuRwg==";
       };
     };
     "@netlify/config-0.11.11" = {
@@ -3415,31 +3559,31 @@ let
         sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw==";
       };
     };
-    "@netlify/config-2.3.4" = {
+    "@netlify/config-2.3.6" = {
       name = "_at_netlify_slash_config";
       packageName = "@netlify/config";
-      version = "2.3.4";
+      version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/config/-/config-2.3.4.tgz";
-        sha512 = "toowJoJ3XE10iHxVWUTYeJL1bLx0N9mDKr2Qidk10UmqJqX8HrIb5pqxtnOxXM+ED+dcdVL++iBvMBNQVIZmmQ==";
+        url = "https://registry.npmjs.org/@netlify/config/-/config-2.3.6.tgz";
+        sha512 = "50cK+lEnmZdN1Es1jeiiBV8kT5tKbRK9yp4qlUo1CYp3MJxw4RY/duoYnCAy/D1wbdV5poDM5gZpHS+dxF7nmQ==";
       };
     };
-    "@netlify/functions-utils-1.2.10" = {
+    "@netlify/functions-utils-1.3.2" = {
       name = "_at_netlify_slash_functions-utils";
       packageName = "@netlify/functions-utils";
-      version = "1.2.10";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.2.10.tgz";
-        sha512 = "dgoCm8eLz4F0Jri6sfcv8NR2F7O9SGskh9rnB5UZQ/HqMoBy1Zbab6nsQvwOYUyjRQ6VibXopT2qHNpxYKlQ/g==";
+        url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.2.tgz";
+        sha512 = "1/Jw1p4zxORIC8Nkglzf7bQEIjuALHFfi2e8tEqQfQUZ6pbBNy8bP3pcXZKpYc+fkrYKQaaqpKrfr+GjPHnT2Q==";
       };
     };
-    "@netlify/git-utils-1.0.4" = {
+    "@netlify/git-utils-1.0.6" = {
       name = "_at_netlify_slash_git-utils";
       packageName = "@netlify/git-utils";
-      version = "1.0.4";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.4.tgz";
-        sha512 = "ZB8X/uU3tcQdR6E2//ZLudEP8RUeRDkDX8PWg6gq6Aaisqjkaqg8OL68jYbIEyd09DrmXuM18KK3WMvYdZ7Wnw==";
+        url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.6.tgz";
+        sha512 = "JpuvzCTf9QXVEgVA4mSshH6fi9Dtg0Pqe5d19yaN2f1H9DNnWro3kJUaoR68Hfo0rBls6kYwWJuNZ/csb03VuQ==";
       };
     };
     "@netlify/open-api-0.18.1" = {
@@ -3451,31 +3595,67 @@ let
         sha512 = "kkRCzA71HugJxmPOcWv2B4ArHhSMKjs2ArGBr10ndocVLdAHwCYoJm0X4Xt8IYaOcGD9Lm4fbLjpXDLDRGDzPw==";
       };
     };
-    "@netlify/plugin-edge-handlers-1.8.0" = {
+    "@netlify/plugin-edge-handlers-1.9.0" = {
       name = "_at_netlify_slash_plugin-edge-handlers";
       packageName = "@netlify/plugin-edge-handlers";
-      version = "1.8.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.8.0.tgz";
-        sha512 = "eOU3P8GgRSMKXZWBxMeLZYX3UUwq/w5Hn6BiUyroJ57UkxHFzMsIcsIryt/KW5vKEiLo/pvYZyU0S4WVcbHbWA==";
+        url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.9.0.tgz";
+        sha512 = "5JRVj9lVxG3VKI3vUk95AkS2ZatDHEcOBPZ5En4j+vKlfwQpn0oCbTbHQ5V45Zf0dKZv3rULAYZ//vHmVIH/Nw==";
       };
     };
-    "@netlify/run-utils-1.0.3" = {
+    "@netlify/run-utils-1.0.5" = {
       name = "_at_netlify_slash_run-utils";
       packageName = "@netlify/run-utils";
-      version = "1.0.3";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.3.tgz";
-        sha512 = "o3U+F2vBuTjl84d5EgV0duImNVtPdMjh2MWs9YgI3Gy4rJLVQbQgPezlFV1PvDrgTMBG14iTTZKjaxFXpsA/sg==";
+        url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.5.tgz";
+        sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q==";
       };
     };
-    "@netlify/zip-it-and-ship-it-1.3.12" = {
+    "@netlify/traffic-mesh-agent-0.24.0-pre.23" = {
+      name = "_at_netlify_slash_traffic-mesh-agent";
+      packageName = "@netlify/traffic-mesh-agent";
+      version = "0.24.0-pre.23";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.24.0-pre.23.tgz";
+        sha512 = "uv5F3grah5C0CPGm8raASIyVDi+lYBR4os+wG0GXkUVCU2r2Pcl8MStLeN3phe1G3AjVkco5WcAKC8XfBvvqEw==";
+      };
+    };
+    "@netlify/traffic-mesh-agent-darwin-x64-0.24.0-pre.23" = {
+      name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64";
+      packageName = "@netlify/traffic-mesh-agent-darwin-x64";
+      version = "0.24.0-pre.23";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.24.0-pre.23.tgz";
+        sha512 = "XDn77F+tx+qQZ9sMwqmwRAOEm56syA7xO1rScDY4JV8oSyvwa6sfUWnFXefyxUt1uLNfIQhiKDnA4sOyCRJxDw==";
+      };
+    };
+    "@netlify/traffic-mesh-agent-linux-x64-0.24.0-pre.23" = {
+      name = "_at_netlify_slash_traffic-mesh-agent-linux-x64";
+      packageName = "@netlify/traffic-mesh-agent-linux-x64";
+      version = "0.24.0-pre.23";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.24.0-pre.23.tgz";
+        sha512 = "9D2sFOcO72IBsqiHgU1Z5tQ6+lvjRBUeOc0iFKgcUPG5eJ46pgrOAD8B8tNd2FscNz2lyrJxZc1kGAOjYikzUQ==";
+      };
+    };
+    "@netlify/traffic-mesh-agent-win32-x64-0.24.0-pre.23" = {
+      name = "_at_netlify_slash_traffic-mesh-agent-win32-x64";
+      packageName = "@netlify/traffic-mesh-agent-win32-x64";
+      version = "0.24.0-pre.23";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.24.0-pre.23.tgz";
+        sha512 = "kFImydqG6Er+kgG5UFjIWBp7TxFcf/eOoXSOWr6a+3kJu2iwZP2IdflyNK9EsKdW/KA+W43PXleF4VQwLm830w==";
+      };
+    };
+    "@netlify/zip-it-and-ship-it-1.4.0" = {
       name = "_at_netlify_slash_zip-it-and-ship-it";
       packageName = "@netlify/zip-it-and-ship-it";
-      version = "1.3.12";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.3.12.tgz";
-        sha512 = "FQM/59HXMAKp9k4z6rXDA/FBKFSUaU3n5SFpF2/jScmpCmHBpF+pYIWZmVB4fY17cvq3KIcuSfzf9PqD1B73XQ==";
+        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.4.0.tgz";
+        sha512 = "xPJDEMkHnIoHk19enEbg4qiIwszXS8XOUi8UpD4YMA81GXGT0xi16Z17kOACipDG6Tmmy5Jl6pe3cKqQvM/WyQ==";
       };
     };
     "@node-red/editor-api-1.2.2" = {
@@ -3613,22 +3793,22 @@ let
         sha512 = "pBqoKPWmuk9iaEcXlLBVRIA6I1kG9JiICU+sG0NuD6NAR461F+02elHJS4WkQxHW2W5rnsfvP/ClKwmsZ9RaaA==";
       };
     };
-    "@npmcli/promise-spawn-1.2.0" = {
+    "@npmcli/promise-spawn-1.3.2" = {
       name = "_at_npmcli_slash_promise-spawn";
       packageName = "@npmcli/promise-spawn";
-      version = "1.2.0";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.2.0.tgz";
-        sha512 = "nFtqjVETliApiRdjbYwKwhlSHx2ZMagyj5b9YbNt0BWeeOVxJd47ZVE2u16vxDHyTOZvk+YLV7INwfAE9a2uow==";
+        url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz";
+        sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==";
       };
     };
-    "@npmcli/run-script-1.7.2" = {
+    "@npmcli/run-script-1.7.4" = {
       name = "_at_npmcli_slash_run-script";
       packageName = "@npmcli/run-script";
-      version = "1.7.2";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.7.2.tgz";
-        sha512 = "EZO9uXrZrfzdIJsNi/WwrP2jt1P0lbFSxOq15ljgYn1/rr4UyQXUKBZRURioFVbUb7Z1BJDEKswnWrtRybZPzw==";
+        url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.7.4.tgz";
+        sha512 = "GAeOB6P4/aYyvEbROVHXuSGPgy4wwQN/fGfXP993o9btyuCAOaz0T2cr5Y1y4nSeaBPfhk5W/E/AfFKDt6yG7w==";
       };
     };
     "@oclif/color-0.1.2" = {
@@ -3685,6 +3865,15 @@ let
         sha512 = "yojzeEfmSxjjkAvMRj0KzspXlMjCfBzNRPkWw8ZwOSoNWoJn+OCS/m/S+yfV6BvAM4u2lTzX9Y5rCbrFIgkJLg==";
       };
     };
+    "@oclif/plugin-autocomplete-0.1.5" = {
+      name = "_at_oclif_slash_plugin-autocomplete";
+      packageName = "@oclif/plugin-autocomplete";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.1.5.tgz";
+        sha512 = "Afchpdd8FNfx9GaU/1D9IzyfiXvjfGybgzQ6G4GTFvPO0/hLdkXX3YyYq+SnxE6/bCrhg4pleiB+GuJACmmkEA==";
+      };
+    };
     "@oclif/plugin-autocomplete-0.2.0" = {
       name = "_at_oclif_slash_plugin-autocomplete";
       packageName = "@oclif/plugin-autocomplete";
@@ -3694,6 +3883,15 @@ let
         sha512 = "pHbaE2PH7d9lHjCgFrrQ+ZIwvY+7OAQaGoaANqDbicBNDK/Rszt4N4oGj22dJT7sCQ8a/3Eh942rjxYIq9Mi9Q==";
       };
     };
+    "@oclif/plugin-help-1.2.11" = {
+      name = "_at_oclif_slash_plugin-help";
+      packageName = "@oclif/plugin-help";
+      version = "1.2.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-1.2.11.tgz";
+        sha512 = "tuzhvxxRtfLnWa96klngXBi5IwHt9S/twedCbQhl9dYIKTFMHI1BcOQcPra6ylct+M+b9jhEF5sjWLv78tB6tw==";
+      };
+    };
     "@oclif/plugin-help-2.2.3" = {
       name = "_at_oclif_slash_plugin-help";
       packageName = "@oclif/plugin-help";
@@ -3757,22 +3955,22 @@ let
         sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw==";
       };
     };
-    "@octokit/auth-token-2.4.2" = {
+    "@octokit/auth-token-2.4.3" = {
       name = "_at_octokit_slash_auth-token";
       packageName = "@octokit/auth-token";
-      version = "2.4.2";
+      version = "2.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.2.tgz";
-        sha512 = "jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ==";
+        url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.3.tgz";
+        sha512 = "fdGoOQ3kQJh+hrilc0Plg50xSfaCKOeYN9t6dpJKXN9BxhhfquL0OzoQXg3spLYymL5rm29uPeI3KEXRaZQ9zg==";
       };
     };
-    "@octokit/endpoint-6.0.8" = {
+    "@octokit/endpoint-6.0.9" = {
       name = "_at_octokit_slash_endpoint";
       packageName = "@octokit/endpoint";
-      version = "6.0.8";
+      version = "6.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.8.tgz";
-        sha512 = "MuRrgv+bM4Q+e9uEvxAB/Kf+Sj0O2JAOBA131uo1o6lgdq1iS8ejKwtqHgdfY91V3rN9R/hdGKFiQYMzVzVBEQ==";
+        url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.9.tgz";
+        sha512 = "3VPLbcCuqji4IFTclNUtGdp9v7g+nspWdiCUbK3+iPMjJCZ6LEhn1ts626bWLOn0GiDb6j+uqGvPpqLnY7pBgw==";
       };
     };
     "@octokit/plugin-enterprise-rest-6.0.1" = {
@@ -3793,13 +3991,13 @@ let
         sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q==";
       };
     };
-    "@octokit/plugin-request-log-1.0.0" = {
+    "@octokit/plugin-request-log-1.0.2" = {
       name = "_at_octokit_slash_plugin-request-log";
       packageName = "@octokit/plugin-request-log";
-      version = "1.0.0";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz";
-        sha512 = "ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw==";
+        url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz";
+        sha512 = "oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg==";
       };
     };
     "@octokit/plugin-rest-endpoint-methods-2.4.0" = {
@@ -3811,13 +4009,13 @@ let
         sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==";
       };
     };
-    "@octokit/request-5.4.9" = {
+    "@octokit/request-5.4.10" = {
       name = "_at_octokit_slash_request";
       packageName = "@octokit/request";
-      version = "5.4.9";
+      version = "5.4.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.9.tgz";
-        sha512 = "CzwVvRyimIM1h2n9pLVYfTDmX9m+KHSgCpqPsY8F1NdEK8IaWqXhSBXsdjOBFZSpEcxNEeg4p0UO9cQ8EnOCLA==";
+        url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.10.tgz";
+        sha512 = "egA49HkqEORVGDZGav1mh+VD+7uLgOxtn5oODj6guJk0HCy+YBSYapFkSLFgeYj3Fr18ZULKGURkjyhkAChylw==";
       };
     };
     "@octokit/request-error-1.2.1" = {
@@ -3829,13 +4027,13 @@ let
         sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==";
       };
     };
-    "@octokit/request-error-2.0.2" = {
+    "@octokit/request-error-2.0.3" = {
       name = "_at_octokit_slash_request-error";
       packageName = "@octokit/request-error";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.2.tgz";
-        sha512 = "2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw==";
+        url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.3.tgz";
+        sha512 = "GgD5z8Btm301i2zfvJLk/mkhvGCdjQ7wT8xF9ov5noQY8WbKZDH9cOBqXzoeKd1mLr1xH2FwbtGso135zGBgTA==";
       };
     };
     "@octokit/rest-16.43.2" = {
@@ -3991,13 +4189,13 @@ let
         sha512 = "uc6FmPEegAZawSHjUMFQwU7EjaDn7zy1iD/KD/wBROL9F4378OES8MKMYHoRAKT61Fk7LxVKZSDR5VespMQiqw==";
       };
     };
-    "@prettier/plugin-pug-1.9.0" = {
+    "@prettier/plugin-pug-1.10.1" = {
       name = "_at_prettier_slash_plugin-pug";
       packageName = "@prettier/plugin-pug";
-      version = "1.9.0";
+      version = "1.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.9.0.tgz";
-        sha512 = "doLga3EPMPiUgO98aUWXoq8YuPLIwUWX0YbwqnSg2URQ7hKGjxlyEeVlAmrERVI3mm9zbwpEEZ02jw0ROd+5+g==";
+        url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.10.1.tgz";
+        sha512 = "HyX0FN8pGdumKS1eiVJ8jbYh8bx2DdbvBOpuKf4+SNP1Z8OFDZorl/q4ShH7oCqMAnFj2kFCpZkuIOkD6gZv7Q==";
       };
     };
     "@primer/octicons-11.0.0" = {
@@ -4144,6 +4342,15 @@ let
         sha512 = "s4f489h5+EJksn4CfheLgv5PGOM0CDmK1UEBLw2t/ncWs3cW2VI7vXzndcd/WJHTv3GntJhXDcJMuL+Z2IAOgg==";
       };
     };
+    "@redocly/react-dropdown-aria-2.0.11" = {
+      name = "_at_redocly_slash_react-dropdown-aria";
+      packageName = "@redocly/react-dropdown-aria";
+      version = "2.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@redocly/react-dropdown-aria/-/react-dropdown-aria-2.0.11.tgz";
+        sha512 = "rmuSC2JFFl4DkPDdGVrmffT9KcbG2AB5jvhxPIrOc1dO9mHRMUUftQY35KZlvWqqSSqVn+AM+J9dhiTo1ZqR8A==";
+      };
+    };
     "@rollup/plugin-babel-5.2.1" = {
       name = "_at_rollup_slash_plugin-babel";
       packageName = "@rollup/plugin-babel";
@@ -4234,13 +4441,13 @@ let
         sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==";
       };
     };
-    "@schematics/angular-10.1.7" = {
+    "@schematics/angular-10.2.0" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "10.1.7";
+      version = "10.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.7.tgz";
-        sha512 = "jcyLWDSbpgHvB/BNVSsV4uLJpC2qRx9Z5+rcQpBB1BerqIPS/1cTQg7TViHZtcqnZqWvzHR3jfqzDUSOCZpuJQ==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.2.0.tgz";
+        sha512 = "rJRTTTL8CMMFb3ebCvAVHKHxuNzRqy/HtbXhJ82l5Xo/jXcm74eV2Q0RBUrNo1yBKWFIR+FIwiXLJaGcC/R9Pw==";
       };
     };
     "@schematics/schematics-0.1000.7" = {
@@ -4252,13 +4459,13 @@ let
         sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw==";
       };
     };
-    "@schematics/update-0.1001.7" = {
+    "@schematics/update-0.1002.0" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.1001.7";
+      version = "0.1002.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.7.tgz";
-        sha512 = "q7g/9YaAiqyWxYmUXiSWxB9xwc30xL5iUWY3Rp2LXSH6ihaRsLabmNr743R2YQmMj2Ss+9OhILHmj7nMmqODgw==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.1002.0.tgz";
+        sha512 = "g2bfJSAj3x/YL0GNhnHsDSQmO6DoxSnLxoFLqNN5+ukxK5jq7OZNDwMJGxZ3X6RcSMWKEkIKL/wlq9yhj2T/kw==";
       };
     };
     "@segment/loosely-validate-event-2.0.0" = {
@@ -4288,13 +4495,13 @@ let
         sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
       };
     };
-    "@serverless/components-3.2.4" = {
+    "@serverless/components-3.3.0" = {
       name = "_at_serverless_slash_components";
       packageName = "@serverless/components";
-      version = "3.2.4";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/components/-/components-3.2.4.tgz";
-        sha512 = "J1iCygYu4ol9f3N1I0qkAZjCYxJ46l3bAc+MtIgWtuYc8ItmlqcoukOkTaOuUGM7I4ZoDiDBuK+Q9N8pxhokdw==";
+        url = "https://registry.npmjs.org/@serverless/components/-/components-3.3.0.tgz";
+        sha512 = "QEjWK9jsIXMh9j/my8HJDtS04bL0TtiLPIr50jfPMUkqnl51thZGHswNwkkuCsmnvcQhZGspD68hIqWPlQRjMw==";
       };
     };
     "@serverless/core-1.1.2" = {
@@ -4333,13 +4540,13 @@ let
         sha512 = "zTJBhzjWtDBogLFnzoz6NYiQ6CThsxuvHQxSbBLcNK4+VQPIkrZOxaQ+dNCNLeLN1Tb3NnZDPNGkoThvgGwq3Q==";
       };
     };
-    "@serverless/platform-client-china-2.0.5" = {
+    "@serverless/platform-client-china-2.0.7" = {
       name = "_at_serverless_slash_platform-client-china";
       packageName = "@serverless/platform-client-china";
-      version = "2.0.5";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.5.tgz";
-        sha512 = "AiIPHv1Dzxxh5lB8FCyumsP7hQL+JsN8AxMUEVMTN21IKZC+MvQI6dpYaKgE8EXfQdWq+wuV0xRsgadlHycmkw==";
+        url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.7.tgz";
+        sha512 = "SuHCHqwCjZXODdSlgetXFGksz+ksAWy3kbCpFhAC9nkiFSWR01CLX4a6UW+VhOeb6j6F3wbkczzqi38P17+USg==";
       };
     };
     "@serverless/platform-sdk-2.3.2" = {
@@ -4351,13 +4558,13 @@ let
         sha512 = "JSX0/EphGVvnb4RAgZYewtBXPuVsU2TFCuXh6EEZ4jxK3WgUwNYeYdwB8EuVLrm1/dYqu/UWUC0rPKb+ZDycJg==";
       };
     };
-    "@serverless/template-1.1.3" = {
+    "@serverless/template-1.1.4" = {
       name = "_at_serverless_slash_template";
       packageName = "@serverless/template";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/template/-/template-1.1.3.tgz";
-        sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ==";
+        url = "https://registry.npmjs.org/@serverless/template/-/template-1.1.4.tgz";
+        sha512 = "LYC+RmSD4ozStdCxSHInpVWP8h+0sSa0lmPGjAb1Fw4Ppk+LCJqJTrohbhHmF2ixgaIBu6ceNtVTB4qM+2NvIA==";
       };
     };
     "@serverless/utils-1.2.0" = {
@@ -4378,13 +4585,13 @@ let
         sha512 = "yZQT2f8LIZZlH2ibAIvK4C/Ks72Y8CIWmGz04XGCLPHa/ANA6KqlXTKV6zWg/n1PDy2yj2zgX+m509VpIZuDeQ==";
       };
     };
-    "@serverless/utils-china-1.0.7" = {
+    "@serverless/utils-china-1.0.9" = {
       name = "_at_serverless_slash_utils-china";
       packageName = "@serverless/utils-china";
-      version = "1.0.7";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.7.tgz";
-        sha512 = "qE6vzzMbbJc7/ywIUK3ufcZhLlkmjv0yB2rQJkyPnEoauYGa+v1PiGdPOt3u7wty6duTDBUjlR7VgU5HSvTtEA==";
+        url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.9.tgz";
+        sha512 = "NUwRAvhVMr9pUwFMNhpb3uxslyCua2ORJH35A/x6OZVKEfGWXvdRU5wUpZvtIIes6qZ4t18plMQi1D0f7Ki8/Q==";
       };
     };
     "@sindresorhus/is-0.14.0" = {
@@ -4423,6 +4630,15 @@ let
         sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ==";
       };
     };
+    "@sindresorhus/is-4.0.0" = {
+      name = "_at_sindresorhus_slash_is";
+      packageName = "@sindresorhus/is";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.0.tgz";
+        sha512 = "FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ==";
+      };
+    };
     "@sindresorhus/slugify-1.1.0" = {
       name = "_at_sindresorhus_slash_slugify";
       packageName = "@sindresorhus/slugify";
@@ -4495,6 +4711,15 @@ let
         sha512 = "h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw==";
       };
     };
+    "@snyk/dep-graph-1.20.0" = {
+      name = "_at_snyk_slash_dep-graph";
+      packageName = "@snyk/dep-graph";
+      version = "1.20.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.20.0.tgz";
+        sha512 = "/TOzXGh+JFgAu8pWdo1oLFKDNfFk99TnSQG2lbEu+vKLI2ZrGAk9oGO0geNogAN7Ib4EDQOEhgb7YwqwL7aA7w==";
+      };
+    };
     "@snyk/docker-registry-v2-client-1.13.6" = {
       name = "_at_snyk_slash_docker-registry-v2-client";
       packageName = "@snyk/docker-registry-v2-client";
@@ -4531,13 +4756,13 @@ let
         sha512 = "rxvSS9sz5h6fNjvUG6NhqYpUI8eok+xLTzLShfnSuDllI3JLxPMc/f7EKv5mv3GLlh1sVCCVXYeyIw3RAg5xQg==";
       };
     };
-    "@snyk/rpm-parser-2.2.0" = {
+    "@snyk/rpm-parser-2.2.1" = {
       name = "_at_snyk_slash_rpm-parser";
       packageName = "@snyk/rpm-parser";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.2.0.tgz";
-        sha512 = "aAZaMgmmXZ4hzSRwrpUA2nkAokU+R4ZmaUvVSL4lCyKvt1Bf08b6OLBhJ/z1iJHNsk9IPmzcHr56GUlJX0KeTA==";
+        url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.2.1.tgz";
+        sha512 = "OAON0bPf3c5fgM/GK9DX0aZErB6SnuRyYlPH0rqI1TXGsKrYnVELhaE6ctNbEfPTQuY9r6q0vM+UYDaFM/YliA==";
       };
     };
     "@snyk/snyk-cocoapods-plugin-2.5.1" = {
@@ -4873,13 +5098,13 @@ let
         sha512 = "qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA==";
       };
     };
-    "@types/babel__core-7.1.10" = {
+    "@types/babel__core-7.1.12" = {
       name = "_at_types_slash_babel__core";
       packageName = "@types/babel__core";
-      version = "7.1.10";
+      version = "7.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz";
-        sha512 = "x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==";
+        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz";
+        sha512 = "wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==";
       };
     };
     "@types/babel__generator-7.6.2" = {
@@ -5008,22 +5233,22 @@ let
         sha512 = "t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog==";
       };
     };
-    "@types/cookies-0.7.4" = {
+    "@types/cookies-0.7.5" = {
       name = "_at_types_slash_cookies";
       packageName = "@types/cookies";
-      version = "0.7.4";
+      version = "0.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.4.tgz";
-        sha512 = "oTGtMzZZAVuEjTwCjIh8T8FrC8n/uwy+PG0yTvQcdZ7etoel7C7/3MSd7qrukENTgQtotG7gvBlBojuVs7X5rw==";
+        url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.5.tgz";
+        sha512 = "3+TAFSm78O7/bAeYdB8FoYGntuT87vVP9JKuQRL8sRhv9313LP2SpHHL50VeFtnyjIcb3UELddMk5Yt0eOSOkg==";
       };
     };
-    "@types/cors-2.8.7" = {
+    "@types/cors-2.8.8" = {
       name = "_at_types_slash_cors";
       packageName = "@types/cors";
-      version = "2.8.7";
+      version = "2.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.7.tgz";
-        sha512 = "sOdDRU3oRS7LBNTIqwDkPJyq0lpHYcbMTt0TrjzsXbk/e37hcLTH6eZX7CdbDeN0yJJvzw9hFBZkbtCSbk/jAQ==";
+        url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.8.tgz";
+        sha512 = "fO3gf3DxU2Trcbr75O7obVndW/X5k8rJNZkLXlQWStTHhP71PkRqjwPIEI0yMnJdg9R9OasjU+Bsr+Hr1xy/0w==";
       };
     };
     "@types/debug-0.0.30" = {
@@ -5161,15 +5386,6 @@ let
         sha512 = "RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA==";
       };
     };
-    "@types/express-serve-static-core-4.17.9" = {
-      name = "_at_types_slash_express-serve-static-core";
-      packageName = "@types/express-serve-static-core";
-      version = "4.17.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.9.tgz";
-        sha512 = "DG0BYg6yO+ePW+XoDENYz8zhNGC3jDDEpComMYn7WJc4mY1Us8Rw9ax2YhJXxpyk2SF47PQAoQ0YyVT1a0bEkA==";
-      };
-    };
     "@types/fancy-log-1.3.0" = {
       name = "_at_types_slash_fancy-log";
       packageName = "@types/fancy-log";
@@ -5233,13 +5449,13 @@ let
         sha512 = "AaXSrIF99SjjtPVNmCmYb388HML+PKEJb/xmj4SbL2ZO0hHuETZZzyDIKfOqaEoAHZEuX4sC+FRFrHYJoIby6A==";
       };
     };
-    "@types/graceful-fs-4.1.3" = {
+    "@types/graceful-fs-4.1.4" = {
       name = "_at_types_slash_graceful-fs";
       packageName = "@types/graceful-fs";
-      version = "4.1.3";
+      version = "4.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz";
-        sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==";
+        url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.4.tgz";
+        sha512 = "mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg==";
       };
     };
     "@types/graphlib-2.1.7" = {
@@ -5260,6 +5476,15 @@ let
         sha512 = "0TRyJD2o8vbkmJF8InppFcPVcXKk+Rvlg/xvpHBIndSJYpmDWfmtx/ZAtl4f3jR2vfarpTqYgj8MZuJssSoU7Q==";
       };
     };
+    "@types/hast-2.3.1" = {
+      name = "_at_types_slash_hast";
+      packageName = "@types/hast";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.1.tgz";
+        sha512 = "viwwrB+6xGzw+G1eWpF9geV3fnsDgXqHG+cqgiHrvQfDUW5hzhCyV7Sy3UJxhfRFBsgky2SSW33qi/YrIkjX5Q==";
+      };
+    };
     "@types/hls.js-0.13.1" = {
       name = "_at_types_slash_hls.js";
       packageName = "@types/hls.js";
@@ -5359,13 +5584,13 @@ let
         sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==";
       };
     };
-    "@types/jquery-3.5.3" = {
+    "@types/jquery-3.5.4" = {
       name = "_at_types_slash_jquery";
       packageName = "@types/jquery";
-      version = "3.5.3";
+      version = "3.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.3.tgz";
-        sha512 = "IENpHTjGksr2wQS6ZO8eMIE0tIB22Ywg+n3/yAWCa56VSZ26phcwAbFdh9+VNUWk7e83qB27QLax3Rf4G92Y9A==";
+        url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.4.tgz";
+        sha512 = "//9CHhaUt/rurMJTxGI+I6DmsNHgYU6d8aSLFfO5dB7+10lwLnaWT0z5GY/yY82Q/M+B+0Qh3TixlJ8vmBeqIw==";
       };
     };
     "@types/js-yaml-3.12.5" = {
@@ -5431,13 +5656,13 @@ let
         sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==";
       };
     };
-    "@types/koa-2.11.5" = {
+    "@types/koa-2.11.6" = {
       name = "_at_types_slash_koa";
       packageName = "@types/koa";
-      version = "2.11.5";
+      version = "2.11.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.5.tgz";
-        sha512 = "egP+ceD3+v9PnFW+DLTFO8mt6wa5sDqfGOBIwOAZ61Wzsq4bGZc5kMpJgcCwq7ARGIBfHBY+KkK/1RsMftV/qQ==";
+        url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.6.tgz";
+        sha512 = "BhyrMj06eQkk04C97fovEDQMpLpd2IxCB4ecitaXwOKGq78Wi2tooaDOWOFGajPk8IkQOAtMppApgSVkYe1F/A==";
       };
     };
     "@types/koa-compose-3.2.5" = {
@@ -5458,13 +5683,13 @@ let
         sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==";
       };
     };
-    "@types/lodash-4.14.162" = {
+    "@types/lodash-4.14.164" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
-      version = "4.14.162";
+      version = "4.14.164";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.162.tgz";
-        sha512 = "alvcho1kRUnnD1Gcl4J+hK0eencvzq9rmzvFPRmP5rPHx9VVsJj6bKLTATPVf9ktgv4ujzh7T+XWKp+jhuODig==";
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.164.tgz";
+        sha512 = "fXCEmONnrtbYUc5014avwBeMdhHHO8YJCkOBflUL9EoJBSKZ1dei+VO74fA7JkTHZ1GvZack2TyIw5U+1lT8jg==";
       };
     };
     "@types/long-4.0.1" = {
@@ -5566,13 +5791,13 @@ let
         sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw==";
       };
     };
-    "@types/node-10.17.40" = {
+    "@types/node-10.17.44" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.17.40";
+      version = "10.17.44";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.17.40.tgz";
-        sha512 = "3hZT2z2/531A5pc8hYhn1gU5Qb1SIRSgMLQ6zuHA5xtt16lWAxUGprtr8lJuc9zNJMXEIIBWfSnzqBP/4mglpA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.17.44.tgz";
+        sha512 = "vHPAyBX1ffLcy4fQHmDyIUMUb42gHZjPHU66nhvbMzAWJqHnySGZ6STwN3rwrnSd1FHB0DI/RWgGELgKSYRDmw==";
       };
     };
     "@types/node-12.7.12" = {
@@ -5584,13 +5809,13 @@ let
         sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==";
       };
     };
-    "@types/node-13.13.27" = {
+    "@types/node-13.13.30" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.13.27";
+      version = "13.13.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.13.27.tgz";
-        sha512 = "IeZlpkPnUqO45iBxJocIQzwV+K6phdSVaCxRwlvHHQ0YL+Gb1fvuv9GmIMYllZcjyzqoRKDNJeNo6p8dNWSPSQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.13.30.tgz";
+        sha512 = "HmqFpNzp3TSELxU/bUuRK+xzarVOAsR00hzcvM0TXrMlt/+wcSLa5q6YhTb6/cA6wqDCZLDcfd8fSL95x5h7AA==";
       };
     };
     "@types/node-14.11.1" = {
@@ -5602,13 +5827,13 @@ let
         sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==";
       };
     };
-    "@types/node-14.14.0" = {
+    "@types/node-14.14.6" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.0";
+      version = "14.14.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.0.tgz";
-        sha512 = "BfbIHP9IapdupGhq/hc+jT5dyiBVZ2DdeC5WwJWQWDb0GijQlzUFAeIQn/2GtvZcd2HVUU7An8felIICFTC2qg==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.6.tgz";
+        sha512 = "6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw==";
       };
     };
     "@types/node-6.14.13" = {
@@ -5620,22 +5845,22 @@ let
         sha512 = "J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw==";
       };
     };
-    "@types/node-8.10.65" = {
+    "@types/node-8.10.66" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "8.10.65";
+      version = "8.10.66";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.10.65.tgz";
-        sha512 = "xdcqtQl1g3p/49kmcj7ZixPWOcNHA1tYNz+uN0PJEcgtN6zywK74aacTnd3eFGPuBpD7kK8vowmMRkUt6jHU/Q==";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz";
+        sha512 = "tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==";
       };
     };
-    "@types/node-9.6.60" = {
+    "@types/node-9.6.61" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "9.6.60";
+      version = "9.6.61";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-9.6.60.tgz";
-        sha512 = "yoi9MNxtIwaN23LlUnqFiEjS13gg8tgYMCBR8AV34haAFuLswIdCpaYmOcoKLmhhOPwngbs0ZQG7I0EqWTsaRA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-9.6.61.tgz";
+        sha512 = "/aKAdg5c8n468cYLy2eQrcR5k6chlbNwZNGUj3TboyPa2hcO2QAJcfymlqPzMiRj8B6nYKXjzQz36minFE0RwQ==";
       };
     };
     "@types/node-fetch-2.5.7" = {
@@ -5899,13 +6124,13 @@ let
         sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==";
       };
     };
-    "@types/uglify-js-3.11.0" = {
+    "@types/uglify-js-3.11.1" = {
       name = "_at_types_slash_uglify-js";
       packageName = "@types/uglify-js";
-      version = "3.11.0";
+      version = "3.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.0.tgz";
-        sha512 = "I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q==";
+        url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz";
+        sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q==";
       };
     };
     "@types/unist-2.0.3" = {
@@ -5962,13 +6187,13 @@ let
         sha512 = "2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA==";
       };
     };
-    "@types/webpack-4.41.22" = {
+    "@types/webpack-4.41.24" = {
       name = "_at_types_slash_webpack";
       packageName = "@types/webpack";
-      version = "4.41.22";
+      version = "4.41.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.22.tgz";
-        sha512 = "JQDJK6pj8OMV9gWOnN1dcLCyU9Hzs6lux0wBO4lr1+gyEhIBR9U3FMrz12t2GPkg110XAxEAw2WHF6g7nZIbRQ==";
+        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.24.tgz";
+        sha512 = "1A0MXPwZiMOD3DPMuOKUKcpkdPo8Lq33UGggZ7xio6wJ/jV1dAu5cXDrOfGDnldUroPIRLsr/DT43/GqOA4RFQ==";
       };
     };
     "@types/webpack-sources-2.0.0" = {
@@ -5989,13 +6214,13 @@ let
         sha512 = "f5WLMpezwVxCLm1xQe/kdPpQIOmL0TXYx2O15VYfYzc7hTIdxiOoOvez+McSIw3b7z/1zGovew9YSL7+h4h7/Q==";
       };
     };
-    "@types/ws-7.2.7" = {
+    "@types/ws-7.2.9" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
-      version = "7.2.7";
+      version = "7.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.7.tgz";
-        sha512 = "UUFC/xxqFLP17hTva8/lVT0SybLUrfSD9c+iapKb0fEiC8uoDbA+xuZ3pAN603eW+bY8ebSMLm9jXdIPnD0ZgA==";
+        url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.9.tgz";
+        sha512 = "gmXYAXr7G4BrRMnkGQGkGonc3ArVro9VZd//C1uns/qqsJyl2dxaJdlPMhZbcq5MTxFFC+ttFWtHSfVW5+hlRA==";
       };
     };
     "@types/yargs-13.0.11" = {
@@ -6115,22 +6340,22 @@ let
         sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";
       };
     };
-    "@uifabric/foundation-7.9.14" = {
+    "@uifabric/foundation-7.9.18" = {
       name = "_at_uifabric_slash_foundation";
       packageName = "@uifabric/foundation";
-      version = "7.9.14";
+      version = "7.9.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.14.tgz";
-        sha512 = "AWsSt28+mid44YPofHB8N1nm4C0QmLJ9WXFps5GyjaBHES6/4bfJ7rKzYioa5bN0TxElyK8rRHzwqKNQhWDBYA==";
+        url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.18.tgz";
+        sha512 = "xDDuKAyYNEppKF7lFqolUTQoIYbv70f2teLudsh0yeRDVoISNT4A87nDc/Xa4bkTwttc9Di+D1HEZWP9Wqpj1w==";
       };
     };
-    "@uifabric/icons-7.5.12" = {
+    "@uifabric/icons-7.5.15" = {
       name = "_at_uifabric_slash_icons";
       packageName = "@uifabric/icons";
-      version = "7.5.12";
+      version = "7.5.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.12.tgz";
-        sha512 = "VIqj4oMwi4HJPqH3+3RblLoYjPfYzjVyZ8Kk57dmA7tj+vbM38Zn9vObe+Xg/EVEfohD3kD0fyEqPmnEqY17Pg==";
+        url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.15.tgz";
+        sha512 = "jNrPY7lsEs7gPUXokIYFxZs4TuX5Xiivx/KtxtoZKM4cpurLJx3ddCyOMp+kNn1ljzaNKNbcJae/ONB/jMJkQA==";
       };
     };
     "@uifabric/merge-styles-7.19.1" = {
@@ -6142,13 +6367,13 @@ let
         sha512 = "yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A==";
       };
     };
-    "@uifabric/react-hooks-7.13.6" = {
+    "@uifabric/react-hooks-7.13.9" = {
       name = "_at_uifabric_slash_react-hooks";
       packageName = "@uifabric/react-hooks";
-      version = "7.13.6";
+      version = "7.13.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.6.tgz";
-        sha512 = "DvfphxrTsjo3oYioRZ0D8mXdpxWQhhIHeWk1cfdq0MVGqRyKM+cm++9pJpvItFvnTNba38jzKdggqRSUWi+clg==";
+        url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.9.tgz";
+        sha512 = "VtDg2b3ypYXX7MLp1STk1Fj6ZIeZktXnm0hu1Os/pGvq6xkuLRly5XP6ZSHitm8K7ZcMo48CcNL8smmiXprBQg==";
       };
     };
     "@uifabric/set-version-7.0.23" = {
@@ -6160,22 +6385,22 @@ let
         sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA==";
       };
     };
-    "@uifabric/styling-7.16.13" = {
+    "@uifabric/styling-7.16.16" = {
       name = "_at_uifabric_slash_styling";
       packageName = "@uifabric/styling";
-      version = "7.16.13";
+      version = "7.16.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.13.tgz";
-        sha512 = "jj5FH7XuQXz8HgRhCXNApeUAynDBv2nfmTpzHawE55x7YR+oliQfsJSY8Ow4YbLAazIR5BuW1n9eKuGxxmIw1w==";
+        url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.16.tgz";
+        sha512 = "FFRXMjRPCagj+fN1o8O/FsbO7jHqVKEJyKT5j+zCwl0yBx5XqbQLcX9wzAEdBItB4anlgO7C5ZtFBUholwcCiA==";
       };
     };
-    "@uifabric/utilities-7.32.4" = {
+    "@uifabric/utilities-7.33.2" = {
       name = "_at_uifabric_slash_utilities";
       packageName = "@uifabric/utilities";
-      version = "7.32.4";
+      version = "7.33.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.32.4.tgz";
-        sha512 = "IKZc03uyfTrgcCGSPAUWfFl9CyxzpSrxrYwAuO4NgDEySdOlkYBRwsRUh6UwWfM+sJdhg7Y3nupzNU3VSC/arg==";
+        url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.2.tgz";
+        sha512 = "v2c3IUJdpru/hoGNOwIW549O5D4XBAc5sLpB7RREGI5ywoWuIJlNyYtBEGOwhAY62J2blj11qi86Ep+oZDM/Kw==";
       };
     };
     "@ungap/from-entries-0.2.1" = {
@@ -6232,76 +6457,76 @@ let
         sha512 = "y3vnCLQxUgZ/entdvv6vut7uQwmIp+ichxBay4yy8TjtpBxdVH0EXAByi+6rJlO2sotlvmRdnZU7AV7tz1yLsw==";
       };
     };
-    "@vue/compiler-core-3.0.1" = {
+    "@vue/compiler-core-3.0.2" = {
       name = "_at_vue_slash_compiler-core";
       packageName = "@vue/compiler-core";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.1.tgz";
-        sha512 = "BbQQj9YVNaNWEPnP4PiFKgW8QSGB3dcPSKCtekx1586m4VA1z8hHNLQnzeygtV8BM4oU6yriiWmOIYghbJHwFw==";
+        url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.2.tgz";
+        sha512 = "GOlEMTlC/OdzBkKaKOniYErbkjoKxkBOmulxGmMR10I2JJX6TvXd/peaO/kla2xhpliV/M6Z4TLJp0yjAvRIAw==";
       };
     };
-    "@vue/compiler-dom-3.0.1" = {
+    "@vue/compiler-dom-3.0.2" = {
       name = "_at_vue_slash_compiler-dom";
       packageName = "@vue/compiler-dom";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.1.tgz";
-        sha512 = "8cjgswVU2YmV35H9ARZmSlDr1P9VZxUihRwefkrk6Vrsb7kui5C3d/WQ2/su34FSDpyMU1aacUOiL2CV/vdX6w==";
+        url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.2.tgz";
+        sha512 = "jvaL4QF2yXBJVD+JLbM2YA3e5fNfflJnfQ+GtfYk46ENGsEetqbkZqcX7fO+RHdG8tZBo7LCNBvgD0QLr+V4sg==";
       };
     };
-    "@vue/compiler-sfc-3.0.1" = {
+    "@vue/compiler-sfc-3.0.2" = {
       name = "_at_vue_slash_compiler-sfc";
       packageName = "@vue/compiler-sfc";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.1.tgz";
-        sha512 = "VO5gJ7SyHw0hf1rkKXRlxjXI9+Q4ngcuUWYnyjOSDch7Wtt2IdOEiC82KFWIkfWMpHqA5HPzL2nDmys3y9d19w==";
+        url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.2.tgz";
+        sha512 = "viYjT5ehDSLM3v0jQ9hbTs4I5e/7lSlYsDOp7TQ1qcwHRvzoTQMTkFpY/Iae+LFKM124Ld17tBfXgfrZl9dt+g==";
       };
     };
-    "@vue/compiler-ssr-3.0.1" = {
+    "@vue/compiler-ssr-3.0.2" = {
       name = "_at_vue_slash_compiler-ssr";
       packageName = "@vue/compiler-ssr";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.1.tgz";
-        sha512 = "U0Vb7BOniw9rY0/YvXNw5EuIuO0dCoZd3XhnDjAKL9A5pSBxTlx6fPJeQ53gV0XH40M5z8q4yXukFqSVTXC6hQ==";
+        url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.2.tgz";
+        sha512 = "gOgK1lf+0bFl+kQj6TU0TU1jIDFlsPRlSBZaUUA16DGeeiJrFanhsMuIs/l9U0IBFr/VJcHgzYpTXqHp95luHw==";
       };
     };
-    "@vue/reactivity-3.0.1" = {
+    "@vue/reactivity-3.0.2" = {
       name = "_at_vue_slash_reactivity";
       packageName = "@vue/reactivity";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.1.tgz";
-        sha512 = "XWeqNTbvcAq8BmtR5M+XU6mfIhzi1NTcrQho7nI03I+Zf6QW1hHl/ri+iNfCNCasukQI/tzpkqJYPfyZxCRKyg==";
+        url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.2.tgz";
+        sha512 = "GdRloNcBar4yqWGXOcba1t//j/WizwfthfPUYkjcIPHjYnA/vTEQYp0C9+ZjPdinv1WRK1BSMeN/xj31kQES4A==";
       };
     };
-    "@vue/runtime-core-3.0.1" = {
+    "@vue/runtime-core-3.0.2" = {
       name = "_at_vue_slash_runtime-core";
       packageName = "@vue/runtime-core";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.1.tgz";
-        sha512 = "HporlL3cbD0/79U0a7mDIMEn5XoxstVXrOx0TDTi2O2CUv6yjteUQdxhmMOa8m7pnqU4DL/ZuVntBWFaf4ccaw==";
+        url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.2.tgz";
+        sha512 = "3m/jOs2xSipEFah9FgpEzvC9nERFonVGLN06+pf8iYPIy54Nlv7D2cyrk3Lhbjz4w3PbIrkxJnoTJYvJM7HDfA==";
       };
     };
-    "@vue/runtime-dom-3.0.1" = {
+    "@vue/runtime-dom-3.0.2" = {
       name = "_at_vue_slash_runtime-dom";
       packageName = "@vue/runtime-dom";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.1.tgz";
-        sha512 = "ijb2qTRU8OzllzYQ6BSymuu9KHFDyjzn4m6jcLGlNeazdk1/YA01lFtGkl6oAErdiWPglloUJzIz0ilv0laPwA==";
+        url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.2.tgz";
+        sha512 = "vqC1KK1yWthTw1FKzajT0gYQaEqAq7bpeeXQC473nllGC5YHbJhNAJLSmrDun1tjXqGF0UNCWYljYm+++BJv6w==";
       };
     };
-    "@vue/shared-3.0.1" = {
+    "@vue/shared-3.0.2" = {
       name = "_at_vue_slash_shared";
       packageName = "@vue/shared";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.1.tgz";
-        sha512 = "/X6AUbTFCyD2BcJnBoacUct8qcv1A5uk1+N+3tbzDVuhGPRmoYrTSnNUuF53C/GIsTkChrEiXaJh2kyo/0tRvw==";
+        url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.2.tgz";
+        sha512 = "Zx869zlNoujFOclKIoYmkh8ES2RcS/+Jn546yOiPyZ+3+Ejivnr+fb8l+DdXUEFjo+iVDNR3KyLzg03aBFfZ4Q==";
       };
     };
     "@webassemblyjs/ast-1.8.1" = {
@@ -7231,15 +7456,6 @@ let
         sha512 = "aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==";
       };
     };
-    "adm-zip-0.4.13" = {
-      name = "adm-zip";
-      packageName = "adm-zip";
-      version = "0.4.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.13.tgz";
-        sha512 = "fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw==";
-      };
-    };
     "adm-zip-0.4.16" = {
       name = "adm-zip";
       packageName = "adm-zip";
@@ -7321,13 +7537,13 @@ let
         sha512 = "TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==";
       };
     };
-    "agent-base-6.0.1" = {
+    "agent-base-6.0.2" = {
       name = "agent-base";
       packageName = "agent-base";
-      version = "6.0.1";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz";
-        sha512 = "01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==";
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz";
+        sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==";
       };
     };
     "agentkeepalive-3.5.2" = {
@@ -7969,13 +8185,13 @@ let
         sha512 = "1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA==";
       };
     };
-    "apollo-cache-control-0.11.3" = {
+    "apollo-cache-control-0.11.4" = {
       name = "apollo-cache-control";
       packageName = "apollo-cache-control";
-      version = "0.11.3";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.3.tgz";
-        sha512 = "21GCeC9AIIa22uD0Vtqn/N0D5kOB4rY/Pa9aQhxVeLN+4f8Eu4nmteXhFypUD0LL1/58dmm8lS5embsfoIGjEA==";
+        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.4.tgz";
+        sha512 = "FUKE8ASr8GxVq5rmky/tY8bsf++cleGT591lfLiqnPsP1fo3kAfgRfWA2QRHTCKFNlQxzUhVOEDv+PaysqiOjw==";
       };
     };
     "apollo-cache-inmemory-1.6.6" = {
@@ -8158,13 +8374,13 @@ let
         sha512 = "mjSFPlQxmoLArpHBeUb2Xj+2HDYeTaJqFGOqQ+I8NVJxgL9lJe84PDWcPah/yMLv3rB7QgBDSuZ0xoRFBPlySw==";
       };
     };
-    "apollo-reporting-protobuf-0.6.0" = {
+    "apollo-reporting-protobuf-0.6.1" = {
       name = "apollo-reporting-protobuf";
       packageName = "apollo-reporting-protobuf";
-      version = "0.6.0";
+      version = "0.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.0.tgz";
-        sha512 = "AFLQIuO0QhkoCF+41Be/B/YU0C33BZ0opfyXorIjM3MNNiEDSyjZqmUozlB3LqgfhT9mn2IR5RSsA+1b4VovDQ==";
+        url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.1.tgz";
+        sha512 = "qr4DheFP154PGZsd93SSIS9RkqHnR5b6vT+eCloWjy3UIpY+yZ3cVLlttlIjYvOG4xTJ25XEwcHiAExatQo/7g==";
       };
     };
     "apollo-server-caching-0.5.2" = {
@@ -8176,13 +8392,13 @@ let
         sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==";
       };
     };
-    "apollo-server-core-2.18.2" = {
+    "apollo-server-core-2.19.0" = {
       name = "apollo-server-core";
       packageName = "apollo-server-core";
-      version = "2.18.2";
+      version = "2.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.18.2.tgz";
-        sha512 = "phz57BFBukMa3Ta7ZVW7pj1pdUne9KYLbcBdEcITr+I0+nbhy+YM8gcgpOnjrokWYiEZgIe52XeM3m4BMLw5dg==";
+        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.0.tgz";
+        sha512 = "2aMKUVPyNbomJQaG2tkpfqvp1Tfgxgkdr7nX5zHudYNSzsPrHw+CcYlCbIVFFI/mTZsjoK9czNq1qerFRxZbJw==";
       };
     };
     "apollo-server-env-2.4.5" = {
@@ -8203,40 +8419,40 @@ let
         sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ==";
       };
     };
-    "apollo-server-express-2.18.2" = {
+    "apollo-server-express-2.19.0" = {
       name = "apollo-server-express";
       packageName = "apollo-server-express";
-      version = "2.18.2";
+      version = "2.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.18.2.tgz";
-        sha512 = "9P5YOSE2amcNdkXqxqU3oulp+lpwoIBdwS2vOP69kl6ix+n7vEWHde4ulHwwl4xLdtZ88yyxgdKJEIkhaepiNw==";
+        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.19.0.tgz";
+        sha512 = "3rgSrTme1SlLoecAYtSa8ThH6vYvz29QecgZCigq5Vdc6bFP2SZrCk0ls6BAdD8OZbVKUtizzRxd0yd/uREPAw==";
       };
     };
-    "apollo-server-plugin-base-0.10.1" = {
+    "apollo-server-plugin-base-0.10.2" = {
       name = "apollo-server-plugin-base";
       packageName = "apollo-server-plugin-base";
-      version = "0.10.1";
+      version = "0.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.1.tgz";
-        sha512 = "XChCBDNyfByWqVXptsjPwrwrCj5cxMmNbchZZi8KXjtJ0hN2C/9BMNlInJd6bVGXvUbkRJYUakfKCfO5dZmwIg==";
+        url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.2.tgz";
+        sha512 = "uM5uL1lOxbXdgvt/aEIbgs40fV9xA45Y3Mmh0VtQ/ddqq0MXR5aG92nnf8rM+URarBCUfxKJKaYzJJ/CXAnEdA==";
       };
     };
-    "apollo-server-types-0.6.0" = {
+    "apollo-server-types-0.6.1" = {
       name = "apollo-server-types";
       packageName = "apollo-server-types";
-      version = "0.6.0";
+      version = "0.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.0.tgz";
-        sha512 = "usqXaz81bHxD2IZvKEQNnLpSbf2Z/BmobXZAjEefJEQv1ItNn+lJNUmSSEfGejHvHlg2A7WuAJKJWyDWcJrNnA==";
+        url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.1.tgz";
+        sha512 = "IEQ37aYvMLiTUzsySVLOSuvvhxuyYdhI05f3cnH6u2aN1HgGp7vX6bg+U3Ue8wbHfdcifcGIk5UEU+Q+QO6InA==";
       };
     };
-    "apollo-tracing-0.11.4" = {
+    "apollo-tracing-0.12.0" = {
       name = "apollo-tracing";
       packageName = "apollo-tracing";
-      version = "0.11.4";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.4.tgz";
-        sha512 = "zBu/SwQlXfbdpcKLzWARGVjrEkIZUW3W9Mb4CCIzv07HbBQ8IQpmf9w7HIJJefC7rBiBJYg6JBGyuro3N2lxCA==";
+        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.0.tgz";
+        sha512 = "cMUYGE6mOEwb9HDqhf4fiPEo2JMhjPIqEprAQEC57El76avRpRig5NM0bnqMZcYJZR5QmLlNcttNccOwf9WrNg==";
       };
     };
     "apollo-upload-client-11.0.0" = {
@@ -8347,13 +8563,13 @@ let
         sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==";
       };
     };
-    "arch-2.1.2" = {
+    "arch-2.2.0" = {
       name = "arch";
       packageName = "arch";
-      version = "2.1.2";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/arch/-/arch-2.1.2.tgz";
-        sha512 = "NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ==";
+        url = "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz";
+        sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==";
       };
     };
     "archive-type-4.0.0" = {
@@ -9049,13 +9265,13 @@ let
         sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
       };
     };
-    "ast-module-types-2.6.0" = {
+    "ast-module-types-2.7.1" = {
       name = "ast-module-types";
       packageName = "ast-module-types";
-      version = "2.6.0";
+      version = "2.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.6.0.tgz";
-        sha512 = "zXSoVaMrf2R+r+ISid5/9a8SXm1LLdkhHzh6pSRhj9jklzruOOl1hva1YmFT33wAstg/f9ZndJAlq1BSrFLSGA==";
+        url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.7.1.tgz";
+        sha512 = "Rnnx/4Dus6fn7fTqdeLEAn5vUll5w7/vts0RN608yFa6si/rDOUonlIIiwugHBFWjylHjxm9owoSZn71KwG4gw==";
       };
     };
     "ast-types-0.12.1" = {
@@ -9481,13 +9697,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.774.0" = {
+    "aws-sdk-2.784.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.774.0";
+      version = "2.784.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.774.0.tgz";
-        sha512 = "3a/fM1E3nCPwT4AVbysOWCMmsu/TOdJDD3urjywWE/qO1JShxRwLSdRLD1xRkacR9JcnydfkmdU0qk+VsM3nqg==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.784.0.tgz";
+        sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -9508,13 +9724,13 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.10.1" = {
+    "aws4-1.11.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.10.1";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz";
-        sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz";
+        sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
       };
     };
     "axios-0.17.1" = {
@@ -10408,6 +10624,15 @@ let
         sha512 = "2uhEl8FdjSBUyb69qDTgOEeeqDTa+n3yMQzLW0cOzNf1Ow5bwcg3idf+qsWisIKRH8Bk8oC7UXL8irRcPA8ZEQ==";
       };
     };
+    "bep53-range-1.0.0" = {
+      name = "bep53-range";
+      packageName = "bep53-range";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bep53-range/-/bep53-range-1.0.0.tgz";
+        sha512 = "CNsnREjxe2/wD559wzFXMycUnbmUDA9C2Bs6Z2tm++amSma7JowAAxAnaZJMuDq3cWSx9HSIbV04H06QQ11zTA==";
+      };
+    };
     "better-ajv-errors-0.6.7" = {
       name = "better-ajv-errors";
       packageName = "better-ajv-errors";
@@ -10624,13 +10849,13 @@ let
         sha512 = "tSh9HdQgwyEAfo1jzoGEis6o/zs4CcdRTchG93XVl5jct+DCAN90M5MVUV76k2vJ9Xg3GAzLB5NLsY/vnVTh6w==";
       };
     };
-    "bittorrent-protocol-3.1.1" = {
+    "bittorrent-protocol-3.1.2" = {
       name = "bittorrent-protocol";
       packageName = "bittorrent-protocol";
-      version = "3.1.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.1.tgz";
-        sha512 = "kthSXghQ9DRQ4Lrjr1ceyIeEMeL5x9WiaSrQyR+5Nrr3g9QY6MvDeq+KLQz17R6094iDmT/LgFbQYAPj09/oUA==";
+        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.2.tgz";
+        sha512 = "vjKcxwQ/rDd3FeqImBZXLKk14eawf8sXVXPJd8LgrTZmpDzCn8kquhNIiYbE7M3SybAQ1r5uILJ7f2V2TlT8bQ==";
       };
     };
     "bittorrent-tracker-7.7.0" = {
@@ -10750,13 +10975,13 @@ let
         sha512 = "gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==";
       };
     };
-    "blob-to-buffer-1.2.8" = {
+    "blob-to-buffer-1.2.9" = {
       name = "blob-to-buffer";
       packageName = "blob-to-buffer";
-      version = "1.2.8";
+      version = "1.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.8.tgz";
-        sha512 = "re0AIxakF504MgeMtIyJkVcZ8T5aUxtp/QmTMlmjyb3P44E1BEv5x3LATBGApWAJATyXHtkXRD+gWTmeyYLiQA==";
+        url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.9.tgz";
+        sha512 = "BF033y5fN6OCofD3vgHmNtwZWRcq9NLyyxyILx9hfMy1sXYy4ojFl765hJ2lP0YaN2fuxPaLO2Vzzoxy0FLFFA==";
       };
     };
     "block-stream-0.0.9" = {
@@ -10930,13 +11155,13 @@ let
         sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
       };
     };
-    "boolean-3.0.1" = {
+    "boolean-3.0.2" = {
       name = "boolean";
       packageName = "boolean";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz";
-        sha512 = "HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==";
+        url = "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz";
+        sha512 = "RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==";
       };
     };
     "boom-2.10.1" = {
@@ -11344,13 +11569,13 @@ let
         sha512 = "TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==";
       };
     };
-    "browserslist-4.14.5" = {
+    "browserslist-4.14.6" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.14.5";
+      version = "4.14.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz";
-        sha512 = "Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.6.tgz";
+        sha512 = "zeFYcUo85ENhc/zxHbiIp0LGzzTrE2Pv2JhxvS7kpUb9Q9D38kUX6Bie7pGutJ/5iF5rOxE7CepAuWD56xJ33A==";
       };
     };
     "bser-2.1.1" = {
@@ -11416,13 +11641,13 @@ let
         sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==";
       };
     };
-    "buffer-5.6.0" = {
+    "buffer-5.7.0" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.6.0";
+      version = "5.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz";
-        sha512 = "/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.7.0.tgz";
+        sha512 = "cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg==";
       };
     };
     "buffer-alloc-1.2.0" = {
@@ -11623,13 +11848,13 @@ let
         sha1 = "69fdf13ad9d91222baee109945faadc431534f86";
       };
     };
-    "bufferutil-4.0.1" = {
+    "bufferutil-4.0.2" = {
       name = "bufferutil";
       packageName = "bufferutil";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.1.tgz";
-        sha512 = "xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA==";
+        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.2.tgz";
+        sha512 = "AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA==";
       };
     };
     "bufferview-1.0.1" = {
@@ -11920,6 +12145,15 @@ let
         sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==";
       };
     };
+    "call-bind-1.0.0" = {
+      name = "call-bind";
+      packageName = "call-bind";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz";
+        sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==";
+      };
+    };
     "call-me-maybe-1.0.1" = {
       name = "call-me-maybe";
       packageName = "call-me-maybe";
@@ -12082,13 +12316,13 @@ let
         sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==";
       };
     };
-    "camelcase-6.1.0" = {
+    "camelcase-6.2.0" = {
       name = "camelcase";
       packageName = "camelcase";
-      version = "6.1.0";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz";
-        sha512 = "WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ==";
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz";
+        sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==";
       };
     };
     "camelcase-keys-2.1.0" = {
@@ -12136,13 +12370,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001148" = {
+    "caniuse-lite-1.0.30001154" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001148";
+      version = "1.0.30001154";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz";
-        sha512 = "E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz";
+        sha512 = "y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org==";
       };
     };
     "canvas-2.6.1" = {
@@ -12244,13 +12478,13 @@ let
         sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==";
       };
     };
-    "ccount-1.0.5" = {
+    "ccount-1.1.0" = {
       name = "ccount";
       packageName = "ccount";
-      version = "1.0.5";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ccount/-/ccount-1.0.5.tgz";
-        sha512 = "MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==";
+        url = "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz";
+        sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==";
       };
     };
     "center-align-0.1.3" = {
@@ -12730,13 +12964,13 @@ let
         sha512 = "uiRdh4ZZy+UTPSrAdp8hqEdVb1EllLtTHOt5TMaOjJUvi+O54/83Fc5K2ld1P+TJX+dw5B+8/sCgzI6eaur/lg==";
       };
     };
-    "chrome-dgram-3.0.5" = {
+    "chrome-dgram-3.0.6" = {
       name = "chrome-dgram";
       packageName = "chrome-dgram";
-      version = "3.0.5";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chrome-dgram/-/chrome-dgram-3.0.5.tgz";
-        sha512 = "RcCR5Kpn+F7VGmtL3ex78ltB+cuuSTZdGBa4j3fQwUqz/90uOKd5t+WmnJp+QNv017oaHzn5GoMv1mCoRTmehQ==";
+        url = "https://registry.npmjs.org/chrome-dgram/-/chrome-dgram-3.0.6.tgz";
+        sha512 = "bqBsUuaOiXiqxXt/zA/jukNJJ4oaOtc7ciwqJpZVEaaXwwxqgI2/ZdG02vXYWUhHGziDlvGMQWk0qObgJwVYKA==";
       };
     };
     "chrome-dns-1.0.1" = {
@@ -14098,15 +14332,6 @@ let
         sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==";
       };
     };
-    "commander-4.1.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-4.1.0.tgz";
-        sha512 = "NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==";
-      };
-    };
     "commander-4.1.1" = {
       name = "commander";
       packageName = "commander";
@@ -14143,6 +14368,15 @@ let
         sha512 = "wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==";
       };
     };
+    "commander-6.2.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "6.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz";
+        sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==";
+      };
+    };
     "commandpost-1.4.0" = {
       name = "commandpost";
       packageName = "commandpost";
@@ -14681,7 +14915,7 @@ let
       src = fetchgit {
         url = "https://github.com/wikimedia/content-type.git";
         rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b";
-        sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
+        sha256 = "18eb299165567b0a97e9d5576f7c189fe57072b8b8323ac179571c9e6a10fdd9";
       };
     };
     "content-types-0.1.0" = {
@@ -15629,6 +15863,15 @@ let
         sha512 = "Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==";
       };
     };
+    "css-tree-1.0.0" = {
+      name = "css-tree";
+      packageName = "css-tree";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0.tgz";
+        sha512 = "CdVYz/Yuqw0VdKhXPBIgi8DO3NicJVYZNWeX9XcIuSp9ZoFT5IcleVRW07O5rMjdcx1mb+MEJPknTTEW7DdsYw==";
+      };
+    };
     "css-tree-1.0.0-alpha.37" = {
       name = "css-tree";
       packageName = "css-tree";
@@ -15638,15 +15881,6 @@ let
         sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==";
       };
     };
-    "css-tree-1.0.0-alpha.39" = {
-      name = "css-tree";
-      packageName = "css-tree";
-      version = "1.0.0-alpha.39";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz";
-        sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==";
-      };
-    };
     "css-what-1.0.0" = {
       name = "css-what";
       packageName = "css-what";
@@ -15764,13 +15998,13 @@ let
         sha1 = "178b43a44621221c27756086f531e02f42900ee8";
       };
     };
-    "csso-4.0.3" = {
+    "csso-4.1.0" = {
       name = "csso";
       packageName = "csso";
-      version = "4.0.3";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz";
-        sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==";
+        url = "https://registry.npmjs.org/csso/-/csso-4.1.0.tgz";
+        sha512 = "h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg==";
       };
     };
     "cssom-0.3.8" = {
@@ -16430,13 +16664,13 @@ let
         sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw==";
       };
     };
-    "dayjs-1.9.3" = {
+    "dayjs-1.9.4" = {
       name = "dayjs";
       packageName = "dayjs";
-      version = "1.9.3";
+      version = "1.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.3.tgz";
-        sha512 = "V+1SyIvkS+HmNbN1G7A9+ERbFTV9KTXu6Oor98v2xHmzzpp52OIJhQuJSTywWuBY5pyAEmlwbCi1Me87n/SLOw==";
+        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.4.tgz";
+        sha512 = "ABSF3alrldf7nM9sQ2U+Ln67NRwmzlLOqG7kK03kck0mw3wlSSEKv/XhKGGxUjQcS57QeiCyNdrFgtj9nWlrng==";
       };
     };
     "deasync-0.1.15" = {
@@ -17402,13 +17636,13 @@ let
         sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==";
       };
     };
-    "detective-amd-3.0.0" = {
+    "detective-amd-3.0.1" = {
       name = "detective-amd";
       packageName = "detective-amd";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.0.0.tgz";
-        sha512 = "kOpKHyabdSKF9kj7PqYHLeHPw+TJT8q2u48tZYMkIcas28el1CYeLEJ42Nm+563/Fq060T5WknfwDhdX9+kkBQ==";
+        url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.0.1.tgz";
+        sha512 = "vJgluSKkPyo+/McW9hzwmZwY1VPA3BS0VS1agdpPAWAhr65HwC1ox4Ig82rVfGYDYCa4GcKQON5JWBk++2Kf1Q==";
       };
     };
     "detective-cjs-3.1.1" = {
@@ -17492,13 +17726,13 @@ let
         sha512 = "7/nIzKdQ8y2K0imjIP7dyg2GJ2h38Ps6VOMXWZHIarNDV3p6mTXyEugKFnkmsZ2DD58JEG34ILyVb3qdOMmP9w==";
       };
     };
-    "devtools-protocol-0.0.799653" = {
+    "devtools-protocol-0.0.809251" = {
       name = "devtools-protocol";
       packageName = "devtools-protocol";
-      version = "0.0.799653";
+      version = "0.0.809251";
       src = fetchurl {
-        url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.799653.tgz";
-        sha512 = "t1CcaZbvm8pOlikqrsIM9GOa7Ipp07+4h/q9u0JXBWjPCjHdBl9KkddX87Vv9vBHoBGtwV79sYQNGnQM6iS5gg==";
+        url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.809251.tgz";
+        sha512 = "pf+2OY6ghMDPjKkzSWxHMq+McD+9Ojmq5XVRYpv/kPd9sTMQxzEt21592a31API8qRjro0iYYOc3ag46qF/1FA==";
       };
     };
     "dezalgo-1.0.3" = {
@@ -17600,13 +17834,13 @@ let
         sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==";
       };
     };
-    "diff2html-3.1.14" = {
+    "diff2html-3.1.15" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "3.1.14";
+      version = "3.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.14.tgz";
-        sha512 = "Qot+l+v+aqGcuvJe1C8ZPev17deSyg+DOwICF3m8Ka/C3af1K2Wh2WENYulxv9CQyVhy2VarluR5fMfN5BEHIg==";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.15.tgz";
+        sha512 = "juAPno3aLDhLV6e2rPl1uQ3ZHpFT4o5Hpx5il4EH+nbdphwGgK1a7dQ/BnSXWlNPvEZ5l8lE5CTHijx5QPLzOQ==";
       };
     };
     "diff3-0.0.3" = {
@@ -18122,13 +18356,13 @@ let
         sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==";
       };
     };
-    "dompurify-1.0.11" = {
+    "dompurify-2.2.2" = {
       name = "dompurify";
       packageName = "dompurify";
-      version = "1.0.11";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dompurify/-/dompurify-1.0.11.tgz";
-        sha512 = "XywCTXZtc/qCX3iprD1pIklRVk/uhl8BKpkTxr+ZyMVUzSUg7wkQXRBp/euJ5J5moa1QvfpvaPQVP71z1O59dQ==";
+        url = "https://registry.npmjs.org/dompurify/-/dompurify-2.2.2.tgz";
+        sha512 = "BsGR4nDLaC5CNBnyT5I+d5pOeaoWvgVeg6Gq/aqmKYWMPR07131u60I80BvExLAJ0FQEIBQ1BTicw+C5+jOyrg==";
       };
     };
     "domutils-1.4.3" = {
@@ -18599,13 +18833,13 @@ let
         sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
       };
     };
-    "electron-to-chromium-1.3.582" = {
+    "electron-to-chromium-1.3.586" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.582";
+      version = "1.3.586";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.582.tgz";
-        sha512 = "0nCJ7cSqnkMC+kUuPs0YgklFHraWGl/xHqtZWWtOeVtyi+YqkoAOMGuZQad43DscXCQI/yizcTa3u6B5r+BLww==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.586.tgz";
+        sha512 = "or8FCbQCRlPZHkOoqBULOI9hzTiStVIQqDLgAPt8pzY+swTrW+89vsqd24Zn+Iv4guAJLxRBD6OR5AmbpabGDA==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -18681,13 +18915,13 @@ let
         sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==";
       };
     };
-    "emmet-2.1.5" = {
+    "emmet-2.1.6" = {
       name = "emmet";
       packageName = "emmet";
-      version = "2.1.5";
+      version = "2.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/emmet/-/emmet-2.1.5.tgz";
-        sha512 = "u0RR8qb067EELZ8t+LtxbhLXvfJ4nklbxcoFrHcvs61r7rk8SgJwgcVSM/Xa/4/tlq2jKdunGbVp5Nqz8MZYOg==";
+        url = "https://registry.npmjs.org/emmet/-/emmet-2.1.6.tgz";
+        sha512 = "kfJMlze+k8jpX5CUx7xPYS83DxRNXuh8rQ98rQKnnf+wfo/KD+BG6pmpnEp5a7a1DWM9xmllKuOPfC7MeRmepQ==";
       };
     };
     "emoji-named-characters-1.0.2" = {
@@ -18969,13 +19203,13 @@ let
         sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==";
       };
     };
-    "enhanced-resolve-5.3.0" = {
+    "enhanced-resolve-5.3.1" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "5.3.0";
+      version = "5.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.3.0.tgz";
-        sha512 = "EENz3E701+77g0wfbOITeI8WLPNso2kQNMBIBEi/TH/BEa9YXtS01X7sIEk5XXsfFq1jNkhIpu08hBPH1TRLIQ==";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.3.1.tgz";
+        sha512 = "G1XD3MRGrGfNcf6Hg0LVZG7GIKcYkbfHa5QMxt1HDUTdYoXH0JR1xXyg+MaKLF73E9A27uWNVxvFivNRYeUB6w==";
       };
     };
     "enquirer-2.3.6" = {
@@ -19131,6 +19365,15 @@ let
         sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
       };
     };
+    "err-code-2.0.3" = {
+      name = "err-code";
+      packageName = "err-code";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz";
+        sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==";
+      };
+    };
     "errlop-2.2.0" = {
       name = "errlop";
       packageName = "errlop";
@@ -19554,6 +19797,15 @@ let
         sha512 = "G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==";
       };
     };
+    "eslint-7.12.1" = {
+      name = "eslint";
+      packageName = "eslint";
+      version = "7.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz";
+        sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==";
+      };
+    };
     "eslint-plugin-no-unsanitized-3.1.4" = {
       name = "eslint-plugin-no-unsanitized";
       packageName = "eslint-plugin-no-unsanitized";
@@ -20157,6 +20409,15 @@ let
         sha1 = "b09c2a9309bc0ef0501479472db3180f8d4c3edd";
       };
     };
+    "execa-0.10.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz";
+        sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==";
+      };
+    };
     "execa-0.7.0" = {
       name = "execa";
       packageName = "execa";
@@ -20202,13 +20463,13 @@ let
         sha512 = "r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==";
       };
     };
-    "execa-4.0.3" = {
+    "execa-4.1.0" = {
       name = "execa";
       packageName = "execa";
-      version = "4.0.3";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz";
-        sha512 = "WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==";
+        url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz";
+        sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==";
       };
     };
     "execall-1.0.0" = {
@@ -20337,13 +20598,13 @@ let
         sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929";
       };
     };
-    "expo-pwa-0.0.46" = {
+    "expo-pwa-0.0.48" = {
       name = "expo-pwa";
       packageName = "expo-pwa";
-      version = "0.0.46";
+      version = "0.0.48";
       src = fetchurl {
-        url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.46.tgz";
-        sha512 = "Ikb0VIo2T0cMWmMT+VFa+aSrG7lmtHcJCLsZAaxUgta2IhYJxSqRHqXrKYimPb/q2hagspsd2Hyzf7HF92qs3g==";
+        url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.48.tgz";
+        sha512 = "4KaL0+YhFxS9zrpQG/BNW+fxMldvgx9dM16b6sZ2t7eMkDlUO7Vo6B+zxeg5l/naP27CA02bMUkeEHr61Y5ojA==";
       };
     };
     "express-2.5.11" = {
@@ -20931,13 +21192,13 @@ let
         sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==";
       };
     };
-    "fastq-1.8.0" = {
+    "fastq-1.9.0" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.8.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz";
-        sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz";
+        sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==";
       };
     };
     "fault-1.0.4" = {
@@ -20949,6 +21210,15 @@ let
         sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==";
       };
     };
+    "faunadb-3.0.1" = {
+      name = "faunadb";
+      packageName = "faunadb";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/faunadb/-/faunadb-3.0.1.tgz";
+        sha512 = "WlfPjC0V9xHs4NTunOWmYZtJfbJ45Z1VAIKKka6+mRrmijWOFQzJVDY9CqS6X9kvepM36EjmtNkIvV0OJ1wTEA==";
+      };
+    };
     "faye-websocket-0.10.0" = {
       name = "faye-websocket";
       packageName = "faye-websocket";
@@ -21390,13 +21660,13 @@ let
         sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==";
       };
     };
-    "find-process-1.4.3" = {
+    "find-process-1.4.4" = {
       name = "find-process";
       packageName = "find-process";
-      version = "1.4.3";
+      version = "1.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/find-process/-/find-process-1.4.3.tgz";
-        sha512 = "+IA+AUsQCf3uucawyTwMWcY+2M3FXq3BRvw3S+j5Jvydjk31f/+NPWpYZOJs+JUs2GvxH4Yfr6Wham0ZtRLlPA==";
+        url = "https://registry.npmjs.org/find-process/-/find-process-1.4.4.tgz";
+        sha512 = "rRSuT1LE4b+BFK588D2V8/VG9liW0Ark1XJgroxZXI0LtwmQJOb490DvDYvbm+Hek9ETFzTutGfJ90gumITPhQ==";
       };
     };
     "find-requires-1.0.0" = {
@@ -21696,13 +21966,13 @@ let
         sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
       };
     };
-    "flow-parser-0.136.0" = {
+    "flow-parser-0.137.0" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.136.0";
+      version = "0.137.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.136.0.tgz";
-        sha512 = "PB2vYAqmz+dRikpx8TpNgRtBsyemP+7oQa0BcPZWnGABlJlB2WgJc/Lx0HeEPOUxDO/TxBbPaIHsffEIL9M6BQ==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.137.0.tgz";
+        sha512 = "i3KXJZ8lhlQI0n+BoZzIeH/rv+fNvAiu1i9/s64MklBV+HuhFbycUML7367J2eng0gapLnwvYPFNaPZys8POsA==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -21831,6 +22101,15 @@ let
         sha512 = "uXClqPxT4xW0lcdSBheb2ObVU+kuqUk3Jk64EwieirEXZx9XUrVwp/JuBfKAWaM4T5Td/VL7QLDWPXp/MvGm/g==";
       };
     };
+    "fn-annotate-1.2.0" = {
+      name = "fn-annotate";
+      packageName = "fn-annotate";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fn-annotate/-/fn-annotate-1.2.0.tgz";
+        sha1 = "28da000117dea61842fe61f353f41cf4c93a7a7e";
+      };
+    };
     "fn-name-2.0.1" = {
       name = "fn-name";
       packageName = "fn-name";
@@ -22110,13 +22389,13 @@ let
         sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
       };
     };
-    "fp-ts-2.8.4" = {
+    "fp-ts-2.8.5" = {
       name = "fp-ts";
       packageName = "fp-ts";
-      version = "2.8.4";
+      version = "2.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.4.tgz";
-        sha512 = "J+kwce5SysU0YKuZ3aCnFk+dyezZD1mij6u26w1fCVfuLYgJR4eeXmVfJiUjthpZ+4yCRkRfcwMI5SkGw52oFA==";
+        url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.5.tgz";
+        sha512 = "g6do+Q/IQsxgsd2qU6+QnAbZaPR533seIbFyLGqWSxhNX4+F+cY37QdaYmMUOzekLOv/yg/2f15tc26tzDatgw==";
       };
     };
     "fragment-cache-0.2.1" = {
@@ -22299,6 +22578,15 @@ let
         sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==";
       };
     };
+    "fs-extra-6.0.1" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "6.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz";
+        sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==";
+      };
+    };
     "fs-extra-7.0.1" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -22452,6 +22740,15 @@ let
         sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==";
       };
     };
+    "fsevents-2.2.0" = {
+      name = "fsevents";
+      packageName = "fsevents";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.0.tgz";
+        sha512 = "pKnaUh2TNvk+/egJdBw1h46LwyLx8BzEq+MGCf/RMCVfEHHsGOCWG00dqk91kUPPArIIwMBg9T/virxwzP03cA==";
+      };
+    };
     "fstream-0.1.31" = {
       name = "fstream";
       packageName = "fstream";
@@ -22524,13 +22821,13 @@ let
         sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
       };
     };
-    "fuse.js-6.4.1" = {
+    "fuse.js-6.4.3" = {
       name = "fuse.js";
       packageName = "fuse.js";
-      version = "6.4.1";
+      version = "6.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.1.tgz";
-        sha512 = "+hAS7KYgLXontDh/vqffs7wIBw0ceb9Sx8ywZQhOsiQGcSO5zInGhttWOUYQYlvV/yYMJOacQ129Xs3mP3+oZQ==";
+        url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.3.tgz";
+        sha512 = "JNgngolukIrqwayWnvy6NLH63hmwKPhm63o0uyBg51jPD0j09IvAzlV1rTXfAsgxpghI7khAo6Mv+EmvjDWXig==";
       };
     };
     "fuzzy-0.1.3" = {
@@ -22677,13 +22974,13 @@ let
         sha512 = "KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==";
       };
     };
-    "gensync-1.0.0-beta.1" = {
+    "gensync-1.0.0-beta.2" = {
       name = "gensync";
       packageName = "gensync";
-      version = "1.0.0-beta.1";
+      version = "1.0.0-beta.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz";
-        sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==";
+        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz";
+        sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
       };
     };
     "get-amd-module-type-3.0.0" = {
@@ -22740,6 +23037,15 @@ let
         sha1 = "ead774abee72e20409433a066366023dd6887a41";
       };
     };
+    "get-intrinsic-1.0.1" = {
+      name = "get-intrinsic";
+      packageName = "get-intrinsic";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz";
+        sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==";
+      };
+    };
     "get-own-enumerable-property-symbols-3.0.2" = {
       name = "get-own-enumerable-property-symbols";
       packageName = "get-own-enumerable-property-symbols";
@@ -22929,13 +23235,13 @@ let
         sha1 = "39b91838707e2086fd1cf6ef8777d1c93e14649e";
       };
     };
-    "getmac-5.16.0" = {
+    "getmac-5.17.0" = {
       name = "getmac";
       packageName = "getmac";
-      version = "5.16.0";
+      version = "5.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/getmac/-/getmac-5.16.0.tgz";
-        sha512 = "6uY8p55XkkxO7gwLw5IKii29OLOe6qSh8zWFRXJUtf6uGwlGztUZ30xWtQgCAGhOP2aR3Rb5h+TFrG/RKIooAA==";
+        url = "https://registry.npmjs.org/getmac/-/getmac-5.17.0.tgz";
+        sha512 = "hupD+ZCHVFRaH1wBDPgIil6KWL5p5Z6kG71nAcafwq72QaMxw9bhR2LPBk3jlw3I2F3oELNkx6Fccwiuy5fv0w==";
       };
     };
     "getpass-0.1.6" = {
@@ -23118,13 +23424,13 @@ let
         sha512 = "KPoHZg8v+plarZvto4ruIzzJLFQoRx+sUs5DQSr07By9IBKguVd+e6jwrFR6/TP6xrCJlNV1tPqLO1aREc7O2g==";
       };
     };
-    "git-url-parse-11.3.0" = {
+    "git-url-parse-11.4.0" = {
       name = "git-url-parse";
       packageName = "git-url-parse";
-      version = "11.3.0";
+      version = "11.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.3.0.tgz";
-        sha512 = "i3XNa8IKmqnUqWBcdWBjOcnyZYfN3C1WRvnKI6ouFWwsXCZEnlgbwbm55ZpJ3OJMhfEP/ryFhqW8bBhej3C5Ug==";
+        url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.0.tgz";
+        sha512 = "KlIa5jvMYLjXMQXkqpFzobsyD/V2K5DRHl5OAf+6oDFPlPLxrGDVQlIdI63c4/Kt6kai4kALENSALlzTGST3GQ==";
       };
     };
     "gitconfiglocal-1.0.0" = {
@@ -23334,15 +23640,6 @@ let
         sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f";
       };
     };
-    "global-4.4.0" = {
-      name = "global";
-      packageName = "global";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/global/-/global-4.4.0.tgz";
-        sha512 = "wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==";
-      };
-    };
     "global-agent-2.1.12" = {
       name = "global-agent";
       packageName = "global-agent";
@@ -23677,13 +23974,13 @@ let
         sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww==";
       };
     };
-    "got-11.7.0" = {
+    "got-11.8.0" = {
       name = "got";
       packageName = "got";
-      version = "11.7.0";
+      version = "11.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-11.7.0.tgz";
-        sha512 = "7en2XwH2MEqOsrK0xaKhbWibBoZqy+f1RSUoIeF1BLcnf+pyQdDsljWMfmOh+QKJwuvDIiKx38GtPh5wFdGGjg==";
+        url = "https://registry.npmjs.org/got/-/got-11.8.0.tgz";
+        sha512 = "k9noyoIIY9EejuhaBNLyZ31D5328LeqnyPNXJQb2XlJZcKakLqN5m6O/ikhq/0lw56kUYS54fVm+D1x57YC9oQ==";
       };
     };
     "got-3.3.1" = {
@@ -23839,6 +24136,15 @@ let
         sha512 = "GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w==";
       };
     };
+    "graphql-15.4.0" = {
+      name = "graphql";
+      packageName = "graphql";
+      version = "15.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graphql/-/graphql-15.4.0.tgz";
+        sha512 = "EB3zgGchcabbsU9cFe1j+yxdzKQKAbGUWRb13DsrsMN1yyfmmIq+2+L5MqVWcDCE4V89R5AyUOi7sMOGxdsYtA==";
+      };
+    };
     "graphql-anywhere-4.2.7" = {
       name = "graphql-anywhere";
       packageName = "graphql-anywhere";
@@ -23857,13 +24163,13 @@ let
         sha512 = "MBY0wEjvcgJtZUyoqpPvOE1e5qPI0hJaa1gKTqjonSFiCsNHX2lykNjpOPcodmAgH1V06ELxhGnm9kcVzqvi/g==";
       };
     };
-    "graphql-extensions-0.12.5" = {
+    "graphql-extensions-0.12.6" = {
       name = "graphql-extensions";
       packageName = "graphql-extensions";
-      version = "0.12.5";
+      version = "0.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.5.tgz";
-        sha512 = "mGyGaktGpK3TVBtM0ZoyPX6Xk0mN9GYX9DRyFzDU4k4A2w93nLX7Ebcp+9/O5nHRmgrc0WziYYSmoWq2WNIoUQ==";
+        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.6.tgz";
+        sha512 = "EUNw+OIRXYTPxToSoJjhJvS5aGa94KkdkZnL1I9DCZT64/+rzQNeLeGj+goj2RYuYvoQe1Bmcx0CNZ1GqwBhng==";
       };
     };
     "graphql-subscriptions-1.1.0" = {
@@ -24523,13 +24829,13 @@ let
         sha512 = "0FfLHmfArWOizbdwjL+Rc9QIBzqP80juicNl4S4NEPq5OYWBCgYrtYDPUDoSyQQ9IQlBn9W7++fpYQNzZSq/wQ==";
       };
     };
-    "hast-util-from-parse5-6.0.0" = {
+    "hast-util-from-parse5-6.0.1" = {
       name = "hast-util-from-parse5";
       packageName = "hast-util-from-parse5";
-      version = "6.0.0";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.0.tgz";
-        sha512 = "3ZYnfKenbbkhhNdmOQqgH10vnvPivTdsOJCri+APn0Kty+nRkDHArnaX9Hiaf8H+Ig+vkNptL+SRY/6RwWJk1Q==";
+        url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz";
+        sha512 = "jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA==";
       };
     };
     "hast-util-has-property-1.0.4" = {
@@ -24559,13 +24865,13 @@ let
         sha512 = "oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ==";
       };
     };
-    "hast-util-parse-selector-2.2.4" = {
+    "hast-util-parse-selector-2.2.5" = {
       name = "hast-util-parse-selector";
       packageName = "hast-util-parse-selector";
-      version = "2.2.4";
+      version = "2.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz";
-        sha512 = "gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA==";
+        url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz";
+        sha512 = "7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==";
       };
     };
     "hast-util-phrasing-1.0.5" = {
@@ -24577,13 +24883,22 @@ let
         sha512 = "P3uxm+8bnwcfAS/XpGie9wMmQXAQqsYhgQQKRwmWH/V6chiq0lmTy8KjQRJmYjusdMtNKGCUksdILSZy1suSpQ==";
       };
     };
-    "hast-util-to-nlcst-1.2.7" = {
+    "hast-util-to-html-7.1.2" = {
+      name = "hast-util-to-html";
+      packageName = "hast-util-to-html";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-7.1.2.tgz";
+        sha512 = "pu73bvORzdF6XZgwl9eID/0RjBb/jtRfoGRRSykpR1+o9rCdiAHpgkSukZsQBRlIqMg6ylAcd7F0F7myJUb09Q==";
+      };
+    };
+    "hast-util-to-nlcst-1.2.8" = {
       name = "hast-util-to-nlcst";
       packageName = "hast-util-to-nlcst";
-      version = "1.2.7";
+      version = "1.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hast-util-to-nlcst/-/hast-util-to-nlcst-1.2.7.tgz";
-        sha512 = "IeHm2Ndwu9G7xtLswt51k3zpprLMckg7ahsvvJAG6hTPXfg+pwIu4FS30lrcxyWVMzNt35ZEoW78z4QCFTp0qw==";
+        url = "https://registry.npmjs.org/hast-util-to-nlcst/-/hast-util-to-nlcst-1.2.8.tgz";
+        sha512 = "cKMArohUvGw4fpN9PKDCIB+klMojkWzz5zNVNFRdKa0oC1MVX1TaDki1E/tb9xqS8WlUjKifIjmrNmRbEJzrJg==";
       };
     };
     "hast-util-to-string-1.0.4" = {
@@ -24604,13 +24919,13 @@ let
         sha512 = "I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==";
       };
     };
-    "hastscript-5.1.2" = {
+    "hastscript-6.0.0" = {
       name = "hastscript";
       packageName = "hastscript";
-      version = "5.1.2";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hastscript/-/hastscript-5.1.2.tgz";
-        sha512 = "WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ==";
+        url = "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz";
+        sha512 = "nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==";
       };
     };
     "hasurl-1.0.0" = {
@@ -24712,6 +25027,24 @@ let
         sha1 = "69c1af3f02121f3d8788e02e84dc8b3905d71195";
       };
     };
+    "heroku-cli-util-8.0.12" = {
+      name = "heroku-cli-util";
+      packageName = "heroku-cli-util";
+      version = "8.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/heroku-cli-util/-/heroku-cli-util-8.0.12.tgz";
+        sha512 = "63wB17oSktlA/HzpIV/PGe8Isq5AZArT51KAW1gg54zyYRIiHOwXik93HZuuRVUaVrWvVUhItFeLgqMwAwlTsw==";
+      };
+    };
+    "heroku-client-3.1.0" = {
+      name = "heroku-client";
+      packageName = "heroku-client";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/heroku-client/-/heroku-client-3.1.0.tgz";
+        sha512 = "UfGKwUm5duzzSVI8uUXlNAE1mus6uPxmZPji4vuG1ArV5DYL1rXsZShp0OoxraWdEwYoxCUrM6KGztC68x5EZQ==";
+      };
+    };
     "hex-color-regex-1.1.0" = {
       name = "hex-color-regex";
       packageName = "hex-color-regex";
@@ -25081,6 +25414,15 @@ let
         sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==";
       };
     };
+    "htmlparser2-5.0.1" = {
+      name = "htmlparser2";
+      packageName = "htmlparser2";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz";
+        sha512 = "vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==";
+      };
+    };
     "http-auth-2.0.7" = {
       name = "http-auth";
       packageName = "http-auth";
@@ -25196,7 +25538,7 @@ let
       src = fetchgit {
         url = "git://github.com/feross/http-node";
         rev = "342ef8624495343ffd050bd0808b3750cf0e3974";
-        sha256 = "d7408d01b05fcbd5bb4fb44fd3d7d71463bafd5124d7e69c6f3e97cef8c65368";
+        sha256 = "031176ff1f6ceb8f650cbf2c36863f417e699f0610f83fbd94a74159cb8eba8f";
       };
     };
     "http-parser-js-0.4.13" = {
@@ -25613,6 +25955,15 @@ let
         sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
       };
     };
+    "ieee754-1.2.1" = {
+      name = "ieee754";
+      packageName = "ieee754";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz";
+        sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==";
+      };
+    };
     "iferr-0.1.5" = {
       name = "iferr";
       packageName = "iferr";
@@ -25730,13 +26081,13 @@ let
         sha1 = "0ecdad0c546332672d7b5b511b26bb18ce56e73f";
       };
     };
-    "immediate-chunk-store-2.1.0" = {
+    "immediate-chunk-store-2.1.1" = {
       name = "immediate-chunk-store";
       packageName = "immediate-chunk-store";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.1.0.tgz";
-        sha512 = "QshP0SFpsy/bHQBjYMgzCcnLoqTj6PHFg8ZkPi2WbTw1qddNy0puuPDaFlXyrsZAdWMT3QziPDMzfj+mzCVMYg==";
+        url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.1.1.tgz";
+        sha512 = "y5AxkxqpPTj2dkaAEkDnrMuSX4JNicXHD6yTpLfFnflVejL6yJpzf27obrnlf2PSSQiWUf3735Y9tJEjxvqnoA==";
       };
     };
     "immer-1.10.0" = {
@@ -25748,6 +26099,15 @@ let
         sha512 = "O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==";
       };
     };
+    "immer-7.0.14" = {
+      name = "immer";
+      packageName = "immer";
+      version = "7.0.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/immer/-/immer-7.0.14.tgz";
+        sha512 = "BxCs6pJwhgSEUEOZjywW7OA8DXVzfHjkBelSEl0A+nEu0+zS4cFVdNOONvt55N4WOm8Pu4xqSPYxhm1Lv2iBBA==";
+      };
+    };
     "import-cwd-3.0.0" = {
       name = "import-cwd";
       packageName = "import-cwd";
@@ -25775,6 +26135,15 @@ let
         sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==";
       };
     };
+    "import-fresh-3.2.2" = {
+      name = "import-fresh";
+      packageName = "import-fresh";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz";
+        sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==";
+      };
+    };
     "import-from-3.0.0" = {
       name = "import-from";
       packageName = "import-from";
@@ -26018,13 +26387,13 @@ let
         sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==";
       };
     };
-    "ink-3.0.7" = {
+    "ink-3.0.8" = {
       name = "ink";
       packageName = "ink";
-      version = "3.0.7";
+      version = "3.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ink/-/ink-3.0.7.tgz";
-        sha512 = "DF/Ena9E8af4+dYu4rrk60WwWB54CPL4s4OspDnBk0uZqntmNZLfc4PftreHeW3sUeQJK+2MdQvPLORro7mDQQ==";
+        url = "https://registry.npmjs.org/ink/-/ink-3.0.8.tgz";
+        sha512 = "ubMFylXYaG4IkXQVhPautbhV/p6Lo0GlvAMI/jh8cGJQ39yeznJbaTTJP2CqZXezA4GOHzalpwCWqux/NEY38w==";
       };
     };
     "ink-text-input-4.0.1" = {
@@ -26162,13 +26531,13 @@ let
         sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==";
       };
     };
-    "inquirer-autocomplete-prompt-1.2.0" = {
+    "inquirer-autocomplete-prompt-1.3.0" = {
       name = "inquirer-autocomplete-prompt";
       packageName = "inquirer-autocomplete-prompt";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.2.0.tgz";
-        sha512 = "t8A0gFq0mOKGz8wmGBPh+M/AC8KSMMcn7dnHXzLWyKvLiRYWswQ6rg7d938hoR5tVP1GpHVmHOR6YP8G5dYhhQ==";
+        url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.3.0.tgz";
+        sha512 = "zvAc+A6SZdcN+earG5SsBu1RnQdtBS4o8wZ/OqJiCfL34cfOx+twVRq7wumYix6Rkdjn1N2nVCcO3wHqKqgdGg==";
       };
     };
     "insert-module-globals-7.2.1" = {
@@ -26675,13 +27044,13 @@ let
         sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
-    "is-buffer-2.0.4" = {
+    "is-buffer-2.0.5" = {
       name = "is-buffer";
       packageName = "is-buffer";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz";
-        sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==";
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz";
+        sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==";
       };
     };
     "is-callable-1.2.2" = {
@@ -27737,13 +28106,13 @@ let
         sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
       };
     };
-    "is-valid-domain-0.0.16" = {
+    "is-valid-domain-0.0.17" = {
       name = "is-valid-domain";
       packageName = "is-valid-domain";
-      version = "0.0.16";
+      version = "0.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.16.tgz";
-        sha512 = "3IUxXDOLh9HBmfyHx9ySK4ZZuN8qU2Z1GPT2jNSmY/H7p8nhEXYX36WYpAQYAulupTgA5WnSYXWiWuLYp3Fw1Q==";
+        url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.17.tgz";
+        sha512 = "w0UWEXyrgPeWWwj9FVT14y4/dSIqWgjDkzxbsGDFpT+QRbyS9HTwwNvGus2IOR/03GzCpeChzSWK9Bo9WlStDA==";
       };
     };
     "is-valid-glob-1.0.0" = {
@@ -28214,13 +28583,13 @@ let
         sha512 = "/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==";
       };
     };
-    "jest-worker-26.5.0" = {
+    "jest-worker-26.6.2" = {
       name = "jest-worker";
       packageName = "jest-worker";
-      version = "26.5.0";
+      version = "26.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz";
-        sha512 = "kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==";
+        url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz";
+        sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==";
       };
     };
     "jetifier-1.6.6" = {
@@ -28295,13 +28664,13 @@ let
         sha1 = "b8417b750661a392bee2c2537c68b2a9d4977cd5";
       };
     };
-    "joplin-turndown-4.0.29" = {
+    "joplin-turndown-4.0.30" = {
       name = "joplin-turndown";
       packageName = "joplin-turndown";
-      version = "4.0.29";
+      version = "4.0.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.29.tgz";
-        sha512 = "rVGu8u4TpSRETo59/jiVW9iaXnpdxxpBHjb7nyCflkDfWhg1Kska4uagBQGw7cD2yxw7mB2YUIB/fAgtlIzcDQ==";
+        url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.30.tgz";
+        sha512 = "OrGdNTsjI6/cbx/es9Hl0YI3YTql4SopduFcYCnWTZgqT0SJqILnF2JQxSNnbPnkSDIIRdNOG4+iNzlY6bS1nw==";
       };
     };
     "joplin-turndown-plugin-gfm-1.0.12" = {
@@ -28358,13 +28727,13 @@ let
         sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51";
       };
     };
-    "jquery.terminal-2.18.3" = {
+    "jquery.terminal-2.19.2" = {
       name = "jquery.terminal";
       packageName = "jquery.terminal";
-      version = "2.18.3";
+      version = "2.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.18.3.tgz";
-        sha512 = "zzMVGYlAC+luF7Omm9UY1/nuvp00mozSgcGImObWSS3uDRtcxnxlwxQLC8tvlTT+koyfOvCBaWgB6AD4DvWVpQ==";
+        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.19.2.tgz";
+        sha512 = "oljqqqN19/tqmsSdr4exz75DlQQ35c/FhP0EkrmQUt1NCXtYGujb8G5uCATDV+EhbDpF6nleH8YsOmzpqpKT/g==";
       };
     };
     "js-base64-2.6.4" = {
@@ -28727,6 +29096,15 @@ let
         sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
       };
     };
+    "json-schema-deref-sync-0.13.0" = {
+      name = "json-schema-deref-sync";
+      packageName = "json-schema-deref-sync";
+      version = "0.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-deref-sync/-/json-schema-deref-sync-0.13.0.tgz";
+        sha512 = "YBOEogm5w9Op337yb6pAT6ZXDqlxAsQCanM3grid8lMWNxRJO/zWEJi3ZzqDL8boWfwhTFym5EFrNgWwpqcBRg==";
+      };
+    };
     "json-schema-deref-sync-0.6.0" = {
       name = "json-schema-deref-sync";
       packageName = "json-schema-deref-sync";
@@ -28934,13 +29312,13 @@ let
         sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
       };
     };
-    "jsonfile-6.0.1" = {
+    "jsonfile-6.1.0" = {
       name = "jsonfile";
       packageName = "jsonfile";
-      version = "6.0.1";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz";
-        sha512 = "jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==";
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz";
+        sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==";
       };
     };
     "jsonify-0.0.0" = {
@@ -29123,13 +29501,13 @@ let
         sha1 = "87fccfaeffc0b68cd19d55f6722943f929ea35ea";
       };
     };
-    "just-detect-adblock-1.0.0" = {
+    "just-detect-adblock-1.1.0" = {
       name = "just-detect-adblock";
       packageName = "just-detect-adblock";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/just-detect-adblock/-/just-detect-adblock-1.0.0.tgz";
-        sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c";
+        url = "https://registry.npmjs.org/just-detect-adblock/-/just-detect-adblock-1.1.0.tgz";
+        sha512 = "xtgnwBBZaLtKspGo6jDX/H0FDsHrn41mQVWhNHge7pZe6Nj2gU2izfC09O0rPU/i97iMcJFVjbecFiTAvmNhLQ==";
       };
     };
     "jwa-1.4.1" = {
@@ -29283,7 +29661,7 @@ let
       src = fetchgit {
         url = "https://github.com/wikimedia/kad.git";
         rev = "96f8f5c8e5a88f5dffed47abc20756e93e16387e";
-        sha256 = "12e5b6430f57389c974e7a393f2c7ac9a26df06a58cfe1afbcb5a5f3f00249ea";
+        sha256 = "801c2201565fb46ad591d4cf717eb30842ca76725c1d19f301418796f39d668e";
       };
     };
     "kad-localstorage-0.0.7" = {
@@ -30294,13 +30672,13 @@ let
         sha512 = "8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA==";
       };
     };
-    "load-ip-set-2.1.0" = {
+    "load-ip-set-2.1.1" = {
       name = "load-ip-set";
       packageName = "load-ip-set";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-2.1.0.tgz";
-        sha512 = "taz7U6B+F7Zq90dfIKwqsB1CrFKelSEmMGC68OUqem8Cgd1QZygQBYb2Fk9i6muBSfH4xwF/Pjt4KKlAdOyWZw==";
+        url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-2.1.1.tgz";
+        sha512 = "LC7BWnATJOrKZa94qKNU8I/cWvVCgHPGSEMZ9hNCd3C5Th+XIUuU5lws6KhCK9QYeSD2xADnLUzkUbzYaRJ/lQ==";
       };
     };
     "load-json-file-1.1.0" = {
@@ -32112,13 +32490,13 @@ let
         sha512 = "rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA==";
       };
     };
-    "lunr-2.3.6" = {
+    "lunr-2.3.8" = {
       name = "lunr";
       packageName = "lunr";
-      version = "2.3.6";
+      version = "2.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lunr/-/lunr-2.3.6.tgz";
-        sha512 = "swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==";
+        url = "https://registry.npmjs.org/lunr/-/lunr-2.3.8.tgz";
+        sha512 = "oxMeX/Y35PNFuZoHp+jUj5OSEmLCaIH4KTFJh7a93cHBoFmpw2IoPs22VIz7vyO2YUnx2Tn9dzIwO2P/4quIRg==";
       };
     };
     "lynx-0.2.0" = {
@@ -32229,13 +32607,22 @@ let
         sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8";
       };
     };
-    "magnet-uri-5.3.0" = {
+    "magnet-uri-5.4.0" = {
       name = "magnet-uri";
       packageName = "magnet-uri";
-      version = "5.3.0";
+      version = "5.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.3.0.tgz";
-        sha512 = "8GuTc9mXYfaKrXz687kzx2YTEhMR/X1Qgt6tkTNwPlb2fUy3QfU+O9zuoB5DKAa/IyVdLGxe9xSFUtaA+ZG5tQ==";
+        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.4.0.tgz";
+        sha512 = "ZpqciThlbvE6KkyT5oxAup/6CwjePw1hdtR8NU5+vq2hn9Sp5b7w3bRiJRvo9fMHUj2dWSuVCdkqt9p4ed1V9Q==";
+      };
+    };
+    "magnet-uri-6.0.0" = {
+      name = "magnet-uri";
+      packageName = "magnet-uri";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-6.0.0.tgz";
+        sha512 = "p9wst4k4u0seE7yPonAPKIUTaiC+fm706o2D8FrNoBalK5CcQdU4hB+RHQTqfIISYkFp0nZzsgyKPacPa6Yg/g==";
       };
     };
     "make-dir-1.3.0" = {
@@ -32652,15 +33039,6 @@ let
         sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==";
       };
     };
-    "marked-0.6.3" = {
-      name = "marked";
-      packageName = "marked";
-      version = "0.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz";
-        sha512 = "Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ==";
-      };
-    };
     "marked-0.7.0" = {
       name = "marked";
       packageName = "marked";
@@ -32679,13 +33057,13 @@ let
         sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==";
       };
     };
-    "marked-1.2.0" = {
+    "marked-1.2.2" = {
       name = "marked";
       packageName = "marked";
-      version = "1.2.0";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-1.2.0.tgz";
-        sha512 = "tiRxakgbNPBr301ihe/785NntvYyhxlqcL3YaC8CaxJQh7kiaEtrN9B/eK2I2943Yjkh5gw25chYFDQhOMCwMA==";
+        url = "https://registry.npmjs.org/marked/-/marked-1.2.2.tgz";
+        sha512 = "5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ==";
       };
     };
     "marked-terminal-4.1.0" = {
@@ -32922,13 +33300,13 @@ let
         sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==";
       };
     };
-    "mdast-util-to-nlcst-4.0.0" = {
+    "mdast-util-to-nlcst-4.0.1" = {
       name = "mdast-util-to-nlcst";
       packageName = "mdast-util-to-nlcst";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-4.0.0.tgz";
-        sha512 = "CPDf82bVAVImJTZgZ9S1yxGczDyoYi1R+edzz8EVFUPvT3RN0RZnnSnMikawLf6ukAKj6pyhsG0exSO7UEA3DA==";
+        url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-4.0.1.tgz";
+        sha512 = "Y4ffygj85MTt70STKnEquw6k73jYWJBaYcb4ITAKgSNokZF7fH8rEHZ1GsRY/JaxqUevMaEnsDmkVv5Z9uVRdg==";
       };
     };
     "mdmanifest-1.0.8" = {
@@ -32949,6 +33327,15 @@ let
         sha512 = "yjM/OG0krZIgi+XrhJWS3CJ9UQuGM4FfjIUIt2f65er6qczkM+WjtNEv/9ZF9DxDs/2GR3SO6hDaZLplTRrrfw==";
       };
     };
+    "mdn-data-2.0.12" = {
+      name = "mdn-data";
+      packageName = "mdn-data";
+      version = "2.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.12.tgz";
+        sha512 = "ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==";
+      };
+    };
     "mdn-data-2.0.4" = {
       name = "mdn-data";
       packageName = "mdn-data";
@@ -32958,15 +33345,6 @@ let
         sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==";
       };
     };
-    "mdn-data-2.0.6" = {
-      name = "mdn-data";
-      packageName = "mdn-data";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz";
-        sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==";
-      };
-    };
     "mdns-js-0.5.0" = {
       name = "mdns-js";
       packageName = "mdns-js";
@@ -33021,13 +33399,13 @@ let
         sha512 = "aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==";
       };
     };
-    "mediasource-2.3.0" = {
+    "mediasource-2.4.0" = {
       name = "mediasource";
       packageName = "mediasource";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mediasource/-/mediasource-2.3.0.tgz";
-        sha512 = "fqm86UwHvAnneIv40Uy1sDQaFtAByq/k0SQ3uCtbnEeSQNT1s5TDHCZOD1VmYCHwfY1jL2NjoZVwzZKYqy3L7A==";
+        url = "https://registry.npmjs.org/mediasource/-/mediasource-2.4.0.tgz";
+        sha512 = "SKUMrbFMHgiCUZFOWZcL0aiF/KgHx9SPIKzxrl6+7nMUMDK/ZnOmJdY/9wKzYeM0g3mybt3ueg+W+/mrYfmeFQ==";
       };
     };
     "mediawiki-title-0.6.5" = {
@@ -33084,13 +33462,13 @@ let
         sha512 = "e0WfJAMm8Gv1mP5fEq/Blzy6Lt1VbLg7gNnZmZak7nhrBTibs+c6nQ4SKs/ZyJYHS1mFgDJeopsLAv7Ow0FMFg==";
       };
     };
-    "mem-fs-editor-7.0.1" = {
+    "mem-fs-editor-7.1.0" = {
       name = "mem-fs-editor";
       packageName = "mem-fs-editor";
-      version = "7.0.1";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-7.0.1.tgz";
-        sha512 = "eD8r4/d2ayp9HHIgBPHB6Ds0ggA8F9cf9HxcNtbqrwqJXfIDrOSMG5K4fV3+Ib3B+HIdrWqkeDDDvrO7i9EbvQ==";
+        url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-7.1.0.tgz";
+        sha512 = "BH6QEqCXSqGeX48V7zu+e3cMwHU7x640NB8Zk8VNvVZniz+p4FK60pMx/3yfkzo6miI6G3a8pH6z7FeuIzqrzA==";
       };
     };
     "memfs-3.2.0" = {
@@ -33201,6 +33579,15 @@ let
         sha512 = "HQM+cZB/kY1+jj57It22FsptJ3nuZRYxnwh3rWZEvDZO1zuzhIrX9uyFcjP9AhFQvM5WS6vZKtn3veohDH4S7w==";
       };
     };
+    "memorystore-1.6.4" = {
+      name = "memorystore";
+      packageName = "memorystore";
+      version = "1.6.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.4.tgz";
+        sha512 = "51j4kUedbqkWGby44hAhf5f/hj8GOvHoLX00/YHURBNxOMf5k8JbPuGfmeNpZEXhc3vrmfnFben4+rOOx3HjEQ==";
+      };
+    };
     "memorystream-0.3.1" = {
       name = "memorystream";
       packageName = "memorystream";
@@ -34083,22 +34470,31 @@ let
         sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d";
       };
     };
-    "mobx-4.15.7" = {
+    "mobx-6.0.2" = {
       name = "mobx";
       packageName = "mobx";
-      version = "4.15.7";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mobx/-/mobx-4.15.7.tgz";
-        sha512 = "X4uQvuf2zYKHVO5kRT5Utmr+J9fDnRgxWWnSqJ4oiccPTQU38YG+/O3nPmOhUy4jeHexl7XJJpWDBgEnEfp+8w==";
+        url = "https://registry.npmjs.org/mobx/-/mobx-6.0.2.tgz";
+        sha512 = "MG+8YbcwJw0tjJ78ujooqE8rxvCIfDaVZbCLfCxQ9S81oNNJb6W4KZVMSR+Y1e5n4z1vh70/vkibv0xEGwuEPQ==";
       };
     };
-    "mobx-react-5.4.4" = {
+    "mobx-react-6.3.1" = {
       name = "mobx-react";
       packageName = "mobx-react";
-      version = "5.4.4";
+      version = "6.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.4.tgz";
-        sha512 = "2mTzpyEjVB/RGk2i6KbcmP4HWcAUFox5ZRCrGvSyz49w20I4C4qql63grPpYrS9E9GKwgydBHQlA4y665LuRCQ==";
+        url = "https://registry.npmjs.org/mobx-react/-/mobx-react-6.3.1.tgz";
+        sha512 = "IOxdJGnRSNSJrL2uGpWO5w9JH5q5HoxEqwOF4gye1gmZYdjoYkkMzSGMDnRCUpN/BNzZcFoMdHXrjvkwO7KgaQ==";
+      };
+    };
+    "mobx-react-lite-2.2.2" = {
+      name = "mobx-react-lite";
+      packageName = "mobx-react-lite";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-2.2.2.tgz";
+        sha512 = "2SlXALHIkyUPDsV4VTKVR9DW7K3Ksh1aaIv3NrNJygTbhXe2A9GrcKHZ2ovIiOp/BXilOcTYemfHHZubP431dg==";
       };
     };
     "mocha-2.5.3" = {
@@ -34119,13 +34515,13 @@ let
         sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==";
       };
     };
-    "mocha-8.2.0" = {
+    "mocha-8.2.1" = {
       name = "mocha";
       packageName = "mocha";
-      version = "8.2.0";
+      version = "8.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mocha/-/mocha-8.2.0.tgz";
-        sha512 = "lEWEMq2LMfNJMKeuEwb5UELi+OgFDollXaytR5ggQcHpzG3NP/R7rvixAvF+9/lLsTWhWG+4yD2M70GsM06nxw==";
+        url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz";
+        sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==";
       };
     };
     "mock-require-3.0.3" = {
@@ -34155,13 +34551,13 @@ let
         sha512 = "A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==";
       };
     };
-    "module-definition-3.3.0" = {
+    "module-definition-3.3.1" = {
       name = "module-definition";
       packageName = "module-definition";
-      version = "3.3.0";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/module-definition/-/module-definition-3.3.0.tgz";
-        sha512 = "HTplA9xwDzH67XJFC1YvZMUElWJD28DV0dUq7lhTs+JKJamUOWA/CcYWSlhW5amJO66uWtY7XdltT+LfX0wIVg==";
+        url = "https://registry.npmjs.org/module-definition/-/module-definition-3.3.1.tgz";
+        sha512 = "kLidGPwQ2yq484nSD+D3JoJp4Etc0Ox9P0L34Pu/cU4X4HcG7k7p62XI5BBuvURWMRX3RPyuhOcBHbKus+UH4A==";
       };
     };
     "module-deps-6.2.3" = {
@@ -34596,13 +34992,13 @@ let
         sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ==";
       };
     };
-    "multistream-4.0.0" = {
+    "multistream-4.0.1" = {
       name = "multistream";
       packageName = "multistream";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multistream/-/multistream-4.0.0.tgz";
-        sha512 = "t0C8MAtH/d3Y+5nooEtUMWli92lVw9Jhx4uOhRl5GAwS5vc+YTmp/VXNJNsCBAMeEyK/6zhbk6x9JE3AiCvo4g==";
+        url = "https://registry.npmjs.org/multistream/-/multistream-4.0.1.tgz";
+        sha512 = "LNPIR/LD0JUw2beGlSv4sgTSnGbZp16d/PG2rnIrYjkeCaepNmBTobuiaNQATCPiYgn+BBuQTm70UlvwRfLZ3Q==";
       };
     };
     "munin-plugin-0.0.9" = {
@@ -34884,6 +35280,15 @@ let
         sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==";
       };
     };
+    "nanoid-3.1.16" = {
+      name = "nanoid";
+      packageName = "nanoid";
+      version = "3.1.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.16.tgz";
+        sha512 = "+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w==";
+      };
+    };
     "nanolru-1.0.0" = {
       name = "nanolru";
       packageName = "nanolru";
@@ -34947,13 +35352,13 @@ let
         sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11";
       };
     };
-    "native-request-1.0.7" = {
+    "native-request-1.0.8" = {
       name = "native-request";
       packageName = "native-request";
-      version = "1.0.7";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/native-request/-/native-request-1.0.7.tgz";
-        sha512 = "9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ==";
+        url = "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz";
+        sha512 = "vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==";
       };
     };
     "native-url-0.2.6" = {
@@ -35215,7 +35620,7 @@ let
       src = fetchgit {
         url = "https://github.com/arlolra/negotiator.git";
         rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a";
-        sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
+        sha256 = "0cee71d4f5ad49a14f8ff9b33d1e5b1ac9fbcd3866ab7a95068283e1f7d860b6";
       };
     };
     "neo-async-2.6.2" = {
@@ -35245,13 +35650,22 @@ let
         sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==";
       };
     };
-    "netlify-4.8.0" = {
+    "netlify-4.9.0" = {
       name = "netlify";
       packageName = "netlify";
-      version = "4.8.0";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/netlify/-/netlify-4.8.0.tgz";
-        sha512 = "6eaIvlTIwnh1zzFJ0RBMDAE6/GcZ3Y9JIR4cFNZdgINO+zRgWL/vNbjRs2hIerLpOS1eqt6Ye1P9RTqHEQNXUg==";
+        url = "https://registry.npmjs.org/netlify/-/netlify-4.9.0.tgz";
+        sha512 = "x+VqJ+yop05OUpeaT4fhz/NAvJQFjtNhW1s+/i6oP/EZS6/+B0u+qCANF8uP9u3UJcmWvlJmrRoDhj62Xvtwug==";
+      };
+    };
+    "netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" = {
+      name = "netlify-plugin-deploy-preview-commenting";
+      packageName = "netlify-plugin-deploy-preview-commenting";
+      version = "0.0.1-alpha.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/netlify-plugin-deploy-preview-commenting/-/netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16.tgz";
+        sha512 = "5Rvi17CKgPpZTazEV2wkSj4IbS2zJpoKuytaYCyvemV/CMVeZUUPRwNPWm7+NjxObqJHgzUyi2FmWql8HfWhGA==";
       };
     };
     "netlify-redirect-parser-2.5.0" = {
@@ -35281,6 +35695,15 @@ let
         sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35";
       };
     };
+    "netrc-parser-3.1.6" = {
+      name = "netrc-parser";
+      packageName = "netrc-parser";
+      version = "3.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/netrc-parser/-/netrc-parser-3.1.6.tgz";
+        sha512 = "lY+fmkqSwntAAjfP63jB4z5p5WbuZwyMCD3pInT7dpHU/Gc6Vv90SAC6A0aNiqaRGHiuZFBtiwu+pu8W/Eyotw==";
+      };
+    };
     "nets-3.2.0" = {
       name = "nets";
       packageName = "nets";
@@ -35344,13 +35767,13 @@ let
         sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==";
       };
     };
-    "nextgen-events-1.3.0" = {
+    "nextgen-events-1.3.3" = {
       name = "nextgen-events";
       packageName = "nextgen-events";
-      version = "1.3.0";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.3.0.tgz";
-        sha512 = "eBz5mrO4Hw2eenPVm0AVPHuAzg/RZetAWMI547RH8O9+a0UYhCysiZ3KoNWslnWNlHetb9kzowEshsKsmFo2YQ==";
+        url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.3.3.tgz";
+        sha512 = "5h9U7had+Q+a95Rwgu4JL6otqXs3y4474g7ruQtd8TAsoG6ycvjccnuLxhXEv32/HOKTC09K+HkbFaITIexLkg==";
       };
     };
     "nice-try-1.0.5" = {
@@ -35371,22 +35794,22 @@ let
         sha1 = "04b035cb530d46859d1018839a518c029133f676";
       };
     };
-    "nlcst-is-literal-1.2.1" = {
+    "nlcst-is-literal-1.2.2" = {
       name = "nlcst-is-literal";
       packageName = "nlcst-is-literal";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.1.tgz";
-        sha512 = "abNv1XY7TUoyLn5kSSorMIYHfRvVfXbgftNFNvEMiQQkyKteLdjrGuDqEMMyK70sMbn7uPA6oUbRvykM6pg+pg==";
+        url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.2.tgz";
+        sha512 = "R+1OJEmRl3ZOp9d8PbiRxGpnvmpi3jU+lzSqCJoLeogdEh0FYDRH1aC223qUbaKffxNTJkEfeDOeQfziw749yA==";
       };
     };
-    "nlcst-normalize-2.1.4" = {
+    "nlcst-normalize-2.1.5" = {
       name = "nlcst-normalize";
       packageName = "nlcst-normalize";
-      version = "2.1.4";
+      version = "2.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.4.tgz";
-        sha512 = "dWJ3XUoAoWoau24xOM59Y1FPozv7DyYWy+rdUaXj9Ow0hBCVuwqDQbXzTF7H+HskyTVpTkRPXYPu4YsMEScmRw==";
+        url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.5.tgz";
+        sha512 = "xSqTKv8IHIy3n/orD7wj81BZljLfbrTot0Pv64MYUnQUXfDbi1xDSpJR4qEmbFWyFoHsmivcOdgrK+o7ky3mcw==";
       };
     };
     "nlcst-search-2.0.0" = {
@@ -35531,7 +35954,7 @@ let
       src = fetchgit {
         url = "https://github.com/laurent22/node-emoji.git";
         rev = "9fa01eac463e94dde1316ef8c53089eeef4973b5";
-        sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406";
+        sha256 = "1499424a28a49687c150369075d5ea3794f18454291078760a6c761e6576d8a3";
       };
     };
     "node-environment-flags-1.0.6" = {
@@ -35669,15 +36092,6 @@ let
         sha512 = "CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==";
       };
     };
-    "node-gyp-build-3.7.0" = {
-      name = "node-gyp-build";
-      packageName = "node-gyp-build";
-      version = "3.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz";
-        sha512 = "L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w==";
-      };
-    };
     "node-gyp-build-3.9.0" = {
       name = "node-gyp-build";
       packageName = "node-gyp-build";
@@ -35705,13 +36119,13 @@ let
         sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==";
       };
     };
-    "node-html-parser-1.3.1" = {
+    "node-html-parser-1.4.5" = {
       name = "node-html-parser";
       packageName = "node-html-parser";
-      version = "1.3.1";
+      version = "1.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.3.1.tgz";
-        sha512 = "AwYVI6GyEKj9NGoyMfSx4j5l7Axf7obQgLWGxtasLjED6RggTTQoq5ZRzjwSUfgSZ+Mv8Nzbi3pID0gFGqNUsA==";
+        url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.5.tgz";
+        sha512 = "sNm4Tdc8zj5HnFtkNEcK/1tpvyfRxEuz1d4rkVceGPeMTfzd2twPTiEo/UbqxOexSt9AzJ/cvQXSTj7fa6Ey1w==";
       };
     };
     "node-int64-0.4.0" = {
@@ -35867,13 +36281,13 @@ let
         sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg==";
       };
     };
-    "node-releases-1.1.64" = {
+    "node-releases-1.1.65" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.64";
+      version = "1.1.65";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.64.tgz";
-        sha512 = "Iec8O9166/x2HRMJyLLLWkd0sFFLrFNy+Xf+JQfSQsdBJzPcHpNl3JQ9gD4j+aJxmCa25jNsIbM4bmACtSbkSg==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.65.tgz";
+        sha512 = "YpzJOe2WFIW0V4ZkJQd/DGR/zdVwc/pI4Nl1CZrBO19FdRcSTmsuhdttw9rsTzzJLrNcSloLiBbEYx1C4f6gpA==";
       };
     };
     "node-source-walk-4.2.0" = {
@@ -36299,13 +36713,13 @@ let
         sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
       };
     };
-    "npm-packlist-2.1.2" = {
+    "npm-packlist-2.1.4" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
-      version = "2.1.2";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.2.tgz";
-        sha512 = "eByPaP+wsKai0BJX5pmb58d3mfR0zUATcnyuvSxIudTEn+swCPFLxh7srCmqB4hr7i9V24/DPjjq5b2qUtbgXQ==";
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.4.tgz";
+        sha512 = "Qzg2pvXC9U4I4fLnUrBmcIT4x0woLtUgxUi9eC+Zrcv1Xx5eamytGAfbDWQ67j7xOcQ2VW1I3su9smVTIdu7Hw==";
       };
     };
     "npm-pick-manifest-3.0.2" = {
@@ -36569,13 +36983,13 @@ let
         sha512 = "2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ==";
       };
     };
-    "oas-validator-3.4.0" = {
+    "oas-validator-4.0.8" = {
       name = "oas-validator";
       packageName = "oas-validator";
-      version = "3.4.0";
+      version = "4.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oas-validator/-/oas-validator-3.4.0.tgz";
-        sha512 = "l/SxykuACi2U51osSsBXTxdsFc8Fw41xI7AsZkzgVgWJAzoEFaaNptt35WgY9C3757RUclsm6ye5GvSyYoozLQ==";
+        url = "https://registry.npmjs.org/oas-validator/-/oas-validator-4.0.8.tgz";
+        sha512 = "bIt8erTyclF7bkaySTtQ9sppqyVc+mAlPi7vPzCLVHJsL9nrivQjc/jHLX/o+eGbxHd6a6YBwuY/Vxa6wGsiuw==";
       };
     };
     "oas-validator-5.0.3" = {
@@ -36795,13 +37209,13 @@ let
         sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w==";
       };
     };
-    "object-treeify-1.1.28" = {
+    "object-treeify-1.1.29" = {
       name = "object-treeify";
       packageName = "object-treeify";
-      version = "1.1.28";
+      version = "1.1.29";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.28.tgz";
-        sha512 = "FoBGZexpq9jJr6mDgV8wv711vreKyzRcw65TKeXzHh98+TNmPZfGYznpel3WceM869WsnSCyUuK46rPUG9+Rpg==";
+        url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.29.tgz";
+        sha512 = "XnPIMyiv6fJeb/z3Bz+u43Fcw3C9fs1uoRITd8x3mau/rsSAUhx7qpIO10Q/dzJeMleJesccUSMiFx8FF+ruBA==";
       };
     };
     "object-visit-1.0.1" = {
@@ -36822,13 +37236,13 @@ let
         sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
       };
     };
-    "object.assign-4.1.1" = {
+    "object.assign-4.1.2" = {
       name = "object.assign";
       packageName = "object.assign";
-      version = "4.1.1";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz";
-        sha512 = "VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==";
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
+        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
       };
     };
     "object.defaults-1.1.0" = {
@@ -36975,13 +37389,13 @@ let
         sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==";
       };
     };
-    "office-ui-fabric-react-7.147.1" = {
+    "office-ui-fabric-react-7.149.3" = {
       name = "office-ui-fabric-react";
       packageName = "office-ui-fabric-react";
-      version = "7.147.1";
+      version = "7.149.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.147.1.tgz";
-        sha512 = "nG3h14lvWoTqcO8wxabIDozw84vV0ZtoUvDe6g8QEKsG1oRHaDe8WhCkCy8XCPnsy7f/5aItlbum7AyZtKdgBQ==";
+        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.149.3.tgz";
+        sha512 = "R0iqyTGX8l+cUB5h8SvhB/i5QexNhlXP8GW3j5NCb8U0ZiEuTVpxCCMDua/0Mmdj6MZmcK/hcL9gmK6ZPUe6qg==";
       };
     };
     "omggif-1.0.10" = {
@@ -37209,15 +37623,6 @@ let
         sha512 = "4HeyhxCvBTI5uBePsAdi55C5fmqnWZ2e2MlmvWi5KW5tdH5rxoiv/aMtbeVxKZc3eWkT1GymMnLG8XC4Rq4TDQ==";
       };
     };
-    "open-7.2.1" = {
-      name = "open";
-      packageName = "open";
-      version = "7.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-7.2.1.tgz";
-        sha512 = "xbYCJib4spUdmcs0g/2mK1nKo/jO2T7INClWd/beL7PFkXRWgr8B23ssDHX/USPn2M2IjDR5UdpYs6I67SnTSA==";
-      };
-    };
     "open-7.3.0" = {
       name = "open";
       packageName = "open";
@@ -37335,13 +37740,13 @@ let
         sha512 = "Fxr9YdQ6s7/SIvvM888iWnc1GUn/fFxTaMFqHkUv0/eNCYoBfOwAKj9aptaRfL+BJXlsVdXWCJd3GWkwn8sIJA==";
       };
     };
-    "openapi-sampler-1.0.0-beta.14" = {
+    "openapi-sampler-1.0.0-beta.18" = {
       name = "openapi-sampler";
       packageName = "openapi-sampler";
-      version = "1.0.0-beta.14";
+      version = "1.0.0-beta.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.14.tgz";
-        sha512 = "NNmH9YAN5AaCE4w6MQXdCrmsOJJQTswHVSp075+h+iiG+OTonpZE8HzwocozovD2imx4lamkuxGLs4E4bO4Z+g==";
+        url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.18.tgz";
+        sha512 = "nG/0kvvSY5FbrU5A+Dbp1xTQN++7pKIh87/atryZlxrzDuok5Y6TCbpxO1jYqpUKLycE4ReKGHCywezngG6xtQ==";
       };
     };
     "openapi-schema-validator-3.0.3" = {
@@ -37461,6 +37866,15 @@ let
         sha512 = "nNnZDkUNExBwEpb7LZaeMeQgvrlO8l4bgY/LvGNZCR0xG/dGWqHqjKrAmR5GUoYo0FIz38kxasvA1aevxWs2CA==";
       };
     };
+    "opn-3.0.3" = {
+      name = "opn";
+      packageName = "opn";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz";
+        sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a";
+      };
+    };
     "opn-4.0.2" = {
       name = "opn";
       packageName = "opn";
@@ -38658,15 +39072,6 @@ let
         sha512 = "3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==";
       };
     };
-    "parse-numeric-range-1.2.0" = {
-      name = "parse-numeric-range";
-      packageName = "parse-numeric-range";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-1.2.0.tgz";
-        sha512 = "1q2tXpAOplPxcl8vrIGPWz1dJxxfmdRkCFcpxxMBerDnGuuHalOWF/xj9L8Nn5XoTUoB/6F0CeQBp2fMgkOYFg==";
-      };
-    };
     "parse-passwd-1.0.0" = {
       name = "parse-passwd";
       packageName = "parse-passwd";
@@ -38739,6 +39144,15 @@ let
         sha512 = "to8zT7+o6bVTyP35r2QgG1svuFGMFO1mE6ri1oWHgL9tlgnOtfjmfHmA3mOuP9HTIU/8OiZw0NG5zbyqVLxhvA==";
       };
     };
+    "parse-torrent-9.0.0" = {
+      name = "parse-torrent";
+      packageName = "parse-torrent";
+      version = "9.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.0.0.tgz";
+        sha512 = "Er+VA8XwlGbuwEwss7LYIbWZRYvttS1c+0Td6FMxZhIog/0HDlU3A3qbRfL+1aOSM+L+kGL544yRoGbpTRWPsQ==";
+      };
+    };
     "parse-torrent-file-2.1.4" = {
       name = "parse-torrent-file";
       packageName = "parse-torrent-file";
@@ -39432,13 +39846,13 @@ let
         sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==";
       };
     };
-    "pg-pool-3.2.1" = {
+    "pg-pool-3.2.2" = {
       name = "pg-pool";
       packageName = "pg-pool";
-      version = "3.2.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.1.tgz";
-        sha512 = "BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA==";
+        url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz";
+        sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==";
       };
     };
     "pg-protocol-1.3.0" = {
@@ -39459,13 +39873,13 @@ let
         sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==";
       };
     };
-    "pgpass-1.0.2" = {
+    "pgpass-1.0.4" = {
       name = "pgpass";
       packageName = "pgpass";
-      version = "1.0.2";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz";
-        sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306";
+        url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz";
+        sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==";
       };
     };
     "phantomjs-prebuilt-2.1.16" = {
@@ -40006,7 +40420,7 @@ let
       src = fetchgit {
         url = "git://github.com/anmonteiro/node-getopt";
         rev = "a3123885e3559c9b70903948d6e5c34852520d74";
-        sha256 = "0092766ac49279342f7d17677359880b44b245ad9d32237a11a5ea45cb0d03fa";
+        sha256 = "aec063ab02e2782e6587759b4c7dfd8d8e27f174bbc62dd65842658e30e56720";
       };
     };
     "postcss-5.2.18" = {
@@ -40648,13 +41062,13 @@ let
         sha512 = "BUIorsYJTvS9UhXxPTzupIztOMVNPa/HtAm9KHni9z6qEfiJ1bpOBL5DfUOL9XAc3XkLIEzBzpph+Zbm4AdRAg==";
       };
     };
-    "posthtml-parser-0.5.0" = {
+    "posthtml-parser-0.5.2" = {
       name = "posthtml-parser";
       packageName = "posthtml-parser";
-      version = "0.5.0";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.5.0.tgz";
-        sha512 = "BsZFAqOeX9lkJJPKG2JmGgtm6t++WibU7FeS40FNNGZ1KS2szRSRQ8Wr2JLvikDgAecrQ/9V4sjugTAin2+KVw==";
+        url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.5.2.tgz";
+        sha512 = "rwRA0TyUTivQN6NAG8CLhi8KEdqjWQMZSAJQedxkuH1c8/hme99WDVOW+z8Ony+YLmoaH0sJRUk6RCWVFQ6Rkw==";
       };
     };
     "posthtml-render-1.2.3" = {
@@ -40792,15 +41206,6 @@ let
         sha1 = "994b02aa46f699c50b6257b5faaa7fe2557e62d6";
       };
     };
-    "prettier-eslint-10.1.1" = {
-      name = "prettier-eslint";
-      packageName = "prettier-eslint";
-      version = "10.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-10.1.1.tgz";
-        sha512 = "TtYxuFUMVxudJTSnPScaBqHZm/48ndvX3KLFzhejJYbRzRybmM9RdBfn9YzgN0itfPrYxCesIZGJqyXXZJOR2w==";
-      };
-    };
     "prettier-eslint-11.0.0" = {
       name = "prettier-eslint";
       packageName = "prettier-eslint";
@@ -41269,13 +41674,13 @@ let
         sha1 = "2a13fa063688a2a5983b161fff0108a07d26fc74";
       };
     };
-    "prompts-2.3.2" = {
+    "prompts-2.4.0" = {
       name = "prompts";
       packageName = "prompts";
-      version = "2.3.2";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz";
-        sha512 = "Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==";
+        url = "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz";
+        sha512 = "awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==";
       };
     };
     "promzard-0.3.0" = {
@@ -42223,22 +42628,22 @@ let
         sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
       };
     };
-    "pupa-2.0.1" = {
+    "pupa-2.1.1" = {
       name = "pupa";
       packageName = "pupa";
-      version = "2.0.1";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz";
-        sha512 = "hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==";
+        url = "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz";
+        sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==";
       };
     };
-    "puppeteer-5.3.1" = {
+    "puppeteer-5.4.1" = {
       name = "puppeteer";
       packageName = "puppeteer";
-      version = "5.3.1";
+      version = "5.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-5.3.1.tgz";
-        sha512 = "YTM1RaBeYrj6n7IlRXRYLqJHF+GM7tasbvrNFx6w1S16G76NrPq7oYFKLDO+BQsXNtS8kW2GxWCXjIMPvfDyaQ==";
+        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-5.4.1.tgz";
+        sha512 = "8u6r9tFm3gtMylU4uCry1W/CeAA8uczKMONvGvivkTsGqKA7iB7DWO2CBFYlB9GY6/IEoq9vkI5slJWzUBkwNw==";
       };
     };
     "purgecss-2.3.0" = {
@@ -42493,13 +42898,13 @@ let
         sha512 = "AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw==";
       };
     };
-    "queue-microtask-1.1.4" = {
+    "queue-microtask-1.2.0" = {
       name = "queue-microtask";
       packageName = "queue-microtask";
-      version = "1.1.4";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.1.4.tgz";
-        sha512 = "eY/4Obve9cE5FK8YvC1cJsm5cr7XvAurul8UtBDJ2PR1p5NmAwHtvAt5ftcLtwYRCUKNhxCneZZlxmUDFoSeKA==";
+        url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.0.tgz";
+        sha512 = "J95OVUiS4b8qqmpqhCodN8yPpHG2mpZUPQ8tDGyIY0VhM+kBHszOuvsMJVGNQ1OH2BnTFbqz45i+2jGpDw9H0w==";
       };
     };
     "quick-format-unescaped-4.0.1" = {
@@ -42664,13 +43069,13 @@ let
         sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b";
       };
     };
-    "random-item-3.0.0" = {
+    "random-item-3.1.0" = {
       name = "random-item";
       packageName = "random-item";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-item/-/random-item-3.0.0.tgz";
-        sha512 = "IpO3Jk9/Dt79R7iS/Fn2d2asGXahMNnXLNRsgSmjTTtiS0tZ972BWEEm9uUgm3YAon5YFUt8126FA9wJAjmeZw==";
+        url = "https://registry.npmjs.org/random-item/-/random-item-3.1.0.tgz";
+        sha512 = "0DyAT8LYBNQKSkqcPjia/HNoWCZ5JWBdAQWjBQVh5DMVv3Fv7V90I8/AuUf8NW4zdFn27i9qj8Kp6wI5JsiiOA==";
       };
     };
     "random-iterate-1.0.1" = {
@@ -42844,6 +43249,15 @@ let
         sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA==";
       };
     };
+    "re-reselect-4.0.0" = {
+      name = "re-reselect";
+      packageName = "re-reselect";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/re-reselect/-/re-reselect-4.0.0.tgz";
+        sha512 = "wuygyq8TXUlSdVXv2kigXxQNOgdb9m7LbIjwfTNGSpaY1riLd5e+VeQjlQMyUtrk0oiyhi1AqIVynworl3qxHA==";
+      };
+    };
     "react-16.14.0" = {
       name = "react";
       packageName = "react";
@@ -42880,31 +43294,13 @@ let
         sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==";
       };
     };
-    "react-dropdown-1.9.0" = {
-      name = "react-dropdown";
-      packageName = "react-dropdown";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/react-dropdown/-/react-dropdown-1.9.0.tgz";
-        sha512 = "BDApCUhs0qHqnFW3b54SuqI200FOOsmiy0dejdmtdTn/MMY11jcou3CLX1oT2Qa1PdN7viTyAGT8YCpK5qb9xg==";
-      };
-    };
-    "react-error-overlay-6.0.7" = {
+    "react-error-overlay-6.0.8" = {
       name = "react-error-overlay";
       packageName = "react-error-overlay";
-      version = "6.0.7";
+      version = "6.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz";
-        sha512 = "TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA==";
-      };
-    };
-    "react-hot-loader-4.13.0" = {
-      name = "react-hot-loader";
-      packageName = "react-hot-loader";
-      version = "4.13.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.13.0.tgz";
-        sha512 = "JrLlvUPqh6wIkrK2hZDfOyq/Uh/WeVEr8nc7hkn2/3Ul0sx1Kr5y4kOGNacNRoj7RhwLNcQ3Udf1KJXrqc0ZtA==";
+        url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.8.tgz";
+        sha512 = "HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw==";
       };
     };
     "react-is-16.13.1" = {
@@ -42916,15 +43312,6 @@ let
         sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==";
       };
     };
-    "react-lifecycles-compat-3.0.4" = {
-      name = "react-lifecycles-compat";
-      packageName = "react-lifecycles-compat";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz";
-        sha512 = "fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==";
-      };
-    };
     "react-reconciler-0.24.0" = {
       name = "react-reconciler";
       packageName = "react-reconciler";
@@ -43429,13 +43816,13 @@ let
         sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b";
       };
     };
-    "redoc-2.0.0-rc.8-1" = {
+    "redoc-2.0.0-rc.45" = {
       name = "redoc";
       packageName = "redoc";
-      version = "2.0.0-rc.8-1";
+      version = "2.0.0-rc.45";
       src = fetchurl {
-        url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.8-1.tgz";
-        sha512 = "/YoCdcl2QtveKz4CTXaqtOfCIaVgZZgcnfUNC5xK7xBl/LxTiNj3tUbgFmrYMLTZGzNdQ9TUJpsa7lXDKcr8Pw==";
+        url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.45.tgz";
+        sha512 = "yOgyXFybwBItvY+y9cFEA6X0W6KDdnkdeWK8LMkTxWN4HUecRwPFYPRdzx+SvDUb8ICh4PDtfyDU3Fo1e9N8Iw==";
       };
     };
     "reduce-component-1.0.1" = {
@@ -43483,13 +43870,13 @@ let
         sha512 = "rQfJ025lvPjw9qyQuNPqE+cRs5qVs7BMrZwgRJnmuMcX/8r/eJE8f5/RCunJWViXKHmN5K2DFafYzglLOHE/tw==";
       };
     };
-    "regenerate-1.4.1" = {
+    "regenerate-1.4.2" = {
       name = "regenerate";
       packageName = "regenerate";
-      version = "1.4.1";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz";
-        sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==";
+        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz";
+        sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==";
       };
     };
     "regenerate-unicode-properties-8.2.0" = {
@@ -43690,6 +44077,15 @@ let
         sha512 = "DitR4wnEvYQEFU8pRPwldGMGW76LM29fvz8s7oTYMwZBMSqNFtBr8eAts/I55LODCQm6b4jzdgFQ+/c6v7RmdA==";
       };
     };
+    "rehype-stringify-8.0.0" = {
+      name = "rehype-stringify";
+      packageName = "rehype-stringify";
+      version = "8.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rehype-stringify/-/rehype-stringify-8.0.0.tgz";
+        sha512 = "VkIs18G0pj2xklyllrPSvdShAV36Ff3yE5PUO9u36f6+2qJFnn22Z5gKwBOwgXviux4UC7K+/j13AnZfPICi/g==";
+      };
+    };
     "reinterval-1.1.0" = {
       name = "reinterval";
       packageName = "reinterval";
@@ -44122,6 +44518,15 @@ let
         sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
       };
     };
+    "request-promise-4.2.6" = {
+      name = "request-promise";
+      packageName = "request-promise";
+      version = "4.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz";
+        sha512 = "HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==";
+      };
+    };
     "request-promise-core-1.1.4" = {
       name = "request-promise-core";
       packageName = "request-promise-core";
@@ -44248,6 +44653,15 @@ let
         sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==";
       };
     };
+    "reselect-4.0.0" = {
+      name = "reselect";
+      packageName = "reselect";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz";
+        sha512 = "qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==";
+      };
+    };
     "resolve-1.17.0" = {
       name = "resolve";
       packageName = "resolve";
@@ -44266,13 +44680,13 @@ let
         sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==";
       };
     };
-    "resolve-2.0.0-next.1" = {
+    "resolve-2.0.0-next.2" = {
       name = "resolve";
       packageName = "resolve";
-      version = "2.0.0-next.1";
+      version = "2.0.0-next.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.1.tgz";
-        sha512 = "ZGTmuLZAW++TDjgslfUMRZcv7kXHv8z0zwxvuRWOPjnqc56HVsn1lVaqsWOZeQ8MwiilPVJLrcPVKG909QsAfA==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.2.tgz";
+        sha512 = "oHC2H45OCkhIeS45uW5zCsSinW+hgWwRtfobOhmkXiO4Q6e6fpZpBuBkZxAqTfoC1O6VIclqK6RjyeGVaxEYtA==";
       };
     };
     "resolve-alpn-1.0.0" = {
@@ -44752,13 +45166,13 @@ let
         sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
       };
     };
-    "rollup-2.32.0" = {
+    "rollup-2.33.1" = {
       name = "rollup";
       packageName = "rollup";
-      version = "2.32.0";
+      version = "2.33.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup/-/rollup-2.32.0.tgz";
-        sha512 = "0FIG1jY88uhCP2yP4CfvtKEqPDRmsUwfY1kEOOM+DH/KOGATgaIFd/is1+fQOxsvh62ELzcFfKonwKWnHhrqmw==";
+        url = "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz";
+        sha512 = "uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==";
       };
     };
     "rollup-plugin-babel-4.4.0" = {
@@ -44941,22 +45355,22 @@ let
         sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==";
       };
     };
-    "run-parallel-1.1.9" = {
+    "run-parallel-1.1.10" = {
       name = "run-parallel";
       packageName = "run-parallel";
-      version = "1.1.9";
+      version = "1.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
-        sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==";
+        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz";
+        sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==";
       };
     };
-    "run-parallel-limit-1.0.5" = {
+    "run-parallel-limit-1.0.6" = {
       name = "run-parallel-limit";
       packageName = "run-parallel-limit";
-      version = "1.0.5";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.5.tgz";
-        sha512 = "NsY+oDngvrvMxKB3G8ijBzIema6aYbQMD2bHOamvN52BysbIGTnEY2xsNyfrcr9GhY995/t/0nQN3R3oZvaDlg==";
+        url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.6.tgz";
+        sha512 = "yFFs4Q2kECi5mWXyyZj3UlAZ5OFq5E07opABC+EmhZdjEkrxXaUwFqOaaNF4tbayMnBxrsbujpeCYTVjGufZGQ==";
       };
     };
     "run-queue-1.0.3" = {
@@ -44968,13 +45382,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "run-series-1.1.8" = {
+    "run-series-1.1.9" = {
       name = "run-series";
       packageName = "run-series";
-      version = "1.1.8";
+      version = "1.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz";
-        sha512 = "+GztYEPRpIsQoCSraWHDBs9WVy4eVME16zhOtDB4H9J4xN0XRhknnmLOl+4gRgZtu8dpp9N/utSPjKH/xmDzXg==";
+        url = "https://registry.npmjs.org/run-series/-/run-series-1.1.9.tgz";
+        sha512 = "Arc4hUN896vjkqCYrUXquBFtRZdv1PfLbTYP71efP6butxyQ0kWpiNJyAgsxscmQg1cqvHY32/UCBzXedTpU2g==";
       };
     };
     "rusha-0.8.13" = {
@@ -45247,22 +45661,22 @@ let
         sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==";
       };
     };
-    "sass-1.27.0" = {
+    "sass-1.28.0" = {
       name = "sass";
       packageName = "sass";
-      version = "1.27.0";
+      version = "1.28.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sass/-/sass-1.27.0.tgz";
-        sha512 = "0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig==";
+        url = "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz";
+        sha512 = "9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A==";
       };
     };
-    "sass-formatter-0.4.15" = {
+    "sass-formatter-0.5.1" = {
       name = "sass-formatter";
       packageName = "sass-formatter";
-      version = "0.4.15";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.15.tgz";
-        sha512 = "EpjwQsya8DmefZawi1sNoCjKw6IGE4z18h9lKd0QPgoGGkis8nqK+mfCMS4B8OaEa0To//71yQyGV1OW1/t60g==";
+        url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.5.1.tgz";
+        sha512 = "hRIyMsN9eKQCx+tQec78EtbRs+Be7vamEh+B+JCdIyIc4t2Ku84FIZHC+qjeu+Q5LDtXcHoMxS61AijNA+SZvA==";
       };
     };
     "sax-0.5.8" = {
@@ -45985,13 +46399,13 @@ let
         sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==";
       };
     };
-    "seventh-0.7.35" = {
+    "seventh-0.7.36" = {
       name = "seventh";
       packageName = "seventh";
-      version = "0.7.35";
+      version = "0.7.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.35.tgz";
-        sha512 = "8uGsybZk/XBSv7BvyjbSeK+R8vpWh2jkZJq0UIMVlJTr9CZsCLTfGWKtcBxmHzMUbzSPxa134prhvZA8GuIx/w==";
+        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.36.tgz";
+        sha512 = "JeOf8Xybc1QeKhb0Hrj4w9WWYpmgGrjhvV48f0Ap/K2jra1TAnVYvKuJfpW01YFuRtwan6Jc3dN6t1JJrIPxcQ==";
       };
     };
     "sha.js-2.4.11" = {
@@ -46174,13 +46588,13 @@ let
         sha512 = "sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==";
       };
     };
-    "shortid-2.2.15" = {
+    "shortid-2.2.16" = {
       name = "shortid";
       packageName = "shortid";
-      version = "2.2.15";
+      version = "2.2.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shortid/-/shortid-2.2.15.tgz";
-        sha512 = "5EaCy2mx2Jgc/Fdn9uuDuNIIfWBpzY4XIlhoqtXF6qsf+/+SGZ+FxDdX/ZsMZiWupIWNqAEmiNY4RC+LSmCeOw==";
+        url = "https://registry.npmjs.org/shortid/-/shortid-2.2.16.tgz";
+        sha512 = "Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==";
       };
     };
     "should-13.2.3" = {
@@ -46381,13 +46795,13 @@ let
         sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3";
       };
     };
-    "simple-peer-9.7.2" = {
+    "simple-peer-9.8.0" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "9.7.2";
+      version = "9.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.7.2.tgz";
-        sha512 = "xeMyxa9B4V0eA6mf17fVr8nm2QhAYFu+ZZv8zkSFFTjJETGF227CshwobrIYZuspJglMD63egcevQXGOrTIsuA==";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.8.0.tgz";
+        sha512 = "GK1KhJvEwtZILr6zWvQR3AnBNpLrxwr6b5wcduFxOrQNGLg9Hn92eFsHD7RYPnnWsapxGXFMJcBjNuicqBDRIQ==";
       };
     };
     "simple-plist-1.1.1" = {
@@ -46615,15 +47029,6 @@ let
         sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
       };
     };
-    "slug-3.5.1" = {
-      name = "slug";
-      packageName = "slug";
-      version = "3.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slug/-/slug-3.5.1.tgz";
-        sha512 = "ei0JnJzg8HKhLunZy+vpNlILRRradfaAQ+p2YEI4b4r8yX/5TlFi1JSwcYQCg7INZxdTC43BT68rHMkRxzn7Xg==";
-      };
-    };
     "slugid-1.1.0" = {
       name = "slugid";
       packageName = "slugid";
@@ -46633,13 +47038,13 @@ let
         sha1 = "e09f00899c09f5a7058edc36dd49f046fd50a82a";
       };
     };
-    "slugify-1.4.5" = {
+    "slugify-1.4.6" = {
       name = "slugify";
       packageName = "slugify";
-      version = "1.4.5";
+      version = "1.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/slugify/-/slugify-1.4.5.tgz";
-        sha512 = "WpECLAgYaxHoEAJ8Q1Lo8HOs1ngn7LN7QjXgOLbmmfkcWvosyk4ZTXkTzKyhngK640USTZUlgoQJfED1kz5fnQ==";
+        url = "https://registry.npmjs.org/slugify/-/slugify-1.4.6.tgz";
+        sha512 = "ZdJIgv9gdrYwhXqxsH9pv7nXxjUEyQ6nqhngRxoAAOlmMGA28FDq5O4/5US4G2/Nod7d1ovNcgURQJ7kHq50KQ==";
       };
     };
     "smart-buffer-4.1.0" = {
@@ -46777,13 +47182,13 @@ let
         sha512 = "/xcDy8H5wxhk+4E9e8zDDGfcNo5g+zpwy585sCDkH5KpHdZHmguPi0GmZ9ZCBTuGIodeTIqsDqkBiA1WXSH7+w==";
       };
     };
-    "snyk-docker-plugin-4.1.1" = {
+    "snyk-docker-plugin-4.7.0" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "4.1.1";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.1.1.tgz";
-        sha512 = "2N8um3cU+qWAVut0Pm/jTM1Hcjyk4kQLKd5nX/Fl/DOhxi62pVpIQ6qGE2LKxYTShEpeC0YS70D9J4ke7ra8Dw==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.7.0.tgz";
+        sha512 = "u8IFJfOBswBMGYMGalY2XrMr+uMBrNCDxRld8wNJJmGtM2yW7tQXKkCqtF266rFrYJnuqIgHHJb+NQiPBK2Ypw==";
       };
     };
     "snyk-go-parser-1.4.1" = {
@@ -46804,13 +47209,13 @@ let
         sha512 = "FAM56z3bl1iuxeqkCEA/jyZ2hpwkQK8xQxQbhR+QppEK5lole7w1PQyWYgZAJ9oRY/BU32zdRAJwGuZbhk7G2Q==";
       };
     };
-    "snyk-gradle-plugin-3.10.0" = {
+    "snyk-gradle-plugin-3.10.1" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "3.10.0";
+      version = "3.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.0.tgz";
-        sha512 = "G33nwUIVALII7mHqKuIxLh1Qj2qsOFd6vbnu4d6lPISVCH9TRBTvirPaVnybWgrO2TWvzZ+jXsZHhG++8kLpXQ==";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.1.tgz";
+        sha512 = "kChphbd9OHdUadkPbYILGeNozwm1QISeEYgAX0Lfth6Gi1ViB71vAErbzzY6MnErImo8m+9rQRuWsqEFv8CvAw==";
       };
     };
     "snyk-module-1.9.1" = {
@@ -46894,6 +47299,15 @@ let
         sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA==";
       };
     };
+    "snyk-poetry-lockfile-parser-1.1.0" = {
+      name = "snyk-poetry-lockfile-parser";
+      packageName = "snyk-poetry-lockfile-parser";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.0.tgz";
+        sha512 = "FTMF6dVl9xOsDBcQT6k4gyoIurO7oZ2i78+rfb4X0W0XH4XYwSXeFw02vQLcWza2eNBvCcFmI0DtXRvQS880SA==";
+      };
+    };
     "snyk-policy-1.14.1" = {
       name = "snyk-policy";
       packageName = "snyk-policy";
@@ -46903,13 +47317,13 @@ let
         sha512 = "C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g==";
       };
     };
-    "snyk-python-plugin-1.17.1" = {
+    "snyk-python-plugin-1.18.0" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.17.1";
+      version = "1.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.17.1.tgz";
-        sha512 = "KKklat9Hfbj4hw2y63LRhgmziYzmyRt+cSuzN5KDmBSAGYck0EAoPDtNpJXjrIs1kPNz28EXnE6NDnadXnOjiQ==";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.18.0.tgz";
+        sha512 = "vt07qsO1rHRAjO7wKwaLUJ0uZyvh6Aceafokc88N9mDyRbY2sf4ptIKEZ718wlbSQDLu17uRXiIQ+9jSWwH6Ng==";
       };
     };
     "snyk-resolve-1.0.1" = {
@@ -47083,13 +47497,13 @@ let
         sha512 = "o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==";
       };
     };
-    "socks-2.4.4" = {
+    "socks-2.5.0" = {
       name = "socks";
       packageName = "socks";
-      version = "2.4.4";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socks/-/socks-2.4.4.tgz";
-        sha512 = "7LmHN4IHj1Vpd/k8D872VGCHJ6yIVyeFkfIBExRmGPYQ/kdUkpdg9eKh9oOzYYYKQhuxavayJHTnmBG+EzluUA==";
+        url = "https://registry.npmjs.org/socks/-/socks-2.5.0.tgz";
+        sha512 = "00OqQHp5SCbwm9ecOMJj9aQtMSjwi1uVuGQoxnpKCS50VKZcOZ8z11CTKypmR8sEy7nZimy/qXY7rYJYbRlXmA==";
       };
     };
     "socks-proxy-agent-4.0.2" = {
@@ -48901,22 +49315,22 @@ let
         sha512 = "b5yrbl3BXIjHau9Prk7U0RRYcUYdN4wGSVaqoBQS50CCE3KBuYU0TYRNPFCP7aVoNMX87HKThdMRVIP3giclKg==";
       };
     };
-    "string.prototype.trimend-1.0.1" = {
+    "string.prototype.trimend-1.0.2" = {
       name = "string.prototype.trimend";
       packageName = "string.prototype.trimend";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
-        sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==";
+        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz";
+        sha512 = "8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==";
       };
     };
-    "string.prototype.trimstart-1.0.1" = {
+    "string.prototype.trimstart-1.0.2" = {
       name = "string.prototype.trimstart";
       packageName = "string.prototype.trimstart";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
-        sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==";
+        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz";
+        sha512 = "7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==";
       };
     };
     "string2compact-1.3.0" = {
@@ -49342,13 +49756,13 @@ let
         sha1 = "7958c793e47e32e07d2b5cafe5c0bf8e12e77902";
       };
     };
-    "styled-components-5.2.0" = {
+    "styled-components-5.2.1" = {
       name = "styled-components";
       packageName = "styled-components";
-      version = "5.2.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/styled-components/-/styled-components-5.2.0.tgz";
-        sha512 = "9qE8Vgp8C5cpGAIdFaQVAl89Zgx1TDM4Yf4tlHbO9cPijtpSXTMLHy9lmP0lb+yImhgPFb1AmZ1qMUubmg3HLg==";
+        url = "https://registry.npmjs.org/styled-components/-/styled-components-5.2.1.tgz";
+        sha512 = "sBdgLWrCFTKtmZm/9x7jkIabjFNVzCUeKfoQsM6R3saImkUnjx0QYdLwJHBjY9ifEcmjDamJDVfknWm1yxZPxQ==";
       };
     };
     "stylehacks-4.0.3" = {
@@ -49486,13 +49900,13 @@ let
         sha512 = "LFLshqEwm1bXd3fEl0STYXZzEHbAz8HwsyItA8vvxhMZrIo+CpB7RrtLvor6mk+7SdfgJhmV3RdIdDIcPAJTTg==";
       };
     };
-    "suf-regex-0.0.23" = {
+    "suf-regex-0.0.25" = {
       name = "suf-regex";
       packageName = "suf-regex";
-      version = "0.0.23";
+      version = "0.0.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.23.tgz";
-        sha512 = "Rupps+hO04fiskhx5YwBaiB8Bbwsy8fsqDfT8FED6DWkumWClb3em+yukbNgmAvUIbLAm7ibJoN+2Pl4golkQw==";
+        url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.25.tgz";
+        sha512 = "0hd6oSzoeqwFgFLtXRoA6lMndzTpgPZCSU+/sCoin0HyKnqni/GX/BkUe9Qgs4uRIV1pxsZzE2pEIbaiFX61AQ==";
       };
     };
     "sugarss-1.0.1" = {
@@ -49774,22 +50188,22 @@ let
         sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw==";
       };
     };
-    "swagger-ui-dist-3.35.2" = {
+    "swagger-ui-dist-3.36.1" = {
       name = "swagger-ui-dist";
       packageName = "swagger-ui-dist";
-      version = "3.35.2";
+      version = "3.36.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.35.2.tgz";
-        sha512 = "19oRW6ZVCTY7JnaMFnIUoxkqI+xhBOGzSFVQTMLDB9KTNASP82v/0SkNpY2T4zbjwZF2Y5bcty9E6rhLGAj0Gg==";
+        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.36.1.tgz";
+        sha512 = "p7lx/OubaaCzOfSYDuMbkRvf/a+rTnQAOySN/NhL+k6D5o9WXEEeKZwj/6fRHRoLSHKZq28jc1xQcz8HuYcgwQ==";
       };
     };
-    "swagger2openapi-5.4.0" = {
+    "swagger2openapi-6.2.3" = {
       name = "swagger2openapi";
       packageName = "swagger2openapi";
-      version = "5.4.0";
+      version = "6.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-5.4.0.tgz";
-        sha512 = "f5QqfXawiVijhjMtYqWZ55ESHPZFqrPC8L9idhIiuSX8O2qsa1i4MVGtCM3TQF+Smzr/6WfT/7zBuzG3aTgPAA==";
+        url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-6.2.3.tgz";
+        sha512 = "cUUktzLpK69UwpMbcTzjMw2ns9RZChfxh56AHv6+hTx3StPOX2foZjPgds3HlJcINbxosYYBn/D3cG8nwcCWwQ==";
       };
     };
     "swagger2openapi-7.0.3" = {
@@ -49882,13 +50296,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.27.10" = {
+    "systeminformation-4.27.11" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.27.10";
+      version = "4.27.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.10.tgz";
-        sha512 = "qXuJaa+3A1bLkFNr/rn3H9Uw8UGodSbq+1QjxDbXua9iexfw4UIdAZZTyu9kE5OkXG1Lt6u0z4aZfxYRVL68EA==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.11.tgz";
+        sha512 = "U7bigXbOnsB8k1vNHS0Y13RCsRz5/UohiUmND+3mMUL6vfzrpbe/h4ZqewowB+B+tJNnmGFDj08Z8xGfYo45dQ==";
       };
     };
     "syswide-cas-5.3.0" = {
@@ -49988,7 +50402,7 @@ let
       src = fetchgit {
         url = "https://github.com/mixu/node-tabtab.git";
         rev = "94af2b878b174527b6636aec88acd46979247755";
-        sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272";
+        sha256 = "6e84c406481c826d85e946e9dc09ed1e71ecfa405f60dd6209e5c835aacf32c1";
       };
     };
     "tabula-1.10.0" = {
@@ -50243,15 +50657,6 @@ let
         sha512 = "s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==";
       };
     };
-    "temp-0.9.0" = {
-      name = "temp";
-      packageName = "temp";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz";
-        sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==";
-      };
-    };
     "temp-0.9.1" = {
       name = "temp";
       packageName = "temp";
@@ -50261,6 +50666,15 @@ let
         sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA==";
       };
     };
+    "temp-0.9.2" = {
+      name = "temp";
+      packageName = "temp";
+      version = "0.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/temp/-/temp-0.9.2.tgz";
+        sha512 = "KLVd6CXeUYsqmI/LBWDLg3bFkdZPg0Xr/Gn79GUuPNiISzp6v/EKUaCOrxqeH1w/wVNmrljyDRgKxhZV9JzyJA==";
+      };
+    };
     "temp-dir-1.0.0" = {
       name = "temp-dir";
       packageName = "temp-dir";
@@ -50342,13 +50756,13 @@ let
         sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
       };
     };
-    "term-size-2.2.0" = {
+    "term-size-2.2.1" = {
       name = "term-size";
       packageName = "term-size";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz";
-        sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==";
+        url = "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz";
+        sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==";
       };
     };
     "terminal-kit-1.44.0" = {
@@ -50387,13 +50801,13 @@ let
         sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==";
       };
     };
-    "terser-5.3.7" = {
+    "terser-5.3.8" = {
       name = "terser";
       packageName = "terser";
-      version = "5.3.7";
+      version = "5.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-5.3.7.tgz";
-        sha512 = "lJbKdfxWvjpV330U4PBZStCT9h3N9A4zZVA5Y4k9sCWXknrpdyxi1oMsRKLmQ/YDMDxSBKIh88v0SkdhdqX06w==";
+        url = "https://registry.npmjs.org/terser/-/terser-5.3.8.tgz";
+        sha512 = "zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ==";
       };
     };
     "terser-webpack-plugin-1.4.5" = {
@@ -50423,13 +50837,13 @@ let
         sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ==";
       };
     };
-    "terser-webpack-plugin-5.0.0" = {
+    "terser-webpack-plugin-5.0.3" = {
       name = "terser-webpack-plugin";
       packageName = "terser-webpack-plugin";
-      version = "5.0.0";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.0.0.tgz";
-        sha512 = "rf7l5a9xamIVX3enQeTl0MY2MNeZClo5yPX/tVPy22oY0nzu0b45h7JqyFi/bygqKWtzXMnml0u12mArhQPsBQ==";
+        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.0.3.tgz";
+        sha512 = "zFdGk8Lh9ZJGPxxPE6jwysOlATWB8GMW8HcfGULWA/nPal+3VdATflQvSBSLQJRCmYZnfFJl6vkRTiwJGNgPiQ==";
       };
     };
     "test-exclude-6.0.0" = {
@@ -50783,13 +51197,13 @@ let
         sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d";
       };
     };
-    "timers-browserify-2.0.11" = {
+    "timers-browserify-2.0.12" = {
       name = "timers-browserify";
       packageName = "timers-browserify";
-      version = "2.0.11";
+      version = "2.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz";
-        sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz";
+        sha512 = "9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==";
       };
     };
     "timers-ext-0.1.7" = {
@@ -51521,13 +51935,13 @@ let
         sha1 = "e3646a2ea4e891312bf7eace6cfb05380bc01c21";
       };
     };
-    "trim-trailing-lines-1.1.3" = {
+    "trim-trailing-lines-1.1.4" = {
       name = "trim-trailing-lines";
       packageName = "trim-trailing-lines";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz";
-        sha512 = "4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==";
+        url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz";
+        sha512 = "rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==";
       };
     };
     "triple-beam-1.3.0" = {
@@ -52133,6 +52547,15 @@ let
         sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==";
       };
     };
+    "typescript-4.0.5" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "4.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz";
+        sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==";
+      };
+    };
     "typescript-eslint-parser-16.0.1" = {
       name = "typescript-eslint-parser";
       packageName = "typescript-eslint-parser";
@@ -52241,13 +52664,13 @@ let
         sha512 = "G440NU6fewtnQftSgqRV1r2A5ChKbU1gqFCJ7I8S7MPpY/eZZfLGefaY6gUZYiWebMaO+txgiQ1ZyLDuNWJulg==";
       };
     };
-    "uglify-js-3.11.3" = {
+    "uglify-js-3.11.5" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.11.3";
+      version = "3.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.3.tgz";
-        sha512 = "wDRziHG94mNj2n3R864CvYw/+pc9y/RNImiTyrrf8BzgWn75JgFSwYvXrtZQMnMnOp/4UTrf3iCSQxSStPiByA==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz";
+        sha512 = "btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w==";
       };
     };
     "uglify-js-3.4.10" = {
@@ -52781,13 +53204,13 @@ let
         sha512 = "lWgIc3rrTMTlK1Y0hEuL+k+ApzFk78h+lsaa2gHf63Gp5Ww+mt11huDniuaoq1H+XMK2lIIjjPkncxXcDp3QDw==";
       };
     };
-    "unist-util-find-all-after-3.0.1" = {
+    "unist-util-find-all-after-3.0.2" = {
       name = "unist-util-find-all-after";
       packageName = "unist-util-find-all-after";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.1.tgz";
-        sha512 = "0GICgc++sRJesLwEYDjFVJPJttBpVQaTNgc6Jw0Jhzvfs+jtKePEMu+uD+PqkRUrAvGQqwhpDwLGWo1PK8PDEw==";
+        url = "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz";
+        sha512 = "xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==";
       };
     };
     "unist-util-inspect-4.1.4" = {
@@ -52835,13 +53258,13 @@ let
         sha512 = "sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==";
       };
     };
-    "unist-util-is-4.0.2" = {
+    "unist-util-is-4.0.3" = {
       name = "unist-util-is";
       packageName = "unist-util-is";
-      version = "4.0.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz";
-        sha512 = "Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==";
+        url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.3.tgz";
+        sha512 = "bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw==";
       };
     };
     "unist-util-map-1.0.5" = {
@@ -53015,6 +53438,15 @@ let
         sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==";
       };
     };
+    "universalify-2.0.0" = {
+      name = "universalify";
+      packageName = "universalify";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz";
+        sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==";
+      };
+    };
     "unix-crypt-td-js-1.1.4" = {
       name = "unix-crypt-td-js";
       packageName = "unix-crypt-td-js";
@@ -53249,6 +53681,15 @@ let
         sha512 = "8tqsiVrMv7aZsKNSjqA6DdBLKJpZG1hRpkj1RbOJu1PgyP69OX+EInAnP1EK/ShX5YdPFgwWdk19oquZ0HTM8g==";
       };
     };
+    "update-notifier-5.0.1" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-5.0.1.tgz";
+        sha512 = "BuVpRdlwxeIOvmc32AGYvO1KVdPlsmqSh8KDDBxS6kDE5VR7R8OMP1d8MdhaVBvxl4H3551k9akXr0Y1iIB2Wg==";
+      };
+    };
     "upnp-device-client-1.0.2" = {
       name = "upnp-device-client";
       packageName = "upnp-device-client";
@@ -53438,6 +53879,15 @@ let
         sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c";
       };
     };
+    "url-template-2.0.8" = {
+      name = "url-template";
+      packageName = "url-template";
+      version = "2.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz";
+        sha1 = "fc565a3cccbff7730c775f5641f9555791439f21";
+      };
+    };
     "url-to-options-1.0.1" = {
       name = "url-to-options";
       packageName = "url-to-options";
@@ -53492,6 +53942,16 @@ let
         sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
       };
     };
+    "uslug-git+https://github.com/laurent22/uslug.git#emoji-support" = {
+      name = "uslug";
+      packageName = "uslug";
+      version = "1.0.4";
+      src = fetchgit {
+        url = "https://github.com/laurent22/uslug.git";
+        rev = "ba2834d79beb0435318709958b2f5e817d96674d";
+        sha256 = "9f64413fac2052a07323c54475be269280ab1c5d174e88bd1542e24091be0259";
+      };
+    };
     "ut_metadata-3.5.1" = {
       name = "ut_metadata";
       packageName = "ut_metadata";
@@ -53519,13 +53979,13 @@ let
         sha1 = "8bb871a4741e085c70487ca7acdbd7d6d36029eb";
       };
     };
-    "utf-8-validate-5.0.2" = {
+    "utf-8-validate-5.0.3" = {
       name = "utf-8-validate";
       packageName = "utf-8-validate";
-      version = "5.0.2";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.2.tgz";
-        sha512 = "SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw==";
+        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.3.tgz";
+        sha512 = "jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A==";
       };
     };
     "utf7-1.0.2" = {
@@ -53780,13 +54240,13 @@ let
         sha512 = "FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==";
       };
     };
-    "v8-compile-cache-2.1.1" = {
+    "v8-compile-cache-2.2.0" = {
       name = "v8-compile-cache";
       packageName = "v8-compile-cache";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz";
-        sha512 = "8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==";
+        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz";
+        sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==";
       };
     };
     "v8-debug-1.0.1" = {
@@ -54293,13 +54753,13 @@ let
         sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==";
       };
     };
-    "verda-1.1.1" = {
+    "verda-1.1.2" = {
       name = "verda";
       packageName = "verda";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/verda/-/verda-1.1.1.tgz";
-        sha512 = "8nki9HjTh39EFuIYY2snCCdIDU0z4LmFN7tQ9oZByW2AQpPYpWDHwRqewWgUt9PVcDsXDSZbJWSuJwGnyAj8gg==";
+        url = "https://registry.npmjs.org/verda/-/verda-1.1.2.tgz";
+        sha512 = "c91aFgK+UQBqWoixDP8MRvyAN5hfVVaXT3nuk6uFiEb3NXu5UwtK7qCBIZP08talrYDn9ifIpcl+h0JGcH7IlQ==";
       };
     };
     "verror-1.1.0" = {
@@ -54419,13 +54879,13 @@ let
         sha512 = "sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==";
       };
     };
-    "vfile-location-3.1.0" = {
+    "vfile-location-3.2.0" = {
       name = "vfile-location";
       packageName = "vfile-location";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.1.0.tgz";
-        sha512 = "FCZ4AN9xMcjFIG1oGmZKo61PjwJHRVA+0/tPUP2ul4uIwjGGndIxavEMRpWn5p4xwm/ZsdXp9YNygf1ZyE4x8g==";
+        url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz";
+        sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==";
       };
     };
     "vfile-message-1.1.1" = {
@@ -54599,13 +55059,13 @@ let
         sha512 = "gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w==";
       };
     };
-    "vls-0.5.4" = {
+    "vls-0.5.5" = {
       name = "vls";
       packageName = "vls";
-      version = "0.5.4";
+      version = "0.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vls/-/vls-0.5.4.tgz";
-        sha512 = "BAdsW9uYaMIEQcAK3cZsuoA+jMapOxc3RFNqiZtRDunbkv+sWrCs4xrydiPIiLHY7Pi8I/yNqBPlR/8LDlFmhA==";
+        url = "https://registry.npmjs.org/vls/-/vls-0.5.5.tgz";
+        sha512 = "DDfnr83S2jAXWA0TLOy3t2g+wgTzo+hUNz8aYcF4WQrCTlNVyDsZ3wtcCa5koZVYWbfDitfBAlbqkqIpjeaDng==";
       };
     };
     "vm-browserify-1.1.2" = {
@@ -54653,15 +55113,6 @@ let
         sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg==";
       };
     };
-    "vscode-css-languageservice-4.3.3" = {
-      name = "vscode-css-languageservice";
-      packageName = "vscode-css-languageservice";
-      version = "4.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.3.tgz";
-        sha512 = "b2b+0oHvPmBHygDtOXX3xBvpQCa6eIQSvXnGDNSDmIC1894ZTJ2yX10vjplOO/PvV7mwhyvGPwHyY4X2HGxtKw==";
-      };
-    };
     "vscode-css-languageservice-4.3.5" = {
       name = "vscode-css-languageservice";
       packageName = "vscode-css-languageservice";
@@ -54698,13 +55149,13 @@ let
         sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow==";
       };
     };
-    "vscode-emmet-helper-2.0.7" = {
+    "vscode-emmet-helper-2.1.1" = {
       name = "vscode-emmet-helper";
       packageName = "vscode-emmet-helper";
-      version = "2.0.7";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.0.7.tgz";
-        sha512 = "Rzr3A2/8t0b3kJPdWA4B52Fu0ZNMUjgfnJ8j2QVSn5Y1mZp8wejNlkOSojWipP+J26FAF0/q2zMpB6uTHrIIJg==";
+        url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.1.1.tgz";
+        sha512 = "598eqXynvHDBdjgZqjTTg3XNb0SIvlVIc22/DwqxKjTKJLqe4LDCWi0H1yYBvU0Eb1FAJSh/l04InFxuI/mDVg==";
       };
     };
     "vscode-html-languageservice-2.1.12" = {
@@ -54716,13 +55167,13 @@ let
         sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w==";
       };
     };
-    "vscode-json-languageservice-3.9.1" = {
+    "vscode-json-languageservice-3.10.0" = {
       name = "vscode-json-languageservice";
       packageName = "vscode-json-languageservice";
-      version = "3.9.1";
+      version = "3.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.9.1.tgz";
-        sha512 = "oJkknkdCVitQ5XPSRa0weHjUxt8eSCptaL+MBQQlRsa6Nb8XnEY0S5wYnLUFHzEvKzwt01/LKk8LdOixWEXkNA==";
+        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.10.0.tgz";
+        sha512 = "8IvuRSQnjznu+obqy6Dy4S4H68Ke7a3Kb+A0FcdctyAMAWEnrORpCpMOMqEYiPLm/OTYLVWJ7ql3qToDTozu4w==";
       };
     };
     "vscode-jsonrpc-3.5.0" = {
@@ -54986,6 +55437,15 @@ let
         sha512 = "s/z5ZqSe7VpoXJ6JQcvwRiPPA3nG0nAcJ/HH03zoU6QaFfnkcgPK+HshC3WKPPnC2G08xA0iRB6h7kmyBB5Adg==";
       };
     };
+    "vscode-languageserver-types-3.16.0-next.4" = {
+      name = "vscode-languageserver-types";
+      packageName = "vscode-languageserver-types";
+      version = "3.16.0-next.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.4.tgz";
+        sha512 = "NlKJyGcET/ZBCCLBYIPaGo2c37R03bPYeWXozUtnjyye7+9dhlbMSODyoG2INcQf8zFmB4qhm2UOJjgYEgPCNA==";
+      };
+    };
     "vscode-languageserver-types-3.5.0" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
@@ -55031,13 +55491,13 @@ let
         sha512 = "u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==";
       };
     };
-    "vscode-test-1.4.0" = {
+    "vscode-test-1.4.1" = {
       name = "vscode-test";
       packageName = "vscode-test";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.4.0.tgz";
-        sha512 = "Jt7HNGvSE0+++Tvtq5wc4hiXLIr2OjDShz/gbAfM/mahQpy4rKBnmOK33D+MR67ATWviQhl+vpmU3p/qwSH/Pg==";
+        url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.4.1.tgz";
+        sha512 = "Ls7+JyC06cUCuomlTYk4aNJI00Rri09hgtkNl3zfQ1bj6meXglpSPpuzJ/RPNetlUHFMm4eGs0Xr/H5pFPVwfQ==";
       };
     };
     "vscode-textbuffer-1.0.0" = {
@@ -55112,13 +55572,13 @@ let
         sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==";
       };
     };
-    "vue-3.0.1" = {
+    "vue-3.0.2" = {
       name = "vue";
       packageName = "vue";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vue/-/vue-3.0.1.tgz";
-        sha512 = "WBTgaQMJIWQuhlzMV6C0qvVrxyQSpx3gKwflYC0sqGKEZSxMIOYRnrIlHUN4ivUVvP7mUMxcnFTt7P+akdOkQA==";
+        url = "https://registry.npmjs.org/vue/-/vue-3.0.2.tgz";
+        sha512 = "ciKFjutKRs+2Vbvgrist1oDd5wZQqtOel/K//ku54zLbf8tcTV+XbyAfanTHcTkML9CUj09vnC+y+5uaOz2/9g==";
       };
     };
     "vue-cli-plugin-apollo-0.21.3" = {
@@ -55265,13 +55725,13 @@ let
         sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==";
       };
     };
-    "watchpack-2.0.0" = {
+    "watchpack-2.0.1" = {
       name = "watchpack";
       packageName = "watchpack";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-2.0.0.tgz";
-        sha512 = "xSdCxxYZWNk3VK13bZRYhsQpfa8Vg63zXG+3pyU8ouqSLRCv4IGXIp9Kr226q6GBkGRlZrST2wwKtjfKz2m7Cg==";
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-2.0.1.tgz";
+        sha512 = "vO8AKGX22ZRo6PiOFM9dC0re8IcKh8Kd/aH2zeqUc6w4/jBGlTy2P7fTC6ekT0NjVeGjgU2dGC5rNstKkeLEQg==";
       };
     };
     "watchpack-chokidar2-2.0.0" = {
@@ -55508,13 +55968,13 @@ let
         sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==";
       };
     };
-    "webpack-sources-2.0.1" = {
+    "webpack-sources-2.2.0" = {
       name = "webpack-sources";
       packageName = "webpack-sources";
-      version = "2.0.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.0.1.tgz";
-        sha512 = "A9oYz7ANQBK5EN19rUXbvNgfdfZf5U2gP0769OXsj9CvYkCR6OHOsd6OKyEy4H38GGxpsQPKIL83NC64QY6Xmw==";
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz";
+        sha512 = "bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==";
       };
     };
     "webpack-stream-6.1.0" = {
@@ -55571,13 +56031,13 @@ let
         sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
       };
     };
-    "webtorrent-0.108.6" = {
+    "webtorrent-0.110.1" = {
       name = "webtorrent";
       packageName = "webtorrent";
-      version = "0.108.6";
+      version = "0.110.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.108.6.tgz";
-        sha512 = "hkwjMQTbBiwdJn3vEVjOyNwKZISp6r4GEl/J0N6Ukw2oeaETIylvAlf7G0o+a9FcFMThBIle0iCPYLTwumCOaQ==";
+        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.110.1.tgz";
+        sha512 = "KLMkKbf/7G7k6ok45a/O/RGJwIyUI2I992mTp/sezY5n8P7Lh1Q00bSKI/CW4Eqile1XlQoOFMLrJLPChz/SSQ==";
       };
     };
     "well-known-symbols-2.0.0" = {
@@ -55922,15 +56382,6 @@ let
         sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0";
       };
     };
-    "winston-1.1.2" = {
-      name = "winston";
-      packageName = "winston";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz";
-        sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c";
-      };
-    };
     "winston-2.1.1" = {
       name = "winston";
       packageName = "winston";
@@ -56967,13 +57418,13 @@ let
         sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
       };
     };
-    "y18n-5.0.4" = {
+    "y18n-5.0.5" = {
       name = "y18n";
       packageName = "y18n";
-      version = "5.0.4";
+      version = "5.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-5.0.4.tgz";
-        sha512 = "deLOfD+RvFgrpAmSZgfGdWYE+OKyHcVHaRQ7NphG/63scpRvTHHeQMAxGGvaLVGJ+HYVcCXlzcTK0ZehFf+eHQ==";
+        url = "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz";
+        sha512 = "hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==";
       };
     };
     "yaeti-0.0.6" = {
@@ -57066,6 +57517,15 @@ let
         sha512 = "N3Tu3g4O6ZWV7W0LVsNk62DtKJDQkbnPZRDd7ntaAeEl8QkxL1vnMunI26uzDU4PwwG4tPJ8g/VRS6U+fVp/6A==";
       };
     };
+    "yaml-language-server-parser-0.1.1" = {
+      name = "yaml-language-server-parser";
+      packageName = "yaml-language-server-parser";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.1.tgz";
+        sha512 = "2PememGb1SrPqXAxXTpBD39rwYZap6CJVSvkfULNv9uwV3VHp1TfkgpsylBb+mpuuivH0JZ52lChXPvNa6yVxw==";
+      };
+    };
     "yamljs-0.3.0" = {
       name = "yamljs";
       packageName = "yamljs";
@@ -57531,17 +57991,17 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "10.1.7";
+    version = "10.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.7.tgz";
-      sha512 = "0tbeHnPIzSV/z+KlZT7N2J1yMnwQi4xIxvbsANrLjoAxNssse84i9BDdMZYsPoV8wbzcDhFOtt5KmfTO0GIeYQ==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-10.2.0.tgz";
+      sha512 = "YBzwkFBmG6CdUJk8onsPXxHX/ByU5MERBQgYhLC873e2nZlXMUu+Ttq2Wai6apyskGvsXKxZNPOQSFZTGKXzXg==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.1001.7"
-      sources."@angular-devkit/core-10.1.7"
-      sources."@angular-devkit/schematics-10.1.7"
-      sources."@schematics/angular-10.1.7"
-      sources."@schematics/update-0.1001.7"
+      sources."@angular-devkit/architect-0.1002.0"
+      sources."@angular-devkit/core-10.2.0"
+      sources."@angular-devkit/schematics-10.2.0"
+      sources."@schematics/angular-10.2.0"
+      sources."@schematics/update-0.1002.0"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONStream-1.3.5"
       sources."agent-base-4.3.0"
@@ -57557,7 +58017,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bluebird-3.7.2"
@@ -57571,6 +58031,7 @@ in
           sources."yallist-3.1.1"
         ];
       })
+      sources."call-bind-1.0.0"
       sources."caseless-0.12.0"
       sources."chalk-4.1.0"
       sources."chardet-0.7.0"
@@ -57629,6 +58090,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."genfun-5.0.0"
+      sources."get-intrinsic-1.0.1"
       sources."get-stream-4.1.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
@@ -57741,11 +58203,7 @@ in
       sources."oauth-sign-0.9.0"
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      (sources."object.assign-4.1.1" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."object.assign-4.1.2"
       sources."object.getownpropertydescriptors-2.1.0"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
@@ -57829,8 +58287,16 @@ in
       sources."stream-each-1.2.3"
       sources."stream-shift-1.0.1"
       sources."string-width-4.2.0"
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
+      (sources."string.prototype.trimend-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
+      (sources."string.prototype.trimstart-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -57955,7 +58421,7 @@ in
       sources."bops-0.0.7"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      (sources."buffer-5.6.0" // {
+      (sources."buffer-5.7.0" // {
         dependencies = [
           sources."base64-js-1.3.1"
         ];
@@ -57970,6 +58436,7 @@ in
           sources."pump-3.0.0"
         ];
       })
+      sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
       sources."clean-git-ref-2.0.1"
@@ -58011,8 +58478,6 @@ in
         ];
       })
       sources."end-of-stream-1.4.4"
-      sources."es-abstract-1.18.0-next.1"
-      sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-2.0.0"
       sources."esprima-4.0.1"
       sources."exit-on-epipe-1.0.1"
@@ -58037,6 +58502,7 @@ in
       })
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       (sources."get-stream-4.1.0" // {
         dependencies = [
           sources."pump-3.0.0"
@@ -58074,22 +58540,17 @@ in
       sources."has-1.0.3"
       sources."has-symbols-1.0.1"
       sources."http-cache-semantics-4.1.0"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."ignore-5.1.8"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-absolute-1.0.0"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
-      sources."is-date-object-1.0.2"
       sources."is-extglob-2.1.1"
       sources."is-glob-3.1.0"
       sources."is-negated-glob-1.0.0"
-      sources."is-negative-zero-2.0.0"
       sources."is-number-7.0.0"
-      sources."is-regex-1.1.1"
       sources."is-relative-1.0.0"
-      sources."is-symbol-1.0.3"
       sources."is-unc-path-1.0.0"
       sources."is-utf8-0.2.1"
       sources."is-valid-glob-1.0.0"
@@ -58127,9 +58588,8 @@ in
       sources."normalize-path-2.1.1"
       sources."normalize-url-4.5.0"
       sources."now-and-later-2.0.1"
-      sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."opal-runtime-1.0.11"
       (sources."ordered-read-streams-1.0.1" // {
@@ -58183,16 +58643,6 @@ in
       sources."source-map-0.6.1"
       sources."sprintf-js-1.0.3"
       sources."stream-shift-1.0.1"
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
       sources."string_decoder-1.3.0"
       sources."through-2.3.8"
       sources."through2-4.0.2"
@@ -58216,7 +58666,7 @@ in
         ];
       })
       sources."to-utf8-0.0.1"
-      sources."uglify-js-3.11.3"
+      sources."uglify-js-3.11.5"
       sources."unc-path-regex-0.1.2"
       sources."unique-stream-2.3.1"
       sources."universalify-0.1.2"
@@ -58277,7 +58727,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big-integer-1.6.36"
       sources."browser-process-hrtime-1.0.0"
@@ -58446,7 +58896,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      (sources."@nestjs/schematics-7.1.2" // {
+      (sources."@nestjs/schematics-7.1.3" // {
         dependencies = [
           sources."@angular-devkit/core-9.1.12"
           sources."@angular-devkit/schematics-9.1.12"
@@ -58458,11 +58908,11 @@ in
       sources."@types/anymatch-1.3.1"
       sources."@types/json-schema-7.0.6"
       sources."@types/json5-0.0.29"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/parse-json-4.0.0"
       sources."@types/source-list-map-0.1.2"
       sources."@types/tapable-1.0.6"
-      (sources."@types/uglify-js-3.11.0" // {
+      (sources."@types/uglify-js-3.11.1" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -58759,9 +59209,9 @@ in
       sources."hmac-drbg-1.0.1"
       sources."https-browserify-1.0.0"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."iferr-0.1.5"
-      sources."import-fresh-3.2.1"
+      sources."import-fresh-3.2.2"
       sources."imurmurhash-0.1.4"
       sources."infer-owner-1.0.4"
       sources."inflight-1.0.6"
@@ -58804,7 +59254,11 @@ in
       sources."json-parse-even-better-errors-2.3.1"
       sources."json-schema-traverse-0.4.1"
       sources."json5-1.0.1"
-      sources."jsonfile-6.0.1"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."kind-of-6.0.3"
       sources."lines-and-columns-1.1.6"
       sources."loader-runner-2.4.0"
@@ -59079,7 +59533,7 @@ in
       })
       sources."through-2.3.8"
       sources."through2-2.0.5"
-      sources."timers-browserify-2.0.11"
+      sources."timers-browserify-2.0.12"
       sources."tmp-0.0.33"
       sources."to-arraybuffer-1.0.1"
       (sources."to-object-path-0.3.0" // {
@@ -59196,7 +59650,7 @@ in
       sources."@apollo/federation-0.20.2"
       (sources."@apollo/protobufjs-1.0.5" // {
         dependencies = [
-          sources."@types/node-10.17.40"
+          sources."@types/node-10.17.44"
         ];
       })
       sources."@apollographql/apollo-tools-0.4.8"
@@ -59484,16 +59938,16 @@ in
       sources."@types/body-parser-1.19.0"
       sources."@types/connect-3.4.33"
       sources."@types/content-disposition-0.5.3"
-      sources."@types/cookies-0.7.4"
-      sources."@types/cors-2.8.7"
+      sources."@types/cookies-0.7.5"
+      sources."@types/cors-2.8.8"
       sources."@types/ejs-2.7.0"
       sources."@types/express-4.17.7"
-      sources."@types/express-serve-static-core-4.17.9"
+      sources."@types/express-serve-static-core-4.17.13"
       sources."@types/fs-capacitor-2.0.0"
       sources."@types/glob-7.1.3"
       (sources."@types/graphql-upload-8.0.4" // {
         dependencies = [
-          sources."graphql-15.3.0"
+          sources."graphql-15.4.0"
         ];
       })
       sources."@types/http-assert-1.5.1"
@@ -59507,12 +59961,12 @@ in
         ];
       })
       sources."@types/keygrip-1.0.2"
-      sources."@types/koa-2.11.5"
+      sources."@types/koa-2.11.6"
       sources."@types/koa-compose-3.2.5"
       sources."@types/long-4.0.1"
       sources."@types/mime-2.0.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       (sources."@types/node-fetch-2.5.7" // {
         dependencies = [
           sources."form-data-3.0.0"
@@ -59523,7 +59977,7 @@ in
       sources."@types/range-parser-1.2.3"
       sources."@types/serve-static-1.13.6"
       sources."@types/through-0.0.30"
-      sources."@types/ws-7.2.7"
+      sources."@types/ws-7.2.9"
       sources."@types/zen-observable-0.8.1"
       sources."@vue/cli-shared-utils-4.5.8"
       (sources."@vue/cli-ui-4.5.8" // {
@@ -59533,24 +59987,24 @@ in
       })
       sources."@vue/cli-ui-addon-webpack-4.5.8"
       sources."@vue/cli-ui-addon-widgets-4.5.8"
-      (sources."@vue/compiler-core-3.0.1" // {
+      (sources."@vue/compiler-core-3.0.2" // {
         dependencies = [
           sources."@babel/types-7.12.1"
           sources."source-map-0.6.1"
         ];
       })
-      sources."@vue/compiler-dom-3.0.1"
-      (sources."@vue/compiler-sfc-3.0.1" // {
+      sources."@vue/compiler-dom-3.0.2"
+      (sources."@vue/compiler-sfc-3.0.2" // {
         dependencies = [
           sources."@babel/types-7.12.1"
           sources."source-map-0.6.1"
         ];
       })
-      sources."@vue/compiler-ssr-3.0.1"
-      sources."@vue/reactivity-3.0.1"
-      sources."@vue/runtime-core-3.0.1"
-      sources."@vue/runtime-dom-3.0.1"
-      sources."@vue/shared-3.0.1"
+      sources."@vue/compiler-ssr-3.0.2"
+      sources."@vue/reactivity-3.0.2"
+      sources."@vue/runtime-core-3.0.2"
+      sources."@vue/runtime-dom-3.0.2"
+      sources."@vue/shared-3.0.2"
       sources."@wry/context-0.4.4"
       sources."@wry/equality-0.1.11"
       sources."abbrev-1.1.1"
@@ -59601,7 +60055,7 @@ in
         ];
       })
       sources."apollo-cache-1.3.5"
-      sources."apollo-cache-control-0.11.3"
+      sources."apollo-cache-control-0.11.4"
       sources."apollo-cache-inmemory-1.6.6"
       sources."apollo-client-2.6.10"
       (sources."apollo-codegen-core-0.38.0" // {
@@ -59627,19 +60081,19 @@ in
       sources."apollo-link-persisted-queries-0.2.2"
       sources."apollo-link-state-0.4.2"
       sources."apollo-link-ws-1.0.20"
-      sources."apollo-reporting-protobuf-0.6.0"
+      sources."apollo-reporting-protobuf-0.6.1"
       sources."apollo-server-caching-0.5.2"
-      (sources."apollo-server-core-2.18.2" // {
+      (sources."apollo-server-core-2.19.0" // {
         dependencies = [
           sources."uuid-8.3.1"
         ];
       })
       sources."apollo-server-env-2.4.5"
       sources."apollo-server-errors-2.4.2"
-      sources."apollo-server-express-2.18.2"
-      sources."apollo-server-plugin-base-0.10.1"
-      sources."apollo-server-types-0.6.0"
-      sources."apollo-tracing-0.11.4"
+      sources."apollo-server-express-2.19.0"
+      sources."apollo-server-plugin-base-0.10.2"
+      sources."apollo-server-types-0.6.1"
+      sources."apollo-tracing-0.12.0"
       sources."apollo-upload-client-11.0.0"
       sources."apollo-utilities-1.3.4"
       (sources."archive-type-4.0.0" // {
@@ -59675,7 +60129,7 @@ in
       sources."atob-2.1.2"
       sources."await-to-js-2.1.1"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."babel-core-7.0.0-bridge.0"
       sources."babel-plugin-dynamic-import-node-2.3.3"
       sources."backo2-1.0.2"
@@ -59719,14 +60173,14 @@ in
           sources."is-fullwidth-code-point-2.0.0"
           sources."strip-ansi-5.2.0"
           sources."supports-color-7.2.0"
-          sources."term-size-2.2.0"
+          sources."term-size-2.2.1"
           sources."type-fest-0.8.1"
         ];
       })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.14.5"
-      sources."buffer-5.6.0"
+      sources."browserslist-4.14.6"
+      sources."buffer-5.7.0"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -59746,13 +60200,14 @@ in
           sources."sort-keys-2.0.0"
         ];
       })
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."camel-case-4.1.1"
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001148"
+      sources."caniuse-lite-1.0.30001154"
       sources."capital-case-1.0.3"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
@@ -59960,7 +60415,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.582"
+      sources."electron-to-chromium-1.3.586"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
@@ -60029,7 +60484,7 @@ in
       sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."fd-slicer-1.1.0"
       sources."figures-1.7.0"
       sources."file-type-8.1.0"
@@ -60051,7 +60506,7 @@ in
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.136.0"
+      sources."flow-parser-0.137.0"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -60076,8 +60531,9 @@ in
       sources."generate-function-1.1.0"
       sources."generate-object-property-1.2.0"
       sources."generic-names-2.0.1"
-      sources."gensync-1.0.0-beta.1"
+      sources."gensync-1.0.0-beta.2"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.0.1"
       sources."get-proxy-2.1.0"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
@@ -60145,7 +60601,7 @@ in
           sources."ts-invariant-0.3.3"
         ];
       })
-      sources."graphql-extensions-0.12.5"
+      sources."graphql-extensions-0.12.6"
       sources."graphql-subscriptions-1.1.0"
       sources."graphql-tag-2.11.0"
       sources."graphql-tools-4.0.8"
@@ -60194,7 +60650,7 @@ in
       sources."iconv-lite-0.4.24"
       sources."icss-replace-symbols-1.1.0"
       sources."icss-utils-4.1.1"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."ignore-5.1.8"
       sources."ignore-by-default-1.0.1"
       sources."import-fresh-2.0.0"
@@ -60307,7 +60763,11 @@ in
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
       sources."json5-2.1.3"
-      sources."jsonfile-6.0.1"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."jsprim-1.4.1"
       sources."keyv-3.0.0"
       sources."kind-of-6.0.3"
@@ -60441,7 +60901,7 @@ in
           sources."is-wsl-2.2.0"
         ];
       })
-      sources."node-releases-1.1.64"
+      sources."node-releases-1.1.65"
       (sources."nodemon-1.19.4" // {
         dependencies = [
           sources."debug-3.2.6"
@@ -60478,13 +60938,9 @@ in
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object-path-0.11.5"
-      sources."object-treeify-1.1.28"
+      sources."object-treeify-1.1.29"
       sources."object-visit-1.0.1"
-      (sources."object.assign-4.1.1" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."object.assign-4.1.2"
       sources."object.getownpropertydescriptors-2.1.0"
       sources."object.pick-1.3.0"
       sources."on-finished-2.3.0"
@@ -60626,7 +61082,7 @@ in
       })
       sources."rechoir-0.6.2"
       sources."redeyed-2.1.1"
-      sources."regenerate-1.4.1"
+      sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.13.7"
       sources."regenerator-transform-0.14.5"
@@ -60662,7 +61118,7 @@ in
       sources."rimraf-3.0.2"
       sources."rss-parser-3.9.0"
       sources."run-async-2.4.1"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."rxjs-6.6.3"
       sources."safe-buffer-5.2.1"
       sources."safe-regex-1.1.0"
@@ -60700,7 +61156,7 @@ in
       sources."shell-quote-1.7.2"
       sources."shelljs-0.8.4"
       sources."shellwords-0.1.1"
-      sources."shortid-2.2.15"
+      sources."shortid-2.2.16"
       sources."signal-exit-3.0.3"
       sources."slash-3.0.0"
       sources."slice-ansi-0.0.4"
@@ -60780,8 +61236,16 @@ in
       sources."strict-uri-encode-1.1.0"
       sources."string-hash-1.1.3"
       sources."string-width-4.2.0"
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
+      (sources."string.prototype.trimend-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
+      (sources."string.prototype.trimstart-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -60967,7 +61431,7 @@ in
       (sources."vue-codemod-0.0.4" // {
         dependencies = [
           sources."globby-10.0.2"
-          sources."vue-3.0.1"
+          sources."vue-3.0.2"
         ];
       })
       sources."watch-1.0.2"
@@ -61283,7 +61747,7 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."fs-extra-5.0.0"
       sources."function-bind-1.1.1"
-      sources."gensync-1.0.0-beta.1"
+      sources."gensync-1.0.0-beta.2"
       (sources."global-modules-0.2.3" // {
         dependencies = [
           sources."is-windows-0.2.0"
@@ -61364,7 +61828,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
@@ -61413,7 +61877,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
@@ -61732,6 +62196,7 @@ in
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."cached-path-relative-1.0.2"
+      sources."call-bind-1.0.0"
       sources."cipher-base-1.0.4"
       sources."combine-source-map-0.8.0"
       sources."concat-map-0.0.1"
@@ -61775,6 +62240,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."get-assigned-identifiers-1.2.0"
+      sources."get-intrinsic-1.0.1"
       sources."glob-7.1.6"
       sources."has-1.0.3"
       sources."has-symbols-1.0.1"
@@ -61787,7 +62253,7 @@ in
       sources."hmac-drbg-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-1.0.0"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."inline-source-map-0.6.2"
@@ -61821,11 +62287,7 @@ in
       sources."object-assign-4.1.1"
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      (sources."object.assign-4.1.1" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."os-browserify-0.3.0"
       sources."pako-1.0.11"
@@ -61876,8 +62338,16 @@ in
         ];
       })
       sources."stream-splicer-2.0.1"
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
+      (sources."string.prototype.trimend-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
+      (sources."string.prototype.trimstart-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."string_decoder-1.3.0"
       sources."subarg-1.0.0"
       sources."syntax-error-1.4.0"
@@ -61930,7 +62400,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.27"
+      sources."@types/node-13.13.30"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
       sources."ajv-6.12.6"
@@ -61945,11 +62415,12 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bencode-2.0.1"
+      sources."bep53-range-1.0.0"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-6.4.2" // {
         dependencies = [
@@ -61961,7 +62432,7 @@ in
           sources."bencode-0.8.0"
         ];
       })
-      sources."blob-to-buffer-1.2.8"
+      sources."blob-to-buffer-1.2.9"
       sources."bn.js-4.11.9"
       sources."bncode-0.5.3"
       sources."brace-expansion-1.1.11"
@@ -61981,7 +62452,7 @@ in
       })
       sources."castv2-client-1.2.0"
       sources."chalk-1.0.0"
-      sources."chrome-dgram-3.0.5"
+      sources."chrome-dgram-3.0.6"
       sources."chrome-dns-1.0.1"
       sources."chrome-net-3.3.4"
       sources."chromecast-player-0.2.3"
@@ -61991,7 +62462,7 @@ in
       sources."co-3.1.0"
       sources."codepage-1.4.0"
       sources."combined-stream-1.0.8"
-      sources."commander-6.1.0"
+      sources."commander-6.2.0"
       sources."compact2string-1.4.1"
       sources."concat-map-0.0.1"
       (sources."concat-stream-2.0.0" // {
@@ -62095,7 +62566,7 @@ in
       sources."long-4.0.0"
       sources."loud-rejection-1.6.0"
       sources."lru-2.0.1"
-      sources."magnet-uri-5.3.0"
+      sources."magnet-uri-5.4.0"
       sources."map-obj-1.0.1"
       (sources."mdns-js-1.0.3" // {
         dependencies = [
@@ -62217,8 +62688,8 @@ in
       sources."resolve-1.18.1"
       sources."rimraf-2.7.1"
       sources."router-0.6.2"
-      sources."run-parallel-1.1.9"
-      sources."run-series-1.1.8"
+      sources."run-parallel-1.1.10"
+      sources."run-series-1.1.9"
       sources."rusha-0.8.13"
       sources."rx-2.5.3"
       sources."safe-buffer-5.2.1"
@@ -62454,10 +62925,10 @@ in
   coc-css = nodeEnv.buildNodePackage {
     name = "coc-css";
     packageName = "coc-css";
-    version = "1.2.5";
+    version = "1.2.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.5.tgz";
-      sha512 = "Khii6e43VV1JqSNd/UGMDmenBkFYcFKEr0WM6a8isOOWxSX8Vly/YAjVq7rbErD3mYOeJ+rxcH5/faUqIDj/9A==";
+      url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.6.tgz";
+      sha512 = "eVzucf/n0T9Sap+9HbKeW6XhMle1Q/2aURaE9BVTNHFW9eqFlKq72l/38NzrUYbdCpQh8foDsoKAqbFsAnBFYw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -62471,10 +62942,10 @@ in
   coc-diagnostic = nodeEnv.buildNodePackage {
     name = "coc-diagnostic";
     packageName = "coc-diagnostic";
-    version = "0.11.0";
+    version = "0.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.11.0.tgz";
-      sha512 = "QdKxUVPcrX+/rkpWHjQtRePsT2tWZY586Ip7hGsn5WCP3SY/HyAfzuzk6tygC0C7VvXrV0WQd3VLIMwgpwWQnA==";
+      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.12.0.tgz";
+      sha512 = "onUfHm8s/nisp/VtrtPwjXvljhdnYUmQwc/VmB/MsZfaJW3hDLhl4gDbBHISR+CHDHANpkItHw/dpU53V/YC6g==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -62588,13 +63059,13 @@ in
   coc-html = nodeEnv.buildNodePackage {
     name = "coc-html";
     packageName = "coc-html";
-    version = "1.2.4";
+    version = "1.3.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-html/-/coc-html-1.2.4.tgz";
-      sha512 = "gr0GBKeew88n8hcn4fkzIcBruhih7YAqBd7ldsYjoG2qZhjPEj/arYESFOYgooX1jYuxCpQYH526EXXzs4BGRQ==";
+      url = "https://registry.npmjs.org/coc-html/-/coc-html-1.3.1.tgz";
+      sha512 = "qC1BifVAAuI5cPT6fEQuP0RIjwDWqhLCH+AUJrQ7lW2IghWInjOarhj9AHWS+1cZLnsVrMMYXL6i8HZLnkRDQQ==";
     };
     dependencies = [
-      sources."typescript-3.9.7"
+      sources."typescript-4.0.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -62626,14 +63097,14 @@ in
   coc-java = nodeEnv.buildNodePackage {
     name = "coc-java";
     packageName = "coc-java";
-    version = "1.4.12";
+    version = "1.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.12.tgz";
-      sha512 = "kKvT5ESFDOVPZ2iO4MQ2FkWj88kZqcczpQDqYD1tBgrLAGD0YnEzSzK6paI+kJYqk945X/k66Kcq5YbercvmqA==";
+      url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.0.tgz";
+      sha512 = "EvoHLu7a0H3NB8z3JqXUTggKNTCi28on2dsE7/EJ7AYT1i3SgPaDaU/M7lkK/mUqokbHhAKwcEZBcAr2PtRAgg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Java langauage extension for coc.nvim";
+      description = "Java language extension for coc.nvim";
       homepage = "https://github.com/neoclide/coc-java#readme";
       license = "EPL-1.0";
     };
@@ -62679,10 +63150,10 @@ in
   coc-lists = nodeEnv.buildNodePackage {
     name = "coc-lists";
     packageName = "coc-lists";
-    version = "1.3.10";
+    version = "1.3.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.10.tgz";
-      sha512 = "XbwltkjxhzzfN5In3w43TBKFbR1b8+3OgIldwYQOUYHlUxF1KO2mJj8ngkzKsaglIPeMYuWtWizOS02L74fKkA==";
+      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.11.tgz";
+      sha512 = "FG0sCSIbkOe+RRikjHuDp+lFJWXyKBcDSTXDbS7T6q4dNwpkpl4+wNSkvN0tWKnXwNFd2HJt5GuFn5xj9DFK8g==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -62703,10 +63174,10 @@ in
       sha512 = "KZVd2kmQjUQVLEHM9c2aXxP4AbM8sRybPtdAR6lWfIK3VGj67O2PIoG30Ro17d7BgcASVBp2Ad86azK9Op8uDw==";
     };
     dependencies = [
-      sources."@chemzqm/neovim-5.2.6"
+      sources."@chemzqm/neovim-5.2.8"
       sources."@tootallnate/once-1.1.2"
-      sources."agent-base-6.0.1"
-      sources."arch-2.1.2"
+      sources."agent-base-6.0.2"
+      sources."arch-2.2.0"
       sources."async-2.6.3"
       sources."await-semaphore-0.1.3"
       sources."balanced-match-1.0.0"
@@ -62718,6 +63189,7 @@ in
       sources."buffer-indexof-polyfill-1.0.2"
       sources."buffers-0.1.1"
       sources."bytes-3.1.0"
+      sources."call-bind-1.0.0"
       sources."chainsaw-0.1.0"
       sources."chownr-2.0.0"
       sources."clipboardy-2.3.0"
@@ -62746,7 +63218,7 @@ in
       sources."fb-watchman-2.0.1"
       sources."flatted-2.0.2"
       sources."follow-redirects-1.13.0"
-      sources."fp-ts-2.8.4"
+      sources."fp-ts-2.8.5"
       sources."fs-extra-8.1.0"
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
@@ -62757,6 +63229,7 @@ in
         ];
       })
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       sources."get-stream-4.1.0"
       sources."glob-7.1.6"
       sources."graceful-fs-4.2.4"
@@ -62764,7 +63237,7 @@ in
       sources."has-symbols-1.0.1"
       sources."http-proxy-agent-4.0.1"
       sources."https-proxy-agent-5.0.0"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
@@ -62812,11 +63285,7 @@ in
       sources."npm-run-path-2.0.2"
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      (sources."object.assign-4.1.1" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."p-finally-1.0.0"
       sources."path-is-absolute-1.0.1"
@@ -62842,8 +63311,16 @@ in
           sources."date-format-2.1.0"
         ];
       })
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
+      (sources."string.prototype.trimend-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
+      (sources."string.prototype.trimstart-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."string_decoder-1.1.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
@@ -62893,10 +63370,10 @@ in
   coc-prettier = nodeEnv.buildNodePackage {
     name = "coc-prettier";
     packageName = "coc-prettier";
-    version = "1.1.17";
+    version = "1.1.18";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.17.tgz";
-      sha512 = "KwHA9HvRs4W6OKd+aVa7/R2YzyVSogWpPUVX8wJ8vBEp5U2VHqfjwhyvN9BFEo1FEkyigXG6DI44jtq47eE5YQ==";
+      url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.18.tgz";
+      sha512 = "K2rny+Gy8TKZTWFpRqQ0cuH1QkrClml7cNh6A39vkQfbgmDXgaTbli/V0oWslSnVyPOtidGS3vIhZ09mukVhvw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -62973,9 +63450,9 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
-      sources."caniuse-lite-1.0.30001148"
+      sources."caniuse-lite-1.0.30001154"
       sources."capture-stack-trace-1.0.1"
-      sources."ccount-1.0.5"
+      sources."ccount-1.1.0"
       sources."chalk-2.4.2"
       sources."character-entities-1.2.4"
       sources."character-entities-html4-1.1.4"
@@ -63070,7 +63547,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.582"
+      sources."electron-to-chromium-1.3.586"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -63245,7 +63722,7 @@ in
       sources."htmlparser2-3.10.1"
       sources."iconv-lite-0.4.24"
       sources."ignore-4.0.6"
-      sources."import-fresh-3.2.1"
+      sources."import-fresh-3.2.2"
       sources."import-lazy-2.1.0"
       sources."import-local-0.1.1"
       sources."imurmurhash-0.1.4"
@@ -63510,11 +63987,7 @@ in
       sources."prepend-http-1.0.4"
       sources."preserve-0.2.0"
       sources."prettier-2.1.2"
-      (sources."prettier-eslint-10.1.1" // {
-        dependencies = [
-          sources."prettier-1.19.1"
-        ];
-      })
+      sources."prettier-eslint-11.0.0"
       (sources."prettier-stylelint-0.4.2" // {
         dependencies = [
           sources."debug-3.2.6"
@@ -63752,7 +64225,7 @@ in
       })
       sources."trim-0.0.1"
       sources."trim-newlines-1.0.0"
-      sources."trim-trailing-lines-1.1.3"
+      sources."trim-trailing-lines-1.1.4"
       sources."trough-1.0.5"
       sources."tslib-1.14.1"
       (sources."tslint-5.20.1" // {
@@ -63795,7 +64268,7 @@ in
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
-      sources."v8-compile-cache-2.1.1"
+      sources."v8-compile-cache-2.2.0"
       sources."validate-npm-package-license-3.0.4"
       sources."vfile-2.3.0"
       sources."vfile-location-2.0.6"
@@ -63854,10 +64327,10 @@ in
   coc-python = nodeEnv.buildNodePackage {
     name = "coc-python";
     packageName = "coc-python";
-    version = "1.2.12";
+    version = "1.2.13";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.12.tgz";
-      sha512 = "cwZ/uIJT5id6zwBE6RWC/HcGy7uw2hLjC0OyvcjFzidazH73e3fQBBoEMJNtLKgPuAJfNjo4BPu+cDsCSAkCAw==";
+      url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.13.tgz";
+      sha512 = "thsXkbwwJMpiGa/1GiPvFnbWtC5K8QcZvcUtoc4lU8Hf38LbywK5qRp6M7tOAabJOq5dYcIYYbPZWzGwhoZEiw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -63913,10 +64386,10 @@ in
   coc-rust-analyzer = nodeEnv.buildNodePackage {
     name = "coc-rust-analyzer";
     packageName = "coc-rust-analyzer";
-    version = "0.10.1";
+    version = "0.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.10.1.tgz";
-      sha512 = "aSQyW+Ceum86wXxIyKdv2T7Qv4EmflQvbytaJxN1boR0RS16cEccZScxVI/7pkFnh+Tkp+rVXItmNmNU5ByrjA==";
+      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.14.0.tgz";
+      sha512 = "2s1VTk/IgwO82Vf/YhywNUbijpdgAmUBa6+R9f8xPzl2MyYw9lKVqasxJPa3qA4CB6sqSAG5r3egP6LzqqDxbA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -63949,10 +64422,10 @@ in
   coc-snippets = nodeEnv.buildNodePackage {
     name = "coc-snippets";
     packageName = "coc-snippets";
-    version = "2.2.1";
+    version = "2.2.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.1.tgz";
-      sha512 = "iMAZLafpYJYtf+jMIoUlNqYjZkxFEflbG1aW7XiesC0c+TY8HYglN3/CnuoKu0bwWcxoktUhiRqDixuw36VRSQ==";
+      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.3.tgz";
+      sha512 = "mK3oTm3gjQzV37Hq9r/bTj2N63p5tzO7IppuksQ7Yk0hURrHUzyx58PdBhfVOsD77FIo37dY1E0gOXv5t7a1dg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -63966,10 +64439,10 @@ in
   coc-solargraph = nodeEnv.buildNodePackage {
     name = "coc-solargraph";
     packageName = "coc-solargraph";
-    version = "1.1.7";
+    version = "1.1.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.7.tgz";
-      sha512 = "+oaGgco/4VuQIAp7MqvwrMPnKXViap/W894pFodstK1FkCUpP3qc04Kt7B/8IqRTFrd5b6tAn7Nrsf5g4RffTw==";
+      url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.8.tgz";
+      sha512 = "j0/S9ycyP4cdFhTu3FGaY4t0ZSn1K5EFWi6A90nppQYPwrzSGo3tn5XDO44vaWsYhEUlQfQrXVwtFScKCdc1vg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64032,12 +64505,12 @@ in
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.14.5"
+      sources."browserslist-4.14.6"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001148"
-      sources."ccount-1.0.5"
+      sources."caniuse-lite-1.0.30001154"
+      sources."ccount-1.1.0"
       (sources."chalk-4.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -64077,7 +64550,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.582"
+      sources."electron-to-chromium-1.3.586"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -64090,7 +64563,7 @@ in
       sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fastest-levenshtein-1.0.12"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."file-entry-cache-5.0.1"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
@@ -64098,7 +64571,7 @@ in
       sources."flatted-2.0.2"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
-      sources."gensync-1.0.0-beta.1"
+      sources."gensync-1.0.0-beta.2"
       sources."get-stdin-8.0.0"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
@@ -64115,7 +64588,7 @@ in
       sources."html-tags-3.1.0"
       sources."htmlparser2-3.10.1"
       sources."ignore-5.1.8"
-      (sources."import-fresh-3.2.1" // {
+      (sources."import-fresh-3.2.2" // {
         dependencies = [
           sources."resolve-from-4.0.0"
         ];
@@ -64131,7 +64604,7 @@ in
       sources."is-alphanumeric-1.0.0"
       sources."is-alphanumerical-1.0.4"
       sources."is-arrayish-0.2.1"
-      sources."is-buffer-2.0.4"
+      sources."is-buffer-2.0.5"
       sources."is-core-module-2.0.0"
       sources."is-decimal-1.0.4"
       sources."is-extglob-2.1.1"
@@ -64175,7 +64648,7 @@ in
       })
       sources."mkdirp-0.5.5"
       sources."ms-2.1.2"
-      sources."node-releases-1.1.64"
+      sources."node-releases-1.1.65"
       sources."normalize-package-data-2.5.0"
       sources."normalize-range-0.1.2"
       sources."normalize-selector-0.2.0"
@@ -64237,7 +64710,7 @@ in
       sources."resolve-from-5.0.0"
       sources."reusify-1.0.4"
       sources."rimraf-2.6.3"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."safe-buffer-5.1.2"
       sources."semver-5.7.1"
       sources."signal-exit-3.0.3"
@@ -64275,25 +64748,25 @@ in
       sources."to-regex-range-5.0.1"
       sources."trim-0.0.1"
       sources."trim-newlines-3.0.0"
-      sources."trim-trailing-lines-1.1.3"
+      sources."trim-trailing-lines-1.1.4"
       sources."trough-1.0.5"
       sources."type-fest-0.13.1"
       sources."typedarray-to-buffer-3.1.5"
       sources."unherit-1.1.3"
       sources."unified-9.2.0"
       sources."uniq-1.0.1"
-      sources."unist-util-find-all-after-3.0.1"
-      sources."unist-util-is-4.0.2"
+      sources."unist-util-find-all-after-3.0.2"
+      sources."unist-util-is-4.0.3"
       sources."unist-util-remove-position-2.0.1"
       sources."unist-util-stringify-position-2.0.3"
       sources."unist-util-visit-2.0.3"
       sources."unist-util-visit-parents-3.1.1"
       sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
-      sources."v8-compile-cache-2.1.1"
+      sources."v8-compile-cache-2.2.0"
       sources."validate-npm-package-license-3.0.4"
       sources."vfile-4.2.0"
-      sources."vfile-location-3.1.0"
+      sources."vfile-location-3.2.0"
       sources."vfile-message-2.0.4"
       sources."vscode-jsonrpc-5.1.0-next.1"
       sources."vscode-languageserver-6.2.0-next.2"
@@ -64303,7 +64776,7 @@ in
         ];
       })
       sources."vscode-languageserver-textdocument-1.0.1"
-      sources."vscode-languageserver-types-3.16.0-next.3"
+      sources."vscode-languageserver-types-3.16.0-next.4"
       sources."vscode-uri-2.1.2"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
@@ -64436,13 +64909,13 @@ in
   coc-tsserver = nodeEnv.buildNodePackage {
     name = "coc-tsserver";
     packageName = "coc-tsserver";
-    version = "1.5.8";
+    version = "1.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.8.tgz";
-      sha512 = "rh1/curdq4ygQxsqPxJ7lgZR1zcEC3uWjLuDM4aiexzVAIO5QxtCFmKkfQHPzlOMHm6Gp5WvSJzgncS3Fj2Z+Q==";
+      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.0.tgz";
+      sha512 = "mGqubDWL5kRHhcoCoAG5LyODhBEh7ORXhCTCZ1GLj7waEaHxtmFSoBlD0H4KwijvI/P+08ji/DLBfp842BPkgw==";
     };
     dependencies = [
-      sources."typescript-4.0.3"
+      sources."typescript-4.0.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -64457,10 +64930,10 @@ in
   coc-vetur = nodeEnv.buildNodePackage {
     name = "coc-vetur";
     packageName = "coc-vetur";
-    version = "1.2.0";
+    version = "1.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.0.tgz";
-      sha512 = "JtuTM6DHU21h6j1fEeAaOtfFveLOzeqVXh9mjd53fVHws9T89wW8yV0ZsU5gz4u4g0tw7nN779sJqOEAXnmR8w==";
+      url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.1.tgz";
+      sha512 = "ji3UHWxiAnEwEcAxedGMxZbwKffTB+7t0zT2mKozv9wYZGgc3Rexp0Nvl3J05Cfvz+FCrSEDSaxpo+JSfdYLIQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -64469,7 +64942,7 @@ in
       sources."@emmetio/abbreviation-2.0.2"
       sources."@emmetio/css-abbreviation-2.1.2"
       sources."@emmetio/scanner-1.0.0"
-      (sources."@eslint/eslintrc-0.1.3" // {
+      (sources."@eslint/eslintrc-0.2.1" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."ignore-4.0.6"
@@ -64484,7 +64957,7 @@ in
       })
       sources."@nodelib/fs.stat-1.1.3"
       sources."@nodelib/fs.walk-1.2.4"
-      sources."@prettier/plugin-pug-1.9.0"
+      sources."@prettier/plugin-pug-1.10.1"
       sources."@sindresorhus/is-0.14.0"
       sources."@sorg/log-2.2.0"
       sources."@starptech/expression-parser-0.10.0"
@@ -64511,7 +64984,7 @@ in
       sources."@types/json-schema-7.0.6"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.0"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
@@ -64609,7 +65082,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-4.1.0"
       sources."camelcase-keys-4.2.0"
-      sources."ccount-1.0.5"
+      sources."ccount-1.1.0"
       sources."chalk-2.4.2"
       sources."character-entities-1.2.4"
       sources."character-entities-html4-1.1.4"
@@ -64740,13 +65213,13 @@ in
       sources."duplexer3-0.1.4"
       sources."editorconfig-0.15.3"
       sources."element-helper-json-2.0.6"
-      sources."emmet-2.1.5"
+      sources."emmet-2.1.6"
       sources."emoji-regex-7.0.3"
       sources."end-of-stream-1.4.4"
       sources."enquirer-2.3.6"
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-7.11.0" // {
+      (sources."eslint-7.12.1" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."ansi-styles-4.3.0"
@@ -64844,7 +65317,7 @@ in
       })
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."fault-1.0.4"
       sources."figures-3.2.0"
       sources."file-entry-cache-5.0.1"
@@ -64861,7 +65334,7 @@ in
       sources."format-0.2.2"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.2.0"
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       sources."get-caller-file-1.0.3"
@@ -64905,7 +65378,7 @@ in
       sources."hast-util-has-property-1.0.4"
       sources."hast-util-is-body-ok-link-1.0.4"
       sources."hast-util-is-element-1.1.0"
-      sources."hast-util-parse-selector-2.2.4"
+      sources."hast-util-parse-selector-2.2.5"
       sources."hast-util-to-string-1.0.4"
       sources."hast-util-whitespace-1.0.4"
       sources."hosted-git-info-2.8.8"
@@ -64914,7 +65387,7 @@ in
       sources."http-cache-semantics-4.1.0"
       sources."iconv-lite-0.4.24"
       sources."ignore-3.3.10"
-      (sources."import-fresh-3.2.1" // {
+      (sources."import-fresh-3.2.2" // {
         dependencies = [
           sources."resolve-from-4.0.0"
         ];
@@ -64946,7 +65419,7 @@ in
       sources."is-alphanumerical-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-2.1.0"
-      sources."is-buffer-2.0.4"
+      sources."is-buffer-2.0.5"
       sources."is-ci-2.0.0"
       sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
@@ -65229,13 +65702,13 @@ in
       sources."reusify-1.0.4"
       sources."rimraf-2.6.3"
       sources."run-async-2.4.1"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."rxjs-6.6.3"
       sources."s.color-0.0.13"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      sources."sass-formatter-0.4.15"
+      sources."sass-formatter-0.5.1"
       sources."sax-1.2.4"
       sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
@@ -65362,7 +65835,7 @@ in
       sources."stylus-supremacy-2.14.5"
       sources."suf-cli-0.1.3"
       sources."suf-node-1.2.1"
-      sources."suf-regex-0.0.23"
+      sources."suf-regex-0.0.25"
       sources."supports-color-5.5.0"
       sources."symbol-0.2.3"
       (sources."table-5.4.6" // {
@@ -65388,7 +65861,7 @@ in
       sources."to-vfile-6.1.0"
       sources."trim-0.0.1"
       sources."trim-newlines-2.0.0"
-      sources."trim-trailing-lines-1.1.3"
+      sources."trim-trailing-lines-1.1.4"
       sources."trough-1.0.5"
       sources."tslib-1.14.1"
       (sources."tslint-5.20.1" // {
@@ -65400,7 +65873,7 @@ in
       sources."type-check-0.4.0"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
-      sources."typescript-4.0.3"
+      sources."typescript-4.0.5"
       sources."unherit-1.1.3"
       (sources."unified-7.1.0" // {
         dependencies = [
@@ -65454,7 +65927,7 @@ in
       sources."use-3.1.1"
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
-      sources."v8-compile-cache-2.1.1"
+      sources."v8-compile-cache-2.2.0"
       sources."validate-npm-package-license-3.0.4"
       sources."vfile-4.2.0"
       sources."vfile-location-2.0.6"
@@ -65471,13 +65944,13 @@ in
       })
       sources."vfile-sort-2.2.2"
       sources."vfile-statistics-1.1.4"
-      sources."vls-0.5.4"
-      (sources."vscode-css-languageservice-4.3.3" // {
+      sources."vls-0.5.5"
+      (sources."vscode-css-languageservice-4.3.5" // {
         dependencies = [
           sources."vscode-languageserver-types-3.16.0-next.2"
         ];
       })
-      (sources."vscode-emmet-helper-2.0.7" // {
+      (sources."vscode-emmet-helper-2.1.1" // {
         dependencies = [
           sources."vscode-languageserver-types-3.15.1"
         ];
@@ -65487,7 +65960,7 @@ in
       sources."vscode-languageserver-protocol-3.16.0-next.7"
       sources."vscode-languageserver-textdocument-1.0.1"
       sources."vscode-languageserver-types-3.16.0-next.3"
-      sources."vscode-nls-4.1.2"
+      sources."vscode-nls-5.0.0"
       sources."vscode-uri-2.1.2"
       sources."vscode-web-custom-data-0.3.1"
       (sources."vue-eslint-parser-7.1.1" // {
@@ -65595,7 +66068,7 @@ in
       sources."prettier-2.0.5"
       sources."request-light-0.2.5"
       sources."sprintf-js-1.0.3"
-      (sources."vscode-json-languageservice-3.9.1" // {
+      (sources."vscode-json-languageservice-3.10.0" // {
         dependencies = [
           sources."vscode-languageserver-types-3.16.0-next.2"
           sources."vscode-nls-5.0.0"
@@ -65714,41 +66187,39 @@ in
   configurable-http-proxy = nodeEnv.buildNodePackage {
     name = "configurable-http-proxy";
     packageName = "configurable-http-proxy";
-    version = "4.2.1";
+    version = "4.2.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.2.1.tgz";
-      sha512 = "43JESj3abbSnIu1B3pdyTxX2pfMT+wUgVSuCRItBq9HHops0anoxWOnbV1vRk6myeuHElB41wX4Q6QF+d/r8PQ==";
+      url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.2.2.tgz";
+      sha512 = "sG/P4fxVzz7lTzKjIg1MmnNF5ChW1+zk/LpLxdNgCHlgAMlQTAC12UqBtkFrczGQ6SapsvB3x4VbKLjdrcrjhA==";
     };
     dependencies = [
-      sources."async-2.6.3"
+      sources."@dabh/diagnostics-2.0.2"
+      sources."async-3.2.0"
       sources."color-3.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."color-string-1.5.4"
-      sources."colornames-1.1.1"
       sources."colors-1.4.0"
       sources."colorspace-1.1.2"
-      sources."commander-4.1.1"
+      sources."commander-6.1.0"
       sources."core-util-is-1.0.2"
-      sources."diagnostics-1.1.1"
-      sources."enabled-1.0.2"
-      sources."env-variable-0.0.6"
+      sources."enabled-2.0.0"
       sources."eventemitter3-4.0.7"
       sources."fast-safe-stringify-2.0.7"
       sources."fecha-4.2.0"
+      sources."fn.name-1.1.0"
       sources."follow-redirects-1.13.0"
       sources."http-proxy-1.18.1"
       sources."inherits-2.0.4"
       sources."is-arrayish-0.3.2"
-      sources."is-stream-1.1.0"
+      sources."is-stream-2.0.0"
       sources."isarray-1.0.0"
-      sources."kuler-1.0.1"
-      sources."lodash-4.17.20"
+      sources."kuler-2.0.0"
       sources."logform-2.2.0"
       sources."lynx-0.2.0"
       sources."mersenne-0.0.4"
       sources."ms-2.1.2"
-      sources."one-time-0.0.4"
+      sources."one-time-1.0.0"
       sources."process-nextick-args-2.0.1"
       sources."readable-stream-3.6.0"
       sources."requires-port-1.0.0"
@@ -65761,7 +66232,7 @@ in
       sources."text-hex-1.0.0"
       sources."triple-beam-1.3.0"
       sources."util-deprecate-1.0.2"
-      sources."winston-3.2.1"
+      sources."winston-3.3.3"
       (sources."winston-transport-4.4.0" // {
         dependencies = [
           sources."readable-stream-2.3.7"
@@ -65816,7 +66287,7 @@ in
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
@@ -65925,7 +66396,7 @@ in
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
-      sources."execa-4.0.3"
+      sources."execa-4.1.0"
       sources."express-4.17.1"
       sources."extend-3.0.2"
       (sources."external-editor-3.1.0" // {
@@ -65938,7 +66409,7 @@ in
       sources."fast-glob-3.2.4"
       sources."fast-json-parse-1.0.3"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."figures-2.0.0"
       sources."fill-range-7.0.1"
       sources."finalhandler-1.1.2"
@@ -65978,7 +66449,7 @@ in
       sources."human-signals-1.1.1"
       sources."iconv-lite-0.4.24"
       sources."ignore-5.1.8"
-      sources."import-fresh-3.2.1"
+      sources."import-fresh-3.2.2"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
@@ -66038,7 +66509,11 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-6.0.1"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       (sources."jsprim-1.4.1" // {
         dependencies = [
           sources."extsprintf-1.3.0"
@@ -66132,7 +66607,7 @@ in
       sources."psl-1.8.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
-      sources."pupa-2.0.1"
+      sources."pupa-2.1.1"
       sources."q-1.5.1"
       sources."qs-6.7.0"
       sources."range-parser-1.2.1"
@@ -66165,7 +66640,7 @@ in
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
       sources."run-async-2.4.1"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."rxjs-6.6.3"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -66209,8 +66684,8 @@ in
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.27.10"
-      sources."term-size-2.2.0"
+      sources."systeminformation-4.27.11"
+      sources."term-size-2.2.1"
       sources."through-2.3.8"
       sources."tmp-0.2.1"
       sources."to-readable-stream-1.0.0"
@@ -66296,7 +66771,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.0"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/normalize-package-data-2.4.0"
       sources."aggregate-error-3.1.0"
       sources."ansi-styles-3.2.1"
@@ -66667,7 +67142,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.2"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -66811,34 +67286,35 @@ in
   create-react-app = nodeEnv.buildNodePackage {
     name = "create-react-app";
     packageName = "create-react-app";
-    version = "3.4.1";
+    version = "4.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.4.1.tgz";
-      sha512 = "i0Zxiqj8Q2tMJkMousrZdB/vlvtoAZyN49bgAfM4yHhWQUzrpM1rZU7TX1Rg5bbDQ1R8Gk/usNnpkDzEHJdVXg==";
+      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.0.tgz";
+      sha512 = "TonJ7eOtCbqURfE8VaHKXHPvsFMNrya+0XZMvpGAiQ8Snlig70BfZi0CUr0MNM8WQxap1xe3GivtKOBwuQsRCg==";
     };
     dependencies = [
       sources."ansi-escapes-4.3.1"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
+      sources."at-least-node-1.0.0"
       sources."balanced-match-1.0.0"
       sources."block-stream-0.0.9"
       sources."brace-expansion-1.1.11"
       sources."buffer-from-0.1.2"
       sources."builtins-1.0.3"
-      sources."chalk-3.0.0"
+      sources."chalk-4.1.0"
       sources."chardet-0.7.0"
       sources."cli-cursor-3.1.0"
-      sources."cli-width-2.2.1"
+      sources."cli-width-3.0.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      sources."commander-4.1.0"
+      sources."commander-4.1.1"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
-      sources."cross-spawn-7.0.1"
+      sources."cross-spawn-7.0.3"
       sources."debug-2.6.9"
       sources."duplexer2-0.0.2"
       sources."emoji-regex-8.0.0"
-      sources."envinfo-7.5.0"
+      sources."envinfo-7.7.3"
       sources."escape-string-regexp-1.0.5"
       (sources."external-editor-3.1.0" // {
         dependencies = [
@@ -66846,7 +67322,7 @@ in
         ];
       })
       sources."figures-3.2.0"
-      sources."fs-extra-8.1.0"
+      sources."fs-extra-9.0.1"
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.12"
       sources."fstream-ignore-1.0.5"
@@ -66857,20 +67333,15 @@ in
       sources."iconv-lite-0.4.24"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      (sources."inquirer-7.0.4" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
+      sources."inquirer-7.3.3"
       sources."is-fullwidth-code-point-3.0.0"
       sources."isarray-0.0.1"
       sources."isexe-2.0.0"
-      sources."jsonfile-4.0.0"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."lodash-4.17.20"
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
@@ -66891,21 +67362,13 @@ in
       sources."rxjs-6.6.3"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-6.3.0"
+      sources."semver-7.3.2"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.3"
-      (sources."string-width-4.2.0" // {
-        dependencies = [
-          sources."strip-ansi-6.0.0"
-        ];
-      })
+      sources."string-width-4.2.0"
       sources."string_decoder-0.10.31"
-      (sources."strip-ansi-5.2.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-        ];
-      })
+      sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
       sources."tar-2.2.2"
       (sources."tar-pack-3.4.1" // {
@@ -66921,11 +67384,15 @@ in
           sources."readable-stream-1.0.34"
         ];
       })
-      sources."tmp-0.1.0"
+      (sources."tmp-0.2.1" // {
+        dependencies = [
+          sources."rimraf-3.0.2"
+        ];
+      })
       sources."tslib-1.14.1"
       sources."type-fest-0.11.0"
       sources."uid-number-0.0.6"
-      sources."universalify-0.1.2"
+      sources."universalify-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."validate-npm-package-name-3.0.0"
       sources."which-2.0.2"
@@ -67019,7 +67486,7 @@ in
       sources."atob-2.1.2"
       sources."atomic-batcher-1.0.2"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -67061,7 +67528,7 @@ in
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
-      sources."chrome-dgram-3.0.5"
+      sources."chrome-dgram-3.0.6"
       sources."chrome-dns-1.0.1"
       sources."chrome-net-3.3.4"
       sources."ci-info-1.6.0"
@@ -67436,7 +67903,7 @@ in
       sources."ret-0.1.15"
       sources."revalidator-0.1.8"
       sources."rimraf-2.7.1"
-      sources."run-series-1.1.8"
+      sources."run-series-1.1.9"
       sources."rusha-0.8.13"
       sources."safe-buffer-5.2.1"
       sources."safe-regex-1.1.0"
@@ -67682,7 +68149,7 @@ in
       sources."del-6.0.0"
       sources."dir-glob-3.0.1"
       sources."fast-glob-3.2.4"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
       sources."fs.realpath-1.0.0"
@@ -67716,7 +68183,7 @@ in
       sources."picomatch-2.2.2"
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."rxjs-6.6.3"
       sources."slash-3.0.0"
       sources."temp-dir-2.0.0"
@@ -67777,10 +68244,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.33.4";
+    version = "6.34.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.33.4.tgz";
-      sha512 = "DrZNU3pm9PCWpP8yOut7XP0UTpu+bIzfvR4FCFbefN/kI87e9BNQ44rcZIf6R3B9KhVzKhByCw7mzkTwk+oy7g==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.34.0.tgz";
+      sha512 = "YpMFwMv6BhUg4xC1eJRkBzqonsOFf/gsSjOP3Dr6S89USW3DNrY4UTZn0D7rrfpCkSZPDDcEwqy5rpcfSNYN9Q==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
@@ -67789,9 +68256,9 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.774.0"
+      sources."aws-sdk-2.784.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
@@ -67961,13 +68428,13 @@ in
       sources."@babel/template-7.10.4"
       sources."@babel/traverse-7.12.1"
       sources."@babel/types-7.12.1"
-      sources."@sindresorhus/is-3.1.2"
+      sources."@sindresorhus/is-4.0.0"
       sources."@szmarczak/http-timer-4.0.5"
       sources."@types/cacheable-request-6.0.1"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
       sources."@types/minimist-1.2.0"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/responselike-1.0.0"
       sources."@types/yoga-layout-1.9.2"
@@ -67979,7 +68446,7 @@ in
       })
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
-      sources."arch-2.1.2"
+      sources."arch-2.2.0"
       sources."arrify-1.0.1"
       sources."astral-regex-2.0.0"
       sources."atomically-1.6.0"
@@ -68049,11 +68516,11 @@ in
       sources."find-up-3.0.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
-      sources."gensync-1.0.0-beta.1"
+      sources."gensync-1.0.0-beta.2"
       sources."get-stream-4.1.0"
       sources."glob-7.1.6"
       sources."globals-11.12.0"
-      sources."got-11.7.0"
+      sources."got-11.8.0"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -68064,7 +68531,7 @@ in
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      (sources."ink-3.0.7" // {
+      (sources."ink-3.0.8" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
@@ -68292,10 +68759,10 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.147.1"
-      sources."@fluentui/react-focus-7.16.13"
-      sources."@fluentui/react-window-provider-0.3.3"
-      sources."@fluentui/theme-1.5.1"
+      sources."@fluentui/react-7.149.3"
+      sources."@fluentui/react-focus-7.16.16"
+      sources."@fluentui/react-window-provider-1.0.1"
+      sources."@fluentui/theme-1.5.4"
       (sources."@gulp-sourcemaps/identity-map-1.0.2" // {
         dependencies = [
           sources."normalize-path-2.1.1"
@@ -68306,7 +68773,7 @@ in
           sources."normalize-path-2.1.1"
         ];
       })
-      sources."@microsoft/load-themed-styles-1.10.114"
+      sources."@microsoft/load-themed-styles-1.10.125"
       sources."@nodelib/fs.scandir-2.1.3"
       sources."@nodelib/fs.stat-2.0.3"
       sources."@nodelib/fs.walk-1.2.4"
@@ -68351,13 +68818,13 @@ in
       sources."@types/sqlite3-3.1.6"
       sources."@types/tough-cookie-4.0.0"
       sources."@types/url-join-4.0.0"
-      sources."@uifabric/foundation-7.9.14"
-      sources."@uifabric/icons-7.5.12"
+      sources."@uifabric/foundation-7.9.18"
+      sources."@uifabric/icons-7.5.15"
       sources."@uifabric/merge-styles-7.19.1"
-      sources."@uifabric/react-hooks-7.13.6"
+      sources."@uifabric/react-hooks-7.13.9"
       sources."@uifabric/set-version-7.0.23"
-      sources."@uifabric/styling-7.16.13"
-      sources."@uifabric/utilities-7.32.4"
+      sources."@uifabric/styling-7.16.16"
+      sources."@uifabric/utilities-7.33.2"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
       sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -68477,7 +68944,7 @@ in
       sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."b24.js-1.0.3"
       sources."babel-polyfill-6.23.0"
       (sources."babel-runtime-6.26.0" // {
@@ -68526,7 +68993,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."buffer-5.6.0"
+      sources."buffer-5.7.0"
       sources."buffer-equal-1.0.0"
       sources."buffer-from-1.1.1"
       sources."buffer-writer-2.0.0"
@@ -68559,6 +69026,7 @@ in
           sources."lowercase-keys-2.0.0"
         ];
       })
+      sources."call-bind-1.0.0"
       sources."callsite-1.0.0"
       sources."camelcase-3.0.0"
       sources."caseless-0.12.0"
@@ -68771,8 +69239,6 @@ in
       sources."enhanced-resolve-4.3.0"
       sources."errno-0.1.7"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.1"
-      sources."es-to-primitive-1.2.1"
       sources."es5-ext-0.10.53"
       sources."es6-iterator-2.0.3"
       sources."es6-promise-4.2.8"
@@ -68839,7 +69305,7 @@ in
       sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-1.1.4"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."figgy-pudding-3.5.2"
       sources."figures-2.0.0"
       sources."file-uri-to-path-1.0.0"
@@ -68908,6 +69374,7 @@ in
         ];
       })
       sources."get-caller-file-1.0.3"
+      sources."get-intrinsic-1.0.1"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
@@ -69011,7 +69478,7 @@ in
       sources."http-signature-1.2.0"
       sources."https-browserify-1.0.0"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."iferr-0.1.5"
       sources."ignore-5.1.8"
       sources."ignore-walk-3.0.3"
@@ -69032,10 +69499,8 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
       sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
-      sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
       sources."is-dir-1.0.0"
       sources."is-extendable-0.1.1"
@@ -69043,16 +69508,13 @@ in
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-negated-glob-1.0.0"
-      sources."is-negative-zero-2.0.0"
       sources."is-number-7.0.0"
       sources."is-path-cwd-2.2.0"
       sources."is-path-inside-3.0.2"
       sources."is-plain-object-2.0.4"
       sources."is-promise-2.2.2"
-      sources."is-regex-1.1.1"
       sources."is-relative-1.0.0"
       sources."is-stream-1.1.0"
-      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-unc-path-1.0.0"
       sources."is-utf8-0.2.1"
@@ -69063,7 +69525,7 @@ in
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
-      (sources."jest-worker-26.5.0" // {
+      (sources."jest-worker-26.6.2" // {
         dependencies = [
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
@@ -69079,7 +69541,11 @@ in
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."json-stringify-safe-5.0.1"
       sources."json5-1.0.1"
-      sources."jsonfile-6.0.1"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."jsprim-1.4.1"
       sources."just-debounce-1.0.0"
       sources."keyv-3.1.0"
@@ -69322,15 +69788,14 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."object.defaults-1.1.0"
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
       sources."object.reduce-1.0.1"
-      sources."office-ui-fabric-react-7.147.1"
+      sources."office-ui-fabric-react-7.149.3"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -69413,10 +69878,10 @@ in
       })
       sources."pg-connection-string-2.4.0"
       sources."pg-int8-1.0.1"
-      sources."pg-pool-3.2.1"
+      sources."pg-pool-3.2.2"
       sources."pg-protocol-1.3.0"
       sources."pg-types-2.2.0"
-      sources."pgpass-1.0.2"
+      sources."pgpass-1.0.4"
       sources."picomatch-2.2.2"
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
@@ -69518,13 +69983,13 @@ in
       sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
       sources."run-async-2.4.1"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."run-queue-1.0.3"
       sources."rx-4.1.0"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      sources."sass-1.27.0"
+      sources."sass-1.28.0"
       sources."sax-1.2.4"
       sources."scheduler-0.19.1"
       sources."schema-utils-2.7.1"
@@ -69617,8 +70082,8 @@ in
       sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.1"
       sources."spdx-license-ids-3.0.6"
-      sources."split-1.0.1"
       sources."split-string-3.1.0"
+      sources."split2-3.2.2"
       sources."sprintf-js-1.0.3"
       sources."sqlite3-5.0.0"
       sources."sqlstring-2.3.1"
@@ -69680,16 +70145,6 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
       (sources."string_decoder-1.3.0" // {
         dependencies = [
           sources."safe-buffer-5.2.1"
@@ -69710,7 +70165,7 @@ in
           sources."mkdirp-0.5.5"
         ];
       })
-      (sources."terser-5.3.7" // {
+      (sources."terser-5.3.8" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -69726,7 +70181,7 @@ in
       })
       sources."through2-filter-3.0.0"
       sources."time-stamp-1.1.0"
-      sources."timers-browserify-2.0.11"
+      sources."timers-browserify-2.0.12"
       sources."timers-ext-0.1.7"
       sources."tmp-0.0.33"
       sources."to-absolute-glob-2.0.2"
@@ -69939,10 +70394,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "7.11.0";
+    version = "7.12.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz";
-      sha512 = "G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==";
+      url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz";
+      sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -69952,7 +70407,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@eslint/eslintrc-0.1.3"
+      sources."@eslint/eslintrc-0.2.1"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
       sources."ajv-6.12.6"
@@ -70021,7 +70476,7 @@ in
       sources."globals-12.4.0"
       sources."has-flag-3.0.0"
       sources."ignore-4.0.6"
-      sources."import-fresh-3.2.1"
+      sources."import-fresh-3.2.2"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -70070,7 +70525,7 @@ in
       sources."type-check-0.4.0"
       sources."type-fest-0.8.1"
       sources."uri-js-4.4.0"
-      sources."v8-compile-cache-2.1.1"
+      sources."v8-compile-cache-2.2.0"
       sources."which-2.0.2"
       sources."word-wrap-1.2.3"
       sources."wrappy-1.0.2"
@@ -70102,7 +70557,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@eslint/eslintrc-0.1.3"
+      sources."@eslint/eslintrc-0.2.1"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
       sources."ajv-6.12.6"
@@ -70134,7 +70589,7 @@ in
       sources."emoji-regex-7.0.3"
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-7.11.0"
+      sources."eslint-7.12.1"
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
         dependencies = [
@@ -70173,7 +70628,7 @@ in
       sources."globals-12.4.0"
       sources."has-flag-3.0.0"
       sources."ignore-4.0.6"
-      sources."import-fresh-3.2.1"
+      sources."import-fresh-3.2.2"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -70223,7 +70678,7 @@ in
       sources."type-check-0.4.0"
       sources."type-fest-0.8.1"
       sources."uri-js-4.4.0"
-      sources."v8-compile-cache-2.1.1"
+      sources."v8-compile-cache-2.2.0"
       sources."which-2.0.2"
       sources."word-wrap-1.2.3"
       sources."wrappy-1.0.2"
@@ -70242,21 +70697,21 @@ in
   expo-cli = nodeEnv.buildNodePackage {
     name = "expo-cli";
     packageName = "expo-cli";
-    version = "3.28.1";
+    version = "3.28.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.1.tgz";
-      sha512 = "m0+d3uvO7sopcI0mlpLjYYAKaWx1FCPNlbxQxkRZHdhbdCVhrPcAdmZHJGfBNW1N4szMac6LiLZFWxDjECU1bA==";
+      url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.4.tgz";
+      sha512 = "nVk7Tc8I3hzhKnZwIOWh08Qq8VDZqYLA81Zrdu7HeIfJYAzppgYPB6tiZFouWwZl9/twf2JSYAUZmLwVhLK61A==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/compat-data-7.12.1"
+      sources."@babel/compat-data-7.12.5"
       sources."@babel/core-7.9.0"
-      sources."@babel/generator-7.12.1"
+      sources."@babel/generator-7.12.5"
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
       sources."@babel/helper-builder-react-jsx-7.10.4"
       sources."@babel/helper-builder-react-jsx-experimental-7.12.4"
-      sources."@babel/helper-compilation-targets-7.12.1"
+      sources."@babel/helper-compilation-targets-7.12.5"
       sources."@babel/helper-create-class-features-plugin-7.12.1"
       sources."@babel/helper-create-regexp-features-plugin-7.12.1"
       (sources."@babel/helper-define-map-7.10.5" // {
@@ -70269,7 +70724,7 @@ in
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-hoist-variables-7.10.4"
       sources."@babel/helper-member-expression-to-functions-7.12.1"
-      sources."@babel/helper-module-imports-7.12.1"
+      sources."@babel/helper-module-imports-7.12.5"
       (sources."@babel/helper-module-transforms-7.12.1" // {
         dependencies = [
           sources."lodash-4.17.20"
@@ -70283,20 +70738,20 @@ in
         ];
       })
       sources."@babel/helper-remap-async-to-generator-7.12.1"
-      sources."@babel/helper-replace-supers-7.12.1"
+      sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
       sources."@babel/helper-split-export-declaration-7.11.0"
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/helper-validator-option-7.12.1"
       sources."@babel/helper-wrap-function-7.12.3"
-      sources."@babel/helpers-7.12.1"
+      sources."@babel/helpers-7.12.5"
       (sources."@babel/highlight-7.10.4" // {
         dependencies = [
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.12.3"
+      sources."@babel/parser-7.12.5"
       sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
       sources."@babel/plugin-proposal-dynamic-import-7.12.1"
@@ -70305,7 +70760,7 @@ in
       sources."@babel/plugin-proposal-json-strings-7.12.1"
       sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-      sources."@babel/plugin-proposal-numeric-separator-7.12.1"
+      sources."@babel/plugin-proposal-numeric-separator-7.12.5"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
       sources."@babel/plugin-proposal-optional-chaining-7.12.1"
@@ -70353,7 +70808,7 @@ in
       sources."@babel/plugin-transform-parameters-7.12.1"
       sources."@babel/plugin-transform-property-literals-7.12.1"
       sources."@babel/plugin-transform-react-display-name-7.12.1"
-      sources."@babel/plugin-transform-react-jsx-7.12.1"
+      sources."@babel/plugin-transform-react-jsx-7.12.5"
       sources."@babel/plugin-transform-react-jsx-source-7.12.1"
       sources."@babel/plugin-transform-regenerator-7.12.1"
       sources."@babel/plugin-transform-reserved-words-7.12.1"
@@ -70373,14 +70828,14 @@ in
       sources."@babel/preset-env-7.12.1"
       sources."@babel/preset-modules-0.1.4"
       sources."@babel/preset-typescript-7.12.1"
-      sources."@babel/runtime-7.12.1"
+      sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.10.4"
-      (sources."@babel/traverse-7.12.1" // {
+      (sources."@babel/traverse-7.12.5" // {
         dependencies = [
           sources."lodash-4.17.20"
         ];
       })
-      (sources."@babel/types-7.12.1" // {
+      (sources."@babel/types-7.12.5" // {
         dependencies = [
           sources."lodash-4.17.20"
         ];
@@ -70391,9 +70846,10 @@ in
           sources."uuid-3.4.0"
         ];
       })
-      (sources."@expo/config-3.3.11" // {
+      (sources."@expo/config-3.3.13" // {
         dependencies = [
           sources."semver-7.3.2"
+          sources."slash-3.0.0"
           sources."uuid-3.4.0"
           sources."xcode-2.1.0"
         ];
@@ -70405,7 +70861,7 @@ in
           sources."pngjs-5.0.0"
         ];
       })
-      (sources."@expo/dev-server-0.1.36" // {
+      (sources."@expo/dev-server-0.1.38" // {
         dependencies = [
           sources."body-parser-1.19.0"
           sources."bytes-3.1.0"
@@ -70419,13 +70875,15 @@ in
           sources."serialize-error-6.0.0"
           sources."setprototypeof-1.1.1"
           sources."statuses-1.5.0"
+          sources."type-fest-0.12.0"
         ];
       })
-      sources."@expo/dev-tools-0.13.54"
-      sources."@expo/eas-build-job-0.1.1"
+      sources."@expo/dev-tools-0.13.57"
+      sources."@expo/eas-build-job-0.1.2"
       (sources."@expo/image-utils-0.3.7" // {
         dependencies = [
           sources."semver-6.1.1"
+          sources."tempy-0.3.0"
         ];
       })
       (sources."@expo/json-file-8.2.24" // {
@@ -70433,7 +70891,7 @@ in
           sources."json5-1.0.1"
         ];
       })
-      sources."@expo/metro-config-0.1.36"
+      sources."@expo/metro-config-0.1.38"
       (sources."@expo/ngrok-2.4.3" // {
         dependencies = [
           sources."uuid-3.4.0"
@@ -70481,14 +70939,14 @@ in
       sources."@expo/spawn-async-1.5.0"
       sources."@expo/traveling-fastlane-darwin-1.15.1"
       sources."@expo/traveling-fastlane-linux-1.15.1"
-      (sources."@expo/webpack-config-0.12.40" // {
+      (sources."@expo/webpack-config-0.12.42" // {
         dependencies = [
           sources."@babel/runtime-7.9.0"
           sources."is-wsl-2.2.0"
           sources."react-refresh-0.8.3"
         ];
       })
-      (sources."@expo/xdl-58.0.15" // {
+      (sources."@expo/xdl-58.0.18" // {
         dependencies = [
           sources."chownr-1.1.4"
           sources."es6-error-4.1.1"
@@ -70601,8 +71059,8 @@ in
         ];
       })
       sources."@npmcli/node-gyp-1.0.1"
-      sources."@npmcli/promise-spawn-1.2.0"
-      sources."@npmcli/run-script-1.7.2"
+      sources."@npmcli/promise-spawn-1.3.2"
+      sources."@npmcli/run-script-1.7.4"
       sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3"
       sources."@react-native-community/cli-debugger-ui-4.9.0"
       (sources."@react-native-community/cli-platform-android-4.13.0" // {
@@ -70663,10 +71121,10 @@ in
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/json-schema-7.0.6"
       sources."@types/keyv-3.1.1"
-      sources."@types/lodash-4.14.162"
+      sources."@types/lodash-4.14.164"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-9.6.60"
+      sources."@types/node-9.6.61"
       sources."@types/q-1.5.4"
       sources."@types/responselike-1.0.0"
       sources."@types/retry-0.12.0"
@@ -70675,12 +71133,12 @@ in
       sources."@types/tapable-1.0.6"
       sources."@types/text-table-0.2.1"
       sources."@types/tmp-0.0.33"
-      (sources."@types/uglify-js-3.11.0" // {
+      (sources."@types/uglify-js-3.11.1" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
-      (sources."@types/webpack-4.41.22" // {
+      (sources."@types/webpack-4.41.24" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -70717,7 +71175,7 @@ in
       sources."accepts-1.3.7"
       sources."acorn-6.4.2"
       sources."address-1.1.2"
-      sources."agent-base-6.0.1"
+      sources."agent-base-6.0.2"
       sources."agentkeepalive-4.1.3"
       sources."aggregate-error-3.1.0"
       sources."ajv-6.12.6"
@@ -70758,7 +71216,7 @@ in
       sources."apollo-utilities-1.3.4"
       sources."application-config-path-0.1.0"
       sources."aproba-1.2.0"
-      sources."arch-2.1.2"
+      sources."arch-2.2.0"
       sources."are-we-there-yet-1.1.5"
       sources."argparse-1.0.10"
       sources."arr-diff-4.0.0"
@@ -70800,12 +71258,12 @@ in
         ];
       })
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       (sources."axios-0.19.0" // {
         dependencies = [
           sources."debug-3.1.0"
           sources."follow-redirects-1.5.10"
-          sources."is-buffer-2.0.4"
+          sources."is-buffer-2.0.5"
           sources."ms-2.0.0"
         ];
       })
@@ -70892,8 +71350,8 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.14.5"
-      sources."buffer-5.6.0"
+      sources."browserslist-4.14.6"
+      sources."buffer-5.7.0"
       sources."buffer-equal-0.0.1"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
@@ -70918,6 +71376,7 @@ in
           sources."normalize-url-4.5.0"
         ];
       })
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
@@ -70930,7 +71389,7 @@ in
       })
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001148"
+      sources."caniuse-lite-1.0.30001154"
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       (sources."chalk-4.1.0" // {
@@ -70984,7 +71443,7 @@ in
         ];
       })
       sources."cliui-6.0.0"
-      sources."clone-1.0.4"
+      sources."clone-2.1.2"
       sources."clone-response-1.0.2"
       sources."co-4.6.0"
       (sources."coa-2.0.2" // {
@@ -71105,17 +71564,18 @@ in
       sources."cssnano-util-get-match-4.0.0"
       sources."cssnano-util-raw-cache-4.0.1"
       sources."cssnano-util-same-parent-4.0.1"
-      (sources."csso-4.0.3" // {
+      (sources."csso-4.1.0" // {
         dependencies = [
-          sources."css-tree-1.0.0-alpha.39"
-          sources."mdn-data-2.0.6"
+          sources."css-tree-1.0.0"
+          sources."mdn-data-2.0.12"
           sources."source-map-0.6.1"
         ];
       })
       sources."cyclist-1.0.1"
+      sources."dag-map-1.0.2"
       sources."dashdash-1.14.1"
       sources."dateformat-3.0.3"
-      sources."dayjs-1.9.3"
+      sources."dayjs-1.9.4"
       sources."debug-4.3.0"
       sources."debuglog-1.0.1"
       sources."decache-4.4.0"
@@ -71127,7 +71587,11 @@ in
       sources."deep-scope-analyser-1.7.0"
       sources."deepmerge-1.5.2"
       sources."default-gateway-4.2.0"
-      sources."defaults-1.0.3"
+      (sources."defaults-1.0.3" // {
+        dependencies = [
+          sources."clone-1.0.4"
+        ];
+      })
       sources."defer-to-connect-1.1.3"
       sources."define-properties-1.1.3"
       sources."define-property-2.0.2"
@@ -71154,7 +71618,7 @@ in
       (sources."devcert-1.1.3" // {
         dependencies = [
           sources."@types/glob-5.0.36"
-          sources."@types/node-8.10.65"
+          sources."@types/node-8.10.66"
           sources."debug-3.2.6"
           sources."rimraf-2.7.1"
           sources."sudo-prompt-8.2.5"
@@ -71184,7 +71648,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.582"
+      sources."electron-to-chromium-1.3.586"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -71267,7 +71731,7 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."expo-pwa-0.0.46" // {
+      (sources."expo-pwa-0.0.48" // {
         dependencies = [
           sources."commander-2.20.0"
         ];
@@ -71295,7 +71759,7 @@ in
       sources."fast-deep-equal-3.1.3"
       sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."faye-websocket-0.10.0"
       sources."figgy-pudding-3.5.2"
       sources."figures-3.2.0"
@@ -71347,7 +71811,11 @@ in
       sources."from2-2.3.0"
       (sources."fs-extra-9.0.0" // {
         dependencies = [
-          sources."jsonfile-6.0.1"
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.0"
+            ];
+          })
           sources."universalify-1.0.0"
         ];
       })
@@ -71368,8 +71836,9 @@ in
           sources."strip-ansi-3.0.1"
         ];
       })
-      sources."gensync-1.0.0-beta.1"
+      sources."gensync-1.0.0-beta.2"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.0.1"
       sources."get-own-enumerable-property-symbols-3.0.2"
       sources."get-port-3.2.0"
       sources."get-stream-4.1.0"
@@ -71388,9 +71857,9 @@ in
           sources."pify-2.3.0"
         ];
       })
-      (sources."got-11.7.0" // {
+      (sources."got-11.8.0" // {
         dependencies = [
-          sources."@sindresorhus/is-3.1.2"
+          sources."@sindresorhus/is-4.0.0"
           sources."@szmarczak/http-timer-4.0.5"
           sources."cacheable-request-7.0.1"
           sources."decompress-response-6.0.0"
@@ -71503,7 +71972,7 @@ in
       sources."iconv-lite-0.4.23"
       sources."icss-utils-4.1.1"
       sources."idx-2.4.0"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."iferr-0.1.5"
       sources."ignore-5.1.8"
       sources."ignore-walk-3.0.3"
@@ -71557,6 +72026,12 @@ in
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-function-1.0.2"
       sources."is-glob-4.0.1"
+      (sources."is-invalid-path-0.1.0" // {
+        dependencies = [
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+        ];
+      })
       sources."is-lambda-1.0.1"
       sources."is-map-2.0.1"
       sources."is-negative-zero-2.0.0"
@@ -71597,6 +72072,7 @@ in
         ];
       })
       sources."is-typedarray-1.0.0"
+      sources."is-valid-path-0.1.1"
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
       sources."is-windows-1.0.2"
@@ -71607,7 +72083,7 @@ in
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
       sources."iterall-1.2.2"
-      (sources."jest-worker-26.5.0" // {
+      (sources."jest-worker-26.6.2" // {
         dependencies = [
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
@@ -71626,6 +72102,11 @@ in
       sources."json-parse-better-errors-1.0.2"
       sources."json-parse-even-better-errors-2.3.1"
       sources."json-schema-0.2.3"
+      (sources."json-schema-deref-sync-0.13.0" // {
+        dependencies = [
+          sources."md5-2.2.1"
+        ];
+      })
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-1.0.1"
       sources."json-stringify-safe-5.0.1"
@@ -71701,6 +72182,7 @@ in
       sources."md5hex-1.0.0"
       sources."mdn-data-2.0.4"
       sources."media-typer-0.3.0"
+      sources."memory-cache-0.2.0"
       sources."memory-fs-0.4.1"
       sources."merge-descriptors-1.0.1"
       sources."merge-stream-2.0.0"
@@ -71810,7 +72292,7 @@ in
           sources."which-2.0.2"
         ];
       })
-      sources."node-html-parser-1.3.1"
+      sources."node-html-parser-1.4.5"
       (sources."node-libs-browser-2.2.1" // {
         dependencies = [
           sources."buffer-4.9.2"
@@ -71819,7 +72301,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.64"
+      sources."node-releases-1.1.65"
       sources."nopt-5.0.0"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
@@ -71835,7 +72317,7 @@ in
           sources."hosted-git-info-2.8.8"
         ];
       })
-      sources."npm-packlist-2.1.2"
+      sources."npm-packlist-2.1.4"
       (sources."npm-pick-manifest-6.1.0" // {
         dependencies = [
           sources."npm-package-arg-8.1.0"
@@ -71873,7 +72355,7 @@ in
       sources."object-is-1.1.3"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       (sources."object.entries-1.1.2" // {
         dependencies = [
           sources."es-abstract-1.17.7"
@@ -71914,7 +72396,6 @@ in
       (sources."p-any-2.1.0" // {
         dependencies = [
           sources."p-cancelable-2.0.0"
-          sources."type-fest-0.3.1"
         ];
       })
       sources."p-cancelable-1.1.0"
@@ -72168,7 +72649,7 @@ in
           sources."retry-0.10.1"
         ];
       })
-      sources."prompts-2.3.2"
+      sources."prompts-2.4.0"
       sources."proxy-addr-2.0.6"
       sources."prr-1.0.1"
       sources."psl-1.8.0"
@@ -72255,7 +72736,7 @@ in
           sources."which-2.0.2"
         ];
       })
-      sources."react-error-overlay-6.0.7"
+      sources."react-error-overlay-6.0.8"
       sources."react-is-16.13.1"
       sources."react-refresh-0.4.3"
       sources."read-chunk-3.2.0"
@@ -72269,7 +72750,7 @@ in
       sources."readdir-scoped-modules-1.1.0"
       sources."readdirp-3.5.0"
       sources."recursive-readdir-2.2.2"
-      sources."regenerate-1.4.1"
+      sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.13.7"
       sources."regenerator-transform-0.14.5"
@@ -72346,7 +72827,7 @@ in
       sources."ripemd160-2.0.2"
       sources."router-ips-1.0.0"
       sources."run-async-2.4.1"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."run-queue-1.0.3"
       (sources."rxjs-5.5.12" // {
         dependencies = [
@@ -72410,7 +72891,7 @@ in
           sources."uuid-2.0.3"
         ];
       })
-      sources."slugify-1.4.5"
+      sources."slugify-1.4.6"
       sources."smart-buffer-4.1.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
@@ -72453,7 +72934,7 @@ in
           sources."faye-websocket-0.11.3"
         ];
       })
-      sources."socks-2.4.4"
+      sources."socks-2.5.0"
       sources."socks-proxy-agent-5.0.0"
       sources."source-list-map-2.0.1"
       sources."source-map-0.5.7"
@@ -72513,16 +72994,8 @@ in
           sources."is-fullwidth-code-point-3.0.0"
         ];
       })
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.2"
+      sources."string.prototype.trimstart-1.0.2"
       sources."string_decoder-1.1.1"
       (sources."stringify-object-3.3.0" // {
         dependencies = [
@@ -72579,12 +73052,23 @@ in
         ];
       })
       sources."temp-dir-1.0.0"
-      (sources."tempy-0.3.0" // {
+      (sources."tempy-0.7.1" // {
         dependencies = [
-          sources."type-fest-0.3.1"
+          sources."array-union-2.1.0"
+          sources."crypto-random-string-2.0.0"
+          sources."del-6.0.0"
+          sources."globby-11.0.1"
+          sources."is-path-inside-3.0.2"
+          sources."is-stream-2.0.0"
+          sources."p-map-4.0.0"
+          sources."rimraf-3.0.2"
+          sources."slash-3.0.0"
+          sources."temp-dir-2.0.0"
+          sources."type-fest-0.16.0"
+          sources."unique-string-2.0.0"
         ];
       })
-      sources."term-size-2.2.0"
+      sources."term-size-2.2.1"
       sources."terminal-link-2.1.1"
       (sources."terser-4.8.0" // {
         dependencies = [
@@ -72610,7 +73094,7 @@ in
       sources."through2-2.0.5"
       sources."thunky-1.1.0"
       sources."timed-out-4.0.1"
-      sources."timers-browserify-2.0.11"
+      sources."timers-browserify-2.0.12"
       sources."timm-1.7.1"
       sources."timsort-0.3.0"
       sources."tinycolor2-1.4.2"
@@ -72628,6 +73112,7 @@ in
       sources."toidentifier-1.0.0"
       sources."topo-2.0.2"
       sources."tough-cookie-2.5.0"
+      sources."traverse-0.6.6"
       sources."tree-kill-1.2.2"
       sources."ts-invariant-0.4.4"
       sources."ts-pnp-1.2.0"
@@ -72635,7 +73120,7 @@ in
       sources."tty-browserify-0.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."type-fest-0.12.0"
+      sources."type-fest-0.3.1"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."ultron-1.1.1"
@@ -72697,6 +73182,7 @@ in
       sources."utila-0.4.0"
       sources."utils-merge-1.0.1"
       sources."uuid-8.3.1"
+      sources."valid-url-1.0.9"
       sources."validate-npm-package-name-3.0.0"
       sources."validator-10.5.0"
       sources."vary-1.1.2"
@@ -72980,7 +73466,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."buffer-crc32-0.2.13"
       sources."buffer-from-1.1.1"
@@ -73147,6 +73633,573 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  fauna-shell = nodeEnv.buildNodePackage {
+    name = "fauna-shell";
+    packageName = "fauna-shell";
+    version = "0.11.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.11.5.tgz";
+      sha512 = "0/PujreRi2BsZoyvp5N48xaMWLow2GsNz7AY7bdW+0/DAj6F++7kQY7OotmiPlVX2idYL9QJswAcgy1ksRtF9A==";
+    };
+    dependencies = [
+      (sources."@heroku-cli/color-1.1.14" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."ansi-styles-3.2.1"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
+      sources."@mrmlnc/readdir-enhanced-2.2.1"
+      sources."@nodelib/fs.scandir-2.1.3"
+      sources."@nodelib/fs.stat-2.0.3"
+      sources."@nodelib/fs.walk-1.2.4"
+      (sources."@oclif/command-1.8.0" // {
+        dependencies = [
+          sources."@oclif/plugin-help-3.2.0"
+          sources."ansi-regex-3.0.0"
+          sources."ansi-styles-3.2.1"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."string-width-2.1.1"
+          sources."strip-ansi-4.0.0"
+          sources."wrap-ansi-4.0.0"
+        ];
+      })
+      (sources."@oclif/config-1.17.0" // {
+        dependencies = [
+          sources."globby-11.0.1"
+          sources."tslib-2.0.3"
+        ];
+      })
+      sources."@oclif/errors-1.3.3"
+      sources."@oclif/linewrap-1.0.0"
+      sources."@oclif/parser-3.8.5"
+      (sources."@oclif/plugin-autocomplete-0.1.5" // {
+        dependencies = [
+          sources."debug-3.2.6"
+          sources."fs-extra-6.0.1"
+          sources."jsonfile-4.0.0"
+          sources."universalify-0.1.2"
+        ];
+      })
+      (sources."@oclif/plugin-help-1.2.11" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."indent-string-3.2.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."string-width-2.1.1"
+          sources."strip-ansi-4.0.0"
+          sources."widest-line-2.0.1"
+          sources."wrap-ansi-3.0.1"
+        ];
+      })
+      sources."@oclif/screen-1.0.4"
+      sources."@sindresorhus/is-0.7.0"
+      sources."ajv-6.12.6"
+      sources."ansi-escapes-3.2.0"
+      sources."ansi-regex-5.0.0"
+      sources."ansi-styles-4.3.0"
+      sources."ansicolors-0.3.2"
+      sources."arr-diff-4.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
+      sources."array-union-2.1.0"
+      sources."array-uniq-1.0.3"
+      sources."array-unique-0.3.2"
+      sources."arrify-1.0.1"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."assign-symbols-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."at-least-node-1.0.0"
+      sources."atob-2.1.2"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.11.0"
+      sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      sources."base64-js-1.3.1"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."bluebird-3.7.2"
+      sources."brace-expansion-1.1.11"
+      sources."braces-3.0.2"
+      sources."btoa-lite-1.0.0"
+      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."cardinal-2.1.1"
+      sources."caseless-0.12.0"
+      (sources."chalk-2.4.2" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."escape-string-regexp-1.0.5"
+        ];
+      })
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (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."kind-of-5.1.0"
+        ];
+      })
+      sources."clean-stack-3.0.0"
+      sources."cli-table-0.3.1"
+      (sources."cli-ux-4.9.3" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."ansi-styles-3.2.1"
+          sources."clean-stack-2.2.0"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."fs-extra-7.0.1"
+          sources."indent-string-3.2.0"
+          sources."is-wsl-1.1.0"
+          sources."jsonfile-4.0.0"
+          sources."semver-5.7.1"
+          sources."strip-ansi-5.2.0"
+          sources."universalify-0.1.2"
+        ];
+      })
+      sources."clone-response-1.0.2"
+      sources."co-4.6.0"
+      sources."collection-visit-1.0.0"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
+      sources."colors-1.0.3"
+      sources."combined-stream-1.0.8"
+      sources."component-emitter-1.3.0"
+      sources."concat-map-0.0.1"
+      sources."copy-descriptor-0.1.1"
+      sources."core-util-is-1.0.2"
+      sources."cross-fetch-3.0.6"
+      (sources."cross-spawn-6.0.5" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
+      sources."dashdash-1.14.1"
+      sources."debug-4.3.0"
+      sources."decode-uri-component-0.2.0"
+      sources."decompress-response-3.3.0"
+      sources."deep-is-0.1.3"
+      sources."define-property-2.0.2"
+      sources."delayed-stream-1.0.0"
+      sources."dir-glob-3.0.1"
+      sources."dotenv-8.2.0"
+      sources."duplexer3-0.1.4"
+      sources."ecc-jsbn-0.1.2"
+      sources."emoji-regex-8.0.0"
+      sources."escape-string-regexp-4.0.0"
+      sources."escodegen-1.14.3"
+      sources."esprima-4.0.1"
+      sources."estraverse-4.3.0"
+      sources."esutils-2.0.3"
+      sources."execa-0.10.0"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (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."kind-of-5.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
+      sources."extend-3.0.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."extract-stack-1.0.0"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-3.1.3"
+      sources."fast-glob-3.2.4"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."fastq-1.9.0"
+      sources."faunadb-3.0.1"
+      sources."fill-range-7.0.1"
+      sources."fn-annotate-1.2.0"
+      sources."for-in-1.0.2"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."fragment-cache-0.2.1"
+      sources."from2-2.3.0"
+      sources."fs-extra-9.0.1"
+      sources."fs.realpath-1.0.0"
+      sources."get-stream-3.0.0"
+      sources."get-value-2.0.6"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.6"
+      sources."glob-parent-5.1.1"
+      sources."glob-to-regexp-0.3.0"
+      (sources."globby-8.0.2" // {
+        dependencies = [
+          sources."@nodelib/fs.stat-1.1.3"
+          sources."array-union-1.0.2"
+          (sources."braces-2.3.2" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          sources."dir-glob-2.0.0"
+          sources."fast-glob-2.2.7"
+          (sources."fill-range-4.0.0" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          sources."glob-parent-3.1.0"
+          sources."ignore-3.3.10"
+          sources."is-glob-3.1.0"
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."micromatch-3.1.10"
+          sources."path-type-3.0.0"
+          sources."slash-1.0.0"
+          sources."to-regex-range-2.1.1"
+        ];
+      })
+      sources."got-8.3.2"
+      sources."graceful-fs-4.2.4"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.5"
+      sources."has-flag-3.0.0"
+      sources."has-symbol-support-x-1.4.2"
+      sources."has-to-string-tag-x-1.4.1"
+      sources."has-value-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
+      (sources."heroku-cli-util-8.0.12" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."ansi-styles-3.2.1"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."heroku-client-3.1.0"
+      sources."http-cache-semantics-3.8.1"
+      sources."http-signature-1.2.0"
+      sources."hyperlinker-1.0.0"
+      sources."ignore-5.1.8"
+      sources."indent-string-4.0.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."ini-1.3.5"
+      sources."into-stream-3.1.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-docker-2.1.1"
+      sources."is-extendable-0.1.1"
+      sources."is-extglob-2.1.1"
+      sources."is-fullwidth-code-point-3.0.0"
+      sources."is-glob-4.0.1"
+      sources."is-number-7.0.0"
+      sources."is-object-1.0.1"
+      sources."is-plain-obj-1.1.0"
+      sources."is-plain-object-2.0.4"
+      sources."is-retry-allowed-1.2.0"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."is-windows-1.0.2"
+      sources."is-wsl-2.2.0"
+      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"
+      sources."json-buffer-3.0.0"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
+      sources."jsprim-1.4.1"
+      sources."keyv-3.0.0"
+      sources."kind-of-6.0.3"
+      sources."levn-0.3.0"
+      sources."lodash-4.17.20"
+      sources."lodash._reinterpolate-3.0.0"
+      sources."lodash.template-4.5.0"
+      sources."lodash.templatesettings-4.2.0"
+      sources."lowercase-keys-1.0.1"
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
+      sources."merge2-1.4.1"
+      sources."micromatch-4.0.2"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
+      sources."mimic-response-1.0.1"
+      sources."minimatch-3.0.4"
+      (sources."mixin-deep-1.3.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      sources."moment-2.29.1"
+      sources."ms-2.1.2"
+      sources."nanomatch-1.2.13"
+      (sources."netrc-parser-3.1.6" // {
+        dependencies = [
+          sources."debug-3.2.6"
+        ];
+      })
+      sources."nice-try-1.0.5"
+      sources."node-fetch-2.6.1"
+      sources."normalize-url-2.0.1"
+      sources."npm-run-path-2.0.2"
+      sources."oauth-sign-0.9.0"
+      sources."object-assign-4.1.1"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."object-visit-1.0.1"
+      sources."object.pick-1.3.0"
+      sources."once-1.4.0"
+      sources."opn-3.0.3"
+      sources."optionator-0.8.3"
+      sources."p-cancelable-0.4.1"
+      sources."p-finally-1.0.0"
+      sources."p-is-promise-1.1.0"
+      sources."p-timeout-2.0.1"
+      sources."pascalcase-0.1.1"
+      sources."password-prompt-1.1.2"
+      sources."path-dirname-1.0.2"
+      sources."path-is-absolute-1.0.1"
+      sources."path-key-2.0.1"
+      sources."path-type-4.0.0"
+      sources."performance-now-2.1.0"
+      sources."picomatch-2.2.2"
+      sources."pify-3.0.0"
+      sources."posix-character-classes-0.1.1"
+      sources."prelude-ls-1.1.2"
+      sources."prepend-http-2.0.0"
+      sources."process-nextick-args-2.0.1"
+      sources."psl-1.8.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.5.2"
+      sources."query-string-5.1.1"
+      sources."querystringify-2.2.0"
+      (sources."readable-stream-2.3.7" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."redeyed-2.1.1"
+      sources."regex-not-1.0.2"
+      sources."repeat-element-1.1.3"
+      sources."repeat-string-1.6.1"
+      sources."request-2.88.2"
+      sources."request-promise-4.2.6"
+      sources."request-promise-core-1.1.4"
+      sources."requires-port-1.0.0"
+      sources."resolve-url-0.2.1"
+      sources."responselike-1.0.2"
+      sources."ret-0.1.15"
+      sources."reusify-1.0.4"
+      sources."run-parallel-1.1.10"
+      sources."safe-buffer-5.2.1"
+      sources."safe-regex-1.1.0"
+      sources."safer-buffer-2.1.2"
+      sources."semver-7.3.2"
+      (sources."set-value-2.0.1" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.3"
+      sources."slash-3.0.0"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (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."kind-of-5.1.0"
+          sources."ms-2.0.0"
+          sources."source-map-0.5.7"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."sort-keys-2.0.0"
+      sources."source-map-0.6.1"
+      sources."source-map-resolve-0.5.3"
+      sources."source-map-url-0.4.0"
+      sources."split-string-3.1.0"
+      sources."sshpk-1.16.1"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (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."kind-of-5.1.0"
+        ];
+      })
+      sources."stealthy-require-1.1.1"
+      sources."strict-uri-encode-1.1.0"
+      sources."string-width-4.2.0"
+      (sources."string_decoder-1.1.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."strip-ansi-6.0.0"
+      sources."strip-eof-1.0.0"
+      sources."supports-color-5.5.0"
+      (sources."supports-hyperlinks-1.0.1" // {
+        dependencies = [
+          sources."has-flag-2.0.0"
+        ];
+      })
+      sources."timed-out-4.0.1"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-5.0.1"
+      sources."tough-cookie-2.5.0"
+      sources."treeify-1.1.0"
+      sources."tslib-1.14.1"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-check-0.3.2"
+      sources."union-value-1.0.1"
+      sources."universalify-1.0.0"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+        ];
+      })
+      sources."uri-js-4.4.0"
+      sources."urix-0.1.0"
+      sources."url-parse-1.4.7"
+      sources."url-parse-lax-3.0.0"
+      sources."url-to-options-1.0.1"
+      sources."use-3.1.1"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.4.0"
+      sources."verror-1.10.0"
+      sources."which-1.3.1"
+      sources."widest-line-3.1.0"
+      sources."word-wrap-1.2.3"
+      sources."wrap-ansi-7.0.0"
+      sources."wrappy-1.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "faunadb shell";
+      homepage = https://github.com/fauna/fauna-shell;
+      license = "MPL-2.0";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   fkill-cli = nodeEnv.buildNodePackage {
     name = "fkill-cli";
     packageName = "fkill-cli";
@@ -73198,7 +74251,7 @@ in
       sources."error-ex-1.3.2"
       sources."esc-exit-2.0.2"
       sources."escape-string-regexp-1.0.5"
-      sources."execa-4.0.3"
+      sources."execa-4.1.0"
       sources."external-editor-3.1.0"
       sources."figures-3.2.0"
       sources."find-up-4.1.0"
@@ -73221,7 +74274,7 @@ in
           sources."chalk-4.1.0"
         ];
       })
-      (sources."inquirer-autocomplete-prompt-1.2.0" // {
+      (sources."inquirer-autocomplete-prompt-1.3.0" // {
         dependencies = [
           sources."chalk-4.1.0"
         ];
@@ -73392,6 +74445,7 @@ in
         ];
       })
       sources."cache-base-1.0.1"
+      sources."call-bind-1.0.0"
       sources."caller-0.0.1"
       sources."camelcase-2.1.1"
       sources."chokidar-2.1.8"
@@ -73483,6 +74537,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.13"
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       sources."get-value-2.0.6"
       sources."glob-7.1.6"
       (sources."glob-parent-3.1.0" // {
@@ -73572,7 +74627,7 @@ in
       sources."object-is-1.1.3"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."optimist-0.6.0"
@@ -73678,16 +74733,8 @@ in
       })
       sources."stream-combiner-0.0.4"
       sources."string-width-1.0.2"
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.2"
+      sources."string.prototype.trimstart-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-0.1.3"
@@ -73882,7 +74929,7 @@ in
       sources."is-my-ip-valid-1.0.0"
       sources."is-my-json-valid-2.20.5"
       sources."is-property-1.0.2"
-      sources."is-valid-domain-0.0.16"
+      sources."is-valid-domain-0.0.17"
       sources."json-buffer-2.0.11"
       sources."jsonpointer-4.1.0"
       sources."kvgraph-0.1.0"
@@ -73971,7 +75018,7 @@ in
       sources."separator-escape-0.0.0"
       sources."sha.js-2.4.5"
       sources."smart-buffer-4.1.0"
-      sources."socks-2.4.4"
+      sources."socks-2.5.0"
       sources."sodium-browserify-1.3.0"
       (sources."sodium-browserify-tweetnacl-0.2.6" // {
         dependencies = [
@@ -74136,14 +75183,14 @@ in
       sources."error-ex-1.3.2"
       sources."escape-goat-2.1.1"
       sources."escape-string-regexp-1.0.5"
-      sources."execa-4.0.3"
+      sources."execa-4.1.0"
       sources."external-editor-3.1.0"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."figures-3.2.0"
       sources."find-up-3.0.0"
       sources."function-bind-1.1.1"
-      sources."fuse.js-6.4.1"
+      sources."fuse.js-6.4.3"
       sources."get-stream-5.2.0"
       sources."global-dirs-2.0.1"
       (sources."got-9.6.0" // {
@@ -74165,7 +75212,7 @@ in
       sources."indent-string-4.0.0"
       sources."ini-1.3.5"
       sources."inquirer-7.3.3"
-      sources."inquirer-autocomplete-prompt-1.2.0"
+      sources."inquirer-autocomplete-prompt-1.3.0"
       sources."is-arrayish-0.2.1"
       sources."is-ci-2.0.0"
       sources."is-core-module-2.0.0"
@@ -74248,7 +75295,7 @@ in
       sources."prepend-http-2.0.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
-      sources."pupa-2.0.1"
+      sources."pupa-2.1.1"
       sources."quick-lru-4.0.1"
       sources."rc-1.2.8"
       (sources."read-pkg-5.2.0" // {
@@ -74292,7 +75339,7 @@ in
       sources."strip-indent-3.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."term-size-2.2.0"
+      sources."term-size-2.2.1"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."to-readable-stream-1.0.0"
@@ -74352,16 +75399,49 @@ in
       sources."@exodus/schemasafe-1.0.0-rc.3"
       sources."@graphql-cli/common-4.1.0"
       sources."@graphql-cli/init-4.1.0"
-      sources."@graphql-tools/delegate-6.2.4"
-      sources."@graphql-tools/graphql-file-loader-6.2.4"
+      (sources."@graphql-tools/batch-execute-7.0.0" // {
+        dependencies = [
+          sources."@graphql-tools/utils-7.0.2"
+        ];
+      })
+      (sources."@graphql-tools/delegate-7.0.3" // {
+        dependencies = [
+          sources."@graphql-tools/utils-7.0.2"
+        ];
+      })
+      (sources."@graphql-tools/graphql-file-loader-6.2.5" // {
+        dependencies = [
+          sources."@graphql-tools/utils-7.0.2"
+        ];
+      })
       sources."@graphql-tools/import-6.2.4"
-      sources."@graphql-tools/json-file-loader-6.2.4"
+      (sources."@graphql-tools/json-file-loader-6.2.5" // {
+        dependencies = [
+          sources."@graphql-tools/utils-7.0.2"
+        ];
+      })
       sources."@graphql-tools/load-6.2.4"
-      sources."@graphql-tools/merge-6.2.4"
-      sources."@graphql-tools/schema-6.2.4"
-      sources."@graphql-tools/url-loader-6.3.0"
+      (sources."@graphql-tools/merge-6.2.5" // {
+        dependencies = [
+          sources."@graphql-tools/utils-7.0.2"
+        ];
+      })
+      (sources."@graphql-tools/schema-7.0.0" // {
+        dependencies = [
+          sources."@graphql-tools/utils-7.0.2"
+        ];
+      })
+      (sources."@graphql-tools/url-loader-6.3.2" // {
+        dependencies = [
+          sources."@graphql-tools/utils-7.0.2"
+        ];
+      })
       sources."@graphql-tools/utils-6.2.4"
-      sources."@graphql-tools/wrap-6.2.4"
+      (sources."@graphql-tools/wrap-7.0.1" // {
+        dependencies = [
+          sources."@graphql-tools/utils-7.0.2"
+        ];
+      })
       sources."@kwsites/file-exists-1.1.1"
       sources."@kwsites/promise-deferred-1.1.1"
       sources."@nodelib/fs.scandir-2.1.3"
@@ -74369,7 +75449,7 @@ in
       sources."@nodelib/fs.walk-1.2.4"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/parse-json-4.0.0"
       sources."@types/websocket-1.0.1"
       sources."aggregate-error-3.1.0"
@@ -74391,19 +75471,20 @@ in
       sources."at-least-node-1.0.0"
       sources."available-typed-arrays-1.0.2"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."bufferutil-4.0.1"
+      sources."bufferutil-4.0.2"
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
           sources."get-stream-5.2.0"
           sources."lowercase-keys-2.0.0"
         ];
       })
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."callsites-3.1.0"
       (sources."camel-case-4.1.1" // {
@@ -74497,7 +75578,7 @@ in
       sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-safe-stringify-2.0.7"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."figlet-1.5.0"
       sources."figures-3.2.0"
       sources."fill-range-7.0.1"
@@ -74513,6 +75594,7 @@ in
       sources."fullname-4.0.1"
       sources."function-bind-1.1.1"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.0.1"
       sources."get-stream-4.1.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
@@ -74542,7 +75624,7 @@ in
       sources."http2-client-1.3.3"
       sources."iconv-lite-0.4.24"
       sources."ignore-5.1.8"
-      (sources."import-fresh-3.2.1" // {
+      (sources."import-fresh-3.2.2" // {
         dependencies = [
           sources."resolve-from-4.0.0"
         ];
@@ -74605,7 +75687,11 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-6.0.1"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."jsonpath-plus-4.0.0"
       sources."jsprim-1.4.1"
       sources."keyv-3.1.0"
@@ -74659,7 +75745,7 @@ in
       sources."node-emoji-1.10.0"
       sources."node-fetch-2.6.1"
       sources."node-fetch-h2-2.3.0"
-      sources."node-gyp-build-3.7.0"
+      sources."node-gyp-build-4.2.3"
       sources."node-readfiles-0.2.0"
       sources."normalize-path-2.1.1"
       sources."normalize-url-4.5.0"
@@ -74677,7 +75763,7 @@ in
       sources."object-inspect-1.8.0"
       sources."object-is-1.1.3"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."open-7.3.0"
@@ -74752,7 +75838,7 @@ in
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
       sources."run-async-2.4.1"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       (sources."rxjs-6.6.3" // {
         dependencies = [
           sources."tslib-1.14.1"
@@ -74783,16 +75869,8 @@ in
           sources."strip-ansi-6.0.0"
         ];
       })
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.2"
+      sources."string.prototype.trimstart-1.0.2"
       sources."strip-ansi-5.2.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
@@ -74820,7 +75898,7 @@ in
       sources."unixify-1.0.0"
       sources."uri-js-4.4.0"
       sources."url-parse-lax-3.0.0"
-      sources."utf-8-validate-5.0.2"
+      sources."utf-8-validate-5.0.3"
       sources."uuid-3.4.0"
       sources."valid-url-1.0.9"
       sources."verror-1.10.0"
@@ -74858,7 +75936,7 @@ in
           sources."cliui-7.0.3"
           sources."strip-ansi-6.0.0"
           sources."wrap-ansi-7.0.0"
-          sources."y18n-5.0.4"
+          sources."y18n-5.0.5"
           sources."yargs-parser-20.2.3"
         ];
       })
@@ -75233,7 +76311,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."systeminformation-4.27.10"
+      sources."systeminformation-4.27.11"
       sources."term-canvas-0.0.5"
       sources."type-fest-0.11.0"
       sources."wordwrap-0.0.3"
@@ -75317,6 +76395,7 @@ in
       sources."buffer-equal-1.0.0"
       sources."buffer-from-1.1.1"
       sources."cache-base-1.0.1"
+      sources."call-bind-1.0.0"
       sources."camelcase-3.0.0"
       sources."chokidar-2.1.8"
       (sources."class-utils-0.3.6" // {
@@ -75369,8 +76448,6 @@ in
       sources."each-props-1.3.2"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.1"
-      sources."es-to-primitive-1.2.1"
       sources."es5-ext-0.10.53"
       sources."es6-iterator-2.0.3"
       sources."es6-symbol-3.1.3"
@@ -75432,6 +76509,7 @@ in
       sources."fsevents-1.2.13"
       sources."function-bind-1.1.1"
       sources."get-caller-file-1.0.3"
+      sources."get-intrinsic-1.0.1"
       sources."get-value-2.0.6"
       sources."glob-7.1.6"
       (sources."glob-parent-3.1.0" // {
@@ -75467,26 +76545,21 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
       sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
-      sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-glob-4.0.1"
       sources."is-negated-glob-1.0.0"
-      sources."is-negative-zero-2.0.0"
       (sources."is-number-3.0.0" // {
         dependencies = [
           sources."kind-of-3.2.2"
         ];
       })
       sources."is-plain-object-2.0.4"
-      sources."is-regex-1.1.1"
       sources."is-relative-1.0.0"
-      sources."is-symbol-1.0.3"
       sources."is-unc-path-1.0.0"
       sources."is-utf8-0.2.1"
       sources."is-valid-glob-1.0.0"
@@ -75541,10 +76614,9 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."object.defaults-1.1.0"
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
@@ -75660,16 +76732,6 @@ in
       sources."stream-exhaust-1.0.2"
       sources."stream-shift-1.0.1"
       sources."string-width-1.0.2"
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
@@ -75771,6 +76833,7 @@ in
       })
       sources."buffer-from-1.1.1"
       sources."cache-base-1.0.1"
+      sources."call-bind-1.0.0"
       sources."camelcase-3.0.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -75800,8 +76863,6 @@ in
       sources."detect-file-1.0.0"
       sources."each-props-1.3.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.1"
-      sources."es-to-primitive-1.2.1"
       sources."es5-ext-0.10.53"
       sources."es6-iterator-2.0.3"
       sources."es6-symbol-3.1.3"
@@ -75848,6 +76909,7 @@ in
       sources."fragment-cache-0.2.1"
       sources."function-bind-1.1.1"
       sources."get-caller-file-1.0.3"
+      sources."get-intrinsic-1.0.1"
       sources."get-value-2.0.6"
       sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
@@ -75876,14 +76938,12 @@ in
       })
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
       sources."is-core-module-2.0.0"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.3"
         ];
       })
-      sources."is-date-object-1.0.2"
       (sources."is-descriptor-1.0.2" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -75893,16 +76953,13 @@ in
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-glob-4.0.1"
-      sources."is-negative-zero-2.0.0"
       (sources."is-number-3.0.0" // {
         dependencies = [
           sources."kind-of-3.2.2"
         ];
       })
       sources."is-plain-object-2.0.4"
-      sources."is-regex-1.1.1"
       sources."is-relative-1.0.0"
-      sources."is-symbol-1.0.3"
       sources."is-unc-path-1.0.0"
       sources."is-utf8-0.2.1"
       sources."is-windows-1.0.2"
@@ -75959,10 +77016,9 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."object.defaults-1.1.0"
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
@@ -76048,16 +77104,6 @@ in
         ];
       })
       sources."string-width-1.0.2"
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
@@ -76142,7 +77188,7 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.6.1"
-      sources."uglify-js-3.11.3"
+      sources."uglify-js-3.11.5"
       sources."upper-case-1.1.3"
     ];
     buildInputs = globalBuildInputs;
@@ -76171,7 +77217,7 @@ in
       sources."async-3.2.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
@@ -76367,7 +77413,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."boolbase-1.0.0"
       sources."camelcase-1.2.1"
@@ -76656,44 +77702,65 @@ in
   insect = nodeEnv.buildNodePackage {
     name = "insect";
     packageName = "insect";
-    version = "5.5.0";
+    version = "5.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/insect/-/insect-5.5.0.tgz";
-      sha512 = "Oac190s8AGYOYDvAP7PLNFm3gA+dtSoHl5yYGf9sgvMB+I8bRPfSNI6q4kra1QubpN5+/ARfGjGjAFUu10QsIg==";
+      url = "https://registry.npmjs.org/insect/-/insect-5.6.0.tgz";
+      sha512 = "56gjTrj9SMfPkbGANfqtGYeY3G5KmCkpgEYlKkmiDNG+SpQtLT9/53gt/9CbYd5iT9GgP+IvGXwDWplgCz3NnA==";
     };
     dependencies = [
-      sources."@types/jquery-3.5.3"
+      sources."@types/jquery-3.5.4"
       sources."@types/sizzle-2.3.2"
+      sources."arch-2.2.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."clipboard-2.0.6"
+      sources."clipboardy-2.3.0"
       sources."clone-1.0.4"
       sources."concat-map-0.0.1"
+      sources."cross-spawn-6.0.5"
       sources."decimal.js-7.5.1"
       sources."defaults-1.0.3"
       sources."delegate-3.2.0"
+      sources."end-of-stream-1.4.4"
+      sources."execa-1.0.0"
       sources."fs-extra-0.24.0"
       sources."fs.realpath-1.0.0"
+      sources."get-stream-4.1.0"
       sources."glob-7.1.6"
       sources."good-listener-1.2.2"
       sources."graceful-fs-4.2.4"
       sources."historic-readline-1.0.8"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
+      sources."is-docker-2.1.1"
+      sources."is-stream-1.1.0"
+      sources."is-wsl-2.2.0"
+      sources."isexe-2.0.0"
       sources."jquery-3.5.1"
-      sources."jquery.terminal-2.18.3"
+      sources."jquery.terminal-2.19.2"
       sources."jsonfile-2.4.0"
       sources."keyboardevent-key-polyfill-1.1.0"
       sources."line-reader-0.4.0"
       sources."minimatch-3.0.4"
+      sources."nice-try-1.0.5"
+      sources."npm-run-path-2.0.2"
       sources."once-1.4.0"
       sources."os-homedir-1.0.2"
+      sources."p-finally-1.0.0"
       sources."path-is-absolute-1.0.1"
+      sources."path-key-2.0.1"
       sources."prismjs-1.22.0"
+      sources."pump-3.0.0"
       sources."rimraf-2.7.1"
       sources."select-1.1.2"
+      sources."semver-5.7.1"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.3"
+      sources."strip-eof-1.0.0"
       sources."tiny-emitter-2.1.0"
       sources."wcwidth-1.0.1"
+      sources."which-1.3.1"
       sources."wrappy-1.0.2"
       sources."xdg-basedir-2.0.0"
     ];
@@ -76728,7 +77795,7 @@ in
       sources."@ionic/utils-subprocess-1.0.13"
       sources."@ionic/utils-terminal-1.1.2"
       sources."@tootallnate/once-1.1.2"
-      sources."agent-base-6.0.1"
+      sources."agent-base-6.0.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
@@ -76931,7 +77998,7 @@ in
         ];
       })
       sources."smart-buffer-4.1.0"
-      sources."socks-2.4.4"
+      sources."socks-2.5.0"
       sources."socks-proxy-agent-5.0.0"
       sources."source-map-0.6.1"
       sources."split2-3.2.2"
@@ -77029,7 +78096,7 @@ in
       sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bindings-1.5.0"
@@ -77150,7 +78217,11 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-6.0.1"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."jsonparse-1.3.1"
       sources."jsprim-1.4.1"
       sources."lcid-1.0.0"
@@ -77171,12 +78242,11 @@ in
         ];
       })
       sources."minizlib-1.3.3"
-      sources."mkdirp-1.0.4"
+      sources."mkdirp-0.5.5"
       sources."ms-2.0.0"
       sources."nan-2.14.2"
       (sources."node-gyp-4.0.0" // {
         dependencies = [
-          sources."mkdirp-0.5.5"
           sources."semver-5.3.0"
           sources."which-1.3.1"
         ];
@@ -77286,6 +78356,7 @@ in
       sources."strip-bom-stream-4.0.0"
       (sources."stylus-0.54.8" // {
         dependencies = [
+          sources."mkdirp-1.0.4"
           sources."semver-6.3.0"
           sources."source-map-0.7.3"
         ];
@@ -77293,11 +78364,10 @@ in
       sources."supports-color-5.5.0"
       (sources."tar-4.4.13" // {
         dependencies = [
-          sources."mkdirp-0.5.5"
           sources."yallist-3.1.1"
         ];
       })
-      sources."temp-0.9.1"
+      sources."temp-0.9.2"
       sources."through-2.3.8"
       sources."topsort-0.0.2"
       sources."tough-cookie-2.5.0"
@@ -77319,7 +78389,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."validate-npm-package-license-3.0.4"
-      (sources."verda-1.1.1" // {
+      (sources."verda-1.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
@@ -77487,10 +78557,10 @@ in
   joplin = nodeEnv.buildNodePackage {
     name = "joplin";
     packageName = "joplin";
-    version = "1.2.3";
+    version = "1.3.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/joplin/-/joplin-1.2.3.tgz";
-      sha512 = "oXopPtdqjEGhjeDjhULGbgZ47+auGaZIhWwgKSnYmrw47scWgXIlNztwFaH4xyTRsm+mCJ/WwPTruloNfTMQhw==";
+      url = "https://registry.npmjs.org/joplin/-/joplin-1.3.3.tgz";
+      sha512 = "6QhCBf0amMaVX6u90Uy84hEdHLPthTrQIbgUBFccFpBC1bowdj85C3tSYEfrSCf72OtjwwT26OaHuRJgzCmb8A==";
     };
     dependencies = [
       sources."@cronvel/get-pixels-3.4.0"
@@ -77539,7 +78609,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.774.0" // {
+      (sources."aws-sdk-2.784.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -77547,7 +78617,7 @@ in
         ];
       })
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -77560,7 +78630,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       (sources."bl-4.0.3" // {
         dependencies = [
-          sources."buffer-5.6.0"
+          sources."buffer-5.7.0"
         ];
       })
       sources."brace-expansion-1.1.11"
@@ -77571,6 +78641,7 @@ in
       })
       sources."browser-process-hrtime-1.0.0"
       sources."buffer-4.9.2"
+      sources."builtin-modules-3.1.0"
       sources."cache-base-1.0.1"
       sources."camel-case-3.0.0"
       sources."camelcase-4.1.0"
@@ -77798,6 +78869,7 @@ in
         ];
       })
       sources."image-type-3.1.0"
+      sources."immer-7.0.14"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
@@ -77861,7 +78933,7 @@ in
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
       sources."jmespath-0.15.0"
-      sources."joplin-turndown-4.0.29"
+      sources."joplin-turndown-4.0.30"
       sources."joplin-turndown-plugin-gfm-1.0.12"
       sources."jpeg-js-0.4.2"
       sources."js-tokens-4.0.0"
@@ -77929,7 +79001,6 @@ in
       sources."md5-2.3.0"
       sources."md5-file-4.0.0"
       sources."mdurl-1.0.1"
-      sources."memory-cache-0.2.0"
       sources."micromatch-3.1.10"
       sources."mime-2.4.6"
       sources."mime-db-1.44.0"
@@ -77950,6 +79021,7 @@ in
       sources."ms-2.0.0"
       sources."multiparty-4.2.2"
       sources."nan-2.14.1"
+      sources."nanoid-3.1.16"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."is-windows-1.0.2"
@@ -77964,7 +79036,7 @@ in
           sources."ms-2.1.2"
         ];
       })
-      sources."nextgen-events-1.3.0"
+      sources."nextgen-events-1.3.3"
       sources."nice-try-1.0.5"
       sources."no-case-2.3.2"
       sources."node-abi-2.19.1"
@@ -78046,6 +79118,7 @@ in
       sources."querystringify-2.2.0"
       sources."random-bytes-1.0.0"
       sources."rc-1.2.8"
+      sources."re-reselect-4.0.0"
       sources."read-chunk-2.1.0"
       sources."readable-stream-3.6.0"
       sources."reduce-flatten-1.0.1"
@@ -78074,6 +79147,7 @@ in
         ];
       })
       sources."requires-port-1.0.0"
+      sources."reselect-4.0.0"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
       sources."retry-0.10.1"
@@ -78093,7 +79167,7 @@ in
       })
       sources."setimmediate-1.0.5"
       sources."setprototypeof-1.2.0"
-      sources."seventh-0.7.35"
+      sources."seventh-0.7.36"
       (sources."sharp-0.23.4" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -78112,7 +79186,6 @@ in
           sources."is-fullwidth-code-point-2.0.0"
         ];
       })
-      sources."slug-3.5.1"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -78260,6 +79333,7 @@ in
       sources."union-value-1.0.1"
       sources."uniq-1.0.1"
       sources."universalify-0.1.2"
+      sources."unorm-1.6.0"
       sources."unpack-string-0.0.2"
       (sources."unset-value-1.0.0" // {
         dependencies = [
@@ -78281,6 +79355,7 @@ in
       sources."url-0.10.3"
       sources."url-parse-1.4.7"
       sources."use-3.1.1"
+      sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."valid-url-1.0.9"
@@ -78401,7 +79476,7 @@ in
       sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ==";
     };
     dependencies = [
-      sources."@babel/parser-7.12.3"
+      sources."@babel/parser-7.12.5"
       sources."argparse-1.0.10"
       sources."bluebird-3.7.2"
       sources."catharsis-0.8.11"
@@ -78746,7 +79821,7 @@ in
       sources."prepend-http-2.0.0"
       sources."proxy-addr-2.0.6"
       sources."pump-3.0.0"
-      sources."pupa-2.0.1"
+      sources."pupa-2.1.1"
       sources."qs-6.7.0"
       sources."range-parser-1.2.1"
       sources."raw-body-2.4.0"
@@ -78784,7 +79859,7 @@ in
       sources."strip-ansi-5.2.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."term-size-2.2.0"
+      sources."term-size-2.2.1"
       sources."to-readable-stream-1.0.0"
       sources."toidentifier-1.0.0"
       sources."type-fest-0.8.1"
@@ -79068,6 +80143,7 @@ in
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."buffer-equal-1.0.0"
+      sources."call-bind-1.0.0"
       sources."clone-2.1.2"
       sources."clone-buffer-1.0.0"
       sources."clone-stats-1.0.0"
@@ -79078,13 +80154,12 @@ in
       sources."define-properties-1.1.3"
       sources."duplexify-3.7.1"
       sources."end-of-stream-1.4.4"
-      sources."es-abstract-1.18.0-next.1"
-      sources."es-to-primitive-1.2.1"
       sources."extend-3.0.2"
       sources."flush-write-stream-1.1.1"
       sources."fs-mkdirp-stream-1.0.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       sources."glob-7.1.6"
       sources."glob-parent-3.1.0"
       sources."glob-stream-6.1.0"
@@ -79095,15 +80170,10 @@ in
       sources."inherits-2.0.4"
       sources."is-absolute-1.0.0"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
-      sources."is-date-object-1.0.2"
       sources."is-extglob-2.1.1"
       sources."is-glob-3.1.0"
       sources."is-negated-glob-1.0.0"
-      sources."is-negative-zero-2.0.0"
-      sources."is-regex-1.1.1"
       sources."is-relative-1.0.0"
-      sources."is-symbol-1.0.3"
       sources."is-unc-path-1.0.0"
       sources."is-utf8-0.2.1"
       sources."is-valid-glob-1.0.0"
@@ -79115,9 +80185,8 @@ in
       sources."minimatch-3.0.4"
       sources."normalize-path-2.1.1"
       sources."now-and-later-2.0.1"
-      sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."ordered-read-streams-1.0.1"
       sources."path-dirname-1.0.2"
@@ -79133,16 +80202,6 @@ in
       sources."resolve-options-1.1.0"
       sources."safe-buffer-5.1.2"
       sources."stream-shift-1.0.1"
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
       sources."string_decoder-1.1.1"
       sources."through2-2.0.5"
       sources."through2-filter-3.0.0"
@@ -79188,7 +80247,7 @@ in
       sources."async-1.5.2"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."boolbase-1.0.0"
@@ -79531,8 +80590,8 @@ in
       sources."@lerna/write-log-file-3.13.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
-      sources."@octokit/auth-token-2.4.2"
-      (sources."@octokit/endpoint-6.0.8" // {
+      sources."@octokit/auth-token-2.4.3"
+      (sources."@octokit/endpoint-6.0.9" // {
         dependencies = [
           sources."is-plain-object-5.0.0"
           sources."universal-user-agent-6.0.0"
@@ -79544,15 +80603,15 @@ in
           sources."@octokit/types-2.16.2"
         ];
       })
-      sources."@octokit/plugin-request-log-1.0.0"
+      sources."@octokit/plugin-request-log-1.0.2"
       (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // {
         dependencies = [
           sources."@octokit/types-2.16.2"
         ];
       })
-      (sources."@octokit/request-5.4.9" // {
+      (sources."@octokit/request-5.4.10" // {
         dependencies = [
-          sources."@octokit/request-error-2.0.2"
+          sources."@octokit/request-error-2.0.3"
           sources."is-plain-object-5.0.0"
           sources."universal-user-agent-6.0.0"
         ];
@@ -79567,7 +80626,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.0"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/normalize-package-data-2.4.0"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
@@ -79600,7 +80659,7 @@ in
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -79623,6 +80682,7 @@ in
       sources."byte-size-5.0.1"
       sources."cacache-12.0.4"
       sources."cache-base-1.0.1"
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
@@ -79845,6 +80905,7 @@ in
       })
       sources."genfun-5.0.0"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.0.1"
       (sources."get-pkg-repo-1.4.0" // {
         dependencies = [
           sources."camelcase-2.1.1"
@@ -79905,7 +80966,7 @@ in
         ];
       })
       sources."git-up-4.0.2"
-      sources."git-url-parse-11.3.0"
+      sources."git-url-parse-11.4.0"
       sources."gitconfiglocal-1.0.0"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
@@ -80139,11 +81200,7 @@ in
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      (sources."object.assign-4.1.1" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."object.assign-4.1.2"
       sources."object.getownpropertydescriptors-2.1.0"
       sources."object.pick-1.3.0"
       sources."octokit-pagination-methods-1.1.0"
@@ -80338,8 +81395,16 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
+      (sources."string.prototype.trimend-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
+      (sources."string.prototype.trimstart-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -80376,7 +81441,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.11.3"
+      sources."uglify-js-3.11.5"
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
       sources."union-value-1.0.1"
@@ -80469,7 +81534,7 @@ in
       sources."image-size-0.5.5"
       sources."make-dir-2.1.0"
       sources."mime-1.6.0"
-      sources."native-request-1.0.7"
+      sources."native-request-1.0.8"
       sources."pify-4.0.1"
       sources."prr-1.0.1"
       sources."semver-5.7.1"
@@ -80869,7 +81934,7 @@ in
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."backo2-1.0.2"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -81361,12 +82426,12 @@ in
     src = ../interpreters/clojurescript/lumo;
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/compat-data-7.12.1"
+      sources."@babel/compat-data-7.12.5"
       sources."@babel/core-7.12.3"
-      sources."@babel/generator-7.12.1"
+      sources."@babel/generator-7.12.5"
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
-      sources."@babel/helper-compilation-targets-7.12.1"
+      sources."@babel/helper-compilation-targets-7.12.5"
       sources."@babel/helper-create-class-features-plugin-7.12.1"
       sources."@babel/helper-create-regexp-features-plugin-7.12.1"
       sources."@babel/helper-define-map-7.10.5"
@@ -81375,26 +82440,26 @@ in
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-hoist-variables-7.10.4"
       sources."@babel/helper-member-expression-to-functions-7.12.1"
-      sources."@babel/helper-module-imports-7.12.1"
+      sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
       sources."@babel/helper-optimise-call-expression-7.10.4"
       sources."@babel/helper-plugin-utils-7.10.4"
       sources."@babel/helper-regex-7.10.5"
       sources."@babel/helper-remap-async-to-generator-7.12.1"
-      sources."@babel/helper-replace-supers-7.12.1"
+      sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
       sources."@babel/helper-split-export-declaration-7.11.0"
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/helper-validator-option-7.12.1"
       sources."@babel/helper-wrap-function-7.12.3"
-      sources."@babel/helpers-7.12.1"
+      sources."@babel/helpers-7.12.5"
       (sources."@babel/highlight-7.10.4" // {
         dependencies = [
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.12.3"
+      sources."@babel/parser-7.12.5"
       sources."@babel/plugin-external-helpers-7.8.3"
       sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
@@ -81403,7 +82468,7 @@ in
       sources."@babel/plugin-proposal-json-strings-7.12.1"
       sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-      sources."@babel/plugin-proposal-numeric-separator-7.12.1"
+      sources."@babel/plugin-proposal-numeric-separator-7.12.5"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
       sources."@babel/plugin-proposal-optional-chaining-7.12.1"
@@ -81459,10 +82524,10 @@ in
       sources."@babel/preset-env-7.12.1"
       sources."@babel/preset-modules-0.1.4"
       sources."@babel/preset-stage-2-7.8.3"
-      sources."@babel/runtime-7.12.1"
+      sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.1"
-      sources."@babel/types-7.12.1"
+      sources."@babel/traverse-7.12.5"
+      sources."@babel/types-7.12.5"
       sources."@cnakazawa/watch-1.0.4"
       sources."@comandeer/babel-plugin-banner-5.0.0"
       sources."@istanbuljs/load-nyc-config-1.1.0"
@@ -81473,17 +82538,17 @@ in
         ];
       })
       sources."@jest/types-25.5.0"
-      sources."@types/babel__core-7.1.10"
+      sources."@types/babel__core-7.1.12"
       sources."@types/babel__generator-7.6.2"
       sources."@types/babel__template-7.0.3"
       sources."@types/babel__traverse-7.0.15"
       sources."@types/estree-0.0.45"
-      sources."@types/graceful-fs-4.1.3"
+      sources."@types/graceful-fs-4.1.4"
       sources."@types/istanbul-lib-coverage-2.0.3"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-0.0.8"
       sources."@types/yargs-15.0.9"
@@ -81546,7 +82611,7 @@ in
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."babel-core-7.0.0-bridge.0"
       sources."babel-eslint-10.0.3"
       sources."babel-helper-evaluate-path-0.5.0"
@@ -81610,7 +82675,7 @@ in
       sources."bindings-1.5.0"
       (sources."bl-4.0.3" // {
         dependencies = [
-          sources."buffer-5.6.0"
+          sources."buffer-5.7.0"
           sources."readable-stream-3.6.0"
         ];
       })
@@ -81645,7 +82710,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.14.5"
+      sources."browserslist-4.14.6"
       sources."bser-2.1.1"
       sources."buffer-5.2.1"
       sources."buffer-from-1.1.1"
@@ -81659,8 +82724,9 @@ in
       })
       sources."cache-base-1.0.1"
       sources."cached-path-relative-1.0.2"
+      sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001148"
+      sources."caniuse-lite-1.0.30001154"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       (sources."chalk-3.0.0" // {
@@ -81676,6 +82742,7 @@ in
         dependencies = [
           sources."braces-3.0.2"
           sources."fill-range-7.0.1"
+          sources."fsevents-2.1.3"
           sources."is-number-7.0.0"
           sources."to-regex-range-5.0.1"
         ];
@@ -81782,7 +82849,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.582"
+      sources."electron-to-chromium-1.3.586"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -81798,8 +82865,6 @@ in
       })
       sources."errno-0.1.7"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.1"
-      sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
       sources."eslint-scope-4.0.3"
@@ -81883,11 +82948,12 @@ in
       sources."fs-constants-1.0.0"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.2.0"
       sources."function-bind-1.1.1"
-      sources."gensync-1.0.0-beta.1"
+      sources."gensync-1.0.0-beta.2"
       sources."get-assigned-identifiers-1.2.0"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.0.1"
       sources."get-package-type-0.1.0"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
@@ -81938,7 +83004,7 @@ in
       sources."htmlescape-1.1.1"
       sources."http-signature-1.2.0"
       sources."https-browserify-1.0.0"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."iferr-0.1.5"
       sources."import-local-2.0.0"
       sources."imurmurhash-0.1.4"
@@ -81953,11 +83019,9 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-2.1.0"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.2"
       sources."is-ci-2.0.0"
       sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
-      sources."is-date-object-1.0.2"
       sources."is-deflate-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
@@ -81966,7 +83030,6 @@ in
       sources."is-glob-4.0.1"
       sources."is-gzip-1.0.0"
       sources."is-module-1.0.0"
-      sources."is-negative-zero-2.0.0"
       (sources."is-number-3.0.0" // {
         dependencies = [
           sources."kind-of-3.2.2"
@@ -81974,9 +83037,7 @@ in
       })
       sources."is-plain-object-2.0.4"
       sources."is-reference-1.2.1"
-      sources."is-regex-1.1.1"
       sources."is-stream-1.1.0"
-      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
@@ -82088,13 +83149,13 @@ in
           sources."inherits-2.0.3"
           sources."punycode-1.4.1"
           sources."stream-http-2.8.3"
-          sources."timers-browserify-2.0.11"
+          sources."timers-browserify-2.0.12"
           sources."tty-browserify-0.0.0"
           sources."util-0.11.1"
         ];
       })
       sources."node-modules-regexp-1.0.0"
-      sources."node-releases-1.1.64"
+      sources."node-releases-1.1.65"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-2.0.2"
@@ -82113,10 +83174,9 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."os-browserify-0.3.0"
@@ -82190,7 +83250,7 @@ in
       })
       sources."readdirp-3.5.0"
       sources."realpath-native-2.0.0"
-      sources."regenerate-1.4.1"
+      sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.13.7"
       sources."regenerator-transform-0.14.5"
@@ -82340,16 +83400,6 @@ in
       sources."stream-shift-1.0.1"
       sources."stream-splicer-2.0.1"
       sources."string-width-3.1.0"
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
       (sources."string_decoder-1.3.0" // {
         dependencies = [
           sources."safe-buffer-5.2.1"
@@ -82434,7 +83484,7 @@ in
       })
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
-      sources."v8-compile-cache-2.1.1"
+      sources."v8-compile-cache-2.2.0"
       sources."validate-npm-package-license-3.0.4"
       sources."verror-1.10.0"
       sources."vinyl-2.2.1"
@@ -82566,14 +83616,14 @@ in
       sources."async-3.2.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."caseless-0.12.0"
       sources."chalk-4.1.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."combined-stream-1.0.8"
-      sources."commander-6.1.0"
+      sources."commander-6.2.0"
       sources."core-util-is-1.0.2"
       sources."dashdash-1.14.1"
       sources."delayed-stream-1.0.0"
@@ -82602,7 +83652,7 @@ in
       sources."link-check-4.5.2"
       sources."lodash-4.17.20"
       sources."markdown-link-extractor-1.2.6"
-      sources."marked-1.2.0"
+      sources."marked-1.2.2"
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
       sources."ms-2.1.2"
@@ -82663,7 +83713,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."babel-code-frame-6.26.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
@@ -82992,7 +84042,7 @@ in
       sha512 = "X9I7gwvqKVdqVvqi9AVfUWXnHQQYjssWJ2asKfhBDAkQn0vPagKkx6EjzKcRgyIroWGXN6ZpwkQ/gMvTPFlx7g==";
     };
     dependencies = [
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/yauzl-2.9.1"
       sources."agent-base-5.1.1"
       sources."ansi-styles-4.3.0"
@@ -83000,16 +84050,16 @@ in
       sources."base64-js-1.3.1"
       sources."bl-4.0.3"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.6.0"
+      sources."buffer-5.7.0"
       sources."buffer-crc32-0.2.13"
       sources."chalk-4.1.0"
       sources."chownr-1.1.4"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      sources."commander-6.1.0"
+      sources."commander-6.2.0"
       sources."concat-map-0.0.1"
       sources."debug-4.3.0"
-      sources."devtools-protocol-0.0.799653"
+      sources."devtools-protocol-0.0.809251"
       sources."end-of-stream-1.4.4"
       sources."extract-zip-2.0.1"
       sources."fd-slicer-1.1.0"
@@ -83020,13 +84070,14 @@ in
       sources."glob-7.1.6"
       sources."has-flag-4.0.0"
       sources."https-proxy-agent-4.0.0"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."locate-path-5.0.0"
       sources."minimatch-3.0.4"
       sources."mkdirp-classic-0.5.3"
       sources."ms-2.1.2"
+      sources."node-fetch-2.6.1"
       sources."once-1.4.0"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
@@ -83038,7 +84089,7 @@ in
       sources."progress-2.0.3"
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
-      sources."puppeteer-5.3.1"
+      sources."puppeteer-5.4.1"
       sources."readable-stream-3.6.0"
       sources."rimraf-3.0.2"
       sources."safe-buffer-5.2.1"
@@ -83075,20 +84126,20 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.147.1"
-      sources."@fluentui/react-focus-7.16.13"
-      sources."@fluentui/react-window-provider-0.3.3"
-      sources."@fluentui/theme-1.5.1"
-      sources."@microsoft/load-themed-styles-1.10.114"
+      sources."@fluentui/react-7.149.3"
+      sources."@fluentui/react-focus-7.16.16"
+      sources."@fluentui/react-window-provider-1.0.1"
+      sources."@fluentui/theme-1.5.4"
+      sources."@microsoft/load-themed-styles-1.10.125"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@uifabric/foundation-7.9.14"
-      sources."@uifabric/icons-7.5.12"
+      sources."@uifabric/foundation-7.9.18"
+      sources."@uifabric/icons-7.5.15"
       sources."@uifabric/merge-styles-7.19.1"
-      sources."@uifabric/react-hooks-7.13.6"
+      sources."@uifabric/react-hooks-7.13.9"
       sources."@uifabric/set-version-7.0.23"
-      sources."@uifabric/styling-7.16.13"
-      sources."@uifabric/utilities-7.32.4"
+      sources."@uifabric/styling-7.16.16"
+      sources."@uifabric/utilities-7.33.2"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
       sources."ansi-escapes-1.4.0"
@@ -83108,7 +84159,7 @@ in
       sources."basic-auth-2.0.1"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.6.0"
+      sources."buffer-5.7.0"
       sources."buffer-from-1.1.1"
       sources."builtin-status-codes-3.0.0"
       sources."bytes-3.1.0"
@@ -83172,7 +84223,7 @@ in
       sources."http-cache-semantics-4.1.0"
       sources."http-errors-1.7.2"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
@@ -83214,7 +84265,7 @@ in
       sources."node-fetch-1.6.3"
       sources."normalize-url-4.5.0"
       sources."object-assign-4.1.1"
-      sources."office-ui-fabric-react-7.147.1"
+      sources."office-ui-fabric-react-7.149.3"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -83313,7 +84364,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
       sources."swagger-schema-official-2.0.0-bab6bed"
-      sources."swagger-ui-dist-3.35.2"
+      sources."swagger-ui-dist-3.36.1"
       sources."tail-2.0.4"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
@@ -83344,10 +84395,10 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "8.2.0";
+    version = "8.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-8.2.0.tgz";
-      sha512 = "lEWEMq2LMfNJMKeuEwb5UELi+OgFDollXaytR5ggQcHpzG3NP/R7rvixAvF+9/lLsTWhWG+4yD2M70GsM06nxw==";
+      url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz";
+      sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==";
     };
     dependencies = [
       sources."@ungap/promise-all-settled-1.1.2"
@@ -83458,7 +84509,7 @@ in
       sources."yargs-parser-13.1.2"
       (sources."yargs-unparser-2.0.0" // {
         dependencies = [
-          sources."camelcase-6.1.0"
+          sources."camelcase-6.2.0"
           sources."decamelize-4.0.0"
         ];
       })
@@ -83600,23 +84651,23 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "2.65.6";
+    version = "2.67.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.65.6.tgz";
-      sha512 = "0e3B0qQV2JRQ7fzkyaQ8XiszK0r6DyWTuZ+7r2OdUo0pPfQ/qZowfSjt/8WcKUZjX97ITPCxtKYTBVb7GJvgZA==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.67.2.tgz";
+      sha512 = "tCb/TqAtxrtRTzBayfRmg7Gd809ymXfg6vVrBAAXqi93ijobB6qjopIQYlq5Tgq50m5rI/EgxvLU3BCUSEq/eQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/compat-data-7.12.1"
+      sources."@babel/compat-data-7.12.5"
       (sources."@babel/core-7.12.3" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
       })
-      sources."@babel/generator-7.12.1"
+      sources."@babel/generator-7.12.5"
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
-      (sources."@babel/helper-compilation-targets-7.12.1" // {
+      (sources."@babel/helper-compilation-targets-7.12.5" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
@@ -83629,22 +84680,22 @@ in
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-hoist-variables-7.10.4"
       sources."@babel/helper-member-expression-to-functions-7.12.1"
-      sources."@babel/helper-module-imports-7.12.1"
+      sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
       sources."@babel/helper-optimise-call-expression-7.10.4"
       sources."@babel/helper-plugin-utils-7.10.4"
       sources."@babel/helper-regex-7.10.5"
       sources."@babel/helper-remap-async-to-generator-7.12.1"
-      sources."@babel/helper-replace-supers-7.12.1"
+      sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
       sources."@babel/helper-split-export-declaration-7.11.0"
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/helper-validator-option-7.12.1"
       sources."@babel/helper-wrap-function-7.12.3"
-      sources."@babel/helpers-7.12.1"
+      sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.3"
+      sources."@babel/parser-7.12.5"
       sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
       sources."@babel/plugin-proposal-dynamic-import-7.12.1"
@@ -83652,7 +84703,7 @@ in
       sources."@babel/plugin-proposal-json-strings-7.12.1"
       sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-      sources."@babel/plugin-proposal-numeric-separator-7.12.1"
+      sources."@babel/plugin-proposal-numeric-separator-7.12.5"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
       sources."@babel/plugin-proposal-optional-chaining-7.12.1"
@@ -83708,33 +84759,33 @@ in
         ];
       })
       sources."@babel/preset-modules-0.1.4"
-      sources."@babel/runtime-7.12.1"
+      sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.1"
-      sources."@babel/types-7.12.1"
-      sources."@bugsnag/browser-7.4.0"
+      sources."@babel/traverse-7.12.5"
+      sources."@babel/types-7.12.5"
+      sources."@bugsnag/browser-7.5.1"
       sources."@bugsnag/core-7.3.5"
       sources."@bugsnag/cuid-3.0.0"
-      sources."@bugsnag/js-7.4.0"
+      sources."@bugsnag/js-7.5.1"
       sources."@bugsnag/node-7.3.5"
       sources."@bugsnag/safe-json-stringify-6.0.0"
       sources."@dabh/diagnostics-2.0.2"
       sources."@jest/types-24.9.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      (sources."@netlify/build-5.0.2" // {
+      (sources."@netlify/build-5.2.1" // {
         dependencies = [
           sources."chalk-3.0.0"
-          sources."resolve-2.0.0-next.1"
+          sources."resolve-2.0.0-next.2"
         ];
       })
-      sources."@netlify/cache-utils-1.0.4"
-      (sources."@netlify/config-2.3.4" // {
+      sources."@netlify/cache-utils-1.0.6"
+      (sources."@netlify/config-2.3.6" // {
         dependencies = [
           sources."chalk-3.0.0"
         ];
       })
-      sources."@netlify/functions-utils-1.2.10"
-      (sources."@netlify/git-utils-1.0.4" // {
+      sources."@netlify/functions-utils-1.3.2"
+      (sources."@netlify/git-utils-1.0.6" // {
         dependencies = [
           sources."braces-3.0.2"
           sources."fill-range-7.0.1"
@@ -83744,11 +84795,15 @@ in
         ];
       })
       sources."@netlify/open-api-0.18.1"
-      sources."@netlify/plugin-edge-handlers-1.8.0"
-      sources."@netlify/run-utils-1.0.3"
-      (sources."@netlify/zip-it-and-ship-it-1.3.12" // {
+      sources."@netlify/plugin-edge-handlers-1.9.0"
+      sources."@netlify/run-utils-1.0.5"
+      sources."@netlify/traffic-mesh-agent-0.24.0-pre.23"
+      sources."@netlify/traffic-mesh-agent-darwin-x64-0.24.0-pre.23"
+      sources."@netlify/traffic-mesh-agent-linux-x64-0.24.0-pre.23"
+      sources."@netlify/traffic-mesh-agent-win32-x64-0.24.0-pre.23"
+      (sources."@netlify/zip-it-and-ship-it-1.4.0" // {
         dependencies = [
-          sources."resolve-2.0.0-next.1"
+          sources."resolve-2.0.0-next.2"
         ];
       })
       (sources."@nodelib/fs.scandir-2.1.3" // {
@@ -83856,8 +84911,8 @@ in
         ];
       })
       sources."@oclif/screen-1.0.4"
-      sources."@octokit/auth-token-2.4.2"
-      (sources."@octokit/endpoint-6.0.8" // {
+      sources."@octokit/auth-token-2.4.3"
+      (sources."@octokit/endpoint-6.0.9" // {
         dependencies = [
           sources."is-plain-object-5.0.0"
           sources."universal-user-agent-6.0.0"
@@ -83868,15 +84923,15 @@ in
           sources."@octokit/types-2.16.2"
         ];
       })
-      sources."@octokit/plugin-request-log-1.0.0"
+      sources."@octokit/plugin-request-log-1.0.2"
       (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // {
         dependencies = [
           sources."@octokit/types-2.16.2"
         ];
       })
-      (sources."@octokit/request-5.4.9" // {
+      (sources."@octokit/request-5.4.10" // {
         dependencies = [
-          sources."@octokit/request-error-2.0.2"
+          sources."@octokit/request-error-2.0.3"
           sources."is-plain-object-5.0.0"
           sources."universal-user-agent-6.0.0"
         ];
@@ -83911,17 +84966,20 @@ in
       sources."@types/estree-0.0.39"
       sources."@types/glob-7.1.3"
       sources."@types/got-8.3.5"
+      sources."@types/hast-2.3.1"
       sources."@types/http-proxy-1.17.4"
       sources."@types/istanbul-lib-coverage-2.0.3"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/node-fetch-2.5.7"
       sources."@types/normalize-package-data-2.4.0"
+      sources."@types/parse5-5.0.3"
       sources."@types/resolve-1.17.1"
       sources."@types/semver-5.5.0"
+      sources."@types/unist-2.0.3"
       sources."@types/yargs-13.0.11"
       sources."@types/yargs-parser-15.0.0"
       sources."@typescript-eslint/typescript-estree-2.34.0"
@@ -83932,7 +84990,7 @@ in
         ];
       })
       sources."accepts-1.3.7"
-      sources."agent-base-6.0.1"
+      sources."agent-base-6.0.2"
       sources."aggregate-error-3.1.0"
       (sources."ansi-align-3.0.0" // {
         dependencies = [
@@ -83980,20 +85038,22 @@ in
         ];
       })
       sources."assign-symbols-1.0.0"
-      sources."ast-module-types-2.6.0"
+      sources."ast-module-types-2.7.1"
       sources."async-3.2.0"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
-      (sources."aws-sdk-2.774.0" // {
+      (sources."aws-sdk-2.784.0" // {
         dependencies = [
           sources."buffer-4.9.2"
+          sources."ieee754-1.1.13"
           sources."uuid-3.3.2"
         ];
       })
       sources."babel-plugin-dynamic-import-node-2.3.3"
       sources."backoff-2.5.0"
+      sources."bail-1.0.5"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -84043,9 +85103,9 @@ in
           sources."readable-stream-3.6.0"
         ];
       })
-      sources."browserslist-4.14.5"
+      sources."browserslist-4.14.6"
       sources."btoa-lite-1.0.0"
-      sources."buffer-5.6.0"
+      sources."buffer-5.7.0"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -84064,11 +85124,13 @@ in
         ];
       })
       sources."cachedir-2.3.0"
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001148"
+      sources."caniuse-lite-1.0.30001154"
       sources."cardinal-2.1.1"
       sources."caw-2.0.1"
+      sources."ccount-1.1.0"
       (sources."chalk-2.4.2" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
@@ -84077,6 +85139,8 @@ in
           sources."supports-color-5.5.0"
         ];
       })
+      sources."character-entities-html4-1.1.4"
+      sources."character-entities-legacy-1.1.4"
       sources."chardet-0.7.0"
       (sources."chokidar-3.4.3" // {
         dependencies = [
@@ -84135,6 +85199,7 @@ in
       sources."colors-1.4.0"
       sources."colorspace-1.1.2"
       sources."combined-stream-1.0.8"
+      sources."comma-separated-tokens-1.0.8"
       sources."commander-2.20.3"
       sources."common-path-prefix-2.0.0"
       sources."commondir-1.0.1"
@@ -84227,7 +85292,6 @@ in
           sources."bl-1.2.3"
           sources."file-type-5.2.0"
           sources."tar-stream-1.6.2"
-          sources."xtend-4.0.2"
         ];
       })
       (sources."decompress-tarbz2-4.1.1" // {
@@ -84269,7 +85333,7 @@ in
       sources."deprecation-2.3.1"
       sources."des.js-1.0.1"
       sources."destroy-1.0.4"
-      sources."detective-amd-3.0.0"
+      sources."detective-amd-3.0.1"
       sources."detective-cjs-3.1.1"
       sources."detective-es6-2.2.0"
       sources."detective-less-1.0.2"
@@ -84312,7 +85376,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.582"
+      sources."electron-to-chromium-1.3.586"
       sources."elf-tools-1.1.2"
       (sources."elliptic-6.5.3" // {
         dependencies = [
@@ -84327,7 +85391,7 @@ in
       sources."errno-0.1.7"
       sources."error-ex-1.3.2"
       sources."error-stack-parser-2.0.6"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.17.7"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-goat-2.1.1"
@@ -84387,6 +85451,7 @@ in
       sources."express-logging-1.1.1"
       sources."ext-list-2.2.2"
       sources."ext-name-5.0.0"
+      sources."extend-3.0.2"
       (sources."extend-shallow-3.0.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
@@ -84410,7 +85475,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."fast-safe-stringify-2.0.7"
       sources."fast-stringify-1.1.2"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."fd-slicer-1.1.0"
       sources."fecha-4.2.0"
       (sources."figures-3.2.0" // {
@@ -84464,9 +85529,10 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."gensync-1.0.0-beta.1"
+      sources."gensync-1.0.0-beta.2"
       sources."get-amd-module-type-3.0.0"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.0.1"
       sources."get-port-5.1.1"
       sources."get-proxy-2.1.0"
       sources."get-stream-5.2.0"
@@ -84545,8 +85611,15 @@ in
           sources."is-stream-2.0.0"
         ];
       })
+      sources."hast-util-from-parse5-6.0.1"
+      sources."hast-util-is-element-1.1.0"
+      sources."hast-util-parse-selector-2.2.5"
+      sources."hast-util-to-html-7.1.2"
+      sources."hast-util-whitespace-1.0.4"
+      sources."hastscript-6.0.0"
       sources."hmac-drbg-1.0.1"
       sources."hosted-git-info-2.8.8"
+      sources."html-void-elements-1.0.5"
       sources."http-cache-semantics-4.1.0"
       (sources."http-call-5.3.0" // {
         dependencies = [
@@ -84574,7 +85647,7 @@ in
       sources."hyperlinker-1.0.0"
       sources."iconv-lite-0.4.24"
       sources."idb-wrapper-1.7.2"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."ignore-4.0.6"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -84602,7 +85675,7 @@ in
           })
         ];
       })
-      (sources."inquirer-autocomplete-prompt-1.2.0" // {
+      (sources."inquirer-autocomplete-prompt-1.3.0" // {
         dependencies = [
           sources."ansi-escapes-4.3.1"
           sources."chalk-4.1.0"
@@ -84666,7 +85739,7 @@ in
       })
       sources."jest-get-type-24.9.0"
       sources."jest-validate-24.9.0"
-      sources."jest-worker-26.5.0"
+      sources."jest-worker-26.6.2"
       sources."jmespath-0.15.0"
       sources."js-string-escape-1.0.1"
       sources."js-tokens-4.0.0"
@@ -84676,7 +85749,11 @@ in
       sources."json-parse-better-errors-1.0.2"
       sources."json-parse-even-better-errors-2.3.1"
       sources."json5-2.1.3"
-      sources."jsonfile-6.0.1"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."junk-3.1.0"
       sources."jwt-decode-3.0.0"
       sources."keep-func-props-3.0.1"
@@ -84685,7 +85762,7 @@ in
       sources."kuler-2.0.0"
       (sources."lambda-local-1.7.4" // {
         dependencies = [
-          sources."commander-6.1.0"
+          sources."commander-6.2.0"
         ];
       })
       sources."latest-version-5.1.0"
@@ -84697,7 +85774,11 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."level-filesystem-1.2.0"
+      (sources."level-filesystem-1.2.0" // {
+        dependencies = [
+          sources."xtend-2.2.0"
+        ];
+      })
       sources."level-fix-range-2.0.0"
       sources."level-hooks-4.5.0"
       (sources."level-js-2.2.4" // {
@@ -84824,7 +85905,7 @@ in
         ];
       })
       sources."mkdirp-0.5.5"
-      sources."module-definition-3.3.0"
+      sources."module-definition-3.3.1"
       sources."moize-5.4.7"
       (sources."move-file-1.2.0" // {
         dependencies = [
@@ -84849,11 +85930,12 @@ in
       sources."natural-orderby-2.0.3"
       sources."negotiator-0.6.2"
       sources."nested-error-stacks-2.1.0"
-      (sources."netlify-4.8.0" // {
+      (sources."netlify-4.9.0" // {
         dependencies = [
           sources."qs-6.9.4"
         ];
       })
+      sources."netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16"
       (sources."netlify-redirect-parser-2.5.0" // {
         dependencies = [
           sources."@netlify/config-0.11.11"
@@ -84863,7 +85945,7 @@ in
       sources."netlify-redirector-0.2.0"
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.1"
-      sources."node-releases-1.1.64"
+      sources."node-releases-1.1.65"
       sources."node-source-walk-4.2.0"
       sources."noop2-2.0.0"
       (sources."normalize-package-data-2.5.0" // {
@@ -84895,14 +85977,10 @@ in
       })
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      sources."object-treeify-1.1.28"
+      sources."object-treeify-1.1.29"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.1"
-      (sources."object.getownpropertydescriptors-2.1.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."object.assign-4.1.2"
+      sources."object.getownpropertydescriptors-2.1.0"
       sources."object.pick-1.3.0"
       sources."octal-1.0.0"
       sources."octokit-pagination-methods-1.1.0"
@@ -84961,10 +86039,12 @@ in
       })
       sources."parallel-transform-1.2.0"
       sources."parse-asn1-5.1.6"
+      sources."parse-github-repo-url-1.4.1"
       sources."parse-github-url-1.0.2"
       sources."parse-gitignore-1.0.1"
       sources."parse-json-5.1.0"
       sources."parse-ms-2.1.0"
+      sources."parse5-6.0.1"
       sources."parseurl-1.3.3"
       sources."pascalcase-0.1.1"
       sources."password-prompt-1.1.2"
@@ -85004,6 +86084,7 @@ in
       sources."prettyjson-1.2.1"
       sources."process-es6-0.11.6"
       sources."process-nextick-args-2.0.1"
+      sources."property-information-5.6.0"
       sources."proto-list-1.2.4"
       sources."proxy-addr-2.0.6"
       sources."prr-1.0.1"
@@ -85014,12 +86095,12 @@ in
       })
       sources."pump-3.0.0"
       sources."punycode-1.3.2"
-      sources."pupa-2.0.1"
+      sources."pupa-2.1.1"
       sources."qs-6.7.0"
       sources."query-string-5.1.1"
       sources."querystring-0.2.0"
       sources."random-bytes-1.0.0"
-      sources."random-item-3.0.0"
+      sources."random-item-3.1.0"
       sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
       sources."range-parser-1.2.1"
@@ -85043,7 +86124,7 @@ in
       })
       sources."readdirp-3.5.0"
       sources."redeyed-2.1.1"
-      sources."regenerate-1.4.1"
+      sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.13.7"
       sources."regenerator-transform-0.14.5"
@@ -85057,9 +86138,12 @@ in
           sources."jsesc-0.5.0"
         ];
       })
+      sources."rehype-parse-7.0.1"
+      sources."rehype-stringify-8.0.0"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
+      sources."replace-ext-1.0.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."require-package-name-2.0.1"
@@ -85077,11 +86161,11 @@ in
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
       sources."ripemd160-2.0.2"
-      sources."rollup-2.32.0"
+      sources."rollup-2.33.1"
       sources."rollup-plugin-node-builtins-2.1.2"
       sources."rollup-plugin-terser-7.0.2"
       sources."run-async-2.4.1"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."rxjs-6.6.3"
       sources."safe-buffer-5.2.1"
       sources."safe-join-0.1.3"
@@ -85169,6 +86253,7 @@ in
       })
       sources."source-map-url-0.4.0"
       sources."sourcemap-codec-1.4.8"
+      sources."space-separated-tokens-1.1.5"
       sources."spdx-correct-3.1.1"
       sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.1"
@@ -85211,14 +86296,14 @@ in
       sources."strict-uri-encode-1.1.0"
       sources."string-range-1.2.2"
       sources."string-width-4.2.0"
-      (sources."string.prototype.trimend-1.0.1" // {
+      (sources."string.prototype.trimend-1.0.2" // {
         dependencies = [
-          sources."es-abstract-1.17.7"
+          sources."es-abstract-1.18.0-next.1"
         ];
       })
-      (sources."string.prototype.trimstart-1.0.1" // {
+      (sources."string.prototype.trimstart-1.0.2" // {
         dependencies = [
-          sources."es-abstract-1.17.7"
+          sources."es-abstract-1.18.0-next.1"
         ];
       })
       (sources."string_decoder-1.1.1" // {
@@ -85226,6 +86311,7 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
+      sources."stringify-entities-3.1.0"
       (sources."strip-ansi-6.0.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
@@ -85267,29 +86353,17 @@ in
           sources."unique-string-1.0.0"
         ];
       })
-      sources."term-size-2.2.0"
-      (sources."terser-5.3.7" // {
+      sources."term-size-2.2.1"
+      (sources."terser-5.3.8" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
       })
       sources."text-hex-1.0.0"
       sources."through-2.3.8"
-      (sources."through2-2.0.5" // {
-        dependencies = [
-          sources."xtend-4.0.2"
-        ];
-      })
-      (sources."through2-filter-3.0.0" // {
-        dependencies = [
-          sources."xtend-4.0.2"
-        ];
-      })
-      (sources."through2-map-3.0.0" // {
-        dependencies = [
-          sources."xtend-4.0.2"
-        ];
-      })
+      sources."through2-2.0.5"
+      sources."through2-filter-3.0.0"
+      sources."through2-map-3.0.0"
       sources."time-zone-1.0.0"
       sources."timed-out-4.0.1"
       sources."tmp-0.2.1"
@@ -85314,6 +86388,7 @@ in
         ];
       })
       sources."triple-beam-1.3.0"
+      sources."trough-1.0.5"
       sources."tslib-1.14.1"
       sources."tsutils-3.17.1"
       sources."tunnel-agent-0.6.0"
@@ -85329,9 +86404,18 @@ in
       sources."unicode-match-property-ecmascript-1.0.4"
       sources."unicode-match-property-value-ecmascript-1.2.0"
       sources."unicode-property-aliases-ecmascript-1.1.0"
+      (sources."unified-9.2.0" // {
+        dependencies = [
+          sources."is-buffer-2.0.5"
+        ];
+      })
       sources."union-value-1.0.1"
       sources."uniq-1.0.1"
       sources."unique-string-2.0.0"
+      sources."unist-util-is-4.0.3"
+      sources."unist-util-stringify-position-2.0.3"
+      sources."unist-util-visit-2.0.3"
+      sources."unist-util-visit-parents-3.1.1"
       sources."universal-user-agent-4.0.1"
       sources."universalify-1.0.0"
       (sources."unixify-1.0.0" // {
@@ -85361,22 +86445,26 @@ in
       sources."url-to-options-1.0.1"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
-      (sources."util.promisify-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."util.promisify-1.0.1"
       sources."utils-merge-1.0.1"
       sources."uuid-8.3.1"
       sources."validate-npm-package-license-3.0.4"
       sources."validate-npm-package-name-3.0.0"
       sources."vary-1.1.2"
+      (sources."vfile-4.2.0" // {
+        dependencies = [
+          sources."is-buffer-2.0.5"
+        ];
+      })
+      sources."vfile-location-3.2.0"
+      sources."vfile-message-2.0.4"
       (sources."wait-port-0.2.9" // {
         dependencies = [
           sources."commander-3.0.2"
         ];
       })
       sources."wcwidth-1.0.1"
+      sources."web-namespaces-1.1.4"
       sources."well-known-symbols-2.0.0"
       sources."which-2.0.2"
       sources."which-module-2.0.0"
@@ -85405,7 +86493,7 @@ in
       sources."xdg-basedir-4.0.0"
       sources."xml2js-0.4.19"
       sources."xmlbuilder-9.0.7"
-      sources."xtend-2.2.0"
+      sources."xtend-4.0.2"
       sources."y18n-4.0.0"
       sources."yargs-15.4.1"
       sources."yargs-parser-18.1.3"
@@ -85467,7 +86555,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
@@ -85605,7 +86693,7 @@ in
       sources."async-0.9.2"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bcrypt-pbkdf-1.0.2"
@@ -85883,10 +86971,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.15.0";
+    version = "0.16.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz";
-      sha512 = "7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA==";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.16.0.tgz";
+      sha512 = "4efGA+X/YXAHLi1hN8KaPrILULaUn2nWecFrn1k2I+99HpoyvcOGEbtcOxpDiUwPF2ZANMJDh32qwOUPenuR1g==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -85974,7 +87062,7 @@ in
       sha512 = "/cGajoUjpCgP1Plqjtvupm8gE+19Vzm/z31M25f50XIuLpy3wieTki+e2oIPPyuzTD7Gz04JMySbcB8tx0voNA==";
     };
     dependencies = [
-      sources."@babel/runtime-7.12.1"
+      sources."@babel/runtime-7.12.5"
       sources."@node-red/editor-api-1.2.2"
       sources."@node-red/editor-client-1.2.2"
       (sources."@node-red/nodes-1.2.2" // {
@@ -85996,7 +87084,7 @@ in
       sources."@node-red/util-1.2.2"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
-      (sources."agent-base-6.0.1" // {
+      (sources."agent-base-6.0.2" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."ms-2.1.2"
@@ -86023,7 +87111,7 @@ in
       sources."async-mutex-0.2.4"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."axios-0.19.2"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.3.1"
@@ -86058,7 +87146,7 @@ in
       sources."body-parser-1.19.0"
       sources."boolbase-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.6.0"
+      sources."buffer-5.7.0"
       sources."buffer-from-1.1.1"
       sources."busboy-0.2.14"
       sources."bytes-3.1.0"
@@ -86204,7 +87292,7 @@ in
       })
       sources."i18next-15.1.2"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."ignore-walk-3.0.3"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -86491,7 +87579,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
@@ -86639,7 +87727,7 @@ in
           sources."mkdirp-1.0.4"
         ];
       })
-      sources."temp-0.9.1"
+      sources."temp-0.9.2"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -86775,7 +87863,7 @@ in
       sources."prepend-http-2.0.0"
       sources."pstree.remy-1.1.8"
       sources."pump-3.0.0"
-      sources."pupa-2.0.1"
+      sources."pupa-2.1.1"
       sources."rc-1.2.8"
       sources."readdirp-3.5.0"
       sources."registry-auth-token-4.2.0"
@@ -86799,7 +87887,7 @@ in
       sources."strip-ansi-5.2.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      sources."term-size-2.2.0"
+      sources."term-size-2.2.1"
       sources."to-readable-stream-1.0.0"
       sources."to-regex-range-5.0.1"
       sources."touch-3.1.0"
@@ -86850,10 +87938,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "9.1.0";
+    version = "9.2.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.1.0.tgz";
-      sha512 = "sx/hbKWAMPgflMffQLZXYt9uZeOK7Rnd6DLoL+8n2Sxe5yn5MMD4kXtkH5NXqJ3OxVA4JgnVbL7rvXhJKGMZrg==";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.2.4.tgz";
+      sha512 = "YXEIqKXzxOhtPWg670+JAp/jPtjfTdaBJVGSlWL3eHbUDY4O80ELQNGO/qDy8oxh3pOrxSdII7vNglDf4FDw4w==";
     };
     dependencies = [
       sources."@npmcli/ci-detect-1.3.0"
@@ -86861,13 +87949,13 @@ in
       sources."@npmcli/installed-package-contents-1.0.5"
       sources."@npmcli/move-file-1.0.1"
       sources."@npmcli/node-gyp-1.0.1"
-      sources."@npmcli/promise-spawn-1.2.0"
-      sources."@npmcli/run-script-1.7.2"
+      sources."@npmcli/promise-spawn-1.3.2"
+      sources."@npmcli/run-script-1.7.4"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@tootallnate/once-1.1.2"
       sources."abbrev-1.1.1"
-      sources."agent-base-6.0.1"
+      sources."agent-base-6.0.2"
       sources."agentkeepalive-4.1.3"
       sources."aggregate-error-3.1.0"
       sources."ajv-6.12.6"
@@ -86889,7 +87977,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       (sources."boxen-4.2.0" // {
@@ -86926,7 +88014,7 @@ in
       sources."color-name-1.1.4"
       sources."colors-1.0.3"
       sources."combined-stream-1.0.8"
-      sources."commander-6.1.0"
+      sources."commander-6.2.0"
       sources."concat-map-0.0.1"
       sources."configstore-5.0.1"
       sources."console-control-strings-1.1.0"
@@ -87060,7 +88148,7 @@ in
       sources."npm-install-checks-4.0.0"
       sources."npm-normalize-package-bin-1.0.1"
       sources."npm-package-arg-8.1.0"
-      sources."npm-packlist-2.1.2"
+      sources."npm-packlist-2.1.4"
       sources."npm-pick-manifest-6.1.0"
       sources."npm-registry-fetch-8.1.5"
       sources."npmlog-4.1.2"
@@ -87088,11 +88176,11 @@ in
       sources."progress-2.0.3"
       sources."promise-inflight-1.0.1"
       sources."promise-retry-1.1.1"
-      sources."prompts-2.3.2"
+      sources."prompts-2.4.0"
       sources."psl-1.8.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
-      sources."pupa-2.0.1"
+      sources."pupa-2.1.1"
       sources."qs-6.5.2"
       sources."rc-1.2.8"
       sources."rc-config-loader-3.0.0"
@@ -87120,7 +88208,7 @@ in
       sources."signal-exit-3.0.3"
       sources."sisteransi-1.0.5"
       sources."smart-buffer-4.1.0"
-      sources."socks-2.4.4"
+      sources."socks-2.5.0"
       sources."socks-proxy-agent-5.0.0"
       sources."spawn-please-0.4.1"
       sources."sprintf-js-1.0.3"
@@ -87132,7 +88220,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
       sources."tar-6.0.5"
-      sources."term-size-2.2.0"
+      sources."term-size-2.2.1"
       sources."to-readable-stream-1.0.0"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
@@ -87142,7 +88230,7 @@ in
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
       sources."unique-string-2.0.0"
-      sources."update-notifier-5.0.0"
+      sources."update-notifier-5.0.1"
       sources."uri-js-4.4.0"
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
@@ -87182,7 +88270,7 @@ in
     src = fetchgit {
       url = "git://github.com/NixOS/npm2nix.git";
       rev = "0c06be7d278a7f64fc853a5fd42d2031d14496d5";
-      sha256 = "e1b252cd883fd8c5c4618b157d03b3fb869fa6aad4170ef51e34681069d50bf5";
+      sha256 = "ac58ebe43b62e42cdc1754f4d6c6795de9c33fe12b72a858522c9f0ba10b5cee";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -87195,7 +88283,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."block-stream-0.0.9"
@@ -87400,14 +88488,14 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/compat-data-7.12.1"
+      sources."@babel/compat-data-7.12.5"
       (sources."@babel/core-7.12.3" // {
         dependencies = [
           sources."json5-2.1.3"
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.12.1" // {
+      (sources."@babel/generator-7.12.5" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -87416,7 +88504,7 @@ in
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
       sources."@babel/helper-builder-react-jsx-7.10.4"
       sources."@babel/helper-builder-react-jsx-experimental-7.12.4"
-      sources."@babel/helper-compilation-targets-7.12.1"
+      sources."@babel/helper-compilation-targets-7.12.5"
       sources."@babel/helper-create-class-features-plugin-7.12.1"
       sources."@babel/helper-create-regexp-features-plugin-7.12.1"
       sources."@babel/helper-define-map-7.10.5"
@@ -87425,22 +88513,22 @@ in
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-hoist-variables-7.10.4"
       sources."@babel/helper-member-expression-to-functions-7.12.1"
-      sources."@babel/helper-module-imports-7.12.1"
+      sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
       sources."@babel/helper-optimise-call-expression-7.10.4"
       sources."@babel/helper-plugin-utils-7.10.4"
       sources."@babel/helper-regex-7.10.5"
       sources."@babel/helper-remap-async-to-generator-7.12.1"
-      sources."@babel/helper-replace-supers-7.12.1"
+      sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
       sources."@babel/helper-split-export-declaration-7.11.0"
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/helper-validator-option-7.12.1"
       sources."@babel/helper-wrap-function-7.12.3"
-      sources."@babel/helpers-7.12.1"
+      sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.3"
+      sources."@babel/parser-7.12.5"
       sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
       sources."@babel/plugin-proposal-dynamic-import-7.12.1"
@@ -87448,7 +88536,7 @@ in
       sources."@babel/plugin-proposal-json-strings-7.12.1"
       sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-      sources."@babel/plugin-proposal-numeric-separator-7.12.1"
+      sources."@babel/plugin-proposal-numeric-separator-7.12.5"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
       sources."@babel/plugin-proposal-optional-chaining-7.12.1"
@@ -87492,7 +88580,7 @@ in
       sources."@babel/plugin-transform-object-super-7.12.1"
       sources."@babel/plugin-transform-parameters-7.12.1"
       sources."@babel/plugin-transform-property-literals-7.12.1"
-      sources."@babel/plugin-transform-react-jsx-7.12.1"
+      sources."@babel/plugin-transform-react-jsx-7.12.5"
       sources."@babel/plugin-transform-regenerator-7.12.1"
       sources."@babel/plugin-transform-reserved-words-7.12.1"
       sources."@babel/plugin-transform-shorthand-properties-7.12.1"
@@ -87504,10 +88592,10 @@ in
       sources."@babel/plugin-transform-unicode-regex-7.12.1"
       sources."@babel/preset-env-7.12.1"
       sources."@babel/preset-modules-0.1.4"
-      sources."@babel/runtime-7.12.1"
+      sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.1"
-      sources."@babel/types-7.12.1"
+      sources."@babel/traverse-7.12.5"
+      sources."@babel/types-7.12.5"
       sources."@iarna/toml-2.2.5"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
@@ -87560,7 +88648,7 @@ in
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."babel-plugin-dynamic-import-node-2.3.3"
       (sources."babel-runtime-6.26.0" // {
         dependencies = [
@@ -87609,7 +88697,7 @@ in
           sources."pako-1.0.11"
         ];
       })
-      sources."browserslist-4.14.5"
+      sources."browserslist-4.14.6"
       (sources."buffer-4.9.2" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -87620,12 +88708,13 @@ in
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       sources."cache-base-1.0.1"
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001148"
+      sources."caniuse-lite-1.0.30001154"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -87697,10 +88786,10 @@ in
       sources."cssnano-util-get-match-4.0.0"
       sources."cssnano-util-raw-cache-4.0.1"
       sources."cssnano-util-same-parent-4.0.1"
-      (sources."csso-4.0.3" // {
+      (sources."csso-4.1.0" // {
         dependencies = [
-          sources."css-tree-1.0.0-alpha.39"
-          sources."mdn-data-2.0.6"
+          sources."css-tree-1.0.0"
+          sources."mdn-data-2.0.12"
         ];
       })
       sources."cssom-0.3.8"
@@ -87751,7 +88840,11 @@ in
       sources."domain-browser-1.2.0"
       sources."domelementtype-1.3.1"
       sources."domexception-1.0.1"
-      sources."domhandler-2.4.2"
+      (sources."domhandler-3.3.0" // {
+        dependencies = [
+          sources."domelementtype-2.0.2"
+        ];
+      })
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."dotenv-5.0.1"
@@ -87759,7 +88852,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.582"
+      sources."electron-to-chromium-1.3.586"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -87769,7 +88862,11 @@ in
       sources."entities-1.1.2"
       sources."envinfo-7.7.3"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.1"
+      (sources."es-abstract-1.17.7" // {
+        dependencies = [
+          sources."object-inspect-1.8.0"
+        ];
+      })
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-html-1.0.3"
@@ -87813,7 +88910,8 @@ in
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.13"
       sources."function-bind-1.1.1"
-      sources."gensync-1.0.0-beta.1"
+      sources."gensync-1.0.0-beta.2"
+      sources."get-intrinsic-1.0.1"
       sources."get-port-3.2.0"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
@@ -87860,13 +88958,16 @@ in
       (sources."htmlnano-0.2.7" // {
         dependencies = [
           sources."posthtml-0.13.4"
-          sources."posthtml-parser-0.5.0"
+          sources."posthtml-parser-0.5.2"
           sources."terser-4.8.0"
         ];
       })
-      (sources."htmlparser2-3.10.1" // {
+      (sources."htmlparser2-5.0.1" // {
         dependencies = [
-          sources."readable-stream-3.6.0"
+          sources."dom-serializer-1.1.0"
+          sources."domelementtype-2.0.2"
+          sources."domutils-2.4.2"
+          sources."entities-2.1.0"
         ];
       })
       sources."http-errors-1.7.3"
@@ -87874,7 +88975,7 @@ in
       sources."https-browserify-1.0.0"
       sources."iconv-lite-0.4.24"
       sources."icss-replace-symbols-1.1.0"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."import-fresh-2.0.0"
       sources."indexes-of-1.0.1"
       sources."inflight-1.0.6"
@@ -88009,7 +89110,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.64"
+      sources."node-releases-1.1.65"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
       sources."nth-check-1.0.2"
@@ -88017,21 +89118,13 @@ in
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       sources."object-copy-0.1.0"
-      sources."object-inspect-1.8.0"
+      sources."object-inspect-1.4.1"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.1"
-      (sources."object.getownpropertydescriptors-2.1.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."object.assign-4.1.2"
+      sources."object.getownpropertydescriptors-2.1.0"
       sources."object.pick-1.3.0"
-      (sources."object.values-1.1.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."object.values-1.1.1"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
@@ -88122,7 +89215,13 @@ in
       sources."postcss-unique-selectors-4.0.1"
       sources."postcss-value-parser-3.3.1"
       sources."posthtml-0.11.6"
-      sources."posthtml-parser-0.4.2"
+      (sources."posthtml-parser-0.4.2" // {
+        dependencies = [
+          sources."domhandler-2.4.2"
+          sources."htmlparser2-3.10.1"
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."posthtml-render-1.2.3"
       sources."prelude-ls-1.1.2"
       sources."process-0.11.10"
@@ -88155,7 +89254,7 @@ in
         ];
       })
       sources."readdirp-2.2.1"
-      sources."regenerate-1.4.1"
+      sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.13.7"
       sources."regenerator-transform-0.14.5"
@@ -88252,23 +89351,21 @@ in
         ];
       })
       sources."static-extend-0.1.2"
-      (sources."static-module-2.2.5" // {
-        dependencies = [
-          sources."object-inspect-1.4.1"
-        ];
-      })
+      sources."static-module-2.2.5"
       sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."stream-browserify-2.0.2"
       sources."stream-http-2.8.3"
-      (sources."string.prototype.trimend-1.0.1" // {
+      (sources."string.prototype.trimend-1.0.2" // {
         dependencies = [
-          sources."es-abstract-1.17.7"
+          sources."es-abstract-1.18.0-next.1"
+          sources."object-inspect-1.8.0"
         ];
       })
-      (sources."string.prototype.trimstart-1.0.1" // {
+      (sources."string.prototype.trimstart-1.0.2" // {
         dependencies = [
-          sources."es-abstract-1.17.7"
+          sources."es-abstract-1.18.0-next.1"
+          sources."object-inspect-1.8.0"
         ];
       })
       sources."string_decoder-1.1.1"
@@ -88283,7 +89380,7 @@ in
       sources."symbol-tree-3.2.4"
       sources."terser-3.17.0"
       sources."through2-2.0.5"
-      sources."timers-browserify-2.0.11"
+      sources."timers-browserify-2.0.12"
       sources."timsort-0.3.0"
       sources."tiny-inflate-1.0.3"
       sources."to-arraybuffer-1.0.1"
@@ -88346,13 +89443,9 @@ in
         ];
       })
       sources."util-deprecate-1.0.2"
-      (sources."util.promisify-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."util.promisify-1.0.1"
       sources."uuid-3.4.0"
-      sources."v8-compile-cache-2.1.1"
+      sources."v8-compile-cache-2.2.0"
       sources."vendors-1.0.4"
       sources."verror-1.10.0"
       sources."vlq-0.2.3"
@@ -88407,7 +89500,7 @@ in
       sources."async-0.9.2"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."babybird-0.0.1"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
@@ -88425,6 +89518,7 @@ in
       sources."bunyan-syslog-udp-0.2.0"
       sources."busboy-0.3.1"
       sources."bytes-3.0.0"
+      sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
       sources."caseless-0.12.0"
       sources."clarinet-0.11.0"
@@ -88461,8 +89555,6 @@ in
       sources."encodeurl-1.0.2"
       sources."entities-1.1.2"
       sources."errno-0.1.7"
-      sources."es-abstract-1.18.0-next.1"
-      sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."esprima-4.0.1"
       sources."etag-1.8.1"
@@ -88489,6 +89581,7 @@ in
       sources."gelf-stream-1.1.1"
       sources."gelfling-0.3.1"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.0.1"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."graceful-fs-4.2.4"
@@ -88507,12 +89600,7 @@ in
       sources."inherits-2.0.3"
       sources."ipaddr.js-1.9.1"
       sources."is-arguments-1.0.4"
-      sources."is-callable-1.2.2"
-      sources."is-date-object-1.0.2"
       sources."is-fullwidth-code-point-2.0.0"
-      sources."is-negative-zero-2.0.0"
-      sources."is-regex-1.1.1"
-      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
       sources."isstream-0.1.2"
@@ -88554,9 +89642,8 @@ in
       sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
       sources."neo-async-2.6.2"
       sources."oauth-sign-0.9.0"
-      sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -88627,16 +89714,6 @@ in
       sources."statuses-1.5.0"
       sources."streamsearch-0.1.2"
       sources."string-width-3.1.0"
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
       sources."string_decoder-1.1.1"
       sources."strip-ansi-5.2.0"
       sources."toidentifier-1.0.0"
@@ -88644,7 +89721,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
-      sources."uglify-js-3.11.3"
+      sources."uglify-js-3.11.5"
       sources."unix-dgram-2.0.4"
       sources."unpipe-1.0.0"
       sources."uri-js-4.4.0"
@@ -88971,6 +90048,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bencode-2.0.1"
+      sources."bep53-range-1.0.0"
       sources."big-integer-1.6.48"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-6.4.2" // {
@@ -88983,7 +90061,7 @@ in
           sources."bencode-0.8.0"
         ];
       })
-      sources."blob-to-buffer-1.2.8"
+      sources."blob-to-buffer-1.2.9"
       sources."bn.js-4.11.9"
       sources."bncode-0.5.3"
       sources."bonjour-3.5.0"
@@ -88997,11 +90075,12 @@ in
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
+      sources."call-bind-1.0.0"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
       sources."chalk-1.1.3"
       sources."chardet-0.4.2"
-      sources."chrome-dgram-3.0.5"
+      sources."chrome-dgram-3.0.6"
       sources."chrome-dns-1.0.1"
       sources."chrome-net-3.3.4"
       sources."cli-cursor-2.1.0"
@@ -89045,6 +90124,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."get-browser-rtc-1.0.2"
+      sources."get-intrinsic-1.0.1"
       sources."get-stdin-4.0.1"
       sources."glob-7.1.6"
       sources."graceful-fs-4.2.4"
@@ -89101,7 +90181,7 @@ in
       sources."lodash-3.10.1"
       sources."loud-rejection-1.6.0"
       sources."lru-2.0.1"
-      sources."magnet-uri-5.3.0"
+      sources."magnet-uri-5.4.0"
       sources."map-obj-1.0.1"
       sources."meow-3.7.0"
       sources."mime-2.4.6"
@@ -89124,7 +90204,7 @@ in
       sources."object-inspect-1.8.0"
       sources."object-is-1.1.3"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."open-0.0.5"
@@ -89187,8 +90267,8 @@ in
       sources."reverse-http-1.3.0"
       sources."rimraf-2.7.1"
       sources."run-async-2.4.1"
-      sources."run-parallel-1.1.9"
-      sources."run-series-1.1.8"
+      sources."run-parallel-1.1.10"
+      sources."run-series-1.1.9"
       sources."rusha-0.8.13"
       sources."rxjs-5.5.12"
       sources."safe-buffer-5.1.2"
@@ -89214,16 +90294,8 @@ in
       sources."speedometer-0.1.4"
       sources."stream-buffers-2.2.0"
       sources."string-width-1.0.2"
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.2"
+      sources."string.prototype.trimstart-1.0.2"
       (sources."string2compact-1.3.0" // {
         dependencies = [
           sources."ipaddr.js-1.9.1"
@@ -89307,7 +90379,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.4"
@@ -89332,7 +90404,7 @@ in
       sources."bncode-0.5.3"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.6.0"
+      sources."buffer-5.7.0"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -89343,7 +90415,7 @@ in
       sources."bytes-3.1.0"
       sources."callsite-1.0.0"
       sources."caseless-0.12.0"
-      sources."chrome-dgram-3.0.5"
+      sources."chrome-dgram-3.0.6"
       sources."chrome-dns-1.0.1"
       sources."chrome-net-3.3.4"
       sources."combined-stream-1.0.8"
@@ -89435,7 +90507,7 @@ in
       })
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."immediate-chunk-store-1.0.8"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
@@ -89551,8 +90623,8 @@ in
         ];
       })
       sources."rimraf-2.7.1"
-      sources."run-parallel-1.1.9"
-      sources."run-series-1.1.8"
+      sources."run-parallel-1.1.10"
+      sources."run-series-1.1.9"
       sources."rusha-0.8.13"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -89890,7 +90962,7 @@ in
       sources."readdirp-3.5.0"
       sources."require-in-the-middle-5.0.3"
       sources."resolve-1.18.1"
-      sources."run-series-1.1.8"
+      sources."run-series-1.1.9"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
@@ -89911,7 +90983,7 @@ in
       sources."statuses-1.5.0"
       sources."string_decoder-0.10.31"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.27.10"
+      sources."systeminformation-4.27.11"
       sources."thunkify-2.1.2"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
@@ -89946,10 +91018,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "5.9.3";
+    version = "5.10.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.9.3.tgz";
-      sha512 = "MyN/jR/WfM7SPnnrkaEoQ2+cOhoSAnhzJ2sDOF7yZKyjh0sYuvGcijeZYbyWJ0r5C0vtBPV5SRtiLaHvwYWZBg==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.10.4.tgz";
+      sha512 = "HWtg7vrXpNNCeroOc0IhsoNdwPmga/N7Nci/Mc9SadHrkMXPNpkFXCHT3g9e4HqtGlbDX2K30WKvYQu2umdM+w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -89964,10 +91036,10 @@ in
   postcss-cli = nodeEnv.buildNodePackage {
     name = "postcss-cli";
     packageName = "postcss-cli";
-    version = "8.1.0";
+    version = "8.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.1.0.tgz";
-      sha512 = "FYuV5zyYX53X5RywInxjWLqHZ4oCBC3nDwrHYU3Z75mFqUo5IHfbeY593heWSagG90nPnXq3tXCck8+2CUl8EA==";
+      url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.2.0.tgz";
+      sha512 = "N7tgPpB/2yXk/04irc/RiImCkftVw42STaploQBeOT1xvrIkyG+YW+TsHAJ57xWwL+b0AjXnqs5/RL/1XIh2Lw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -90008,7 +91080,7 @@ in
       sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
       sources."fast-glob-3.2.4"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."fill-range-7.0.1"
       sources."fs-extra-9.0.1"
       sources."fsevents-2.1.3"
@@ -90020,7 +91092,7 @@ in
       sources."has-flag-4.0.0"
       sources."ignore-5.1.8"
       sources."import-cwd-3.0.0"
-      sources."import-fresh-3.2.1"
+      sources."import-fresh-3.2.2"
       (sources."import-from-3.0.0" // {
         dependencies = [
           sources."resolve-from-5.0.0"
@@ -90034,7 +91106,11 @@ in
       sources."is-number-7.0.0"
       sources."js-tokens-4.0.0"
       sources."json-parse-even-better-errors-2.3.1"
-      sources."jsonfile-6.0.1"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."lines-and-columns-1.1.6"
       sources."lodash.difference-4.5.0"
       sources."lodash.forown-4.4.0"
@@ -90058,7 +91134,7 @@ in
       sources."require-directory-2.1.1"
       sources."resolve-from-4.0.0"
       sources."reusify-1.0.4"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."slash-3.0.0"
       sources."string-width-4.2.0"
       sources."strip-ansi-6.0.0"
@@ -90066,7 +91142,7 @@ in
       sources."to-regex-range-5.0.1"
       sources."universalify-1.0.0"
       sources."wrap-ansi-7.0.0"
-      sources."y18n-5.0.4"
+      sources."y18n-5.0.5"
       sources."yaml-1.10.0"
       sources."yargs-16.1.0"
       sources."yargs-parser-20.2.3"
@@ -90259,7 +91335,7 @@ in
       sources."hmac-drbg-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-1.0.0"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."inline-source-map-0.6.2"
@@ -90365,7 +91441,7 @@ in
       sources."string_decoder-1.3.0"
       sources."subarg-1.0.0"
       sources."syntax-error-1.4.0"
-      (sources."temp-0.9.1" // {
+      (sources."temp-0.9.2" // {
         dependencies = [
           sources."rimraf-2.6.3"
         ];
@@ -90474,10 +91550,10 @@ in
   pyright = nodeEnv.buildNodePackage {
     name = "pyright";
     packageName = "pyright";
-    version = "1.1.80";
+    version = "1.1.82";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.80.tgz";
-      sha512 = "B0Ygy3F6EjpEAWPb+nrjTVVoLnpm4ZZqNsEAPOWpse41+Dh4dj+YklKXaej7hpMt02JM2IxzcbwrVg6xoGAD6g==";
+      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.82.tgz";
+      sha512 = "sSYrN9ziOKTLdo7HwP8vlU8pLhY7KDQ9hGK7sW4S2pNn6pAe2ewUjD5Gk4AAbKc13qQ9za9cdthhT0Gk60L7mA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -90505,6 +91581,7 @@ in
       sources."available-typed-arrays-1.0.2"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
+      sources."call-bind-1.0.0"
       sources."chalk-1.1.3"
       sources."colors-0.6.2"
       sources."concat-map-0.0.1"
@@ -90523,6 +91600,7 @@ in
       sources."foreach-2.0.5"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       sources."glob-7.1.6"
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
@@ -90559,7 +91637,7 @@ in
       sources."object-inspect-1.8.0"
       sources."object-is-1.1.3"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."pkginfo-0.4.1"
@@ -90575,16 +91653,8 @@ in
       sources."semver-5.7.1"
       sources."side-channel-1.0.3"
       sources."stack-trace-0.0.10"
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.2"
+      sources."string.prototype.trimstart-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."utile-0.2.1"
@@ -90685,7 +91755,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."browser-process-hrtime-1.0.0"
       sources."caseless-0.12.0"
@@ -90800,14 +91870,14 @@ in
   redoc-cli = nodeEnv.buildNodePackage {
     name = "redoc-cli";
     packageName = "redoc-cli";
-    version = "0.9.12";
+    version = "0.9.13";
     src = fetchurl {
-      url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.9.12.tgz";
-      sha512 = "9Ap7WfEsYtAoVZNyA8lryWAsU2Wq0lHXaNiFgdVZb4zltHNTYEqKmRi06WhileeuqVTNkd1CF2S5CCS5Xg9+aQ==";
+      url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.9.13.tgz";
+      sha512 = "6zNhK7KiiYPGaMIFISsIkgAJaXTY0n8hY3xGAeQuS52GRm/DR5bA1Jna52GUzWM/LXgyp6HSBvYucd+wmOQYCQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      (sources."@babel/generator-7.12.1" // {
+      (sources."@babel/generator-7.12.5" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -90815,22 +91885,24 @@ in
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
-      sources."@babel/helper-module-imports-7.12.1"
+      sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-split-export-declaration-7.11.0"
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.3"
-      sources."@babel/runtime-7.12.1"
+      sources."@babel/parser-7.12.5"
+      sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.1"
-      sources."@babel/types-7.12.1"
+      sources."@babel/traverse-7.12.5"
+      sources."@babel/types-7.12.5"
       sources."@emotion/is-prop-valid-0.8.8"
       sources."@emotion/memoize-0.7.4"
       sources."@emotion/stylis-0.8.5"
       sources."@emotion/unitless-0.7.5"
       sources."@exodus/schemasafe-1.0.0-rc.3"
+      sources."@redocly/react-dropdown-aria-2.0.11"
+      sources."@types/node-13.13.30"
       sources."ajv-5.5.2"
-      sources."ansi-regex-3.0.0"
+      sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
       sources."anymatch-3.1.1"
       sources."argparse-1.0.10"
@@ -90848,7 +91920,6 @@ in
       sources."babel-plugin-syntax-jsx-6.18.0"
       sources."base64-js-1.3.1"
       sources."better-ajv-errors-0.6.7"
-      sources."big.js-5.2.2"
       sources."binary-extensions-2.1.0"
       sources."bn.js-5.1.3"
       sources."braces-3.0.2"
@@ -90883,11 +91954,10 @@ in
       sources."cipher-base-1.0.4"
       sources."classnames-2.2.6"
       sources."clipboard-2.0.6"
-      sources."cliui-4.1.0"
+      sources."cliui-6.0.0"
       sources."clsx-1.1.1"
       sources."co-4.6.0"
       sources."code-error-fragment-0.0.230"
-      sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."console-browserify-1.2.0"
@@ -90901,7 +91971,6 @@ in
       })
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
-      sources."cross-spawn-6.0.5"
       sources."crypto-browserify-3.12.0"
       sources."css-color-keywords-1.0.0"
       sources."css-to-react-native-3.0.0"
@@ -90915,37 +91984,30 @@ in
           sources."bn.js-4.11.9"
         ];
       })
-      sources."dom-walk-0.1.2"
       sources."domain-browser-1.2.0"
-      sources."dompurify-1.0.11"
+      sources."dompurify-2.2.2"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
         ];
       })
       sources."emoji-regex-8.0.0"
-      sources."emojis-list-3.0.0"
-      sources."end-of-stream-1.4.4"
       sources."es6-promise-3.3.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
-      sources."eventemitter3-3.1.2"
+      sources."eventemitter3-4.0.7"
       sources."events-3.2.0"
       sources."evp_bytestokey-1.0.3"
-      sources."execa-1.0.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-levenshtein-2.0.6"
       sources."fast-safe-stringify-2.0.7"
       sources."fill-range-7.0.1"
-      sources."find-up-3.0.0"
+      sources."find-up-4.1.0"
       sources."foreach-2.0.5"
       sources."format-util-1.0.5"
       sources."fsevents-2.1.3"
-      sources."get-caller-file-1.0.3"
-      sources."get-stream-4.1.0"
+      sources."get-caller-file-2.0.5"
       sources."glob-parent-5.1.1"
-      sources."global-4.4.0"
       sources."globals-11.12.0"
       sources."good-listener-1.2.2"
       sources."grapheme-splitter-1.0.4"
@@ -90966,17 +92028,14 @@ in
       sources."hoist-non-react-statics-3.3.2"
       sources."http2-client-1.3.3"
       sources."https-browserify-1.0.0"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."inherits-2.0.1"
-      sources."invert-kv-2.0.0"
       sources."is-binary-path-2.1.0"
       sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
-      sources."is-stream-1.1.0"
       sources."isarray-2.0.5"
-      sources."isexe-2.0.0"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.0"
       sources."jsesc-2.5.2"
@@ -90984,65 +92043,50 @@ in
       sources."json-schema-ref-parser-6.1.0"
       sources."json-schema-traverse-0.3.1"
       sources."json-to-ast-2.1.0"
-      sources."json5-1.0.1"
       sources."jsonpointer-4.1.0"
-      sources."lcid-2.0.0"
       sources."leven-3.1.0"
-      sources."loader-utils-1.4.0"
-      sources."locate-path-3.0.0"
+      sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."loose-envify-1.4.0"
-      sources."lunr-2.3.6"
-      sources."map-age-cleaner-0.1.3"
+      sources."lunr-2.3.8"
       sources."mark.js-8.11.1"
-      sources."marked-0.6.3"
+      sources."marked-0.7.0"
       sources."md5.js-1.3.5"
-      sources."mem-4.3.0"
       sources."memoize-one-5.1.1"
       (sources."miller-rabin-4.0.1" // {
         dependencies = [
           sources."bn.js-4.11.9"
         ];
       })
-      sources."mimic-fn-2.1.0"
-      sources."min-document-2.19.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimist-1.2.5"
       sources."mkdirp-1.0.4"
-      sources."mobx-4.15.7"
-      sources."mobx-react-5.4.4"
+      sources."mobx-6.0.2"
+      sources."mobx-react-6.3.1"
+      sources."mobx-react-lite-2.2.2"
       sources."ms-2.1.2"
       sources."neo-async-2.6.2"
-      sources."nice-try-1.0.5"
       sources."node-fetch-h2-2.3.0"
       sources."node-libs-browser-2.2.1"
       sources."node-readfiles-0.2.0"
       sources."normalize-path-3.0.0"
-      sources."npm-run-path-2.0.2"
-      sources."number-is-nan-1.0.1"
       sources."oas-kit-common-1.0.8"
       sources."oas-linter-3.2.1"
       sources."oas-resolver-2.5.2"
       sources."oas-schema-walker-1.1.5"
-      sources."oas-validator-3.4.0"
+      sources."oas-validator-4.0.8"
       sources."object-assign-4.1.1"
-      sources."once-1.4.0"
       sources."ono-4.0.11"
-      sources."openapi-sampler-1.0.0-beta.14"
+      sources."openapi-sampler-1.0.0-beta.18"
       sources."os-browserify-0.3.0"
-      sources."os-locale-3.1.0"
-      sources."p-defer-1.0.0"
-      sources."p-finally-1.0.0"
-      sources."p-is-promise-2.1.0"
       sources."p-limit-2.3.0"
-      sources."p-locate-3.0.0"
+      sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
       sources."pako-1.0.11"
       sources."parse-asn1-5.1.6"
       sources."path-browserify-0.0.1"
-      sources."path-exists-3.0.0"
-      sources."path-key-2.0.1"
+      sources."path-exists-4.0.0"
       sources."pbkdf2-3.1.1"
       sources."perfect-scrollbar-1.5.0"
       sources."picomatch-2.2.2"
@@ -91057,7 +92101,6 @@ in
           sources."bn.js-4.11.9"
         ];
       })
-      sources."pump-3.0.0"
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -91065,14 +92108,7 @@ in
       sources."randomfill-1.0.4"
       sources."react-16.14.0"
       sources."react-dom-16.14.0"
-      sources."react-dropdown-1.9.0"
-      (sources."react-hot-loader-4.13.0" // {
-        dependencies = [
-          sources."source-map-0.7.3"
-        ];
-      })
       sources."react-is-16.13.1"
-      sources."react-lifecycles-compat-3.0.4"
       sources."react-tabs-3.1.1"
       (sources."readable-stream-2.3.7" // {
         dependencies = [
@@ -91083,68 +92119,52 @@ in
         ];
       })
       sources."readdirp-3.5.0"
-      (sources."redoc-2.0.0-rc.8-1" // {
-        dependencies = [
-          sources."tslib-1.14.1"
-        ];
-      })
+      sources."redoc-2.0.0-rc.45"
       sources."reftools-1.1.6"
       sources."regenerator-runtime-0.13.7"
       sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
+      sources."require-main-filename-2.0.0"
       sources."ripemd160-2.0.2"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."scheduler-0.19.1"
       sources."select-1.1.2"
-      sources."semver-5.7.1"
       sources."set-blocking-2.0.0"
       sources."setimmediate-1.0.5"
       sources."sha.js-2.4.11"
       sources."shallowequal-1.1.0"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
       sources."should-13.2.3"
       sources."should-equal-2.0.0"
       sources."should-format-3.0.3"
       sources."should-type-1.4.0"
       sources."should-type-adaptors-1.1.0"
       sources."should-util-1.0.1"
-      sources."signal-exit-3.0.3"
-      sources."slugify-1.4.5"
+      sources."slugify-1.4.6"
       sources."source-map-0.6.1"
       sources."sprintf-js-1.0.3"
       sources."stickyfill-1.1.1"
       sources."stream-browserify-2.0.2"
       sources."stream-http-2.8.3"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
+      sources."string-width-4.2.0"
       sources."string_decoder-1.3.0"
-      sources."strip-ansi-4.0.0"
-      sources."strip-eof-1.0.0"
-      sources."styled-components-5.2.0"
+      sources."strip-ansi-6.0.0"
+      sources."styled-components-5.2.1"
       sources."supports-color-5.5.0"
-      (sources."swagger2openapi-5.4.0" // {
-        dependencies = [
-          sources."yargs-12.0.5"
-        ];
-      })
-      sources."timers-browserify-2.0.11"
+      sources."swagger2openapi-6.2.3"
+      sources."timers-browserify-2.0.12"
       sources."tiny-emitter-2.1.0"
       sources."to-arraybuffer-1.0.1"
       sources."to-fast-properties-2.0.0"
       sources."to-regex-range-5.0.1"
       sources."tslib-2.0.3"
       sources."tty-browserify-0.0.0"
-      sources."uglify-js-3.11.3"
+      sources."uglify-js-3.11.5"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
         ];
       })
+      sources."url-template-2.0.8"
       (sources."util-0.11.1" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -91152,41 +92172,20 @@ in
       })
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-1.1.2"
-      sources."which-1.3.1"
       sources."which-module-2.0.0"
       sources."wordwrap-1.0.0"
-      (sources."wrap-ansi-2.1.0" // {
+      (sources."wrap-ansi-6.2.0" // {
         dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
+          sources."ansi-styles-4.3.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
         ];
       })
-      sources."wrappy-1.0.2"
       sources."xtend-4.0.2"
       sources."y18n-4.0.0"
       sources."yaml-1.10.0"
-      (sources."yargs-15.4.1" // {
-        dependencies = [
-          sources."ansi-regex-5.0.0"
-          sources."ansi-styles-4.3.0"
-          sources."cliui-6.0.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."find-up-4.1.0"
-          sources."get-caller-file-2.0.5"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."locate-path-5.0.0"
-          sources."p-locate-4.1.0"
-          sources."path-exists-4.0.0"
-          sources."require-main-filename-2.0.0"
-          sources."string-width-4.2.0"
-          sources."strip-ansi-6.0.0"
-          sources."wrap-ansi-6.2.0"
-          sources."yargs-parser-18.1.3"
-        ];
-      })
-      sources."yargs-parser-11.1.1"
+      sources."yargs-15.4.1"
+      sources."yargs-parser-18.1.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -91219,10 +92218,10 @@ in
   rollup = nodeEnv.buildNodePackage {
     name = "rollup";
     packageName = "rollup";
-    version = "2.32.0";
+    version = "2.33.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/rollup/-/rollup-2.32.0.tgz";
-      sha512 = "0FIG1jY88uhCP2yP4CfvtKEqPDRmsUwfY1kEOOM+DH/KOGATgaIFd/is1+fQOxsvh62ELzcFfKonwKWnHhrqmw==";
+      url = "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz";
+      sha512 = "uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==";
     };
     dependencies = [
       sources."fsevents-2.1.3"
@@ -91250,7 +92249,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@eslint/eslintrc-0.1.3"
+      sources."@eslint/eslintrc-0.2.1"
       sources."@rollup/plugin-commonjs-13.0.2"
       sources."@rollup/plugin-node-resolve-8.4.0"
       sources."@rollup/pluginutils-3.1.0"
@@ -91352,7 +92351,7 @@ in
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-7.11.0" // {
+      (sources."eslint-7.12.1" // {
         dependencies = [
           sources."eslint-visitor-keys-2.0.0"
           sources."semver-7.3.2"
@@ -91412,7 +92411,7 @@ in
         ];
       })
       sources."ignore-4.0.6"
-      sources."import-fresh-3.2.1"
+      sources."import-fresh-3.2.2"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -91450,7 +92449,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."mkdirp-0.5.5"
-      (sources."mocha-8.2.0" // {
+      (sources."mocha-8.2.1" // {
         dependencies = [
           sources."debug-4.2.0"
           sources."escape-string-regexp-4.0.0"
@@ -91501,7 +92500,7 @@ in
       sources."resolve-1.18.1"
       sources."resolve-from-4.0.0"
       sources."rimraf-2.6.3"
-      sources."rollup-2.32.0"
+      sources."rollup-2.33.1"
       sources."safe-buffer-5.2.1"
       sources."semver-6.3.0"
       sources."serialize-javascript-5.0.1"
@@ -91543,11 +92542,11 @@ in
       sources."uri-js-4.4.0"
       sources."url-join-1.1.0"
       sources."util-deprecate-1.0.2"
-      sources."v8-compile-cache-2.1.1"
+      sources."v8-compile-cache-2.2.0"
       (sources."vsce-1.81.1" // {
         dependencies = [
           sources."chalk-2.4.2"
-          sources."commander-6.1.0"
+          sources."commander-6.2.0"
           sources."semver-5.7.1"
         ];
       })
@@ -91555,7 +92554,7 @@ in
       sources."vscode-languageclient-7.0.0-next.9"
       sources."vscode-languageserver-protocol-3.16.0-next.7"
       sources."vscode-languageserver-types-3.16.0-next.3"
-      sources."vscode-test-1.4.0"
+      sources."vscode-test-1.4.1"
       sources."which-2.0.2"
       sources."which-module-2.0.0"
       (sources."wide-align-1.1.3" // {
@@ -91589,7 +92588,7 @@ in
       sources."yargs-parser-13.1.2"
       (sources."yargs-unparser-2.0.0" // {
         dependencies = [
-          sources."camelcase-6.1.0"
+          sources."camelcase-6.2.0"
           sources."decamelize-4.0.0"
         ];
       })
@@ -91618,7 +92617,7 @@ in
       sources."asynckit-0.4.0"
       sources."aws-sdk-1.18.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."buffer-crc32-0.2.1"
       sources."bytes-0.2.1"
@@ -91738,10 +92737,10 @@ in
   sass = nodeEnv.buildNodePackage {
     name = "sass";
     packageName = "sass";
-    version = "1.27.0";
+    version = "1.28.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sass/-/sass-1.27.0.tgz";
-      sha512 = "0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig==";
+      url = "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz";
+      sha512 = "9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A==";
     };
     dependencies = [
       sources."anymatch-3.1.1"
@@ -91803,7 +92802,7 @@ in
       sources."ansi-align-2.0.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
-      sources."arch-2.1.2"
+      sources."arch-2.2.0"
       sources."arg-2.0.0"
       sources."balanced-match-1.0.0"
       sources."boxen-1.3.0"
@@ -91897,10 +92896,10 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "2.8.0";
+    version = "2.10.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-2.8.0.tgz";
-      sha512 = "5yG+t5SHX4vxMmllLEj6DPkP0QTuMwmYfQw7mqq8H2WPr6MOUTuksskgNhljpgEASLAeZa5HdaRQq+s+/pq17w==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-2.10.0.tgz";
+      sha512 = "5q/8gJvOh3ssqskIw/UNLyXWWLEfJtvRiPK7qnOS71uvjz19mtL+a3XrowMNe/KINRXzzMWBGpGNwzcLEAhcZQ==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
@@ -91932,23 +92931,10 @@ in
         ];
       })
       sources."@serverless/component-metrics-1.0.8"
-      (sources."@serverless/components-3.2.4" // {
+      (sources."@serverless/components-3.3.0" // {
         dependencies = [
-          sources."@sindresorhus/is-3.1.2"
-          sources."@szmarczak/http-timer-4.0.5"
           sources."ansi-regex-5.0.0"
-          sources."cacheable-request-7.0.1"
-          sources."decompress-response-6.0.0"
-          sources."defer-to-connect-2.0.0"
-          sources."get-stream-5.2.0"
-          sources."got-11.7.0"
-          sources."json-buffer-3.0.1"
-          sources."keyv-4.0.3"
-          sources."lowercase-keys-2.0.0"
-          sources."mimic-response-3.1.0"
-          sources."p-cancelable-2.0.0"
           sources."ramda-0.27.1"
-          sources."responselike-2.0.0"
           sources."strip-ansi-6.0.0"
         ];
       })
@@ -91961,7 +92947,7 @@ in
       sources."@serverless/enterprise-plugin-4.1.1"
       sources."@serverless/event-mocks-1.1.1"
       sources."@serverless/platform-client-3.1.2"
-      sources."@serverless/platform-client-china-2.0.5"
+      sources."@serverless/platform-client-china-2.0.7"
       (sources."@serverless/platform-sdk-2.3.2" // {
         dependencies = [
           sources."chalk-2.4.2"
@@ -91974,13 +92960,13 @@ in
           sources."ws-6.2.1"
         ];
       })
-      sources."@serverless/template-1.1.3"
+      sources."@serverless/template-1.1.4"
       (sources."@serverless/utils-2.0.0" // {
         dependencies = [
           sources."write-file-atomic-3.0.3"
         ];
       })
-      sources."@serverless/utils-china-1.0.7"
+      sources."@serverless/utils-china-1.0.9"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@tencent-sdk/capi-1.1.5"
@@ -91988,9 +92974,9 @@ in
       sources."@types/caseless-0.12.2"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/lodash-4.14.162"
+      sources."@types/lodash-4.14.164"
       sources."@types/long-4.0.1"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/request-2.48.5"
       sources."@types/request-promise-native-1.0.17"
       sources."@types/responselike-1.0.0"
@@ -92047,14 +93033,15 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.774.0" // {
+      (sources."aws-sdk-2.784.0" // {
         dependencies = [
           sources."buffer-4.9.2"
+          sources."ieee754-1.1.13"
           sources."uuid-3.3.2"
         ];
       })
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."axios-0.19.2"
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
@@ -92097,7 +93084,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."buffer-5.6.0"
+      sources."buffer-5.7.0"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -92179,7 +93166,7 @@ in
         ];
       })
       sources."dashdash-1.14.1"
-      sources."dayjs-1.9.3"
+      sources."dayjs-1.9.4"
       sources."debug-3.1.0"
       sources."decode-uri-component-0.2.0"
       sources."decompress-4.2.1"
@@ -92277,7 +93264,7 @@ in
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-safe-stringify-2.0.7"
       sources."fastest-levenshtein-1.0.12"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."fd-slicer-1.1.0"
       sources."fecha-4.2.0"
       sources."figures-3.2.0"
@@ -92287,10 +93274,11 @@ in
       sources."filenamify-3.0.0"
       sources."filesize-6.1.0"
       sources."fill-range-7.0.1"
-      (sources."find-process-1.4.3" // {
+      (sources."find-process-1.4.4" // {
         dependencies = [
-          sources."chalk-2.4.2"
-          sources."debug-2.6.9"
+          sources."commander-5.1.0"
+          sources."debug-4.3.0"
+          sources."ms-2.1.2"
         ];
       })
       sources."find-requires-1.0.0"
@@ -92309,10 +93297,15 @@ in
       sources."fs-constants-1.0.0"
       (sources."fs-extra-9.0.1" // {
         dependencies = [
-          sources."jsonfile-6.0.1"
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.0"
+            ];
+          })
           sources."universalify-1.0.0"
         ];
       })
+      sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
       sources."fs2-0.3.8"
       sources."fsevents-2.1.3"
@@ -92329,7 +93322,22 @@ in
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."globby-11.0.1"
-      sources."got-9.6.0"
+      (sources."got-11.8.0" // {
+        dependencies = [
+          sources."@sindresorhus/is-4.0.0"
+          sources."@szmarczak/http-timer-4.0.5"
+          sources."cacheable-request-7.0.1"
+          sources."decompress-response-6.0.0"
+          sources."defer-to-connect-2.0.0"
+          sources."get-stream-5.2.0"
+          sources."json-buffer-3.0.1"
+          sources."keyv-4.0.3"
+          sources."lowercase-keys-2.0.0"
+          sources."mimic-response-3.1.0"
+          sources."p-cancelable-2.0.0"
+          sources."responselike-2.0.0"
+        ];
+      })
       sources."graceful-fs-4.2.4"
       sources."graphlib-2.1.8"
       sources."har-schema-2.0.0"
@@ -92349,13 +93357,13 @@ in
       sources."http2-wrapper-1.0.0-beta.5.2"
       (sources."https-proxy-agent-5.0.0" // {
         dependencies = [
-          sources."agent-base-6.0.1"
+          sources."agent-base-6.0.2"
           sources."debug-4.3.0"
           sources."ms-2.1.2"
         ];
       })
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."ignore-5.1.8"
       sources."immediate-3.0.6"
       sources."imurmurhash-0.1.4"
@@ -92371,7 +93379,7 @@ in
           sources."strip-ansi-6.0.0"
         ];
       })
-      sources."inquirer-autocomplete-prompt-1.2.0"
+      sources."inquirer-autocomplete-prompt-1.3.0"
       sources."into-stream-3.1.0"
       sources."is-arrayish-0.3.2"
       sources."is-binary-path-2.1.0"
@@ -92467,6 +93475,8 @@ in
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
+      sources."minipass-3.1.3"
+      sources."minizlib-2.1.2"
       sources."mkdirp-0.5.5"
       sources."moment-2.29.1"
       sources."ms-2.0.0"
@@ -92515,6 +93525,7 @@ in
       sources."p-try-2.2.0"
       (sources."package-json-6.5.0" // {
         dependencies = [
+          sources."got-9.6.0"
           sources."semver-6.3.0"
         ];
       })
@@ -92542,7 +93553,7 @@ in
       sources."promise-queue-2.2.5"
       (sources."protobufjs-6.10.1" // {
         dependencies = [
-          sources."@types/node-13.13.27"
+          sources."@types/node-13.13.30"
           sources."long-4.0.0"
         ];
       })
@@ -92576,7 +93587,7 @@ in
       sources."retry-0.10.1"
       sources."reusify-1.0.4"
       sources."run-async-2.4.1"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."rxjs-6.6.3"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
@@ -92587,7 +93598,7 @@ in
       sources."set-immediate-shim-1.0.1"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
-      sources."shortid-2.2.15"
+      sources."shortid-2.2.16"
       sources."signal-exit-3.0.3"
       sources."simple-concat-1.0.1"
       sources."simple-get-2.8.1"
@@ -92659,6 +93670,12 @@ in
           sources."untildify-3.0.3"
         ];
       })
+      (sources."tar-6.0.5" // {
+        dependencies = [
+          sources."chownr-2.0.0"
+          sources."mkdirp-1.0.4"
+        ];
+      })
       (sources."tar-fs-1.16.3" // {
         dependencies = [
           sources."pump-1.0.3"
@@ -92672,7 +93689,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."term-size-2.2.0"
+      sources."term-size-2.2.1"
       sources."text-hex-1.0.0"
       sources."through-2.3.8"
       sources."timed-out-4.0.1"
@@ -92733,6 +93750,7 @@ in
       sources."xmlbuilder-9.0.7"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."xtend-4.0.2"
+      sources."yallist-4.0.0"
       sources."yaml-ast-parser-0.0.43"
       sources."yamljs-0.3.0"
       sources."yargs-parser-20.2.3"
@@ -92770,7 +93788,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."base64-arraybuffer-0.1.2"
       sources."base64id-0.1.0"
       sources."bcrypt-nodejs-0.0.3"
@@ -93377,10 +94395,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.419.0";
+    version = "1.424.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.419.0.tgz";
-      sha512 = "IglViQz+KprJcHoY/ot42gBgX27OPlvm2enBbg/MaH7pgh4glA+h2Wyxc9y6Sxbh+NE3TgbSswimOIg+lEGhWg==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.424.0.tgz";
+      sha512 = "mL1uKYBTJND3EKMLaWDnS8n6ggJWwvur3Kz2tCj9cmF++G10FAHA8RyhBKc1jF41lSI0SZKMfh6MXTNvrzfx6g==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -93391,7 +94409,7 @@ in
       sources."@snyk/docker-registry-v2-client-1.13.6"
       sources."@snyk/gemfile-1.2.0"
       sources."@snyk/java-call-graph-builder-1.16.0"
-      sources."@snyk/rpm-parser-2.2.0"
+      sources."@snyk/rpm-parser-2.2.1"
       (sources."@snyk/snyk-cocoapods-plugin-2.5.1" // {
         dependencies = [
           sources."tslib-2.0.3"
@@ -93410,7 +94428,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/js-yaml-3.12.5"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/responselike-1.0.0"
       sources."@types/semver-5.5.0"
       sources."@yarnpkg/lockfile-1.1.0"
@@ -93461,7 +94479,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."browserify-zlib-0.1.4"
-      sources."buffer-5.6.0"
+      sources."buffer-5.7.0"
       sources."buffer-from-1.1.1"
       sources."bytes-3.1.0"
       sources."cacheable-lookup-5.0.3"
@@ -93593,7 +94611,7 @@ in
         ];
       })
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."immediate-3.0.6"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -93731,7 +94749,7 @@ in
           sources."pump-2.0.1"
         ];
       })
-      sources."pupa-2.0.1"
+      sources."pupa-2.1.1"
       sources."quick-lru-5.1.1"
       sources."raw-body-2.4.1"
       sources."rc-1.2.8"
@@ -93773,7 +94791,7 @@ in
           sources."tslib-2.0.3"
         ];
       })
-      (sources."snyk-docker-plugin-4.1.1" // {
+      (sources."snyk-docker-plugin-4.7.0" // {
         dependencies = [
           sources."rimraf-3.0.2"
           sources."snyk-nodejs-lockfile-parser-1.30.0"
@@ -93788,7 +94806,7 @@ in
           sources."tmp-0.2.1"
         ];
       })
-      (sources."snyk-gradle-plugin-3.10.0" // {
+      (sources."snyk-gradle-plugin-3.10.1" // {
         dependencies = [
           (sources."@snyk/cli-interface-2.9.1" // {
             dependencies = [
@@ -93828,6 +94846,16 @@ in
           sources."tslib-1.11.1"
         ];
       })
+      (sources."snyk-poetry-lockfile-parser-1.1.0" // {
+        dependencies = [
+          (sources."@snyk/dep-graph-1.20.0" // {
+            dependencies = [
+              sources."tslib-1.14.1"
+            ];
+          })
+          sources."tslib-2.0.3"
+        ];
+      })
       (sources."snyk-policy-1.14.1" // {
         dependencies = [
           sources."@types/node-6.14.13"
@@ -93839,7 +94867,7 @@ in
           })
         ];
       })
-      sources."snyk-python-plugin-1.17.1"
+      sources."snyk-python-plugin-1.18.0"
       (sources."snyk-resolve-1.0.1" // {
         dependencies = [
           sources."debug-3.2.6"
@@ -93911,7 +94939,7 @@ in
           sources."temp-dir-1.0.0"
         ];
       })
-      sources."term-size-2.2.0"
+      sources."term-size-2.2.1"
       sources."then-fs-2.0.0"
       sources."through-2.3.8"
       sources."through2-2.0.5"
@@ -94288,15 +95316,16 @@ in
       sources."brace-expansion-1.1.11"
       sources."braces-1.8.5"
       sources."broadcast-stream-0.2.2"
-      sources."buffer-5.6.0"
+      sources."buffer-5.7.0"
       sources."buffer-from-1.1.1"
       (sources."cache-base-1.0.1" // {
         dependencies = [
           sources."isobject-3.0.1"
         ];
       })
+      sources."call-bind-1.0.0"
       sources."camelcase-2.1.1"
-      sources."ccount-1.0.5"
+      sources."ccount-1.1.0"
       sources."chalk-1.1.3"
       sources."character-entities-1.2.4"
       sources."character-entities-html4-1.1.4"
@@ -94452,6 +95481,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.13"
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       sources."get-value-2.0.6"
       sources."glob-6.0.4"
       sources."glob-base-0.3.0"
@@ -94483,7 +95513,7 @@ in
       sources."heap-0.2.6"
       sources."hoox-0.0.1"
       sources."idb-kv-store-4.5.0"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."immediate-3.2.3"
       sources."increment-buffer-1.0.1"
       sources."inflight-1.0.6"
@@ -94547,7 +95577,7 @@ in
         ];
       })
       sources."is-typedarray-1.0.0"
-      sources."is-valid-domain-0.0.16"
+      sources."is-valid-domain-0.0.17"
       sources."is-weakmap-2.0.1"
       sources."is-weakset-2.0.1"
       sources."is-windows-1.0.2"
@@ -94662,7 +95692,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."object.omit-2.0.1"
       (sources."object.pick-1.3.0" // {
         dependencies = [
@@ -94894,7 +95924,7 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      sources."socks-2.4.4"
+      sources."socks-2.5.0"
       sources."sodium-browserify-1.3.0"
       (sources."sodium-browserify-tweetnacl-0.2.6" // {
         dependencies = [
@@ -94982,16 +96012,8 @@ in
       })
       sources."string-width-1.0.2"
       sources."string.prototype.trim-1.2.2"
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.2"
+      sources."string.prototype.trimstart-1.0.2"
       sources."string_decoder-1.1.1"
       sources."stringify-entities-1.3.2"
       sources."strip-ansi-3.0.1"
@@ -95019,7 +96041,7 @@ in
       sources."to-vfile-1.0.0"
       sources."trim-0.0.1"
       sources."trim-lines-1.1.3"
-      sources."trim-trailing-lines-1.1.3"
+      sources."trim-trailing-lines-1.1.4"
       sources."tweetnacl-0.14.5"
       sources."tweetnacl-auth-0.3.1"
       sources."typedarray-0.0.6"
@@ -95166,13 +96188,13 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.774.0" // {
+      (sources."aws-sdk-2.784.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
       })
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."babel-runtime-6.26.0"
       sources."babel-types-6.26.0"
       sources."babylon-6.18.0"
@@ -95953,6 +96975,7 @@ in
       sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
       sources."boolbase-1.0.0"
+      sources."call-bind-1.0.0"
       sources."chalk-2.4.2"
       sources."coa-2.0.2"
       sources."color-convert-1.9.3"
@@ -95961,10 +96984,10 @@ in
       sources."css-select-base-adapter-0.1.1"
       sources."css-tree-1.0.0-alpha.37"
       sources."css-what-3.4.2"
-      (sources."csso-4.0.3" // {
+      (sources."csso-4.1.0" // {
         dependencies = [
-          sources."css-tree-1.0.0-alpha.39"
-          sources."mdn-data-2.0.6"
+          sources."css-tree-1.0.0"
+          sources."mdn-data-2.0.12"
         ];
       })
       sources."define-properties-1.1.3"
@@ -95981,6 +97004,7 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.1"
@@ -95996,11 +97020,7 @@ in
       sources."nth-check-1.0.2"
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      (sources."object.assign-4.1.1" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."object.assign-4.1.2"
       sources."object.getownpropertydescriptors-2.1.0"
       sources."object.values-1.1.1"
       sources."q-1.5.1"
@@ -96008,8 +97028,16 @@ in
       sources."source-map-0.6.1"
       sources."sprintf-js-1.0.3"
       sources."stable-0.1.8"
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
+      (sources."string.prototype.trimend-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
+      (sources."string.prototype.trimstart-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."supports-color-5.5.0"
       sources."unquote-1.1.1"
       sources."util.promisify-1.0.1"
@@ -96596,7 +97624,7 @@ in
       sources."truncate-utf8-bytes-1.0.2"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.11.3"
+      sources."uglify-js-3.11.5"
       sources."undefsafe-2.0.3"
       (sources."union-value-1.0.1" // {
         dependencies = [
@@ -96660,7 +97688,7 @@ in
     src = fetchgit {
       url = "https://github.com/TediCross/TediCross.git";
       rev = "80ec2189cbda51eec9f3cd3f7f551b7a71474d38";
-      sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
+      sha256 = "1d3e9fb2a35f366e6fb4cf46699d21a58cbdde3b7a41130d0eb1aa1f4dceabb9";
     };
     dependencies = [
       sources."ajv-6.12.6"
@@ -96672,7 +97700,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       (sources."bcrypt-pbkdf-1.0.2" // {
         dependencies = [
           sources."tweetnacl-0.14.5"
@@ -96860,6 +97888,7 @@ in
       sources."boundary-1.0.1"
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
+      sources."call-bind-1.0.0"
       (sources."chalk-1.1.3" // {
         dependencies = [
           sources."strip-ansi-3.0.1"
@@ -96896,6 +97925,7 @@ in
       sources."format-0.2.2"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       sources."get-stdin-5.0.1"
       sources."glob-7.1.6"
       sources."graceful-fs-4.2.4"
@@ -96947,7 +97977,7 @@ in
       sources."object-inspect-1.8.0"
       sources."object-is-1.1.3"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."once-1.4.0"
       sources."optionator-0.8.3"
       sources."p-limit-1.3.0"
@@ -97005,16 +98035,8 @@ in
           sources."strip-ansi-3.0.1"
         ];
       })
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.2"
+      sources."string.prototype.trimstart-1.0.2"
       sources."string_decoder-1.1.1"
       (sources."strip-ansi-6.0.0" // {
         dependencies = [
@@ -97035,7 +98057,7 @@ in
       sources."text-table-0.2.0"
       sources."traverse-0.6.6"
       sources."trim-0.0.1"
-      sources."trim-trailing-lines-1.1.3"
+      sources."trim-trailing-lines-1.1.4"
       sources."trough-1.0.5"
       sources."try-resolve-1.0.1"
       sources."type-check-0.3.2"
@@ -97101,10 +98123,12 @@ in
       sha1 = "8d49dd02b3a7a88d7e6b32817f9e202c5c6596b9";
     };
     dependencies = [
+      sources."call-bind-1.0.0"
       sources."define-properties-1.1.3"
       sources."es-abstract-1.17.7"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       sources."has-1.0.3"
       sources."has-symbols-1.0.1"
       sources."is-callable-1.2.2"
@@ -97115,14 +98139,18 @@ in
       sources."match-index-1.0.3"
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      (sources."object.assign-4.1.1" // {
+      sources."object.assign-4.1.2"
+      sources."regexp.prototype.flags-1.3.0"
+      (sources."string.prototype.trimend-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
+      (sources."string.prototype.trimstart-1.0.2" // {
         dependencies = [
           sources."es-abstract-1.18.0-next.1"
         ];
       })
-      sources."regexp.prototype.flags-1.3.0"
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -97150,6 +98178,7 @@ in
       sources."@szmarczak/http-timer-1.1.2"
       sources."@textlint/ast-node-types-4.3.4"
       sources."@textlint/types-1.4.5"
+      sources."@types/hast-2.3.1"
       sources."@types/minimist-1.2.0"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse5-5.0.3"
@@ -97191,7 +98220,7 @@ in
       })
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."ccount-1.0.5"
+      sources."ccount-1.1.0"
       sources."chalk-2.4.2"
       sources."character-entities-1.2.4"
       sources."character-entities-html4-1.1.4"
@@ -97260,16 +98289,16 @@ in
       sources."has-flag-3.0.0"
       sources."has-yarn-2.1.0"
       sources."hast-util-embedded-1.0.5"
-      sources."hast-util-from-parse5-6.0.0"
+      sources."hast-util-from-parse5-6.0.1"
       sources."hast-util-has-property-1.0.4"
       sources."hast-util-is-body-ok-link-1.0.4"
       sources."hast-util-is-element-1.1.0"
-      sources."hast-util-parse-selector-2.2.4"
+      sources."hast-util-parse-selector-2.2.5"
       sources."hast-util-phrasing-1.0.5"
-      sources."hast-util-to-nlcst-1.2.7"
+      sources."hast-util-to-nlcst-1.2.8"
       sources."hast-util-to-string-1.0.4"
       sources."hast-util-whitespace-1.0.4"
-      sources."hastscript-5.1.2"
+      sources."hastscript-6.0.0"
       sources."hosted-git-info-2.8.8"
       sources."http-cache-semantics-4.1.0"
       sources."ignore-5.1.8"
@@ -97283,7 +98312,7 @@ in
       sources."is-alphanumeric-1.0.0"
       sources."is-alphanumerical-1.0.4"
       sources."is-arrayish-0.2.1"
-      sources."is-buffer-2.0.4"
+      sources."is-buffer-2.0.5"
       sources."is-ci-2.0.0"
       sources."is-core-module-2.0.0"
       sources."is-decimal-1.0.4"
@@ -97334,11 +98363,7 @@ in
       sources."markdown-table-2.0.0"
       sources."mdast-comment-marker-1.1.2"
       sources."mdast-util-compact-2.0.1"
-      (sources."mdast-util-to-nlcst-4.0.0" // {
-        dependencies = [
-          sources."vfile-location-3.1.0"
-        ];
-      })
+      sources."mdast-util-to-nlcst-4.0.1"
       sources."meow-7.1.1"
       sources."mimic-response-1.0.1"
       sources."min-indent-1.0.1"
@@ -97346,8 +98371,8 @@ in
       sources."minimist-1.2.5"
       sources."minimist-options-4.1.0"
       sources."ms-2.1.2"
-      sources."nlcst-is-literal-1.2.1"
-      sources."nlcst-normalize-2.1.4"
+      sources."nlcst-is-literal-1.2.2"
+      sources."nlcst-normalize-2.1.5"
       sources."nlcst-search-2.0.0"
       sources."nlcst-to-string-2.0.4"
       sources."normalize-package-data-2.5.0"
@@ -97378,7 +98403,7 @@ in
       sources."property-information-5.6.0"
       sources."pump-1.0.3"
       sources."pump-chain-1.0.0"
-      sources."pupa-2.0.1"
+      sources."pupa-2.1.1"
       sources."quick-lru-4.0.1"
       sources."quotation-1.1.3"
       sources."rc-1.2.8"
@@ -97401,11 +98426,7 @@ in
       sources."remark-frontmatter-2.0.0"
       sources."remark-mdx-2.0.0-next.8"
       sources."remark-message-control-6.0.0"
-      (sources."remark-parse-8.0.3" // {
-        dependencies = [
-          sources."vfile-location-3.1.0"
-        ];
-      })
+      sources."remark-parse-8.0.3"
       sources."remark-retext-4.0.0"
       sources."remark-stringify-8.1.1"
       sources."repeat-string-1.6.1"
@@ -97464,7 +98485,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."structured-source-3.0.2"
       sources."supports-color-5.5.0"
-      sources."term-size-2.2.0"
+      sources."term-size-2.2.1"
       (sources."textlint-rule-helper-2.1.1" // {
         dependencies = [
           sources."unist-util-is-3.0.0"
@@ -97483,7 +98504,7 @@ in
       sources."to-vfile-6.1.0"
       sources."trim-0.0.1"
       sources."trim-newlines-3.0.0"
-      sources."trim-trailing-lines-1.1.3"
+      sources."trim-trailing-lines-1.1.4"
       sources."trough-1.0.5"
       sources."type-fest-0.13.1"
       sources."typedarray-0.0.6"
@@ -97500,14 +98521,10 @@ in
           sources."is-plain-obj-2.1.0"
         ];
       })
-      (sources."unified-message-control-3.0.1" // {
-        dependencies = [
-          sources."vfile-location-3.1.0"
-        ];
-      })
+      sources."unified-message-control-3.0.1"
       sources."unique-string-2.0.0"
       sources."unist-util-inspect-5.0.1"
-      sources."unist-util-is-4.0.2"
+      sources."unist-util-is-4.0.3"
       sources."unist-util-modify-children-2.0.0"
       sources."unist-util-position-3.1.0"
       sources."unist-util-remove-position-2.0.1"
@@ -97530,7 +98547,7 @@ in
       sources."validate-npm-package-license-3.0.4"
       sources."vfile-4.2.0"
       sources."vfile-find-up-5.0.1"
-      sources."vfile-location-2.0.6"
+      sources."vfile-location-3.2.0"
       sources."vfile-message-2.0.4"
       (sources."vfile-reporter-6.0.1" // {
         dependencies = [
@@ -97691,11 +98708,13 @@ in
       sources."@textlint/types-1.4.5"
       sources."boundary-1.0.1"
       sources."buffer-from-1.1.1"
+      sources."call-bind-1.0.0"
       sources."concat-stream-2.0.0"
       sources."define-properties-1.1.3"
       sources."es-abstract-1.17.7"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       sources."has-1.0.3"
       sources."has-symbols-1.0.1"
       sources."inherits-2.0.4"
@@ -97707,17 +98726,21 @@ in
       sources."object-assign-4.1.1"
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      (sources."object.assign-4.1.1" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."object.assign-4.1.2"
       sources."object.values-1.1.1"
       sources."readable-stream-3.6.0"
       sources."safe-buffer-5.2.1"
       sources."sentence-splitter-3.2.0"
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
+      (sources."string.prototype.trimend-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
+      (sources."string.prototype.trimstart-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."string_decoder-1.3.0"
       sources."structured-source-3.0.2"
       sources."textlint-rule-helper-2.1.1"
@@ -97747,6 +98770,7 @@ in
     };
     dependencies = [
       sources."array.prototype.find-2.1.1"
+      sources."call-bind-1.0.0"
       sources."check-ends-with-period-1.0.1"
       sources."define-properties-1.1.3"
       sources."emoji-regex-6.5.1"
@@ -97754,6 +98778,7 @@ in
       sources."es-abstract-1.17.7"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       sources."has-1.0.3"
       sources."has-symbols-1.0.1"
       sources."is-callable-1.2.2"
@@ -97763,13 +98788,17 @@ in
       sources."is-symbol-1.0.3"
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      (sources."object.assign-4.1.1" // {
+      sources."object.assign-4.1.2"
+      (sources."string.prototype.trimend-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
+      (sources."string.prototype.trimstart-1.0.2" // {
         dependencies = [
           sources."es-abstract-1.18.0-next.1"
         ];
       })
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -97851,10 +98880,12 @@ in
     };
     dependencies = [
       sources."array-includes-3.1.1"
+      sources."call-bind-1.0.0"
       sources."define-properties-1.1.3"
       sources."es-abstract-1.17.7"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       sources."has-1.0.3"
       sources."has-symbols-1.0.1"
       sources."is-callable-1.2.2"
@@ -97866,13 +98897,17 @@ in
       sources."is-symbol-1.0.3"
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      (sources."object.assign-4.1.1" // {
+      sources."object.assign-4.1.2"
+      (sources."string.prototype.trimend-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
+      (sources."string.prototype.trimstart-1.0.2" // {
         dependencies = [
           sources."es-abstract-1.18.0-next.1"
         ];
       })
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -97897,33 +98932,17 @@ in
       sources."@textlint/types-1.4.5"
       sources."adverb-where-0.0.9"
       sources."boundary-1.0.1"
+      sources."call-bind-1.0.0"
       sources."define-properties-1.1.3"
       sources."e-prime-0.10.4"
-      sources."es-abstract-1.18.0-next.1"
-      sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.0.1"
       sources."has-1.0.3"
       sources."has-symbols-1.0.1"
-      sources."is-callable-1.2.2"
-      sources."is-date-object-1.0.2"
-      sources."is-negative-zero-2.0.0"
-      sources."is-regex-1.1.1"
-      sources."is-symbol-1.0.3"
       sources."no-cliches-0.1.1"
-      sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."passive-voice-0.1.0"
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
       sources."structured-source-3.0.2"
       sources."textlint-rule-helper-2.1.1"
       sources."too-wordy-0.1.6"
@@ -97959,13 +98978,13 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
       sources."accepts-1.3.7"
       sources."after-0.8.2"
-      (sources."agent-base-6.0.1" // {
+      (sources."agent-base-6.0.2" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."ms-2.1.2"
@@ -97991,7 +99010,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."backo2-1.0.2"
       sources."backoff-2.5.0"
       sources."balanced-match-1.0.0"
@@ -98137,7 +99156,7 @@ in
         ];
       })
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."ignore-walk-3.0.3"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
@@ -98393,10 +99412,10 @@ in
   three = nodeEnv.buildNodePackage {
     name = "three";
     packageName = "three";
-    version = "0.121.1";
+    version = "0.122.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/three/-/three-0.121.1.tgz";
-      sha512 = "+rYhNpW5W1aBdLkPQDld/GA4Sj/uOKJJKVpCAZUbpk/HZEiYRUlPt8+s+9nmxRglWmRHdBa3ERvUwqg4nmoA5w==";
+      url = "https://registry.npmjs.org/three/-/three-0.122.0.tgz";
+      sha512 = "bgYMo0WdaQhf7DhLE8OSNN/rVFO5J4K1A2VeeKqoV4MjjuHjfCP6xLpg8Xedhns7NlEnN3sZ6VJROq19Qyl6Sg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -98429,13 +99448,12 @@ in
   titanium = nodeEnv.buildNodePackage {
     name = "titanium";
     packageName = "titanium";
-    version = "5.2.5";
+    version = "5.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/titanium/-/titanium-5.2.5.tgz";
-      sha512 = "P2+0coxeYre+1Lf/k2t61W1UwcNhupQy5s5UcpDkbGiRg7EDoYVnkix1H08yg+mfKh14Jm9+6QDDKpEWM+arZQ==";
+      url = "https://registry.npmjs.org/titanium/-/titanium-5.3.0.tgz";
+      sha512 = "j+Bk1jWH4Ki/7hfizhG6MvaZMEeHNdaJnzjC50CUJThfDkxr8nN1rn7smaX9Wg5W1iiBeBQyJreTExZloTRCJw==";
     };
     dependencies = [
-      sources."adm-zip-0.4.13"
       sources."ajv-6.12.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
@@ -98443,13 +99461,13 @@ in
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."buffer-crc32-0.2.13"
       sources."caseless-0.12.0"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
@@ -98487,18 +99505,20 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-6.0.1"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
       sources."jsprim-1.4.1"
       sources."keypress-0.2.1"
       sources."lodash-4.17.20"
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
       sources."minimatch-3.0.4"
-      sources."moment-2.29.1"
       (sources."node-appc-1.1.2" // {
         dependencies = [
           sources."async-3.2.0"
-          sources."colors-1.4.0"
         ];
       })
       sources."oauth-sign-0.9.0"
@@ -98506,11 +99526,10 @@ in
       sources."path-is-absolute-1.0.1"
       sources."pend-1.2.0"
       sources."performance-now-2.1.0"
-      sources."pkginfo-0.3.1"
       sources."psl-1.8.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      (sources."request-2.88.0" // {
+      (sources."request-2.88.2" // {
         dependencies = [
           sources."uuid-3.4.0"
         ];
@@ -98522,19 +99541,15 @@ in
       sources."sprintf-0.1.5"
       sources."sshpk-1.16.1"
       sources."stack-trace-0.0.10"
-      sources."temp-0.9.0"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."temp-0.9.1"
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."universalify-1.0.0"
       sources."uri-js-4.4.0"
       sources."uuid-8.3.1"
       sources."verror-1.10.0"
-      (sources."winston-1.1.2" // {
+      (sources."winston-2.4.5" // {
         dependencies = [
           sources."async-1.0.0"
           sources."colors-1.0.3"
@@ -98827,10 +99842,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "4.0.3";
+    version = "4.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz";
-      sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==";
+      url = "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz";
+      sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -98881,10 +99896,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.11.3";
+    version = "3.11.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.3.tgz";
-      sha512 = "wDRziHG94mNj2n3R864CvYw/+pc9y/RNImiTyrrf8BzgWn75JgFSwYvXrtZQMnMnOp/4UTrf3iCSQxSStPiByA==";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz";
+      sha512 = "btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -98917,17 +99932,17 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.5.11";
+    version = "1.5.13";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.5.11.tgz";
-      sha512 = "oCpdK5T7N2skQCfZ7i/PEjuB3kRqQYYA/PXyN63jsoo0Vh6iSo/3w4GOt3e8s5XXw8YzuMlExKd1fsDXiUF47g==";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.5.13.tgz";
+      sha512 = "m+NczxQwrfo5Jle+QvgToZZAmgoiJoKGc0UT0e9YHQx288DBfNnrDUpaNBZB+L6i0NMqkp8c/CHAFaVpJS0v7Q==";
     };
     dependencies = [
       sources."@dabh/diagnostics-2.0.2"
       sources."@primer/octicons-11.0.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."after-0.8.2"
@@ -98987,7 +100002,7 @@ in
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."diff-4.0.2"
-      sources."diff2html-3.1.14"
+      sources."diff2html-3.1.15"
       sources."dnd-page-scroll-0.0.4"
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
@@ -99032,7 +100047,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."get-caller-file-2.0.5"
       sources."get-stream-4.1.0"
-      sources."getmac-5.16.0"
+      sources."getmac-5.17.0"
       sources."glob-7.1.6"
       sources."got-9.6.0"
       sources."has-binary2-1.0.3"
@@ -99061,7 +100076,7 @@ in
       sources."jquery-3.5.1"
       sources."jquery-ui-1.12.1"
       sources."json-buffer-3.0.0"
-      sources."just-detect-adblock-1.0.0"
+      sources."just-detect-adblock-1.1.0"
       sources."keyv-3.1.0"
       sources."knockout-3.5.1"
       sources."kuler-2.0.0"
@@ -99076,9 +100091,10 @@ in
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.5"
       sources."media-typer-0.3.0"
-      (sources."memorystore-1.6.2" // {
+      (sources."memorystore-1.6.4" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.3.0"
+          sources."ms-2.1.2"
         ];
       })
       sources."merge-descriptors-1.0.1"
@@ -99090,7 +100106,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."mkdirp-1.0.4"
-      sources."moment-2.28.0"
+      sources."moment-2.29.1"
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
       sources."node-cache-5.1.2"
@@ -99103,7 +100119,7 @@ in
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."one-time-1.0.0"
-      sources."open-7.2.1"
+      sources."open-7.3.0"
       sources."p-cancelable-1.1.0"
       (sources."package-json-6.5.0" // {
         dependencies = [
@@ -99186,8 +100202,9 @@ in
       })
       sources."strip-ansi-6.0.0"
       sources."strip-json-comments-2.0.1"
-      (sources."temp-0.9.1" // {
+      (sources."temp-0.9.2" // {
         dependencies = [
+          sources."mkdirp-0.5.5"
           sources."rimraf-2.6.3"
         ];
       })
@@ -99215,9 +100232,9 @@ in
       sources."wrappy-1.0.2"
       sources."ws-7.3.1"
       sources."xmlhttprequest-ssl-1.5.5"
-      sources."y18n-5.0.4"
+      sources."y18n-5.0.5"
       sources."yallist-2.1.2"
-      sources."yargs-16.0.3"
+      sources."yargs-16.1.0"
       sources."yargs-parser-20.2.3"
       sources."yeast-0.1.2"
     ];
@@ -99392,7 +100409,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."y18n-5.0.4"
+      sources."y18n-5.0.5"
       sources."yallist-3.1.1"
       (sources."yargs-16.1.0" // {
         dependencies = [
@@ -99447,7 +100464,7 @@ in
       sources."vega-expression-3.0.0"
       sources."vega-util-1.16.0"
       sources."wrap-ansi-7.0.0"
-      sources."y18n-5.0.4"
+      sources."y18n-5.0.5"
       sources."yargs-16.0.3"
       sources."yargs-parser-20.2.3"
     ];
@@ -99567,7 +100584,7 @@ in
           sources."vscode-nls-4.1.2"
         ];
       })
-      (sources."vscode-json-languageservice-3.9.1" // {
+      (sources."vscode-json-languageservice-3.10.0" // {
         dependencies = [
           sources."jsonc-parser-2.3.1"
           sources."vscode-nls-5.0.0"
@@ -99604,7 +100621,7 @@ in
     dependencies = [
       sources."@types/json5-0.0.30"
       sources."@types/mocha-7.0.2"
-      sources."@types/node-8.10.65"
+      sources."@types/node-8.10.66"
       sources."@types/vscode-1.50.0"
       sources."@types/yauzl-2.9.1"
       sources."@webassemblyjs/ast-1.9.0"
@@ -99704,6 +100721,7 @@ in
         ];
       })
       sources."cache-base-1.0.1"
+      sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
       (sources."chalk-2.4.2" // {
         dependencies = [
@@ -99743,7 +100761,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."commander-6.1.0"
+      sources."commander-6.2.0"
       sources."commondir-1.0.1"
       sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
@@ -99810,8 +100828,7 @@ in
       sources."errno-0.1.7"
       (sources."es-abstract-1.17.7" // {
         dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-          sources."object.assign-4.1.1"
+          sources."object.assign-4.1.2"
         ];
       })
       sources."es-to-primitive-1.2.1"
@@ -99901,6 +100918,7 @@ in
       sources."fsevents-2.1.3"
       sources."function-bind-1.1.1"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.0.1"
       sources."get-value-2.0.6"
       sources."glob-7.1.3"
       sources."glob-parent-5.1.1"
@@ -99946,7 +100964,7 @@ in
         ];
       })
       sources."https-browserify-1.0.0"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."iferr-0.1.5"
       sources."import-local-2.0.0"
       sources."imurmurhash-0.1.4"
@@ -99957,7 +100975,7 @@ in
       sources."interpret-1.4.0"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-binary-path-2.1.0"
-      sources."is-buffer-2.0.4"
+      sources."is-buffer-2.0.5"
       sources."is-callable-1.2.2"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
@@ -100241,8 +101259,18 @@ in
       sources."stream-shift-1.0.1"
       sources."string-argv-0.3.1"
       sources."string-width-2.1.1"
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
+      (sources."string.prototype.trimend-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+          sources."object.assign-4.1.2"
+        ];
+      })
+      (sources."string.prototype.trimstart-1.0.2" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+          sources."object.assign-4.1.2"
+        ];
+      })
       sources."string_decoder-0.10.31"
       sources."strip-ansi-4.0.0"
       sources."strip-json-comments-2.0.1"
@@ -100261,7 +101289,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."timers-browserify-2.0.11"
+      sources."timers-browserify-2.0.12"
       sources."tmp-0.0.29"
       sources."to-arraybuffer-1.0.1"
       (sources."to-object-path-0.3.0" // {
@@ -100315,7 +101343,7 @@ in
         ];
       })
       sources."util-deprecate-1.0.2"
-      sources."v8-compile-cache-2.1.1"
+      sources."v8-compile-cache-2.2.0"
       sources."vm-browserify-1.1.2"
       sources."vsce-1.81.1"
       sources."vscode-debugadapter-testsupport-1.42.0"
@@ -100442,14 +101470,14 @@ in
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bl-1.2.3"
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.6.0"
+      sources."buffer-5.7.0"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -100540,7 +101568,7 @@ in
       sources."has-to-string-tag-x-1.4.1"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
@@ -100669,7 +101697,7 @@ in
       sources."tslib-1.14.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uglify-js-3.11.3"
+      sources."uglify-js-3.11.5"
       sources."uid-0.0.2"
       sources."unbzip2-stream-1.4.3"
       sources."unyield-0.0.1"
@@ -100728,7 +101756,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -100815,7 +101843,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-4.1.0"
       sources."camelcase-keys-4.2.0"
-      sources."ccount-1.0.5"
+      sources."ccount-1.1.0"
       sources."chalk-2.4.2"
       sources."character-entities-1.2.4"
       sources."character-entities-html4-1.1.4"
@@ -101003,7 +102031,7 @@ in
       sources."format-0.2.2"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.2.0"
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       sources."get-caller-file-1.0.3"
@@ -101045,7 +102073,7 @@ in
       sources."hast-util-has-property-1.0.4"
       sources."hast-util-is-body-ok-link-1.0.4"
       sources."hast-util-is-element-1.1.0"
-      sources."hast-util-parse-selector-2.2.4"
+      sources."hast-util-parse-selector-2.2.5"
       sources."hast-util-to-string-1.0.4"
       sources."hast-util-whitespace-1.0.4"
       sources."hosted-git-info-2.8.8"
@@ -101054,7 +102082,7 @@ in
       sources."http-cache-semantics-4.1.0"
       sources."iconv-lite-0.4.24"
       sources."ignore-3.3.10"
-      (sources."import-fresh-3.2.1" // {
+      (sources."import-fresh-3.2.2" // {
         dependencies = [
           sources."resolve-from-4.0.0"
         ];
@@ -101077,7 +102105,7 @@ in
       sources."is-alphanumerical-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-2.1.0"
-      sources."is-buffer-2.0.4"
+      sources."is-buffer-2.0.5"
       sources."is-ci-2.0.0"
       sources."is-core-module-2.0.0"
       sources."is-data-descriptor-1.0.0"
@@ -101511,7 +102539,7 @@ in
       sources."to-vfile-6.1.0"
       sources."trim-0.0.1"
       sources."trim-newlines-2.0.0"
-      sources."trim-trailing-lines-1.1.3"
+      sources."trim-trailing-lines-1.1.4"
       sources."trough-1.0.5"
       sources."tslib-1.14.1"
       sources."tslint-5.20.1"
@@ -101692,7 +102720,7 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."JSONSelect-0.2.1"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
@@ -101740,7 +102768,7 @@ in
       sources."atob-2.1.2"
       sources."atomic-sleep-1.0.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -101768,7 +102796,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."buffer-5.6.0"
+      sources."buffer-5.7.0"
       sources."buffer-crc32-0.2.13"
       sources."buffer-equal-constant-time-1.0.1"
       sources."buffer-from-1.1.1"
@@ -101783,6 +102811,7 @@ in
           sources."lowercase-keys-2.0.0"
         ];
       })
+      sources."call-bind-1.0.0"
       sources."callsites-3.1.0"
       sources."camelcase-6.0.0"
       sources."caseless-0.12.0"
@@ -101938,7 +102967,7 @@ in
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."event-to-promise-0.8.0"
-      sources."execa-4.0.3"
+      sources."execa-4.1.0"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -102003,7 +103032,11 @@ in
       sources."fs-constants-1.0.0"
       (sources."fs-extra-9.0.1" // {
         dependencies = [
-          sources."jsonfile-6.0.1"
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.0"
+            ];
+          })
           sources."universalify-1.0.0"
         ];
       })
@@ -102019,6 +103052,7 @@ in
         ];
       })
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.0.1"
       sources."get-stream-5.2.0"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
@@ -102059,7 +103093,7 @@ in
       sources."http-cache-semantics-4.1.0"
       sources."http-signature-1.2.0"
       sources."human-signals-1.1.1"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."ignore-4.0.6"
       sources."import-fresh-3.2.1"
       sources."import-lazy-2.1.0"
@@ -102221,7 +103255,7 @@ in
       })
       sources."mz-2.7.0"
       sources."nan-2.14.2"
-      sources."nanoid-3.1.12"
+      sources."nanoid-3.1.16"
       sources."nanomatch-1.2.13"
       sources."natural-compare-1.4.0"
       sources."natural-compare-lite-1.4.0"
@@ -102261,7 +103295,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       (sources."object.pick-1.3.0" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -102312,7 +103346,7 @@ in
       sources."psl-1.8.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
-      sources."pupa-2.0.1"
+      sources."pupa-2.1.1"
       sources."qs-6.5.2"
       sources."quick-format-unescaped-4.0.1"
       (sources."rc-1.2.8" // {
@@ -102455,16 +103489,8 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.2"
+      sources."string.prototype.trimstart-1.0.2"
       sources."string_decoder-1.3.0"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-4.0.0"
@@ -102479,7 +103505,7 @@ in
       sources."supports-color-7.2.0"
       sources."table-5.4.6"
       sources."tar-stream-2.1.4"
-      sources."term-size-2.2.0"
+      sources."term-size-2.2.1"
       sources."text-table-0.2.0"
       sources."thenify-3.3.1"
       sources."thenify-all-1.6.0"
@@ -102530,7 +103556,7 @@ in
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
-      sources."v8-compile-cache-2.1.1"
+      sources."v8-compile-cache-2.2.0"
       sources."verror-1.10.0"
       sources."watchpack-1.7.4"
       (sources."watchpack-chokidar2-2.0.0" // {
@@ -102632,17 +103658,17 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "5.1.3";
+    version = "5.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.1.3.tgz";
-      sha512 = "bNBF5EOpt5a6NeCBFu0+8KJtG61cVmOb2b/a5tPNRLz3OWgDpHMbmnDkaSm3nf/UQ6ufw4PWYGVsVOAi8UfL2A==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-5.4.0.tgz";
+      sha512 = "udpYTyqz8toTTdaOsL2QKPLeZLt2IEm9qY7yTXuFEQhKu5bk0yQD9BtAdVQksmz4jFbbWOiWmm3NHarO0zr/ng==";
     };
     dependencies = [
       sources."@types/eslint-7.2.4"
       sources."@types/eslint-scope-3.7.0"
       sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
       sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -102666,13 +103692,13 @@ in
       sources."acorn-8.0.4"
       sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
-      sources."browserslist-4.14.5"
+      sources."browserslist-4.14.6"
       sources."buffer-from-1.1.1"
-      sources."caniuse-lite-1.0.30001148"
+      sources."caniuse-lite-1.0.30001154"
       sources."chrome-trace-event-1.0.2"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.582"
-      sources."enhanced-resolve-5.3.0"
+      sources."electron-to-chromium-1.3.586"
+      sources."enhanced-resolve-5.3.1"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"
       (sources."esrecurse-4.3.0" // {
@@ -102688,7 +103714,7 @@ in
       sources."glob-to-regexp-0.4.1"
       sources."graceful-fs-4.2.4"
       sources."has-flag-4.0.0"
-      sources."jest-worker-26.5.0"
+      sources."jest-worker-26.6.2"
       sources."json-parse-better-errors-1.0.2"
       sources."json-schema-traverse-0.4.1"
       sources."loader-runner-4.1.0"
@@ -102697,7 +103723,7 @@ in
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
       sources."neo-async-2.6.2"
-      sources."node-releases-1.1.64"
+      sources."node-releases-1.1.65"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
@@ -102713,20 +103739,20 @@ in
       sources."source-map-support-0.5.19"
       sources."supports-color-7.2.0"
       sources."tapable-2.0.0"
-      (sources."terser-5.3.7" // {
+      (sources."terser-5.3.8" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
       })
-      (sources."terser-webpack-plugin-5.0.0" // {
+      (sources."terser-webpack-plugin-5.0.3" // {
         dependencies = [
           sources."p-limit-3.0.2"
         ];
       })
       sources."tslib-1.14.1"
       sources."uri-js-4.4.0"
-      sources."watchpack-2.0.0"
-      sources."webpack-sources-2.0.1"
+      sources."watchpack-2.0.1"
+      sources."webpack-sources-2.2.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -102758,14 +103784,14 @@ in
       sources."color-name-1.1.3"
       sources."colorette-1.2.1"
       sources."command-line-usage-6.1.0"
-      sources."commander-6.1.0"
+      sources."commander-6.2.0"
       sources."cross-spawn-7.0.3"
       sources."deep-extend-0.6.0"
       sources."end-of-stream-1.4.4"
       sources."enquirer-2.3.6"
       sources."envinfo-7.7.3"
       sources."escape-string-regexp-1.0.5"
-      sources."execa-4.0.3"
+      sources."execa-4.1.0"
       sources."find-up-4.1.0"
       sources."function-bind-1.1.1"
       sources."get-stream-5.2.0"
@@ -102805,7 +103831,7 @@ in
       sources."table-layout-1.0.1"
       sources."type-fest-0.11.0"
       sources."typical-5.2.0"
-      sources."v8-compile-cache-2.1.1"
+      sources."v8-compile-cache-2.2.0"
       sources."webpack-merge-4.2.2"
       sources."which-2.0.2"
       sources."wordwrapjs-4.0.0"
@@ -102832,7 +103858,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
       sources."ajv-errors-1.0.1"
@@ -102884,6 +103910,7 @@ in
       sources."buffer-indexof-1.1.1"
       sources."bytes-3.0.0"
       sources."cache-base-1.0.1"
+      sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
       sources."chokidar-2.1.8"
       (sources."class-utils-0.3.6" // {
@@ -103027,6 +104054,7 @@ in
       sources."fsevents-1.2.13"
       sources."function-bind-1.1.1"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.0.1"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.6"
@@ -103150,7 +104178,7 @@ in
       sources."object-is-1.1.3"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.1"
+      sources."object.assign-4.1.2"
       sources."object.pick-1.3.0"
       sources."obuf-1.1.2"
       sources."on-finished-2.3.0"
@@ -103330,16 +104358,8 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      (sources."string.prototype.trimend-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.2"
+      sources."string.prototype.trimstart-1.0.2"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -103424,10 +104444,10 @@ in
   copy-webpack-plugin = nodeEnv.buildNodePackage {
     name = "copy-webpack-plugin";
     packageName = "copy-webpack-plugin";
-    version = "6.2.1";
+    version = "6.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.2.1.tgz";
-      sha512 = "VH2ZTMIBsx4p++Lmpg77adZ0KUyM5gFR/9cuTrbneNnJlcQXUFvsNariPqq2dq2kV3F2skHiDGPQCyKWy1+U0Q==";
+      url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.0.tgz";
+      sha512 = "kQ2cGGQLO6Ov2fe7rEGVxObI17dPeFkv8bRGnUAGZehOcrrObyAR9yWYlFGlJsyWM4EeuC/ytQNQkXxjYotMzg==";
     };
     dependencies = [
       sources."@nodelib/fs.scandir-2.1.3"
@@ -103453,7 +104473,7 @@ in
       sources."fast-deep-equal-3.1.3"
       sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."fill-range-7.0.1"
       sources."find-cache-dir-3.3.1"
       sources."find-up-4.1.0"
@@ -103507,7 +104527,7 @@ in
       sources."randombytes-2.1.0"
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."safe-buffer-5.2.1"
       sources."schema-utils-3.0.0"
       sources."semver-6.3.0"
@@ -103555,11 +104575,12 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.27"
+      sources."@types/node-13.13.30"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
       sources."balanced-match-1.0.0"
       sources."bencode-2.0.1"
+      sources."bep53-range-1.0.0"
       sources."binary-search-1.3.6"
       sources."bitfield-3.0.0"
       (sources."bittorrent-dht-10.0.0" // {
@@ -103569,7 +104590,7 @@ in
         ];
       })
       sources."bittorrent-peerid-1.3.3"
-      (sources."bittorrent-protocol-3.1.1" // {
+      (sources."bittorrent-protocol-3.1.2" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."ms-2.1.2"
@@ -103584,7 +104605,7 @@ in
           sources."simple-get-4.0.0"
         ];
       })
-      sources."blob-to-buffer-1.2.8"
+      sources."blob-to-buffer-1.2.9"
       sources."block-stream2-2.0.0"
       sources."bn.js-5.1.3"
       sources."brace-expansion-1.1.11"
@@ -103594,7 +104615,7 @@ in
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
-      sources."bufferutil-4.0.1"
+      sources."bufferutil-4.0.2"
       (sources."castv2-0.1.10" // {
         dependencies = [
           sources."debug-4.3.0"
@@ -103603,7 +104624,7 @@ in
       })
       sources."castv2-client-1.2.0"
       sources."charset-1.0.1"
-      sources."chrome-dgram-3.0.5"
+      sources."chrome-dgram-3.0.6"
       sources."chrome-dns-1.0.1"
       sources."chrome-net-3.3.4"
       (sources."chromecasts-1.9.1" // {
@@ -103638,6 +104659,7 @@ in
       sources."ee-first-1.1.1"
       sources."elementtree-0.1.7"
       sources."end-of-stream-1.4.1"
+      sources."err-code-2.0.3"
       sources."escape-html-1.0.3"
       sources."executable-4.1.1"
       sources."filestream-5.0.0"
@@ -103654,7 +104676,7 @@ in
       sources."he-1.2.0"
       sources."http-node-git://github.com/feross/http-node#webtorrent"
       sources."http-parser-js-0.4.13"
-      sources."immediate-chunk-store-2.1.0"
+      sources."immediate-chunk-store-2.1.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ip-1.1.5"
@@ -103671,19 +104693,19 @@ in
       sources."k-rpc-5.1.0"
       sources."k-rpc-socket-1.11.1"
       sources."last-one-wins-1.0.4"
-      (sources."load-ip-set-2.1.0" // {
+      (sources."load-ip-set-2.1.1" // {
         dependencies = [
-          sources."decompress-response-4.2.1"
-          sources."mimic-response-2.1.0"
-          sources."simple-get-3.1.0"
+          sources."decompress-response-6.0.0"
+          sources."mimic-response-3.1.0"
+          sources."simple-get-4.0.0"
         ];
       })
       sources."long-4.0.0"
       sources."lru-3.1.0"
-      sources."magnet-uri-5.3.0"
+      sources."magnet-uri-5.4.0"
       sources."mdns-js-0.5.0"
       sources."mdns-js-packet-0.2.0"
-      sources."mediasource-2.3.0"
+      sources."mediasource-2.4.0"
       sources."memory-chunk-store-1.3.0"
       sources."mime-2.4.6"
       sources."mimic-response-1.0.1"
@@ -103699,18 +104721,18 @@ in
           sources."thunky-1.1.0"
         ];
       })
-      sources."multistream-4.0.0"
+      sources."multistream-4.0.1"
+      sources."napi-macros-2.0.0"
       sources."netmask-1.0.6"
       sources."network-address-1.1.2"
       sources."next-event-1.0.0"
-      sources."node-gyp-build-3.7.0"
+      sources."node-gyp-build-4.2.3"
       sources."node-ssdp-2.9.1"
       sources."nodebmc-0.0.7"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."open-7.3.0"
       sources."package-json-versionify-1.0.4"
-      sources."parse-numeric-range-1.2.0"
       (sources."parse-torrent-7.1.3" // {
         dependencies = [
           sources."decompress-response-4.2.1"
@@ -103731,7 +104753,7 @@ in
       sources."protobufjs-6.10.1"
       sources."pump-3.0.0"
       sources."qap-3.3.1"
-      sources."queue-microtask-1.1.4"
+      sources."queue-microtask-1.2.0"
       sources."random-access-file-2.1.4"
       sources."random-access-storage-1.4.1"
       sources."random-iterate-1.0.1"
@@ -103747,16 +104769,16 @@ in
         ];
       })
       sources."rimraf-3.0.2"
-      sources."run-parallel-1.1.9"
-      sources."run-parallel-limit-1.0.5"
-      sources."run-series-1.1.8"
+      sources."run-parallel-1.1.10"
+      sources."run-parallel-limit-1.0.6"
+      sources."run-series-1.1.9"
       sources."rusha-0.8.13"
       sources."safe-buffer-5.2.1"
       sources."sax-1.1.4"
       sources."semver-5.1.1"
       sources."simple-concat-1.0.1"
       sources."simple-get-2.8.1"
-      (sources."simple-peer-9.7.2" // {
+      (sources."simple-peer-9.8.0" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."ms-2.1.2"
@@ -103783,6 +104805,7 @@ in
       sources."thirty-two-1.0.2"
       sources."through-2.3.8"
       sources."thunky-0.1.0"
+      sources."timeout-refresh-1.0.3"
       sources."to-arraybuffer-1.0.1"
       (sources."torrent-discovery-9.3.0" // {
         dependencies = [
@@ -103795,6 +104818,7 @@ in
       sources."typedarray-to-buffer-3.1.5"
       sources."uint64be-2.0.2"
       sources."unordered-array-remove-1.0.2"
+      sources."unordered-set-2.0.1"
       sources."upnp-device-client-1.0.2"
       sources."upnp-mediarenderer-client-1.4.0"
       sources."url-join-4.0.1"
@@ -103805,17 +104829,21 @@ in
         ];
       })
       sources."ut_pex-2.0.1"
-      sources."utf-8-validate-5.0.2"
+      sources."utf-8-validate-5.0.3"
       sources."util-deprecate-1.0.2"
+      sources."utp-native-2.2.1"
       sources."videostream-3.2.1"
       sources."vlc-command-1.2.0"
-      (sources."webtorrent-0.108.6" // {
+      (sources."webtorrent-0.110.1" // {
         dependencies = [
           sources."debug-4.3.0"
-          sources."decompress-response-4.2.1"
-          sources."mimic-response-2.1.0"
+          sources."decompress-response-6.0.0"
+          sources."get-stdin-8.0.0"
+          sources."magnet-uri-6.0.0"
+          sources."mimic-response-3.1.0"
           sources."ms-2.1.2"
-          sources."simple-get-3.1.0"
+          sources."parse-torrent-9.0.0"
+          sources."simple-get-4.0.0"
         ];
       })
       sources."winreg-1.2.4"
@@ -103883,10 +104911,10 @@ in
   yaml-language-server = nodeEnv.buildNodePackage {
     name = "yaml-language-server";
     packageName = "yaml-language-server";
-    version = "0.11.1";
+    version = "0.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.11.1.tgz";
-      sha512 = "N3Tu3g4O6ZWV7W0LVsNk62DtKJDQkbnPZRDd7ntaAeEl8QkxL1vnMunI26uzDU4PwwG4tPJ8g/VRS6U+fVp/6A==";
+      url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.12.0.tgz";
+      sha512 = "EAr9fJi05wVWsFVgc4s0AI74nT6D2oN7xcy7W+7JCkvirbm0L7aPDRAjSz6z/dXVyYyFlEAgRWVThXzqguFyTw==";
     };
     dependencies = [
       sources."agent-base-4.3.0"
@@ -103900,10 +104928,9 @@ in
       sources."js-yaml-3.14.0"
       sources."jsonc-parser-2.3.1"
       sources."ms-2.0.0"
-      sources."prettier-2.0.5"
       sources."request-light-0.2.5"
       sources."sprintf-js-1.0.3"
-      (sources."vscode-json-languageservice-3.9.1" // {
+      (sources."vscode-json-languageservice-3.10.0" // {
         dependencies = [
           sources."vscode-languageserver-types-3.16.0-next.2"
           sources."vscode-nls-5.0.0"
@@ -103924,12 +104951,11 @@ in
       sources."vscode-languageserver-types-3.15.1"
       sources."vscode-nls-4.1.2"
       sources."vscode-uri-2.1.2"
-      sources."yaml-ast-parser-custom-tags-0.0.43"
+      sources."yaml-language-server-parser-0.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "YAML language server";
-      homepage = "https://github.com/redhat-developer/yaml-language-server#readme";
       license = "MIT";
     };
     production = true;
@@ -103966,13 +104992,13 @@ in
       sources."@babel/code-frame-7.10.4"
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/runtime-7.12.1"
+      sources."@babel/runtime-7.12.5"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@sindresorhus/is-0.7.0"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.0"
+      sources."@types/node-14.14.6"
       sources."@types/normalize-package-data-2.4.0"
       sources."JSONStream-1.3.5"
       sources."aggregate-error-3.1.0"
@@ -104000,10 +105026,10 @@ in
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       (sources."axios-0.18.1" // {
         dependencies = [
-          sources."is-buffer-2.0.4"
+          sources."is-buffer-2.0.5"
         ];
       })
       sources."balanced-match-1.0.0"
@@ -104020,7 +105046,7 @@ in
       })
       sources."bin-version-check-3.0.0"
       sources."binaryextensions-2.3.0"
-      sources."boolean-3.0.1"
+      sources."boolean-3.0.2"
       (sources."boxen-1.3.0" // {
         dependencies = [
           sources."camelcase-4.1.0"
@@ -104820,7 +105846,7 @@ in
           sources."color-name-1.1.4"
           sources."cross-spawn-7.0.3"
           sources."debug-3.2.6"
-          sources."execa-4.0.3"
+          sources."execa-4.1.0"
           sources."figures-3.2.0"
           sources."get-stream-5.2.0"
           sources."has-flag-4.0.0"
@@ -104871,7 +105897,7 @@ in
               sources."semver-6.3.0"
             ];
           })
-          (sources."mem-fs-editor-7.0.1" // {
+          (sources."mem-fs-editor-7.1.0" // {
             dependencies = [
               sources."rimraf-3.0.2"
             ];

From acd3d3dd20295d14996660d90e48c084402eb0c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Tue, 3 Nov 2020 17:35:06 -0600
Subject: [PATCH 1144/3942] nixos/modules/services/network-filesystems/ipfs:
 refactor

Add `package` option to change the package used for the service.
---
 .../services/network-filesystems/ipfs.nix       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index f298f831fa7b..2082d513161e 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -44,6 +44,13 @@ in {
 
       enable = mkEnableOption "Interplanetary File System (WARNING: may cause severe network degredation)";
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.ipfs;
+        defaultText = "pkgs.ipfs";
+        description = "Which IPFS package to use.";
+      };
+
       user = mkOption {
         type = types.str;
         default = "ipfs";
@@ -176,7 +183,7 @@ in {
   ###### implementation
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.ipfs ];
+    environment.systemPackages = [ cfg.package ];
     environment.variables.IPFS_PATH = cfg.dataDir;
 
     programs.fuse = mkIf cfg.autoMount {
@@ -207,14 +214,14 @@ in {
       "d '${cfg.ipnsMountDir}' - ${cfg.user} ${cfg.group} - -"
     ];
 
-    systemd.packages = [ pkgs.ipfs ];
+    systemd.packages = [ cfg.package ];
 
     systemd.services.ipfs-init = {
       description = "IPFS Initializer";
 
       environment.IPFS_PATH = cfg.dataDir;
 
-      path = [ pkgs.ipfs ];
+      path = [ cfg.package ];
 
       script = ''
         if [[ ! -f ${cfg.dataDir}/config ]]; then
@@ -239,7 +246,7 @@ in {
     };
 
     systemd.services.ipfs = {
-      path = [ "/run/wrappers" pkgs.ipfs ];
+      path = [ "/run/wrappers" cfg.package ];
       environment.IPFS_PATH = cfg.dataDir;
 
       wants = [ "ipfs-init.service" ];
@@ -267,7 +274,7 @@ in {
               cfg.extraConfig))
           );
       serviceConfig = {
-        ExecStart = ["" "${pkgs.ipfs}/bin/ipfs daemon ${ipfsFlags}"];
+        ExecStart = ["" "${cfg.package}/bin/ipfs daemon ${ipfsFlags}"];
         User = cfg.user;
         Group = cfg.group;
       } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; };

From ea4201e19800d61f4c3f57b0ae8fc5fcda09c56b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 00:02:29 +0000
Subject: [PATCH 1145/3942] opendht: 2.1.4 -> 2.1.6

---
 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 f9b2e07fb423..e160bfb7d367 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "opendht";
-  version = "2.1.4";
+  version = "2.1.6";
 
   src = fetchFromGitHub {
     owner = "savoirfairelinux";
     repo = "opendht";
     rev = version;
-    sha256 = "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal";
+    sha256 = "0sjb2a3yqnabwgmmn8gapc1dq9m8vp9z8w85zhsj654i5h3gp6zv";
   };
 
   nativeBuildInputs =

From 4e1db3daf010c32882d8fc7b9309be7973c19da4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 00:18:43 +0000
Subject: [PATCH 1146/3942] pcm: 202008 -> 202009

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

diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix
index 3c49e53d8008..3e9a8d41b3a5 100644
--- a/pkgs/os-specific/linux/pcm/default.nix
+++ b/pkgs/os-specific/linux/pcm/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "202008";
+  version = "202009";
   pname = "pcm";
 
   src = fetchFromGitHub {
     owner = "opcm";
     repo = "pcm";
     rev = version;
-    sha256 = "1paxwq0p39vp2ma0rg7dkalc3r28wzj77sm3alavvk2vxgvxi0ig";
+    sha256 = "1phkdmbgvrmv5w0xa4i2j9v7lcxkxjdhzi5x6l52z9y9as30dzbd";
   };
 
   installPhase = ''

From fe2094acf84674386f457f244c7917388864fe7e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 00:32:50 +0000
Subject: [PATCH 1147/3942] padthv1: 0.9.17 -> 0.9.18

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

diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index 29ef027f2f20..e321119d838f 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   pname = "padthv1";
-  version = "0.9.17";
+  version = "0.9.18";
 
   src = fetchurl {
     url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
-    sha256 = "098fk8fwcgssnfr1gilqg8g17zvch62lrn3rqsswpzbr3an5adb3";
+    sha256 = "1karrprb3ijrbiwpr43rl3nxnzc33lnmwrd1832psgr3flnr9fp5";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ];

From 8f4cddeaae574d38da2673e6fcc4f74635f7d94d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 00:58:59 +0000
Subject: [PATCH 1148/3942] parallel: 20200822 -> 20200922

---
 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 2f3ca5afd5a4..45439afe3d11 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20200822";
+  name = "parallel-20200922";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "02dy46g6f05p7s2qs8h6yg20p1zl3flxxf77n5jw74l3h1m24m4n";
+    sha256 = "0wj19kwjk0hwm8bk9yfcf3rpr0314lmjy5xxlvvdqnbbc4ml2418";
   };
 
   patches = [

From 7e51cfadba872ee177462652767352e438b549f6 Mon Sep 17 00:00:00 2001
From: Antonio Yang <yanganto@gmail.com>
Date: Thu, 17 Sep 2020 00:21:30 +0800
Subject: [PATCH 1149/3942] find-cursor: init at 1.6

Co-authored-by: Ivar <41924494+IvarWithoutBones@users.noreply.github.com>
---
 pkgs/tools/X11/find-cursor/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/X11/find-cursor/default.nix

diff --git a/pkgs/tools/X11/find-cursor/default.nix b/pkgs/tools/X11/find-cursor/default.nix
new file mode 100644
index 000000000000..13f274577887
--- /dev/null
+++ b/pkgs/tools/X11/find-cursor/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, libX11, libXdamage, libXrender, libXcomposite, libXext, installShellFiles, git }:
+
+stdenv.mkDerivation rec {
+  pname = "find-cursor";
+  version = "1.6";
+
+  src = fetchFromGitHub {
+    owner = "arp242";
+    repo = "find-cursor";
+    rev = "v${version}";
+    sha256 = "13lpcxklv9ayqapyk9pmwxkinhxah5hkr6n0jc2m5hm68nh220w1";
+  };
+
+  nativeBuildInputs = [ installShellFiles git ];
+  buildInputs = [ libX11 libXdamage libXrender libXcomposite libXext ];
+  preInstall = "mkdir -p $out/share/man/man1";
+  installFlags = "PREFIX=${placeholder "out"}";
+
+  meta = with stdenv.lib; {
+    description = "Simple XLib program to highlight the cursor position";
+    homepage = "https://github.com/arp242/find-cursor";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.yanganto ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e56325b91a1c..af341fc63fee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -321,6 +321,8 @@ in
 
   fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { };
 
+  find-cursor = callPackage ../tools/X11/find-cursor { };
+
   prefer-remote-fetch = import ../build-support/prefer-remote-fetch;
 
   global-platform-pro = callPackage ../development/tools/global-platform-pro/default.nix { };

From ff16a8b8e9ff3a30b012203fbc658bd2e5bf696f Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 26 Sep 2020 11:35:18 +0200
Subject: [PATCH 1150/3942] scummvm: 2.1.2 -> 2.2.0

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

diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index e6efbc6203c1..02df60c829f2 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "scummvm";
-  version = "2.1.2";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz";
-    sha256 = "1c4fz1nfg0nqnqx9iipayhzcsiqdmfxm2i95nw9dbhshhsdnrhf4";
+    sha256 = "FGllflk72Ky8+sC4ObCG9kDr8SBjPpPxFsq2UrWyc4c=";
   };
 
   nativeBuildInputs = [ nasm ];

From 4571671de3bde59961313e90c65de70888897ca6 Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Tue, 3 Nov 2020 17:25:01 -0800
Subject: [PATCH 1151/3942] tailscale: 1.0.5 -> 1.2.1

---
 pkgs/servers/tailscale/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index 2e14b0fe7f8d..803f166d5dd4 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,20 +2,21 @@
 
 buildGoModule rec {
   pname = "tailscale";
-  version = "1.0.5";
+  version = "1.2.1";
+  tagHash = "614f6730fe7f46bc6e2128b9efd33bee92f3ff93"; # from `git rev-parse v1.2.1`
 
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tailscale";
     rev = "v${version}";
-    sha256 = "0ib2s694kf5iz5hvrlzfs80z0931dhva7yir80crq0pji9y4rp7b";
+    sha256 = "1xkzh9b67fgp7flfvjja6328254j8gmlzmpnmb69klj3km5v6qmy";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   CGO_ENABLED = 0;
 
-  vendorSha256 = "0l9lzwwvshg9a2kmmq1cvvlaxncbas78a9hjhvjjar89rjr2k2sv";
+  vendorSha256 = "01g3jkgl3jrygd154gmjm3dq13nkppd993iym7assdz8mr3rq31s";
 
   doCheck = false;
 
@@ -24,7 +25,7 @@ buildGoModule rec {
   preBuild = ''
     export buildFlagsArray=(
       -tags="xversion"
-      -ldflags="-X tailscale.com/version.LONG=${version} -X tailscale.com/version.SHORT=${version}"
+      -ldflags="-X tailscale.com/version.Long=${version} -X tailscale.com/version.Short=${version} -X tailscale.com/version.GitCommit=${tagHash}"
     )
   '';
 

From 313325d4f42c84ef5cd30878b8d214c051e431f5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 01:30:26 +0000
Subject: [PATCH 1152/3942] buildpack: 0.13.0 -> 0.14.2

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

diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix
index 1d8e53ba5256..8845e39f1d69 100644
--- a/pkgs/development/tools/buildpack/default.nix
+++ b/pkgs/development/tools/buildpack/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pack";
-  version = "0.13.0";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0h7lgsg5d74pfa15kx0y3ngnvmz64znqk2k73iyjya9pi9h8hh88";
+    sha256 = "0m2hcd7fdvlqy8yp3pa2ccpk9wbnknjh2f8qic31v9yh3zm8aga7";
   };
 
   vendorSha256 = "1c38g169kq9kv6x0x1rlg39ywbc1q66fndby0v85b3ri3xb52869";

From 490b87f7bcb1cabab3386dede8bac8eaa07fcc76 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 01:37:30 +0000
Subject: [PATCH 1153/3942] papis: 0.10 -> 0.11.1

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

diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix
index a97c075d30f6..93eafff6c93b 100644
--- a/pkgs/development/python-modules/papis/default.nix
+++ b/pkgs/development/python-modules/papis/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "papis";
-  version = "0.10";
+  version = "0.11.1";
   disabled = !isPy3k;
 
   # Missing tests on Pypi
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "papis";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0fmrvxs6ixfwjlp96b69db7fpvyqfy2n3c23kdz8yr0vhnp82l93";
+    sha256 = "0bbkjyw1fsvvp0380l404h2lys8ib4xqga5s6401k1y1hld28nl6";
   };
 
   propagatedBuildInputs = [

From 04990cdb8501c6410fd870b120e02d11ada6e579 Mon Sep 17 00:00:00 2001
From: Samuel Ainsworth <skainsworth@gmail.com>
Date: Tue, 3 Nov 2020 18:38:30 -0800
Subject: [PATCH 1154/3942] slack: refactor to be amenable to auto-updates

---
 .../instant-messengers/slack/default.nix          | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index bd41fc562bfc..6b2c2875e3ec 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -39,9 +39,16 @@ let
   throwSystem = throw "Unsupported system: ${system}";
 
   pname = "slack";
+
+  x86_64-darwin-version = "4.10.3";
+  x86_64-darwin-sha256 = "0r77l57vr603xamich4h4gbdd5vdcj0sjs6yjpymfx9s0f98v8bb";
+
+  x86_64-linux-version = "4.10.3";
+  x86_64-linux-sha256 = "1gnjj2iyk8cwjajg8h9qpmzx10j4qjxjzciq8csg45qfzwkr3drf";
+
   version = {
-    x86_64-darwin = "4.10.3";
-    x86_64-linux = "4.10.3";
+    x86_64-darwin = x86_64-darwin-version;
+    x86_64-linux = x86_64-linux-version;
   }.${system} or throwSystem;
 
   src = let
@@ -49,11 +56,11 @@ let
   in {
     x86_64-darwin = fetchurl {
       url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
-      sha256 = "0r77l57vr603xamich4h4gbdd5vdcj0sjs6yjpymfx9s0f98v8bb";
+      sha256 = x86_64-darwin-sha256;
     };
     x86_64-linux = fetchurl {
       url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
-      sha256 = "1gnjj2iyk8cwjajg8h9qpmzx10j4qjxjzciq8csg45qfzwkr3drf";
+      sha256 = x86_64-linux-sha256;
     };
   }.${system} or throwSystem;
 

From f0fc6961fd5c9603c43b553628d36488708949fe Mon Sep 17 00:00:00 2001
From: Samuel Ainsworth <skainsworth@gmail.com>
Date: Tue, 3 Nov 2020 18:38:44 -0800
Subject: [PATCH 1155/3942] slack: add auto-updater script

---
 .../instant-messengers/slack/update.sh        | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100755 pkgs/applications/networking/instant-messengers/slack/update.sh

diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh
new file mode 100755
index 000000000000..adef44411091
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/slack/update.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p curl gnused
+
+set -eou pipefail
+
+latest_linux_version=$(curl --silent https://slack.com/downloads/linux | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p')
+latest_mac_version=$(curl --silent https://slack.com/downloads/mac | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p')
+
+# Double check that the latest mac and linux versions are in sync.
+if [[ "$latest_linux_version" != "$latest_mac_version" ]]; then
+  echo "the latest linux ($latest_linux_version) and mac ($latest_mac_version) versions are not the same"
+  exit 1
+fi
+
+nixpkgs="$(git rev-parse --show-toplevel)"
+slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix"
+nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p')
+nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')
+
+if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then
+  echo "nixpkgs versions are all up to date!"
+  exit 0
+fi
+
+linux_url="https://downloads.slack-edge.com/linux_releases/slack-desktop-${latest_linux_version}-amd64.deb"
+mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg"
+linux_sha256=$(nix-prefetch-url ${linux_url})
+mac_sha256=$(nix-prefetch-url ${mac_url})
+
+sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix"
+sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"
+sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix"
+sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix"
+
+if ! nix-build -A slack "$nixpkgs"; then
+  echo "The updated slack failed to build."
+  exit 1
+fi
+
+echo "Successfully updated"
+echo "slack: $nixpkgs_linux_version -> $latest_linux_version"

From 566c7012c018bfb5795cb99d904f5279b16f60ed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 02:43:31 +0000
Subject: [PATCH 1156/3942] pdfsam-basic: 4.1.4 -> 4.2.0

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

diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index a6dd86393ff1..d8e55e113b28 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pdfsam-basic";
-  version = "4.1.4";
+  version = "4.2.0";
 
   src = fetchurl {
     url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
-    sha256 = "1gw3cmc8c1xxc55bm71v1dz9x9560lbhx9nkwprarhxlmn0m0zzp";
+    sha256 = "0dhwaadk2qw7avpfnw0mgqv3yhjsm4qm88yyy4w24a3cqzrvb56g";
   };
 
   unpackPhase = ''

From 0e3c2cd8c0cff2c5fa561c9bb54e491d0b9c9555 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 02:49:33 +0000
Subject: [PATCH 1157/3942] pam_gnupg: 0.1 -> 0.2

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

diff --git a/pkgs/os-specific/linux/pam_gnupg/default.nix b/pkgs/os-specific/linux/pam_gnupg/default.nix
index 84135f2492aa..50373fe746d6 100644
--- a/pkgs/os-specific/linux/pam_gnupg/default.nix
+++ b/pkgs/os-specific/linux/pam_gnupg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pam_gnupg";
-  version = "0.1";
+  version = "0.2";
 
   src = fetchFromGitHub {
     owner = "cruegge";
     repo = "pam-gnupg";
     rev = "v${version}";
-    sha256 = "0b70mazyvcbg6xyqllm62rwhbz0y94pcy202db1qyy4w8466bhsw";
+    sha256 = "1d8046clv7r3bl77dbpza4f1zlkjffvdczbb5bci3prz7dyfrwsz";
   };
 
   configureFlags = [

From 39ed1364d4f79b7e38a5f018ff96bfcac348b745 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 01:17:12 +0000
Subject: [PATCH 1158/3942] owl-lisp: 0.1.19 -> 0.1.23

---
 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 80ea9eb4c0b8..93713af99b46 100644
--- a/pkgs/development/compilers/owl-lisp/default.nix
+++ b/pkgs/development/compilers/owl-lisp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "owl-lisp";
-  version = "0.1.19";
+  version = "0.1.23";
 
   src = fetchFromGitLab {
     owner  = "owl-lisp";
     repo   = "owl";
     rev    = "v${version}";
-    sha256 = "1bgjd2gkr5risfcc401rlr5fc82gwm4r2gpp9gzkg9h64acivkjx";
+    sha256 = "1indcbicqcdlk9sinkdyhk50fi1b4cb7yrr14vr874gjzmwr2l3i";
   };
 
   nativeBuildInputs = [ which ];

From 503caab7765f31d18bce7fa58b26d447bc413c17 Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Fri, 30 Oct 2020 18:11:30 -0700
Subject: [PATCH 1159/3942] nixos/tailscale: use upstream systemd service
 config.

Signed-off-by: David Anderson <dave@natulte.net>
---
 .../modules/services/networking/tailscale.nix | 26 +++----------------
 pkgs/servers/tailscale/default.nix            |  2 ++
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index 4419c8a0602f..d6684d69e615 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -18,30 +18,10 @@ in {
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.tailscale ]; # for the CLI
-    systemd.services.tailscale = {
-      description = "Tailscale client daemon";
-
-      after = [ "network-pre.target" ];
-      wants = [ "network-pre.target" ];
+    systemd.packages = [ pkgs.tailscale ];
+    systemd.services.tailscaled = {
       wantedBy = [ "multi-user.target" ];
-
-      startLimitIntervalSec = 0;
-
-      serviceConfig = {
-        ExecStart =
-          "${pkgs.tailscale}/bin/tailscaled --port ${toString cfg.port}";
-
-        RuntimeDirectory = "tailscale";
-        RuntimeDirectoryMode = 755;
-
-        StateDirectory = "tailscale";
-        StateDirectoryMode = 750;
-
-        CacheDirectory = "tailscale";
-        CacheDirectoryMode = 750;
-
-        Restart = "on-failure";
-      };
+      serviceConfig.Environment = "PORT=${toString cfg.port}";
     };
   };
 }
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index 803f166d5dd4..4c36d865da96 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -33,6 +33,8 @@ buildGoModule rec {
     wrapProgram $out/bin/tailscaled --prefix PATH : ${
       lib.makeBinPath [ iproute iptables ]
     }
+    sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service
+    install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service
   '';
 
   meta = with lib; {

From 365c7bdc14401c25cb3a11d5a58d26f92efa663f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 03:47:59 +0000
Subject: [PATCH 1160/3942] libsForQt5.packagekit-qt: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix
index 987c834f505d..2a1ebada0020 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/pkgs/tools/package-management/packagekit/qt.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "packagekit-qt";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner  = "hughsie";
     repo   = "PackageKit-Qt";
     rev    = "v${version}";
-    sha256 = "1ls6mn9abpwzw5wjgmslc5h9happj3516y1q67imppczk8g9h2yk";
+    sha256 = "1d20r503msw1vix3nb6a8bmdqld7fj8k9jk33bkqsc610a2zsms6";
   };
 
   buildInputs = [ packagekit ];

From 27a32adbe41983ea725fc50ff8f7bd62c6e6e3d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 04:04:05 +0000
Subject: [PATCH 1161/3942] php73Packages.psalm: 3.11.2 -> 4.1.0

---
 pkgs/development/php-packages/psalm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix
index d36640e109b9..07a9392b2528 100644
--- a/pkgs/development/php-packages/psalm/default.nix
+++ b/pkgs/development/php-packages/psalm/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "psalm";
-  version = "3.11.2";
+  version = "4.1.0";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
-    sha256 = "1ani0907whqy2ycr01sjlvrmwps4dg5igim8z1qyv8grhwvw6gb0";
+    sha256 = "1mpbw9q0fgh6vdfwsm222fz1vi9jrw6l5k1mz4gyv5kxvbyzmn4c";
   };
 
   phases = [ "installPhase" ];

From ed0543131b200ec2074ab142f7f70fc95bc5fc7a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 3 Nov 2020 04:20:00 +0000
Subject: [PATCH 1162/3942] syncthing: 1.10.0 -> 1.11.0

- https://github.com/syncthing/syncthing/releases/tag/v1.11.0
- https://github.com/syncthing/syncthing/releases/tag/v1.11.1
---
 pkgs/applications/networking/syncthing/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 6dd71ed4b4b6..febb1e699820 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,17 +3,17 @@
 let
   common = { stname, target, postInstall ? "" }:
     buildGoModule rec {
-      version = "1.10.0";
+      version = "1.11.1";
       name = "${stname}-${version}";
 
       src = fetchFromGitHub {
         owner  = "syncthing";
         repo   = "syncthing";
         rev    = "v${version}";
-        sha256 = "0wi8k248qr80vscb5qwh2ygiyy2am9hh6a8c1il1h2702ch2cd45";
+        sha256 = "0x5a24r74i9am6a8k32qkb2vck28d2jiy4yhpb4g774m4krjqxd2";
       };
 
-      vendorSha256 = "0as1kn7bpgp5b82pf1bgr23az1qq8x85zr2zwgqsx57yjbc18658";
+      vendorSha256 = "0ap287996ix119hkdyssn2q2bqjbgdshi9a67hf8msfp7k9warm7";
 
       doCheck = false;
 

From 422d223757ccda5daecd2ffb3a7d469ced016fe5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 4 Nov 2020 04:20:00 +0000
Subject: [PATCH 1163/3942] git-lfs: 2.12.0 -> 2.12.1

https://github.com/git-lfs/git-lfs/releases/tag/v2.12.1
---
 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 2df8b335bda7..bd6c5f5cc678 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "git-lfs";
-  version = "2.12.0";
+  version = "2.12.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "git-lfs";
     repo = "git-lfs";
-    sha256 = "0pyvlcy6jxh0vzpsmywlbzwwdyj3jkcclnqb6sg786mmwrnqzj88";
+    sha256 = "1x8s1w8yqhj5nm20knr2gkb59rwzx220nf099lgd62cajzsdpjx5";
   };
 
   goPackagePath = "github.com/git-lfs/git-lfs";

From 6ebbc312aaff485eafe258e6872ea6bf6d19c703 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 4 Nov 2020 04:20:00 +0000
Subject: [PATCH 1164/3942] shadowsocks-rust: 1.8.18 -> 1.8.23

---
 pkgs/tools/networking/shadowsocks-rust/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix
index 9726cde61e54..ed793a50cb8f 100644
--- a/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "shadowsocks-rust";
-  version = "1.8.18";
+  version = "1.8.23";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "shadowsocks";
     repo = pname;
-    sha256 = "1kxf0qcyg5mhddrzwv0hd1fy901wl0ydmxi6b1k2217xmgiyi2s6";
+    sha256 = "1ylasv33478cgwmr8wrd4705azfzrw495w629ncynamv7z17w3k3";
   };
 
-  cargoSha256 = "0vmd4sjagyhrc7q7fszwcjh4nhhmhckmx48i1h2xhr68bwncmyif";
+  cargoSha256 = "060k2dil38bx4zb5nnkr3mj6aayginbhr3aqjv0h071q0vlvp05p";
 
   SODIUM_USE_PKG_CONFIG = 1;
 

From 3a8811630972d1d17a5769c5a0400db5b306498a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 04:15:04 +0000
Subject: [PATCH 1165/3942] python27Packages.authlib: 0.15.1 -> 0.15.2

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

diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix
index 94fc7215c340..e3d8c99e0ea1 100644
--- a/pkgs/development/python-modules/authlib/default.nix
+++ b/pkgs/development/python-modules/authlib/default.nix
@@ -8,14 +8,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.15.1";
+  version = "0.15.2";
   pname = "authlib";
 
   src = fetchFromGitHub {
     owner = "lepture";
     repo = "authlib";
     rev = "v${version}";
-    sha256 = "0jh4kdi5spzhmgvq3ffz2q467hjycz3wg97f7n53rffiwd86jrh5";
+    sha256 = "0jsqh2nirx3xifsakqdpd3wpdig6czavv3yj4lyqz3wh9xjpvswg";
   };
 
   propagatedBuildInputs = [ cryptography requests ];

From 6391d3c1b501e063d2102b2a65cf12557d5e3251 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 04:53:50 +0000
Subject: [PATCH 1166/3942] picard-tools: 2.23.4 -> 2.23.8

---
 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 d496e78748d9..0353f2e7cebd 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 {
   pname = "picard-tools";
-  version = "2.23.4";
+  version = "2.23.8";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0xg4nbx02a2kckr6p8pqjpv5rmp95bkmglgm1bma6f77s7hkab7q";
+    sha256 = "0aflbsxzc2pcp195bbgwk6zqabq0pszc41s1pw17khn8ywl2jjr2";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a14acbe8235f6737aa3a2de87dc8a4602e83f27e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 05:13:08 +0000
Subject: [PATCH 1167/3942] php73Packages.composer2: 2.0.0 -> 2.0.4

---
 pkgs/development/php-packages/composer/2.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/composer/2.0.nix b/pkgs/development/php-packages/composer/2.0.nix
index 8321681de5a2..858884628d3e 100644
--- a/pkgs/development/php-packages/composer/2.0.nix
+++ b/pkgs/development/php-packages/composer/2.0.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "composer";
-  version = "2.0.0";
+  version = "2.0.4";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://getcomposer.org/download/${version}/composer.phar";
-    sha256 = "11fjplbrscnw0fs5hmw4bmszg5a87ig189175407i1ip5fm5g5hk";
+    sha256 = "03bnaifywh8pmpzl0b8r3rm3radj0rz176vzkz327j99fi3vrcn3";
   };
 
   dontUnpack = true;

From ba588df304ef2b08c1b28c36ed92516bc1207396 Mon Sep 17 00:00:00 2001
From: Evax Software <contact@evax.fr>
Date: Mon, 2 Nov 2020 10:22:44 +0100
Subject: [PATCH 1168/3942] python3Packages.pandas-datareader: init at 0.9.0

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

diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix
new file mode 100644
index 000000000000..92adfb9d3f16
--- /dev/null
+++ b/pkgs/development/python-modules/pandas-datareader/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, isPy27
+, pandas
+, lxml
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "pandas-datareader";
+  version = "0.9.0";
+  disabled = isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b2cbc1e16a6ab9ff1ed167ae2ea92839beab9a20823bd00bdfb78155fa04f891";
+  };
+
+  # Tests are trying to load data over the network
+  doCheck = false;
+  pythonImportsCheck = [ "pandas_datareader" ];
+
+  propagatedBuildInputs = [ pandas lxml requests ];
+
+  meta = with stdenv.lib; {
+    description = "Up to date remote data access for pandas, works for multiple versions of pandas";
+    homepage = "https://github.com/pydata/pandas-datareader";
+    license= licenses.bsd3;
+    maintainers = with maintainers; [ evax ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8eccc39b5abe..f672ee24ce58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4306,6 +4306,8 @@ in {
   else
     callPackage ../development/python-modules/pandas/2.nix { };
 
+  pandas-datareader = callPackage ../development/python-modules/pandas-datareader { };
+
   pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { };
 
   pandocfilters = callPackage ../development/python-modules/pandocfilters { };

From 1581e7ed746db7a677451fd2f134ae01511e4a04 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 05:36:45 +0000
Subject: [PATCH 1169/3942] php73Extensions.blackfire: 1.41.0 -> 1.43.0

---
 pkgs/development/tools/misc/blackfire/php-probe.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix
index 5de2a05349a6..a14f5b0edb6b 100644
--- a/pkgs/development/tools/misc/blackfire/php-probe.nix
+++ b/pkgs/development/tools/misc/blackfire/php-probe.nix
@@ -17,11 +17,11 @@ let
   }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version.");
 in stdenv.mkDerivation rec {
   pname = "php-blackfire";
-  version = "1.41.0";
+  version = "1.43.0";
 
   src = fetchurl {
     url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb";
-    sha256 = "0vbl48bccswk9ygb4sshn24cl33fk0xg8d1bcg7ihvdc45any9ww";
+    sha256 = "1038qbpqkamd51ip25z6fbbz69faggahhdw75lnsd8prrwjcpli7";
   };
 
   nativeBuildInputs = [

From a492b32c3ad89d4b7617655278b3930e2ff828d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 14:39:31 +0000
Subject: [PATCH 1170/3942] mimalloc: 1.6.4 -> 1.6.7

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

diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix
index 997fd2ab6346..7382ed57c640 100644
--- a/pkgs/development/libraries/mimalloc/default.nix
+++ b/pkgs/development/libraries/mimalloc/default.nix
@@ -7,13 +7,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname   = "mimalloc";
-  version = "1.6.4";
+  version = "1.6.7";
 
   src = fetchFromGitHub {
     owner  = "microsoft";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0b6ymi2a9is2q6n49dvlnjxknikj0rfff5ygbc4n7894h5mllvvr";
+    sha256 = "1ymffs3ixc4vkhpr09ph6xhyknm2cx8ij8j5l70cq6119mwilnwa";
   };
 
   nativeBuildInputs = [ cmake ninja ];

From 834e2ae646595dfa2648d733247bdd54b9d4d66a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 05:42:52 +0000
Subject: [PATCH 1171/3942] phoronix-test-suite: 9.8.0 -> 10.0.1

---
 pkgs/tools/misc/phoronix-test-suite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix
index bea73610ddad..520794c56569 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "phoronix-test-suite";
-  version = "9.8.0";
+  version = "10.0.1";
 
   src = fetchurl {
     url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
-    sha256 = "05q01cr4a2mmyski50pqna9sgw2jy93fgfpjwkhbkc09na6400sq";
+    sha256 = "09wrrcxfvh7pwv0jqpyzjsr0rd7askfr0s2xr1wv9v40znxmsmzz";
   };
 
   buildInputs = [ php ];

From 14108cfdb2a3cff0d8542f69717679bfe82c7c76 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 05:34:38 +0000
Subject: [PATCH 1172/3942] libsolv: 0.7.14 -> 0.7.16

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

diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index d559efd3aab5..65ab87a0cf65 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
 
 stdenv.mkDerivation rec {
-  version  = "0.7.14";
+  version  = "0.7.16";
   pname = "libsolv";
 
   src = fetchFromGitHub {
     owner  = "openSUSE";
     repo   = "libsolv";
     rev    = version;
-    sha256 = "10klbgknl2njbjl4k0l50ii7afwqrl1691ar4ry3snmc8chb1z7g";
+    sha256 = "1arw7p83s5yq36pw94b76zfiqsh90fjjnayni54a5wgm0zvbkki8";
   };
 
   cmakeFlags = [

From 4148fc489b29e826bd42ed05e12ba6fe64c2921e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 15:07:16 +0000
Subject: [PATCH 1173/3942] oil: 0.8.1 -> 0.8.3

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

diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index 94fd062e45ca..e1d4ff1585f8 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "oil";
-  version = "0.8.1";
+  version = "0.8.3";
 
   src = fetchurl {
     url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    sha256 = "0mhzys1siry848v7swr1iv2wp329ksw0gpz1qd82fmlakml5brc1";
+    sha256 = "1jrw8lbcya5wza1g65b5mgm432a2r00d8i0p1plz0kp8rl3ccy1z";
   };
 
   postPatch = ''

From 53db304162b27d0e7ab681a836a44fe71ef122b1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 19:56:33 +0000
Subject: [PATCH 1174/3942] oneshot: 1.2.0 -> 1.3.1

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

diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/tools/networking/oneshot/default.nix
index f02370ab69d5..0f886fda03c9 100644
--- a/pkgs/tools/networking/oneshot/default.nix
+++ b/pkgs/tools/networking/oneshot/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "oneshot";
-  version = "1.2.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "raphaelreyna";
     repo = "oneshot";
     rev = "v${version}";
-    sha256 = "11xmvqj7md970rjhkg1zj2w6yqpw6cj83aw37a82sfdn90kyhg9d";
+    sha256 = "047mncv9abs4xj7bh9lhc3wan37cldjjyrpkis7pvx6zhzml74kf";
   };
 
   vendorSha256 = "1cxr96yrrmz37r542mc5376jll9lqjqm18k8761h9jqfbzmh9rkp";

From bd5c059f8671652b27ab3ec053b95a5d7bf1184b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 08:39:15 +0000
Subject: [PATCH 1175/3942] mtools: 4.0.24 -> 4.0.25

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

diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index 58bd9340c5b0..5ebf82ea91f8 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mtools-4.0.24";
+  name = "mtools-4.0.25";
 
   src = fetchurl {
     url = "mirror://gnu/mtools/${name}.tar.bz2";
-    sha256 = "1f9g7g8zspp8nvg1nz869il9pvxpdpchqd0vxfc89y8rjbda5x14";
+    sha256 = "059cirrarizvcxv8zyp6ykaz45rymljpgdkdjc9kvadp7gn1w5px";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;

From 91b086f153cef74a6cc986e2f7fecbe429a078a6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 15:40:59 +0000
Subject: [PATCH 1176/3942] libosip: 5.1.1 -> 5.1.2

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

diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index 24db4c6609b7..ed854e8a4609 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
-  version = "5.1.1";
+  version = "5.1.2";
   src = fetchurl {
     url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
-    sha256 = "0kgnxgzf968kbl6rx3hjsfb3jsg4ydgrsf35gzj319i1f8qjifv1";
+    sha256 = "148j1i0zkwf09qdpk3nc5sssj1dvppw7p0n9rgrg8k56447l1h1b";
   };
   pname = "libosip2";
 

From fc48e6f93287c94f67071b9355a3192a3df67e5e Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 4 Nov 2020 07:05:21 +0100
Subject: [PATCH 1177/3942] php73: 7.3.23 -> 7.3.24

---
 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 ff9388699175..1d3a7478eb4b 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -273,8 +273,8 @@ let
         };
 
   php73base = callPackage generic (_args // {
-    version = "7.3.23";
-    sha256 = "0k600imsxm3r3qdv20ryqhvfmnkmjhvm2hcnqr180l058snncrpx";
+    version = "7.3.24";
+    sha256 = "1655rj4w63n5fkvdj3kz9f5jfyjgvzw8a6j8zkzgic1p42xszdsm";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

From c1a2cf890a98d9e761fbdab89afeb56886a6f35d Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 4 Nov 2020 07:02:43 +0100
Subject: [PATCH 1178/3942] php74: 7.4.11 -> 7.4.12

---
 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 ff9388699175..1ce0642ac01d 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -281,8 +281,8 @@ let
   });
 
   php74base = callPackage generic (_args // {
-    version = "7.4.11";
-    sha256 = "1idq2sk3x6msy8l2g42jv3y87h1fgb1aybxw7wpjkliv4iaz422l";
+    version = "7.4.12";
+    sha256 = "0rwrl7xgfq2bbgmy34klgfsqa7v935074ibanmic9pwy4g676vvf";
   });
 
   defaultPhpExtensions = { all, ... }: with all; ([

From d06be7fd3838d3c901908e2439fdfe4802538bb0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 06:07:07 +0000
Subject: [PATCH 1179/3942] procs: 0.10.4 -> 0.10.5

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

diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 54bdf238e3f2..528a4467bb82 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.10.4";
+  version = "0.10.5";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1a28kkxcrdfmrq2mmsfkdxfp3msklwga5nbfhjb7a7s64xh8jmjv";
+    sha256 = "0w6a8pfk5s30yi5038kdqh4dncx2pskm7a23z66c4xj3842ci79c";
   };
 
-  cargoSha256 = "1xlxjr0pkwlzm7f5xlrsf76in28r9jj41n6gn44vxqbh4x161gs1";
+  cargoSha256 = "07fwznx2czk1ibb77xcfhma9dpqps0m7rsmbb90gah6f32gah617";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 2b404345f52b347bcab521002ca0605c97feb5d5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 06:12:55 +0000
Subject: [PATCH 1180/3942] php73Packages.phpstan: 0.12.51 -> 0.12.52

---
 pkgs/development/php-packages/phpstan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index ef17aa9f98f1..ddc8516742a1 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "phpstan";
-  version = "0.12.51";
+  version = "0.12.52";
 in
 mkDerivation {
   inherit pname version;
 
   src = pkgs.fetchurl {
     url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
-    sha256 = "0pfy14c0r64hdzlq5x1w225za2566s8vhh4hnfasmfh52s7v77p4";
+    sha256 = "0zhbpcja7fyhqi2p8mky7v3dv50dgi4yxpj2hvmxs61kp9irf0nb";
   };
 
   phases = [ "installPhase" ];

From 404f6fbfea9a8ecdf331b12dde197d821b91622a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 06:23:23 +0000
Subject: [PATCH 1181/3942] pounce: 1.4p2 -> 2.0

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

diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix
index a418417ce2fe..62d576ffc6d9 100644
--- a/pkgs/servers/pounce/default.nix
+++ b/pkgs/servers/pounce/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pounce";
-  version = "1.4p2";
+  version = "2.0";
 
   src = fetchzip {
     url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz";
-    sha256 = "0fpnj9yvmj4gbbfpya4i0lyin56r782pz19z3pgd8xgs22gd48cc";
+    sha256 = "0vr42s8l617k6893zq7qn9wz7kcdchmr99ivbkrmvd38qrhsa02l";
   };
 
   buildInputs = [ libressl ];

From 2442c1585a5e9b97ed9fb3c0aa77c1005e0ecee2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 05:49:41 +0000
Subject: [PATCH 1182/3942] picard: 2.5 -> 2.5.1

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

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index cf8523b4ef74..2cb4ff09803c 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -12,13 +12,13 @@ let
   ;
 in pythonPackages.buildPythonApplication rec {
   pname = "picard";
-  version = "2.5";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "metabrainz";
     repo = pname;
     rev = "release-${version}";
-    sha256 = "02px6r086pyhpf6wia876c73bgr4xa4pyx2yykv6j74zyp5wig3z";
+    sha256 = "13q926iqwdba6ds5s3ir57c9bkg8gcv6dhqvhmg00fnzkq9xqk3d";
   };
 
   nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]

From 2ac37a3e8af096562ae3e50d6c2ca86060442581 Mon Sep 17 00:00:00 2001
From: David Birks <david@birks.dev>
Date: Tue, 3 Nov 2020 20:40:11 -0500
Subject: [PATCH 1183/3942] dbeaver: 7.2.3 -> 7.2.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 547a60566855..1a7f240ffda8 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "dbeaver-ce";
-  version = "7.2.3";
+  version = "7.2.4";
 
   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 = "sha256-XYAe+e9zK/fvxBJ2Caz9/95++JzIQykXj8953IocDZU=";
+    sha256 = "sha256-RsXLznTz/U23e77xzyINi8HVuGqR4TrPaf+w++zPOH4=";
   };
 
   installPhase = ''

From db530f4490d7474e253bfe01b582d7b755e35799 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 4 Nov 2020 01:14:28 +0100
Subject: [PATCH 1184/3942] i3status-rust: add missing ethtool and notmuch
 buildInputs

i3status-rust requires `ethtool` for the net block to work since 0.14.2.
The notmuch feature is also available and all we've to do for that is to
pass the `notmuch` input and enable the feature.
---
 .../window-managers/i3/status-rust.nix        | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index f6acf5698f4c..a1900deb2257 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -1,4 +1,13 @@
-{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }:
+{ stdenv
+, rustPlatform
+, fetchFromGitHub
+, pkgconfig
+, makeWrapper
+, dbus
+, libpulseaudio
+, notmuch
+, ethtool
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "i3status-rust";
@@ -13,9 +22,17 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1dcfclk8lbqvq2hywr80jm63p1i1kz3893zq99ipgryia46vd397";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
 
-  buildInputs = [ dbus libpulseaudio ];
+  buildInputs = [ dbus libpulseaudio notmuch ];
+
+  cargoBuildFlags = [
+    "--features=notmuch"
+  ];
+
+  postFixup = ''
+    wrapProgram $out/bin/i3status-rs --prefix PATH : "${ethtool}/bin"
+  '';
 
   # Currently no tests are implemented, so we avoid building the package twice
   doCheck = false;

From 5c31f534f1d03a308681ca86c3cc2da84b47d0b6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 22:18:26 +0000
Subject: [PATCH 1185/3942] obsidian: 0.9.4 -> 0.9.6

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

diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index 8d6669917e79..58ea50c3ed18 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -30,12 +30,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "obsidian";
-  version = "0.9.4";
+  version = "0.9.6";
 
   src = fetchurl {
     url =
       "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
-    sha256 = "0qahgm9gf4sap28wy7cxbf41h8zldplbwxnv8shyajbkxn108g5p";
+    sha256 = "1n8qc8ssv93xcal9fgbwvkvahzwyn6367v8gbxgc3036l66mira7";
   };
 
   nativeBuildInputs = [ makeWrapper graphicsmagick ];

From f76171b0dbb45708ecb7a626c642f4762cb989c8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Nov 2020 08:02:51 +0100
Subject: [PATCH 1186/3942] =?UTF-8?q?blackfire:=201.44.1=20=E2=86=92=201.4?=
 =?UTF-8?q?4.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix
index 08496d9f5202..27e043a9ac49 100644
--- a/pkgs/development/tools/misc/blackfire/default.nix
+++ b/pkgs/development/tools/misc/blackfire/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "blackfire-agent";
-  version = "1.44.1";
+  version = "1.44.2";
 
   src = fetchurl {
     url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb";
-    sha256 = "1p00flipm5x6r36gblfrfrd14byipilybrhfzv8rzpahz2b7r5hb";
+    sha256 = "1bam4sb0yhxciykph7wn41zs8fa7c9iwnbihd5kza0cylbb7fbkb";
   };
 
   nativeBuildInputs = [

From b9f0d99e55bcd623be25da5eef902a0d57ba7938 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 13:24:42 +0000
Subject: [PATCH 1187/3942] ncpamixer: 1.3.3 -> 1.3.3.1

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

diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix
index 32d8df2f0487..89a0da5e0d63 100644
--- a/pkgs/applications/audio/ncpamixer/default.nix
+++ b/pkgs/applications/audio/ncpamixer/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   pname = "ncpamixer";
-  version = "1.3.3";
+  version = "1.3.3.1";
 
   src = fetchFromGitHub {
     owner = "fulhax";
     repo = "ncpamixer";
     rev = version;
-    sha256 = "19pxfvfhhrbfk1wz5awx60y51jccrgrcvlq7lb622sw2z0wzw4ac";
+    sha256 = "1v3bz0vpgh18257hdnz3yvbnl51779g1h5b265zgc21ks7m1jw5z";
   };
 
   buildInputs = [ ncurses libpulseaudio ];

From dcdf8fa49cd5351d91f753584f914990bacd5dcb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 12:56:42 +0000
Subject: [PATCH 1188/3942] mksh: 59b -> 59c

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

diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index 7abf75c70f49..c19406e5f55c 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "mksh";
-  version = "59b";
+  version = "59c";
 
   src = fetchurl {
     urls = [
       "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
       "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
     ];
-    sha256 = "1rp0farbylypyiaald2hw5avg5w3m8x7cjnxxyyihzvfb2lx2zlh";
+    sha256 = "01n5ggw33bw4jv4d3148wlw9n4aj7vdn3ffnc66c9w9pldjidbkp";
   };
 
   dontConfigure = true;

From 1bf0327ef6d7e0959f3250758b4d33b4066a732b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 3 Nov 2020 04:20:00 +0000
Subject: [PATCH 1189/3942] racket: 7.8 -> 7.9

https://download.racket-lang.org/v7.9.html
---
 pkgs/development/interpreters/racket/default.nix | 6 +++---
 pkgs/development/interpreters/racket/minimal.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index b62df6e837b8..6de4ab6da31c 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -46,7 +46,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "racket";
-  version = "7.8"; # always change at once with ./minimal.nix
+  version = "7.9"; # always change at once with ./minimal.nix
 
   src = (stdenv.lib.makeOverridable ({ name, sha256 }:
     fetchurl {
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     }
   )) {
     name = "${pname}-${version}";
-    sha256 = "19z3dayybcra277s4gk2mppalwawd93f2b16xyrb6d7rbbfz7j9j";
+    sha256 = "18pz6gjzqy6a62xkcmjanhr7kgxpvpmc0blrk4igz8ldcybz44if";
   };
 
   FONTCONFIG_FILE = fontsConf;
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     unset AR
-    for f in src/lt/configure src/cs/c/configure src/racket/src/string.c; do
+    for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do
       substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname
     done
     mkdir src/build
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index abff21c798aa..656546dcb630 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
   name = "racket-minimal-${oldAttrs.version}";
   src = oldAttrs.src.override {
     inherit name;
-    sha256 = "0bbglf9vfacpm2hn3lskhvc8cpg6z088fbnzpqsn17z8qdk8yvb3";
+    sha256 = "0xvnd7afx058sg7j51bmbikqgn4sl0246nkhr8zlqcrbr3nqi6p4";
   };
 
   meta = oldAttrs.meta // {

From 297857c9fbac454d33c4169c9e6773fcf670205f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Nov 2020 02:59:35 +0100
Subject: [PATCH 1190/3942] pythonPackages: fix pythonImportsCheck typos and
 capitalization

---
 pkgs/development/python-modules/batchspawner/default.nix  | 2 +-
 pkgs/development/python-modules/distro/default.nix        | 2 +-
 pkgs/development/python-modules/dockerspawner/default.nix | 2 +-
 pkgs/development/python-modules/gym/default.nix           | 2 +-
 pkgs/development/python-modules/wled/default.nix          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix
index ebf24fb9d7ba..29109a2e0914 100644
--- a/pkgs/development/python-modules/batchspawner/default.nix
+++ b/pkgs/development/python-modules/batchspawner/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # tests require a job scheduler e.g. slurm, pbs, etc.
   doCheck = false;
 
-  pythonImportCheck = [ "batchspawner" ];
+  pythonImportsCheck = [ "batchspawner" ];
 
   meta = with lib; {
     description = "A spawner for Jupyterhub to spawn notebooks using batch resource managers";
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
index cee4e6deb38a..baaf54dd061d 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # tests are very targeted at individual linux distributions
   doCheck = false;
 
-  pythonImportcheck = [ "distro" ];
+  pythonImportsCheck = [ "distro" ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/nir0s/distro";
diff --git a/pkgs/development/python-modules/dockerspawner/default.nix b/pkgs/development/python-modules/dockerspawner/default.nix
index 6dba529ef997..192fb94bd45a 100644
--- a/pkgs/development/python-modules/dockerspawner/default.nix
+++ b/pkgs/development/python-modules/dockerspawner/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   # tests require docker
   doCheck = false;
 
-  pythonImportCheck = [ "dockerspawner" ];
+  pythonImportsCheck = [ "dockerspawner" ];
 
   meta = with lib; {
     description = "Dockerspawner: A custom spawner for Jupyterhub";
diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index 482b2c64aae2..547f79a7b101 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   # The test needs MuJoCo that is not free library.
   doCheck = false;
 
-  pythonImportCheck = [ "gym" ];
+  pythonImportsCheck = [ "gym" ];
 
   meta = with lib; {
     description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents";
diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix
index 329cdd5b610e..92dbc210c6de 100644
--- a/pkgs/development/python-modules/wled/default.nix
+++ b/pkgs/development/python-modules/wled/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportCheck = [ "wled" ];
+  pythonImportsCheck = [ "wled" ];
 
   meta = with lib; {
     description = "Asynchronous Python client for WLED";

From ea161a63070ee425a1937a2d49d2557ca0f88d4f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 10:17:30 +0000
Subject: [PATCH 1191/3942] nextcloud-client: 3.0.2 -> 3.0.3

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

diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index ed670be08a65..64bcf5f6838a 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -19,13 +19,13 @@
 
 mkDerivation rec {
   pname = "nextcloud-client";
-  version = "3.0.2";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "desktop";
     rev = "v${version}";
-    sha256 = "ROzaiRa9Odq4lXuHL7nbE0S49d0wxmDgm01qI1WM+WM=";
+    sha256 = "0idh8i71jivdjjs2y62l22yl3qxwgcr0hf53dad587bzgkkkr223";
   };
 
   patches = [

From 157889a3e24c359d857cfb212066b503a33c2278 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 07:33:04 +0000
Subject: [PATCH 1192/3942] pspg: 3.1.3 -> 3.1.5

---
 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 4af7a0009af5..a2048132e078 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pspg";
-  version = "3.1.3";
+  version = "3.1.5";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = pname;
     rev = version;
-    sha256 = "16pajhzr4aahyhdzkp9g3ld2insnlk2z2w2pfab8bghw4f69j5xf";
+    sha256 = "000h4yiaym7i5bcm268rvsjbs2brz2is9lhm6vm3dx0q7k1pcx45";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 50fa2dbc729b0a84e9f019c0a6fc9aa9255c6b88 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 3 Nov 2020 19:30:09 +0100
Subject: [PATCH 1193/3942] =?UTF-8?q?ocamlPackages.mirage-crypto:=200.8.6?=
 =?UTF-8?q?=20=E2=86=92=200.8.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
index 66da69fee222..f963e8e15d08 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
@@ -4,11 +4,11 @@ buildDunePackage rec {
   minimumOCamlVersion = "4.08";
 
   pname = "mirage-crypto";
-  version = "0.8.6";
+  version = "0.8.7";
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
-    sha256 = "1fghg89lpm1iks6nk1jhqcimpvb52jih0ys9bxbn2f343l0njbkq";
+    sha256 = "1gx86h6kk39zq3kvl854jc2ap2755paalp1f7iv8r9js2xnbxfxy";
   };
 
   useDune2 = true;

From df4ce3f261d567b9b8375cf5663fc4be6e20d459 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 07:43:07 +0000
Subject: [PATCH 1194/3942] pmd: 6.26.0 -> 6.29.0

---
 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 f91cdbead82c..497a244f68b4 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pmd";
-  version = "6.26.0";
+  version = "6.29.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
-    sha256 = "1vlqwrbqk2cbp8kgxkm61c4blai81ib35yjf6wms16w0hvbqf2b4";
+    sha256 = "08iibpf9jhkk7ihsmlm85wpjwy1bvznbvggvqyw6109f9gzlrvvq";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

From 4d507f9002368cdd918fc76a389a6b6815dfe81d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 07:59:18 +0000
Subject: [PATCH 1195/3942] petsc: 3.13.4 -> 3.14.0

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

diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix
index 82a0d063570d..0946f8f2f66b 100644
--- a/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/pkgs/development/libraries/science/math/petsc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "petsc";
-  version = "3.13.4";
+  version = "3.14.0";
 
   src = fetchurl {
     url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
-    sha256 = "1n2paqw5c0ja392s1qhp7q2ypwav8s5drxxz2w5m2cn31vbspy1c";
+    sha256 = "1hq3igm90bnl44vyjdbkpqmqk7496pakcswzc2vq57l8d27nhdxz";
   };
 
   nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ];

From c30745e0532d949ddcad902215f1b399b2f6b09d Mon Sep 17 00:00:00 2001
From: ajs124 <ajs124@users.noreply.github.com>
Date: Wed, 4 Nov 2020 09:30:03 +0100
Subject: [PATCH 1196/3942] open-iscsi: install systemd files (#97793)

---
 pkgs/os-specific/linux/open-iscsi/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index 01bbd9a9cc16..6314dcea62d2 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -25,8 +25,16 @@ stdenv.mkDerivation rec {
     sed -i 's|/usr|/|' Makefile
   '';
 
+  installFlags = [
+    "install"
+    "install_systemd"
+  ];
+
   postInstall = ''
     cp usr/iscsistart $out/sbin/
+    for f in $out/lib/systemd/system/*; do
+      substituteInPlace $f --replace /sbin $out/bin
+    done
     $out/sbin/iscsistart -v
   '';
 

From f73df04874c3664392fd5b429fa21741ee17f8f5 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 2 Nov 2020 19:03:02 +0100
Subject: [PATCH 1197/3942] haskell.compiler.integer-simple: Exclude
 ghc8102Binary*

(cherry picked from commit fc1562695bdfe26c38f473e4639ab0a1c349a953)
---
 pkgs/top-level/haskell-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index da73a4a30518..e613b931d631 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -6,6 +6,7 @@ let
     "ghc822Binary"
     "ghc865Binary"
     "ghc8102Binary"
+    "ghc8102BinaryMinimal"
     "ghcjs"
     "ghcjs86"
     "integer-simple"

From 83163b43e47de20c20315920afd4b7d0d8ae46a0 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 3 Nov 2020 20:44:36 +0100
Subject: [PATCH 1198/3942] postgresql: Fix timetz test failure

A recent addition to the test suite turned out to be sensitive to
DST. The main code is ok. Patch only required to make test succeed.

See https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=4a071afbd056282746a5bc9362e87f579a56402d
---
 pkgs/servers/sql/postgresql/default.nix       |   4 +-
 .../patches/stabilize-timetz-dst.patch        | 117 ++++++++++++++++++
 2 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/sql/postgresql/patches/stabilize-timetz-dst.patch

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index bc1108ad3339..31c60303c039 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -64,7 +64,9 @@ let
         (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch       else ./patches/hardcode-pgxs-path.patch)
         ./patches/specify_pkglibdir_at_runtime.patch
         ./patches/findstring.patch
-      ] ++ lib.optional stdenv.isLinux (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch);
+      ]
+      ++ lib.optional (atLeast "10") ./patches/stabilize-timetz-dst.patch
+      ++ lib.optional stdenv.isLinux (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch);
 
     installTargets = [ "install-world" ];
 
diff --git a/pkgs/servers/sql/postgresql/patches/stabilize-timetz-dst.patch b/pkgs/servers/sql/postgresql/patches/stabilize-timetz-dst.patch
new file mode 100644
index 000000000000..b6c633cb73eb
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/patches/stabilize-timetz-dst.patch
@@ -0,0 +1,117 @@
+From 4a071afbd056282746a5bc9362e87f579a56402d Mon Sep 17 00:00:00 2001
+From: Tom Lane <tgl@sss.pgh.pa.us>
+Date: Thu, 29 Oct 2020 15:28:14 -0400
+Subject: [PATCH 1/1] Stabilize timetz test across DST transitions.
+
+The timetz test cases I added in commit a9632830b were unintentionally
+sensitive to whether or not DST is active in the PST8PDT time zone.
+Thus, they'll start failing this coming weekend, as reported by
+Bernhard M. Wiedemann in bug #16689.  Fortunately, DST-awareness is
+not significant to the purpose of these test cases, so we can just
+force them all to PDT (DST hours) to preserve stability of the
+results.
+
+Back-patch to v10, as the prior patch was.
+
+Discussion: https://postgr.es/m/16689-57701daa23b377bf@postgresql.org
+Git viewer: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=4a071afbd056282746a5bc9362e87f579a56402d;hp=f90149e6285aaae6b48559afce1bd638ee26c33e
+---
+ src/test/regress/expected/timetz.out | 32 ++++++++++++++--------------
+ src/test/regress/sql/timetz.sql      | 16 +++++++-------
+ 2 files changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/src/test/regress/expected/timetz.out b/src/test/regress/expected/timetz.out
+index 038bb5fa09..1ab5ed5105 100644
+--- a/src/test/regress/expected/timetz.out
++++ b/src/test/regress/expected/timetz.out
+@@ -91,45 +91,45 @@ SELECT f1 AS "Ten" FROM TIMETZ_TBL WHERE f1 >= '00:00-07';
+ (12 rows)
+ 
+ -- Check edge cases
+-SELECT '23:59:59.999999'::timetz;
++SELECT '23:59:59.999999 PDT'::timetz;
+        timetz       
+ --------------------
+  23:59:59.999999-07
+ (1 row)
+ 
+-SELECT '23:59:59.9999999'::timetz;  -- rounds up
++SELECT '23:59:59.9999999 PDT'::timetz;  -- rounds up
+    timetz    
+ -------------
+  24:00:00-07
+ (1 row)
+ 
+-SELECT '23:59:60'::timetz;  -- rounds up
++SELECT '23:59:60 PDT'::timetz;  -- rounds up
+    timetz    
+ -------------
+  24:00:00-07
+ (1 row)
+ 
+-SELECT '24:00:00'::timetz;  -- allowed
++SELECT '24:00:00 PDT'::timetz;  -- allowed
+    timetz    
+ -------------
+  24:00:00-07
+ (1 row)
+ 
+-SELECT '24:00:00.01'::timetz;  -- not allowed
+-ERROR:  date/time field value out of range: "24:00:00.01"
+-LINE 1: SELECT '24:00:00.01'::timetz;
++SELECT '24:00:00.01 PDT'::timetz;  -- not allowed
++ERROR:  date/time field value out of range: "24:00:00.01 PDT"
++LINE 1: SELECT '24:00:00.01 PDT'::timetz;
+                ^
+-SELECT '23:59:60.01'::timetz;  -- not allowed
+-ERROR:  date/time field value out of range: "23:59:60.01"
+-LINE 1: SELECT '23:59:60.01'::timetz;
++SELECT '23:59:60.01 PDT'::timetz;  -- not allowed
++ERROR:  date/time field value out of range: "23:59:60.01 PDT"
++LINE 1: SELECT '23:59:60.01 PDT'::timetz;
+                ^
+-SELECT '24:01:00'::timetz;  -- not allowed
+-ERROR:  date/time field value out of range: "24:01:00"
+-LINE 1: SELECT '24:01:00'::timetz;
++SELECT '24:01:00 PDT'::timetz;  -- not allowed
++ERROR:  date/time field value out of range: "24:01:00 PDT"
++LINE 1: SELECT '24:01:00 PDT'::timetz;
+                ^
+-SELECT '25:00:00'::timetz;  -- not allowed
+-ERROR:  date/time field value out of range: "25:00:00"
+-LINE 1: SELECT '25:00:00'::timetz;
++SELECT '25:00:00 PDT'::timetz;  -- not allowed
++ERROR:  date/time field value out of range: "25:00:00 PDT"
++LINE 1: SELECT '25:00:00 PDT'::timetz;
+                ^
+ --
+ -- TIME simple math
+diff --git a/src/test/regress/sql/timetz.sql b/src/test/regress/sql/timetz.sql
+index b699e4b03c..ce763d89e8 100644
+--- a/src/test/regress/sql/timetz.sql
++++ b/src/test/regress/sql/timetz.sql
+@@ -36,14 +36,14 @@ SELECT f1 AS "None" FROM TIMETZ_TBL WHERE f1 < '00:00-07';
+ SELECT f1 AS "Ten" FROM TIMETZ_TBL WHERE f1 >= '00:00-07';
+ 
+ -- Check edge cases
+-SELECT '23:59:59.999999'::timetz;
+-SELECT '23:59:59.9999999'::timetz;  -- rounds up
+-SELECT '23:59:60'::timetz;  -- rounds up
+-SELECT '24:00:00'::timetz;  -- allowed
+-SELECT '24:00:00.01'::timetz;  -- not allowed
+-SELECT '23:59:60.01'::timetz;  -- not allowed
+-SELECT '24:01:00'::timetz;  -- not allowed
+-SELECT '25:00:00'::timetz;  -- not allowed
++SELECT '23:59:59.999999 PDT'::timetz;
++SELECT '23:59:59.9999999 PDT'::timetz;  -- rounds up
++SELECT '23:59:60 PDT'::timetz;  -- rounds up
++SELECT '24:00:00 PDT'::timetz;  -- allowed
++SELECT '24:00:00.01 PDT'::timetz;  -- not allowed
++SELECT '23:59:60.01 PDT'::timetz;  -- not allowed
++SELECT '24:01:00 PDT'::timetz;  -- not allowed
++SELECT '25:00:00 PDT'::timetz;  -- not allowed
+ 
+ --
+ -- TIME simple math
+-- 
+2.20.1

From 27e9328895987728c499382f190a36d755eca9a2 Mon Sep 17 00:00:00 2001
From: Victor Nawothnig <Victor.Nawothnig@gmail.com>
Date: Mon, 22 Jun 2020 21:40:41 +0200
Subject: [PATCH 1199/3942] Support virtio_scsi devices on
 nixos-generate-config

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 44f4c44a56c2..6e3ddb875e1b 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -183,6 +183,11 @@ sub pciCheck {
         push @imports, "(modulesPath + \"/hardware/network/broadcom-43xx.nix\")";
     }
 
+    # In case this is a virtio scsi device, we need to explicitly make this available.
+    if ($vendor eq "0x1af4" && $device eq "0x1004") {
+        push @initrdAvailableKernelModules, "virtio_scsi";
+    }
+
     # Can't rely on $module here, since the module may not be loaded
     # due to missing firmware.  Ideally we would check modules.pcimap
     # here.

From 22dd82ce98fd111a0994eede23432179bc7008ea Mon Sep 17 00:00:00 2001
From: "Bryan A. S" <bryanasdev000@gmail.com>
Date: Mon, 2 Nov 2020 02:49:59 -0300
Subject: [PATCH 1200/3942] sonobuoy: Fixes wrong "v" behaviour

Adjust the generated manifests by placing the character v in the sonobuoy version, successfully pulling the image within the cluster and running smoothly.

Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
---
 pkgs/applications/networking/cluster/sonobuoy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix
index c111f7eccfee..be5cb51d450d 100644
--- a/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
     let t = goPackagePath;
     in ''
       -ldflags=
-        -s -X ${t}/pkg/buildinfo.Version=${version}
+        -s -X ${t}/pkg/buildinfo.Version=v${version}
            -X ${t}/pkg/buildinfo.GitSHA=${rev}
            -X ${t}/pkg/buildDate=unknown
     '';

From 7a75852e8b770814b23880d5b63104f5dbdde4a5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 09:09:31 +0000
Subject: [PATCH 1201/3942] php73Extensions.event: 2.5.7 -> 3.0.0

---
 pkgs/development/php-packages/event/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix
index 47b99234fac9..56bc4209c6e8 100644
--- a/pkgs/development/php-packages/event/default.nix
+++ b/pkgs/development/php-packages/event/default.nix
@@ -2,8 +2,8 @@
 buildPecl {
   pname = "event";
 
-  version = "2.5.7";
-  sha256 = "0jkzcm5mmbg101jc7p3aws9qb6l6xbxkfff82mrf7s5fn7xd44im";
+  version = "3.0.0";
+  sha256 = "1k35qwcf4qz8617b4riy7bp0vna1j3ds0k9j52hlm7qrhww2yxqn";
 
   configureFlags = [
     "--with-event-libevent-dir=${pkgs.libevent.dev}"

From 6fc9aca0de086e7edb6c7a41d8ae31dab05d4b1f Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Wed, 4 Nov 2020 09:31:24 +0100
Subject: [PATCH 1202/3942] slirp4netns: 1.1.4 -> 1.1.6

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/tools/networking/slirp4netns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix
index 60cb34132537..39b361bd3020 100644
--- a/pkgs/tools/networking/slirp4netns/default.nix
+++ b/pkgs/tools/networking/slirp4netns/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "slirp4netns";
-  version = "1.1.4";
+  version = "1.1.6";
 
   src = fetchFromGitHub {
     owner = "rootless-containers";
     repo = "slirp4netns";
     rev = "v${version}";
-    sha256 = "13hlljkqss9abjpwaa5gcn6qnax0ws03zzh45c4rv1if7rwk6nbl";
+    sha256 = "1nspvzcpwmaipdq49jm7z3ymdg95zqgcyv1cjfs1zb950knrrggr";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

From f8e066b5ed0980ca6acccf6b701cc129a855c7cb Mon Sep 17 00:00:00 2001
From: Bas van Dijk <bas@dfinity.org>
Date: Wed, 4 Nov 2020 09:24:38 +0000
Subject: [PATCH 1203/3942] mlc: refactoring

---
 pkgs/tools/system/mlc/default.nix | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/tools/system/mlc/default.nix
index fc9302e2698a..d055c98e04cb 100644
--- a/pkgs/tools/system/mlc/default.nix
+++ b/pkgs/tools/system/mlc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, lib }:
+{ stdenv, fetchurl, patchelf }:
 stdenv.mkDerivation rec {
   pname = "mlc";
   version = "3.9";
@@ -10,25 +10,21 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "Linux";
 
-  nativeBuildInputs = [ patchelf ];
-
-  phases = [ "unpackPhase" "installPhase" "patchPhase" ];
-
   installPhase = ''
-    mkdir -p $out/bin
-    cp mlc $out/bin/mlc
-    chmod +x $out/bin/mlc
+    install -Dm755 mlc $out/bin/mlc
   '';
 
-  patchPhase = ''
+  nativeBuildInputs = [ patchelf ];
+
+  fixupPhase = ''
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/mlc
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://software.intel.com/content/www/us/en/develop/articles/intelr-memory-latency-checker.html";
     description = "Intel Memory Latency Checker";
-    license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ basvandijk ];
-    platforms = with lib.platforms; linux;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ basvandijk ];
+    platforms = with platforms; linux;
   };
 }

From 9fdc485e52a99accf8120899350fc3d0d08b9bdb Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 4 Nov 2020 10:39:13 +0100
Subject: [PATCH 1204/3942] mamba: 1.6 -> 1.7

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

diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix
index 23a94668ded1..b8c5fe13a3f4 100644
--- a/pkgs/applications/audio/mamba/default.nix
+++ b/pkgs/applications/audio/mamba/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mamba";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "brummer10";
     repo = "Mamba";
     rev = "v${version}";
-    sha256 = "02w47347cbfqxybh908ww5ifd9jcns8v0msycq59y9q7x0a2h6fh";
+    sha256 = "1i78snpyxap2r4899967nyfr8hg20k45nsbshs9h6hdxbfwhikbc";
     fetchSubmodules = true;
   };
 

From b6c43061ff37992e2a163fe8426f983c5ef90b40 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 09:42:48 +0000
Subject: [PATCH 1205/3942] pulseeffects: 4.8.1 -> 4.8.2

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

diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index a7b97e9daaf8..427d29768d66 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -44,13 +44,13 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "pulseeffects";
-  version = "4.8.1";
+  version = "4.8.2";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "pulseeffects";
     rev = "v${version}";
-    sha256 = "17yfs3ja7vflywhxbn3n3r8n6hl829x257kzplg2vpppppg6ylj6";
+    sha256 = "19h47mrxjm6x83pqcxfsshf48kd1babfk0kwdy1c7fjri7kj0g0s";
   };
 
   nativeBuildInputs = [

From 7b405fade85866d2d3a7e06476f25f6a4adb93f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 10:10:05 +0000
Subject: [PATCH 1206/3942] precice: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix
index d8501428079b..f0064dbd3623 100644
--- a/pkgs/development/libraries/precice/default.nix
+++ b/pkgs/development/libraries/precice/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "precice";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "precice";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1268dz39sx3gygnm7vpg59k1wdhy6rhf72i8i0kz4jckll0s9102";
+    sha256 = "180db4nlir2409wzdnsc1bkyrllnki8d551qbm1rg82zkz3vdmqg";
   };
 
   cmakeFlags = [

From a9d894b85e655c91951bdaa728263605b69709ab Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Wed, 4 Nov 2020 13:12:09 +0300
Subject: [PATCH 1207/3942] =?UTF-8?q?whitebox-tools:=201.3.0=20=E2=86=92?=
 =?UTF-8?q?=201.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/gis/whitebox-tools/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index 0ac19c0d1336..61c2bbc542cd 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, rustPlatform , fetchFromGitHub, Security }:
+{ stdenv, rustPlatform, fetchFromGitHub, Security }:
 rustPlatform.buildRustPackage rec {
   pname = "whitebox_tools";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "jblindsay";
     repo = "whitebox-tools";
-    rev = "v${version}";
-    sha256 = "0c9jmfjz6ys65y65zlllv9xvaaavr9jpqc1dc217iywhj07j8k2v";
+    rev = version;
+    sha256 = "0s5byn8qyi1bm59j9vhwqaygw5cxipc7wbd3flh7n24nx0s8pr8c";
   };
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
-  cargoSha256 = "05w2jimmygg7dc93i8bpjpjc5yj5xfpfkjnbbgw2sq4kh06r5ii4";
+  cargoSha256 = "09rz8f1xyc64qjbj6pgw8jxr2a7chghmdc6sfkbv7hdvx6vg4wvk";
 
   meta = with stdenv.lib; {
     description = "An advanced geospatial data analysis platform";

From c21a04cab9c500d8f230db3d8b6cb436d3fcc2fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 10:30:18 +0000
Subject: [PATCH 1208/3942] prometheus-process-exporter: 0.5.0 -> 0.7.1

---
 pkgs/servers/monitoring/prometheus/process-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix
index 9b90b9a57f95..53497b685b87 100644
--- a/pkgs/servers/monitoring/prometheus/process-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "process-exporter";
-  version = "0.5.0";
+  version = "0.7.1";
 
   goPackagePath = "github.com/ncabatoff/process-exporter";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "ncabatoff";
     repo = pname;
     rev = "v${version}";
-    sha256 = "129vqry3l8waxcyvx83wg0dvh3qg4pr3rl5fw7vmhgdzygbaq3bq";
+    sha256 = "0jkh4xzjlrlabpll3igpyhqs35f1dxifjkbfxvijjcq9yahxfj0x";
   };
 
   postPatch = ''

From c2bd0a487167b6179c364a765e9bb96c762b31fe Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 2 Nov 2020 20:58:14 +0300
Subject: [PATCH 1209/3942] openxray: 730-july-preview -> 784-october-preview

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

diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix
index 394edcf1953a..13bc046e8643 100644
--- a/pkgs/games/openxray/default.nix
+++ b/pkgs/games/openxray/default.nix
@@ -3,13 +3,13 @@
 , pcre, makeWrapper }:
 
 let
-  version = "730-july-preview";
+  version = "784-october-preview";
 
   src = fetchFromGitHub {
     owner = "OpenXRay";
     repo = "xray-16";
     rev = version;
-    sha256 = "1nish3sbpk0hsag7r4nyx8j6pl9mlgx58v8dhzg2vwj2q32isyb2";
+    sha256 = "0q0h70gbpscdvn45wpxicljj4ji3cd2maijd5b7jhr1695h61q5y";
     fetchSubmodules = true;
   };
 

From f5adeda7e6b8af39b9f5c40b60fa9c20222c5869 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 10:36:17 +0000
Subject: [PATCH 1210/3942] php73Packages.php-cs-fixer: 2.16.4 -> 2.16.7

---
 pkgs/development/php-packages/php-cs-fixer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix
index 48d45cc4ea90..de8e17f8f235 100644
--- a/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "php-cs-fixer";
-  version = "2.16.4";
+  version = "2.16.7";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
-    sha256 = "05rdvypxc86hjs8b7id2csa7g1rf7dk2swzfvd5768abdgfasvr8";
+    sha256 = "1azivqvgqy224g2ch9v9qgi31w4ml7fph3bsk8c304yvbvvfv5nh";
   };
 
   phases = [ "installPhase" ];

From d116fe2924e18869d13ea8647d5aff23b94c37db Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 3 Nov 2020 20:09:30 +0100
Subject: [PATCH 1211/3942] intel-media-driver: 20.3.0 -> 20.4.0

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

diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index cb8c0a1cb145..498265a5a2f0 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-media-driver";
-  version = "20.3.0";
+  version = "20.4.0";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "media-driver";
     rev    = "intel-media-${version}";
-    sha256 = "0dy30g32iqyygap3cm1idbhwnm1p3qvf2j2nzcr9n5im287h5gcr";
+    sha256 = "0nah3h3s6hqbgz1wqp5j1grzq0q939wbh4b9d27dmb4wy6ma41sl";
   };
 
   cmakeFlags = [

From 43e8cb49b985aeee7878e51d9cc245910e9a8ac2 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Wed, 4 Nov 2020 13:41:37 +0300
Subject: [PATCH 1212/3942] =?UTF-8?q?mu-repo:=201.8.0=20=E2=86=92=201.8.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/misc/mu-repo/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/mu-repo/default.nix b/pkgs/applications/misc/mu-repo/default.nix
index ddee1939b02a..eacd1971610f 100644
--- a/pkgs/applications/misc/mu-repo/default.nix
+++ b/pkgs/applications/misc/mu-repo/default.nix
@@ -1,20 +1,19 @@
-{ lib, fetchFromGitHub, buildPythonApplication, pytest, git }:
+{ lib, fetchFromGitHub, buildPythonApplication, pytestCheckHook, git }:
 
 buildPythonApplication rec {
   pname = "mu-repo";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "fabioz";
     repo = pname;
-    rev = with lib;
-      "mu_repo_" + concatStringsSep "_" (splitVersion version);
-    sha256 = "1dxfggzbhiips0ww2s93yba9842ycp0i3x2i8vvcx0vgicv3rv6f";
+    rev = "mu_repo_${lib.replaceStrings [ "." ] [ "_" ] version}";
+    sha256 = "0mmjdkvmdlsndi2q56ybxyz2988ppxsbbr1g54nzzkkvab2bc2na";
   };
 
-  checkInputs = [ pytest git ];
-  # disable test which assumes it's a git repo
-  checkPhase = "py.test mu_repo --ignore=mu_repo/tests/test_checkout.py";
+  propagatedBuildInputs = [ git ];
+
+  checkInputs = [ pytestCheckHook git ];
 
   meta = with lib; {
     description = "Tool to help in dealing with multiple git repositories";

From 988f0cf3c5c7f4372dd353ed148935cd943ff8ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Wed, 4 Nov 2020 07:45:44 -0300
Subject: [PATCH 1213/3942] iosevka-bin: Use iosevka's meta

The two packages have the same metadata, except for the maintainers.
---
 pkgs/data/fonts/iosevka/bin.nix   | 16 +++++-----------
 pkgs/data/fonts/iosevka/update.sh | 10 +++++-----
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index c3e77c1051fb..e624e85dd48b 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip
+{ stdenv, lib, fetchurl, iosevka, unzip
 , variant ? ""
 }:
 
@@ -29,16 +29,10 @@ in stdenv.mkDerivation rec {
     unzip -d $out/share/fonts/truetype $src
   '';
 
-  meta = with lib; {
-    homepage = "https://be5invis.github.io/Iosevka/";
-    downloadPage = "https://github.com/be5invis/Iosevka/releases";
-    description = ''
-      Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
-      Pro, M+ and PF DIN Mono, designed to be the ideal font for programming.
-    '';
-    license = licenses.ofl;
-    platforms = platforms.all;
-    maintainers = [ maintainers.cstrahan ];
+  meta = iosevka.meta // {
+    maintainers = with lib.maintainers; [
+      cstrahan
+    ];
   };
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/data/fonts/iosevka/update.sh b/pkgs/data/fonts/iosevka/update.sh
index df78c62a6ce8..a402f152d8a1 100755
--- a/pkgs/data/fonts/iosevka/update.sh
+++ b/pkgs/data/fonts/iosevka/update.sh
@@ -1,11 +1,12 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p curl jq
 
-set -e
+set -euo pipefail
+cd "$(dirname "${BASH_SOURCE[0]}")"
 
 release=$(curl -s https://api.github.com/repos/be5invis/Iosevka/releases/latest)
 
-oldVersion=$(nix-instantiate --eval -E 'with import ./. {}; lib.getVersion iosevka-bin' | tr -d '"')
+oldVersion=$(nix-instantiate --eval -E 'with import ../../../.. {}; lib.getVersion iosevka-bin' | tr -d '"')
 version=$(echo "$release" | jq -r .tag_name | tr -d v)
 
 if test "$oldVersion" = "$version"; then
@@ -13,8 +14,7 @@ if test "$oldVersion" = "$version"; then
 	exit 0
 fi
 
-file=$(nix-instantiate --eval -A iosevka-bin.meta.position | sed -r 's/^"(.*):[0-9]+"$/\1/')
-sed -i "s/$oldVersion/$version/" "$file"
+sed -i "s/$oldVersion/$version/" bin.nix
 
 {
 	echo '# This file was autogenerated. DO NOT EDIT!'
@@ -25,4 +25,4 @@ sed -i "s/$oldVersion/$version/" "$file"
 			$(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset")
 	done
 	echo '}'
-} >$(dirname "$file")/variants.nix
+} >variants.nix

From e237f23b6afca53ee2640f2e156fdaf171afea58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Fri, 30 Oct 2020 22:16:26 -0300
Subject: [PATCH 1214/3942] iosevka-bin: move update script

Move bin.nix's update script to update-bin.sh so it doesn't conflict
with default.nix's update script.
---
 pkgs/data/fonts/iosevka/bin.nix                      | 2 +-
 pkgs/data/fonts/iosevka/{update.sh => update-bin.sh} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/data/fonts/iosevka/{update.sh => update-bin.sh} (100%)

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index e624e85dd48b..8188c569ff7d 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -35,5 +35,5 @@ in stdenv.mkDerivation rec {
     ];
   };
 
-  passthru.updateScript = ./update.sh;
+  passthru.updateScript = ./update-bin.sh;
 }
diff --git a/pkgs/data/fonts/iosevka/update.sh b/pkgs/data/fonts/iosevka/update-bin.sh
similarity index 100%
rename from pkgs/data/fonts/iosevka/update.sh
rename to pkgs/data/fonts/iosevka/update-bin.sh

From e6bc641ef45e773a2eba5ba35fda697faf79cac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Fri, 30 Oct 2020 22:22:01 -0300
Subject: [PATCH 1215/3942] iosevka: 3.2.2 -> 3.7.1; fetch source through
 nodePackages

Previously we used nodePackages only to fetch Iosevka's build
dependencies and then fetched the source code ourselves.  Updates
involved changing the version and hashes in the `iosevka` derivation and
then running node-packages/generate.sh to update the build dependencies,
which in turns updates *all* of node-packages.nix.

A new proposed policy for handling node-packages.nix updates involves
batching those updates.  Previously, that would mean `iosevka` and its
build dependencies could end up out of sync until the batched update was
run.

To work with the new policy, we now fetch Iosevka's source code (and
not only its dependencies) through nodePackages.  Updates are done by
changing the source URL in node-packages.json, which eventually becomes
part of an update of node-packages.nix, which is then propagated to
`iosevka` itself.

One con of this strategy is that errors can not be caught directly
after the update, but only after node-packages.nix is regenerated.
---
 pkgs/data/fonts/iosevka/default.nix           | 34 ++++++++++++-------
 pkgs/data/fonts/iosevka/package.json          | 28 ---------------
 .../node-packages/node-packages.json          |  2 +-
 3 files changed, 22 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/data/fonts/iosevka/package.json

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 5167c494fa07..36fddc3ce0fc 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -27,21 +27,29 @@
 
 assert (privateBuildPlan != null) -> set != null;
 
+let
+  # We don't know the attribute name for the Iosevka package as it
+  # changes not when our update script is run (which in turn updates
+  # node-packages.json, but when node-packages/generate.sh is run
+  # (which updates node-packages.nix).
+  #
+  # Doing it this way ensures that the package can always be built,
+  # although possibly an older version than ioseva-bin.
+  nodeIosevka = (
+    lib.findSingle
+      (drv: drv ? packageName && drv.packageName == "iosevka")
+      (throw "no 'iosevka' package found in nodePackages")
+      (throw "multiple 'iosevka' packages found in nodePackages")
+      (lib.attrValues nodePackages)
+  ).override (drv: { dontNpmInstall = true; });
+in
 stdenv.mkDerivation rec {
   pname = if set != null then "iosevka-${set}" else "iosevka";
-
-  version = "3.2.2";
-
-  src = fetchFromGitHub {
-    owner = "be5invis";
-    repo = "Iosevka";
-    rev = "v${version}";
-    sha256 = "1wbnp6gr3ywvspwk6i0jn68zwjmsd38arn4n2dkh7mdkrmvah81k";
-  };
+  inherit (nodeIosevka) version src;
 
   nativeBuildInputs = [
     nodejs
-    nodePackages."iosevka-build-deps-../../data/fonts/iosevka"
+    nodeIosevka
     remarshal
     otfcc
     ttfautohint-nox
@@ -61,9 +69,7 @@ stdenv.mkDerivation rec {
       echo -e "\n" >> parameters.toml
       cat "$extraParametersPath" >> parameters.toml
     ''}
-    ln -s ${
-      nodePackages."iosevka-build-deps-../../data/fonts/iosevka"
-    }/lib/node_modules/iosevka-build-deps/node_modules .
+    ln -s ${nodeIosevka}/lib/node_modules/iosevka/node_modules .
     runHook postConfigure
   '';
 
@@ -74,9 +80,11 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
+    runHook preInstall
     fontdir="$out/share/fonts/truetype"
     install -d "$fontdir"
     install "dist/$pname/ttf"/* "$fontdir"
+    runHook postInstall
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/data/fonts/iosevka/package.json b/pkgs/data/fonts/iosevka/package.json
deleted file mode 100644
index bc772960882d..000000000000
--- a/pkgs/data/fonts/iosevka/package.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"name": "iosevka-build-deps",
-	"version": "3.2.2",
-	"scripts": {
-		"build": "verda -f verdafile.js"
-	},
-	"dependencies": {
-		"@iarna/toml": "^2.2.5",
-		"cldr": "^5.5.4",
-		"ejs": "^3.1.3",
-		"fs-extra": "^9.0.0",
-		"object-assign": "^4.1.1",
-		"otfcc-ttcize": "^0.10.2",
-		"patel": "^0.33.1",
-		"prettier": "^2.0.5",
-		"semver": "^7.1.3",
-		"spiro": "^2.0.0",
-		"stylus": "^0.54.7",
-		"topsort": "^0.0.2",
-		"ttf2woff": "^2.0.1",
-		"ttf2woff2": "^3.0.0",
-		"typo-geom": "^0.8.0",
-		"unicode-13.0.0": "^0.8.0",
-		"unorm": "^1.6.0",
-		"verda": "^1.0.1",
-		"which": "^2.0.2"
-	}
-}
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 479e28cfabeb..0e46f65c7823 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -100,7 +100,7 @@
 , "indium"
 , "insect"
 , "ionic"
-, { "iosevka-build-deps": "../../data/fonts/iosevka" }
+, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz"}
 , "jake"
 , "javascript-typescript-langserver"
 , "joplin"

From 26ce7f260775c50238b97aa262429c3ee01bd177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Sat, 31 Oct 2020 09:49:59 -0300
Subject: [PATCH 1216/3942] iosevka: add update script

As outlined in the previous commit, we just need to update the source
URL in node-packages.json, and wait for node-packages.nix to be rebuilt
from it.
---
 pkgs/data/fonts/iosevka/default.nix       |  4 ++++
 pkgs/data/fonts/iosevka/update-default.sh | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100755 pkgs/data/fonts/iosevka/update-default.sh

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 36fddc3ce0fc..9ef751688db3 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -89,6 +89,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  passthru = {
+    updateScript = ./update-default.sh;
+  };
+
   meta = with stdenv.lib; {
     homepage = "https://be5invis.github.io/Iosevka";
     downloadPage = "https://github.com/be5invis/Iosevka/releases";
diff --git a/pkgs/data/fonts/iosevka/update-default.sh b/pkgs/data/fonts/iosevka/update-default.sh
new file mode 100755
index 000000000000..208ea6101ac2
--- /dev/null
+++ b/pkgs/data/fonts/iosevka/update-default.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p common-updater-scripts coreutils gawk replace
+set -euo pipefail
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+nixpkgs=../../../..
+repo=https://github.com/be5invis/Iosevka
+
+# Discover the latest version.
+current_version=$(nix-instantiate "$nixpkgs" --eval --strict -A iosevka.version | tr -d '"')
+new_version=$(list-git-tags "$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }')
+if [[ "$new_version" == "$current_version" ]]; then
+    echo "iosevka: no update found"
+    exit
+fi
+
+# Update the source package in nodePackages.
+current_source="$repo/archive/v$current_version.tar.gz"
+new_source="$repo/archive/v$new_version.tar.gz"
+replace-literal -ef "$current_source" "$new_source" ../../../development/node-packages/node-packages.json
+echo "iosevka: $current_version -> $new_version (after nodePackages update)"

From 08fd340b1eb98b32e0d11d34d893d5e1f34c09c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Sat, 31 Oct 2020 09:41:39 -0300
Subject: [PATCH 1217/3942] iosevka: remove dependency on otfcc

As of Iosevka 3.7.0, otfcc is no longer used.  I haven't checked if
the situation has changed since [2017] but this should make Iosevka
available on aarch64-linux and *-darwin.

[2017]: https://github.com/NixOS/nixpkgs/pull/31835#issuecomment-347048242
---
 pkgs/data/fonts/iosevka/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 9ef751688db3..49c7a00eeb95 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal
-, ttfautohint-nox, otfcc
+, ttfautohint-nox
 
 # Custom font set options.
 # See https://github.com/be5invis/Iosevka#build-your-own-style
@@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
     nodejs
     nodeIosevka
     remarshal
-    otfcc
     ttfautohint-nox
   ];
 

From 1ade372bf80c553e0d3e32992ce96f541f769484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Sat, 31 Oct 2020 09:45:18 -0300
Subject: [PATCH 1218/3942] iosevka: add AluisioASG as maintainer

---
 pkgs/data/fonts/iosevka/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 49c7a00eeb95..3d350796105a 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -107,6 +107,7 @@ stdenv.mkDerivation rec {
       ttuegel
       babariviere
       rileyinman
+      AluisioASG
     ];
   };
 }

From 319ec9b2fa92fc98629abcccbcc3afdf1ae3864e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 10:53:58 +0000
Subject: [PATCH 1219/3942] postman: 7.32.0 -> 7.34.0

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

diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 1495b811d09b..c12e0260fbed 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "postman";
-  version = "7.32.0";
+  version = "7.34.0";
 
   src = fetchurl {
     url = "https://dl.pstmn.io/download/version/${version}/linux64";
-    sha256 = "0dn9awzhaafsdsiwwj6870zyqw4spsmc08zgcc5dhnpcnjcyldf3";
+    sha256 = "13d3wc49wp8rh8kxrn1krsyh24g5m6wl0mfhvbjylv0q6kp5jlan";
     name = "${pname}.tar.gz";
   };
 

From 5a60fcf9e89ba962773bfb723fb682a4a4ab8846 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 11 Oct 2020 14:12:04 +0300
Subject: [PATCH 1220/3942] pg_featureserv: init at 1.1.1

---
 pkgs/servers/pg_featureserv/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/servers/pg_featureserv/default.nix

diff --git a/pkgs/servers/pg_featureserv/default.nix b/pkgs/servers/pg_featureserv/default.nix
new file mode 100644
index 000000000000..a50c1d593008
--- /dev/null
+++ b/pkgs/servers/pg_featureserv/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+  pname = "pg_featureserv";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "CrunchyData";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0vfrwncx41yn9n2hqb32av3xgd13fqplrs1qzg5mv25i4qppd88l";
+  };
+
+  vendorSha256 = "1jqrkx850ghmpnfjhqky93r8fq7q63m5ivs0lzljzbvn7ya75f2r";
+
+  meta = with lib; {
+    description = "Lightweight RESTful Geospatial Feature Server for PostGIS in Go";
+    homepage = "https://github.com/CrunchyData/pg_featureserv";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ sikmir ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e0130cc1c1b..2be106732fa3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16987,6 +16987,8 @@ in
 
   tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { };
 
+  pg_featureserv = callPackage ../servers/pg_featureserv { };
+
   pg_tileserv = callPackage ../servers/pg_tileserv { };
 
   pies = callPackage ../servers/pies { };

From 9b588992b7abb733cdcc116aa4b06020e06ba7e8 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 4 Nov 2020 12:22:34 +0100
Subject: [PATCH 1221/3942] newman: 5.2.0 -> 5.2.1

---
 pkgs/development/web/newman/node-packages.nix | 1005 +++++++----------
 1 file changed, 389 insertions(+), 616 deletions(-)

diff --git a/pkgs/development/web/newman/node-packages.nix b/pkgs/development/web/newman/node-packages.nix
index 22b7aeccc960..a7c29ca49c76 100644
--- a/pkgs/development/web/newman/node-packages.nix
+++ b/pkgs/development/web/newman/node-packages.nix
@@ -13,22 +13,22 @@ let
         sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
       };
     };
-    "@babel/core-7.11.6" = {
+    "@babel/core-7.12.3" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.11.6";
+      version = "7.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz";
-        sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz";
+        sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==";
       };
     };
-    "@babel/generator-7.11.6" = {
+    "@babel/generator-7.12.5" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.11.6";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz";
-        sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz";
+        sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==";
       };
     };
     "@babel/helper-function-name-7.10.4" = {
@@ -49,31 +49,31 @@ let
         sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==";
       };
     };
-    "@babel/helper-member-expression-to-functions-7.11.0" = {
+    "@babel/helper-member-expression-to-functions-7.12.1" = {
       name = "_at_babel_slash_helper-member-expression-to-functions";
       packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz";
-        sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==";
+        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz";
+        sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==";
       };
     };
-    "@babel/helper-module-imports-7.10.4" = {
+    "@babel/helper-module-imports-7.12.5" = {
       name = "_at_babel_slash_helper-module-imports";
       packageName = "@babel/helper-module-imports";
-      version = "7.10.4";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz";
-        sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==";
+        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz";
+        sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==";
       };
     };
-    "@babel/helper-module-transforms-7.11.0" = {
+    "@babel/helper-module-transforms-7.12.1" = {
       name = "_at_babel_slash_helper-module-transforms";
       packageName = "@babel/helper-module-transforms";
-      version = "7.11.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz";
-        sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==";
+        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz";
+        sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
       };
     };
     "@babel/helper-optimise-call-expression-7.10.4" = {
@@ -85,22 +85,22 @@ let
         sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==";
       };
     };
-    "@babel/helper-replace-supers-7.10.4" = {
+    "@babel/helper-replace-supers-7.12.5" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
-      version = "7.10.4";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz";
-        sha512 = "sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==";
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz";
+        sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==";
       };
     };
-    "@babel/helper-simple-access-7.10.4" = {
+    "@babel/helper-simple-access-7.12.1" = {
       name = "_at_babel_slash_helper-simple-access";
       packageName = "@babel/helper-simple-access";
-      version = "7.10.4";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz";
-        sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==";
+        url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz";
+        sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==";
       };
     };
     "@babel/helper-split-export-declaration-7.11.0" = {
@@ -121,13 +121,13 @@ let
         sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==";
       };
     };
-    "@babel/helpers-7.10.4" = {
+    "@babel/helpers-7.12.5" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.10.4";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz";
-        sha512 = "L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz";
+        sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==";
       };
     };
     "@babel/highlight-7.10.4" = {
@@ -139,13 +139,13 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.11.5" = {
+    "@babel/parser-7.12.5" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.11.5";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz";
-        sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz";
+        sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==";
       };
     };
     "@babel/template-7.10.4" = {
@@ -157,31 +157,31 @@ let
         sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==";
       };
     };
-    "@babel/traverse-7.11.5" = {
+    "@babel/traverse-7.12.5" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.11.5";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz";
-        sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz";
+        sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==";
       };
     };
-    "@babel/types-7.11.5" = {
+    "@babel/types-7.12.6" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.11.5";
+      version = "7.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz";
-        sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz";
+        sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==";
       };
     };
-    "@eslint/eslintrc-0.1.3" = {
+    "@eslint/eslintrc-0.2.1" = {
       name = "_at_eslint_slash_eslintrc";
       packageName = "@eslint/eslintrc";
-      version = "0.1.3";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz";
-        sha512 = "4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==";
+        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz";
+        sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==";
       };
     };
     "@istanbuljs/load-nyc-config-1.1.0" = {
@@ -202,13 +202,13 @@ let
         sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==";
       };
     };
-    "@postman/form-data-3.1.0" = {
+    "@postman/form-data-3.1.1" = {
       name = "_at_postman_slash_form-data";
       packageName = "@postman/form-data";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@postman/form-data/-/form-data-3.1.0.tgz";
-        sha512 = "6x1UHKQ45Sv5yLFjqhhtyk3YGOF9677RVRQjfr32Bkt45pH8yIlqcpPxiIR4/ZEs3GFk5vl5j9ymmdLTt0HR6Q==";
+        url = "https://registry.npmjs.org/@postman/form-data/-/form-data-3.1.1.tgz";
+        sha512 = "vjh8Q2a8S6UCm/KKs31XFJqEEgmbjBmpPNVV2eVav6905wyFAwaUOBGA1NPBI4ERH9MMZc6w0umFgM6WbEPMdg==";
       };
     };
     "@postman/tunnel-agent-0.6.3" = {
@@ -247,13 +247,13 @@ let
         sha512 = "KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==";
       };
     };
-    "@sinonjs/samsam-5.1.0" = {
+    "@sinonjs/samsam-5.2.0" = {
       name = "_at_sinonjs_slash_samsam";
       packageName = "@sinonjs/samsam";
-      version = "5.1.0";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.1.0.tgz";
-        sha512 = "42nyaQOVunX5Pm6GRJobmzbS7iLI+fhERITnETXzzwDZh+TtDr/Au3yAvXVjFmZ4wEUaE4Y3NFZfKv0bV0cbtg==";
+        url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.2.0.tgz";
+        sha512 = "CaIcyX5cDsjcW/ab7HposFWzV1kC++4HNsfnEdFJa7cP1QIuILAKV+BgfeqRXhcnSAc76r/Rh/O5C+300BwUIw==";
       };
     };
     "@sinonjs/text-encoding-0.7.1" = {
@@ -265,13 +265,13 @@ let
         sha512 = "+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==";
       };
     };
-    "@types/color-name-1.1.1" = {
-      name = "_at_types_slash_color-name";
-      packageName = "@types/color-name";
-      version = "1.1.1";
+    "@ungap/promise-all-settled-1.1.2" = {
+      name = "_at_ungap_slash_promise-all-settled";
+      packageName = "@ungap/promise-all-settled";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz";
-        sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==";
+        url = "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz";
+        sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==";
       };
     };
     "JSONStream-1.3.2" = {
@@ -283,13 +283,13 @@ let
         sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea";
       };
     };
-    "acorn-7.4.0" = {
+    "acorn-7.4.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "7.4.0";
+      version = "7.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz";
-        sha512 = "+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz";
+        sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";
       };
     };
     "acorn-jsx-5.3.1" = {
@@ -310,13 +310,13 @@ let
         sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==";
       };
     };
-    "ajv-6.12.4" = {
+    "ajv-6.12.6" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.12.4";
+      version = "6.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz";
-        sha512 = "eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz";
+        sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
       };
     };
     "ansi-colors-4.1.1" = {
@@ -391,13 +391,13 @@ let
         sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
-    "ansi-styles-4.2.1" = {
+    "ansi-styles-4.3.0" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
-      version = "4.2.1";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz";
-        sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz";
+        sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
       };
     };
     "anymatch-3.1.1" = {
@@ -481,15 +481,6 @@ let
         sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6";
       };
     };
-    "array.prototype.map-1.0.2" = {
-      name = "array.prototype.map";
-      packageName = "array.prototype.map";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz";
-        sha512 = "Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==";
-      };
-    };
     "asn1-0.2.4" = {
       name = "asn1";
       packageName = "asn1";
@@ -589,6 +580,15 @@ let
         sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==";
       };
     };
+    "aws4-1.11.0" = {
+      name = "aws4";
+      packageName = "aws4";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz";
+        sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
+      };
+    };
     "balanced-match-1.0.0" = {
       name = "balanced-match";
       packageName = "balanced-match";
@@ -760,6 +760,15 @@ let
         sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
       };
     };
+    "camelcase-6.2.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "6.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz";
+        sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==";
+      };
+    };
     "caseless-0.12.0" = {
       name = "caseless";
       packageName = "caseless";
@@ -814,13 +823,13 @@ let
         sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==";
       };
     };
-    "chardet-1.2.1" = {
+    "chardet-1.3.0" = {
       name = "chardet";
       packageName = "chardet";
-      version = "1.2.1";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chardet/-/chardet-1.2.1.tgz";
-        sha512 = "bnDt+69nS8Hi7Xmt0uDiQ32/hRpMK/0pc4lc32Y87voBgdsz26VZXOyo5VNQWQfe7rUsevZIfWB82C5QSpCXcQ==";
+        url = "https://registry.npmjs.org/chardet/-/chardet-1.3.0.tgz";
+        sha512 = "cyTQGGptIjIT+CMGT5J/0l9c6Fb+565GCFjjeUTKxUO7w3oR+FcNCMEKTn5xtVKaLFmladN7QF68IiQsv5Fbdw==";
       };
     };
     "charset-1.0.1" = {
@@ -841,13 +850,13 @@ let
         sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82";
       };
     };
-    "chokidar-3.4.2" = {
+    "chokidar-3.4.3" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.4.2";
+      version = "3.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz";
-        sha512 = "IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz";
+        sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==";
       };
     };
     "chownr-1.1.4" = {
@@ -904,13 +913,13 @@ let
         sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==";
       };
     };
-    "collect-all-1.0.3" = {
+    "collect-all-1.0.4" = {
       name = "collect-all";
       packageName = "collect-all";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/collect-all/-/collect-all-1.0.3.tgz";
-        sha512 = "0y0rBgoX8IzIjBAUnO73SEtSb4Mhk3IoceWJq5zZSxb9mWORhWH8xLYo4EDSOE1jRBk1LhmfjqWFFt10h/+MEA==";
+        url = "https://registry.npmjs.org/collect-all/-/collect-all-1.0.4.tgz";
+        sha512 = "RKZhRwJtJEP5FWul+gkSMEnaK6H3AGPTTWOiRimCcs+rc/OmQE3Yhy1Q7A7KsdkG3ZXVdZq68Y6ONSdvkeEcKA==";
       };
     };
     "color-convert-1.9.3" = {
@@ -1030,13 +1039,13 @@ let
         sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==";
       };
     };
-    "commander-6.1.0" = {
+    "commander-6.2.0" = {
       name = "commander";
       packageName = "commander";
-      version = "6.1.0";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz";
-        sha512 = "wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==";
+        url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz";
+        sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==";
       };
     };
     "comment-parser-0.7.6" = {
@@ -1174,15 +1183,6 @@ let
         sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
       };
     };
-    "debug-4.1.1" = {
-      name = "debug";
-      packageName = "debug";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
-        sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
-      };
-    };
     "debug-4.2.0" = {
       name = "debug";
       packageName = "debug";
@@ -1192,6 +1192,15 @@ let
         sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==";
       };
     };
+    "debug-4.3.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz";
+        sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg==";
+      };
+    };
     "decamelize-1.2.0" = {
       name = "decamelize";
       packageName = "decamelize";
@@ -1201,6 +1210,15 @@ let
         sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
       };
     };
+    "decamelize-4.0.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz";
+        sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==";
+      };
+    };
     "deep-eql-3.0.1" = {
       name = "deep-eql";
       packageName = "deep-eql";
@@ -1237,15 +1255,6 @@ let
         sha512 = "ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==";
       };
     };
-    "define-properties-1.1.3" = {
-      name = "define-properties";
-      packageName = "define-properties";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz";
-        sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
-      };
-    };
     "delayed-stream-1.0.0" = {
       name = "delayed-stream";
       packageName = "delayed-stream";
@@ -1327,13 +1336,13 @@ let
         sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
-    "domelementtype-2.0.1" = {
+    "domelementtype-2.0.2" = {
       name = "domelementtype";
       packageName = "domelementtype";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz";
-        sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==";
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz";
+        sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==";
       };
     };
     "domhandler-2.4.2" = {
@@ -1426,40 +1435,13 @@ let
         sha512 = "MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==";
       };
     };
-    "es-abstract-1.17.6" = {
-      name = "es-abstract";
-      packageName = "es-abstract";
-      version = "1.17.6";
+    "entities-2.1.0" = {
+      name = "entities";
+      packageName = "entities";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz";
-        sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==";
-      };
-    };
-    "es-array-method-boxes-properly-1.0.0" = {
-      name = "es-array-method-boxes-properly";
-      packageName = "es-array-method-boxes-properly";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz";
-        sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==";
-      };
-    };
-    "es-get-iterator-1.1.0" = {
-      name = "es-get-iterator";
-      packageName = "es-get-iterator";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz";
-        sha512 = "UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==";
-      };
-    };
-    "es-to-primitive-1.2.1" = {
-      name = "es-to-primitive";
-      packageName = "es-to-primitive";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
-        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
+        url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz";
+        sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==";
       };
     };
     "es6-error-4.1.1" = {
@@ -1507,22 +1489,22 @@ let
         sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==";
       };
     };
-    "eslint-7.8.0" = {
+    "eslint-7.12.1" = {
       name = "eslint";
       packageName = "eslint";
-      version = "7.8.0";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.8.0.tgz";
-        sha512 = "qgtVyLZqKd2ZXWnLQA4NtVbOyH56zivOAdBFWE54RFkSZjokzNrcP4Z0eVWsZ+84ByXv+jL9k/wE1ENYe8xRFw==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz";
+        sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==";
       };
     };
-    "eslint-plugin-jsdoc-30.3.0" = {
+    "eslint-plugin-jsdoc-30.7.6" = {
       name = "eslint-plugin-jsdoc";
       packageName = "eslint-plugin-jsdoc";
-      version = "30.3.0";
+      version = "30.7.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.3.0.tgz";
-        sha512 = "RvDLH26ILwX2J60P7tlNdz5IlTFeC52TEFgAC12+nz/lOx4a7n3/hP8fBPFZrQP07WA1t9ZOO8H/i7cEs2BTnA==";
+        url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.6.tgz";
+        sha512 = "w18IOiS/9ahKgRfQOuHbce+EQYx3fwIkZhUZDEK+augNlhJkzgTSZkrBkzaflSbFNZ9/Tk4xzUABEaTbsBSzew==";
       };
     };
     "eslint-plugin-lodash-7.1.0" = {
@@ -1552,13 +1534,13 @@ let
         sha512 = "xlS7P2PLMXeqfhyf3NpqbvbnW04kN8M9NtmhpR3XGyOvt/vNKS7XPXT5EDbwKW9vCjWH4PpfQvgD/+JgN0VJKA==";
       };
     };
-    "eslint-scope-5.1.0" = {
+    "eslint-scope-5.1.1" = {
       name = "eslint-scope";
       packageName = "eslint-scope";
-      version = "5.1.0";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz";
-        sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==";
+        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz";
+        sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==";
       };
     };
     "eslint-utils-2.1.0" = {
@@ -1579,6 +1561,15 @@ let
         sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==";
       };
     };
+    "eslint-visitor-keys-2.0.0" = {
+      name = "eslint-visitor-keys";
+      packageName = "eslint-visitor-keys";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz";
+        sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==";
+      };
+    };
     "espree-7.3.0" = {
       name = "espree";
       packageName = "espree";
@@ -1804,13 +1795,13 @@ let
         sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==";
       };
     };
-    "flat-4.1.0" = {
+    "flat-5.0.2" = {
       name = "flat";
       packageName = "flat";
-      version = "4.1.0";
+      version = "5.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz";
-        sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==";
+        url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz";
+        sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==";
       };
     };
     "flat-cache-2.0.1" = {
@@ -1822,13 +1813,22 @@ let
         sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==";
       };
     };
-    "flatted-2.0.1" = {
+    "flatted-2.0.2" = {
       name = "flatted";
       packageName = "flatted";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz";
-        sha512 = "a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==";
+        url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz";
+        sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
+      };
+    };
+    "flatted-3.1.0" = {
+      name = "flatted";
+      packageName = "flatted";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz";
+        sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==";
       };
     };
     "foreground-child-2.0.0" = {
@@ -1849,13 +1849,13 @@ let
         sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     };
-    "fromentries-1.2.1" = {
+    "fromentries-1.3.1" = {
       name = "fromentries";
       packageName = "fromentries";
-      version = "1.2.1";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fromentries/-/fromentries-1.2.1.tgz";
-        sha512 = "Xu2Qh8yqYuDhQGOhD5iJGninErSfI9A3FrriD3tjUgV5VbJFeH8vfgZ9HnC6jWN80QDVNQK5vmxRAmEAp7Mevw==";
+        url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.1.tgz";
+        sha512 = "w4t/zm2J+uAcrpeKyW0VmYiIs3aqe/xKQ+2qwazVNZSCklQHhaVjk6XzKw5GtImq5thgL0IVRjGRAOastb08RQ==";
       };
     };
     "fs-constants-1.0.0" = {
@@ -1912,13 +1912,13 @@ let
         sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
       };
     };
-    "gensync-1.0.0-beta.1" = {
+    "gensync-1.0.0-beta.2" = {
       name = "gensync";
       packageName = "gensync";
-      version = "1.0.0-beta.1";
+      version = "1.0.0-beta.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz";
-        sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==";
+        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz";
+        sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
       };
     };
     "get-caller-file-2.0.5" = {
@@ -2083,22 +2083,13 @@ let
         sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
       };
     };
-    "has-symbols-1.0.1" = {
-      name = "has-symbols";
-      packageName = "has-symbols";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
-        sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
-      };
-    };
-    "hasha-5.2.0" = {
+    "hasha-5.2.2" = {
       name = "hasha";
       packageName = "hasha";
-      version = "5.2.0";
+      version = "5.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz";
-        sha512 = "2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==";
+        url = "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz";
+        sha512 = "Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==";
       };
     };
     "he-1.2.0" = {
@@ -2137,13 +2128,13 @@ let
         sha1 = "a953ca670078669dde142ce899401b9d6e85d3b4";
       };
     };
-    "http-signature-1.3.4" = {
+    "http-signature-1.3.5" = {
       name = "http-signature";
       packageName = "http-signature";
-      version = "1.3.4";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.4.tgz";
-        sha512 = "CbG3io8gUSIxNNSgq+XMjgpTMzAeVRipxVXjuGrDhH5M1a2kZ03w20s8FCLR1NjnnJj10KbvabvckmtQcYNb9g==";
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.5.tgz";
+        sha512 = "NwoTQYSJoFt34jSBbwzDHDofoA61NGXzu6wXh95o1Ry62EnmKjXb/nR/RknLeZ3G/uGwrlKNY2z7uPt+Cdl7Tw==";
       };
     };
     "httpntlm-1.7.6" = {
@@ -2182,13 +2173,13 @@ let
         sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==";
       };
     };
-    "import-fresh-3.2.1" = {
+    "import-fresh-3.2.2" = {
       name = "import-fresh";
       packageName = "import-fresh";
-      version = "3.2.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz";
-        sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==";
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz";
+        sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==";
       };
     };
     "imurmurhash-0.1.4" = {
@@ -2254,15 +2245,6 @@ let
         sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
       };
     };
-    "is-arguments-1.0.4" = {
-      name = "is-arguments";
-      packageName = "is-arguments";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz";
-        sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==";
-      };
-    };
     "is-binary-path-2.1.0" = {
       name = "is-binary-path";
       packageName = "is-binary-path";
@@ -2272,31 +2254,13 @@ let
         sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
       };
     };
-    "is-buffer-2.0.4" = {
-      name = "is-buffer";
-      packageName = "is-buffer";
-      version = "2.0.4";
+    "is-core-module-2.0.0" = {
+      name = "is-core-module";
+      packageName = "is-core-module";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz";
-        sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==";
-      };
-    };
-    "is-callable-1.2.1" = {
-      name = "is-callable";
-      packageName = "is-callable";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz";
-        sha512 = "wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==";
-      };
-    };
-    "is-date-object-1.0.2" = {
-      name = "is-date-object";
-      packageName = "is-date-object";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
-        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz";
+        sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==";
       };
     };
     "is-extglob-2.1.1" = {
@@ -2335,15 +2299,6 @@ let
         sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
       };
     };
-    "is-map-2.0.1" = {
-      name = "is-map";
-      packageName = "is-map";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz";
-        sha512 = "T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==";
-      };
-    };
     "is-number-7.0.0" = {
       name = "is-number";
       packageName = "is-number";
@@ -2353,31 +2308,13 @@ let
         sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
       };
     };
-    "is-plain-obj-1.1.0" = {
+    "is-plain-obj-2.1.0" = {
       name = "is-plain-obj";
       packageName = "is-plain-obj";
-      version = "1.1.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz";
-        sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e";
-      };
-    };
-    "is-regex-1.1.1" = {
-      name = "is-regex";
-      packageName = "is-regex";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz";
-        sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==";
-      };
-    };
-    "is-set-2.0.1" = {
-      name = "is-set";
-      packageName = "is-set";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz";
-        sha512 = "eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==";
+        url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz";
+        sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==";
       };
     };
     "is-stream-2.0.0" = {
@@ -2389,24 +2326,6 @@ let
         sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
       };
     };
-    "is-string-1.0.5" = {
-      name = "is-string";
-      packageName = "is-string";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz";
-        sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==";
-      };
-    };
-    "is-symbol-1.0.3" = {
-      name = "is-symbol";
-      packageName = "is-symbol";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
-        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
-      };
-    };
     "is-typedarray-1.0.0" = {
       name = "is-typedarray";
       packageName = "is-typedarray";
@@ -2443,15 +2362,6 @@ let
         sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
       };
     };
-    "isarray-2.0.5" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz";
-        sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==";
-      };
-    };
     "isexe-2.0.0" = {
       name = "isexe";
       packageName = "isexe";
@@ -2533,24 +2443,6 @@ let
         sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==";
       };
     };
-    "iterate-iterator-1.0.1" = {
-      name = "iterate-iterator";
-      packageName = "iterate-iterator";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz";
-        sha512 = "3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw==";
-      };
-    };
-    "iterate-value-1.0.2" = {
-      name = "iterate-value";
-      packageName = "iterate-value";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz";
-        sha512 = "A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==";
-      };
-    };
     "js-sha512-0.8.0" = {
       name = "js-sha512";
       packageName = "js-sha512";
@@ -2605,13 +2497,13 @@ let
         sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     };
-    "jsdoc-3.6.5" = {
+    "jsdoc-3.6.6" = {
       name = "jsdoc";
       packageName = "jsdoc";
-      version = "3.6.5";
+      version = "3.6.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.5.tgz";
-        sha512 = "SbY+i9ONuxSK35cgVHaI8O9senTE4CDYAmGSDJ5l3+sfe62Ff4gy96osy6OW84t4K4A8iGnMrlRrsSItSNp3RQ==";
+        url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.6.tgz";
+        sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ==";
       };
     };
     "jsdoc-api-6.0.0" = {
@@ -2731,13 +2623,13 @@ let
         sha512 = "Ioj5I4w18ZcHFaaisqCKdh1z+ipzN7sA2JB+h+WOlGcOMWm0FFN1dfxkgc2I4EXfhSP/mOfM3W43uFzEdz4sTw==";
       };
     };
-    "just-extend-4.1.0" = {
+    "just-extend-4.1.1" = {
       name = "just-extend";
       packageName = "just-extend";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz";
-        sha512 = "ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==";
+        url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz";
+        sha512 = "aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==";
       };
     };
     "klaw-3.0.0" = {
@@ -3010,13 +2902,13 @@ let
         sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==";
       };
     };
-    "marked-1.1.1" = {
+    "marked-1.2.0" = {
       name = "marked";
       packageName = "marked";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz";
-        sha512 = "mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw==";
+        url = "https://registry.npmjs.org/marked/-/marked-1.2.0.tgz";
+        sha512 = "tiRxakgbNPBr301ihe/785NntvYyhxlqcL3YaC8CaxJQh7kiaEtrN9B/eK2I2943Yjkh5gw25chYFDQhOMCwMA==";
       };
     };
     "mdurl-1.0.1" = {
@@ -3100,13 +2992,13 @@ let
         sha512 = "Q2PKB4ZR4UPtjLl76JfzlgSCUZhSV1AXQgAZa1qt5RiaALFjP/CDrGvFBrOz7Ck6McPcwMAxTsJvWOUjOU8XMw==";
       };
     };
-    "mocha-8.1.3" = {
+    "mocha-8.2.1" = {
       name = "mocha";
       packageName = "mocha";
-      version = "8.1.3";
+      version = "8.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz";
-        sha512 = "ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw==";
+        url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz";
+        sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==";
       };
     };
     "ms-2.1.2" = {
@@ -3118,6 +3010,15 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
+    "nanoid-3.1.12" = {
+      name = "nanoid";
+      packageName = "nanoid";
+      version = "3.1.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz";
+        sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==";
+      };
+    };
     "natural-compare-1.4.0" = {
       name = "natural-compare";
       packageName = "natural-compare";
@@ -3235,24 +3136,6 @@ let
         sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==";
       };
     };
-    "object-inspect-1.8.0" = {
-      name = "object-inspect";
-      packageName = "object-inspect";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz";
-        sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==";
-      };
-    };
-    "object-keys-1.1.1" = {
-      name = "object-keys";
-      packageName = "object-keys";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
-        sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
-      };
-    };
     "object-to-spawn-args-2.0.0" = {
       name = "object-to-spawn-args";
       packageName = "object-to-spawn-args";
@@ -3262,15 +3145,6 @@ let
         sha512 = "ZMT4owlXg3JGegecLlAgAA/6BsdKHn63R3ayXcAa3zFkF7oUBHcSb0oxszeutYe0FO2c1lT5pwCuidLkC4Gx3g==";
       };
     };
-    "object.assign-4.1.0" = {
-      name = "object.assign";
-      packageName = "object.assign";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
-        sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
-      };
-    };
     "once-1.4.0" = {
       name = "once";
       packageName = "once";
@@ -3496,22 +3370,22 @@ let
         sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==";
       };
     };
-    "postcss-7.0.32" = {
+    "postcss-7.0.35" = {
       name = "postcss";
       packageName = "postcss";
-      version = "7.0.32";
+      version = "7.0.35";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz";
-        sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==";
+        url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz";
+        sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==";
       };
     };
-    "postman-collection-3.6.6" = {
+    "postman-collection-3.6.8" = {
       name = "postman-collection";
       packageName = "postman-collection";
-      version = "3.6.6";
+      version = "3.6.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-collection/-/postman-collection-3.6.6.tgz";
-        sha512 = "fm9AGKHbL2coSzD5nw+F07JrX7jzqu2doGIXevPPrwlpTZyTM6yagEdENeO/Na8rSUrI1+tKPj+TgAFiLvtF4w==";
+        url = "https://registry.npmjs.org/postman-collection/-/postman-collection-3.6.8.tgz";
+        sha512 = "TNPaK2dpVRhttUFo/WN0ReopXEtuSQMktwcvwJbQ0z8K+5hftvyx2ia40xgg9qFl/Ra78qoNTUmLL1s3lRqLMg==";
       };
     };
     "postman-collection-transformer-3.3.3" = {
@@ -3532,40 +3406,40 @@ let
         sha1 = "60e4fbf3b2175f772520b3c978c07a8bd32b5829";
       };
     };
-    "postman-request-2.88.1-postman.24" = {
+    "postman-request-2.88.1-postman.27" = {
       name = "postman-request";
       packageName = "postman-request";
-      version = "2.88.1-postman.24";
+      version = "2.88.1-postman.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.24.tgz";
-        sha512 = "afW2QxA9YCSaMUBFGRWvxnyjN4SqgXC5HqKJ0DFNfbx4ZW6AsBCFXeb5NAFgCH3kZ/og0XhUSDV+imjWwahLLg==";
+        url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.27.tgz";
+        sha512 = "4Qc7p3/cbp5S4Q6LcOzJ+K5N7loWDKjW0S9hj8M2AMJDUVcFUbdgvQb6ZfTERz2+34xP9ByCy7VhdnNCATe/bA==";
       };
     };
-    "postman-runtime-7.26.5" = {
+    "postman-runtime-7.26.8" = {
       name = "postman-runtime";
       packageName = "postman-runtime";
-      version = "7.26.5";
+      version = "7.26.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-runtime/-/postman-runtime-7.26.5.tgz";
-        sha512 = "5sY4iWjG4GeGQ5o4QAJkAt79jmcZhOrs3XSbtCLrs4NqoZpTBx5WDQr6h1Dy4Y8Q0X/9NMCYqF/c5pnsqUyDCQ==";
+        url = "https://registry.npmjs.org/postman-runtime/-/postman-runtime-7.26.8.tgz";
+        sha512 = "ZMUZ7mQ2SMOX/C/ntgx2SAfRt3VV6wOy+aLyWbAqpQPo5Jfodxwv9QhxGj3S2km+IYzO6BT1luzE8X8fr2UafA==";
       };
     };
-    "postman-sandbox-3.5.9" = {
+    "postman-sandbox-4.0.0" = {
       name = "postman-sandbox";
       packageName = "postman-sandbox";
-      version = "3.5.9";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-sandbox/-/postman-sandbox-3.5.9.tgz";
-        sha512 = "B9mREFulQuYOa9+B7rklb94d9iZ6EYyhsUvdIfxphGUByimb6mOhumWV0sGbrtxVTsCAtTpN/68Shm7NCjrZ0A==";
+        url = "https://registry.npmjs.org/postman-sandbox/-/postman-sandbox-4.0.0.tgz";
+        sha512 = "0j1VCDa5MHMTfZqv2XSYUyn+hgT9izoRdGFAvjtHCH+i+2TP1KxqXzjxXzOdx1pt26wpl9APdJ2hKKFpx9UlrQ==";
       };
     };
-    "postman-url-encoder-2.1.3" = {
+    "postman-url-encoder-3.0.0" = {
       name = "postman-url-encoder";
       packageName = "postman-url-encoder";
-      version = "2.1.3";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-2.1.3.tgz";
-        sha512 = "CwQjnoxaugCGeOyzVeZ4k1cNQ6iS8OBCzuWzcf4kLStKeRp0MwmLKYv25frynmDpugUUimq/d+FZCq6GtIX9Ag==";
+        url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-3.0.0.tgz";
+        sha512 = "bk5wus5/5Ei9pbh+sQXaAxS5n4ZwiNAaIA8VBvRcXP6QyKcue2yF6xk1HqdtaZoH1G8+6509SVeOBojoFQ7nrA==";
       };
     };
     "prelude-ls-1.2.1" = {
@@ -3577,13 +3451,13 @@ let
         sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==";
       };
     };
-    "pretty-ms-7.0.0" = {
+    "pretty-ms-7.0.1" = {
       name = "pretty-ms";
       packageName = "pretty-ms";
-      version = "7.0.0";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.0.tgz";
-        sha512 = "J3aPWiC5e9ZeZFuSeBraGxSkGMOvulSWsxDByOcbD1Pr75YL3LSNIKIb52WXbCLE1sS5s4inBBbryjF4Y05Ceg==";
+        url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz";
+        sha512 = "973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==";
       };
     };
     "process-nextick-args-2.0.1" = {
@@ -3613,15 +3487,6 @@ let
         sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==";
       };
     };
-    "promise.allsettled-1.0.2" = {
-      name = "promise.allsettled";
-      packageName = "promise.allsettled";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz";
-        sha512 = "UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==";
-      };
-    };
     "propagate-2.0.1" = {
       name = "propagate";
       packageName = "propagate";
@@ -3739,13 +3604,13 @@ let
         sha1 = "4dd002d3f30dc11afe3bb177ad8e99094f7f62dd";
       };
     };
-    "readdirp-3.4.0" = {
+    "readdirp-3.5.0" = {
       name = "readdirp";
       packageName = "readdirp";
-      version = "3.4.0";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz";
-        sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==";
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz";
+        sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==";
       };
     };
     "rechoir-0.6.2" = {
@@ -3865,13 +3730,13 @@ let
         sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==";
       };
     };
-    "resolve-1.17.0" = {
+    "resolve-1.18.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.17.0";
+      version = "1.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz";
-        sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz";
+        sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==";
       };
     };
     "resolve-from-4.0.0" = {
@@ -4009,13 +3874,13 @@ let
         sha512 = "vybp3GItaR1ZtO2nxZZo8eOo7fnVaNtP3XE2vJKgzkKR2bagCkdJ1EpYYhEMd3qu/80DwQk9KjsNSxE3fXWq0g==";
       };
     };
-    "serialize-javascript-4.0.0" = {
+    "serialize-javascript-5.0.1" = {
       name = "serialize-javascript";
       packageName = "serialize-javascript";
-      version = "4.0.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz";
-        sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==";
+        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz";
+        sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==";
       };
     };
     "server-destroy-1.0.1" = {
@@ -4081,13 +3946,13 @@ let
         sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
       };
     };
-    "sinon-9.0.3" = {
+    "sinon-9.2.1" = {
       name = "sinon";
       packageName = "sinon";
-      version = "9.0.3";
+      version = "9.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sinon/-/sinon-9.0.3.tgz";
-        sha512 = "IKo9MIM111+smz9JGwLmw5U1075n1YXeAq8YeSFlndCLhAL5KGn6bLgu7b/4AYHTV/LcEMcRm2wU2YiL55/6Pg==";
+        url = "https://registry.npmjs.org/sinon/-/sinon-9.2.1.tgz";
+        sha512 = "naPfsamB5KEE1aiioaoqJ6MEhdUs/2vtI5w1hPAXX/UwvoPjXcwh1m5HiKx0HGgKR8lQSoFIgY5jM6KK8VrS9w==";
       };
     };
     "slice-ansi-2.1.0" = {
@@ -4153,13 +4018,13 @@ let
         sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
       };
     };
-    "spdx-license-ids-3.0.5" = {
+    "spdx-license-ids-3.0.6" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.5";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
-        sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz";
+        sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==";
       };
     };
     "split-ca-1.0.1" = {
@@ -4279,24 +4144,6 @@ let
         sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==";
       };
     };
-    "string.prototype.trimend-1.0.1" = {
-      name = "string.prototype.trimend";
-      packageName = "string.prototype.trimend";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
-        sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==";
-      };
-    };
-    "string.prototype.trimstart-1.0.1" = {
-      name = "string.prototype.trimstart";
-      packageName = "string.prototype.trimstart";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
-        sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==";
-      };
-    };
     "string_decoder-0.10.31" = {
       name = "string_decoder";
       packageName = "string_decoder";
@@ -4369,15 +4216,6 @@ let
         sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==";
       };
     };
-    "strip-json-comments-3.0.1" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz";
-        sha512 = "VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==";
-      };
-    };
     "strip-json-comments-3.1.1" = {
       name = "strip-json-comments";
       packageName = "strip-json-comments";
@@ -4414,15 +4252,6 @@ let
         sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==";
       };
     };
-    "supports-color-7.1.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "7.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz";
-        sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==";
-      };
-    };
     "supports-color-7.2.0" = {
       name = "supports-color";
       packageName = "supports-color";
@@ -4693,13 +4522,13 @@ let
         sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==";
       };
     };
-    "uglify-js-3.10.4" = {
+    "uglify-js-3.11.5" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.10.4";
+      version = "3.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz";
-        sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz";
+        sha512 = "btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w==";
       };
     };
     "underscore-1.10.2" = {
@@ -4747,15 +4576,6 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "uuid-3.3.2" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
-        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
-      };
-    };
     "uuid-3.4.0" = {
       name = "uuid";
       packageName = "uuid";
@@ -4765,22 +4585,22 @@ let
         sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
-    "uvm-1.7.9" = {
+    "uvm-2.0.1" = {
       name = "uvm";
       packageName = "uvm";
-      version = "1.7.9";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uvm/-/uvm-1.7.9.tgz";
-        sha512 = "Z3Uf7Jm8Cpvxf8FMjE7cFBaXsXzKu2n3kFqV23pQNLg8rrZqi6fmLFnLCn5EhiEC94XdcQCCNjrGeOnFdy1xsA==";
+        url = "https://registry.npmjs.org/uvm/-/uvm-2.0.1.tgz";
+        sha512 = "bZAckfNKnr95YkTCVZWyzK+7w1c8sYJuTresCBqhiizByVRtfPqhGJpTwFUSaS2YkaVfsMoN5xZcOCNxTx9uCA==";
       };
     };
-    "v8-compile-cache-2.1.1" = {
+    "v8-compile-cache-2.2.0" = {
       name = "v8-compile-cache";
       packageName = "v8-compile-cache";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz";
-        sha512 = "8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==";
+        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz";
+        sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==";
       };
     };
     "verror-1.10.0" = {
@@ -4873,13 +4693,13 @@ let
         sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw==";
       };
     };
-    "workerpool-6.0.0" = {
+    "workerpool-6.0.2" = {
       name = "workerpool";
       packageName = "workerpool";
-      version = "6.0.0";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz";
-        sha512 = "fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA==";
+        url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz";
+        sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==";
       };
     };
     "wrap-ansi-5.1.0" = {
@@ -5008,15 +4828,6 @@ let
         sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==";
       };
     };
-    "yargs-14.2.3" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "14.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz";
-        sha512 = "ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==";
-      };
-    };
     "yargs-15.4.1" = {
       name = "yargs";
       packageName = "yargs";
@@ -5035,15 +4846,6 @@ let
         sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
       };
     };
-    "yargs-parser-15.0.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "15.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz";
-        sha512 = "0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==";
-      };
-    };
     "yargs-parser-18.1.3" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -5053,13 +4855,13 @@ let
         sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
       };
     };
-    "yargs-unparser-1.6.1" = {
+    "yargs-unparser-2.0.0" = {
       name = "yargs-unparser";
       packageName = "yargs-unparser";
-      version = "1.6.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.1.tgz";
-        sha512 = "qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA==";
+        url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz";
+        sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==";
       };
     };
   };
@@ -5068,49 +4870,49 @@ in
   newman = nodeEnv.buildNodePackage {
     name = "newman";
     packageName = "newman";
-    version = "5.2.0";
+    version = "5.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/newman/-/newman-5.2.0.tgz";
-      sha512 = "VzvKHhdPM7QvuwQfnJMj50hHLf27AE9hCAbMgbP5aXIQ12eKhrL3if1U0OWcB+BvSLdww9nKvMDwvuF72/ipFw==";
+      url = "https://registry.npmjs.org/newman/-/newman-5.2.1.tgz";
+      sha512 = "kEuTMQCiORHZFx92sPVih8RHsJ40JxgxvlsrUe6MFXLQg2/UrO1KaUQCDabTy41tOu0a+dx6Mtg+x+uK1rCPcA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      (sources."@babel/core-7.11.6" // {
+      (sources."@babel/core-7.12.3" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.0"
           sources."semver-5.7.1"
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.11.6" // {
+      (sources."@babel/generator-7.12.5" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
       })
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
-      sources."@babel/helper-member-expression-to-functions-7.11.0"
-      sources."@babel/helper-module-imports-7.10.4"
-      sources."@babel/helper-module-transforms-7.11.0"
+      sources."@babel/helper-member-expression-to-functions-7.12.1"
+      sources."@babel/helper-module-imports-7.12.5"
+      sources."@babel/helper-module-transforms-7.12.1"
       sources."@babel/helper-optimise-call-expression-7.10.4"
-      sources."@babel/helper-replace-supers-7.10.4"
-      sources."@babel/helper-simple-access-7.10.4"
+      sources."@babel/helper-replace-supers-7.12.5"
+      sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-split-export-declaration-7.11.0"
       sources."@babel/helper-validator-identifier-7.10.4"
-      sources."@babel/helpers-7.10.4"
+      sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.11.5"
+      sources."@babel/parser-7.12.5"
       sources."@babel/template-7.10.4"
-      (sources."@babel/traverse-7.11.5" // {
+      (sources."@babel/traverse-7.12.5" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.0"
           sources."globals-11.12.0"
         ];
       })
-      sources."@babel/types-7.11.5"
-      (sources."@eslint/eslintrc-0.1.3" // {
+      sources."@babel/types-7.12.6"
+      (sources."@eslint/eslintrc-0.2.1" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.0"
         ];
       })
       (sources."@istanbuljs/load-nyc-config-1.1.0" // {
@@ -5122,19 +4924,19 @@ in
         ];
       })
       sources."@istanbuljs/schema-0.1.2"
-      sources."@postman/form-data-3.1.0"
+      sources."@postman/form-data-3.1.1"
       sources."@postman/tunnel-agent-0.6.3"
       sources."@sinonjs/commons-1.8.1"
       sources."@sinonjs/fake-timers-6.0.1"
       sources."@sinonjs/formatio-5.0.1"
-      sources."@sinonjs/samsam-5.1.0"
+      sources."@sinonjs/samsam-5.2.0"
       sources."@sinonjs/text-encoding-0.7.1"
-      sources."@types/color-name-1.1.1"
+      sources."@ungap/promise-all-settled-1.1.2"
       sources."JSONStream-1.3.2"
-      sources."acorn-7.4.0"
+      sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
       sources."aggregate-error-3.1.0"
-      sources."ajv-6.12.4"
+      sources."ajv-6.12.6"
       sources."ansi-colors-4.1.1"
       (sources."ansi-escape-sequences-4.1.0" // {
         dependencies = [
@@ -5149,7 +4951,6 @@ in
       sources."argparse-1.0.10"
       sources."array-back-4.0.1"
       sources."array-uniq-1.0.3"
-      sources."array.prototype.map-1.0.2"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."assertion-error-1.1.0"
@@ -5157,7 +4958,7 @@ in
       sources."async-3.2.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
@@ -5198,10 +4999,10 @@ in
       sources."catharsis-0.8.11"
       sources."chai-4.2.0"
       sources."chalk-2.4.2"
-      sources."chardet-1.2.1"
+      sources."chardet-1.3.0"
       sources."charset-1.0.1"
       sources."check-error-1.0.2"
-      sources."chokidar-3.4.2"
+      sources."chokidar-3.4.3"
       sources."chownr-1.1.4"
       sources."clean-stack-2.2.0"
       sources."cli-progress-3.8.2"
@@ -5215,7 +5016,7 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."collect-all-1.0.3"
+      sources."collect-all-1.0.4"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."colors-1.4.0"
@@ -5236,7 +5037,7 @@ in
           sources."array-back-2.0.0"
         ];
       })
-      sources."commander-6.1.0"
+      sources."commander-6.2.0"
       sources."comment-parser-0.7.6"
       sources."common-sequence-2.0.0"
       sources."commondir-1.0.1"
@@ -5271,7 +5072,6 @@ in
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."default-require-extensions-3.0.0"
-      sources."define-properties-1.1.3"
       sources."delayed-stream-1.0.0"
       sources."diff-4.0.2"
       (sources."dmd-5.0.2" // {
@@ -5297,8 +5097,8 @@ in
       sources."doctrine-3.0.0"
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."domelementtype-2.0.1"
-          sources."entities-2.0.3"
+          sources."domelementtype-2.0.2"
+          sources."entities-2.1.0"
         ];
       })
       sources."domelementtype-1.3.1"
@@ -5315,40 +5115,40 @@ in
       sources."end-of-stream-1.4.4"
       sources."enquirer-2.3.6"
       sources."entities-1.1.2"
-      sources."es-abstract-1.17.6"
-      sources."es-array-method-boxes-properly-1.0.0"
-      (sources."es-get-iterator-1.1.0" // {
-        dependencies = [
-          sources."isarray-2.0.5"
-        ];
-      })
-      sources."es-to-primitive-1.2.1"
       sources."es6-error-4.1.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-7.8.0" // {
+      (sources."eslint-7.12.1" // {
         dependencies = [
-          sources."ansi-styles-4.2.1"
+          sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
-          sources."debug-4.2.0"
+          sources."debug-4.3.0"
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
         ];
       })
-      (sources."eslint-plugin-jsdoc-30.3.0" // {
+      (sources."eslint-plugin-jsdoc-30.7.6" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.0"
         ];
       })
       sources."eslint-plugin-lodash-7.1.0"
       sources."eslint-plugin-mocha-8.0.0"
       sources."eslint-plugin-security-1.4.0"
-      sources."eslint-scope-5.1.0"
-      sources."eslint-utils-2.1.0"
-      sources."eslint-visitor-keys-1.3.0"
-      sources."espree-7.3.0"
+      sources."eslint-scope-5.1.1"
+      (sources."eslint-utils-2.1.0" // {
+        dependencies = [
+          sources."eslint-visitor-keys-1.3.0"
+        ];
+      })
+      sources."eslint-visitor-keys-2.0.0"
+      (sources."espree-7.3.0" // {
+        dependencies = [
+          sources."eslint-visitor-keys-1.3.0"
+        ];
+      })
       sources."esprima-4.0.1"
       (sources."esquery-1.3.1" // {
         dependencies = [
@@ -5387,19 +5187,23 @@ in
         ];
       })
       sources."find-up-5.0.0"
-      sources."flat-4.1.0"
-      sources."flat-cache-2.0.1"
-      sources."flatted-2.0.1"
+      sources."flat-5.0.2"
+      (sources."flat-cache-2.0.1" // {
+        dependencies = [
+          sources."flatted-2.0.2"
+        ];
+      })
+      sources."flatted-3.1.0"
       sources."foreground-child-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."fromentries-1.2.1"
+      sources."fromentries-1.3.1"
       sources."fs-constants-1.0.0"
       sources."fs-then-native-2.0.0"
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.1.3"
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
-      sources."gensync-1.0.0-beta.1"
+      sources."gensync-1.0.0-beta.2"
       sources."get-caller-file-2.0.5"
       sources."get-func-name-2.0.0"
       sources."get-package-type-0.1.0"
@@ -5420,18 +5224,17 @@ in
         ];
       })
       sources."has-flag-3.0.0"
-      sources."has-symbols-1.0.1"
-      sources."hasha-5.2.0"
+      sources."hasha-5.2.2"
       sources."he-1.2.0"
       sources."html-escaper-2.0.2"
       sources."htmlparser2-3.10.1"
       sources."http-reasons-0.1.0"
-      sources."http-signature-1.3.4"
+      sources."http-signature-1.3.5"
       sources."httpntlm-1.7.6"
       sources."httpreq-0.4.24"
       sources."iconv-lite-0.6.2"
       sources."ignore-4.0.6"
-      (sources."import-fresh-3.2.1" // {
+      (sources."import-fresh-3.2.2" // {
         dependencies = [
           sources."resolve-from-4.0.0"
         ];
@@ -5451,22 +5254,14 @@ in
       })
       sources."interpret-1.4.0"
       sources."ip-regex-2.1.0"
-      sources."is-arguments-1.0.4"
       sources."is-binary-path-2.1.0"
-      sources."is-buffer-2.0.4"
-      sources."is-callable-1.2.1"
-      sources."is-date-object-1.0.2"
+      sources."is-core-module-2.0.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.1"
-      sources."is-map-2.0.1"
       sources."is-number-7.0.0"
-      sources."is-plain-obj-1.1.0"
-      sources."is-regex-1.1.1"
-      sources."is-set-2.0.1"
+      sources."is-plain-obj-2.1.0"
       sources."is-stream-2.0.0"
-      sources."is-string-1.0.5"
-      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
@@ -5496,18 +5291,16 @@ in
       })
       (sources."istanbul-lib-source-maps-4.0.0" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.0"
         ];
       })
       sources."istanbul-reports-3.0.2"
-      sources."iterate-iterator-1.0.1"
-      sources."iterate-value-1.0.2"
       sources."js-sha512-0.8.0"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.0"
       sources."js2xmlparser-4.0.1"
       sources."jsbn-0.1.1"
-      (sources."jsdoc-3.6.5" // {
+      (sources."jsdoc-3.6.6" // {
         dependencies = [
           sources."bluebird-3.7.2"
           sources."escape-string-regexp-2.0.0"
@@ -5532,7 +5325,7 @@ in
           sources."xmlbuilder-10.1.1"
         ];
       })
-      sources."just-extend-4.1.0"
+      sources."just-extend-4.1.1"
       sources."klaw-3.0.0"
       sources."levn-0.4.1"
       sources."linkify-it-2.2.0"
@@ -5553,7 +5346,7 @@ in
       sources."lodash.set-4.3.2"
       (sources."log-symbols-4.0.0" // {
         dependencies = [
-          sources."ansi-styles-4.2.1"
+          sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
@@ -5569,7 +5362,7 @@ in
         ];
       })
       sources."markdown-it-anchor-5.3.0"
-      sources."marked-1.1.1"
+      sources."marked-1.2.0"
       sources."mdurl-1.0.1"
       sources."mime-db-1.44.0"
       sources."mime-format-2.0.0"
@@ -5578,22 +5371,22 @@ in
       sources."minimist-1.2.5"
       sources."mkdirp-1.0.4"
       sources."mkdirp2-1.0.4"
-      (sources."mocha-8.1.3" // {
+      (sources."mocha-8.2.1" // {
         dependencies = [
-          sources."debug-4.1.1"
+          sources."debug-4.2.0"
           sources."escape-string-regexp-4.0.0"
           sources."has-flag-4.0.0"
-          sources."strip-json-comments-3.0.1"
-          sources."supports-color-7.1.0"
+          sources."supports-color-7.2.0"
         ];
       })
       sources."ms-2.1.2"
+      sources."nanoid-3.1.12"
       sources."natural-compare-1.4.0"
       sources."neo-async-2.6.2"
       sources."nise-4.0.4"
       (sources."nock-13.0.4" // {
         dependencies = [
-          sources."debug-4.2.0"
+          sources."debug-4.3.0"
         ];
       })
       sources."node-oauth1-1.3.0"
@@ -5602,7 +5395,7 @@ in
       sources."number-is-nan-1.0.1"
       (sources."nyc-15.1.0" // {
         dependencies = [
-          sources."ansi-styles-4.2.1"
+          sources."ansi-styles-4.3.0"
           sources."cliui-6.0.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
@@ -5622,10 +5415,7 @@ in
       sources."object-assign-4.1.1"
       sources."object-get-2.1.1"
       sources."object-hash-1.3.1"
-      sources."object-inspect-1.8.0"
-      sources."object-keys-1.1.1"
       sources."object-to-spawn-args-2.0.0"
-      sources."object.assign-4.1.0"
       sources."once-1.4.0"
       sources."optionator-0.9.1"
       sources."p-limit-3.0.2"
@@ -5665,12 +5455,12 @@ in
           sources."p-locate-4.1.0"
         ];
       })
-      (sources."postcss-7.0.32" // {
+      (sources."postcss-7.0.35" // {
         dependencies = [
           sources."supports-color-6.1.0"
         ];
       })
-      sources."postman-collection-3.6.6"
+      sources."postman-collection-3.6.8"
       (sources."postman-collection-transformer-3.3.3" // {
         dependencies = [
           sources."commander-5.1.0"
@@ -5678,24 +5468,24 @@ in
         ];
       })
       sources."postman-jsdoc-theme-0.0.3"
-      (sources."postman-request-2.88.1-postman.24" // {
+      (sources."postman-request-2.88.1-postman.27" // {
         dependencies = [
           sources."tough-cookie-2.5.0"
         ];
       })
-      (sources."postman-runtime-7.26.5" // {
+      (sources."postman-runtime-7.26.8" // {
         dependencies = [
           sources."async-2.6.3"
+          sources."aws4-1.10.1"
         ];
       })
-      sources."postman-sandbox-3.5.9"
-      sources."postman-url-encoder-2.1.3"
+      sources."postman-sandbox-4.0.0"
+      sources."postman-url-encoder-3.0.0"
       sources."prelude-ls-1.2.1"
-      sources."pretty-ms-7.0.0"
+      sources."pretty-ms-7.0.1"
       sources."process-nextick-args-2.0.1"
       sources."process-on-spawn-1.0.0"
       sources."progress-2.0.3"
-      sources."promise.allsettled-1.0.2"
       sources."propagate-2.0.1"
       sources."pseudomap-1.0.2"
       sources."psl-1.8.0"
@@ -5707,7 +5497,7 @@ in
       sources."randombytes-2.1.0"
       sources."readable-stream-3.6.0"
       sources."readdir-0.0.13"
-      sources."readdirp-3.4.0"
+      sources."readdirp-3.5.0"
       sources."rechoir-0.6.2"
       sources."recursive-readdir-2.2.2"
       (sources."reduce-extract-1.0.0" // {
@@ -5730,7 +5520,7 @@ in
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."requizzle-0.2.3"
-      sources."resolve-1.17.0"
+      sources."resolve-1.18.1"
       sources."resolve-from-5.0.0"
       sources."ret-0.1.15"
       sources."rimraf-2.6.3"
@@ -5745,7 +5535,7 @@ in
           sources."stack-trace-0.0.9"
         ];
       })
-      sources."serialize-javascript-4.0.0"
+      sources."serialize-javascript-5.0.1"
       sources."server-destroy-1.0.1"
       sources."set-blocking-2.0.0"
       sources."shebang-command-2.0.0"
@@ -5753,7 +5543,7 @@ in
       sources."shelljs-0.8.4"
       sources."sigmund-1.0.1"
       sources."signal-exit-3.0.3"
-      (sources."sinon-9.0.3" // {
+      (sources."sinon-9.2.1" // {
         dependencies = [
           sources."has-flag-4.0.0"
           sources."supports-color-7.2.0"
@@ -5779,7 +5569,7 @@ in
       })
       sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.5"
+      sources."spdx-license-ids-3.0.6"
       sources."split-ca-1.0.1"
       sources."sprintf-js-1.0.3"
       sources."srcset-1.0.0"
@@ -5794,8 +5584,6 @@ in
       sources."stream-via-1.0.4"
       sources."strftime-0.10.0"
       sources."string-width-4.2.0"
-      sources."string.prototype.trimend-1.0.1"
-      sources."string.prototype.trimstart-1.0.1"
       sources."string_decoder-1.3.0"
       sources."strip-ansi-6.0.0"
       sources."strip-bom-4.0.0"
@@ -5851,19 +5639,14 @@ in
       sources."typedarray-to-buffer-3.1.5"
       sources."typical-2.6.1"
       sources."uc.micro-1.0.6"
-      sources."uglify-js-3.10.4"
+      sources."uglify-js-3.11.5"
       sources."underscore-1.7.0"
       sources."uri-js-4.4.0"
       sources."utcstring-0.1.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
-      (sources."uvm-1.7.9" // {
-        dependencies = [
-          sources."lodash-4.17.19"
-          sources."uuid-3.3.2"
-        ];
-      })
-      sources."v8-compile-cache-2.1.1"
+      sources."uvm-2.0.1"
+      sources."v8-compile-cache-2.2.0"
       sources."verror-1.10.0"
       sources."walk-back-4.0.0"
       sources."which-2.0.2"
@@ -5885,7 +5668,7 @@ in
       sources."word-wrap-1.2.3"
       sources."wordwrap-1.0.0"
       sources."wordwrapjs-3.0.0"
-      sources."workerpool-6.0.0"
+      sources."workerpool-6.0.2"
       (sources."wrap-ansi-5.1.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -5927,20 +5710,10 @@ in
         ];
       })
       sources."yargs-parser-13.1.2"
-      (sources."yargs-unparser-1.6.1" // {
+      (sources."yargs-unparser-2.0.0" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."emoji-regex-7.0.3"
-          sources."find-up-3.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."locate-path-3.0.0"
-          sources."p-limit-2.3.0"
-          sources."p-locate-3.0.0"
-          sources."path-exists-3.0.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-          sources."yargs-14.2.3"
-          sources."yargs-parser-15.0.1"
+          sources."camelcase-6.2.0"
+          sources."decamelize-4.0.0"
         ];
       })
     ];

From dda8bdcf6d83e121ab4766e2e07b41861d6a7558 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Wed, 28 Oct 2020 10:14:21 +0300
Subject: [PATCH 1222/3942] =?UTF-8?q?gpxsee:=207.33=20=E2=86=92=207.35?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 5b34007ec408..1bfe642752be 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "gpxsee";
-  version = "7.33";
+  version = "7.35";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "1k4zl7knlpwxrpqk1axkmy8x12915z15h3q2sjnx3jcnx6qw73ja";
+    sha256 = "1schmymcsd8s0r26qwyx56z107ql8pgrk1pnqy19mc7fyirdwmp5";
   };
 
   patches = (substituteAll {
@@ -29,15 +29,14 @@ mkDerivation rec {
     wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee
   '';
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
-    homepage = "https://www.gpxsee.org/";
     description = "GPS log file viewer and analyzer";
     longDescription = ''
       GPXSee is a Qt-based GPS log file viewer and analyzer that supports
       all common GPS log file formats.
     '';
+    homepage = "https://www.gpxsee.org/";
+    changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
     license = licenses.gpl3;
     maintainers = with maintainers; [ womfoo sikmir ];
     platforms = with platforms; linux ++ darwin;

From dc0f5ed6d20bef391a0bbc9986c24f1388a20c6b Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Tue, 3 Nov 2020 20:13:06 +0100
Subject: [PATCH 1223/3942] btc1: remove

---
 nixos/doc/manual/release-notes/rl-2103.xml |  5 +++
 pkgs/applications/blockchains/btc1.nix     | 41 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  6 ----
 4 files changed, 6 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/applications/blockchains/btc1.nix

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 2d0c5e39f7aa..7fd7ff5c2a96 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -121,6 +121,11 @@
       <literal>/var/lib/powerdns</literal> to <literal>/run/pdns</literal>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+    <package>btc1</package> has been abandoned upstream, and removed.
+    </para>
+   </listitem>
    <listitem>
     <para>
     <package>riak-cs</package> package removed along with <varname>services.riak-cs</varname> module.
diff --git a/pkgs/applications/blockchains/btc1.nix b/pkgs/applications/blockchains/btc1.nix
deleted file mode 100644
index 3442c9ba807f..000000000000
--- a/pkgs/applications/blockchains/btc1.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48
-, boost, zlib, miniupnpc, qt4, protobuf, qrencode, libevent
-, AppKit
-, withGui ? !stdenv.isDarwin
-}:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "1.15.1";
-
-  src = fetchurl {
-    url = "https://github.com/btc1/bitcoin/archive/v${version}.tar.gz";
-    sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8";
-  };
-
-  nativeBuildInputs = [ pkgconfig autoreconfHook hexdump ];
-  buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent ]
-    ++ optionals withGui [ qt4 qrencode ]
-    ++ optional stdenv.isDarwin AppKit;
-
-  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
-                     ++ optionals withGui [ "--with-gui=qt4" ];
-
-  meta = {
-    description = "Peer-to-peer electronic cash system (btc1 client)";
-    longDescription= ''
-      Bitcoin is a free open source peer-to-peer electronic cash system that is
-      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.
-
-      btc1 is an implementation of a Bitcoin full node with segwit2x hard fork
-      support.
-    '';
-    homepage = "https://github.com/btc1/bitcoin";
-    license = licenses.mit;
-    maintainers = with maintainers; [ sorpaas ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index defde7dcc0a3..b87ce83fc9ec 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -65,6 +65,7 @@ mapAliases ({
   bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03
   bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03
   bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03
+  btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03
   buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
   buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26
   buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e65aa28b25b8..caea73eda84c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24766,12 +24766,6 @@ in
   bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; };
   bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; };
 
-  btc1 = callPackage ../applications/blockchains/btc1.nix {
-    inherit (darwin.apple_sdk.frameworks) AppKit;
-    boost = boost165;
-  };
-  btc1d = btc1.override { withGui = false; };
-
   btcpayserver = callPackage ../applications/blockchains/btcpayserver { };
 
   cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };

From ef2333fb0391ba66c09e72be59a629f5384a0fe5 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Wed, 4 Nov 2020 12:38:27 +0100
Subject: [PATCH 1224/3942] inkcut: update to 2.1.2

wasn't able to test with an actual cutter due to covid, but the GUI
starts correctly
---
 pkgs/applications/misc/inkcut/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix
index 6be6e842bde7..cfb10cfbe2f0 100644
--- a/pkgs/applications/misc/inkcut/default.nix
+++ b/pkgs/applications/misc/inkcut/default.nix
@@ -1,16 +1,20 @@
-{ lib, python3Packages, fetchFromGitHub, wrapQtAppsHook }:
+{ lib
+, python3Packages
+, fetchFromGitHub
+, wrapQtAppsHook
+}:
 
 with python3Packages;
 
 buildPythonApplication rec {
   pname = "inkcut";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1c0mfdfy9iq4l683f3aa7cm7x2w9px83dyigc7655wvaq3bxi2rp";
+    sha256 = "1zn5i69f3kimcwdd2qkqd3hd1hq76a6i5wxxfb91ih2hj04vdbmx";
   };
 
   nativeBuildInputs = [ wrapQtAppsHook ];

From 013dc4c263b2ec35f9736a2a4f6b4fe8a99ea890 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 4 Nov 2020 12:37:45 +0100
Subject: [PATCH 1225/3942] signal-desktop: 1.37.2 -> 1.37.3

---
 .../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 5603ff13b19a..9656db0bd843 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -25,7 +25,7 @@ let
       else "");
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "1.37.2"; # Please backport all updates to the stable channel.
+  version = "1.37.3"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "0n4g2fh1ibw6fl5vbnnchx2vafasqrq8rl9w0ch7lai665zkxsk3";
+    sha256 = "0gyg67qhrqqn1676m7ki8h9akhn29fh1sxmj0kw5j7dx4cyc4mid";
   };
 
   nativeBuildInputs = [

From 7d15aa4ba02da17015894c4d23f4fcb4225d0d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Wed, 4 Nov 2020 08:49:33 -0300
Subject: [PATCH 1226/3942] nodePackages: update

---
 .../node-packages/node-packages.nix           | 1050 ++++++++++-------
 1 file changed, 627 insertions(+), 423 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 5797af8215b1..dc1548810544 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -49,15 +49,6 @@ let
         sha512 = "XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==";
       };
     };
-    "@angular-devkit/core-9.1.12" = {
-      name = "_at_angular-devkit_slash_core";
-      packageName = "@angular-devkit/core";
-      version = "9.1.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.12.tgz";
-        sha512 = "D/GnBeSlmdgGn7EhuE32HuPuRAjvUuxi7Q6WywBI8PSsXKAGnrypghBwMATNnOA24//CgbW2533Y9VWHaeXdeA==";
-      };
-    };
     "@angular-devkit/schematics-10.0.7" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
@@ -76,15 +67,6 @@ let
         sha512 = "TQI5NnE6iM3ChF5gZQ9qb+lZgMWa7aLoF5ksOyT3zrmOuICiQYJhA6SsjV95q7J4M55qYymwBib8KTqU/xuQww==";
       };
     };
-    "@angular-devkit/schematics-9.1.12" = {
-      name = "_at_angular-devkit_slash_schematics";
-      packageName = "@angular-devkit/schematics";
-      version = "9.1.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.12.tgz";
-        sha512 = "+GYnUzmIy1/QpYitCC8mI7jcrViGHTtOKvvDPEFjU2nggjNEQaMmsHcdIsjrqggEc23ZZyebNAIewT8CMkJyrQ==";
-      };
-    };
     "@angular-devkit/schematics-cli-0.1000.7" = {
       name = "_at_angular-devkit_slash_schematics-cli";
       packageName = "@angular-devkit/schematics-cli";
@@ -319,15 +301,6 @@ let
         sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==";
       };
     };
-    "@babel/compat-data-7.12.1" = {
-      name = "_at_babel_slash_compat-data";
-      packageName = "@babel/compat-data";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz";
-        sha512 = "725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ==";
-      };
-    };
     "@babel/compat-data-7.12.5" = {
       name = "_at_babel_slash_compat-data";
       packageName = "@babel/compat-data";
@@ -364,15 +337,6 @@ let
         sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==";
       };
     };
-    "@babel/generator-7.12.1" = {
-      name = "_at_babel_slash_generator";
-      packageName = "@babel/generator";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz";
-        sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==";
-      };
-    };
     "@babel/generator-7.12.5" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
@@ -418,15 +382,6 @@ let
         sha512 = "AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og==";
       };
     };
-    "@babel/helper-compilation-targets-7.12.1" = {
-      name = "_at_babel_slash_helper-compilation-targets";
-      packageName = "@babel/helper-compilation-targets";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz";
-        sha512 = "jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g==";
-      };
-    };
     "@babel/helper-compilation-targets-7.12.5" = {
       name = "_at_babel_slash_helper-compilation-targets";
       packageName = "@babel/helper-compilation-targets";
@@ -508,15 +463,6 @@ let
         sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==";
       };
     };
-    "@babel/helper-module-imports-7.12.1" = {
-      name = "_at_babel_slash_helper-module-imports";
-      packageName = "@babel/helper-module-imports";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz";
-        sha512 = "ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==";
-      };
-    };
     "@babel/helper-module-imports-7.12.5" = {
       name = "_at_babel_slash_helper-module-imports";
       packageName = "@babel/helper-module-imports";
@@ -571,15 +517,6 @@ let
         sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==";
       };
     };
-    "@babel/helper-replace-supers-7.12.1" = {
-      name = "_at_babel_slash_helper-replace-supers";
-      packageName = "@babel/helper-replace-supers";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz";
-        sha512 = "zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==";
-      };
-    };
     "@babel/helper-replace-supers-7.12.5" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
@@ -643,15 +580,6 @@ let
         sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==";
       };
     };
-    "@babel/helpers-7.12.1" = {
-      name = "_at_babel_slash_helpers";
-      packageName = "@babel/helpers";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz";
-        sha512 = "9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==";
-      };
-    };
     "@babel/helpers-7.12.5" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
@@ -670,15 +598,6 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.12.3" = {
-      name = "_at_babel_slash_parser";
-      packageName = "@babel/parser";
-      version = "7.12.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz";
-        sha512 = "kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==";
-      };
-    };
     "@babel/parser-7.12.5" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
@@ -769,15 +688,6 @@ let
         sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==";
       };
     };
-    "@babel/plugin-proposal-numeric-separator-7.12.1" = {
-      name = "_at_babel_slash_plugin-proposal-numeric-separator";
-      packageName = "@babel/plugin-proposal-numeric-separator";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz";
-        sha512 = "MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA==";
-      };
-    };
     "@babel/plugin-proposal-numeric-separator-7.12.5" = {
       name = "_at_babel_slash_plugin-proposal-numeric-separator";
       packageName = "@babel/plugin-proposal-numeric-separator";
@@ -1228,15 +1138,6 @@ let
         sha512 = "cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w==";
       };
     };
-    "@babel/plugin-transform-react-jsx-7.12.1" = {
-      name = "_at_babel_slash_plugin-transform-react-jsx";
-      packageName = "@babel/plugin-transform-react-jsx";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.1.tgz";
-        sha512 = "RmKejwnT0T0QzQUzcbP5p1VWlpnP8QHtdhEtLG55ZDQnJNalbF3eeDyu3dnGKvGzFIQiBzFhBYTwvv435p9Xpw==";
-      };
-    };
     "@babel/plugin-transform-react-jsx-7.12.5" = {
       name = "_at_babel_slash_plugin-transform-react-jsx";
       packageName = "@babel/plugin-transform-react-jsx";
@@ -1426,15 +1327,6 @@ let
         sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==";
       };
     };
-    "@babel/runtime-7.12.1" = {
-      name = "_at_babel_slash_runtime";
-      packageName = "@babel/runtime";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz";
-        sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==";
-      };
-    };
     "@babel/runtime-7.12.5" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
@@ -1462,15 +1354,6 @@ let
         sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==";
       };
     };
-    "@babel/traverse-7.12.1" = {
-      name = "_at_babel_slash_traverse";
-      packageName = "@babel/traverse";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz";
-        sha512 = "MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==";
-      };
-    };
     "@babel/traverse-7.12.5" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
@@ -1489,15 +1372,6 @@ let
         sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==";
       };
     };
-    "@babel/types-7.12.1" = {
-      name = "_at_babel_slash_types";
-      packageName = "@babel/types";
-      version = "7.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz";
-        sha512 = "BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==";
-      };
-    };
     "@babel/types-7.12.5" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
@@ -2317,13 +2191,13 @@ let
         sha512 = "yDKgoT2+Uf3cdLYmiFB9lRIGsB6lZhILtCXHgZigYgURExrEPmfj3ZyszfEpPKYcPmKaO9FI4coDhIN0Toxl3w==";
       };
     };
-    "@graphql-tools/url-loader-6.3.2" = {
+    "@graphql-tools/url-loader-6.4.0" = {
       name = "_at_graphql-tools_slash_url-loader";
       packageName = "@graphql-tools/url-loader";
-      version = "6.3.2";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.3.2.tgz";
-        sha512 = "nrrZD33T7lFeOjIufCrwk2PAHYqFtdFcb1pe1ULWnvuFmFuhZnRCgIsfCsoy+WOMwmZHQ/eXBem//I/bewXlgw==";
+        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.4.0.tgz";
+        sha512 = "M3mS/VH6vpnai3b3Fa33kYcdCgZvhFh7RqFE1R3NMfhYjphQ10EWwgf31P+VQcBNB2zz+ubxttI6UcJLiGqwuQ==";
       };
     };
     "@graphql-tools/utils-6.2.4" = {
@@ -2911,15 +2785,6 @@ let
         sha512 = "UK0Fu0eevQlpRXq5ff4o/71HJlpX9wJMddJjMYg9vUqCCl8ZnumRAljfShHFhGyO+Vc9IzN6dd8Y5JZZTp1KOw==";
       };
     };
-    "@josh-brown/vector-3.4.0" = {
-      name = "_at_josh-brown_slash_vector";
-      packageName = "@josh-brown/vector";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@josh-brown/vector/-/vector-3.4.0.tgz";
-        sha512 = "E2FcWwiAMXwr4MUv+SkxmtKsgwgaEaCNK7IlyCfQ1Rz1QzeaV36SooA8/GNkLh0WnlIda59WmDDSL7S1S73lUg==";
-      };
-    };
     "@kwsites/file-exists-1.1.1" = {
       name = "_at_kwsites_slash_file-exists";
       packageName = "@kwsites/file-exists";
@@ -3514,13 +3379,13 @@ let
         sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg==";
       };
     };
-    "@nestjs/schematics-7.1.3" = {
+    "@nestjs/schematics-7.2.1" = {
       name = "_at_nestjs_slash_schematics";
       packageName = "@nestjs/schematics";
-      version = "7.1.3";
+      version = "7.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.1.3.tgz";
-        sha512 = "13YU6H8Cw+GwtIfclSBeiswlzdM2Z9tMN4ZWiveyok0Fmi/8t6mxGHDw3bWPv8wGkd1bWz0PVCC2CjUGkHmcGg==";
+        url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.1.tgz";
+        sha512 = "yTIwiclX65HYIeemJ/ih3SVlj3BhUHS5eeGy/6uFy1EiIujNadsgi/RZxFSwlCIDkSrGUykqoZdvzfdnsD1Itw==";
       };
     };
     "@netflix/nerror-1.1.3" = {
@@ -4090,6 +3955,312 @@ let
         sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A==";
       };
     };
+    "@ot-builder/bin-composite-types-0.10.31" = {
+      name = "_at_ot-builder_slash_bin-composite-types";
+      packageName = "@ot-builder/bin-composite-types";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.31.tgz";
+        sha512 = "SbyWNIMJZEqPdbJW6P1KaHnLTvTqinm3J9MiNmdOhrEuw1k4jLpatQCYT4jLMDHuD1bRLmzgRshcfbm5Rtb+Kg==";
+      };
+    };
+    "@ot-builder/bin-util-0.10.31" = {
+      name = "_at_ot-builder_slash_bin-util";
+      packageName = "@ot-builder/bin-util";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.31.tgz";
+        sha512 = "bbYcQ582m2uNcJajhPB7St2lXvN4hekaNrMVgQREfaDmHcQycV7NaqM3Q333IYbKNSHehSLBcJ3whVyN1oAOvw==";
+      };
+    };
+    "@ot-builder/cli-help-shower-0.10.31" = {
+      name = "_at_ot-builder_slash_cli-help-shower";
+      packageName = "@ot-builder/cli-help-shower";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.31.tgz";
+        sha512 = "96SdquA87vuHHuwPuTDKrFoKD7g89SddDsmowjdR57N+9tinbwGxNiz3jCK4DycMIebSRwWIq0ls20Veq0uT3g==";
+      };
+    };
+    "@ot-builder/cli-proc-0.10.31" = {
+      name = "_at_ot-builder_slash_cli-proc";
+      packageName = "@ot-builder/cli-proc";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.31.tgz";
+        sha512 = "5rt5zCn681qoz8CwwB8HBrSdHv/axOtmtjOAkFuTm1HEOZeAmJt2nRVQwP+08lQLlPhZyiBM57XDqNgohGu+3A==";
+      };
+    };
+    "@ot-builder/cli-shared-0.10.31" = {
+      name = "_at_ot-builder_slash_cli-shared";
+      packageName = "@ot-builder/cli-shared";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.31.tgz";
+        sha512 = "54dJvtBCZ2ELNI38F98blPUURwD/cu09sOC68u7WghDrkmcql9UOjCgVsujoLDS52KdpD7DzOxhTu2j6upAZ2w==";
+      };
+    };
+    "@ot-builder/common-impl-0.10.31" = {
+      name = "_at_ot-builder_slash_common-impl";
+      packageName = "@ot-builder/common-impl";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.31.tgz";
+        sha512 = "9cGRXS45fPR9tau81G+zo6J8toEP9ouuE0gTTAL8ZHz84mAeUE3ybTL0pyiBO0fu01LtMgeLxl1w0rBze8T4jw==";
+      };
+    };
+    "@ot-builder/errors-0.10.31" = {
+      name = "_at_ot-builder_slash_errors";
+      packageName = "@ot-builder/errors";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.31.tgz";
+        sha512 = "6UvEpFqukndJ2d9T5gvdtMUliK6H8j8g1JrLyG9WNNPMY9NZ7MAHz1vAzR3ZNN9cBZPMy/mYjUf7q1mjs8fiow==";
+      };
+    };
+    "@ot-builder/io-bin-cff-0.10.31" = {
+      name = "_at_ot-builder_slash_io-bin-cff";
+      packageName = "@ot-builder/io-bin-cff";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.31.tgz";
+        sha512 = "ypaCkzW/hDvItKwJ6i5JVsG4YxhLP9M3CNUxSOD5FNH8Ld/AvS2Mt8i1fJdj37O2tAJgFLUj3dET0bWL8Czlvg==";
+      };
+    };
+    "@ot-builder/io-bin-encoding-0.10.31" = {
+      name = "_at_ot-builder_slash_io-bin-encoding";
+      packageName = "@ot-builder/io-bin-encoding";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.31.tgz";
+        sha512 = "BsU7+eeG+G7TaE1zdmqP2QqQk97KXYpaY08eAwrZBVoOWbOKClg+GKup4+Cbcy+2ckNZtviYnty18iwzfVNXSQ==";
+      };
+    };
+    "@ot-builder/io-bin-ext-private-0.10.31" = {
+      name = "_at_ot-builder_slash_io-bin-ext-private";
+      packageName = "@ot-builder/io-bin-ext-private";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.31.tgz";
+        sha512 = "xI/UUgCEfbulXwawyNtPpCNS2cIkDzz81sIK/u83sK7BVUIfrLQmsxX7Qfcnz3fbskbhY0oM2qIbJ5StfbOVHA==";
+      };
+    };
+    "@ot-builder/io-bin-font-0.10.31" = {
+      name = "_at_ot-builder_slash_io-bin-font";
+      packageName = "@ot-builder/io-bin-font";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.31.tgz";
+        sha512 = "lcXfk5enFMKNd8tGO5aZFVWDqqaHVDl3q6nSNlcrrYGcAxvuoMfwRExgqxT7WSrEn9RNc4GueKfR3CMz0B0dtg==";
+      };
+    };
+    "@ot-builder/io-bin-glyph-store-0.10.31" = {
+      name = "_at_ot-builder_slash_io-bin-glyph-store";
+      packageName = "@ot-builder/io-bin-glyph-store";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.31.tgz";
+        sha512 = "7uL/j0AE+eRE+gdUKVILmRL1lKlBofUk1WQ6JV/HMFI7WcKQNRguifXMUlKARYJLdVJE2XB85q7TejJ8ycPVSA==";
+      };
+    };
+    "@ot-builder/io-bin-layout-0.10.31" = {
+      name = "_at_ot-builder_slash_io-bin-layout";
+      packageName = "@ot-builder/io-bin-layout";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.31.tgz";
+        sha512 = "gLrHGKulldU6G5kMlNyMAofBOz/9/Om0RBvkXvt2djp6ndVFvTXGiWqeS0SdU5CJZxAZWGvKARETWQ4d0foz2g==";
+      };
+    };
+    "@ot-builder/io-bin-metadata-0.10.31" = {
+      name = "_at_ot-builder_slash_io-bin-metadata";
+      packageName = "@ot-builder/io-bin-metadata";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.31.tgz";
+        sha512 = "fYJlzf7gTGMntv+/OmIS2KlyGJuFwWQX69L1IH4swV1VJXYC9KlA4GojFyZ1oAZLWBORZ0kuUuvjD/4nox4QCA==";
+      };
+    };
+    "@ot-builder/io-bin-metric-0.10.31" = {
+      name = "_at_ot-builder_slash_io-bin-metric";
+      packageName = "@ot-builder/io-bin-metric";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.31.tgz";
+        sha512 = "6RueaPhQ2r2dTQ4/vncM1TCYjPpJ+N5vyFT4w0SJP30C46g1kn0bryyrhdpG0jvl+pLkty7MbwKOpBxOQ0RtdA==";
+      };
+    };
+    "@ot-builder/io-bin-name-0.10.31" = {
+      name = "_at_ot-builder_slash_io-bin-name";
+      packageName = "@ot-builder/io-bin-name";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.31.tgz";
+        sha512 = "x7aI+idbaNwJf2Ty9RaEOS/E0aEh33QihM2EhrcT20ui67hnx+99aAUXjVwp7puY0zXARy/u0k99r91SATrLqw==";
+      };
+    };
+    "@ot-builder/io-bin-sfnt-0.10.31" = {
+      name = "_at_ot-builder_slash_io-bin-sfnt";
+      packageName = "@ot-builder/io-bin-sfnt";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.31.tgz";
+        sha512 = "ssmHoGAuxMe1QkS24+GlxcgjpHoxQDsBQrdTSfh4pkmRP9aSfOrMWLksBgSQCTzRmOwf3lEJH2gz2r3NbsZldw==";
+      };
+    };
+    "@ot-builder/io-bin-ttf-0.10.31" = {
+      name = "_at_ot-builder_slash_io-bin-ttf";
+      packageName = "@ot-builder/io-bin-ttf";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.31.tgz";
+        sha512 = "pDWFXlUvguvygBDFpeliDMSKOg/rFprhiyCz6wPokRYwJg8fDS5EDtJOQ6p9/Y0C1V12PWA1O+fucYBfqUmSQw==";
+      };
+    };
+    "@ot-builder/ot-0.10.31" = {
+      name = "_at_ot-builder_slash_ot";
+      packageName = "@ot-builder/ot";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.31.tgz";
+        sha512 = "5Cit1J+bxKOgLsB+6jey90eOXLPHiUzJbdNmHrIwUyM5C5ZRXRLg5VRnrYPYZoRCLPaVjG6AXFP+WvALdaLp8A==";
+      };
+    };
+    "@ot-builder/ot-encoding-0.10.31" = {
+      name = "_at_ot-builder_slash_ot-encoding";
+      packageName = "@ot-builder/ot-encoding";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.31.tgz";
+        sha512 = "cVQZu7ZxOb/Fq2Ilh6ka7vzHXCVyZYOATFthrsV3uZFF3Iz+xefrrK0eh38UEoRopmbqMiPC9U3IHr6A86h+JA==";
+      };
+    };
+    "@ot-builder/ot-ext-private-0.10.31" = {
+      name = "_at_ot-builder_slash_ot-ext-private";
+      packageName = "@ot-builder/ot-ext-private";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.31.tgz";
+        sha512 = "G+TV59TNTa2tKrQ2/wy55dVoOP5uSVv6LfUcM2al5aM6pAjeWMV84BtBzDWH0nPTjlovyEmmiqDoUFgrm2TqYw==";
+      };
+    };
+    "@ot-builder/ot-glyphs-0.10.31" = {
+      name = "_at_ot-builder_slash_ot-glyphs";
+      packageName = "@ot-builder/ot-glyphs";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.31.tgz";
+        sha512 = "qY+O9RIXFalVg707swyfRK9beGDHEAKCGd74Rt9HdZIaWWPYfb+CH22zbwI+gVJEV/NRCTMGpZB1WrdLRm4q4w==";
+      };
+    };
+    "@ot-builder/ot-layout-0.10.31" = {
+      name = "_at_ot-builder_slash_ot-layout";
+      packageName = "@ot-builder/ot-layout";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.31.tgz";
+        sha512 = "j1WZRr6V48jIvl0VROBbzI1MPNYJUbrjwwiPdzMpi/Moj/k0tMAO5d/3FKhvVMcvpgXtN/Pe2V3yxz9yXD37pw==";
+      };
+    };
+    "@ot-builder/ot-metadata-0.10.31" = {
+      name = "_at_ot-builder_slash_ot-metadata";
+      packageName = "@ot-builder/ot-metadata";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.31.tgz";
+        sha512 = "H/Pdmf667+hLQkx7zpBecvwOW8VppxRSLSvKIopd0+TSdiXo9iZrmkkqnIHxA9/KPdvVLh6a/gzfxj5KwMMeDw==";
+      };
+    };
+    "@ot-builder/ot-name-0.10.31" = {
+      name = "_at_ot-builder_slash_ot-name";
+      packageName = "@ot-builder/ot-name";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.31.tgz";
+        sha512 = "38oV/H2n9x9DKl44XDdMWf8fY5lsgIlykxMUXT+2XlBS0Fw1u/S4THLXGhRG8nwcM6eJRzF+diL6/yGPCtpYfQ==";
+      };
+    };
+    "@ot-builder/ot-sfnt-0.10.31" = {
+      name = "_at_ot-builder_slash_ot-sfnt";
+      packageName = "@ot-builder/ot-sfnt";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.31.tgz";
+        sha512 = "hkTeDmNMZqeWq5OwBPy5zpy6cFecfkT/zO6ZiPyqbo8ND6Qp6WoLvkhIST6Bwesh2mApffTKyePbGnHrfWdnkw==";
+      };
+    };
+    "@ot-builder/ot-standard-glyph-namer-0.10.31" = {
+      name = "_at_ot-builder_slash_ot-standard-glyph-namer";
+      packageName = "@ot-builder/ot-standard-glyph-namer";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.31.tgz";
+        sha512 = "at6KH+5XDfi+7buSy1AayHp0C8N8iEql5PO8ZeTry22uE9mI80spqBShdTbYjI4m7S4rgKxK+Mtx5+Iq1pku1Q==";
+      };
+    };
+    "@ot-builder/prelude-0.10.31" = {
+      name = "_at_ot-builder_slash_prelude";
+      packageName = "@ot-builder/prelude";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.31.tgz";
+        sha512 = "0GhgWpPaCetCvzJfpC5o11WqEQ0O6ZE5BLyiCC1cLCd2i/4zsyOlXvAUZ2FLvvR8Oz3Q/EtF1uZ12iuIxR75Hw==";
+      };
+    };
+    "@ot-builder/primitive-0.10.31" = {
+      name = "_at_ot-builder_slash_primitive";
+      packageName = "@ot-builder/primitive";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.31.tgz";
+        sha512 = "1woeCUkc1BxsBNVGw9ALcR4P0Lk3iTK7LkRnMM2VCP+NhoF6aYM81FK1TYMZbmf21nS6OQtyZaT/+10oaZ1Y2A==";
+      };
+    };
+    "@ot-builder/rectify-0.10.31" = {
+      name = "_at_ot-builder_slash_rectify";
+      packageName = "@ot-builder/rectify";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.31.tgz";
+        sha512 = "QpHhRMGu0Hj1eN3nBKm2BYNHb2UOGi+2ZJP/QmH2GXMdE4LFOWmSN9Mvvubfxr23cjt3VtHK1X/5OBmhcEVfyA==";
+      };
+    };
+    "@ot-builder/stat-glyphs-0.10.31" = {
+      name = "_at_ot-builder_slash_stat-glyphs";
+      packageName = "@ot-builder/stat-glyphs";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.31.tgz";
+        sha512 = "GxSEEaRstSZV40FkF3SDTZceZN9UboBx3f9Kx2mSW2wfmQk14cCvQszLehXJsXnZ2+h9oVgJ8fpzSU0jY5Ip8g==";
+      };
+    };
+    "@ot-builder/trace-0.10.31" = {
+      name = "_at_ot-builder_slash_trace";
+      packageName = "@ot-builder/trace";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.31.tgz";
+        sha512 = "hCeRQp1FusNIU3B5gWL+0E5Ionr8RNF3nFk9wIuqYbgQqeaYpJaEcD4brlGp5BrgCqQA6n9pOTpogPMZOffdFw==";
+      };
+    };
+    "@ot-builder/var-store-0.10.31" = {
+      name = "_at_ot-builder_slash_var-store";
+      packageName = "@ot-builder/var-store";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.31.tgz";
+        sha512 = "adpNdlPmVCrBZBbDTPITLGe/EJpdfgoZJ7vTiR6tQ0gfwkD88r/i9I/YovWYi1v0VonXEIH9IyGlH3iU13zXuw==";
+      };
+    };
+    "@ot-builder/variance-0.10.31" = {
+      name = "_at_ot-builder_slash_variance";
+      packageName = "@ot-builder/variance";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.31.tgz";
+        sha512 = "3M2HFcPQs2YGsNdx5XuW+s1fwTnWYW2d/FpdLN9VtVa5THeI3GfUtWHlWgHIrYWycakM9+XPTbueQDTCEf26Cg==";
+      };
+    };
     "@parcel/fs-1.11.0" = {
       name = "_at_parcel_slash_fs";
       packageName = "@parcel/fs";
@@ -4585,13 +4756,13 @@ let
         sha512 = "yZQT2f8LIZZlH2ibAIvK4C/Ks72Y8CIWmGz04XGCLPHa/ANA6KqlXTKV6zWg/n1PDy2yj2zgX+m509VpIZuDeQ==";
       };
     };
-    "@serverless/utils-china-1.0.9" = {
+    "@serverless/utils-china-1.0.10" = {
       name = "_at_serverless_slash_utils-china";
       packageName = "@serverless/utils-china";
-      version = "1.0.9";
+      version = "1.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.9.tgz";
-        sha512 = "NUwRAvhVMr9pUwFMNhpb3uxslyCua2ORJH35A/x6OZVKEfGWXvdRU5wUpZvtIIes6qZ4t18plMQi1D0f7Ki8/Q==";
+        url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.10.tgz";
+        sha512 = "pMl6uW672Tll5rjFAYILxu1EwxSaWBE7r/Tr38sCgDOh0t36sRXiI3oCBHIu/C0tqKFfU1s+coRZbZYKkirCiw==";
       };
     };
     "@sindresorhus/is-0.14.0" = {
@@ -6421,6 +6592,15 @@ let
         sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==";
       };
     };
+    "@unicode/unicode-13.0.0-1.0.2" = {
+      name = "_at_unicode_slash_unicode-13.0.0";
+      packageName = "@unicode/unicode-13.0.0";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.0.2.tgz";
+        sha512 = "OKI6clBZqvMBlPKbH1tv3ChmkqRcyCfB6ulHqEX+9asjN5BVXs7tH7aOi+SExCNsmCVB8uJ1ZcvjuwaHsCtUeg==";
+      };
+    };
     "@vue/cli-shared-utils-4.5.8" = {
       name = "_at_vue_slash_cli-shared-utils";
       packageName = "@vue/cli-shared-utils";
@@ -12838,15 +13018,6 @@ let
         sha512 = "0UQ55f51JBkOFa+fvR76ywRzxiPwQS3Xe8oe5bZRphpv+dIMeerW5Zn5e4cUy4COJwVtJyU0R79RMnw+aCqmGA==";
       };
     };
-    "child-process-promise-2.2.1" = {
-      name = "child-process-promise";
-      packageName = "child-process-promise";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz";
-        sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074";
-      };
-    };
     "chloride-2.3.0" = {
       name = "chloride";
       packageName = "chloride";
@@ -14915,7 +15086,7 @@ let
       src = fetchgit {
         url = "https://github.com/wikimedia/content-type.git";
         rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b";
-        sha256 = "18eb299165567b0a97e9d5576f7c189fe57072b8b8323ac179571c9e6a10fdd9";
+        sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
       };
     };
     "content-types-0.1.0" = {
@@ -18833,13 +19004,13 @@ let
         sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
       };
     };
-    "electron-to-chromium-1.3.586" = {
+    "electron-to-chromium-1.3.587" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.586";
+      version = "1.3.587";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.586.tgz";
-        sha512 = "or8FCbQCRlPZHkOoqBULOI9hzTiStVIQqDLgAPt8pzY+swTrW+89vsqd24Zn+Iv4guAJLxRBD6OR5AmbpabGDA==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.587.tgz";
+        sha512 = "8XFNxzNj0R8HpTQslWAw6UWpGSuOKSP3srhyFHVbGUGb8vTHckZGCyWi+iQlaXJx5DNeTQTQLd6xN11WSckkmA==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -25538,7 +25709,7 @@ let
       src = fetchgit {
         url = "git://github.com/feross/http-node";
         rev = "342ef8624495343ffd050bd0808b3750cf0e3974";
-        sha256 = "031176ff1f6ceb8f650cbf2c36863f417e699f0610f83fbd94a74159cb8eba8f";
+        sha256 = "d7408d01b05fcbd5bb4fb44fd3d7d71463bafd5124d7e69c6f3e97cef8c65368";
       };
     };
     "http-parser-js-0.4.13" = {
@@ -29661,7 +29832,7 @@ let
       src = fetchgit {
         url = "https://github.com/wikimedia/kad.git";
         rev = "96f8f5c8e5a88f5dffed47abc20756e93e16387e";
-        sha256 = "801c2201565fb46ad591d4cf717eb30842ca76725c1d19f301418796f39d668e";
+        sha256 = "12e5b6430f57389c974e7a393f2c7ac9a26df06a58cfe1afbcb5a5f3f00249ea";
       };
     };
     "kad-localstorage-0.0.7" = {
@@ -34470,13 +34641,13 @@ let
         sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d";
       };
     };
-    "mobx-6.0.2" = {
+    "mobx-6.0.3" = {
       name = "mobx";
       packageName = "mobx";
-      version = "6.0.2";
+      version = "6.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mobx/-/mobx-6.0.2.tgz";
-        sha512 = "MG+8YbcwJw0tjJ78ujooqE8rxvCIfDaVZbCLfCxQ9S81oNNJb6W4KZVMSR+Y1e5n4z1vh70/vkibv0xEGwuEPQ==";
+        url = "https://registry.npmjs.org/mobx/-/mobx-6.0.3.tgz";
+        sha512 = "DBMd0NXsMn25HJMUAWBndgJ2wRjOJPbpn6wdzUvZW0PVsyTnrw028XwQfzsjnxnKG+bAXGVNb38rvd+1o0G9uQ==";
       };
     };
     "mobx-react-6.3.1" = {
@@ -35620,7 +35791,7 @@ let
       src = fetchgit {
         url = "https://github.com/arlolra/negotiator.git";
         rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a";
-        sha256 = "0cee71d4f5ad49a14f8ff9b33d1e5b1ac9fbcd3866ab7a95068283e1f7d860b6";
+        sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
       };
     };
     "neo-async-2.6.2" = {
@@ -35954,7 +36125,7 @@ let
       src = fetchgit {
         url = "https://github.com/laurent22/node-emoji.git";
         rev = "9fa01eac463e94dde1316ef8c53089eeef4973b5";
-        sha256 = "1499424a28a49687c150369075d5ea3794f18454291078760a6c761e6576d8a3";
+        sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406";
       };
     };
     "node-environment-flags-1.0.6" = {
@@ -36119,13 +36290,13 @@ let
         sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==";
       };
     };
-    "node-html-parser-1.4.5" = {
+    "node-html-parser-1.4.6" = {
       name = "node-html-parser";
       packageName = "node-html-parser";
-      version = "1.4.5";
+      version = "1.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.5.tgz";
-        sha512 = "sNm4Tdc8zj5HnFtkNEcK/1tpvyfRxEuz1d4rkVceGPeMTfzd2twPTiEo/UbqxOexSt9AzJ/cvQXSTj7fa6Ey1w==";
+        url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.6.tgz";
+        sha512 = "VgX2Bk8dq59yFeNC46LdA6VzRXffOPVNOMoeZquACZVwbC1VYJ3ssd5/mncTBGBrd3M+t6cMD5KQWdK/l+qPFQ==";
       };
     };
     "node-int64-0.4.0" = {
@@ -36344,15 +36515,6 @@ let
         sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
       };
     };
-    "node-version-1.2.0" = {
-      name = "node-version";
-      packageName = "node-version";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz";
-        sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==";
-      };
-    };
     "node-wsfederation-0.1.1" = {
       name = "node-wsfederation";
       packageName = "node-wsfederation";
@@ -36785,6 +36947,15 @@ let
         sha512 = "yZPNoJK9clx1jhSXU54kU6Aj1SV2p7mXUs1W/6OjQvek3wb1RrjDCrt4iY1+VX9eBQvvSGEpzNmYkRUaTL8rqg==";
       };
     };
+    "npm-registry-fetch-9.0.0" = {
+      name = "npm-registry-fetch";
+      packageName = "npm-registry-fetch";
+      version = "9.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz";
+        sha512 = "PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA==";
+      };
+    };
     "npm-run-path-2.0.2" = {
       name = "npm-run-path";
       packageName = "npm-run-path";
@@ -38055,15 +38226,6 @@ let
         sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==";
       };
     };
-    "ora-4.0.3" = {
-      name = "ora";
-      packageName = "ora";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ora/-/ora-4.0.3.tgz";
-        sha512 = "fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg==";
-      };
-    };
     "ora-4.0.4" = {
       name = "ora";
       packageName = "ora";
@@ -38217,13 +38379,22 @@ let
         sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
-    "otfcc-ttcize-0.10.2" = {
-      name = "otfcc-ttcize";
-      packageName = "otfcc-ttcize";
-      version = "0.10.2";
+    "ot-builder-0.10.31" = {
+      name = "ot-builder";
+      packageName = "ot-builder";
+      version = "0.10.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.10.2.tgz";
-        sha512 = "CLMMw6r97AvmK5nOIGpnG4xHVU40gyTzpvn55RPyxZQ3E/UMXG4HnykyTYHlVL7Y46ISr1isPiSN0CvjYpZtgg==";
+        url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.31.tgz";
+        sha512 = "Cj/EsGzPQ4h59OWJJoXi5JEj94ULlxHB0ZwLvaRt6O3kmJ6PvZdp7MyEvi6fF0/BMcjFJOMOkcggbjAOCl/E3g==";
+      };
+    };
+    "otb-ttc-bundle-0.10.31" = {
+      name = "otb-ttc-bundle";
+      packageName = "otb-ttc-bundle";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.31.tgz";
+        sha512 = "PHT2rzKRD8QkwD7CrPDuh7tmtnaAVecK6JjALw7d4CajmNBvYbFlnb7fdpF1melyizJgnhigeN3hjHllEuqdMQ==";
       };
     };
     "p-all-2.1.0" = {
@@ -38730,13 +38901,13 @@ let
         sha512 = "JcMmHiK6h6rcncj2HLayiyJZg28iJXJafXcmEGw2NjKH3WE8ZgSwyMZs7+f+aliPD57PDhB31IEgUtLXp0YZxA==";
       };
     };
-    "pacote-11.1.11" = {
+    "pacote-11.1.12" = {
       name = "pacote";
       packageName = "pacote";
-      version = "11.1.11";
+      version = "11.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-11.1.11.tgz";
-        sha512 = "r6PHtCEhkaGv+QPx1JdE/xRdkSkZUG7dE2oloNk/CGTPGNOtaJyYqZPFeN6d6UcUrTPRvZXFo3IBzJIBopPuSA==";
+        url = "https://registry.npmjs.org/pacote/-/pacote-11.1.12.tgz";
+        sha512 = "suazooYMzefXr3glexAX4+q+qqH3wrzchtj+EivwiCCr/tsaHe9HtdHSx3R8YPjulAhojBZ2JkAVy13QwA8Jpg==";
       };
     };
     "pacote-9.5.12" = {
@@ -40420,7 +40591,7 @@ let
       src = fetchgit {
         url = "git://github.com/anmonteiro/node-getopt";
         rev = "a3123885e3559c9b70903948d6e5c34852520d74";
-        sha256 = "aec063ab02e2782e6587759b4c7dfd8d8e27f174bbc62dd65842658e30e56720";
+        sha256 = "0092766ac49279342f7d17677359880b44b245ad9d32237a11a5ea45cb0d03fa";
       };
     };
     "postcss-5.2.18" = {
@@ -41584,15 +41755,6 @@ let
         sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931";
       };
     };
-    "promise-polyfill-6.1.0" = {
-      name = "promise-polyfill";
-      packageName = "promise-polyfill";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz";
-        sha1 = "dfa96943ea9c121fca4de9b5868cb39d3472e057";
-      };
-    };
     "promise-queue-2.2.5" = {
       name = "promise-queue";
       packageName = "promise-queue";
@@ -42727,6 +42889,15 @@ let
         sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e";
       };
     };
+    "qrcode-terminal-0.12.0" = {
+      name = "qrcode-terminal";
+      packageName = "qrcode-terminal";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz";
+        sha512 = "EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==";
+      };
+    };
     "qs-0.4.2" = {
       name = "qs";
       packageName = "qs";
@@ -45472,15 +45643,6 @@ let
         sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==";
       };
     };
-    "rxjs-6.5.4" = {
-      name = "rxjs";
-      packageName = "rxjs";
-      version = "6.5.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz";
-        sha512 = "naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==";
-      };
-    };
     "rxjs-6.5.5" = {
       name = "rxjs";
       packageName = "rxjs";
@@ -50287,6 +50449,15 @@ let
         sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==";
       };
     };
+    "sync-fetch-0.3.0" = {
+      name = "sync-fetch";
+      packageName = "sync-fetch";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sync-fetch/-/sync-fetch-0.3.0.tgz";
+        sha512 = "dJp4qg+x4JwSEW1HibAuMi0IIrBI3wuQr2GimmqB7OXR50wmwzfdusG+p39R9w3R6aFtZ2mzvxvWKQ3Bd/vx3g==";
+      };
+    };
     "syntax-error-1.4.0" = {
       name = "syntax-error";
       packageName = "syntax-error";
@@ -50402,7 +50573,7 @@ let
       src = fetchgit {
         url = "https://github.com/mixu/node-tabtab.git";
         rev = "94af2b878b174527b6636aec88acd46979247755";
-        sha256 = "6e84c406481c826d85e946e9dc09ed1e71ecfa405f60dd6209e5c835aacf32c1";
+        sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272";
       };
     };
     "tabula-1.10.0" = {
@@ -51665,13 +51836,13 @@ let
         sha512 = "605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==";
       };
     };
-    "topsort-0.0.2" = {
-      name = "topsort";
-      packageName = "topsort";
-      version = "0.0.2";
+    "toposort-2.0.2" = {
+      name = "toposort";
+      packageName = "toposort";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz";
-        sha1 = "2e5e0ee8a1439417f101d5b9b2d035e620263321";
+        url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz";
+        sha1 = "ae21768175d1559d48bef35420b2f4962f09c330";
       };
     };
     "torrent-discovery-5.4.0" = {
@@ -52610,13 +52781,13 @@ let
         sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==";
       };
     };
-    "typo-geom-0.8.4" = {
+    "typo-geom-0.11.0" = {
       name = "typo-geom";
       packageName = "typo-geom";
-      version = "0.8.4";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.8.4.tgz";
-        sha512 = "n0P1RQidLnjLI2iSUDENiugkABaR+tr/kSIpl040XLKmrfsBZ/weS1OvQ9Mq98CsJlcJDemKdPqldoyYSsVgmQ==";
+        url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.11.0.tgz";
+        sha512 = "0f7MjfJdUOYCLfUpVegTIukkWd1nkvN6CX6oXF8hcx9Hu04qhQfTC+gOffH8bhSjsSiLhIy7aRuzgIAj4UdyyQ==";
       };
     };
     "ua-parser-js-0.7.21" = {
@@ -52934,15 +53105,6 @@ let
         sha512 = "Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==";
       };
     };
-    "unicode-13.0.0-0.8.0" = {
-      name = "unicode-13.0.0";
-      packageName = "unicode-13.0.0";
-      version = "0.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unicode-13.0.0/-/unicode-13.0.0-0.8.0.tgz";
-        sha512 = "Ekct2eo5hBIp/29ERCj1ABIBNnrFOAisNHFv8l2KksHJg4PurIN/nGPFItaIpBJHVzlBYuJaVx/bAvmJnFFL/w==";
-      };
-    };
     "unicode-canonical-property-names-ecmascript-1.0.4" = {
       name = "unicode-canonical-property-names-ecmascript";
       packageName = "unicode-canonical-property-names-ecmascript";
@@ -53949,7 +54111,7 @@ let
       src = fetchgit {
         url = "https://github.com/laurent22/uslug.git";
         rev = "ba2834d79beb0435318709958b2f5e817d96674d";
-        sha256 = "9f64413fac2052a07323c54475be269280ab1c5d174e88bd1542e24091be0259";
+        sha256 = "e23c172456a8fa0af48dba3f89ca0d525dd870408f7bd6ad1d776cdbe13f0489";
       };
     };
     "ut_metadata-3.5.1" = {
@@ -58896,12 +59058,12 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      (sources."@nestjs/schematics-7.1.3" // {
+      (sources."@nestjs/schematics-7.2.1" // {
         dependencies = [
-          sources."@angular-devkit/core-9.1.12"
-          sources."@angular-devkit/schematics-9.1.12"
-          sources."ora-4.0.3"
-          sources."rxjs-6.5.4"
+          sources."@angular-devkit/core-10.2.0"
+          sources."@angular-devkit/schematics-10.2.0"
+          sources."ajv-6.12.4"
+          sources."rxjs-6.6.2"
         ];
       })
       sources."@schematics/schematics-0.1000.7"
@@ -59660,22 +59822,22 @@ in
       sources."@apollographql/graphql-language-service-utils-2.0.2"
       sources."@apollographql/graphql-playground-html-1.6.26"
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/compat-data-7.12.1"
+      sources."@babel/compat-data-7.12.5"
       (sources."@babel/core-7.12.3" // {
         dependencies = [
-          sources."@babel/generator-7.12.1"
-          sources."@babel/types-7.12.1"
+          sources."@babel/generator-7.12.5"
+          sources."@babel/types-7.12.5"
           sources."semver-5.7.1"
         ];
       })
       (sources."@babel/generator-7.11.6" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
         ];
       })
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
-      (sources."@babel/helper-compilation-targets-7.12.1" // {
+      (sources."@babel/helper-compilation-targets-7.12.5" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
@@ -59684,12 +59846,12 @@ in
       sources."@babel/helper-create-regexp-features-plugin-7.12.1"
       (sources."@babel/helper-define-map-7.10.5" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
         ];
       })
       (sources."@babel/helper-explode-assignable-expression-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
         ];
       })
       sources."@babel/helper-function-name-7.10.4"
@@ -59697,17 +59859,17 @@ in
       sources."@babel/helper-hoist-variables-7.10.4"
       (sources."@babel/helper-member-expression-to-functions-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
         ];
       })
-      (sources."@babel/helper-module-imports-7.12.1" // {
+      (sources."@babel/helper-module-imports-7.12.5" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
         ];
       })
       (sources."@babel/helper-module-transforms-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
         ];
       })
       sources."@babel/helper-optimise-call-expression-7.10.4"
@@ -59715,39 +59877,39 @@ in
       sources."@babel/helper-regex-7.10.5"
       (sources."@babel/helper-remap-async-to-generator-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
         ];
       })
-      (sources."@babel/helper-replace-supers-7.12.1" // {
+      (sources."@babel/helper-replace-supers-7.12.5" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
         ];
       })
       (sources."@babel/helper-simple-access-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
         ];
       })
       (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
         ];
       })
       (sources."@babel/helper-split-export-declaration-7.11.0" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
         ];
       })
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/helper-validator-option-7.12.1"
       sources."@babel/helper-wrap-function-7.12.3"
-      (sources."@babel/helpers-7.12.1" // {
+      (sources."@babel/helpers-7.12.5" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
         ];
       })
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.3"
+      sources."@babel/parser-7.12.5"
       sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
       sources."@babel/plugin-proposal-dynamic-import-7.12.1"
@@ -59755,7 +59917,7 @@ in
       sources."@babel/plugin-proposal-json-strings-7.12.1"
       sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-      sources."@babel/plugin-proposal-numeric-separator-7.12.1"
+      sources."@babel/plugin-proposal-numeric-separator-7.12.5"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
       sources."@babel/plugin-proposal-optional-chaining-7.12.1"
@@ -59811,7 +59973,7 @@ in
       sources."@babel/plugin-transform-unicode-regex-7.12.1"
       (sources."@babel/preset-env-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
           sources."semver-5.7.1"
         ];
       })
@@ -59825,12 +59987,12 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."@babel/runtime-7.12.1"
+      sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.10.4"
-      (sources."@babel/traverse-7.12.1" // {
+      (sources."@babel/traverse-7.12.5" // {
         dependencies = [
-          sources."@babel/generator-7.12.1"
-          sources."@babel/types-7.12.1"
+          sources."@babel/generator-7.12.5"
+          sources."@babel/types-7.12.5"
         ];
       })
       sources."@babel/types-7.10.4"
@@ -59989,14 +60151,14 @@ in
       sources."@vue/cli-ui-addon-widgets-4.5.8"
       (sources."@vue/compiler-core-3.0.2" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
           sources."source-map-0.6.1"
         ];
       })
       sources."@vue/compiler-dom-3.0.2"
       (sources."@vue/compiler-sfc-3.0.2" // {
         dependencies = [
-          sources."@babel/types-7.12.1"
+          sources."@babel/types-7.12.5"
           sources."source-map-0.6.1"
         ];
       })
@@ -60415,7 +60577,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.586"
+      sources."electron-to-chromium-1.3.587"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
@@ -61616,12 +61778,12 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/generator-7.12.1"
+      sources."@babel/generator-7.12.5"
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.3"
+      sources."@babel/parser-7.12.5"
       sources."@babel/template-7.10.4"
-      sources."@babel/types-7.12.1"
+      sources."@babel/types-7.12.5"
       sources."@webassemblyjs/ast-1.9.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
       sources."@webassemblyjs/helper-api-error-1.9.1"
@@ -61706,7 +61868,7 @@ in
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.12.1" // {
+      (sources."@babel/generator-7.12.5" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -61714,19 +61876,19 @@ in
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-member-expression-to-functions-7.12.1"
-      sources."@babel/helper-module-imports-7.12.1"
+      sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
       sources."@babel/helper-optimise-call-expression-7.10.4"
-      sources."@babel/helper-replace-supers-7.12.1"
+      sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-split-export-declaration-7.11.0"
       sources."@babel/helper-validator-identifier-7.10.4"
-      sources."@babel/helpers-7.12.1"
+      sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.3"
+      sources."@babel/parser-7.12.5"
       sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.1"
-      sources."@babel/types-7.12.1"
+      sources."@babel/traverse-7.12.5"
+      sources."@babel/types-7.12.5"
       sources."JSV-4.0.2"
       sources."ansi-styles-3.2.1"
       sources."array-unique-0.3.2"
@@ -63547,7 +63709,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.586"
+      sources."electron-to-chromium-1.3.587"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -64464,27 +64626,27 @@ in
     dependencies = [
       sources."@babel/code-frame-7.10.4"
       sources."@babel/core-7.12.3"
-      sources."@babel/generator-7.12.1"
+      sources."@babel/generator-7.12.5"
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-member-expression-to-functions-7.12.1"
-      sources."@babel/helper-module-imports-7.12.1"
+      sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
       sources."@babel/helper-optimise-call-expression-7.10.4"
-      sources."@babel/helper-replace-supers-7.12.1"
+      sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-split-export-declaration-7.11.0"
       sources."@babel/helper-validator-identifier-7.10.4"
-      sources."@babel/helpers-7.12.1"
+      sources."@babel/helpers-7.12.5"
       (sources."@babel/highlight-7.10.4" // {
         dependencies = [
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.12.3"
+      sources."@babel/parser-7.12.5"
       sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.1"
-      sources."@babel/types-7.12.1"
+      sources."@babel/traverse-7.12.5"
+      sources."@babel/types-7.12.5"
       sources."@nodelib/fs.scandir-2.1.3"
       sources."@nodelib/fs.stat-2.0.3"
       sources."@nodelib/fs.walk-1.2.4"
@@ -64550,7 +64712,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.586"
+      sources."electron-to-chromium-1.3.587"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -68401,33 +68563,33 @@ in
     dependencies = [
       sources."@babel/code-frame-7.10.4"
       sources."@babel/core-7.12.3"
-      sources."@babel/generator-7.12.1"
+      sources."@babel/generator-7.12.5"
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-react-jsx-7.10.4"
       sources."@babel/helper-builder-react-jsx-experimental-7.12.4"
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-member-expression-to-functions-7.12.1"
-      sources."@babel/helper-module-imports-7.12.1"
+      sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
       sources."@babel/helper-optimise-call-expression-7.10.4"
       sources."@babel/helper-plugin-utils-7.10.4"
-      sources."@babel/helper-replace-supers-7.12.1"
+      sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-split-export-declaration-7.11.0"
       sources."@babel/helper-validator-identifier-7.10.4"
-      sources."@babel/helpers-7.12.1"
+      sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.3"
+      sources."@babel/parser-7.12.5"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-syntax-jsx-7.12.1"
       sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
       sources."@babel/plugin-transform-destructuring-7.12.1"
       sources."@babel/plugin-transform-parameters-7.12.1"
-      sources."@babel/plugin-transform-react-jsx-7.12.1"
+      sources."@babel/plugin-transform-react-jsx-7.12.5"
       sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.1"
-      sources."@babel/types-7.12.1"
+      sources."@babel/traverse-7.12.5"
+      sources."@babel/types-7.12.5"
       sources."@sindresorhus/is-4.0.0"
       sources."@szmarczak/http-timer-4.0.5"
       sources."@types/cacheable-request-6.0.1"
@@ -71648,7 +71810,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.586"
+      sources."electron-to-chromium-1.3.587"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -72292,7 +72454,7 @@ in
           sources."which-2.0.2"
         ];
       })
-      sources."node-html-parser-1.4.5"
+      sources."node-html-parser-1.4.6"
       (sources."node-libs-browser-2.2.1" // {
         dependencies = [
           sources."buffer-4.9.2"
@@ -72421,11 +72583,12 @@ in
           sources."url-parse-lax-3.0.0"
         ];
       })
-      (sources."pacote-11.1.11" // {
+      (sources."pacote-11.1.12" // {
         dependencies = [
           sources."minipass-3.1.3"
           sources."mkdirp-1.0.4"
           sources."npm-package-arg-8.1.0"
+          sources."npm-registry-fetch-9.0.0"
           sources."rimraf-3.0.2"
           sources."semver-7.3.2"
         ];
@@ -75431,7 +75594,7 @@ in
           sources."@graphql-tools/utils-7.0.2"
         ];
       })
-      (sources."@graphql-tools/url-loader-6.3.2" // {
+      (sources."@graphql-tools/url-loader-6.4.0" // {
         dependencies = [
           sources."@graphql-tools/utils-7.0.2"
         ];
@@ -75474,9 +75637,11 @@ in
       sources."aws4-1.11.0"
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
+      sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
+      sources."buffer-5.7.0"
       sources."bufferutil-4.0.2"
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
@@ -75623,6 +75788,7 @@ in
       sources."http-signature-1.2.0"
       sources."http2-client-1.3.3"
       sources."iconv-lite-0.4.24"
+      sources."ieee754-1.2.1"
       sources."ignore-5.1.8"
       (sources."import-fresh-3.2.2" // {
         dependencies = [
@@ -75882,6 +76048,7 @@ in
         ];
       })
       sources."symbol-observable-1.2.0"
+      sources."sync-fetch-0.3.0"
       sources."tar-6.0.5"
       sources."through-2.3.8"
       sources."tmp-0.2.1"
@@ -78072,19 +78239,83 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "iosevka-build-deps-../../data/fonts/iosevka" = nodeEnv.buildNodePackage {
-    name = "iosevka-build-deps";
-    packageName = "iosevka-build-deps";
-    version = "3.2.2";
-    src = ../../data/fonts/iosevka;
+  "iosevka-https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz" = nodeEnv.buildNodePackage {
+    name = "iosevka";
+    packageName = "iosevka";
+    version = "3.7.1";
+    src = fetchurl {
+      name = "iosevka-3.7.1.tar.gz";
+      url = https://codeload.github.com/be5invis/Iosevka/tar.gz/v3.7.1;
+      sha256 = "ed7aee70af326ef22458f8f7603c599fd2f5164ae8062fbd6fb7d56864d98aca";
+    };
     dependencies = [
       sources."@iarna/toml-2.2.5"
-      sources."@josh-brown/vector-3.4.0"
-      sources."JSONStream-1.3.5"
+      sources."@ot-builder/bin-composite-types-0.10.31"
+      sources."@ot-builder/bin-util-0.10.31"
+      (sources."@ot-builder/cli-help-shower-0.10.31" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."chalk-4.1.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.2.0"
+        ];
+      })
+      (sources."@ot-builder/cli-proc-0.10.31" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."chalk-4.1.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.2.0"
+        ];
+      })
+      (sources."@ot-builder/cli-shared-0.10.31" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."chalk-4.1.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.2.0"
+        ];
+      })
+      sources."@ot-builder/common-impl-0.10.31"
+      sources."@ot-builder/errors-0.10.31"
+      sources."@ot-builder/io-bin-cff-0.10.31"
+      sources."@ot-builder/io-bin-encoding-0.10.31"
+      sources."@ot-builder/io-bin-ext-private-0.10.31"
+      sources."@ot-builder/io-bin-font-0.10.31"
+      sources."@ot-builder/io-bin-glyph-store-0.10.31"
+      sources."@ot-builder/io-bin-layout-0.10.31"
+      sources."@ot-builder/io-bin-metadata-0.10.31"
+      sources."@ot-builder/io-bin-metric-0.10.31"
+      sources."@ot-builder/io-bin-name-0.10.31"
+      sources."@ot-builder/io-bin-sfnt-0.10.31"
+      sources."@ot-builder/io-bin-ttf-0.10.31"
+      sources."@ot-builder/ot-0.10.31"
+      sources."@ot-builder/ot-encoding-0.10.31"
+      sources."@ot-builder/ot-ext-private-0.10.31"
+      sources."@ot-builder/ot-glyphs-0.10.31"
+      sources."@ot-builder/ot-layout-0.10.31"
+      sources."@ot-builder/ot-metadata-0.10.31"
+      sources."@ot-builder/ot-name-0.10.31"
+      sources."@ot-builder/ot-sfnt-0.10.31"
+      sources."@ot-builder/ot-standard-glyph-namer-0.10.31"
+      sources."@ot-builder/prelude-0.10.31"
+      sources."@ot-builder/primitive-0.10.31"
+      sources."@ot-builder/rectify-0.10.31"
+      sources."@ot-builder/stat-glyphs-0.10.31"
+      sources."@ot-builder/trace-0.10.31"
+      sources."@ot-builder/var-store-0.10.31"
+      sources."@ot-builder/variance-0.10.31"
+      sources."@unicode/unicode-13.0.0-1.0.2"
       sources."abbrev-1.1.1"
       sources."ajv-6.12.6"
       sources."amdefine-1.0.1"
-      sources."ansi-regex-5.0.0"
+      sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
@@ -78103,16 +78334,15 @@ in
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
       sources."bufferstreams-2.0.1"
-      sources."camelcase-5.3.1"
+      sources."camelcase-3.0.0"
       sources."caseless-0.12.0"
       sources."chainsaw-0.0.9"
       sources."chalk-2.4.2"
-      sources."child-process-promise-2.2.1"
       sources."chownr-1.1.4"
       sources."cldr-5.7.0"
       sources."cli-cursor-3.1.0"
       sources."clipper-lib-6.4.2"
-      sources."cliui-6.0.0"
+      sources."cliui-3.2.0"
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -78120,12 +78350,6 @@ in
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      (sources."cross-spawn-4.0.2" // {
-        dependencies = [
-          sources."lru-cache-4.1.5"
-          sources."which-1.3.1"
-        ];
-      })
       sources."css-2.2.4"
       sources."css-parse-2.0.0"
       sources."dashdash-1.14.1"
@@ -78173,23 +78397,15 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."file-uri-to-path-1.0.0"
       sources."filelist-1.0.1"
-      sources."find-up-4.1.0"
-      sources."first-chunk-stream-3.0.0"
+      sources."find-up-1.1.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."fs-extra-9.0.1"
       sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
-      (sources."gauge-2.7.4" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
-      sources."get-caller-file-2.0.5"
+      sources."gauge-2.7.4"
+      sources."get-caller-file-1.0.3"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."graceful-fs-4.2.4"
@@ -78201,12 +78417,13 @@ in
       sources."hashish-0.0.4"
       sources."hosted-git-info-2.8.8"
       sources."http-signature-1.2.0"
+      sources."iconv-lite-0.6.2"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."invert-kv-1.0.0"
       sources."is-arrayish-0.2.1"
       sources."is-core-module-2.0.0"
-      sources."is-fullwidth-code-point-3.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
       sources."isarray-1.0.0"
@@ -78222,7 +78439,6 @@ in
           sources."universalify-2.0.0"
         ];
       })
-      sources."jsonparse-1.3.1"
       sources."jsprim-1.4.1"
       sources."lcid-1.0.0"
       sources."levn-0.3.0"
@@ -78236,22 +78452,18 @@ in
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      (sources."minipass-2.9.0" // {
-        dependencies = [
-          sources."yallist-3.1.1"
-        ];
-      })
+      sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      sources."mkdirp-0.5.5"
+      sources."mkdirp-1.0.4"
       sources."ms-2.0.0"
       sources."nan-2.14.2"
       (sources."node-gyp-4.0.0" // {
         dependencies = [
+          sources."mkdirp-0.5.5"
           sources."semver-5.3.0"
           sources."which-1.3.1"
         ];
       })
-      sources."node-version-1.2.0"
       sources."nopt-3.0.6"
       (sources."normalize-package-data-2.5.0" // {
         dependencies = [
@@ -78269,31 +78481,25 @@ in
       sources."os-locale-1.4.0"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
-      sources."otfcc-ttcize-0.10.2"
+      sources."ot-builder-0.10.31"
+      (sources."otb-ttc-bundle-0.10.31" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."chalk-4.1.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.2.0"
+        ];
+      })
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
       sources."pako-1.0.11"
       sources."parse-json-2.2.0"
       sources."passerror-1.1.1"
-      (sources."patel-0.33.1" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."camelcase-3.0.0"
-          sources."cliui-3.2.0"
-          sources."get-caller-file-1.0.3"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."require-main-filename-1.0.1"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."which-module-1.0.0"
-          sources."wrap-ansi-2.1.0"
-          sources."y18n-3.2.1"
-          sources."yargs-6.6.0"
-          sources."yargs-parser-4.2.1"
-        ];
-      })
-      sources."path-exists-4.0.0"
+      sources."patel-0.33.1"
+      sources."path-exists-2.1.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."path-type-1.1.0"
@@ -78305,29 +78511,21 @@ in
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."prelude-ls-1.1.2"
-      sources."prettier-2.1.2"
       sources."process-nextick-args-2.0.1"
-      sources."promise-polyfill-6.1.0"
-      sources."pseudomap-1.0.2"
       sources."psl-1.8.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."read-pkg-1.1.0"
-      (sources."read-pkg-up-1.0.1" // {
-        dependencies = [
-          sources."find-up-1.1.2"
-          sources."path-exists-2.1.0"
-        ];
-      })
+      sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.7"
       sources."request-2.88.2"
       sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
+      sources."require-main-filename-1.0.1"
       sources."resolve-1.18.1"
       sources."resolve-url-0.2.1"
       sources."restore-cursor-3.1.0"
       sources."resumer-0.0.0"
-      sources."rimraf-2.6.3"
+      sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
@@ -78343,20 +78541,21 @@ in
       sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.1"
       sources."spdx-license-ids-3.0.6"
-      sources."spiro-2.0.0"
+      (sources."spiro-2.0.0" // {
+        dependencies = [
+          sources."tslib-1.14.1"
+        ];
+      })
       sources."split-1.0.1"
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.16.1"
       sources."stack-trace-0.0.9"
-      sources."string-width-4.2.0"
+      sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
-      sources."strip-ansi-6.0.0"
+      sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
-      sources."strip-bom-buf-2.0.0"
-      sources."strip-bom-stream-4.0.0"
       (sources."stylus-0.54.8" // {
         dependencies = [
-          sources."mkdirp-1.0.4"
           sources."semver-6.3.0"
           sources."source-map-0.7.3"
         ];
@@ -78364,26 +78563,23 @@ in
       sources."supports-color-5.5.0"
       (sources."tar-4.4.13" // {
         dependencies = [
-          sources."yallist-3.1.1"
+          sources."mkdirp-0.5.5"
         ];
       })
-      sources."temp-0.9.2"
       sources."through-2.3.8"
-      sources."topsort-0.0.2"
+      sources."toposort-2.0.2"
       sources."tough-cookie-2.5.0"
       sources."traverse-0.3.9"
       sources."ts-process-promises-1.0.2"
-      sources."tslib-1.14.1"
+      sources."tslib-2.0.3"
       sources."ttf2woff-2.0.2"
       sources."ttf2woff2-3.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
-      sources."typo-geom-0.8.4"
-      sources."unicode-13.0.0-0.8.0"
+      sources."typo-geom-0.11.0"
       sources."unicoderegexp-0.4.1"
       sources."universalify-1.0.0"
-      sources."unorm-1.6.0"
       sources."uri-js-4.4.0"
       sources."urix-0.1.0"
       sources."util-deprecate-1.0.2"
@@ -78391,42 +78587,43 @@ in
       sources."validate-npm-package-license-3.0.4"
       (sources."verda-1.1.2" // {
         dependencies = [
+          sources."ansi-regex-5.0.0"
           sources."ansi-styles-4.3.0"
+          sources."camelcase-5.3.1"
           sources."chalk-4.1.0"
+          sources."cliui-6.0.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
+          sources."find-up-4.1.0"
+          sources."get-caller-file-2.0.5"
           sources."has-flag-4.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."path-exists-4.0.0"
+          sources."require-main-filename-2.0.0"
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
           sources."supports-color-7.2.0"
-          sources."tslib-2.0.3"
+          sources."which-module-2.0.0"
+          sources."wrap-ansi-6.2.0"
+          sources."y18n-4.0.0"
+          sources."yargs-15.4.1"
+          sources."yargs-parser-18.1.3"
         ];
       })
       sources."verror-1.10.0"
       sources."which-2.0.2"
-      sources."which-module-2.0.0"
-      (sources."wide-align-1.1.3" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."string-width-2.1.1"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
+      sources."which-module-1.0.0"
+      sources."wide-align-1.1.3"
       sources."word-wrap-1.2.3"
       sources."wordwrap-0.0.3"
-      (sources."wrap-ansi-6.2.0" // {
-        dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-        ];
-      })
+      sources."wrap-ansi-2.1.0"
       sources."wrappy-1.0.2"
       sources."xmldom-0.3.0"
       sources."xpath-0.0.27"
-      sources."y18n-4.0.0"
-      sources."yallist-2.1.2"
-      sources."yargs-15.4.1"
-      sources."yargs-parser-18.1.3"
+      sources."y18n-3.2.1"
+      sources."yallist-3.1.1"
+      sources."yargs-6.6.0"
+      sources."yargs-parser-4.2.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -82849,7 +83046,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.586"
+      sources."electron-to-chromium-1.3.587"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -85376,7 +85573,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.586"
+      sources."electron-to-chromium-1.3.587"
       sources."elf-tools-1.1.2"
       (sources."elliptic-6.5.3" // {
         dependencies = [
@@ -88150,7 +88347,7 @@ in
       sources."npm-package-arg-8.1.0"
       sources."npm-packlist-2.1.4"
       sources."npm-pick-manifest-6.1.0"
-      sources."npm-registry-fetch-8.1.5"
+      sources."npm-registry-fetch-9.0.0"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.9.0"
@@ -88166,7 +88363,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."pacote-11.1.11"
+      sources."pacote-11.1.12"
       sources."parse-github-url-1.0.2"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
@@ -88270,7 +88467,7 @@ in
     src = fetchgit {
       url = "git://github.com/NixOS/npm2nix.git";
       rev = "0c06be7d278a7f64fc853a5fd42d2031d14496d5";
-      sha256 = "ac58ebe43b62e42cdc1754f4d6c6795de9c33fe12b72a858522c9f0ba10b5cee";
+      sha256 = "e1b252cd883fd8c5c4618b157d03b3fb869fa6aad4170ef51e34681069d50bf5";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -88852,7 +89049,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.586"
+      sources."electron-to-chromium-1.3.587"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -91550,10 +91747,10 @@ in
   pyright = nodeEnv.buildNodePackage {
     name = "pyright";
     packageName = "pyright";
-    version = "1.1.82";
+    version = "1.1.83";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.82.tgz";
-      sha512 = "sSYrN9ziOKTLdo7HwP8vlU8pLhY7KDQ9hGK7sW4S2pNn6pAe2ewUjD5Gk4AAbKc13qQ9za9cdthhT0Gk60L7mA==";
+      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.83.tgz";
+      sha512 = "uwaqJsuGxtY94lA8PL3Akp1xkUqUYWEFDLrIdW3FQY6JgFngkAZ51rPyUsuXQjoObm056OZ68wtzUMhDX5P5UA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -92062,7 +92259,7 @@ in
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimist-1.2.5"
       sources."mkdirp-1.0.4"
-      sources."mobx-6.0.2"
+      sources."mobx-6.0.3"
       sources."mobx-react-6.3.1"
       sources."mobx-react-lite-2.2.2"
       sources."ms-2.1.2"
@@ -92966,7 +93163,7 @@ in
           sources."write-file-atomic-3.0.3"
         ];
       })
-      sources."@serverless/utils-china-1.0.9"
+      sources."@serverless/utils-china-1.0.10"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@tencent-sdk/capi-1.1.5"
@@ -93560,6 +93757,7 @@ in
       sources."psl-1.8.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
+      sources."qrcode-terminal-0.12.0"
       sources."qs-6.5.2"
       sources."query-string-5.1.1"
       sources."querystring-0.2.0"
@@ -94395,10 +94593,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.424.0";
+    version = "1.424.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.424.0.tgz";
-      sha512 = "mL1uKYBTJND3EKMLaWDnS8n6ggJWwvur3Kz2tCj9cmF++G10FAHA8RyhBKc1jF41lSI0SZKMfh6MXTNvrzfx6g==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.424.1.tgz";
+      sha512 = "jPfGpI/cCPc1xn335GP7fVVHkqw/ss3W8ie9p+KM748QgZkc5JMuUJKc9lB1y+5+H7wpCnt4wuO1jKkFBpwSUQ==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -94478,6 +94676,7 @@ in
         ];
       })
       sources."brace-expansion-1.1.11"
+      sources."braces-3.0.2"
       sources."browserify-zlib-0.1.4"
       sources."buffer-5.7.0"
       sources."buffer-from-1.1.1"
@@ -94568,6 +94767,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."figures-3.2.0"
       sources."file-uri-to-path-1.0.0"
+      sources."fill-range-7.0.1"
       sources."fs-constants-1.0.0"
       sources."fs.realpath-1.0.0"
       (sources."ftp-0.3.10" // {
@@ -94639,6 +94839,7 @@ in
       sources."is-gzip-1.0.0"
       sources."is-installed-globally-0.3.2"
       sources."is-npm-4.0.0"
+      sources."is-number-7.0.0"
       sources."is-obj-2.0.0"
       sources."is-path-inside-3.0.2"
       sources."is-stream-1.1.0"
@@ -94679,6 +94880,7 @@ in
       sources."lru-cache-5.1.1"
       sources."macos-release-2.4.1"
       sources."make-dir-3.1.0"
+      sources."micromatch-4.0.2"
       sources."mimic-fn-2.1.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
@@ -94735,6 +94937,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
       sources."peek-stream-1.1.3"
+      sources."picomatch-2.2.2"
       sources."prelude-ls-1.1.2"
       sources."prepend-http-2.0.0"
       sources."process-nextick-args-2.0.1"
@@ -94946,6 +95149,7 @@ in
       sources."thunkify-2.1.2"
       sources."tmp-0.0.33"
       sources."to-readable-stream-1.0.0"
+      sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
       sources."toml-3.0.0"
       sources."tree-kill-1.2.2"
@@ -97688,7 +97892,7 @@ in
     src = fetchgit {
       url = "https://github.com/TediCross/TediCross.git";
       rev = "80ec2189cbda51eec9f3cd3f7f551b7a71474d38";
-      sha256 = "1d3e9fb2a35f366e6fb4cf46699d21a58cbdde3b7a41130d0eb1aa1f4dceabb9";
+      sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
     };
     dependencies = [
       sources."ajv-6.12.6"
@@ -103697,7 +103901,7 @@ in
       sources."caniuse-lite-1.0.30001154"
       sources."chrome-trace-event-1.0.2"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.586"
+      sources."electron-to-chromium-1.3.587"
       sources."enhanced-resolve-5.3.1"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"

From 58c76844d7af3736190e0a05c127acdaefe44181 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 4 Nov 2020 13:15:52 +0100
Subject: [PATCH 1227/3942] llvm_11: Add myself as maintainer

Because I maintain Chromium which always requires the most recent LLVM
release (would be good to get notified on any PRs/issues, especially
since I seem to end up merging most of the PRs anyway).

See #100725.
---
 pkgs/development/compilers/llvm/11/llvm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix
index 3f37cac078f9..c2b70a149bf5 100644
--- a/pkgs/development/compilers/llvm/11/llvm.nix
+++ b/pkgs/development/compilers/llvm/11/llvm.nix
@@ -163,7 +163,7 @@ in stdenv.mkDerivation (rec {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = "https://llvm.org/";
     license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
+    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill primeos ];
     platforms   = stdenv.lib.platforms.all;
   };
 } // stdenv.lib.optionalAttrs enableManpages {

From 3f857b887d9cdf35d2633d11ac20d6105a72db5b Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Wed, 4 Nov 2020 01:07:10 +0100
Subject: [PATCH 1228/3942] libhandy: 1.0.0 -> 1.0.1, reenable checks

---
 .../development/libraries/libhandy/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index 835eaeac2bf4..a008052c0ca8 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -17,18 +17,20 @@
 , gdk-pixbuf
 , librsvg
 , hicolor-icon-theme
+, at-spi2-atk
+, at-spi2-core
 }:
 
 stdenv.mkDerivation rec {
   pname = "libhandy";
-  version = "1.0.0";
+  version = "1.0.1";
 
   outputs = [ "out" "dev" "devdoc" "glade" ];
   outputBin = "dev";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-qTmFgvR7fXKSBdbqwMBo/vNarySf3Vfuo3JPhRjSZpk=";
+    sha256 = "106qa4d2rcbvd3g3avbgkd59aq0bjvwpx8vfz1cikvwrarnfvql4";
   };
 
   nativeBuildInputs = [
@@ -52,8 +54,11 @@ stdenv.mkDerivation rec {
 
   checkInputs = [
     dbus
-    hicolor-icon-theme
     xvfb_run
+    at-spi2-atk
+    at-spi2-core
+    librsvg
+    hicolor-icon-theme
   ];
 
   mesonFlags = [
@@ -64,14 +69,11 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
   PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
 
-  # Bail out! dbind-FATAL-WARNING:
-  # AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown:
-  # The name org.a11y.Bus was not provided by any .service files
-  doCheck = false;
+  doCheck = true;
 
   checkPhase = ''
     NO_AT_BRIDGE=1 \
-    XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share"
+    XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \
     GDK_PIXBUF_MODULE_FILE="${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
     xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
       --config-file=${dbus.daemon}/share/dbus-1/session.conf \

From 20baaf104a4f4f75d8ca2d26d3219bde864b04cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 4 Nov 2020 13:53:25 +0100
Subject: [PATCH 1229/3942] Revert "Disable the metrics job"

This reverts commit c54308d27c76155b9c4c9baf2a6ba031f03d1e90.
The machine has been back for some time.
---
 pkgs/top-level/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index eacd2f5904ca..5fc6e91b3118 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -30,7 +30,7 @@ let
   jobs =
     { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };
 
-      #metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
+      metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
 
       manual = import ../../doc { inherit pkgs nixpkgs; };
       lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };

From 0d3256564447e8cca0b0df4400790abff73c5401 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Nov 2020 14:02:28 +0100
Subject: [PATCH 1230/3942] libical: disable rest of failing tests

likely caused by tzdata bump
---
 pkgs/development/libraries/libical/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 5741a121c463..62034a7bce27 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     runHook preInstallCheck
 
     export TZDIR=${tzdata}/share/zoneinfo
-    ctest --output-on-failure --exclude-regex 'timezones|libical-glib-array|libical-glib-component|libical-glib-timezone'
+    ctest --output-on-failure --exclude-regex 'regression|recur|timezones|libical-glib-array|libical-glib-component|libical-glib-timezone'
 
     runHook postInstallCheck
   '';

From 0b5bcd88a29e0b9caf8a32e92231e07dd2afc873 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Nov 2020 13:16:10 +0100
Subject: [PATCH 1231/3942] sddm: 0.18.1 -> 0.19.0

https://github.com/sddm/sddm/releases/tag/v0.19.0

Fixes: CVE-2020-28049
---
 .../applications/display-managers/sddm/default.nix |  4 ++--
 .../sddm/sddm-ignore-config-mtime.patch            | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 3ebeaa6262b7..fd02536589fb 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "0.18.1";
+  version = "0.19.0";
 
 in mkDerivation {
   pname = "sddm";
@@ -14,7 +14,7 @@ in mkDerivation {
     owner = "sddm";
     repo = "sddm";
     rev = "v${version}";
-    sha256 = "0an1zafz0yhxd9jgd3gzdwmaw5f9vs4c924q56lp2yxxddbmzjcq";
+    sha256 = "1s6icb5r1n6grfs137gdzfrcvwsb3hvlhib2zh6931x8pkl1qvxa";
   };
 
   patches = [
diff --git a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
index aac09dfe876b..a4d41e3e6f52 100644
--- a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
+++ b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
@@ -1,8 +1,8 @@
 diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp
-index 4b5983c..911c511 100644
+index 041e5ed..efb1324 100644
 --- a/src/common/ConfigReader.cpp
 +++ b/src/common/ConfigReader.cpp
-@@ -147,16 +147,13 @@ namespace SDDM {
+@@ -148,17 +148,14 @@ namespace SDDM {
          // * m_path (classic fallback /etc/sddm.conf)
  
          QStringList files;
@@ -13,18 +13,20 @@ index 4b5983c..911c511 100644
              QDir dir(m_sysConfigDir);
              if (dir.exists()) {
 -                latestModificationTime = std::max(latestModificationTime,  QFileInfo(m_sysConfigDir).lastModified());
-                 foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) {
+                 const auto dirFiles = dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware);
+                 for (const QFileInfo &file : dirFiles) {
                      files << (file.absoluteFilePath());
 -                    latestModificationTime = std::max(latestModificationTime, file.lastModified());
                  }
              }
          }
-@@ -164,21 +161,14 @@ namespace SDDM {
+@@ -166,22 +163,15 @@ namespace SDDM {
              //include the configDir in modification time so we also reload on any files added/removed
              QDir dir(m_configDir);
              if (dir.exists()) {
 -                latestModificationTime = std::max(latestModificationTime,  QFileInfo(m_configDir).lastModified());
-                 foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) {
+                 const auto dirFiles = dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware);
+                 for (const QFileInfo &file : dirFiles) {
                      files << (file.absoluteFilePath());
 -                    latestModificationTime = std::max(latestModificationTime, file.lastModified());
                  }
@@ -38,6 +40,6 @@ index 4b5983c..911c511 100644
 -        }
 -        m_fileModificationTime = latestModificationTime;
 -
-         foreach (const QString &filepath, files) {
+         for (const QString &filepath : qAsConst(files)) {
              loadInternal(filepath);
          }

From 4d563ba7efc67d01664344b0c2e207e2bec38feb Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 7 Oct 2020 00:49:18 +0200
Subject: [PATCH 1232/3942] zoneminder: 1.34.16 -> 1.34.22

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

diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index 935993b781ff..0bdaede49a5e 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig
+{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkgconfig
 , curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages
 , polkit, utillinuxMinimal, x264, zlib
 , coreutils, procps, psmisc, nixosTests }:
@@ -78,13 +78,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "zoneminder";
-  version = "1.34.16";
+  version = "1.34.22";
 
   src = fetchFromGitHub {
     owner  = "ZoneMinder";
     repo   = "zoneminder";
     rev    = version;
-    sha256 = "azQbm8EkbypBf2NjplDVCb6duEC476hhKDA0EGqxxWE=";
+    sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83";
   };
 
   patches = [

From 562eaafd36e0be77d00d119fc2da2a72342fdd21 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 4 Nov 2020 05:32:14 -0800
Subject: [PATCH 1233/3942] tree-sitter: 0.17.1 -> 0.17.3; run make install

---
 .../development/tools/parsing/tree-sitter/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 63082f60ac2c..ba1a03b89b99 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -11,9 +11,9 @@ let
   # 1) change all these hashes
   # 2) nix-build -A tree-sitter.updater.update-all-grammars
   # 3) run the ./result script that is output by that (it updates ./grammars)
-  version = "0.17.1";
-  sha256 = "sha256-k61actAEyao/Ea8aw9PCm252U+1I0d43MAYC68/lui4=";
-  cargoSha256 = "sha256-Jp/Fl20ZZfaIdWinOOujNVH5JjJNtyUYHfyTrmeeoRg=";
+  version = "0.17.3";
+  sha256 = "sha256-uQs80r9cPX8Q46irJYv2FfvuppwonSS5HVClFujaP+U=";
+  cargoSha256 = "sha256-fonlxLNh9KyEwCj7G5vxa7cM/DlcHNFbQpp0SwVQ3j4=";
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
@@ -68,6 +68,11 @@ in rustPlatform.buildRustPackage {
     bash ./script/build-wasm --debug
   '';
 
+  postInstall = ''
+    export PREFIX=$out
+    make install
+  '';
+
   # test result: FAILED. 120 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out
   doCheck = false;
 

From a76a2e552e1879ce7a2b589152e3da979c516143 Mon Sep 17 00:00:00 2001
From: kubaracek <me@jakubracek.net>
Date: Wed, 4 Nov 2020 16:16:15 +0100
Subject: [PATCH 1234/3942] wrapQtAppsHook for pianobooster

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

diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index 4832fce1e962..b92808775c8a 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkg-config, qttools
-, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi
+, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "03xcdnlpsij22ca3i6xj19yqzn3q2ch0d32r73v0c96nm04gvhjj";
   };
 
-  nativeBuildInputs = [ cmake pkg-config qttools ];
+  nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
 
   buildInputs = [ alsaLib ftgl libGLU libjack2 qtbase rtmidi ];
 

From 8279979f386322bbba8504ac4dc9931dd5e90d34 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Wed, 4 Nov 2020 16:32:56 +0100
Subject: [PATCH 1235/3942] lean: build olean files

---
 pkgs/applications/science/logic/lean/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index eae2e384df40..749220382c64 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -15,9 +15,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ gmp ];
   enableParallelBuilding = true;
 
-  preConfigure = ''
-    cd src
-  '';
+  cmakeDir = "../src";
+
+  # Running the tests is required to build the *.olean files for the core
+  # library.
+  doCheck = true;
+
+  postPatch = "patchShebangs .";
 
   postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace $out/bin/leanpkg \

From 8c73ec11978f2b7014450100fdcc0a0e18026724 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Wed, 4 Nov 2020 23:39:37 +0800
Subject: [PATCH 1236/3942] ipfs-migrator: 1.6.3 -> 1.6.4

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

diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix
index 4b1d1213b015..d2339fbe8999 100644
--- a/pkgs/applications/networking/ipfs-migrator/default.nix
+++ b/pkgs/applications/networking/ipfs-migrator/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "ipfs-migrator";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "fs-repo-migrations";
     rev = "v${version}";
-    sha256 = "13ah5jk8n3wznvag6dda1ssgpqsdr9pdgvqm9gcsb7zzls89j9x5";
+    sha256 = "004qqcwcw55q13r3sr273dfa5zgxc275pcgqwihzbikl3i168d9f";
   };
 
   vendorSha256 = null;

From aefda81a0566cbd499b42a435b0d65e8a9cb3704 Mon Sep 17 00:00:00 2001
From: Benjamin Asbach <asbachb@users.noreply.github.com>
Date: Mon, 2 Nov 2020 03:03:34 +0100
Subject: [PATCH 1237/3942] openjdk: switch from mercurial repository to GitHub

Reasons:
* openjdk is migrating to GitHub (https://openjdk.java.net/jeps/369)
* GitHub provides faster download speed that mercurial
---
 pkgs/development/compilers/openjdk/11.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 92320f5eac04..b2093f2cf461 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
+{ stdenv, lib, fetchFromGitHub, bash, pkgconfig, autoconf, cpio, file, which, unzip
 , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
 , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
@@ -18,9 +18,11 @@ let
     pname = "openjdk" + lib.optionalString headless "-headless";
     version = "${major}.${minor}.${update}+${build}";
 
-    src = fetchurl {
-      url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "fc2ee2ee5822f2440e66114c8fa76888fea7ddd351282940c222d34b5f871858";
+    src = fetchFromGitHub {
+      owner = "openjdk";
+      repo = "jdk${major}u";
+      rev = "jdk-${version}";
+      sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf ];

From 23be792bad9d13c558d6019e5cac222115d288ea Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 Nov 2020 11:51:36 -0500
Subject: [PATCH 1238/3942] sbt: Add test

---
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/sbt.nix                           | 18 +++++++
 .../tools/build-managers/sbt/default.nix      | 54 ++++++++++---------
 3 files changed, 48 insertions(+), 25 deletions(-)
 create mode 100644 nixos/tests/sbt.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 4e4d8b5e6894..10ac6c84d0ef 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -310,6 +310,7 @@ in
   rxe = handleTest ./rxe.nix {};
   samba = handleTest ./samba.nix {};
   sanoid = handleTest ./sanoid.nix {};
+  sbt = handleTest ./sbt.nix {};
   sddm = handleTest ./sddm.nix {};
   service-runner = handleTest ./service-runner.nix {};
   shadowsocks = handleTest ./shadowsocks {};
diff --git a/nixos/tests/sbt.nix b/nixos/tests/sbt.nix
new file mode 100644
index 000000000000..004d9c2e140a
--- /dev/null
+++ b/nixos/tests/sbt.nix
@@ -0,0 +1,18 @@
+import ./make-test-python.nix ({ pkgs, ...} : {
+  name = "sbt";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  machine = { pkgs, ... }:
+    {
+      environment.systemPackages = [ pkgs.sbt ];
+    };
+
+  testScript =
+    ''
+      machine.succeed(
+          "(sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${pkgs.sbt.version}  (this may take some time)'"
+      )
+    '';
+})
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 6f34ef03b00f..dbace29d7e74 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript
-, common-updater-scripts, git, nixfmt, nix, coreutils, gnused }:
+, common-updater-scripts, git, nixfmt, nix, coreutils, gnused, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "sbt";
@@ -36,30 +36,34 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
   };
 
-  passthru.updateScript = writeScript "update.sh" ''
-    #!${stdenv.shell}
-    set -o errexit
-    PATH=${
-      stdenv.lib.makeBinPath [
-        common-updater-scripts
-        git
-        nixfmt
-        nix
-        coreutils
-        gnused
-      ]
-    }
+  passthru = {
+    tests = { inherit (nixosTests) sbt; };
 
-    oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion sbt" | tr -d '"')"
-    latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:sbt/sbt.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
+    updateScript = writeScript "update.sh" ''
+      #!${stdenv.shell}
+      set -o errexit
+      PATH=${
+        stdenv.lib.makeBinPath [
+          common-updater-scripts
+          git
+          nixfmt
+          nix
+          coreutils
+          gnused
+        ]
+      }
 
-    if [ ! "$oldVersion" = "$latestTag" ]; then
-      update-source-version sbt "$latestTag" --version-key=version --print-changes
-      nixpkgs="$(git rev-parse --show-toplevel)"
-      default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix"
-      nixfmt "$default_nix"
-    else
-      echo "sbt is already up-to-date"
-    fi
-  '';
+      oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion sbt" | tr -d '"')"
+      latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:sbt/sbt.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
+
+      if [ ! "$oldVersion" = "$latestTag" ]; then
+        update-source-version sbt "$latestTag" --version-key=version --print-changes
+        nixpkgs="$(git rev-parse --show-toplevel)"
+        default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix"
+        nixfmt "$default_nix"
+      else
+        echo "sbt is already up-to-date"
+      fi
+    '';
+  };
 }

From 3bcca127385e859c5ac838534137fa306bfa80c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 4 Nov 2020 13:44:50 -0300
Subject: [PATCH 1239/3942] canta-theme: restrict platform to linux

The dependency numix-icon-theme-circle (a parent of canta-icon-theme)
is unavailable in darwin.
---
 pkgs/data/themes/canta/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix
index 8534fe7a5064..c6a6678b98c7 100644
--- a/pkgs/data/themes/canta/default.nix
+++ b/pkgs/data/themes/canta/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     description = "Flat Design theme for GTK based desktop environments";
     homepage = "https://github.com/vinceliuice/Canta-theme";
     license = licenses.gpl2;
-    platforms = platforms.unix;
+    platforms = platforms.linux; # numix-icon-theme-circle unavailable in darwin
     maintainers = [ maintainers.romildo ];
   };
 }

From d4efa08b536d7dc500c2df45d7efa8087ca19557 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Sat, 19 Sep 2020 13:30:09 +0200
Subject: [PATCH 1240/3942] openjdk: add derivation to generate bespoke minimal
 JRE's

Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
---
 doc/languages-frameworks/java.xml          | 18 ++++++++++++++++--
 pkgs/development/compilers/openjdk/jre.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix            | 11 ++++++++++-
 3 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/openjdk/jre.nix

diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml
index bf0fc4883922..881d492b5bff 100644
--- a/doc/languages-frameworks/java.xml
+++ b/doc/languages-frameworks/java.xml
@@ -32,7 +32,7 @@ nativeBuildInputs = [ jdk ];
  </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:
+  If your Java package provides a program, you need to generate a wrapper script to run it using a JRE. You can use <literal>makeWrapper</literal> for this:
 <programlisting>
 nativeBuildInputs = [ makeWrapper ];
 
@@ -43,7 +43,21 @@ 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.
+Since the introduction of the Java Platform Module System in Java 9, Java distributions typically no longer ship with a general-purpose JRE: instead, they allow generating a JRE with only the modules required for your application(s). Because we can't predict what modules will be needed on a general-purpose system, the default <package>jre</package> package is the full JDK. When building a minimal system/image, you can override the <literal>modules</literal> parameter on <literal>jre_minimal</literal> to build a JRE with only the modules relevant for you:
+<programlisting>
+let
+  my_jre = pkgs.jre_minimal.override {
+    modules = [
+      # The modules used by 'something' and 'other' combined:
+      "java.base"
+      "java.logging"
+    ];
+  };
+  something = (pkgs.something.override { jre = my_jre; });
+  other = (pkgs.other.override { jre = my_jre; });
+in
+  ...
+</programlisting>
  </para>
 
  <para>
diff --git a/pkgs/development/compilers/openjdk/jre.nix b/pkgs/development/compilers/openjdk/jre.nix
new file mode 100644
index 000000000000..817cdf9c26a9
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/jre.nix
@@ -0,0 +1,19 @@
+{ jdk
+, runCommand
+, patchelf
+, lib
+, modules ? [ "java.base" ]
+}:
+
+let
+  jre = runCommand "${jdk.name}-jre" {
+    nativeBuildInputs = [ patchelf ];
+    buildInputs = [ jdk ];
+    passthru = {
+      home = "${jre}";
+    };
+  }   ''
+      jlink --module-path ${jdk}/lib/openjdk/jmods --add-modules ${lib.concatStringsSep "," modules} --output $out
+      patchelf --shrink-rpath $out/bin/* $out/lib/jexec $out/lib/jspawnhelper $out/lib/*.so $out/lib/*/*.so
+  '';
+in jre
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fe1e4cd5253..6ffd2476c3bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9267,10 +9267,19 @@ in
   /* default JDK */
 
   jdk = jdk14;
-  # jdk14 lacks a jre output. See https://github.com/NixOS/nixpkgs/issues/79490
+
+  # Since the introduction of the Java Platform Module System in Java 9, Java
+  # no longer ships a separate JRE package.
+  #
+  # If you are building a 'minimal' system/image, you are encouraged to use
+  # 'jre_minimal' to build a bespoke JRE containing only the modules you need.
+  #
+  # For a general-purpose system, 'jre' defaults to the full JDK:
   jre = jdk14;
   jre_headless = jdk14_headless;
 
+  jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { };
+
   openjdk = openjdk14;
   openjdk_headless = openjdk14_headless;
 

From c4384a1f87d7a3a1e5d19f905a49c3f87bbc2602 Mon Sep 17 00:00:00 2001
From: Finn Behrens <me@kloenk.de>
Date: Wed, 4 Nov 2020 17:49:46 +0100
Subject: [PATCH 1241/3942] onefetch: 2.5.0 -> 2.6.0

---
 pkgs/tools/misc/onefetch/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix
index 426c5f212036..61f6fdde5d3a 100644
--- a/pkgs/tools/misc/onefetch/default.nix
+++ b/pkgs/tools/misc/onefetch/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "onefetch";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "o2sh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-F1NbzcMoct0mjWKY2itz4cBqVToY7HpoaRzk3l683fY=";
+    sha256 = "sha256-KdPr/6wGyoHhEwfPektL+B1khyoRfxDHI4aFcKNU0TM=";
   };
 
-  cargoSha256 = "sha256-eBY+34VEPEAv5bqerxR3i7cJrVb1GtvmWyrM7uuef2E=";
+  cargoSha256 = "sha256-MLlGz7Sid0G52//XekqkZgzLqFL7xoUwT6OvpaF4jm0=";
 
   buildInputs = with stdenv;
     lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];
@@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
     description = "Git repository summary on your terminal";
     homepage = "https://github.com/o2sh/onefetch";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ filalex77 kloenk ];
   };
 }

From cc3d5f46e340bd0e6bc20b9e7bc6b8a2c1a0aea7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 04:10:16 +0000
Subject: [PATCH 1242/3942] poppler_data: 0.4.9 -> 0.4.10

---
 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 c06e63d3e692..717c948f7437 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.10";
 
   src = fetchurl {
     url = "https://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z";
+    sha256 = "0c3vjs3p7rjc4yfacnhd865r27czmzwcr4j2z4jldi68dvvcwbvf";
   };
 
   nativeBuildInputs = [ cmake ninja ];

From 932efc3528cba329632c2346dad67de5c4b8cc0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Wed, 4 Nov 2020 16:52:40 +0000
Subject: [PATCH 1243/3942] polkadot: 0.8.25 -> 0.8.26

---
 .../blockchains/polkadot/default.nix          |  8 +++---
 .../substrate-wasm-builder-runner.patch       | 25 -------------------
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/applications/blockchains/polkadot/substrate-wasm-builder-runner.patch

diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index 45cecf7e9fb8..ef241126e6a6 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -7,18 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "polkadot";
-  version = "0.8.25";
+  version = "0.8.26";
 
   src = fetchFromGitHub {
     owner = "paritytech";
     repo = "polkadot";
     rev = "v${version}";
-    sha256 = "1jdklmysr25rlwgx7pz0jw66j1w60h98kqghzjhr90zhynzh39lz";
+    sha256 = "1bvma6k3gsjqh8w76k4kf52sjg8wxn1b7a409kmnmmvmd9j6z5ia";
   };
 
-  cargoSha256 = "08yfafrspkd1g1mhlfwngbknkxjkyymbcga8n2rdsk7mz0hm0vgy";
-
-  cargoPatches = [ ./substrate-wasm-builder-runner.patch ];
+  cargoSha256 = "0mjkiq6kih5vbmbmr3nmzw4zynha93lsqwbvams73871124mj7rc";
 
   nativeBuildInputs = [ clang ];
 
diff --git a/pkgs/applications/blockchains/polkadot/substrate-wasm-builder-runner.patch b/pkgs/applications/blockchains/polkadot/substrate-wasm-builder-runner.patch
deleted file mode 100644
index 7d84965dcea2..000000000000
--- a/pkgs/applications/blockchains/polkadot/substrate-wasm-builder-runner.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 5e7c4a14..bb67aada 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -8642,8 +8642,7 @@ dependencies = [
- [[package]]
- name = "substrate-wasm-builder-runner"
- version = "1.0.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d2a965994514ab35d3893e9260245f2947fd1981cdd4fffd2c6e6d1a9ce02e6a"
-+source = "git+https://github.com/paritytech/substrate#647ad15565d7c35ecf00b73b12cccad9858780b9"
- 
- [[package]]
- name = "subtle"
-diff --git a/Cargo.toml b/Cargo.toml
-index 78047a1a..2d571f8e 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -112,3 +112,6 @@ polkadot = { path = "/usr/bin/polkadot" }
- 
- [package.metadata.rpm.files]
- "../scripts/packaging/polkadot.service" = { path = "/usr/lib/systemd/system/polkadot.service", mode = "644" }
-+
-+[patch.crates-io]
-+substrate-wasm-builder-runner = { git = "https://github.com/paritytech/substrate", branch = "master" }

From 3341f6c1fc87099e906e6cc1f1a1437124cdf673 Mon Sep 17 00:00:00 2001
From: Griffin Smith <root@gws.fyi>
Date: Tue, 3 Nov 2020 19:47:16 -0500
Subject: [PATCH 1244/3942] babashka,clj-kondo: Depend on graalvm-ce

Now that we have community builds of graalvm landed in #99631, both
clj-kondo and babashka can depend on those versions of graalvm rather
than the one that requires building from source - this can be built in
hydra, and generally is much easier to build and test.
---
 pkgs/development/interpreters/clojure/babashka.nix | 6 +++---
 pkgs/development/tools/clj-kondo/default.nix       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index c023aa65fdaa..22c83f99d5fb 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, graalvm8, glibcLocales }:
+{ stdenv, fetchurl, graalvm8-ce, glibcLocales }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   dontUnpack = true;
 
   LC_ALL = "en_US.UTF-8";
-  nativeBuildInputs = [ graalvm8 glibcLocales ];
+  nativeBuildInputs = [ graalvm8-ce glibcLocales ];
 
   buildPhase = ''
     native-image \
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/borkdude/babashka";
     license = licenses.epl10;
-    platforms = graalvm8.meta.platforms;
+    platforms = graalvm8-ce.meta.platforms;
     maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ];
   };
 }
diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix
index f64041d1be84..92596a068f7a 100644
--- a/pkgs/development/tools/clj-kondo/default.nix
+++ b/pkgs/development/tools/clj-kondo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, graalvm8, fetchurl }:
+{ stdenv, lib, graalvm8-ce, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "clj-kondo";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   dontUnpack = true;
 
-  buildInputs = [ graalvm8 ];
+  buildInputs = [ graalvm8-ce ];
 
   buildPhase = ''
     native-image  \
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "A linter for Clojure code that sparks joy";
     homepage = "https://github.com/borkdude/clj-kondo";
     license = licenses.epl10;
-    platforms = graalvm8.meta.platforms;
+    platforms = graalvm8-ce.meta.platforms;
     maintainers = with maintainers; [ jlesquembre bandresen ];
   };
 }

From b5de671861d3dda1be831c8052ba1966e5e1353e Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Tue, 3 Nov 2020 19:52:18 +0900
Subject: [PATCH 1245/3942] pythonPackages.smugline: remove

Upstream states that it is no longer maintained.

Reference: https://github.com/gingerlime/smugline#broken-no-longer-maintained
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 .../python-modules/smugline/default.nix       | 40 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 pkgs/top-level/python-packages.nix            |  2 -
 4 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 pkgs/development/python-modules/smugline/default.nix

diff --git a/pkgs/development/python-modules/smugline/default.nix b/pkgs/development/python-modules/smugline/default.nix
deleted file mode 100644
index d779a79ed21a..000000000000
--- a/pkgs/development/python-modules/smugline/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, fetchFromGitHub
-, docopt
-, requests
-, smugpy
-, python
-, pkgs
-}:
-
-stdenv.mkDerivation rec {
-  pname   = "smugline";
-  version = "20160106";
-
-  src = fetchFromGitHub {
-    owner  = "gingerlime";
-    repo   = pname;
-    rev    = "134554c574c2d282112ba60165a8c5ffe0f16fd4";
-    sha256 = "00n012ijkdrx8wsl8x3ghdcxcdp29s4kwr3yxvlyj79g5yhfvaj6";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  buildInputs = [ python pkgs.makeWrapper ];
-  propagatedBuildInputs = [ docopt requests smugpy ];
-
-  installPhase = ''
-    mkdir -p $out/bin $out/libexec
-    cp smugline.py $out/libexec
-    makeWrapper ${python.interpreter} $out/bin/smugline \
-      --add-flags "$out/libexec/smugline.py" \
-      --prefix PYTHONPATH : "$PYTHONPATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/gingerlime/smugline";
-    description = "A simple command line tool for smugmug ";
-    license = licenses.mit;
-  };
-
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b87ce83fc9ec..f0150d8fb956 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -541,6 +541,7 @@ mapAliases ({
   slurm-llnl-full = slurm-full; # renamed July 2017
   slurm-full = slurm; # added 2018-05-1
   smbclient = samba; # added 2018-04-25
+  smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04
   slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
   slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
   sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4dc2f696225c..0488e78521bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7187,8 +7187,6 @@ in
 
   smu = callPackage ../tools/text/smu { };
 
-  smugline = python3Packages.smugline;
-
   sn0int = callPackage ../tools/security/sn0int { };
 
   snabb = callPackage ../tools/networking/snabb { } ;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ae1007f89154..a72d7c3a1fbb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6654,8 +6654,6 @@ in {
 
   smpplib = callPackage ../development/python-modules/smpplib { };
 
-  smugline = callPackage ../development/python-modules/smugline { };
-
   smugpy = callPackage ../development/python-modules/smugpy { };
 
   snack = toPythonModule (pkgs.newt.override { inherit (self) python; });

From 023f70ef8ac5f3c0030941a4e2f5118091afb995 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Tue, 3 Nov 2020 20:09:45 +0900
Subject: [PATCH 1246/3942] pythonPackages.smugpy: remove

Upstream has stalled since 2013. The latest release supports up to
Python 3.2.

Reference: https://github.com/chrishoffman/smugpy
Reference: https://pypi.org/project/smugpy/
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 .../python-modules/smugpy/default.nix         | 21 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 23 deletions(-)
 delete mode 100644 pkgs/development/python-modules/smugpy/default.nix

diff --git a/pkgs/development/python-modules/smugpy/default.nix b/pkgs/development/python-modules/smugpy/default.nix
deleted file mode 100644
index 43ac45b1235e..000000000000
--- a/pkgs/development/python-modules/smugpy/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub }:
-
-buildPythonPackage rec {
-  pname   = "smugpy";
-  version = "20131218";
-
-  src = fetchFromGitHub {
-    owner  = "chrishoffman";
-    repo   = pname;
-    rev    = "f698d6749ce446e3d6c7d925b2cd1cd5b3d695ea";
-    sha256 = "029x6hm1744iznv4sw8sfyl974wmx1sqnr1k5dvzzwpk3ja49a1y";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Python library for the SmugMug API";
-    license = with licenses; [ mit ];
-    homepage = "https://github.com/chrishoffman/smugpy";
-  };
-
-  doCheck = false; # Tries to login to Smugmug…
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a72d7c3a1fbb..305bd7934d5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6654,8 +6654,6 @@ in {
 
   smpplib = callPackage ../development/python-modules/smpplib { };
 
-  smugpy = callPackage ../development/python-modules/smugpy { };
-
   snack = toPythonModule (pkgs.newt.override { inherit (self) python; });
 
   snakebite = callPackage ../development/python-modules/snakebite { };

From f1d86be8d70ffd91f826d141aa09e40b8b8b2352 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 15:13:10 +0000
Subject: [PATCH 1247/3942] python37Packages.breathe: 4.22.1 -> 4.23.0

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

diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index fe7a2a713cfb..9c8440b9f7f1 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,13 +1,13 @@
 { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
 
 buildPythonPackage rec {
-  version = "4.22.1";
+  version = "4.23.0";
   pname = "breathe";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6e4b66e61876dac90e78b335788a38eaa3625ed9c70d0add261f98ddd128d36a";
+    sha256 = "c28e251ad8a42e4d3dd6c0861a66128b400131614b36f19df505ea34c934f801";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];

From 1856010455c8a3a1318a2cf3e5767d5ccf4c8df6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 15:19:41 +0000
Subject: [PATCH 1248/3942] python27Packages.bitarray: 1.5.3 -> 1.6.0

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

diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
index 1e995af39207..fe4e442e3084 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bitarray";
-  version = "1.5.3";
+  version = "1.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "567631fc922b1c2c528c376795f18dcc0604d18702e0b8b50e8e35f0474214a5";
+    sha256 = "ba157ddebddc723fe021fc80595b3c70924d69ee58286b62bfca21da48edfc9d";
   };
 
   meta = with lib; {

From 5f9adc68508aedb60b544c1b0c5e70c76f844422 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 14:41:20 +0000
Subject: [PATCH 1249/3942] python27Packages.btchip: 0.1.30 -> 0.1.31

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

diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix
index 7370d3db7dbf..c84ee0f0be7f 100644
--- a/pkgs/development/python-modules/btchip/default.nix
+++ b/pkgs/development/python-modules/btchip/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "btchip-python";
-  version = "0.1.30";
+  version = "0.1.31";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mraf2lmh70b038k934adxi7d40431j7yq93my3aws99f5xccsb8";
+    sha256 = "4167f3c6ea832dd189d447d0d7a8c2a968027671ae6f43c680192f2b72c39b2c";
   };
 
   propagatedBuildInputs = [ hidapi pyscard ecdsa ];

From 7e743a0f2918648cc2f0723282b34fb550cd383d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 15:37:37 +0000
Subject: [PATCH 1250/3942] python27Packages.cbor2: 5.1.2 -> 5.2.0

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

diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
index 4ee4b8ecb60e..08503297d1f7 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cbor2";
-  version = "5.1.2";
+  version = "5.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "91759bd0ee5ef0d4fa24144dfa551670730baeca8cf2fff1cc59f734ecd21de6";
+    sha256 = "a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From 74a37c61a0c7c145ef0c74bdf8471a2a84b45c8c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 17:41:38 +0000
Subject: [PATCH 1251/3942] python27Packages.iniconfig: 1.0.1 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix
index f6383e46d234..ae4d08f498fb 100644
--- a/pkgs/development/python-modules/iniconfig/default.nix
+++ b/pkgs/development/python-modules/iniconfig/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "iniconfig";
-  version = "1.0.1";
+  version = "1.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0s9z9n4603fdpv2vzh6ddzfgsjmb09n6qalkjl2xwrss6n4jzyg5";
+    sha256 = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32";
   };
 
   doCheck = false; # avoid circular import with pytest

From 7e062659e97ba0c354a329dbf6ae2f9460cfc69b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 4 Nov 2020 12:45:20 -0500
Subject: [PATCH 1252/3942] ammonite: Add test reference, update script

---
 nixos/tests/all-tests.nix                   |  1 +
 nixos/tests/ammonite.nix                    |  2 +-
 pkgs/development/tools/ammonite/default.nix | 40 +++++++++++++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 553f4f8fc4cc..e277f5922ccf 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -24,6 +24,7 @@ in
   _3proxy = handleTest ./3proxy.nix {};
   acme = handleTest ./acme.nix {};
   agda = handleTest ./agda.nix {};
+  ammonite = handleTest ./ammonite.nix {};
   atd = handleTest ./atd.nix {};
   avahi = handleTest ./avahi.nix {};
   avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };
diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix
index 1955e42be5f0..e9f06358e13f 100644
--- a/nixos/tests/ammonite.nix
+++ b/nixos/tests/ammonite.nix
@@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
     amm =
       { pkgs, ... }:
         {
-          environment.systemPackages = [ pkgs.ammonite ];
+          environment.systemPackages = [ (pkgs.ammonite.override { jre = pkgs.jre8; }) ];
         };
     };
 
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 82e38e2a25f8..fc8ec00bb8b7 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchurl, jre, disableRemoteLogging ? true }:
+{ stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git
+, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }:
 
 with stdenv.lib;
 
 let
+  repo = "git@github.com:lihaoyi/Ammonite.git";
+
   common = { scalaVersion, sha256 }:
     stdenv.mkDerivation rec {
       pname = "ammonite";
@@ -24,6 +27,37 @@ let
         sed -i '1i #!/bin/sh' $out/bin/amm
       '';
 
+      passthru = {
+        tests = { inherit (nixosTests) ammonite; };
+
+        updateScript = writeScript "update.sh" ''
+          #!${stdenv.shell}
+          set -o errexit
+          PATH=${
+            stdenv.lib.makeBinPath [
+              common-updater-scripts
+              coreutils
+              git
+              gnused
+              nix
+              nixfmt
+            ]
+          }
+          oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
+          latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)"
+          if [ ! "$oldVersion" = "$latestTag" ]; then
+            nixpkgs="$(git rev-parse --show-toplevel)"
+            default_nix="$nixpkgs/pkgs/development/tools/ammonite/default.nix"
+            update-source-version ${pname}_2_12 "$latestTag" --version-key=version --print-changes
+            sed -i "s|$latestTag|$oldVersion|g" "$default_nix"
+            update-source-version ${pname}_2_13 "$latestTag" --version-key=version --print-changes
+            nixfmt "$default_nix"
+          else
+            echo "${pname} is already up-to-date"
+          fi
+        '';
+      };
+
       meta = {
         description = "Improved Scala REPL";
         longDescription = ''
@@ -41,10 +75,10 @@ let
 in {
   ammonite_2_12 = common {
     scalaVersion = "2.12";
-    sha256 = "0nclfqwy3jfn1680z1hd0zzmc0b79wpvx6gn1jnm19aq7qcvh5zp";
+    sha256 = "9xe4GT5YpVCtDPaZvi9PZwFW/wcNhg+QCdbJ4Tl2lFk=";
   };
   ammonite_2_13 = common {
     scalaVersion = "2.13";
-    sha256 = "104bnahn382sb6vwjvchsg0jrnkkwjn08rfh0g5ra7lwhgcj2719";
+    sha256 = "KRwh2YOcHpXLA9BlBKzkc9oswdOQbcm3WVqgYaGyi4A=";
   };
 }

From 1eaf05fbaf6a84c3037fe718aba46bbf061504e4 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 4 Nov 2020 19:22:57 +0100
Subject: [PATCH 1253/3942] terraform-providers.linuxbox: init at 0.3.11

---
 .../cluster/terraform-providers/default.nix   |  1 +
 .../terraform-providers/linuxbox/default.nix  | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 4467e8304db6..ebe787a25192 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -167,6 +167,7 @@ let
     hcloud = callPackage ./hcloud {};
     keycloak = callPackage ./keycloak {};
     libvirt = callPackage ./libvirt {};
+    linuxbox = callPackage ./linuxbox {};
     lxd = callPackage ./lxd {};
     shell = callPackage ./shell {};
     vpsadmin = callPackage ./vpsadmin {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix
new file mode 100644
index 000000000000..60cd7f2d7637
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "terraform-provider-linuxbox";
+  version = "0.3.11";
+
+  src = fetchFromGitHub {
+    owner = "numtide";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1sxb2iv4dl0rw3v1r7k5dfkyh14nmp19cprqafhb7ncarmvawq39";
+  };
+
+  vendorSha256 = "16hp0pv1qpvr34ac1syjci39csvyj3c748inllypjwx76q6rwp7k";
+
+  postInstall = "mv $out/bin/terraform-provider-linuxbox{,_v${version}}";
+
+  passthru.provider-source-address = "registry.terraform.io/numtide/linuxbox";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/numtide/terraform-provider-linuxbox";
+    description = "Basic building block for Seed DevOps";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}

From fb396b7ea5fd1bf42d870345f528d0c84197b960 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <NeQuissimus@users.noreply.github.com>
Date: Wed, 4 Nov 2020 13:26:21 -0500
Subject: [PATCH 1254/3942] Update pkgs/development/tools/ammonite/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/tools/ammonite/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index fc8ec00bb8b7..c3a578f18b8c 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -45,7 +45,7 @@ let
           }
           oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
           latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)"
-          if [ ! "$oldVersion" = "$latestTag" ]; then
+          if [ "$oldVersion" != "$latestTag" ]; then
             nixpkgs="$(git rev-parse --show-toplevel)"
             default_nix="$nixpkgs/pkgs/development/tools/ammonite/default.nix"
             update-source-version ${pname}_2_12 "$latestTag" --version-key=version --print-changes

From d5edfc50ef449e95b3c3efd53c5fe18858f20147 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Wed, 4 Nov 2020 20:21:54 +0000
Subject: [PATCH 1255/3942] dasel: init at 1.1.0

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

diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
new file mode 100644
index 000000000000..ef1279cddfc1
--- /dev/null
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "dasel";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "TomWright";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256:11xm47p7n79mq2zkv9q9m5v4a1gga01pkzi2j42gq1ma9hwz4idz";
+  };
+
+  vendorSha256 = "sha256:1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw";
+
+  meta = with stdenv.lib; {
+    description = "Query and update data structures from the command line";
+    longDescription = ''
+      Dasel (short for data-selector) allows you to query and modify data structures using selector strings.
+      Comparable to jq / yq, but supports JSON, YAML, TOML and XML with zero runtime dependencies.
+    '';
+    homepage = "https://github.com/TomWright/dasel";
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ _0x4A6F ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0488e78521bf..708831dbb809 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1854,6 +1854,8 @@ in
 
   dapr-cli = callPackage ../development/tools/dapr/cli {};
 
+  dasel = callPackage ../applications/misc/dasel { };
+
   dasher = callPackage ../applications/accessibility/dasher { };
 
   datamash = callPackage ../tools/misc/datamash { };

From 55ac5df24253ee442ca7c10776804c514ef03363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 4 Nov 2020 21:48:35 +0100
Subject: [PATCH 1256/3942] kwin: fixup build by upstream patch

---
 pkgs/desktops/plasma-5/kwin/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 78b6909f046d..e2fb0877ec86 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, fetchpatch,
   extra-cmake-modules, kdoctools,
 
   epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
@@ -37,6 +37,11 @@ mkDerivation {
   patches = [
     ./0001-follow-symlinks.patch
     ./0002-xwayland.patch
+    (fetchpatch { # included in >= 5.18.6
+      name = "EGL_TEXTURE_Y_XUXV_WL.diff";
+      url = "https://github.com/KDE/kwin/commit/2c76cc478.diff";
+      sha256 = "1ywaky05h5j1x758q3yhp3ap45ispffghyxynqz5lybl5n6yyxhy";
+    })
   ];
   CXXFLAGS = [
     ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''

From 2d68f63d1c04643e7c3a05ef8e21f8d889784feb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 19:58:14 +0000
Subject: [PATCH 1257/3942] python37Packages.cssselect2: 0.3.0 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix
index 5eb65ce2fca4..eadc3eb32b1f 100644
--- a/pkgs/development/python-modules/cssselect2/default.nix
+++ b/pkgs/development/python-modules/cssselect2/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "cssselect2";
-  version = "0.3.0";
+  version = "0.4.1";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5c2716f06b5de93f701d5755a9666f2ee22cbcd8b4da8adddfc30095ffea3abc";
+    sha256 = "93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8";
   };
 
   propagatedBuildInputs = [ tinycss2 ];

From 89cd50903d2eebf8c7ba821b54a1665cc232db0a Mon Sep 17 00:00:00 2001
From: Red Davies <red@infect.me>
Date: Wed, 4 Nov 2020 21:07:36 +0000
Subject: [PATCH 1258/3942] ant: 1.10.8 -> 1.10.9

---
 pkgs/development/tools/build-managers/apache-ant/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index b0411090fbe5..caa9bc3b9eb7 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, coreutils, makeWrapper }:
 
-let version = "1.10.8"; in
+let version = "1.10.9"; in
 
 stdenv.mkDerivation {
   pname = "ant";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
-    sha256 = "0zh94csb2hl6ir2ccn18ps506mjgh3mffnrb8wpsmp1x5fcykha5";
+    sha256 = "1ab8ybczvk12501dnj450a3d4v43ca0pjhk33s175hax46s58z47";
   };
 
   contrib = fetchurl {

From dda47e489aee9a7925a79e7c35775d5428a90585 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 4 Nov 2020 20:40:14 +0000
Subject: [PATCH 1259/3942] ghc8102BinaryMinimal: Re-add docs, remove more
 profiling files

(cherry picked from commit 7bd21d3e2da8b9ae394258cef9f18bf0a8dd2d47)
---
 pkgs/development/compilers/ghc/8.10.2-binary.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix
index cc9491ede240..38454147e394 100644
--- a/pkgs/development/compilers/ghc/8.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix
@@ -7,8 +7,6 @@
   # regular builds and GHC bootstrapping.
   # This is "useful" for staying within hydra's output limits for at least the
   # aarch64-linux architecture.
-  # Examples of unnecessary files are the bundled documentation and files that
-  # are only needed for profiling builds.
 , minimal ? false
 }:
 
@@ -182,11 +180,15 @@ stdenv.mkDerivation rec {
     done
   '' +
   stdenv.lib.optionalString minimal ''
-    # Remove profiling objects
+    # Remove profiling files
     find $out -type f -name '*.p_o' -delete
+    find $out -type f -name '*.p_hi' -delete
+    find $out -type f -name '*_p.a' -delete
     rm $out/lib/ghc-*/bin/ghc-iserv-prof
-    # Remove docs
-    rm -r $out/share/{doc,man}
+    # Hydra will redistribute this derivation, so we have to keep the docs for
+    # legal reasons (retaining the legal notices etc)
+    # As a last resort we could unpack the docs separately and symlink them in.
+    # They're in $out/share/{doc,man}.
   '';
 
   doInstallCheck = true;

From 6b377f29687e48f37222395324d7256f17acb654 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 4 Nov 2020 20:41:07 +0000
Subject: [PATCH 1260/3942] ghc8102Binary*: simplify meta

Not distributing dependencies via hydraPlatforms does not work,
so we keep meta simple.

(cherry picked from commit 4643796794897f2baa3a8015de5a9c9fd416f1ae)
---
 pkgs/development/compilers/ghc/8.10.2-binary.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix
index 38454147e394..1a1a9ca0160e 100644
--- a/pkgs/development/compilers/ghc/8.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix
@@ -212,18 +212,11 @@ stdenv.mkDerivation rec {
     enableShared = true;
   };
 
-  meta = let
-    platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
-  in {
+  meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     license = stdenv.lib.licenses.bsd3;
-
-    # The minimal variation can not be distributed because it removes the
-    # documentation, including licensing information that is required for
-    # distribution.
-    inherit platforms;
-    hydraPlatforms = stdenv.lib.optionals (!minimal) platforms;
+    platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
     maintainers = with stdenv.lib.maintainers; [ lostnet ];
   };
 }

From 3db4b04eb75c3815e6651785a6111d3e1f3da28e Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Thu, 5 Nov 2020 07:54:09 +0900
Subject: [PATCH 1261/3942] mstflint: add description

While I am aware of a new version 4.15.0-1, I avoided touching the
package itself as I can not test the package with real hardware.

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 pkgs/tools/misc/mstflint/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix
index 20d7110944d8..be3993d81ecf 100644
--- a/pkgs/tools/misc/mstflint/default.nix
+++ b/pkgs/tools/misc/mstflint/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   dontDisableStatic = true;  # the build fails without this. should probably be reported upstream
 
   meta = with stdenv.lib; {
+    description = "Open source version of Mellanox Firmware Tools (MFT)";
     homepage = "https://github.com/Mellanox/mstflint";
     license = with licenses; [ gpl2 bsd2 ];
     platforms = platforms.linux;

From 588729c1c8be2f896eb8ff52a8a0dd56124803df Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 4 Nov 2020 18:00:00 -0500
Subject: [PATCH 1262/3942] nodejs-15_x: 15.0.1 -> 15.1.0

https://github.com/nodejs/node/releases/tag/v15.1.0
---
 pkgs/development/web/nodejs/v15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix
index f115e42d0d08..23a14dc83486 100644
--- a/pkgs/development/web/nodejs/v15.nix
+++ b/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "15.0.1";
-    sha256 = "03xxnl7q96fmm7lalliwb9kmllz52jqrcsqn9cx9pzhwd1x97l5q";
+    version = "15.1.0";
+    sha256 = "1fd0ck6nlmp937j00y17q2k9xszzwf4s383p1z4v4qzj0qzxflvk";
   }

From 9907a2d48bf10c8ab39fb5ad165d0522e837b109 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 4 Nov 2020 18:12:23 -0500
Subject: [PATCH 1263/3942] oh-my-zsh: Update script

---
 pkgs/shells/zsh/oh-my-zsh/default.nix | 39 +++++++++++++++++++++++++--
 pkgs/shells/zsh/oh-my-zsh/update.sh   | 19 -------------
 2 files changed, 37 insertions(+), 21 deletions(-)
 delete mode 100755 pkgs/shells/zsh/oh-my-zsh/update.sh

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index e7433e2de0b8..f4388f6d8614 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -1,7 +1,8 @@
 # This script was inspired by the ArchLinux User Repository package:
 #
 #   https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts, git
+, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
 
 stdenv.mkDerivation rec {
   version = "2020-10-29";
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "0021rayw5wiwgjfwy7d6g577xidws58vk7y9xxhidnmk9sr4vri7";
+    sha256 = "J+ZNsk6z2hZh78mfuVHRvMV+TnmmHc+dfDzywr3KQQA=";
   };
 
   installPhase = ''
@@ -65,6 +66,40 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
+  passthru = {
+    updateScript = writeScript "update.sh" ''
+      #!${stdenv.shell}
+      set -o errexit
+      PATH=${
+        stdenv.lib.makeBinPath [
+          common-updater-scripts
+          curl
+          cacert
+          git
+          nixfmt
+          nix
+          jq
+          coreutils
+          gnused
+        ]
+      }
+
+      oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion oh-my-zsh" | tr -d '"')"
+      latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')"
+
+      if [ ! "null" = "$latestSha" ]; then
+        nixpkgs="$(git rev-parse --show-toplevel)"
+        default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix"
+        latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/$latestSha | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')"
+        update-source-version oh-my-zsh "$latestSha" --version-key=rev
+        update-source-version oh-my-zsh "$latestDate" --ignore-same-hash
+        nixfmt "$default_nix"
+      else
+        echo "${pname} is already up-to-date"
+      fi
+    '';
+  };
+
   meta = with stdenv.lib; {
     description = "A framework for managing your zsh configuration";
     longDescription = ''
diff --git a/pkgs/shells/zsh/oh-my-zsh/update.sh b/pkgs/shells/zsh/oh-my-zsh/update.sh
deleted file mode 100755
index 738c0810737a..000000000000
--- a/pkgs/shells/zsh/oh-my-zsh/update.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl common-updater-scripts jq
-
-set -eu -o pipefail
-
-oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion oh-my-zsh" | tr -d '"')"
-latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')"
-
-if [ ! "null" = "${latestSha}" ]; then
-  latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/${latestSha} | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')"
-  update-source-version oh-my-zsh "${latestSha}" --version-key=rev
-  update-source-version oh-my-zsh "${latestDate}" --ignore-same-hash
-  nixpkgs="$(git rev-parse --show-toplevel)"
-  default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix"
-  git add "${default_nix}"
-  git commit -m "oh-my-zsh: ${oldVersion} -> ${latestDate}"
-else
-  echo "oh-my-zsh is already up-to-date"
-fi

From 2a5b50f67dba187ba21dd56f20ee65f1d04f9059 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaum.bouchard@gmail.com>
Date: Wed, 4 Nov 2020 22:33:01 +0100
Subject: [PATCH 1264/3942] azure-cli: loosen antlr4 version bounds

---
 pkgs/tools/admin/azure-cli/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index a7dd4a6ae82c..5f636dcf747a 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -23,6 +23,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
     substituteInPlace setup.py \
       --replace "javaproperties==0.5.1" "javaproperties" \
       --replace "pytz==2019.1" "pytz" \
+      --replace "antlr4-python3-runtime~=4.7.2" "antlr4-python3-runtime~=4.7" \
       --replace "mock~=4.0" "mock"
 
     # remove namespace hacks

From 2de3de46317f5d95a308542265a4d08e3fb40534 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaum.bouchard@gmail.com>
Date: Wed, 4 Nov 2020 19:58:32 +0100
Subject: [PATCH 1265/3942] antlr: 4.7 -> 4.8

---
 pkgs/applications/misc/mysql-workbench/default.nix        | 8 ++++----
 pkgs/development/tools/parsing/antlr/{4.7.nix => 4.8.nix} | 6 +++---
 pkgs/top-level/all-packages.nix                           | 5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)
 rename pkgs/development/tools/parsing/antlr/{4.7.nix => 4.8.nix} (93%)

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 63d7077d32e0..71adcdc0757b 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -9,7 +9,7 @@
 , gtkmm3
 , pcre
 , swig
-, antlr4_7
+, antlr4_8
 , sudo
 , mysql
 , libxml2
@@ -80,7 +80,7 @@ in stdenv.mkDerivation rec {
   # have it look for 4.7.2 instead of 4.7.1
   preConfigure = ''
     substituteInPlace CMakeLists.txt \
-      --replace "antlr-4.7.1-complete.jar" "antlr-4.7.2-complete.jar"
+      --replace "antlr-4.7.1-complete.jar" "antlr-4.8-complete.jar"
   '';
 
   nativeBuildInputs = [
@@ -96,7 +96,7 @@ in stdenv.mkDerivation rec {
     gtk3
     gtkmm3
     libX11
-    antlr4_7.runtime.cpp
+    antlr4_8.runtime.cpp
     python2
     mysql
     libxml2
@@ -141,7 +141,7 @@ in stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"
     "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config"
-    "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}"
+    "-DWITH_ANTLR_JAR=${antlr4_8.jarLocation}"
     # mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8.
     # Newer versions of connector still provide the legacy library when enabled
     # but the headers are in a different location.
diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.8.nix
similarity index 93%
rename from pkgs/development/tools/parsing/antlr/4.7.nix
rename to pkgs/development/tools/parsing/antlr/4.8.nix
index 23267bf24313..1c88c82e16ae 100644
--- a/pkgs/development/tools/parsing/antlr/4.7.nix
+++ b/pkgs/development/tools/parsing/antlr/4.8.nix
@@ -2,12 +2,12 @@
 , fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }:
 
 let
-  version = "4.7.2";
+  version = "4.8";
   source = fetchFromGitHub {
     owner = "antlr";
     repo = "antlr4";
     rev = version;
-    sha256 = "1pl0zs6c6wx9nmq30s7ccpc3dl72az55i8vfp574fw9sywmvxmlj";
+    sha256 = "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m";
   };
 
   runtime = {
@@ -41,7 +41,7 @@ let
 
     src = fetchurl {
       url ="https://www.antlr.org/download/antlr-${version}-complete.jar";
-      sha256 = "1d40nfkq3ws8g4ksx4gj6l6m2l9j4b605q6sf68z5vvmg5nkhlk8";
+      sha256 = "0nms976cnqyr1ndng3haxkmknpdq6xli4cpf4x4al0yr21l9v93k";
     };
 
     dontUnpack = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0488e78521bf..24a889399201 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10682,10 +10682,11 @@ in
   };
   antlr3 = antlr3_5;
 
-  antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix {
+  antlr4_8 = callPackage ../development/tools/parsing/antlr/4.8.nix {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
-  antlr4 = antlr4_7;
+
+  antlr4 = antlr4_8;
 
   apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
   apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };

From eddeeb12e4e5e0b548ed91ff7de6631acd94ce12 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 23:54:40 +0000
Subject: [PATCH 1266/3942] python27Packages.flask-paginate: 0.5.4 -> 0.7.1

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

diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix
index f0cf96d13679..0d618e2b55df 100644
--- a/pkgs/development/python-modules/flask-paginate/default.nix
+++ b/pkgs/development/python-modules/flask-paginate/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "flask-paginate";
-  version = "0.5.4";
+  version = "0.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "60079a1c4c600cb4d4a9f7c386ea357b5ee02355ae6d6e8b41f769ae3f7af3ad";
+    sha256 = "949b93d0535d1223b91ac0048586bd878aaebf4044c54c1dc3068acc9bdf441f";
   };
 
   propagatedBuildInputs = [ flask ];

From 3037318511eccef339099704773564ee2b1bffe1 Mon Sep 17 00:00:00 2001
From: Samuel Ainsworth <skainsworth@gmail.com>
Date: Wed, 4 Nov 2020 16:12:36 -0800
Subject: [PATCH 1267/3942] slack: add passthru.updateScript

---
 .../networking/instant-messengers/slack/default.nix           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 6b2c2875e3ec..d27bd6a521de 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -75,6 +75,8 @@ let
   linux = stdenv.mkDerivation rec {
     inherit pname version src meta;
 
+    passthru.updateScript = ./update.sh;
+
     rpath = stdenv.lib.makeLibraryPath [
       alsaLib
       at-spi2-atk
@@ -159,6 +161,8 @@ let
   darwin = stdenv.mkDerivation {
     inherit pname version src meta;
 
+    passthru.updateScript = ./update.sh;
+
     nativeBuildInputs = [ undmg ];
 
     sourceRoot = "Slack.app";

From 7410775be72a7718a7593e6b0e1ad66f8032642c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 00:27:19 +0000
Subject: [PATCH 1268/3942] python27Packages.exifread: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix
index f62655055842..3c7b814a3c83 100644
--- a/pkgs/development/python-modules/exifread/default.nix
+++ b/pkgs/development/python-modules/exifread/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "ExifRead";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "269ff3a8eab8e082734a076182cce6fb126116619c0b7c2009bea34502cca213";
+    sha256 = "a0f74af5040168d3883bbc980efe26d06c89f026dc86ba28eb34107662d51766";
   };
 
   meta = with stdenv.lib; {

From e1c4c96c286b1b41684f3b3def429de577953cd3 Mon Sep 17 00:00:00 2001
From: Paul <423357+toothbrush@users.noreply.github.com>
Date: Thu, 5 Nov 2020 10:39:51 +0930
Subject: [PATCH 1269/3942] mercury: 20.06 -> 20.06.1

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

diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix
index b9225cbd793b..d7029733381d 100644
--- a/pkgs/development/compilers/mercury/default.nix
+++ b/pkgs/development/compilers/mercury/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mercury";
-  version = "20.06";
+  version = "20.06.1";
 
   src = fetchurl {
     url    = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz";
-    sha256 = "1gkr9w8lsdzqykqwd3f1a1phsqv090648i14ilhv8jdg85frdimr";
+    sha256 = "ef093ae81424c4f3fe696eff9aefb5fb66899e11bb17ae0326adfb70d09c1c1f";
   };
 
   buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper

From a5675f2034e7bd14cde0f2a9a990d55696f1b9b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 01:21:37 +0000
Subject: [PATCH 1270/3942] python27Packages.caldav: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix
index 57dffe89fc32..3888bb7ec65a 100644
--- a/pkgs/development/python-modules/caldav/default.nix
+++ b/pkgs/development/python-modules/caldav/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "caldav";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "python-caldav";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0m64maiqp3k8fsgkkvdx1dlfhkc70pqig4dclq6w8ajz82czrq83";
+    sha256 = "1shfj67kq6qzd0ngyfk09hpzfggybcfxv5s7hqs87nq9l51bssv8";
   };
 
   nativeBuildInputs = lib.optionals (pythonOlder "3.5") [ mock ];

From 9813539969d6071ed1a162a1d45d7521b2980c2a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 4 Nov 2020 20:37:50 -0500
Subject: [PATCH 1271/3942] oh-my-zsh: Add test

---
 nixos/tests/all-tests.nix             |  1 +
 nixos/tests/oh-my-zsh.nix             | 18 ++++++++++++++++++
 pkgs/shells/zsh/oh-my-zsh/default.nix |  2 ++
 3 files changed, 21 insertions(+)
 create mode 100644 nixos/tests/oh-my-zsh.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 76b2af9d578c..e2e9a15fc324 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -254,6 +254,7 @@ in
   novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {};
   nsd = handleTest ./nsd.nix {};
   nzbget = handleTest ./nzbget.nix {};
+  oh-my-zsh = handleTest ./oh-my-zsh.nix {};
   openarena = handleTest ./openarena.nix {};
   openldap = handleTest ./openldap.nix {};
   opensmtpd = handleTest ./opensmtpd.nix {};
diff --git a/nixos/tests/oh-my-zsh.nix b/nixos/tests/oh-my-zsh.nix
new file mode 100644
index 000000000000..57a073b086e8
--- /dev/null
+++ b/nixos/tests/oh-my-zsh.nix
@@ -0,0 +1,18 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+  name = "oh-my-zsh";
+
+  machine = { pkgs, ... }:
+
+    {
+      programs.zsh = {
+        enable = true;
+        ohMyZsh.enable = true;
+      };
+    };
+
+  testScript = ''
+    start_all()
+    machine.succeed("touch ~/.zshrc")
+    machine.succeed("zsh -c 'source /etc/zshrc && echo $ZSH | grep oh-my-zsh-${pkgs.oh-my-zsh.version}'")
+  '';
+})
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index f4388f6d8614..3660453245bb 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -67,6 +67,8 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
+    tests = { inherit (nixosTests) oh-my-zsh; };
+
     updateScript = writeScript "update.sh" ''
       #!${stdenv.shell}
       set -o errexit

From 343aa3365b88f95abdd8893b7fd27169d9c4e616 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 02:14:29 +0000
Subject: [PATCH 1272/3942] python37Packages.elementpath: 2.0.3 -> 2.0.4

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

diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index 53324f94c89d..9b9597c98bef 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -1,7 +1,7 @@
 { lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
 
 buildPythonPackage rec {
-  version = "2.0.3";
+  version = "2.0.4";
   pname = "elementpath";
   disabled = isPy27; # uses incompatible class syntax
 
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "elementpath";
     rev = "v${version}";
-    sha256 = "16gs5glnlr4i41xbmd30x62zj85apmf69m9akvfnka0gkjlzv8in";
+    sha256 = "0812il5xn7cq0qa0vmkszrvprakfpyxmilk7s918l9kavdy4al8x";
   };
 
   # avoid circular dependency with xmlschema which directly depends on this

From 43f23f5c1974e1459b4493472825115639dbbb9f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 02:21:12 +0000
Subject: [PATCH 1273/3942] python27Packages.jq: 1.0.2 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix
index 72776a037192..3d4097b07186 100644
--- a/pkgs/development/python-modules/jq/default.nix
+++ b/pkgs/development/python-modules/jq/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "jq";
-  version = "1.0.2";
+  version = "1.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9fe6ce07bc8d209c385d8ba132a2971c69aef015103c46bea87a73a16c5ec147";
+    sha256 = "62d649c4f6f26ed91810c8db075f5fe05319c3dc99dbebcd2d31b0b697a4592e";
   };
   patches = [ ./jq-py-setup.patch ];
 

From 981e163aa345f8435cf11a534c73c41ad008d736 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 5 Nov 2020 04:20:00 +0000
Subject: [PATCH 1274/3942] nixops: fix build on darwin

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

diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix
index 722c4a53b8fa..7a023d9489ed 100644
--- a/pkgs/development/libraries/libvirt/5.9.0.nix
+++ b/pkgs/development/libraries/libvirt/5.9.0.nix
@@ -36,12 +36,12 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper pkgconfig rpcsvc-proto ];
   buildInputs = [
     libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
-    libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib libtirpc
+    libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
   ] ++ optionals (!buildFromTarball) [
     libtool autoconf automake
   ] ++ optionals stdenv.isLinux [
     libpciaccess lvm2 utillinux systemd libnl numad zfs
-    libapparmor libcap_ng numactl attr parted
+    libapparmor libcap_ng numactl attr parted libtirpc
   ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
     xen
   ] ++ optionals enableIscsi [

From 94a810c56d54882577711ecbdd3c4b0838ec8c65 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 5 Nov 2020 04:20:00 +0000
Subject: [PATCH 1275/3942] nixops: add patch to follow redirects in
 nixos-infect

---
 pkgs/tools/package-management/nixops/default.nix | 9 ++++++++-
 pkgs/tools/package-management/nixops/generic.nix | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index c761a3a47793..96e6ec3f55a0 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl }:
+{ callPackage, fetchurl, fetchpatch }:
 
 callPackage ./generic.nix (rec {
   version = "1.7";
@@ -6,4 +6,11 @@ callPackage ./generic.nix (rec {
     url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
     sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3";
   };
+  patches = [
+    # follow redirect in nixos-infect. Remove with the next release.
+    (fetchpatch {
+      url = "https://github.com/NixOS/nixops/commit/fb6d4665e8efd858a215bbaaf079ec3f5ebc49b8.patch";
+      sha256 = "1hbhykl811zsqlaj3y5m9d8lfsal6ps6n5p16ah6lqy2s18ap9d0";
+    })
+  ];
 })
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index 59d139d28847..564256de35d1 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -2,11 +2,12 @@
 # version args
 , src, version
 , meta ? {}
+, patches ? null
 }:
 
 python2Packages.buildPythonApplication {
   name = "nixops-${version}";
-  inherit version src;
+  inherit version src patches;
 
   buildInputs = [ libxslt ];
 

From 33eb9cd9612c008e416fd0463bf043de0c4cb1c7 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Wed, 21 Oct 2020 00:32:00 -0700
Subject: [PATCH 1276/3942] rustc: enable on ppc64le

---
 pkgs/development/compilers/rust/1_45.nix        | 1 +
 pkgs/development/compilers/rust/1_47.nix        | 1 +
 pkgs/development/compilers/rust/print-hashes.sh | 1 +
 3 files changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/rust/1_45.nix b/pkgs/development/compilers/rust/1_45.nix
index 94c70880dbaa..2b3de4dd38c6 100644
--- a/pkgs/development/compilers/rust/1_45.nix
+++ b/pkgs/development/compilers/rust/1_45.nix
@@ -32,6 +32,7 @@ import ./default.nix {
     armv7-unknown-linux-gnueabihf = "d44294732cf268ea84908f1135f574ab9489132a332eaa9d5bda547374b15d54";
     aarch64-unknown-linux-gnu = "a2d74ebeec0b6778026b6c37814cdc91d14db3b0d8b6d69d036216f4d9cf7e49";
     x86_64-apple-darwin = "a5464e7bcbce9647607904a4afa8362382f1fc55d39e7bbaf4483ac00eb5d56a";
+    powerpc64le-unknown-linux-gnu = "22deeca259459db31065af7c862fcab7fbfb623200520c65002ed2ba93d87ad2";
   };
 
   selectRustPackage = pkgs: pkgs.rust_1_45;
diff --git a/pkgs/development/compilers/rust/1_47.nix b/pkgs/development/compilers/rust/1_47.nix
index e5cbae193bf1..8298a5d956cf 100644
--- a/pkgs/development/compilers/rust/1_47.nix
+++ b/pkgs/development/compilers/rust/1_47.nix
@@ -34,6 +34,7 @@ import ./default.nix {
     armv7-unknown-linux-gnueabihf = "7c0640879d7f2c38db60352e3c0f09e3fc6fa3bac6ca8f22cbccb1eb5e950121";
     aarch64-unknown-linux-gnu = "f0c6d630f3dedb3db69d69ed9f833aa6b472363096f5164f1068c7001ca42aeb";
     x86_64-apple-darwin = "82d61582a3772932432a99789c3b3bd4abe6baca339e355048ca9efb9ea5b4db";
+    powerpc64le-unknown-linux-gnu = "89e2f4761d257f017a4b6aa427f36ac0603195546fa2cfded8c899789832941c";
   };
 
   selectRustPackage = pkgs: pkgs.rust_1_47;
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh
index 957011fad376..9180ccb67d91 100755
--- a/pkgs/development/compilers/rust/print-hashes.sh
+++ b/pkgs/development/compilers/rust/print-hashes.sh
@@ -14,6 +14,7 @@ PLATFORMS=(
   armv7-unknown-linux-gnueabihf
   aarch64-unknown-linux-gnu
   x86_64-apple-darwin
+  powerpc64le-unknown-linux-gnu
 )
 BASEURL=https://static.rust-lang.org/dist
 VERSION=${1:-}

From 172cbb8eb7663de4fb2cced894d7b90d2275250e Mon Sep 17 00:00:00 2001
From: Benjamin Andresen <b@lambda.icu>
Date: Thu, 5 Nov 2020 07:11:54 +0100
Subject: [PATCH 1277/3942] babashka: 0.0.97 -> 0.2.3

with #99631 and #102693 merged, it's possible to bump the babashka
version again.

However recent versions of babashka depend on java11 features and I
spoke in Slack with the project lead and this java11 dependency will
exist going forward.
---
 pkgs/development/interpreters/clojure/babashka.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index 22c83f99d5fb..a6beaf1a5761 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchurl, graalvm8-ce, glibcLocales }:
+{ stdenv, fetchurl, graalvm11-ce, glibcLocales }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "babashka";
-  version = "0.0.97";
+  version = "0.2.3";
 
   reflectionJson = fetchurl {
     name = "reflection.json";
     url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json";
-    sha256 = "1gd9ih9l02n1j9qkbxb36d3cb5sddwvxiw8kkicgc4xig77lsa7z";
+    sha256 = "0lbdh3v3g3j00bn99bjhjj3gk1q9ks2alpvl9bxc00xpyw86f7z8";
   };
 
   src = fetchurl {
     url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "08py6bawfrhg90fbcnv2mq4c91g5wa1q2q6zdjy2i1b9q4x1654r";
+    sha256 = "0vh6k3dkzyk346jjzg6n4mdi65iybrmhb3js9lm73yc3ay2c5dyi";
   };
 
   dontUnpack = true;
 
   LC_ALL = "en_US.UTF-8";
-  nativeBuildInputs = [ graalvm8-ce glibcLocales ];
+  nativeBuildInputs = [ graalvm11-ce glibcLocales ];
 
   buildPhase = ''
     native-image \
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/borkdude/babashka";
     license = licenses.epl10;
-    platforms = graalvm8-ce.meta.platforms;
+    platforms = graalvm11-ce.meta.platforms;
     maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ];
   };
 }

From 926c4d7d5901c9511dabeac313c0ca06dd1409c3 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sun, 18 Oct 2020 16:00:40 -0700
Subject: [PATCH 1278/3942] maintainers: add r-burns

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4bfd01be5f1d..93e5b583233f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7065,6 +7065,12 @@
       fingerprint = "7573 56D7 79BB B888 773E  415E 736C CDF9 EF51 BD97";
     }];
   };
+  r-burns = {
+    email = "rtburns@protonmail.com";
+    github = "r-burns";
+    githubId = 52847440;
+    name = "Ryan Burns";
+  };
   raboof = {
     email = "arnout@bzzt.net";
     github = "raboof";

From 1a42b1c0242a2bd444051d38c36f25e5a8514eee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 04:17:03 +0000
Subject: [PATCH 1279/3942] python37Packages.django_modelcluster: 5.0.2 -> 5.1

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

diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix
index 4ded69bc3256..e41b455cd4b5 100644
--- a/pkgs/development/python-modules/django_modelcluster/default.nix
+++ b/pkgs/development/python-modules/django_modelcluster/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "django-modelcluster";
-  version = "5.0.2";
+  version = "5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c7a42cf9b93d1161a10bf59919f7ee52d996a523a4134b2a136f6fe1eba7a2fa";
+    sha256 = "783d177f7bf5c8f30fe365c347b9a032920de371fe1c63d955d7b283684d4c08";
   };
 
   disabled = pythonOlder "3.5";

From af12dc00c72ac210fd6934912325d63b46503042 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 05:56:13 +0000
Subject: [PATCH 1280/3942] python27Packages.pushbullet: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix
index b9c2a84728fa..68c9d9180dc8 100644
--- a/pkgs/development/python-modules/pushbullet/default.nix
+++ b/pkgs/development/python-modules/pushbullet/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "pushbullet.py";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "aa9dc7bb46e083e3497d46241154f12944a8f540e29d150330ca94db0b453b8d";
+    sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
   };
 
   propagatedBuildInputs = [ requests websocket_client python_magic ];

From 0f0f3d53df523d2a3173e19528e4f40c07b3553f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 06:49:44 +0000
Subject: [PATCH 1281/3942] python27Packages.pex: 2.1.15 -> 2.1.20

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

diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 9eb722633025..78bb61d03cfb 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pex";
-  version = "2.1.15";
+  version = "2.1.20";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e1092ae52cfdef41c22d98fa98f9225ac21936a7d096131777ca3a7940fe1b2d";
+    sha256 = "2f1cf9721aa5fce93b034d2a18922d34d6f5fb81236ab3a955706226b15658fd";
   };
 
   nativeBuildInputs = [ setuptools ];

From 005f545f46afd57abd037a37efa6b42fbc07c7c8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 23:19:11 +0000
Subject: [PATCH 1282/3942] python37Packages.cupy: 7.7.0 -> 8.1.0

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

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 2bbd20a16d72..2983255e8f91 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "cupy";
-  version = "7.7.0";
+  version = "8.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b4032adf839f63bab7fc9f3e7066ef86abe0928e834aa5d132e4e7ce907951ed";
+    sha256 = "4dfa4a0cd0a752d980347c816cab2169f0938c1d37275311810396dcf3c27912";
   };
 
   checkInputs = [

From e06a9d63bcced7ea0f7ed01017eff463782068e3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 4 Nov 2020 23:17:12 -0800
Subject: [PATCH 1283/3942] python2Packages.cupy: disable for python2

---
 pkgs/development/python-modules/cupy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 2983255e8f91..5c9a5b76d101 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -7,6 +7,7 @@
 buildPythonPackage rec {
   pname = "cupy";
   version = "8.1.0";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;

From 20c1ccf2dc252cbb7afb598fb9c1fd2f58082cce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 06:06:13 +0000
Subject: [PATCH 1284/3942] python27Packages.python-sql: 1.1.0 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix
index b6a489343721..90dc5835e458 100644
--- a/pkgs/development/python-modules/python-sql/default.nix
+++ b/pkgs/development/python-modules/python-sql/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "python-sql";
-  version = "1.1.0";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f0g10y0whvax8yv0rfs7b4yd68lbxbss1za0mvbvr65b8r3pdxz";
+    sha256 = "306999bd311fbf50804d76f346655af0a6ff18881ce46c1329256fee40f492c0";
   };
 
   meta = {

From 842c7c538449e7680f1eded1bb41cef92b05eeb6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Nov 2020 12:43:05 +0100
Subject: [PATCH 1285/3942] python3Packages.pyairvisual: 1.0.0 -> 5.0.4

---
 .../python-modules/pyairvisual/default.nix    | 49 ++++++++++++++-----
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix
index 58eb5f7028ac..084852fa5371 100644
--- a/pkgs/development/python-modules/pyairvisual/default.nix
+++ b/pkgs/development/python-modules/pyairvisual/default.nix
@@ -1,29 +1,54 @@
-{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, requests
-, requests-mock, pytest
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, poetry
+, aiohttp
+, numpy
+, pysmb
+, aresponses
+, asynctest
+, pytest-aiohttp
+, pytest-asyncio
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "pyairvisual";
-  version = "1.0.0";
+  version = "5.0.4";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "bachya";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "0ng6k07n91k5l68zk3hl4fywb33admp84wqdm20qmmw9yc9c64fd";
+    rev = version;
+    sha256 = "0z769xrb6w6bhqcq02sjryl1qyvk9dc1xfn06fc3mdqnrbr0xxj3";
   };
 
-  checkInputs = [ pytest requests-mock ];
-  propagatedBuildInputs = [ requests ];
+  nativeBuildInputs = [ poetry ];
 
-  checkPhase = ''
-    py.test tests
-  '';
+  propagatedBuildInputs = [
+    aiohttp
+    numpy
+    pysmb
+  ];
 
-  disabled = !isPy3k;
+  checkInputs = [
+    aresponses
+    asynctest
+    pytest-aiohttp
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "tests"
+  ];
 
   meta = with lib; {
-    description = "A thin Python wrapper for the AirVisual API";
+    description = "A simple, clean, well-tested Python library for interacting with AirVisual©";
     license = licenses.mit;
     homepage = "https://github.com/bachya/pyairvisual";
   };

From 7f623f6f3b2e3d647488a4da960a71f34efb4656 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Nov 2020 12:48:49 +0100
Subject: [PATCH 1286/3942] python3Packages.pyatmo: 4.1.0 -> 4.2.0

Relax their oauthlib pin to 3.1.0, we have already move on to an unstable
version for the latest PyJWT support.
---
 .../python-modules/pyatmo/default.nix           | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix
index b0e8ac5d250f..971b43147c6c 100644
--- a/pkgs/development/python-modules/pyatmo/default.nix
+++ b/pkgs/development/python-modules/pyatmo/default.nix
@@ -12,17 +12,26 @@
 
 buildPythonPackage rec {
   pname = "pyatmo";
-  version = "4.1.0";
-  disabled = pythonOlder "3.5"; # uses type hints
+  version = "4.2.0";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "jabesq";
     repo = "netatmo-api-python";
     rev = "v${version}";
-    sha256 = "0x3xq6ni9rl5k3vi0ydqafdzvza785ycnlgyikgqbkppbh3j33ig";
+    sha256 = "0b2k1814zg3994k60xdw5gpsl8k1wy9zndd0b1p4dfb5qkx9f8kp";
   };
 
-  propagatedBuildInputs = [ oauthlib requests requests_oauthlib ];
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "oauthlib==3.1.0" "oauthlib"
+  '';
+
+  propagatedBuildInputs = [
+    oauthlib
+    requests
+    requests_oauthlib
+  ];
 
   checkInputs = [
     freezegun

From 0c4e33e4aabd1c2e55fb0be71a383aca8df126b1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Nov 2020 12:52:54 +0100
Subject: [PATCH 1287/3942] homeassistant: 0.117.2 -> 0.117.3

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 140d6841681d..371faf8ccce5 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.117.2";
+  version = "0.117.3";
   components = {
     "abode" = ps: with ps; [ abodepy ];
     "accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 9302a38f79e6..9e239e8c9610 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.117.2";
+  hassVersion = "0.117.3";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -83,13 +83,16 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    sha256 = "1mpvskr0zjvl065ldw05kc0x5yvibwfm2nmv478wznw3vwmbqrzn";
+    sha256 = "05vsq3dw02bn3hppxbgw321ray842ck6z559rq92i720bx1vi0qx";
   };
 
+  # leave this in, so users don't have to constantly update their downstream patch handling
+  patches = [];
+
   postPatch = ''
     substituteInPlace setup.py \
       --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
-      --replace "cryptography==3.2.0" "cryptography" \
+      --replace "cryptography==3.2" "cryptography" \
       --replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100"
     substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
   '';

From 8071b8ba821c1a00c7d05d013b10edb93eaa38a0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Nov 2020 17:26:53 +0100
Subject: [PATCH 1288/3942] homeassistant: 0.117.3 -> 0.117.4

---
 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 371faf8ccce5..8f6f555474f6 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.117.3";
+  version = "0.117.4";
   components = {
     "abode" = ps: with ps; [ abodepy ];
     "accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 9e239e8c9610..995d0bd0ede0 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.117.3";
+  hassVersion = "0.117.4";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    sha256 = "05vsq3dw02bn3hppxbgw321ray842ck6z559rq92i720bx1vi0qx";
+    sha256 = "0f5a5y6d9wxdfd5l526dz34xz2n1a6ia7vdcr7sqf2qp51brpw52";
   };
 
   # leave this in, so users don't have to constantly update their downstream patch handling

From ff48d9500eaa663be951b90627569f2704b86112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 4 Nov 2020 18:02:32 +0100
Subject: [PATCH 1289/3942] ocamlPackages.gsl: fix building on darwin

---
 pkgs/development/ocaml-modules/gsl/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix
index c292c3d6ab5f..aebdf4adb27f 100644
--- a/pkgs/development/ocaml-modules/gsl/default.nix
+++ b/pkgs/development/ocaml-modules/gsl/default.nix
@@ -1,6 +1,4 @@
-{ lib, fetchurl, buildDunePackage, pkg-config, gsl
-, dune-configurator
-}:
+{ stdenv, fetchurl, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }:
 
 buildDunePackage rec {
   pname = "gsl";
@@ -14,11 +12,12 @@ buildDunePackage rec {
   };
 
   buildInputs = [ dune-configurator gsl pkg-config ];
+  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://mmottl.github.io/gsl-ocaml/";
     description = "OCaml bindings to the GNU Scientific Library";
-    license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.vbgl ];
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vbgl ];
   };
 }

From 3f50332bc4913a56ad216ca01f5d0bd24277a6b2 Mon Sep 17 00:00:00 2001
From: Evax Software <contact@evax.fr>
Date: Wed, 4 Nov 2020 08:45:03 +0100
Subject: [PATCH 1290/3942] python3Packages: init shap at 0.36.0

python3Packages: init slicer at 0.0.4
---
 .../python-modules/shap/default.nix           | 70 +++++++++++++++++++
 .../python-modules/slicer/default.nix         | 29 ++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 3 files changed, 103 insertions(+)
 create mode 100644 pkgs/development/python-modules/shap/default.nix
 create mode 100644 pkgs/development/python-modules/slicer/default.nix

diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix
new file mode 100644
index 000000000000..deb6dcf2a21a
--- /dev/null
+++ b/pkgs/development/python-modules/shap/default.nix
@@ -0,0 +1,70 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, pytestCheckHook
+, numpy
+, scipy
+, scikitlearn
+, pandas
+, tqdm
+, slicer
+, numba
+, matplotlib
+, nose
+, ipython
+}:
+
+buildPythonPackage rec {
+  pname = "shap";
+  version = "0.36.0";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "slundberg";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1wxnxvbz6avzzfqjfbcqd4v879hvpq4021v31fhdpccr2q317rr9";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    scipy
+    scikitlearn
+    pandas
+    tqdm
+    slicer
+    numba
+  ];
+
+  preCheck = ''
+    export HOME=$TMPDIR
+    # when importing the local copy the extension is not found
+    rm -r shap
+  '';
+  checkInputs = [ pytestCheckHook matplotlib nose ipython ];
+  # Those tests access the network
+  disabledTests = [
+    "test_kernel_shap_with_a1a_sparse_zero_background"
+    "test_kernel_shap_with_a1a_sparse_nonzero_background"
+    "test_kernel_shap_with_high_dim_sparse"
+    "test_sklearn_random_forest_newsgroups"
+    "test_sum_match_random_forest"
+    "test_sum_match_extra_trees"
+    "test_single_row_random_forest"
+    "test_sum_match_gradient_boosting_classifier"
+    "test_single_row_gradient_boosting_classifier"
+    "test_HistGradientBoostingClassifier_proba"
+    "test_HistGradientBoostingClassifier_multidim"
+    "test_sum_match_gradient_boosting_regressor"
+    "test_single_row_gradient_boosting_regressor"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A unified approach to explain the output of any machine learning model";
+    homepage = "https://github.com/slundberg/shap";
+    license = licenses.mit;
+    maintainers = with maintainers; [ evax ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix
new file mode 100644
index 000000000000..827894771778
--- /dev/null
+++ b/pkgs/development/python-modules/slicer/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, pytestCheckHook
+, pandas
+, pytorch
+}:
+
+buildPythonPackage rec {
+  pname = "slicer";
+  version = "0.0.4";
+  disabled = isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "21d53aac4e78c93fd83c0fd2f8f9d8a2195ac079dffdc0da81cd749da0f2f355";
+  };
+
+  checkInputs = [ pytestCheckHook pandas pytorch ];
+
+  meta = with stdenv.lib; {
+    description = "Wraps tensor-like objects and provides a uniform slicing interface via __getitem__";
+    homepage = "https://github.com/interpretml/slicer";
+    license = licenses.mit;
+    maintainers = with maintainers; [ evax ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f672ee24ce58..b91a3d7cde37 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6547,6 +6547,8 @@ in {
 
   shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { };
 
+  shap = callPackage ../development/python-modules/shap { };
+
   shapely = callPackage ../development/python-modules/shapely { };
 
   sharedmem = callPackage ../development/python-modules/sharedmem { };
@@ -6628,6 +6630,8 @@ in {
 
   slicedimage = callPackage ../development/python-modules/slicedimage { };
 
+  slicer = callPackage ../development/python-modules/slicer { };
+
   slicerator = callPackage ../development/python-modules/slicerator { };
 
   slimit = callPackage ../development/python-modules/slimit { };

From 79b173c35832863dc5d018546d6b8d677dccb024 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 5 Nov 2020 09:40:47 +0100
Subject: [PATCH 1291/3942] gtk2: fix eval with old Nix

---
 pkgs/development/libraries/gtk/2.x.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix
index e01034a3d584..d13e3636baeb 100644
--- a/pkgs/development/libraries/gtk/2.x.nix
+++ b/pkgs/development/libraries/gtk/2.x.nix
@@ -19,9 +19,6 @@ in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
-  # passthru to prevent rebuild but allow pname and version
-  passthru = { inherit pname version; };
-
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz";
     sha256 = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e";
@@ -78,6 +75,8 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
+    # passthru to prevent rebuild but allow pname and version
+    inherit pname version;
     gtkExeEnvPostBuild = ''
       rm $out/lib/gtk-2.0/2.10.0/immodules.cache
       $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache

From 64b75ad5c0fb7d902d0c10c8d54ee29bc1329f27 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 5 Nov 2020 09:44:14 +0100
Subject: [PATCH 1292/3942] gtk2: move pname & version inside

Since there will not be any updates.
---
 pkgs/development/libraries/gtk/2.x.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix
index d13e3636baeb..be5f8521f9c8 100644
--- a/pkgs/development/libraries/gtk/2.x.nix
+++ b/pkgs/development/libraries/gtk/2.x.nix
@@ -12,12 +12,9 @@ assert cupsSupport -> cups != null;
 
 with stdenv.lib;
 
-let
-  pname = "gtk+";
-  version = "2.24.32"; # remove passthru on next update
-in
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  pname = "gtk+";
+  version = "2.24.32";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz";
@@ -75,8 +72,6 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    # passthru to prevent rebuild but allow pname and version
-    inherit pname version;
     gtkExeEnvPostBuild = ''
       rm $out/lib/gtk-2.0/2.10.0/immodules.cache
       $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache

From da6850852e8c143abfacba20957dd7d93159b57d Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Mon, 2 Nov 2020 13:42:16 -0500
Subject: [PATCH 1293/3942] pipewire: 0.3.13 -> 0.3.15

---
 pkgs/development/libraries/pipewire/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index d8a58e6a8eab..858f2f94db2a 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -40,7 +40,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "pipewire";
-  version = "0.3.13";
+  version = "0.3.15";
 
   outputs = [
     "out"
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     owner = "pipewire";
     repo = "pipewire";
     rev = version;
-    sha256 = "19j5kmb7iaivkq2agfzncfm2qms41ckqi0ddxvhpc91ihwprdc5w";
+    sha256 = "1lmsn13pbr0cigb5ri9nd3102ffbaf8nsz5c8aawf6lsz7mhkx9x";
   };
 
   patches = [
@@ -65,13 +65,6 @@ stdenv.mkDerivation rec {
     ./alsa-profiles-use-libdir.patch
     # Move installed tests into their own output.
     ./installed-tests-path.patch
-
-    # TODO Remove this on next update
-    # Fixes rpath referencecs.
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/2e3556fa128b778be62a7ffad5fbe78393035825.diff";
-      sha256 = "039yysb8j1aiqml54rxnaqfmzqz1b6m8sv5w3vz52grvav3kyr1l";
-    })
   ];
 
   nativeBuildInputs = [

From 949ddf17619bdfb87bbc34441ffd357890ffe9f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 09:10:47 +0000
Subject: [PATCH 1294/3942] python27Packages.numpy-stl: 2.11.2 -> 2.12.0

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

diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix
index b862319d9477..2207d4244edc 100644
--- a/pkgs/development/python-modules/numpy-stl/default.nix
+++ b/pkgs/development/python-modules/numpy-stl/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "numpy-stl";
-  version = "2.11.2";
+  version = "2.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1dil1rklb41m3v6a0i93ymimv453whsg1m9z6g0z17jbg7gmc98r";
+    sha256 = "10912d7749ab02b0ee2ee61fc04c38fa211fc9d00a9b73a7d1c2465c53c1abf5";
   };
 
   checkInputs = [ pytest pytestrunner ];

From 7cd06d3ceba5fe30e14075bfeb5bda5fa5394fda Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 06:53:13 +0000
Subject: [PATCH 1295/3942] pulseaudio-ctl: 1.67 -> 1.68

---
 pkgs/applications/audio/pulseaudio-ctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix
index 6cabdc6534dd..6a19d959a23d 100644
--- a/pkgs/applications/audio/pulseaudio-ctl/default.nix
+++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix
@@ -7,13 +7,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "1.67";
+  version = "1.68";
 
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1mf5r7x6aiqmx9mz7gpckrqvvzxnr5gs2q1k4m42rjk6ldkpdb46";
+    sha256 = "0wrzfanwy18wyawpg8rfvfgjh3lwngqwmfpi4ww3530rfmi84cf0";
   };
 
   postPatch = ''

From e0f258f596bd943ec1a0ca25ddfc9e9b886f32cb Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Thu, 5 Nov 2020 02:12:50 +0100
Subject: [PATCH 1296/3942] neovim: Do $PATH lookup in neovim.desktop instead
 of hardcoding derivation

See db236e588de "steam: Do $PATH lookup in steam.desktop [...]".
tl;dr: Otherwise widget/panel/desktop icons in DEs like KDE break.

Simply stop adding the full derivation path for neovim and stick with
how upstream uses no path at all.

While here, take care of gnvim.desktop as well by adjusting the sed(1)
expression (and simplifying it in one go);  I do not use gnvim.desktop
but built it and confirmed the resulting files to contain no full paths
any longer.
---
 pkgs/applications/editors/neovim/gnvim/wrapper.nix | 4 +---
 pkgs/applications/editors/neovim/wrapper.nix       | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/neovim/gnvim/wrapper.nix b/pkgs/applications/editors/neovim/gnvim/wrapper.nix
index e16fe8a8adc7..bb9930b6c718 100644
--- a/pkgs/applications/editors/neovim/gnvim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/gnvim/wrapper.nix
@@ -23,9 +23,7 @@ stdenv.mkDerivation {
     cp -r '${gnvim-unwrapped}/share/applications' "$out/share/applications"
     # Sed needs a writable directory to do inplace modifications
     chmod u+rw "$out/share/applications"
-    for file in $out/share/applications/*.desktop; do
-      sed -e "s|Exec=.\\+gnvim\\>|Exec=$out/bin/gnvim|" -i "$file"
-    done
+    sed -e "s|Exec=.\\+gnvim\\>|Exec=gnvim|" -i $out/share/applications/*.desktop
   '';
 
   preferLocalBuild = true;
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index 71bc38eadcfb..111e84e63437 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -43,7 +43,6 @@ let
       postBuild = lib.optionalString stdenv.isLinux ''
         rm $out/share/applications/nvim.desktop
         substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \
-          --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \
           --replace 'Name=Neovim' 'Name=WrappedNeovim'
       ''
       + optionalString withPython2 ''

From 5e12d4b409224e83396c4e2dde8cfc0ef8646b9e Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Thu, 5 Nov 2020 02:12:49 +0100
Subject: [PATCH 1297/3942] teams: Do $PATH lookup in teams.desktop instead of
 hardcoding derivation

See db236e588de "steam: Do $PATH lookup in steam.desktop [...]".
tl;dr: Otherwise widget/panel/desktop icons in DEs like KDE break.

I verified that there are no other (executable) paths in the .desktop
file and therefore went for this minimal diff.
---
 .../networking/instant-messengers/teams/default.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
index f1a2c137ad29..bf864eb41475 100644
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     mv share $out/share
 
     substituteInPlace $out/share/applications/teams.desktop \
-      --replace /usr/bin/ $out/bin/
+      --replace /usr/bin/ ""
 
     ln -s $out/opt/teams/teams $out/bin/
 

From b02719a29c19500e4d93f8394eab0fec6e28708c Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Thu, 5 Nov 2020 02:12:48 +0100
Subject: [PATCH 1298/3942] nixos-help: Do $PATH lookup in nixos-manual.desktop
 instead of hardcoding derivation

See db236e588de "steam: Do $PATH lookup in steam.desktop [...]".
tl;dr: Otherwise widget/panel/desktop icons in DEs like KDE break.
---
 nixos/modules/misc/documentation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 71a40b4f4d6e..906e9f05063e 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -64,7 +64,7 @@ let
     desktopName = "NixOS Manual";
     genericName = "View NixOS documentation in a web browser";
     icon = "nix-snowflake";
-    exec = "${helpScript}/bin/nixos-help";
+    exec = "nixos-help";
     categories = "System";
   };
 

From 3560f0d913a1d1b2c6f0a650d3a4f3ab5419baa2 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 5 Nov 2020 11:47:14 +0100
Subject: [PATCH 1299/3942] nixos-help: use writeShellScriptBin and drop custom
 shebang line

---
 nixos/modules/misc/documentation.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 906e9f05063e..0a8b1a313efb 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -40,9 +40,8 @@ let
       in scrubbedEval.options;
   };
 
-  helpScript = pkgs.writeScriptBin "nixos-help"
+  helpScript = pkgs.writeShellScriptBin "nixos-help"
     ''
-      #! ${pkgs.runtimeShell} -e
       # Finds first executable browser in a colon-separated list.
       # (see how xdg-open defines BROWSER)
       browser="$(

From 4f8a41c83bf925593549f797dde3010aeb109cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Thu, 5 Nov 2020 10:53:19 +0000
Subject: [PATCH 1300/3942] polkadot: fix cargoSha256

---
 pkgs/applications/blockchains/polkadot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index ef241126e6a6..193825445512 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1bvma6k3gsjqh8w76k4kf52sjg8wxn1b7a409kmnmmvmd9j6z5ia";
   };
 
-  cargoSha256 = "0mjkiq6kih5vbmbmr3nmzw4zynha93lsqwbvams73871124mj7rc";
+  cargoSha256 = "0pacmmvvjgzmaxgg47qbfhqwl02jxj3i6vnmkjbj9npzqfmqf72d";
 
   nativeBuildInputs = [ clang ];
 

From 9a01e978244c2d7e20b97533309f02ba93933a8c Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 5 Nov 2020 11:51:02 +0100
Subject: [PATCH 1301/3942] nixos-help: bundle the desktop item with the script

This is to ensure that whenever we install the desktop item we also have
the script installed. Prior to b02719a we always had the reference to
the script in the desktop item. Since desktop items are being copied to
home directories and thus "bit rod" over time that absolute path was
removed.
---
 nixos/modules/misc/documentation.nix | 33 ++++++++++++++++++----------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 0a8b1a313efb..bc43cc33b5d4 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -40,8 +40,9 @@ let
       in scrubbedEval.options;
   };
 
-  helpScript = pkgs.writeShellScriptBin "nixos-help"
-    ''
+
+  nixos-help = let
+    helpScript = pkgs.writeShellScriptBin "nixos-help" ''
       # Finds first executable browser in a colon-separated list.
       # (see how xdg-open defines BROWSER)
       browser="$(
@@ -58,14 +59,22 @@ let
       exec "$browser" ${manual.manualHTMLIndex}
     '';
 
-  desktopItem = pkgs.makeDesktopItem {
-    name = "nixos-manual";
-    desktopName = "NixOS Manual";
-    genericName = "View NixOS documentation in a web browser";
-    icon = "nix-snowflake";
-    exec = "nixos-help";
-    categories = "System";
-  };
+    desktopItem = pkgs.makeDesktopItem {
+      name = "nixos-manual";
+      desktopName = "NixOS Manual";
+      genericName = "View NixOS documentation in a web browser";
+      icon = "nix-snowflake";
+      exec = "nixos-help";
+      categories = "System";
+    };
+
+    in pkgs.symlinkJoin {
+      name = "nixos-help";
+      paths = [
+        helpScript
+        desktopItem
+      ];
+    };
 
 in
 
@@ -249,8 +258,8 @@ in
 
       environment.systemPackages = []
         ++ optional cfg.man.enable manual.manpages
-        ++ optionals cfg.doc.enable ([ manual.manualHTML helpScript ]
-           ++ optionals config.services.xserver.enable [ desktopItem pkgs.nixos-icons ]);
+        ++ optionals cfg.doc.enable ([ manual.manualHTML nixos-help ]
+           ++ optionals config.services.xserver.enable [ pkgs.nixos-icons ]);
 
       services.mingetty.helpLine = mkIf cfg.doc.enable (
           "\nRun 'nixos-help' for the NixOS manual."

From c5057bd3ea488300d0f0f5c55f8504474536736f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 23 Aug 2020 16:07:58 +0300
Subject: [PATCH 1302/3942] bubblemail: init at 1.3

---
 .../mailreaders/bubblemail/default.nix        | 76 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/bubblemail/default.nix

diff --git a/pkgs/applications/networking/mailreaders/bubblemail/default.nix b/pkgs/applications/networking/mailreaders/bubblemail/default.nix
new file mode 100644
index 000000000000..d415eb4e51f2
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/bubblemail/default.nix
@@ -0,0 +1,76 @@
+{ lib
+, fetchFromGitLab
+, gettext
+, gtk3
+, python3Packages
+, gdk-pixbuf
+, libnotify
+, gst_all_1
+, libsecret
+, wrapGAppsHook
+, gsettings-desktop-schemas
+, gnome-online-accounts
+, glib
+, gobject-introspection
+, folks
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "bubblemail";
+  version = "1.3";
+
+  src = fetchFromGitLab {
+    domain = "framagit.org";
+    owner = "razer";
+    repo = "bubblemail";
+    rev = "v${version}";
+    sha256 = "FEIdEoZBlM28F5kSMoln7KACwetb8hp+qix1P+DIE8k=";
+  };
+
+  buildInputs = [
+    gtk3
+    gdk-pixbuf
+    glib
+    libnotify
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    libsecret
+    gnome-online-accounts
+    folks
+  ];
+
+  nativeBuildInputs = [
+    gettext
+    wrapGAppsHook
+    python3Packages.pillow
+    # For setup-hook
+    gobject-introspection
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    gsettings-desktop-schemas
+    pygobject3
+    dbus-python
+    pyxdg
+  ];
+
+  # See https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues-double-wrapped
+  dontWrapGApps = true;
+
+  # https://github.com/NixOS/nixpkgs/issues/56943
+  strictDeps = false;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = with lib; {
+    description = "An extensible mail notification service.";
+    homepage = "http://bubblemail.free.fr/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ doronbehar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5e96c702485..61e4ea1b5c24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5348,6 +5348,7 @@ in
   mailnagWithPlugins = mailnag.withPlugins(
     builtins.attrValues mailnag.availablePlugins
   );
+  bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { };
 
   mailsend = callPackage ../tools/networking/mailsend { };
 

From f1d3f6b2ca2617d770c7ef1c32dbdfddd186c958 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Thu, 5 Nov 2020 20:50:18 +0900
Subject: [PATCH 1303/3942] opencv: 2.4.13 -> 2.4.13.7

It updates the repository URL to opencv/opencv. opencv2, p2pvc and
pfstools are built without errors but not really tested.

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 pkgs/development/libraries/opencv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 0749ec9e7f30..67c00839b358 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -19,13 +19,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "opencv";
-  version = "2.4.13";
+  version = "2.4.13.7";
 
   src = fetchFromGitHub {
-    owner = "Itseez";
+    owner = "opencv";
     repo = "opencv";
     rev = version;
-    sha256 = "1k29rxlvrhgc5hadg2nc50wa3d2ls9ndp373257p756a0aividxh";
+    sha256 = "062js7zhh4ixi2wk61wyi23qp9zsk5vw24iz2i5fab2hp97y5zq3";
   };
 
   patches =

From 1f4133acd475db8d777cd71e9ed2bbda1154c388 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Wed, 4 Nov 2020 21:45:11 +0000
Subject: [PATCH 1304/3942] unifiBeta: update to 6.0.28

---
 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 bce539ec0f6f..3cdd331f3b17 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -54,7 +54,7 @@ in {
   };
 
   unifiBeta = generic {
-    version = "6.0.23";
-    sha256 = "sha256-t/s0UEk0CgnAeydtLWTgpZjnAJqnyfyESNNVe1d5PHo=";
+    version = "6.0.28";
+    sha256 = "14q8r4mcqx0v3sh8zwqg4cc3iszqn5201q5r4c20cwqdd4ivf97q";
   };
 }

From d8039ff3807d293b47d7072bf7a0d7cbf3a3223a Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <sebastian.neubauer@amd.com>
Date: Thu, 5 Nov 2020 13:01:47 +0100
Subject: [PATCH 1305/3942] amdvlk: 2020.Q4.2 -> 2020.Q4.3

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

diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index fdbff329c147..033780b8ef65 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -21,13 +21,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "amdvlk";
-  version = "2020.Q4.2";
+  version = "2020.Q4.3";
 
   src = fetchRepoProject {
     name = "${pname}-src";
     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
     rev = "refs/tags/v-${version}";
-    sha256 = "qqP95+K8G9Z3Da1pUT9EGAUi83IM50qI9eZxpp7Vlqg=";
+    sha256 = "O1+w2R9Fvoc+1vegiCkBA9pE/yi/p0aK82fY4jML/2c=";
   };
 
   buildInputs = [

From 0de5ab3f20424c0dfb0a2a90ef2a136f7fa790d6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 12:41:57 +0000
Subject: [PATCH 1306/3942] =?UTF-8?q?oh-my-zsh:=202020-10-29=20=E2=86=92?=
 =?UTF-8?q?=202020-11-04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 3660453245bb..7c402b4733f5 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
 
 stdenv.mkDerivation rec {
-  version = "2020-10-29";
+  version = "2020-11-04";
   pname = "oh-my-zsh";
-  rev = "852a44094a3bb4df39f8f778bc7ada2ddda09727";
+  rev = "3e6ee85a161c8089955c19364728e167025a911d";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "J+ZNsk6z2hZh78mfuVHRvMV+TnmmHc+dfDzywr3KQQA=";
+    sha256 = "/8ySf5ulSx2HtPG/tzPzOI1ljksxF+hGwjXFhGIseBk=";
   };
 
   installPhase = ''

From 6834d33b00bc68e5e37a589b802bdb028c271a65 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 08:32:28 -0500
Subject: [PATCH 1307/3942] scala: Refactor, add tests

Abstract over Scala derivation, add tests for individual versions
---
 nixos/tests/all-tests.nix                 |  1 +
 nixos/tests/scala.nix                     | 33 ++++++++++
 pkgs/development/compilers/scala/2.10.nix | 43 ------------
 pkgs/development/compilers/scala/2.11.nix | 48 --------------
 pkgs/development/compilers/scala/2.12.nix | 47 -------------
 pkgs/development/compilers/scala/2.13.nix | 47 -------------
 pkgs/development/compilers/scala/2.x.nix  | 80 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           | 10 +--
 8 files changed, 120 insertions(+), 189 deletions(-)
 create mode 100644 nixos/tests/scala.nix
 delete mode 100644 pkgs/development/compilers/scala/2.10.nix
 delete mode 100644 pkgs/development/compilers/scala/2.11.nix
 delete mode 100644 pkgs/development/compilers/scala/2.12.nix
 delete mode 100644 pkgs/development/compilers/scala/2.13.nix
 create mode 100644 pkgs/development/compilers/scala/2.x.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0e80f27cee8f..e2a5263a95de 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -314,6 +314,7 @@ in
   samba = handleTest ./samba.nix {};
   sanoid = handleTest ./sanoid.nix {};
   sbt = handleTest ./sbt.nix {};
+  scala = handleTest ./scala.nix {};
   sddm = handleTest ./sddm.nix {};
   service-runner = handleTest ./service-runner.nix {};
   shadowsocks = handleTest ./shadowsocks {};
diff --git a/nixos/tests/scala.nix b/nixos/tests/scala.nix
new file mode 100644
index 000000000000..f99d9e563ffe
--- /dev/null
+++ b/nixos/tests/scala.nix
@@ -0,0 +1,33 @@
+{ system ? builtins.currentSystem,
+  config ? {},
+  pkgs ? import ../.. { inherit system config; }
+}:
+
+with pkgs.lib;
+
+let
+  common = name: package: (import ./make-test-python.nix ({
+    inherit name;
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ nequissimus ];
+    };
+
+    nodes = {
+      scala = { ... }: {
+        environment.systemPackages = [ package ];
+      };
+    };
+
+    testScript = ''
+      start_all()
+
+      scala.succeed("scalac -version 2>&1 | grep '^Scala compiler version ${package.version}'")
+    '';
+  }) { inherit system; });
+
+in with pkgs; {
+  scala_2_10  = common "scala_2_10"  scala_2_10;
+  scala_2_11  = common "scala_2_11"  scala_2_11;
+  scala_2_12  = common "scala_2_12"  scala_2_12;
+  scala_2_13  = common "scala_2_13"  scala_2_13;
+}
diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix
deleted file mode 100644
index d41442afaf13..000000000000
--- a/pkgs/development/compilers/scala/2.10.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
-
-stdenv.mkDerivation rec {
-  name = "scala-2.10.7";
-
-  src = fetchurl {
-    url = "https://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "04gi55lzgrhsb78qw8jmnccqim92rw6898knw0a7gfzn2sci30wj";
-  };
-
-  propagatedBuildInputs = [ jre ] ;
-  buildInputs = [ makeWrapper ] ;
-
-  installPhase = ''
-    mkdir -p $out
-    rm bin/*.bat
-    mv * $out
-
-    for p in $(ls $out/bin/) ; do
-      wrapProgram $out/bin/$p \
-        --prefix PATH ":" ${coreutils}/bin \
-        --prefix PATH ":" ${gnugrep}/bin \
-        --prefix PATH ":" ${jre}/bin \
-        --set JAVA_HOME ${jre}
-    done
-  '';
-
-  meta = {
-    description = "A general purpose programming language";
-    longDescription = ''
-      Scala is a general purpose programming language designed to express
-      common programming patterns in a concise, elegant, and type-safe way.
-      It smoothly integrates features of object-oriented and functional
-      languages, enabling Java and other programmers to be more productive.
-      Code sizes are typically reduced by a factor of two to three when
-      compared to an equivalent Java application.
-    '';
-    homepage = "https://www.scala-lang.org/";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
-    branch = "2.10";
-  };
-}
diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix
deleted file mode 100644
index d8fcd3f9a88f..000000000000
--- a/pkgs/development/compilers/scala/2.11.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
-
-stdenv.mkDerivation rec {
-  name = "scala-2.11.12";
-
-  src = fetchurl {
-    url = "https://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "1a4nc4qp9dm4rps47j92hlmxxqskv67qbdmjqc5zd94wd4rps7di";
-  };
-
-  propagatedBuildInputs = [ jre ] ;
-  buildInputs = [ makeWrapper ] ;
-
-  installPhase = ''
-    mkdir -p $out
-    rm "bin/"*.bat
-    mv * $out
-
-    # put docs in correct subdirectory
-    mkdir -p $out/share/doc
-    mv $out/doc $out/share/doc/${name}
-    mv $out/man $out/share/man
-
-    for p in $(ls $out/bin/) ; do
-      wrapProgram $out/bin/$p \
-        --prefix PATH ":" ${coreutils}/bin \
-        --prefix PATH ":" ${gnugrep}/bin \
-        --prefix PATH ":" ${jre}/bin \
-        --set JAVA_HOME ${jre}
-    done
-  '';
-
-  meta = {
-    description = "General purpose programming language";
-    longDescription = ''
-      Scala is a general purpose programming language designed to express
-      common programming patterns in a concise, elegant, and type-safe way.
-      It smoothly integrates features of object-oriented and functional
-      languages, enabling Java and other programmers to be more productive.
-      Code sizes are typically reduced by a factor of two to three when
-      compared to an equivalent Java application.
-    '';
-    homepage = "https://www.scala-lang.org/";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
-    branch = "2.11";
-  };
-}
diff --git a/pkgs/development/compilers/scala/2.12.nix b/pkgs/development/compilers/scala/2.12.nix
deleted file mode 100644
index 1a7c5677de5b..000000000000
--- a/pkgs/development/compilers/scala/2.12.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
-
-stdenv.mkDerivation rec {
-  name = "scala-2.12.12";
-
-  src = fetchurl {
-    url = "https://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "0avyaa7y8w7494339krcpqhc2p8y5pjk4pz7mqmzdzwy7hgws81m";
-  };
-
-  propagatedBuildInputs = [ jre ] ;
-  buildInputs = [ makeWrapper ] ;
-
-  installPhase = ''
-    mkdir -p $out
-    rm "bin/"*.bat
-    mv * $out
-
-    # put docs in correct subdirectory
-    mkdir -p $out/share/doc
-    mv $out/doc $out/share/doc/scala
-    mv $out/{LICENSE,NOTICE} $out/share/doc/scala
-
-    for p in $(ls $out/bin/) ; do
-      wrapProgram $out/bin/$p \
-        --prefix PATH ":" ${coreutils}/bin \
-        --prefix PATH ":" ${gnugrep}/bin \
-        --prefix PATH ":" ${jre}/bin \
-        --set JAVA_HOME ${jre}
-    done
-  '';
-
-  meta = {
-    description = "General purpose programming language";
-    longDescription = ''
-      Scala is a general purpose programming language designed to express
-      common programming patterns in a concise, elegant, and type-safe way.
-      It smoothly integrates features of object-oriented and functional
-      languages, enabling Java and other programmers to be more productive.
-      Code sizes are typically reduced by a factor of two to three when
-      compared to an equivalent Java application.
-    '';
-    homepage = "https://www.scala-lang.org/";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix
deleted file mode 100644
index 75996c382a8c..000000000000
--- a/pkgs/development/compilers/scala/2.13.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
-
-stdenv.mkDerivation rec {
-  name = "scala-2.13.3";
-
-  src = fetchurl {
-    url = "https://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "0zv9w9f6g2cfydsvp8mqcfgv2v3487xp4ca1qndg6v7jrhdp7wy9";
-  };
-
-  propagatedBuildInputs = [ jre ] ;
-  buildInputs = [ makeWrapper ] ;
-
-  installPhase = ''
-    mkdir -p $out
-    rm "bin/"*.bat
-    mv * $out
-
-    # put docs in correct subdirectory
-    mkdir -p $out/share/doc
-    mv $out/doc $out/share/doc/scala
-    mv $out/{LICENSE,NOTICE} $out/share/doc/scala
-
-    for p in $(ls $out/bin/) ; do
-      wrapProgram $out/bin/$p \
-        --prefix PATH ":" ${coreutils}/bin \
-        --prefix PATH ":" ${gnugrep}/bin \
-        --prefix PATH ":" ${jre}/bin \
-        --set JAVA_HOME ${jre}
-    done
-  '';
-
-  meta = {
-    description = "General purpose programming language";
-    longDescription = ''
-      Scala is a general purpose programming language designed to express
-      common programming patterns in a concise, elegant, and type-safe way.
-      It smoothly integrates features of object-oriented and functional
-      languages, enabling Java and other programmers to be more productive.
-      Code sizes are typically reduced by a factor of two to three when
-      compared to an equivalent Java application.
-    '';
-    homepage = "https://www.scala-lang.org/";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix
new file mode 100644
index 000000000000..6b24fafc0c55
--- /dev/null
+++ b/pkgs/development/compilers/scala/2.x.nix
@@ -0,0 +1,80 @@
+{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils, nixosTests }:
+let
+  common = { version, sha256, test }:
+    stdenv.mkDerivation rec {
+      inherit version;
+
+      name = "scala-${version}";
+
+      src = fetchurl {
+        inherit sha256;
+        url = "https://www.scala-lang.org/files/archive/scala-${version}.tgz";
+      };
+
+      propagatedBuildInputs = [ jre ];
+      buildInputs = [ makeWrapper ];
+
+      installPhase = ''
+        mkdir -p $out
+        rm bin/*.bat
+        mv * $out
+
+        # put docs in correct subdirectory
+        mkdir -p $out/share/doc
+        mv $out/doc $out/share/doc/${name}
+        mv $out/man $out/share/man
+
+        for p in $(ls $out/bin/) ; do
+          wrapProgram $out/bin/$p \
+            --prefix PATH ":" ${coreutils}/bin \
+            --prefix PATH ":" ${gnugrep}/bin \
+            --prefix PATH ":" ${jre}/bin \
+            --set JAVA_HOME ${jre}
+        done
+      '';
+
+      passthru = {
+        tests = [ test ];
+      };
+
+      meta = {
+        description = "A general purpose programming language";
+        longDescription = ''
+          Scala is a general purpose programming language designed to express
+          common programming patterns in a concise, elegant, and type-safe way.
+          It smoothly integrates features of object-oriented and functional
+          languages, enabling Java and other programmers to be more productive.
+          Code sizes are typically reduced by a factor of two to three when
+          compared to an equivalent Java application.
+        '';
+        homepage = "https://www.scala-lang.org/";
+        license = stdenv.lib.licenses.bsd3;
+        platforms = stdenv.lib.platforms.all;
+        branch = stdenv.lib.majorMinor version;
+      };
+    };
+in {
+  scala_2_10 = common {
+    version = "2.10.7";
+    sha256 = "04gi55lzgrhsb78qw8jmnccqim92rw6898knw0a7gfzn2sci30wj";
+    test = { inherit (nixosTests) scala_2_10; };
+  };
+
+  scala_2_11 = common {
+    version = "2.11.12";
+    sha256 = "1a4nc4qp9dm4rps47j92hlmxxqskv67qbdmjqc5zd94wd4rps7di";
+    test = { inherit (nixosTests) scala_2_11; };
+  };
+
+  scala_2_12 = common {
+    version = "2.12.12";
+    sha256 = "0avyaa7y8w7494339krcpqhc2p8y5pjk4pz7mqmzdzwy7hgws81m";
+    test = { inherit (nixosTests) scala_2_12; };
+  };
+
+  scala_2_13 = common {
+    version = "2.13.3";
+    sha256 = "0zv9w9f6g2cfydsvp8mqcfgv2v3487xp4ca1qndg6v7jrhdp7wy9";
+    test = { inherit (nixosTests) scala_2_13; };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26833e4870bb..3d15b75f2ed7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9931,10 +9931,12 @@ in
   sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {};
   sbcl = callPackage ../development/compilers/sbcl {};
 
-  scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
-  scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { };
-  scala_2_12 = callPackage ../development/compilers/scala/2.12.nix { jre = jre8; };
-  scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; };
+  inherit (callPackage ../development/compilers/scala/2.x.nix { jre = jre8; })
+    scala_2_10
+    scala_2_11
+    scala_2_12
+    scala_2_13;
+
   scala = scala_2_13;
 
   metal = callPackage ../development/libraries/metal { };

From 61a04f735af6a3cdbbb6d2d234fd2dfea934fd18 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 5 Nov 2020 14:55:02 +0100
Subject: [PATCH 1308/3942] python3.pkgs.pip: 20.1.1 -> 20.2.4

Reproducible builds of pyproject projects using pip is resolved.

Fixes https://github.com/pypa/pip/issues/7808
Fixes https://github.com/NixOS/nixpkgs/issues/81441

The more recent c409f694807e8cd16db8e2affb630073c1aadc48 caused trouble
with pyproject troubles and had to be reverted anyway.
https://github.com/NixOS/nixpkgs/pull/102222#issuecomment-722380794

Revert "pythonPackages.pip: make reproducible (#102222)"

This reverts commit c409f694807e8cd16db8e2affb630073c1aadc48.

Revert "python3Packages.pip: allow setting reproducible temporary directory via NIX_PIP_INSTALL_TMPDIR"

This reverts commit aedbade43e615d7893d268632f5e7f2570fd3233.
---
 .../python/hooks/pip-install-hook.sh          |  4 +--
 .../bootstrapped-pip/default.nix              |  5 ----
 .../python-modules/pip/default.nix            |  8 ++----
 .../python-modules/pip/reproducible.patch     | 25 -------------------
 4 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pip/reproducible.patch

diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
index 73d3c3cbbffa..4eefe22d3f28 100644
--- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
@@ -11,9 +11,7 @@ pipInstallPhase() {
     export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH"
 
     pushd dist || return 1
-    mkdir tmpbuild
-    @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags
-    rm -rf tmpbuild
+    @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags --build tmpbuild
     popd || return 1
 
     runHook postInstall
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 2b1a7dc8786c..8bb713b76416 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -23,11 +23,6 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    # Apply the pip reproducible patch
-    pushd "${pip.src.name}"
-      patch -p1 < ${../pip/reproducible.patch}
-    popd
-
     mkdir -p $out/bin
   '';
 
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 8dbf2c54a7fe..9db7cdea6721 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -14,21 +14,17 @@
 
 buildPythonPackage rec {
   pname = "pip";
-  version = "20.1.1";
+  version = "20.2.4";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
     rev = version;
-    sha256 = "01wq01ysv0ijcrg8a4mj72zb8al15b8vw8g3ywhxq53kbsyhfxn4";
+    sha256 = "eMVV4ftgV71HLQsSeaOchYlfaJVgzNrwUynn3SA1/Do=";
     name = "${pname}-${version}-source";
   };
 
-  # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441
-  # See also https://github.com/pypa/pip/issues/7808
-  patches = [ ./reproducible.patch ];
-
   nativeBuildInputs = [ bootstrapped-pip ];
 
   # pip detects that we already have bootstrapped_pip "installed", so we need
diff --git a/pkgs/development/python-modules/pip/reproducible.patch b/pkgs/development/python-modules/pip/reproducible.patch
deleted file mode 100644
index 69001f0ef278..000000000000
--- a/pkgs/development/python-modules/pip/reproducible.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/pip/_internal/utils/temp_dir.py b/src/pip/_internal/utils/temp_dir.py
-index 201ba6d98..f1569fecd 100644
---- a/src/pip/_internal/utils/temp_dir.py
-+++ b/src/pip/_internal/utils/temp_dir.py
-@@ -3,6 +3,7 @@ from __future__ import absolute_import
- import errno
- import itertools
- import logging
-+import os
- import os.path
- import tempfile
- from contextlib import contextmanager
-@@ -181,6 +182,11 @@ class TempDirectory(object):
-         # symlinked to another directory.  This tends to confuse build
-         # scripts, so we canonicalize the path by traversing potential
-         # symlinks here.
-+        if "SOURCE_DATE_EPOCH" in os.environ:
-+            path = os.path.join(tempfile.gettempdir(), "pip-{}-immobile".format(kind))
-+            os.mkdir(path)
-+            return path
-+
-         path = os.path.realpath(
-             tempfile.mkdtemp(prefix="pip-{}-".format(kind))
-         )
-

From c12f249b455757e607e0692711eb9b0f249ea94c Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 15:17:10 +0100
Subject: [PATCH 1309/3942] oven-media-engine: 0.10.4 -> 0.10.8

---
 pkgs/servers/misc/oven-media-engine/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix
index c207a33848dd..7faf8a9cfeeb 100644
--- a/pkgs/servers/misc/oven-media-engine/default.nix
+++ b/pkgs/servers/misc/oven-media-engine/default.nix
@@ -12,7 +12,7 @@
 , libopus
 , srtp
 , jemalloc
-, ... }:
+}:
 
 let
   ffmpeg = ffmpeg_3_4.overrideAttrs (super: {
@@ -20,20 +20,20 @@ let
     src = fetchFromGitHub {
       owner = "Airensoft";
       repo = "FFmpeg";
-      rev = "142b4bb64b64e337f80066e6af935a68627fedae";  # ome/3.4
+      rev = "142b4bb64b64e337f80066e6af935a68627fedae";  # on branch ome/3.4
       sha256 = "0fla3940q3z0c0ik2xzkbvdfvrdg06ban7wi6y94y8mcipszpp11";
     };
   });
 in
 stdenv.mkDerivation rec {
   pname = "oven-media-engine";
-  version = "0.10.4";
+  version = "0.10.8";
 
   src = fetchFromGitHub {
     owner = "AirenSoft";
     repo = "OvenMediaEngine";
     rev = "v${version}";
-    sha256 = "15lrlynsldlpa21ryzccf5skgiih6y5fc9qg0bfqh557wnnmml6w";
+    sha256 = "ec4yvS+4/rTBHGEx2OP0yoNGDtzPucFOcZJ0o0cCAHg=";
   };
 
   sourceRoot = "source/src";

From bcc808c68f7d9dc62131977aca44182932a4719f Mon Sep 17 00:00:00 2001
From: Christoph Ruegge <c.ruegge@math.uni-goettingen.de>
Date: Tue, 3 Nov 2020 17:57:17 +0100
Subject: [PATCH 1310/3942] Create /dev/std{in,out,err} symlinks in stage-1

This used to be done by udev, but that was removed in
systemd/systemd@6b2229c. The links are created by systemd at the end of
stage-2, but activation scripts might need them earlier.
---
 nixos/modules/system/boot/stage-1-init.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index e5cafe237cd5..abc1a0af48a6 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -219,6 +219,9 @@ done
 @preDeviceCommands@
 echo "running udev..."
 ln -sfn /proc/self/fd /dev/fd
+ln -sfn /proc/self/fd/0 /dev/stdin
+ln -sfn /proc/self/fd/1 /dev/stdout
+ln -sfn /proc/self/fd/2 /dev/stderr
 mkdir -p /etc/systemd
 ln -sfn @linkUnits@ /etc/systemd/network
 mkdir -p /etc/udev

From 13ed0cce2f73031fe7d8020ae4f9c10cfb487baf Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 5 Nov 2020 20:47:19 +0800
Subject: [PATCH 1311/3942] nixos/systemd-resolved: fix incorrect user

---
 nixos/modules/system/boot/resolved.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index b024f9cf5ee9..84bc9b78076c 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -136,7 +136,7 @@ in
       }
     ];
 
-    users.users.resolved.group = "systemd-resolve";
+    users.users.systemd-resolve.group = "systemd-resolve";
 
     # add resolve to nss hosts database if enabled and nscd enabled
     # system.nssModules is configured in nixos/modules/system/boot/systemd.nix

From 75d9e713d98599fdfea87b1231c66813a0dbe5d6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 5 Nov 2020 14:55:02 +0100
Subject: [PATCH 1312/3942] python3.pkgs.pip: 20.1.1 -> 20.2.4

Reproducible builds of pyproject projects using pip is resolved.

Fixes https://github.com/pypa/pip/issues/7808
Fixes https://github.com/NixOS/nixpkgs/issues/81441

The more recent c409f694807e8cd16db8e2affb630073c1aadc48 caused trouble
with pyproject troubles and had to be reverted anyway.
https://github.com/NixOS/nixpkgs/pull/102222#issuecomment-722380794

Revert "pythonPackages.pip: make reproducible (#102222)"

This reverts commit c409f694807e8cd16db8e2affb630073c1aadc48.

Revert "python3Packages.pip: allow setting reproducible temporary directory via NIX_PIP_INSTALL_TMPDIR"

This reverts commit aedbade43e615d7893d268632f5e7f2570fd3233.
---
 .../python/hooks/pip-install-hook.sh          |  4 +--
 .../bootstrapped-pip/default.nix              |  5 ----
 .../python-modules/pip/default.nix            |  8 ++----
 .../python-modules/pip/reproducible.patch     | 25 -------------------
 4 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pip/reproducible.patch

diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
index 73d3c3cbbffa..4eefe22d3f28 100644
--- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
@@ -11,9 +11,7 @@ pipInstallPhase() {
     export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH"
 
     pushd dist || return 1
-    mkdir tmpbuild
-    @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags
-    rm -rf tmpbuild
+    @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags --build tmpbuild
     popd || return 1
 
     runHook postInstall
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 2b1a7dc8786c..8bb713b76416 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -23,11 +23,6 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    # Apply the pip reproducible patch
-    pushd "${pip.src.name}"
-      patch -p1 < ${../pip/reproducible.patch}
-    popd
-
     mkdir -p $out/bin
   '';
 
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 8dbf2c54a7fe..9db7cdea6721 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -14,21 +14,17 @@
 
 buildPythonPackage rec {
   pname = "pip";
-  version = "20.1.1";
+  version = "20.2.4";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
     rev = version;
-    sha256 = "01wq01ysv0ijcrg8a4mj72zb8al15b8vw8g3ywhxq53kbsyhfxn4";
+    sha256 = "eMVV4ftgV71HLQsSeaOchYlfaJVgzNrwUynn3SA1/Do=";
     name = "${pname}-${version}-source";
   };
 
-  # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441
-  # See also https://github.com/pypa/pip/issues/7808
-  patches = [ ./reproducible.patch ];
-
   nativeBuildInputs = [ bootstrapped-pip ];
 
   # pip detects that we already have bootstrapped_pip "installed", so we need
diff --git a/pkgs/development/python-modules/pip/reproducible.patch b/pkgs/development/python-modules/pip/reproducible.patch
deleted file mode 100644
index 69001f0ef278..000000000000
--- a/pkgs/development/python-modules/pip/reproducible.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/pip/_internal/utils/temp_dir.py b/src/pip/_internal/utils/temp_dir.py
-index 201ba6d98..f1569fecd 100644
---- a/src/pip/_internal/utils/temp_dir.py
-+++ b/src/pip/_internal/utils/temp_dir.py
-@@ -3,6 +3,7 @@ from __future__ import absolute_import
- import errno
- import itertools
- import logging
-+import os
- import os.path
- import tempfile
- from contextlib import contextmanager
-@@ -181,6 +182,11 @@ class TempDirectory(object):
-         # symlinked to another directory.  This tends to confuse build
-         # scripts, so we canonicalize the path by traversing potential
-         # symlinks here.
-+        if "SOURCE_DATE_EPOCH" in os.environ:
-+            path = os.path.join(tempfile.gettempdir(), "pip-{}-immobile".format(kind))
-+            os.mkdir(path)
-+            return path
-+
-         path = os.path.realpath(
-             tempfile.mkdtemp(prefix="pip-{}-".format(kind))
-         )
-

From 41b4c2d11b29ca0147a696f294fdc2feb8497e2b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 09:09:39 -0500
Subject: [PATCH 1313/3942] linux: 4.14.203 -> 4.14.204

---
 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 a28531ee4012..dedd3485c25d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.203";
+  version = "4.14.204";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0c9r1s83mrn9lzgrr4wzvk4d72q70sbgf7lql6z9ivkf12v3p5mc";
+    sha256 = "1ncacsy2g80zigfx8nmr1f7v50s1y9ys1xy9jgizrnvmxjcji0wy";
   };
 } // (args.argsOverride or {}))

From 5fe041997e14330a67d5ec45b0be31260c16bbc2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 09:10:02 -0500
Subject: [PATCH 1314/3942] linux: 4.19.154 -> 4.19.155

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 7a63297578ba..dcde8fceba26 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.154";
+  version = "4.19.155";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0ik6anz6ly0dl0lp8m5mighlvzkifnk2kljwajxa56vbhj691339";
+    sha256 = "1lj81aadyskmxs3j4s923nhnk69dfj2kiwm0nxabbcjw83sliinb";
   };
 } // (args.argsOverride or {}))

From 3b7197307bdaa27211c23a7163c94dd6b5202cf9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 09:10:24 -0500
Subject: [PATCH 1315/3942] linux: 5.4.74 -> 5.4.75

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 881e72f5cf17..9db1ada350bd 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.74";
+  version = "5.4.75";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1drs2pngr5w3rmpydljirmibp30qb4hdrhqsi92knshlw6nz817c";
+    sha256 = "0w0lpiy56zqdm2vpx9ckxakna334n88pnqbv52zyfcslxgb6yinj";
   };
 } // (args.argsOverride or {}))

From eeb8ffabbd2ab80ae223156a364e6db10b7ebee9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 09:10:38 -0500
Subject: [PATCH 1316/3942] linux: 5.9.3 -> 5.9.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix
index 9d9f1eaa7f00..f4ef41ec8644 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.9.3";
+  version = "5.9.5";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0wwa6557i9l4vyswz26ixz8c2ykxnzqrsc9pwkr76nyjx7gjibni";
+    sha256 = "1q427ryzh0dfg4lxyf04qfbyckxkcczxc4a6qd3ciwx2isv262ca";
   };
 } // (args.argsOverride or {}))

From c97c2d4d34c2b6c220177f2f82cf1401d9762ee6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 08:42:02 -0500
Subject: [PATCH 1317/3942] scala: Add update script

---
 pkgs/development/compilers/scala/2.x.nix | 55 ++++++++++++++++++++----
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix
index 6b24fafc0c55..02b9b99d84d2 100644
--- a/pkgs/development/compilers/scala/2.x.nix
+++ b/pkgs/development/compilers/scala/2.x.nix
@@ -1,6 +1,12 @@
-{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils, nixosTests }:
+{ stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils, nixosTests
+, writeScript, common-updater-scripts, git, gnused, nix, nixfmt }:
+
+with lib;
+
 let
-  common = { version, sha256, test }:
+  repo = "git@github.com:scala/scala.git";
+
+  common = { version, sha256, test, pname }:
     stdenv.mkDerivation rec {
       inherit version;
 
@@ -35,6 +41,32 @@ let
 
       passthru = {
         tests = [ test ];
+
+        updateScript = writeScript "update.sh" ''
+          #!${stdenv.shell}
+          set -o errexit
+          PATH=${
+            stdenv.lib.makeBinPath [
+              common-updater-scripts
+              coreutils
+              git
+              gnused
+              nix
+              nixfmt
+            ]
+          }
+          versionSelect='v${versions.major version}.${versions.minor version}.*'
+          oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
+          latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} "$versionSelect" | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
+          if [ "$oldVersion" != "$latestTag" ]; then
+            nixpkgs="$(git rev-parse --show-toplevel)"
+            default_nix="$nixpkgs/pkgs/development/compilers/scala/2.x.nix"
+            update-source-version ${pname} "$latestTag" --version-key=version --print-changes
+            nixfmt "$default_nix"
+          else
+            echo "${pname} is already up-to-date"
+          fi
+        '';
       };
 
       meta = {
@@ -48,33 +80,38 @@ let
           compared to an equivalent Java application.
         '';
         homepage = "https://www.scala-lang.org/";
-        license = stdenv.lib.licenses.bsd3;
-        platforms = stdenv.lib.platforms.all;
-        branch = stdenv.lib.majorMinor version;
+        license = licenses.bsd3;
+        platforms = platforms.all;
+        branch = versions.majorMinor version;
+        maintainers = [ maintainers.nequissimus ];
       };
     };
 in {
   scala_2_10 = common {
     version = "2.10.7";
-    sha256 = "04gi55lzgrhsb78qw8jmnccqim92rw6898knw0a7gfzn2sci30wj";
+    sha256 = "koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE=";
     test = { inherit (nixosTests) scala_2_10; };
+    pname = "scala_2_10";
   };
 
   scala_2_11 = common {
     version = "2.11.12";
-    sha256 = "1a4nc4qp9dm4rps47j92hlmxxqskv67qbdmjqc5zd94wd4rps7di";
+    sha256 = "sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg=";
     test = { inherit (nixosTests) scala_2_11; };
+    pname = "scala_2_11";
   };
 
   scala_2_12 = common {
     version = "2.12.12";
-    sha256 = "0avyaa7y8w7494339krcpqhc2p8y5pjk4pz7mqmzdzwy7hgws81m";
+    sha256 = "NSDNHzye//YrrudfMuUtHl3BIL4szzQGSeRw5I9Sfis=";
     test = { inherit (nixosTests) scala_2_12; };
+    pname = "scala_2_12";
   };
 
   scala_2_13 = common {
     version = "2.13.3";
-    sha256 = "0zv9w9f6g2cfydsvp8mqcfgv2v3487xp4ca1qndg6v7jrhdp7wy9";
+    sha256 = "yfNzG8zybPOaxUExcvtBZGyxn2O4ort1846JZ1ziaX8=";
     test = { inherit (nixosTests) scala_2_13; };
+    pname = "scala_2_13";
   };
 }

From c7176d55ac8a801a0368014a3c76c4ebbd5eacaa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 5 Nov 2020 16:09:24 +0100
Subject: [PATCH 1318/3942] python2.pkgs.pip: fix regression in 20.2

---
 .../python-modules/bootstrapped-pip/default.nix          | 5 +++++
 pkgs/development/python-modules/pip/default.nix          | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 8bb713b76416..04bac36cf5af 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -2,6 +2,7 @@
 , pipInstallHook
 , setuptoolsBuildHook
 , wheel, pip, setuptools
+, isPy27
 }:
 
 stdenv.mkDerivation rec {
@@ -24,6 +25,10 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     mkdir -p $out/bin
+  '' + stdenv.lib.optionalString isPy27 ''
+    pushd "${pip.src.name}"
+    patch -p1 < ${builtins.elemAt pip.patches 0}
+    popd
   '';
 
   nativeBuildInputs = [ makeWrapper unzip ];
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 9db7cdea6721..d451ca4a9b25 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -10,6 +10,8 @@
 , pytest
 , setuptools
 , wheel
+, isPy27
+, fetchpatch
 }:
 
 buildPythonPackage rec {
@@ -27,6 +29,13 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ bootstrapped-pip ];
 
+  patches = lib.optionals isPy27 [
+    (fetchpatch {
+      url = "https://github.com/pypa/pip/commit/94fbb6cf78c267bf7cdf83eeeb2536ad56cfe639.patch";
+      sha256 = "Z6x5yxBp8QkU/GOfb1ltI0dVt//MaI09XK3cdY42kFs=";
+    })
+  ];
+
   # pip detects that we already have bootstrapped_pip "installed", so we need
   # to force it a little.
   pipInstallFlags = [ "--ignore-installed" ];

From b66f954dfc90eea8aa0c416baff1abe2fd7b7c3d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 5 Nov 2020 16:09:24 +0100
Subject: [PATCH 1319/3942] python2.pkgs.pip: fix regression in 20.2

---
 .../python-modules/bootstrapped-pip/default.nix          | 5 +++++
 pkgs/development/python-modules/pip/default.nix          | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 8bb713b76416..04bac36cf5af 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -2,6 +2,7 @@
 , pipInstallHook
 , setuptoolsBuildHook
 , wheel, pip, setuptools
+, isPy27
 }:
 
 stdenv.mkDerivation rec {
@@ -24,6 +25,10 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     mkdir -p $out/bin
+  '' + stdenv.lib.optionalString isPy27 ''
+    pushd "${pip.src.name}"
+    patch -p1 < ${builtins.elemAt pip.patches 0}
+    popd
   '';
 
   nativeBuildInputs = [ makeWrapper unzip ];
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 9db7cdea6721..d451ca4a9b25 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -10,6 +10,8 @@
 , pytest
 , setuptools
 , wheel
+, isPy27
+, fetchpatch
 }:
 
 buildPythonPackage rec {
@@ -27,6 +29,13 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ bootstrapped-pip ];
 
+  patches = lib.optionals isPy27 [
+    (fetchpatch {
+      url = "https://github.com/pypa/pip/commit/94fbb6cf78c267bf7cdf83eeeb2536ad56cfe639.patch";
+      sha256 = "Z6x5yxBp8QkU/GOfb1ltI0dVt//MaI09XK3cdY42kFs=";
+    })
+  ];
+
   # pip detects that we already have bootstrapped_pip "installed", so we need
   # to force it a little.
   pipInstallFlags = [ "--ignore-installed" ];

From be5ef7d85dba4248ce079d280a114f4a2e279321 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Nov 2020 16:56:00 +0100
Subject: [PATCH 1320/3942] homeassistant: 0.117.4 -> 0.117.5

---
 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 8f6f555474f6..6597eeaf117f 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.117.4";
+  version = "0.117.5";
   components = {
     "abode" = ps: with ps; [ abodepy ];
     "accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 995d0bd0ede0..d0d88f73bc10 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.117.4";
+  hassVersion = "0.117.5";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    sha256 = "0f5a5y6d9wxdfd5l526dz34xz2n1a6ia7vdcr7sqf2qp51brpw52";
+    sha256 = "1al2pwj2xrhqyaz2pal4a1bdh4sm63ijfaw8pajghz5z23gf62r0";
   };
 
   # leave this in, so users don't have to constantly update their downstream patch handling

From 5d9ea37fd335286ddb85a9f90a7b3b7ad8d09665 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 4 Nov 2020 08:59:41 -0800
Subject: [PATCH 1321/3942] zfsUnstable: 2.0.0-rc4 -> 2.0.0-rc5

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

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index c6bd7ad93364..bb4a2dcf9796 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -202,9 +202,9 @@ in {
     # incompatibleKernelVersion = "4.19";
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2.0.0-rc4";
+    version = "2.0.0-rc5";
 
-    sha256 = "12ydycmmzqm70p6hgmmg7q93j8n1xlkk3j56vvqh1zmazr3sr6r0";
+    sha256 = "0vnldx95c36yy18v1hfr8r4cmmh3hw4n6pwz30drkwgywakjwnsd";
     isUnstable = true;
   };
 }

From 734c7444071243ba157fef71a880ed1b072abf11 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 5 Nov 2020 17:07:47 +0100
Subject: [PATCH 1322/3942] python3.pkgs.pymzq: clean up and fix

---
 .../python-modules/pyzmq/default.nix          | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix
index f23d86eb4b73..2d17e6a76e08 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/pkgs/development/python-modules/pyzmq/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage
 , fetchPypi
-, pytest
+, pytestCheckHook
 , tornado
 , zeromq
 , py
@@ -16,23 +16,30 @@ buildPythonPackage rec {
     sha256 = "296540a065c8c21b26d63e3cea2d1d57902373b16e4256afe46422691903a438";
   };
 
-  checkInputs = [  pytest tornado ];
+  checkInputs = [
+    pytestCheckHook
+    tornado
+  ];
   buildInputs = [ zeromq ];
   propagatedBuildInputs = [ py ];
 
-  # test_socket.py seems to be hanging
-  # others fail
-  # for test_monitor: https://github.com/zeromq/pyzmq/issues/1272
-  checkPhase = ''
-    py.test $out/${python.sitePackages}/zmq/ -k "not test_socket \
-      and not test_current \
-      and not test_instance \
-      and not test_callable_check \
-      and not test_on_recv_basic \
-      and not test_on_recv_wake \
-      and not test_monitor \
-      and not test_cython"
-  '';
+  # failing tests
+  disabledTests = [
+    "test_socket" # hangs
+    "test_current"
+    "test_instance"
+    "test_callable_check"
+    "test_on_recv_basic"
+    "test_on_recv_wake"
+    "test_monitor" # https://github.com/zeromq/pyzmq/issues/1272
+    "test_cython"
+    "test_asyncio" # hangs
+    "test_mockable" # fails
+  ];
+
+  pytestFlagsArray = [
+    "$out/${python.sitePackages}/zmq/tests/" # Folder with tests
+  ];
 
   # Some of the tests use localhost networking.
   __darwinAllowLocalNetworking = true;

From 23b43eb476fcde52a7c658f88d3af4b2ab4a16a0 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Thu, 5 Nov 2020 18:39:44 +0100
Subject: [PATCH 1323/3942] keycloak: 11.0.2 -> 11.0.3

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

diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
index 67d3d9bd45a2..6340f734d08c 100644
--- a/pkgs/servers/keycloak/default.nix
+++ b/pkgs/servers/keycloak/default.nix
@@ -18,11 +18,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname   = "keycloak";
-  version = "11.0.2";
+  version = "11.0.3";
 
   src = fetchzip {
     url    = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip";
-    sha256 = "0ayg6cl6mff64qs36djnfs3is4x0pzhk7zwb27cbln77q3icc0j0";
+    sha256 = "15fw49rhnjky108hh71dkdlafd0ajr1n13vhivqcw6c18zvyan35";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 8b8130f26ad043ac9721b3fafab500ce8bb39d06 Mon Sep 17 00:00:00 2001
From: Max Hausch <cheriimoya@googlemail.com>
Date: Wed, 28 Oct 2020 20:45:57 +0100
Subject: [PATCH 1324/3942] libass: 0.14.0 -> 0.15.0

Harfbuzz is now being required unconditionally as per
https://github.com/libass/libass/releases/tag/0.15.0

Fixes: CVE-2020-26682
---
 pkgs/development/libraries/libass/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 508a57b203d2..9d8cf7434c23 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchurl, pkgconfig, yasm
-, freetype, fribidi
+, freetype, fribidi, harfbuzz
 , encaSupport ? true, enca ? null # enca support
 , fontconfigSupport ? true, fontconfig ? null # fontconfig support
-, harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
 , rasterizerSupport ? false # Internal rasterizer
 , largeTilesSupport ? false # Use larger tiles in the rasterizer
 , libiconv
@@ -10,7 +9,6 @@
 
 assert encaSupport -> enca != null;
 assert fontconfigSupport -> fontconfig != null;
-assert harfbuzzSupport -> harfbuzz != null;
 
 let
   mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
@@ -19,27 +17,25 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libass";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchurl {
     url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8";
+    sha256 = "0cz8v6kh3f2j5rdjrra2z0h715fa16vjm7kambvqx9hak86262cz";
   };
 
   configureFlags = [
     (mkFlag encaSupport "enca")
     (mkFlag fontconfigSupport "fontconfig")
-    (mkFlag harfbuzzSupport "harfbuzz")
     (mkFlag rasterizerSupport "rasterizer")
     (mkFlag largeTilesSupport "large-tiles")
   ];
 
   nativeBuildInputs = [ pkgconfig yasm ];
 
-  buildInputs = [ freetype fribidi ]
+  buildInputs = [ freetype fribidi harfbuzz ]
     ++ optional encaSupport enca
     ++ optional fontconfigSupport fontconfig
-    ++ optional harfbuzzSupport harfbuzz
     ++ optional stdenv.isDarwin libiconv;
 
   meta = {

From 66d8c7d29a54a833559bc4c62b4601ea082865c4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 13:08:06 -0500
Subject: [PATCH 1325/3942] jenkins: Inline update script, add test reference

---
 .../jenkins/default.nix                       | 43 ++++++++++++++++++-
 .../continuous-integration/jenkins/update.sh  | 22 ----------
 2 files changed, 41 insertions(+), 24 deletions(-)
 delete mode 100755 pkgs/development/tools/continuous-integration/jenkins/update.sh

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index d9eb540c3f2e..c95a21c012dd 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt, writeScript, nixosTests, jq, cacert, curl }:
 
 stdenv.mkDerivation rec {
   pname = "jenkins";
@@ -14,11 +14,50 @@ stdenv.mkDerivation rec {
     cp "$src" "$out/webapps/jenkins.war"
   '';
 
+  passthru = {
+    tests = { inherit (nixosTests) jenkins; };
+
+    updateScript = writeScript "update.sh" ''
+      #!${stdenv.shell}
+      set -o errexit
+      PATH=${
+       stdenv.lib.makeBinPath [
+          cacert
+          common-updater-scripts
+          coreutils
+          curl
+          git
+          gnused
+          jq
+          nix
+          nixfmt
+        ]
+      }
+
+      core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)"
+      oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"')
+
+      version="$(jq -r .version <<<$core_json)"
+      sha256="$(jq -r .sha256 <<<$core_json)"
+      hash="$(nix-hash --type sha256 --to-base32 "$sha256")"
+      url="$(jq -r .url <<<$core_json)"
+
+      if [ ! "$oldVersion" = "$version" ]; then
+        update-source-version jenkins "$version" "$hash" "$url"
+        nixpkgs="$(git rev-parse --show-toplevel)"
+        default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix"
+        nixfmt "$default_nix"
+      else
+        echo "jenkins is already up-to-date"
+      fi
+    '';
+  };
+
   meta = with stdenv.lib; {
     description = "An extendable open source continuous integration server";
     homepage = "https://jenkins-ci.org";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ coconnor fpletz earldouglas ];
+    maintainers = with maintainers; [ coconnor fpletz earldouglas nequissimus ];
   };
 }
diff --git a/pkgs/development/tools/continuous-integration/jenkins/update.sh b/pkgs/development/tools/continuous-integration/jenkins/update.sh
deleted file mode 100755
index 4f2f6527eccc..000000000000
--- a/pkgs/development/tools/continuous-integration/jenkins/update.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl common-updater-scripts jq
-
-set -eu -o pipefail
-
-core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)"
-oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"')
-
-version="$(jq -r .version <<<$core_json)"
-sha256="$(jq -r .sha256 <<<$core_json)"
-hash="$(nix-hash --type sha256 --to-base32 "$sha256")"
-url="$(jq -r .url <<<$core_json)"
-
-if [ ! "${oldVersion}" = "${version}" ]; then
-  update-source-version jenkins "$version" "$hash" "$url"
-  nixpkgs="$(git rev-parse --show-toplevel)"
-  default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix"
-  git add "${default_nix}"
-  git commit -m "jenkins: ${oldVersion} -> ${version}"
-else
-  echo "jenkins is already up-to-date"
-fi

From 37cd50fa353fbede65ba2d5de002e289bc73f0b6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 18:09:36 +0000
Subject: [PATCH 1326/3942] =?UTF-8?q?jenkins:=202.249.2=20=E2=86=92=202.24?=
 =?UTF-8?q?9.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/continuous-integration/jenkins/default.nix     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index c95a21c012dd..b4cc2843c335 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt, writeScript, nixosTests, jq, cacert, curl }:
+{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt
+, writeScript, nixosTests, jq, cacert, curl }:
 
 stdenv.mkDerivation rec {
   pname = "jenkins";
-  version = "2.249.2";
+  version = "2.249.3";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "08m5z4ik96gnhw92hjzch7rpvrs0dipi9fps4rihwwzg5k26rc0v";
+    sha256 = "00lpqkkz7k0m2czz1sg54gb90sljc14i5a2kpikrkiw8aqfz3s4d";
   };
 
   buildCommand = ''
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
       #!${stdenv.shell}
       set -o errexit
       PATH=${
-       stdenv.lib.makeBinPath [
+        stdenv.lib.makeBinPath [
           cacert
           common-updater-scripts
           coreutils

From 7a8b30fb60aa811d6431ce598d1f41b752b17488 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Thu, 5 Nov 2020 10:09:44 -0800
Subject: [PATCH 1327/3942] prometheus: 2.20.1 -> 2.22.1

---
 .../servers/monitoring/prometheus/default.nix |    4 +-
 .../monitoring/prometheus/webui-package.json  |   28 +-
 .../monitoring/prometheus/webui-yarndeps.nix  | 3312 +++++++++--------
 3 files changed, 1796 insertions(+), 1548 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 7e729cd366f3..445872bbe5fb 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,13 +1,13 @@
 { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }:
 
 let
-  version = "2.20.1";
+  version = "2.22.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "prometheus";
     repo = "prometheus";
-    sha256 = "0svhx08pbz55nhn6g9pn79zbhyvr394k5w3ny1mq3wp382h62r5j";
+    sha256 = "0wilx675b0a8ww7bj36hzcaip0zqzndkzan04rjsjigz5bw6kba0";
   };
 
   webui = mkYarnPackage {
diff --git a/pkgs/servers/monitoring/prometheus/webui-package.json b/pkgs/servers/monitoring/prometheus/webui-package.json
index 09ebefa01102..3c4c3eb8568f 100644
--- a/pkgs/servers/monitoring/prometheus/webui-package.json
+++ b/pkgs/servers/monitoring/prometheus/webui-package.json
@@ -8,33 +8,33 @@
     "@fortawesome/react-fontawesome": "^0.1.4",
     "@reach/router": "^1.2.1",
     "@testing-library/react-hooks": "^3.1.1",
-    "@types/jest": "^24.0.20",
-    "@types/jquery": "^3.3.29",
+    "@types/jest": "^26.0.10",
+    "@types/jquery": "^3.5.1",
     "@types/node": "^12.11.1",
     "@types/reach__router": "^1.2.6",
     "@types/react": "^16.8.2",
     "@types/react-copy-to-clipboard": "^4.3.0",
     "@types/react-dom": "^16.8.0",
-    "@types/react-resize-detector": "^4.0.2",
+    "@types/react-resize-detector": "^4.2.0",
     "@types/sanitize-html": "^1.20.2",
     "bootstrap": "^4.2.1",
     "css.escape": "^1.5.1",
-    "downshift": "^3.2.2",
+    "downshift": "^3.4.8",
     "enzyme-to-json": "^3.4.3",
     "fuzzy": "^0.1.3",
     "i": "^0.3.6",
-    "jest-fetch-mock": "^2.1.2",
-    "jquery": "^3.5",
+    "jest-fetch-mock": "^3.0.3",
+    "jquery": "^3.5.1",
     "jquery.flot.tooltip": "^0.9.0",
-    "jsdom": "^15.2.0",
+    "jsdom": "^16.4.0",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.23",
     "popper.js": "^1.14.3",
     "react": "^16.7.0",
     "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "^16.7.0",
-    "react-resize-detector": "^4.2.1",
-    "react-scripts": "3.4.0",
+    "react-resize-detector": "^5.0.7",
+    "react-scripts": "3.4.3",
     "react-test-renderer": "^16.9.0",
     "reactstrap": "^8.0.1",
     "sanitize-html": "^1.20.1",
@@ -68,7 +68,7 @@
     "@types/flot": "0.0.31",
     "@types/moment-timezone": "^0.5.10",
     "@types/reactstrap": "^8.0.5",
-    "@types/sinon": "^7.5.0",
+    "@types/sinon": "^9.0.4",
     "@typescript-eslint/eslint-plugin": "2.x",
     "@typescript-eslint/parser": "2.x",
     "enzyme": "^3.10.0",
@@ -76,15 +76,15 @@
     "eslint": "6.x",
     "eslint-config-prettier": "^6.4.0",
     "eslint-config-react-app": "^5.0.2",
-    "eslint-plugin-flowtype": "3.x",
+    "eslint-plugin-flowtype": "4.x",
     "eslint-plugin-import": "2.x",
     "eslint-plugin-jsx-a11y": "6.x",
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-react": "7.x",
-    "eslint-plugin-react-hooks": "1.x",
-    "jest-fetch-mock": "^2.1.2",
+    "eslint-plugin-react-hooks": "2.x",
+    "jest-fetch-mock": "^3.0.3",
     "prettier": "^1.18.2",
-    "sinon": "^7.5.0"
+    "sinon": "^9.0.3"
   },
   "proxy": "http://localhost:9090",
   "jest": {
diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
index 8b7d346e5600..56f9ec722782 100644
--- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
+++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
@@ -10,19 +10,19 @@
       };
     }
     {
-      name = "_babel_compat_data___compat_data_7.9.0.tgz";
+      name = "_babel_code_frame___code_frame_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_compat_data___compat_data_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz";
-        sha1 = "04815556fc90b0c174abd2c0c1bb966faa036a6c";
+        name = "_babel_code_frame___code_frame_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz";
+        sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a";
       };
     }
     {
-      name = "_babel_core___core_7.8.4.tgz";
+      name = "_babel_compat_data___compat_data_7.11.0.tgz";
       path = fetchurl {
-        name = "_babel_core___core_7.8.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz";
-        sha1 = "d496799e5c12195b3602d0fddd77294e3e38e80e";
+        name = "_babel_compat_data___compat_data_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz";
+        sha1 = "e9f73efe09af1355b723a7f39b11bad637d7c99c";
       };
     }
     {
@@ -34,259 +34,251 @@
       };
     }
     {
-      name = "_babel_generator___generator_7.9.0.tgz";
+      name = "_babel_core___core_7.11.6.tgz";
       path = fetchurl {
-        name = "_babel_generator___generator_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.0.tgz";
-        sha1 = "0f67adea4ec39dad6e63345f70eec33014d78c89";
+        name = "_babel_core___core_7.11.6.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz";
+        sha1 = "3a9455dc7387ff1bac45770650bc13ba04a15651";
       };
     }
     {
-      name = "_babel_generator___generator_7.9.4.tgz";
+      name = "_babel_generator___generator_7.11.6.tgz";
       path = fetchurl {
-        name = "_babel_generator___generator_7.9.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz";
-        sha1 = "12441e90c3b3c4159cdecf312075bf1a8ce2dbce";
+        name = "_babel_generator___generator_7.11.6.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz";
+        sha1 = "b868900f81b163b4d464ea24545c61cbac4dc620";
       };
     }
     {
-      name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz";
+      name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz";
-        sha1 = "60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee";
+        name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz";
+        sha1 = "5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3";
       };
     }
     {
-      name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz";
+      name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz";
-        sha1 = "c84097a427a061ac56a1c30ebf54b7b22d241503";
+        name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz";
+        sha1 = "bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3";
       };
     }
     {
-      name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.0.tgz";
+      name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.11.5.tgz";
       path = fetchurl {
-        name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz";
-        sha1 = "066d80262ade488f9c1b1823ce5db88a4cedaa43";
+        name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.11.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz";
+        sha1 = "4ea43dd63857b0a35cd1f1b161dc29b43414e79f";
       };
     }
     {
-      name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz";
+      name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz";
-        sha1 = "16bf391990b57732700a3278d4d9a81231ea8d32";
+        name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz";
+        sha1 = "8095cddbff858e6fa9c326daee54a2f2732c1d5d";
       };
     }
     {
-      name = "_babel_helper_call_delegate___helper_call_delegate_7.8.7.tgz";
+      name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_call_delegate___helper_call_delegate_7.8.7.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz";
-        sha1 = "28a279c2e6c622a6233da548127f980751324cab";
+        name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz";
+        sha1 = "804ae8e3f04376607cc791b9d47d540276332bd2";
       };
     }
     {
-      name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.7.tgz";
+      name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.5.tgz";
       path = fetchurl {
-        name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.7.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz";
-        sha1 = "dac1eea159c0e4bd46e309b5a1b04a66b53c1dde";
+        name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz";
+        sha1 = "9f61446ba80e8240b0a5c85c6fdac8459d6f259d";
       };
     }
     {
-      name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.6.tgz";
+      name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.6.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz";
-        sha1 = "243a5b46e2f8f0f674dc1387631eb6b28b851de0";
+        name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz";
+        sha1 = "fdd60d88524659a0b6959c0579925e425714f3b8";
       };
     }
     {
-      name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz";
+      name = "_babel_helper_define_map___helper_define_map_7.10.5.tgz";
       path = fetchurl {
-        name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz";
-        sha1 = "5d84180b588f560b7864efaeea89243e58312087";
+        name = "_babel_helper_define_map___helper_define_map_7.10.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz";
+        sha1 = "b53c10db78a640800152692b13393147acb9bb30";
       };
     }
     {
-      name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz";
+      name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.11.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz";
-        sha1 = "a0655cad5451c3760b726eba875f1cd8faa02c15";
+        name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.11.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz";
+        sha1 = "2d8e3470252cc17aba917ede7803d4a7a276a41b";
       };
     }
     {
-      name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz";
+      name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz";
-        sha1 = "a728dc5b4e89e30fc2dfc7d04fa28a930653f982";
+        name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";
+        sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a";
       };
     }
     {
-      name = "_babel_helper_function_name___helper_function_name_7.8.3.tgz";
+      name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_function_name___helper_function_name_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz";
-        sha1 = "eeeb665a01b1f11068e9fb86ad56a1cb1a824cca";
+        name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";
+        sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2";
       };
     }
     {
-      name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz";
+      name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz";
-        sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5";
+        name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz";
+        sha1 = "d49b001d1d5a68ca5e6604dda01a6297f7c9381e";
       };
     }
     {
-      name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz";
+      name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz";
       path = fetchurl {
-        name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz";
-        sha1 = "1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134";
+        name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz";
+        sha1 = "ae69c83d84ee82f4b42f96e2a09410935a8f26df";
       };
     }
     {
-      name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz";
+      name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz";
-        sha1 = "659b710498ea6c1d9907e0c73f206eee7dadc24c";
+        name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz";
+        sha1 = "4c5c54be04bd31670a7382797d75b9fa2e5b5620";
       };
     }
     {
-      name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz";
+      name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz";
       path = fetchurl {
-        name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz";
-        sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498";
+        name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz";
+        sha1 = "b16f250229e47211abdd84b34b64737c2ab2d359";
       };
     }
     {
-      name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz";
+      name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz";
-        sha1 = "43b34dfe15961918707d247327431388e9fe96e5";
+        name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz";
+        sha1 = "50dc96413d594f995a77905905b05893cd779673";
       };
     }
     {
-      name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz";
+      name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz";
-        sha1 = "7ed071813d09c75298ef4f208956006b6111ecb9";
+        name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz";
+        sha1 = "2f75a831269d4f677de49986dff59927533cf375";
       };
     }
     {
-      name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz";
+      name = "_babel_helper_regex___helper_regex_7.10.5.tgz";
       path = fetchurl {
-        name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz";
-        sha1 = "9ea293be19babc0f52ff8ca88b34c3611b208670";
+        name = "_babel_helper_regex___helper_regex_7.10.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz";
+        sha1 = "32dfbb79899073c415557053a19bd055aae50ae0";
       };
     }
     {
-      name = "_babel_helper_regex___helper_regex_7.8.3.tgz";
+      name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.11.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_regex___helper_regex_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz";
-        sha1 = "139772607d51b93f23effe72105b319d2a4c6965";
+        name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.11.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz";
+        sha1 = "4474ea9f7438f18575e30b0cac784045b402a12d";
       };
     }
     {
-      name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz";
+      name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz";
-        sha1 = "273c600d8b9bf5006142c1e35887d555c12edd86";
+        name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz";
+        sha1 = "d585cd9388ea06e6031e4cd44b6713cbead9e6cf";
       };
     }
     {
-      name = "_babel_helper_replace_supers___helper_replace_supers_7.8.6.tgz";
+      name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_replace_supers___helper_replace_supers_7.8.6.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz";
-        sha1 = "5ada744fd5ad73203bf1d67459a27dcba67effc8";
+        name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz";
+        sha1 = "0f5ccda2945277a2a7a2d3a821e15395edcf3461";
       };
     }
     {
-      name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz";
+      name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.11.0.tgz";
       path = fetchurl {
-        name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz";
-        sha1 = "7f8109928b4dab4654076986af575231deb639ae";
+        name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz";
+        sha1 = "eec162f112c2f58d3af0af125e3bb57665146729";
       };
     }
     {
-      name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz";
+      name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz";
       path = fetchurl {
-        name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz";
-        sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9";
+        name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz";
+        sha1 = "f8a491244acf6a676158ac42072911ba83ad099f";
       };
     }
     {
-      name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.0.tgz";
+      name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz";
-        sha1 = "ad53562a7fc29b3b9a91bbf7d10397fd146346ed";
+        name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz";
+        sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2";
       };
     }
     {
-      name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz";
+      name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz";
-        sha1 = "9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610";
+        name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz";
+        sha1 = "8a6f701eab0ff39f765b5a1cfef409990e624b87";
       };
     }
     {
-      name = "_babel_helpers___helpers_7.9.2.tgz";
+      name = "_babel_helpers___helpers_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helpers___helpers_7.9.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz";
-        sha1 = "b42a81a811f1e7313b88cba8adc66b3d9ae6c09f";
+        name = "_babel_helpers___helpers_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz";
+        sha1 = "2abeb0d721aff7c0a97376b9e1f6f65d7a475044";
       };
     }
     {
-      name = "_babel_highlight___highlight_7.9.0.tgz";
+      name = "_babel_highlight___highlight_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_highlight___highlight_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz";
-        sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079";
+        name = "_babel_highlight___highlight_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz";
+        sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143";
       };
     }
     {
-      name = "_babel_parser___parser_7.9.4.tgz";
+      name = "_babel_parser___parser_7.11.5.tgz";
       path = fetchurl {
-        name = "_babel_parser___parser_7.9.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz";
-        sha1 = "68a35e6b0319bbc014465be43828300113f2f2e8";
+        name = "_babel_parser___parser_7.11.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz";
+        sha1 = "c7ff6303df71080ec7a4f5b8c003c58f1cf51037";
       };
     }
     {
-      name = "_babel_parser___parser_7.9.2.tgz";
+      name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.5.tgz";
       path = fetchurl {
-        name = "_babel_parser___parser_7.9.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz";
-        sha1 = "4e767f424b479c514077544484d1f9bdba7f1158";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz";
-        sha1 = "bad329c670b382589721b27540c7d288601c6e6f";
+        name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz";
+        sha1 = "3491cabf2f7c179ab820606cec27fed15e0e8558";
       };
     }
     {
@@ -297,6 +289,14 @@
         sha1 = "5e06654af5cd04b608915aada9b2a6788004464e";
       };
     }
+    {
+      name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz";
+        sha1 = "a33bf632da390a59c7a8c570045d1115cd778807";
+      };
+    }
     {
       name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz";
       path = fetchurl {
@@ -306,19 +306,35 @@
       };
     }
     {
-      name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz";
+      name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz";
-        sha1 = "38c4fe555744826e97e2ae930b0fb4cc07e66054";
+        name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz";
+        sha1 = "ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e";
       };
     }
     {
-      name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz";
+      name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz";
-        sha1 = "da5216b238a98b58a1e05d6852104b10f9a70d6b";
+        name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz";
+        sha1 = "570d883b91031637b3e2958eea3c438e62c05f54";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz";
+        sha1 = "593e59c63528160233bd321b1aebe0820c2341db";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.11.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz";
+        sha1 = "9f80e482c03083c87125dee10026b58527ea20c8";
       };
     }
     {
@@ -329,6 +345,14 @@
         sha1 = "e4572253fdeed65cddeecfdab3f928afeb2fd5d2";
       };
     }
+    {
+      name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz";
+        sha1 = "02a7e961fc32e6d5b2db0649e01bf80ddee7e04a";
+      };
+    }
     {
       name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz";
       path = fetchurl {
@@ -338,19 +362,27 @@
       };
     }
     {
-      name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.0.tgz";
+      name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz";
-        sha1 = "a28993699fc13df165995362693962ba6b061d6f";
+        name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz";
+        sha1 = "ce1590ff0a65ad12970a609d78855e9a4c1aef06";
       };
     }
     {
-      name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz";
+      name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.11.0.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz";
-        sha1 = "9dee96ab1650eed88646ae9734ca167ac4a9c5c9";
+        name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz";
+        sha1 = "bd81f95a1f746760ea43b6c2d3d62b11790ad0af";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz";
+        sha1 = "31c938309d24a78a49d68fdabffaa863758554dd";
       };
     }
     {
@@ -362,11 +394,27 @@
       };
     }
     {
-      name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz";
+      name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.11.0.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz";
-        sha1 = "ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d";
+        name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz";
+        sha1 = "de5866d0646f6afdaab8a566382fe3a221755076";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz";
+        sha1 = "b160d972b8fdba5c7d111a145fc8c421fc2a6909";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz";
+        sha1 = "4483cda53041ce3413b7fe2f00022665ddfaa75d";
       };
     }
     {
@@ -378,11 +426,19 @@
       };
     }
     {
-      name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz";
+      name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz";
-        sha1 = "8d2c15a9f1af624b0025f961682a9d53d3001bda";
+        name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz";
+        sha1 = "6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz";
+        sha1 = "6853085b2c429f9d322d02f5a635018cdeb2360c";
       };
     }
     {
@@ -394,11 +450,19 @@
       };
     }
     {
-      name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz";
+      name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz";
-        sha1 = "f2c883bd61a6316f2c89380ae5122f923ba4527f";
+        name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz";
+        sha1 = "028964a9ba80dbc094c915c487ad7c4e7a66465a";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz";
+        sha1 = "53351dd7ae01995e567d04ce42af1a6e0ba846a6";
       };
     }
     {
@@ -410,11 +474,19 @@
       };
     }
     {
-      name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz";
+      name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz";
-        sha1 = "521b06c83c40480f1e58b4fd33b92eceb1d6ea94";
+        name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz";
+        sha1 = "39abaae3cbf710c4373d8429484e6ba21340166c";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz";
+        sha1 = "ca91ef46303530448b906652bac2e9fe9941f699";
       };
     }
     {
@@ -426,11 +498,11 @@
       };
     }
     {
-      name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz";
+      name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz";
-        sha1 = "0e3fb63e09bea1b11e96467271c8308007e7c41f";
+        name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz";
+        sha1 = "b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97";
       };
     }
     {
@@ -458,99 +530,99 @@
       };
     }
     {
-      name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz";
+      name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz";
-        sha1 = "3acdece695e6b13aaf57fc291d1a800950c71391";
+        name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz";
+        sha1 = "4bbeb8917b54fcf768364e0a81f560e33a3ef57d";
       };
     }
     {
-      name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz";
+      name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz";
-        sha1 = "c1f659dda97711a569cef75275f7e15dcaa6cabc";
+        name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz";
+        sha1 = "2f55e770d3501e83af217d782cb7517d7bb34d25";
       };
     }
     {
-      name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz";
+      name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz";
-        sha1 = "82776c2ed0cd9e1a49956daeb896024c9473b8b6";
+        name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz";
+        sha1 = "e22960d77e697c74f41c501d44d73dbf8a6a64cd";
       };
     }
     {
-      name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz";
+      name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz";
-        sha1 = "4308fad0d9409d71eafb9b1a6ee35f9d64b64086";
+        name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz";
+        sha1 = "41a5017e49eb6f3cda9392a51eef29405b245a37";
       };
     }
     {
-      name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz";
+      name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz";
-        sha1 = "437eec5b799b5852072084b3ae5ef66e8349e8a3";
+        name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz";
+        sha1 = "1afa595744f75e43a91af73b0d998ecfe4ebc2e8";
       };
     }
     {
-      name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz";
+      name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.11.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz";
-        sha1 = "97d35dab66857a437c166358b91d09050c868f3a";
+        name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.11.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz";
+        sha1 = "5b7efe98852bef8d652c0b28144cd93a9e4b5215";
       };
     }
     {
-      name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.2.tgz";
+      name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz";
-        sha1 = "8603fc3cc449e31fdbdbc257f67717536a11af8d";
+        name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz";
+        sha1 = "405136af2b3e218bc4a1926228bc917ab1a0adc7";
       };
     }
     {
-      name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz";
+      name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz";
-        sha1 = "96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b";
+        name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz";
+        sha1 = "9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb";
       };
     }
     {
-      name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.8.tgz";
+      name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.8.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz";
-        sha1 = "fadb2bc8e90ccaf5658de6f8d4d22ff6272a2f4b";
+        name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz";
+        sha1 = "70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5";
       };
     }
     {
-      name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz";
+      name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz";
-        sha1 = "c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e";
+        name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz";
+        sha1 = "469c2062105c1eb6a040eaf4fac4b488078395ee";
       };
     }
     {
-      name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz";
+      name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz";
-        sha1 = "8d12df309aa537f272899c565ea1768e286e21f1";
+        name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz";
+        sha1 = "697e50c9fee14380fe843d1f306b295617431e47";
       };
     }
     {
-      name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz";
+      name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz";
-        sha1 = "581a6d7f56970e06bf51560cd64f5e947b70d7b7";
+        name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz";
+        sha1 = "5ae338c57f8cf4001bdb35607ae66b92d665af2e";
       };
     }
     {
@@ -562,115 +634,115 @@
       };
     }
     {
-      name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz";
+      name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz";
-        sha1 = "0f260e27d3e29cd1bb3128da5e76c761aa6c108e";
+        name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz";
+        sha1 = "c08892e8819d3a5db29031b115af511dbbfebae9";
       };
     }
     {
-      name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz";
+      name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz";
-        sha1 = "279373cb27322aaad67c2683e776dfc47196ed8b";
+        name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz";
+        sha1 = "6a467880e0fc9638514ba369111811ddbe2644b7";
       };
     }
     {
-      name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz";
+      name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz";
-        sha1 = "aef239823d91994ec7b68e55193525d76dbd5dc1";
+        name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz";
+        sha1 = "9f42ba0841100a135f22712d0e391c462f571f3c";
       };
     }
     {
-      name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz";
+      name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz";
-        sha1 = "963fed4b620ac7cbf6029c755424029fa3a40410";
+        name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz";
+        sha1 = "b1ec44fcf195afcb8db2c62cd8e551c881baf8b7";
       };
     }
     {
-      name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.0.tgz";
+      name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.5.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz";
-        sha1 = "19755ee721912cf5bb04c07d50280af3484efef4";
+        name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz";
+        sha1 = "1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1";
       };
     }
     {
-      name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.0.tgz";
+      name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz";
-        sha1 = "e3e72f4cbc9b4a260e30be0ea59bdf5a39748940";
+        name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz";
+        sha1 = "66667c3eeda1ebf7896d41f1f16b17105a2fbca0";
       };
     }
     {
-      name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.0.tgz";
+      name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.5.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz";
-        sha1 = "e9fd46a296fc91e009b64e07ddaa86d6f0edeb90";
+        name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz";
+        sha1 = "6270099c854066681bae9e05f87e1b9cadbe8c85";
       };
     }
     {
-      name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz";
+      name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz";
-        sha1 = "e909acae276fec280f9b821a5f38e1f08b480697";
+        name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz";
+        sha1 = "9a8481fe81b824654b3a0b65da3df89f3d21839e";
       };
     }
     {
-      name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz";
+      name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz";
-        sha1 = "a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c";
+        name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz";
+        sha1 = "78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6";
       };
     }
     {
-      name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz";
+      name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz";
-        sha1 = "60cc2ae66d85c95ab540eb34babb6434d4c70c43";
+        name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz";
+        sha1 = "9097d753cb7b024cb7381a3b2e52e9513a9c6888";
       };
     }
     {
-      name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz";
+      name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz";
-        sha1 = "ebb6a1e7a86ffa96858bd6ac0102d65944261725";
+        name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz";
+        sha1 = "d7146c4d139433e7a6526f888c667e314a093894";
       };
     }
     {
-      name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.8.tgz";
+      name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.5.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.8.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz";
-        sha1 = "0381de466c85d5404565243660c4496459525daf";
+        name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz";
+        sha1 = "59d339d58d0b1950435f4043e74e2510005e2c4a";
       };
     }
     {
-      name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz";
+      name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz";
-        sha1 = "33194300d8539c1ed28c62ad5087ba3807b98263";
+        name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz";
+        sha1 = "f6fe54b6590352298785b83edd815d214c42e3c0";
       };
     }
     {
-      name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz";
+      name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz";
-        sha1 = "a75abc936a3819edec42d3386d9f1c93f28d9d9e";
+        name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.4.tgz";
+        sha1 = "0f485260bf1c29012bb973e7e404749eaac12c9e";
       };
     }
     {
@@ -682,51 +754,67 @@
       };
     }
     {
-      name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz";
+      name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz";
-        sha1 = "3c2a130727caf00c2a293f0aed24520825dbf754";
+        name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz";
+        sha1 = "b5795f4e3e3140419c3611b7a2a3832b9aef328d";
       };
     }
     {
-      name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz";
+      name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.11.5.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz";
-        sha1 = "f4f26a325820205239bb915bad8e06fcadabb49b";
+        name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.11.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.11.5.tgz";
+        sha1 = "e1439e6a57ee3d43e9f54ace363fb29cefe5d7b6";
       };
     }
     {
-      name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz";
+      name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz";
-        sha1 = "89ef93025240dd5d17d3122294a093e5e0183de0";
+        name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz";
+        sha1 = "cd301a5fed8988c182ed0b9d55e9bd6db0bd9369";
       };
     }
     {
-      name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.1.tgz";
+      name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.10.5.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.1.tgz";
-        sha1 = "d03af29396a6dc51bfa24eefd8005a9fd381152a";
+        name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.10.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz";
+        sha1 = "34f1779117520a779c054f2cdd9680435b9222b4";
       };
     }
     {
-      name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz";
+      name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz";
-        sha1 = "5e46a0dca2bee1ad8285eb0527e6abc9c37672f8";
+        name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz";
+        sha1 = "673c9f913948764a4421683b2bef2936968fddf2";
       };
     }
     {
-      name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz";
+      name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz";
-        sha1 = "9a0635ac4e665d29b162837dd3cc50745dfdf1f5";
+        name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz";
+        sha1 = "3eefbb73db94afbc075f097523e445354a1c6501";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz";
+        sha1 = "2015e59d839074e76838de2159db421966fd8b63";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz";
+        sha1 = "8f2682bcdcef9ed327e1b0861585d7013f8a54dd";
       };
     }
     {
@@ -738,59 +826,67 @@
       };
     }
     {
-      name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz";
+      name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz";
-        sha1 = "28545216e023a832d4d3a1185ed492bcfeac08c8";
+        name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz";
+        sha1 = "9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6";
       };
     }
     {
-      name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz";
+      name = "_babel_plugin_transform_spread___plugin_transform_spread_7.11.0.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz";
-        sha1 = "9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8";
+        name = "_babel_plugin_transform_spread___plugin_transform_spread_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz";
+        sha1 = "fa84d300f5e4f57752fe41a6d1b3c554f13f17cc";
       };
     }
     {
-      name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz";
+      name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz";
-        sha1 = "be7a1290f81dae767475452199e1f76d6175b100";
+        name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz";
+        sha1 = "8f3889ee8657581130a29d9cc91d7c73b7c4a28d";
       };
     }
     {
-      name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz";
+      name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.5.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz";
-        sha1 = "7bfa4732b455ea6a43130adc0ba767ec0e402a80";
+        name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz";
+        sha1 = "78bc5d626a6642db3312d9d0f001f5e7639fde8c";
       };
     }
     {
-      name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz";
+      name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz";
-        sha1 = "ede4062315ce0aaf8a657a920858f1a2f35fc412";
+        name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz";
+        sha1 = "9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc";
       };
     }
     {
-      name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.0.tgz";
+      name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.11.0.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.0.tgz";
-        sha1 = "8b52649c81cb7dee117f760952ab46675a258836";
+        name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz";
+        sha1 = "2b4879676af37342ebb278216dd090ac67f13abb";
       };
     }
     {
-      name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz";
+      name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz";
-        sha1 = "0cef36e3ba73e5c57273effb182f46b91a1ecaad";
+        name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz";
+        sha1 = "feae523391c7651ddac115dae0a9d06857892007";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz";
+        sha1 = "e56d71f9282fac6db09c82742055576d5e6d80a8";
       };
     }
     {
@@ -802,11 +898,19 @@
       };
     }
     {
-      name = "_babel_preset_modules___preset_modules_0.1.3.tgz";
+      name = "_babel_preset_env___preset_env_7.11.5.tgz";
       path = fetchurl {
-        name = "_babel_preset_modules___preset_modules_0.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz";
-        sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72";
+        name = "_babel_preset_env___preset_env_7.11.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.5.tgz";
+        sha1 = "18cb4b9379e3e92ffea92c07471a99a2914e4272";
+      };
+    }
+    {
+      name = "_babel_preset_modules___preset_modules_0.1.4.tgz";
+      path = fetchurl {
+        name = "_babel_preset_modules___preset_modules_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz";
+        sha1 = "362f2b68c662842970fdb5e254ffc8fc1c2e415e";
       };
     }
     {
@@ -817,6 +921,14 @@
         sha1 = "b346403c36d58c3bb544148272a0cefd9c28677a";
       };
     }
+    {
+      name = "_babel_preset_react___preset_react_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_preset_react___preset_react_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz";
+        sha1 = "92e8a66d816f9911d11d4cc935be67adfc82dbcf";
+      };
+    }
     {
       name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz";
       path = fetchurl {
@@ -826,11 +938,11 @@
       };
     }
     {
-      name = "_babel_runtime_corejs3___runtime_corejs3_7.9.2.tgz";
+      name = "_babel_runtime_corejs3___runtime_corejs3_7.11.2.tgz";
       path = fetchurl {
-        name = "_babel_runtime_corejs3___runtime_corejs3_7.9.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz";
-        sha1 = "26fe4aa77e9f1ecef9b776559bbb8e84d34284b7";
+        name = "_babel_runtime_corejs3___runtime_corejs3_7.11.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz";
+        sha1 = "02c3029743150188edeb66541195f54600278419";
       };
     }
     {
@@ -842,35 +954,35 @@
       };
     }
     {
-      name = "_babel_runtime___runtime_7.9.2.tgz";
+      name = "_babel_runtime___runtime_7.11.2.tgz";
       path = fetchurl {
-        name = "_babel_runtime___runtime_7.9.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz";
-        sha1 = "d90df0583a3a252f09aaa619665367bae518db06";
+        name = "_babel_runtime___runtime_7.11.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz";
+        sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736";
       };
     }
     {
-      name = "_babel_template___template_7.8.6.tgz";
+      name = "_babel_template___template_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_template___template_7.8.6.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz";
-        sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b";
+        name = "_babel_template___template_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz";
+        sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278";
       };
     }
     {
-      name = "_babel_traverse___traverse_7.9.0.tgz";
+      name = "_babel_traverse___traverse_7.11.5.tgz";
       path = fetchurl {
-        name = "_babel_traverse___traverse_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz";
-        sha1 = "d3882c2830e513f4fe4cec9fe76ea1cc78747892";
+        name = "_babel_traverse___traverse_7.11.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz";
+        sha1 = "be777b93b518eb6d76ee2e1ea1d143daa11e61c3";
       };
     }
     {
-      name = "_babel_types___types_7.9.0.tgz";
+      name = "_babel_types___types_7.11.5.tgz";
       path = fetchurl {
-        name = "_babel_types___types_7.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz";
-        sha1 = "00b064c3df83ad32b2dbf5ff07312b15c7f1efb5";
+        name = "_babel_types___types_7.11.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz";
+        sha1 = "d9de577d01252d77c6800cee039ee64faf75662d";
       };
     }
     {
@@ -898,35 +1010,35 @@
       };
     }
     {
-      name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.27.tgz";
+      name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.32.tgz";
       path = fetchurl {
-        name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.27.tgz";
-        url  = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.27.tgz";
-        sha1 = "19706345859fc46adf3684ed01d11b40903b87e9";
+        name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.32.tgz";
+        url  = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz";
+        sha1 = "3436795d5684f22742989bfa08f46f50f516f259";
       };
     }
     {
-      name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.27.tgz";
+      name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.32.tgz";
       path = fetchurl {
-        name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.27.tgz";
-        url  = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.27.tgz";
-        sha1 = "e4db8e3be81a40988213507c3e3d0c158a6641a3";
+        name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.32.tgz";
+        url  = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz";
+        sha1 = "da092bfc7266aa274be8604de610d7115f9ba6cf";
       };
     }
     {
-      name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.12.1.tgz";
+      name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.15.1.tgz";
       path = fetchurl {
-        name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.12.1.tgz";
-        url  = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.12.1.tgz";
-        sha1 = "76b6f958a3471821ff146f8f955e6d7cfe87147c";
+        name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.15.1.tgz";
+        url  = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.1.tgz";
+        sha1 = "e1432676ddd43108b41197fee9f86d910ad458ef";
       };
     }
     {
-      name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.9.tgz";
+      name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.11.tgz";
       path = fetchurl {
-        name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.9.tgz";
-        url  = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.9.tgz";
-        sha1 = "c865b9286c707407effcec99958043711367cd02";
+        name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.11.tgz";
+        url  = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.11.tgz";
+        sha1 = "c1a95a2bdb6a18fa97b355a563832e248bf6ef4a";
       };
     }
     {
@@ -1049,6 +1161,14 @@
         sha1 = "63cb26cb7500d069e5a389441a7c6ab5e909fc59";
       };
     }
+    {
+      name = "_jest_types___types_25.5.0.tgz";
+      path = fetchurl {
+        name = "_jest_types___types_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz";
+        sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d";
+      };
+    }
     {
       name = "_mrmlnc_readdir_enhanced___readdir_enhanced_2.2.1.tgz";
       path = fetchurl {
@@ -1066,35 +1186,43 @@
       };
     }
     {
-      name = "_reach_router___router_1.3.3.tgz";
+      name = "_reach_router___router_1.3.4.tgz";
       path = fetchurl {
-        name = "_reach_router___router_1.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/@reach/router/-/router-1.3.3.tgz";
-        sha1 = "58162860dce6c9449d49be86b0561b5ef46d80db";
+        name = "_reach_router___router_1.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/@reach/router/-/router-1.3.4.tgz";
+        sha1 = "d2574b19370a70c80480ed91f3da840136d10f8c";
       };
     }
     {
-      name = "_sinonjs_commons___commons_1.7.1.tgz";
+      name = "_sinonjs_commons___commons_1.8.1.tgz";
       path = fetchurl {
-        name = "_sinonjs_commons___commons_1.7.1.tgz";
-        url  = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.1.tgz";
-        sha1 = "da5fd19a5f71177a53778073978873964f49acf1";
+        name = "_sinonjs_commons___commons_1.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz";
+        sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217";
       };
     }
     {
-      name = "_sinonjs_formatio___formatio_3.2.2.tgz";
+      name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz";
       path = fetchurl {
-        name = "_sinonjs_formatio___formatio_3.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.2.2.tgz";
-        sha1 = "771c60dfa75ea7f2d68e3b94c7e888a78781372c";
+        name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz";
+        sha1 = "293674fccb3262ac782c7aadfdeca86b10c75c40";
       };
     }
     {
-      name = "_sinonjs_samsam___samsam_3.3.3.tgz";
+      name = "_sinonjs_formatio___formatio_5.0.1.tgz";
       path = fetchurl {
-        name = "_sinonjs_samsam___samsam_3.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-3.3.3.tgz";
-        sha1 = "46682efd9967b259b81136b9f120fd54585feb4a";
+        name = "_sinonjs_formatio___formatio_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-5.0.1.tgz";
+        sha1 = "f13e713cb3313b1ab965901b01b0828ea6b77089";
+      };
+    }
+    {
+      name = "_sinonjs_samsam___samsam_5.2.0.tgz";
+      path = fetchurl {
+        name = "_sinonjs_samsam___samsam_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.2.0.tgz";
+        sha1 = "fcff83ab86f83b5498f4a967869c079408d9b5eb";
       };
     }
     {
@@ -1218,75 +1346,51 @@
       };
     }
     {
-      name = "_testing_library_react_hooks___react_hooks_3.2.1.tgz";
+      name = "_testing_library_react_hooks___react_hooks_3.4.2.tgz";
       path = fetchurl {
-        name = "_testing_library_react_hooks___react_hooks_3.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-3.2.1.tgz";
-        sha1 = "19b6caa048ef15faa69d439c469033873ea01294";
+        name = "_testing_library_react_hooks___react_hooks_3.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-3.4.2.tgz";
+        sha1 = "8deb94f7684e0d896edd84a4c90e5b79a0810bc2";
       };
     }
     {
-      name = "_types_babel__core___babel__core_7.1.6.tgz";
+      name = "_types_babel__core___babel__core_7.1.10.tgz";
       path = fetchurl {
-        name = "_types_babel__core___babel__core_7.1.6.tgz";
-        url  = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.6.tgz";
-        sha1 = "16ff42a5ae203c9af1c6e190ed1f30f83207b610";
+        name = "_types_babel__core___babel__core_7.1.10.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz";
+        sha1 = "ca58fc195dd9734e77e57c6f2df565623636ab40";
       };
     }
     {
-      name = "_types_babel__generator___babel__generator_7.6.1.tgz";
+      name = "_types_babel__generator___babel__generator_7.6.2.tgz";
       path = fetchurl {
-        name = "_types_babel__generator___babel__generator_7.6.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz";
-        sha1 = "4901767b397e8711aeb99df8d396d7ba7b7f0e04";
+        name = "_types_babel__generator___babel__generator_7.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz";
+        sha1 = "f3d71178e187858f7c45e30380f8f1b7415a12d8";
       };
     }
     {
-      name = "_types_babel__template___babel__template_7.0.2.tgz";
+      name = "_types_babel__template___babel__template_7.0.3.tgz";
       path = fetchurl {
-        name = "_types_babel__template___babel__template_7.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz";
-        sha1 = "4ff63d6b52eddac1de7b975a5223ed32ecea9307";
+        name = "_types_babel__template___babel__template_7.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.3.tgz";
+        sha1 = "b8aaeba0a45caca7b56a5de9459872dde3727214";
       };
     }
     {
-      name = "_types_babel__traverse___babel__traverse_7.0.9.tgz";
+      name = "_types_babel__traverse___babel__traverse_7.0.15.tgz";
       path = fetchurl {
-        name = "_types_babel__traverse___babel__traverse_7.0.9.tgz";
-        url  = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.9.tgz";
-        sha1 = "be82fab304b141c3eee81a4ce3b034d0eba1590a";
+        name = "_types_babel__traverse___babel__traverse_7.0.15.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz";
+        sha1 = "db9e4238931eb69ef8aab0ad6523d4d4caa39d03";
       };
     }
     {
-      name = "_types_cheerio___cheerio_0.22.17.tgz";
+      name = "_types_cheerio___cheerio_0.22.22.tgz";
       path = fetchurl {
-        name = "_types_cheerio___cheerio_0.22.17.tgz";
-        url  = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.17.tgz";
-        sha1 = "e54f71c3135f71ebc16c8dc62edad533872c9e72";
-      };
-    }
-    {
-      name = "_types_color_name___color_name_1.1.1.tgz";
-      path = fetchurl {
-        name = "_types_color_name___color_name_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz";
-        sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0";
-      };
-    }
-    {
-      name = "_types_domhandler___domhandler_2.4.1.tgz";
-      path = fetchurl {
-        name = "_types_domhandler___domhandler_2.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/domhandler/-/domhandler-2.4.1.tgz";
-        sha1 = "7b3b347f7762180fbcb1ece1ce3dd0ebbb8c64cf";
-      };
-    }
-    {
-      name = "_types_domutils___domutils_1.7.2.tgz";
-      path = fetchurl {
-        name = "_types_domutils___domutils_1.7.2.tgz";
-        url  = "https://registry.yarnpkg.com/@types/domutils/-/domutils-1.7.2.tgz";
-        sha1 = "89422e579c165994ad5c09ce90325da596cc105d";
+        name = "_types_cheerio___cheerio_0.22.22.tgz";
+        url  = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.22.tgz";
+        sha1 = "ae71cf4ca59b8bbaf34c99af7a5d6c8894988f5f";
       };
     }
     {
@@ -1298,11 +1402,11 @@
       };
     }
     {
-      name = "_types_enzyme___enzyme_3.10.5.tgz";
+      name = "_types_enzyme___enzyme_3.10.7.tgz";
       path = fetchurl {
-        name = "_types_enzyme___enzyme_3.10.5.tgz";
-        url  = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.5.tgz";
-        sha1 = "fe7eeba3550369eed20e7fb565bfb74eec44f1f0";
+        name = "_types_enzyme___enzyme_3.10.7.tgz";
+        url  = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.7.tgz";
+        sha1 = "ebdf3b972d293095e09af479e36c772025285e3a";
       };
     }
     {
@@ -1313,14 +1417,6 @@
         sha1 = "1ee30d79544ca84d68d4b3cdb0af4f205663dd2d";
       };
     }
-    {
-      name = "_types_events___events_3.0.0.tgz";
-      path = fetchurl {
-        name = "_types_events___events_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz";
-        sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7";
-      };
-    }
     {
       name = "_types_flot___flot_0.0.31.tgz";
       path = fetchurl {
@@ -1330,35 +1426,27 @@
       };
     }
     {
-      name = "_types_glob___glob_7.1.1.tgz";
+      name = "_types_glob___glob_7.1.3.tgz";
       path = fetchurl {
-        name = "_types_glob___glob_7.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz";
-        sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575";
+        name = "_types_glob___glob_7.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz";
+        sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183";
       };
     }
     {
-      name = "_types_history___history_4.7.5.tgz";
+      name = "_types_history___history_4.7.8.tgz";
       path = fetchurl {
-        name = "_types_history___history_4.7.5.tgz";
-        url  = "https://registry.yarnpkg.com/@types/history/-/history-4.7.5.tgz";
-        sha1 = "527d20ef68571a4af02ed74350164e7a67544860";
+        name = "_types_history___history_4.7.8.tgz";
+        url  = "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz";
+        sha1 = "49348387983075705fe8f4e02fb67f7daaec4934";
       };
     }
     {
-      name = "_types_htmlparser2___htmlparser2_3.10.1.tgz";
+      name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz";
       path = fetchurl {
-        name = "_types_htmlparser2___htmlparser2_3.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/htmlparser2/-/htmlparser2-3.10.1.tgz";
-        sha1 = "1e65ba81401d53f425c1e2ba5a3d05c90ab742c7";
-      };
-    }
-    {
-      name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz";
-      path = fetchurl {
-        name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz";
-        sha1 = "42995b446db9a48a11a07ec083499a860e9138ff";
+        name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz";
+        sha1 = "4ba8ddb720221f432e443bd5f9117fd22cfd4762";
       };
     }
     {
@@ -1370,35 +1458,43 @@
       };
     }
     {
-      name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz";
+      name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz";
       path = fetchurl {
-        name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz";
-        sha1 = "7a8cbf6a406f36c8add871625b278eaf0b0d255a";
+        name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz";
+        sha1 = "e875cc689e47bce549ec81f3df5e6f6f11cfaeb2";
       };
     }
     {
-      name = "_types_jest___jest_24.9.1.tgz";
+      name = "_types_jest___jest_26.0.14.tgz";
       path = fetchurl {
-        name = "_types_jest___jest_24.9.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/jest/-/jest-24.9.1.tgz";
-        sha1 = "02baf9573c78f1b9974a5f36778b366aa77bd534";
+        name = "_types_jest___jest_26.0.14.tgz";
+        url  = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz";
+        sha1 = "078695f8f65cb55c5a98450d65083b2b73e5a3f3";
       };
     }
     {
-      name = "_types_jquery___jquery_3.3.33.tgz";
+      name = "_types_jquery___jquery_3.5.2.tgz";
       path = fetchurl {
-        name = "_types_jquery___jquery_3.3.33.tgz";
-        url  = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.33.tgz";
-        sha1 = "61d9cbd4004ffcdf6cf7e34720a87a5625a7d8e9";
+        name = "_types_jquery___jquery_3.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.2.tgz";
+        sha1 = "e17c1756ecf7bbb431766c6761674a5d1de16579";
       };
     }
     {
-      name = "_types_json_schema___json_schema_7.0.4.tgz";
+      name = "_types_json_schema___json_schema_7.0.6.tgz";
       path = fetchurl {
-        name = "_types_json_schema___json_schema_7.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz";
-        sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339";
+        name = "_types_json_schema___json_schema_7.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz";
+        sha1 = "f4c7ec43e81b319a9815115031709f26987891f0";
+      };
+    }
+    {
+      name = "_types_json5___json5_0.0.29.tgz";
+      path = fetchurl {
+        name = "_types_json5___json5_0.0.29.tgz";
+        url  = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz";
+        sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee";
       };
     }
     {
@@ -1410,27 +1506,27 @@
       };
     }
     {
-      name = "_types_moment_timezone___moment_timezone_0.5.12.tgz";
+      name = "_types_moment_timezone___moment_timezone_0.5.30.tgz";
       path = fetchurl {
-        name = "_types_moment_timezone___moment_timezone_0.5.12.tgz";
-        url  = "https://registry.yarnpkg.com/@types/moment-timezone/-/moment-timezone-0.5.12.tgz";
-        sha1 = "0fb680c03db194fe8ff4551eaeb1eec8d3d80e9f";
+        name = "_types_moment_timezone___moment_timezone_0.5.30.tgz";
+        url  = "https://registry.yarnpkg.com/@types/moment-timezone/-/moment-timezone-0.5.30.tgz";
+        sha1 = "340ed45fe3e715f4a011f5cfceb7cb52aad46fc7";
       };
     }
     {
-      name = "_types_node___node_13.9.2.tgz";
+      name = "_types_node___node_14.11.5.tgz";
       path = fetchurl {
-        name = "_types_node___node_13.9.2.tgz";
-        url  = "https://registry.yarnpkg.com/@types/node/-/node-13.9.2.tgz";
-        sha1 = "ace1880c03594cc3e80206d96847157d8e7fa349";
+        name = "_types_node___node_14.11.5.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-14.11.5.tgz";
+        sha1 = "fecad41c041cae7f2404ad4b2d0742fdb628b305";
       };
     }
     {
-      name = "_types_node___node_12.12.30.tgz";
+      name = "_types_node___node_12.12.64.tgz";
       path = fetchurl {
-        name = "_types_node___node_12.12.30.tgz";
-        url  = "https://registry.yarnpkg.com/@types/node/-/node-12.12.30.tgz";
-        sha1 = "3501e6f09b954de9c404671cefdbcc5d9d7c45f6";
+        name = "_types_node___node_12.12.64.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-12.12.64.tgz";
+        sha1 = "e3b336dc4c6ba52c6b59e3bd69a100347c20b1c0";
       };
     }
     {
@@ -1450,19 +1546,19 @@
       };
     }
     {
-      name = "_types_q___q_1.5.2.tgz";
+      name = "_types_q___q_1.5.4.tgz";
       path = fetchurl {
-        name = "_types_q___q_1.5.2.tgz";
-        url  = "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz";
-        sha1 = "690a1475b84f2a884fd07cd797c00f5f31356ea8";
+        name = "_types_q___q_1.5.4.tgz";
+        url  = "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz";
+        sha1 = "15925414e0ad2cd765bfef58842f7e26a7accb24";
       };
     }
     {
-      name = "_types_reach__router___reach__router_1.3.1.tgz";
+      name = "_types_reach__router___reach__router_1.3.6.tgz";
       path = fetchurl {
-        name = "_types_reach__router___reach__router_1.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.1.tgz";
-        sha1 = "ca8b431acb12bb897d2b806f6fdd815f056d6d02";
+        name = "_types_reach__router___reach__router_1.3.6.tgz";
+        url  = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.6.tgz";
+        sha1 = "413417ce74caab331c70ce6a03a4c825188e4709";
       };
     }
     {
@@ -1474,11 +1570,11 @@
       };
     }
     {
-      name = "_types_react_dom___react_dom_16.9.5.tgz";
+      name = "_types_react_dom___react_dom_16.9.8.tgz";
       path = fetchurl {
-        name = "_types_react_dom___react_dom_16.9.5.tgz";
-        url  = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.5.tgz";
-        sha1 = "5de610b04a35d07ffd8f44edad93a71032d9aaa7";
+        name = "_types_react_dom___react_dom_16.9.8.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz";
+        sha1 = "fe4c1e11dfc67155733dfa6aa65108b4971cb423";
       };
     }
     {
@@ -1490,43 +1586,51 @@
       };
     }
     {
-      name = "_types_react_test_renderer___react_test_renderer_16.9.2.tgz";
+      name = "_types_react_test_renderer___react_test_renderer_16.9.3.tgz";
       path = fetchurl {
-        name = "_types_react_test_renderer___react_test_renderer_16.9.2.tgz";
-        url  = "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-16.9.2.tgz";
-        sha1 = "e1c408831e8183e5ad748fdece02214a7c2ab6c5";
+        name = "_types_react_test_renderer___react_test_renderer_16.9.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-16.9.3.tgz";
+        sha1 = "96bab1860904366f4e848b739ba0e2f67bcae87e";
       };
     }
     {
-      name = "_types_react___react_16.9.25.tgz";
+      name = "_types_react___react_16.9.51.tgz";
       path = fetchurl {
-        name = "_types_react___react_16.9.25.tgz";
-        url  = "https://registry.yarnpkg.com/@types/react/-/react-16.9.25.tgz";
-        sha1 = "6ae2159b40138c792058a23c3c04fd3db49e929e";
+        name = "_types_react___react_16.9.51.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react/-/react-16.9.51.tgz";
+        sha1 = "f8aa51ffa9996f1387f63686696d9b59713d2b60";
       };
     }
     {
-      name = "_types_reactstrap___reactstrap_8.4.2.tgz";
+      name = "_types_reactstrap___reactstrap_8.5.1.tgz";
       path = fetchurl {
-        name = "_types_reactstrap___reactstrap_8.4.2.tgz";
-        url  = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.4.2.tgz";
-        sha1 = "e7066d0e67e2924dab0a52c6aedcf922f2be53b6";
+        name = "_types_reactstrap___reactstrap_8.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.5.1.tgz";
+        sha1 = "bd01ed7b14b9aeb476c0b8e195443dda98ac6156";
       };
     }
     {
-      name = "_types_sanitize_html___sanitize_html_1.22.0.tgz";
+      name = "_types_sanitize_html___sanitize_html_1.27.0.tgz";
       path = fetchurl {
-        name = "_types_sanitize_html___sanitize_html_1.22.0.tgz";
-        url  = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.22.0.tgz";
-        sha1 = "9bf3a13aeab6e38d130d8ba34bb443956b75bc3d";
+        name = "_types_sanitize_html___sanitize_html_1.27.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.27.0.tgz";
+        sha1 = "77702dc856f16efecc005014c1d2e45b1f2cbc56";
       };
     }
     {
-      name = "_types_sinon___sinon_7.5.2.tgz";
+      name = "_types_sinon___sinon_9.0.8.tgz";
       path = fetchurl {
-        name = "_types_sinon___sinon_7.5.2.tgz";
-        url  = "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.2.tgz";
-        sha1 = "5e2f1d120f07b9cda07e5dedd4f3bf8888fccdb9";
+        name = "_types_sinon___sinon_9.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.8.tgz";
+        sha1 = "1ed0038d356784f75b086104ef83bfd4130bb81b";
+      };
+    }
+    {
+      name = "_types_sinonjs__fake_timers___sinonjs__fake_timers_6.0.2.tgz";
+      path = fetchurl {
+        name = "_types_sinonjs__fake_timers___sinonjs__fake_timers_6.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz";
+        sha1 = "3a84cf5ec3249439015e14049bd3161419bf9eae";
       };
     }
     {
@@ -1546,11 +1650,11 @@
       };
     }
     {
-      name = "_types_testing_library__react_hooks___testing_library__react_hooks_3.2.0.tgz";
+      name = "_types_testing_library__react_hooks___testing_library__react_hooks_3.4.1.tgz";
       path = fetchurl {
-        name = "_types_testing_library__react_hooks___testing_library__react_hooks_3.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@types/testing-library__react-hooks/-/testing-library__react-hooks-3.2.0.tgz";
-        sha1 = "52f3a109bef06080e3b1e3ae7ea1c014ce859897";
+        name = "_types_testing_library__react_hooks___testing_library__react_hooks_3.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/testing-library__react-hooks/-/testing-library__react-hooks-3.4.1.tgz";
+        sha1 = "b8d7311c6c1f7db3103e94095fe901f8fef6e433";
       };
     }
     {
@@ -1562,43 +1666,51 @@
       };
     }
     {
-      name = "_types_yargs___yargs_13.0.8.tgz";
+      name = "_types_yargs___yargs_13.0.11.tgz";
       path = fetchurl {
-        name = "_types_yargs___yargs_13.0.8.tgz";
-        url  = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz";
-        sha1 = "a38c22def2f1c2068f8971acb3ea734eb3c64a99";
+        name = "_types_yargs___yargs_13.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.11.tgz";
+        sha1 = "def2f0c93e4bdf2c61d7e34899b17e34be28d3b1";
       };
     }
     {
-      name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.24.0.tgz";
+      name = "_types_yargs___yargs_15.0.7.tgz";
       path = fetchurl {
-        name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.24.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.24.0.tgz";
-        sha1 = "a86cf618c965a462cddf3601f594544b134d6d68";
+        name = "_types_yargs___yargs_15.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.7.tgz";
+        sha1 = "dad50a7a234a35ef9460737a56024287a3de1d2b";
       };
     }
     {
-      name = "_typescript_eslint_experimental_utils___experimental_utils_2.24.0.tgz";
+      name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.34.0.tgz";
       path = fetchurl {
-        name = "_typescript_eslint_experimental_utils___experimental_utils_2.24.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz";
-        sha1 = "a5cb2ed89fedf8b59638dc83484eb0c8c35e1143";
+        name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.34.0.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz";
+        sha1 = "6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9";
       };
     }
     {
-      name = "_typescript_eslint_parser___parser_2.24.0.tgz";
+      name = "_typescript_eslint_experimental_utils___experimental_utils_2.34.0.tgz";
       path = fetchurl {
-        name = "_typescript_eslint_parser___parser_2.24.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.24.0.tgz";
-        sha1 = "2cf0eae6e6dd44d162486ad949c126b887f11eb8";
+        name = "_typescript_eslint_experimental_utils___experimental_utils_2.34.0.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz";
+        sha1 = "d3524b644cdb40eebceca67f8cf3e4cc9c8f980f";
       };
     }
     {
-      name = "_typescript_eslint_typescript_estree___typescript_estree_2.24.0.tgz";
+      name = "_typescript_eslint_parser___parser_2.34.0.tgz";
       path = fetchurl {
-        name = "_typescript_eslint_typescript_estree___typescript_estree_2.24.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz";
-        sha1 = "38bbc8bb479790d2f324797ffbcdb346d897c62a";
+        name = "_typescript_eslint_parser___parser_2.34.0.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz";
+        sha1 = "50252630ca319685420e9a39ca05fe185a256bc8";
+      };
+    }
+    {
+      name = "_typescript_eslint_typescript_estree___typescript_estree_2.34.0.tgz";
+      path = fetchurl {
+        name = "_typescript_eslint_typescript_estree___typescript_estree_2.34.0.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz";
+        sha1 = "14aeb6353b39ef0732cc7f1b8285294937cf37d5";
       };
     }
     {
@@ -1762,11 +1874,11 @@
       };
     }
     {
-      name = "abab___abab_2.0.3.tgz";
+      name = "abab___abab_2.0.5.tgz";
       path = fetchurl {
-        name = "abab___abab_2.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz";
-        sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a";
+        name = "abab___abab_2.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz";
+        sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a";
       };
     }
     {
@@ -1786,11 +1898,19 @@
       };
     }
     {
-      name = "acorn_jsx___acorn_jsx_5.2.0.tgz";
+      name = "acorn_globals___acorn_globals_6.0.0.tgz";
       path = fetchurl {
-        name = "acorn_jsx___acorn_jsx_5.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz";
-        sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe";
+        name = "acorn_globals___acorn_globals_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz";
+        sha1 = "46cdd39f0f8ff08a876619b55f5ac8a6dc770b45";
+      };
+    }
+    {
+      name = "acorn_jsx___acorn_jsx_5.3.1.tgz";
+      path = fetchurl {
+        name = "acorn_jsx___acorn_jsx_5.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz";
+        sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b";
       };
     }
     {
@@ -1801,6 +1921,14 @@
         sha1 = "123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c";
       };
     }
+    {
+      name = "acorn_walk___acorn_walk_7.2.0.tgz";
+      path = fetchurl {
+        name = "acorn_walk___acorn_walk_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz";
+        sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc";
+      };
+    }
     {
       name = "acorn___acorn_5.7.4.tgz";
       path = fetchurl {
@@ -1810,19 +1938,19 @@
       };
     }
     {
-      name = "acorn___acorn_6.4.1.tgz";
+      name = "acorn___acorn_6.4.2.tgz";
       path = fetchurl {
-        name = "acorn___acorn_6.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz";
-        sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474";
+        name = "acorn___acorn_6.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz";
+        sha1 = "35866fd710528e92de10cf06016498e47e39e1e6";
       };
     }
     {
-      name = "acorn___acorn_7.1.1.tgz";
+      name = "acorn___acorn_7.4.1.tgz";
       path = fetchurl {
-        name = "acorn___acorn_7.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz";
-        sha1 = "e35668de0b402f359de515c5482a1ab9f89a69bf";
+        name = "acorn___acorn_7.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz";
+        sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa";
       };
     }
     {
@@ -1842,19 +1970,19 @@
       };
     }
     {
-      name = "aggregate_error___aggregate_error_3.0.1.tgz";
+      name = "aggregate_error___aggregate_error_3.1.0.tgz";
       path = fetchurl {
-        name = "aggregate_error___aggregate_error_3.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz";
-        sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0";
+        name = "aggregate_error___aggregate_error_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz";
+        sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a";
       };
     }
     {
-      name = "airbnb_prop_types___airbnb_prop_types_2.15.0.tgz";
+      name = "airbnb_prop_types___airbnb_prop_types_2.16.0.tgz";
       path = fetchurl {
-        name = "airbnb_prop_types___airbnb_prop_types_2.15.0.tgz";
-        url  = "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.15.0.tgz";
-        sha1 = "5287820043af1eb469f5b0af0d6f70da6c52aaef";
+        name = "airbnb_prop_types___airbnb_prop_types_2.16.0.tgz";
+        url  = "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz";
+        sha1 = "b96274cefa1abb14f623f804173ee97c13971dc2";
       };
     }
     {
@@ -1866,19 +1994,19 @@
       };
     }
     {
-      name = "ajv_keywords___ajv_keywords_3.4.1.tgz";
+      name = "ajv_keywords___ajv_keywords_3.5.2.tgz";
       path = fetchurl {
-        name = "ajv_keywords___ajv_keywords_3.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz";
-        sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da";
+        name = "ajv_keywords___ajv_keywords_3.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz";
+        sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d";
       };
     }
     {
-      name = "ajv___ajv_6.12.0.tgz";
+      name = "ajv___ajv_6.12.5.tgz";
       path = fetchurl {
-        name = "ajv___ajv_6.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz";
-        sha1 = "06d60b96d87b8454a5adaba86e7854da629db4b7";
+        name = "ajv___ajv_6.12.5.tgz";
+        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz";
+        sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da";
       };
     }
     {
@@ -1970,11 +2098,11 @@
       };
     }
     {
-      name = "ansi_styles___ansi_styles_4.2.1.tgz";
+      name = "ansi_styles___ansi_styles_4.3.0.tgz";
       path = fetchurl {
-        name = "ansi_styles___ansi_styles_4.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz";
-        sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359";
+        name = "ansi_styles___ansi_styles_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz";
+        sha1 = "edd803628ae71c04c85ae7a0906edad34b648937";
       };
     }
     {
@@ -2017,6 +2145,14 @@
         sha1 = "65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc";
       };
     }
+    {
+      name = "aria_query___aria_query_4.2.2.tgz";
+      path = fetchurl {
+        name = "aria_query___aria_query_4.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz";
+        sha1 = "0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b";
+      };
+    }
     {
       name = "arity_n___arity_n_1.0.4.tgz";
       path = fetchurl {
@@ -2081,14 +2217,6 @@
         sha1 = "24ef80a28c1a893617e2149b0c6d0d788293b099";
       };
     }
-    {
-      name = "array_from___array_from_2.1.1.tgz";
-      path = fetchurl {
-        name = "array_from___array_from_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz";
-        sha1 = "cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195";
-      };
-    }
     {
       name = "array_includes___array_includes_3.1.1.tgz";
       path = fetchurl {
@@ -2137,6 +2265,14 @@
         sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b";
       };
     }
+    {
+      name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz";
+      path = fetchurl {
+        name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz";
+        sha1 = "1c13f84a178566042dd63de4414440db9222e443";
+      };
+    }
     {
       name = "arrify___arrify_1.0.1.tgz";
       path = fetchurl {
@@ -2154,11 +2290,11 @@
       };
     }
     {
-      name = "asn1.js___asn1.js_4.10.1.tgz";
+      name = "asn1.js___asn1.js_5.4.1.tgz";
       path = fetchurl {
-        name = "asn1.js___asn1.js_4.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz";
-        sha1 = "b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0";
+        name = "asn1.js___asn1.js_5.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz";
+        sha1 = "11a980b84ebb91781ce35b0fdc2ee294e3783f07";
       };
     }
     {
@@ -2258,11 +2394,11 @@
       };
     }
     {
-      name = "autoprefixer___autoprefixer_9.7.4.tgz";
+      name = "autoprefixer___autoprefixer_9.8.6.tgz";
       path = fetchurl {
-        name = "autoprefixer___autoprefixer_9.7.4.tgz";
-        url  = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz";
-        sha1 = "f8bf3e06707d047f0641d87aee8cfb174b2a5378";
+        name = "autoprefixer___autoprefixer_9.8.6.tgz";
+        url  = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz";
+        sha1 = "3b73594ca1bf9266320c5acf1588d74dea74210f";
       };
     }
     {
@@ -2274,19 +2410,27 @@
       };
     }
     {
-      name = "aws4___aws4_1.9.1.tgz";
+      name = "aws4___aws4_1.10.1.tgz";
       path = fetchurl {
-        name = "aws4___aws4_1.9.1.tgz";
-        url  = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz";
-        sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e";
+        name = "aws4___aws4_1.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz";
+        sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428";
       };
     }
     {
-      name = "axobject_query___axobject_query_2.1.2.tgz";
+      name = "axe_core___axe_core_3.5.5.tgz";
       path = fetchurl {
-        name = "axobject_query___axobject_query_2.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz";
-        sha1 = "2bdffc0371e643e5f03ba99065d5179b9ca79799";
+        name = "axe_core___axe_core_3.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/axe-core/-/axe-core-3.5.5.tgz";
+        sha1 = "84315073b53fa3c0c51676c588d59da09a192227";
+      };
+    }
+    {
+      name = "axobject_query___axobject_query_2.2.0.tgz";
+      path = fetchurl {
+        name = "axobject_query___axobject_query_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz";
+        sha1 = "943d47e10c0b704aa42275e20edf3722648989be";
       };
     }
     {
@@ -2298,11 +2442,11 @@
       };
     }
     {
-      name = "babel_eslint___babel_eslint_10.0.3.tgz";
+      name = "babel_eslint___babel_eslint_10.1.0.tgz";
       path = fetchurl {
-        name = "babel_eslint___babel_eslint_10.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz";
-        sha1 = "81a2c669be0f205e19462fed2482d33e4687a88a";
+        name = "babel_eslint___babel_eslint_10.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz";
+        sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232";
       };
     }
     {
@@ -2322,19 +2466,19 @@
       };
     }
     {
-      name = "babel_loader___babel_loader_8.0.6.tgz";
+      name = "babel_loader___babel_loader_8.1.0.tgz";
       path = fetchurl {
-        name = "babel_loader___babel_loader_8.0.6.tgz";
-        url  = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz";
-        sha1 = "e33bdb6f362b03f4bb141a0c21ab87c501b70dfb";
+        name = "babel_loader___babel_loader_8.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz";
+        sha1 = "c611d5112bd5209abe8b9fa84c3e4da25275f1c3";
       };
     }
     {
-      name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz";
+      name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz";
       path = fetchurl {
-        name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz";
-        sha1 = "f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f";
+        name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz";
+        sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3";
       };
     }
     {
@@ -2482,11 +2626,11 @@
       };
     }
     {
-      name = "binary_extensions___binary_extensions_2.0.0.tgz";
+      name = "binary_extensions___binary_extensions_2.1.0.tgz";
       path = fetchurl {
-        name = "binary_extensions___binary_extensions_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz";
-        sha1 = "23c0df14f6a88077f5f986c0d167ec03c3d5537c";
+        name = "binary_extensions___binary_extensions_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz";
+        sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9";
       };
     }
     {
@@ -2506,11 +2650,19 @@
       };
     }
     {
-      name = "bn.js___bn.js_4.11.8.tgz";
+      name = "bn.js___bn.js_4.11.9.tgz";
       path = fetchurl {
-        name = "bn.js___bn.js_4.11.8.tgz";
-        url  = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz";
-        sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f";
+        name = "bn.js___bn.js_4.11.9.tgz";
+        url  = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz";
+        sha1 = "26d556829458f9d1e81fc48952493d0ba3507828";
+      };
+    }
+    {
+      name = "bn.js___bn.js_5.1.3.tgz";
+      path = fetchurl {
+        name = "bn.js___bn.js_5.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz";
+        sha1 = "beca005408f642ebebea80b042b4d18d2ac0ee6b";
       };
     }
     {
@@ -2538,11 +2690,11 @@
       };
     }
     {
-      name = "bootstrap___bootstrap_4.4.1.tgz";
+      name = "bootstrap___bootstrap_4.5.2.tgz";
       path = fetchurl {
-        name = "bootstrap___bootstrap_4.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz";
-        sha1 = "8582960eea0c5cd2bede84d8b0baf3789c3e8b01";
+        name = "bootstrap___bootstrap_4.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.2.tgz";
+        sha1 = "a85c4eda59155f0d71186b6e6ad9b875813779ab";
       };
     }
     {
@@ -2626,11 +2778,11 @@
       };
     }
     {
-      name = "browserify_sign___browserify_sign_4.0.4.tgz";
+      name = "browserify_sign___browserify_sign_4.2.1.tgz";
       path = fetchurl {
-        name = "browserify_sign___browserify_sign_4.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz";
-        sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
+        name = "browserify_sign___browserify_sign_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz";
+        sha1 = "eaf4add46dd54be3bb3b36c0cf15abbeba7956c3";
       };
     }
     {
@@ -2649,6 +2801,14 @@
         sha1 = "f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9";
       };
     }
+    {
+      name = "browserslist___browserslist_4.14.5.tgz";
+      path = fetchurl {
+        name = "browserslist___browserslist_4.14.5.tgz";
+        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz";
+        sha1 = "1c751461a102ddc60e40993639b709be7f2c4015";
+      };
+    }
     {
       name = "bser___bser_2.1.1.tgz";
       path = fetchurl {
@@ -2714,11 +2874,11 @@
       };
     }
     {
-      name = "cacache___cacache_12.0.3.tgz";
+      name = "cacache___cacache_12.0.4.tgz";
       path = fetchurl {
-        name = "cacache___cacache_12.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz";
-        sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390";
+        name = "cacache___cacache_12.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz";
+        sha1 = "668bcbd105aeb5f1d92fe25570ec9525c8faa40c";
       };
     }
     {
@@ -2810,11 +2970,11 @@
       };
     }
     {
-      name = "caniuse_lite___caniuse_lite_1.0.30001035.tgz";
+      name = "caniuse_lite___caniuse_lite_1.0.30001146.tgz";
       path = fetchurl {
-        name = "caniuse_lite___caniuse_lite_1.0.30001035.tgz";
-        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz";
-        sha1 = "2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e";
+        name = "caniuse_lite___caniuse_lite_1.0.30001146.tgz";
+        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001146.tgz";
+        sha1 = "c61fcb1474520c1462913689201fb292ba6f447c";
       };
     }
     {
@@ -2865,6 +3025,14 @@
         sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4";
       };
     }
+    {
+      name = "chalk___chalk_4.1.0.tgz";
+      path = fetchurl {
+        name = "chalk___chalk_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz";
+        sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a";
+      };
+    }
     {
       name = "chardet___chardet_0.7.0.tgz";
       path = fetchurl {
@@ -2890,11 +3058,11 @@
       };
     }
     {
-      name = "chokidar___chokidar_3.3.1.tgz";
+      name = "chokidar___chokidar_3.4.2.tgz";
       path = fetchurl {
-        name = "chokidar___chokidar_3.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz";
-        sha1 = "c84e5b3d18d9a4d77558fef466b1bf16bbeb3450";
+        name = "chokidar___chokidar_3.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz";
+        sha1 = "38dc8e658dec3809741eb3ef7bb0a47fe424232d";
       };
     }
     {
@@ -2970,19 +3138,19 @@
       };
     }
     {
-      name = "cli_width___cli_width_2.2.0.tgz";
+      name = "cli_width___cli_width_2.2.1.tgz";
       path = fetchurl {
-        name = "cli_width___cli_width_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz";
-        sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639";
+        name = "cli_width___cli_width_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz";
+        sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48";
       };
     }
     {
-      name = "cliui___cliui_4.1.0.tgz";
+      name = "cli_width___cli_width_3.0.0.tgz";
       path = fetchurl {
-        name = "cliui___cliui_4.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz";
-        sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49";
+        name = "cli_width___cli_width_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz";
+        sha1 = "a2f48437a2caa9a22436e794bf071ec9e61cedf6";
       };
     }
     {
@@ -3025,14 +3193,6 @@
         sha1 = "43f6c21151b4ef2bf57187db0d73de229e3e7ec3";
       };
     }
-    {
-      name = "code_point_at___code_point_at_1.1.0.tgz";
-      path = fetchurl {
-        name = "code_point_at___code_point_at_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz";
-        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
-      };
-    }
     {
       name = "collection_visit___collection_visit_1.0.0.tgz";
       path = fetchurl {
@@ -3089,6 +3249,14 @@
         sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10";
       };
     }
+    {
+      name = "colorette___colorette_1.2.1.tgz";
+      path = fetchurl {
+        name = "colorette___colorette_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz";
+        sha1 = "4d0b921325c14faf92633086a536db6e89564b1b";
+      };
+    }
     {
       name = "combined_stream___combined_stream_1.0.8.tgz";
       path = fetchurl {
@@ -3162,11 +3330,11 @@
       };
     }
     {
-      name = "compute_scroll_into_view___compute_scroll_into_view_1.0.13.tgz";
+      name = "compute_scroll_into_view___compute_scroll_into_view_1.0.16.tgz";
       path = fetchurl {
-        name = "compute_scroll_into_view___compute_scroll_into_view_1.0.13.tgz";
-        url  = "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.13.tgz";
-        sha1 = "be1b1663b0e3f56cd5f7713082549f562a3477e2";
+        name = "compute_scroll_into_view___compute_scroll_into_view_1.0.16.tgz";
+        url  = "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz";
+        sha1 = "5b7bf4f7127ea2c19b750353d7ce6776a90ee088";
       };
     }
     {
@@ -3298,19 +3466,19 @@
       };
     }
     {
-      name = "core_js_compat___core_js_compat_3.6.4.tgz";
+      name = "core_js_compat___core_js_compat_3.6.5.tgz";
       path = fetchurl {
-        name = "core_js_compat___core_js_compat_3.6.4.tgz";
-        url  = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz";
-        sha1 = "938476569ebb6cda80d339bcf199fae4f16fff17";
+        name = "core_js_compat___core_js_compat_3.6.5.tgz";
+        url  = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz";
+        sha1 = "2a51d9a4e25dfd6e690251aa81f99e3c05481f1c";
       };
     }
     {
-      name = "core_js_pure___core_js_pure_3.6.4.tgz";
+      name = "core_js_pure___core_js_pure_3.6.5.tgz";
       path = fetchurl {
-        name = "core_js_pure___core_js_pure_3.6.4.tgz";
-        url  = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz";
-        sha1 = "4bf1ba866e25814f149d4e9aaa08c36173506e3a";
+        name = "core_js_pure___core_js_pure_3.6.5.tgz";
+        url  = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz";
+        sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813";
       };
     }
     {
@@ -3322,11 +3490,11 @@
       };
     }
     {
-      name = "core_js___core_js_3.6.4.tgz";
+      name = "core_js___core_js_3.6.5.tgz";
       path = fetchurl {
-        name = "core_js___core_js_3.6.4.tgz";
-        url  = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz";
-        sha1 = "440a83536b458114b9cb2ac1580ba377dc470647";
+        name = "core_js___core_js_3.6.5.tgz";
+        url  = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz";
+        sha1 = "7395dc273af37fb2e50e9bd3d9fe841285231d1a";
       };
     }
     {
@@ -3354,11 +3522,11 @@
       };
     }
     {
-      name = "create_ecdh___create_ecdh_4.0.3.tgz";
+      name = "create_ecdh___create_ecdh_4.0.4.tgz";
       path = fetchurl {
-        name = "create_ecdh___create_ecdh_4.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz";
-        sha1 = "c9111b6f33045c4697f144787f9254cdc77c45ff";
+        name = "create_ecdh___create_ecdh_4.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz";
+        sha1 = "d6e7f4bffa66736085a0762fd3a632684dabcc4e";
       };
     }
     {
@@ -3386,11 +3554,11 @@
       };
     }
     {
-      name = "cross_fetch___cross_fetch_2.2.3.tgz";
+      name = "cross_fetch___cross_fetch_3.0.6.tgz";
       path = fetchurl {
-        name = "cross_fetch___cross_fetch_2.2.3.tgz";
-        url  = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.3.tgz";
-        sha1 = "e8a0b3c54598136e037f8650f8e823ccdfac198e";
+        name = "cross_fetch___cross_fetch_3.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz";
+        sha1 = "3a4040bc8941e653e0e9cf17f29ebcd177d3365c";
       };
     }
     {
@@ -3497,6 +3665,14 @@
         sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22";
       };
     }
+    {
+      name = "css_tree___css_tree_1.0.0_alpha.39.tgz";
+      path = fetchurl {
+        name = "css_tree___css_tree_1.0.0_alpha.39.tgz";
+        url  = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz";
+        sha1 = "2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb";
+      };
+    }
     {
       name = "css_what___css_what_2.1.3.tgz";
       path = fetchurl {
@@ -3506,11 +3682,11 @@
       };
     }
     {
-      name = "css_what___css_what_3.2.1.tgz";
+      name = "css_what___css_what_3.4.1.tgz";
       path = fetchurl {
-        name = "css_what___css_what_3.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz";
-        sha1 = "f4a8f12421064621b456755e34a03a2c22df5da1";
+        name = "css_what___css_what_3.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.1.tgz";
+        sha1 = "81cb70b609e4b1351b1e54cbc90fd9c54af86e2e";
       };
     }
     {
@@ -3602,11 +3778,11 @@
       };
     }
     {
-      name = "csso___csso_4.0.2.tgz";
+      name = "csso___csso_4.0.3.tgz";
       path = fetchurl {
-        name = "csso___csso_4.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz";
-        sha1 = "e5f81ab3a56b8eefb7f0092ce7279329f454de3d";
+        name = "csso___csso_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz";
+        sha1 = "0d9985dc852c7cc2b2cacfbbe1079014d1a8e903";
       };
     }
     {
@@ -3634,19 +3810,19 @@
       };
     }
     {
-      name = "cssstyle___cssstyle_2.2.0.tgz";
+      name = "cssstyle___cssstyle_2.3.0.tgz";
       path = fetchurl {
-        name = "cssstyle___cssstyle_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.2.0.tgz";
-        sha1 = "e4c44debccd6b7911ed617a4395e5754bba59992";
+        name = "cssstyle___cssstyle_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz";
+        sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852";
       };
     }
     {
-      name = "csstype___csstype_2.6.9.tgz";
+      name = "csstype___csstype_3.0.3.tgz";
       path = fetchurl {
-        name = "csstype___csstype_2.6.9.tgz";
-        url  = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz";
-        sha1 = "05141d0cd557a56b8891394c1911c40c8a98d098";
+        name = "csstype___csstype_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz";
+        sha1 = "2b410bbeba38ba9633353aff34b05d9755d065f8";
       };
     }
     {
@@ -3689,6 +3865,14 @@
         sha1 = "15ee0582baa5e22bb59c77140da8f9c76963bbfe";
       };
     }
+    {
+      name = "data_urls___data_urls_2.0.0.tgz";
+      path = fetchurl {
+        name = "data_urls___data_urls_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz";
+        sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b";
+      };
+    }
     {
       name = "debug___debug_2.6.9.tgz";
       path = fetchurl {
@@ -3706,11 +3890,11 @@
       };
     }
     {
-      name = "debug___debug_4.1.1.tgz";
+      name = "debug___debug_4.2.0.tgz";
       path = fetchurl {
-        name = "debug___debug_4.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz";
-        sha1 = "3b72260255109c6b589cee050f1d516139664791";
+        name = "debug___debug_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz";
+        sha1 = "7f150f93920e94c58f5574c2fd01a3110effe7f1";
       };
     }
     {
@@ -3721,6 +3905,14 @@
         sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
       };
     }
+    {
+      name = "decimal.js___decimal.js_10.2.1.tgz";
+      path = fetchurl {
+        name = "decimal.js___decimal.js_10.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz";
+        sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3";
+      };
+    }
     {
       name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
       path = fetchurl {
@@ -3858,11 +4050,19 @@
       };
     }
     {
-      name = "diff___diff_3.5.0.tgz";
+      name = "diff_sequences___diff_sequences_25.2.6.tgz";
       path = fetchurl {
-        name = "diff___diff_3.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz";
-        sha1 = "800c0dd1e0a8bfbc95835c202ad220fe317e5a12";
+        name = "diff_sequences___diff_sequences_25.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz";
+        sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd";
+      };
+    }
+    {
+      name = "diff___diff_4.0.2.tgz";
+      path = fetchurl {
+        name = "diff___diff_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz";
+        sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d";
       };
     }
     {
@@ -3961,6 +4161,14 @@
         sha1 = "1afb81f533717175d478655debc5e332d9f9bb51";
       };
     }
+    {
+      name = "dom_serializer___dom_serializer_1.1.0.tgz";
+      path = fetchurl {
+        name = "dom_serializer___dom_serializer_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.1.0.tgz";
+        sha1 = "5f7c828f1bfc44887dc2a315ab5c45691d544b58";
+      };
+    }
     {
       name = "dom_serializer___dom_serializer_0.1.1.tgz";
       path = fetchurl {
@@ -3986,11 +4194,11 @@
       };
     }
     {
-      name = "domelementtype___domelementtype_2.0.1.tgz";
+      name = "domelementtype___domelementtype_2.0.2.tgz";
       path = fetchurl {
-        name = "domelementtype___domelementtype_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz";
-        sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d";
+        name = "domelementtype___domelementtype_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz";
+        sha1 = "f3b6e549201e46f588b59463dd77187131fe6971";
       };
     }
     {
@@ -4001,6 +4209,14 @@
         sha1 = "937442644ca6a31261ef36e3ec677fe805582c90";
       };
     }
+    {
+      name = "domexception___domexception_2.0.1.tgz";
+      path = fetchurl {
+        name = "domexception___domexception_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz";
+        sha1 = "fb44aefba793e1574b0af6aed2801d057529f304";
+      };
+    }
     {
       name = "domhandler___domhandler_2.4.2.tgz";
       path = fetchurl {
@@ -4010,11 +4226,11 @@
       };
     }
     {
-      name = "domhandler___domhandler_3.0.0.tgz";
+      name = "domhandler___domhandler_3.3.0.tgz";
       path = fetchurl {
-        name = "domhandler___domhandler_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/domhandler/-/domhandler-3.0.0.tgz";
-        sha1 = "51cd13efca31da95bbb0c5bee3a48300e333b3e9";
+        name = "domhandler___domhandler_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz";
+        sha1 = "6db7ea46e4617eb15cf875df68b2b8524ce0037a";
       };
     }
     {
@@ -4034,11 +4250,11 @@
       };
     }
     {
-      name = "domutils___domutils_2.0.0.tgz";
+      name = "domutils___domutils_2.4.2.tgz";
       path = fetchurl {
-        name = "domutils___domutils_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz";
-        sha1 = "15b8278e37bfa8468d157478c58c367718133c08";
+        name = "domutils___domutils_2.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/domutils/-/domutils-2.4.2.tgz";
+        sha1 = "7ee5be261944e1ad487d9aa0616720010123922b";
       };
     }
     {
@@ -4050,11 +4266,11 @@
       };
     }
     {
-      name = "dot_prop___dot_prop_5.2.0.tgz";
+      name = "dot_prop___dot_prop_5.3.0.tgz";
       path = fetchurl {
-        name = "dot_prop___dot_prop_5.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz";
-        sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb";
+        name = "dot_prop___dot_prop_5.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz";
+        sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88";
       };
     }
     {
@@ -4082,11 +4298,11 @@
       };
     }
     {
-      name = "duplexer___duplexer_0.1.1.tgz";
+      name = "duplexer___duplexer_0.1.2.tgz";
       path = fetchurl {
-        name = "duplexer___duplexer_0.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz";
-        sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+        name = "duplexer___duplexer_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz";
+        sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6";
       };
     }
     {
@@ -4114,11 +4330,11 @@
       };
     }
     {
-      name = "electron_to_chromium___electron_to_chromium_1.3.380.tgz";
+      name = "electron_to_chromium___electron_to_chromium_1.3.578.tgz";
       path = fetchurl {
-        name = "electron_to_chromium___electron_to_chromium_1.3.380.tgz";
-        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.380.tgz";
-        sha1 = "1e1f07091b42b54bccd0ad6d3a14f2b73b60dc9d";
+        name = "electron_to_chromium___electron_to_chromium_1.3.578.tgz";
+        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.578.tgz";
+        sha1 = "e6671936f4571a874eb26e2e833aa0b2c0b776e0";
       };
     }
     {
@@ -4145,6 +4361,14 @@
         sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37";
       };
     }
+    {
+      name = "emoji_regex___emoji_regex_9.0.0.tgz";
+      path = fetchurl {
+        name = "emoji_regex___emoji_regex_9.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.0.0.tgz";
+        sha1 = "48a2309cc8a1d2e9d23bc6a67c39b63032e76ea4";
+      };
+    }
     {
       name = "emojis_list___emojis_list_2.1.0.tgz";
       path = fetchurl {
@@ -4178,11 +4402,11 @@
       };
     }
     {
-      name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz";
+      name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz";
       path = fetchurl {
-        name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz";
-        sha1 = "2937e2b8066cd0fe7ce0990a98f0d71a35189f66";
+        name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz";
+        sha1 = "3b806f3bfafc1ec7de69551ef93cca46c1704126";
       };
     }
     {
@@ -4194,43 +4418,43 @@
       };
     }
     {
-      name = "entities___entities_2.0.0.tgz";
+      name = "entities___entities_2.0.3.tgz";
       path = fetchurl {
-        name = "entities___entities_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz";
-        sha1 = "68d6084cab1b079767540d80e56a39b423e4abf4";
+        name = "entities___entities_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz";
+        sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f";
       };
     }
     {
-      name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.2.tgz";
+      name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.5.tgz";
       path = fetchurl {
-        name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.2.tgz";
-        url  = "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.2.tgz";
-        sha1 = "b16db2f0ea424d58a808f9df86ab6212895a4501";
+        name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.5.tgz";
+        url  = "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.5.tgz";
+        sha1 = "7a6f0093d3edd2f7025b36e7fbf290695473ee04";
       };
     }
     {
-      name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz";
+      name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz";
       path = fetchurl {
-        name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz";
-        url  = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz";
-        sha1 = "01c885dde2114b4690bf741f8dc94cee3060eb78";
+        name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz";
+        url  = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.1.tgz";
+        sha1 = "59c1b734b0927543e3d8dc477299ec957feb312d";
       };
     }
     {
-      name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.1.tgz";
+      name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.4.tgz";
       path = fetchurl {
-        name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.1.tgz";
-        sha1 = "7afe03db3801c9b76de8440694096412a8d9d49e";
+        name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz";
+        sha1 = "b9256cb25a5f430f9bfe073a84808c1d74fced2e";
       };
     }
     {
-      name = "enzyme_to_json___enzyme_to_json_3.4.4.tgz";
+      name = "enzyme_to_json___enzyme_to_json_3.6.1.tgz";
       path = fetchurl {
-        name = "enzyme_to_json___enzyme_to_json_3.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.4.4.tgz";
-        sha1 = "b30726c59091d273521b6568c859e8831e94d00e";
+        name = "enzyme_to_json___enzyme_to_json_3.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.6.1.tgz";
+        sha1 = "d60740950bc7ca6384dfe6fe405494ec5df996bc";
       };
     }
     {
@@ -4258,11 +4482,19 @@
       };
     }
     {
-      name = "es_abstract___es_abstract_1.17.4.tgz";
+      name = "es_abstract___es_abstract_1.17.7.tgz";
       path = fetchurl {
-        name = "es_abstract___es_abstract_1.17.4.tgz";
-        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz";
-        sha1 = "e3aedf19706b20e7c2594c35fc0d57605a79e184";
+        name = "es_abstract___es_abstract_1.17.7.tgz";
+        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz";
+        sha1 = "a4de61b2f66989fc7421676c1cb9787573ace54c";
+      };
+    }
+    {
+      name = "es_abstract___es_abstract_1.18.0_next.1.tgz";
+      path = fetchurl {
+        name = "es_abstract___es_abstract_1.18.0_next.1.tgz";
+        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz";
+        sha1 = "6e3a0a4bda717e5023ab3b8e90bec36108d22c68";
       };
     }
     {
@@ -4297,6 +4529,14 @@
         sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18";
       };
     }
+    {
+      name = "escalade___escalade_3.1.0.tgz";
+      path = fetchurl {
+        name = "escalade___escalade_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz";
+        sha1 = "e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e";
+      };
+    }
     {
       name = "escape_html___escape_html_1.0.3.tgz";
       path = fetchurl {
@@ -4322,19 +4562,19 @@
       };
     }
     {
-      name = "escodegen___escodegen_1.14.1.tgz";
+      name = "escodegen___escodegen_1.14.3.tgz";
       path = fetchurl {
-        name = "escodegen___escodegen_1.14.1.tgz";
-        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz";
-        sha1 = "ba01d0c8278b5e95a9a45350142026659027a457";
+        name = "escodegen___escodegen_1.14.3.tgz";
+        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz";
+        sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503";
       };
     }
     {
-      name = "eslint_config_prettier___eslint_config_prettier_6.10.0.tgz";
+      name = "eslint_config_prettier___eslint_config_prettier_6.12.0.tgz";
       path = fetchurl {
-        name = "eslint_config_prettier___eslint_config_prettier_6.10.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz";
-        sha1 = "7b15e303bf9c956875c948f6b21500e48ded6a7f";
+        name = "eslint_config_prettier___eslint_config_prettier_6.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz";
+        sha1 = "9eb2bccff727db1c52104f0b49e87ea46605a0d2";
       };
     }
     {
@@ -4346,11 +4586,11 @@
       };
     }
     {
-      name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz";
+      name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz";
       path = fetchurl {
-        name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz";
-        sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404";
+        name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz";
+        sha1 = "85ffa81942c25012d8231096ddf679c03042c717";
       };
     }
     {
@@ -4362,19 +4602,11 @@
       };
     }
     {
-      name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz";
+      name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz";
       path = fetchurl {
-        name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz";
-        sha1 = "7878f7504824e1b857dd2505b59a8e5eda26a708";
-      };
-    }
-    {
-      name = "eslint_plugin_flowtype___eslint_plugin_flowtype_3.13.0.tgz";
-      path = fetchurl {
-        name = "eslint_plugin_flowtype___eslint_plugin_flowtype_3.13.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.13.0.tgz";
-        sha1 = "e241ebd39c0ce519345a3f074ec1ebde4cf80f2c";
+        name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz";
+        sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6";
       };
     }
     {
@@ -4386,11 +4618,11 @@
       };
     }
     {
-      name = "eslint_plugin_import___eslint_plugin_import_2.20.0.tgz";
+      name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.7.0.tgz";
       path = fetchurl {
-        name = "eslint_plugin_import___eslint_plugin_import_2.20.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.0.tgz";
-        sha1 = "d749a7263fb6c29980def8e960d380a6aa6aecaa";
+        name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.7.0.tgz";
+        sha1 = "903a6ea3eb5cbf4c7ba7fa73cc43fc39ab7e4a70";
       };
     }
     {
@@ -4401,6 +4633,14 @@
         sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3";
       };
     }
+    {
+      name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz";
+        sha1 = "0896c7e6a0cf44109a2d97b95903c2bb689d7702";
+      };
+    }
     {
       name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.2.3.tgz";
       path = fetchurl {
@@ -4410,11 +4650,27 @@
       };
     }
     {
-      name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.2.tgz";
+      name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.3.1.tgz";
       path = fetchurl {
-        name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz";
-        sha1 = "432e5a667666ab84ce72f945c72f77d996a5c9ba";
+        name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.3.1.tgz";
+        sha1 = "99ef7e97f567cc6a5b8dd5ab95a94a67058a2660";
+      };
+    }
+    {
+      name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.4.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz";
+        sha1 = "168ab43154e2ea57db992a2cd097c828171f75c2";
+      };
+    }
+    {
+      name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_2.5.1.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_2.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz";
+        sha1 = "4ef5930592588ce171abeb26f400c7fbcbc23cd0";
       };
     }
     {
@@ -4425,14 +4681,6 @@
         sha1 = "6210b6d5a37205f0b92858f895a4e827020a7d04";
       };
     }
-    {
-      name = "eslint_plugin_react___eslint_plugin_react_7.18.0.tgz";
-      path = fetchurl {
-        name = "eslint_plugin_react___eslint_plugin_react_7.18.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.0.tgz";
-        sha1 = "2317831284d005b30aff8afb7c4e906f13fa8e7e";
-      };
-    }
     {
       name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz";
       path = fetchurl {
@@ -4441,6 +4689,14 @@
         sha1 = "6d08f9673628aa69c5559d33489e855d83551666";
       };
     }
+    {
+      name = "eslint_plugin_react___eslint_plugin_react_7.21.3.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_react___eslint_plugin_react_7.21.3.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.3.tgz";
+        sha1 = "71655d2af5155b19285ec929dd2cdc67a4470b52";
+      };
+    }
     {
       name = "eslint_scope___eslint_scope_4.0.3.tgz";
       path = fetchurl {
@@ -4450,11 +4706,11 @@
       };
     }
     {
-      name = "eslint_scope___eslint_scope_5.0.0.tgz";
+      name = "eslint_scope___eslint_scope_5.1.1.tgz";
       path = fetchurl {
-        name = "eslint_scope___eslint_scope_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz";
-        sha1 = "e87c8887c73e8d1ec84f1ca591645c358bfc8fb9";
+        name = "eslint_scope___eslint_scope_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz";
+        sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c";
       };
     }
     {
@@ -4466,11 +4722,19 @@
       };
     }
     {
-      name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
+      name = "eslint_utils___eslint_utils_2.1.0.tgz";
       path = fetchurl {
-        name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz";
-        sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2";
+        name = "eslint_utils___eslint_utils_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz";
+        sha1 = "d2de5e03424e707dc10c74068ddedae708741b27";
+      };
+    }
+    {
+      name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz";
+      path = fetchurl {
+        name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz";
+        sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e";
       };
     }
     {
@@ -4498,19 +4762,19 @@
       };
     }
     {
-      name = "esquery___esquery_1.1.0.tgz";
+      name = "esquery___esquery_1.3.1.tgz";
       path = fetchurl {
-        name = "esquery___esquery_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz";
-        sha1 = "c5c0b66f383e7656404f86b31334d72524eddb48";
+        name = "esquery___esquery_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz";
+        sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57";
       };
     }
     {
-      name = "esrecurse___esrecurse_4.2.1.tgz";
+      name = "esrecurse___esrecurse_4.3.0.tgz";
       path = fetchurl {
-        name = "esrecurse___esrecurse_4.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz";
-        sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf";
+        name = "esrecurse___esrecurse_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz";
+        sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921";
       };
     }
     {
@@ -4521,6 +4785,14 @@
         sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d";
       };
     }
+    {
+      name = "estraverse___estraverse_5.2.0.tgz";
+      path = fetchurl {
+        name = "estraverse___estraverse_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz";
+        sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880";
+      };
+    }
     {
       name = "esutils___esutils_2.0.3.tgz";
       path = fetchurl {
@@ -4538,19 +4810,19 @@
       };
     }
     {
-      name = "eventemitter3___eventemitter3_4.0.0.tgz";
+      name = "eventemitter3___eventemitter3_4.0.7.tgz";
       path = fetchurl {
-        name = "eventemitter3___eventemitter3_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz";
-        sha1 = "d65176163887ee59f386d64c82610b696a4a74eb";
+        name = "eventemitter3___eventemitter3_4.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz";
+        sha1 = "2de9b68f6528d5644ef5c59526a1b4a07306169f";
       };
     }
     {
-      name = "events___events_3.1.0.tgz";
+      name = "events___events_3.2.0.tgz";
       path = fetchurl {
-        name = "events___events_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz";
-        sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59";
+        name = "events___events_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz";
+        sha1 = "93b87c18f8efcd4202a461aec4dfc0556b639379";
       };
     }
     {
@@ -4682,11 +4954,11 @@
       };
     }
     {
-      name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
+      name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
       path = fetchurl {
-        name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
-        sha1 = "545145077c501491e33b15ec408c294376e94ae4";
+        name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
+        sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525";
       };
     }
     {
@@ -4746,11 +5018,11 @@
       };
     }
     {
-      name = "figgy_pudding___figgy_pudding_3.5.1.tgz";
+      name = "figgy_pudding___figgy_pudding_3.5.2.tgz";
       path = fetchurl {
-        name = "figgy_pudding___figgy_pudding_3.5.1.tgz";
-        url  = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz";
-        sha1 = "862470112901c727a0e495a80744bd5baa1d6790";
+        name = "figgy_pudding___figgy_pudding_3.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz";
+        sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e";
       };
     }
     {
@@ -4882,11 +5154,11 @@
       };
     }
     {
-      name = "flatted___flatted_2.0.1.tgz";
+      name = "flatted___flatted_2.0.2.tgz";
       path = fetchurl {
-        name = "flatted___flatted_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz";
-        sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08";
+        name = "flatted___flatted_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz";
+        sha1 = "4575b21e2bcee7434aa9be662f4b7b5f9c2b5138";
       };
     }
     {
@@ -4906,11 +5178,11 @@
       };
     }
     {
-      name = "follow_redirects___follow_redirects_1.10.0.tgz";
+      name = "follow_redirects___follow_redirects_1.13.0.tgz";
       path = fetchurl {
-        name = "follow_redirects___follow_redirects_1.10.0.tgz";
-        url  = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz";
-        sha1 = "01f5263aee921c6a54fb91667f08f4155ce169eb";
+        name = "follow_redirects___follow_redirects_1.13.0.tgz";
+        url  = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz";
+        sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db";
       };
     }
     {
@@ -5050,11 +5322,19 @@
       };
     }
     {
-      name = "fsevents___fsevents_1.2.12.tgz";
+      name = "fsevents___fsevents_1.2.13.tgz";
       path = fetchurl {
-        name = "fsevents___fsevents_1.2.12.tgz";
-        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz";
-        sha1 = "db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c";
+        name = "fsevents___fsevents_1.2.13.tgz";
+        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz";
+        sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38";
+      };
+    }
+    {
+      name = "fsevents___fsevents_2.1.3.tgz";
+      path = fetchurl {
+        name = "fsevents___fsevents_2.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz";
+        sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e";
       };
     }
     {
@@ -5105,14 +5385,6 @@
         sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269";
       };
     }
-    {
-      name = "get_caller_file___get_caller_file_1.0.3.tgz";
-      path = fetchurl {
-        name = "get_caller_file___get_caller_file_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz";
-        sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a";
-      };
-    }
     {
       name = "get_caller_file___get_caller_file_2.0.5.tgz";
       path = fetchurl {
@@ -5170,11 +5442,11 @@
       };
     }
     {
-      name = "glob_parent___glob_parent_5.1.0.tgz";
+      name = "glob_parent___glob_parent_5.1.1.tgz";
       path = fetchurl {
-        name = "glob_parent___glob_parent_5.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz";
-        sha1 = "5f4c1d1e748d30cd73ad2944b3577a81b081e8c2";
+        name = "glob_parent___glob_parent_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz";
+        sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229";
       };
     }
     {
@@ -5242,11 +5514,11 @@
       };
     }
     {
-      name = "graceful_fs___graceful_fs_4.2.3.tgz";
+      name = "graceful_fs___graceful_fs_4.2.4.tgz";
       path = fetchurl {
-        name = "graceful_fs___graceful_fs_4.2.3.tgz";
-        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz";
-        sha1 = "4a12ff1b60376ef09862c2093edd908328be8423";
+        name = "graceful_fs___graceful_fs_4.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz";
+        sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb";
       };
     }
     {
@@ -5274,11 +5546,11 @@
       };
     }
     {
-      name = "handle_thing___handle_thing_2.0.0.tgz";
+      name = "handle_thing___handle_thing_2.0.1.tgz";
       path = fetchurl {
-        name = "handle_thing___handle_thing_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz";
-        sha1 = "0e039695ff50c93fc288557d696f3c1dc6776754";
+        name = "handle_thing___handle_thing_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz";
+        sha1 = "857f79ce359580c340d43081cc648970d0bb234e";
       };
     }
     {
@@ -5290,11 +5562,11 @@
       };
     }
     {
-      name = "har_validator___har_validator_5.1.3.tgz";
+      name = "har_validator___har_validator_5.1.5.tgz";
       path = fetchurl {
-        name = "har_validator___har_validator_5.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz";
-        sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080";
+        name = "har_validator___har_validator_5.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz";
+        sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd";
       };
     }
     {
@@ -5378,11 +5650,11 @@
       };
     }
     {
-      name = "hash_base___hash_base_3.0.4.tgz";
+      name = "hash_base___hash_base_3.1.0.tgz";
       path = fetchurl {
-        name = "hash_base___hash_base_3.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz";
-        sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
+        name = "hash_base___hash_base_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz";
+        sha1 = "55c381d9e06e1d2997a883b4a3fddfe7f0d3af33";
       };
     }
     {
@@ -5474,27 +5746,35 @@
       };
     }
     {
-      name = "html_entities___html_entities_1.2.1.tgz";
+      name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz";
       path = fetchurl {
-        name = "html_entities___html_entities_1.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz";
-        sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f";
+        name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz";
+        sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3";
       };
     }
     {
-      name = "html_escaper___html_escaper_2.0.1.tgz";
+      name = "html_entities___html_entities_1.3.1.tgz";
       path = fetchurl {
-        name = "html_escaper___html_escaper_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.1.tgz";
-        sha1 = "beed86b5d2b921e92533aa11bce6d8e3b583dee7";
+        name = "html_entities___html_entities_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz";
+        sha1 = "fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44";
       };
     }
     {
-      name = "html_minifier_terser___html_minifier_terser_5.0.4.tgz";
+      name = "html_escaper___html_escaper_2.0.2.tgz";
       path = fetchurl {
-        name = "html_minifier_terser___html_minifier_terser_5.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.4.tgz";
-        sha1 = "e8cc02748acb983bd7912ea9660bd31c0702ec32";
+        name = "html_escaper___html_escaper_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz";
+        sha1 = "dfd60027da36a36dfcbe236262c00a5822681453";
+      };
+    }
+    {
+      name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz";
+      path = fetchurl {
+        name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz";
+        sha1 = "922e96f1f3bb60832c2634b79884096389b1f054";
       };
     }
     {
@@ -5554,11 +5834,11 @@
       };
     }
     {
-      name = "http_parser_js___http_parser_js_0.4.10.tgz";
+      name = "http_parser_js___http_parser_js_0.5.2.tgz";
       path = fetchurl {
-        name = "http_parser_js___http_parser_js_0.4.10.tgz";
-        url  = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz";
-        sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4";
+        name = "http_parser_js___http_parser_js_0.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz";
+        sha1 = "da2e31d237b393aae72ace43882dd7e270a8ff77";
       };
     }
     {
@@ -5570,11 +5850,11 @@
       };
     }
     {
-      name = "http_proxy___http_proxy_1.18.0.tgz";
+      name = "http_proxy___http_proxy_1.18.1.tgz";
       path = fetchurl {
-        name = "http_proxy___http_proxy_1.18.0.tgz";
-        url  = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz";
-        sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a";
+        name = "http_proxy___http_proxy_1.18.1.tgz";
+        url  = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz";
+        sha1 = "401541f0534884bbf95260334e72f88ee3976549";
       };
     }
     {
@@ -5786,11 +6066,11 @@
       };
     }
     {
-      name = "inquirer___inquirer_7.1.0.tgz";
+      name = "inquirer___inquirer_7.3.3.tgz";
       path = fetchurl {
-        name = "inquirer___inquirer_7.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz";
-        sha1 = "1298a01859883e17c7264b82870ae1034f92dd29";
+        name = "inquirer___inquirer_7.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz";
+        sha1 = "04d176b2af04afc157a83fd7c100e98ee0aad003";
       };
     }
     {
@@ -5817,14 +6097,6 @@
         sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6";
       };
     }
-    {
-      name = "invert_kv___invert_kv_2.0.0.tgz";
-      path = fetchurl {
-        name = "invert_kv___invert_kv_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz";
-        sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02";
-      };
-    }
     {
       name = "ip_regex___ip_regex_2.1.0.tgz";
       path = fetchurl {
@@ -5938,11 +6210,11 @@
       };
     }
     {
-      name = "is_callable___is_callable_1.1.5.tgz";
+      name = "is_callable___is_callable_1.2.2.tgz";
       path = fetchurl {
-        name = "is_callable___is_callable_1.1.5.tgz";
-        url  = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz";
-        sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab";
+        name = "is_callable___is_callable_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz";
+        sha1 = "c7c6715cd22d4ddb48d3e19970223aceabb080d9";
       };
     }
     {
@@ -6010,11 +6282,11 @@
       };
     }
     {
-      name = "is_docker___is_docker_2.0.0.tgz";
+      name = "is_docker___is_docker_2.1.1.tgz";
       path = fetchurl {
-        name = "is_docker___is_docker_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz";
-        sha1 = "2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b";
+        name = "is_docker___is_docker_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz";
+        sha1 = "4125a88e44e450d384e09047ede71adc2d144156";
       };
     }
     {
@@ -6041,14 +6313,6 @@
         sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     }
-    {
-      name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz";
-      path = fetchurl {
-        name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
-        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
-      };
-    }
     {
       name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz";
       path = fetchurl {
@@ -6089,6 +6353,14 @@
         sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc";
       };
     }
+    {
+      name = "is_negative_zero___is_negative_zero_2.0.0.tgz";
+      path = fetchurl {
+        name = "is_negative_zero___is_negative_zero_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz";
+        sha1 = "9553b121b0fac28869da9ed459e20c7543788461";
+      };
+    }
     {
       name = "is_number_object___is_number_object_1.0.4.tgz";
       path = fetchurl {
@@ -6170,19 +6442,19 @@
       };
     }
     {
-      name = "is_promise___is_promise_2.1.0.tgz";
+      name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz";
       path = fetchurl {
-        name = "is_promise___is_promise_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz";
-        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+        name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz";
+        sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397";
       };
     }
     {
-      name = "is_regex___is_regex_1.0.5.tgz";
+      name = "is_regex___is_regex_1.1.1.tgz";
       path = fetchurl {
-        name = "is_regex___is_regex_1.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz";
-        sha1 = "39d589a358bf18967f726967120b8fc1aed74eae";
+        name = "is_regex___is_regex_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz";
+        sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9";
       };
     }
     {
@@ -6274,11 +6546,11 @@
       };
     }
     {
-      name = "is_wsl___is_wsl_2.1.1.tgz";
+      name = "is_wsl___is_wsl_2.2.0.tgz";
       path = fetchurl {
-        name = "is_wsl___is_wsl_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz";
-        sha1 = "4a1c152d429df3d441669498e2486d3596ebaf1d";
+        name = "is_wsl___is_wsl_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz";
+        sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271";
       };
     }
     {
@@ -6401,6 +6673,14 @@
         sha1 = "931b7d0d5778a1baf7452cb816e325e3724055da";
       };
     }
+    {
+      name = "jest_diff___jest_diff_25.5.0.tgz";
+      path = fetchurl {
+        name = "jest_diff___jest_diff_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz";
+        sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9";
+      };
+    }
     {
       name = "jest_docblock___jest_docblock_24.9.0.tgz";
       path = fetchurl {
@@ -6442,11 +6722,11 @@
       };
     }
     {
-      name = "jest_fetch_mock___jest_fetch_mock_2.1.2.tgz";
+      name = "jest_fetch_mock___jest_fetch_mock_3.0.3.tgz";
       path = fetchurl {
-        name = "jest_fetch_mock___jest_fetch_mock_2.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/jest-fetch-mock/-/jest-fetch-mock-2.1.2.tgz";
-        sha1 = "1260b347918e3931c4ec743ceaf60433da661bd0";
+        name = "jest_fetch_mock___jest_fetch_mock_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz";
+        sha1 = "31749c456ae27b8919d69824f1c2bd85fe0a1f3b";
       };
     }
     {
@@ -6457,6 +6737,14 @@
         sha1 = "1684a0c8a50f2e4901b6644ae861f579eed2ef0e";
       };
     }
+    {
+      name = "jest_get_type___jest_get_type_25.2.6.tgz";
+      path = fetchurl {
+        name = "jest_get_type___jest_get_type_25.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz";
+        sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877";
+      };
+    }
     {
       name = "jest_haste_map___jest_haste_map_24.9.0.tgz";
       path = fetchurl {
@@ -6506,11 +6794,11 @@
       };
     }
     {
-      name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz";
+      name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz";
       path = fetchurl {
-        name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz";
-        sha1 = "ecdae604c077a7fbc70defb6d517c3c1c898923a";
+        name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz";
+        sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c";
       };
     }
     {
@@ -6610,11 +6898,11 @@
       };
     }
     {
-      name = "jest_worker___jest_worker_25.1.0.tgz";
+      name = "jest_worker___jest_worker_25.5.0.tgz";
       path = fetchurl {
-        name = "jest_worker___jest_worker_25.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz";
-        sha1 = "75d038bad6fdf58eba0d2ec1835856c497e3907a";
+        name = "jest_worker___jest_worker_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz";
+        sha1 = "2611d071b79cea0f43ee57a3d118593ac1547db1";
       };
     }
     {
@@ -6658,11 +6946,11 @@
       };
     }
     {
-      name = "js_yaml___js_yaml_3.13.1.tgz";
+      name = "js_yaml___js_yaml_3.14.0.tgz";
       path = fetchurl {
-        name = "js_yaml___js_yaml_3.13.1.tgz";
-        url  = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz";
-        sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847";
+        name = "js_yaml___js_yaml_3.14.0.tgz";
+        url  = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz";
+        sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482";
       };
     }
     {
@@ -6690,11 +6978,11 @@
       };
     }
     {
-      name = "jsdom___jsdom_15.2.1.tgz";
+      name = "jsdom___jsdom_16.4.0.tgz";
       path = fetchurl {
-        name = "jsdom___jsdom_15.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz";
-        sha1 = "d2feb1aef7183f86be521b8c6833ff5296d07ec5";
+        name = "jsdom___jsdom_16.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz";
+        sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb";
       };
     }
     {
@@ -6721,6 +7009,14 @@
         sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9";
       };
     }
+    {
+      name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz";
+      path = fetchurl {
+        name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz";
+        sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d";
+      };
+    }
     {
       name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz";
       path = fetchurl {
@@ -6778,11 +7074,11 @@
       };
     }
     {
-      name = "json5___json5_2.1.2.tgz";
+      name = "json5___json5_2.1.3.tgz";
       path = fetchurl {
-        name = "json5___json5_2.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz";
-        sha1 = "43ef1f0af9835dd624751a6b7fa48874fb2d608e";
+        name = "json5___json5_2.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz";
+        sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43";
       };
     }
     {
@@ -6810,19 +7106,19 @@
       };
     }
     {
-      name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz";
+      name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz";
       path = fetchurl {
-        name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz";
-        url  = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz";
-        sha1 = "8a9364e402448a3ce7f14d357738310d9248054f";
+        name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz";
+        sha1 = "1114a4c1209481db06c690c2b4f488cc665f657e";
       };
     }
     {
-      name = "just_extend___just_extend_4.1.0.tgz";
+      name = "just_extend___just_extend_4.1.1.tgz";
       path = fetchurl {
-        name = "just_extend___just_extend_4.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.0.tgz";
-        sha1 = "7278a4027d889601640ee0ce0e5a00b992467da4";
+        name = "just_extend___just_extend_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.1.tgz";
+        sha1 = "158f1fdb01f128c411dc8b286a7b4837b3545282";
       };
     }
     {
@@ -6881,6 +7177,22 @@
         sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e";
       };
     }
+    {
+      name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz";
+      path = fetchurl {
+        name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz";
+        url  = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.20.tgz";
+        sha1 = "a00a37121894f224f763268e431c55556b0c0755";
+      };
+    }
+    {
+      name = "language_tags___language_tags_1.0.5.tgz";
+      path = fetchurl {
+        name = "language_tags___language_tags_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz";
+        sha1 = "d321dbc4da30ba8bf3024e040fa5c14661f9193a";
+      };
+    }
     {
       name = "last_call_webpack_plugin___last_call_webpack_plugin_3.0.0.tgz";
       path = fetchurl {
@@ -6905,14 +7217,6 @@
         sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
       };
     }
-    {
-      name = "lcid___lcid_2.0.0.tgz";
-      path = fetchurl {
-        name = "lcid___lcid_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz";
-        sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf";
-      };
-    }
     {
       name = "left_pad___left_pad_1.3.0.tgz";
       path = fetchurl {
@@ -7025,14 +7329,6 @@
         sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0";
       };
     }
-    {
-      name = "lodash_es___lodash_es_4.17.15.tgz";
-      path = fetchurl {
-        name = "lodash_es___lodash_es_4.17.15.tgz";
-        url  = "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz";
-        sha1 = "21bd96839354412f23d7a10340e5eac6ee455d78";
-      };
-    }
     {
       name = "lodash._reinterpolate___lodash._reinterpolate_3.0.0.tgz";
       path = fetchurl {
@@ -7041,14 +7337,6 @@
         sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d";
       };
     }
-    {
-      name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz";
-      path = fetchurl {
-        name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz";
-        sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef";
-      };
-    }
     {
       name = "lodash.escape___lodash.escape_4.0.1.tgz";
       path = fetchurl {
@@ -7057,14 +7345,6 @@
         sha1 = "c9044690c21e04294beaa517712fded1fa88de98";
       };
     }
-    {
-      name = "lodash.escaperegexp___lodash.escaperegexp_4.1.2.tgz";
-      path = fetchurl {
-        name = "lodash.escaperegexp___lodash.escaperegexp_4.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz";
-        sha1 = "64762c48618082518ac3df4ccf5d5886dae20347";
-      };
-    }
     {
       name = "lodash.flattendeep___lodash.flattendeep_4.4.0.tgz";
       path = fetchurl {
@@ -7073,6 +7353,14 @@
         sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2";
       };
     }
+    {
+      name = "lodash.get___lodash.get_4.4.2.tgz";
+      path = fetchurl {
+        name = "lodash.get___lodash.get_4.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz";
+        sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99";
+      };
+    }
     {
       name = "lodash.isequal___lodash.isequal_4.5.0.tgz";
       path = fetchurl {
@@ -7081,22 +7369,6 @@
         sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
       };
     }
-    {
-      name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
-      path = fetchurl {
-        name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz";
-        sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb";
-      };
-    }
-    {
-      name = "lodash.isstring___lodash.isstring_4.0.1.tgz";
-      path = fetchurl {
-        name = "lodash.isstring___lodash.isstring_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz";
-        sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451";
-      };
-    }
     {
       name = "lodash.memoize___lodash.memoize_4.1.2.tgz";
       path = fetchurl {
@@ -7105,14 +7377,6 @@
         sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe";
       };
     }
-    {
-      name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz";
-      path = fetchurl {
-        name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz";
-        sha1 = "617121f89ac55f59047c7aec1ccd6654c6590f55";
-      };
-    }
     {
       name = "lodash.sortby___lodash.sortby_4.7.0.tgz";
       path = fetchurl {
@@ -7146,35 +7410,19 @@
       };
     }
     {
-      name = "lodash___lodash_4.17.15.tgz";
+      name = "lodash___lodash_4.17.20.tgz";
       path = fetchurl {
-        name = "lodash___lodash_4.17.15.tgz";
-        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz";
-        sha1 = "b447f6670a0455bbfeedd11392eff330ea097548";
+        name = "lodash___lodash_4.17.20.tgz";
+        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz";
+        sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52";
       };
     }
     {
-      name = "loglevel___loglevel_1.6.7.tgz";
+      name = "loglevel___loglevel_1.7.0.tgz";
       path = fetchurl {
-        name = "loglevel___loglevel_1.6.7.tgz";
-        url  = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz";
-        sha1 = "b3e034233188c68b889f5b862415306f565e2c56";
-      };
-    }
-    {
-      name = "lolex___lolex_4.2.0.tgz";
-      path = fetchurl {
-        name = "lolex___lolex_4.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz";
-        sha1 = "ddbd7f6213ca1ea5826901ab1222b65d714b3cd7";
-      };
-    }
-    {
-      name = "lolex___lolex_5.1.2.tgz";
-      path = fetchurl {
-        name = "lolex___lolex_5.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz";
-        sha1 = "953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367";
+        name = "loglevel___loglevel_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz";
+        sha1 = "728166855a740d59d38db01cf46f042caa041bb0";
       };
     }
     {
@@ -7210,11 +7458,11 @@
       };
     }
     {
-      name = "make_dir___make_dir_3.0.2.tgz";
+      name = "make_dir___make_dir_3.1.0.tgz";
       path = fetchurl {
-        name = "make_dir___make_dir_3.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz";
-        sha1 = "04a1acbf22221e1d6ef43559f43e05a90dbb4392";
+        name = "make_dir___make_dir_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz";
+        sha1 = "415e967046b3a7f1d185277d84aa58203726a13f";
       };
     }
     {
@@ -7233,14 +7481,6 @@
         sha1 = "ad2c9576197c9f1abf308d0787865bd975a3f3e4";
       };
     }
-    {
-      name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz";
-      path = fetchurl {
-        name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
-        sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a";
-      };
-    }
     {
       name = "map_cache___map_cache_0.2.2.tgz";
       path = fetchurl {
@@ -7273,6 +7513,14 @@
         sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b";
       };
     }
+    {
+      name = "mdn_data___mdn_data_2.0.6.tgz";
+      path = fetchurl {
+        name = "mdn_data___mdn_data_2.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz";
+        sha1 = "852dc60fcaa5daa2e8cf6c9189c440ed3e042978";
+      };
+    }
     {
       name = "media_typer___media_typer_0.3.0.tgz";
       path = fetchurl {
@@ -7281,14 +7529,6 @@
         sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
       };
     }
-    {
-      name = "mem___mem_4.3.0.tgz";
-      path = fetchurl {
-        name = "mem___mem_4.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz";
-        sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178";
-      };
-    }
     {
       name = "memory_fs___memory_fs_0.4.1.tgz";
       path = fetchurl {
@@ -7330,11 +7570,11 @@
       };
     }
     {
-      name = "merge2___merge2_1.3.0.tgz";
+      name = "merge2___merge2_1.4.1.tgz";
       path = fetchurl {
-        name = "merge2___merge2_1.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz";
-        sha1 = "5b366ee83b2f1582c48f87e47cf1a9352103ca81";
+        name = "merge2___merge2_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz";
+        sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae";
       };
     }
     {
@@ -7370,19 +7610,27 @@
       };
     }
     {
-      name = "mime_db___mime_db_1.43.0.tgz";
+      name = "mime_db___mime_db_1.44.0.tgz";
       path = fetchurl {
-        name = "mime_db___mime_db_1.43.0.tgz";
-        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz";
-        sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58";
+        name = "mime_db___mime_db_1.44.0.tgz";
+        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz";
+        sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92";
       };
     }
     {
-      name = "mime_types___mime_types_2.1.26.tgz";
+      name = "mime_db___mime_db_1.45.0.tgz";
       path = fetchurl {
-        name = "mime_types___mime_types_2.1.26.tgz";
-        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz";
-        sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06";
+        name = "mime_db___mime_db_1.45.0.tgz";
+        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz";
+        sha1 = "cceeda21ccd7c3a745eba2decd55d4b73e7879ea";
+      };
+    }
+    {
+      name = "mime_types___mime_types_2.1.27.tgz";
+      path = fetchurl {
+        name = "mime_types___mime_types_2.1.27.tgz";
+        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz";
+        sha1 = "47949f98e279ea53119f5722e0f34e529bec009f";
       };
     }
     {
@@ -7394,11 +7642,11 @@
       };
     }
     {
-      name = "mime___mime_2.4.4.tgz";
+      name = "mime___mime_2.4.6.tgz";
       path = fetchurl {
-        name = "mime___mime_2.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz";
-        sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5";
+        name = "mime___mime_2.4.6.tgz";
+        url  = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz";
+        sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1";
       };
     }
     {
@@ -7466,19 +7714,19 @@
       };
     }
     {
-      name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz";
+      name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz";
       path = fetchurl {
-        name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz";
-        sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a";
+        name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz";
+        sha1 = "68472f79711c084657c067c5c6ad93cddea8214c";
       };
     }
     {
-      name = "minipass___minipass_3.1.1.tgz";
+      name = "minipass___minipass_3.1.3.tgz";
       path = fetchurl {
-        name = "minipass___minipass_3.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz";
-        sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5";
+        name = "minipass___minipass_3.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz";
+        sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd";
       };
     }
     {
@@ -7506,11 +7754,19 @@
       };
     }
     {
-      name = "mkdirp___mkdirp_0.5.3.tgz";
+      name = "mkdirp___mkdirp_0.5.5.tgz";
       path = fetchurl {
-        name = "mkdirp___mkdirp_0.5.3.tgz";
-        url  = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz";
-        sha1 = "5a514b7179259287952881e94410ec5465659f8c";
+        name = "mkdirp___mkdirp_0.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz";
+        sha1 = "d91cefd62d1436ca0f41620e251288d420099def";
+      };
+    }
+    {
+      name = "moment_timezone___moment_timezone_0.5.31.tgz";
+      path = fetchurl {
+        name = "moment_timezone___moment_timezone_0.5.31.tgz";
+        url  = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.31.tgz";
+        sha1 = "9c40d8c5026f0c7ab46eda3d63e49c155148de05";
       };
     }
     {
@@ -7522,19 +7778,11 @@
       };
     }
     {
-      name = "moment_timezone___moment_timezone_0.5.28.tgz";
+      name = "moment___moment_2.29.1.tgz";
       path = fetchurl {
-        name = "moment_timezone___moment_timezone_0.5.28.tgz";
-        url  = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.28.tgz";
-        sha1 = "f093d789d091ed7b055d82aa81a82467f72e4338";
-      };
-    }
-    {
-      name = "moment___moment_2.24.0.tgz";
-      path = fetchurl {
-        name = "moment___moment_2.24.0.tgz";
-        url  = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz";
-        sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b";
+        name = "moment___moment_2.29.1.tgz";
+        url  = "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz";
+        sha1 = "b2be769fa31940be9eeea6469c075e35006fa3d3";
       };
     }
     {
@@ -7602,11 +7850,11 @@
       };
     }
     {
-      name = "nan___nan_2.14.0.tgz";
+      name = "nan___nan_2.14.1.tgz";
       path = fetchurl {
-        name = "nan___nan_2.14.0.tgz";
-        url  = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz";
-        sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c";
+        name = "nan___nan_2.14.1.tgz";
+        url  = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz";
+        sha1 = "d7be34dfa3105b91494c3147089315eff8874b01";
       };
     }
     {
@@ -7626,11 +7874,11 @@
       };
     }
     {
-      name = "nearley___nearley_2.19.1.tgz";
+      name = "nearley___nearley_2.19.7.tgz";
       path = fetchurl {
-        name = "nearley___nearley_2.19.1.tgz";
-        url  = "https://registry.yarnpkg.com/nearley/-/nearley-2.19.1.tgz";
-        sha1 = "4af4006e16645ff800e9f993c3af039857d9dbdc";
+        name = "nearley___nearley_2.19.7.tgz";
+        url  = "https://registry.yarnpkg.com/nearley/-/nearley-2.19.7.tgz";
+        sha1 = "eafbe3e2d8ccfe70adaa5c026ab1f9709c116218";
       };
     }
     {
@@ -7642,11 +7890,11 @@
       };
     }
     {
-      name = "neo_async___neo_async_2.6.1.tgz";
+      name = "neo_async___neo_async_2.6.2.tgz";
       path = fetchurl {
-        name = "neo_async___neo_async_2.6.1.tgz";
-        url  = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz";
-        sha1 = "ac27ada66167fa8849a6addd837f6b189ad2081c";
+        name = "neo_async___neo_async_2.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz";
+        sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f";
       };
     }
     {
@@ -7666,11 +7914,11 @@
       };
     }
     {
-      name = "nise___nise_1.5.3.tgz";
+      name = "nise___nise_4.0.4.tgz";
       path = fetchurl {
-        name = "nise___nise_1.5.3.tgz";
-        url  = "https://registry.yarnpkg.com/nise/-/nise-1.5.3.tgz";
-        sha1 = "9d2cfe37d44f57317766c6e9408a359c5d3ac1f7";
+        name = "nise___nise_4.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/nise/-/nise-4.0.4.tgz";
+        sha1 = "d73dea3e5731e6561992b8f570be9e363c4512dd";
       };
     }
     {
@@ -7682,19 +7930,19 @@
       };
     }
     {
-      name = "node_fetch___node_fetch_2.1.2.tgz";
+      name = "node_fetch___node_fetch_2.6.1.tgz";
       path = fetchurl {
-        name = "node_fetch___node_fetch_2.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz";
-        sha1 = "ab884e8e7e57e38a944753cec706f788d1768bb5";
+        name = "node_fetch___node_fetch_2.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz";
+        sha1 = "045bd323631f76ed2e2b55573394416b639a0052";
       };
     }
     {
-      name = "node_forge___node_forge_0.9.0.tgz";
+      name = "node_forge___node_forge_0.10.0.tgz";
       path = fetchurl {
-        name = "node_forge___node_forge_0.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz";
-        sha1 = "d624050edbb44874adca12bb9a52ec63cb782579";
+        name = "node_forge___node_forge_0.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz";
+        sha1 = "32dea2afb3e9926f02ee5ce8794902691a676bf3";
       };
     }
     {
@@ -7730,11 +7978,11 @@
       };
     }
     {
-      name = "node_releases___node_releases_1.1.52.tgz";
+      name = "node_releases___node_releases_1.1.61.tgz";
       path = fetchurl {
-        name = "node_releases___node_releases_1.1.52.tgz";
-        url  = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz";
-        sha1 = "bcffee3e0a758e92e44ecfaecd0a47554b0bcba9";
+        name = "node_releases___node_releases_1.1.61.tgz";
+        url  = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz";
+        sha1 = "707b0fca9ce4e11783612ba4a2fcba09047af16e";
       };
     }
     {
@@ -7809,14 +8057,6 @@
         sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede";
       };
     }
-    {
-      name = "number_is_nan___number_is_nan_1.0.1.tgz";
-      path = fetchurl {
-        name = "number_is_nan___number_is_nan_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "097b602b53422a522c1afb8790318336941a011d";
-      };
-    }
     {
       name = "nwsapi___nwsapi_2.2.0.tgz";
       path = fetchurl {
@@ -7858,19 +8098,19 @@
       };
     }
     {
-      name = "object_inspect___object_inspect_1.7.0.tgz";
+      name = "object_inspect___object_inspect_1.8.0.tgz";
       path = fetchurl {
-        name = "object_inspect___object_inspect_1.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz";
-        sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67";
+        name = "object_inspect___object_inspect_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz";
+        sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0";
       };
     }
     {
-      name = "object_is___object_is_1.0.2.tgz";
+      name = "object_is___object_is_1.1.3.tgz";
       path = fetchurl {
-        name = "object_is___object_is_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz";
-        sha1 = "6b80eb84fe451498f65007982f035a5b445edec4";
+        name = "object_is___object_is_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz";
+        sha1 = "2e3b9e65560137455ee3bd62aec4d90a2ea1cc81";
       };
     }
     {
@@ -7898,19 +8138,19 @@
       };
     }
     {
-      name = "object.assign___object.assign_4.1.0.tgz";
+      name = "object.assign___object.assign_4.1.1.tgz";
       path = fetchurl {
-        name = "object.assign___object.assign_4.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz";
-        sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da";
+        name = "object.assign___object.assign_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz";
+        sha1 = "303867a666cdd41936ecdedfb1f8f3e32a478cdd";
       };
     }
     {
-      name = "object.entries___object.entries_1.1.1.tgz";
+      name = "object.entries___object.entries_1.1.2.tgz";
       path = fetchurl {
-        name = "object.entries___object.entries_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz";
-        sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b";
+        name = "object.entries___object.entries_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz";
+        sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add";
       };
     }
     {
@@ -7978,19 +8218,19 @@
       };
     }
     {
-      name = "onetime___onetime_5.1.0.tgz";
+      name = "onetime___onetime_5.1.2.tgz";
       path = fetchurl {
-        name = "onetime___onetime_5.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz";
-        sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5";
+        name = "onetime___onetime_5.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz";
+        sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e";
       };
     }
     {
-      name = "open___open_7.0.3.tgz";
+      name = "open___open_7.3.0.tgz";
       path = fetchurl {
-        name = "open___open_7.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz";
-        sha1 = "db551a1af9c7ab4c7af664139930826138531c48";
+        name = "open___open_7.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz";
+        sha1 = "45461fdee46444f3645b6e14eb3ca94b82e1be69";
       };
     }
     {
@@ -8033,14 +8273,6 @@
         sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27";
       };
     }
-    {
-      name = "os_locale___os_locale_3.1.0.tgz";
-      path = fetchurl {
-        name = "os_locale___os_locale_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz";
-        sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a";
-      };
-    }
     {
       name = "os_tmpdir___os_tmpdir_1.0.2.tgz";
       path = fetchurl {
@@ -8049,14 +8281,6 @@
         sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
       };
     }
-    {
-      name = "p_defer___p_defer_1.0.0.tgz";
-      path = fetchurl {
-        name = "p_defer___p_defer_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz";
-        sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
-      };
-    }
     {
       name = "p_each_series___p_each_series_1.0.0.tgz";
       path = fetchurl {
@@ -8073,14 +8297,6 @@
         sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
       };
     }
-    {
-      name = "p_is_promise___p_is_promise_2.1.0.tgz";
-      path = fetchurl {
-        name = "p_is_promise___p_is_promise_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz";
-        sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e";
-      };
-    }
     {
       name = "p_limit___p_limit_1.3.0.tgz";
       path = fetchurl {
@@ -8090,11 +8306,11 @@
       };
     }
     {
-      name = "p_limit___p_limit_2.2.2.tgz";
+      name = "p_limit___p_limit_2.3.0.tgz";
       path = fetchurl {
-        name = "p_limit___p_limit_2.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz";
-        sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e";
+        name = "p_limit___p_limit_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz";
+        sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1";
       };
     }
     {
@@ -8202,11 +8418,11 @@
       };
     }
     {
-      name = "parse_asn1___parse_asn1_5.1.5.tgz";
+      name = "parse_asn1___parse_asn1_5.1.6.tgz";
       path = fetchurl {
-        name = "parse_asn1___parse_asn1_5.1.5.tgz";
-        url  = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz";
-        sha1 = "003271343da58dc94cace494faef3d2147ecea0e";
+        name = "parse_asn1___parse_asn1_5.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz";
+        sha1 = "385080a3ec13cb62a62d39409cb3e88844cdaed4";
       };
     }
     {
@@ -8226,11 +8442,19 @@
       };
     }
     {
-      name = "parse_json___parse_json_5.0.0.tgz";
+      name = "parse_json___parse_json_5.1.0.tgz";
       path = fetchurl {
-        name = "parse_json___parse_json_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz";
-        sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f";
+        name = "parse_json___parse_json_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz";
+        sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646";
+      };
+    }
+    {
+      name = "parse_srcset___parse_srcset_1.0.2.tgz";
+      path = fetchurl {
+        name = "parse_srcset___parse_srcset_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz";
+        sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1";
       };
     }
     {
@@ -8249,6 +8473,14 @@
         sha1 = "c59341c9723f414c452975564c7c00a68d58acd2";
       };
     }
+    {
+      name = "parse5___parse5_5.1.1.tgz";
+      path = fetchurl {
+        name = "parse5___parse5_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz";
+        sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178";
+      };
+    }
     {
       name = "parse5___parse5_3.0.3.tgz";
       path = fetchurl {
@@ -8402,11 +8634,11 @@
       };
     }
     {
-      name = "pbkdf2___pbkdf2_3.0.17.tgz";
+      name = "pbkdf2___pbkdf2_3.1.1.tgz";
       path = fetchurl {
-        name = "pbkdf2___pbkdf2_3.0.17.tgz";
-        url  = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz";
-        sha1 = "976c206530617b14ebb32114239f7b09336e93a6";
+        name = "pbkdf2___pbkdf2_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz";
+        sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94";
       };
     }
     {
@@ -8522,11 +8754,11 @@
       };
     }
     {
-      name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.0.tgz";
+      name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.4.tgz";
       path = fetchurl {
-        name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.0.tgz";
-        sha1 = "d5c068013a2fdc82224ca50ed179c8fba9036a8e";
+        name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.4.tgz";
+        url  = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz";
+        sha1 = "c9711ac4dc48a685dabafc86f8b6dd9f8df84149";
       };
     }
     {
@@ -8538,11 +8770,11 @@
       };
     }
     {
-      name = "portfinder___portfinder_1.0.25.tgz";
+      name = "portfinder___portfinder_1.0.28.tgz";
       path = fetchurl {
-        name = "portfinder___portfinder_1.0.25.tgz";
-        url  = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz";
-        sha1 = "254fd337ffba869f4b9d37edc298059cb4d35eca";
+        name = "portfinder___portfinder_1.0.28.tgz";
+        url  = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz";
+        sha1 = "67c4622852bd5374dd1dd900f779f53462fac778";
       };
     }
     {
@@ -8570,11 +8802,11 @@
       };
     }
     {
-      name = "postcss_calc___postcss_calc_7.0.2.tgz";
+      name = "postcss_calc___postcss_calc_7.0.5.tgz";
       path = fetchurl {
-        name = "postcss_calc___postcss_calc_7.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz";
-        sha1 = "504efcd008ca0273120568b0792b16cdcde8aac1";
+        name = "postcss_calc___postcss_calc_7.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz";
+        sha1 = "f8a6e99f12e619c2ebc23cf6c486fdc15860933e";
       };
     }
     {
@@ -8778,11 +9010,11 @@
       };
     }
     {
-      name = "postcss_load_config___postcss_load_config_2.1.0.tgz";
+      name = "postcss_load_config___postcss_load_config_2.1.2.tgz";
       path = fetchurl {
-        name = "postcss_load_config___postcss_load_config_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz";
-        sha1 = "c84d692b7bb7b41ddced94ee62e8ab31b417b003";
+        name = "postcss_load_config___postcss_load_config_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz";
+        sha1 = "c5ea504f2c4aef33c7359a34de3573772ad7502a";
       };
     }
     {
@@ -8866,11 +9098,11 @@
       };
     }
     {
-      name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz";
+      name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz";
       path = fetchurl {
-        name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz";
-        sha1 = "e8a6561be914aaf3c052876377524ca90dbb7915";
+        name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz";
+        sha1 = "bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0";
       };
     }
     {
@@ -9090,11 +9322,11 @@
       };
     }
     {
-      name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz";
+      name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz";
       path = fetchurl {
-        name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz";
-        sha1 = "934cf799d016c83411859e09dcecade01286ec5c";
+        name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz";
+        sha1 = "56075a1380a04604c38b063ea7767a129af5c2b3";
       };
     }
     {
@@ -9122,11 +9354,11 @@
       };
     }
     {
-      name = "postcss_value_parser___postcss_value_parser_4.0.3.tgz";
+      name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz";
       path = fetchurl {
-        name = "postcss_value_parser___postcss_value_parser_4.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz";
-        sha1 = "651ff4593aa9eda8d5d0d66593a2417aeaeb325d";
+        name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz";
+        sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb";
       };
     }
     {
@@ -9146,11 +9378,11 @@
       };
     }
     {
-      name = "postcss___postcss_7.0.27.tgz";
+      name = "postcss___postcss_7.0.35.tgz";
       path = fetchurl {
-        name = "postcss___postcss_7.0.27.tgz";
-        url  = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz";
-        sha1 = "cc67cdc6b0daa375105b7c424a85567345fc54d9";
+        name = "postcss___postcss_7.0.35.tgz";
+        url  = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz";
+        sha1 = "d2be00b998f7f211d8a276974079f2e92b970e24";
       };
     }
     {
@@ -9186,11 +9418,11 @@
       };
     }
     {
-      name = "pretty_bytes___pretty_bytes_5.3.0.tgz";
+      name = "pretty_bytes___pretty_bytes_5.4.1.tgz";
       path = fetchurl {
-        name = "pretty_bytes___pretty_bytes_5.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz";
-        sha1 = "f2849e27db79fb4d6cfe24764fc4134f165989f2";
+        name = "pretty_bytes___pretty_bytes_5.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz";
+        sha1 = "cd89f79bbcef21e3d21eb0da68ffe93f803e884b";
       };
     }
     {
@@ -9210,11 +9442,11 @@
       };
     }
     {
-      name = "private___private_0.1.8.tgz";
+      name = "pretty_format___pretty_format_25.5.0.tgz";
       path = fetchurl {
-        name = "private___private_0.1.8.tgz";
-        url  = "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz";
-        sha1 = "2381edb3689f7a53d653190060fcf822d2f368ff";
+        name = "pretty_format___pretty_format_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz";
+        sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a";
       };
     }
     {
@@ -9250,11 +9482,11 @@
       };
     }
     {
-      name = "promise_polyfill___promise_polyfill_7.1.2.tgz";
+      name = "promise_polyfill___promise_polyfill_8.1.3.tgz";
       path = fetchurl {
-        name = "promise_polyfill___promise_polyfill_7.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz";
-        sha1 = "ab05301d8c28536301622d69227632269a70ca3b";
+        name = "promise_polyfill___promise_polyfill_8.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz";
+        sha1 = "8c99b3cf53f3a91c68226ffde7bde81d7f904116";
       };
     }
     {
@@ -9306,11 +9538,11 @@
       };
     }
     {
-      name = "psl___psl_1.7.0.tgz";
+      name = "psl___psl_1.8.0.tgz";
       path = fetchurl {
-        name = "psl___psl_1.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz";
-        sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c";
+        name = "psl___psl_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz";
+        sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24";
       };
     }
     {
@@ -9418,11 +9650,11 @@
       };
     }
     {
-      name = "querystringify___querystringify_2.1.1.tgz";
+      name = "querystringify___querystringify_2.2.0.tgz";
       path = fetchurl {
-        name = "querystringify___querystringify_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz";
-        sha1 = "60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e";
+        name = "querystringify___querystringify_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz";
+        sha1 = "3345941b4153cb9d082d8eee4cda2016a9aef7f6";
       };
     }
     {
@@ -9554,19 +9786,19 @@
       };
     }
     {
-      name = "react_resize_detector___react_resize_detector_4.2.1.tgz";
+      name = "react_resize_detector___react_resize_detector_5.2.0.tgz";
       path = fetchurl {
-        name = "react_resize_detector___react_resize_detector_4.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-4.2.1.tgz";
-        sha1 = "8982b74c3e1cf949afaa3c41050458c87b033982";
+        name = "react_resize_detector___react_resize_detector_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-5.2.0.tgz";
+        sha1 = "992083834432308c551a8251a2c52306d9d16718";
       };
     }
     {
-      name = "react_scripts___react_scripts_3.4.0.tgz";
+      name = "react_scripts___react_scripts_3.4.3.tgz";
       path = fetchurl {
-        name = "react_scripts___react_scripts_3.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.0.tgz";
-        sha1 = "f413680f0b5b937c8879ba1ffdae9b8c5b364bf5";
+        name = "react_scripts___react_scripts_3.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.3.tgz";
+        sha1 = "21de5eb93de41ee92cd0b85b0e1298d0bb2e6c51";
       };
     }
     {
@@ -9594,11 +9826,11 @@
       };
     }
     {
-      name = "reactstrap___reactstrap_8.4.1.tgz";
+      name = "reactstrap___reactstrap_8.6.0.tgz";
       path = fetchurl {
-        name = "reactstrap___reactstrap_8.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.4.1.tgz";
-        sha1 = "c7f63b9057f58b52833061711ebe235b9ec4e3e5";
+        name = "reactstrap___reactstrap_8.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.6.0.tgz";
+        sha1 = "baee0d12990c9fef3c82199fb05e84d9f0af1a26";
       };
     }
     {
@@ -9658,11 +9890,11 @@
       };
     }
     {
-      name = "readdirp___readdirp_3.3.0.tgz";
+      name = "readdirp___readdirp_3.4.0.tgz";
       path = fetchurl {
-        name = "readdirp___readdirp_3.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz";
-        sha1 = "984458d13a1e42e2e9f5841b129e162f369aff17";
+        name = "readdirp___readdirp_3.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz";
+        sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada";
       };
     }
     {
@@ -9698,11 +9930,11 @@
       };
     }
     {
-      name = "regenerate___regenerate_1.4.0.tgz";
+      name = "regenerate___regenerate_1.4.1.tgz";
       path = fetchurl {
-        name = "regenerate___regenerate_1.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz";
-        sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11";
+        name = "regenerate___regenerate_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz";
+        sha1 = "cad92ad8e6b591773485fbe05a485caf4f457e6f";
       };
     }
     {
@@ -9714,19 +9946,19 @@
       };
     }
     {
-      name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz";
+      name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz";
       path = fetchurl {
-        name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz";
-        url  = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz";
-        sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697";
+        name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz";
+        url  = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz";
+        sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55";
       };
     }
     {
-      name = "regenerator_transform___regenerator_transform_0.14.4.tgz";
+      name = "regenerator_transform___regenerator_transform_0.14.5.tgz";
       path = fetchurl {
-        name = "regenerator_transform___regenerator_transform_0.14.4.tgz";
-        url  = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz";
-        sha1 = "5266857896518d1616a78a0479337a30ea974cc7";
+        name = "regenerator_transform___regenerator_transform_0.14.5.tgz";
+        url  = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz";
+        sha1 = "c98da154683671c9c4dcb16ece736517e1b7feb4";
       };
     }
     {
@@ -9762,27 +9994,27 @@
       };
     }
     {
-      name = "regexpp___regexpp_3.0.0.tgz";
+      name = "regexpp___regexpp_3.1.0.tgz";
       path = fetchurl {
-        name = "regexpp___regexpp_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz";
-        sha1 = "dd63982ee3300e67b41c1956f850aa680d9d330e";
+        name = "regexpp___regexpp_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz";
+        sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2";
       };
     }
     {
-      name = "regexpu_core___regexpu_core_4.7.0.tgz";
+      name = "regexpu_core___regexpu_core_4.7.1.tgz";
       path = fetchurl {
-        name = "regexpu_core___regexpu_core_4.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz";
-        sha1 = "fcbf458c50431b0bb7b45d6967b8192d91f3d938";
+        name = "regexpu_core___regexpu_core_4.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz";
+        sha1 = "2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6";
       };
     }
     {
-      name = "regjsgen___regjsgen_0.5.1.tgz";
+      name = "regjsgen___regjsgen_0.5.2.tgz";
       path = fetchurl {
-        name = "regjsgen___regjsgen_0.5.1.tgz";
-        url  = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz";
-        sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c";
+        name = "regjsgen___regjsgen_0.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz";
+        sha1 = "92ff295fb1deecbf6ecdab2543d207e91aa33733";
       };
     }
     {
@@ -9834,19 +10066,19 @@
       };
     }
     {
-      name = "request_promise_core___request_promise_core_1.1.3.tgz";
+      name = "request_promise_core___request_promise_core_1.1.4.tgz";
       path = fetchurl {
-        name = "request_promise_core___request_promise_core_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz";
-        sha1 = "e9a3c081b51380dfea677336061fea879a829ee9";
+        name = "request_promise_core___request_promise_core_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz";
+        sha1 = "3eedd4223208d419867b78ce815167d10593a22f";
       };
     }
     {
-      name = "request_promise_native___request_promise_native_1.0.8.tgz";
+      name = "request_promise_native___request_promise_native_1.0.9.tgz";
       path = fetchurl {
-        name = "request_promise_native___request_promise_native_1.0.8.tgz";
-        url  = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz";
-        sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36";
+        name = "request_promise_native___request_promise_native_1.0.9.tgz";
+        url  = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz";
+        sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28";
       };
     }
     {
@@ -9865,14 +10097,6 @@
         sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     }
-    {
-      name = "require_main_filename___require_main_filename_1.0.1.tgz";
-      path = fetchurl {
-        name = "require_main_filename___require_main_filename_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
-      };
-    }
     {
       name = "require_main_filename___require_main_filename_2.0.0.tgz";
       path = fetchurl {
@@ -9954,11 +10178,11 @@
       };
     }
     {
-      name = "resolve___resolve_1.15.1.tgz";
+      name = "resolve___resolve_1.17.0.tgz";
       path = fetchurl {
-        name = "resolve___resolve_1.15.1.tgz";
-        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz";
-        sha1 = "27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8";
+        name = "resolve___resolve_1.17.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz";
+        sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444";
       };
     }
     {
@@ -10058,11 +10282,11 @@
       };
     }
     {
-      name = "run_async___run_async_2.4.0.tgz";
+      name = "run_async___run_async_2.4.1.tgz";
       path = fetchurl {
-        name = "run_async___run_async_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz";
-        sha1 = "e59054a5b86876cfae07f431d18cbaddc594f1e8";
+        name = "run_async___run_async_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz";
+        sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455";
       };
     }
     {
@@ -10074,11 +10298,11 @@
       };
     }
     {
-      name = "rxjs___rxjs_6.5.4.tgz";
+      name = "rxjs___rxjs_6.6.3.tgz";
       path = fetchurl {
-        name = "rxjs___rxjs_6.5.4.tgz";
-        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz";
-        sha1 = "e0777fe0d184cec7872df147f303572d414e211c";
+        name = "rxjs___rxjs_6.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz";
+        sha1 = "8ca84635c4daa900c0d3967a6ee7ac60271ee552";
       };
     }
     {
@@ -10090,11 +10314,11 @@
       };
     }
     {
-      name = "safe_buffer___safe_buffer_5.2.0.tgz";
+      name = "safe_buffer___safe_buffer_5.2.1.tgz";
       path = fetchurl {
-        name = "safe_buffer___safe_buffer_5.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz";
-        sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519";
+        name = "safe_buffer___safe_buffer_5.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz";
+        sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6";
       };
     }
     {
@@ -10122,11 +10346,11 @@
       };
     }
     {
-      name = "sanitize_html___sanitize_html_1.22.1.tgz";
+      name = "sanitize_html___sanitize_html_1.27.5.tgz";
       path = fetchurl {
-        name = "sanitize_html___sanitize_html_1.22.1.tgz";
-        url  = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.1.tgz";
-        sha1 = "5b36c92ab27917ddd2775396815c2bc1a6268310";
+        name = "sanitize_html___sanitize_html_1.27.5.tgz";
+        url  = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.27.5.tgz";
+        sha1 = "6c8149462adb23e360e1bb71cc0bae7f08c823c7";
       };
     }
     {
@@ -10161,6 +10385,14 @@
         sha1 = "d59d1fd332ec92ad98a2e0b2ee644702384b1c5b";
       };
     }
+    {
+      name = "saxes___saxes_5.0.1.tgz";
+      path = fetchurl {
+        name = "saxes___saxes_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz";
+        sha1 = "eebab953fa3b7608dbe94e5dadb15c888fa6696d";
+      };
+    }
     {
       name = "scheduler___scheduler_0.19.1.tgz";
       path = fetchurl {
@@ -10178,11 +10410,11 @@
       };
     }
     {
-      name = "schema_utils___schema_utils_2.6.5.tgz";
+      name = "schema_utils___schema_utils_2.7.1.tgz";
       path = fetchurl {
-        name = "schema_utils___schema_utils_2.6.5.tgz";
-        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz";
-        sha1 = "c758f0a7e624263073d396e29cd40aa101152d8a";
+        name = "schema_utils___schema_utils_2.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz";
+        sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7";
       };
     }
     {
@@ -10194,11 +10426,11 @@
       };
     }
     {
-      name = "selfsigned___selfsigned_1.10.7.tgz";
+      name = "selfsigned___selfsigned_1.10.8.tgz";
       path = fetchurl {
-        name = "selfsigned___selfsigned_1.10.7.tgz";
-        url  = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz";
-        sha1 = "da5819fd049d5574f28e88a9bcc6dbc6e6f3906b";
+        name = "selfsigned___selfsigned_1.10.8.tgz";
+        url  = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz";
+        sha1 = "0d17208b7d12c33f8eac85c41835f27fc3d81a30";
       };
     }
     {
@@ -10225,6 +10457,14 @@
         sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e";
       };
     }
+    {
+      name = "semver___semver_7.3.2.tgz";
+      path = fetchurl {
+        name = "semver___semver_7.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz";
+        sha1 = "604962b052b81ed0786aae84389ffba70ffd3938";
+      };
+    }
     {
       name = "send___send_0.17.1.tgz";
       path = fetchurl {
@@ -10234,11 +10474,11 @@
       };
     }
     {
-      name = "serialize_javascript___serialize_javascript_2.1.2.tgz";
+      name = "serialize_javascript___serialize_javascript_4.0.0.tgz";
       path = fetchurl {
-        name = "serialize_javascript___serialize_javascript_2.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz";
-        sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61";
+        name = "serialize_javascript___serialize_javascript_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz";
+        sha1 = "b525e1238489a5ecfc42afacc3fe99e666f4b1aa";
       };
     }
     {
@@ -10370,19 +10610,19 @@
       };
     }
     {
-      name = "side_channel___side_channel_1.0.2.tgz";
+      name = "side_channel___side_channel_1.0.3.tgz";
       path = fetchurl {
-        name = "side_channel___side_channel_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz";
-        sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947";
+        name = "side_channel___side_channel_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz";
+        sha1 = "cdc46b057550bbab63706210838df5d4c19519c3";
       };
     }
     {
-      name = "signal_exit___signal_exit_3.0.2.tgz";
+      name = "signal_exit___signal_exit_3.0.3.tgz";
       path = fetchurl {
-        name = "signal_exit___signal_exit_3.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+        name = "signal_exit___signal_exit_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz";
+        sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c";
       };
     }
     {
@@ -10394,11 +10634,11 @@
       };
     }
     {
-      name = "sinon___sinon_7.5.0.tgz";
+      name = "sinon___sinon_9.2.0.tgz";
       path = fetchurl {
-        name = "sinon___sinon_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/sinon/-/sinon-7.5.0.tgz";
-        sha1 = "e9488ea466070ea908fd44a3d6478fd4923c67ec";
+        name = "sinon___sinon_9.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/sinon/-/sinon-9.2.0.tgz";
+        sha1 = "1d333967e30023609f7347351ebc0dc964c0f3c9";
       };
     }
     {
@@ -10474,11 +10714,11 @@
       };
     }
     {
-      name = "sockjs___sockjs_0.3.19.tgz";
+      name = "sockjs___sockjs_0.3.20.tgz";
       path = fetchurl {
-        name = "sockjs___sockjs_0.3.19.tgz";
-        url  = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz";
-        sha1 = "d976bbe800af7bd20ae08598d582393508993c0d";
+        name = "sockjs___sockjs_0.3.20.tgz";
+        url  = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz";
+        sha1 = "b26a283ec562ef8b2687b44033a4eeceac75d855";
       };
     }
     {
@@ -10506,11 +10746,11 @@
       };
     }
     {
-      name = "source_map_support___source_map_support_0.5.16.tgz";
+      name = "source_map_support___source_map_support_0.5.19.tgz";
       path = fetchurl {
-        name = "source_map_support___source_map_support_0.5.16.tgz";
-        url  = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz";
-        sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042";
+        name = "source_map_support___source_map_support_0.5.19.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz";
+        sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61";
       };
     }
     {
@@ -10538,35 +10778,35 @@
       };
     }
     {
-      name = "spdx_correct___spdx_correct_3.1.0.tgz";
+      name = "spdx_correct___spdx_correct_3.1.1.tgz";
       path = fetchurl {
-        name = "spdx_correct___spdx_correct_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz";
-        sha1 = "fb83e504445268f154b074e218c87c003cd31df4";
+        name = "spdx_correct___spdx_correct_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz";
+        sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9";
       };
     }
     {
-      name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz";
+      name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz";
       path = fetchurl {
-        name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
-        sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977";
+        name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz";
+        sha1 = "3f28ce1a77a00372683eade4a433183527a2163d";
       };
     }
     {
-      name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz";
+      name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz";
       path = fetchurl {
-        name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
-        sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0";
+        name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz";
+        sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679";
       };
     }
     {
-      name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz";
+      name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz";
       path = fetchurl {
-        name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
-        sha1 = "3694b5804567a458d3c8045842a6358632f62654";
+        name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz";
+        sha1 = "c80757383c28abf7296744998cbc106ae8b854ce";
       };
     }
     {
@@ -10578,11 +10818,11 @@
       };
     }
     {
-      name = "spdy___spdy_4.0.1.tgz";
+      name = "spdy___spdy_4.0.2.tgz";
       path = fetchurl {
-        name = "spdy___spdy_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz";
-        sha1 = "6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2";
+        name = "spdy___spdy_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz";
+        sha1 = "b74f466203a3eda452c02492b91fb9e84a27677b";
       };
     }
     {
@@ -10601,14 +10841,6 @@
         sha1 = "04e6926f662895354f3dd015203633b857297e2c";
       };
     }
-    {
-      name = "srcset___srcset_2.0.1.tgz";
-      path = fetchurl {
-        name = "srcset___srcset_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/srcset/-/srcset-2.0.1.tgz";
-        sha1 = "8f842d357487eb797f413d9c309de7a5149df5ac";
-      };
-    }
     {
       name = "sshpk___sshpk_1.16.1.tgz";
       path = fetchurl {
@@ -10729,22 +10961,6 @@
         sha1 = "107ef8c23456e187a8abd4a61162ff4ac6e25837";
       };
     }
-    {
-      name = "string_width___string_width_1.0.2.tgz";
-      path = fetchurl {
-        name = "string_width___string_width_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz";
-        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
-      };
-    }
-    {
-      name = "string_width___string_width_2.1.1.tgz";
-      path = fetchurl {
-        name = "string_width___string_width_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz";
-        sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
-      };
-    }
     {
       name = "string_width___string_width_3.1.0.tgz";
       path = fetchurl {
@@ -10770,27 +10986,27 @@
       };
     }
     {
-      name = "string.prototype.trim___string.prototype.trim_1.2.1.tgz";
+      name = "string.prototype.trim___string.prototype.trim_1.2.2.tgz";
       path = fetchurl {
-        name = "string.prototype.trim___string.prototype.trim_1.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz";
-        sha1 = "141233dff32c82bfad80684d7e5f0869ee0fb782";
+        name = "string.prototype.trim___string.prototype.trim_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.2.tgz";
+        sha1 = "f538d0bacd98fc4297f0bef645226d5aaebf59f3";
       };
     }
     {
-      name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
+      name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz";
       path = fetchurl {
-        name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
-        sha1 = "9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74";
+        name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
+        sha1 = "85812a6b847ac002270f5808146064c995fb6913";
       };
     }
     {
-      name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
+      name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz";
       path = fetchurl {
-        name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
-        sha1 = "440314b15996c866ce8a0341894d45186200c5d9";
+        name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
+        sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54";
       };
     }
     {
@@ -10874,11 +11090,11 @@
       };
     }
     {
-      name = "strip_json_comments___strip_json_comments_3.0.1.tgz";
+      name = "strip_json_comments___strip_json_comments_3.1.1.tgz";
       path = fetchurl {
-        name = "strip_json_comments___strip_json_comments_3.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz";
-        sha1 = "85713975a91fb87bf1b305cca77395e40d2a64a7";
+        name = "strip_json_comments___strip_json_comments_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz";
+        sha1 = "31f1281b3832630434831c310c01cccda8cbe006";
       };
     }
     {
@@ -10922,11 +11138,11 @@
       };
     }
     {
-      name = "supports_color___supports_color_7.1.0.tgz";
+      name = "supports_color___supports_color_7.2.0.tgz";
       path = fetchurl {
-        name = "supports_color___supports_color_7.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz";
-        sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1";
+        name = "supports_color___supports_color_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz";
+        sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da";
       };
     }
     {
@@ -10986,27 +11202,27 @@
       };
     }
     {
-      name = "terser_webpack_plugin___terser_webpack_plugin_2.3.4.tgz";
+      name = "terser_webpack_plugin___terser_webpack_plugin_2.3.8.tgz";
       path = fetchurl {
-        name = "terser_webpack_plugin___terser_webpack_plugin_2.3.4.tgz";
-        url  = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.4.tgz";
-        sha1 = "ac045703bd8da0936ce910d8fb6350d0e1dee5fe";
+        name = "terser_webpack_plugin___terser_webpack_plugin_2.3.8.tgz";
+        url  = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz";
+        sha1 = "894764a19b0743f2f704e7c2a848c5283a696724";
       };
     }
     {
-      name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz";
+      name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz";
       path = fetchurl {
-        name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz";
-        url  = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz";
-        sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c";
+        name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz";
+        url  = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz";
+        sha1 = "a217aefaea330e734ffacb6120ec1fa312d6040b";
       };
     }
     {
-      name = "terser___terser_4.6.7.tgz";
+      name = "terser___terser_4.8.0.tgz";
       path = fetchurl {
-        name = "terser___terser_4.6.7.tgz";
-        url  = "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz";
-        sha1 = "478d7f9394ec1907f0e488c5f6a6a9a2bad55e72";
+        name = "terser___terser_4.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz";
+        sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17";
       };
     }
     {
@@ -11178,11 +11394,19 @@
       };
     }
     {
-      name = "ts_pnp___ts_pnp_1.1.5.tgz";
+      name = "tr46___tr46_2.0.2.tgz";
       path = fetchurl {
-        name = "ts_pnp___ts_pnp_1.1.5.tgz";
-        url  = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.5.tgz";
-        sha1 = "840e0739c89fce5f3abd9037bb091dbff16d9dec";
+        name = "tr46___tr46_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz";
+        sha1 = "03273586def1595ae08fedb38d7733cee91d2479";
+      };
+    }
+    {
+      name = "ts_pnp___ts_pnp_1.1.6.tgz";
+      path = fetchurl {
+        name = "ts_pnp___ts_pnp_1.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz";
+        sha1 = "389a24396d425a0d3162e96d2b4638900fdc289a";
       };
     }
     {
@@ -11194,11 +11418,19 @@
       };
     }
     {
-      name = "tslib___tslib_1.11.1.tgz";
+      name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz";
       path = fetchurl {
-        name = "tslib___tslib_1.11.1.tgz";
-        url  = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz";
-        sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35";
+        name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz";
+        sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b";
+      };
+    }
+    {
+      name = "tslib___tslib_1.14.0.tgz";
+      path = fetchurl {
+        name = "tslib___tslib_1.14.0.tgz";
+        url  = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.0.tgz";
+        sha1 = "d624983f3e2c5e0b55307c3dd6c86acd737622c6";
       };
     }
     {
@@ -11282,11 +11514,11 @@
       };
     }
     {
-      name = "type___type_2.0.0.tgz";
+      name = "type___type_2.1.0.tgz";
       path = fetchurl {
-        name = "type___type_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz";
-        sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3";
+        name = "type___type_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz";
+        sha1 = "9bdc22c648cf8cf86dd23d32336a41cfb6475e3f";
       };
     }
     {
@@ -11306,11 +11538,11 @@
       };
     }
     {
-      name = "typescript___typescript_3.8.3.tgz";
+      name = "typescript___typescript_3.9.7.tgz";
       path = fetchurl {
-        name = "typescript___typescript_3.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz";
-        sha1 = "409eb8544ea0335711205869ec458ab109ee1061";
+        name = "typescript___typescript_3.9.7.tgz";
+        url  = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz";
+        sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa";
       };
     }
     {
@@ -11426,11 +11658,11 @@
       };
     }
     {
-      name = "uri_js___uri_js_4.2.2.tgz";
+      name = "uri_js___uri_js_4.4.0.tgz";
       path = fetchurl {
-        name = "uri_js___uri_js_4.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz";
-        sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0";
+        name = "uri_js___uri_js_4.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz";
+        sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602";
       };
     }
     {
@@ -11538,11 +11770,11 @@
       };
     }
     {
-      name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz";
+      name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz";
       path = fetchurl {
-        name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz";
-        sha1 = "e14de37b31a6d194f5690d67efc4e7f6fc6ab30e";
+        name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz";
+        sha1 = "54bc3cdd43317bca91e35dcaf305b1a7237de745";
       };
     }
     {
@@ -11601,6 +11833,14 @@
         sha1 = "30485ca7d70a6fd052420a3d12fd90e6339ce794";
       };
     }
+    {
+      name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz";
+      path = fetchurl {
+        name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz";
+        sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a";
+      };
+    }
     {
       name = "walker___walker_1.0.7.tgz";
       path = fetchurl {
@@ -11618,11 +11858,19 @@
       };
     }
     {
-      name = "watchpack___watchpack_1.6.0.tgz";
+      name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz";
       path = fetchurl {
-        name = "watchpack___watchpack_1.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz";
-        sha1 = "4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00";
+        name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz";
+        sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0";
+      };
+    }
+    {
+      name = "watchpack___watchpack_1.7.4.tgz";
+      path = fetchurl {
+        name = "watchpack___watchpack_1.7.4.tgz";
+        url  = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz";
+        sha1 = "6e9da53b3c80bb2d6508188f5b200410866cd30b";
       };
     }
     {
@@ -11641,6 +11889,22 @@
         sha1 = "a855980b1f0b6b359ba1d5d9fb39ae941faa63ad";
       };
     }
+    {
+      name = "webidl_conversions___webidl_conversions_5.0.0.tgz";
+      path = fetchurl {
+        name = "webidl_conversions___webidl_conversions_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz";
+        sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff";
+      };
+    }
+    {
+      name = "webidl_conversions___webidl_conversions_6.1.0.tgz";
+      path = fetchurl {
+        name = "webidl_conversions___webidl_conversions_6.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz";
+        sha1 = "9111b4d7ea80acd40f5270d666621afa78b69514";
+      };
+    }
     {
       name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz";
       path = fetchurl {
@@ -11650,11 +11914,11 @@
       };
     }
     {
-      name = "webpack_dev_server___webpack_dev_server_3.10.2.tgz";
+      name = "webpack_dev_server___webpack_dev_server_3.11.0.tgz";
       path = fetchurl {
-        name = "webpack_dev_server___webpack_dev_server_3.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.2.tgz";
-        sha1 = "3403287d674c7407aab6d9b3f72259ecd0aa0874";
+        name = "webpack_dev_server___webpack_dev_server_3.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz";
+        sha1 = "8f154a3bce1bcfd1cc618ef4e703278855e7ff8c";
       };
     }
     {
@@ -11682,19 +11946,27 @@
       };
     }
     {
-      name = "webpack___webpack_4.41.5.tgz";
+      name = "webpack___webpack_4.42.0.tgz";
       path = fetchurl {
-        name = "webpack___webpack_4.41.5.tgz";
-        url  = "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz";
-        sha1 = "3210f1886bce5310e62bb97204d18c263341b77c";
+        name = "webpack___webpack_4.42.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz";
+        sha1 = "b901635dd6179391d90740a63c93f76f39883eb8";
       };
     }
     {
-      name = "websocket_driver___websocket_driver_0.7.3.tgz";
+      name = "websocket_driver___websocket_driver_0.6.5.tgz";
       path = fetchurl {
-        name = "websocket_driver___websocket_driver_0.7.3.tgz";
-        url  = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz";
-        sha1 = "a2d4e0d4f4f116f1e6297eba58b05d430100e9f9";
+        name = "websocket_driver___websocket_driver_0.6.5.tgz";
+        url  = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz";
+        sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36";
+      };
+    }
+    {
+      name = "websocket_driver___websocket_driver_0.7.4.tgz";
+      path = fetchurl {
+        name = "websocket_driver___websocket_driver_0.7.4.tgz";
+        url  = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz";
+        sha1 = "89ad5295bbf64b480abcba31e4953aca706f5760";
       };
     }
     {
@@ -11714,19 +11986,11 @@
       };
     }
     {
-      name = "whatwg_fetch___whatwg_fetch_2.0.4.tgz";
+      name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz";
       path = fetchurl {
-        name = "whatwg_fetch___whatwg_fetch_2.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz";
-        sha1 = "dde6a5df315f9d39991aa17621853d720b85566f";
-      };
-    }
-    {
-      name = "whatwg_fetch___whatwg_fetch_3.0.0.tgz";
-      path = fetchurl {
-        name = "whatwg_fetch___whatwg_fetch_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz";
-        sha1 = "fc804e458cc460009b1a2b966bc8817d2578aefb";
+        name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz";
+        sha1 = "e5f871572d6879663fa5674c8f833f15a8425ab3";
       };
     }
     {
@@ -11753,6 +12017,14 @@
         sha1 = "c2c492f1eca612988efd3d2266be1b9fc6170d06";
       };
     }
+    {
+      name = "whatwg_url___whatwg_url_8.3.0.tgz";
+      path = fetchurl {
+        name = "whatwg_url___whatwg_url_8.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.3.0.tgz";
+        sha1 = "d1e11e565334486cdb280d3101b9c3fd1c867582";
+      };
+    }
     {
       name = "which_module___which_module_2.0.0.tgz";
       path = fetchurl {
@@ -11929,14 +12201,6 @@
         sha1 = "cb565bd6d7071a8f16660686051e969ad32f54d5";
       };
     }
-    {
-      name = "wrap_ansi___wrap_ansi_2.1.0.tgz";
-      path = fetchurl {
-        name = "wrap_ansi___wrap_ansi_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
-      };
-    }
     {
       name = "wrap_ansi___wrap_ansi_5.1.0.tgz";
       path = fetchurl {
@@ -11986,11 +12250,11 @@
       };
     }
     {
-      name = "ws___ws_7.2.3.tgz";
+      name = "ws___ws_7.3.1.tgz";
       path = fetchurl {
-        name = "ws___ws_7.2.3.tgz";
-        url  = "https://registry.yarnpkg.com/ws/-/ws-7.2.3.tgz";
-        sha1 = "a5411e1fb04d5ed0efee76d26d5c46d830c39b46";
+        name = "ws___ws_7.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz";
+        sha1 = "d0547bf67f7ce4f12a72dfe31262c68d7dc551c8";
       };
     }
     {
@@ -12050,19 +12314,11 @@
       };
     }
     {
-      name = "yaml___yaml_1.8.3.tgz";
+      name = "yaml___yaml_1.10.0.tgz";
       path = fetchurl {
-        name = "yaml___yaml_1.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/yaml/-/yaml-1.8.3.tgz";
-        sha1 = "2f420fca58b68ce3a332d0ca64be1d191dd3f87a";
-      };
-    }
-    {
-      name = "yargs_parser___yargs_parser_11.1.1.tgz";
-      path = fetchurl {
-        name = "yargs_parser___yargs_parser_11.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz";
-        sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4";
+        name = "yaml___yaml_1.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz";
+        sha1 = "3b593add944876077d4d683fee01081bd9fff31e";
       };
     }
     {
@@ -12073,14 +12329,6 @@
         sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38";
       };
     }
-    {
-      name = "yargs___yargs_12.0.5.tgz";
-      path = fetchurl {
-        name = "yargs___yargs_12.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz";
-        sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13";
-      };
-    }
     {
       name = "yargs___yargs_13.3.2.tgz";
       path = fetchurl {

From dfb9e8689dfbe633f6f7ac579f89593ab0a0368b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 3 Nov 2020 14:25:18 +0100
Subject: [PATCH 1328/3942] kupfer: fix build

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

diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix
index c7f54990107f..f2744bf23ea5 100644
--- a/pkgs/applications/misc/kupfer/default.nix
+++ b/pkgs/applications/misc/kupfer/default.nix
@@ -16,6 +16,8 @@ buildPythonApplication rec {
   pname = "kupfer";
   version = "319";
 
+  format = "other";
+
   src = fetchurl {
     url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz";
     sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92";
@@ -33,13 +35,9 @@ buildPythonApplication rec {
   # see https://github.com/NixOS/nixpkgs/issues/56943 for details
   strictDeps = false;
 
-  postInstall = let
-    pythonPath = (stdenv.lib.concatMapStringsSep ":"
-      (m: "${m}/lib/${python.libPrefix}/site-packages")
-      propagatedBuildInputs);
-  in ''
+  postInstall = ''
     gappsWrapperArgs+=(
-      "--prefix" "PYTHONPATH" : "${pythonPath}"
+      "--prefix" "PYTHONPATH" : "${makePythonPath propagatedBuildInputs}"
       "--set" "PYTHONNOUSERSITE" "1"
     )
   '';

From 9c237eb7ab81f47e33d76c93441d44f43dafd53d Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 6 Oct 2020 14:30:24 +0200
Subject: [PATCH 1329/3942] ardour: 6.2 -> 6.3

---
 pkgs/applications/audio/ardour/default.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 0c38057d56f8..49579e332946 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -12,17 +12,14 @@
 , fftw
 , fftwSinglePrec
 , flac
-, fluidsynth
 , glibc
 , glibmm
 , graphviz
 , gtkmm2
-, hidapi
 , itstool
 , libarchive
 , libjack2
 , liblo
-, libltc
 , libogg
 , libpulseaudio
 , librdf_raptor
@@ -42,11 +39,11 @@
 , perl
 , pkg-config
 , python3
-, qm-dsp
 , readline
 , rubberband
 , serd
 , sord
+, soundtouch
 , sratom
 , suil
 , taglib
@@ -55,13 +52,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "ardour";
-  version = "6.2";
+  version = "6.3";
 
   # don't fetch releases from the GitHub mirror, they are broken
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
     rev = version;
-    sha256 = "17jxbqavricy01x4ymq6d302djsqfnv84m7dm4fd8cpka0dqjp1y";
+    sha256 = "050p1adgyirr790a3xp878pq3axqwzcmrk3drgm9z6v753h0xhcd";
   };
 
   patches = [
@@ -91,15 +88,12 @@ stdenv.mkDerivation rec {
     fftw
     fftwSinglePrec
     flac
-    fluidsynth
     glibmm
     gtkmm2
-    hidapi
     itstool
     libarchive
     libjack2
     liblo
-    libltc
     libogg
     libpulseaudio
     librdf_raptor
@@ -118,11 +112,11 @@ stdenv.mkDerivation rec {
     pango
     perl
     python3
-    qm-dsp
     readline
     rubberband
     serd
     sord
+    soundtouch
     sratom
     suil
     taglib
@@ -136,11 +130,11 @@ stdenv.mkDerivation rec {
     "--no-phone-home"
     "--optimize"
     "--ptformat"
-    "--qm-dsp-include=${qm-dsp}/include/qm-dsp"
     "--run-tests"
     "--test"
-    "--use-external-libs"
   ];
+  # removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437
+  # "--use-external-libs"
 
   # Ardour's wscript requires git revision and date to be available.
   # Since they are not, let's generate the file manually.

From eee7e054a57bec2067cc165f92017a1e8507af4a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 5 Nov 2020 20:17:11 +0100
Subject: [PATCH 1330/3942] tdesktop: 2.4.6 -> 2.4.7

---
 .../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 a754e544bc07..3bd8ac58e8bc 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -22,12 +22,12 @@ let
 
 in mkDerivation rec {
   pname = "telegram-desktop";
-  version = "2.4.6";
+  version = "2.4.7";
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "190k9ik678br5k892gj26bx4rbj5rn5ks4qgf2nrlgww0z59fvrc";
+    sha256 = "1j2v29952l0am357pqvvgzm2zghmwhlr833kgp85hssxpr9xy4vv";
   };
 
   postPatch = ''

From 4653f62f44b1062c41eaad7d3bc5bbaf2f298d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 5 Nov 2020 20:44:01 +0100
Subject: [PATCH 1331/3942] _1password-gui: 0.9.1 -> 0.9.2-1

Changes:

https://1password.community/discussion/116663/1password-beta-0-9-2
---
 pkgs/tools/security/1password-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix
index b9e668aaa403..0a76a04196c3 100644
--- a/pkgs/tools/security/1password-gui/default.nix
+++ b/pkgs/tools/security/1password-gui/default.nix
@@ -13,11 +13,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "1password";
-  version = "0.9.1";
+  version = "0.9.2-1";
 
   src = fetchurl {
     url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
-    sha256 = "04hv7hw4s3f65kf3ggh9l0nrx25k5yj2kqv83nl7pvam5lvnv8sz";
+    sha256 = "19m8qfhmdzgz76xba9wi5cb12jqwr17afqzajvgq681i52fij0lr";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 76d4a93444141d020946133048fe04b14bb05729 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 17:28:15 -0500
Subject: [PATCH 1332/3942] linux: 5.9.5 -> 5.9.6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix
index f4ef41ec8644..59f18baa8c83 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.9.5";
+  version = "5.9.6";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1q427ryzh0dfg4lxyf04qfbyckxkcczxc4a6qd3ciwx2isv262ca";
+    sha256 = "0w2kcng09nzk09dwkx4azdfgnwzbd2mz8lyl4j69bwx837z85hbc";
   };
 } // (args.argsOverride or {}))

From 2490755a9802eef4c419ced4309a00e6f4b6623e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:49 +0100
Subject: [PATCH 1333/3942] python3Packages.GitPython: 3.1.7 -> 3.1.11

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

diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix
index 67ec5c2e4d1f..2edb8c51e3a0 100644
--- a/pkgs/development/python-modules/GitPython/default.nix
+++ b/pkgs/development/python-modules/GitPython/default.nix
@@ -1,13 +1,13 @@
 { lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }:
 
 buildPythonPackage rec {
-  version = "3.1.7";
+  version = "3.1.11";
   pname = "GitPython";
   disabled = isPy27; # no longer supported
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2db287d71a284e22e5c2846042d0602465c7434d910406990d5b74df4afb0858";
+    sha256 = "befa4d101f91bad1b632df4308ec64555db684c360bd7d2130b4807d49ce86b8";
   };
 
   patches = [

From e5614a48ab7f3d792a66b2717c1f321f8d478d6b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:49 +0100
Subject: [PATCH 1334/3942] python3Packages.adal: 1.2.4 -> 1.2.5

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

diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index 58a8ce72cb98..0df7247986d0 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "adal";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7a15d22b1ee7ce1be92441199958748982feba6b7dec35fbf60f9b607bad1bc0";
+    sha256 = "8003ba03ef04170195b3eddda8a5ab43649ef2c5f0287023d515affb1ccfcfc3";
   };
 
   propagatedBuildInputs =  [ requests pyjwt dateutil ];

From 3c68887b23b8606e25dc923e49cfa94b1c0e23a4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:49 +0100
Subject: [PATCH 1335/3942] python3Packages.aiohttp: 3.6.2 -> 3.6.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 2e5191909bb3..90a7b41f7c10 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -25,13 +25,13 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.6.2";
+  version = "3.6.3";
   # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5";
+    sha256 = "698cd7bc3c7d1b82bb728bae835724a486a8c376647aec336aa21a60113c3645";
   };
 
   checkInputs = [

From 73719b114821f4aceec39de1d37010b504c8dc36 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:49 +0100
Subject: [PATCH 1336/3942] python3Packages.alembic: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 18a56936d9db..4061dca8aa28 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "alembic";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "035ab00497217628bf5d0be82d664d8713ab13d37b630084da8e1f98facf4dbf";
+    sha256 = "5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245";
   };
 
   buildInputs = [ pytest pytestcov mock coverage ];

From 6a9d91dc358aa09674b9f64269bb62ae9215f9b0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:49 +0100
Subject: [PATCH 1337/3942] python3Packages.amazon_kclpy: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix
index f18b5e59e34f..47a62cd2afce 100644
--- a/pkgs/development/python-modules/amazon_kclpy/default.nix
+++ b/pkgs/development/python-modules/amazon_kclpy/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "amazon_kclpy";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "amazon-kinesis-client-python";
     rev = "v${version}";
-    sha256 = "1qg86y9172gm5592ja7lr6w7kfnx668j99bf3ijklpk5yshxwr9m";
+    sha256 = "0jjqh9hq0hx2wr7wlqjr6cixpygragwlk4pz7rkqg2gkbhazmnq3";
   };
 
   # argparse is just required for python2.6

From 495f158b29e7549483902c9ea47cd1662b17ac25 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:49 +0100
Subject: [PATCH 1338/3942] python3Packages.amply: 0.1.2 -> 0.1.4

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

diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix
index e0e9100f7924..ddb75d592b81 100644
--- a/pkgs/development/python-modules/amply/default.nix
+++ b/pkgs/development/python-modules/amply/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "amply";
-  version = "0.1.2";
+  version = "0.1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1j2dqdz1y1nbyw33qq89v0f5rkmqfbga72d9hax909vpcapm6pbf";
+    sha256 = "cb12dcb49d16b168c02be128a1527ecde50211e4bd94af76ff4e67707f5a2d38";
   };
 
   buildInputs = [ setuptools_scm ];

From 037a7661fd0a13daea97c6d221e2d7201b76b47b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:49 +0100
Subject: [PATCH 1339/3942] python3Packages.apispec: 3.3.1 -> 3.3.2

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

diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
index 222f2efdd626..9941cf7ae60a 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/pkgs/development/python-modules/apispec/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "apispec";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f5244ccca33f7a81309f6b3c9d458e33e869050c2d861b9f8cee24b3ad739d2b";
+    sha256 = "d23ebd5b71e541e031b02a19db10b5e6d5ef8452c552833e3e1afc836b40b1ad";
   };
 
   checkInputs = [

From 7343285d5c7418ee1efac15d8218178b42947960 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:50 +0100
Subject: [PATCH 1340/3942] python3Packages.astropy: 4.0.1.post1 -> 4.0.3

---
 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 147a4d65de5e..1affa4b50538 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "astropy";
-  version = "4.0.1.post1";
+  version = "4.0.3";
 
   disabled = !isPy3k; # according to setup.py
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1da4xj793ldck29aajyb514wpz330cml26f3gdp45jj531n4lc2w";
+    sha256 = "cf69d1a3f140ca8fe1664202072201395495a73c334a69fc965fab6a6e1d281a";
   };
 
   nativeBuildInputs = [ astropy-helpers ];

From a77a6a9bd75fa34e40e3f36d73357762702411ab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:50 +0100
Subject: [PATCH 1341/3942] python3Packages.atlassian-python-api: 1.17.5 ->
 1.17.6

---
 .../python-modules/atlassian-python-api/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index 5161f85a4c10..8942b5e59130 100755
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "atlassian-python-api";
-  version = "1.17.5";
+  version = "1.17.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cbd7941fa7e1eb6f63e12724277894350298745480297658da912e07234314cc";
+    sha256 = "c54ebb385eeb18c6275091687ad1f21e5e91613b6aca31b6727e880a678d16c2";
   };
 
   checkInputs = [ pytestrunner pytest ];

From 841886bb12c638cb7be664807fb9be700c275775 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:50 +0100
Subject: [PATCH 1342/3942] python3Packages.awkward1: 0.2.35 -> 0.2.38

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

diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix
index 927d620948ca..591035461857 100644
--- a/pkgs/development/python-modules/awkward1/default.nix
+++ b/pkgs/development/python-modules/awkward1/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "awkward1";
-  version = "0.2.35";
+  version = "0.2.38";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "563868f0f2d0cb398ce3616ee3f9734cc68cee9a612d35cab830ec5c728f1474";
+    sha256 = "f25db4920677029a92e92b994f1056902724b6a947549254c1446bdc6e388671";
   };
 
   nativeBuildInputs = [ cmake ];

From 8c872d6567167a9c98387e9ae415ac368dd7ed7e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:50 +0100
Subject: [PATCH 1343/3942] python3Packages.aws-adfs: 1.24.4 -> 1.24.5

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

diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix
index cb014896d294..ce4c6f789263 100644
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/pkgs/development/python-modules/aws-adfs/default.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "aws-adfs";
-  version = "1.24.4";
+  version = "1.24.5";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "601b056fa8ba4b615289def3b1aa49aa58f1f4aa6b89f3cf7cf1e0aee9f2291c";
+    sha256 = "6a78bd31477ea9988166215ae86abcbfe1413bee20373ecdf0dd170b7290db55";
   };
 
   # Relax version constraint

From 7a80631a8bc6425138842ba9323a6ba51895cf62 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:50 +0100
Subject: [PATCH 1344/3942] python3Packages.bayespy: 0.5.19 -> 0.5.20

---
 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 0532e0e022ef..ef3dfa095184 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.19";
+  version = "0.5.20";
 
   # Python 2 not supported and not some old Python 3 because MPL doesn't support
   # them properly.
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "24e1327ce241a0113abf217fbaf41ac25e04f5a01f9ed606610f2f1f2d82d34f";
+    sha256 = "8c16cdc73bbcd9a1124a0495056065b7ce938dbe6c2c780dc330c83fb4d2640a";
   };
 
   checkInputs = [ pytest nose glibcLocales ];

From d4408a8c24b44e62f7ff13459e18b450c9238268 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:50 +0100
Subject: [PATCH 1345/3942] python3Packages.beautifulsoup4: 4.9.1 -> 4.9.3

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

diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix
index f804ea9b282d..a0afd0c4f4c4 100644
--- a/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "beautifulsoup4";
-  version = "4.9.1";
+  version = "4.9.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "73cc4d115b96f79c7d77c1c7f7a0a8d4c57860d1041df407dd1aae7f07a77fd7";
+    sha256 = "84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25";
   };
 
   checkInputs = [ pytest ];

From 4b2d597eec4e50002c85825d4a2aca59c485d5ab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:50 +0100
Subject: [PATCH 1346/3942] python3Packages.bokeh: 2.2.1 -> 2.2.3

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

diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 55a01c65f1c2..091b020efc25 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -33,11 +33,11 @@
 
 buildPythonPackage rec {
   pname = "bokeh";
-  version = "2.2.1";
+  version = "2.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "qC6e69eh4uu3+PwerYAv79EKhNrvjsS/yYYSEyOUhVU=";
+    sha256 = "c4a3f97afe5f525019dd58ee8c4e3d43f53fe1b1ac264ccaae9b02c07b2abc17";
   };
 
   patches = [

From 9bd265b70e5ab7da1109a89dd23883f6ee1ddae5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1347/3942] python3Packages.boto3: 1.15.9 -> 1.15.18

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

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index c1f1b180b707..713b50c68291 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.15.9"; # N.B: if you change this, change botocore too
+  version = "1.15.18"; # N.B: if you change this, change botocore too
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zrsrz7c8aqj3n06piybwf7vy026rflr0ky362q615rln6iggx82";
+    sha256 = "f56148e2c6b9a2d704218da42f07d72f00270bfddb13bc1bdea20d3327daa51e";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

From b7e95158c37eb21bc93462e3782b15ce0cdaba21 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1348/3942] python3Packages.botocore: 1.18.9 -> 1.18.18

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

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index daa5897fefd0..d896367c7c6b 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.18.9"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.18.18"; # N.B: if you change this, change boto3 and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0rb3in7n9hdhp3sklkw78l378103khgmhdfy13kxfbgb0646pc1m";
+    sha256 = "e224754230e7e015836ba20037cac6321e8e2ce9b8627c14d579fcb37249decd";
   };
 
   propagatedBuildInputs = [

From b25737a56d71e1e9ec0008c4a52769603cb5d0cc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1349/3942] python3Packages.browser-cookie3: 0.11.1 -> 0.11.3

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

diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix
index 61e50246a139..3cc99de2aa11 100644
--- a/pkgs/development/python-modules/browser-cookie3/default.nix
+++ b/pkgs/development/python-modules/browser-cookie3/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}:
 buildPythonPackage rec {
   pname = "browser-cookie3";
-  version = "0.11.1";
+  version = "0.11.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5d1f825fc9cc6f98fe0ee3f97cdb4947c22d59ac8a11643da5837ebd8c873f05";
+    sha256 = "d4435cd0fdad358f8522ed72294b7c3c02f86b24b6d1c6bb1e7f0a53413d3bd3";
   };
 
   disabled = !isPy3k;

From 9cac3582c0374279ddb3fb3f2a5ea8237a967cd9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1350/3942] python3Packages.cffi: 1.14.2 -> 1.14.3

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

diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index c4e14c0e7fba..cee7a7fe8a18 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -2,11 +2,11 @@
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
-  version = "1.14.2";
+  version = "1.14.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b";
+    sha256 = "f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591";
   };
 
   outputs = [ "out" "dev" ];

From c4523121e35d29cab85bbb345254808a8af865fc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1351/3942] python3Packages.codecov: 2.1.9 -> 2.1.10

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

diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix
index 8424a560d260..455888c447da 100644
--- a/pkgs/development/python-modules/codecov/default.nix
+++ b/pkgs/development/python-modules/codecov/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "codecov";
-  version = "2.1.9";
+  version = "2.1.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "355fc7e0c0b8a133045f0d6089bde351c845e7b52b99fec5903b4ea3ab5f6aab";
+    sha256 = "d30ad6084501224b1ba699cbf018a340bb9553eb2701301c14133995fdd84f33";
   };
 
   checkInputs = [ unittest2 ]; # Tests only

From ac12f5de5fda5d7c6f8ae7fac4b26bfcb5ebe055 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1352/3942] python3Packages.colorama: 0.4.3 -> 0.4.4

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

diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix
index d22f93d47f17..063491845827 100644
--- a/pkgs/development/python-modules/colorama/default.nix
+++ b/pkgs/development/python-modules/colorama/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "colorama";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1";
+    sha256 = "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b";
   };
 
   # No tests in archive

From 8841dd8a2868bd83c74d415950b36a4012f81b0c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1353/3942] python3Packages.configparser: 5.0.0 -> 5.0.1

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

diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix
index 7322a6891cd8..ad9a13c28bf0 100644
--- a/pkgs/development/python-modules/configparser/default.nix
+++ b/pkgs/development/python-modules/configparser/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "configparser";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2ca44140ee259b5e3d8aaf47c79c36a7ab0d5e94d70bd4105c03ede7a20ea5a1";
+    sha256 = "005c3b102c96f4be9b8f40dafbd4997db003d07d1caa19f37808be8031475f2a";
   };
 
   # No tests available

From 3b64aa3d8053afe6c5cb1bd907752d2ba3e089b3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1354/3942] python3Packages.cornice: 5.0.2 -> 5.0.3

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

diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix
index 9897115353f3..d09cffb31d64 100644
--- a/pkgs/development/python-modules/cornice/default.nix
+++ b/pkgs/development/python-modules/cornice/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "cornice";
-  version = "5.0.2";
+  version = "5.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4fcf3be295514e7e20fdd602fea8d204127bb02da2ff6bdbc8b6fba859ac9fd0";
+    sha256 = "f971831e90343374b21c0c97d523e23eb09cec41a2a8fc2e85bb5c2585348576";
   };
 
   propagatedBuildInputs = [ pyramid simplejson six venusian ];

From dc7b19254ae19e4199017701c34ebcf865b9f7b3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1355/3942] python3Packages.croniter: 0.3.34 -> 0.3.35

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

diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix
index 05e855b12dc1..81af265ac3c6 100644
--- a/pkgs/development/python-modules/croniter/default.nix
+++ b/pkgs/development/python-modules/croniter/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "croniter";
-  version = "0.3.34";
+  version = "0.3.35";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7186b9b464f45cf3d3c83a18bc2344cc101d7b9fd35a05f2878437b14967e964";
+    sha256 = "b9075573d9d18fdc4c67ad6741c4bfa4b446b1b1d7f03279757244c8a75abedf";
   };
 
   propagatedBuildInputs = [

From 8e43c85dfa36a1e9278cb569d153834986cb1dad Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1356/3942] python3Packages.cvxpy: 1.1.6 -> 1.1.7

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

diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index 1050591f641e..58d06e60d39c 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -17,13 +17,13 @@
 
 buildPythonPackage rec {
   pname = "cvxpy";
-  version = "1.1.6";
+  version = "1.1.7";
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "36527573c937cedd270f46c77b50bb5e16b96ca7b05a7a480bdc8c9052595723";
+    sha256 = "330eb76e8369c360b68d9231c6eb350848e373b5952134f9bfebaed1a4c4211f";
   };
 
   propagatedBuildInputs = [

From e1297d63f69dd3825ee27f17941f3a432b3c3538 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1357/3942] python3Packages.deform: 2.0.10 -> 2.0.14

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

diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix
index a3fd0f2b8f53..e1d7e042648c 100644
--- a/pkgs/development/python-modules/deform/default.nix
+++ b/pkgs/development/python-modules/deform/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "deform";
-  version = "2.0.10";
+  version = "2.0.14";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2f4e98a5b5bdcdfff9a62f88bd17c7ee378b7c8be61738797442eed5b961d3d2";
+    sha256 = "35d9acf144245772a70d05bd24b8263e8cd284f0d564011e8bf331d6150acfc7";
   };
 
   postPatch = ''

From e1d48c6a3a3454428eeda10cd86b2defe55dd6fa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1358/3942] python3Packages.django-simple-captcha: 0.5.12 ->
 0.5.13

---
 .../python-modules/django-simple-captcha/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix
index 51c5b26bdf27..0724bf27b317 100644
--- a/pkgs/development/python-modules/django-simple-captcha/default.nix
+++ b/pkgs/development/python-modules/django-simple-captcha/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "django-simple-captcha";
-  version = "0.5.12";
+  version = "0.5.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1g92sdgcb81r3il34pg0z210cz6wm14k00b558nshai8br1g09gw";
+    sha256 = "5e43ba3b61daf690ac0319157837bb57e31df8bddbdc9a59ef42ef1a99e21fa2";
     extension = "zip";
   };
 

From deb8e23f39f469a6bb3d316b83ac63473be6b041 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1359/3942] python3Packages.django-reversion: 3.0.7 -> 3.0.8

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

diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix
index 9c61cfdfe86a..9d307734367c 100644
--- a/pkgs/development/python-modules/django_reversion/default.nix
+++ b/pkgs/development/python-modules/django_reversion/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "django-reversion";
-  version = "3.0.7";
+  version = "3.0.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "72fc53580a6b538f0cfff10f27f42333f67d79c406399289c94ec5a193cfb3e1";
+    sha256 = "49e9930f90322dc6a2754dd26144285cfcc1c5bd0c1c39ca95d5602c5054ae32";
   };
 
   # tests assume the availability of a mysql/postgresql database

From 61113ec48739e91dc82d32bad0e7c884a269782f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:51 +0100
Subject: [PATCH 1360/3942] python3Packages.djangorestframework: 3.11.1 ->
 3.11.2

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

diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 5a2d155644a4..8d1055029b7a 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPythonPackage, fetchPypi, django, isPy27 }:
 
 buildPythonPackage rec {
-  version = "3.11.1";
+  version = "3.11.2";
   pname = "djangorestframework";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6dd02d5a4bd2516fb93f80360673bf540c3b6641fec8766b1da2870a5aa00b32";
+    sha256 = "a5967b68a04e0d97d10f4df228e30f5a2d82ba63b9d03e1759f84993b7bf1b53";
   };
 
   # Test settings are missing

From 27a3c9226879f8b079fc7ad6a4c7f6ecf8f27150 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1361/3942] python3Packages.dotnetcore2: 2.1.14 -> 2.1.17

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

diff --git a/pkgs/development/python-modules/dotnetcore2/default.nix b/pkgs/development/python-modules/dotnetcore2/default.nix
index 7cc069707aad..d5bab1526e2c 100644
--- a/pkgs/development/python-modules/dotnetcore2/default.nix
+++ b/pkgs/development/python-modules/dotnetcore2/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "dotnetcore2";
-  version = "2.1.14";
+  version = "2.1.17";
   format = "wheel";
   disabled = isPy27;
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     inherit pname version format;
     python = "py3";
     platform = "manylinux1_x86_64";
-    sha256 = "0dxp9a73ncjylc09bjwq81fgj5ysk1yi27l8ka5f98121k1kmn6q";
+    sha256 = "87248bf5b5c751817025530bc1514e31f140e109f097a28ae8f8592fa7e4098d";
   };
 
   nativeBuildInputs = [ unzip ];

From 249b263128b0a52e9d0bb4322074da1c65f68e96 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1362/3942] python3Packages.dulwich: 0.20.5 -> 0.20.6

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

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index de0d6f4c3e29..caf584d84f7c 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -4,12 +4,12 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.20.5";
+  version = "0.20.6";
   pname = "dulwich";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "98484ede022da663c96b54bc8dcdb4407072cb50efd5d20d58ca4e7779931305";
+    sha256 = "e593f514b8ac740b4ceeb047745b4719bfc9f334904245c6edcb3a9d002f577b";
   };
 
   LC_ALL = "en_US.UTF-8";

From 4ee5695d7f349129383b1d84956f7105552ba6a6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1363/3942] python3Packages.eventlet: 0.28.0 -> 0.28.1

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

diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index abd279d6c33c..a712b1491380 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "eventlet";
-  version = "0.28.0";
+  version = "0.28.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9c7c63e8a80c7d02d692b2cf308312402fa4777335fd3de5da45097383301ff3";
+    sha256 = "55eef68e39473d6a58d28c4cf388cb8b7d29bab76568e7124d7df98d9365ab35";
   };
 
   propagatedBuildInputs = [ dnspython greenlet monotonic six ]

From 9f24ef5798feaca46cd465c02b17da307ba19078 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1364/3942] python3Packages.Faker: 4.1.2 -> 4.1.8

---
 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 102f506b6a69..4cc3c86aab68 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -17,11 +17,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
 
 buildPythonPackage rec {
   pname = "Faker";
-  version = "4.1.2";
+  version = "4.1.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ff188c416864e3f7d8becd8f9ee683a4b4101a2a2d2bcdcb3e84bb1bdd06eaae";
+    sha256 = "179418909da04b04000eab5463c403895faed2849d36ef8d9cbda72cc44797a0";
   };
 
   nativeBuildInputs = [ pytestrunner ];

From a357d50562aa4ed58b4120ee010b114eac73df6b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1365/3942] python3Packages.Fiona: 1.8.13.post1 -> 1.8.17

---
 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 cd4ed57d792c..5a0a97220fa9 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "Fiona";
-  version = "1.8.13.post1";
+  version = "1.8.17";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00366f2j21b5r4r8310sadf7jjhdr44s0381dhjqkw2nzpwjnhqs";
+    sha256 = "716201c21246587f374785bec6d6a20a984fe1f6c2b0e83bf15127eb8f724d0c";
   };
 
   CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";

From 78e9fd52b1ae36071f5955f6c18905a356eb9394 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1366/3942] python3Packages.flake8: 3.8.3 -> 3.8.4

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

diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix
index e44aac202cf4..a369919b98fb 100644
--- a/pkgs/development/python-modules/flake8/default.nix
+++ b/pkgs/development/python-modules/flake8/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "flake8";
-  version = "3.8.3";
+  version = "3.8.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f04b9fcbac03b0a3e58c0ab3a0ecc462e023a9faf046d57794184028123aa208";
+    sha256 = "aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b";
   };
 
   checkInputs = [ pytest mock pytestrunner ];

From 3bbfa5c217ba00875a3ea3d0cf9ea64ff036f7aa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1367/3942] python3Packages.Flask-Cors: 3.0.8 -> 3.0.9

---
 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 e20d213029c0..85635c0e65f9 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/pkgs/development/python-modules/flask-cors/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "Flask-Cors";
-  version = "3.0.8";
+  version = "3.0.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05id72xwvhni23yasdvpdd8vsf3v4j6gzbqqff2g04j6xcih85vj";
+    sha256 = "6bcfc100288c5d1bcb1dbb854babd59beee622ffd321e444b05f24d6d58466b8";
   };
 
   checkInputs = [ nose ];

From 920815b75bf2b29c74c4d88efcbb85ec6468d910 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1368/3942] python3Packages.google-api-core: 1.22.1 -> 1.22.4

---
 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 a72f68c19ff9..85371f06ca51 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google_api_core/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "1.22.1";
+  version = "1.22.4";
   disabled = isPy27; # google namespace no longer works on python2
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "35cba563034d668ae90ffe1f03193a84e745b38f09592f60258358b5e5ee6238";
+    sha256 = "4a9d7ac2527a9e298eebb580a5e24e7e41d6afd97010848dd0f306cae198ec1a";
   };
 
   propagatedBuildInputs = [

From 45fa64117b932eb7f1a82481ff486fa37d42a49e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1369/3942] python3Packages.google-cloud-bigquery-datatransfer:
 1.1.0 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
index 97ad04334fc0..0647c1f91730 100644
--- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
+++ b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-datatransfer";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "71791a38a0ec535fdd4970d3403aa4cb2d9ca5c2729f80730858be2776b3c518";
+    sha256 = "8536e8656658d349db3bd5a763ce795fe79a5bfdbd1544f406957cc42e34690b";
   };
 
   checkInputs = [ pytest mock ];

From 1b1961ed41d85df589f448e512e19ee0427833b0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1370/3942] python3Packages.google-cloud-core: 1.4.1 -> 1.4.3

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

diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix
index f277711e8f16..01ec24a23810 100644
--- a/pkgs/development/python-modules/google_cloud_core/default.nix
+++ b/pkgs/development/python-modules/google_cloud_core/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-core";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "613e56f164b6bee487dd34f606083a0130f66f42f7b10f99730afdf1630df507";
+    sha256 = "21afb70c1b0bce8eeb8abb5dca63c5fd37fc8aea18f4b6d60e803bd3d27e6b80";
   };
 
   propagatedBuildInputs = [ google_api_core grpcio setuptools ];

From 038819118366fc280d1891ef9bf58a70451f518e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1371/3942] python3Packages.google-cloud-dataproc: 2.0.0 ->
 2.0.2

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

diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix
index c7d0bf1b730b..68b04508e605 100644
--- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix
+++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dataproc";
-  version = "2.0.0";
+  version = "2.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d6d94af6c0d5aee0bb88d058a180f4d3341209e112f85a1c7ce0df7887cbf867";
+    sha256 = "1ab0128be96a01c6ba3d10db21b8018583b15995ad9a088cb3e4c3df90a62e46";
   };
 
   checkInputs = [ pytest mock ];

From 8b327dfc61a22fd05642354db6ae5e7d27194154 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1372/3942] python3Packages.google-cloud-datastore: 1.15.0 ->
 1.15.3

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

diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/pkgs/development/python-modules/google_cloud_datastore/default.nix
index ff2d0b3baa91..652eca773a36 100644
--- a/pkgs/development/python-modules/google_cloud_datastore/default.nix
+++ b/pkgs/development/python-modules/google_cloud_datastore/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datastore";
-  version = "1.15.0";
+  version = "1.15.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c94bc357e975ce7bd5e5636497316c1bf4d015891e0ed96df9e7ce901415b94a";
+    sha256 = "3da44b4c8230a83e69dd9429324cca9d3000ee8a8bb11f3b005c7837fcd844b3";
   };
 
   checkInputs = [ pytest mock ];

From 56c109941d8337ca74d8c868527b183b73878301 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1373/3942] python3Packages.green: 3.2.1 -> 3.2.3

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

diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix
index 5ecf9a18ad50..dae14036ef03 100644
--- a/pkgs/development/python-modules/green/default.nix
+++ b/pkgs/development/python-modules/green/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "green";
-  version = "3.2.1";
+  version = "3.2.3";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c5a90e247237ac7e320120961608cf65191134fa400d327cbd4d09864c880935";
+    sha256 = "2fc2fdd86dbc700ca6afa6d83f1216bb9bcaf4d1b3ae36ba52878ac1b9cd063c";
   };
 
   propagatedBuildInputs = [

From 4bfbcbeb383e442bb9b60d82fc401340bc38536a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1374/3942] python3Packages.greenlet: 0.4.16 -> 0.4.17

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

diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index c325c9652491..5b7581ada8f0 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "greenlet";
-  version = "0.4.16";
+  version = "0.4.17";
   disabled = isPyPy;  # builtin for pypy
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c";
+    sha256 = "41d8835c69a78de718e466dd0e6bfd4b46125f21a67c3ff6d76d8d8059868d6b";
   };
 
   propagatedBuildInputs = [ six ];

From 97c5d7783969eea49878a210f2d5e6a33ba6567e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:52 +0100
Subject: [PATCH 1375/3942] python3Packages.gym: 0.17.2 -> 0.17.3

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

diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index 547f79a7b101..d826fc33324f 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "gym";
-  version = "0.17.2";
+  version = "0.17.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb495aa56995b01274a2213423bf5ba05b8f4fd51c6dc61e9d4abddd1189718e";
+    sha256 = "96a7dd4e9cdb39e30c7a79e5773570fd9408f7fdb58c714c293cfbb314818eb6";
   };
 
   postPatch = ''

From 7d9be623822df99d13e0ca5e56840d7fdeb5aba4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1376/3942] python3Packages.hmmlearn: 0.2.3 -> 0.2.4

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

diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix
index c92c707d9072..909606c25ebf 100644
--- a/pkgs/development/python-modules/hmmlearn/default.nix
+++ b/pkgs/development/python-modules/hmmlearn/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "hmmlearn";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchurl {
     url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz";
-    sha256 = "8003d5dc55612de8016156abdc7aa1dd995abc2431adb1ef33dd84a6d29e56bf";
+    sha256 = "0f5cb598a7494b9703c6188246dc89e529d46cbb6700eca70cc895085f0b3cc3";
   };
 
   buildInputs = [ setuptools_scm cython ];

From ac466d3d9f11efecf52a5a9d4ccc0afc03747fed Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1377/3942] python3Packages.ipdb: 0.13.3 -> 0.13.4

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

diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix
index c32726be7e47..8fd20290b0eb 100644
--- a/pkgs/development/python-modules/ipdb/default.nix
+++ b/pkgs/development/python-modules/ipdb/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "ipdb";
-  version = "0.13.3";
+  version = "0.13.4";
   disabled = isPyPy;  # setupterm: could not find terminfo database
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y3yk5k2yszcwxsjinvf40b1wl8wi8l6kv7pl9jmx9j53hk6vx6n";
+    sha256 = "c85398b5fb82f82399fc38c44fe3532c0dde1754abee727d8f5cfcc74547b334";
   };
 
   propagatedBuildInputs = [ ipython ];

From 9969e9a68e13ece19ae22f432b5cc8e3336174d6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1378/3942] python3Packages.ipyvue: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix
index c9426473ba6d..3941f08348a5 100644
--- a/pkgs/development/python-modules/ipyvue/default.nix
+++ b/pkgs/development/python-modules/ipyvue/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "ipyvue";
-  version = "1.4.0";
+  version = "1.4.1";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3253727e8e12e3c157550e3e8d6986edf61ad0d68299992fbf3fa6acec41a12e";
+    sha256 = "5b59cf92a1eb7fbef4f2d02be49ac562a721a6cf34f991ac963222cf4c8885a1";
   };
 
   propagatedBuildInputs = [ ipywidgets ];

From e847f89c74f319bec03b46028cbb5f5dced09dff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1379/3942] python3Packages.iso8601: 0.1.12 -> 0.1.13

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

diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix
index 28f8db12895a..b83374fff3e1 100644
--- a/pkgs/development/python-modules/iso8601/default.nix
+++ b/pkgs/development/python-modules/iso8601/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "iso8601";
-  version = "0.1.12";
+  version = "0.1.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82";
+    sha256 = "f7dec22af52025d4526be94cc1303c7d8f5379b746a3f54a8c8446384392eeb1";
   };
 
   checkInputs = [ pytest ];

From bd2f221b6f4d8bed610659f60b33f34b063f46f5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1380/3942] python3Packages.jupyterlab: 2.2.8 -> 2.2.9

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

diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index f05536741f29..ff725ce18297 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab";
-  version = "2.2.8";
+  version = "2.2.9";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c8377bee30504919c1e79949f9fe35443ab7f5c4be622c95307e8108410c8b8c";
+    sha256 = "3be8f8edea173753dd838c1b6d3bbcb6f5c801121f824a477025c1b6a1d33dc6";
   };
 
   propagatedBuildInputs = [ jupyterlab_server notebook ];

From 7f25c249fbd20587edfd70ef3955016b0e59556f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1381/3942] python3Packages.kaggle: 1.5.6 -> 1.5.9

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

diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix
index cccd553a31f3..12b46be69b94 100644
--- a/pkgs/development/python-modules/kaggle/default.nix
+++ b/pkgs/development/python-modules/kaggle/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "kaggle";
-  version = "1.5.6";
+  version = "1.5.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f5qrkgklcpgbwncrif7aw4f86dychqplh7k3f4rljwnr9yhjb1w";
+    sha256 = "444aeecfb646dbb889c767ee2ab071f63fe3a2b85f72f08f2bd772353d3e3b93";
   };
 
   # The version bounds in the setup.py file are unnecessarily restrictive.

From 2cba31a012ccfe08983f75dc921d3cd882c81d5e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1382/3942] python3Packages.labelbox: 2.4.4 -> 2.4.6

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

diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index ad8d2853b1d8..b761b7168533 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "labelbox";
-  version = "2.4.4";
+  version = "2.4.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a455ae30ccb9328731fca7f7f4cefaa7da69a2fe3e43d1b742bae5ff4693c695";
+    sha256 = "2be6c03dafce0a786cfab5d120196efccaf300cab5aee4d2fdad644b7bee1aef";
   };
 
   propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ];

From 6d156bed94f61a8063bc9d2b338649ea45014f47 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1383/3942] python3Packages.ledgerblue: 0.1.31 -> 0.1.32

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

diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index 87fece0f026b..849c162b280d 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "ledgerblue";
-  version = "0.1.31";
+  version = "0.1.32";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f1fc7ab685780309a7220c6ee517d88072cc594a9615bcc18e68ed5f149fa432";
+    sha256 = "c81553a08cdf56c26164b8b0e13400e0a963492d3122afdc82dcf906fafcbf41";
   };
 
   propagatedBuildInputs = [

From 1fb6a293627588a7a7a2b476825bb895ea0794f5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1384/3942] python3Packages.matplotlib: 3.3.1 -> 3.3.2

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

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 732a6c89f439..f8adc0d0986b 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -20,14 +20,14 @@ assert enableTk -> (tcl != null)
 assert enableQt -> pyqt5 != null;
 
 buildPythonPackage rec {
-  version = "3.3.1";
+  version = "3.3.2";
   pname = "matplotlib";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "87f53bcce90772f942c2db56736788b39332d552461a5cb13f05ff45c1680f0e";
+    sha256 = "3d2edbf59367f03cd9daf42939ca06383a7d7803e3993eb5ff1bee8e8a3fbb6b";
   };
 
   XDG_RUNTIME_DIR = "/tmp";

From e0040a8a231682500ee4ab0614b74ab59ced12aa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1385/3942] python3Packages.maxminddb: 2.0.2 -> 2.0.3

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

diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix
index 0afdeef2228a..d101cdfd0c2e 100644
--- a/pkgs/development/python-modules/maxminddb/default.nix
+++ b/pkgs/development/python-modules/maxminddb/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.0.2";
+  version = "2.0.3";
   pname = "maxminddb";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b95d8ed21799e6604683669c7ed3c6a184fcd92434d5762dccdb139b4f29e597";
+    sha256 = "47e86a084dd814fac88c99ea34ba3278a74bc9de5a25f4b815b608798747c7dc";
   };
 
   buildInputs = [ libmaxminddb ];

From 8769cc3a7386b0baeefe3498edde874e09900006 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1386/3942] python3Packages.mecab-python3: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix
index dc7123405549..edcf887b095d 100644
--- a/pkgs/development/python-modules/mecab-python3/default.nix
+++ b/pkgs/development/python-modules/mecab-python3/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "mecab-python3";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0246wxfk8v1js75nv8jl15cwpf4rvv4xndi4gbzjrrqbsgj2fvfm";
+    sha256 = "eefdff160ba231acb21afab5c775bc2e024b3164c637a23b599b270d45feb32d";
   };
 
   nativeBuildInputs = [

From 961d64ad8870c6229123e99f6f53b9d0d6db3ce6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1387/3942] python3Packages.msal: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix
index eae7eadb7f91..e67868912f21 100644
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/pkgs/development/python-modules/msal/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "msal";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cc67d3a14850ba7e533ec5d05a4c23a34dd74a7fa5e0210daebef397b2009b0e";
+    sha256 = "7efb0256c96a7b2eadab49ce29ecdb91352a91440c12a40bed44303724b62fda";
   };
 
   propagatedBuildInputs = [

From 2359f03b75fd17de6783def30ae7df83dfd55b9d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1388/3942] python3Packages.msgpack-numpy: 0.4.6.1 -> 0.4.7.1

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

diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix
index d380f18f7729..ad612550d7e8 100644
--- a/pkgs/development/python-modules/msgpack-numpy/default.nix
+++ b/pkgs/development/python-modules/msgpack-numpy/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "msgpack-numpy";
-  version = "0.4.6.1";
+  version = "0.4.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9f9b57abb2b155c2d3e411c2dd5b98f14998bd053a20c6ed0ab64a6ceb8ad51d";
+    sha256 = "7eaf51acf82d7c467d21aa71df94e1c051b2055e54b755442051b474fa7cf5e1";
   };
 
   buildInputs = [

From e6715c9bbf108c35d746e1514f35157dd56bdf5a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1389/3942] python3Packages.munkres: 1.1.2 -> 1.1.4

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

diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix
index 93e0c27fcca1..a4c16ee066c8 100644
--- a/pkgs/development/python-modules/munkres/default.nix
+++ b/pkgs/development/python-modules/munkres/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "munkres";
-  version = "1.1.2";
+  version = "1.1.4";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "81e9ced40c3d0ffc48be4b6da5cfdfaa49041faaaba8075b159974ec47926aea";
+    sha256 = "fc44bf3c3979dada4b6b633ddeeb8ffbe8388ee9409e4d4e8310c2da1792db03";
   };
 
   checkInputs = [ nose ];

From 06ef5238ac1d0641caa4c4fd9bbe7ab24aef7c4d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1390/3942] python3Packages.nbformat: 5.0.7 -> 5.0.8

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

diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index 0c75fc4ac5ac..3bd119179a45 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "nbformat";
-  version = "5.0.7";
+  version = "5.0.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "54d4d6354835a936bad7e8182dcd003ca3dc0cedfee5a306090e04854343b340";
+    sha256 = "f545b22138865bfbcc6b1ffe89ed5a2b8e2dc5d4fe876f2ca60d8e6f702a30f8";
   };
 
   LC_ALL="en_US.utf8";

From bf935d15e3fe8f6f1612d35d6f50e91e396af71f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:53 +0100
Subject: [PATCH 1391/3942] python3Packages.nest_asyncio: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
index 993e5e413e4c..c2291322d438 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.4.0";
+  version = "1.4.1";
   pname = "nest_asyncio";
   disabled = !(pythonAtLeast "3.5");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1j2rbb31wdq9k15cmj2y0kypzvfc3v05py1n0809nmqlpi5hawsp";
+    sha256 = "b86c3193abda5b2eeccf8c79894bc71c680369a178f4b068514ac00720b14e01";
   };
 
   # tests not packaged with source dist as of 1.3.2/1.3.2, and

From bbfc68fc77c39175d563fb3a4c893e980bc0feab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1392/3942] python3Packages.numba: 0.51.1 -> 0.51.2

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

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index c3a6484adbc6..ad31b8e960c8 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -13,14 +13,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.51.1";
+  version = "0.51.2";
   pname = "numba";
   # uses f-strings
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e765b1a41535684bf3b0465c1d0a24dcbbff6af325270c8f4dad924c0940160";
+    sha256 = "16bd59572114adbf5f600ea383880d7b2071ae45477e84a24994e089ea390768";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

From 990bfbc1ffede7a1629b8b1816f14705ae161572 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1393/3942] python3Packages.numpy-stl: 2.11.2 -> 2.11.3

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

diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix
index b862319d9477..12710bbab19f 100644
--- a/pkgs/development/python-modules/numpy-stl/default.nix
+++ b/pkgs/development/python-modules/numpy-stl/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "numpy-stl";
-  version = "2.11.2";
+  version = "2.11.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1dil1rklb41m3v6a0i93ymimv453whsg1m9z6g0z17jbg7gmc98r";
+    sha256 = "a0e019e575c61f2817526a20f96f10509834c696b67a54b2f1d267f7154b1ae7";
   };
 
   checkInputs = [ pytest pytestrunner ];

From da014855f036c8432f5c3143cb2fa7ebf5859ead Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1394/3942] python3Packages.numpy: 1.19.1 -> 1.19.2

---
 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 9502cdc5b0a0..96ab4c3d75df 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -39,13 +39,13 @@ let
   };
 in buildPythonPackage rec {
   pname = "numpy";
-  version = "1.19.1";
+  version = "1.19.2";
   format = "pyproject.toml";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "b8456987b637232602ceb4d663cb34106f7eb780e247d51a260b84760fd8f491";
+    sha256 = "0d310730e1e793527065ad7dde736197b705d0e4c9999775f212b03c44a8484c";
   };
 
   nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];

From 5d579d99946dd79085c8afbf333a15621b593cde Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1395/3942] python3Packages.nunavut: 0.3.6 -> 0.3.9

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

diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix
index 4905a8da7a38..1c25d6acd55b 100644
--- a/pkgs/development/python-modules/nunavut/default.nix
+++ b/pkgs/development/python-modules/nunavut/default.nix
@@ -2,12 +2,12 @@
 
  buildPythonPackage rec {
   pname = "nunavut";
-  version = "0.3.6";
+  version = "0.3.9";
   disabled = pythonOlder "3.5"; # only python>=3.5 is supported
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "434edabdc431b9af719896e0de4bd0deead657777d1d8aa4e3cd0dcdff6298bc";
+    sha256 = "1f2f42f058afd30456e47b6b92a6b7b15100f6bca0a29108ace95bd5147a8e86";
   };
 
   propagatedBuildInputs = [

From 90ae50b53043c16a2fd8a8e1f7a810e698be5043 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1396/3942] python3Packages.openwrt-luci-rpc: 1.1.3 -> 1.1.6

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

diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
index 718dc48d005b..935a64b4186e 100644
--- a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
+++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
@@ -10,11 +10,11 @@ with lib;
 
 buildPythonPackage rec {
   pname = "openwrt-luci-rpc";
-  version = "1.1.3";
+  version = "1.1.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c8c27c98c0a1deac2d32d417c4ca536b08be2655a9a6de8a7897e8bc6431858c";
+    sha256 = "841c7fc956ad42825a2f2cd0cb2aa02005c3482b200ff7aaccd390345c9f3e18";
   };
 
   postPatch = ''

From 686fd3aa3823065b3e8db2d98569410efcbb978a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1397/3942] python3Packages.packet-python: 1.43.0 -> 1.43.1

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

diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix
index 02255f4bfd70..1552148ae37b 100644
--- a/pkgs/development/python-modules/packet-python/default.nix
+++ b/pkgs/development/python-modules/packet-python/default.nix
@@ -12,10 +12,10 @@
 
 buildPythonPackage rec {
   pname = "packet-python";
-  version = "1.43.0";
+  version = "1.43.1";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "48fcc5ca6e7f3d84ef91016585d1894bb9deb3dae6591ffab90fdf05006c3e48";
+    sha256 = "e333fb5ce45a3f283ddeb6261d061b39328b82eb440a89233fa08ce3fec2fcf0";
   };
   nativeBuildInputs = [ pytestrunner ];
   propagatedBuildInputs = [ requests ];

From caa139243ddb5750158e38d005beabec079c11ba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1398/3942] python3Packages.pandas: 1.1.1 -> 1.1.3

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

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index d4c9706fe654..55b2ddf55d62 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -31,11 +31,11 @@ let
 
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "1.1.1";
+  version = "1.1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "53328284a7bb046e2e885fd1b8c078bd896d7fc4575b915d4936f54984a2ba67";
+    sha256 = "babbeda2f83b0686c9ad38d93b10516e68cdcd5771007eb80a763e98aaf44613";
   };
 
   checkInputs = [ pytest glibcLocales moto hypothesis ];

From e8cc2e4c8a547c2a8165f8e6ac14313fd5653acb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1399/3942] python3Packages.pandocfilters: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix
index f688d97c91d1..848e59313af9 100644
--- a/pkgs/development/python-modules/pandocfilters/default.nix
+++ b/pkgs/development/python-modules/pandocfilters/default.nix
@@ -4,12 +4,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.4.2";
+  version = "1.4.3";
   pname = "pandocfilters";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b3dd70e169bb5449e6bc6ff96aea89c5eea8c5f6ab5e207fc2f521a2cf4a0da9";
+    sha256 = "bc63fbb50534b4b1f8ebe1860889289e8af94a23bff7445259592df25a3906eb";
   };
 
   # No tests available

From 10472cd288df800b20df1118c60a0574665d1ec7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1400/3942] python3Packages.parver: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix
index a51f1c003274..268e90020100 100644
--- a/pkgs/development/python-modules/parver/default.nix
+++ b/pkgs/development/python-modules/parver/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "parver";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a6jp17c1ag6b9yp5xgy9wvznk3g0v2f8gpwkcwxpyc9ygk98zdm";
+    sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3";
   };
 
   propagatedBuildInputs = [ six attrs arpeggio ];

From 00d4397345c48524496de0cf0034c88397aaf5a2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1401/3942] python3Packages.passlib: 1.7.2 -> 1.7.4

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

diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index 84ace0bdb822..316abb2ac32c 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "passlib";
-  version = "1.7.2";
+  version = "1.7.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8d666cef936198bc2ab47ee9b0410c94adf2ba798e5a84bf220be079ae7ab6a8";
+    sha256 = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04";
   };
 
   checkInputs = [ nose ];

From c99e9a2b9ae9dfe94c12eb452d83618313b26467 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1402/3942] python3Packages.PasteDeploy: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix
index b82192267d02..21149da917f1 100644
--- a/pkgs/development/python-modules/pastedeploy/default.nix
+++ b/pkgs/development/python-modules/pastedeploy/default.nix
@@ -6,12 +6,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.1.0";
+  version = "2.1.1";
   pname = "PasteDeploy";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e7559878b6e92023041484be9bcb6d767cf4492fc3de7257a5dae76a7cc11a9b";
+    sha256 = "6dead6ab9823a85d585ef27f878bc647f787edb9ca8da0716aa9f1261b464817";
   };
 
   buildInputs = [ pytestrunner ];

From f126e261c929f541fbe9f2a7cf126d00e30ecc83 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1403/3942] python3Packages.pg8000: 1.16.5 -> 1.16.6

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

diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index e4a158a7183b..4bbd99206238 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "pg8000";
-  version = "1.16.5";
+  version = "1.16.6";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8af70cdfcc1fadafa32468a6af563e1c0b5271c4dcc99a4490030a128cb295a3";
+    sha256 = "8fc1e6a62ccb7c9830f1e7e9288e2d20eaf373cc8875b5c55b7d5d9b7717be91";
   };
 
   propagatedBuildInputs = [ passlib ];

From 0c96ab63dde80497ae398458b9b2934114d059ee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1404/3942] python3Packages.prompt_toolkit: 3.0.6 -> 3.0.8

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

diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix
index 47fbace69df0..2fa885a69f71 100644
--- a/pkgs/development/python-modules/prompt_toolkit/default.nix
+++ b/pkgs/development/python-modules/prompt_toolkit/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "prompt_toolkit";
-  version = "3.0.6";
+  version = "3.0.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7630ab85a23302839a0f26b31cc24f518e6155dea1ed395ea61b42c45941b6a6";
+    sha256 = "25c95d2ac813909f813c93fde734b6e44406d1477a9faef7c915ff37d39c0a8c";
   };
   checkPhase = ''
     py.test -k 'not test_pathcompleter_can_expanduser'

From cbb4c5d55d3896d0d8711c16679495f25bece8b9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:54 +0100
Subject: [PATCH 1405/3942] python3Packages.proto-plus: 1.10.1 -> 1.10.2

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

diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix
index d542d6f64778..a32ee79bd19a 100644
--- a/pkgs/development/python-modules/proto-plus/default.nix
+++ b/pkgs/development/python-modules/proto-plus/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "proto-plus";
-  version = "1.10.1";
+  version = "1.10.2";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n8ia51jg2dkab2sf0qnh39bssqhz65ybcqr78f3zzf7ja923lkr";
+    sha256 = "cee328fc3da159ebbbdf15da6fb0b3bfe79ca32b075d208ff2a033854f6b324a";
   };
 
   propagatedBuildInputs = [ protobuf ];

From 25d8808b36a1627814063b63b5ae83924b4672f4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1406/3942] python3Packages.psd-tools: 1.9.15 -> 1.9.16

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

diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix
index a4eb552bb7d2..783905c70241 100644
--- a/pkgs/development/python-modules/psd-tools/default.nix
+++ b/pkgs/development/python-modules/psd-tools/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "psd-tools";
-  version = "1.9.15";
+  version = "1.9.16";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "23b545d91c784fcaf27fbf4c69abe21ac1ea10d25b5b8c61dcd8f0e03ccff786";
+    sha256 = "dece6327b5aa03b53163c63e2bf90b4a7b0ff6872ef743adab140a59cb2318ff";
   };
 
   propagatedBuildInputs = [

From 0087a318864f5a1a057db9fa93e970a6a414fa05 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1407/3942] python3Packages.psutil: 5.7.2 -> 5.7.3

---
 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 ab3a3c1665e4..2d9f0a9440d5 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "psutil";
-  version = "5.7.2";
+  version = "5.7.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb";
+    sha256 = "af73f7bcebdc538eda9cc81d19db1db7bf26f103f91081d780bbacfcb620dee2";
   };
 
   # arch doesn't report frequency is the same way

From 7080585f371543c13a97a42b2296754a198869ff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1408/3942] python3Packages.psycopg2: 2.8.5 -> 2.8.6

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

diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index 5e1f578d901b..604431612a09 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "psycopg2";
-  version = "2.8.5";
+  version = "2.8.6";
 
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f7d46240f7a1ae1dd95aab38bd74f7428d46531f69219954266d669da60c0818";
+    sha256 = "fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543";
   };
 
   buildInputs = lib.optional stdenv.isDarwin openssl;

From 43a91282d66223c5cb978d53fbe1033f56dd7f2b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1409/3942] python3Packages.py4j: 0.10.9 -> 0.10.9.1

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

diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix
index db117e04d128..e8faee8d817d 100644
--- a/pkgs/development/python-modules/py4j/default.nix
+++ b/pkgs/development/python-modules/py4j/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   pname = "py4j";
 
-  version = "0.10.9";
+  version = "0.10.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "36ec57f43ff8ced260a18aa9a4e46c3500a730cac8860e259cbaa546c2b9db2f";
+    sha256 = "7605e512bf9b002245f5a9121a8c2df9bfd1a6004fe6dd3ff29d46f901719d53";
   };
 
   # No tests in archive

From 6d00360bf98868640316bebbfa5df473e341618d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1410/3942] python3Packages.pybase64: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix
index d52a1f67d214..d48fed13543b 100644
--- a/pkgs/development/python-modules/pybase64/default.nix
+++ b/pkgs/development/python-modules/pybase64/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pybase64";
-  version = "1.0.1";
+  version = "1.0.2";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6ced40531bffc81bafc790d5c0d2f752e281b3b00fd6ff4e79385c625e5dbab1";
+    sha256 = "c430b36751dd89820c867aadd0130bbe8ce007ee570cbe91bb23012fb6f52e87";
   };
 
   propagatedBuildInputs = [ six ];

From ae3ba44986e5f03d1afa9a741bacaa728ad9a66c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1411/3942] python3Packages.pybids: 0.12.1 -> 0.12.3

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

diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
index 7f930c04105c..d6d66e754952 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -16,12 +16,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.12.1";
+  version = "0.12.3";
   pname = "pybids";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08smd4frl8hf0n6bi20ayd5wcf51g3g488bpakjciz7ghdvky1h6";
+    sha256 = "a084172ae5b26a5f26b17186ade98400cda52d9244d9f0b329041741ea82b5db";
   };
 
   propagatedBuildInputs = [

From aa5d0ffef1b7321a0066710d130300418a539419 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1412/3942] python3Packages.pybotvac: 0.0.17 -> 0.0.18

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

diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix
index f915c4983508..c5e239ab8973 100644
--- a/pkgs/development/python-modules/pybotvac/default.nix
+++ b/pkgs/development/python-modules/pybotvac/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pybotvac";
-  version = "0.0.17";
+  version = "0.0.18";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f212f0df8a946c0fa25f0c20c3c9decd9ddc4dbd9b48592a3283e7481112923e";
+    sha256 = "e983c9ffc0734c2e5a7c2adf5d0d0dfe399d94157c590ef70fad765f882c341f";
   };
 
   propagatedBuildInputs = [ requests ];

From 3301cc06a2fd33e5b070baf78d5061406dca5554 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1413/3942] python3Packages.PyChromecast: 7.5.0 -> 7.5.1

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

diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index e9f70df58901..ce72850fffd7 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "PyChromecast";
-  version = "7.5.0";
+  version = "7.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2f346a88ddc27a19cc68bc2d3e8929d89276298cb1c11871b82a87fbdafb95a8";
+    sha256 = "cf2e9fa795ea1e9d0d180adfbdccefd6b4f532eae56f41f15d1a75b323096f51";
   };
 
   disabled = !isPy3k;

From 76af8cf40ae86de2092f1fd016d7321a222297b0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1414/3942] python3Packages.pyct: 0.4.6 -> 0.4.8

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

diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix
index c187c6a55761..009867e0c4ef 100644
--- a/pkgs/development/python-modules/pyct/default.nix
+++ b/pkgs/development/python-modules/pyct/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pyct";
-  version = "0.4.6";
+  version = "0.4.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "df7b2d29f874cabdbc22e4f8cba2ceb895c48aa33da4e0fe679e89873e0a4c6e";
+    sha256 = "23d7525b5a1567535c093aea4b9c33809415aa5f018dd77f6eb738b1226df6f7";
   };
 
   checkInputs = [ pytest ];

From b947fef4911e723d2243332fe63f20071eb4be26 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1415/3942] python3Packages.pycurl: 7.43.0.5 -> 7.43.0.6

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

diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index 7531bb8f7bbc..9c39961b05df 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "pycurl";
-  version = "7.43.0.5";
+  version = "7.43.0.6";
   disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ec7dd291545842295b7b56c12c90ffad2976cc7070c98d7b1517b7b6cd5994b3";
+    sha256 = "8301518689daefa53726b59ded6b48f33751c383cf987b0ccfbbc4ed40281325";
   };
 
   buildInputs = [

From cda7e319400b188afa619324d7c3ee20730c6f15 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1416/3942] python3Packages.pyexcel-xls: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix
index 418dfbf42f84..34d11830e570 100644
--- a/pkgs/development/python-modules/pyexcel-xls/default.nix
+++ b/pkgs/development/python-modules/pyexcel-xls/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "pyexcel-xls";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "64bac180274c52efe970c664d3e8bb12402c9d10e0734d9fe87655646a876c45";
+    sha256 = "c4cc1fb4ac5d1682a44d9a368a43ec2e089ad6fc46884648ccfad46863e3da0a";
   };
 
   propagatedBuildInputs = [

From 716f2588a1ead90386cd710c757c7af5c52f0aae Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1417/3942] python3Packages.pyhomematic: 0.1.68 -> 0.1.70

---
 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 3f12888d5319..0dab202a79a7 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyhomematic";
-  version = "0.1.68";
+  version = "0.1.70";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7f8ec68238a441cfe593fa9028509fd0c3dc67400b4dd520c8c02088f177302e";
+    sha256 = "1c9ae61c870e37348483966f6aa46f650f339f5f1169e5beb19d681c6434c247";
   };
 
   # PyPI tarball does not include tests/ directory

From f2d5785a3f6b38e0cee9693fab077d7a5abcc5eb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:55 +0100
Subject: [PATCH 1418/3942] python3Packages.PyMuPDF: 1.17.6 -> 1.17.7

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

diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index bc2f2c6e95ff..d0bf1492672a 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
 buildPythonPackage rec {
   pname = "PyMuPDF";
-  version = "1.17.6";
+  version = "1.17.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5eef4ff61698016a296932858625a5a0039b923ba692043e2c98ca02966f1da2";
+    sha256 = "33e8ed71b9ece929c52a19f5e5a6d414ded0a6275772b36f2e768ce3c0c86347";
   };
 
   patchPhase = ''

From 4eee0f495bac2469df3f02634f9f0ba15ca66787 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1419/3942] python3Packages.pyopencl: 2020.2.1 -> 2020.2.2

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

diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index e5eddd81d99c..4552fab5b856 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2020.2.1";
+  version = "2020.2.2";
 
   checkInputs = [ pytest ];
   buildInputs = [ opencl-headers ocl-icd pybind11 ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "deb6c50f37f8f88960a943b379eca8c0a9a80634cf60e09aee691a7453ae202e";
+    sha256 = "31fcc79fb6862998e98d91a624c0bd4f0ab4c5d418d199912d4d312c64e437ec";
   };
 
   # py.test is not needed during runtime, so remove it from `install_requires`

From 681c96748d27c412ba76570017fb1a3c6c5f5a30 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1420/3942] python3Packages.pyotp: 2.4.0 -> 2.4.1

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

diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix
index 310ad95808ac..7ad07b3a6e8c 100644
--- a/pkgs/development/python-modules/pyotp/default.nix
+++ b/pkgs/development/python-modules/pyotp/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyotp";
-  version = "2.4.0";
+  version = "2.4.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01eceab573181188fe038d001e42777884a7f5367203080ef5bda0e30fe82d28";
+    sha256 = "038a3f70b34eaad3f72459e8b411662ef8dfcdd95f7d9203fa489e987a75584b";
   };
 
   pythonImportsCheck = [ "pyotp" ];

From 6e6c2108b143faf85c5a2462b3db80d2ca72b57b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1421/3942] python3Packages.pyperclip: 1.8.0 -> 1.8.1

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

diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix
index 2c3b3e56a93f..0df0da0cc5ed 100644
--- a/pkgs/development/python-modules/pyperclip/default.nix
+++ b/pkgs/development/python-modules/pyperclip/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  version = "1.8.0";
+  version = "1.8.1";
   pname = "pyperclip";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b75b975160428d84608c26edba2dec146e7799566aea42c1fe1b32e72b6028f2";
+    sha256 = "9abef1e79ce635eb62309ecae02dfb5a3eb952fa7d6dce09c1aef063f81424d3";
   };
 
   doCheck = false;

From 4ed177e8c10588c91cc01fb354c432b52bb0ab8c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1422/3942] python3Packages.pyrsistent: 0.16.0 -> 0.16.1

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

diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index edc1bb73f5a9..ae22dad1223d 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pyrsistent";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "28669905fe725965daa16184933676547c5bb40a5153055a8dee2a4bd7933ad3";
+    sha256 = "aa2ae1c2e496f4d6777f869ea5de7166a8ccb9c2e06ebcf6c7ff1b670c98c5ef";
   };
 
   propagatedBuildInputs = [ six ];

From f0b8d30b17fc6c3c9bc61a7607ba6a21a0fc9c3a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1423/3942] python3Packages.pyspread: 1.99.2 -> 1.99.4

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

diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix
index 16f1e2c215e1..cf62af03002d 100644
--- a/pkgs/development/python-modules/pyspread/default.nix
+++ b/pkgs/development/python-modules/pyspread/default.nix
@@ -18,11 +18,11 @@
 
 buildPythonPackage rec {
   pname = "pyspread";
-  version = "1.99.2";
+  version = "1.99.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "117268cbeb225e0aca4c59381b7bdf5333bf95ca85c1db410a326a887a74f3da";
+    sha256 = "69edad3e4a3bcfb728beb3ad32e308096c29234cc0f7398ecd26a51e10b75978";
   };
 
   propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ];

From 30415a4717e6b1ed1bc29e86237213a5f1f26025 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1424/3942] python3Packages.pytest-black: 0.3.11 -> 0.3.12

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

diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix
index e2a469c1ed85..20b2483c9d16 100644
--- a/pkgs/development/python-modules/pytest-black/default.nix
+++ b/pkgs/development/python-modules/pytest-black/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-black";
-  version = "0.3.11";
+  version = "0.3.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mjxqvzadpyfvypv5isfda9c6lz8xbqci9b4hn58b2lbj3kv0pjr";
+    sha256 = "1d339b004f764d6cd0f06e690f6dd748df3d62e6fe1a692d6a5500ac2c5b75a5";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From 2033141fdd5ce21de5668e8deef2209bdf2030d4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1425/3942] python3Packages.pytest-flakes: 4.0.1 -> 4.0.2

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

diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix
index 39eb56ce76e9..fb0011f61408 100644
--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -5,11 +5,11 @@ buildPythonPackage rec {
   # upstream has abandoned project in favor of pytest-flake8
   # retaining package to not break other packages
   pname = "pytest-flakes";
-  version = "4.0.1";
+  version = "4.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "37113ac6c7ea5e0b648abf73937955a45f8b9214fe49413297c2ce6ce1808500";
+    sha256 = "6733db47937d9689032876359e5ee0ee6926e3638546c09220e2f86b3581d4c1";
   };
 
   checkInputs = [ pytestpep8 pytest ];

From 5f811aee02ae9fa6804cbf03b3b92ab3222dccaa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1426/3942] python3Packages.pytest-quickcheck: 0.8.4 -> 0.8.5

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

diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix
index ec78329ff8d9..f3a62a79db93 100644
--- a/pkgs/development/python-modules/pytest-quickcheck/default.nix
+++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }:
 buildPythonPackage rec {
   pname = "pytest-quickcheck";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e368390c9e3fd48eb3edec0c4eef08d7332f1143ad7b7190d32376b2fd2e62ff";
+    sha256 = "2427808b54ccdec26a40cdba934a6c042fab9ebadb60d563a01f367bef87fe58";
   };
 
   buildInputs = [ pytest ];

From c12d87e515ed3a47f75eb738a907967eae301710 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1427/3942] python3Packages.pytest-sanic: 1.6.1 -> 1.6.2

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

diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix
index 147ce6a19597..0044a13d2c9a 100644
--- a/pkgs/development/python-modules/pytest-sanic/default.nix
+++ b/pkgs/development/python-modules/pytest-sanic/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-sanic";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "99e02c28cfa18a0a9af0cd151dddf0eca373279b9bac808733746f7ed7030ecc";
+    sha256 = "6428ed8cc2e6cfa05b92689a8589149aacdc1f0640fcf9673211aa733e6a5209";
   };
 
   propagatedBuildInputs = [

From 0fc5e60fd2510bea25434eadf7e986208632c29c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1428/3942] python3Packages.pytest-testmon: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix
index 9d9add167829..b86947f5f758 100644
--- a/pkgs/development/python-modules/pytest-testmon/default.nix
+++ b/pkgs/development/python-modules/pytest-testmon/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pytest-testmon";
-  version = "1.0.2";
+  version = "1.0.3";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fdb016d953036051d1ef0e36569b7168cefa4914014789a65a4ffefc87f85ac5";
+    sha256 = "927a73dd510b90a2e4a48ea4d37e82c4490b56caa745663262024ea0cd278169";
   };
 
   propagatedBuildInputs = [ coverage ];

From 955c527a9f1654292d31a60f246f9d13b8b21849 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1429/3942] python3Packages.python-hosts: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix
index cf1314e0d4c2..e76dbc3e3b24 100644
--- a/pkgs/development/python-modules/python-hosts/default.nix
+++ b/pkgs/development/python-modules/python-hosts/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "python-hosts";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "850998704ba9025ce4c8ffd45dc4fbea2b5e30247bf3b574872ac5df90426b4d";
+    sha256 = "5b9749ce807170fb340d044d3f971e1da4dac0ae6af8ce8db00b6758a920a2bc";
   };
 
   # win_inet_pton is required for windows support

From 7e69e227fc69acf596f22957596a7defc9f99ca2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1430/3942] python3Packages.python-rapidjson: 0.9.1 -> 0.9.3

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

diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix
index b9e7c136b380..defd5430f2ee 100644
--- a/pkgs/development/python-modules/python-rapidjson/default.nix
+++ b/pkgs/development/python-modules/python-rapidjson/default.nix
@@ -8,13 +8,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.9.1";
+  version = "0.9.3";
   pname = "python-rapidjson";
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ad80bd7e4bb15d9705227630037a433e2e2a7982b54b51de2ebabdd1611394a1";
+    sha256 = "4e339edfbba9e5feed0cf44043b6befba0c780b34cdf446888dbce44de362a8a";
   };
 
   LC_ALL="en_US.utf-8";

From e61c4117046f180baed6c933faafc87d1112b07e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1431/3942] python3Packages.pytools: 2020.4 -> 2020.4.3

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

diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix
index f8f9ef27ff9c..4add5ac5e857 100644
--- a/pkgs/development/python-modules/pytools/default.nix
+++ b/pkgs/development/python-modules/pytools/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "pytools";
-  version = "2020.4";
+  version = "2020.4.3";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "37db39ff11a1b5fc8aec875ae4ddb3d6c21aa0e95bddc9c841aa98e1631ae460";
+    sha256 = "21aa1fd942bc3bc54c8ae3b5e60c1f771e6db0817b7402fd802aa5964f20e629";
   };
 
   checkInputs = [ pytest ];

From 990360cf29e45b50551a75c36f4c51997000f80b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:56 +0100
Subject: [PATCH 1432/3942] python3Packages.pywbem: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix
index 345908031ccf..e944f693503e 100644
--- a/pkgs/development/python-modules/pywbem/default.nix
+++ b/pkgs/development/python-modules/pywbem/default.nix
@@ -5,14 +5,14 @@
 
 buildPythonPackage rec {
   pname = "pywbem";
-  version = "1.0.2";
+  version = "1.0.3";
 
   # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release
   disabled = isPy37;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "66d8ec82d30f2b95d8b4bd51659429066c2879d3f46292561f5fdbc7fed10f3d";
+    sha256 = "a6c53d9426326e0e722a5b1af3a1d55810259cb3afa92ca5e4029a6d533cab37";
   };
 
   propagatedBuildInputs = [

From 351659f85eaf50fd2fe840368c4b73de5f4c5178 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1433/3942] python3Packages.reportlab: 3.5.48 -> 3.5.53

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

diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index cbd3f54c547b..e96943a1953a 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -11,11 +11,11 @@ let
   ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
 in buildPythonPackage rec {
   pname = "reportlab";
-  version = "3.5.48";
+  version = "3.5.53";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0bfe3fe6e1bd1d922f83683eae2ba1d2d29de94e25fb115eacca9530b4b02f76";
+    sha256 = "49e32586d3a814a5f77407c0590504a72743ca278518b3c0f90182430f2d87af";
   };
 
   checkInputs = [ glibcLocales ];

From 028804dc9a6b545ec7530e4496619caf2ec7e7f6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1434/3942] python3Packages.requests-aws4auth: 1.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix
index f954a340b7fa..ede2fc6c6a82 100644
--- a/pkgs/development/python-modules/requests-aws4auth/default.nix
+++ b/pkgs/development/python-modules/requests-aws4auth/default.nix
@@ -2,11 +2,11 @@
 with lib;
 buildPythonPackage rec {
   pname = "requests-aws4auth";
-  version = "1.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2950f6ff686b5a452a269076d990e4821d959b61cfac319c3d3c6daaa5db55ce";
+    sha256 = "9a4a5f4a61c49f098f5f669410308ac5b0ea2682fd511ee3a4f9ff73b5bb275a";
   };
 
   propagatedBuildInputs = [ requests ];

From 07b8c65c4e8d7a02c5acf508b70d4d1747a25f66 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1435/3942] python3Packages.robotframework: 3.2.1 -> 3.2.2

---
 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 cf9f4ea86f92..1a3b55451537 100644
--- a/pkgs/development/python-modules/robotframework/default.nix
+++ b/pkgs/development/python-modules/robotframework/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "robotframework";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d693e6d06b17f48669e2a8c4cb6c1f0d56e5f1a74835d18b8ea2118da7bf2d79";
+    sha256 = "a0786a916d0572bd9d6afe26e95c6021e3df5dcafa0ece6b302e36366e58c24e";
     extension = "zip";
   };
 

From ed1b68f21467f2045d6db286eee4534cab068efd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1436/3942] python3Packages.ruamel.ordereddict: 0.4.14 ->
 0.4.15

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

diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/pkgs/development/python-modules/ruamel_ordereddict/default.nix
index da4e891b2b38..7f05229a4f54 100644
--- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix
+++ b/pkgs/development/python-modules/ruamel_ordereddict/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "ruamel.ordereddict";
-  version = "0.4.14";
+  version = "0.4.15";
   disabled = isPy3k || isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "281051d26eb2b18ef3d920e1e260716a52bd058a6b1a2f324102fc6a15cb8d4a";
+    sha256 = "d7d9cf8b11e7662deb460260cf062980cd84b87a1d0457132060ab9d44e0a5f4";
   };
 
   meta = with stdenv.lib; {

From 4698f5614ded402f134b2638814c190b0e7e60ef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1437/3942] python3Packages.ruamel.yaml: 0.16.10 -> 0.16.12

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

diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix
index 9e32f9212cfc..6bda50d24ad5 100644
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "ruamel.yaml";
-  version = "0.16.10";
+  version = "0.16.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "099c644a778bf72ffa00524f78dd0b6476bca94a1da344130f4bf3381ce5b954";
+    sha256 = "076cc0bc34f1966d920a49f18b52b6ad559fbe656a0748e3535cf7b3f29ebf9e";
   };
 
   # Tests use relative paths

From 5e3c79e88e944fa35641052842c0c47d3ad0ac70 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1438/3942] python3Packages.scipy: 1.5.2 -> 1.5.3

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

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 8ebb436e2880..ef5f6a6972f4 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -9,11 +9,11 @@ let
   });
 in buildPythonPackage rec {
   pname = "scipy";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "066c513d90eb3fd7567a9e150828d39111ebd88d3e924cdfc9f8ce19ab6f90c9";
+    sha256 = "ddae76784574cc4c172f3d5edd7308be16078dd3b977e8746860c76c195fa707";
   };
 
   checkInputs = [ nose pytest ];

From 590c5949e251351db574c3521ac21bbd2fbc6115 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1439/3942] python3Packages.scour: 0.38 -> 0.38.1.post1

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

diff --git a/pkgs/development/python-modules/scour/default.nix b/pkgs/development/python-modules/scour/default.nix
index 4f1f39293869..3d2e07226612 100644
--- a/pkgs/development/python-modules/scour/default.nix
+++ b/pkgs/development/python-modules/scour/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "scour";
-  version = "0.38";
+  version = "0.38.1.post1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cf50a13dcdf8cfe1861f0ce334f413604e376a7681c5b181e15322f43c3befcd";
+    sha256 = "81b93dcfc57338f1260db4fb62697b653770a8a8bd756dcba3640c9b558a7145";
   };
 
   propagatedBuildInputs = [ six ];

From eb913190d3f35ccb50acd9e31c267f6d754b1a99 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1440/3942] python3Packages.screeninfo: 0.6.5 -> 0.6.6

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

diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix
index 9ee04cb50a82..142730781d65 100644
--- a/pkgs/development/python-modules/screeninfo/default.nix
+++ b/pkgs/development/python-modules/screeninfo/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonApplication rec {
   pname = "screeninfo";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0vcw54crdgmbzwlrfg80kd1a8p9i10yks8k0szzi0k5q80zhp8xz";
+    sha256 = "c93fcc3c9421cc2046e57468241c4c08c0c6cffd0e05a85cb0b18de8fe8b026f";
   };
 
   # dataclasses is a compatibility shim for python 3.6 ONLY

From 8f946f69e85f5028d3acf3c7a60c097fa5826f15 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1441/3942] python3Packages.sh: 1.14.0 -> 1.14.1

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

diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix
index 3ef3393363ac..964512460bf1 100644
--- a/pkgs/development/python-modules/sh/default.nix
+++ b/pkgs/development/python-modules/sh/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "sh";
-  version = "1.14.0";
+  version = "1.14.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05c7e520cdf70f70a7228a03b589da9f96c6e0d06fc487ab21fc62b26a592e59";
+    sha256 = "39aa9af22f6558a0c5d132881cf43e34828ca03e4ae11114852ca6a55c7c1d8e";
   };
 
   patches = [

From 17276a3d51efdfbb66cb14dce47d83ff70abb8ba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1442/3942] python3Packages.slither-analyzer: 0.6.12 -> 0.6.13

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

diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix
index d4f332b44750..d2b904f53491 100644
--- a/pkgs/development/python-modules/slither-analyzer/default.nix
+++ b/pkgs/development/python-modules/slither-analyzer/default.nix
@@ -6,7 +6,7 @@
 
 buildPythonPackage rec {
   pname = "slither-analyzer";
-  version = "0.6.12";
+  version = "0.6.13";
 
   disabled = pythonOlder "3.6";
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9773cf48754341d03bb2e65c07897fc9c00a8727487ab2820ed89eb85f546506";
+    sha256 = "2b0fe48f07971f4104e2b66d70a7924a550b477405b8feed9c0d4db14bb2c87c";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From cf2f036f63ece10e1e49cd2f37082f9a84a2024a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1443/3942] python3Packages.sounddevice: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix
index eb46580a7b30..7787e8b16b85 100644
--- a/pkgs/development/python-modules/sounddevice/default.nix
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "sounddevice";
-  version = "0.4.0";
+  version = "0.4.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "007cfef077c447eebbdbca3d510ca4365c211c2c6c4d2912d6eec43c8cbcbc02";
+    sha256 = "f21978921186c0c7183af032fab77b735d824f3e926d76adb3fd0912e289ce0b";
   };
 
   propagatedBuildInputs = [ cffi numpy portaudio ];

From 526260936ce4d05d2603664e44ec0837d15015f8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1444/3942] python3Packages.sphinxcontrib-plantuml: 0.18 ->
 0.18.1

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

diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
index 579b2f173eee..b5dd9e11db03 100644
--- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-plantuml";
-  version = "0.18";
+  version = "0.18.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08555dndvp12g261wag3qklybdbfnjcmagh4gpl79k2kz5bqrk5c";
+    sha256 = "c69662d39e4ae214943d8c141dbfb1cf0a5f125d3b45d2c90849c5f37d0c5fb7";
   };
 
   # No tests included.

From 733781fee2d360f6d6326668361152f1da6a9036 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1445/3942] python3Packages.SQLAlchemy: 1.3.19 -> 1.3.20

---
 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 a4cb3bd6d734..83fd3e7b10b3 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  version = "1.3.19";
+  version = "1.3.20";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3bba2e9fbedb0511769780fe1d63007081008c5c2d7d715e91858c94dbaa260e";
+    sha256 = "d2f25c7f410338d31666d7ddedfa67570900e248b940d186b48461bd4e5569a1";
   };
 
   checkInputs = [

From ce19184b92c7fa3ccae0275982511af931a375ed Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:57 +0100
Subject: [PATCH 1446/3942] python3Packages.sqlmap: 1.4.9 -> 1.4.10

---
 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 ddcaa061c6b9..e7bfff7b41a9 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.4.9";
+  version = "1.4.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8f1f84799184a2d3b0433ece09fa0e2ff90a8286c562957667fe0f40dad28287";
+    sha256 = "0cef7d8ae2e2cd829d49535aa2047c58b25e429e80f148e29063fbe2b2acf97f";
   };
 
   postPatch = ''

From 1c39da0d81e7593aadf76783b711fabafdd2abc6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1447/3942] python3Packages.srptools: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix
index 3b1844fb138e..9fca318db0b9 100644
--- a/pkgs/development/python-modules/srptools/default.nix
+++ b/pkgs/development/python-modules/srptools/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "srptools";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5754f639ed1888f47c1185d74e8907ff9af4c0ccc1c8be2ef19339d0a1327f4d";
+    sha256 = "7fa4337256a1542e8f5bb4bed19e1d9aea98fe5ff9baf76693342a1dd6ac7c96";
   };
 
   propagatedBuildInputs = [ six ];

From a89f8d152b4eab2665bd69cd03cb98a72eb535e8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1448/3942] python3Packages.streamz: 0.5.5 -> 0.5.6

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

diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix
index d34a826a0604..c8cad2282f22 100644
--- a/pkgs/development/python-modules/streamz/default.nix
+++ b/pkgs/development/python-modules/streamz/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "streamz";
-  version = "0.5.5";
+  version = "0.5.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "787ade4796c5b2e79af2aac678841ba3748a65a3adce150697dcdd31c4f80365";
+    sha256 = "d2ca46c9f77ec444310c6ee45b66e8d59bb3a04607a0386297c10668ba7fca3a";
   };
 
   propagatedBuildInputs = [

From 4b4ff655c56e7e24a1d1909d006d75d8f7cad005 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1449/3942] python3Packages.tasklib: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix
index 1f204aecf141..319dd98234d2 100644
--- a/pkgs/development/python-modules/tasklib/default.nix
+++ b/pkgs/development/python-modules/tasklib/default.nix
@@ -8,11 +8,11 @@ wsl_stub = writeShellScriptBin "wsl" "true";
 
 in buildPythonPackage rec {
   pname = "tasklib";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "da66e84614b09443aa67c4dc2922213417329c39511dc5b384d8a5671e29115e";
+    sha256 = "21525a34469928876b64edf8abf79cf788bb3fa796d4554ba22a68bc1f0693f5";
   };
 
   propagatedBuildInputs = [

From 14f316cf0d4a281df5af9b4cd4b4db3ea8dbcc56 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1450/3942] python3Packages.testfixtures: 6.14.1 -> 6.14.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 7c875ec05918..7a52c4c41926 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.14.1";
+  version = "6.14.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0rh38zj8wywgqlsi5j75c7drpqhkrg50qknj1kdmvg4kdlab7ljq";
+    sha256 = "14d9907390f5f9c7189b3d511b64f34f1072d07cc13b604a57e1bb79029376e3";
   };
 
   checkInputs = [ pytest mock sybil zope_component twisted ];

From e3fc292a5d85610c2503e24d627a1f8e173b38ff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1451/3942] python3Packages.textacy: 0.10.0 -> 0.10.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 2079dc1b9434..616db71a94f4 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
   pname = "textacy";
-  version = "0.10.0";
+  version = "0.10.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a824333f53d19d24ca864c92da52f3fecd412f4ef3e1448864c45f06189fd6d";
+    sha256 = "ff72adc6dbb85db6981324e226fff77830da57d7fe7e4adb2cafd9dc2a8bfa7d";
   };
 
   propagatedBuildInputs = [

From 1e7672b7cd0faf945773e896d3e2ca085c4b2197 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1452/3942] python3Packages.transitions: 0.8.2 -> 0.8.4

---
 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 a8e84acc2dfd..a372e492f9f6 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.8.2";
+  version = "0.8.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0j3pswbckrhd6plblb0bwzsbvk50nqmxq6dvjclvcr5cljzs7xvg";
+    sha256 = "9a2841b24789dfd345267cb92e26b79da75fd03f6021d1a5222c71b5c9ae3c16";
   };
 
   postPatch = ''

From 3d4b1acdda337d521be6a4ab6cfe139e0604bc69 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1453/3942] python3Packages.txdbus: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/txdbus/default.nix b/pkgs/development/python-modules/txdbus/default.nix
index 636e19b39bab..f6bc44981fb1 100644
--- a/pkgs/development/python-modules/txdbus/default.nix
+++ b/pkgs/development/python-modules/txdbus/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "txdbus";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eefcffa4efbf82ba11222f17f5989fe1b2b6ef57226ef896c4a7084c990ba217";
+    sha256 = "8375a5fb68a12054f0def91af800c821fb2232949337756ed975f88d8ea2bc97";
   };
 
   propagatedBuildInputs = [ six twisted ];

From 7228e71474efecfa47ea056681ded90ec5f00ffb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1454/3942] python3Packages.u-msgpack-python: 2.7.0 -> 2.7.1

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

diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix
index ef4fe47b7a27..f44b7db455b1 100644
--- a/pkgs/development/python-modules/u-msgpack-python/default.nix
+++ b/pkgs/development/python-modules/u-msgpack-python/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "u-msgpack-python";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "996e4c4454771f0ff0fd2a7566b1a159d305d3611cd755addf444e3533e2bc54";
+    sha256 = "b7e7d433cab77171a4c752875d91836f3040306bab5063fb6dbe11f64ea69551";
   };
 
   LC_ALL="en_US.UTF-8";

From d60e4a7647a113c4e72cfec52589e027928a3ecc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1455/3942] python3Packages.urllib3: 1.25.10 -> 1.25.11

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

diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index 2715388e8f20..96bb2a0e5325 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "urllib3";
-  version = "1.25.10";
+  version = "1.25.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a";
+    sha256 = "8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2";
   };
 
   NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [

From d6c8c798c3b38fe08aefe5f0b1391fed52a0eac3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1456/3942] python3Packages.urwid: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index 36fe4b51495d..0846d801059a 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "urwid";
-  version = "2.1.1";
+  version = "2.1.2";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09nmi2nmvpcmbh3w3fb0dn0c7yp7r20i5pfcr6q722xh6mp8cw3q";
+    sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae";
   };
 
   # tests need to be able to set locale

From d1ec4bfa930b2d417092acf5ca259f1c7cbc0cba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1457/3942] python3Packages.vcrpy: 4.1.0 -> 4.1.1

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

diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index 633c4f266cdc..e67bbc59e932 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "vcrpy";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4138e79eb35981ad391406cbb7227bce7eba8bad788dcf1a89c2e4a8b740debe";
+    sha256 = "57095bf22fc0a2d99ee9674cdafebed0f3ba763018582450706f7d3a74fff599";
   };
 
   checkInputs = [

From b072c1b5b57a36aa570334c071b20ce1518e13a0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1458/3942] python3Packages.virtualenv: 20.0.31 -> 20.0.35

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

diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index 6a9d91d79c89..4642a44762aa 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -17,11 +17,11 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "20.0.31";
+  version = "20.0.35";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "43add625c53c596d38f971a465553f6318decc39d98512bc100fa1b1e839c8dc";
+    sha256 = "2a72c80fa2ad8f4e2985c06e6fc12c3d60d060e410572f553c90619b0f6efaf3";
   };
 
   nativeBuildInputs = [

From d47a172bc07355ac8c34e03b37fcbf4fe947d757 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:58 +0100
Subject: [PATCH 1459/3942] python3Packages.xhtml2pdf: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix
index e10c8e93ab5c..c35d0b484d37 100644
--- a/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/pkgs/development/python-modules/xhtml2pdf/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "xhtml2pdf";
-  version = "0.2.4";
+  version = "0.2.5";
 
   propagatedBuildInputs = [pillow html5lib pypdf2 reportlab six];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6793fbbdcb6bb8a4a70132966d8d95e95ea3498cdf0e82252d2b8e9aae34fcb5";
+    sha256 = "6797e974fac66f0efbe927c1539a2756ca4fe8777eaa5882bac132fc76b39421";
   };
 
   meta = with stdenv.lib; {

From 23ebe219273d133b3e645bb177ad8e82d1301fd9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:59 +0100
Subject: [PATCH 1460/3942] python3Packages.zeroconf: 0.28.5 -> 0.28.6

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

diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 6777378c2df3..a8715a2133c3 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.28.5";
+  version = "0.28.6";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c08dbb90c116626cb6c5f19ebd14cd4846cffe7151f338c19215e6938d334980";
+    sha256 = "70f10f0f16e3a8c4eb5e1a106b812b8d052253041cf1ee1195933df706f5261c";
   };
 
   propagatedBuildInputs = [ ifaddr ]

From 0839ea028c960df4f65da5179cef5901da6fd701 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:59 +0100
Subject: [PATCH 1461/3942] python3Packages.zfec: 1.5.3 -> 1.5.4

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

diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix
index e848511d9ca8..dbcd8303ef2f 100644
--- a/pkgs/development/python-modules/zfec/default.nix
+++ b/pkgs/development/python-modules/zfec/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "zfec";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b41bd4b0af9c6b3a78bd6734e1e4511475944164375e6241b53df518a366922b";
+    sha256 = "222a2d84898db792b28f993cb663e940668bfbd844992a82351fd40dc1680883";
   };
 
   buildInputs = [ setuptoolsDarcs ];

From 515d47d81443e22a2c9e0c8d9cadb8b117fb254b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:59 +0100
Subject: [PATCH 1462/3942] python3Packages.zha-quirks: 0.0.43 -> 0.0.45

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

diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index 1e1a55d689de..959e7f9c0d83 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -4,14 +4,14 @@
 
 buildPythonPackage rec {
   pname = "zha-quirks";
-  version = "0.0.43";
+  version = "0.0.45";
 
   nativeBuildInputs = [ pytest ];
   buildInputs = [ aiohttp zigpy ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16f62dddce73bb27408b13a0d6526a250b588ca020405b2369e72d5dc9fa7607";
+    sha256 = "9f0640d2844939118c631d88df18d78adfa17d01cac3e04d7156e5f99e41bc7d";
   };
 
   meta = with stdenv.lib; {

From ee7591e5962ac274adc779b7c84421b79380557e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:59 +0100
Subject: [PATCH 1463/3942] python3Packages.zope.interface: 5.1.0 -> 5.1.2

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

diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix
index 5e7086191cce..acef337e782e 100644
--- a/pkgs/development/python-modules/zope_interface/default.nix
+++ b/pkgs/development/python-modules/zope_interface/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.interface";
-  version = "5.1.0";
+  version = "5.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "03nrl6b8cb600dnnh46y149awvrm0gxyqgwq5hdw3lvys8mw9r20";
+    sha256 = "c9c8e53a5472b77f6a391b515c771105011f4b40740ce53af8428d1c8ca20004";
   };
 
   propagatedBuildInputs = [ zope_event ];

From 86b239ea4ce8906a4a1aa7c7693fb455b9411d30 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Oct 2020 10:06:59 +0100
Subject: [PATCH 1464/3942] python3Packages.zopfli: 0.1.6 -> 0.1.7

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

diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix
index 58b7d43f3d22..a80b3155b8ce 100644
--- a/pkgs/development/python-modules/zopfli/default.nix
+++ b/pkgs/development/python-modules/zopfli/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "zopfli";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0smaxh7iihjr9mwxw1ifc9vnlh3ra8l060dd1gbvp1963k0r68pd";
+    sha256 = "512892714f0e3dcc9a77222cb509ed519f41ce2b92467e47a4b406a23b48561a";
     extension = "zip";
   };
 

From e95b156a0f6b7ee413d60b8e65245c70a4f297bb Mon Sep 17 00:00:00 2001
From: Nicolai Kellerer <nicolai@kellerer.me>
Date: Thu, 22 Oct 2020 15:24:51 +0200
Subject: [PATCH 1465/3942] pythonPackages.numpy: set license to bsd3

---
 pkgs/development/python-modules/numpy/1.16.nix    | 1 +
 pkgs/development/python-modules/numpy/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/numpy/1.16.nix b/pkgs/development/python-modules/numpy/1.16.nix
index 6fa77d8fa907..ab4991cad145 100644
--- a/pkgs/development/python-modules/numpy/1.16.nix
+++ b/pkgs/development/python-modules/numpy/1.16.nix
@@ -92,6 +92,7 @@ in buildPythonPackage rec {
   meta = {
     description = "Scientific tools for Python";
     homepage = "https://numpy.org/";
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fridh ];
   };
 }
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 96ab4c3d75df..df620ab0556c 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -95,6 +95,7 @@ in buildPythonPackage rec {
   meta = {
     description = "Scientific tools for Python";
     homepage = "https://numpy.org/";
+    license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fridh ];
   };
 }

From 08efaed39d3d0de3cb11bcd16129fccaced21e40 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:21 +0100
Subject: [PATCH 1466/3942] python3Packages.aioconsole: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index 3090c3cb1f6e..c198676e3eb0 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -10,12 +10,12 @@
 # wrapped to be able to find aioconsole and any other packages.
 buildPythonPackage rec {
   pname = "aioconsole";
-  version = "0.3.0";
+  version = "0.3.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b84724e6b93d1306a909974864df377236cf4bab8e0594096fed7936207205c5";
+    sha256 = "7c038bb40b7690bf5be6b17154830b7bff25e7be1c02d8420a346c3efbd5d8e5";
   };
 
   # hardcodes a test dependency on an old version of pytest-asyncio

From 7450efb84117e82712312201ab61b44a36bf6ede Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:21 +0100
Subject: [PATCH 1467/3942] python3Packages.atlassian-python-api: 1.17.6 ->
 1.17.7

---
 .../python-modules/atlassian-python-api/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index 8942b5e59130..a91c3ee8a52b 100755
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "atlassian-python-api";
-  version = "1.17.6";
+  version = "1.17.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c54ebb385eeb18c6275091687ad1f21e5e91613b6aca31b6727e880a678d16c2";
+    sha256 = "456e9873fa5ab5cc91c6ae76a70b662f0993d32e4dff6d8febd866a53d86041e";
   };
 
   checkInputs = [ pytestrunner pytest ];

From ba8de70c8bfdfe3f134251282539f979090bf648 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:21 +0100
Subject: [PATCH 1468/3942] python3Packages.blis: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix
index 5d4b9bcb5e21..1d6d7806b979 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/pkgs/development/python-modules/blis/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "blis";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "014771a0f753a64ef5610c5b3d4a090b263073bdd59b8ad0d872ce1e06e7315a";
+    sha256 = "c14fb9ec3f5ed7c4940c132c7691469ac5d3e302891d95e935623bf1d4e17fbb";
   };
 
   nativeBuildInputs = [

From 5f840df03b39712d6939d74f5f121168ca77d4e0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:21 +0100
Subject: [PATCH 1469/3942] python3Packages.browser-cookie3: 0.11.3 -> 0.11.4

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

diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix
index 3cc99de2aa11..6c9f864061aa 100644
--- a/pkgs/development/python-modules/browser-cookie3/default.nix
+++ b/pkgs/development/python-modules/browser-cookie3/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}:
 buildPythonPackage rec {
   pname = "browser-cookie3";
-  version = "0.11.3";
+  version = "0.11.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d4435cd0fdad358f8522ed72294b7c3c02f86b24b6d1c6bb1e7f0a53413d3bd3";
+    sha256 = "3d140c6b651dbd8b8555aca6472557fcfda4dd93afc26ea3a200be922a843e2c";
   };
 
   disabled = !isPy3k;

From f3e3a789f3941e3c375aeb593d94d7a889f23bf2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:21 +0100
Subject: [PATCH 1470/3942] python3Packages.chalice: 1.21.3 -> 1.21.4

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

diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index f985da36d17a..7eb06e26450c 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -22,11 +22,11 @@
 
 buildPythonPackage rec {
   pname = "chalice";
-  version = "1.21.3";
+  version = "1.21.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0b44514cdbafab08b18e21f59fc016cead0b78f5f5fdf14eccd993c469130b39";
+    sha256 = "fb3580272cc66ba0fd59914b7ac395d2da6b9b32b11dc7557aa80a0ae7cccf3c";
   };
 
   checkInputs = [ watchdog pytest hypothesis mock ];

From dfe58022619add643f27c5ad96c30179d4b4de37 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:21 +0100
Subject: [PATCH 1471/3942] python3Packages.croniter: 0.3.35 -> 0.3.36

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

diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix
index 81af265ac3c6..a8ae75746880 100644
--- a/pkgs/development/python-modules/croniter/default.nix
+++ b/pkgs/development/python-modules/croniter/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "croniter";
-  version = "0.3.35";
+  version = "0.3.36";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b9075573d9d18fdc4c67ad6741c4bfa4b446b1b1d7f03279757244c8a75abedf";
+    sha256 = "9d3098e50f7edc7480470455d42f09c501fa1bb7e2fc113526ec6e90b068f32c";
   };
 
   propagatedBuildInputs = [

From 7faf9ab94e9fecab243947ff8b989401a6057331 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:21 +0100
Subject: [PATCH 1472/3942] python3Packages.dash_renderer: 1.8.2 -> 1.8.3

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

diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix
index c61bf129abb0..8977d49489cb 100644
--- a/pkgs/development/python-modules/dash-renderer/default.nix
+++ b/pkgs/development/python-modules/dash-renderer/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "dash_renderer";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "84cbb22019299a5a3c268ec1143c6f241c3f136e95753edac83a81673b7fa04e";
+    sha256 = "f7ab2b922f4f0850bae0e9793cec99f8a1a241e5f7f5786e367ddd9e41d2b170";
   };
 
   # No tests in archive

From 928b4e764c32753dd8dcaf9a6278186be851a677 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1473/3942] python3Packages.deepmerge: 0.1.0 -> 0.1.1

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

diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix
index 1cdf0449c68c..0d81110dee82 100644
--- a/pkgs/development/python-modules/deepmerge/default.nix
+++ b/pkgs/development/python-modules/deepmerge/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "deepmerge";
-  version = "0.1.0";
+  version = "0.1.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0d1ab9lxwymqxxd58j50id1wib48xym3ss5xw172i2jfwwwzfdrx";
+    sha256 = "fa1d44269786bcc12d30a7471b0b39478aa37a43703b134d7f12649792f92c1f";
   };
 
   propagatedBuildInputs = [

From c95674b00944d1ba53ca4d2a9f2b2fb988e7edd6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1474/3942] python3Packages.distributed: 2.30.0 -> 2.30.1

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

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 0267e959e5ba..f4be407fade2 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -28,12 +28,12 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2.30.0";
+  version = "2.30.1";
 
   # get full repository need conftest.py to run tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3eb8e4173625cea6ebda2f0a079b813eeabbffd1b24584855cf063ed1cca60b3";
+    sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e";
   };
 
   disabled = pythonOlder "3.6";

From be3fe29777f29739aa024bea80627b100486e487 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1475/3942] python3Packages.django-q: 1.3.3 -> 1.3.4

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

diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix
index a81aa2a63cd3..0755c5055a1e 100644
--- a/pkgs/development/python-modules/django-q/default.nix
+++ b/pkgs/development/python-modules/django-q/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "django-q";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "de7077660ede36bfdd89ab9405d6393b598bb3e0bfed61f59a0a9074cc4942bb";
+    sha256 = "523d54dcf1b66152c1b658f914f00ed3b518a3432a9decd4898738ca8dbbe10f";
   };
 
   propagatedBuildInputs = [

From 74a760015920873cc81613379732ddf25bafe818 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1476/3942] python3Packages.Django: 2.2.16 -> 2.2.17

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

diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix
index 3a88f0703d06..64897890759e 100644
--- a/pkgs/development/python-modules/django/2.nix
+++ b/pkgs/development/python-modules/django/2.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "2.2.16";
+  version = "2.2.17";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1535g2r322cl4x52fb0dmzlbg23539j2wx6027j54p22xvjlbkv2";
+    sha256 = "cf5370a4d7765a9dd6d42a7b96b53c74f9446cd38209211304b210fe0404b861";
   };
 
   patches = stdenv.lib.optional withGdal

From 75705f483fea47548111c7fcd0cc7c980772008e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1477/3942] python3Packages.Django: 3.1.2 -> 3.1.3

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

diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix
index 0648552b6f1a..84a7e8b1e3c6 100644
--- a/pkgs/development/python-modules/django/3.nix
+++ b/pkgs/development/python-modules/django/3.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "3.1.2";
+  version = "3.1.3";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a2127ad0150ec6966655bedf15dbbff9697cc86d61653db2da1afa506c0b04cc";
+    sha256 = "14b87775ffedab2ef6299b73343d1b4b41e5d4e2aa58c6581f114dbec01e3f8f";
   };
 
   patches = stdenv.lib.optional withGdal

From 2a6bc617464e6b1acb18d3b4fa889c1e73281088 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1478/3942] python3Packages.djangoql: 0.14.0 -> 0.14.2

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

diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix
index 0d5190aba77c..ec39f0739aeb 100644
--- a/pkgs/development/python-modules/djangoql/default.nix
+++ b/pkgs/development/python-modules/djangoql/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "djangoql";
-  version = "0.14.0";
+  version = "0.14.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b1f80940bb15982e06208b97d7b3d08e1d5f8fb62aa07e5e33599c7ce4c0334";
+    sha256 = "91fd65d9ee4b09092602ff05aca8a21c5a18062faf56f269a011b8e8e41483c6";
   };
 
   propagatedBuildInputs = [ ply ];

From 84027baf165748a4055032473c4e80a26e367349 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1479/3942] python3Packages.dulwich: 0.20.6 -> 0.20.11

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

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index caf584d84f7c..2225cccd6a43 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -4,12 +4,12 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.20.6";
+  version = "0.20.11";
   pname = "dulwich";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e593f514b8ac740b4ceeb047745b4719bfc9f334904245c6edcb3a9d002f577b";
+    sha256 = "0b142794fb72647673173b80ed8b75e1f56b42a0972c5b3c752d88766a659d53";
   };
 
   LC_ALL = "en_US.UTF-8";

From f4345e45c3d1d7b369e34af7863a7d86c963e898 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1480/3942] python3Packages.ECPy: 1.2.3 -> 1.2.5

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

diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
index 153fcd08d25a..bb54fc6e73fa 100644
--- a/pkgs/development/python-modules/ecpy/default.nix
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "ECPy";
-  version = "1.2.3";
+  version = "1.2.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6dd09f8cda5a1d673228ff9ef41aea8f036ee5ef3183198de83c14957d68c3e0";
+    sha256 = "9635cffb9b6ecf7fd7f72aea1665829ac74a1d272006d0057d45a621aae20228";
   };
 
   propagatedBuildInputs = lib.optional (!isPy3k) future;

From 0303d30c227ef93ff4728075ce84c2e77abbcfd3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1481/3942] python3Packages.Genshi: 0.7.3 -> 0.7.4

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

diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix
index 5554e4b330e2..724983f6955f 100644
--- a/pkgs/development/python-modules/genshi/default.nix
+++ b/pkgs/development/python-modules/genshi/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "Genshi";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7933c95151d7dd2124a2b4c8dd85bb6aec881ca17c0556da0b40e56434b313a0";
+    sha256 = "d92ef3bb34474a38566f7e44e570ff3067c7f7c126670c79f660661badf8eddb";
   };
 
   # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase)

From 79c5793ce8cac45c7d68b19032e696d49eeeeed9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1482/3942] python3Packages.google-auth-oauthlib: 0.4.1 ->
 0.4.2

---
 .../python-modules/google-auth-oauthlib/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index ed7e57963ba6..9497de84bb02 100644
--- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "google-auth-oauthlib";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "88d2cd115e3391eb85e1243ac6902e76e77c5fe438b7276b297fbe68015458dd";
+    sha256 = "65b65bc39ad8cab15039b35e5898455d3d66296d0584d96fe0e79d67d04c51d9";
   };
 
   checkInputs = [

From 7064c16cea4ded277da6cc69296099f2ffeeb146 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1483/3942] python3Packages.green: 3.2.3 -> 3.2.4

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

diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix
index dae14036ef03..280f4de1aca9 100644
--- a/pkgs/development/python-modules/green/default.nix
+++ b/pkgs/development/python-modules/green/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "green";
-  version = "3.2.3";
+  version = "3.2.4";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2fc2fdd86dbc700ca6afa6d83f1216bb9bcaf4d1b3ae36ba52878ac1b9cd063c";
+    sha256 = "3473abb4629c8c1af9f6b59a4f9c757315736580053a64bbfd91ff21ccad57a8";
   };
 
   propagatedBuildInputs = [

From b68e5e1636c65d885b8b7cc2cbe64f25ce00a072 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1484/3942] python3Packages.hidapi: 0.10.0 -> 0.10.0.post1

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

diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix
index df9ac9ebed6d..070ad57c4f11 100644
--- a/pkgs/development/python-modules/hidapi/default.nix
+++ b/pkgs/development/python-modules/hidapi/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "hidapi";
-  version = "0.10.0";
+  version = "0.10.0.post1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2560ad8db212f54cf40ea8d78715adad7df803011cfdce9dabbac0e76acf31ef";
+    sha256 = "27c04d42a7187becf7a8309d4846aa4f235ac8b7dafd758335b109f5cbd3b962";
   };
 
   propagatedBuildInputs =

From 0d87c948bd24bc3f99e0ce75c31b719def54764c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:22 +0100
Subject: [PATCH 1485/3942] python3Packages.identify: 1.5.6 -> 1.5.9

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

diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 3385e5bfc9ec..8369afc24a4c 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "identify";
-  version = "1.5.6";
+  version = "1.5.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "969d844b7a85d32a5f9ac4e163df6e846d73c87c8b75847494ee8f4bd2186421";
+    sha256 = "c9504ba6a043ee2db0a9d69e43246bc138034895f6338d5aed1b41e4a73b1513";
   };
 
   # Tests not included in PyPI tarball

From c68b16d3dbe9958d7e43d1ac8df65edb236673e0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1486/3942] python3Packages.junos-eznc: 2.5.3 -> 2.5.4

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

diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix
index 22ff5caad80e..d47130c5f3fb 100644
--- a/pkgs/development/python-modules/junos-eznc/default.nix
+++ b/pkgs/development/python-modules/junos-eznc/default.nix
@@ -18,11 +18,11 @@
 
 buildPythonPackage rec {
   pname = "junos-eznc";
-  version = "2.5.3";
+  version = "2.5.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "521659fe94da796897abc16773c3d84fa44d3e1f5386c71fbaef44cb80159855";
+    sha256 = "bf036d0af9ee5c5e4f517cb5fc902fe891fa120e18f459805862c53d4a97193a";
   };
 
   checkInputs = [ nose ];

From cfb81cd55ebd294f2de64ef3f09e79482c19bcc3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1487/3942] python3Packages.jupyterlab_git: 0.22.2 -> 0.22.3

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

diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index 35fd7b8b8d84..b69572df7458 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab_git";
-  version = "0.22.2";
+  version = "0.22.3";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9966a569428e67cc1688fbc2e05f51b0ceeefd8dfe30737e78a501ce3105103d";
+    sha256 = "434ff9edd1190809e02e0cbf50090c28de48a51e151a1f904ac66e902244398d";
   };
 
   propagatedBuildInputs = [ notebook nbdime git ];

From ad3a3ac8f092699796d8eb153d6aa173bfa35efd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1488/3942] python3Packages.ledgerblue: 0.1.32 -> 0.1.34

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

diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index 849c162b280d..c84d5fa471bd 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "ledgerblue";
-  version = "0.1.32";
+  version = "0.1.34";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c81553a08cdf56c26164b8b0e13400e0a963492d3122afdc82dcf906fafcbf41";
+    sha256 = "f9553d496fbc6b612d98cc9db2f1648c1bcb63939c988ee1520e8fcb9bd77b24";
   };
 
   propagatedBuildInputs = [

From 19f27d7309d6299cee3d2cba8884584c98a31373 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1489/3942] python3Packages.libtmux: 0.8.3 -> 0.8.5

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

diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 605cbe040269..9df5cffec97b 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "libtmux";
-  version = "0.8.3";
+  version = "0.8.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a4c7379604ccdc684aa865723211184709f9a2b45511772989b5f26ad156650e";
+    sha256 = "1d35b9f8451944d31c5ed22ed9e6c8e18034adcc75718fcc5b27fbd9621543e1";
   };
 
   checkInputs = [ pytest ];

From a31ffa21e29f5d5019a99d1b087340f256fabf95 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1490/3942] python3Packages.murmurhash: 1.0.2 -> 1.0.4

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

diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix
index 82b33b6b4020..2bd156bd63fd 100644
--- a/pkgs/development/python-modules/murmurhash/default.nix
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "murmurhash";
-  version = "1.0.2";
+  version = "1.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c7a646f6b07b033642b4f52ae2e45efd8b80780b3b90e8092a0cec935fbf81e2";
+    sha256 = "422084ac1fe994cb7c893689c600923dee4e2c3fc74e832f7d9a8d6fdcc362d5";
   };
 
   postPatch = ''

From e1372f506712cc28160d79a533c77d12f90a85d0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1491/3942] python3Packages.nest_asyncio: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
index c2291322d438..533977aa6d98 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.4.1";
+  version = "1.4.2";
   pname = "nest_asyncio";
   disabled = !(pythonAtLeast "3.5");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b86c3193abda5b2eeccf8c79894bc71c680369a178f4b068514ac00720b14e01";
+    sha256 = "c614fcfaca72b1f04778bc0e73f49c84500b3d045c49d149fc46f1566643c175";
   };
 
   # tests not packaged with source dist as of 1.3.2/1.3.2, and

From a460c9c8a35f6e0e06a661e3a0b45c7b2ed6e2d0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1492/3942] python3Packages.notify_py: 0.2.3 -> 0.2.4

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

diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix
index fc2eda47beba..4772fc295349 100644
--- a/pkgs/development/python-modules/notify-py/default.nix
+++ b/pkgs/development/python-modules/notify-py/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "notify_py";
-  version = "0.2.3";
+  version = "0.2.4";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1i209xsff54hipdk9cg6va60fl33swg126yfgkg3wsgjmi6s07ca";
+    sha256 = "2a19273a476c8b003baa96650d00a81c5981c3a17ada748bc0a73aefad46d977";
   };
 
   postPatch = ''

From baa93c3deeeefbd55ebd7cf68bfbb4a10b095768 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1493/3942] python3Packages.numpy: 1.19.2 -> 1.19.4

---
 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 df620ab0556c..b8faccb155b5 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -39,13 +39,13 @@ let
   };
 in buildPythonPackage rec {
   pname = "numpy";
-  version = "1.19.2";
+  version = "1.19.4";
   format = "pyproject.toml";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0d310730e1e793527065ad7dde736197b705d0e4c9999775f212b03c44a8484c";
+    sha256 = "141ec3a3300ab89c7f2b0775289954d193cc8edb621ea05f99db9cb181530512";
   };
 
   nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];

From 57887f659d20e081a96e919357f68c1d6b73531c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1494/3942] python3Packages.pandas: 1.1.3 -> 1.1.4

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

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 55b2ddf55d62..6e9f3874d29f 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -31,11 +31,11 @@ let
 
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "babbeda2f83b0686c9ad38d93b10516e68cdcd5771007eb80a763e98aaf44613";
+    sha256 = "a979d0404b135c63954dea79e6246c45dd45371a88631cdbb4877d844e6de3b6";
   };
 
   checkInputs = [ pytest glibcLocales moto hypothesis ];

From f16fad34a2cb4ac523cbaf069f9c0da2cdcefa0d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1495/3942] python3Packages.phonenumbers: 8.12.11 -> 8.12.12

---
 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 e4cb59f5b930..5f961b8e18ea 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.12.11";
+  version = "8.12.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17f39f06c1e0e20eabe69ff735b1c08e4547d12a12595da3d835fd3256a9ee0c";
+    sha256 = "70aa98a50ba7bc7f6bf17851f806c927107e7c44e7d21eb46bdbec07b99d23ae";
   };
 
   meta = {

From 50fbffa74ed8c84a3aa03b477ae68f3767e88bab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1496/3942] python3Packages.preshed: 3.0.2 -> 3.0.3

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

diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix
index 96a015076df3..c408782a423b 100644
--- a/pkgs/development/python-modules/preshed/default.nix
+++ b/pkgs/development/python-modules/preshed/default.nix
@@ -9,11 +9,11 @@
 }:
 buildPythonPackage rec {
   pname = "preshed";
-  version = "3.0.2";
+  version = "3.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1jrnci1pw9yv7j1a9b2q6c955l3gb8fv1q4d0id6s7bwr5l39mv1";
+    sha256 = "8ad47d5d2688fabc66850f32c7b6d3b4a97e6b653726309fe09603edd6fceb23";
   };
 
   propagatedBuildInputs = [

From 3ab5553dd86f919fbbbb48790aa608b6be8f459b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1497/3942] python3Packages.pycoin: 0.90.20200809 ->
 0.90.20201031

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

diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix
index da09cfdd64e2..cb0431be61f8 100644
--- a/pkgs/development/python-modules/pycoin/default.nix
+++ b/pkgs/development/python-modules/pycoin/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pycoin";
-  version = "0.90.20200809";
+  version = "0.90.20201031";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "301dd6df9d9d580701d7325c4d1c341233ba1a94cb805305ea3a43c31bdaaa4c";
+    sha256 = "65c19204cb7aece4aae30c44b5e08beecb9c118370a9f9994d6cddaee17c351d";
   };
 
   propagatedBuildInputs = [ setuptools ];

From 4d80f4042377f15f92e68583abf7b6792349d395 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1498/3942] python3Packages.pycryptodome: 3.9.8 -> 3.9.9

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

diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index 15e93e59542b..40084c2885e8 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
-  version = "3.9.8";
+  version = "3.9.9";
   pname = "pycryptodome";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0e24171cf01021bc5dc17d6a9d4f33a048f09d62cc3f62541e95ef104588bda4";
+    sha256 = "910e202a557e1131b1c1b3f17a63914d57aac55cf9fb9b51644962841c3995c4";
   };
 
   meta = {

From 916672c954d3fad48b89e02ff574eae7cdb9ad6a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1499/3942] python3Packages.pycryptodomex: 3.9.8 -> 3.9.9

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

diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix
index 0bef1364617e..d58821569e62 100644
--- a/pkgs/development/python-modules/pycryptodomex/default.nix
+++ b/pkgs/development/python-modules/pycryptodomex/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pycryptodomex";
-  version = "3.9.8";
+  version = "3.9.9";
 
   meta = {
     description = "A self-contained cryptographic library for Python";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9";
+    sha256 = "7b5b7c5896f8172ea0beb283f7f9428e0ab88ec248ce0a5b8c98d73e26267d51";
   };
 }

From 57ee133e6d3e562d70005fa6e1cdf5f9df1509ac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1500/3942] python3Packages.pyexcel-io: 0.6.3 -> 0.6.4

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

diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix
index 6fe2245385a0..15014cdafd28 100644
--- a/pkgs/development/python-modules/pyexcel-io/default.nix
+++ b/pkgs/development/python-modules/pyexcel-io/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "pyexcel-io";
-  version = "0.6.3";
+  version = "0.6.4";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8fb7a201eb3e5763bb8f9d6e096ceed9e5f1baecd784c9fadbe0fb3d59174c0e";
+    sha256 = "00f15f4bae2947de49b3206f2600f78780008e044380f7aafe0ce52969cda4ca";
   };
 
   propagatedBuildInputs = [

From 330f5a86ee34bd6cf28e705f18a98a7a2da46565 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:23 +0100
Subject: [PATCH 1501/3942] python3Packages.pymavlink: 2.4.11 -> 2.4.12

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

diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix
index b401f1f90b1a..f0a5b222c224 100644
--- a/pkgs/development/python-modules/pymavlink/default.nix
+++ b/pkgs/development/python-modules/pymavlink/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pymavlink";
-  version = "2.4.11";
+  version = "2.4.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0b1265b169f809c6ca94911ad2d7649b8e087a7cc573a0a6ea62ade9bea7ca5c";
+    sha256 = "2954bb071ff67fc5ab29ed2dabe3b5355c4063fb8b014477d9bfbceb87358bc6";
   };
 
   propagatedBuildInputs = [ future lxml ];

From afa624cfe3c7176a9357c5b43873f555ed9c26af Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:24 +0100
Subject: [PATCH 1502/3942] python3Packages.pytest: 6.1.1 -> 6.1.2

---
 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 29def3082a4f..93282218871a 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -21,14 +21,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "6.1.1";
+  version = "6.1.2";
   pname = "pytest";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8f593023c1a0f916110285b6efd7f99db07d59546e3d8c36fc60e2ab05d3be92";
+    sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e";
   };
 
   checkInputs = [ hypothesis pygments ];

From 210e94a62e70ee97429cfd5af4f038f52af8fab1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:24 +0100
Subject: [PATCH 1503/3942] python3Packages.reportlab: 3.5.53 -> 3.5.55

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

diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index e96943a1953a..3a668077a383 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -11,11 +11,11 @@ let
   ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
 in buildPythonPackage rec {
   pname = "reportlab";
-  version = "3.5.53";
+  version = "3.5.55";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "49e32586d3a814a5f77407c0590504a72743ca278518b3c0f90182430f2d87af";
+    sha256 = "4f307accda32c9f17015ed77c7424f904514e349dff063f78d2462d715963e53";
   };
 
   checkInputs = [ glibcLocales ];

From 47dd7ee25efa81d3d50f13847999abaa72e1e694 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:24 +0100
Subject: [PATCH 1504/3942] python3Packages.scp: 0.13.2 -> 0.13.3

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

diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix
index b17be3c77d88..a37927b9a641 100644
--- a/pkgs/development/python-modules/scp/default.nix
+++ b/pkgs/development/python-modules/scp/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "scp";
-  version = "0.13.2";
+  version = "0.13.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1crlpw9lnn58fs1c1rmh7s7s9y5gkgpgjsqlvg9qa51kq1knx7gg";
+    sha256 = "8bd748293d7362073169b96ce4b8c4f93bcc62cfc5f7e1d949e01e406a025bd4";
   };
 
   propagatedBuildInputs = [

From 5fe0232f8f1036a6f89ce2f0a4b27a4bb7350bd6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:24 +0100
Subject: [PATCH 1505/3942] python3Packages.setuptools-rust: 0.11.3 -> 0.11.4

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

diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index a00ea9e818f4..cfffffb94bf6 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "setuptools-rust";
-  version = "0.11.3";
+  version = "0.11.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1p21sw77197m7pciy8g25bwwaakq1675h0x1lis9sypzr46p2s11";
+    sha256 = "9714fcb94c78e6ab1864ddac7750049e105fd4f7c52103aecf40d408e94a722f";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From bcadb24a2885b053d494a6ff84bb6555cf5058fc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:24 +0100
Subject: [PATCH 1506/3942] python3Packages.snowflake-connector-python: 2.3.4
 -> 2.3.5

---
 .../python-modules/snowflake-connector-python/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 6f271e1758aa..bc60d7897c1a 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -25,12 +25,12 @@
 
 buildPythonPackage rec {
   pname = "snowflake-connector-python";
-  version = "2.3.4";
+  version = "2.3.5";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5a072ee61ef156e5938e04447f0b99248b87ef262e498b5e5002f5b579cd7fb2";
+    sha256 = "b953a53141a88406e9c0e3144582a7c257e5c89fa81e97664d520999991812e7";
   };
 
   propagatedBuildInputs = [

From 878b253ff58600593af8c2db721da9e637bcdc68 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:24 +0100
Subject: [PATCH 1507/3942] python3Packages.sqlmap: 1.4.10 -> 1.4.11

---
 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 e7bfff7b41a9..fe17c909efac 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.4.10";
+  version = "1.4.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0cef7d8ae2e2cd829d49535aa2047c58b25e429e80f148e29063fbe2b2acf97f";
+    sha256 = "5c91d13f090c8e891201c7b924cc2b2feccf12042b42075a5623b4986b9c9ee7";
   };
 
   postPatch = ''

From 33913fa33bc110232efdebe08136862fac780cd2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:24 +0100
Subject: [PATCH 1508/3942] python3Packages.sshtunnel: 0.2.1 -> 0.2.2

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

diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix
index f37ba1545748..b8f2ab998266 100644
--- a/pkgs/development/python-modules/sshtunnel/default.nix
+++ b/pkgs/development/python-modules/sshtunnel/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.2.1";
+  version = "0.2.2";
   pname = "sshtunnel";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ce28bf9abe6c6b00c5d10343a68c1325f8409ebfb9bf1c1d863a31afa3983cd7";
+    sha256 = "1801b144b42b9bdb2f931923e85837f9193b877f3d490cd5776e1d4062c62fb4";
   };
 
   propagatedBuildInputs = [ paramiko ];

From 2b24bd711bcce6eb88dd32a167309d3c864a3413 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:24 +0100
Subject: [PATCH 1509/3942] python3Packages.statsmodels: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
index 3ced08d78587..f538cdf0c04b 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "statsmodels";
-  version = "0.12.0";
+  version = "0.12.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5c7d6707ad3112b67f564abaf1845d3c02ecc7174c2d990d539f45c37e98ad35";
+    sha256 = "a271b4ccec190148dccda25f0cbdcbf871f408fc1394a10a7dc1af4a62b91c8e";
   };
 
   nativeBuildInputs = [ cython ];

From 8ab64ec8dfb1a5bf5b6db03f6c3f2e5dec533ee0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:24 +0100
Subject: [PATCH 1510/3942] python3Packages.tempora: 4.0.0 -> 4.0.1

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

diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index 238b250136cb..0536b0f2ccd4 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "tempora";
-  version = "4.0.0";
+  version = "4.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "599a3a910b377f2b544c7b221582ecf4cb049b017c994b37f2b1a9ed1099716e";
+    sha256 = "9af06854fafb26d3d40d3dd6402e8baefaf57f90e48fdc9a94f6b22827a60fb3";
   };
 
   disabled = pythonOlder "3.2";

From 08eff68ba6d4425f948250a7cc614c95f6b6b145 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:24 +0100
Subject: [PATCH 1511/3942] python3Packages.thinc: 7.4.1 -> 7.4.2

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

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 9272e25a1ba3..5ac55f5f57dd 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -23,11 +23,11 @@
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "7.4.1";
+  version = "7.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17lampllwq50yjl2djs9bs5rp29xw55gqj762npqi3cvvj2glf81";
+    sha256 = "772f1a27b9b31e51003d1d2a7476cc49cc81044dd87088112237f93bd2091f0b";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

From f2d0b1ffeb03c4d2418adc6eb6efe779ffabccf7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:24 +0100
Subject: [PATCH 1512/3942] python3Packages.toml: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix
index 8e96efcdf444..96c6635771c7 100644
--- a/pkgs/development/python-modules/toml/default.nix
+++ b/pkgs/development/python-modules/toml/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "toml";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f";
+    sha256 = "b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f";
   };
 
   # This package has a test script (built for Travis) that involves a)

From 35c8e7bf2514fdb7b3f08eec48f80bfd0cef87f3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Nov 2020 15:04:24 +0100
Subject: [PATCH 1513/3942] python3Packages.tubeup: 0.0.19 -> 0.0.20

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

diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix
index d25180948a32..02269cdbfb28 100644
--- a/pkgs/development/python-modules/tubeup/default.nix
+++ b/pkgs/development/python-modules/tubeup/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "tubeup";
-  version = "0.0.19";
+  version = "0.0.20";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6e3ebbf677a43018bfd71070919187bd57120010b0d708c0494c0f17bb72e84e";
+    sha256 = "8bf4004629b8427173c8259e1a09065db99135d6cc390b70a8a67b52a34a3f67";
   };
 
   postPatch = ''

From c36ac559ebc712ac638188f7b0cc1b5ae5cbe463 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 5 Nov 2020 10:38:35 +0100
Subject: [PATCH 1514/3942] python3Packages.periodictable: 1.5.2 -> 1.5.3

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

diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix
index a0949385bd3a..9e41cd5aae84 100644
--- a/pkgs/development/python-modules/periodictable/default.nix
+++ b/pkgs/development/python-modules/periodictable/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "periodictable";
-  version = "1.5.2";
+  version = "1.5.3";
 
   propagatedBuildInputs = [numpy pyparsing];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lx03xirh3hcrzkwrz91dmdzcj01bykq59hccd83ai901jzqmshz";
+    sha256 = "1d09c359468e2de74b43fc3a7dcb0d3d71e0ff53adb85995215d8d7796451af6";
   };
 
   meta = {

From f3ecc37a857e2dfe4f03dc508dfdf8300afa867c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 5 Nov 2020 10:38:35 +0100
Subject: [PATCH 1515/3942] python3Packages.scipy: 1.5.3 -> 1.5.4

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

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index ef5f6a6972f4..218415354db7 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -9,11 +9,11 @@ let
   });
 in buildPythonPackage rec {
   pname = "scipy";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ddae76784574cc4c172f3d5edd7308be16078dd3b977e8746860c76c195fa707";
+    sha256 = "4a453d5e5689de62e5d38edf40af3f17560bfd63c9c5bd228c18c1f99afa155b";
   };
 
   checkInputs = [ nose pytest ];

From ac8aff99bf4aea5d641dd2b23afb228d3cfa458b Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Thu, 17 Sep 2020 10:19:28 -0400
Subject: [PATCH 1516/3942] pythonPackages.pandas: cleanup

* Sort imports
* add changelog
---
 .../python-modules/pandas/default.nix         | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 6e9f3874d29f..da3358cbbdaf 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -1,27 +1,29 @@
-{ buildPythonPackage
+{ stdenv
+, buildPythonPackage
 , fetchPypi
 , python
-, stdenv
-, pytest
-, glibcLocales
+, isPy38
+, beautifulsoup4
+, bottleneck
 , cython
 , dateutil
-, scipy
-, moto
-, numexpr
-, pytz
-, xlrd
-, bottleneck
-, sqlalchemy
-, lxml
 , html5lib
-, beautifulsoup4
-, hypothesis
+, lxml
+, numexpr
 , openpyxl
+, pytz
+, sqlalchemy
+, scipy
 , tables
+, xlrd
 , xlwt
+# Test Inputs
+, glibcLocales
+, hypothesis
+, moto
+, pytest
+# Darwin inputs
 , runtimeShell
-, isPy38
 , libcxx ? null
 }:
 
@@ -43,18 +45,18 @@ in buildPythonPackage rec {
   nativeBuildInputs = [ cython ];
   buildInputs = optional isDarwin libcxx;
   propagatedBuildInputs = [
-    dateutil
-    scipy
-    numexpr
-    pytz
-    xlrd
-    bottleneck
-    sqlalchemy
-    lxml
-    html5lib
     beautifulsoup4
+    bottleneck
+    dateutil
+    html5lib
+    numexpr
+    lxml
     openpyxl
+    pytz
+    scipy
+    sqlalchemy
     tables
+    xlrd
     xlwt
   ];
 
@@ -128,14 +130,15 @@ in buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     # https://github.com/pandas-dev/pandas/issues/14866
     # pandas devs are no longer testing i686 so safer to assume it's broken
     broken = stdenv.isi686;
     homepage = "https://pandas.pydata.org/";
+    changelog = "https://pandas.pydata.org/docs/whatsnew/index.html";
     description = "Python Data Analysis Library";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ raskin fridh knedlsepp ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ raskin fridh knedlsepp ];
+    platforms = platforms.unix;
   };
 }

From 1849bc57be30a3c8c9ca8b520950208a1f5f1daf Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Thu, 17 Sep 2020 10:54:32 -0400
Subject: [PATCH 1517/3942] pythonPackages.pandas: convert to pytestCheckHook

---
 .../python-modules/pandas/default.nix         | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index da3358cbbdaf..ce208fe90786 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -21,7 +21,7 @@
 , glibcLocales
 , hypothesis
 , moto
-, pytest
+, pytestCheckHook
 # Darwin inputs
 , runtimeShell
 , libcxx ? null
@@ -40,8 +40,6 @@ in buildPythonPackage rec {
     sha256 = "a979d0404b135c63954dea79e6246c45dd45371a88631cdbb4877d844e6de3b6";
   };
 
-  checkInputs = [ pytest glibcLocales moto hypothesis ];
-
   nativeBuildInputs = [ cython ];
   buildInputs = optional isDarwin libcxx;
   propagatedBuildInputs = [
@@ -60,6 +58,8 @@ in buildPythonPackage rec {
     xlwt
   ];
 
+  checkInputs = [ pytestCheckHook glibcLocales moto hypothesis ];
+
   # doesn't work with -Werror,-Wunused-command-line-argument
   # https://github.com/NixOS/nixpkgs/issues/39687
   hardeningDisable = optional stdenv.cc.isClang "strictoverflow";
@@ -82,8 +82,14 @@ in buildPythonPackage rec {
     "--parallel=$NIX_BUILD_CORES"
   ];
 
+  doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
 
-  disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([
+  pytestFlagsArray = [
+    "$out/${python.sitePackages}/pandas"
+    "--skip-slow"
+    "--skip-network"
+  ];
+  disabledTests = [
     # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat
     # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case
     "test_fallback_plural"
@@ -110,12 +116,10 @@ in buildPythonPackage rec {
   ] ++ optionals isDarwin [
     "test_locale"
     "test_clipboard"
-  ]);
+  ];
 
-  doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
-
-  checkPhase = ''
-    runHook preCheck
+  preCheck = ''
+    export LC_ALL="en_US.UTF-8"
   ''
   # TODO: Get locale and clipboard support working on darwin.
   #       Until then we disable the tests.
@@ -125,9 +129,6 @@ in buildPythonPackage rec {
     echo "#!${runtimeShell}" > pbpaste
     chmod a+x pbcopy pbpaste
     export PATH=$(pwd):$PATH
-  '' + ''
-    LC_ALL="en_US.UTF-8" py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network -k "$disabledTests"
-    runHook postCheck
   '';
 
   meta = with stdenv.lib; {

From 0259315d055a5c06d3b77dd353c6f795df611d39 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 5 Nov 2020 14:19:23 +0100
Subject: [PATCH 1518/3942] python3.pkgs.genshi: fix build

---
 pkgs/development/python-modules/genshi/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix
index 724983f6955f..a0033eb658b1 100644
--- a/pkgs/development/python-modules/genshi/default.nix
+++ b/pkgs/development/python-modules/genshi/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , setuptools
+, six
 }:
 
 buildPythonPackage rec {
@@ -17,7 +18,9 @@ buildPythonPackage rec {
   # FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase)
   doCheck = false;
 
-  buildInputs = [ setuptools ];
+  propagatedBuildInputs = [
+    setuptools six
+  ];
 
   meta = with stdenv.lib; {
     description = "Python components for parsing HTML, XML and other textual content";

From fb89bb42c708b95dc969df047842bc401d385880 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:06:41 -0800
Subject: [PATCH 1519/3942] python3Packages.browser-cookie3: fix deps

---
 pkgs/development/python-modules/browser-cookie3/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix
index 6c9f864061aa..ad8fe1c8a077 100644
--- a/pkgs/development/python-modules/browser-cookie3/default.nix
+++ b/pkgs/development/python-modules/browser-cookie3/default.nix
@@ -1,4 +1,5 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}:
+{ lib, fetchPypi, buildPythonPackage, isPy3k, lz4, keyring, pbkdf2, pycryptodome, pyaes}:
+
 buildPythonPackage rec {
   pname = "browser-cookie3";
   version = "0.11.4";
@@ -10,7 +11,7 @@ buildPythonPackage rec {
 
   disabled = !isPy3k;
 
-  propagatedBuildInputs = [ keyring pbkdf2 pyaes ];
+  propagatedBuildInputs = [ lz4 keyring pbkdf2 pyaes pycryptodome ];
 
   # No tests implemented
   doCheck = false;

From b111fec8923f6fcd7be17acf5930c90b3360fc50 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:08:29 -0800
Subject: [PATCH 1520/3942] python3Packages.dash_core_components: 1.12.1 ->
 1.13.0

---
 .../python-modules/dash-core-components/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix
index 30f747d7fa37..9d5e650207bc 100644
--- a/pkgs/development/python-modules/dash-core-components/default.nix
+++ b/pkgs/development/python-modules/dash-core-components/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "dash_core_components";
-  version = "1.12.1";
+  version = "1.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "27f2ac612f5574dcd0d645f9302ceca5975bbdac6791865692e3ac51d0aec7f4";
+    sha256 = "f92025b12931539cdda2173f2b4cd077119cbabbf3ddf62333f6302fd0d8a3ac";
   };
 
   # No tests in archive

From cf99928f8eb369b2d14c7cac4d36fca8473de4ba Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:08:29 -0800
Subject: [PATCH 1521/3942] python3Packages.dash: 1.16.2 -> 1.17.0

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

diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix
index b07836a098a4..f6f00553d930 100644
--- a/pkgs/development/python-modules/dash/default.nix
+++ b/pkgs/development/python-modules/dash/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "dash";
-  version = "1.16.2";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "plotly";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1krhwxlz8kpaklf5ii3h339id6c3139xzxxkq7mvvag330j6nbgg";
+    sha256 = "1fbnhpmkxavv6yirmhx7659q1y9bqynwjd1g6cscv1mfv9m59l60";
   };
 
   propagatedBuildInputs = [

From eb20fd2002ed85cc39c042e9cb343adb8ded4d58 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:08:30 -0800
Subject: [PATCH 1522/3942] python3Packages.dash_table: 4.10.1 -> 4.11.0

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

diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix
index fdcadf3f00a4..c313aea6c062 100644
--- a/pkgs/development/python-modules/dash-table/default.nix
+++ b/pkgs/development/python-modules/dash-table/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "dash_table";
-  version = "4.10.1";
+  version = "4.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1aa02180faef13434364286b60404d26164d1ce2779c765c9c52e6935991a4e9";
+    sha256 = "3170504a8626a9676b016c5ab456ab8c1fb1ea0206dcc2eddb8c4c6589216304";
   };
 
   # No tests in archive

From 92c7a4085654a67b353193aa354a2036772f29f1 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:10:17 -0800
Subject: [PATCH 1523/3942] python3Packages.update_checker: disable py2

```
builder for '/nix/store/2qwl0rkdm2gx2byhpmw7lxyg5rprwqqk-python2.7-update_checker-0.18.0.drv' failed with exit code 1; last 10 log lines:
  no configure script, doing nothing
  building
  Executing setuptoolsBuildPhase
  Traceback (most recent call last):
    File "nix_run_setup", line 8, in <module>
      exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
    File "setup.py", line 9
      with open(f"{MODULE_NAME}.py") as fp:
                                  ^
  SyntaxError: invalid syntax
```
---
 pkgs/development/python-modules/update_checker/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix
index fd3d0b02b630..6779a50e2c47 100644
--- a/pkgs/development/python-modules/update_checker/default.nix
+++ b/pkgs/development/python-modules/update_checker/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests}:
+{ stdenv, buildPythonPackage, fetchPypi, requests, isPy27
+}:
 
 buildPythonPackage rec {
   pname = "update_checker";
   version = "0.18.0";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;

From 9d04b893808f2ffd31e01d26e0e12c323b371314 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:11:24 -0800
Subject: [PATCH 1524/3942] python3Packages.sphinxcontrib-openapi: disable py2

```
builder for '/nix/store/jz41wvwvkc6q55972ysdajm6k3vnv6r8-python2.7-sphinxcontrib-openapi-0.7.0.drv' failed with exit code 1; last 10 log lines:
  configuring
  no configure script, doing nothing
  building
  Executing setuptoolsBuildPhase
  Traceback (most recent call last):
    File "nix_run_setup", line 8, in <module>
      exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
    File "setup.py", line 10, in <module>
      with open(os.path.join(here, "README.rst"), "r", encoding="utf-8") as f:
  TypeError: 'encoding' is an invalid keyword argument for this function
```
---
 .../python-modules/sphinxcontrib-openapi/default.nix            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
index d3e9f30f50a8..bd62d2ef4f8f 100644
--- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy27
 , setuptools_scm
 , m2r
 , pyyaml
@@ -11,6 +12,7 @@
 buildPythonPackage rec {
   pname = "sphinxcontrib-openapi";
   version = "0.7.0";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;

From 58336243fb76db477842fad2d6ba998e1ce9ab0a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:13:08 -0800
Subject: [PATCH 1525/3942] python3Packages.pytest-flakes: disable py2

---
 pkgs/development/python-modules/pytest-flakes/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix
index fb0011f61408..8c38544d8120 100644
--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -1,11 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pytestpep8, pytest, pyflakes }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+, pytestpep8
+, pytest
+, pyflakes
+}:
 
 buildPythonPackage rec {
   # upstream has abandoned project in favor of pytest-flake8
   # retaining package to not break other packages
   pname = "pytest-flakes";
   version = "4.0.2";
+  disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;

From 3316af8b21215d041771df63bf257b005bb74d42 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:14:21 -0800
Subject: [PATCH 1526/3942] Revert "python: patator: 0.7 -> 0.9"

This reverts commit 5c1c22ad8cfde07d6d6c45cd2ea5f3508842116f.
---
 pkgs/development/python-modules/patator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix
index 81d9e50b28ff..46601c167553 100644
--- a/pkgs/development/python-modules/patator/default.nix
+++ b/pkgs/development/python-modules/patator/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "patator";
-  version = "0.9";
+  version = "0.7";
   disabled = !(isPy3k);
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "68cb24bdc3042ee0d47a288b19a8b99a6c54bdbd4ddf0c5817d9b9ac0a0d8a15";
+    sha256 = "335e432e6cc591437e316ba8c1da935484ca39fc79e595ccf60ccd9166e965f1";
   };
 
   propagatedBuildInputs = [

From 022b8690d137d2974e48242b1d9b296d990d41e2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:17:28 -0800
Subject: [PATCH 1527/3942] python3Packages.flask-cores: fix tests

---
 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 85635c0e65f9..da61365e3ae8 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/pkgs/development/python-modules/flask-cors/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchPypi, buildPythonPackage
-, nose, flask, six }:
+, nose, flask, six, packaging }:
 
 buildPythonPackage rec {
   pname = "Flask-Cors";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "6bcfc100288c5d1bcb1dbb854babd59beee622ffd321e444b05f24d6d58466b8";
   };
 
-  checkInputs = [ nose ];
+  checkInputs = [ nose packaging ];
   propagatedBuildInputs = [ flask six ];
 
   # Exclude test_acl_uncaught_exception_500 test case because is not compatible

From 94d2943d871bea4deeff60f989b4fe66a2de893a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:19:14 -0800
Subject: [PATCH 1528/3942] python3Packages.amply: fix tests

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

diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix
index ddb75d592b81..1962d004f41b 100644
--- a/pkgs/development/python-modules/amply/default.nix
+++ b/pkgs/development/python-modules/amply/default.nix
@@ -4,6 +4,7 @@
 , setuptools_scm
 , docutils
 , pyparsing
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -15,15 +16,13 @@ buildPythonPackage rec {
     sha256 = "cb12dcb49d16b168c02be128a1527ecde50211e4bd94af76ff4e67707f5a2d38";
   };
 
-  buildInputs = [ setuptools_scm ];
+  nativeBuildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [
     docutils
     pyparsing
   ];
+  checkInputs = [ pytestCheckHook ];
 
-  checkPhase = ''
-    python tests/test_amply.py
-  '';
   pythonImportsCheck = [ "amply" ];
 
   meta = with stdenv.lib; {

From 767b06b65ff92795f6841266d50dfcc8af148615 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:20:01 -0800
Subject: [PATCH 1529/3942] python3Packages.google-auth-oauthlib: disable
 python<3.6

---
 .../development/python-modules/google-auth-oauthlib/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index 9497de84bb02..bdea58de8999 100644
--- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pythonOlder
 , isPy3k
 , click
 , mock
@@ -13,6 +14,7 @@
 buildPythonPackage rec {
   pname = "google-auth-oauthlib";
   version = "0.4.2";
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;

From b135e5f99a6180757035e0368fce017701c778c2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:22:17 -0800
Subject: [PATCH 1530/3942] python3Packages.pyct: disable py2 tests

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

diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix
index 009867e0c4ef..b2314e6edfeb 100644
--- a/pkgs/development/python-modules/pyct/default.nix
+++ b/pkgs/development/python-modules/pyct/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, isPy27
 , param
 , pyyaml
 , requests
@@ -16,6 +17,7 @@ buildPythonPackage rec {
     sha256 = "23d7525b5a1567535c093aea4b9c33809415aa5f018dd77f6eb738b1226df6f7";
   };
 
+  doCheck = !isPy27;
   checkInputs = [ pytest ];
   propagatedBuildInputs = [
     param

From 063116f13fbd20aecb219ae66b8914ece4b34c08 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:25:36 -0800
Subject: [PATCH 1531/3942] python3Packages.requests_aws4auth: disable tests,
 no longer in pyip

---
 pkgs/development/python-modules/requests-aws4auth/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix
index ede2fc6c6a82..a2e92283dc72 100644
--- a/pkgs/development/python-modules/requests-aws4auth/default.nix
+++ b/pkgs/development/python-modules/requests-aws4auth/default.nix
@@ -11,11 +11,15 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ requests ];
 
+  # pypi package no longer contains tests
+  doCheck = false;
   checkPhase = ''
     cd requests_aws4auth
     ${python.interpreter} test/requests_aws4auth_test.py
   '';
 
+  pythonImportsCheck = [ "requests_aws4auth" ];
+
   meta = {
     description = "Amazon Web Services version 4 authentication for the Python Requests library.";
     homepage = "https://github.com/sam-washington/requests-aws4auth";

From a4973ed5dfff54fe3cee1895ce4c19dea9bf92d3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:26:41 -0800
Subject: [PATCH 1532/3942] python3Packages.munkres: fix tests

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

diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix
index a4c16ee066c8..0df36385c0cd 100644
--- a/pkgs/development/python-modules/munkres/default.nix
+++ b/pkgs/development/python-modules/munkres/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , isPy3k
-, nose
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -16,9 +16,7 @@ buildPythonPackage rec {
     sha256 = "fc44bf3c3979dada4b6b633ddeeb8ffbe8388ee9409e4d4e8310c2da1792db03";
   };
 
-  checkInputs = [ nose ];
-
-  checkPhase = "nosetests";
+  checkInputs = [ pytestCheckHook ];
 
   meta = with stdenv.lib; {
     homepage = "http://bmc.github.com/munkres/";

From b5a0e3532b96544a2fadd3b311b443737f6a8606 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:28:24 -0800
Subject: [PATCH 1533/3942] python3Packages.py-multihash: mark broken,
 unmaintained

---
 pkgs/development/python-modules/py-multihash/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix
index 5034f6df4699..e9bf5bcd48ce 100644
--- a/pkgs/development/python-modules/py-multihash/default.nix
+++ b/pkgs/development/python-modules/py-multihash/default.nix
@@ -45,5 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/multiformats/py-multihash";
     license = licenses.mit;
     maintainers = with maintainers; [ rakesh4g ];
+    broken = true; # no longer compatible with base58, no updates in 5 years. Added 2020-11-05
   };
 }

From d67cb89b057f50b524dbbe93cf7b3c0dbdcfb83f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:30:55 -0800
Subject: [PATCH 1534/3942] python3Packages.premailer: disable for py2

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

diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix
index ec0e959c7a5c..c69ec9a05a1f 100644
--- a/pkgs/development/python-modules/premailer/default.nix
+++ b/pkgs/development/python-modules/premailer/default.nix
@@ -1,10 +1,11 @@
-{ lib, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchPypi, isPy27,
   cssselect, cssutils, lxml, mock, nose, requests, cachetools
 }:
 
 buildPythonPackage rec {
   pname = "premailer";
   version = "3.7.0";
+  disabled = isPy27; # no longer compatible with urllib
 
   src = fetchPypi {
     inherit pname version;

From 802fa28d25a7d2558c02e29537eb2334d0116aba Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:31:59 -0800
Subject: [PATCH 1535/3942] python3Packages.pushover-complete: disable for py2

---
 pkgs/development/python-modules/pushover-complete/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/pushover-complete/default.nix b/pkgs/development/python-modules/pushover-complete/default.nix
index e588ae9f796e..33769af319d6 100644
--- a/pkgs/development/python-modules/pushover-complete/default.nix
+++ b/pkgs/development/python-modules/pushover-complete/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, isPy27
 , requests
 , six
 , tox
@@ -11,6 +12,7 @@
 buildPythonPackage rec {
   pname = "pushover-complete";
   version = "1.1.1";
+  disabled = isPy27;
 
   src = fetchPypi {
     pname = "pushover_complete";

From 1c18e511190edc85dc8b71076416db6ddbae51e2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:33:47 -0800
Subject: [PATCH 1536/3942] python3Packages.zope_copy: disable tests for py2

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

diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix
index 4d6e740278e8..0d1ae412262d 100644
--- a/pkgs/development/python-modules/zope_copy/default.nix
+++ b/pkgs/development/python-modules/zope_copy/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, isPy27
 , zope_interface
 , zope_location
 , zope_schema
@@ -18,6 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ zope_interface ];
 
+  doCheck = !isPy27; # namespace conflicts
   checkInputs = [ zope_location zope_schema ];
 
   checkPhase = ''

From f411927e630db142e2f33e7641b068b9af07ec93 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:35:09 -0800
Subject: [PATCH 1537/3942] python3Packages.iterm2: make darwin only

requires pyobjc package, which is only available for darwin
---
 pkgs/development/python-modules/iterm2/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix
index 66227fcb6680..12a1fd92cbe9 100644
--- a/pkgs/development/python-modules/iterm2/default.nix
+++ b/pkgs/development/python-modules/iterm2/default.nix
@@ -26,6 +26,7 @@ buildPythonPackage rec {
     description = "Python interface to iTerm2's scripting API";
     homepage = "https://github.com/gnachman/iTerm2";
     license = licenses.gpl2;
+    platforms = platforms.darwin;
     maintainers = with maintainers; [ jeremyschlatter ];
   };
 }

From d4873aa586a977a877f32503a19b5c40b0a8c2f1 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:37:26 -0800
Subject: [PATCH 1538/3942] python3Packages.nbconflux: disable for py2

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

diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix
index e86119036b5c..4e443a377eda 100644
--- a/pkgs/development/python-modules/nbconflux/default.nix
+++ b/pkgs/development/python-modules/nbconflux/default.nix
@@ -1,8 +1,9 @@
-{ lib, buildPythonPackage, fetchFromGitHub, nbconvert, pytest, requests, responses }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27, nbconvert, pytest, requests, responses }:
 
 buildPythonPackage rec {
   pname = "nbconflux";
   version = "0.7.0";
+  disabled = isPy27; # no longer compatible with python 2 urllib
 
   src = fetchFromGitHub {
     owner = "Valassis-Digital-Media";

From c4e36c4f0f5e9d792a5bf3d268020077c1a137ba Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:37:49 -0800
Subject: [PATCH 1539/3942] python3Packages.jupytext: fix deps

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

diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index e4b285d4ea73..542e177e47fd 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -3,6 +3,7 @@
 , nbformat
 , pytest
 , pyyaml
+, toml
 }:
 
 buildPythonPackage rec {
@@ -17,6 +18,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     pyyaml
     nbformat
+    toml
   ] ++ lib.optionals isPy27 [ mock ]; # why they put it in install_requires, who knows
 
   checkInputs = [

From baa855134f92cd7ea88a7e92f09f57a81f8a6808 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:38:33 -0800
Subject: [PATCH 1540/3942] python3Packages.pycurl: disable for py2

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

diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index 9c39961b05df..fe62d1be1ea1 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -1,6 +1,7 @@
 { buildPythonPackage
 , isPyPy
 , fetchPypi
+, pythonOlder
 , curl
 , openssl
 , bottle
@@ -12,7 +13,7 @@
 buildPythonPackage rec {
   pname = "pycurl";
   version = "7.43.0.6";
-  disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
+  disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208
 
   src = fetchPypi {
     inherit pname version;

From 80856166340b7df57f03ebb4d23b9638013e26d4 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:40:20 -0800
Subject: [PATCH 1541/3942] python37Packages.sphinxcontrib-spelling: fix deps

---
 .../python-modules/sphinxcontrib-spelling/default.nix       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
index 0dc7297be69c..6b366ee517ce 100644
--- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
@@ -1,6 +1,9 @@
 { stdenv
+, lib
 , buildPythonPackage
 , fetchPypi
+, pythonOlder
+, importlib-metadata
 , sphinx
 , pyenchant
 , pbr
@@ -15,7 +18,8 @@ buildPythonPackage rec {
     sha256 = "c8250ff02e6033c3aeabc41e91dc185168fecefb0c5722aaa3e2055a829e1e4c";
   };
 
-  propagatedBuildInputs = [ sphinx pyenchant pbr ];
+  propagatedBuildInputs = [ sphinx pyenchant pbr ]
+    ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   # No tests included
   doCheck = false;

From fb67994b6b6645a4e0b144f4681d34085f0439de Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 15:46:50 -0800
Subject: [PATCH 1542/3942] python3Packages.fiona: fix deps

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

diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index 5a0a97220fa9..a88db7b80f56 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
 , attrs, click, cligj, click-plugins, six, munch, enum34
-, pytest, boto3, mock, giflib
+, pytest, boto3, mock, giflib, pytz
 , gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745
 }:
 
@@ -30,6 +30,7 @@ buildPythonPackage rec {
     click-plugins
     six
     munch
+    pytz
   ] ++ lib.optional (!isPy3k) enum34;
 
   checkInputs = [

From a435637e66f2da5e9c985756e4678d758baf3ec4 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Thu, 5 Nov 2020 16:24:37 -0800
Subject: [PATCH 1543/3942] linux/hardened/patches/4.14: 4.14.202.a ->
 4.14.204.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index ff410b2ab2c5..1d82a4fa1d24 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,8 +1,8 @@
 {
     "4.14": {
-        "name": "linux-hardened-4.14.202.a.patch",
-        "sha256": "0ns5yq087m7i7ciq2b4skxclnlym0zm5v0vjqvzi9r375fd0gm9s",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.202.a/linux-hardened-4.14.202.a.patch"
+        "name": "linux-hardened-4.14.204.a.patch",
+        "sha256": "1vwja9mqycw3322p8a896l9mkxvzym6r9q17zfgwpqi3kvr9k74h",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.204.a/linux-hardened-4.14.204.a.patch"
     },
     "4.19": {
         "name": "linux-hardened-4.19.152.a.patch",

From 22387315b65f8bc2986eea08d2c3c00e922d3bc1 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Thu, 5 Nov 2020 16:24:39 -0800
Subject: [PATCH 1544/3942] linux/hardened/patches/4.19: 4.19.152.a ->
 4.19.155.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 1d82a4fa1d24..18c4b913b4f0 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -5,9 +5,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.204.a/linux-hardened-4.14.204.a.patch"
     },
     "4.19": {
-        "name": "linux-hardened-4.19.152.a.patch",
-        "sha256": "0zc36yklzjb3sqd61m12c1988mazkrv242wbk7cn0a2b5sw7a373",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.152.a/linux-hardened-4.19.152.a.patch"
+        "name": "linux-hardened-4.19.155.a.patch",
+        "sha256": "0jrvd9yws7cym08j28r7wv3i83zlk5z0vl0l1mibak04h43mibgf",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.155.a/linux-hardened-4.19.155.a.patch"
     },
     "5.4": {
         "name": "linux-hardened-5.4.72.a.patch",

From f9d1130ae9b4e564b0a30d682b3bdebd18c23bb8 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Thu, 5 Nov 2020 16:24:40 -0800
Subject: [PATCH 1545/3942] linux/hardened/patches/5.4: 5.4.72.a -> 5.4.75.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 18c4b913b4f0..d0d6c9887d74 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -10,9 +10,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.155.a/linux-hardened-4.19.155.a.patch"
     },
     "5.4": {
-        "name": "linux-hardened-5.4.72.a.patch",
-        "sha256": "1w4sfkx4qj9vx47z06bkf4biaiz58z2qp536g7dss26zdbx1im26",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.72.a/linux-hardened-5.4.72.a.patch"
+        "name": "linux-hardened-5.4.75.a.patch",
+        "sha256": "169m2a3wm5lsyzp7cp8nvxarhgcnan41ap7k5r7jx7x1frx2vzxm",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.75.a/linux-hardened-5.4.75.a.patch"
     },
     "5.8": {
         "name": "linux-hardened-5.8.16.a.patch",

From 8bf8b61c2ddd4d7805011d1b3871811e59c4511c Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Thu, 5 Nov 2020 16:24:42 -0800
Subject: [PATCH 1546/3942] linux/hardened/patches/5.8: 5.8.16.a -> 5.8.18.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index d0d6c9887d74..7c055d0758f3 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -15,9 +15,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.75.a/linux-hardened-5.4.75.a.patch"
     },
     "5.8": {
-        "name": "linux-hardened-5.8.16.a.patch",
-        "sha256": "0b7bfzknz2am9pfypazqzky9bcd6659sakcdx2a7p1i3bj6zxnn1",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.16.a/linux-hardened-5.8.16.a.patch"
+        "name": "linux-hardened-5.8.18.a.patch",
+        "sha256": "1r2n74nbyi3dp5zql9sk504xkpil6ylbyd99zqqva4nd3qg17c99",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch"
     },
     "5.9": {
         "name": "linux-hardened-5.9.1.a.patch",

From d57891889d5ae0743a3ade514216829cc5ba4138 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Thu, 5 Nov 2020 16:24:43 -0800
Subject: [PATCH 1547/3942] linux/hardened/patches/5.9: 5.9.1.a -> 5.9.6.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 7c055d0758f3..f97474556ce9 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -20,8 +20,8 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch"
     },
     "5.9": {
-        "name": "linux-hardened-5.9.1.a.patch",
-        "sha256": "07897dgkldm2dxsriapjlg9b118sd32qmd1z8xja01xcgd3r6vp7",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.1.a/linux-hardened-5.9.1.a.patch"
+        "name": "linux-hardened-5.9.6.a.patch",
+        "sha256": "1h25jkbp0yz2jfmbnwrldd1rcpag8mbf8dv6kc79j7qg1agafxkn",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.6.a/linux-hardened-5.9.6.a.patch"
     }
 }

From 5ff62a94f2a188d47de3a89b827e1c228974a019 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Oct 2020 13:52:52 +0200
Subject: [PATCH 1548/3942] tiv: init at 1.1.0

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

diff --git a/pkgs/applications/misc/tiv/default.nix b/pkgs/applications/misc/tiv/default.nix
new file mode 100644
index 000000000000..3790a9fdd069
--- /dev/null
+++ b/pkgs/applications/misc/tiv/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, imagemagick }:
+
+stdenv.mkDerivation rec {
+  pname = "tiv";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "stefanhaustein";
+    repo = "TerminalImageViewer";
+    rev = "v${version}";
+    sha256 = "17zqbwj2imk6ygyc142mw6v4fh7h4rd5vzn5wxr9gs0g8qdc6ixn";
+  };
+
+  buildInputs = [ imagemagick ];
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  preConfigure = "cd src/main/cpp";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/stefanhaustein/TerminalImageViewer";
+    description = "Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ magnetophon ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5e96c702485..1a4d7de7d192 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7433,6 +7433,8 @@ in
 
   tio = callPackage ../tools/misc/tio { };
 
+  tiv = callPackage ../applications/misc/tiv { };
+
   tldr = callPackage ../tools/misc/tldr { };
 
   tldr-hs = haskellPackages.tldr;

From adf334a0c653a5c163e00e05cc6f5088295cc4d8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 20:38:18 -0500
Subject: [PATCH 1549/3942] nanorc: 2020-01-25 -> 2020-10-10

Add update script
---
 .../editors/nano/nanorc/default.nix           | 43 ++++++++++++++++---
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix
index 4d4b093233bd..54442fc21f43 100644
--- a/pkgs/applications/editors/nano/nanorc/default.nix
+++ b/pkgs/applications/editors/nano/nanorc/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts
+, coreutils, git, gnused, nix, nixfmt }:
 
-stdenv.mkDerivation {
+let
+  owner = "scopatz";
+  repo = "nanorc";
+in stdenv.mkDerivation rec {
   pname = "nanorc";
-  version = "2020-01-25";
+  version = "2020-10-10";
 
   src = fetchFromGitHub {
-    owner = "scopatz";
-    repo = "nanorc";
-    rev = "2020.1.25";
-    sha256 = "1y8jk3jsl4bd6r4hzmxzcf77hv8bwm0318yv7y2npkkd3a060z8d";
+    inherit owner repo;
+    rev = builtins.replaceStrings [ "-" ] [ "." ] version;
+    sha256 = "3B2nNFYkwYHCX6pQz/hMO/rnVqlCiw1BSNmGmJ6KCqE=";
   };
 
   dontBuild = true;
@@ -19,6 +22,32 @@ stdenv.mkDerivation {
     install *.nanorc $out/share/
   '';
 
+  passthru.updateScript = writeScript "update.sh" ''
+    #!${stdenv.shell}
+    set -o errexit
+    PATH=${
+      stdenv.lib.makeBinPath [
+        common-updater-scripts
+        coreutils
+        git
+        gnused
+        nix
+        nixfmt
+      ]
+    }
+    oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"' | sed 's|\\.|-|g')"
+    latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:${owner}/${repo} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)"
+    if [ "$oldVersion" != "$latestTag" ]; then
+      nixpkgs="$(git rev-parse --show-toplevel)"
+      default_nix="$nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix"
+      newTag=$(echo $latestTag | sed 's|\.|-|g')
+      update-source-version ${pname} "$newTag" --version-key=version --print-changes
+      nixfmt "$default_nix"
+    else
+      echo "${pname} is already up-to-date"
+    fi
+  '';
+
   meta = {
     description = "Improved Nano Syntax Highlighting Files";
     homepage = "https://github.com/scopatz/nanorc";

From 43907de6a754597006e0f12fc763a6d7475cf566 Mon Sep 17 00:00:00 2001
From: AmineChikhaoui <amine@chikhaoui.org>
Date: Thu, 5 Nov 2020 20:58:08 -0500
Subject: [PATCH 1550/3942] ec2-amis: update AMIs to use gpt partition table

Use changes made as part of #102182.
---
 nixos/modules/virtualisation/ec2-amis.nix | 36 +++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index 4d9c391e0465..3da63078a214 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -329,24 +329,24 @@ let self = {
   "20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86";
   "20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d";
 
-  # 20.09.1465.9a0b14b097d
-  "20.09".eu-west-1.hvm-ebs = "ami-0d90f16418e3c364c";
-  "20.09".eu-west-2.hvm-ebs = "ami-0635ec0780ea57cfe";
-  "20.09".eu-west-3.hvm-ebs = "ami-0714e94352f2eabb9";
-  "20.09".eu-central-1.hvm-ebs = "ami-0979d39762a4d2a02";
-  "20.09".eu-north-1.hvm-ebs = "ami-0b14e273185c66e9b";
-  "20.09".us-east-1.hvm-ebs = "ami-0f8b063ac3f2d9645";
-  "20.09".us-east-2.hvm-ebs = "ami-0959202a0393fdd0c";
-  "20.09".us-west-1.hvm-ebs = "ami-096d50833b785478b";
-  "20.09".us-west-2.hvm-ebs = "ami-0fc31031df0df6104";
-  "20.09".ca-central-1.hvm-ebs = "ami-0787786a38cde3905";
-  "20.09".ap-southeast-1.hvm-ebs = "ami-0b3f693d3a2a0b9ae";
-  "20.09".ap-southeast-2.hvm-ebs = "ami-02471872bc876b610";
-  "20.09".ap-northeast-1.hvm-ebs = "ami-06505fd2bf44a59a7";
-  "20.09".ap-northeast-2.hvm-ebs = "ami-0754b4c014eea1e8a";
-  "20.09".ap-south-1.hvm-ebs = "ami-05100e32242ae65a6";
-  "20.09".ap-east-1.hvm-ebs = "ami-045288859a39de009";
-  "20.09".sa-east-1.hvm-ebs = "ami-0a937748db48fb00d";
+  # 20.09.1632.a6a3a368dda
+  "20.09".eu-west-1.hvm-ebs = "ami-01a79d5ce435f4db3";
+  "20.09".eu-west-2.hvm-ebs = "ami-0cbe14f32904e6331";
+  "20.09".eu-west-3.hvm-ebs = "ami-07f493412d6213de6";
+  "20.09".eu-central-1.hvm-ebs = "ami-01d4a0c2248cbfe38";
+  "20.09".eu-north-1.hvm-ebs = "ami-0003f54dd99d68e0f";
+  "20.09".us-east-1.hvm-ebs = "ami-068a62d478710462d";
+  "20.09".us-east-2.hvm-ebs = "ami-01ac677ff61399caa";
+  "20.09".us-west-1.hvm-ebs = "ami-04befdb203b4b17f6";
+  "20.09".us-west-2.hvm-ebs = "ami-0fb7bd4a43261c6b2";
+  "20.09".ca-central-1.hvm-ebs = "ami-06d5ee429f153f856";
+  "20.09".ap-southeast-1.hvm-ebs = "ami-0db0304e23c535b2a";
+  "20.09".ap-southeast-2.hvm-ebs = "ami-045983c4db7e36447";
+  "20.09".ap-northeast-1.hvm-ebs = "ami-0beb18d632cf64e5a";
+  "20.09".ap-northeast-2.hvm-ebs = "ami-0dd0316af578862db";
+  "20.09".ap-south-1.hvm-ebs = "ami-008d15ced81c88aed";
+  "20.09".ap-east-1.hvm-ebs = "ami-071f49713f86ea965";
+  "20.09".sa-east-1.hvm-ebs = "ami-05ded1ae35209b5a8";
 
   latest = self."20.09";
 }; in self

From 93b0accc76ffccee15a1b34ff8206f84a64069cb Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Thu, 5 Nov 2020 18:00:31 -0800
Subject: [PATCH 1551/3942] macvim: fix building with nix-daemon (#102975)

When building MacVim with nix-daemon it tries to place the derived data
into a path rooted in `/var/empty`, which fails. Specifying the derived
data path ourselves fixes this problem.
---
 pkgs/applications/editors/vim/macvim.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index ef6c6a144071..d2cc14c30c48 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -94,6 +94,19 @@ stdenv.mkDerivation {
   + ''
     unset LD
   ''
+  # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use
+  # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath
+  # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim
+  # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default
+  # behavior to build the first target in the project. Experimentally, there seems to be a scheme
+  # called MacVim, so we'll explicitly select that. We also need to specify the configuration too
+  # as the scheme seems to have the wrong default.
+  + ''
+    configureFlagsArray+=(
+      XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData"
+      --with-xcodecfg="Release"
+    )
+  ''
   ;
 
   # Because we're building with system clang, this means we're building against Xcode's SDK and

From 8846bd9f79bcfed13d0209e03bb4920f19775807 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 20:54:12 -0500
Subject: [PATCH 1552/3942] coursier: Add update script

---
 pkgs/development/tools/coursier/default.nix | 61 +++++++++++++++++----
 1 file changed, 49 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index d3c1cc50d0e1..662cea9558c7 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, fetchurl, makeWrapper, jre }:
+{ stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts
+, coreutils, git, gnused, nix, nixfmt }:
 
 let
-  zshCompletion = version: fetchurl {
-    url = "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh";
-    sha256 = "0afxzrk9w1qinfsz55jjrxydw0fcv6p722g1q955dl7f6xbab1jh";
-  };
-in
-stdenv.mkDerivation rec {
-  pname = "coursier";
   version = "2.0.6";
 
+  zshCompletion = fetchurl {
+    url =
+      "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh";
+    sha256 = "0afxzrk9w1qinfsz55jjrxydw0fcv6p722g1q955dl7f6xbab1jh";
+  };
+
+  repo = "git@github.com:coursier/coursier.git";
+in stdenv.mkDerivation rec {
+  inherit version;
+
+  pname = "coursier";
+
   src = fetchurl {
-    url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
-    sha256 = "0zg07bi44a5p0zfc77i1vmjz9rwzxzf6p0xsybsv3n1saq884wij";
+    url =
+      "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
+    sha256 = "MnKCEFY62LH18rqDa9zvn+f0Zd0hnsPcB7coQuI64H0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -23,12 +30,42 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin
 
     # copy zsh completion
-    install -Dm755 ${zshCompletion version} $out/share/zsh/site-functions/_coursier
+    install -Dm755 ${zshCompletion} $out/share/zsh/site-functions/_coursier
+  '';
+
+  passthru.updateScript = writeScript "update.sh" ''
+    #!${stdenv.shell}
+    set -o errexit
+    PATH=${
+      stdenv.lib.makeBinPath [
+        common-updater-scripts
+        coreutils
+        git
+        gnused
+        nix
+        nixfmt
+      ]
+    }
+    oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
+    latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
+    if [ "$oldVersion" != "$latestTag" ]; then
+      nixpkgs="$(git rev-parse --show-toplevel)"
+      default_nix="$nixpkgs/pkgs/development/tools/coursier/default.nix"
+      update-source-version ${pname} "$latestTag" --version-key=version --print-changes
+      url="${builtins.head zshCompletion.urls}"
+      completion_url=$(echo $url | sed "s|$oldVersion|$latestTag|g")
+      completion_sha256="$(nix-prefetch-url --type sha256 $completion_url)"
+      sed -i "s|${zshCompletion.outputHash}|$completion_sha256|g" "$default_nix"
+      nixfmt "$default_nix"
+    else
+      echo "${pname} is already up-to-date"
+    fi
   '';
 
   meta = with stdenv.lib; {
     homepage = "https://get-coursier.io/";
-    description = "A Scala library to fetch dependencies from Maven / Ivy repositories";
+    description =
+      "A Scala library to fetch dependencies from Maven / Ivy repositories";
     license = licenses.asl20;
     maintainers = with maintainers; [ adelbertc nequissimus ];
   };

From 11fc05583669cf3cb8c99dc6cb6f6ca7d93fa01d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 5 Nov 2020 22:02:27 +0800
Subject: [PATCH 1553/3942] pam_mount: add support for LUKS2

---
 pkgs/os-specific/linux/pam_mount/default.nix  | 47 ++++++++++++-------
 .../linux/pam_mount/support_luks2.patch       | 47 +++++++++++++++++++
 2 files changed, 76 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/os-specific/linux/pam_mount/support_luks2.patch

diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix
index 18bc84effa06..3e026be6abb2 100644
--- a/pkgs/os-specific/linux/pam_mount/default.nix
+++ b/pkgs/os-specific/linux/pam_mount/default.nix
@@ -1,37 +1,48 @@
-{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "pam_mount-2.16";
+  pname = "pam_mount";
+  version = "2.16";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pam-mount/pam_mount/2.16/${name}.tar.xz";
+    url = "mirror://sourceforge/pam-mount/pam_mount/${version}/${pname}-${version}.tar.xz";
     sha256 = "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ];
+  patches = [
+    ./insert_utillinux_path_hooks.patch
+    ./support_luks2.patch
+  ];
 
-  patches = [ ./insert_utillinux_path_hooks.patch ];
+  postPatch = ''
+    substituteInPlace src/mtcrypt.c \
+      --replace @@NIX_UTILLINUX@@ ${utillinux}/bin
+  '';
 
-  preConfigure = ''
-    substituteInPlace src/mtcrypt.c --replace @@NIX_UTILLINUX@@ ${utillinux}/bin
-    sh autogen.sh --prefix=$out
-    '';
+  nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];
 
-  makeFlags = [ "DESTDIR=$(out)" ];
+  buildInputs = [ pam libHX utillinux libxml2 pcre perl openssl cryptsetup ];
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--prefix=${placeholder "out"}"
+    "--localstatedir=${placeholder "out"}/var"
+    "--sbindir=${placeholder "out"}/bin"
+    "--sysconfdir=${placeholder "out"}/etc"
+    "--with-slibdir=${placeholder "out"}/lib"
+    "--with-ssbindir=${placeholder "out"}/bin"
+  ];
 
-  # Probably a hack, but using DESTDIR and PREFIX makes everything work!
   postInstall = ''
-    mkdir -p $out
-    cp -r $out/$out/* $out
-    rm -r $out/nix
-    '';
+    rm -r $out/var
+  '';
 
   meta = with stdenv.lib; {
-    homepage = "http://pam-mount.sourceforge.net/";
     description = "PAM module to mount volumes for a user session";
-    maintainers = [ maintainers.tstrobel ];
+    homepage = "https://pam-mount.sourceforge.net/";
     license = with licenses; [ gpl2 gpl3 lgpl21 lgpl3 ];
+    maintainers = with maintainers; [ tstrobel ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/pam_mount/support_luks2.patch b/pkgs/os-specific/linux/pam_mount/support_luks2.patch
new file mode 100644
index 000000000000..0b8557f1bae0
--- /dev/null
+++ b/pkgs/os-specific/linux/pam_mount/support_luks2.patch
@@ -0,0 +1,47 @@
+commit d4434c05e7c0cf05d87089404cfa2deedc60811a
+Author: Ingo Franzki <ifranzki@linux.ibm.com>
+Date:   Mon Oct 29 16:47:40 2018 +0100
+
+    crypto: Add support for LUKS2
+    
+    Cryptsetup version 2.0 added support for LUKS2.
+    This patch adds support for mounting LUKS2 volumes with
+    pam_mount.
+    
+    Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
+
+diff --git a/src/crypto-dmc.c b/src/crypto-dmc.c
+index d0ab6ca..abd0358 100644
+--- a/src/crypto-dmc.c
++++ b/src/crypto-dmc.c
+@@ -21,6 +21,12 @@
+ #include "libcryptmount.h"
+ #include "pam_mount.h"
+ 
++#ifndef CRYPT_LUKS
++	#define CRYPT_LUKS	NULL /* Passing NULL to crypt_load will
++					default to LUKS(1) on older
++					libcryptsetup versions. */
++#endif
++
+ /**
+  * dmc_is_luks - check if @path points to a LUKS volume (cf. normal dm-crypt)
+  * @path:	path to the crypto container
+@@ -48,7 +54,7 @@ EXPORT_SYMBOL int ehd_is_luks(const char *path, bool blkdev)
+ 
+ 	ret = crypt_init(&cd, device);
+ 	if (ret == 0) {
+-		ret = crypt_load(cd, CRYPT_LUKS1, NULL);
++		ret = crypt_load(cd, CRYPT_LUKS, NULL);
+ 		if (ret == -EINVAL)
+ 			ret = false;
+ 		else if (ret == 0)
+@@ -106,7 +112,7 @@ static bool dmc_run(const struct ehd_mount_request *req,
+ #endif
+ 	}
+ 
+-	ret = crypt_load(cd, CRYPT_LUKS1, NULL);
++	ret = crypt_load(cd, CRYPT_LUKS, NULL);
+ 	if (ret == 0) {
+ 		ret = crypt_activate_by_passphrase(cd, mt->crypto_name,
+ 		      CRYPT_ANY_SLOT, req->key_data, req->key_size, flags);

From 0f0af1dbd49c4637e8d40efa237e3b0de5206294 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 20:32:50 -0500
Subject: [PATCH 1554/3942] linux-hardened: Do not block channel

---
 nixos/release-combined.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 945ba90e3454..384ae5765b8c 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -71,7 +71,6 @@ in rec {
         (onFullSupported "nixos.tests.fontconfig-default-fonts")
         (onFullSupported "nixos.tests.gnome3")
         (onFullSupported "nixos.tests.gnome3-xorg")
-        (onFullSupported "nixos.tests.hardened")
         (onSystems ["x86_64-linux"] "nixos.tests.hibernate")
         (onFullSupported "nixos.tests.i3wm")
         (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple")
@@ -93,7 +92,6 @@ in rec {
         (onFullSupported "nixos.tests.keymap.dvp")
         (onFullSupported "nixos.tests.keymap.neo")
         (onFullSupported "nixos.tests.keymap.qwertz")
-        (onFullSupported "nixos.tests.latestKernel.hardened")
         (onFullSupported "nixos.tests.latestKernel.login")
         (onFullSupported "nixos.tests.lightdm")
         (onFullSupported "nixos.tests.login")

From ffb658f66a26c906b33ad28033a8686a8a8fd849 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 6 Nov 2020 08:54:17 +1000
Subject: [PATCH 1555/3942] go_1_14: 1.14.10 -> 1.14.11

---
 pkgs/development/compilers/go/1.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix
index e9adb0522c8a..67f9184d8d9b 100644
--- a/pkgs/development/compilers/go/1.14.nix
+++ b/pkgs/development/compilers/go/1.14.nix
@@ -36,11 +36,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.14.10";
+  version = "1.14.11";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "0rfnjl582cm5klv8c2qyyvn26807zn89m5mk282gkc7awfkrjxmk";
+    sha256 = "05hgnyda5bpm29gnx1956syq54jmpk4k9cf976vypw8ckg9g6w8q";
   };
 
   # perl is used for testing go vet

From d1febbeb1bfc6a0b2a7be5112e2c1f255a07cb15 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 6 Nov 2020 08:54:17 +1000
Subject: [PATCH 1556/3942] go_1_15: 1.15.3 -> 1.15.4

---
 pkgs/development/compilers/go/1.15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix
index 8e692dca1e0d..61531fb62b15 100644
--- a/pkgs/development/compilers/go/1.15.nix
+++ b/pkgs/development/compilers/go/1.15.nix
@@ -36,11 +36,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.15.3";
+  version = "1.15.4";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "1228nv4vyzbqv768dl0bimsic47x9yyqld61qbgqqk75f0jn0sl9";
+    sha256 = "0rr3gp99bmdzg381x5fdwa15brllihn57175l0c82sqqljlscg86";
   };
 
   # perl is used for testing go vet

From 66d424514f2dff8968e41dfd70c8836f995fb7be Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 22 Oct 2020 22:50:46 +1000
Subject: [PATCH 1557/3942] buildGoModule: copy vendor instead of symlinking

Allow the second phase to modify the contents of the vendor directory.
---
 pkgs/development/go-modules/generic/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 1549c83234a8..7180ab7bf967 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -136,10 +136,10 @@ let
       export GOSUMDB=off
       export GOPROXY=off
       cd "$modRoot"
-      if [ -n "${go-modules}" ]; then
-          rm -rf vendor
-          ln -s ${go-modules} vendor
-      fi
+    '' + lib.optionalString (go-modules != "") ''
+      rm -rf vendor
+      cp -r --reflink=auto ${go-modules} vendor
+    '' + ''
 
       runHook postConfigure
     '';

From 214e19c049a0eba1503af866f5c035290abdb66d Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 22 Oct 2020 23:15:41 +1000
Subject: [PATCH 1558/3942] kopia: drop vendor workaround

---
 pkgs/tools/backup/kopia/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix
index 47d9dc1b3787..bcf51372f6c5 100644
--- a/pkgs/tools/backup/kopia/default.nix
+++ b/pkgs/tools/backup/kopia/default.nix
@@ -24,12 +24,6 @@ buildGoModule rec {
   '';
 
   postConfigure = ''
-    # make 'vendor' writable
-    cp -L -r vendor tmp-vendor
-    rm -rf vendor
-    chmod -R u+w tmp-vendor
-    mv tmp-vendor vendor
-
     # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22
     substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \
       --replace "/bin/stty" "${coreutils}/bin/stty"

From 8ba1cd2e10a6eac0c3d3df0d61c8d1b993ff8cc2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 20:01:03 -0800
Subject: [PATCH 1559/3942] python3Packages.pandas: fix tests

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

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index ce208fe90786..9d2d32d428af 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -113,6 +113,8 @@ in buildPythonPackage rec {
     # Fails with 1.0.5
     "test_constructor_list_frames"
     "test_constructor_with_embedded_frames"
+    # tries to import compiled C extension locally
+    "test_missing_required_dependency"
   ] ++ optionals isDarwin [
     "test_locale"
     "test_clipboard"
@@ -120,6 +122,7 @@ in buildPythonPackage rec {
 
   preCheck = ''
     export LC_ALL="en_US.UTF-8"
+    PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
   ''
   # TODO: Get locale and clipboard support working on darwin.
   #       Until then we disable the tests.

From f6428fd75e4ae25a0ae5a34edcf7604c7beddb96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 5 Nov 2020 22:02:14 +0100
Subject: [PATCH 1560/3942] python3Packages.crytic-compile: init at 0.1.9

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

diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix
new file mode 100644
index 000000000000..e6f82c6d8ad8
--- /dev/null
+++ b/pkgs/development/python-modules/crytic-compile/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pysha3 }:
+
+buildPythonPackage rec {
+  pname = "crytic-compile";
+  version = "0.1.9";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "crytic";
+    repo = "crytic-compile";
+    rev = version;
+    sha256 = "01mis7bqsh0l5vjl6jwibzy99djza35fxmywy56q8k4jbxwmdcna";
+  };
+
+  propagatedBuildInputs = [ pysha3 ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Abstraction layer for smart contract build systems";
+    homepage = "https://github.com/crytic/crytic-compile";
+    license = licenses.agpl3;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 305bd7934d5c..e52d78f0f3c2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1379,6 +1379,8 @@ in {
   else
     callPackage ../development/python-modules/cryptography/vectors.nix { };
 
+  crytic-compile = callPackage ../development/python-modules/crytic-compile { };
+
   csscompressor = callPackage ../development/python-modules/csscompressor { };
 
   cssmin = callPackage ../development/python-modules/cssmin { };

From 11d53d30f6c1fa8a9936424877e651843fe5c605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 5 Nov 2020 22:02:47 +0100
Subject: [PATCH 1561/3942] python3Packages.slither-analyzer: Fix missing
 dependency on crytic-compile

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

diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix
index d4f332b44750..001c5f57f415 100644
--- a/pkgs/development/python-modules/slither-analyzer/default.nix
+++ b/pkgs/development/python-modules/slither-analyzer/default.nix
@@ -1,7 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder
-, prettytable
-, setuptools
-, solc
+, crytic-compile, prettytable, setuptools, solc
 }:
 
 buildPythonPackage rec {
@@ -19,7 +17,7 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  propagatedBuildInputs = [ prettytable setuptools ];
+  propagatedBuildInputs = [ crytic-compile prettytable setuptools ];
 
   postFixup = ''
     wrapProgram $out/bin/slither \

From 7eb64f7603d7f97c03e02375a9f4c15602539812 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Wed, 16 Sep 2020 13:59:04 -0400
Subject: [PATCH 1562/3942] solc: 0.6.8 -> 0.7.4

Use gccStdenv to avoid issues with clang on Darwin.
---
 pkgs/development/compilers/solc/default.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index ac4bc324868a..0f0af33e7001 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,32 +1,37 @@
-{ stdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
+{ gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
 , z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null
 , cln ? null, gmp ? null
 }:
 
+# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin,
+# general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS
+let stdenv = gccStdenv; in
+
 assert z3Support -> z3 != null && stdenv.lib.versionAtLeast z3.version "4.6.0";
 assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
 
 let
-  jsoncppURL = "https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz";
+  jsoncppVersion = "1.9.4";
+  jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz";
   jsoncpp = fetchzip {
-    url = jsoncppURL;
-    sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg";
+    url = jsoncppUrl;
+    sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
   };
 in
 stdenv.mkDerivation rec {
 
   pname = "solc";
-  version = "0.6.8";
+  version = "0.7.4";
 
   # upstream suggests avoid using archive generated by github
   src = fetchzip {
     url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
-    sha256 = "1nxds6c10hjqjjk893qw2yljws57li0xigbf3ih85y8y6d587ph0";
+    sha256 = "02261l54jdbvxk612z7zsyvmchy1rx4lf27b3f616sd7r56krpkg";
   };
 
   postPatch = ''
     substituteInPlace cmake/jsoncpp.cmake \
-      --replace "${jsoncppURL}" ${jsoncpp}
+      --replace "${jsoncppUrl}" ${jsoncpp}
   '';
 
   cmakeFlags = [

From 487c44867ad97ad32d2624fbb2c3b9c4032b7a86 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 6 Nov 2020 04:20:00 +0000
Subject: [PATCH 1563/3942] archiver: 3.4.0 -> 3.5.0

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

diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix
index aec0b9d51186..1691ab073610 100644
--- a/pkgs/applications/misc/archiver/default.nix
+++ b/pkgs/applications/misc/archiver/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "archiver";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "mholt";
     repo = pname;
     rev = "v${version}";
-    sha256 = "16jawybywqfkp68035bnf206a2w4khjw239saa429a21lxrfyk4a";
+    sha256 = "0fdkqfs87svpijccz8m11gvby8pvmznq6fs9k94vbzak0kxhw1wg";
   };
 
-  vendorSha256 = "0m89ibj3dm58j49d99dhkn0ryivnianxz7lkpkvhs0cdbzzc02az";
+  vendorSha256 = "0avnskay23mpl3qkyf1h75rr7szpsxis2bj5pplhwf8q8q0212xf";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ];
 

From 17fc38828d963bf8ac0693f2dedb0eda94298b58 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 6 Nov 2020 04:20:00 +0000
Subject: [PATCH 1564/3942] python27Packages.iniconfig: fix homepage

---
 pkgs/development/python-modules/iniconfig/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix
index ae4d08f498fb..90761f76f9d5 100644
--- a/pkgs/development/python-modules/iniconfig/default.nix
+++ b/pkgs/development/python-modules/iniconfig/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "brain-dead simple parsing of ini files";
-    homepage = "https://github.com/CHANGE/iniconfig/";
+    homepage = "https://github.com/RonnyPfannschmidt/iniconfig";
     license = licenses.mit;
     maintainers = with maintainers; [ jonringer ];
   };

From ac019684705b3ccfdb9d7edf7aef85d016fdd064 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 6 Nov 2020 04:20:00 +0000
Subject: [PATCH 1565/3942] skim: 0.9.2 -> 0.9.3

https://github.com/lotabout/skim/releases/tag/v0.9.3
---
 pkgs/tools/misc/skim/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix
index 6a613869e148..996e6b4490e1 100644
--- a/pkgs/tools/misc/skim/default.nix
+++ b/pkgs/tools/misc/skim/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "0k101ymr6shi8hivf7kv52vwgcad2dwhyma0yg2pnp9q3ll0iszb";
+    sha256 = "026mgqcp9sg6wwikghrc3rgh5p6wdbnvav5pb3xvs79lj85d5ga7";
   };
 
   outputs = [ "out" "vim" ];
 
-  cargoSha256 = "0b4pj30w07p67zvpn5af23ddkvknmfp5a33sy6ai8argfi73bf4c";
+  cargoSha256 = "07bs23x2vxzlrca5swwq8khmd9fbdhlhm0avwp9y231df6xdi2ys";
 
   postPatch = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim

From 11d1486a852c6ab699697394a8c622a70a6e9fac Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 6 Nov 2020 04:20:00 +0000
Subject: [PATCH 1566/3942] ktlint: 0.38.1 -> 0.39.0

https://github.com/pinterest/ktlint/releases/tag/0.39.0
---
 pkgs/development/tools/ktlint/default.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix
index 3b5233d88951..b26c328dba85 100644
--- a/pkgs/development/tools/ktlint/default.nix
+++ b/pkgs/development/tools/ktlint/default.nix
@@ -1,38 +1,31 @@
-{ stdenv, fetchurl, makeWrapper, jre }:
+{ stdenv, fetchurl, makeWrapper, jre_headless }:
 
 stdenv.mkDerivation rec {
   pname = "ktlint";
-  version = "0.38.1";
+  version = "0.39.0";
 
   src = fetchurl {
     url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint";
-    sha256 = "0wz839ikvqjxpx2rzaxaji12pcqxcgmmb91xypz2dzlplxvzxvdj";
+    sha256 = "0lvi4d731ypdjcskj0hdfd37wa3ldspibs2dgaahg7d7zhp1l76g";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
-  propagatedBuildInputs = [ jre ];
-
-  unpackCmd = ''
-    mkdir -p ${pname}-${version}
-    cp $curSrc ${pname}-${version}/ktlint
-  '';
+  dontUnpack = true;
 
   installPhase = ''
-    mkdir -p $out/bin
-    mv ktlint $out/bin/ktlint
-    chmod +x $out/bin/ktlint
+    install -Dm755 $src $out/bin/ktlint
   '';
 
   postFixup = ''
-    wrapProgram $out/bin/ktlint --prefix PATH : "${jre}/bin"
+    wrapProgram $out/bin/ktlint --prefix PATH : "${jre_headless}/bin"
   '';
 
   meta = with stdenv.lib; {
     description = "An anti-bikeshedding Kotlin linter with built-in formatter";
     homepage = "https://ktlint.github.io/";
     license = licenses.mit;
-    platforms = platforms.all;
+    platforms = jre_headless.meta.platforms;
     maintainers = with maintainers; [ tadfisher ];
   };
 }

From a4afd835dad793e4265e96a1b6c7a329b5a6805c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 6 Nov 2020 04:20:00 +0000
Subject: [PATCH 1567/3942] nushell: 0.21.0 -> 0.22.0

http://www.nushell.sh/blog/2020/11/03/nushell_0_22.html
---
 pkgs/shells/nushell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index d025ed1ddcd8..20624293e85a 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "19bpxx9pi3cl5y7h5qg4a2pmvwqavm1vciyvsq96kxkc7rq2xwvl";
+    sha256 = "1nj8cjj5db5r4wnxbcsd5z9n5kqf2p1j54l5z0m650370z41df1f";
   };
 
-  cargoSha256 = "1ghbzahz8lbk11sjy2kis12w22rjr92aaw451rmc86pk2lsxn0dx";
+  cargoSha256 = "0sh6z8dclla3lrjzwfjb7avsbkagaq9d9q3d8ll8y0mahv1a135w";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

From aef2a4e6844dce91a89f4d15538621c4529b53b6 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 20:22:55 -0800
Subject: [PATCH 1568/3942] python3Packages.rubymarshal: disable tests

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

diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix
index 9668a26e0944..6115702009ac 100644
--- a/pkgs/development/python-modules/rubymarshal/default.nix
+++ b/pkgs/development/python-modules/rubymarshal/default.nix
@@ -12,6 +12,11 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ hypothesis ];
 
+  # pypi doesn't distribute tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "rubymarshal" ];
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/d9pouces/RubyMarshal/";
     description = "Read and write Ruby-marshalled data";

From 90aa139224ff95c3b2b4bc0c05954e2809d4086a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 20:26:57 -0800
Subject: [PATCH 1569/3942] python2Packages.screeninfo: disable python2

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

diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix
index 142730781d65..1b79a43af9c9 100644
--- a/pkgs/development/python-modules/screeninfo/default.nix
+++ b/pkgs/development/python-modules/screeninfo/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, buildPythonApplication, fetchPypi, isPy36, dataclasses, libX11, libXinerama, libXrandr }:
+{ stdenv, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }:
 
 buildPythonApplication rec {
   pname = "screeninfo";
   version = "0.6.6";
+  disabled = isPy27; # dataclasses isn't available for python2
 
   src = fetchPypi {
     inherit pname version;

From b715913402a73719890dc1ed4a9fb8d3a65c1664 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 20:28:02 -0800
Subject: [PATCH 1570/3942] python3Packages.xdis: 5.0.4 -> 5.0.5

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

diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index 27f3c1af202d..280470957dc7 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "xdis";
-  version = "5.0.4";
+  version = "5.0.5";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "rocky";
     repo = "python-xdis";
     rev = version;
-    sha256 = "0hh5pam8dabvh0w1bks0rqfq85gjy3h6ljrzmjg0nqsaapp1g4dd";
+    sha256 = "01248nh8y5szin6ymd3hrl8qnsg4xijsk3lxyks8zk9cjh008lmq";
   };
 
   checkInputs = [ pytest ];

From 2f8226470d442c37177d2de0d36e5ce569cb7d1a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 20:30:48 -0800
Subject: [PATCH 1571/3942] pythonPackages.ipdb: disable python2

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

diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix
index 8fd20290b0eb..652ee6434b32 100644
--- a/pkgs/development/python-modules/ipdb/default.nix
+++ b/pkgs/development/python-modules/ipdb/default.nix
@@ -3,12 +3,13 @@
 , fetchPypi
 , ipython
 , isPyPy
+, isPy27
 }:
 
 buildPythonPackage rec {
   pname = "ipdb";
   version = "0.13.4";
-  disabled = isPyPy;  # setupterm: could not find terminfo database
+  disabled = isPyPy || isPy27;  # setupterm: could not find terminfo database
 
   src = fetchPypi {
     inherit pname version;

From 6cfd954b06f91dd0f923a59c1dbcdcc5939d9ed9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 20:46:41 -0800
Subject: [PATCH 1572/3942] libsoup: fix build

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

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 65e0ced1d9bd..88c6a359ba8d 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     python3
     sqlite
     libpsl
+    glib.out
     brotli
   ] ++ lib.optionals stdenv.isLinux [
     libsysprof-capture
@@ -29,6 +30,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ];
   propagatedBuildInputs = [ glib libxml2 ];
 
+  NIX_CFLAGS_COMPILE = [ "-lpthread" ];
+
   mesonFlags = [
     "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency
     "-Dgssapi=disabled"

From db42905a5ae4a60a9d71a19850bdc8f05a00f76a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 20:50:19 -0800
Subject: [PATCH 1573/3942] python3Packages.periodictable: fix tests

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

diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix
index 9e41cd5aae84..ea42f7ea7fef 100644
--- a/pkgs/development/python-modules/periodictable/default.nix
+++ b/pkgs/development/python-modules/periodictable/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchPypi, buildPythonPackage, numpy, pyparsing}:
+{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytestcov, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "periodictable";
@@ -11,6 +11,8 @@ buildPythonPackage rec {
     sha256 = "1d09c359468e2de74b43fc3a7dcb0d3d71e0ff53adb85995215d8d7796451af6";
   };
 
+  checkInputs = [ pytestcov pytestCheckHook ];
+
   meta = {
     homepage = "https://www.reflectometry.org/danse/software.html";
     description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments";

From 18252b3f8233e9920861553f0ba576a87c84ac36 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 20:52:32 -0800
Subject: [PATCH 1574/3942] python3Packages.deform: fix tests

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

diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix
index e1d7e042648c..5b3a6e7281ec 100644
--- a/pkgs/development/python-modules/deform/default.nix
+++ b/pkgs/development/python-modules/deform/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi
 , chameleon, colander, iso8601, peppercorn, translationstring, zope_deprecation
-, nose, coverage, beautifulsoup4, flaky }:
+, nose, coverage, beautifulsoup4, flaky, pyramid, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "deform";
@@ -30,6 +30,8 @@ buildPythonPackage rec {
     coverage
     beautifulsoup4
     flaky
+    pyramid
+    pytestCheckHook
   ];
 
   meta = with lib; {

From c9a550126bf42e8a31525e7c230aefd76826f3f3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 20:53:31 -0800
Subject: [PATCH 1575/3942] python3Packages.ipdb: add missing test deps

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

diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix
index 652ee6434b32..df2ae6b46616 100644
--- a/pkgs/development/python-modules/ipdb/default.nix
+++ b/pkgs/development/python-modules/ipdb/default.nix
@@ -4,6 +4,7 @@
 , ipython
 , isPyPy
 , isPy27
+, mock
 }:
 
 buildPythonPackage rec {
@@ -17,6 +18,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ ipython ];
+  checkInputs = [ mock ];
 
   preCheck = ''
     export HOME=$(mktemp -d)

From 9b69c0881c85c6c34125ba7460aba2d9e0235c4e Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 21:10:04 -0800
Subject: [PATCH 1576/3942] python3Packages.scramp: init at 1.2.0

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

diff --git a/pkgs/development/python-modules/scramp/default.nix b/pkgs/development/python-modules/scramp/default.nix
new file mode 100644
index 000000000000..7beefa4e8999
--- /dev/null
+++ b/pkgs/development/python-modules/scramp/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
+
+buildPythonPackage rec {
+  pname = "scramp";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "tlocke";
+    repo = "scramp";
+    rev = version;
+    sha256 = "15jb7z5l2lijxr60fb9v55i3f81h6d83c0b7fv5q0fv5q259nv0a";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "scramp" ];
+
+  meta = with lib; {
+    description = "Implementation of the SCRAM authentication protocol";
+    homepage = "https://github.com/tlocke/scramp";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c5fcee60c136..dfcb448f06b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6450,6 +6450,8 @@ in {
 
   scp = callPackage ../development/python-modules/scp { };
 
+  scramp = callPackage ../development/python-modules/scramp { };
+
   scrapy = callPackage ../development/python-modules/scrapy { };
 
   scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { };

From b79b4c0eb09932669a731410bb1df773cd03336e Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Thu, 5 Nov 2020 21:10:30 -0800
Subject: [PATCH 1577/3942] wally-cli: enable on darwin

---
 pkgs/development/tools/wally-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/development/tools/wally-cli/default.nix
index d9abe6163a26..ffa666468595 100644
--- a/pkgs/development/tools/wally-cli/default.nix
+++ b/pkgs/development/tools/wally-cli/default.nix
@@ -27,8 +27,8 @@ buildGoModule rec {
   meta = with lib; {
     description = "A tool to flash firmware to mechanical keyboards";
     homepage = "https://ergodox-ez.com/pages/wally-planck";
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
     license = licenses.mit;
-    maintainers = [ maintainers.spacekookie ];
+    maintainers = with maintainers; [ spacekookie r-burns ];
   };
 }

From 17f401122f7850947a91046db8d6c343d853acb0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 21:19:21 -0800
Subject: [PATCH 1578/3942] python3Packages.pg8000: add missing deps

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

diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index 4bbd99206238..0c9459772186 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, scramp
 , isPy3k
 , passlib
 }:
@@ -16,7 +17,7 @@ buildPythonPackage rec {
     sha256 = "8fc1e6a62ccb7c9830f1e7e9288e2d20eaf373cc8875b5c55b7d5d9b7717be91";
   };
 
-  propagatedBuildInputs = [ passlib ];
+  propagatedBuildInputs = [ passlib scramp ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/tlocke/pg8000";

From a4b1f04419798c9bd6a4a4269bfa9c8f4ad722f1 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 21:23:53 -0800
Subject: [PATCH 1579/3942] python3Packages.google_auth: 1.20.1 -> 1.23.0

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

diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix
index 59ed94d34865..758d415d399e 100644
--- a/pkgs/development/python-modules/google_auth/default.nix
+++ b/pkgs/development/python-modules/google_auth/default.nix
@@ -17,11 +17,11 @@
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "1.20.1";
+  version = "1.23.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2f34dd810090d0d4c9d5787c4ad7b4413d1fbfb941e13682c7a2298d3b6cdcc8";
+    sha256 = "0h6lpbz8inxj2kpdjwrk5v7lqh1w5kkyv76d8sk3gs77y62xnxji";
   };
 
   propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ];

From 1ee6cafaa00fd6a829c5500a75f820e32d3b0c4e Mon Sep 17 00:00:00 2001
From: omg <omgbebebe@gmail.com>
Date: Fri, 2 Oct 2020 18:25:22 +0400
Subject: [PATCH 1580/3942] maintainers: add omgbebebe

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c73e499c26bc..f4547e9ed3a4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6451,6 +6451,12 @@
     githubId = 167209;
     name = "Masanori Ogino";
   };
+  omgbebebe = {
+    email = "omgbebebe@gmail.com";
+    github = "omgbebebe";
+    githubId = 588167;
+    name = "Sergey Bubnov";
+  };
   omnipotententity = {
     email = "omnipotententity@gmail.com";
     github = "omnipotententity";

From 6cb2d3f9ddaf5af53178c26d3f26bc70dfe3f4fe Mon Sep 17 00:00:00 2001
From: omg <omgbebebe@gmail.com>
Date: Fri, 2 Oct 2020 18:23:34 +0400
Subject: [PATCH 1581/3942] photoflare: init at 1.6.5

---
 .../graphics/photoflare/default.nix           | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/graphics/photoflare/default.nix

diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix
new file mode 100644
index 000000000000..43b12c40d965
--- /dev/null
+++ b/pkgs/applications/graphics/photoflare/default.nix
@@ -0,0 +1,31 @@
+{ mkDerivation, stdenv, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools
+}:
+
+mkDerivation rec {
+  pname = "photoflare";
+  version = "1.6.5";
+
+  src = fetchFromGitHub {
+    owner = "PhotoFlare";
+    repo = "photoflare";
+    rev = "v${version}";
+    sha256 = "0a394324h7ds567z3i3pw6kkii78n4qwdn129kgkkm996yh03q89";
+  };
+
+  nativeBuildInputs = [ qmake qttools ];
+  buildInputs = [ qtbase graphicsmagick ];
+
+  qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface";
+    homepage = "https://photoflare.io";
+    maintainers = [ maintainers.omgbebebe ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb08f0ec578d..ad233b5131d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22897,6 +22897,8 @@ in
 
   photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { };
 
+  photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { };
+
   photoflow = callPackage ../applications/graphics/photoflow { };
 
   phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };

From ef4e78e71b3d5de1ef3dabceeaddfa8141bc97a9 Mon Sep 17 00:00:00 2001
From: Tom Ho <thomas.ho@formbay.com.au>
Date: Fri, 6 Nov 2020 18:13:35 +1100
Subject: [PATCH 1582/3942] Adding MajesticMullet to maintainers-list.nix

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bacd3dab9aae..2178e9f79f93 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5268,6 +5268,12 @@
     githubId = 1238350;
     name = "Matthias Herrmann";
   };
+  majesticmullet = {
+    email = "hoccthomas@gmail.com.au";
+    github = "MajesticMullet";
+    githubId = 31056089;
+    name = "Tom Ho";
+  };
   makefu = {
     email = "makefu@syntax-fehler.de";
     github = "makefu";

From 7fede29d8339ad4efebfe8f9e050e89611ebb4af Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Fri, 6 Nov 2020 00:39:50 -0800
Subject: [PATCH 1583/3942] nixos/octoprint: remove references to
 deprecated/removed m33-fio plugin

---
 nixos/modules/services/misc/octoprint.nix     |   2 +-
 .../misc/octoprint/m33-fio-one-library.patch  | 175 ------------------
 2 files changed, 1 insertion(+), 176 deletions(-)
 delete mode 100644 pkgs/applications/misc/octoprint/m33-fio-one-library.patch

diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index e2fbd3b401cc..a69e65073050 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -68,7 +68,7 @@ in
       plugins = mkOption {
         default = plugins: [];
         defaultText = "plugins: []";
-        example = literalExample "plugins: with plugins; [ m33-fio stlviewer ]";
+        example = literalExample "plugins: with plugins; [ themeify stlviewer ]";
         description = "Additional plugins to be used. Available plugins are passed through the plugins input.";
       };
 
diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
deleted file mode 100644
index 24c9c4a80f5d..000000000000
--- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From 314bcebfcd1759981ce12255be29d8ae68cd400b Mon Sep 17 00:00:00 2001
-From: Nikolay Amiantov <ab@fmap.me>
-Date: Wed, 23 Nov 2016 00:40:48 +0300
-Subject: [PATCH] Build and use one version of preprocessor library
-
----
- octoprint_m33fio/__init__.py   | 73 ++----------------------------------------
- shared library source/Makefile | 62 +++--------------------------------
- 2 files changed, 6 insertions(+), 129 deletions(-)
-
-diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py
-index 054870a..4d5ecc1 100755
---- a/octoprint_m33fio/__init__.py
-+++ b/octoprint_m33fio/__init__.py
-@@ -1189,78 +1189,9 @@ class M33FioPlugin(
- 		# Check if using shared library or checking if it is usable
- 		if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable :
- 	
--			# Check if running on Linux
--			if platform.uname()[0].startswith("Linux") :
--
--				# Check if running on a Raspberry Pi 1
--				if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" :
--	
--					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm1176jzf-s.so")
--	
--				# Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3
--				elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" :
--	
--					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm_cortex-a7.so")
--	
--				# Otherwise check if running on an ARM7 device
--				elif platform.uname()[4].startswith("armv7") :
--	
--					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm7.so")
--	
--				# Otherwise check if using an i386 or x86-64 device
--				elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") :
--
--					# Check if Python is running as 32-bit
--					if platform.architecture()[0].startswith("32") :
--		
--						# Set shared library
--						self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.so")
--	
--					# Otherwise check if Python is running as 64-bit
--					elif platform.architecture()[0].startswith("64") :
--		
--						# Set shared library
--						self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.so")
--
--			# Otherwise check if running on Windows and using an i386 or x86-64 device
--			elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
-+			# Set shared library
-+			self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
- 
--				# Check if Python is running as 32-bit
--				if platform.architecture()[0].startswith("32") :
--	
--					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dll")
--
--				# Otherwise check if Python is running as 64-bit
--				elif platform.architecture()[0].startswith("64") :
--	
--					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dll")
--
--			# Otherwise check if running on macOS and using an i386 or x86-64 device
--			elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
--
--				# Check if Python is running as 32-bit
--				if platform.architecture()[0].startswith("32") :
--	
--					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dylib")
--
--				# Otherwise check if Python is running as 64-bit
--				elif platform.architecture()[0].startswith("64") :
--	
--					# Set shared library
--					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib")
--			
--			# Otherwise check if running FreeBSD
--			elif platform.uname()[0].startswith("FreeBSD") :
--			
--				# TODO: Compile FreeBSD shared library pre-processors
--				pass
--			
- 			# Check if shared library was set
- 			if self.sharedLibrary :
- 
-diff --git a/shared library source/Makefile b/shared library source/Makefile
-index 792b4f4..4c74f5c 100755
---- a/shared library source/Makefile	
-+++ b/shared library source/Makefile	
-@@ -1,68 +1,14 @@
--# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, MACOS32, MACOS64
--LIBRARY_NAME = preprocessor
--TARGET_PLATFORM = LINUX64
-+LIBRARY_NAME = libpreprocessor
- VER = .1
- 
--ifeq ($(TARGET_PLATFORM), LINUX32)
--	PROG = $(LIBRARY_NAME)_i386.so
--	CC = g++
--	CFLAGS = -fPIC -m32 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
--endif
--
--ifeq ($(TARGET_PLATFORM), LINUX64)
--	PROG = $(LIBRARY_NAME)_x86-64.so
--	CC = g++
--	CFLAGS = -fPIC -m64 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
--endif
--
--ifeq ($(TARGET_PLATFORM), WINDOWS32)
--	PROG = $(LIBRARY_NAME)_i386.dll
--	CC = i686-w64-mingw32-g++
--	CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
--endif
--
--ifeq ($(TARGET_PLATFORM), WINDOWS64)
--	PROG = $(LIBRARY_NAME)_x86-64.dll
--	CC = x86_64-w64-mingw32-g++
--	CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
--endif
--
--ifeq ($(TARGET_PLATFORM), PI)
--	PROG = $(LIBRARY_NAME)_arm1176jzf-s.so
--	CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++
--	CFLAGS = -fPIC -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
--endif
--
--ifeq ($(TARGET_PLATFORM), PI2)
--	PROG = $(LIBRARY_NAME)_arm_cortex-a7.so
--	CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++
--	CFLAGS = -fPIC -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
--endif
--
--ifeq ($(TARGET_PLATFORM), ARM7)
--	PROG = $(LIBRARY_NAME)_arm7.so
--	CC = /opt/arm-toolchain/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++
--	CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
--endif
--
--ifeq ($(TARGET_PLATFORM), MACOS32)
--	PROG = $(LIBRARY_NAME)_i386.dylib
--	CC = clang++
--	CFLAGS = -fPIC -m32 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)
--
--endif
--
--ifeq ($(TARGET_PLATFORM), MACOS64)
--	PROG = $(LIBRARY_NAME)_x86-64.dylib
--	CC = clang++
--	CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)
--endif
-+PROG = $(LIBRARY_NAME).so
-+CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER)
- 
- SRCS = preprocessor.cpp gcode.cpp vector.cpp
- CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared
- 
- all:
--	$(CC) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS)
-+	$(CXX) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS)
- 
- clean:
- 	rm -f ../octoprint_m33fio/static/libraries/$(PROG)
--- 
-2.14.1
-

From 702b62657065bbf0fa7f58ce843100d6e6681370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 6 Nov 2020 09:55:12 +0100
Subject: [PATCH 1584/3942] mkl: Fix pkg-config file

There was a spurious `intel64` in some library paths.
---
 pkgs/development/libraries/science/math/mkl/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index 2be3baed4497..7cbc50bc5b37 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -90,7 +90,8 @@ in stdenvNoCC.mkDerivation {
       substituteInPlace $f \
         --replace "prefix=<INSTALLDIR>/mkl" "prefix=$out" \
         --replace $\{MKLROOT} "$out" \
-        --replace "lib/intel64_lin" "lib"
+        --replace "lib/intel64_lin" "lib" \
+        --replace "lib/intel64" "lib"
     done
 
     for f in $(find opt/intel -name 'mkl*iomp.pc') ; do

From 8b5088130ea9d09d3350d001161b5884193bef81 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 3 Nov 2020 08:26:34 +0100
Subject: [PATCH 1585/3942] ocamlPackages.mirage-console: init at 3.0.2

---
 .../ocaml-modules/mirage-console/default.nix  | 24 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/mirage-console/default.nix

diff --git a/pkgs/development/ocaml-modules/mirage-console/default.nix b/pkgs/development/ocaml-modules/mirage-console/default.nix
new file mode 100644
index 000000000000..ccde5c5f2ae2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage-console/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchurl, buildDunePackage
+, lwt, mirage-device, mirage-flow
+}:
+
+buildDunePackage rec {
+  pname = "mirage-console";
+  version = "3.0.2";
+
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/mirage/mirage-console/releases/download/v${version}/mirage-console-v${version}.tbz";
+    sha256 = "1fygk7pvlmwx6vd0h4cv9935xxhi64k2dgym41wf6qfkxgpp31lm";
+  };
+
+  propagatedBuildInputs = [ lwt mirage-device mirage-flow ];
+
+  meta = {
+    description = "Implementations of Mirage console devices";
+    homepage = "https://github.com/mirage/mirage-console";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ee362e03a940..16ed885d52d3 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -549,6 +549,8 @@ let
 
     mirage-clock-unix = callPackage ../development/ocaml-modules/mirage-clock/unix.nix { };
 
+    mirage-console = callPackage ../development/ocaml-modules/mirage-console { };
+
     mirage-crypto = callPackage ../development/ocaml-modules/mirage-crypto { };
 
     mirage-crypto-pk = callPackage ../development/ocaml-modules/mirage-crypto/pk.nix { };

From 63aa105b1c1759029e229ea5d1fda08950956216 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 4 Nov 2020 07:35:52 +0100
Subject: [PATCH 1586/3942] ocamlPackages.apron: split into multiple outputs

---
 .../development/ocaml-modules/apron/default.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix
index 0da1ab74e199..79c4d8a50024 100644
--- a/pkgs/development/ocaml-modules/apron/default.nix
+++ b/pkgs/development/ocaml-modules/apron/default.nix
@@ -13,8 +13,21 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ];
   propagatedBuildInputs = [ mlgmpidl ];
 
-  prefixKey = "-prefix ";
-  preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
+  outputs = [ "out" "bin" "dev" ];
+
+  configurePhase = ''
+    runHook preConfigure
+    ./configure -prefix $out
+    mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
+    runHook postConfigure
+  '';
+
+  postInstall = ''
+    mkdir -p $dev/lib
+    mv $out/lib/ocaml $dev/lib/
+    mkdir -p $bin
+    mv $out/bin $bin/
+  '';
 
   meta = {
     license = stdenv.lib.licenses.lgpl21;

From 5a540a899682799f59258bf475297e5cfc9997b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 30 Oct 2020 12:48:35 +0100
Subject: [PATCH 1587/3942] linuxPackages.bcc: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index a90b2fce34d5..2bc705d4487a 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -6,13 +6,13 @@
 
 python.pkgs.buildPythonApplication rec {
   pname = "bcc";
-  version = "0.16.0";
+  version = "0.17.0";
 
   disabled = !stdenv.isLinux;
 
   src = fetchurl {
     url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz";
-    sha256 = "sha256-ekVRyugpZOU1nr0N9kWCSoJTmtD2qGsn/DmWgK7XZ/c=";
+    sha256 = "sha256-aEy8WwtKGaf7GZOTK5IHhwzenqU2U+vpWrcNWMCGvMw=";
   };
   format = "other";
 
@@ -26,12 +26,6 @@ python.pkgs.buildPythonApplication rec {
     # This is needed until we fix
     # https://github.com/NixOS/nixpkgs/issues/40427
     ./fix-deadlock-detector-import.patch
-
-    # This is already upstream; remove it on the next release
-    (fetchpatch {
-      url = "https://github.com/iovisor/bcc/commit/60de17161fe7f44b534a8da343edbad2427220e3.patch";
-      sha256 = "0pd5b4vgpdxbsrjwrw2kmn4l9hpj0rwdm3hvwvk7dsr3raz7w4b3";
-    })
   ];
 
   propagatedBuildInputs = [ python.pkgs.netaddr ];

From 75b59386b471a3809d3b6fd206f7ce90fd40d846 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 3 Nov 2020 11:43:56 +0100
Subject: [PATCH 1588/3942] =?UTF-8?q?ocamlPackages.owl:=200.9.0=20?=
 =?UTF-8?q?=E2=86=92=200.10.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/owl-base/default.nix           | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix
index 3e1eb09faad6..7a454e9ef441 100644
--- a/pkgs/development/ocaml-modules/owl-base/default.nix
+++ b/pkgs/development/ocaml-modules/owl-base/default.nix
@@ -1,23 +1,19 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, stdlib-shims }:
+{ lib, buildDunePackage, fetchurl }:
 
 buildDunePackage rec {
   pname = "owl-base";
-  version = "0.9.0";
+  version = "0.10.0";
 
   useDune2 = true;
 
-  src = fetchFromGitHub {
-    owner = "owlbarn";
-    repo = "owl";
-    rev  = version;
-    sha256 = "0xxchsymmdbwszs6barqq8x4vqz5hbap64yxq82c2la9sdxgk0vv";
+  src = fetchurl {
+    url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz";
+    sha256 = "148ny2cdzga1l36kcibvlz5xlyi5zvkywifxaqn8lf79n1swmlzf";
   };
 
-  propagatedBuildInputs = [ stdlib-shims ];
-
   minimumOCamlVersion = "4.10";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Numerical computing library for Ocaml";
     homepage = "https://ocaml.xyz";
     changelog = "https://github.com/owlbarn/owl/releases";

From bcd196ca6991f3ebd77324704f7215a1b19539a2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 6 Nov 2020 08:22:06 +0100
Subject: [PATCH 1589/3942] ocamlPackages.mirage-logs: init at 1.2.0

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

diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix
new file mode 100644
index 000000000000..2a7670ce3722
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchurl, buildDunePackage
+, logs, lwt, mirage-clock, mirage-profile, ptime
+, alcotest
+}:
+
+buildDunePackage rec {
+  pname = "mirage-logs";
+  version = "1.2.0";
+
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-v${version}.tbz";
+    sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1";
+  };
+
+  propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime ];
+
+  doCheck = true;
+  checkInputs = [ alcotest ];
+
+  meta = {
+    description = "A reporter for the Logs library that writes log messages to stderr, using a Mirage `CLOCK` to add timestamps";
+    homepage = "https://github.com/mirage/mirage-logs";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 16ed885d52d3..1cdcb31c97e8 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -571,6 +571,8 @@ let
 
     mirage-kv = callPackage ../development/ocaml-modules/mirage-kv { };
 
+    mirage-logs = callPackage ../development/ocaml-modules/mirage-logs { };
+
     mirage-net = callPackage ../development/ocaml-modules/mirage-net { };
 
     mirage-profile = callPackage ../development/ocaml-modules/mirage-profile { };

From af7f9e5fa098e339d64ddfc1ea00bcd430210d0e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <freddyrietdijk@fridh.nl>
Date: Fri, 6 Nov 2020 10:12:17 +0100
Subject: [PATCH 1590/3942] CODEOWNERS: maintainers for `dockerTools` (#102749)

* CODEOWNERS: maintainers for docker-tools

* CODEOWNERS: Add roberth to Docker tools

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
---
 .github/CODEOWNERS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3ce1e940e5d5..500d63b8cbfd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -206,6 +206,12 @@
 /nixos/tests/cri-o.nix                       @NixOS/podman @zowoq
 /nixos/tests/podman.nix                      @NixOS/podman @zowoq
 
+# Docker tools
+/pkgs/build-support/docker                   @roberth
+/nixos/tests/docker-tools-overlay.nix        @roberth
+/nixos/tests/docker-tools.nix                @roberth
+/doc/builders/images/dockertools.xml         @roberth
+
 # Blockchains
 /pkgs/applications/blockchains  @mmahut
 

From 8716b71ea632a6163b9fd3845c570bdfc0590dad Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 24 Sep 2020 18:26:30 +0300
Subject: [PATCH 1591/3942] doc/nixos: Explain better NixOS specific Systemd
 stuff

Divide the "Service Management" chapter into two sections. The 1st (the
original) explaining General, not NixOS specific ways to interact with
Systemd. The 2nd section, explaining NixOS specific things worth
knowing.

Explain in the 2nd section a bit NixOS modules and services of Nixpkgs,
and mention `systemd.user.services` option. Give an example
demonstrating how to enable imperatively an upstream provided unit file
for a user. Explain why `systemctl --user enable` doesn't work for the
long term on NixOS.
---
 .../manual/administration/service-mgmt.xml    | 98 ++++++++++++++++---
 1 file changed, 83 insertions(+), 15 deletions(-)

diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml
index 1b9c745eb59f..66a4e31ceda2 100644
--- a/nixos/doc/manual/administration/service-mgmt.xml
+++ b/nixos/doc/manual/administration/service-mgmt.xml
@@ -6,7 +6,7 @@
  <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
+  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
@@ -16,10 +16,17 @@
   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:
+ <section xml:id="sect-nixos-systemd-general">
+  <title>Interacting with a running systemd</title>
+   <para>
+    The command <command>systemctl</command> is the main way to interact with
+    <command>systemd</command>. The following paragraphs demonstrate ways to
+    interact with any OS running systemd as init system. NixOS is of no
+    exception. The <link xlink:href="#sect-nixos-systemd-nixos">next section
+    </link> explains NixOS specific things worth knowing.
+   </para>
+   <para>
+    Without any arguments, <literal>systmctl</literal> the status of active units:
 <screen>
 <prompt>$ </prompt>systemctl
 -.mount          loaded active mounted   /
@@ -28,10 +35,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>
 <prompt>$ </prompt>systemctl status postgresql.service
 postgresql.service - PostgreSQL Server
@@ -62,11 +69,72 @@ Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
 # 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>
-<!-- - cgroups: each service and user session is a cgroup
+   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>
+  <!-- TODO: document cgroups, draft:
+   each service and user session is a cgroup
 
-- cgroup resource management -->
+   - cgroup resource management -->
+ </section>
+ <section xml:id="sect-nixos-systemd-nixos">
+  <title>systemd in NixOS</title>
+  <para>
+   Packages in Nixpkgs sometimes provide systemd units with them, usually in
+   e.g <literal>#pkg-out#/lib/systemd/</literal>. Putting such a package in
+   <literal>environment.systemPackages</literal> doesn't make the service
+   available to users or the system.
+  </para>
+  <para>
+   In order to enable a systemd <emphasis>system</emphasis> service with
+   provided upstream package, use (e.g):
+<programlisting>
+<xref linkend="opt-systemd.packages"/> = [ pkgs.packagekit ];
+</programlisting>
+  </para>
+  <para>
+   Usually NixOS modules written by the community do the above, plus take care of
+   other details. If a module was written for a service you are interested in,
+   you'd probably need only to use
+   <literal>services.#name#.enable = true;</literal>. These services are defined
+   in Nixpkgs'
+   <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules">
+   <literal>nixos/modules/</literal> directory </link>. In case the service is
+   simple enough, the above method should work, and start the service on boot.
+  </para>
+  <para>
+   <emphasis>User</emphasis> systemd services on the other hand, should be
+   treated differently. Given a package that has a systemd unit file at
+   <literal>#pkg-out#/lib/systemd/user/</literal>, using
+   <xref linkend="opt-systemd.packages"/> will make you able to start the service via
+   <literal>systemctl --user start</literal>, but it won't start automatically on login.
+   <!-- TODO: Document why systemd.packages doesn't work for user services or fix this.
+   https://github.com/NixOS/nixpkgs/blob/2cd6594a8710a801038af2b72348658f732ce84a/nixos/modules/system/boot/systemd-lib.nix#L177-L198
+
+   This has been talked over at https://discourse.nixos.org/t/how-to-enable-upstream-systemd-user-services-declaratively/7649/5
+   -->
+   However, You can imperatively enable it by adding the package's attribute to
+   <link linkend="opt-environment.systemPackages">
+   <literal>systemd.packages</literal></link> and then do this (e.g):
+<screen>
+<prompt>$ </prompt>mkdir -p ~/.config/systemd/user/default.target.wants
+<prompt>$ </prompt>ln -s /run/current-system/sw/lib/systemd/user/syncthing.service ~/.config/systemd/user/default.target.wants/
+<prompt>$ </prompt>systemctl --user daemon-reload
+<prompt>$ </prompt>systemctl --user enable syncthing.service
+</screen>
+   If you are interested in a timer file, use <literal>timers.target.wants</literal>
+   instead of <literal>default.target.wants</literal> in the 1st and 2nd command.
+  </para>
+  <para>
+   Using <literal>systemctl --user enable syncthing.service</literal> instead of
+   the above, will work, but it'll use the absolute path of
+   <literal>syncthing.service</literal> for the symlink, and this path is in
+   <literal>/nix/store/.../lib/systemd/user/</literal>. Hence
+   <link xlink:href="#sec-nix-gc">garbage collection</link> will remove that file
+   and you will wind up with a broken symlink in your systemd configuration, which
+   in turn will not make the service / timer start on login.
+  </para>
+ </section>
 </chapter>
+

From 4a902e35d126097f16deecaffc0940fe8900d5a2 Mon Sep 17 00:00:00 2001
From: leenaars <leenaars@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:04:40 +0100
Subject: [PATCH 1592/3942] Sylk: 2.9.1 -> 2.9.2 (#102945)

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

diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix
index 164e2b1ea79c..3ba91b6abc55 100644
--- a/pkgs/applications/networking/Sylk/default.nix
+++ b/pkgs/applications/networking/Sylk/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "Sylk";
-  version = "2.9.1";
+  version = "2.9.2";
 in
 
 appimageTools.wrapType2 rec {
@@ -10,7 +10,7 @@ appimageTools.wrapType2 rec {
 
   src = fetchurl {
     url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage";
-    hash = "sha256-Y1FR1tYZTxhMFn6NL578otitmOsngMJBPK/9cpCqE/Q=";
+    hash = "sha256-pfzTeKxY2fs98mgvhzaI/uBbYYkxfnQ+6jQ+gTSeEkA=";
   };
 
   profile = ''

From 6057cb97860496d9ad7e98a7196d1f360ff8f219 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 6 Nov 2020 10:29:51 +0100
Subject: [PATCH 1593/3942] ghc*: Increase build timeout to 1 day

The default of 10 hours is insufficient for some of the slower
platforms like macOS and aarch64.
---
 pkgs/development/compilers/ghc/8.10.1.nix | 1 +
 pkgs/development/compilers/ghc/8.10.2.nix | 1 +
 pkgs/development/compilers/ghc/8.6.5.nix  | 1 +
 pkgs/development/compilers/ghc/8.8.2.nix  | 1 +
 pkgs/development/compilers/ghc/8.8.3.nix  | 1 +
 pkgs/development/compilers/ghc/8.8.4.nix  | 1 +
 pkgs/development/compilers/ghc/9.0.1.nix  | 1 +
 7 files changed, 7 insertions(+)

diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix
index d3835d01e5a2..42eb994b8fe2 100644
--- a/pkgs/development/compilers/ghc/8.10.1.nix
+++ b/pkgs/development/compilers/ghc/8.10.1.nix
@@ -246,6 +246,7 @@ stdenv.mkDerivation (rec {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
diff --git a/pkgs/development/compilers/ghc/8.10.2.nix b/pkgs/development/compilers/ghc/8.10.2.nix
index f3d64ced81ee..2407a48090bd 100644
--- a/pkgs/development/compilers/ghc/8.10.2.nix
+++ b/pkgs/development/compilers/ghc/8.10.2.nix
@@ -242,6 +242,7 @@ stdenv.mkDerivation (rec {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index a5d2bb5c88d6..3d660dd95217 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -256,6 +256,7 @@ stdenv.mkDerivation (rec {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix
index 371a369496ee..fbb75637df65 100644
--- a/pkgs/development/compilers/ghc/8.8.2.nix
+++ b/pkgs/development/compilers/ghc/8.8.2.nix
@@ -241,6 +241,7 @@ stdenv.mkDerivation (rec {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix
index e26eacca204b..538655a0d056 100644
--- a/pkgs/development/compilers/ghc/8.8.3.nix
+++ b/pkgs/development/compilers/ghc/8.8.3.nix
@@ -246,6 +246,7 @@ stdenv.mkDerivation (rec {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix
index cd579c05ec54..e69766bccdaa 100644
--- a/pkgs/development/compilers/ghc/8.8.4.nix
+++ b/pkgs/development/compilers/ghc/8.8.4.nix
@@ -250,6 +250,7 @@ stdenv.mkDerivation (rec {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 
diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix
index 23daee56a75f..bdb1a7555c21 100644
--- a/pkgs/development/compilers/ghc/9.0.1.nix
+++ b/pkgs/development/compilers/ghc/9.0.1.nix
@@ -237,6 +237,7 @@ stdenv.mkDerivation (rec {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    timeout = 24 * 3600;
     inherit (ghc.meta) license platforms;
   };
 

From 7ac71d78a33a3ae0ab8fd76e40e786befa563cf4 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 6 Nov 2020 11:35:19 +0100
Subject: [PATCH 1594/3942] ghc8102: Fix whitespace

---
 pkgs/development/compilers/ghc/8.10.2.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.2.nix b/pkgs/development/compilers/ghc/8.10.2.nix
index 2407a48090bd..41aa5e16ba14 100644
--- a/pkgs/development/compilers/ghc/8.10.2.nix
+++ b/pkgs/development/compilers/ghc/8.10.2.nix
@@ -107,9 +107,9 @@ stdenv.mkDerivation (rec {
 
   outputs = [ "out" "doc" ];
 
-  # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 
-  patches = [ 
-    ./issue-18549.patch 
+  # https://gitlab.haskell.org/ghc/ghc/-/issues/18549
+  patches = [
+    ./issue-18549.patch
   ];
 
   postPatch = "patchShebangs .";
@@ -190,7 +190,7 @@ stdenv.mkDerivation (rec {
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx

From da04a8e39741bbf336344b75b9842f2a7dc76ac1 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 6 Nov 2020 09:45:58 +0100
Subject: [PATCH 1595/3942] k9copy: remove for being broken since 2014

---
 pkgs/applications/video/k9copy/default.nix | 63 ----------------------
 pkgs/applications/video/k9copy/gcc6.patch  | 26 ---------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  2 -
 4 files changed, 1 insertion(+), 91 deletions(-)
 delete mode 100644 pkgs/applications/video/k9copy/default.nix
 delete mode 100644 pkgs/applications/video/k9copy/gcc6.patch

diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix
deleted file mode 100644
index 317505185d0d..000000000000
--- a/pkgs/applications/video/k9copy/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv, fetchurl
-, cmake
-, dvdauthor, xineLib, libmpeg2, libav, libdvdread, libdvdnav, dvdplusrwtools
-, phonon, qtx11extras
-, extra-cmake-modules, kio, kiconthemes, ki18n, kdesu, kdoctools, solid
-}:
-
-stdenv.mkDerivation rec {
-  version = "3.0.3";
-  pname = "k9copy";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/k9copy-reloaded/${pname}-${version}.tar.gz";
-    sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg";
-  };
-
-  patches = [
-    ./gcc6.patch
-  ];
-
-  cmakeFlags = [
-    "-DQT5_BUILD=ON"
-    "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0"
-  ];
-
-  # Hack to disable documentation
-  preConfigure = ''
-   substituteInPlace ./CMakeLists.txt \
-     --replace "add_subdirectory(doc)" ""
-  '';
-
-  buildInputs = [
-    cmake
-    dvdauthor
-    xineLib
-    libmpeg2
-    libav
-    libdvdread
-    libdvdnav
-    dvdplusrwtools
-    #automoc4
-    phonon
-    extra-cmake-modules
-    kio
-    solid
-    qtx11extras
-    kiconthemes
-    ki18n
-    kdesu
-  ];
-  nativeBuildInputs = [ kdoctools ];
-
-  meta = {
-    description = "DVD backup and DVD authoring program";
-    homepage = "http://k9copy-reloaded.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ flosse ];
-    platforms = stdenv.lib.platforms.unix;
-    # TODO: The software is deprecated and the build is broken, see:
-    # https://github.com/NixOS/nixpkgs/pull/63260#issuecomment-503506487
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/video/k9copy/gcc6.patch b/pkgs/applications/video/k9copy/gcc6.patch
deleted file mode 100644
index d0c9c2a8035e..000000000000
--- a/pkgs/applications/video/k9copy/gcc6.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git c/src/backup/k9dvdbackup.cpp i/src/backup/k9dvdbackup.cpp
-index f5e4859..82fa392 100755
---- c/src/backup/k9dvdbackup.cpp
-+++ i/src/backup/k9dvdbackup.cpp
-@@ -907,7 +907,7 @@ k9Vobu * k9DVDBackup::remapOffset(uint32_t _sector,uint32_t *_offset,int _dir) {
- 
- 
-         if ((vobu1 !=NULL) && (vobu2!=NULL)) {
--            *_offset = abs(vobu1->newSector - vobu2->newSector)  | maskOffset1 ;
-+            *_offset = (vobu1->newSector - vobu2->newSector)  | maskOffset1 ;
-             *_offset |= maskOffset2;
-             return vobu2;
-         }
-diff --git c/src/backup/k9execcopy.cpp i/src/backup/k9execcopy.cpp
-index d59222c..35de923 100644
---- c/src/backup/k9execcopy.cpp
-+++ i/src/backup/k9execcopy.cpp
-@@ -306,7 +306,7 @@ void k9ExecCopy::createMkv(k9DVDTitle *_title,const QString &_filename,QMultiMap
- 
- #if QT_VERSION >= 0x050000
-     m_progressDialog=new QProgressDialog(k9Dialogs::getMainWidget() );
--    m_progressDialog->setCancelButton(false);
-+    m_progressDialog->setCancelButton(0);
- 
- #else
-     m_progressDialog=new KProgressDialog(k9Dialogs::getMainWidget() );
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f0150d8fb956..41024876d554 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -226,6 +226,7 @@ mapAliases ({
   joseki = apache-jena-fuseki; # added 2016-02-28
   json_glib = json-glib; # added 2018-02-25
   kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
+  k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06
   julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15
   julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15
   kdeconnect = kdeApplications.kdeconnect-kde; # added 2020-10-28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b65557794448..fdbb26d24047 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21773,8 +21773,6 @@ in
 
   k3s = callPackage ../applications/networking/cluster/k3s {};
 
-  k9copy = libsForQt514.callPackage ../applications/video/k9copy {};
-
   kail = callPackage ../tools/networking/kail {  };
 
   kanboard = callPackage ../applications/misc/kanboard { };

From 65d60c1259c240eb976c2d0507095f0ca0c72e8a Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 4 Nov 2020 16:03:46 +0200
Subject: [PATCH 1596/3942] pythonPackages.pypass: init at 0.2.1

---
 .../python-modules/pypass/default.nix         |  84 ++++++
 .../pypass/mark-executables.patch             | 255 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 3 files changed, 341 insertions(+)
 create mode 100644 pkgs/development/python-modules/pypass/default.nix
 create mode 100644 pkgs/development/python-modules/pypass/mark-executables.patch

diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix
new file mode 100644
index 000000000000..2458a29ac31d
--- /dev/null
+++ b/pkgs/development/python-modules/pypass/default.nix
@@ -0,0 +1,84 @@
+{ buildPythonPackage
+, click
+, colorama
+, enum34
+, fetchPypi
+, git
+, gnugrep
+, gnupg
+, nose
+, pbr
+, pexpect
+, pythonAtLeast
+, pythonOlder
+, stdenv
+, substituteAll
+, tree
+, xclip
+}:
+
+# NOTE: pypass can also be used as an application, but probably the most
+# important usecase is as a library. So, let's use buildPythonPackage and
+# support any Python version instead of defining it as an application with
+# buildPythonApplication.
+buildPythonPackage rec {
+  pname = "pypass";
+  version = "0.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nm4mj7pd7gz4ghic6b3wrnd1b59hd1f0axavdabfl79wy511l7r";
+  };
+
+  # Set absolute nix store paths to the executables that pypass uses
+  patches = [
+    (substituteAll {
+      src = ./mark-executables.patch;
+      git_exec = "${git}/bin/git";
+      grep_exec = "${gnugrep}/bin/grep";
+      gpg_exec = "${gnupg}/bin/gpg2";
+      tree_exec = "${tree}/bin/tree";
+      xclip_exec = "${xclip}/bin/xclip";
+    })
+  ];
+
+  # Remove enum34 requirement if Python >= 3.4
+  postPatch = stdenv.lib.optionalString (pythonAtLeast "3.4") ''
+    substituteInPlace requirements.txt --replace "enum34" ""
+  '';
+
+  nativeBuildInputs = [ pbr ];
+
+  propagatedBuildInputs = [
+    click
+    colorama
+    pexpect
+  ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+
+  checkInputs = [ nose ];
+
+  # Configuration so that the tests work
+  preCheck = ''
+    HOME=$TEMP ${git}/bin/git config --global user.email "nix-builder@nixos.org"
+    HOME=$TEMP ${git}/bin/git config --global user.name "Nix Builder"
+    HOME=$TEMP ${git}/bin/git config --global pull.ff only
+    HOME=$TEMP make setup_gpg
+  '';
+
+  # Run tests but exclude the test that uses clipboard as I wasn't able to make
+  # it work - probably the X clipboard just doesn't work in the build
+  # environment..
+  checkPhase = ''
+    runHook preCheck
+    HOME=$TEMP GNUPGHOME=pypass/tests/gnupg nosetests -v --exclude=test_show_clip .
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Password manager pass in Python";
+    homepage = "https://github.com/aviau/python-pass";
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/development/python-modules/pypass/mark-executables.patch b/pkgs/development/python-modules/pypass/mark-executables.patch
new file mode 100644
index 000000000000..9bde97c5110c
--- /dev/null
+++ b/pkgs/development/python-modules/pypass/mark-executables.patch
@@ -0,0 +1,255 @@
+diff --git a/Makefile b/Makefile
+index 1ef67c8..d49031a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,5 +16,5 @@ test: kill build
+ setup_gpg: pypass/tests/gnupg
+ pypass/tests/gnupg: pypass/tests/test_key_sec.asc pypass/tests/test_ownertrust.txt
+ 	mkdir -m 700 -p pypass/tests/gnupg
+-	GNUPGHOME=pypass/tests/gnupg gpg --allow-secret-key-import --import pypass/tests/test_key_sec.asc
+-	GNUPGHOME=pypass/tests/gnupg gpg --import-ownertrust pypass/tests/test_ownertrust.txt
++	GNUPGHOME=pypass/tests/gnupg @gpg_exec@ --allow-secret-key-import --import pypass/tests/test_key_sec.asc
++	GNUPGHOME=pypass/tests/gnupg @gpg_exec@ --import-ownertrust pypass/tests/test_ownertrust.txt
+diff --git a/pypass/command.py b/pypass/command.py
+index 4616a5f..a72cf5d 100644
+--- a/pypass/command.py
++++ b/pypass/command.py
+@@ -173,7 +173,7 @@ def show(config, path, clip):
+     if clip:
+         xclip = subprocess.Popen(
+             [
+-                'xclip',
++                '@xclip_exec@',
+                 '-selection', 'clipboard'
+             ],
+             stdin=subprocess.PIPE
+@@ -206,7 +206,7 @@ def connect(config, path):
+ def ls(config, subfolder):
+     tree = subprocess.Popen(
+         [
+-            'tree',
++            '@tree_exec@',
+             '-C',
+             '-l',
+             '--noreport',
+@@ -239,7 +239,7 @@ def find(config, search_terms):
+ 
+     tree = subprocess.Popen(
+         [
+-            'tree',
++            '@tree_exec@',
+             '-C',
+             '-l',
+             '--noreport',
+@@ -273,7 +273,7 @@ def grep(config, search_string):
+             config['password_store'].get_decrypted_password(password)
+ 
+         grep = subprocess.Popen(
+-            ['grep', '-e', search_string],
++            ['@grep_exec@', '-e', search_string],
+             stdout=subprocess.PIPE,
+             stdin=subprocess.PIPE
+         )
+@@ -397,7 +397,7 @@ def git(config, commands):
+     else:
+         subprocess.call(
+             [
+-                'git',
++                '@git_exec@',
+                 '--git-dir=%s' % config['password_store'].git_dir,
+                 '--work-tree=%s' % config['password_store'].path,
+             ] + command_list,
+diff --git a/pypass/passwordstore.py b/pypass/passwordstore.py
+index 9de0376..8cf20a4 100644
+--- a/pypass/passwordstore.py
++++ b/pypass/passwordstore.py
+@@ -26,18 +26,7 @@ import re
+ from .entry_type import EntryType
+ 
+ # Find the right gpg binary
+-if subprocess.call(
+-        ['which', 'gpg2'],
+-        stdout=subprocess.PIPE,
+-        stderr=subprocess.PIPE) == 0:
+-    GPG_BIN = 'gpg2'
+-elif subprocess.call(
+-        ['which', 'gpg'],
+-        stdout=subprocess.PIPE,
+-        stderr=subprocess.PIPE) == 0:
+-    GPG_BIN = 'gpg'
+-else:
+-    raise Exception("Could not find GPG")
++GPG_BIN = '@gpg_exec@'
+ 
+ 
+ class PasswordStore(object):
+@@ -215,7 +204,7 @@ class PasswordStore(object):
+             # Init git repo
+             subprocess.call(
+                 [
+-                    "git",
++                    "@git_exec@",
+                     "--git-dir=%s" % git_dir,
+                     "--work-tree=%s" % git_work_tree,
+                     "init", path
+@@ -226,7 +215,7 @@ class PasswordStore(object):
+             # Add remote repo
+             subprocess.call(
+                 [
+-                    "git",
++                    "@git_exec@",
+                     "--git-dir=%s" % git_dir,
+                     "--work-tree=%s" % git_work_tree,
+                     "remote",
+@@ -241,7 +230,7 @@ class PasswordStore(object):
+             # TODO: add parameters for remote and branch ?
+             subprocess.call(
+                 [
+-                    "git",
++                    "@git_exec@",
+                     "--git-dir=%s" % git_dir,
+                     "--work-tree=%s" % git_work_tree,
+                     "pull",
+@@ -272,7 +261,7 @@ class PasswordStore(object):
+ 
+         subprocess.call(
+             [
+-                'git',
++                '@git_exec@',
+                 "--git-dir=%s" % self.git_dir,
+                 "--work-tree=%s" % self.path,
+                 'init',
+@@ -298,7 +287,7 @@ class PasswordStore(object):
+ 
+         subprocess.call(
+             [
+-                'git',
++                '@git_exec@',
+                 "--git-dir=%s" % self.git_dir,
+                 "--work-tree=%s" % self.path,
+                 'config',
+@@ -311,7 +300,7 @@ class PasswordStore(object):
+ 
+         subprocess.call(
+             [
+-                'git',
++                '@git_exec@',
+                 "--git-dir=%s" % self.git_dir,
+                 "--work-tree=%s" % self.path,
+                 'config',
+@@ -326,7 +315,7 @@ class PasswordStore(object):
+ 
+         subprocess.call(
+             [
+-                'git',
++                '@git_exec@',
+                 "--git-dir=%s" % self.git_dir,
+                 "--work-tree=%s" % self.path,
+                 'add',
+@@ -338,7 +327,7 @@ class PasswordStore(object):
+         if message:
+             subprocess.call(
+                 [
+-                    'git',
++                    '@git_exec@',
+                     "--git-dir=%s" % self.git_dir,
+                     "--work-tree=%s" % self.path,
+                     'commit',
+@@ -350,7 +339,7 @@ class PasswordStore(object):
+         else:
+             subprocess.call(
+                 [
+-                    'git',
++                    '@git_exec@',
+                     "--git-dir=%s" % self.git_dir,
+                     "--work-tree=%s" % self.path,
+                     'commit'
+diff --git a/pypass/tests/test_command.py b/pypass/tests/test_command.py
+index 4966b34..960a8ed 100644
+--- a/pypass/tests/test_command.py
++++ b/pypass/tests/test_command.py
+@@ -127,7 +127,7 @@ class TestCommand(unittest.TestCase):
+ 
+         # Check if the password is in the clipoard
+         xclip = subprocess.Popen(
+-            ['xclip', '-o', '-selection', 'clipboard'],
++            ['@xclip_exec@', '-o', '-selection', 'clipboard'],
+             stdout=subprocess.PIPE)
+         xclip.wait()
+         self.assertEqual(xclip.stdout.read().decode('utf8'), 'clipme999')
+@@ -301,7 +301,7 @@ class TestCommand(unittest.TestCase):
+         # git init should set diff.gpg.binary to True
+         diff_gpg_binary = subprocess.Popen(
+             [
+-                'git',
++                '@git_exec@',
+                 '--git-dir=%s' % os.path.join(self.dir, '.git'),
+                 '--work-tree=%s' % self.dir,
+                 'config',
+@@ -317,7 +317,7 @@ class TestCommand(unittest.TestCase):
+         # git init should set diff.gpg.textconv to 'gpg -d'
+         gpg = subprocess.Popen(
+             [
+-                'git',
++                '@git_exec@',
+                 '--git-dir=%s' % os.path.join(self.dir, '.git'),
+                 '--work-tree=%s' % self.dir,
+                 'config',
+@@ -337,7 +337,7 @@ class TestCommand(unittest.TestCase):
+ 
+         subprocess.Popen(
+             [
+-                'git',
++                '@git_exec@',
+                 '--git-dir=%s' % origin_git_dir,
+                 '--work-tree=%s' % origin_dir,
+                 'init',
+@@ -350,7 +350,7 @@ class TestCommand(unittest.TestCase):
+ 
+         subprocess.call(
+             [
+-                'git',
++                '@git_exec@',
+                 '--git-dir=%s' % origin_git_dir,
+                 '--work-tree=%s' % origin_dir,
+                 'add', 'test_git_init_clone.gpg',
+@@ -359,7 +359,7 @@ class TestCommand(unittest.TestCase):
+ 
+         subprocess.call(
+             [
+-                'git',
++                '@git_exec@',
+                 '--git-dir=%s' % origin_git_dir,
+                 '--work-tree=%s' % origin_dir,
+                 'commit',
+diff --git a/pypass/tests/test_passwordstore.py b/pypass/tests/test_passwordstore.py
+index 6decc5f..ceb5181 100644
+--- a/pypass/tests/test_passwordstore.py
++++ b/pypass/tests/test_passwordstore.py
+@@ -171,7 +171,7 @@ class TestPasswordStore(unittest.TestCase):
+ 
+         subprocess.Popen(
+             [
+-                'git',
++                '@git_exec@',
+                 '--git-dir=%s' % os.path.join(origin_dir, '.git'),
+                 '--work-tree=%s' % origin_dir,
+                 'init',
+@@ -184,7 +184,7 @@ class TestPasswordStore(unittest.TestCase):
+ 
+         subprocess.Popen(
+             [
+-                'git',
++                '@git_exec@',
+                 '--git-dir=%s' % os.path.join(origin_dir, '.git'),
+                 '--work-tree=%s' % origin_dir,
+                 'add', 'test_git_init_clone.gpg',
+@@ -193,7 +193,7 @@ class TestPasswordStore(unittest.TestCase):
+ 
+         subprocess.Popen(
+             [
+-                'git',
++                '@git_exec@',
+                 '--git-dir=%s' % os.path.join(origin_dir, '.git'),
+                 '--work-tree=%s' % origin_dir,
+                 'commit',
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8eccc39b5abe..6b1023637186 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5287,6 +5287,8 @@ in {
 
   pyparted = callPackage ../development/python-modules/pyparted { };
 
+  pypass = callPackage ../development/python-modules/pypass { };
+
   pypblib = callPackage ../development/python-modules/pypblib { };
 
   pypcap = callPackage ../development/python-modules/pypcap { };

From efa1a8b5c43a8d8e9602480d5da313f2cd67573a Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 4 Nov 2020 16:04:13 +0200
Subject: [PATCH 1597/3942] pass-secret-service: init at unstable-2020-04-12

---
 .../misc/pass-secret-service/default.nix      | 61 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/applications/misc/pass-secret-service/default.nix

diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix
new file mode 100644
index 000000000000..678bc06f8004
--- /dev/null
+++ b/pkgs/applications/misc/pass-secret-service/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchFromGitHub, python3, dbus, gnupg }:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "pass-secret-service";
+  # PyPI has old alpha version. Since then the project has switched from using a
+  # seemingly abandoned D-Bus package pydbus and started using maintained
+  # dbus-next. So let's use latest from GitHub.
+  version = "unstable-2020-04-12";
+
+  src = fetchFromGitHub {
+    owner = "mdellweg";
+    repo = "pass_secret_service";
+    rev = "f6fbca6ac3ccd16bfec407d845ed9257adf74dfa";
+    sha256 = "0rm4pbx1fiwds1v7f99khhh7x3inv9yniclwd95mrbgljk3cc6a4";
+  };
+
+
+  # Need to specify session.conf file for tests because it won't be found under
+  # /etc/ in check phase.
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace \
+        "dbus-run-session" \
+        "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf"
+  '';
+
+  propagatedBuildInputs = with python3.pkgs; [
+    click
+    cryptography
+    dbus-next
+    decorator
+    pypass
+    secretstorage
+  ];
+
+  checkInputs =
+    let
+      ps = python3.pkgs;
+    in
+    [
+      dbus
+      gnupg
+      ps.pytest
+      ps.pytest-asyncio
+      ps.pypass
+    ];
+
+  checkPhase = ''
+    runHook preCheck
+    make test
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Libsecret D-Bus API with pass as the backend";
+    homepage = "https://github.com/mdellweg/pass_secret_service/";
+    license = stdenv.lib.licenses.gpl3Only;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e65aa28b25b8..b33c46b6eb93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21401,6 +21401,8 @@ in
 
   musikcube = callPackage ../applications/audio/musikcube {};
 
+  pass-secret-service = callPackage ../applications/misc/pass-secret-service { };
+
   pinboard = with python3Packages; toPythonApplication pinboard;
 
   pinboard-notes-backup = haskell.lib.overrideCabal

From b5d27eb87c99a476460f5bec2a636848a4e7cef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 6 Nov 2020 09:56:13 +0100
Subject: [PATCH 1598/3942] mkl: Add a small test program

The MKL pkg-config files often change and are then incorrect for our
paths. pkg-config validation finds some issues, but not incorrect
paths. So, add a small test program to test whether the generated
pkg-config files can actually be used to build a functioning
binary. Hopefully this catches future regressions.
---
 .../libraries/science/math/mkl/default.nix    |  5 ++-
 .../science/math/mkl/test/default.nix         | 33 +++++++++++++++++++
 .../libraries/science/math/mkl/test/test.c    | 12 +++++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/science/math/mkl/test/default.nix
 create mode 100644 pkgs/development/libraries/science/math/mkl/test/test.c

diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index 7cbc50bc5b37..7b91940033dd 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -1,4 +1,5 @@
-{ stdenvNoCC
+{ callPackage
+, stdenvNoCC
 , fetchurl
 , rpmextract
 , undmg
@@ -157,6 +158,8 @@ in stdenvNoCC.mkDerivation {
   dontStrip = true;
   dontPatchELF = true;
 
+  passthru.tests.pkg-config = callPackage ./test { };
+
   meta = with stdenvNoCC.lib; {
     description = "Intel Math Kernel Library";
     longDescription = ''
diff --git a/pkgs/development/libraries/science/math/mkl/test/default.nix b/pkgs/development/libraries/science/math/mkl/test/default.nix
new file mode 100644
index 000000000000..688c0ec7c399
--- /dev/null
+++ b/pkgs/development/libraries/science/math/mkl/test/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, pkg-config, mkl }:
+
+stdenv.mkDerivation {
+  pname = "mkl-test";
+  version = mkl.version;
+
+  src = ./.;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ mkl ];
+
+  doCheck = true;
+
+  buildPhase = ''
+    # Check regular Nix build.
+    gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test
+
+    # Clear flags to ensure that we are purely relying on options
+    # provided by pkg-config.
+    NIX_CFLAGS_COMPILE="" \
+    NIX_LDFLAGS="" \
+      gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test
+  '';
+
+  installPhase = ''
+    touch $out
+  '';
+
+  checkPhase = ''
+    ./test
+  '';
+}
diff --git a/pkgs/development/libraries/science/math/mkl/test/test.c b/pkgs/development/libraries/science/math/mkl/test/test.c
new file mode 100644
index 000000000000..9413ac0c68e9
--- /dev/null
+++ b/pkgs/development/libraries/science/math/mkl/test/test.c
@@ -0,0 +1,12 @@
+#include <assert.h>
+
+#include <mkl_cblas.h>
+
+int main() {
+  float u[] = {1., 2., 3.};
+  float v[] = {4., 5., 6.};
+
+  float dp = cblas_sdot(3, u, 1, v, 1);
+
+  assert(dp == 32.);
+}

From 8051411322da516ab395ba597a457f41afcb9e58 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 6 Nov 2020 13:45:12 +0100
Subject: [PATCH 1599/3942] cargo-make: 0.32.7 -> 0.32.8

https://github.com/sagiegurari/cargo-make/releases/tag/0.32.8
---
 pkgs/development/tools/rust/cargo-make/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index 4d1c851198fe..4249e55247ca 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -4,11 +4,11 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.32.7";
+  version = "0.32.8";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "0x8alv0jdk7xl63b2m4696w2hwqnbwxfqz6f3gisljll42xp6n2z";
+    sha256 = "sha256-TwutU4RjiYtxc2vT67Bgqe/WRHi5aXwgzvZu7Wk4Cao=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
 
-  cargoSha256 = "1y2izxlc1nz3kqzrnhh9ir8j1gwvpj4cma2iqd65s9cf7xpkr6cx";
+  cargoSha256 = "sha256-HzRriPVaMn6qDu6h/NQjILglO4/0//8J1orV4Uz+XEI=";
 
   # Some tests fail because they need network access.
   # However, Travis ensures a proper build.

From f71d393b942b32ed4f0182007aca00c083754242 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 6 Nov 2020 13:46:18 +0100
Subject: [PATCH 1600/3942] curlie: 1.5.4 -> 1.6.0

https://github.com/rs/curlie/releases/tag/v1.6.0

Fixes integration with `curl-7.73.0` which we have on `master`
since 4df8aa7b008575c1646f430ac1d78b382053ae53.
---
 pkgs/tools/networking/curlie/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix
index 542bb888bfe5..9ae9644eb940 100644
--- a/pkgs/tools/networking/curlie/default.nix
+++ b/pkgs/tools/networking/curlie/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "curlie";
-  version = "1.5.4";
+  version = "1.6.0";
 
   src= fetchFromGitHub {
     owner = "rs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0z92gz39m0gk8j7l2nwa5vrfr3mq160vr1b15sy13jwi1zspc7hx";
+    sha256 = "sha256-rrwdqaKrC37BaI9RuTTv6EiOZ3ztgd7nGuplmeW02h8=";
   };
 
-  vendorSha256 = "1qnl15b9cs6xi8z368a9n34v3wr2adwp376cjzhyllni7sf6v1mm";
+  vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI=";
 
   doCheck = false;
 

From b62b76b78bfc93ae89a61636ba3615e5b651f20a Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 4 Nov 2020 18:59:02 +0100
Subject: [PATCH 1601/3942] php: Refactor to have the different versions as
 separate files

This should enable easier auto updates of the packages.
---
 pkgs/development/interpreters/php/7.3.nix     | 20 +++++++++++
 pkgs/development/interpreters/php/7.4.nix     | 17 ++++++++++
 .../php/{default.nix => generic.nix}          | 34 ++-----------------
 pkgs/top-level/all-packages.nix               | 25 +++++++++-----
 4 files changed, 56 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/development/interpreters/php/7.3.nix
 create mode 100644 pkgs/development/interpreters/php/7.4.nix
 rename pkgs/development/interpreters/php/{default.nix => generic.nix} (90%)

diff --git a/pkgs/development/interpreters/php/7.3.nix b/pkgs/development/interpreters/php/7.3.nix
new file mode 100644
index 000000000000..832a8323d58b
--- /dev/null
+++ b/pkgs/development/interpreters/php/7.3.nix
@@ -0,0 +1,20 @@
+{ callPackage, lib, stdenv, nixosTests, ... }@_args:
+
+let
+  generic = (import ./generic.nix) _args;
+
+  base = callPackage generic (_args // {
+    version = "7.3.24";
+    sha256 = "1655rj4w63n5fkvdj3kz9f5jfyjgvzw8a6j8zkzgic1p42xszdsm";
+
+    # https://bugs.php.net/bug.php?id=76826
+    extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
+  });
+
+in base.withExtensions ({ all, ... }: with all; ([
+  bcmath calendar curl ctype dom exif fileinfo filter ftp gd
+  gettext gmp hash iconv intl json ldap mbstring mysqli mysqlnd
+  opcache openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite
+  pgsql posix readline session simplexml sockets soap sodium sqlite3
+  tokenizer xmlreader xmlwriter zip zlib
+] ++ lib.optionals (!stdenv.isDarwin) [ imap ]))
diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix
new file mode 100644
index 000000000000..571c7af8fc69
--- /dev/null
+++ b/pkgs/development/interpreters/php/7.4.nix
@@ -0,0 +1,17 @@
+{ callPackage, lib, stdenv, nixosTests, ... }@_args:
+
+let
+  generic = (import ./generic.nix) _args;
+
+  base = callPackage generic (_args // {
+    version = "7.4.12";
+    sha256 = "0rwrl7xgfq2bbgmy34klgfsqa7v935074ibanmic9pwy4g676vvf";
+  });
+
+in base.withExtensions ({ all, ... }: with all; ([
+  bcmath calendar curl ctype dom exif fileinfo filter ftp gd
+  gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache
+  openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql
+  posix readline session simplexml sockets soap sodium sqlite3
+  tokenizer xmlreader xmlwriter zip zlib
+] ++ lib.optionals (!stdenv.isDarwin) [ imap ]))
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/generic.nix
similarity index 90%
rename from pkgs/development/interpreters/php/default.nix
rename to pkgs/development/interpreters/php/generic.nix
index efd9441e9092..ef50eacc5fca 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/generic.nix
@@ -1,7 +1,7 @@
 # We have tests for PCRE and PHP-FPM in nixos/tests/php/ or
 # both in the same attribute named nixosTests.php
 
-{ callPackage, lib, stdenv, nixosTests }@_args:
+{ callPackage, lib, stdenv, nixosTests, ... }:
 
 let
   generic =
@@ -271,34 +271,4 @@ let
             outputsToInstall = [ "out" "dev" ];
           };
         };
-
-  php73base = callPackage generic (_args // {
-    version = "7.3.24";
-    sha256 = "1655rj4w63n5fkvdj3kz9f5jfyjgvzw8a6j8zkzgic1p42xszdsm";
-
-    # https://bugs.php.net/bug.php?id=76826
-    extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
-  });
-
-  php74base = callPackage generic (_args // {
-    version = "7.4.12";
-    sha256 = "0rwrl7xgfq2bbgmy34klgfsqa7v935074ibanmic9pwy4g676vvf";
-  });
-
-  defaultPhpExtensions = { all, ... }: with all; ([
-    bcmath calendar curl ctype dom exif fileinfo filter ftp gd
-    gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache
-    openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql
-    posix readline session simplexml sockets soap sodium sqlite3
-    tokenizer xmlreader xmlwriter zip zlib
-  ] ++ lib.optionals (!stdenv.isDarwin) [ imap ]);
-
-  defaultPhpExtensionsWithHash = { all, ... }:
-    (defaultPhpExtensions { inherit all; }) ++ [ all.hash ];
-
-  php74 = php74base.withExtensions defaultPhpExtensions;
-  php73 = php73base.withExtensions defaultPhpExtensionsWithHash;
-
-in {
-  inherit php73 php74;
-}
+in generic
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb08f0ec578d..c5f07d2f5042 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10315,19 +10315,28 @@ in
 
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
 
-  php = php74;
 
+  # PHP interpreters, packages and extensions.
+  #
+  # Set default PHP interpreter, extensions and packages
+  php = php74;
+  phpExtensions = php74Extensions;
   phpPackages = php74Packages;
-  php73Packages = recurseIntoAttrs php73.packages;
+
+  # Import PHP74 interpreter, extensions and packages
+  php74 = callPackage ../development/interpreters/php/7.4.nix {
+    stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
+  };
+  php74Extensions = recurseIntoAttrs php74.extensions;
   php74Packages = recurseIntoAttrs php74.packages;
 
-  phpExtensions = php74Extensions;
-  php73Extensions = recurseIntoAttrs php73.extensions;
-  php74Extensions = recurseIntoAttrs php74.extensions;
-
-  inherit (callPackage ../development/interpreters/php {
+  # Import PHP73 interpreter, extensions and packages
+  php73 = callPackage ../development/interpreters/php/7.3.nix {
     stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
-  }) php74 php73;
+  };
+  php73Extensions = recurseIntoAttrs php73.extensions;
+  php73Packages = recurseIntoAttrs php73.packages;
+
 
   picoc = callPackage ../development/interpreters/picoc {};
 

From b06e65aad2b37485c0d48bb34e302aa0dbe8d6b4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 6 Nov 2020 13:48:52 +0100
Subject: [PATCH 1602/3942] vagrant: 2.2.10 -> 2.2.11

https://github.com/hashicorp/vagrant/blob/main/CHANGELOG.md#2211-november-05-2020
---
 pkgs/development/tools/vagrant/default.nix    |   4 +-
 pkgs/development/tools/vagrant/gemset.nix     | 106 +++---------------
 .../tools/vagrant/gemset_libvirt.nix          |  73 +++++++++---
 3 files changed, 75 insertions(+), 108 deletions(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 4e2930f97a28..24f93f55effb 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -5,9 +5,9 @@
 let
   # NOTE: bumping the version and updating the hash is insufficient;
   # you must use bundix to generate a new gemset.nix in the Vagrant source.
-  version = "2.2.10";
+  version = "2.2.11";
   url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
-  sha256 = "07wlj4m79m9li3za1jkk4imdhqwpca86qz3c0h706s0w8cmv4bbj";
+  sha256 = "sha256-KDQDEMebqQYgsBroHmQrm/OJWTES9C9eGl0dDHTBpIc=";
 
   deps = bundlerEnv rec {
     name = "${pname}-${version}";
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix
index 3c22b74efed0..f1b9fa119798 100644
--- a/pkgs/development/tools/vagrant/gemset.nix
+++ b/pkgs/development/tools/vagrant/gemset.nix
@@ -39,17 +39,6 @@
     };
     version = "1.1.7";
   };
-  domain_name = {
-    dependencies = ["unf"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
-      type = "gem";
-    };
-    version = "0.5.20190701";
-  };
   ed25519 = {
     groups = ["default"];
     platforms = [];
@@ -70,15 +59,15 @@
     };
     version = "1.9.0";
   };
-  erubis = {
+  excon = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+      sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs";
       type = "gem";
     };
-    version = "2.7.0";
+    version = "0.78.0";
   };
   ffi = {
     groups = ["default"];
@@ -122,17 +111,6 @@
     };
     version = "0.1.5";
   };
-  http-cookie = {
-    dependencies = ["domain_name"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
   httpclient = {
     groups = ["default"];
     platforms = [];
@@ -196,16 +174,6 @@
     };
     version = "2.3.0";
   };
-  mime = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr";
-      type = "gem";
-    };
-    version = "0.4.4";
-  };
   mime-types = {
     dependencies = ["mime-types-data"];
     groups = ["default"];
@@ -222,10 +190,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
+      sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
       type = "gem";
     };
-    version = "3.2020.0512";
+    version = "3.2020.1104";
   };
   multi_json = {
     groups = ["default"];
@@ -264,20 +232,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9";
+      sha256 = "1hlyp6z3ffwdcnzq9khrkz6waxggn4hnzsczbp3mz61lhx4qiri3";
       type = "gem";
     };
-    version = "6.1.0";
-  };
-  netrc = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
-      type = "gem";
-    };
-    version = "0.11.0";
+    version = "6.2.0.rc1";
   };
   nori = {
     groups = ["default"];
@@ -321,17 +279,6 @@
     };
     version = "0.2.5";
   };
-  rest-client = {
-    dependencies = ["http-cookie" "mime-types" "netrc"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j";
-      type = "gem";
-    };
-    version = "2.0.2";
-  };
   ruby_dep = {
     groups = ["default"];
     platforms = [];
@@ -362,37 +309,16 @@
     };
     version = "2.3.0";
   };
-  unf = {
-    dependencies = ["unf_ext"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
-      type = "gem";
-    };
-    version = "0.1.4";
-  };
-  unf_ext = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
-      type = "gem";
-    };
-    version = "0.0.7.7";
-  };
   vagrant_cloud = {
-    dependencies = ["rest-client"];
+    dependencies = ["excon" "log4r"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16jpnq4xa7gavm024wk1rgmkfb850g89rv56f26dkh0rdhbqiqvs";
+      sha256 = "0b3b9ybd6mskfz2vffb6li2y6njdc9xqhik9c4mvzq9dchxpbxlj";
       type = "gem";
     };
-    version = "2.0.3";
+    version = "3.0.2";
   };
   wdm = {
     groups = ["default"];
@@ -410,10 +336,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13c0vf32vinkp3ia86rvq779dacl37v4v2814v4g9qrk3liv0dym";
+      sha256 = "0k9i86v805gpya3pyqahjykljbdwpjsrk7hsdqrl05j2rpidvk4v";
       type = "gem";
     };
-    version = "2.3.4";
+    version = "2.3.5";
   };
   winrm-elevated = {
     dependencies = ["erubi" "winrm" "winrm-fs"];
@@ -421,10 +347,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv";
+      sha256 = "0savhyfry7ii9axcmprvbzhrz4sd9byd8wifn74bd7y78asrbpdq";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.2.2";
   };
   winrm-fs = {
     dependencies = ["erubi" "logging" "rubyzip" "winrm"];
@@ -432,9 +358,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "093f698l9b9cx6vcqwjc9hi5hbd86ynp1g5c7g9k18y6h7fxjk43";
+      sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d";
       type = "gem";
     };
-    version = "1.3.4";
+    version = "1.3.5";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/development/tools/vagrant/gemset_libvirt.nix
index 2631833dc009..df6b6c40496b 100644
--- a/pkgs/development/tools/vagrant/gemset_libvirt.nix
+++ b/pkgs/development/tools/vagrant/gemset_libvirt.nix
@@ -1,24 +1,34 @@
 {
+  builder = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
+      type = "gem";
+    };
+    version = "3.2.4";
+  };
   excon = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2";
+      sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs";
       type = "gem";
     };
-    version = "0.62.0";
+    version = "0.78.0";
   };
   fog-core = {
-    dependencies = ["builder" "excon" "formatador"];
+    dependencies = ["builder" "excon" "formatador" "mime-types"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ac25s2wv7m6av7h7vjzd2bg3srhnn5yrz3lq1xpimhnfmp82sw6";
+      sha256 = "0bwqm9n69y5y0a5iickr358z7w4hml3flqwfz8b7cnj1ldabhnjn";
       type = "gem";
     };
-    version = "1.43.0";
+    version = "2.2.3";
   };
   fog-json = {
     dependencies = ["fog-core" "multi_json"];
@@ -37,10 +47,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0gk16gsjd51x71wla7h5jqr6x5ywpwz5l8jdv76f9mr6fp1j2bkf";
+      sha256 = "0by97bx0szdz47kdy0fqvx6j2kzy5yhrwbvvsfbh27dm9c0vfwgr";
       type = "gem";
     };
-    version = "0.5.0";
+    version = "0.7.0";
   };
   fog-xml = {
     dependencies = ["fog-core" "nokogiri"];
@@ -68,20 +78,51 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.3.1";
+  };
+  mime-types = {
+    dependencies = ["mime-types-data"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
+      type = "gem";
+    };
+    version = "3.3.1";
+  };
+  mime-types-data = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
+      type = "gem";
+    };
+    version = "3.2020.1104";
   };
   mini_portile2 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+      sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
+  };
+  multi_json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+      type = "gem";
+    };
+    version = "1.15.0";
   };
   nokogiri = {
     dependencies = ["mini_portile2"];
@@ -89,10 +130,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
+      sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
       type = "gem";
     };
-    version = "1.8.5";
+    version = "1.10.10";
   };
   ruby-libvirt = {
     groups = ["default"];
@@ -110,9 +151,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wm5yvml3sxdzpnlp4q6yhy695syy8byd1g7cxll4pmj1kwlknym";
+      sha256 = "1b1m8fg1rin6ps15ykqhwz6qm7isadb83r22b733dkw2gvvj91jv";
       type = "gem";
     };
-    version = "0.0.45";
+    version = "0.2.1";
   };
-}
+}
\ No newline at end of file

From d328ba130bec21519a980b50fc74f42be1ff6761 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 5 Nov 2020 17:13:59 +0100
Subject: [PATCH 1603/3942] tzdata: Revert to the "fat" "bloated" format

The timezone dumps have switched to a "slim" format since 2020b.
This has broken various packages, including
 - go 1.4 (used for bootstrapping)
 - haskellPackages.tz
 - libical

The "fat" format can still be generated, as this commit shows.
It seems to create files that are *mostly* the slim versions with
some more data attached.
---
 pkgs/data/misc/tzdata/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index dc80580ff5ec..5065e3718cb2 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     "MANDIR=$(man)/share/man"
     "AWK=awk"
     "CFLAGS=-DHAVE_LINK=0"
+    "CFLAGS+=-DZIC_BLOAT_DEFAULT=\\\"fat\\\""
     "cc=${stdenv.cc.targetPrefix}cc"
     "AR=${stdenv.cc.targetPrefix}ar"
   ];

From 5e1cf833834aa41910c5e88d0e5d68ab8731e24c Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 5 Nov 2020 17:25:24 +0100
Subject: [PATCH 1604/3942] Revert "libical: skip timezone tests"

This reverts commit 9c5154b5aaee073eeca7f94359d69c93d4dbf5b3.
---
 pkgs/development/libraries/libical/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 62034a7bce27..c03367da97ba 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     runHook preInstallCheck
 
     export TZDIR=${tzdata}/share/zoneinfo
-    ctest --output-on-failure --exclude-regex 'regression|recur|timezones|libical-glib-array|libical-glib-component|libical-glib-timezone'
+    ctest --output-on-failure
 
     runHook postInstallCheck
   '';

From f7e691ac7e7cda4ef5b2f46e16b0d50a1ad2a4b8 Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Fri, 6 Nov 2020 15:01:43 +0100
Subject: [PATCH 1605/3942] xorg.xf86videointel: Fix build

Since c2526545844bdbb8347f9d9169a77728bf2bdd73, building xf86videointel
has been broken on my system due to missing libXv. This commit
explicitly includes the dependency when building the package to
hopefully avoid things being broken for others.
---
 pkgs/servers/x11/xorg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 96f40649c0f2..263ae993330b 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1963,7 +1963,7 @@ lib.makeScope newScope (self: with self; {
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
 
-  xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation {
+  xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC, libXv }: stdenv.mkDerivation {
     name = "xf86-video-intel-2.99.917";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1972,7 +1972,7 @@ lib.makeScope newScope (self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ];
+    buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC libXv ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
 

From 18c596964a2175d6bcebb30fad4e518a34698e4a Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 6 Nov 2020 13:33:43 +0100
Subject: [PATCH 1606/3942] =?UTF-8?q?ocamlPackages.asn1-combinators:=200.2?=
 =?UTF-8?q?.3=20=E2=86=92=200.2.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index 556c749011fa..ed314bde06fb 100644
--- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
@@ -6,11 +6,11 @@ buildDunePackage rec {
   minimumOCamlVersion = "4.05";
 
   pname = "asn1-combinators";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchurl {
     url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz";
-    sha256 = "1z73hc17f5m2i4bfxw0g94fsri67f8vha812mm8klz4ggs8y7d6r";
+    sha256 = "09rn5wwqhwg7x51b9ycl15s7007hgha6lwaz2bpw85fr70jq3i9r";
   };
 
   propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ];

From 255f45ea20b215fd843861e9882e87446dee21bc Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 6 Nov 2020 14:02:00 +0100
Subject: [PATCH 1607/3942] ocamlPackages.asn1-combinators: use dune 2

---
 pkgs/development/ocaml-modules/asn1-combinators/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index ed314bde06fb..ddc181a49928 100644
--- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
@@ -8,6 +8,8 @@ buildDunePackage rec {
   pname = "asn1-combinators";
   version = "0.2.4";
 
+  useDune2 = true;
+
   src = fetchurl {
     url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz";
     sha256 = "09rn5wwqhwg7x51b9ycl15s7007hgha6lwaz2bpw85fr70jq3i9r";

From d050e5e399618302aa51b214b90d05e941e6e329 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 1 Nov 2020 18:40:20 +0100
Subject: [PATCH 1608/3942] ocamlPackages.email_message: remove at 0.11.0

---
 .../ocaml-modules/janestreet/default.nix      |  8 -------
 .../email-message-angstrom-0.14.patch         | 22 -------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index 837504f9a7fe..25b498bb7da0 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -529,14 +529,6 @@ rec {
     meta.description = "Writing Emacs plugin in OCaml";
   };
 
-  email_message = janePackage {
-    pname = "email_message";
-    hash = "131jd72k4s8cdbgg6gyg7w5v8mphdlvdx4fgvh8d9a1m7kkvbxfg";
-    propagatedBuildInputs = [ async angstrom core_extended cryptokit magic-mime ounit ];
-    patches = [ ./email-message-angstrom-0.14.patch ];
-    meta.description = "E-mail message parser";
-  };
-
   incremental_kernel = janePackage {
     version = "0.11.1";
     pname = "incremental_kernel";
diff --git a/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch b/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch
deleted file mode 100644
index 624a3e5334b2..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/email_address/src/email_address.ml b/email_address/src/email_address.ml
-index 7470273..d070465 100644
---- a/email_address/src/email_address.ml
-+++ b/email_address/src/email_address.ml
-@@ -38,7 +38,7 @@ module Stable = struct
-       let of_string ?default_domain input_str =
-         let open Core_kernel in
-         let open! Int.Replace_polymorphic_compare in
--        match Angstrom.parse_string Email_address_parser_stable_v1.email_only input_str with
-+        match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_only input_str with
-         | Error error ->
-           Or_error.error_s [%message
-             "Failed to parse email address"
-@@ -104,7 +104,7 @@ module T = Stable.V1.With_comparator
- include T
- 
- let list_of_string ?default_domain input_str =
--  match Angstrom.parse_string Email_address_parser_stable_v1.email_list_only input_str with
-+  match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_list_only input_str with
-   | Error error ->
-     Or_error.error_s [%message
-       "Failed to parse email address(es)"

From 2e2aae2ccd124d80eabdca540476bf8383b4ddff Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 1 Nov 2020 18:40:25 +0100
Subject: [PATCH 1609/3942] =?UTF-8?q?ocamlPackages.cryptokit:=201.14=20?=
 =?UTF-8?q?=E2=86=92=201.16.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/cryptokit/default.nix       | 40 ++++++-------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 69f8445e2173..272ff72d8c59 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -1,43 +1,29 @@
-{ stdenv, fetchurl, zlib, ocaml, findlib, ocamlbuild, zarith, ncurses }:
+{ lib, buildDunePackage, fetchurl, zlib, dune-configurator, zarith, ncurses }:
 
-assert stdenv.lib.versionAtLeast ocaml.version "3.12";
-
-let param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.02"
-  then {
-    version = "1.14";
-    url = "https://github.com/xavierleroy/cryptokit/archive/release114.tar.gz";
-    sha256 = "0wkh72idkb7dahiwyl94hhbq27cc7x9fnmxkpnbqli6wi8wd7d05";
-    inherit zarith;
-  } else {
-    version = "1.10";
-    url = "http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz";
-    sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv";
-    zarith = null;
-  };
-in
-
-stdenv.mkDerivation {
+buildDunePackage {
   pname = "cryptokit";
-  inherit (param) version;
+  version = "1.16.1";
+
+  useDune2 = true;
 
   src = fetchurl {
-    inherit (param) url sha256;
+    url = "https://github.com/xavierleroy/cryptokit/archive/release1161.tar.gz";
+    sha256 = "0kzqkk451m69nqi5qiwak0rd0rp5vzi613gcngsiig7dyxwka61c";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ncurses ];
-  propagatedBuildInputs = [ param.zarith zlib ];
+  dontConfigure = true;
 
-  buildFlags = [ "setup.data" "build" ];
+  buildInputs = [ dune-configurator ncurses ];
+  propagatedBuildInputs = [ zarith zlib ];
 
-  preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
+  doCheck = true;
 
   meta = {
     homepage = "http://pauillac.inria.fr/~xleroy/software.html";
     description = "A library of cryptographic primitives for OCaml";
-    platforms = ocaml.meta.platforms or [];
+    license = lib.licenses.lgpl2Only;
     maintainers = [
-      stdenv.lib.maintainers.maggesi
+      lib.maintainers.maggesi
     ];
   };
 }

From 44ee3ae9b13966dba1e717bb20e34cada17f5ab4 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 6 Nov 2020 13:24:35 +0100
Subject: [PATCH 1610/3942] =?UTF-8?q?ocamlPackages.tls:=200.12.5=20?=
 =?UTF-8?q?=E2=86=92=200.12.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
index b52561d760e9..375c2de27e0e 100644
--- a/pkgs/development/ocaml-modules/tls/default.nix
+++ b/pkgs/development/ocaml-modules/tls/default.nix
@@ -6,12 +6,12 @@
 buildDunePackage rec {
   minimumOCamlVersion = "4.08";
 
-  version = "0.12.5";
+  version = "0.12.6";
   pname = "tls";
 
   src = fetchurl {
     url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz";
-    sha256 = "1zsh3fx8l3d9lc9w516apzabqsix2ss8nv6kbbzjmp2d4hwh818b";
+    sha256 = "14b2289nhb65qm8wrw51y8qgz5ysn8hcbrj5plznd1pdzl46zxc9";
   };
 
   useDune2 = true;

From cf5397d5f9819bddd441874df46c7b65b1475f94 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 6 Nov 2020 15:32:50 +0100
Subject: [PATCH 1611/3942] waypipe: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix
index 0393a5bdeb83..2c91d6496a0e 100644
--- a/pkgs/applications/networking/remote/waypipe/default.nix
+++ b/pkgs/applications/networking/remote/waypipe/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchFromGitLab
 , meson, ninja, pkg-config, scdoc
-, wayland, wayland-protocols, openssh
+, openssh
 , mesa, lz4, zstd, ffmpeg, libva
 }:
 
 stdenv.mkDerivation rec {
   pname = "waypipe-unstable";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mstoeckl";
     repo = "waypipe";
     rev = "v${version}";
-    sha256 = "0bkmibask7gfnwkn3fg3l6zaabp95n1zsdnz3dwng8j80a0kakyy";
+    sha256 = "00skyxmbssfxksb8wlqdr8gajpysadirjcn230fd5gaf5msvllx7";
   };
 
   postPatch = ''
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja pkg-config scdoc ];
 
   buildInputs = [
-    wayland wayland-protocols
     # Optional dependencies:
     mesa lz4 zstd ffmpeg libva
   ];

From c100f8851b7150982748f0e7482369fc311dbcf3 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 6 Nov 2020 15:08:11 +0000
Subject: [PATCH 1612/3942] skypeforlinux: 8.65.0.78 -> 8.66.0.74

---
 .../networking/instant-messengers/skypeforlinux/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index b7aa2d845b17..47a79c7309df 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -7,7 +7,7 @@ let
 
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
-  version = "8.65.0.78";
+  version = "8.66.0.74";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -65,7 +65,7 @@ let
           "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
           "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
         ];
-        sha256 = "04qcpz3w2clpa23axh0xx68rm792d2l029r3wy1hfzbxd51z09lh";
+        sha256 = "11bpzr3j6fa5x62xrx2q2sr1wxjrn0a37053j4prxjcvdrc5in8f";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

From d447c2413cbace4fdcbeb6a364bc08d310309c4e Mon Sep 17 00:00:00 2001
From: Justinas Stankevicius <justinas@justinas.org>
Date: Thu, 6 Aug 2020 09:56:35 +0300
Subject: [PATCH 1613/3942] nixos/prometheus-sql-exporter: new module

---
 .../monitoring/prometheus/exporters.nix       |   9 ++
 .../monitoring/prometheus/exporters/sql.nix   | 104 ++++++++++++++++++
 nixos/tests/prometheus-exporters.nix          |  44 ++++++++
 3 files changed, 157 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/sql.nix

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 1233e5cdd1a9..754a775605a1 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -44,6 +44,7 @@ let
     "redis"
     "rspamd"
     "snmp"
+    "sql"
     "surfboard"
     "tor"
     "unifi"
@@ -217,6 +218,14 @@ in
         Please specify either 'services.prometheus.exporters.mail.configuration'
           or 'services.prometheus.exporters.mail.configFile'.
       '';
+    } {
+      assertion = cfg.sql.enable -> (
+        (cfg.sql.configFile == null) != (cfg.sql.configuration == null)
+      );
+      message = ''
+        Please specify either 'services.prometheus.exporters.sql.configuration' or
+          'services.prometheus.exporters.sql.configFile'
+      '';
     } ];
   }] ++ [(mkIf config.services.minio.enable {
     services.prometheus.exporters.minio.minioAddress  = mkDefault "http://localhost:9000";
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/sql.nix b/nixos/modules/services/monitoring/prometheus/exporters/sql.nix
new file mode 100644
index 000000000000..d9be724ebc03
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/sql.nix
@@ -0,0 +1,104 @@
+{ config, lib, pkgs, options }:
+with lib;
+let
+  cfg = config.services.prometheus.exporters.sql;
+  cfgOptions = {
+    options = with types; {
+      jobs = mkOption {
+        type = attrsOf (submodule jobOptions);
+        default = { };
+        description = "An attrset of metrics scraping jobs to run.";
+      };
+    };
+  };
+  jobOptions = {
+    options = with types; {
+      interval = mkOption {
+        type = str;
+        description = ''
+          How often to run this job, specified in
+          <link xlink:href="https://golang.org/pkg/time/#ParseDuration">Go duration</link> format.
+        '';
+      };
+      connections = mkOption {
+        type = listOf str;
+        description = "A list of connection strings of the SQL servers to scrape metrics from";
+      };
+      startupSql = mkOption {
+        type = listOf str;
+        default = [];
+        description = "A list of SQL statements to execute once after making a connection.";
+      };
+      queries = mkOption {
+        type = attrsOf (submodule queryOptions);
+        description = "SQL queries to run.";
+      };
+    };
+  };
+  queryOptions = {
+    options = with types; {
+      help = mkOption {
+        type = nullOr str;
+        default = null;
+        description = "A human-readable description of this metric.";
+      };
+      labels = mkOption {
+        type = listOf str;
+        default = [ ];
+        description = "A set of columns that will be used as Prometheus labels.";
+      };
+      query = mkOption {
+        type = str;
+        description = "The SQL query to run.";
+      };
+      values = mkOption {
+        type = listOf str;
+        description = "A set of columns that will be used as values of this metric.";
+      };
+    };
+  };
+
+  configFile =
+    if cfg.configFile != null
+    then cfg.configFile
+    else
+      let
+        nameInline = mapAttrsToList (k: v: v // { name = k; });
+        renameStartupSql = j: removeAttrs (j // { startup_sql = j.startupSql; }) [ "startupSql" ];
+        configuration = {
+          jobs = map renameStartupSql
+            (nameInline (mapAttrs (k: v: (v // { queries = nameInline v.queries; })) cfg.configuration.jobs));
+        };
+      in
+      builtins.toFile "config.yaml" (builtins.toJSON configuration);
+in
+{
+  extraOpts = {
+    configFile = mkOption {
+      type = with types; nullOr path;
+      default = null;
+      description = ''
+        Path to configuration file.
+      '';
+    };
+    configuration = mkOption {
+      type = with types; nullOr (submodule cfgOptions);
+      default = null;
+      description = ''
+        Exporter configuration as nix attribute set. Mutually exclusive with 'configFile' option.
+      '';
+    };
+  };
+
+  port = 9237;
+  serviceOpts = {
+    serviceConfig = {
+      ExecStart = ''
+        ${pkgs.prometheus-sql-exporter}/bin/sql_exporter \
+          -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          -config.file ${configFile} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index ad2fff2b01f6..a7e946f5c46e 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -578,6 +578,50 @@ let
       '';
     };
 
+    sql = {
+      exporterConfig = {
+        configuration.jobs.points = {
+          interval = "1m";
+          connections = [
+            "postgres://prometheus-sql-exporter@/data?host=/run/postgresql&sslmode=disable"
+          ];
+          queries = {
+            points = {
+              labels = [ "name" ];
+              help = "Amount of points accumulated per person";
+              values = [ "amount" ];
+              query = "SELECT SUM(amount) as amount, name FROM points GROUP BY name";
+            };
+          };
+        };
+        enable = true;
+        user = "postgres";
+      };
+      metricProvider = {
+        services.postgresql = {
+          enable = true;
+          initialScript = builtins.toFile "init.sql" ''
+            CREATE DATABASE data;
+            \c data;
+            CREATE TABLE points (amount INT, name TEXT);
+            INSERT INTO points(amount, name) VALUES (1, 'jack');
+            INSERT INTO points(amount, name) VALUES (2, 'jill');
+            INSERT INTO points(amount, name) VALUES (3, 'jack');
+
+            CREATE USER "prometheus-sql-exporter";
+            GRANT ALL PRIVILEGES ON DATABASE data TO "prometheus-sql-exporter";
+            GRANT SELECT ON points TO "prometheus-sql-exporter";
+          '';
+        };
+        systemd.services.prometheus-sql-exporter.after = [ "postgresql.service" ];
+      };
+      exporterTest = ''
+        wait_for_unit("prometheus-sql-exporter.service")
+        wait_for_open_port(9237)
+        succeed("curl http://localhost:9237/metrics | grep -c 'sql_points{' | grep -q 2")
+      '';
+    };
+
     surfboard = {
       exporterConfig = {
         enable = true;

From 428fc4e297093eefa5a17689a3a9e9a6b8b7f154 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 6 Nov 2020 16:43:07 +0100
Subject: [PATCH 1614/3942] nixos/prometheus-exporters: fix `sql` test

---
 nixos/tests/prometheus-exporters.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index a7e946f5c46e..53080403dd64 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -595,7 +595,7 @@ let
           };
         };
         enable = true;
-        user = "postgres";
+        user = "prometheus-sql-exporter";
       };
       metricProvider = {
         services.postgresql = {

From e24e104f42b5d6387827be6372fef140acc6b15a Mon Sep 17 00:00:00 2001
From: David Birks <david@birks.dev>
Date: Fri, 6 Nov 2020 11:18:18 -0500
Subject: [PATCH 1615/3942] material-shell: 8 -> 9 (#102286)

---
 pkgs/desktops/gnome-3/extensions/material-shell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/pkgs/desktops/gnome-3/extensions/material-shell/default.nix
index 87869f27d453..7b5156997b25 100644
--- a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/material-shell/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-material-shell";
-  version = "8";
+  version = "9";
 
   src = fetchFromGitHub {
     owner = "material-shell";
     repo = "material-shell";
     rev = version;
-    sha256 = "08zc6xl2b7k7l5l6afr40ii3gnxxbysan3cqv2s9g614rbsmc62r";
+    sha256 = "154ids72hkkvibqpq3522wf6h9qw7zkjnf8dgz50vxbkiiy015xn";
   };
 
   # This package has a Makefile, but it's used for building a zip for

From ae614ffc30f73ae85339247c7f309ad11cdad0c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 5 Nov 2020 20:47:09 +0100
Subject: [PATCH 1616/3942] python3Packages.setuptools-rust: 0.11.3 -> 0.11.4

Changelog:

https://github.com/PyO3/setuptools-rust/releases/tag/v0.11.4
---
 .../development/python-modules/setuptools-rust/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index a00ea9e818f4..b04fa39149cc 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy27
 , semantic-version
 , setuptools
 , setuptools_scm
@@ -9,11 +10,13 @@
 
 buildPythonPackage rec {
   pname = "setuptools-rust";
-  version = "0.11.3";
+  version = "0.11.4";
+
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1p21sw77197m7pciy8g25bwwaakq1675h0x1lis9sypzr46p2s11";
+    sha256 = "9714fcb94c78e6ab1864ddac7750049e105fd4f7c52103aecf40d408e94a722f";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From e75e997253e872a89a684ef0870a274f33813620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 6 Nov 2020 07:47:11 +0100
Subject: [PATCH 1617/3942] python3Packages.thinc: 7.4.1 -> 7.4.2

Changelog:

https://github.com/explosion/thinc/releases/tag/v7.4.1
---
 pkgs/development/python-modules/thinc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 9272e25a1ba3..5ac55f5f57dd 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -23,11 +23,11 @@
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "7.4.1";
+  version = "7.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17lampllwq50yjl2djs9bs5rp29xw55gqj762npqi3cvvj2glf81";
+    sha256 = "772f1a27b9b31e51003d1d2a7476cc49cc81044dd87088112237f93bd2091f0b";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

From b1178783876f51864f03f68eb89e9e93656bc57b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 6 Nov 2020 07:52:08 +0100
Subject: [PATCH 1618/3942] pythonPackages.blis: 0.7.1 -> 0.7.2

Changelog:

https://github.com/explosion/cython-blis/releases/tag/v0.7.2
---
 pkgs/development/python-modules/blis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix
index 5d4b9bcb5e21..1d6d7806b979 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/pkgs/development/python-modules/blis/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "blis";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "014771a0f753a64ef5610c5b3d4a090b263073bdd59b8ad0d872ce1e06e7315a";
+    sha256 = "c14fb9ec3f5ed7c4940c132c7691469ac5d3e302891d95e935623bf1d4e17fbb";
   };
 
   nativeBuildInputs = [

From 9bd690bb000a4acd49511147c06f077af60246d0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 13:41:44 +0000
Subject: [PATCH 1619/3942] python27Packages.flask-compress: 1.5.0 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix
index cf9abdc596ab..fe55705bb521 100644
--- a/pkgs/development/python-modules/flask-compress/default.nix
+++ b/pkgs/development/python-modules/flask-compress/default.nix
@@ -3,12 +3,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.5.0";
+  version = "1.8.0";
   pname = "Flask-Compress";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f367b2b46003dd62be34f7fb1379938032656dca56377a9bc90e7188e4289a7c";
+    sha256 = "c132590e7c948877a96d675c13cbfa64edec0faafa2381678dea6f36aa49a552";
   };
 
   propagatedBuildInputs = [ flask brotli ];

From c0d11ea66ccdd77228bc84959ade21d80cc87893 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Fri, 25 Sep 2020 14:47:54 -0400
Subject: [PATCH 1620/3942] gambit-unstable: 2020-07-29 -> 2020-09-20

---
 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 7284e5b531d8..a689991a1e13 100644
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/pkgs/development/compilers/gambit/unstable.nix
@@ -1,13 +1,13 @@
 { callPackage, fetchFromGitHub, gambit-support }:
 
 callPackage ./build.nix {
-  version = "unstable-2020-07-29";
-  git-version = "4.9.3-1232-gbba388b8";
+  version = "unstable-2020-09-20";
+  git-version = "4.9.3-1234-g6acd87df";
   src = fetchFromGitHub {
     owner = "feeley";
     repo = "gambit";
-    rev = "bba388b80ca62a77883a8936d64b03316808696a";
-    sha256 = "0iqlp1mvxz8g32kqrqm0phnnp1i5c4jrapqh2wqwa8fh1vgnizg1";
+    rev = "6acd87dfa95bfca33082a431e72f023345dc07ee";
+    sha256 = "0a3dy4ij8hzlp3sjam4b6dp6yvyz5d7g2x784qm3gp89fi2ck56r";
   };
   gambit-params = gambit-support.unstable-params;
 }

From 078d667f9e46e50c152e6fc3480b4287ec3e31f6 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Mon, 24 Aug 2020 00:04:04 -0400
Subject: [PATCH 1621/3942] gerbil-unstable: 2020-08-02 -> 2020-11-05

---
 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 7b54438b5c9a..d4ff3ca7a98a 100644
--- a/pkgs/development/compilers/gerbil/unstable.nix
+++ b/pkgs/development/compilers/gerbil/unstable.nix
@@ -1,13 +1,13 @@
 { callPackage, fetchFromGitHub, gambit-unstable, gambit-support }:
 
 callPackage ./build.nix rec {
-  version = "unstable-2020-08-02";
-  git-version = "0.16-120-g3f248e13";
+  version = "unstable-2020-11-05";
+  git-version = "0.16-152-g808929ae";
   src = fetchFromGitHub {
     owner = "vyzo";
     repo = "gerbil";
-    rev = "3f248e139dfa11be74284fc812253fbecafbaf31";
-    sha256 = "18v192cypj0nbmfcyflm8qnwp27qwy65m0a19ggs47wwbzhgvgqh";
+    rev = "808929aeb8823959191f35df53bc0c0150911b4b";
+    sha256 = "0d9k2gkrs9qvlnk7xa3gjzs3gln3ydds7yd2313pvbw4q2lcz8iw";
   };
   inherit gambit-support;
   gambit = gambit-unstable;

From 8ff03048f93297392a82d37310a854062b843e7e Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Fri, 25 Sep 2020 21:19:24 -0400
Subject: [PATCH 1622/3942] gerbilPackages-unstable.smug-gerbil: init at
 2019-12-24

---
 .../compilers/gerbil/gerbil-support.nix       | 10 ++++---
 .../compilers/gerbil/smug-gerbil.nix          | 30 +++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/compilers/gerbil/smug-gerbil.nix

diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix
index e3f4bb0e0d25..37f5c00efdb4 100644
--- a/pkgs/development/compilers/gerbil/gerbil-support.nix
+++ b/pkgs/development/compilers/gerbil/gerbil-support.nix
@@ -1,4 +1,4 @@
-{ pkgs, gccStdenv, callPackage, fetchFromGitHub }:
+{ pkgs, lib, gccStdenv, callPackage, fetchFromGitHub }:
 # See ../gambit/build.nix regarding gccStdenv
 
 rec {
@@ -9,6 +9,7 @@ rec {
     gerbil-poo = callPackage ./gerbil-poo.nix { };
     gerbil-persist = callPackage ./gerbil-persist.nix { };
     gerbil-ethereum = callPackage ./gerbil-ethereum.nix { };
+    smug-gerbil = callPackage ./smug-gerbil.nix { };
   };
 
   # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH.
@@ -23,6 +24,7 @@ rec {
     gambit-params ? pkgs.gambit-support.stable-params,
     gerbilInputs ? [],
     buildInputs ? [],
+    buildScript ? "./build.ss",
     softwareName ? ""} :
     let buildInputs_ = buildInputs; in
     gccStdenv.mkDerivation rec {
@@ -33,8 +35,8 @@ rec {
         set -e ;
         if [ -n "${version-path}.ss" ] ; then
           echo -e '(import :clan/versioning${builtins.concatStringsSep ""
-                     (map (x : if x.passthru.version-path != ""
-                               then " :${x.passthru.gerbil-package}/${x.passthru.version-path}" else "")
+                     (map (x : lib.optionalString (x.passthru.version-path != "")
+                               " :${x.passthru.gerbil-package}/${x.passthru.version-path}")
                           gerbilInputs)
                      })\n(register-software "${softwareName}" "v${git-version}")\n' > "${passthru.version-path}.ss"
         fi
@@ -50,7 +52,7 @@ rec {
 
       buildPhase = ''
         runHook preBuild
-        ./build.ss
+        ${buildScript}
         runHook postBuild
       '';
 
diff --git a/pkgs/development/compilers/gerbil/smug-gerbil.nix b/pkgs/development/compilers/gerbil/smug-gerbil.nix
new file mode 100644
index 000000000000..732cdb500b9b
--- /dev/null
+++ b/pkgs/development/compilers/gerbil/smug-gerbil.nix
@@ -0,0 +1,30 @@
+{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
+
+gerbil-support.gerbilPackage {
+  pname = "smug-gerbil";
+  version = "unstable-2019-12-24";
+  git-version = "95d60d4";
+  gerbil-package = "drewc/smug";
+  gerbil = gerbil-unstable;
+  gerbilInputs = [];
+  buildInputs = [];
+  gambit-params = gambit-support.unstable-params;
+  version-path = ""; #"version";
+  softwareName = "Smug-Gerbil";
+  src = fetchFromGitHub {
+    owner = "drewc";
+    repo = "smug-gerbil";
+    rev = "95d60d486c1603743c6d3c525e6d5f5761b984e5";
+    sha256 = "0ys07z78gq60z833si2j7xa1scqvbljlx1zb32vdf32f1b27c04j";
+  };
+  meta = {
+    description = "Super Monadic Über Go-into : Parsers and Gerbil Scheme";
+    homepage    = "https://github.com/drewc/smug-gerbil";
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ fare ];
+  };
+  buildScript = ''
+    for i in primitive simple tokens smug ; do gxc -O $i.ss ; done
+  '';
+}

From 520e10f6a50c59e2cc05f3233bf98bbbca140541 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Mon, 24 Aug 2020 00:05:00 -0400
Subject: [PATCH 1623/3942] gerbilPackages-unstable.gerbil-utils: 2020-08-02 ->
 2020-10-18

---
 pkgs/development/compilers/gerbil/gerbil-utils.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix
index 7e1a9bf05574..6d89e1181f2d 100644
--- a/pkgs/development/compilers/gerbil/gerbil-utils.nix
+++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix
@@ -2,8 +2,8 @@
 
 gerbil-support.gerbilPackage {
   pname = "gerbil-utils";
-  version = "unstable-2020-08-02";
-  git-version = "0.2-21-g7e7d053";
+  version = "unstable-2020-10-18";
+  git-version = "0.2-36-g8b481b7";
   gerbil-package = "clan";
   gerbil = gerbil-unstable;
   gambit-params = gambit-support.unstable-params;
@@ -12,8 +12,8 @@ gerbil-support.gerbilPackage {
   src = fetchFromGitHub {
     owner = "fare";
     repo = "gerbil-utils";
-    rev = "7e7d053ec5e78cc58d38cb03baf554d83b31b0c6";
-    sha256 = "078vqdcddfavqq0d9pw430iz1562cgx1ck3fw6dpwxjkyc6m4bms";
+    rev = "8b481b787e13e07e14d0718d670aab016131a090";
+    sha256 = "0br8k5b2wcv4wcp65r2bfhji3af2qgqjspf41syqslq9awx47f3m";
   };
   meta = {
     description = "Gerbil Clan: Community curated Collection of Common Utilities";

From 78bf0aca7071400ceeaf5170541c11aa88cfbacc Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Mon, 24 Aug 2020 00:05:50 -0400
Subject: [PATCH 1624/3942] gerbilPackages-unstable.gerbil-poo: 2020-08-02 ->
 2020-10-17

---
 pkgs/development/compilers/gerbil/gerbil-poo.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gerbil/gerbil-poo.nix b/pkgs/development/compilers/gerbil/gerbil-poo.nix
index 55673368eead..c6580ea0c77a 100644
--- a/pkgs/development/compilers/gerbil/gerbil-poo.nix
+++ b/pkgs/development/compilers/gerbil/gerbil-poo.nix
@@ -2,8 +2,8 @@
 
 gerbil-support.gerbilPackage {
   pname = "gerbil-ethereum";
-  version = "unstable-2020-08-02";
-  git-version = "0.0-13-g1014154";
+  version = "unstable-2020-10-17";
+  git-version = "0.0-35-g44d490d";
   gerbil-package = "clan/poo";
   gerbil = gerbil-unstable;
   gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto];
@@ -14,8 +14,8 @@ gerbil-support.gerbilPackage {
   src = fetchFromGitHub {
     owner = "fare";
     repo = "gerbil-poo";
-    rev = "1014154fe4943dfbec7524666c831b601ba88559";
-    sha256 = "0g8l5mi007n07qs79m9h3h3am1p7h0kzq7yb49h562b8frh5gp97";
+    rev = "44d490d95b9d1b5d54eaedf2602419af8e086837";
+    sha256 = "082ndpy281saybcnp3bdidcibkk2ih6glrkbb5fdj1524ban4d0k";
   };
   meta = {
     description = "Gerbil POO: Prototype Object Orientation for Gerbil Scheme";

From 58bddc26d4a2daa63e56f4c51080025040e53ecf Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Mon, 24 Aug 2020 00:06:22 -0400
Subject: [PATCH 1625/3942] gerbilPackages-unstable.gerbil-persist: 2020-08-02
 -> 2020-08-31

---
 pkgs/development/compilers/gerbil/gerbil-persist.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gerbil/gerbil-persist.nix b/pkgs/development/compilers/gerbil/gerbil-persist.nix
index 1be6684bf440..74485c19c2d0 100644
--- a/pkgs/development/compilers/gerbil/gerbil-persist.nix
+++ b/pkgs/development/compilers/gerbil/gerbil-persist.nix
@@ -2,8 +2,8 @@
 
 gerbil-support.gerbilPackage {
   pname = "gerbil-persist";
-  version = "unstable-2020-08-02";
-  git-version = "0.0-4-ga3b2bd1";
+  version = "unstable-2020-08-31";
+  git-version = "0.0-8-gd211390";
   gerbil-package = "clan/persist";
   gerbil = gerbil-unstable;
   gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto gerbil-poo];
@@ -14,8 +14,8 @@ gerbil-support.gerbilPackage {
   src = fetchFromGitHub {
     owner = "fare";
     repo = "gerbil-persist";
-    rev = "a3b2bd104612db0e4492737f09f72adea6684483";
-    sha256 = "0mc01wva26ww1i7n8naa95mfw7i6lj8qg0bwsik7gb3dsj2acjvh";
+    rev = "d211390c8a199cf2b8c7400cd98977524e960015";
+    sha256 = "13s6ws8ziwalfp23nalss41qnz667z2712lr3y123sypm5n5axk7";
   };
   meta = {
     description = "Gerbil Persist: Persistent data and activities";

From 65a90770955a27f5a5b73649526bb0e1770183d1 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Mon, 24 Aug 2020 00:06:38 -0400
Subject: [PATCH 1626/3942] gerbilPackages-unstable.gerbil-ethereum: 2020-08-02
 -> 2020-10-18

---
 pkgs/development/compilers/gerbil/gerbil-ethereum.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix
index 9b90cc053e1e..e498818d2e61 100644
--- a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix
+++ b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix
@@ -2,8 +2,8 @@
 
 gerbil-support.gerbilPackage {
   pname = "gerbil-ethereum";
-  version = "unstable-2020-08-02";
-  git-version = "0.0-15-g7cd2dd7";
+  version = "unstable-2020-10-18";
+  git-version = "0.0-26-gf27ada8";
   gerbil-package = "mukn/ethereum";
   gerbil = gerbil-unstable;
   gerbilInputs = with gerbil-support.gerbilPackages-unstable;
@@ -15,8 +15,8 @@ gerbil-support.gerbilPackage {
   src = fetchFromGitHub {
     owner = "fare";
     repo = "gerbil-ethereum";
-    rev = "7cd2dd7436b11917d0729dbafe087cfa8ec38f86";
-    sha256 = "0qq3ch2dg735yrj3l2c9pb9qlvz98x3vjfi2xyr4fwr78smpqgb5";
+    rev = "f27ada8e7f4de4f8fbdfede9fe055914b254d8e7";
+    sha256 = "1lykjqim6a44whj1r8kkpiz68wghkfqx5vjlrc2ldxlmgd4r9gvd";
   };
   meta = {
     description = "Gerbil Ethereum: a Scheme alternative to web3.js";

From 0febc5788322885bf5dcb092044f3d5cd29385bf Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Wed, 21 Oct 2020 00:08:26 -0400
Subject: [PATCH 1627/3942] gambit: support targets, modules

---
 pkgs/development/compilers/gambit/build.nix          | 2 ++
 pkgs/development/compilers/gambit/gambit-support.nix | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix
index c6a48bd744e7..a4b884147db1 100644
--- a/pkgs/development/compilers/gambit/build.nix
+++ b/pkgs/development/compilers/gambit/build.nix
@@ -35,6 +35,7 @@ gccStdenv.mkDerivation rec {
   #runtimeDeps = [ gnused gnugrep ];
 
   configureFlags = [
+    "--enable-targets=${gambit-params.targets}"
     "--enable-single-host"
     "--enable-c-opt=${optimizationSetting}"
     "--enable-gcc-opts"
@@ -94,6 +95,7 @@ gccStdenv.mkDerivation rec {
 
     # Now use the bootstrap compiler to build the real thing!
     make -j$NIX_BUILD_CORES from-scratch
+    ${lib.optionalString gambit-params.modules "make -j$NIX_BUILD_CORES modules"}
   '';
 
   postInstall = ''
diff --git a/pkgs/development/compilers/gambit/gambit-support.nix b/pkgs/development/compilers/gambit/gambit-support.nix
index 0e78831f2e4e..be745367ec03 100644
--- a/pkgs/development/compilers/gambit/gambit-support.nix
+++ b/pkgs/development/compilers/gambit/gambit-support.nix
@@ -2,12 +2,16 @@
 
 rec {
   stable-params = {
+    stable = true;
     defaultRuntimeOptions = "f8,-8,t8";
     buildRuntimeOptions = "f8,-8,t8";
     fix-stamp = git-version : "";
+    targets = "java,js,php,python,ruby";
+    modules = false;
   };
 
   unstable-params = {
+    stable = false;
     defaultRuntimeOptions = "iL,fL,-L,tL";
     buildRuntimeOptions = "i8,f8,-8,t8";
     fix-stamp = git-version : ''
@@ -15,6 +19,8 @@ rec {
         --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \
         --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ;
     '';
+    targets = "arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64"; # eats 100% cpu on _digest
+    modules = false;
   };
 
   export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;";

From 3d33e4f7995fb666fc594016a67ada374b1fdf36 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Wed, 28 Oct 2020 01:13:46 -0400
Subject: [PATCH 1628/3942] gerbilPackages-unstable.gerbil-libp2p: init at
 2018-12-27

---
 .../compilers/gerbil/gerbil-libp2p.nix        | 27 +++++++++++++++++++
 .../compilers/gerbil/gerbil-support.nix       |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/compilers/gerbil/gerbil-libp2p.nix

diff --git a/pkgs/development/compilers/gerbil/gerbil-libp2p.nix b/pkgs/development/compilers/gerbil/gerbil-libp2p.nix
new file mode 100644
index 000000000000..336f5af89c3b
--- /dev/null
+++ b/pkgs/development/compilers/gerbil/gerbil-libp2p.nix
@@ -0,0 +1,27 @@
+{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }:
+
+gerbil-support.gerbilPackage {
+  pname = "gerbil-libp2p";
+  version = "unstable-2018-12-27";
+  git-version = "2376b3f";
+  gerbil-package = "vyzo";
+  gerbil = gerbil-unstable;
+  gerbilInputs = [];
+  buildInputs = []; # Note: at *runtime*, depends on go-libp2p-daemon
+  gambit-params = gambit-support.unstable-params;
+  version-path = "version";
+  softwareName = "Gerbil-libp2p";
+  src = fetchFromGitHub {
+    owner = "vyzo";
+    repo = "gerbil-libp2p";
+    rev = "2376b3f39cee04dd4ec455c8ea4e5faa93c2bf88";
+    sha256 = "0jcy7hfg953078msigyfwp2g4ii44pi6q7vcpmq01cbbvxpxz6zw";
+  };
+  meta = {
+    description = "Gerbil libp2p: use libp2p from Gerbil";
+    homepage    = "https://github.com/vyzo/gerbil-libp2p";
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ fare ];
+  };
+}
diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix
index 37f5c00efdb4..9cb9954544c7 100644
--- a/pkgs/development/compilers/gerbil/gerbil-support.nix
+++ b/pkgs/development/compilers/gerbil/gerbil-support.nix
@@ -4,6 +4,7 @@
 rec {
   # Gerbil libraries
   gerbilPackages-unstable = {
+    gerbil-libp2p = callPackage ./gerbil-libp2p.nix { };
     gerbil-utils = callPackage ./gerbil-utils.nix { };
     gerbil-crypto = callPackage ./gerbil-crypto.nix { };
     gerbil-poo = callPackage ./gerbil-poo.nix { };

From 9bf2cf0a73293d448f5c96d97cc0a80e6d5d414e Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Sat, 31 Oct 2020 21:21:55 -0400
Subject: [PATCH 1629/3942] go-libp2p-daemon: init at 0.3.0

---
 pkgs/servers/go-libp2p-daemon/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/servers/go-libp2p-daemon/default.nix

diff --git a/pkgs/servers/go-libp2p-daemon/default.nix b/pkgs/servers/go-libp2p-daemon/default.nix
new file mode 100644
index 000000000000..995cfe2d26dc
--- /dev/null
+++ b/pkgs/servers/go-libp2p-daemon/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule {
+  pname = "go-libp2p-daemon";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "libp2p";
+    repo = "go-libp2p-daemon";
+    rev = "bfa207ed34c27947f0828a4ae8d10bda62aa49a9";
+    sha256 = "1f3gjkmpqngajjpijpjdmkmsjfm9bdgakb5r28fnc6w9dmfyj51x";
+  };
+
+  vendorSha256 = "0g25r7wd1hvnwxxq18mpx1r1wig6dnlnvzkpvgw79q6nymxlppmv";
+
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://github.com/libp2p/go-libp2p-daemon";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fare ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9379d6a618f..3bdee66d7d14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20726,6 +20726,8 @@ in
 
   exercism = callPackage ../applications/misc/exercism { };
 
+  go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { };
+
   go-motion = callPackage ../development/tools/go-motion { };
 
   gpg-mdp = callPackage ../applications/misc/gpg-mdp { };

From d8d1dc10714d373cde81b2fafc868500980f548c Mon Sep 17 00:00:00 2001
From: upkeep-bot <foo@bar.com>
Date: Fri, 6 Nov 2020 12:11:43 +0000
Subject: [PATCH 1630/3942] vscodium: 1.50.1 -> 1.51.0

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

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 650e88a260b4..6cfcb491afe4 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -11,8 +11,8 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1sarih1yah69ympp12bmgyb0y9ybrxasppb47l58w05iz1wpn6v0";
-    x86_64-darwin = "1pj041kccj2i77v223i86xxqj9bg88k0sfbshm7qiynwyj9p05ji";
+    x86_64-linux = "0qims8qypx6aackw1b47pb7hkf0lffh94c69bm5rld2swzczcfnj";
+    x86_64-darwin = "1i96qhynjl1ihycq25xjakqlyvszindg5g8kgyhd6ab0q0zhmxqy";
   }.${system};
 
   sourceRoot = {
@@ -27,7 +27,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.50.1";
+    version = "1.51.0";
     pname = "vscodium";
 
     executableName = "codium";

From b936e6f3b3070c98ba2e76a4a961b5b406fce405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Thu, 5 Nov 2020 14:38:19 -0600
Subject: [PATCH 1631/3942] ldc: 1.20.1 -> 1.24.0

---
 pkgs/development/compilers/ldc/default.nix | 5 ++---
 pkgs/development/compilers/ldc/generic.nix | 8 ++------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index 5a4baabcf8d8..e0a689c7fa05 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -1,5 +1,4 @@
 import ./generic.nix {
-  version = "1.20.1";
-  ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b";
+  version = "1.24.0";
+  ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx";
 }
-
diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix
index c93d423945cb..214d64cfa76b 100644
--- a/pkgs/development/compilers/ldc/generic.nix
+++ b/pkgs/development/compilers/ldc/generic.nix
@@ -1,5 +1,5 @@
 { version, ldcSha256 }:
-{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata
+{ stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata
 , libconfig, lit, gdb, unzip, darwin, bash
 , callPackage, makeWrapper, runCommand, targetPackages
 , ldcBootstrap ? callPackage ./bootstrap.nix { }
@@ -56,16 +56,12 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    cmake ninja makeWrapper unzip ldcBootstrap lit lit.python
+    cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip
   ]
   ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.Foundation
-    # https://github.com/NixOS/nixpkgs/issues/57120
-    # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515
-    llvm_5
   ]
   ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    llvm_8
     # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
     gdb
   ];

From 55fc82d6d2bec1cc625b28dcc32ca35f2b87e743 Mon Sep 17 00:00:00 2001
From: upkeep-bot <foo@bar.com>
Date: Fri, 6 Nov 2020 12:12:35 +0000
Subject: [PATCH 1632/3942] vscode: 1.50.1 -> 1.51.0

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

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 528a0496d915..ce6122bddc41 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -11,8 +11,8 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "0mpb4641icr3z89y2rlh5anli40p1f48sl5xagr7h3nb5c84k10x";
-    x86_64-darwin = "1azmc79zf72007qc1xndp9wdkd078mvqgv35hf231q7kdi6wzxcp";
+    x86_64-linux = "18fx2nsgn09l2gzgr1abi0cp4g8z2v9177sdl2rqr0yvmwk5i3p0";
+    x86_64-darwin = "14qdfz8q1dz0skkcgpamksgdvgsid2mcm9h09cvkh4z3v458100r";
   }.${system};
 in
   callPackage ./generic.nix rec {
@@ -21,7 +21,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.50.1";
+    version = "1.51.0";
     pname = "vscode";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";

From e4747121dfdec22630514fa192db65d9b0f63db2 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Thu, 5 Nov 2020 21:23:00 -0800
Subject: [PATCH 1633/3942] python3Packages.poetry: 1.1.1 -> 1.1.4

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

diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 8000c667e6db..bad38ea582fb 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "poetry";
-  version = "1.1.1";
+  version = "1.1.4";
   format = "pyproject";
   disabled = isPy27;
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "python-poetry";
     repo = pname;
     rev = version;
-    sha256 = "1j3ij8qsd709p7ww5r4759f2xnk2s7g40kzm9vx99l98zw890g05";
+    sha256 = "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs";
   };
 
   postPatch = ''

From 37c564ae5089dbdfd23e92ee63ca0d8b84405097 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 5 Nov 2020 17:21:34 -0800
Subject: [PATCH 1634/3942] python3Packages.dotnetcore2: remove

Outdated, and new package isn't trivial to package anymore.
Not really useful outside of Azure Machine Learning anyway.
---
 .../python-modules/dotnetcore2/default.nix    | 59 -------------------
 .../python-modules/dotnetcore2/runtime.patch  | 22 -------
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 83 deletions(-)
 delete mode 100644 pkgs/development/python-modules/dotnetcore2/default.nix
 delete mode 100644 pkgs/development/python-modules/dotnetcore2/runtime.patch

diff --git a/pkgs/development/python-modules/dotnetcore2/default.nix b/pkgs/development/python-modules/dotnetcore2/default.nix
deleted file mode 100644
index 7cc069707aad..000000000000
--- a/pkgs/development/python-modules/dotnetcore2/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, python, isPy27
-, dotnet-sdk
-, substituteAll
-, distro
-, unzip
-}:
-
-buildPythonPackage rec {
-  pname = "dotnetcore2";
-  version = "2.1.14";
-  format = "wheel";
-  disabled = isPy27;
-
-  src = fetchPypi {
-    inherit pname version format;
-    python = "py3";
-    platform = "manylinux1_x86_64";
-    sha256 = "0dxp9a73ncjylc09bjwq81fgj5ysk1yi27l8ka5f98121k1kmn6q";
-  };
-
-  nativeBuildInputs = [ unzip ];
-
-  propagatedBuildInputs = [ distro ];
-
-  # needed to apply patches
-  prePatch = ''
-    unzip dist/dotnet*
-  '';
-
-  patches = [
-    ( substituteAll {
-        src = ./runtime.patch;
-        dotnet = dotnet-sdk;
-      }
-    )
-  ];
-
-  # remove bin, which has a broken dotnetcore installation
-  installPhase = ''
-    rm -rf dotnetcore2/bin
-    mkdir -p $out/${python.sitePackages}/
-    cp -r dotnetcore2 $out/${python.sitePackages}/
-  '';
-
-  # no tests, ensure it's one useful function works
-  checkPhase = ''
-    rm -r dotnetcore2 # avoid importing local directory
-    export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
-    ${python.interpreter} -c 'from dotnetcore2 import runtime; print(runtime.get_runtime_path()); runtime.ensure_dependencies()'
-  '';
-
-  meta = with lib; {
-    description = "DotNet Core runtime";
-    homepage = "https://github.com/dotnet/core";
-    license = licenses.mit;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ jonringer ];
-  };
-}
diff --git a/pkgs/development/python-modules/dotnetcore2/runtime.patch b/pkgs/development/python-modules/dotnetcore2/runtime.patch
deleted file mode 100644
index 28cf10e21d15..000000000000
--- a/pkgs/development/python-modules/dotnetcore2/runtime.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/dotnetcore2/runtime.py b/dotnetcore2/runtime.py
-index 475e2b4..5b578ec 100644
---- a/dotnetcore2/runtime.py
-+++ b/dotnetcore2/runtime.py
-@@ -41,6 +41,7 @@ def _get_bin_folder() -> str:
- 
- 
- def get_runtime_path():
-+    return "@dotnet@/dotnet"
-     search_string = os.path.join(_get_bin_folder(), 'dotnet*')
-     matches = [f for f in glob.glob(search_string, recursive=True)]
-     return matches[0]
-@@ -96,8 +97,7 @@ class _FileLock():
- 
- 
- def ensure_dependencies() -> Optional[str]:
--    if dist is None:
--        return None
-+    return None
- 
-     bin_folder = _get_bin_folder()
-     deps_path = os.path.join(bin_folder, 'deps')
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e52d78f0f3c2..2609284bf61a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1811,8 +1811,6 @@ in {
 
   dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; };
 
-  dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { inherit (pkgs) substituteAll dotnet-sdk; };
-
   dparse = callPackage ../development/python-modules/dparse { };
 
   dpath = callPackage ../development/python-modules/dpath { };

From 52b180ad540884619b2cde7176f924e261a9d513 Mon Sep 17 00:00:00 2001
From: Andrew Fontaine <andrew@afontaine.ca>
Date: Thu, 5 Nov 2020 19:04:07 -0500
Subject: [PATCH 1635/3942] plexamp: 3.2.0 -> 3.3.1

Release notes: https://forums.plex.tv/t/plexamp-release-notes/221280/20
---
 pkgs/applications/audio/plexamp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix
index 277382452313..2c33584e3621 100644
--- a/pkgs/applications/audio/plexamp/default.nix
+++ b/pkgs/applications/audio/plexamp/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "plexamp";
-  version = "3.2.0";
+  version = "3.3.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
-    sha256 = "R1BhobnwoU7oJ7bNes8kH2neXqHlMPbRCNjcHyzUPqo=";
     name="${pname}-${version}.AppImage";
+    sha256 = "6/asP8VR+rJ52lKKds46gSw1or9suUEmyR75pjdWHIQ=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 40bd50cbbb1fd71e0ff639779d4e5f523038a688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= <mic.liamg@gmail.com>
Date: Fri, 6 Nov 2020 05:02:09 +0100
Subject: [PATCH 1636/3942] megasync: 4.3.1.0 -> 4.3.5.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolves #102634

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
---
 pkgs/applications/misc/megasync/default.nix | 36 +++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index d5da4c7d773a..3b25d7e606a6 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -1,17 +1,40 @@
-{ stdenv, autoconf, automake, c-ares, cryptopp, curl, doxygen, fetchFromGitHub
-, fetchpatch, ffmpeg_3, libmediainfo, libraw, libsodium, libtool, libuv, libzen
-, lsb-release, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip
-, wget }:
+{ stdenv
+, autoconf
+, automake
+, c-ares
+, cryptopp
+, curl
+, doxygen
+, fetchFromGitHub
+, fetchpatch
+, ffmpeg_3
+, libmediainfo
+, libraw
+, libsodium
+, libtool
+, libuv
+, libzen
+, lsb-release
+, mkDerivation
+, pkgconfig
+, qtbase
+, qttools
+, qtx11extras
+, sqlite
+, swig
+, unzip
+, wget
+}:
 
 mkDerivation rec {
   pname = "megasync";
-  version = "4.3.1.0";
+  version = "4.3.5.0";
 
   src = fetchFromGitHub {
     owner = "meganz";
     repo = "MEGAsync";
     rev = "v${version}_Linux";
-    sha256 = "0b68wpif8a0wf1vfn1nr19dmz8f31dprb27jpldxrxhyfslc43yj";
+    sha256 = "0rr1jjy0n5bj1lh6xi3nbbcikvq69j3r9qnajp4mhywr5izpccvs";
     fetchSubmodules = true;
   };
 
@@ -29,6 +52,7 @@ mkDerivation rec {
     libuv
     libzen
     qtbase
+    qtx11extras
     sqlite
     unzip
     wget

From bf8f06748a016b95e43661d9afd65c24efedc940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= <mic.liamg@gmail.com>
Date: Fri, 6 Nov 2020 05:40:50 +0100
Subject: [PATCH 1637/3942] megasync: bumped qt to 5.15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Minář <mic.liamg@gmail.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 d9379d6a618f..b20511f88d2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2345,7 +2345,7 @@ in
 
   medusa = callPackage ../tools/security/medusa { };
 
-  megasync = libsForQt514.callPackage ../applications/misc/megasync { };
+  megasync = libsForQt515.callPackage ../applications/misc/megasync { };
 
   megacmd = callPackage ../applications/misc/megacmd { };
 

From 7ac7ce8b1ab5020639c4a3d53f85e8b1dcc36ac7 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 3 Nov 2020 22:31:16 +0800
Subject: [PATCH 1638/3942] rust-analyzer: 2020-10-19 -> 2020-11-02

---
 .../node-packages/node-packages.nix           | 2272 +++++++----------
 .../tools/rust/rust-analyzer/default.nix      |    6 +-
 .../tools/rust/rust-analyzer/generic.nix      |    5 -
 .../rust/rust-analyzer/no-track_env_var.patch |  120 -
 .../rust-analyzer/build-deps/package.json     |    2 +-
 5 files changed, 914 insertions(+), 1491 deletions(-)
 delete mode 100644 pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch

diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index dc1548810544..0d35f0fbd5fb 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -31,15 +31,6 @@ let
         sha512 = "twM8V03ujBIGVpgV1PBlSDodUdxtUb7WakutfWafAvEHUsgwzfvQz2VtKWvjNZ9AiYjnCuwkQaclqVv0VHNo9w==";
       };
     };
-    "@angular-devkit/core-10.0.7" = {
-      name = "_at_angular-devkit_slash_core";
-      packageName = "@angular-devkit/core";
-      version = "10.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.7.tgz";
-        sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw==";
-      };
-    };
     "@angular-devkit/core-10.2.0" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
@@ -49,15 +40,6 @@ let
         sha512 = "XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==";
       };
     };
-    "@angular-devkit/schematics-10.0.7" = {
-      name = "_at_angular-devkit_slash_schematics";
-      packageName = "@angular-devkit/schematics";
-      version = "10.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.7.tgz";
-        sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg==";
-      };
-    };
     "@angular-devkit/schematics-10.2.0" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
@@ -67,13 +49,13 @@ let
         sha512 = "TQI5NnE6iM3ChF5gZQ9qb+lZgMWa7aLoF5ksOyT3zrmOuICiQYJhA6SsjV95q7J4M55qYymwBib8KTqU/xuQww==";
       };
     };
-    "@angular-devkit/schematics-cli-0.1000.7" = {
+    "@angular-devkit/schematics-cli-0.1002.0" = {
       name = "_at_angular-devkit_slash_schematics-cli";
       packageName = "@angular-devkit/schematics-cli";
-      version = "0.1000.7";
+      version = "0.1002.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1000.7.tgz";
-        sha512 = "5zXO0WfyRySZudv2/EEC/UVfG75y7TGrdMfVZNc1WP0SB54psA0U3Z3jT+6Y9VjdjmXdxjVfybhuOzZ4I1fs0Q==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1002.0.tgz";
+        sha512 = "wV5YPdcolPAXo5oyMu9vM3fm3grb3ZT9amrTMC9oc3OWQUVFySPCIzvguHf8bVGMQ/AHfel2TaYxIQv/LurBrQ==";
       };
     };
     "@antora/asciidoc-loader-2.3.4" = {
@@ -184,13 +166,13 @@ let
         sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg==";
       };
     };
-    "@apollo/federation-0.20.2" = {
+    "@apollo/federation-0.20.4" = {
       name = "_at_apollo_slash_federation";
       packageName = "@apollo/federation";
-      version = "0.20.2";
+      version = "0.20.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.2.tgz";
-        sha512 = "SrwUK0dZdlHLDkv/8K/Q5OK1AE/RypNkLmxhBndlOKAb2e5li6dZy6FJGNbErgHBAJQSx2Xp1gCF5CZONbFxpw==";
+        url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.4.tgz";
+        sha512 = "A/2BtgSytrrA2nSuCrKIlXYemfMEzCosIOD4vUjK7Y1LvNuPCBxt6mdZ+hjKrfpY4IXhZdgbtHjI5/Q2Pkqsmg==";
       };
     };
     "@apollo/protobufjs-1.0.5" = {
@@ -328,13 +310,13 @@ let
         sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==";
       };
     };
-    "@babel/generator-7.11.6" = {
+    "@babel/generator-7.12.1" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.11.6";
+      version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz";
-        sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz";
+        sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==";
       };
     };
     "@babel/generator-7.12.5" = {
@@ -1372,13 +1354,13 @@ let
         sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==";
       };
     };
-    "@babel/types-7.12.5" = {
+    "@babel/types-7.12.6" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.12.5";
+      version = "7.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.5.tgz";
-        sha512 = "gyTcvz7JFa4V45C0Zklv//GmFOAal5fL23OWpBLqc4nZ4Yrz67s4kCNwSK1Gu0MXGTU8mRY3zJYtacLdKXlzig==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz";
+        sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==";
       };
     };
     "@bugsnag/browser-7.5.1" = {
@@ -1741,13 +1723,13 @@ let
         sha512 = "fQRc4+RG+rEw1IdjFx/5t2AvOlJT8ktv2dfObD3aW838ohZxCx1QvFUY/Gdx5JA1JY/KrHRGuEqQLH9ayiexyg==";
       };
     };
-    "@expo/config-3.3.13" = {
+    "@expo/config-3.3.14" = {
       name = "_at_expo_slash_config";
       packageName = "@expo/config";
-      version = "3.3.13";
+      version = "3.3.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/config/-/config-3.3.13.tgz";
-        sha512 = "ZFkMQxtk6Zobfc+BPy60rAAuiXFd5ybV7QFF3A7tTy7e6T0/YmuiSMyTM6fqs2c0O47F8/1eoaefXWUl7ppz3w==";
+        url = "https://registry.npmjs.org/@expo/config/-/config-3.3.14.tgz";
+        sha512 = "nYnnNJRr3UZlBsUk4esbeYS2AfR3EFw4x9bVZQbbWKgDapFj26QIjGYeolZrO0yFhllSC/TU+2YNIyt6sQwRpw==";
       };
     };
     "@expo/config-types-40.0.0-beta.1" = {
@@ -1768,22 +1750,22 @@ let
         sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ==";
       };
     };
-    "@expo/dev-server-0.1.38" = {
+    "@expo/dev-server-0.1.39" = {
       name = "_at_expo_slash_dev-server";
       packageName = "@expo/dev-server";
-      version = "0.1.38";
+      version = "0.1.39";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.38.tgz";
-        sha512 = "LOLqo/SpjVfYuSEOicKgCnUzIvbV0oYvXTS9Rr/LBxw3Q/Smy8p8FbYZ/7RTbSnFbCW1oZWERJ+Qe1ghWKbAEw==";
+        url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.39.tgz";
+        sha512 = "PTNrPQ7z3yYLijePiqOKTtjTtzpn9HECE0LQKFcf/IVHxxVe/ScRWJAu6xndL51sXWJgE3PXg8r47UMLHb7Y2w==";
       };
     };
-    "@expo/dev-tools-0.13.57" = {
+    "@expo/dev-tools-0.13.58" = {
       name = "_at_expo_slash_dev-tools";
       packageName = "@expo/dev-tools";
-      version = "0.13.57";
+      version = "0.13.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.57.tgz";
-        sha512 = "eRP49UYFVytfK7cHA6notnfmCiWvcQ2FOFJABeti2zUa3O55IDP0b/NDqdyLRDpuTxsRZl/K0MBLD5NAUsHMHQ==";
+        url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.58.tgz";
+        sha512 = "CdlCPWEzvA69ZucdeCYFoM0fEBVufcSwOOs2xcEJo2cVHGJkCUFhEwASXHdPOGt773DF1ISF4mKQAUsLtmA7qw==";
       };
     };
     "@expo/eas-build-job-0.1.2" = {
@@ -1813,13 +1795,13 @@ let
         sha512 = "i34lfcMVt5Wv2Cf5apZUj3o9JlFt8WOPSZjrECryunBQ9/BsQQYY5NHgGjhhZnnRE+6JFf0CPQTjXdoQ1w3w0w==";
       };
     };
-    "@expo/metro-config-0.1.38" = {
+    "@expo/metro-config-0.1.39" = {
       name = "_at_expo_slash_metro-config";
       packageName = "@expo/metro-config";
-      version = "0.1.38";
+      version = "0.1.39";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.38.tgz";
-        sha512 = "t7BW8cgmm7nmxiY20g1ZMKvXFyDr5Kq+9Ppnskvhg+QffXcY3db/kYSOR0QswscqF5/jBPVGjox7m4+SBKHCDg==";
+        url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.39.tgz";
+        sha512 = "oCeBGyLPmo65HeUPKEBMiZCbh2RfEbH8AO7Apwitn1zs8LZf9DvVtpEh7mlYRJlmKCrxaM4NjuFZMcquh72aiQ==";
       };
     };
     "@expo/ngrok-2.4.3" = {
@@ -2020,22 +2002,22 @@ let
         sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg==";
       };
     };
-    "@expo/webpack-config-0.12.42" = {
+    "@expo/webpack-config-0.12.43" = {
       name = "_at_expo_slash_webpack-config";
       packageName = "@expo/webpack-config";
-      version = "0.12.42";
+      version = "0.12.43";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.42.tgz";
-        sha512 = "VqQIzFiQQQLMQISdmIqBgJHeGD9LO8eP9sI5puW6y8oEB7Cd8asU+DOC3xJVS1MrqK2usQhW5EJhi2wV7RVG8g==";
+        url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.43.tgz";
+        sha512 = "2XNqppNrngC4WrJJRnKpST6Xzez6GbUxB+SwhKVef8qf4Uw2vE50p0zpGTcIzs+aAIaKW3cFSIRQnhxkVrGXww==";
       };
     };
-    "@expo/xdl-58.0.18" = {
+    "@expo/xdl-58.0.19" = {
       name = "_at_expo_slash_xdl";
       packageName = "@expo/xdl";
-      version = "58.0.18";
+      version = "58.0.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.18.tgz";
-        sha512 = "CwwLtdEIj857iXwhc10V+gjuepOQ0S21wWM0oKny0TzGSmCz8uVvTCnKK+Geem5hsqyKkCsayirUKTeZ2ToMqA==";
+        url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.19.tgz";
+        sha512 = "+YWCOSJi6CoBLSgktJfy8/ijQGK3WbPUmujndcxY/WPmCe+Wek6kajmxclMMuDVAjg4RFXdH/fuLwOb/abOU5g==";
       };
     };
     "@fluentui/date-time-utilities-7.9.0" = {
@@ -2065,22 +2047,22 @@ let
         sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ==";
       };
     };
-    "@fluentui/react-7.149.3" = {
+    "@fluentui/react-7.149.4" = {
       name = "_at_fluentui_slash_react";
       packageName = "@fluentui/react";
-      version = "7.149.3";
+      version = "7.149.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.149.3.tgz";
-        sha512 = "CmeTmPcqEy+lHCKsxg2Y0QnvU1dfyh8F/3Bkt48yo+B6/eCEUUCQW+Xl3ktp3tvlijdLaskKV68L9lNh3RZP4Q==";
+        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.149.4.tgz";
+        sha512 = "yZqU5EFYDlXZQfFLIm085/A/nYW9SL/YccPT6E+r51vwn4NlfRSQ6K0IFD5cGnMPOhA+mwyT79uFgxb3/I281A==";
       };
     };
-    "@fluentui/react-focus-7.16.16" = {
+    "@fluentui/react-focus-7.16.17" = {
       name = "_at_fluentui_slash_react-focus";
       packageName = "@fluentui/react-focus";
-      version = "7.16.16";
+      version = "7.16.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.16.tgz";
-        sha512 = "1YtdaoFUwQWiVfBnhIcMxb0U6ZH3uyk9asfjluW9d6GsUTWczY+PNKZWukIQT1dtpr4+LcOw+F5oSTnzux/Mpg==";
+        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.17.tgz";
+        sha512 = "Uioe+9tZoiXxp5aKam6Y+PyU46UDGMCF4xYctgP3tIpPyi7xfka7Aat6IyIFcTxN53UKea2IcCMzbOhpK0VTLg==";
       };
     };
     "@fluentui/react-window-provider-1.0.1" = {
@@ -2092,13 +2074,13 @@ let
         sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w==";
       };
     };
-    "@fluentui/theme-1.5.4" = {
+    "@fluentui/theme-1.6.0" = {
       name = "_at_fluentui_slash_theme";
       packageName = "@fluentui/theme";
-      version = "1.5.4";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.5.4.tgz";
-        sha512 = "f89jKHET6/f4Z+BzKzs1YXA3mAsBBIDSOtc5ZXfNwYcKPJ0ZqKYtplRz668LcvHdz1ysMR0XxtA0Y5eNUXyLxw==";
+        url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.6.0.tgz";
+        sha512 = "X+uJx7+9ChfM0SAq+eDLgL9t65ZA8NAc1Ifrw4eek6cS3c1eY95/tgf1EkX+hOE9+oIuEATujM9THzk+4yd1VQ==";
       };
     };
     "@graphql-cli/common-4.1.0" = {
@@ -2128,13 +2110,13 @@ let
         sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q==";
       };
     };
-    "@graphql-tools/delegate-7.0.3" = {
+    "@graphql-tools/delegate-7.0.4" = {
       name = "_at_graphql-tools_slash_delegate";
       packageName = "@graphql-tools/delegate";
-      version = "7.0.3";
+      version = "7.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.3.tgz";
-        sha512 = "BSRF/Wg9XNllWo3Kdt0QBBaFltexn3vAnTOWH1qLrNcmfQAvUMf17/TsAqH9ZLSKU1NW9XCOsd7YMHhhUuTCEg==";
+        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.4.tgz";
+        sha512 = "6/qL9V31FgECNPwc5As1359hpsAt4ASWsiYBSYWL+Iq9/K0YRcNeEmSseXIyCP4oh8k/9HS/w/m2lkMk/YSUpQ==";
       };
     };
     "@graphql-tools/graphql-file-loader-6.2.5" = {
@@ -3343,13 +3325,13 @@ let
         sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q==";
       };
     };
-    "@microsoft/load-themed-styles-1.10.125" = {
+    "@microsoft/load-themed-styles-1.10.126" = {
       name = "_at_microsoft_slash_load-themed-styles";
       packageName = "@microsoft/load-themed-styles";
-      version = "1.10.125";
+      version = "1.10.126";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.125.tgz";
-        sha512 = "qig3jfhrlwvK0tDQc3mrEbg6hUt432FDK4y3zJH9upT068Qrk40s6J62Kv7YW+lIMfX5h/tTi5Y/RyvqwcM+Nw==";
+        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.126.tgz";
+        sha512 = "6GoapdGJPmWq6WChTaImAZ6UjuPb2FWHeP/pTEHw6Dz+d4/4TnyWcVR9uDLx+8n6xn3ZpU6OtW0FEGzNNa+TUw==";
       };
     };
     "@mozilla/readability-0.3.0" = {
@@ -3478,40 +3460,40 @@ let
         sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q==";
       };
     };
-    "@netlify/traffic-mesh-agent-0.24.0-pre.23" = {
+    "@netlify/traffic-mesh-agent-0.24.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent";
       packageName = "@netlify/traffic-mesh-agent";
-      version = "0.24.0-pre.23";
+      version = "0.24.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.24.0-pre.23.tgz";
-        sha512 = "uv5F3grah5C0CPGm8raASIyVDi+lYBR4os+wG0GXkUVCU2r2Pcl8MStLeN3phe1G3AjVkco5WcAKC8XfBvvqEw==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.24.0.tgz";
+        sha512 = "m3nfdolp8+jwy7sBKz6iuw1MRRZR27onrUtQz3Iwor7CE0+rIWJm+aPc5AFYUlISDM5zTCXgVGDeiPHJv5cOQQ==";
       };
     };
-    "@netlify/traffic-mesh-agent-darwin-x64-0.24.0-pre.23" = {
+    "@netlify/traffic-mesh-agent-darwin-x64-0.24.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64";
       packageName = "@netlify/traffic-mesh-agent-darwin-x64";
-      version = "0.24.0-pre.23";
+      version = "0.24.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.24.0-pre.23.tgz";
-        sha512 = "XDn77F+tx+qQZ9sMwqmwRAOEm56syA7xO1rScDY4JV8oSyvwa6sfUWnFXefyxUt1uLNfIQhiKDnA4sOyCRJxDw==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.24.0.tgz";
+        sha512 = "aFh/04aTRNI7BAyUbpXvH6AZ+XcJMxwroQWfMYjyVm7F+T4bg0XRcteoVjX/U2NhxkNhCXMqBgrHFsVNZLlJ7w==";
       };
     };
-    "@netlify/traffic-mesh-agent-linux-x64-0.24.0-pre.23" = {
+    "@netlify/traffic-mesh-agent-linux-x64-0.24.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent-linux-x64";
       packageName = "@netlify/traffic-mesh-agent-linux-x64";
-      version = "0.24.0-pre.23";
+      version = "0.24.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.24.0-pre.23.tgz";
-        sha512 = "9D2sFOcO72IBsqiHgU1Z5tQ6+lvjRBUeOc0iFKgcUPG5eJ46pgrOAD8B8tNd2FscNz2lyrJxZc1kGAOjYikzUQ==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.24.0.tgz";
+        sha512 = "cUHUpajpK3WrE78F29fEuOKuRG+mkXoPoe2SL9wO+sCrAw18A9px/tfWWFwC9iJLSr/WLHYAAOJhdm02ypa65A==";
       };
     };
-    "@netlify/traffic-mesh-agent-win32-x64-0.24.0-pre.23" = {
+    "@netlify/traffic-mesh-agent-win32-x64-0.24.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent-win32-x64";
       packageName = "@netlify/traffic-mesh-agent-win32-x64";
-      version = "0.24.0-pre.23";
+      version = "0.24.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.24.0-pre.23.tgz";
-        sha512 = "kFImydqG6Er+kgG5UFjIWBp7TxFcf/eOoXSOWr6a+3kJu2iwZP2IdflyNK9EsKdW/KA+W43PXleF4VQwLm830w==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.24.0.tgz";
+        sha512 = "9K4QA5VcJK9Wrx9BTKSaeOaX9es7lfS97iJMB1micSFuLIK5o/DS9oxaa4tMjzIy0Ck/Pa717XX9TGx9MpCexA==";
       };
     };
     "@netlify/zip-it-and-ship-it-1.4.0" = {
@@ -3523,58 +3505,58 @@ let
         sha512 = "xPJDEMkHnIoHk19enEbg4qiIwszXS8XOUi8UpD4YMA81GXGT0xi16Z17kOACipDG6Tmmy5Jl6pe3cKqQvM/WyQ==";
       };
     };
-    "@node-red/editor-api-1.2.2" = {
+    "@node-red/editor-api-1.2.3" = {
       name = "_at_node-red_slash_editor-api";
       packageName = "@node-red/editor-api";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.2.tgz";
-        sha512 = "5bKIH2lPYiYMYLQIpBplwu4tkuFk4JI24sCOyYsPTkT1EB2zx4qxQndwc+crKjBCMbMvHdh2D3zw9mc1Av9B7g==";
+        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.3.tgz";
+        sha512 = "7xw02VV69E08jx4cnLkVaOaX+XrQNPlFCRSobAQyj6KKGizMbclWKbsIF6gWSnWEHJdQR/kbAuaK0Qm/F19YuA==";
       };
     };
-    "@node-red/editor-client-1.2.2" = {
+    "@node-red/editor-client-1.2.3" = {
       name = "_at_node-red_slash_editor-client";
       packageName = "@node-red/editor-client";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.2.tgz";
-        sha512 = "bkNPwzTFhe1AYVydmgqHNfhUsdHfJx261PGLOS9ZJYf9Ww2jVDKXGxHz25qd4lgeRqnUcT7b6T2bOzqVs1zMWA==";
+        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.3.tgz";
+        sha512 = "nYmt4B2GwZOAQIAeHDj6dj85aJ2KnyXdX4nHqRkpBO3UMqfaZuG2WuhDful/TOUEhgTOXWLzXVPQwzFt3q9fRA==";
       };
     };
-    "@node-red/nodes-1.2.2" = {
+    "@node-red/nodes-1.2.3" = {
       name = "_at_node-red_slash_nodes";
       packageName = "@node-red/nodes";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.2.tgz";
-        sha512 = "cbHfjdV5QGEQtwYpqZh7ylUnI3zbXmfvcIoGRMXVyhHTgok00ltAgJtJ3PGHSSOsd/OWshPKO2OPoM0xenepTw==";
+        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.3.tgz";
+        sha512 = "HHWRtbronw4OaFGlF58CYSCFHTVzvfzT+mWmqTucP7iD14658hDHUAVPC8eFmP6E2tbo+Vy3+Rdu80djcaRyUQ==";
       };
     };
-    "@node-red/registry-1.2.2" = {
+    "@node-red/registry-1.2.3" = {
       name = "_at_node-red_slash_registry";
       packageName = "@node-red/registry";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.2.tgz";
-        sha512 = "HTpv/5OmptMkXYzlGfwQZl8lb+e5ta72z0nexNgbox5nc1Cg65CaFvhwcjC9UVK7ROblwDlVnutBG03eZvyOoA==";
+        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.3.tgz";
+        sha512 = "wGJ1KK1+NycM+Sbmib6FIL4/OwWxB0sx4IHLI5tYdGYLaf7MYSKTcNxpLvUwjsE2k0ngeiqW43oPhyFrK01Ihw==";
       };
     };
-    "@node-red/runtime-1.2.2" = {
+    "@node-red/runtime-1.2.3" = {
       name = "_at_node-red_slash_runtime";
       packageName = "@node-red/runtime";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.2.tgz";
-        sha512 = "a4dGwF4BgAYAFyKGGyeLjashn1hstl1i7g2nwGFfnI2hJvF05fzj2lGy8dWE6wYq6c2FZQv4OetAwBfN1akxsg==";
+        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.3.tgz";
+        sha512 = "qFEJ8Xgg5lgtlYPW/Zfi2r8HBMzTzwP+ws7f9So28fG76SGcXk8MfNnx2GTSGRnp+a9Mn1/SRlunNQqw9bQ/LA==";
       };
     };
-    "@node-red/util-1.2.2" = {
+    "@node-red/util-1.2.3" = {
       name = "_at_node-red_slash_util";
       packageName = "@node-red/util";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.2.tgz";
-        sha512 = "7rj3qb/puqcNaHIz12wtLjuJ1pHWsZzPZ+vEubs116SxAas6OVYYLuBGEPhHWeE3zg3t6Erv7wYNaDZeyUm/CQ==";
+        url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.3.tgz";
+        sha512 = "myAbQ35tk/oIJJfwUehpQbobFcAkeLxRKmRE5FOda8S79RHJh3OJVdISSm2lgUh0QlwFl4D8fZvu+2wZ5GoB0Q==";
       };
     };
     "@nodelib/fs.scandir-2.1.3" = {
@@ -3685,6 +3667,15 @@ let
         sha512 = "M9o+DOrb8l603qvgz1FogJBUGLqcMFL1aFg2ZEL0FbXJofiNTLOWIeB4faeZTLwE6dt0xH9GpCVpzksMMzGbmA==";
       };
     };
+    "@oclif/command-1.6.1" = {
+      name = "_at_oclif_slash_command";
+      packageName = "@oclif/command";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@oclif/command/-/command-1.6.1.tgz";
+        sha512 = "pvmMmfGn+zm4e4RwVw63mg9sIaqKqmVsFbImQoUrCO/43UmWzoSHWNXKdgEGigOezWrkZfFucaeZcSbp149OWg==";
+      };
+    };
     "@oclif/command-1.8.0" = {
       name = "_at_oclif_slash_command";
       packageName = "@oclif/command";
@@ -3694,6 +3685,15 @@ let
         sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw==";
       };
     };
+    "@oclif/config-1.15.1" = {
+      name = "_at_oclif_slash_config";
+      packageName = "@oclif/config";
+      version = "1.15.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@oclif/config/-/config-1.15.1.tgz";
+        sha512 = "GdyHpEZuWlfU8GSaZoiywtfVBsPcfYn1KuSLT1JTfvZGpPG6vShcGr24YZ3HG2jXUFlIuAqDcYlTzOrqOdTPNQ==";
+      };
+    };
     "@oclif/config-1.17.0" = {
       name = "_at_oclif_slash_config";
       packageName = "@oclif/config";
@@ -3703,6 +3703,15 @@ let
         sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA==";
       };
     };
+    "@oclif/errors-1.2.2" = {
+      name = "_at_oclif_slash_errors";
+      packageName = "@oclif/errors";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.2.2.tgz";
+        sha512 = "Eq8BFuJUQcbAPVofDxwdE0bL14inIiwt5EaKRVY9ZDIG11jwdXZqiQEECJx0VfnLyUZdYfRd/znDI/MytdJoKg==";
+      };
+    };
     "@oclif/errors-1.3.3" = {
       name = "_at_oclif_slash_errors";
       packageName = "@oclif/errors";
@@ -4621,13 +4630,13 @@ let
         sha512 = "rJRTTTL8CMMFb3ebCvAVHKHxuNzRqy/HtbXhJ82l5Xo/jXcm74eV2Q0RBUrNo1yBKWFIR+FIwiXLJaGcC/R9Pw==";
       };
     };
-    "@schematics/schematics-0.1000.7" = {
+    "@schematics/schematics-0.1002.0" = {
       name = "_at_schematics_slash_schematics";
       packageName = "@schematics/schematics";
-      version = "0.1000.7";
+      version = "0.1002.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1000.7.tgz";
-        sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw==";
+        url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1002.0.tgz";
+        sha512 = "A6z0j+GCgj3NPAJ3+OZPgU/8KYLHcVWN+ZELuQTFXZgN6mpgbxCmM3yymfo7+riaF0xx1mXlt8G+tO7xDsLVvQ==";
       };
     };
     "@schematics/update-0.1002.0" = {
@@ -4684,13 +4693,13 @@ let
         sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ==";
       };
     };
-    "@serverless/enterprise-plugin-4.1.1" = {
+    "@serverless/enterprise-plugin-4.1.2" = {
       name = "_at_serverless_slash_enterprise-plugin";
       packageName = "@serverless/enterprise-plugin";
-      version = "4.1.1";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.1.1.tgz";
-        sha512 = "ga9g/bRyA6LCckYPU8jvx63Q9+Po/yZxbdbYb2KiCZ+0S1YcQQsjDJwsOTAAgQ6AEp95TtrQkn3BycYTSGEm7A==";
+        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.1.2.tgz";
+        sha512 = "aAHF9ElWr0eaAEVXy6M9DvokiyVV/y5xokiBnAhQisMT2faTVlCX1B8D1nJef0NdJ6pXJVOd3JrXC4rIxjz0zg==";
       };
     };
     "@serverless/event-mocks-1.1.1" = {
@@ -4711,13 +4720,13 @@ let
         sha512 = "zTJBhzjWtDBogLFnzoz6NYiQ6CThsxuvHQxSbBLcNK4+VQPIkrZOxaQ+dNCNLeLN1Tb3NnZDPNGkoThvgGwq3Q==";
       };
     };
-    "@serverless/platform-client-china-2.0.7" = {
+    "@serverless/platform-client-china-2.0.8" = {
       name = "_at_serverless_slash_platform-client-china";
       packageName = "@serverless/platform-client-china";
-      version = "2.0.7";
+      version = "2.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.7.tgz";
-        sha512 = "SuHCHqwCjZXODdSlgetXFGksz+ksAWy3kbCpFhAC9nkiFSWR01CLX4a6UW+VhOeb6j6F3wbkczzqi38P17+USg==";
+        url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.8.tgz";
+        sha512 = "20sceKHkGP56HnwMgrdHwD963bxew63+hE2aNrcu1DtLuUqcRvP5evaWO/CwMDTajJJDhEwi3wQDxPpxtKlJ7A==";
       };
     };
     "@serverless/platform-sdk-2.3.2" = {
@@ -4954,13 +4963,13 @@ let
         sha512 = "uWKtjh29I/d0mfmfBN7w6RwwNBQxQVKrauF5ND/gqb0PVsKV22GIpkI+viWjI7KNKso6/B0tMmsv7TX2tsNcLQ==";
       };
     };
-    "@sorg/log-2.2.0" = {
+    "@sorg/log-2.2.1" = {
       name = "_at_sorg_slash_log";
       packageName = "@sorg/log";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sorg/log/-/log-2.2.0.tgz";
-        sha512 = "w5aH2k4caUWxO3dzJ0+GUJJGSqsg0gT6myhypQumlJXsKzYqzsZGZRWA2s/0zQIx6+B2wDvdweVogiWMAAbaKw==";
+        url = "https://registry.npmjs.org/@sorg/log/-/log-2.2.1.tgz";
+        sha512 = "GGtgReHuH7M+FS0pGy6tb3QPNVipjUl5+RWvG8yMP3Hb+Lq0AqsFYgBUz+FVECQ9J3otvsAzgOfz+8BIqRUr0Q==";
       };
     };
     "@starptech/expression-parser-0.10.0" = {
@@ -5089,13 +5098,13 @@ let
         sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==";
       };
     };
-    "@tencent-sdk/capi-1.1.5" = {
+    "@tencent-sdk/capi-1.1.6" = {
       name = "_at_tencent-sdk_slash_capi";
       packageName = "@tencent-sdk/capi";
-      version = "1.1.5";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.5.tgz";
-        sha512 = "cHkoMY/1L5VxeiKv51uKxbFK8lZ7pZbY3CukzOHro8YKT6dETKYzTGO/F8jDhH7r8vKWxuA+ZcALzxYuVlmwsg==";
+        url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.6.tgz";
+        sha512 = "3Ietq/r8B/CQu94qXr4YrNE79p5emhtMI6szHh/cD9xz1/6OOUwW/agcCO1748v94jjxOFEspAvva6jGVriuGA==";
       };
     };
     "@textlint/ast-node-types-4.3.4" = {
@@ -5854,13 +5863,13 @@ let
         sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==";
       };
     };
-    "@types/lodash-4.14.164" = {
+    "@types/lodash-4.14.165" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
-      version = "4.14.164";
+      version = "4.14.165";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.164.tgz";
-        sha512 = "fXCEmONnrtbYUc5014avwBeMdhHHO8YJCkOBflUL9EoJBSKZ1dei+VO74fA7JkTHZ1GvZack2TyIw5U+1lT8jg==";
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.165.tgz";
+        sha512 = "tjSSOTHhI5mCHTy/OOXYIhi2Wt1qcbHmuXD1Ha7q70CgI/I71afO4XtLb/cVexki1oVYchpul/TOuu3Arcdxrg==";
       };
     };
     "@types/long-4.0.1" = {
@@ -6340,22 +6349,13 @@ let
         sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw==";
       };
     };
-    "@types/vscode-1.50.0" = {
+    "@types/vscode-1.51.0" = {
       name = "_at_types_slash_vscode";
       packageName = "@types/vscode";
-      version = "1.50.0";
+      version = "1.51.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.50.0.tgz";
-        sha512 = "QnIeyi4L2DiD9M2bAQKRzT/EQvc80qP9UL6JD5TiLlNRL1khIDg4ej4mDSRbtFrDAsRntFI1RhMvdomUThMsqg==";
-      };
-    };
-    "@types/webpack-4.41.21" = {
-      name = "_at_types_slash_webpack";
-      packageName = "@types/webpack";
-      version = "4.41.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.21.tgz";
-        sha512 = "2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA==";
+        url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.51.0.tgz";
+        sha512 = "C/jZ35OT5k/rsJyAK8mS1kM++vMcm89oSWegkzxRCvHllIq0cToZAkIDs6eCY4SKrvik3nrhELizyLcM0onbQA==";
       };
     };
     "@types/webpack-4.41.24" = {
@@ -6511,22 +6511,22 @@ let
         sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";
       };
     };
-    "@uifabric/foundation-7.9.18" = {
+    "@uifabric/foundation-7.9.19" = {
       name = "_at_uifabric_slash_foundation";
       packageName = "@uifabric/foundation";
-      version = "7.9.18";
+      version = "7.9.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.18.tgz";
-        sha512 = "xDDuKAyYNEppKF7lFqolUTQoIYbv70f2teLudsh0yeRDVoISNT4A87nDc/Xa4bkTwttc9Di+D1HEZWP9Wqpj1w==";
+        url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.19.tgz";
+        sha512 = "F/kKiFL4uSiosnqdv1BT3aQ3w9bQ3l+F3NiMqDbJpnlBAOMOlH2X7xAxZsNYbS66pgTPKsSP/8/SK3A+0wzMXg==";
       };
     };
-    "@uifabric/icons-7.5.15" = {
+    "@uifabric/icons-7.5.16" = {
       name = "_at_uifabric_slash_icons";
       packageName = "@uifabric/icons";
-      version = "7.5.15";
+      version = "7.5.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.15.tgz";
-        sha512 = "jNrPY7lsEs7gPUXokIYFxZs4TuX5Xiivx/KtxtoZKM4cpurLJx3ddCyOMp+kNn1ljzaNKNbcJae/ONB/jMJkQA==";
+        url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.16.tgz";
+        sha512 = "S+KGDZeN9y5sBJfg7Jgi3/598CxE0hvlMtl1XzzftKPdD2Jw8QCQazgYFqG8iZj6R5ILFjezoDr+yXYj6dMXMQ==";
       };
     };
     "@uifabric/merge-styles-7.19.1" = {
@@ -6556,13 +6556,13 @@ let
         sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA==";
       };
     };
-    "@uifabric/styling-7.16.16" = {
+    "@uifabric/styling-7.16.17" = {
       name = "_at_uifabric_slash_styling";
       packageName = "@uifabric/styling";
-      version = "7.16.16";
+      version = "7.16.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.16.tgz";
-        sha512 = "FFRXMjRPCagj+fN1o8O/FsbO7jHqVKEJyKT5j+zCwl0yBx5XqbQLcX9wzAEdBItB4anlgO7C5ZtFBUholwcCiA==";
+        url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.17.tgz";
+        sha512 = "9TZP5npZopaQUkb7V418bu2OzqjL+4uov9n59Kh/Ll2Bq9WyWg/kngGUMX793gxjOMy9w2IUEd2LN3odM05OlQ==";
       };
     };
     "@uifabric/utilities-7.33.2" = {
@@ -7159,22 +7159,22 @@ let
         sha512 = "tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w==";
       };
     };
-    "@webpack-cli/info-1.0.2" = {
+    "@webpack-cli/info-1.1.0" = {
       name = "_at_webpack-cli_slash_info";
       packageName = "@webpack-cli/info";
-      version = "1.0.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.0.2.tgz";
-        sha512 = "FEfLQwmN4pXZSYSrtp+KC84rFanoCIxXFpS2wUvviDCE2fnajwxw2GXzbj83IlH4Dl8Wq8kJjavVwvxv3YJmnw==";
+        url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.1.0.tgz";
+        sha512 = "uNWSdaYHc+f3LdIZNwhdhkjjLDDl3jP2+XBqAq9H8DjrJUvlOKdP8TNruy1yEaDfgpAIgbSAN7pye4FEHg9tYQ==";
       };
     };
-    "@webpack-cli/serve-1.0.1" = {
+    "@webpack-cli/serve-1.1.0" = {
       name = "_at_webpack-cli_slash_serve";
       packageName = "@webpack-cli/serve";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.0.1.tgz";
-        sha512 = "WGMaTMTK6NOe29Hw1WBEok9vGLfKg5C6jWzNOS/6HH1YadR+RL+TRWRcSyc81Dzulljhk/Ree9mrDM4Np9GGOQ==";
+        url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.1.0.tgz";
+        sha512 = "7RfnMXCpJ/NThrhq4gYQYILB18xWyoQcBey81oIyVbmgbc6m5ZHHyFK+DyH7pLHJf0p14MxL4mTsoPAgBSTpIg==";
       };
     };
     "@wry/context-0.4.4" = {
@@ -7807,15 +7807,6 @@ let
         sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
       };
     };
-    "ajv-6.12.3" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "6.12.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz";
-        sha512 = "4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==";
-      };
-    };
     "ajv-6.12.4" = {
       name = "ajv";
       packageName = "ajv";
@@ -8347,13 +8338,13 @@ let
         sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw==";
       };
     };
-    "apollo-2.31.0" = {
+    "apollo-2.31.1" = {
       name = "apollo";
       packageName = "apollo";
-      version = "2.31.0";
+      version = "2.31.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo/-/apollo-2.31.0.tgz";
-        sha512 = "galQp/6UAiP+Aa2WtJZPIPPAiQqR6Um/fe0cOC8wu3c1BmXF2fHzjj2NSOv7xqAHZPyBRn/ixIe0aVUy3gcCLw==";
+        url = "https://registry.npmjs.org/apollo/-/apollo-2.31.1.tgz";
+        sha512 = "qx64LGc09GSwpEIUbRJX90zq6ixVsgo6ZPGuCsDTY83Lz5ITMeXIs7+CF/1oAU1IzEI+YRMVsFTkK2aIBZzSYA==";
       };
     };
     "apollo-cache-1.3.5" = {
@@ -8392,49 +8383,49 @@ let
         sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA==";
       };
     };
-    "apollo-codegen-core-0.38.0" = {
+    "apollo-codegen-core-0.38.1" = {
       name = "apollo-codegen-core";
       packageName = "apollo-codegen-core";
-      version = "0.38.0";
+      version = "0.38.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.38.0.tgz";
-        sha512 = "NZnmS1qWFSlYaraxyi9q4uVFDGktr3IgQmgGI5Jj7iBY5iFTNJIIDXb2ufB8UvLBF3eKqHR9VxpQIAi4wfo8+w==";
+        url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.38.1.tgz";
+        sha512 = "LOeLQdSeKnHJBYxjhrJ/4b8RR9V4f9QhUAB/wYyJ7g8eCT4ZcjdGdwQ/KnijI0GmrWaz+t4Z5zn3wpXaudn7bA==";
       };
     };
-    "apollo-codegen-flow-0.36.0" = {
+    "apollo-codegen-flow-0.36.1" = {
       name = "apollo-codegen-flow";
       packageName = "apollo-codegen-flow";
-      version = "0.36.0";
+      version = "0.36.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.36.0.tgz";
-        sha512 = "OJ3aRqxbI63NnUrUrPaindeXCI9bOCGmIHoENGGXwNrtS229lUJ9b6rTelqyfAwKau8AysJQoMfAclula3Br7A==";
+        url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.36.1.tgz";
+        sha512 = "+986zLn9gA44fKF+7iKrPrtSN0cCtlgXeqBHZFujcyGaWWzra8+/lj23L+toFCT+FI93KYGZLqslrlwoMbcD3g==";
       };
     };
-    "apollo-codegen-scala-0.37.0" = {
+    "apollo-codegen-scala-0.37.1" = {
       name = "apollo-codegen-scala";
       packageName = "apollo-codegen-scala";
-      version = "0.37.0";
+      version = "0.37.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.37.0.tgz";
-        sha512 = "Wsvd/eF6XBnzJvl1AceiAXw3pFwGYWyKXWbCzneuNHggf3ONc09V0zPQ2dqcsMnslIn6y+HnZav9rQB/iJNNEQ==";
+        url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.37.1.tgz";
+        sha512 = "+pSDQ4MbGZNbQ1VgfHK0P+w+iDoIHDQ2Bq7WhjX8ZayKTpLb/X9eWYMzrfQRtr0uDrXbbPkM0YGj1kcdGehINw==";
       };
     };
-    "apollo-codegen-swift-0.38.0" = {
+    "apollo-codegen-swift-0.38.1" = {
       name = "apollo-codegen-swift";
       packageName = "apollo-codegen-swift";
-      version = "0.38.0";
+      version = "0.38.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.38.0.tgz";
-        sha512 = "kUoDUOOY3h7fUg4hpNNZrQl+bfPzwxN49pl8lrGoEB8uvgaCBj5C77NbHTISomSk1OzdT8uVlm4l4oJiMsT28g==";
+        url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.38.1.tgz";
+        sha512 = "VJROl4GQzDJn8EnFX6IEP/G1KMeHZblD/Mrbweza+3Kel4wH6SpD533Jc/W4pd4pxdzbhbmfXkJSzkL/xPIvbg==";
       };
     };
-    "apollo-codegen-typescript-0.38.0" = {
+    "apollo-codegen-typescript-0.38.1" = {
       name = "apollo-codegen-typescript";
       packageName = "apollo-codegen-typescript";
-      version = "0.38.0";
+      version = "0.38.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.38.0.tgz";
-        sha512 = "sEAIoE38ASFtqU7bhj31vtSRLKix5H8ltwvU9MRMbpgWfos/r29krKrNSJi8DeouC1/QSQAOaFzsghCMe5fkrQ==";
+        url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.38.1.tgz";
+        sha512 = "UAHh1HliM8ahraF7csRYrbhrYhDcgqlE0PEu1WwqFISE1r7wRtLZXg+ic25iyRpTIZqkB8mfkym20Z5nZgmNbw==";
       };
     };
     "apollo-datasource-0.7.2" = {
@@ -8464,13 +8455,13 @@ let
         sha512 = "BxTf5LOQe649e9BNTPdyCGItVv4Ll8wZ2BKnmiYpRAocYEXAVrQPWuSr3dO4iipqAU8X0gvle/Xu9mSqg5b7Qg==";
       };
     };
-    "apollo-language-server-1.24.0" = {
+    "apollo-language-server-1.24.1" = {
       name = "apollo-language-server";
       packageName = "apollo-language-server";
-      version = "1.24.0";
+      version = "1.24.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.24.0.tgz";
-        sha512 = "n1o1QmQ6hQcl5Rx+K23yO9MrDcF94Xygychn1pxJG5xKEZ8kkKxqNqjUhjFxIN908LJ4yuFjTW6OEtEym4haxg==";
+        url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.24.1.tgz";
+        sha512 = "2LYW/pWWBkG0/BggMedZ3EEHAQIKFc9PxHroxKhXh2Y5SXha4yQmmFILloQFrA6z7fU39IF6Tudgt5yNw2Cw/w==";
       };
     };
     "apollo-link-1.2.1" = {
@@ -9877,13 +9868,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.784.0" = {
+    "aws-sdk-2.786.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.784.0";
+      version = "2.786.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.784.0.tgz";
-        sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.786.0.tgz";
+        sha512 = "oL+rDkoBdn0Q3AxiEzSemCE3WqW6kBf0A72SIjDQZJb4/NDvA2mL2rpNQGaxaFX3zMHEwfUGcMu7T3q7I6Q0lw==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -10984,6 +10975,15 @@ let
         sha512 = "hJmWKucJQfdSkQPDPBKmWogM9s8+NOSzDT9QVbJbjinXaQ0bJKPu/cn98qRWy3PDNWtKw4XaoUP3XruGRIKEgg==";
       };
     };
+    "bitfield-4.0.0" = {
+      name = "bitfield";
+      packageName = "bitfield";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bitfield/-/bitfield-4.0.0.tgz";
+        sha512 = "jtuSG9CQr5yoHFuvhgf50+DH8Aezl3C/mMSfqdG4DqP7Kqe34uBUtCEHPN9oWaldTm96/i7y5e778SnM5ES4rw==";
+      };
+    };
     "bitfield-rle-2.2.1" = {
       name = "bitfield-rle";
       packageName = "bitfield-rle";
@@ -11020,6 +11020,15 @@ let
         sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ==";
       };
     };
+    "bittorrent-lsd-1.0.0" = {
+      name = "bittorrent-lsd";
+      packageName = "bittorrent-lsd";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bittorrent-lsd/-/bittorrent-lsd-1.0.0.tgz";
+        sha512 = "rM3ECQrtEiE1ef5TTdQbWJgbpd4NQur3bxrNs0r5VPcYfnFhXT85m75+whkyV5NIwNsndS7M/D+Uf/Mi/BUrWg==";
+      };
+    };
     "bittorrent-peerid-1.3.3" = {
       name = "bittorrent-peerid";
       packageName = "bittorrent-peerid";
@@ -11029,13 +11038,13 @@ let
         sha512 = "tSh9HdQgwyEAfo1jzoGEis6o/zs4CcdRTchG93XVl5jct+DCAN90M5MVUV76k2vJ9Xg3GAzLB5NLsY/vnVTh6w==";
       };
     };
-    "bittorrent-protocol-3.1.2" = {
+    "bittorrent-protocol-3.2.0" = {
       name = "bittorrent-protocol";
       packageName = "bittorrent-protocol";
-      version = "3.1.2";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.2.tgz";
-        sha512 = "vjKcxwQ/rDd3FeqImBZXLKk14eawf8sXVXPJd8LgrTZmpDzCn8kquhNIiYbE7M3SybAQ1r5uILJ7f2V2TlT8bQ==";
+        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.2.0.tgz";
+        sha512 = "8xgCgK8xUg7MXZBxhqJapZy9hexHwN2TCD+b8m4yWg56/ZFfdkULxhxQkzuhpXyUfvKIKxeRzGmLT43li7FDKg==";
       };
     };
     "bittorrent-tracker-7.7.0" = {
@@ -11821,13 +11830,13 @@ let
         sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==";
       };
     };
-    "buffer-5.7.0" = {
+    "buffer-5.7.1" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.7.0";
+      version = "5.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.7.0.tgz";
-        sha512 = "cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg==";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz";
+        sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==";
       };
     };
     "buffer-alloc-1.2.0" = {
@@ -12550,13 +12559,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001154" = {
+    "caniuse-lite-1.0.30001156" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001154";
+      version = "1.0.30001156";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz";
-        sha512 = "y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001156.tgz";
+        sha512 = "z7qztybA2eFZTB6Z3yvaQBIoJpQtsewRD74adw2UbRWwsRq3jIPvgrQGawBMbfafekQaD21FWuXNcywtTDGGCw==";
       };
     };
     "canvas-2.6.1" = {
@@ -13081,15 +13090,6 @@ let
         sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==";
       };
     };
-    "chokidar-3.4.2" = {
-      name = "chokidar";
-      packageName = "chokidar";
-      version = "3.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz";
-        sha512 = "IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==";
-      };
-    };
     "chokidar-3.4.3" = {
       name = "chokidar";
       packageName = "chokidar";
@@ -13378,6 +13378,15 @@ let
         sha512 = "eDu0vN44ZBvoEU0oRIKwWPIccGWXtdnUNmKJuTukZ1de00Uoqavb5pfIMKiC7/r+knQ5RbvAjGuVZiN3JwJL4Q==";
       };
     };
+    "clean-stack-1.3.0" = {
+      name = "clean-stack";
+      packageName = "clean-stack";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz";
+        sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31";
+      };
+    };
     "clean-stack-2.2.0" = {
       name = "clean-stack";
       packageName = "clean-stack";
@@ -13594,6 +13603,15 @@ let
         sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA==";
       };
     };
+    "cli-ux-5.4.6" = {
+      name = "cli-ux";
+      packageName = "cli-ux";
+      version = "5.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.6.tgz";
+        sha512 = "EeiS2TzEndRVknCqE+8Ri8g0bsP617a1nq6n+3Trwft1JCDzyUNlX2J1fl7fwTgRPWtmBmiF6xIyueL5YGs65g==";
+      };
+    };
     "cli-ux-5.5.0" = {
       name = "cli-ux";
       packageName = "cli-ux";
@@ -15161,13 +15179,13 @@ let
         sha512 = "jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==";
       };
     };
-    "conventional-changelog-angular-5.0.11" = {
+    "conventional-changelog-angular-5.0.12" = {
       name = "conventional-changelog-angular";
       packageName = "conventional-changelog-angular";
-      version = "5.0.11";
+      version = "5.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.11.tgz";
-        sha512 = "nSLypht/1yEflhuTogC03i7DX7sOrXGsRn14g131Potqi6cbGbGEE9PSDEHKldabB6N76HiSyw9Ph+kLmC04Qw==";
+        url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz";
+        sha512 = "5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw==";
       };
     };
     "conventional-changelog-core-3.2.3" = {
@@ -15188,31 +15206,31 @@ let
         sha512 = "GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==";
       };
     };
-    "conventional-changelog-writer-4.0.17" = {
+    "conventional-changelog-writer-4.0.18" = {
       name = "conventional-changelog-writer";
       packageName = "conventional-changelog-writer";
-      version = "4.0.17";
+      version = "4.0.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.17.tgz";
-        sha512 = "IKQuK3bib/n032KWaSb8YlBFds+aLmzENtnKtxJy3+HqDq5kohu3g/UdNbIHeJWygfnEbZjnCKFxAW0y7ArZAw==";
+        url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.18.tgz";
+        sha512 = "mAQDCKyB9HsE8Ko5cCM1Jn1AWxXPYV0v8dFPabZRkvsiWUul2YyAqbIaoMKF88Zf2ffnOPSvKhboLf3fnjo5/A==";
       };
     };
-    "conventional-commits-filter-2.0.6" = {
+    "conventional-commits-filter-2.0.7" = {
       name = "conventional-commits-filter";
       packageName = "conventional-commits-filter";
-      version = "2.0.6";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.6.tgz";
-        sha512 = "4g+sw8+KA50/Qwzfr0hL5k5NWxqtrOVw4DDk3/h6L85a9Gz0/Eqp3oP+CWCNfesBvZZZEFHF7OTEbRe+yYSyKw==";
+        url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz";
+        sha512 = "ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==";
       };
     };
-    "conventional-commits-parser-3.1.0" = {
+    "conventional-commits-parser-3.2.0" = {
       name = "conventional-commits-parser";
       packageName = "conventional-commits-parser";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.1.0.tgz";
-        sha512 = "RSo5S0WIwXZiRxUGTPuYFbqvrR4vpJ1BDdTlthFgvHt5kEdnd1+pdvwWphWn57/oIl4V72NMmOocFqqJ8mFFhA==";
+        url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz";
+        sha512 = "XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ==";
       };
     };
     "conventional-recommended-bump-5.0.1" = {
@@ -15494,13 +15512,22 @@ let
         sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==";
       };
     };
-    "core-js-compat-3.6.5" = {
+    "core-js-3.7.0" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "3.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz";
+        sha512 = "NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==";
+      };
+    };
+    "core-js-compat-3.7.0" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.6.5";
+      version = "3.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz";
-        sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz";
+        sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -16835,13 +16862,13 @@ let
         sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw==";
       };
     };
-    "dayjs-1.9.4" = {
+    "dayjs-1.9.5" = {
       name = "dayjs";
       packageName = "dayjs";
-      version = "1.9.4";
+      version = "1.9.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.4.tgz";
-        sha512 = "ABSF3alrldf7nM9sQ2U+Ln67NRwmzlLOqG7kK03kck0mw3wlSSEKv/XhKGGxUjQcS57QeiCyNdrFgtj9nWlrng==";
+        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.5.tgz";
+        sha512 = "WULIw7UpW/E0y6VywewpbXAMH3d5cZijEhoHLwM+OMVbk/NtchKS/W+57H/0P1rqU7gHrAArjiRLHCUhgMQl6w==";
       };
     };
     "deasync-0.1.15" = {
@@ -19004,13 +19031,13 @@ let
         sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
       };
     };
-    "electron-to-chromium-1.3.587" = {
+    "electron-to-chromium-1.3.589" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.587";
+      version = "1.3.589";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.587.tgz";
-        sha512 = "8XFNxzNj0R8HpTQslWAw6UWpGSuOKSP3srhyFHVbGUGb8vTHckZGCyWi+iQlaXJx5DNeTQTQLd6xN11WSckkmA==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.589.tgz";
+        sha512 = "rQItBTFnol20HaaLm26UgSUduX7iGerwW7pEYX17MB1tI6LzFajiLV7iZ7LVcUcsN/7HrZUoCLrBauChy/IqEg==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -19320,6 +19347,15 @@ let
         sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==";
       };
     };
+    "engine.io-4.0.1" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.1.tgz";
+        sha512 = "6EaSBxasBUwxRdf6B68SEYpD3tcrG80J4YTzHl/D+9Q+vM0AMHZabfYcc2WdnvEaQxZjX/UZsa+UdGoM0qQQkQ==";
+      };
+    };
     "engine.io-client-1.3.1" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
@@ -19356,6 +19392,15 @@ let
         sha512 = "x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==";
       };
     };
+    "engine.io-parser-4.0.1" = {
+      name = "engine.io-parser";
+      packageName = "engine.io-parser";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.1.tgz";
+        sha512 = "v5aZK1hlckcJDGmHz3W8xvI3NUHYc9t8QtTbqdR5OaH3S9iJZilPubauOm+vLWOMMWzpE3hiq92l9lTAHamRCg==";
+      };
+    };
     "enhanced-resolve-2.3.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
@@ -20769,13 +20814,13 @@ let
         sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929";
       };
     };
-    "expo-pwa-0.0.48" = {
+    "expo-pwa-0.0.49" = {
       name = "expo-pwa";
       packageName = "expo-pwa";
-      version = "0.0.48";
+      version = "0.0.49";
       src = fetchurl {
-        url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.48.tgz";
-        sha512 = "4KaL0+YhFxS9zrpQG/BNW+fxMldvgx9dM16b6sZ2t7eMkDlUO7Vo6B+zxeg5l/naP27CA02bMUkeEHr61Y5ojA==";
+        url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.49.tgz";
+        sha512 = "HzwUGdnN9g5Ov/3r2uXwyjYP0xNtgOre1Z+Cywxg7GQWoFiklBfvYraIQFfwOjXVnsgo7bF4GFd4QW4v5vi9wA==";
       };
     };
     "express-2.5.11" = {
@@ -21831,15 +21876,6 @@ let
         sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==";
       };
     };
-    "find-process-1.4.4" = {
-      name = "find-process";
-      packageName = "find-process";
-      version = "1.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-process/-/find-process-1.4.4.tgz";
-        sha512 = "rRSuT1LE4b+BFK588D2V8/VG9liW0Ark1XJgroxZXI0LtwmQJOb490DvDYvbm+Hek9ETFzTutGfJ90gumITPhQ==";
-      };
-    };
     "find-requires-1.0.0" = {
       name = "find-requires";
       packageName = "find-requires";
@@ -22434,13 +22470,13 @@ let
         sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ==";
       };
     };
-    "fork-ts-checker-webpack-plugin-5.1.0" = {
+    "fork-ts-checker-webpack-plugin-5.2.1" = {
       name = "fork-ts-checker-webpack-plugin";
       packageName = "fork-ts-checker-webpack-plugin";
-      version = "5.1.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.1.0.tgz";
-        sha512 = "vuKyEjSLGbhQbEr5bifXXOkr9iV73L6n72mHoHIv7okvrf7O7z6RKeplM6C6ATPsukoQivij+Ba1vcptL60Z2g==";
+        url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz";
+        sha512 = "SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==";
       };
     };
     "form-data-1.0.0-rc3" = {
@@ -22911,13 +22947,13 @@ let
         sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==";
       };
     };
-    "fsevents-2.2.0" = {
+    "fsevents-2.2.1" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.0.tgz";
-        sha512 = "pKnaUh2TNvk+/egJdBw1h46LwyLx8BzEq+MGCf/RMCVfEHHsGOCWG00dqk91kUPPArIIwMBg9T/virxwzP03cA==";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.1.tgz";
+        sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA==";
       };
     };
     "fstream-0.1.31" = {
@@ -23586,15 +23622,6 @@ let
         sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ==";
       };
     };
-    "git-url-parse-11.2.0" = {
-      name = "git-url-parse";
-      packageName = "git-url-parse";
-      version = "11.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.2.0.tgz";
-        sha512 = "KPoHZg8v+plarZvto4ruIzzJLFQoRx+sUs5DQSr07By9IBKguVd+e6jwrFR6/TP6xrCJlNV1tPqLO1aREc7O2g==";
-      };
-    };
     "git-url-parse-11.4.0" = {
       name = "git-url-parse";
       packageName = "git-url-parse";
@@ -26684,15 +26711,6 @@ let
         sha512 = "Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==";
       };
     };
-    "inquirer-7.1.0" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "7.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz";
-        sha512 = "5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==";
-      };
-    };
     "inquirer-7.3.3" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -27278,13 +27296,13 @@ let
         sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345";
       };
     };
-    "is-core-module-2.0.0" = {
+    "is-core-module-2.1.0" = {
       name = "is-core-module";
       packageName = "is-core-module";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz";
-        sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==";
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz";
+        sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==";
       };
     };
     "is-data-descriptor-0.1.4" = {
@@ -29420,13 +29438,13 @@ let
         sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==";
       };
     };
-    "jsonata-1.8.3" = {
+    "jsonata-1.8.4" = {
       name = "jsonata";
       packageName = "jsonata";
-      version = "1.8.3";
+      version = "1.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.3.tgz";
-        sha512 = "r6ztI6ohbpRo77AxBm6vMs3aHZi2L2PaakW7TCPwSkeGcuAZ/SxXGLWH2Npwqq5+YBM/fg/g0EXg/pI9HvXQ8Q==";
+        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.4.tgz";
+        sha512 = "OqzmM5IICtm/687zckG5BROZzInGCEuKojpYs48H8RnkII8Np+o912ryvhnYwsRrSI24TQRG/qqrSwBuaneDbg==";
       };
     };
     "jsonc-parser-1.0.3" = {
@@ -29726,13 +29744,13 @@ let
         sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79";
       };
     };
-    "jwt-decode-3.0.0" = {
+    "jwt-decode-3.1.1" = {
       name = "jwt-decode";
       packageName = "jwt-decode";
-      version = "3.0.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.0.0.tgz";
-        sha512 = "RBQv2MTm3FNKQkdzhEyQwh5MbdNgMa+FyIJIK5RMWEn6hRgRHr7j55cRxGhRe6vGJDElyi6f6u/yfkP7AoXddA==";
+        url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.1.tgz";
+        sha512 = "EaH9dTD9ogCmxZRdiTsIUIJslqjoFfk8nEAi+Bq8u/aUjrVuhZ6eZjhWRH6SC9NBA0Lwr3K35H2zDnWvK/n4vQ==";
       };
     };
     "k-bucket-0.6.0" = {
@@ -33228,13 +33246,13 @@ let
         sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==";
       };
     };
-    "marked-1.2.2" = {
+    "marked-1.2.3" = {
       name = "marked";
       packageName = "marked";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-1.2.2.tgz";
-        sha512 = "5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ==";
+        url = "https://registry.npmjs.org/marked/-/marked-1.2.3.tgz";
+        sha512 = "RQuL2i6I6Gn+9n81IDNGbL0VHnta4a+8ZhqvryXEniTb/hQNtf3i26hi1XWUhzb9BgVyWHKR3UO8MaHtKoYibw==";
       };
     };
     "marked-terminal-4.1.0" = {
@@ -33741,15 +33759,6 @@ let
         sha512 = "qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA==";
       };
     };
-    "memorystore-1.6.2" = {
-      name = "memorystore";
-      packageName = "memorystore";
-      version = "1.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.2.tgz";
-        sha512 = "HQM+cZB/kY1+jj57It22FsptJ3nuZRYxnwh3rWZEvDZO1zuzhIrX9uyFcjP9AhFQvM5WS6vZKtn3veohDH4S7w==";
-      };
-    };
     "memorystore-1.6.4" = {
       name = "memorystore";
       packageName = "memorystore";
@@ -33822,6 +33831,15 @@ let
         sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==";
       };
     };
+    "meow-8.0.0" = {
+      name = "meow";
+      packageName = "meow";
+      version = "8.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/meow/-/meow-8.0.0.tgz";
+        sha512 = "nbsTRz2fwniJBFgUkcdISq8y/q9n9VbiHYbfwklFh5V4V2uAcxtKQkDc0yCLPM/kP0d+inZBewn3zJqewHE7kg==";
+      };
+    };
     "merge-1.2.1" = {
       name = "merge";
       packageName = "merge";
@@ -34776,15 +34794,6 @@ let
         sha512 = "Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==";
       };
     };
-    "moment-2.28.0" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.28.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.28.0.tgz";
-        sha512 = "Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw==";
-      };
-    };
     "moment-2.29.1" = {
       name = "moment";
       packageName = "moment";
@@ -34902,13 +34911,13 @@ let
         sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw==";
       };
     };
-    "mqtt-4.2.1" = {
+    "mqtt-4.2.4" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "4.2.1";
+      version = "4.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.1.tgz";
-        sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg==";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.4.tgz";
+        sha512 = "g3tJt5UOS1Wqn/xntl4JhlJW51OM8CvgEmY8cwZ1zecE5G7uuwjSUUvgGeVDiEMWJ5vXCfZz2VMCQGNvKhzfEQ==";
       };
     };
     "mqtt-packet-6.6.0" = {
@@ -36290,13 +36299,13 @@ let
         sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==";
       };
     };
-    "node-html-parser-1.4.6" = {
+    "node-html-parser-1.4.8" = {
       name = "node-html-parser";
       packageName = "node-html-parser";
-      version = "1.4.6";
+      version = "1.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.6.tgz";
-        sha512 = "VgX2Bk8dq59yFeNC46LdA6VzRXffOPVNOMoeZquACZVwbC1VYJ3ssd5/mncTBGBrd3M+t6cMD5KQWdK/l+qPFQ==";
+        url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.8.tgz";
+        sha512 = "goyDL2T1qnepirf64Qu1ttJ2UZmNGp1CPbG3pkh2VYc1yqzgPX0rjKN7vqThFcZmEIzC+ratLIod1O/MNXwgzg==";
       };
     };
     "node-int64-0.4.0" = {
@@ -36668,6 +36677,15 @@ let
         sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
       };
     };
+    "normalize-package-data-3.0.0" = {
+      name = "normalize-package-data";
+      packageName = "normalize-package-data";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.0.tgz";
+        sha512 = "6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==";
+      };
+    };
     "normalize-path-2.1.1" = {
       name = "normalize-path";
       packageName = "normalize-path";
@@ -37560,13 +37578,13 @@ let
         sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==";
       };
     };
-    "office-ui-fabric-react-7.149.3" = {
+    "office-ui-fabric-react-7.149.4" = {
       name = "office-ui-fabric-react";
       packageName = "office-ui-fabric-react";
-      version = "7.149.3";
+      version = "7.149.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.149.3.tgz";
-        sha512 = "R0iqyTGX8l+cUB5h8SvhB/i5QexNhlXP8GW3j5NCb8U0ZiEuTVpxCCMDua/0Mmdj6MZmcK/hcL9gmK6ZPUe6qg==";
+        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.149.4.tgz";
+        sha512 = "9gfzIGlQr9tijkR10S+chRkNhxtyf2bonPFwTvJh/vrJ3R2/CHanHEWh+k4KUjsz2+4bf/+aRY5mjKCpEG65qA==";
       };
     };
     "omggif-1.0.10" = {
@@ -37830,13 +37848,13 @@ let
         sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow==";
       };
     };
-    "openapi-framework-7.0.2" = {
+    "openapi-framework-7.1.0" = {
       name = "openapi-framework";
       packageName = "openapi-framework";
-      version = "7.0.2";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.0.2.tgz";
-        sha512 = "62gOWK5iq75HJVS0KWKuLXR7CYynjrbvgxLrTc0Tr0fTcI9ZiJV61KDmz9bz37rHhk/uQIVSMMuTjTC8bmyQtA==";
+        url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.1.0.tgz";
+        sha512 = "GB1TUdv51fYKdvzy0Xg3fLtsuHXJY0v0PR6XGjdSKgxLYK8PA1/dQfxtTRftzx7XVI6uMegdG8aCAPwYTsypWQ==";
       };
     };
     "openapi-jsonschema-parameters-1.2.0" = {
@@ -37866,13 +37884,13 @@ let
         sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ==";
       };
     };
-    "openapi-request-coercer-7.0.1" = {
+    "openapi-request-coercer-7.1.0" = {
       name = "openapi-request-coercer";
       packageName = "openapi-request-coercer";
-      version = "7.0.1";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.0.1.tgz";
-        sha512 = "nKSRnLX7KQ3Iu1TTZ+1PdEoz0Ke47vH4EcZIM9EOkdqadCFj2pSG/6oMcyqipCs2X7oMFi9Df/UGDRnTdzmPog==";
+        url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.1.0.tgz";
+        sha512 = "6nvSgvOvLYMkUBu3NbHQU6Lcol1WxDr0DsOe3oYHb2tZhokrNEuOF20QYPV+CGZYyEzc0f+Hdas774n5B0euLg==";
       };
     };
     "openapi-request-validator-4.2.0" = {
@@ -38028,13 +38046,13 @@ let
         sha512 = "xH6qaz/hS55rEX8xURz4HRUO96cpj821WY6UEG9rgcusZ8Jsq54jGWP1EMCjGvgngonw8vgSljM1i2OESv16Gw==";
       };
     };
-    "opentracing-0.14.4" = {
+    "opentracing-0.14.5" = {
       name = "opentracing";
       packageName = "opentracing";
-      version = "0.14.4";
+      version = "0.14.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.4.tgz";
-        sha512 = "nNnZDkUNExBwEpb7LZaeMeQgvrlO8l4bgY/LvGNZCR0xG/dGWqHqjKrAmR5GUoYo0FIz38kxasvA1aevxWs2CA==";
+        url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.5.tgz";
+        sha512 = "XLKtEfHxqrWyF1fzxznsv78w3csW41ucHnjiKnfzZLD5FN8UBDZZL1i4q0FR29zjxXhm+2Hop+5Vr/b8tKIvEg==";
       };
     };
     "opn-3.0.3" = {
@@ -38226,15 +38244,6 @@ let
         sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==";
       };
     };
-    "ora-4.0.4" = {
-      name = "ora";
-      packageName = "ora";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz";
-        sha512 = "77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==";
-      };
-    };
     "ora-4.1.1" = {
       name = "ora";
       packageName = "ora";
@@ -38343,6 +38352,15 @@ let
         sha512 = "h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==";
       };
     };
+    "os-name-4.0.0" = {
+      name = "os-name";
+      packageName = "os-name";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz";
+        sha512 = "caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg==";
+      };
+    };
     "os-shim-0.1.3" = {
       name = "os-shim";
       packageName = "os-shim";
@@ -38901,13 +38919,13 @@ let
         sha512 = "JcMmHiK6h6rcncj2HLayiyJZg28iJXJafXcmEGw2NjKH3WE8ZgSwyMZs7+f+aliPD57PDhB31IEgUtLXp0YZxA==";
       };
     };
-    "pacote-11.1.12" = {
+    "pacote-11.1.13" = {
       name = "pacote";
       packageName = "pacote";
-      version = "11.1.12";
+      version = "11.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-11.1.12.tgz";
-        sha512 = "suazooYMzefXr3glexAX4+q+qqH3wrzchtj+EivwiCCr/tsaHe9HtdHSx3R8YPjulAhojBZ2JkAVy13QwA8Jpg==";
+        url = "https://registry.npmjs.org/pacote/-/pacote-11.1.13.tgz";
+        sha512 = "oJ7Bg7p3izrIMhZPHCCHmMHQl+xb+pKBXL5ZYeM2oCZrw6sBRSx7f8l7F+95V2qA0BP3c1cNaaBmUNkbo6Hn9w==";
       };
     };
     "pacote-9.5.12" = {
@@ -39855,13 +39873,13 @@ let
         sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0";
       };
     };
-    "patrisika-0.21.0" = {
+    "patrisika-0.22.0" = {
       name = "patrisika";
       packageName = "patrisika";
-      version = "0.21.0";
+      version = "0.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz";
-        sha1 = "b82c27f7d4041522dc5c31b43b7c6efb19e47482";
+        url = "https://registry.npmjs.org/patrisika/-/patrisika-0.22.0.tgz";
+        sha512 = "2ug3pMunBT5js9S6+6cpt7KkfQA+nQ35nZi6aiiS6S0GdqvXhcsaSvOnczJosEZK9Xrar4j8t9J1VpNnVMrHWw==";
       };
     };
     "patrisika-scopes-0.11.1" = {
@@ -43024,13 +43042,13 @@ let
         sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==";
       };
     };
-    "query-string-6.13.6" = {
+    "query-string-6.13.7" = {
       name = "query-string";
       packageName = "query-string";
-      version = "6.13.6";
+      version = "6.13.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/query-string/-/query-string-6.13.6.tgz";
-        sha512 = "/WWZ7d9na6s2wMEGdVCVgKWE9Rt7nYyNIf7k8xmHXcesPMlEzicWo3lbYwHyA4wBktI2KrXxxZeACLbE84hvSQ==";
+        url = "https://registry.npmjs.org/query-string/-/query-string-6.13.7.tgz";
+        sha512 = "CsGs8ZYb39zu0WLkeOhe0NMePqgYdAuCqxOYKDR5LVCytDZYMGx3Bb+xypvQvPHVPijRXB0HZNFllCzHRe4gEA==";
       };
     };
     "querystring-0.2.0" = {
@@ -43816,15 +43834,6 @@ let
         sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==";
       };
     };
-    "readdirp-3.4.0" = {
-      name = "readdirp";
-      packageName = "readdirp";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz";
-        sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==";
-      };
-    };
     "readdirp-3.5.0" = {
       name = "readdirp";
       packageName = "readdirp";
@@ -45643,15 +45652,6 @@ let
         sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==";
       };
     };
-    "rxjs-6.5.5" = {
-      name = "rxjs";
-      packageName = "rxjs";
-      version = "6.5.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz";
-        sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==";
-      };
-    };
     "rxjs-6.6.2" = {
       name = "rxjs";
       packageName = "rxjs";
@@ -45670,13 +45670,13 @@ let
         sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==";
       };
     };
-    "s.color-0.0.13" = {
+    "s.color-0.0.15" = {
       name = "s.color";
       packageName = "s.color";
-      version = "0.0.13";
+      version = "0.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/s.color/-/s.color-0.0.13.tgz";
-        sha512 = "56rTWlPg3jQX5n2wv201gUBn8fSgnGwbNjN159FV+JeD4EeqZiVnhDASmivhE4+f9Ivzj59y5AgoFflsf25KwA==";
+        url = "https://registry.npmjs.org/s.color/-/s.color-0.0.15.tgz";
+        sha512 = "AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA==";
       };
     };
     "s3-stream-upload-2.0.2" = {
@@ -45823,13 +45823,13 @@ let
         sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==";
       };
     };
-    "sass-1.28.0" = {
+    "sass-1.29.0" = {
       name = "sass";
       packageName = "sass";
-      version = "1.28.0";
+      version = "1.29.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz";
-        sha512 = "9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A==";
+        url = "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz";
+        sha512 = "ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==";
       };
     };
     "sass-formatter-0.5.1" = {
@@ -47569,6 +47569,15 @@ let
         sha512 = "WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==";
       };
     };
+    "socket.io-adapter-2.0.3" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.0.3.tgz";
+        sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ==";
+      };
+    };
     "socket.io-client-1.0.6" = {
       name = "socket.io-client";
       packageName = "socket.io-client";
@@ -47632,6 +47641,15 @@ let
         sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==";
       };
     };
+    "socket.io-parser-4.0.1" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.1.tgz";
+        sha512 = "5JfNykYptCwU2lkOI0ieoePWm+6stEhkZ2UnLDjqnE1YEjUlXXLd1lpxPZ+g+h3rtaytwWkWrLQCaJULlGqjOg==";
+      };
+    };
     "sockjs-0.3.20" = {
       name = "sockjs";
       packageName = "sockjs";
@@ -50044,24 +50062,6 @@ let
         sha512 = "es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA==";
       };
     };
-    "suf-cli-0.1.3" = {
-      name = "suf-cli";
-      packageName = "suf-cli";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/suf-cli/-/suf-cli-0.1.3.tgz";
-        sha512 = "dM85t6+egHKKM7ChM1JpkZUeXNczRb7vAQN3Y8UAyRjeW6UvfChPi8YbV73eTUBp6N7VfKqwwrsYsbdEb/u0Rg==";
-      };
-    };
-    "suf-node-1.2.1" = {
-      name = "suf-node";
-      packageName = "suf-node";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/suf-node/-/suf-node-1.2.1.tgz";
-        sha512 = "LFLshqEwm1bXd3fEl0STYXZzEHbAz8HwsyItA8vvxhMZrIo+CpB7RrtLvor6mk+7SdfgJhmV3RdIdDIcPAJTTg==";
-      };
-    };
     "suf-regex-0.0.25" = {
       name = "suf-regex";
       packageName = "suf-regex";
@@ -50467,13 +50467,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.27.11" = {
+    "systeminformation-4.28.1" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.27.11";
+      version = "4.28.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.11.tgz";
-        sha512 = "U7bigXbOnsB8k1vNHS0Y13RCsRz5/UohiUmND+3mMUL6vfzrpbe/h4ZqewowB+B+tJNnmGFDj08Z8xGfYo45dQ==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.28.1.tgz";
+        sha512 = "g9WQy+Igsf0efbbTlXzDkV7iYeUerFJeqI/zh07F9sWHxclejmXn5hrGdgHf2ok+1DuRmC9t4mEh7XS0b8Zk9w==";
       };
     };
     "syswide-cas-5.3.0" = {
@@ -51854,13 +51854,13 @@ let
         sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29";
       };
     };
-    "torrent-discovery-9.3.0" = {
+    "torrent-discovery-9.4.0" = {
       name = "torrent-discovery";
       packageName = "torrent-discovery";
-      version = "9.3.0";
+      version = "9.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.3.0.tgz";
-        sha512 = "rdOfm+o6d+E+nRjeYiCzXGrM9ou7spkZpxu9xhnfKoTJgtWpSYEHXO4BT9hwVF1uoUpm+hOwNnwgkSfBZNMh7g==";
+        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.0.tgz";
+        sha512 = "+YW9JGbO5bCuDw9YYW//p4iVLV0aP4C+AYrNQjL/+dSNPUtD1ufK1V8UZERt6rIoeNGhutkSVyeO4Fid9Tjxjg==";
       };
     };
     "torrent-piece-1.1.2" = {
@@ -52601,6 +52601,15 @@ let
         sha512 = "eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==";
       };
     };
+    "type-fest-0.18.0" = {
+      name = "type-fest";
+      packageName = "type-fest";
+      version = "0.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.18.0.tgz";
+        sha512 = "fbDukFPnJBdn2eZ3RR+5mK2slHLFd6gYHY7jna1KWWy4Yr4XysHuCdXRzy+RiG/HwG4WJat00vdC2UHky5eKiQ==";
+      };
+    };
     "type-fest-0.3.1" = {
       name = "type-fest";
       packageName = "type-fest";
@@ -52826,13 +52835,13 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.11.2" = {
+    "uglify-js-3.11.4" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.11.2";
+      version = "3.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.2.tgz";
-        sha512 = "G440NU6fewtnQftSgqRV1r2A5ChKbU1gqFCJ7I8S7MPpY/eZZfLGefaY6gUZYiWebMaO+txgiQ1ZyLDuNWJulg==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.4.tgz";
+        sha512 = "FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw==";
       };
     };
     "uglify-js-3.11.5" = {
@@ -54114,13 +54123,13 @@ let
         sha256 = "e23c172456a8fa0af48dba3f89ca0d525dd870408f7bd6ad1d776cdbe13f0489";
       };
     };
-    "ut_metadata-3.5.1" = {
+    "ut_metadata-3.5.2" = {
       name = "ut_metadata";
       packageName = "ut_metadata";
-      version = "3.5.1";
+      version = "3.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.5.1.tgz";
-        sha512 = "D98YM9dKGHzNFUuqLHLV1vXqbHNfyvTx/rADtvF9P6D1HYV/0JuArlpnQIHhOuWXQGUVyR5XJGRVLKbeNu0o5A==";
+        url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.5.2.tgz";
+        sha512 = "3XZZuJSeoIUyMYSuDbTbVtP4KAVGHPfU8nmHFkr8LJc+THCaUXwnu/2AV+LCSLarET/hL9IlbNfYTGrt6fOVuQ==";
       };
     };
     "ut_pex-2.0.1" = {
@@ -55392,6 +55401,15 @@ let
         sha512 = "IAgsltQPwg/pXOPsdXgbUTCaO9VSKZwirZN5SGtkdYQ/R3VjeC4v00WTVvoNayWMZpoC3O9u0ogqmsKzKhVasQ==";
       };
     };
+    "vscode-jsonrpc-6.0.0-next.7" = {
+      name = "vscode-jsonrpc";
+      packageName = "vscode-jsonrpc";
+      version = "6.0.0-next.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.7.tgz";
+        sha512 = "1nG+6cuTtpzmXe7yYfO9GCkYlyV6Ai+jDnwidHiT2T7zhc+bJM+VTtc0T/CdTlDyTNTqIcCj0V1nD4TcVjJ7Ug==";
+      };
+    };
     "vscode-languageclient-4.0.1" = {
       name = "vscode-languageclient";
       packageName = "vscode-languageclient";
@@ -55401,13 +55419,13 @@ let
         sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA==";
       };
     };
-    "vscode-languageclient-7.0.0-next.9" = {
+    "vscode-languageclient-7.0.0-next.12" = {
       name = "vscode-languageclient";
       packageName = "vscode-languageclient";
-      version = "7.0.0-next.9";
+      version = "7.0.0-next.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.9.tgz";
-        sha512 = "lFO+rN/i72CM2va6iKXq1lD7pJg8J93KEXf0w0boWVqU+DJhWzLrV3pXl8Xk1nCv//qOAyhlc/nx2KZCTeRF/A==";
+        url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.12.tgz";
+        sha512 = "OrzvOvhS5o26C0KctTJC7hkwh3avCwkVhllzy42AqwpIUZ3p2aVqkSG2uVxaeodq8ThBb3TLgtg50vxyWs6FEg==";
       };
     };
     "vscode-languageserver-3.5.1" = {
@@ -55500,6 +55518,15 @@ let
         sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==";
       };
     };
+    "vscode-languageserver-protocol-3.16.0-next.10" = {
+      name = "vscode-languageserver-protocol";
+      packageName = "vscode-languageserver-protocol";
+      version = "3.16.0-next.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.10.tgz";
+        sha512 = "YRTctHUZvts0Z1xXKNYU0ha0o+Tlgtwr+6O8OmDquM086N8exiSKBMwMC+Ra1QtIE+1mfW43Wxsme2FnMkAS9A==";
+      };
+    };
     "vscode-languageserver-protocol-3.16.0-next.2" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
@@ -56022,15 +56049,6 @@ let
         sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==";
       };
     };
-    "webpack-4.44.1" = {
-      name = "webpack";
-      packageName = "webpack";
-      version = "4.44.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz";
-        sha512 = "4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==";
-      };
-    };
     "webpack-4.44.2" = {
       name = "webpack";
       packageName = "webpack";
@@ -56040,6 +56058,15 @@ let
         sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==";
       };
     };
+    "webpack-5.4.0" = {
+      name = "webpack";
+      packageName = "webpack";
+      version = "5.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webpack/-/webpack-5.4.0.tgz";
+        sha512 = "udpYTyqz8toTTdaOsL2QKPLeZLt2IEm9qY7yTXuFEQhKu5bk0yQD9BtAdVQksmz4jFbbWOiWmm3NHarO0zr/ng==";
+      };
+    };
     "webpack-cli-3.3.12" = {
       name = "webpack-cli";
       packageName = "webpack-cli";
@@ -56112,13 +56139,13 @@ let
         sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==";
       };
     };
-    "webpack-node-externals-2.5.1" = {
+    "webpack-node-externals-2.5.2" = {
       name = "webpack-node-externals";
       packageName = "webpack-node-externals";
-      version = "2.5.1";
+      version = "2.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-2.5.1.tgz";
-        sha512 = "RWxKGibUU5kuJT6JDYmXGa3QsZskqIaiBvZ2wBxHlJzWVJPOyBMnroXf23uxEHnj1rYS8jNdyUfrNAXJ2bANNw==";
+        url = "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-2.5.2.tgz";
+        sha512 = "aHdl/y2N7PW2Sx7K+r3AxpJO+aDMcYzMQd60Qxefq3+EwhewSbTBqNumOsCE1JsCUNoyfGj5465N0sSf6hc/5w==";
       };
     };
     "webpack-sources-1.4.3" = {
@@ -56220,13 +56247,13 @@ let
         sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==";
       };
     };
-    "whatwg-fetch-3.4.1" = {
+    "whatwg-fetch-3.5.0" = {
       name = "whatwg-fetch";
       packageName = "whatwg-fetch";
-      version = "3.4.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz";
-        sha512 = "sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ==";
+        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz";
+        sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A==";
       };
     };
     "whatwg-mimetype-2.3.0" = {
@@ -56499,6 +56526,15 @@ let
         sha512 = "OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==";
       };
     };
+    "windows-release-4.0.0" = {
+      name = "windows-release";
+      packageName = "windows-release";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz";
+        sha512 = "OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==";
+      };
+    };
     "winreg-0.0.12" = {
       name = "winreg";
       packageName = "winreg";
@@ -58288,7 +58324,7 @@ in
       sources."inquirer-7.3.3"
       sources."ip-1.1.5"
       sources."is-callable-1.2.2"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-date-object-1.0.2"
       sources."is-docker-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -58583,7 +58619,7 @@ in
       sources."bops-0.0.7"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      (sources."buffer-5.7.0" // {
+      (sources."buffer-5.7.1" // {
         dependencies = [
           sources."base64-js-1.3.1"
         ];
@@ -59034,40 +59070,38 @@ in
   "@nestjs/cli" = nodeEnv.buildNodePackage {
     name = "_at_nestjs_slash_cli";
     packageName = "@nestjs/cli";
-    version = "7.5.1";
+    version = "7.5.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.1.tgz";
-      sha512 = "18EfBO48ojVm7YzwyPc8PRjas9KcIVjdlD+v7tIImKzrf5THcpAYxvzUvZUspSbLIIIqwTgKj/loqamkwOk/XA==";
+      url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.2.tgz";
+      sha512 = "qxh5aqQbxzQe8Tuc3CF8nLb1KsWCjLabSAZm+hlxrWYSJzbffbn947MPmsIwZdXgAXZ6AprmJV5KeB2U6DoM+w==";
     };
     dependencies = [
-      sources."@angular-devkit/core-10.0.7"
-      (sources."@angular-devkit/schematics-10.0.7" // {
+      sources."@angular-devkit/core-10.2.0"
+      (sources."@angular-devkit/schematics-10.2.0" // {
         dependencies = [
-          sources."ora-4.0.4"
-        ];
-      })
-      (sources."@angular-devkit/schematics-cli-0.1000.7" // {
-        dependencies = [
-          sources."inquirer-7.1.0"
+          sources."chalk-4.1.0"
+          sources."ora-5.0.0"
         ];
       })
+      sources."@angular-devkit/schematics-cli-0.1002.0"
       sources."@babel/code-frame-7.10.4"
       sources."@babel/helper-validator-identifier-7.10.4"
       (sources."@babel/highlight-7.10.4" // {
         dependencies = [
+          sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."has-flag-3.0.0"
+          sources."supports-color-5.5.0"
         ];
       })
-      (sources."@nestjs/schematics-7.2.1" // {
-        dependencies = [
-          sources."@angular-devkit/core-10.2.0"
-          sources."@angular-devkit/schematics-10.2.0"
-          sources."ajv-6.12.4"
-          sources."rxjs-6.6.2"
-        ];
-      })
-      sources."@schematics/schematics-0.1000.7"
+      sources."@nestjs/schematics-7.2.1"
+      sources."@schematics/schematics-0.1002.0"
       sources."@types/anymatch-1.3.1"
+      sources."@types/eslint-7.2.4"
+      sources."@types/eslint-scope-3.7.0"
+      sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
       sources."@types/json5-0.0.29"
       sources."@types/node-14.14.6"
@@ -59079,7 +59113,7 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      (sources."@types/webpack-4.41.21" // {
+      (sources."@types/webpack-4.41.24" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -59105,177 +59139,50 @@ in
       sources."@webassemblyjs/wast-printer-1.9.0"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."acorn-6.4.2"
-      sources."ajv-6.12.3"
-      sources."ajv-errors-1.0.1"
+      sources."acorn-8.0.4"
+      sources."ajv-6.12.4"
       sources."ajv-keywords-3.5.2"
       sources."ansi-escapes-4.3.1"
       sources."ansi-regex-5.0.0"
-      sources."ansi-styles-3.2.1"
+      sources."ansi-styles-4.3.0"
       sources."anymatch-3.1.1"
-      sources."aproba-1.2.0"
-      sources."arr-diff-4.0.0"
-      sources."arr-flatten-1.1.0"
-      sources."arr-union-3.1.0"
-      sources."array-unique-0.3.2"
-      (sources."asn1.js-5.4.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
-      (sources."assert-1.5.0" // {
-        dependencies = [
-          sources."inherits-2.0.1"
-          sources."util-0.10.3"
-        ];
-      })
-      sources."assign-symbols-1.0.0"
-      sources."async-each-1.0.3"
       sources."at-least-node-1.0.0"
-      sources."atob-2.1.2"
       sources."balanced-match-1.0.0"
-      (sources."base-0.11.2" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-        ];
-      })
-      sources."base64-js-1.3.1"
-      sources."big.js-5.2.2"
       sources."binary-extensions-2.1.0"
-      sources."bindings-1.5.0"
-      sources."bluebird-3.7.2"
-      sources."bn.js-5.1.3"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."brorand-1.1.0"
-      sources."browserify-aes-1.2.0"
-      sources."browserify-cipher-1.0.1"
-      sources."browserify-des-1.0.2"
-      (sources."browserify-rsa-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
-      (sources."browserify-sign-4.2.1" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-          sources."safe-buffer-5.2.1"
-        ];
-      })
-      sources."browserify-zlib-0.2.0"
-      sources."buffer-4.9.2"
+      sources."browserslist-4.14.6"
       sources."buffer-from-1.1.1"
-      sources."buffer-xor-1.0.3"
-      sources."builtin-status-codes-3.0.0"
-      (sources."cacache-12.0.4" // {
-        dependencies = [
-          sources."rimraf-2.7.1"
-        ];
-      })
-      sources."cache-base-1.0.1"
       sources."callsites-3.1.0"
-      (sources."chalk-3.0.0" // {
-        dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."has-flag-4.0.0"
-          sources."supports-color-7.2.0"
-        ];
-      })
+      sources."caniuse-lite-1.0.30001156"
+      sources."chalk-3.0.0"
       sources."chardet-0.7.0"
-      sources."chokidar-3.4.2"
-      sources."chownr-1.1.4"
+      sources."chokidar-3.4.3"
       sources."chrome-trace-event-1.0.2"
-      sources."cipher-base-1.0.4"
-      (sources."class-utils-0.3.6" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          (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."kind-of-5.1.0"
-        ];
-      })
       sources."cli-cursor-3.1.0"
       sources."cli-spinners-2.5.0"
-      (sources."cli-table3-0.5.1" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."string-width-2.1.1"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
-      sources."cli-width-2.2.1"
+      sources."cli-table3-0.5.1"
+      sources."cli-width-3.0.0"
       sources."clone-1.0.4"
-      sources."collection-visit-1.0.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commander-4.1.1"
-      sources."commondir-1.0.1"
-      sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
-      sources."console-browserify-1.2.0"
-      sources."constants-browserify-1.0.0"
-      (sources."copy-concurrently-1.0.5" // {
-        dependencies = [
-          sources."rimraf-2.7.1"
-        ];
-      })
-      sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."cosmiconfig-6.0.0"
-      (sources."create-ecdh-4.0.4" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
-      sources."create-hash-1.2.0"
-      sources."create-hmac-1.1.7"
-      (sources."cross-spawn-6.0.5" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
-      sources."crypto-browserify-3.12.0"
-      sources."cyclist-1.0.1"
-      sources."debug-2.6.9"
-      sources."decode-uri-component-0.2.0"
+      sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."define-property-2.0.2"
-      sources."des.js-1.0.1"
-      (sources."diffie-hellman-5.0.3" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
-      sources."domain-browser-1.2.0"
-      sources."duplexify-3.7.1"
-      (sources."elliptic-6.5.3" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."electron-to-chromium-1.3.589"
       sources."emoji-regex-8.0.0"
-      sources."emojis-list-3.0.0"
       sources."end-of-stream-1.4.4"
       sources."enhanced-resolve-4.3.0"
       sources."errno-0.1.7"
       sources."error-ex-1.3.2"
+      sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-scope-4.0.3"
+      sources."eslint-scope-5.1.1"
       (sources."esrecurse-4.3.0" // {
         dependencies = [
           sources."estraverse-5.2.0"
@@ -59283,134 +59190,55 @@ in
       })
       sources."estraverse-4.3.0"
       sources."events-3.2.0"
-      sources."evp_bytestokey-1.0.3"
-      sources."execa-1.0.0"
-      (sources."expand-brackets-2.1.4" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          sources."extend-shallow-2.0.1"
-          (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."kind-of-5.1.0"
-        ];
-      })
-      (sources."extend-shallow-3.0.2" // {
-        dependencies = [
-          sources."is-extendable-1.0.1"
-        ];
-      })
+      sources."execa-4.1.0"
       sources."external-editor-3.1.0"
-      (sources."extglob-2.0.4" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-          sources."extend-shallow-2.0.1"
-        ];
-      })
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."figgy-pudding-3.5.2"
       sources."figures-3.2.0"
-      sources."file-uri-to-path-1.0.0"
       sources."fill-range-7.0.1"
-      sources."find-cache-dir-2.1.0"
-      sources."find-up-3.0.0"
-      sources."flush-write-stream-1.1.1"
-      sources."for-in-1.0.2"
-      (sources."fork-ts-checker-webpack-plugin-5.1.0" // {
+      sources."find-up-4.1.0"
+      (sources."fork-ts-checker-webpack-plugin-5.2.1" // {
         dependencies = [
-          sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."has-flag-4.0.0"
-          sources."supports-color-7.2.0"
         ];
       })
-      sources."fragment-cache-0.2.1"
-      sources."from2-2.3.0"
       sources."fs-extra-9.0.1"
       sources."fs-monkey-1.0.1"
-      sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.1.3"
       sources."function-bind-1.1.1"
-      sources."get-stream-4.1.0"
-      sources."get-value-2.0.6"
+      sources."get-stream-5.2.0"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
+      sources."glob-to-regexp-0.4.1"
       sources."graceful-fs-4.2.4"
       sources."has-1.0.3"
-      sources."has-flag-3.0.0"
-      sources."has-value-1.0.0"
-      (sources."has-values-1.0.0" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
-      (sources."hash-base-3.1.0" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-          sources."safe-buffer-5.2.1"
-        ];
-      })
-      sources."hash.js-1.1.7"
-      sources."hmac-drbg-1.0.1"
-      sources."https-browserify-1.0.0"
+      sources."has-flag-4.0.0"
+      sources."human-signals-1.1.1"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
-      sources."iferr-0.1.5"
       sources."import-fresh-3.2.2"
-      sources."imurmurhash-0.1.4"
-      sources."infer-owner-1.0.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       (sources."inquirer-7.3.3" // {
         dependencies = [
-          sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
-          sources."cli-width-3.0.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."has-flag-4.0.0"
-          sources."rxjs-6.6.3"
-          sources."supports-color-7.2.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."string-width-4.2.0"
         ];
       })
       sources."interpret-1.4.0"
-      sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-2.1.0"
-      sources."is-buffer-1.1.6"
-      sources."is-core-module-2.0.0"
-      sources."is-data-descriptor-1.0.0"
-      sources."is-descriptor-1.0.2"
-      sources."is-extendable-0.1.1"
+      sources."is-core-module-2.1.0"
       sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-interactive-1.0.0"
       sources."is-number-7.0.0"
-      sources."is-plain-object-2.0.4"
-      sources."is-stream-1.1.0"
-      sources."is-windows-1.0.2"
-      sources."is-wsl-1.1.0"
+      sources."is-stream-2.0.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."isobject-3.0.1"
+      sources."jest-worker-26.6.2"
       sources."js-tokens-4.0.0"
       sources."json-parse-better-errors-1.0.2"
       sources."json-parse-even-better-errors-2.3.1"
@@ -59421,372 +59249,152 @@ in
           sources."universalify-2.0.0"
         ];
       })
-      sources."kind-of-6.0.3"
       sources."lines-and-columns-1.1.6"
-      sources."loader-runner-2.4.0"
-      sources."loader-utils-1.4.0"
-      sources."locate-path-3.0.0"
+      sources."loader-runner-4.1.0"
+      sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."lodash.toarray-4.4.0"
-      (sources."log-symbols-3.0.0" // {
+      (sources."log-symbols-4.0.0" // {
         dependencies = [
-          sources."chalk-2.4.2"
+          sources."chalk-4.1.0"
         ];
       })
-      sources."lru-cache-5.1.1"
       sources."macos-release-2.4.1"
       sources."magic-string-0.25.7"
-      (sources."make-dir-2.1.0" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
-      sources."map-cache-0.2.2"
-      sources."map-visit-1.0.0"
-      sources."md5.js-1.3.5"
       sources."memfs-3.2.0"
       sources."memory-fs-0.5.0"
-      (sources."micromatch-3.1.10" // {
-        dependencies = [
-          (sources."braces-2.3.2" // {
-            dependencies = [
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."fill-range-4.0.0" // {
-            dependencies = [
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."to-regex-range-2.1.1"
-        ];
-      })
-      (sources."miller-rabin-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."merge-stream-2.0.0"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
       sources."mimic-fn-2.1.0"
-      sources."minimalistic-assert-1.0.1"
-      sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      sources."mississippi-3.0.0"
-      (sources."mixin-deep-1.3.2" // {
-        dependencies = [
-          sources."is-extendable-1.0.1"
-        ];
-      })
-      sources."mkdirp-0.5.5"
-      (sources."move-concurrently-1.0.1" // {
-        dependencies = [
-          sources."rimraf-2.7.1"
-        ];
-      })
-      sources."ms-2.0.0"
       sources."mute-stream-0.0.8"
-      sources."nan-2.14.2"
-      sources."nanomatch-1.2.13"
       sources."neo-async-2.6.2"
-      sources."nice-try-1.0.5"
       sources."node-emoji-1.10.0"
-      (sources."node-libs-browser-2.2.1" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."node-releases-1.1.65"
       sources."normalize-path-3.0.0"
-      sources."npm-run-path-2.0.2"
+      sources."npm-run-path-4.0.1"
       sources."object-assign-4.1.1"
-      (sources."object-copy-0.1.0" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          sources."is-accessor-descriptor-0.1.6"
-          sources."is-data-descriptor-0.1.4"
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."object-visit-1.0.1"
-      sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
-      (sources."ora-5.0.0" // {
+      (sources."ora-5.1.0" // {
         dependencies = [
-          sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."has-flag-4.0.0"
-          sources."log-symbols-4.0.0"
-          sources."supports-color-7.2.0"
         ];
       })
-      sources."os-browserify-0.3.0"
-      sources."os-name-3.1.0"
+      sources."os-name-4.0.0"
       sources."os-tmpdir-1.0.2"
-      sources."p-finally-1.0.0"
       sources."p-limit-2.3.0"
-      sources."p-locate-3.0.0"
+      sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
-      sources."pako-1.0.11"
-      sources."parallel-transform-1.2.0"
       sources."parent-module-1.0.1"
-      sources."parse-asn1-5.1.6"
       sources."parse-json-5.1.0"
-      sources."pascalcase-0.1.1"
-      sources."path-browserify-0.0.1"
-      sources."path-dirname-1.0.2"
-      sources."path-exists-3.0.0"
+      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-key-2.0.1"
+      sources."path-key-3.1.1"
       sources."path-parse-1.0.6"
       sources."path-type-4.0.0"
-      sources."pbkdf2-3.1.1"
       sources."picomatch-2.2.2"
-      sources."pify-4.0.1"
-      sources."pkg-dir-3.0.0"
+      sources."pkg-dir-4.2.0"
       sources."pluralize-8.0.0"
-      sources."posix-character-classes-0.1.1"
-      sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
-      sources."promise-inflight-1.0.1"
       sources."prr-1.0.1"
-      (sources."public-encrypt-4.0.3" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
       sources."pump-3.0.0"
-      (sources."pumpify-1.5.1" // {
-        dependencies = [
-          sources."pump-2.0.1"
-        ];
-      })
       sources."punycode-2.1.1"
-      sources."querystring-0.2.0"
-      sources."querystring-es3-0.2.1"
       sources."randombytes-2.1.0"
-      sources."randomfill-1.0.4"
       sources."readable-stream-2.3.7"
-      sources."readdirp-3.4.0"
+      sources."readdirp-3.5.0"
       sources."rechoir-0.6.2"
-      sources."regex-not-1.0.2"
-      sources."remove-trailing-separator-1.1.0"
-      sources."repeat-element-1.1.3"
-      sources."repeat-string-1.6.1"
       sources."resolve-1.18.1"
       sources."resolve-from-4.0.0"
-      sources."resolve-url-0.2.1"
       sources."restore-cursor-3.1.0"
-      sources."ret-0.1.15"
       sources."rimraf-3.0.2"
-      sources."ripemd160-2.0.2"
       sources."run-async-2.4.1"
-      sources."run-queue-1.0.3"
-      sources."rxjs-6.5.5"
+      sources."rxjs-6.6.2"
       sources."safe-buffer-5.1.2"
-      sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."schema-utils-2.7.0"
       sources."semver-7.3.2"
-      sources."serialize-javascript-4.0.0"
-      (sources."set-value-2.0.1" // {
-        dependencies = [
-          sources."extend-shallow-2.0.1"
-        ];
-      })
-      sources."setimmediate-1.0.5"
-      sources."sha.js-2.4.11"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
+      sources."serialize-javascript-5.0.1"
+      sources."shebang-command-2.0.0"
+      sources."shebang-regex-3.0.0"
       sources."shelljs-0.8.4"
       sources."signal-exit-3.0.3"
-      (sources."snapdragon-0.8.2" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          sources."extend-shallow-2.0.1"
-          (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."kind-of-5.1.0"
-          sources."source-map-0.5.7"
-        ];
-      })
-      (sources."snapdragon-node-2.1.1" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-        ];
-      })
-      (sources."snapdragon-util-3.0.1" // {
-        dependencies = [
-          sources."kind-of-3.2.2"
-        ];
-      })
       sources."source-list-map-2.0.1"
       sources."source-map-0.7.3"
-      sources."source-map-resolve-0.5.3"
       (sources."source-map-support-0.5.19" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
-      sources."source-map-url-0.4.0"
       sources."sourcemap-codec-1.4.8"
-      sources."split-string-3.1.0"
-      sources."ssri-6.0.1"
-      (sources."static-extend-0.1.2" // {
+      (sources."string-width-2.1.1" // {
         dependencies = [
-          sources."define-property-0.2.5"
-          (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."kind-of-5.1.0"
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
         ];
       })
-      sources."stream-browserify-2.0.2"
-      sources."stream-each-1.2.3"
-      sources."stream-http-2.8.3"
-      sources."stream-shift-1.0.1"
-      sources."string-width-4.2.0"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-6.0.0"
       sources."strip-bom-3.0.0"
-      sources."strip-eof-1.0.0"
-      sources."supports-color-5.5.0"
+      sources."strip-final-newline-2.0.0"
+      sources."supports-color-7.2.0"
       sources."symbol-observable-1.2.0"
       sources."tapable-1.1.3"
-      (sources."terser-4.8.0" // {
+      (sources."terser-5.3.8" // {
         dependencies = [
           sources."commander-2.20.3"
-          sources."source-map-0.6.1"
         ];
       })
-      (sources."terser-webpack-plugin-1.4.5" // {
+      (sources."terser-webpack-plugin-5.0.3" // {
         dependencies = [
-          sources."schema-utils-1.0.0"
+          sources."ajv-6.12.6"
+          sources."p-limit-3.0.2"
+          sources."schema-utils-3.0.0"
           sources."source-map-0.6.1"
         ];
       })
       sources."through-2.3.8"
-      sources."through2-2.0.5"
-      sources."timers-browserify-2.0.12"
       sources."tmp-0.0.33"
-      sources."to-arraybuffer-1.0.1"
-      (sources."to-object-path-0.3.0" // {
-        dependencies = [
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."to-regex-3.0.2"
       sources."to-regex-range-5.0.1"
       sources."tree-kill-1.2.2"
       sources."tsconfig-paths-3.9.0"
       (sources."tsconfig-paths-webpack-plugin-3.3.0" // {
         dependencies = [
+          sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."has-flag-3.0.0"
+          sources."supports-color-5.5.0"
         ];
       })
       sources."tslib-1.14.1"
-      sources."tty-browserify-0.0.0"
       sources."type-fest-0.11.0"
-      sources."typedarray-0.0.6"
-      sources."typescript-3.9.7"
-      sources."union-value-1.0.1"
-      sources."unique-filename-1.1.1"
-      sources."unique-slug-2.0.2"
+      sources."typescript-4.0.5"
       sources."universalify-1.0.0"
-      (sources."unset-value-1.0.0" // {
-        dependencies = [
-          (sources."has-value-0.3.1" // {
-            dependencies = [
-              sources."isobject-2.1.0"
-            ];
-          })
-          sources."has-values-0.1.4"
-        ];
-      })
-      sources."upath-1.2.0"
       sources."uri-js-4.4.0"
-      sources."urix-0.1.0"
-      (sources."url-0.11.0" // {
-        dependencies = [
-          sources."punycode-1.3.2"
-        ];
-      })
-      sources."use-3.1.1"
-      (sources."util-0.11.1" // {
-        dependencies = [
-          sources."inherits-2.0.3"
-        ];
-      })
       sources."util-deprecate-1.0.2"
-      sources."vm-browserify-1.1.2"
-      sources."watchpack-1.7.4"
-      (sources."watchpack-chokidar2-2.0.0" // {
-        dependencies = [
-          sources."anymatch-2.0.0"
-          sources."binary-extensions-1.13.1"
-          sources."braces-2.3.2"
-          sources."chokidar-2.1.8"
-          sources."extend-shallow-2.0.1"
-          sources."fill-range-4.0.0"
-          sources."fsevents-1.2.13"
-          sources."glob-parent-3.1.0"
-          sources."is-binary-path-1.0.1"
-          sources."is-glob-3.1.0"
-          sources."is-number-3.0.0"
-          sources."kind-of-3.2.2"
-          sources."normalize-path-2.1.1"
-          sources."readdirp-2.2.1"
-          sources."to-regex-range-2.1.1"
-        ];
-      })
+      sources."watchpack-2.0.1"
       sources."wcwidth-1.0.1"
-      (sources."webpack-4.44.1" // {
+      (sources."webpack-5.4.0" // {
         dependencies = [
-          sources."memory-fs-0.4.1"
-          sources."schema-utils-1.0.0"
+          sources."ajv-6.12.6"
+          sources."enhanced-resolve-5.3.1"
+          sources."schema-utils-3.0.0"
+          sources."tapable-2.0.0"
         ];
       })
-      sources."webpack-node-externals-2.5.1"
-      (sources."webpack-sources-1.4.3" // {
+      sources."webpack-node-externals-2.5.2"
+      (sources."webpack-sources-2.2.0" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
-      sources."which-1.3.1"
-      sources."windows-release-3.3.3"
-      sources."worker-farm-1.7.0"
+      sources."which-2.0.2"
+      sources."windows-release-4.0.0"
       sources."wrappy-1.0.2"
-      sources."xtend-4.0.2"
-      sources."y18n-4.0.0"
-      sources."yallist-3.1.1"
       sources."yaml-1.10.0"
     ];
     buildInputs = globalBuildInputs;
@@ -59809,7 +59417,7 @@ in
     };
     dependencies = [
       sources."@akryum/winattr-3.0.0"
-      sources."@apollo/federation-0.20.2"
+      sources."@apollo/federation-0.20.4"
       (sources."@apollo/protobufjs-1.0.5" // {
         dependencies = [
           sources."@types/node-10.17.44"
@@ -59825,14 +59433,13 @@ in
       sources."@babel/compat-data-7.12.5"
       (sources."@babel/core-7.12.3" // {
         dependencies = [
-          sources."@babel/generator-7.12.5"
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
           sources."semver-5.7.1"
         ];
       })
-      (sources."@babel/generator-7.11.6" // {
+      (sources."@babel/generator-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       sources."@babel/helper-annotate-as-pure-7.10.4"
@@ -59846,12 +59453,12 @@ in
       sources."@babel/helper-create-regexp-features-plugin-7.12.1"
       (sources."@babel/helper-define-map-7.10.5" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       (sources."@babel/helper-explode-assignable-expression-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       sources."@babel/helper-function-name-7.10.4"
@@ -59859,17 +59466,17 @@ in
       sources."@babel/helper-hoist-variables-7.10.4"
       (sources."@babel/helper-member-expression-to-functions-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       (sources."@babel/helper-module-imports-7.12.5" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       (sources."@babel/helper-module-transforms-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       sources."@babel/helper-optimise-call-expression-7.10.4"
@@ -59877,27 +59484,27 @@ in
       sources."@babel/helper-regex-7.10.5"
       (sources."@babel/helper-remap-async-to-generator-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       (sources."@babel/helper-replace-supers-7.12.5" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       (sources."@babel/helper-simple-access-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       (sources."@babel/helper-split-export-declaration-7.11.0" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       sources."@babel/helper-validator-identifier-7.10.4"
@@ -59905,7 +59512,7 @@ in
       sources."@babel/helper-wrap-function-7.12.3"
       (sources."@babel/helpers-7.12.5" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       sources."@babel/highlight-7.10.4"
@@ -59973,7 +59580,7 @@ in
       sources."@babel/plugin-transform-unicode-regex-7.12.1"
       (sources."@babel/preset-env-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
           sources."semver-5.7.1"
         ];
       })
@@ -59992,7 +59599,7 @@ in
       (sources."@babel/traverse-7.12.5" // {
         dependencies = [
           sources."@babel/generator-7.12.5"
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
         ];
       })
       sources."@babel/types-7.10.4"
@@ -60070,9 +59677,10 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      (sources."@oclif/plugin-plugins-1.9.0" // {
+      (sources."@oclif/plugin-plugins-1.9.1" // {
         dependencies = [
-          sources."npm-run-path-3.1.0"
+          sources."fs-extra-9.0.1"
+          sources."npm-run-path-4.0.1"
           sources."path-key-3.1.1"
           sources."semver-7.3.2"
           sources."tslib-2.0.3"
@@ -60151,14 +59759,14 @@ in
       sources."@vue/cli-ui-addon-widgets-4.5.8"
       (sources."@vue/compiler-core-3.0.2" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
           sources."source-map-0.6.1"
         ];
       })
       sources."@vue/compiler-dom-3.0.2"
       (sources."@vue/compiler-sfc-3.0.2" // {
         dependencies = [
-          sources."@babel/types-7.12.5"
+          sources."@babel/types-7.12.6"
           sources."source-map-0.6.1"
         ];
       })
@@ -60210,7 +59818,7 @@ in
           sources."to-regex-range-2.1.1"
         ];
       })
-      (sources."apollo-2.31.0" // {
+      (sources."apollo-2.31.1" // {
         dependencies = [
           sources."mkdirp-1.0.4"
           sources."strip-ansi-5.2.0"
@@ -60220,21 +59828,21 @@ in
       sources."apollo-cache-control-0.11.4"
       sources."apollo-cache-inmemory-1.6.6"
       sources."apollo-client-2.6.10"
-      (sources."apollo-codegen-core-0.38.0" // {
+      (sources."apollo-codegen-core-0.38.1" // {
         dependencies = [
           sources."recast-0.20.4"
           sources."source-map-0.6.1"
           sources."tslib-2.0.3"
         ];
       })
-      sources."apollo-codegen-flow-0.36.0"
-      sources."apollo-codegen-scala-0.37.0"
-      sources."apollo-codegen-swift-0.38.0"
-      sources."apollo-codegen-typescript-0.38.0"
+      sources."apollo-codegen-flow-0.36.1"
+      sources."apollo-codegen-scala-0.37.1"
+      sources."apollo-codegen-swift-0.38.1"
+      sources."apollo-codegen-typescript-0.38.1"
       sources."apollo-datasource-0.7.2"
       sources."apollo-env-0.6.5"
       sources."apollo-graphql-0.6.0"
-      sources."apollo-language-server-1.24.0"
+      sources."apollo-language-server-1.24.1"
       sources."apollo-link-1.2.14"
       sources."apollo-link-context-1.0.20"
       sources."apollo-link-error-1.1.13"
@@ -60342,7 +59950,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."browserslist-4.14.6"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -60369,7 +59977,7 @@ in
       sources."callsites-2.0.0"
       sources."camel-case-4.1.1"
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001154"
+      sources."caniuse-lite-1.0.30001156"
       sources."capital-case-1.0.3"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
@@ -60485,8 +60093,8 @@ in
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.6.5"
-      (sources."core-js-compat-3.6.5" // {
+      sources."core-js-3.7.0"
+      (sources."core-js-compat-3.7.0" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -60577,7 +60185,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.587"
+      sources."electron-to-chromium-1.3.589"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
@@ -60709,7 +60317,7 @@ in
         ];
       })
       sources."git-up-4.0.2"
-      sources."git-url-parse-11.2.0"
+      sources."git-url-parse-11.4.0"
       sources."glob-7.1.5"
       sources."glob-parent-5.1.1"
       sources."glob-to-regexp-0.3.0"
@@ -60851,7 +60459,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-ci-1.2.1"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -61032,7 +60640,7 @@ in
         ];
       })
       sources."mkdirp-0.5.5"
-      sources."moment-2.28.0"
+      sources."moment-2.29.1"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.8"
       sources."nan-2.14.2"
@@ -61783,7 +61391,7 @@ in
       sources."@babel/highlight-7.10.4"
       sources."@babel/parser-7.12.5"
       sources."@babel/template-7.10.4"
-      sources."@babel/types-7.12.5"
+      sources."@babel/types-7.12.6"
       sources."@webassemblyjs/ast-1.9.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
       sources."@webassemblyjs/helper-api-error-1.9.1"
@@ -61888,7 +61496,7 @@ in
       sources."@babel/parser-7.12.5"
       sources."@babel/template-7.10.4"
       sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.5"
+      sources."@babel/types-7.12.6"
       sources."JSV-4.0.2"
       sources."ansi-styles-3.2.1"
       sources."array-unique-0.3.2"
@@ -61929,7 +61537,7 @@ in
       sources."homedir-polyfill-1.0.3"
       sources."ini-1.3.5"
       sources."is-3.3.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-windows-1.0.2"
       sources."isexe-2.0.0"
       sources."js-tokens-4.0.0"
@@ -62219,7 +61827,7 @@ in
       sources."inherits-2.0.4"
       sources."intersect-1.0.1"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-finite-1.1.0"
       sources."is-plain-obj-1.1.0"
       sources."is-utf8-0.2.1"
@@ -62423,7 +62031,7 @@ in
       sources."is-arguments-1.0.4"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-date-object-1.0.2"
       sources."is-generator-function-1.0.7"
       sources."is-negative-zero-2.0.0"
@@ -62704,7 +62312,7 @@ in
       sources."ip-set-1.0.2"
       sources."ipaddr.js-2.0.0"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-finite-1.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
@@ -63050,7 +62658,7 @@ in
       sources."pkginfo-0.4.1"
       sources."prompt-1.0.0"
       sources."punycode-2.1.1"
-      sources."query-string-6.13.6"
+      sources."query-string-6.13.7"
       sources."read-1.0.7"
       sources."revalidator-0.1.8"
       sources."rimraf-2.7.1"
@@ -63063,7 +62671,7 @@ in
       sources."universal-url-2.0.0"
       sources."utile-0.3.0"
       sources."webidl-conversions-4.0.2"
-      sources."whatwg-fetch-3.4.1"
+      sources."whatwg-fetch-3.5.0"
       sources."whatwg-url-7.1.0"
       (sources."winston-2.1.1" // {
         dependencies = [
@@ -63277,10 +62885,10 @@ in
   coc-jest = nodeEnv.buildNodePackage {
     name = "coc-jest";
     packageName = "coc-jest";
-    version = "1.1.1";
+    version = "1.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.1.1.tgz";
-      sha512 = "9Gkw9wznxtYIiPbgORZqwN5sjHQQYe2rZBvYNPMX2AVlF++OuTXUfy4Aidw6hstbzxKR8JEnjez7JiVaUF6M/A==";
+      url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.1.2.tgz";
+      sha512 = "vQKfTnF+LMEJEDR/+oTWowOUylr2+3pkOHGUr+OgNMhdjQPy+K1/Kcuqkm4qTpmhQFwg7OzF7GYDfoQojEEmBQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -63612,7 +63220,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
-      sources."caniuse-lite-1.0.30001154"
+      sources."caniuse-lite-1.0.30001156"
       sources."capture-stack-trace-1.0.1"
       sources."ccount-1.1.0"
       sources."chalk-2.4.2"
@@ -63669,7 +63277,7 @@ in
         ];
       })
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.6.5"
+      sources."core-js-3.7.0"
       sources."cosmiconfig-3.1.0"
       sources."create-error-class-3.0.2"
       (sources."cross-spawn-6.0.5" // {
@@ -63709,7 +63317,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.587"
+      sources."electron-to-chromium-1.3.589"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -63916,7 +63524,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-ci-1.2.1"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -64584,10 +64192,10 @@ in
   coc-snippets = nodeEnv.buildNodePackage {
     name = "coc-snippets";
     packageName = "coc-snippets";
-    version = "2.2.3";
+    version = "2.2.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.3.tgz";
-      sha512 = "mK3oTm3gjQzV37Hq9r/bTj2N63p5tzO7IppuksQ7Yk0hURrHUzyx58PdBhfVOsD77FIo37dY1E0gOXv5t7a1dg==";
+      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.5.tgz";
+      sha512 = "YtWw6yFdKxgIxjoUyEgzmT3YVtp3JX7AZUOYDbbnPbneyck5poZyOpjwL+3Wu2TzohDtg2H4ivTDyttv2wXvRQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64646,7 +64254,7 @@ in
       sources."@babel/parser-7.12.5"
       sources."@babel/template-7.10.4"
       sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.5"
+      sources."@babel/types-7.12.6"
       sources."@nodelib/fs.scandir-2.1.3"
       sources."@nodelib/fs.stat-2.0.3"
       sources."@nodelib/fs.walk-1.2.4"
@@ -64671,7 +64279,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001154"
+      sources."caniuse-lite-1.0.30001156"
       sources."ccount-1.1.0"
       (sources."chalk-4.1.0" // {
         dependencies = [
@@ -64712,7 +64320,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.587"
+      sources."electron-to-chromium-1.3.589"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -64767,7 +64375,7 @@ in
       sources."is-alphanumerical-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-2.0.5"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-decimal-1.0.4"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -65006,7 +64614,7 @@ in
       sources."has-flag-3.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.0"
       sources."minimatch-3.0.4"
@@ -65121,7 +64729,7 @@ in
       sources."@nodelib/fs.walk-1.2.4"
       sources."@prettier/plugin-pug-1.10.1"
       sources."@sindresorhus/is-0.14.0"
-      sources."@sorg/log-2.2.0"
+      sources."@sorg/log-2.2.1"
       sources."@starptech/expression-parser-0.10.0"
       sources."@starptech/hast-util-from-webparser-0.10.0"
       (sources."@starptech/prettyhtml-0.10.0" // {
@@ -65306,7 +64914,7 @@ in
       sources."config-chain-1.1.12"
       sources."configstore-4.0.0"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.6.5"
+      sources."core-js-3.7.0"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
@@ -65316,7 +64924,6 @@ in
         ];
       })
       sources."css-parse-2.0.0"
-      sources."csstype-2.6.13"
       sources."currently-unhandled-0.4.1"
       sources."debug-3.2.6"
       sources."decamelize-1.2.0"
@@ -65496,7 +65103,7 @@ in
       sources."format-0.2.2"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.2.0"
+      sources."fsevents-2.2.1"
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       sources."get-caller-file-1.0.3"
@@ -65583,7 +65190,7 @@ in
       sources."is-binary-path-2.1.0"
       sources."is-buffer-2.0.5"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-decimal-1.0.4"
       sources."is-descriptor-1.0.2"
@@ -65691,7 +65298,6 @@ in
       sources."nanomatch-1.2.13"
       sources."natural-compare-1.4.0"
       sources."nice-try-1.0.5"
-      sources."node-fetch-2.6.1"
       sources."nopt-5.0.0"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-3.0.0"
@@ -65866,7 +65472,7 @@ in
       sources."run-async-2.4.1"
       sources."run-parallel-1.1.10"
       sources."rxjs-6.6.3"
-      sources."s.color-0.0.13"
+      sources."s.color-0.0.15"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
@@ -65995,8 +65601,6 @@ in
         ];
       })
       sources."stylus-supremacy-2.14.5"
-      sources."suf-cli-0.1.3"
-      sources."suf-node-1.2.1"
       sources."suf-regex-0.0.25"
       sources."supports-color-5.5.0"
       sources."symbol-0.2.3"
@@ -66648,7 +66252,7 @@ in
       sources."ip-regex-2.1.0"
       sources."ipaddr.js-1.9.1"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-docker-2.1.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
@@ -66846,7 +66450,7 @@ in
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.27.11"
+      sources."systeminformation-4.28.1"
       sources."term-size-2.2.1"
       sources."through-2.3.8"
       sources."tmp-0.2.1"
@@ -67073,7 +66677,7 @@ in
       sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
@@ -68418,7 +68022,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.784.0"
+      sources."aws-sdk-2.786.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."base64-js-1.3.1"
@@ -68589,7 +68193,7 @@ in
       sources."@babel/plugin-transform-react-jsx-7.12.5"
       sources."@babel/template-7.10.4"
       sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.5"
+      sources."@babel/types-7.12.6"
       sources."@sindresorhus/is-4.0.0"
       sources."@szmarczak/http-timer-4.0.5"
       sources."@types/cacheable-request-6.0.1"
@@ -68716,7 +68320,7 @@ in
       })
       sources."is-arrayish-0.2.1"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-docker-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-obj-2.0.0"
@@ -68921,10 +68525,10 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.149.3"
-      sources."@fluentui/react-focus-7.16.16"
+      sources."@fluentui/react-7.149.4"
+      sources."@fluentui/react-focus-7.16.17"
       sources."@fluentui/react-window-provider-1.0.1"
-      sources."@fluentui/theme-1.5.4"
+      sources."@fluentui/theme-1.6.0"
       (sources."@gulp-sourcemaps/identity-map-1.0.2" // {
         dependencies = [
           sources."normalize-path-2.1.1"
@@ -68935,7 +68539,7 @@ in
           sources."normalize-path-2.1.1"
         ];
       })
-      sources."@microsoft/load-themed-styles-1.10.125"
+      sources."@microsoft/load-themed-styles-1.10.126"
       sources."@nodelib/fs.scandir-2.1.3"
       sources."@nodelib/fs.stat-2.0.3"
       sources."@nodelib/fs.walk-1.2.4"
@@ -68980,12 +68584,12 @@ in
       sources."@types/sqlite3-3.1.6"
       sources."@types/tough-cookie-4.0.0"
       sources."@types/url-join-4.0.0"
-      sources."@uifabric/foundation-7.9.18"
-      sources."@uifabric/icons-7.5.15"
+      sources."@uifabric/foundation-7.9.19"
+      sources."@uifabric/icons-7.5.16"
       sources."@uifabric/merge-styles-7.19.1"
       sources."@uifabric/react-hooks-7.13.9"
       sources."@uifabric/set-version-7.0.23"
-      sources."@uifabric/styling-7.16.16"
+      sources."@uifabric/styling-7.16.17"
       sources."@uifabric/utilities-7.33.2"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
@@ -69155,7 +68759,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-equal-1.0.0"
       sources."buffer-from-1.1.1"
       sources."buffer-writer-2.0.0"
@@ -69661,7 +69265,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-dir-1.0.0"
@@ -69957,15 +69561,15 @@ in
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
       sources."object.reduce-1.0.1"
-      sources."office-ui-fabric-react-7.149.3"
+      sources."office-ui-fabric-react-7.149.4"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."openapi-default-setter-7.0.1"
-      sources."openapi-framework-7.0.2"
+      sources."openapi-framework-7.1.0"
       sources."openapi-jsonschema-parameters-7.0.2"
-      sources."openapi-request-coercer-7.0.1"
+      sources."openapi-request-coercer-7.1.0"
       sources."openapi-request-validator-7.0.2"
       sources."openapi-response-validator-7.0.1"
       sources."openapi-schema-validator-7.0.1"
@@ -70151,7 +69755,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      sources."sass-1.28.0"
+      sources."sass-1.29.0"
       sources."sax-1.2.4"
       sources."scheduler-0.19.1"
       sources."schema-utils-2.7.1"
@@ -70859,10 +70463,10 @@ in
   expo-cli = nodeEnv.buildNodePackage {
     name = "expo-cli";
     packageName = "expo-cli";
-    version = "3.28.4";
+    version = "3.28.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.4.tgz";
-      sha512 = "nVk7Tc8I3hzhKnZwIOWh08Qq8VDZqYLA81Zrdu7HeIfJYAzppgYPB6tiZFouWwZl9/twf2JSYAUZmLwVhLK61A==";
+      url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.5.tgz";
+      sha512 = "Lam0JkBx57gs1xhlI+rXx3aJqOebIPBPf9sWAvUpTFDSVkyZN86rFXJWud6QnAFBLGqUgGFZJDC1tMq+l7Mgng==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -70997,7 +70601,7 @@ in
           sources."lodash-4.17.20"
         ];
       })
-      (sources."@babel/types-7.12.5" // {
+      (sources."@babel/types-7.12.6" // {
         dependencies = [
           sources."lodash-4.17.20"
         ];
@@ -71008,7 +70612,7 @@ in
           sources."uuid-3.4.0"
         ];
       })
-      (sources."@expo/config-3.3.13" // {
+      (sources."@expo/config-3.3.14" // {
         dependencies = [
           sources."semver-7.3.2"
           sources."slash-3.0.0"
@@ -71023,7 +70627,7 @@ in
           sources."pngjs-5.0.0"
         ];
       })
-      (sources."@expo/dev-server-0.1.38" // {
+      (sources."@expo/dev-server-0.1.39" // {
         dependencies = [
           sources."body-parser-1.19.0"
           sources."bytes-3.1.0"
@@ -71040,7 +70644,7 @@ in
           sources."type-fest-0.12.0"
         ];
       })
-      sources."@expo/dev-tools-0.13.57"
+      sources."@expo/dev-tools-0.13.58"
       sources."@expo/eas-build-job-0.1.2"
       (sources."@expo/image-utils-0.3.7" // {
         dependencies = [
@@ -71053,7 +70657,7 @@ in
           sources."json5-1.0.1"
         ];
       })
-      sources."@expo/metro-config-0.1.38"
+      sources."@expo/metro-config-0.1.39"
       (sources."@expo/ngrok-2.4.3" // {
         dependencies = [
           sources."uuid-3.4.0"
@@ -71101,14 +70705,14 @@ in
       sources."@expo/spawn-async-1.5.0"
       sources."@expo/traveling-fastlane-darwin-1.15.1"
       sources."@expo/traveling-fastlane-linux-1.15.1"
-      (sources."@expo/webpack-config-0.12.42" // {
+      (sources."@expo/webpack-config-0.12.43" // {
         dependencies = [
           sources."@babel/runtime-7.9.0"
           sources."is-wsl-2.2.0"
           sources."react-refresh-0.8.3"
         ];
       })
-      (sources."@expo/xdl-58.0.18" // {
+      (sources."@expo/xdl-58.0.19" // {
         dependencies = [
           sources."chownr-1.1.4"
           sources."es6-error-4.1.1"
@@ -71283,7 +70887,7 @@ in
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/json-schema-7.0.6"
       sources."@types/keyv-3.1.1"
-      sources."@types/lodash-4.14.164"
+      sources."@types/lodash-4.14.165"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
       sources."@types/node-9.6.61"
@@ -71513,7 +71117,7 @@ in
       })
       sources."browserify-zlib-0.2.0"
       sources."browserslist-4.14.6"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-equal-0.0.1"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
@@ -71551,7 +71155,7 @@ in
       })
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001154"
+      sources."caniuse-lite-1.0.30001156"
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       (sources."chalk-4.1.0" // {
@@ -71674,8 +71278,8 @@ in
           sources."slash-3.0.0"
         ];
       })
-      sources."core-js-3.6.5"
-      (sources."core-js-compat-3.6.5" // {
+      sources."core-js-3.7.0"
+      (sources."core-js-compat-3.7.0" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -71737,7 +71341,7 @@ in
       sources."dag-map-1.0.2"
       sources."dashdash-1.14.1"
       sources."dateformat-3.0.3"
-      sources."dayjs-1.9.4"
+      sources."dayjs-1.9.5"
       sources."debug-4.3.0"
       sources."debuglog-1.0.1"
       sources."decache-4.4.0"
@@ -71810,7 +71414,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.587"
+      sources."electron-to-chromium-1.3.589"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -71893,7 +71497,7 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."expo-pwa-0.0.48" // {
+      (sources."expo-pwa-0.0.49" // {
         dependencies = [
           sources."commander-2.20.0"
         ];
@@ -72177,7 +71781,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-color-stop-1.1.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -72454,7 +72058,7 @@ in
           sources."which-2.0.2"
         ];
       })
-      sources."node-html-parser-1.4.6"
+      sources."node-html-parser-1.4.8"
       (sources."node-libs-browser-2.2.1" // {
         dependencies = [
           sources."buffer-4.9.2"
@@ -72583,7 +72187,7 @@ in
           sources."url-parse-lax-3.0.0"
         ];
       })
-      (sources."pacote-11.1.12" // {
+      (sources."pacote-11.1.13" // {
         dependencies = [
           sources."minipass-3.1.3"
           sources."mkdirp-1.0.4"
@@ -73680,7 +73284,7 @@ in
       sources."indent-string-2.1.0"
       sources."inherits-2.0.4"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-finite-1.1.0"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
@@ -74443,7 +74047,7 @@ in
         ];
       })
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-plain-obj-1.1.0"
       sources."is-stream-2.0.0"
@@ -75378,7 +74982,7 @@ in
       sources."inquirer-autocomplete-prompt-1.3.0"
       sources."is-arrayish-0.2.1"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-installed-globally-0.3.2"
       sources."is-interactive-1.0.0"
@@ -75567,7 +75171,7 @@ in
           sources."@graphql-tools/utils-7.0.2"
         ];
       })
-      (sources."@graphql-tools/delegate-7.0.3" // {
+      (sources."@graphql-tools/delegate-7.0.4" // {
         dependencies = [
           sources."@graphql-tools/utils-7.0.2"
         ];
@@ -75641,7 +75245,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."bufferutil-4.0.2"
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
@@ -76232,7 +75836,7 @@ in
       sources."is-absolute-1.0.0"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
@@ -76478,7 +76082,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."systeminformation-4.27.11"
+      sources."systeminformation-4.28.1"
       sources."term-canvas-0.0.5"
       sources."type-fest-0.11.0"
       sources."wordwrap-0.0.3"
@@ -76712,7 +76316,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
@@ -77105,7 +76709,7 @@ in
       })
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -78422,7 +78026,7 @@ in
       sources."inherits-2.0.4"
       sources."invert-kv-1.0.0"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
@@ -78503,7 +78107,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."path-type-1.1.0"
-      sources."patrisika-0.21.0"
+      sources."patrisika-0.22.0"
       sources."patrisika-scopes-0.11.1"
       sources."pegjs-0.10.0"
       sources."performance-now-2.1.0"
@@ -78712,7 +78316,7 @@ in
       sources."object-assign-4.1.1"
       sources."object-hash-1.3.1"
       sources."once-1.4.0"
-      sources."opentracing-0.14.4"
+      sources."opentracing-0.14.5"
       sources."path-is-absolute-1.0.1"
       sources."pathval-1.1.0"
       sources."process-0.10.1"
@@ -78806,7 +78410,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.784.0" // {
+      (sources."aws-sdk-2.786.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -78827,7 +78431,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       (sources."bl-4.0.3" // {
         dependencies = [
-          sources."buffer-5.7.0"
+          sources."buffer-5.7.1"
         ];
       })
       sources."brace-expansion-1.1.11"
@@ -80936,22 +80540,24 @@ in
       sources."concat-stream-1.6.2"
       sources."config-chain-1.1.12"
       sources."console-control-strings-1.1.0"
-      sources."conventional-changelog-angular-5.0.11"
+      sources."conventional-changelog-angular-5.0.12"
       (sources."conventional-changelog-core-3.2.3" // {
         dependencies = [
           sources."through2-3.0.2"
         ];
       })
       sources."conventional-changelog-preset-loader-2.3.4"
-      (sources."conventional-changelog-writer-4.0.17" // {
+      (sources."conventional-changelog-writer-4.0.18" // {
         dependencies = [
-          sources."through2-3.0.2"
+          sources."readable-stream-3.6.0"
+          sources."through2-4.0.2"
         ];
       })
-      sources."conventional-commits-filter-2.0.6"
-      (sources."conventional-commits-parser-3.1.0" // {
+      sources."conventional-commits-filter-2.0.7"
+      (sources."conventional-commits-parser-3.2.0" // {
         dependencies = [
-          sources."through2-3.0.2"
+          sources."readable-stream-3.6.0"
+          sources."through2-4.0.2"
         ];
       })
       (sources."conventional-recommended-bump-5.0.1" // {
@@ -81231,7 +80837,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -81299,15 +80905,21 @@ in
       sources."map-cache-0.2.2"
       sources."map-obj-4.1.0"
       sources."map-visit-1.0.0"
-      (sources."meow-7.1.1" // {
+      (sources."meow-8.0.0" // {
         dependencies = [
           sources."find-up-4.1.0"
+          sources."hosted-git-info-3.0.7"
           sources."locate-path-5.0.0"
+          sources."lru-cache-6.0.0"
+          sources."normalize-package-data-3.0.0"
           sources."p-locate-4.1.0"
           sources."parse-json-5.1.0"
           sources."path-exists-4.0.0"
           (sources."read-pkg-5.2.0" // {
             dependencies = [
+              sources."hosted-git-info-2.8.8"
+              sources."normalize-package-data-2.5.0"
+              sources."semver-5.7.1"
               sources."type-fest-0.6.0"
             ];
           })
@@ -81316,8 +80928,10 @@ in
               sources."type-fest-0.8.1"
             ];
           })
-          sources."type-fest-0.13.1"
-          sources."yargs-parser-18.1.3"
+          sources."semver-7.3.2"
+          sources."type-fest-0.18.0"
+          sources."yallist-4.0.0"
+          sources."yargs-parser-20.2.3"
         ];
       })
       sources."merge2-1.4.1"
@@ -82724,7 +82338,7 @@ in
       sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.10.4"
       sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.5"
+      sources."@babel/types-7.12.6"
       sources."@cnakazawa/watch-1.0.4"
       sources."@comandeer/babel-plugin-banner-5.0.0"
       sources."@istanbuljs/load-nyc-config-1.1.0"
@@ -82872,7 +82486,7 @@ in
       sources."bindings-1.5.0"
       (sources."bl-4.0.3" // {
         dependencies = [
-          sources."buffer-5.7.0"
+          sources."buffer-5.7.1"
           sources."readable-stream-3.6.0"
         ];
       })
@@ -82923,7 +82537,7 @@ in
       sources."cached-path-relative-1.0.2"
       sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001154"
+      sources."caniuse-lite-1.0.30001156"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       (sources."chalk-3.0.0" // {
@@ -82995,7 +82609,7 @@ in
       })
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.6.11"
-      (sources."core-js-compat-3.6.5" // {
+      (sources."core-js-compat-3.7.0" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -83046,7 +82660,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.587"
+      sources."electron-to-chromium-1.3.589"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -83145,7 +82759,7 @@ in
       sources."fs-constants-1.0.0"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.2.0"
+      sources."fsevents-2.2.1"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.2"
       sources."get-assigned-identifiers-1.2.0"
@@ -83217,7 +82831,7 @@ in
       sources."is-binary-path-2.1.0"
       sources."is-buffer-1.1.6"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-deflate-1.0.0"
       sources."is-descriptor-1.0.2"
@@ -83849,7 +83463,7 @@ in
       sources."link-check-4.5.2"
       sources."lodash-4.17.20"
       sources."markdown-link-extractor-1.2.6"
-      sources."marked-1.2.2"
+      sources."marked-1.2.3"
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
       sources."ms-2.1.2"
@@ -84030,7 +83644,7 @@ in
       sources."inherits-2.0.4"
       sources."inquirer-0.12.0"
       sources."interpret-1.4.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-my-ip-valid-1.0.0"
       sources."is-my-json-valid-2.20.5"
@@ -84247,7 +83861,7 @@ in
       sources."base64-js-1.3.1"
       sources."bl-4.0.3"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-crc32-0.2.13"
       sources."chalk-4.1.0"
       sources."chownr-1.1.4"
@@ -84323,19 +83937,19 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.149.3"
-      sources."@fluentui/react-focus-7.16.16"
+      sources."@fluentui/react-7.149.4"
+      sources."@fluentui/react-focus-7.16.17"
       sources."@fluentui/react-window-provider-1.0.1"
-      sources."@fluentui/theme-1.5.4"
-      sources."@microsoft/load-themed-styles-1.10.125"
+      sources."@fluentui/theme-1.6.0"
+      sources."@microsoft/load-themed-styles-1.10.126"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@uifabric/foundation-7.9.18"
-      sources."@uifabric/icons-7.5.15"
+      sources."@uifabric/foundation-7.9.19"
+      sources."@uifabric/icons-7.5.16"
       sources."@uifabric/merge-styles-7.19.1"
       sources."@uifabric/react-hooks-7.13.9"
       sources."@uifabric/set-version-7.0.23"
-      sources."@uifabric/styling-7.16.16"
+      sources."@uifabric/styling-7.16.17"
       sources."@uifabric/utilities-7.33.2"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
@@ -84356,7 +83970,7 @@ in
       sources."basic-auth-2.0.1"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-from-1.1.1"
       sources."builtin-status-codes-3.0.0"
       sources."bytes-3.1.0"
@@ -84462,7 +84076,7 @@ in
       sources."node-fetch-1.6.3"
       sources."normalize-url-4.5.0"
       sources."object-assign-4.1.1"
-      sources."office-ui-fabric-react-7.149.3"
+      sources."office-ui-fabric-react-7.149.4"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -84848,10 +84462,10 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "2.67.2";
+    version = "2.68.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.67.2.tgz";
-      sha512 = "tCb/TqAtxrtRTzBayfRmg7Gd809ymXfg6vVrBAAXqi93ijobB6qjopIQYlq5Tgq50m5rI/EgxvLU3BCUSEq/eQ==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.68.0.tgz";
+      sha512 = "nrdMstEiFYtwLmPF+UsMxnOekeKIayUwRpEMzaLtK+i9Yf/IjCPxKwMF7Z+yc3wjYIjxjlWSBqq0I8bcwxUDnQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -84959,7 +84573,7 @@ in
       sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.10.4"
       sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.5"
+      sources."@babel/types-7.12.6"
       sources."@bugsnag/browser-7.5.1"
       sources."@bugsnag/core-7.3.5"
       sources."@bugsnag/cuid-3.0.0"
@@ -84994,10 +84608,10 @@ in
       sources."@netlify/open-api-0.18.1"
       sources."@netlify/plugin-edge-handlers-1.9.0"
       sources."@netlify/run-utils-1.0.5"
-      sources."@netlify/traffic-mesh-agent-0.24.0-pre.23"
-      sources."@netlify/traffic-mesh-agent-darwin-x64-0.24.0-pre.23"
-      sources."@netlify/traffic-mesh-agent-linux-x64-0.24.0-pre.23"
-      sources."@netlify/traffic-mesh-agent-win32-x64-0.24.0-pre.23"
+      sources."@netlify/traffic-mesh-agent-0.24.0"
+      sources."@netlify/traffic-mesh-agent-darwin-x64-0.24.0"
+      sources."@netlify/traffic-mesh-agent-linux-x64-0.24.0"
+      sources."@netlify/traffic-mesh-agent-win32-x64-0.24.0"
       (sources."@netlify/zip-it-and-ship-it-1.4.0" // {
         dependencies = [
           sources."resolve-2.0.0-next.2"
@@ -85026,39 +84640,37 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      (sources."@oclif/command-1.8.0" // {
+      (sources."@oclif/command-1.6.1" // {
         dependencies = [
           sources."@oclif/plugin-help-3.2.0"
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
           sources."is-fullwidth-code-point-2.0.0"
+          sources."semver-5.7.1"
           sources."string-width-2.1.1"
           sources."strip-ansi-4.0.0"
           sources."wrap-ansi-4.0.0"
         ];
       })
-      (sources."@oclif/config-1.17.0" // {
+      sources."@oclif/config-1.15.1"
+      (sources."@oclif/errors-1.2.2" // {
         dependencies = [
-          sources."@nodelib/fs.stat-2.0.3"
-          sources."array-union-2.1.0"
-          sources."braces-3.0.2"
-          sources."dir-glob-3.0.1"
-          sources."fast-glob-3.2.4"
-          sources."fill-range-7.0.1"
-          sources."glob-parent-5.1.1"
-          sources."globby-11.0.1"
-          sources."ignore-5.1.8"
-          sources."is-number-7.0.0"
-          sources."micromatch-4.0.2"
-          sources."slash-3.0.0"
-          sources."to-regex-range-5.0.1"
-          sources."tslib-2.0.3"
-        ];
-      })
-      (sources."@oclif/errors-1.3.3" // {
-        dependencies = [
-          sources."clean-stack-3.0.0"
-          sources."wrap-ansi-7.0.0"
+          sources."ansi-regex-3.0.0"
+          sources."ansi-styles-3.2.1"
+          sources."clean-stack-1.3.0"
+          sources."indent-string-3.2.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          (sources."string-width-2.1.1" // {
+            dependencies = [
+              sources."strip-ansi-4.0.0"
+            ];
+          })
+          sources."strip-ansi-5.2.0"
+          (sources."wrap-ansi-4.0.0" // {
+            dependencies = [
+              sources."strip-ansi-4.0.0"
+            ];
+          })
         ];
       })
       sources."@oclif/linewrap-1.0.0"
@@ -85089,20 +84701,16 @@ in
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."cli-ux-4.9.3"
-          sources."fs-extra-7.0.1"
           sources."has-flag-3.0.0"
           sources."indent-string-3.2.0"
-          sources."is-wsl-1.1.0"
-          sources."jsonfile-4.0.0"
           sources."semver-5.7.1"
           sources."strip-ansi-5.2.0"
           sources."supports-color-5.5.0"
-          sources."universalify-0.1.2"
         ];
       })
-      (sources."@oclif/plugin-plugins-1.9.1" // {
+      (sources."@oclif/plugin-plugins-1.9.0" // {
         dependencies = [
-          sources."npm-run-path-4.0.1"
+          sources."npm-run-path-3.1.0"
           sources."path-key-3.1.1"
           sources."tslib-2.0.3"
         ];
@@ -85238,10 +84846,9 @@ in
       sources."ast-module-types-2.7.1"
       sources."async-3.2.0"
       sources."asynckit-0.4.0"
-      sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
-      (sources."aws-sdk-2.784.0" // {
+      (sources."aws-sdk-2.786.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -85302,7 +84909,7 @@ in
       })
       sources."browserslist-4.14.6"
       sources."btoa-lite-1.0.0"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -85324,7 +84931,7 @@ in
       sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001154"
+      sources."caniuse-lite-1.0.30001156"
       sources."cardinal-2.1.1"
       sources."caw-2.0.1"
       sources."ccount-1.1.0"
@@ -85373,14 +84980,16 @@ in
       sources."cli-cursor-2.1.0"
       sources."cli-progress-3.8.2"
       sources."cli-spinners-2.5.0"
-      (sources."cli-ux-5.5.0" // {
+      (sources."cli-ux-5.4.6" // {
         dependencies = [
           sources."ansi-escapes-4.3.1"
-          sources."chalk-4.1.0"
-          sources."clean-stack-3.0.0"
-          sources."extract-stack-2.0.0"
-          sources."supports-hyperlinks-2.1.0"
-          sources."tslib-2.0.3"
+          sources."emoji-regex-7.0.3"
+          sources."has-flag-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."semver-5.7.1"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
+          sources."supports-color-5.5.0"
           sources."type-fest-0.11.0"
         ];
       })
@@ -85431,7 +85040,7 @@ in
           sources."readdirp-2.2.1"
         ];
       })
-      (sources."core-js-compat-3.6.5" // {
+      (sources."core-js-compat-3.7.0" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -85573,7 +85182,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.587"
+      sources."electron-to-chromium-1.3.589"
       sources."elf-tools-1.1.2"
       (sources."elliptic-6.5.3" // {
         dependencies = [
@@ -85714,7 +85323,7 @@ in
       sources."from2-2.3.0"
       sources."from2-array-0.0.4"
       sources."fs-constants-1.0.0"
-      sources."fs-extra-9.0.1"
+      sources."fs-extra-7.0.1"
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.1.3"
       sources."function-bind-1.1.1"
@@ -85888,7 +85497,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -85922,7 +85531,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."is-url-1.2.4"
       sources."is-windows-1.0.2"
-      sources."is-wsl-2.2.0"
+      sources."is-wsl-1.1.0"
       sources."is-yarn-global-0.3.0"
       sources."isarray-1.0.0"
       sources."isbuffer-0.0.0"
@@ -85946,13 +85555,9 @@ in
       sources."json-parse-better-errors-1.0.2"
       sources."json-parse-even-better-errors-2.3.1"
       sources."json5-2.1.3"
-      (sources."jsonfile-6.1.0" // {
-        dependencies = [
-          sources."universalify-2.0.0"
-        ];
-      })
+      sources."jsonfile-4.0.0"
       sources."junk-3.1.0"
-      sources."jwt-decode-3.0.0"
+      sources."jwt-decode-3.1.1"
       sources."keep-func-props-3.0.1"
       sources."keyv-3.1.0"
       sources."kind-of-6.0.3"
@@ -86191,12 +85796,12 @@ in
           sources."mimic-fn-2.1.0"
         ];
       })
-      sources."open-7.3.0"
-      (sources."opn-5.5.0" // {
+      (sources."open-7.3.0" // {
         dependencies = [
-          sources."is-wsl-1.1.0"
+          sources."is-wsl-2.2.0"
         ];
       })
+      sources."opn-5.5.0"
       sources."optionator-0.8.3"
       (sources."ora-4.1.1" // {
         dependencies = [
@@ -86614,7 +86219,7 @@ in
       sources."unist-util-visit-2.0.3"
       sources."unist-util-visit-parents-3.1.1"
       sources."universal-user-agent-4.0.1"
-      sources."universalify-1.0.0"
+      sources."universalify-0.1.2"
       (sources."unixify-1.0.0" // {
         dependencies = [
           sources."normalize-path-2.1.1"
@@ -86979,7 +86584,7 @@ in
       sources."invert-kv-1.0.0"
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
@@ -87253,16 +86858,16 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "1.2.2";
+    version = "1.2.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-1.2.2.tgz";
-      sha512 = "/cGajoUjpCgP1Plqjtvupm8gE+19Vzm/z31M25f50XIuLpy3wieTki+e2oIPPyuzTD7Gz04JMySbcB8tx0voNA==";
+      url = "https://registry.npmjs.org/node-red/-/node-red-1.2.3.tgz";
+      sha512 = "2SnJJ8YPTz0IzbRyEVpMZmDukm5DiAbNS+Nvv4g8dEtHFgOMj2Qid3OgqbSsYyRE5aH5FZ8xVLyFrBMPMRj24g==";
     };
     dependencies = [
       sources."@babel/runtime-7.12.5"
-      sources."@node-red/editor-api-1.2.2"
-      sources."@node-red/editor-client-1.2.2"
-      (sources."@node-red/nodes-1.2.2" // {
+      sources."@node-red/editor-api-1.2.3"
+      sources."@node-red/editor-client-1.2.3"
+      (sources."@node-red/nodes-1.2.3" // {
         dependencies = [
           sources."cookie-0.4.1"
           sources."http-errors-1.7.3"
@@ -87276,9 +86881,9 @@ in
           })
         ];
       })
-      sources."@node-red/registry-1.2.2"
-      sources."@node-red/runtime-1.2.2"
-      sources."@node-red/util-1.2.2"
+      sources."@node-red/registry-1.2.3"
+      sources."@node-red/runtime-1.2.3"
+      sources."@node-red/util-1.2.3"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       (sources."agent-base-6.0.2" // {
@@ -87343,7 +86948,7 @@ in
       sources."body-parser-1.19.0"
       sources."boolbase-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-from-1.1.1"
       sources."busboy-0.2.14"
       sources."bytes-3.1.0"
@@ -87381,7 +86986,6 @@ in
       sources."cron-1.7.2"
       sources."css-select-1.2.0"
       sources."css-what-2.1.3"
-      sources."d-1.0.1"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."deep-extend-0.6.0"
@@ -87409,19 +87013,9 @@ in
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
-      sources."es5-ext-0.10.53"
-      sources."es6-iterator-2.0.3"
-      sources."es6-map-0.1.5"
-      (sources."es6-set-0.1.5" // {
-        dependencies = [
-          sources."es6-symbol-3.1.1"
-        ];
-      })
-      sources."es6-symbol-3.1.3"
       sources."escape-html-1.0.3"
       sources."esprima-4.0.1"
       sources."etag-1.8.1"
-      sources."event-emitter-0.3.5"
       (sources."express-4.17.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -87432,11 +87026,6 @@ in
           sources."depd-2.0.0"
         ];
       })
-      (sources."ext-1.4.0" // {
-        dependencies = [
-          sources."type-2.1.0"
-        ];
-      })
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
@@ -87513,7 +87102,7 @@ in
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonata-1.8.3"
+      sources."jsonata-1.8.4"
       sources."jsonfile-4.0.0"
       sources."jsprim-1.4.1"
       sources."leven-2.1.0"
@@ -87532,9 +87121,10 @@ in
       sources."lodash.some-4.6.0"
       sources."lru-cache-4.1.5"
       sources."media-typer-0.3.0"
-      (sources."memorystore-1.6.2" // {
+      (sources."memorystore-1.6.4" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.3.0"
+          sources."ms-2.1.2"
         ];
       })
       sources."merge-descriptors-1.0.1"
@@ -87557,14 +87147,13 @@ in
       sources."mkdirp-0.5.5"
       sources."moment-2.29.1"
       sources."moment-timezone-0.5.31"
-      (sources."mqtt-4.2.1" // {
+      (sources."mqtt-4.2.4" // {
         dependencies = [
+          sources."concat-stream-2.0.0"
           sources."debug-4.3.0"
-          sources."isarray-1.0.0"
           sources."ms-2.1.2"
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
+          sources."readable-stream-3.6.0"
+          sources."string_decoder-1.3.0"
           sources."ws-7.3.1"
         ];
       })
@@ -87586,7 +87175,6 @@ in
         ];
       })
       sources."negotiator-0.6.2"
-      sources."next-tick-1.0.0"
       (sources."node-pre-gyp-0.14.0" // {
         dependencies = [
           sources."chownr-1.1.4"
@@ -87723,10 +87311,9 @@ in
       sources."tslib-2.0.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."type-1.2.0"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.11.2"
+      sources."uglify-js-3.11.4"
       sources."uid-safe-2.1.5"
       sources."uid2-0.0.3"
       sources."unc-path-regex-0.1.2"
@@ -87831,7 +87418,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
@@ -88363,7 +87950,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."pacote-11.1.12"
+      sources."pacote-11.1.13"
       sources."parse-github-url-1.0.2"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
@@ -88792,7 +88379,7 @@ in
       sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.10.4"
       sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.5"
+      sources."@babel/types-7.12.6"
       sources."@iarna/toml-2.2.5"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
@@ -88911,7 +88498,7 @@ in
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001154"
+      sources."caniuse-lite-1.0.30001156"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -88937,7 +88524,7 @@ in
       sources."convert-source-map-1.7.0"
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.6.11"
-      (sources."core-js-compat-3.6.5" // {
+      (sources."core-js-compat-3.7.0" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -89049,7 +88636,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.587"
+      sources."electron-to-chromium-1.3.589"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -89188,7 +88775,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-color-stop-1.1.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -90357,7 +89944,7 @@ in
       sources."is-arguments-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-callable-1.2.2"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-date-object-1.0.2"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
@@ -90601,7 +90188,7 @@ in
       sources."bncode-0.5.3"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -91093,7 +90680,7 @@ in
       sources."inherits-2.0.4"
       sources."ip-1.1.5"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
@@ -91180,7 +90767,7 @@ in
       sources."statuses-1.5.0"
       sources."string_decoder-0.10.31"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.27.11"
+      sources."systeminformation-4.28.1"
       sources."thunkify-2.1.2"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
@@ -91542,7 +91129,7 @@ in
         ];
       })
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."json-stable-stringify-0.0.1"
@@ -92090,7 +91677,7 @@ in
       sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.10.4"
       sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.5"
+      sources."@babel/types-7.12.6"
       sources."@emotion/is-prop-valid-0.8.8"
       sources."@emotion/memoize-0.7.4"
       sources."@emotion/stylis-0.8.5"
@@ -92159,7 +91746,7 @@ in
       sources."color-name-1.1.3"
       sources."console-browserify-1.2.0"
       sources."constants-browserify-1.0.0"
-      sources."core-js-3.6.5"
+      sources."core-js-3.7.0"
       sources."core-util-is-1.0.2"
       (sources."create-ecdh-4.0.4" // {
         dependencies = [
@@ -92459,7 +92046,7 @@ in
       sources."@types/node-12.7.12"
       sources."@types/node-fetch-2.5.7"
       sources."@types/resolve-1.17.1"
-      sources."@types/vscode-1.50.0"
+      sources."@types/vscode-1.51.0"
       (sources."@typescript-eslint/eslint-plugin-3.10.1" // {
         dependencies = [
           sources."semver-7.3.2"
@@ -92613,7 +92200,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
@@ -92747,10 +92334,10 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."vscode-jsonrpc-6.0.0-next.5"
-      sources."vscode-languageclient-7.0.0-next.9"
-      sources."vscode-languageserver-protocol-3.16.0-next.7"
-      sources."vscode-languageserver-types-3.16.0-next.3"
+      sources."vscode-jsonrpc-6.0.0-next.7"
+      sources."vscode-languageclient-7.0.0-next.12"
+      sources."vscode-languageserver-protocol-3.16.0-next.10"
+      sources."vscode-languageserver-types-3.16.0-next.4"
       sources."vscode-test-1.4.1"
       sources."which-2.0.2"
       sources."which-module-2.0.0"
@@ -92934,10 +92521,10 @@ in
   sass = nodeEnv.buildNodePackage {
     name = "sass";
     packageName = "sass";
-    version = "1.28.0";
+    version = "1.29.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz";
-      sha512 = "9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A==";
+      url = "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz";
+      sha512 = "ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==";
     };
     dependencies = [
       sources."anymatch-3.1.1"
@@ -93093,10 +92680,10 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "2.10.0";
+    version = "2.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-2.10.0.tgz";
-      sha512 = "5q/8gJvOh3ssqskIw/UNLyXWWLEfJtvRiPK7qnOS71uvjz19mtL+a3XrowMNe/KINRXzzMWBGpGNwzcLEAhcZQ==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-2.11.0.tgz";
+      sha512 = "xR6ntWPdLA2gMauiuXAXUImUEFEVe8vmPbIZ4pbc34VwbztyeAnhUf4JyOL9wfDHStdJC2vqZ/zDngTJbM0DxQ==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
@@ -93141,10 +92728,10 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."@serverless/enterprise-plugin-4.1.1"
+      sources."@serverless/enterprise-plugin-4.1.2"
       sources."@serverless/event-mocks-1.1.1"
       sources."@serverless/platform-client-3.1.2"
-      sources."@serverless/platform-client-china-2.0.7"
+      sources."@serverless/platform-client-china-2.0.8"
       (sources."@serverless/platform-sdk-2.3.2" // {
         dependencies = [
           sources."chalk-2.4.2"
@@ -93166,12 +92753,12 @@ in
       sources."@serverless/utils-china-1.0.10"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@tencent-sdk/capi-1.1.5"
+      sources."@tencent-sdk/capi-1.1.6"
       sources."@types/cacheable-request-6.0.1"
       sources."@types/caseless-0.12.2"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/lodash-4.14.164"
+      sources."@types/lodash-4.14.165"
       sources."@types/long-4.0.1"
       sources."@types/node-14.14.6"
       sources."@types/request-2.48.5"
@@ -93230,7 +92817,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.784.0" // {
+      (sources."aws-sdk-2.786.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -93281,7 +92868,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -93363,7 +92950,7 @@ in
         ];
       })
       sources."dashdash-1.14.1"
-      sources."dayjs-1.9.4"
+      sources."dayjs-1.9.5"
       sources."debug-3.1.0"
       sources."decode-uri-component-0.2.0"
       sources."decompress-4.2.1"
@@ -93471,13 +93058,6 @@ in
       sources."filenamify-3.0.0"
       sources."filesize-6.1.0"
       sources."fill-range-7.0.1"
-      (sources."find-process-1.4.4" // {
-        dependencies = [
-          sources."commander-5.1.0"
-          sources."debug-4.3.0"
-          sources."ms-2.1.2"
-        ];
-      })
       sources."find-requires-1.0.0"
       sources."flat-5.0.2"
       sources."follow-redirects-1.5.10"
@@ -94593,10 +94173,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.424.1";
+    version = "1.424.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.424.1.tgz";
-      sha512 = "jPfGpI/cCPc1xn335GP7fVVHkqw/ss3W8ie9p+KM748QgZkc5JMuUJKc9lB1y+5+H7wpCnt4wuO1jKkFBpwSUQ==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.424.4.tgz";
+      sha512 = "l+p0PgYx7+xmAYNGy4hvd8hXtDIcQzYM1SrI7uM4CtlxR0Hjze93p0TcE3GYxSuia3IUDub95DIVtWmxLCeCMw==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -94678,7 +94258,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."browserify-zlib-0.1.4"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-from-1.1.1"
       sources."bytes-3.1.0"
       sources."cacheable-lookup-5.0.3"
@@ -95218,68 +94798,29 @@ in
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
-    version = "2.3.0";
+    version = "3.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz";
-      sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.0.tgz";
+      sha512 = "arLQtd+UoJ08NXBRBGUJDyQ9B+cc9WwD67hc5s1WQcs2DyAkYzI5HWg4U0CrFtK00kjyAWxBGhLwVbfOeMqz1A==";
     };
     dependencies = [
       sources."accepts-1.3.7"
-      sources."after-0.8.2"
-      sources."arraybuffer.slice-0.0.7"
-      sources."async-limiter-1.0.1"
-      sources."backo2-1.0.2"
-      sources."base64-arraybuffer-0.1.4"
       sources."base64id-2.0.0"
-      sources."better-assert-1.0.2"
-      sources."blob-0.0.5"
-      sources."callsite-1.0.0"
-      sources."component-bind-1.0.0"
-      sources."component-emitter-1.2.1"
-      sources."component-inherit-0.0.3"
-      sources."cookie-0.3.1"
+      sources."component-emitter-1.3.0"
+      sources."cookie-0.4.1"
+      sources."cors-2.8.5"
       sources."debug-4.1.1"
-      sources."engine.io-3.4.2"
-      (sources."engine.io-client-3.4.4" // {
-        dependencies = [
-          sources."component-emitter-1.3.0"
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-          sources."parseqs-0.0.6"
-          sources."parseuri-0.0.6"
-          sources."ws-6.1.4"
-        ];
-      })
-      sources."engine.io-parser-2.2.1"
-      sources."has-binary2-1.0.3"
-      sources."has-cors-1.1.0"
-      sources."indexof-0.0.1"
-      sources."isarray-2.0.1"
+      sources."engine.io-4.0.1"
+      sources."engine.io-parser-4.0.1"
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
       sources."ms-2.1.2"
       sources."negotiator-0.6.2"
-      sources."object-component-0.0.3"
-      sources."parseqs-0.0.5"
-      sources."parseuri-0.0.5"
-      sources."socket.io-adapter-1.1.2"
-      (sources."socket.io-client-2.3.0" // {
-        dependencies = [
-          sources."base64-arraybuffer-0.1.5"
-          sources."ms-2.0.0"
-          (sources."socket.io-parser-3.3.1" // {
-            dependencies = [
-              sources."component-emitter-1.3.0"
-              sources."debug-3.1.0"
-            ];
-          })
-        ];
-      })
-      sources."socket.io-parser-3.4.1"
-      sources."to-array-0.1.4"
+      sources."object-assign-4.1.1"
+      sources."socket.io-adapter-2.0.3"
+      sources."socket.io-parser-4.0.1"
+      sources."vary-1.1.2"
       sources."ws-7.3.1"
-      sources."xmlhttprequest-ssl-1.5.5"
-      sources."yeast-0.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -95358,7 +94899,7 @@ in
       sources."ini-1.3.5"
       sources."is-arrayish-0.2.1"
       sources."is-ci-1.2.1"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
@@ -95520,7 +95061,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."braces-1.8.5"
       sources."broadcast-stream-0.2.2"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-from-1.1.1"
       (sources."cache-base-1.0.1" // {
         dependencies = [
@@ -96392,7 +95933,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.784.0" // {
+      (sources."aws-sdk-2.786.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -96647,7 +96188,7 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       (sources."is-expression-3.0.0" // {
         dependencies = [
           sources."acorn-4.0.13"
@@ -98145,7 +97686,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-date-object-1.0.2"
       sources."is-decimal-1.0.4"
       sources."is-file-1.0.0"
@@ -98518,7 +98059,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-2.0.5"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-decimal-1.0.4"
       sources."is-empty-1.2.0"
       sources."is-fullwidth-code-point-2.0.0"
@@ -99258,7 +98799,7 @@ in
       sources."content-type-1.0.4"
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."core-js-3.6.5"
+      sources."core-js-3.7.0"
       sources."core-util-is-1.0.2"
       sources."css-select-1.2.0"
       sources."css-what-2.1.3"
@@ -100524,7 +100065,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."isarray-1.0.0"
       sources."mimic-response-2.1.0"
@@ -100826,7 +100367,7 @@ in
       sources."@types/json5-0.0.30"
       sources."@types/mocha-7.0.2"
       sources."@types/node-8.10.66"
-      sources."@types/vscode-1.50.0"
+      sources."@types/vscode-1.51.0"
       sources."@types/yauzl-2.9.1"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
@@ -101681,7 +101222,7 @@ in
       sources."bl-1.2.3"
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -102235,7 +101776,7 @@ in
       sources."format-0.2.2"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.2.0"
+      sources."fsevents-2.2.1"
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       sources."get-caller-file-1.0.3"
@@ -102311,7 +101852,7 @@ in
       sources."is-binary-path-2.1.0"
       sources."is-buffer-2.0.5"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-decimal-1.0.4"
       sources."is-descriptor-1.0.2"
@@ -103000,7 +102541,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."buffer-5.7.0"
+      sources."buffer-5.7.1"
       sources."buffer-crc32-0.2.13"
       sources."buffer-equal-constant-time-1.0.1"
       sources."buffer-from-1.1.1"
@@ -103898,10 +103439,10 @@ in
       sources."ajv-keywords-3.5.2"
       sources."browserslist-4.14.6"
       sources."buffer-from-1.1.1"
-      sources."caniuse-lite-1.0.30001154"
+      sources."caniuse-lite-1.0.30001156"
       sources."chrome-trace-event-1.0.2"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.587"
+      sources."electron-to-chromium-1.3.589"
       sources."enhanced-resolve-5.3.1"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"
@@ -103971,16 +103512,15 @@ in
   webpack-cli = nodeEnv.buildNodePackage {
     name = "webpack-cli";
     packageName = "webpack-cli";
-    version = "4.1.0";
+    version = "4.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.1.0.tgz";
-      sha512 = "NdhxXMZmoik62Y05t0h1y65LjBM7BwFPq311ihXuMM3RY6dlc4KkCTyHLzTuBEc+bqq6d3xh+CWmU0xRexNJBA==";
+      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.2.0.tgz";
+      sha512 = "EIl3k88vaF4fSxWSgtAQR+VwicfLMTZ9amQtqS4o+TDPW9HGaEpbFBbAZ4A3ZOT5SOnMxNOzROsSTPiE8tBJPA==";
     };
     dependencies = [
-      sources."@webpack-cli/info-1.0.2"
-      sources."@webpack-cli/serve-1.0.1"
+      sources."@webpack-cli/info-1.1.0"
+      sources."@webpack-cli/serve-1.1.0"
       sources."ansi-colors-4.1.1"
-      sources."ansi-escapes-4.3.1"
       sources."ansi-styles-3.2.1"
       sources."array-back-4.0.1"
       sources."chalk-2.4.2"
@@ -104004,9 +103544,10 @@ in
       sources."human-signals-1.1.1"
       sources."import-local-3.0.2"
       sources."interpret-2.2.0"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-stream-2.0.0"
       sources."isexe-2.0.0"
+      sources."leven-3.1.0"
       sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."merge-stream-2.0.0"
@@ -104033,7 +103574,6 @@ in
       sources."strip-final-newline-2.0.0"
       sources."supports-color-5.5.0"
       sources."table-layout-1.0.1"
-      sources."type-fest-0.11.0"
       sources."typical-5.2.0"
       sources."v8-compile-cache-2.2.0"
       sources."webpack-merge-4.2.2"
@@ -104793,13 +104333,20 @@ in
           sources."ms-2.1.2"
         ];
       })
-      sources."bittorrent-peerid-1.3.3"
-      (sources."bittorrent-protocol-3.1.2" // {
+      (sources."bittorrent-lsd-1.0.0" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."ms-2.1.2"
         ];
       })
+      sources."bittorrent-peerid-1.3.3"
+      (sources."bittorrent-protocol-3.2.0" // {
+        dependencies = [
+          sources."bitfield-4.0.0"
+          sources."debug-4.3.0"
+          sources."ms-2.1.2"
+        ];
+      })
       (sources."bittorrent-tracker-9.15.0" // {
         dependencies = [
           sources."debug-4.3.0"
@@ -105011,7 +104558,7 @@ in
       sources."thunky-0.1.0"
       sources."timeout-refresh-1.0.3"
       sources."to-arraybuffer-1.0.1"
-      (sources."torrent-discovery-9.3.0" // {
+      (sources."torrent-discovery-9.4.0" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."ms-2.1.2"
@@ -105026,8 +104573,9 @@ in
       sources."upnp-device-client-1.0.2"
       sources."upnp-mediarenderer-client-1.4.0"
       sources."url-join-4.0.1"
-      (sources."ut_metadata-3.5.1" // {
+      (sources."ut_metadata-3.5.2" // {
         dependencies = [
+          sources."bitfield-4.0.0"
           sources."debug-4.3.0"
           sources."ms-2.1.2"
         ];
@@ -105322,7 +104870,7 @@ in
       sources."config-chain-1.1.12"
       sources."configstore-3.1.5"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.6.5"
+      sources."core-js-3.7.0"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-6.0.5"
@@ -105515,7 +105063,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-ci-1.2.1"
-      sources."is-core-module-2.0.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-docker-1.1.0"
diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index 2e6db32966d4..b77ff811c702 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -2,10 +2,10 @@
 
 {
   rust-analyzer-unwrapped = callPackage ./generic.nix rec {
-    rev = "2020-10-19";
+    rev = "2020-11-02";
     version = "unstable-${rev}";
-    sha256 = "1xvyk1d26zn1d9i42h78qsm6bg57nhn1rgr46jwa46gsb31nabjh";
-    cargoSha256 = "18s5yrc9fdj2ndylwyf07l0kmwxka7mnbj254xmq3g7ragw71xjw";
+    sha256 = "1f64286ywsjw9s8kai3jw2dqnqswm2vnms6ilxx1x706mridxjv0";
+    cargoSha256 = "0q53w43gag2pfb20jywikdbac291rvr1zmjnmwq462m5wfz0w127";
   };
 
   rust-analyzer = callPackage ./wrapper.nix {} {
diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix
index ca72f91953cf..cbcab33e0db3 100644
--- a/pkgs/development/tools/rust/rust-analyzer/generic.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix
@@ -16,11 +16,6 @@ rustPlatform.buildRustPackage {
     inherit rev sha256;
   };
 
-  # FIXME: Temporary fixes for our rust 1.46.0
-  patches = [
-    ./no-track_env_var.patch # Requires rustc 1.47.0
-  ];
-
   buildAndTestSubdir = "crates/rust-analyzer";
 
   cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc";
diff --git a/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch b/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch
deleted file mode 100644
index f5173c4bacbc..000000000000
--- a/pkgs/development/tools/rust/rust-analyzer/no-track_env_var.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-This patch revert 3d169bd3f4cdc2dc3dd09eadbbc17c19214d69f3 (Add track_env_var to the proc macro server).
-
-diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/client.rs b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs
-index 55d6330cc..cb4b3bdb0 100644
---- a/crates/proc_macro_srv/src/proc_macro/bridge/client.rs
-+++ b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs
-@@ -160,7 +160,6 @@ macro_rules! define_handles {
- }
- define_handles! {
-     'owned:
--    FreeFunctions,
-     TokenStream,
-     TokenStreamBuilder,
-     TokenStreamIter,
-diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs
-index b97886eb9..aeb05aad4 100644
---- a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs
-+++ b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs
-@@ -57,10 +57,6 @@ use std::thread;
- macro_rules! with_api {
-     ($S:ident, $self:ident, $m:ident) => {
-         $m! {
--            FreeFunctions {
--                fn drop($self: $S::FreeFunctions);
--                fn track_env_var(var: &str, value: Option<&str>);
--            },
-             TokenStream {
-                 fn drop($self: $S::TokenStream);
-                 fn clone($self: &$S::TokenStream) -> $S::TokenStream;
-diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs
-index 3acb239af..45d41ac02 100644
---- a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs
-+++ b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs
-@@ -11,8 +11,6 @@ use super::client::HandleStore;
- /// Declare an associated item of one of the traits below, optionally
- /// adjusting it (i.e., adding bounds to types and default bodies to methods).
- macro_rules! associated_item {
--    (type FreeFunctions) =>
--        (type FreeFunctions: 'static;);
-     (type TokenStream) =>
-         (type TokenStream: 'static + Clone;);
-     (type TokenStreamBuilder) =>
-diff --git a/crates/proc_macro_srv/src/proc_macro/mod.rs b/crates/proc_macro_srv/src/proc_macro/mod.rs
-index fc6e7344f..ee0dc9722 100644
---- a/crates/proc_macro_srv/src/proc_macro/mod.rs
-+++ b/crates/proc_macro_srv/src/proc_macro/mod.rs
-@@ -924,25 +924,3 @@ impl fmt::Debug for Literal {
-         self.0.fmt(f)
-     }
- }
--
--pub mod tracked_env {
--    use std::env::{self, VarError};
--    use std::ffi::OsStr;
--
--    /// Retrieve an environment variable and add it to build dependency info.
--    /// Build system executing the compiler will know that the variable was accessed during
--    /// compilation, and will be able to rerun the build when the value of that variable changes.
--    /// Besides the dependency tracking this function should be equivalent to `env::var` from the
--    /// standard library, except that the argument must be UTF-8.
--    pub fn var<K: AsRef<OsStr> + AsRef<str>>(key: K) -> Result<String, VarError> {
--        use std::ops::Deref;
--
--        let key: &str = key.as_ref();
--        let value = env::var(key);
--        super::bridge::client::FreeFunctions::track_env_var(
--            key,
--            value.as_ref().map(|t| t.deref()).ok(),
--        );
--        value
--    }
--}
-diff --git a/crates/proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs
-index c5fe3591e..7d1695c86 100644
---- a/crates/proc_macro_srv/src/rustc_server.rs
-+++ b/crates/proc_macro_srv/src/rustc_server.rs
-@@ -242,8 +242,6 @@ impl TokenStreamBuilder {
-     }
- }
-
--pub struct FreeFunctions;
--
- #[derive(Clone)]
- pub struct TokenStreamIter {
-     trees: IntoIter<TokenTree>,
-@@ -256,7 +254,6 @@ pub struct Rustc {
- }
-
- impl server::Types for Rustc {
--    type FreeFunctions = FreeFunctions;
-     type TokenStream = TokenStream;
-     type TokenStreamBuilder = TokenStreamBuilder;
-     type TokenStreamIter = TokenStreamIter;
-@@ -270,13 +267,6 @@ impl server::Types for Rustc {
-     type MultiSpan = Vec<Span>;
- }
-
--impl server::FreeFunctions for Rustc {
--    fn track_env_var(&mut self, _var: &str, _value: Option<&str>) {
--        // FIXME: track env var accesses
--        // https://github.com/rust-lang/rust/pull/71858
--    }
--}
--
- impl server::TokenStream for Rustc {
-     fn new(&mut self) -> Self::TokenStream {
-         Self::TokenStream::new()
-diff --git a/xtask/src/install.rs b/xtask/src/install.rs
-index fcc4f05e4..d829790d7 100644
---- a/xtask/src/install.rs
-+++ b/xtask/src/install.rs
-@@ -7,7 +7,7 @@ use anyhow::{bail, format_err, Context, Result};
- use crate::not_bash::{pushd, run};
-
- // Latest stable, feel free to send a PR if this lags behind.
--const REQUIRED_RUST_VERSION: u32 = 47;
-+const REQUIRED_RUST_VERSION: u32 = 46;
-
- pub struct InstallCmd {
-     pub client: Option<ClientOpt>,
diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
index 4af15f4619ea..ea91b6d6470e 100644
--- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
+++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
@@ -3,7 +3,7 @@
   "version": "0.4.0-dev",
   "dependencies": {
     "node-fetch": "^2.6.1",
-    "vscode-languageclient": "7.0.0-next.9",
+    "vscode-languageclient": "7.0.0-next.12",
     "@rollup/plugin-commonjs": "^13.0.2",
     "@rollup/plugin-node-resolve": "^8.4.0",
     "@types/glob": "^7.1.3",

From 79a01d91e2ed1fc9795717bfc30024aacd609ede Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 08:23:14 +0000
Subject: [PATCH 1639/3942] python27Packages.libtmux: 0.8.3 -> 0.8.5

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

diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 605cbe040269..9df5cffec97b 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "libtmux";
-  version = "0.8.3";
+  version = "0.8.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a4c7379604ccdc684aa865723211184709f9a2b45511772989b5f26ad156650e";
+    sha256 = "1d35b9f8451944d31c5ed22ed9e6c8e18034adcc75718fcc5b27fbd9621543e1";
   };
 
   checkInputs = [ pytest ];

From a7de168b125701f03f18a15973a007745358047d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 08:57:47 +0000
Subject: [PATCH 1640/3942] python37Packages.proto-plus: 1.10.1 -> 1.11.0

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

diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix
index d542d6f64778..4a36b625298d 100644
--- a/pkgs/development/python-modules/proto-plus/default.nix
+++ b/pkgs/development/python-modules/proto-plus/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "proto-plus";
-  version = "1.10.1";
+  version = "1.11.0";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n8ia51jg2dkab2sf0qnh39bssqhz65ybcqr78f3zzf7ja923lkr";
+    sha256 = "416a0f13987789333cd8760a0ee998f8eccd6d7165ee9f283d64ca2de3e8774d";
   };
 
   propagatedBuildInputs = [ protobuf ];

From 2778cf633a2cec6277ac8ead1f7297ffe980e04f Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:13:56 -0800
Subject: [PATCH 1641/3942] python3Packages.google-cloud-iam: init at 2.0.0

---
 .../google-cloud-iam/default.nix              | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/google-cloud-iam/default.nix

diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix
new file mode 100644
index 000000000000..9d6120629380
--- /dev/null
+++ b/pkgs/development/python-modules/google-cloud-iam/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_api_core, libcst, mock, proto-plus, pytest-asyncio }:
+
+buildPythonPackage rec {
+  pname = "google-cloud-iam";
+  version = "2.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1zxsx5avs8njiyw32zvsx2yblmmiwxy771x334hbgmy0aqms4lak";
+  };
+
+  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+  meta = with lib; {
+    description = "Google Cloud IAM API client library";
+    homepage = "https://github.com/googleapis/python-iam";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ austinbutler ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2609284bf61a..d21021bc36ee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2470,6 +2470,8 @@ in {
 
   google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { };
 
+  google-cloud-iam = callPackage ../development/python-modules/google-cloud-iam { };
+
   google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { };
 
   google_cloud_kms = callPackage ../development/python-modules/google_cloud_kms { };

From b6421926db39a3fdb07eaf76e4bcfe361dafbeed Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:14:27 -0800
Subject: [PATCH 1642/3942] python3Packages.google_api_core: 1.22.1 -> 1.22.4

---
 .../google_api_core/default.nix               | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix
index a72f68c19ff9..40c800100855 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google_api_core/default.nix
@@ -1,32 +1,27 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27
-, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio
-, mock
-}:
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_auth, protobuf
+, googleapis_common_protos, requests, grpcio, mock, pytest, pytest-asyncio, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "1.22.1";
-  disabled = isPy27; # google namespace no longer works on python2
+  version = "1.22.4";
+  disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "35cba563034d668ae90ffe1f03193a84e745b38f09592f60258358b5e5ee6238";
+    sha256 = "06pck3hwl1pks26q843hv6pxchby9viab05mxf72k7ksab17m7aa";
   };
 
-  propagatedBuildInputs = [
-    googleapis_common_protos protobuf
-    google_auth requests setuptools grpcio
-  ];
+  propagatedBuildInputs =
+    [ googleapis_common_protos protobuf google_auth requests grpcio ];
 
-  # requires nox
-  doCheck = false;
-  checkInputs = [ mock ];
+  checkInputs = [ google_auth mock protobuf pytest-asyncio pytestCheckHook ];
 
-  pythonImportsCheck = [
-    "google.auth"
-    "google.protobuf"
-    "google.api"
-  ];
+  # prevent google directory from shadowing google imports
+  preCheck = ''
+    rm -r google
+  '';
+
+  pythonImportsCheck = [ "google.auth" "google.protobuf" "google.api" ];
 
   meta = with lib; {
     description = "Core Library for Google Client Libraries";
@@ -35,7 +30,8 @@ buildPythonPackage rec {
       helpers used by all Google API clients.
     '';
     homepage = "https://github.com/googleapis/python-api-core";
-    changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md";
+    changelog =
+      "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ ];
   };

From 618da3917d0992b864db9f0255f50fce07537053 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:14:43 -0800
Subject: [PATCH 1643/3942] python3Packages.google_auth: 1.20.1 -> 1.22.1

---
 .../python-modules/google_auth/default.nix    | 35 ++++++-------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix
index 59ed94d34865..3f201aee2331 100644
--- a/pkgs/development/python-modules/google_auth/default.nix
+++ b/pkgs/development/python-modules/google_auth/default.nix
@@ -1,29 +1,19 @@
-{ stdenv, buildPythonPackage, fetchpatch, fetchPypi
-, cachetools
-, flask
-, freezegun
-, mock
-, oauth2client
-, pyasn1-modules
-, pytest
-, pytest-localserver
-, requests
-, responses
-, rsa
-, setuptools
-, six
-, urllib3
-}:
+{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder
+, pytestCheckHook, cachetools, flask, freezegun, mock, oauth2client
+, pyasn1-modules, pytest, pytest-localserver, requests, responses, rsa
+, setuptools, six, urllib3 }:
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "1.20.1";
+  version = "1.22.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2f34dd810090d0d4c9d5787c4ad7b4413d1fbfb941e13682c7a2298d3b6cdcc8";
+    sha256 = "1fs448jcx2cbpk0nq3picndfryjsakmd9allggvh7mrqjiw723ww";
   };
 
+  disabled = pythonOlder "3.5";
+
   propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ];
 
   checkInputs = [
@@ -31,17 +21,13 @@ buildPythonPackage rec {
     freezegun
     mock
     oauth2client
-    pytest
+    pytestCheckHook
     pytest-localserver
     requests
     responses
     urllib3
   ];
 
-  checkPhase = ''
-    py.test
-  '';
-
   meta = with stdenv.lib; {
     description = "Google Auth Python Library";
     longDescription = ''
@@ -49,7 +35,8 @@ buildPythonPackage rec {
       authentication mechanisms to access Google APIs.
     '';
     homepage = "https://github.com/googleapis/google-auth-library-python";
-    changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
+    changelog =
+      "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
     # Documentation: https://googleapis.dev/python/google-auth/latest/index.html
     license = licenses.asl20;
     maintainers = with maintainers; [ ];

From c4d8e9743a009081dc406b69ed4e8a8d8d840a51 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:15:01 -0800
Subject: [PATCH 1644/3942] python3Packages.google_cloud_automl: 1.0.1 -> 2.0.0

---
 .../google_cloud_automl/default.nix           | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix
index 43ffdc7a70db..8ed42aeed282 100644
--- a/pkgs/development/python-modules/google_cloud_automl/default.nix
+++ b/pkgs/development/python-modules/google_cloud_automl/default.nix
@@ -1,34 +1,38 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, google_api_core
-, google_cloud_storage
-, pandas
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, libcst
+, google_api_core, google_cloud_storage, google_cloud_testutils, pandas
+, proto-plus, pytest-asyncio, mock }:
 
 buildPythonPackage rec {
   pname = "google-cloud-automl";
-  version = "1.0.1";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f08abe78d37fb94a3748aa43e66dae2bad52f991cc7740501a341bc6f6387fd5";
+    sha256 = "16hr1i2771z4yh19xg6kk037h9cv5j64q5bxb9nmkvj12hdwbwgv";
   };
 
-  checkInputs = [ pandas pytest mock google_cloud_storage ];
-  propagatedBuildInputs = [ enum34 google_api_core ];
+  disabled = pythonOlder "3.6";
+
+  checkInputs = [
+    google_cloud_storage
+    google_cloud_testutils
+    mock
+    pandas
+    pytest-asyncio
+    pytestCheckHook
+  ];
+  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
 
   # ignore tests which need credentials
-  checkPhase = ''
-    pytest tests/unit -k 'not upload and not prediction_client_client_info'
+  disabledTests = [ "test_prediction_client_client_info" ];
+  preCheck = ''
+    rm -r google
+    rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py
   '';
 
   meta = with stdenv.lib; {
     description = "Cloud AutoML API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://github.com/googleapis/python-automl";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From f2b0d07cf08824234cd0cefe3ee579b1ae3ba3d9 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:15:10 -0800
Subject: [PATCH 1645/3942] python3Packages.google_cloud_bigquery: 1.26.1 ->
 2.1.0

---
 .../google_cloud_bigquery/default.nix         | 52 ++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix
index b8120285917f..356850876a7a 100644
--- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix
+++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix
@@ -1,42 +1,46 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, freezegun
-, google_resumable_media
-, google_api_core
-, google_cloud_core
-, pandas
-, pyarrow
-, pytest
-, mock
-, ipython
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, freezegun
+, google_api_core, google_cloud_core, google_cloud_testutils
+, google_resumable_media, grpcio, ipython, mock, pandas, proto-plus, pyarrow }:
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery";
-  version = "1.26.1";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "51c29b95d460486d9e0210f63e8193691cd08480b69775270e84dd3db87c1bf2";
+    sha256 = "0x5g6n151rcdgq4s80f71zpsl7bsvyyrs07l58psdpyd3kwf4sbk";
   };
 
-  checkInputs = [ pytest mock ipython freezegun ];
-  propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core pandas pyarrow ];
+  disabled = pythonOlder "3.6";
 
-  # prevent local directory from shadowing google imports
-  # call_api_applying_custom_retry_on_timeout requires credentials
+  checkInputs =
+    [ freezegun google_cloud_testutils ipython mock pytestCheckHook ];
+  propagatedBuildInputs = [
+    google_resumable_media
+    google_api_core
+    google_cloud_core
+    pandas
+    proto-plus
+    pyarrow
+  ];
+
+  # prevent google directory from shadowing google imports
   # test_magics requires modifying sys.path
-  checkPhase = ''
+  preCheck = ''
     rm -r google
-    pytest tests/unit \
-      -k 'not call_api_applying_custom_retry_on_timeout' \
-      --ignore=tests/unit/test_magics.py
+    rm tests/unit/test_magics.py
   '';
 
+  # call_api_applying_custom_retry_on_timeout requires credentials
+  # to_dataframe_timestamp_out_of_pyarrow_bounds has inconsistent results
+  disabledTests = [
+    "call_api_applying_custom_retry_on_timeout"
+    "to_dataframe_timestamp_out_of_pyarrow_bounds"
+  ];
+
   meta = with stdenv.lib; {
     description = "Google BigQuery API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://pypi.org/project/google-cloud-bigquery";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From 7cbe301ffc940496b5929c01750892b9fdfbe05b Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:15:22 -0800
Subject: [PATCH 1646/3942] python3Packages.google_cloud_container: 2.0.1 ->
 2.1.0

---
 .../google_cloud_container/default.nix        | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/pkgs/development/python-modules/google_cloud_container/default.nix
index ec41592b48b6..e155a545a153 100644
--- a/pkgs/development/python-modules/google_cloud_container/default.nix
+++ b/pkgs/development/python-modules/google_cloud_container/default.nix
@@ -1,23 +1,20 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, grpc_google_iam_v1
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, google_api_core
+, grpc_google_iam_v1, libcst, mock, proto-plus, pytest, pytest-asyncio }:
 
 buildPythonPackage rec {
   pname = "google-cloud-container";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6f714e3d427e2b36d1365fc400f4d379972529fb40f798d9c0e06c7c3418fc89";
+    sha256 = "07rcq4c49zfaacyn5df62bs7qjf5hpmdm9mpb6nx510lylq0507x";
   };
 
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 ];
+  disabled = pythonOlder "3.6";
+
+  checkInputs = [ mock pytest pytest-asyncio ];
+  propagatedBuildInputs =
+    [ google_api_core grpc_google_iam_v1 libcst proto-plus ];
 
   checkPhase = ''
     pytest tests/unit
@@ -25,7 +22,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Google Container Engine API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://github.com/googleapis/python-container";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From d1cd5b6f54002793e757ebbdd8737d22d6aa3210 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:15:39 -0800
Subject: [PATCH 1647/3942] python3Packages.google_cloud_core: 1.4.1 -> 1.4.3

---
 .../google_cloud_core/default.nix             | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix
index f277711e8f16..88bc24d493c9 100644
--- a/pkgs/development/python-modules/google_cloud_core/default.nix
+++ b/pkgs/development/python-modules/google_cloud_core/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, buildPythonPackage, fetchPypi, python
-, google_api_core, grpcio, pytest, mock, setuptools }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, python
+, google_api_core, grpcio, mock }:
 
 buildPythonPackage rec {
   pname = "google-cloud-core";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "613e56f164b6bee487dd34f606083a0130f66f42f7b10f99730afdf1630df507";
+    sha256 = "103bgv9d6fw01vbbdx0qxa5gqdzxqmiwlpdvibmqxkhb3c6bgbr1";
   };
 
-  propagatedBuildInputs = [ google_api_core grpcio setuptools ];
-  checkInputs = [ pytest mock ];
+  disabled = pythonOlder "3.5";
 
-  checkPhase = ''
-    cd tests
-    ${python.interpreter} -m unittest discover
+  propagatedBuildInputs = [ google_api_core grpcio ];
+  checkInputs = [ google_api_core mock pytestCheckHook ];
+
+  pythonImportsCheck = [ "google.cloud" ];
+
+  # prevent google directory from shadowing google imports
+  preCheck = ''
+    rm -r google
   '';
 
   meta = with stdenv.lib; {
     description = "API Client library for Google Cloud: Core Helpers";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://github.com/googleapis/python-cloud-core";
     license = licenses.asl20;
     maintainers = with maintainers; [ ];
   };

From 3305029ef16af369e2ee92f6a528405f39252623 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:15:57 -0800
Subject: [PATCH 1648/3942] python3Packages.google_cloud_error_reporting:
 0.34.0 -> 1.0.0

---
 .../google_cloud_error_reporting/default.nix  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
index 72502a4f4ad1..350bbaea115b 100644
--- a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
+++ b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
@@ -1,31 +1,31 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_cloud_logging
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_cloud_logging, google_cloud_testutils, libcst, mock, proto-plus
+, pytest-asyncio }:
 
 buildPythonPackage rec {
   pname = "google-cloud-error-reporting";
-  version = "0.34.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "34edd11601b17c87a89c2e1cefdc27d975e1e9243a88ba3c0c48bfe6a05c404f";
+    sha256 = "1y5vkkg1cmzshj5j68zk1876857z8a7sjm0wqhf4rzgqgkr2kcdd";
   };
 
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_cloud_logging ];
+  disabled = pythonOlder "3.6";
 
-  checkPhase = ''
+  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+  propagatedBuildInputs = [ google_cloud_logging libcst proto-plus ];
+
+  # Disable tests that require credentials
+  disabledTests = [ "test_report_error_event" "test_report_exception" ];
+  # prevent google directory from shadowing google imports
+  preCheck = ''
     rm -r google
-    pytest tests/unit
   '';
 
   meta = with stdenv.lib; {
     description = "Stackdriver Error Reporting API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://github.com/googleapis/python-error-reporting";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From 3eda2da78d92f2437d49693947015ecba0d2135a Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:16:19 -0800
Subject: [PATCH 1649/3942] python3Packages.google_cloud_kms: 2.0.1 -> 2.2.0

---
 .../google_cloud_kms/default.nix              | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix
index 79fe4bcc80f2..a4d2439fb49c 100644
--- a/pkgs/development/python-modules/google_cloud_kms/default.nix
+++ b/pkgs/development/python-modules/google_cloud_kms/default.nix
@@ -1,32 +1,28 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, grpc_google_iam_v1
-, google_api_core
-, pytest
-, mock
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, grpc_google_iam_v1, google_api_core, libcst, mock, proto-plus, pytest-asyncio
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-kms";
-  version = "2.0.1";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c590a8ab12a3f776ab35e570d21c0881f9d73c444bd509e54321a4c715233372";
+    sha256 = "0f3k2ixp1zsgydpvkj75bs2mb805389snyw30hn41c38qq5ksdga";
   };
 
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
+  disabled = pythonOlder "3.6";
 
-  checkPhase = ''
-    pytest tests/unit
-  '';
+  checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+  propagatedBuildInputs =
+    [ grpc_google_iam_v1 google_api_core libcst proto-plus ];
+
+  # Disable tests that need credentials
+  disabledTests = [ "test_list_global_key_rings" ];
 
   meta = with stdenv.lib; {
     description = "Cloud Key Management Service (KMS) API API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://github.com/googleapis/python-kms";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From 9324ba634dd9452c9ef547eb4b1530f9799578eb Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:16:31 -0800
Subject: [PATCH 1650/3942] python3Packages.google_cloud_logging: fix tests

---
 .../google_cloud_logging/default.nix          | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google_cloud_logging/default.nix
index 6aeef14b6921..ef155a18a1d1 100644
--- a/pkgs/development/python-modules/google_cloud_logging/default.nix
+++ b/pkgs/development/python-modules/google_cloud_logging/default.nix
@@ -1,14 +1,6 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, google_cloud_core
-, pytest
-, mock
-, webapp2
-, django
-, flask
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, django
+, flask, google_api_core, google_cloud_core, google_cloud_testutils, mock
+, webapp2 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-logging";
@@ -19,17 +11,27 @@ buildPythonPackage rec {
     sha256 = "cb0d4af9d684eb8a416f14c39d9fa6314be3adf41db2dd8ee8e30db9e8853d90";
   };
 
-  checkInputs = [ pytest mock webapp2 django flask ];
+  disabled = pythonOlder "3.5";
+
+  checkInputs =
+    [ django flask google_cloud_testutils mock pytestCheckHook webapp2 ];
   propagatedBuildInputs = [ google_api_core google_cloud_core ];
 
-  checkPhase = ''
+  # api_url test broken, fix not yet released
+  # https://github.com/googleapis/python-logging/pull/66
+  disabledTests =
+    [ "test_build_api_url_w_custom_endpoint" "test_write_log_entries" ];
+
+  # prevent google directory from shadowing google imports
+  # remove system integration tests
+  preCheck = ''
     rm -r google
-    pytest tests/unit
+    rm tests/system/test_system.py
   '';
 
   meta = with stdenv.lib; {
     description = "Stackdriver Logging API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://github.com/googleapis/python-logging";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From 24d644de7d035e7ad02ce1ae733109060037cb74 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:16:49 -0800
Subject: [PATCH 1651/3942] python3Packages.google_cloud_pubsub: 1.7.0 -> 2.1.0

---
 .../google_cloud_pubsub/default.nix           | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix
index 56a956928469..4af622dc66ec 100644
--- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix
+++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix
@@ -1,36 +1,34 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, grpc_google_iam_v1
-, google_api_core
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook
+, google_api_core, google_cloud_testutils, grpc_google_iam_v1, libcst, mock
+, proto-plus, pytest-asyncio }:
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "1.7.0";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c8d098ebd208d00c8f3bb55eefecd8553e7391d59700426a97d35125f0dcb248";
+    sha256 = "0358g5q4igq1pgy8dznbbkc6y7zf36y4m81hhh8hvzzhaa37vc22";
   };
 
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
+  disabled = pythonOlder "3.6";
 
-  # tests don't clean up file descriptors correctly
-  doCheck = false;
-  checkPhase = ''
-    pytest tests/unit
+  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+  propagatedBuildInputs =
+    [ grpc_google_iam_v1 google_api_core libcst proto-plus ];
+
+  # prevent google directory from shadowing google imports
+  # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com
+  preCheck = ''
+    rm -r google
+    rm -r tests/unit/pubsub_v1
   '';
 
   pythonImportsCheck = [ "google.cloud.pubsub" ];
 
   meta = with stdenv.lib; {
     description = "Google Cloud Pub/Sub API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://pypi.org/project/google-cloud-pubsub";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From 7fbefa7cf9a892c526bff6c8f59c833538993c3b Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:17:14 -0800
Subject: [PATCH 1652/3942] python3Packages.google_cloud_resource_manager: fix
 tests

---
 .../google_cloud_resource_manager/default.nix | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
index 84fac88bcfa9..a4b310797a7f 100644
--- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
+++ b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
@@ -1,11 +1,5 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_cloud_core
-, google_api_core
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_cloud_core, google_api_core, mock, pytest }:
 
 buildPythonPackage rec {
   pname = "google-cloud-resource-manager";
@@ -16,17 +10,24 @@ buildPythonPackage rec {
     sha256 = "de7eba5235df61deee2291a2fe70b904154df613a334109488afdea7a4c0011f";
   };
 
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_cloud_core google_api_core ];
+  disabled = pythonOlder "3.5";
 
-  checkPhase = ''
+  checkInputs = [ mock pytestCheckHook ];
+  propagatedBuildInputs = [ google_api_core google_cloud_core ];
+
+  # api_url test broken, fix not yet released
+  # https://github.com/googleapis/python-resource-manager/pull/31
+  disabledTests =
+    [ "api_url_no_extra_query_param" "api_url_w_custom_endpoint" ];
+
+  # prevent google directory from shadowing google imports
+  preCheck = ''
     rm -r google
-    pytest tests/unit
   '';
 
   meta = with stdenv.lib; {
     description = "Google Cloud Resource Manager API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://github.com/googleapis/python-resource-manager";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From d6e7e3c6f82d8ae75247ee77d9cd57fc7366a97f Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:17:29 -0800
Subject: [PATCH 1653/3942] python3Packages.google_cloud_runtimeconfig: fix
 tests

---
 .../google_cloud_runtimeconfig/default.nix    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
index 08e2c38ea1b1..80bdcd1b83cc 100644
--- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
+++ b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
@@ -1,11 +1,5 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, google_cloud_core
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_api_core, google_cloud_core, mock }:
 
 buildPythonPackage rec {
   pname = "google-cloud-runtimeconfig";
@@ -16,18 +10,24 @@ buildPythonPackage rec {
     sha256 = "3d125c01817d5bef2b644095b044d22b03b9d8d4591088cadd8e97851f7a150a";
   };
 
-  checkInputs = [ pytest mock ];
+  disabled = pythonOlder "3.5";
+
+  checkInputs = [ mock pytestCheckHook ];
   propagatedBuildInputs = [ google_api_core google_cloud_core ];
 
-  # ignore tests which require credentials or network
-  checkPhase = ''
+  # api_url test broken, fix not yet released
+  # https://github.com/googleapis/python-resource-manager/pull/31
+  # Client tests require credentials
+  disabledTests = [ "build_api_url_w_custom_endpoint" "client_options" ];
+
+  # prevent google directory from shadowing google imports
+  preCheck = ''
     rm -r google
-    pytest tests/unit -k 'not client and not extra_headers'
   '';
 
   meta = with stdenv.lib; {
     description = "Google Cloud RuntimeConfig API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://pypi.org/project/google-cloud-runtimeconfig";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From d0b54015df388b33683c71d546373833d172f5b0 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:17:50 -0800
Subject: [PATCH 1654/3942] python3Packages.google_cloud_spanner: 1.17.1 ->
 1.19.1

---
 .../google_cloud_spanner/default.nix          | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix
index ce03add44e4f..4e86908b4260 100644
--- a/pkgs/development/python-modules/google_cloud_spanner/default.nix
+++ b/pkgs/development/python-modules/google_cloud_spanner/default.nix
@@ -1,35 +1,32 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, grpc_google_iam_v1
-, grpcio-gcp
-, google_api_core
-, google_cloud_core
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, grpc_google_iam_v1, grpcio-gcp, google_api_core, google_cloud_core
+, google_cloud_testutils, mock, pytest }:
 
 buildPythonPackage rec {
   pname = "google-cloud-spanner";
-  version = "1.17.1";
+  version = "1.19.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3240a04eaa6496e9d8bf4929f4ff04de1652621fd49555eb83b743c48ed9ca04";
+    sha256 = "0b9ifh9i4hkcs19b4l6v8j8v93yd8p3j19qrrjvvf5a44bc7bhsh";
   };
 
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ];
+  disabled = pythonOlder "3.5";
 
-  # avoid importing local package
-  checkPhase = ''
+  checkInputs = [ google_cloud_testutils mock pytestCheckHook ];
+  propagatedBuildInputs =
+    [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ];
+
+  # prevent google directory from shadowing google imports
+  # remove tests that require credentials
+  preCheck = ''
     rm -r google
-    pytest tests/unit
+    rm tests/system/test_system.py
   '';
 
   meta = with stdenv.lib; {
     description = "Cloud Spanner API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://pypi.org/project/google-cloud-spanner";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From d19278d5eef2a8646aeabaa6b8fd87df9737c7e0 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:18:50 -0800
Subject: [PATCH 1655/3942] python3Packages.google_cloud_storage: fix tests

---
 .../google_cloud_storage/default.nix          | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix
index 7a92e731042d..bcb8b604e45c 100644
--- a/pkgs/development/python-modules/google_cloud_storage/default.nix
+++ b/pkgs/development/python-modules/google_cloud_storage/default.nix
@@ -1,13 +1,7 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, google_resumable_media
-, google_api_core
-, google_cloud_core
-, pytest
-, mock
-, setuptools
-}:
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_api_core, google_auth, google-cloud-iam, google_cloud_core
+, google_cloud_kms, google_cloud_testutils, google_resumable_media, mock
+, requests }:
 
 buildPythonPackage rec {
   pname = "google-cloud-storage";
@@ -18,27 +12,36 @@ buildPythonPackage rec {
     sha256 = "da12b7bd79bbe978a7945a44b600604fbc10ece2935d31f243e751f99135e34f";
   };
 
+  disabled = pythonOlder "3.5";
+
   propagatedBuildInputs = [
     google_api_core
+    google_auth
     google_cloud_core
     google_resumable_media
-    setuptools
+    requests
   ];
   checkInputs = [
+    google-cloud-iam
+    google_cloud_kms
+    google_cloud_testutils
     mock
-    pytest
+    pytestCheckHook
   ];
 
-  # remove directory from interferring with importing modules
-  # ignore tests which require credentials
-  checkPhase = ''
+  # disable tests which require credentials
+  disabledTests = [ "create" "get" "post" "test_build_api_url" ];
+
+  # prevent google directory from shadowing google imports
+  # remove tests which require credentials
+  preCheck = ''
     rm -r google
-    pytest tests/unit -k 'not (create or get or post)'
+    rm tests/system/test_system.py tests/unit/test_client.py
   '';
 
   meta = with lib; {
     description = "Google Cloud Storage API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://github.com/googleapis/python-storage";
     license = licenses.asl20;
     maintainers = with maintainers; [ costrouc ];
   };

From 51f17159974848d72c74b7748a09ed00d9bbbbc4 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:19:08 -0800
Subject: [PATCH 1656/3942] pythonPackages.google_cloud_testutils: unstable ->
 0.1.0

---
 .../google_cloud_testutils/default.nix        | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google_cloud_testutils/default.nix
index 90e4683f7b06..dfd6354dcc4b 100644
--- a/pkgs/development/python-modules/google_cloud_testutils/default.nix
+++ b/pkgs/development/python-modules/google_cloud_testutils/default.nix
@@ -1,34 +1,22 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, six
-, google_auth
-}:
+{ stdenv, buildPythonPackage, fetchPypi, google_auth, pytest, six }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "google-cloud-testutils";
-  version = "unstable-36ffa923c7037e8b4fdcaa76272cb6267e908a9d";
+  version = "0.1.0";
 
-  # google-cloud-testutils is not "really"
-  # released as a python package
-  # but it is required for google-cloud-* tests
-  # so why not package it as a module
-  src = fetchFromGitHub {
-    owner = "googleapis";
-    repo = "google-cloud-python";
-    rev = "36ffa923c7037e8b4fdcaa76272cb6267e908a9d";
-    sha256 = "1fvcnssmpgf4lfr7l9h7cz984rbc5mfr1j1br12japcib5biwzjy";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bn1pz00lxym3vkl6l45b3nydpmfdvmylwggh2lspldrxwx39a0k";
   };
 
-  propagatedBuildInputs = [ six google_auth ];
+  propagatedBuildInputs = [ google_auth six ];
 
-  postPatch = ''
-    cd test_utils
-  '';
+  # There are no tests
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "System test utilities for google-cloud-python";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://github.com/googleapis/python-test-utils";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From 9a902f2a71e336949954691ad7c8f1f59d19962f Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:19:22 -0800
Subject: [PATCH 1657/3942] python3Packages.google_cloud_texttospeech: fix
 build

---
 .../google_cloud_texttospeech/default.nix     | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
index 3a052c73cdae..32e8fa223a88 100644
--- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
+++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
@@ -1,10 +1,5 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_api_core, libcst, mock, proto-plus, pytest-asyncio, }:
 
 buildPythonPackage rec {
   pname = "google-cloud-texttospeech";
@@ -15,16 +10,17 @@ buildPythonPackage rec {
     sha256 = "cbbd397e72b6189668134f3c8e8c303198188334a4e6a5f77cc90c3220772f9e";
   };
 
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_api_core ];
+  disabled = pythonOlder "3.5";
 
-  checkPhase = ''
-    pytest tests/unit
-  '';
+  checkInputs = [ mock pytest-asyncio pytestCheckHook ];
+  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+
+  # Disable tests that require credentials
+  disabledTests = ["test_synthesize_speech" "test_list_voices"];
 
   meta = with stdenv.lib; {
     description = "Google Cloud Text-to-Speech API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://github.com/googleapis/python-texttospeech";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From 3a0da735d945d1e0d6b48955583717b942db1360 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:19:33 -0800
Subject: [PATCH 1658/3942] python3Packages.google_cloud_translate: fix tests

---
 .../google_cloud_translate/default.nix        | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/pkgs/development/python-modules/google_cloud_translate/default.nix
index f25f4badc815..60f9e3e11ae9 100644
--- a/pkgs/development/python-modules/google_cloud_translate/default.nix
+++ b/pkgs/development/python-modules/google_cloud_translate/default.nix
@@ -1,12 +1,6 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, google_cloud_core
-, grpcio
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_api_core, google_cloud_core, google_cloud_testutils, grpcio, libcst
+, mock, proto-plus, pytest-asyncio }:
 
 buildPythonPackage rec {
   pname = "google-cloud-translate";
@@ -17,18 +11,29 @@ buildPythonPackage rec {
     sha256 = "ecdea3e176e80f606d08c4c7fd5acea6b3dd960f4b2e9a65951aaf800350a759";
   };
 
-  # google_cloud_core[grpc] -> grpcio
-  propagatedBuildInputs = [ google_api_core google_cloud_core grpcio ];
+  disabled = pythonOlder "3.6";
 
-  checkInputs = [ pytest mock ];
-  checkPhase = ''
-    cd tests # prevent local google/__init__.py from getting loaded
-    pytest unit -k 'not extra_headers'
+  # google_cloud_core[grpc] -> grpcio
+  propagatedBuildInputs =
+    [ google_api_core google_cloud_core grpcio libcst proto-plus ];
+
+  checkInputs = [ google_cloud_testutils mock pytest-asyncio pytestCheckHook ];
+
+  # test_http.py broken, fix not yet released
+  # https://github.com/googleapis/python-translate/pull/69
+  disabledTests = [
+    "test_build_api_url_w_extra_query_params"
+    "test_build_api_url_no_extra_query_params"
+    "test_build_api_url_w_custom_endpoint"
+  ];
+
+  preCheck = ''
+    rm -r google
   '';
 
   meta = with stdenv.lib; {
     description = "Google Cloud Translation API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://github.com/googleapis/python-translate";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From b99504f142ae85751747d362f6380b296fd2ce1d Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:19:58 -0800
Subject: [PATCH 1659/3942] python3Packages.google_cloud_websecurityscanner:
 fix build

---
 .../default.nix                               | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
index a43f7fd5f9c2..356759f9bcb5 100644
--- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
@@ -1,10 +1,5 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_api_core, libcst, mock, proto-plus, pytest-asyncio }:
 
 buildPythonPackage rec {
   pname = "google-cloud-websecurityscanner";
@@ -15,16 +10,14 @@ buildPythonPackage rec {
     sha256 = "1de60f880487b898b499345f46f7acf38651f5356ebca8673116003a57f25393";
   };
 
-  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_api_core ];
+  disabled = pythonOlder "3.6";
 
-  checkPhase = ''
-    pytest tests/unit
-  '';
+  checkInputs = [ mock pytest-asyncio pytestCheckHook ];
+  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
 
   meta = with stdenv.lib; {
     description = "Google Cloud Web Security Scanner API client library";
-    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+    homepage = "https://github.com/googleapis/python-websecurityscanner";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From a361626b6ea0f508b399434534563ccfeecc6461 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Mon, 2 Nov 2020 17:20:14 -0800
Subject: [PATCH 1660/3942] patroni: fix tests

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

diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix
index 1634b0b5b74b..bd06aa2ff7db 100644
--- a/pkgs/servers/sql/patroni/default.nix
+++ b/pkgs/servers/sql/patroni/default.nix
@@ -39,7 +39,7 @@ pythonPackages.buildPythonApplication rec {
   checkInputs = with pythonPackages; [
     flake8
     mock
-    pytest
+    pytestCheckHook
     pytestcov
     requests
   ];

From 68060f6f6f491201724192ea0997d67dbeb2e302 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Sat, 7 Nov 2020 00:31:25 +0800
Subject: [PATCH 1661/3942] makeRustPlatform: add rustLibSrc

rust-analyzer: rustcSrc -> rustLibSrc to fix build
---
 .../development/compilers/rust/make-rust-platform.nix |  4 ++++
 pkgs/development/compilers/rust/rust-lib-src.nix      | 11 +++++++++++
 pkgs/development/tools/rust/rust-analyzer/generic.nix |  2 +-
 pkgs/development/tools/rust/rust-analyzer/wrapper.nix |  5 +++--
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/rust/rust-lib-src.nix

diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix
index 6a827cff9a15..4b1f572bebb8 100644
--- a/pkgs/development/compilers/rust/make-rust-platform.nix
+++ b/pkgs/development/compilers/rust/make-rust-platform.nix
@@ -18,4 +18,8 @@ rec {
   rustcSrc = callPackage ./rust-src.nix {
     inherit rustc;
   };
+
+  rustLibSrc = callPackage ./rust-lib-src.nix {
+    inherit rustc;
+  };
 }
diff --git a/pkgs/development/compilers/rust/rust-lib-src.nix b/pkgs/development/compilers/rust/rust-lib-src.nix
new file mode 100644
index 000000000000..67a7fa3641ad
--- /dev/null
+++ b/pkgs/development/compilers/rust/rust-lib-src.nix
@@ -0,0 +1,11 @@
+{ stdenv, rustc }:
+
+stdenv.mkDerivation {
+  name = "rust-lib-src";
+  src = rustc.src;
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mv library $out
+  '';
+}
diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix
index cbcab33e0db3..1bab5b951837 100644
--- a/pkgs/development/tools/rust/rust-analyzer/generic.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
 
   inherit doCheck;
   preCheck = lib.optionalString doCheck ''
-    export RUST_SRC_PATH=${rustPlatform.rustcSrc}
+    export RUST_SRC_PATH=${rustPlatform.rustLibSrc}
   '';
 
   doInstallCheck = true;
diff --git a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix
index 8ca3ff1a6d20..bed206281826 100644
--- a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix
@@ -4,7 +4,8 @@ lib.makeOverridable ({
   unwrapped,
   pname ? "rust-analyzer",
   version ? unwrapped.version,
-  rustcSrc ? rustPlatform.rustcSrc,
+  # Use name from `RUST_SRC_PATH`
+  rustSrc ? rustPlatform.rustLibSrc,
 }: runCommandNoCC "${pname}-${version}" {
   inherit pname version;
   inherit (unwrapped) src meta;
@@ -12,5 +13,5 @@ lib.makeOverridable ({
 } ''
   mkdir -p $out/bin
   makeWrapper ${unwrapped}/bin/rust-analyzer $out/bin/rust-analyzer \
-    --set-default RUST_SRC_PATH "${rustcSrc}"
+    --set-default RUST_SRC_PATH "${rustSrc}"
 '')

From 038497d3b3fee1121c155c2787830e55c8559847 Mon Sep 17 00:00:00 2001
From: Andika Demas Riyandi <andika.riyan@gmail.com>
Date: Sat, 7 Nov 2020 00:59:51 +0700
Subject: [PATCH 1662/3942] nar-serve: init at 0.3.0 (#95420)

* nar-serve: init at 0.3.0

* nixos/nar-serve: add new module

Co-authored-by: zimbatm <zimbatm@zimbatm.com>
---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/networking/nar-serve.nix | 55 +++++++++++++++++++
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/nar-serve.nix                     | 48 ++++++++++++++++
 pkgs/tools/nix/nar-serve/default.nix          | 31 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 6 files changed, 138 insertions(+)
 create mode 100644 nixos/modules/services/networking/nar-serve.nix
 create mode 100644 nixos/tests/nar-serve.nix
 create mode 100644 pkgs/tools/nix/nar-serve/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3fd7ebd1ca78..6ac12e4e1387 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -680,6 +680,7 @@
   ./services/networking/murmur.nix
   ./services/networking/mxisd.nix
   ./services/networking/namecoind.nix
+  ./services/networking/nar-serve.nix
   ./services/networking/nat.nix
   ./services/networking/ndppd.nix
   ./services/networking/networkmanager.nix
diff --git a/nixos/modules/services/networking/nar-serve.nix b/nixos/modules/services/networking/nar-serve.nix
new file mode 100644
index 000000000000..ddd42fa01073
--- /dev/null
+++ b/nixos/modules/services/networking/nar-serve.nix
@@ -0,0 +1,55 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+  cfg = config.services.nar-serve;
+in
+{
+  meta = {
+    maintainers = [ maintainers.rizary ];
+  };
+  options = {
+    services.nar-serve = {
+      enable = mkEnableOption "Serve NAR file contents via HTTP";
+
+      port = mkOption {
+        type = types.int;
+        default = 8383;
+        description = ''
+          Port number where nar-serve will listen on.
+        '';
+      };
+
+      cacheURL = mkOption {
+        type = types.str;
+        default = "https://cache.nixos.org/";
+        description = ''
+          Binary cache URL to connect to.
+
+          The URL format is compatible with the nix remote url style, such as:
+          - http://, https:// for binary caches via HTTP or HTTPS
+          - s3:// for binary caches stored in Amazon S3
+          - gs:// for binary caches stored in Google Cloud Storage
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.nar-serve = {
+      description = "NAR server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      environment.PORT = toString cfg.port;
+      environment.NAR_CACHE_URL = cfg.cacheURL;
+
+      serviceConfig = {
+        Restart = "always";
+        RestartSec = "5s";
+        ExecStart = "${pkgs.nar-serve}/bin/nar-serve";
+        DynamicUser = true;
+      };
+    };
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e2a5263a95de..7d582aa5921b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -225,6 +225,7 @@ in
   mysql-backup = handleTest ./mysql/mysql-backup.nix {};
   mysql-replication = handleTest ./mysql/mysql-replication.nix {};
   nagios = handleTest ./nagios.nix {};
+  nar-serve = handleTest ./nar-serve.nix {};
   nat.firewall = handleTest ./nat.nix { withFirewall = true; };
   nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; };
   nat.standalone = handleTest ./nat.nix { withFirewall = false; };
diff --git a/nixos/tests/nar-serve.nix b/nixos/tests/nar-serve.nix
new file mode 100644
index 000000000000..9ee738ffb170
--- /dev/null
+++ b/nixos/tests/nar-serve.nix
@@ -0,0 +1,48 @@
+import ./make-test-python.nix (
+  { pkgs, lib, ... }:
+  {
+    name = "nar-serve";
+    meta.maintainers = [ lib.maintainers.rizary ];
+    nodes =
+      {
+        server = { pkgs, ... }: {
+          services.nginx = {
+            enable = true;
+            virtualHosts.default.root = "/var/www";
+          };
+          services.nar-serve = {
+            enable = true;
+            # Connect to the localhost nginx instead of the default
+            # https://cache.nixos.org
+            cacheURL = "http://localhost/";
+          };
+          environment.systemPackages = [
+            pkgs.hello
+            pkgs.curl
+          ];
+
+          networking.firewall.allowedTCPPorts = [ 8383 ];
+
+          # virtualisation.diskSize = 2 * 1024;
+        };
+      };
+    testScript = ''
+      start_all()
+
+      # Create a fake cache with Nginx service the static files
+      server.succeed(
+          "nix copy --to file:///var/www ${pkgs.hello}"
+      )
+      server.wait_for_unit("nginx.service")
+      server.wait_for_open_port(80)
+
+      # Check that nar-serve can return the content of the derivation
+      drvName = os.path.basename("${pkgs.hello}")
+      drvHash = drvName.split("-")[0]
+      server.wait_for_unit("nar-serve.service")
+      server.succeed(
+          "curl -o hello -f http://localhost:8383/nix/store/{}/bin/hello".format(drvHash)
+      )
+    '';
+  }
+)
diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix
new file mode 100644
index 000000000000..89a38b40a199
--- /dev/null
+++ b/pkgs/tools/nix/nar-serve/default.nix
@@ -0,0 +1,31 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+, stdenv
+}:
+let
+  pname = "nar-serve";
+  version = "0.3.0";
+
+in
+buildGoModule rec {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "numtide";
+    repo = "nar-serve";
+    rev = "v${version}";
+    sha256 = "000xxrar5ngrqqfi7ynx84i6wi27mirgm26brhyg0y4pygc9ykhz";
+  };
+
+  vendorSha256 = "0qkzbr85wkx3r7qgnzg9pdl7vsli10bzcdbj2gqd1kdzwb8khszs";
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Serve NAR file contents via HTTP";
+    homepage = "https://github.com/numtide/nar-serve";
+    license = licenses.mit;
+    maintainers = with maintainers; [ rizary ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b20511f88d2f..68001e7db32b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27314,6 +27314,8 @@ in
 
   mynewt-newt = callPackage ../tools/package-management/mynewt-newt { };
 
+  nar-serve = callPackage ../tools/nix/nar-serve { };
+
   inherit (callPackage ../tools/package-management/nix {
       storeDir = config.nix.storeDir or "/nix/store";
       stateDir = config.nix.stateDir or "/nix/var";

From c45792d6c95d6a7eaefdc5968c91f82b430070f9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 04:53:52 +0000
Subject: [PATCH 1663/3942] python27Packages.param: 1.9.3 -> 1.10.0

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

diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix
index 096bb2cfb910..9f6d78a8ecbe 100644
--- a/pkgs/development/python-modules/param/default.nix
+++ b/pkgs/development/python-modules/param/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "param";
-  version = "1.9.3";
+  version = "1.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10crjlsn5vx03xwlnhga9faqq2rlw0qwabi45vnvhmz22qbd8w43";
+    sha256 = "a284c1b42aff6367e8eea2f649d4f3f70a9f16c6f17d8ad672a31ff36089f995";
   };
 
   checkInputs = [ flake8 nose ];

From a3ca1528d74a3892576bf46bcd48d890ad380c58 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 6 Nov 2020 15:32:50 +0100
Subject: [PATCH 1664/3942] vimPlugins.neuron-vim: ihsanturk/neuron.vim ->
 fiatjaf/neuron.vim

The current derivation for `vimPlugins.neuron-vim` points to
[ihsanturk/neuron.vim], which doesn't seem to be actively maintained.
This PR switches over to an actively maintained fork,
[fiatjaf/neuron.vim], which works with recent versions of [neuron].

[ihsanturk/neuron.vim]: https://github.com/ihsanturk/neuron.vim
[fiatjaf/neuron.vim]: https://github.com/fiatjaf/neuron.vim
[neuron]: https://github.com/srid/neuron
---
 pkgs/misc/vim-plugins/generated.nix    | 10 +++++-----
 pkgs/misc/vim-plugins/vim-plugin-names |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e1d8171ea0cd..82374718b16b 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2472,14 +2472,14 @@ let
 
   neuron-vim = buildVimPluginFrom2Nix {
     pname = "neuron-vim";
-    version = "2020-08-07";
+    version = "2020-10-29";
     src = fetchFromGitHub {
-      owner = "ihsanturk";
+      owner = "fiatjaf";
       repo = "neuron.vim";
-      rev = "07521a3ef2940bd726e7b4d50b82e46898e686cc";
-      sha256 = "0myadiy6y2p73lhdzk2w55whg4i5rs004jaw1m21cz0dk8k8ibn2";
+      rev = "2b4321bf12a4d0b589cd8c26aabb7e31311dab26";
+      sha256 = "0h8m72n4jdl9fa308wrchckn6xsbs3b5w8b0714qf9rdpg8jzwa6";
     };
-    meta.homepage = "https://github.com/ihsanturk/neuron.vim/";
+    meta.homepage = "https://github.com/fiatjaf/neuron.vim/";
   };
 
   nim-vim = buildVimPluginFrom2Nix {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index d161392ef16d..cb62025a8f87 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -109,6 +109,7 @@ fatih/vim-go
 fcpg/vim-osc52
 FelikZ/ctrlp-py-matcher
 fenetikm/falcon
+fiatjaf/neuron.vim
 fisadev/vim-isort
 flazz/vim-colorschemes
 floobits/floobits-neovim
@@ -159,7 +160,6 @@ iamcco/coc-vimlsp
 ianks/vim-tsx
 idanarye/vim-merginal
 idris-hackers/idris-vim
-ihsanturk/neuron.vim
 Inazuma110/deoplete-greek
 inkarkat/vim-SyntaxRange
 int3/vim-extradite

From 7ff16d8155ab1669503409e44180f63f189459f8 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 6 Nov 2020 18:28:28 +0000
Subject: [PATCH 1665/3942] firmwareLinuxNonfree: 2020-09-18 -> 2020-10-22

---
 .../linux/firmware/firmware-linux-nonfree/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 76ea5230becc..fcebea126fe9 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "firmware-linux-nonfree";
-  version = "2020-09-18";
+  version = "2020-10-22";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
     rev = lib.replaceStrings ["-"] [""] version;
-    sha256 = "06k2x6y9dhzs6nnbs1ws7rxbz0xijzmyn24sa223n0bmbb96n4f0";
+    sha256 = "15l32993pfm0albx7ky64c5i60vph150hrdkg87md15919a6naia";
   };
 
   installFlags = [ "DESTDIR=$(out)" ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   outputHashMode = "recursive";
   outputHashAlgo = "sha256";
-  outputHash = "1avpf2x1g7dlpva76pcnldxngkjabsyaknkkjbrhg1mj6z9g1mx7";
+  outputHash = "0y2dpp3gklzym2gr0w9wddf6cn6p0sv9n2xh401j1299sjsr57m9";
 
   meta = with stdenv.lib; {
     description = "Binary firmware collection packaged by kernel.org";

From 8fb56a487fe57e420209d9f37a085fcc89a5d108 Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Thu, 15 Oct 2020 16:07:12 +0200
Subject: [PATCH 1666/3942] python3Packages.pyelftools: disable tests on Darwin

af27072 broke the build on Darwin.

There does not seem to be any way to sanely enable tests on Darwin.

Tests initially fail because of missing 'greadelf'
expected by test/run_readelf_tests.py.

This is fixed by:

- adding 'binutils-unwrapped' to checkInputs
- hardlinking 'readelf' to 'greadelf' in a temp bin dir
- exporting temp bin dir to PATH

This leads to further test failures because of 'readelf' version mismatch
causing output inconsistencies.

See test/run_readelf_tests.py:31 for further details.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
 pkgs/development/python-modules/pyelftools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix
index 08fba705aa85..51e1886f1d0d 100644
--- a/pkgs/development/python-modules/pyelftools/default.nix
+++ b/pkgs/development/python-modules/pyelftools/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "sha256-O7l1kj0k8bOSOtZJVzS674oVnM+X3oP00Ybs0qjb64Q=";
   };
 
-  doCheck = stdenv.is64bit;
+  doCheck = stdenv.is64bit && !stdenv.isDarwin;
 
   checkPhase = ''
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" test/external_tools/readelf

From 0a2f47b51b0b99bac14a23e5ff4b29aed4f8162e Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Thu, 5 Nov 2020 15:31:28 -0500
Subject: [PATCH 1667/3942] nvidia_x11.persistenced: fix build on master

---
 pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index ff2792ac315d..5979f7e9a224 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -1,6 +1,10 @@
 nvidia_x11: sha256:
 
-{ stdenv, fetchFromGitHub, m4 }:
+{ stdenv
+, fetchFromGitHub
+, m4
+, libtirpc
+}:
 
 stdenv.mkDerivation rec {
   pname = "nvidia-persistenced";
@@ -14,6 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ m4 ];
+  buildInputs = [ libtirpc ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
@@ -27,6 +32,9 @@ stdenv.mkDerivation rec {
       $out/bin/nvidia-persistenced
   '';
 
+  NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
+  NIX_LDFLAGS = [ "-ltirpc" ];
+
   meta = with stdenv.lib; {
     homepage = "https://www.nvidia.com/object/unix.html";
     description = "Settings application for NVIDIA graphics cards";

From e173880ed54b0d0cb0c2a35ce05770dd81ba6e2b Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 14:14:28 +0100
Subject: [PATCH 1668/3942] pugixml: 1.9 -> 1.10

* split to multiple outputs when using the shared library version
* enabled the tests
* validate the pkg-config files
---
 .../development/libraries/pugixml/default.nix | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index 8bd861540688..d9b04781ba1b 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -1,34 +1,41 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }:
+{ stdenv, lib, fetchFromGitHub, cmake, check, validatePkgConfig, shared ? false }:
 
 stdenv.mkDerivation rec {
   pname = "pugixml";
-  version = "1.9";
+  version = "1.10";
 
   src = fetchFromGitHub {
     owner = "zeux";
     repo = "pugixml";
     rev = "v${version}";
-    sha256 = "0iraznwm78pyyzc9snvd3dyz8gddvmxsm1b3kpw7wixkvcawdviv";
+    sha256 = "dywnLSJHeGaR3+0lTLpacWQL0rWlF8+LNCy+oCCO9C4=";
   };
 
-  patches = [
-    # To be removed after a version newer than 1.9 is released
-    (fetchpatch {
-      url = "https://github.com/zeux/pugixml/pull/193.patch";
-      sha256 = "0s4anqlr2ppfibxyl29nrqbcprrg89k7il6303dm91s6620ydmka";
-    })
+  outputs = if shared then [ "out" "dev" ] else [ "out" ];
+
+  nativeBuildInputs = [ cmake validatePkgConfig ];
+
+  cmakeFlags = [
+    "-DBUILD_TESTS=ON"
+    "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}"
   ];
 
-  nativeBuildInputs = [ cmake ];
+  checkInputs = [ check ];
 
-  cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ];
+  # Hack to be able to run the test, broken because we use
+  # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install
+  preBuild = if stdenv.isDarwin then ''
+    export DYLD_LIBRARY_PATH="`pwd`''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
+  '' else ''
+    export LD_LIBRARY_PATH="`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
+  '';
 
   preConfigure = ''
     # Enable long long support (required for filezilla)
     sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Light-weight, simple and fast XML parser for C++ with XPath support";
     homepage = "https://pugixml.org";
     license = licenses.mit;

From 2a2f3d4aed78f665b1a7de5da3e89484dcd5730c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Nov 2020 19:16:29 +0000
Subject: [PATCH 1669/3942] python27Packages.msgpack-numpy: 0.4.6.1 -> 0.4.7.1

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

diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix
index d380f18f7729..ad612550d7e8 100644
--- a/pkgs/development/python-modules/msgpack-numpy/default.nix
+++ b/pkgs/development/python-modules/msgpack-numpy/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "msgpack-numpy";
-  version = "0.4.6.1";
+  version = "0.4.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9f9b57abb2b155c2d3e411c2dd5b98f14998bd053a20c6ed0ab64a6ceb8ad51d";
+    sha256 = "7eaf51acf82d7c467d21aa71df94e1c051b2055e54b755442051b474fa7cf5e1";
   };
 
   buildInputs = [

From 1122d28e9f814829a1f14cf9951d19a2b2e0ca00 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Fri, 6 Nov 2020 00:52:46 -0800
Subject: [PATCH 1670/3942] octoprint.python.pkgs.marlingcodevisualizer: init
 at 0.11.0

---
 pkgs/applications/misc/octoprint/plugins.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 366b3866dfd5..421690f29d46 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -109,6 +109,25 @@ in {
     };
   };
 
+  marlingcodedocumentation = buildPlugin rec {
+    pname = "MarlinGcodeDocumentation";
+    version = "0.11.0";
+
+    src = fetchFromGitHub {
+      owner = "costas-basdekis";
+      repo = pname;
+      rev = "v${version}";
+      sha256 = "0vx06w9hqwy0k4r8g67y8gdckfdx7wl8ghfx6hmxc1s8fgkghfkc";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Displays GCode documentation for Marlin in the Octoprint terminal command line";
+      homepage = "https://github.com/costas-basdekis/MarlinGcodeDocumentation";
+      license = licenses.agpl3;
+      maintainers = with maintainers; [ lovesegfault ];
+    };
+  };
+
   mqtt = buildPlugin rec {
     pname = "MQTT";
     version = "0.8.7";

From 5eaa17ae4de6a854212c8461f10fb41cb75c654e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Nov 2020 19:26:31 +0000
Subject: [PATCH 1671/3942] python27Packages.pyphen: 0.9.5 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix
index 7a182b6be4a9..b5018e40d7eb 100644
--- a/pkgs/development/python-modules/pyphen/default.nix
+++ b/pkgs/development/python-modules/pyphen/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "Pyphen";
-  version = "0.9.5";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3b633a50873156d777e1f1075ba4d8e96a6ad0a3ca42aa3ea9a6259f93f18921";
+    sha256 = "719b21dfb4b04fbc11cc0f6112418535fe35474021120cccfffc43a25fe63128";
   };
 
   meta = with stdenv.lib; {

From b5008f9e303c03baf98f8878ac119a7d749a62d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 6 Nov 2020 20:54:12 +0100
Subject: [PATCH 1672/3942] texmacs: 1.99.13 -> 1.99.14

---
 pkgs/applications/editors/texmacs/default.nix | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index aeef43e3f0b8..32892c7c26e7 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -16,7 +16,7 @@
 
 let
   pname = "TeXmacs";
-  version = "1.99.13";
+  version = "1.99.14";
   common = callPackage ./common.nix {
     inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
   };
@@ -26,22 +26,9 @@ mkDerivation {
 
   src = fetchurl {
     url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
-    sha256 = "Aq0cS47QqmFQHelxRjANeJlgXCXagnYRykpAq7wHqbQ=";
+    sha256 = "1zbl1ddhppgnn3j213jl1b9mn8zmwnknxiqswm25p4llj0mqcgna";
   };
 
-  patches = [
-    # Minor patch for Qt 5.15 support, should be included in next release.
-    (fetchpatch {
-      url = "https://github.com/texmacs/texmacs/commit/3cf56af92326b74538f5e943928199ba6e963d0b.patch";
-      sha256 = "+OBQmnKgvQZZkLx6ea773Dwq0o7L92Sex/kcVUhmg6Q=";
-    })
-    # Fix returned version, lets hope they remember to bump the version next release.
-    (fetchpatch {
-      url = "https://github.com/texmacs/texmacs/commit/da5b67005d2fc31bb32ea1ead882c26af12d8cbb.patch";
-      sha256 = "czMgdraQErrdvN83jY76P673L52BpQkDwntmKvF0Ykg=";
-    })
-  ];
-
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ cmake pkgconfig ];

From e552d657c3fc659f1123e6e18878b7557e52bea4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Nov 2020 19:42:00 +0000
Subject: [PATCH 1673/3942] python37Packages.pytest_6: 6.1.1 -> 6.1.2

---
 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 29def3082a4f..93282218871a 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -21,14 +21,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "6.1.1";
+  version = "6.1.2";
   pname = "pytest";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8f593023c1a0f916110285b6efd7f99db07d59546e3d8c36fc60e2ab05d3be92";
+    sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e";
   };
 
   checkInputs = [ hypothesis pygments ];

From befa4e168771e1beb8e8c4ca4e5bc12ab91645b9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 6 Nov 2020 12:07:51 -0800
Subject: [PATCH 1674/3942] kent: add to 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 9a69bf422ca7..f4829945657f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4951,6 +4951,8 @@ in
 
   kexpand = callPackage ../development/tools/kexpand { };
 
+  kent = callPackage ../applications/science/biology/kent { };
+
   keybase = callPackage ../tools/security/keybase {
     # Reasoning for the inherited apple_sdk.frameworks:
     # 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox

From f979b589c780c448a38908a15fa9eeb686765460 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Wed, 28 Oct 2020 16:57:31 +0100
Subject: [PATCH 1675/3942] elf-dissector: init at unstable-2020-11-14

---
 .../misc/elf-dissector/default.nix            | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/misc/elf-dissector/default.nix

diff --git a/pkgs/applications/misc/elf-dissector/default.nix b/pkgs/applications/misc/elf-dissector/default.nix
new file mode 100644
index 000000000000..36ceb49d5c4b
--- /dev/null
+++ b/pkgs/applications/misc/elf-dissector/default.nix
@@ -0,0 +1,26 @@
+{ mkDerivation, fetchgit, lib, cmake, extra-cmake-modules, kitemmodels
+, libiberty, libelf, libdwarf, libopcodes }:
+
+mkDerivation rec {
+  pname = "elf-dissector";
+  version = "unstable-2020-11-14";
+
+  src = fetchgit {
+    url = "https://invent.kde.org/sdk/elf-dissector.git";
+    rev = "d1700e76e3f60aff0a2a9fb63bc001251d2be522";
+    sha256 = "1h1xr3ag1sbf005drcx8g8dc5mk7fb2ybs73swrld7clcawhxnk8";
+  };
+
+  nativeBuildInputs = [ cmake extra-cmake-modules ];
+
+  buildInputs = [ kitemmodels libiberty libelf libdwarf libopcodes ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    homepage = "https://invent.kde.org/sdk/elf-dissector";
+    description = "Tools for inspecting, analyzing and optimizing ELF files";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ ehmry ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 679b4deb858c..8bc9fac15a2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20598,6 +20598,8 @@ in
 
   elementary-planner = callPackage ../applications/office/elementary-planner { };
 
+  elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { };
+
   elinks = callPackage ../applications/networking/browsers/elinks { };
 
   elvis = callPackage ../applications/editors/elvis { };

From be459ef9ff5bb8eb1d0418f2bdf625afb814c8cf Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sat, 31 Oct 2020 11:21:04 +0100
Subject: [PATCH 1676/3942] tup: 0.7.9 -> 0.7.10

---
 .../tools/build-managers/tup/default.nix         | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix
index 80ee38105ca5..628e0c4797b3 100644
--- a/pkgs/development/tools/build-managers/tup/default.nix
+++ b/pkgs/development/tools/build-managers/tup/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }:
+{ stdenv, fetchFromGitHub, fuse3, pkgconfig, pcre }:
 
 stdenv.mkDerivation rec {
   pname = "tup";
-  version = "0.7.9";
+  version = "0.7.10";
+  outputs = [ "bin" "man" "out" ];
 
   src = fetchFromGitHub {
     owner = "gittup";
     repo = "tup";
     rev = "v${version}";
-    sha256 = "1b9rllwfdmjvfmwvzqfbqfi1flf4y9zzjmyp0dizq23gpkvhi42f";
+    sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ fuse pcre ];
+  buildInputs = [ fuse3 pcre ];
 
   configurePhase = ''
     sed -i 's/`git describe`/v${version}/g' src/tup/link.sh
@@ -30,11 +31,8 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp tup $out/bin/
-
-    mkdir -p $out/share/man/man1
-    cp tup.1 $out/share/man/man1/
+    install -D tup -t $bin/bin/
+    install -D tup.1 -t $man/share/man/man1/
   '';
 
   setupHook = ./setup-hook.sh;

From 0fa596936b0bf07b34530599dcd35aae0d1ba21e Mon Sep 17 00:00:00 2001
From: Kai Harries <kai.harries@posteo.de>
Date: Sat, 31 Oct 2020 17:02:05 +0100
Subject: [PATCH 1677/3942] haskellPackages.git-mediate: mark as not broken

After update to 1.0.8.1 git-mediate is buildable again
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3a31056fd12f..13b94368c8ce 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5415,7 +5415,6 @@ broken-packages:
   - git-fmt
   - git-gpush
   - git-jump
-  - git-mediate
   - git-monitor
   - git-object
   - git-remote-ipfs

From 17eee57642f0cd010176767a873c42d34167cde4 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Tue, 3 Nov 2020 16:45:15 +0900
Subject: [PATCH 1678/3942] haskellPackages.shellFor: improve documentation

---
 .../haskell-modules/make-package-set.nix      | 156 +++++++++++++++---
 1 file changed, 131 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 1418cfef0574..c5604aa41962 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -258,6 +258,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     # packages themselves. Using nix-shell on this derivation will
     # give you an environment suitable for developing the listed
     # packages with an incremental tool like cabal-install.
+    #
     # In addition to the "packages" arg and "withHoogle" arg, anything that
     # can be passed into stdenv.mkDerivation can be included in the input attrset
     #
@@ -274,7 +275,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     #     (import ./.).shellFor {
     #       packages = p: [p.frontend p.backend p.common];
     #       withHoogle = true;
-    #       buildInputs = [ pkgs.python ];
+    #       buildInputs = [ pkgs.python pkgs.cabal-install ];
     #     }
     #
     #     -- cabal.project
@@ -285,38 +286,143 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     #
     #     bash$ nix-shell --run "cabal new-build all"
     #     bash$ nix-shell --run "python"
-    shellFor = { packages, withHoogle ? false, ... } @ args:
+    shellFor =
+      { # Packages to create this development shell for.  These are usually
+        # your local packages.
+        packages
+      , # Whether or not to generated a Hoogle database for all the
+        # dependencies.
+        withHoogle ? false
+      , ...
+      } @ args:
       let
-        combinedPackageFor = packages:
-          let
-            selected = packages self;
+        # A list of the packages we want to build a development shell for.
+        #
+        # This is a list of Haskell package derivations.
+        selected = packages self;
 
-            pname = if pkgs.lib.length selected == 1
-              then (pkgs.lib.head selected).name
-              else "packages";
+        # This is a list of attribute sets, where the each attribute set
+        # corresponds to the build inputs one of the packages input to shellFor.
+        #
+        # Each attribute has keys like buildDepends, executableHaskellDepends,
+        # testPkgconfigDepends, etc.  The values for the keys of the attribute
+        # set are lists of dependencies.
+        #
+        # Example:
+        #   cabalDepsForSelected
+        #   => [
+        #        # This may be the attribute set corresponding to the `backend`
+        #        # package in the example above.
+        #        { buildDepends = [ gcc ... ];
+        #          libraryHaskellDepends = [ lens conduit ... ];
+        #          ...
+        #        }
+        #        # This may be the attribute set corresponding to the `common`
+        #        # package in the example above.
+        #        { testHaskellDepends = [ tasty hspec ... ];
+        #          libraryHaskellDepends = [ lens aeson ];
+        #          benchmarkHaskellDepends = [ criterion ... ];
+        #          ...
+        #        }
+        #        ...
+        #      ]
+        cabalDepsForSelected = map (p: p.getCabalDeps) selected;
 
-            # If `packages = [ a b ]` and `a` depends on `b`, don't build `b`,
-            # because cabal will end up ignoring that built version, assuming
-            # new-style commands.
-            combinedPackages = pkgs.lib.filter
-              (input: pkgs.lib.all (p: input.outPath or null != p.outPath) selected);
+        # A predicate that takes a derivation as input, and tests whether it is
+        # the same as any of the `selected` packages.
+        #
+        # Returns true if the input derivation is not in the list of `selected`
+        # packages.
+        #
+        # isNotSelected :: Derivation -> Bool
+        #
+        # Example:
+        #
+        #   isNotSelected common [ frontend backend common ]
+        #   => false
+        #
+        #   isNotSelected lens [ frontend backend common ]
+        #   => true
+        isNotSelected = input: pkgs.lib.all (p: input.outPath or null != p.outPath) selected;
 
-            # Returns an attrset containing a combined list packages' inputs for each
-            # stage of the build process
-            packageInputs = pkgs.lib.zipAttrsWith
-              (_: pkgs.lib.concatMap combinedPackages)
-              (map (p: p.getCabalDeps) selected);
+        # A function that takes a list of list of derivations, filters out all
+        # the `selected` packages from each list, and concats the results.
+        #
+        #   zipperCombinedPkgs :: [[Derivation]] -> [Derivation]
+        #
+        # Example:
+        #   zipperCombinedPkgs [ [ lens conduit ] [ aeson frontend ] ]
+        #   => [ lens conduit aeson ]
+        #
+        # Note: The reason this isn't just the function `pkgs.lib.concat` is
+        # that we need to be careful to remove dependencies that are in the
+        # `selected` packages.
+        #
+        # For instance, in the above example, if `common` is a dependency of
+        # `backend`, then zipperCombinedPkgs needs to be careful to filter out
+        # `common`, because cabal will end up ignoring that built version,
+        # assuming new-style commands.
+        zipperCombinedPkgs = vals:
+          pkgs.lib.concatMap
+            (drvList: pkgs.lib.filter isNotSelected drvList)
+            vals;
 
-            genericBuilderArgs = {
-              inherit pname;
-              version = "0";
-              license = null;
-            } // packageInputs;
+        # Zip `cabalDepsForSelected` into a single attribute list, combining
+        # the derivations in all the individual attributes.
+        #
+        # Example:
+        #   packageInputs
+        #   => # Assuming the value of cabalDepsForSelected is the same as
+        #      # the example in cabalDepsForSelected:
+        #      { buildDepends = [ gcc ... ];
+        #        libraryHaskellDepends = [ lens conduit aeson ... ];
+        #        testHaskellDepends = [ tasty hspec ... ];
+        #        benchmarkHaskellDepends = [ criterion ... ];
+        #        ...
+        #      }
+        #
+        # See the Note in `zipperCombinedPkgs` for what gets filtered out from
+        # each of these dependency lists.
+        packageInputs =
+          pkgs.lib.zipAttrsWith (_name: zipperCombinedPkgs) cabalDepsForSelected;
 
-          in self.mkDerivation genericBuilderArgs;
+        # A attribute set to pass to `haskellPackages.mkDerivation`.
+        #
+        # The important thing to note here is that all the fields from
+        # packageInputs are set correctly.
+        genericBuilderArgs = {
+          pname =
+            if pkgs.lib.length selected == 1
+            then (pkgs.lib.head selected).name
+            else "packages";
+          version = "0";
+          license = null;
+        }
+        // packageInputs;
+
+        # This is a pseudo Haskell package derivation that contains all the
+        # dependencies for the packages in `selected`.
+        #
+        # This is a derivation created with `haskellPackages.mkDerivation`.
+        #
+        # pkgWithCombinedDeps :: HaskellDerivation
+        pkgWithCombinedDeps = self.mkDerivation genericBuilderArgs;
+
+        # The derivation returned from `envFunc` for `pkgWithCombinedDeps`.
+        #
+        # This is a derivation that can be run with `nix-shell`.  It provides a
+        # GHC with a package database with all the dependencies of our
+        # `selected` packages.
+        #
+        # This is a derivation created with `stdenv.mkDerivation` (not
+        # `haskellPackages.mkDerivation`).
+        #
+        # pkgWithCombinedDepsDevDrv :: Derivation
+        pkgWithCombinedDepsDevDrv = pkgWithCombinedDeps.envFunc { inherit withHoogle; };
 
         mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" ];
-      in ((combinedPackageFor packages).envFunc { inherit withHoogle; }).overrideAttrs (old: mkDerivationArgs // {
+
+      in pkgWithCombinedDepsDevDrv.overrideAttrs (old: mkDerivationArgs // {
         nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or [];
         buildInputs = old.buildInputs ++ mkDerivationArgs.buildInputs or [];
       });

From d26890fd15c9e0c7cee1698b7bef8c3ffa478919 Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Wed, 4 Nov 2020 09:18:56 +0900
Subject: [PATCH 1679/3942] haskellPackages.shellFor: fix spelling and grammar
 mistakes

Co-authored-by: maralorn <malte.brandy@maralorn.de>
---
 pkgs/development/haskell-modules/make-package-set.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index c5604aa41962..6994dcf5e540 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -290,19 +290,18 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
       { # Packages to create this development shell for.  These are usually
         # your local packages.
         packages
-      , # Whether or not to generated a Hoogle database for all the
+      , # Whether or not to generate a Hoogle database for all the
         # dependencies.
         withHoogle ? false
       , ...
       } @ args:
       let
         # A list of the packages we want to build a development shell for.
-        #
         # This is a list of Haskell package derivations.
         selected = packages self;
 
-        # This is a list of attribute sets, where the each attribute set
-        # corresponds to the build inputs one of the packages input to shellFor.
+        # This is a list of attribute sets, where each attribute set
+        # corresponds to the build inputs of one of the packages input to shellFor.
         #
         # Each attribute has keys like buildDepends, executableHaskellDepends,
         # testPkgconfigDepends, etc.  The values for the keys of the attribute

From 86a1b6c41d5f14d2558d849794766dd64cc8e6dc Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 4 Nov 2020 14:21:32 +0800
Subject: [PATCH 1680/3942] haskellPackages.vulkan-utils: Add necessary
 dependency on vulkan-headers

Also mark as unbroken
---
 pkgs/development/haskell-modules/configuration-common.nix      | 3 ++-
 .../development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ce3093763966..41b2080d0d65 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -922,8 +922,9 @@ self: super: {
   # This package refers to the wrong library (itself in fact!)
   vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
 
-  # Compiles some C++ source which requires these headers
+  # Compiles some C or C++ source which requires these headers
   VulkanMemoryAllocator = addExtraLibrary super.VulkanMemoryAllocator pkgs.vulkan-headers;
+  vulkan-utils = addExtraLibrary super.vulkan-utils pkgs.vulkan-headers;
 
   # https://github.com/dmwit/encoding/pull/3
   encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch);
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 13b94368c8ce..4cdcd9f3aab2 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -10987,7 +10987,6 @@ broken-packages:
   - vty-menu
   - vty-ui
   - vty-ui-extras
-  - vulkan-utils
   - waargonaut
   - wacom-daemon
   - waddle

From 22dbcb3b571fb78749bdda55a20c930152aa72dd Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 4 Nov 2020 14:23:05 +0800
Subject: [PATCH 1681/3942] haskellPackages.autoapply: Depend on correct
 version of th-desugar

Also mark as unbroken
---
 pkgs/development/haskell-modules/configuration-common.nix       | 2 ++
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 41b2080d0d65..f11ba9458ad5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1484,6 +1484,8 @@ self: super: {
   # Too tight version bounds, see https://github.com/haskell-hvr/microaeson/pull/4
   microaeson = doJailbreak super.microaeson;
 
+  autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; };
+
   # haskell-language-server needs a more current version of pantry to compile
 } // (let
   inherit (self) hls-ghcide hls-brittany;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4cdcd9f3aab2..e3bb173c128c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3205,7 +3205,6 @@ broken-packages:
   - authenticate-ldap
   - authinfo-hs
   - authoring
-  - autoapply
   - AutoForms
   - autom
   - automata

From 65c119e6e722fc0fe138eb21459e9f1ffb165ac3 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 4 Nov 2020 14:29:08 +0800
Subject: [PATCH 1682/3942] haskellPackages.exact-real: mark unbroken

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e3bb173c128c..ab4714fc6f61 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4855,7 +4855,6 @@ broken-packages:
   - every-bit-counts
   - ewe
   - exact-cover
-  - exact-real
   - exact-real-positional
   - except-exceptions
   - exception-monads-fd

From f78fb98f18da47afb10e4f50173187eb41817eb5 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 4 Nov 2020 14:30:09 +0800
Subject: [PATCH 1683/3942] haskellPackages.orbits: mark unbroken

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ab4714fc6f61..b3d00f9dcf27 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8377,7 +8377,6 @@ broken-packages:
   - optparse-applicative-simple
   - optparse-enum
   - optparse-helper
-  - orbits
   - orc
   - orchestrate
   - OrchestrateDB

From d3fb9a25b3b4bd0bab4fb0f4c1164e7f97b9d853 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Wed, 4 Nov 2020 10:00:30 +0900
Subject: [PATCH 1684/3942] haskellPackages.shellFor: add a doBenchmark
 argument for enabling benchmarks deps

---
 .../development/haskell-modules/make-package-set.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 6994dcf5e540..ac65fad35270 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -293,6 +293,10 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
       , # Whether or not to generate a Hoogle database for all the
         # dependencies.
         withHoogle ? false
+      , # Whether or not to include benchmark dependencies of your local
+        # packages.  You should set this to true if you have benchmarks defined
+        # in your local packages that you want to be able to run with cabal benchmark
+        doBenchmark ? false
       , ...
       } @ args:
       let
@@ -397,7 +401,11 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
           version = "0";
           license = null;
         }
-        // packageInputs;
+        // packageInputs
+        // pkgs.lib.optionalAttrs doBenchmark {
+          # `doBenchmark` needs to explicitly be set here because haskellPackages.mkDerivation defaults it to `false`.  If the user wants benchmark dependencies included in their development shell, it has to be explicitly enabled here.
+          doBenchmark = true;
+        };
 
         # This is a pseudo Haskell package derivation that contains all the
         # dependencies for the packages in `selected`.
@@ -419,7 +427,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
         # pkgWithCombinedDepsDevDrv :: Derivation
         pkgWithCombinedDepsDevDrv = pkgWithCombinedDeps.envFunc { inherit withHoogle; };
 
-        mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" ];
+        mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" "doBenchmark" ];
 
       in pkgWithCombinedDepsDevDrv.overrideAttrs (old: mkDerivationArgs // {
         nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or [];

From 696f1c191c09c63eb97a4674b27899a761d81c89 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Nov 2020 11:44:43 +0100
Subject: [PATCH 1685/3942] haskell-gi-base: update override 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 f11ba9458ad5..9c027d8fcb1d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1352,7 +1352,7 @@ self: super: {
   # 2020-08-14: gi-pango from stackage is to old for the C libs it links against in nixpkgs.
   # That's why we need to bump a ton of dependency versions to unbreak them.
   gi-pango = assert super.gi-pango.version == "1.0.22"; self.gi-pango_1_0_23;
-  haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_3) [ pkgs.gobject-introspection ];
+  haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_4) [ pkgs.gobject-introspection ];
   haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_5;
   gi-cairo = assert super.gi-cairo.version == "1.0.23"; self.gi-cairo_1_0_24;
   gi-glib = assert super.gi-glib.version == "2.0.23"; self.gi-glib_2_0_24;

From 5e386edc22478aabe44478a11a1e6955bfcb12f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Nov 2020 11:54:17 +0100
Subject: [PATCH 1686/3942] pandoc: update override 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 9c027d8fcb1d..546783ec1721 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1468,7 +1468,7 @@ self: super: {
   skylighting-core = doDistribute super.skylighting-core_0_10_0_3;
   hslua = doDistribute self.hslua_1_1_2;
   jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2;
-  pandoc = doDistribute self.pandoc_2_11_0_4;
+  pandoc = doDistribute self.pandoc_2_11_1;
   # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
   pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2);
   pandoc-types = doDistribute self.pandoc-types_1_22;

From ef5068f06973b388ca70c31252e80aac6b039877 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Nov 2020 11:55:05 +0100
Subject: [PATCH 1687/3942] haskell-configuration-common: cosmetic

---
 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 546783ec1721..0ec9fad1e8a2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1476,7 +1476,6 @@ self: super: {
 
   # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
   domain-auth = dontCheck super.domain-auth;
-  # INSERT NEW OVERRIDES ABOVE THIS LINE
 
   # stack-2.5.1 needs a more current version of pantry to compile
   pantry = self.pantry_0_5_1_3;
@@ -1486,7 +1485,7 @@ self: super: {
 
   autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; };
 
-  # haskell-language-server needs a more current version of pantry to compile
+  # INSERT NEW OVERRIDES ABOVE THIS LINE
 } // (let
   inherit (self) hls-ghcide hls-brittany;
   hlsScopeOverride = self: super: {

From 78bb20c424d50388ec4c1a8b03632d954c981de7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Nov 2020 11:56:23 +0100
Subject: [PATCH 1688/3942] all-cabal-hashes: update to Hackage at
 2020-11-06T01:07:40Z

---
 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 c9950d9fcd11..3c9a531ab62f 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/197a82b352062bfeeefd4b62bfec19dd51a3728d.tar.gz";
-  sha256 = "11c9a67j421vf6a7vvh280gsmssf49rxqnamdp1n9iljkhlfh5z1";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/59ba02b3424684458764210fa9e32ca08e516db2.tar.gz";
+  sha256 = "0m4scz6b7xg7kisy6zlnw258pkfksmzzppw9gp0g6rdl0cxly239";
 }

From 3edd552cf075c7d9f7c6e325ef927f425256ce34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Nov 2020 11:59:00 +0100
Subject: [PATCH 1689/3942] hackage2nix: update list of broken builds to fix
 evaluation errors on Hydra

Ping @cdepillabout because of broken spago build.
---
 .../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 b3d00f9dcf27..8213b47785b0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2892,6 +2892,7 @@ broken-packages:
   - accentuateus
   - access-time
   - access-token-provider
+  - achille
   - acid-state-dist
   - acid-state-tls
   - ACME
@@ -3121,6 +3122,8 @@ broken-packages:
   - armor
   - arpa
   - arpack
+  - array-builder
+  - array-chunks
   - array-forth
   - array-list
   - array-primops
@@ -3455,6 +3458,7 @@ broken-packages:
   - bitcoin-hs
   - bitcoin-rpc
   - bitcoin-script
+  - bitcoin-scripting
   - bitcoin-tx
   - bitcoind-regtest
   - bitcoind-rpc
@@ -3600,7 +3604,11 @@ broken-packages:
   - byline
   - bytable
   - bytearray-parsing
+  - bytebuild
+  - bytehash
   - bytelog
+  - byteslice
+  - bytesmith
   - bytestring-arbitrary
   - bytestring-builder-varword
   - bytestring-class
@@ -3994,6 +4002,7 @@ broken-packages:
   - compdata-dags
   - compdata-param
   - compdoc
+  - compdoc-dhall-decoder
   - competition
   - compilation
   - complexity
@@ -4100,7 +4109,9 @@ broken-packages:
   - context-free-grammar
   - context-stack
   - ContextAlgebra
+  - contiguous
   - contiguous-checked
+  - contiguous-fft
   - continue
   - continuum
   - continuum-client
@@ -4534,6 +4545,7 @@ broken-packages:
   - discord-gateway
   - discord-haskell
   - discord-hs
+  - discord-register
   - discord-rest
   - discord-types
   - discordian-calendar
@@ -4599,6 +4611,9 @@ broken-packages:
   - doi
   - DOM
   - dom-lt
+  - domain
+  - domain-core
+  - domain-optics
   - domplate
   - dot-linker
   - dotfs
@@ -4798,6 +4813,7 @@ broken-packages:
   - eros
   - eros-client
   - eros-http
+  - error-codes
   - error-context
   - error-continuations
   - error-list
@@ -5260,6 +5276,8 @@ broken-packages:
   - garepinoh
   - gargoyle
   - gargoyle-postgresql
+  - gargoyle-postgresql-connect
+  - gargoyle-postgresql-nix
   - gas
   - gbu
   - gc-monitoring-wai
@@ -5515,6 +5533,7 @@ broken-packages:
   - GoogleSB
   - GoogleTranslate
   - gopherbot
+  - gopro-plus
   - gore-and-ash
   - gore-and-ash-actor
   - gore-and-ash-async
@@ -6155,6 +6174,7 @@ broken-packages:
   - hevolisa
   - hevolisa-dph
   - hex
+  - hex-text
   - HExcel
   - hexchat
   - hexif
@@ -6925,6 +6945,7 @@ broken-packages:
   - iostring
   - iothread
   - iotransaction
+  - ip
   - ip2location
   - ip2proxy
   - ipatch
@@ -7586,6 +7607,7 @@ broken-packages:
   - lxd-client
   - lye
   - Lykah
+  - lz4-bytes
   - lz4-conduit
   - lz4-frame-conduit
   - lzma-enumerator
@@ -7608,6 +7630,7 @@ broken-packages:
   - maclight
   - macos-corelibs
   - macosx-make-standalone
+  - macrm
   - madlang
   - mage
   - magic-tyfams
@@ -7823,6 +7846,7 @@ broken-packages:
   - mltool
   - mm2
   - mmsyn4
+  - mmsyn7h
   - mmtf
   - mmtl
   - mmtl-base
@@ -7925,8 +7949,10 @@ broken-packages:
   - morfette
   - morfeusz
   - morley
+  - morloc
   - morpheus-graphql-cli
   - morpheus-graphql-client
+  - morpheus-graphql-subscriptions
   - morphisms-functors
   - morphisms-functors-inventory
   - morphisms-objects
@@ -8729,6 +8755,7 @@ broken-packages:
   - pointless-haskell
   - pointless-lenses
   - pointless-rewrite
+  - poke
   - pokemon-go-protobuf-types
   - poker-eval
   - pokitdok
@@ -8747,6 +8774,7 @@ broken-packages:
   - polysemy-kvstore-jsonfile
   - polysemy-methodology
   - polysemy-optics
+  - polysemy-path
   - polysemy-RandomFu
   - polysemy-resume
   - polysemy-test
@@ -8777,6 +8805,7 @@ broken-packages:
   - poseidon
   - poseidon-postgis
   - posix-acl
+  - posix-api
   - posix-realtime
   - posix-waitpid
   - posplyu
@@ -8855,10 +8884,15 @@ broken-packages:
   - primal
   - primal-memory
   - primes-type
+  - primitive-atomic
+  - primitive-containers
+  - primitive-extras
   - primitive-indexed
   - primitive-maybe
   - primitive-simd
+  - primitive-sort
   - primitive-stablename
+  - primitive-unlifted
   - PrimitiveArray-Pretty
   - primula-board
   - primula-bot
@@ -9184,6 +9218,7 @@ broken-packages:
   - reflex-dom-svg
   - reflex-dynamic-containers
   - reflex-fsnotify
+  - reflex-gadt-api
   - reflex-ghci
   - reflex-gloss
   - reflex-gloss-scene
@@ -9412,6 +9447,7 @@ broken-packages:
   - ruin
   - ruler
   - ruler-core
+  - run-st
   - rungekutta
   - runhs
   - runmany
@@ -9853,6 +9889,7 @@ broken-packages:
   - sme
   - smerdyakov
   - smiles
+  - smith
   - smith-cli
   - smith-client
   - Smooth
@@ -10117,6 +10154,7 @@ broken-packages:
   - stm-chunked-queues
   - stm-containers
   - stm-firehose
+  - stm-hamt
   - stm-promise
   - stm-stats
   - stm-supply
@@ -10327,6 +10365,7 @@ broken-packages:
   - tart
   - task
   - task-distribution
+  - taskell
   - TaskMonad
   - tasty-auto
   - tasty-bdd
@@ -10454,6 +10493,7 @@ broken-packages:
   - th-instances
   - th-kinds
   - th-kinds-fork
+  - th-lego
   - th-pprint
   - th-sccs
   - th-tc
@@ -10742,6 +10782,7 @@ broken-packages:
   - typescript-docs
   - typograffiti
   - tyro
+  - tz
   - u2f
   - uber
   - uberlast
@@ -11285,6 +11326,7 @@ broken-packages:
   - yaml-rpc
   - yaml-rpc-scotty
   - yaml-rpc-snap
+  - yaml-unscrambler
   - YamlReference
   - Yampa
   - yampa-canvas

From 753cb4fc51bc40d372a000447707c56d5ca9b886 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 31 Oct 2020 02:30:28 +0100
Subject: [PATCH 1690/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-27-g11a103b from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/6ce5b767941b7361d0db86fdb076b7ffe64e07b2.
---
 .../haskell-modules/hackage-packages.nix      | 2246 +++++++++++++----
 1 file changed, 1783 insertions(+), 463 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6169d134ddaa..6ad8267d4483 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3387,15 +3387,15 @@ self: {
        broken = true;
      }) {};
 
-  "Color_0_2_0" = callPackage
+  "Color_0_3_0" = callPackage
     ({ mkDerivation, base, colour, criterion, data-default-class
      , deepseq, doctest, hspec, HUnit, JuicyPixels, massiv, massiv-test
      , QuickCheck, random, vector
      }:
      mkDerivation {
        pname = "Color";
-       version = "0.2.0";
-       sha256 = "1w7d1wjssldybbg46s4hc83f96n49v53wyq0sc1q8mkvqdl35vsh";
+       version = "0.3.0";
+       sha256 = "18aissrpllxll01k203i2agfff89ffah465zvb0yx0lvs8jh2xr7";
        libraryHaskellDepends = [ base data-default-class deepseq vector ];
        testHaskellDepends = [
          base colour doctest hspec HUnit JuicyPixels massiv massiv-test
@@ -6928,8 +6928,8 @@ self: {
     ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }:
      mkDerivation {
        pname = "GPipe-GLFW";
-       version = "1.4.1.3";
-       sha256 = "0czrq3zhcxfl9pzypmxpxgn11faqb0kw05m5k3apr4b88prbj1ij";
+       version = "1.4.1.4";
+       sha256 = "13qbiy2gv682xyj0dpy336zbg4224a1sgzqq9kq1v6f8pwavw6bk";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
        description = "GLFW OpenGL context creation for GPipe";
@@ -8071,8 +8071,8 @@ self: {
      }:
      mkDerivation {
        pname = "HDBC-postgresql";
-       version = "2.3.2.8";
-       sha256 = "0c76di7a134xhw5pmzdjasgyqxj6gkjkj45mr4mwfrchgdg4cvil";
+       version = "2.4.0.0";
+       sha256 = "1zmilqvlp170nb7zakbhdpihykkq95s7nb7la2sdas1fv69mhnx3";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -9537,6 +9537,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HUnit_1_6_1_0" = callPackage
+    ({ mkDerivation, base, call-stack, deepseq, filepath }:
+     mkDerivation {
+       pname = "HUnit";
+       version = "1.6.1.0";
+       sha256 = "1rpi52rnjpyv379rm6n3s706z6mv114aychf03dq456wfa4b7123";
+       libraryHaskellDepends = [ base call-stack deepseq ];
+       testHaskellDepends = [ base call-stack deepseq filepath ];
+       description = "A unit testing framework for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HUnit-Diff" = callPackage
     ({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }:
      mkDerivation {
@@ -10848,6 +10861,21 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {inherit (pkgs) openssl;};
 
+  "HsOpenSSL_0_11_5_1" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
+     mkDerivation {
+       pname = "HsOpenSSL";
+       version = "0.11.5.1";
+       sha256 = "1np4yyiq4935p1vbf89m0ifkilzc6vzab9i8x7c21y9s7rsv4rj9";
+       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 {
@@ -20739,13 +20767,14 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "VulkanMemoryAllocator";
-       version = "0.3.7";
-       sha256 = "1y2dmk60dvk8d9n16in98cmin5ckvdx3knwlfzcs0jl6vyh8n51n";
+       version = "0.3.7.1";
+       sha256 = "18al9vr5zy8smn090dd7fwnm4pqcsxld97azrxni7xsqdb22kja8";
        libraryHaskellDepends = [
          base bytestring transformers vector vulkan
        ];
        description = "Bindings to the VulkanMemoryAllocator library";
        license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "WAVE" = callPackage
@@ -21104,12 +21133,12 @@ self: {
        platforms = stdenv.lib.platforms.none;
      }) {};
 
-  "Win32_2_10_0_0" = callPackage
+  "Win32_2_10_1_0" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "Win32";
-       version = "2.10.0.0";
-       sha256 = "09g61dgw3xvg066qdydw7nxn8vk1nxxwzi1wwr19rkaxhz43149n";
+       version = "2.10.1.0";
+       sha256 = "1il70gh3ysmp4pnhk7dxcbd0c0mh5ay33b9ijmmj0ikmbw0nfpbv";
        description = "A binding to Windows Win32 API";
        license = stdenv.lib.licenses.bsd3;
        platforms = stdenv.lib.platforms.none;
@@ -22975,6 +23004,8 @@ self: {
        ];
        description = "A library for building static site generators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acid-state" = callPackage
@@ -25537,6 +25568,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "agda2lagda" = callPackage
+    ({ mkDerivation, base, directory, filepath, optparse-applicative }:
+     mkDerivation {
+       pname = "agda2lagda";
+       version = "0.2020.11.1";
+       sha256 = "0yl44jdczy9306b5ifd8iwchr8izna8sd5v2h2qm9ns909wcs1l8";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory filepath optparse-applicative
+       ];
+       description = "Translate .agda files into .lagda.tex files.";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "agentx" = callPackage
     ({ mkDerivation, base, binary, bitwise, bytestring, containers
      , data-default, Diff, fclabels, mtl, network, pipes
@@ -32898,6 +32944,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Builders for arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "array-chunks" = callPackage
@@ -32915,6 +32963,8 @@ self: {
        ];
        description = "Lists of chunks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "array-forth" = callPackage
@@ -35361,6 +35411,8 @@ self: {
        pname = "aura";
        version = "3.2.2";
        sha256 = "07ska8w2k3sl084aadjclw8v0ykrp8hiwhim5zd6wd7q95njyk2f";
+       revision = "1";
+       editedCabalFile = "033ycqm18zqq69yam189whpcbnajanj2yp8na8ad344ghcn1gs5l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35526,8 +35578,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Template Haskell to automatically pass values to functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "autoexporter" = callPackage
@@ -37967,17 +38017,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "base16-bytestring_1_0_0_0" = callPackage
+  "base16-bytestring_1_0_1_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit
      , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "base16-bytestring";
-       version = "1.0.0.0";
-       sha256 = "12bnl2fs0h4hcjpr69xqqngjh0117dlvkv56lxski6g6fnbwps2r";
-       revision = "2";
-       editedCabalFile = "16nmmf3mmkdrssx6i77drh7ac7r6cfb1dnbna62z32h11yyyk49j";
+       version = "1.0.1.0";
+       sha256 = "1ynnplw8iz3v5ld0xxgpxgasb0hg62x62wxxf5lx6lxyb15hmiy0";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -40453,10 +40501,8 @@ self: {
      }:
      mkDerivation {
        pname = "binary-instances";
-       version = "1.0.0.1";
-       sha256 = "0f8ilzpwj7gbyvlswlkd48dzpj9m13ipinw55lvjag0ir52idk9a";
-       revision = "1";
-       editedCabalFile = "19xmaj5vlabsifkdk1kpxp4nadfml7a51w316sd4fxd69ncvwd72";
+       version = "1.0.1";
+       sha256 = "0whqjziwqrqslf6byliry84pg47z7vc6yjligpzb8gb5db2gw1h0";
        libraryHaskellDepends = [
          aeson base binary binary-orphans case-insensitive hashable
          scientific tagged text text-binary time-compat unordered-containers
@@ -42524,6 +42570,29 @@ self: {
        broken = true;
      }) {};
 
+  "bitcoin-scripting" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
+     , cereal, containers, haskoin-core, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "bitcoin-scripting";
+       version = "0.1.0";
+       sha256 = "1hd45rr4mq7dizdw7d1wkypr15azaaqc4fy6rkr9gim93jzc8707";
+       libraryHaskellDepends = [
+         attoparsec base base16-bytestring bytestring cereal containers
+         haskoin-core text transformers
+       ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring cereal haskoin-core tasty
+         tasty-hunit tasty-quickcheck text
+       ];
+       description = "Resources for working with miniscript, and script descriptors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "bitcoin-tx" = callPackage
     ({ mkDerivation, base, binary, bitcoin-script, bitcoin-types
      , bytestring, cryptohash, hexstring, hspec, lens
@@ -42566,44 +42635,51 @@ self: {
      }) {};
 
   "bitcoind-regtest" = callPackage
-    ({ mkDerivation, base, bitcoind-rpc, cereal, containers
-     , haskoin-core, http-client, process, servant, servant-client
-     , tasty, tasty-hunit, temporary, text
+    ({ mkDerivation, base, bitcoind-rpc, bytestring, cereal, containers
+     , haskoin-core, http-client, optparse-applicative, process, servant
+     , servant-client, tasty, tasty-hunit, temporary, text
      }:
      mkDerivation {
        pname = "bitcoind-regtest";
-       version = "0.1.0.0";
-       sha256 = "078834ndl253d1s6f68a8cq1dc0hq3r3ic4a90wbr4msw9zn626q";
+       version = "0.2.0.0";
+       sha256 = "06sk8kb3vjf7a2k7rhqpc7j1lbqd69xyhb25dc8bk7110m5l38cf";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bitcoind-rpc cereal containers haskoin-core http-client
          process servant servant-client temporary text
        ];
+       executableHaskellDepends = [
+         base bitcoind-rpc bytestring cereal haskoin-core http-client
+         optparse-applicative process servant servant-client temporary text
+       ];
        testHaskellDepends = [
          base bitcoind-rpc cereal haskoin-core http-client process servant
          servant-client tasty tasty-hunit temporary text
        ];
        description = "A library for working with bitcoin-core regtest networks";
-       license = stdenv.lib.licenses.isc;
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
 
   "bitcoind-rpc" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cereal, haskoin-core
+    ({ mkDerivation, aeson, base, base16-bytestring
+     , bitcoin-compact-filters, bytestring, cereal, haskoin-core
      , http-client, scientific, servant, servant-client
      , servant-jsonrpc-client, text, time, transformers
      }:
      mkDerivation {
        pname = "bitcoind-rpc";
-       version = "0.1.0.0";
-       sha256 = "1a3p49lzzsqd9m7ivisxksb6c7yc0dg5rps6ym85s4aasr1ln1j8";
+       version = "0.2.0.0";
+       sha256 = "0y5y5bdbhc1kcdk2nwjv2x5nz9vg5j38mc3l9pjyizz1s5yzn9rc";
        libraryHaskellDepends = [
-         aeson base bytestring cereal haskoin-core http-client scientific
-         servant servant-client servant-jsonrpc-client text time
-         transformers
+         aeson base base16-bytestring bitcoin-compact-filters bytestring
+         cereal haskoin-core http-client scientific servant servant-client
+         servant-jsonrpc-client text time transformers
        ];
        description = "A streamlined interface to bitcoin core using Haskoin types and Servant";
-       license = stdenv.lib.licenses.isc;
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -43269,14 +43345,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "blanks_0_4_2" = callPackage
+  "blanks_0_5_0" = callPackage
     ({ mkDerivation, adjunctions, base, containers, deepseq
      , distributive, megaparsec, mtl, tasty, tasty-hunit, text
      }:
      mkDerivation {
        pname = "blanks";
-       version = "0.4.2";
-       sha256 = "0dbp923x0zy94kc61j2szmib299y99v208fqs5wir3lzyd55gdsc";
+       version = "0.5.0";
+       sha256 = "1a38cwk65zkzhq8yc95v4kamyp9k1y1vnfii84yqzvrrlbfzxbqf";
        libraryHaskellDepends = [
          adjunctions base containers deepseq distributive mtl
        ];
@@ -47143,8 +47219,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytebuild";
-       version = "0.3.6.0";
-       sha256 = "15nk9r9mx798kmjl04qf01il1csfjyi3jx44yhi4hmgl66p9fdx3";
+       version = "0.3.7.0";
+       sha256 = "1vckm98sarxzqh6ib89y5kzhbf1yxc9wgrbpwbsrh0dv5gi3pclj";
        libraryHaskellDepends = [
          base byteslice bytestring integer-logarithms natural-arithmetic
          primitive primitive-offset primitive-unlifted run-st text-short
@@ -47161,6 +47237,8 @@ self: {
        ];
        description = "Serialize to a small byte arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytedump" = callPackage
@@ -47201,6 +47279,8 @@ self: {
        ];
        description = "Universal hashing of bytes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytelog" = callPackage
@@ -47287,6 +47367,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge primitive ];
        description = "Slicing managed and unmanaged memory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytesmith" = callPackage
@@ -47311,6 +47393,8 @@ self: {
        ];
        description = "Nonresumable byte parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring_0_11_0_0" = callPackage
@@ -49629,8 +49713,8 @@ self: {
      }:
      mkDerivation {
        pname = "cachix";
-       version = "0.3.8";
-       sha256 = "0n05ys0jz6if3k121hr5znzbbd0v6xmckhh4vyya90r3kvgp1526";
+       version = "0.5.0";
+       sha256 = "05z5gnj5fkl0pqhinlvnq9zf51v5xhc6lhgnm061aj89rclhm6bg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -49658,25 +49742,22 @@ self: {
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , conduit, cookie, cryptonite, deepseq, exceptions, hspec
      , hspec-discover, http-api-data, http-media, jose, lens, memory
-     , protolude, resourcet, servant, servant-auth, servant-auth-server
-     , servant-auth-swagger, servant-client, servant-swagger
-     , servant-swagger-ui-core, string-conv, swagger2, text
-     , transformers
+     , nix-narinfo, protolude, resourcet, servant, servant-auth
+     , servant-auth-server, servant-auth-swagger, servant-client
+     , servant-swagger, servant-swagger-ui-core, string-conv, swagger2
+     , text, time, transformers
      }:
      mkDerivation {
        pname = "cachix-api";
-       version = "0.4.0";
-       sha256 = "14hwn9nrnaypwzgy70l4kcscq7fcw1z5rs3a46cm2v5qqj72r2jx";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.5.0";
+       sha256 = "14b4vg6wv7kzxkfbh64ml2wvm9w8fyv2k2sm7ncaa0pp0f26pswy";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring conduit cookie cryptonite
          deepseq exceptions http-api-data http-media jose lens memory
-         protolude resourcet servant servant-auth servant-auth-server
-         servant-auth-swagger servant-client servant-swagger string-conv
-         swagger2 text transformers
+         nix-narinfo protolude resourcet servant servant-auth
+         servant-auth-server servant-client string-conv swagger2 text time
+         transformers
        ];
-       executableHaskellDepends = [ aeson base protolude ];
        testHaskellDepends = [
          aeson base base16-bytestring bytestring conduit cookie cryptonite
          hspec http-api-data http-media lens memory protolude servant
@@ -54658,8 +54739,8 @@ self: {
      }:
      mkDerivation {
        pname = "citeproc";
-       version = "0.1.0.3";
-       sha256 = "10zkkn00b2rm1lfnwdpmbxp82vmzbh69ivsda40kh0x2d8r1rzxp";
+       version = "0.1.1.1";
+       sha256 = "1w6ivzkwjpgaqd8nnb73krp2xwnkli5ggd0nmw3llxfzcvpg0mxz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -57217,8 +57298,8 @@ self: {
      }:
      mkDerivation {
        pname = "cobot-io";
-       version = "0.1.3.8";
-       sha256 = "1x3ikycb9v9hmn1j57sddnr50kb3kvnch6w09fsyqzzmbnfc6nys";
+       version = "0.1.3.10";
+       sha256 = "0fdx96f9kn09nwpcdqpys3rvxlwrvynba5ipb509vriny96p7vrr";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-msgpack
          deepseq http-conduit hyraxAbif lens linear mtl split text vector
@@ -58678,8 +58759,8 @@ self: {
      }:
      mkDerivation {
        pname = "commonmark";
-       version = "0.1.0.2";
-       sha256 = "00rqy02pn4gg0wpwvxyqxvzqg75lvb1qawn4m8rnjq6v43c4g23l";
+       version = "0.1.1.2";
+       sha256 = "13gk08gigih75zq7kwc101yxmxvj3hvfyi67ap13nrabv70l6zjm";
        libraryHaskellDepends = [
          base bytestring containers parsec text transformers
        ];
@@ -58720,8 +58801,8 @@ self: {
      }:
      mkDerivation {
        pname = "commonmark-extensions";
-       version = "0.2.0.1";
-       sha256 = "08i6167d78b5wf6aqsrjz2sb1qaanwrjzhpfg1jn4grd9g8i2ql6";
+       version = "0.2.0.4";
+       sha256 = "166ywkh6vyyrrwq7ww68pwzdkwmhi23hjvw28769m010ksimz2wh";
        libraryHaskellDepends = [
          base bytestring commonmark containers emojis parsec text
          transformers
@@ -59183,8 +59264,8 @@ self: {
      }:
      mkDerivation {
        pname = "compdoc";
-       version = "0.1.0.0";
-       sha256 = "0m7xrl1ki3agp69yczgy396xlb84kggslmqnjglziyg6sziv58ak";
+       version = "0.2.0.0";
+       sha256 = "0cdgyvbx2xf7dgvg0h6k980yfh9vj7yg5vsg08i7cb8iik2w0k0m";
        libraryHaskellDepends = [
          aeson base composite-aeson composite-aeson-throw composite-base
          pandoc pandoc-throw path rio vinyl
@@ -59195,6 +59276,26 @@ self: {
        broken = true;
      }) {};
 
+  "compdoc-dhall-decoder" = callPackage
+    ({ mkDerivation, base, compdoc, composite-aeson, composite-base
+     , dhall, either, pandoc, text
+     }:
+     mkDerivation {
+       pname = "compdoc-dhall-decoder";
+       version = "0.2.0.0";
+       sha256 = "0iygbgcqcs3ixdnphhrp57s1ihpwnf9q59z7r74qqj7qx1yjrxig";
+       revision = "1";
+       editedCabalFile = "1g15qxkxfipvf6al3k8bdcvvcl1vyhjhg3r1w2z2g91ngz0b5y18";
+       libraryHaskellDepends = [
+         base compdoc composite-aeson composite-base dhall either pandoc
+         text
+       ];
+       description = "Allows you to write FromDhall instances for Compdoc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "compendium-client" = callPackage
     ({ mkDerivation, aeson, base, http-client, language-protobuf
      , megaparsec, servant, servant-client, text
@@ -62661,6 +62762,8 @@ self: {
        ];
        description = "Unified interface for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "contiguous-checked" = callPackage
@@ -62685,6 +62788,8 @@ self: {
        libraryHaskellDepends = [ base contiguous primitive semirings ];
        description = "dft of contiguous memory structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "continue" = callPackage
@@ -63559,6 +63664,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "core-data_0_2_1_9" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, core-text
+     , hashable, prettyprinter, scientific, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "core-data";
+       version = "0.2.1.9";
+       sha256 = "098bxx2g4mh3agpx7bccxhq8lpxjgl7a017vzp3ab65ni8126b1r";
+       libraryHaskellDepends = [
+         aeson base bytestring containers core-text hashable prettyprinter
+         scientific text unordered-containers vector
+       ];
+       description = "Convenience wrappers around common data structures and encodings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "core-haskell" = callPackage
     ({ mkDerivation, base, haskeline, haskell-src-exts, hint }:
      mkDerivation {
@@ -63597,6 +63720,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "core-program_0_2_6_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, chronologique, core-data
+     , core-text, directory, exceptions, filepath, fsnotify, hashable
+     , hourglass, mtl, prettyprinter, safe-exceptions, stm
+     , template-haskell, terminal-size, text, text-short, transformers
+     , unix
+     }:
+     mkDerivation {
+       pname = "core-program";
+       version = "0.2.6.0";
+       sha256 = "1qyl7kcdqxfl2inx66n7pa1z2pqjxrz1bpg3jjknjj0kpw9rlhf3";
+       libraryHaskellDepends = [
+         async base bytestring chronologique core-data core-text directory
+         exceptions filepath fsnotify hashable hourglass mtl prettyprinter
+         safe-exceptions stm template-haskell terminal-size text text-short
+         transformers unix
+       ];
+       description = "Opinionated Haskell Interoperability";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "core-text" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable
      , prettyprinter, prettyprinter-ansi-terminal, template-haskell
@@ -63614,6 +63759,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "core-text_0_3_0_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq
+     , fingertree, hashable, prettyprinter, template-haskell, text
+     , text-short
+     }:
+     mkDerivation {
+       pname = "core-text";
+       version = "0.3.0.0";
+       sha256 = "103fd1bbhkh1l9di0f88yxl9mdaxjh31pgg49bk6yhx9cmdhgn1x";
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring colour deepseq fingertree hashable
+         prettyprinter template-haskell text text-short
+       ];
+       description = "A rope type based on a finger tree over UTF-8 fragments";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "corebot-bliki" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
      , directory, filepath, filestore, http-types, monads-tf, pandoc
@@ -64787,15 +64950,16 @@ self: {
 
   "crdt-event-fold" = callPackage
     ({ mkDerivation, base, binary, containers, data-default-class
-     , data-dword
+     , data-dword, hspec
      }:
      mkDerivation {
        pname = "crdt-event-fold";
-       version = "1.0.0.2";
-       sha256 = "0bhfbzxb7s49x6nk1gg1n5nf26h8xqgy41ln7d5j59zp0lri5c04";
+       version = "1.1.0.0";
+       sha256 = "084vbx98b8ca5q2p6icbz0hv0hh4djk8iain7vv60w18453pz8fc";
        libraryHaskellDepends = [
          base binary containers data-default-class data-dword
        ];
+       testHaskellDepends = [ base hspec ];
        description = "Garbage collected event folding CRDT";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -67319,8 +67483,8 @@ self: {
      }:
      mkDerivation {
        pname = "cut-the-crap";
-       version = "2.2.0";
-       sha256 = "19i1wmh9163fb8wggnla4c8r51j71wiwyzhhh3mznckhaws40fqa";
+       version = "2.3.1";
+       sha256 = "1q7jp39xyhximpb9k4yw2baccpgixgsdcrrlx1a0s84nxv8d0hl6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69812,8 +69976,8 @@ self: {
        pname = "data-tree-print";
        version = "0.1.0.2";
        sha256 = "00jh37anim8qsn553467gmfhajcz1c61zrgh1ypkqsll0gc29vy3";
-       revision = "1";
-       editedCabalFile = "1r6dnvc7d50q5p9fdqqwfvi7kwn7r89319plj7v284sjai9b6ld4";
+       revision = "2";
+       editedCabalFile = "00qpzhm3lndhpql8aj93aj6r3x9n0gw3nx6n0q60xxrd6agyjifq";
        libraryHaskellDepends = [ base pretty syb ];
        description = "Print Data instances as a nested tree";
        license = stdenv.lib.licenses.bsd3;
@@ -72250,15 +72414,15 @@ self: {
 
   "dependent-sum-aeson-orphans" = callPackage
     ({ mkDerivation, aeson, base, constraints, constraints-extras
-     , dependent-map, dependent-sum
+     , dependent-map, dependent-sum, some
      }:
      mkDerivation {
        pname = "dependent-sum-aeson-orphans";
-       version = "0.2.1.0";
-       sha256 = "04flfszrn4ah9vrm6hyp2pk0sbldcjp0jjibdny7lxdmv0fskzj5";
+       version = "0.3.0.0";
+       sha256 = "1wpjrynv9zva3hw1wgmqd5pmhhpa491yh85p1dnbpkj7h0g1pl1a";
        libraryHaskellDepends = [
          aeson base constraints constraints-extras dependent-map
-         dependent-sum
+         dependent-sum some
        ];
        description = "JSON instances for DSum, DMap, and Some";
        license = stdenv.lib.licenses.bsd3;
@@ -75857,6 +76021,39 @@ self: {
        broken = true;
      }) {};
 
+  "discord-register" = callPackage
+    ({ mkDerivation, base, calamity, dhall, di, di-polysemy
+     , generic-lens, hspec, hspec-megaparsec, megaparsec, polysemy
+     , polysemy-plugin, text, text-show, unboxing-vector
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "discord-register";
+       version = "0.0.1";
+       sha256 = "1crwbdkyg6k4777lcc7yi5n47xpsnvl3s1652n896k1hck7ckrr8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base calamity dhall di di-polysemy generic-lens hspec
+         hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show
+         unboxing-vector unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         base calamity dhall di di-polysemy generic-lens hspec
+         hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show
+         unboxing-vector unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base calamity dhall di di-polysemy generic-lens hspec
+         hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show
+         unboxing-vector unordered-containers vector
+       ];
+       description = "Discord verification bot";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "discord-rest" = callPackage
     ({ mkDerivation, aeson, base, bytestring, comonad, data-default
      , discord-types, hashable, hslogger, http-client, mtl, req, stm
@@ -78196,6 +78393,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "domain" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, domain-core, foldl
+     , hashable, parser-combinators, QuickCheck, quickcheck-instances
+     , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , template-haskell-compat-v0208, text, th-lego, th-orphans
+     , yaml-unscrambler
+     }:
+     mkDerivation {
+       pname = "domain";
+       version = "0.1";
+       sha256 = "1lr97k14wc35myckknsv3vyximqfv5vq04f5kpd8167lk3vjahm2";
+       libraryHaskellDepends = [
+         attoparsec base bytestring domain-core foldl hashable
+         parser-combinators template-haskell template-haskell-compat-v0208
+         text th-lego yaml-unscrambler
+       ];
+       testHaskellDepends = [
+         base domain-core QuickCheck quickcheck-instances rerebase tasty
+         tasty-hunit tasty-quickcheck template-haskell text th-orphans
+       ];
+       description = "Codegen helping you define domain models";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "domain-auth" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, attoparsec, base
      , bytestring, containers, cryptonite, dns, doctest, iproute, memory
@@ -78214,6 +78437,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "domain-core" = callPackage
+    ({ mkDerivation, base, template-haskell
+     , template-haskell-compat-v0208, text, th-lego, th-lift-instances
+     }:
+     mkDerivation {
+       pname = "domain-core";
+       version = "0.1";
+       sha256 = "1qxscw4rcbnak9mp21455gzjdnjj6cqisdhq63gdibhrazfsjvd3";
+       libraryHaskellDepends = [
+         base template-haskell template-haskell-compat-v0208 text th-lego
+         th-lift-instances
+       ];
+       description = "Low-level API of \"domain\"";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "domain-optics" = callPackage
+    ({ mkDerivation, base, domain, domain-core, optics, optics-core
+     , rerebase, template-haskell, template-haskell-compat-v0208, text
+     , th-lego, unordered-containers
+     }:
+     mkDerivation {
+       pname = "domain-optics";
+       version = "0.1";
+       sha256 = "0nivzn3nw30n1wb0i2j9qzxfmqcyknc187z3rkfyz5a5y7iq7x4m";
+       libraryHaskellDepends = [
+         base domain-core optics-core template-haskell
+         template-haskell-compat-v0208 text th-lego unordered-containers
+       ];
+       testHaskellDepends = [ domain optics rerebase ];
+       description = "Integration of domain with optics";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "dominion" = callPackage
     ({ mkDerivation, base, containers, hspec, lens, mtl, random }:
      mkDerivation {
@@ -81336,15 +81597,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "egison-pattern-src_0_2_1_1" = callPackage
+  "egison-pattern-src_0_2_1_2" = callPackage
     ({ mkDerivation, base, containers, free, megaparsec, mtl
      , parser-combinators, prettyprinter, recursion-schemes, tasty
      , tasty-discover, tasty-hunit, text
      }:
      mkDerivation {
        pname = "egison-pattern-src";
-       version = "0.2.1.1";
-       sha256 = "0zpaxkskpdhq5nm1h6fh1klww4cslz96a3w4fhlaz0v0wdbkbrfs";
+       version = "0.2.1.2";
+       sha256 = "14g13m9c4353j8hir5inqhfzwapkxdkbvkzfbrrgca6hyj7mn1vf";
        libraryHaskellDepends = [
          base containers free megaparsec mtl parser-combinators
          prettyprinter recursion-schemes text
@@ -81364,8 +81625,8 @@ self: {
      }:
      mkDerivation {
        pname = "egison-pattern-src-haskell-mode";
-       version = "0.2.1.1";
-       sha256 = "0k21fi28imqnn2rp5182mjxnrahssbdxay3pzhzj5yyfjp8qymwp";
+       version = "0.2.1.2";
+       sha256 = "1v76k77p8d86sp8lpd9h7gqdd9srbbiq8sd3bvvdvn7sj44gzw9m";
        libraryHaskellDepends = [
          base egison-pattern-src haskell-src-exts mtl text
        ];
@@ -81399,6 +81660,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "egison-pattern-src-th-mode_0_2_1_2" = callPackage
+    ({ mkDerivation, base, egison-pattern-src, haskell-src-exts
+     , haskell-src-meta, mtl, pretty, tasty, tasty-discover, tasty-hunit
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "egison-pattern-src-th-mode";
+       version = "0.2.1.2";
+       sha256 = "0zm3ds6vcxhahcwwryhk8f65141f0bnzj6mxy681npzwzgvljiyd";
+       libraryHaskellDepends = [
+         base egison-pattern-src haskell-src-exts haskell-src-meta mtl
+         pretty template-haskell text
+       ];
+       testHaskellDepends = [
+         base egison-pattern-src haskell-src-exts mtl tasty tasty-hunit
+         template-haskell text
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Parser and pretty printer for Egison pattern expressions to use with TH";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "egison-quote" = callPackage
     ({ mkDerivation, base, egison, mtl, parsec, template-haskell }:
      mkDerivation {
@@ -84257,6 +84541,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Error code functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "error-context" = callPackage
@@ -84702,7 +84988,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "esqueleto_3_4_0_0" = callPackage
+  "esqueleto_3_4_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
      , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql
      , mysql-simple, persistent, persistent-mysql, persistent-postgresql
@@ -84712,8 +84998,8 @@ self: {
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "3.4.0.0";
-       sha256 = "0a4wrkcwlzgw0mds1pnxspv6ddzy9mz0md0qdx0x9s51z9ldswaj";
+       version = "3.4.0.1";
+       sha256 = "1vq8yfrixgqps8g6wvfgr9n42zmwj1jybiq3sbrgfj318n6dm5mc";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-html bytestring conduit containers
          monad-logger persistent resourcet tagged text time transformers
@@ -86069,8 +86355,8 @@ self: {
      }:
      mkDerivation {
        pname = "exact-real";
-       version = "0.12.4";
-       sha256 = "09i0pi141cmqc09mxgsmdk7n3a0rcmjc7w2j4a0ckf0i41vb9yni";
+       version = "0.12.4.1";
+       sha256 = "194qx4dq8c9w1nbr4vyalmvp0m1a0q1pxjckg59m7c3fsz9r88jg";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base integer-gmp random ];
        testHaskellDepends = [
@@ -86080,8 +86366,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Exact real arithmetic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exact-real-positional" = callPackage
@@ -92911,7 +93195,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "foldl_1_4_9" = callPackage
+  "foldl_1_4_10" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, criterion, doctest, hashable, mwc-random
      , primitive, profunctors, semigroupoids, text, transformers
@@ -92919,10 +93203,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.4.9";
-       sha256 = "06cl9nyamzrmk894zm5na5hkbvnfyla1yvs2dk2ydms5m0v7z1na";
-       revision = "1";
-       editedCabalFile = "1fp5fym1620zcp570naa3wqhs4x3l9qgdxk77ddmijm9q3j0vqmm";
+       version = "1.4.10";
+       sha256 = "1fl1vahga6dv21nkgjd265nlhmgqzr8sa0fb5dfqzk34fb01vvvq";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant hashable
          mwc-random primitive profunctors semigroupoids text transformers
@@ -97209,14 +97491,14 @@ self: {
 
   "gargoyle" = callPackage
     ({ mkDerivation, base, directory, filelock, filepath, network
-     , process
+     , process, unix
      }:
      mkDerivation {
        pname = "gargoyle";
-       version = "0.1";
-       sha256 = "1yjvn1bfjnr8prs6inz5nhmywszwp8f38iz6v6i3lfazcck8qb43";
+       version = "0.1.1.0";
+       sha256 = "1rjkz0v8jmzxxh41fs777fyhdp7lizwngg33886awmg08hdk24rq";
        libraryHaskellDepends = [
-         base directory filelock filepath network process
+         base directory filelock filepath network process unix
        ];
        description = "Automatically spin up and spin down local daemons";
        license = stdenv.lib.licenses.bsd3;
@@ -97225,17 +97507,18 @@ self: {
      }) {};
 
   "gargoyle-postgresql" = callPackage
-    ({ mkDerivation, base, bytestring, directory, gargoyle, process
-     , stringsearch, text, unix
+    ({ mkDerivation, base, bytestring, directory, gargoyle
+     , posix-escape, process, stringsearch, text, unix
      }:
      mkDerivation {
        pname = "gargoyle-postgresql";
-       version = "0.1";
-       sha256 = "13s2r5kxqkpq4g13dpqig7y2ya0n19xw5ng1sw093kp2kmfjs4h4";
+       version = "0.2.0.1";
+       sha256 = "1k12cfrz58hmdrjnrxyb3dixj8yfz41xpq0dqgvxzwlrd3d4nb9g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring directory gargoyle process stringsearch text unix
+         base bytestring directory gargoyle posix-escape process
+         stringsearch text unix
        ];
        executableHaskellDepends = [
          base bytestring gargoyle process text unix
@@ -97246,6 +97529,49 @@ self: {
        broken = true;
      }) {};
 
+  "gargoyle-postgresql-connect" = callPackage
+    ({ mkDerivation, base, bytestring, directory, gargoyle
+     , gargoyle-postgresql, gargoyle-postgresql-nix, postgresql-simple
+     , resource-pool
+     }:
+     mkDerivation {
+       pname = "gargoyle-postgresql-connect";
+       version = "0.1.0.0";
+       sha256 = "00gfs33hcmjla7h32hiazjpsdcszvig7fajhsx48yr8jq9srkm3d";
+       revision = "2";
+       editedCabalFile = "052glxfxsd9wvdyqxdj49vp1b1vvqr77zrdv85r3iqm7mvf16gmk";
+       libraryHaskellDepends = [
+         base bytestring directory gargoyle gargoyle-postgresql
+         gargoyle-postgresql-nix postgresql-simple resource-pool
+       ];
+       description = "Connect to gargoyle-managed postgresql instances";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "gargoyle-postgresql-nix" = callPackage
+    ({ mkDerivation, base, bytestring, gargoyle, gargoyle-postgresql
+     , which
+     }:
+     mkDerivation {
+       pname = "gargoyle-postgresql-nix";
+       version = "0.3.0.0";
+       sha256 = "1cjh9hqk4ba1bz29b4vj0h249vpfpdgn8zsznqcr7b58czd8cf4y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring gargoyle gargoyle-postgresql which
+       ];
+       executableHaskellDepends = [
+         base gargoyle gargoyle-postgresql which
+       ];
+       description = "Manage PostgreSQL servers with gargoyle and nix";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "garlic-bread" = callPackage
     ({ mkDerivation, base, hspec, mtl, transformers }:
      mkDerivation {
@@ -98122,7 +98448,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "generic-data_0_9_1_0" = callPackage
+  "generic-data_0_9_2_0" = callPackage
     ({ mkDerivation, ap-normalize, base, base-orphans, Cabal
      , cabal-doctest, contravariant, criterion, deepseq, doctest
      , generic-lens, ghc-boot-th, inspection-testing, one-liner
@@ -98131,8 +98457,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-data";
-       version = "0.9.1.0";
-       sha256 = "0p58z70wp3vapxrwg7hkr5n6px7hws9398v9shc08c2aigq36kqa";
+       version = "0.9.2.0";
+       sha256 = "00zwfr21kmgcdjfjvacn4pvs5i8bl6xbbzw95746g67ap5nz624d";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ap-normalize base base-orphans contravariant ghc-boot-th
@@ -98255,13 +98581,13 @@ self: {
      }) {};
 
   "generic-functor" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, ap-normalize, base, transformers }:
      mkDerivation {
        pname = "generic-functor";
-       version = "0.1.0.0";
-       sha256 = "02anlx3l0zn4hx9pckpdpp93yp1xyqcafpy6rk7s1zpv7nqk12z2";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
+       version = "0.2.0.0";
+       sha256 = "0zrjsn78ip9kigqgw5cxzm9d7pqf1svdzrc3rm041889ca0szwjv";
+       libraryHaskellDepends = [ ap-normalize base ];
+       testHaskellDepends = [ base transformers ];
        description = "Deriving generalized functors with GHC.Generics";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -103355,8 +103681,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "8.20201007";
-       sha256 = "0v11yc4kkxnzvwqry277dpjwlavinrjiagfw0ayhrfwd703j1y8a";
+       version = "8.20201103";
+       sha256 = "1z9ikpsz3by48yfw87qav5dy7j4k9ky4a7nqnasl15kdm3lav9pl";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -103642,8 +103968,6 @@ self: {
        ];
        description = "Tool to help resolving git conflicts";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-monitor" = callPackage
@@ -108184,8 +108508,8 @@ self: {
      }:
      mkDerivation {
        pname = "goldplate";
-       version = "0.1.1";
-       sha256 = "0qjqx3yxlyfdj6glych7vwrrh47nrp6xi0vncga2a94hb5sljzzl";
+       version = "0.1.2";
+       sha256 = "1qbh23sqx0jvwrmhb88683z3rx31jy99xh8h24iqv1ykmjvmqwvf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108569,15 +108893,16 @@ self: {
 
   "gopro-plus" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, exceptions
-     , filepath, generic-deriving, HUnit, lens, lens-aeson, mtl, random
+     , filepath, generic-deriving, generic-random, HUnit, lens
+     , lens-aeson, mtl, QuickCheck, quickcheck-instances, random
      , raw-strings-qq, retry, tasty, tasty-hunit, tasty-quickcheck, text
      , time, transformers, unix, unliftio, unordered-containers, vector
      , wreq
      }:
      mkDerivation {
        pname = "gopro-plus";
-       version = "0.4.1.1";
-       sha256 = "1vcy9r4jnnrfc6xp34b4w5z4xgxhcnsv5sy26iazw6g07mg1v73p";
+       version = "0.4.1.3";
+       sha256 = "1924d0qymm18zy5pw04irf1nmwdbkbscxcvw4cmjqm9xj7cnyja0";
        libraryHaskellDepends = [
          aeson base bytestring containers exceptions filepath
          generic-deriving lens lens-aeson mtl random retry text time
@@ -108585,12 +108910,15 @@ self: {
        ];
        testHaskellDepends = [
          aeson base bytestring containers exceptions filepath
-         generic-deriving HUnit lens lens-aeson mtl random raw-strings-qq
-         retry tasty tasty-hunit tasty-quickcheck text time transformers
-         unix unliftio unordered-containers vector wreq
+         generic-deriving generic-random HUnit lens lens-aeson mtl
+         QuickCheck quickcheck-instances random raw-strings-qq retry tasty
+         tasty-hunit tasty-quickcheck text time transformers unix unliftio
+         unordered-containers vector wreq
        ];
        description = "GoPro Plus Client API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash" = callPackage
@@ -112065,6 +112393,55 @@ self: {
        broken = true;
      }) {};
 
+  "hOpenPGP_2_9_5" = callPackage
+    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
+     , base16-bytestring, bifunctors, binary, binary-conduit, bytestring
+     , bz2, conduit, conduit-extra, containers, criterion
+     , crypto-cipher-types, cryptonite, errors, hashable
+     , incremental-parser, ixset-typed, lens, memory, monad-loops
+     , nettle, network, network-uri, openpgp-asciiarmor, prettyprinter
+     , QuickCheck, quickcheck-instances, resourcet, split, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
+     , transformers, unliftio-core, unordered-containers, zlib
+     }:
+     mkDerivation {
+       pname = "hOpenPGP";
+       version = "2.9.5";
+       sha256 = "1wzvlk7my7a8rwmsw1glw2dlph3b2hwyz2jkcjr0hd1jj8ywksnx";
+       libraryHaskellDepends = [
+         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
+         binary binary-conduit bytestring bz2 conduit conduit-extra
+         containers crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network-uri openpgp-asciiarmor prettyprinter resourcet 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 bz2 conduit conduit-extra
+         containers crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri prettyprinter QuickCheck quickcheck-instances
+         resourcet split tasty tasty-hunit tasty-quickcheck text time
+         time-locale-compat transformers unliftio-core unordered-containers
+         zlib
+       ];
+       benchmarkHaskellDepends = [
+         aeson base base16-bytestring bifunctors binary binary-conduit
+         bytestring bz2 conduit conduit-extra containers criterion
+         crypto-cipher-types cryptonite errors hashable incremental-parser
+         ixset-typed lens memory monad-loops nettle network network-uri
+         openpgp-asciiarmor prettyprinter resourcet split text time
+         time-locale-compat transformers unliftio-core unordered-containers
+         zlib
+       ];
+       description = "native Haskell implementation of OpenPGP (RFC4880)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hPDB" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , ghc-prim, iterable, linear, mmap, mtl, Octree, parallel
@@ -112992,10 +113369,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-security-HTTP";
-       version = "0.1.1";
-       sha256 = "0chkrn4d33qjh50fpbkrkqj6jsxd5y5c2mrgqgwsdx3x08kaq8nd";
-       revision = "3";
-       editedCabalFile = "1nsvfqg2k1yj8pvbfx1083m29v1c9kcb9h389r380ga1b32v89nl";
+       version = "0.1.1.1";
+       sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2";
        libraryHaskellDepends = [
          base bytestring hackage-security HTTP mtl network network-uri zlib
        ];
@@ -114488,15 +114863,15 @@ self: {
      }) {};
 
   "hakyll-typescript" = callPackage
-    ({ mkDerivation, base, bytestring, directory, hakyll, hjsmin, tasty
-     , tasty-hunit, typed-process
+    ({ mkDerivation, base, bytestring, directory, hakyll
+     , hakyll-process, hjsmin, tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "hakyll-typescript";
-       version = "0.0.1.0";
-       sha256 = "1vhkhbmy0pflcnzfhb9gck436rr5wr6hfpcb3sz8r27l1fml26ji";
+       version = "0.0.2.0";
+       sha256 = "03vxfv693grnyrkr3qz9vxh97dmaw1qqnb4hrfi8hpkqb094yw5d";
        libraryHaskellDepends = [
-         base bytestring hakyll hjsmin typed-process
+         base bytestring hakyll hakyll-process hjsmin
        ];
        testHaskellDepends = [ base directory hakyll tasty tasty-hunit ];
        description = "Typescript and javascript hakyll compilers";
@@ -117963,12 +118338,12 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "haskell-gi-base_0_24_3" = callPackage
+  "haskell-gi-base_0_24_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.24.3";
-       sha256 = "007qy63s9d6rdhybnd7cfb5jsx0kzg7lbgximxkh5rd66bjbk9pc";
+       version = "0.24.4";
+       sha256 = "1xdl2pfpk30h4649avh0ms6gq9dij3yxpfxn6kwxyjcsxdggzmdg";
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
        description = "Foundation for libraries generated by haskell-gi";
@@ -120266,7 +120641,7 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "haskoin-core_0_17_0" = callPackage
+  "haskoin-core_0_17_1" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
      , cereal, conduit, containers, cryptonite, deepseq, entropy
      , hashable, hspec, hspec-discover, HUnit, lens, lens-aeson, memory
@@ -120276,8 +120651,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-core";
-       version = "0.17.0";
-       sha256 = "0zsi5390ig611clahj3p2l3h3w7b3lzl3dfiqliihanivlnrmkag";
+       version = "0.17.1";
+       sha256 = "07w2ddgrq3s4xhhhh616a65zm3xnlmcfk7wzdj6dr26h0frpz6zi";
        libraryHaskellDepends = [
          aeson array base base16-bytestring bytestring cereal conduit
          containers cryptonite deepseq entropy hashable hspec memory mtl
@@ -123417,8 +123792,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdocs";
-       version = "0.5.4.0";
-       sha256 = "1qj7kcpfwpsgzbmhiix22n66173kgxqgf3fb6mc2ybdc4zmkfa29";
+       version = "0.5.5.0";
+       sha256 = "1bwwvqlxpjh77fi443ay269i8n9cxzdv7nspql6lrks9wh8jf8cf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -125388,32 +125763,32 @@ self: {
 
   "hevm" = callPackage
     ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base
-     , base16-bytestring, binary, brick, bytestring, cborg, cereal
-     , containers, cryptonite, data-dword, deepseq, directory, ff, fgl
-     , filepath, free, haskeline, here, HUnit, lens, lens-aeson
-     , megaparsec, memory, monad-par, mtl, multiset, operational
-     , optparse-generic, process, QuickCheck, quickcheck-text
-     , regex-tdfa, restless-git, rosezipper, s-cargot, sbv, scientific
-     , secp256k1, semver-range, tasty, tasty-hunit, tasty-quickcheck
-     , temporary, text, text-format, time, transformers, tree-view
-     , unordered-containers, vector, vty, witherable, wreq
+     , base16-bytestring, binary, brick, bytestring, cereal, containers
+     , cryptonite, data-dword, deepseq, directory, ff, fgl, filepath
+     , free, haskeline, here, HUnit, lens, lens-aeson, megaparsec
+     , memory, monad-par, mtl, multiset, operational, optparse-generic
+     , process, QuickCheck, quickcheck-text, regex-tdfa, restless-git
+     , rosezipper, s-cargot, sbv, scientific, secp256k1, semver-range
+     , tasty, tasty-hunit, tasty-quickcheck, temporary, text
+     , text-format, time, transformers, tree-view, unordered-containers
+     , vector, vty, witherable, wreq
      }:
      mkDerivation {
        pname = "hevm";
-       version = "0.41.0";
-       sha256 = "13qf0bh47dppqbxv1g07411c1lfmfxl0pm2s3xkwdf7kr219l0hw";
+       version = "0.42.0";
+       sha256 = "0p736bxsg91l7n82xad52j5gqvyx6ik7hbmlnnz5bsrnsm05maxz";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          abstract-par aeson ansi-wl-pprint base base16-bytestring binary
-         brick bytestring cborg cereal containers cryptonite data-dword
-         deepseq directory fgl filepath free haskeline lens lens-aeson
-         megaparsec memory monad-par mtl multiset operational
-         optparse-generic process QuickCheck quickcheck-text regex-tdfa
-         restless-git rosezipper s-cargot sbv scientific semver-range
-         temporary text text-format time transformers tree-view
-         unordered-containers vector vty witherable wreq
+         brick bytestring cereal containers cryptonite data-dword deepseq
+         directory fgl filepath free haskeline lens lens-aeson megaparsec
+         memory monad-par mtl multiset operational optparse-generic process
+         QuickCheck quickcheck-text regex-tdfa restless-git rosezipper
+         s-cargot sbv scientific semver-range temporary text text-format
+         time transformers tree-view unordered-containers vector vty
+         witherable wreq
        ];
        librarySystemDepends = [ ff secp256k1 ];
        executableHaskellDepends = [
@@ -125497,6 +125872,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "ByteString-Text hexidecimal conversions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexchat" = callPackage
@@ -127537,6 +127914,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hinotify_0_4_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , unix
+     }:
+     mkDerivation {
+       pname = "hinotify";
+       version = "0.4.1";
+       sha256 = "06pqfikfa61i45g92b65br83kplwmizqkm42yp8d0ddgmq0b21qk";
+       libraryHaskellDepends = [ async base bytestring containers unix ];
+       testHaskellDepends = [ base bytestring directory unix ];
+       description = "Haskell binding to inotify";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hinotify-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , posix-paths, unix, utf8-string
@@ -129884,8 +130276,8 @@ self: {
      }:
      mkDerivation {
        pname = "hnix";
-       version = "0.10.1";
-       sha256 = "19a5pa1ji4hjr3vjvbkjmhnysnd8jcpkzlj9f2qw67h5iagysccy";
+       version = "0.11.0";
+       sha256 = "01m23sn3r2pr6ldblk4m41y082jc0lrgpfzbx63sx168ldhwxar3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -131246,6 +131638,39 @@ self: {
        broken = true;
      }) {};
 
+  "hopenpgp-tools_0_23_3" = callPackage
+    ({ mkDerivation, aeson, alex, array, base, base16-bytestring
+     , binary, binary-conduit, bytestring, conduit, conduit-extra
+     , containers, cryptonite, directory, errors, fgl, graphviz, happy
+     , hOpenPGP, http-client, http-client-tls, http-types, ixset-typed
+     , lens, memory, monad-loops, mtl, openpgp-asciiarmor
+     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
+     , prettyprinter-convert-ansi-wl-pprint, resourcet, text, time
+     , time-locale-compat, transformers, unordered-containers, vector
+     , yaml
+     }:
+     mkDerivation {
+       pname = "hopenpgp-tools";
+       version = "0.23.3";
+       sha256 = "1h6hg05i7vm0cnhn3sifmmv01hjxy0w030j4m3fig3ic57658q2p";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson array base base16-bytestring binary binary-conduit bytestring
+         conduit conduit-extra containers cryptonite directory errors fgl
+         graphviz hOpenPGP http-client http-client-tls http-types
+         ixset-typed lens memory monad-loops mtl openpgp-asciiarmor
+         optparse-applicative prettyprinter prettyprinter-ansi-terminal
+         prettyprinter-convert-ansi-wl-pprint resourcet text time
+         time-locale-compat transformers unordered-containers vector yaml
+       ];
+       executableToolDepends = [ alex happy ];
+       description = "hOpenPGP-based command-line tools";
+       license = stdenv.lib.licenses.agpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hopenssl" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, openssl }:
      mkDerivation {
@@ -132501,8 +132926,10 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.4.13";
-       sha256 = "0z88kiirwpnzw6hxg99kg42j2hkf002vcsmbcm7nqdfqajrggiy0";
+       version = "2.4.17";
+       sha256 = "1r7zr4sbg6355zavbzjixvfv10aglz1zs9ajnznpjhnj6lfisf32";
+       revision = "2";
+       editedCabalFile = "0hxhvjk3mswx712viv7krcgiynxq4bjs71vbk2pgm2d50i5qr8mr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134851,30 +135278,31 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec
      , base, bytestring, Cabal, containers, cpphs, data-default, deepseq
      , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc
-     , ghc-boot, ghc-paths, haddock-api, haddock-library, haskell-names
-     , haskell-src-exts, hdocs, hformat, hlint, hspec, http-client, lens
-     , lens-aeson, lifted-base, mmorph, monad-control, monad-loops, mtl
-     , network, network-uri, optparse-applicative, process
-     , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm
-     , syb, template-haskell, text, text-region, time, transformers
-     , transformers-base, uniplate, unix, unordered-containers, vector
+     , ghc-boot, ghc-lib-parser, ghc-paths, haddock-api, haddock-library
+     , haskell-names, haskell-src-exts, hdocs, hformat, hlint, hspec
+     , http-client, lens, lens-aeson, lifted-base, mmorph, monad-control
+     , monad-loops, mtl, network, network-uri, optparse-applicative
+     , process, regex-pcre-builtin, scientific, simple-log
+     , sqlite-simple, stm, syb, template-haskell, text, text-region
+     , time, transformers, transformers-base, uniplate, unix
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.3.3.8";
-       sha256 = "01dagwpg70h9af5kzr2f19qsvy4h5cx5rjdrcq0r36fbmdkbza2z";
+       version = "0.3.4.0";
+       sha256 = "1qp1rsqxnv842kamhcf9hylj7ja1hwxni4m29d7pqfwbqsfwf55h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty array async attoparsec base bytestring Cabal
          containers cpphs data-default deepseq direct-sqlite directory
-         exceptions filepath fsnotify ghc ghc-boot ghc-paths haddock-api
-         haddock-library haskell-names haskell-src-exts hdocs hformat hlint
-         http-client lens lifted-base mmorph monad-control monad-loops mtl
-         network network-uri optparse-applicative process regex-pcre-builtin
-         scientific simple-log sqlite-simple stm syb template-haskell text
-         text-region time transformers transformers-base uniplate unix
-         unordered-containers vector
+         exceptions filepath fsnotify ghc ghc-boot ghc-lib-parser ghc-paths
+         haddock-api haddock-library haskell-names haskell-src-exts hdocs
+         hformat hlint http-client lens lifted-base mmorph monad-control
+         monad-loops mtl network network-uri optparse-applicative process
+         regex-pcre-builtin scientific simple-log sqlite-simple stm syb
+         template-haskell text text-region time transformers
+         transformers-base uniplate unix unordered-containers vector
        ];
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring containers deepseq directory
@@ -134996,6 +135424,20 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "hsemail_2_2_1" = callPackage
+    ({ mkDerivation, base, hspec, parsec, time, time-compat }:
+     mkDerivation {
+       pname = "hsemail";
+       version = "2.2.1";
+       sha256 = "108xjspr7apx248gvv7w1hh2pqnb7qg699a8l8f8z64cv6s9ksmm";
+       libraryHaskellDepends = [ base parsec time time-compat ];
+       testHaskellDepends = [ base hspec parsec time ];
+       description = "Parsec parsers for the Internet Message format (e-mail)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "hsemail-ns" = callPackage
     ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }:
      mkDerivation {
@@ -139491,6 +139933,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-rfc7807" = callPackage
+    ({ mkDerivation, aeson, base, call-stack, hspec-expectations-json
+     , http-media, http-types, servant, servant-server, tasty
+     , tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "http-rfc7807";
+       version = "0.1.0.0";
+       sha256 = "1wysqi3rfyg1fb7p9plb6ihcqzvyb2cqhsfx46ciwgym9nxg8lr4";
+       libraryHaskellDepends = [
+         aeson base http-media http-types servant servant-server text
+       ];
+       testHaskellDepends = [
+         aeson base call-stack hspec-expectations-json tasty tasty-hunit
+         text
+       ];
+       description = "RFC7807 style response messages";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "http-server" = callPackage
     ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix
      , url, utf8-string
@@ -139661,10 +140123,8 @@ self: {
      }:
      mkDerivation {
        pname = "http2-client";
-       version = "0.9.0.0";
-       sha256 = "1z46an4sign2ashjsj2y07vkf73i2wzx5x10qsdaf4av5ib8ykxq";
-       revision = "1";
-       editedCabalFile = "00fg9a62qkjwp7rb38j7z7yy6dk3mkh6mgwspd79v2ycmn4mr25q";
+       version = "0.10.0.0";
+       sha256 = "0kv4qa9cbwwj6b62manzpl1sk4jnsb5vx2y73w49drlfkrw1vpgy";
        libraryHaskellDepends = [
          async base bytestring containers deepseq http2 lifted-async
          lifted-base mtl network stm time tls transformers-base
@@ -146616,6 +147076,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "integer-logarithms_1_0_3_1" = callPackage
+    ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
+     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "integer-logarithms";
+       version = "1.0.3.1";
+       sha256 = "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv";
+       libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
+       testHaskellDepends = [
+         base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       description = "Integer logarithms";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "integer-pure" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -147865,6 +148344,8 @@ self: {
        ];
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ip-quoter" = callPackage
@@ -154889,8 +155370,8 @@ self: {
      }:
      mkDerivation {
        pname = "kubernetes-client";
-       version = "0.3.0.0";
-       sha256 = "1wpcamcvyphs2y370qzn5fmc18zyn8nb0099si12n9xgk5zdmcrq";
+       version = "0.3.1.0";
+       sha256 = "1ys3b143wckkgc7wjwfilkvr35j7as775p2d2riqkjpfi88kh301";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring connection
          containers data-default-class either filepath hoauth2 http-client
@@ -154924,8 +155405,8 @@ self: {
      }:
      mkDerivation {
        pname = "kubernetes-client-core";
-       version = "0.3.0.0";
-       sha256 = "0ifn69iqxwxkl4y2qlz5d25fbyqb2pks0cd064j54hc0fjwlxlzk";
+       version = "0.3.1.0";
+       sha256 = "0rb5iyln1grpdg36hf2655sm3chrw4cddbmfhxjpispybr1ypl9c";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          deepseq exceptions http-api-data http-client http-client-tls
@@ -159565,10 +160046,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.3.2.0";
-       sha256 = "134f9ijnd1dw2l9k5m1ay643pc4jqmq5kx17cnijb7ff93442s0n";
-       revision = "2";
-       editedCabalFile = "0xijjp1ysybbd9n3f5vcaph1qdad5v9ynp0jia5aaizr34lwx94z";
+       version = "1.4.0.0";
+       sha256 = "1f5jcprb2l65nyysxgdkhd9vsg1ixn8qfpjgmgvi8cqm0zp28zw7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -159641,22 +160120,28 @@ self: {
      }) {};
 
   "less-arbitrary" = callPackage
-    ({ mkDerivation, base, containers, generic-arbitrary, hashable, mtl
-     , QuickCheck, quickcheck-classes, quickcheck-instances, random
-     , scientific, text, transformers, unordered-containers, vector
+    ({ mkDerivation, base, containers, email-validate
+     , generic-arbitrary, genvalidity, genvalidity-hspec
+     , genvalidity-property, hashable, hspec, mtl, QuickCheck
+     , quickcheck-classes, quickcheck-instances, random, scientific
+     , text, time, transformers, unordered-containers, validity, vector
      }:
      mkDerivation {
        pname = "less-arbitrary";
-       version = "0.1.0.1";
-       sha256 = "1hbiwyk49qqqdfglydywj02ycymdb486nv5cp8710gfwh75i29xw";
+       version = "0.1.0.2";
+       sha256 = "0xqhlk4qqykb173pm6akd7jvygm5ya3qqw3xc649aiq053ralvif";
        libraryHaskellDepends = [
-         base containers generic-arbitrary hashable mtl QuickCheck random
-         scientific text transformers unordered-containers vector
+         base containers email-validate generic-arbitrary genvalidity
+         genvalidity-hspec genvalidity-property hashable hspec mtl
+         QuickCheck random scientific text time transformers
+         unordered-containers validity vector
        ];
        testHaskellDepends = [
-         base containers generic-arbitrary hashable mtl QuickCheck
-         quickcheck-classes quickcheck-instances random scientific text
-         transformers unordered-containers vector
+         base containers email-validate generic-arbitrary genvalidity
+         genvalidity-hspec genvalidity-property hashable hspec mtl
+         QuickCheck quickcheck-classes quickcheck-instances random
+         scientific text time transformers unordered-containers validity
+         vector
        ];
        description = "Linear time testing with variant of Arbitrary class that always terminates";
        license = stdenv.lib.licenses.bsd3;
@@ -164050,6 +164535,19 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "loc_0_1_3_10" = callPackage
+    ({ mkDerivation, base, containers, doctest, hedgehog }:
+     mkDerivation {
+       pname = "loc";
+       version = "0.1.3.10";
+       sha256 = "0vl0pyimcm7jp4lgdmsqgcg9shqfrj60lz4psjkdfdcm3vkdqnkw";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers doctest hedgehog ];
+       description = "Types representing line and column positions and ranges in text files";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "loc-test" = callPackage
     ({ mkDerivation, base, containers, hedgehog, loc }:
      mkDerivation {
@@ -165695,6 +166193,8 @@ self: {
        pname = "lsp";
        version = "1.0.0.0";
        sha256 = "05m9kxcf7g2xb4bhbn08bfbf09b8vvvw3nvpcfldpx180yz3n02r";
+       revision = "1";
+       editedCabalFile = "1pgxvwfn7avkpdl6f3p7rqaivdz438yqkzsz0rp1y0s80mymvz1i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165777,8 +166277,8 @@ self: {
      }:
      mkDerivation {
        pname = "lsp-types";
-       version = "1.0.0.0";
-       sha256 = "1cf07hdzgh5inskabdyli3zg95grc3qlw9d5xiqf1hwlspsyxis9";
+       version = "1.0.0.1";
+       sha256 = "1yrm42qsbqk94ql0khifcpvicy9lbvwwrvnr41lplbb1vhqvqc27";
        libraryHaskellDepends = [
          aeson base binary bytestring containers data-default deepseq
          dependent-sum-template directory filepath hashable hslogger lens
@@ -166481,6 +166981,8 @@ self: {
        ];
        description = "Bindings to LZ4";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lz4-conduit" = callPackage
@@ -167116,6 +167618,32 @@ self: {
        broken = true;
      }) {};
 
+  "macrm" = callPackage
+    ({ mkDerivation, base, bytestring, cmdargs, cond, directory
+     , exceptions, filepath, githash, hspec, inline-c, main-tester
+     , MissingH, process, text, time, unix, uuid
+     }:
+     mkDerivation {
+       pname = "macrm";
+       version = "1.0.0.5";
+       sha256 = "0j1lcg5igypppj7c5plxifyvcl065j0mqhkdyb8nkpgjp95f7r0n";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cmdargs cond directory exceptions githash inline-c MissingH
+         process text time unix
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base bytestring directory filepath hspec main-tester MissingH
+         process unix uuid
+       ];
+       description = "Alternative rm command for macOS that remove files/dirs to the system trash";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "mad-props" = callPackage
     ({ mkDerivation, base, containers, lens, logict, MonadRandom, mtl
      , psqueues, random, random-shuffle, raw-strings-qq, transformers
@@ -168867,6 +169395,30 @@ self: {
        broken = true;
      }) {};
 
+  "massiv_0_5_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, deepseq
+     , doctest, exceptions, mersenne-random-pure64, primitive
+     , QuickCheck, random, scheduler, splitmix, template-haskell
+     , unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "massiv";
+       version = "0.5.5.0";
+       sha256 = "1nlx8lakwnpplmgiiv692jbs03b52wqvclfyvaxcaf8yqdjms3r9";
+       libraryHaskellDepends = [
+         base bytestring data-default-class deepseq exceptions primitive
+         scheduler unliftio-core vector
+       ];
+       testHaskellDepends = [
+         base doctest mersenne-random-pure64 QuickCheck random splitmix
+         template-haskell
+       ];
+       description = "Massiv (Массив) is an Array Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "massiv-io" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color
      , data-default-class, deepseq, doctest, exceptions, filepath, hspec
@@ -168894,7 +169446,7 @@ self: {
        broken = true;
      }) {};
 
-  "massiv-io_0_3_0_1" = callPackage
+  "massiv-io_0_4_0_0" = callPackage
     ({ mkDerivation, base, bytestring, Color, data-default-class
      , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels
      , massiv, massiv-test, netpbm, QuickCheck, random, template-haskell
@@ -168902,8 +169454,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv-io";
-       version = "0.3.0.1";
-       sha256 = "0r0nkgpdkjwsdxcfys3idk1m7q0paz5c3gx1sx7xwsj7c5gyp5gs";
+       version = "0.4.0.0";
+       sha256 = "18q09pz563jp8lmnvmcynmhrk6pmqxr8whlcp6f9kilkzy7hzy9k";
        libraryHaskellDepends = [
          base bytestring Color data-default-class deepseq exceptions
          filepath JuicyPixels massiv netpbm unliftio vector
@@ -170273,6 +170825,8 @@ self: {
        pname = "medea";
        version = "1.2.0";
        sha256 = "019jfz29gz3d06b5yi7fygqa79lp6c6vbzxcb5ka7d8w0zv7w60v";
+       revision = "1";
+       editedCabalFile = "1zkwy3p9q3rd4qcnmgr67xi3fv9frw35rsqpwh5l1mfvv772qap9";
        libraryHaskellDepends = [
          aeson algebraic-graphs base bytestring containers deepseq free
          hashable megaparsec microlens-ghc mtl nonempty-containers
@@ -173576,20 +174130,20 @@ self: {
 
   "miv" = callPackage
     ({ mkDerivation, aeson, async, base, concurrent-output, directory
-     , filepath, ghc-prim, hashable, hspec, monad-parallel, process
-     , SafeSemaphore, text, time, unix-compat, unordered-containers
-     , xdg-basedir, yaml
+     , filepath, filepattern, ghc-prim, hashable, hspec, monad-parallel
+     , process, SafeSemaphore, text, time, unix-compat
+     , unordered-containers, xdg-basedir, yaml
      }:
      mkDerivation {
        pname = "miv";
-       version = "0.4.3";
-       sha256 = "0i2ikjr36qdr2i92bapx2p4lq4jvfmzh12b2nslhqq4xnf2fs2ib";
+       version = "0.4.4";
+       sha256 = "0is2ckkglh9wnhwnvyhhjy7as67mk7bs4az98q32nk3hx0yj9nq8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson async base concurrent-output directory filepath ghc-prim
-         hashable monad-parallel process SafeSemaphore text time unix-compat
-         unordered-containers xdg-basedir yaml
+         aeson async base concurrent-output directory filepath filepattern
+         ghc-prim hashable monad-parallel process SafeSemaphore text time
+         unix-compat unordered-containers xdg-basedir yaml
        ];
        testHaskellDepends = [
          aeson base directory ghc-prim hashable hspec monad-parallel process
@@ -173970,6 +174524,8 @@ self: {
        ];
        description = "Produces a sound recording specified by the Ukrainian text";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mmsyn7l" = callPackage
@@ -176532,8 +177088,8 @@ self: {
        pname = "monoidal-containers";
        version = "0.6.0.1";
        sha256 = "1j5mfs0ysvwk3jsmq4hlj4l3kasfc28lk1b3xaymf9dw48ac5j82";
-       revision = "1";
-       editedCabalFile = "06agyfnhr4cr42m4zj7xwl5an3skbjvba53a5i6sl9890gx7mml3";
+       revision = "2";
+       editedCabalFile = "1b98zf8c2mz7qrp24pyq6wqx5ljlckc7hyk62kiyj23svq7sxpzz";
        libraryHaskellDepends = [
          aeson base containers deepseq hashable lens newtype semialign
          semigroups these unordered-containers
@@ -176885,6 +177441,46 @@ self: {
        license = stdenv.lib.licenses.agpl3Plus;
      }) {};
 
+  "morloc" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , docopt, extra, filepath, haskell-src-meta, megaparsec, mtl
+     , parsec, partial-order, pretty-simple, prettyprinter
+     , prettyprinter-ansi-terminal, process, QuickCheck, raw-strings-qq
+     , safe, scientific, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, unordered-containers
+     , yaml
+     }:
+     mkDerivation {
+       pname = "morloc";
+       version = "0.33.0";
+       sha256 = "089p6hajqlzsgpgmn1s467c4m9d3d0h507vml6vvxlhlph1gda76";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory extra filepath
+         haskell-src-meta megaparsec mtl parsec partial-order pretty-simple
+         prettyprinter prettyprinter-ansi-terminal process raw-strings-qq
+         safe scientific template-haskell text unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory docopt extra filepath
+         haskell-src-meta megaparsec mtl parsec partial-order pretty-simple
+         prettyprinter prettyprinter-ansi-terminal process raw-strings-qq
+         safe scientific template-haskell text unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory extra filepath
+         haskell-src-meta megaparsec mtl parsec partial-order pretty-simple
+         prettyprinter prettyprinter-ansi-terminal process QuickCheck
+         raw-strings-qq safe scientific tasty tasty-golden tasty-hunit
+         tasty-quickcheck template-haskell text unordered-containers yaml
+       ];
+       description = "A multi-lingual, typed, workflow language";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "morph" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , optparse-applicative, postgresql-simple, text, yaml
@@ -176929,26 +177525,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "morpheus-graphql_0_15_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, megaparsec
-     , morpheus-graphql-core, mtl, scientific, tasty, tasty-hunit
-     , template-haskell, text, transformers, unliftio-core
-     , unordered-containers, uuid, vector, websockets
+  "morpheus-graphql_0_16_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers
+     , morpheus-graphql-core, morpheus-graphql-subscriptions, mtl
+     , relude, tasty, tasty-hunit, template-haskell, text, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "morpheus-graphql";
-       version = "0.15.1";
-       sha256 = "1vk1rzrham61pnn5c77rvrn0zb02hc1birxdnyz80sjdap5fk8in";
+       version = "0.16.0";
+       sha256 = "18sayr7avxdavppzj8nh3fli0cdryl4yyrzw8d38qk0p8hw84wgc";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers megaparsec morpheus-graphql-core
-         mtl scientific template-haskell text transformers unliftio-core
-         unordered-containers uuid vector websockets
+         aeson base bytestring containers morpheus-graphql-core mtl relude
+         template-haskell text transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base bytestring containers megaparsec morpheus-graphql-core
-         mtl scientific tasty tasty-hunit template-haskell text transformers
-         unliftio-core unordered-containers uuid vector websockets
+         aeson base bytestring containers morpheus-graphql-core
+         morpheus-graphql-subscriptions mtl relude tasty tasty-hunit
+         template-haskell text transformers unordered-containers vector
        ];
        description = "Morpheus GraphQL";
        license = stdenv.lib.licenses.mit;
@@ -176979,21 +177574,22 @@ self: {
 
   "morpheus-graphql-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory
-     , morpheus-graphql-core, mtl, tasty, tasty-hunit, template-haskell
-     , text, transformers, unordered-containers
+     , morpheus-graphql-core, mtl, relude, tasty, tasty-hunit
+     , template-haskell, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "morpheus-graphql-client";
-       version = "0.15.1";
-       sha256 = "1gmyil518qjn5l30kljrm52fznkib1d1qyxnjhyb535jc9f44zhz";
+       version = "0.16.0";
+       sha256 = "1apm35yy1f1hkqihk4ilzzlg1p4fk13i7zmd7fkcd33aiajzw5mh";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base bytestring morpheus-graphql-core mtl template-haskell
-         text transformers unordered-containers
+         aeson base bytestring morpheus-graphql-core mtl relude
+         template-haskell text transformers unordered-containers
        ];
        testHaskellDepends = [
-         aeson base bytestring directory morpheus-graphql-core mtl tasty
-         tasty-hunit template-haskell text transformers unordered-containers
+         aeson base bytestring directory morpheus-graphql-core mtl relude
+         tasty tasty-hunit template-haskell text transformers
+         unordered-containers
        ];
        description = "Morpheus GraphQL Client";
        license = stdenv.lib.licenses.mit;
@@ -177025,32 +177621,57 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "morpheus-graphql-core_0_15_1" = callPackage
+  "morpheus-graphql-core_0_16_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, hashable
-     , megaparsec, mtl, scientific, tasty, tasty-hunit, template-haskell
-     , text, th-lift-instances, transformers, unordered-containers
-     , vector
+     , megaparsec, mtl, relude, scientific, tasty, tasty-hunit
+     , template-haskell, text, th-lift-instances, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "morpheus-graphql-core";
-       version = "0.15.1";
-       sha256 = "0nakm33ybrj8y3ci0a4697dvz8q38z17vr2mkcbm7h14h06kg8wr";
+       version = "0.16.0";
+       sha256 = "0c5gbqrxgib2irysmvl35j7ccz5fi1aqb3p3fyxkvcw44nnmkl5g";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base bytestring hashable megaparsec mtl scientific
+         aeson base bytestring hashable megaparsec mtl relude scientific
          template-haskell text th-lift-instances transformers
          unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base bytestring directory hashable megaparsec mtl scientific
-         tasty tasty-hunit template-haskell text th-lift-instances
-         transformers unordered-containers vector
+         aeson base bytestring directory hashable megaparsec mtl relude
+         scientific tasty tasty-hunit template-haskell text
+         th-lift-instances transformers unordered-containers vector
        ];
        description = "Morpheus GraphQL Core";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "morpheus-graphql-subscriptions" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory
+     , morpheus-graphql-core, mtl, relude, tasty, tasty-hunit, text
+     , transformers, unliftio-core, unordered-containers, uuid
+     , websockets
+     }:
+     mkDerivation {
+       pname = "morpheus-graphql-subscriptions";
+       version = "0.16.0";
+       sha256 = "1bilw276nlzx9fqcc6g5cmnf4jws17v7djz1m8n184a1skxbd02l";
+       libraryHaskellDepends = [
+         aeson base bytestring morpheus-graphql-core mtl relude text
+         transformers unliftio-core unordered-containers uuid websockets
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory morpheus-graphql-core mtl relude
+         tasty tasty-hunit text transformers unliftio-core
+         unordered-containers uuid websockets
+       ];
+       description = "Morpheus GraphQL Subscriptions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "morphisms" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -180573,8 +181194,8 @@ self: {
      }:
      mkDerivation {
        pname = "mysql-haskell";
-       version = "0.8.4.2";
-       sha256 = "1lg9w9kwjnrx948r24flw0yjwxc8f93ygg45dl2djk4kfxdfnlaz";
+       version = "0.8.4.3";
+       sha256 = "1gjq8spl6s05kcckw78d1wi2k8blr25mbvicd1kwr653lj2d3w74";
        libraryHaskellDepends = [
          base binary binary-ieee754 binary-parsers blaze-textual bytestring
          bytestring-lexing cryptonite io-streams memory monad-loops network
@@ -180612,8 +181233,8 @@ self: {
      }:
      mkDerivation {
        pname = "mysql-haskell-openssl";
-       version = "0.8.3.0";
-       sha256 = "0pm5vd2gpb1x68n2i5brvspngfplp283jlw9a351z2yrnpwmwd24";
+       version = "0.8.3.1";
+       sha256 = "1fq1990423is1zmyd3qa6dxyyj5ackrgsr9i3wvzkw3xys472j2w";
        libraryHaskellDepends = [
          base binary HsOpenSSL mysql-haskell tcp-streams tcp-streams-openssl
          wire-streams
@@ -190452,8 +191073,8 @@ self: {
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "optparse-declarative";
-       version = "0.3.1";
-       sha256 = "1s3bkkn5a8bgkbqdsf5ir18r0j0r2r0agz04q2ccafd26d8xdx2s";
+       version = "0.4.1";
+       sha256 = "0paa7r64y0nb9yv3x387pdid68lnc1gn2m28kcli55dvh1x4wwxr";
        libraryHaskellDepends = [ base mtl ];
        description = "Declarative command line option parser";
        license = stdenv.lib.licenses.mit;
@@ -190582,8 +191203,6 @@ self: {
        ];
        description = "Types and functions for Kepler orbits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orc" = callPackage
@@ -191088,6 +191707,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ormolu_0_1_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dlist, exceptions
+     , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl
+     , optparse-applicative, path, path-io, syb, text
+     }:
+     mkDerivation {
+       pname = "ormolu";
+       version = "0.1.3.1";
+       sha256 = "1qad2s270rhgm2chhrmjd5zsv6bqykba978vn0hakm29mgck2zgw";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers dlist exceptions ghc-lib-parser mtl syb
+         text
+       ];
+       executableHaskellDepends = [
+         base ghc-lib-parser gitrev optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base containers filepath hspec path path-io text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A formatter for Haskell source code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "orthotope" = callPackage
     ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -192091,7 +192738,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_11_0_4" = callPackage
+  "pandoc_2_11_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , case-insensitive, citeproc, commonmark, commonmark-extensions
@@ -192110,8 +192757,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.11.0.4";
-       sha256 = "18nqdhvk0rgrzmbhab9vb05g8w9hvwx0ncf5cqp5ijxycilcskb8";
+       version = "2.11.1";
+       sha256 = "0gvpal4v92x8vscmm5h3jjlx9q03a4qbz0zwcbw24y02xmaz09d8";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -192292,6 +192939,17 @@ self: {
        broken = true;
      }) {};
 
+  "pandoc-dhall-decoder" = callPackage
+    ({ mkDerivation, base, dhall, either, pandoc, text }:
+     mkDerivation {
+       pname = "pandoc-dhall-decoder";
+       version = "0.1.0.1";
+       sha256 = "032fx8fy134hysg10y5c57c7jkvq8lkc0q2r8ylc54qbfmvqd820";
+       libraryHaskellDepends = [ base dhall either pandoc text ];
+       description = "Decodes pandoc to dhall";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pandoc-emphasize-code" = callPackage
     ({ mkDerivation, base, filepath, hashable, lucid, mtl, pandoc-types
      , process, semigroups, tasty, tasty-discover, tasty-hspec
@@ -194932,15 +195590,15 @@ self: {
      }:
      mkDerivation {
        pname = "patch";
-       version = "0.0.3.1";
-       sha256 = "1dkms6ngr01d4gvyjbl6z30b6qz4cnxnh0y7advrc9fib0237gnl";
+       version = "0.0.3.2";
+       sha256 = "1b819d1iramxb0sf0zm4ry8mrd74y35iffbb6qys3a2xq1d382xa";
        libraryHaskellDepends = [
          base constraints-extras containers dependent-map dependent-sum lens
          monoidal-containers semialign semigroupoids these transformers
          witherable
        ];
        testHaskellDepends = [ base directory filemanip filepath hlint ];
-       description = "Infrastructure for writing patches which act on other types";
+       description = "Data structures for describing changes to other data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -197017,6 +197675,34 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent_2_11_0_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , blaze-html, bytestring, conduit, containers, fast-logger, hspec
+     , http-api-data, monad-logger, mtl, path-pieces, resource-pool
+     , resourcet, scientific, silently, text, time, transformers
+     , unliftio, unliftio-core, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "persistent";
+       version = "2.11.0.1";
+       sha256 = "0nmgjk5jpsh7dxwyghvmnislxj8m77sdp9hg6anh7ba94xs7wcjv";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-html bytestring
+         conduit containers fast-logger http-api-data monad-logger mtl
+         path-pieces resource-pool resourcet scientific silently text time
+         transformers unliftio unliftio-core unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-html bytestring
+         containers hspec http-api-data path-pieces scientific text time
+         transformers unordered-containers vector
+       ];
+       description = "Type-safe, multi-backend data serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "persistent-audit" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , getopt-generics, hashable, hspec, mongoDB, persistent
@@ -197229,10 +197915,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mongoDB";
-       version = "2.10.0.1";
-       sha256 = "194cxlxyaxwzgm7a7q8530bh842s5s1vmq33pclldp78nfy1dczm";
-       revision = "1";
-       editedCabalFile = "084gdbb25qn2cw0qz20hksr9ypf401iwwx2kysibi0y4zxvpcy2z";
+       version = "2.11.0.0";
+       sha256 = "19szqr1f028hqhzigvb7sa6r2vm8q9pi5fhvx483ag0agcypmhhb";
        libraryHaskellDepends = [
          aeson base bson bytestring cereal conduit http-api-data mongoDB
          network path-pieces persistent resource-pool resourcet text time
@@ -197276,6 +197960,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "persistent-mysql_2_10_3" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+     , containers, fast-logger, hspec, HUnit, monad-logger, mysql
+     , mysql-simple, persistent, persistent-qq, persistent-template
+     , persistent-test, QuickCheck, quickcheck-instances, resource-pool
+     , resourcet, text, time, transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "persistent-mysql";
+       version = "2.10.3";
+       sha256 = "1da2vbkz55lngpi5ggndnnxv8gm9ckcv3gd3y8z47yh129b04csk";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring conduit containers monad-logger
+         mysql mysql-simple persistent resource-pool resourcet text
+         transformers unliftio-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers fast-logger hspec HUnit monad-logger
+         mysql persistent persistent-qq persistent-template persistent-test
+         QuickCheck quickcheck-instances resourcet text time transformers
+         unliftio-core
+       ];
+       description = "Backend for the persistent library using MySQL database server";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-mysql-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , fast-logger, hspec, HUnit, io-streams, monad-logger
@@ -197375,6 +198086,8 @@ self: {
        pname = "persistent-postgresql";
        version = "2.10.1.2";
        sha256 = "1q7n0h16argvpw2y3f8mxzmvy24q6if46ab9nvybviki283zbvlb";
+       revision = "1";
+       editedCabalFile = "0vzm2d9smg9zvskaz3dv7c90d14pb0as7qpnsnvswhh8vn0862g3";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers monad-logger
          persistent postgresql-libpq postgresql-simple resource-pool
@@ -197391,6 +198104,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "persistent-postgresql_2_11_0_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , conduit, containers, fast-logger, hspec, hspec-expectations
+     , HUnit, monad-logger, mtl, persistent, persistent-qq
+     , persistent-template, persistent-test, postgresql-libpq
+     , postgresql-simple, QuickCheck, quickcheck-instances
+     , resource-pool, resourcet, string-conversions, text, time
+     , transformers, unliftio-core, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "persistent-postgresql";
+       version = "2.11.0.0";
+       sha256 = "12h72dj6zmk8m45m62syc3inwvqgb03whymi7wds0aklzn4j83b4";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder bytestring conduit containers
+         monad-logger mtl persistent postgresql-libpq postgresql-simple
+         resource-pool resourcet string-conversions text time transformers
+         unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers fast-logger hspec
+         hspec-expectations HUnit monad-logger persistent persistent-qq
+         persistent-template persistent-test QuickCheck quickcheck-instances
+         resourcet text time transformers unliftio-core unordered-containers
+         vector
+       ];
+       description = "Backend for the persistent library using postgresql";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-protobuf" = callPackage
     ({ mkDerivation, base, bytestring, persistent, protocol-buffers
      , protocol-buffers-descriptor, template-haskell, text
@@ -197570,6 +198314,8 @@ self: {
        pname = "persistent-sqlite";
        version = "2.10.6.2";
        sha256 = "0l6287ni2ksi8l8kv6gbsyjxhjpcqn6a1gw577ii7fixbyvbpbnf";
+       revision = "1";
+       editedCabalFile = "1kg5cikbw7mpdzwc1f1kfxwjq7q2raqdxsdq5rb65rk87wl3fih5";
        configureFlags = [ "-fsystemlib" ];
        isLibrary = true;
        isExecutable = true;
@@ -197590,6 +198336,39 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {inherit (pkgs) sqlite;};
 
+  "persistent-sqlite_2_11_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, containers
+     , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger
+     , persistent, persistent-template, persistent-test, QuickCheck
+     , resource-pool, resourcet, sqlite, system-fileio, system-filepath
+     , temporary, text, time, transformers, unliftio-core
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "persistent-sqlite";
+       version = "2.11.0.0";
+       sha256 = "1kfijsn00brqm42ypaa66bmwq41r9n6h66r6jmgldhzpcbv46sfv";
+       configureFlags = [ "-fsystemlib" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring conduit containers microlens-th monad-logger
+         persistent resource-pool resourcet text time transformers
+         unliftio-core unordered-containers
+       ];
+       librarySystemDepends = [ sqlite ];
+       testHaskellDepends = [
+         base bytestring containers exceptions fast-logger hspec HUnit
+         monad-logger persistent persistent-template persistent-test
+         QuickCheck resourcet system-fileio system-filepath temporary text
+         time transformers unliftio-core
+       ];
+       description = "Backend for the persistent library using sqlite3";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {inherit (pkgs) sqlite;};
+
   "persistent-template" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, deepseq-generics, file-embed, hspec, http-api-data
@@ -197601,8 +198380,8 @@ self: {
        pname = "persistent-template";
        version = "2.8.2.3";
        sha256 = "1y96aj5i3c1j2ls6980l8lfjj9b3vfmp3766xk5af1870vj1s1lf";
-       revision = "1";
-       editedCabalFile = "0ilgcn3k72b2zm53yy4na4y0f8xfrlw6s5w3xhhavg6blyw971j7";
+       revision = "2";
+       editedCabalFile = "0n0zr4fxzrgdbgl26mikfl9hyn0269isblrr9rj3i045p96a0y5s";
        libraryHaskellDepends = [
          aeson base bytestring containers http-api-data monad-control
          monad-logger path-pieces persistent template-haskell text
@@ -197620,7 +198399,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-template_2_9" = callPackage
+  "persistent-template_2_9_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, deepseq-generics, file-embed, hspec, http-api-data
      , monad-control, monad-logger, path-pieces, persistent, QuickCheck
@@ -197629,8 +198408,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-template";
-       version = "2.9";
-       sha256 = "181ag017wj41pzlc954mcx7s7v1dnqgjnry03hly8zln4iii63yw";
+       version = "2.9.1.0";
+       sha256 = "19ilgz8r6p5wy111rb4v0d6cnrj8jfiv2pnzdynpxd9ay66vgbca";
        libraryHaskellDepends = [
          aeson base bytestring containers http-api-data monad-control
          monad-logger path-pieces persistent template-haskell text
@@ -197694,7 +198473,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "persistent-test_2_0_3_3" = callPackage
+  "persistent-test_2_0_3_5" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit
      , containers, exceptions, hspec, hspec-expectations, HUnit
      , monad-control, monad-logger, mtl, path-pieces, persistent
@@ -197704,8 +198483,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-test";
-       version = "2.0.3.3";
-       sha256 = "0ry6inln7grmcj58k3sfjid24069n4kmph6sikvm352b9ffw6h5x";
+       version = "2.0.3.5";
+       sha256 = "16m3nlmpwxibfhgrfl3xqh3a518bkrd7qaa8hklfq2qwlvjbb31v";
        libraryHaskellDepends = [
          aeson base blaze-html bytestring conduit containers exceptions
          hspec hspec-expectations HUnit monad-control monad-logger mtl
@@ -198345,13 +199124,58 @@ self: {
     ({ mkDerivation, base, subG, vector }:
      mkDerivation {
        pname = "phonetic-languages-common";
-       version = "0.1.0.0";
-       sha256 = "12al80szl9mxapwq6b0kp6bnhnwqxjqzyf72ycxvpx1xlppsfza9";
+       version = "0.1.1.0";
+       sha256 = "08i9g7yaiwryy9ndd0adbl3cskqva71mi45x55knc6r9wdhnprph";
        libraryHaskellDepends = [ base subG vector ];
        description = "A generalization of the uniqueness-periods-vector-common package";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "phonetic-languages-examples" = callPackage
+    ({ mkDerivation, base, parallel, phonetic-languages-common
+     , phonetic-languages-general, phonetic-languages-plus
+     , phonetic-languages-properties, phonetic-languages-ukrainian
+     , phonetic-languages-vector, print-info, subG
+     , ukrainian-phonetics-basic, uniqueness-periods-vector-filters
+     , uniqueness-periods-vector-stats, vector
+     }:
+     mkDerivation {
+       pname = "phonetic-languages-examples";
+       version = "0.1.1.0";
+       sha256 = "1i95kglsif5zd5k7yri69mwh8n3a63cqwh3kvn91qpyxqf8zgdzz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base phonetic-languages-common phonetic-languages-properties
+         phonetic-languages-vector vector
+       ];
+       executableHaskellDepends = [
+         base parallel phonetic-languages-common phonetic-languages-general
+         phonetic-languages-plus phonetic-languages-properties
+         phonetic-languages-ukrainian phonetic-languages-vector print-info
+         subG ukrainian-phonetics-basic uniqueness-periods-vector-filters
+         uniqueness-periods-vector-stats vector
+       ];
+       description = "A generalization of the uniqueness-periods-vector-examples functionality";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "phonetic-languages-general" = callPackage
+    ({ mkDerivation, base, phonetic-languages-common
+     , phonetic-languages-plus, print-info, subG, vector
+     }:
+     mkDerivation {
+       pname = "phonetic-languages-general";
+       version = "0.1.0.0";
+       sha256 = "1vv1n58npgwy1shp7xhm48fdqm9a8kqb3lbqkl0sn7qwkph5x53k";
+       libraryHaskellDepends = [
+         base phonetic-languages-common phonetic-languages-plus print-info
+         subG vector
+       ];
+       description = "A generalization of the uniqueness-periods-vector-general functionality";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "phonetic-languages-plus" = callPackage
     ({ mkDerivation, base, bytestring, lists-flines, parallel
      , uniqueness-periods-vector-stats
@@ -198371,6 +199195,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "phonetic-languages-properties" = callPackage
+    ({ mkDerivation, base, phonetic-languages-common
+     , phonetic-languages-rhythmicity, phonetic-languages-vector
+     , ukrainian-phonetics-basic, vector
+     }:
+     mkDerivation {
+       pname = "phonetic-languages-properties";
+       version = "0.1.1.0";
+       sha256 = "1c312i66rpwxfk34rpzh8ai3m4lbxwj4ayqh1vzbj17mciachaqf";
+       libraryHaskellDepends = [
+         base phonetic-languages-common phonetic-languages-rhythmicity
+         phonetic-languages-vector ukrainian-phonetics-basic vector
+       ];
+       description = "A generalization of the uniqueness-periods-vector-properties package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "phonetic-languages-rhythmicity" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -201601,6 +202442,39 @@ self: {
        broken = true;
      }) {};
 
+  "poke" = callPackage
+    ({ mkDerivation, base, calamity, dhall, di, di-polysemy
+     , generic-lens, hspec, hspec-megaparsec, megaparsec, polysemy
+     , polysemy-plugin, text, text-show, unboxing-vector
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "poke";
+       version = "0.0.0.1";
+       sha256 = "0y63j8pv482f92nmk2x7f8kfkvrqbq9bz2vi9br6hpk4612vas4c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base calamity dhall di di-polysemy generic-lens hspec
+         hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show
+         unboxing-vector unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         base calamity dhall di di-polysemy generic-lens hspec
+         hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show
+         unboxing-vector unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base calamity dhall di di-polysemy generic-lens hspec
+         hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show
+         unboxing-vector unordered-containers vector
+       ];
+       description = "Discord verification bot";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "pokemon-go-protobuf-types" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
      , lens-family, proto-lens, text
@@ -202012,6 +202886,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "polysemy_1_4_0_0" = callPackage
+    ({ mkDerivation, async, base, Cabal, cabal-doctest, containers
+     , criterion, doctest, first-class-families, free, freer-simple
+     , hspec, hspec-discover, inspection-testing, mtl, QuickCheck, stm
+     , syb, template-haskell, th-abstraction, transformers, type-errors
+     , type-errors-pretty, unagi-chan
+     }:
+     mkDerivation {
+       pname = "polysemy";
+       version = "1.4.0.0";
+       sha256 = "1zbfx3l390kqxq45lb1wms72cxckwh3sl7vk52q68d0l7j5cvn8n";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         async base containers first-class-families mtl QuickCheck stm syb
+         template-haskell th-abstraction transformers type-errors
+         type-errors-pretty unagi-chan
+       ];
+       testHaskellDepends = [
+         async base containers doctest first-class-families hspec
+         inspection-testing mtl QuickCheck stm syb template-haskell
+         th-abstraction transformers type-errors type-errors-pretty
+         unagi-chan
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         async base containers criterion first-class-families free
+         freer-simple mtl QuickCheck stm syb template-haskell th-abstraction
+         transformers type-errors type-errors-pretty unagi-chan
+       ];
+       description = "Higher-order, low-boilerplate free monads";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "polysemy-RandomFu" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, polysemy
      , polysemy-plugin, polysemy-zoo, random-fu, random-source, text
@@ -202064,13 +202972,30 @@ self: {
        pname = "polysemy-extra";
        version = "0.1.0.0";
        sha256 = "1y5k935jh6dfs87kdih1ibb61ljkp39wyrkg1n2zss020cdhbi7g";
+       revision = "1";
+       editedCabalFile = "0nh9laqwr40dhkh0806v748zqg61agmv3ih4fyidzr9h30lcl0q8";
        libraryHaskellDepends = [ base containers polysemy polysemy-zoo ];
-       description = "Run a KVStore as a filesystem in polysemy";
+       description = "Extra transformations functions for polysemy";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
 
+  "polysemy-fs" = callPackage
+    ({ mkDerivation, base, bytestring, path, polysemy, rio, temporary
+     , text, unliftio-path
+     }:
+     mkDerivation {
+       pname = "polysemy-fs";
+       version = "0.1.0.0";
+       sha256 = "16lf6a5ypf5injdl8aljrnrdrfz21b0rhcmypx5ngvw1k2mgh6zl";
+       libraryHaskellDepends = [
+         base bytestring path polysemy rio temporary text unliftio-path
+       ];
+       description = "Low level filesystem operations for polysemy";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "polysemy-fskvstore" = callPackage
     ({ mkDerivation, base, bytestring, path, polysemy, polysemy-zoo
      , rio, unliftio-path
@@ -202141,13 +203066,15 @@ self: {
      }) {};
 
   "polysemy-methodology" = callPackage
-    ({ mkDerivation, base, polysemy, polysemy-plugin, polysemy-zoo }:
+    ({ mkDerivation, base, co-log-polysemy, polysemy, polysemy-plugin
+     , polysemy-zoo
+     }:
      mkDerivation {
        pname = "polysemy-methodology";
-       version = "0.1.2.1";
-       sha256 = "0is4jnmfn2gx78ijxwvhm8qwk2gqz31hh9pg5r8y43hyx7im40ay";
+       version = "0.1.5.0";
+       sha256 = "1gi2rjf1vgcamjyqqi4wnasv9i5yaazlh14hbjspvsyv8h2zyl4i";
        libraryHaskellDepends = [
-         base polysemy polysemy-plugin polysemy-zoo
+         base co-log-polysemy polysemy polysemy-plugin polysemy-zoo
        ];
        description = "Domain modelling algebra for polysemy";
        license = stdenv.lib.licenses.mit;
@@ -202168,6 +203095,23 @@ self: {
        broken = true;
      }) {};
 
+  "polysemy-path" = callPackage
+    ({ mkDerivation, base, path, polysemy, polysemy-plugin
+     , polysemy-zoo
+     }:
+     mkDerivation {
+       pname = "polysemy-path";
+       version = "0.0.1.0";
+       sha256 = "12iw6qq1pigvvb0bnbkxz7gdmr4z609vqdsn5sxzh5va02dn1r57";
+       libraryHaskellDepends = [
+         base path polysemy polysemy-plugin polysemy-zoo
+       ];
+       description = "Polysemy versions of Path functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "polysemy-plugin" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
      , ghc, ghc-tcplugins-extra, hspec, hspec-discover
@@ -202176,8 +203120,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-plugin";
-       version = "0.2.5.1";
-       sha256 = "14iz5p5g57ki9lbjyy8i3lx7xk2qmrc8dqkd94jrbilsvn4m5gf3";
+       version = "0.2.5.2";
+       sha256 = "13qfbgwn187vgdqs2rkl5lhcfbaw992qnlpz90pr9nw64k2ylcmp";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base containers ghc ghc-tcplugins-extra polysemy syb transformers
@@ -202268,8 +203212,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-video";
-       version = "0.1.1.0";
-       sha256 = "1f8fzhxjg3cpqb8sdrdl8mx9dwas5l32aw98s5m2p4xv1amnjl39";
+       version = "0.1.2.0";
+       sha256 = "1q6acrcxin32ykhzrmd562xb45d972c37sqydh9mz1xp49764fy9";
        libraryHaskellDepends = [
          base formatting path path-utils polysemy text turtle
        ];
@@ -203101,6 +204045,8 @@ self: {
        ];
        description = "posix bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) systemd;};
 
   "posix-error-codes" = callPackage
@@ -203547,6 +204493,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
 
+  "postgresql-libpq_0_9_4_3" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
+     mkDerivation {
+       pname = "postgresql-libpq";
+       version = "0.9.4.3";
+       sha256 = "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       librarySystemDepends = [ postgresql ];
+       testHaskellDepends = [ base bytestring ];
+       description = "low-level binding to libpq";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) postgresql;};
+
   "postgresql-libpq-notify" = callPackage
     ({ mkDerivation, async, base, hspec, postgres-options
      , postgresql-libpq, stm, text, tmp-postgres
@@ -204904,28 +205865,26 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
      , comonad, constraints, containers, deepseq, directory, doctest
      , hashable, lens, lens-action, pcre-heavy, pcre-light
-     , pretty-terminal, QuickCheck, random, safe, stm
-     , string-conversions, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, th-lift, these, time
+     , pretty-terminal, QuickCheck, safe, stm, string-conversions, tasty
+     , tasty-hunit, tasty-quickcheck, template-haskell, text, th-lift
+     , th-lift-instances, these, time
      }:
      mkDerivation {
        pname = "predicate-typed";
-       version = "0.7.4.0";
-       sha256 = "04vxyw4bgzbkk56dw7p8b4x12m4wymxwh83537hvphdv9qj71ph9";
-       revision = "1";
-       editedCabalFile = "064zfd03nw1bd0p8vwymk0kscbpvxrgzbwmqys3ys1rqzjpnfdrp";
+       version = "0.7.4.2";
+       sha256 = "0n1r8ysjyc61pr107y5kkarc30crjzps865kx9k25kjcmk5ynlgz";
        libraryHaskellDepends = [
          aeson aeson-pretty base binary bytestring comonad constraints
          containers deepseq directory hashable lens lens-action pcre-heavy
-         pcre-light pretty-terminal QuickCheck random safe
-         string-conversions template-haskell text th-lift these time
+         pcre-light pretty-terminal QuickCheck safe string-conversions
+         template-haskell text th-lift th-lift-instances these time
        ];
        testHaskellDepends = [
          aeson aeson-pretty base binary bytestring comonad constraints
          containers deepseq directory doctest hashable lens lens-action
-         pcre-heavy pcre-light pretty-terminal QuickCheck random safe stm
+         pcre-heavy pcre-light pretty-terminal QuickCheck safe stm
          string-conversions tasty tasty-hunit tasty-quickcheck
-         template-haskell text th-lift these time
+         template-haskell text th-lift th-lift-instances these time
        ];
        description = "Predicates, Refinement types and Dsl";
        license = stdenv.lib.licenses.bsd3;
@@ -206150,6 +207109,8 @@ self: {
        testHaskellDepends = [ base primitive primitive-unlifted ];
        description = "Wrappers for primops around atomic operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-checked" = callPackage
@@ -206186,6 +207147,8 @@ self: {
        ];
        description = "containers backed by arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-convenience" = callPackage
@@ -206219,6 +207182,8 @@ self: {
        ];
        description = "Extras for the \"primitive\" library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-foreign" = callPackage
@@ -206311,6 +207276,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ];
        description = "Sort primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-stablename" = callPackage
@@ -206339,15 +207306,24 @@ self: {
      }) {};
 
   "primitive-unlifted" = callPackage
-    ({ mkDerivation, base, bytestring, primitive, stm, text-short }:
+    ({ mkDerivation, array, base, bytestring, primitive, QuickCheck
+     , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short
+     }:
      mkDerivation {
        pname = "primitive-unlifted";
-       version = "0.1.3.0";
-       sha256 = "1q7scarsdv51x74g6ahvc5znk9h628s984a7bawig0lnx67wzwih";
-       libraryHaskellDepends = [ base bytestring primitive text-short ];
-       testHaskellDepends = [ base primitive stm ];
+       version = "1.0.0.0";
+       sha256 = "07b53730nxzqyhac71xxijg598304ppb7wa8lfhw1glicj9h0wad";
+       libraryHaskellDepends = [
+         array base bytestring primitive text-short
+       ];
+       testHaskellDepends = [
+         base primitive QuickCheck quickcheck-classes-base stm tasty
+         tasty-quickcheck
+       ];
        description = "Primitive GHC types with unlifted types inside";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primula-board" = callPackage
@@ -207595,16 +208571,16 @@ self: {
      }) {};
 
   "prolude" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, mongoDB
-     , safe-exceptions, scientific, text, time, vector
+    ({ mkDerivation, aeson, base, bytestring, cassava, containers
+     , mongoDB, safe-exceptions, scientific, text, time, vector
      }:
      mkDerivation {
        pname = "prolude";
-       version = "0.0.0.4";
-       sha256 = "147kn423jxc4rcb4vbsj7av8pxdz8lgcgblbmrvq821h26vgc1ai";
+       version = "0.0.0.6";
+       sha256 = "1f3apqs82lv7fq69mjqycs8ynj3hhprg1rrclvs3yix2lc3465vf";
        libraryHaskellDepends = [
-         aeson base bytestring containers mongoDB safe-exceptions scientific
-         text time vector
+         aeson base bytestring cassava containers mongoDB safe-exceptions
+         scientific text time vector
        ];
        description = "ITProTV's custom prelude";
        license = stdenv.lib.licenses.mit;
@@ -208421,8 +209397,8 @@ self: {
      }:
      mkDerivation {
        pname = "protocol-buffers";
-       version = "2.4.13";
-       sha256 = "0xwfb2bkh4nd34s24q786ph4zyrnnl3bcry2kqx3sw20yk3zfdsc";
+       version = "2.4.17";
+       sha256 = "027y1xfk93119d6xfzj0a9n77bdqzkxfp05hz9bn0hyf33lb4jzb";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          directory filepath mtl parsec syb text utf8-string vector
@@ -208437,8 +209413,10 @@ self: {
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
-       version = "2.4.13";
-       sha256 = "1c3aiysjlk7r02l5902iq020iasiswk9c1mvf4f9h1yijba4x4fp";
+       version = "2.4.17";
+       sha256 = "1dir8v79hzc8smlf405a8m3y5jhjqiphj2jm6rbshd1vg6l3vjia";
+       revision = "1";
+       editedCabalFile = "0zin8qqvb1hg5kq2s17rkik55pjnws556xflg76x1xrqkyivhqlg";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers
@@ -211229,7 +212207,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-instances_0_3_24" = callPackage
+  "quickcheck-instances_0_3_25" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive
      , containers, data-fix, hashable, integer-logarithms, old-time
      , QuickCheck, scientific, splitmix, strict, tagged, text, these
@@ -211238,8 +212216,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-instances";
-       version = "0.3.24";
-       sha256 = "0jvb3d43hc1sa8aal1gjpwmrh65mswi72yssb98bj5hca4z8grk5";
+       version = "0.3.25";
+       sha256 = "08lp5fwmhj1ld9zmhxv6aiqc7668nlkz0ckykgp57bv0i6sh4n7q";
        libraryHaskellDepends = [
          array base bytestring case-insensitive containers data-fix hashable
          integer-logarithms old-time QuickCheck scientific splitmix strict
@@ -215367,8 +216345,8 @@ self: {
     ({ mkDerivation, base, composition-prelude }:
      mkDerivation {
        pname = "recursion";
-       version = "2.2.4.2";
-       sha256 = "15ahlgm0dilapk0y5jhwdvrims7nyzdsbdccq4x9jj0ddsszqr02";
+       version = "2.2.4.3";
+       sha256 = "0k5as7i7xyas6qhpr7wpnnf0rc93nsh4s9gsxdsk72xkwd86chkj";
        libraryHaskellDepends = [ base composition-prelude ];
        description = "A recursion schemes library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -215590,8 +216568,8 @@ self: {
      }:
      mkDerivation {
        pname = "redis-io";
-       version = "1.0.0";
-       sha256 = "119qga77xv0kq6cppgz6ry3f1ql4slswqwqg7qyiyg639sli9nfp";
+       version = "1.1.0";
+       sha256 = "0q2gr8sbxxpfx2qn9qmyxiwjj4nx32zmx4lv7g2vfmkj329crrdd";
        libraryHaskellDepends = [
          attoparsec auto-update base bytestring containers exceptions
          iproute monad-control mtl network operational redis-resp
@@ -216065,7 +217043,7 @@ self: {
      , constraints-extras, containers, criterion, data-default, deepseq
      , dependent-map, dependent-sum, directory, exception-transformers
      , filemanip, filepath, haskell-src-exts, haskell-src-meta, hlint
-     , hspec, lens, loch-th, MemoTrie, monad-control
+     , hspec, lens, loch-th, MemoTrie, mmorph, monad-control
      , monoidal-containers, mtl, patch, prim-uniq, primitive, process
      , proctest, profunctors, random, ref-tf, reflection, semialign
      , semigroupoids, split, stm, syb, template-haskell, text, these
@@ -216073,15 +217051,16 @@ self: {
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.7.1.0";
-       sha256 = "0qxxhgkh3cv3fzxd9pgy78kxhi9b4q72jcq4n002h9qh8i6wwp7a";
+       version = "0.8.0.0";
+       sha256 = "14pw033ljs6x5bi5657cm5lpwwj6gkfgskbv5lpdi2hp7svzayql";
        libraryHaskellDepends = [
          base bifunctors comonad constraints-extras containers data-default
          dependent-map dependent-sum exception-transformers haskell-src-exts
-         haskell-src-meta lens MemoTrie monad-control monoidal-containers
-         mtl patch prim-uniq primitive profunctors random ref-tf reflection
-         semialign semigroupoids stm syb template-haskell these time
-         transformers unbounded-delays witherable
+         haskell-src-meta lens MemoTrie mmorph monad-control
+         monoidal-containers mtl patch prim-uniq primitive profunctors
+         random ref-tf reflection semialign semigroupoids stm syb
+         template-haskell these time transformers unbounded-delays
+         witherable
        ];
        testHaskellDepends = [
          base bifunctors constraints constraints-extras containers deepseq
@@ -216192,8 +217171,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-dom";
-       version = "0.6.0.0";
-       sha256 = "1iimsk89akb7v2i1k1gaa6a6bhdyf2rsggac9k1xizxkylara5k4";
+       version = "0.6.1.0";
+       sha256 = "190g56y16xvj508qdp3znlbbv4gb3ska38jbjpblvq8cz2d4nkdc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -216256,8 +217235,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-dom-core";
-       version = "0.6.0.0";
-       sha256 = "0819858z5p6847ac1rb1hsfr5ikn7x5xii8vgqbih4fg39mqfy14";
+       version = "0.6.1.0";
+       sha256 = "072bkjjmz6mjw42gchlbswhjhr9xs0vaybf6mvdycs618lb1zhf0";
        libraryHaskellDepends = [
          aeson base bifunctors bimap blaze-builder bytestring
          case-insensitive constraints containers contravariant data-default
@@ -216342,8 +217321,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-dom-retractable";
-       version = "0.1.3.0";
-       sha256 = "0l2nz78cjx0p03h0h9pflhfd59p2j4drsglsm9yxys0zglbxnqwl";
+       version = "0.1.6.0";
+       sha256 = "0xmxbyf72jnlyyr1iqgms43has4z3qv7ini5jrn1xkyhjmdanrcw";
        libraryHaskellDepends = [
          base containers jsaddle mtl ref-tf reflex reflex-dom
        ];
@@ -216400,27 +217379,53 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-fsnotify";
-       version = "0.2.1.1";
-       sha256 = "0r7fv01dgg5l45yspgj3n2gh6yq0qkjv19hj9vq6284x04vldnqj";
+       version = "0.2.1.2";
+       sha256 = "1g5zm12ypqr0agrgmbyglhh5f9p933hba2dismbyywsgdmn1i9bl";
        libraryHaskellDepends = [
          base containers directory filepath fsnotify reflex
        ];
-       description = "reflex-frp interface for watching files";
+       description = "Reflex FRP interface for watching files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "reflex-gadt-api" = callPackage
+    ({ mkDerivation, aeson, aeson-gadt-th, base, bytestring
+     , constraints, constraints-extras, containers, data-default
+     , dependent-sum, jsaddle, reflex, reflex-dom-core, text, time
+     }:
+     mkDerivation {
+       pname = "reflex-gadt-api";
+       version = "0.2.0.1";
+       sha256 = "0lyzabjyx1fyxrkxpmzhwhkpph9358hw7bpnmsppvwsdaq3m1yqq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-gadt-th base bytestring constraints constraints-extras
+         containers data-default dependent-sum jsaddle reflex
+         reflex-dom-core text time
+       ];
+       executableHaskellDepends = [
+         aeson aeson-gadt-th base constraints-extras reflex-dom-core text
+         time
+       ];
+       description = "Interact with a GADT API in your reflex-dom application";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
 
   "reflex-ghci" = callPackage
-    ({ mkDerivation, base, bytestring, dependent-sum, directory
-     , filepath, fsnotify, mtl, optparse-applicative, primitive, process
-     , ref-tf, reflex, reflex-fsnotify, reflex-process, reflex-vty
-     , regex-tdfa, temporary, text, unix, vty
+    ({ mkDerivation, base, bytestring, directory, filepath, fsnotify
+     , optparse-applicative, process, reflex, reflex-fsnotify
+     , reflex-process, reflex-vty, regex-tdfa, temporary, text, unix
+     , vty
      }:
      mkDerivation {
        pname = "reflex-ghci";
-       version = "0.1.4.1";
-       sha256 = "0505glpxc6yf7nwkgz9l2m8diqm39sal7vg9h1g8f8i3x6ab1rw3";
+       version = "0.1.5.1";
+       sha256 = "1m4sphj2qhj9ckjxjy6m4yzb2d6lq68a0fynv5q9ibc6550bm1sx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -216432,8 +217437,7 @@ self: {
          text vty
        ];
        testHaskellDepends = [
-         base bytestring dependent-sum directory mtl primitive process
-         ref-tf reflex reflex-process reflex-vty temporary text
+         base directory process reflex reflex-process temporary
        ];
        description = "A GHCi widget library for use in reflex applications";
        license = stdenv.lib.licenses.bsd3;
@@ -216547,8 +217551,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-process";
-       version = "0.3.0.0";
-       sha256 = "1hfzp0hnqhpdcri6qqqbndl3nlf028hn78kmdc6h1mzwx5va7rh5";
+       version = "0.3.1.0";
+       sha256 = "1z86h7wkzg69d6kw0y37pzr4ldpg9qkl8wx5mw7r1h82isb9wgbl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -216561,7 +217565,7 @@ self: {
          async base bytestring containers dependent-sum hspec mtl primitive
          process ref-tf reflex unix
        ];
-       description = "reflex-frp interface for running shell commands";
+       description = "Reflex FRP interface for running system processes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -216635,8 +217639,10 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-vty";
-       version = "0.1.4.0";
-       sha256 = "0z4yca6hh5rwgybsf6ssklhvpl34ikvi9j6wq99df5y0hpy9185f";
+       version = "0.1.4.1";
+       sha256 = "0hv2h1pzz808bg2bvignb3d2wma1aw96zdf545f9p01vjr1b656a";
+       revision = "1";
+       editedCabalFile = "0gpfbpzcg516kghsgwc4gnbp217p6phw9bh1qhlkzd0ji35gdibm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -216647,7 +217653,7 @@ self: {
        executableHaskellDepends = [
          base containers reflex text time transformers vty
        ];
-       description = "Reflex FRP host and widgets for vty applications";
+       description = "Reflex FRP host and widgets for VTY applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -217696,6 +218702,35 @@ self: {
        broken = true;
      }) {};
 
+  "registry_0_2_0_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph
+     , MonadRandom, mtl, multimap, protolude, random, resourcet
+     , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog
+     , tasty-th, template-haskell, text, transformers-base, universum
+     }:
+     mkDerivation {
+       pname = "registry";
+       version = "0.2.0.1";
+       sha256 = "0vpgjxm5mx11vnfhnvlzlawaqwa0a99iyimpd333ibz0psw10wka";
+       libraryHaskellDepends = [
+         base containers exceptions hashable mmorph mtl protolude resourcet
+         semigroupoids semigroups template-haskell text transformers-base
+       ];
+       testHaskellDepends = [
+         async base bytestring containers directory exceptions generic-lens
+         hashable hedgehog io-memoize mmorph MonadRandom mtl multimap
+         protolude random resourcet semigroupoids semigroups tasty
+         tasty-discover tasty-hedgehog tasty-th template-haskell text
+         transformers-base universum
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "data structure for assembling components";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "registry-hedgehog" = callPackage
     ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph
      , multimap, protolude, registry, tasty, tasty-discover
@@ -223195,6 +224230,8 @@ self: {
        libraryHaskellDepends = [ base primitive primitive-unlifted ];
        description = "runST without boxing penalty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rungekutta" = callPackage
@@ -225347,6 +226384,28 @@ self: {
        broken = true;
      }) {};
 
+  "scheduler_1_5_0" = callPackage
+    ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions
+     , genvalidity-hspec, hspec, mwc-random, primitive, pvar, QuickCheck
+     , template-haskell, unliftio, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "scheduler";
+       version = "1.5.0";
+       sha256 = "19sgc3ydbjjlgd6jh9pqfxv3gq1mbgaicshf7kbj5yf5cnimq5vp";
+       libraryHaskellDepends = [
+         atomic-primops base deepseq exceptions primitive pvar unliftio-core
+       ];
+       testHaskellDepends = [
+         base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck
+         template-haskell unliftio vector
+       ];
+       description = "Work stealing scheduler";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "schedyield" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -226520,6 +227579,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
+  "sdl2_2_5_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, exceptions, linear
+     , SDL2, StateVar, text, transformers, vector, weigh
+     }:
+     mkDerivation {
+       pname = "sdl2";
+       version = "2.5.3.0";
+       sha256 = "08l24cb92spnx3bn26bj0z2cszpsawhaa9vvhblvsr3d6z76065q";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring exceptions linear StateVar text transformers vector
+       ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 ];
+       testHaskellDepends = [ base deepseq linear vector weigh ];
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.6+).";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2;};
+
   "sdl2-cairo" = callPackage
     ({ mkDerivation, base, cairo, linear, sdl2 }:
      mkDerivation {
@@ -227733,6 +228814,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "semver_0_4_0_1" = callPackage
+    ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable
+     , tasty, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "semver";
+       version = "0.4.0.1";
+       sha256 = "0hgn3wd1wv3y1723kvd9clj72z65f6m28yf75mxl1zjfd0kf6ivw";
+       revision = "1";
+       editedCabalFile = "13c692s2fbn6xygw70aglj84a8hq549gcj1p40g11j77w68p9xx4";
+       libraryHaskellDepends = [ attoparsec base deepseq hashable text ];
+       testHaskellDepends = [ base tasty tasty-hunit text ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Representation, manipulation, and de/serialisation of Semantic Versions";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "semver-range" = callPackage
     ({ mkDerivation, base, classy-prelude, hspec, parsec, QuickCheck
      , text, unordered-containers
@@ -228524,22 +229623,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant_0_18" = callPackage
+  "servant_0_18_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors
      , bytestring, case-insensitive, deepseq, hspec, hspec-discover
      , http-api-data, http-media, http-types, mmorph, mtl, network-uri
-     , QuickCheck, quickcheck-instances, singleton-bool
+     , QuickCheck, quickcheck-instances, singleton-bool, sop-core
      , string-conversions, tagged, text, transformers, vault
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.18";
-       sha256 = "1dcb92q8w2fim087plspf1hs2gq2hdfiaggp71jqbljhnznlf5vj";
+       version = "0.18.1";
+       sha256 = "15brknvia5kd1fiyxlqghhhnajwrgai9yspkg5nd0v2k1g9dllky";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bifunctors bytestring
          case-insensitive deepseq http-api-data http-media http-types mmorph
-         mtl network-uri QuickCheck singleton-bool string-conversions tagged
-         text transformers vault
+         mtl network-uri QuickCheck singleton-bool sop-core
+         string-conversions tagged text transformers vault
        ];
        testHaskellDepends = [
          aeson base base-compat bytestring hspec http-media mtl QuickCheck
@@ -229026,6 +230125,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-blaze_0_9_1" = callPackage
+    ({ mkDerivation, base, blaze-html, http-media, servant
+     , servant-server, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-blaze";
+       version = "0.9.1";
+       sha256 = "08fvy904mz5xjqda702kq4ch25m3nda1yhpp4g7i62j0jmxs2ji6";
+       libraryHaskellDepends = [ base blaze-html http-media servant ];
+       testHaskellDepends = [ base blaze-html servant-server wai warp ];
+       description = "Blaze-html support for servant";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-cassava" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, cassava, http-media
      , servant, servant-server, vector, wai, warp
@@ -229149,19 +230263,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-client_0_18" = callPackage
+  "servant-client_0_18_1" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, containers
      , deepseq, entropy, exceptions, hspec, hspec-discover
      , http-api-data, http-client, http-media, http-types, HUnit
      , kan-extensions, markdown-unlit, monad-control, mtl, network
      , QuickCheck, semigroupoids, servant, servant-client-core
-     , servant-server, stm, tdigest, text, time, transformers
+     , servant-server, sop-core, stm, tdigest, text, time, transformers
      , transformers-base, transformers-compat, wai, warp
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.18";
-       sha256 = "17m0cakf4apdrpq7wic9mbxcn2hd9cwh9xrcbxshabfffgkq791i";
+       version = "0.18.1";
+       sha256 = "0pv9xj5a6caqxsnlnv4ijzavgmsgi0n3zri4h84mrjki2h2z1837";
+       revision = "1";
+       editedCabalFile = "1d2f8l2zs2gy880g3i9l3jwjrxygb705qz1f81ral7ik56465m83";
        libraryHaskellDepends = [
          base base-compat bytestring containers deepseq exceptions
          http-client http-media http-types kan-extensions monad-control mtl
@@ -229171,8 +230287,8 @@ self: {
        testHaskellDepends = [
          aeson base base-compat bytestring entropy hspec http-api-data
          http-client http-types HUnit kan-extensions markdown-unlit mtl
-         network QuickCheck servant servant-client-core servant-server stm
-         tdigest text transformers transformers-compat wai warp
+         network QuickCheck servant servant-client-core servant-server
+         sop-core stm tdigest text transformers transformers-compat wai warp
        ];
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
@@ -229203,20 +230319,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-client-core_0_18" = callPackage
+  "servant-client-core_0_18_1" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , bytestring, containers, deepseq, exceptions, free, hspec
      , hspec-discover, http-media, http-types, network-uri, QuickCheck
-     , safe, servant, template-haskell, text, transformers
+     , safe, servant, sop-core, template-haskell, text, transformers
      }:
      mkDerivation {
        pname = "servant-client-core";
-       version = "0.18";
-       sha256 = "198kixjiy34z05vavs18wb2kp62pk5bzr5cl7dvhkl73alvj3rhn";
+       version = "0.18.1";
+       sha256 = "1pp4r8l1130ph680kcw7zpk1p76z88ip21cf4dghckmj0lflyw9h";
+       revision = "1";
+       editedCabalFile = "04lk4zwx5g652krn561fd02wbrsg9jrj93hw7gv6z2xay8dr05m1";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring containers
          deepseq exceptions free http-media http-types network-uri safe
-         servant template-haskell text transformers
+         servant sop-core template-haskell text transformers
        ];
        testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
@@ -229401,7 +230519,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-docs_0_11_6" = callPackage
+  "servant-docs_0_11_7" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, hashable, http-media, http-types, lens, servant
      , string-conversions, tasty, tasty-golden, tasty-hunit, text
@@ -229409,8 +230527,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.11.6";
-       sha256 = "07qabs5xi6dw8anmrnl2135fps901k4y1s2xywgdxhqyg01rljhq";
+       version = "0.11.7";
+       sha256 = "01m8ixxs310mcmnd1c5na2ycbnc9xwizdnzzcjdbli5r1mngpgc8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -229831,8 +230949,10 @@ self: {
      }:
      mkDerivation {
        pname = "servant-http-streams";
-       version = "0.18";
-       sha256 = "1krpmmzjc1vagcy8rdgcl3zm8zlfjf8ikicaqrqp6d95f8bz4kaz";
+       version = "0.18.1";
+       sha256 = "05ji6zg6v8cysfbh0850cmwrian0n2clvqn3b348cz3qms0ijrpg";
+       revision = "1";
+       editedCabalFile = "0xpscs5y480n19n3i4sn7xmb6kra7cyjxq64ic18cpqijv1jwlm1";
        libraryHaskellDepends = [
          base base-compat bytestring case-insensitive containers deepseq
          exceptions http-common http-media http-streams http-types
@@ -230170,8 +231290,10 @@ self: {
      }:
      mkDerivation {
        pname = "servant-multipart";
-       version = "0.11.6";
-       sha256 = "0yzr5hv2ki9ig4g6735bjnzv6mkpgj5l68g9hlvp9g9i0ryxqahn";
+       version = "0.12";
+       sha256 = "1hs1h66zjhknfnz1bdi5c0d2sfb20fc7x9adbc87gq168k8riqvl";
+       revision = "1";
+       editedCabalFile = "0pc254b458v4k5xw729fvw3q3klwpkai2mmp455dw2i7g02dv0da";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -230256,8 +231378,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-openapi3";
-       version = "2.0.0.1";
-       sha256 = "14vxvvnzjk7w7lzivmjh5ib7byqqywrhr72rx0nafzq2vsw1wzng";
+       version = "2.0.1.0";
+       sha256 = "14mfa7l3rqjmqp89x9gny5sy3c1w41czkyx7qp1d8dz1y4qi4ipf";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson aeson-pretty base base-compat bytestring hspec http-media
@@ -230785,26 +231907,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-server_0_18" = callPackage
+  "servant-server_0_18_1" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , bytestring, containers, directory, exceptions, filepath, hspec
      , hspec-discover, hspec-wai, http-api-data, http-media, http-types
      , monad-control, mtl, network, network-uri, QuickCheck, resourcet
-     , safe, servant, should-not-typecheck, string-conversions, tagged
-     , temporary, text, transformers, transformers-base
+     , safe, servant, should-not-typecheck, sop-core, string-conversions
+     , tagged, temporary, text, transformers, transformers-base
      , transformers-compat, wai, wai-app-static, wai-extra, warp, word8
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.18";
-       sha256 = "0knbzr6ls9p2wjn3kfggy99gxavl817xw48m53plhf2r4s4vjrw8";
+       version = "0.18.1";
+       sha256 = "1azyaprki2mxqxb67h792qrjzxy8cy9m9f7zxg22g60l3j197df5";
+       revision = "1";
+       editedCabalFile = "1z136vqfbxliq141y4i6m9d3bif4k0ay34xximlnnfxjazx4r0ph";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base base-compat base64-bytestring bytestring containers exceptions
          filepath http-api-data http-media http-types monad-control mtl
-         network network-uri resourcet servant string-conversions tagged
-         text transformers transformers-base wai wai-app-static word8
+         network network-uri resourcet servant sop-core string-conversions
+         tagged text transformers transformers-base wai wai-app-static word8
        ];
        executableHaskellDepends = [
          aeson base base-compat servant text wai warp
@@ -231160,6 +232284,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-swagger-ui_0_3_4_3_36_1" = callPackage
+    ({ mkDerivation, base, bytestring, file-embed-lzma, servant
+     , servant-server, servant-swagger-ui-core, swagger2, text
+     }:
+     mkDerivation {
+       pname = "servant-swagger-ui";
+       version = "0.3.4.3.36.1";
+       sha256 = "0j66ci53mlv1v57xg0hx6sm876i7yj99v573zizgb497c747dy8n";
+       libraryHaskellDepends = [
+         base bytestring file-embed-lzma servant servant-server
+         servant-swagger-ui-core swagger2 text
+       ];
+       description = "Servant swagger ui";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-swagger-ui-core" = callPackage
     ({ mkDerivation, base, blaze-markup, bytestring, http-media
      , servant, servant-blaze, servant-server, swagger2, text
@@ -231169,8 +232310,8 @@ self: {
        pname = "servant-swagger-ui-core";
        version = "0.3.3";
        sha256 = "0gpdjnclbjjr6gwc0gyx1d4w06cjf6z5b2ngjfcgbn885wqllwh3";
-       revision = "3";
-       editedCabalFile = "0yx3q7y533v61ca4bm4wi8h7chbghj2rz92b330a544w7ac8il0p";
+       revision = "4";
+       editedCabalFile = "1kj72caf8skcl25bfw4nh7kj7hh33wd55sggsd474di57wi9j2c4";
        libraryHaskellDepends = [
          base blaze-markup bytestring http-media servant servant-blaze
          servant-server swagger2 text transformers transformers-compat
@@ -231188,8 +232329,8 @@ self: {
        pname = "servant-swagger-ui-jensoleg";
        version = "0.3.3";
        sha256 = "02zwymqxq54xwc8wmzhbcfgx9plvk0n4kp1907sbl98mhh2frwrw";
-       revision = "3";
-       editedCabalFile = "08fwi8zq3clski4bac2p2ahqf4475xwzba31jw4f4lcr01rickqk";
+       revision = "4";
+       editedCabalFile = "19h7n1g847ly7addv03vzy5915n48xa0y7l88dzamy6ly1jrmdg2";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -231206,8 +232347,8 @@ self: {
        pname = "servant-swagger-ui-redoc";
        version = "0.3.3.1.22.3";
        sha256 = "0bzkrh1hf29vfa1r1sgifb9j2zcg6i43fal4abbx4lcqvf155pzv";
-       revision = "2";
-       editedCabalFile = "195vfc3871l1clk85kzxjvz1zr986lbvgy26fazfkfsn032s74c6";
+       revision = "3";
+       editedCabalFile = "1csz8gzmrrjbjvr6kx4vmyp419i5vbzk84a01vh5zr6ncrpx5nf3";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -232859,12 +234000,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "shake-plus_0_3_3_0" = callPackage
+  "shake-plus_0_3_3_1" = callPackage
     ({ mkDerivation, base, extra, path, rio, shake }:
      mkDerivation {
        pname = "shake-plus";
-       version = "0.3.3.0";
-       sha256 = "13a5n6gh1msrygi671lk5y83shcd75yz64x3r2smxif5hsfazwqv";
+       version = "0.3.3.1";
+       sha256 = "09zinaphlmdshny3hiyibbqqkfflj2rkxh8zkpnnk5dvf2qb15p5";
        libraryHaskellDepends = [ base extra path rio shake ];
        description = "Re-export of Shake using well-typed paths and ReaderT";
        license = stdenv.lib.licenses.mit;
@@ -232894,35 +234035,44 @@ self: {
 
   "shakebook" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, aeson-with, base
-     , binary, binary-instances, comonad, comonad-extras
-     , composite-aeson, composite-base, doctemplates, feed, free
-     , hashable-time, http-conduit, ixset-typed, ixset-typed-conversions
-     , lens, lens-aeson, lucid, lucid-cdn, mtl, mustache, pandoc
-     , pandoc-types, path, path-extensions, rio, shake-plus
-     , shake-plus-extended, sitemap-gen, slick, split, tasty
-     , tasty-golden, text-time, vinyl, zipper-extra
+     , binary-instances, comonad, comonad-extras, compdoc
+     , composite-aeson, composite-aeson-cofree-list
+     , composite-aeson-path, composite-aeson-throw
+     , composite-aeson-writeonly, composite-base, composite-binary
+     , composite-hashable, composite-tuple, composite-xstep
+     , doctemplates, feed, free, hashable-time, ixset-typed
+     , ixset-typed-conversions, lens, lens-aeson, lucid, lucid-cdn, mtl
+     , pandoc, pandoc-throw, pandoc-types, path, path-extensions
+     , path-utils, rio, shake-plus, shake-plus-extended, sitemap-gen
+     , skylighting, split, stache, tasty, tasty-golden, vinyl
+     , zipper-extra
      }:
      mkDerivation {
        pname = "shakebook";
-       version = "0.11.0.0";
-       sha256 = "0h6pq3y7ll5l83a682mwk60zipsm91w0srgrigdgi7l4wdhn7qzb";
+       version = "0.13.1.0";
+       sha256 = "1c2qklpjyszc3rfqm7p73bkb4ma43lwvsc9h8p8dyc5s1dxv8d4f";
        libraryHaskellDepends = [
-         aeson aeson-better-errors aeson-with base binary binary-instances
-         comonad comonad-extras composite-aeson composite-base doctemplates
-         feed free hashable-time http-conduit ixset-typed
-         ixset-typed-conversions lens lens-aeson lucid lucid-cdn mtl
-         mustache pandoc pandoc-types path path-extensions rio shake-plus
-         shake-plus-extended sitemap-gen slick split text-time vinyl
-         zipper-extra
+         aeson aeson-better-errors aeson-with base binary-instances comonad
+         comonad-extras compdoc composite-aeson composite-aeson-cofree-list
+         composite-aeson-path composite-aeson-throw
+         composite-aeson-writeonly composite-base composite-binary
+         composite-hashable composite-tuple composite-xstep doctemplates
+         feed free hashable-time ixset-typed ixset-typed-conversions lens
+         lens-aeson lucid lucid-cdn mtl pandoc pandoc-throw pandoc-types
+         path path-extensions path-utils rio shake-plus shake-plus-extended
+         sitemap-gen skylighting stache vinyl zipper-extra
        ];
        testHaskellDepends = [
-         aeson aeson-better-errors aeson-with base binary binary-instances
-         comonad comonad-extras composite-aeson composite-base doctemplates
-         feed free hashable-time http-conduit ixset-typed
-         ixset-typed-conversions lens lens-aeson lucid lucid-cdn mtl
-         mustache pandoc pandoc-types path path-extensions rio shake-plus
-         shake-plus-extended sitemap-gen slick split tasty tasty-golden
-         text-time vinyl zipper-extra
+         aeson aeson-better-errors aeson-with base binary-instances comonad
+         comonad-extras compdoc composite-aeson composite-aeson-cofree-list
+         composite-aeson-path composite-aeson-throw
+         composite-aeson-writeonly composite-base composite-binary
+         composite-hashable composite-tuple composite-xstep doctemplates
+         feed free hashable-time ixset-typed ixset-typed-conversions lens
+         lens-aeson lucid lucid-cdn mtl pandoc pandoc-throw pandoc-types
+         path path-extensions path-utils rio shake-plus shake-plus-extended
+         sitemap-gen skylighting split stache tasty tasty-golden vinyl
+         zipper-extra
        ];
        description = "Shake-based technical documentation generator; HTML & PDF";
        license = stdenv.lib.licenses.mit;
@@ -237492,6 +238642,8 @@ self: {
        libraryHaskellDepends = [ base bytesmith primitive ];
        description = "Parse arrays of tokens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smith-cli" = callPackage
@@ -244745,6 +245897,8 @@ self: {
        ];
        description = "STM-specialised Hash Array Mapped Trie";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-incremental" = callPackage
@@ -252015,6 +253169,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A command-line kanban board/task manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "taskpool" = callPackage
@@ -252819,8 +253975,8 @@ self: {
        pname = "tasty-travis";
        version = "0.2.0.2";
        sha256 = "0g1qwmr11rgpvm964367mskgrjzbi34lbxzf9c0knx5ij9565gfg";
-       revision = "4";
-       editedCabalFile = "10kvalx02kyx2dx6shw00s689hb1qgllpagwy6nxvah6cky438ks";
+       revision = "5";
+       editedCabalFile = "1m1npkvi3g1i7vn7aiq2558l3hbv2w6nz1ix9mv1djn6ccjlh1gk";
        libraryHaskellDepends = [ base tasty ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Fancy Travis CI output for tasty tests";
@@ -256797,8 +257953,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-lego";
-       version = "0.2.2";
-       sha256 = "0z9bpycyayvjr01pl704yhmchdfiyfi58drkq9ccxahgrwa0gpfc";
+       version = "0.2.3";
+       sha256 = "1c2q1gz04072kh2dxs22hqvcjkfq66ylixl0631wnlmvivbm2ahz";
        libraryHaskellDepends = [
          base template-haskell template-haskell-compat-v0208 text
        ];
@@ -256808,6 +257964,8 @@ self: {
        ];
        description = "Template Haskell construction utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-lift" = callPackage
@@ -258282,6 +259440,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "time-compat_1_9_4" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit
+     , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "time-compat";
+       version = "1.9.4";
+       sha256 = "0fpk2bpxfyzwd24lk06k3cpra713hrpva5ylnwa28zq34azy1snz";
+       libraryHaskellDepends = [ base base-orphans deepseq time ];
+       testHaskellDepends = [
+         base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit
+         tasty-quickcheck time
+       ];
+       description = "Compatibility package for time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "time-extras" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -260207,12 +261383,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tonalude_0_1_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, Glob, rio, unliftio }:
+     mkDerivation {
+       pname = "tonalude";
+       version = "0.1.1.1";
+       sha256 = "19pl0l0nz3nywhf31190qld7crbzry241h5dw0234w5qyiwf5h0h";
+       libraryHaskellDepends = [ base bytestring rio unliftio ];
+       testHaskellDepends = [ base bytestring doctest Glob rio unliftio ];
+       description = "A standard library for Tonatona framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tonaparser" = callPackage
     ({ mkDerivation, base, doctest, envy, Glob, rio, say, tonatona }:
      mkDerivation {
        pname = "tonaparser";
-       version = "0.1.0.0";
-       sha256 = "0v9qfc13lyjclk7pqsld1lzzbdhimz7gziix7w2x6v2rr2nia8j0";
+       version = "0.1.0.1";
+       sha256 = "1hhg8iil1gradmr2nr6rms5y8f1478splfw6q8n8548zgaqlrzig";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base envy rio say ];
@@ -260225,8 +261414,8 @@ self: {
     ({ mkDerivation, base, doctest, Glob, rio, tonaparser }:
      mkDerivation {
        pname = "tonatona";
-       version = "0.1.1.0";
-       sha256 = "17hd93m2i79pb39z00x0sdvhfds3b5fgyhld8pr64rlnr9wm039l";
+       version = "0.1.2.1";
+       sha256 = "0995j5z87s5bq7ax3byhqrzq794fra5khswf1vj5ppymj6sgq9pf";
        libraryHaskellDepends = [ base rio tonaparser ];
        testHaskellDepends = [ base doctest Glob rio tonaparser ];
        description = "meta application framework";
@@ -260261,8 +261450,8 @@ self: {
     ({ mkDerivation, base, doctest, Glob, rio, tonaparser, tonatona }:
      mkDerivation {
        pname = "tonatona-logger";
-       version = "0.2.0.0";
-       sha256 = "14pirmflhyfmw6y7j1af7ryh8iq30prx7xsdjwmliacszhsqvvfa";
+       version = "0.2.0.2";
+       sha256 = "047mhgzkk1jkyblbmh41ha56fifgsfccq6jzq3s0y6fx4sgc95nn";
        libraryHaskellDepends = [ base rio tonaparser tonatona ];
        testHaskellDepends = [ base doctest Glob rio tonaparser tonatona ];
        description = "tonatona plugin for logging";
@@ -260275,8 +261464,8 @@ self: {
      }:
      mkDerivation {
        pname = "tonatona-persistent-postgresql";
-       version = "0.1.0.1";
-       sha256 = "1fxf3h024bl02aldcwc9mhjish9l2y57ir9shra6liddk6065g5n";
+       version = "0.1.0.2";
+       sha256 = "1lib6akp6xnq7iqjgyxgd14l9mgswx8y61v0qpdj8q13xxs5m1si";
        libraryHaskellDepends = [
          base monad-logger persistent persistent-postgresql resource-pool
          rio tonaparser tonatona
@@ -260297,8 +261486,8 @@ self: {
      }:
      mkDerivation {
        pname = "tonatona-persistent-sqlite";
-       version = "0.1.0.1";
-       sha256 = "0a0jgi01pdirr7ay2ah3cvf3nv2pnmvxag34zif04vc6sbs8pryb";
+       version = "0.1.0.2";
+       sha256 = "185bkhikkhk7m8l96rapcy6nwccw3js7kpnif7dlrniv0ckjdwzg";
        libraryHaskellDepends = [
          base monad-logger persistent persistent-sqlite resource-pool rio
          tonaparser tonatona
@@ -260318,8 +261507,8 @@ self: {
      }:
      mkDerivation {
        pname = "tonatona-servant";
-       version = "0.1.0.3";
-       sha256 = "1v414apf2znvwm6vdph6wr0slhd5ki2nc666frhc8blmwj3whqrr";
+       version = "0.1.0.4";
+       sha256 = "0zldxq7qygswa0pyxb82p1bbwap6lfr18dw2802ailv5y6gxsjg0";
        libraryHaskellDepends = [
          base data-default exceptions http-types monad-logger rio servant
          servant-server tonaparser tonatona tonatona-logger wai wai-extra
@@ -263038,6 +264227,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ttc_0_3_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, tasty, tasty-hunit
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "ttc";
+       version = "0.3.0.0";
+       sha256 = "0k23fsp9fji17341iag3rv79lsxj7x26chhijl8lh3jraqvj9y4p";
+       libraryHaskellDepends = [ base bytestring template-haskell text ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit template-haskell text
+       ];
+       description = "Textual Type Classes";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ttl-hashtables" = callPackage
     ({ mkDerivation, base, clock, containers, data-default, failable
      , hashable, hashtables, hspec, mtl, transformers
@@ -264780,6 +265986,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-of-html_1_6_0_0" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers
+     , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim
+     , hspec, QuickCheck, random, text, weigh
+     }:
+     mkDerivation {
+       pname = "type-of-html";
+       version = "1.6.0.0";
+       sha256 = "1blwdwr0ryq3as7dc1wh9ixxy81q600hmm5d4bw768a5kbjc1sj6";
+       libraryHaskellDepends = [
+         base bytestring containers double-conversion ghc-prim text
+       ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion deepseq ghc ghc-paths random
+         text weigh
+       ];
+       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 {
@@ -265610,6 +266838,8 @@ self: {
        preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tzdata" = callPackage
@@ -266081,8 +267311,8 @@ self: {
     ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }:
      mkDerivation {
        pname = "ukrainian-phonetics-basic";
-       version = "0.1.7.0";
-       sha256 = "0rjyy6yxwd799svqd34wjjz5wvxzlkr7bl65s1wmvdfbs9dvfk95";
+       version = "0.1.10.0";
+       sha256 = "14rc2jx621brka5sgxa8m5s38bqyzqdc1jw808zw6mll4hg6scvx";
        libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ];
        description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
        license = stdenv.lib.licenses.mit;
@@ -266213,8 +267443,8 @@ self: {
      }:
      mkDerivation {
        pname = "unbeliever";
-       version = "0.10.0.7";
-       sha256 = "17yjw8lgwm93hhf4rk0npj35h77jfig3ziampdmg5cjhyy2h4sd7";
+       version = "0.10.0.8";
+       sha256 = "062xr66i96kwvbwf4pr51ybiavy6wbijzz7zy0si18g13x00x54c";
        libraryHaskellDepends = [ base core-data core-program core-text ];
        testHaskellDepends = [
          base bytestring core-data core-program core-text fingertree
@@ -268466,21 +269696,31 @@ self: {
      }) {};
 
   "update-nix-fetchgit" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, errors, hnix
-     , prettyprinter, process, text, time, transformers, uniplate
-     , utf8-string
+    ({ mkDerivation, aeson, async, base, bytestring, data-fix
+     , directory, filepath, github-rest, hnix, monad-validate, mtl
+     , optparse-applicative, optparse-generic, process, regex-tdfa, say
+     , syb, tasty, tasty-discover, tasty-golden, template-haskell
+     , temporary, text, time, utf8-string, vector
      }:
      mkDerivation {
        pname = "update-nix-fetchgit";
-       version = "0.1.2.0";
-       sha256 = "0i2dmz95l8nnjqys2vjyjww47rnlny6wpwpj8k5kjl0fbz4h001d";
+       version = "0.2.3";
+       sha256 = "1fmpmwg31gnablwp22a90l7q5hj6xxd57cxf3zbp3mv1xabd341k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring errors hnix prettyprinter process text
-         time transformers uniplate utf8-string
+         aeson async base bytestring data-fix github-rest hnix
+         monad-validate mtl process regex-tdfa syb template-haskell text
+         time utf8-string vector
        ];
-       executableHaskellDepends = [ base text ];
+       executableHaskellDepends = [
+         base optparse-applicative optparse-generic regex-tdfa say text
+       ];
+       testHaskellDepends = [
+         base directory filepath process tasty tasty-discover tasty-golden
+         temporary text
+       ];
+       testToolDepends = [ tasty-discover ];
        description = "A program to update fetchgit values in Nix expressions";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ sorki ];
@@ -270196,8 +271436,8 @@ self: {
        pname = "validated-literals";
        version = "0.3.0";
        sha256 = "1k77jp19kl7h4v9hl2jhsmbq8dhzl8z9sgkw1jxx1rblm3fszjx1";
-       revision = "3";
-       editedCabalFile = "0m7iggm5676nayzkj0ip866qg8d4ld6gv38krl02z020m96zax5b";
+       revision = "4";
+       editedCabalFile = "16fwvivw1barrgkw7cl2hfgksfhambfmhrwibhi6n8096sj79h0j";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [
          base bytestring deepseq tasty tasty-hunit tasty-travis
@@ -270281,18 +271521,19 @@ self: {
      }) {};
 
   "validationt" = callPackage
-    ({ mkDerivation, aeson, base, containers, exceptions, lens
+    ({ mkDerivation, aeson, base, containers, doctest, exceptions, lens
      , monad-control, mtl, QuickCheck, text, transformers
-     , transformers-base, transformers-lift, vector
+     , transformers-base, vector
      }:
      mkDerivation {
        pname = "validationt";
-       version = "0.2.1.0";
-       sha256 = "0b91rn6fvdc9cypaljhm4q8gn4fivyszk00h47qvvs4by8rx5q58";
+       version = "0.3.0";
+       sha256 = "14kvkiawsychqq55nm0afpfwxjvxh9izbr35zgp3wg2j0zqzkhnz";
        libraryHaskellDepends = [
          aeson base containers exceptions lens monad-control mtl QuickCheck
-         text transformers transformers-base transformers-lift vector
+         text transformers transformers-base vector
        ];
+       testHaskellDepends = [ base doctest ];
        description = "Straightforward validation monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -272920,12 +274161,13 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "vulkan";
-       version = "3.6.11";
-       sha256 = "065l0nk4w3if01aavfzgnalpp39xz1j8xw022l9w9pmdmb2y0fjm";
+       version = "3.6.12";
+       sha256 = "1ysqa9vps8jkrcapbrans3k4aljw3wysqlq5z9qds29zrhki4dd0";
        libraryHaskellDepends = [ base bytestring transformers vector ];
        librarySystemDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
        license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {vulkan = null;};
 
   "vulkan-api" = callPackage
@@ -272945,16 +274187,14 @@ self: {
      }:
      mkDerivation {
        pname = "vulkan-utils";
-       version = "0.1.2";
-       sha256 = "1him27687nbqc5mv56gf8nr9hg4wpx702sijrci0ls7mpjz9qlxp";
+       version = "0.1.2.1";
+       sha256 = "1ixjw397aqw04p2gy1d1pg9c3rdww2czakqg21ihg7ldi894n8pa";
        libraryHaskellDepends = [
          base bytestring extra file-embed filepath template-haskell
          temporary typed-process vulkan
        ];
        description = "Utils for the vulkan package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "waargonaut" = callPackage
@@ -273365,7 +274605,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "wai-extra_3_1_1" = callPackage
+  "wai-extra_3_1_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , bytestring, call-stack, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -273375,8 +274615,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.1.1";
-       sha256 = "0x3lixv64j9s6zp9ghl53dj5lgw25mpl65v1cwjfs8kbk44nvbsk";
+       version = "3.1.2";
+       sha256 = "03aszasb9508jy7dpazay89cy1zs4p5g0n08zjhsl8c47rap16ks";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -273679,15 +274919,16 @@ self: {
      }) {};
 
   "wai-log" = callPackage
-    ({ mkDerivation, aeson, base, http-types, log-base
-     , string-conversions, text, time, wai
+    ({ mkDerivation, aeson, base, bytestring, http-types, log-base
+     , string-conversions, text, time, uuid, wai
      }:
      mkDerivation {
        pname = "wai-log";
-       version = "0.2.0.0";
-       sha256 = "02lsvkh7mkqd6p69qffrl62pdxzn5h1a4wnqflb3sycifi8dmj9b";
+       version = "0.3.0.0";
+       sha256 = "0mgby05lq9j31ssyk2yp6mghqwgpffkki7pygday1lmg130n8n74";
        libraryHaskellDepends = [
-         aeson base http-types log-base string-conversions text time wai
+         aeson base bytestring http-types log-base string-conversions text
+         time uuid wai
        ];
        description = "A logging middleware for WAI applications";
        license = stdenv.lib.licenses.bsd3;
@@ -274477,8 +275718,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-predicates";
-       version = "0.10.0";
-       sha256 = "1hnpzf7zwizx67ql4fwpqj7xlgkn6c2ms8w4kjapmgxv8z8zdcxp";
+       version = "1.0.0";
+       sha256 = "0m6aqpafc7rgcp81g0kilshz9bxsp4vxllrya2wjccan3n5pajji";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-conversion case-insensitive
          cookie http-types singletons text transformers vault vector wai
@@ -282461,6 +283702,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yaml-unscrambler" = callPackage
+    ({ mkDerivation, acc, attoparsec, attoparsec-data, attoparsec-time
+     , base, base64, bytestring, conduit, containers, foldl, hashable
+     , libyaml, mtl, neat-interpolation, QuickCheck
+     , quickcheck-instances, rerebase, scientific, selective, tasty
+     , tasty-hunit, tasty-quickcheck, text, text-builder, time
+     , transformers, unordered-containers, uuid, vector, yaml
+     }:
+     mkDerivation {
+       pname = "yaml-unscrambler";
+       version = "0.1.0.1";
+       sha256 = "05z892g8c9alwmjwjm1405s43s8cdbj42ymqc9jlb27qc8ikc4n7";
+       libraryHaskellDepends = [
+         acc attoparsec attoparsec-data attoparsec-time base base64
+         bytestring conduit containers foldl hashable libyaml mtl scientific
+         selective text text-builder time transformers unordered-containers
+         uuid vector yaml
+       ];
+       testHaskellDepends = [
+         foldl neat-interpolation QuickCheck quickcheck-instances rerebase
+         tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Flexible declarative YAML parsing toolkit";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "yaml2owl" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, network
      , network-uri, swish, text, xml, yaml
@@ -283277,6 +284546,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth_1_6_10_1" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, bytestring, conduit, conduit-extra, containers
+     , cryptonite, data-default, email-validate, file-embed, http-client
+     , http-client-tls, http-conduit, http-types, memory, network-uri
+     , nonce, persistent, random, safe, shakespeare, template-haskell
+     , text, time, transformers, unliftio, unliftio-core
+     , unordered-containers, wai, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.6.10.1";
+       sha256 = "12bnadmf3afbkni3k8gc1srv2makssy62zciygg4dh8q7rr2pw2s";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup bytestring conduit
+         conduit-extra containers cryptonite data-default email-validate
+         file-embed http-client http-client-tls http-conduit http-types
+         memory network-uri nonce persistent random safe shakespeare
+         template-haskell text time transformers unliftio unliftio-core
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-account" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
      , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -283590,8 +284888,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-oauth";
-       version = "1.6.0.1";
-       sha256 = "0b9sp2rbj8yd343whcgg1ph4ybfk136d0ln09q7z56xqxn4brl3s";
+       version = "1.6.0.2";
+       sha256 = "1rr21vclcvy4lrv6r3v6f6sslmwg49jr7jiad63snn81nz854da1";
        libraryHaskellDepends = [
          authenticate-oauth base bytestring text unliftio yesod-auth
          yesod-core yesod-form
@@ -284629,6 +285927,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-persistent_1_6_0_5" = callPackage
+    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
+     , persistent-sqlite, persistent-template, resource-pool, resourcet
+     , text, transformers, wai-extra, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-persistent";
+       version = "1.6.0.5";
+       sha256 = "0chvpzhfj0l1lacwslizhawsc9ns307q0wc6mcalz6gv7cm7mfi3";
+       libraryHaskellDepends = [
+         base blaze-builder conduit persistent persistent-template
+         resource-pool resourcet transformers yesod-core
+       ];
+       testHaskellDepends = [
+         base blaze-builder conduit hspec persistent persistent-sqlite text
+         wai-extra yesod-core
+       ];
+       description = "Some helpers for using Persistent from Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-platform" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding
      , asn1-parse, asn1-types, attoparsec-conduit, authenticate

From 58b878c74801770f32c925636ada56366ff02d26 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 6 Nov 2020 15:13:09 +0100
Subject: [PATCH 1691/3942] haskellPackages.dependent-sum-aeson-orphans: Remove
 obsolete patch

---
 pkgs/development/haskell-modules/configuration-common.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0ec9fad1e8a2..d73a69c85833 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1382,13 +1382,6 @@ self: super: {
     sha256 = "1c5ck2ibag2gcyag6rjivmlwdlp5k0dmr8nhk7wlkzq2vh7zgw63";
   });
 
-  # Version bumps have not been merged by upstream yet.
-  # https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/5
-  dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch {
-    url = "https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/5a369e433ad7e3eef54c7c3725d34270f6aa48cc.patch";
-    sha256 = "1lzrcicvdg77hd8j2fg37z19amp5yna5xmw1fc06zi0j95csll4r";
-  });
-
   # Tests are broken because of missing files in hackage tarball.
   # https://github.com/jgm/commonmark-hs/issues/55
   commonmark-extensions = dontCheck super.commonmark-extensions;

From a146baff16c99bf347beda70294a558875cc40fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Nov 2020 20:04:38 +0100
Subject: [PATCH 1692/3942] git-annex: update sha256 hash for new version
 8.20201103

---
 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 d73a69c85833..4894b59c4ad3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -69,7 +69,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "05yvl09ksyvzykibs95996rni9x6w03yfqyv2fadd73z1m6lq5bf";
+      sha256 = "1g5ba1lv0v4zjk5ghdp78wxgszspfda1lrl734fi7hyavqrfjxkz";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From e0073ccae7392a3395694c0faea66263590ff453 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Nov 2020 20:11:45 +0100
Subject: [PATCH 1693/3942] ghcjs: mark build broken

---
 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 7b6fbc460a95..c6c81491fe6d 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -104,4 +104,6 @@ in stdenv.mkDerivation {
 
     meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
     meta.maintainers = [lib.maintainers.elvishjerricco];
+    meta.hydraPlatforms = [];
+    meta.broken = true;    # https://hydra.nixos.org/build/129701778
   }

From 7347bbf45443f55ce591079ea5a49712a0560a2e Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Fri, 6 Nov 2020 22:50:00 +0800
Subject: [PATCH 1694/3942] haskellPackages.vulkan: add 32 bit platforms to
 unsupported-platforms

Same for haskellPackages.VulkanMemoryAllocator
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8213b47785b0..4328d6a75894 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2738,6 +2738,8 @@ unsupported-platforms:
   sdl2-mixer:                                   [ x86_64-darwin ]
   sdl2-ttf:                                     [ x86_64-darwin ]
   tokyotyrant-haskell:                          [ x86_64-darwin ]
+  vulkan:                                       [ i686-linux, armv7l-linux ]
+  VulkanMemoryAllocator:                        [ i686-linux, armv7l-linux ]
   Win32-console:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-dhcp-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]

From 8925f7ae79303004e5ed2c056aa6d9e569357e40 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Nov 2020 21:27:34 +0100
Subject: [PATCH 1695/3942] haskell-binary-instances: drop obsolete override

Unfortunately, this doesn't mean that the package now compiles
because it still depends on an newer version of time-compat. :-(
---
 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 4894b59c4ad3..821e32ab8a14 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1173,9 +1173,6 @@ self: super: {
   # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71
   nixfmt = doJailbreak super.nixfmt;
 
-  # 2020-06-22: NOTE: QuickCheck upstreamed https://github.com/phadej/binary-instances/issues/7
-  binary-instances = dontCheck super.binary-instances;
-
   # The test suite depends on an impure cabal-install installation in
   # $HOME, which we don't have in our build sandbox.
   cabal-install-parsers = dontCheck super.cabal-install-parsers;

From d1e684cd2456cdd5ff87d01a2624d67b63e3b3bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Nov 2020 21:33:53 +0100
Subject: [PATCH 1696/3942] haskell: drop obsolete patches for patch and reflex

---
 .../haskell-modules/configuration-common.nix  | 37 +------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 821e32ab8a14..ff3a7be3b134 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1252,41 +1252,8 @@ self: super: {
   x509-validation = dontCheck super.x509-validation;
   tls = dontCheck super.tls;
 
-  patch = appendPatches super.patch [
-    # Upstream PR: https://github.com/reflex-frp/patch/pull/20
-    # Makes tests work with hlint 3
-    (pkgs.fetchpatch {
-      url = "https://github.com/reflex-frp/patch/commit/3ed23a4e4049ee17e64a1a5bbebf1990cdbe033a.patch";
-      sha256 ="1hfa980wln8kzbqw1lr8ddszgcibw25xf12ki2jb9xkl464aynzf";
-    })
-    # Upstream PR: https://github.com/reflex-frp/patch/pull/17
-    # Bumps version dependencies
-    (pkgs.fetchpatch {
-      url = "https://github.com/reflex-frp/patch/commit/a191ed9ded708ed7ff0cf53ad6dafaf54db5b95a.patch";
-      sha256 ="1x9w5fimhk3a0l2aa5z91nqaa6s2irz1775iidd0191m6w25vszp";
-    })
-  ];
-
-  reflex = appendPatches super.reflex [
-    # Upstream PR: https://github.com/reflex-frp/reflex/pull/434
-    # Bump version bounds
-    (pkgs.fetchpatch {
-      url = "https://github.com/reflex-frp/reflex/commit/e6104bdfd7f664f524b6765275490722e376df4d.patch";
-      sha256 ="1awp5p4640cnhfd50dplsvp0kzy6h8r0hpbw1s40blni74r3dhzr";
-    })
-    # Upstream PR: https://github.com/reflex-frp/reflex/pull/436
-    # Fix build with newest dependent-map version
-    (pkgs.fetchpatch {
-      url = "https://github.com/reflex-frp/reflex/commit/dc3bf44d822d70594e3c474fe3869261776c3554.patch";
-      sha256 ="0rbjfj9b8p6zkvd5j4pak5kpgard6cyfvzk750s4xwpc1v84iiqd";
-    })
-    # Upstream PR: https://github.com/reflex-frp/reflex/pull/437
-    # Fix tests with newer dep versions
-    (pkgs.fetchpatch {
-      url = "https://github.com/reflex-frp/reflex/commit/87c74a1b9d9098eae8a56148c59ed4963a5232c2.patch";
-      sha256 ="0qhjjgd6n4fms1hpbblny78c95bfh74izhx9dvrdlnhz6q7xlm9q";
-    })
-  ];
+  # Allow building with recent versions of hlint.
+  patch = doJailbreak super.patch;
 
   # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
   # Tests disabled because of very old dep: https://github.com/reflex-frp/reflex-dom/issues/393

From f6d0d8c265caed8620d799a0a2817d6f0e757f20 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Nov 2020 07:30:53 +0000
Subject: [PATCH 1697/3942] python27Packages.objgraph: 3.4.1 -> 3.5.0

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

diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix
index 860f8c0051e7..79c448b5cced 100644
--- a/pkgs/development/python-modules/objgraph/default.nix
+++ b/pkgs/development/python-modules/objgraph/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "objgraph";
-  version = "3.4.1";
+  version = "3.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bf29512d7f8b457b53fa0722ea59f516abb8abc59b78f97f0ef81394a0c615a7";
+    sha256 = "4752ca5bcc0e0512e41b8cc4d2780ac2fd3b3eabd03b7e950a5594c06203dfc4";
   };
 
   # Tests fail with PyPy.

From 9f1022241ec6159ad3d457c62c9af3784ae56d86 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 6 Nov 2020 14:28:59 -0800
Subject: [PATCH 1698/3942] README.md: bump pkg count to 60k

repology has us at 65k+ packages
https://repology.org/repository/nix_unstable
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 70d50e5efcd6..16cfeabfa7ed 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 </p>
 
 [Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over
-40,000 software packages that can be installed with the
+60,000 software packages that can be installed with the
 [Nix](https://nixos.org/nix/) package manager. It also implements
 [NixOS](https://nixos.org/nixos/), a purely-functional Linux distribution.
 

From ade59d25e88352838a577ffeff161a989c692961 Mon Sep 17 00:00:00 2001
From: Peter Stewart <peter@stewartmail.xyz>
Date: Thu, 5 Nov 2020 18:55:39 +1100
Subject: [PATCH 1699/3942] mono6: 6.0.0.313 -> 6.12.0.90

---
 pkgs/development/compilers/mono/6.nix       | 4 ++--
 pkgs/development/compilers/mono/generic.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix
index 0157fa7b7f68..04028648a255 100644
--- a/pkgs/development/compilers/mono/6.nix
+++ b/pkgs/development/compilers/mono/6.nix
@@ -2,8 +2,8 @@
 
 callPackage ./generic.nix ({
   inherit Foundation libobjc;
-  version = "6.0.0.313";
+  version = "6.12.0.90";
   srcArchiveSuffix = "tar.xz";
-  sha256 = "0l0cd6q5xh1vdm6zr78rkfqdsmrgzanjgpxvgig0pyd3glfyjim9";
+  sha256 = "1b6d0926rd0nkmsppwjgmwsxx1479jjvr1gm7zwk64siml15rpji";
   enableParallelBuilding = true;
 })
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index c510f372666a..ca3b31478070 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which
+{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which
 , gnumake42
 , enableParallelBuilding ? true
 , srcArchiveSuffix ? "tar.bz2"
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gnumake42 ];
   buildInputs =
-    [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which
+    [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool automake cmake which
     ]
     ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
 

From 419c760564853a6db4b0d01d4ec8c40dc21e9d97 Mon Sep 17 00:00:00 2001
From: evalexpr <jonathan@wilkins.tech>
Date: Fri, 6 Nov 2020 22:36:09 +0000
Subject: [PATCH 1700/3942] vimPlugins.barbar-nvim: init at 2020-11-06

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 82374718b16b..87ce6f2dadb8 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -219,6 +219,18 @@ let
     meta.homepage = "https://github.com/ayu-theme/ayu-vim/";
   };
 
+  barbar-nvim = buildVimPluginFrom2Nix {
+    pname = "barbar-nvim";
+    version = "2020-11-06";
+    src = fetchFromGitHub {
+      owner = "romgrk";
+      repo = "barbar.nvim";
+      rev = "92e70f9e369d106476de283354bc30e37a94e864";
+      sha256 = "17az4flcsry4f2p4xnmgw0ymbbybcfycajm25g6r692hcbgkg5dx";
+    };
+    meta.homepage = "https://github.com/romgrk/barbar.nvim/";
+  };
+
   base16-vim = buildVimPluginFrom2Nix {
     pname = "base16-vim";
     version = "2019-06-07";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index cb62025a8f87..4a50581cec83 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -429,6 +429,7 @@ rhysd/vim-operator-surround
 rodjek/vim-puppet
 romainl/vim-cool
 roman/golden-ratio
+romgrk/barbar.nvim
 ron89/thesaurus_query.vim
 roxma/nvim-cm-racer
 roxma/nvim-completion-manager

From 56d09147f13293dc365d08f857c787f12904a1f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 08:33:41 +0000
Subject: [PATCH 1701/3942] python37Packages.aioresponses: 0.6.4 -> 0.7.1

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

diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index 7b12cefc8c78..6a0d69371a8e 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/pkgs/development/python-modules/aioresponses/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "aioresponses";
-  version = "0.6.4";
+  version = "0.7.1";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4397ca736238a1ada8c7f47e557dda05e9ecfdd467b9f6b83871efd365af7e9f";
+    sha256 = "f65bba2be1e9a4997ee166bc0161a50be0fef7350ad09e6afdb2adccf74dfefe";
   };
 
   nativeBuildInputs = [

From 050aad187bc99f45328b2c5abf3c0ab29cbbe254 Mon Sep 17 00:00:00 2001
From: Jeremy Schlatter <jeremy@jeremyschlatter.com>
Date: Mon, 19 Oct 2020 17:30:15 -0700
Subject: [PATCH 1702/3942] pythonPackages.inform: init at 1.23

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

diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix
new file mode 100644
index 000000000000..158f1161cb4d
--- /dev/null
+++ b/pkgs/development/python-modules/inform/default.nix
@@ -0,0 +1,36 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, arrow
+, six
+, hypothesis
+, pytest
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "inform";
+  version = "1.23";
+
+  src = fetchFromGitHub {
+    owner = "KenKundert";
+    repo = "inform";
+    rev = "v${version}";
+    sha256 = "02zlprvidkz51aypss4knhv7dbr0sbpz3caqjzf9am2n1jx2viyy";
+  };
+
+  propagatedBuildInputs = [ arrow six ];
+
+  checkInputs = [ pytest hypothesis ];
+  checkPhase = "./test.doctests.py && ./test.inform.py && pytest";
+
+  meta = with lib; {
+    description = "Print and logging utilities";
+    longDescription = ''
+      Inform is designed to display messages from programs that are typically
+      run from a console. It provides a collection of ‘print’ functions that
+      allow you to simply and cleanly print different types of messages.
+    '';
+    homepage = "https://inform.readthedocs.io";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ jeremyschlatter ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aab9f760dbad..6ae48a44d63d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2907,6 +2907,8 @@ in {
 
   infoqscraper = callPackage ../development/python-modules/infoqscraper { };
 
+  inform = callPackage ../development/python-modules/inform { };
+
   iniconfig = callPackage ../development/python-modules/iniconfig { };
 
   inifile = callPackage ../development/python-modules/inifile { };

From 1120f899daee5681cff8f6bf59ed531d4dd58a85 Mon Sep 17 00:00:00 2001
From: Jeremy Schlatter <jeremy@jeremyschlatter.com>
Date: Mon, 19 Oct 2020 17:30:53 -0700
Subject: [PATCH 1703/3942] pythonPackages.nestedtext: init at 1.2

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

diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix
new file mode 100644
index 000000000000..1fbfde7b26a6
--- /dev/null
+++ b/pkgs/development/python-modules/nestedtext/default.nix
@@ -0,0 +1,43 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, inform
+, pytestCheckHook
+, docopt
+, natsort
+, voluptuous
+}:
+
+buildPythonPackage rec {
+  pname = "nestedtext";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "KenKundert";
+    repo = "nestedtext";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    sha256 = "1dwks5apghg29aj90nc4qm0chk195jh881297zr1wk7mqd2n159y";
+  };
+
+  propagatedBuildInputs = [ inform ];
+
+  checkInputs = [ pytestCheckHook docopt natsort voluptuous ];
+  pytestFlagsArray = [ "--ignore=build" ]; # Avoids an ImportMismatchError.
+
+  meta = with lib; {
+    description = "A human friendly data format";
+    longDescription = ''
+      NestedText is a file format for holding data that is to be entered,
+      edited, or viewed by people. It allows data to be organized into a nested
+      collection of dictionaries, lists, and strings. In this way it is similar
+      to JSON, YAML and TOML, but without the complexity and risk of YAML and
+      without the syntactic clutter of JSON and TOML. NestedText is both simple
+      and natural. Only a small number of concepts and rules must be kept in
+      mind when creating it. It is easily created, modified, or viewed with a
+      text editor and easily understood and used by both programmers and
+      non-programmers.
+    '';
+    homepage = "https://nestedtext.org";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jeremyschlatter ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ae48a44d63d..beb4b050d6cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3978,6 +3978,8 @@ in {
 
   nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
 
+  nestedtext = callPackage ../development/python-modules/nestedtext { };
+
   netaddr = callPackage ../development/python-modules/netaddr { };
 
   netcdf4 = callPackage ../development/python-modules/netcdf4 { };

From 5cd0d6d710d1156a248d334dd4775fa5934bc047 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Thu, 5 Nov 2020 21:28:40 -0800
Subject: [PATCH 1704/3942] plater: init at 2020-07-30

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

diff --git a/pkgs/applications/misc/plater/default.nix b/pkgs/applications/misc/plater/default.nix
new file mode 100644
index 000000000000..9d29390870e8
--- /dev/null
+++ b/pkgs/applications/misc/plater/default.nix
@@ -0,0 +1,30 @@
+{ mkDerivation
+, cmake
+, fetchFromGitHub
+, lib
+, libGLU
+, qtbase
+}:
+
+mkDerivation rec {
+  pname = "plater";
+  version = "2020-07-30";
+
+  src = fetchFromGitHub {
+    owner = "Rhoban";
+    repo = "Plater";
+    rev = "f8de6d038f95a9edebfcfe142c8e9783697d5b47";
+    sha256 = "0r20mbzd16zv1aiadjqdy7z6sp09rr6lgfxhvir4ll3cpakkynr4";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libGLU qtbase ];
+
+  meta = with lib; {
+    description = "3D-printer parts placer and plate generator";
+    homepage = "https://github.com/Rhoban/Plater";
+    maintainers = with maintainers; [ lovesegfault ];
+    platforms = platforms.linux;
+    license = licenses.cc-by-nc-30;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb08f0ec578d..84cf77b2cfe8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22989,6 +22989,8 @@ in
 
   pistol = callPackage ../tools/misc/pistol { };
 
+  plater = libsForQt5.callPackage ../applications/misc/plater { };
+
   plexamp = callPackage ../applications/audio/plexamp { };
 
   plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { };

From d8bdeac599f4f8a9c86a88f34900cd651a7a544b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 7 Nov 2020 04:20:00 +0000
Subject: [PATCH 1705/3942] nix-linter: fix build

---
 pkgs/development/tools/analysis/nix-linter/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix
index 62de8bdfdaaf..138933ebb57f 100644
--- a/pkgs/development/tools/analysis/nix-linter/default.nix
+++ b/pkgs/development/tools/analysis/nix-linter/default.nix
@@ -1,6 +1,7 @@
 { lib
 , mkDerivation
 , fetchFromGitHub
+, fetchpatch
 , fixplate
 , tasty
 , tasty-hunit
@@ -36,6 +37,14 @@ mkDerivation rec {
   executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ];
   testHaskellDepends = [ tasty tasty-hunit tasty-th ];
 
+  patches = [
+    # raise upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46
+    (fetchpatch {
+      url = "https://github.com/Synthetica9/nix-linter/commit/b406024e525977b3c69d78d6a94a683e2ded121f.patch";
+      sha256 = "0viwbprslcmy70bxy3v27did79nqhlc0jcx4kp0lycswaccvnp1j";
+    })
+  ];
+
   description = "Linter for Nix(pkgs), based on hnix";
   homepage = "https://github.com/Synthetica9/nix-linter";
   license = lib.licenses.bsd3;

From 7aa50bb38ba24dc6b1116152c85b15638ba5f542 Mon Sep 17 00:00:00 2001
From: David Birks <david@birks.dev>
Date: Thu, 22 Oct 2020 00:13:40 -0400
Subject: [PATCH 1706/3942] maintainers: add dbirks

---
 maintainers/maintainer-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bacd3dab9aae..15292ae51427 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2011,6 +2011,16 @@
     githubId = 49904992;
     name = "Dawid Sowa";
   };
+  dbirks = {
+    email = "david@birks.dev";
+    github = "dbirks";
+    githubId = 7545665;
+    name = "David Birks";
+    keys = [{
+      longkeyid = "ed25519/0xBB999F83D9A19A36";
+      fingerprint = "B26F 9AD8 DA20 3392 EF87  C61A BB99 9F83 D9A1 9A36";
+    }];
+  };
   dbohdan = {
     email = "dbohdan@dbohdan.com";
     github = "dbohdan";

From 2c99a203c7b7a7e03882dd3ce39334f02c3632e1 Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Sun, 30 Aug 2020 22:17:19 +0900
Subject: [PATCH 1707/3942] mackerel-agent: init at 0.69.3

---
 .../monitoring/mackerel-agent/default.nix     | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/servers/monitoring/mackerel-agent/default.nix

diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix
new file mode 100644
index 000000000000..c5548fafd348
--- /dev/null
+++ b/pkgs/servers/monitoring/mackerel-agent/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute, nettools }:
+
+buildGoModule rec {
+  pname = "mackerel-agent";
+  version = "0.69.3";
+
+  src = fetchFromGitHub {
+    owner = "mackerelio";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0jkvqqzk6wyjsdsmn2l2cdw8pjqzswlqb9p492czhgrfy065lrqp";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];
+  buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute ];
+
+  vendorSha256 = "0kjky2mhs6dapnr4xpjpnbibp6y8r320igddplynsfsp8vwrfp7m";
+
+  subPackages = [ "." ];
+
+  buildFlagsArray = ''
+    -ldflags=
+    -X=main.version=${version}
+    -X=main.gitcommit=v${version}
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/mackerel-agent \
+      --prefix PATH : "${lib.makeBinPath buildInputs}"
+  '';
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "System monitoring service for mackerel.io";
+    homepage = "https://github.com/mackerelio/mackerel-agent";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ midchildan ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28ce443ead31..3d7a307c79c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16813,6 +16813,8 @@ in
 
   labelImg = callPackage ../applications/science/machine-learning/labelimg { };
 
+  mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { };
+
   mailman = callPackage ../servers/mail/mailman/wrapped.nix { };
 
   mailman-rss = callPackage ../development/python-modules/mailman-rss { };

From 921a66edc47a690cf989ff79f41d553fdd5c96ea Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Sun, 30 Aug 2020 22:21:15 +0900
Subject: [PATCH 1708/3942] nixos/mackerel-agent: init

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/monitoring/mackerel-agent.nix    | 111 ++++++++++++++++++
 2 files changed, 112 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/mackerel-agent.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6ac12e4e1387..0a38fa317305 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -542,6 +542,7 @@
   ./services/monitoring/kapacitor.nix
   ./services/monitoring/loki.nix
   ./services/monitoring/longview.nix
+  ./services/monitoring/mackerel-agent.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/munin.nix
   ./services/monitoring/nagios.nix
diff --git a/nixos/modules/services/monitoring/mackerel-agent.nix b/nixos/modules/services/monitoring/mackerel-agent.nix
new file mode 100644
index 000000000000..7046de9d403c
--- /dev/null
+++ b/nixos/modules/services/monitoring/mackerel-agent.nix
@@ -0,0 +1,111 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.mackerel-agent;
+  settingsFmt = pkgs.formats.toml {};
+in {
+  options.services.mackerel-agent = {
+    enable = mkEnableOption "mackerel.io agent";
+
+    # the upstream package runs as root, but doesn't seem to be strictly
+    # necessary for basic functionality
+    runAsRoot = mkEnableOption "Whether to run as root.";
+
+    autoRetirement = mkEnableOption ''
+      Whether to automatically retire the host upon OS shutdown.
+    '';
+
+    apiKeyFile = mkOption {
+      type = types.path;
+      default = "";
+      example = "/run/keys/mackerel-api-key";
+      description = ''
+        Path to file containing the Mackerel API key. The file should contain a
+        single line of the following form:
+
+        <literallayout>apikey = "EXAMPLE_API_KEY"</literallayout>
+      '';
+    };
+
+    settings = mkOption {
+      description = ''
+        Options for mackerel-agent.conf.
+
+        Documentation:
+        <link xlink:href="https://mackerel.io/docs/entry/spec/agent"/>
+      '';
+
+      default = {};
+      example = {
+        verbose = false;
+        silent = false;
+      };
+
+      type = types.submodule {
+        freeformType = settingsFmt.type;
+
+        options.host_status = {
+          on_start = mkOption {
+            type = types.enum [ "working" "standby" "maintenance" "poweroff" ];
+            description = "Host status after agent startup.";
+            default = "working";
+          };
+          on_stop = mkOption {
+            type = types.enum [ "working" "standby" "maintenance" "poweroff" ];
+            description = "Host status after agent shutdown.";
+            default = "poweroff";
+          };
+        };
+
+        options.diagnostic =
+          mkEnableOption "Collect memory usage for the agent itself";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [ mackerel-agent ];
+
+    environment.etc = {
+      "mackerel-agent/mackerel-agent.conf".source =
+        settingsFmt.generate "mackerel-agent.conf" cfg.settings;
+      "mackerel-agent/conf.d/api-key.conf".source = cfg.apiKeyFile;
+    };
+
+    services.mackerel-agent.settings = {
+      root = mkDefault "/var/lib/mackerel-agent";
+      pidfile = mkDefault "/run/mackerel-agent/mackerel-agent.pid";
+
+      # conf.d stores the symlink to cfg.apiKeyFile
+      include = mkDefault "/etc/mackerel-agent/conf.d/*.conf";
+    };
+
+    # upstream service file in https://git.io/JUt4Q
+    systemd.services.mackerel-agent = {
+      description = "mackerel.io agent";
+      after = [ "network-online.target" "nss-lookup.target" ];
+      wantedBy = [ "multi-user.target" ];
+      environment = {
+        MACKEREL_PLUGIN_WORKDIR = mkDefault "%C/mackerel-agent";
+      };
+      serviceConfig = {
+        DynamicUser = !cfg.runAsRoot;
+        PrivateTmp = mkDefault true;
+        CacheDirectory = "mackerel-agent";
+        ConfigurationDirectory = "mackerel-agent";
+        RuntimeDirectory = "mackerel-agent";
+        StateDirectory = "mackerel-agent";
+        ExecStart = "${pkgs.mackerel-agent}/bin/mackerel-agent supervise";
+        ExecStopPost = mkIf cfg.autoRetirement "${pkg.mackerel-agent}/bin/mackerel-agent retire -force";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        LimitNOFILE = mkDefault 65536;
+        LimitNPROC = mkDefault 65536;
+      };
+      restartTriggers = [
+        config.environment.etc."mackerel-agent/mackerel-agent.conf".source
+      ];
+    };
+  };
+}

From dd30093d6fd45262cf5c3777a00682b8e4f66ac6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Nov 2020 05:13:58 +0000
Subject: [PATCH 1709/3942] python27Packages.user-agents: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix
index 80985eed4812..5fb926607bae 100644
--- a/pkgs/development/python-modules/user-agents/default.nix
+++ b/pkgs/development/python-modules/user-agents/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "user-agents";
-  version = "2.1.0";
+  version = "2.2.0";
 
   # PyPI is missing devices.json
   src = fetchFromGitHub {
     owner = "selwin";
     repo = "python-user-agents";
     rev = "v${version}";
-    sha256 = "04bndajsfnpymxfiggnj7g38cmlvca3ry5k2611x8ibp38x53yhc";
+    sha256 = "0pcbjqj21c2ixhl414bh2h8khi8y1igzfpkyqwan1pakix0lq45a";
   };
 
   propagatedBuildInputs = [ ua-parser ];

From 425e98b91fdec295d23af3baddce2606493fea08 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Nov 2020 05:38:56 +0000
Subject: [PATCH 1710/3942] python27Packages.sh: 1.14.0 -> 1.14.1

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

diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix
index 3ef3393363ac..964512460bf1 100644
--- a/pkgs/development/python-modules/sh/default.nix
+++ b/pkgs/development/python-modules/sh/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "sh";
-  version = "1.14.0";
+  version = "1.14.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05c7e520cdf70f70a7228a03b589da9f96c6e0d06fc487ab21fc62b26a592e59";
+    sha256 = "39aa9af22f6558a0c5d132881cf43e34828ca03e4ae11114852ca6a55c7c1d8e";
   };
 
   patches = [

From e57a4bfc4b905a54dda49186102f685680b0b2ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Nov 2020 05:53:33 +0000
Subject: [PATCH 1711/3942] python37Packages.rq: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index 66ca024b2bb5..c788d4164102 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "rq";
-  version = "1.5.1";
+  version = "1.5.2";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "rq";
     repo = "rq";
     rev = "v${version}";
-    sha256 = "0i7yyw828wdvl7ap4gb7jhm4p94502is3xxrgrdgwwp0l1rac004";
+    sha256 = "0ikqmpq0g1qiqwd7ar1286l4hqjb6aj2wr844gihhb8ijzwhp8va";
   };
 
   # test require a running redis rerver, which is something we can't do yet

From 7c0d90e11eda5bd5cf3e970dd786c950c9bc35f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Nov 2020 06:19:11 +0000
Subject: [PATCH 1712/3942] quilter: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
index 4d1cf5dafb76..b69d20850ad2 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "quilter";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "0622mh46z3fi6zvipmgj8k4d4gj1c2781l10frk7wqq1sysjrxps";
+    sha256 = "0ya1iwzfzvrci083zyrjj6ac4ys25j90slpk8yydw9n99kb750rk";
   };
 
   nativeBuildInputs = [

From 981c8bb5e24f25014c75cbe050dd16697ca68157 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Thu, 29 Oct 2020 00:14:42 -0700
Subject: [PATCH 1713/3942] soil: fix dead url, enable on darwin

---
 pkgs/development/libraries/soil/default.nix | 45 ++++++++++++++-------
 pkgs/top-level/all-packages.nix             |  4 +-
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix
index cf0896170c17..dcec1c897b3b 100644
--- a/pkgs/development/libraries/soil/default.nix
+++ b/pkgs/development/libraries/soil/default.nix
@@ -1,28 +1,45 @@
-{ stdenv, fetchurl, unzip, mesa, libX11, libGL }:
+{ stdenv, lib
+, Carbon
+, fetchzip
+, libGL
+, libX11
+}:
 
 stdenv.mkDerivation {
   name = "soil";
 
-  src = fetchurl {
-    url    = "http://www.lonesock.net/files/soil.zip";
-    sha256 = "00gpwp9dldzhsdhksjvmbhsd2ialraqbv6v6dpikdmpncj6mnc52";
+  src = fetchzip {
+    url = "https://web.archive.org/web/20200104042737id_/http://www.lonesock.net/files/soil.zip";
+    sha256 = "1c05nwbnfdgwaz8ywn7kg2xrcvrcbpdyhcfkkiiwk69zvil0pbgd";
   };
 
-  buildInputs = [ unzip mesa libGL libX11 ];
+  buildInputs = if stdenv.hostPlatform.isDarwin then [
+    Carbon
+  ] else [
+    libGL
+    libX11
+  ];
 
-  sourceRoot = "Simple OpenGL Image Library/projects/makefile";
-  preBuild   = "mkdir obj";
-  preInstall = "mkdir -p $out/lib $out/include";
-  makeFlags  = [ "LOCAL=$(out)" ];
+  buildPhase = ''
+    cd src
+    $CC $NIX_CFLAGS_COMPILE -c *.c
+    $AR rcs libSOIL.a *.o
+  '';
+  installPhase = ''
+    mkdir -p $out/lib $out/include/SOIL
+    cp libSOIL.a $out/lib/
+    cp SOIL.h $out/include/SOIL/
+  '';
 
-  meta = {
-    description     = "Simple OpenGL Image Library";
+  meta = with lib; {
+    description = "Simple OpenGL Image Library";
     longDescription = ''
       SOIL is a tiny C library used primarily for uploading textures
       into OpenGL.
     '';
-    homepage  = "https://www.lonesock.net/soil.html";
-    license   = stdenv.lib.licenses.publicDomain;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://www.lonesock.net/soil.html";
+    license = licenses.publicDomain;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ r-burns ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 250e25228951..3e571724c0f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15704,7 +15704,9 @@ in
 
   sofia_sip = callPackage ../development/libraries/sofia-sip { };
 
-  soil = callPackage ../development/libraries/soil { };
+  soil = callPackage ../development/libraries/soil {
+    inherit (darwin.apple_sdk.frameworks) Carbon;
+  };
 
   sonic = callPackage ../development/libraries/sonic { };
 

From 33a3ac31693030f0942a960ec0cc411f5a5b0dbe Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 7 Nov 2020 03:12:41 +0900
Subject: [PATCH 1714/3942] thunderbird-bin: 78.4.0 -> 78.4.1

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 3ffd171295cf..ca2b8a77347c 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,665 +1,665 @@
 {
-  version = "78.4.0";
+  version = "78.4.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/af/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/af/thunderbird-78.4.1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "589fe4c9a7ceffb4d027f493e0b074647bb958a62046deef5b8268fd43e6aae9";
+      sha256 = "36268a7fe6ec5a0ea0243f83ffbd73204d5c4ef257b0c8857a50428304b2d4c2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ar/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ar/thunderbird-78.4.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "b94d46899a7458f9c94849db71975e0028004bf93d5b0695a454fbac24a41ec6";
+      sha256 = "831e70f807f05ce2f82bb11db35d05ed80dac53ad00c12ff6e191a627d0d42d0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ast/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ast/thunderbird-78.4.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "c6057f5e2937a05f84decc3c2f26de4555314c627210a961882773b2c745ddbf";
+      sha256 = "e6efde72ce7aeeda5f7c6d7cc0f3a08265c44546a0f8fc84a2adbc11cc038601";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/be/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/be/thunderbird-78.4.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "94d7bd38e35745f4829abe6cf3ada8e947a2df881dcb1e5f6ef823bbd6e0aa75";
+      sha256 = "07fe33390caf37a96c000e0f5435d07711f7a95dbe04f85a222b17ae5a13f1bc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/bg/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/bg/thunderbird-78.4.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "d482c6a6873ddb34dc49002b8ecac94e82579fde7d24514500f2de28fc777e18";
+      sha256 = "d460e201cbe4a1d6548a52121a33c2aaa7cbbf0e126fa1c4e8a431423424fb9e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/br/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/br/thunderbird-78.4.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "18fc5e174942874ecc41838451aec780485a263584121decfb9f9607ee35322c";
+      sha256 = "9e85928f1145391d9c3f238612b93e6344a2ad5e6179bf09502b1b69c8ad1b03";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ca/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ca/thunderbird-78.4.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "269762ee175f69ecc9ffdeab2ad66788d24d2b9ba1e8d05f74ff222848077735";
+      sha256 = "1516236c252f22933adf23bfe93d73fa272a4574deb674aef6e1f35006a6cc50";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/cak/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cak/thunderbird-78.4.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "735baa9541d1dfad828db27a2cba54caa681973f792c0712300e4f952803dbfb";
+      sha256 = "c46508321d32c468d067d86c04973ca345b09b0e983954eaa123d02778d61fbd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/cs/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cs/thunderbird-78.4.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "04763e1461106c76b51c31522de9bd6376d531c9f93e79d4a4c00d5bacb9de29";
+      sha256 = "227209429c07238f38d334e5ac8a5fd895a4c87f51b21b4376df89c50bb6a789";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/cy/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cy/thunderbird-78.4.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "974885f8e17be1b744f65c0e392747921508d7e0f286ab9fa20580cc205a56ee";
+      sha256 = "b272926205e5470df8aec8b22d6733e4f47993e76123fe81d4be26ad5a153062";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/da/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/da/thunderbird-78.4.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "f0e13b8952478b5ebc46552405421b796d645fbb0a16aa759a045b48fd43739d";
+      sha256 = "13f9fe10c84d2b8d8d0215cb58a9852486741f5bc8c6979f0a701bef14a70f4f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/de/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/de/thunderbird-78.4.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "735eb8e1d318e09d9dca6560074960cf9ce2fcd5a720754608886f6e51e87266";
+      sha256 = "590f9a5a975544d2effedda942e3989a13be23b95f4e6707f9905fed3fc08214";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/dsb/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/dsb/thunderbird-78.4.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "b1b5fad405049cc62784dbb6e938cce6492df3b620c25a0987a594a88d0caaa1";
+      sha256 = "5b572c847f9ec76b25c225652c23ecf8c56523ffc3071b437310f0d8f9049b05";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/el/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/el/thunderbird-78.4.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "1bb01c5fa05d3dae7d1216a0b3e01354655e96f728f63b8213d1ac4ca08e5b8e";
+      sha256 = "7cad76ea5a07dce6bdd3db78485f83a998ff27037f8ca68f8617659a06910a05";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/en-CA/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-CA/thunderbird-78.4.1.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "cc7280af5ca21c82ae8e4fbcceac117b1b3c2a2e95db418cd60322161eeaa0ba";
+      sha256 = "f261b38fbc8d83c20be63015a444644a95f7d8b6584fcfc193145abcc69a4164";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/en-GB/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-GB/thunderbird-78.4.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "6bf5112867c3493df18880858e483b684946b657bd10960f55a0e55bc364d8a5";
+      sha256 = "5c0c364b1408182c0cbae1c2d05041781e2e4f3a17fb1735d61196c9b647dba4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/en-US/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-US/thunderbird-78.4.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "24780daa2b17799f263a6c16b770b0e6710d14f7f1f502f4868fe48d81ca8e48";
+      sha256 = "a152c3b8c6ad4ba3a92a8a1f909b99599d8c3ded62b57e9721fb333b47f6509d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/es-AR/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/es-AR/thunderbird-78.4.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "ac6e82b950f6cd0d7a964815c58a28f602580813ce29cb33bfcde36205d06def";
+      sha256 = "dc06a64e0b20dd174d6158e5d2f393bf6a6907f8f515120220bb2a8480f58d1c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/es-ES/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/es-ES/thunderbird-78.4.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "67a03e3c7b00d5e0953ae9eae031ddb42337e23ff9e65ed7c0b759e1c2fa4426";
+      sha256 = "7d3b7ff0ffb9b19f10bd7c2cffb5dbff8216c65c01fd4032ba5b7924c73ce343";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/et/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/et/thunderbird-78.4.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "fe5af4823e15422da39c49c3fed60fe460ad23b7c78f6b4fc85ce247a09cd0a8";
+      sha256 = "a9a8e610bc1c696137ee650fa11f2cbf8dece4ba32d1f0961ae697f6433cf1b2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/eu/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/eu/thunderbird-78.4.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "94699170301daed68a6d8554816c37cc8c51d72fbd1642cc5a066ae4d5a394b2";
+      sha256 = "6835e8459b4191cd4bb5ae8011d032d475631e7a532450b98f0b087ed0a80fb6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fa/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fa/thunderbird-78.4.1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "fd22c75cb11bf3fe1a3d2faec1cb7a2332131ac62324bffdd51cc8f03e95a372";
+      sha256 = "7cfd8681a7ed38364a823881fbb42af8cf33d17bf911e9f5b97dd18102b412f5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fi/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fi/thunderbird-78.4.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "df3632903e77b9eb5fda1ff1d8a155b1f3c4861a8821efeb1fef4d39878a9349";
+      sha256 = "8c84662afb60e3dc94eace5a493f7feef6598b78613fe99f195408e4ee2b0a11";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fr/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fr/thunderbird-78.4.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "5100b9facddae8451550fa0a65b9bd345066e7e465916ed3728b40cc9ac06e65";
+      sha256 = "24449816c690757b05d1913ff1fa12eed47f316ac13c76a195ae0628c6950da0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fy-NL/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fy-NL/thunderbird-78.4.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "40c7fe9bea5b5edc5a3e62f7d1cf18ae036544c0172954440d036086f90ee119";
+      sha256 = "9a0334f032333eda16cdabd5dffb05f5a22edb1dcf4bcd0b47495defd0d9f3dc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ga-IE/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ga-IE/thunderbird-78.4.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "4ec2f91ba73d3a7ab99d69af2a7d99cfb2280c3872fd4dcd7436ae9362586d06";
+      sha256 = "33e5a54e2259984ff29d3394fe936b5af8830e489e0775ff36eace4c6b3dc145";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/gd/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/gd/thunderbird-78.4.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "f6d168939a0157c2d450c43d818005e3b9a59e8caad5796492e8078947234b29";
+      sha256 = "b91c4b3aafa2166cd27c52977711c55aa425f68c5f7cca64be1dd07fd533bc05";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/gl/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/gl/thunderbird-78.4.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "2fb6b4995f722e82503bf88fbb3b5275faa4d392bfa5832735ac1d40bbe3ee38";
+      sha256 = "d1c03b3b92bef4f3c94518981cf99840944c8a36aab7b2cfe3f72f1f0e57e045";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/he/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/he/thunderbird-78.4.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "70f0bf4db60ad4f1656f0aca1575fadce3a697634f60353bc3d63e3336225d2f";
+      sha256 = "7fdaf0e83eeb39b66a6d1c2600f2c6f1b69ec4f67dd7b33a39132e838a699f06";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hr/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hr/thunderbird-78.4.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "d37ac64cd63a4cd66fff1bd30ee3643be75cb977581f2182a95c27a16607f3a0";
+      sha256 = "4ba99eaa25964bde6108eeab702b096ba50b45d8db7e36f3203b0a71cc1e30cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hsb/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hsb/thunderbird-78.4.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "85e823db225258e9f74e04c61faa89e7c9553445900083f22b7aceb22ef3d901";
+      sha256 = "187a5f2b2e1b16fad948356f31b2ac903fe318432d9a3f105055c23d1225d11b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hu/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hu/thunderbird-78.4.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "da897b48a2e4a5a3734016ef18c503864792d5c0943bcb2644c272c1a7c63f16";
+      sha256 = "8f6b79692143e6e27cc844985366004d06c8e55184a73477fd20020575947ad8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hy-AM/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hy-AM/thunderbird-78.4.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "dbe1276b14b5864be5fc2de3708ea320d2dcc80eb654e9bad56950f818903484";
+      sha256 = "4066683e4a635b163b9b14e1921d834b37a95cee8dd04fc6885094c5e0394dee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/id/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/id/thunderbird-78.4.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "86c7be9b6385ef437323069a7e2497b3a18a552af9d9c4523789be4ee2e07b22";
+      sha256 = "1fed6d3a9a11d303db2f2c6f7a92639b92ca144ce3b45eed4607696ea4617511";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/is/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/is/thunderbird-78.4.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "8e062c75b579d52d1a887d2165bcd3eb1d0c4e435dffc05d0d76d4404dd061eb";
+      sha256 = "a627c95d2284b4e828a466865aa19262aa84a1a2267235c3f62d13c52081c580";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/it/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/it/thunderbird-78.4.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "932de1926441066a472d5e68b933fd4035f2e858fdabd4b9d4e71ee6e64202a3";
+      sha256 = "6b01e88da702deee95a3a6d526e563e854be7ae13414fed3a2c9cc427e906ffa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ja/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ja/thunderbird-78.4.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "2bacdb192fda85f10f747a8c8a2ef3bc60345075c1ba33947594fcc66eb35e5a";
+      sha256 = "3b63cf4c45945f4a40159a417ed217b77128905de82812fe2165c0c5f66410a7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ka/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ka/thunderbird-78.4.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "110d71951f0f3235ab63c02e8d979b2777de4abd4906409b96107fac1f6d7466";
+      sha256 = "c9d11ae298691f2e302078f865b047b1c2b568ae763495fbfe2f2d4f04a9ef6a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/kab/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/kab/thunderbird-78.4.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "f765a32900f0100f03aac4cdce7f33abb44e53911011cef6f6db8f9dddd11124";
+      sha256 = "b6367ccb74b2ced8708ca9f4c2c06aeaaf4f3bcba0b2b2fdf2c552aa10fcfc03";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/kk/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/kk/thunderbird-78.4.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "9af2ab317e0736e0dbab419f5061a6a5c83e521d15f38911455a2d57f6bae945";
+      sha256 = "99ece9975a3981fa33887d3b5d60cd6874e1dab7c51d830dc0d13c28c103ca79";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ko/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ko/thunderbird-78.4.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "06669829857f1c49acf7a58f6a7f0e5a4d8e4ce93703cde0d36525f5bb9697cb";
+      sha256 = "d81c844cbd490e5eeeb2739a9b040062baf3bbdf13ddfbceb59b5630019b935d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/lt/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/lt/thunderbird-78.4.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "f85e547d17b6bae2597d4b780b14f9076d70dc7c63ae85427b54c01f0c559b72";
+      sha256 = "56b5813a5b0debfe90fa2a20fb9a13ea210e2eed37f180f3e23e851f871241e2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ms/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ms/thunderbird-78.4.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "e21639c89686480be875a0514c1b1d99fefca6b79da80a5406f37a63e316348d";
+      sha256 = "8dc3f341a69b9ef458c1203ff15779beecf3db2dede1cd8740ee19a9552f22f3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/nb-NO/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nb-NO/thunderbird-78.4.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "652d43cabbab6ab158b3d3ab70cf83d8ed3ae3524232aa340d17c248dc5fa869";
+      sha256 = "0fe431d3773de39431cd777cf301d2c3d8074dd41596bf6a6f1bef96870413b4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/nl/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nl/thunderbird-78.4.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "2c5f173545ef0ddd0c93c921931850e9a7f457575188a91d243245236fe09384";
+      sha256 = "4127bdb6338210d9928fc84838a57cfb731aa3254aa5427471deca00bb12beca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/nn-NO/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nn-NO/thunderbird-78.4.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "f89082f26cb871befb4f8c82c31a9d1cdd5587d20ad3a9a1e78515f947ce4271";
+      sha256 = "cf0c6d67115ee36b80010d93d50991a544af332ca19f1ed1199f49c7dd125049";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pa-IN/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pa-IN/thunderbird-78.4.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "75d7f3bbe88ef2bab33e62834a765f814f75a28e2277afef2517a91be98201ba";
+      sha256 = "283c2be7f9bc0aa3d505f1838f1c03721a4b956870ac2b1e762b966e87767ce0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pl/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pl/thunderbird-78.4.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "c016668ef5f80043eb3e3eff6c8d2327adc3ed86375e81318fb8a4a9fc4689bb";
+      sha256 = "4c07e4500ad4c0d698942e3c47ced3bbd6142e4a70292629ebbe53ef5f1816f9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pt-BR/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pt-BR/thunderbird-78.4.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "637a97f3b584e315ebec350a08fa54d17cde8825385736a2bc4ca1937dd552f3";
+      sha256 = "c6ace3452d1720681e668da50d16811286c1e73021bd06ab9b538c6f6fc5fda6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pt-PT/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pt-PT/thunderbird-78.4.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "9719af4fc96ecc0e01f8ad4829f8a94004cdeb518d10f12deb41073f6b0d6f32";
+      sha256 = "b9ab4d38b271e2987b5e425a277042dc149794cf461283114553133e7fed5f06";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/rm/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/rm/thunderbird-78.4.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "d3467e689f512a3032f9dd8b022af58bf7d61dcdcb1c69317629f0c0b37aa2d4";
+      sha256 = "50fc69135b789b2bb5d8008292d3fc25f1a0a30bba35c6e24ddfeabe55231407";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ro/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ro/thunderbird-78.4.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "25985053e562792ffdc5757f201d6171cd7f30199eae7ae2f50cf39b5090feeb";
+      sha256 = "1e050b33a942dc815e739c57944a0d705982e18e74637172b0366a9b06916f7b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ru/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ru/thunderbird-78.4.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "2c0769be95e0a21471197a1f1b979bd36b9793f4242f7ac329c7fe0fe88fc5a3";
+      sha256 = "c295bda57db84e07f28affa4201c4f612478efce733cb9c69962f6d7a797218b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/si/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/si/thunderbird-78.4.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "2a6d7e47e92166ac1636495e5cbd1849285576cdd812d650767130730002aa6c";
+      sha256 = "63dc83cfab8be94893ca6a0d60e448d14db1afcae55192149a882456dca77e9a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sk/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sk/thunderbird-78.4.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "5d0de7356dd46a9ac1cb98254167fa7be34b6897e5ea69ca093e71a850d53363";
+      sha256 = "5ab5ea76649582ddf10fa77bbb95040d157883e0905df72f5bc0ae79167d97be";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sl/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sl/thunderbird-78.4.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "8c7e69e7fbe49ba34277e8cb7cbf45eeade086eb460a92e243698824cdf3d5ce";
+      sha256 = "da3f8a30797386bc7c9ba135ba360cee01143bc76a2315e7a2223bab90e2283e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sq/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sq/thunderbird-78.4.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "95cfe7b956bb590c790c156f22ac3c5cdc1dd3e4d7b64422583597fc9ccd8c28";
+      sha256 = "f2f9639c4b4dc4bfba476aa92814fee65ecd3fca27652177614d1107e4200246";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sr/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sr/thunderbird-78.4.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "82573f011da92f7d93d6cf0a700c9eae31a46c6d09671afa63afa533f063e5bd";
+      sha256 = "3bcad0c845e4481a22c1b330b6cd94c3c6fc46c33597ce5af0594368579a8260";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sv-SE/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sv-SE/thunderbird-78.4.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "5fda7b6e8095bc456e684887a82cb2adcc14fdfdd9f14731f2bdf2789eac4930";
+      sha256 = "9b09d4ab71000429c5015dd8a0642cfe0eeeaa785d2cac6e876b1cd6aadaeb44";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/th/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/th/thunderbird-78.4.1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "0e33b43cb7fdb2ae4c30480e264e00651181f2034af42d7a3ac2bfb57c148896";
+      sha256 = "b33e42f0271ee84a581a737513197d5f036695706b19697a53000834c199c75f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/tr/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/tr/thunderbird-78.4.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "05019602190a28ecefbdc5100b40409d3d6288f076d589136724d07e111bf324";
+      sha256 = "f419ed9f0f06575da2f89486d830ab7fd2b439dcfcac92f1b31c573901e7b9ea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/uk/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/uk/thunderbird-78.4.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "2940500895c734857b258550b85f846e9eb5be68b6faaf808ed7a9867c423d14";
+      sha256 = "bcecec66a6ef8b928da2aa5d52d89f4f1587d4e45bf0e836b71912b0e5a43f7c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/uz/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/uz/thunderbird-78.4.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "de82b265c6e19495abc70c36f377cef705137f352da0aa7d01aa874e2a9f1f70";
+      sha256 = "2b33f40b9da386e61f3bdcacd9c16fc06dac18d2b36865292700744dfbe2da25";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/vi/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/vi/thunderbird-78.4.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "cf02606c0eff0b941c1c2ef654e250d5d6a8cb7deda752468e779af1b616c0e1";
+      sha256 = "b5d005c45221c41e1e81234b755f6a9d380220cc03f43012c40440a0378c19e0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/zh-CN/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/zh-CN/thunderbird-78.4.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "54a1a869a746ff3af8d5ec27b11f1d3a0efeb49480043fbf776e9646b5be944d";
+      sha256 = "c08765cc8562cce08b4cda04123cd8672f5abb130b597f36f4c143d74b09b9b3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/zh-TW/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/zh-TW/thunderbird-78.4.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "0c9530adcb5029ae570a8d25d790f243c0a3d6ad7701ed071fad326d3718bea3";
+      sha256 = "56f84ea43a5288a6cd34f8de5f69dde05737474f11c70d638981ef2ff4ea5bfa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/af/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/af/thunderbird-78.4.1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "29b39333cfd9919830cecf1b0043faf4dd829c36554fdcbcff6a8dbf11882060";
+      sha256 = "95384cf3d0ab6ad8d3bb133e8ff7c1881523c0f7be840c5ab6016325ebc7f9ff";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ar/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ar/thunderbird-78.4.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "49896345d391f22f262592e055b2bc5fc1852d5fe1f9812392ef09b9f329afee";
+      sha256 = "c2cf87579a092bec69042b35743574872b8b791d54628c35c28d44c1dc605b6b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ast/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ast/thunderbird-78.4.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "71a952590eec188661f8cf95f62efb2c9f2465aadec361c990bb62481938b128";
+      sha256 = "127ce24b2c06606e9567e2106ba5cb9628d8bda10620b01cbfe60bc287977c94";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/be/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/be/thunderbird-78.4.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "d99a81043f6c158376c960d0dbd60f6d2e73ee1e6a015aee55ff42786e58fc21";
+      sha256 = "e8acd7cc25f91af91caee7487598cf1f60512864cf1fee714d2289a65f0cc195";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/bg/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/bg/thunderbird-78.4.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "1226b669b2b2e7c890a1de0a628e663069c2279369587a8b819756584be2ba0d";
+      sha256 = "461e4ec0b0f3dcb78426a99f0b8dc32b14dbc561b89e8d422433f5360425448d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/br/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/br/thunderbird-78.4.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "2f656a4269f37dd8513cf2f0b799d97225ffe55b00e778dbeedac66bf7b00d47";
+      sha256 = "ba3902a457d0570d3eeaa63cc83a67e35532e547127b71f38781158bc3cc5e60";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ca/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ca/thunderbird-78.4.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "34dcc816776f2da32bf7412a802a8d3d7a0b31afcfb1811c617f1295ced05adc";
+      sha256 = "609de3623c6f4075bedee741533843f6f9fd1afc5933fe3a8709f5c16c7d7bc5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/cak/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cak/thunderbird-78.4.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "f9fb448edc5238b69fe3c08c665a30320e5662c1df78101ba4807d371a6a15d4";
+      sha256 = "4a5aa707eca53cf5490189a09d222abaa8290ea3366d4bf081273c23e89b3fc0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/cs/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cs/thunderbird-78.4.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "156c36781f43fbaa3eb5d1d32ca7d6b3c9573261757dc9c78e8cf0be24a6c717";
+      sha256 = "0450c73284b274af21f3f0c4c21842e11fa2a86fcb38f96332c1ca8984149c62";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/cy/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cy/thunderbird-78.4.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "0e48e453cddf00929e189546f0dd478e273dcd8bc891fe875f553825f0b4fcc4";
+      sha256 = "5686316ec53a76dab272934dbd274a47802c5c31f2ae8719bcf85c22e12cc3f7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/da/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/da/thunderbird-78.4.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "e614911f79a2a86055e6914aa0f4922979eebe4229b26b18f6ff31cc6bb49c89";
+      sha256 = "2025f5946989905fd197fe5bf6c51160e7c9d281d6cfd220ea3ee0393cc54ca0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/de/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/de/thunderbird-78.4.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "a8c916da07945657672b5b71a722485fa7117dd912896bc9eec8b9b82dfcc48b";
+      sha256 = "906e8a5de0aa12b496f4d4447df25432b11c88d79b7ab4a55291a9d65434aa03";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/dsb/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/dsb/thunderbird-78.4.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "0b3ac7ec984e26b66cd3c5df733c3cac6b83f4388cd65344dc40310651798c05";
+      sha256 = "d6bfb2b790d8391344916515d1cc6ca2eb68a3e58934cacba14e77788aec6b09";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/el/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/el/thunderbird-78.4.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "dbfd90c1810dcad51bda6a7d2de6a132f428a5c6151c107cd09a98a48b2ce98d";
+      sha256 = "5f96345a945697326b24fcd73a96fa2f49edb66b02f4c23b6d392fad87935e08";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/en-CA/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-CA/thunderbird-78.4.1.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "3ccd8193d486596ebd70e3e1803563a3a8d59ca25c29eeaaeab78ab78cb0e72c";
+      sha256 = "b57e44fd16e33b178778a60f0bd47519585a3e648b3b621f1fd693836c5fb598";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/en-GB/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-GB/thunderbird-78.4.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "6d74ef15e0196a2b07302f40bc3992acc8ffc94ff7d90433a00d766a0840226a";
+      sha256 = "6f656dcbd7aaab5995beb11a9847e32f8820199272e2f9ce27583cd3d7e50a76";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/en-US/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-US/thunderbird-78.4.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "718e57f9b1d7f1ca5c52dfa8aa109f8cdda279cfb6dea649add651b6637fc6bc";
+      sha256 = "8c6bccc757df947bed74a3f7448a3885932a4f6c21d24ab6b5c7a94ab83ebae5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/es-AR/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/es-AR/thunderbird-78.4.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "26dea055b9c6ea2b8f7e15b0c93cd3d880c83bd1c9f23f8d572a92659740986a";
+      sha256 = "55bbc629ceadf359e0ad05e763a31479f6c57c38f372e55812b028681a5ff32a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/es-ES/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/es-ES/thunderbird-78.4.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "90d115cb34ae852332e5bd792067c66f1bad920721da68f59b38a2a86a8a0105";
+      sha256 = "bf30dd8882b2b35bfaa62a6c4b40a823333476128a6d5dd3e3d2c8eb16303b9a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/et/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/et/thunderbird-78.4.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "a82aed816b1ea065e21120a8e6e0345c477b90f9c672c04cee9d15ffed85ef28";
+      sha256 = "5b977eab7f203e230d6a03b36afebdb32c481f1eb8129e454977791469ed5651";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/eu/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/eu/thunderbird-78.4.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "7f1bf5742159e15fd566827db713421778262377a8da9ac269fc6af635f1b20b";
+      sha256 = "f2d606a6f825640c0f344cf470d87a1dea5fc6ff538239ce25c3d7c9fc76237d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fa/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fa/thunderbird-78.4.1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "25d97499486a7c3d38c4686f7ff5daf930694f6614d3d556af85c3cb99193403";
+      sha256 = "95d0d3d1b456c035cc6ed09df970e9e772a71af3703f05e9388e844d7f80edab";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fi/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fi/thunderbird-78.4.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "5531179571b0306ae2c1d5f4af40047ea9a5fdf65137bc7c255ee7f5dae2bab6";
+      sha256 = "e0be2532774bbe017a6091d7e1ec79901f692c39e04e01fe4094f7c8179fbaf4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fr/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fr/thunderbird-78.4.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "12e33246e17aebac0547801d5d4e23db0523ff260b5345b8f0a19fc5cf44f2b5";
+      sha256 = "48cc16a61958160f369b32e8a0dcd2979ee65e18efe3d1dd3a4af1109842718b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fy-NL/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fy-NL/thunderbird-78.4.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "50c6dff9614b113ea57d4c75dd0768a8524743a7b9f462f84f27f10daadbc1f5";
+      sha256 = "386d0a2ed01b158f0fe18eb6820ff9a17fbbea61241eaf873782271ac84eb103";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ga-IE/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ga-IE/thunderbird-78.4.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "6c6229aa064098560b13369a0d11133156d47193a8f8b2fdc241fbcba3cb3f9c";
+      sha256 = "c0c15410e6812e8652181ab347b3fe60fdce3b5b9958d54ef3f96ecc46a4d344";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/gd/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/gd/thunderbird-78.4.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "6e5f686d98b02bc97e14f5788eac7b93e5e2652e9feaab0906cb026a883b1485";
+      sha256 = "3989f0c0f87ebfca3e4cfad0ac9ca2964791ab8f1163f1bec340444ae4a72a7b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/gl/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/gl/thunderbird-78.4.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "2ccde2411bb2c3e4b492b4cacbe8d756dc22c2164fbe7364bc2381c1ff582f75";
+      sha256 = "eb1b58c93e492a79f92660909e671ee7ec504701b8e074d3dc6f3d3fe3619660";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/he/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/he/thunderbird-78.4.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "30fe226741e47f86f07c5acbb8fe3d2aa2fb7102fb4743189f12612c817415c1";
+      sha256 = "f584e117ba4fbfbb7d2c28b68377a88aad87929657141adac5ce960bcf5f4fa3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hr/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hr/thunderbird-78.4.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "4230396816f72ce2784bab21fa2fe731ea378f1ceeace609e0423e2b5e7ea83e";
+      sha256 = "633eab2f8ac99426dd85b614f04d96509125f0799c187305b7678496d9ceff0f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hsb/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hsb/thunderbird-78.4.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "155a4e98c597f7876ab44276ab8814ab185a5a59e1fdb743260bef2f78b27e4a";
+      sha256 = "80e4b98bbc9874de9b4c8e35633f6eea7b5707cfc4943df7264cf0bbfba49d99";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hu/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hu/thunderbird-78.4.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "bb0b46dc74b926e9d13c4bd8b0371d730ce03aeffa5c41689eeb797ae1ce4382";
+      sha256 = "5a9339a876a7e0dced6769a99a948329f6eaa400acb6920a24d06695120f682a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hy-AM/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hy-AM/thunderbird-78.4.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "7ee0ee79ac2143fe3ce8930c3916f201910d6d7a40437fdc49a8c617d49871d8";
+      sha256 = "286542d67a76a6e8f0c34e7aca9c23c8922bf85f8be77c913285e208f8b195a7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/id/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/id/thunderbird-78.4.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "e1a4072dfdccfdf35401e9a58e77cbff2277703ff2c78a52fc0df801bca8f91a";
+      sha256 = "930cbbe1520c544a25cfbdf8d10b4e6ae19a812c8a20ce51053ba0d5fc2b4b24";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/is/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/is/thunderbird-78.4.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "d4d63add23724c58fd92d992165748f7002540f73df591914540f6361dc0089b";
+      sha256 = "7fca3c4c9d3a309ec182d1486438973741fe2f1e39afd3ccb769256657db20a6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/it/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/it/thunderbird-78.4.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "28ec9beacfb8b27b80e1f1deba83d81324a2d3baa0d9572a41a94f920c8c60aa";
+      sha256 = "3b44f63975cfe7460f3eadd9f71f13db9ded5d9e5622ec322f556692f979434b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ja/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ja/thunderbird-78.4.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "ad1f9e091cfd66683964f8d683653b3134068174daf24fe061aad00d0c864176";
+      sha256 = "1284e52cda834b1ef9b5ac6a1dc29858f6e1519d0fd47d330744c0d294338650";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ka/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ka/thunderbird-78.4.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "9074e7b2eb10943f6b87e79be9ec9ae706eeb4300c85ffe456bb34f11798b81a";
+      sha256 = "b12a79e20fce3db2541dcde61e04206e82530d1d79b58637bfcede87294fd801";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/kab/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/kab/thunderbird-78.4.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "7b7d17a26dc9914d46de8959c08d56ed92b263d3eae383ca71d45a1b37a9650f";
+      sha256 = "9766eab276e77b0e33ad7ecbf8f26b84aa2a079a4fc9e4dfc992c41074513e40";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/kk/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/kk/thunderbird-78.4.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "b38db92efa1b4bc1067eeee7eaf7307d6e86e6c6d3f4dd1b81496768c981d5af";
+      sha256 = "aec202db7c28ae69c9f7684a2e4f30a16ab29ec983aacb32bbe4b5bd31b76e94";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ko/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ko/thunderbird-78.4.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "951a2e6e2cae525618646f8f054d127b32a535028930eeb3be7dfd2720c4ccea";
+      sha256 = "b0e553c14925413461a87f1d81591bfa4e2ce2c5ad87e8ec609fef76ba4f17d8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/lt/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/lt/thunderbird-78.4.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "5e76866c25f63aa283e54c871e1014a10e4ecdb8182ca6bc3ac1d16a344ae8f8";
+      sha256 = "6036247e3025c2b513762577e7de1d1eda050572f674c31391e583ccd16e80f8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ms/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ms/thunderbird-78.4.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "74e28f4ed81a233bd8aa721515667b31e83f7a6d6bad0aaef421f1f1e4b0c4c9";
+      sha256 = "0852cb745130e22af327e2ce39249751ed482c8216c18f4545bd294f4afb4e29";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/nb-NO/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nb-NO/thunderbird-78.4.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "4cfa6097b0879de04314773d96d3e03aee3b7e1680e97cee3dbb6fca9e4010ca";
+      sha256 = "eebec58d3a20956894711266715ce5a4afcfd44b5eb7b334dc0c22068fbb10a6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/nl/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nl/thunderbird-78.4.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "e097065367e8bcaa331803c779ff71e43dfa7dcc5b516fd5d73f60b1c614c7a0";
+      sha256 = "0c6d35960d89681087bcfbf403ff727f53ba2e67de9c69d04f96b68447b616d8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/nn-NO/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nn-NO/thunderbird-78.4.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "e3bc6a3754f13db3dc5f70c3fd9b70b4250be494a47c7d20546dccb57b914ae5";
+      sha256 = "b761b921ba2e604dcde7ac0e03a83ef29a3311309cb95bc39801b8bcfd80ef98";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pa-IN/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pa-IN/thunderbird-78.4.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "80a785335bd49d5d0e8c669a7d548c0e077c413c184eb50133aaf5790fe1148a";
+      sha256 = "fa350ad64a3ff760a6e2cc6ac6b6ad1d6b9ad300b6c3420477148152bc207499";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pl/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pl/thunderbird-78.4.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "bc20f221babef7c3a3992d57ab5a3afcad12faa0263ff8978c96a1267af54c28";
+      sha256 = "8b187d44bc1364dc76258ff3452610483b2ab3d060c9de43e47c25fd3103c5d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pt-BR/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pt-BR/thunderbird-78.4.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "6dd040a2046c418d51bd7103d93a50b58e3345de5ed0c8917c0a8a8c7bf87c7c";
+      sha256 = "1ff199f91e49d72bd9821bfe3e2d33cb4a750a6c46aaf16a80554c195694ed43";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pt-PT/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pt-PT/thunderbird-78.4.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "45f67266e6af96dccae07d6db4f5d62c3d6d26e1a76e4951f08591c664122359";
+      sha256 = "098043202612b362a16353c84a5b9e662331c2311679357592b5a77a6690b68d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/rm/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/rm/thunderbird-78.4.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "1d53a7290332375212c0d58af23265d59502bce1a6a4629b56bc86d048be65a9";
+      sha256 = "ab9bb22e53da48744885634a14886ddb23dd5ccab376e5323824daa3f22ae0cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ro/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ro/thunderbird-78.4.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "de3e5496ce5b8c4dff6fcbcf2b8a47b0c81d026fb5334e2668b8f9fc293c5216";
+      sha256 = "fb3e61830c5693c7f3b84eb4e3c60ff97324c5654352008aabbe9f16ea40cb0e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ru/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ru/thunderbird-78.4.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "838b9a02684541ef7df67a23b9966282ff9d8b12b64dfcbcfea8e8381b24951a";
+      sha256 = "f9fceef81a605ebc66fd90e2759205c4eb7160095312579eb7543b4293dd7a7d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/si/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/si/thunderbird-78.4.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "202f815bdf7538d50f4770e601d10c8a1ffddb042a3c7dfd1a1b65e9b5dc5ec6";
+      sha256 = "0903c3d1bf790c5c10167839e3bc60d80a23e4230895703f7c931856cb617038";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sk/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sk/thunderbird-78.4.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "44c5aa3723919798493e7f43c927ac48891eecf94a69c79b86be107984e9e068";
+      sha256 = "2018e5685fbcb5c2cc8925be39b04f6d98347cb59446af62846378818d6435f6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sl/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sl/thunderbird-78.4.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "2d5125d9625f916788265db46ee1fb47ace3b6099dae26ecb734aecf36160949";
+      sha256 = "d20b13b5caa2f5c9c431f3e69095f094800fa520b3a5a57c27a4c9c565961fb8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sq/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sq/thunderbird-78.4.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "2aa337b0fd8ccfe86feadef605ca863499f21c3ca7f194121064fc060d5a3de7";
+      sha256 = "164041c3958f57f90d17fe1457205a420f326c17e88da0197732435cf6a5dfca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sr/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sr/thunderbird-78.4.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "fe690670c6702ed63684eac68a3f3f29f12bd27af7d34c63af768e0362a1eb11";
+      sha256 = "8ffcd2dea1b4980519220a27346b5c0fa955b89580836c38711c21c8eb7d26c8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sv-SE/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sv-SE/thunderbird-78.4.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "74525ce44ca330e8fd29785842992c62cf3b5494675ec9a8148ea14d945fcaae";
+      sha256 = "83536011e7bfe2e7a0a760ed879e041b4caa3ee27e95829331faefd29e8deebb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/th/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/th/thunderbird-78.4.1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "0503e2ed79dae95302bf2d9d8055589ed1ca511c16c35a9b84445548a7a306d4";
+      sha256 = "13be237b698dc9b468af7a2b8ff062118421a7b798771f1db4f82bcb1098f83c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/tr/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/tr/thunderbird-78.4.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "c4b14f4f22549c66f5f445a2ad5826d0e90332c9d76783851078625245625bbb";
+      sha256 = "c70d085f6ceed58e7ea55ab01d121627a55df2f5e961ef160f4965db941660b3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/uk/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/uk/thunderbird-78.4.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "cf06114027f9bf14ef506fe37e6a7ef6a1cbdb201cde061a754c82d9b3ef0c39";
+      sha256 = "c1b7b0efe7af03a488c80020247e2d8038d6dffa313188083bb75c1bc09c35fc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/uz/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/uz/thunderbird-78.4.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "c805d88694b105412f05dd840e038edfef90b4a48b5a79b0bac5b5575d50a14a";
+      sha256 = "f4b8d20603c5e1dcc72760623803fc4cb34fffffd7b394c1998b860b5e3bc129";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/vi/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/vi/thunderbird-78.4.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "ca30574d981964eed7c3a100dd76f90c518a24d7dcde74f0790ede4a0a8d3285";
+      sha256 = "6d9d7885ba742ae28766ed98e64aa59892ffb51ad67eb9bc47d5a3974b8a7f50";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/zh-CN/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/zh-CN/thunderbird-78.4.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "6cb1566d330e36b03e86bcfe96ad887fee511ba314167d235facba6c47871688";
+      sha256 = "e47c2e9b66c99c8ba02c60f739d31ea2d679cdc4d6f1f407257ef3372cabf364";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/zh-TW/thunderbird-78.4.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/zh-TW/thunderbird-78.4.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "7af0d92565a54bef6c962dd8b9b100198e2cac8d47ede749bade87c30d5ee37b";
+      sha256 = "1cbab249ae670a204e464a9082365967a74ce2533bdab60682c14fe65dafba16";
     }
     ];
 }

From 56fb786f8239c76dd90dd100d06987e9acb9fb42 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@protonmail.com>
Date: Sat, 7 Nov 2020 02:41:16 -0600
Subject: [PATCH 1715/3942] looking-glass-client: B1 -> B2

---
 .../looking-glass-client/default.nix          | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix
index a0ec55dd895b..74370aafa40e 100644
--- a/pkgs/applications/virtualization/looking-glass-client/default.nix
+++ b/pkgs/applications/virtualization/looking-glass-client/default.nix
@@ -1,36 +1,30 @@
-{ stdenv, fetchFromGitHub, fetchpatch
-, cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig
-, libX11, freefont_ttf, nettle, libconfig, wayland, libpthreadstubs, libXdmcp
-, libXfixes, libbfd
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_ttf, spice-protocol
+, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp
+, libXi, libXext, wayland, libffi, libGLU, expat, libbfd
 }:
 
 stdenv.mkDerivation rec {
   pname = "looking-glass-client";
-  version = "B1";
+  version = "B2";
 
   src = fetchFromGitHub {
     owner = "gnif";
     repo = "LookingGlass";
     rev = version;
-    sha256 = "0vykv7yjz4fima9d82m83acd8ab72nq4wyzyfs1c499i27wz91ia";
+    sha256 = "100b5kzh8gr81kzw5fdqz2jsms25hv3815d31vy3qd6lrlm5gs3d";
+    fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig
-    libX11 freefont_ttf nettle libconfig wayland libpthreadstubs
-    libXdmcp libXfixes libbfd cmake
+    SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle
+    libpthreadstubs libXau libXdmcp libXi libXext wayland libffi libGLU expat
+    libbfd
   ];
 
-  enableParallelBuilding = true;
-
   sourceRoot = "source/client";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mv looking-glass-client $out/bin
-  '';
+  NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem.
 
   meta = with stdenv.lib; {
     description = "A KVM Frame Relay (KVMFR) implementation";
@@ -41,9 +35,9 @@ stdenv.mkDerivation rec {
       step required to move away from dual booting with other operating systems
       for legacy programs that require high performance graphics.
     '';
-    homepage = "https://looking-glass.hostfission.com/";
+    homepage = "https://looking-glass.io/";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.alexbakker ];
+    maintainers = with maintainers; [ alexbakker ];
     platforms = [ "x86_64-linux" ];
   };
 }

From c8b7c9bf69053850d67b74ea3f3e3c2de3733fa5 Mon Sep 17 00:00:00 2001
From: ilmari-lauhakangas <ilmari-lauhakangas@users.noreply.github.com>
Date: Sat, 7 Nov 2020 10:53:46 +0200
Subject: [PATCH 1716/3942] Remove vigra and glew as obsolete LibreOffice
 dependencies

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

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 111e50b7d454..2f961f43da0a 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,11 +6,11 @@
 , openssl, gperf, cppunit, poppler, utillinux
 , librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus-glib, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus-glib, clucene_core, libcdr, lcms
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, bluez5, libtool, carlito
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
-, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
+, librevenge, libe-book, libmwaw, glm, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
 , gnome3, glib, ncurses, epoxy, gpgme
 , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ]
@@ -394,10 +394,10 @@ in (mkDrv rec {
       libXdmcp libpthreadstubs libGLU libGL mythes
       glib libmysqlclient
       neon nspr nss openldap openssl pam perl pkgconfig poppler
-      python3 sane-backends unzip vigra which zip zlib
+      python3 sane-backends unzip which zip zlib
       mdds bluez5 libcmis libwps libabw libzmf
       libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
-      librevenge libe-book libmwaw glm glew ncurses epoxy
+      librevenge libe-book libmwaw glm ncurses epoxy
       libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
     ]
     ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])

From 13d86cc8e74dab67e9a110905a6e33df9bb8e869 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Thu, 5 Nov 2020 21:21:20 +0100
Subject: [PATCH 1717/3942] dbus: docs: make id's reproducible

With this parameter, generating docs from the same sources will produce the
same 'bit-by-bit' result each time.

This is particularly important since dbus is part of the 'minimal' testset at
https://r13y.com/

Also submitted upstream (though in a slightly different form):
https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189
---
 pkgs/development/libraries/dbus/default.nix       |  8 +++++++-
 .../libraries/dbus/docs-reproducible-ids.patch    | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/dbus/docs-reproducible-ids.patch

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 376fe9f64eec..b3723f1b4d21 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -30,7 +30,13 @@ stdenv.mkDerivation rec {
     sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp";
   };
 
-  patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
+  patches = [
+    # 'generate.consistent.ids=1' ensures reproducible docs, for further details see
+    # http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
+    # Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189,
+    # expected in version 1.14
+    ./docs-reproducible-ids.patch
+  ] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch);
 
   postPatch = ''
     substituteInPlace tools/Makefile.in \
diff --git a/pkgs/development/libraries/dbus/docs-reproducible-ids.patch b/pkgs/development/libraries/dbus/docs-reproducible-ids.patch
new file mode 100644
index 000000000000..2356b64d95cf
--- /dev/null
+++ b/pkgs/development/libraries/dbus/docs-reproducible-ids.patch
@@ -0,0 +1,15 @@
+diff --color -Naur dbus-1.12.20-original/doc/Makefile.in dbus-1.12.20-hacked2/doc/Makefile.in
+--- dbus-1.12.20-original/doc/Makefile.in	2020-07-02 12:10:41.000000000 +0200
++++ dbus-1.12.20-hacked2/doc/Makefile.in	2020-11-07 09:57:15.297694773 +0100
+@@ -870,8 +870,10 @@
+ .PRECIOUS: Makefile
+ 
+ 
++# 'generate.consistent.ids=1' ensures reproducible docs, for further details see
++# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
+ @DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml
+-@DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) html-nochunks $<
++@DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $<
+ 
+ @DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml
+ @DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) man $<

From 00213ef17f8bc35aae3227012256713d17b1d0d8 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 7 Nov 2020 03:13:09 +0900
Subject: [PATCH 1718/3942] thunderbird: 78.4.0 -> 78.4.1

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 7494c1138058..1f58ec59a7cb 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true;
 
 stdenv.mkDerivation rec {
   pname = "thunderbird";
-  version = "78.4.0";
+  version = "78.4.1";
 
   src = fetchurl {
     url =
       "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
     sha512 =
-      "04b6n3gsan0a5abh371ws3c3rry4dcb3c6rbqmcxkzrdjg2xr5vn6xhlg3dgl3l01p0hp1xqpckj8g5yb2dq2x07xgg1hnyhs9aadh5";
+      "2mbb139xdi69bnvvg7zabwbw181xnz7y154viynmkwyh4iww0hcsvr88q246gnif8a7jns3pi4qgqxgzflyl6mzpsvfdrbjs5hylanx";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a69bf422ca7..86da651d9002 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23811,7 +23811,9 @@ in
   thunderbird = thunderbird-78;
 
   thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird {
-    inherit (rustPackages) cargo rustc;
+    # Using older Rust for workaround:
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1663715
+    inherit (rustPackages_1_45) cargo rustc;
     libpng = libpng_apng;
     icu = icu67;
     libvpx = libvpx_1_8;

From 1fe5d52eb8516c93e52e983b3a73b7b104d170c4 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Sat, 7 Nov 2020 11:05:37 +0000
Subject: [PATCH 1719/3942] dasel: 1.1.0 -> 1.2.0

- Add support for YAML multi-document files
---
 pkgs/applications/misc/dasel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
index ef1279cddfc1..0e5c33c00b5b 100644
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "dasel";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "TomWright";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256:11xm47p7n79mq2zkv9q9m5v4a1gga01pkzi2j42gq1ma9hwz4idz";
+    sha256 = "sha256-Un9tqODwiWsaw66t2m8NyaDF0+hq/e0tmRFi3/T4LMI=";
   };
 
   vendorSha256 = "sha256:1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw";

From 4c68a713372a6a021e4e3f4f16565be1605f10d0 Mon Sep 17 00:00:00 2001
From: Josh Holland <josh@inv.alid.pw>
Date: Tue, 16 Jun 2020 13:23:01 +0100
Subject: [PATCH 1720/3942] maintainers: add jshholland

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 87694473cd50..94588050cc4a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4284,6 +4284,12 @@
     githubId = 16374374;
     name = "Joshua Campbell";
   };
+  jshholland = {
+    email = "josh@inv.alid.pw";
+    github = "jshholland";
+    githubId = 107689;
+    name = "Josh Holland";
+  };
   jtcoolen = {
     email = "jtcoolen@pm.me";
     name = "Julien Coolen";

From bcb92f53d59bb9f63fbe537ac17b9780852a339b Mon Sep 17 00:00:00 2001
From: Josh Holland <josh@inv.alid.pw>
Date: Tue, 28 Jul 2020 12:54:30 +0100
Subject: [PATCH 1721/3942] as-tree: init at 0.12.0

---
 pkgs/tools/misc/as-tree/cargo-lock.patch | 13 ++++++++++++
 pkgs/tools/misc/as-tree/default.nix      | 27 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/misc/as-tree/cargo-lock.patch
 create mode 100644 pkgs/tools/misc/as-tree/default.nix

diff --git a/pkgs/tools/misc/as-tree/cargo-lock.patch b/pkgs/tools/misc/as-tree/cargo-lock.patch
new file mode 100644
index 000000000000..f7a06c050d2d
--- /dev/null
+++ b/pkgs/tools/misc/as-tree/cargo-lock.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 991ecd8..9e94574 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -11,7 +11,7 @@ dependencies = [
+ 
+ [[package]]
+ name = "as-tree"
+-version = "0.11.1"
++version = "0.12.0"
+ dependencies = [
+  "ansi_term",
+  "atty",
diff --git a/pkgs/tools/misc/as-tree/default.nix b/pkgs/tools/misc/as-tree/default.nix
new file mode 100644
index 000000000000..7cc97fd79e46
--- /dev/null
+++ b/pkgs/tools/misc/as-tree/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "as-tree";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "jez";
+    repo = pname;
+    rev = version;
+    sha256 = "0c0g32pkyhyvqpgvzlw9244c80npq6s8mxy3may7q4qyd7hi3dz5";
+  };
+
+  cargoSha256 = "0yhd9svdxg7akv61msn7rf3rfblb7kxnyn955dfdwyxbxq48qwpr";
+  # the upstream 0.12.0 release didn't update the Cargo.lock file properly
+  # they have updated their release script, so this patch can be removed
+  # when the next version is released.
+  cargoPatches = [ ./cargo-lock.patch ];
+
+  meta = with lib; {
+    description = "Print a list of paths as a tree of paths";
+    homepage = "https://github.com/jez/as-tree";
+    license = with licenses; [ blueOak100 ];
+    maintainers = with maintainers; [ jshholland ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 250e25228951..456ecfc3ca0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1338,6 +1338,8 @@ in
   };
   aria = aria2;
 
+  as-tree = callPackage ../tools/misc/as-tree { };
+
   asmfmt = callPackage ../development/tools/asmfmt { };
 
   aspcud = callPackage ../tools/misc/aspcud { };

From aec3bd0bcb79c9a58eb638e4e67da46338146912 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Thu, 5 Nov 2020 16:48:09 +0100
Subject: [PATCH 1722/3942] seaweedfs: init at 2.07

---
 .../networking/seaweedfs/default.nix          | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/networking/seaweedfs/default.nix

diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix
new file mode 100644
index 000000000000..be583755868b
--- /dev/null
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+  pname = "seaweedfs";
+  version = "2.07";
+
+  src = fetchFromGitHub {
+    owner = "chrislusf";
+    repo = "seaweedfs";
+    rev = version;
+    sha256 = "0yrfpj4ph9f321vqfn1zadv44pqa3ivjq9rx6gsz9hlv50gfaqn1";
+  };
+
+  vendorSha256 = "1ysqagi4y25bi84h5fhkdimnsigy43klf6hrcqn7q75382fb4bzn";
+
+  subPackages = [ "weed" ];
+
+  meta = with lib; {
+    description = "Simple and highly scalable distributed file system";
+    homepage = "https://github.com/chrislusf/seaweedfs";
+    maintainers = [ maintainers.raboof ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6269c16b5cf7..12a74cf0de31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7031,6 +7031,8 @@ in
 
   skim = callPackage ../tools/misc/skim { };
 
+  seaweedfs = callPackage ../applications/networking/seaweedfs { };
+
   sec = callPackage ../tools/admin/sec { };
 
   seccure = callPackage ../tools/security/seccure { };

From a71f07694c1b51ff2100a46ef3a54ff19e4632d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 7 Nov 2020 13:50:23 +0100
Subject: [PATCH 1723/3942] libtorch-bin: cleanup passthru test

- Make passthru.tests an attrset.
- Remove CMake VERBOSE option.
- Remove spurious `cat CMakeLists.txt`.
- Run the test as well.
- Actually test some functionality.
---
 .../libraries/science/math/libtorch/bin.nix     |  2 +-
 .../science/math/libtorch/test/default.nix      |  8 ++------
 .../science/math/libtorch/test/test.cpp         | 17 +++++++++++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix
index 33229bbefc82..6180c14c4d72 100644
--- a/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -100,7 +100,7 @@ in stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  passthru.tests = callPackage ./test { };
+  passthru.tests.cmake = callPackage ./test { };
 
   meta = with stdenv.lib; {
     description = "C++ API of the PyTorch machine learning framework";
diff --git a/pkgs/development/libraries/science/math/libtorch/test/default.nix b/pkgs/development/libraries/science/math/libtorch/test/default.nix
index d661ec28db98..e69807871f46 100644
--- a/pkgs/development/libraries/science/math/libtorch/test/default.nix
+++ b/pkgs/development/libraries/science/math/libtorch/test/default.nix
@@ -6,16 +6,12 @@ stdenv.mkDerivation {
 
   src = ./.;
 
-  postPatch = ''
-    cat CMakeLists.txt
-  '';
-
-  makeFlags = [ "VERBOSE=1" ];
-
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ libtorch-bin ];
 
+  doCheck = true;
+
   installPhase = ''
     touch $out
   '';
diff --git a/pkgs/development/libraries/science/math/libtorch/test/test.cpp b/pkgs/development/libraries/science/math/libtorch/test/test.cpp
index 5537724ce5f6..ca238fba521d 100644
--- a/pkgs/development/libraries/science/math/libtorch/test/test.cpp
+++ b/pkgs/development/libraries/science/math/libtorch/test/test.cpp
@@ -1,7 +1,20 @@
-#include <torch/torch.h>
+#undef NDEBUG
+#include <cassert>
+
 #include <iostream>
 
+#include <torch/torch.h>
+
 int main() {
   torch::Tensor tensor = torch::eye(3);
-  std::cout << tensor << std::endl;
+
+  float checkData[] = {
+    1, 0, 0,
+    0, 1, 0,
+    0, 0, 1
+  };
+
+  torch::Tensor check = torch::from_blob(checkData, {3, 3});
+
+  assert(tensor.allclose(check));
 }

From 0c131ae1186d2833b44fb6382391e07a28b46221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Sat, 7 Nov 2020 13:20:38 +0000
Subject: [PATCH 1724/3942] linux_zen: 5.9.3 -> 5.9.6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 9ee6dad7680c..cfeaa6d1ec73 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildLinux, ... } @ args:
 
 let
-  version = "5.9.3";
+  version = "5.9.6";
 in
 
 buildLinux (args // {
@@ -13,7 +13,7 @@ buildLinux (args // {
     owner = "zen-kernel";
     repo = "zen-kernel";
     rev = "v${version}-zen1";
-    sha256 = "0004fp3qnz2dpahnxkbc02yyijyqiavqmacyng1fi5wrw5kl2aj3";
+    sha256 = "0v8nc2zy75ij4hn8js23998spadbiid8qc9cib5d0apmzkhilqwq";
   };
 
   extraMeta = {

From 6c9aaf2a811720a4a9ec603116314f39c22cd636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 7 Nov 2020 14:52:03 +0100
Subject: [PATCH 1725/3942] makemkv: fix formatting and replace pkgconfig alias

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

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index d3cb12924c26..953f5b56c726 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -1,5 +1,12 @@
-{ stdenv, mkDerivation, fetchurl, autoPatchelfHook
-, ffmpeg_3, openssl, qtbase, zlib, pkgconfig
+{ stdenv
+, mkDerivation
+, fetchurl
+, autoPatchelfHook
+, pkg-config
+, ffmpeg_3
+, openssl
+, qtbase
+, zlib
 }:
 
 let
@@ -27,7 +34,7 @@ in mkDerivation {
 
   sourceRoot = "makemkv-oss-${version}";
 
-  nativeBuildInputs = [ autoPatchelfHook pkgconfig ];
+  nativeBuildInputs = [ autoPatchelfHook pkg-config ];
 
   buildInputs = [ ffmpeg_3 openssl qtbase zlib ];
 

From eb3fd61bb6fd92e0e5f6f717fa21128e278d4e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 7 Nov 2020 14:53:42 +0100
Subject: [PATCH 1726/3942] firefox-esr: fix build by using older rust

It's probably the same issue as with thunderbird.
---
 pkgs/applications/networking/browsers/firefox/common.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 03cf35e1a6be..a98891df4d13 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -9,7 +9,7 @@
 , hunspell, libXdamage, libevent, libstartup_notification
 , libvpx_1_8
 , icu67, libpng, jemalloc, glib
-, autoconf213, which, gnused, cargo, rustc
+, autoconf213, which, gnused, rustPackages, rustPackages_1_45
 , rust-cbindgen, nodejs, nasm, fetchpatch
 , gnum4
 , debugBuild ? false
@@ -102,6 +102,10 @@ let
   buildStdenv = if ltoSupport
                 then overrideCC stdenv llvmPackages.lldClang
                 else stdenv;
+
+  # 78 ESR won't build with rustc 1.47
+  inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45)
+    rustc cargo;
 in
 
 buildStdenv.mkDerivation ({

From 83e9cc41f62dbdce06c62c82276f6c5a0afa0097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 7 Nov 2020 14:55:09 +0100
Subject: [PATCH 1727/3942] makemkv: add jre_headless PATH through the wrapper

MakeMKV requires a Java runtime environment to extract some Blu-ray
disks:

http://www.makemkv.com/bdjava/

This change provides jre_headless by default.
---
 pkgs/applications/video/makemkv/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 953f5b56c726..6575fa0634dc 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -7,6 +7,9 @@
 , openssl
 , qtbase
 , zlib
+
+, withJava ? true
+, jre_headless
 }:
 
 let
@@ -38,6 +41,13 @@ in mkDerivation {
 
   buildInputs = [ ffmpeg_3 openssl qtbase zlib ];
 
+  qtWrapperArgs =
+    let
+      binPath = stdenv.lib.makeBinPath [ jre_headless ];
+    in stdenv.lib.optionals withJava [
+      ''--prefix PATH : ${binPath}''
+    ];
+
   installPhase = ''
     runHook preInstall
 

From fa5367f2cb3e1205953937aec936736ec8e4cb91 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 7 Nov 2020 15:18:21 +0100
Subject: [PATCH 1728/3942] =?UTF-8?q?pythonPackages.psautohint:=202.1.1=20?=
 =?UTF-8?q?=E2=86=92=202.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix
index b439c05f0b87..fb9237c89344 100644
--- a/pkgs/development/python-modules/psautohint/default.nix
+++ b/pkgs/development/python-modules/psautohint/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "psautohint";
-  version = "2.1.1";
+  version = "2.1.2";
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner  = "adobe-type-tools";
     repo   = pname;
-    sha256 = "00n9bycjmvx1fb4332bdj53f01q86ajndrvid9idpiyzybmd5vp4";
+    sha256 = "1s2l54gzn11y07zaggprwif7r3ia244qijjhkbvjdx4jsgc5df8n";
     rev    = "v${version}";
     fetchSubmodules = true; # data dir for tests
   };

From c48faf07f44e73f7e7da9d28031118262bad231b Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+nixpkgs@sourcephile.fr>
Date: Fri, 6 Nov 2020 23:08:22 +0100
Subject: [PATCH 1729/3942] transmission: fix #98904

---
 nixos/modules/services/torrent/transmission.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index aeb58a7194f9..717c18d367f0 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -236,6 +236,7 @@ in
           # an AppArmor profile is provided to get a confinement based upon paths and rights.
           builtins.storeDir
           "/etc"
+          "/run"
           ] ++
           optional (cfg.settings.script-torrent-done-enabled &&
                     cfg.settings.script-torrent-done-filename != "")
@@ -408,6 +409,7 @@ in
           #r @{PROC}/@{pid}/environ,
           r @{PROC}/@{pid}/mounts,
           rwk /tmp/tr_session_id_*,
+          r /run/systemd/resolve/stub-resolv.conf,
 
           r ${pkgs.openssl.out}/etc/**,
           r ${config.systemd.services.transmission.environment.CURL_CA_BUNDLE},

From 756f36b554c318ce77cc73502ac7280f0f37dd20 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Fri, 23 Oct 2020 15:17:47 +0200
Subject: [PATCH 1730/3942] kicad: 5.1.6 -> 5.1.7

---
 .../science/electronics/kicad/default.nix     |  3 +-
 .../science/electronics/kicad/versions.nix    | 28 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 7290503311d3..48a5779d207a 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -212,11 +212,10 @@ stdenv.mkDerivation rec {
 
   # why does $makeWrapperArgs have to be added explicitly?
   # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set?
-  # kicad-ogltest's source seems to indicate that crashing is expected behaviour...
   installPhase =
     let
       tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ];
-      utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ];
+      utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" ];
     in
     (concatStringsSep "\n"
       (flatten [
diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix
index 1afb33b6fbd8..0252f69aeae2 100644
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@@ -3,25 +3,25 @@
 {
   "kicad" = {
     kicadVersion = {
-      version = "5.1.6";
+      version =			"5.1.7";
       src = {
-        rev = "c6e7f7de7df655fd59b57823499efc443009de6b";
-        sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622";
+        rev =			"a382d34a883a5bf4250e86ec4bc390aa0a385012";
+        sha256 =		"1gjh0rny4pw52kpljfim51sivs8x1cvy11hx1isgp4dsn2zdwg95";
       };
     };
     libVersion = {
-      version = "5.1.6";
+      version =			"5.1.7";
       libSources = {
-        i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd";
-        i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha";
-        symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708";
-        symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6";
-        templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9";
-        templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg";
-        footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332";
-        footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx";
-        packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c";
-        packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1";
+        i18n.rev =		"d24af2da8cab4ce1081c401909a4a880514e5549";
+        i18n.sha256 =		"0r0sv52k84sw4jxf10lrmzwmn58d2fv5h57fdrspnmvnh10q63xf";
+        symbols.rev =		"bf475af94877e8fd9cf80e667578ff61835e02bb";
+        symbols.sha256 =	"1ii3r813653ng2ycggnknqx4g3ja7dbm4qyxrf9aq48ws0xkvhx3";
+        templates.rev =		"1ccbaf3704e8ff4030d0915f71e051af621ef7d7";
+        templates.sha256 =	"1a8xfcbdbb4ylrb5m7n2jjk9kwvgmlx1pmnn2cwj327a2b3m4jjs";
+        footprints.rev =	"302ac78bac21825532f970fb92714fa5973ad79b";
+        footprints.sha256 =	"0gyqxryda273hjn2rv8dha461j9bjh054y5dlpiw1wiha65lrf9i";
+        packages3d.rev =	"7abe02f30fd79b8f4f66c01589861df7f8f72f04";
+        packages3d.sha256 =	"1szcin52fcsyb55bj7xq7lz6ig187dpz3lk7blwab7b9c4dn3c3y";
       };
     };
   };

From 50ec961174f634c0de08bfd223060ae1477235d3 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Fri, 6 Nov 2020 06:53:42 +0100
Subject: [PATCH 1731/3942] kicad: fix update.sh bootstrapping

it will now correctly build a version.nix file from scratch
---
 pkgs/applications/science/electronics/kicad/update.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh
index 8c154c302c84..cfd78323b77a 100755
--- a/pkgs/applications/science/electronics/kicad/update.sh
+++ b/pkgs/applications/science/electronics/kicad/update.sh
@@ -110,7 +110,7 @@ for version in "${all_versions[@]}"; do
     echo "Checking src" >&2
     src_rev="$(${get_rev} "${gitlab}"/code/kicad.git "${version}" | cut -f1)"
     has_rev="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}" || true)"
-    has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256")"
+    has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256" || true)"
     if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
       echo "Reusing old ${pname}.src.sha256, already latest .rev" >&2
       grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "rev" -A 1
@@ -130,7 +130,7 @@ for version in "${all_versions[@]}"; do
         echo "Checking i18n" >&2
         i18n_rev="$(${get_rev} "${i18n}" "${version}" | cut -f1)"
         has_rev="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}" || true)"
-        has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256")"
+        has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256" || true)"
         if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
           echo "Reusing old kicad-i18n-${today}.src.sha256, already latest .rev" >&2
           grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n" -A 1
@@ -146,7 +146,7 @@ for version in "${all_versions[@]}"; do
             url="${gitlab}/libraries/kicad-${lib}.git"
             lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1 | head -n1)"
             has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)"
-            has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")"
+            has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256" || true)"
             if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
               echo "Reusing old kicad-${lib}-${today}.src.sha256, already latest .rev" >&2
               grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}" -A 1

From 905134a79f18255f547c04fd0f63ec353b4151c4 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Fri, 6 Nov 2020 01:23:16 +0100
Subject: [PATCH 1732/3942] kicad: 5.1.7 -> 5.1.8

---
 .../science/electronics/kicad/versions.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix
index 0252f69aeae2..0ba69e5a502e 100644
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@@ -3,17 +3,17 @@
 {
   "kicad" = {
     kicadVersion = {
-      version =			"5.1.7";
+      version =			"5.1.8";
       src = {
-        rev =			"a382d34a883a5bf4250e86ec4bc390aa0a385012";
-        sha256 =		"1gjh0rny4pw52kpljfim51sivs8x1cvy11hx1isgp4dsn2zdwg95";
+        rev =			"db9833491010954bc27fac92c83d2864bd95c23c";
+        sha256 =		"08ni9j2lw2hjc1csk6rkydcxwdal6da17ch60zkjij5vfsif2hix";
       };
     };
     libVersion = {
-      version =			"5.1.7";
+      version =			"5.1.8";
       libSources = {
-        i18n.rev =		"d24af2da8cab4ce1081c401909a4a880514e5549";
-        i18n.sha256 =		"0r0sv52k84sw4jxf10lrmzwmn58d2fv5h57fdrspnmvnh10q63xf";
+        i18n.rev =		"78adcd19e7ed53f4889d6db65a33dd8ec2d323e9";
+        i18n.sha256 =		"0x0w2m6d3xfm22y4anp5j2j67iwzby149ynj6qjlw2kcsi8kwk1j";
         symbols.rev =		"bf475af94877e8fd9cf80e667578ff61835e02bb";
         symbols.sha256 =	"1ii3r813653ng2ycggnknqx4g3ja7dbm4qyxrf9aq48ws0xkvhx3";
         templates.rev =		"1ccbaf3704e8ff4030d0915f71e051af621ef7d7";

From a52e974cff8fb80c427e0d55c01b3b8c770ccec4 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Fri, 6 Nov 2020 01:33:48 +0100
Subject: [PATCH 1733/3942] kicad-unstable: 2020-10-09 -> 2020-11-07

patch for issue 72248 no longer applies
  issue doesn't seem to occur without it anymore...
---
 pkgs/applications/science/electronics/kicad/base.nix | 11 -----------
 .../science/electronics/kicad/versions.nix           | 12 ++++++------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix
index 3d83e905103b..7f11f483a9d0 100644
--- a/pkgs/applications/science/electronics/kicad/base.nix
+++ b/pkgs/applications/science/electronics/kicad/base.nix
@@ -55,17 +55,6 @@ stdenv.mkDerivation rec {
 
   src = kicadSrc;
 
-  # quick fix for #72248
-  # should be removed if a a more permanent fix is published
-  patches = [
-    (
-      fetchpatch {
-        url = "https://github.com/johnbeard/kicad/commit/dfb1318a3989e3d6f9f2ac33c924ca5030ea273b.patch";
-        sha256 = "00ifd3fas8lid8svzh1w67xc8kyx89qidp7gm633r014j3kjkgcd";
-      }
-    )
-  ];
-
   # tagged releases don't have "unknown"
   # kicad nightlies use git describe --dirty
   # nix removes .git, so its approximated here
diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix
index 0ba69e5a502e..beadd1724e10 100644
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@@ -27,17 +27,17 @@
   };
   "kicad-unstable" = {
     kicadVersion = {
-      version =			"2020-10-09";
+      version =			"2020-11-07";
       src = {
-        rev =			"560428a70f0196fb4ade620042c5ddefc1685ebe";
-        sha256 =		"0rzn83bpl06v1d49lcvwfg93nirn684bqqq536zxhmjm0ayx29ka";
+        rev =			"9454f9df9245aea037d1ad5baf050c2d9101159c";
+        sha256 =		"03bd0dk234ihqnwrv4n40gi856xcjqgxplfwjzlwcq521gwykv30";
       };
     };
     libVersion = {
-      version =			"2020-10-09";
+      version =			"2020-11-07";
       libSources = {
-        i18n.rev =		"d24af2da8cab4ce1081c401909a4a880514e5549";
-        i18n.sha256 =		"0r0sv52k84sw4jxf10lrmzwmn58d2fv5h57fdrspnmvnh10q63xf";
+        i18n.rev =		"e89d9a89bec59199c1ade56ee2556591412ab7b0";
+        i18n.sha256 =		"04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl";
         symbols.rev =		"9c50f4333bafc5a1abf7786436db5ffb6a66758d";
         symbols.sha256 =	"06ic59svz0256isy93863i5ay4k8wshvp1kspnqrc776wmq03l3k";
         templates.rev =		"41eae4ccd3ac02fdb969e3aa272c07ab51dcf5af";

From 51acdda61805c8965d408cf5d1e6c3800075bf8c Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sat, 7 Nov 2020 16:25:28 +0100
Subject: [PATCH 1734/3942] bear: 2.4.2 -> 3.0.1

Bear has been completely redone, this is basically a new package
---
 .../build-managers/bear/cmakepaths.patch      | 13 ------
 .../tools/build-managers/bear/default.nix     | 41 +++++++++++++++----
 .../build-managers/bear/ignore_wrapper.patch  | 27 ------------
 .../bear/no-double-relative.patch             | 14 +++++++
 4 files changed, 48 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/bear/cmakepaths.patch
 delete mode 100644 pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
 create mode 100644 pkgs/development/tools/build-managers/bear/no-double-relative.patch

diff --git a/pkgs/development/tools/build-managers/bear/cmakepaths.patch b/pkgs/development/tools/build-managers/bear/cmakepaths.patch
deleted file mode 100644
index d237267078e6..000000000000
--- a/pkgs/development/tools/build-managers/bear/cmakepaths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 04c5c58..429ca47 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,7 @@ set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING  "Rogue")
- 
- set(EAR_LIB_FILE ${CMAKE_SHARED_LIBRARY_PREFIX}ear${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(EAR_LIB_PATH "${CMAKE_INSTALL_LIBDIR}/bear")
--set(DEFAULT_PRELOAD_FILE ${CMAKE_INSTALL_PREFIX}/${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.")
-+set(DEFAULT_PRELOAD_FILE ${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.")
- 
- add_subdirectory(libear)
- add_subdirectory(bear)
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index bc7bb46cd5b9..cd5e508fbdd6 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -1,22 +1,49 @@
-{ stdenv, fetchFromGitHub, cmake, python3 }:
+{ stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, grpc
+, protobuf
+, openssl
+, nlohmann_json
+, gtest
+, fmt
+, spdlog
+, c-ares
+, abseil-cpp
+, zlib
+}:
 
 stdenv.mkDerivation rec {
   pname = "bear";
-  version = "2.4.2";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "rizsotto";
     repo = pname;
     rev = version;
-    sha256 = "1w1kyjzvvy5lj16kn3yyf7iil2cqlfkszi8kvagql7f5h5l6w9b1";
+    sha256 = "02vzlm48ywf6s3fly19j94k11dqx94x8pgmkq1ylx3z3d1y3b5zb";
   };
 
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ python3 ]; # just for shebang of bin/bear
+  nativeBuildInputs = [ cmake pkg-config ];
 
-  doCheck = false; # all fail
+  buildInputs = [
+    grpc
+    protobuf
+    openssl
+    nlohmann_json
+    gtest
+    fmt
+    spdlog
+    c-ares
+    abseil-cpp
+    zlib
+  ];
 
-  patches = [ ./ignore_wrapper.patch ./cmakepaths.patch ];
+  patches = [
+    # Default libexec would be set to /nix/store/*-bear//nix/store/*-bear/libexec/...
+    ./no-double-relative.patch
+  ];
 
   meta = with stdenv.lib; {
     description = "Tool that generates a compilation database for clang tooling";
diff --git a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
deleted file mode 100644
index 8effc723bbab..000000000000
--- a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/bear/main.py.in
-+++ b/bear/main.py.in
-@@ -49,6 +49,7 @@ import tempfile
- import shutil
- import contextlib
- import logging
-+from distutils.spawn import find_executable
- 
- # Map of ignored compiler option for the creation of a compilation database.
- # This map is used in _split_command method, which classifies the parameters
-@@ -569,7 +570,15 @@ class Compilation:
-                 (compiler, language, rest of the command) otherwise """
- 
-         if command:  # not empty list will allow to index '0' and '1:'
--            executable = os.path.basename(command[0])  # type: str
-+            executable_file = find_executable(command[0])
-+            if executable_file:
-+                absolute_executable = os.path.realpath(executable_file)
-+                # Ignore Nix wrappers.
-+                if 'wrapper' in absolute_executable:
-+                    return None
-+                executable = os.path.basename(absolute_executable)
-+            else:
-+                executable = os.path.basename(command[0])
-             parameters = command[1:]  # type: List[str]
-             # 'wrapper' 'parameters' and
-             # 'wrapper' 'compiler' 'parameters' are valid.
\ No newline at end of file
diff --git a/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/pkgs/development/tools/build-managers/bear/no-double-relative.patch
new file mode 100644
index 000000000000..0184bdfd6ba7
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bear/no-double-relative.patch
@@ -0,0 +1,14 @@
+diff --git a/source/config.h.in b/source/config.h.in
+index 2ca8853..2564c63 100644
+--- a/source/config.h.in
++++ b/source/config.h.in
+@@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@";
+ 
+ constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames";
+ constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept";
+-constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
+-constexpr char EXECUTOR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/er";
+-constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d";
++constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
++constexpr char EXECUTOR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/er";
++constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d";

From e7ce7e370abc8a709d3e01068f8c52450924d3d9 Mon Sep 17 00:00:00 2001
From: David Birks <david@birks.dev>
Date: Sat, 7 Nov 2020 11:39:00 -0500
Subject: [PATCH 1735/3942] ssmsh: init at 1.4.3

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

diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix
new file mode 100644
index 000000000000..03fa9156aad2
--- /dev/null
+++ b/pkgs/tools/admin/ssmsh/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "ssmsh";
+  version = "1.4.3";
+
+  src = fetchFromGitHub {
+    owner = "bwhaley";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0rvvawn4cavqhbrrp616mi5ipn4q6j22227h4rbjh0zxdlna23gm";
+  };
+
+  vendorSha256 = "127xni0i7w42075bspmm5r61j858i1p59jr2ib8f9r1pbizh63xw";
+
+  doCheck = true;
+
+  buildFlagsArray = [ "-ldflags=-w -s -X main.Version=${version}" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/bwhaley/ssmsh";
+    description = "An interactive shell for AWS Parameter Store";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dbirks ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05c8770c763b..bb562b87ebc5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2515,6 +2515,8 @@ in
 
   socklog = callPackage ../tools/system/socklog { };
 
+  ssmsh = callPackage ../tools/admin/ssmsh { };
+
   stagit = callPackage ../development/tools/stagit { };
 
   starboard = callPackage ../applications/networking/cluster/starboard { };

From 62b33a614d9b57be89dcc2f2036dd4bc1e21a6e6 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sat, 31 Oct 2020 12:19:03 +0100
Subject: [PATCH 1736/3942] mlterm: add Darwin support

---
 .../terminal-emulators/mlterm/default.nix     | 44 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index 0ec8d7a47404..eea267445a6c 100644
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -5,6 +5,7 @@
 , openssl, libssh2 #build-in ssh
 , fcitx, ibus, uim #IME
 , wrapGAppsHook #color picker in mlconfig
+, Cocoa #Darwin
 }:
 
 stdenv.mkDerivation rec {
@@ -18,9 +19,25 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ];
   buildInputs = [
-    libX11 gdk-pixbuf.dev cairo libXft gtk3 vte
-    harfbuzz fribidi m17n_lib openssl libssh2
-    fcitx ibus uim
+    libX11
+    gdk-pixbuf.dev
+    cairo
+    libXft
+    gtk3
+    harfbuzz
+    fribidi
+  ] ++ lib.optionals (!stdenv.isDarwin) [
+    # need linker magic, not adapted for Darwin yet
+    openssl
+    libssh2
+
+    # Not supported on Darwin
+    vte
+    m17n_lib
+
+    fcitx
+    ibus
+    uim
   ];
 
   #bad configure.ac and Makefile.in everywhere
@@ -42,7 +59,7 @@ stdenv.mkDerivation rec {
       --replace "-m 2755 -g utmp" " " \
       --replace "-m 4755 -o root" " "
   '';
-  NIX_LDFLAGS = "
+  NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "
     -L${stdenv.cc.cc.lib}/lib
     -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft
     -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n
@@ -53,23 +70,30 @@ stdenv.mkDerivation rec {
   ";
 
   configureFlags = [
-    "--with-x=yes"
-    "--with-gui=xlib,fb"
     "--with-imagelib=gdk-pixbuf" #or mlimgloader depending on your bugs of choice
     "--with-type-engines=cairo,xft,xcore"
     "--with-gtk=3.0"
     "--enable-ind" #indic scripts
     "--enable-fribidi" #bidi scripts
-    "--enable-m17nlib" #character encodings
     "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc"
      #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core
      #and configuring ~/.mlterm/key correctly.
- ] ++ lib.optional (libssh2 == null) "--disable-ssh2";
+ ] ++ lib.optionals (!stdenv.isDarwin) [
+   "--with-x=yes"
+   "--with-gui=xlib,fb"
+    "--enable-m17nlib" #character encodings
+ ] ++ lib.optionals stdenv.isDarwin [
+    "--with-gui=quartz"
+ ] ++ lib.optionals (libssh2 == null) [ " --disable-ssh2" ];
 
   postInstall = ''
     install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg"
     install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png"
     install -D -t $out/share/applications $desktopItem/share/applications/*
+  '' + lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/Applications/
+    cp -a cocoa/mlterm.app $out/Applications/
+    install $out/bin/mlterm -Dt $out/Applications/mlterm.app/Contents/MacOS/
   '';
 
   desktopItem = makeDesktopItem {
@@ -87,10 +111,10 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    description = "Multi Lingual TERMinal emulator on X11";
+    description = "Multi Lingual TERMinal emulator";
     homepage = "http://mlterm.sourceforge.net/";
     license = licenses.bsd3;
     maintainers = with maintainers; [ vrthra ramkromberg ];
-    platforms = with platforms; linux;
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82bf8bc78cab..0f5f19700129 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -722,6 +722,7 @@ in
   mlterm = callPackage ../applications/terminal-emulators/mlterm {
     libssh2 = null;
     openssl = null;
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
   mrxvt = callPackage ../applications/terminal-emulators/mrxvt { };

From c6b47ff67838b9cedf3fc0e1df9afd1fcf1cb88a Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sat, 31 Oct 2020 12:32:38 +0100
Subject: [PATCH 1737/3942] mlterm: add myself as maintainer

---
 pkgs/applications/terminal-emulators/mlterm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index eea267445a6c..853fe22f0bf2 100644
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
     description = "Multi Lingual TERMinal emulator";
     homepage = "http://mlterm.sourceforge.net/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ vrthra ramkromberg ];
+    maintainers = with maintainers; [ vrthra ramkromberg atemu ];
     platforms = with platforms; linux ++ darwin;
   };
 }

From 6e5d98ebdb0ebe1625a95ae6e6e00dab65da7f48 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 3 Nov 2020 17:37:24 +0100
Subject: [PATCH 1738/3942] framac: use wrapGAppsHook

this solves a gdk-pixbuf related problem when using nix-bundle
---
 pkgs/development/tools/analysis/frama-c/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 179a74c56d50..bb3c21f43f5e 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl, makeWrapper, writeText
 , autoconf, ncurses, graphviz, doxygen
-, ocamlPackages, ltl2ba, coq, why3,
+, ocamlPackages, ltl2ba, coq, why3
+, gdk-pixbuf, wrapGAppsHook
 }:
 
 let
@@ -33,20 +34,18 @@ stdenv.mkDerivation rec {
 
   preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")";
 
-  nativeBuildInputs = [ autoconf makeWrapper ];
+  nativeBuildInputs = [ autoconf wrapGAppsHook ];
 
   buildInputs = with ocamlPackages; [
     ncurses ocaml findlib ltl2ba ocamlgraph yojson menhir camlzip
     lablgtk coq graphviz zarith apron why3 mlgmpidl doxygen
+    gdk-pixbuf
   ];
 
   enableParallelBuilding = true;
 
-  fixupPhase = ''
-    for p in $out/bin/frama-c{,-gui};
-    do
-      wrapProgram $p --prefix OCAMLPATH ':' ${ocamlpath}
-    done
+  preFixup = ''
+     gappsWrapperArgs+=(--prefix OCAMLPATH ':' ${ocamlpath})
   '';
 
   # Allow loading of external Frama-C plugins

From 3dd8f8e0bac2b88aeba3a20f4ce5b532970b3f75 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 3 Nov 2020 17:49:28 +0100
Subject: [PATCH 1739/3942] framac: fix setup hook without plugins in
 nix-review

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

diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index bb3c21f43f5e..4638427b3ed9 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -52,16 +52,16 @@ stdenv.mkDerivation rec {
   setupHook = writeText "setupHook.sh" ''
     addFramaCPath () {
       if test -d "''$1/lib/frama-c/plugins"; then
-        export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins"
-        export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins"
+        export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN-}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins"
+        export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins"
       fi
 
       if test -d "''$1/lib/frama-c"; then
-        export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c"
+        export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/frama-c"
       fi
 
       if test -d "''$1/share/frama-c/"; then
-        export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c"
+        export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE-}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c"
       fi
 
     }

From d92a19b0394f39f9febba56e4fd878a34c27df24 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sat, 7 Nov 2020 11:52:59 +0100
Subject: [PATCH 1740/3942] stdenv: Fix error message when checkPhase is
 missing

---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index d19ed342aab0..2617a8f74ab5 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1037,7 +1037,7 @@ checkPhase() {
     runHook preCheck
 
     if [[ -z "${foundMakefile:-}" ]]; then
-        echo "no Makefile or custom buildPhase, doing nothing"
+        echo "no Makefile or custom checkPhase, doing nothing"
         runHook postCheck
         return
     fi
@@ -1182,7 +1182,7 @@ installCheckPhase() {
     runHook preInstallCheck
 
     if [[ -z "${foundMakefile:-}" ]]; then
-        echo "no Makefile or custom buildPhase, doing nothing"
+        echo "no Makefile or custom installCheckPhase, doing nothing"
     #TODO(@oxij): should flagsArray influence make -n?
     elif [[ -z "${installCheckTarget:-}" ]] \
        && ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then

From d07bef461c625e26f3c6efdd4866ad8db203756b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 09:21:31 +0000
Subject: [PATCH 1741/3942] libngspice: 31 -> 33

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

diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
index e1b9e4f0bdca..84bd9b33e790 100644
--- a/pkgs/development/libraries/libngspice/default.nix
+++ b/pkgs/development/libraries/libngspice/default.nix
@@ -4,11 +4,11 @@
 # the ngspice derivation.
 stdenv.mkDerivation rec {
   pname = "libngspice";
-  version = "31";
+  version = "33";
 
   src = fetchurl {
     url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
-    sha256 = "10n2lnfrpsv4vyrirkphr4jwjjhy7i617g6za78dwirfjq63npw4";
+    sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr";
   };
 
   nativeBuildInputs = [ flex bison ];

From ba3b59939f6d62e4bb033001aea6b0afeefc8bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 7 Nov 2020 06:56:53 +0100
Subject: [PATCH 1742/3942] python3.pkgs.hbmqtt: needs setuptools at runtime

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

diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix
index b00e3a88d3e9..76ae5718024a 100644
--- a/pkgs/development/python-modules/hbmqtt/default.nix
+++ b/pkgs/development/python-modules/hbmqtt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, setuptools
 , transitions, websockets, passlib, docopt, pyyaml, nose }:
 
 buildPythonPackage rec {
@@ -12,7 +12,9 @@ buildPythonPackage rec {
     sha256 = "1n9c8yj11npiq9qxivwmfhib1qkjpcyw42a7q0w641bdrz3x6r37";
   };
 
-  propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ];
+  propagatedBuildInputs = [
+    transitions websockets passlib docopt pyyaml setuptools
+  ];
 
   postPatch = ''
     # test tries to bind same port multiple times and fails

From 045c2abdfafaab8b7e080439cbd6c50c9c74bd49 Mon Sep 17 00:00:00 2001
From: Benjamin Andresen <b@lambda.icu>
Date: Sat, 7 Nov 2020 19:52:45 +0100
Subject: [PATCH 1743/3942] clj-kondo: 2020.04.05 -> 2020.11.07

---
 pkgs/development/tools/clj-kondo/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix
index 92596a068f7a..702e5935689d 100644
--- a/pkgs/development/tools/clj-kondo/default.nix
+++ b/pkgs/development/tools/clj-kondo/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, lib, graalvm8-ce, fetchurl }:
+{ stdenv, lib, graalvm11-ce, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "clj-kondo";
-  version = "2020.04.05";
+  version = "2020.11.07";
 
   reflectionJson = fetchurl {
     name = "reflection.json";
     url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json";
-    sha256 = "1m6kja38p6aypawbynkyq8bdh8wpdjmyqrhslinqid9r8cl25rcq";
+    sha256 = "0mwclqjh38alkddr5r7bfqn5lplx06h9gladi89kp06qdxc1hp7a";
   };
 
   src = fetchurl {
     url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "0k9samcqkpkdgzbzr2bpixf75987lsabh97101v1fg12qvjhf187";
+    sha256 = "1xqryfcn82bp8wasqnllfgvhl5w9zm63yw8c2kgxz18dayhq4i31";
   };
 
   dontUnpack = true;
 
-  buildInputs = [ graalvm8-ce ];
+  buildInputs = [ graalvm11-ce ];
 
   buildPhase = ''
     native-image  \
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "A linter for Clojure code that sparks joy";
     homepage = "https://github.com/borkdude/clj-kondo";
     license = licenses.epl10;
-    platforms = graalvm8-ce.meta.platforms;
+    platforms = graalvm11-ce.meta.platforms;
     maintainers = with maintainers; [ jlesquembre bandresen ];
   };
 }

From 17a861413b6a4b151b9ba7a4cf6119566c8018ca Mon Sep 17 00:00:00 2001
From: Mazurel <mateusz.mazur@yahoo.com>
Date: Thu, 5 Nov 2020 16:26:06 +0100
Subject: [PATCH 1744/3942] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 102 ++++++++++++++--------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 87ce6f2dadb8..e08a3f5214c4 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2020-10-15";
+    version = "2020-11-04";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "557a1ed5da70cb443a8650766f4e8ea95e8c0da3";
-      sha256 = "105rp35mp6nr79vyz93v36x48yjja38n9n4ngxnpsnm7qf9q8x5n";
+      rev = "1ec573bf0df6cbc5eef8b593f93081e4c1837c1b";
+      sha256 = "0h4aa3bd0wc9hz8af66biv9gcxw1m3bvp87jnc1jp3m3qxk93knl";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
   };
@@ -137,12 +137,12 @@ let
 
   asyncomplete-vim = buildVimPluginFrom2Nix {
     pname = "asyncomplete-vim";
-    version = "2020-10-21";
+    version = "2020-11-04";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "asyncomplete.vim";
-      rev = "2107094f83e58818ec9b8ca033a75eeeb49db163";
-      sha256 = "0bxxl1jj1bigwnvd07wb0ypsp5rn0b5c864m4k44llw7v1r3nrms";
+      rev = "ed75b1c92fb144bbe236bfb4d60a98dccf637c58";
+      sha256 = "1szxam9hq3s1s542i5fk5pkr5kdpdlz5849yq68i2nnkkh8xwrar";
     };
     meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/";
   };
@@ -317,12 +317,12 @@ let
 
   caw-vim = buildVimPluginFrom2Nix {
     pname = "caw-vim";
-    version = "2020-10-09";
+    version = "2020-11-04";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
-      rev = "26279f70cdfe5da2226cd15d7dd832ef6242ed26";
-      sha256 = "0sdkcbh0rxx9wf5qa7wwvm8zjk57vvclvss4cadll54zi6q8xq1s";
+      rev = "41be34ca231c97d6be6c05e7ecb5b020f79cd37f";
+      sha256 = "0da1v913nlf9kddyk1hqx4h6n95r67b0lxa71hkp8lhqzy9z0gw0";
     };
     meta.homepage = "https://github.com/tyru/caw.vim/";
   };
@@ -473,12 +473,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2020-11-02";
+    version = "2020-11-05";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "0cbd225b922c3702e4828608bab1c6bf699a3eeb";
-      sha256 = "05r8nfbf702bsrzpps2gj04d62kjaa9h6h116c0ql0iwi2zi0kmi";
+      rev = "815d105fe9bada4fda9c85f98557005b70a9e667";
+      sha256 = "0hxrja25hwcnw31bwcrs8krvjdxwvb6wxjrrx9zwbplj4x7xbkyp";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -1040,12 +1040,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2020-10-29";
+    version = "2020-11-04";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "3c94074f71faac00a7d8f4eef2c4bdea96212cd5";
-      sha256 = "1g5bll38gw1bpmhss398s1lj9jhvszv1xzbi5qc698y2zi5cm87z";
+      rev = "9aacded51b323f338859f01fcdca30a4acaf7dcc";
+      sha256 = "07gmj9cljbn4h7naxayq05p38930ffby97zg3x2c98x3hxldqsq8";
     };
     meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
   };
@@ -1112,12 +1112,12 @@ let
 
   dracula-vim = buildVimPluginFrom2Nix {
     pname = "dracula-vim";
-    version = "2020-11-02";
+    version = "2020-11-04";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "261765405c07bfbf808c69cb6126e0e5a7c6ea4f";
-      sha256 = "03abvp7fhssgynm5405bx6qdnbv4j4hrwwz6npqnb5ajqwl6y4cm";
+      rev = "8242b8f5aaa07fb3102d8ef649797454039b261b";
+      sha256 = "15sjrn8ajagbymxswa5qmaqbw517s2j9xavzhfxmfffv9h10rs3c";
     };
     meta.homepage = "https://github.com/dracula/vim/";
   };
@@ -1956,12 +1956,12 @@ let
 
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
-    version = "2020-10-20";
+    version = "2020-11-05";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "8769bbb84cd22b475275cc4f9f06a25445357a49";
-      sha256 = "1q1pmfvzvdsknw67zi00b3bn8y10mx7wjfc1nxfy1h33vzhl2g2r";
+      rev = "53176a0b75d6389d775d7bce0d494e58fc654f38";
+      sha256 = "0wg0nrjbr8my98ivaawj3khyx1fkkgbafwhmq6mlb8j8aj47pigx";
     };
     meta.homepage = "https://github.com/itchyny/lightline.vim/";
   };
@@ -1980,12 +1980,12 @@ let
 
   lsp_extensions-nvim = buildVimPluginFrom2Nix {
     pname = "lsp_extensions-nvim";
-    version = "2020-10-30";
+    version = "2020-11-04";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "lsp_extensions.nvim";
-      rev = "8740c4b52dd6f9c2a564209db466ae72a3412dcc";
-      sha256 = "0sakmg4fkzji3rl9qmfx2rphz3ma5b6sysf7h7sag4n4lykinayj";
+      rev = "eaa389f8a80d9700cc2c3bce787b00b61761a0f0";
+      sha256 = "0zndlyn3xgzxwshjk79yfva5914xchzg9v8qimfgn7jlmn5ljhwm";
     };
     meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/";
   };
@@ -2604,12 +2604,12 @@ let
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2020-11-03";
+    version = "2020-11-04";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "f999dc41131c3c69f2411af13597932c042e8e5a";
-      sha256 = "0zn8lf290cm2pwjd4iawjrlbpcxqrgqj2agarvsqrlmdxhgq7a77";
+      rev = "6e80f426bf9dc44c14b73d3589c6e19cbe9aa682";
+      sha256 = "14nprh59sif0kvkdxqw8ij7wnnm4d5zcv4cfgah4y7mj5a99na53";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -3313,12 +3313,12 @@ let
 
   syntastic = buildVimPluginFrom2Nix {
     pname = "syntastic";
-    version = "2020-09-27";
+    version = "2020-11-04";
     src = fetchFromGitHub {
       owner = "vim-syntastic";
       repo = "syntastic";
-      rev = "dd226673063b189683b98133d7a2243c1316e71e";
-      sha256 = "1kk7xavirj9lh77nsci5ws7p8a1bm3wz5la7sj7y82sr426rmlix";
+      rev = "5788b1c6df63bc31ae93d6c1a3523e0602c60901";
+      sha256 = "1a6mr5ffwx7f7yclp9i2hvkq2lf3zm1j4761vqmc8nq73w4sbd2z";
     };
     meta.homepage = "https://github.com/vim-syntastic/syntastic/";
   };
@@ -3902,12 +3902,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2020-10-30";
+    version = "2020-11-05";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "44b7b729381738cef0fc28a35fbe78fc2abe4d48";
-      sha256 = "09kvdm8yakqg0pjv1zbq5yy2wzzl3ax639mykk833b7g8hi6115q";
+      rev = "d64e5f8dd7ac0b094f0caacc63453a0418b37fdb";
+      sha256 = "0kspf0m00slrscld6qg5rj3i4lr9pwv25xvqqldyk8h884b182g7";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
   };
@@ -3926,24 +3926,24 @@ let
 
   vim-airline-themes = buildVimPluginFrom2Nix {
     pname = "vim-airline-themes";
-    version = "2020-10-29";
+    version = "2020-11-05";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
-      rev = "5307367693f770a6b06d1a498c9bc9bf4cf9a884";
-      sha256 = "14iyfihlirp5adih8v117nz02wskaap4qlbrkgb7w0x87gfa3yqp";
+      rev = "3dafdfc0424716bae21f5340314f7d90a9ddf4f2";
+      sha256 = "1j18anw9202cplfzgmsy8y6pl8zrxwnrhyn9djy580slakrk1s8k";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
   };
 
   vim-android = buildVimPluginFrom2Nix {
     pname = "vim-android";
-    version = "2020-04-25";
+    version = "2020-11-04";
     src = fetchFromGitHub {
       owner = "hsanson";
       repo = "vim-android";
-      rev = "1e5ee4f2a3281201aeb71766d45800e192c103f2";
-      sha256 = "1d187w74y0viv502gqxfqi0kyak0lyi0dbpcfkjd9c0fjbqrydd6";
+      rev = "5007343968e21bba30d85af982689d1c1f9145e1";
+      sha256 = "17c3yhnn016k03f2g3cjfwnazg2525pgwy4zqcv0vrgq2g4dil82";
     };
     meta.homepage = "https://github.com/hsanson/vim-android/";
   };
@@ -4130,12 +4130,12 @@ let
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2020-11-03";
+    version = "2020-11-04";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "d7bbe7529680662025f633954501a537ba226942";
-      sha256 = "042qzd3dg3y5m1sggsxhzhz2i4mnlv8sii817xx6vfif49pg7b0r";
+      rev = "992c2d43318ba096eedac0592a0c2d6f90fed236";
+      sha256 = "1nl29l1zb9prsm5iz0psiav846fv2ybwxd06rmf2mcigg96502vr";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -4382,12 +4382,12 @@ let
 
   vim-devicons = buildVimPluginFrom2Nix {
     pname = "vim-devicons";
-    version = "2020-09-26";
+    version = "2020-11-04";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
-      rev = "929dbd023f0de84d1abb502b7d77eddad33419a6";
-      sha256 = "15qj771nss9jxfrqnfgvk0d5zrna3g064lqbwrfxmc816k1j56w0";
+      rev = "383159d338024f09e4d56585a9301958b6fefad6";
+      sha256 = "1mzr45pxjm3xfc0x92clybxzj67akwmfjwwbmdd1wxjw37qdjvpw";
     };
     meta.homepage = "https://github.com/ryanoasis/vim-devicons/";
   };
@@ -5451,12 +5451,12 @@ let
 
   vim-lsp = buildVimPluginFrom2Nix {
     pname = "vim-lsp";
-    version = "2020-10-29";
+    version = "2020-11-04";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "eba0839b79b7f036f492b2b8c4a62269f72b3dab";
-      sha256 = "0fbz5yfjcjslpwkw81x1x2i6gd3p5rbssfqw13rbvj6ivf5qgglh";
+      rev = "594751093da71a662c0ef371ee60c05c1c96b63b";
+      sha256 = "0wanchva7g455v2bic6sfsh9wdcn0x644k9bfsbr14s8kfwpyair";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
   };
@@ -6003,12 +6003,12 @@ let
 
   vim-polyglot = buildVimPluginFrom2Nix {
     pname = "vim-polyglot";
-    version = "2020-11-02";
+    version = "2020-11-03";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
-      rev = "cd768124020d3c565f1d400ea0537949351b26a2";
-      sha256 = "1wa8wk60vs9d3qflq4m49h15bwv86gwl2hqbcbfbqdq57y3l3r87";
+      rev = "4af1321588c7dcb718022226cb27ec325973c2f0";
+      sha256 = "1dghqg23c47qmicmlrhjh6i1fan5bj5s21yinpf58ki7l68rf881";
     };
     meta.homepage = "https://github.com/sheerun/vim-polyglot/";
   };

From 11ffb0a362e39a4e0af58d9a79b6574c85863557 Mon Sep 17 00:00:00 2001
From: Mazurel <mateusz.mazur@yahoo.com>
Date: Thu, 5 Nov 2020 16:41:50 +0100
Subject: [PATCH 1745/3942] vimPlugins.vim-lsp-cxx-highlight: init at
 2020-08-12

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e08a3f5214c4..a1698b40395a 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -5461,6 +5461,18 @@ let
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
   };
 
+  vim-lsp-cxx-highlight = buildVimPluginFrom2Nix {
+    pname = "vim-lsp-cxx-highlight";
+    version = "2020-08-12";
+    src = fetchFromGitHub {
+      owner = "jackguo380";
+      repo = "vim-lsp-cxx-highlight";
+      rev = "7c47d39d808118f0ef030b15db28ff3995d91cb6";
+      sha256 = "0yiyxfhicqhhpp83ilknngr8l9r8z9bchkn3xd2ri8bx0bm7i4l7";
+    };
+    meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/";
+  };
+
   vim-maktaba = buildVimPluginFrom2Nix {
     pname = "vim-maktaba";
     version = "2020-09-23";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 4a50581cec83..dae2f4d3ba28 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -169,6 +169,7 @@ itchyny/thumbnail.vim
 itchyny/vim-cursorword
 itchyny/vim-gitbranch
 ivanov/vim-ipython
+jackguo380/vim-lsp-cxx-highlight
 jacoborus/tender.vim
 jaredgorski/SpaceCamp
 jaxbot/semantic-highlight.vim

From 0c6e5e15f8c952f0b2844cead019868e93aedb19 Mon Sep 17 00:00:00 2001
From: Mazurel <mateusz.mazur@yahoo.com>
Date: Thu, 5 Nov 2020 16:43:14 +0100
Subject: [PATCH 1746/3942] vimPlugins.vim-racket: init at 2020-07-24

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index a1698b40395a..41a1e6c90c75 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -6169,6 +6169,18 @@ let
     meta.homepage = "https://github.com/racer-rust/vim-racer/";
   };
 
+  vim-racket = buildVimPluginFrom2Nix {
+    pname = "vim-racket";
+    version = "2020-07-24";
+    src = fetchFromGitHub {
+      owner = "wlangstroth";
+      repo = "vim-racket";
+      rev = "bca2643c3d8bd0fcd46ab73bee69023a5da1964b";
+      sha256 = "059a79d66yxhhwq127sjl84ky1153im7mm5ixjcsgg9glgvd39jy";
+    };
+    meta.homepage = "https://github.com/wlangstroth/vim-racket/";
+  };
+
   vim-ragtag = buildVimPluginFrom2Nix {
     pname = "vim-ragtag";
     version = "2020-01-26";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index dae2f4d3ba28..2cc00b630f5b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -611,6 +611,7 @@ whonore/Coqtail
 will133/vim-dirdiff
 wincent/command-t
 wincent/ferret
+wlangstroth/vim-racket
 wsdjeg/vim-fetch
 xavierd/clang_complete
 xolox/vim-easytags

From 99c9647e69e3c500022f07f13f2e56bd7ede19e6 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 22:27:48 +0100
Subject: [PATCH 1747/3942] pkgsStatic.brotli: fix patch

---
 pkgs/tools/compression/brotli/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index fd4872cf8442..a69740ea1ffe 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -16,9 +16,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   patches = stdenv.lib.optional staticOnly (fetchpatch {
-    # from https://github.com/google/brotli/pull/655
-    url = "https://github.com/google/brotli/commit/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch";
-    sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg";
+    # context from https://github.com/google/brotli/pull/655
+    # updated patch from https://github.com/google/brotli/pull/655
+    url = "https://github.com/google/brotli/commit/47a554804ceabb899ae924aaee54df806053d0d1.patch";
+    sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0=";
   });
 
   cmakeFlags = []

From 4e81c65d724c22b90f8a123e6638b2b01093592d Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Sat, 7 Nov 2020 15:06:06 +0100
Subject: [PATCH 1748/3942] mypy: 0.782 -> 0.790

---
 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 0bcf216fa46f..2e751c6f48dc 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.782";
+  version = "0.790";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "030kn709515452n6gy2i1d9fg6fyrkmdz228lfpmbslybsld9xzg";
+    sha256 = "sha256-KyG6Ra2e8uLriM5K6t0BEtD1AmQYMkF2/UlKaCS3SXU=";
   };
 
   propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ];

From f671d7e1918ac66552da3459d680235f1d931f86 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 04:45:43 +0100
Subject: [PATCH 1749/3942] python3Packages.hyperopt: init at 0.1.2

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

diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix
new file mode 100644
index 000000000000..7a907224993e
--- /dev/null
+++ b/pkgs/development/python-modules/hyperopt/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, cloudpickle, numpy, future, networkx
+, six, tqdm, scipy, pymongo
+}:
+
+buildPythonPackage rec {
+  pname = "hyperopt";
+  version = "0.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "34xIpivBYUvcN/XMVwBkqTpLgaFlWWIduazuP2U2tlg=";
+  };
+
+  propagatedBuildInputs = [ future cloudpickle numpy networkx six tqdm scipy pymongo ];
+
+  # tries to use /homeless-shelter to mimic container usage, etc
+  doCheck = false;
+
+  pythonImportsCheck = [ "hyperopt" ];
+
+  meta = with stdenv.lib; {
+    description = "Distributed Asynchronous Hyperparameter Optimization";
+    homepage    = "http://hyperopt.github.com/hyperopt/";
+    license     = licenses.bsd2;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dddf6a23d51b..0570c01dda62 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2826,6 +2826,8 @@ in {
 
   hyperlink = callPackage ../development/python-modules/hyperlink { };
 
+  hyperopt = callPackage ../development/python-modules/hyperopt { };
+
   hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix
     { }; # File name is called 2.nix because this one will need to remain for Python 2.
 

From bf066b27b424c96a64ce7860d45d38e85d8b515e Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 04:46:41 +0100
Subject: [PATCH 1750/3942] python3Packages.click-help-colors: init at 0.8

---
 .../click-help-colors/default.nix             | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/click-help-colors/default.nix

diff --git a/pkgs/development/python-modules/click-help-colors/default.nix b/pkgs/development/python-modules/click-help-colors/default.nix
new file mode 100644
index 000000000000..ac1cab90d0ad
--- /dev/null
+++ b/pkgs/development/python-modules/click-help-colors/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, click, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "click-help-colors";
+  version = "0.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "EZ5fr2nPyRnJlcWWIyasj9h/EeVqNxr1lOPf2EWPTG4=";
+  };
+
+  propagatedBuildInputs = [ click ];
+
+  # tries to use /homeless-shelter to mimic container usage, etc
+  #doCheck = false;
+  checkInputs = [ pytest ];
+
+  pythonImportsCheck = [ "click_help_colors" ];
+
+  meta = with stdenv.lib; {
+    description = "Colorization of help messages in Click";
+    homepage    = "https://github.com/r-m-n/click-help-colors";
+    license     = licenses.mit;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0570c01dda62..3b2b9cf40bb8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1200,6 +1200,8 @@ in {
 
   click-didyoumean = callPackage ../development/python-modules/click-didyoumean { };
 
+  click-help-colors = callPackage ../development/python-modules/click-help-colors { };
+
   click-log = callPackage ../development/python-modules/click-log { };
 
   click-plugins = callPackage ../development/python-modules/click-plugins { };

From bbc0af82bdaa768a2d6fd2e7e586e6cb1c15a29b Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 04:47:55 +0100
Subject: [PATCH 1751/3942] python3Packages.gradient_sdk: init at 0.0.4

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

diff --git a/pkgs/development/python-modules/gradient_sdk/default.nix b/pkgs/development/python-modules/gradient_sdk/default.nix
new file mode 100644
index 000000000000..3ee66a1c5242
--- /dev/null
+++ b/pkgs/development/python-modules/gradient_sdk/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, hyperopt
+}:
+
+buildPythonPackage rec {
+  pname = "gradient_sdk";
+  version = "0.0.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "Q9oeYjjgJf2lhxW1ypsweQAPpMglmW9PxgzMsgTqJkY=";
+  };
+
+  propagatedBuildInputs = [ hyperopt ];
+
+  pythonImportsCheck = [ "gradient_sdk" ];
+
+  meta = with stdenv.lib; {
+    description = "Gradient ML SDK";
+    homepage    = "https://github.com/Paperspace/gradient-sdk";
+    license     = licenses.mit;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b2b9cf40bb8..135050e5a4dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2562,6 +2562,8 @@ in {
 
   gpyopt = callPackage ../development/python-modules/gpyopt { };
 
+  gradient_sdk = callPackage ../development/python-modules/gradient_sdk { };
+
   grammalecte = callPackage ../development/python-modules/grammalecte { };
 
   grandalf = callPackage ../development/python-modules/grandalf { };

From a73cedd74fef4c279f191dacd8519def5ad430b7 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 04:48:36 +0100
Subject: [PATCH 1752/3942] python3Packages.gradient_statsd: init at 1.0.1

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

diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix
new file mode 100644
index 000000000000..0521b4a57d6f
--- /dev/null
+++ b/pkgs/development/python-modules/gradient_statsd/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchPypi, buildPythonPackage
+, boto3, requests, datadog, configparser, python
+}:
+
+buildPythonPackage rec {
+  pname = "gradient_statsd";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "iWlNX43ZtvU73wz4+8DgDulQNOnssJGxTBkvAaLj530=";
+  };
+
+  propagatedBuildInputs = [ requests datadog ]
+    ++ lib.optional python.isPy2 configparser;
+
+  pythonImportsCheck = [ "gradient_statsd" ];
+
+  meta = with stdenv.lib; {
+    description = "Wrapper around the DogStatsd client";
+    homepage    = "https://paperspace.com";
+    license     = licenses.mit;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 135050e5a4dc..2ef9459b13f9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2564,6 +2564,8 @@ in {
 
   gradient_sdk = callPackage ../development/python-modules/gradient_sdk { };
 
+  gradient_statsd = callPackage ../development/python-modules/gradient_statsd { };
+
   grammalecte = callPackage ../development/python-modules/grammalecte { };
 
   grandalf = callPackage ../development/python-modules/grandalf { };

From c0efa713da5b88e7801febf9774d328b77e6f495 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 04:49:18 +0100
Subject: [PATCH 1753/3942] python3Packages.paperspace: unbreak

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

diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix
index c439b4099a00..fad394a5339b 100644
--- a/pkgs/development/python-modules/paperspace/default.nix
+++ b/pkgs/development/python-modules/paperspace/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchPypi, buildPythonPackage
-, boto3, requests
+, boto3, requests, gradient_statsd, terminaltables
+, click-completion , click-didyoumean, click-help-colors
+, colorama, requests_toolbelt, gradient_sdk, progressbar2
 }:
 
 buildPythonPackage rec {
@@ -11,7 +13,10 @@ buildPythonPackage rec {
     sha256 = "7959305128fea6da8ca0cdc528783a89859dacb9b54bf8eb89fd04a518872191";
   };
 
-  propagatedBuildInputs = [ boto3 requests ];
+  propagatedBuildInputs = [ boto3 requests gradient_statsd terminaltables
+    click-completion click-didyoumean click-help-colors requests_toolbelt
+    colorama gradient_sdk progressbar2
+  ];
 
   # tries to use /homeless-shelter to mimic container usage, etc
   doCheck = false;
@@ -22,6 +27,5 @@ buildPythonPackage rec {
     license     = licenses.isc;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ thoughtpolice ];
-    broken = true;
   };
 }

From 10687019df67acac0479ef570c2c47afbc155ee8 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 23:44:34 +0100
Subject: [PATCH 1754/3942] xautoclick: 0.31 -> 0.34

Migrate to Gtk3 and Qt5
Adds support for fltk too
---
 pkgs/applications/misc/xautoclick/default.nix | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index 4f441d8a9a99..f259b28131db 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -1,32 +1,30 @@
-{ stdenv, fetchurl, xorg, pkgconfig
-, gtkSupport ? true, gtk2
-, qtSupport ? true, qt4
+{ stdenv, fetchFromGitHub, xorg, pkg-config
+, cmake, libevdev
+, gtkSupport ? true, gtk3, pcre, glib, wrapGAppsHook
+, fltkSupport ? true, fltk
+, qtSupport ? true, qt5
 }:
 
-stdenv.mkDerivation {
-  version = "0.31";
+stdenv.mkDerivation rec {
   pname = "xautoclick";
-  src = fetchurl {
-    url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz";
-    sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm";
+  version = "0.34";
+
+  src = fetchFromGitHub {
+    owner = "qarkai";
+    repo = "xautoclick";
+    rev = "v${version}";
+    sha256 = "GN3zI5LQnVmRC0KWffzUTHKrxcqnstiL55hopwTTwpE=";
   };
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext ]
-    ++ stdenv.lib.optionals gtkSupport [ gtk2 ]
-    ++ stdenv.lib.optionals qtSupport [ qt4 ];
-  patchPhase = ''
-    substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11.dev}
-  '';
-  preConfigure = stdenv.lib.optional qtSupport ''
-    mkdir .bin
-    ln -s ${qt4}/bin/moc .bin/moc-qt4
-    addToSearchPath PATH .bin
-    sed -i -e "s@LD=\$_cc@LD=\$_cxx@" configure
-  '';
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ libevdev xorg.libXtst ]
+    ++ stdenv.lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook ]
+    ++ stdenv.lib.optionals fltkSupport [ fltk ]
+    ++ stdenv.lib.optionals qtSupport [ qt5.qtbase qt5.wrapQtAppsHook ];
 
   meta = with stdenv.lib; {
     description = "Autoclicker application, which enables you to automatically click the left mousebutton";
-    homepage = "http://xautoclick.sourceforge.net";
+    homepage = "https://github.com/qarkai/xautoclick";
     license = licenses.gpl2;
     platforms = platforms.linux;
   };

From ad4a4e12e859410161a348d3091b8ce93d369b25 Mon Sep 17 00:00:00 2001
From: Finn Behrens <me@kloenk.de>
Date: Sat, 7 Nov 2020 20:33:49 +0100
Subject: [PATCH 1755/3942] onefetch: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix
index 61f6fdde5d3a..ba210ca36325 100644
--- a/pkgs/tools/misc/onefetch/default.nix
+++ b/pkgs/tools/misc/onefetch/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "onefetch";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "o2sh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-KdPr/6wGyoHhEwfPektL+B1khyoRfxDHI4aFcKNU0TM=";
+    sha256 = "sha256-9HZLr/dwr5T1m6H/SHy9ULfKMkyrLNb2Z8W3RlSWzGM=";
   };
 
-  cargoSha256 = "sha256-MLlGz7Sid0G52//XekqkZgzLqFL7xoUwT6OvpaF4jm0=";
+  cargoSha256 = "sha256-cyffVX1XEF5zaNbk/VeZEtKG/Npwv5Yzz9OU5G9UyGc=";
 
   buildInputs = with stdenv;
     lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];

From e3ca5483203b44dd888f46bab4a27c4928fb7f62 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 7 Nov 2020 20:00:37 +0100
Subject: [PATCH 1756/3942] k3s: add version field

---
 pkgs/applications/networking/cluster/k3s/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index ae98fbbcc2dc..8fa288f04014 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -222,6 +222,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "k3s";
+  version = k3sVersion;
 
   # Important utilities used by  the kubelet, see
   # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494

From 4fcf71f9a28fc9a9530cac476a1403293a4b6b37 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 6 Nov 2020 19:34:02 -0300
Subject: [PATCH 1757/3942] picom: 8.1 -> 8.2

---
 pkgs/applications/window-managers/picom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix
index 9a00b3a2efaa..064e555f3a5b 100644
--- a/pkgs/applications/window-managers/picom/default.nix
+++ b/pkgs/applications/window-managers/picom/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "picom";
-  version = "8.1";
+  version = "8.2";
 
   src = fetchFromGitHub {
     owner  = "yshui";
     repo   = "picom";
     rev    = "v${version}";
-    sha256 = "0iwixf3gaichmpvhczxdg5srkb72yh61i5wh7m3fab657h3r7di6";
+    sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl";
     fetchSubmodules = true;
   };
 

From e9e003e247b67e38f9f5625b6ed6f4e646323a16 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 7 Nov 2020 23:50:18 +0100
Subject: [PATCH 1758/3942] mutt: 1.14.7 -> 2.0.0

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 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 0b18a579e3bc..49a4790f8a83 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 {
   pname = "mutt";
-  version = "1.14.7";
+  version = "2.0.0";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
-    sha256 = "0r58xnjgkw0kmnnzhb32mk5gkkani5kbi5krybpbag156fqhgxg4";
+    sha256 = "1bxf8976mrl3vbn3s5i32i1lf908yag5rsf84n76dllmly61794k";
   };
 
   patches = optional smimeSupport (fetchpatch {

From 726d307d2c1ebd43ff616a8f1ff9282202657bcf Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Nov 2020 21:17:06 -0500
Subject: [PATCH 1759/3942] linux-hardened: 5.8.x -> 5.9.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 bdcf09ef4d21..39b4f5807ea7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18354,7 +18354,7 @@ in
   # Hardened Linux
   hardenedLinuxPackagesFor = kernel': overrides:
     let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:
-      linux_latest_for_hardened = pkgs.linux_5_8;
+      linux_latest_for_hardened = pkgs.linux_5_9;
       kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;
     in linuxPackagesFor (kernel.override {
       structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {

From 169ab0b89f124694e81639ff52c8bafc695d961d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sun, 11 Oct 2020 03:15:19 +0200
Subject: [PATCH 1760/3942] redis service: Listen on localhost by default.
 Fixes #100192.

All other database servers in NixOS also use this safe-by-default setting.
---
 nixos/doc/manual/release-notes/rl-2103.xml | 5 +++++
 nixos/modules/services/databases/redis.nix | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 7fd7ff5c2a96..dc61f095a5cf 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -159,6 +159,11 @@
      to <package>nextcloud20</package>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The setting <xref linkend="opt-services.redis.bind" /> defaults to <literal>127.0.0.1</literal> now, making Redis listen on the loopback interface only, and not all public network interfaces.
+    </para>
+   </listitem>
    <listitem>
     <para>
      NixOS now emits a deprecation warning if systemd's <literal>StartLimitInterval</literal> setting is used in a <literal>serviceConfig</literal> section instead of in a <literal>unitConfig</literal>; that setting is deprecated and now undocumented for the service section by systemd upstream, but still effective and somewhat buggy there, which can be confusing. See <link xlink:href="https://github.com/NixOS/nixpkgs/issues/45785">#45785</link> for details.
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index f1777854e141..6b8853ae390b 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -87,9 +87,12 @@ in
 
       bind = mkOption {
         type = with types; nullOr str;
-        default = null; # All interfaces
-        description = "The IP interface to bind to.";
-        example = "127.0.0.1";
+        default = "127.0.0.1";
+        description = ''
+          The IP interface to bind to.
+          <literal>null</literal> means "all interfaces".
+        '';
+        example = "192.0.2.1";
       };
 
       unixSocket = mkOption {

From ac0323064d7726c944f9b9f71a61c1acc701a873 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Sat, 7 Nov 2020 19:29:44 -0500
Subject: [PATCH 1761/3942] lollypop: 1.3.2 -> 1.4.5

lollypop has a new release.

[Full changelog](https://gitlab.gnome.org/World/lollypop/-/compare/1.3.2...1.4.5)
---
 pkgs/applications/audio/lollypop/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index f325185920d7..14ab2aaf2d0b 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -7,6 +7,7 @@
 , python3
 , gtk3
 , gst_all_1
+, libhandy
 , libsecret
 , libsoup
 , appstream-glib
@@ -24,7 +25,7 @@
 
 python3.pkgs.buildPythonApplication rec  {
   pname = "lollypop";
-  version = "1.3.2";
+  version = "1.4.5";
 
   format = "other";
   doCheck = false;
@@ -33,7 +34,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "14854j1dhq67s1vzs0lqy345vbl6f5w8nb36n4i33fmpva2flsk3";
+    sha256 = "1i5qcpp3fpkda08g6nkiiff8lsjmv5xsvpa0512kigq5z0lsagrx";
   };
 
   nativeBuildInputs = [
@@ -57,6 +58,7 @@ python3.pkgs.buildPythonApplication rec  {
     gst-plugins-ugly
     gstreamer
     gtk3
+    libhandy
     libsoup
     pango
     totem-pl-parser

From d07dc0aba1b08a6891a4dc0e5dcb3c82acd665d5 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Sun, 8 Nov 2020 01:13:08 +0000
Subject: [PATCH 1762/3942] libreoffice-fresh: 7.0.0.3 -> 7.0.3.1

Also, replace HTTP with HTTPS.
---
 .../libreoffice/generate-libreoffice-srcs.py  |   4 +-
 .../office/libreoffice/src-fresh/download.nix | 264 +++++++++---------
 .../office/libreoffice/src-fresh/primary.nix  |  10 +-
 3 files changed, 139 insertions(+), 139 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
index 636f36cb383b..c4d15927f380 100755
--- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
+++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
@@ -53,10 +53,10 @@ def main():
 
 def construct_url(x):
     if x['brief']:
-        return 'http://dev-www.libreoffice.org/src/{}{}'.format(
+        return 'https://dev-www.libreoffice.org/src/{}{}'.format(
             x.get('subdir', ''), x['tarball'])
     else:
-        return 'http://dev-www.libreoffice.org/src/{}{}-{}'.format(
+        return 'https://dev-www.libreoffice.org/src/{}{}-{}'.format(
             x.get('subdir', ''), x['md5'], x['tarball'])
 
 
diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix
index 16d754a18a14..e26081a02980 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/download.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix
@@ -1,882 +1,882 @@
 [
   {
     name = "libabw-0.1.3.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz";
     sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed";
     md5 = "";
     md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz";
   }
   {
     name = "commons-logging-1.2-src.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz";
     sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81";
     md5 = "";
     md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz";
   }
   {
     name = "apr-1.5.2.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz";
     sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb";
     md5 = "";
     md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz";
   }
   {
     name = "apr-util-1.5.4.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz";
     sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19";
     md5 = "";
     md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
   }
   {
     name = "boost_1_71_0.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz";
     sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543";
     md5 = "";
     md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz";
   }
   {
     name = "breakpad.zip";
-    url = "http://dev-www.libreoffice.org/src/breakpad.zip";
+    url = "https://dev-www.libreoffice.org/src/breakpad.zip";
     sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9";
     md5 = "";
     md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip";
   }
   {
     name = "bsh-2.0b6-src.zip";
-    url = "http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
+    url = "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
     sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96";
     md5 = "beeca87be45ec87d241ddd0e1bad80c1";
     md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
   }
   {
     name = "bzip2-1.0.6.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
     sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd";
     md5 = "00b516f4704d4a7cb50a1d97e6e8e15b";
     md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
   }
   {
     name = "cairo-1.16.0.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz";
     sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331";
     md5 = "";
     md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz";
   }
   {
     name = "libcdr-0.1.6.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz";
     sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861";
     md5 = "";
     md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz";
   }
   {
     name = "clucene-core-2.3.3.4.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz";
     sha256 = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab";
     md5 = "48d647fbd8ef8889e5a7f422c1bfda94";
     md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz";
   }
   {
     name = "dtoa-20180411.tgz";
-    url = "http://dev-www.libreoffice.org/src/dtoa-20180411.tgz";
+    url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz";
     sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4";
     md5 = "";
     md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz";
   }
   {
     name = "libcmis-0.5.2.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz";
     sha256 = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2";
     md5 = "";
     md5name = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2-libcmis-0.5.2.tar.xz";
   }
   {
     name = "CoinMP-1.7.6.tgz";
-    url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz";
+    url = "https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz";
     sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f";
     md5 = "";
     md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz";
   }
   {
     name = "cppunit-1.15.1.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz";
     sha256 = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7";
     md5 = "";
     md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
   }
   {
     name = "converttexttonumber-1-5-0.oxt";
-    url = "http://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
+    url = "https://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
     sha256 = "71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3";
     md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a";
     md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
   }
   {
     name = "curl-7.71.0.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz";
     sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772";
     md5 = "";
     md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz";
   }
   {
     name = "libe-book-0.1.3.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz";
     sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9";
     md5 = "";
     md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz";
   }
   {
     name = "libepoxy-1.5.3.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz";
     sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d";
     md5 = "";
     md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz";
   }
   {
     name = "epm-3.7.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz";
     sha256 = "b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91";
     md5 = "3ade8cfe7e59ca8e65052644fed9fca4";
     md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz";
   }
   {
     name = "libepubgen-0.1.1.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz";
     sha256 = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad";
     md5 = "";
     md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz";
   }
   {
     name = "libetonyek-0.1.9.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz";
     sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a";
     md5 = "";
     md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz";
   }
   {
     name = "expat-2.2.8.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2";
     sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102";
     md5 = "";
     md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2";
   }
   {
     name = "Firebird-3.0.0.32483-0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2";
     sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860";
     md5 = "";
     md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2";
   }
   {
     name = "fontconfig-2.13.91.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz";
     sha256 = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5";
     md5 = "";
     md5name = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5-fontconfig-2.13.91.tar.gz";
   }
   {
     name = "crosextrafonts-20130214.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz";
     sha256 = "c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09";
     md5 = "368f114c078f94214a308a74c7e991bc";
     md5name = "368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz";
   }
   {
     name = "crosextrafonts-carlito-20130920.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz";
     sha256 = "4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a";
     md5 = "c74b7223abe75949b4af367942d96c7a";
     md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz";
   }
   {
     name = "dejavu-fonts-ttf-2.37.zip";
-    url = "http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip";
+    url = "https://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip";
     sha256 = "7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a";
     md5 = "33e1e61fab06a547851ed308b4ffef42";
     md5name = "33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip";
   }
   {
     name = "GentiumBasic_1102.zip";
-    url = "http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip";
+    url = "https://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip";
     sha256 = "2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc";
     md5 = "1725634df4bb3dcb1b2c91a6175f8789";
     md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip";
   }
   {
     name = "liberation-narrow-fonts-ttf-1.07.6.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz";
     sha256 = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3";
     md5 = "";
     md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz";
   }
   {
     name = "liberation-fonts-ttf-2.00.4.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz";
     sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45";
     md5 = "";
     md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz";
   }
   {
     name = "LinLibertineG-20120116.zip";
-    url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
+    url = "https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
     sha256 = "54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5";
     md5 = "e7a384790b13c29113e22e596ade9687";
     md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
   }
   {
     name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
     sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f";
     md5 = "907d6e99f241876695c19ff3db0b8923";
     md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
   }
   {
     name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
     sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61";
     md5 = "edc4d741888bc0d38e32dbaa17149596";
     md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
   }
   {
     name = "source-serif-pro-3.000R.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz";
     sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3";
     md5 = "";
     md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz";
   }
   {
     name = "EmojiOneColor-SVGinOT-1.3.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz";
     sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7";
     md5 = "";
     md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz";
   }
   {
     name = "noto-fonts-20171024.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz";
     sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994";
     md5 = "";
     md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz";
   }
   {
     name = "culmus-0.131.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz";
     sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b";
     md5 = "";
     md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz";
   }
   {
     name = "libre-hebrew-1.0.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz";
     sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a";
     md5 = "";
     md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz";
   }
   {
     name = "alef-1.001.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/alef-1.001.tar.gz";
     sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52";
     md5 = "";
     md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz";
   }
   {
     name = "Amiri-0.111.zip";
-    url = "http://dev-www.libreoffice.org/src/Amiri-0.111.zip";
+    url = "https://dev-www.libreoffice.org/src/Amiri-0.111.zip";
     sha256 = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166";
     md5 = "";
     md5name = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166-Amiri-0.111.zip";
   }
   {
     name = "ttf-kacst_2.01+mry.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz";
     sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56";
     md5 = "";
     md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz";
   }
   {
     name = "ReemKufi-0.7.zip";
-    url = "http://dev-www.libreoffice.org/src/ReemKufi-0.7.zip";
+    url = "https://dev-www.libreoffice.org/src/ReemKufi-0.7.zip";
     sha256 = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f";
     md5 = "";
     md5name = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f-ReemKufi-0.7.zip";
   }
   {
     name = "Scheherazade-2.100.zip";
-    url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip";
+    url = "https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip";
     sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5";
     md5 = "";
     md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip";
   }
   {
     name = "libfreehand-0.1.2.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz";
     sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac";
     md5 = "";
     md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
   }
   {
     name = "freetype-2.9.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2";
     sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d";
     md5 = "";
     md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2";
   }
   {
     name = "glm-0.9.9.7.zip";
-    url = "http://dev-www.libreoffice.org/src/glm-0.9.9.7.zip";
+    url = "https://dev-www.libreoffice.org/src/glm-0.9.9.7.zip";
     sha256 = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95";
     md5 = "";
     md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip";
   }
   {
     name = "gpgme-1.9.0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2";
     sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb";
     md5 = "";
     md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2";
   }
   {
     name = "graphite2-minimal-1.3.14.tgz";
-    url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz";
+    url = "https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz";
     sha256 = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc";
     md5 = "";
     md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";
   }
   {
     name = "harfbuzz-2.6.0.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz";
     sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966";
     md5 = "";
     md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz";
   }
   {
     name = "hsqldb_1_8_0.zip";
-    url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
+    url = "https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
     sha256 = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370";
     md5 = "17410483b5b5f267aa18b7e00b65e6e0";
     md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
   }
   {
     name = "hunspell-1.7.0.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz";
     sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951";
     md5 = "";
     md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz";
   }
   {
     name = "hyphen-2.8.8.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
     sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705";
     md5 = "5ade6ae2a99bc1e9e57031ca88d36dad";
     md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
   }
   {
     name = "icu4c-67_1-src.tgz";
-    url = "http://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz";
+    url = "https://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz";
     sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc";
     md5 = "";
     md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz";
   }
   {
     name = "icu4c-67_1-data.zip";
-    url = "http://dev-www.libreoffice.org/src/icu4c-67_1-data.zip";
+    url = "https://dev-www.libreoffice.org/src/icu4c-67_1-data.zip";
     sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e";
     md5 = "";
     md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip";
   }
   {
     name = "flow-engine-0.9.4.zip";
-    url = "http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip";
+    url = "https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip";
     sha256 = "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd";
     md5 = "ba2930200c9f019c2d93a8c88c651a0f";
     md5name = "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip";
   }
   {
     name = "flute-1.1.6.zip";
-    url = "http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip";
+    url = "https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip";
     sha256 = "1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133";
     md5 = "d8bd5eed178db6e2b18eeed243f85aa8";
     md5name = "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip";
   }
   {
     name = "libbase-1.1.6.zip";
-    url = "http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip";
+    url = "https://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip";
     sha256 = "75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba";
     md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624";
     md5name = "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip";
   }
   {
     name = "libfonts-1.1.6.zip";
-    url = "http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip";
+    url = "https://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip";
     sha256 = "e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743";
     md5 = "3bdf40c0d199af31923e900d082ca2dd";
     md5name = "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip";
   }
   {
     name = "libformula-1.1.7.zip";
-    url = "http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip";
+    url = "https://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip";
     sha256 = "5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b";
     md5 = "3404ab6b1792ae5f16bbd603bd1e1d03";
     md5name = "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip";
   }
   {
     name = "liblayout-0.2.10.zip";
-    url = "http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip";
+    url = "https://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip";
     sha256 = "e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772";
     md5 = "db60e4fde8dd6d6807523deb71ee34dc";
     md5name = "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip";
   }
   {
     name = "libloader-1.1.6.zip";
-    url = "http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip";
+    url = "https://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip";
     sha256 = "3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8";
     md5 = "97b2d4dba862397f446b217e2b623e71";
     md5name = "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip";
   }
   {
     name = "librepository-1.1.6.zip";
-    url = "http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip";
+    url = "https://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip";
     sha256 = "abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095";
     md5 = "8ce2fcd72becf06c41f7201d15373ed9";
     md5name = "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip";
   }
   {
     name = "libserializer-1.1.6.zip";
-    url = "http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip";
+    url = "https://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip";
     sha256 = "05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343";
     md5 = "f94d9870737518e3b597f9265f4e9803";
     md5name = "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip";
   }
   {
     name = "libxml-1.1.7.zip";
-    url = "http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip";
+    url = "https://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip";
     sha256 = "7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66";
     md5 = "ace6ab49184e329db254e454a010f56d";
     md5name = "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip";
   }
   {
     name = "sacjava-1.3.zip";
-    url = "http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
+    url = "https://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
     sha256 = "085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045";
     md5 = "39bb3fcea1514f1369fcfc87542390fd";
     md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
   }
   {
     name = "libjpeg-turbo-1.5.3.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz";
     sha256 = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523";
     md5 = "";
     md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
   }
   {
     name = "language-subtag-registry-2020-04-01.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2";
     sha256 = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da";
     md5 = "";
     md5name = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da-language-subtag-registry-2020-04-01.tar.bz2";
   }
   {
     name = "JLanguageTool-1.7.0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2";
     sha256 = "48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d";
     md5 = "b63e6340a02ff1cacfeadb2c42286161";
     md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2";
   }
   {
     name = "lcms2-2.9.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz";
     sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20";
     md5 = "";
     md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz";
   }
   {
     name = "libassuan-2.5.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2";
     sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449";
     md5 = "";
     md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2";
   }
   {
     name = "libatomic_ops-7.6.8.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz";
     sha256 = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665";
     md5 = "";
     md5name = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665-libatomic_ops-7.6.8.tar.gz";
   }
   {
     name = "libeot-0.01.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2";
     sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a";
     md5 = "";
     md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2";
   }
   {
     name = "libexttextcat-3.4.5.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz";
     sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8";
     md5 = "";
     md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz";
   }
   {
     name = "libffi-3.3.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libffi-3.3.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libffi-3.3.tar.gz";
     sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056";
     md5 = "";
     md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz";
   }
   {
     name = "libgpg-error-1.27.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";
     sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2";
     md5 = "";
     md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2";
   }
   {
     name = "liblangtag-0.6.2.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";
     sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e";
     md5 = "";
     md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2";
   }
   {
     name = "libnumbertext-1.0.6.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz";
     sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57";
     md5 = "";
     md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz";
   }
   {
     name = "ltm-1.0.zip";
-    url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip";
+    url = "https://dev-www.libreoffice.org/src/ltm-1.0.zip";
     sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483";
     md5 = "";
     md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
   }
   {
     name = "xmlsec1-1.2.30.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz";
     sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8";
     md5 = "";
     md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz";
   }
   {
     name = "libxml2-2.9.10.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz";
     sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f";
     md5 = "";
     md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz";
   }
   {
     name = "libxslt-1.1.34.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz";
     sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f";
     md5 = "";
     md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz";
   }
   {
     name = "lp_solve_5.5.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
     sha256 = "171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695";
     md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
     md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
   }
   {
     name = "lxml-4.1.1.tgz";
-    url = "http://dev-www.libreoffice.org/src/lxml-4.1.1.tgz";
+    url = "https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz";
     sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e";
     md5 = "";
     md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz";
   }
   {
     name = "mariadb-connector-c-3.1.8-src.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz";
     sha256 = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b";
     md5 = "";
     md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz";
   }
   {
     name = "mdds-1.6.0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2";
     sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d";
     md5 = "";
     md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2";
   }
   {
     name = "mDNSResponder-878.200.35.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz";
     sha256 = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0";
     md5 = "";
     md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz";
   }
   {
     name = "libmspub-0.1.4.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz";
     sha256 = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba";
     md5 = "";
     md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz";
   }
   {
     name = "libmwaw-0.3.16.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz";
     sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868";
     md5 = "";
     md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz";
   }
   {
     name = "mythes-1.2.4.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
     sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f";
     md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6";
     md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
   }
   {
     name = "neon-0.30.2.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz";
     sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca";
     md5 = "";
     md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
   }
   {
-    name = "nss-3.47.1-with-nspr-4.23.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz";
-    sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64";
+    name = "nss-3.55-with-nspr-4.27.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/nss-3.55-with-nspr-4.27.tar.gz";
+    sha256 = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45";
     md5 = "";
-    md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz";
+    md5name = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45-nss-3.55-with-nspr-4.27.tar.gz";
   }
   {
     name = "libodfgen-0.1.6.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2";
     sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2";
     md5 = "";
     md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2";
   }
   {
     name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar";
-    url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar";
+    url = "https://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar";
     sha256 = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0";
     md5 = "";
     md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar";
   }
   {
     name = "officeotron-0.7.4-master.jar";
-    url = "http://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
+    url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
     sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770";
     md5 = "8249374c274932a21846fa7629c2aa9b";
     md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
   }
   {
     name = "openldap-2.4.45.tgz";
-    url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";
+    url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";
     sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824";
     md5 = "";
     md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
   }
   {
     name = "openssl-1.0.2t.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz";
     sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc";
     md5 = "";
     md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz";
   }
   {
     name = "liborcus-0.15.4.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2";
     sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61";
     md5 = "";
     md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2";
   }
   {
     name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
     sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb";
     md5 = "";
     md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
   }
   {
     name = "libpagemaker-0.0.4.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz";
     sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d";
     md5 = "";
     md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
   }
   {
     name = "pdfium-4137.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2";
     sha256 = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6";
     md5 = "";
     md5name = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6-pdfium-4137.tar.bz2";
   }
   {
     name = "pixman-0.34.0.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz";
     sha256 = "21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e";
     md5 = "e80ebae4da01e77f68744319f01d52a3";
     md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz";
   }
   {
     name = "libpng-1.6.37.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz";
     sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca";
     md5 = "";
     md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
   }
   {
     name = "poppler-0.82.0.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz";
     sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df";
     md5 = "";
     md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz";
   }
   {
     name = "postgresql-9.2.24.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2";
     sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126";
     md5 = "";
     md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
   }
   {
     name = "Python-3.7.7.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz";
     sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136";
     md5 = "";
     md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz";
   }
   {
     name = "QR-Code-generator-1.4.0.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz";
     sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a";
     md5 = "";
     md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz";
   }
   {
     name = "libqxp-0.0.2.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz";
     sha256 = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c";
     md5 = "";
     md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz";
   }
   {
     name = "raptor2-2.0.15.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
     sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed";
     md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd";
     md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
   }
   {
     name = "rasqal-0.9.33.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz";
     sha256 = "6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c";
     md5 = "1f5def51ca0026cd192958ef07228b52";
     md5name = "1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz";
   }
   {
     name = "redland-1.0.17.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz";
     sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681";
     md5 = "e5be03eda13ef68aabab6e42aa67715e";
     md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz";
   }
   {
     name = "librevenge-0.0.4.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2";
     sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf";
     md5 = "";
     md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2";
   }
   {
     name = "rhino1_5R5.zip";
-    url = "http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip";
+    url = "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip";
     sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753";
     md5 = "798b2ffdc8bcfe7bca2cf92b62caf685";
     md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip";
   }
   {
     name = "serf-1.2.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2";
     sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700";
     md5 = "";
     md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2";
   }
   {
-    name = "skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz";
-    sha256 = "f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0";
+    name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";
+    sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760";
     md5 = "";
-    md5name = "f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0-skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz";
+    md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";
   }
   {
     name = "libstaroffice-0.0.7.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz";
     sha256 = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db";
     md5 = "";
     md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz";
   }
   {
     name = "swingExSrc.zip";
-    url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip";
+    url = "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip";
     sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1";
     md5 = "35c94d2df8893241173de1d16b6034c0";
     md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip";
   }
   {
     name = "twaindsm_2.4.1.orig.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz";
     sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6";
     md5 = "";
     md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz";
   }
   {
     name = "ucpp-1.3.2.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
     sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776";
     md5 = "0168229624cfac409e766913506961a8";
     md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
   }
   {
     name = "libvisio-0.1.7.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz";
     sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c";
     md5 = "";
     md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz";
   }
   {
     name = "libwpd-0.10.3.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz";
     sha256 = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09";
     md5 = "";
     md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz";
   }
   {
     name = "libwpg-0.3.3.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz";
     sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c";
     md5 = "";
     md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz";
   }
   {
     name = "libwps-0.4.11.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz";
     sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1";
     md5 = "";
     md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz";
   }
   {
     name = "xsltml_2.1.2.zip";
-    url = "http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip";
+    url = "https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip";
     sha256 = "75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870";
     md5 = "a7983f859eafb2677d7ff386a023bc40";
     md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip";
   }
   {
     name = "zlib-1.2.11.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz";
     sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066";
     md5 = "";
     md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz";
   }
   {
     name = "libzmf-0.0.2.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz";
     sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22";
     md5 = "";
     md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";
diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
index 1beb8f1156c4..dbfd249901e7 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
@@ -8,8 +8,8 @@ rec {
 
   major = "7";
   minor = "0";
-  patch = "0";
-  tweak = "3";
+  patch = "3";
+  tweak = "1";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -17,13 +17,13 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "sha256-sl+vgnLGIWtyw8Y/ovVsxThdOMg2Gby4SRaiaqvZVB0=";
+    sha256 = "0b998k2dxbbj7hn3srn07fgsah236h14ncyyahamdff6h3hvqrk5";
   };
 
   # FIXME rename
   translations = fetchSrc {
     name = "translations";
-    sha256 = "sha256-i3yfD5cmM6D9BctjablIFRqfibjrwLAaxxPIsQdk0sY=";
+    sha256 = "0s3ic79q0c16hbd6r06mwkyqhw4fdfy9z3xbqvdxp7jl64cjlaj4";
   };
 
   # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@@ -31,6 +31,6 @@ rec {
 
   help = fetchSrc {
     name = "help";
-    sha256 = "sha256-hYBEEPRmh16zgGZBUN20xfTY6qL07aKMC1lC/0ij9/0=";
+    sha256 = "14wjkcdmcflfcc7264jx64s6clk5rdsprx7nkbv08z0bp6ff677b";
   };
 }

From 16ee3d1e09da3113157b38c49bc01c90f91242b7 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Fri, 6 Nov 2020 16:21:27 -0800
Subject: [PATCH 1763/3942] cocoapods: 1.9.3 -> 1.10.0

---
 .../development/mobile/cocoapods/Gemfile.lock | 47 +++++-----
 pkgs/development/mobile/cocoapods/gemset.nix  | 89 +++++++++++--------
 2 files changed, 77 insertions(+), 59 deletions(-)

diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock
index 9e891569d92d..d4de7cd698d7 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile.lock
@@ -2,25 +2,26 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.2)
-    activesupport (4.2.11.3)
-      i18n (~> 0.7)
+    activesupport (5.2.4.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    algoliasearch (1.27.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.9.3)
-      activesupport (>= 4.0.2, < 5)
+    cocoapods (1.10.0)
+      addressable (~> 2.6)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.9.3)
+      cocoapods-core (= 1.10.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.2.2, < 2.0)
+      cocoapods-downloader (>= 1.4.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.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
@@ -30,55 +31,57 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.14.0, < 2.0)
-    cocoapods-core (1.9.3)
-      activesupport (>= 4.0.2, < 6)
+      xcodeproj (>= 1.19.0, < 2.0)
+    cocoapods-core (1.10.0)
+      activesupport (> 5.0, < 6)
+      addressable (~> 2.6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
       netrc (~> 0.11)
+      public_suffix
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.3.0)
+    cocoapods-downloader (1.4.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.1.0)
     cocoapods-trunk (1.5.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     escape (0.0.4)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    ffi (1.12.2)
+    ffi (1.13.1)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (0.9.5)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
-    minitest (5.14.1)
+    json (2.3.1)
+    minitest (5.14.2)
     molinillo (0.6.6)
-    nanaimo (0.2.6)
+    nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
+    public_suffix (4.0.6)
     ruby-macho (1.4.0)
     thread_safe (0.3.6)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    xcodeproj (1.16.0)
+    xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
+      nanaimo (~> 0.3.0)
 
 PLATFORMS
   ruby
diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix
index 8ff1b2e118ba..3641186186e8 100644
--- a/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/pkgs/development/mobile/cocoapods/gemset.nix
@@ -1,14 +1,25 @@
 {
   activesupport = {
-    dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i";
+      sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd";
       type = "gem";
     };
-    version = "4.2.11.3";
+    version = "5.2.4.4";
+  };
+  addressable = {
+    dependencies = ["public_suffix"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+      type = "gem";
+    };
+    version = "2.7.0";
   };
   algoliasearch = {
     dependencies = ["httpclient" "json"];
@@ -16,10 +27,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1b3xk42ry6dlsqn379p884zdi4iyra67xh45rwl6vcrwmrnbq7f0";
+      sha256 = "0ly8zsgvih540xmxr098hsngv61cf119wf28q5hbvi1f7kgwvh96";
       type = "gem";
     };
-    version = "1.27.2";
+    version = "1.27.5";
   };
   atomos = {
     source = {
@@ -50,26 +61,26 @@
     version = "1.0.3";
   };
   cocoapods = {
-    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"];
+    dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zqj1878izp34cn7552q2djs3zd4a5ylyv0af3yxbz34z0qllk60";
+      sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j";
       type = "gem";
     };
-    version = "1.9.3";
+    version = "1.10.0";
   };
   cocoapods-core = {
-    dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
+    dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sn1561sdhq2bh35pmi9nhq1adjcgdkhxybd9pxcjs75zmqzpz13";
+      sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4";
       type = "gem";
     };
-    version = "1.9.3";
+    version = "1.10.0";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -86,10 +97,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08vn0pgcyn6w6fq5xjd7szv2h9s5rzl17kyidnd7fl5qdmzc9c54";
+      sha256 = "1j03hxvz3m82fwgx3jayw0y2iqm7zpacn88r6nfj2arkbjxmvjwz";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.0";
   };
   cocoapods-plugins = {
     dependencies = ["nap"];
@@ -108,16 +119,6 @@
     };
     version = "1.0.0";
   };
-  cocoapods-stats = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
   cocoapods-trunk = {
     dependencies = ["nap" "netrc"];
     groups = ["default"];
@@ -152,10 +153,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
+      sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
       type = "gem";
     };
-    version = "1.1.6";
+    version = "1.1.7";
   };
   escape = {
     source = {
@@ -181,10 +182,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
+      sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
       type = "gem";
     };
-    version = "1.12.2";
+    version = "1.13.1";
   };
   fourflusher = {
     groups = ["default"];
@@ -224,32 +225,34 @@
   };
   i18n = {
     dependencies = ["concurrent-ruby"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
+      sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
       type = "gem";
     };
-    version = "0.9.5";
+    version = "1.8.5";
   };
   json = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
+      sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.3.1";
   };
   minitest = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g";
+      sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
       type = "gem";
     };
-    version = "5.14.1";
+    version = "5.14.2";
   };
   molinillo = {
     source = {
@@ -260,12 +263,14 @@
     version = "0.6.6";
   };
   nanaimo = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ajfyaqjw3dzykk612yw8sm21savfqy292hgps8h8l4lvxww1lz6";
+      sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma";
       type = "gem";
     };
-    version = "0.2.6";
+    version = "0.3.0";
   };
   nap = {
     source = {
@@ -283,6 +288,16 @@
     };
     version = "0.11.0";
   };
+  public_suffix = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+      type = "gem";
+    };
+    version = "4.0.6";
+  };
   ruby-macho = {
     groups = ["default"];
     platforms = [];
@@ -329,9 +344,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi";
+      sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn";
       type = "gem";
     };
-    version = "1.16.0";
+    version = "1.19.0";
   };
 }
\ No newline at end of file

From a5ec423734fbf4ef1fe15026116f6f0911fb9196 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Fri, 6 Nov 2020 16:21:42 -0800
Subject: [PATCH 1764/3942] cocoapods-beta: 1.10.0.beta.2 -> 1.10.0

---
 .../mobile/cocoapods/Gemfile-beta.lock        | 18 ++++++------
 .../mobile/cocoapods/gemset-beta.nix          | 28 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
index 98963ba41282..9c5e10d3a482 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
@@ -2,22 +2,22 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.2)
-    activesupport (5.2.4.3)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    algoliasearch (1.27.3)
+    algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.10.0.beta.2)
+    cocoapods (1.10.0)
       addressable (~> 2.6)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.0.beta.2)
+      cocoapods-core (= 1.10.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,8 +31,8 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.17.0, < 2.0)
-    cocoapods-core (1.10.0.beta.2)
+      xcodeproj (>= 1.19.0, < 2.0)
+    cocoapods-core (1.10.0)
       activesupport (> 5.0, < 6)
       addressable (~> 2.6)
       algoliasearch (~> 1.0)
@@ -64,19 +64,19 @@ GEM
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     json (2.3.1)
-    minitest (5.14.1)
+    minitest (5.14.2)
     molinillo (0.6.6)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     ruby-macho (1.4.0)
     thread_safe (0.3.6)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    xcodeproj (1.18.0)
+    xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix
index b456f728b4c4..9067f2cec43e 100644
--- a/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix
@@ -5,10 +5,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02fdawr3wyvpzpja3r7mvb8lmn2mm5jdw502bx3ncr2sy2nw1kx6";
+      sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd";
       type = "gem";
     };
-    version = "5.2.4.3";
+    version = "5.2.4.4";
   };
   addressable = {
     dependencies = ["public_suffix"];
@@ -27,10 +27,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1z94dnx0rljsfa3k24i1nc0vf1nfk3bbk89nqc6n1ax25h4fs5sw";
+      sha256 = "0ly8zsgvih540xmxr098hsngv61cf119wf28q5hbvi1f7kgwvh96";
       type = "gem";
     };
-    version = "1.27.3";
+    version = "1.27.5";
   };
   atomos = {
     groups = ["default"];
@@ -68,10 +68,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jf5q75h410b6gymy86j4zy9yhb6n28wa7hrk8p7y2dsafdzbric";
+      sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j";
       type = "gem";
     };
-    version = "1.10.0.beta.2";
+    version = "1.10.0";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@@ -79,10 +79,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vrw6v5fp0m903ghvfwaw3mbxrr68x7hz9bj34rj4icirwp4ifyl";
+      sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4";
       type = "gem";
     };
-    version = "1.10.0.beta.2";
+    version = "1.10.0";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -263,10 +263,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g";
+      sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
       type = "gem";
     };
-    version = "5.14.1";
+    version = "5.14.2";
   };
   molinillo = {
     groups = ["default"];
@@ -313,10 +313,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g";
+      sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
       type = "gem";
     };
-    version = "4.0.5";
+    version = "4.0.6";
   };
   ruby-macho = {
     groups = ["default"];
@@ -366,9 +366,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18idiqfbvyrcyflccwy4qw125psckrnqy7ggci33m8f3zs8h7hnm";
+      sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn";
       type = "gem";
     };
-    version = "1.18.0";
+    version = "1.19.0";
   };
 }
\ No newline at end of file

From c60ef6a249b952ed975c51a8701d1bd22a6185d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 8 Nov 2020 02:45:57 +0100
Subject: [PATCH 1765/3942] vgo2nix: 2020-05-05 -> 2020-11-07

---
 pkgs/development/tools/vgo2nix/default.nix |  36 ++--
 pkgs/development/tools/vgo2nix/deps.nix    | 210 ---------------------
 2 files changed, 17 insertions(+), 229 deletions(-)
 delete mode 100644 pkgs/development/tools/vgo2nix/deps.nix

diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix
index 880703383d11..d48787ea017a 100644
--- a/pkgs/development/tools/vgo2nix/default.nix
+++ b/pkgs/development/tools/vgo2nix/default.nix
@@ -1,41 +1,39 @@
-{ stdenv
-, lib
-, buildGoPackage
-, go
+{ lib
+, fetchFromGitHub
+, buildGoModule
 , makeWrapper
 , nix-prefetch-git
-, fetchFromGitHub
+, go
 }:
 
-buildGoPackage {
+buildGoModule {
   pname = "vgo2nix";
-  version = "unstable-2020-05-05";
-  goPackagePath = "github.com/adisbladis/vgo2nix";
-
-  nativeBuildInputs = [ makeWrapper ];
+  version = "unstable-2020-11-07";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "vgo2nix";
-    rev = "71e59bf268d5257a0f89b2f59cd20fd468c8c6ac";
-    sha256 = "1pcdkknq2v7nrs0siqcvvq2x0qqz5snwdz2lpjnad8i33rwhmayh";
+    rev = "4546d8056ab09ece3d2489594627c0541b15a397";
+    sha256 = "0n9pf0i5y59kiiv6dq8h8w1plaz9w6s67rqr2acqgxa45iq36mkh";
   };
 
-  goDeps = ./deps.nix;
+  vendorSha256 = "1lzhhg9wimn8nfzrrla5bshgk1ghnlsdfmq6iask0zqz311g96bv";
+
+  subPackages = [ "." ];
+
+  nativeBuildInputs = [ makeWrapper ];
 
   allowGoReference = true;
 
-  postInstall = with stdenv; let
-    binPath = lib.makeBinPath [ nix-prefetch-git go ];
-  in ''
-    wrapProgram $out/bin/vgo2nix --prefix PATH : ${binPath}
+  postInstall = ''
+    wrapProgram $out/bin/vgo2nix --prefix PATH : ${lib.makeBinPath [ nix-prefetch-git go ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files";
     homepage = "https://github.com/nix-community/vgo2nix";
     license = licenses.mit;
-    maintainers = with maintainers; [ adisbladis ];
+    maintainers = with maintainers; [ adisbladis SuperSandro2000 ];
   };
 
 }
diff --git a/pkgs/development/tools/vgo2nix/deps.nix b/pkgs/development/tools/vgo2nix/deps.nix
deleted file mode 100644
index 2d9a130e43e3..000000000000
--- a/pkgs/development/tools/vgo2nix/deps.nix
+++ /dev/null
@@ -1,210 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
-  {
-    goPackagePath = "github.com/alecthomas/assert";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/assert";
-      rev = "405dbfeb8e38";
-      sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l";
-    };
-  }
-  {
-    goPackagePath = "github.com/alecthomas/colour";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/colour";
-      rev = "60882d9e2721";
-      sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs";
-    };
-  }
-  {
-    goPackagePath = "github.com/alecthomas/kingpin";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/kingpin";
-      rev = "v2.2.6";
-      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
-    };
-  }
-  {
-    goPackagePath = "github.com/alecthomas/repr";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/repr";
-      rev = "117648cd9897";
-      sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp";
-    };
-  }
-  {
-    goPackagePath = "github.com/alecthomas/template";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/template";
-      rev = "a0175ee3bccc";
-      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
-    };
-  }
-  {
-    goPackagePath = "github.com/alecthomas/units";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/units";
-      rev = "2efee857e7cf";
-      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
-    };
-  }
-  {
-    goPackagePath = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev = "v1.1.1";
-      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-isatty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-isatty";
-      rev = "v0.0.3";
-      sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
-    };
-  }
-  {
-    goPackagePath = "github.com/orivej/e";
-    fetch = {
-      type = "git";
-      url = "https://github.com/orivej/e";
-      rev = "ac3492690fda";
-      sha256 = "11jizr28kfkr6zscjxg95pqi6cjp08aqnhs41sdhc98nww78ilkr";
-    };
-  }
-  {
-    goPackagePath = "github.com/orivej/go-nix";
-    fetch = {
-      type = "git";
-      url = "https://github.com/orivej/go-nix";
-      rev = "dae45d921a44";
-      sha256 = "17hfmsz8hs3h2d5c06j1bvbw8ijrhzm3iz911z5zydsl4x7y0cgy";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/profile";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/profile";
-      rev = "v1.2.1";
-      sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr";
-    };
-  }
-  {
-    goPackagePath = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev = "v1.0.0";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-    };
-  }
-  {
-    goPackagePath = "github.com/sergi/go-diff";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sergi/go-diff";
-      rev = "v1.0.0";
-      sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
-    };
-  }
-  {
-    goPackagePath = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev = "v1.2.2";
-      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
-    };
-  }
-  {
-    goPackagePath = "github.com/yuin/goldmark";
-    fetch = {
-      type = "git";
-      url = "https://github.com/yuin/goldmark";
-      rev = "v1.1.27";
-      sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "87dc89f01550";
-      sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/mod";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/mod";
-      rev = "v0.2.0";
-      sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "0de0cce0169b";
-      sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sync";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sync";
-      rev = "cd5d95a43a6e";
-      sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "97732733099d";
-      sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "v0.3.0";
-      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/tools";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev = "0c9eba77bc32";
-      sha256 = "1xz0jyxdmibkams6vd61va5cw963l25jjf3i9r33m0i739qwg4lj";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/xerrors";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/xerrors";
-      rev = "9bdfabe68543";
-      sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c";
-    };
-  }
-]

From c8d6ea6925e5dfc9eeba73e5d7e1b5be65b12aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Thu, 29 Oct 2020 15:37:21 +0100
Subject: [PATCH 1766/3942] restic-rest-server: 0.9.7 -> 0.10.0

---
 pkgs/tools/backup/restic/rest-server.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix
index 45a4df74b15d..9f2a52d64dcd 100644
--- a/pkgs/tools/backup/restic/rest-server.nix
+++ b/pkgs/tools/backup/restic/rest-server.nix
@@ -1,25 +1,20 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "restic-rest-server";
-  version = "0.9.7";
-
-  goPackagePath = "github.com/restic/rest-server";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "restic";
     repo = "rest-server";
     rev = "v${version}";
-    sha256 = "1g47ly1pxwn0znbj3v5j6kqhn66d4wf0d5gjqzig75pzknapv8qj";
+    sha256 = "1msa6mah76zfif5wp0129jjk2jlq5ff38p9p6d241mw45i1xjfy7";
   };
 
-  buildPhase = ''
-    cd go/src/${goPackagePath}
-    go run build.go
-  '';
+  vendorSha256 = "04w63sx7p0fm9xq0m7xab808az7lgw7i3p8basndszky8kgvxhmg";
 
-  installPhase = ''
-    install -Dt $out/bin rest-server
+  preCheck = ''
+    substituteInPlace handlers_test.go --replace "TestJoin" "SkipTestJoin"
   '';
 
   meta = with lib; {

From d63af62a6eff7516a8189ecf9cc3f0a7b61de590 Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Sun, 13 Sep 2020 18:29:15 +0200
Subject: [PATCH 1767/3942] nomad: 0.12.3 -> 0.12.4

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

diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix
index 3687b58b5a7c..d3942a891925 100644
--- a/pkgs/applications/networking/cluster/nomad/0.12.nix
+++ b/pkgs/applications/networking/cluster/nomad/0.12.nix
@@ -2,6 +2,6 @@
 
 callPackage ./generic.nix {
   inherit buildGoPackage;
-  version = "0.12.3";
-  sha256 = "100ynhc4nm4mmjxx1jhq2kjbqshxvi5x8y482520j8gsyn40g6zc";
+  version = "0.12.4";
+  sha256 = "0lwrkynq7iksfjk2m7i56l59d06gibyn6vd9bw80x5h08yw2zdks";
 }

From b64df08a5fa2b12be9275c4cf963b1bd83446af9 Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Sun, 13 Sep 2020 18:29:35 +0200
Subject: [PATCH 1768/3942] nomad: Default package 0.11 -> 0.12

Nomad 0.12 has now reached a fairly stable point release, this means we
should now be able to bump the default pretty safely, with recent
releases bug fixes primarily targetting 0.12 exclusive features, or long
standing latent bugs.
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fde911a0a7c2..75928eb7dcc8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5901,7 +5901,8 @@ in
 
   noip = callPackage ../tools/networking/noip { };
 
-  nomad = nomad_0_11;
+  nomad = nomad_0_12;
+
   # Nomad never updates major go versions within a release series and is unsupported
   # on Go versions that it did not ship with. Due to historic bugs when compiled
   # with different versions we pin Go for all versions.

From dff0cadbc6c631c65fe7f1fe27a587e934a4b897 Mon Sep 17 00:00:00 2001
From: "Maxine E. Aubrey" <maxeaubrey@gmail.com>
Date: Wed, 21 Oct 2020 19:21:20 +0200
Subject: [PATCH 1769/3942] nomad_0_12: 0.12.4 -> 0.12.5

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

diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix
index d3942a891925..987ecaac157b 100644
--- a/pkgs/applications/networking/cluster/nomad/0.12.nix
+++ b/pkgs/applications/networking/cluster/nomad/0.12.nix
@@ -2,6 +2,6 @@
 
 callPackage ./generic.nix {
   inherit buildGoPackage;
-  version = "0.12.4";
-  sha256 = "0lwrkynq7iksfjk2m7i56l59d06gibyn6vd9bw80x5h08yw2zdks";
+  version = "0.12.5";
+  sha256 = "15cadw8rwdi7iphki8hg3jvxfh0cbxn4i0b1mds1j8z0s7j75mci";
 }

From decc5fbbc6d17119ac9b27f4d119253fe349350f Mon Sep 17 00:00:00 2001
From: "Maxine E. Aubrey" <maxeaubrey@gmail.com>
Date: Thu, 22 Oct 2020 10:56:09 +0200
Subject: [PATCH 1770/3942] nomad_0_11: 0.11.4 -> 0.11.5

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

diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix
index ff0d1c69f41d..8c54f5bc1ebf 100644
--- a/pkgs/applications/networking/cluster/nomad/0.11.nix
+++ b/pkgs/applications/networking/cluster/nomad/0.11.nix
@@ -2,6 +2,6 @@
 
 callPackage ./generic.nix {
   inherit buildGoPackage;
-  version = "0.11.4";
-  sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb";
+  version = "0.11.5";
+  sha256 = "0g7i7qd0zksd7s8y4l63kk7xdc7nrw8radba6ws3hw0h2kr2cmp8";
 }

From ed6f7108df0d37cd14bf5523ceb796c18511ed9a Mon Sep 17 00:00:00 2001
From: "Maxine E. Aubrey" <maxeaubrey@gmail.com>
Date: Thu, 22 Oct 2020 10:56:21 +0200
Subject: [PATCH 1771/3942] nomad_0_12: 0.12.5 -> 0.12.6

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

diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix
index 987ecaac157b..b92bf568b79f 100644
--- a/pkgs/applications/networking/cluster/nomad/0.12.nix
+++ b/pkgs/applications/networking/cluster/nomad/0.12.nix
@@ -2,6 +2,6 @@
 
 callPackage ./generic.nix {
   inherit buildGoPackage;
-  version = "0.12.5";
-  sha256 = "15cadw8rwdi7iphki8hg3jvxfh0cbxn4i0b1mds1j8z0s7j75mci";
+  version = "0.12.6";
+  sha256 = "1fd7i50zc7g7d879bijh1ckvyq0h28169p6hw5ip71n71zhvvgp0";
 }

From 2ff401dd59283ad249c70834bd99db27dede722a Mon Sep 17 00:00:00 2001
From: "Maxine E. Aubrey" <maxeaubrey@gmail.com>
Date: Fri, 23 Oct 2020 19:24:14 +0200
Subject: [PATCH 1772/3942] nomad_0_11: 0.11.5 -> 0.11.6

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

diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix
index 8c54f5bc1ebf..aec421bf1a7d 100644
--- a/pkgs/applications/networking/cluster/nomad/0.11.nix
+++ b/pkgs/applications/networking/cluster/nomad/0.11.nix
@@ -2,6 +2,6 @@
 
 callPackage ./generic.nix {
   inherit buildGoPackage;
-  version = "0.11.5";
-  sha256 = "0g7i7qd0zksd7s8y4l63kk7xdc7nrw8radba6ws3hw0h2kr2cmp8";
+  version = "0.11.6";
+  sha256 = "09ym9fd4fp2461ddhrb5nlz8l24iq4hsbqikzc21ainagq2g1azf";
 }

From e8469ca6537b68291e9bac4e1259fe40577b24be Mon Sep 17 00:00:00 2001
From: "Maxine E. Aubrey" <maxeaubrey@gmail.com>
Date: Fri, 23 Oct 2020 19:24:30 +0200
Subject: [PATCH 1773/3942] nomad_0_12: 0.12.6 -> 0.12.7

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

diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix
index b92bf568b79f..863f7cbed2f9 100644
--- a/pkgs/applications/networking/cluster/nomad/0.12.nix
+++ b/pkgs/applications/networking/cluster/nomad/0.12.nix
@@ -2,6 +2,6 @@
 
 callPackage ./generic.nix {
   inherit buildGoPackage;
-  version = "0.12.6";
-  sha256 = "1fd7i50zc7g7d879bijh1ckvyq0h28169p6hw5ip71n71zhvvgp0";
+  version = "0.12.7";
+  sha256 = "0y1nwmpc4fqgjyb19n1f2w4y5k7fy4p68v2vnnry11nj3im7ia14";
 }

From ae17a85324be66255a27c16b4f9b2d2a225c5d89 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 8 Nov 2020 04:20:00 +0000
Subject: [PATCH 1774/3942] dogdns: fix build on darwin

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

diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix
index 2875f2025151..0389d733599e 100644
--- a/pkgs/tools/networking/dogdns/default.nix
+++ b/pkgs/tools/networking/dogdns/default.nix
@@ -3,6 +3,7 @@
 , rustPlatform
 , pkg-config
 , openssl
+, Security
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -16,8 +17,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy";
   };
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ];
+  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
   cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f881a85ccac..dec617067132 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3355,7 +3355,9 @@ in
 
   dog = callPackage ../tools/system/dog { };
 
-  dogdns = callPackage ../tools/networking/dogdns { };
+  dogdns = callPackage ../tools/networking/dogdns {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   dosfstools = callPackage ../tools/filesystems/dosfstools { };
 

From f4e11121fe4f6664c78b15f0891b96fb059a5b1b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 8 Nov 2020 04:20:00 +0000
Subject: [PATCH 1775/3942] dogdns: install completions

---
 pkgs/tools/networking/dogdns/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix
index 0389d733599e..71e065e5d14c 100644
--- a/pkgs/tools/networking/dogdns/default.nix
+++ b/pkgs/tools/networking/dogdns/default.nix
@@ -4,6 +4,7 @@
 , pkg-config
 , openssl
 , Security
+, installShellFiles
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -17,12 +18,17 @@ rustPlatform.buildRustPackage rec {
     sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy";
   };
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
+  nativeBuildInputs = [ installShellFiles ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
   cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6";
 
+  postInstall = ''
+    installShellCompletion completions/dog.{bash,fish,zsh}
+  '';
+
   meta = with stdenv.lib; {
     description = "Command-line DNS client";
     homepage = "https://dns.lookup.dog";

From cea51f0cb92b120a1d60b2d34a4a1acc2808ce5f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 8 Nov 2020 04:20:00 +0000
Subject: [PATCH 1776/3942] go-chromecast: init at 0.2.5

---
 .../video/go-chromecast/default.nix           | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/video/go-chromecast/default.nix

diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix
new file mode 100644
index 000000000000..89c2eb425ce6
--- /dev/null
+++ b/pkgs/applications/video/go-chromecast/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "go-chromecast";
+  version = "0.2.5";
+
+  src = fetchFromGitHub {
+    owner = "vishen";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0y1zwy1bxnjz409vdhqwykvfjhrsyy4j503v3rjrrhkcca6vfbyg";
+  };
+
+  vendorSha256 = "04mgm3afgczq0an6ys8bilxv1hgzfwvgjx21fyl82yxd573rsf5r";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/vishen/go-chromecast";
+    description = "CLI for Google Chromecast, Home devices and Cast Groups";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ marsam ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f881a85ccac..f578815d61e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2145,6 +2145,8 @@ in
 
   gdrive = callPackage ../applications/networking/gdrive { };
 
+  go-chromecast = callPackage ../applications/video/go-chromecast { };
+
   go-rice = callPackage ../tools/misc/go.rice {};
 
   go-2fa = callPackage ../tools/security/2fa {};

From 2898985747aef295a7b026f67e8dc33da5792f6e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 8 Nov 2020 01:48:09 -0300
Subject: [PATCH 1777/3942] 4th: init at 3.62.5

---
 pkgs/development/compilers/4th/default.nix | 39 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/compilers/4th/default.nix

diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/development/compilers/4th/default.nix
new file mode 100644
index 000000000000..ee3050b8ba69
--- /dev/null
+++ b/pkgs/development/compilers/4th/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "4th";
+  version = "3.62.5";
+
+  src = fetchurl {
+    url = "https://sourceforge.net/projects/forth-4th/files/${pname}-${version}/${pname}-${version}-unix.tar.gz";
+    sha256 = "sha256-+CL33Yz7CxdEpi1lPG7+kzV4rheJ7GCgiFCaOLyktPw=";
+  };
+
+  dontConfigure = true;
+
+  makeFlags = [
+    "-C sources"
+    "CC=${stdenv.cc}/bin/cc"
+  ];
+
+  preInstall = ''
+    install -d ${placeholder "out"}/bin \
+      ${placeholder "out"}/lib \
+      ${placeholder "out"}/share/doc/${pname} \
+      ${placeholder "out"}/share/man
+  '';
+
+  installFlags = [
+    "BINARIES=${placeholder "out"}/bin"
+    "LIBRARIES=${placeholder "out"}/lib"
+    "DOCDIR=${placeholder "out"}/share/doc"
+    "MANDIR=${placeholder "out"}/share/man"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A portable Forth compiler";
+    homepage = "https://thebeez.home.xs4all.nl/4tH/index.html";
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75928eb7dcc8..b5a75d0b4324 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8557,6 +8557,8 @@ in
 
   ### DEVELOPMENT / COMPILERS
 
+  _4th = callPackage ../development/compilers/4th { };
+
   abcl = callPackage ../development/compilers/abcl {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
     jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731

From b2f62cfa27c0264407fbe0502daa34e8666902c2 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sun, 8 Nov 2020 00:32:39 -0500
Subject: [PATCH 1778/3942] nwg-launchers: 0.4.0 -> 0.4.2

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

diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix
index d14d4d43e83f..77eae10293d4 100644
--- a/pkgs/applications/misc/nwg-launchers/default.nix
+++ b/pkgs/applications/misc/nwg-launchers/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nwg-launchers";
-  version = "0.4.0";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0r0wj4w3jj3l56z1lx6ypkzz4fsgx4vzqbvs95661l8q362pndzw";
+    sha256 = "0flp7mwj1pgcwx3k9pzc8pmqlkhbddj0maimdnvlazk87kzxpfd0";
   };
 
   nativeBuildInputs = [

From 28860ab1ad6e17355dae0452cf222c011dee6802 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sun, 8 Nov 2020 00:57:56 -0500
Subject: [PATCH 1779/3942] restic: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 6839b47a5ff2..3317ada541a5 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -3,16 +3,16 @@
 
 buildGoModule rec {
   pname = "restic";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "restic";
     repo = "restic";
     rev = "v${version}";
-    sha256 = "0nrh52cjymzcf093sqqa3kfw2nimnx6qwn8aw0wsci2v2r84yzzx";
+    sha256 = "13zmx9wzv29z0np3agx4rsz1j9pgrvlnngjsb971i1dnzwv5l3hf";
   };
 
-  vendorSha256 = "1pfixq3mbfn12gyablc4g0j8r00md3887q0l8xgxy76z0d8w924s";
+  vendorSha256 = "09sa5jpdj73w595c063mib14132zacswh54nmjqp2n440cflmwjh";
 
   subPackages = [ "cmd/restic" ];
 

From e6fd6ab41e12159609c922216287aeb100cdc403 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sun, 8 Nov 2020 01:27:04 -0500
Subject: [PATCH 1780/3942] dogdns: init at 0.1.0

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

diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix
new file mode 100644
index 000000000000..2875f2025151
--- /dev/null
+++ b/pkgs/tools/networking/dogdns/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, openssl
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "dogdns";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "ogham";
+    repo = "dog";
+    rev = "v${version}";
+    sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ];
+
+  cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6";
+
+  meta = with stdenv.lib; {
+    description = "Command-line DNS client";
+    homepage = "https://dns.lookup.dog";
+    license = licenses.eupl12;
+    maintainers = with maintainers; [ bbigras ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75928eb7dcc8..03be57b914c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3355,6 +3355,8 @@ in
 
   dog = callPackage ../tools/system/dog { };
 
+  dogdns = callPackage ../tools/networking/dogdns { };
+
   dosfstools = callPackage ../tools/filesystems/dosfstools { };
 
   dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };

From 84276fd18cb1be74dd03c6b543a73e42ae9cddb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sun, 8 Nov 2020 08:22:07 +0100
Subject: [PATCH 1781/3942] python3Packages.datasets: 1.0.1 -> 1.1.2

Changelog:

https://github.com/huggingface/datasets/releases/tag/1.1.2
https://github.com/huggingface/datasets/releases/tag/1.1.0
https://github.com/huggingface/datasets/releases/tag/1.0.2
---
 pkgs/development/python-modules/datasets/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix
index b953ed1dd1af..4214304a9c93 100644
--- a/pkgs/development/python-modules/datasets/default.nix
+++ b/pkgs/development/python-modules/datasets/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , dill
 , filelock
+, multiprocess
 , numpy
 , pandas
 , pyarrow
@@ -13,18 +14,19 @@
 
 buildPythonPackage rec {
   pname = "datasets";
-  version = "1.0.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = pname;
     rev = version;
-    sha256 = "14f7847b8md5kf631zl8x2f53wy8zbzxypq4wdgzvwsjz4k7v4jn";
+    hash = "sha256-upXZ2rOfmjnJbDo6RMGeHv/fe10RQAf/zwDWWKdt6SA=";
   };
 
   propagatedBuildInputs = [
     dill
     filelock
+    multiprocess
     numpy
     pandas
     pyarrow

From bbf6b239902bfc8636759f1389a090eacc0fffa5 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Mon, 2 Nov 2020 22:20:41 -0500
Subject: [PATCH 1782/3942] nuspell: 4.0.0 -> 4.0.1

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

diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix
index c8cb7734e90c..3fac1421899a 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, ronn }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, pandoc }:
 
 stdenv.mkDerivation rec {
   pname = "nuspell";
-  version = "4.0.0";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "nuspell";
     repo = "nuspell";
     rev = "v${version}";
-    sha256 = "1jfnwva2i67i9pyh123a5h2zs5p7gw77qh4w7qkx61jigsyxc5v7";
+    sha256 = "1p90a3wv4b8m5fdpbnr9cyd1x3a504q9rc4cghq02xff63h5gclf";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ronn ];
+  nativeBuildInputs = [ cmake pkgconfig pandoc ];
   buildInputs = [ boost icu ];
 
   outputs = [ "out" "lib" "dev" "man" ];

From f4c13d1d9d23d974695bb11e06dc55b4cc699c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 8 Nov 2020 09:43:36 +0100
Subject: [PATCH 1783/3942] brotli.meta.maintainers: unlist myself

Years ago I thought I might use it for something, but anything like that
seems very unlikely to ever materialize, so let me focus on packages
that I consider more important.
---
 pkgs/tools/compression/brotli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index a69740ea1ffe..7e04d05516a3 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
       '';
 
     license = licenses.mit;
-    maintainers = [ maintainers.vcunat ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }

From 7b117f15b15c512ae857c2cdf00cfac417614dce Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Thu, 29 Oct 2020 19:22:09 +0800
Subject: [PATCH 1784/3942] fortune-mod: 2.10.0 -> 3.2.0

---
 pkgs/tools/misc/fortune/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix
index 74c21d21fcc3..0804d8b06377 100644
--- a/pkgs/tools/misc/fortune/default.nix
+++ b/pkgs/tools/misc/fortune/default.nix
@@ -2,11 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fortune-mod";
-  version = "2.10.0";
+  version = "3.2.0";
 
+  # We use fetchurl instead of fetchFromGitHub because the release pack has some
+  # special files.
   src = fetchurl {
-    url = "https://www.shlomifish.org/open-source/projects/fortune-mod/arcs/fortune-mod-${version}.tar.xz";
-    sha256 = "07g50hij87jb7m40pkvgd47qfvv4s805lwiz79jbqcxzd7zdyax7";
+    url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz";
+    sha256 = "0j554ja4min5rbqni8qn5gzk4xiyd643b8r50jyi32pcs88dwp7n";
   };
 
   nativeBuildInputs = [ cmake perl ];
@@ -31,12 +33,13 @@ stdenv.mkDerivation rec {
      )
 
      my_exe(
-    -- 
+    --
   '') ];
 
   meta = with stdenv.lib; {
     description = "A program that displays a pseudorandom message from a database of quotations";
     license = licenses.bsdOriginal;
     platforms = platforms.unix;
+    maintainers = with maintainers; [ vonfry ];
   };
 }

From 2c330cba4a082e357351f57de28334479e437967 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sun, 8 Nov 2020 10:41:06 +0000
Subject: [PATCH 1785/3942] pythonModules.pyscard: 1.9.9 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index d563a62a46b3..fefeaf7ebb55 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -9,12 +9,12 @@ let
 in
 
 buildPythonPackage rec {
-  version = "1.9.9";
+  version = "2.0.0";
   pname = "pyscard";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "082cjkbxadaz2jb4rbhr0mkrirzlqyqhcf3r823qb0q1k50ybgg6";
+    sha256 = "0yap0p8mp6dx58n3nina6ryhc2cysaj75sq98wf3qybf33cxjr5k";
   };
 
   postPatch = if withApplePCSC then ''

From b3e07c753289818df5e18a4f10a5121b699d73ce Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Sun, 8 Nov 2020 12:41:19 +0100
Subject: [PATCH 1786/3942] altcoins.freicoin: remove

---
 pkgs/applications/blockchains/freicoin.nix | 41 ----------------------
 pkgs/top-level/all-packages.nix            |  1 -
 2 files changed, 42 deletions(-)
 delete mode 100644 pkgs/applications/blockchains/freicoin.nix

diff --git a/pkgs/applications/blockchains/freicoin.nix b/pkgs/applications/blockchains/freicoin.nix
deleted file mode 100644
index cc28fff96c47..000000000000
--- a/pkgs/applications/blockchains/freicoin.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, qt4, qmake4Hook }:
-
-stdenv.mkDerivation rec {
-  version = "0.8.6-2";
-  pname = "freicoin";
-
-  src = fetchFromGitHub {
-    owner = "freicoin";
-    repo = "freicoin";
-    rev = "v${version}";
-    sha256 = "1v1qwv4x5agjba82s1vknmdgq67y26wzdwbmwwqavv7f7y3y860h";
-  };
-
-  enableParallelBuilding = false;
-
-  qmakeFlags = ["USE_UPNP=-"];
-
-  # I think that openssl and zlib are required, but come through other
-  # packages
-
-  preBuild = "unset AR";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp freicoin-qt $out/bin
-  '';
-
-  nativeBuildInputs = [ qmake4Hook ];
-  buildInputs = [ db boost gmp mpfr qt4 ];
-
-  meta = with stdenv.lib; {
-    description = "Peer-to-peer currency with demurrage fee";
-    homepage = "http://freicoi.in/";
-    license = licenses.mit;
-    maintainers = [ maintainers.viric ];
-    platforms = platforms.linux;
-
-    # upstream doesn't support newer openssl versions, use 1.0.1 for testing
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e65aa28b25b8..16aa6b117053 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24793,7 +24793,6 @@ in
 
   exodus = callPackage ../applications/blockchains/exodus { };
 
-  freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; };
   go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) IOKit;

From 3f659d76e643cc4ae6ea5a35b9ce582505888904 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 8 Nov 2020 13:44:32 +0100
Subject: [PATCH 1787/3942] pmix: 3.1.5 -> 3.2.0

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

diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix
index c8d8be4e8cbf..32e5c5381b64 100644
--- a/pkgs/development/libraries/pmix/default.nix
+++ b/pkgs/development/libraries/pmix/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, perl, autoconf, automake
-, libtool, flex, libevent, hwloc, munge, zlib
+, libtool, flex, libevent, hwloc, munge, zlib, pandoc
 } :
 
 let
-  version = "3.1.5";
+  version = "3.2.0";
 
 in stdenv.mkDerivation {
   pname = "pmix";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
     repo = "openpmix";
     owner = "openpmix";
     rev = "v${version}";
-    sha256 = "0fvfsig20amcigyn4v3gcdxc0jif44vqg37b8zzh0s8jqqj7jz5w";
+    sha256 = "171hpz0m6lpyjd1hkxy7fl06fcgymz8cssqgbxzg92b7x595276b";
   };
 
   postPatch = ''
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
     patchShebangs ./config
   '';
 
-  nativeBuildInputs = [ perl autoconf automake libtool flex ];
+  nativeBuildInputs = [ pandoc perl autoconf automake libtool flex ];
 
   buildInputs = [ libevent hwloc munge zlib ];
 

From e26564f4ffdd2639aa3163aa962023f4e05e9b89 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Sat, 5 Sep 2020 13:39:01 +0100
Subject: [PATCH 1788/3942] computecpp: 1.3.0 -> 2.2.1

---
 pkgs/development/compilers/computecpp/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/development/compilers/computecpp/default.nix
index 31a0b054ee72..7cfc60f050e4 100644
--- a/pkgs/development/compilers/computecpp/default.nix
+++ b/pkgs/development/compilers/computecpp/default.nix
@@ -3,24 +3,23 @@
 , pkg-config
 , autoPatchelfHook
 , installShellFiles
-, ncurses5
 , ocl-icd
 , zlib
 }:
 
 stdenv.mkDerivation rec {
   pname = "computecpp";
-  version = "1.3.0";
+  version = "2.2.1";
 
   src = fetchzip {
-    url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/ubuntu-16.04-64bit.tar.gz";
-    sha256 = "1q6gqjpzz4a260gsd6mm1iv4z8ar3vxaypmgdwl8pb4i7kg6ykaz";
+    url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz";
+    hash = "sha256-niXNWbkXjd35col6dS66HdxFurXfJw/Xb2c5njukxcg=";
     stripRoot = true;
   };
 
   dontStrip = true;
 
-  buildInputs = [ stdenv.cc.cc.lib ncurses5 ocl-icd zlib ];
+  buildInputs = [ stdenv.cc.cc.lib ocl-icd zlib ];
   nativeBuildInputs = [ autoPatchelfHook pkg-config installShellFiles ];
 
   installPhase = ''

From 412b1c3ee5f9c78caf4273f78f99af940e014c56 Mon Sep 17 00:00:00 2001
From: meutraa <paul@lost.host>
Date: Sun, 8 Nov 2020 14:03:32 +0000
Subject: [PATCH 1789/3942] androidStudioPackages.{canary,dev}: 4.2.0.15 ->
 4.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 3a5bc63e1c38..cca7b0b2f41f 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -19,9 +19,9 @@ let
     sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88=";
   };
   latestVersion = { # canary & dev
-    version = "4.2.0.15"; # "Android Studio 4.2 Canary 15"
-    build = "202.6922807";
-    sha256Hash = "sha256-PXFNnPSJbdp9NtkMDR3Vq+vpWqd85Io2FmXPhRLRk/8=";
+    version = "4.2.0.16"; # "Android Studio 4.2 Canary 16"
+    build = "202.6939830";
+    sha256Hash = "sha256-2Xh0GR4BHZI6ofdyMI2icrztI2BmiHWT+1bEZIZ58IE=";
   };
 in {
   # Attributes are named by their corresponding release channels

From d1dc6f61f9eae66428ceeb9c7ce76c30c2be30d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 24 Oct 2020 21:15:35 +0200
Subject: [PATCH 1790/3942] python3.pkgs.smbus-cffi: init at 0.5.1

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

diff --git a/pkgs/development/python-modules/smbus-cffi/default.nix b/pkgs/development/python-modules/smbus-cffi/default.nix
new file mode 100644
index 000000000000..b762730914b5
--- /dev/null
+++ b/pkgs/development/python-modules/smbus-cffi/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cffi
+, pytestCheckHook
+, pyserial
+, fetchpatch
+}:
+
+buildPythonPackage rec {
+  pname = "smbus-cffi";
+  version = "0.5.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "fb4195aaabfc01586863f60d3190b5cb1bf8f12622fd597e23e48768dad6bde8";
+  };
+
+  patches = [
+    # https://github.com/bivab/smbus-cffi/pull/24
+    (fetchpatch {
+      url = "https://github.com/bivab/smbus-cffi/commit/ba79ae174a9d84e767d95f165c43ee212b1bbb92.patch";
+      sha256 = "sha256-WtRuK5y6fWDEhm0Xy5XqS5yCkn7vXXYtjlOjS90gla4=";
+    })
+  ];
+
+  propagatedBuildInputs = [ cffi ];
+
+  installCheckPhase = ''
+    # we want to import the installed module that also contains the compiled library
+    rm -rf smbus
+    runHook pytestCheckPhase
+  '';
+
+  # requires hardware access
+  pytestFlagsArray = [ "--ignore=test/test_smbus_integration.py" ];
+
+  checkInputs = [ pytestCheckHook pyserial ];
+
+  meta = with lib; {
+    description = "Python module for SMBus access through Linux I2C /dev interface";
+    homepage = "https://github.com/bivab/smbus-cffi";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2ef9459b13f9..80f157dbd4e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6664,6 +6664,8 @@ in {
 
   smartypants = callPackage ../development/python-modules/smartypants { };
 
+  smbus-cffi = callPackage ../development/python-modules/smbus-cffi { };
+
   smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
 
   smmap = callPackage ../development/python-modules/smmap { };

From 105dd1dfaef4c684e5c4cc84b759bcd6df1d75ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 24 Oct 2020 21:26:58 +0200
Subject: [PATCH 1791/3942] python3.pkgs.bme680: init at 1.0.5

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

diff --git a/pkgs/development/python-modules/bme680/default.nix b/pkgs/development/python-modules/bme680/default.nix
new file mode 100644
index 000000000000..0fd28701816e
--- /dev/null
+++ b/pkgs/development/python-modules/bme680/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, smbus-cffi
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "bme680";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "pimoroni";
+    repo = "bme680-python";
+    rev = "v${version}";
+    sha256 = "sha256-oIXh1JnGTI/Cj4MQFpWq+sWR2X+ioCsK0Q+T7wPITCQ=";
+  };
+
+  propagatedBuildInputs = [ smbus-cffi ];
+
+  preBuild = ''
+    cd library
+  '';
+  checkInputs = [ pytestCheckHook ];
+
+  # next release will have tests, but not the current one
+  doCheck = false;
+
+  pythonImportsCheck = [ "bme680" ];
+
+  meta = with lib; {
+    description = "Python library for driving the Pimoroni BME680 Breakout";
+    homepage = "https://github.com/pimoroni/bme680-python";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 80f157dbd4e4..947e631a1c82 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -913,6 +913,8 @@ in {
 
   bluepy = callPackage ../development/python-modules/bluepy { };
 
+  bme680 = callPackage ../development/python-modules/bme680 { };
+
   bokeh = callPackage ../development/python-modules/bokeh { };
 
   boltons = callPackage ../development/python-modules/boltons { };

From 0c1ff16a7c64afd7657347957e3e9f74878f1768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 8 Nov 2020 10:53:13 +0100
Subject: [PATCH 1792/3942] home-assistant: regenerate with new deps

---
 pkgs/servers/home-assistant/component-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8f6f555474f6..4f5fa58a29dc 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -74,7 +74,7 @@
     "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO
     "bbox" = ps: with ps; [ ]; # missing inputs: pybbox
     "beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim
-    "bh1750" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi
+    "bh1750" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
     "binary_sensor" = ps: with ps; [ ];
     "bitcoin" = ps: with ps; [ ]; # missing inputs: blockchain
     "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus
@@ -88,8 +88,8 @@
     "bluesound" = ps: with ps; [ xmltodict ];
     "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
     "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez
-    "bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi
-    "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi
+    "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
+    "bme680" = ps: with ps; [ bme680 smbus-cffi ];
     "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
     "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected
     "bond" = ps: with ps; [ ]; # missing inputs: bond-api
@@ -222,7 +222,7 @@
     "enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader
     "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient
     "environment_canada" = ps: with ps; [ ]; # missing inputs: env_canada
-    "envirophat" = ps: with ps; [ ]; # missing inputs: envirophat smbus-cffi
+    "envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat
     "envisalink" = ps: with ps; [ ]; # missing inputs: pyenvisalink
     "ephember" = ps: with ps; [ ]; # missing inputs: pyephember
     "epson" = ps: with ps; [ ]; # missing inputs: epson-projector
@@ -358,7 +358,7 @@
     "hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo
     "html5" = ps: with ps; [ aiohttp-cors pywebpush ];
     "http" = ps: with ps; [ aiohttp-cors ];
-    "htu21d" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi
+    "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
     "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize
     "huawei_router" = ps: with ps; [ ];
     "hue" = ps: with ps; [ aiohue ];
@@ -657,7 +657,7 @@
     "rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle
     "rainmachine" = ps: with ps; [ ]; # missing inputs: regenmaschine
     "random" = ps: with ps; [ ];
-    "raspihats" = ps: with ps; [ ]; # missing inputs: raspihats smbus-cffi
+    "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats
     "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client
     "recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste
     "recorder" = ps: with ps; [ sqlalchemy ];

From 545456ddcae2ed5bdc91ebc5c7fd0b04b1796475 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 8 Nov 2020 14:01:52 +0100
Subject: [PATCH 1793/3942] rdma-core: 31.0 -> 31.1

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

diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index 59a7125aad6d..13f48405cd1d 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -4,7 +4,7 @@
 } :
 
 let
-  version = "31.0";
+  version = "31.1";
 
 in stdenv.mkDerivation {
   pname = "rdma-core";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
     owner = "linux-rdma";
     repo = "rdma-core";
     rev = "v${version}";
-    sha256 = "0qr8a25ylmkwfgyj519zvl74q16bhf4895xjich2r98rl2yg0qdl";
+    sha256 = "1xkmdix6mgv6kjjj6wi844bfddhl0ybalrp5g8pf5izasc43brg7";
   };
 
   nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ];

From e940b82ab7959b4d254264f6cc266a654a520119 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Sun, 8 Nov 2020 15:59:45 +0100
Subject: [PATCH 1794/3942] bambootracker: 0.4.4 -> 0.4.5

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

diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix
index a26431a82edf..f1f97de256e6 100644
--- a/pkgs/applications/audio/bambootracker/default.nix
+++ b/pkgs/applications/audio/bambootracker/default.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , qmake
 , qtbase
-, qtmultimedia
 , qttools
 , alsaSupport ? stdenv.hostPlatform.isLinux
 , alsaLib
@@ -19,20 +18,20 @@ let
 in
 mkDerivation rec {
   pname = "bambootracker";
-  version = "0.4.4";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "rerrahkr";
     repo = "BambooTracker";
     rev = "v${version}";
-    sha256 = "0d0f4jqzknsiq725pvfndarfjg183f92rb0lim3wzshnsixr5vdc";
+    sha256 = "0ibi0sykxf6cp5la2c4pgxf5gvy56yv259fbmdwdrdyv6vlddf42";
   };
 
   sourceRoot = "source/BambooTracker";
 
   nativeBuildInputs = [ qmake qttools ];
 
-  buildInputs = [ qtbase qtmultimedia ]
+  buildInputs = [ qtbase ]
     ++ optional alsaSupport alsaLib
     ++ optional pulseSupport libpulseaudio
     ++ optional jackSupport libjack2;

From 9621822607fc3c37c2f7c23505ec8de8f567644a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 8 Nov 2020 16:15:55 +0100
Subject: [PATCH 1795/3942] asymptote: 2.66 -> 2.67; fix build with fresh
 ghostscript

---
 pkgs/tools/graphics/asymptote/default.nix      | 18 +++++++++++++-----
 pkgs/tools/graphics/asymptote/default.upstream |  4 ----
 2 files changed, 13 insertions(+), 9 deletions(-)
 delete mode 100644 pkgs/tools/graphics/asymptote/default.upstream

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 67afac2cdccd..6b8c6870a668 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -1,24 +1,32 @@
-{ stdenv, fetchFromGitHub, fetchurl
+{ stdenv, fetchFromGitHub, fetchurl, fetchpatch
 , autoreconfHook, bison, glm, yacc, flex
 , freeglut, ghostscriptX, imagemagick, fftw
 , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
 , python3Packages
-, zlib, perl
+, zlib, perl, curl
 , texLive, texinfo
 , darwin
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.66";
+  version = "2.67";
   pname = "asymptote";
 
   src = fetchFromGitHub {
     owner = "vectorgraphics";
     repo = pname;
     rev = version;
-    sha256 = "0c445j950n6nxgr1zxj7a26daa5d9f3i91506b7r7627s943b1kd";
+    sha256 = "sha256:1lawj2gf0985clzbyym26s5mxxp2syl1dqqxfzk0sq9s30l2rj3l";
   };
 
+  patches =
+    (stdenv.lib.optional (stdenv.lib.versionOlder version "2.68")
+      (fetchpatch {
+        url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch";
+        sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm";
+      }))
+  ;
+
   nativeBuildInputs = [
     autoreconfHook
     bison
@@ -30,7 +38,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ghostscriptX imagemagick fftw
     boehmgc ncurses readline gsl libsigsegv
-    zlib perl
+    zlib perl curl
     texLive
   ] ++ (with python3Packages; [
     python
diff --git a/pkgs/tools/graphics/asymptote/default.upstream b/pkgs/tools/graphics/asymptote/default.upstream
deleted file mode 100644
index e86d81ba4435..000000000000
--- a/pkgs/tools/graphics/asymptote/default.upstream
+++ /dev/null
@@ -1,4 +0,0 @@
-url https://sourceforge.net/projects/asymptote/files/
-SF_version_dir
-version_link 'src[.]tgz/download$'
-SF_redirect

From 7d8631190a8ee06d7e60844f2a5f7baeff901cf8 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Thu, 5 Nov 2020 00:28:31 +0000
Subject: [PATCH 1796/3942] pythonPackages.emv: init at 1.0.11

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

diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix
new file mode 100644
index 000000000000..6dfe39f8b6b1
--- /dev/null
+++ b/pkgs/development/python-modules/emv/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, click, enum-compat, pyscard, pycountry, terminaltables
+, pytestCheckHook, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "emv";
+  version = "1.0.11";
+  disabled = pythonOlder "3.4";
+
+  src = fetchFromGitHub {
+    owner = "russss";
+    repo = "python-emv";
+    rev = "v${version}";
+    hash = "sha256:1715hcba3fdi0i5awnrjdjnk74p66sxm9349pd8bb717zrh4gpj7";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+  propagatedBuildInputs = [
+    enum-compat
+    click
+    pyscard
+    pycountry
+    terminaltables
+  ];
+
+  # argparse is part of the standardlib
+  prePatch = ''
+    substituteInPlace setup.py \
+      --replace '"argparse==1.4.0",' ""
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/russss/python-emv";
+    description = "Implementation of the EMV chip-and-pin smartcard protocol";
+    license = licenses.mit;
+    maintainers = with maintainers; [ lukegb ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 947e631a1c82..ce5a6b4aa708 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1900,6 +1900,8 @@ in {
 
   emcee = callPackage ../development/python-modules/emcee { };
 
+  emv = callPackage ../development/python-modules/emv { };
+
   emoji = callPackage ../development/python-modules/emoji { };
 
   enaml = callPackage ../development/python-modules/enaml { };

From cfdeea41e668e786115195cb344e4d79b0cf210a Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Sun, 8 Nov 2020 16:36:33 +0100
Subject: [PATCH 1797/3942] keepassxc: Enable networking by default

Upstream builds with it enabled, as do other distros.
---
 pkgs/applications/misc/keepassx/community.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index f718ab4d8047..7df1294874f1 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -31,7 +31,7 @@
 , withKeePassKeeShare ? true
 , withKeePassKeeShareSecure ? true
 , withKeePassSSHAgent ? true
-, withKeePassNetworking ? false
+, withKeePassNetworking ? true
 , withKeePassTouchID ? true
 , withKeePassFDOSecrets ? true
 }:

From 19fda989f3e973563c78705ad46f49e892326757 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 8 Nov 2020 16:19:21 +0100
Subject: [PATCH 1798/3942] wlroots: 0.11.0 -> 0.12.0

The libseat session backend [0] will be disabled for now since NixOS
depends on systemd anyway (so we can use logind).
But if someone wants/requires libseat [1] and would maintain it in
Nixpkgs we could enable it.

[0]: https://github.com/swaywm/wlroots/pull/2364
[1]: https://sr.ht/~kennylevinsen/seatd/
---
 pkgs/development/libraries/wlroots/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 67faad8cd74f..13132c8cc1c9 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wlroots";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "wlroots";
     rev = version;
-    sha256 = "08d5d52m8wy3imfc6mdxpx8swhh2k4s1gmfaykg02j59z84awc6p";
+    sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn";
   };
 
   # $out for the library and $examples for the example programs (in examples):
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     libpng ffmpeg
   ];
 
-  mesonFlags = [ "-Dlogind-provider=systemd" ];
+  mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ];
 
   postFixup = ''
     # Install ALL example programs to $examples:

From db6b85391fee03650b9ea937e64f8b4bfa1b0361 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 8 Nov 2020 16:50:11 +0100
Subject: [PATCH 1799/3942] sway: Fix the build with wlroots 0.12.0

Sway 1.5 isn't affected by the breaking changes of wlroots 0.12.0 so we
can simply relax the version requirement.
---
 pkgs/applications/window-managers/sway/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index da58d844ee89..0af46db0a1c2 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -22,7 +22,9 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    substituteInPlace meson.build --replace "v1.5" "1.5"
+    substituteInPlace meson.build \
+      --replace "v1.5" "1.5" \
+      --replace "wlroots_version = ['>=0.11.0', '<0.12.0']" "wlroots_version = ['>=0.11.0', '<0.13.0']"
   '';
 
   nativeBuildInputs = [

From 2f845dccbf525cbf79ac64629e9eb932f56dc86f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sun, 8 Nov 2020 16:58:58 +0100
Subject: [PATCH 1800/3942] manual: nginx: Mention ProtectHome in release
 notes. See #85567.

See https://github.com/NixOS/nixpkgs/pull/85567#pullrequestreview-525820684
---
 nixos/doc/manual/release-notes/rl-2009.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 01f113198eb9..5845cc48c545 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -885,6 +885,17 @@ php.override {
 systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
        </programlisting>
      </para>
+     <para>
+       Nginx is also started with the systemd option <literal>ProtectHome = mkDefault true;</literal>
+       which forbids it to read anything from <literal>/home</literal>, <literal>/root</literal>
+       and <literal>/run/user</literal> (see
+       <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.exec.html#ProtectHome=">ProtectHome docs</link>
+       for details).
+       If you require serving files from home directories, you may choose to set e.g.
+<programlisting>
+systemd.services.nginx.serviceConfig.ProtectHome = "read-only";
+</programlisting>
+     </para>
    </listitem>
    <listitem>
     <para>

From c65164ec759510798482a24455f11918a2d59285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sun, 8 Nov 2020 17:26:54 +0100
Subject: [PATCH 1801/3942] nixos/release-notes: Mutt 2.x has some backward
 incompatible changes

---
 nixos/doc/manual/release-notes/rl-2103.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 7fd7ff5c2a96..2a84959f601d 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -136,6 +136,13 @@
     <package>stanchion</package> package removed along with <varname>services.stanchion</varname> module.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     <package>mutt</package> has been updated to a new major version (2.x), which comes with
+     some backward incompatible changes that are described in the
+     <link xlink:href="http://www.mutt.org/relnotes/2.0/">release notes for Mutt 2.0</link>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From 2e7b320931a1bf2a8b7f1dd2f2ee4343a8dc0847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sun, 8 Nov 2020 17:55:11 +0100
Subject: [PATCH 1802/3942] manual: nginx: Remove reference to `stateDir` from
 release notes. Fixes #102211.

Fixed wording taken from:
https://github.com/NixOS/nixpkgs/issues/102211#issuecomment-719976230
---
 nixos/doc/manual/release-notes/rl-2009.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 5845cc48c545..75c8adbf45ed 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -879,7 +879,7 @@ php.override {
    <listitem>
      <para>
        Nginx web server now starting with additional sandbox/hardening options. By default, write access
-       to <literal>services.nginx.stateDir</literal> is allowed. To allow writing to other folders,
+       to <literal>/var/log/nginx</literal> and <literal>/var/cache/nginx</literal> is allowed. To allow writing to other folders,
        use <literal>systemd.services.nginx.serviceConfig.ReadWritePaths</literal>
        <programlisting>
 systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];

From 752773e0a43fe10a7d3d3aa6d3c3eafc68a26592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 8 Nov 2020 16:19:00 +0100
Subject: [PATCH 1803/3942] gnome3.mutter: use full sysprof

Mutter needs acces to sysprofs dbus interfaces at build time, which the
libsysprof-capture package fail to provide.

Also fix libdir name.
---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index f57bb4812ce5..d0acdd5133b7 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -32,7 +32,7 @@
 , xorgserver
 , python3
 , wrapGAppsHook
-, libsysprof-capture
+, sysprof
 , desktop-file-utils
 , libcap_ng
 , egl-wayland
@@ -110,7 +110,7 @@ let self = stdenv.mkDerivation rec {
     libxkbfile
     pango
     pipewire
-    libsysprof-capture
+    sysprof
     xkeyboard_config
     xwayland
     wayland-protocols
@@ -128,7 +128,7 @@ let self = stdenv.mkDerivation rec {
   PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
 
   passthru = {
-    libdir = "${self}/lib/mutter-6";
+    libdir = "${self}/lib/mutter-7";
 
     tests = {
       libdirExists = runCommand "mutter-libdir-exists" {} ''

From 9aa5a10068b96ad3a931c3072312183e26a78c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 8 Nov 2020 16:22:55 +0100
Subject: [PATCH 1804/3942] gnome3.gnome-tweaks: use libhandy_0

---
 pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index 0271992b6407..a51eb854e73f 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -1,6 +1,6 @@
 { stdenv, meson, ninja, gettext, fetchurl
 , pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas
-, itstool, libxml2, python3Packages, libhandy
+, itstool, libxml2, python3Packages, libhandy_0
 , gnome3, gdk-pixbuf, libnotify, gobject-introspection, wrapGAppsHook }:
 
 let
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
     libnotify gnome3.gnome-shell python3Packages.pygobject3
     libsoup gnome3.gnome-settings-daemon gnome3.nautilus
     gnome3.mutter gnome3.gnome-desktop gobject-introspection
-    gnome3.nautilus libhandy
+    gnome3.nautilus libhandy_0
     # Makes it possible to select user themes through the `user-theme` extension
     gnome3.gnome-shell-extensions
   ];

From b39390867307e040fc274003740c193769d7cff4 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 25 Oct 2020 19:27:09 +0100
Subject: [PATCH 1805/3942] ocamlPackages.ocaml-lsp: init at 1.1.0

---
 .../ocaml-modules/ocaml-lsp/default.nix       | 66 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocaml-lsp/default.nix

diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
new file mode 100644
index 000000000000..0db0164589cf
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
@@ -0,0 +1,66 @@
+{ buildDunePackage
+, stdlib-shims
+, ppx_yojson_conv_lib
+, ocaml-syntax-shims
+, omd
+, octavius
+, dune-build-info
+, uutf
+, csexp
+, cmdliner
+, fetchzip
+, lib
+}:
+let
+  version = "1.1.0";
+  src = fetchzip {
+    url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/ocaml-lsp-server-${version}.tbz";
+    sha256 = "0al89waw43jl80k9z06kh44byhjhwb5hmzx07sddwi1kr1vc6jrb";
+  };
+
+  # unvendor some (not all) dependencies.
+  # They are vendored by upstream only because it is then easier to install
+  # ocaml-lsp without messing with your opam switch, but nix should prevent
+  # this type of problems without resorting to vendoring.
+  preBuild = ''
+    rm -r vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner}
+  '';
+
+  buildInputs = [
+    stdlib-shims
+    ppx_yojson_conv_lib
+    ocaml-syntax-shims
+    octavius
+    uutf
+    csexp
+    dune-build-info
+    omd
+    cmdliner
+  ];
+
+  lsp = buildDunePackage {
+    pname = "lsp";
+    inherit version src;
+    useDune2 = true;
+    minimumOCamlVersion = "4.06";
+
+    inherit buildInputs preBuild;
+  };
+
+in
+buildDunePackage {
+  pname = "ocaml-lsp-server";
+  inherit version src;
+  useDune2 = true;
+
+  inherit preBuild;
+
+  buildInputs = buildInputs ++ [ lsp ];
+
+  meta = with lib; {
+    description = "OCaml Language Server Protocol implementation";
+    license = lib.licenses.isc;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.symphorien ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 1cdcb31c97e8..757a77f0403a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -654,6 +654,8 @@ let
 
     ocamlify = callPackage ../development/tools/ocaml/ocamlify { };
 
+    ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { };
+
     ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { };
 
     ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };

From 602d26e8bd6b45add7aef3bd528e9c20ad3a1249 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 8 Nov 2020 16:37:40 +0100
Subject: [PATCH 1806/3942] libexif: apply patches for CVE-2020-0196,
 CVE-2020-0452

* CVE-2020-0198: unsigned integer overflow in exif_data_load_data_content
* CVE-2020-0452: compiler optimization could remove an a bufferoverflow check, making a buffer overflow possible with some EXIF tags

Fixes: CVE-2020-0196, CVE-2020-0452
---
 pkgs/development/libraries/libexif/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index fd2ed39e34a4..a0f831e927ef 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gettext }:
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }:
 
 stdenv.mkDerivation rec {
   pname = "libexif";
@@ -11,6 +11,20 @@ stdenv.mkDerivation rec {
     sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2020-0198.patch";
+      url = "https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c.patch";
+      sha256 = "1040278g5dbq3vvlyk8cmzb7flpi9bfsp99268hw69i6ilwbdf2k";
+    })
+    (fetchpatch {
+      name = "CVE-2020-0452.patch";
+      url = "https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06.patch";
+      excludes = [ "NEWS" ];
+      sha256 = "0k4z1gbbkli6wwyy9qm2qvn0h00qda6wqym61nmmbys7yc2zryj6";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook gettext ];
 
   meta = with stdenv.lib; {

From de572aea82fcfc83cb469dcb283a0622f7620971 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 8 Nov 2020 19:52:32 +0100
Subject: [PATCH 1807/3942] python3Packages.deepmerge: 0.1.0 -> 0.1.1

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

diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix
index 1cdf0449c68c..dd6059da974b 100644
--- a/pkgs/development/python-modules/deepmerge/default.nix
+++ b/pkgs/development/python-modules/deepmerge/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "deepmerge";
-  version = "0.1.0";
+  version = "0.1.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0d1ab9lxwymqxxd58j50id1wib48xym3ss5xw172i2jfwwwzfdrx";
+    sha256 = "07rcz699fr0jgx6i6fvh8dxa72j7745inix760nw3g46jwk487gs";
   };
 
   propagatedBuildInputs = [

From 9167c807fbc40ee37f65ddc6e63d0a8e30f296f8 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 8 Nov 2020 22:16:10 +0100
Subject: [PATCH 1808/3942] pugixml: move check steps to preCheck hook

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

diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index d9b04781ba1b..8b070671fe40 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
 
   # Hack to be able to run the test, broken because we use
   # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install
-  preBuild = if stdenv.isDarwin then ''
-    export DYLD_LIBRARY_PATH="`pwd`''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
+  preCheck = if stdenv.isDarwin then ''
+    export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
   '' else ''
-    export LD_LIBRARY_PATH="`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
   '';
 
   preConfigure = ''

From 91b20fb1aa6b44fbd9c9d26d62f3e956cfacda63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sun, 8 Nov 2020 22:20:18 +0100
Subject: [PATCH 1809/3942] roundcube service: Restart on config changes.

Until now, e.g. `extraConfig` changes did not reflect in
the system on `nixos-rebuild switch`.
---
 nixos/modules/services/mail/roundcube.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index a0bbab64985b..ee7aa7e22fb9 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -204,6 +204,11 @@ in
     };
     systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ];
 
+    # Restart on config changes.
+    systemd.services.phpfpm-roundcube.restartTriggers = [
+      config.environment.etc."roundcube/config.inc.php".source
+    ];
+
     systemd.services.roundcube-setup = mkMerge [
       (mkIf (cfg.database.host == "localhost") {
         requires = [ "postgresql.service" ];

From a0ea60fde38c4ef9d854abb3fc1456d9106ba3b5 Mon Sep 17 00:00:00 2001
From: squalus <squalus@tuta.io>
Date: Sun, 8 Nov 2020 13:44:11 -0800
Subject: [PATCH 1810/3942] ungoogled-chromium: 86.0.4240.111-1 ->
 86.0.4240.183-1

based on chromium master@b3939086
---
 .../browsers/ungoogled-chromium/common.nix    |  7 +++-
 .../browsers/ungoogled-chromium/default.nix   | 15 +------
 .../ungoogled-chromium/ungoogled-src.nix      |  6 +--
 .../browsers/ungoogled-chromium/update.py     | 30 ++++++++++++-
 .../ungoogled-chromium/upstream-info.json     | 42 +++++++++++++++----
 5 files changed, 73 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
index de409f80370f..1ffb5b6fcbe3 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
@@ -344,7 +344,12 @@ let
       patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary"
     '';
 
-    passthru.updateScript = ./update.py;
+    passthru = {
+      updateScript = ./update.py;
+      chromiumDeps = {
+        gn = gnChromium;
+      };
+    };
   };
 
 # Remove some extraAttrs we supplied to the base attributes already.
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix
index 3cd0ec34db1c..b02c91c6e230 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix
@@ -37,26 +37,15 @@ let
       inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs
               cupsSupport pulseSupport useOzone;
       inherit ungoogled;
-      # TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
       gnChromium = gn.overrideAttrs (oldAttrs: {
-        version = "2020-07-20";
+        inherit (upstream-info.deps.gn) version;
         src = fetchgit {
-          url = "https://gn.googlesource.com/gn";
-          rev = "3028c6a426a4aaf6da91c4ebafe716ae370225fe";
-          sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q";
+          inherit (upstream-info.deps.gn) url rev sha256;
         };
       });
     } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") {
       useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/
       useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine)
-      gnChromium = gn.overrideAttrs (oldAttrs: {
-        version = "2020-08-17";
-        src = fetchgit {
-          url = "https://gn.googlesource.com/gn";
-          rev = "6f13aaac55a977e1948910942675c69f2b4f7a94";
-          sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251";
-        };
-      });
     });
 
     browser = callPackage ./browser.nix { inherit channel enableWideVine; };
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix
index abcb2ce391af..73c9796aaa96 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix
@@ -1,6 +1,6 @@
 {
-  "86.0.4240.111" = {
-    rev = "86.0.4240.111-1";
-    sha256 = "0fkk0lxbvik8q8d5njxmwiam64qz5g74hlb56w24nh5mh1jm59a8";
+  "86.0.4240.183" = {
+    rev = "86.0.4240.183-1";
+    sha256 = "0528l2wr5bpl1cwsxzl5zxz1gw91kffkh5j1kzmc5n7m4mscqxyc";
   };
 }
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.py b/pkgs/applications/networking/browsers/ungoogled-chromium/update.py
index bfc7f0d2478c..b404ca555bff 100755
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/update.py
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/update.py
@@ -1,13 +1,15 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i python -p python3 nix
+#! nix-shell -i python -p python3 nix nix-prefetch-git
 
 import csv
 import json
+import re
 import subprocess
 import sys
 
 from codecs import iterdecode
 from collections import OrderedDict
+from datetime import datetime
 from os.path import abspath, dirname
 from urllib.request import urlopen
 
@@ -26,6 +28,30 @@ def nix_prefetch_url(url, algo='sha256'):
     out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url])
     return out.decode('utf-8').rstrip()
 
+def nix_prefetch_git(url, rev):
+    print(f'nix-prefetch-git {url} {rev}')
+    out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev])
+    return json.loads(out)
+
+def get_file_revision(revision, file_path):
+    url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}'
+    with urlopen(url) as http_response:
+        return http_response.read()
+
+def get_channel_dependencies(channel):
+    deps = get_file_revision(channel['version'], 'DEPS')
+    gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'"
+    gn_commit = re.search(gn_pattern, deps).group(1).decode()
+    gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit)
+    return {
+        'gn': {
+            'version': datetime.fromisoformat(gn['date']).date().isoformat(),
+            'url': gn['url'],
+            'rev': gn['rev'],
+            'sha256': gn['sha256']
+        }
+    }
+
 channels = {}
 last_channels = load_json(JSON_PATH)
 
@@ -58,6 +84,8 @@ with urlopen(HISTORY_URL) as resp:
             # the next one.
             continue
 
+        channel['deps'] = get_channel_dependencies(channel)
+
         channels[channel_name] = channel
 
 with open(JSON_PATH, 'w') as out:
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json
index 5fded39c749a..565f884c5102 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json
@@ -1,17 +1,41 @@
 {
   "stable": {
-    "version": "86.0.4240.111",
-    "sha256": "05y7lwr89awkhvgmwkx3br9j4ap2aypg2wsc0nz8mi7kxc1dnyzj",
-    "sha256bin64": "10aqiiydw4i3jxnw8xxdgkgcqbfqc67n1fbrg40y54kg0v5dz8l6"
+    "version": "86.0.4240.183",
+    "sha256": "1g39i82js7fm4fqb8i66d6xs0kzqjxzi4vzvvwz5y9rkbikcc4ma",
+    "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9",
+    "deps": {
+      "gn": {
+        "version": "2020-08-07",
+        "url": "https://gn.googlesource.com/gn",
+        "rev": "e327ffdc503815916db2543ec000226a8df45163",
+        "sha256": "0kvlfj3www84zp1vmxh76x8fdjm9hyk8lkh2vdsidafpmm75fphr"
+      }
+    }
   },
   "beta": {
-    "version": "87.0.4280.27",
-    "sha256": "0w0asxj7jlsw69cssfia8km4q9cx1c2mliks2rmhf4jk0hsghasm",
-    "sha256bin64": "1lsx4mhy8nachfb8c9f3mrx5nqw2bi046dqirb4lnv7y80jjjs1k"
+    "version": "87.0.4280.40",
+    "sha256": "07xh76fl257np68way6i5rf64qbvirkfddy7m5gvqb0fzcqd7dp3",
+    "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41",
+    "deps": {
+      "gn": {
+        "version": "2020-09-09",
+        "url": "https://gn.googlesource.com/gn",
+        "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
+        "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
+      }
+    }
   },
   "dev": {
-    "version": "88.0.4298.4",
-    "sha256": "0ka11gmpkyrmifajaxm66c16hrj3xakdvhjqg04slyp2sv0nlhrl",
-    "sha256bin64": "0768y31jqbl1znp7yp6mvl5j12xl1nwjkh2l8zdga81q0wz52hh6"
+    "version": "88.0.4300.0",
+    "sha256": "00cfs2rp4h8ybn2snr1d8ygg635hx7q5gv2aqriy1j6f8a1pgh1b",
+    "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv",
+    "deps": {
+      "gn": {
+        "version": "2020-09-09",
+        "url": "https://gn.googlesource.com/gn",
+        "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
+        "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
+      }
+    }
   }
 }

From 197ddbced2ae72efbef0f5f8838a7ad3fbd986eb Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 15 Oct 2020 16:22:14 +0200
Subject: [PATCH 1811/3942] mesa: Replace all usages of old aliases

---
 pkgs/applications/networking/browsers/chromium/common.nix   | 4 ++--
 .../networking/browsers/ungoogled-chromium/common.nix       | 4 ++--
 pkgs/games/katago/default.nix                               | 6 +++---
 pkgs/top-level/aliases.nix                                  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 76f53dcecc87..92403598a038 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -22,7 +22,7 @@
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
 , libva ? null # useVaapi
-, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone
+, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone
 
 # package customization
 , useOzone ? false
@@ -146,7 +146,7 @@ let
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optionals cupsSupport [ libgcrypt cups ]
       ++ optional pulseSupport libpulseaudio
-      ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
+      ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ];
 
     patches = [
       ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
index de409f80370f..fd5a86044551 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
@@ -22,7 +22,7 @@
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
 , libva ? null # useVaapi
-, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone
+, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone
 
 # package customization
 , useOzone ? false
@@ -153,7 +153,7 @@ let
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optionals cupsSupport [ libgcrypt cups ]
       ++ optional pulseSupport libpulseaudio
-      ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
+      ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ];
 
     patches = [
       ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix
index 20ad47d3e0a8..0f9e4b8d67a8 100644
--- a/pkgs/games/katago/default.nix
+++ b/pkgs/games/katago/default.nix
@@ -9,7 +9,7 @@
 , fetchpatch
 , cudnn ? null
 , cudatoolkit ? null
-, libGL_driver ? null
+, mesa ? null
 , opencl-headers ? null
 , ocl-icd ? null
 , gperftools ? null
@@ -25,7 +25,7 @@ assert !enableGPU -> (
   !enableCuda);
 
 assert enableCuda -> (
-  libGL_driver != null &&
+  mesa != null &&
   cudatoolkit != null &&
   cudnn != null);
 
@@ -65,7 +65,7 @@ in env.mkDerivation rec {
     eigen
   ] ++ lib.optionals (enableGPU && enableCuda) [
     cudnn
-    libGL_driver
+    mesa.drivers
   ] ++ lib.optionals (enableGPU && !enableCuda) [
     opencl-headers
     ocl-icd
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 41024876d554..f8228f457012 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -261,7 +261,7 @@ mapAliases ({
   libgnome_keyring = libgnome-keyring; # added 2018-02-25
   libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
   libgumbo = gumbo; # added 2018-01-21
-  libGL_driver = mesa.drivers;
+  libGL_driver = mesa.drivers; # added 2019-05-28
   libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14
   libjpeg_drop = libjpeg_original; # added 2020-06-05
   libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28

From 95d509a27827e5ec5db79c03f58d44670f87df59 Mon Sep 17 00:00:00 2001
From: Utku Demir <me@utdemir.com>
Date: Mon, 9 Nov 2020 11:17:40 +1300
Subject: [PATCH 1812/3942] CODEOWNERS: Add utdemir to docker tools

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 500d63b8cbfd..3762b2eaf8f5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -207,7 +207,7 @@
 /nixos/tests/podman.nix                      @NixOS/podman @zowoq
 
 # Docker tools
-/pkgs/build-support/docker                   @roberth
+/pkgs/build-support/docker                   @roberth @utdemir
 /nixos/tests/docker-tools-overlay.nix        @roberth
 /nixos/tests/docker-tools.nix                @roberth
 /doc/builders/images/dockertools.xml         @roberth

From cd1c5633af2665bf5aee46935ff46f3bacdce317 Mon Sep 17 00:00:00 2001
From: snicket2100 <57048005+snicket2100@users.noreply.github.com>
Date: Sun, 8 Nov 2020 23:25:59 +0100
Subject: [PATCH 1813/3942] firejail: 0.9.62 -> 0.9.64

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

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 272b8612d7a7..497314a6d44a 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.62";
+    version="0.9.64";
     name="${baseName}-${version}";
     url="mirror://sourceforge/firejail/firejail/firejail-${version}.tar.xz";
-    sha256="1q2silgy882fl61p5qa9f9jqkxcqnwa71jig3c729iahx4f0hs05";
+    sha256="1zgjwy2k57nx0r63fzr15gijah098ig0bll66jd615vc9q3snfz5";
   };
   buildInputs = [
     which
@@ -20,19 +20,6 @@ stdenv.mkDerivation {
     name = "${s.name}.tar.bz2";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2020-17367.patch";
-      url = "https://github.com/netblue30/firejail/commit/2c734d6350ad321fccbefc5ef0382199ac331b37.patch";
-      sha256 = "1gxz4jxp80gxnn46195qxcpmikwqab9d0ylj9zkm62lycp84ij6n";
-    })
-    (fetchpatch {
-      name = "CVE-2020-17368.patch";
-      url = "https://github.com/netblue30/firejail/commit/34193604fed04cad2b7b6b0f1a3a0428afd9ed5b.patch";
-      sha256 = "0n4ch3qykxx870201l8lz81f7h84vk93pzz77f5cjbd30cxnbddl";
-    })
-  ];
-
   prePatch = ''
     # Allow whitelisting ~/.nix-profile
     substituteInPlace etc/firejail.config --replace \

From 5813ab6de2ec1077f24e6cc3d53535468732a7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 8 Nov 2020 17:51:50 +0100
Subject: [PATCH 1814/3942] Fix SDL_image loading jpeg and others

It was using dlopen and its shared object didn't have the proper rpath
to do so.

This fixes tuxpaint loading of jpeg pictures.
---
 pkgs/development/libraries/SDL_image/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index 8e3078563e2b..968fc3d38af8 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -17,7 +17,12 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = [
+    # Disable its dynamic loading or dlopen will fail because of no proper rpath
+    "--disable-jpg-shared"
+    "--disable-png-shared"
+    "--disable-tif-shared"
+  ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
 
   buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ];
 

From 88de0d7354f174379119cc1663e9ccc4203a4e20 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Mon, 9 Nov 2020 09:29:53 +0900
Subject: [PATCH 1815/3942] maxima: 5.42.2 -> 5.44.0 (#102861)

Reference: https://sourceforge.net/p/maxima/code/ci/master/tree/ChangeLog-5.43.md
Reference: https://sourceforge.net/p/maxima/code/ci/master/tree/ChangeLog-5.44.md
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 .../science/math/maxima/default.nix           | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 49ff0d5d5a05..1bf7d16f2904 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null
-, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false
+{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, autoreconfHook
+, rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false
 }:
 
 let
   name    = "maxima";
-  version = "5.42.2";
+  version = "5.44.0";
 
   searchPath =
     stdenv.lib.makeBinPath
@@ -16,14 +16,20 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
-    sha256 = "0kdncy6137sg3rradirxzj10mkcvafxd892zlclwhr9sa7b12zhn";
+    sha256 = "1v6jr5s6hhj6r18gfk6hgxk2qd6z1dxkrjq9ss2z1y6sqi45wgyr";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   buildInputs = stdenv.lib.filter (x: x != null) [
     sbcl ecl texinfo perl python makeWrapper
     gnuplot   # required in the test suite
   ];
 
+  postPatch = ''
+    substituteInPlace doc/info/Makefile.am --replace "/usr/bin/env perl" "${perl}/bin/perl"
+  '';
+
   postInstall = ''
     # Make sure that maxima can find its runtime dependencies.
     for prog in "$out/bin/"*; do
@@ -57,13 +63,6 @@ stdenv.mkDerivation ({
       url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
       sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx";
     })
-
-    # upstream bug https://sourceforge.net/p/maxima/bugs/2520/ (not fixed)
-    # introduced in https://trac.sagemath.org/ticket/13364
-    (fetchpatch {
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
-      sha256 = "0xa0b6cr458zp7lc7qi0flv5ar0r3ivsqhjl0c3clv86di2y522d";
-    })
   ] ++ stdenv.lib.optionals ecl-fasl [
     # build fasl, needed for ECL support
     (fetchpatch {
@@ -74,11 +73,13 @@ stdenv.mkDerivation ({
 
   # The test suite is disabled since 5.42.2 because of the following issues:
   #
-  #   Errors found in /build/maxima-5.42.2/share/linearalgebra/rtest_matrixexp.mac, problems:
+  #   Error(s) found:
+  #   /build/maxima-5.44.0/share/linearalgebra/rtest_matrixexp.mac problems:
   #   (20 21 22)
-  #   Error found in rtest_arag, problem:
-  #   (error break)
-  #   3 tests failed out of 3,881 total tests.
+  #   Tests that were expected to fail but passed:
+  #   /build/maxima-5.44.0/share/vector/rtest_vect.mac problem:
+  #   (19)
+  #   3 tests failed out of 16,184 total tests.
   #
   # These failures don't look serious. It would be nice to fix them, but I
   # don't know how and probably won't have the time to find out.

From a5c97364b3d88df3b76729a9fd181cc6189d24f2 Mon Sep 17 00:00:00 2001
From: Jonathan Strickland <djanatyn@gmail.com>
Date: Sun, 8 Nov 2020 20:03:25 -0500
Subject: [PATCH 1816/3942] fend: init at 0.1.9

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

diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix
new file mode 100644
index 000000000000..ee91c66cc82a
--- /dev/null
+++ b/pkgs/tools/misc/fend/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "fend";
+  version = "0.1.9";
+
+  src = fetchFromGitHub {
+    owner = "printfn";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "11cvpg7j2rvqri16cr3gb6dpm7dzgs3vywhdc91aa531f87qj16c";
+  };
+
+  cargoSha256 = "0q9gkvbay6rnb0nd14z71h3506yzn9610zc6g8wbpgmw6cpwvbg9";
+
+  meta = with lib; {
+    description = "Arbitrary-precision unit-aware calculator";
+    homepage = "https://github.com/printfn/fend";
+    license = licenses.mit;
+    maintainers = with maintainers; [ djanatyn ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fde911a0a7c2..6e6dd8c5fbf1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3790,6 +3790,8 @@ in
 
   feedreader = callPackage ../applications/networking/feedreaders/feedreader {};
 
+  fend = callPackage ../tools/misc/fend { };
+
   ferm = callPackage ../tools/networking/ferm { };
 
   ffsend = callPackage ../tools/misc/ffsend { };

From 145be290858682eddb4efa17a9b13d6b66e33287 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 9 Nov 2020 09:48:44 +1000
Subject: [PATCH 1817/3942] miniserve: 0.10.0 -> 0.10.1

https://github.com/svenstaro/miniserve/releases/tag/v0.10.1
---
 pkgs/tools/misc/miniserve/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix
index a0fe350a2736..c40f70c6f7fb 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/pkgs/tools/misc/miniserve/default.nix
@@ -8,18 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "miniserve";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "miniserve";
     rev = "v${version}";
-    sha256 = "01nsviw5nc5lb6z3j2yiymiwhiq719nwqpvqbyb5p65s98sph7yh";
+    sha256 = "0d3jfxlk6r52ikqlvrj34grj2anq6r8653icn1dsjcrnwam5vn39";
   };
 
-  cargoSha256 = "098p4645air5402shqignc57zdm6755shahhby17nqv1s27gfinc";
-
-  RUSTC_BOOTSTRAP = 1;
+  cargoSha256 = "0zzfx7j36cxjx8vbcghg5icimda7lwm2qhlnvxcd67fws3ggmn5x";
 
   nativeBuildInputs = [ pkg-config zlib ];
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];

From f0efe2d16cc4abb402ceb6d1e0306f669de5ed5b Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 8 Nov 2020 20:28:45 -0500
Subject: [PATCH 1818/3942] darwin.adv_cmds: fix build

Also disable pgrep that depends on pkill
---
 .../adv_cmds/default.nix                      | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
index 0cbd7d81b902..6113eed007e5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
@@ -3,27 +3,22 @@
 appleDerivation {
   # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264
 
+  patchPhase = ''
+    substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
+      --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib'
+  '';
+
   # pkill requires special private headers that are unavailable in
   # NixPkgs. These ones are needed:
   #  - xpc/xpxc.h
   #  - os/base_private.h
   #  - _simple.h
   # We disable it here for now. TODO: build pkill inside adv_cmds
-
-  # We also disable locale here because of some issues with a missing
-  # "lstdc++".
-  patchPhase = ''
-    substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
-      --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \
-      --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" \
-      --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib'
-  '';
-
   buildPhase = ''
     targets=$(xcodebuild -list \
                 | awk '/Targets:/{p=1;print;next} p&&/^\s*$/{p=0};p' \
                 | tail -n +2 | sed 's/^[ \t]*//' \
-                | grep -v -e Desktop -e Embedded -e mklocale -e colldef)
+                | grep -v -e Desktop -e Embedded -e mklocale -e pkill -e pgrep -e colldef)
 
     for i in $targets; do
       xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates -target $i
@@ -34,7 +29,7 @@ appleDerivation {
   installPhase = ''
     for f in Products/Release/*; do
       if [ -f $f ]; then
-        install -D $file $out/bin/$(basename $f)
+        install -D $f $out/bin/$(basename $f)
       fi
     done
 

From 0c75dfb732d471ff9641ea24a89defa780d849be Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 9 Nov 2020 01:45:09 +0000
Subject: [PATCH 1819/3942] convertall: init at 0.8.0 (#103108)

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

diff --git a/pkgs/applications/science/misc/convertall/default.nix b/pkgs/applications/science/misc/convertall/default.nix
new file mode 100644
index 000000000000..63ed18c89b2f
--- /dev/null
+++ b/pkgs/applications/science/misc/convertall/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, python3, wrapQtAppsHook }:
+
+let
+  inherit (python3.pkgs) wrapPython pyqt5;
+in stdenv.mkDerivation rec {
+  pname = "convertall";
+  version = "0.8.0";
+
+  src = fetchFromGitHub {
+    owner = "doug-101";
+    repo = "ConvertAll";
+    rev = "v${version}";
+    sha256 = "02xxasgbjbivsbhyfpn3cpv52lscdx5kc95s6ns1dvnmdg0fpng0";
+  };
+
+  nativeBuildInputs = [ python3 wrapPython wrapQtAppsHook ];
+
+  propagatedBuildInputs = [ pyqt5 ];
+
+  installPhase = ''
+    python3 install.py -p $out -x
+  '';
+
+  postFixup = ''
+    buildPythonPath $out
+    patchPythonScript $out/share/convertall/convertall.py
+    makeQtWrapper $out/share/convertall/convertall.py $out/bin/convertall
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://convertall.bellz.org/";
+    description = "Graphical unit converter";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ orivej ];
+    platforms = pyqt5.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afa640a9f3fd..9f881a85ccac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26892,6 +26892,8 @@ in
     inherit (pkgs.gnome2) gtkglext;
   };
 
+  convertall = qt5.callPackage ../applications/science/misc/convertall { };
+
   cytoscape = callPackage ../applications/science/misc/cytoscape {
     jre = openjdk11;
   };

From 3a04ea47b74b0c5fbc8b9233666b2cb1fec44901 Mon Sep 17 00:00:00 2001
From: Felix Andreas <felix.andreas95@googlemail.com>
Date: Wed, 4 Nov 2020 00:28:51 +0100
Subject: [PATCH 1820/3942] maintainers: add andreasfelix

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bacd3dab9aae..6a5582d2c92d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -514,6 +514,12 @@
     githubId = 69135;
     name = "Andrea Bedini";
   };
+  andreasfelix = {
+    email = "fandreas@physik.hu-berlin.de";
+    github = "andreasfelix";
+    githubId = 24651767;
+    name = "Felix Andreas";
+  };
   andres = {
     email = "ksnixos@andres-loeh.de";
     github = "kosmikus";

From 49280e8bb8b874355a1245e36b9276b6573a60af Mon Sep 17 00:00:00 2001
From: Felix Andreas <felix.andreas95@googlemail.com>
Date: Mon, 9 Nov 2020 03:44:08 +0100
Subject: [PATCH 1821/3942] vala-language-server: init at 0.48.1

---
 .../tools/vala-language-server/default.nix    | 59 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/tools/vala-language-server/default.nix

diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/vala-language-server/default.nix
new file mode 100644
index 000000000000..f26615e26b7a
--- /dev/null
+++ b/pkgs/development/tools/vala-language-server/default.nix
@@ -0,0 +1,59 @@
+{ stdenv
+, fetchFromGitHub
+, nix-update-script
+, meson
+, ninja
+, pkg-config
+, scdoc
+, gnome-builder
+, gnused
+, glib
+, libgee
+, json-glib
+, jsonrpc-glib
+, vala
+}:
+
+stdenv.mkDerivation rec {
+  pname = "vala-language-server";
+  version = "0.48.1";
+
+  src = fetchFromGitHub {
+    owner = "benwaffle";
+    repo = pname;
+    rev = version;
+    sha256 = "12k095052jkvbiyz8gzkj6w7r7p16d5m18fyikl48yvh5nln8fw0";
+  };
+
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = pname;
+    };
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    scdoc
+    # GNOME Builder Plugin
+    gnused
+    gnome-builder
+  ];
+
+  buildInputs = [
+    glib
+    libgee
+    json-glib
+    jsonrpc-glib
+    vala
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Code Intelligence for Vala & Genie";
+    homepage = "https://github.com/benwaffle/vala-language-server";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ andreasfelix worldofpeace ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 006a9dbe7650..cee7f463ba7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11899,6 +11899,8 @@ in
 
   vagrant = callPackage ../development/tools/vagrant {};
 
+  vala-language-server = callPackage ../development/tools/vala-language-server {};
+
   bashdb = callPackage ../development/tools/misc/bashdb { };
 
   gdb = callPackage ../development/tools/misc/gdb {

From 56172cf2c127884329431e6057f51aec0d505a70 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 9 Nov 2020 12:48:25 +1000
Subject: [PATCH 1822/3942] miniserve: 0.10.1 -> 0.10.3

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

diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix
index c40f70c6f7fb..3e3c62fd0930 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/pkgs/tools/misc/miniserve/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "miniserve";
-  version = "0.10.1";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "miniserve";
     rev = "v${version}";
-    sha256 = "0d3jfxlk6r52ikqlvrj34grj2anq6r8653icn1dsjcrnwam5vn39";
+    sha256 = "17m0h0ib7fl0kijagcwdcnvrdcb6z3knix9dl17abg5ivbvkwz8q";
   };
 
-  cargoSha256 = "0zzfx7j36cxjx8vbcghg5icimda7lwm2qhlnvxcd67fws3ggmn5x";
+  cargoSha256 = "0ddc8b9wph4r1qcy24p8yiaq9s2knii0d7dh0w0qnzrn6cmm17dg";
 
   nativeBuildInputs = [ pkg-config zlib ];
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];

From 7d3fb8234df988c807c8ecc974f15da92d5e8046 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 9 Nov 2020 04:11:29 +0100
Subject: [PATCH 1823/3942] brotli: add myself as maintainer (#103129)

---
 pkgs/tools/compression/brotli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index 7e04d05516a3..f4f0ac41563a 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
       '';
 
     license = licenses.mit;
-    maintainers = [ ];
+    maintainers = with maintainers; [ freezeboy ];
     platforms = platforms.all;
   };
 }

From f7c50a8aa060b38c9b8fa0a40fca6e7049be2652 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Mon, 9 Nov 2020 04:35:12 +0100
Subject: [PATCH 1824/3942] nixos/ssmtp: add assertion for useSTARTTLS
 dependency on useTLS

services.ssmtp.useSTARTTLS has no effect when services.ssmtp.useTLS is disabled.
---
 nixos/modules/programs/ssmtp.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix
index 98ff21bd37f2..1f49ddc91bb3 100644
--- a/nixos/modules/programs/ssmtp.nix
+++ b/nixos/modules/programs/ssmtp.nix
@@ -142,6 +142,13 @@ in
 
   config = mkIf cfg.enable {
 
+    assertions = [
+      {
+        assertion = cfg.useSTARTTLS -> cfg.useTLS;
+        message = "services.ssmtp.useSTARTTLS has no effect without services.ssmtp.useTLS";
+      }
+    ];
+
     services.ssmtp.settings = mkMerge [
       ({
         MailHub = cfg.hostName;

From 1a7131a8420199946d1cc4b9164f1b08132efa8c Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sun, 8 Nov 2020 21:14:34 +0100
Subject: [PATCH 1825/3942] wordpress: 5.5.1 -> 5.5.3

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

diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 019988093471..af2a41202671 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wordpress";
-  version = "5.5.1";
+  version = "5.5.3";
 
   src = fetchurl {
     url = "https://wordpress.org/${pname}-${version}.tar.gz";
-    sha256 = "15cjp48q23fw8ryy39mlxi4rd3rha2yqyrnk5mhx0h72ygawx8k6";
+    sha256 = "sTkmdr9Mulw7XwNEMJBU81rwNV/agNpBjCznGuObrtQ=";
   };
 
   installPhase = ''

From e42eadcd1683d588b73e4f53ea79c445d1ae4ddb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 9 Nov 2020 04:20:00 +0000
Subject: [PATCH 1826/3942] jetbrains-mono: 2.200 -> 2.210

https://github.com/JetBrains/JetBrainsMono/releases/tag/v2.210
---
 pkgs/data/fonts/jetbrains-mono/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix
index e3ac0a1f3200..fc4d76f6ad6b 100644
--- a/pkgs/data/fonts/jetbrains-mono/default.nix
+++ b/pkgs/data/fonts/jetbrains-mono/default.nix
@@ -1,14 +1,14 @@
 { lib, fetchzip }:
 
 let
-  version = "2.200";
+  version = "2.210";
 in
 fetchzip {
   name = "JetBrainsMono-${version}";
 
   url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";
 
-  sha256 = "16v914ph9sgdz3w56yz9f26zpj2lpxjb6ppnphxlmbllh68z1fh4";
+  sha256 = "05csy42qji8xbaq5iap2nmki0d0cbiwiq9kbzjd1cah9qn6gfill";
 
   postFetch = ''
     mkdir -p $out/share/fonts

From e8721af065934457b4ebf4ca819009ab5a2cb3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sun, 8 Nov 2020 10:49:31 +0100
Subject: [PATCH 1827/3942] libtorch-bin: fix CMake library paths for split
 outputs

The libtorch CMake files are in the `dev` output and used relative
paths to locate the shared libraries. This fails, because the
libraries are in the `out` output. This change patches the CMake files
to use library paths from `out`.

See #102146.
---
 pkgs/development/libraries/science/math/libtorch/bin.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix
index 6180c14c4d72..7c78f61af694 100644
--- a/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -45,6 +45,14 @@ in stdenv.mkDerivation {
 
     # We do not care about Java support...
     rm -f $out/lib/lib*jni* 2> /dev/null || true
+
+    # Fix up library paths for split outputs
+    substituteInPlace $dev/share/cmake/Torch/TorchConfig.cmake \
+      --replace \''${TORCH_INSTALL_PREFIX}/lib "$out/lib" \
+
+    substituteInPlace \
+      $dev/share/cmake/Caffe2/Caffe2Targets-release.cmake \
+      --replace \''${_IMPORT_PREFIX}/lib "$out/lib" \
   '';
 
   postFixup = let

From 2802a021e32005497a4ae911d5a339f9456d6051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sun, 8 Nov 2020 10:55:53 +0100
Subject: [PATCH 1828/3942] libtorch-bin: modify passthru test to capture CMake
 misconfiguration

---
 .../libraries/science/math/libtorch/test/CMakeLists.txt          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt b/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt
index b302449ef772..4e96704a4c17 100644
--- a/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt
+++ b/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.0)
 find_package(Torch REQUIRED)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")
 add_executable(test test.cpp)

From 971aef5e0876e3c88de20329f8d183b416ec8ade Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 9 Nov 2020 10:59:34 +0100
Subject: [PATCH 1829/3942] mesa: 20.2.1 -> 20.2.2 (#103174)

---
 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 aa180b94d747..8e8a625b50f8 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -31,7 +31,7 @@ with stdenv.lib;
 let
   # Release calendar: https://www.mesa3d.org/release-calendar.html
   # Release frequency: https://www.mesa3d.org/releasing.html#schedule
-  version = "20.2.1";
+  version = "20.2.2";
   branch  = versions.major version;
 in
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "0ji4s1gwcvx3fbj9h0x5zbma6kw4b75vs0266zhc06r97yd6v96i";
+    sha256 = "0qdqi767vshclnfg9drlsmp2pa17hi7y0172s064jwfgj08fp4qz";
   };
 
   prePatch = "patchShebangs .";

From 59239feacb096a5e33cbaec5cb7d4e1e85c9cc6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 9 Nov 2020 11:09:06 +0100
Subject: [PATCH 1830/3942] nixos/plasma5: Fix when running without aliases

---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index b4f45a24efd3..8cc579af2ca0 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -367,7 +367,7 @@ in
       security.pam.services.sddm.enableKwallet = true;
 
       xdg.portal.enable = true;
-      xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
+      xdg.portal.extraPortals = [ plasma5.xdg-desktop-portal-kde ];
 
       # Update the start menu for each user that is currently logged in
       system.userActivationScripts.plasmaSetup = activationScript;

From 78bf7f33d9ca4562858414ed22919c9f510ead8e Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Mon, 9 Nov 2020 11:40:52 +0100
Subject: [PATCH 1831/3942] wtf: 0.33.0 -> 0.34.0

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

diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index ad8e261cf686..ad107b644722 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "wtf";
-  version = "0.33.0";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "wtfutil";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0dszc3igfvlb6dgf5whyhw72id39lqqmgpd42kyqx5yjf5dw2wg7";
+    sha256 = "01zydr1w8byjhxf4xj6z001q4ynq0452cn332ap1l1w0dmx9mxyr";
    };
 
-  vendorSha256 = "1wcqk8lfv3jq7dfaj9dj8bzsmq2qislzs1m38gx1hh4jwg1rn2cn";
+  vendorSha256 = "1xyai417l8q44b562ssp5qqw04klrhg5397ahr4pc3i30csz8a7a";
 
   doCheck = false;
 

From 7f1a82d4761ecced506035ee175160c2f3b5fe39 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 15 Oct 2020 23:42:09 +0200
Subject: [PATCH 1832/3942] stdenv/darwin: bump bootstrap tools

This new version has tapi support, which is needed to build the new
stubs based libSystem, etc. and Big Sur support.

You can verify the provenance of these yourself by checking Hydra here:
https://hydra.nixos.org/build/128192471
---
 pkgs/stdenv/darwin/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 58da8b71b650..5540216b0d8b 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -7,15 +7,15 @@
 # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
 , bootstrapFiles ? let
   fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/d5bdfcbfe6346761a332918a267e82799ec954d2/${file}";
+    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/5ab5783e4f46c373c6de84deac9ad59b608bb2e6/${file}";
     inherit (localSystem) system;
     inherit sha256 executable;
   }; in {
-    sh      = fetch { file = "sh";    sha256 = "07wm33f1yzfpcd3rh42f8g096k4cvv7g65p968j28agzmm2s7s8m"; };
-    bzip2   = fetch { file = "bzip2"; sha256 = "0y9ri2aprkrp2dkzm6229l0mw4rxr2jy7vvh3d8mxv2698v2kdbm"; };
-    mkdir   = fetch { file = "mkdir"; sha256 = "0sb07xpy66ws6f2jfnpjibyimzb71al8n8c6y4nr8h50al3g90nr"; };
-    cpio    = fetch { file = "cpio";  sha256 = "0r5c54hg678w7zydx27bzl9p3v9fs25y5ix6vdfi1ilqim7xh65n"; };
-    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "18hp5w6klr8g307ap4368r255qpzg9r0vwg9vqvj8f2zy1xilcjf"; executable = false; };
+    sh      = fetch { file = "sh";    sha256 = "sha256-nbb4XEk3go7ttiWrQyKQMLzPr+qUnwnHkWMtVCZsMCs="; };
+    bzip2   = fetch { file = "bzip2"; sha256 = "sha256-ybnA+JWrKhXSfn20+GVKXkHFTp2Zt79hat8hAVmsUOc="; };
+    mkdir   = fetch { file = "mkdir"; sha256 = "sha256-nmvMxmfcY41/60Z/E8L9u0vgePW5l30Dqw1z+Nr02Hk="; };
+    cpio    = fetch { file = "cpio";  sha256 = "sha256-cB36rN3NLj19Tk37Kc5bodMFMO+mCpEQkKKo0AEMkaU="; };
+    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "sha256-kh2vKmjCr/HvR06czZbxUxV5KDRxSF27M6nN3cyofRI="; executable = false; };
   }
 }:
 

From 86ee107a15ac7197380d5b44697cd2b3af00bf2f Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 31 Jul 2020 23:03:51 +0900
Subject: [PATCH 1833/3942] darwin/stdenv: assemble full clang toolchain

Adapted from main expression for clang 7.
---
 pkgs/stdenv/darwin/default.nix | 48 +++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 5540216b0d8b..5386213f2ad7 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -24,6 +24,8 @@ assert crossSystem == localSystem;
 let
   inherit (localSystem) system platform;
 
+  bootstrapClangVersion = "7.1.0";
+
   commonImpureHostDeps = [
     "/bin/sh"
     "/usr/lib/libSystem.B.dylib"
@@ -90,7 +92,18 @@ in rec {
         inherit shell;
         inherit (last) stdenvNoCC;
 
-        extraPackages = [];
+        extraPackages = [
+          # last.pkgs.llvmPackages_7.libcxxabi # TODO: is this required? if not, why not?
+          last.pkgs.llvmPackages_7.compiler-rt
+        ];
+
+        extraBuildCommands = ''
+          rsrc="$out/resource-root"
+          mkdir "$rsrc"
+          ln -s "${bootstrapTools}/lib/clang/${bootstrapClangVersion}/include" "$rsrc"
+          ln -s "${last.pkgs.llvmPackages_7.compiler-rt.out}/lib" "$rsrc/lib"
+          echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+        '';
 
         nativeTools  = false;
         nativeLibc   = false;
@@ -180,6 +193,15 @@ in rec {
             ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
           '';
         };
+
+        compiler-rt = stdenv.mkDerivation {
+          name = "bootstrap-stage0-compiler-rt";
+          buildCommand = ''
+            mkdir -p $out/lib
+            ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib
+            ln -s ${bootstrapTools}/lib/darwin       $out/lib/darwin
+          '';
+        };
       };
     };
 
@@ -195,6 +217,12 @@ in rec {
       python3 = super.python3Minimal;
 
       ninja = super.ninja.override { buildDocs = false; };
+
+      llvmPackages_7 = super.llvmPackages_7 // (let
+        libraries = super.llvmPackages_7.libraries.extend (_: _: {
+          inherit (llvmPackages_7) compiler-rt;
+        });
+      in { inherit libraries; } // libraries);
     };
   in with prevStage; stageFun 1 prevStage {
     extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
@@ -203,7 +231,9 @@ in rec {
     libcxx = pkgs.libcxx;
 
     allowedRequisites =
-      [ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ];
+      [ bootstrapTools ] ++
+      (with pkgs; [ libcxx libcxxabi llvmPackages_7.compiler-rt ]) ++
+      (with pkgs.darwin; [ Libsystem ]);
 
     overrides = persistent;
   };
@@ -217,6 +247,12 @@ in rec {
         findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils
         libssh2 nghttp2 libkrb5 ninja;
 
+      llvmPackages_7 = super.llvmPackages_7 // (let
+        libraries = super.llvmPackages_7.libraries.extend (_: _: {
+          inherit (llvmPackages_7) compiler-rt;
+        });
+      in { inherit libraries; } // libraries);
+
       darwin = super.darwin // {
         inherit (darwin)
           dyld Libsystem xnu configd ICU libdispatch libclosure launchd CF;
@@ -234,8 +270,8 @@ in rec {
     allowedRequisites =
       [ bootstrapTools ] ++
       (with pkgs; [
-        xz.bin xz.out libcxx libcxxabi zlib libxml2.out curl.out openssl.out libssh2.out
-        nghttp2.lib libkrb5
+        xz.bin xz.out libcxx libcxxabi llvmPackages_7.compiler-rt zlib
+        libxml2.out curl.out openssl.out libssh2.out nghttp2.lib libkrb5
       ]) ++
       (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
 
@@ -284,8 +320,8 @@ in rec {
     allowedRequisites =
       [ bootstrapTools ] ++
       (with pkgs; [
-        xz.bin xz.out bash libcxx libcxxabi zlib libxml2.out curl.out openssl.out libssh2.out
-        nghttp2.lib libkrb5
+        xz.bin xz.out bash libcxx libcxxabi llvmPackages_7.compiler-rt zlib
+        libxml2.out curl.out openssl.out libssh2.out nghttp2.lib libkrb5
       ]) ++
       (with pkgs.darwin; [ dyld ICU Libsystem locale ]);
 

From fece3eb2e981b3bd9ea73b34f302ff3aa3d9f81c Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 31 Jul 2020 23:03:51 +0900
Subject: [PATCH 1834/3942] darwin/stdenv: refactoring

Build the llvm support libraries (libcxx, libcxxabi) from scratch
without using the existing llvm libraries. This is the same spirit and
similar implementation as the "useLLVM" bootstrap in llvm package
sets. Critically it avoids having libcxxabi provided by the cc-wrapper
when building libcxx, which otherwise results in two libcxxabi
instances.

$ otool -L /nix/store/vd4vvgs9xngqbjzpg3qc41wl6jh42s9i-libc++-7.1.0/lib/libc++.dylib
/nix/store/vd4vvgs9xngqbjzpg3qc41wl6jh42s9i-libc++-7.1.0/lib/libc++.dylib:
        /nix/store/vd4vvgs9xngqbjzpg3qc41wl6jh42s9i-libc++-7.1.0/lib/libc++.1.0.dylib (compatibility version 1.0.0, current version 1.0.0)
        /nix/store/gmpwk5fyp3iasppqrrdpswxvid6kcp8r-libc++abi-7.1.0/lib/libc++abi.dylib (compatibility version 1.0.0, current version 1.0.0)
        /nix/store/3hn7azynqgp2pm5gpdg45gpq0ia72skg-libc++abi-7.1.0/lib/libc++abi.dylib (compatibility version 1.0.0, current version 1.0.0)
        /nix/store/1nq94scbxs6bk7pimqhvz76q6cfmbv97-Libsystem-osx-10.12.6/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1226.10.1)

Additionally move some utilities (clang, binutils, coreutils, gnugrep)
to the stage layers so they can be replaced before the final
stdenv. This should cause most of stage4 to be built from the
toolchain assembled as of stage3 instead of the bootstrap toolchain.
---
 .../compilers/llvm/7/libc++abi.nix            |   5 +-
 pkgs/stdenv/darwin/default.nix                | 132 ++++++++++++------
 2 files changed, 94 insertions(+), 43 deletions(-)

diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix
index 97141a0bd402..7f2ec528f3c1 100644
--- a/pkgs/development/compilers/llvm/7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -1,4 +1,5 @@
 { stdenv, cmake, fetch, libcxx, llvm, version
+, standalone ? false
   # on musl the shared objects don't build
 , enableShared ? ! stdenv.hostPlatform.isMusl }:
 
@@ -20,7 +21,9 @@ stdenv.mkDerivation {
     patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
   '';
 
-  cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";
+  cmakeFlags =
+     stdenv.lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++
+     stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";
 
   installPhase = if stdenv.isDarwin
     then ''
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 5386213f2ad7..fbd5f1cf3f01 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -74,44 +74,48 @@ in rec {
         inherit (last) stdenv;
       };
 
-      coreutils = { name = "${name}-coreutils"; outPath = bootstrapTools; };
-      gnugrep   = { name = "${name}-gnugrep";   outPath = bootstrapTools; };
+      mkExtraBuildCommands = cc: ''
+        rsrc="$out/resource-root"
+        mkdir "$rsrc"
+        ln -s "${cc}/lib/clang/${cc.version}/include" "$rsrc"
+        ln -s "${last.pkgs.llvmPackages_7.compiler-rt.out}/lib" "$rsrc/lib"
+        echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+      '';
 
-      bintools = import ../../build-support/bintools-wrapper {
-        inherit shell;
-        inherit (last) stdenvNoCC;
+      mkCC = overrides: import ../../build-support/cc-wrapper (
+        let args = {
+          inherit shell;
+          inherit (last) stdenvNoCC;
 
-        nativeTools  = false;
-        nativeLibc   = false;
-        inherit buildPackages coreutils gnugrep;
-        libc         = last.pkgs.darwin.Libsystem;
-        bintools     = { name = "${name}-binutils"; outPath = bootstrapTools; };
-      };
-
-      cc = if last == null then "/dev/null" else import ../../build-support/cc-wrapper {
-        inherit shell;
-        inherit (last) stdenvNoCC;
+          nativeTools  = false;
+          nativeLibc   = false;
+          inherit buildPackages libcxx;
+          inherit (last.pkgs) coreutils gnugrep;
+          bintools     = last.pkgs.darwin.binutils;
+          libc         = last.pkgs.darwin.Libsystem;
+          isClang      = true;
+          cc           = last.pkgs.llvmPackages_7.clang-unwrapped;
+        }; in args // (overrides args));
 
+      cc = if last == null then "/dev/null" else mkCC ({ cc, ... }: {
         extraPackages = [
-          # last.pkgs.llvmPackages_7.libcxxabi # TODO: is this required? if not, why not?
+          last.pkgs.llvmPackages_7.libcxxabi
           last.pkgs.llvmPackages_7.compiler-rt
         ];
+        extraBuildCommands = mkExtraBuildCommands cc;
+      });
 
+      ccNoLibcxx = if last == null then "/dev/null" else mkCC ({ cc, ... }: {
+        libcxx = null;
+        extraPackages = [
+          last.pkgs.llvmPackages_7.compiler-rt
+        ];
         extraBuildCommands = ''
-          rsrc="$out/resource-root"
-          mkdir "$rsrc"
-          ln -s "${bootstrapTools}/lib/clang/${bootstrapClangVersion}/include" "$rsrc"
-          ln -s "${last.pkgs.llvmPackages_7.compiler-rt.out}/lib" "$rsrc/lib"
-          echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-        '';
-
-        nativeTools  = false;
-        nativeLibc   = false;
-        inherit buildPackages coreutils gnugrep bintools libcxx;
-        libc         = last.pkgs.darwin.Libsystem;
-        isClang      = true;
-        cc           = { name = "${name}-clang"; outPath = bootstrapTools; };
-      };
+          echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+          echo "-B${last.pkgs.llvmPackages_7.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+          echo "-nostdlib++" >> $out/nix-support/cc-cflags
+        '' + mkExtraBuildCommands cc;
+      });
 
       thisStdenv = import ../generic {
         name = "${name}-stdenv-darwin";
@@ -150,7 +154,10 @@ in rec {
         extraAttrs = {
           inherit macosVersionMin appleSdkVersion platform;
         };
-        overrides  = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
+        overrides  = self: super: (overrides self super) // {
+          inherit ccNoLibcxx;
+          fetchurl = thisStdenv.fetchurlBoot;
+        };
       };
 
     in {
@@ -160,6 +167,9 @@ in rec {
 
   stage0 = stageFun 0 null {
     overrides = self: super: with stage0; {
+      coreutils = { name = "bootstrap-stage0-coreutils"; outPath = bootstrapTools; };
+      gnugrep   = { name = "bootstrap-stage0-gnugrep";   outPath = bootstrapTools; };
+
       darwin = super.darwin // {
         Libsystem = stdenv.mkDerivation {
           name = "bootstrap-stage0-Libsystem";
@@ -170,9 +180,26 @@ in rec {
           '';
         };
         dyld = bootstrapTools;
+
+        binutils = lib.makeOverridable (import ../../build-support/bintools-wrapper) {
+          shell = "${bootstrapTools}/bin/bash";
+          inherit (self) stdenvNoCC;
+
+          nativeTools  = false;
+          nativeLibc   = false;
+          inherit (self) buildPackages coreutils gnugrep;
+          libc         = self.pkgs.darwin.Libsystem;
+          bintools     = { name = "bootstrap-stage0-binutils"; outPath = bootstrapTools; };
+        };
       };
 
       llvmPackages_7 = {
+        clang-unwrapped = {
+          name = "bootstrap-stage0-clang";
+          outPath = bootstrapTools;
+          version = bootstrapClangVersion;
+        };
+
         libcxx = stdenv.mkDerivation {
           name = "bootstrap-stage0-libcxx";
           phases = [ "installPhase" "fixupPhase" ];
@@ -219,10 +246,19 @@ in rec {
       ninja = super.ninja.override { buildDocs = false; };
 
       llvmPackages_7 = super.llvmPackages_7 // (let
-        libraries = super.llvmPackages_7.libraries.extend (_: _: {
-          inherit (llvmPackages_7) compiler-rt;
+        tools = super.llvmPackages_7.tools.extend (_: _: {
+          inherit (llvmPackages_7) clang-unwrapped;
         });
-      in { inherit libraries; } // libraries);
+        libraries = super.llvmPackages_7.libraries.extend (_: _: {
+          inherit (llvmPackages_7) compiler-rt libcxx libcxxabi;
+        });
+      in { inherit tools libraries; } // tools // libraries);
+
+      darwin = super.darwin // {
+        binutils = darwin.binutils.override {
+          libc = self.darwin.Libsystem;
+        };
+      };
     };
   in with prevStage; stageFun 1 prevStage {
     extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
@@ -248,14 +284,24 @@ in rec {
         libssh2 nghttp2 libkrb5 ninja;
 
       llvmPackages_7 = super.llvmPackages_7 // (let
-        libraries = super.llvmPackages_7.libraries.extend (_: _: {
-          inherit (llvmPackages_7) compiler-rt;
+        tools = super.llvmPackages_7.tools.extend (_: _: {
+          inherit (llvmPackages_7) clang-unwrapped;
         });
-      in { inherit libraries; } // libraries);
+        libraries = super.llvmPackages_7.libraries.extend (_: libSuper: {
+          inherit (llvmPackages_7) compiler-rt;
+          libcxx = libSuper.libcxx.override {
+            stdenv = overrideCC self.stdenv self.ccNoLibcxx;
+          };
+          libcxxabi = libSuper.libcxxabi.override {
+            stdenv = overrideCC self.stdenv self.ccNoLibcxx;
+            standalone = true;
+          };
+        });
+      in { inherit tools libraries; } // tools // libraries);
 
       darwin = super.darwin // {
         inherit (darwin)
-          dyld Libsystem xnu configd ICU libdispatch libclosure launchd CF;
+          binutils dyld Libsystem xnu configd ICU libdispatch libclosure launchd CF;
       };
     };
   in with prevStage; stageFun 2 prevStage {
@@ -270,8 +316,9 @@ in rec {
     allowedRequisites =
       [ bootstrapTools ] ++
       (with pkgs; [
-        xz.bin xz.out libcxx libcxxabi llvmPackages_7.compiler-rt zlib
-        libxml2.out curl.out openssl.out libssh2.out nghttp2.lib libkrb5
+        xz.bin xz.out libcxx libcxxabi llvmPackages_7.compiler-rt
+        zlib libxml2.out curl.out openssl.out libssh2.out
+        nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv
       ]) ++
       (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
 
@@ -320,8 +367,9 @@ in rec {
     allowedRequisites =
       [ bootstrapTools ] ++
       (with pkgs; [
-        xz.bin xz.out bash libcxx libcxxabi llvmPackages_7.compiler-rt zlib
-        libxml2.out curl.out openssl.out libssh2.out nghttp2.lib libkrb5
+        xz.bin xz.out bash libcxx libcxxabi llvmPackages_7.compiler-rt
+        zlib libxml2.out curl.out openssl.out libssh2.out
+        nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv
       ]) ++
       (with pkgs.darwin; [ dyld ICU Libsystem locale ]);
 

From ddd17201abbec8bf04e55164b995eb148ae94b48 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Thu, 30 Jul 2020 00:32:34 +0900
Subject: [PATCH 1835/3942] compiler-rt: prevent platform sniffing on Darwin

Exposed by the tbd stubs which contains fat libraries. The previously
used proxy libraries were x86_64 only.
---
 pkgs/development/compilers/llvm/10/compiler-rt.nix | 5 +++++
 pkgs/development/compilers/llvm/5/compiler-rt.nix  | 5 +++++
 pkgs/development/compilers/llvm/6/compiler-rt.nix  | 5 +++++
 pkgs/development/compilers/llvm/7/compiler-rt.nix  | 5 +++++
 pkgs/development/compilers/llvm/8/compiler-rt.nix  | 5 +++++
 pkgs/development/compilers/llvm/9/compiler-rt.nix  | 5 +++++
 6 files changed, 30 insertions(+)

diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix
index 47bbe808ac20..e6882cbabb8b 100644
--- a/pkgs/development/compilers/llvm/10/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
   ] ++ stdenv.lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # The compiler-rt build infrastructure sniffs supported platforms on Darwin
+    # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
+    # when it tries to use libc++ and libc++api for i386.
+    "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
   ];
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix
index 32d6dd3d4795..41f2b24b057e 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation {
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
   ] ++ stdenv.lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # The compiler-rt build infrastructure sniffs supported platforms on Darwin
+    # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
+    # when it tries to use libc++ and libc++api for i386.
+    "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
   ];
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix
index 89f25cad2c54..8bd61f5d7f70 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation {
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
   ] ++ stdenv.lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # The compiler-rt build infrastructure sniffs supported platforms on Darwin
+    # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
+    # when it tries to use libc++ and libc++api for i386.
+    "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
   ];
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index 97a5d73f3041..ec9b7e6e6ad4 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation {
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
   ] ++ stdenv.lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # The compiler-rt build infrastructure sniffs supported platforms on Darwin
+    # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
+    # when it tries to use libc++ and libc++api for i386.
+    "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
   ];
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index a907d4086550..3c6265c4fca0 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation {
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
   ] ++ stdenv.lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # The compiler-rt build infrastructure sniffs supported platforms on Darwin
+    # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
+    # when it tries to use libc++ and libc++api for i386.
+    "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
   ];
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix
index 394f66ff7f1a..13b0b522771f 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
     "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
   ] ++ stdenv.lib.optionals (bareMetal) [
     "-DCOMPILER_RT_OS_DIR=baremetal"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # The compiler-rt build infrastructure sniffs supported platforms on Darwin
+    # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
+    # when it tries to use libc++ and libc++api for i386.
+    "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
   ];
 
   outputs = [ "out" "dev" ];

From 523debafc4e8adf8d9d329f84a8fa2139e2f5e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 9 Nov 2020 12:36:03 +0100
Subject: [PATCH 1836/3942] asterisk: Bump all packages

---
 pkgs/servers/asterisk/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index c5c2f6d513d0..aa4b2a64150e 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -105,8 +105,8 @@ in rec {
   asterisk = asterisk_18;
 
   asterisk_13 = common {
-    version = "13.37.0";
-    sha256 = "09wc6cqh4f15wm62drzdppwvh7nwgnbwapvz1kgb0qdgixsshn3v";
+    version = "13.37.1";
+    sha256 = "1zc3104zw4y7i8bhhgrgy3snq0zr1904p64ykfc3ldh4xyfy3ld6";
     externals = {
       "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
       "addons/mp3" = mp3-202;
@@ -114,8 +114,8 @@ in rec {
   };
 
   asterisk_16 = common {
-    version = "16.14.0";
-    sha256 = "1y120p4jlhg4iwihdxlk64y3y3n8w7y785lwqxsyqg6zviz0ghx6";
+    version = "16.14.1";
+    sha256 = "1lhh3npyy8hvy29jwjgapnxfjv1ahp2qdi4iq1d6a61ffhd20vfs";
     externals = {
       "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
       "addons/mp3" = mp3-202;
@@ -123,8 +123,8 @@ in rec {
   };
 
   asterisk_17 = common {
-    version = "17.8.0";
-    sha256 = "0xhwh8s8n8xg43gcdkqjj484assva7lm5ah1b306a5nf6j8p9bjy";
+    version = "17.8.1";
+    sha256 = "0m7gw01kpvsc0f9lb1hiq5b4g1fdh4gdfyxlqxp6m37vgxh2a48p";
     externals = {
       "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
       "addons/mp3" = mp3-202;
@@ -132,8 +132,8 @@ in rec {
   };
 
   asterisk_18 = common {
-    version = "18.0.0";
-    sha256 = "174zasx8d7ragy2fz4vwc4pbra9wl471mnisz1z0a3b2qsbh4y4v";
+    version = "18.0.1";
+    sha256 = "1kyly10pk7bpfqg3mjbvb8p795fnj9lvd29yp2xsxwgsqi1dn9p8";
     externals = {
       "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
       "addons/mp3" = mp3-202;

From 22b73d1282c2f5e39d9cd009531c17a931a97965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= <git@samuelgrf.com>
Date: Fri, 6 Nov 2020 00:28:15 +0100
Subject: [PATCH 1837/3942] pkgs/*: add final newline to .nix files

---
 pkgs/applications/science/physics/xflr5/default.nix             | 2 +-
 pkgs/applications/window-managers/windowlab/default.nix         | 2 +-
 pkgs/build-support/fetchsvnrevision/default.nix                 | 2 +-
 .../interpreters/python/update-python-libraries/default.nix     | 2 +-
 pkgs/development/libraries/aspell/aspell-with-dicts.nix         | 2 +-
 pkgs/development/libraries/protobuf/2.5.nix                     | 2 +-
 pkgs/development/tools/misc/itm-tools/default.nix               | 2 +-
 pkgs/servers/mlflow-server/default.nix                          | 2 +-
 pkgs/tools/graphics/diagrams-builder/default.nix                | 2 +-
 pkgs/tools/misc/jugglinglab/default.nix                         | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix
index 85838b04cbf1..b2e5284796f8 100644
--- a/pkgs/applications/science/physics/xflr5/default.nix
+++ b/pkgs/applications/science/physics/xflr5/default.nix
@@ -20,4 +20,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.esclear ];
     platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix
index d0a1de7f6006..1bbdb7a460fd 100644
--- a/pkgs/applications/window-managers/windowlab/default.nix
+++ b/pkgs/applications/window-managers/windowlab/default.nix
@@ -33,4 +33,4 @@ stdenv.mkDerivation {
       maintainers = with maintainers; [ ehmry ];
       platforms   = platforms.linux;
     };
-}
\ No newline at end of file
+}
diff --git a/pkgs/build-support/fetchsvnrevision/default.nix b/pkgs/build-support/fetchsvnrevision/default.nix
index 288451a225c7..f2e2a11da8d5 100644
--- a/pkgs/build-support/fetchsvnrevision/default.nix
+++ b/pkgs/build-support/fetchsvnrevision/default.nix
@@ -7,4 +7,4 @@ runCommand: subversion: repository:
       rev=$(echo p | svn ls -v --depth empty  ${repository} |awk '{ print $1 }')
       echo "[ \"$rev\" ]" > $out
       echo Latest revision is $rev
-    '')
\ No newline at end of file
+    '')
diff --git a/pkgs/development/interpreters/python/update-python-libraries/default.nix b/pkgs/development/interpreters/python/update-python-libraries/default.nix
index 762ca2bdd34b..81975bc5250e 100644
--- a/pkgs/development/interpreters/python/update-python-libraries/default.nix
+++ b/pkgs/development/interpreters/python/update-python-libraries/default.nix
@@ -9,4 +9,4 @@ runCommand "update-python-libraries" {
   cp ${./update-python-libraries.py} $out
   patchShebangs $out
   substituteInPlace $out --replace 'GIT = "git"' 'GIT = "${git}/bin/git"'
-''
\ No newline at end of file
+''
diff --git a/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/pkgs/development/libraries/aspell/aspell-with-dicts.nix
index fd5ccf9696cc..88b1302271fb 100644
--- a/pkgs/development/libraries/aspell/aspell-with-dicts.nix
+++ b/pkgs/development/libraries/aspell/aspell-with-dicts.nix
@@ -33,4 +33,4 @@ in buildEnv {
     done
     popd
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/protobuf/2.5.nix b/pkgs/development/libraries/protobuf/2.5.nix
index 550d0b1bace2..9d7bb38cf3c9 100644
--- a/pkgs/development/libraries/protobuf/2.5.nix
+++ b/pkgs/development/libraries/protobuf/2.5.nix
@@ -7,4 +7,4 @@ callPackage ./generic.nix (args // rec {
     url = "http://protobuf.googlecode.com/files/${version}.tar.bz2";
     sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";
   };
-})
\ No newline at end of file
+})
diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/development/tools/misc/itm-tools/default.nix
index 6fb256951115..a121cc670993 100644
--- a/pkgs/development/tools/misc/itm-tools/default.nix
+++ b/pkgs/development/tools/misc/itm-tools/default.nix
@@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec {
     license = with licenses; [ asl20 mit ];
     maintainers = with maintainers; [ hh sb0 ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/servers/mlflow-server/default.nix
index eb99fffeb169..12f1427555bf 100644
--- a/pkgs/servers/mlflow-server/default.nix
+++ b/pkgs/servers/mlflow-server/default.nix
@@ -34,4 +34,4 @@ py.toPythonApplication
       cp ${gunicornScript} $gpath
       chmod 555 $gpath
     '';
-}))
\ No newline at end of file
+}))
diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix
index a12e5dbb8bb3..8a23375d945f 100644
--- a/pkgs/tools/graphics/diagrams-builder/default.nix
+++ b/pkgs/tools/graphics/diagrams-builder/default.nix
@@ -41,4 +41,4 @@ stdenv.mkDerivation {
   # Will be faster to build the wrapper locally then to fetch it from a binary cache.
   preferLocalBuild = true;
   meta = diagrams-builder.meta;
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix
index 32c45b31a17d..1b5f11440fa0 100644
--- a/pkgs/tools/misc/jugglinglab/default.nix
+++ b/pkgs/tools/misc/jugglinglab/default.nix
@@ -27,4 +27,4 @@ stdenv.mkDerivation rec {
       maintainers = with maintainers; [ wnklmnn ];
       platforms = platforms.all;
   };
-}
\ No newline at end of file
+}

From 0950c98059a8e393b37ae1fbd4fa15901740522c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= <git@samuelgrf.com>
Date: Thu, 5 Nov 2020 12:26:15 +0100
Subject: [PATCH 1838/3942] docker: add final newline to detjson.py

---
 pkgs/build-support/docker/detjson.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/docker/detjson.py b/pkgs/build-support/docker/detjson.py
index 439c21313878..fe82cbea11bb 100644
--- a/pkgs/build-support/docker/detjson.py
+++ b/pkgs/build-support/docker/detjson.py
@@ -37,4 +37,4 @@ def main():
     json.dump(j, sys.stdout, sort_keys=True)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

From 3ca5220350202fb084de03bbf8acdbc91485a536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= <git@samuelgrf.com>
Date: Thu, 5 Nov 2020 12:27:23 +0100
Subject: [PATCH 1839/3942] keen4: add final newline to builder.sh

---
 pkgs/games/keen4/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/keen4/builder.sh b/pkgs/games/keen4/builder.sh
index 50d261db8651..b5864b8392f5 100644
--- a/pkgs/games/keen4/builder.sh
+++ b/pkgs/games/keen4/builder.sh
@@ -28,4 +28,4 @@ for i in *; do
     fi
 done
 EOF
-chmod +x $out/bin/keen4
\ No newline at end of file
+chmod +x $out/bin/keen4

From 0e19ef393acc86efca69e5b10bd9d3ee8ec81164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= <git@samuelgrf.com>
Date: Thu, 5 Nov 2020 12:32:21 +0100
Subject: [PATCH 1840/3942] idris-modules: add final newline to TODO.md

---
 pkgs/development/idris-modules/TODO.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/idris-modules/TODO.md b/pkgs/development/idris-modules/TODO.md
index 4dcaa61829a8..41b0be2b2efa 100644
--- a/pkgs/development/idris-modules/TODO.md
+++ b/pkgs/development/idris-modules/TODO.md
@@ -1,3 +1,3 @@
 * Build the RTS separately from Idris
 * idris2nix
-* Only require gmp, rts when compiling executables
\ No newline at end of file
+* Only require gmp, rts when compiling executables

From 2c9497b430fc3d1b8b7c95648e6e87c8e0f50a01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= <git@samuelgrf.com>
Date: Thu, 5 Nov 2020 12:44:07 +0100
Subject: [PATCH 1841/3942] qxmledit: add final newline to qxmledit.json

---
 pkgs/applications/editors/qxmledit/qxmledit.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/qxmledit/qxmledit.json b/pkgs/applications/editors/qxmledit/qxmledit.json
index 3b50532d6a0d..88d2e3c4c2b9 100644
--- a/pkgs/applications/editors/qxmledit/qxmledit.json
+++ b/pkgs/applications/editors/qxmledit/qxmledit.json
@@ -3,4 +3,4 @@
     "repo": "qxmledit",
     "rev": "6136dca50ceb3b4447c91a7a18dcf84785ea11d1",
     "sha256": "1wcnphalwf0a5gz9r44jgk8wcv1w2qipbwjkbzkra2kxanxns834"
-}
\ No newline at end of file
+}

From 88bf1b3e92d96cb64c862db09b7e90263d89664e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= <git@samuelgrf.com>
Date: Thu, 5 Nov 2020 16:24:19 +0100
Subject: [PATCH 1842/3942] nixos/boot: add final newline to pbkdf2-sha512.c

---
 nixos/modules/system/boot/pbkdf2-sha512.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/pbkdf2-sha512.c b/nixos/modules/system/boot/pbkdf2-sha512.c
index b40c383ac023..67e989957ba6 100644
--- a/nixos/modules/system/boot/pbkdf2-sha512.c
+++ b/nixos/modules/system/boot/pbkdf2-sha512.c
@@ -35,4 +35,4 @@ int main(int argc, char** argv)
 	fwrite(key, 1, key_length, stdout);
 
 	return 0;
-}
\ No newline at end of file
+}

From 433c1a77260ed5bc8ed5da226ab54c9a204a5605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= <git@samuelgrf.com>
Date: Thu, 5 Nov 2020 22:06:46 +0100
Subject: [PATCH 1843/3942] diagrams-builder,mlflow-server: remove trailing
 whitespace

---
 pkgs/servers/mlflow-server/default.nix           | 2 +-
 pkgs/tools/graphics/diagrams-builder/default.nix | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/servers/mlflow-server/default.nix
index 12f1427555bf..45dd6dd43ae3 100644
--- a/pkgs/servers/mlflow-server/default.nix
+++ b/pkgs/servers/mlflow-server/default.nix
@@ -3,7 +3,7 @@
 let
   py = python3.pkgs;
 in
-py.toPythonApplication 
+py.toPythonApplication
   (py.mlflow.overridePythonAttrs(old: rec {
     pname = "mlflow-server";
 
diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix
index 8a23375d945f..24e43044697d 100644
--- a/pkgs/tools/graphics/diagrams-builder/default.nix
+++ b/pkgs/tools/graphics/diagrams-builder/default.nix
@@ -2,7 +2,7 @@
   If user need access to more haskell package for building his
   diagrams, he simply has to pass these package through the
   extra packages function as follow in `config.nix`:
-  
+
   ~~~
   diagrams-builder.override {
     extraPackages = self : [myHaskellPackage];
@@ -15,7 +15,7 @@
 let
 
   # Used same technique as for the yiCustom package.
-  wrappedGhc = ghcWithPackages 
+  wrappedGhc = ghcWithPackages
     (self: [ diagrams-builder ] ++ extraPackages self);
   ghcVersion = wrappedGhc.version;
 
@@ -25,7 +25,7 @@ let
       --set NIX_GHC ${wrappedGhc}/bin/ghc \
       --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion}
   '';
-  
+
   backends = ["svg" "cairo" "ps"];
 
 in
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ makeWrapper ];
 
-  buildCommand = with stdenv.lib; 
+  buildCommand = with stdenv.lib;
     concatStrings (intersperse "\n" (map exeWrapper backends));
 
   # Will be faster to build the wrapper locally then to fetch it from a binary cache.

From a62b87270e9e1ddbb8d160ea262ba6cd78eda141 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Mon, 9 Nov 2020 21:41:49 +1300
Subject: [PATCH 1844/3942] namecoin: remove myself as maintainer

---
 pkgs/applications/blockchains/namecoin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix
index 936eaa2505e1..cbce17731043 100644
--- a/pkgs/applications/blockchains/namecoin.nix
+++ b/pkgs/applications/blockchains/namecoin.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
     homepage = "https://namecoin.org";
     license = licenses.mit;
-    maintainers = with maintainers; [ doublec infinisil ];
+    maintainers = with maintainers; [ infinisil ];
     platforms = platforms.linux;
   };
 }

From f4a3f2e6ce1e8a8c443ce9b2195d7e9b29e014d2 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Mon, 9 Nov 2020 21:41:59 +1300
Subject: [PATCH 1845/3942] tor-browser-bundle-bin: remove myself as maintainer

---
 .../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 842ce9ba9a3b..f6f6deb7380e 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -403,7 +403,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.torproject.org/";
     changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
     platforms = attrNames srcs;
-    maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 cap KarlJoad ];
+    maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 cap KarlJoad ];
     hydraPlatforms = [];
     # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
     # the compound is "libre" in a strict sense (some components place certain

From 743169a07b8f795958a2e56a8ecc0dbf3da29a1a Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Mon, 9 Nov 2020 21:42:14 +1300
Subject: [PATCH 1846/3942] freenet: remove myself as maintainer

---
 pkgs/applications/networking/p2p/freenet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index 017f059ff6c3..d50f5a679316 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -74,7 +74,7 @@ in stdenv.mkDerivation {
     description = "Decentralised and censorship-resistant network";
     homepage = "https://freenetproject.org/";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.doublec ];
+    maintainers = [ ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

From 02004e4a1f673546fab2be9fa9491a388dbced8f Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Mon, 9 Nov 2020 21:42:27 +1300
Subject: [PATCH 1847/3942] ponyc: remove myself as maintainer

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

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 566fd7be311c..0bfaba914a7b 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation (rec {
     description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
     homepage = "https://www.ponylang.org";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ doublec kamilchm patternspandemic redvers ];
+    maintainers = with maintainers; [ kamilchm patternspandemic redvers ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 })

From b1c43525d0da90263ab564932d6ec4b4ed3f8ac2 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Mon, 9 Nov 2020 21:42:40 +1300
Subject: [PATCH 1848/3942] tor: remove myself as maintainer

---
 pkgs/tools/security/tor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index a3a76dd7b836..791ba8028866 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
 
     maintainers = with maintainers;
-      [ phreedom doublec thoughtpolice joachifm ];
+      [ phreedom thoughtpolice joachifm ];
     platforms = platforms.unix;
   };
 }

From 327e84900f24225f37bff309083d334f202f4ce3 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sun, 8 Nov 2020 00:21:09 -0500
Subject: [PATCH 1849/3942] swaylock-effects: v1.6-1 -> v1.6-2

---
 pkgs/applications/window-managers/sway/lock-effects.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix
index a6c8d5cd1c32..4bb4225d394d 100644
--- a/pkgs/applications/window-managers/sway/lock-effects.nix
+++ b/pkgs/applications/window-managers/sway/lock-effects.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "swaylock-effects";
-  version = "v1.6-1";
+  version = "v1.6-2";
 
   src = fetchFromGitHub {
     owner = "mortie";
     repo = "swaylock-effects";
     rev = version;
-    sha256 = "044fc4makjx8v29fkx5xlil6vr1v4r0k6c8741pl67gzvlm4cx3i";
+    sha256 = "0fs3c4liajgkax0a2pdc7117v1g9k73nv87g3kyv9wsnkfbbz534";
   };
 
   postPatch = ''

From c8e9728927e8d0f42345ba84a7ab0a0d160ae76f Mon Sep 17 00:00:00 2001
From: Sebastien Braun <sebastien@sebbraun.de>
Date: Sun, 8 Nov 2020 06:18:50 +0100
Subject: [PATCH 1850/3942] erlangR23: 23.1 -> 23.1.2

---
 pkgs/development/interpreters/erlang/R23.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix
index e0e2357cc24e..3ad55d806a57 100644
--- a/pkgs/development/interpreters/erlang/R23.nix
+++ b/pkgs/development/interpreters/erlang/R23.nix
@@ -3,8 +3,8 @@
 # How to obtain `sha256`:
 # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
 mkDerivation {
-  version = "23.1";
-  sha256 = "1k74g6m2lidhp04vrcwrg0jszj3zwxyrm4fsma09sfn9rfsra36g";
+  version = "23.1.2";
+  sha256 = "06dp2sw486khy2lc34cw5dca58ii5jvi26dpchiqxnmyvd6995z0";
 
   prePatch = ''
     substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"

From 64c4adce545a30aab8c7c5591f935d2d7126dd0c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 9 Nov 2020 21:52:41 +1000
Subject: [PATCH 1851/3942] fzf: 0.24.2 -> 0.24.3

https://github.com/junegunn/fzf/releases/tag/0.24.3
---
 pkgs/tools/misc/fzf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index fd9cea21a919..de9e58251144 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.24.2";
+  version = "0.24.3";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = pname;
     rev = version;
-    sha256 = "1s9ynpd158cddzppphqksml5v1csyi55ji0az8kz2p10iz89v1ry";
+    sha256 = "04ycjgy40if0licc883lp7i6jpndvcndw24xp7lilskmaacpm5if";
   };
 
   vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";

From 8691178e7adc6039a9a4dd3487fc24ecae64a346 Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Sat, 7 Nov 2020 20:13:30 +0100
Subject: [PATCH 1852/3942] nix-prefetch-github: 4.0 -> 4.0.1

---
 .../python-modules/nix-prefetch-github/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix
index d4307c659804..152ceddb91fd 100644
--- a/pkgs/development/python-modules/nix-prefetch-github/default.nix
+++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "nix-prefetch-github";
-  version = "4.0";
+  version = "4.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-STUyMUCWAHfDA6dkpiOqSRBL3/tubedUbWa94Kp/764=";
+    sha256 = "asfRohjOgYxMV/wprKvxUD328GVJQkAYnuAkE09kKgs=";
   };
 
   propagatedBuildInputs = [

From aaae3637a64ee5fa5ccc8974ed78ddab6f5757b0 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Fri, 6 Nov 2020 23:17:42 +0200
Subject: [PATCH 1853/3942] qbittorrent: 4.2.5 -> 4.3.0.1

---
 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 964752f3b85d..9b6a8bd707d5 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,13 +10,13 @@ with lib;
 
 mkDerivation rec {
   pname = "qbittorrent";
-  version = "4.2.5";
+  version = "4.3.0.1";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
     repo = "qbittorrent";
     rev = "release-${version}";
-    sha256 = "1n613ylg6i9gisgk0dbr2kpfasyizrkdjff1r8smd4vri2qrdksn";
+    sha256 = "068sf24mjvc2idimgpzvf7gjk8n9xrr3qqlqfx5j3j598ckm3yfp";
   };
 
   # NOTE: 2018-05-31: CMake is working but it is not officially supported

From c54bb4e98ed1d1e2b1c3e437777652d7c4cefb66 Mon Sep 17 00:00:00 2001
From: Griffin Smith <root@gws.fyi>
Date: Thu, 5 Nov 2020 16:38:06 -0500
Subject: [PATCH 1854/3942] argocd: 1.4.2 -> 1.7.8

---
 .../networking/cluster/argocd/default.nix     |   10 +-
 .../cluster/argocd/use-go-module.patch        | 3058 -----------------
 2 files changed, 4 insertions(+), 3064 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/argocd/use-go-module.patch

diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index 505de3c08021..2f884970fc1a 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,24 +2,22 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "1.4.2";
-  commit = "48cced9d925b5bc94f6aa9fa4a8a19b2a59e128a";
+  version = "1.7.8";
+  commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    sha256 = "01vsyrks1k5yfvrarv8ia0isr7snilr21b7lfiy860si82r2r8hj";
+    sha256 = "1pwk6mzmlsx43c75wl5lglpxgc2jkgzra4443hwp6n0wfgzajfp4";
   };
 
-  vendorSha256 = "0r2nh7v00m6zbdnhsgjn01q9pkiz41ckkqgfnpqmkxaqmjz31iyj";
+  vendorSha256 = "0c5gykijwjrq3cx9qg9hm5j7axccngc1kp5qj3429a2ilw80l8pl";
 
   doCheck = false;
 
   nativeBuildInputs = [ packr ];
 
-  patches = [ ./use-go-module.patch ];
-
   buildFlagsArray = ''
      -ldflags=
       -X github.com/argoproj/argo-cd/common.version=${version}
diff --git a/pkgs/applications/networking/cluster/argocd/use-go-module.patch b/pkgs/applications/networking/cluster/argocd/use-go-module.patch
deleted file mode 100644
index ac597f4187e9..000000000000
--- a/pkgs/applications/networking/cluster/argocd/use-go-module.patch
+++ /dev/null
@@ -1,3058 +0,0 @@
-diff --git a/Gopkg.lock b/Gopkg.lock
-deleted file mode 100644
-index 03737a95..00000000
---- a/Gopkg.lock
-+++ /dev/null
-@@ -1,2103 +0,0 @@
--# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
--
--
--[[projects]]
--  digest = "1:6d5a057da97a9dbdb10e7beedd2f43452b6bf7691001c0c8886e8dacf5610349"
--  name = "bou.ke/monkey"
--  packages = ["."]
--  pruneopts = ""
--  revision = "bdf6dea004c6fd1cdf4b25da8ad45a606c09409a"
--  version = "v1.0.1"
--
--[[projects]]
--  digest = "1:9702dc153c9bb6ee7ee0587c248b7024700e89e4a7be284faaeeab9da32e1c6b"
--  name = "cloud.google.com/go"
--  packages = ["compute/metadata"]
--  pruneopts = ""
--  revision = "767c40d6a2e058483c25fa193e963a22da17236d"
--  version = "v0.18.0"
--
--[[projects]]
--  digest = "1:8ec1618fc3ee146af104d6c13be250f25e5976e34557d4afbfe4b28035ce6c05"
--  name = "github.com/Knetic/govaluate"
--  packages = ["."]
--  pruneopts = ""
--  revision = "d216395917cc49052c7c7094cf57f09657ca08a8"
--  version = "v3.0.0"
--
--[[projects]]
--  digest = "1:63e57618d792cccb87ad7cb8a0602e6205732beb3b01b0ea858fc4a5fd3ce8f1"
--  name = "github.com/MakeNowJust/heredoc"
--  packages = ["."]
--  pruneopts = ""
--  revision = "efb6ca8de9d5385c3963279701760e37637cf238"
--  version = "v2.0.1"
--
--[[projects]]
--  digest = "1:b856d8248663c39265a764561c1a1a149783f6cc815feb54a1f3a591b91f6eca"
--  name = "github.com/Masterminds/semver"
--  packages = ["."]
--  pruneopts = ""
--  revision = "c7af12943936e8c39859482e61f0574c2fd7fc75"
--  version = "v1.4.2"
--
--[[projects]]
--  digest = "1:71c0dfb843260bfb9b03357cae8eac261b8d82e149ad8f76938b87a23aa47c43"
--  name = "github.com/PuerkitoBio/purell"
--  packages = ["."]
--  pruneopts = ""
--  revision = "b938d81255b5473c57635324295cb0fe398c7a58"
--
--[[projects]]
--  branch = "master"
--  digest = "1:331a419049c2be691e5ba1d24342fc77c7e767a80c666a18fd8a9f7b82419c1c"
--  name = "github.com/PuerkitoBio/urlesc"
--  packages = ["."]
--  pruneopts = ""
--  revision = "de5bf2ad457846296e2031421a34e2568e304e35"
--
--[[projects]]
--  branch = "master"
--  digest = "1:a1b56af5e69569454f55ef4842485a0da5616e240a610d77c987e17a73b0e265"
--  name = "github.com/TomOnTime/utfutil"
--  packages = ["."]
--  pruneopts = ""
--  revision = "09c41003ee1d5015b75f331e52215512e7145b8d"
--
--[[projects]]
--  branch = "master"
--  digest = "1:52905b00a73cda93a2ce8c5fa35185daed673d59e39576e81ad6ab6fb7076b3c"
--  name = "github.com/argoproj/pkg"
--  packages = [
--    "errors",
--    "exec",
--    "rand",
--    "time",
--  ]
--  pruneopts = ""
--  revision = "02a6aac40ac4cd23de448afe7a1ec0ba4b6d2b96"
--
--[[projects]]
--  digest = "1:d8a2bb36a048d1571bcc1aee208b61f39dc16c6c53823feffd37449dde162507"
--  name = "github.com/asaskevich/govalidator"
--  packages = ["."]
--  pruneopts = ""
--  revision = "ccb8e960c48f04d6935e72476ae4a51028f9e22f"
--  version = "v9"
--
--[[projects]]
--  branch = "master"
--  digest = "1:c0bec5f9b98d0bc872ff5e834fac186b807b656683bd29cb82fb207a1513fabb"
--  name = "github.com/beorn7/perks"
--  packages = ["quantile"]
--  pruneopts = ""
--  revision = "3a771d992973f24aa725d07868b467d1ddfceafb"
--
--[[projects]]
--  digest = "1:6e2b0748ea11cffebe87b4a671a44ecfb243141cdd5df54cb44b7e8e93cb7ea3"
--  name = "github.com/casbin/casbin"
--  packages = [
--    ".",
--    "config",
--    "effect",
--    "errors",
--    "log",
--    "model",
--    "persist",
--    "persist/file-adapter",
--    "rbac",
--    "rbac/default-role-manager",
--    "util",
--  ]
--  pruneopts = ""
--  revision = "aaed1b7a7eac65d37ec4e15e308429fdf0bd6a9e"
--  version = "v1.9.1"
--
--[[projects]]
--  branch = "master"
--  digest = "1:9c19f8c33e635e0439c8afc167d6d02e3aa6eea5b69d64880244fd354a99edc4"
--  name = "github.com/chai2010/gettext-go"
--  packages = [
--    "gettext",
--    "gettext/mo",
--    "gettext/plural",
--    "gettext/po",
--  ]
--  pruneopts = ""
--  revision = "bf70f2a70fb1b1f36d90d671a72795984eab0fcb"
--
--[[projects]]
--  branch = "v2"
--  digest = "1:d8ee1b165eb7f4fd9ada718e1e7eeb0bc1fd462592d0bd823df694443f448681"
--  name = "github.com/coreos/go-oidc"
--  packages = ["."]
--  pruneopts = ""
--  revision = "1180514eaf4d9f38d0d19eef639a1d695e066e72"
--
--[[projects]]
--  digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b"
--  name = "github.com/davecgh/go-spew"
--  packages = ["spew"]
--  pruneopts = ""
--  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
--  version = "v1.1.0"
--
--[[projects]]
--  digest = "1:6098222470fe0172157ce9bbef5d2200df4edde17ee649c5d6e48330e4afa4c6"
--  name = "github.com/dgrijalva/jwt-go"
--  packages = ["."]
--  pruneopts = ""
--  revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
--  version = "v3.2.0"
--
--[[projects]]
--  digest = "1:c05f1899f086e3b4613d94d9e6f7ba6f4b6587498a1aa6037c5c294b22f5a743"
--  name = "github.com/docker/distribution"
--  packages = [
--    "digestset",
--    "reference",
--  ]
--  pruneopts = ""
--  revision = "2461543d988979529609e8cb6fca9ca190dc48da"
--  version = "v2.7.1"
--
--[[projects]]
--  digest = "1:b021ef379356343bdc13ec101e546b756fcef4b1186d08163bef7d3bc8c1e07f"
--  name = "github.com/docker/docker"
--  packages = [
--    "pkg/term",
--    "pkg/term/winconsole",
--  ]
--  pruneopts = ""
--  revision = "fc4825d5ef5e0e1af74904208f9b925c22f0b6f8"
--  version = "v1.6.0-rc5"
--
--[[projects]]
--  branch = "master"
--  digest = "1:d6c13a378213e3de60445e49084b8a0a9ce582776dfc77927775dbeb3ff72a35"
--  name = "github.com/docker/spdystream"
--  packages = [
--    ".",
--    "spdy",
--  ]
--  pruneopts = ""
--  revision = "6480d4af844c189cf5dd913db24ddd339d3a4f85"
--
--[[projects]]
--  branch = "master"
--  digest = "1:f1a75a8e00244e5ea77ff274baa9559eb877437b240ee7b278f3fc560d9f08bf"
--  name = "github.com/dustin/go-humanize"
--  packages = ["."]
--  pruneopts = ""
--  revision = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"
--
--[[projects]]
--  digest = "1:971e9ba63a417c5f1f83ab358677bc59e96ff04285f26c6646ff089fb60b15e8"
--  name = "github.com/emicklei/go-restful"
--  packages = [
--    ".",
--    "log",
--  ]
--  pruneopts = ""
--  revision = "3658237ded108b4134956c1b3050349d93e7b895"
--  version = "v2.7.1"
--
--[[projects]]
--  digest = "1:ba7c75e38d81b9cf3e8601c081567be3b71bccca8c11aee5de98871360aa4d7b"
--  name = "github.com/emirpasic/gods"
--  packages = [
--    "containers",
--    "lists",
--    "lists/arraylist",
--    "trees",
--    "trees/binaryheap",
--    "utils",
--  ]
--  pruneopts = ""
--  revision = "f6c17b524822278a87e3b3bd809fec33b51f5b46"
--  version = "v1.9.0"
--
--[[projects]]
--  digest = "1:46ddeb9dd35d875ac7568c4dc1fc96ce424e034bdbb984239d8ffc151398ec01"
--  name = "github.com/evanphx/json-patch"
--  packages = ["."]
--  pruneopts = ""
--  revision = "026c730a0dcc5d11f93f1cf1cc65b01247ea7b6f"
--  version = "v4.5.0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:549f95037fea25e00a5341ac6a169a5b3e5306be107f45260440107b779b74f9"
--  name = "github.com/exponent-io/jsonpath"
--  packages = ["."]
--  pruneopts = ""
--  revision = "d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
--
--[[projects]]
--  digest = "1:23a5efa4b272df86a8ebffc942f5e0c1aac4b750836037394cc450b6d91e241a"
--  name = "github.com/fatih/camelcase"
--  packages = ["."]
--  pruneopts = ""
--  revision = "44e46d280b43ec1531bb25252440e34f1b800b65"
--  version = "v1.0.0"
--
--[[projects]]
--  digest = "1:b13707423743d41665fd23f0c36b2f37bb49c30e94adb813319c44188a51ba22"
--  name = "github.com/ghodss/yaml"
--  packages = ["."]
--  pruneopts = ""
--  revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
--  version = "v1.0.0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:eb77b66abaf9649747230eb973350bd1c311a0d0362213192efbdd222082b072"
--  name = "github.com/go-openapi/analysis"
--  packages = ["."]
--  pruneopts = ""
--  revision = "5957818e100395077187fb7ef3b8a28227af06c6"
--
--[[projects]]
--  branch = "master"
--  digest = "1:ee273c95c1414ef11bd4da259b40e83f41c1d5a6bee7d1b54a05ef5f3565fd92"
--  name = "github.com/go-openapi/errors"
--  packages = ["."]
--  pruneopts = ""
--  revision = "b2b2befaf267d082d779bcef52d682a47c779517"
--
--[[projects]]
--  branch = "master"
--  digest = "1:1287439f7765209116509fffff2b8f853845e4b35572b41a1aadda42cbcffcc2"
--  name = "github.com/go-openapi/jsonpointer"
--  packages = ["."]
--  pruneopts = ""
--  revision = "779f45308c19820f1a69e9a4cd965f496e0da10f"
--
--[[projects]]
--  branch = "master"
--  digest = "1:07ac8ac445f68b0bc063d11845d479fb7e09c906ead7a8c4165b59777df09d74"
--  name = "github.com/go-openapi/jsonreference"
--  packages = ["."]
--  pruneopts = ""
--  revision = "36d33bfe519efae5632669801b180bf1a245da3b"
--
--[[projects]]
--  branch = "master"
--  digest = "1:c4a8c916364abeda1c5cf36684320298bbf4d87718b0b2bd9c4ca663157fdc75"
--  name = "github.com/go-openapi/loads"
--  packages = ["."]
--  pruneopts = ""
--  revision = "2a2b323bab96e6b1fdee110e57d959322446e9c9"
--
--[[projects]]
--  branch = "master"
--  digest = "1:1d9c762f6695e6e7ed0b4c055fa0eab7d20c2b36c935943282273d37f114e302"
--  name = "github.com/go-openapi/runtime"
--  packages = [
--    ".",
--    "logger",
--    "middleware",
--    "middleware/denco",
--    "middleware/header",
--    "middleware/untyped",
--    "security",
--  ]
--  pruneopts = ""
--  revision = "cd9d8ed52e4b4665463cbc655500e4faa09c3c16"
--
--[[projects]]
--  branch = "master"
--  digest = "1:fd4008f8283b993180f0626d0c7b2f48880e9dbb6bd92a91cac7ded30dc66777"
--  name = "github.com/go-openapi/spec"
--  packages = ["."]
--  pruneopts = ""
--  revision = "1de3e0542de65ad8d75452a595886fdd0befb363"
--
--[[projects]]
--  branch = "master"
--  digest = "1:4ddc424130bcfbf6f782f433192ca2502a02a09e4ac55dcbecf91f22ed4e3138"
--  name = "github.com/go-openapi/strfmt"
--  packages = ["."]
--  pruneopts = ""
--  revision = "481808443b00a14745fada967cb5eeff0f9b1df2"
--
--[[projects]]
--  branch = "master"
--  digest = "1:366052ef634d344217d6720719c9f8e95de13a94d211f09785b0ba3c4c181b06"
--  name = "github.com/go-openapi/swag"
--  packages = ["."]
--  pruneopts = ""
--  revision = "84f4bee7c0a6db40e3166044c7983c1c32125429"
--
--[[projects]]
--  branch = "master"
--  digest = "1:671e25496d550c80a9d6e7e588d32b380c6b4877f113750724f69acc6ce6790f"
--  name = "github.com/go-openapi/validate"
--  packages = ["."]
--  pruneopts = ""
--  revision = "b0a3ed684d0fdd3e1eda00433382188ce8aa7169"
--
--[[projects]]
--  digest = "1:024c9473f363a12918e87e7efc778091839beab514b01309a6ecd8aa336c8065"
--  name = "github.com/go-redis/cache"
--  packages = [
--    ".",
--    "internal/lrucache",
--    "internal/singleflight",
--  ]
--  pruneopts = ""
--  revision = "c58ada1e23a3b66593f81c70572c20a0bb805a90"
--  version = "v6.3.5"
--
--[[projects]]
--  digest = "1:b73fabc1ff8f2417bc5cc51d3f7274d6af5300b5ad9b8606967213134c1700dc"
--  name = "github.com/go-redis/redis"
--  packages = [
--    ".",
--    "internal",
--    "internal/consistenthash",
--    "internal/hashtag",
--    "internal/pool",
--    "internal/proto",
--    "internal/util",
--  ]
--  pruneopts = ""
--  revision = "22be8a3eaf992c828cecb69dc07348313bf08d2e"
--  version = "v6.15.1"
--
--[[projects]]
--  digest = "1:842c1acbacc80da775cfc0c412c4fe322c2d1b86c260db632987730d0d67a6bd"
--  name = "github.com/gobuffalo/packr"
--  packages = ["."]
--  pruneopts = ""
--  revision = "7f4074995d431987caaa35088199f13c44b24440"
--  version = "v1.11.0"
--
--[[projects]]
--  digest = "1:9ab1b1c637d7c8f49e39d8538a650d7eb2137b076790cff69d160823b505964c"
--  name = "github.com/gobwas/glob"
--  packages = [
--    ".",
--    "compiler",
--    "match",
--    "syntax",
--    "syntax/ast",
--    "syntax/lexer",
--    "util/runes",
--    "util/strings",
--  ]
--  pruneopts = ""
--  revision = "5ccd90ef52e1e632236f7326478d4faa74f99438"
--  version = "v0.2.3"
--
--[[projects]]
--  branch = "master"
--  digest = "1:9a06e7365c6039daf4db9bbf79650e2933a2880982cbab8106cb74a36617f40d"
--  name = "github.com/gogits/go-gogs-client"
--  packages = ["."]
--  pruneopts = ""
--  revision = "5a05380e4bc2440e0ec12f54f6f45648dbdd5e55"
--
--[[projects]]
--  digest = "1:d69d2ba23955582a64e367ff2b0808cdbd048458c178cea48f11ab8c40bd7aea"
--  name = "github.com/gogo/protobuf"
--  packages = [
--    "gogoproto",
--    "plugin/compare",
--    "plugin/defaultcheck",
--    "plugin/description",
--    "plugin/embedcheck",
--    "plugin/enumstringer",
--    "plugin/equal",
--    "plugin/face",
--    "plugin/gostring",
--    "plugin/marshalto",
--    "plugin/oneofcheck",
--    "plugin/populate",
--    "plugin/size",
--    "plugin/stringer",
--    "plugin/testgen",
--    "plugin/union",
--    "plugin/unmarshal",
--    "proto",
--    "protoc-gen-gofast",
--    "protoc-gen-gogo/descriptor",
--    "protoc-gen-gogo/generator",
--    "protoc-gen-gogo/generator/internal/remap",
--    "protoc-gen-gogo/grpc",
--    "protoc-gen-gogo/plugin",
--    "protoc-gen-gogofast",
--    "sortkeys",
--    "vanity",
--    "vanity/command",
--  ]
--  pruneopts = ""
--  revision = "5628607bb4c51c3157aacc3a50f0ab707582b805"
--  version = "v1.3.1"
--
--[[projects]]
--  branch = "master"
--  digest = "1:107b233e45174dbab5b1324201d092ea9448e58243ab9f039e4c0f332e121e3a"
--  name = "github.com/golang/glog"
--  packages = ["."]
--  pruneopts = ""
--  revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"
--
--[[projects]]
--  digest = "1:3dd078fda7500c341bc26cfbc6c6a34614f295a2457149fc1045cab767cbcf18"
--  name = "github.com/golang/protobuf"
--  packages = [
--    "jsonpb",
--    "proto",
--    "protoc-gen-go",
--    "protoc-gen-go/descriptor",
--    "protoc-gen-go/generator",
--    "protoc-gen-go/generator/internal/remap",
--    "protoc-gen-go/grpc",
--    "protoc-gen-go/plugin",
--    "ptypes",
--    "ptypes/any",
--    "ptypes/duration",
--    "ptypes/empty",
--    "ptypes/struct",
--    "ptypes/timestamp",
--  ]
--  pruneopts = ""
--  revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5"
--  version = "v1.2.0"
--
--[[projects]]
--  digest = "1:1e5b1e14524ed08301977b7b8e10c719ed853cbf3f24ecb66fae783a46f207a6"
--  name = "github.com/google/btree"
--  packages = ["."]
--  pruneopts = ""
--  revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306"
--  version = "v1.0.0"
--
--[[projects]]
--  digest = "1:9fcb267c272bc5054564b392e3ff7e65e35400fd9914afb1d169f92b95e7dbc9"
--  name = "github.com/google/go-cmp"
--  packages = [
--    "cmp",
--    "cmp/internal/diff",
--    "cmp/internal/flags",
--    "cmp/internal/function",
--    "cmp/internal/value",
--  ]
--  pruneopts = ""
--  revision = "2d0692c2e9617365a95b295612ac0d4415ba4627"
--  version = "v0.3.1"
--
--[[projects]]
--  digest = "1:14d826ee25139b4674e9768ac287a135f4e7c14e1134a5b15e4e152edfd49f41"
--  name = "github.com/google/go-jsonnet"
--  packages = [
--    ".",
--    "ast",
--    "parser",
--  ]
--  pruneopts = ""
--  revision = "dfddf2b4e3aec377b0dcdf247ff92e7d078b8179"
--
--[[projects]]
--  branch = "master"
--  digest = "1:754f77e9c839b24778a4b64422236d38515301d2baeb63113aa3edc42e6af692"
--  name = "github.com/google/gofuzz"
--  packages = ["."]
--  pruneopts = ""
--  revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1"
--
--[[projects]]
--  branch = "master"
--  digest = "1:d0899ec7c2f61fd5e4ccba7dbefe72e366a3ecce23ecdb982c768fa1d38812fb"
--  name = "github.com/google/shlex"
--  packages = ["."]
--  pruneopts = ""
--  revision = "c34317bd91bf98fab745d77b03933cf8769299fe"
--
--[[projects]]
--  digest = "1:2a131706ff80636629ab6373f2944569b8252ecc018cda8040931b05d32e3c16"
--  name = "github.com/googleapis/gnostic"
--  packages = [
--    "OpenAPIv2",
--    "compiler",
--    "extensions",
--  ]
--  pruneopts = ""
--  revision = "ee43cbb60db7bd22502942cccbc39059117352ab"
--  version = "v0.1.0"
--
--[[projects]]
--  digest = "1:09aa5dd1332b93c96bde671bafb053249dc813febf7d5ca84e8f382ba255d67d"
--  name = "github.com/gorilla/websocket"
--  packages = ["."]
--  pruneopts = ""
--  revision = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"
--  version = "v1.4.0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:e1fd67b5695fb12f54f979606c5d650a5aa72ef242f8e71072bfd4f7b5a141a0"
--  name = "github.com/gregjones/httpcache"
--  packages = [
--    ".",
--    "diskcache",
--  ]
--  pruneopts = ""
--  revision = "901d90724c7919163f472a9812253fb26761123d"
--
--[[projects]]
--  branch = "master"
--  digest = "1:9dca8c981b8aed7448d94e78bc68a76784867a38b3036d5aabc0b32d92ffd1f4"
--  name = "github.com/grpc-ecosystem/go-grpc-middleware"
--  packages = [
--    ".",
--    "auth",
--    "logging",
--    "logging/logrus",
--    "logging/logrus/ctxlogrus",
--    "retry",
--    "tags",
--    "tags/logrus",
--    "util/backoffutils",
--    "util/metautils",
--  ]
--  pruneopts = ""
--  revision = "bc372cc64f55abd91995ba3f219b380ffbc59e9d"
--
--[[projects]]
--  digest = "1:e24dc5ef44694848785de507f439a24e9e6d96d7b43b8cf3d6cfa857aa1e2186"
--  name = "github.com/grpc-ecosystem/go-grpc-prometheus"
--  packages = ["."]
--  pruneopts = ""
--  revision = "c225b8c3b01faf2899099b768856a9e916e5087b"
--  version = "v1.2.0"
--
--[[projects]]
--  digest = "1:9feb7485bc57adbcbc1e1037ca05588e9d8b0a3a1875fbf730021fc118859b75"
--  name = "github.com/grpc-ecosystem/grpc-gateway"
--  packages = [
--    "protoc-gen-grpc-gateway",
--    "protoc-gen-grpc-gateway/descriptor",
--    "protoc-gen-grpc-gateway/generator",
--    "protoc-gen-grpc-gateway/gengateway",
--    "protoc-gen-grpc-gateway/httprule",
--    "protoc-gen-swagger",
--    "protoc-gen-swagger/genswagger",
--    "protoc-gen-swagger/options",
--    "runtime",
--    "runtime/internal",
--    "utilities",
--  ]
--  pruneopts = ""
--  revision = "07f5e79768022f9a3265235f0db4ac8c3f675fec"
--  version = "v1.3.1"
--
--[[projects]]
--  branch = "master"
--  digest = "1:9c776d7d9c54b7ed89f119e449983c3f24c0023e75001d6092442412ebca6b94"
--  name = "github.com/hashicorp/golang-lru"
--  packages = [
--    ".",
--    "simplelru",
--  ]
--  pruneopts = ""
--  revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
--
--[[projects]]
--  digest = "1:23bc0b496ba341c6e3ba24d6358ff4a40a704d9eb5f9a3bd8e8fbd57ad869013"
--  name = "github.com/imdario/mergo"
--  packages = ["."]
--  pruneopts = ""
--  revision = "163f41321a19dd09362d4c63cc2489db2015f1f4"
--  version = "0.3.2"
--
--[[projects]]
--  digest = "1:6f7a8f1f3e04174c426eea1c8661ef49a6b4c63bd2e40c0ad74b5ba9051f4812"
--  name = "github.com/improbable-eng/grpc-web"
--  packages = ["go/grpcweb"]
--  pruneopts = ""
--  revision = "16092bd1d58ae1b3c2d8be1cb67e65956f945dea"
--  version = "0.7.0"
--
--[[projects]]
--  digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
--  name = "github.com/inconshreveable/mousetrap"
--  packages = ["."]
--  pruneopts = ""
--  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
--  version = "v1.0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:95abc4eba158a39873bd4fabdee576d0ae13826b550f8b710881d80ae4093a0f"
--  name = "github.com/jbenet/go-context"
--  packages = ["io"]
--  pruneopts = ""
--  revision = "d14ea06fba99483203c19d92cfcd13ebe73135f4"
--
--[[projects]]
--  digest = "1:302ad9379eb146668760df4d779a95379acab43ce5f9a28f27f3273f98232020"
--  name = "github.com/jonboulle/clockwork"
--  packages = ["."]
--  pruneopts = ""
--  revision = "2eee05ed794112d45db504eb05aa693efd2b8b09"
--  version = "v0.1.0"
--
--[[projects]]
--  digest = "1:31c6f3c4f1e15fcc24fcfc9f5f24603ff3963c56d6fa162116493b4025fb6acc"
--  name = "github.com/json-iterator/go"
--  packages = ["."]
--  pruneopts = ""
--  revision = "f2b4162afba35581b6d4a50d3b8f34e33c144682"
--
--[[projects]]
--  branch = "master"
--  digest = "1:63e7368fcf6b54804076eaec26fd9cf0c4466166b272393db4b93102e1e962df"
--  name = "github.com/kballard/go-shellquote"
--  packages = ["."]
--  pruneopts = ""
--  revision = "95032a82bc518f77982ea72343cc1ade730072f0"
--
--[[projects]]
--  digest = "1:41e0bed5df4f9fd04c418bf9b6b7179b3671e416ad6175332601ca1c8dc74606"
--  name = "github.com/kevinburke/ssh_config"
--  packages = ["."]
--  pruneopts = ""
--  revision = "81db2a75821ed34e682567d48be488a1c3121088"
--  version = "0.5"
--
--[[projects]]
--  branch = "master"
--  digest = "1:448b4a6e39e46d8740b00dc871f26d58dc39341b160e01267b7917132831a136"
--  name = "github.com/konsorten/go-windows-terminal-sequences"
--  packages = ["."]
--  pruneopts = ""
--  revision = "b729f2633dfe35f4d1d8a32385f6685610ce1cb5"
--
--[[projects]]
--  branch = "master"
--  digest = "1:93018a4331df9925058905133cb997aec8f54d5303f4536a23e49b5648632d06"
--  name = "github.com/liggitt/tabwriter"
--  packages = ["."]
--  pruneopts = ""
--  revision = "89fcab3d43de07060e4fd4c1547430ed57e87f24"
--
--[[projects]]
--  branch = "master"
--  digest = "1:ccc20cacf54eb16464dad02efa1c14fa7c0b9e124639b0d2a51dcc87b0154e4c"
--  name = "github.com/mailru/easyjson"
--  packages = [
--    "buffer",
--    "jlexer",
--    "jwriter",
--  ]
--  pruneopts = ""
--  revision = "32fa128f234d041f196a9f3e0fea5ac9772c08e1"
--
--[[projects]]
--  digest = "1:63722a4b1e1717be7b98fc686e0b30d5e7f734b9e93d7dee86293b6deab7ea28"
--  name = "github.com/matttproud/golang_protobuf_extensions"
--  packages = ["pbutil"]
--  pruneopts = ""
--  revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c"
--  version = "v1.0.1"
--
--[[projects]]
--  digest = "1:096a8a9182648da3d00ff243b88407838902b6703fc12657f76890e08d1899bf"
--  name = "github.com/mitchellh/go-homedir"
--  packages = ["."]
--  pruneopts = ""
--  revision = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"
--  version = "v1.0.0"
--
--[[projects]]
--  digest = "1:713b341855f1480e4baca1e7c5434e1d266441340685ecbde32d59bdc065fb3f"
--  name = "github.com/mitchellh/go-wordwrap"
--  packages = ["."]
--  pruneopts = ""
--  revision = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"
--  version = "v1.0.0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:eb9117392ee8e7aa44f78e0db603f70b1050ee0ebda4bd40040befb5b218c546"
--  name = "github.com/mitchellh/mapstructure"
--  packages = ["."]
--  pruneopts = ""
--  revision = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"
--
--[[projects]]
--  digest = "1:0c0ff2a89c1bb0d01887e1dac043ad7efbf3ec77482ef058ac423d13497e16fd"
--  name = "github.com/modern-go/concurrent"
--  packages = ["."]
--  pruneopts = ""
--  revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
--  version = "1.0.3"
--
--[[projects]]
--  digest = "1:e32bdbdb7c377a07a9a46378290059822efdce5c8d96fe71940d87cb4f918855"
--  name = "github.com/modern-go/reflect2"
--  packages = ["."]
--  pruneopts = ""
--  revision = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"
--  version = "1.0.1"
--
--[[projects]]
--  digest = "1:5d9b668b0b4581a978f07e7d2e3314af18eb27b3fb5d19b70185b7c575723d11"
--  name = "github.com/opencontainers/go-digest"
--  packages = ["."]
--  pruneopts = ""
--  revision = "279bed98673dd5bef374d3b6e4b09e2af76183bf"
--  version = "v1.0.0-rc1"
--
--[[projects]]
--  digest = "1:4c0404dc03d974acd5fcd8b8d3ce687b13bd169db032b89275e8b9d77b98ce8c"
--  name = "github.com/patrickmn/go-cache"
--  packages = ["."]
--  pruneopts = ""
--  revision = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"
--  version = "v2.1.0"
--
--[[projects]]
--  digest = "1:049b5bee78dfdc9628ee0e557219c41f683e5b06c5a5f20eaba0105ccc586689"
--  name = "github.com/pelletier/go-buffruneio"
--  packages = ["."]
--  pruneopts = ""
--  revision = "c37440a7cf42ac63b919c752ca73a85067e05992"
--  version = "v0.2.0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:5f0faa008e8ff4221b55a1a5057c8b02cb2fd68da6a65c9e31c82b72cbc836d0"
--  name = "github.com/petar/GoLLRB"
--  packages = ["llrb"]
--  pruneopts = ""
--  revision = "33fb24c13b99c46c93183c291836c573ac382536"
--
--[[projects]]
--  digest = "1:4709c61d984ef9ba99b037b047546d8a576ae984fb49486e48d99658aa750cd5"
--  name = "github.com/peterbourgon/diskv"
--  packages = ["."]
--  pruneopts = ""
--  revision = "0be1b92a6df0e4f5cb0a5d15fb7f643d0ad93ce6"
--  version = "v3.0.0"
--
--[[projects]]
--  digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca"
--  name = "github.com/pkg/errors"
--  packages = ["."]
--  pruneopts = ""
--  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
--  version = "v0.8.0"
--
--[[projects]]
--  digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411"
--  name = "github.com/pmezard/go-difflib"
--  packages = ["difflib"]
--  pruneopts = ""
--  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
--  version = "v1.0.0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:90daff4630a8cf2fa207dbd3ccaed0e860936ead1851a473019674e6b5993a13"
--  name = "github.com/pquerna/cachecontrol"
--  packages = [
--    ".",
--    "cacheobject",
--  ]
--  pruneopts = ""
--  revision = "525d0eb5f91d30e3b1548de401b7ef9ea6898520"
--
--[[projects]]
--  digest = "1:9d34d575593e3dd27bbd119138ba009ef1535a0df2aad7259e1dd5aed7405eea"
--  name = "github.com/prometheus/client_golang"
--  packages = [
--    "prometheus",
--    "prometheus/internal",
--    "prometheus/promhttp",
--  ]
--  pruneopts = ""
--  revision = "7858729281ec582767b20e0d696b6041d995d5e0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:185cf55b1f44a1bf243558901c3f06efa5c64ba62cfdcbb1bf7bbe8c3fb68561"
--  name = "github.com/prometheus/client_model"
--  packages = ["go"]
--  pruneopts = ""
--  revision = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
--
--[[projects]]
--  branch = "master"
--  digest = "1:f477ef7b65d94fb17574fc6548cef0c99a69c1634ea3b6da248b63a61ebe0498"
--  name = "github.com/prometheus/common"
--  packages = [
--    "expfmt",
--    "internal/bitbucket.org/ww/goautoneg",
--    "model",
--  ]
--  pruneopts = ""
--  revision = "c7de2306084e37d54b8be01f3541a8464345e9a5"
--
--[[projects]]
--  branch = "master"
--  digest = "1:e04aaa0e8f8da0ed3d6c0700bd77eda52a47f38510063209d72d62f0ef807d5e"
--  name = "github.com/prometheus/procfs"
--  packages = [
--    ".",
--    "internal/util",
--    "nfs",
--    "xfs",
--  ]
--  pruneopts = ""
--  revision = "05ee40e3a273f7245e8777337fc7b46e533a9a92"
--
--[[projects]]
--  digest = "1:6bb048133650d1fb7fbff9fb3c35bd5c7e8653fc95c3bae6df94cd17d1580278"
--  name = "github.com/robfig/cron"
--  packages = ["."]
--  pruneopts = ""
--  revision = "45fbe1491cdd47d74d1bf1396286d67faee8b8b5"
--  version = "v3.0.0"
--
--[[projects]]
--  digest = "1:5f47c69f85311c4dc292be6cc995a0a3fe8337a6ce38ef4f71e5b7efd5ad42e0"
--  name = "github.com/rs/cors"
--  packages = ["."]
--  pruneopts = ""
--  revision = "9a47f48565a795472d43519dd49aac781f3034fb"
--  version = "v1.6.0"
--
--[[projects]]
--  digest = "1:2761e287c811d0948d47d0252b82281eca3801eb3c9d5f9530956643d5b9f430"
--  name = "github.com/russross/blackfriday"
--  packages = ["."]
--  pruneopts = ""
--  revision = "05f3235734ad95d0016f6a23902f06461fcf567a"
--  version = "v1.5.2"
--
--[[projects]]
--  digest = "1:3962f553b77bf6c03fc07cd687a22dd3b00fe11aa14d31194f5505f5bb65cdc8"
--  name = "github.com/sergi/go-diff"
--  packages = ["diffmatchpatch"]
--  pruneopts = ""
--  revision = "1744e2970ca51c86172c8190fadad617561ed6e7"
--  version = "v1.0.0"
--
--[[projects]]
--  digest = "1:01d968ff6535945510c944983eee024e81f1c949043e9bbfe5ab206ebc3588a4"
--  name = "github.com/sirupsen/logrus"
--  packages = [
--    ".",
--    "hooks/test",
--  ]
--  pruneopts = ""
--  revision = "a67f783a3814b8729bd2dac5780b5f78f8dbd64d"
--  version = "v1.1.0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:50b5be512f924d289f20e8b2aef8951d98b9bd8c44666cf169514906df597a4c"
--  name = "github.com/skratchdot/open-golang"
--  packages = ["open"]
--  pruneopts = ""
--  revision = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"
--
--[[projects]]
--  digest = "1:022a4e2a8c327eb46a99088a51c0dda5d5be86928ace2afd72145dc1d746a323"
--  name = "github.com/soheilhy/cmux"
--  packages = ["."]
--  pruneopts = ""
--  revision = "e09e9389d85d8492d313d73d1469c029e710623f"
--  version = "v0.1.4"
--
--[[projects]]
--  digest = "1:0c63b3c7ad6d825a898f28cb854252a3b29d37700c68a117a977263f5ec94efe"
--  name = "github.com/spf13/cobra"
--  packages = ["."]
--  pruneopts = ""
--  revision = "0.0.5"
--
--[[projects]]
--  digest = "1:8e243c568f36b09031ec18dff5f7d2769dcf5ca4d624ea511c8e3197dc3d352d"
--  name = "github.com/spf13/pflag"
--  packages = ["."]
--  pruneopts = ""
--  revision = "583c0c0531f06d5278b7d917446061adc344b5cd"
--  version = "v1.0.1"
--
--[[projects]]
--  digest = "1:b1861b9a1aa0801b0b62945ed7477c1ab61a4bd03b55dfbc27f6d4f378110c8c"
--  name = "github.com/src-d/gcfg"
--  packages = [
--    ".",
--    "scanner",
--    "token",
--    "types",
--  ]
--  pruneopts = ""
--  revision = "f187355171c936ac84a82793659ebb4936bc1c23"
--  version = "v1.3.0"
--
--[[projects]]
--  digest = "1:306417ea2f31ea733df356a2b895de63776b6a5107085b33458e5cd6eb1d584d"
--  name = "github.com/stretchr/objx"
--  packages = ["."]
--  pruneopts = ""
--  revision = "facf9a85c22f48d2f52f2380e4efce1768749a89"
--  version = "v0.1"
--
--[[projects]]
--  digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75"
--  name = "github.com/stretchr/testify"
--  packages = [
--    "assert",
--    "mock",
--  ]
--  pruneopts = ""
--  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
--  version = "v1.2.2"
--
--[[projects]]
--  digest = "1:51cf0fca93f4866709ceaf01b750e51d997c299a7bd2edf7ccd79e3b428754ae"
--  name = "github.com/vmihailenco/msgpack"
--  packages = [
--    ".",
--    "codes",
--  ]
--  pruneopts = ""
--  revision = "a053f3dac71df214bfe8b367f34220f0029c9c02"
--  version = "v3.3.1"
--
--[[projects]]
--  digest = "1:afc0b8068986a01e2d8f449917829753a54f6bd4d1265c2b4ad9cba75560020f"
--  name = "github.com/xanzy/ssh-agent"
--  packages = ["."]
--  pruneopts = ""
--  revision = "640f0ab560aeb89d523bb6ac322b1244d5c3796c"
--  version = "v0.2.0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:3cf699a0df65293cc8fd2339606950d3e2f6d02a435703951d1da411a23f7cef"
--  name = "github.com/yudai/gojsondiff"
--  packages = [
--    ".",
--    "formatter",
--  ]
--  pruneopts = ""
--  revision = "0525c875b75ca60b9e67ddc44496aa16f21066b0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:9857bb2293f372b2181004d8b62179bbdb4ab0982ec6f762abe6cf2bfedaff85"
--  name = "github.com/yudai/golcs"
--  packages = ["."]
--  pruneopts = ""
--  revision = "ecda9a501e8220fae3b4b600c3db4b0ba22cfc68"
--
--[[projects]]
--  branch = "master"
--  digest = "1:525776d99293affd2c61dfb573007ff9f22863068c20c220ef3f58620758c341"
--  name = "github.com/yuin/gopher-lua"
--  packages = [
--    ".",
--    "ast",
--    "parse",
--    "pm",
--  ]
--  pruneopts = ""
--  revision = "732aa6820ec4fb93d60c4057dd574c33db8ad4e7"
--
--[[projects]]
--  branch = "master"
--  digest = "1:2ea6df0f542cc95a5e374e9cdd81eaa599ed0d55366eef92d2f6b9efa2795c07"
--  name = "golang.org/x/crypto"
--  packages = [
--    "bcrypt",
--    "blowfish",
--    "cast5",
--    "curve25519",
--    "ed25519",
--    "ed25519/internal/edwards25519",
--    "internal/chacha20",
--    "openpgp",
--    "openpgp/armor",
--    "openpgp/elgamal",
--    "openpgp/errors",
--    "openpgp/packet",
--    "openpgp/s2k",
--    "poly1305",
--    "ssh",
--    "ssh/agent",
--    "ssh/knownhosts",
--    "ssh/terminal",
--  ]
--  pruneopts = ""
--  revision = "432090b8f568c018896cd8a0fb0345872bbac6ce"
--
--[[projects]]
--  branch = "master"
--  digest = "1:b4ba046df563f56fe42b6270b20039107a37e1ab47c97aa47a16f848aa5b6d9a"
--  name = "golang.org/x/net"
--  packages = [
--    "context",
--    "context/ctxhttp",
--    "http2",
--    "http2/hpack",
--    "idna",
--    "internal/timeseries",
--    "lex/httplex",
--    "trace",
--  ]
--  pruneopts = ""
--  revision = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"
--
--[[projects]]
--  digest = "1:8a58c605e58272e3d280181a24749b07499cf98968da6f7c1d19c8d5649c6b1b"
--  name = "golang.org/x/oauth2"
--  packages = [
--    ".",
--    "google",
--    "internal",
--    "jws",
--    "jwt",
--  ]
--  pruneopts = ""
--  revision = "cce311a261e6fcf29de72ca96827bdb0b7d9c9e6"
--
--[[projects]]
--  branch = "master"
--  digest = "1:b2ea75de0ccb2db2ac79356407f8a4cd8f798fe15d41b381c00abf3ae8e55ed1"
--  name = "golang.org/x/sync"
--  packages = [
--    "errgroup",
--    "semaphore",
--  ]
--  pruneopts = ""
--  revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"
--
--[[projects]]
--  branch = "master"
--  digest = "1:ed900376500543ca05f2a2383e1f541b4606f19cd22f34acb81b17a0b90c7f3e"
--  name = "golang.org/x/sys"
--  packages = [
--    "unix",
--    "windows",
--  ]
--  pruneopts = ""
--  revision = "d0be0721c37eeb5299f245a996a483160fc36940"
--
--[[projects]]
--  branch = "master"
--  digest = "1:31985a0ed491dba5ba7fe92e18be008acd92ca9435ed9b35b06f3e6c00fd82cb"
--  name = "golang.org/x/text"
--  packages = [
--    "collate",
--    "collate/build",
--    "encoding",
--    "encoding/internal",
--    "encoding/internal/identifier",
--    "encoding/unicode",
--    "internal/colltab",
--    "internal/gen",
--    "internal/tag",
--    "internal/triegen",
--    "internal/ucd",
--    "internal/utf8internal",
--    "language",
--    "runes",
--    "secure/bidirule",
--    "transform",
--    "unicode/bidi",
--    "unicode/cldr",
--    "unicode/norm",
--    "unicode/rangetable",
--    "width",
--  ]
--  pruneopts = ""
--  revision = "4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1"
--
--[[projects]]
--  branch = "master"
--  digest = "1:55a681cb66f28755765fa5fa5104cbd8dc85c55c02d206f9f89566451e3fe1aa"
--  name = "golang.org/x/time"
--  packages = ["rate"]
--  pruneopts = ""
--  revision = "fbb02b2291d28baffd63558aa44b4b56f178d650"
--
--[[projects]]
--  branch = "master"
--  digest = "1:77e1d6ed91936b206979806b0aacbf817ec54b840803d8f8cd7a1de5bfbf92a4"
--  name = "golang.org/x/tools"
--  packages = [
--    "go/ast/astutil",
--    "imports",
--  ]
--  pruneopts = ""
--  revision = "5e776fee60db37e560cee3fb46db699d2f095386"
--
--[[projects]]
--  branch = "master"
--  digest = "1:e9e4b928898842a138bc345d42aae33741baa6d64f3ca69b0931f9c7a4fd0437"
--  name = "gonum.org/v1/gonum"
--  packages = [
--    "blas",
--    "blas/blas64",
--    "blas/cblas128",
--    "blas/gonum",
--    "floats",
--    "graph",
--    "graph/internal/linear",
--    "graph/internal/ordered",
--    "graph/internal/set",
--    "graph/internal/uid",
--    "graph/iterator",
--    "graph/simple",
--    "graph/topo",
--    "graph/traverse",
--    "internal/asm/c128",
--    "internal/asm/c64",
--    "internal/asm/f32",
--    "internal/asm/f64",
--    "internal/cmplx64",
--    "internal/math32",
--    "lapack",
--    "lapack/gonum",
--    "lapack/lapack64",
--    "mat",
--  ]
--  pruneopts = ""
--  revision = "90b7154515874cee6c33cf56b29e257403a09a69"
--
--[[projects]]
--  digest = "1:934fb8966f303ede63aa405e2c8d7f0a427a05ea8df335dfdc1833dd4d40756f"
--  name = "google.golang.org/appengine"
--  packages = [
--    ".",
--    "datastore",
--    "internal",
--    "internal/app_identity",
--    "internal/base",
--    "internal/datastore",
--    "internal/log",
--    "internal/modules",
--    "internal/remote_api",
--    "internal/urlfetch",
--    "urlfetch",
--  ]
--  pruneopts = ""
--  revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a"
--  version = "v1.0.0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:2d833b53e432cd69645da559b822661ebc5c0a13c571dee1c1f80fb1a0241330"
--  name = "google.golang.org/genproto"
--  packages = [
--    "googleapis/api/annotations",
--    "googleapis/rpc/status",
--  ]
--  pruneopts = ""
--  revision = "2b5a72b8730b0b16380010cfe5286c42108d88e7"
--
--[[projects]]
--  digest = "1:15656947b87a6a240e61dcfae9e71a55a8d5677f240d12ab48f02cdbabf1e309"
--  name = "google.golang.org/grpc"
--  packages = [
--    ".",
--    "balancer",
--    "balancer/base",
--    "balancer/roundrobin",
--    "codes",
--    "connectivity",
--    "credentials",
--    "encoding",
--    "encoding/proto",
--    "grpclog",
--    "internal",
--    "internal/backoff",
--    "internal/channelz",
--    "internal/envconfig",
--    "internal/grpcrand",
--    "internal/transport",
--    "keepalive",
--    "metadata",
--    "naming",
--    "peer",
--    "reflection",
--    "reflection/grpc_reflection_v1alpha",
--    "resolver",
--    "resolver/dns",
--    "resolver/passthrough",
--    "stats",
--    "status",
--    "tap",
--  ]
--  pruneopts = ""
--  revision = "8dea3dc473e90c8179e519d91302d0597c0ca1d1"
--  version = "v1.15.0"
--
--[[projects]]
--  digest = "1:adf5b0ae3467c3182757ecb86fbfe819939473bb870a42789dc1a3e7729397cd"
--  name = "gopkg.in/go-playground/webhooks.v5"
--  packages = [
--    "bitbucket",
--    "bitbucket-server",
--    "github",
--    "gitlab",
--    "gogs",
--  ]
--  pruneopts = ""
--  revision = "175186584584a83966dc9a7b8ec6c3d3a4ce6110"
--  version = "v5.11.0"
--
--[[projects]]
--  digest = "1:e5d1fb981765b6f7513f793a3fcaac7158408cca77f75f7311ac82cc88e9c445"
--  name = "gopkg.in/inf.v0"
--  packages = ["."]
--  pruneopts = ""
--  revision = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"
--  version = "v0.9.0"
--
--[[projects]]
--  branch = "v2"
--  digest = "1:c80894778314c7fb90d94a5ab925214900e1341afeddc953cda7398b8cdcd006"
--  name = "gopkg.in/mgo.v2"
--  packages = [
--    "bson",
--    "internal/json",
--  ]
--  pruneopts = ""
--  revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655"
--
--[[projects]]
--  digest = "1:de0ec5755ee1a5e61f079c8855cf2073b5a5f614ae3b51db65f2c4e1044455fd"
--  name = "gopkg.in/square/go-jose.v2"
--  packages = [
--    ".",
--    "cipher",
--    "json",
--  ]
--  pruneopts = ""
--  revision = "76dd09796242edb5b897103a75df2645c028c960"
--  version = "v2.1.6"
--
--[[projects]]
--  digest = "1:c8f3ff1edaf7208bf7633e5952ffb8d697552343f8010aee12427400b434ae63"
--  name = "gopkg.in/src-d/go-billy.v4"
--  packages = [
--    ".",
--    "helper/chroot",
--    "helper/polyfill",
--    "osfs",
--    "util",
--  ]
--  pruneopts = ""
--  revision = "59952543636f55de3f860b477b615093d5c2c3e4"
--  version = "v4.2.1"
--
--[[projects]]
--  digest = "1:a72d911e18578e34367f4b849340501c7e6a2787a3a05651b3d53c6cb96990f4"
--  name = "gopkg.in/src-d/go-git.v4"
--  packages = [
--    ".",
--    "config",
--    "internal/revision",
--    "plumbing",
--    "plumbing/cache",
--    "plumbing/filemode",
--    "plumbing/format/config",
--    "plumbing/format/diff",
--    "plumbing/format/gitignore",
--    "plumbing/format/idxfile",
--    "plumbing/format/index",
--    "plumbing/format/objfile",
--    "plumbing/format/packfile",
--    "plumbing/format/pktline",
--    "plumbing/object",
--    "plumbing/protocol/packp",
--    "plumbing/protocol/packp/capability",
--    "plumbing/protocol/packp/sideband",
--    "plumbing/revlist",
--    "plumbing/storer",
--    "plumbing/transport",
--    "plumbing/transport/client",
--    "plumbing/transport/file",
--    "plumbing/transport/git",
--    "plumbing/transport/http",
--    "plumbing/transport/internal/common",
--    "plumbing/transport/server",
--    "plumbing/transport/ssh",
--    "storage",
--    "storage/filesystem",
--    "storage/filesystem/dotgit",
--    "storage/memory",
--    "utils/binary",
--    "utils/diff",
--    "utils/ioutil",
--    "utils/merkletrie",
--    "utils/merkletrie/filesystem",
--    "utils/merkletrie/index",
--    "utils/merkletrie/internal/frame",
--    "utils/merkletrie/noder",
--  ]
--  pruneopts = ""
--  revision = "a1f6ef44dfed1253ef7f3bc049f66b15f8fc2ab2"
--  version = "v4.9.1"
--
--[[projects]]
--  digest = "1:ceec7e96590fb8168f36df4795fefe17051d4b0c2acc7ec4e260d8138c4dafac"
--  name = "gopkg.in/warnings.v0"
--  packages = ["."]
--  pruneopts = ""
--  revision = "ec4a0fea49c7b46c2aeb0b51aac55779c607e52b"
--  version = "v0.1.2"
--
--[[projects]]
--  digest = "1:cedccf16b71e86db87a24f8d4c70b0a855872eb967cb906a66b95de56aefbd0d"
--  name = "gopkg.in/yaml.v2"
--  packages = ["."]
--  pruneopts = ""
--  revision = "51d6538a90f86fe93ac480b35f37b2be17fef232"
--  version = "v2.2.2"
--
--[[projects]]
--  branch = "release-1.16"
--  digest = "1:5e5cfbab57ea5444c1eb295a39fdc403f097f5ace592c829db7b3e0e3ea66903"
--  name = "k8s.io/api"
--  packages = [
--    "admission/v1",
--    "admission/v1beta1",
--    "admissionregistration/v1",
--    "admissionregistration/v1beta1",
--    "apps/v1",
--    "apps/v1beta1",
--    "apps/v1beta2",
--    "auditregistration/v1alpha1",
--    "authentication/v1",
--    "authentication/v1beta1",
--    "authorization/v1",
--    "authorization/v1beta1",
--    "autoscaling/v1",
--    "autoscaling/v2beta1",
--    "autoscaling/v2beta2",
--    "batch/v1",
--    "batch/v1beta1",
--    "batch/v2alpha1",
--    "certificates/v1beta1",
--    "coordination/v1",
--    "coordination/v1beta1",
--    "core/v1",
--    "discovery/v1alpha1",
--    "events/v1beta1",
--    "extensions/v1beta1",
--    "imagepolicy/v1alpha1",
--    "networking/v1",
--    "networking/v1beta1",
--    "node/v1alpha1",
--    "node/v1beta1",
--    "policy/v1beta1",
--    "rbac/v1",
--    "rbac/v1alpha1",
--    "rbac/v1beta1",
--    "scheduling/v1",
--    "scheduling/v1alpha1",
--    "scheduling/v1beta1",
--    "settings/v1alpha1",
--    "storage/v1",
--    "storage/v1alpha1",
--    "storage/v1beta1",
--  ]
--  pruneopts = ""
--  revision = "195af9ec35214c6d98662c5791364285bf2e2cf2"
--
--[[projects]]
--  branch = "release-1.16"
--  digest = "1:7f29d62c07c68767171cf2ed8598e0cb862b99584bb8beb93189e2ed00ac520e"
--  name = "k8s.io/apiextensions-apiserver"
--  packages = [
--    "pkg/apis/apiextensions",
--    "pkg/apis/apiextensions/v1",
--    "pkg/apis/apiextensions/v1beta1",
--    "pkg/client/clientset/clientset",
--    "pkg/client/clientset/clientset/scheme",
--    "pkg/client/clientset/clientset/typed/apiextensions/v1",
--    "pkg/client/clientset/clientset/typed/apiextensions/v1beta1",
--    "pkg/features",
--  ]
--  pruneopts = ""
--  revision = "07afe84a85e43cf2503133660c424a0b594b21db"
--
--[[projects]]
--  branch = "release-1.16"
--  digest = "1:36db89a45a8cb3d565f7ebfd67dafd42c9c0bbb80d6bbd4991629b39b02a4c64"
--  name = "k8s.io/apimachinery"
--  packages = [
--    "pkg/api/equality",
--    "pkg/api/errors",
--    "pkg/api/meta",
--    "pkg/api/resource",
--    "pkg/api/validation",
--    "pkg/api/validation/path",
--    "pkg/apis/meta/internalversion",
--    "pkg/apis/meta/v1",
--    "pkg/apis/meta/v1/unstructured",
--    "pkg/apis/meta/v1/unstructured/unstructuredscheme",
--    "pkg/apis/meta/v1/validation",
--    "pkg/apis/meta/v1beta1",
--    "pkg/conversion",
--    "pkg/conversion/queryparams",
--    "pkg/fields",
--    "pkg/labels",
--    "pkg/runtime",
--    "pkg/runtime/schema",
--    "pkg/runtime/serializer",
--    "pkg/runtime/serializer/json",
--    "pkg/runtime/serializer/protobuf",
--    "pkg/runtime/serializer/recognizer",
--    "pkg/runtime/serializer/streaming",
--    "pkg/runtime/serializer/versioning",
--    "pkg/selection",
--    "pkg/types",
--    "pkg/util/cache",
--    "pkg/util/clock",
--    "pkg/util/diff",
--    "pkg/util/duration",
--    "pkg/util/errors",
--    "pkg/util/framer",
--    "pkg/util/httpstream",
--    "pkg/util/httpstream/spdy",
--    "pkg/util/intstr",
--    "pkg/util/json",
--    "pkg/util/jsonmergepatch",
--    "pkg/util/mergepatch",
--    "pkg/util/naming",
--    "pkg/util/net",
--    "pkg/util/remotecommand",
--    "pkg/util/runtime",
--    "pkg/util/sets",
--    "pkg/util/strategicpatch",
--    "pkg/util/validation",
--    "pkg/util/validation/field",
--    "pkg/util/wait",
--    "pkg/util/yaml",
--    "pkg/version",
--    "pkg/watch",
--    "third_party/forked/golang/json",
--    "third_party/forked/golang/netutil",
--    "third_party/forked/golang/reflect",
--  ]
--  pruneopts = ""
--  revision = "72ed19daf4bb788ae595ae4103c404cb0fa09c84"
--
--[[projects]]
--  branch = "release-1.16"
--  digest = "1:4e236f3f94cfc5f005ceb143948ad39a4b2ad10373f394b232838f797bddd6ef"
--  name = "k8s.io/apiserver"
--  packages = [
--    "pkg/apis/audit",
--    "pkg/authentication/serviceaccount",
--    "pkg/authentication/user",
--    "pkg/endpoints/request",
--    "pkg/features",
--    "pkg/util/feature",
--  ]
--  pruneopts = ""
--  revision = "ebfe712c1fff40c4800d779470515e6025eda218"
--
--[[projects]]
--  branch = "release-1.16"
--  digest = "1:b46a88b317c3187b6fa7c5351eca48b35aad182eee371168677747430ff955bb"
--  name = "k8s.io/cli-runtime"
--  packages = [
--    "pkg/genericclioptions",
--    "pkg/kustomize",
--    "pkg/kustomize/k8sdeps",
--    "pkg/kustomize/k8sdeps/configmapandsecret",
--    "pkg/kustomize/k8sdeps/kunstruct",
--    "pkg/kustomize/k8sdeps/kv",
--    "pkg/kustomize/k8sdeps/transformer",
--    "pkg/kustomize/k8sdeps/transformer/hash",
--    "pkg/kustomize/k8sdeps/transformer/patch",
--    "pkg/kustomize/k8sdeps/validator",
--    "pkg/printers",
--    "pkg/resource",
--  ]
--  pruneopts = ""
--  revision = "6bff60de437070d7e8644b7a930837d5de512240"
--
--[[projects]]
--  branch = "release-13.0"
--  digest = "1:84f90f6a3b5b16f2c57164c5281d302b2647da8f77aa9cb14d5ebeb17fccc25e"
--  name = "k8s.io/client-go"
--  packages = [
--    "discovery",
--    "discovery/cached/disk",
--    "discovery/fake",
--    "dynamic",
--    "dynamic/fake",
--    "informers/core/v1",
--    "informers/internalinterfaces",
--    "kubernetes",
--    "kubernetes/fake",
--    "kubernetes/scheme",
--    "kubernetes/typed/admissionregistration/v1",
--    "kubernetes/typed/admissionregistration/v1/fake",
--    "kubernetes/typed/admissionregistration/v1beta1",
--    "kubernetes/typed/admissionregistration/v1beta1/fake",
--    "kubernetes/typed/apps/v1",
--    "kubernetes/typed/apps/v1/fake",
--    "kubernetes/typed/apps/v1beta1",
--    "kubernetes/typed/apps/v1beta1/fake",
--    "kubernetes/typed/apps/v1beta2",
--    "kubernetes/typed/apps/v1beta2/fake",
--    "kubernetes/typed/auditregistration/v1alpha1",
--    "kubernetes/typed/auditregistration/v1alpha1/fake",
--    "kubernetes/typed/authentication/v1",
--    "kubernetes/typed/authentication/v1/fake",
--    "kubernetes/typed/authentication/v1beta1",
--    "kubernetes/typed/authentication/v1beta1/fake",
--    "kubernetes/typed/authorization/v1",
--    "kubernetes/typed/authorization/v1/fake",
--    "kubernetes/typed/authorization/v1beta1",
--    "kubernetes/typed/authorization/v1beta1/fake",
--    "kubernetes/typed/autoscaling/v1",
--    "kubernetes/typed/autoscaling/v1/fake",
--    "kubernetes/typed/autoscaling/v2beta1",
--    "kubernetes/typed/autoscaling/v2beta1/fake",
--    "kubernetes/typed/autoscaling/v2beta2",
--    "kubernetes/typed/autoscaling/v2beta2/fake",
--    "kubernetes/typed/batch/v1",
--    "kubernetes/typed/batch/v1/fake",
--    "kubernetes/typed/batch/v1beta1",
--    "kubernetes/typed/batch/v1beta1/fake",
--    "kubernetes/typed/batch/v2alpha1",
--    "kubernetes/typed/batch/v2alpha1/fake",
--    "kubernetes/typed/certificates/v1beta1",
--    "kubernetes/typed/certificates/v1beta1/fake",
--    "kubernetes/typed/coordination/v1",
--    "kubernetes/typed/coordination/v1/fake",
--    "kubernetes/typed/coordination/v1beta1",
--    "kubernetes/typed/coordination/v1beta1/fake",
--    "kubernetes/typed/core/v1",
--    "kubernetes/typed/core/v1/fake",
--    "kubernetes/typed/discovery/v1alpha1",
--    "kubernetes/typed/discovery/v1alpha1/fake",
--    "kubernetes/typed/events/v1beta1",
--    "kubernetes/typed/events/v1beta1/fake",
--    "kubernetes/typed/extensions/v1beta1",
--    "kubernetes/typed/extensions/v1beta1/fake",
--    "kubernetes/typed/networking/v1",
--    "kubernetes/typed/networking/v1/fake",
--    "kubernetes/typed/networking/v1beta1",
--    "kubernetes/typed/networking/v1beta1/fake",
--    "kubernetes/typed/node/v1alpha1",
--    "kubernetes/typed/node/v1alpha1/fake",
--    "kubernetes/typed/node/v1beta1",
--    "kubernetes/typed/node/v1beta1/fake",
--    "kubernetes/typed/policy/v1beta1",
--    "kubernetes/typed/policy/v1beta1/fake",
--    "kubernetes/typed/rbac/v1",
--    "kubernetes/typed/rbac/v1/fake",
--    "kubernetes/typed/rbac/v1alpha1",
--    "kubernetes/typed/rbac/v1alpha1/fake",
--    "kubernetes/typed/rbac/v1beta1",
--    "kubernetes/typed/rbac/v1beta1/fake",
--    "kubernetes/typed/scheduling/v1",
--    "kubernetes/typed/scheduling/v1/fake",
--    "kubernetes/typed/scheduling/v1alpha1",
--    "kubernetes/typed/scheduling/v1alpha1/fake",
--    "kubernetes/typed/scheduling/v1beta1",
--    "kubernetes/typed/scheduling/v1beta1/fake",
--    "kubernetes/typed/settings/v1alpha1",
--    "kubernetes/typed/settings/v1alpha1/fake",
--    "kubernetes/typed/storage/v1",
--    "kubernetes/typed/storage/v1/fake",
--    "kubernetes/typed/storage/v1alpha1",
--    "kubernetes/typed/storage/v1alpha1/fake",
--    "kubernetes/typed/storage/v1beta1",
--    "kubernetes/typed/storage/v1beta1/fake",
--    "listers/core/v1",
--    "pkg/apis/clientauthentication",
--    "pkg/apis/clientauthentication/v1alpha1",
--    "pkg/apis/clientauthentication/v1beta1",
--    "pkg/version",
--    "plugin/pkg/client/auth/exec",
--    "plugin/pkg/client/auth/gcp",
--    "plugin/pkg/client/auth/oidc",
--    "rest",
--    "rest/watch",
--    "restmapper",
--    "scale",
--    "scale/scheme",
--    "scale/scheme/appsint",
--    "scale/scheme/appsv1beta1",
--    "scale/scheme/appsv1beta2",
--    "scale/scheme/autoscalingv1",
--    "scale/scheme/extensionsint",
--    "scale/scheme/extensionsv1beta1",
--    "testing",
--    "third_party/forked/golang/template",
--    "tools/auth",
--    "tools/cache",
--    "tools/clientcmd",
--    "tools/clientcmd/api",
--    "tools/clientcmd/api/latest",
--    "tools/clientcmd/api/v1",
--    "tools/metrics",
--    "tools/pager",
--    "tools/portforward",
--    "tools/reference",
--    "tools/remotecommand",
--    "tools/watch",
--    "transport",
--    "transport/spdy",
--    "util/cert",
--    "util/connrotation",
--    "util/exec",
--    "util/flowcontrol",
--    "util/homedir",
--    "util/jsonpath",
--    "util/keyutil",
--    "util/retry",
--    "util/workqueue",
--  ]
--  pruneopts = ""
--  revision = "85029d69edeae82e97dd1a0de3b24668cee9a15d"
--
--[[projects]]
--  branch = "release-1.16"
--  digest = "1:254da4cb69b3776686b730a206e081e6f8898bb64760619d1895c25c407e718f"
--  name = "k8s.io/code-generator"
--  packages = [
--    "cmd/go-to-protobuf",
--    "cmd/go-to-protobuf/protobuf",
--    "pkg/util",
--    "third_party/forked/golang/reflect",
--  ]
--  pruneopts = ""
--  revision = "8e001e5d18949be7e823ccb9cfe9b60026e7bda0"
--
--[[projects]]
--  branch = "master"
--  digest = "1:06c18e328063f3612dfda3c4c5e5b8becda1eabceca689335c8d98704dffe70a"
--  name = "k8s.io/component-base"
--  packages = ["featuregate"]
--  pruneopts = ""
--  revision = "435ce712a6949916fa293dc4d3d49429962043d8"
--
--[[projects]]
--  branch = "master"
--  digest = "1:6a2a63e09a59caff3fd2d36d69b7b92c2fe7cf783390f0b7349fb330820f9a8e"
--  name = "k8s.io/gengo"
--  packages = [
--    "args",
--    "examples/set-gen/sets",
--    "generator",
--    "namer",
--    "parser",
--    "types",
--  ]
--  pruneopts = ""
--  revision = "e17681d19d3ac4837a019ece36c2a0ec31ffe985"
--
--[[projects]]
--  digest = "1:9eaf86f4f6fb4a8f177220d488ef1e3255d06a691cca95f14ef085d4cd1cef3c"
--  name = "k8s.io/klog"
--  packages = ["."]
--  pruneopts = ""
--  revision = "d98d8acdac006fb39831f1b25640813fef9c314f"
--  version = "v0.3.3"
--
--[[projects]]
--  branch = "master"
--  digest = "1:0d737d598e9db0a38d6ef6cba514c358b9fe7e1bc6b1128d02b2622700c75f2a"
--  name = "k8s.io/kube-aggregator"
--  packages = [
--    "pkg/apis/apiregistration",
--    "pkg/apis/apiregistration/v1",
--    "pkg/apis/apiregistration/v1beta1",
--  ]
--  pruneopts = ""
--  revision = "e80910364765199a4baebd4dec54c885fe52b680"
--
--[[projects]]
--  digest = "1:16a343bd9d820ae320de4d1eaa8acc7a214aac4b38fb21d03255d3a457d861df"
--  name = "k8s.io/kube-openapi"
--  packages = [
--    "cmd/openapi-gen",
--    "cmd/openapi-gen/args",
--    "pkg/common",
--    "pkg/generators",
--    "pkg/generators/rules",
--    "pkg/util/proto",
--    "pkg/util/proto/validation",
--    "pkg/util/sets",
--  ]
--  pruneopts = ""
--  revision = "30be4d16710ac61bce31eb28a01054596fe6a9f1"
--
--[[projects]]
--  branch = "release-1.16"
--  digest = "1:687af22932f9b53ff2e6755b2eefe160f076d522794abb980f0ddb187bcefacd"
--  name = "k8s.io/kubectl"
--  packages = [
--    "pkg/cmd/apply",
--    "pkg/cmd/delete",
--    "pkg/cmd/util",
--    "pkg/cmd/util/editor",
--    "pkg/cmd/util/editor/crlf",
--    "pkg/cmd/wait",
--    "pkg/describe",
--    "pkg/describe/versioned",
--    "pkg/generated",
--    "pkg/rawhttp",
--    "pkg/scheme",
--    "pkg/util",
--    "pkg/util/certificate",
--    "pkg/util/deployment",
--    "pkg/util/event",
--    "pkg/util/fieldpath",
--    "pkg/util/i18n",
--    "pkg/util/interrupt",
--    "pkg/util/openapi",
--    "pkg/util/openapi/validation",
--    "pkg/util/printers",
--    "pkg/util/qos",
--    "pkg/util/rbac",
--    "pkg/util/resource",
--    "pkg/util/slice",
--    "pkg/util/storage",
--    "pkg/util/templates",
--    "pkg/util/term",
--    "pkg/validation",
--    "pkg/version",
--  ]
--  pruneopts = ""
--  revision = "14647fd13a8b4cffc5a8f327b0018e037f72e4e8"
--
--[[projects]]
--  branch = "release-1.16"
--  digest = "1:02241e5570c239d31e52955b1a8e6d603a35fd6542d14e98882fb6c3c4ef3d56"
--  name = "k8s.io/kubernetes"
--  packages = [
--    "pkg/api/legacyscheme",
--    "pkg/api/v1/pod",
--    "pkg/apis/apps",
--    "pkg/apis/apps/install",
--    "pkg/apis/apps/v1",
--    "pkg/apis/apps/v1beta1",
--    "pkg/apis/apps/v1beta2",
--    "pkg/apis/authentication",
--    "pkg/apis/authentication/install",
--    "pkg/apis/authentication/v1",
--    "pkg/apis/authentication/v1beta1",
--    "pkg/apis/authorization",
--    "pkg/apis/authorization/install",
--    "pkg/apis/authorization/v1",
--    "pkg/apis/authorization/v1beta1",
--    "pkg/apis/autoscaling",
--    "pkg/apis/autoscaling/install",
--    "pkg/apis/autoscaling/v1",
--    "pkg/apis/autoscaling/v2beta1",
--    "pkg/apis/autoscaling/v2beta2",
--    "pkg/apis/batch",
--    "pkg/apis/batch/install",
--    "pkg/apis/batch/v1",
--    "pkg/apis/batch/v1beta1",
--    "pkg/apis/batch/v2alpha1",
--    "pkg/apis/certificates",
--    "pkg/apis/certificates/install",
--    "pkg/apis/certificates/v1beta1",
--    "pkg/apis/coordination",
--    "pkg/apis/coordination/install",
--    "pkg/apis/coordination/v1",
--    "pkg/apis/coordination/v1beta1",
--    "pkg/apis/core",
--    "pkg/apis/core/install",
--    "pkg/apis/core/v1",
--    "pkg/apis/events",
--    "pkg/apis/events/install",
--    "pkg/apis/events/v1beta1",
--    "pkg/apis/extensions",
--    "pkg/apis/extensions/install",
--    "pkg/apis/extensions/v1beta1",
--    "pkg/apis/networking",
--    "pkg/apis/policy",
--    "pkg/apis/policy/install",
--    "pkg/apis/policy/v1beta1",
--    "pkg/apis/rbac",
--    "pkg/apis/rbac/install",
--    "pkg/apis/rbac/v1",
--    "pkg/apis/rbac/v1alpha1",
--    "pkg/apis/rbac/v1beta1",
--    "pkg/apis/scheduling",
--    "pkg/apis/scheduling/install",
--    "pkg/apis/scheduling/v1",
--    "pkg/apis/scheduling/v1alpha1",
--    "pkg/apis/scheduling/v1beta1",
--    "pkg/apis/settings",
--    "pkg/apis/settings/install",
--    "pkg/apis/settings/v1alpha1",
--    "pkg/apis/storage",
--    "pkg/apis/storage/install",
--    "pkg/apis/storage/v1",
--    "pkg/apis/storage/v1alpha1",
--    "pkg/apis/storage/v1beta1",
--    "pkg/features",
--    "pkg/kubectl/cmd/auth",
--    "pkg/registry/rbac/reconciliation",
--    "pkg/registry/rbac/validation",
--    "pkg/util/node",
--    "pkg/util/parsers",
--    "pkg/util/slice",
--    "pkg/util/workqueue/prometheus",
--  ]
--  pruneopts = ""
--  revision = "bfafae8f1c2fdf3c3cfef04674db028531a7c098"
--
--[[projects]]
--  branch = "master"
--  digest = "1:a8a2e6bbef691323b833d0eb11bb0e570e7eb9619ac76f7b11265530e1cac922"
--  name = "k8s.io/utils"
--  packages = [
--    "buffer",
--    "exec",
--    "integer",
--    "net",
--    "pointer",
--    "trace",
--  ]
--  pruneopts = ""
--  revision = "6ca3b61696b65b0e81f1a39b4937fc2d2994ed6a"
--
--[[projects]]
--  branch = "master"
--  digest = "1:9b9f12f4c13ca4a4f4b4554c00ba46cb2910ff4079825d96d520b03c447e6da5"
--  name = "layeh.com/gopher-json"
--  packages = ["."]
--  pruneopts = ""
--  revision = "97fed8db84274c421dbfffbb28ec859901556b97"
--
--[[projects]]
--  digest = "1:0b2daace3dcced8712072529b621360cf520f3c2ead92d755f35a0ec8dca2714"
--  name = "sigs.k8s.io/kustomize"
--  packages = [
--    "pkg/commands/build",
--    "pkg/constants",
--    "pkg/expansion",
--    "pkg/factory",
--    "pkg/fs",
--    "pkg/git",
--    "pkg/gvk",
--    "pkg/ifc",
--    "pkg/ifc/transformer",
--    "pkg/image",
--    "pkg/internal/error",
--    "pkg/loader",
--    "pkg/patch",
--    "pkg/patch/transformer",
--    "pkg/resid",
--    "pkg/resmap",
--    "pkg/resource",
--    "pkg/target",
--    "pkg/transformers",
--    "pkg/transformers/config",
--    "pkg/transformers/config/defaultconfig",
--    "pkg/types",
--  ]
--  pruneopts = ""
--  revision = "a6f65144121d1955266b0cd836ce954c04122dc8"
--  version = "v2.0.3"
--
--[[projects]]
--  digest = "1:321081b4a44256715f2b68411d8eda9a17f17ebfe6f0cc61d2cc52d11c08acfa"
--  name = "sigs.k8s.io/yaml"
--  packages = ["."]
--  pruneopts = ""
--  revision = "fd68e9863619f6ec2fdd8625fe1f02e7c877e480"
--  version = "v1.1.0"
--
--[solve-meta]
--  analyzer-name = "dep"
--  analyzer-version = 1
--  input-imports = [
--    "bou.ke/monkey",
--    "github.com/Masterminds/semver",
--    "github.com/TomOnTime/utfutil",
--    "github.com/argoproj/pkg/errors",
--    "github.com/argoproj/pkg/exec",
--    "github.com/argoproj/pkg/time",
--    "github.com/casbin/casbin",
--    "github.com/casbin/casbin/model",
--    "github.com/coreos/go-oidc",
--    "github.com/dgrijalva/jwt-go",
--    "github.com/dustin/go-humanize",
--    "github.com/evanphx/json-patch",
--    "github.com/ghodss/yaml",
--    "github.com/go-openapi/loads",
--    "github.com/go-openapi/runtime/middleware",
--    "github.com/go-openapi/spec",
--    "github.com/go-redis/cache",
--    "github.com/go-redis/redis",
--    "github.com/gobuffalo/packr",
--    "github.com/gobwas/glob",
--    "github.com/gogits/go-gogs-client",
--    "github.com/gogo/protobuf/gogoproto",
--    "github.com/gogo/protobuf/proto",
--    "github.com/gogo/protobuf/protoc-gen-gofast",
--    "github.com/gogo/protobuf/protoc-gen-gogofast",
--    "github.com/gogo/protobuf/sortkeys",
--    "github.com/golang/protobuf/proto",
--    "github.com/golang/protobuf/protoc-gen-go",
--    "github.com/golang/protobuf/ptypes/empty",
--    "github.com/google/go-jsonnet",
--    "github.com/google/shlex",
--    "github.com/grpc-ecosystem/go-grpc-middleware",
--    "github.com/grpc-ecosystem/go-grpc-middleware/auth",
--    "github.com/grpc-ecosystem/go-grpc-middleware/logging",
--    "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus",
--    "github.com/grpc-ecosystem/go-grpc-middleware/retry",
--    "github.com/grpc-ecosystem/go-grpc-middleware/tags/logrus",
--    "github.com/grpc-ecosystem/go-grpc-prometheus",
--    "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway",
--    "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger",
--    "github.com/grpc-ecosystem/grpc-gateway/runtime",
--    "github.com/grpc-ecosystem/grpc-gateway/utilities",
--    "github.com/improbable-eng/grpc-web/go/grpcweb",
--    "github.com/kballard/go-shellquote",
--    "github.com/patrickmn/go-cache",
--    "github.com/pkg/errors",
--    "github.com/prometheus/client_golang/prometheus",
--    "github.com/prometheus/client_golang/prometheus/promhttp",
--    "github.com/robfig/cron",
--    "github.com/sirupsen/logrus",
--    "github.com/sirupsen/logrus/hooks/test",
--    "github.com/skratchdot/open-golang/open",
--    "github.com/soheilhy/cmux",
--    "github.com/spf13/cobra",
--    "github.com/spf13/pflag",
--    "github.com/stretchr/testify/assert",
--    "github.com/stretchr/testify/mock",
--    "github.com/vmihailenco/msgpack",
--    "github.com/yudai/gojsondiff",
--    "github.com/yudai/gojsondiff/formatter",
--    "github.com/yuin/gopher-lua",
--    "golang.org/x/crypto/bcrypt",
--    "golang.org/x/crypto/ssh",
--    "golang.org/x/crypto/ssh/knownhosts",
--    "golang.org/x/crypto/ssh/terminal",
--    "golang.org/x/net/context",
--    "golang.org/x/oauth2",
--    "golang.org/x/sync/errgroup",
--    "golang.org/x/sync/semaphore",
--    "google.golang.org/genproto/googleapis/api/annotations",
--    "google.golang.org/grpc",
--    "google.golang.org/grpc/codes",
--    "google.golang.org/grpc/credentials",
--    "google.golang.org/grpc/grpclog",
--    "google.golang.org/grpc/metadata",
--    "google.golang.org/grpc/reflection",
--    "google.golang.org/grpc/status",
--    "gopkg.in/go-playground/webhooks.v5/bitbucket",
--    "gopkg.in/go-playground/webhooks.v5/bitbucket-server",
--    "gopkg.in/go-playground/webhooks.v5/github",
--    "gopkg.in/go-playground/webhooks.v5/gitlab",
--    "gopkg.in/go-playground/webhooks.v5/gogs",
--    "gopkg.in/src-d/go-git.v4",
--    "gopkg.in/src-d/go-git.v4/config",
--    "gopkg.in/src-d/go-git.v4/plumbing",
--    "gopkg.in/src-d/go-git.v4/plumbing/transport",
--    "gopkg.in/src-d/go-git.v4/plumbing/transport/client",
--    "gopkg.in/src-d/go-git.v4/plumbing/transport/http",
--    "gopkg.in/src-d/go-git.v4/plumbing/transport/ssh",
--    "gopkg.in/src-d/go-git.v4/storage/memory",
--    "gopkg.in/src-d/go-git.v4/utils/ioutil",
--    "gopkg.in/yaml.v2",
--    "k8s.io/api/apps/v1",
--    "k8s.io/api/batch/v1",
--    "k8s.io/api/core/v1",
--    "k8s.io/api/extensions/v1beta1",
--    "k8s.io/api/networking/v1beta1",
--    "k8s.io/api/rbac/v1",
--    "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1",
--    "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset",
--    "k8s.io/apimachinery/pkg/api/equality",
--    "k8s.io/apimachinery/pkg/api/errors",
--    "k8s.io/apimachinery/pkg/apis/meta/v1",
--    "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
--    "k8s.io/apimachinery/pkg/fields",
--    "k8s.io/apimachinery/pkg/labels",
--    "k8s.io/apimachinery/pkg/runtime",
--    "k8s.io/apimachinery/pkg/runtime/schema",
--    "k8s.io/apimachinery/pkg/runtime/serializer",
--    "k8s.io/apimachinery/pkg/selection",
--    "k8s.io/apimachinery/pkg/types",
--    "k8s.io/apimachinery/pkg/util/intstr",
--    "k8s.io/apimachinery/pkg/util/jsonmergepatch",
--    "k8s.io/apimachinery/pkg/util/runtime",
--    "k8s.io/apimachinery/pkg/util/strategicpatch",
--    "k8s.io/apimachinery/pkg/util/wait",
--    "k8s.io/apimachinery/pkg/watch",
--    "k8s.io/cli-runtime/pkg/genericclioptions",
--    "k8s.io/cli-runtime/pkg/printers",
--    "k8s.io/client-go/discovery",
--    "k8s.io/client-go/discovery/fake",
--    "k8s.io/client-go/dynamic",
--    "k8s.io/client-go/dynamic/fake",
--    "k8s.io/client-go/informers/core/v1",
--    "k8s.io/client-go/kubernetes",
--    "k8s.io/client-go/kubernetes/fake",
--    "k8s.io/client-go/kubernetes/scheme",
--    "k8s.io/client-go/listers/core/v1",
--    "k8s.io/client-go/plugin/pkg/client/auth/gcp",
--    "k8s.io/client-go/plugin/pkg/client/auth/oidc",
--    "k8s.io/client-go/rest",
--    "k8s.io/client-go/testing",
--    "k8s.io/client-go/tools/cache",
--    "k8s.io/client-go/tools/clientcmd",
--    "k8s.io/client-go/tools/clientcmd/api",
--    "k8s.io/client-go/tools/portforward",
--    "k8s.io/client-go/transport/spdy",
--    "k8s.io/client-go/util/flowcontrol",
--    "k8s.io/client-go/util/workqueue",
--    "k8s.io/code-generator/cmd/go-to-protobuf",
--    "k8s.io/klog",
--    "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1",
--    "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1",
--    "k8s.io/kube-openapi/cmd/openapi-gen",
--    "k8s.io/kube-openapi/pkg/common",
--    "k8s.io/kubectl/pkg/cmd/apply",
--    "k8s.io/kubectl/pkg/cmd/util",
--    "k8s.io/kubectl/pkg/scheme",
--    "k8s.io/kubectl/pkg/util/term",
--    "k8s.io/kubernetes/pkg/api/legacyscheme",
--    "k8s.io/kubernetes/pkg/api/v1/pod",
--    "k8s.io/kubernetes/pkg/apis/apps/install",
--    "k8s.io/kubernetes/pkg/apis/authentication/install",
--    "k8s.io/kubernetes/pkg/apis/authorization/install",
--    "k8s.io/kubernetes/pkg/apis/autoscaling/install",
--    "k8s.io/kubernetes/pkg/apis/batch/install",
--    "k8s.io/kubernetes/pkg/apis/certificates/install",
--    "k8s.io/kubernetes/pkg/apis/coordination/install",
--    "k8s.io/kubernetes/pkg/apis/core",
--    "k8s.io/kubernetes/pkg/apis/core/install",
--    "k8s.io/kubernetes/pkg/apis/events/install",
--    "k8s.io/kubernetes/pkg/apis/extensions/install",
--    "k8s.io/kubernetes/pkg/apis/policy/install",
--    "k8s.io/kubernetes/pkg/apis/rbac/install",
--    "k8s.io/kubernetes/pkg/apis/scheduling/install",
--    "k8s.io/kubernetes/pkg/apis/settings/install",
--    "k8s.io/kubernetes/pkg/apis/storage/install",
--    "k8s.io/kubernetes/pkg/kubectl/cmd/auth",
--    "k8s.io/kubernetes/pkg/util/node",
--    "k8s.io/kubernetes/pkg/util/slice",
--    "k8s.io/kubernetes/pkg/util/workqueue/prometheus",
--    "k8s.io/utils/pointer",
--    "layeh.com/gopher-json",
--  ]
--  solver-name = "gps-cdcl"
--  solver-version = 1
-diff --git a/Gopkg.toml b/Gopkg.toml
-deleted file mode 100644
-index 2fa04ee4..00000000
---- a/Gopkg.toml
-+++ /dev/null
-@@ -1,117 +0,0 @@
--# Packages should only be added to the following list when we use them *outside* of our go code.
--# (e.g. we want to build the binary to invoke as part of the build process, such as in
--# generate-proto.sh). Normal use of golang packages should be added via `dep ensure`, and pinned
--# with a [[constraint]] or [[override]] when version is important.
--required = [
--  "github.com/golang/protobuf/protoc-gen-go",
--  "github.com/gogo/protobuf/protoc-gen-gofast",
--  "github.com/gogo/protobuf/protoc-gen-gogofast",
--  "k8s.io/code-generator/cmd/go-to-protobuf",
--  "k8s.io/kube-openapi/cmd/openapi-gen",
--  "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway",
--  "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger",
--  "golang.org/x/sync/errgroup",
--]
--
--[[constraint]]
--  name = "google.golang.org/grpc"
--  version = "1.15.0"
--
--[[constraint]]
--  name = "github.com/gogo/protobuf"
--  version = "1.3.1"
--
--# override github.com/grpc-ecosystem/go-grpc-middleware's constraint on master
--[[override]]
--  name = "github.com/golang/protobuf"
--  version = "1.2.0"
--
--[[constraint]]
--  name = "github.com/grpc-ecosystem/grpc-gateway"
--  version = "v1.3.1"
--
--# prometheus does not believe in semversioning yet
--[[constraint]]
--  name = "github.com/prometheus/client_golang"
--  revision = "7858729281ec582767b20e0d696b6041d995d5e0"
--
--[[override]]
--  branch = "release-1.16"
--  name = "k8s.io/api"
--
--[[override]]
--  branch = "release-1.16"
--  name = "k8s.io/kubernetes"
--
--[[override]]
--  branch = "release-1.16"
--  name = "k8s.io/code-generator"
--
--[[override]]
--  branch = "release-1.16"
--  name = "k8s.io/apimachinery"
--
--[[override]]
--  branch = "release-1.16"
--  name = "k8s.io/apiextensions-apiserver"
--
--[[override]]
--  branch = "release-1.16"
--  name = "k8s.io/apiserver"
--
--[[override]]
--  branch = "release-1.16"
--  name = "k8s.io/kubectl"
--
--[[override]]
--  branch = "release-1.16"
--  name = "k8s.io/cli-runtime"
--
--[[override]]
--  version = "2.0.3"
--  name = "sigs.k8s.io/kustomize"
--
--# ASCIIRenderer does not implement blackfriday.Renderer
--[[override]]
--  name = "github.com/russross/blackfriday"
--  version = "1.5.2"
-- 
--[[override]]
--  branch = "release-13.0"
--  name = "k8s.io/client-go"
--
--[[override]]
--  name = "github.com/casbin/casbin"
--  version = "1.9.1"
--
--[[constraint]]
--  name = "github.com/stretchr/testify"
--  version = "1.2.2"
--
--[[constraint]]
--  name = "github.com/gobuffalo/packr"
--  version = "v1.11.0"
--
--[[constraint]]
--  branch = "master"
--  name = "github.com/argoproj/pkg"
--
--[[constraint]]
--  branch = "master"
--  name = "github.com/yudai/gojsondiff"
--
--# Fixes: Could not introduce sigs.k8s.io/kustomize@v2.0.3, as it has a dependency on github.com/spf13/cobra with constraint ^0.0.2, which has no overlap with existing constraint 0.0.5 from (root)
--[[override]]
--  name = "github.com/spf13/cobra"
--  revision = "0.0.5"
--
--# TODO: move off of k8s.io/kube-openapi and use controller-tools for CRD spec generation
--# (override argoproj/argo contraint on master)
--[[override]]
--  revision = "30be4d16710ac61bce31eb28a01054596fe6a9f1"
--  name = "k8s.io/kube-openapi"
--
--# jsonpatch replace operation does not apply: doc is missing key: /metadata/annotations
--[[override]]
--  name = "github.com/evanphx/json-patch"
--  version = "v4.1.0"
-diff --git a/go.mod b/go.mod
-new file mode 100644
-index 00000000..2e741ab3
---- /dev/null
-+++ b/go.mod
-@@ -0,0 +1,114 @@
-+module github.com/argoproj/argo-cd
-+
-+go 1.12
-+
-+require (
-+	bou.ke/monkey v1.0.1
-+	github.com/Masterminds/semver v1.4.2
-+	github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d
-+	github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4
-+	github.com/casbin/casbin v1.9.1
-+	github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect
-+	github.com/coreos/go-oidc v2.1.0+incompatible
-+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-+	github.com/docker/docker v1.6.0-rc5 // indirect
-+	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
-+	github.com/dustin/go-humanize v1.0.0
-+	github.com/evanphx/json-patch v4.5.0+incompatible
-+	github.com/ghodss/yaml v1.0.0
-+	github.com/go-openapi/loads v0.19.2
-+	github.com/go-openapi/runtime v0.19.0
-+	github.com/go-openapi/spec v0.19.2
-+	github.com/go-redis/cache v6.3.5+incompatible
-+	github.com/go-redis/redis v6.15.1+incompatible
-+	github.com/gobuffalo/packr v1.11.0
-+	github.com/gobwas/glob v0.2.3
-+	github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2
-+	github.com/gogo/protobuf v1.3.1
-+	github.com/golang/protobuf v1.3.1
-+	github.com/google/btree v1.0.0 // indirect
-+	github.com/google/go-cmp v0.3.1 // indirect
-+	github.com/google/go-jsonnet v0.10.0
-+	github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf
-+	github.com/googleapis/gnostic v0.1.0 // indirect
-+	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
-+	github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79
-+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
-+	github.com/grpc-ecosystem/grpc-gateway v1.3.1
-+	github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a
-+	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
-+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-+	github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8 // indirect
-+	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
-+	github.com/patrickmn/go-cache v2.1.0+incompatible
-+	github.com/pkg/errors v0.8.1
-+	github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d // indirect
-+	github.com/prometheus/client_golang v0.9.2
-+	github.com/robfig/cron v1.1.0
-+	github.com/rs/cors v1.6.0 // indirect
-+	github.com/sirupsen/logrus v1.4.2
-+	github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c
-+	github.com/soheilhy/cmux v0.1.4
-+	github.com/spf13/cobra v0.0.5
-+	github.com/spf13/pflag v1.0.5
-+	github.com/stretchr/testify v1.3.0
-+	github.com/vmihailenco/msgpack v3.3.1+incompatible
-+	github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c
-+	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
-+	github.com/yudai/pp v2.0.1+incompatible // indirect
-+	github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4
-+	golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
-+	golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
-+	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
-+	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-+	google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873
-+	google.golang.org/grpc v1.23.0
-+	gopkg.in/go-playground/webhooks.v5 v5.11.0
-+	gopkg.in/src-d/go-git.v4 v4.9.1
-+	gopkg.in/yaml.v2 v2.2.8
-+	k8s.io/api v0.0.0
-+	k8s.io/apiextensions-apiserver v0.0.0
-+	k8s.io/apimachinery v0.16.5-beta.1
-+	k8s.io/cli-runtime v0.0.0
-+	k8s.io/client-go v0.0.0
-+	k8s.io/klog v1.0.0
-+	k8s.io/kube-aggregator v0.0.0
-+	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
-+	k8s.io/kubectl v0.0.0
-+	k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f
-+	k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6
-+	layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427
-+)
-+
-+replace (
-+	k8s.io/api => k8s.io/api v0.0.0-20200131112707-d64dbec685a4
-+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e
-+	k8s.io/apimachinery => k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9
-+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20200208192130-2d005a048922
-+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442
-+	k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
-+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20200131203752-f498d522efeb
-+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20200131121422-fc6110069b18
-+	k8s.io/code-generator => k8s.io/code-generator v0.16.7-beta.0.0.20200131112027-a3045e5e55c0
-+	k8s.io/component-base => k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd
-+	k8s.io/cri-api => k8s.io/cri-api v0.16.8-beta.0
-+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20200131121824-f033562d74c3
-+	k8s.io/gengo => k8s.io/gengo v0.0.0-20190822140433-26a664648505
-+	k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
-+	k8s.io/klog => k8s.io/klog v0.4.0
-+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007
-+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20200131121224-13b3f231e47d
-+	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
-+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20200131120626-5b8ba5e54e1f
-+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20200131121024-5f0ba0866863
-+	k8s.io/kubectl => k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f
-+	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20200131120825-905bd8eea4c4
-+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20200208200602-3a1c7effd2b3
-+	k8s.io/metrics => k8s.io/metrics v0.0.0-20200131120008-5c623d74062d
-+	k8s.io/node-api => k8s.io/node-api v0.0.0-20200131122255-04077c800298
-+	k8s.io/repo-infra => k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3
-+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20200208192953-f8dc80bbc173
-+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20200131120425-dca0863cb511
-+	k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20200131115407-2b45fb79af22
-+	k8s.io/utils => k8s.io/utils v0.0.0-20190801114015-581e00157fb1
-+)
-diff --git a/go.sum b/go.sum
-new file mode 100644
-index 00000000..3d39244f
---- /dev/null
-+++ b/go.sum
-@@ -0,0 +1,700 @@
-+bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM=
-+bou.ke/monkey v1.0.1 h1:zEMLInw9xvNakzUUPjfS4Ds6jYPqCFx3m7bRmG5NH2U=
-+bou.ke/monkey v1.0.1/go.mod h1:FgHuK96Rv2Nlf+0u1OOVDpCMdsWyOFmeeketDHE7LIg=
-+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-+cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo=
-+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-+github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
-+github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-+github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
-+github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
-+github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-+github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-+github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc=
-+github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8=
-+github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-+github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
-+github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-+github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14=
-+github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA=
-+github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
-+github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
-+github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU=
-+github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
-+github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
-+github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
-+github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
-+github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
-+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
-+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-+github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
-+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
-+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-+github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg=
-+github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d h1:WtAMR0fPCOfK7TPGZ8ZpLLY18HRvL7XJ3xcs0wnREgo=
-+github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d/go.mod h1:WML6KOYjeU8N6YyusMjj2qRvaPNUEvrQvaxuFcMRFJY=
-+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
-+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
-+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
-+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-+github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4 h1:ykGEoo3WuCNoqO+rnaa0j/RdYfXZFp5Aqim+CjzdBaQ=
-+github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4/go.mod h1:2EZ44RG/CcgtPTwrRR0apOc7oU6UIw8GjCUJWZ8X3bM=
-+github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
-+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-+github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM=
-+github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-+github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e/go.mod h1:uHBSeeATKpVazAACZBDPL/Nk/UhQDDsJWDlqYJo8/Us=
-+github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
-+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
-+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-+github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU=
-+github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-+github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
-+github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ4uw0RzP1E=
-+github.com/casbin/casbin v1.9.1 h1:ucjbS5zTrmSLtH4XogqOG920Poe6QatdXtz1FEbApeM=
-+github.com/casbin/casbin v1.9.1/go.mod h1:z8uPsfBJGUsnkagrt3G8QvjgTKFMBJ32UP8HpZllfog=
-+github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
-+github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY=
-+github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
-+github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U=
-+github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
-+github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho=
-+github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
-+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-+github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
-+github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0=
-+github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
-+github.com/container-storage-interface/spec v1.1.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
-+github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
-+github.com/containerd/containerd v1.0.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
-+github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
-+github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
-+github.com/coredns/corefile-migration v1.0.2/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E=
-+github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
-+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-+github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
-+github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM=
-+github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
-+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-+github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-+github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-+github.com/coreos/rkt v1.30.0/go.mod h1:O634mlH6U7qk87poQifK6M2rsFNt+FyUTWNMnP1hF1U=
-+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
-+github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
-+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-+github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
-+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-+github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
-+github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
-+github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-+github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-+github.com/docker/docker v1.6.0-rc5 h1:8dnqiCOcZf2QXwR4LNnG7AK9hXeeT6adGmtjicsVswc=
-+github.com/docker/docker v1.6.0-rc5/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-+github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-+github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-+github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8=
-+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
-+github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
-+github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
-+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e h1:p1yVGRW3nmb85p1Sh1ZJSDm4A4iKLS5QNbvUHMgGu/M=
-+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-+github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
-+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-+github.com/emirpasic/gods v1.9.0 h1:rUF4PuzEjMChMiNsVjdI+SyLu7rEqpQ5reNFnhC7oFo=
-+github.com/emirpasic/gods v1.9.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
-+github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw=
-+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-+github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
-+github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-+github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
-+github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
-+github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
-+github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
-+github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
-+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
-+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-+github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
-+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-+github.com/gliderlabs/ssh v0.1.1 h1:j3L6gSLQalDETeEg/Jg0mGY0/y/N6zI2xX1978P0Uqw=
-+github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-+github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
-+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-+github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M=
-+github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
-+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
-+github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
-+github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
-+github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
-+github.com/go-openapi/analysis v0.19.2 h1:ophLETFestFZHk3ji7niPEL4d466QjW+0Tdg5VyDq7E=
-+github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
-+github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-+github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-+github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY=
-+github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
-+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
-+github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
-+github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
-+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
-+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
-+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
-+github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
-+github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
-+github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
-+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
-+github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-+github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-+github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-+github.com/go-openapi/loads v0.19.2 h1:rf5ArTHmIJxyV5Oiks+Su0mUens1+AjpkPoWr5xFRcI=
-+github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
-+github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
-+github.com/go-openapi/runtime v0.19.0 h1:sU6pp4dSV2sGlNKKyHxZzi1m1kG4WnYtWcJ+HYbygjE=
-+github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
-+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
-+github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
-+github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
-+github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE=
-+github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
-+github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
-+github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
-+github.com/go-openapi/strfmt v0.19.0 h1:0Dn9qy1G9+UJfRU7TR8bmdGxb4uifB7HNrJjOnV0yPk=
-+github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
-+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
-+github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
-+github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
-+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
-+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-+github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
-+github.com/go-openapi/validate v0.19.2 h1:ky5l57HjyVRrsJfd2+Ro5Z9PjGuKbsmftwyMtk8H7js=
-+github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
-+github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
-+github.com/go-redis/cache v6.3.5+incompatible h1:4OUyoXXYRRQ6tKA4ue3TlPUkBzk3occzjtXBZBxCzgs=
-+github.com/go-redis/cache v6.3.5+incompatible/go.mod h1:XNnMdvlNjcZvHjsscEozHAeOeSE5riG9Fj54meG4WT4=
-+github.com/go-redis/redis v6.15.1+incompatible h1:BZ9s4/vHrIqwOb0OPtTQ5uABxETJ3NRuUNoSUurnkew=
-+github.com/go-redis/redis v6.15.1+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-+github.com/gobuffalo/packr v1.11.0 h1:lxysfHcxVCWGNMHzKABP7ZEL3A7iIVYfkev/D7AR0aM=
-+github.com/gobuffalo/packr v1.11.0/go.mod h1:rYwMLC6NXbAbkKb+9j3NTKbxSswkKLlelZYccr4HYVw=
-+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
-+github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-+github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
-+github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2 h1:BbwX8wsMRDZRdNYxAna+4ls3wvMKJyn4PT6Zk1CPxP4=
-+github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2/go.mod h1:cY2AIrMgHm6oOHmR7jY+9TtjzSjQ3iG7tURJG3Y6XH0=
-+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
-+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
-+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8=
-+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
-+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-+github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
-+github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
-+github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
-+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
-+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-+github.com/google/cadvisor v0.34.0/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1sTX6NE48=
-+github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
-+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
-+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-+github.com/google/go-jsonnet v0.10.0 h1:NzmG/5DRTYDjNnsL/OmX6wT+ByeKbSoRoV6VxOy+QdM=
-+github.com/google/go-jsonnet v0.10.0/go.mod h1:gVu3UVSfOt5fRFq+dh9duBqXa5905QY8S1QvMNcEIVs=
-+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
-+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
-+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-+github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf h1:7+FW5aGwISbqUtkfmIpZJGRgNFg2ioYPvFaUxdqpDsg=
-+github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE=
-+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
-+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-+github.com/googleapis/gnostic v0.1.0 h1:rVsPeBmXbYv4If/cumu1AzZPwV58q433hvONV1UEZoI=
-+github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-+github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
-+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-+github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-+github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
-+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-+github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-+github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
-+github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-+github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79 h1:lR9ssWAqp9qL0bALxqEEkuudiP1eweOdv9jsRK3e7lE=
-+github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
-+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
-+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-+github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
-+github.com/grpc-ecosystem/grpc-gateway v1.3.1 h1:k2neygAEBYavP90THffKBVlkASdxu4XiI8cAWuL3MG0=
-+github.com/grpc-ecosystem/grpc-gateway v1.3.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
-+github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-+github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-+github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
-+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-+github.com/heketi/heketi v9.0.0+incompatible/go.mod h1:bB9ly3RchcQqsQ9CpyaQwvva7RS5ytVoSoholZQON6o=
-+github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413/go.mod h1:BeS3M108VzVlmAue3lv2WcGuPAX94/KN63MUURzbYSI=
-+github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4=
-+github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64/go.mod h1:RYlF4ghFZPPmk2TC5REt5OFwvfb6lzxFWrTWB+qs28s=
-+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-+github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=
-+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-+github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a h1:RweVA0vnEyStwtAelyGmnU8ENDnwd1Q7pQr7U3J/rXo=
-+github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a/go.mod h1:6hRR09jOEG81ADP5wCQju1z71g6OL4eEvELdran/3cs=
-+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
-+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
-+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-+github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8=
-+github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-+github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
-+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-+github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
-+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM=
-+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
-+github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
-+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
-+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-+github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e h1:RgQk53JHp/Cjunrr1WlsXSZpqXn+uREuHvUVcK82CV8=
-+github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-+github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
-+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
-+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-+github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
-+github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=
-+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
-+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
-+github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
-+github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA=
-+github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod h1:JpH9J1c9oX6otFSgdUHwUBUizmKlrMjxWnIAjff4m04=
-+github.com/lucas-clemente/quic-clients v0.1.0/go.mod h1:y5xVIEoObKqULIKivu+gD/LU90pL73bTdtQjPBvtCBk=
-+github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H70QZ/CXoxqw9bzao=
-+github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58=
-+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-+github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-+github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
-+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-+github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8 h1:A6SLdFpRzUUF5v9F/7T1fu3DERmOCgTwwP6x54eyFfU=
-+github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8/go.mod h1:UtpLyb/EupVKXF/N0b4NRe1DNg+QYJsnsHQ038romhM=
-+github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
-+github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
-+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-+github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI=
-+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-+github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
-+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
-+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-+github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4=
-+github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
-+github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-+github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-+github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY=
-+github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
-+github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-+github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
-+github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
-+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-+github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
-+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-+github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
-+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
-+github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0=
-+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-+github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU=
-+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
-+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-+github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
-+github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
-+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-+github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
-+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-+github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
-+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-+github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
-+github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
-+github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-+github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-+github.com/opencontainers/selinux v1.2.2/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=
-+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
-+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
-+github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA=
-+github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
-+github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-+github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
-+github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-+github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
-+github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d h1:7gXyC293Lsm2YWgQ+0uaAFFFDO82ruiQSwc3ua+Vtlc=
-+github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
-+github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
-+github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
-+github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
-+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
-+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
-+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
-+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-+github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
-+github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
-+github.com/robfig/cron v1.1.0 h1:jk4/Hud3TTdcrJgUOBgsqrZBarcxl6ADIjSC2iniwLY=
-+github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
-+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-+github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI=
-+github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
-+github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto=
-+github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-+github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
-+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-+github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-+github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
-+github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
-+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-+github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
-+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
-+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-+github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c h1:fyKiXKO1/I/B6Y2U8T7WdQGWzwehOuGIrljPtt7YTTI=
-+github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
-+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-+github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-+github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-+github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E=
-+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-+github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
-+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
-+github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-+github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
-+github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
-+github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
-+github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY=
-+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
-+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
-+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-+github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
-+github.com/thecodeteam/goscaleio v0.1.0/go.mod h1:68sdkZAsK8bvEwBlbQnlLS+xU+hvLYM/iQ8KXej1AwM=
-+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
-+github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
-+github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
-+github.com/vmihailenco/msgpack v3.3.1+incompatible h1:ibe+d1lqocBmxbJ+gwcDO8LpAHFr3PGDYovoURuTVGk=
-+github.com/vmihailenco/msgpack v3.3.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
-+github.com/vmware/govmomi v0.20.1/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
-+github.com/xanzy/ssh-agent v0.2.0 h1:Adglfbi5p9Z0BmK2oKU9nTG+zKfniSfnaMYB+ULd+Ro=
-+github.com/xanzy/ssh-agent v0.2.0/go.mod h1:0NyE30eGUDliuLEHJgYte/zncp2zdTStcOnWhgSqHD8=
-+github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-+github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8=
-+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-+github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c h1:/8Xb/f8s2/ZZpzMzBkFwW2Jvj7Pglk+AW8m8FFqOoIQ=
-+github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
-+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
-+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
-+github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI=
-+github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
-+github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4 h1:1yOVVSFiradDwXpgdkDjlGOcGJqcohH/W49Zn8Ywgco=
-+github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4/go.mod h1:fFiAh+CowNFr0NK5VASokuwKwkbacRmHsVA7Yb1Tqac=
-+go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-+go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-+go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-+go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-+golang.org/x/crypto v0.0.0-20180426230345-b49d69b5da94/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-+golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-+golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-+golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-+golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0=
-+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-+golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-+golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-+golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
-+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
-+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
-+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20181004145325-8469e314837c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
-+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
-+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-+golang.org/x/tools v0.0.0-20170824195420-5d2fd3ccab98/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-+golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-+golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-+gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
-+gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
-+gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
-+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-+google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4=
-+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-+google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
-+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg=
-+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-+google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=
-+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-+gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
-+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
-+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-+gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
-+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
-+gopkg.in/go-playground/webhooks.v5 v5.11.0 h1:V3vej+ZXrVvO2EmBTKlhClEbpTqXH44K5OyLUMOkHMg=
-+gopkg.in/go-playground/webhooks.v5 v5.11.0/go.mod h1:LZbya/qLVdbqDR1aKrGuWV6qbia2zCYSR5dpom2SInQ=
-+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
-+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-+gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U=
-+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
-+gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA=
-+gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-+gopkg.in/src-d/go-billy.v4 v4.2.1 h1:omN5CrMrMcQ+4I8bJ0wEhOBPanIRWzFC953IiXKdYzo=
-+gopkg.in/src-d/go-billy.v4 v4.2.1/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk=
-+gopkg.in/src-d/go-git-fixtures.v3 v3.1.1 h1:XWW/s5W18RaJpmo1l0IYGqXKuJITWRFuA45iOf1dKJs=
-+gopkg.in/src-d/go-git-fixtures.v3 v3.1.1/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
-+gopkg.in/src-d/go-git.v4 v4.9.1 h1:0oKHJZY8tM7B71378cfTg2c5jmWyNlXvestTT6WfY+4=
-+gopkg.in/src-d/go-git.v4 v4.9.1/go.mod h1:Vtut8izDyrM8BUVQnzJ+YvmNcem2J89EmfZYCkLokZk=
-+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-+gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-+gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
-+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-+gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
-+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
-+gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpAriY=
-+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-+honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-+k8s.io/api v0.0.0-20200131112707-d64dbec685a4 h1:7kA/ATNKWB1TVM0pwxzl/JONybbBVROCxqndoCd57fU=
-+k8s.io/api v0.0.0-20200131112707-d64dbec685a4/go.mod h1:SGkmWEIoDg63In+t6yMJLEXQSkK5XxTNDcVydoy58dc=
-+k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e h1:L/XqOouONrybm+3jyUJZPo5JIMARb5qFNfmmUqy81Eg=
-+k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e/go.mod h1:YzEcimsSKeVDDQnLTI9Qf8uws94WpMl4qut8Rbx4dVk=
-+k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9 h1:pusQlPC9d40F13jjdYyJDFDwnUjCTDN5P/y5WteLVkA=
-+k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9/go.mod h1:Xk2vD2TRRpuWYLQNM6lT9R7DSFZUYG03SarNkbGrnKE=
-+k8s.io/apiserver v0.0.0-20200208192130-2d005a048922 h1:kgU/Yr5/GsGK3GAaFgmSp+y0IMLu+FoZK+wnKlgzIrQ=
-+k8s.io/apiserver v0.0.0-20200208192130-2d005a048922/go.mod h1:kcWyL8/bV2c1b/FeWrxbO08zraTaYuhR7leZ4l9iOmo=
-+k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442 h1:gHF/ZIm6hTWAuN/rKdH1IO/iJfKPjn0d1kdeIMbPiDg=
-+k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442/go.mod h1:sL3otDuOz8AlMrzsrBeB/ektmi6qYAE4a9Gid/pxtSo=
-+k8s.io/client-go v0.0.0-20191016111102-bec269661e48 h1:C2XVy2z0dV94q9hSSoCuTPp1KOG7IegvbdXuz9VGxoU=
-+k8s.io/client-go v0.0.0-20191016111102-bec269661e48/go.mod h1:hrwktSwYGI4JK+TJA3dMaFyyvHVi/aLarVHpbs8bgCU=
-+k8s.io/cloud-provider v0.0.0-20200131203752-f498d522efeb/go.mod h1:hb9XI7OCOFjqueeUaUYHbEuGG/nSq0UZtydmOu83p6M=
-+k8s.io/cluster-bootstrap v0.0.0-20200131121422-fc6110069b18/go.mod h1:2U3dLDmef+EIuACENgQ1f8jQV//Z+aX/bp9DsglDXK0=
-+k8s.io/code-generator v0.16.7-beta.0.0.20200131112027-a3045e5e55c0/go.mod h1:wFdrXdVi/UC+xIfLi+4l9elsTT/uEF61IfcN2wOLULQ=
-+k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd h1:W0AuOSSgValfdhcR68oayHewqFJh/nMA+JDPQbXGrkg=
-+k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd/go.mod h1:55xG5ozAlA2bbjfmFYC2LPf4cQqp4nOJT5e4+cXUDnY=
-+k8s.io/cri-api v0.16.8-beta.0/go.mod h1:W6aMMPN5fmxcRGaHnb6BEfoTeS82OsJcsUJyKf+EWYc=
-+k8s.io/csi-translation-lib v0.0.0-20200131121824-f033562d74c3/go.mod h1:2NVc4Xw5CEBgQj3/GtHOKPs5M68nhbszaFFuoB+xGUE=
-+k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-+k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
-+k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
-+k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
-+k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007 h1:PqWgdqcu7/ZAno0sqGoqo3eC/qhwnz+XTotZfG+84ic=
-+k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007/go.mod h1:u6psj4FzpmwlJuQKReXypLOIhIF2UxzZRBThWtnjIDU=
-+k8s.io/kube-controller-manager v0.0.0-20200131121224-13b3f231e47d/go.mod h1:rlvqwtZiupLrqd54U19Th2a0sMf0PNbGA1J3zPTwFAc=
-+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ=
-+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
-+k8s.io/kube-proxy v0.0.0-20200131120626-5b8ba5e54e1f/go.mod h1:3/a8cJm4V50vBnkRwRhpgdIdsTH+4cj/kV66oxybGxc=
-+k8s.io/kube-scheduler v0.0.0-20200131121024-5f0ba0866863/go.mod h1:1xme9q7fNwDPtgIELmyOFGQErlOzFlQ1XHjTPUz1GYc=
-+k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f h1:7764TWFJ+UYY6TX1Vq3jCo/3BkORLtywarY8SEdQh18=
-+k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f/go.mod h1:d78MZ7MR2Q5xMwSrGvbJARH13CsOo5mSoDZWfjIe1TQ=
-+k8s.io/kubelet v0.0.0-20200131120825-905bd8eea4c4/go.mod h1:VkwV80jJy9GciSRBPFduby5qJxI5v5lV3D6WMMCveek=
-+k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f h1:bGmDtZ96ysKXeBFw0+9cw9twoCQjrPRkkpSQqhxEXVs=
-+k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f/go.mod h1:OdJXH1Q9L+NDVj158Zo8f6R3NSaOx1ewLUcaJv8hSRE=
-+k8s.io/legacy-cloud-providers v0.0.0-20200208200602-3a1c7effd2b3/go.mod h1:Egd+aHCesdnzDDtUaaWnAhnyt5/dgQIfM4UL5z2WJxg=
-+k8s.io/metrics v0.0.0-20200131120008-5c623d74062d/go.mod h1:18pR44uxuhPU05LZpHhJiPPzQvGoFmCf2UlTp2EhSM8=
-+k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3/go.mod h1:+G1xBfZDfVFsm1Tj/HNCvg4QqWx8rJ2Fxpqr1rqp/gQ=
-+k8s.io/sample-apiserver v0.0.0-20200208192953-f8dc80bbc173/go.mod h1:Bnw1dM0HuYH49aVse0I8cV6KeyOFPBaWxnhsU7uR2UA=
-+k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE=
-+k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
-+layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427 h1:RZkKxMR3jbQxdCEcglq3j7wY3PRJIopAwBlx1RE71X0=
-+layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427/go.mod h1:ivKkcY8Zxw5ba0jldhZCYYQfGdb2K6u9tbYK1AwMIBc=
-+modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
-+modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
-+modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
-+modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
-+modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
-+sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
-+sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
-+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
-+sigs.k8s.io/structured-merge-diff v1.0.2/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
-+sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
-+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-+vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=

From 3bf8df2877f0eb0bdbd265c8aa96dbd3db8f1e8e Mon Sep 17 00:00:00 2001
From: Luz <luz666@daum.net>
Date: Thu, 5 Nov 2020 19:14:58 +0100
Subject: [PATCH 1855/3942] librepcb: 0.1.4 -> 0.1.5

---
 .../applications/science/electronics/librepcb/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index de01b095e381..494a5cf2931b 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -1,15 +1,15 @@
 { lib, mkDerivation, fetchFromGitHub, qtbase, qttools, qmake, wrapQtAppsHook }:
 
-mkDerivation {
+mkDerivation rec {
   pname = "librepcb";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "LibrePCB";
     repo = "LibrePCB";
     fetchSubmodules = true;
-    rev = "ae04eef5a71b5ba66ae2cee6b631c1c933ace535";
-    sha256 = "0wk5qny1jb6n4mwyyrs7syir3hmwxlwazcd80bpxharmsj7p0rzc";
+    rev = version;
+    sha256 = "0ag8h3id2c1k9ds22rfrvyhf2vjhkv82xnrdrz4n1hnlr9566vcx";
   };
 
   enableParallelBuilding = true;

From 947d21ca71330925a23d3a84b4ec8cd9a1c64fe2 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Thu, 5 Nov 2020 09:09:15 -0600
Subject: [PATCH 1856/3942] lazygit: 0.23.6 -> 0.23.7

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

diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
index 65c3a194897e..f92eaf3ebf8f 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "lazygit";
-  version = "0.23.6";
+  version = "0.23.7";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0afs3h8npbzmcrzm6kzfdva5id3zyifhhsh7zgyrxkmw60qhl498";
+    sha256 = "05s0rj785dm9dqr30ak5hi26qy0z2w71zljyln5is4frckxkcvng";
   };
 
   vendorSha256 = null;

From 6780f45bc16ff03cb110bc56448424b4cf483871 Mon Sep 17 00:00:00 2001
From: Sebastien Braun <sebastien@sebbraun.de>
Date: Thu, 5 Nov 2020 15:12:30 +0100
Subject: [PATCH 1857/3942] elixir_1_11: 1.11.1 -> 1.11.2

---
 pkgs/development/interpreters/elixir/1.11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/1.11.nix b/pkgs/development/interpreters/elixir/1.11.nix
index 3dcd8c19ba84..8f9d869abf3c 100644
--- a/pkgs/development/interpreters/elixir/1.11.nix
+++ b/pkgs/development/interpreters/elixir/1.11.nix
@@ -3,7 +3,7 @@
 # How to obtain `sha256`:
 # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
 mkDerivation {
-  version = "1.11.1";
-  sha256 = "0czyv98sq9drlvdwv3gw9vnhn8qa3va4xh5vdqpg7m6b93l1r3p1";
+  version = "1.11.2";
+  sha256 = "0b4nfgxhmi4gwba9h9k103zrkpbxxvk0gmdl0ggrd5xlg6v288ky";
   minimumOTPVersion = "21";
 }

From b5ca1a173104157e32798a9a7a3b13924e745ab0 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Thu, 5 Nov 2020 07:34:56 +0000
Subject: [PATCH 1858/3942] json_c: 0.14 -> 0.15

https://github.com/json-c/json-c/blob/json-c-0.15-20200726/ChangeLog
---
 pkgs/development/libraries/json-c/default.nix | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix
index 164f7c44ba9d..d72d50214348 100644
--- a/pkgs/development/libraries/json-c/default.nix
+++ b/pkgs/development/libraries/json-c/default.nix
@@ -1,20 +1,13 @@
-{ stdenv, fetchurl, fetchpatch, cmake }:
+{ stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "json-c-0.14";
-  src = fetchurl {
-    url    = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz";
-    sha256 = "1yia8417qljmczs9w3rn4c4i2p2iywq098pgrj11s81599j4x4cr";
-  };
+  pname = "json-c";
+  version = "0.15";
 
-  patches = [
-    # https://nvd.nist.gov/vuln/detail/CVE-2020-12762
-    (fetchpatch {
-      name = "CVE-2020-12762.patch";
-      url = "https://github.com/json-c/json-c/commit/5d6fa331418d49f1bd488553fd1cfa9ab023fabb.patch";
-      sha256 = "0aar7kgbycqxnhh0lrr61adfbb903nbapalhs5i6h8anxwy1ylcm";
-    })
-  ];
+  src = fetchurl {
+    url    = "https://s3.amazonaws.com/json-c_releases/releases/${pname}-${version}.tar.gz";
+    sha256 = "1im484iz08j3gmzpw07v16brwq46pxxj65i996kkp2vivcfhmn5q";
+  };
 
   outputs = [ "out" "dev" ];
 

From 286a2017865ab4bf3241cfffa7fed2e3af0ce160 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Thu, 5 Nov 2020 01:35:49 +0000
Subject: [PATCH 1859/3942] wireshark: 3.2.7 -> 3.4.0

https://www.wireshark.org/docs/relnotes/wireshark-3.2.8.html
https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html
---
 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 e9f676eae558..d906b4459009 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -10,7 +10,7 @@ assert withQt  -> qt5  != null;
 with stdenv.lib;
 
 let
-  version = "3.2.7";
+  version = "3.4.0";
   variant = if withQt then "qt" else "cli";
   pcap = libpcap.override { withBluez = stdenv.isLinux; };
 
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "1nkhglzxj05hwhgzrgan4glv0z67rmasf9djx1dmqicwdnw2z0xy";
+    sha256 = "1bm8jj2rviis9j9l6nixvhxcfx362y9iphkxssgmiz2kj6yypr37";
   };
 
   cmakeFlags = [

From 576a9287941b279fff9684013266bf89aeb68a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 2 Nov 2020 12:26:49 +0100
Subject: [PATCH 1860/3942] vim: Get rid of Python 2 dependency

---
 nixos/doc/manual/release-notes/rl-2103.xml     |  5 +++++
 pkgs/applications/editors/vim/configurable.nix | 15 +++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 8c804ce0470d..087931f2d1ff 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -143,6 +143,11 @@
      <link xlink:href="http://www.mutt.org/relnotes/2.0/">release notes for Mutt 2.0</link>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      <literal>vim</literal> switched to Python 3, dropping all Python 2 support.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 77d7ca983cdd..aa8120470d14 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -1,5 +1,5 @@
 { source ? "default", callPackage, stdenv, ncurses, pkgconfig, gettext
-, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby
+, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python3, perl, tcl, ruby
 , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
 , libICE
 , vimPlugins
@@ -62,8 +62,6 @@ let
 
   common = callPackage ./common.nix {};
 
-  isPython3 = python.isPy3 or false;
-
 in stdenv.mkDerivation rec {
 
   pname = "vim_configurable";
@@ -106,9 +104,10 @@ in stdenv.mkDerivation rec {
     "--with-luajit"
   ]
   ++ stdenv.lib.optionals pythonSupport [
-    "--enable-python${if isPython3 then "3" else ""}interp=yes"
-    "--with-python${if isPython3 then "3" else ""}-config-dir=${python}/lib"
-    "--disable-python${if (!isPython3) then "3" else ""}interp"
+    "--enable-python3interp=yes"
+    "--with-python3-config-dir=${python3}/lib"
+    # Disables Python 2
+    "--disable-pythoninterp"
   ]
   ++ stdenv.lib.optional nlsSupport          "--enable-nls"
   ++ stdenv.lib.optional perlSupport         "--enable-perlinterp"
@@ -134,7 +133,7 @@ in stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11
     ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ]
     ++ stdenv.lib.optional luaSupport lua
-    ++ stdenv.lib.optional pythonSupport python
+    ++ stdenv.lib.optional pythonSupport python3
     ++ stdenv.lib.optional tclSupport tcl
     ++ stdenv.lib.optional rubySupport ruby;
 
@@ -163,7 +162,7 @@ in stdenv.mkDerivation rec {
 
     ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc
   '' + stdenv.lib.optionalString wrapPythonDrv ''
-    wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin"
+    wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin"
   '' + stdenv.lib.optionalString (guiSupport == "gtk3") ''
 
     rewrap () {

From 1c9efa61b4ea26ef4c9500050bc839611a185a47 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Thu, 5 Nov 2020 05:32:28 +0900
Subject: [PATCH 1861/3942] mrsh: 2020-07-27 -> 2020-11-04

Reference: https://github.com/emersion/mrsh/compare/0da902c0ee...1738e41b2a
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 pkgs/shells/mrsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix
index cc7e3e27be6d..c72f23c143b0 100644
--- a/pkgs/shells/mrsh/default.nix
+++ b/pkgs/shells/mrsh/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname   = "mrsh";
-  version = "2020-07-27";
+  version = "2020-11-04";
 
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "mrsh";
-    rev = "0da902c0ee6f443fe703498e60f266af7f12537e";
-    sha256 = "1yr09ln5p1s48aj8xv2d6dy0pahqvd86fkiwyc6zrjfq80igxf05";
+    rev = "1738e41b2a35e5f99b9a1300a5f687478458226a";
+    sha256 = "08gak5261d4sd6b2w2kscmdwa4gwcp5drgfyb3swyrj9cl0nlcbn";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];

From 0f6b72ead8fb92a0f000c34de42fdeb32e45f66b Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 4 Nov 2020 13:49:19 +0100
Subject: [PATCH 1862/3942] elisa: build requires Qt5.14

---
 pkgs/applications/kde/elisa.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix
index bd2cd529473e..9a51aa786fac 100644
--- a/pkgs/applications/kde/elisa.nix
+++ b/pkgs/applications/kde/elisa.nix
@@ -3,6 +3,7 @@
 , lib
 , extra-cmake-modules
 , kdoctools
+, qtbase
 , qtmultimedia
 , qtquickcontrols2
 , qtwebsockets
@@ -42,5 +43,6 @@ mkDerivation rec {
     description = "A simple media player for KDE";
     license = licenses.gpl3;
     maintainers = with maintainers; [ peterhoeg ];
+    broken = lib.versionOlder qtbase.version "5.14";
   };
 }

From 0c441e26d0866b1fc8a1694fe548e8d6fe274fbd Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 4 Nov 2020 13:49:32 +0100
Subject: [PATCH 1863/3942] kwave: build requires Qt5.14

---
 pkgs/applications/kde/kwave.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix
index 78a3d9ab4a54..1a831c7c8dd8 100644
--- a/pkgs/applications/kde/kwave.nix
+++ b/pkgs/applications/kde/kwave.nix
@@ -1,14 +1,17 @@
-{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig, kcrash, kiconthemes, kio, audiofile, libsamplerate
-, alsaLib, libpulseaudio, flac, id3lib, libogg, libmad, libopus, libvorbis, fftw, librsvg }:
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig
+, kcrash, kiconthemes, kio, audiofile, libsamplerate, alsaLib, libpulseaudio, flac, id3lib
+, libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }:
 
 mkDerivation {
   name = "kwave";
+
   meta = with lib; {
     homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave";
     description = "A simple media player";
     maintainers = with maintainers; [ freezeboy ];
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
+    broken = lib.versionOlder qtbase.version "5.14";
   };
   nativeBuildInputs = [
     extra-cmake-modules

From 4039c1125560a0a09be255965b5024c4de57cb4f Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 4 Nov 2020 13:49:42 +0100
Subject: [PATCH 1864/3942] minuet: build requires Qt5.14

---
 pkgs/applications/kde/minuet.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix
index cd98d56b86dd..2c0f0a5092d8 100644
--- a/pkgs/applications/kde/minuet.nix
+++ b/pkgs/applications/kde/minuet.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ mkDerivation, qtbase
 , lib, extra-cmake-modules, gettext, python
 , drumstick, fluidsynth
 , kcoreaddons, kcrash, kdoctools
@@ -10,6 +10,7 @@ mkDerivation {
   meta = with lib; {
     license = with licenses; [ lgpl21 gpl3 ];
     maintainers = with maintainers; [ peterhoeg HaoZeke ];
+    broken = lib.versionOlder qtbase.version "5.14";
   };
 
   nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python qtdeclarative ];

From 10af77af13f7fb9865b68fe3b57ad70802bc0294 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 4 Nov 2020 09:33:35 +0000
Subject: [PATCH 1865/3942] qgis: 3.10.10 -> 3.10.11

---
 pkgs/applications/gis/qgis/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index da66b0d9d252..13990c338751 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -10,7 +10,7 @@ let
     [ qscintilla-qt5 gdal jinja2 numpy psycopg2
       chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
 in mkDerivation rec {
-  version = "3.10.10";
+  version = "3.10.11";
   pname = "qgis";
   name = "${pname}-unwrapped-${version}";
 
@@ -18,7 +18,7 @@ in mkDerivation rec {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "yZBG+bpJA7iKkUEjVo45d+bmRp9WS7mk8z96FLf0ZQ0=";
+    sha256 = "157hwi9sgnsf0csbfg4x3c7vh0zgf1hnqgn04lhg9xa1n8jjbv2q";
   };
 
   passthru = {

From ce438bd47196ca61fa2b0ffd4757495d8b12d1fb Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Mon, 9 Nov 2020 21:12:54 +0900
Subject: [PATCH 1866/3942] opencv: unbreak 2.4.13.7

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 pkgs/development/libraries/opencv/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 67c00839b358..56414cfa3979 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -87,6 +87,5 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     maintainers = with maintainers; [ ];
     platforms = platforms.linux;
-    broken = true;
   };
 }

From b2a20c2a5158db6840f6efb944999b92337e040c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Nov 2020 13:46:23 +0100
Subject: [PATCH 1867/3942] nats-server: 2.1.7 -> 2.1.9

Fixes: CVE-2020-26521, CVE-2020-26892
---
 pkgs/servers/nats-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix
index b0ae2ebc2dc9..d24fe89cc48e 100644
--- a/pkgs/servers/nats-server/default.nix
+++ b/pkgs/servers/nats-server/default.nix
@@ -4,7 +4,7 @@ with lib;
 
 buildGoPackage rec {
   pname   = "nats-server";
-  version = "2.1.7";
+  version = "2.1.9";
 
   goPackagePath = "github.com/nats-io/${pname}";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "nats-io";
     repo   = pname;
-    sha256 = "08wqaqar964p9adc0ma8dqg0rf88rylk1m2mddlbbqmd6l4h6m27";
+    sha256 = "0y92isca1dlvprik0lbiz8ny1w84svy4zn73brqhzrkxnqppcxi2";
   };
 
   meta = {

From d1de45ad619be065294fdd9692a268ea1863b083 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 3 Nov 2020 00:52:05 +0100
Subject: [PATCH 1868/3942] fluent-bit: fix build on darwin

---
 pkgs/tools/misc/fluent-bit/default.nix             |  2 ++
 pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 51b58a8102de..0f67ab84d443 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake flex bison ];
 
+  patches = [ ./fix-luajit-darwin.patch ];
+
   postPatch = ''
     substituteInPlace src/CMakeLists.txt \
       --replace /lib/systemd $out/lib/systemd
diff --git a/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch b/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch
new file mode 100644
index 000000000000..21d9c21f5b9b
--- /dev/null
+++ b/pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch
@@ -0,0 +1,14 @@
+diff -Naur fluent-bit.old/cmake/luajit.cmake fluent-bit.new/cmake/luajit.cmake
+--- fluent-bit.old/cmake/luajit.cmake
++++ fluent-bit.new/cmake/luajit.cmake
+@@ -11,10 +11,6 @@
+ set(LUAJIT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${FLB_PATH_LIB_LUAJIT})
+ set(LUAJIT_DEST ${CMAKE_CURRENT_BINARY_DIR})
+ 
+-if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+-  set(CFLAGS "${CFLAGS} -isysroot ${CMAKE_OSX_SYSROOT}")
+-endif()
+-
+ # luajit (UNIX)
+ # =============
+ ExternalProject_Add(luajit

From 734434c1d8e599ede444bf1e058ab3eba0fd7305 Mon Sep 17 00:00:00 2001
From: Diego Rodriguez <diego@noteable.io>
Date: Mon, 2 Nov 2020 12:56:20 -0700
Subject: [PATCH 1869/3942] minikube: 1.14.1 -> 1.14.2

---
 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 299c1fb523c5..134d25ae678e 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "minikube";
-  version = "1.14.1";
+  version = "1.14.2";
 
   vendorSha256 = "057mlmja3mygfdf0cp0bcm0chq7s30bjcs5hqacwl6c79ivrjf89";
 
@@ -21,7 +21,7 @@ buildGoModule rec {
     owner = "kubernetes";
     repo = "minikube";
     rev = "v${version}";
-    sha256 = "000i30qsjx1h2x6b8vb5piq9lhjrz5hj9wza7gxsrzsf2z9rhryg";
+    sha256 = "1fidvfm9x3rbqfjn9zm5kx9smk94dmjm4gb98rrdmgsld5fg99xj";
   };
 
   nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];

From 4365578bdf945936e9c8eefc46614ccadf0e32b8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 05:57:01 +0000
Subject: [PATCH 1870/3942] groovy: 3.0.3 -> 3.0.6

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

diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index 97e997bdd693..d075eb4e3f1c 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "groovy";
-  version = "3.0.3";
+  version = "3.0.6";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
-    sha256 = "0xdm70b61pdj8z3g08az16y9b6cpz5hv7iwvwfyfyxrjdi47h419";
+    sha256 = "1wimpcg4nyxykbkh407d7h0b828vmrf7sv412mgmif57p3aw433f";
   };
 
   buildInputs = [ unzip makeWrapper ];

From 58f024530a5482759295c282acb99da8efc1ee11 Mon Sep 17 00:00:00 2001
From: Hunter Jones <hjones2199@gmail.com>
Date: Sun, 1 Nov 2020 13:14:33 -0600
Subject: [PATCH 1871/3942] indilib: 1.1.0 -> 1.8.6

---
 maintainers/maintainer-list.nix               |  6 +++++
 .../development/libraries/indilib/default.nix | 26 ++++++++++++-------
 .../libraries/indilib/udev-dir.patch          | 23 ++++++++--------
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4bee75ed035e..48f847b3d197 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3493,6 +3493,12 @@
     email = "t@larkery.com";
     name = "Tom Hinton";
   };
+  hjones2199 = {
+    email = "hjones2199@gmail.com";
+    github = "hjones2199";
+    githubId = 5525217;
+    name = "Hunter Jones";
+  };
   hkjn = {
     email = "me@hkjn.me";
     name = "Henrik Jonsson";
diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix
index fadd2657b688..212b2f743d37 100644
--- a/pkgs/development/libraries/indilib/default.nix
+++ b/pkgs/development/libraries/indilib/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchurl
+, fetchFromGitHub
 , cmake
 , cfitsio
 , libusb1
@@ -9,14 +9,18 @@
 , curl
 , libjpeg
 , gsl
+, fftw
 }:
 
-stdenv.mkDerivation {
-  name = "indilib-1.1.0";
+stdenv.mkDerivation rec {
+  pname = "indilib";
+  version = "1.8.6";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/indi/libindi_1.1.0.tar.gz";
-    sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w";
+  src = fetchFromGitHub {
+    owner = "indilib";
+    repo = "indi";
+    rev = "v${version}";
+    sha256 = "1yzvcm7lwhwssnvv6gp8f7igmnvs35bpidmzz6z15awm5841yw30";
   };
 
   patches = [
@@ -36,12 +40,14 @@ stdenv.mkDerivation {
     libnova
     libjpeg
     gsl
+    fftw
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://www.indilib.org/";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    description = "Implementaion of the INDI protocol for POSIX operating systems";
-    platforms = stdenv.lib.platforms.unix;
+    description = "Implementation of the INDI protocol for POSIX operating systems";
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ hjones2199 ];
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/libraries/indilib/udev-dir.patch b/pkgs/development/libraries/indilib/udev-dir.patch
index 0f497419e706..701680012914 100644
--- a/pkgs/development/libraries/indilib/udev-dir.patch
+++ b/pkgs/development/libraries/indilib/udev-dir.patch
@@ -1,12 +1,11 @@
-diff -Naur libindi-1.0.0-upstream/CMakeLists.txt libindi-1.0.0/CMakeLists.txt
---- libindi-1.0.0-upstream/CMakeLists.txt	2015-03-28 21:06:49.576863460 -0430
-+++ libindi-1.0.0/CMakeLists.txt	2015-03-28 21:07:48.420677548 -0430
-@@ -28,7 +28,7 @@
- ## the following are directories where stuff will be installed to
- set(INCLUDE_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/include/")
- set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/")
--set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
-+set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
- 
- ##################  Includes  ################################
- Include (CheckCXXSourceCompiles)
+--- indi-1.8.6/CMakeLists.txt	2020-08-21 05:56:59.000000000 -0500
++++ CMakeLists.txt	2020-11-01 12:50:57.621293870 -0600
+@@ -77,7 +77,7 @@
+ ## the following are directories where stuff will be installed to
+ set(INCLUDE_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/include/")
+ set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
+-set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
++set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
+ 
+ set(PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+ 

From 5041cbc69114ddb049997f84afb20fa00d7211e5 Mon Sep 17 00:00:00 2001
From: Hunter Jones <hjones2199@gmail.com>
Date: Mon, 2 Nov 2020 18:34:55 -0600
Subject: [PATCH 1872/3942] kstars: 2.9.8 -> 3.4.3

---
 .../science/astronomy/kstars/default.nix      | 37 ++++++++------
 .../science/astronomy/kstars/indi-fix.patch   | 50 +++++++++++++++++++
 2 files changed, 72 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/applications/science/astronomy/kstars/indi-fix.patch

diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix
index 0b53e3e85ac3..fde8df610485 100644
--- a/pkgs/applications/science/astronomy/kstars/default.nix
+++ b/pkgs/applications/science/astronomy/kstars/default.nix
@@ -1,27 +1,30 @@
 {
-  mkDerivation, lib, fetchgit,
-  extra-cmake-modules,
+  stdenv, extra-cmake-modules, fetchurl,
 
   kconfig, kdoctools, kguiaddons, ki18n, kinit, kiconthemes, kio,
-  knewstuff, kplotting, kwidgetsaddons, kxmlgui,
+  knewstuff, kplotting, kwidgetsaddons, kxmlgui, wrapQtAppsHook,
 
   qtx11extras, qtwebsockets,
 
   eigen, zlib,
 
-  cfitsio, indilib, xplanet
+  cfitsio, indilib, xplanet, libnova, gsl
 }:
 
-mkDerivation {
-  name = "kstars";
-  
-  src = fetchgit {
-    url = "https://anongit.kde.org/kstars.git";
-    rev = "7acc527939280edd22823371dc4e22494c6c626a";
-    sha256 = "1n1lgi7p3dj893fdnzjbnrha40p4apl0dy8zppcabxwrb1khb84v";
+stdenv.mkDerivation rec {
+  pname = "kstars";
+  version = "3.4.3";
+
+  src = fetchurl {
+    url = "https://mirrors.mit.edu/kde/stable/kstars/kstars-${version}.tar.xz";
+    sha256 = "0j5yxg6ay6sic194skz6vjzg6yvrpb3gvypvs0frjrcjbsl1j4f8";
   };
-  
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+
+  patches = [
+    ./indi-fix.patch
+  ];
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ];
   buildInputs = [
     kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio
     knewstuff kplotting kwidgetsaddons kxmlgui
@@ -30,10 +33,14 @@ mkDerivation {
 
     eigen zlib
 
-    cfitsio indilib xplanet
+    cfitsio indilib xplanet libnova gsl
   ];
 
-  meta = with lib; {
+  cmakeFlags = [
+    "-DINDI_NIX_ROOT=${indilib}"
+  ];
+
+  meta = with stdenv.lib; {
     description = "Virtual planetarium astronomy software";
     homepage = "https://kde.org/applications/education/org.kde.kstars";
     longDescription = ''
diff --git a/pkgs/applications/science/astronomy/kstars/indi-fix.patch b/pkgs/applications/science/astronomy/kstars/indi-fix.patch
new file mode 100644
index 000000000000..9ff9f8a31dd3
--- /dev/null
+++ b/pkgs/applications/science/astronomy/kstars/indi-fix.patch
@@ -0,0 +1,50 @@
+--- CMakeLists.txt	2020-11-02 13:58:06.119743710 -0600
++++ kstars-3.4.3/CMakeLists.txt	2020-11-02 14:05:01.707799274 -0600
+@@ -4,5 +4,7 @@
+ set (KStars_VERSION_REVISION 3)
+ set (CMAKE_CXX_STANDARD 11)
+ 
++add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT})
++
+ # Build KStars Lite with -DBUILD_KSTARS_LITE=ON
+ option(BUILD_KSTARS_LITE "Build KStars Lite" OFF)
+
+--- ksutils.cpp	2020-11-02 13:47:44.883596916 -0600
++++ kstars-3.4.3/kstars/auxiliary/ksutils.cpp	2020-11-02 17:41:44.961937090 -0600
+@@ -1076,6 +1076,9 @@
+ {
+     QString snap = QProcessEnvironment::systemEnvironment().value("SNAP");
+     QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST");
++#define STR_EXPAND(x) #x
++#define STR(x) STR_EXPAND(x)
++    QString nix = QString(STR(INDI_NIX_ROOT));
+ 
+     if (option == "fitsDir")
+     {
+@@ -1089,7 +1091,7 @@
+         if (flat.isEmpty() == false)
+             return flat + "/bin/indiserver";
+         else
+-            return snap + "/usr/bin/indiserver";
++            return nix + "/bin/indiserver";
+     }
+     else if (option == "INDIHubAgent")
+     {
+@@ -1099,7 +1101,7 @@
+         if (flat.isEmpty() == false)
+             return flat + "/bin/indihub-agent";
+         else
+-            return snap + "/usr/bin/indihub-agent";
++            return nix + "/bin/indihub-agent";
+     }
+     else if (option == "indiDriversDir")
+     {
+@@ -1109,7 +1111,7 @@
+         if (flat.isEmpty() == false)
+             return flat + "/share/indi";
+         else
+-            return snap + "/usr/share/indi";
++            return nix + "/share/indi";
+ #else
+         return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory);
+ #endif

From d52578bd31f0c73666749328054f52e13d9d2d26 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Mon, 9 Nov 2020 20:33:23 +0800
Subject: [PATCH 1873/3942] rust-analyzer: fix update script with unstable nix

---
 pkgs/development/tools/rust/rust-analyzer/update.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh
index b0435be72083..f08ea67cf22d 100755
--- a/pkgs/development/tools/rust/rust-analyzer/update.sh
+++ b/pkgs/development/tools/rust/rust-analyzer/update.sh
@@ -24,24 +24,24 @@ echo "$old_rev -> $rev"
 
 sha256=$(nix-prefetch -f "$nixpkgs" rust-analyzer-unwrapped.src --rev "$rev")
 # Clear cargoSha256 to avoid inconsistency.
-sed -e "s/rev = \".*\"/rev = \"$rev\"/" \
-    -e "s/sha256 = \".*\"/sha256 = \"$sha256\"/" \
-    -e "s/cargoSha256 = \".*\"/cargoSha256 = \"\"/" \
+sed -e "s#rev = \".*\"#rev = \"$rev\"#" \
+    -e "s#sha256 = \".*\"#sha256 = \"$sha256\"#" \
+    -e "s#cargoSha256 = \".*\"#cargoSha256 = \"\"#" \
     --in-place ./default.nix
 node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code"
 
 # Check vscode compatibility
 req_vscode_ver="$(jq '.engines.vscode' "$node_src/package.json" --raw-output)"
 req_vscode_ver="${req_vscode_ver#^}"
-cur_vscode_ver="$(nix eval --raw -f "$nixpkgs" vscode.version)"
-if [[ "$(nix eval "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then
+cur_vscode_ver="$(nix-instantiate --eval --strict "$nixpkgs" -A vscode.version | tr -d '"')"
+if [[ "$(nix-instantiate --eval --strict -E "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then
     echo "vscode $cur_vscode_ver is incompatible with the extension requiring ^$req_vscode_ver"
     exit 1
 fi
 
 echo "Prebuilding for cargoSha256"
 cargo_sha256=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).rust-analyzer-unwrapped.cargoDeps.overrideAttrs (_: { outputHash = sha256; })")
-sed "s/cargoSha256 = \".*\"/cargoSha256 = \"$cargo_sha256\"/" \
+sed "s#cargoSha256 = \".*\"#cargoSha256 = \"$cargo_sha256\"#" \
     --in-place ./default.nix
 
 # Update vscode extension

From 4894ffd62022b10a6c52b1623d7b389507407cfd Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Mon, 9 Nov 2020 20:33:37 +0800
Subject: [PATCH 1874/3942] rust-analyzer: 2020-11-02 -> 2020-11-09

---
 pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index b77ff811c702..a398b7e504df 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -2,10 +2,10 @@
 
 {
   rust-analyzer-unwrapped = callPackage ./generic.nix rec {
-    rev = "2020-11-02";
+    rev = "2020-11-09";
     version = "unstable-${rev}";
-    sha256 = "1f64286ywsjw9s8kai3jw2dqnqswm2vnms6ilxx1x706mridxjv0";
-    cargoSha256 = "0q53w43gag2pfb20jywikdbac291rvr1zmjnmwq462m5wfz0w127";
+    sha256 = "sha256-SX9dvx2JtYZBxA3+dHQKX/jrjbAMy37/SAybDjlYcSs=";
+    cargoSha256 = "sha256-+td+wMmI+MyGz9oPC+SPO2TmAV0+3lOORNY7xf6s3vI=";
   };
 
   rust-analyzer = callPackage ./wrapper.nix {} {

From 445dde63041d516195926d2a2358541f9fbc8b7e Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Wed, 4 Nov 2020 21:13:06 +0700
Subject: [PATCH 1875/3942] Initial implementation of mmix cross-compile

---
 lib/systems/doubles.nix                       |  3 ++
 lib/systems/examples.nix                      |  5 +++
 lib/systems/inspect.nix                       |  1 +
 lib/systems/parse.nix                         | 33 ++++++++------
 lib/tests/systems.nix                         |  6 ++-
 .../bintools-wrapper/default.nix              |  1 +
 pkgs/development/tools/mmixware/default.nix   | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 8 files changed, 79 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/tools/mmixware/default.nix

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 517a7296afd2..d8bfc48a96f8 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -36,6 +36,8 @@ let
     "riscv64-none" "riscv32-none"
     "vc4-none"
 
+    "mmix-mmixware"
+
     "js-ghcjs"
 
     "aarch64-genode" "i686-genode" "x86_64-genode"
@@ -56,6 +58,7 @@ in {
   i686          = filterDoubles predicates.isi686;
   x86_64        = filterDoubles predicates.isx86_64;
   mips          = filterDoubles predicates.isMips;
+  mmix          = filterDoubles predicates.isMmix;
   riscv         = filterDoubles predicates.isRiscV;
   vc4           = filterDoubles predicates.isVc4;
   js            = filterDoubles predicates.isJavaScript;
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 87c05a0b0524..c869429d3ae7 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -109,6 +109,11 @@ rec {
     platform = platforms.riscv-multiplatform "32";
   };
 
+  mmix = {
+    config = "mmix-unknown-mmixware";
+    libc = "newlib";
+  };
+
   msp430 = {
     config = "msp430-elf";
     libc = "newlib";
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 8fa630572509..7adbc98f9a9d 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -17,6 +17,7 @@ rec {
     isAarch32      = { cpu = { family = "arm"; bits = 32; }; };
     isAarch64      = { cpu = { family = "arm"; bits = 64; }; };
     isMips         = { cpu = { family = "mips"; }; };
+    isMmix         = { cpu = { family = "mmix"; }; };
     isRiscV        = { cpu = { family = "riscv"; }; };
     isSparc        = { cpu = { family = "sparc"; }; };
     isWasm         = { cpu = { family = "wasm"; }; };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 6bd44a007466..6ba3c40c665a 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -93,6 +93,8 @@ rec {
     mips64   = { bits = 64; significantByte = bigEndian;    family = "mips"; };
     mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
 
+    mmix     = { bits = 64; significantByte = bigEndian;    family = "mmix"; };
+
     powerpc  = { bits = 32; significantByte = bigEndian;    family = "power"; };
     powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; };
     powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; };
@@ -268,19 +270,20 @@ rec {
   kernels = with execFormats; with kernelFamilies; setTypes types.openKernel {
     # TODO(@Ericson2314): Don't want to mass-rebuild yet to keeping 'darwin' as
     # the nnormalized name for macOS.
-    macos   = { execFormat = macho;   families = { inherit darwin; }; name = "darwin"; };
-    ios     = { execFormat = macho;   families = { inherit darwin; }; };
-    freebsd = { execFormat = elf;     families = { inherit bsd; }; };
-    linux   = { execFormat = elf;     families = { }; };
-    netbsd  = { execFormat = elf;     families = { inherit bsd; }; };
-    none    = { execFormat = unknown; families = { }; };
-    openbsd = { execFormat = elf;     families = { inherit bsd; }; };
-    solaris = { execFormat = elf;     families = { }; };
-    wasi    = { execFormat = wasm;    families = { }; };
-    redox   = { execFormat = elf;     families = { }; };
-    windows = { execFormat = pe;      families = { }; };
-    ghcjs   = { execFormat = unknown; families = { }; };
-    genode  = { execFormat = elf;     families = { }; };
+    macos    = { execFormat = macho;   families = { inherit darwin; }; name = "darwin"; };
+    ios      = { execFormat = macho;   families = { inherit darwin; }; };
+    freebsd  = { execFormat = elf;     families = { inherit bsd; }; };
+    linux    = { execFormat = elf;     families = { }; };
+    netbsd   = { execFormat = elf;     families = { inherit bsd; }; };
+    none     = { execFormat = unknown; families = { }; };
+    openbsd  = { execFormat = elf;     families = { inherit bsd; }; };
+    solaris  = { execFormat = elf;     families = { }; };
+    wasi     = { execFormat = wasm;    families = { }; };
+    redox    = { execFormat = elf;     families = { }; };
+    windows  = { execFormat = pe;      families = { }; };
+    ghcjs    = { execFormat = unknown; families = { }; };
+    genode   = { execFormat = elf;     families = { }; };
+    mmixware = { execFormat = unknown; families = { }; };
   } // { # aliases
     # 'darwin' is the kernel for all of them. We choose macOS by default.
     darwin = kernels.macos;
@@ -382,7 +385,7 @@ rec {
       else if (elemAt l 1) == "elf"
         then { cpu = elemAt l 0; vendor = "unknown";  kernel = "none";     abi = elemAt l 1; }
       else   { cpu = elemAt l 0;                      kernel = elemAt l 1;                   };
-    "3" = # Awkwards hacks, beware!
+    "3" = # Awkward hacks, beware!
       if elemAt l 1 == "apple"
         then { cpu = elemAt l 0; vendor = "apple";    kernel = elemAt l 2;                   }
       else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu")
@@ -393,6 +396,8 @@ rec {
         then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "wasi";                       }
       else if (elemAt l 2 == "redox")
         then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "redox";                      }
+      else if (elemAt l 2 == "mmixware")
+        then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "mmixware";                   }
       else if hasPrefix "netbsd" (elemAt l 2)
         then { cpu = elemAt l 0; vendor = elemAt l 1;    kernel = elemAt l 2;                }
       else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index f691b2da3165..eed7ee725bc4 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -11,12 +11,14 @@ let
     expr     = lib.sort lib.lessThan x;
     expected = lib.sort lib.lessThan y;
   };
-in with lib.systems.doubles; lib.runTests {
-  testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ js ++ genode ++ redox);
+in
+with lib.systems.doubles; lib.runTests {
+  testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox);
 
   testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-none" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
   testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
   testmips = mseteq mips [ "mipsel-linux" ];
+  testmmix = mseteq mmix [ "mmix-mmixware" ];
   testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
 
   testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 786f0f9c5983..9c5aef135fd6 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -179,6 +179,7 @@ stdenv.mkDerivation {
           mips64   = "btsmip";
           mips64el = "ltsmip";
         }.${targetPlatform.parsed.cpu.name}
+      else if targetPlatform.isMmix then "mmix"
       else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc"
       else if targetPlatform.isSparc then "sparc"
       else if targetPlatform.isMsp430 then "msp430"
diff --git a/pkgs/development/tools/mmixware/default.nix b/pkgs/development/tools/mmixware/default.nix
new file mode 100644
index 000000000000..0b0d394b4e1e
--- /dev/null
+++ b/pkgs/development/tools/mmixware/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitLab, tetex }:
+
+stdenv.mkDerivation {
+  pname = "mmixware";
+  version = "unstable-2019-02-19";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.lrz.de";
+    owner = "mmix";
+    repo = "mmixware";
+    rev = "a330d68aafcfe739ecaaece888a669b8e7d9bcb8";
+    sha256 = "0bq0d19vqhfbpk4mcqzmd0hygbkhapl1mzlfkcr6afx0fhlhi087";
+  };
+
+  hardeningDisable = [ "format" ];
+
+  postPatch = ''
+    substituteInPlace Makefile --replace 'rm abstime.h' ""
+  '';
+
+  nativeBuildInputs = [ tetex ];
+  enableParallelBuilding = true;
+
+  makeFlags = [ "all" "doc" "CFLAGS=-O2" ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/doc
+    cp *.ps $out/share/doc
+    install -Dm755 mmixal -t $out/bin
+    install -Dm755 mmix -t $out/bin
+    install -Dm755 mmotype -t $out/bin
+    install -Dm755 mmmix -t $out/bin
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description  = "MMIX simulator and assembler";
+    homepage     = "https://www-cs-faculty.stanford.edu/~knuth/mmix-news.html";
+    maintainers  = with maintainers; [ siraben ];
+    platforms    = platforms.unix;
+    license      = licenses.publicDomain;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d017efe6dfb1..e67708b4255f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5642,6 +5642,8 @@ in
 
   mmake = callPackage ../tools/misc/mmake { };
 
+  mmixware = callPackage ../development/tools/mmixware { };
+
   modemmanager = callPackage ../tools/networking/modem-manager {};
 
   modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {};

From 8e7fca3a5ce218f61728a2d9af688c41d1f5c972 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 9 Nov 2020 14:00:18 +0100
Subject: [PATCH 1876/3942] nixos/plymouth: fix eval with aliases disabled

Fallout from https://github.com/NixOS/nixpkgs/pull/101369
---
 nixos/modules/system/boot/plymouth.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 55e5b07ed615..ddf5ef8a0a6a 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -9,7 +9,7 @@ let
 
   cfg = config.boot.plymouth;
 
-  nixosBreezePlymouth = pkgs.breeze-plymouth.override {
+  nixosBreezePlymouth = pkgs.plasma5.breeze-plymouth.override {
     logoFile = cfg.logo;
     logoName = "nixos";
     osName = "NixOS";

From b8884815dd2abfd5ad0513894a7b51d60969eeee Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 9 Nov 2020 14:02:59 +0100
Subject: [PATCH 1877/3942] gnome3.totem: clean up

* format with nixpkgs-fmt
* reorder attributes to more cannonical order
* narrow patchShebangs attributes
* add hooks to checkPhase
* correct license
---
 pkgs/desktops/gnome-3/core/totem/default.nix | 99 ++++++++++++++++----
 1 file changed, 81 insertions(+), 18 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index e59265e79de6..db060bd85ff2 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -1,9 +1,34 @@
-{ stdenv, fetchurl, meson, ninja, gettext, gst_all_1
-, clutter-gtk, clutter-gst, python3Packages, shared-mime-info
-, pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser
-, wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins
-, libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas
-, gdk-pixbuf, tracker, nautilus, xvfb_run }:
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, gettext
+, gst_all_1
+, clutter-gtk
+, clutter-gst
+, python3Packages
+, shared-mime-info
+, pkgconfig
+, gtk3
+, glib
+, gobject-introspection
+, totem-pl-parser
+, wrapGAppsHook
+, itstool
+, libxml2
+, vala
+, gnome3
+, grilo
+, grilo-plugins
+, libpeas
+, adwaita-icon-theme
+, gnome-desktop
+, gsettings-desktop-schemas
+, gdk-pixbuf
+, tracker
+, nautilus
+, xvfb_run
+}:
 
 stdenv.mkDerivation rec {
   pname = "totem";
@@ -14,16 +39,48 @@ stdenv.mkDerivation rec {
     sha256 = "0bs33ijvxbr2prb9yj4dxglsszslsn9k258n311sld84masz4ad8";
   };
 
-  doCheck = true;
+  nativeBuildInputs = [
+    meson
+    ninja
+    vala
+    pkgconfig
+    gettext
+    python3Packages.python
+    itstool
+    gobject-introspection
+    wrapGAppsHook
+  ];
 
-  nativeBuildInputs = [ meson ninja vala pkgconfig gettext python3Packages.python itstool gobject-introspection wrapGAppsHook ];
   buildInputs = [
-    gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins
-    gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-    gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas shared-mime-info
-    gdk-pixbuf libxml2 adwaita-icon-theme gnome-desktop
-    gsettings-desktop-schemas tracker nautilus
-    python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins
+    gtk3
+    glib
+    grilo
+    clutter-gtk
+    clutter-gst
+    totem-pl-parser
+    grilo-plugins
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-ugly
+    gst_all_1.gst-libav
+    libpeas
+    shared-mime-info
+    gdk-pixbuf
+    libxml2
+    adwaita-icon-theme
+    gnome-desktop
+    gsettings-desktop-schemas
+    tracker
+    nautilus
+    # for plug-ins
+    python3Packages.pygobject3
+    python3Packages.dbus-python
+  ];
+
+  checkInputs = [
+    xvfb_run
   ];
 
   mesonFlags = [
@@ -31,16 +88,22 @@ stdenv.mkDerivation rec {
     "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
   ];
 
+  doCheck = true;
+
   postPatch = ''
     chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file
-    patchShebangs .
+    patchShebangs \
+      ./meson_compile_python.py \
+      ./meson_post_install.py
   '';
 
-  checkInputs = [ xvfb_run ];
-
   checkPhase = ''
+    runHook preCheck
+
     xvfb-run -s '-screen 0 800x600x24' \
       ninja test
+
+    runHook postCheck
   '';
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
@@ -56,7 +119,7 @@ stdenv.mkDerivation rec {
     homepage = "https://wiki.gnome.org/Apps/Videos";
     description = "Movie player for the GNOME desktop based on GStreamer";
     maintainers = teams.gnome.members;
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins
     platforms = platforms.linux;
   };
 }

From 4fdf368360a6fb999a21ced398a96f029f5c3438 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 9 Nov 2020 14:16:14 +0100
Subject: [PATCH 1878/3942] gnome3.totem: disable tests

They do not work with GStreamer 1.18.
https://gitlab.gnome.org/GNOME/totem/-/issues/450
---
 pkgs/desktops/gnome-3/core/totem/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index db060bd85ff2..204dd41aeff1 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -88,7 +88,9 @@ stdenv.mkDerivation rec {
     "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
   ];
 
-  doCheck = true;
+  # Tests do not work with GStreamer 1.18.
+  # https://gitlab.gnome.org/GNOME/totem/-/issues/450
+  doCheck = false;
 
   postPatch = ''
     chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file

From 099bb158f91ff67a3c2fa637cb533b44cf17a7da Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 9 Nov 2020 14:26:52 +0100
Subject: [PATCH 1879/3942] gnome3.totem: remove unneeded deps

* properties panel was moved to Nautilus proper
* tracker is used only indirectly through grilo
---
 pkgs/desktops/gnome-3/core/totem/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 204dd41aeff1..58ee706b1cfc 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -25,8 +25,6 @@
 , gnome-desktop
 , gsettings-desktop-schemas
 , gdk-pixbuf
-, tracker
-, nautilus
 , xvfb_run
 }:
 
@@ -72,8 +70,6 @@ stdenv.mkDerivation rec {
     adwaita-icon-theme
     gnome-desktop
     gsettings-desktop-schemas
-    tracker
-    nautilus
     # for plug-ins
     python3Packages.pygobject3
     python3Packages.dbus-python

From 2f5593b3a39b1f94e21511f79839b79e25a6d2e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Mon, 9 Nov 2020 14:36:21 +0100
Subject: [PATCH 1880/3942] kodi: 18.8 -> 18.9

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

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index fcbb546a1fa1..a60250ee0ff1 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -45,14 +45,14 @@ assert useWayland -> wayland != null && wayland-protocols != null && waylandpp !
 
 let
   kodiReleaseDate = "20200728";
-  kodiVersion = "18.8";
+  kodiVersion = "18.9";
   rel = "Leia";
 
   kodi_src = fetchFromGitHub {
     owner  = "xbmc";
     repo   = "xbmc";
     rev    = "${kodiVersion}-${rel}";
-    sha256 = "0qpkpz43s207msvv3qkiy6vzqwcgmydxv3py7vc29mv6h30chrva";
+    sha256 = "0nnf7823pixj6n2fkjc8rbdjwayvhlbglij2by4rnjzzfgmqmw20";
   };
 
   cmakeProto = fetchurl {

From f59f04352aace7ba228695de0ec8e716ce82134f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 7 Jun 2020 10:19:16 +0300
Subject: [PATCH 1881/3942] ruby: Rename removeReferencesToCC flag to
 `!jitSupport`

If JIT support is built in to ruby, there's no choice other then to
leave this cc reference as is. removeReferencesToCC didn't do it's job
completely since some time ago. That's why it was practically redundant
- `lib/ruby/${version}/<platform>/rbconfig.rb` still referenced cc.
Removing this reference from
`lib/ruby/${version}/<platform>/rbconfig.rb` as well might lead to
breakage in some Gems that require this feature.

But, if JIT support is not desired, it should be safe enough to
completely remove all cc references, both in
lib/ruby/${version}/<platform>/rbconfig.rb and in $out/lib/libruby.so .
Hence now `rubyMinimal` has JIT support disabled and it has no
references at all to stdenv.cc.
---
 .../development/interpreters/ruby/default.nix | 28 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 189be8945fa9..ec65eaad8ce3 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -44,11 +44,23 @@ let
       , groff, docSupport ? true
       , libyaml, yamlSupport ? true
       , libffi, fiddleSupport ? true
-      # ruby -e "puts RbConfig::CONFIG['configure_args']"
-      # puts a reference to the C compiler in the binary.
-      # This might be required by some gems at runtime,
-      # but we allow to strip it out for smaller closure size.
-      , removeReferencesTo, removeReferenceToCC ? true
+      # By default, ruby has 3 observed references to stdenv.cc:
+      #
+      # - If you run:
+      #     ruby -e "puts RbConfig::CONFIG['configure_args']"
+      # - In:
+      #     $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
+      #   Or (usually):
+      #     $(nix-build -A ruby)/lib/ruby/2.6.0/x86_64-linux/rbconfig.rb
+      # - In $out/lib/libruby.so and/or $out/lib/libruby.dylib
+      #
+      # Since some Gems require JIT support, there's probably no
+      # escape from this reference. Hence, it was decided to enable this
+      # feature by default, as it's enabled by default by ruby's ./configure
+      # script. We do disable this feature though for the other cc references
+      # in all of the locations given above for the `rubyMinimal` build defined
+      # in all-packages.nix.
+      , removeReferencesTo, jitSupport ? true
       , autoreconfHook, bison, autoconf
       , buildEnv, bundler, bundix
       , libiconv, libobjc, libunwind, Foundation
@@ -121,6 +133,7 @@ let
 
         configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby-${version}"]
           ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
+          ++ op (!jitSupport) "--disable-jit-support"
           ++ op (!docSupport) "--disable-install-doc"
           ++ ops stdenv.isDarwin [
             # on darwin, we have /usr/include/tk.h -- so the configure script detects
@@ -157,11 +170,14 @@ let
           # Remove unnecessary groff reference from runtime closure, since it's big
           sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
           ${
-            lib.optionalString removeReferenceToCC ''
+            lib.optionalString (!jitSupport) ''
               # Get rid of the CC runtime dependency
               ${removeReferencesTo}/bin/remove-references-to \
                 -t ${stdenv.cc} \
                 $out/lib/libruby*
+              ${removeReferencesTo}/bin/remove-references-to \
+                -t ${stdenv.cc} \
+                $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
             ''
           }
           # Bundler tries to create this directory
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f06713de0a5..db6e59c003fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10548,6 +10548,7 @@ in
   rubyMinimal = ruby.override {
     # gem support is minimal overhead
     rubygemsSupport = true;
+    jitSupport = false;
     useRailsExpress = false;
     zlibSupport = false;
     opensslSupport = false;

From 9db44f61a78a3a1fea720de7465787383a52d010 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 13 Jun 2020 10:55:58 +0300
Subject: [PATCH 1882/3942] rubyMinimal: remove

Due to being unused, and seemingly unusable, added appropriate release
notes.
---
 nixos/doc/manual/release-notes/rl-2103.xml     | 12 ++++++++++++
 pkgs/development/interpreters/ruby/default.nix |  5 ++---
 pkgs/top-level/aliases.nix                     |  1 +
 pkgs/top-level/all-packages.nix                | 14 --------------
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 709b2ba5228f..f857f1e28b79 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -89,6 +89,18 @@
      user D-Bus session available also for non-graphical logins.
     </para>
    </listitem>
+   <listitem>
+     <para>
+       <literal>rubyMinimal</literal> was removed due to being unused and
+       unusable. The default ruby interpreter includes JIT support, which makes
+       it reference it's compiler. Since JIT support is probably needed by some
+       Gems, it was decided to enable this feature with all cc references by
+       default, and allow to build a Ruby derivation without references to cc,
+       by setting <literal>jitSupport = false;</literal> in an overlay. See
+       <link xlink:href="https://github.com/NixOS/nixpkgs/pull/90151">#90151</link>
+       for more info.
+     </para>
+   </listitem>
    <listitem>
     <para>
      The option <option>fonts.enableFontDir</option> has been renamed to
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index ec65eaad8ce3..cfd5c7e5180e 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -57,9 +57,8 @@ let
       # Since some Gems require JIT support, there's probably no
       # escape from this reference. Hence, it was decided to enable this
       # feature by default, as it's enabled by default by ruby's ./configure
-      # script. We do disable this feature though for the other cc references
-      # in all of the locations given above for the `rubyMinimal` build defined
-      # in all-packages.nix.
+      # script. If you'd like to have a ruby without reference to cc, setting
+      # jitSupport to false should remove all known references mentioned above.
       , removeReferencesTo, jitSupport ? true
       , autoreconfHook, bison, autoconf
       , buildEnv, bundler, bundix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f8228f457012..cebec0d5e52c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -501,6 +501,7 @@ mapAliases ({
   ruby_2_5_0 = throw "ruby_2_5_0 was deprecated on 2018-02-13: use a newer version of ruby";
   rubyPackages_2_4 = throw "rubyPackages_2_4 was deprecated in 2019-12: use a newer version of rubyPackages instead";
   rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby";
+  rubyMinimal = throw "rubyMinimal was removed due to being unused";
   rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
   rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
   urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db6e59c003fb..8eae90ddc4c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10545,20 +10545,6 @@ in
     ruby_2_6
     ruby_2_7;
 
-  rubyMinimal = ruby.override {
-    # gem support is minimal overhead
-    rubygemsSupport = true;
-    jitSupport = false;
-    useRailsExpress = false;
-    zlibSupport = false;
-    opensslSupport = false;
-    gdbmSupport = false;
-    cursesSupport = false;
-    docSupport = false;
-    yamlSupport = false;
-    fiddleSupport = false;
-  };
-
   ruby = ruby_2_6;
   rubyPackages = rubyPackages_2_6;
 

From 30b932e46b13a9ad6640c0429c97c2af20458228 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 9 Nov 2020 14:25:24 +0000
Subject: [PATCH 1883/3942] =?UTF-8?q?glib:=202.66.1=20=E2=86=92=202.66.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes compatibility with recent tzdata.

https://ftp.gnome.org/pub/GNOME/sources/glib/2.66/glib-2.66.2.news
---
 pkgs/development/libraries/glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 5a498991c670..de874a798b2b 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -45,11 +45,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "glib";
-  version = "2.66.1";
+  version = "2.66.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0q7g70j6vjvcw4xf6bbfkm4j6mradcabdcdcy4gs5hxwkzkgysd2";
+    sha256 = "1i0pd8y6xz64qlzfj73wxyqp0x7x9j6mwf4gj6ggil4d9vnhnfgc";
   };
 
   patches = optionals stdenv.isDarwin [

From a1a4585729631346910a131a27408ea01633ee1e Mon Sep 17 00:00:00 2001
From: Victor Luft <victor@luft.io>
Date: Mon, 9 Nov 2020 09:52:15 -0500
Subject: [PATCH 1884/3942] sublime-merge-dev: 2033 -> 2037

---
 .../applications/version-management/sublime-merge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix
index d5713ea23451..773a2c3b4f51 100644
--- a/pkgs/applications/version-management/sublime-merge/default.nix
+++ b/pkgs/applications/version-management/sublime-merge/default.nix
@@ -9,8 +9,8 @@ in {
   } {};
 
   sublime-merge-dev = common {
-    buildVersion = "2033";
-    sha256 = "ab937a393eb6ae776a81b30ec5a589ae37763885ba8a91680d5c43e19a01a8fa";
+    buildVersion = "2037";
+    sha256 = "1s0g18l2msmnn6w7f126andh2dygm9l94fxxhsi64v74mkawqg82";
     dev = true;
   } {};
 }

From f3ba4b1bcd91b679edd62c5a1fa9b72cee61a2c4 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 13:28:06 +0100
Subject: [PATCH 1885/3942] moodle: 3.9.2 -> 3.10.0

---
 pkgs/servers/web-apps/moodle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix
index b9f11b5c1798..da84481c9353 100644
--- a/pkgs/servers/web-apps/moodle/default.nix
+++ b/pkgs/servers/web-apps/moodle/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchurl, writeText, plugins ? [ ] }:
 
 let
-  version = "3.9.2";
-  stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
+  version = "3.10";
+  stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version));
 
 in stdenv.mkDerivation rec {
   pname = "moodle";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url =
       "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
-    sha256 = "ygy9xlYs49Ga3u2Q/vqxhnDnqXsrh6YYTAtcsXF8kNo=";
+    sha256 = "4aYKZmXym1Tq/462PIgJb4sHGUclEkU0Ok1iQJ6u0aw=";
   };
 
   phpConfig = writeText "config.php" ''

From f6650152bdf342456756533c34b9bef32b7b7e24 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Fri, 5 Jun 2020 21:39:08 +0200
Subject: [PATCH 1886/3942] Promote allowUnfreePredicate in remediation message

---
 pkgs/stdenv/generic/check-meta.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index b93ea558eac2..0ceb60535f55 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -80,9 +80,9 @@ let
   pos_str = meta: meta.position or "«unknown-file»";
 
   remediation = {
-    unfree = remediate_whitelist "Unfree";
-    broken = remediate_whitelist "Broken";
-    unsupported = remediate_whitelist "UnsupportedSystem";
+    unfree = remediate_whitelist "Unfree" remediate_unfree_predicate;
+    broken = remediate_whitelist "Broken" (x: "");
+    unsupported = remediate_whitelist "UnsupportedSystem" (x: "");
     blacklisted = x: "";
     insecure = remediate_insecure;
     broken-outputs = remediateOutputsToInstall;
@@ -98,7 +98,17 @@ let
     Broken = "broken packages";
     UnsupportedSystem = "packages that are unsupported for this system";
   }.${allow_attr};
-  remediate_whitelist = allow_attr: attrs:
+  remediate_unfree_predicate = attrs:
+    ''
+
+      Alternatively you can configure a predicate to whitelist specific packages:
+        { nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+            "${lib.getName attrs}"
+          ];
+        }
+    '';
+
+  remediate_whitelist = allow_attr: rebuild_amendment: attrs:
     ''
       a) To temporarily allow ${remediation_phrase allow_attr}, you can use an environment variable
          for a single invocation of the nix tools.
@@ -108,7 +118,7 @@ let
       b) For `nixos-rebuild` you can set
         { nixpkgs.config.allow${allow_attr} = true; }
       in configuration.nix to override this.
-
+      ${rebuild_amendment attrs}
       c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
         { allow${allow_attr} = true; }
       to ~/.config/nixpkgs/config.nix.

From feb893a6f862db5d54a5b925815a2c1aaf43ec56 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 9 Nov 2020 17:56:06 +0100
Subject: [PATCH 1887/3942] element-web: 1.7.12 -> 1.7.13

https://github.com/vector-im/element-web/releases/tag/v1.7.13
---
 .../networking/instant-messengers/element/element-web.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix
index 0d3e771630fd..93f9e34f8671 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -12,11 +12,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "element-web";
-  version = "1.7.12";
+  version = "1.7.13";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "173hdg09cw13vqh0lvz6kl0mq4i3rsacjxhspkpydh2qd1g3hjrs";
+    sha256 = "13ylzyr1kkrppvp86kih60pqxlsvqlcsgz2gj4azgmrf2bijfby3";
   };
 
   installPhase = ''

From ad63addc5e97fa67272579fb3185d8226b3b6bc4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 9 Nov 2020 17:56:21 +0100
Subject: [PATCH 1888/3942] element-desktop: 1.7.12 -> 1.7.13

https://github.com/vector-im/element-desktop/releases/tag/v1.7.13
---
 .../instant-messengers/element/element-desktop-package.json   | 2 +-
 .../networking/instant-messengers/element/element-desktop.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index 364f5a25d0af..871850fd6a69 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
   "name": "element-desktop",
   "productName": "Element",
   "main": "src/electron-main.js",
-  "version": "1.7.12",
+  "version": "1.7.13",
   "description": "A feature-rich client for Matrix.org",
   "author": "Element",
   "repository": {
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index b31841c5e79a..4f387045bb4b 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -8,12 +8,12 @@
 
 let
   executableName = "element-desktop";
-  version = "1.7.12";
+  version = "1.7.13";
   src = fetchFromGitHub {
     owner = "vector-im";
     repo = "riot-desktop";
     rev = "v${version}";
-    sha256 = "08d9llrglap5bbicdkbdl9l71wba2kkyhdyd0a4iqdz3l2jvv698";
+    sha256 = "04nm5amhc0bqqwcc1c9x88lnbjaaryfs0xhi4as65l5ac4jdkzjc";
   };
   electron = electron_9;
 

From c9c5914a64ff935ac271eefd5d838eed713a0dd4 Mon Sep 17 00:00:00 2001
From: Serval <servalcat@pm.me>
Date: Tue, 10 Nov 2020 01:08:43 +0800
Subject: [PATCH 1889/3942] v2ray: 4.31.0 -> 4.32.1

---
 pkgs/tools/networking/v2ray/default.nix | 37 +++++++++++++------------
 pkgs/tools/networking/v2ray/update.sh   |  8 +++---
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix
index 1165f0bd7e0b..ecc2c2438414 100644
--- a/pkgs/tools/networking/v2ray/default.nix
+++ b/pkgs/tools/networking/v2ray/default.nix
@@ -3,33 +3,33 @@
 }:
 
 let
-  version = "4.31.0";
+  version = "4.32.1";
 
   src = fetchFromGitHub {
-    owner = "v2ray";
+    owner = "v2fly";
     repo = "v2ray-core";
     rev = "v${version}";
-    sha256 = "0s0blc05nrqm78qslv5xb42pjlx5v8qqwg0pwbzhxn9s71x2669m";
+    sha256 = "1mlrl5fz1v3bcb83pczqp859d8w9mi7jj600a2yw7xm372w2irk8";
   };
 
-  vendorSha256 = "0n2mf19fvgk5x0j2wwm4zk9xikzvl6cdvw26qar91wzcsraf5z2d";
+  vendorSha256 = "1mz1acdj8ailgyqrr1v47n36qc24ggzw5rmj4p2awfwz3gp2yz6z";
 
   assets = {
     # MIT licensed
     "geoip.dat" = let
-      geoipRev = "202009300006";
-      geoipSha256 = "1ss2izqlmrp5b5kpw804jk6c1nyimwlccbkikix3bwfaz4vlv1nc";
+      geoipRev = "202011050012";
+      geoipSha256 = "1d2n3hskgdmcfk1nl7a8lxxz325p84i7gz44cs77z1m9r7c2vsjy";
     in fetchurl {
-      url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat";
+      url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
       sha256 = geoipSha256;
     };
 
     # MIT licensed
     "geosite.dat" = let
-      geositeRev = "20201010021828";
-      geositeSha256 = "0gpfhcf4iyx7ip7rlkb0l1q64w84zvmcah52qyjwljs6l4p3hrj9";
+      geositeRev = "20201102141726";
+      geositeSha256 = "0sn2f5vd6w94ryh845mnbfyjzycg7cvb66rkzh37pg9l7fvgs4jh";
     in fetchurl {
-      url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat";
+      url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
       sha256 = geositeSha256;
     };
 
@@ -59,20 +59,23 @@ let
     installPhase = ''
       install -Dm755 v2ray v2ctl -t $out/bin
     '';
+
+    meta = {
+      homepage = "https://www.v2ray.com/en/index.html";
+      description = "A platform for building proxies to bypass network restrictions";
+      # The license of the dependency `https://github.com/XTLS/Go` doesn't allowed user to modify its source code,
+      # which made it unfree.
+      license = with lib.licenses; [ mit unfree ];
+      maintainers = with lib.maintainers; [ servalcatty ];
+    };
   };
 
 in runCommand "v2ray-${version}" {
   inherit version;
+  inherit (core) meta;
 
   nativeBuildInputs = [ makeWrapper ];
 
-  meta = {
-    homepage = "https://www.v2ray.com/en/index.html";
-    description = "A platform for building proxies to bypass network restrictions";
-    license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ servalcatty ];
-  };
-
   passthru = {
     updateScript = ./update.sh;
     tests = {
diff --git a/pkgs/tools/networking/v2ray/update.sh b/pkgs/tools/networking/v2ray/update.sh
index 56a148444c71..08062b1e9969 100755
--- a/pkgs/tools/networking/v2ray/update.sh
+++ b/pkgs/tools/networking/v2ray/update.sh
@@ -14,7 +14,7 @@ echo "Current version:" >&2
 echo "core: $old_core_rev, geoip: $old_geoip_rev, geosite: $old_geosite_rev" >&2
 
 function fetch_latest_rev {
-    curl "https://api.github.com/repos/v2ray/$1/releases" |
+    curl "https://api.github.com/repos/v2fly/$1/releases" |
         jq '.[0].tag_name' --raw-output
 }
 
@@ -28,7 +28,7 @@ echo "core: $core_rev, geoip: $geoip_rev, geosite: $geosite_rev" >&2
 if [[ $core_rev != $old_core_rev ]]; then
     echo "Prefetching core..." >&2
     { read hash; read store_path; } < <(
-        nix-prefetch-url --unpack --print-path "https://github.com/v2ray/v2ray-core/archive/v$core_rev.zip"
+        nix-prefetch-url --unpack --print-path "https://github.com/v2fly/v2ray-core/archive/v$core_rev.zip"
     )
 
     sed --in-place \
@@ -40,7 +40,7 @@ fi
 
 if [[ $geoip_rev != $old_geoip_rev ]]; then
     echo "Prefetching geoip..." >&2
-    hash=$(nix-prefetch-url "https://github.com/v2ray/geoip/releases/download/$geoip_rev/geoip.dat")
+    hash=$(nix-prefetch-url "https://github.com/v2fly/geoip/releases/download/$geoip_rev/geoip.dat")
     sed --in-place \
         -e "s/\bgeoipRev = \".*\"/geoipRev = \"$geoip_rev\"/" \
         -e "s/\bgeoipSha256 = \".*\"/geoipSha256 = \"$hash\"/" \
@@ -49,7 +49,7 @@ fi
 
 if [[ $geosite_rev != $old_geosite_rev ]]; then
     echo "Prefetching geosite..." >&2
-    hash=$(nix-prefetch-url "https://github.com/v2ray/domain-list-community/releases/download/$geosite_rev/dlc.dat")
+    hash=$(nix-prefetch-url "https://github.com/v2fly/domain-list-community/releases/download/$geosite_rev/dlc.dat")
     sed --in-place \
         -e "s/\bgeositeRev = \".*\"/geositeRev = \"$geosite_rev\"/" \
         -e "s/\bgeositeSha256 = \".*\"/geositeSha256 = \"$hash\"/" \

From bd25321863c63b1b1996e7f7deb471e0cc06a557 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 9 Nov 2020 18:24:45 +0100
Subject: [PATCH 1890/3942] sshfs: 3.7.0 -> 3.7.1

---
 pkgs/tools/filesystems/sshfs-fuse/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 018dfe7858e3..3922851af331 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub
-, meson, pkgconfig, ninja, docutils, makeWrapper
+, meson, pkg-config, ninja, docutils, makeWrapper
 , fuse3, glib
 , which, python3Packages
 , openssh
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.7.0";
+  version = "3.7.1";
   pname = "sshfs-fuse";
 
   src = fetchFromGitHub {
     owner = "libfuse";
     repo = "sshfs";
     rev = "sshfs-${version}";
-    sha256 = "119qvjaai3nqs2psqk2kv4gxjchrnrcfnmlwk7yxnj3v59pgyxhv";
+    sha256 = "088mgcsqv9f2vly4xn6lvvkmqkgr9jjmjs9qp8938hl7j6rrgd17";
   };
 
-  nativeBuildInputs = [ meson pkgconfig ninja docutils makeWrapper ];
+  nativeBuildInputs = [ meson pkg-config ninja docutils makeWrapper ];
   buildInputs = [ fuse3 glib ];
   checkInputs = [ which python3Packages.pytest ];
 

From 51e55942cc43917cd57adf94e78b5574ff8400b9 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 9 Nov 2020 18:25:09 +0100
Subject: [PATCH 1891/3942] llvmPackages_latest: llvmPackages_10 ->
 llvmPackages_11

---
 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 8cb08bce062d..c62bcaedafb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9624,7 +9624,7 @@ in
     stdenv = gcc7Stdenv;
   });
 
-  llvmPackages_latest = llvmPackages_10;
+  llvmPackages_latest = llvmPackages_11;
 
   llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { };
 

From e13120bb098f25ac552570c2f9ea5908ef102a50 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Tue, 13 Oct 2020 21:47:08 +0200
Subject: [PATCH 1892/3942] mupdf: 1.17.0 -> 1.18.0

fixes CVE-2017-5991
fixes CVE-2020-26519

also drops the patch for shared libs (not needed anymore)
---
 pkgs/applications/misc/mupdf/default.nix      | 14 ++++---
 .../misc/mupdf/mupdf-1.14-shared_libs.patch   | 39 -------------------
 2 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 61eb32bbd5cd..ecefbd17cfe0 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg
 , jbig2dec, libjpeg , darwin
+, gumbo
 , enableX11 ? true, libX11, libXext, libXi, libXrandr
 , enableCurl ? true, curl, openssl
 , enableGL ? true, freeglut, libGLU
@@ -13,27 +14,28 @@ let
 
 
 in stdenv.mkDerivation rec {
-  version = "1.17.0";
+  version = "1.18.0";
   pname = "mupdf";
 
   src = fetchurl {
     url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
-    sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0";
+    sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48";
   };
 
   patches =
-    # Use shared libraries to decrease size
-    stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch
-    ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch
+    stdenv.lib.optional stdenv.isDarwin ./darwin.patch
   ;
 
   postPatch = ''
     sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
   '';
 
+  # Use shared libraries to decrease size
+  buildFlags = [ "shared" ];
+
   makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ];
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ]
+  buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU gumbo ]
                 ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
                 ++ lib.optionals enableCurl [ curl openssl ]
                 ++ lib.optionals enableGL (
diff --git a/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch b/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch
deleted file mode 100644
index 131a1bbbf6bd..000000000000
--- a/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- mupdf-1.14.0-source.orig/Makefile	2018-11-02 06:57:12.114012496 +0100
-+++ mupdf-1.14.0-source/Makefile	2018-11-02 09:57:10.067945307 +0100
-@@ -20,7 +20,7 @@
- # Do not specify CFLAGS or LIBS on the make invocation line - specify
- # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
- # set a variable that was set on the command line.
--CFLAGS += $(XCFLAGS) -Iinclude
-+CFLAGS += $(XCFLAGS) -Iinclude -fPIC
- LIBS += $(XLIBS) -lm
- 
- ifneq ($(threading),no)
-@@ -190,17 +190,21 @@
- 
- # --- Library ---
- 
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
--THREAD_LIB = $(OUT)/libmupdf-threads.a
--PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-+MUPDF_LIB = $(OUT)/libmupdf.so
-+THIRD_LIB = $(OUT)/libmupdf-third.so
-+THREAD_LIB = $(OUT)/libmupdf-threads.so
-+PKCS7_LIB = $(OUT)/libmupdf-pkcs7.so
- 
--$(MUPDF_LIB) : $(MUPDF_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
-+	$(LINK_CMD) $(THIRD_LIBS) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
- $(THIRD_LIB) : $(THIRD_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so -Wl,--no-undefined
- $(THREAD_LIB) : $(THREAD_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-threads.so -Wl,--no-undefined -lpthread
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-pkcs7.so
- 
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
- 
- # --- Main tools and viewers ---
- 

From bbcc8b020e3b2bf3154084174f66e5ae731ef065 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Tue, 13 Oct 2020 22:41:11 +0200
Subject: [PATCH 1893/3942] mupdf: adopt post-release bugfix-patches from
 upstream

---
 pkgs/applications/misc/mupdf/default.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index ecefbd17cfe0..836d970a2b55 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -23,8 +23,23 @@ in stdenv.mkDerivation rec {
   };
 
   patches =
-    stdenv.lib.optional stdenv.isDarwin ./darwin.patch
-  ;
+    stdenv.lib.optional stdenv.isDarwin ./darwin.patch ++ [
+    (fetchpatch {
+        name = "pdfocr.patch";
+        url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84";
+        sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3";
+      })
+    (fetchpatch {
+        name = "pdf-layer.patch";
+        url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54";
+        sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm";
+      })
+    (fetchpatch {
+        name = "pixmap.patch";
+        url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603";
+        sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj";
+      })
+    ];
 
   postPatch = ''
     sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c

From 3c7e7b87b3fd3f7cf67015eddddee354def28594 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Tue, 13 Oct 2020 22:47:50 +0200
Subject: [PATCH 1894/3942] pymupdf: 1.17.6 -> 1.18.0

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

diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index bc2f2c6e95ff..c3cf43be01af 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
 buildPythonPackage rec {
   pname = "PyMuPDF";
-  version = "1.17.6";
+  version = "1.18.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5eef4ff61698016a296932858625a5a0039b923ba692043e2c98ca02966f1da2";
+    sha256 = "64ce58f92d9edd2631e447175fa13b4024ac3b6dce6e718e0b003c41de6f7952";
   };
 
   patchPhase = ''

From a08a95acd987f5ca748bdb4912c94bddaaca1fb3 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Wed, 14 Oct 2020 07:16:08 +0200
Subject: [PATCH 1895/3942] llpp: 32 -> 33

---
 pkgs/applications/misc/llpp/default.nix       | 10 +++----
 .../misc/llpp/fix-build-bash.patch            | 28 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index d7752258df98..c16322ad84fa 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11,
-libGLU, libGL, freetype, xclip, inotify-tools, procps }:
+{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz,
+libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps }:
 
 assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
 
 stdenv.mkDerivation rec {
   pname = "llpp";
-  version = "32";
+  version = "33";
 
   src = fetchgit {
     url = "git://repo.or.cz/llpp.git";
     rev = "v${version}";
-    sha256 = "1h1zysm5cz8laq8li49djl6929cnrjlflag9hw0c1dcr4zaxk32y";
+    sha256 = "0shqzhaflm2yhkx6c0csq9lxp1s1r7lh5kgpx9q5k06xya2a7yvs";
     fetchSubmodules = false;
   };
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   });
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype ];
+  buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ];
 
   dontStrip = true;
 
diff --git a/pkgs/applications/misc/llpp/fix-build-bash.patch b/pkgs/applications/misc/llpp/fix-build-bash.patch
index fbc341c8af78..c12828f2d94d 100644
--- a/pkgs/applications/misc/llpp/fix-build-bash.patch
+++ b/pkgs/applications/misc/llpp/fix-build-bash.patch
@@ -1,8 +1,9 @@
 diff --git a/build.bash b/build.bash
 index 7c278b6..41494c5 100755
+with manual adjustments
 --- a/build.bash
 +++ b/build.bash
-@@ -29,7 +29,6 @@ srcd="$(dirname $0)"
+@@ -30,7 +30,6 @@ srcd="$(dirname $0)"
  mudir=$outd/mupdf
  muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include"
  
@@ -10,25 +11,25 @@ index 7c278b6..41494c5 100755
  
  mkdir -p $outd/{$wsid,lablGL}
  :>$outd/ordered
-@@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; }
- mbt=${mbt:-native}
- mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a
+@@ -41,12 +40,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; }
+ mulibst="$mudir/build/$mbt/libs"
+ mulibs="$mudir/build/$mbt/libmupdf.a $mudir/build/$mbt/libmupdf-third.a"
  
 -keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs"
--isfresh "$mulibs" "$(eval $keycmd)" || (
+-isfresh "$mulibst" "$(eval $keycmd)" || (
 -    make -C "$mudir" build=$mbt -j $mjobs libs
--    eval $keycmd >$mudir/build/$mbt/libmupdf.a.past
+-    eval $keycmd >${mulibst}.past
 -) && vecho "fresh mupdf"
 -
  oincs() {
      local i=
      local incs1=
-@@ -89,34 +82,6 @@ mflags() {
+@@ -100,35 +93,6 @@ mflags() {
  }
  
  overs="$(ocamlc -vnum 2>/dev/null)" || overs=""
--test "$overs" = "4.10.0" || {
--    url=https://caml.inria.fr/pub/distrib/ocaml-4.10/ocaml-4.10.0.tar.xz
+-test "$overs" = "4.11.1" || {
+-    url=https://caml.inria.fr/pub/distrib/ocaml-4.11/ocaml-4.11.1.tar.xz
 -    txz=$outd/$(basename $url)
 -    keycmd="printf $url; digest $txz;"
 -    isfresh $txz "$(eval $keycmd)" || {
@@ -48,7 +49,8 @@ index 7c278b6..41494c5 100755
 -        tar xf $txz -C $outd
 -        bn=$(basename $url)
 -        cd $outd/${bn%.tar.xz}
--        ./configure --disable-ocamldoc --enable-debugger=no --prefix=$absprefix
+-        ./configure --disable-ocamldoc --disable-ocamltest      \
+-                    --enable-debugger=no --prefix=$absprefix
 -        make -j $mjobs world
 -        make install
 -        eval $keycmd >$absprefix/bin/ocamlc.past
@@ -58,7 +60,7 @@ index 7c278b6..41494c5 100755
  
  ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \
                        { read _ c; echo $c; })}
-@@ -230,7 +195,7 @@ bobjc() {
+@@ -243,7 +208,7 @@ bobjc() {
      } && vecho "fresh $o"
  }
  
@@ -67,12 +69,12 @@ index 7c278b6..41494c5 100755
  
  cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)"
  keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml"
-@@ -284,7 +249,7 @@ for m in ml_gl ml_glarray ml_raw; do
+@@ -291,7 +256,7 @@ for m in ml_gl ml_glarray ml_raw; do
  done
  
  libs="str.cma unix.cma"
 -clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread"
-+clibs="-lmupdf -lfreetype -lpthread"
++clibs="-lmupdf -lmupdf-third -lfreetype -lgumbo -ljpeg -lopenjp2 -ljbig2dec -llcms2 -lharfbuzz -lpthread -lz"
  if $darwin; then
      mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; })
      clibs="$clibs -framework Cocoa -framework OpenGL"

From 9ed8e03a09a127e4dfdbd00524ede239b94cac78 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Wed, 14 Oct 2020 09:39:58 +0200
Subject: [PATCH 1896/3942] mupdf: mark 1.17 as insecure but as still required
 as dependency

---
 pkgs/applications/misc/k2pdfopt/default.nix   |  4 +-
 pkgs/applications/misc/mupdf/1.17.nix         | 95 +++++++++++++++++++
 .../misc/mupdf/mupdf-1.14-shared_libs.patch   | 39 ++++++++
 pkgs/os-specific/linux/jfbview/default.nix    |  4 +-
 pkgs/top-level/all-packages.nix               |  1 +
 5 files changed, 139 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/misc/mupdf/1.17.nix
 create mode 100644 pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch

diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 75e467d4cdf8..be61a76190a2 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -2,7 +2,7 @@
 , cmake, pkgconfig, zlib, libpng, makeWrapper
 , enableGSL ? true, gsl
 , enableGhostScript ? true, ghostscript
-, enableMuPDF ? true, mupdf
+, enableMuPDF ? true, mupdf_1_17
 , enableDJVU ? true, djvulibre
 , enableGOCR ? false, gocr # Disabled by default due to crashes
 , enableTesseract ? true, leptonica, tesseract4
@@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {
         cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/
       '';
     };
-    mupdf_modded = mupdf.overrideAttrs ({ patches ? [], ... }: {
+    mupdf_modded = mupdf_1_17.overrideAttrs ({ patches ? [], ... }: {
       patches = patches ++ [ mupdf_patch ];
       # This function is missing in font.c, see font-win32.c
       postPatch = ''
diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix
new file mode 100644
index 000000000000..c6243e5f1d6b
--- /dev/null
+++ b/pkgs/applications/misc/mupdf/1.17.nix
@@ -0,0 +1,95 @@
+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg
+, jbig2dec, libjpeg , darwin
+, enableX11 ? true, libX11, libXext, libXi, libXrandr
+, enableCurl ? true, curl, openssl
+, enableGL ? true, freeglut, libGLU
+}:
+
+let
+
+  # OpenJPEG version is hardcoded in package source
+  openJpegVersion = with stdenv;
+    lib.versions.majorMinor (lib.getVersion openjpeg);
+
+
+in stdenv.mkDerivation rec {
+  version = "1.17.0";
+  pname = "mupdf";
+
+  src = fetchurl {
+    url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
+    sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0";
+  };
+
+  patches =
+    # Use shared libraries to decrease size
+    stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch
+    ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch
+  ;
+
+  postPatch = ''
+    sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
+  '';
+
+  makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ]
+                ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
+                ++ lib.optionals enableCurl [ curl openssl ]
+                ++ lib.optionals enableGL (
+                  if stdenv.isDarwin then
+                    with darwin.apple_sdk.frameworks; [ GLUT OpenGL ]
+                  else
+                    [ freeglut libGLU ])
+                ;
+  outputs = [ "bin" "dev" "out" "man" "doc" ];
+
+  preConfigure = ''
+    # Don't remove mujs because upstream version is incompatible
+    rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
+  '';
+
+  postInstall = ''
+    mkdir -p "$out/lib/pkgconfig"
+    cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF
+    prefix=$out
+    libdir=$out/lib
+    includedir=$out/include
+
+    Name: mupdf
+    Description: Library for rendering PDF documents
+    Version: ${version}
+    Libs: -L$out/lib -lmupdf -lmupdf-third
+    Cflags: -I$dev/include
+    EOF
+
+    moveToOutput "bin" "$bin"
+    ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf"
+    mkdir -p $bin/share/applications
+    cat > $bin/share/applications/mupdf.desktop <<EOF
+    [Desktop Entry]
+    Type=Application
+    Version=1.0
+    Name=mupdf
+    Comment=PDF viewer
+    Exec=$bin/bin/mupdf-x11 %f
+    Terminal=false
+    MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip
+    EOF
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://mupdf.com";
+    repositories.git = "git://git.ghostscript.com/mupdf.git";
+    description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
+    license = licenses.agpl3Plus;
+    maintainers = with maintainers; [ vrthra fpletz ];
+    platforms = platforms.unix;
+    knownVulnerabilities = [
+      "CVE-2020-26519: denial of service when parsing JBIG2"
+      "CVE-2017-5991: NULL pointer dereference"
+    ];
+  };
+}
diff --git a/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch b/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch
new file mode 100644
index 000000000000..131a1bbbf6bd
--- /dev/null
+++ b/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch
@@ -0,0 +1,39 @@
+--- mupdf-1.14.0-source.orig/Makefile	2018-11-02 06:57:12.114012496 +0100
++++ mupdf-1.14.0-source/Makefile	2018-11-02 09:57:10.067945307 +0100
+@@ -20,7 +20,7 @@
+ # Do not specify CFLAGS or LIBS on the make invocation line - specify
+ # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
+ # set a variable that was set on the command line.
+-CFLAGS += $(XCFLAGS) -Iinclude
++CFLAGS += $(XCFLAGS) -Iinclude -fPIC
+ LIBS += $(XLIBS) -lm
+ 
+ ifneq ($(threading),no)
+@@ -190,17 +190,21 @@
+ 
+ # --- Library ---
+ 
+-MUPDF_LIB = $(OUT)/libmupdf.a
+-THIRD_LIB = $(OUT)/libmupdf-third.a
+-THREAD_LIB = $(OUT)/libmupdf-threads.a
+-PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
++MUPDF_LIB = $(OUT)/libmupdf.so
++THIRD_LIB = $(OUT)/libmupdf-third.so
++THREAD_LIB = $(OUT)/libmupdf-threads.so
++PKCS7_LIB = $(OUT)/libmupdf-pkcs7.so
+ 
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
++	$(LINK_CMD) $(THIRD_LIBS) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
+ $(THIRD_LIB) : $(THIRD_OBJ)
++	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so -Wl,--no-undefined
+ $(THREAD_LIB) : $(THREAD_OBJ)
++	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-threads.so -Wl,--no-undefined -lpthread
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
++	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-pkcs7.so
+ 
+-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
+ 
+ # --- Main tools and viewers ---
+ 
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index f8e211fb289f..7984e2678070 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, freetype, harfbuzz, jbig2dec, libjpeg, libX11, mupdf, ncurses, openjpeg
+, freetype, harfbuzz, jbig2dec, libjpeg, libX11, mupdf_1_17, ncurses, openjpeg
 , openssl
 
 , imageSupport ? true, imlib2 ? null }:
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   buildInputs = [
-    freetype harfbuzz jbig2dec libjpeg libX11 mupdf ncurses openjpeg
+    freetype harfbuzz jbig2dec libjpeg libX11 mupdf_1_17 ncurses openjpeg
     openssl
   ] ++ stdenv.lib.optionals imageSupport [
     imlib2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8cb08bce062d..d2d7c0c1aacb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22672,6 +22672,7 @@ in
   pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { };
 
   mupdf = callPackage ../applications/misc/mupdf { };
+  mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { };
 
   mystem = callPackage ../applications/misc/mystem { };
 

From 33784354b96055c4b4d40fc12aa88b3862b6048e Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 24 Oct 2020 20:58:42 -0400
Subject: [PATCH 1897/3942] pulseaudio-hsphfpd: init at 2020-11-02

---
 ...d-option-for-installation-sysconfdir.patch | 100 ++++++++
 pkgs/servers/pulseaudio/correct-ldflags.patch |  13 ++
 pkgs/servers/pulseaudio/pali.nix              | 219 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +
 4 files changed, 336 insertions(+)
 create mode 100644 pkgs/servers/pulseaudio/add-option-for-installation-sysconfdir.patch
 create mode 100644 pkgs/servers/pulseaudio/correct-ldflags.patch
 create mode 100644 pkgs/servers/pulseaudio/pali.nix

diff --git a/pkgs/servers/pulseaudio/add-option-for-installation-sysconfdir.patch b/pkgs/servers/pulseaudio/add-option-for-installation-sysconfdir.patch
new file mode 100644
index 000000000000..dd4de7321e95
--- /dev/null
+++ b/pkgs/servers/pulseaudio/add-option-for-installation-sysconfdir.patch
@@ -0,0 +1,100 @@
+
+diff --git a/meson.build b/meson.build
+index 86af7243e..e2d48ab94 100644
+--- a/meson.build
++++ b/meson.build
+@@ -65,6 +65,11 @@ datadir = join_paths(prefix, get_option('datadir'))
+ localedir = join_paths(prefix, get_option('localedir'))
+ localstatedir = join_paths(prefix, get_option('localstatedir'))
+ sysconfdir = join_paths(prefix, get_option('sysconfdir'))
++if get_option('sysconfdir_install') != ''
++  sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install'))
++else
++  sysconfdir_install = sysconfdir
++endif
+ privlibdir = join_paths(libdir, 'pulseaudio')
+ 
+ alsadatadir = get_option('alsadatadir')
+@@ -75,6 +80,11 @@ endif
+ pkgconfigdir = join_paths(libdir, 'pkgconfig')
+ pulselibexecdir = join_paths(libexecdir, 'pulse')
+ pulsesysconfdir = join_paths(sysconfdir, 'pulse')
++if get_option('sysconfdir_install') != ''
++  pulsesysconfdir_install = join_paths(get_option('prefix'),  get_option('sysconfdir_install'), 'pulse')
++else
++  pulsesysconfdir_install = pulsesysconfdir
++endif
+ 
+ modlibexecdir = get_option('modlibexecdir')
+ if modlibexecdir == ''
+diff --git a/meson_options.txt b/meson_options.txt
+index 824f24e08..59a2b57ab 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -66,6 +66,9 @@ option('bashcompletiondir',
+ option('zshcompletiondir',
+        type : 'string',
+        description : 'Directory for zsh completion scripts ["no" disables]')
++option('sysconfdir_install',
++       type: 'string', value: '',
++       description: 'sysconfdir to use during installation')
+ 
+ # Optional features
+ 
+diff --git a/src/daemon/meson.build b/src/daemon/meson.build
+index 9c9f807e7..425cecb46 100644
+--- a/src/daemon/meson.build
++++ b/src/daemon/meson.build
+@@ -53,7 +53,7 @@ if x11_dep.found()
+     po_dir : po_dir,
+     type : 'desktop',
+     install : true,
+-    install_dir : join_paths(sysconfdir, 'xdg', 'autostart'),
++    install_dir : join_paths(sysconfdir_install, 'xdg', 'autostart'),
+   )
+ 
+   desktop_utils = find_program('desktop-file-validate', required: false)
+@@ -85,7 +85,7 @@ custom_target('daemon.conf',
+   command : [m4, '@INPUT@'],
+   build_by_default : true,
+   install : true,
+-  install_dir : pulsesysconfdir,
++  install_dir : pulsesysconfdir_install,
+ )
+ 
+ default_conf = configuration_data()
+@@ -111,7 +111,7 @@ custom_target('default.pa',
+   command : [m4, '@INPUT@'],
+   build_by_default : true,
+   install : true,
+-  install_dir : pulsesysconfdir,
++  install_dir : pulsesysconfdir_install,
+ )
+ 
+ system_conf = configuration_data()
+@@ -132,12 +132,12 @@ custom_target('system.pa',
+   command : [m4, '@INPUT@'],
+   build_by_default : true,
+   install : true,
+-  install_dir : pulsesysconfdir,
++  install_dir : pulsesysconfdir_install,
+ )
+ 
+ if dbus_dep.found()
+   install_data('pulseaudio-system.conf',
+-    install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
++    install_dir : join_paths(sysconfdir_install, 'dbus-1', 'system.d')
+   )
+ endif
+ 
+diff --git a/src/pulse/meson.build b/src/pulse/meson.build
+index aaebff53e..05a29a0d0 100644
+--- a/src/pulse/meson.build
++++ b/src/pulse/meson.build
+@@ -130,5 +130,5 @@ client_conf_file = configure_file(
+   input : 'client.conf.in',
+   output : 'client.conf',
+   configuration : client_conf,
+-  install_dir : pulsesysconfdir,
++  install_dir : pulsesysconfdir_install,
+ )
diff --git a/pkgs/servers/pulseaudio/correct-ldflags.patch b/pkgs/servers/pulseaudio/correct-ldflags.patch
new file mode 100644
index 000000000000..174cb8b4f746
--- /dev/null
+++ b/pkgs/servers/pulseaudio/correct-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 45df103f0..d57d13172 100644
+--- a/meson.build
++++ b/meson.build
+@@ -342,7 +342,7 @@ cdata.set('MESON_BUILD', 1)
+ # On ELF systems we don't want the libraries to be unloaded since we don't clean them up properly,
+ # so we request the nodelete flag to be enabled.
+ # On other systems, we don't really know how to do that, but it's welcome if somebody can tell.
+-nodelete_link_args = ['-Wl,-z,nodelete']
++nodelete_link_args = cc.get_supported_link_arguments(['-Wl,-z,nodelete'])
+ 
+ # Code coverage
+ 
diff --git a/pkgs/servers/pulseaudio/pali.nix b/pkgs/servers/pulseaudio/pali.nix
new file mode 100644
index 000000000000..d5ae80b5e798
--- /dev/null
+++ b/pkgs/servers/pulseaudio/pali.nix
@@ -0,0 +1,219 @@
+{ lib
+, stdenv
+, fetchurl
+, fetchFromGitLab
+, meson
+, ninja
+, pkgconfig
+, libsndfile
+, libtool
+, makeWrapper
+, perlPackages
+, xorg
+, libcap
+, alsaLib
+, glib
+, dconf
+, avahi
+, libjack2
+, libasyncns
+, lirc
+, dbus
+, sbc
+, bluez5
+, udev
+, openssl
+, fftwFloat
+, soxr
+, speexdsp
+, systemd
+, webrtc-audio-processing
+, gtk3
+, tdb
+, orc
+, check
+, gettext
+, gst_all_1
+, libopenaptx
+
+, x11Support ? true
+
+, # Whether to support the JACK sound system as a backend.
+  jackaudioSupport ? false
+
+, airtunesSupport ? true
+
+, bluetoothSupport ? true
+
+, remoteControlSupport ? true
+
+, zeroconfSupport ? true
+
+, # Whether to build only the library.
+  libOnly ? false
+
+# Building from Git source
+, fromGit ? true
+
+, CoreServices
+, AudioUnit
+, Cocoa
+}:
+
+stdenv.mkDerivation rec {
+  pname = "${if libOnly then "lib" else ""}pulseaudio-hsphfpd";
+  version = "13.99.2";
+
+  outputs = [ "out" "dev" ];
+
+  # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/288
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "pali";
+    repo = "pulseaudio";
+    rev = "5336b39e7e03cf50386e719e287a712b59730eb8";
+    sha256 = "0vc0i5rzkns3xw6y2q0c94p2qdi5k3mgjvhicgq1b0py2qxmji16";
+  };
+
+  patches = [
+    ./add-option-for-installation-sysconfdir.patch
+    ./correct-ldflags.patch
+  ];
+
+  # Says it should be v${version} but it's parsing logic is broken
+  preConfigure = lib.optionalString fromGit ''
+    sed -i "s@version : run_command.*@version: '${version}',@" meson.build
+  '';
+
+  nativeBuildInputs = [
+    gettext
+    makeWrapper
+    meson
+    ninja
+    pkgconfig
+    perlPackages.perl
+    perlPackages.XMLParser
+  ];
+
+  checkInputs = [
+    check
+  ];
+
+  propagatedBuildInputs = lib.optional stdenv.isLinux libcap;
+
+  buildInputs = [
+    libopenaptx
+    fftwFloat
+    libsndfile
+    libtool
+    orc
+    soxr
+    speexdsp
+    tdb
+    sbc
+    gst_all_1.gst-plugins-base
+  ] ++ lib.optionals bluetoothSupport [
+    bluez5
+  ] ++ lib.optionals stdenv.isLinux [
+    dbus
+    glib
+    gtk3
+    libasyncns
+  ] ++ lib.optionals stdenv.isDarwin [
+    AudioUnit
+    Cocoa
+    CoreServices
+  ] ++ lib.optionals (!libOnly) (
+    lib.optionals x11Support [
+      xorg.libXi
+      xorg.libXtst
+      xorg.xlibsWrapper
+    ] ++ lib.optionals stdenv.isLinux [
+      alsaLib
+      systemd
+      udev
+    ] ++ lib.optional airtunesSupport openssl
+    ++ lib.optional jackaudioSupport libjack2
+    ++ lib.optional remoteControlSupport lirc
+    ++ lib.optional zeroconfSupport avahi
+    ++ [ webrtc-audio-processing ]
+  );
+
+  mesonFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "-Daccess_group=audio"
+    "-Dbashcompletiondir=${placeholder "out"}/share/bash-completions/completions"
+    "-Dman=false" # TODO: needs xmltoman; also doesn't check for this
+    "-Dsysconfdir_install=${placeholder "out"}/etc"
+    "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
+    "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d"
+    "-Dzshcompletiondir=${placeholder "out"}/share/zsh/site-functions"
+  ] ++ lib.optionals (!stdenv.isLinux) [
+    "-Dasyncns=disabled"
+    "-Ddbus=disabled"
+    "-Dglib=disabled"
+    "-Dgsettings=disabled"
+    "-Dgtk=disabled"
+  ] ++ lib.optionals (!stdenv.isLinux || libOnly) [
+    "-Dalsa=disabled"
+    "-Dsystemd=disabled"
+    "-Dudev=disabled"
+  ] ++ lib.optional libOnly "-Dwebrtc-aec=disabled"
+    ++ lib.optional (!x11Support) "-Dx11=disabled"
+    ++ lib.optional (!bluetoothSupport) "-Dbluez5=false"
+    ++ lib.optional (!airtunesSupport) "-Dopenssl=disabled"
+    ++ lib.optional (!jackaudioSupport) "-Djack=disabled"
+    ++ lib.optional (!remoteControlSupport) "-Dlirc=disabled"
+    ++ lib.optional (!zeroconfSupport) "-Davahi=disabled"
+    ++ lib.optional (!doCheck) "-Dtests=false";
+
+  # To create ~/.config/pulse
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  doCheck = true;
+
+  # not sure what the best practices are here -- can't seem to find a way
+  # for the compiler to bring in stdlib and stdio (etc.) properly
+  # the alternative is to copy the files from /usr/include to src, but there are
+  # probably a large number of files that would need to be copied (I stopped
+  # after the seventh)
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I/usr/include";
+
+  NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreServices -framework Cocoa -framework AudioUnit";
+
+  postInstall = ''
+    moveToOutput lib/cmake "$dev"
+    rm -f $out/bin/qpaeq # this is packaged by the "qpaeq" package now, because of missing deps
+  '' + lib.optionalString libOnly ''
+    rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
+  '';
+
+  preFixup = lib.optionalString (stdenv.isLinux && !libOnly) ''
+    wrapProgram $out/libexec/pulse/gsettings-helper \
+     --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${pname}-${version}" \
+     --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"
+  '';
+
+  passthru = {
+    pulseDir = "lib/pulse-" + lib.versions.majorMinor version;
+  };
+
+  meta = with lib; {
+    description = "A featureful, general-purpose sound server";
+    homepage = "http://www.pulseaudio.org/";
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms = platforms.unix;
+    longDescription = ''
+      PulseAudio is a sound system for POSIX OSes, meaning that it is
+      a proxy for your sound applications. It allows you to do advanced
+      operations on your sound data as it passes between your application
+      and your hardware. Things like transferring the audio to a different machine,
+      changing the sample format or channel count and mixing several sounds into one
+      are easily achieved using a sound server.
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0c9b4641b44..679f69ea3e01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16995,6 +16995,10 @@ in
 
   # PulseAudio daemons
 
+  pulseaudio-hsphfpd = callPackage ../servers/pulseaudio/pali.nix {
+    inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
+  };
+
   pulseaudio = callPackage ../servers/pulseaudio {
     inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
   };

From 0e4d0d95d03d581d4d94ec6a04f58293baaaa167 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 25 Oct 2020 21:18:26 -0400
Subject: [PATCH 1898/3942] treewide: generate pulseaudio pulseDir

---
 nixos/modules/config/pulseaudio.nix                           | 2 +-
 pkgs/applications/audio/pulseaudio-modules-bt/default.nix     | 4 ++--
 .../audio/pulseaudio-modules-bt/fix-install-path.patch        | 2 +-
 pkgs/servers/pulseaudio/default.nix                           | 4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 408d0a9c33f2..3939d6aa2d8a 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -259,7 +259,7 @@ in {
           (drv: drv.override { pulseaudio = overriddenPackage; })
           cfg.extraModules;
         modulePaths = builtins.map
-          (drv: "${drv}/lib/pulse-${overriddenPackage.version}/modules")
+          (drv: "${drv}/${overriddenPackage.pulseDir}/modules")
           # User-provided extra modules take precedence
           (overriddenModules ++ [ overriddenPackage ]);
       in lib.concatStringsSep ":" modulePaths;
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index 556dd5f10619..7a1768d858c0 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
 
     # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions
     substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version}
-    substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version}
+    substituteInPlace CMakeLists.txt --replace '${"\${PULSE_DIR}"}' ${pulseaudio.pulseDir}
 
     # Fraunhofer recommends to enable afterburner but upstream has it set to false by default
     substituteInPlace src/modules/bluetooth/a2dp/a2dp_aac.c \
@@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
     for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do
       orig_rpath=$(patchelf --print-rpath "$so")
       patchelf \
-        --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \
+        --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/${pulseaudio.pulseDir}/modules:$orig_rpath" \
         "$so"
     done
   '';
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
index 3c498fe8af1b..7cdb7de4dd13 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
@@ -8,4 +8,4 @@ index 8d20dbf..63fe7ba 100644
          module-bluetooth-policy
 -        LIBRARY DESTINATION ${PulseAudio_modlibexecdir})
 -
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/)
++        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PULSE_DIR}/modules/)
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 513249cb7ad5..c9e2c3aa6e5e 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -124,6 +124,10 @@ stdenv.mkDerivation rec {
      --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"
   '';
 
+  passthru = {
+    pulseDir = "lib/pulse-" + lib.versions.majorMinor version;
+  };
+
   meta = {
     description = "Sound server for POSIX and Win32 systems";
     homepage    = "http://www.pulseaudio.org/";

From 35294d8c5095e0df4dd88c6bb14f3b2c1ef5d5b1 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 9 Nov 2020 19:26:28 +0100
Subject: [PATCH 1899/3942] trezord: 2.0.29 -> 2.0.30

---
 pkgs/servers/trezord/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index a59f74873dc5..a6841f7fabed 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -1,18 +1,22 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, trezor-udev-rules }:
+{ stdenv
+, buildGoModule
+, fetchFromGitHub
+, trezor-udev-rules
+}:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "trezord-go";
-  version = "2.0.29";
-
-  goPackagePath = "github.com/trezor/trezord-go";
+  version = "2.0.30";
 
   src = fetchFromGitHub {
     owner  = "trezor";
     repo   = "trezord-go";
     rev    = "v${version}";
-    sha256 = "1ks1fa0027s3xp0z6qp0dxmayvrb4dwwscfhbx7da0khp153f2cp";
+    sha256 = "1hzvk0wfgg7b4wpqjk3738yqxlv3pj5i7zxwm0jady2h97hmrqrr";
   };
 
+  vendorSha256 = "0wb959xzyvr5zzjvkfqc422frmf97q5nr460f02wwx0pj6ch0y61";
+
   propagatedBuildInputs = [ trezor-udev-rules ];
 
   meta = with stdenv.lib; {

From 48b2cb5126959524e0558ebe9377a2b33c79656d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 9 Nov 2020 19:33:02 +0100
Subject: [PATCH 1900/3942] google-cloud-cpp: Mark as broken

See https://hydra.nixos.org/build/129622012.
---
 pkgs/development/libraries/google-cloud-cpp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix
index 7eb69d075cab..b2d8856bfea1 100644
--- a/pkgs/development/libraries/google-cloud-cpp/default.nix
+++ b/pkgs/development/libraries/google-cloud-cpp/default.nix
@@ -58,5 +58,6 @@ in stdenv.mkDerivation rec {
     homepage = "https://github.com/googleapis/google-cloud-cpp";
     description = "C++ Idiomatic Clients for Google Cloud Platform services";
     maintainers = with maintainers; [ andir flokli ];
+    broken = true; # Broken on Hydra since 2020-05-19
   };
 }

From aea7f1b5401c6e96b418f67e540ee5779d97fcdc Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Mon, 9 Nov 2020 18:41:20 +0000
Subject: [PATCH 1901/3942] tree-sitter: make shared/static libraries
 configurable

---
 pkgs/development/tools/parsing/tree-sitter/default.nix | 7 +++++--
 pkgs/top-level/static.nix                              | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index ba1a03b89b99..dc8da1af447b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -3,6 +3,8 @@
 , writeShellScript, runCommand, which
 , rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten
 , callPackage
+, enableShared ? true
+, enableStatic ? false
 }:
 
 # TODO: move to carnix or https://github.com/kolloch/crate2nix
@@ -69,8 +71,9 @@ in rustPlatform.buildRustPackage {
   '';
 
   postInstall = ''
-    export PREFIX=$out
-    make install
+    PREFIX=$out make install
+    ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"}
+    ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"}
   '';
 
   # test result: FAILED. 120 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index 865e5cf2900e..b3851ba20f09 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -286,6 +286,11 @@ in {
 
   libexecinfo = super.libexecinfo.override { enableShared = false; };
 
+  tree-sitter = super.tree-sitter.override {
+    enableShared = false;
+    enableStatic = true;
+  };
+
   xorg = super.xorg.overrideScope' (xorgself: xorgsuper: {
     libX11 = xorgsuper.libX11.overrideAttrs (attrs: {
       depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ];

From a63c72212cb63c288a336e0eaf6264aa97c921d7 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Mon, 9 Nov 2020 18:41:51 +0000
Subject: [PATCH 1902/3942] tree-sitter: macOS compatibility

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

diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index dc8da1af447b..e34350615636 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -5,6 +5,7 @@
 , callPackage
 , enableShared ? true
 , enableStatic ? false
+, Security
 }:
 
 # TODO: move to carnix or https://github.com/kolloch/crate2nix
@@ -51,6 +52,8 @@ in rustPlatform.buildRustPackage {
   pname = "tree-sitter";
   inherit src version cargoSha256;
 
+  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+
   nativeBuildInputs = [ emscripten which ];
 
   postPatch = ''
@@ -103,9 +106,8 @@ in rustPlatform.buildRustPackage {
     '';
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ Profpatsch ];
-    # Darwin needs some more work with default libraries
     # Aarch has test failures with how tree-sitter compiles the generated C files
-    broken = stdenv.isDarwin || stdenv.isAarch64;
+    broken = stdenv.isAarch64;
   };
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e0130cc1c1b..8687d77a8249 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11885,7 +11885,9 @@ in
 
   travis = callPackage ../development/tools/misc/travis { };
 
-  tree-sitter = callPackage ../development/tools/parsing/tree-sitter { };
+  tree-sitter = callPackage ../development/tools/parsing/tree-sitter {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   trellis = callPackage ../development/tools/trellis { };
 

From 4d8adccab694baf4d413e8feef308c9b1da2d507 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Mon, 9 Nov 2020 18:42:17 +0000
Subject: [PATCH 1903/3942] tree-sitter: update grammars

---
 .../tools/parsing/tree-sitter/grammars/default.nix     |  1 +
 .../parsing/tree-sitter/grammars/tree-sitter-cpp.json  |  8 ++++----
 .../parsing/tree-sitter/grammars/tree-sitter-go.json   |  8 ++++----
 .../parsing/tree-sitter/grammars/tree-sitter-java.json | 10 ++++++++++
 .../tree-sitter/grammars/tree-sitter-javascript.json   |  8 ++++----
 .../tree-sitter/grammars/tree-sitter-python.json       |  8 ++++----
 .../parsing/tree-sitter/grammars/tree-sitter-ruby.json |  8 ++++----
 .../parsing/tree-sitter/grammars/tree-sitter-rust.json |  8 ++++----
 .../tree-sitter/grammars/tree-sitter-typescript.json   |  8 ++++----
 9 files changed, 39 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index 083dc61a96f8..e9cb0a1db6ed 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -5,6 +5,7 @@
   embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json));
   go = (builtins.fromJSON (builtins.readFile ./tree-sitter-go.json));
   html = (builtins.fromJSON (builtins.readFile ./tree-sitter-html.json));
+  java = (builtins.fromJSON (builtins.readFile ./tree-sitter-java.json));
   javascript = (builtins.fromJSON (builtins.readFile ./tree-sitter-javascript.json));
   jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json));
   json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json));
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index 99af884be9f7..16aef8ee33e9 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-cpp",
-  "rev": "5e7476bd014445abdae879661e9caf299215478a",
-  "date": "2020-05-14T11:46:56-07:00",
-  "path": "/nix/store/xz540ah1xx06n3wwmk3ym72nj0bz82hh-tree-sitter-cpp",
-  "sha256": "0v2l5269bhbpzcd929r3pn88gqcczx6spsq7p6ibsvsydbwj95wx",
+  "rev": "fb8250eef8b4cf1ce104806c50dc206e388b0e72",
+  "date": "2020-11-02T09:46:58-08:00",
+  "path": "/nix/store/qmza43f0fraa111bg50vaxsgnrs5kqs1-tree-sitter-cpp",
+  "sha256": "1sbk5a2p1fh6798naiswsap6fpj7n7bqhwd3xdyi35xf613qpwsi",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
index 67d58d64063a..612b8eb64d88 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-go",
-  "rev": "34181774b3e86b7801c939c79c7b80a82df91a2b",
-  "date": "2020-08-13T12:21:50-07:00",
-  "path": "/nix/store/3a5w7pz1m74y0lhbzq3bw3k2297lypqs-tree-sitter-go",
-  "sha256": "0cfi7ghs0m3iqwd4jvsqgsj4gnfikn1j2q0wbkdfvz2j25l0qwq0",
+  "rev": "dadfd9c9aab2630632e61cfce645c13c35aa092f",
+  "date": "2020-10-27T13:42:16-04:00",
+  "path": "/nix/store/91a8w265vjc955hyp7cqvpm8ks9zcmqv-tree-sitter-go",
+  "sha256": "1pwbzkg7s0l2fhr4p1rpcldjcpxbkaqsm3q81543almc75k38x8w",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
new file mode 100644
index 000000000000..260dc4d10c00
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
@@ -0,0 +1,10 @@
+{
+  "url": "https://github.com/tree-sitter/tree-sitter-java",
+  "rev": "f7b62ac33d63bea56ce202ace107aaa4285e50af",
+  "date": "2020-10-27T13:41:02-04:00",
+  "path": "/nix/store/h51zjbzdrm89gczcdv7nyih54vnd2xps-tree-sitter-java",
+  "sha256": "0jbh79brs1dskfqw05s9ndrp46hibyc37nfvhxlvanmgj3pjwgxb",
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index 9020e8a40bc3..68008d393d1f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-javascript",
-  "rev": "3d5493495b62b4ff8e8c24aee7519dd904e25813",
-  "date": "2020-09-21T17:18:41-07:00",
-  "path": "/nix/store/bhjws8yif1ihhvhfsrdrp4inf03ks08r-tree-sitter-javascript",
-  "sha256": "10fscmclcgl1a0314ppkfy0s7pmiiz5vjipbmks76608kic8nzpp",
+  "rev": "852f11b394804ac2a8986f8bcaafe77753635667",
+  "date": "2020-10-27T13:43:40-04:00",
+  "path": "/nix/store/7a9nd3prxbv2izvilqdxf58his097ak7-tree-sitter-javascript",
+  "sha256": "1cdqx75fm7fvna0iymw7n03a7f6gayfg97qwqz3himi0775fz9ir",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index 1c057f51ea99..402c4c087b18 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-python",
-  "rev": "30f538aa1f932a2864c102694761d3127a61dc68",
-  "date": "2020-09-21T13:21:51-07:00",
-  "path": "/nix/store/bxv85lm636xdsdqjf4n7sxjlhhh35qnv-tree-sitter-python",
-  "sha256": "0hzzz90pn1qwyl5xk03cah62rbvp1c1yp1pw2m3hifqflxg4rs1g",
+  "rev": "d245768132eb6cb74d8a394ca4d29dc57169b096",
+  "date": "2020-10-27T13:20:04-04:00",
+  "path": "/nix/store/afv7ibxpf5c2shafa89cnza88hsfb7kj-tree-sitter-python",
+  "sha256": "075r5i2id2rn76xm3pcrn5cpvj63dlaxcpvphig39a4c9f9hrpdx",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
index 06418942b4de..d5a1767a23ce 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-ruby",
-  "rev": "a6fcb529e9097a2efbbb3f4857e42773e7f2474f",
-  "date": "2020-05-26T16:18:48-07:00",
-  "path": "/nix/store/yqd5b7ky21scahnhrik9psalbkwi3ab3-tree-sitter-ruby",
-  "sha256": "0bxg5lfdazz5mlfnf0amcygvc8b2ydzl2blvbbhnziyx92r8di6q",
+  "rev": "f86d90cce578e28c824afdcdbdca7d031b88c0b0",
+  "date": "2020-11-02T20:49:49-08:00",
+  "path": "/nix/store/gs0hhb1dlgmv0y60zyyz7ki30yvpddfx-tree-sitter-ruby",
+  "sha256": "1n1irdjfmv27p5ia2vqzv8zfsq19pxi0as0wrkb7z7s1lqr1gwrb",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index 9f037cdc0947..4e0e2e2f7f47 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-rust",
-  "rev": "40620bf4097cbc9cea79504d7e877865df43a19e",
-  "date": "2020-05-15T10:53:35-07:00",
-  "path": "/nix/store/r24bba6gxchb5zqzghna8yjvqnngbv4a-tree-sitter-rust",
-  "sha256": "0hjp6nsskw341g97x41481b3zfwh8g853fs9six6j1mh92irmv6y",
+  "rev": "cf47ff80cbd8bdc6dd649a005c5f5d73f9c347e2",
+  "date": "2020-11-04T06:23:40-08:00",
+  "path": "/nix/store/8cvjxw8cz5jrkqwvgq88r7rfm269xwk1-tree-sitter-rust",
+  "sha256": "0yzcag0yy3ncxwpnb3fmsw8bxaidp7z8kbl8wwaxaj2vvxxf6sam",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index 7081d3036cf1..d31f72754bf8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-typescript",
-  "rev": "5a38a5bd04364d9f48b902fd1514e075b98b0edc",
-  "date": "2020-09-17T10:19:01-07:00",
-  "path": "/nix/store/b3q7vz9zhgjdbv3c2xap4k2ghpdjp2yf-tree-sitter-typescript",
-  "sha256": "1mxwvzqbaaq11cz7zidiwr29fs0b6ycf3nadwdkgiz8c6x2xx398",
+  "rev": "73afadbd117a8e8551758af9c3a522ef46452119",
+  "date": "2020-10-20T12:15:52-07:00",
+  "path": "/nix/store/wrgp1j5l50cigv5cmlxikw693a55i6g9-tree-sitter-typescript",
+  "sha256": "0dsbmcvjzys9s229drp1l8anram7d6nsx1nixl5m9znw54hr4w9p",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

From 2e1400173b9d8a551986d19c7fe5c2137ac10d19 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Mon, 9 Nov 2020 14:03:31 +0200
Subject: [PATCH 1904/3942] pijul: 0.12.0 -> 1.0.0-alpha

---
 .../version-management/pijul/default.nix      | 78 +++++++------------
 .../pijul/thrussh-build-fix.patch             | 12 ---
 2 files changed, 29 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/applications/version-management/pijul/thrussh-build-fix.patch

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index b17e759c6573..0eadb51fd1a8 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,64 +1,44 @@
-{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }:
+{ stdenv
+, fetchCrate
+, rustPlatform
+, pkg-config
+, clang
+, libclang
+, libsodium
+, openssl
+, xxHash
+, zstd
+, darwin
+, gitImportSupport ? true
+, libgit2 ? null
+}:
 
-let
-  # nettle-sys=1.0.1 requires the des-compat.h header, but it was removed in
-  # nettle 3.5.  See https://nest.pijul.com/pijul_org/pijul/discussions/416
-  # Remove with the next release
-  nettle_34 = nettle.overrideAttrs (_oldAttrs: rec {
-    version = "3.4.1";
-    src = fetchurl {
-      url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
-      sha256 = "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr";
-    };
-  });
-in rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   pname = "pijul";
-  version = "0.12.0";
+  version = "1.0.0-alpha";
 
-  src = fetchurl {
-    url = "https://pijul.org/releases/${pname}-${version}.tar.gz";
-    sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q";
+  src = fetchCrate {
+    inherit version pname;
+    sha256 = "0dnw2cxsxb20my81szyqjsmmnkakxawvsk6cnd1fi88k4lr0z2xh";
   };
 
-  cargoSha256 = "0rf8qmgzgyl718yznbskzafyg963ygibjmqncd93zdandgl9nj5v";
+  cargoSha256 = "130vryqs0g4a0328ivqafdylwqs64g4mp8vgmz6nz4c9l3h9wgcx";
 
-  # N.B. The cargo depfile checker expects us to have unpacked the src tarball
-  # into the standard dirname "source".
-  cargoDepsHook = ''
-    ln -s ${pname}-${version} source
-  '';
-
-  # TODO: Delete once pijul fixes upstream:
-  # https://nest.pijul.com/pijul_org/pijul/discussions/447
-  postPatch = ''
-    pushd ../${pname}-${version}-vendor.tar.gz/thrussh/
-    patch -p1 < ${./thrussh-build-fix.patch}
-    substituteInPlace .cargo-checksum.json --replace \
-      9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \
-      a199f2bba520d56e11607b77be4dde0cfae576c90badb9fbd39af4784e8120d1
-    popd
-  '';
-
-  nativeBuildInputs = [ pkgconfig clang ];
-
-  postInstall = ''
-    mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d}
-    $out/bin/pijul generate-completions --bash > $out/share/bash-completion/completions/pijul
-    $out/bin/pijul generate-completions --zsh > $out/share/zsh/site-functions/_pijul
-    $out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish
-  '';
-
-  LIBCLANG_PATH = libclang + "/lib";
-
-  buildInputs = [ openssl libsodium nettle_34 libclang ] ++ stdenv.lib.optionals stdenv.isDarwin
-    (with darwin.apple_sdk.frameworks; [ CoreServices Security ]);
+  cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";
+  LIBCLANG_PATH = "${libclang}/lib";
 
   doCheck = false;
+  nativeBuildInputs = [ pkg-config clang ];
+  buildInputs = [ openssl libclang libsodium xxHash zstd ]
+    ++ (stdenv.lib.optionals gitImportSupport [ libgit2 ])
+    ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+      CoreServices Security SystemConfiguration
+    ]));
 
   meta = with stdenv.lib; {
     description = "A distributed version control system";
     homepage = "https://pijul.org";
     license = with licenses; [ gpl2Plus ];
-    maintainers = [ maintainers.gal_bolle ];
+    maintainers = with maintainers; [ gal_bolle dywedir ];
   };
 }
diff --git a/pkgs/applications/version-management/pijul/thrussh-build-fix.patch b/pkgs/applications/version-management/pijul/thrussh-build-fix.patch
deleted file mode 100644
index 3989639620bf..000000000000
--- a/pkgs/applications/version-management/pijul/thrussh-build-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/client/connection.rs	2020-02-04 12:48:43.845299096 +0100
-+++ b/src/client/connection.rs	2020-02-04 12:50:00.140329310 +0100
-@@ -546,8 +546,8 @@
-                 &[msg::NEWKEYS],
-                 &mut session.0.write_buffer,
-             );
--            session.0.kex = Some(Kex::NewKeys(newkeys));
-             newkeys.sent = true;
-+            session.0.kex = Some(Kex::NewKeys(newkeys));
-         }
-         Ok(())
-     }

From c1e5f8723ceb684c8d501d4d4ae738fef704747e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 9 Nov 2020 20:17:41 +0100
Subject: [PATCH 1905/3942] cachix: bump to 0.5.1

---
 pkgs/development/haskell-modules/configuration-nix.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index a74b1eb05cd5..7c233ade7427 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -95,7 +95,15 @@ self: super: builtins.intersectAttrs super {
   sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
 
   # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8
-  cachix = disableLibraryProfiling super.cachix;
+  cachix = overrideSrc (disableLibraryProfiling super.cachix) {
+    src = (pkgs.fetchFromGitHub {
+      owner = "cachix";
+      repo = "cachix";
+      rev = "1471050f5906ecb7cd0d72115503d07d2e3beb17";
+      sha256 = "1lkrmhv5x9dpy53w33kxnhv4x4qm711ha8hsgccrjmxaqcsdm59g";
+    }) + "/cachix";
+    version = "0.5.1";
+  };
   hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent;
 
   # avoid compiling twice by providing executable as a separate output (with small closure size)

From 2472122bf39f2baf545bc113bda7b50681b7f138 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Mon, 9 Nov 2020 14:43:52 -0500
Subject: [PATCH 1906/3942] arcanist: copy directly from $PWD to pick up any
 applied patches (#95879)

---
 .../tools/misc/arcanist/default.nix           | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index fcddf1d0cacc..14ef09ee7ed0 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchFromGitHub, php, flex }:
+{ bison
+, fetchFromGitHub
+, flex
+, php
+, stdenv
+}:
 
 # Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being
 # invoked and complains about it being an unknown toolset. We could use `makeWrapper`, but
 # then we’d need to still craft a script that does the `php libexec/arcanist/bin/...` dance
 # anyway... So just do everything at once.
 let makeArcWrapper = toolset: ''
-    cat << WRAPPER > $out/bin/${toolset}
-    #!$shell -e
-    export PATH='${php}/bin/'\''${PATH:+':'}\$PATH
-    exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@"
-    WRAPPER
-    chmod +x $out/bin/${toolset}
+  cat << WRAPPER > $out/bin/${toolset}
+  #!$shell -e
+  export PATH='${php}/bin/'\''${PATH:+':'}\$PATH
+  exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@"
+  WRAPPER
+  chmod +x $out/bin/${toolset}
 '';
 
 in
-
 stdenv.mkDerivation {
   pname = "arcanist";
   version = "20200711";
@@ -25,7 +29,7 @@ stdenv.mkDerivation {
     rev = "2565cc7b4d1dbce6bc7a5b3c4e72ae94be4712fe";
     sha256 = "0jiv4aj4m5750dqw9r8hizjkwiyxk4cg4grkr63sllsa2dpiibxw";
   };
-  buildInputs = [ php flex ];
+  buildInputs = [ bison flex php ];
 
   postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
     substituteInPlace support/xhpast/Makefile \
@@ -33,13 +37,15 @@ stdenv.mkDerivation {
   '';
 
   buildPhase = ''
+    make cleanall -C support/xhpast
     make xhpast -C support/xhpast
   '';
 
   installPhase = ''
     mkdir -p $out/bin $out/libexec
     make install -C support/xhpast
-    cp -R $src $out/libexec/arcanist
+    make cleanall -C support/xhpast
+    cp -R . $out/libexec/arcanist
 
     ${makeArcWrapper "arc"}
     ${makeArcWrapper "phage"}
@@ -53,9 +59,9 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Command line interface to Phabricator";
-    homepage    = "http://phabricator.org";
-    license     = stdenv.lib.licenses.asl20;
-    platforms   = stdenv.lib.platforms.unix;
+    homepage = "http://phabricator.org";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }

From e50d10b4aac7581f25b5825fdf243404585df122 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 9 Nov 2020 20:00:47 +0000
Subject: [PATCH 1907/3942] deno: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 0c60821102dd..00c9a1a29b82 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "deno";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = pname;
     rev = "v${version}";
-    sha256 = "19ki9qyg9q26jq4jkcf8b6xhy4g4cn30zqccgl3324mnijhl33jk";
+    sha256 = "0dpx74zp85a3qcabfmwnsh1kl0c74ygafybqzmyvwjmax0hdgkq6";
     fetchSubmodules = true;
   };
-  cargoSha256 = "1q3gmilphkbh54y7m711ccr1gr5slk2nn91qq61rmmphyylwkgv2";
+  cargoSha256 = "0358vbpda9x0ib0vla4crn052lk299x2hg14g8lzymg33277lk3p";
 
   # Install completions post-install
   nativeBuildInputs = [ installShellFiles ];

From 2cc1860fafda2d77254369d0f8db71e314e8bcf0 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 9 Nov 2020 17:32:21 -0300
Subject: [PATCH 1908/3942] Dockapps: cleanup

---
 .../windowmaker/dockapps/alsamixer.app.nix    | 27 ----------------
 .../windowmaker/dockapps/wmcalclock.nix       | 32 -------------------
 .../windowmaker/dockapps/wmsm.app.nix         | 29 -----------------
 .../windowmaker/dockapps/wmsystemtray.nix     | 20 ------------
 pkgs/top-level/all-packages.nix               |  8 -----
 5 files changed, 116 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
 delete mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix
 delete mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
 delete mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix

diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
deleted file mode 100644
index 4e1256399e76..000000000000
--- a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchgit, pkgconfig, libX11, libXpm, libXext, alsaLib }:
-
-stdenv.mkDerivation {
-  name = "alsamixer.app-0.2.1";
-  src = fetchgit {
-     url = "git://repo.or.cz/dockapps.git";
-     rev = "38c74350b02f35824554ce0c4f0f251d71762040";
-     sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libX11 libXpm libXext alsaLib ];
-
-  postUnpack = "sourceRoot=\${sourceRoot}/AlsaMixer.app";
-
-  installPhase = ''
-    mkdir -pv $out/bin;
-    cp AlsaMixer.app $out/bin/AlsaMixer;
-    '';
-
-  meta = {
-    description = "Alsa mixer application for Windowmaker";
-    homepage = "http://windowmaker.org/dockapps/?name=AlsaMixer.app";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.bstrik ];
-  };
-}
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix
deleted file mode 100644
index 48f4753d674b..000000000000
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }:
-
-stdenv.mkDerivation {
-  name = "wmCalClock-1.25";
-  src = fetchurl {
-     url = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz";
-     sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libX11 libXpm libXext ];
-
-  postUnpack = "sourceRoot=\${sourceRoot}/Src";
-
-  buildPhase=''
-    make prefix=$out
-  '';
-
-  installPhase = ''
-    mkdir -pv $out/bin
-    mkdir -pv $out/man/man1
-    make DESTDIR=$out install
-  '';
-
-  meta = {
-    description = "Clock for Windowmaker";
-    homepage = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmcalclock";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.bstrik ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
deleted file mode 100644
index ad255414a692..000000000000
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }:
-
-stdenv.mkDerivation {
-  name = "wmsm.app-0.2.1";
-  src = fetchurl {
-     url = "http://linux-bsd-unix.strefa.pl/wmsm.app-0.2.1.tar.bz2";
-     sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libX11 libXpm libXext ];
-
-  postUnpack = "sourceRoot=\${sourceRoot}/wmsm";
-
-  NIX_CFLAGS_COMPILE = "-std=gnu89";
-
-  installPhase = ''
-    substituteInPlace Makefile --replace "PREFIX	= /usr/X11R6/bin" "" --replace "/usr/bin/install" "install"
-    mkdir -pv $out/bin;
-    make PREFIX=$out/bin install;
-    '';
-
-  meta = {
-    description = "System monitor for Windowmaker";
-    homepage = "http://linux-bsd-unix.strefa.pl";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.bstrik ];
-  };
-}
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
deleted file mode 100644
index 3e073cd8e91b..000000000000
--- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }:
-
-stdenv.mkDerivation {
-  name = "wmsystemtray-1.4";
-  src = fetchurl {
-     url = "mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz";
-     sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libX11 libXpm libXext libXfixes libXmu ];
-
-  meta = {
-    description = "Systemtray for Windowmaker";
-    homepage = "http://wmsystemtray.sourceforge.net";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.bstrik ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f881a85ccac..db3cc203d8fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24331,16 +24331,8 @@ in
 
   write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { };
 
-  alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };
-
   wllvm = callPackage  ../development/tools/wllvm { };
 
-  wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { };
-
-  wmsm.app = callPackage ../applications/window-managers/windowmaker/dockapps/wmsm.app.nix { };
-
-  wmsystemtray = callPackage ../applications/window-managers/windowmaker/dockapps/wmsystemtray.nix { };
-
   wmname = callPackage ../applications/misc/wmname { };
 
   wmctrl = callPackage ../tools/X11/wmctrl { };

From ce009bb0e26008a4272d06b7c35eeb1b6a2ff134 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 8 Nov 2020 23:06:35 -0300
Subject: [PATCH 1909/3942] Dockapps: new structure

---
 .../window-managers/windowmaker/dockapps/default.nix          | 4 ++++
 pkgs/top-level/all-packages.nix                               | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/default.nix

diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
new file mode 100644
index 000000000000..ffa2b92cb6f6
--- /dev/null
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
@@ -0,0 +1,4 @@
+{ config, lib, pkgs }:
+
+lib.makeScope pkgs.newScope (self: with self; {
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db3cc203d8fa..bbd62d5355cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24322,6 +24322,7 @@ in
   windowlab = callPackage ../applications/window-managers/windowlab { };
 
   windowmaker = callPackage ../applications/window-managers/windowmaker { };
+  dockapps = callPackage ../applications/window-managers/windowmaker/dockapps { };
 
   wily = callPackage ../applications/editors/wily { };
 

From 8741edb2ec222c23b520bdc20cd9181238869d68 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 8 Nov 2020 23:08:10 -0300
Subject: [PATCH 1910/3942] Dockapps: fetch sources

Most of dockapps live in a monorepo maintained by dockapps.net. Unfortunately
there is not an obvious way to fix a particular release, tag or whatever from
this monorepo.
---
 .../window-managers/windowmaker/dockapps/default.nix       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
index ffa2b92cb6f6..710408fc6e5c 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
@@ -1,4 +1,11 @@
 { config, lib, pkgs }:
 
 lib.makeScope pkgs.newScope (self: with self; {
+
+  dockapps-sources = pkgs.fetchgit {
+    url = "https://repo.or.cz/dockapps.git";
+    rev = "b2b9d872ee61c9b329e4597c301e4417cbd9c3ea";
+    sha256 = "sha256-BuSnwPIj3gUWMjj++SK+117xm/77u4gXLQzRFttei0w=";
+  };
+
 })

From 04e33d64aaf04881058bd951cd9cbfd0bd3794d2 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 8 Nov 2020 23:12:25 -0300
Subject: [PATCH 1911/3942] libdockapp: init at 0.7.3

---
 .../windowmaker/dockapps/default.nix          |  1 +
 .../windowmaker/dockapps/libdockapp.nix       | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix

diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
index 710408fc6e5c..5668189402ca 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
@@ -8,4 +8,5 @@ lib.makeScope pkgs.newScope (self: with self; {
     sha256 = "sha256-BuSnwPIj3gUWMjj++SK+117xm/77u4gXLQzRFttei0w=";
   };
 
+  libdockapp = callPackage ./libdockapp.nix { };
 })
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix b/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix
new file mode 100644
index 000000000000..bcdef42a78a0
--- /dev/null
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix
@@ -0,0 +1,30 @@
+{ stdenv, dockapps-sources, autoreconfHook, pkg-config
+, libX11, libXext, libXpm, mkfontdir, fontutil }:
+
+stdenv.mkDerivation rec {
+  pname = "libdockapp";
+  version = "0.7.3";
+
+  src = dockapps-sources;
+
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+  buildInputs = [ libX11 libXext libXpm fontutil mkfontdir ];
+
+  setSourceRoot = ''
+    export sourceRoot=$(echo */${pname})
+  '';
+
+  # There is a bug on --with-font
+  configureFlags = [
+    "--with-examples=no"
+    "--with-font=no"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A library providing a framework for dockapps";
+    homepage = "https://www.dockapps.net/libdockapp";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.bstrik ];
+  };
+}

From 7a7b4b49d594ebd244f0f1538a75954379a34629 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 8 Nov 2020 23:22:43 -0300
Subject: [PATCH 1912/3942] AlsaMixer-app: stay at 0.2.1

---
 .../windowmaker/dockapps/AlsaMixer-app.nix    | 38 +++++++++++++++++++
 .../windowmaker/dockapps/default.nix          |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix

diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix
new file mode 100644
index 000000000000..4ec021644011
--- /dev/null
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix
@@ -0,0 +1,38 @@
+{ stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsaLib }:
+
+stdenv.mkDerivation rec {
+  pname = "AlsaMixer.app";
+  version = "0.2.1";
+
+  src = dockapps-sources;
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ libX11 libXpm libXext alsaLib ];
+
+  setSourceRoot = ''
+    export sourceRoot=$(echo */${pname})
+  '';
+
+  dontConfigure = true;
+
+  preInstall = ''
+    install -d ${placeholder "out"}/bin
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -t ${placeholder "out"}/bin AlsaMixer.app
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    ln -s ${placeholder "out"}/bin/AlsaMixer.app ${placeholder "out"}/bin/AlsaMixer
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Alsa mixer application for Windowmaker";
+    homepage = "https://www.dockapps.net/alsamixerapp";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.bstrik ];
+  };
+}
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
index 5668189402ca..3f96d3ef6b4d 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
@@ -9,4 +9,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   };
 
   libdockapp = callPackage ./libdockapp.nix { };
+
+  AlsaMixer-app = callPackage ./AlsaMixer-app.nix { };
 })

From 9f20bdc582f7adec3b96a8b67450f19d458339b2 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 8 Nov 2020 23:24:51 -0300
Subject: [PATCH 1913/3942] wmCalClock: stay at 1.25

---
 .../windowmaker/dockapps/default.nix          |  2 +
 .../windowmaker/dockapps/wmCalClock.nix       | 38 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix

diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
index 3f96d3ef6b4d..536c70445e2b 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
@@ -11,4 +11,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   libdockapp = callPackage ./libdockapp.nix { };
 
   AlsaMixer-app = callPackage ./AlsaMixer-app.nix { };
+
+  wmCalClock = callPackage ./wmCalClock.nix { };
 })
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix
new file mode 100644
index 000000000000..f8ea781858a4
--- /dev/null
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix
@@ -0,0 +1,38 @@
+{ stdenv, dockapps-sources
+, libX11, libXpm, libXext }:
+
+stdenv.mkDerivation rec {
+  pname = "wmCalClock";
+  version = "1.25";
+
+  src = dockapps-sources;
+
+  buildInputs = [ libX11 libXpm libXext ];
+
+  setSourceRoot = ''
+    export sourceRoot=$(echo */${pname}/Src)
+  '';
+
+  preBuild = ''
+    makeFlagsArray+=(
+      CC="cc"
+      INCDIR="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include"
+      LIBDIR="-I${libX11}/lib -I${libXext}/lib -I${libXpm}/lib"
+    )
+  '';
+
+  preInstall = ''
+    install -d ${placeholder "out"}/bin
+    install -d ${placeholder "out"}/man/man1
+  '';
+
+  installFlags = [ "DESTDIR=${placeholder "out"}" ];
+
+  meta = with stdenv.lib; {
+    description = "A Calendar clock with antialiased text";
+    homepage = "https://www.dockapps.net/wmcalclock";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.bstrik ];
+    platforms = platforms.linux;
+  };
+}

From dc4a01d8f5bc8ebe107347e0e942fddafbba023c Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 8 Nov 2020 23:28:03 -0300
Subject: [PATCH 1914/3942] wmsm-app: stay at 0.2.1

---
 .../windowmaker/dockapps/default.nix          |  2 +
 .../windowmaker/dockapps/wmsm-app.nix         | 43 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix

diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
index 536c70445e2b..489bc8db7d89 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
@@ -13,4 +13,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   AlsaMixer-app = callPackage ./AlsaMixer-app.nix { };
 
   wmCalClock = callPackage ./wmCalClock.nix { };
+
+  wmsm-app = callPackage ./wmsm-app.nix { };
 })
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix
new file mode 100644
index 000000000000..dd25ee2b2fce
--- /dev/null
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix
@@ -0,0 +1,43 @@
+{ stdenv, dockapps-sources
+, libX11
+, libXpm
+, libXext
+, libdockapp }:
+
+stdenv.mkDerivation rec {
+  pname = "wmsm.app";
+  version = "0.2.1";
+
+  src = dockapps-sources;
+
+  buildInputs = [ libX11 libXpm libXext libdockapp ];
+
+  setSourceRoot = ''
+    export sourceRoot=$(echo */${pname}/wmsm)
+  '';
+
+  NIX_CFLAGS_COMPILE = "-std=gnu89";
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "PREFIX	= /usr/X11R6/bin" "" \
+      --replace "/usr/bin/install" "install"
+  '';
+
+  makeFlags = [ "CC=cc" ];
+
+  preInstall = ''
+    runHook preInstall
+    install -d ${placeholder "out"}/bin
+    runHook postInstall
+  '';
+
+  installFlags = [ "PREFIX=${placeholder "out"}/bin" ];
+
+  meta = with stdenv.lib; {
+    description = "System monitor for Windowmaker";
+    homepage = "https://www.dockapps.net/wmsmapp";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.bstrik ];
+  };
+}

From 46bc1e2f8678fa223fdceb69c7a2bc22be270b30 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 8 Nov 2020 23:29:15 -0300
Subject: [PATCH 1915/3942] wmsystemtray: stay at 1.4

---
 .../windowmaker/dockapps/default.nix          |  2 ++
 .../windowmaker/dockapps/wmsystemtray.nix     | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix

diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
index 489bc8db7d89..8a66fdbd67f2 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix
@@ -15,4 +15,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   wmCalClock = callPackage ./wmCalClock.nix { };
 
   wmsm-app = callPackage ./wmsm-app.nix { };
+
+  wmsystemtray = callPackage ./wmsystemtray.nix { };
 })
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
new file mode 100644
index 000000000000..6ec62af5d36e
--- /dev/null
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }:
+
+stdenv.mkDerivation rec {
+  pname = "wmsystemtray";
+  version = "1.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}.tar.gz";
+     sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k=";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libX11 libXpm libXext libXfixes libXmu ];
+
+  meta = with stdenv.lib; {
+    description = "A system tray for Windowmaker";
+    homepage = "http://wmsystemtray.sourceforge.net";
+    license = licenses.gpl2Only;
+    maintainers = [ maintainers.bstrik ];
+    platforms = platforms.linux;
+  };
+}

From aa08b8eb73e5904e66974d44ba4fbc2dbca5fe59 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 9 Nov 2020 15:36:08 -0500
Subject: [PATCH 1916/3942] qt5.qtwebengine: remove dead conditions for pre
 5.12 support

This doesn't change the derivation.
---
 .../libraries/qt-5/modules/qtwebengine.nix       | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 049b0349a4f8..ff2b444ac275 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -1,5 +1,5 @@
-{ qtModule, qtCompatVersion,
-  qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
+{ qtModule
+, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
 
 , bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which
 
@@ -54,14 +54,6 @@ qtModule {
     ''
       ( cd src/3rdparty/chromium; patchShebangs . )
     ''
-    # Patch Chromium build files
-    + optionalString (lib.versionOlder qtCompatVersion "5.12") ''
-      substituteInPlace ./src/3rdparty/chromium/build/common.gypi --replace /bin/echo ${coreutils}/bin/echo
-      substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \
-        --replace /bin/echo ${coreutils}/bin/echo
-      substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \
-        --replace /bin/echo ${coreutils}/bin/echo
-    ''
     # Prevent Chromium build script from making the path to `clang` relative to
     # the build directory.  `clang_base_path` is the value of `QMAKE_CLANG_DIR`
     # from `src/core/config/mac_osx.pri`.
@@ -91,10 +83,10 @@ qtModule {
     ''
      # Following is required to prevent a build error:
      # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it
-    + (optionalString (lib.versionAtLeast qtCompatVersion "5.11") ''
+    + ''
       substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \
         --replace '$sysroot/usr' "${darwin.xnu}"
-    '')
+    ''
     + ''
     # Apple has some secret stuff they don't share with OpenBSM
     substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \

From 42a115422d68db2d15e9dd599660bdc5e6c2779f Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Mon, 9 Nov 2020 20:53:04 +0000
Subject: [PATCH 1917/3942] promscale: 0.1.1 -> 0.1.2

---
 pkgs/servers/monitoring/prometheus/promscale.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix
index 25ad49e7c8a8..f8827b1f1fed 100644
--- a/pkgs/servers/monitoring/prometheus/promscale.nix
+++ b/pkgs/servers/monitoring/prometheus/promscale.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "promscale";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = pname;
     rev = version;
-    sha256 = "sha256:00mhkp3nf6h2zsvmmwyza1lahvmm05isfi7rqkx24c0dmkmif3x9";
+    sha256 = "sha256-Yl61hX4YBddw0euTwheMIOy08jgS47rAU0cKyXiz9s4=";
   };
 
   vendorSha256 = "sha256:1ilciwf08678sciwwrjalwvcs5bp7x254nxc3nhdf88cf0bp2nxi";

From 7a2455a0fdacaebbd1d0f4d7063c071ff8161ceb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 9 Nov 2020 22:24:11 +0100
Subject: [PATCH 1918/3942] batman-adv: 2020.3 -> 2020.4

---
 pkgs/os-specific/linux/batman-adv/version.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix
index e617881a570c..d93f8a6c46ed 100644
--- a/pkgs/os-specific/linux/batman-adv/version.nix
+++ b/pkgs/os-specific/linux/batman-adv/version.nix
@@ -1,9 +1,9 @@
 {
-  version = "2020.3";
+  version = "2020.4";
 
   sha256 = {
-    batman-adv = "0wrzh0k44zzjx2s5zj65hjkh4jm9y38qpis1s5cbx9cyj756slb5";
-    alfred = "13bvccz90pkjl09jyw68gj23pbrw9b05w1vhds9sjggwf3jkj5w2";
-    batctl = "0r2w2v4sy6wgr7mp9lc7yj9k4ldsbsm3425rjil7p0b17zmzf4rm";
+    batman-adv = "1cxr0zmn9nzisawkrfk0gzd9fx0pg6261c889kz47hwp4f545v6d";
+    alfred = "1ay69nifzghpbvy11fdca5cllkn852h6rg045lci4vzgqf7b2bd2";
+    batctl = "05rrpfbpdhxn5zgdps849qls2ifis6a94cjryb60d4y1nc2n0d7w";
   };
 }

From 24ff3949b01c0e2e7655ff7132964106930fc35a Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 9 Nov 2020 21:36:07 +0000
Subject: [PATCH 1919/3942] deno: move to new installShellCompletion style

---
 pkgs/development/web/deno/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 00c9a1a29b82..5fe6eb0575d9 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -52,15 +52,14 @@ rustPlatform.buildRustPackage rec {
   # Skipping until resolved
   doCheck = false;
 
-  # TODO: Move to enhanced installShellCompletion when merged: PR #83630
   postInstall = ''
     # remove test plugin and test server
     rm -rf $out/lib $out/bin/test_server
 
-    $out/bin/deno completions bash > deno.bash
-    $out/bin/deno completions fish > deno.fish
-    $out/bin/deno completions zsh  > _deno
-    installShellCompletion deno.{bash,fish} --zsh _deno
+    installShellCompletion --cmd deno \
+      --bash <($out/bin/deno completions bash) \
+      --fish <($out/bin/deno completions fish) \
+      --zsh <($out/bin/deno completions zsh)
   '';
 
   passthru.updateScript = ./update/update.ts;

From 3a5ba30c138d18ab79edbb60fa06beab62366d55 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 27 Oct 2020 07:29:44 +0100
Subject: [PATCH 1920/3942] =?UTF-8?q?fwupd:=201.4.6=20=E2=86=92=201.5.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* https://github.com/fwupd/fwupd/releases/tag/1.5.0
* https://github.com/fwupd/fwupd/releases/tag/1.5.1

* The changelog mentions removed dependency on efivar but we still need the package because it also contains efiboot required dependency. https://github.com/fwupd/fwupd/pull/2485
* Blacklist options were renamed.
* Test firmware was moved to a separate repo. We need to install it or some tests will be skipped. https://github.com/fwupd/fwupd/pull/2330
* Initially, there was an option to configure dbx but in the end, it was removed in favour of bespoke dbxtool. https://github.com/fwupd/fwupd/pull/2061, https://github.com/fwupd/fwupd/pull/2318, https://github.com/fwupd/fwupd/pull/2329
* Fwupd now checks hashes of plug-ins and will complain loudly that it is tainted when “invalid” plug-in is loaded (during testing).
* Installed tests complain about not being able to access cdn, even though we are not setting CI_NETWORK env var. We need a patch to fix that.
---
 nixos/modules/services/hardware/fwupd.nix     | 18 ++++----
 nixos/tests/installed-tests/fwupd.nix         |  2 +-
 ...d-option-for-installation-sysconfdir.patch | 11 ++---
 .../linux/firmware/fwupd/default.nix          | 36 ++++++++++++----
 .../firmware/fwupd/installed-tests-path.patch | 42 +++++++++++++------
 5 files changed, 75 insertions(+), 34 deletions(-)

diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index 222ac8e487eb..51eca19dca32 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -11,8 +11,8 @@ let
     "fwupd/daemon.conf" = {
       source = pkgs.writeText "daemon.conf" ''
         [fwupd]
-        BlacklistDevices=${lib.concatStringsSep ";" cfg.blacklistDevices}
-        BlacklistPlugins=${lib.concatStringsSep ";" cfg.blacklistPlugins}
+        DisabledDevices=${lib.concatStringsSep ";" cfg.disabledDevices}
+        DisabledPlugins=${lib.concatStringsSep ";" cfg.disabledPlugins}
       '';
     };
     "fwupd/uefi.conf" = {
@@ -59,21 +59,21 @@ in {
         '';
       };
 
-      blacklistDevices = mkOption {
+      disabledDevices = mkOption {
         type = types.listOf types.str;
         default = [];
         example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ];
         description = ''
-          Allow blacklisting specific devices by their GUID
+          Allow disabling specific devices by their GUID
         '';
       };
 
-      blacklistPlugins = mkOption {
+      disabledPlugins = mkOption {
         type = types.listOf types.str;
         default = [];
         example = [ "udev" ];
         description = ''
-          Allow blacklisting specific plugins
+          Allow disabling specific plugins
         '';
       };
 
@@ -105,11 +105,15 @@ in {
     };
   };
 
+  imports = [
+    (mkRenamedOptionModule [ "services" "fwupd" "blacklistDevices"] [ "services" "fwupd" "disabledDevices" ])
+    (mkRenamedOptionModule [ "services" "fwupd" "blacklistPlugins"] [ "services" "fwupd" "disabledPlugins" ])
+  ];
 
   ###### implementation
   config = mkIf cfg.enable {
     # Disable test related plug-ins implicitly so that users do not have to care about them.
-    services.fwupd.blacklistPlugins = cfg.package.defaultBlacklistedPlugins;
+    services.fwupd.disabledPlugins = cfg.package.defaultDisabledPlugins;
 
     environment.systemPackages = [ cfg.package ];
 
diff --git a/nixos/tests/installed-tests/fwupd.nix b/nixos/tests/installed-tests/fwupd.nix
index 6a0ceb57dda4..a8a683a1af7b 100644
--- a/nixos/tests/installed-tests/fwupd.nix
+++ b/nixos/tests/installed-tests/fwupd.nix
@@ -5,7 +5,7 @@ makeInstalledTest {
 
   testConfig = {
     services.fwupd.enable = true;
-    services.fwupd.blacklistPlugins = lib.mkForce []; # don't blacklist test plugin
+    services.fwupd.disabledPlugins = lib.mkForce []; # don't disable test plugin
     services.fwupd.enableTestRemote = true;
     virtualisation.memorySize = 768;
   };
diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
index a727e5f4a85b..349fcbb23f3d 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
+++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
@@ -93,14 +93,11 @@ diff --git a/meson_options.txt b/meson_options.txt
 index 3da9b6c4..6c80275b 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -24,6 +24,7 @@ option('plugin_coreboot', type : 'boolean', value : true, description : 'enable
- option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
- option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units')
- option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
+@@ -1,3 +1,4 @@
 +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
- option('tests', type : 'boolean', value : true, description : 'enable tests')
- option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
- option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules')
+ option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type')
+ option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent')
+ option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')
 diff --git a/plugins/ata/meson.build b/plugins/ata/meson.build
 index 8444bb8a..fa4a8ad1 100644
 --- a/plugins/ata/meson.build
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index d502d049ace4..85f5bbbf5b18 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -3,6 +3,7 @@
 { stdenv
 , fetchurl
 , fetchpatch
+, fetchFromGitHub
 , substituteAll
 , gtk-doc
 , pkg-config
@@ -88,7 +89,7 @@ let
 
   self = stdenv.mkDerivation rec {
     pname = "fwupd";
-    version = "1.4.6";
+    version = "1.5.1";
 
     # libfwupd goes to lib
     # daemon, plug-ins and libfwupdplugin go to out
@@ -97,7 +98,7 @@ let
 
     src = fetchurl {
       url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
-      sha256 = "AKG5stioIveQc7ooYb/2UoOaBzbPUFzYk8tZK0rzvK0=";
+      sha256 = "0fpxcl6bighiipyl4qspjhi0lwisrgq8jdahm68mk34rmrx50sgf";
     };
 
     patches = [
@@ -118,6 +119,12 @@ let
         # Needs a different set of modules than po/make-images.
         inherit installedTestsPython;
       })
+
+      # Skip tests requiring network.
+      (fetchpatch {
+        url = "https://github.com/fwupd/fwupd/commit/db15442c7c217610954786bd40779c14ed0e034b.patch";
+        sha256 = "/jzpGMJcqLisjecKpSUfA8ZCU53n7BOPR6tMgEX/qL8=";
+      })
     ];
 
     nativeBuildInputs = [
@@ -229,6 +236,19 @@ let
       addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share"
     '';
 
+    postInstall =
+      let
+        testFw = fetchFromGitHub {
+          owner = "fwupd";
+          repo = "fwupd-test-firmware";
+          rev = "42b62c62dc85ecfb8e38099fe5de0625af87a722";
+          sha256 = "XUpxE003DZSeLJMtyV5UN5CNHH89/nEVKpCbMStm91Q=";
+        };
+      in ''
+        # These files have weird licenses so they are shipped separately.
+        cp --recursive --dereference "${testFw}/installed-tests/tests" "$installedTests/libexec/installed-tests/fwupd"
+      '';
+
     preFixup = let
       binPath = [
         efibootmgr
@@ -254,6 +274,8 @@ let
       done
     '';
 
+    separateDebugInfo = true;
+
     passthru = {
       filesInstalledToEtc = [
         "fwupd/ata.conf"
@@ -277,8 +299,8 @@ let
         "fwupd/remotes.d/dell-esrt.conf"
       ];
 
-      # BlacklistPlugins key in fwupd/daemon.conf
-      defaultBlacklistedPlugins = [
+      # DisabledPlugins key in fwupd/daemon.conf
+      defaultDisabledPlugins = [
         "test"
         "invalid"
       ];
@@ -302,9 +324,9 @@ let
 
           config = configparser.RawConfigParser()
           config.read('${self}/etc/fwupd/daemon.conf')
-          package_blacklisted_plugins = config.get('fwupd', 'BlacklistPlugins').rstrip(';').split(';')
-          passthru_blacklisted_plugins = ${listToPy passthru.defaultBlacklistedPlugins}
-          assert package_blacklisted_plugins == passthru_blacklisted_plugins, f'Default blacklisted plug-ins in the package {package_blacklisted_plugins} do not match those listed in passthru.defaultBlacklistedPlugins {passthru_blacklisted_plugins}'
+          package_disabled_plugins = config.get('fwupd', 'DisabledPlugins').rstrip(';').split(';')
+          passthru_disabled_plugins = ${listToPy passthru.defaultDisabledPlugins}
+          assert package_disabled_plugins == passthru_disabled_plugins, f'Default disabled plug-ins in the package {package_disabled_plugins} do not match those listed in passthru.defaultDisabledPlugins {passthru_disabled_plugins}'
 
           pathlib.Path(os.getenv('out')).touch()
         '';
diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch
index 432056cbe7fe..d8f1a533b824 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch
+++ b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch
@@ -1,3 +1,5 @@
+diff --git a/data/device-tests/hardware.py b/data/device-tests/hardware.py
+index 7f1e1907..10fee1b8 100755
 --- a/data/device-tests/hardware.py
 +++ b/data/device-tests/hardware.py
 @@ -1,4 +1,4 @@
@@ -6,25 +8,41 @@
  # pylint: disable=wrong-import-position,too-many-locals,unused-argument,wrong-import-order
  #
  # Copyright (C) 2017 Richard Hughes <richard@hughsie.com>
+diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build
+index adadbcdd..1b51bb9c 100644
 --- a/data/installed-tests/meson.build
 +++ b/data/installed-tests/meson.build
-@@ -1,4 +1,4 @@
--installed_test_datadir = join_paths(datadir, 'installed-tests', 'fwupd')
-+installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'fwupd')
- 
- con2 = configuration_data()
- con2.set('installedtestsdir', installed_test_datadir)
-@@ -52,5 +52,5 @@ configure_file(
+@@ -65,5 +65,5 @@ configure_file(
    output : 'fwupd-tests.conf',
    configuration : con2,
    install: true,
 -  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
 +  install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
  )
+diff --git a/meson.build b/meson.build
+index 772b7bbe..f59302cd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -177,8 +177,8 @@ else
+   datadir = join_paths(prefix, get_option('datadir'))
+   sysconfdir = join_paths(prefix, get_option('sysconfdir'))
+   localstatedir = join_paths(prefix, get_option('localstatedir'))
+-  installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
+-  installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name())
++  installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
++  installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
+ endif
+ mandir = join_paths(prefix, get_option('mandir'))
+ localedir = join_paths(prefix, get_option('localedir'))
+diff --git a/meson_options.txt b/meson_options.txt
+index 0a0e2853..5f68d78b 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -1,3 +1,4 @@
-+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
- option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type')
- option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent')
- option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')
+@@ -25,6 +26,7 @@ option('plugin_coreboot', type : 'boolean', value : true, description : 'enable
+ option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
+ option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on')
+ option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
++option('installed_test_prefix', type: 'string', description: 'Prefix for installed tests')
+ option('tests', type : 'boolean', value : true, description : 'enable tests')
+ option('tpm', type : 'boolean', value : true, description : 'enable TPM support')
+ option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')

From e0f4e7e0917cd856048ad5fa4eb366b7729e45af Mon Sep 17 00:00:00 2001
From: Andreas Wiese <aw-nixos@meterriblecrew.net>
Date: Wed, 4 Nov 2020 23:33:50 +0100
Subject: [PATCH 1921/3942] bpytop: 1.0.47 -> 1.0.50

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

diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix
index e395b3c5d611..feaebc14e0ad 100644
--- a/pkgs/tools/system/bpytop/default.nix
+++ b/pkgs/tools/system/bpytop/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bpytop";
-  version = "1.0.47";
+  version = "1.0.50";
 
   src = fetchFromGitHub {
     owner = "aristocratos";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1zsxqnisb9zyji6xwl4b7r722mr0g4hs3a74xsfghd5kafvgzj24";
+    sha256 = "10j2g19sh2hl5lzbcllr862hkzr0mc1z8n24afzaycn1sphri8fc";
   };
 
   buildInputs = [ makeWrapper ];

From d9565b838638e9dbda077935e1a0696fabc40be0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Nov 2020 23:37:09 +0000
Subject: [PATCH 1922/3942] qview: 3.0 -> 4.0

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

diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix
index b6f25795665a..001616ab41dd 100644
--- a/pkgs/applications/graphics/qview/default.nix
+++ b/pkgs/applications/graphics/qview/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "qview";
-  version = "3.0";
+  version = "4.0";
 
   src = fetchFromGitHub {
     owner = "jurplel";
     repo = "qView";
     rev = version;
-    sha256 = "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7";
+    sha256 = "15n9cq7w3ckinnx38hvncxrbkv4qm4k51sal41q4y0pkvhmafhnr";
   };
 
   nativeBuildInputs = [ qmake ];

From de2112c03de506c39827e6b6aa7e16c951071357 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 9 Nov 2020 22:57:02 +0800
Subject: [PATCH 1923/3942] bolt: 0.8 -> 0.9

---
 pkgs/os-specific/linux/bolt/default.nix | 45 +++++++++++++++++++------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix
index 114a90129ac2..8bd442843b19 100644
--- a/pkgs/os-specific/linux/bolt/default.nix
+++ b/pkgs/os-specific/linux/bolt/default.nix
@@ -1,28 +1,49 @@
-{ stdenv, meson, ninja, pkgconfig, fetchFromGitLab,
-  python3, umockdev, gobject-introspection, dbus,
-  asciidoc, libxml2, libxslt, docbook_xml_dtd_45, docbook_xsl,
-  glib, systemd, polkit
+{ stdenv
+, meson
+, ninja
+, pkgconfig
+, fetchFromGitLab
+, python3
+, umockdev
+, gobject-introspection
+, dbus
+, asciidoc
+, libxml2
+, libxslt
+, docbook_xml_dtd_45
+, docbook_xsl
+, glib
+, systemd
+, polkit
 }:
 
 stdenv.mkDerivation rec {
   pname = "bolt";
-  version = "0.8";
+  version = "0.9";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "bolt";
     repo = "bolt";
     rev = version;
-    sha256 = "1qamls0fll0qc27lqavf56hv1yj6v6n4ry90g7bcnwpvccmd82yd";
+    sha256 = "sha256-lcJE+bMK2S2GObHMy/Fu12WGb3T1HrWjsNyZPz4/f4E=";
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig
-    asciidoc libxml2 libxslt docbook_xml_dtd_45 docbook_xsl
+    asciidoc
+    docbook_xml_dtd_45
+    docbook_xsl
+    libxml2
+    libxslt
+    meson
+    ninja
+    pkgconfig
   ] ++ stdenv.lib.optional (!doCheck) python3;
 
   buildInputs = [
-    glib systemd polkit
+    glib
+    polkit
+    systemd
   ];
 
   doCheck = true;
@@ -32,7 +53,9 @@ stdenv.mkDerivation rec {
   '';
 
   checkInputs = [
-    dbus umockdev gobject-introspection
+    dbus
+    gobject-introspection
+    umockdev
     (python3.withPackages
       (p: [ p.pygobject3 p.dbus-python p.python-dbusmock ]))
   ];
@@ -55,7 +78,7 @@ stdenv.mkDerivation rec {
     description = "Thunderbolt 3 device management daemon";
     homepage = "https://gitlab.freedesktop.org/bolt/bolt";
     license = licenses.lgpl21Plus;
-    maintainers = [ maintainers.callahad ];
+    maintainers = with maintainers; [ callahad ];
     platforms = platforms.linux;
   };
 }

From fdca20391ce37ee54a618094c8f9dded88c85f9e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 9 Nov 2020 23:11:55 +0800
Subject: [PATCH 1924/3942] plasma-thunderbolt: init at 5.18.5

---
 pkgs/desktops/plasma-5/default.nix            |  1 +
 pkgs/desktops/plasma-5/plasma-thunderbolt.nix | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/plasma-5/plasma-thunderbolt.nix

diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 265c22b55655..39299d8c83c0 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -129,6 +129,7 @@ let
       plasma-integration = callPackage ./plasma-integration {};
       plasma-nm = callPackage ./plasma-nm {};
       plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
+      plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { };
       plasma-vault = callPackage ./plasma-vault {};
       plasma-workspace = callPackage ./plasma-workspace {};
       plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
diff --git a/pkgs/desktops/plasma-5/plasma-thunderbolt.nix b/pkgs/desktops/plasma-5/plasma-thunderbolt.nix
new file mode 100644
index 000000000000..1bb79c327ebf
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-thunderbolt.nix
@@ -0,0 +1,16 @@
+{ mkDerivation
+, extra-cmake-modules
+, kcmutils
+, kcoreaddons
+, bolt
+}:
+
+mkDerivation {
+  name = "plasma-thunderbolt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcmutils
+    kcoreaddons
+    bolt
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c24ea21ce0d..a5a4230f1337 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15281,7 +15281,7 @@ in
       kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit
       kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration
       kwin kwrited milou oxygen plasma-browser-integration plasma-desktop
-      plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
+      plasma-integration plasma-nm plasma-pa plasma-thunderbolt plasma-vault plasma-workspace
       plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
       systemsettings user-manager xdg-desktop-portal-kde
     ;

From d19906002f6935c358bf8d925b1cb8c8195bb8bf Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 10 Nov 2020 09:12:21 +0900
Subject: [PATCH 1925/3942] thunderbird-bin: 78.4.1 -> 78.4.2

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index ca2b8a77347c..ec2d3c9af128 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,665 +1,665 @@
 {
-  version = "78.4.1";
+  version = "78.4.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/af/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/af/thunderbird-78.4.2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "36268a7fe6ec5a0ea0243f83ffbd73204d5c4ef257b0c8857a50428304b2d4c2";
+      sha256 = "8b1c2e12bd1de45251131d9fe444b06681577cafc019219dac4aa13b3abf989b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ar/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ar/thunderbird-78.4.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "831e70f807f05ce2f82bb11db35d05ed80dac53ad00c12ff6e191a627d0d42d0";
+      sha256 = "708ce9ae434ae78bd21d2c8a608a732d6ebdc88c2cc3c91c748d2b6a4eab24bd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ast/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ast/thunderbird-78.4.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "e6efde72ce7aeeda5f7c6d7cc0f3a08265c44546a0f8fc84a2adbc11cc038601";
+      sha256 = "46aadaa73a4e214c016f05eb9e0dc0a3daa6a87fc72988c696bf243d475d0285";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/be/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/be/thunderbird-78.4.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "07fe33390caf37a96c000e0f5435d07711f7a95dbe04f85a222b17ae5a13f1bc";
+      sha256 = "06abeef2331df228ad303d9280d077ef4a74af8658c4ac0147ae59e181dfc42e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/bg/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/bg/thunderbird-78.4.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "d460e201cbe4a1d6548a52121a33c2aaa7cbbf0e126fa1c4e8a431423424fb9e";
+      sha256 = "3aa13c52a514f5331bf626f9e3138bfe995c6a223559a9fbd6d590858484d9c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/br/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/br/thunderbird-78.4.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "9e85928f1145391d9c3f238612b93e6344a2ad5e6179bf09502b1b69c8ad1b03";
+      sha256 = "1f2d9ee7090e96e3e5611011c9fef8389b514dda4edbf47e889019312df6ab5f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ca/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ca/thunderbird-78.4.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "1516236c252f22933adf23bfe93d73fa272a4574deb674aef6e1f35006a6cc50";
+      sha256 = "f48d5d02a04212ca14cd4c175102a0e45483299d8a4615ff96232431c4ffa4a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cak/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/cak/thunderbird-78.4.2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "c46508321d32c468d067d86c04973ca345b09b0e983954eaa123d02778d61fbd";
+      sha256 = "28b541daeac6aa6274f4185f9471ce8b2a46e18fe55ae1e373246d9f23d78ec6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cs/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/cs/thunderbird-78.4.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "227209429c07238f38d334e5ac8a5fd895a4c87f51b21b4376df89c50bb6a789";
+      sha256 = "d4f061ac86da0b6279b81b30c8949cca93aca5b2f90d0e5dafc5cdecc2868e05";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cy/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/cy/thunderbird-78.4.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "b272926205e5470df8aec8b22d6733e4f47993e76123fe81d4be26ad5a153062";
+      sha256 = "824c703a570ae23d8e7b86d93baabb193842ac36fbc9d4ec65ae686e3d540de1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/da/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/da/thunderbird-78.4.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "13f9fe10c84d2b8d8d0215cb58a9852486741f5bc8c6979f0a701bef14a70f4f";
+      sha256 = "8dd27d2596346853e3fddab12ad0dabd700c5216310922e768faacb019b5b3d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/de/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/de/thunderbird-78.4.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "590f9a5a975544d2effedda942e3989a13be23b95f4e6707f9905fed3fc08214";
+      sha256 = "3920c60073ee3066fbe35a1d2c34ab03a7b7e2dfbbe22af97fa32814000f6942";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/dsb/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/dsb/thunderbird-78.4.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "5b572c847f9ec76b25c225652c23ecf8c56523ffc3071b437310f0d8f9049b05";
+      sha256 = "fd09bbf80996e3aaf12dba79c366c4cfff41a0db0cdf7f6ed4d9722fd2623ff1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/el/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/el/thunderbird-78.4.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "7cad76ea5a07dce6bdd3db78485f83a998ff27037f8ca68f8617659a06910a05";
+      sha256 = "a9df959b2df9c381b9881fe3015e654ac82ca441a3cfc25036c1e658401bf810";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-CA/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/en-CA/thunderbird-78.4.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "f261b38fbc8d83c20be63015a444644a95f7d8b6584fcfc193145abcc69a4164";
+      sha256 = "126e6fffa28b9c2a7eb7bb49254786fd0884aba62524dcf7d8352d6542903f77";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-GB/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/en-GB/thunderbird-78.4.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "5c0c364b1408182c0cbae1c2d05041781e2e4f3a17fb1735d61196c9b647dba4";
+      sha256 = "099ef4c54072c6a4a134badd02a51255573e876c8b630c3b9eaecfde997f9e03";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-US/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/en-US/thunderbird-78.4.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "a152c3b8c6ad4ba3a92a8a1f909b99599d8c3ded62b57e9721fb333b47f6509d";
+      sha256 = "e6041bd8ad2a21f0a8f8d78fd395239f1f41e2948584770673aaa0f3a9978b3e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/es-AR/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/es-AR/thunderbird-78.4.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "dc06a64e0b20dd174d6158e5d2f393bf6a6907f8f515120220bb2a8480f58d1c";
+      sha256 = "d4055f3134cd255f8e91ee2ef012bd4e4443e6db519cb7bf2543d4e193f59f61";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/es-ES/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/es-ES/thunderbird-78.4.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "7d3b7ff0ffb9b19f10bd7c2cffb5dbff8216c65c01fd4032ba5b7924c73ce343";
+      sha256 = "39f3c8e5262b1125f21e2bc0e51d53b09283ef4922a7bbec6146605ea0bd1d51";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/et/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/et/thunderbird-78.4.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "a9a8e610bc1c696137ee650fa11f2cbf8dece4ba32d1f0961ae697f6433cf1b2";
+      sha256 = "60331d65f98b68397a0d53a08a169b97654aae3d26efe48f494f575e1a51fe13";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/eu/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/eu/thunderbird-78.4.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "6835e8459b4191cd4bb5ae8011d032d475631e7a532450b98f0b087ed0a80fb6";
+      sha256 = "206026522eb361b599dccf433887b1314b554adfea90ee558f36d116ae6c8f70";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fa/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fa/thunderbird-78.4.2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "7cfd8681a7ed38364a823881fbb42af8cf33d17bf911e9f5b97dd18102b412f5";
+      sha256 = "88f1421d251e0bc5288f2c8ca333345ec97ca0a86d491b242471d1af82c04776";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fi/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fi/thunderbird-78.4.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "8c84662afb60e3dc94eace5a493f7feef6598b78613fe99f195408e4ee2b0a11";
+      sha256 = "4abbc607c3d6ec03a8416636e88ffdfd61fc0b062aa135d14fb3918c284f9ebd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fr/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fr/thunderbird-78.4.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "24449816c690757b05d1913ff1fa12eed47f316ac13c76a195ae0628c6950da0";
+      sha256 = "406437d8cf7a695b636c3c1005df5a65f174bbb10d0d961ddda08833ee2c808d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fy-NL/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fy-NL/thunderbird-78.4.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "9a0334f032333eda16cdabd5dffb05f5a22edb1dcf4bcd0b47495defd0d9f3dc";
+      sha256 = "456f51fbef14e1de16fdb3d7c31b6736e0e7b43c509ac38bdb8a88cb4a2de0d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ga-IE/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ga-IE/thunderbird-78.4.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "33e5a54e2259984ff29d3394fe936b5af8830e489e0775ff36eace4c6b3dc145";
+      sha256 = "0f1ab856deed39280ab9d6a43afd6f719470d4aafc4404e0662da0e14b64308a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/gd/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/gd/thunderbird-78.4.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "b91c4b3aafa2166cd27c52977711c55aa425f68c5f7cca64be1dd07fd533bc05";
+      sha256 = "07f2fc13f34a70d4e6ecc65d465e33f5bcff63196996fe057f8584ef2e7e595c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/gl/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/gl/thunderbird-78.4.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "d1c03b3b92bef4f3c94518981cf99840944c8a36aab7b2cfe3f72f1f0e57e045";
+      sha256 = "f4cb60a537ffba88823c8c8a60f2c164e62fbba13d448f2931c71e7d98d6abe0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/he/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/he/thunderbird-78.4.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "7fdaf0e83eeb39b66a6d1c2600f2c6f1b69ec4f67dd7b33a39132e838a699f06";
+      sha256 = "425a0bd38d231308fa5cac5d362b7818ccfb6b5fc06924ce312433ba4d5bf2b0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hr/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hr/thunderbird-78.4.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "4ba99eaa25964bde6108eeab702b096ba50b45d8db7e36f3203b0a71cc1e30cf";
+      sha256 = "37d3f14aeed404bad5cab35c256473a5927787f889afee3da112e510999373f9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hsb/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hsb/thunderbird-78.4.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "187a5f2b2e1b16fad948356f31b2ac903fe318432d9a3f105055c23d1225d11b";
+      sha256 = "3249467db25d25866a4d1e0acd9a18a26bad13e2ca683df04ca5f8ca19affac3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hu/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hu/thunderbird-78.4.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "8f6b79692143e6e27cc844985366004d06c8e55184a73477fd20020575947ad8";
+      sha256 = "f3a82c5917757f221ca59c4b6a950991b52b10f2782b1dffe21c7a7ca6a26272";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hy-AM/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hy-AM/thunderbird-78.4.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "4066683e4a635b163b9b14e1921d834b37a95cee8dd04fc6885094c5e0394dee";
+      sha256 = "cb917c1ff3fa342a8ad3253a03a1dbb4a417c0bc3cdfd1422ef5ff06dcfcca74";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/id/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/id/thunderbird-78.4.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "1fed6d3a9a11d303db2f2c6f7a92639b92ca144ce3b45eed4607696ea4617511";
+      sha256 = "1599ddf22093c6a99ccd3ec3e1492e65ce0b5ebdc3a69aafb321ec26f22b6a13";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/is/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/is/thunderbird-78.4.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "a627c95d2284b4e828a466865aa19262aa84a1a2267235c3f62d13c52081c580";
+      sha256 = "8cb02ca7ce8c28c10aa1f16ed08417342e93da2dd00f15c5a89fd71306f9afb3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/it/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/it/thunderbird-78.4.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "6b01e88da702deee95a3a6d526e563e854be7ae13414fed3a2c9cc427e906ffa";
+      sha256 = "16f3c54980e614b20ef6a8c0a09ebe7707e298d753d373da79bb2d52d1cc43b6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ja/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ja/thunderbird-78.4.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "3b63cf4c45945f4a40159a417ed217b77128905de82812fe2165c0c5f66410a7";
+      sha256 = "e4ec88dd86b46d814232662a4d558361043ac97b348a8fbb2076ec856087be6e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ka/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ka/thunderbird-78.4.2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "c9d11ae298691f2e302078f865b047b1c2b568ae763495fbfe2f2d4f04a9ef6a";
+      sha256 = "9c2a110ed4df58c334b533255c0f3bf46d777960967e46e74f7f376203bf467b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/kab/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/kab/thunderbird-78.4.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "b6367ccb74b2ced8708ca9f4c2c06aeaaf4f3bcba0b2b2fdf2c552aa10fcfc03";
+      sha256 = "1f5cf7b8a03fb4273d9ce4d657c3a77ac4a26b7716e3bed700e14f05a398163d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/kk/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/kk/thunderbird-78.4.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "99ece9975a3981fa33887d3b5d60cd6874e1dab7c51d830dc0d13c28c103ca79";
+      sha256 = "002ac92fee28c3ec9c05587025eddb4065a842df0430ace7f468ed8f3ec2df27";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ko/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ko/thunderbird-78.4.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "d81c844cbd490e5eeeb2739a9b040062baf3bbdf13ddfbceb59b5630019b935d";
+      sha256 = "277f0fdfbda0d215a03ccd663f0986cf1b0a1c4e68e3ef36e81c8505d6eb7d09";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/lt/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/lt/thunderbird-78.4.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "56b5813a5b0debfe90fa2a20fb9a13ea210e2eed37f180f3e23e851f871241e2";
+      sha256 = "65b6737b4ff528453bdaf57cc525a74c79899a9563d189123f87db729aa0f529";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ms/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ms/thunderbird-78.4.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "8dc3f341a69b9ef458c1203ff15779beecf3db2dede1cd8740ee19a9552f22f3";
+      sha256 = "cd40e14d4dbcf03ea7e5ab672678abc9b3b46c5b67fdbb961928a860c2f3218b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nb-NO/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/nb-NO/thunderbird-78.4.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "0fe431d3773de39431cd777cf301d2c3d8074dd41596bf6a6f1bef96870413b4";
+      sha256 = "49c9633a0552a704b06df87ea91991017be920684d12f66c72f6795dafd1cd5d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nl/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/nl/thunderbird-78.4.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "4127bdb6338210d9928fc84838a57cfb731aa3254aa5427471deca00bb12beca";
+      sha256 = "4514d79caa1e2b44cafdc9ef06aa54c4708763c888a489d6bdf4473597221316";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nn-NO/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/nn-NO/thunderbird-78.4.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "cf0c6d67115ee36b80010d93d50991a544af332ca19f1ed1199f49c7dd125049";
+      sha256 = "f6aab88e4708659658be8cfb457c40533969a261af489a976f4010439a833458";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pa-IN/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pa-IN/thunderbird-78.4.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "283c2be7f9bc0aa3d505f1838f1c03721a4b956870ac2b1e762b966e87767ce0";
+      sha256 = "10f5a885550f2cbee158fedc7111b96a0f07764b5d6d60004d17c233153f304b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pl/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pl/thunderbird-78.4.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "4c07e4500ad4c0d698942e3c47ced3bbd6142e4a70292629ebbe53ef5f1816f9";
+      sha256 = "1a192c0a9b8ac2f9b18445e69024462b8e95b78bff48014b55dd451e260aaf73";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pt-BR/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pt-BR/thunderbird-78.4.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "c6ace3452d1720681e668da50d16811286c1e73021bd06ab9b538c6f6fc5fda6";
+      sha256 = "b9dc3db4d8cf4fc2b958695f9077c50d48d355e850618320adff179d33a116d0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pt-PT/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pt-PT/thunderbird-78.4.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "b9ab4d38b271e2987b5e425a277042dc149794cf461283114553133e7fed5f06";
+      sha256 = "0a3887ff46f9ecc1576bda76e1469eed8ef43813ccec25536e2dbae289196bd5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/rm/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/rm/thunderbird-78.4.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "50fc69135b789b2bb5d8008292d3fc25f1a0a30bba35c6e24ddfeabe55231407";
+      sha256 = "1a13d443c00da4300aaf58d0af0620541de04e02e87218fa0774cad4b2aaa34f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ro/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ro/thunderbird-78.4.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "1e050b33a942dc815e739c57944a0d705982e18e74637172b0366a9b06916f7b";
+      sha256 = "62bd15566895dc9462b985f2f5e1afcc7057ef4e93f69005b9ebe89821a2a73a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ru/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ru/thunderbird-78.4.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "c295bda57db84e07f28affa4201c4f612478efce733cb9c69962f6d7a797218b";
+      sha256 = "e0624e745da31cafe1b885393e11622bac6ddd2e3e4c0cd35432eb5e0e57a47c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/si/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/si/thunderbird-78.4.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "63dc83cfab8be94893ca6a0d60e448d14db1afcae55192149a882456dca77e9a";
+      sha256 = "46e286fd0913b07ede577514b8e64ce279afd7bda3054b7cba4ec1f9981eef03";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sk/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sk/thunderbird-78.4.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "5ab5ea76649582ddf10fa77bbb95040d157883e0905df72f5bc0ae79167d97be";
+      sha256 = "3ab838c25d5e10d318705bed69e690d287e6b988412a3f9d5d94f2b7c8cd831b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sl/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sl/thunderbird-78.4.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "da3f8a30797386bc7c9ba135ba360cee01143bc76a2315e7a2223bab90e2283e";
+      sha256 = "c04e1a339c4fb2ca8748da6bbc0f5a4dc9eb032b565d6f2333c7d1751eaaaa9a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sq/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sq/thunderbird-78.4.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "f2f9639c4b4dc4bfba476aa92814fee65ecd3fca27652177614d1107e4200246";
+      sha256 = "ae9052f081baf3f25c43b2b1e109ce50abeacb5b2322ef38f8d42fb070417908";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sr/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sr/thunderbird-78.4.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "3bcad0c845e4481a22c1b330b6cd94c3c6fc46c33597ce5af0594368579a8260";
+      sha256 = "c4eec55d9be21e02158e8266b9b7b424aa1f5d1078d9de2f0dfce4fef5f801d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sv-SE/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sv-SE/thunderbird-78.4.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "9b09d4ab71000429c5015dd8a0642cfe0eeeaa785d2cac6e876b1cd6aadaeb44";
+      sha256 = "c7c01c580e1201e2948d0bfe3e029b6bd3a98e9845e6ff648d8bd4fbc8189d37";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/th/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/th/thunderbird-78.4.2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "b33e42f0271ee84a581a737513197d5f036695706b19697a53000834c199c75f";
+      sha256 = "f09079980e41c156e62f8d008d600850ca8a62fc88917f3cc06d10321bb3e500";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/tr/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/tr/thunderbird-78.4.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "f419ed9f0f06575da2f89486d830ab7fd2b439dcfcac92f1b31c573901e7b9ea";
+      sha256 = "2b99f6fcf904c7cdf67de2ed957167b6e1fe7d997c5a422641bba0af8a22b7f4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/uk/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/uk/thunderbird-78.4.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "bcecec66a6ef8b928da2aa5d52d89f4f1587d4e45bf0e836b71912b0e5a43f7c";
+      sha256 = "d502f4447e1e0c02e9384435e1b552c4da6d083225555b03f90d71ed04314324";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/uz/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/uz/thunderbird-78.4.2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "2b33f40b9da386e61f3bdcacd9c16fc06dac18d2b36865292700744dfbe2da25";
+      sha256 = "7b9548f91dcf0ee6bfaed9d735baf9254842a633e3f06986d00d9d86b0f645d6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/vi/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/vi/thunderbird-78.4.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "b5d005c45221c41e1e81234b755f6a9d380220cc03f43012c40440a0378c19e0";
+      sha256 = "32f78b425fd56900d1b3319e571af151214edee83a22321a449556e8ddebea69";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/zh-CN/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/zh-CN/thunderbird-78.4.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "c08765cc8562cce08b4cda04123cd8672f5abb130b597f36f4c143d74b09b9b3";
+      sha256 = "a6252fdd66dbfbd33444a3ebdacef38f8b600891af324d31f22f2fcf59b1e7fb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/zh-TW/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/zh-TW/thunderbird-78.4.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "56f84ea43a5288a6cd34f8de5f69dde05737474f11c70d638981ef2ff4ea5bfa";
+      sha256 = "b97a176fc12f156d8503e07819e9a0536b338850b8527c3896d93a36d64083aa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/af/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/af/thunderbird-78.4.2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "95384cf3d0ab6ad8d3bb133e8ff7c1881523c0f7be840c5ab6016325ebc7f9ff";
+      sha256 = "e1f0a03f540da701f9e742cf7a05e21a1216ba5c60c402968799ff494ffb1fcc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ar/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ar/thunderbird-78.4.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "c2cf87579a092bec69042b35743574872b8b791d54628c35c28d44c1dc605b6b";
+      sha256 = "5bbee34fe9c5cf02f2f3c8160264f3a0ca3ad880bd75fd1ede87f906b886c7fd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ast/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ast/thunderbird-78.4.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "127ce24b2c06606e9567e2106ba5cb9628d8bda10620b01cbfe60bc287977c94";
+      sha256 = "8a5e481e9aa16619513260d532ec6f7e2c6338b41a0a44468950ec26287b2a26";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/be/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/be/thunderbird-78.4.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "e8acd7cc25f91af91caee7487598cf1f60512864cf1fee714d2289a65f0cc195";
+      sha256 = "27f600f0d4b977cde9ede5bd39efd97bfa1abc04f3d1c7a3290339e7eedaef47";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/bg/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/bg/thunderbird-78.4.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "461e4ec0b0f3dcb78426a99f0b8dc32b14dbc561b89e8d422433f5360425448d";
+      sha256 = "a9a6c127461ca7da6b5fca5e2d2ca8b1eecbbe78b42a9e18e16bc7a343c761ec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/br/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/br/thunderbird-78.4.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "ba3902a457d0570d3eeaa63cc83a67e35532e547127b71f38781158bc3cc5e60";
+      sha256 = "b8f363ca9ada5b2ed80a9526d1f775d9c17bfecd6b84113391fd6a5b1966bd90";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ca/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ca/thunderbird-78.4.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "609de3623c6f4075bedee741533843f6f9fd1afc5933fe3a8709f5c16c7d7bc5";
+      sha256 = "e1c5035ab818ce7525c2bd659622b14b3fe544b7f4c8432bca2b018c7ba1bfa5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cak/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/cak/thunderbird-78.4.2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "4a5aa707eca53cf5490189a09d222abaa8290ea3366d4bf081273c23e89b3fc0";
+      sha256 = "f42d03442c8ab4bd844b0414e6d6c8ee168230714b55bbff1704117315f26a0d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cs/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/cs/thunderbird-78.4.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "0450c73284b274af21f3f0c4c21842e11fa2a86fcb38f96332c1ca8984149c62";
+      sha256 = "c45a3b75c5106377d73f72b905814972a58604b4f2bfe49f05f5177584f2e0d6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cy/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/cy/thunderbird-78.4.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "5686316ec53a76dab272934dbd274a47802c5c31f2ae8719bcf85c22e12cc3f7";
+      sha256 = "e8e1f70703c9c22fceb2efe10f55a2f25da4085822ada1a3a3a3736ae41c0503";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/da/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/da/thunderbird-78.4.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "2025f5946989905fd197fe5bf6c51160e7c9d281d6cfd220ea3ee0393cc54ca0";
+      sha256 = "d8fb3be7bc41ae6ae0d064bdf9ab9cc569f65dc18f720de960ace84bb2514b68";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/de/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/de/thunderbird-78.4.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "906e8a5de0aa12b496f4d4447df25432b11c88d79b7ab4a55291a9d65434aa03";
+      sha256 = "373f50cb99608779e502d76af0e4a301ef0b8b75a6ec235f64da7626188157c6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/dsb/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/dsb/thunderbird-78.4.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "d6bfb2b790d8391344916515d1cc6ca2eb68a3e58934cacba14e77788aec6b09";
+      sha256 = "07518d32b488fb805adceea1126ca104f2e86e3a1245f6cc4fe108b70335c995";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/el/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/el/thunderbird-78.4.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "5f96345a945697326b24fcd73a96fa2f49edb66b02f4c23b6d392fad87935e08";
+      sha256 = "97699a80d96422dad4c95658c9c4d472bd1d69e1823f5a5f7dce5fdaddf1211f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-CA/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/en-CA/thunderbird-78.4.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "b57e44fd16e33b178778a60f0bd47519585a3e648b3b621f1fd693836c5fb598";
+      sha256 = "0b2dc377399c4f27acb717c7f0e59e9e735ad3d2ba1e617a93a3fa337b6dd2c0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-GB/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/en-GB/thunderbird-78.4.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "6f656dcbd7aaab5995beb11a9847e32f8820199272e2f9ce27583cd3d7e50a76";
+      sha256 = "679fd1138a8795b0e7d64a4b8d8a2821deb8b30d40092e9df98b0a08d6cc6539";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-US/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/en-US/thunderbird-78.4.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "8c6bccc757df947bed74a3f7448a3885932a4f6c21d24ab6b5c7a94ab83ebae5";
+      sha256 = "a86f2780353dff8a449f323d5f54d83ce70b724db1a2d77dc3cecf6d1e849ada";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/es-AR/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/es-AR/thunderbird-78.4.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "55bbc629ceadf359e0ad05e763a31479f6c57c38f372e55812b028681a5ff32a";
+      sha256 = "1fbd2312a971f658243dd6733067157fe3de509a88b2cce766ee8e45c243d23d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/es-ES/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/es-ES/thunderbird-78.4.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "bf30dd8882b2b35bfaa62a6c4b40a823333476128a6d5dd3e3d2c8eb16303b9a";
+      sha256 = "e51217ca711a307c67f538d487eb836d49e4ccd6b8ff9b1a1926bd481322d46f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/et/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/et/thunderbird-78.4.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "5b977eab7f203e230d6a03b36afebdb32c481f1eb8129e454977791469ed5651";
+      sha256 = "345ccfa0e703893795d226aacf95645cc2cdc7dc99f5f9fba108466f74af19fe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/eu/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/eu/thunderbird-78.4.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "f2d606a6f825640c0f344cf470d87a1dea5fc6ff538239ce25c3d7c9fc76237d";
+      sha256 = "47e95ce28a229dbd01d8598d3a5b7f00d8e2c1934f8da4ff92052693dbb0c7c9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fa/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fa/thunderbird-78.4.2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "95d0d3d1b456c035cc6ed09df970e9e772a71af3703f05e9388e844d7f80edab";
+      sha256 = "6c05b6a34a1ae3232b417e37c6c71bb05e46a296019b55192331cd441f212e1b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fi/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fi/thunderbird-78.4.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "e0be2532774bbe017a6091d7e1ec79901f692c39e04e01fe4094f7c8179fbaf4";
+      sha256 = "fe043a86dd6679dc20ed17920e008894d78562d099861c0cda598c74aff3b176";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fr/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fr/thunderbird-78.4.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "48cc16a61958160f369b32e8a0dcd2979ee65e18efe3d1dd3a4af1109842718b";
+      sha256 = "950fa73e6f5fcf2fd66da9af7b79e43420e3ce75c9227fee095ea65ce2769a7f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fy-NL/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fy-NL/thunderbird-78.4.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "386d0a2ed01b158f0fe18eb6820ff9a17fbbea61241eaf873782271ac84eb103";
+      sha256 = "e01f59e5b7abde309421515240229d16cc0ec6ad4ea52ef1a54fb65f0bc49091";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ga-IE/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ga-IE/thunderbird-78.4.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "c0c15410e6812e8652181ab347b3fe60fdce3b5b9958d54ef3f96ecc46a4d344";
+      sha256 = "53a7b0b5a2046525701120101fbab5c581b99de56caadf3aed4732f444c35569";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/gd/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/gd/thunderbird-78.4.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "3989f0c0f87ebfca3e4cfad0ac9ca2964791ab8f1163f1bec340444ae4a72a7b";
+      sha256 = "eaea6b3770d5bc51a00e25fee02110f5614d9ef52049fc092d90dc1e8de4c210";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/gl/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/gl/thunderbird-78.4.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "eb1b58c93e492a79f92660909e671ee7ec504701b8e074d3dc6f3d3fe3619660";
+      sha256 = "b0c5d871785d1efa23bdbe341d8186b96394375ac56bb541d5d9a75bc784b471";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/he/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/he/thunderbird-78.4.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "f584e117ba4fbfbb7d2c28b68377a88aad87929657141adac5ce960bcf5f4fa3";
+      sha256 = "cef410178a3cf310c7bf158eba5c12093385dfda1de334d6d6e0c28ada16c7ca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hr/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hr/thunderbird-78.4.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "633eab2f8ac99426dd85b614f04d96509125f0799c187305b7678496d9ceff0f";
+      sha256 = "9040e2235a752a50cbe09207684df928b84787629d21c8d53e6b9bfc708b09a3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hsb/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hsb/thunderbird-78.4.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "80e4b98bbc9874de9b4c8e35633f6eea7b5707cfc4943df7264cf0bbfba49d99";
+      sha256 = "b0bb84d18c588abf2f05abc8ecb1f3a169221fcdf4117e48b3169362cfc69aa6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hu/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hu/thunderbird-78.4.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "5a9339a876a7e0dced6769a99a948329f6eaa400acb6920a24d06695120f682a";
+      sha256 = "6d5d0ded325cf7852ef638d7f5d8dd4d7ce127ad7f4eace22ce696541f9485a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hy-AM/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hy-AM/thunderbird-78.4.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "286542d67a76a6e8f0c34e7aca9c23c8922bf85f8be77c913285e208f8b195a7";
+      sha256 = "cbb8de1462385ef9bdb42cec5e8c81664347dc9e7573f602f41ff586c217d8ea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/id/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/id/thunderbird-78.4.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "930cbbe1520c544a25cfbdf8d10b4e6ae19a812c8a20ce51053ba0d5fc2b4b24";
+      sha256 = "358a95d7d87adc85cd39bf6da1373026de5b8631139ee1ec44e9410b027e00cd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/is/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/is/thunderbird-78.4.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "7fca3c4c9d3a309ec182d1486438973741fe2f1e39afd3ccb769256657db20a6";
+      sha256 = "c7b27e5311737cd5f3d314830aba0ec165669d8c949edb37482fb4df3b460f9e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/it/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/it/thunderbird-78.4.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "3b44f63975cfe7460f3eadd9f71f13db9ded5d9e5622ec322f556692f979434b";
+      sha256 = "a302c50190fb992fcdaa66a8de9c5f5d177a5563fcec55e5f433761646ccfcbd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ja/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ja/thunderbird-78.4.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "1284e52cda834b1ef9b5ac6a1dc29858f6e1519d0fd47d330744c0d294338650";
+      sha256 = "d2357cc5bb5b5493035a79b504db8db2750f5880705b693554e2170d8d840cb0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ka/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ka/thunderbird-78.4.2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "b12a79e20fce3db2541dcde61e04206e82530d1d79b58637bfcede87294fd801";
+      sha256 = "2d150d1160d92499fd9dc4d632e006170a27929f88909715c0d0210005516ff7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/kab/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/kab/thunderbird-78.4.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "9766eab276e77b0e33ad7ecbf8f26b84aa2a079a4fc9e4dfc992c41074513e40";
+      sha256 = "4f9879d5a106ec9fc3bd423fdb5df25a3e0d47690cfec652654472addd21a2c2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/kk/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/kk/thunderbird-78.4.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "aec202db7c28ae69c9f7684a2e4f30a16ab29ec983aacb32bbe4b5bd31b76e94";
+      sha256 = "f8d7fe1f39af2019bb37e117545e8cb2901feb0d31a92287eb4b30da2e431a6b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ko/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ko/thunderbird-78.4.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "b0e553c14925413461a87f1d81591bfa4e2ce2c5ad87e8ec609fef76ba4f17d8";
+      sha256 = "bd9abd627205fe33430717a60eea8b54498325a8fe4d92fb5572a2719ba50341";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/lt/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/lt/thunderbird-78.4.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "6036247e3025c2b513762577e7de1d1eda050572f674c31391e583ccd16e80f8";
+      sha256 = "69ab343eb79c42c4a1a9ea480aa2ac50d95e9140968690fd99b3d13824be17ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ms/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ms/thunderbird-78.4.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "0852cb745130e22af327e2ce39249751ed482c8216c18f4545bd294f4afb4e29";
+      sha256 = "fb1246094e22ff59f8671a6aa0827c8e51a7fa8dc2bb565a3cb446d35c098f16";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nb-NO/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/nb-NO/thunderbird-78.4.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "eebec58d3a20956894711266715ce5a4afcfd44b5eb7b334dc0c22068fbb10a6";
+      sha256 = "0ffcd2db855686c4b7e8751884aa4a8729b0fc8da597d256d37d6c73a50c7585";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nl/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/nl/thunderbird-78.4.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "0c6d35960d89681087bcfbf403ff727f53ba2e67de9c69d04f96b68447b616d8";
+      sha256 = "615205a37248619a664b4649f808ddce9b019aae60a900fe4d2ca2dfdd717fe2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nn-NO/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/nn-NO/thunderbird-78.4.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "b761b921ba2e604dcde7ac0e03a83ef29a3311309cb95bc39801b8bcfd80ef98";
+      sha256 = "8813d2b40da457d5d7c0da88d54b8b0c13d2ea0215b9bee2966215d366d79a81";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pa-IN/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pa-IN/thunderbird-78.4.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "fa350ad64a3ff760a6e2cc6ac6b6ad1d6b9ad300b6c3420477148152bc207499";
+      sha256 = "31feb987ff8493d96e15395deb93506b13089db28d91c0bf6ee4da271db8a0d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pl/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pl/thunderbird-78.4.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "8b187d44bc1364dc76258ff3452610483b2ab3d060c9de43e47c25fd3103c5d9";
+      sha256 = "a9c30450e918ec4c0a95da51c071f8c4ec4f870976ac494ae6042aa3fdbc4a56";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pt-BR/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pt-BR/thunderbird-78.4.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "1ff199f91e49d72bd9821bfe3e2d33cb4a750a6c46aaf16a80554c195694ed43";
+      sha256 = "157d64059b2a7a1082f233c05fdc0302f92dfa496c0075761bd54327b439594c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pt-PT/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pt-PT/thunderbird-78.4.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "098043202612b362a16353c84a5b9e662331c2311679357592b5a77a6690b68d";
+      sha256 = "d8a403996d56e22809e9124fc4c9dec98cda19a5fad7144fa87e452ae75a990e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/rm/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/rm/thunderbird-78.4.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "ab9bb22e53da48744885634a14886ddb23dd5ccab376e5323824daa3f22ae0cf";
+      sha256 = "97524948b2f9259d1b08b9bbc6533b79fd5e592b08fb5fc5cc63bdb749d5866c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ro/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ro/thunderbird-78.4.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "fb3e61830c5693c7f3b84eb4e3c60ff97324c5654352008aabbe9f16ea40cb0e";
+      sha256 = "99e2c94054fd01001555fdcf4e9ee8a04fbae77e5ff9d34ebc42a6415b939bbd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ru/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ru/thunderbird-78.4.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "f9fceef81a605ebc66fd90e2759205c4eb7160095312579eb7543b4293dd7a7d";
+      sha256 = "f1996c3f3b6b5371f853f6854edd15ee030b6238f396870a2cff39320eac111a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/si/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/si/thunderbird-78.4.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "0903c3d1bf790c5c10167839e3bc60d80a23e4230895703f7c931856cb617038";
+      sha256 = "10df360a1d5a94ccd218a265024fb3f3d9d9a72b8c749ab93d797a3879cbad03";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sk/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sk/thunderbird-78.4.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "2018e5685fbcb5c2cc8925be39b04f6d98347cb59446af62846378818d6435f6";
+      sha256 = "a5f9e0b983961cc4e4ff7cb6f03c197cd8729eead74d6c0b657b441a91635326";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sl/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sl/thunderbird-78.4.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "d20b13b5caa2f5c9c431f3e69095f094800fa520b3a5a57c27a4c9c565961fb8";
+      sha256 = "10526684f3066322066f204a2cf978c779bb895d5c7ba73880ee32caf63d62a7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sq/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sq/thunderbird-78.4.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "164041c3958f57f90d17fe1457205a420f326c17e88da0197732435cf6a5dfca";
+      sha256 = "d422e42397d2012efaeeb37101a5b1b29feb34e9e9dbaf87a85f9e2f881511ea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sr/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sr/thunderbird-78.4.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "8ffcd2dea1b4980519220a27346b5c0fa955b89580836c38711c21c8eb7d26c8";
+      sha256 = "1e9b5637581c2c4973efcc5b0844ca228f66c4fbb0a44e88201973623aad0b83";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sv-SE/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sv-SE/thunderbird-78.4.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "83536011e7bfe2e7a0a760ed879e041b4caa3ee27e95829331faefd29e8deebb";
+      sha256 = "592daeeebdb5f56f486a4e6efa1c51e709d834a65c861e76e5b6fd86f8a4bb09";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/th/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/th/thunderbird-78.4.2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "13be237b698dc9b468af7a2b8ff062118421a7b798771f1db4f82bcb1098f83c";
+      sha256 = "00f883ed3d542d0bf3da3e744523cfd1b3405ae0b928dd83c42e55e5f1bab4e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/tr/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/tr/thunderbird-78.4.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "c70d085f6ceed58e7ea55ab01d121627a55df2f5e961ef160f4965db941660b3";
+      sha256 = "ab69a35eebbd1cdef80b22a398c4d570c17e13a8a36e5399b892974d7ed29b10";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/uk/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/uk/thunderbird-78.4.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "c1b7b0efe7af03a488c80020247e2d8038d6dffa313188083bb75c1bc09c35fc";
+      sha256 = "efbd5bf9552333d78c68191265b3ecccb2a59ae19f2bfe7a1d8b096a44c9fcdc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/uz/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/uz/thunderbird-78.4.2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "f4b8d20603c5e1dcc72760623803fc4cb34fffffd7b394c1998b860b5e3bc129";
+      sha256 = "db90d47b59efeb5c847ecdf8b7438a4f99d0954283f1deda39a0ee08f54fdfd1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/vi/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/vi/thunderbird-78.4.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "6d9d7885ba742ae28766ed98e64aa59892ffb51ad67eb9bc47d5a3974b8a7f50";
+      sha256 = "1d616c682f04f7c0ec976d41eb71d3ac929eaa3199b4af749a80c906a3f2a212";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/zh-CN/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/zh-CN/thunderbird-78.4.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "e47c2e9b66c99c8ba02c60f739d31ea2d679cdc4d6f1f407257ef3372cabf364";
+      sha256 = "490e4e310606846836d93ca9704b7de11bf307b918933fd0187aa5d3795a82bf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/zh-TW/thunderbird-78.4.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/zh-TW/thunderbird-78.4.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "1cbab249ae670a204e464a9082365967a74ce2533bdab60682c14fe65dafba16";
+      sha256 = "c62476ac43d302ad9895524f6f66350122edfdf393697111d5868cf25b996c1a";
     }
     ];
 }

From bd03a75f6f59f76f0e72d71135eb95bde3ffb683 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 10 Nov 2020 09:12:50 +0900
Subject: [PATCH 1926/3942] thunderbird: 78.4.1 -> 78.4.2

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index dd339ef1c1a8..e92e89c7126c 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true;
 
 stdenv.mkDerivation rec {
   pname = "thunderbird";
-  version = "78.4.1";
+  version = "78.4.2";
 
   src = fetchurl {
     url =
       "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
     sha512 =
-      "2mbb139xdi69bnvvg7zabwbw181xnz7y154viynmkwyh4iww0hcsvr88q246gnif8a7jns3pi4qgqxgzflyl6mzpsvfdrbjs5hylanx";
+      "1bd8z6fm2nky4p3qxc5jh9dca7v7g77i6kdn6p5dzzm4gyadqvk00bfa4nzglzi9nwwyld14r3ydjd6ms012yk07q4aqdsrf51b9k4y";
   };
 
   nativeBuildInputs = [

From 3aca0e1e6c2d473525efc2fe083cffe47f44d46f Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 9 Nov 2020 13:19:38 +0300
Subject: [PATCH 1927/3942] vkquake: 1.05.0 -> 1.05.1

---
 pkgs/games/quakespasm/vulkan.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 49f9e6832354..73639fd7553c 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vkquake";
-  version = "1.05.0";
+  version = "1.05.1";
 
   src = fetchFromGitHub {
     owner = "Novum";
     repo = "vkQuake";
     rev = version;
-    sha256 = "16ryjfkmnhlxv7b6yvyk3247q7ih4g90a7c4z501xiyp7h0wlsw8";
+    sha256 = "03b2vxpakp6zizb0m65q9lq800z67b052k01q251b3f04kr1waih";
   };
 
   sourceRoot = "source/Quake";

From 3664e4929fa4212c62ef8e087a1d52ae47b32d3a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 01:49:59 +0000
Subject: [PATCH 1928/3942] qalculate-gtk: 3.13.0 -> 3.14.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 133df7c75ac5..48c4b77c2ccd 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qalculate-gtk";
-  version = "3.13.0";
+  version = "3.14.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     rev = "v${version}";
-    sha256 = "0yrzvsii84r9d2i2hrs4f65wzv3yj24l9d9yqfv3j85881h8wkm2";
+    sha256 = "1pff3m5xnw9kai6n110j1grxzcf2r7pxi76jin1lxhm8q8gmnnz1";
   };
 
   hardeningDisable = [ "format" ];

From ee2501f124b817f29cb2ef65b8fc8bbe59cc143f Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 9 Nov 2020 21:11:59 -0500
Subject: [PATCH 1929/3942] qt5.qtwebengine: don't override `patches` in
 qtModule

This fixes darwin build.

Fixes: 90db9641 ('qt5.qtwebengine: fix build with bison-3.7')
---
 pkgs/development/libraries/qt-5/5.12/default.nix      |  9 +++++++++
 pkgs/development/libraries/qt-5/5.14/default.nix      | 11 ++++++++++-
 pkgs/development/libraries/qt-5/5.15/default.nix      | 11 ++++++++++-
 .../libraries/qt-5/modules/qtwebengine.nix            | 11 -----------
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index fcceb6d6cf2b..329ddd171626 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -97,6 +97,15 @@ let
         url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951";
         sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
       })
+
+      # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599
+      (fetchpatch {
+        name = "qtwebengine-bison-3.7-build.patch";
+        url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599";
+        sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy";
+        stripLen = 1;
+        extraPrefix = "src/3rdparty/";
+      })
     ] ++ optionals stdenv.isDarwin [
       ./qtwebengine-darwin-no-platform-check.patch
       ./qtwebengine-darwin-fix-failed-static-assertion.patch
diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix
index 469157a5f727..b17d9b97b183 100644
--- a/pkgs/development/libraries/qt-5/5.14/default.nix
+++ b/pkgs/development/libraries/qt-5/5.14/default.nix
@@ -70,7 +70,16 @@ let
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
-    qtwebengine = [ ]
+    qtwebengine = [
+      # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599
+      (fetchpatch {
+        name = "qtwebengine-bison-3.7-build.patch";
+        url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599";
+        sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy";
+        stripLen = 1;
+        extraPrefix = "src/3rdparty/";
+      })
+    ]
       ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
     qtwebkit = [
       (fetchpatch {
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 1a90c610a5b5..3a31ca3a9480 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -70,7 +70,16 @@ let
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
-    qtwebengine = [ ]
+    qtwebengine = [
+      # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599
+      (fetchpatch {
+        name = "qtwebengine-bison-3.7-build.patch";
+        url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599";
+        sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy";
+        stripLen = 1;
+        extraPrefix = "src/3rdparty/";
+      })
+    ]
       ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
     qtwebkit = [ ./qtwebkit.patch ]
       ++ optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index ff2b444ac275..b98b711c0f5d 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -38,17 +38,6 @@ qtModule {
   # which cannot be set at the same time as -Wformat-security
   hardeningDisable = [ "format" ];
 
-  patches = [
-    # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599
-    (fetchpatch {
-      name = "qtwebengine-bison-3.7-build.patch";
-      url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599";
-      sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy";
-      stripLen = 1;
-      extraPrefix = "src/3rdparty/";
-    })
-  ];
-
   postPatch =
     # Patch Chromium build tools
     ''

From 400b29acf141fab0c89ac3be4887f728f843459b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 02:38:09 +0000
Subject: [PATCH 1930/3942] qbs: 1.16.0 -> 1.17.0

---
 pkgs/development/tools/build-managers/qbs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index d4f94c1aed97..359c942d189a 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   pname = "qbs";
 
-  version = "1.16.0";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "qbs";
     repo = "qbs";
     rev = "v${version}";
-    sha256 = "1kg11s3figpkvgd85p0zk416s57gnvlzrz1isbc2lv13adidf041";
+    sha256 = "0sd4qwl1wh8b1hck846plrgddkrdwdfqwk2dgh5hdsrlrvx5xjrr";
   };
 
   nativeBuildInputs = [ qmake ];

From dbef34ef3a285d8b65d209c0cec2c7997b8c75a6 Mon Sep 17 00:00:00 2001
From: Rajiv Ranganath <rajiv.ranganath@atihita.com>
Date: Mon, 9 Nov 2020 11:55:25 +0000
Subject: [PATCH 1931/3942] zfsbackup: update unstable-2019-03-05 ->
 unstable-2020-09-30

Signed-off-by: Rajiv Ranganath <rajiv.ranganath@atihita.com>
---
 pkgs/tools/backup/zfsbackup/default.nix |    6 +-
 pkgs/tools/backup/zfsbackup/deps.nix    | 1171 +++++++++++++++++++++--
 2 files changed, 1115 insertions(+), 62 deletions(-)

diff --git a/pkgs/tools/backup/zfsbackup/default.nix b/pkgs/tools/backup/zfsbackup/default.nix
index 7b3cbdeaa103..5cdb39c3ecb0 100644
--- a/pkgs/tools/backup/zfsbackup/default.nix
+++ b/pkgs/tools/backup/zfsbackup/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   pname = "zfsbackup";
-  version = "unstable-2019-03-05";
-  rev = "78fea6e99f0a5a4c8513d3a3d1d45fb6750cfddf";
+  version = "unstable-2020-09-30";
+  rev = "092f80846b23e02f99d2aa72d9d889eabfdcb053";
 
   goPackagePath = "github.com/someone1/zfsbackup-go";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "someone1";
     repo = "zfsbackup-go";
     inherit rev;
-    sha256 = "0yalsfvzmcnc8yfzm3r5dikqrp57spwa16l7gbzvgqqcz4vlnw3n";
+    sha256 = "1xiacaf4r9jkx0m8wjfis14cq622yhljldwkflh9ni3khax7dlgi";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/backup/zfsbackup/deps.nix b/pkgs/tools/backup/zfsbackup/deps.nix
index f1fa23755bc7..28be9fa141cf 100644
--- a/pkgs/tools/backup/zfsbackup/deps.nix
+++ b/pkgs/tools/backup/zfsbackup/deps.nix
@@ -1,12 +1,21 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
 [
   {
     goPackagePath = "cloud.google.com/go";
     fetch = {
       type = "git";
-      url = "https://code.googlesource.com/gocloud";
-      rev = "b9197a057a6cb1129f29cd21ca11d1bb043666d1";
-      sha256 = "0f1p361apzj30i9vcza60ldhhjxff8581gr5xqim7x4d5rgmpwil";
+      url = "https://github.com/googleapis/google-cloud-go";
+      rev = "v0.57.0";
+      sha256 = "0lcq68h0x56qb14yx2df584ad0g9s1s19py813dy9nzqp0bmjig8";
+    };
+  }
+  {
+    goPackagePath = "dmitri.shuralyov.com/gpu/mtl";
+    fetch = {
+      type = "git";
+      url = "https://dmitri.shuralyov.com/gpu/mtl";
+      rev = "666a987793e9";
+      sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z";
     };
   }
   {
@@ -14,26 +23,98 @@
     fetch = {
       type = "git";
       url = "https://github.com/Azure/azure-pipeline-go";
-      rev = "232aee85e8e3a6223a11c0943f7df2ae0fac00e4";
+      rev = "v0.2.2";
       sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6";
     };
   }
+  {
+    goPackagePath = "github.com/Azure/azure-sdk-for-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-sdk-for-go";
+      rev = "v42.3.0";
+      sha256 = "1nqxpifrr8n17irkfzhx253b17cwd15x4vfqxx80l5y7dn0jqavq";
+    };
+  }
   {
     goPackagePath = "github.com/Azure/azure-storage-blob-go";
     fetch = {
       type = "git";
       url = "https://github.com/Azure/azure-storage-blob-go";
-      rev = "fc700035fe4a7020f50d49f420b3c088aed57e03";
+      rev = "v0.8.0";
       sha256 = "00gsnk9s1rlrakqvcm917hn4r47jannxwp7rkhrb71pamzm46752";
     };
   }
+  {
+    goPackagePath = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev = "v0.3.1";
+      sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+    };
+  }
+  {
+    goPackagePath = "github.com/BurntSushi/xgb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/xgb";
+      rev = "27f122750802";
+      sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj";
+    };
+  }
+  {
+    goPackagePath = "github.com/OneOfOne/xxhash";
+    fetch = {
+      type = "git";
+      url = "https://github.com/OneOfOne/xxhash";
+      rev = "v1.2.2";
+      sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "a0175ee3bccc";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "2efee857e7cf";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    goPackagePath = "github.com/armon/consul-api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/armon/consul-api";
+      rev = "eb2c6b5be1b6";
+      sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
+    };
+  }
   {
     goPackagePath = "github.com/aws/aws-sdk-go";
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "3576772d916b5db1cb5516b772bcdc362349a177";
-      sha256 = "04clzbyg5cmqz98i5hxbik6sd7aclas1707rhaixmmckgisqxb8i";
+      rev = "v1.31.4";
+      sha256 = "07ia78j6j2y139iq9x5gin0fwc77wv8x0zhg47kibykxn4iyx85y";
+    };
+  }
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "v1.0.0";
+      sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
     };
   }
   {
@@ -41,8 +122,161 @@
     fetch = {
       type = "git";
       url = "https://github.com/cenkalti/backoff";
-      rev = "4b4cebaf850ec58f1bb1fec5bdebdf8501c2bc3f";
-      sha256 = "0vwd6nbadrqgaljb5grmw2iljvv963qd15axr5cvvgpd465q3kzc";
+      rev = "v2.2.1";
+      sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8";
+    };
+  }
+  {
+    goPackagePath = "github.com/census-instrumentation/opencensus-proto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-instrumentation/opencensus-proto";
+      rev = "v0.2.1";
+      sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj";
+    };
+  }
+  {
+    goPackagePath = "github.com/cespare/xxhash";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cespare/xxhash";
+      rev = "v1.1.0";
+      sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x";
+    };
+  }
+  {
+    goPackagePath = "github.com/chzyer/logex";
+    fetch = {
+      type = "git";
+      url = "https://github.com/chzyer/logex";
+      rev = "v1.1.10";
+      sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4";
+    };
+  }
+  {
+    goPackagePath = "github.com/chzyer/readline";
+    fetch = {
+      type = "git";
+      url = "https://github.com/chzyer/readline";
+      rev = "2972be24d48e";
+      sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
+    };
+  }
+  {
+    goPackagePath = "github.com/chzyer/test";
+    fetch = {
+      type = "git";
+      url = "https://github.com/chzyer/test";
+      rev = "a1ea475d72b1";
+      sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k";
+    };
+  }
+  {
+    goPackagePath = "github.com/client9/misspell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/client9/misspell";
+      rev = "v0.3.4";
+      sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
+    };
+  }
+  {
+    goPackagePath = "github.com/cncf/udpa";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cncf/udpa";
+      rev = "269d4d468f6f";
+      sha256 = "0i1jiaw2k3hlwwmg4hap81vb4s1p25xp9kdfww37v0fbgjariccs";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/bbolt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/bbolt";
+      rev = "v1.3.2";
+      sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/etcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/etcd";
+      rev = "v3.3.10";
+      sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-semver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-semver";
+      rev = "v0.2.0";
+      sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-systemd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-systemd";
+      rev = "95778dfbb74e";
+      sha256 = "1s3bg9p78wkixn2bqb2p23wbsqfg949ml6crw2b498s71mwh8rcf";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/pkg";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/pkg";
+      rev = "399ea9e2e55f";
+      sha256 = "0nxbn0m7lr4dg0yrwnvlkfiyg3ndv8vdpssjx7b714nivpc6ar0y";
+    };
+  }
+  {
+    goPackagePath = "github.com/cpuguy83/go-md2man";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cpuguy83/go-md2man";
+      rev = "v2.0.0";
+      sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "v1.1.1";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev = "v3.2.0";
+      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgryski/go-sip13";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgryski/go-sip13";
+      rev = "e10d5fee7954";
+      sha256 = "15fyibfas209ljz3f7g07kdmfbl3hhyd9n5n7aq5n5p9m5mn41d6";
+    };
+  }
+  {
+    goPackagePath = "github.com/dnaeon/go-vcr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dnaeon/go-vcr";
+      rev = "v1.0.1";
+      sha256 = "1d0kpqr12qrqlamz5a47bp05mx49za2v6l1k7c6z71xahfmb7v2d";
     };
   }
   {
@@ -50,17 +284,125 @@
     fetch = {
       type = "git";
       url = "https://github.com/dustin/go-humanize";
-      rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e";
+      rev = "v1.0.0";
       sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
     };
   }
+  {
+    goPackagePath = "github.com/envoyproxy/go-control-plane";
+    fetch = {
+      type = "git";
+      url = "https://github.com/envoyproxy/go-control-plane";
+      rev = "v0.9.4";
+      sha256 = "0m0crzx70lp7vz13v20wxb1fcfdnzp7h3mkh3bn6a8mbfz6w5asj";
+    };
+  }
+  {
+    goPackagePath = "github.com/envoyproxy/protoc-gen-validate";
+    fetch = {
+      type = "git";
+      url = "https://github.com/envoyproxy/protoc-gen-validate";
+      rev = "v0.1.0";
+      sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy";
+    };
+  }
+  {
+    goPackagePath = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev = "v1.4.7";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath = "github.com/ghodss/yaml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ghodss/yaml";
+      rev = "v1.0.0";
+      sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-gl/glfw";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-gl/glfw";
+      rev = "6f7a984d4dc4";
+      sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-kit/kit";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-kit/kit";
+      rev = "v0.8.0";
+      sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-logfmt/logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-logfmt/logfmt";
+      rev = "v0.4.0";
+      sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev = "v1.5.0";
+      sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-stack/stack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-stack/stack";
+      rev = "v1.8.0";
+      sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "v1.2.1";
+      sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev = "23def4e6c14b";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
   {
     goPackagePath = "github.com/golang/groupcache";
     fetch = {
       type = "git";
       url = "https://github.com/golang/groupcache";
-      rev = "404acd9df4cc9859d64fb9eed42e5c026187287a";
-      sha256 = "1zmhdr758wn0kfh5xr4hg026f9qvy00s3midb5iqnpx1kh647j2g";
+      rev = "8c9f03a8e57e";
+      sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/mock";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/mock";
+      rev = "v1.4.3";
+      sha256 = "1p37xnja1dgq5ykx24n7wincwz2gahjh71b95p8vpw7ss2g8j8wx";
     };
   }
   {
@@ -68,8 +410,53 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "1680a479a2cfb3fa22b972af7e36d0a0fde47bf8";
-      sha256 = "1w0aivn2rqf7bcpz84nbn0alh1q3nglqgp7il835fmvvc94rrkqn";
+      rev = "v1.4.1";
+      sha256 = "0w7ks4vffnnkp0miwgc3chrsnmya45lzvpahb2wmw0jwhdp5kdx7";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/btree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/btree";
+      rev = "v1.0.0";
+      sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-cmp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-cmp";
+      rev = "v0.4.0";
+      sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/martian";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/martian";
+      rev = "v2.1.0";
+      sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/pprof";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/pprof";
+      rev = "fc25d7d30c6d";
+      sha256 = "0ba28qx2i1bi6n6x5g670v8hmqavwj8lwl8psnc6vzagmdhjw0vg";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/renameio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/renameio";
+      rev = "v0.1.0";
+      sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx";
     };
   }
   {
@@ -77,8 +464,107 @@
     fetch = {
       type = "git";
       url = "https://github.com/googleapis/gax-go";
-      rev = "a170e83f27ee4e20c66e51b66a99a4a349a1b75a";
-      sha256 = "0a5ir1v5cd6m40hscqy0qpc3ibd703kiw419m66ddxnkvzykvp0i";
+      rev = "v2.0.5";
+      sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev = "v1.4.0";
+      sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
+    };
+  }
+  {
+    goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/go-grpc-middleware";
+      rev = "v1.0.0";
+      sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp";
+    };
+  }
+  {
+    goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/go-grpc-prometheus";
+      rev = "v1.2.0";
+      sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl";
+    };
+  }
+  {
+    goPackagePath = "github.com/grpc-ecosystem/grpc-gateway";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/grpc-gateway";
+      rev = "v1.9.0";
+      sha256 = "1r4y48c76yxc2hpqszfjirvh7zxjb6z72qmk95li12ar79dhv3dy";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/golang-lru";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev = "v0.5.1";
+      sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "v1.0.0";
+      sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
+    };
+  }
+  {
+    goPackagePath = "github.com/ianlancetaylor/demangle";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ianlancetaylor/demangle";
+      rev = "5e5cf60278f6";
+      sha256 = "1fhjk11cip9c3jyj1byz9z77n6n2rlxmyz0xjx1zpn1da3cvri75";
+    };
+  }
+  {
+    goPackagePath = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev = "v1.0.0";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath = "github.com/jmespath/go-jmespath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jmespath/go-jmespath";
+      rev = "v0.3.0";
+      sha256 = "12qgp7yb7yfjxhd311kb820fcjmg7gd4hp2fc4v6x8s7121pwnjp";
+    };
+  }
+  {
+    goPackagePath = "github.com/jonboulle/clockwork";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jonboulle/clockwork";
+      rev = "v0.1.0";
+      sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
+    };
+  }
+  {
+    goPackagePath = "github.com/jstemmer/go-junit-report";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jstemmer/go-junit-report";
+      rev = "v0.9.1";
+      sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw";
     };
   }
   {
@@ -86,8 +572,35 @@
     fetch = {
       type = "git";
       url = "https://github.com/juju/ratelimit";
-      rev = "f60b32039441cd828005f82f3a54aafd00bc9882";
-      sha256 = "1qbjcm4y53awkqmpxb1nm9c1xdylc44vph4mn30qjb5wrcqy7c1r";
+      rev = "v1.0.1";
+      sha256 = "0ppwvwbh9jdpdk4f9924vw373cpfz5g5ad10c707p22a984vanrz";
+    };
+  }
+  {
+    goPackagePath = "github.com/julienschmidt/httprouter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/julienschmidt/httprouter";
+      rev = "v1.2.0";
+      sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+    };
+  }
+  {
+    goPackagePath = "github.com/kisielk/errcheck";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kisielk/errcheck";
+      rev = "v1.1.0";
+      sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y";
+    };
+  }
+  {
+    goPackagePath = "github.com/kisielk/gotool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kisielk/gotool";
+      rev = "v1.0.0";
+      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
     };
   }
   {
@@ -95,8 +608,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/klauspost/compress";
-      rev = "30993c63e1b02b47dd3878e74c8db50833706ecc";
-      sha256 = "07d0r56ic91rdd0xvfr7zpn015kl6g9jwlgq5avczbz4fnyx5x8m";
+      rev = "v1.10.6";
+      sha256 = "0jnm5mjazxkjwzb7z6sjlqm2l68z4h4xjhir2lgfkf04rj4l290s";
     };
   }
   {
@@ -104,8 +617,53 @@
     fetch = {
       type = "git";
       url = "https://github.com/klauspost/pgzip";
-      rev = "083b1c3f84dd6486588802e5ce295de3a7f41a8b";
-      sha256 = "0ddigh096fz3lixbdm679hjvnfivbpkijrclk5sn9091hyj38pb3";
+      rev = "v1.2.4";
+      sha256 = "0mnhfdn0isbkra455jynqjbmrwymx09shlbzbyvgfycih3nbrif0";
+    };
+  }
+  {
+    goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+    fetch = {
+      type = "git";
+      url = "https://github.com/konsorten/go-windows-terminal-sequences";
+      rev = "v1.0.1";
+      sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/logfmt";
+      rev = "b84e30acd515";
+      sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty";
+      rev = "v0.1.0";
+      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pty";
+      rev = "v1.1.1";
+      sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev = "v0.1.0";
+      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
     };
   }
   {
@@ -113,8 +671,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/kurin/blazer";
-      rev = "cf2f27cc0be3dac3c1a94c3c8b76834ce741439e";
-      sha256 = "02nwxrczg8c9zj3hdmbyg458qvhfwl60ci1pjl7f0y07kgiv1rg3";
+      rev = "v0.5.3";
+      sha256 = "18jsq7n31ycvaivpvyksbddj82spw4g29w6dx92x2wab2hzbc7ik";
+    };
+  }
+  {
+    goPackagePath = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev = "v1.8.0";
+      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
     };
   }
   {
@@ -122,8 +689,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-ieproxy";
-      rev = "f9202b1cfdeb0c82ddd3dc1e8e9cd94b3c0c1b13";
-      sha256 = "0r8c17znlv32750qy3p96fbyp8ys8xfdccpzv0z9lr2y88jnzhpz";
+      rev = "v0.0.1";
+      sha256 = "0x1ijwwp22s20vjbca5ac7y7bx2jp6jizzqa38ks4943q7vi4w09";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "v1.0.1";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
     };
   }
   {
@@ -131,8 +707,35 @@
     fetch = {
       type = "git";
       url = "https://github.com/miolini/datacounter";
-      rev = "aa48df3a02c1fbcd3040271f631887991c3071fb";
-      sha256 = "12ldh5jhafjhh3jvh979mldwygkkcnm97axs7dhlai6gqwlhls87";
+      rev = "v1.0.2";
+      sha256 = "0lqhdb9glx65ycjjrqqqpd28zi95qnr2sdz93y6fma0khss46c5f";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "v1.1.0";
+      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "v1.1.2";
+      sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
+    };
+  }
+  {
+    goPackagePath = "github.com/mwitkow/go-conntrack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mwitkow/go-conntrack";
+      rev = "cc309e4a2223";
+      sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
     };
   }
   {
@@ -140,8 +743,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/nightlyone/lockfile";
-      rev = "0ad87eef1443f64d3d8c50da647e2b1552851124";
-      sha256 = "19vfswcvdy937da7w6hap3wp83drj5a084sqszy8r2ph4fbkln41";
+      rev = "v1.0.0";
+      sha256 = "0jzlngank7yaq5pl5mipsfglmalv9x2b9yhqr78w5dmx4hikh7kr";
+    };
+  }
+  {
+    goPackagePath = "github.com/oklog/ulid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/oklog/ulid";
+      rev = "v1.3.1";
+      sha256 = "0hybwyid820n80axrk863k2py93hbqlq6hxhf84ppmz0qd0ys0gq";
     };
   }
   {
@@ -149,17 +761,170 @@
     fetch = {
       type = "git";
       url = "https://github.com/op/go-logging";
-      rev = "970db520ece77730c7e4724c61121037378659d9";
+      rev = "970db520ece7";
       sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj";
     };
   }
+  {
+    goPackagePath = "github.com/pelletier/go-toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-toml";
+      rev = "v1.2.0";
+      sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
+    };
+  }
   {
     goPackagePath = "github.com/pkg/errors";
     fetch = {
       type = "git";
       url = "https://github.com/pkg/errors";
-      rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7";
-      sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y";
+      rev = "v0.9.1";
+      sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "v1.0.0";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "v0.9.3";
+      sha256 = "1608rm1y2p3iv8k2x7wyc6hshvpbfkv2k77hy0x870syms1g3g1p";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "14fe0d1b01d4";
+      sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "v0.4.0";
+      sha256 = "00008pczafy982m59n1j31pnp41f4grbc2c40jccp52xg3m5klmr";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "5867b95ac084";
+      sha256 = "1rahdk62ajj4zpfb3mgzjqip773la9fb0m87m7s9a0b39l3fmzvr";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/tsdb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/tsdb";
+      rev = "v0.7.1";
+      sha256 = "1c1da8i5byvhh4fp3vqjfb65aaksjskn3ggb8wg9hcfzjrhgpz04";
+    };
+  }
+  {
+    goPackagePath = "github.com/rogpeppe/fastuuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rogpeppe/fastuuid";
+      rev = "6724a57986af";
+      sha256 = "12s65phfx6hxj4v0b5kj8akgrbf5mxpa101fyzw03h6hld1f70cz";
+    };
+  }
+  {
+    goPackagePath = "github.com/rogpeppe/go-internal";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rogpeppe/go-internal";
+      rev = "v1.3.0";
+      sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216";
+    };
+  }
+  {
+    goPackagePath = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev = "v2.0.1";
+      sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j";
+    };
+  }
+  {
+    goPackagePath = "github.com/satori/go.uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/satori/go.uuid";
+      rev = "v1.2.0";
+      sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
+    };
+  }
+  {
+    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/sanitized_anchor_name";
+      rev = "v1.0.0";
+      sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
+    };
+  }
+  {
+    goPackagePath = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev = "v1.2.0";
+      sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
+    };
+  }
+  {
+    goPackagePath = "github.com/soheilhy/cmux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/soheilhy/cmux";
+      rev = "v0.1.4";
+      sha256 = "1f736g68d9vwlyfb6g0fxkr0r875369xafk30cz8kaq5niaqwv0h";
+    };
+  }
+  {
+    goPackagePath = "github.com/spaolacci/murmur3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spaolacci/murmur3";
+      rev = "f09979ecbc72";
+      sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev = "v1.1.2";
+      sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev = "v1.3.0";
+      sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
     };
   }
   {
@@ -167,8 +932,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "8a4b46fadf756f30eff047abf2f8edba4eac6fef";
-      sha256 = "0f9pxni3lghl205wrnssw58iliqifrxcdabrbww20887zwn3ki7q";
+      rev = "v1.0.0";
+      sha256 = "0vbppqqhby302a5ayn0296jqr71qkcd4c9am7wzsk6z71fwdsa7h";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev = "v1.0.0";
+      sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
     };
   }
   {
@@ -176,17 +950,125 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/pflag";
-      rev = "2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab";
+      rev = "v1.0.5";
       sha256 = "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31";
     };
   }
+  {
+    goPackagePath = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev = "v1.4.0";
+      sha256 = "1zpzxvn13wpvbblbbn73svaq39zgxfjqhci9d68g3qf309pcfy19";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/objx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/objx";
+      rev = "v0.1.1";
+      sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "v1.5.1";
+      sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
+    };
+  }
+  {
+    goPackagePath = "github.com/tmc/grpc-websocket-proxy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tmc/grpc-websocket-proxy";
+      rev = "0ad062ec5ee5";
+      sha256 = "1anw4v9wspnw9xf2z5r9w0sszwjklyanl0l85wgg6nxak9gnrqp4";
+    };
+  }
+  {
+    goPackagePath = "github.com/ugorji/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ugorji/go";
+      rev = "v1.1.4";
+      sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
+    };
+  }
+  {
+    goPackagePath = "github.com/xiang90/probing";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xiang90/probing";
+      rev = "43a291ad63a2";
+      sha256 = "1z22ms16j5j42775mf31isanwx2pwr1d8wqw8006dczjv36qnz5i";
+    };
+  }
+  {
+    goPackagePath = "github.com/xordataexchange/crypt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xordataexchange/crypt";
+      rev = "b2862e3d0a77";
+      sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
+    };
+  }
+  {
+    goPackagePath = "github.com/yuin/goldmark";
+    fetch = {
+      type = "git";
+      url = "https://github.com/yuin/goldmark";
+      rev = "v1.1.27";
+      sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923";
+    };
+  }
+  {
+    goPackagePath = "go.etcd.io/bbolt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/etcd-io/bbolt";
+      rev = "v1.3.2";
+      sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2";
+    };
+  }
   {
     goPackagePath = "go.opencensus.io";
     fetch = {
       type = "git";
       url = "https://github.com/census-instrumentation/opencensus-go";
-      rev = "3b5a343282fe4b4fccdb0f24cbd1d7169d20858a";
-      sha256 = "0qzx8p019r4qzm0knvs3kcx5vc9qg6ksgf1amk5djr1h00w460aw";
+      rev = "v0.22.3";
+      sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw";
+    };
+  }
+  {
+    goPackagePath = "go.uber.org/atomic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/atomic";
+      rev = "v1.4.0";
+      sha256 = "0c6yzx15c20719xii3dm0vyjd8i9jx45m0wh5yp1zf29b0gbljcy";
+    };
+  }
+  {
+    goPackagePath = "go.uber.org/multierr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/multierr";
+      rev = "v1.1.0";
+      sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
+    };
+  }
+  {
+    goPackagePath = "go.uber.org/zap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/zap";
+      rev = "v1.10.0";
+      sha256 = "10hdzr1rghwbsl6bbd30779dx44fh9mg9pq8d2cgqlknqxxpvpvr";
     };
   }
   {
@@ -194,8 +1076,53 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "87dc89f01550277dc22b74ffcf4cd89fa2f40f4c";
-      sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
+      rev = "06a226fb4e37";
+      sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/exp";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/exp";
+      rev = "6cc2880d07d6";
+      sha256 = "1iia6hiif6hcp0cg1i6nq63qg0pmvm2kq24pf2r2il3597rfmlgy";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/image";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/image";
+      rev = "cff245a6509b";
+      sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/lint";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/lint";
+      rev = "738671d3881b";
+      sha256 = "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/mobile";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/mobile";
+      rev = "d2bd2a29d028";
+      sha256 = "1nv6vvhnjr01nx9y06q46ww87dppdwpbqrlsfg1xf2587wxl8xiv";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/mod";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/mod";
+      rev = "v0.2.0";
+      sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl";
     };
   }
   {
@@ -203,8 +1130,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "da9a3fd4c5820e74b24a6cb7fb438dc9b0dd377c";
-      sha256 = "0iavs400534jn7drmdphx0f18vgg060p2r59xw5d85ji1l5rin1l";
+      rev = "7e3656a0809f";
+      sha256 = "1rmj59bd0hvf8cbp42c0y8y38prs5ill1zszhqp9i8m86cvkfqk9";
     };
   }
   {
@@ -212,8 +1139,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/oauth2";
-      rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33";
-      sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2";
+      rev = "bf48bf16ab8d";
+      sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg";
     };
   }
   {
@@ -221,8 +1148,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sync";
-      rev = "cd5d95a43a6e21273425c7ae415d3df9ea832eeb";
-      sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds";
+      rev = "43a5402ce75a";
+      sha256 = "0j6zrrb81qjr1926kkwmn0di9a0jn8qyjd9dw614rfkihxgq1vsm";
     };
   }
   {
@@ -230,8 +1157,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "b09406accb4736d857a32bf9444cd7edae2ffa79";
-      sha256 = "00lbhsr2p3mi2n35mv3yy6lmgzjjav45yv9bmrxgyahbac5qnz5m";
+      rev = "7e40ca221e25";
+      sha256 = "1fkhs1sn6prfsqaj70kya2gn1sqqa85lmgff6j6s7027zc1yjvqa";
     };
   }
   {
@@ -239,26 +1166,62 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "3d0f7978add91030e5e8976ff65ccdd828286cba";
-      sha256 = "0iagl5icarfrbiv6m3dhqy51r30cnl07r66im5c88dz7lrvpy5z3";
+      rev = "v0.3.2";
+      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/time";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/time";
+      rev = "555d28b269f0";
+      sha256 = "1rhl4lyz030kwfsg63yk83yd3ivryv1afmzdz9sxbhcj84ym6h4r";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "2bc93b1c0c88";
+      sha256 = "10sg7nvw40f2d6hxmsy4nvhmawbidk022v3arbh8acsjxglw84zs";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/xerrors";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/xerrors";
+      rev = "9bdfabe68543";
+      sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c";
     };
   }
   {
     goPackagePath = "google.golang.org/api";
     fetch = {
       type = "git";
-      url = "https://code.googlesource.com/google-api-go-client";
-      rev = "e6ade80c6e2a122a6588f9f827207dcb99da433e";
-      sha256 = "1mk0ab6f2dyx1lack436zdhspq1hgip2s5m3pqjrqk18s8vvn4bd";
+      url = "https://github.com/googleapis/google-api-go-client";
+      rev = "v0.25.0";
+      sha256 = "0bfpii160ns1pl3iqc38h5db258mv58igf2ifglds3dajgsj2qrr";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev = "v1.6.6";
+      sha256 = "15c38h6fbv06cnkr6yknygfrpibyms2mya4w0l29kaxf42jn1qi5";
     };
   }
   {
     goPackagePath = "google.golang.org/genproto";
     fetch = {
       type = "git";
-      url = "https://github.com/google/go-genproto";
-      rev = "548a555dbc03994223efbaba0090152849259498";
-      sha256 = "15sbfwrh6m18fn3n369cb5c8qsmw17wibwmjssblgp64gvmx5b18";
+      url = "https://github.com/googleapis/go-genproto";
+      rev = "f5ebc3bea380";
+      sha256 = "1v5dyp6g35rwjwx1ixjy7yh1hay4n7ya5aq5h4ckvd9h0j7rw5sz";
     };
   }
   {
@@ -266,8 +1229,98 @@
     fetch = {
       type = "git";
       url = "https://github.com/grpc/grpc-go";
-      rev = "7c8e60372e19da88fb3fe8ac6a8de781eef7f547";
-      sha256 = "03fb7j1gfglzp77hkhlm8dgg3if1j1pvry0nhx915ww0hmz6sr00";
+      rev = "v1.29.1";
+      sha256 = "1465947r6536si36cl2ppx7929la9zba1y6xfczfyp4kgf8988hf";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/protobuf";
+      rev = "v1.22.0";
+      sha256 = "0n7lc4m7kfvj01glc0gnjy0zsnsic7cxnbvlajy0h14cxbab87pj";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/alecthomas/kingpin.v2";
+      rev = "v2.2.6";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/check.v1";
+      rev = "788fd7840127";
+      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/errgo.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/errgo.v2";
+      rev = "v2.1.0";
+      sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/resty.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/resty.v1";
+      rev = "v1.12.0";
+      sha256 = "062mn735rqzhha5ag07z4gz08hxzrfm2yx067jfmaaxmb6797lmp";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "v2.2.2";
+      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+    };
+  }
+  {
+    goPackagePath = "honnef.co/go/tools";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dominikh/go-tools";
+      rev = "v0.0.1-2020.1.3";
+      sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf";
+    };
+  }
+  {
+    goPackagePath = "rsc.io/binaryregexp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rsc/binaryregexp";
+      rev = "v0.2.0";
+      sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b";
+    };
+  }
+  {
+    goPackagePath = "rsc.io/quote";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rsc/quote";
+      rev = "v3.1.0";
+      sha256 = "0nvv97hwwrl1mx5gzsbdm1ndnwpg3m7i2jb10ig9wily7zmvki0i";
+    };
+  }
+  {
+    goPackagePath = "rsc.io/sampler";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rsc/sampler";
+      rev = "v1.3.0";
+      sha256 = "0byxk2ynba50py805kcvbvjzh59l1r308i1xgyzpw6lff4xx9xjh";
     };
   }
 ]

From 4735ed0d4ff973daf71c00027c90db1348ed875c Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Tue, 10 Nov 2020 11:02:33 +0800
Subject: [PATCH 1932/3942] perlPackages.FutureAsyncAwait: 0.45 -> 0.46

---
 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 123f7484a79a..cdfcace932ee 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8300,12 +8300,12 @@ let
     };
   };
 
-  FutureAsyncAwait = buildPerlModule {
+  FutureAsyncAwait = buildPerlModule rec {
     pname = "Future-AsyncAwait";
-    version = "0.45";
+    version = "0.46";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.45.tar.gz";
-      sha256 = "1aq19b21r9i4c1mxkrv0irnx16234cnzsx50178c7xif4gqkar9k";
+      url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz";
+      sha256 = "1iqbs7n8923xjkai51hiczn5an8cskddl7qrfi30axjl1d56h6r0";
     };
     buildInputs = [ TestRefcount ];
     propagatedBuildInputs = [ Future XSParseSublike ];

From 6d8327ea96621b2d03aceee63df4fcdeea73e13a Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 9 Nov 2020 15:06:44 -0500
Subject: [PATCH 1933/3942] Initial support for OpenRISC 1000 (or1k)

---
 lib/systems/doubles.nix                         | 2 ++
 lib/systems/examples.nix                        | 6 ++++++
 lib/systems/inspect.nix                         | 1 +
 lib/systems/parse.nix                           | 2 ++
 pkgs/build-support/bintools-wrapper/default.nix | 1 +
 5 files changed, 12 insertions(+)

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 517a7296afd2..5cd203efc4a5 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -35,6 +35,7 @@ let
     "msp430-none"
     "riscv64-none" "riscv32-none"
     "vc4-none"
+    "or1k-none"
 
     "js-ghcjs"
 
@@ -58,6 +59,7 @@ in {
   mips          = filterDoubles predicates.isMips;
   riscv         = filterDoubles predicates.isRiscV;
   vc4           = filterDoubles predicates.isVc4;
+  or1k          = filterDoubles predicates.isOr1k;
   js            = filterDoubles predicates.isJavaScript;
 
   bigEndian     = filterDoubles predicates.isBigEndian;
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 87c05a0b0524..9a813b14cc20 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -124,6 +124,12 @@ rec {
     platform = {};
   };
 
+  or1k = {
+    config = "or1k-elf";
+    libc = "newlib";
+    platform = {};
+  };
+
   arm-embedded = {
     config = "arm-none-eabi";
     libc = "newlib";
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 8fa630572509..ac483941dd2e 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -24,6 +24,7 @@ rec {
     isVc4          = { cpu = { family = "vc4"; }; };
     isAvr          = { cpu = { family = "avr"; }; };
     isAlpha        = { cpu = { family = "alpha"; }; };
+    isOr1k         = { cpu = { family = "or1k"; }; };
     isJavaScript   = { cpu = cpuTypes.js; };
 
     is32bit        = { cpu = { bits = 32; }; };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 6bd44a007466..eadeb38c7237 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -114,6 +114,8 @@ rec {
 
     vc4      = { bits = 32; significantByte = littleEndian; family = "vc4"; };
 
+    or1k     = { bits = 32; significantByte = bigEndian; family = "or1k"; };
+
     js       = { bits = 32; significantByte = littleEndian; family = "js"; };
   };
 
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 786f0f9c5983..b9cdd0b1b2e2 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -185,6 +185,7 @@ stdenv.mkDerivation {
       else if targetPlatform.isAvr then "avr"
       else if targetPlatform.isAlpha then "alpha"
       else if targetPlatform.isVc4 then "vc4"
+      else if targetPlatform.isOr1k then "or1k"
       else throw "unknown emulation for platform: ${targetPlatform.config}";
     in if targetPlatform.useLLVM or false then ""
        else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);

From 46db711cdadc1408da6dfe4d9b473bb444b1a563 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 17 Jul 2020 16:02:26 -0400
Subject: [PATCH 1934/3942] or1k-newlib: Add newlib for OpenRISC 1000

---
 pkgs/development/misc/or1k/newlib.nix | 36 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  3 +++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/misc/or1k/newlib.nix

diff --git a/pkgs/development/misc/or1k/newlib.nix b/pkgs/development/misc/or1k/newlib.nix
new file mode 100644
index 000000000000..92829896a27c
--- /dev/null
+++ b/pkgs/development/misc/or1k/newlib.nix
@@ -0,0 +1,36 @@
+{ stdenv, texinfo, flex, bison, fetchFromGitHub, crossLibcStdenv, buildPackages }:
+
+crossLibcStdenv.mkDerivation {
+  name = "newlib";
+  src = fetchFromGitHub {
+    owner = "openrisc";
+    repo = "newlib";
+    rev = "8ac94ca7bbe4ceddafe6583ee4766d3c15b18ac8";
+    sha256 = "0hzhijmry5slpp6x12pgng8v7jil3mn18ahrhnw431lqrs1cma0s";
+  };
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  # newlib expects CC to build for build platform, not host platform
+  preConfigure = ''
+    export CC=cc
+  '';
+
+  configurePlatforms = [ "build" "target" ];
+  configureFlags = [
+    "--host=${stdenv.buildPlatform.config}"
+
+    "--disable-newlib-supplied-syscalls"
+    "--disable-nls"
+    "--enable-newlib-io-long-long"
+    "--enable-newlib-register-fini"
+    "--enable-newlib-retargetable-locking"
+  ];
+
+  dontDisableStatic = true;
+
+  passthru = {
+    incdir = "/${stdenv.targetPlatform.config}/include";
+    libdir = "/${stdenv.targetPlatform.config}/lib";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8eae90ddc4c7..4ec7aad24f61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10664,6 +10664,8 @@ in
   vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {};
   resim = callPackage ../misc/emulators/resim {};
 
+  or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {};
+
   rappel = callPackage ../development/misc/rappel/default.nix { };
 
   pharo-vms = callPackage ../development/pharo/vm { };
@@ -12841,6 +12843,7 @@ in
     else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross
     else if name == "newlib" && stdenv.targetPlatform.isMsp430 then targetPackages.msp430NewlibCross or msp430NewlibCross
     else if name == "newlib" && stdenv.targetPlatform.isVc4 then targetPackages.vc4-newlib or vc4-newlib
+    else if name == "newlib" && stdenv.targetPlatform.isOr1k then targetPackages.or1k-newlib or or1k-newlib
     else if name == "newlib" then targetPackages.newlibCross or newlibCross
     else if name == "musl" then targetPackages.muslCross or muslCross
     else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64

From dbe556af9cb9d00c6c50d76a1c1abade5455ab2f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 9 Nov 2020 17:47:50 -0500
Subject: [PATCH 1935/3942] binutils: Move patches in versioned dir

We'll have multiple binutils to contend with.
---
 pkgs/development/libraries/libbfd/default.nix |  2 +-
 .../libraries/libopcodes/default.nix          |  2 +-
 .../tools/misc/binutils/default.nix           | 29 ++++++++++---------
 ...OPERTY_X86_ISA_1_USED-note-if-needed.patch |  0
 ...operly-add-X86_ISA_1_NEEDED-property.patch |  0
 ...ly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch |  0
 .../2.31}/always-search-rpath.patch           |  0
 .../2.31}/build-components-separately.patch   |  0
 .../{ => patches/2.31}/deterministic.patch    |  0
 .../2.31}/disambiguate-arm-targets.patch      |  0
 .../2.31}/gold-symbol-visibility.patch        |  0
 .../{ => patches/2.31}/no-plugins.patch       |  0
 12 files changed, 18 insertions(+), 15 deletions(-)
 rename pkgs/development/tools/misc/binutils/{ => patches/2.31}/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch (100%)
 rename pkgs/development/tools/misc/binutils/{ => patches/2.31}/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch (100%)
 rename pkgs/development/tools/misc/binutils/{ => patches/2.31}/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch (100%)
 rename pkgs/development/tools/misc/binutils/{ => patches/2.31}/always-search-rpath.patch (100%)
 rename pkgs/development/tools/misc/binutils/{ => patches/2.31}/build-components-separately.patch (100%)
 rename pkgs/development/tools/misc/binutils/{ => patches/2.31}/deterministic.patch (100%)
 rename pkgs/development/tools/misc/binutils/{ => patches/2.31}/disambiguate-arm-targets.patch (100%)
 rename pkgs/development/tools/misc/binutils/{ => patches/2.31}/gold-symbol-visibility.patch (100%)
 rename pkgs/development/tools/misc/binutils/{ => patches/2.31}/no-plugins.patch (100%)

diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index 75db780b7bb6..e622cc6be687 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   outputs = [ "out" "dev" ];
 
   patches = binutils-unwrapped.patches ++ [
-    ../../tools/misc/binutils/build-components-separately.patch
+    (binutils-unwrapped.patchesDir + "/build-components-separately.patch")
     (fetchpatch {
       url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch";
       sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q";
diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix
index 8db034683dc7..f596ddfafc44 100644
--- a/pkgs/development/libraries/libopcodes/default.nix
+++ b/pkgs/development/libraries/libopcodes/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   outputs = [ "out" "dev" ];
 
   patches = binutils-unwrapped.patches ++ [
-    ../../tools/misc/binutils/build-components-separately.patch
+    (binutils-unwrapped.patchesDir + "/build-components-separately.patch")
   ];
 
   # We just want to build libopcodes
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index b352e63a27cc..3807fd7a539d 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -38,6 +38,7 @@ let
     url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2";
     sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
   });
+  patchesDir = ./patches + "/${minorVersion}";
 in
 
 stdenv.mkDerivation {
@@ -48,18 +49,18 @@ stdenv.mkDerivation {
 
   patches = [
     # Make binutils output deterministic by default.
-    ./deterministic.patch
+    "${patchesDir}/deterministic.patch"
 
     # Bfd looks in BINDIR/../lib for some plugins that don't
     # exist. This is pointless (since users can't install plugins
     # there) and causes a cycle between the lib and bin outputs, so
     # get rid of it.
-    ./no-plugins.patch
+    "${patchesDir}/no-plugins.patch"
 
     # Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and
     # elf32-littlearm-vxworks in favor of the first.
     # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766
-    ./disambiguate-arm-targets.patch
+    "${patchesDir}/disambiguate-arm-targets.patch"
 
     # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's
     # not clear why this behavior was decided upon but it has the unfortunate
@@ -67,19 +68,21 @@ stdenv.mkDerivation {
     # shared objects when cross-compiling. Consequently, we are forced to
     # override this behavior, forcing ld to search DT_RPATH even when
     # cross-compiling.
-    ./always-search-rpath.patch
-
-  ] ++ lib.optionals (!stdenv.targetPlatform.isVc4)
-  [
+    "${patchesDir}/always-search-rpath.patch"
+  ]
+  # For version 2.31 exclusively
+  ++ lib.optionals (!stdenv.targetPlatform.isVc4 && minorVersion == "2.31") [
     # https://sourceware.org/bugzilla/show_bug.cgi?id=22868
-    ./gold-symbol-visibility.patch
+    ./patches/2.31/gold-symbol-visibility.patch
 
     # https://sourceware.org/bugzilla/show_bug.cgi?id=23428
     # un-break features so linking against musl doesn't produce crash-only binaries
-    ./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
-    ./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
-    ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
-  ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch;
+    ./patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
+    ./patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
+    ./patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
+  ]
+  ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch
+  ;
 
   outputs = [ "out" "info" "man" ];
 
@@ -149,7 +152,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   passthru = {
-    inherit targetPrefix;
+    inherit targetPrefix patchesDir;
   };
 
   meta = with lib; {
diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
similarity index 100%
rename from pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
rename to pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
similarity index 100%
rename from pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
rename to pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
similarity index 100%
rename from pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
rename to pkgs/development/tools/misc/binutils/patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
diff --git a/pkgs/development/tools/misc/binutils/always-search-rpath.patch b/pkgs/development/tools/misc/binutils/patches/2.31/always-search-rpath.patch
similarity index 100%
rename from pkgs/development/tools/misc/binutils/always-search-rpath.patch
rename to pkgs/development/tools/misc/binutils/patches/2.31/always-search-rpath.patch
diff --git a/pkgs/development/tools/misc/binutils/build-components-separately.patch b/pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patch
similarity index 100%
rename from pkgs/development/tools/misc/binutils/build-components-separately.patch
rename to pkgs/development/tools/misc/binutils/patches/2.31/build-components-separately.patch
diff --git a/pkgs/development/tools/misc/binutils/deterministic.patch b/pkgs/development/tools/misc/binutils/patches/2.31/deterministic.patch
similarity index 100%
rename from pkgs/development/tools/misc/binutils/deterministic.patch
rename to pkgs/development/tools/misc/binutils/patches/2.31/deterministic.patch
diff --git a/pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch b/pkgs/development/tools/misc/binutils/patches/2.31/disambiguate-arm-targets.patch
similarity index 100%
rename from pkgs/development/tools/misc/binutils/disambiguate-arm-targets.patch
rename to pkgs/development/tools/misc/binutils/patches/2.31/disambiguate-arm-targets.patch
diff --git a/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch b/pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patch
similarity index 100%
rename from pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch
rename to pkgs/development/tools/misc/binutils/patches/2.31/gold-symbol-visibility.patch
diff --git a/pkgs/development/tools/misc/binutils/no-plugins.patch b/pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patch
similarity index 100%
rename from pkgs/development/tools/misc/binutils/no-plugins.patch
rename to pkgs/development/tools/misc/binutils/patches/2.31/no-plugins.patch

From 257fb62387f1324a9cb75465dceb3d84eefc2b4d Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 9 Nov 2020 20:18:16 -0500
Subject: [PATCH 1936/3942] binutils: Add patches for 2.34

From #89793
---
 .../patches/2.34/always-search-rpath.patch    |  14 ++
 .../2.34/build-components-separately.patch    | 164 ++++++++++++++++++
 .../binutils/patches/2.34/deterministic.patch |  12 ++
 .../2.34/disambiguate-arm-targets.patch       |  23 +++
 .../binutils/patches/2.34/no-plugins.patch    |  21 +++
 5 files changed, 234 insertions(+)
 create mode 100644 pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch
 create mode 100644 pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch
 create mode 100644 pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch
 create mode 100644 pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch
 create mode 100644 pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch

diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch b/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch
new file mode 100644
index 000000000000..2e9956e6b6e4
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch
@@ -0,0 +1,14 @@
+diff --git a/ld/genscripts.sh b/ld/genscripts.sh
+index b6940d376d..0feb1adfd0 100755
+--- a/ld/genscripts.sh
++++ b/ld/genscripts.sh
+@@ -125,6 +125,9 @@ if test "x$NATIVE" = "xyes" ; then
+   USE_LIBPATH=yes
+ fi
+ 
++# TODO: why is this needed?
++USE_LIBPATH=yes
++
+ # Set the library search path, for libraries named by -lfoo.
+ # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used.
+ # Otherwise, the default is set here.
diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch b/pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch
new file mode 100644
index 000000000000..38fa4934a28a
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch
@@ -0,0 +1,164 @@
+diff --git a/bfd/configure.ac b/bfd/configure.ac
+index c5bfbd5d..45ad4c26 100644
+--- a/bfd/configure.ac
++++ b/bfd/configure.ac
+@@ -278,31 +278,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed,
+ 
+ LT_LIB_M
+ 
+-# When building a shared libbfd, link against the pic version of libiberty
+-# so that apps that use libbfd won't need libiberty just to satisfy any
+-# libbfd references.
+-# We can't do that if a pic libiberty is unavailable since including non-pic
+-# code would insert text relocations into libbfd.
+ SHARED_LIBADD=
+-SHARED_LDFLAGS=
++SHARED_LDFLAGS=-liberty
+ if test "$enable_shared" = "yes"; then
+-changequote(,)dnl
+-  x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`
+-changequote([,])dnl
+-  if test -n "$x"; then
+-    SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
+-  fi
+-
+   case "${host}" in
+   # More hacks to build DLLs on Windows.
+   *-*-cygwin*)
+     SHARED_LDFLAGS="-no-undefined"
+-    SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
++    SHARED_LIBADD="-liberty -lintl -lcygwin -lkernel32"
+   ;;
+ 
+   # Use built-in libintl on macOS, since it is not provided by libc.
+   *-*-darwin*)
+-    SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl"
++    SHARED_LIBADD="-liberty -lintl"
+   ;;
+   esac
+ 
+diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
+index 4f06074a..6836c589 100644
+--- a/opcodes/Makefile.am
++++ b/opcodes/Makefile.am
+@@ -51,7 +51,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir)
+ endif
+ 
+ # This is where bfd.h lives.
+-BFD_H = ../bfd/bfd.h
++BFD_H = $(BFDDIR)/bfd.h
+ 
+ BUILD_LIBS = @BUILD_LIBS@
+ BUILD_LIB_DEPS = @BUILD_LIB_DEPS@
+@@ -301,7 +301,7 @@ OFILES = @BFD_MACHINES@
+ # development.sh is used to determine -Werror default.
+ CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh
+ 
+-AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@
++AM_CPPFLAGS = -I. -I$(srcdir) -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@
+ 
+ disassemble.lo: disassemble.c
+ if am__fastdepCC
+@@ -322,12 +322,21 @@ libopcodes_la_SOURCES =  dis-buf.c disassemble.c dis-init.c
+ # old version of libbfd, or to pick up libbfd for the wrong architecture
+ # if host != build. So for building with shared libraries we use a
+ # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la.
+-libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@
++libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libtool-soversion
+ libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@
+-libopcodes_la_LDFLAGS += -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@
++libopcodes_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@
+ # Allow dependency tracking to work on all the source files.
+ EXTRA_libopcodes_la_SOURCES = $(LIBOPCODES_CFILES)
+ 
++libtool-soversion:
++	@echo "creating $@"
++	bfd_soversion="$(VERSION)" ;\
++	. $(BFDDIR)/development.sh ;\
++	if test "$$development" = true ; then \
++	  bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
++	fi ;\
++	echo "$${bfd_soversion}" > $@
++
+ # libtool will build .libs/libopcodes.a.  We create libopcodes.a in
+ # the build directory so that we don't have to convert all the
+ # programs that use libopcodes.a simultaneously.  This is a hack which
+diff --git a/opcodes/configure.ac b/opcodes/configure.ac
+index 00be9c88..6e589ae4 100644
+--- a/opcodes/configure.ac
++++ b/opcodes/configure.ac
+@@ -86,6 +86,7 @@ AC_PROG_INSTALL
+ 
+ AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h)
+ ACX_HEADER_STRING
++GCC_HEADER_STDINT(bfd_stdint.h)
+ 
+ AC_CHECK_DECLS([basename, stpcpy])
+ 
+@@ -137,61 +138,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed,
+ 
+ LT_LIB_M
+ 
+-#Libs for generator progs
+-if test "x$cross_compiling" = "xno"; then
+-  BUILD_LIBS=../libiberty/libiberty.a
+-  BUILD_LIB_DEPS=$BUILD_LIBS
+-else
+-  # if cross-compiling, assume that the system provides -liberty
+-  # and that the version is compatible with new headers.
+-  BUILD_LIBS=-liberty
+-  BUILD_LIB_DEPS=
+-fi
+-BUILD_LIBS="$BUILD_LIBS $LIBINTL"
+-BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP"
++BUILD_LIBS="-liberty $LIBINTL"
++BUILD_LIB_DEPS="$LIBINTL_DEP"
+ 
+ AC_SUBST(BUILD_LIBS)
+ AC_SUBST(BUILD_LIB_DEPS)
+ 
+ # Horrible hacks to build DLLs on Windows and a shared library elsewhere.
+ SHARED_LDFLAGS=
+-SHARED_LIBADD=
++SHARED_LIBADD=-liberty
+ SHARED_DEPENDENCIES=
+ if test "$enable_shared" = "yes"; then
+-# When building a shared libopcodes, link against the pic version of libiberty
+-# so that apps that use libopcodes won't need libiberty just to satisfy any
+-# libopcodes references.
+-# We can't do that if a pic libiberty is unavailable since including non-pic
+-# code would insert text relocations into libopcodes.
+ # Note that linking against libbfd as we do here, which is itself linked
+ # against libiberty, may not satisfy all the libopcodes libiberty references
+ # since libbfd may not pull in the entirety of libiberty.
+-changequote(,)dnl
+-  x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`
+-changequote([,])dnl
+-  if test -n "$x"; then
+-    SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
+-  fi
+-
+   case "${host}" in
+     *-*-cygwin*)
+       SHARED_LDFLAGS="-no-undefined"
+-      SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin"
++      SHARED_LIBADD="-lbfd -liberty -lintl -lcygwin"
+       ;;
+-   *-*-darwin*)
+-     SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}"
+-     SHARED_DEPENDENCIES="../bfd/libbfd.la"
+-     ;;
+     *)
+-      case "$host_vendor" in
+-        hp)
+-          SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl ${SHARED_LIBADD}"
+-	  ;;
+-	*)
+-          SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so ${SHARED_LIBADD}"
+-	  ;;
+-      esac
+-      SHARED_DEPENDENCIES="../bfd/libbfd.la"
++      SHARED_LIBADD="-lbfd ${SHARED_LIBADD}"
+       ;;
+   esac
+ 
diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch b/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch
new file mode 100644
index 000000000000..736e0aca6ce1
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch
@@ -0,0 +1,12 @@
+diff -ur orig/binutils-2.23.1/ld/ldlang.c binutils-2.23.1/ld/ldlang.c
+--- orig/ld/ldlang.c
++++ new/ld/ldlang.c
+@@ -3095,6 +3095,8 @@
+                           ldfile_output_machine))
+     einfo (_("%P%F:%s: can not set architecture: %E\n"), name);
+ 
++  link_info.output_bfd->flags |= BFD_DETERMINISTIC_OUTPUT;
++
+   link_info.hash = bfd_link_hash_table_create (link_info.output_bfd);
+   if (link_info.hash == NULL)
+     einfo (_("%P%F: can not create hash table: %E\n"));
diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch b/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch
new file mode 100644
index 000000000000..abbfa73da05d
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch
@@ -0,0 +1,23 @@
+diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
+index 9f956d3..f5b61f1 100644
+--- a/bfd/elf32-arm.c
++++ b/bfd/elf32-arm.c
+@@ -19585,7 +19585,10 @@ elf32_arm_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker)
+ #undef  ELF_MAXPAGESIZE
+ #define ELF_MAXPAGESIZE			0x1000
+ 
++/* Prioritize elf32-*arm (priority 1) over elf32-*arm-vxworks (priority 2) */
++#define elf_match_priority 2
+ #include "elf32-target.h"
++#undef  elf_match_priority
+ 
+ 
+ /* Merge backend specific data from an object file to the output
+@@ -19974,4 +19977,7 @@ elf32_arm_symbian_plt_sym_val (bfd_vma i, const asection *plt,
+ #undef  ELF_MAXPAGESIZE
+ #define ELF_MAXPAGESIZE			0x8000
+ 
++/* Prioritize elf32-*arm (priority 1) over elf32-*arm-symbian (priority 2) */
++#define elf_match_priority 2
+ #include "elf32-target.h"
++#undef  elf_match_priority
diff --git a/pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch b/pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch
new file mode 100644
index 000000000000..68cf51b7dd3c
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch
@@ -0,0 +1,21 @@
+diff --git a/bfd/plugin.c b/bfd/plugin.c
+index 537ab60311..bfe7957f96 100644
+--- a/bfd/plugin.c
++++ b/bfd/plugin.c
+@@ -386,6 +386,7 @@ load_plugin (bfd *abfd)
+   if (plugin_program_name == NULL)
+     return found;
+ 
++#if 0
+   /* Try not to search the same dir twice, by looking at st_dev and
+      st_ino for the dir.  If we are on a file system that always sets
+      st_ino to zero or the actual st_ino is zero we might waste some
+@@ -437,7 +438,7 @@ load_plugin (bfd *abfd)
+       if (found)
+ 	break;
+     }
+-
++#endif
+   return found;
+ }
+ 

From c6f6db77ac53e84006353396283d271cb1b22460 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 9 Nov 2020 20:27:45 -0500
Subject: [PATCH 1937/3942] binutils: Prepare for concurrent versions

---
 .../tools/misc/binutils/default.nix           | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 3807fd7a539d..9bc50efa0ee5 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -8,6 +8,7 @@
 , bison ? null
 , flex
 , texinfo
+, perl
 }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
@@ -21,7 +22,10 @@ let
   # Remove gold-symbol-visibility patch when updating, the proper fix
   # is now upstream.
   # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3
-  version = "2.31.1";
+  version = "${minorVersion}${patchVersion}";
+  minorVersion = "2.31";
+  patchVersion =   ".1";
+
   basename = "binutils";
   # The targetPrefix prepended to binary names to allow multiple binuntils on the
   # PATH to both be usable.
@@ -33,19 +37,28 @@ let
     rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36";
     sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63";
   };
-  # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
-  normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl {
+
+  # binutils sources not part of the bootstrap.
+  non-boot-src = (fetchurl {
     url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2";
-    sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
+    sha256 = {
+      "2.31.1" = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
+    }.${version};
   });
+
+  # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
+  normal-src = stdenv.__bootPackages.binutils-unwrapped.src or non-boot-src;
+
+  # Select the specific source according to the platform in use.
+  src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src
+    else normal-src;
+
   patchesDir = ./patches + "/${minorVersion}";
 in
 
 stdenv.mkDerivation {
   pname = targetPrefix + basename;
-  inherit version;
-
-  src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src else normal-src;
+  inherit src version;
 
   patches = [
     # Make binutils output deterministic by default.

From ebd89f6de1894f3c3d22e4bb8cb879be7e9556b3 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 9 Nov 2020 20:28:15 -0500
Subject: [PATCH 1938/3942] binutils: Use 2.34 for OpenRISC 1000

---
 pkgs/development/tools/misc/binutils/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 9bc50efa0ee5..c0846fce45cc 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -23,8 +23,8 @@ let
   # is now upstream.
   # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3
   version = "${minorVersion}${patchVersion}";
-  minorVersion = "2.31";
-  patchVersion =   ".1";
+  minorVersion = if stdenv.targetPlatform.isOr1k then "2.34" else "2.31";
+  patchVersion = if stdenv.targetPlatform.isOr1k then     "" else   ".1";
 
   basename = "binutils";
   # The targetPrefix prepended to binary names to allow multiple binuntils on the
@@ -43,14 +43,20 @@ let
     url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2";
     sha256 = {
       "2.31.1" = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
+      "2.34"   = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49";
     }.${version};
   });
 
   # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
   normal-src = stdenv.__bootPackages.binutils-unwrapped.src or non-boot-src;
 
+  # Platforms where we directly use the final source.
+  # Generally for cross-compiled platforms, where the boot source won't compile.
+  skipBootSrc = stdenv.targetPlatform.isOr1k;
+
   # Select the specific source according to the platform in use.
   src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src
+    else if skipBootSrc then non-boot-src
     else normal-src;
 
   patchesDir = ./patches + "/${minorVersion}";
@@ -102,6 +108,9 @@ stdenv.mkDerivation {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
     bison
+  ] ++ lib.optionals (lib.versionAtLeast version "2.34") [
+    perl
+    texinfo
   ] ++ (lib.optionals stdenv.targetPlatform.isiOS [
     autoreconfHook
   ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ texinfo flex ];

From eeb4ae1c66d292903855fe8e507ef66b82c5b533 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 9 Nov 2020 21:51:27 -0500
Subject: [PATCH 1939/3942] geant4.tests.example_B1: init

---
 .../libraries/physics/geant4/default.nix      |  5 +++
 .../libraries/physics/geant4/tests.nix        | 31 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/physics/geant4/tests.nix

diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 97822d769dd5..2aa53b213a99 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -38,6 +38,9 @@
 # For enablePython
 , boost
 , python3
+
+# For tests
+, callPackage
 }:
 
 let
@@ -108,6 +111,8 @@ stdenv.mkDerivation rec {
           inherit stdenv fetchurl;
           geant_version = version;
       };
+
+    tests = callPackage ./tests.nix {};
   };
 
   # Set the myriad of envars required by Geant4 if we use a nix-shell.
diff --git a/pkgs/development/libraries/physics/geant4/tests.nix b/pkgs/development/libraries/physics/geant4/tests.nix
new file mode 100644
index 000000000000..83afee6089d4
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/tests.nix
@@ -0,0 +1,31 @@
+{ stdenv, cmake, geant4 }:
+
+{
+  example_B1 = stdenv.mkDerivation {
+    name = "${geant4.name}-test-example_B1";
+
+    inherit (geant4) src;
+
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ geant4 ];
+    checkInputs = with geant4.data; [
+      G4EMLOW
+      G4ENSDFSTATE
+      G4PARTICLEXS
+      G4PhotonEvaporation
+    ];
+
+    prePatch = ''
+      cd examples/basic/B1
+    '';
+
+    doCheck = true;
+    checkPhase = ''
+      runHook preCheck
+
+      ./exampleB1 ../run2.mac
+
+      runHook postCheck
+    '';
+  };
+}

From 6bc3e866628bd5253f7ea0004b0cd7924d4d91a6 Mon Sep 17 00:00:00 2001
From: r-burns <52847440+r-burns@users.noreply.github.com>
Date: Mon, 9 Nov 2020 20:12:31 -0800
Subject: [PATCH 1940/3942] bandwidth: fix build on darwin, fix license, adopt
 (#101522)

Cleaned up rules a bit for platform-independent building.
License was incorrectly listed as MIT, it is actually GPL2+.
Taking on maintainership as it appears to be orphaned.
---
 pkgs/tools/misc/bandwidth/default.nix | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index 8cd926c5c272..024454a3472d 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -1,13 +1,8 @@
 { stdenv, fetchurl, nasm }:
 
 let
-  arch =
-    if      stdenv.hostPlatform.system == "x86_64-linux" then "bandwidth64"
-    else if stdenv.hostPlatform.system == "i686-linux" then "bandwidth32"
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then "bandwidth-mac64"
-    else if stdenv.hostPlatform.system == "i686-darwin" then "bandwidth-mac32"
-    else if stdenv.hostPlatform.system == "i686-cygwin" then "bandwidth-win32"
-    else throw "Unknown architecture";
+  inherit (stdenv.hostPlatform.parsed.cpu) bits;
+  arch = "bandwidth${toString bits}";
 in
 stdenv.mkDerivation rec {
   pname = "bandwidth";
@@ -18,21 +13,25 @@ stdenv.mkDerivation rec {
     sha256 = "0x798xj3vhiwq2hal0vmf92sq4h7yalp3i6ylqwhnnpv99m2zws4";
   };
 
-  buildInputs = [ nasm ];
+  postPatch = ''
+    sed -i 's,^CC=gcc .*,,' OOC/Makefile Makefile*
+    sed -i 's,ar ,$(AR) ,g' OOC/Makefile
+  '';
 
-  buildFlags = [ arch ]
-    ++ stdenv.lib.optionals stdenv.cc.isClang [ "CC=clang" "LD=clang" ];
+  nativeBuildInputs = [ nasm ];
+
+  buildFlags = [ arch ];
 
   installPhase = ''
     mkdir -p $out/bin
-    cp ${arch} $out/bin
-    ln -s ${arch} $out/bin/bandwidth
+    cp ${arch} $out/bin/bandwidth
   '';
 
   meta = with stdenv.lib; {
     homepage = "https://zsmith.co/bandwidth.html";
     description = "Artificial benchmark for identifying weaknesses in the memory subsystem";
-    license = licenses.mit;
-    platforms = platforms.unix;
+    license = licenses.gpl2Plus;
+    platforms = platforms.x86;
+    maintainers = with maintainers; [ r-burns ];
   };
 }

From fae02c06b8b3a0c5f224ce4954dabf828442e1ba Mon Sep 17 00:00:00 2001
From: Alexander Bich <quyse0@gmail.com>
Date: Mon, 2 Nov 2020 23:58:09 +0300
Subject: [PATCH 1941/3942] ocaml-libvirt: 0.6.1.4.2017-11-08-unstable ->
 0.6.1.5

---
 .../virtualization/virt-top/default.nix       | 10 +++++++++-
 .../ocaml-modules/ocaml-libvirt/default.nix   | 20 ++++++++-----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index 7ad60405f1b8..692b5f01b5c6 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ocamlPackages, autoreconfHook }:
+{ stdenv, fetchgit, fetchpatch, ocamlPackages, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "virt-top";
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
     sha256 = "0m7pm8lzlpngsj0vjv0hg8l9ck3gvwpva7r472f8f03xpjffwiga";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "ocaml-libvirt-0.6.1.5-fix.patch";
+      url = "http://git.annexia.org/?p=virt-top.git;a=patch;h=24a461715d5bce47f63cb0097606fc336230589f";
+      sha256 = "15w7w9iggvlw8m9w8g4h08251wzb3m3zkb58glr7ifsgi3flbn61";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt gettext-stub curses csv xml-light ];
 
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index 026aeb220e56..dc6cef0bbba1 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -1,28 +1,24 @@
-{ stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }:
+{ stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }:
 
 stdenv.mkDerivation rec {
   pname = "ocaml-libvirt";
-  rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897";
-  version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4
+  version = "0.6.1.5";
 
-  src = fetchgit {
-    url = "git://git.annexia.org/git/ocaml-libvirt.git";
-    rev = rev;
-    sha256 = "0vxgx1n58fp4qmly6i5zxiacr7303127d6j78a295xin1p3a8xcw";
+  src = fetchFromGitLab {
+    owner = "libvirt";
+    repo = "libvirt-ocaml";
+    rev = "v${version}";
+    sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k";
   };
 
   propagatedBuildInputs = [ libvirt ];
 
-  nativeBuildInputs = [ autoconf findlib ];
+  nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ];
 
   buildInputs = [ ocaml ];
 
   createFindlibDestdir = true;
 
-  preConfigure = ''
-    autoconf
-  '';
-
   buildPhase = "make all opt CPPFLAGS=-Wno-error";
 
   installPhase = "make install-opt";

From eccd3ea47abf5b3efb4c5ffe80479f7195aae83b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 10 Nov 2020 07:39:51 +0100
Subject: [PATCH 1942/3942] nixos-generators: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix
index c1e844946094..74bbcbd0ae6b 100644
--- a/pkgs/tools/nix/nixos-generators/default.nix
+++ b/pkgs/tools/nix/nixos-generators/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "nixos-generators";
-  version = "1.1.0";
+  version = "1.2.0";
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixos-generators";
     rev = version;
-    sha256 = "04cfhj42c2m7lafir9ksh36n3nhx3x20lhamyk4zc5p3pm1xdbs6";
+    sha256 = "1iwc39hzvzzyndxwbnl3fck7phxnjpnhy8zn4nyp8is1fiw0648v";
   };
   nativeBuildInputs = [ makeWrapper ];
   installFlags = [ "PREFIX=$(out)" ];

From 42374a1329f8bab1902e8c3a2f97eaf64fbba5d5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 05:44:31 +0000
Subject: [PATCH 1943/3942] python37Packages.pyvmomi: 7.0 -> 7.0.1

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

diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix
index 25845c9847a3..8f8ca6f1d7ac 100644
--- a/pkgs/development/python-modules/pyvmomi/default.nix
+++ b/pkgs/development/python-modules/pyvmomi/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyvmomi";
-  version = "7.0";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "vmware";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1qqljrlc9h7kddx3xxc6479gk75fvaxspfikzjn6zj5mznsvfwj5";
+    sha256 = "1i7zni4ygdikc22wfrbnzwqh6qy402s3di6sdlfcvky2y7fzx52x";
   };
 
   # requires old version of vcrpy

From c183f1252fbe910c0e70eab54c6f0c521db0694e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 05:52:02 +0000
Subject: [PATCH 1944/3942] ansible-lint: 4.3.6 -> 4.3.7

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

diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
index 2c324bc42710..2718ba7670b5 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "ansible-lint";
-  version = "4.3.6";
+  version = "4.3.7";
   # pip is not able to import version info on raumel.yaml
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fn7mdykm4id78k4faibi92q9yxbjbyxb90ww0by03c31m8z5348";
+    sha256 = "0kwwv9dv9rgsqvp15r2vma7hii9lkkqn0n2irvp5h32cbhzzq4hh";
   };
 
   format = "pyproject";

From 38763f10bd391783c38d15ee3a8df1294d029f37 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 07:00:04 +0000
Subject: [PATCH 1945/3942] python37Packages.pytest-pylint: 0.17.0 -> 0.18.0

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

diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix
index f7a9a3143065..e35d2ebc73e9 100644
--- a/pkgs/development/python-modules/pytest-pylint/default.nix
+++ b/pkgs/development/python-modules/pytest-pylint/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "pytest-pylint";
-  version = "0.17.0";
+  version = "0.18.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b0c177d63f6e3f5b82fa2720a6570dd2ecff1616c26ed6d02d0cbf75fd98ddf9";
+    sha256 = "790c7a8019fab08e59bd3812db1657a01995a975af8b1c6ce95b9aa39d61da27";
   };
 
   nativeBuildInputs = [ pytestrunner ];

From 4defa325b815d40282a154c28be1e6463deb1f87 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 02:22:26 +0000
Subject: [PATCH 1946/3942] python37Packages.streamz: 0.5.5 -> 0.6.1

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

diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix
index d34a826a0604..d17aed6ae43a 100644
--- a/pkgs/development/python-modules/streamz/default.nix
+++ b/pkgs/development/python-modules/streamz/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "streamz";
-  version = "0.5.5";
+  version = "0.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "787ade4796c5b2e79af2aac678841ba3748a65a3adce150697dcdd31c4f80365";
+    sha256 = "215703456479d24f524cdcd0365006250d4502d242f57e2f5db18e8638bc8694";
   };
 
   propagatedBuildInputs = [

From ebed0a25ddb7cedef2e6c18df75c8512528c2a44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Tue, 3 Nov 2020 19:53:33 -0600
Subject: [PATCH 1947/3942] maintainers: add fabianhjr

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 48f847b3d197..483a49172222 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2833,6 +2833,12 @@
       fingerprint = "50B7 11F4 3DFD 2018 DCE6  E8D0 8A52 A140 BEBF 7D2C";
     }];
   };
+  fabianhjr = {
+    email = "fabianhjr@protonmail.com";
+    github = "fabianhjr";
+    githubId = 303897;
+    name = "Fabián Heredia Montiel";
+  };
   fadenb = {
     email = "tristan.helmich+nixos@gmail.com";
     github = "fadenb";

From 4408345c9c8050ba4913fa969414c03064ea4fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Tue, 3 Nov 2020 23:14:13 -0600
Subject: [PATCH 1948/3942] pythonPackages.cpyparsing: init at 2.4.5.0.1.1

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

diff --git a/pkgs/development/python-modules/cpyparsing/default.nix b/pkgs/development/python-modules/cpyparsing/default.nix
new file mode 100644
index 000000000000..66f173106e49
--- /dev/null
+++ b/pkgs/development/python-modules/cpyparsing/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub, cython, python }:
+
+buildPythonPackage rec {
+  pname = "cpyparsing";
+  version = "2.4.5.0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "evhub";
+    repo = pname;
+    rev = "aa8ee45daec5c55328446bad7202ab8f799ab0ce"; # No tags on repo
+    sha256 = "1mxa5q41cb0k4lkibs0d4lzh1w6kmhhdrsm0w0r1m3s80m05ffmw";
+  };
+
+  nativeBuildInputs = [ cython ];
+
+  checkPhase = "${python.interpreter} tests/cPyparsing_test.py";
+
+  meta = with lib; {
+    homepage = "https://github.com/evhub/cpyparsing";
+    description = "Cython PyParsing implementation";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fabianhjr ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e803e50c84f3..a1dbecdbc138 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1351,6 +1351,8 @@ in {
 
   cppy = callPackage ../development/python-modules/cppy { };
 
+  cpyparsing = callPackage ../development/python-modules/cpyparsing { };
+
   cram = callPackage ../development/python-modules/cram { };
 
   crashtest = callPackage ../development/python-modules/crashtest { };

From 674d77e68ab4dfd915ccee9c363d4cece9942d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Tue, 3 Nov 2020 23:16:55 -0600
Subject: [PATCH 1949/3942] coconut: init at 1.4.3

---
 .../python-modules/coconut/default.nix        | 52 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/coconut/default.nix

diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix
new file mode 100644
index 000000000000..b75a82b6c2b2
--- /dev/null
+++ b/pkgs/development/python-modules/coconut/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonApplication,
+  fetchFromGitHub,
+  fetchpatch,
+
+  cpyparsing,
+  ipykernel,
+  mypy,
+  pygments,
+  pytest,
+  prompt_toolkit,
+  tkinter,
+  watchdog
+}:
+
+buildPythonApplication rec {
+  pname = "coconut";
+  version = "1.4.3";
+
+  src = fetchFromGitHub {
+    owner = "evhub";
+    repo = "coconut";
+    rev = "v${version}";
+    sha256 = "1pz13vza3yy95dbylnq89fzc3mwgcqr7ds096wy25k6vxd9dp9c3";
+  };
+
+  propagatedBuildInputs = [ cpyparsing pygments prompt_toolkit ipykernel mypy watchdog ];
+
+  patches = [
+    (fetchpatch {
+      name = "fix-setuptools-version-check.patch";
+      url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch";
+      sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q";
+    })
+  ];
+
+  checkInputs = [ pytest tkinter ];
+  # Currently most tests do not work on Hydra due to external fetches.
+  checkPhase = ''
+    pytest tests/constants_test.py
+    pytest tests/main_test.py::TestShell::test_compile_to_file
+    pytest tests/main_test.py::TestShell::test_convenience
+  '';
+
+  meta = with lib; {
+    homepage = "http://coconut-lang.org/";
+    description = "Simple, elegant, Pythonic functional programming";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fabianhjr ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a66fefcf4495..b9254fadb87c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1064,6 +1064,8 @@ in
 
   cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian  { };
 
+  coconut = with python3Packages; toPythonApplication coconut;
+
   cod = callPackage ../tools/misc/cod { };
 
   codespell = with python3Packages; toPythonApplication codespell;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a1dbecdbc138..b2aadd1e42ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1250,6 +1250,8 @@ in {
 
   cnvkit = callPackage ../development/python-modules/cnvkit { };
 
+  coconut = callPackage ../development/python-modules/coconut { };
+
   cocotb = callPackage ../development/python-modules/cocotb { };
 
   codecov = callPackage ../development/python-modules/codecov { };

From d04287f130365228569b95c49df068e3ad1aea3a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Nov 2020 23:15:30 +0000
Subject: [PATCH 1950/3942] python27Packages.rtslib: 2.1.72 -> 2.1.74

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

diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix
index 28b66ec5a521..aaf879d2a3f4 100644
--- a/pkgs/development/python-modules/rtslib/default.nix
+++ b/pkgs/development/python-modules/rtslib/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "rtslib";
-  version = "2.1.72";
+  version = "2.1.74";
 
   src = fetchFromGitHub {
     owner = "open-iscsi";
     repo = "${pname}-fb";
     rev = "v${version}";
-    sha256 = "13kycf9xkyxm1ik8yh3qpd96vird8y65daigyiyb4jvx0lmrd0kv";
+    sha256 = "1in10z6ckmkfhykar435k1fmswbfajysv4g9nsav893ij8g694fy";
   };
 
   propagatedBuildInputs = [ six pyudev pygobject3 ];

From 7a647b07b6b486733a4270a99f42f53d445a09d3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 07:23:31 +0000
Subject: [PATCH 1951/3942] python37Packages.chalice: 1.21.3 -> 1.21.4

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

diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index f985da36d17a..7eb06e26450c 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -22,11 +22,11 @@
 
 buildPythonPackage rec {
   pname = "chalice";
-  version = "1.21.3";
+  version = "1.21.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0b44514cdbafab08b18e21f59fc016cead0b78f5f5fdf14eccd993c469130b39";
+    sha256 = "fb3580272cc66ba0fd59914b7ac395d2da6b9b32b11dc7557aa80a0ae7cccf3c";
   };
 
   checkInputs = [ watchdog pytest hypothesis mock ];

From beafea6499338bf41d9b15e5c8770c74f6e037dc Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 10 Nov 2020 19:29:35 +1000
Subject: [PATCH 1952/3942] gnomeExtensions.paperwm: 38.0 -> 38.1

https://github.com/paperwm/PaperWM/releases/tag/38.1
---
 pkgs/desktops/gnome-3/extensions/paperwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix
index fb6ce614119b..c2d5136e45eb 100644
--- a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-paperwm";
-  version = "38.0";
+  version = "38.1";
 
   src = fetchFromGitHub {
     owner = "paperwm";
     repo = "PaperWM";
     rev = version;
-    sha256 = "01r2ifwrl8w735d0ckzlwhvclax9dxd2ld5y2svv5bp444zbjsag";
+    sha256 = "1jq15qrq3khqpjsjbcc17amdr1k53jkvambdacdf56xbqkycvlgs";
   };
 
   uuid = "paperwm@hedning:matrix.org";

From 689eb49d4261296acefcc175d93e77f6599b4ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Nov 2020 10:15:54 +0100
Subject: [PATCH 1953/3942] nixos/loki: add logcli to system path

Admins quite likely want to query loki for debugging purpose.
---
 nixos/modules/services/monitoring/loki.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/monitoring/loki.nix b/nixos/modules/services/monitoring/loki.nix
index f4eec7e0d284..d5e7beeb0438 100644
--- a/nixos/modules/services/monitoring/loki.nix
+++ b/nixos/modules/services/monitoring/loki.nix
@@ -78,6 +78,8 @@ in {
       '';
     }];
 
+    environment.systemPackages = [ pkgs.grafana-loki ]; # logcli
+
     users.groups.${cfg.group} = { };
     users.users.${cfg.user} = {
       description = "Loki Service User";

From 88d1da8e5d94202c88d65816bb5793829f1baa7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Nov 2020 10:28:06 +0100
Subject: [PATCH 1954/3942] nixos/promtail: use json type for configuration

---
 nixos/modules/services/logging/promtail.nix | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix
index 834bb99bb1d6..1d3e9d8e9b99 100644
--- a/nixos/modules/services/logging/promtail.nix
+++ b/nixos/modules/services/logging/promtail.nix
@@ -11,20 +11,7 @@ in {
     enable = mkEnableOption "the Promtail ingresser";
 
     configuration = mkOption {
-      type = with lib.types; let
-        valueType = nullOr (oneOf [
-          bool
-          int
-          float
-          str
-          (lazyAttrsOf valueType)
-          (listOf valueType)
-        ]) // {
-          description = "JSON value";
-          emptyValue.value = {};
-          deprecationMessage = null;
-        };
-      in valueType;
+      type = (pkgs.formats.json {}).type;
       description = ''
         Specify the configuration for Promtail in Nix.
       '';

From 4c64fa224eca82883088852914fa8fd28789dc32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Nov 2020 10:29:18 +0100
Subject: [PATCH 1955/3942] nixos/loki: mergeable configuration

type.attrs is not mergable
---
 nixos/modules/services/monitoring/loki.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/loki.nix b/nixos/modules/services/monitoring/loki.nix
index d5e7beeb0438..51cabaa274a3 100644
--- a/nixos/modules/services/monitoring/loki.nix
+++ b/nixos/modules/services/monitoring/loki.nix
@@ -39,7 +39,7 @@ in {
     };
 
     configuration = mkOption {
-      type = types.attrs;
+      type = (pkgs.formats.json {}).type;
       default = {};
       description = ''
         Specify the configuration for Loki in Nix.

From 31a0b5dff6d9baa8c7aee4f77c379ed8fd3d1e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Nov 2020 10:36:53 +0100
Subject: [PATCH 1956/3942] nixos/promtail: fix access to journal

---
 nixos/modules/services/logging/promtail.nix | 4 ++++
 nixos/tests/loki.nix                        | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix
index 1d3e9d8e9b99..19b12daa4152 100644
--- a/nixos/modules/services/logging/promtail.nix
+++ b/nixos/modules/services/logging/promtail.nix
@@ -6,10 +6,12 @@ let
     echo '${builtins.toJSON conf}' | ${pkgs.buildPackages.jq}/bin/jq 'del(._module)' > $out
   '';
 
+  allowSystemdJournal = cfg.configuration ? scrape_configs && lib.any (v: v ? journal) cfg.configuration.scrape_configs;
 in {
   options.services.promtail = with types; {
     enable = mkEnableOption "the Promtail ingresser";
 
+
     configuration = mkOption {
       type = (pkgs.formats.json {}).type;
       description = ''
@@ -67,6 +69,8 @@ in {
         RestrictRealtime = true;
         MemoryDenyWriteExecute = true;
         PrivateUsers = true;
+
+        SupplementaryGroups = lib.optional (allowSystemdJournal) "systemd-journal";
       } // (optionalAttrs (!pkgs.stdenv.isAarch64) { # FIXME: figure out why this breaks on aarch64
         SystemCallFilter = "@system-service";
       });
diff --git a/nixos/tests/loki.nix b/nixos/tests/loki.nix
index eaee717cf87d..bede775b7d3c 100644
--- a/nixos/tests/loki.nix
+++ b/nixos/tests/loki.nix
@@ -45,6 +45,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
     machine.wait_for_open_port(3100)
     machine.wait_for_open_port(9080)
     machine.succeed("echo 'Loki Ingestion Test' > /var/log/testlog")
+    # should not have access to journal unless specified
+    machine.fail("systemctl show --property=SupplementaryGroups promtail | grep -q systemd-journal")
     machine.wait_until_succeeds(
         "${pkgs.grafana-loki}/bin/logcli --addr='http://localhost:3100' query --no-labels '{job=\"varlogs\",filename=\"/var/log/testlog\"}' | grep -q 'Loki Ingestion Test'"
     )

From 37a7436356c4d28e7c85bb3bf8bb453fe20e145c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Nov 2020 10:46:30 +0100
Subject: [PATCH 1957/3942] loki: reference nixosTests

---
 pkgs/servers/monitoring/loki/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index c4bfeed8c88d..f1cefdc0b1d9 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -1,4 +1,12 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, systemd, fetchpatch }:
+{ stdenv
+, lib
+, buildGoModule
+, fetchFromGitHub
+, makeWrapper
+, nixosTests
+, systemd
+, fetchpatch
+}:
 
 buildGoModule rec {
   version = "2.0.0";
@@ -32,6 +40,8 @@ buildGoModule rec {
       --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"
   '';
 
+  passthru.tests = { inherit (nixosTests) loki; };
+
   doCheck = true;
 
   meta = with stdenv.lib; {

From 652195179a09d7ab5518680386f62bcaa10665dd Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 24 Oct 2020 12:23:38 +1000
Subject: [PATCH 1958/3942] .github/workflows/editorconfig.yml: check
 indent_style

---
 .github/workflows/editorconfig.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml
index d61882c50400..962f3ced398b 100644
--- a/.github/workflows/editorconfig.yml
+++ b/.github/workflows/editorconfig.yml
@@ -23,5 +23,5 @@ jobs:
     - name: Checking EditorConfig
       if: env.GIT_DIFF
       run: |
-        ./bin/editorconfig-checker -disable-indentation \
+        ./bin/editorconfig-checker -disable-indent-size \
         ${{ env.GIT_DIFF }}

From 7e33f0ed75313c7f29ab9959824be429c5b50646 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 24 Oct 2020 12:24:25 +1000
Subject: [PATCH 1959/3942] .editorconfig: indent_style excludes

---
 .editorconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index d8a320e495c1..6625cbf69810 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -76,10 +76,12 @@ trim_trailing_whitespace = unset
 
 [pkgs/build-support/dotnetenv/Wrapper/**]
 end_of_line = unset
+indent_style = unset
 insert_final_newline = unset
 trim_trailing_whitespace = unset
 
 [pkgs/build-support/upstream-updater/**]
+indent_style = unset
 trim_trailing_whitespace = unset
 
 [pkgs/development/compilers/elm/registry.dat]
@@ -96,6 +98,9 @@ trim_trailing_whitespace = unset
 [pkgs/development/node-packages/composition.nix]
 insert_final_newline = unset
 
+[pkgs/development/{perl-modules,ocaml-modules,tools/ocaml}/**]
+indent_style = unset
+
 [pkgs/servers/dict/wordnet_structures.py]
 trim_trailing_whitespace = unset
 

From 4b5c6c8a58a164faaa9347957081fae36c8dc474 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 24 Oct 2020 12:24:25 +1000
Subject: [PATCH 1960/3942] .github/workflows/editorconfig.yml: disable for
 release branches

---
 .github/workflows/editorconfig.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml
index 962f3ced398b..be7a4ba02b61 100644
--- a/.github/workflows/editorconfig.yml
+++ b/.github/workflows/editorconfig.yml
@@ -2,6 +2,8 @@ name: "Checking EditorConfig"
 
 on:
   pull_request:
+    branches-ignore:
+      - 'release-**'
 
 jobs:
   tests:

From 9979ec11e38930e36c32bc0bfb6b930261cde4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Tue, 10 Nov 2020 11:53:23 +0100
Subject: [PATCH 1961/3942] atlassian-confluence: 7.8.1 -> 7.9.0

---
 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 88b0c8435860..a3a599064376 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);
 
 stdenvNoCC.mkDerivation rec {
   pname = "atlassian-confluence";
-  version = "7.8.1";
+  version = "7.9.0";
 
   src = fetchurl {
     url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
-    sha256 = "0jgwd8vb58yzwvnns0kyb0vzgrdvjwzvpk4x8228hrisjxahsm45";
+    sha256 = "0y21ivvzzs6mq2p96csmhbvz1jzwp1x4zrw26qrwavf84l2v7nlh";
   };
 
   buildPhase = ''

From cea118396f35518683822014d1a916dc90b546ba Mon Sep 17 00:00:00 2001
From: Mazurel <mateusz.mazur@yahoo.com>
Date: Tue, 10 Nov 2020 12:10:32 +0100
Subject: [PATCH 1962/3942] maintainers: add mazurel

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 48f847b3d197..6b8c8bd7580d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5468,6 +5468,12 @@
     githubId = 1191859;
     name = "Maxim Krivchikov";
   };
+  mazurel = {
+    email = "mateusz.mazur@yahoo.com";
+    github = "Mazurel";
+    githubId = 22836301;
+    name = "Mateusz Mazur";
+  };
   mbakke = {
     email = "mbakke@fastmail.com";
     github = "mbakke";

From 841664a172b31f4d07ab962fc1015c11523d88cd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 10 Nov 2020 12:06:30 +0100
Subject: [PATCH 1963/3942] chromium: 86.0.4240.183 -> 86.0.4240.193

https://chromereleases.googleblog.com/2020/11/stable-channel-update-for-desktop_9.html

This update includes 1 security fix (no CVE).
---
 .../browsers/chromium/upstream-info.json      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 565f884c5102..8a6ed0453a1a 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,8 +1,8 @@
 {
   "stable": {
-    "version": "86.0.4240.183",
-    "sha256": "1g39i82js7fm4fqb8i66d6xs0kzqjxzi4vzvvwz5y9rkbikcc4ma",
-    "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9",
+    "version": "86.0.4240.193",
+    "sha256": "0d55xkw3fygqpa3a5bvz7vqmzb0d9w1kis72h54cnwsqgw4xag90",
+    "sha256bin64": "1x1f8fv0fi965apk2a5v6jmhz8j5m3rz0k5x5vmkwqprvlblfjpw",
     "deps": {
       "gn": {
         "version": "2020-08-07",
@@ -13,9 +13,9 @@
     }
   },
   "beta": {
-    "version": "87.0.4280.40",
-    "sha256": "07xh76fl257np68way6i5rf64qbvirkfddy7m5gvqb0fzcqd7dp3",
-    "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41",
+    "version": "87.0.4280.47",
+    "sha256": "0a3c4kz85857wrbcxqknbqmai250d36nq332l66a83r8sidhbxfq",
+    "sha256bin64": "0bjls2airr4p448rx7im1a7gff68yfnfb5vymr4bin4kz0s38mpw",
     "deps": {
       "gn": {
         "version": "2020-09-09",
@@ -26,15 +26,15 @@
     }
   },
   "dev": {
-    "version": "88.0.4300.0",
-    "sha256": "00cfs2rp4h8ybn2snr1d8ygg635hx7q5gv2aqriy1j6f8a1pgh1b",
-    "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv",
+    "version": "88.0.4315.5",
+    "sha256": "0k6man2xq8vmnk73dqv3fcc9929agqq8j6s6nvc9z653q4jdphkw",
+    "sha256bin64": "0m139w8lwaawridk8in24ss1g1i6ah5298xky226k3vhk5i4mn3j",
     "deps": {
       "gn": {
-        "version": "2020-09-09",
+        "version": "2020-10-21",
         "url": "https://gn.googlesource.com/gn",
-        "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
-        "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
+        "rev": "f5f465b52e5df6d4de9fbe67cc79f1914ba4dbfc",
+        "sha256": "1xb31vsvg27ivvcdyiq93h8wj4d90qdrpagfh1dvm6xszkajsca1"
       }
     }
   }

From b5f8f521e69dab6558c1a788e0f4f26e131e74a3 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Mon, 9 Nov 2020 08:42:23 -0800
Subject: [PATCH 1964/3942] cp437: init at v0.6

Emulates an old-style "code page 437" / "IBM-PC" character set terminal
on a modern UTF-8 terminal emulator.

Signed-off-by: William Casarin <jb55@jb55.com>
---
 pkgs/tools/misc/cp437/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/misc/cp437/default.nix

diff --git a/pkgs/tools/misc/cp437/default.nix b/pkgs/tools/misc/cp437/default.nix
new file mode 100644
index 000000000000..2e15e32e9713
--- /dev/null
+++ b/pkgs/tools/misc/cp437/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+let version = "0.6";
+in
+stdenv.mkDerivation {
+  pname = "cp437";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "keaston";
+    repo  = "cp437";
+    rev   = "v${version}";
+    sha256 = "18f4mnfnyviqclbhmbhix80k823481ypkwbp26qfvhnxdgzbggcc";
+  };
+
+  installPhase = ''
+    install -Dm755 cp437 -t $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''
+      Emulates an old-style "code page 437" / "IBM-PC" character
+      set terminal on a modern UTF-8 terminal emulator
+    '';
+    homepage = "https://github.com/keaston/cp437";
+    license = licenses.bsd3;
+    maintainer = with maintainers; [ jb55 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8d4e426ceb2..a31b429274c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -192,6 +192,8 @@ in
 
   comedilib = callPackage ../development/libraries/comedilib {  };
 
+  cp437 = callPackage ../tools/misc/cp437 { };
+
   cpu-x = callPackage ../applications/misc/cpu-x { };
 
   dhallToNix = callPackage ../build-support/dhall-to-nix.nix {

From b63fbf3a54a21ae616bff349d79b94b77805dc83 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 12:46:55 +0000
Subject: [PATCH 1965/3942] python37Packages.xstatic-jquery: 3.4.1.0 -> 3.5.1.1

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

diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix
index 3cfbf3eb9326..e2a8f8266111 100644
--- a/pkgs/development/python-modules/xstatic-jquery/default.nix
+++ b/pkgs/development/python-modules/xstatic-jquery/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "XStatic-jQuery";
-  version = "3.4.1.0";
+  version = "3.5.1.1";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0y2rhbasr7vdjbgi6x67cx97hwdnmv6m5difqqq59yb5n9zark1z";
+    sha256 = "e0ae8f8ec5bbd28045ba4bca06767a38bd5fc27cf9b71f434589f59370dcd323";
   };
 
   # no tests implemented

From de47c1907c60e3951d70971c501578aa41d6fc18 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 10 Nov 2020 22:51:00 +1000
Subject: [PATCH 1966/3942] cp437: fix eval

---
 pkgs/tools/misc/cp437/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/cp437/default.nix b/pkgs/tools/misc/cp437/default.nix
index 2e15e32e9713..70ca44bd06a2 100644
--- a/pkgs/tools/misc/cp437/default.nix
+++ b/pkgs/tools/misc/cp437/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
     '';
     homepage = "https://github.com/keaston/cp437";
     license = licenses.bsd3;
-    maintainer = with maintainers; [ jb55 ];
+    maintainers = with maintainers; [ jb55 ];
   };
 }

From 24c8927c4a80db656c535893b65eb75e8cf0fcf0 Mon Sep 17 00:00:00 2001
From: moinessim <47434700+moinessim@users.noreply.github.com>
Date: Tue, 10 Nov 2020 07:52:13 -0500
Subject: [PATCH 1967/3942] fsharp41: Add patch to avoid type inference error.
 (#103223)

https://github.com/mono/mono/pull/13109/

Co-authored-by: Moises Nessim <moises.nessim@topmanage.com>
---
 pkgs/development/compilers/fsharp41/default.nix     |  1 +
 ...GetFileNameWithoutExtension-type-inference.patch | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch

diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix
index 8a4fa303937c..6475deb1026b 100644
--- a/pkgs/development/compilers/fsharp41/default.nix
+++ b/pkgs/development/compilers/fsharp41/default.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
     ./fsharp-IsPathRooted-type-inference.patch
     ./fsharp-string-switchName.patch
     ./fsharp-path-overloads.patch
+    ./fsharp-GetFileNameWithoutExtension-type-inference.patch
   ];
 
   configurePhase = ''
diff --git a/pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch b/pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch
new file mode 100644
index 000000000000..14e9444b1de3
--- /dev/null
+++ b/pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch
@@ -0,0 +1,13 @@
+diff --git a/src/scripts/fssrgen.fsx b/src/scripts/fssrgen.fsx
+index 0bee9b79e..e6ceda11e 100644
+--- a/src/scripts/fssrgen.fsx
++++ b/src/scripts/fssrgen.fsx
+@@ -329,7 +329,7 @@ let StringBoilerPlate filename =
+     // END BOILERPLATE        
+ "            
+ 
+-let RunMain(filename, outFilename, outXmlFilenameOpt, projectNameOpt) =
++let RunMain(filename:string, outFilename, outXmlFilenameOpt, projectNameOpt) =
+     try
+         let justfilename = System.IO.Path.GetFileNameWithoutExtension(filename)
+         if justfilename |> Seq.exists (fun c -> not(System.Char.IsLetterOrDigit(c))) then

From a33290b1a85b428cb33f3c5cdaee6fff7c7e2458 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Sun, 1 Nov 2020 19:26:15 +0100
Subject: [PATCH 1968/3942] nixos/cfdyndns: add apikeyFile option

nixos/cfdyndns: remove apikey option
---
 nixos/modules/services/misc/cfdyndns.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/cfdyndns.nix b/nixos/modules/services/misc/cfdyndns.nix
index dcf416022734..15af1f50da1d 100644
--- a/nixos/modules/services/misc/cfdyndns.nix
+++ b/nixos/modules/services/misc/cfdyndns.nix
@@ -6,6 +6,12 @@ let
   cfg = config.services.cfdyndns;
 in
 {
+  imports = [
+    (mkRemovedOptionModule
+      [ "services" "cfdyndns" "apikey" ]
+      "Use services.cfdyndns.apikeyFile instead.")
+  ];
+
   options = {
     services.cfdyndns = {
       enable = mkEnableOption "Cloudflare Dynamic DNS Client";
@@ -17,10 +23,12 @@ in
         '';
       };
 
-      apikey = mkOption {
-        type = types.str;
+      apikeyFile = mkOption {
+        default = null;
+        type = types.nullOr types.str;
         description = ''
-          The API Key to use to authenticate to CloudFlare.
+          The path to a file containing the API Key
+          used to authenticate with CloudFlare.
         '';
       };
 
@@ -45,13 +53,17 @@ in
         Type = "simple";
         User = config.ids.uids.cfdyndns;
         Group = config.ids.gids.cfdyndns;
-        ExecStart = "/bin/sh -c '${pkgs.cfdyndns}/bin/cfdyndns'";
       };
       environment = {
         CLOUDFLARE_EMAIL="${cfg.email}";
-        CLOUDFLARE_APIKEY="${cfg.apikey}";
         CLOUDFLARE_RECORDS="${concatStringsSep "," cfg.records}";
       };
+      script = ''
+        ${optionalString (cfg.apikeyFile != null) ''
+          export CLOUDFLARE_APIKEY="$(cat ${escapeShellArg cfg.apikeyFile})"
+        ''}
+        ${pkgs.cfdyndns}/bin/cfdyndns
+      '';
     };
 
     users.users = {

From 93777ff5937e786b29275868d22bb808c5772782 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 11:37:26 +0000
Subject: [PATCH 1969/3942] python37Packages.genanki: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix
index 658ea3baee73..201f7646e010 100644
--- a/pkgs/development/python-modules/genanki/default.nix
+++ b/pkgs/development/python-modules/genanki/default.nix
@@ -4,15 +4,15 @@
 
 buildPythonPackage rec {
   pname = "genanki";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08eddb4a203e36e4fc3b66f85e00252070379867dbbc04fd8902ddc14fb352c6";
+    sha256 = "e8bd0d117b2ddfc6bfebe86344979134c7acbd9e4c6cd04578df2cd6077785c1";
   };
 
   propagatedBuildInputs = [
-		pytestrunner
+    pytestrunner
     cached-property
     frozendict
     pystache
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   disabled = !isPy3k;
 
   # relies on upstream anki
-	doCheck = false;
+  doCheck = false;
   checkPhase = ''
     py.test
   '';

From c3fe9824242cc9cff7d5175dee318cecc7051d22 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 13:12:45 +0000
Subject: [PATCH 1970/3942] python37Packages.dbus-next: 0.1.4 -> 0.2.1

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

diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix
index 163a7adcb10d..216e63638501 100644
--- a/pkgs/development/python-modules/dbus-next/default.nix
+++ b/pkgs/development/python-modules/dbus-next/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "dbus-next";
-  version = "0.1.4";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "altdesktop";
     repo = "python-dbus-next";
     rev = "v${version}";
-    sha256 = "sha256-C/aFDHmt6Qws6ek+++wM5GRN6TEvMGMiFktKIXRdGL0=";
+    sha256 = "0c14mmysx014n1m4pi4ymi6pzxf8dkjr6fm2cmp96x05z9v90vlr";
   };
 
   checkInputs = [

From dc506de1feb30df89ea8acbea675028d5f78fcf6 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 10 Nov 2020 13:38:09 +0000
Subject: [PATCH 1971/3942] kube3d: 3.1.5 -> 3.2.0

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

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 0f39fc5281ed..af91f0fe7e6d 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "kube3d";
-  version = "3.1.5";
+  version = "3.2.0";
   k3sVersion = "1.18.9-k3s1";
 
   excludedPackages = ''tools'';
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "rancher";
     repo   = "k3d";
     rev    = "v${version}";
-    sha256 = "0aspkar9im323d8117k48fvh1yylyspi2p2l2f5rdg1ilpa6hm53";
+    sha256 = "0jy0l8rvmwi0qznnvv97v50lfkpc2bwjmbnq4pxnmf9ih970wjwh";
   };
 
   buildFlagsArray = ''

From feca10b61d727a61aa142ece4b5acd0281c2ed8a Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 10 Nov 2020 13:39:08 +0000
Subject: [PATCH 1972/3942] kube3d: move to new installShellCompletion style

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

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index af91f0fe7e6d..f6306ef9043d 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -23,12 +23,11 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  # TODO: Move to enhanced installShellCompletion when in master: PR #83630
   postInstall = ''
-    $out/bin/k3d completion bash > k3d.bash
-    $out/bin/k3d completion fish > k3d.fish
-    $out/bin/k3d completion zsh  > _k3d
-    installShellCompletion k3d.{bash,fish} --zsh _k3d
+    installShellCompletion --cmd k3d \
+      --bash <($out/bin/k3d completion bash) \
+      --fish <($out/bin/k3d completion fish) \
+      --zsh <($out/bin/k3d completion zsh)
   '';
 
   vendorSha256 = null;

From a126b44084c4394da875f588d12466603f6e8019 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 10 Nov 2020 13:50:11 +0000
Subject: [PATCH 1973/3942] terragrunt: 0.25.5 -> 0.26.2

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

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index e3f2adacfb21..e607a9ee75ba 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "terragrunt";
-  version = "0.25.5";
+  version = "0.26.2";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "19rsnhws4cvssxjmm22j746jck0wzrhwi24hnlwxkdaaw92yd36l";
+    sha256 = "0bp43rsnkq2ysdl0v28i9agan738m0zk5yn8zza6js28sx0y7kns";
   };
 
   vendorSha256 = "0l85jx02dj9qvxs8l0ln5fln8vssi0fisblm5i1scz9x4a1jqg9n";

From b3d4f5dada2264dc55e55717ce33589536908c00 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 10 Nov 2020 08:48:18 -0500
Subject: [PATCH 1974/3942] zfs: extend zpool scripts with :$PATH, remove sudo

sudo the package is not suid, so remove it from the PATH. Extend
PATH with $PATH to fetch sudo from the outer PATH. Move the generation
of `path` in to Nix, so the sed expression can use single quotes,
which prevents $PATH being interpolated at build-time.
---
 pkgs/os-specific/linux/zfs/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index bb4a2dcf9796..b9a8c83060b5 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -161,10 +161,11 @@ let
         (cd $out/share/bash-completion/completions; ln -s zfs zpool)
       '';
 
-      postFixup = ''
-        path="PATH=${makeBinPath [ coreutils gawk gnused gnugrep utillinux smartmontools sysstat sudo ]}"
+      postFixup = let
+        path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep utillinux smartmontools sysstat ]}:$PATH";
+      in ''
         for i in $out/libexec/zfs/zpool.d/*; do
-          sed -i "2i$path" $i
+          sed -i '2i${path}' $i
         done
       '';
 

From 081584d41cdb84e7374fd4c6bc60697d8931345c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 01:54:20 +0000
Subject: [PATCH 1975/3942] libgcrypt: 1.8.6 -> 1.8.7

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

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index d49fa37325aa..2290d2fa07dc 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
   pname = "libgcrypt";
-  version = "1.8.6";
+  version = "1.8.7";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
-    sha256 = "0xdrsxgqw5v7szshjdgdv60rgpvzzaqic32ahqrzr6bvc402gfhc";
+    sha256 = "0j27jxhjay78by940d64778nxwbysxynv5mq6iq1nmlrh810zdq3";
   };
 
   outputs = [ "out" "dev" "info" ];

From 5eb7512317f4b1a54803442824049e6d55d7d161 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 00:37:36 +0000
Subject: [PATCH 1976/3942] libqmi: 1.26.2 -> 1.26.6

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

diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index e8db7501534c..de38e5d3b6e7 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libqmi";
-  version = "1.26.2";
+  version = "1.26.6";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
-    sha256 = "00vvvfq74awg6mk0si1cdv79f6z6wqx11h47nl78a1h7zsr6fd0k";
+    sha256 = "1fbwz6534q6n4bgabdx4svbgkf4mdyisjh3y51jjd94p22xn66d7";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From df8b363d9817b837b86d6aaeb9ef5aee90e57e14 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 07:18:49 +0000
Subject: [PATCH 1977/3942] libshout: 2.4.3 -> 2.4.4

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

diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix
index 23ab4d0b3385..075855fada46 100644
--- a/pkgs/development/libraries/libshout/default.nix
+++ b/pkgs/development/libraries/libshout/default.nix
@@ -4,11 +4,11 @@
 # need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc
 
 stdenv.mkDerivation rec {
-  name = "libshout-2.4.3";
+  name = "libshout-2.4.4";
 
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz";
-    sha256 = "1zhdshas539cs8fsz8022ljxnnncr5lafhfd1dqr1gs125fzb2hd";
+    sha256 = "1hz670a4pfpsb89b0mymy8nw4rx8x0vmh61gq6j1vbg70mfhrscc";
   };
 
   outputs = [ "out" "dev" "doc" ];

From ab83eeff8a81aa40c5ffe73a86d844ec61ef074e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 04:48:52 +0000
Subject: [PATCH 1978/3942] lilv: 0.24.8 -> 0.24.10

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

diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 124828b0ff5f..e8008058626a 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lilv";
-  version = "0.24.8";
+  version = "0.24.10";
 
   src = fetchurl {
     url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
-    sha256 = "0063i5zgf3d3accwmyx651hw0wh5ik7kji2hvfkcdbl1qia3dp6a";
+    sha256 = "1565zy0yz46cf2f25pi46msdnzkj6bbhml9gfigdpjnsdlyskfyi";
   };
 
   patches = [ ./lilv-pkgconfig.patch ];

From 9493ca9ee40e5eea00f85f0ab8cd69f70c6f0b9b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 00:19:13 +0000
Subject: [PATCH 1979/3942] libipt: 2.0.2 -> 2.0.3

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

diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix
index 79ae927fc24b..e585a2b090fc 100644
--- a/pkgs/development/libraries/libipt/default.nix
+++ b/pkgs/development/libraries/libipt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libipt";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "libipt";
     rev = "v${version}";
-    sha256 = "095agnk7r2sq5yas6c1ri8fmsl55n4l5hkl6j5l397p9nxvxvrkc";
+    sha256 = "1i6jmv345rqd88qmap6iqbaph4pkd6wbjgkixf22a80pj7cfm1s4";
   };
 
   nativeBuildInputs = [ cmake ];

From 4349012e6177f490e7e2a7de9b7496f6452dbdfa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 23:15:35 +0000
Subject: [PATCH 1980/3942] libmtp: 1.1.17 -> 1.1.18

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

diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index 21bde84181b4..dc5410d65fd8 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb1, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "libmtp-1.1.17";
+  name = "libmtp-1.1.18";
 
   src = fetchurl {
     url = "mirror://sourceforge/libmtp/${name}.tar.gz";
-    sha256 = "1p3r38nvdip40ab1h4scj3mzfjkx6kd14szjqyw9r6wz5pslr8zq";
+    sha256 = "1w41l93yi0dmw218daiw36rylkc8rammxx37csh1ij24q18gx03j";
   };
 
   outputs = [ "bin" "dev" "out" ];

From 96a43738400b0603683944b1141ed283f2c0cb8c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 23:05:29 +0000
Subject: [PATCH 1981/3942] libbluray: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 7bfd9a8a2d02..a00e2272d668 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -19,11 +19,11 @@ assert withFonts -> freetype != null;
 
 stdenv.mkDerivation rec {
   pname = "libbluray";
-  version  = "1.2.0";
+  version  = "1.2.1";
 
   src = fetchurl {
     url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "04bcd53ml0zn8b4f9r1grs0yy20rcirji1v3pxzaf4i5zl3flhfd";
+    sha256 = "1v1nmq631j0prih7pjl01ixhhwgrkjpxrjmmc342rsl8g4zyh8sj";
   };
 
   patches = optional withJava ./BDJ-JARFILE-path.patch;

From 289ff52b8e788ff79c69404d3c4b5953b734f6ef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 19:59:51 +0000
Subject: [PATCH 1982/3942] libmbim: 1.24.2 -> 1.24.4

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

diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
index 0e9a3784f383..fdf724c09fda 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmbim";
-  version = "1.24.2";
+  version = "1.24.4";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz";
-    sha256 = "1r41d4yddp8rgccxrkz9vg5lbrj3dr5vy71d8igrr147k44qq69j";
+    sha256 = "11djb1d8w9ms07aklfm3pskjw9rnff4p4n3snanschv22zk8wj6x";
   };
 
   outputs = [ "out" "dev" "man" ];

From e9d669451a9a8389ff93a5569fd54e74ab35934d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 17:28:43 +0000
Subject: [PATCH 1983/3942] libnftnl: 1.1.7 -> 1.1.8

---
 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 f9def04f99b7..3da2ccce4422 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.1.7";
+  version = "1.1.8";
   pname = "libnftnl";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
-    sha256 = "13zd90bfrr0q3j0l0cbc8kiizccw6n8gp727kqnfljh024zw3nr0";
+    sha256 = "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 3ffd4b446fbdec4f5f96d8dbf85b8db3b12fe64a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 08:50:11 +0000
Subject: [PATCH 1984/3942] iptables: 1.8.5 -> 1.8.6

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

diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index c9c342ad7682..97c93db50b8a 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -6,12 +6,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.8.5";
+  version = "1.8.6";
   pname = "iptables";
 
   src = fetchurl {
     url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
-    sha256 = "02a3575ypdpg6a2x752mhk3f7h1381ymkq1n0gss6fp6292xfmyl";
+    sha256 = "0rvp0k8a72h2snrdx48cfn75bfa0ycrd2xl3kjysbymq7q6gxx50";
   };
 
   nativeBuildInputs = [ pkgconfig pruneLibtoolFiles flex bison ];

From 3c25cf4d137d82bee1c19b652a4801e9bc809ce6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 10 Nov 2020 08:58:37 -0500
Subject: [PATCH 1985/3942] linux: 4.14.204 -> 4.14.205

---
 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 dedd3485c25d..98968c8385c5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.204";
+  version = "4.14.205";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "1ncacsy2g80zigfx8nmr1f7v50s1y9ys1xy9jgizrnvmxjcji0wy";
+    sha256 = "0m6ajw3iypxwvym8hmymd0dlcm9gdczpa6y6id4b447r774aqmcc";
   };
 } // (args.argsOverride or {}))

From 8f6733ca48f3067a874d22cb1c78c5377698e8bd Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 10 Nov 2020 08:58:47 -0500
Subject: [PATCH 1986/3942] linux: 4.19.155 -> 4.19.156

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index dcde8fceba26..7657656fbc0e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.155";
+  version = "4.19.156";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "1lj81aadyskmxs3j4s923nhnk69dfj2kiwm0nxabbcjw83sliinb";
+    sha256 = "0b9g2v8dvlhq0kbns2z62v93pnaprk7xbjzzx8rk0b522x42nq08";
   };
 } // (args.argsOverride or {}))

From 48d83292f8e431f304d32a91d87c593d181fb91c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 10 Nov 2020 08:58:53 -0500
Subject: [PATCH 1987/3942] linux: 4.4.241 -> 4.4.242

---
 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 64d011461805..0fb971e00a97 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, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.241";
+  version = "4.4.242";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "054jd6jgymxbkjfmk8wbckihl355gjimjg2xi5yr4v2343qi9zij";
+    sha256 = "089gigqali5q8izac82ybigxyi1bnw0xhm1cc590h4v7lkmk0mm1";
   };
 } // (args.argsOverride or {}))

From e696d5466caa7beb8d912ff593d0727c040b3b8c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 10 Nov 2020 08:59:02 -0500
Subject: [PATCH 1988/3942] linux: 4.9.241 -> 4.9.242

---
 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 2d81826d6c36..bda5a463599b 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, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.241";
+  version = "4.9.242";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0b5k9cwz7vpaybw4nd03pn2z4d8qbhmhd9mx4j2yd0fqj57x1in4";
+    sha256 = "1r1myvxkhnsz419i5y6zjdkz177q3d19jk7748vv1v505gi3k1g4";
   };
 } // (args.argsOverride or {}))

From 8aa3123f33109bae1c54ebb6445d59550616c37e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 10 Nov 2020 08:59:09 -0500
Subject: [PATCH 1989/3942] linux: 5.4.75 -> 5.4.76

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 9db1ada350bd..55ec4d341f73 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.75";
+  version = "5.4.76";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0w0lpiy56zqdm2vpx9ckxakna334n88pnqbv52zyfcslxgb6yinj";
+    sha256 = "1lpppqjsrcmpr6vawxycsy7lpwdh3pb3d3f841sxzqgm3b9mymkg";
   };
 } // (args.argsOverride or {}))

From 589bf72e97f4735505d28ca0816bb5ae07300a15 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 10 Nov 2020 08:59:17 -0500
Subject: [PATCH 1990/3942] linux: 5.9.6 -> 5.9.7

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix
index 59f18baa8c83..010bdc788c27 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.9.6";
+  version = "5.9.7";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0w2kcng09nzk09dwkx4azdfgnwzbd2mz8lyl4j69bwx837z85hbc";
+    sha256 = "1dv933lnkcfrpjbq1hdc3b5r210f6vn5y04jp87pij4mmkn47a6y";
   };
 } // (args.argsOverride or {}))

From 2e00fff0474a55b59dc9599f3b3291f98426d71c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 10 Nov 2020 09:21:34 -0500
Subject: [PATCH 1991/3942] oh-my-zsh: Fix update script

Pull commit date rather than author date to avoid going back in time
on commits that have been sitting for a while.
---
 pkgs/shells/zsh/oh-my-zsh/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 7c402b4733f5..37d75f78e0eb 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
       if [ ! "null" = "$latestSha" ]; then
         nixpkgs="$(git rev-parse --show-toplevel)"
         default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix"
-        latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/$latestSha | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')"
+        latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')"
         update-source-version oh-my-zsh "$latestSha" --version-key=rev
         update-source-version oh-my-zsh "$latestDate" --ignore-same-hash
         nixfmt "$default_nix"

From e43b443121b43ab7abf13ba2a99607cfd8cf7656 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 10 Nov 2020 14:22:32 +0000
Subject: [PATCH 1992/3942] =?UTF-8?q?oh-my-zsh:=202020-11-04=20=E2=86=92?=
 =?UTF-8?q?=202020-11-09?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 37d75f78e0eb..462a9107ba95 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
 
 stdenv.mkDerivation rec {
-  version = "2020-11-04";
+  version = "2020-11-09";
   pname = "oh-my-zsh";
-  rev = "3e6ee85a161c8089955c19364728e167025a911d";
+  rev = "eef04c62c2dfbd81f9fee6752e3b7e0b9c3bf617";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "/8ySf5ulSx2HtPG/tzPzOI1ljksxF+hGwjXFhGIseBk=";
+    sha256 = "15gisyawg9g8xan5dawzj3jmqnwdiki95dxjgwyswfks2vcfakl6";
   };
 
   installPhase = ''

From 4e2a217211337b0e9bc7cf6dd2c5484996c2792c Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Wed, 11 Nov 2020 00:13:52 +0900
Subject: [PATCH 1993/3942] gitui: fix darwin build (#103194)

Fixes:

  = note: ld: warning: passed two min versions (10.12.0, 10.12) for platform macOS. Using 10.12.
          ld: framework not found AppKit
          clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
---
 .../applications/version-management/git-and-tools/default.nix | 2 +-
 .../version-management/git-and-tools/gitui/default.nix        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 114e8fe012cc..f68a3c7728d6 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -198,7 +198,7 @@ let
   gitstatus = callPackage ./gitstatus { };
 
   gitui = callPackage ./gitui {
-    inherit (darwin.apple_sdk.frameworks) Security;
+    inherit (darwin.apple_sdk.frameworks) Security AppKit;
   };
 
   grv = callPackage ./grv { };
diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix
index 6aad5b78fb69..ef77a8e7fe5e 100644
--- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security }:
+{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security, AppKit }:
 rustPlatform.buildRustPackage rec {
   pname = "gitui";
   version = "0.10.1";
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ python3 ];
   buildInputs = [ ]
     ++ stdenv.lib.optional stdenv.isLinux xorg.libxcb
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security AppKit ];
 
   meta = with stdenv.lib; {
     description = "Blazing fast terminal-ui for git written in rust";

From 9359148620b1601f3e054e5d980485c1903d410b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 14:43:47 +0000
Subject: [PATCH 1994/3942] python37Packages.awkward: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index 65dfd4628571..6a919c768c70 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1a461ee084ea5e98333dacf2506e9b2619ee89cece14b9b99830b546b35c5922";
+    sha256 = "6a3878f46e8bc2acf28a0b9feb69d354ad2fee2a2a0f65c48c115aa74f245204";
   };
 
   nativeBuildInputs = [ pytestrunner ];

From 51c2129eb8e145dca78a14088941cbc254e27e30 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 9 Nov 2020 14:40:52 +0100
Subject: [PATCH 1995/3942] monero: 0.17.1.1 -> 0.17.1.3

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

diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix
index 29acbd0f37b3..1010da81da34 100644
--- a/pkgs/applications/blockchains/monero/default.nix
+++ b/pkgs/applications/blockchains/monero/default.nix
@@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
 
 stdenv.mkDerivation rec {
   pname = "monero";
-  version = "0.17.1.1";
+  version = "0.17.1.3";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    sha256 = "18x27dm24k04vx0yz57zi02rk0wrmbn4wr8alqf48dq6z9wr0fhp";
+    sha256 = "1ddkdfd8i5q509qziwcx1f6nm8axs4a1ppzv2y5lgsqpq375if6j";
     fetchSubmodules = true;
   };
 

From 52ee36a710695c299598ac9901b018a2d6bce147 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 9 Nov 2020 14:41:12 +0100
Subject: [PATCH 1996/3942] monero-gui: 0.17.1.1 -> 0.17.1.4

---
 .../blockchains/monero-gui/default.nix             | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index 8cd03f34286f..6275a26118f6 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -1,5 +1,6 @@
 { stdenv, wrapQtAppsHook, makeDesktopItem
 , fetchFromGitHub
+, fetchpatch
 , cmake, qttools, pkgconfig
 , qtbase, qtdeclarative, qtgraphicaleffects
 , qtmultimedia, qtxmlpatterns
@@ -27,13 +28,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "monero-gui";
-  version = "0.17.1.1";
+  version = "0.17.1.4";
 
   src = fetchFromGitHub {
     owner  = "monero-project";
     repo   = "monero-gui";
     rev    = "v${version}";
-    sha256 = "0aqhp4rmqsgwjb875kgh6qwz0wyyiag1fksyic9cnhgg5j5y95nx";
+    sha256 = "1ixjfdlvwr2an2s9jaql240bk7jpq5hhm5c4hww0bicyy3fp12ng";
   };
 
   nativeBuildInputs = [
@@ -58,7 +59,14 @@ stdenv.mkDerivation rec {
     chmod -R +w source/monero
   '';
 
-  patches = [ ./move-log-file.patch ];
+  patches = [
+    ./move-log-file.patch
+    # fix build failure due to invalid use of CMAKE_PREFIX_PATH
+    (fetchpatch {
+      url = "https://github.com/monero-project/monero-gui/commit/ef2be82c21b0934522ad8e110805b66f5948da1f.patch";
+      sha256 = "1rhazk2xwa5dv1cmkrkq8yr08qxslg4k929cvlliabrx20kbr5z5";
+    })
+  ];
 
   postPatch = ''
     # set monero-gui version

From ed697cde581ba63e6e9e2f5603b2564a576aff65 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 15:39:14 +0000
Subject: [PATCH 1997/3942] python37Packages.uproot-methods: 0.7.4 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix
index 298f6c96d58d..1e382629e899 100644
--- a/pkgs/development/python-modules/uproot-methods/default.nix
+++ b/pkgs/development/python-modules/uproot-methods/default.nix
@@ -6,12 +6,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.7.4";
+  version = "0.8.0";
   pname = "uproot-methods";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7f110208a3a2aa9b4d6da11233fd0f206ea039b52bca4bfe312f1b9dcf788476";
+    sha256 = "57da3d67e1a42b548020debdd23285b5710e3bb2aac20eb7b2d2a686822aa1ab";
   };
 
   propagatedBuildInputs = [ numpy awkward ];

From f116aa46665ebb2de6353f64341bb29903c49dfb Mon Sep 17 00:00:00 2001
From: pulsation <philippe.sam-long@laposte.net>
Date: Thu, 30 Jul 2020 21:03:36 +0200
Subject: [PATCH 1998/3942] maintainers: add pulsation

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c3970f3e02fb..ac6f55176747 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9970,4 +9970,10 @@
     githubId = 19290397;
     name = "Tunc Uzlu";
   };
+  pulsation = {
+    name = "Philippe Sam-Long";
+    email = "1838397+pulsation@users.noreply.github.com";
+    github = "pulsation";
+    githubId = 1838397;
+  };
 }

From d6a464275dcf298c31da04b16cd48bc08e3aea6f Mon Sep 17 00:00:00 2001
From: Ivan Petkov <ivanppetkov@gmail.com>
Date: Tue, 10 Nov 2020 10:19:15 -0800
Subject: [PATCH 1999/3942] topgrade: 5.8.1 -> 5.9.1

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

diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index 9da96dd352f5..01c52ba6cc53 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "topgrade";
-  version = "5.8.1";
+  version = "5.9.1";
 
   src = fetchFromGitHub {
     owner = "r-darwish";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0m3kqk0ghlpzysyql777jlk5c0nb36z44vabw6r0484fh5vncwrh";
+    sha256 = "17vrnwx8qv2s2m9sj7h4gxxrnppqs9yzjzp8jsyfnpqd66h60wcg";
   };
 
-  cargoSha256 = "1h5cyiyhpagdin9a8gfsccbl4jahw33nbkg5m74axyp4qrfc1mkz";
+  cargoSha256 = "1k5lslin5qpmgz1zkz6xazjnapbr0i5r2ifzcz7bdbxwkaaliksd";
 
   buildInputs = lib.optional stdenv.isDarwin Foundation;
 

From ea4f00d189e72b399e11d9783363f0ec3f0b1109 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Nov 2020 18:04:27 +0000
Subject: [PATCH 2000/3942] =?UTF-8?q?gnome3.gdm:=203.38.1=20=E2=86=92=203.?=
 =?UTF-8?q?38.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gdm/-/compare/3.38.1...3.38.2

Fixes CVE-2020-16125
---
 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 98257c80f0f0..026e0d2fae61 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -47,13 +47,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gdm";
-  version = "3.38.1";
+  version = "3.38.2";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0wkzy5mrxq963fm4pmn6bhml73zmc8bq61frm77a175046c590q8";
+    sha256 = "1k2k3rv10y9dppp6ffz6gqi2p6s3g03bxjyy8njvcjyxqdk6d8i5";
   };
 
   mesonFlags = [

From b972ca801db35ff30839aa28255fcd3685433028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 10 Nov 2020 20:26:18 +0100
Subject: [PATCH 2001/3942] libe57format: Fix dependents not finding its cmake
 config

---
 .../libraries/libe57format/default.nix        | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/development/libraries/libe57format/default.nix
index 6bb48c9530c8..137c73990f6a 100644
--- a/pkgs/development/libraries/libe57format/default.nix
+++ b/pkgs/development/libraries/libe57format/default.nix
@@ -5,6 +5,9 @@
   boost,
   xercesc,
   icu,
+
+  dos2unix,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -25,9 +28,39 @@ stdenv.mkDerivation rec {
   buildInputs = [
     boost
     icu
+  ];
+
+  propagatedBuildInputs = [
+    # Necessary for projects that try to find libE57Format via CMake
+    # due to the way that libe57format's CMake config is written.
     xercesc
   ];
 
+  # TODO: Remove CMake patching when https://github.com/asmaloney/libE57Format/pull/60 is available.
+
+  # GNU patch cannot patch `CMakeLists.txt` that has CRLF endings,
+  # see https://unix.stackexchange.com/questions/239364/how-to-fix-hunk-1-failed-at-1-different-line-endings-message/243748#243748
+  # so convert it first.
+  prePatch = ''
+    ${dos2unix}/bin/dos2unix CMakeLists.txt
+  '';
+  patches = [
+    (fetchpatch {
+      name = "libE57Format-cmake-Fix-config-filename.patch";
+      url = "https://github.com/asmaloney/libE57Format/commit/279d8d6b60ee65fb276cdbeed74ac58770a286f9.patch";
+      sha256 = "0fbf92hs1c7yl169i7zlbaj9yhrd1yg3pjf0wsqjlh8mr5m6rp14";
+    })
+  ];
+  # It appears that while the patch has
+  #     diff --git a/cmake/E57Format-config.cmake b/cmake/e57format-config.cmake
+  #     similarity index 100%
+  #     rename from cmake/E57Format-config.cmake
+  #     rename to cmake/e57format-config.cmake
+  # GNU patch doesn't interpret that.
+  postPatch = ''
+    mv cmake/E57Format-config.cmake cmake/e57format-config.cmake
+  '';
+
   # The build system by default builds ONLY static libraries, and with
   # `-DE57_BUILD_SHARED=ON` builds ONLY shared libraries, see:
   #     https://github.com/asmaloney/libE57Format/issues/48

From e50eb89d529e1c6da1075b904ba9507bc0878351 Mon Sep 17 00:00:00 2001
From: 1000101 <b1000101@pm.me>
Date: Tue, 10 Nov 2020 20:48:57 +0100
Subject: [PATCH 2002/3942] terraform-providers: vultr 1.4.1 -> 1.5.0 (#103305)

---
 .../networking/cluster/terraform-providers/default.nix | 10 ----------
 .../cluster/terraform-providers/providers.json         |  6 +++---
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index ebe787a25192..6ce7ad6092af 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -149,16 +149,6 @@ let
       '';
     });
 
-    # provider was moved to the `vultr` organization, but kept the old references:
-    # https://github.com/vultr/terraform-provider-vultr/pull/67
-    # this override should be removed as soon as new version (>1.4.1) is released.
-    vultr = automated-providers.vultr.overrideAttrs (attrs: {
-      prePatch = attrs.prePatch or "" + ''
-        substituteInPlace go.mod --replace terraform-providers/terraform-provider-vultr vultr/terraform-provider-vultr
-        substituteInPlace main.go --replace terraform-providers/terraform-provider-vultr vultr/terraform-provider-vultr
-      '';
-    });
-
     # Packages that don't fit the default model
     ansible = callPackage ./ansible {};
     cloudfoundry = callPackage ./cloudfoundry {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 83843a82a669..3136529baed4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1017,9 +1017,9 @@
   "vultr": {
     "owner": "vultr",
     "repo": "terraform-provider-vultr",
-    "rev": "v1.4.1",
-    "sha256": "1jx9p4bwpa5zxig6gfk4akfsnbivvyhwcw8id2ch2ga9a67pwald",
-    "version": "1.4.1"
+    "rev": "v1.5.0",
+    "sha256": "04qy366ignn53bbdj9s3032qr1x7h84q36qzl5ywydlw2va0qbsd",
+    "version": "1.5.0"
   },
   "wavefront": {
     "owner": "terraform-providers",

From 0f83b301aa78ced03010d11d84baf6a8805c495d Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 24 Oct 2020 19:54:30 -0400
Subject: [PATCH 2003/3942] hsphfpd: init at 2020-10-25

---
 pkgs/servers/pulseaudio/hsphfpd.nix | 46 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/servers/pulseaudio/hsphfpd.nix

diff --git a/pkgs/servers/pulseaudio/hsphfpd.nix b/pkgs/servers/pulseaudio/hsphfpd.nix
new file mode 100644
index 000000000000..8c1bea86aca1
--- /dev/null
+++ b/pkgs/servers/pulseaudio/hsphfpd.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
+
+let
+  perlLibs = with perlPackages; [ NetDBus XMLTwig XMLParser ];
+in
+stdenv.mkDerivation {
+  pname = "hsphfpd";
+  version = "2020-10-25";
+
+  src = fetchFromGitHub {
+    owner = "pali";
+    repo = "hsphfpd-prototype";
+    rev = "601bf8f7bf2da97257aa6f786ec4cbb69b0ecbc8";
+    sha256 = "06hh0xmp143334x8dg5nmp5727g38q2m5kqsvlrfia6vw2hcq0v0";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ perlPackages.perl ];
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/dbus-1/system.d
+    cp org.hsphfpd.conf $out/share/dbus-1/system.d
+
+    mkdir -p $out/bin
+    cp *.pl $out/bin
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    for f in $out/bin/*.pl; do
+      wrapProgram "$f" --set PERL5LIB "${perlPackages.makePerlPath perlLibs}"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Bluetooth HSP/HFP daemon";
+    homepage = "https://github.com/pali/hsphfpd-prototype";
+    license = licenses.artistic1;
+    maintainers = with maintainers; [ gebner ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 679f69ea3e01..db9992d4b753 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16995,6 +16995,8 @@ in
 
   # PulseAudio daemons
 
+  hsphfpd = callPackage ../servers/pulseaudio/hsphfpd.nix { };
+
   pulseaudio-hsphfpd = callPackage ../servers/pulseaudio/pali.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
   };

From 4d0ad2783d17c78910096784e5a8913a8888e503 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 24 Oct 2020 21:12:05 -0400
Subject: [PATCH 2004/3942] nixos/*: hsphfpd support

---
 nixos/modules/services/hardware/bluetooth.nix | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index 230492c6b091..6f5a6d3bf288 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -15,6 +15,8 @@ in {
     hardware.bluetooth = {
       enable = mkEnableOption "support for Bluetooth";
 
+      hsphfpd.enable = mkEnableOption "support for hsphfpd[-prototype] implementation";
+
       powerOnBoot = mkOption {
         type    = types.bool;
         default = true;
@@ -72,7 +74,8 @@ in {
       };
     };
 
-    environment.systemPackages = [ bluez-bluetooth ];
+    environment.systemPackages = [ bluez-bluetooth ]
+      ++ optionals cfg.hsphfpd.enable [ pkgs.hsphfpd ];
 
     environment.etc."bluetooth/main.conf"= {
       source = pkgs.writeText "main.conf"
@@ -80,7 +83,8 @@ in {
     };
 
     services.udev.packages = [ bluez-bluetooth ];
-    services.dbus.packages = [ bluez-bluetooth ];
+    services.dbus.packages = [ bluez-bluetooth ]
+      ++ optionals cfg.hsphfpd.enable [ pkgs.hsphfpd ];
     systemd.packages       = [ bluez-bluetooth ];
 
     systemd.services = {
@@ -90,11 +94,31 @@ in {
         # restarting can leave people without a mouse/keyboard
         unitConfig.X-RestartIfChanged = false;
       };
-    };
+    }
+      // (optionalAttrs cfg.hsphfpd.enable {
+        hsphfpd = {
+          after = [ "bluetooth.service" ];
+          requires = [ "bluetooth.service" ];
+          wantedBy = [ "multi-user.target" ];
+
+          description = "A prototype implementation used for connecting HSP/HFP Bluetooth devices";
+          serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/hsphfpd.pl";
+        };
+      })
+      ;
 
     systemd.user.services = {
       obex.aliases = [ "dbus-org.bluez.obex.service" ];
-    };
+    }
+      // (optionalAttrs cfg.hsphfpd.enable {
+        telephony_client = {
+          wantedBy = [ "default.target"];
+
+          description = "telephony_client for hsphfpd";
+          serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/telephony_client.pl";
+        };
+      })
+      ;
 
   };
 

From 7387dc54effc15b770256a90b883861aac857d80 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 9 Nov 2020 19:10:12 +0100
Subject: [PATCH 2005/3942] pulseaudio-modules-bt: support git versions of
 pulseaudio

---
 pkgs/applications/audio/pulseaudio-modules-bt/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index 7a1768d858c0..42e780af0989 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -18,8 +18,12 @@
 let
   pulseSources = runCommand "pulseaudio-sources" {} ''
     mkdir $out
-    tar -xf ${pulseaudio.src}
-    mv pulseaudio*/* $out/
+    if [ -d ${pulseaudio.src} ]; then
+      ln -s ${pulseaudio.src}/* $out/
+    else
+      tar -xf ${pulseaudio.src}
+      mv pulseaudio*/* $out/
+    fi
   '';
 
 in stdenv.mkDerivation rec {

From 4c0972e8d799bf6f17bad03af6001c43b986e10c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 10 Nov 2020 21:02:25 +0100
Subject: [PATCH 2006/3942] sway: 1.5 -> 1.5.1

This is basically a no-op, apart from the version bump.
---
 pkgs/applications/window-managers/sway/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 0af46db0a1c2..23dcf68bddf3 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sway-unwrapped";
-  version = "1.5";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "sway";
     rev = version;
-    sha256 = "0r3b7h778l9i20z3him9i2qsaynpn9y78hzfgv3cqi8fyry2c4f9";
+    sha256 = "1xsa3h8zhf29p0mi90baxpr76jkd9pd1gr97ky8cnjbcs4isj9j0";
   };
 
   patches = [
@@ -21,12 +21,6 @@ stdenv.mkDerivation rec {
     ./load-configuration-from-etc.patch
   ];
 
-  postPatch = ''
-    substituteInPlace meson.build \
-      --replace "v1.5" "1.5" \
-      --replace "wlroots_version = ['>=0.11.0', '<0.12.0']" "wlroots_version = ['>=0.11.0', '<0.13.0']"
-  '';
-
   nativeBuildInputs = [
     meson ninja pkg-config wayland scdoc
   ];

From 8a9d29cdeabdc5c7867ac2f63813d8385d06369d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 20:43:51 +0000
Subject: [PATCH 2007/3942] act: 0.2.16 -> 0.2.17

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

diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix
index 9456335d72ad..bd4017ed4405 100644
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/pkgs/development/tools/misc/act/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "act";
-  version = "0.2.16";
+  version = "0.2.17";
 
   src = fetchFromGitHub {
     owner = "nektos";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0zhn6av1adphkk9g13m5na63r8fqcjw8wibcja9v9mbw886zcc3p";
+    sha256 = "0s7bgm2q7z9xpaj6kfvg63v12k35ckaxwmh6bbjh15xibaw58183";
   };
 
   vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h";

From 84874697af71106cd0d2167552930b0c8316194c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 21:11:39 +0000
Subject: [PATCH 2008/3942] amber: 0.5.4 -> 0.5.5

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

diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix
index 22a18b1cffb2..c6ba6f98da1d 100644
--- a/pkgs/tools/text/amber/default.nix
+++ b/pkgs/tools/text/amber/default.nix
@@ -4,16 +4,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "amber";
-  version = "0.5.4";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0pqz3spb5lmrj7w8hynmah9nrcfjsb1s0bmrr0cng9a9jx8amwzn";
+    sha256 = "083gpssnhjxp1gr5rn27k9j4pm42wqz76llrn5yh91rwcwvlg1l8";
   };
 
-  cargoSha256 = "1ps70swh96xbfn4hng5krlmwvw2bwrl2liqvx9v9vy6pr86643s6";
+  cargoSha256 = "199wfc98vq6vgrz8xqqh8lz4j3ig7w66mrk1am9x0viyhj92fvx0";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 62df30641d7b946b6dfed6b27323a0ce10ffc0cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 21:18:15 +0000
Subject: [PATCH 2009/3942] amfora: 1.5.0 -> 1.6.0

---
 pkgs/applications/networking/browsers/amfora/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix
index eaea5f12b872..925cc1a4f912 100644
--- a/pkgs/applications/networking/browsers/amfora/default.nix
+++ b/pkgs/applications/networking/browsers/amfora/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "amfora";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "makeworld-the-better-one";
     repo = "amfora";
     rev = "v${version}";
-    sha256 = "011h5xzwiafh3fdp9wil8n618p45ph9swa66lw6s82ijpiizz79s";
+    sha256 = "1f5r12hmdgj26p4ss5pcpfcvqlcn19fr9xvvvk2izckcr48p4fy7";
   };
 
-  vendorSha256 = "10f3bh3r3jc1185r8r1ihg8rprdpl8qwg5b6wqwsda96ydkbpi2b";
+  vendorSha256 = "0mkk7xxfxxp1w9890mkmag11mzxhy2zmh8v1macpyp1zmzgs21f8";
 
   postInstall = ''
     sed -i "s:amfora:$out/bin/amfora:" amfora.desktop

From a28ba681b6cb622c69121e2d750a2a1150cec34d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 21:27:53 +0000
Subject: [PATCH 2010/3942] argo: 2.11.6 -> 2.11.7

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

diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index 49b45308ce3e..6f2344bd3e75 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -19,13 +19,13 @@ let
 in
 buildGoModule rec {
   pname = "argo";
-  version = "2.11.6";
+  version = "2.11.7";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo";
     rev = "v${version}";
-    sha256 = "1vlz1f4hyzgz1x9xgzlmpnbjba8xyhpx9ybia0pwilfg7mwfq92r";
+    sha256 = "1i7qgghnb39bibnk07f47k64qpkb1k8mi3bbfnx6mxl0jlq335af";
   };
 
   vendorSha256 = "1ca0ssvbi4vrsn9ljc783hnh9bmf5p8nr1lz5wm8g3gbrrrf1ray";

From 209bec5aca4c387231732899bd1b6849931925bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 21:39:39 +0000
Subject: [PATCH 2011/3942] aws-okta: 1.0.6 -> 1.0.8

---
 pkgs/tools/security/aws-okta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix
index d4abe12d664c..340c2cd971c6 100644
--- a/pkgs/tools/security/aws-okta/default.nix
+++ b/pkgs/tools/security/aws-okta/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "aws-okta";
-  version = "1.0.6";
+  version = "1.0.8";
 
   goPackagePath = "github.com/segmentio/aws-okta";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "segmentio";
     repo = "aws-okta";
     rev = "v${version}";
-    sha256 = "1nhcqj3vhdgk0a0smmyqphjw2slcvqbb8xd8bx506j8h8x84p6yf";
+    sha256 = "14bg9rdfxkpw00phc8faz4ghiyb0j7a9qai74lidrzplzl139bzf";
   };
 
   buildFlags = [ "--tags" "release" ];

From 999abcfc07286f9d2f88fbe31954df5cfd98db87 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 10 Nov 2020 23:13:39 +0100
Subject: [PATCH 2012/3942] codebraid: 0.5.0-unstable-2020-07-01 ->
 0.5.0-unstable-2020-08-14

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

diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/tools/misc/codebraid/default.nix
index eea5260a989c..79ed7dd01fca 100644
--- a/pkgs/tools/misc/codebraid/default.nix
+++ b/pkgs/tools/misc/codebraid/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "codebraid";
-  version = "0.5.0-unstable-2020-07-01";
+  version = "0.5.0-unstable-2020-08-14";
 
   src = fetchFromGitHub {
     owner = "gpoore";
     repo = pname;
-    rev = "c7962587e7f1e619b5dcf9a5e901eb7042520b00";
-    sha256 = "1f31yaiwc33ivjbipym7sggsqwqxn70kgf9dixi8392pk70jzq6p";
+    rev = "526a223c4fc32c37d6c5c9133524dfa0e1811ca4";
+    sha256 = "0qkqaj49k584qzgx9jlsf5vlv4lq7x403s1kig8v87i0kgh55p56";
   };
 
   propagatedBuildInputs = with python3Packages; [ bespon ];

From 376405314fd15eee5c9235549096cee3518ff364 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 22:20:26 +0000
Subject: [PATCH 2013/3942] bear: 3.0.1 -> 3.0.2

---
 pkgs/development/tools/build-managers/bear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index cd5e508fbdd6..712778665d2a 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bear";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "rizsotto";
     repo = pname;
     rev = version;
-    sha256 = "02vzlm48ywf6s3fly19j94k11dqx94x8pgmkq1ylx3z3d1y3b5zb";
+    sha256 = "0x1an9sxcr0f45c9kdpgpcrc773cc28zsffbxddpqp0h1qh9s4ns";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 84010634378725ab44b8a3768cee2c0f7d907a9a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 21:50:47 +0000
Subject: [PATCH 2014/3942] azure-cli: 2.14.0 -> 2.14.2

---
 pkgs/tools/admin/azure-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index 5f636dcf747a..820fef1a74aa 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, python, fetchFromGitHub, installShellFiles }:
 
 let
-  version = "2.14.0";
+  version = "2.14.2";
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-cli";
     rev = "azure-cli-${version}";
-    sha256 = "0rihxkdckfkqzrr3jc8jpdpjg3pgz5jymyz19lpva8qqln7cmzpy";
+    sha256 = "1d5qd39b0i5icg193ybr9gzl0axqw5ml5zjwqin1zxqj5y3r6sc2";
   };
 
   # put packages that needs to be overriden in the py package scope

From b2e857a5fe704a41664660cd9992bbd5e8fb182c Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 30 Aug 2020 10:40:52 -0700
Subject: [PATCH 2015/3942] spicetify-cli: init at 1.1.0

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

diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix
new file mode 100644
index 000000000000..a042cc53c055
--- /dev/null
+++ b/pkgs/applications/misc/spicetify-cli/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "spicetify-cli";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "khanhas";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "08rnwj7ggh114n3mhhm8hb8fm1njgb4j6vba3hynp8x1c2ngidff";
+  };
+
+  vendorSha256 = "0k06c3jw5z8rw8nk4qf794kyfipylmz6x6l126a2snvwi0lmc601";
+
+  # used at runtime, but not installed by default
+  postInstall = ''
+    cp -r ${src}/jsHelper $out/bin/jsHelper
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    $out/bin/spicetify-cli --help > /dev/null
+  '';
+
+  meta = with lib; {
+    description = "Command-line tool to customize Spotify client";
+    homepage = "https://github.com/khanhas/spicetify-cli/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a2380317a13..65e7818736d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15796,6 +15796,8 @@ in
 
   spice-up = callPackage ../applications/office/spice-up { };
 
+  spicetify-cli = callPackage ../applications/misc/spicetify-cli { };
+
   spirv-cross = callPackage ../tools/graphics/spirv-cross { };
 
   sratom = callPackage ../development/libraries/audio/sratom { };

From 0e9cccac8183b052f7be8c0c8950beb11b6df420 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Tue, 10 Nov 2020 22:32:37 +0100
Subject: [PATCH 2016/3942] gimpPlugins: replace references to
 registry.gimp.org

https://registry.gimp.org/ currently directs to a post [0] pronouncing
it dead. A readonly mirror is available at [1].

Also bumped:
- lqrPlugin: 0.6.1 -> 0.7.1
- removed rainbowPlasma, lightningGate as they were commented anyway.

[0] https://www.gimp.org/registry/
[1] https://github.com/pixlsus/registry.gimp.org_static
---
 .../graphics/gimp/plugins/default.nix         | 37 ++++---------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 97c0429a996e..b78350ae4d30 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -127,21 +127,22 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
     name = "wavelet-sharpen-0.1.2";
     NIX_LDFLAGS = "-lm";
     src = fetchurl {
-      url = "http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz";
+      url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz";
       sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
     };
     installPhase = "installPlugins src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix?
   };
 
-  lqrPlugin = pluginDerivation {
+  lqrPlugin = pluginDerivation rec {
     /* menu:
        Layer/Liquid Rescale
     */
-    name = "lqr-plugin-0.6.1";
+    pname = "lqr-plugin";
+    version = "0.7.1";
     buildInputs = with pkgs; [ liblqr1 ];
     src = fetchurl {
-      url = "http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2";
-      sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";
+      url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/gimp-lqr-plugin-${version}.tar.bz2";
+      sha256 = "sha256-YpgYPjHZkueJWS51QGmugXavGS+1x4o20St31qoRng4=";
     };
     #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"'';
     installPhase = "installPlugins src/gimp-lqr-plugin";
@@ -196,35 +197,11 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
   lightning = scriptDerivation {
     name = "Lightning";
     src = fetchurl {
-      url = "http://registry.gimp.org/files/Lightning.scm";
+      url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/Lightning.scm";
       sha256 = "c14a8f4f709695ede3f77348728a25b3f3ded420da60f3f8de3944b7eae98a49";
     };
   };
 
-  /* space in name trouble ?
-
-  rainbowPlasma = scriptDerivation {
-    # http://registry.gimp.org/node/164
-    name = "rainbow-plasma";
-    src = fetchurl {
-      url = "http://registry.gimp.org/files/Rainbow Plasma.scm";
-      sha256 = "34308d4c9441f9e7bafa118af7ec9540f10ea0df75e812e2f3aa3fd7b5344c23";
-      name = "Rainbow-Plasma.scm"; # nix doesn't like spaces, does it?
-    };
-  };
-  */
-
-  /* doesn't seem to be working :-(
-  lightningGate = scriptDerivation {
-    # http://registry.gimp.org/node/153
-    name = "lightning-gate";
-    src = fetchurl {
-      url = "http://registry.gimp.org/files/LightningGate.scm";
-      sha256 = "181w1zi9a99kn2mfxjp43wkwcgw5vbb6iqjas7a9mhm8p04csys2";
-    };
-  };
-  */
-
 } // stdenv.lib.optionalAttrs (config.allowAliases or true) {
 
   resynthesizer2 = resynthesizer;

From 89752afdbd7a839665892488387ea16352ab51a4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 15:50:15 +0000
Subject: [PATCH 2017/3942] python37Packages.aioconsole: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index 3090c3cb1f6e..c198676e3eb0 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -10,12 +10,12 @@
 # wrapped to be able to find aioconsole and any other packages.
 buildPythonPackage rec {
   pname = "aioconsole";
-  version = "0.3.0";
+  version = "0.3.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b84724e6b93d1306a909974864df377236cf4bab8e0594096fed7936207205c5";
+    sha256 = "7c038bb40b7690bf5be6b17154830b7bff25e7be1c02d8420a346c3efbd5d8e5";
   };
 
   # hardcodes a test dependency on an old version of pytest-asyncio

From 221568ccfbe6774930bfefcc308b1f0e23261cb6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 13:58:17 +0000
Subject: [PATCH 2018/3942] python37Packages.pymavlink: 2.4.11 -> 2.4.12

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

diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix
index b401f1f90b1a..f0a5b222c224 100644
--- a/pkgs/development/python-modules/pymavlink/default.nix
+++ b/pkgs/development/python-modules/pymavlink/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pymavlink";
-  version = "2.4.11";
+  version = "2.4.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0b1265b169f809c6ca94911ad2d7649b8e087a7cc573a0a6ea62ade9bea7ca5c";
+    sha256 = "2954bb071ff67fc5ab29ed2dabe3b5355c4063fb8b014477d9bfbceb87358bc6";
   };
 
   propagatedBuildInputs = [ future lxml ];

From 5c737382f3d17dabd4e2a3b3b368543ae954f4c5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 15:56:58 +0000
Subject: [PATCH 2019/3942] python37Packages.xstatic-bootbox: 4.4.0.1 ->
 5.5.1.1

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

diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix
index ba75ed0b8824..6e5200d2a887 100644
--- a/pkgs/development/python-modules/xstatic-bootbox/default.nix
+++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "XStatic-Bootbox";
-  version = "4.4.0.1";
+  version = "5.5.1.1";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "1g00q38g1k576lxjlwglv4w3fj4z0z8lxlwpc66wyhjglj4r4bwd";
+    sha256 = "4b2120bb33a1d8ada8f9e0532ad99987aa03879b17b08bfdc6b8326d6eb7c205";
   };
 
   # no tests implemented

From c67382b02f97de380ac73764470b70ac6dc7f0c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 10 Nov 2020 18:16:13 +0100
Subject: [PATCH 2020/3942] python3Packages.tokenizers: 0.9.2 -> 0.9.4

Changelog:

https://github.com/huggingface/tokenizers/releases/tag/python-v0.9.3
https://github.com/huggingface/tokenizers/releases/tag/python-v0.9.4
---
 .../python-modules/tokenizers/default.nix        | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix
index 5b0ba5d0bfa0..4e5aacd6c7ac 100644
--- a/pkgs/development/python-modules/tokenizers/default.nix
+++ b/pkgs/development/python-modules/tokenizers/default.nix
@@ -32,6 +32,14 @@ let
     url = "https://norvig.com/big.txt";
     sha256 = "0yz80icdly7na03cfpl0nfk5h3j3cam55rj486n03wph81ynq1ps";
   };
+  docPipelineTokenizer = fetchurl {
+    url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-pipeline/tokenizer.json";
+    hash = "sha256-i533xC8J5CDMNxBjo+p6avIM8UOcui8RmGAmK0GmfBc=";
+  };
+  docQuicktourTokenizer = fetchurl {
+    url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-quicktour/tokenizer.json";
+    hash = "sha256-ipY9d5DR5nxoO6kj7rItueZ9AO5wq9+Nzr6GuEIfIBI=";
+  };
   openaiVocab = fetchurl {
     url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json";
     sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x";
@@ -42,16 +50,16 @@ let
   };
 in rustPlatform.buildRustPackage rec {
   pname = "tokenizers";
-  version = "0.9.2";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = pname;
     rev = "python-v${version}";
-    sha256 = "0rsm1g5zfq3ygdb3s8v9xqqpgfzvvkc4n5ik3ahy8sw7pyjljb4m";
+    hash = "sha256-JXoH9yfhMIFg5qDY5zrF6iWb7XKugjMfk1NxSizfaWg=";
   };
 
-  cargoSha256 = "0yn699dq9hdjh7fyci99ni8mmd5qdhzrsi80grzgf5cch8g38rbi";
+  cargoSha256 = "sha256-u9qitrOxJSABs0VjwHUZgmw7VTQXNbp6l8fKKE/RQ7M=";
 
   sourceRoot = "source/bindings/python";
 
@@ -82,6 +90,8 @@ in rustPlatform.buildRustPackage rec {
       ln -s ${robertaMerges} roberta-base-merges.txt
       ln -s ${albertVocab} albert-base-v1-tokenizer.json
       ln -s ${bertVocab} bert-base-uncased-vocab.txt
+      ln -s ${docPipelineTokenizer} bert-wiki.json
+      ln -s ${docQuicktourTokenizer} tokenizer-wiki.json
       ln -s ${norvigBig} big.txt
       ln -s ${openaiVocab} openai-gpt-vocab.json
       ln -s ${openaiMerges} openai-gpt-merges.txt )

From 8712a719c20ef553cc4cadd7b9d6945853fd5056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 10 Nov 2020 18:22:51 +0100
Subject: [PATCH 2021/3942] python3Packages.transformers: relax tokenizers
 version bound

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

diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index e3fd150fbcf7..95e982f8ec01 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -45,6 +45,11 @@ buildPythonPackage rec {
     timeout-decorator
   ];
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "tokenizers == 0.9.2" "tokenizers"
+  '';
+
   preCheck = ''
     export HOME="$TMPDIR"
 

From bb83e1c29371c25fa4223976b08e486b0e7a2814 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 13:40:55 +0000
Subject: [PATCH 2022/3942] python37Packages.cairosvg: 2.4.2 -> 2.5.0

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

diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix
index 31f7d7bc5d67..da3e84b725dd 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/pkgs/development/python-modules/cairosvg/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "CairoSVG";
-  version = "2.4.2";
+  version = "2.5.0";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bb7irxbaxxb9ahm3z5wsx1q96mm5gzskc7b6q07h9ikcnb8yrjf";
+    sha256 = "3fc50d10f0cbef53b3ee376a97a88d81bbd9e2f190f7e63de08431a1a08e9afa";
   };
 
   propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];

From 408cf0b1a3e59c6d82d596e08fde2a6fc9c775e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 13:03:04 +0000
Subject: [PATCH 2023/3942] python37Packages.dropbox: 10.7.0 -> 10.8.0

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

diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index 07d13c74c8db..20576e5e47a4 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "dropbox";
-  version = "10.7.0";
+  version = "10.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08c1e0bbc16499e0138431e34777c35ea086734ff15ee5067b0df3424df2a9ec";
+    sha256 = "2312a0314d7698f6aa6944bf6d73a756f4ff7d7d90fa26c323a418a84dc3b533";
   };
 
   # Set DROPBOX_TOKEN environment variable to a valid token.

From 54e2bb0bf99933a70df700faeef49fe6c40ea810 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 16:16:39 +0000
Subject: [PATCH 2024/3942] python37Packages.itemadapter: 0.1.1 -> 0.2.0

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

diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix
index 297d7fcef0b4..e1efb9aa673f 100644
--- a/pkgs/development/python-modules/itemadapter/default.nix
+++ b/pkgs/development/python-modules/itemadapter/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "itemadapter";
-  version = "0.1.1";
+  version = "0.2.0";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b5e75d48c769ee5c89de12aeba537b2d62d7b575cd549d5d430ed8a67faa63f2";
+    sha256 = "cb7aaa577fefe2aa6f229ccf4d058e05f44e0178a98c8fb70ee4d95acfabb423";
   };
 
   doCheck = false; # infinite recursion with Scrapy

From 3000a0f87e5574fdaed7e3209f6815bac08d8cd4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Nov 2020 23:57:44 +0100
Subject: [PATCH 2025/3942] gimp: expose gimpdatadir & gimplibdir

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

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 025f97b54e69..4ba7cb8eb036 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -163,8 +163,10 @@ in stdenv.mkDerivation rec {
     # The declarations for `gimp-with-plugins` wrapper,
     # used for determining plug-in installation paths
     majorVersion = "${lib.versions.major version}.0";
-    targetPluginDir = "lib/gimp/${majorVersion}/plug-ins";
-    targetScriptDir = "share/gimp/${majorVersion}/scripts";
+    targetLibDir = "lib/gimp/${majorVersion}";
+    targetDataDir = "share/gimp/${majorVersion}";
+    targetPluginDir = "${targetLibDir}/plug-ins";
+    targetScriptDir = "${targetDataDir}/scripts";
 
     # probably its a good idea to use the same gtk in plugins ?
     gtk = gtk2;

From 3525d53c2b846d7c54299020955610c86ff9455b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 19:02:07 +0000
Subject: [PATCH 2026/3942] python37Packages.gphoto2: 2.2.3 -> 2.2.4

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

diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
index d5ad49f349b1..2834fc5a735d 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "gphoto2";
-  version = "2.2.3";
+  version = "2.2.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "35d3ae97a9f13526746fb506de627a73328328528b436a51567fcb7e640883e9";
+    sha256 = "48b4c4ab70826d3ddaaf7440564d513c02d78680fa690994b0640d383ffb8a7d";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 39ea613da169536989f68eace33d2a73668e08b5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 19:16:03 +0000
Subject: [PATCH 2027/3942] python37Packages.azure-mgmt-sql: 0.23.0 -> 0.24.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
index 36432ccbc84f..aa60cde71425 100644
--- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-sql";
-  version = "0.23.0";
+  version = "0.24.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "acf7d4c83fb43152a809e3894528e561e601be543250c2824cc615cc88a70855";
+    sha256 = "da391ed00d82cd8e20ca50affdc43b99fd9a7919b54a3a0d53c73cb41eea09d3";
   };
 
   propagatedBuildInputs = [

From bae1a8a8893e67b38b601bc42faec2bea4db231c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 10 Nov 2020 18:00:00 -0500
Subject: [PATCH 2028/3942] nodejs-15_x: 15.1.0 -> 15.2.0

https://github.com/nodejs/node/releases/tag/v15.2.0
---
 pkgs/development/web/nodejs/v15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix
index 23a14dc83486..b5319493dad3 100644
--- a/pkgs/development/web/nodejs/v15.nix
+++ b/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "15.1.0";
-    sha256 = "1fd0ck6nlmp937j00y17q2k9xszzwf4s383p1z4v4qzj0qzxflvk";
+    version = "15.2.0";
+    sha256 = "022kw29sjf46mgvwciihi2cmf9sfjpqi0xih8xpk7xiwfmx02ypn";
   }

From edba7d603aab7aceedaef28a353ddafca9307785 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 09:21:59 +0000
Subject: [PATCH 2029/3942] python37Packages.onnx: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix
index 6c0560bbaffc..278d7c1df046 100644
--- a/pkgs/development/python-modules/onnx/default.nix
+++ b/pkgs/development/python-modules/onnx/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "onnx";
-  version = "1.7.0";
+  version = "1.8.0";
 
   # Due to Protobuf packaging issues this build of Onnx with Python 2 gives
   # errors on import.
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0j6rgfbhsw3a8id8pyg18y93k68lbjbj1kq6qia36h69f6pvlyjy";
+    sha256 = "5f787fd3ce1290e12da335237b3b921152157e51aa09080b65631b3ce3fcc50c";
   };
 
   nativeBuildInputs = [ cmake ];

From 4702cd52c743b916750a28f73e28a092226316a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 16:57:56 +0000
Subject: [PATCH 2030/3942] python37Packages.django-q: 1.3.3 -> 1.3.4

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

diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix
index a81aa2a63cd3..0755c5055a1e 100644
--- a/pkgs/development/python-modules/django-q/default.nix
+++ b/pkgs/development/python-modules/django-q/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "django-q";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "de7077660ede36bfdd89ab9405d6393b598bb3e0bfed61f59a0a9074cc4942bb";
+    sha256 = "523d54dcf1b66152c1b658f914f00ed3b518a3432a9decd4898738ca8dbbe10f";
   };
 
   propagatedBuildInputs = [

From 61b839d9d61bdd656401f9124bbb34c27428dcf3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 19:38:08 +0000
Subject: [PATCH 2031/3942] python37Packages.keep: 2.9 -> 2.10

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

diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix
index 6108ea506892..4e7003aef9f9 100644
--- a/pkgs/development/python-modules/keep/default.nix
+++ b/pkgs/development/python-modules/keep/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "keep";
-  version = "2.9";
+  version = "2.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0902kcvhbmy5q5n0ai1df29ybf87qaljz306c5ssl8j9xdjipcq2";
+    sha256 = "ce71d14110df197ab5afdbd26a14c0bd266b79671118ae1351835fa192e61d9b";
   };
 
   propagatedBuildInputs = [

From 660ae96644c5499516304a81af4961ced2a26ec4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 11:07:20 +0000
Subject: [PATCH 2032/3942] python37Packages.trytond: 5.6.8 -> 5.8.0

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

diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index 5a9495746cd9..74dc6c79a746 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -25,12 +25,12 @@ with stdenv.lib;
 
 buildPythonApplication rec {
   pname = "trytond";
-  version = "5.6.8";
+  version = "5.8.0";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "330067d7319a50b9fb15e89d224e89ab28bc363926774adf7fa119f681b106b6";
+    sha256 = "ae9baf7a83a3249686703eee71e81a0283570f545ce985a999fd74b6ab3d4e4f";
   };
 
   # Tells the tests which database to use

From 72bb100578cc7305945a7a3227cc4ffe52b4bd74 Mon Sep 17 00:00:00 2001
From: Thiago Franco de Moraes <totonixsame@gmail.com>
Date: Sun, 4 Oct 2020 19:27:11 -0300
Subject: [PATCH 2033/3942] pwsafe: use wxGTK30

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

diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index 91f23f662af9..6a9de9e600f4 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl
-, wxGTK31, libXext, libXi, libXt, libXtst, xercesc
+, wxGTK30, libXext, libXi, libXt, libXtst, xercesc
 , qrencode, libuuid, libyubikey, yubikey-personalization
 , curl, openssl, file
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     cmake gettext perl pkgconfig zip
   ];
   buildInputs = [
-    libXext libXi libXt libXtst wxGTK31
+    libXext libXi libXt libXtst wxGTK30
     curl qrencode libuuid openssl xercesc
     libyubikey yubikey-personalization
     file

From 2a136d1605edcfedf36775e06043579081aa8fbd Mon Sep 17 00:00:00 2001
From: Thiago Franco de Moraes <totonixsame@gmail.com>
Date: Wed, 30 Sep 2020 14:23:18 -0300
Subject: [PATCH 2034/3942] wxGTK31: 3.1.3 -> 3.1.4

---
 .../libraries/wxwidgets/3.1/default.nix       | 87 ++++++++++++++-----
 1 file changed, 64 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix
index 44e6fe49b489..8b0e6811efff 100644
--- a/pkgs/development/libraries/wxwidgets/3.1/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix
@@ -1,13 +1,32 @@
-{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
-, libXinerama, libSM, libXxf86vm
-, gtk2, gtk3
-, xorgproto, gst_all_1, setfile
+{ stdenv
+, fetchFromGitHub
+, fetchurl
+, pkgconfig
+, libXinerama
+, libSM
+, libXxf86vm
+, libXtst
+, gtk2
+, GConf ? null
+, gtk3
+, xorgproto
+, gst_all_1
+, setfile
 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, withMesa ? libGLSupported, libGLU ? null, libGL ? null
-, compat28 ? false, compat30 ? true, unicode ? true
+, withMesa ? libGLSupported
+, libGLU ? null
+, libGL ? null
+, compat28 ? false
+, compat30 ? true
+, unicode ? true
 , withGtk2 ? true
-, withWebKit ? false, webkitgtk ? null
-, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
+, withWebKit ? false
+, webkitgtk ? null
+, AGL ? null
+, Carbon ? null
+, Cocoa ? null
+, Kernel ? null
+, QTKit ? null
 }:
 
 with stdenv.lib;
@@ -18,47 +37,58 @@ assert withWebKit -> webkitgtk != null;
 assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK31: You cannot enable withWebKit when using withGtk2.";
 
 stdenv.mkDerivation rec {
-  version = "3.1.3";
+  version = "3.1.4";
   pname = "wxwidgets";
 
   src = fetchFromGitHub {
     owner = "wxWidgets";
     repo = "wxWidgets";
     rev = "v${version}";
-    sha256 = "022mby78q7n0bhd4mph04hz93c9qamnvzv3h1s26r839k28760f4";
+    sha256 = "1fwzrk6w5k0vs8kqdq5lpzdbp5c09hx740wg6mi6vgmc1r67dv67";
+    fetchSubmodules = true;
   };
 
   buildInputs = [
-    libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
-  ] ++ optionals withGtk2 [ gtk2 ]
-    ++ optional (!withGtk2) gtk3
-    ++ optional withMesa libGLU
-    ++ optional withWebKit webkitgtk
-    ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
+    libXinerama
+    libSM
+    libXxf86vm
+    libXtst
+    xorgproto
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+  ] ++ optionals withGtk2 [ gtk2 GConf ]
+  ++ optional (!withGtk2) gtk3
+  ++ optional withMesa libGLU
+  ++ optional withWebKit webkitgtk
+  ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
 
   nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = optional stdenv.isDarwin AGL;
 
   patches = [
-    (fetchurl { # https://trac.wxwidgets.org/ticket/17942
+    (fetchurl {
+      # https://trac.wxwidgets.org/ticket/17942
       url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/"
-          + "fix_assertion_using_hide_in_destroy.diff";
+        + "fix_assertion_using_hide_in_destroy.diff";
       sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy";
     })
   ];
 
   configureFlags =
-    [ "--disable-precomp-headers" "--enable-mediactrl"
+    [
+      "--disable-precomp-headers"
+      "--enable-mediactrl"
       (if compat28 then "--enable-compat28" else "--disable-compat28")
-      (if compat30 then "--enable-compat30" else "--disable-compat30") ]
+      (if compat30 then "--enable-compat30" else "--disable-compat30")
+    ]
     ++ optional unicode "--enable-unicode"
     ++ optional withMesa "--with-opengl"
     ++ optionals stdenv.isDarwin
       # allow building on 64-bit
       [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]
     ++ optionals withWebKit
-      ["--enable-webview" "--enable-webviewwebkit"];
+      [ "--enable-webview" "--enable-webviewwebkit" ];
 
   SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib ";
 
@@ -90,8 +120,19 @@ stdenv.mkDerivation rec {
     platforms = with platforms; darwin ++ linux;
     license = licenses.wxWindows;
     homepage = "https://www.wxwidgets.org/";
-    description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
-    longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
+    description = "A C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
+    longDescription = ''
+      WxWidgets gives you a single, easy-to-use API for
+      writing GUI applications on multiple platforms that still utilize the
+      native platform's controls and utilities. Link with the appropriate library
+      for your platform and compiler, and your application will adopt the look
+      and feel appropriate to that platform. On top of great GUI functionality,
+      wxWidgets gives you: online help, network programming, streams, clipboard
+      and drag and drop, multithreading, image loading and saving in a variety of
+      popular formats, database support, HTML viewing and printing, and much
+      more.
+    '';
     badPlatforms = [ "x86_64-darwin" ];
+    maintainers = with maintainers; [ tfmoraes ];
   };
 }

From dd72edcdae1ef5fb68e19e8d8220983d180a3d47 Mon Sep 17 00:00:00 2001
From: Thiago Franco de Moraes <totonixsame@gmail.com>
Date: Wed, 30 Sep 2020 14:26:27 -0300
Subject: [PATCH 2035/3942] python3Packages.wxpython_4_1: init at 4.1.0

---
 .../python-modules/wxPython/4.1.nix           | 75 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  8 ++
 2 files changed, 83 insertions(+)
 create mode 100644 pkgs/development/python-modules/wxPython/4.1.nix

diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix
new file mode 100644
index 000000000000..6d07f8b5e281
--- /dev/null
+++ b/pkgs/development/python-modules/wxPython/4.1.nix
@@ -0,0 +1,75 @@
+{ lib
+, stdenv
+, fetchPypi
+, buildPythonPackage
+, which
+, pkgconfig
+, python
+, isPy27
+, pyopengl
+, doxygen
+, cairo
+, ncurses
+, pango
+, wxGTK
+}:
+let
+  dynamic-linker = stdenv.cc.bintools.dynamicLinker;
+in
+buildPythonPackage rec {
+  pname = "wxPython";
+  version = "4.1.0";
+  disabled = isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "12x4ci5q7qni4rkfiq6lnpn1fk8b0sfc6dck5wyxkj2sfp5pa91f";
+  };
+
+  # https://github.com/NixOS/nixpkgs/issues/75759
+  # https://github.com/wxWidgets/Phoenix/issues/1316
+  doCheck = false;
+
+  nativeBuildInputs = [ which doxygen wxGTK pkgconfig ];
+
+  buildInputs = [
+    wxGTK.gtk
+    ncurses
+  ];
+
+  DOXYGEN = "${doxygen}/bin/doxygen";
+
+  preConfigure = lib.optionalString (!stdenv.isDarwin) ''
+    substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
+      --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")'
+    substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
+      --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
+        ("gdk",        "${wxGTK.gtk}/lib/libgtk-x11-3.0.so"),
+        ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
+        ("appsvc",     None)
+      ]}'
+
+    # https://github.com/wxWidgets/Phoenix/pull/1584
+    # It'll be not needed in next version because https://github.com/wxWidgets/Phoenix/pull/1699
+    substituteInPlace build.py --replace "os.environ['PYTHONPATH'] = phoenixDir()" \
+      "os.environ['PYTHONPATH'] = os.environ['PYTHONPATH'] + os.pathsep + phoenixDir()"
+  '';
+
+  buildPhase = ''
+    ${python.interpreter} build.py -v --use_syswx dox etg --nodoc build_py
+  '';
+
+  installPhase = ''
+    ${python.interpreter} setup.py install --skip-build --prefix=$out
+    wrapPythonPrograms
+  '';
+
+  passthru = { inherit wxGTK; };
+
+  meta = with lib; {
+    description = "Cross platform GUI toolkit for Python, Phoenix version";
+    homepage = "http://wxpython.org/";
+    license = licenses.wxWindows;
+    maintainers = with maintainers; [ tfmoraes ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ce7e0f87469f..044f30e76174 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7689,6 +7689,14 @@ in {
     };
   };
 
+  wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix {
+    inherit (pkgs) pkgconfig;
+    wxGTK = pkgs.wxGTK31.override {
+      withGtk2 = false;
+      withWebKit = true;
+    };
+  };
+
   wxPython = self.wxPython30;
 
   x11_hash = callPackage ../development/python-modules/x11_hash { };

From a84a2de0aece7e1a4ee6a95567100426745048dd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 11 Nov 2020 00:14:16 +0100
Subject: [PATCH 2036/3942] gimpPlugins: clean up using gimp.targetLibDir

---
 .../graphics/gimp/plugins/default.nix         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index b78350ae4d30..dae498d99a04 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -8,8 +8,8 @@ let
   inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub;
   inherit (gimp) targetPluginDir targetScriptDir;
 
-  pluginDerivation = a: let
-    name = a.name or "${a.pname}-${a.version}";
+  pluginDerivation = attrs: let
+    name = attrs.name or "${attrs.pname}-${attrs.version}";
   in stdenv.mkDerivation ({
     prePhases = "extraLib";
     extraLib = ''
@@ -22,12 +22,16 @@ let
         for p in "$@"; do cp "$p" -r $out/${targetPluginDir}/${name}; done
       }
     '';
+
+    # Override installation paths.
+    PKG_CONFIG_GIMP_2_0_GIMPLIBDIR = "${placeholder "out"}/${gimp.targetLibDir}";
+    PKG_CONFIG_GIMP_2_0_GIMPDATADIR = "${placeholder "out"}/${gimp.targetDataDir}";
   }
-  // a
+  // attrs
   // {
       name = "gimp-plugin-${name}";
-      buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []);
-      nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []);
+      buildInputs = [ gimp gimp.gtk glib ] ++ (attrs.buildInputs or []);
+      nativeBuildInputs = [ pkgconfig intltool ] ++ (attrs.nativeBuildInputs or []);
     }
   );
 
@@ -49,10 +53,6 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
       sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
     };
     NIX_LDFLAGS = "-lm";
-    patchPhase = ''
-      sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \
-       -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure
-    '';
     hardeningDisable = [ "format" ];
     meta = with stdenv.lib; {
       description = "The GIMP Animation Package";
@@ -99,7 +99,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
     version = "2.0.3";
     buildInputs = with pkgs; [ fftw ];
     nativeBuildInputs = with pkgs; [ autoreconfHook ];
-    makeFlags = [ "GIMP_LIBDIR=${placeholder "out"}/lib/gimp/2.0" ];
+    makeFlags = [ "GIMP_LIBDIR=${placeholder "out"}/${gimp.targetLibDir}" ];
     src = fetchFromGitHub {
       owner = "bootchk";
       repo = "resynthesizer";

From f4c513125dbd0c235697771621bc560f5e90bb64 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 11 Nov 2020 00:16:39 +0100
Subject: [PATCH 2037/3942] =?UTF-8?q?gimpPlugins.lqrPlugin:=200.7.1=20?=
 =?UTF-8?q?=E2=86=92=200.7.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/carlobaldassi/gimp-lqr-plugin/compare/v0.7.1...v0.7.2

Also switch to GitHub upstream and use installPhase from generic builder (thanks to the pkg-config variables).
---
 pkgs/applications/graphics/gimp/plugins/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index dae498d99a04..6a492580f7d3 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -138,14 +138,14 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
        Layer/Liquid Rescale
     */
     pname = "lqr-plugin";
-    version = "0.7.1";
+    version = "0.7.2";
     buildInputs = with pkgs; [ liblqr1 ];
-    src = fetchurl {
-      url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/gimp-lqr-plugin-${version}.tar.bz2";
-      sha256 = "sha256-YpgYPjHZkueJWS51QGmugXavGS+1x4o20St31qoRng4=";
+    src = fetchFromGitHub {
+      owner = "carlobaldassi";
+      repo = "gimp-lqr-plugin";
+      rev = "v${version}";
+      sha256 = "81ajdZ2zQi/THxnBlSeT36tVTEzrS1YqLGpHMhFTKAo=";
     };
-    #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"'';
-    installPhase = "installPlugins src/gimp-lqr-plugin";
   };
 
   gmic = pkgs.gmic-qt.override {

From b48a9f05bf5714a5d8b7e5f79666b0ddd028b935 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 23:33:45 +0000
Subject: [PATCH 2038/3942] cargo-make: 0.32.8 -> 0.32.9

---
 pkgs/development/tools/rust/cargo-make/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index 4249e55247ca..881a53872c96 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -4,11 +4,11 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.32.8";
+  version = "0.32.9";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-TwutU4RjiYtxc2vT67Bgqe/WRHi5aXwgzvZu7Wk4Cao=";
+    sha256 = "0f6avprq0d65v5fk3kn2kvw3w024f21yq6v8y7d9rbwqxxf87jlf";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
 
-  cargoSha256 = "sha256-HzRriPVaMn6qDu6h/NQjILglO4/0//8J1orV4Uz+XEI=";
+  cargoSha256 = "0v0657hh8ivqaq4sn0saaiz06shxavhrh9mksjlzj7c2ym6cxkih";
 
   # Some tests fail because they need network access.
   # However, Travis ensures a proper build.

From 078dc38e35af463bb8a739af0aafdae4a3d255d0 Mon Sep 17 00:00:00 2001
From: Gabor Greif <ggreif@gmail.com>
Date: Tue, 10 Nov 2020 20:30:51 +0100
Subject: [PATCH 2039/3942] wasmtime: 0.20.0 -> 0.21.0

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

diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 75a022de912f..3d13dddb6425 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,17 +2,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasmtime";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "01k1fpk2qp4kv0xr4f0xmrjkr98j5ws48r1aks8l80mffs4ynqfr";
+    sha256 = "0q7wsnq5zdskxwzsxwm98jfnv2frnwca1dkhwndcn9yyz2gyw57m";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "0vghcs1nbxlkmw9wfikzb1ndscx7fkmgv5q8dnfcisl05zpkj7si";
+  cargoSha256 = "1r1fm28zaxfbzd17jzaz8ql6ss6y6djgdhpfpkvpbw9l8l06x4lc";
 
   nativeBuildInputs = [ python cmake clang ];
   buildInputs = [ llvmPackages.libclang ] ++

From 23b939cfc336612fc7c5ba6213aea7966c872153 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 11 Nov 2020 01:05:07 +0100
Subject: [PATCH 2040/3942] fwupd: Fix build

Few new files are trying to be installed to /etc.

Fixes: https://github.com/NixOS/nixpkgs/issues/103365
---
 ...d-option-for-installation-sysconfdir.patch | 48 ++++++++++++++-----
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
index 349fcbb23f3d..6faa6079355c 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
+++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
@@ -1,5 +1,5 @@
 diff --git a/data/meson.build b/data/meson.build
-index bb749fd4..b611875b 100644
+index 14454458..12a798c0 100644
 --- a/data/meson.build
 +++ b/data/meson.build
 @@ -17,7 +17,7 @@ endif
@@ -73,10 +73,10 @@ index 826a3c1d..b78db663 100644
 +  install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
  )
 diff --git a/meson.build b/meson.build
-index 87ea67e5..3a4374db 100644
+index a6fb55dd..aedb7530 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -175,6 +175,12 @@ endif
+@@ -183,6 +183,12 @@ endif
  mandir = join_paths(prefix, get_option('mandir'))
  localedir = join_paths(prefix, get_option('localedir'))
  
@@ -90,7 +90,7 @@ index 87ea67e5..3a4374db 100644
  gio = dependency('gio-2.0', version : '>= 2.45.8')
  giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false)
 diff --git a/meson_options.txt b/meson_options.txt
-index 3da9b6c4..6c80275b 100644
+index 0a0e2853..198ae930 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -1,3 +1,4 @@
@@ -99,7 +99,7 @@ index 3da9b6c4..6c80275b 100644
  option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent')
  option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')
 diff --git a/plugins/ata/meson.build b/plugins/ata/meson.build
-index 8444bb8a..fa4a8ad1 100644
+index f32b97fe..679ccc7b 100644
 --- a/plugins/ata/meson.build
 +++ b/plugins/ata/meson.build
 @@ -7,7 +7,7 @@ install_data([
@@ -122,11 +122,37 @@ index ed4eee70..76dbdb1d 100644
 -  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
 +  install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
  )
+diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build
+index d829e153..e2917bbe 100644
+--- a/plugins/msr/meson.build
++++ b/plugins/msr/meson.build
+@@ -5,7 +5,7 @@ install_data(['msr.quirk'],
+ )
+ 
+ install_data(['fwupd-msr.conf'],
+-  install_dir: join_paths(sysconfdir, 'modules-load.d')
++  install_dir: join_paths(sysconfdir_install, 'modules-load.d')
+ )
+ 
+ shared_module('fu_plugin_msr',
+diff --git a/plugins/platform-integrity/meson.build b/plugins/platform-integrity/meson.build
+index 6f1c4bc5..c5d043fc 100644
+--- a/plugins/platform-integrity/meson.build
++++ b/plugins/platform-integrity/meson.build
+@@ -7,7 +7,7 @@ install_data([
+ )
+ 
+ install_data(['fwupd-platform-integrity.conf'],
+-  install_dir: join_paths(sysconfdir, 'modules-load.d')
++  install_dir: join_paths(sysconfdir_install, 'modules-load.d')
+ )
+ 
+ shared_module('fu_plugin_platform_integrity',
 diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
-index 25fc5c7d..77eb9a83 100644
+index 92762791..08bb37ea 100644
 --- a/plugins/redfish/meson.build
 +++ b/plugins/redfish/meson.build
-@@ -27,7 +27,7 @@ shared_module('fu_plugin_redfish',
+@@ -26,7 +26,7 @@ shared_module('fu_plugin_redfish',
  )
  
  install_data(['redfish.conf'],
@@ -136,10 +162,10 @@ index 25fc5c7d..77eb9a83 100644
  
  if get_option('tests')
 diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
-index 06ab34ee..297a9182 100644
+index 6b2368fb..2bd06fed 100644
 --- a/plugins/thunderbolt/meson.build
 +++ b/plugins/thunderbolt/meson.build
-@@ -46,7 +46,7 @@ executable('tbtfwucli',
+@@ -31,7 +31,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
  )
  
  install_data(['thunderbolt.conf'],
@@ -149,10 +175,10 @@ index 06ab34ee..297a9182 100644
  # we use functions from 2.52 in the tests
  if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
 diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
-index 5838cecc..9ba3d5cd 100644
+index 2d1b2d22..c4217a72 100644
 --- a/plugins/uefi/meson.build
 +++ b/plugins/uefi/meson.build
-@@ -101,7 +101,7 @@ if get_option('man')
+@@ -97,7 +97,7 @@ if get_option('man')
  endif
  
  install_data(['uefi.conf'],

From 74d1ab8949d8348186850209c8274c91fda45771 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 00:32:57 +0000
Subject: [PATCH 2041/3942] cheat: 4.1.0 -> 4.1.1

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

diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index 77717ff50a21..472eee655188 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -3,13 +3,13 @@
 
 buildGoModule rec {
   pname = "cheat";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "cheat";
     repo = "cheat";
     rev = version;
-    sha256 = "0x6msbbqkwxs6msqacpqw4wlw7c9ilf8n6jqmx297ij6isswgksh";
+    sha256 = "0mraraby0s213ay2ahqsdvnyg76awbqllrkkx17mrx9z3ykba62d";
   };
 
   subPackages = [ "cmd/cheat" ];

From 4c438d109efdcbb62d92fe5cbee17bacef222eb1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 00:40:18 +0000
Subject: [PATCH 2042/3942] circleci-cli: 0.1.11146 -> 0.1.11458

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

diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index adfcdbb1ffdb..27fdb76cf82a 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.11146";
+  version = "0.1.11458";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1pn421sc3ipdqvdwl6fvlvwcddck3v23j8rfk5lq5a2n4ip5r8z8";
+    sha256 = "028qm25vhqp2a1jpvy4csgzqy5ijmsnzyh9696x660glrk5q2r1i";
   };
 
-  vendorSha256 = "0fjj8hh0s0jcgz48japbcfpl4ihba2drvvxlyg69j8hrcb9lmi4l";
+  vendorSha256 = "15l9f87vgspdsxhwqdm56z3dvrspc8k1bbyvhhhnvqf3fkiki2bw";
 
   doCheck = false;
 

From 264294bf29332397359111733b7cccdd6616199c Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Tue, 10 Nov 2020 19:44:46 -0500
Subject: [PATCH 2043/3942] cargo-tarpaulin: 0.15.0 -> 0.17.0

---
 pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
index d2ad97141ca7..b4cfa356b277 100644
--- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
+++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tarpaulin";
-  version = "0.15.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "xd009642";
     repo = "tarpaulin";
     rev = version;
-    sha256 = "0ga2zfq4365hxvr3wd3isc146ibivy3bfcy24rb6cq3av3b90a8k";
+    sha256 = "1z104cd3wg718x1d89znppx4h6f0c6icgmpcllyrd0d19lb71a2b";
   };
 
   nativeBuildInputs = [
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   ];
   buildInputs = [ openssl ];
 
-  cargoSha256 = "1ij1bic95315kba7k7igix33kmwr2va0c2hbysjs0bl5kcnai4f7";
+  cargoSha256 = "0pn9xgryfb7f0plx50v9i7hsv1wib87pi0fl43cv6hgqyrdb52ny";
   #checkFlags = [ "--test-threads" "1" ];
   doCheck = false;
 

From 7d2ae456bcac7f7a98c6279e0d542397b404d5b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 00:59:49 +0000
Subject: [PATCH 2044/3942] codeql: 2.3.2 -> 2.3.3

---
 pkgs/development/tools/analysis/codeql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index ba50f643ab40..5e1e93951c37 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.3.2";
+  version = "2.3.3";
 
   dontConfigure = true;
   dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    sha256 = "1fzybh21jw02gdmqkh54gin4chqxj5r5alkrqk1wcryhf73brsbb";
+    sha256 = "17a574g92jfff2059mhaw2x31npglp9rfcwwk73adbajpiyf4g8q";
   };
 
   nativeBuildInputs = [

From 77127d2f609646cf136626c5c1a93e8589e178aa Mon Sep 17 00:00:00 2001
From: Luis Aranguren <mercurytoxic@gmail.com>
Date: Wed, 11 Nov 2020 12:02:57 +1100
Subject: [PATCH 2045/3942] pivx: Correct homepage

Change incorrect homepage from https://www.dash.org to https://pivx.org
---
 pkgs/applications/blockchains/pivx.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix
index 16ea2dc43e74..5a59bb4b7de2 100644
--- a/pkgs/applications/blockchains/pivx.nix
+++ b/pkgs/applications/blockchains/pivx.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
       Zero Knowledge cryptography proofs for industry-leading transaction anonymity.
     '';
     license = licenses.mit;
-    homepage = "https://www.dash.org";
+    homepage = "https://pivx.org";
     maintainers = with maintainers; [ wucke13 ];
     platforms = platforms.unix;
   };

From c857365a7cf53c690492eed0431a94aa147de785 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 01:17:04 +0000
Subject: [PATCH 2046/3942] cpp-utilities: 5.7.0 -> 5.8.0

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

diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index b821faebdebc..82c4882a3678 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cpp-utilities";
-  version = "5.7.0";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "04483v9bw6wp831f34fn46zj54v9y7f6qqfmx85fjxhkr3rqk4i0";
+    sha256 = "06mpag2hg2vb03pdc5f9cjkpgw3kdh3bh29xfrbb16ixk4rhv0j7";
   };
 
   nativeBuildInputs = [ cmake ];

From 23c932f8792b46b3303b7d66b99fe6c5e4970211 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 01:33:19 +0000
Subject: [PATCH 2047/3942] ctop: 0.7.4 -> 0.7.5

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

diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix
index 68e7562975f3..2b538d66322f 100644
--- a/pkgs/tools/system/ctop/default.nix
+++ b/pkgs/tools/system/ctop/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "ctop";
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "bcicen";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0zslxd00pypn6ri7r420mqxjqy3i6qv944f7899saapsb2m08w7j";
+    sha256 = "0mm1gapnz67mwc346jr530xwpiajq1b2f295s8gz5nrb2a23mqln";
   };
 
   vendorSha256 = "0a5rwnf251jbp7jz2ln8z9hqp0112c6kx0y09nncvlcki35qq9sh";

From 5b3f7b23ff2024c08e954cf7dde020e2448d4c63 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 02:36:18 +0000
Subject: [PATCH 2048/3942] dnsproxy: 0.32.6 -> 0.33.2

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

diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix
index 68739507d3b8..b2c19e2acf93 100644
--- a/pkgs/tools/networking/dnsproxy/default.nix
+++ b/pkgs/tools/networking/dnsproxy/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "dnsproxy";
-  version = "0.32.6";
+  version = "0.33.2";
 
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0wcn2wr521n2vcmpnwphgycq109251nkfdr0wzn7lk2zl5qx81ax";
+    sha256 = "0x005lgncaf1fzs27fpcpf6dcncb7wia6fka64pmjxdsq7nmh1hh";
   };
 
   vendorSha256 = null;

From 79709873e3534d2e739b3ff8f22a9ada93fad6f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 02:42:04 +0000
Subject: [PATCH 2049/3942] do-agent: 3.7.1 -> 3.8.0

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

diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix
index c2527acc1cd4..6ebcf940146c 100644
--- a/pkgs/servers/monitoring/do-agent/default.nix
+++ b/pkgs/servers/monitoring/do-agent/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "do-agent";
-  version = "3.7.1";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "do-agent";
     rev = version;
-    sha256 = "16mmh1kz6zbncfisd9qnb3ssgpkcb4hb7700jlzbdjqxyjmy0qsf";
+    sha256 = "141hmkswb65sq99ad6vg4dkrbhsmni88hlrfdxqdn89hvsz8f7b2";
   };
 
   buildFlagsArray = ''

From a4e0d2b1b83df0ea77c143ff342c33e6b9f50c8b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 02:48:10 +0000
Subject: [PATCH 2050/3942] doctest: 2.4.0 -> 2.4.1

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

diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix
index 5a2561056876..d647d5f38880 100644
--- a/pkgs/development/libraries/doctest/default.nix
+++ b/pkgs/development/libraries/doctest/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "doctest";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "onqtam";
     repo = "doctest";
     rev = version;
-    sha256 = "1yi95saqv8qb3ix6w8d7ffvs7qbwvqmq6wblckhxhicxxdxk85cd";
+    sha256 = "17g7n6rjs90i0b231x5s934qnr8m80ga2yg1z344bnsdiqcjd63w";
   };
 
   nativeBuildInputs = [ cmake ];

From 2fe0a921a4408ca712400042c8b4a9ee3bd96083 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 02:54:12 +0000
Subject: [PATCH 2051/3942] doctl: 1.49.0 -> 1.51.0

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

diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index b30bd8d29909..51dffdbe2bed 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.49.0";
+  version = "1.51.0";
 
   vendorSha256 = null;
 
@@ -32,7 +32,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     rev = "v${version}";
-    sha256 = "1z7424am1fb1l9bz8q1lfzmhz84c29v7k5p391m4hhbl8h46x6ca";
+    sha256 = "1pc1nyzjzgnwchxbhgwiq46rysxpvxv7nmshvmphqm7avxfsmdzf";
   };
 
   meta = with lib; {

From 5012439804f39272648d39da9a4d7b68e81a8bd6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 03:00:26 +0000
Subject: [PATCH 2052/3942] dolt: 0.21.1 -> 0.21.4

---
 pkgs/servers/sql/dolt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index 8d4e92551354..08b873ea0345 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
     pname = "dolt";
-    version = "0.21.1";
+    version = "0.21.4";
 
     src = fetchFromGitHub {
         owner = "liquidata-inc";
         repo = "dolt";
         rev = "v${version}";
-        sha256 = "03fg91r6lxfq58c5843vysaw8hbagiq4r2qxc4nh9w1b3mc71h7v";
+        sha256 = "13dr3iq3v14i9zlcpv8yvq6yp90b70512bk2jkr5arlk2bilba8c";
     };
 
     modRoot = "./go";
     subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
-  vendorSha256 = "19755xbjxxva574mj0sc7kqqmr4k22bbvf4aj3d0hhcfjpyhn434";
+  vendorSha256 = "1x3a4q629jrgh7x8b81n2iapbxjfd389pj1wc2zd6c5l9r70xr97";
 
   doCheck = false;
 

From 14ed5891eb5da6f92795d582a42f65a9bd043147 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 03:10:18 +0000
Subject: [PATCH 2053/3942] doppler: 3.16.0 -> 3.16.1

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

diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix
index 2492390bdd83..d31ad30ff61f 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/tools/security/doppler/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "doppler";
-  version = "3.16.0";
+  version = "3.16.1";
 
   src = fetchFromGitHub {
     owner = "dopplerhq";
     repo = "cli";
     rev = version;
-    sha256 = "1hypi62bzdpa55bd9z9lvisw7ybcn8jlk0kyck9h7wc2ll59jzwx";
+    sha256 = "141ic9vgkqv3hdcpj1dlb4lawzd2rm7h2np21x28mmsd0hlg6v7y";
   };
 
   vendorSha256 = "1s8zwjfk9kcddn8cywr7llh9v5m140kvmi5lmy2glvwh3rwccgxf";

From 9a7d633b59f754a81fce55e3556cf23d0aac6f33 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 03:33:26 +0000
Subject: [PATCH 2054/3942] dstask: 0.23 -> 0.23.1

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

diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix
index 0eeb0d9cab6e..0c2f25b2653f 100644
--- a/pkgs/applications/misc/dstask/default.nix
+++ b/pkgs/applications/misc/dstask/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "dstask";
-  version = "0.23";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "naggie";
     repo = pname;
     rev = "v${version}";
-    sha256 = "15hr0ivwvm2lzpi8l5y5a3hya3i7r85pxna961m24gd4f8gs4cjl";
+    sha256 = "0rfz8jim0xqcwdb5n28942v9r3hbvhjrwdgzvbwc9f9psqg2s8d2";
   };
 
   # Set vendorSha256 to null because dstask vendors its dependencies (meaning

From faa1d785f68495e883c495caa22cd6ad429c935d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 03:47:32 +0000
Subject: [PATCH 2055/3942] duckdb: 0.2.1 -> 0.2.2

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

diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix
index 9b1adb7e2358..1aedee5c3b68 100644
--- a/pkgs/development/libraries/duckdb/default.nix
+++ b/pkgs/development/libraries/duckdb/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "duckdb";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "cwida";
     repo = "duckdb";
     rev = "v${version}";
-    sha256 = "18l4qdzfm8k9ggn49r3h99cbcmmq01byzkxps3pvmq8q246hb55x";
+    sha256 = "1pzz2zjzpvji5am21vd9kjxj0pnxsjmrsfqrym9h2rk2mi7p2cx8";
   };
 
   nativeBuildInputs = [ cmake ];

From 070cf26fe8432e467f84844231f88ce606447a8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 03:53:37 +0000
Subject: [PATCH 2056/3942] duf: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix
index 831d66c73c72..29456f54cd16 100644
--- a/pkgs/tools/misc/duf/default.nix
+++ b/pkgs/tools/misc/duf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "duf";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "muesli";
     repo = "duf";
     rev = "v${version}";
-    sha256 = "093kir1zwpkl0jic4p1f032ir5k7kra94di2indzn0fa4j4r7a0i";
+    sha256 = "0n0nvrqrlr75dmf2j6ja615ighzs35cfixn7z9cwdz3vhj1xhc5f";
   };
 
   dontStrip = true;

From d3fc9d7499ea57d27a38b012667bf43d693b2502 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 03:59:28 +0000
Subject: [PATCH 2057/3942] duperemove: 0.11.1 -> 0.11.2

---
 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 53ebbb2f8d44..3d70f2f73c7f 100644
--- a/pkgs/tools/filesystems/duperemove/default.nix
+++ b/pkgs/tools/filesystems/duperemove/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "duperemove";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "markfasheh";
     repo = "duperemove";
     rev = "v${version}";
-    sha256 = "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z";
+    sha256 = "1a87mka2sfzhbch2jip6wlvvs0glxq9lqwmyrp359d1rmwwmqiw9";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From ee702dac70ac1d667ccc58017de71b4059727497 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 04:23:45 +0000
Subject: [PATCH 2058/3942] ergo: 3.3.5 -> 3.3.6

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

diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix
index 706acebba553..6b686d0b2d6c 100644
--- a/pkgs/applications/blockchains/ergo/default.nix
+++ b/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ergo";
-  version = "3.3.5";
+  version = "3.3.6";
 
   src = fetchurl {
     url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
-    sha256 = "0bxzpwwb42bppqli3zggx3lah7g6kwmy6k6k6dinypj6x0bafqcg";
+    sha256 = "1zi559ixjxxsrpvvjbxa1d0g96px3h9amjvy149sfhp7b8w5hhk3";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 17c9e6f2ffe1db856987967dd8a3afaac6c09eb0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 04:44:43 +0000
Subject: [PATCH 2059/3942] exoscale-cli: 1.19.0 -> 1.20.2

---
 pkgs/tools/admin/exoscale-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix
index e131389aa84f..9fbedcdbf4ad 100644
--- a/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "exoscale-cli";
-  version = "1.19.0";
+  version = "1.20.2";
 
   src = fetchFromGitHub {
     owner  = "exoscale";
     repo   = "cli";
     rev    = "v${version}";
-    sha256 = "05j9bwg8ph3xysd3rvykfznzs476w6wi6hj4mfg7jzw5r23ddc7k";
+    sha256 = "1vawc3ba7p35gil57wz9s1mlp1x99imvwcxfzlkfhgizfa56vfrx";
   };
 
   goPackagePath = "github.com/exoscale/cli";

From 49bd6654cfb6ba69631513aaa2e297055296dbd2 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Tue, 10 Nov 2020 21:21:56 -0800
Subject: [PATCH 2060/3942] gnome3.mutter334: Use full sysprof

Commit 56b944156340a6e1967143887165f2119ebd17bb (#101528) incorrectly
switched mutter and mutter334 from full sysprof to libsysprof-capture,
causing channel-blocking build failures:

https://hydra.nixos.org/build/129977355 (mutter)
https://hydra.nixos.org/build/130019098 (mutter334)

Commit 752773e0a43fe10a7d3d3aa6d3c3eafc68a26592 (#103142) reverted only
the mutter part.  This reverts the mutter334 part.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/desktops/gnome-3/core/mutter/3.34/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
index 0581695d288a..6afded766716 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
@@ -35,7 +35,7 @@
 , xorgserver
 , python3
 , wrapGAppsHook
-, libsysprof-capture
+, sysprof
 , desktop-file-utils
 , libcap_ng
 , egl-wayland
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
     libxkbfile
     pango
     pipewire_0_2 # TODO: backport pipewire 0.3 support
-    libsysprof-capture
+    sysprof
     upower
     xkeyboard_config
     xwayland

From 9b9cf9469ffad6c98efa980c4e12ea6d3fee4e06 Mon Sep 17 00:00:00 2001
From: Dmitry Vyal <dmitryvyal@gmail.com>
Date: Sat, 5 Sep 2020 23:46:04 +0300
Subject: [PATCH 2061/3942] python3Packages.tensorboardx: fix build after
 upgrade to PyTorch 1.6

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

diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix
index d2532777d006..a95f8e029285 100644
--- a/pkgs/development/python-modules/tensorboardx/default.nix
+++ b/pkgs/development/python-modules/tensorboardx/default.nix
@@ -19,6 +19,12 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ numpy protobuf six ];
 
+  # apparently torch API changed a bit at 1.6
+  postPatch = ''
+    substituteInPlace tensorboardX/pytorch_graph.py --replace "torch.onnx.set_training(model, False)" "torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)"
+  '';
+
+
   disabledTests = [ "test_TorchVis"  "test_onnx_graph" ];
 
   meta = with lib; {

From 88894b56921ab388ac17e21943ba1952ab53b2ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 06:10:51 +0000
Subject: [PATCH 2062/3942] fluent-bit: 1.6.2 -> 1.6.3

---
 pkgs/tools/misc/fluent-bit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 0f67ab84d443..7616e6a5b304 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "0v2n43mn6n4nn6r2d4ksp98793xkx334xp078vhvgi01nsmd60x7";
+    sha256 = "0c8b5xg1shdncw24jsnzwk96ln4qmw1h2qlxv6467lf083kz0azw";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From 9d408eb8341468b874f10ab49ebf34fffd8bd8c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 06:17:34 +0000
Subject: [PATCH 2063/3942] flyctl: 0.0.145 -> 0.0.146

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

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index dbc6bfb9a037..73450d086777 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.0.145";
+  version = "0.0.146";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    sha256 = "00by00jslj9nkq89iwvc5f0jcn4lv8i6xs9y9l2x044rq525q08q";
+    sha256 = "0qqrzzgr7r2j5cwhbfwfl1z6k9qgqpsdf8f0n545hg48i52q0p2q";
   };
 
   preBuild = ''

From a23aa390c519e6ec089c21a0a18f7360f78d3e82 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 12:30:15 +0000
Subject: [PATCH 2064/3942] python37Packages.google_cloud_automl: 2.0.0 ->
 2.1.0

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

diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix
index 8ed42aeed282..3ad8dcb12fb3 100644
--- a/pkgs/development/python-modules/google_cloud_automl/default.nix
+++ b/pkgs/development/python-modules/google_cloud_automl/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-automl";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16hr1i2771z4yh19xg6kk037h9cv5j64q5bxb9nmkvj12hdwbwgv";
+    sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696";
   };
 
   disabled = pythonOlder "3.6";

From b331d9f9c95a482b32c4e19adf35958f444286c5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 21:56:31 +0000
Subject: [PATCH 2065/3942] azure-storage-azcopy: 10.6.1 -> 10.7.0

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

diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index 096e321fe700..1c5bb899b69b 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
-  version = "10.6.1";
+  version = "10.7.0";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-storage-azcopy";
     rev = "v${version}";
-    sha256 = "1gmpdyc55mkzdkkhyzvy9517znvcj8hd9x3rpkpr86vfzgjv9qyv";
+    sha256 = "0l2109r9a8fhd66zgsi56zdmy390fpnvy08rbxf6rfc0a55n96ka";
   };
 
   subPackages = [ "." ];
 
-  vendorSha256 = "10sxkb2dh1il4ps15dlvq0xsry8hax27imb5qg3khdmjhb4yaj7k";
+  vendorSha256 = "032yzl8mmgmmxbpsymndp4ddgi572jh5drwql0bjjabp3yqwj1g1";
 
   doCheck = false;
 

From 7888921107f15b988f7c3d8ce38c143328ad98eb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 03:26:27 +0000
Subject: [PATCH 2066/3942] tmuxp: 1.5.8 -> 1.6.2

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

diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index 515d7001fbc7..a02c1d0f437d 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -4,11 +4,11 @@ with python.pkgs;
 
 buildPythonApplication rec {
   pname = "tmuxp";
-  version = "1.5.8";
+  version = "1.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09b403c9e1ef50695fab1e72376ff5674906b485fbcaad50c7cafec1ba775087";
+    sha256 = "feec0be98a60c8cd8557bce388156202496dd9c8998e6913e595e939aeb0f735";
   };
 
   postPatch = ''

From e787afe7eddfcb61d075e477bb806820ffa13ae8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 00:17:35 +0000
Subject: [PATCH 2067/3942] python27Packages.rope: 0.17.0 -> 0.18.0

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

diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix
index fd7bf55ad52c..81e306f81db2 100644
--- a/pkgs/development/python-modules/rope/default.nix
+++ b/pkgs/development/python-modules/rope/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "rope";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "658ad6705f43dcf3d6df379da9486529cf30e02d9ea14c5682aa80eb33b649e1";
+    sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04";
   };
 
   checkInputs = [ nose ];

From 2e6b023570a278d4edbc4d720703ca21b6e57fef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 06:42:01 +0000
Subject: [PATCH 2068/3942] postfix: 3.5.6 -> 3.5.7

---
 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 e449f4ae954e..9aee89db9b70 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
 
   pname = "postfix";
 
-  version = "3.5.6";
+  version = "3.5.7";
 
   src = fetchurl {
     url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
-    sha256 = "0shyxk83adv4pbfilmskyrgjpb57vyhmvqbmfqawxbc22mksmh4f";
+    sha256 = "0q89iwan5yd84yrzdv3sqg1zanmw56bl2f5gyv5wfg8m9vqp995p";
   };
 
   nativeBuildInputs = [ makeWrapper m4 ];

From 8d4e04cb557d8a187b2f345e8af9144fb2537a64 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Nov 2020 23:25:46 +0000
Subject: [PATCH 2069/3942] qtractor: 0.9.15 -> 0.9.18

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

diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index 2975e6464e1c..961314088d1a 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "qtractor";
-  version = "0.9.15";
+  version = "0.9.18";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "0k7a6llwrzs07flr9mvzvay9ygc2x64syg8npyabsw5a4d85fwsx";
+    sha256 = "121vmygdzp37p6f93f8dbbg2m2r55j7amyiapzkqgypgn4vfdbwr";
   };
 
   nativeBuildInputs = [

From df76f017f21e95659622b0b364dc0730e5fcafd7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 08:17:06 +0000
Subject: [PATCH 2070/3942] python37Packages.snowflake-connector-python: 2.3.4
 -> 2.3.5

---
 .../python-modules/snowflake-connector-python/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 6f271e1758aa..bc60d7897c1a 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -25,12 +25,12 @@
 
 buildPythonPackage rec {
   pname = "snowflake-connector-python";
-  version = "2.3.4";
+  version = "2.3.5";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5a072ee61ef156e5938e04447f0b99248b87ef262e498b5e5002f5b579cd7fb2";
+    sha256 = "b953a53141a88406e9c0e3144582a7c257e5c89fa81e97664d520999991812e7";
   };
 
   propagatedBuildInputs = [

From af2f6c21d9c51872a829061274d33c513866ec30 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 06:41:16 +0000
Subject: [PATCH 2071/3942] frp: 0.34.1 -> 0.34.2

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

diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix
index 0e00009751a3..582ec78d09dc 100644
--- a/pkgs/tools/networking/frp/default.nix
+++ b/pkgs/tools/networking/frp/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "frp";
-  version = "0.34.1";
+  version = "0.34.2";
 
   src = fetchFromGitHub {
     owner = "fatedier";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1n1b7rr6njblz3rmsdl6xng4swlagg2z3jnik0gnajiq3w8ajwdj";
+    sha256 = "0r7bp99kbp5nh5kqrxc4fb7pblpmcksbq67c6z922hvynpgnycj0";
   };
 
   vendorSha256 = "18d9478ndzywwmh0jsxcb4i2rqyn3vzrgwflqrsv7krijalknsc9";

From d2264a55529be20ea78f31a20ee5339e3e08f57b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 06:48:11 +0000
Subject: [PATCH 2072/3942] ft2-clone: 1.37 -> 1.39

---
 pkgs/applications/audio/ft2-clone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index 20618e3c5d5f..5ee7a4d9c744 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ft2-clone";
-  version = "1.37";
+  version = "1.39";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
     rev = "v${version}";
-    sha256 = "1lhpzd46mpr3bq13qhd0bq724db5fhc8jplfb684c2q7sc4v92nk";
+    sha256 = "0vc7gni24q649b53flz7rlgnc5xl2dqdklgwc2brj380a5s7g6m7";
   };
 
   nativeBuildInputs = [ cmake ];

From b24bccf5366c3b1983903373eff77d99240b6f36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Nov 2020 23:53:00 +0000
Subject: [PATCH 2073/3942] qmmp: 1.4.1 -> 1.4.2

---
 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 84ff9f787d53..e6f41711fdf6 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
 # handle that.
 
 mkDerivation rec {
-  name = "qmmp-1.4.1";
+  name = "qmmp-1.4.2";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "0p18r2ri75vbyjzfa7bcl1dm372m6jvn9zj2p5ia2rh1g77fbm9a";
+    sha256 = "1kvzw0n90crg3dgy8834qrjv0zb3ia5cny7virax9ax73y653jfa";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 195ed0d5cdb861268b49e28857a22d2c1391e950 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 07:02:14 +0000
Subject: [PATCH 2074/3942] gauge: 1.1.4 -> 1.1.5

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

diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index 457d7b7a4b57..d7ec8564cf16 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "gauge";
-  version = "1.1.4";
+  version = "1.1.5";
 
   goPackagePath = "github.com/getgauge/gauge";
   excludedPackages = ''\(build\|man\)'';
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "getgauge";
     repo = "gauge";
     rev = "v${version}";
-    sha256 = "07kq6j5scbcicgb8dqkf129q5ppvnlvkfp165ql30jrkfd6ybf6y";
+    sha256 = "0jijw9x1ccqbb9kkzx1bj3wsq6v1415hvlbiihswqbb559bcmira";
   };
 
   meta = with stdenv.lib; {

From a9e2cea85c85587efc8344736d00eda3de9fe64c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 07:13:04 +0000
Subject: [PATCH 2075/3942] gifski: 1.2.2 -> 1.2.4

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

diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix
index 612db49c8a47..aa247a4c9177 100644
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/pkgs/tools/graphics/gifski/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gifski";
-  version = "1.2.2";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "gifski";
     rev = version;
-    sha256 = "175wlvn6psa3xx9g2i05xykk24wpmkr0m27rm95jyi0kzlqdc466";
+    sha256 = "0mr4ni75klmzfjivfv5xmcdw03y1gjvkz1d297gwh46zq1q7blf3";
   };
 
-  cargoSha256 = "01gf8v6q2rpaik6dyxch8n2mpaxp222v32zrw19059hn3smg98l0";
+  cargoSha256 = "0wm139lik6w2hwg72j8hcphp0z89bbabfxjmfyqrih6akyzb0l01";
 
   nativeBuildInputs = [ pkgconfig ];
 

From c945b47a25d4fa0c0ac342291b2142eb9807a746 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Tue, 10 Nov 2020 21:57:51 +0000
Subject: [PATCH 2076/3942] linuxPackages.wireguard: fix the build on linux
 5.4.76

Patch copied from https://github.com/archlinux/svntogit-packages/blob/packages/wireguard-dkms/trunk/lts.diff

This fixes:

```
In file included from <command-line>:
/build/source/src/compat/compat-asm.h:44: warning: "SYM_FUNC_START" redefined
   44 | #define SYM_FUNC_START ENTRY
      |
In file included from /build/source/src/compat/compat-asm.h:9,
                 from <command-line>:
/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/include/linux/linkage.h:218: note: this is the location of the previous definition
  218 | #define SYM_FUNC_START(name)    \
      |
In file included from <command-line>:
/build/source/src/compat/compat-asm.h:45: warning: "SYM_FUNC_END" redefined
   45 | #define SYM_FUNC_END ENDPROC
      |
In file included from /build/source/src/compat/compat-asm.h:9,
                 from <command-line>:
/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/include/linux/linkage.h:265: note: this is the location of the previous definition
  265 | #define SYM_FUNC_END(name)    \
      |
/build/source/src/crypto/zinc/blake2s/blake2s-x86_64.S: Assembler messages:
/build/source/src/crypto/zinc/blake2s/blake2s-x86_64.S:50: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/blake2s/blake2s-x86_64.S:176: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/blake2s/blake2s-x86_64.S:180: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/blake2s/blake2s-x86_64.S:257: Error: invalid character '(' in mnemonic
make[3]: *** [/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/scripts/Makefile.build:348: /build/source/src/crypto/zinc/blake2s/blake2s-x86_64.o] Error 1
make[3]: *** Waiting for unfinished jobs....
In file included from <command-line>:
/build/source/src/compat/compat-asm.h:44: warning: "SYM_FUNC_START" redefined
   44 | #define SYM_FUNC_START ENTRY
      |
In file included from /build/source/src/compat/compat-asm.h:9,
                 from <command-line>:
/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/include/linux/linkage.h:218: note: this is the location of the previous definition
  218 | #define SYM_FUNC_START(name)    \
      |
In file included from <command-line>:
/build/source/src/compat/compat-asm.h:45: warning: "SYM_FUNC_END" redefined
   45 | #define SYM_FUNC_END ENDPROC
      |
In file included from /build/source/src/compat/compat-asm.h:9,
                 from <command-line>:
/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/include/linux/linkage.h:265: note: this is the location of the previous definition
  265 | #define SYM_FUNC_END(name)    \
      |
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S: Assembler messages:
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:123: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:185: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:187: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:319: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:1016: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:1616: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:1620: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:1810: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:1812: Error: invalid character '(' in mnemonic
/build/source/src/crypto/zinc/chacha20/chacha20-x86_64.S:1959: Error: invalid character '(' in mnemonic
make[3]: *** [/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/scripts/Makefile.build:348: /build/source/src/crypto/zinc/chacha20/chacha20-x86_64.o] Error 1
make[2]: *** [/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/Makefile:1729: /build/source/src] Error 2
make[1]: *** [/nix/store/cz60577g5hwk78c2z7rhxl21bklaqr0d-linux-5.4.77-dev/lib/modules/5.4.77-hardened/source/Makefile:179: sub-make] Error 2
make: *** [Makefile:26: module] Error 2
builder for '/nix/store/hll3sjyrwa55arzlsxnbacqdd8s842l1-wireguard-1.0.20200908.drv' failed with exit code 2
```
---
 pkgs/os-specific/linux/wireguard/default.nix         |  4 ++++
 .../linux/wireguard/linux-5.4.76-fix.patch           | 12 ++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index b8b65fecafc2..ef81dd54a736 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "1nd2kc3c62907kxm1084dw7krd8xsy3hxydmcpz4jvk03vm5dnkg";
   };
 
+  patches = [
+    ./linux-5.4.76-fix.patch
+  ];
+
   hardeningDisable = [ "pic" ];
 
   KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
diff --git a/pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch b/pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch
new file mode 100644
index 000000000000..78c3365bcb32
--- /dev/null
+++ b/pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch
@@ -0,0 +1,12 @@
+diff -u -r wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h
+--- wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h	2020-09-08 16:22:40.000000000 +0000
++++ wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h	2020-11-10 15:05:43.720093522 +0000
+@@ -40,7 +40,7 @@
+ #undef pull
+ #endif
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76)
+ #define SYM_FUNC_START ENTRY
+ #define SYM_FUNC_END ENDPROC
+ #endif

From 8e9b77130da43189be22c8ac07545f04a7d1dc6f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 07:29:04 +0000
Subject: [PATCH 2077/3942] globalarrays: 5.7.2 -> 5.8

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

diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix
index 423272fcd455..5f700f73515a 100644
--- a/pkgs/development/libraries/globalarrays/default.nix
+++ b/pkgs/development/libraries/globalarrays/default.nix
@@ -3,7 +3,7 @@
 } :
 
 let
-  version = "5.7.2";
+  version = "5.8";
 
 in stdenv.mkDerivation {
   pname = "globalarrays";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
     owner = "GlobalArrays";
     repo = "ga";
     rev = "v${version}";
-    sha256 = "0c1y9a5jpdw9nafzfmvjcln1xc2gklskaly0r1alm18ng9zng33i";
+    sha256 = "0bky91ncz6vy0011ps9prsnq9f4a5s5xwr23kkmi39xzg0417mnd";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From d16b0de92dd3e6e40847eed3c1bb07fbb563581c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 07:40:48 +0000
Subject: [PATCH 2078/3942] goconst: 1.2.0 -> 1.3.2

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

diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix
index 5c2e40032e95..50574923e49a 100644
--- a/pkgs/development/tools/goconst/default.nix
+++ b/pkgs/development/tools/goconst/default.nix
@@ -5,7 +5,7 @@
 
 buildGoPackage rec {
   pname = "goconst";
-  version = "1.2.0";
+  version = "1.3.2";
 
   goPackagePath = "github.com/jgautheron/goconst";
 
@@ -15,7 +15,7 @@ buildGoPackage rec {
     owner = "jgautheron";
     repo = "goconst";
     rev = version;
-    sha256 = "10yy9llmbznaq3v11sxywk1wpwhn0ddly7lxs31z1sf8paan7aig";
+    sha256 = "0bfiblp1498ic5jbdsm6mnc8s9drhasbqsw0asi6kmcz2kmslp9s";
   };
 
   meta = with lib; {

From 27a11e95b397ecd7b2d638049003c44875ed38d5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 07:50:32 +0000
Subject: [PATCH 2079/3942] golangci-lint: 1.32.0 -> 1.32.2

---
 pkgs/development/tools/golangci-lint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index 743247d6014e..e65f45e647d0 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "golangci-lint";
-  version = "1.32.0";
+  version = "1.32.2";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    sha256 = "157sqpwhb2984yri7w6x6pzp53ql56svv8bvbigcih3syrngxspr";
+    sha256 = "14zy8sq5bc26hxb3hg4afd7dpnrw25qi3g6v8y2p05isdf55laww";
   };
 
-  vendorSha256 = "1caf0flmq032azxwyfq6dvhw757nncxigfkf32s2a6g3jmqr1g3y";
+  vendorSha256 = "1l73qqpyn40z2czh2d8wgp3lpj6vnv8ll29yyryx0wm59ric732g";
 
   doCheck = false;
 

From 0aefa1ed8a330f94f0a5590927de02c38ed39a57 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 08:19:03 +0000
Subject: [PATCH 2080/3942] gramps: 5.0.1 -> 5.1.3

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

diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 4315af94f6b6..1ef00efaf7b4 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -9,7 +9,7 @@
 let
   inherit (pythonPackages) python buildPythonApplication;
 in buildPythonApplication rec {
-  version = "5.0.1";
+  version = "5.1.3";
   pname = "gramps";
 
   nativeBuildInputs = [ wrapGAppsHook gettext ];
@@ -26,7 +26,7 @@ in buildPythonApplication rec {
     owner = "gramps-project";
     repo = "gramps";
     rev = "v${version}";
-    sha256 = "1jz1fbjj6byndvir7qxzhd2ryirrd5h2kwndxpp53xdc05z1i8g7";
+    sha256 = "109dwkswz2h2328xkqk2zj736d117s9pp7rz5cc1qg2vxn1lpm93";
   };
 
   pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ];

From 4c875b9c025e7cd7b9ee0ae5ccd7314bc4d6717d Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Wed, 11 Nov 2020 17:19:20 +0900
Subject: [PATCH 2081/3942] wrangler: fix Darwin build

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

diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix
index 8844ed255886..d62e2e377d00 100644
--- a/pkgs/development/tools/wrangler/default.nix
+++ b/pkgs/development/tools/wrangler/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0d9wvdjjakznz8dnqx4gqxh0xkxrh4229460hg6dr9qn492p7nfx";
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config perl ];
+  nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
 
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [

From 15c8338975fa9b0e488a5342484e49c06a02f06c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 21 Oct 2020 18:48:39 +0000
Subject: [PATCH 2082/3942] atlassian-cli: 9.3.0 -> 9.4.0

---
 pkgs/applications/office/atlassian-cli/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index 3cc62aa9dc18..1140bb9bee20 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "atlassian-cli";
-  version = "9.3.0";
-  
+  version = "9.4.0";
+
   src = fetchzip {
     url  = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
-    sha256  = "1gsyxkkx04vhp8ii0xbln5h8wa8x3dj6xhh2fyjs4z0bil4hlf06";
+    sha256  = "091dhjkx7fdn23cj7c4071swncsbmknpvidmmjzhc0355l3p4k2g";
     extraPostFetch = "chmod go-w $out";
   };
-  
+
   tools = [
     "agile"
     "bamboo"
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "trello"
     "upm"
   ];
-  
+
   installPhase = ''
     mkdir -p $out/{bin,share/doc/atlassian-cli}
     cp -r lib $out/share/java
@@ -38,7 +38,7 @@ 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";

From 85d4895f0986c2f9f5585daaf365d87a0c86cb64 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 08:50:56 +0000
Subject: [PATCH 2083/3942] hcloud: 1.19.1 -> 1.20.0

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

diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 704477421ceb..edaaa9c3a68e 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "hcloud";
-  version = "1.19.1";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "hetznercloud";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "0iq04jfqvmwlm6947kzz4c3a33lvwxvj42z179rc3126b5v7bq54";
+    sha256 = "0sjshcppcfdfz29nsrzvrciypcb4r7fbl2sqhlkcq948b7k3jk8b";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  vendorSha256 = "1svwrb5wyz5d8fgx36bpypnfq4hmpfxyd197cla9wnqpbkia7n5r";
+  vendorSha256 = "0q6jm2ghwrbjxn76i8wz72xjdmwfvl5dn8n4zilyjjx9vvllwdjw";
 
   doCheck = false;
 

From f820f6eddf3b8196ddd4091f643e24731e2499dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 04:14:17 +0000
Subject: [PATCH 2084/3942] enchant: 2.2.12 -> 2.2.13

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

diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index cbc3f2173260..02215a30418b 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "enchant";
-  version = "2.2.12";
+  version = "2.2.13";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "0zi20s62gax9rkhwj318kqrxa62pmks6dsdd6m9pzvhlwy5cb6vb";
+    sha256 = "084aqsrkzz2c1ls47p759d9bsi26d0m6wq9901k37483g46zkfga";
   };
 
   nativeBuildInputs = [

From be92f5f0d610726d557c99d08bac3799b1f3e022 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 09:01:28 +0000
Subject: [PATCH 2085/3942] helmfile: 0.132.1 -> 0.134.0

---
 pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index f8c7ce2254ef..64106a7507b4 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "helmfile";
-  version = "0.132.1";
+  version = "0.134.0";
 
   src = fetchFromGitHub {
     owner = "roboll";
     repo = "helmfile";
     rev = "v${version}";
-    sha256 = "03i9pl3iwqk5az73qm9rxdq8c5nd9l4w3c28yk55bfgpwpnxcwjc";
+    sha256 = "0s64l3dj5ydal7rfyg1avckb2ri7a34y2x7rhbplam8lk0vdzx03";
   };
 
-  vendorSha256 = "0r4p4nwhmxg06qyf86gd2g61l4r1mlpblh4vhsc1shbz9iigykzi";
+  vendorSha256 = "1p5m5v5lpdyzywq2ybsa9zkygixdkaifn2szxj7v8x162bzf16r5";
 
   doCheck = false;
 

From 13c4f38c80cfc4921bae9cfe8e097e0e3305551b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 09:12:16 +0000
Subject: [PATCH 2086/3942] helmsman: 3.4.6 -> 3.5.1

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

diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix
index d4f1e82d5116..d044840637eb 100644
--- a/pkgs/applications/networking/cluster/helmsman/default.nix
+++ b/pkgs/applications/networking/cluster/helmsman/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "helmsman";
-  version = "3.4.6";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "Praqma";
     repo = "helmsman";
     rev = "v${version}";
-    sha256 = "018bkl6q6q8njv9qy87affs0g6c716vmhcqv2czv8qz454hn7i5h";
+    sha256 = "0vng0ra8bjxmfq6xvdxn72f5bcjrv8i72dams80lf0mq3l7wjl7c";
   };
 
   vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl";

From 6fe3b7c9df47005eeecc4cecc3a10dc50a7f76c4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 09:41:21 +0000
Subject: [PATCH 2087/3942] hugo: 0.78.0 -> 0.78.1

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 58f0bc8978fa..0882b0974497 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.78.0";
+  version = "0.78.1";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0la1c6yj9dq9rqxk6m8n8l4cabgzlk0r3was8mvgd80g3x3zn55v";
+    sha256 = "1rzv6az7fb1xvjxxq31rs42waqpwvks4h03lzjxv0kj8i43z116k";
   };
 
-  vendorSha256 = "09fvvs85rvvh0z4px2bj5908xf1mrcslkzsz09p0gy5i3zaqfnp9";
+  vendorSha256 = "06cw3qj57nhrxrbbxcyrqn53j6g11rd2q7bxw89fdn901mc26s03";
 
   doCheck = false;
 

From ef13cb68b1b80ef41713c4c5ac9a43e54740fa86 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 09:48:27 +0000
Subject: [PATCH 2088/3942] humioctl: 0.27.0 -> 0.28.1

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

diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix
index 14e1f64ebeb1..bcaf4a3627fe 100644
--- a/pkgs/applications/logging/humioctl/default.nix
+++ b/pkgs/applications/logging/humioctl/default.nix
@@ -1,8 +1,8 @@
 { buildGoModule, fetchFromGitHub, installShellFiles, stdenv }:
 
 let
-  humioCtlVersion = "0.27.0";
-  sha256 = "1h65g10dxcaw4wk0gyyyqj9f94xlphj30lp9w6rsfrk4pi3irzr4";
+  humioCtlVersion = "0.28.1";
+  sha256 = "0vy07nzafqhc14i179sfrzb795yh4pcyjj3py9fwq0nwnmxndby4";
   vendorSha256 = "0anvah2rpqvxgmdrdj73k3vbf8073nmsl3aykgvb1nraf3gz3bpk";
 in buildGoModule {
     name = "humioctl-${humioCtlVersion}";

From 87d5e6fc1adc56c3fb2b731e4183c6fd0c6a75a8 Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <Gabriel439@gmail.com>
Date: Sun, 1 Nov 2020 12:26:33 -0800
Subject: [PATCH 2089/3942] Change idiom for overriding Dhall package version

Before this change, a Dhall package like the Prelude would be
encoded as a record with one field per supported version.  Then
downstream packages would specify which package to override
by selecting a different record field.

The problem with that approach is that it did not provide an
easy way to override a package to a version other than the default
ones supplied by Nixpkgs.  Normally you would use the `.override`
method for this purpose, but the `override` method added by
`buildDhall{Directory,GitHub}Package` is clobbered by the
`override` method added by `callPackage` in
`./pkgs/top-level/dhall-packages.nix`.

The solution is to add a separate `.overridePackage` method which is
essentially the exact same as `.override`, except that it is no
longer clobbered by `callPackage`.  This `.overridePackage` method
allows one to override the arguments supplied to
`buildDhall{Directory,GitHub}Package`, making it easier to specify
package versions outside of the ones supported by Nixpkgs..

This also includes a change to only build one (preferred) version of each
package (instead of multiple supported versions per package), in order to
minimize the maintenance burden for the Dhall package set.
---
 pkgs/development/dhall-modules/Prelude.nix    | 68 +++-----------
 .../dhall-modules/dhall-kubernetes.nix        | 35 ++------
 .../dhall-modules/dhall-packages.nix          | 88 +++++++++----------
 pkgs/development/dhall-modules/lib.nix        | 25 ++++++
 .../dhall/build-dhall-directory-package.nix   |  2 +-
 .../dhall/build-dhall-github-package.nix      |  2 +-
 pkgs/top-level/dhall-packages.nix             | 18 ++--
 7 files changed, 95 insertions(+), 143 deletions(-)
 create mode 100644 pkgs/development/dhall-modules/lib.nix

diff --git a/pkgs/development/dhall-modules/Prelude.nix b/pkgs/development/dhall-modules/Prelude.nix
index 6af08edf88a7..36bfda403c8d 100644
--- a/pkgs/development/dhall-modules/Prelude.nix
+++ b/pkgs/development/dhall-modules/Prelude.nix
@@ -1,59 +1,11 @@
-{ buildDhallGitHubPackage, lib }:
+{ buildDhallGitHubPackage }:
 
-let
-  makePrelude =
-    version: { rev, sha256 }:
-      buildDhallGitHubPackage {
-        name      = "Prelude-${version}";
-        owner     = "dhall-lang";
-        repo      = "dhall-lang";
-        directory = "Prelude";
-        file      = "package.dhall";
-
-        inherit rev sha256;
-      };
-
-in
-  lib.mapAttrs makePrelude {
-    # Prelude versions older than 7.0.0 use old-style union literals, which are
-    # no longer supported by the latest version of the standard
-    "7.0.0" = {
-      rev    = "f0509b403ace4b8a72ebb5fa9c473b9aeabeaf33";
-      sha256 = "00ldlvqfh411vnrnc41zfnlvgfanwfd3l8hdia8kni3r8q9qmd71";
-    };
-
-    "8.0.0" = {
-      rev    = "136a3491753fef251b2087031617d1ee1053f285";
-      sha256 = "0haxd5dhi5bmg06a0hx1blpivmwrcnndydwagibj3zvch4knyi2q";
-    };
-
-    "9.0.0" = {
-      rev    = "6cbf57c946e7e6576babc23a38320e53ecfa6bee";
-      sha256 = "1r06fijszyifq5b4j6libwkm06g8693m9n5c4kq61dvzrjfd2gim";
-    };
-
-    "10.0.0" = {
-      rev    = "ecbf82785cff406bbd162bbabf3df6f817c805e0";
-      sha256 = "0gxkr9649jqpykdzqjc98gkwnjry8wp469037brfghyidwsm021m";
-    };
-
-    "11.0.0" = {
-      rev    = "8098184d17c3aecc82674a7b874077a7641be05a";
-      sha256 = "0rdvyxq7mvas82wsfzzpk6imzm8ax4q58l522mx0ks69pacpr3yi";
-    };
-
-    "11.1.0" = {
-      rev    = "31e90e1996f6c4cb50e03ccb1f3c45beb4bd278c";
-      sha256 = "0rdvyxq7mvas82wsfzzpk6imzm8ax4q58l522mx0ks69pacpr3yi";
-    };
-
-    "12.0.0" = {
-      rev    = "9f248138f69ee5e22192dc3d0417d5c77b189e04";
-      sha256 = "1gbr0376sfamp0ibhcbxz4vaxr6ipv42y42p5wyksfhz3ls9x5ph";
-    };
-
-    "13.0.0" = {
-      rev    = "48db9e1ff1f8881fa4310085834fbc19e313ebf0";
-      sha256 = "0kg3rzag3irlcldck63rjspls614bc2sbs3zq44h0pzcz9v7z5h9";
-    };
-  }
+buildDhallGitHubPackage {
+  name      = "Prelude-13.0.0";
+  owner     = "dhall-lang";
+  repo      = "dhall-lang";
+  directory = "Prelude";
+  file      = "package.dhall";
+  rev       = "48db9e1ff1f8881fa4310085834fbc19e313ebf0";
+  sha256    = "0kg3rzag3irlcldck63rjspls614bc2sbs3zq44h0pzcz9v7z5h9";
+}
diff --git a/pkgs/development/dhall-modules/dhall-kubernetes.nix b/pkgs/development/dhall-modules/dhall-kubernetes.nix
index 2de89d63ec37..337ae474dafd 100644
--- a/pkgs/development/dhall-modules/dhall-kubernetes.nix
+++ b/pkgs/development/dhall-modules/dhall-kubernetes.nix
@@ -1,27 +1,10 @@
-{ buildDhallGitHubPackage, lib }:
+{ buildDhallGitHubPackage }:
 
-let
-  makeDhallKubernetes =
-    version: { rev, sha256 }:
-      buildDhallGitHubPackage {
-        name  = "dhall-kubernetes-${version}";
-        owner = "dhall-lang";
-        repo  = "dhall-kubernetes";
-        file  = "package.dhall";
-
-        inherit rev sha256;
-      };
-
-in
-  lib.mapAttrs makeDhallKubernetes {
-    # 2.1.0 was the first version to introduce a top-level `package.dhall` file
-    "2.1.0" = {
-      rev    = "bbfec3d8548b605f1c9628f34029ab4a7d928839";
-      sha256 = "10zkigj05khiy6w2sqcm5nw7d47r5k52xq8np8q86h0phy798g96";
-    };
-
-    "3.0.0" = {
-      rev    = "3c6d09a9409977cdde58a091d76a6d20509ca4b0";
-      sha256 = "1r4awh770ghsrwabh5ddy3jpmrbigakk0h32542n1kh71w3cdq1h";
-    };
-  }
+buildDhallGitHubPackage {
+  name   = "dhall-kubernetes-3.0.0";
+  owner  = "dhall-lang";
+  repo   = "dhall-kubernetes";
+  file   = "package.dhall";
+  rev    = "3c6d09a9409977cdde58a091d76a6d20509ca4b0";
+  sha256 = "1r4awh770ghsrwabh5ddy3jpmrbigakk0h32542n1kh71w3cdq1h";
+}
diff --git a/pkgs/development/dhall-modules/dhall-packages.nix b/pkgs/development/dhall-modules/dhall-packages.nix
index 866b689e38a1..989531db8da6 100644
--- a/pkgs/development/dhall-modules/dhall-packages.nix
+++ b/pkgs/development/dhall-modules/dhall-packages.nix
@@ -1,51 +1,51 @@
-{ buildDhallGitHubPackage, dhall-kubernetes, lib, Prelude }:
+{ buildDhallGitHubPackage, dhall-kubernetes, Prelude }:
 
 let
-  makeDhallPackages =
-    version: { rev, sha256, dependencies }:
-      buildDhallGitHubPackage {
-        name  = "dhall-packages-${version}";
-        owner = "EarnestResearch";
-        repo  = "dhall-packages";
-        file  = "package.dhall";
+  Prelude_12_0_0 = Prelude.overridePackage {
+    name = "Prelude-12.0.0";
+    rev    = "9f248138f69ee5e22192dc3d0417d5c77b189e04";
+    sha256 = "1gbr0376sfamp0ibhcbxz4vaxr6ipv42y42p5wyksfhz3ls9x5ph";
+  };
 
-        inherit rev sha256 dependencies;
-      };
+  kubernetes = {
+    "6a47bd" = dhall-kubernetes.overridePackage {
+      name   = "dhall-kubernetes-6a47bd";
+      rev    = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4";
+      sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh";
+    };
+
+    "4ad581" = dhall-kubernetes.overridePackage {
+      name   = "dhall-kubernetes-4ad581";
+      rev    = "4ad58156b7fdbbb6da0543d8b314df899feca077";
+      sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0";
+    };
+
+    "fee24c" = dhall-kubernetes.overridePackage {
+      name   = "dhall-kubernetes-fee24c";
+      rev    = "fee24c0993ba0b20190e2fdb94e386b7fb67252d";
+      sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk";
+    };
+  };
 
 in
-  lib.mapAttrs makeDhallPackages {
-    "0.11.1" =
-      let
-        k8s_6a47bd = dhall-kubernetes.override {
-          rev    = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4";
-          sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh";
-        };
+  buildDhallGitHubPackage {
+    name   = "dhall-packages-0.11.1";
+    owner  = "EarnestResearch";
+    repo   = "dhall-packages";
+    file   = "package.dhall";
+    rev    = "8d228f578fbc7bb16c04a7c9ac8c6c7d2e13d1f7";
+    sha256 = "1v4y1x13lxy6cxf8xqc6sb0mc4mrd4frkxih95v9q2wxw4vkw2h7";
 
-        k8s_4ad581 = dhall-kubernetes.override {
-          rev    = "4ad58156b7fdbbb6da0543d8b314df899feca077";
-          sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0";
-        };
-
-        k8s_fee24c = dhall-kubernetes.override {
-          rev    = "fee24c0993ba0b20190e2fdb94e386b7fb67252d";
-          sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk";
-        };
-
-      in
-        { rev    = "8d228f578fbc7bb16c04a7c9ac8c6c7d2e13d1f7";
-          sha256 = "1v4y1x13lxy6cxf8xqc6sb0mc4mrd4frkxih95v9q2wxw4vkw2h7";
-
-          dependencies = [
-            (k8s_6a47bd.override { file = "1.14/package.dhall"; })
-            (k8s_6a47bd.override { file = "1.15/package.dhall"; })
-            (k8s_6a47bd.override { file = "1.16/package.dhall"; })
-            (k8s_4ad581.override { file = "types.dhall"; })
-            (k8s_fee24c.override { file = "types/io.k8s.api.core.v1.ServiceSpec.dhall"; })
-            (k8s_fee24c.override { file = "types/io.k8s.api.core.v1.PodTemplateSpec.dhall"; })
-            Prelude."12.0.0"
-            (Prelude."12.0.0".override { file = "JSON/package.dhall"; })
-            (Prelude."12.0.0".override { file = "JSON/Type"; })
-            (Prelude."12.0.0".override { file = "Map/Type"; })
-          ];
-        };
+    dependencies = [
+      (kubernetes."6a47bd".overridePackage { file = "1.14/package.dhall"; })
+      (kubernetes."6a47bd".overridePackage { file = "1.15/package.dhall"; })
+      (kubernetes."6a47bd".overridePackage { file = "1.16/package.dhall"; })
+      (kubernetes."4ad581".overridePackage { file = "types.dhall"; })
+      (kubernetes."fee24c".overridePackage { file = "types/io.k8s.api.core.v1.ServiceSpec.dhall"; })
+      (kubernetes."fee24c".overridePackage { file = "types/io.k8s.api.core.v1.PodTemplateSpec.dhall"; })
+      Prelude_12_0_0
+      (Prelude_12_0_0.overridePackage { file = "JSON/package.dhall"; })
+      (Prelude_12_0_0.overridePackage { file = "JSON/Type"; })
+      (Prelude_12_0_0.overridePackage { file = "Map/Type"; })
+    ];
   }
diff --git a/pkgs/development/dhall-modules/lib.nix b/pkgs/development/dhall-modules/lib.nix
new file mode 100644
index 000000000000..c1993d0af020
--- /dev/null
+++ b/pkgs/development/dhall-modules/lib.nix
@@ -0,0 +1,25 @@
+{ lib }:
+
+let
+  # This is essentially the same thing as `lib.makeOverridable`, except storing
+  # the override method in a method named `overridePackage` so that it's not
+  # shadowed by the `override` method added by `callPackage`
+  makePackageOverridable = f: args:
+    let
+      result = lib.makeOverridable f args;
+
+      copyArgs = g: lib.setFunctionArgs g (lib.functionArgs f);
+
+      overrideWith =
+        update: args // (if lib.isFunction update then update args else update);
+
+      overridePackage =
+        copyArgs (update: makePackageOverridable f (overrideWith update));
+
+    in
+      result // { inherit overridePackage; };
+
+in
+  lib // {
+    inherit makePackageOverridable;
+  }
diff --git a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix
index b4401a85d141..0c182b25d573 100644
--- a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix
+++ b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix
@@ -5,7 +5,7 @@
 # the `file`
 #
 # This function is used by `dhall-to-nixpkgs` when given a directory
-lib.makeOverridable
+lib.makePackageOverridable
   ( { # Arguments passed through to `buildDhallPackage`
       name
     , dependencies ? []
diff --git a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix
index 9289e9b656d3..bdb958fb8bd7 100644
--- a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix
+++ b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix
@@ -1,7 +1,7 @@
 { buildDhallPackage, fetchFromGitHub, lib }:
 
 # This function is used by `dhall-to-nixpkgs` when given a GitHub repository
-lib.makeOverridable
+lib.makePackageOverridable
   ( { # Arguments passed through to `buildDhallPackage`
       name
     , dependencies ? []
diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix
index 9d4801e9dc5c..c1c2c5f0e3bb 100644
--- a/pkgs/top-level/dhall-packages.nix
+++ b/pkgs/top-level/dhall-packages.nix
@@ -8,16 +8,6 @@ let
     let
       callPackage = newScope self;
 
-      prefer = version: path:
-        let
-          packages = callPackage path { };
-
-        in
-          packages."${version}".overrideAttrs (_: {
-              passthru = packages;
-            }
-          );
-
       buildDhallPackage =
         callPackage ../development/interpreters/dhall/build-dhall-package.nix { };
 
@@ -34,14 +24,16 @@ let
           buildDhallDirectoryPackage
         ;
 
+        lib = import ../development/dhall-modules/lib.nix { inherit lib; };
+
         dhall-kubernetes =
-          prefer "3.0.0" ../development/dhall-modules/dhall-kubernetes.nix;
+          callPackage ../development/dhall-modules/dhall-kubernetes.nix { };
 
         dhall-packages =
-          prefer "0.11.1" ../development/dhall-modules/dhall-packages.nix;
+          callPackage ../development/dhall-modules/dhall-packages.nix { };
 
         Prelude =
-          prefer "13.0.0" ../development/dhall-modules/Prelude.nix;
+          callPackage ../development/dhall-modules/Prelude.nix { };
       };
 
 in

From 9b5b1d2bfa8edfd18935c5b8965712c0d9a389f1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 10:31:30 +0000
Subject: [PATCH 2090/3942] jackett: 0.16.1964 -> 0.16.2131

---
 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 27f816b269ac..a2ae37efe896 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jackett";
-  version = "0.16.1964";
+  version = "0.16.2131";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "06mj9pahziwm77nqjiqcbg3zfxkjy7sp15h84iqcxp0lpz0w2z55";
+    sha256 = "1689w80cjji7wq1x3sgkpmx0n543mqkzvhb3hdmz6f66h479hcpk";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From fe1568fa24106e01b056845010f2ad6ce5fd108f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 11 Nov 2020 11:22:13 +0100
Subject: [PATCH 2091/3942] nextcloud-client: remove myself from the maintainer
 list

---
 pkgs/applications/networking/nextcloud-client/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 64bcf5f6838a..bfc928cfbc60 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -64,7 +64,7 @@ mkDerivation rec {
     description = "Nextcloud themed desktop client";
     homepage = "https://nextcloud.com";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ caugner ma27 ];
+    maintainers = with maintainers; [ caugner ];
     platforms = platforms.linux;
   };
 }

From fba4c99f4f211f041f66c7e584ed3362aac2555f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 11 Nov 2020 12:02:02 +0100
Subject: [PATCH 2092/3942] davfs2: 1.5.6 -> 1.6.0

---
 ...the-setuid-wrapped-umount-is-invoked.patch | 42 +++++++++++++++++++
 pkgs/tools/filesystems/davfs2/default.nix     | 22 +++-------
 2 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch

diff --git a/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch b/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch
new file mode 100644
index 000000000000..0e31725936fa
--- /dev/null
+++ b/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch
@@ -0,0 +1,42 @@
+From 56873cf29974ff0dfc1ba1afb7022ce49e300835 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Wed, 11 Nov 2020 11:58:25 +0100
+Subject: [PATCH 2/2] Make sure that the setuid-wrapped `umount` is invoked
+
+---
+ src/dav_fuse.c     | 2 +-
+ src/umount_davfs.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/dav_fuse.c b/src/dav_fuse.c
+index 734bc1f..4501433 100644
+--- a/src/dav_fuse.c
++++ b/src/dav_fuse.c
+@@ -187,7 +187,7 @@ dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time,
+             unmounting = 1;
+             pid_t pid = fork();
+             if (pid == 0) {
+-                execl("/bin/umount", "umount", "-il", mountpoint, NULL);
++                execl("@wrapperDir@/umount", "umount", "-il", mountpoint, NULL);
+                 _exit(EXIT_FAILURE);
+             }
+         }
+diff --git a/src/umount_davfs.c b/src/umount_davfs.c
+index b7019c3..75e3b4b 100644
+--- a/src/umount_davfs.c
++++ b/src/umount_davfs.c
+@@ -122,9 +122,9 @@ main(int argc, char *argv[])
+ 
+     char *umount_command = NULL;
+     if (mpoint) {
+-        umount_command = ne_concat("umount -i '", mpoint, "'", NULL);
++        umount_command = ne_concat("@wrapperDir@/umount -i '", mpoint, "'", NULL);
+     } else {
+-        umount_command = ne_concat("umount -i '", argv[optind], "'", NULL);
++        umount_command = ne_concat("@wrapperDir@/umount -i '", argv[optind], "'", NULL);
+         error(0, 0,
+               _("\n"
+                 "  can't evaluate PID file name;\n"
+-- 
+2.28.0
+
diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix
index 4f818ed213b7..02536a13d15b 100644
--- a/pkgs/tools/filesystems/davfs2/default.nix
+++ b/pkgs/tools/filesystems/davfs2/default.nix
@@ -1,42 +1,32 @@
 { stdenv
 , fetchurl
 , fetchpatch
-, autoreconfHook
 , neon
 , procps
 , substituteAll
 , zlib
+, wrapperDir ? "/run/wrappers/bin"
 }:
 
 stdenv.mkDerivation rec {
-  name = "davfs2-1.5.6";
+  name = "davfs2-1.6.0";
 
   src = fetchurl {
     url = "mirror://savannah/davfs2/${name}.tar.gz";
-    sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21";
+    sha256 = "sha256-LmtnVoW9kXdyvmDwmZrgmMgPef8g3BMej+xFR8u2O1A=";
   };
 
-  nativeBuildInputs = [
-    autoreconfHook # neon-0.31.patch requires reconfiguration
-  ];
-
   buildInputs = [ neon zlib ];
 
   patches = [
-    ./isdir.patch
     ./fix-sysconfdir.patch
     (substituteAll {
       src = ./0001-umount_davfs-substitute-ps-command.patch;
       ps = "${procps}/bin/ps";
     })
-
-    # Fix build with neon 0.31
-    # http://savannah.nongnu.org/bugs/?58101
-    (fetchpatch {
-      name = "neon-0.31.patch";
-      url = "http://savannah.nongnu.org/bugs/download.php?file_id=48737";
-      sha256 = "117x9rql6wk230pl1nram3pp8svll9wzfs5nf407z4jnrdr1zm0j";
-      extraPrefix = ""; # empty means add 'a/' and 'b/'
+    (substituteAll {
+      src = ./0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch;
+      inherit wrapperDir;
     })
   ];
 

From 3f41f8b24e6b47a45c0e983a08213e420074dbd1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 11 Nov 2020 12:02:43 +0100
Subject: [PATCH 2093/3942] unison: 2.51.2 -> 2.51.3

---
 .../sync/unison/4.08-compatibility.patch      | 52 -------------------
 .../networking/sync/unison/default.nix        | 10 +---
 .../networking/sync/unison/lablgtk.patch      | 31 -----------
 3 files changed, 2 insertions(+), 91 deletions(-)
 delete mode 100644 pkgs/applications/networking/sync/unison/4.08-compatibility.patch
 delete mode 100644 pkgs/applications/networking/sync/unison/lablgtk.patch

diff --git a/pkgs/applications/networking/sync/unison/4.08-compatibility.patch b/pkgs/applications/networking/sync/unison/4.08-compatibility.patch
deleted file mode 100644
index a6921b516f07..000000000000
--- a/pkgs/applications/networking/sync/unison/4.08-compatibility.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001
-From: Jaap Boender <jaapb@kerguelen.org>
-Date: Thu, 21 Mar 2019 12:26:51 +0000
-Subject: [PATCH] Compatibility with OCaml 4.08
-
----
- src/files.ml                 | 2 +-
- src/recon.ml                 | 4 ++--
- src/system/system_generic.ml | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/files.ml b/src/files.ml
-index ba42ad57..5babf21e 100644
---- a/src/files.ml
-+++ b/src/files.ml
-@@ -722,7 +722,7 @@ let get_files_in_directory dir =
-   with End_of_file ->
-     dirh.System.closedir ()
-   end;
--  Sort.list (<) !files
-+  List.sort String.compare !files
- 
- let ls dir pattern =
-   Util.convertUnixErrorsToTransient
-diff --git a/src/recon.ml b/src/recon.ml
-index 5ed358d7..0df2cfe4 100644
---- a/src/recon.ml
-+++ b/src/recon.ml
-@@ -651,8 +651,8 @@ let rec reconcile
- 
- (* Sorts the paths so that they will be displayed in order                   *)
- let sortPaths pathUpdatesList =
--  Sort.list
--    (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
-+  List.sort
-+    Path.compare
-     pathUpdatesList
- 
- let rec enterPath p1 p2 t =
-diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml
-index ed8e18f3..0e28a781 100755
---- a/src/system/system_generic.ml
-+++ b/src/system/system_generic.ml
-@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
- let chmod = Unix.chmod
- let chown = Unix.chown
- let utimes = Unix.utimes
--let link = Unix.link
-+let link s d = Unix.link s d
- let openfile = Unix.openfile
- let opendir f =
-   let h = Unix.opendir f in
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index 7b7318544c56..36e803509262 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -6,12 +6,12 @@ let inherit (ocamlPackages) ocaml lablgtk; in
 stdenv.mkDerivation (rec {
 
   pname = "unison";
-  version = "2.51.2";
+  version = "2.51.3";
   src = fetchFromGitHub {
     owner = "bcpierce00";
     repo = "unison";
     rev = "v${version}";
-    sha256 = "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq";
+    sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";
   };
 
   buildInputs = [ ocaml makeWrapper ncurses ];
@@ -27,12 +27,6 @@ stdenv.mkDerivation (rec {
     "UISTYLE=${if enableX11 then "gtk2" else "text"}"
   ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false";
 
-  patches = [
-    # NOTE: Only needed until Unison 2.51.3 is released!
-    ./4.08-compatibility.patch
-    ./lablgtk.patch
-  ];
-
   preInstall = "mkdir -p $out/bin";
 
   postInstall = if enableX11 then ''
diff --git a/pkgs/applications/networking/sync/unison/lablgtk.patch b/pkgs/applications/networking/sync/unison/lablgtk.patch
deleted file mode 100644
index 20c1db1b1166..000000000000
--- a/pkgs/applications/networking/sync/unison/lablgtk.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 Mon Sep 17 00:00:00 2001
-From: daviddavid <geiger.david68210@gmail.com>
-Date: Mon, 26 Feb 2018 13:36:36 +0100
-Subject: [PATCH] Fix for lablgtk >= 2.18.6
-
----
- src/uigtk2.ml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/uigtk2.ml b/src/uigtk2.ml
-index 2ba6d79..04c4da4 100644
---- a/src/uigtk2.ml
-+++ b/src/uigtk2.ml
-@@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_string "italic")
- (* This does not work with the current version of Lablgtk, due to a bug
- let icon =
-   GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true
--    (Gpointer.region_of_string Pixmaps.icon_data)
-+    (Gpointer.region_of_bytes Pixmaps.icon_data)
- *)
- let icon =
-   let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
-   Gpointer.blit
--    (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
-+    (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
-   p
- 
- let leftPtrWatch =
--- 
-2.25.1
-

From 51c69db0aa751225cd9a334092351427f1f2b498 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 12:50:00 +0000
Subject: [PATCH 2094/3942] libamqpcpp: 4.2.1 -> 4.3.8

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

diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index 02aa7be623ca..b074cba5c81d 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libamqpcpp";
-  version = "4.2.1";
+  version = "4.3.8";
 
   src = fetchFromGitHub {
     owner = "CopernicaMarketingSoftware";
     repo = "AMQP-CPP";
     rev = "v${version}";
-    sha256 = "0993vlvpa3vwg7qb5vl3jcnqwb8dqqfrxg4gg8mz7icnhx57kj34";
+    sha256 = "1cgpk1v8wgsdyl2gx1bk1nrqflc17ciy0wdg3rgzgy0avl4yghww";
   };
 
   buildInputs = [ openssl ];

From 292de46c5b9c3f42088d3de0d74a2aedf3755fee Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Sun, 30 Aug 2020 12:12:45 +0200
Subject: [PATCH 2095/3942] Document conventions around adding new maintainers

Adding them to `maintainers/maintainer-list` in a separate commit.

Co-Authored-By: Pavol Rusnak <pavol@rusnak.io>
Co-Authored-By: Atemu <atemu.main@gmail.com>
Co-Authored-By: Kevin Cox <kevincox@kevincox.ca>
---
 doc/stdenv/meta.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/stdenv/meta.xml b/doc/stdenv/meta.xml
index 9cef9360002c..67c7a23c32e0 100644
--- a/doc/stdenv/meta.xml
+++ b/doc/stdenv/meta.xml
@@ -190,7 +190,7 @@ hello-2.3  A program that produces a familiar, friendly greeting
     <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>.
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link>. There is no restriction to becoming a maintainer, just add each new maintainer to that list in a separate commit titled 'maintainers: add alice', and reference maintainers with <literal>maintainers = with lib.maintainers; [ alice bob ]</literal>.
      </para>
     </listitem>
    </varlistentry>

From 49f3ff28b51dc62abdc822ce68781991b71266fc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 13:07:28 +0000
Subject: [PATCH 2096/3942] libde265: 1.0.7 -> 1.0.8

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

diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix
index 9d88a61ad10f..6c2f3b8e1071 100644
--- a/pkgs/development/libraries/libde265/default.nix
+++ b/pkgs/development/libraries/libde265/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.7";
+  version = "1.0.8";
   pname = "libde265";
 
   src = fetchFromGitHub {
     owner = "strukturag";
     repo = "libde265";
     rev = "v${version}";
-    sha256 = "0x7g9771457z49qvzpk4iswfhq018i0mzsflv9gg8if5hjqhfdp0";
+    sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 5a3b2c18e743ea77aac4a7e6de82deb4e8acbae2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 13:11:35 +0000
Subject: [PATCH 2097/3942] libdeflate: 1.6 -> 1.7

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

diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix
index 25fa4db38f6b..f0bf60cdfb88 100644
--- a/pkgs/development/libraries/libdeflate/default.nix
+++ b/pkgs/development/libraries/libdeflate/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeflate";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "ebiggers";
     repo = "libdeflate";
     rev = "v${version}";
-    sha256 = "1rhichmalqz7p1hiwvn6y0isralpbf0w5nyjp4lg0asawkxy9cww";
+    sha256 = "1hnn1yd9s5h92xs72y73izak47kdz070kxkw3kyz2d3az6brfdgh";
   };
 
   postPatch = ''

From 8928b4bfe9c73e293b32c5a5d138a35817e97d94 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 11 Nov 2020 14:14:22 +0100
Subject: [PATCH 2098/3942] weechat: 2.9 -> 3.0

---
 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 ea00669006bd..404810e5f245 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -27,12 +27,12 @@ let
   in
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
-      version = "2.9";
+      version = "3.0";
       pname = "weechat";
 
       src = fetchurl {
         url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
-        sha256 = "12h4m4ag8cdab7q6f5n357mfg0fdayab1gcikncjkkid3bjd4r4g";
+        sha256 = "0ciddvyhyp38fnfsi1plj3z8d76f28lbzbxib2857vw7rzyqfcky";
       };
 
       outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;

From a79902f23e9c84a0b6c389f75a91f103e1ef0e5e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 11 Nov 2020 14:21:40 +0100
Subject: [PATCH 2099/3942] microcodeIntel: 20200616 -> 20201110

Release notes:
https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20201110

Security advisories:
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00381.html
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00389.html

Fixes: CVE-2020-8694, CVE-2020-8695, CVE-2020-8696, CVE-2020-8698
---
 pkgs/os-specific/linux/microcode/intel.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 475288a0b6f6..8a975b4fb3d2 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "microcode-intel";
-  version = "20200616";
+  version = "20201110";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "Intel-Linux-Processor-Microcode-Data-Files";
     rev = "microcode-${version}";
-    sha256 = "13jrs8hwh7dhjjb9kncb8lk199afaxglkh1cfisl6zca1h36g563";
+    sha256 = "03a89mh5f8zwwg750pahr25qagkjh2rw27bm28vp0586hrd36ll6";
   };
 
   nativeBuildInputs = [ iucode-tool libarchive ];

From 11114dac1063c4395e031da761797fd0a764eed8 Mon Sep 17 00:00:00 2001
From: Moritz Scheuren <m.scheuren@oyra.eu>
Date: Mon, 9 Nov 2020 22:07:09 +0100
Subject: [PATCH 2100/3942] portfolio: 0.49.0 -> 0.49.2

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

diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix
index e186b3e3ce50..163e61215768 100644
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "PortfolioPerformance";
-  version = "0.49.0";
+  version = "0.49.2";
 
   src = fetchurl {
     url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "1b3dll6ljkj2wyiy3ns9cgxqgjjr60dfrqrbbwdbndqj4pzfvbyf";
+    sha256 = "0c2ixzwbc094wqc2lyrh3w1azswg6xz3wdh8l4lbkiw02s9czhhn";
   };
 
   nativeBuildInputs = [

From 999e24d2472213a76e549beb9a823fe380b70483 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 11 Nov 2020 13:16:25 +0800
Subject: [PATCH 2101/3942] vista-fonts: new sha256

---
 pkgs/data/fonts/vista-fonts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix
index df7a6e5383bf..3a5ee616a0ef 100644
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/pkgs/data/fonts/vista-fonts/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip, cabextract}:
+{ stdenv, fetchzip, cabextract }:
 
 fetchzip {
   name = "vista-fonts-1";
@@ -21,7 +21,7 @@ fetchzip {
     done
   '';
 
-  sha256 = "1l27zg5jraa16zm11d3qz1w7m6f1ih3xy5avww454ylm50fw6z11";
+  sha256 = "sha256-x7JSXS9Q1fzlJTVR+MAS3f2+cmo/H0s1qkY9FPjx2zI=";
 
   meta = {
     description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)";

From aa96bd294b2ce9852a524e1a88dad2bd50852a0f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 11 Nov 2020 14:33:49 +0100
Subject: [PATCH 2102/3942] gimpPlugins: include GIMP into the scope

So that it can be easily overridden.

Also clean up, update usage comment for this century and remove alias.
---
 .../graphics/gimp/plugins/default.nix         | 50 +++++++++++--------
 pkgs/applications/graphics/gimp/wrapper.nix   |  2 +-
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 6a492580f7d3..84f5abfce063 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -1,12 +1,18 @@
-# install these packages into your profile. Then add
-# ~/.nix-profile/gimp-version-plugins to your plugin list you can find at
-# preferences -> Folders -> Plug-ins
-# same applies for the scripts
+# Use `gimp-with-plugins` package for GIMP with all plug-ins.
+# If you just want a subset of plug-ins, you can specify them explicitly:
+# `gimp-with-plugins.override { plugins = with gimpPlugins; [ gap ]; }`.
+
+{ config, lib, pkgs }:
 
-{ config, pkgs, gimp }:
 let
-  inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub;
-  inherit (gimp) targetPluginDir targetScriptDir;
+  inherit (pkgs) stdenv fetchurl pkg-config intltool glib fetchFromGitHub;
+in
+
+lib.makeScope pkgs.newScope (self:
+
+let
+  # Use GIMP from the scope.
+  inherit (self) gimp;
 
   pluginDerivation = attrs: let
     name = attrs.name or "${attrs.pname}-${attrs.version}";
@@ -14,12 +20,12 @@ let
     prePhases = "extraLib";
     extraLib = ''
       installScripts(){
-        mkdir -p $out/${targetScriptDir}/${name};
-        for p in "$@"; do cp "$p" -r $out/${targetScriptDir}/${name}; done
+        mkdir -p $out/${gimp.targetScriptDir}/${name};
+        for p in "$@"; do cp "$p" -r $out/${gimp.targetScriptDir}/${name}; done
       }
       installPlugins(){
-        mkdir -p $out/${targetPluginDir}/${name};
-        for p in "$@"; do cp "$p" -r $out/${targetPluginDir}/${name}; done
+        mkdir -p $out/${gimp.targetPluginDir}/${name};
+        for p in "$@"; do cp "$p" -r $out/${gimp.targetPluginDir}/${name}; done
       }
     '';
 
@@ -30,8 +36,16 @@ let
   // attrs
   // {
       name = "gimp-plugin-${name}";
-      buildInputs = [ gimp gimp.gtk glib ] ++ (attrs.buildInputs or []);
-      nativeBuildInputs = [ pkgconfig intltool ] ++ (attrs.nativeBuildInputs or []);
+      buildInputs = [
+        gimp
+        gimp.gtk
+        glib
+      ] ++ (attrs.buildInputs or []);
+
+      nativeBuildInputs = [
+        pkg-config
+        intltool
+      ] ++ (attrs.nativeBuildInputs or []);
     }
   );
 
@@ -39,10 +53,11 @@ let
     phases = [ "extraLib" "installPhase" ];
     installPhase = "installScripts ${src}";
   } // attrs);
-
 in
+{
+  # Allow overriding GIMP package in the scope.
+  inherit (pkgs) gimp;
 
-stdenv.lib.makeScope pkgs.newScope (self: with self; {
   gap = pluginDerivation {
     /* menu:
        Video
@@ -201,9 +216,4 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
       sha256 = "c14a8f4f709695ede3f77348728a25b3f3ded420da60f3f8de3944b7eae98a49";
     };
   };
-
-} // stdenv.lib.optionalAttrs (config.allowAliases or true) {
-
-  resynthesizer2 = resynthesizer;
-
 })
diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix
index 841728d3a294..7e8ce913f022 100644
--- a/pkgs/applications/graphics/gimp/wrapper.nix
+++ b/pkgs/applications/graphics/gimp/wrapper.nix
@@ -2,7 +2,7 @@
 
 let
 allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins);
-selectedPlugins = if plugins == null then allPlugins else plugins;
+selectedPlugins = lib.filter (pkg: pkg != gimpPlugins.gimp) (if plugins == null then allPlugins else plugins);
 extraArgs = map (x: x.wrapArgs or "") selectedPlugins;
 versionBranch = stdenv.lib.versions.majorMinor gimp.version;
 

From 13e4f189a1db7d1d9090d5da60d0eec09f18fdbf Mon Sep 17 00:00:00 2001
From: Jeff Labonte <grimsleepless@protonmail.com>
Date: Mon, 9 Nov 2020 23:59:15 -0500
Subject: [PATCH 2103/3942] brave: 1.15.76 -> 1.16.72

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

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index fc4b5521b0d9..f0abf2a79fe3 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -86,11 +86,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.15.76";
+  version = "1.16.72";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "3b054584c2272a9eeb9029f754cabaf4804db295fd0e6b84ead680b08af38d48";
+    sha256 = "0gcmbqkrkdrjj0cc34bp56iqawhyfz46k7q8x82pw9b1rbjp1x6k";
   };
 
   dontConfigure = true;

From e39bc29e1ec8e5ec450037b4884edd469e164b9c Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 11 Nov 2020 14:48:05 +0100
Subject: [PATCH 2104/3942] asciigraph: init at 0.5.1 (#103184)

---
 pkgs/tools/text/asciigraph/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/text/asciigraph/default.nix

diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/tools/text/asciigraph/default.nix
new file mode 100644
index 000000000000..79d8c9079c79
--- /dev/null
+++ b/pkgs/tools/text/asciigraph/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "asciigraph";
+  version = "0.5.1";
+
+  goPackagePath = "github.com/guptarohit/asciigraph";
+
+  src = fetchFromGitHub {
+    owner = "guptarohit";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0aqf64b5d5lf9scvxdx5f3p0vvx5s59mrvr6hcjljg1prksah9ns";
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/guptarohit/asciigraph";
+    description = "Lightweight ASCII line graph ╭┈╯ command line app";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.mmahut ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a3696909418..68e2ec2ce199 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8654,6 +8654,8 @@ in
 
   arachne-pnr = callPackage ../development/compilers/arachne-pnr { };
 
+  asciigraph = callPackage ../tools/text/asciigraph { };
+
   asn1c = callPackage ../development/compilers/asn1c { };
 
   aspectj = callPackage ../development/compilers/aspectj { };

From cca6c43b255d7cf18d62b090d41c9e7c228c152a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 14:01:31 +0000
Subject: [PATCH 2105/3942] libwacom: 1.5 -> 1.6

---
 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 7c71dc4388b8..6ae116356f8a 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libwacom";
-  version = "1.5";
+  version = "1.6";
 
   outputs = [ "out" "dev" ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "linuxwacom";
     repo = "libwacom";
     rev = "libwacom-${version}";
-    sha256 = "1a3qkzpkag1vqd2xl7b7f2b8kbg1y1g6gg5ydzb1ppyqw3zdjf9x";
+    sha256 = "10wphlk5v591mlvcyr6bjqp60zmhbpqg3lmsq9dza738v97ws8ci";
   };
 
   nativeBuildInputs = [ pkgconfig meson ninja doxygen ];

From cfbe7995dea49e744bcf6b4aa431d158db1464e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 14:07:26 +0000
Subject: [PATCH 2106/3942] lightburn: 0.9.16 -> 0.9.18

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

diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix
index da5caeff3a00..6d5e9d9b9476 100644
--- a/pkgs/applications/graphics/lightburn/default.nix
+++ b/pkgs/applications/graphics/lightburn/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   pname = "lightburn";
-  version = "0.9.16";
+  version = "0.9.18";
 
   nativeBuildInputs = [
     p7zip
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
-    sha256 = "0xmpglfzff3jpxbr304czsa24fbp497b69yd8kjkjdp2cd0l70qc";
+    sha256 = "0inl6zmc1726gmj85jbvq3ra4zphd2ikhrnqphgy2b0c72yh4pf7";
   };
 
   buildInputs = [

From 193e8bc722727f61763b88d1ecf444c0d7cf1f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 11 Nov 2020 14:52:21 +0100
Subject: [PATCH 2107/3942] knot-dns: 3.0.1 -> 3.0.2

https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.2
---
 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 61faf3bd4029..9eb3fc4e74c8 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
 
 stdenv.mkDerivation rec {
   pname = "knot-dns";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "97af6724b04308f691392c80d75564ff8b246871f2f59c4f03cede3c4dd401bb";
+    sha256 = "f813a5e53263ef51d0415508e1f7d33cfbb75a139ccb10a344ae5a91689933fb";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 5eb3f97e5700297c834d7e5211708d429bffeec8 Mon Sep 17 00:00:00 2001
From: Christian Mainka <Christian.Mainka@rub.de>
Date: Wed, 11 Nov 2020 15:23:11 +0100
Subject: [PATCH 2108/3942] joplin-desktop: 1.2.6 -> 1.3.18

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

diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix
index be103f3543a8..de68e90a4f14 100644
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "joplin-desktop";
-  version = "1.2.6";
+  version = "1.3.18";
   name = "${pname}-${version}";
 
   inherit (stdenv.hostPlatform) system;
@@ -16,8 +16,8 @@ let
   src = fetchurl {
     url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
     sha256 = {
-      x86_64-linux = "14svzfhszb0pnsajbydsic0rdc64zp6csqjp6k2p2i20jf0c0im6";
-      x86_64-darwin = "1wdv8idnvn5567xdmsaa3f7skv48i9q6jqd4pgv8pz1zkhiqj0wi";
+      x86_64-linux = "1dldy137ia8qxhf7d5xzq5slm12bhnmw4kx7fm37n1ajjdcn5sf7";
+      x86_64-darwin = "0zm9vhxlfs1ldd8za4yha54psqwl0al4hzdfxjfp7ir98i9a4cj7";
     }.${system} or throwSystem;
   };
 

From ca9dcfb1c4f77e9e01a732282ab437873d6843c7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 14:29:18 +0000
Subject: [PATCH 2109/3942] lokalise2-cli: 2.6.0 -> 2.6.1

---
 pkgs/tools/misc/lokalise2-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix
index 19dafb4cef12..a823973bf9a4 100644
--- a/pkgs/tools/misc/lokalise2-cli/default.nix
+++ b/pkgs/tools/misc/lokalise2-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "lokalise2-cli";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "lokalise";
     repo = "lokalise-cli-2-go";
     rev = "v${version}";
-    sha256 = "15lwy2rrb5d5r0asa51bgjr42pcknk6znx6qirw9s924i8dbzp6s";
+    sha256 = "0a3bah5xa2vmxgqkqihbvcc8rpl64yhw3i0c30lhfdfza0jisaql";
   };
 
   vendorSha256 = "06y1v0v1kkbd5vxa8h0qvasm9ibwwhz0v4x03k3nb5xlwn0x9jx8";

From ef990c190598106d6c795f136c78d71c7e35ecaf Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 14:13:45 +0000
Subject: [PATCH 2110/3942] =?UTF-8?q?oh-my-zsh:=202020-11-09=20=E2=86=92?=
 =?UTF-8?q?=202020-11-10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 462a9107ba95..5dab6e470cb5 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
 
 stdenv.mkDerivation rec {
-  version = "2020-11-09";
+  version = "2020-11-10";
   pname = "oh-my-zsh";
-  rev = "eef04c62c2dfbd81f9fee6752e3b7e0b9c3bf617";
+  rev = "dc4692b53e4a1dc512d405f36f2d2af30c66304b";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "15gisyawg9g8xan5dawzj3jmqnwdiki95dxjgwyswfks2vcfakl6";
+    sha256 = "00jm6vvjq265injnrd6mbmq2dm3w8wmw3g7ibhv9spi2r3zb6400";
   };
 
   installPhase = ''

From 3be8a4483a69961aae6b1404f8a3b64b04d99b0f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 09:16:36 -0500
Subject: [PATCH 2111/3942] linux_latest-libre: 17744 -> 17762

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

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 1e8514e9c2c8..a6ef21fe917f 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "17744";
-    sha256 = "120jf6d1xrpwf8yfqzfqp8a1189lca0si8fxci16sf4bdg5q1had";
+    rev = "17762";
+    sha256 = "1fj77j9x20w8xwk2xmga625dv81c145gj01z8yxz8i3x2cxwccrs";
   }
 , ...
 }:

From 8e364d518b34d0b4aca0b6e3079afa9c0b527ea3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 09:16:44 -0500
Subject: [PATCH 2112/3942] linux/hardened/patches/4.14: 4.14.204.a ->
 4.14.205.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index f97474556ce9..bcd7271016cb 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,8 +1,8 @@
 {
     "4.14": {
-        "name": "linux-hardened-4.14.204.a.patch",
-        "sha256": "1vwja9mqycw3322p8a896l9mkxvzym6r9q17zfgwpqi3kvr9k74h",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.204.a/linux-hardened-4.14.204.a.patch"
+        "name": "linux-hardened-4.14.205.a.patch",
+        "sha256": "0a9llmpkz4rs1xr574iiyjvll1i9fd6y5k0gxqniz2x2m2nl1mkz",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.205.a/linux-hardened-4.14.205.a.patch"
     },
     "4.19": {
         "name": "linux-hardened-4.19.155.a.patch",

From 362d24c7ee13d70bab71002f8f417fe3f06f706f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 09:16:46 -0500
Subject: [PATCH 2113/3942] linux/hardened/patches/4.19: 4.19.155.a ->
 4.19.156.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index bcd7271016cb..63e942c4ee0d 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -5,9 +5,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.205.a/linux-hardened-4.14.205.a.patch"
     },
     "4.19": {
-        "name": "linux-hardened-4.19.155.a.patch",
-        "sha256": "0jrvd9yws7cym08j28r7wv3i83zlk5z0vl0l1mibak04h43mibgf",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.155.a/linux-hardened-4.19.155.a.patch"
+        "name": "linux-hardened-4.19.156.a.patch",
+        "sha256": "1f3di0fvsfs9p549nna67i108v3730hc5mjyh8lk07s2bbigi09z",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.156.a/linux-hardened-4.19.156.a.patch"
     },
     "5.4": {
         "name": "linux-hardened-5.4.75.a.patch",

From 7420461d12fe55603a9493fb2251889e5f7b3232 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 09:16:48 -0500
Subject: [PATCH 2114/3942] linux/hardened/patches/5.4: 5.4.75.a -> 5.4.76.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 63e942c4ee0d..79da6279571a 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -10,9 +10,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.156.a/linux-hardened-4.19.156.a.patch"
     },
     "5.4": {
-        "name": "linux-hardened-5.4.75.a.patch",
-        "sha256": "169m2a3wm5lsyzp7cp8nvxarhgcnan41ap7k5r7jx7x1frx2vzxm",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.75.a/linux-hardened-5.4.75.a.patch"
+        "name": "linux-hardened-5.4.76.a.patch",
+        "sha256": "0b47id64vi55s7lmyasmvhwbfcv9cjwfhw9g4lf220g0rnl6h8jm",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.76.a/linux-hardened-5.4.76.a.patch"
     },
     "5.8": {
         "name": "linux-hardened-5.8.18.a.patch",

From e7fa508f85e000f9f98b43fdb2e82b9f0909744b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 09:16:50 -0500
Subject: [PATCH 2115/3942] linux/hardened/patches/5.9: 5.9.6.a -> 5.9.7.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 79da6279571a..e2df369456a8 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -20,8 +20,8 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch"
     },
     "5.9": {
-        "name": "linux-hardened-5.9.6.a.patch",
-        "sha256": "1h25jkbp0yz2jfmbnwrldd1rcpag8mbf8dv6kc79j7qg1agafxkn",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.6.a/linux-hardened-5.9.6.a.patch"
+        "name": "linux-hardened-5.9.7.a.patch",
+        "sha256": "1sb4rsd3yfh49aqg5j24zav9x38c44q7d9pyx6pb8pl368rd26l4",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.7.a/linux-hardened-5.9.7.a.patch"
     }
 }

From e4d8eb1c300a80deb057590a85a1ea15117321ee Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 09:19:51 -0500
Subject: [PATCH 2116/3942] sbt-extras: Add update script

---
 .../build-managers/sbt-extras/default.nix     | 53 +++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index 49d18d9e8575..038c88dff7e9 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -1,12 +1,10 @@
-{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }:
+{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript
+, common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused }:
 
-let
+stdenv.mkDerivation rec {
+  pname = "sbt-extras";
   rev = "1e9230f35879ce23cbd8d16add07d2134fd479c9";
   version = "2020-09-24";
-in
-stdenv.mkDerivation {
-  name = "sbt-extras-${version}";
-  inherit version;
 
   src = fetchFromGitHub {
     owner = "paulp";
@@ -26,14 +24,51 @@ stdenv.mkDerivation {
 
     install bin/sbt $out/bin
 
-    wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl ]}
+    wrapProgram $out/bin/sbt --prefix PATH : ${
+      stdenv.lib.makeBinPath [ which curl ]
+    }
   '';
 
+  passthru = {
+    updateScript = writeScript "update.sh" ''
+      #!${stdenv.shell}
+      set -xo errexit
+      PATH=${
+        stdenv.lib.makeBinPath [
+          common-updater-scripts
+          curl
+          cacert
+          git
+          nixfmt
+          nix
+          jq
+          coreutils
+          gnused
+        ]
+      }
+
+      oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
+      latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')"
+
+      if [ ! "null" = "$latestSha" ]; then
+        nixpkgs="$(git rev-parse --show-toplevel)"
+        default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix"
+        latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')"
+        update-source-version ${pname} "$latestSha" --version-key=rev
+        update-source-version ${pname} "$latestDate" --ignore-same-hash
+        nixfmt "$default_nix"
+      else
+        echo "${pname} is already up-to-date"
+      fi
+    '';
+  };
+
   meta = {
-    description = "A more featureful runner for sbt, the simple/scala/standard build tool";
+    description =
+      "A more featureful runner for sbt, the simple/scala/standard build tool";
     homepage = "https://github.com/paulp/sbt-extras";
     license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
+    maintainers = with stdenv.lib.maintainers; [ nequissimus puffnfresh ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

From 6134eafe085685ff22796e250127a8c70424b183 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 14:23:43 +0000
Subject: [PATCH 2117/3942] =?UTF-8?q?sbt-extras:=202020-09-24=20=E2=86=92?=
 =?UTF-8?q?=202020-11-08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/tools/build-managers/sbt-extras/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index 038c88dff7e9..77075f3915d7 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -3,14 +3,14 @@
 
 stdenv.mkDerivation rec {
   pname = "sbt-extras";
-  rev = "1e9230f35879ce23cbd8d16add07d2134fd479c9";
-  version = "2020-09-24";
+  rev = "a36958f50bf8806c13f7c67ab0f13936e189351b";
+  version = "2020-11-08";
 
   src = fetchFromGitHub {
     owner = "paulp";
     repo = "sbt-extras";
     inherit rev;
-    sha256 = "1k6vknjjbhr5jfpiyh2yzayn2ziqi1bb862l1q2786q59161ij3j";
+    sha256 = "1xp5r7ia8r2nr4g76wp0mnh95d5ha0dblsqvgicq240dgc28360r";
   };
 
   dontBuild = true;

From b9c505b7bf909180f69a0a03f42656a3c44e21f8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 09:31:57 -0500
Subject: [PATCH 2118/3942] sbt-extras: Add test

---
 nixos/tests/all-tests.nix                        |  1 +
 nixos/tests/sbt-extras.nix                       | 16 ++++++++++++++++
 .../tools/build-managers/sbt-extras/default.nix  |  5 ++++-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/sbt-extras.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index d4aff486225d..868f15a1da37 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -315,6 +315,7 @@ in
   samba = handleTest ./samba.nix {};
   sanoid = handleTest ./sanoid.nix {};
   sbt = handleTest ./sbt.nix {};
+  sbt-extras = handleTest ./sbt-extras.nix {};
   scala = handleTest ./scala.nix {};
   sddm = handleTest ./sddm.nix {};
   service-runner = handleTest ./service-runner.nix {};
diff --git a/nixos/tests/sbt-extras.nix b/nixos/tests/sbt-extras.nix
new file mode 100644
index 000000000000..d63113f943e4
--- /dev/null
+++ b/nixos/tests/sbt-extras.nix
@@ -0,0 +1,16 @@
+import ./make-test-python.nix ({ pkgs, ...} : {
+  name = "sbt-extras";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  machine = { pkgs, ... }:
+    {
+      environment.systemPackages = [ pkgs.sbt-extras ];
+    };
+
+  testScript =
+    ''
+      machine.succeed("(sbt -h)")
+    '';
+})
diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index 77075f3915d7..291c3539f35e 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript
-, common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused }:
+, common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused
+, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "sbt-extras";
@@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
+    tests = { inherit (nixosTests) sbt-extras; };
+
     updateScript = writeScript "update.sh" ''
       #!${stdenv.shell}
       set -xo errexit

From 0251996c69b9d57b5234f9549075b9de269d13d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 14:36:05 +0000
Subject: [PATCH 2119/3942] lsof: 4.93.2 -> 4.94.0

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

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 274577c4a4c5..e5988b1d5a9a 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -4,7 +4,7 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system)
 
 stdenv.mkDerivation rec {
   pname = "lsof";
-  version = "4.93.2";
+  version = "4.94.0";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   buildInputs = [ ncurses ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "lsof-org";
     repo = "lsof";
     rev = version;
-    sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv";
+    sha256 = "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp";
   };
 
   patches = [ ./no-build-info.patch ];

From 280e27327d4990245d418cd10a9d14cfd6df6f05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 11 Nov 2020 15:33:22 +0100
Subject: [PATCH 2120/3942] knot-resolver: 5.1.3 -> 5.2.0

https://lists.nic.cz/pipermail/knot-resolver-users/2020/000318.html

NixOS service: we'll probably want to switch listenDoH
to the new 'doh2' kind, but let me leave that for later.
---
 pkgs/servers/dns/knot-resolver/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 9f54d2f5fa30..aabfcd9796e4 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -16,11 +16,11 @@ lua = luajitPackages;
 
 unwrapped = stdenv.mkDerivation rec {
   pname = "knot-resolver";
-  version = "5.1.3";
+  version = "5.2.0";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
-    sha256 = "20cd829027e39a9f7d993894e3640e886825b492d9ac1a744ac5616cc101458b";
+    sha256 = "8824267ca3331fa06d418c1351b68c648da0af121bcbc84c6e08f5b1e28d9433";
   };
 
   outputs = [ "out" "dev" ];
@@ -67,6 +67,7 @@ unwrapped = stdenv.mkDerivation rec {
   postInstall = ''
     rm "$out"/lib/libkres.a
     rm "$out"/lib/knot-resolver/upgrade-4-to-5.lua # not meaningful on NixOS
+    rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
   '';
 
   doInstallCheck = with stdenv; hostPlatform == buildPlatform;

From fad425cfbb125faa45c0508c19aff21f6faee5f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 22 Oct 2020 10:36:13 +0000
Subject: [PATCH 2121/3942] cmake: 3.18.2 -> 3.18.4

---
 pkgs/development/tools/build-managers/cmake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 010f1d9c6c2c..01c97305807f 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
           + lib.optionalString useNcurses "-cursesUI"
           + lib.optionalString withQt5 "-qt5UI"
           + lib.optionalString useQt4 "-qt4UI";
-  version = "3.18.2";
+  version = "3.18.4";
 
   src = fetchurl {
     url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
     # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
-    sha256 = "0zhxsnxm5d8wdarz2gs3r41r1dfrnh35ki75fa684gaxfzy40kjx";
+    sha256 = "0xsg5lw3i4bw610q987cwz3iz06x3lrbbaa2mnzyr4kaiqsn2z2r";
   };
 
   patches = [

From 44e2d0d402f7faa0601fb675f0fd1817eeb28b79 Mon Sep 17 00:00:00 2001
From: Christian Mainka <Christian.Mainka@rub.de>
Date: Wed, 11 Nov 2020 15:51:41 +0100
Subject: [PATCH 2122/3942] open-vm-tools: 11.1.5 -> 11.2.0

---
 .../virtualization/open-vm-tools/default.nix  |  9 ++---
 .../open-vm-tools/find_gdk_pixbuf_xlib.patch  | 12 -------
 .../open-vm-tools/recognize_nixos.patch       | 33 -------------------
 3 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch
 delete mode 100644 pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch

diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index 033fe79368b7..4cdce2172a21 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "open-vm-tools";
-  version = "11.1.5";
+  version = "11.2.0";
 
   src = fetchFromGitHub {
     owner  = "vmware";
     repo   = "open-vm-tools";
     rev    = "stable-${version}";
-    sha256 = "0i8p28hd5wgiay4lgmd9fid5ickwygy6w3xpfzzy8v9z04xc5bg7";
+    sha256 = "125y3zdhj353dmmjmssdaib2zp1jg5aiqmvpgkrzhnh5nx2icfv6";
   };
 
   sourceRoot = "${src.name}/open-vm-tools";
@@ -23,11 +23,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ]
       ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
 
-  patches = [
-    ./recognize_nixos.patch
-    ./find_gdk_pixbuf_xlib.patch #See https://github.com/vmware/open-vm-tools/pull/438
-  ];
-
   postPatch = ''
      # Build bugfix for 10.1.0, stolen from Arch PKGBUILD
      mkdir -p common-agent/etc/config
diff --git a/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch b/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch
deleted file mode 100644
index 6606c50e77d9..000000000000
--- a/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/appUtil/Makefile.am b/lib/appUtil/Makefile.am
-index a0d8e391..899cd4e9 100644
---- a/lib/appUtil/Makefile.am
-+++ b/lib/appUtil/Makefile.am
-@@ -21,4 +21,6 @@ libAppUtil_la_SOURCES =
- libAppUtil_la_SOURCES += appUtil.c
- libAppUtil_la_SOURCES += appUtilX11.c
- 
--AM_CFLAGS = @GTK_CPPFLAGS@
-+AM_CFLAGS =
-+AM_CFLAGS += @GTK_CPPFLAGS@
-+AM_CFLAGS += @GDK_PIXBUF_XLIB2_CPPFLAGS@
diff --git a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
deleted file mode 100644
index 95b0951b5853..000000000000
--- a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/lib/include/guest_os.h b/lib/include/guest_os.h
-index 868dec68..0b9a2ad7 100644
---- a/lib/include/guest_os.h
-+++ b/lib/include/guest_os.h
-@@ -278,6 +278,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
- #define STR_OS_MANDRAKE_FULL      "Mandrake Linux"
- #define STR_OS_MANDRIVA           "mandriva"
- #define STR_OS_MKLINUX            "MkLinux"
-+#define STR_OS_NIXOS              "NixOS"
- #define STR_OS_NOVELL             "nld9"
- #define STR_OS_NOVELL_FULL        "Novell Linux Desktop 9"
- #define STR_OS_ORACLE6            "oraclelinux6"
-diff --git a/lib/misc/hostinfoPosix.c b/lib/misc/hostinfoPosix.c
-index 348a67ec..5f8beb2b 100644
---- a/lib/misc/hostinfoPosix.c
-+++ b/lib/misc/hostinfoPosix.c
-@@ -203,6 +203,7 @@ static const DistroInfo distroArray[] = {
-    { "Mandrake",           "/etc/mandrake-release"      },
-    { "Mandriva",           "/etc/mandriva-release"      },
-    { "MkLinux",            "/etc/mklinux-release"       },
-+   { "NixOS",              "/etc/os-release"            },
-    { "Novell",             "/etc/nld-release"           },
-    { "OracleLinux",        "/etc/oracle-release"        },
-    { "Photon",             "/etc/lsb-release"           },
-@@ -865,6 +866,8 @@ HostinfoGetOSShortName(const char *distro,      // IN: full distro name
-       }
-    } else if (strstr(distroLower, "mandrake")) {
-       Str_Strcpy(distroShort, STR_OS_MANDRAKE, distroShortSize);
-+   } else if (strstr(distroLower, "nixos")) {
-+      Str_Strcpy(distroShort, STR_OS_NIXOS, distroShortSize);
-    } else if (strstr(distroLower, "turbolinux")) {
-       Str_Strcpy(distroShort, STR_OS_TURBO, distroShortSize);
-    } else if (strstr(distroLower, "sun")) {

From 8946ff8d71313fbe9634e242149f1e3fb6aa824b Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Thu, 10 Sep 2020 19:06:20 +0900
Subject: [PATCH 2123/3942] darwin/darwin-stubs: init

---
 .../darwin/darwin-stubs/default.nix           | 20 +++++++++++++++++++
 pkgs/stdenv/darwin/default.nix                | 10 ++++++----
 pkgs/top-level/darwin-packages.nix            |  2 ++
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/os-specific/darwin/darwin-stubs/default.nix

diff --git a/pkgs/os-specific/darwin/darwin-stubs/default.nix b/pkgs/os-specific/darwin/darwin-stubs/default.nix
new file mode 100644
index 000000000000..f7f083e32f43
--- /dev/null
+++ b/pkgs/os-specific/darwin/darwin-stubs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  pname = "darwin-stubs";
+  version = "10.12";
+
+  src = fetchFromGitHub {
+    owner = "NixOS";
+    repo = "darwin-stubs";
+    rev = "80b3d4a57d3454c975eefd984c804dbd76f04ef2";
+    sha256 = "0sslg4rmskms8ixixv1gvnrvvvmn723vbfjj6mcn24fj2ncg38y7";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir $out
+    cp -vr stubs/$version/* $out
+  '';
+}
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index fbd5f1cf3f01..f07b1ee73b87 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -301,7 +301,8 @@ in rec {
 
       darwin = super.darwin // {
         inherit (darwin)
-          binutils dyld Libsystem xnu configd ICU libdispatch libclosure launchd CF;
+          binutils dyld Libsystem xnu configd ICU libdispatch libclosure
+          launchd CF darwin-stubs;
       };
     };
   in with prevStage; stageFun 2 prevStage {
@@ -345,7 +346,8 @@ in rec {
 
       darwin = super.darwin // {
         inherit (darwin)
-          dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale;
+          dyld Libsystem xnu configd libdispatch libclosure launchd libiconv
+          locale darwin-stubs;
       };
     };
   in with prevStage; stageFun 3 prevStage {
@@ -403,7 +405,7 @@ in rec {
       in { inherit tools libraries; } // tools // libraries);
 
       darwin = super.darwin // rec {
-        inherit (darwin) dyld Libsystem libiconv locale;
+        inherit (darwin) dyld Libsystem libiconv locale darwin-stubs;
 
         CF = super.darwin.CF.override {
           inherit libxml2;
@@ -502,7 +504,7 @@ in rec {
       inherit cc;
 
       darwin = super.darwin // {
-        inherit (prevStage.darwin) CF;
+        inherit (prevStage.darwin) CF darwin-stubs;
         xnu = super.darwin.xnu.override { inherit (prevStage) python3; };
       };
     });
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index affb4ae92c19..91f694b40bb9 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -41,6 +41,8 @@ in
 
   DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
 
+  darwin-stubs = callPackage ../os-specific/darwin/darwin-stubs { };
+
   maloader = callPackage ../os-specific/darwin/maloader {
     inherit (darwin) opencflite;
   };

From fd33052999bd2bb30ed8751a38d4bade17d07d01 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 18 Sep 2020 17:10:03 +0900
Subject: [PATCH 2124/3942] darwin/print-reexports: nixpkgs-specific utility to
 inspect .tbd files

Used during bootstrap to check that re-exported libraries are not
dangling.
---
 .../apple-sdk/print-reexports/default.nix     |  17 +++
 .../darwin/apple-sdk/print-reexports/main.c   | 129 ++++++++++++++++++
 pkgs/top-level/darwin-packages.nix            |   2 +
 3 files changed, 148 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-sdk/print-reexports/main.c

diff --git a/pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix b/pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix
new file mode 100644
index 000000000000..85e11096f06a
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, libyaml }:
+
+stdenv.mkDerivation {
+  name = "print-reexports";
+  src = stdenv.lib.sourceFilesBySuffices ./. [".c"];
+
+  buildInputs = [ libyaml ];
+
+  buildPhase = ''
+    $CC -lyaml -o $name main.c
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv $name $out/bin
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-sdk/print-reexports/main.c b/pkgs/os-specific/darwin/apple-sdk/print-reexports/main.c
new file mode 100644
index 000000000000..7ad793eb4252
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-sdk/print-reexports/main.c
@@ -0,0 +1,129 @@
+#include <stdio.h>
+#include <sys/errno.h>
+#include <yaml.h>
+
+static yaml_node_t *get_mapping_entry(yaml_document_t *document, yaml_node_t *mapping, const char *name) {
+  if (!mapping) {
+    fprintf(stderr, "get_mapping_entry: mapping is null\n");
+    return NULL;
+  }
+
+  for (
+      yaml_node_pair_t *pair = mapping->data.mapping.pairs.start;
+      pair < mapping->data.mapping.pairs.top;
+      ++pair
+  ) {
+    yaml_node_t *key = yaml_document_get_node(document, pair->key);
+
+    if (!key) {
+      fprintf(stderr, "get_mapping_entry: key (%i) is null\n", pair->key);
+      return NULL;
+    }
+
+    if (key->type != YAML_SCALAR_NODE) {
+      fprintf(stderr, "get_mapping_entry: key is not a scalar\n");
+      return NULL;
+    }
+
+    if (strncmp((const char *)key->data.scalar.value, name, key->data.scalar.length) != 0) {
+      continue;
+    }
+
+    return yaml_document_get_node(document, pair->value);
+  }
+
+  return NULL;
+}
+
+static int emit_reexports(yaml_document_t *document) {
+  yaml_node_t *root = yaml_document_get_root_node(document);
+
+  yaml_node_t *exports = get_mapping_entry(document, root, "exports");
+
+  if (!exports) {
+    fprintf(stderr, "emit_reexports: no exports found\n");
+    return 0;
+  }
+
+  if (exports->type != YAML_SEQUENCE_NODE) {
+    fprintf(stderr, "emit_reexports, value is not a sequence\n");
+    return 0;
+  }
+
+  for (
+      yaml_node_item_t *export = exports->data.sequence.items.start;
+      export < exports->data.sequence.items.top;
+      ++export
+  ) {
+    yaml_node_t *export_node = yaml_document_get_node(document, *export);
+
+    yaml_node_t *reexports = get_mapping_entry(document, export_node, "re-exports");
+
+    if (!reexports) {
+      continue;
+    }
+
+    for (
+        yaml_node_item_t *reexport = reexports->data.sequence.items.start;
+        reexport < reexports->data.sequence.items.top;
+        ++reexport
+    ) {
+      yaml_node_t *val = yaml_document_get_node(document, *reexport);
+
+      if (val->type != YAML_SCALAR_NODE) {
+        fprintf(stderr, "item is not a scalar\n");
+        return 0;
+      }
+
+      fwrite(val->data.scalar.value, val->data.scalar.length, 1, stdout);
+      putchar('\n');
+    }
+  }
+
+  return 1;
+}
+
+int main(int argc, char **argv) {
+  int result = 0;
+
+  if (argc != 2) {
+    fprintf(stderr, "Invalid usage\n");
+    result = 2;
+    goto done;
+  }
+
+  FILE *f = fopen(argv[1], "r");
+  if (!f) {
+    perror("opening input file");
+    result = errno;
+    goto done;
+  }
+
+  yaml_parser_t yaml_parser;
+  if (!yaml_parser_initialize(&yaml_parser)) {
+    fprintf(stderr, "Failed to initialize yaml parser\n");
+    result = 1;
+    goto err_file;
+  }
+
+  yaml_parser_set_input_file(&yaml_parser, f);
+
+  yaml_document_t yaml_document;
+
+  if(!yaml_parser_load(&yaml_parser, &yaml_document)) {
+    fprintf(stderr, "Failed to load yaml file\n");
+    result = 1;
+    goto err_yaml;
+  }
+
+  emit_reexports(&yaml_document);
+
+err_yaml:
+  yaml_parser_delete(&yaml_parser);
+
+err_file:
+  fclose(f);
+
+done:
+  return result;
+}
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 91f694b40bb9..ff94d8126e04 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -43,6 +43,8 @@ in
 
   darwin-stubs = callPackage ../os-specific/darwin/darwin-stubs { };
 
+  print-reexports = callPackage ../os-specific/darwin/apple-sdk/print-reexports { };
+
   maloader = callPackage ../os-specific/darwin/maloader {
     inherit (darwin) opencflite;
   };

From b176ad95463252e9699ed1d397c3eebf787554c6 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 18 Sep 2020 17:10:47 +0900
Subject: [PATCH 2125/3942] darwin/Libsystem: use darwin-stubs

---
 .../Libsystem/default.nix                     | 56 ++++---------------
 1 file changed, 11 insertions(+), 45 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 99d670028032..24526f05f062 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -1,7 +1,7 @@
 { stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo
 , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto
 , copyfile, removefile, libresolv, Libnotify, libplatform, libpthread
-, mDNSResponder, launchd, libutil, hfs, darling }:
+, mDNSResponder, launchd, libutil, hfs, darling, darwin-stubs }:
 
 appleDerivation {
   dontBuild = true;
@@ -88,52 +88,18 @@ appleDerivation {
     # The startup object files
     cp ${Csu}/lib/* $out/lib
 
-    # We can't re-exported libsystem_c and libsystem_kernel directly,
-    # so we link against the central library here.
-    mkdir -p $out/lib/system
-    ld -macosx_version_min 10.7 -arch x86_64 -dylib \
-       -o $out/lib/system/libsystem_c.dylib \
-       /usr/lib/libSystem.dylib \
-       -reexported_symbols_list ${./system_c_symbols}
+    cp -vr \
+      ${darwin-stubs}/usr/lib/libSystem.B.tbd \
+      ${darwin-stubs}/usr/lib/system \
+      $out/lib
 
-    ld -macosx_version_min 10.7 -arch x86_64 -dylib \
-       -o $out/lib/system/libsystem_kernel.dylib \
-       /usr/lib/libSystem.dylib \
-       -reexported_symbols_list ${./system_kernel_symbols}
-
-    # The umbrella libSystem also exports some symbols,
-    # but we don't want to pull in everything from the other libraries.
-    ld -macosx_version_min 10.7 -arch x86_64 -dylib \
-       -o $out/lib/libSystem_internal.dylib \
-       /usr/lib/libSystem.dylib \
-       -reexported_symbols_list ${./system_symbols}
-
-    # We used to determine these impurely based on the host system, but then when we got some 10.12 Hydra boxes,
-    # one of them accidentally built this derivation, referenced libsystem_symptoms.dylib, which doesn't exist on
-    # 10.11, and then broke all subsequent builds on 10.11. By picking a 10.11 compatible subset of the libraries,
-    # we avoid scary impurity issues like that.
-    libs=$(cat ${./reexported_libraries} | grep -v '^#')
-
-    for i in $libs; do
-      if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then
-        args="$args -reexport_library $i"
-      fi
-    done
-
-    ld -macosx_version_min 10.7 -arch x86_64 -dylib \
-       -o $out/lib/libSystem.B.dylib \
-       -compatibility_version 1.0 \
-       -current_version 1226.10.1 \
-       -reexport_library $out/lib/system/libsystem_c.dylib \
-       -reexport_library $out/lib/system/libsystem_kernel.dylib \
-       -reexport_library $out/lib/libSystem_internal.dylib \
-       $args
-
-    ln -s libSystem.B.dylib $out/lib/libSystem.dylib
+    substituteInPlace $out/lib/libSystem.B.tbd \
+      --replace "/usr/lib/system/" "$out/lib/system/"
+    ln -s libSystem.B.tbd $out/lib/libSystem.tbd
 
     # Set up links to pretend we work like a conventional unix (Apple's design, not mine!)
     for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do
-      ln -s libSystem.dylib $out/lib/lib$name.dylib
+      ln -s libSystem.tbd $out/lib/lib$name.tbd
     done
 
     # This probably doesn't belong here, but we want to stay similar to glibc, which includes resolv internally...
@@ -144,13 +110,13 @@ appleDerivation {
     chmod +w $out/lib/libresolv.9.dylib
     install_name_tool \
       -id $out/lib/libresolv.9.dylib \
-      -change "$resolv_libSystem" $out/lib/libSystem.dylib \
+      -change "$resolv_libSystem" /usr/lib/libSystem.dylib \
       $out/lib/libresolv.9.dylib
     ln -s libresolv.9.dylib $out/lib/libresolv.dylib
   '';
 
   meta = with stdenv.lib; {
-    description = "The Mac OS libc/libSystem (impure symlinks to binaries with pure headers)";
+    description = "The Mac OS libc/libSystem (tapi library with pure headers)";
     maintainers = with maintainers; [ copumpkin gridaphobe ];
     platforms   = platforms.darwin;
     license     = licenses.apsl20;

From 03988a5fec4b9fc09e7e868a06116f3d9215b393 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 18 Sep 2020 17:11:11 +0900
Subject: [PATCH 2126/3942] darwin/Security: use darwin-stubs

---
 .../apple-source-releases/Security/boot.nix     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix
index e04142b8b11e..b819057f0c1a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix
@@ -1,4 +1,4 @@
-{ appleDerivation }:
+{ appleDerivation, darwin-stubs }:
 
 appleDerivation {
   phases = [ "unpackPhase" "installPhase" ];
@@ -12,14 +12,15 @@ appleDerivation {
   ];
 
   installPhase = ''
-    ###### IMPURITIES
     mkdir -p $out/Library/Frameworks/Security.framework
-    pushd $out/Library/Frameworks/Security.framework
-    ln -s /System/Library/Frameworks/Security.framework/Security
-    ln -s /System/Library/Frameworks/Security.framework/Resources
-    ln -s /System/Library/Frameworks/Security.framework/PlugIns
-    ln -s /System/Library/Frameworks/Security.framework/XPCServices
-    popd
+
+    ###### IMPURITIES
+    ln -s /System/Library/Frameworks/Security.framework/{Resources,Plugins,XPCServices} \
+      $out/Library/Frameworks/Security.framework
+
+    ###### STUBS
+    cp ${darwin-stubs}/System/Library/Frameworks/Security.framework/Versions/A/Security.tbd \
+      $out/Library/Frameworks/Security.framework
 
     ###### HEADERS
 

From 193c91233c048fcea30f8630daa1a65582c19cb4 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 18 Sep 2020 17:11:21 +0900
Subject: [PATCH 2127/3942] darwin/IOKit: use darwin-stubs

---
 .../apple-source-releases/IOKit/default.nix       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
index 4b82209f176c..a945409ed7a0 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, IOKitSrcs, xnu }:
+{ stdenv, appleDerivation, IOKitSrcs, xnu, darwin-stubs }:
 
 # Someday it'll make sense to split these out into their own packages, but today is not that day.
 appleDerivation {
@@ -14,12 +14,15 @@ appleDerivation {
   ];
 
   installPhase = ''
-    ###### IMPURITIES
     mkdir -p $out/Library/Frameworks/IOKit.framework
-    pushd $out/Library/Frameworks/IOKit.framework
-    ln -s /System/Library/Frameworks/IOKit.framework/IOKit
-    ln -s /System/Library/Frameworks/IOKit.framework/Resources
-    popd
+
+    ###### IMPURITIES
+    ln -s /System/Library/Frameworks/IOKit.framework/Resources \
+      $out/Library/Frameworks/IOKit.framework
+
+    ###### STUBS
+    cp ${darwin-stubs}/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit.tbd \
+      $out/Library/Frameworks/IOKit.framework
 
     ###### HEADERS
 

From 8e6d830423aa6bb70fadd9ee46505ff7e5d52ae7 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 18 Sep 2020 17:12:07 +0900
Subject: [PATCH 2128/3942] darwin/objc4: use darwin-stubs

---
 .../darwin/apple-source-releases/objc4/default.nix           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
index a7cedaaea114..2fc4afa77d9f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
@@ -1,4 +1,4 @@
-{ appleDerivation }:
+{ appleDerivation, darwin-stubs }:
 
 appleDerivation {
   phases = [ "unpackPhase" "installPhase" ];
@@ -14,7 +14,8 @@ appleDerivation {
 
   installPhase = ''
     mkdir -p $out/include/objc $out/lib
-    ln -s /usr/lib/libobjc.dylib $out/lib/libobjc.dylib
+    cp ${darwin-stubs}/usr/lib/libobjc.A.tbd $out/lib/libobjc.A.tbd
+    ln -s libobjc.A.tbd $out/lib/libobjc.tbd
     cp runtime/OldClasses.subproj/List.h $out/include/objc/List.h
     cp runtime/NSObjCRuntime.h $out/include/objc/NSObjCRuntime.h
     cp runtime/NSObject.h $out/include/objc/NSObject.h

From 3456ef6f300d3882890d09f1fd91d39baaf986c4 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 18 Sep 2020 17:12:43 +0900
Subject: [PATCH 2129/3942] darwin/apple-sdk: use darwin stubs

---
 .../darwin/apple-sdk/cf-setup-hook.sh         |   2 +-
 pkgs/os-specific/darwin/apple-sdk/default.nix | 108 +++++++--
 .../darwin/apple-sdk/frameworks.nix           | 228 +++++++++---------
 pkgs/top-level/darwin-packages.nix            |   4 +-
 4 files changed, 211 insertions(+), 131 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh
index 86c241cd0f56..bbf9625e6557 100644
--- a/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh
+++ b/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh
@@ -3,7 +3,7 @@ linkSystemCoreFoundationFramework() {
   # gross! many symbols (such as _OBJC_CLASS_$_NSArray) are defined in system CF, but not
   # in the opensource release
   # if the package needs private headers, we assume they also want to link with system CF
-  NIX_LDFLAGS+=" /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"
+  NIX_LDFLAGS+=" @out@/Library/Frameworks/CoreFoundation.framework/CoreFoundation"
 }
 
 preConfigureHooks+=(linkSystemCoreFoundationFramework)
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 89c13d0b92d7..dbfd3b05fa54 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xar, cpio, pkgs, python3, pbzx, lib }:
+{ stdenv, fetchurl, xar, cpio, pkgs, python3, pbzx, lib, darwin-stubs, print-reexports }:
 
 let version = "10.12"; in
 
@@ -42,7 +42,12 @@ let
       rmdir System
 
       pushd lib
-      ln -s -L /usr/lib/libcups*.dylib .
+      cp ${darwin-stubs}/usr/lib/libcups*.tbd .
+      ln -s libcups.2.tbd      libcups.tbd
+      ln -s libcupscgi.1.tbd   libcupscgi.tbd
+      ln -s libcupsimage.2.tbd libcupsimage.tbd
+      ln -s libcupsmime.1.tbd  libcupsmime.tbd
+      ln -s libcupsppdc.1.tbd  libcupsppdc.tbd
       popd
     '';
 
@@ -53,6 +58,12 @@ let
     };
   };
 
+  mkFrameworkSubs = name: deps:
+  let
+    deps' = deps // { "${name}" = placeholder "out"; };
+    substArgs = lib.concatMap (x: [ "--subst-var-by" x deps'."${x}" ]) (lib.attrNames deps');
+  in lib.escapeShellArgs substArgs;
+
   framework = name: deps: stdenv.mkDerivation {
     name = "apple-framework-${name}";
 
@@ -63,11 +74,14 @@ let
 
     disallowedRequisites = [ sdk ];
 
+    nativeBuildInputs = [ print-reexports ];
+
+    extraTBDFiles = [];
+
     installPhase = ''
       linkFramework() {
         local path="$1"
         local nested_path="$1"
-        local dest="$out/Library/Frameworks/$path"
         if [ "$path" == "JavaNativeFoundation.framework" ]; then
           local nested_path="JavaVM.framework/Versions/A/Frameworks/JavaNativeFoundation.framework"
         fi
@@ -80,21 +94,28 @@ let
           current=A
         fi
 
-        mkdir -p "$dest"
-        pushd "$dest" >/dev/null
+        local dest="$out/Library/Frameworks/$path"
 
-        # Keep track of if this is a child or a child rescue as with
-        # ApplicationServices in the 10.9 SDK
-        local isChild=0
+        mkdir -p "$dest/Versions/$current"
+        pushd "$dest/Versions/$current" >/dev/null
 
         if [ -d "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current/Headers" ]; then
-          isChild=1
           cp -R "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current/Headers" .
         elif [ -d "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" ]; then
           current="$(readlink "/System/Library/Frameworks/$name.framework/Versions/Current")"
           cp -R "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" .
         fi
-        ln -s -L "/System/Library/Frameworks/$nested_path/Versions/$current/$name"
+
+        local tbd_source=${darwin-stubs}/System/Library/Frameworks/$nested_path/Versions/$current
+        if [ "${name}" != "Kernel" ]; then
+          cp -v $tbd_source/*.tbd .
+        fi
+
+        if [ -d "$tbd_source/Libraries" ]; then
+          mkdir Libraries
+          cp -v $tbd_source/Libraries/*.tbd Libraries/
+        fi
+
         ln -s -L "/System/Library/Frameworks/$nested_path/Versions/$current/Resources"
 
         if [ -f "/System/Library/Frameworks/$nested_path/module.map" ]; then
@@ -110,17 +131,45 @@ let
           linkFramework "$childpath"
         done
 
-        if [ -d "$dest/Versions/$current" ]; then
-          mv $dest/Versions/$current/* .
-        fi
+        pushd ../.. >/dev/null
+        ln -s "$current" Versions/Current
+        ln -s Versions/Current/* .
+        popd >/dev/null
 
         popd >/dev/null
       }
 
       linkFramework "${name}.framework"
+
+      # linkFramework is recursive, the rest of the processing is not.
+
+      local tbd_source=${darwin-stubs}/System/Library/Frameworks/${name}.framework
+      for tbd in $extraTBDFiles; do
+        local tbd_dest_dir=$out/Library/Frameworks/${name}.framework/$(dirname "$tbd")
+        mkdir -p "$tbd_dest_dir"
+        cp -v "$tbd_source/$tbd" "$tbd_dest_dir"
+      done
+
+      # Fix and check tbd re-export references
+      find $out -name '*.tbd' | while read tbd; do
+        echo "Fixing re-exports in $tbd"
+        substituteInPlace "$tbd" ${mkFrameworkSubs name deps}
+
+        echo "Checking re-exports in $tbd"
+        print-reexports "$tbd" | while read target; do
+          local expected="''${target%.dylib}.tbd"
+          if ! [ -e "$expected" ]; then
+            echo -e "Re-export missing:\n\t$target\n\t(expected $expected)"
+            echo -e "While processing\n\t$tbd"
+            exit 1
+          else
+            echo "Re-exported target $target ok"
+          fi
+        done
+      done
     '';
 
-    propagatedBuildInputs = deps;
+    propagatedBuildInputs = builtins.attrValues deps;
 
     # don't use pure CF for dylibs that depend on frameworks
     setupHook = ./framework-setup-hook.sh;
@@ -139,6 +188,17 @@ let
       platforms   = platforms.darwin;
     };
   };
+
+  tbdOnlyFramework = name: { private ? true }: stdenv.mkDerivation {
+    name = "apple-framework-${name}";
+    dontUnpack = true;
+    installPhase = ''
+      mkdir -p $out/Library/Frameworks/
+      cp -r ${darwin-stubs}/System/Library/${lib.optionalString private "Private"}Frameworks/${name}.framework \
+        $out/Library/Frameworks
+      # NOTE there's no re-export checking here, this is probably wrong
+    '';
+  };
 in rec {
   libs = {
     xpc = stdenv.mkDerivation {
@@ -168,7 +228,8 @@ in rec {
       installPhase = ''
         mkdir -p $out/include $out/lib
         ln -s "${lib.getDev sdk}/include/Xplugin.h" $out/include/Xplugin.h
-        ln -s "/usr/lib/libXplugin.1.dylib" $out/lib/libXplugin.dylib
+        cp ${darwin-stubs}/usr/lib/libXplugin.1.tbd $out/lib
+        ln -s libXplugin.1.tbd $out/lib/libXplugin.tbd
       '';
     };
 
@@ -193,6 +254,10 @@ in rec {
       ];
     });
 
+    Carbon = stdenv.lib.overrideDerivation super.Carbon (drv: {
+      extraTBDFiles = [ "Versions/A/Frameworks/HTMLRendering.framework/Versions/A/HTMLRendering.tbd" ];
+    });
+
     CoreFoundation = stdenv.lib.overrideDerivation super.CoreFoundation (drv: {
       setupHook = ./cf-setup-hook.sh;
     });
@@ -210,6 +275,10 @@ in rec {
       setupHook = ./private-frameworks-setup-hook.sh;
     });
 
+    IMServicePlugIn = stdenv.lib.overrideDerivation super.IMServicePlugIn (drv: {
+      extraTBDFiles = [ "Versions/A/Frameworks/IMServicePlugInSupport.framework/Versions/A/IMServicePlugInSupport.tbd" ];
+    });
+
     Security = stdenv.lib.overrideDerivation super.Security (drv: {
       setupHook = ./security-setup-hook.sh;
     });
@@ -228,7 +297,14 @@ in rec {
         cp ${lib.getDev sdk}/include/simd/*.h $out/include/simd/
       '';
     });
-  };
+
+    WebKit = stdenv.lib.overrideDerivation super.WebKit (drv: {
+      extraTBDFiles = [
+        "Versions/A/Frameworks/WebCore.framework/Versions/A/WebCore.tbd"
+        "Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd"
+      ];
+    });
+  } // lib.genAttrs [ "ContactsPersistence" "UIFoundation" "GameCenter" ] (x: tbdOnlyFramework x {});
 
   bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix {
     inherit frameworks libs;
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index 02e2421f3472..bf0b134773d5 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -5,123 +5,125 @@
 { frameworks, libs, libobjc, }:
 
 with frameworks; with libs; {
-  AGL                     = [ Carbon OpenGL ];
-  AVFoundation            = [ ApplicationServices CoreGraphics ];
-  AVKit                   = [];
-  Accounts                = [];
-  AddressBook             = [ Carbon ];
-  AppKit                  = [ AudioToolbox AudioUnit Foundation QuartzCore ];
-  AppKitScripting         = [];
-  AppleScriptKit          = [];
-  AppleScriptObjC         = [];
-  AudioToolbox            = [ CoreAudio CoreMIDI ];
-  AudioUnit               = [ AudioToolbox Carbon CoreAudio ];
-  AudioVideoBridging      = [ Foundation ];
-  Automator               = [];
-  CFNetwork               = [];
-  CalendarStore           = [];
-  Cocoa                   = [ AppKit ];
-  Collaboration           = [];
+  AGL                     = { inherit Carbon OpenGL; };
+  AVFoundation            = { inherit ApplicationServices CoreGraphics; };
+  AVKit                   = {};
+  Accounts                = {};
+  AddressBook             = { inherit libobjc Carbon ContactsPersistence; };
+  AppKit                  = { inherit ApplicationServices AudioToolbox AudioUnit Foundation QuartzCore UIFoundation; };
+  AppKitScripting         = {};
+  AppleScriptKit          = {};
+  AppleScriptObjC         = {};
+  AudioToolbox            = { inherit CoreAudio CoreMIDI; };
+  AudioUnit               = { inherit AudioToolbox Carbon CoreAudio; };
+  AudioVideoBridging      = { inherit Foundation; };
+  Automator               = {};
+  CFNetwork               = {};
+  CalendarStore           = {};
+  Cocoa                   = { inherit AppKit CoreData; };
+  Collaboration           = {};
   # Impure version of CoreFoundation, this should not be used unless another
   # framework includes headers that are not available in the pure version.
-  CoreFoundation          = [];
-  CoreAudio               = [ IOKit ];
-  CoreAudioKit            = [ AudioUnit ];
-  CoreData                = [];
-  CoreGraphics            = [ Accelerate IOKit IOSurface SystemConfiguration ];
-  CoreImage               = [];
-  CoreLocation            = [];
-  CoreMIDI                = [];
-  CoreMIDIServer          = [];
-  CoreMedia               = [ ApplicationServices AudioToolbox AudioUnit CoreAudio CoreGraphics CoreVideo ];
-  CoreMediaIO             = [ CoreMedia ];
-  CoreText                = [ CoreGraphics ];
-  CoreVideo               = [ ApplicationServices CoreGraphics IOSurface OpenGL ];
-  CoreWLAN                = [ SecurityFoundation ];
-  DVDPlayback             = [];
-  DirectoryService        = [];
-  DiscRecording           = [ CoreServices IOKit ];
-  DiscRecordingUI         = [];
-  DiskArbitration         = [ IOKit ];
-  EventKit                = [];
-  ExceptionHandling       = [];
-  FWAUserLib              = [];
-  ForceFeedback           = [ IOKit ];
-  Foundation              = [ libobjc CoreFoundation Security ApplicationServices SystemConfiguration ];
-  GLKit                   = [];
-  GLUT                    = [ OpenGL ];
-  GSS                     = [];
-  GameController          = [];
-  GameKit                 = [ Foundation ];
-  Hypervisor              = [];
-  ICADevices              = [ Carbon IOBluetooth ];
-  IMServicePlugIn         = [];
-  IOBluetoothUI           = [ IOBluetooth ];
-  IOKit                   = [];
-  IOSurface               = [ IOKit xpc ];
-  ImageCaptureCore        = [];
-  ImageIO                 = [ CoreGraphics ];
-  InputMethodKit          = [ Carbon ];
-  InstallerPlugins        = [];
-  InstantMessage          = [];
-  JavaFrameEmbedding      = [];
-  JavaNativeFoundation    = [];
-  JavaRuntimeSupport      = [];
-  JavaScriptCore          = [];
-  Kerberos                = [];
-  Kernel                  = [ IOKit ];
-  LDAP                    = [];
-  LatentSemanticMapping   = [ Carbon ];
-  LocalAuthentication     = [];
-  MapKit                  = [];
-  MediaAccessibility      = [ CoreGraphics CoreText QuartzCore ];
-  MediaPlayer             = [];
-  MediaToolbox            = [ AudioToolbox AudioUnit CoreMedia ];
-  Metal                   = [];
-  MetalKit                = [ ModelIO Metal ];
-  ModelIO                 = [ ];
-  NetFS                   = [];
-  OSAKit                  = [ Carbon ];
-  OpenAL                  = [];
-  OpenCL                  = [ IOSurface OpenGL ];
-  OpenGL                  = [];
-  PCSC                    = [ CoreData ];
-  PreferencePanes         = [];
-  PubSub                  = [];
-  QTKit                   = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ];
-  QuickLook               = [ ApplicationServices ];
-  SceneKit                = [];
-  ScreenSaver             = [];
-  Scripting               = [];
-  ScriptingBridge         = [];
-  Security                = [ IOKit ];
-  SecurityFoundation      = [];
-  SecurityInterface       = [ Security ];
-  ServiceManagement       = [ Security ];
-  Social                  = [];
-  SpriteKit               = [];
-  StoreKit                = [];
-  SyncServices            = [];
-  SystemConfiguration     = [ Security ];
-  TWAIN                   = [ Carbon ];
-  Tcl                     = [];
-  VideoDecodeAcceleration = [ CoreVideo ];
-  VideoToolbox            = [ CoreMedia CoreVideo ];
-  WebKit                  = [ ApplicationServices Carbon JavaScriptCore OpenGL ];
+  CoreFoundation          = {};
+  CoreAudio               = { inherit IOKit; };
+  CoreAudioKit            = { inherit AudioUnit; };
+  CoreData                = {};
+  CoreGraphics            = { inherit Accelerate IOKit IOSurface SystemConfiguration; };
+  CoreImage               = {};
+  CoreLocation            = {};
+  CoreMIDI                = {};
+  CoreMIDIServer          = { inherit CoreMIDI; };
+  CoreMedia               = { inherit ApplicationServices AudioToolbox AudioUnit CoreAudio CoreGraphics CoreVideo; };
+  CoreMediaIO             = { inherit CoreMedia; };
+  CoreText                = { inherit CoreGraphics; };
+  CoreVideo               = { inherit ApplicationServices CoreGraphics IOSurface OpenGL; };
+  CoreWLAN                = { inherit SecurityFoundation; };
+  DVDPlayback             = {};
+  DirectoryService        = {};
+  DiscRecording           = { inherit libobjc CoreServices IOKit; };
+  DiscRecordingUI         = {};
+  DiskArbitration         = { inherit IOKit; };
+  EventKit                = {};
+  ExceptionHandling       = {};
+  FWAUserLib              = {};
+  ForceFeedback           = { inherit IOKit; };
+  Foundation              = { inherit libobjc CoreFoundation Security ApplicationServices SystemConfiguration; };
+  GLKit                   = {};
+  GLUT                    = { inherit OpenGL; };
+  GSS                     = {};
+  GameCenter              = {};
+  GameController          = {};
+  GameKit                 = { inherit Cocoa Foundation GameCenter GameController GameplayKit Metal MetalKit ModelIO SceneKit SpriteKit; };
+  GameplayKit             = {};
+  Hypervisor              = {};
+  ICADevices              = { inherit libobjc Carbon IOBluetooth; };
+  IMServicePlugIn         = {};
+  IOBluetoothUI           = { inherit IOBluetooth; };
+  IOKit                   = {};
+  IOSurface               = { inherit IOKit xpc; };
+  ImageCaptureCore        = {};
+  ImageIO                 = { inherit CoreGraphics; };
+  InputMethodKit          = { inherit Carbon; };
+  InstallerPlugins        = {};
+  InstantMessage          = {};
+  JavaFrameEmbedding      = {};
+  JavaNativeFoundation    = {};
+  JavaRuntimeSupport      = {};
+  JavaScriptCore          = { inherit libobjc; };
+  Kerberos                = {};
+  Kernel                  = { inherit IOKit; };
+  LDAP                    = {};
+  LatentSemanticMapping   = { inherit Carbon; };
+  LocalAuthentication     = {};
+  MapKit                  = {};
+  MediaAccessibility      = { inherit CoreGraphics CoreText QuartzCore; };
+  MediaPlayer             = {};
+  MediaToolbox            = { inherit AudioToolbox AudioUnit CoreMedia; };
+  Metal                   = {};
+  MetalKit                = { inherit ModelIO Metal; };
+  ModelIO                 = {};
+  NetFS                   = {};
+  OSAKit                  = { inherit Carbon; };
+  OpenAL                  = {};
+  OpenCL                  = { inherit IOSurface OpenGL; };
+  OpenGL                  = {};
+  PCSC                    = { inherit CoreData; };
+  PreferencePanes         = {};
+  PubSub                  = {};
+  QTKit                   = { inherit CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox; };
+  QuickLook               = { inherit ApplicationServices; };
+  SceneKit                = {};
+  ScreenSaver             = {};
+  Scripting               = {};
+  ScriptingBridge         = {};
+  Security                = { inherit IOKit; };
+  SecurityFoundation      = {};
+  SecurityInterface       = { inherit Security SecurityFoundation; };
+  ServiceManagement       = { inherit Security; };
+  Social                  = {};
+  SpriteKit               = {};
+  StoreKit                = {};
+  SyncServices            = {};
+  SystemConfiguration     = { inherit Security; };
+  TWAIN                   = { inherit Carbon; };
+  Tcl                     = {};
+  VideoDecodeAcceleration = { inherit CoreVideo; };
+  VideoToolbox            = { inherit CoreMedia CoreVideo; };
+  WebKit                  = { inherit libobjc ApplicationServices Carbon JavaScriptCore OpenGL; };
 
   # Umbrellas
-  Accelerate          = [ CoreWLAN IOBluetooth ];
-  ApplicationServices = [ CoreServices CoreText ImageIO ];
-  Carbon              = [ ApplicationServices CoreServices Foundation IOKit Security QuartzCore ];
-  CoreBluetooth       = [];
+  Accelerate          = { inherit CoreWLAN IOBluetooth; };
+  ApplicationServices = { inherit CoreGraphics CoreServices CoreText ImageIO; };
+  Carbon              = { inherit libobjc ApplicationServices CoreServices Foundation IOKit Security QuartzCore; };
+  CoreBluetooth       = {};
   # TODO: figure out which part of the umbrella depends on CoreFoundation and move it there.
-  CoreServices        = [ CFNetwork CoreFoundation CoreAudio CoreData DiskArbitration Security NetFS OpenDirectory ServiceManagement ];
-  IOBluetooth         = [ IOKit ];
-  JavaVM              = [];
-  OpenDirectory       = [];
-  Quartz              = [ QuickLook QTKit ];
-  QuartzCore          = [ ApplicationServices CoreVideo OpenCL CoreImage Metal ];
-  QuickTime           = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
+  CoreServices        = { inherit CFNetwork CoreFoundation CoreAudio CoreData DiskArbitration Security NetFS OpenDirectory ServiceManagement; };
+  IOBluetooth         = { inherit CoreBluetooth IOKit; };
+  JavaVM              = {};
+  OpenDirectory       = {};
+  Quartz              = { inherit QuartzCore QuickLook QTKit; };
+  QuartzCore          = { inherit libobjc ApplicationServices CoreVideo OpenCL CoreImage Metal; };
+  QuickTime           = { inherit ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore; };
 
-  vmnet = [];
+  vmnet = {};
 }
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index ff94d8126e04..6fafe09438cd 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -14,7 +14,9 @@ in
     extraBuildInputs = [];
   };
 
-  apple_sdk = callPackage ../os-specific/darwin/apple-sdk { };
+  apple_sdk = callPackage ../os-specific/darwin/apple-sdk {
+    inherit (darwin) darwin-stubs print-reexports;
+  };
 
   binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
     inherit (darwin) cctools;

From 7bbff896df9c426b00126d810279079f5afd27ac Mon Sep 17 00:00:00 2001
From: meutraa <paul@lost.host>
Date: Wed, 11 Nov 2020 16:21:15 +0000
Subject: [PATCH 2130/3942] androidStudioPackages.stable: 4.1.0.19 -> 4.1.1.0

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index cca7b0b2f41f..51c7ebcc907f 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -9,9 +9,9 @@ let
     inherit buildFHSUserEnv;
   };
   stableVersion = {
-    version = "4.1.0.19"; # "Android Studio 4.1.0"
-    build = "201.6858069";
-    sha256Hash = "sha256-S5Uh/EpjE61l/z4UsPP7UEJ9Rk/hQidVVWX0bg/60gI=";
+    version = "4.1.1.0"; # "Android Studio 4.1.1"
+    build = "201.6953283";
+    sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os=";
   };
   betaVersion = {
     version = "4.1.0.18"; # "Android Studio 4.1 RC 3"

From e66ba6bd4619068541dd0446e2c69f2a7cba08a2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 11 Nov 2020 00:31:55 +0100
Subject: [PATCH 2131/3942] gst_all_1.gst-plugins-bad: fix build on Darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It fails with “Argument list too long” on Darwin,
let’s work around it using strictDeps.

Fixes: https://github.com/NixOS/nixpkgs/issues/103274
---
 pkgs/development/libraries/gstreamer/bad/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 88c9f9a385a1..a29fad8a4c94 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -116,16 +116,18 @@ in stdenv.mkDerivation rec {
     meson
     ninja
     pkgconfig
+    orc # for orcc
     python3
     gettext
     gobject-introspection
   ] ++ optionals stdenv.isLinux [
-    wayland-protocols
+    wayland # for wayland-scanner
   ];
 
   buildInputs = [
     gst-plugins-base
     orc
+    gobject-introspection
     faad2
     libass
     libkate
@@ -179,6 +181,7 @@ in stdenv.mkDerivation rec {
   ] ++ optionals stdenv.isLinux [
     bluez
     wayland
+    wayland-protocols
   ] ++ optionals (!stdenv.isDarwin) [
     # wildmidi requires apple's OpenAL
     # TODO: package apple's OpenAL, fix wildmidi, include on Darwin
@@ -282,6 +285,9 @@ in stdenv.mkDerivation rec {
     "-Dapplemedia=disabled"
   ];
 
+  # Argument list too long
+  strictDeps = true;
+
   postPatch = ''
     patchShebangs \
       scripts/extract-release-date-from-doap-file.py

From dd7b6a5160fa8ad3eee3445e979cbbc2ba75f059 Mon Sep 17 00:00:00 2001
From: IvarWithoutBones <ivar.scholten@protonmail.com>
Date: Mon, 26 Oct 2020 23:18:35 +0100
Subject: [PATCH 2132/3942] pythonPackages.py-multihash: 0.2.3 -> 1.0.0

---
 .../python-modules/py-multihash/default.nix        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix
index 5034f6df4699..1b49ffa15399 100644
--- a/pkgs/development/python-modules/py-multihash/default.nix
+++ b/pkgs/development/python-modules/py-multihash/default.nix
@@ -1,6 +1,6 @@
 { base58
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , isPy27
 , lib
 , morphys
@@ -14,11 +14,13 @@
 
 buildPythonPackage rec {
   pname = "py-multihash";
-  version = "0.2.3";
+  version = "1.0.0";
 
-  src = fetchPypi {
-    inherit pname version ;
-    sha256 = "f0ade4de820afdc4b4aaa40464ec86c9da5cae3a4578cda2daab4b0eb7e5b18d";
+  src = fetchFromGitHub {
+    owner = "multiformats";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "07qglrbgcb8sr9msqw2v7dqj9s4rs6nyvhdnx02i5w6xx5ibzi3z";
   };
 
   nativeBuildInputs = [
@@ -38,6 +40,8 @@ buildPythonPackage rec {
     pytestcov
   ];
 
+  pythonImportsCheck = [ "multihash" ];
+
   disabled = isPy27;
 
   meta = with lib; {

From 0effabb377ce29b9cc815cf650ef647b2da98ef7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 17:13:30 +0000
Subject: [PATCH 2133/3942] musikcube: 0.93.1 -> 0.94.0

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

diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix
index 8fc0616ff73b..5f0eb61a5bea 100644
--- a/pkgs/applications/audio/musikcube/default.nix
+++ b/pkgs/applications/audio/musikcube/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "musikcube";
-  version = "0.93.1";
+  version = "0.94.0";
 
   src = fetchFromGitHub {
     owner = "clangen";
     repo = pname;
     rev = version;
-    sha256 = "05qsxyr7x8l0vlmn4yjg4gglxvcw9raf6vfzvblsl2ngsdsrnizy";
+    sha256 = "0hifyawsr38vsx12aqw38nms4kzbaghihib1r80x56f1jjsdhww0";
   };
 
   nativeBuildInputs = [

From 60e9a17a5ae6a952f767ee39e8ddbd41a75a010e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 11 Nov 2020 16:00:53 +0100
Subject: [PATCH 2134/3942] intel-media-driver: 2.4.0 -> 2.4.1

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

diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index 498265a5a2f0..4130d8cf8b9b 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-media-driver";
-  version = "20.4.0";
+  version = "20.4.1";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "media-driver";
     rev    = "intel-media-${version}";
-    sha256 = "0nah3h3s6hqbgz1wqp5j1grzq0q939wbh4b9d27dmb4wy6ma41sl";
+    sha256 = "1axklxzv85flhv41s8nmp7m4kswnav6qpg8w9przac9ji07rknwl";
   };
 
   cmakeFlags = [

From 63fc8c77ca4ae5c36b02572ada9409d74f571be9 Mon Sep 17 00:00:00 2001
From: Sebastian Bolanos <sebasheston@protonmail.com>
Date: Wed, 11 Nov 2020 11:18:57 -0600
Subject: [PATCH 2135/3942] openethereum: v3.0.1 -> v3.1.0

---
 .../blockchains/openethereum/default.nix      |  8 +++-----
 .../blockchains/openethereum/lock.patch       | 20 -------------------
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/applications/blockchains/openethereum/lock.patch

diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix
index 7d5acc62050d..d5c7884c5cc9 100644
--- a/pkgs/applications/blockchains/openethereum/default.nix
+++ b/pkgs/applications/blockchains/openethereum/default.nix
@@ -10,18 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "openethereum";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "openethereum";
     repo = "openethereum";
     rev = "v${version}";
-    sha256 = "08dkcrga1x18csh6pw6f54x5xwijppyjhg46cf4p452xc1l3a6ir";
+    sha256 = "cs84Zz0nhagGDu5sDFTaFZF3SPEgJU8F4vGX7KLihOM=";
   };
 
-  cargoSha256 = "1xliragihwjfc5qmfm0ng519bw8a28m1w1yqcl9mpk8zywiybaah";
-
-  cargoPatches = [ ./lock.patch ];
+  cargoSha256 = "6suNkHw1BbISb0MkYkUaD+mpUal+kn3y1SFVqzJFqJc=";
 
   LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
   nativeBuildInputs = [
diff --git a/pkgs/applications/blockchains/openethereum/lock.patch b/pkgs/applications/blockchains/openethereum/lock.patch
deleted file mode 100644
index 66709480bb72..000000000000
--- a/pkgs/applications/blockchains/openethereum/lock.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- /nix/store/hv764a65zmfzw5scjhz5839agv10da6x-source/Cargo.lock	1969-12-31 16:00:01.000000000 -0800
-+++ ./Cargo.lock	2020-07-31 21:30:31.146750066 -0700
-@@ -3113,7 +3113,7 @@
- 
- [[package]]
- name = "openethereum"
--version = "3.0.0"
-+version = "3.0.1"
- dependencies = [
-  "ansi_term",
-  "atty",
-@@ -3562,7 +3562,7 @@
- 
- [[package]]
- name = "parity-version"
--version = "3.0.0"
-+version = "3.0.1"
- dependencies = [
-  "parity-bytes",
-  "rlp",

From d7e7fb7e7d1704a69f45085fa2a314f2bc7de1df Mon Sep 17 00:00:00 2001
From: OmnipotentEntity <OmnipotentEntity@gmail.com>
Date: Wed, 11 Nov 2020 12:24:08 -0500
Subject: [PATCH 2136/3942] geant4: 10.6.2 -> 10.6.3 (#103095)

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

diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 2aa53b213a99..dc809d589321 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -48,12 +48,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "10.6.2";
+  version = "10.6.3";
   pname = "geant4";
 
   src = fetchurl{
-    url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p02.tar.gz";
-    sha256 = "0vznm3pjlbihjy1wsxc4gj229k0dzc283wvil2xghyl08vwdpnpc";
+    url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p03.tar.gz";
+    sha256 = "1wzv5xky1pfm7wdfdkvqcaaqlcnsrz35dc7zcrxh8l3j5rki6pqb";
   };
 
   boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}";

From e8226dbef06dfe13913f60f7efbe4e13f686231f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 17:38:20 +0000
Subject: [PATCH 2137/3942] nfpm: 1.8.0 -> 1.10.0

---
 pkgs/tools/package-management/nfpm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
index 2ecc64a09b13..62baff512bb2 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "nfpm";
-  version = "1.8.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0hg15k9bz5iw7mv4m31rg4f5anfiirr3vjvy16z532vwfh05ixw3";
+    sha256 = "1pgdajbphqfn430jwm052czz1d4ynl6n4z2wjzmblv7lwkbh9j3d";
   };
 
-  vendorSha256 = "032l0xrf4ny4ildinxlfjy8sslhcl2krmgnm07dnx999jxlswxym";
+  vendorSha256 = "0x7r7qn4852q57fx5mcrw3aqdydmidk9g0hvj6apj81q77k5svqs";
 
   doCheck = false;
 

From 739b762e5685ed9a252f6793cfd64886ad2b8f6e Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 11 Nov 2020 18:39:04 +0100
Subject: [PATCH 2138/3942] Revert "firefox: set build timeout at eight hours"

The default timeout is 10h on Hydra currently, so this timeout
setting is pointless or counterproductive.
This commit seems to have been made in error
https://github.com/NixOS/nixpkgs/pull/96767#issuecomment-724104413

This reverts commit c57fedb14b27292f6433287740e2eec303363ec3.
---
 pkgs/applications/networking/browsers/firefox/packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index e7dd034a8ac4..de0180834d2f 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -26,7 +26,6 @@ rec {
       broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
                                              # not in `badPlatforms` because cross-compilation on 64-bit machine might work.
       license = lib.licenses.mpl20;
-      timeout = 28800; # eight hours
     };
     updateScript = callPackage ./update.nix {
       attrPath = "firefox-unwrapped";

From ffe4dbf32f4335d9a8f7fc124ff7614fb9413363 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sarah@qtr.dk>
Date: Tue, 18 Aug 2020 15:05:22 +0200
Subject: [PATCH 2139/3942] nixos/tests/zfs: Test boot.zfs.forceImportAll

---
 nixos/tests/zfs.nix | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index 87e6c900c98e..e05cd540227a 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -18,7 +18,7 @@ let
         maintainers = [ adisbladis ];
       };
 
-      machine = { pkgs, ... }: {
+      machine = { pkgs, lib, ... }: {
         virtualisation.emptyDiskImages = [ 4096 ];
         networking.hostId = "deadbeef";
         boot.kernelPackages = kernelPackage;
@@ -26,6 +26,24 @@ let
         boot.zfs.enableUnstable = enableUnstable;
 
         environment.systemPackages = [ pkgs.parted ];
+
+        # Setup regular fileSystems machinery to ensure forceImportAll can be
+        # tested via the regular service units.
+        fileSystems = lib.mkVMOverride {
+          "/forcepool" = {
+            device = "forcepool";
+            fsType = "zfs";
+            options = [ "noauto" ];
+          };
+        };
+
+        # forcepool doesn't exist at first boot, and we need to manually test
+        # the import after tweaking the hostId.
+        systemd.services.zfs-import-forcepool.wantedBy = lib.mkVMOverride [];
+        systemd.targets.zfs.wantedBy = lib.mkVMOverride [];
+        boot.zfs.forceImportAll = true;
+        # /dev/disk/by-id doesn't get populated in the NixOS test framework
+        boot.zfs.devNodes = "/dev/disk/by-uuid";
       };
 
       testScript = ''
@@ -57,6 +75,21 @@ let
             "zpool destroy rpool",
             "udevadm settle",
         )
+
+        with subtest("boot.zfs.forceImportAll works"):
+            machine.succeed(
+                "rm /etc/hostid",
+                "zgenhostid deadcafe",
+                "zpool create forcepool /dev/vdb1 -O mountpoint=legacy",
+            )
+            machine.shutdown()
+            machine.start()
+            machine.succeed("udevadm settle")
+            machine.fail("zpool import forcepool")
+            machine.succeed(
+                "systemctl start zfs-import-forcepool.service",
+                "mount -t zfs forcepool /tmp/mnt",
+            )
       '' + extraTest;
 
     };

From a4010e0580fed8afe7d3d5cb53c3b2319c718792 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sarah@qtr.dk>
Date: Tue, 18 Aug 2020 15:05:56 +0200
Subject: [PATCH 2140/3942] nixos/zfs: Respect forceImportAll in import service

---
 nixos/modules/tasks/filesystems/zfs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 9ca7c6fb3431..8589797e0bbf 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -507,6 +507,7 @@ in
               Type = "oneshot";
               RemainAfterExit = true;
             };
+            environment.ZFS_FORCE = optionalString cfgZfs.forceImportAll "-f";
             script = (importLib {
               # See comments at importLib definition.
               zpoolCmd="${packages.zfsUser}/sbin/zpool";

From e0d51db401a64b7e69f10bde7221c1d27bed29dc Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sarah@qtr.dk>
Date: Sun, 13 Sep 2020 01:17:37 +0200
Subject: [PATCH 2141/3942] nixos: boot.zfsImportAll = false; by default

Also add 21.03 release note
---
 nixos/doc/manual/release-notes/rl-2103.xml | 9 +++++++++
 nixos/modules/tasks/filesystems/zfs.nix    | 6 +-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 9bff9a745071..62dcbd6184e4 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -151,6 +151,15 @@
       <literal>vim</literal> switched to Python 3, dropping all Python 2 support.
     </para>
    </listitem>
+   <listitem>
+     <para>
+      <link linkend="opt-boot.zfs.forceImportAll">boot.zfs.forceImportAll</link>
+      previously did nothing, but has been fixed. However its default has been
+      changed to <literal>false</literal> to preserve the existing default
+      behaviour. If you have this explicitly set to <literal>true</literal>,
+      please note that your non-root pools will now be forcibly imported.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 8589797e0bbf..7b6c2277741b 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -175,14 +175,10 @@ in
 
       forceImportAll = mkOption {
         type = types.bool;
-        default = true;
+        default = false;
         description = ''
           Forcibly import all ZFS pool(s).
 
-          This is enabled by default for backwards compatibility purposes, but it is highly
-          recommended to disable this option, as it bypasses some of the safeguards ZFS uses
-          to protect your ZFS pools.
-
           If you set this option to <literal>false</literal> and NixOS subsequently fails to
           import your non-root ZFS pool(s), you should manually import each pool with
           "zpool import -f &lt;pool-name&gt;", and then reboot. You should only need to do

From c360d971a29778aa6ff309c27ff1d6acd8f6209d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 17:54:09 +0000
Subject: [PATCH 2142/3942] nix-build-uncached: 1.0.2 -> 1.1.0

---
 pkgs/development/tools/misc/nix-build-uncached/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix
index 6450ee433857..7886c7c450ac 100644
--- a/pkgs/development/tools/misc/nix-build-uncached/default.nix
+++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "nix-build-uncached";
-  version = "1.0.2";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-build-uncached";
     rev = "v${version}";
-    sha256 = "0hjx2gdwzg02fzxhsf7akp03vqj2s7wmcv9xfqn765zbqnljz14v";
+    sha256 = "1v9xyv0hhvfw61k4pbgzrlgy7igl619cangi40fkh7gdvs01dxz4";
   };
 
   vendorSha256 = null;

From 14a6cf25dba1ac87748706e591acc79c08603a91 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 11 Nov 2020 18:56:41 +0100
Subject: [PATCH 2143/3942] trash-cli: 0.17.1.14 -> 0.20.11.7

---
 pkgs/tools/misc/trash-cli/default.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 141cceff24d3..d7354425b7cd 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -3,13 +3,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "trash-cli";
-  version = "0.17.1.14";
+  version = "0.20.11.7";
 
   src = fetchFromGitHub {
     owner = "andreafrancia";
     repo = "trash-cli";
     rev = version;
-    sha256 = "1bqazna223ibqjwbc1wfvfnspfyrvjy8347qlrgv4cpng72n7gfi";
+    sha256 = "0083vagy0jkahb5sw1il7r53ggk45zbjwwjsqd76v7ph3v1awf4v";
   };
 
   patches = [
@@ -19,18 +19,6 @@ python3Packages.buildPythonApplication rec {
       libc = let ext = if stdenv.isDarwin then ".dylib" else ".so.6";
              in "${stdenv.cc.libc}/lib/libc${ext}";
     })
-
-    # Fix build on Python 3.6.
-    (fetchpatch {
-      url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch";
-      sha256 = "0w49rjh433sjfc2cl5a9wlbr6kcn9f1qg905qsyv7ay3ar75wvyp";
-    })
-
-    # Fix listing trashed files over mount points, see https://github.com/andreafrancia/trash-cli/issues/95
-    (fetchpatch {
-      url = "https://github.com/andreafrancia/trash-cli/commit/436dfddb4c2932ba3ff696e4732750b7bdc58461.patch";
-      sha256 = "02pkcz7nj67jbnqpw1943nrv95m8xyjvab4j62fa64r73fagm8m4";
-    })
   ];
 
   checkInputs = with python3Packages; [

From d277dc65a1f36f9f63bcfd0e77f28568231eee37 Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Fri, 25 Sep 2020 11:00:31 +0200
Subject: [PATCH 2144/3942] turbo-geth: init at 2020.11.01

---
 pkgs/applications/blockchains/turbo-geth.nix | 29 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/blockchains/turbo-geth.nix

diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix
new file mode 100644
index 000000000000..163d87ee8881
--- /dev/null
+++ b/pkgs/applications/blockchains/turbo-geth.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "turbo-geth";
+  version = "2020.11.01";
+
+  src = fetchFromGitHub {
+    owner = "ledgerwatch";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0hm8kqd0w231mlclsmsghf15r8pbrs5g064mkpx59qpqzk37lgss";
+  };
+
+  vendorSha256 = "0b7ldrnwkz3r1d4fw95hvvpi3bz56d9v8p2mjzdvlpk5zhl2a37p";
+  runVend = true;
+
+  subPackages = [
+    "cmd/tg"
+    "cmd/restapi"
+    "cmd/rpcdaemon"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/ledgerwatch/turbo-geth/";
+    description = "Ethereum node and geth fork focused on scalability and modularity";
+    license = with licenses; [ lgpl3 gpl3 ];
+    maintainers = with maintainers; [ xwvvvvwx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68e2ec2ce199..185e961a1a34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24986,6 +24986,8 @@ in
 
   tessera = callPackage ../applications/blockchains/tessera.nix { };
 
+  turbo-geth = callPackage ../applications/blockchains/turbo-geth.nix { };
+
   vertcoin  = libsForQt514.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; };
   vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; };
 

From ec5fc9b7a4077c167fcc71812fbac4b04bebdf88 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 12 Nov 2020 03:12:23 +0900
Subject: [PATCH 2145/3942] thunderbird-bin: 78.4.2 -> 78.4.3

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index ec2d3c9af128..9a411d4a82df 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,665 +1,665 @@
 {
-  version = "78.4.2";
+  version = "78.4.3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/af/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/af/thunderbird-78.4.3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "8b1c2e12bd1de45251131d9fe444b06681577cafc019219dac4aa13b3abf989b";
+      sha256 = "03d4e32b23408b003de5347b2a26d9e3e734f7c3e811510ba81114eff80e6fa3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ar/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ar/thunderbird-78.4.3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "708ce9ae434ae78bd21d2c8a608a732d6ebdc88c2cc3c91c748d2b6a4eab24bd";
+      sha256 = "5aefbc61f46d59de19061a0e76949642e254a13867881b40b6bac289791c281e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ast/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ast/thunderbird-78.4.3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "46aadaa73a4e214c016f05eb9e0dc0a3daa6a87fc72988c696bf243d475d0285";
+      sha256 = "1e328339808efed1db23ed372841ff65f64e1bda8e1d4be81fd00039468bbb1f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/be/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/be/thunderbird-78.4.3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "06abeef2331df228ad303d9280d077ef4a74af8658c4ac0147ae59e181dfc42e";
+      sha256 = "f42230768f2907fb3d23a03a56fc20f14ff5ded7b4418debb3e77c4942eb7db8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/bg/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/bg/thunderbird-78.4.3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "3aa13c52a514f5331bf626f9e3138bfe995c6a223559a9fbd6d590858484d9c1";
+      sha256 = "27a72288cbaaaaee6a24a36bb2e463a0426810e97938cbfe012dceb1a3800fd0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/br/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/br/thunderbird-78.4.3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "1f2d9ee7090e96e3e5611011c9fef8389b514dda4edbf47e889019312df6ab5f";
+      sha256 = "fa1b6c891e3d9d097857a08181030e1df2201240ae466c4adc6fc0be0982d002";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ca/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ca/thunderbird-78.4.3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "f48d5d02a04212ca14cd4c175102a0e45483299d8a4615ff96232431c4ffa4a5";
+      sha256 = "6bcc123c7ecccbf42022e302b63683cdf77f6f6f2a615b12c5ea9e6a081fb900";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/cak/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cak/thunderbird-78.4.3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "28b541daeac6aa6274f4185f9471ce8b2a46e18fe55ae1e373246d9f23d78ec6";
+      sha256 = "392cc166ee9be6c5cf8294f727f97cb21b6ad7ebb77d263bba273f02cb15e661";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/cs/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cs/thunderbird-78.4.3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "d4f061ac86da0b6279b81b30c8949cca93aca5b2f90d0e5dafc5cdecc2868e05";
+      sha256 = "60f5ea97e75f965ac0947e51c8cb8e709e5fa8f67ea478babe936032dee5a912";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/cy/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cy/thunderbird-78.4.3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "824c703a570ae23d8e7b86d93baabb193842ac36fbc9d4ec65ae686e3d540de1";
+      sha256 = "93aa92633d2414ad59aedea8b1a820b158a21c042cbfaedd8abd2b5a41e31c5c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/da/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/da/thunderbird-78.4.3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "8dd27d2596346853e3fddab12ad0dabd700c5216310922e768faacb019b5b3d9";
+      sha256 = "dc263e9d186f4ca8cd404b6e5bd13f9d2874e0e2507eaa55e99a6b5ab3b05179";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/de/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/de/thunderbird-78.4.3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "3920c60073ee3066fbe35a1d2c34ab03a7b7e2dfbbe22af97fa32814000f6942";
+      sha256 = "d9dbf07f3c57f688b08f75673074562ad9d4a9b138159f353415d63f9ccac80b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/dsb/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/dsb/thunderbird-78.4.3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "fd09bbf80996e3aaf12dba79c366c4cfff41a0db0cdf7f6ed4d9722fd2623ff1";
+      sha256 = "084ef3ef3628d003c75dea9a9fa5897424e6e564cb18fb5bca33b341c8c511cc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/el/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/el/thunderbird-78.4.3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "a9df959b2df9c381b9881fe3015e654ac82ca441a3cfc25036c1e658401bf810";
+      sha256 = "4e91e7d21d0a3d524de7e41201ce8af58518a7e0292c11fc2961a84e9b7d04fb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/en-CA/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-CA/thunderbird-78.4.3.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "126e6fffa28b9c2a7eb7bb49254786fd0884aba62524dcf7d8352d6542903f77";
+      sha256 = "922220811fb0083e8dc51c7cbd703530acdfeb0e9403d1a0909ba1618db020bf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/en-GB/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-GB/thunderbird-78.4.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "099ef4c54072c6a4a134badd02a51255573e876c8b630c3b9eaecfde997f9e03";
+      sha256 = "090806f6ebf12efbc5c20a920451feeb0d88d1e7366a074553b79080869687c4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/en-US/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-US/thunderbird-78.4.3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "e6041bd8ad2a21f0a8f8d78fd395239f1f41e2948584770673aaa0f3a9978b3e";
+      sha256 = "7fa3769297600c47c54902bac696e718053c48fc02e54698cb05ef81a4eec873";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/es-AR/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/es-AR/thunderbird-78.4.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "d4055f3134cd255f8e91ee2ef012bd4e4443e6db519cb7bf2543d4e193f59f61";
+      sha256 = "51be3a453bb3e3f1353b88ab31fffa3fc0c135cb91facb7807c967a9d4afa659";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/es-ES/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/es-ES/thunderbird-78.4.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "39f3c8e5262b1125f21e2bc0e51d53b09283ef4922a7bbec6146605ea0bd1d51";
+      sha256 = "8828e5ff82e84c5f69afd60ae5dbba445d766e2a2d7fbbcd8f0dc8f255d8fc02";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/et/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/et/thunderbird-78.4.3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "60331d65f98b68397a0d53a08a169b97654aae3d26efe48f494f575e1a51fe13";
+      sha256 = "d58404701341bcd9b859f1afb87cb3340fc4b8334cc9490e8ea21446e3f308eb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/eu/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/eu/thunderbird-78.4.3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "206026522eb361b599dccf433887b1314b554adfea90ee558f36d116ae6c8f70";
+      sha256 = "5570472164329f23d3f0be51911402c2b454ea704419ef16b46b359a2c93e821";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fa/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fa/thunderbird-78.4.3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "88f1421d251e0bc5288f2c8ca333345ec97ca0a86d491b242471d1af82c04776";
+      sha256 = "cc56e14f1fa17e8b4ec9431ae9ada10159bd90bcade39432c647ba401791e3fe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fi/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fi/thunderbird-78.4.3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "4abbc607c3d6ec03a8416636e88ffdfd61fc0b062aa135d14fb3918c284f9ebd";
+      sha256 = "5175e312e8957490b013dd515b84fe4dfcdf57d30c6806f8bdee67caf39659f7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fr/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fr/thunderbird-78.4.3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "406437d8cf7a695b636c3c1005df5a65f174bbb10d0d961ddda08833ee2c808d";
+      sha256 = "5239f8a07f0f6bc4f69b3d4315570dab33c331ab775479a9df39479b71542cc7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fy-NL/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fy-NL/thunderbird-78.4.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "456f51fbef14e1de16fdb3d7c31b6736e0e7b43c509ac38bdb8a88cb4a2de0d9";
+      sha256 = "5747be2c7f9d5463f9c14fd02fd5e66a8f6c4c8adca3a1bf8c3b4333f1ea2adf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ga-IE/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ga-IE/thunderbird-78.4.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "0f1ab856deed39280ab9d6a43afd6f719470d4aafc4404e0662da0e14b64308a";
+      sha256 = "8e15ffc9235742ad88a1ecaf587a178f5aeb0bc57e075b33f792e2d458362ab9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/gd/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/gd/thunderbird-78.4.3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "07f2fc13f34a70d4e6ecc65d465e33f5bcff63196996fe057f8584ef2e7e595c";
+      sha256 = "72f53918cd04e587319d59100da05657a3084f97d70acba7d1ef7b7321add6ff";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/gl/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/gl/thunderbird-78.4.3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "f4cb60a537ffba88823c8c8a60f2c164e62fbba13d448f2931c71e7d98d6abe0";
+      sha256 = "28beb85fe0ea27a659e5063f7094877e906729602ef2e155f0e55e9e9f6d56ad";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/he/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/he/thunderbird-78.4.3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "425a0bd38d231308fa5cac5d362b7818ccfb6b5fc06924ce312433ba4d5bf2b0";
+      sha256 = "718f8605fc8d418c645a0485ce86d97ae1eeded8b776a990e137ced78eb91a68";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hr/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hr/thunderbird-78.4.3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "37d3f14aeed404bad5cab35c256473a5927787f889afee3da112e510999373f9";
+      sha256 = "febadac023152dc30e72026f6df203c8051b65ad4da0c4e7059a14ab0b4b5f37";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hsb/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hsb/thunderbird-78.4.3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "3249467db25d25866a4d1e0acd9a18a26bad13e2ca683df04ca5f8ca19affac3";
+      sha256 = "faaaf4606fde4baca3216ed5801209f13cd1bbf34c9671cfc7a7648bb0ac7351";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hu/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hu/thunderbird-78.4.3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "f3a82c5917757f221ca59c4b6a950991b52b10f2782b1dffe21c7a7ca6a26272";
+      sha256 = "353633956336852193510c8e77251834355c92ec503ab827a389a0dbc21c05bc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hy-AM/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hy-AM/thunderbird-78.4.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "cb917c1ff3fa342a8ad3253a03a1dbb4a417c0bc3cdfd1422ef5ff06dcfcca74";
+      sha256 = "1b5dba6f05ecc8449522d8a54c1d4e7aa5ec7a2e26fafbaefbd754ee3ea5780f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/id/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/id/thunderbird-78.4.3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "1599ddf22093c6a99ccd3ec3e1492e65ce0b5ebdc3a69aafb321ec26f22b6a13";
+      sha256 = "470151868d745ce829f0f38c6377f4ead87be829d43f4383d2e5c3541b93e8d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/is/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/is/thunderbird-78.4.3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "8cb02ca7ce8c28c10aa1f16ed08417342e93da2dd00f15c5a89fd71306f9afb3";
+      sha256 = "e9d6b36beb61445c3f96ffe6e11b238a8539b398d5f3911f2ded7ee96ec0766c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/it/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/it/thunderbird-78.4.3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "16f3c54980e614b20ef6a8c0a09ebe7707e298d753d373da79bb2d52d1cc43b6";
+      sha256 = "95a02afcebb834b14986b8ccd92d5381a8ac64d3ebbba13860ffbd0313a594e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ja/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ja/thunderbird-78.4.3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "e4ec88dd86b46d814232662a4d558361043ac97b348a8fbb2076ec856087be6e";
+      sha256 = "d1c4e2a551a5266839da96b843372e71616346ea00361dccc8e1a62628e6315f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ka/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ka/thunderbird-78.4.3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "9c2a110ed4df58c334b533255c0f3bf46d777960967e46e74f7f376203bf467b";
+      sha256 = "9eb37a69a370b2619724c91c6789471b9ef579190c08363f633f320563dc4df1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/kab/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/kab/thunderbird-78.4.3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "1f5cf7b8a03fb4273d9ce4d657c3a77ac4a26b7716e3bed700e14f05a398163d";
+      sha256 = "bce07886dc5251ef401141d387c926f27f61d13450f35cb9a9cbc8403b43260a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/kk/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/kk/thunderbird-78.4.3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "002ac92fee28c3ec9c05587025eddb4065a842df0430ace7f468ed8f3ec2df27";
+      sha256 = "222647dd8106134d46bbad6dad8638090e5441a64aa2a6725aa5b1d959a2832a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ko/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ko/thunderbird-78.4.3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "277f0fdfbda0d215a03ccd663f0986cf1b0a1c4e68e3ef36e81c8505d6eb7d09";
+      sha256 = "be2346d5a48e5323d5cc8c1077adf054927d8aececd2fb45fc2f5c0a9f0b8dc2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/lt/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/lt/thunderbird-78.4.3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "65b6737b4ff528453bdaf57cc525a74c79899a9563d189123f87db729aa0f529";
+      sha256 = "da5cde252d5e167025fb06861a32b67a2d0f7171c767bdd8c5d2ba9fc90d7739";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ms/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ms/thunderbird-78.4.3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "cd40e14d4dbcf03ea7e5ab672678abc9b3b46c5b67fdbb961928a860c2f3218b";
+      sha256 = "d6ab0652184cbbfe9126a49f61c25fe8852725b88460ad92c37dc1c4d969368f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/nb-NO/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nb-NO/thunderbird-78.4.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "49c9633a0552a704b06df87ea91991017be920684d12f66c72f6795dafd1cd5d";
+      sha256 = "2485cc4df1b1dafd0c5fb7d7723e923e7fea10af1dbf9764d5d7447f38825e49";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/nl/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nl/thunderbird-78.4.3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "4514d79caa1e2b44cafdc9ef06aa54c4708763c888a489d6bdf4473597221316";
+      sha256 = "0795d2ae4364def43056e77106ea19053c3111e2f95758dbb41875071655ba47";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/nn-NO/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nn-NO/thunderbird-78.4.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "f6aab88e4708659658be8cfb457c40533969a261af489a976f4010439a833458";
+      sha256 = "b774035d8bff615646d3b3d73228277531d50309fb5dbf3978346e2b988b2491";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pa-IN/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pa-IN/thunderbird-78.4.3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "10f5a885550f2cbee158fedc7111b96a0f07764b5d6d60004d17c233153f304b";
+      sha256 = "2a38813c8aa0eaef3d2ec0ac379ab5c85d0b8c2df1f6a2d36ae066f7b0445447";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pl/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pl/thunderbird-78.4.3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "1a192c0a9b8ac2f9b18445e69024462b8e95b78bff48014b55dd451e260aaf73";
+      sha256 = "21cdb977bff1f0c07bf913b4feab2075a429b4594760de52ac358538179d9c66";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pt-BR/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pt-BR/thunderbird-78.4.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "b9dc3db4d8cf4fc2b958695f9077c50d48d355e850618320adff179d33a116d0";
+      sha256 = "d903ccd23367c39779ac2cdd3abe636a0f9e72f8d133a567bead8a739e651589";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pt-PT/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pt-PT/thunderbird-78.4.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "0a3887ff46f9ecc1576bda76e1469eed8ef43813ccec25536e2dbae289196bd5";
+      sha256 = "f220a8bc90b05dd796c402aa5e79c62a8aa91a4d80dacbdf57abf77ec51d73b0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/rm/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/rm/thunderbird-78.4.3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "1a13d443c00da4300aaf58d0af0620541de04e02e87218fa0774cad4b2aaa34f";
+      sha256 = "805d08f629e9dda7d6db36bd41dbcc128defe59b4610e4b7d5d47408a07e47b8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ro/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ro/thunderbird-78.4.3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "62bd15566895dc9462b985f2f5e1afcc7057ef4e93f69005b9ebe89821a2a73a";
+      sha256 = "3b09b2c59f32a09938a45270e04740616b2a13f8b8a6f40503650d9b0f72fc35";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ru/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ru/thunderbird-78.4.3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "e0624e745da31cafe1b885393e11622bac6ddd2e3e4c0cd35432eb5e0e57a47c";
+      sha256 = "2022473752da127d2ebe4eef7f834ac5feafe38dedbe64ad30defb8ae69c6ebd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/si/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/si/thunderbird-78.4.3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "46e286fd0913b07ede577514b8e64ce279afd7bda3054b7cba4ec1f9981eef03";
+      sha256 = "dc5166b0b24bd0a9e98f7dfc483a6bff184a4bfffb0eff8a4007b96fe8205254";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sk/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sk/thunderbird-78.4.3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "3ab838c25d5e10d318705bed69e690d287e6b988412a3f9d5d94f2b7c8cd831b";
+      sha256 = "d30e4d3218fbf13a5c531d45f55f0f366aac10aa2d180886ced778c7459c0610";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sl/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sl/thunderbird-78.4.3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "c04e1a339c4fb2ca8748da6bbc0f5a4dc9eb032b565d6f2333c7d1751eaaaa9a";
+      sha256 = "f968618f7b13b6dc4441a09882ac5c826017a5b0ca3887b7cdca8ef6a3b3c266";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sq/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sq/thunderbird-78.4.3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "ae9052f081baf3f25c43b2b1e109ce50abeacb5b2322ef38f8d42fb070417908";
+      sha256 = "f4400c6e55859e07705b353cbf211e863e8c3f373490f3fff6bd3e6d360d5b7f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sr/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sr/thunderbird-78.4.3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "c4eec55d9be21e02158e8266b9b7b424aa1f5d1078d9de2f0dfce4fef5f801d2";
+      sha256 = "f6437ffb64b1a98b5c5630f3b386b12866a514467c641fb02c8e86560e4b62d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sv-SE/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sv-SE/thunderbird-78.4.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "c7c01c580e1201e2948d0bfe3e029b6bd3a98e9845e6ff648d8bd4fbc8189d37";
+      sha256 = "f1af8019698347ac94bad5c33b5e094b65e8ebed9181f5fed5e740cf2029bcef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/th/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/th/thunderbird-78.4.3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "f09079980e41c156e62f8d008d600850ca8a62fc88917f3cc06d10321bb3e500";
+      sha256 = "75830b637302032bbc70342b71012f391b333a2645d8fefb8f4232d432c9dde1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/tr/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/tr/thunderbird-78.4.3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "2b99f6fcf904c7cdf67de2ed957167b6e1fe7d997c5a422641bba0af8a22b7f4";
+      sha256 = "3691e5aca6b9713fab9c8a15952d1ceae50d67cc60e362eacc9513a362875dfd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/uk/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/uk/thunderbird-78.4.3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "d502f4447e1e0c02e9384435e1b552c4da6d083225555b03f90d71ed04314324";
+      sha256 = "c4aca974c3a541c312029eb66fb8fdb1c5ecd787deb67a10bda3195f0ca06263";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/uz/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/uz/thunderbird-78.4.3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "7b9548f91dcf0ee6bfaed9d735baf9254842a633e3f06986d00d9d86b0f645d6";
+      sha256 = "2052c0a9a41c81a37aa23fbf28775e286b8350594b01aff629604ccbd74ae90d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/vi/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/vi/thunderbird-78.4.3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "32f78b425fd56900d1b3319e571af151214edee83a22321a449556e8ddebea69";
+      sha256 = "b142f463cd953bfc423be210eb891f66e948308129de74cdfd415409d4b0cb03";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/zh-CN/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/zh-CN/thunderbird-78.4.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "a6252fdd66dbfbd33444a3ebdacef38f8b600891af324d31f22f2fcf59b1e7fb";
+      sha256 = "0664f379ce4e464e2e6dcc3cfa749bd6ae4a597b008b7fd1c97bb6219727da6d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/zh-TW/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/zh-TW/thunderbird-78.4.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "b97a176fc12f156d8503e07819e9a0536b338850b8527c3896d93a36d64083aa";
+      sha256 = "2ba4d49b52e6cd699f7bb1fa8f024c330f67d6b9df543a77fea7c3dc87985cc4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/af/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/af/thunderbird-78.4.3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "e1f0a03f540da701f9e742cf7a05e21a1216ba5c60c402968799ff494ffb1fcc";
+      sha256 = "60f62dc28a8433e571b894d33c0d9670c3aebc6a8c556c65f12d8d574e5edceb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ar/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ar/thunderbird-78.4.3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "5bbee34fe9c5cf02f2f3c8160264f3a0ca3ad880bd75fd1ede87f906b886c7fd";
+      sha256 = "cf0fc7d7af09b20dbb35364ac0e47615919ae1627a0b729acf2f13dd99198400";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ast/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ast/thunderbird-78.4.3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "8a5e481e9aa16619513260d532ec6f7e2c6338b41a0a44468950ec26287b2a26";
+      sha256 = "cb7ed53eedb55858fa5a5aadab1ed0ae4f2f9e2714406488b211660e56785d21";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/be/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/be/thunderbird-78.4.3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "27f600f0d4b977cde9ede5bd39efd97bfa1abc04f3d1c7a3290339e7eedaef47";
+      sha256 = "b04239a6caf488d3fcb5be0373ddf83554643897d41bd197edb6dbaee15b9a4d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/bg/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/bg/thunderbird-78.4.3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "a9a6c127461ca7da6b5fca5e2d2ca8b1eecbbe78b42a9e18e16bc7a343c761ec";
+      sha256 = "fabd2c79cee02328166954d6b793b70bb94cb41162b904ecb124cdf91e5cff0d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/br/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/br/thunderbird-78.4.3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "b8f363ca9ada5b2ed80a9526d1f775d9c17bfecd6b84113391fd6a5b1966bd90";
+      sha256 = "66584e5c63c58c10cb4f2f8fb81048c4201046adbad03d58faf8f36e405a8e40";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ca/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ca/thunderbird-78.4.3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "e1c5035ab818ce7525c2bd659622b14b3fe544b7f4c8432bca2b018c7ba1bfa5";
+      sha256 = "eca54850e9ed41a19bb4cd23de9c11d9d2851ac1573507b32b4fd33431ad7889";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/cak/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cak/thunderbird-78.4.3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "f42d03442c8ab4bd844b0414e6d6c8ee168230714b55bbff1704117315f26a0d";
+      sha256 = "ff8e285bf3198c225c2b5b216678bde7f978443c1f354193e39c0c5d3d7237bd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/cs/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cs/thunderbird-78.4.3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "c45a3b75c5106377d73f72b905814972a58604b4f2bfe49f05f5177584f2e0d6";
+      sha256 = "72a18f3ac0168478c7b9c8d2641922ba7be5d129b63b711b7f7f133ba3cb1d75";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/cy/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cy/thunderbird-78.4.3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "e8e1f70703c9c22fceb2efe10f55a2f25da4085822ada1a3a3a3736ae41c0503";
+      sha256 = "16fecfef3f81870befcadf833db5ecf54b7b83d587f2a211c5eaceeaf7a5796f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/da/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/da/thunderbird-78.4.3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "d8fb3be7bc41ae6ae0d064bdf9ab9cc569f65dc18f720de960ace84bb2514b68";
+      sha256 = "7aac88184c6e2539003905b3a7609116cb2180943a8df219449354297b323455";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/de/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/de/thunderbird-78.4.3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "373f50cb99608779e502d76af0e4a301ef0b8b75a6ec235f64da7626188157c6";
+      sha256 = "f3f487f8852b7f50ed49b5375ae97376470282a0f5639c8fc4cb7040da30f946";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/dsb/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/dsb/thunderbird-78.4.3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "07518d32b488fb805adceea1126ca104f2e86e3a1245f6cc4fe108b70335c995";
+      sha256 = "842a084fc74c29d3c7573e473666cfa01f205b75fe6c1ee83acc25cca68d3666";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/el/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/el/thunderbird-78.4.3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "97699a80d96422dad4c95658c9c4d472bd1d69e1823f5a5f7dce5fdaddf1211f";
+      sha256 = "8df4c2a688b435f60fe0d5646ac5172dad33d254fdd68e35a29a6a83c4bda905";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/en-CA/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-CA/thunderbird-78.4.3.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "0b2dc377399c4f27acb717c7f0e59e9e735ad3d2ba1e617a93a3fa337b6dd2c0";
+      sha256 = "8eab7a0b08e3c65eb5c373eb018d5e1df519b28f8774b06203a5b7743b146cd5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/en-GB/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-GB/thunderbird-78.4.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "679fd1138a8795b0e7d64a4b8d8a2821deb8b30d40092e9df98b0a08d6cc6539";
+      sha256 = "23c819e15ca0ff1ad366f2d5fb76e934dcea0fae9cec6674b39339e14a3c4254";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/en-US/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-US/thunderbird-78.4.3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "a86f2780353dff8a449f323d5f54d83ce70b724db1a2d77dc3cecf6d1e849ada";
+      sha256 = "5cdf4b40f337352a8e966046a2eb1a368c0feef4fb069fd4c22d4f986ea1ed3f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/es-AR/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/es-AR/thunderbird-78.4.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "1fbd2312a971f658243dd6733067157fe3de509a88b2cce766ee8e45c243d23d";
+      sha256 = "e7947542ef45cb432991ac5435523987c79811889e9bd5cb6fe4c698897a241e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/es-ES/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/es-ES/thunderbird-78.4.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "e51217ca711a307c67f538d487eb836d49e4ccd6b8ff9b1a1926bd481322d46f";
+      sha256 = "95121f74bc1389e62dfe7acb286d2a4cd60a536f28054c8e367cdfd867babde1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/et/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/et/thunderbird-78.4.3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "345ccfa0e703893795d226aacf95645cc2cdc7dc99f5f9fba108466f74af19fe";
+      sha256 = "87aedd276bc54360887e81bf2e3b07c54a365b78814d7e478f7ad5ec15c1d451";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/eu/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/eu/thunderbird-78.4.3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "47e95ce28a229dbd01d8598d3a5b7f00d8e2c1934f8da4ff92052693dbb0c7c9";
+      sha256 = "66168f09ed77b7f31faaf21daff48e9a8bf75314fcab585fad67160db52471b9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fa/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fa/thunderbird-78.4.3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "6c05b6a34a1ae3232b417e37c6c71bb05e46a296019b55192331cd441f212e1b";
+      sha256 = "2848f0277f75dc58f371e2025bebdeca1c37d543055fa78258df67d05c67f5bc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fi/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fi/thunderbird-78.4.3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "fe043a86dd6679dc20ed17920e008894d78562d099861c0cda598c74aff3b176";
+      sha256 = "725f0dcd456245e188e32a32401ecd40400b7786da3a39d9f6965c1f674ee954";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fr/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fr/thunderbird-78.4.3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "950fa73e6f5fcf2fd66da9af7b79e43420e3ce75c9227fee095ea65ce2769a7f";
+      sha256 = "d24ab35a8db7cb32d6098defb9f7b6b007b5c993a070c1a3a5c8991451165e37";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fy-NL/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fy-NL/thunderbird-78.4.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "e01f59e5b7abde309421515240229d16cc0ec6ad4ea52ef1a54fb65f0bc49091";
+      sha256 = "ea3a88b57166b3b8f04922a5c2f6d8d9f94f1a7bb5f3a9e2d6b5f11a13528c18";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ga-IE/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ga-IE/thunderbird-78.4.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "53a7b0b5a2046525701120101fbab5c581b99de56caadf3aed4732f444c35569";
+      sha256 = "763bc901967ec61e1f7f543bbf248bb03ea68b01c000677505408ec8e8c3cbb4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/gd/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/gd/thunderbird-78.4.3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "eaea6b3770d5bc51a00e25fee02110f5614d9ef52049fc092d90dc1e8de4c210";
+      sha256 = "7394f43ae2ff5816dcf9b37255fd9770dc48dd7309d685ab378bc2de8a5a39b1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/gl/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/gl/thunderbird-78.4.3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "b0c5d871785d1efa23bdbe341d8186b96394375ac56bb541d5d9a75bc784b471";
+      sha256 = "7daaacf6af75b34d37d440e2c0b252ef03c3b432523f5acb8ef71f83b5d7b6cb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/he/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/he/thunderbird-78.4.3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "cef410178a3cf310c7bf158eba5c12093385dfda1de334d6d6e0c28ada16c7ca";
+      sha256 = "4831ef263de0a08df6494b13a280475642c3eed7f34c7415fd7b59af192398dc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hr/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hr/thunderbird-78.4.3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "9040e2235a752a50cbe09207684df928b84787629d21c8d53e6b9bfc708b09a3";
+      sha256 = "6860b40fc2ba7f9b8ddedcaf50acca8ac01b6451c0895c325b36485f188b5dda";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hsb/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hsb/thunderbird-78.4.3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "b0bb84d18c588abf2f05abc8ecb1f3a169221fcdf4117e48b3169362cfc69aa6";
+      sha256 = "681fc8200f6f9346e911c21d6a1c8206e5ee5ad1adfaa56ddfbc5088225fc561";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hu/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hu/thunderbird-78.4.3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "6d5d0ded325cf7852ef638d7f5d8dd4d7ce127ad7f4eace22ce696541f9485a5";
+      sha256 = "8909d02e58f5b333fa51b15e4ddb5df162d01e36a8052827482c479949da2cb4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hy-AM/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hy-AM/thunderbird-78.4.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "cbb8de1462385ef9bdb42cec5e8c81664347dc9e7573f602f41ff586c217d8ea";
+      sha256 = "12dee2dbe126d2243b674bed4617ffcec7c93f850d266f6253d802c6af5b6d6d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/id/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/id/thunderbird-78.4.3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "358a95d7d87adc85cd39bf6da1373026de5b8631139ee1ec44e9410b027e00cd";
+      sha256 = "5564c24b01f9a952def885a4fb56e3246643ca30bc5066d6ffa4ed6c6982b33b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/is/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/is/thunderbird-78.4.3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "c7b27e5311737cd5f3d314830aba0ec165669d8c949edb37482fb4df3b460f9e";
+      sha256 = "fedea70297479b2c828aa19a9a4aa3090597c5490ee842a0f521d0096615d6db";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/it/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/it/thunderbird-78.4.3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "a302c50190fb992fcdaa66a8de9c5f5d177a5563fcec55e5f433761646ccfcbd";
+      sha256 = "8466f3dc9988270d4a9166b82dba764d8dbfa14e8c26a1931d35abe011c3160a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ja/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ja/thunderbird-78.4.3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "d2357cc5bb5b5493035a79b504db8db2750f5880705b693554e2170d8d840cb0";
+      sha256 = "3ffe4ae508896ac961a27940a93f5955bb8b29640c88e5378a8251827b4e9ab8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ka/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ka/thunderbird-78.4.3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "2d150d1160d92499fd9dc4d632e006170a27929f88909715c0d0210005516ff7";
+      sha256 = "7c099596fbc4666e053bd1079f6b7c45511b2b44db73cd5c099fd392bec8e3e3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/kab/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/kab/thunderbird-78.4.3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "4f9879d5a106ec9fc3bd423fdb5df25a3e0d47690cfec652654472addd21a2c2";
+      sha256 = "5e64e5a276a6e77250ad7647f9b4ecc2b8c9dc360c486f9504b3b17b8da3e467";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/kk/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/kk/thunderbird-78.4.3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "f8d7fe1f39af2019bb37e117545e8cb2901feb0d31a92287eb4b30da2e431a6b";
+      sha256 = "4562bced5900bc447a79c53d381b250a1e13b9f076979cb9760f9adaa89c54b3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ko/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ko/thunderbird-78.4.3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "bd9abd627205fe33430717a60eea8b54498325a8fe4d92fb5572a2719ba50341";
+      sha256 = "b6cb53893d67bedb077547f1262a833a5487e49395187a49eb977659d019e7f8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/lt/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/lt/thunderbird-78.4.3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "69ab343eb79c42c4a1a9ea480aa2ac50d95e9140968690fd99b3d13824be17ef";
+      sha256 = "6291d36e9347729920f89a28b949c943d8c92863cba1a03624801c7136eff997";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ms/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ms/thunderbird-78.4.3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "fb1246094e22ff59f8671a6aa0827c8e51a7fa8dc2bb565a3cb446d35c098f16";
+      sha256 = "5dee2e40dbceea93fbe3b35b744d00472b89b88e745025127a1d07afc79d7df8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/nb-NO/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nb-NO/thunderbird-78.4.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "0ffcd2db855686c4b7e8751884aa4a8729b0fc8da597d256d37d6c73a50c7585";
+      sha256 = "491115e7ad1c4245da34dc328e179de3916291d4e42a85ee5fd4fadeae1fcdcd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/nl/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nl/thunderbird-78.4.3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "615205a37248619a664b4649f808ddce9b019aae60a900fe4d2ca2dfdd717fe2";
+      sha256 = "c4631681eb3354a3093acd5a76d5c7ca5ef3e76ac2cef9f1fa4007c40c1e282d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/nn-NO/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nn-NO/thunderbird-78.4.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "8813d2b40da457d5d7c0da88d54b8b0c13d2ea0215b9bee2966215d366d79a81";
+      sha256 = "aa4d383b90b7cd48ff18f098c9bba429f09fcfb72a2f2a086a992778718a3b1d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pa-IN/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pa-IN/thunderbird-78.4.3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "31feb987ff8493d96e15395deb93506b13089db28d91c0bf6ee4da271db8a0d2";
+      sha256 = "c5fb66455a59383494890e06559d4529c0762ecf76d17e5ad784eb413277438d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pl/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pl/thunderbird-78.4.3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "a9c30450e918ec4c0a95da51c071f8c4ec4f870976ac494ae6042aa3fdbc4a56";
+      sha256 = "720eea0998d9934960a5dc97466f57c7e68b2048f88125a987569539a8a00579";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pt-BR/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pt-BR/thunderbird-78.4.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "157d64059b2a7a1082f233c05fdc0302f92dfa496c0075761bd54327b439594c";
+      sha256 = "d27ab836f5d8753d740e980291a4403656735c206cedbaf7d5c13df26d327150";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pt-PT/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pt-PT/thunderbird-78.4.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "d8a403996d56e22809e9124fc4c9dec98cda19a5fad7144fa87e452ae75a990e";
+      sha256 = "2b996d07174c24df1b066c41bd92c8b24ebab82767c47d8c658f2205eeff9cb4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/rm/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/rm/thunderbird-78.4.3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "97524948b2f9259d1b08b9bbc6533b79fd5e592b08fb5fc5cc63bdb749d5866c";
+      sha256 = "206b2bf82b88ab733bf585e11a3eba49a779c8b8fb7bb249716022fc7ee1a18a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ro/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ro/thunderbird-78.4.3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "99e2c94054fd01001555fdcf4e9ee8a04fbae77e5ff9d34ebc42a6415b939bbd";
+      sha256 = "2d06d671114d70ba4e39b2c639eab1debe7ad33de11795113f30f27708d13ae4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ru/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ru/thunderbird-78.4.3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "f1996c3f3b6b5371f853f6854edd15ee030b6238f396870a2cff39320eac111a";
+      sha256 = "08e71802964c340dfbcddf963382d1ccc5b8fd2e262daa1316488cffd04f449f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/si/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/si/thunderbird-78.4.3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "10df360a1d5a94ccd218a265024fb3f3d9d9a72b8c749ab93d797a3879cbad03";
+      sha256 = "0f59d187fa15bd08ffe0e08e643bb76954f7eb7730c3768079514385c53df5d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sk/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sk/thunderbird-78.4.3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "a5f9e0b983961cc4e4ff7cb6f03c197cd8729eead74d6c0b657b441a91635326";
+      sha256 = "5109939226907517fac9ae9c4e6ee96d732de9a67b9139e390d32cbdea892ef7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sl/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sl/thunderbird-78.4.3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "10526684f3066322066f204a2cf978c779bb895d5c7ba73880ee32caf63d62a7";
+      sha256 = "c56fb54ad65dd453b487813b1f0dde8d83ed6a2f7e428af55c40a80d1c9a35ca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sq/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sq/thunderbird-78.4.3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "d422e42397d2012efaeeb37101a5b1b29feb34e9e9dbaf87a85f9e2f881511ea";
+      sha256 = "0b3814c80014108032c9f0376a62c09864704441f36a084accba1c7c0f8156de";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sr/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sr/thunderbird-78.4.3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "1e9b5637581c2c4973efcc5b0844ca228f66c4fbb0a44e88201973623aad0b83";
+      sha256 = "80b01424fae7d18c98a77a0026dd4b50f1913f5f3cce2d3f85d9e56da633a537";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sv-SE/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sv-SE/thunderbird-78.4.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "592daeeebdb5f56f486a4e6efa1c51e709d834a65c861e76e5b6fd86f8a4bb09";
+      sha256 = "ef0154595d85c13d0eac381a907a51da19e9d93d2758c7dc0f052b7b76a7f31f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/th/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/th/thunderbird-78.4.3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "00f883ed3d542d0bf3da3e744523cfd1b3405ae0b928dd83c42e55e5f1bab4e1";
+      sha256 = "939f56c4951e8dbfdff257efe7f0212e93c1bb55547ce1e934f7d908932d3116";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/tr/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/tr/thunderbird-78.4.3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "ab69a35eebbd1cdef80b22a398c4d570c17e13a8a36e5399b892974d7ed29b10";
+      sha256 = "66f4f2cb06f20fca47e59b37d52f07a9e1215b03f0bbf9320cd1436e1d1a7c35";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/uk/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/uk/thunderbird-78.4.3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "efbd5bf9552333d78c68191265b3ecccb2a59ae19f2bfe7a1d8b096a44c9fcdc";
+      sha256 = "33f3b9812b442184c075056cbe7da924655729865d849856093bdaa2d7d84660";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/uz/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/uz/thunderbird-78.4.3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "db90d47b59efeb5c847ecdf8b7438a4f99d0954283f1deda39a0ee08f54fdfd1";
+      sha256 = "5abbc17bb66700093eeef5eb97bcab0a5d040ffe20ecf79d8239123248b1affb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/vi/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/vi/thunderbird-78.4.3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "1d616c682f04f7c0ec976d41eb71d3ac929eaa3199b4af749a80c906a3f2a212";
+      sha256 = "de5071c3b4a5cf7494f91c69f4a7cf4678bcf57227115e1b6e50cc65a3e716dd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/zh-CN/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/zh-CN/thunderbird-78.4.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "490e4e310606846836d93ca9704b7de11bf307b918933fd0187aa5d3795a82bf";
+      sha256 = "07afc2b794439475d0d4db82c7b694728aa5b8e6e80ac79789bae662757ae8d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/zh-TW/thunderbird-78.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/zh-TW/thunderbird-78.4.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "c62476ac43d302ad9895524f6f66350122edfdf393697111d5868cf25b996c1a";
+      sha256 = "70a71d0c26fd2cd18dd599374cc6f1c39d22246f3b3c8e8d17659cb7c33a5a77";
     }
     ];
 }

From 205652e31afac6eed2e1fc40ceaa0270dd2cc601 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 12 Nov 2020 03:12:51 +0900
Subject: [PATCH 2146/3942] thunderbird: 78.4.2 -> 78.4.3

---
 .../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 e92e89c7126c..e4debe7a909b 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true;
 
 stdenv.mkDerivation rec {
   pname = "thunderbird";
-  version = "78.4.2";
+  version = "78.4.3";
 
   src = fetchurl {
     url =
       "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
     sha512 =
-      "1bd8z6fm2nky4p3qxc5jh9dca7v7g77i6kdn6p5dzzm4gyadqvk00bfa4nzglzi9nwwyld14r3ydjd6ms012yk07q4aqdsrf51b9k4y";
+      "0h5ddqp1z2dphyy4mjcb7v9mrrxlnjw8rwklm0yqsbvs9m96pc1yyp4clb3wmgs7kzh3wxdwi450842m3b13wdg5h0ls7rhamd1yi0c";
   };
 
   nativeBuildInputs = [

From 8446b3425516c88696c77cc6feae155144029e37 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 11 Nov 2020 19:00:32 +0100
Subject: [PATCH 2147/3942] grafana: 7.3.1 -> 7.3.2

https://github.com/grafana/grafana/releases/tag/v7.3.2
---
 pkgs/servers/monitoring/grafana/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 7679cd88649d..85420f237f0f 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "grafana";
-  version = "7.3.1";
+  version = "7.3.2";
 
   excludedPackages = [ "release_publisher" ];
 
@@ -10,15 +10,15 @@ buildGoModule rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "02by07d0h07zvws2yj71qa84sgp3x49p5ib0bahh0iyr50xqb3yj";
+    sha256 = "0lknymp203bgrwq8g05pk07p385k2hh9wap4ql4lxylsn89szs65";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "0rqipwiz8bsqkhiv30k9jmk5szhabk9rgl37n7y8l0yk2avbq895";
+    sha256 = "08smddc86jm3ign1pb1arw1zqkh72dbddizzn1bqg4lanx2xwjca";
   };
 
-  vendorSha256 = "0shaxm2y5i29rb0k5bfpcsxbw3ap913l1rb5qbr9hrx7l142dbx8";
+  vendorSha256 = "09rb96fm7ij16r843lbwcxb26vmjyahs1bi5pnnqz0mnm0vvmsjb";
 
   postPatch = ''
     substituteInPlace pkg/cmd/grafana-server/main.go \

From 008e711861d82fd89bdf27795905045a773330b0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 18:19:52 +0000
Subject: [PATCH 2148/3942] obsidian: 0.9.6 -> 0.9.11

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

diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index 58ea50c3ed18..ae3d9181a3e8 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -30,12 +30,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "obsidian";
-  version = "0.9.6";
+  version = "0.9.11";
 
   src = fetchurl {
     url =
       "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
-    sha256 = "1n8qc8ssv93xcal9fgbwvkvahzwyn6367v8gbxgc3036l66mira7";
+    sha256 = "11z22pglqsqjms1ykxmj7lfdwpcmkbdsd5r812m5gv94xsv38lnr";
   };
 
   nativeBuildInputs = [ makeWrapper graphicsmagick ];

From 83992fd7c6f93ce1310db4eca9c2cc053a9d0b37 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 11 Nov 2020 18:20:39 +0000
Subject: [PATCH 2149/3942] bisoncpp: init (#103316)

* bobcat: 4.08.03 -> 5.05.00; switch homepage

* bisoncpp: init at 6.04.00

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/libraries/bobcat/default.nix | 11 ++--
 .../tools/parsing/bisonc++/default.nix        | 56 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/tools/parsing/bisonc++/default.nix

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 17f7bbc667c5..a95f131c00c6 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchFromGitHub, icmake
+{ stdenv, fetchFromGitLab, icmake
 , libmilter, libX11, openssl, readline
 , utillinux, yodl }:
 
 stdenv.mkDerivation rec {
   pname = "bobcat";
-  version = "4.08.03";
+  version = "5.05.00";
 
-  src = fetchFromGitHub {
-    sha256 = "163mdl8hxids7123bjxmqhcaqyc1dv7hv8k33s713ac6lzawarq2";
+  src = fetchFromGitLab {
+    sha256 = "sha256:14lvxzkxmkk54s97ah996m6s1wbw1g3iwawbhsf8qw7sf75vlp1h";
+    domain = "gitlab.com";
     rev = version;
     repo = "bobcat";
     owner = "fbb-git";
@@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Brokken's Own Base Classes And Templates";
-    homepage = "https://fbb-git.github.io/bobcat/";
+    homepage = "https://fbb-git.gitlab.io/bobcat/";
     license = licenses.gpl3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/tools/parsing/bisonc++/default.nix b/pkgs/development/tools/parsing/bisonc++/default.nix
new file mode 100644
index 000000000000..c6a4fc1a068d
--- /dev/null
+++ b/pkgs/development/tools/parsing/bisonc++/default.nix
@@ -0,0 +1,56 @@
+{stdenv, fetchurl, fetchFromGitLab
+, yodl, icmake, flexcpp, bobcat
+}:
+stdenv.mkDerivation rec {
+  pname = "bisonc++";
+  version = "6.04.00";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.com";
+    owner = "fbb-git";
+    repo = "bisoncpp";
+    rev = "6.04.00";
+    sha256 = "sha256:0aa9bij4g08ilsk6cgrbgi03vyhqr9fn6j2164sjin93m63212wl";
+  };
+
+  buildInputs = [ bobcat ];
+
+  nativeBuildInputs = [ yodl icmake flexcpp ];
+
+  setSourceRoot = ''
+    sourceRoot="$(echo */bisonc++)"
+  '';
+
+  gpl = fetchurl {
+    url = "https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt";
+    sha256 = "sha256:0hq6i0dm4420825fdm0lnnppbil6z67ls67n5kgjcd912dszjxw1";
+  };
+
+  postPatch = ''
+    substituteInPlace INSTALL.im --replace /usr $out
+    patchShebangs .
+    for file in $(find documentation -type f); do
+      substituteInPlace "$file" --replace /usr/share/common-licenses/GPL ${gpl}
+      substituteInPlace "$file" --replace /usr $out
+    done
+  '';
+
+  buildPhase = ''
+    ./build program
+    ./build man
+    ./build manual
+  '';
+
+  installPhase = ''
+    ./build install x
+  '';
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "A parser generator like bison, but it generates C++ code";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
+    homepage = "https://fbb-git.gitlab.io/bisoncpp/";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68e2ec2ce199..b1a58cd05b8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10910,6 +10910,8 @@ in
     };
   });
 
+  bisoncpp = callPackage ../development/tools/parsing/bisonc++ { };
+
   black = with python3Packages; toPythonApplication black;
 
   blackfire = callPackage ../development/tools/misc/blackfire { };

From 49b6ce8ce7ef9815a80ab04fac62553cfcba268a Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 11 Nov 2020 19:27:50 +0100
Subject: [PATCH 2150/3942] tempo: 0.2.0 -> 0.3.0

https://github.com/grafana/tempo/releases/tag/v0.3.0
---
 pkgs/servers/tracing/tempo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix
index c97f8344c91b..37bc4aa70d8d 100644
--- a/pkgs/servers/tracing/tempo/default.nix
+++ b/pkgs/servers/tracing/tempo/default.nix
@@ -1,14 +1,14 @@
 { lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-  version = "0.2.0";
+  version = "0.3.0";
   pname = "tempo";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "grafana";
     repo = "tempo";
-    sha256 = "061l72il8arxa53zfbasiwyjdxc4bf498glxrdj5ijcwgvx14275";
+    sha256 = "0inqljiavqyq8dk2w0w0l2bds5390mrf8j190yb7lqwx9ra0cjp9";
   };
 
   vendorSha256 = null;

From a3aa03f32951b5eb125da27cf07eb5581a678f5a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 18:36:38 +0000
Subject: [PATCH 2151/3942] oneDNN: 1.6.4 -> 1.7

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

diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix
index b780b9f4e39b..6dc4bd704dd0 100644
--- a/pkgs/development/libraries/oneDNN/default.nix
+++ b/pkgs/development/libraries/oneDNN/default.nix
@@ -5,13 +5,13 @@
 # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
 stdenv.mkDerivation rec {
   pname = "oneDNN";
-  version = "1.6.4";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneDNN";
     rev = "v${version}";
-    sha256 = "0y4lpx24k08wydv4aprfn2icg6ixk0iprk8pmbvyaa6gyab70vjy";
+    sha256 = "15kanz3zflmxr355dhny4rdycq0ni9iz42vvlblzc5lmj39n84fj";
   };
 
   outputs = [ "out" "dev" "doc" ];

From cabec55afd5f97cdc5e6f00bf6a12a194dbc6b77 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 11 Nov 2020 19:41:04 +0100
Subject: [PATCH 2152/3942] osslsigncode: unstable-2020-08-02 -> 2.1

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

diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix
index 6924ec9e37a7..ef673ed018f2 100644
--- a/pkgs/development/tools/osslsigncode/default.nix
+++ b/pkgs/development/tools/osslsigncode/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "osslsigncode";
-  version = "unstable-2020-08-02";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "mtrojnar";
     repo = pname;
-    rev = "01b3fb5b542ed0b41e3860aeee7a85b735491ff2";
-    sha256 = "03ynm1ycbi86blglma3xiwadck8kc5yb0gawjzlhyv90jidn680l";
+    rev = version;
+    sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3";
   };
 
   nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mtrojnar/osslsigncode";
     description = "OpenSSL based Authenticode signing for PE/MSI/Java CAB files";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ mmahut ];
+    maintainers = with maintainers; [ mmahut prusnak ];
     platforms = platforms.all;
   };
 }

From a3bf66f4872fd5250a9d4a33080f640d3d242bd3 Mon Sep 17 00:00:00 2001
From: pulsation <philippe.sam-long@laposte.net>
Date: Thu, 30 Jul 2020 21:04:26 +0200
Subject: [PATCH 2153/3942] quisk: init at 4.1.72

---
 pkgs/applications/radio/quisk/default.nix | 39 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/radio/quisk/default.nix

diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix
new file mode 100644
index 000000000000..1a032554e193
--- /dev/null
+++ b/pkgs/applications/radio/quisk/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, python38Packages, fetchPypi
+, fftw, alsaLib, pulseaudio, wxPython_4_0 }:
+
+python38Packages.buildPythonApplication rec {
+  pname = "quisk";
+  version = "4.1.72";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qw00b9d0l3ysdrmd3nr5a2zlwg9ygdil7krnk2gjp5g8bb778k7";
+  };
+
+  buildInputs = [ fftw alsaLib pulseaudio ];
+
+  propagatedBuildInputs = [ wxPython_4_0 ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A SDR transceiver for radios that use the Hermes protocol";
+    longDescription = ''
+      QUISK is a Software Defined Radio (SDR) transceiver. You supply radio
+      hardware that converts signals at the antenna to complex (I/Q) data at an
+      intermediate frequency (IF). Data can come from a sound card, Ethernet or
+      USB. Quisk then filters and demodulates the data and sends the audio to
+      your speakers or headphones. For transmit, Quisk takes the microphone
+      signal, converts it to I/Q data and sends it to the hardware.
+
+      Quisk can be used with SoftRock, Hermes Lite 2, HiQSDR, Odyssey and many
+      radios that use the Hermes protocol. Quisk can connect to digital
+      programs like Fldigi and WSJT-X. Quisk can be connected to other software
+      like N1MM+ and software that uses Hamlib.
+    '';
+    license = licenses.gpl2Plus;
+    homepage = "https://james.ahlstrom.name/quisk/";
+    maintainers = with maintainers; [ pulsation ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a31b429274c6..8d088d029f13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23285,6 +23285,8 @@ in
 
   quilter = callPackage ../applications/editors/quilter { };
 
+  quisk = python38Packages.callPackage ../applications/radio/quisk { };
+
   quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {};
 
   falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { };

From 784028111406b926250b1627588ac7434cb90c4f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 19:12:07 +0000
Subject: [PATCH 2154/3942] operator-sdk: 1.1.0 -> 1.2.0

---
 pkgs/development/tools/operator-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix
index e22aaf6ed666..f97611c77853 100644
--- a/pkgs/development/tools/operator-sdk/default.nix
+++ b/pkgs/development/tools/operator-sdk/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "operator-sdk";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "operator-framework";
     repo = pname;
     rev = "v${version}";
-    sha256 = "11xlay3sk5nr9pfbqifcrfi5h81qnhs3hg5b75zgqysgr4d2m987";
+    sha256 = "03iy4a5jlsmmzn8cpyp35sc2kgz6shg18ah0qdzkadqqalqlldy8";
   };
 
-  vendorSha256 = "1bbj23rwghqfw9vsgj9i9zrxvl480adsmjg1zb06cdhh5j1hl0vy";
+  vendorSha256 = "0dls086lw3sbal4rf0l3xb0sp6g393n9ylkpzppp75myj7v900vv";
 
   doCheck = false;
 

From 88b7340a79751b648d0f8c4339587464b5918595 Mon Sep 17 00:00:00 2001
From: Scott Worley <scottworley@scottworley.com>
Date: Wed, 11 Nov 2020 11:20:14 -0800
Subject: [PATCH 2155/3942] doc: Fix doc-building instructions

---
 nixos/doc/manual/contributing-to-this-manual.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/contributing-to-this-manual.xml b/nixos/doc/manual/contributing-to-this-manual.xml
index 9820e75fc337..935dd66bc141 100644
--- a/nixos/doc/manual/contributing-to-this-manual.xml
+++ b/nixos/doc/manual/contributing-to-this-manual.xml
@@ -12,7 +12,7 @@ xlink:href="https://github.com/NixOS/nixpkgs">Nixpkgs</link> repository.
   You can quickly check your edits with the following:
  </para>
 <screen>
-<prompt>$ </prompt>cd /path/to/nixpkgs/nixos/doc/manual
+<prompt>$ </prompt>cd /path/to/nixpkgs
 <prompt>$ </prompt>nix-build nixos/release.nix -A manual.x86_64-linux
 </screen>
  <para>

From f72a3142f07352b326906a2cd609e311d77ef555 Mon Sep 17 00:00:00 2001
From: Scott Worley <scottworley@scottworley.com>
Date: Wed, 11 Nov 2020 11:27:46 -0800
Subject: [PATCH 2156/3942] doc: 20.09 release notes: nixos-YY.MM branches no
 longer in nixos-channels repo

Since https://github.com/NixOS/nixos-channel-scripts/commit/7c442a2f67c77344a71e5aae7e4cd2a1554420a9
for https://github.com/NixOS/nixpkgs/issues/99257
---
 nixos/doc/manual/release-notes/rl-2009.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 75c8adbf45ed..75358835baa9 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -234,7 +234,17 @@
      </listitem>
     </itemizedlist>
    </listitem>
-
+   <listitem>
+    <para>
+     Starting with this release, the hydra-build-result
+     <literal>nixos-<replaceable>YY.MM</replaceable></literal>
+     branches no longer exist in the <link
+     xlink:href="https://github.com/nixos/nixpkgs-channels">deprecated
+     nixpkgs-channels repository</link>.  These branches are now in
+     <link xlink:href="https://github.com/nixos/nixpkgs">the main nixpkgs
+     repository</link>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From 380337da106cca58932154e4ea04dc1b64703a04 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Wed, 11 Nov 2020 11:36:31 -0800
Subject: [PATCH 2157/3942] terraform: withPlugins should inherit meta from
 wrapped derivation (#103396)

When using `terraform.withPlugins (ps: [])` the returned derivation does
not expose the meta of the underlying package. This change inherits meta
from the terraform derivation in the wrapper derivation to expose it.
---
 pkgs/applications/networking/cluster/terraform/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index b73f24ed47d9..b478071ead16 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -114,7 +114,7 @@ let
           (orig: { passthru = orig.passthru // passthru; })
         else
           lib.appendToName "with-plugins" (stdenv.mkDerivation {
-            inherit (terraform) name;
+            inherit (terraform) name meta;
             buildInputs = [ makeWrapper ];
 
             buildCommand = pluginDir + ''

From 5c8be438ead5c0bda138f95d569d356567349bc0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 19:37:17 +0000
Subject: [PATCH 2158/3942] packet-cli: 0.0.8 -> 0.1.1

---
 pkgs/development/tools/packet-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix
index f7bcc8bf8f49..6b603ef00602 100644
--- a/pkgs/development/tools/packet-cli/default.nix
+++ b/pkgs/development/tools/packet-cli/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "packet-cli";
-  version = "0.0.8";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "packethost";
     repo = pname;
     rev = version;
-    sha256 = "0ys6zyhyi65g0sj15pb6rslgbjgkh73y32gc0yvhfd6xmgzaxpxf";
+    sha256 = "089fcn7yslijjivyvwl85j32gfwif8aazqdhm6hi676lz80ssppp";
   };
 
-  vendorSha256 = "1h9p3hrr61hwkhkh4qbw0ld3hd5xi75qm8rwfrpz5z06jba1ll25";
+  vendorSha256 = "1p3v4pzw9hc1iviv1zghw9imbd23nlp24dpa8hf0w8a03jvpy96x";
 
   postInstall = ''
     ln -s $out/bin/packet-cli $out/bin/packet

From 7741f925f16e26ab9c601291337e3efb46d00dec Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 11 Nov 2020 20:40:41 +0100
Subject: [PATCH 2159/3942] google-cloud-cpp: remove myself from maintainers

This was only to enable https://github.com/NixOS/nix/pull/3021, which
has bitrotted sufficiently in the meantime.
---
 pkgs/development/libraries/google-cloud-cpp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix
index b2d8856bfea1..104823b27956 100644
--- a/pkgs/development/libraries/google-cloud-cpp/default.nix
+++ b/pkgs/development/libraries/google-cloud-cpp/default.nix
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
     license = with licenses; [ asl20 ];
     homepage = "https://github.com/googleapis/google-cloud-cpp";
     description = "C++ Idiomatic Clients for Google Cloud Platform services";
-    maintainers = with maintainers; [ andir flokli ];
+    maintainers = with maintainers; [ andir ];
     broken = true; # Broken on Hydra since 2020-05-19
   };
 }

From f24b695908339c783ebf119f4c87416d2b00cd1f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 20:12:56 +0000
Subject: [PATCH 2160/3942] pdfcpu: 0.3.6 -> 0.3.7

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

diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix
index 2c3e9fa865af..3f91fae0beb7 100644
--- a/pkgs/applications/graphics/pdfcpu/default.nix
+++ b/pkgs/applications/graphics/pdfcpu/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pdfcpu";
-  version = "0.3.6";
+  version = "0.3.7";
 
   src = fetchFromGitHub {
     owner = "pdfcpu";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0cbbbf93gxx768fs6pldy25xk46k7mc8k94r3f7cd83f1qd3s5zn";
+    sha256 = "13b1ncpx189ca0h70j5cdp0jwlj95kasysryz1l6g13cwn9n6mii";
   };
 
-  vendorSha256 = "1i0w4284icbl40yrjny9qd5iqrq18x63lrs7p1gz58nybc606azx";
+  vendorSha256 = "11w9i1829hk1qb9w24dyxv1bi49358a274g60x11fp5x5cw7bqa7";
 
   # No tests
   doCheck = false;

From 5d3b355469a0a8c20197b76795b3087943e8bf7c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 20:26:07 +0000
Subject: [PATCH 2161/3942] pgmetrics: 1.10.0 -> 1.10.2

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

diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix
index 600aa3d07d27..ff1b6c01f4f1 100644
--- a/pkgs/tools/misc/pgmetrics/default.nix
+++ b/pkgs/tools/misc/pgmetrics/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pgmetrics";
-  version = "1.10.0";
+  version = "1.10.2";
 
   src = fetchFromGitHub {
     owner  = "rapidloop";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1256mcac75nlr1c7pzsgqmjq026m6qxh9dlldndvl1s08bk7pxr9";
+    sha256 = "0mhdw985gs9gh44iz78a588nnnapirpnd7s0zh35jyripx8pgw47";
   };
 
   vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5";

From d7688900b4274a71b783813a7cef85be4b291a7a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 20:07:33 +0000
Subject: [PATCH 2162/3942] =?UTF-8?q?oh-my-zsh:=202020-11-10=20=E2=86=92?=
 =?UTF-8?q?=202020-11-11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 5dab6e470cb5..35d6e706eaaa 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
 
 stdenv.mkDerivation rec {
-  version = "2020-11-10";
+  version = "2020-11-11";
   pname = "oh-my-zsh";
-  rev = "dc4692b53e4a1dc512d405f36f2d2af30c66304b";
+  rev = "1beac5958ede29855ef2ac4313ada83ed37f5ea8";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "00jm6vvjq265injnrd6mbmq2dm3w8wmw3g7ibhv9spi2r3zb6400";
+    sha256 = "01pm1g4dhdg05fd9jqp148xi4aw9fkd6kyrvmxizbvsbbz8m751h";
   };
 
   installPhase = ''

From 399acdc93405018e63925fde1fd9c89dbee5290c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 15:10:14 -0500
Subject: [PATCH 2163/3942] linux: 4.14.205 -> 4.14.206

---
 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 98968c8385c5..99f20985cddd 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.205";
+  version = "4.14.206";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0m6ajw3iypxwvym8hmymd0dlcm9gdczpa6y6id4b447r774aqmcc";
+    sha256 = "1b46f0s15xnlam43cmw8w41rrvcwrhm6km0278lq6f86lpx3w8qw";
   };
 } // (args.argsOverride or {}))

From 08a59efe79fcc90cf1de30f2080df1d45c471668 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 15:10:28 -0500
Subject: [PATCH 2164/3942] linux: 4.19.156 -> 4.19.157

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 7657656fbc0e..6458f02da664 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.156";
+  version = "4.19.157";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0b9g2v8dvlhq0kbns2z62v93pnaprk7xbjzzx8rk0b522x42nq08";
+    sha256 = "0mgpgv2ny49bb7kgaygy2ay6ckjgw7mg091viivi66jw4mjs7p3n";
   };
 } // (args.argsOverride or {}))

From f4ce75d98d04baf73ac02a2046fc32a025e63a2a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 15:10:39 -0500
Subject: [PATCH 2165/3942] linux: 4.4.242 -> 4.4.243

---
 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 0fb971e00a97..ad34346b9139 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, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.242";
+  version = "4.4.243";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "089gigqali5q8izac82ybigxyi1bnw0xhm1cc590h4v7lkmk0mm1";
+    sha256 = "1daqbmj9ka9wdkkym625hqwqaxq5n11y7c4yc9ln3xkjpnv4dplm";
   };
 } // (args.argsOverride or {}))

From 3b27759e52b8f25c054decc36b63d690c768ee64 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 15:10:54 -0500
Subject: [PATCH 2166/3942] linux: 4.9.242 -> 4.9.243

---
 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 bda5a463599b..3682f6fd5ea8 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, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.242";
+  version = "4.9.243";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1r1myvxkhnsz419i5y6zjdkz177q3d19jk7748vv1v505gi3k1g4";
+    sha256 = "111rlzx6z4kf8zwxncib96d9wy6qmkbs0cq3dhnybipwlyf1iank";
   };
 } // (args.argsOverride or {}))

From 193f7a49feeb449ded34c1be439c776d30fa5d74 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 15:11:10 -0500
Subject: [PATCH 2167/3942] linux: 5.4.76 -> 5.4.77

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 55ec4d341f73..93f7fc599b73 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.76";
+  version = "5.4.77";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1lpppqjsrcmpr6vawxycsy7lpwdh3pb3d3f841sxzqgm3b9mymkg";
+    sha256 = "1xyvml0mps7bsa11bgpa4l0w8x6pasdz9yab2z4ds394f1lkxq53";
   };
 } // (args.argsOverride or {}))

From 470f86b85195b41147afb814d8320117a00b824b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 15:11:19 -0500
Subject: [PATCH 2168/3942] linux: 5.9.7 -> 5.9.8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix
index 010bdc788c27..0f8143114756 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.9.7";
+  version = "5.9.8";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1dv933lnkcfrpjbq1hdc3b5r210f6vn5y04jp87pij4mmkn47a6y";
+    sha256 = "19l67gzk97higd2cbggipcb0wi21pv0ag0mc4qh6cqk564xp6mkn";
   };
 } // (args.argsOverride or {}))

From 6322425d0c05258b3591dc7eb4c8c11a68a503bc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 15:11:38 -0500
Subject: [PATCH 2169/3942] linux/hardened/patches/4.14: 4.14.205.a ->
 4.14.206.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index e2df369456a8..6655f3dde459 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,8 +1,8 @@
 {
     "4.14": {
-        "name": "linux-hardened-4.14.205.a.patch",
-        "sha256": "0a9llmpkz4rs1xr574iiyjvll1i9fd6y5k0gxqniz2x2m2nl1mkz",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.205.a/linux-hardened-4.14.205.a.patch"
+        "name": "linux-hardened-4.14.206.a.patch",
+        "sha256": "17pd23lvhkpa923nw24g5b0gv0kmzj9jkkmc8366k86r0zxk6z53",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.206.a/linux-hardened-4.14.206.a.patch"
     },
     "4.19": {
         "name": "linux-hardened-4.19.156.a.patch",

From 7bfbd07c06cc792c9f31e01394de1231b372f7b0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 15:11:41 -0500
Subject: [PATCH 2170/3942] linux/hardened/patches/4.19: 4.19.156.a ->
 4.19.157.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 6655f3dde459..68704dffce59 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -5,9 +5,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.206.a/linux-hardened-4.14.206.a.patch"
     },
     "4.19": {
-        "name": "linux-hardened-4.19.156.a.patch",
-        "sha256": "1f3di0fvsfs9p549nna67i108v3730hc5mjyh8lk07s2bbigi09z",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.156.a/linux-hardened-4.19.156.a.patch"
+        "name": "linux-hardened-4.19.157.a.patch",
+        "sha256": "159v7z1a55b5kcmkrdna18hvcnscxf79r00kvr0kl8flvsnhf1p0",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.157.a/linux-hardened-4.19.157.a.patch"
     },
     "5.4": {
         "name": "linux-hardened-5.4.76.a.patch",

From feab19926f2c9a7d7f127ce754d0a5587e181d1c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 15:11:43 -0500
Subject: [PATCH 2171/3942] linux/hardened/patches/5.4: 5.4.76.a -> 5.4.77.a

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

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 68704dffce59..3660c37e35d8 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -10,9 +10,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.157.a/linux-hardened-4.19.157.a.patch"
     },
     "5.4": {
-        "name": "linux-hardened-5.4.76.a.patch",
+        "name": "linux-hardened-5.4.77.a.patch",
         "sha256": "0b47id64vi55s7lmyasmvhwbfcv9cjwfhw9g4lf220g0rnl6h8jm",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.76.a/linux-hardened-5.4.76.a.patch"
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.77.a/linux-hardened-5.4.77.a.patch"
     },
     "5.8": {
         "name": "linux-hardened-5.8.18.a.patch",

From 413237b4edcabede6dab53664c4d051d4c1d109f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Nov 2020 15:11:45 -0500
Subject: [PATCH 2172/3942] linux/hardened/patches/5.9: 5.9.7.a -> 5.9.8.a

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

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 3660c37e35d8..101b8fdb6c80 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -20,8 +20,8 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch"
     },
     "5.9": {
-        "name": "linux-hardened-5.9.7.a.patch",
+        "name": "linux-hardened-5.9.8.a.patch",
         "sha256": "1sb4rsd3yfh49aqg5j24zav9x38c44q7d9pyx6pb8pl368rd26l4",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.7.a/linux-hardened-5.9.7.a.patch"
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.8.a/linux-hardened-5.9.8.a.patch"
     }
 }

From d6af8fd0dcd9e9c4b9aadb471a87302b334c0954 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Wed, 11 Nov 2020 13:40:31 -0800
Subject: [PATCH 2173/3942] bluespec maintainer flokli -> jcumming (#103487)

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

diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix
index 09e76d63235c..e1728e8c9318 100644
--- a/pkgs/development/compilers/bluespec/default.nix
+++ b/pkgs/development/compilers/bluespec/default.nix
@@ -90,6 +90,6 @@ in stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ];
     # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562
     # aarch64 fails, as GHC fails with "ghc: could not execute: opt"
-    maintainers = with stdenv.lib.maintainers; [ flokli thoughtpolice ];
+    maintainers = with stdenv.lib.maintainers; [ jcumming thoughtpolice ];
   };
 }

From ac35114c8946bce220240942db1e10542373e922 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 11 Nov 2020 22:51:22 +0100
Subject: [PATCH 2174/3942] qrencode: 4.0.2 -> 4.1.1

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

diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix
index 83d2db6a26b9..2c60c4c10d07 100644
--- a/pkgs/development/libraries/qrencode/default.nix
+++ b/pkgs/development/libraries/qrencode/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qrencode";
-  version = "4.0.2";
+  version = "4.1.1";
 
   outputs = [ "bin" "out" "man" "dev" ];
 
   src = fetchurl {
     url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz";
-    sha256 = "079v3a15ydpr67zdi3xbgvic8n2kxvi0m32dyz8jaik10yffgayv";
+    sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4=";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From a73467d0aa099550a05788ac95b9e66296a76bcf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 21:55:31 +0000
Subject: [PATCH 2175/3942] procs: 0.10.5 -> 0.10.7

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

diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 528a4467bb82..05d0f7c7c290 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.10.5";
+  version = "0.10.7";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0w6a8pfk5s30yi5038kdqh4dncx2pskm7a23z66c4xj3842ci79c";
+    sha256 = "0aaspzx8sna1m5zldql0ps3sldazwr32q0md0p8z3nimww24i3b3";
   };
 
-  cargoSha256 = "07fwznx2czk1ibb77xcfhma9dpqps0m7rsmbb90gah6f32gah617";
+  cargoSha256 = "1nb38nnmmc4hf8crp0bka029hlph15zm796nqziq25i26cgz4xvp";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 0f527d07c56cffa3e0fc3968fc28539c5974ffb4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 22:27:15 +0000
Subject: [PATCH 2176/3942] pt2-clone: 1.23 -> 1.24

---
 pkgs/applications/audio/pt2-clone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix
index eaabcf4bef7d..8a0cd99ff2ba 100644
--- a/pkgs/applications/audio/pt2-clone/default.nix
+++ b/pkgs/applications/audio/pt2-clone/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pt2-clone";
-  version = "1.23";
+  version = "1.24";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "pt2-clone";
     rev = "v${version}";
-    sha256 = "1vixpp0vqpawqviwl44wn8zf602zyyrgqnjzrlwjrmdzydx9c93y";
+    sha256 = "0lw18943dqgydgl4byk440j016m486s82k6hhqjn3w75108b7w1r";
   };
 
   nativeBuildInputs = [ cmake ];

From 11c8a6e4f73cb9b70cd0e873e0d5d70c25d91ccc Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 11 Nov 2020 23:26:21 +0100
Subject: [PATCH 2177/3942] vagrant: 2.2.11 -> 2.2.13

https://github.com/hashicorp/vagrant/blob/v2.2.13/CHANGELOG.md#2213-november-06-2020
---
 pkgs/development/tools/vagrant/default.nix | 4 ++--
 pkgs/development/tools/vagrant/gemset.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 24f93f55effb..3d5fe88bfccd 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -5,9 +5,9 @@
 let
   # NOTE: bumping the version and updating the hash is insufficient;
   # you must use bundix to generate a new gemset.nix in the Vagrant source.
-  version = "2.2.11";
+  version = "2.2.13";
   url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
-  sha256 = "sha256-KDQDEMebqQYgsBroHmQrm/OJWTES9C9eGl0dDHTBpIc=";
+  sha256 = "sha256-NN+8t08yycINbtxOjhOWU96nJ0fZKDAopEr3WyAeG8U=";
 
   deps = bundlerEnv rec {
     name = "${pname}-${version}";
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix
index f1b9fa119798..c18b9818f33a 100644
--- a/pkgs/development/tools/vagrant/gemset.nix
+++ b/pkgs/development/tools/vagrant/gemset.nix
@@ -138,10 +138,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi";
+      sha256 = "07q48aca4r782jh53znqq7ams4pcf1dhmq21dwhyxzjqfclcb48g";
       type = "gem";
     };
-    version = "3.2.1";
+    version = "3.3.0";
   };
   little-plugger = {
     groups = ["default"];

From b7df52351afd11521ccdfce66eb00ef408548937 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 21:25:11 +0000
Subject: [PATCH 2178/3942] python27Packages.colorlog: 4.2.1 -> 4.4.0

---
 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 a7a04c1f605d..a29894fcf427 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 = "4.2.1";
+  version = "4.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "066i7904vc7814gqnlprksf0ikz2dmviw93r2mr7sf53qci5irbm";
+    sha256 = "0272c537469ab1e63b9915535874d15b671963c9325db0c4891a2aeff97ce3d1";
   };
 
   checkInputs = [ pytest ];

From 7e0dc8e35e13adcf75ed37afa7258f85331f9a6f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 22:33:12 +0000
Subject: [PATCH 2179/3942] pure-prompt: 1.13.0 -> 1.15.0

---
 pkgs/shells/zsh/pure-prompt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix
index bfcd3be5e9cf..ac7035045bb1 100644
--- a/pkgs/shells/zsh/pure-prompt/default.nix
+++ b/pkgs/shells/zsh/pure-prompt/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "pure-prompt";
-  version = "1.13.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "sindresorhus";
     repo = "pure";
     rev = "v${version}";
-    sha256 = "16q9v4c8lagp4vxm7qhagilqnwf1g4pbds56x5wfj4cwc0x2gclw";
+    sha256 = "0r4y8bglwdq85dwlxh9sm23ppzy1z7i8kmjny5mx9css0likj8qv";
   };
 
   installPhase = ''

From d7f38d2fcc726d4327b340d3f6f8966801b64b76 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 05:34:22 +0000
Subject: [PATCH 2180/3942] dt-schema: 2020.8.1 -> 2020.11

---
 pkgs/development/tools/dt-schema/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix
index 776a3b06143a..0392c4c95f9d 100644
--- a/pkgs/development/tools/dt-schema/default.nix
+++ b/pkgs/development/tools/dt-schema/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "dtschema";
-  version = "2020.8.1";
+  version = "2020.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5c98202abb4977aac6a2995a7f4ed2f7e51739db6fd72861d29681f865c27c1b";
+    sha256 = "ad052d293eadb5b64631bfffac62c496427ad4105e76eef19a5422ba762ee734";
   };
 
   nativeBuildInputs = [ setuptools_scm git ];

From dcab90488ca74c77164a5ba2f2464219d83dffbd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 01:45:03 +0000
Subject: [PATCH 2181/3942] dasm: 2.20.14 -> 2.20.14.1

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

diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/development/compilers/dasm/default.nix
index 6ab729cd3139..627ac36329a0 100644
--- a/pkgs/development/compilers/dasm/default.nix
+++ b/pkgs/development/compilers/dasm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dasm";
-  version = "2.20.14";
+  version = "2.20.14.1";
 
   src = fetchFromGitHub {
     owner = "dasm-assembler";
     repo = "dasm";
     rev = version;
-    sha256 = "09hzw228j43a78624bmq9cam7y1fjs48d3hpjqh2gn8iwnyk0pnp";
+    sha256 = "1bna0bj503xyn5inwzzsrsgi9qg8p20by4dfk7azj91ynw56pl41";
   };
 
   configurePhase = false;

From 855fc08b1b6f76d709b2bb292299d03b7bc9e0c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 08:09:25 +0000
Subject: [PATCH 2182/3942] gqrx: 2.13.2 -> 2.13.5

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

diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index 786e463686f6..106d2103ec40 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
 
 mkDerivation rec {
   pname = "gqrx";
-  version = "2.13.2";
+  version = "2.13.5";
 
   src = fetchFromGitHub {
     owner = "csete";
     repo = "gqrx";
     rev = "v${version}";
-    sha256 = "1lcy9gqb1x9fwq550bywj7h66rdacq5893wsax1p7qvqa27d945b";
+    sha256 = "168wjad5g0ka555hwsciwbj7fqx1c89q59hq1yxj8aiyp5kfcahx";
   };
 
   nativeBuildInputs = [ cmake ];

From 473f39b65bacc6eeb14142454c596614e5b9cb6b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 11:02:38 +0000
Subject: [PATCH 2183/3942] k9s: 0.23.3 -> 0.23.10

---
 pkgs/applications/networking/cluster/k9s/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index f26697f05611..ec5b6f44c6f8 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "k9s";
-  version = "0.23.3";
+  version = "0.23.10";
 
   src = fetchFromGitHub {
     owner  = "derailed";
     repo   = "k9s";
     rev    = "v${version}";
-    sha256 = "0jdrjsv6miprw0bj964rgkbci4xdwfi536z3px93i2n9zrhhawpn";
+    sha256 = "0nfgi67ja36mymhcyh4902680pkfnk4g8j8nbajksx9nfp53n91v";
   };
 
   buildFlagsArray = ''
@@ -18,7 +18,7 @@ buildGoModule rec {
       -X github.com/derailed/k9s/cmd.commit=${src.rev}
   '';
 
-  vendorSha256 = "105vmy8agl3ppgi28wg7djx0jrfam7nxfvvlps9ycgyrv2qpjh2n";
+  vendorSha256 = "116aidry55917ays7rn5r5kj17nbgb9qi16bplml9kxfkjv072kz";
 
   doCheck = false;
 

From 03b81ea8293a60d191ee01ab85cd288009b37ac0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 05:17:45 +0000
Subject: [PATCH 2184/3942] pipenv: 2020.8.13 -> 2020.11.4

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

diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix
index 3a6ea879e58b..f8b800745dc6 100644
--- a/pkgs/development/tools/pipenv/default.nix
+++ b/pkgs/development/tools/pipenv/default.nix
@@ -18,11 +18,11 @@ let
 
 in buildPythonApplication rec {
   pname = "pipenv";
-  version = "2020.8.13";
+  version = "2020.11.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eff0e10eadb330f612edfa5051d3d8e775e9e0e918c3c50361da703bd0daa035";
+    sha256 = "d6ac39d1721517b23aca12cdb4c726dc318ec4d7bdede5c1220bbb81775005c3";
   };
 
   LC_ALL = "en_US.UTF-8";

From 51a1f280b480d055eccfb51671202d67c488514e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 01:57:38 +0000
Subject: [PATCH 2185/3942] qpdf: 10.0.1 -> 10.0.3

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

diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 9405e18edabd..c098680d27a9 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qpdf";
-  version = "10.0.1";
+  version = "10.0.3";
 
   src = fetchFromGitHub {
     owner = "qpdf";
     repo = "qpdf";
     rev = "release-qpdf-${version}";
-    sha256 = "0g3rqf4wd1n9cms7ra1jnszsgw5bygv37jq2l20d8z5fajckhyyi";
+    sha256 = "14c4ig51hhrvrwhhriklylp40349xqgd3filajsvqk9vaww6na7f";
   };
 
   nativeBuildInputs = [ perl ];

From 145f20d1e729b3ab3730ac5c250e3087eb8ba00c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 00:07:43 +0000
Subject: [PATCH 2186/3942] catch2: 2.13.2 -> 2.13.3

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

diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index 6d6282debf97..4e41f39b49b1 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "2.13.2";
+  version = "2.13.3";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     rev = "v${version}";
-    sha256="100r0kmra8jmra2hv92lzvwcmphpaiccwvq3lpdsa5b7hailhach";
+    sha256="0m7pwsam1nb93akgnf5fxi737pgbrbcj0y28bavhzcss7yrm4gys";
   };
 
   nativeBuildInputs = [ cmake ];

From eb6a8495cef6f1af30cc13605dff3b3900da357f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 11:42:05 +0000
Subject: [PATCH 2187/3942] kubelogin: 0.0.6 -> 0.0.7

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

diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix
index 4d883553bc30..ced9c43876f6 100644
--- a/pkgs/applications/networking/cluster/kubelogin/default.nix
+++ b/pkgs/applications/networking/cluster/kubelogin/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "kubelogin";
-  version = "0.0.6";
+  version = "0.0.7";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = pname;
     rev = "v${version}";
-    sha256 = "18rkjdl8asr5c1kgdm2iqb5qwkfcrv2sk3nns3hhfqzs2v9mxmha";
+    sha256 = "0jw8v6ff0iwkwxlhcr35cvhy4zg31dsm1s3q4fxgi901yj1wn6zy";
   };
 
   vendorSha256 = "0al8y65xvnwl34jkpqyf6zwr21xn30zswknlym9nnn1n47fyayxb";

From 019c3bb417153a2b80f483891f7f0981f6d327a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 20:41:25 +0000
Subject: [PATCH 2188/3942] pistol: 0.1.4 -> 0.1.7

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

diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix
index dfbe5536bccc..d5061d61f57b 100644
--- a/pkgs/tools/misc/pistol/default.nix
+++ b/pkgs/tools/misc/pistol/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "pistol";
-  version = "0.1.4";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "doronbehar";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1x9wb0gj5l71xz15ia0i2hrnhcpf457i21w41jzw2ink2fbdxp3b";
+    sha256 = "0kspix7ac4fb0gblrlhnf8hi2ijc997qqkhmy47jibmj6120lmqk";
   };
 
-  vendorSha256 = "0dg4f9g6895nv3c6d74ijl6hzsyn620ndspbcq7ynvb1z0hsg6iz";
+  vendorSha256 = "08fjavadx5mwibzc130mlhp4zph6iwv15xnd4rsniw6zldkzmczy";
 
   doCheck = false;
 

From db0db5c09ff7dca3651424c6fd5b3f46d92af6fa Mon Sep 17 00:00:00 2001
From: Finn Behrens <me@kloenk.de>
Date: Wed, 11 Nov 2020 21:58:26 +0100
Subject: [PATCH 2189/3942] netatalk: remove glibc input

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

diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix
index f7732cd76fd7..6abad445517b 100644
--- a/pkgs/tools/filesystems/netatalk/default.nix
+++ b/pkgs/tools/filesystems/netatalk/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, autoreconfHook, pkgconfig, perl, python
 , db, libgcrypt, avahi, libiconv, pam, openssl, acl
-, ed, glibc, libevent
+, ed, libtirpc, libevent
 }:
 
 stdenv.mkDerivation rec {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     /^afpd_LDADD
     /am__append_2
     a
-      ${glibc.static}/lib/librpcsvc.a \\
+      ${libtirpc}/lib/libtirpc.so \\
     .
     w
     EOF

From b3c6aac659a2cd75636d2ee04b3d8f9f6701a108 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 21:38:38 +0000
Subject: [PATCH 2190/3942] polkadot: 0.8.26 -> 0.8.26-1

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

diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index 193825445512..866adeea2780 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "polkadot";
-  version = "0.8.26";
+  version = "0.8.26-1";
 
   src = fetchFromGitHub {
     owner = "paritytech";
     repo = "polkadot";
     rev = "v${version}";
-    sha256 = "1bvma6k3gsjqh8w76k4kf52sjg8wxn1b7a409kmnmmvmd9j6z5ia";
+    sha256 = "17ji1gjrx3gzw4msaz9kgvm132y14wgh8z183l3mfw1cj44a6kqk";
   };
 
-  cargoSha256 = "0pacmmvvjgzmaxgg47qbfhqwl02jxj3i6vnmkjbj9npzqfmqf72d";
+  cargoSha256 = "07zwlwx02xw1y20br2c4grwv7bprhynqy7gav4qh3vw117ijpiqk";
 
   nativeBuildInputs = [ clang ];
 

From aec6a8069f91b9ed6a85c8dd8dc646e8afdd4a65 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 20:05:20 +0000
Subject: [PATCH 2191/3942] pcm: 202009 -> 202010

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

diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix
index 3e9a8d41b3a5..74042cf7023c 100644
--- a/pkgs/os-specific/linux/pcm/default.nix
+++ b/pkgs/os-specific/linux/pcm/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "202009";
+  version = "202010";
   pname = "pcm";
 
   src = fetchFromGitHub {
     owner = "opcm";
     repo = "pcm";
     rev = version;
-    sha256 = "1phkdmbgvrmv5w0xa4i2j9v7lcxkxjdhzi5x6l52z9y9as30dzbd";
+    sha256 = "00i7bp7hqwnphh7qyjydvz5s14ydj8rwivz995bdnd37582dyij9";
   };
 
   installPhase = ''

From 19484b9f57249977a3f2fc4200a5f492f9ba3f43 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 11 Nov 2020 19:57:31 +0100
Subject: [PATCH 2192/3942] pythonPackages.gtts-token: 1.1.3 -> 1.1.4

Enable checkPhase for the offline calculation test, disable the online
test.
---
 .../python-modules/gtts-token/default.nix     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/gtts-token/default.nix b/pkgs/development/python-modules/gtts-token/default.nix
index d3443ef0c97e..f3325aab8e6e 100644
--- a/pkgs/development/python-modules/gtts-token/default.nix
+++ b/pkgs/development/python-modules/gtts-token/default.nix
@@ -1,31 +1,35 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , requests
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "gtts-token";
-  version = "1.1.3";
+  version = "1.1.4";
 
-  src = fetchPypi {
-    pname = "gTTS-token";
-    inherit version;
-    sha256 = "9d6819a85b813f235397ef931ad4b680f03d843c9b2a9e74dd95175a4bc012c5";
+  src = fetchFromGitHub {
+    owner = "boudewijn26";
+    repo = "gTTS-token";
+    rev = "v${version}";
+    sha256 = "0vr52zc0jqyfvsccl67j1baims3cdx2is1y2lpx2kav9gadkn8hp";
   };
 
   propagatedBuildInputs = [
     requests
   ];
 
-  # Tests only in github repo, require working internet connection
-  doCheck = false;
+  checkInputs = [ pytestCheckHook ];
+
+  # requires internet access
+  disabledTests = [ "test_real" ];
 
   meta = with lib; {
     description = "Calculates a token to run the Google Translate text to speech";
     homepage = "https://github.com/boudewijn26/gTTS-token";
     license = licenses.mit;
-    maintainers = [ maintainers.makefu ];
+    maintainers = with maintainers; [ makefu ];
   };
 }
 

From 4c4538cd63bc06c4513cc82e3cfc626344c908e3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 11 Nov 2020 20:04:29 +0100
Subject: [PATCH 2193/3942] homeassistant: 0.117.5 -> 0.117.6

---
 pkgs/servers/home-assistant/component-packages.nix | 4 ++--
 pkgs/servers/home-assistant/default.nix            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index add9dcebde39..fa54c2b5f265 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.117.5";
+  version = "0.117.6";
   components = {
     "abode" = ps: with ps; [ abodepy ];
     "accuweather" = ps: with ps; [ accuweather ];
@@ -312,7 +312,7 @@
     "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib
     "google_pubsub" = ps: with ps; [ google_cloud_pubsub ];
     "google_translate" = ps: with ps; [ gtts-token ];
-    "google_travel_time" = ps: with ps; [ ]; # missing inputs: googlemaps
+    "google_travel_time" = ps: with ps; [ googlemaps ];
     "google_wifi" = ps: with ps; [ ];
     "gpmdp" = ps: with ps; [ websocket_client ];
     "gpsd" = ps: with ps; [ ]; # missing inputs: gps3
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index d0d88f73bc10..fb2909c32538 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.117.5";
+  hassVersion = "0.117.6";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    sha256 = "1al2pwj2xrhqyaz2pal4a1bdh4sm63ijfaw8pajghz5z23gf62r0";
+    sha256 = "1f9w7migwmdvnbiv4bi0b31zdfrsg87zgiz2l3gymn6w89f3h8y1";
   };
 
   # leave this in, so users don't have to constantly update their downstream patch handling

From 41f90a81c71c872aa861941429e1114ac6bdfd56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 05:01:22 +0000
Subject: [PATCH 2194/3942] faudio: 20.10 -> 20.11

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

diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix
index 2898eb937fc1..8f6123fb85ae 100644
--- a/pkgs/development/libraries/faudio/default.nix
+++ b/pkgs/development/libraries/faudio/default.nix
@@ -4,16 +4,16 @@
 
 stdenv.mkDerivation rec {
   pname = "faudio";
-  version = "20.10";
+  version = "20.11";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FAudio";
     rev = version;
-    sha256 = "0f5b45zdsy3yv2jsdy5zsd6xcfk1z5w5vlyvnim3d4bn875sp370";
+    sha256 = "0mc8dkdmvkaq418vwn6y9d7fbcdp47djc38rly7b4zarl8hwmc4q";
   };
 
-	nativeBuildInputs = [cmake];
+  nativeBuildInputs = [cmake];
 
   buildInputs = [ SDL2 ];
 

From 21bc6aaf19b0fe585bf0f4df63b77179d8c3fb54 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 20:19:58 +0000
Subject: [PATCH 2195/3942] pgcenter: 0.6.5 -> 0.6.6

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

diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix
index a84ad1fadb08..601694ebc37d 100644
--- a/pkgs/tools/misc/pgcenter/default.nix
+++ b/pkgs/tools/misc/pgcenter/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pgcenter";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner  = "lesovsky";
     repo   = "pgcenter";
     rev    = "v${version}";
-    sha256 = "03n1gn944z6rz5g643y68hvfxpxp65mip32w1zx43xr60x1vpf2v";
+    sha256 = "1axwsclssxsg38ppdmd4v1lbs87ksrwj5z76ckjk8jjfni1xp9sr";
   };
 
   vendorSha256 = "1mzvpr12qh9668iz97p62zl4zhlrcyfgwr4a9zg9irj585pkb5x2";

From a52b343b39716017ee3fddc15b4de8ed28341928 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Wed, 11 Nov 2020 22:22:12 +0200
Subject: [PATCH 2196/3942] oxipng: 3.0.1 -> 4.0.0

---
 pkgs/tools/graphics/oxipng/default.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix
index 965c799a217f..cdb8a16708e0 100644
--- a/pkgs/tools/graphics/oxipng/default.nix
+++ b/pkgs/tools/graphics/oxipng/default.nix
@@ -1,20 +1,15 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchCrate, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  version = "3.0.1";
+  version = "4.0.0";
   pname = "oxipng";
 
-  src = fetchFromGitHub {
-    owner = "shssoichiro";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "11lncwxksm7aqczy9ay1qnba2wmgfsirhgrl6vv1jlgj41b7mzi5";
+  src = fetchCrate {
+    inherit version pname;
+    sha256 = "0p9h006l75ci324lbcx496732pb77srcd46g6dnfw3mcrg33cspc";
   };
 
-  cargoSha256 = "0lalb981qzlnmqfg170mh6lnc0qlzb94wc39mf859g2jvxk3pkrl";
-
-  # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust
-  cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ];
+  cargoSha256 = "1r2zw7p95abxqc31b5gswdyhm4msxsiml34dsh9x8zydhqnwy17j";
 
   doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
 

From 79d04a7cdb2c1b72d19a65c0c46a6ed2babb048a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 18:44:36 +0000
Subject: [PATCH 2197/3942] onefetch: 2.7.0 -> 2.7.1

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

diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix
index ba210ca36325..4b35d23940de 100644
--- a/pkgs/tools/misc/onefetch/default.nix
+++ b/pkgs/tools/misc/onefetch/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "onefetch";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "o2sh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-9HZLr/dwr5T1m6H/SHy9ULfKMkyrLNb2Z8W3RlSWzGM=";
+    sha256 = "1l4acikxkxvmdqn10ck4w4f100vz7kfrzghz5h4haj7ycrr35j3l";
   };
 
-  cargoSha256 = "sha256-cyffVX1XEF5zaNbk/VeZEtKG/Npwv5Yzz9OU5G9UyGc=";
+  cargoSha256 = "0rmy0jnf5rqd4dqyl6rinxb3n3rzqnixrybs4i27lcas9m753z40";
 
   buildInputs = with stdenv;
     lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];

From f4a88761441b53e7845ade89483198ef6a46d32a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 22:59:10 +0000
Subject: [PATCH 2198/3942] rabbitmq-server: 3.8.8 -> 3.8.9

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

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 2d0d4abd9141..2d55e0da85c3 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -8,12 +8,12 @@
 stdenv.mkDerivation rec {
   pname = "rabbitmq-server";
 
-  version = "3.8.8";
+  version = "3.8.9";
 
   # when updating, consider bumping elixir version in all-packages.nix
   src = fetchurl {
     url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "14rzlikaqxi7cvpy4np1s1pnkila547zdxsb7nl4ilman1zwdgk7";
+    sha256 = "0b252l9r45h8r5gibdqcn6hhbm8g6rfzhm1k9d39pwhs5x77cjqv";
   };
 
   buildInputs =

From 6109d8bc04103b5a2ea87bf6be50031531d71cba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 17:21:43 +0000
Subject: [PATCH 2199/3942] mutagen: 0.11.7 -> 0.11.8

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

diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix
index ca75bf34dd13..8d71f75622c7 100644
--- a/pkgs/tools/misc/mutagen/default.nix
+++ b/pkgs/tools/misc/mutagen/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "mutagen";
-  version = "0.11.7";
+  version = "0.11.8";
 
   src = fetchFromGitHub {
     owner = "mutagen-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "11wp94khj9bzmadij0nq6i6q0x9z6h0zy4a6fhf322y5nxsmvcgy";
+    sha256 = "17ycd2y7hgwa2yxbin86i6aj67x7xaajwz3mqgdyfvkja5hgbjyr";
   };
 
   vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l";

From 1e53f7e10be36f6b89ded4504067213c26e670bd Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 12 Nov 2020 08:17:12 +1000
Subject: [PATCH 2200/3942] gitAndTools.gh: 1.2.0 -> 1.2.1

https://github.com/cli/cli/releases/tag/v1.2.1
---
 .../version-management/git-and-tools/gh/default.nix   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 4fe805f752ce..767e471f8a36 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "17hbgi1jh4p07r4p5mr7w7p01i6zzr28mn5i4jaki7p0jwfqbvvi";
+    sha256 = "1lk3lhw598v966c553a3j0bp6vhf03xg7ggv827vzs1s8gnhxshz";
   };
 
-  vendorSha256 = "0ybbwbw4vdsxdq4w75s1i0dqad844sfgs69b3vlscwfm6g3i9h51";
+  vendorSha256 = "0bkd2ndda6w8pdpvw8hhlb60g8r6gbyymgfb69dvanw5i5shsp5q";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -30,9 +30,8 @@ buildGoModule rec {
     done
   '';
 
-  checkPhase = ''
-    make test
-  '';
+  # fails with `unable to find git executable in PATH`
+  doCheck = false;
 
   meta = with lib; {
     description = "GitHub CLI tool";

From 32584c4561f6bd331a8a6b60666205082da97e05 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 14:22:32 +0000
Subject: [PATCH 2201/3942] livepeer: 0.5.11 -> 0.5.12

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

diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix
index 5430c7ddf068..959e82d259b1 100644
--- a/pkgs/servers/livepeer/default.nix
+++ b/pkgs/servers/livepeer/default.nix
@@ -4,7 +4,7 @@
 
 buildGoModule rec {
   pname = "livepeer";
-  version = "0.5.11";
+  version = "0.5.12";
 
   runVend = true;
   vendorSha256 = "13cgwpf3v4vlvb0mgdxsdybpghx1cp3fzkdwmq8b193a8dcl8s63";
@@ -13,7 +13,7 @@ buildGoModule rec {
     owner = "livepeer";
     repo = "go-livepeer";
     rev = "v${version}";
-    sha256 = "12vbnl74z6jk77bnws8a5z5n7bnhkbb4ngzxfir5l3g9zrpsc5p3";
+    sha256 = "15gx6pd6zn40x60p07dyaf1ydxvrg372lk3djp302mph8y0ijqfg";
   };
 
   # livepeer_cli has a vendoring problem

From 97bba96ba463d932c5ed97e2da21824f35b34192 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 23:11:58 +0000
Subject: [PATCH 2202/3942] rar2fs: 1.29.1 -> 1.29.2

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

diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix
index 816aa1498cc6..889f075645a3 100644
--- a/pkgs/tools/filesystems/rar2fs/default.nix
+++ b/pkgs/tools/filesystems/rar2fs/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rar2fs";
-  version = "1.29.1";
+  version = "1.29.2";
 
   src = fetchFromGitHub {
     owner = "hasse69";
     repo = pname;
     rev = "v${version}";
-    sha256 = "03m20bnlm70xamrxnswxs4fzc2lr2wr6f7jq6b3a8sdwq3pqbzzx";
+    sha256 = "0j7ai0gcbln2lyfc87xxmj0zpf3lnqa6fdm5rar3kdqhczb7s93y";
   };
 
   postPatch = ''

From a2e71c49e68c3d5424f9df5c1e7a02cfcdbd03fb Mon Sep 17 00:00:00 2001
From: JesusMtnez <jesusmartinez93@gmail.com>
Date: Wed, 11 Nov 2020 12:26:39 +0100
Subject: [PATCH 2203/3942] vscode-extensions.scala-lang.scala: 0.3.8 -> 0.4.5

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

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 53796981e59c..4a6997739b8a 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -179,8 +179,8 @@ stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs)
     mktplcRef = {
       name = "scala";
       publisher = "scala-lang";
-      version = "0.3.8";
-      sha256 = "17dl10m3ayf57sqgil4mr9fjdm7i8gb5clrs227b768pp2d39ll9";
+      version = "0.4.5";
+      sha256 = "0nrj32a7a86vwc9gfh748xs3mmfwbc304dp7nks61f0lx8b4wzxw";
     };
     meta = {
       license = stdenv.lib.licenses.mit;

From 8281820c96651de93b37563971d17506b1d721af Mon Sep 17 00:00:00 2001
From: JesusMtnez <jesusmartinez93@gmail.com>
Date: Wed, 11 Nov 2020 12:23:04 +0100
Subject: [PATCH 2204/3942] vscode-extensions.scalameta.metals: 1.9.4 -> 1.9.6

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

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 4a6997739b8a..cd1d4ab28505 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -191,8 +191,8 @@ stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs)
     mktplcRef = {
       name = "metals";
       publisher = "scalameta";
-      version = "1.9.4";
-      sha256 = "029s1al1f3qk4pa3539rs045g9jwkhbmdg7wj7biqc6shcria4ca";
+      version = "1.9.6";
+      sha256 = "12sjzk64kz7z8zqh3zg1dyb3v4c5xxgi1ain1jvw8hwf0hicqlgi";
     };
     meta = {
       license = stdenv.lib.licenses.asl20;

From 5420cb2904667a473cc13e0a02c5ee023333f293 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Wed, 11 Nov 2020 11:00:09 +0100
Subject: [PATCH 2205/3942] metals: 0.9.4 -> 0.9.5

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

diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index 55125fbeff45..19e666ced11a 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "metals";
-  version = "0.9.4";
+  version = "0.9.5";
 
   deps = stdenv.mkDerivation {
     name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "1k07gg13z3kambvvrxsc27781cd5npb2a50ahdbj7x6j6h67k0pg";
+    outputHash     = "1hcfnxxahh3yfkpz6ybfr9xsf5mx008rhn7q6p8pmfxrgkdh4c1l";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From fa1165d700eb23f0e01d9d5a39f7fd262cca0595 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 17:29:18 +0000
Subject: [PATCH 2206/3942] nanoflann: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix
index 8480cc868c1f..12389406aa16 100644
--- a/pkgs/development/libraries/nanoflann/default.nix
+++ b/pkgs/development/libraries/nanoflann/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, cmake}:
 
 stdenv.mkDerivation rec {
-  version = "1.3.1";
+  version = "1.3.2";
   pname = "nanoflann";
   
   src = fetchFromGitHub {
     owner = "jlblancoc";
     repo = "nanoflann";
     rev = "v${version}";
-    sha256 = "07vi3yn5y9zk9acdbxy954ghdml15wnyqfizzqwsw8zmc9bf30ih";
+    sha256 = "0lq1zqwjvk8wv15hd7aw57jsqbvv45cwb8ngdh1d2iyw5rvnbhsn";
   };
 
   buildInputs = [ cmake ];

From e84ac7ff3bc9b38ec9348d947e4b119b26ccb7e2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 11 Nov 2020 15:06:00 -0800
Subject: [PATCH 2207/3942] nanoflann: remove extra whitespace

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

diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix
index 12389406aa16..3bd6bb02a054 100644
--- a/pkgs/development/libraries/nanoflann/default.nix
+++ b/pkgs/development/libraries/nanoflann/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "1.3.2";
   pname = "nanoflann";
-  
+
   src = fetchFromGitHub {
     owner = "jlblancoc";
     repo = "nanoflann";

From f7485d07b58001870ed713616dc2d4cfb879c3f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 11:58:11 +0000
Subject: [PATCH 2208/3942] lean: 3.21.0 -> 3.23.0

---
 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 749220382c64..88e1b4fbc0e1 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lean";
-  version = "3.21.0";
+  version = "3.23.0";
 
   src = fetchFromGitHub {
     owner  = "leanprover-community";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "1c7f2x6hdamjkr50761gcb5mg8hhlc75k1mf18vn1k9zsy1gxlgz";
+    sha256 = "09mklc1p6ms1jayg2f89hqfmhca3h5744lli936l38ypn1d00sxx";
   };
 
   nativeBuildInputs = [ cmake ];

From 7fad668515dc13f7c32215827cf75e00808c423b Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Wed, 11 Nov 2020 10:55:57 +0100
Subject: [PATCH 2209/3942] bloop: 1.4.4 -> 1.4.5

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

diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 61a6b4bed4c0..4c6d47ecb189 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bloop";
-  version = "1.4.4";
+  version = "1.4.5";
 
   bloop-coursier-channel = fetchurl {
     url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";
-    sha256 = "1pyf559bpnsmvca4kw36nb9lwkwa9q0ghrpa117s96dhvrp3i2bv";
+    sha256 = "0a3ayvq62nbfrcs2xgrfqg27h0wf9x28pxabmwd8y0ncafsnifjy";
   };
 
   bloop-bash = fetchurl {
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = if stdenv.isLinux && stdenv.isx86_64 then "0hf0priy93zqba78a9nvbgl3mzwlc4jz43gz7cv2cdkj6x0lp0y1"
-                     else if stdenv.isDarwin && stdenv.isx86_64 then "0g2rnmlfnqymji4f4rn0kaz7hipgv3bakdpn08600gg1f3s8gabw"
+    outputHash     = if stdenv.isLinux && stdenv.isx86_64 then "0wh02djny3a9882423lh4kf67z981d1ky85gfphsw52fbdhbzmn9"
+                     else if stdenv.isDarwin && stdenv.isx86_64 then "0db30zbqpa9q285hspaba124dfnnr1gmlrxwwvn9szxz1d55n417"
                      else throw "unsupported platform";
   };
 

From 416f9732d4632fdcc2c8e9057ec411d5b66e35ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 23:22:35 +0000
Subject: [PATCH 2210/3942] rednotebook: 2.19 -> 2.20

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

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index 0cfa2b62dce3..a6e69cf869e9 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonApplication rec {
   pname = "rednotebook";
-  version = "2.19";
+  version = "2.20";
 
   src = fetchFromGitHub {
     owner = "jendrikseipp";
     repo = "rednotebook";
     rev = "v${version}";
-    sha256 = "1y5slcwgs6p5n52whhhjg0c7053688311wnc9wqrk7vjk10qkx9d";
+    sha256 = "1n0zwrzrjh6sg8vmb95mgscsqrylhgm51zsirblqmpvs392jxrk3";
   };
 
   # We have not packaged tests.

From c112ab2f1d564d1500a780313f80660665fb8525 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Wed, 11 Nov 2020 11:15:41 +0100
Subject: [PATCH 2211/3942] dotnetCorePackages.net_5_0: init at version 5.0.0

---
 pkgs/development/compilers/dotnet/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index b4d6a0933e9a..fa4bebb52b3e 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -105,6 +105,15 @@ rec {
 
   # v5.0.0
 
+  net_5_0 = buildNetCore {
+    version = "5.0.0";
+    sha512 = {
+      x86_64-linux = "d4d67df5ff5f6dde0d865a6e87559955bd57429df396cf7d05fe77f09e6220c67dc5e66439b1801ca4d301a62f81f666122bf4b623b31a46b861677dcafc62a4";
+      aarch64-linux = "c7a5ae2bd4e0edbd3b681c2997ebf1633bfa1cd30a4333cb63fc9945b4e7c9278282516fb5bc22c710ce6fb59dc2e28230c07b0e99826165fa148406ab8afb0f";
+      x86_64-darwin = "eba97211e158a0c1c15b03a79b42027319d83456dc377a2513c32defb560cd43fcfa1e84154a43243b77ca6b454c4dbc32be4153f0ba9c954c7b1e69ab5d7c53";
+    };
+  };
+
   sdk_5_0 = buildNetCoreSdk {
     version = "5.0.100-rc.1.20452.10";
     sha512 = {

From a3604fc39d87d3384dc5b0cded27f0a413d8bbcd Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Wed, 11 Nov 2020 11:16:01 +0100
Subject: [PATCH 2212/3942] dotnetCorePackages.aspnetcore_5_0: init at version
 5.0.0

---
 pkgs/development/compilers/dotnet/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index fa4bebb52b3e..db1fa786f487 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -105,6 +105,15 @@ rec {
 
   # v5.0.0
 
+  aspnetcore_5_0 = buildAspNetCore {
+    version = "5.0.0";
+    sha512 = {
+      x86_64-linux = "402046ee144915ef7d75a788cf19552eea56cf897681721b74bfc403fd366f71eb7e56f6b83ea299b6b812c6b87378c15e7bfe249415427dcd147dfeacd084d0";
+      aarch64-linux = "13e174de1cf10135531468c2a76852de2c37253f4d8b487ff25d249c2d7a1c590475545ca246515338baff2950422ec6c5ffe2180e8327f25cb5f9fede696ccc";
+      x86_64-darwin = "b47a9958f5412b22edb2cb47702ad442c389901ede3ca2a7f75d901f8ed608494431849f498c2191327065ff1db52a1658b1a8c0feb53aaec4c814fb0baf6818";
+    };
+  };
+
   net_5_0 = buildNetCore {
     version = "5.0.0";
     sha512 = {

From e60fc2ca56ca3aad77d42818839529fe12fcbcf3 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Wed, 11 Nov 2020 11:17:19 +0100
Subject: [PATCH 2213/3942] dotnetCorePackages.sdk_5_0: 5.0.100-rc.1.20452.10
 -> 5.0.100

---
 pkgs/development/compilers/dotnet/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index db1fa786f487..54784ea63cc8 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -124,11 +124,11 @@ rec {
   };
 
   sdk_5_0 = buildNetCoreSdk {
-    version = "5.0.100-rc.1.20452.10";
+    version = "5.0.100";
     sha512 = {
-      x86_64-linux = "d7e709dacc4bb188c2380060d24bfb5b791240dc33af8499fb4a31e1885a9377dad1d1ebc76847432ea67d5e4ac832a31679dc293e09fa6dade28f5fbbe4db9b";
-      aarch64-linux = "2d04890c71e845d1eb08f5dfbbb9c93024d7a52fb1cc3fd50bd51bc6bd44e455c5c82abc8f04eef23bd012984ae5f86143c600ceb49c4c733935d95d5b68785f";
-      x86_64-darwin = "06bb40273071f3dd1e84ebf58abc7798795d5f1ac298f24bf7109d1597fd52ff31bcbf2b81f86d91d37ae293678d07f8da0469d7cbd318d19a8d718b6629dcac";
+      x86_64-linux = "bec37bfb327c45cc01fd843ef93b22b556f753b04724bba501622df124e7e144c303a4d7e931b5dbadbd4f7b39e5adb8f601cb6293e317ad46d8fe7d52aa9a09";
+      aarch64-linux = "5fceac0a9468097d66af25516da597eb4836b294ed1647ba272ade5c8faea2ed977a95d9ce720c44d71607fa3a0cf9de55afe0e66c0c89ab1cc6736945978204";
+      x86_64-darwin = "69ccc7c686ac06f6c658d118f59cf1a0e7284b4570375dd88d3e3043098e311745922301f2650d159624d09c4d39a1f3cbdd5daee0e408eef915de839e3bce8f";
     };
   };
 }

From a94cc8dc921112051cd477e4ded922acfd254fbe Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Wed, 11 Nov 2020 12:05:31 +0100
Subject: [PATCH 2214/3942] dotnet: document new net packages

---
 doc/languages-frameworks/dotnet.section.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md
index c56f4728bed8..88fd74db8256 100644
--- a/doc/languages-frameworks/dotnet.section.md
+++ b/doc/languages-frameworks/dotnet.section.md
@@ -64,9 +64,9 @@ $ dotnet --info
 
 The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project.
 
-## dotnetCorePackages.sdk vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore
+## dotnetCorePackages.sdk vs vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore
 
-The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications.
+The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version.
 
 ## Packaging a Dotnet Application
 

From 859a395209f811abd3864f68e88ca827c877932c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Nov 2020 16:30:14 +0000
Subject: [PATCH 2215/3942] moolticute: 0.44.0 -> 0.44.17

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

diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix
index c815a74e0197..bc825b94facb 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/applications/misc/moolticute/default.nix
@@ -9,13 +9,13 @@
 
 mkDerivation rec {
   pname = "moolticute";
-  version = "0.44.0";
+  version = "0.44.17";
 
   src = fetchFromGitHub {
     owner = "mooltipass";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1xlbhx6f1ysx8gka8g67271whzhkzsnkavpq3x58hdxr8v88khby";
+    sha256 = "1bqp99n8cqr7kjiffbs39v0dd280f50hid5py3c4zgc7aqj9k0bx";
   };
 
   outputs = [ "out" "udev" ];

From 2c09e7b07209ba6932711954bb85838972d1875e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 00:27:09 +0000
Subject: [PATCH 2216/3942] rnnoise-plugin: 0.9 -> 0.91

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

diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix
index efc8857e235e..6e2542e1db21 100644
--- a/pkgs/development/libraries/rnnoise-plugin/default.nix
+++ b/pkgs/development/libraries/rnnoise-plugin/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rnnoise-plugin";
-  version = "0.9";
+  version = "0.91";
 
   src = fetchFromGitHub {
     owner = "werman";
     repo = "noise-suppression-for-voice";
     rev = "v${version}";
-    sha256 = "18bq5b50xw3d4r1ildinafpg3isb9y216430h4mm9wr3ir7h76a7";
+    sha256 = "11pwisbcks7g0mdgcrrv49v3ci1l6m26bbb7f67xz4pr1hai5dwc";
   };
 
   buildInputs = [ cmake ];

From 3417932f7769f1ae8f386e5fac9380bef3d4a885 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 00:33:13 +0000
Subject: [PATCH 2217/3942] rootlesskit: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix
index d57a054a8b72..7edbeee88b51 100644
--- a/pkgs/tools/virtualization/rootlesskit/default.nix
+++ b/pkgs/tools/virtualization/rootlesskit/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   pname = "rootlesskit";
-  version = "0.10.0";
+  version = "0.11.0";
   goPackagePath = "github.com/rootless-containers/rootlesskit";
 
   src = fetchFromGitHub {
     owner = "rootless-containers";
     repo = "rootlesskit";
     rev = "v${version}";
-    sha256 = "0jrzqaczd5zxlbvh0hjym8pc1d7y8c66gslq3d3l5vv4z7hz7yfr";
+    sha256 = "1x5f02yw5bzkjwg7lcsa7549d8fj13dnk596rgg90q0z6vqfarzj";
   };
 
   meta = with lib; {

From 67a986a44aaf31e3e38a838c39cf55a7581db263 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 00:52:25 +0000
Subject: [PATCH 2218/3942] rr: 5.3.0 -> 5.4.0

---
 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 47832c5ae2a3..5e80d5b096db 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, python3Packages, which, procps, gdb, capnproto }:
 
 stdenv.mkDerivation rec {
-  version = "5.3.0";
+  version = "5.4.0";
   pname = "rr";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "rr";
     rev = version;
-    sha256 = "1x6l1xsdksnhz9v50p4r7hhmr077cq20kaywqy1jzdklvkjqzf64";
+    sha256 = "1sfldgkkmsdyaqa28i5agcykc63gwm3zjihd64g86i852w8al2w6";
   };
 
   postPatch = ''

From d3a30145c34cb86ecb9f55066414a4401bbacdee Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Wed, 11 Nov 2020 19:55:27 -0500
Subject: [PATCH 2219/3942] Make maintainer documentation more direct (#103455)

Additionally fixes the "list of names and emails" to be a list of maintainer expressions.

A follow-up from the discussion in https://github.com/NixOS/nixpkgs/pull/96666
---
 doc/stdenv/meta.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/stdenv/meta.xml b/doc/stdenv/meta.xml
index 67c7a23c32e0..c9d1b1362193 100644
--- a/doc/stdenv/meta.xml
+++ b/doc/stdenv/meta.xml
@@ -189,8 +189,7 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </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>. There is no restriction to becoming a maintainer, just add each new maintainer to that list in a separate commit titled 'maintainers: add alice', and reference maintainers with <literal>maintainers = with lib.maintainers; [ alice bob ]</literal>.
+      A list of the maintainers of this Nix expression. Maintainers are defined in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link>. There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled 'maintainers: add alice', and reference maintainers with <literal>maintainers = with lib.maintainers; [ alice bob ]</literal>.
      </para>
     </listitem>
    </varlistentry>

From a431ca04631b5af2090a392c8482e72a7fc23c2f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 00:58:24 +0000
Subject: [PATCH 2220/3942] rss-bridge: 2020-02-26 -> 2020-11-10

---
 pkgs/servers/web-apps/rss-bridge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix
index 73c2fcce3476..13ad9d69ad6b 100644
--- a/pkgs/servers/web-apps/rss-bridge/default.nix
+++ b/pkgs/servers/web-apps/rss-bridge/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rss-bridge";
-  version = "2020-02-26";
+  version = "2020-11-10";
 
   src = fetchFromGitHub {
     owner = "RSS-Bridge";
     repo = "rss-bridge";
     rev = version;
-    sha256 = "075k4bylx9308d083ry5a9q4629ccnrnndqqdqp1g42rzlqrw79q";
+    sha256 = "00cp61lqvhi7b7j0rglsqg3l7cg8s9b8vq098bgvg5dygyi44hyv";
   };
 
   patchPhase = ''

From 2386295d7ead711870160b287ea77f81fe3f523b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 01:05:32 +0000
Subject: [PATCH 2221/3942] rssguard: 3.7.2 -> 3.8.0

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

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index 40b67484360b..9ed20d7da647 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rssguard";
-  version = "3.7.2";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
     owner = "martinrotter";
     repo = pname;
     rev = version;
-    sha256 = "1l2ra06am6bgwb4q200lhi64sz3np1dzf2vpjh10znxbx0mahbq6";
+    sha256 = "1fkd5j4ppk36ly6b5pjgng2vksqj6jvpyysg1xz77h2rl4xkzmkw";
   };
 
   buildInputs =  [ qtwebengine qttools ];

From d3521527b4ad2358ce2b4fe523c616e4857a3db3 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 12 Nov 2020 04:10:14 +0300
Subject: [PATCH 2222/3942] zoom-us: support alsa

---
 .../networking/instant-messengers/zoom-us/default.nix         | 4 +++-
 1 file changed, 3 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 6c072118bc88..feac6ff8fa43 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -8,6 +8,7 @@
 # Runtime
 , coreutils, faac, pciutils, procps, utillinux
 , pulseaudioSupport ? true, libpulseaudio ? null
+, alsaSupport ? stdenv.isLinux, alsaLib ? null
 }:
 
 assert pulseaudioSupport -> libpulseaudio != null;
@@ -45,7 +46,8 @@ in mkDerivation {
     qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland
   ];
 
-  runtimeDependencies = optional pulseaudioSupport libpulseaudio;
+  runtimeDependencies = optional pulseaudioSupport libpulseaudio
+    ++ optional alsaSupport alsaLib;
 
   installPhase =
     let

From a56626b64567a780a32e80de39633d99c9586aa7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 01:11:25 +0000
Subject: [PATCH 2223/3942] rtsp-simple-server: 0.10.0 -> 0.12.0

---
 pkgs/servers/rtsp-simple-server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix
index 72cebb95b6bd..892ac1921a2b 100644
--- a/pkgs/servers/rtsp-simple-server/default.nix
+++ b/pkgs/servers/rtsp-simple-server/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "rtsp-simple-server";
-  version = "0.10.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "aler9";
     repo = pname;
     rev = "v${version}";
-    sha256 = "rnUmPyT9jAqm7Vf2TokgRGPTn7rTBUvrpJU21IopFsM=";
+    sha256 = "0mslag208410bvnhnd5hr7zvj8026m291ivkvr9sz3v6rh68cisy";
   };
 
-  vendorSha256 = "jAWDz/TclfCKQR/Gh99zSiGAsraciNU+yzFe5DGTeQI=";
+  vendorSha256 = "1884lbfsalry68m0kzfvbrk4dz9y19d2xxaivafwb7nc0wp64734";
 
   # Tests need docker
   doCheck = false;

From d1baaef83d60ef36b321a02295ac53b65645d9e2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 01:43:02 +0000
Subject: [PATCH 2224/3942] samblaster: 0.1.24 -> 0.1.26

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

diff --git a/pkgs/applications/science/biology/samblaster/default.nix b/pkgs/applications/science/biology/samblaster/default.nix
index 7795ba237367..6846e3c84fae 100644
--- a/pkgs/applications/science/biology/samblaster/default.nix
+++ b/pkgs/applications/science/biology/samblaster/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "samblaster";
-  version = "0.1.24";
+  version = "0.1.26";
 
   src = fetchFromGitHub {
     owner = "GregoryFaust";
     repo = "samblaster";
     rev = "v.${version}";
-    sha256 = "0iv2ddfw8363vb2x8gr3p8g88whb6mb9m0pf71i2cqsbv6jghap7";
+    sha256 = "0g24fq5hplnfgqkh3xqpg3lgx3wmxwnh9c7m6yw7pbi40lmgl1jv";
   };
 
   installPhase = ''

From 35d2564325c47f2e087baeb174574dd860ff5ef4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 01:52:15 +0000
Subject: [PATCH 2225/3942] saml2aws: 2.27.0 -> 2.27.1

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

diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix
index fc52662e536f..68721bbdebc1 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/pkgs/tools/security/saml2aws/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "saml2aws";
-  version = "2.27.0";
+  version = "2.27.1";
 
   src = fetchFromGitHub {
     owner = "Versent";
     repo = "saml2aws";
     rev = "v${version}";
-    sha256 = "15ddzab93iqwbvxnaw5wp4dzwlxjqxvyy1c4w37jm69zkczylrmc";
+    sha256 = "1ffq7jh14cj45wn5rx9awh5k8hqbfwm4fjz0a0rq22yqfwbbkkj2";
   };
 
   runVend = true;

From 33645572206e3b4f1401a39f95181d8ee7b6b0d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 02:10:47 +0000
Subject: [PATCH 2226/3942] sd-local: 1.0.5 -> 1.0.12

---
 pkgs/development/tools/sd-local/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix
index 06f6c08feefa..54200c157153 100644
--- a/pkgs/development/tools/sd-local/default.nix
+++ b/pkgs/development/tools/sd-local/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "sd-local";
-  version = "1.0.5";
+  version = "1.0.12";
 
   src = fetchFromGitHub {
     owner = "screwdriver-cd";
     repo = pname;
     rev = "v${version}";
-    sha256 = "09j1wcx66sz2b0pps0bgbay5x06lc0d2awxjvd5zi8wqnbsrdq60";
+    sha256 = "1amj5qsnxf6ya2l5rigjia5qis8i7q0qnd9ci74r721nj95m9jvr";
   };
 
-  vendorSha256 = "1qy51jx181rwim2v53ysgf7rys0nmxsbawvsbh3z1ihh3dlgw5bc";
+  vendorSha256 = "1y4nyw7rpgipblxqaps2zsd07cin8d0i0g9gvsnc3vifi6g29s8z";
 
   subPackages = [ "." ];
 

From ec26da1fc6e54e60b71b4a2dd2e429a3f7b9183e Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 12 Nov 2020 05:21:46 +0300
Subject: [PATCH 2227/3942] nixos/acpilight: add to packages

---
 nixos/modules/hardware/acpilight.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/hardware/acpilight.nix b/nixos/modules/hardware/acpilight.nix
index 34e8a2220965..2de448a265c7 100644
--- a/nixos/modules/hardware/acpilight.nix
+++ b/nixos/modules/hardware/acpilight.nix
@@ -19,6 +19,7 @@ in
   };
 
   config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [ acpilight ];
     services.udev.packages = with pkgs; [ acpilight ];
   };
 }

From e859317c39e639d93b33ea26df4a1896f3cf0eb7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 02:29:55 +0000
Subject: [PATCH 2228/3942] seaweedfs: 2.07 -> 2.09

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

diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix
index be583755868b..da54ecf44dbc 100644
--- a/pkgs/applications/networking/seaweedfs/default.nix
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "seaweedfs";
-  version = "2.07";
+  version = "2.09";
 
   src = fetchFromGitHub {
     owner = "chrislusf";
     repo = "seaweedfs";
     rev = version;
-    sha256 = "0yrfpj4ph9f321vqfn1zadv44pqa3ivjq9rx6gsz9hlv50gfaqn1";
+    sha256 = "0yy5a7hr597vj6xbn7f5vzqdwnr637b3l1d62cmk0h7qbmh4anji";
   };
 
-  vendorSha256 = "1ysqagi4y25bi84h5fhkdimnsigy43klf6hrcqn7q75382fb4bzn";
+  vendorSha256 = "1r7k0rzizs61r4gqqll7l2j7mdpi3w1ja6l4w6vxgzb45h2sjhi7";
 
   subPackages = [ "weed" ];
 

From b00d5d9c3e44c3ab610b9ede17579ee0b961cc8e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 02:40:28 +0000
Subject: [PATCH 2229/3942] sensu-go-backend: 5.21.2 -> 6.1.2

---
 pkgs/servers/monitoring/sensu-go/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix
index 7af9970b507d..6755aeb9968c 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/pkgs/servers/monitoring/sensu-go/default.nix
@@ -4,19 +4,19 @@ let
   generic = { subPackages, pname, postInstall ? "" }:
     buildGoModule rec {
       inherit pname;
-      version = "5.21.2";
+      version = "6.1.2";
       shortRev = "3a1ac58"; # for internal version info
 
       src = fetchFromGitHub {
         owner = "sensu";
         repo = "sensu-go";
         rev = "v${version}";
-        sha256 = "1hsvdqz0ckk8d1yxinqwylw97jd3gnf7c63zkjly87vasg98qk9x";
+        sha256 = "1g4vh4ay5m3sl00j8rn4db87kfdyxcmnaf0rxnv4ah2fbj5nrh2n";
       };
 
       inherit subPackages postInstall;
 
-  vendorSha256 = "06yfaj9k5n3jw8a142sscaqrvdw2lq51v884lp65wjdwy5c3jbba";
+  vendorSha256 = "12qi94k8fjx0kaq2x977yhan8ynd6j6cbqx1l60gqs2xgkm71k9r";
 
   doCheck = false;
 

From c496caef0a6f6ac91d8ec27d43fdc38132966458 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 02:54:13 +0000
Subject: [PATCH 2230/3942] sickgear: 0.21.42 -> 0.22.15

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

diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
index a382c969da86..4eab9d364e10 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -4,13 +4,13 @@ let
   pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
 in stdenv.mkDerivation rec {
   pname = "sickgear";
-  version = "0.21.42";
+  version = "0.22.15";
 
   src = fetchFromGitHub {
     owner = "SickGear";
     repo = "SickGear";
     rev = "release_${version}";
-    sha256 = "0a18vn1vy4zdp40iizgg3yji6k74r54rb7d7gn5byz1zj28g5c5c";
+    sha256 = "1hc0aahfxyv05d3bskfxcv7ik5zvd1j22r3z964idhch8csxw92l";
   };
 
   dontBuild = true;

From 9e18110c145bae795cc0dd5b779eb4b4d139be02 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Thu, 12 Nov 2020 02:40:24 +0000
Subject: [PATCH 2231/3942] libsndfile: 1.0.28 -> 1.0.30

https://github.com/libsndfile/libsndfile/releases/tag/v1.0.29
https://github.com/libsndfile/libsndfile/releases/tag/v1.0.30
---
 .../libraries/libsndfile/default.nix          | 52 ++++---------------
 1 file changed, 11 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 7b20120290d4..739bc7d73323 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -1,50 +1,20 @@
-{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig
+{ stdenv, fetchFromGitHub, autoreconfHook, autogen, flac, libogg, libopus, libvorbis, pkgconfig, python3
 , Carbon, AudioToolbox
 }:
 
 stdenv.mkDerivation rec {
-  name = "libsndfile-1.0.28";
+  pname = "libsndfile";
+  version = "1.0.30";
 
-  src = fetchurl {
-    url = "http://www.mega-nerd.com/libsndfile/files/${name}.tar.gz";
-    sha256 = "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz";
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1rh79y4s4m2wcm2kahmzs2kijpdpayif2gyca6m71f3k7jbhgcwa";
   };
 
-  patches = [
-    (fetchurl {
-      name = "CVE-2017-12562.patch";
-      url = "https://github.com/erikd/libsndfile/commit/cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8.patch";
-      sha256 = "1jg3wq30wdn9nv52mcyv6jyi4d80h4r1h9p96czcria7l91yh4sy";
-    })
-    (fetchurl {
-      name = "CVE-2017-6892.patch";
-      url = "https://github.com/erikd/libsndfile/commit/f833c53cb596e9e1792949f762e0b33661822748.patch";
-      sha256 = "05xkmz2ihc1zcj73sbmj1ikrv9qlcym2bkp1v6ak7w53ky619mwq";
-    })
-    (fetchurl {
-      name = "CVE-2017-8361+CVE-2017-8363+CVE-2017-8365.patch";
-      url = "https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3.patch";
-      sha256 = "0ccndnvjzx5fw18zvy03vnb29rr81h5vsh1m16msqbxk8ibndln2";
-    })
-    (fetchurl {
-      name = "CVE-2017-8362.patch";
-      url = "https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808.patch";
-      sha256 = "1xyv30ga71cpy4wx5f76sc4dma91la2lcc6s9f3pk9rndyi7gj9x";
-    })
-    (fetchurl {
-      name = "CVE-2017-14634.patch";
-      url = "https://github.com/erikd/libsndfile/commit/85c877d5072866aadbe8ed0c3e0590fbb5e16788.patch";
-      sha256 = "0kc7vp22qsxidhvmlc6nfamw7k92n0hcfpmwhb3gaksjamwhb2df";
-    })
-    (fetchurl {
-      name = "CVE-2018-13139.patch";
-      url = "https://github.com/erikd/libsndfile/commit/aaea680337267bfb6d2544da878890ee7f1c5077.patch";
-      sha256 = "01q3m7pa3xqkh05ijmfgv064v8flkg4p24bgy9wxnc6wfcdifggx";
-    })
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ flac libogg libvorbis ]
+  nativeBuildInputs = [ autoreconfHook autogen pkgconfig python3 ];
+  buildInputs = [ flac libogg libopus libvorbis ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ];
 
   enableParallelBuilding = true;
@@ -63,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A C library for reading and writing files containing sampled sound";
-    homepage    = "http://www.mega-nerd.com/libsndfile/";
+    homepage    = "https://libsndfile.github.io/libsndfile/";
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;

From 1e8e9f6b7cdd63d7cec50135d5063b6d906406de Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 03:23:42 +0000
Subject: [PATCH 2232/3942] simplenote: 1.21.1 -> 2.0.0

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

diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 05cf15b8accc..455c08fb295c 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -17,10 +17,10 @@ let
 
   pname = "simplenote";
 
-  version = "1.21.1";
+  version = "2.0.0";
 
   sha256 = {
-    x86_64-linux = "00qx82d17yrrg2mxwhm40av0mpf5hy14j338i5ijhwp79yc8fk8x";
+    x86_64-linux = "18alzsl1y9pvd5rs6gfnzv0py8ha0im33ylg7h6dicil5vii4l05";
   }.${system} or throwSystem;
 
   meta = with stdenv.lib; {

From 7bf1406091a36265ef2d9ac1179cc985a4ab85bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 03:38:00 +0000
Subject: [PATCH 2233/3942] skaffold: 1.15.0 -> 1.16.0

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

diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index d0b0bff05be1..e00bed451196 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "skaffold";
-  version = "1.15.0";
+  version = "1.16.0";
 
   goPackagePath = "github.com/GoogleContainerTools/skaffold";
   subPackages = ["cmd/skaffold"];
@@ -19,7 +19,7 @@ buildGoPackage rec {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${version}";
-    sha256 = "0cir9ld61pq1rziw6vyz1ihkq0aylzrsxg1vqb9544rwnbq7z2qs";
+    sha256 = "18v1s1k05bq38aljazvpxvp543xchy9h4n531pis4w4jl47n387f";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From a1c9c430bf340a7b5170be853cf3261ba7afadb0 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 12 Nov 2020 03:38:19 +0000
Subject: [PATCH 2234/3942] drumstick: fix plugin lookup and enable SonivoxEAS
 and FluidSynth plugins

SonivoxEAS is enabled by building with PulseAudio.
---
 .../libraries/drumstick/default.nix           | 24 ++++++++++++-------
 .../drumstick/drumstick-fluidsynth.patch      |  9 +++++++
 .../drumstick/drumstick-plugins.patch         | 12 ++++++++++
 3 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch
 create mode 100644 pkgs/development/libraries/drumstick/drumstick-plugins.patch

diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index 7cd826b1fe39..5cef17f11196 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, alsaLib, cmake, docbook_xsl, docbook_xml_dtd_45, doxygen
-, fluidsynth, pkgconfig, qtbase, qtsvg
+{ stdenv, fetchurl
+, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, pkg-config, wrapQtAppsHook
+, alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio
 }:
 
 stdenv.mkDerivation rec {
@@ -11,18 +12,25 @@ stdenv.mkDerivation rec {
     sha256 = "1n9wvg79yvkygrkc8xd8pgrd3d7hqmr7gh24dccf0px23lla9b3m";
   };
 
+  patches = [
+    ./drumstick-fluidsynth.patch
+    ./drumstick-plugins.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace library/rt/backendmanager.cpp --subst-var out
+  '';
+
   outputs = [ "out" "dev" "man" ];
 
   enableParallelBuilding = true;
 
-  #Temporarily remove drumstick-piano; Gives segment fault. Submitted ticket
-  postInstall = ''
-    rm $out/bin/drumstick-vpiano
-    '';
+  nativeBuildInputs = [
+    cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen pkg-config wrapQtAppsHook
+  ];
 
-  nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ];
   buildInputs = [
-    alsaLib doxygen fluidsynth qtbase qtsvg
+    alsaLib fluidsynth libpulseaudio qtbase qtsvg
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch b/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch
new file mode 100644
index 000000000000..b8cdf63fb649
--- /dev/null
+++ b/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch
@@ -0,0 +1,9 @@
+It works with fluidsynth 2.
+
+Backported from r400: https://sourceforge.net/p/drumstick/code/400/
+
+--- a/library/rt-backends/CMakeLists.txt
++++ b/library/rt-backends/CMakeLists.txt
+@@ -54,1 +54,1 @@ if (PKG_CONFIG_FOUND)
+-    pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1 fluidsynth<=1.1.11)
++    pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1)
diff --git a/pkgs/development/libraries/drumstick/drumstick-plugins.patch b/pkgs/development/libraries/drumstick/drumstick-plugins.patch
new file mode 100644
index 000000000000..cbb0a0e34896
--- /dev/null
+++ b/pkgs/development/libraries/drumstick/drumstick-plugins.patch
@@ -0,0 +1,12 @@
+Make it look for its plugin in its own installation directory.
+
+--- a/library/rt/backendmanager.cpp
++++ b/library/rt/backendmanager.cpp
+@@ -159,6 +159,7 @@ namespace rt {
+         foreach(const QString& path, QCoreApplication::libraryPaths()) {
+             d->appendDir( path + QDir::separator() + QSTR_DRUMSTICK, result );
+         }
++        d->appendDir( "@out@/lib/drumstick", result );
+         return result;
+     }
+ 

From fd9f28c396f4cb22da8451528bbebbe2dd499687 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 2 Nov 2020 20:14:57 +0100
Subject: [PATCH 2235/3942] vmpk: 0.5.1 -> 0.7.2

Also migrate from qt4 to qt5 (#33248)
---
 pkgs/applications/audio/vmpk/default.nix | 17 ++++++++++-------
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix
index 62ae1d2c049f..dfae5d40e114 100644
--- a/pkgs/applications/audio/vmpk/default.nix
+++ b/pkgs/applications/audio/vmpk/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, cmake, pkgconfig, alsaLib, libjack2, qt4 }:
+{ mkDerivation, lib, fetchurl, cmake, pkg-config
+, qttools, qtx11extras, drumstick
+, docbook-xsl-nons
+}:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "vmpk";
-  version = "0.5.1";
+  version = "0.7.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc";
+    sha256 = "5oLrjQADg59Mxpb0CNLQAE574IOSYLDLJNaQ/9q2cMQ=";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ];
 
-  buildInputs = [ alsaLib libjack2 qt4 ];
+  buildInputs = [ qtx11extras drumstick ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Virtual MIDI Piano Keyboard";
     homepage = "http://vmpk.sourceforge.net/";
     license = licenses.gpl3Plus;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72f6f2c6f9be..11aabc433456 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24268,7 +24268,7 @@ in
     onlyLibVLC = true;
   };
 
-  vmpk = callPackage ../applications/audio/vmpk { };
+  vmpk = libsForQt5.callPackage ../applications/audio/vmpk { };
 
   vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { };
 

From 1133f6e86a7d82275aaa05a33f57586637cb69fd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 03:54:05 +0000
Subject: [PATCH 2236/3942] slurp: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix
index bdbea7367b81..32263bad4a1d 100644
--- a/pkgs/tools/misc/slurp/default.nix
+++ b/pkgs/tools/misc/slurp/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "slurp";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "slurp";
     rev = "v${version}";
-    sha256 = "191yjn909dax8z66ks58wjadrycpbwryirkfjcy99dhq7dijg9fh";
+    sha256 = "1fby2v2ylcadgclds05wpkl9xi2r9dfz49dqyqpn20rjv1wnz3jv";
   };
 
   nativeBuildInputs = [

From db0da7c11d7dc0b8bb552aded71f02d6011c2752 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 04:00:13 +0000
Subject: [PATCH 2237/3942] sngrep: 1.4.7 -> 1.4.8

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

diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix
index b48edd69837a..9dda62b3badb 100644
--- a/pkgs/applications/networking/sniffers/sngrep/default.nix
+++ b/pkgs/applications/networking/sniffers/sngrep/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sngrep";
-  version = "1.4.7";
+  version = "1.4.8";
 
   src = fetchFromGitHub {
     owner = "irontec";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1dx5l48m4634y0zi6wjky412g80lfxqq1nphv7pi1kwvm1k5m5ri";
+    sha256 = "0lnwsw9x4y4lr1yh749y24f71p5zsghwh5lp28zqfanw025mipf2";
   };
 
   buildInputs = [

From 15e82d19572a580ce6bc69fe2ff9a65e111f104c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 04:06:10 +0000
Subject: [PATCH 2238/3942] snippetpixie: 1.4.1 -> 1.5.0

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

diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix
index 5c6025b245e0..ed35a9109a07 100644
--- a/pkgs/tools/text/snippetpixie/default.nix
+++ b/pkgs/tools/text/snippetpixie/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "snippetpixie";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "bytepixie";
     repo = pname;
     rev = version;
-    sha256 = "1db3fbawh4qwdqby5ji4g26pksi4q253r5zvd3kv1m2ljmwrrwj0";
+    sha256 = "1cb76kzw34yr1r135lyd75ddm9v99m7i3lyirm353cdch8qspfmv";
   };
 
   nativeBuildInputs = [

From e293949e42cf197f3e20ca3c5df445d4f7ef2170 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 04:22:54 +0000
Subject: [PATCH 2239/3942] souffle: 2.0.1 -> 2.0.2

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

diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index dbc5c1fa517d..ba13cd7b4b27 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -10,13 +10,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "souffle";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner  = "souffle-lang";
     repo   = "souffle";
     rev    = version;
-    sha256 = "0f7jwmgv83m85lrb2qwvr4cfwzbqww7pik884xd2593fsfqhpnkn";
+    sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5";
   };
 
   nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ];

From 3f20417b4cbdb108228c098167698bec7208b6bf Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 11 Nov 2020 10:21:21 +1000
Subject: [PATCH 2240/3942] doc/*: fix indentation

---
 doc/contributing/reviewing-contributions.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/contributing/reviewing-contributions.xml b/doc/contributing/reviewing-contributions.xml
index fe79d8d992b1..4fe51677f181 100644
--- a/doc/contributing/reviewing-contributions.xml
+++ b/doc/contributing/reviewing-contributions.xml
@@ -7,8 +7,8 @@
  <warning>
   <para>
    The following section is a draft, and the policy for reviewing is still being discussed in issues such as <link
-	   xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166 </link> and <link
-	   xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836 </link>.
+    xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166 </link> and <link
+    xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836 </link>.
   </para>
  </warning>
  <para>

From 31051812bc4117d394966f5df240de531a747809 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 11 Nov 2020 10:26:18 +1000
Subject: [PATCH 2241/3942] nixos/doc/*: fix indentation

---
 nixos/doc/manual/configuration/gpu-accel.xml | 68 +++++++++---------
 nixos/doc/manual/release-notes/rl-2009.xml   | 48 ++++++-------
 nixos/doc/varlistentry-fixer.rb              | 74 ++++++++++----------
 3 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/nixos/doc/manual/configuration/gpu-accel.xml b/nixos/doc/manual/configuration/gpu-accel.xml
index 95ee13f4796e..3695a5ff445a 100644
--- a/nixos/doc/manual/configuration/gpu-accel.xml
+++ b/nixos/doc/manual/configuration/gpu-accel.xml
@@ -65,16 +65,16 @@ Platform Vendor      Advanced Micro Devices, Inc.</screen>
       <title>AMD</title>
 
       <para>
-	Modern AMD <link
-	xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics
-	Core Next</link> (GCN) GPUs are supported through the
-	<package>rocm-opencl-icd</package> package. Adding this package to
-	<xref linkend="opt-hardware.opengl.extraPackages"/> enables OpenCL
-	support:
+       Modern AMD <link
+       xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics
+       Core Next</link> (GCN) GPUs are supported through the
+       <package>rocm-opencl-icd</package> package. Adding this package to
+       <xref linkend="opt-hardware.opengl.extraPackages"/> enables OpenCL
+       support:
 
-	<programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [
-  rocm-opencl-icd
-];</programlisting>
+       <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [
+         rocm-opencl-icd
+       ];</programlisting>
       </para>
     </section>
 
@@ -100,9 +100,9 @@ Platform Vendor      Advanced Micro Devices, Inc.</screen>
        support. For example, for Gen8 and later GPUs, the following
        configuration can be used:
 
-	      <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [
-  intel-compute-runtime
-];</programlisting>
+      <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [
+        intel-compute-runtime
+      ];</programlisting>
 
       </para>
     </section>
@@ -173,31 +173,31 @@ GPU1:
       <title>AMD</title>
 
       <para>
-	Modern AMD <link
-	xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics
-	Core Next</link> (GCN) GPUs are supported through either radv, which is
-	part of <package>mesa</package>, or the <package>amdvlk</package> package.
-	Adding the <package>amdvlk</package> package to
-	<xref linkend="opt-hardware.opengl.extraPackages"/> makes both drivers
-	available for applications and lets them choose. A specific driver can
-	be forced as follows:
+       Modern AMD <link
+       xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics
+       Core Next</link> (GCN) GPUs are supported through either radv, which is
+       part of <package>mesa</package>, or the <package>amdvlk</package> package.
+       Adding the <package>amdvlk</package> package to
+       <xref linkend="opt-hardware.opengl.extraPackages"/> makes both drivers
+       available for applications and lets them choose. A specific driver can
+       be forced as follows:
 
-	<programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [
-  pkgs.<package>amdvlk</package>
-];
+       <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [
+         pkgs.<package>amdvlk</package>
+       ];
 
-# To enable Vulkan support for 32-bit applications, also add:
-<xref linkend="opt-hardware.opengl.extraPackages32"/> = [
-  pkgs.driversi686Linux.<package>amdvlk</package>
-];
+       # To enable Vulkan support for 32-bit applications, also add:
+       <xref linkend="opt-hardware.opengl.extraPackages32"/> = [
+         pkgs.driversi686Linux.<package>amdvlk</package>
+       ];
 
-# For amdvlk
-<xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES =
-   "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json";
-# For radv
-<xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES =
-  "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
-</programlisting>
+       # For amdvlk
+       <xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES =
+          "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json";
+       # For radv
+       <xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES =
+         "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
+       </programlisting>
       </para>
     </section>
   </section>
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 75c8adbf45ed..881a95a78225 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -1593,30 +1593,30 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
      <para>
       Agda has been heavily reworked.
       <itemizedlist>
-	<listitem>
-	  <para>
-	    <literal>agda.mkDerivation</literal> has been heavily changed and
-	    is now located at <package>agdaPackages.mkDerivation</package>.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    New top-level packages <package>agda</package> and
-	    <literal>agda.withPackages</literal> have been added, the second
-	    of which sets up agda with access to chosen libraries.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    All agda libraries now live under
-	    <literal>agdaPackages</literal>.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Many broken libraries have been removed.
-	  </para>
-	</listitem>
+       <listitem>
+         <para>
+           <literal>agda.mkDerivation</literal> has been heavily changed and
+           is now located at <package>agdaPackages.mkDerivation</package>.
+         </para>
+       </listitem>
+       <listitem>
+         <para>
+           New top-level packages <package>agda</package> and
+           <literal>agda.withPackages</literal> have been added, the second
+           of which sets up agda with access to chosen libraries.
+         </para>
+       </listitem>
+       <listitem>
+         <para>
+           All agda libraries now live under
+           <literal>agdaPackages</literal>.
+         </para>
+       </listitem>
+       <listitem>
+         <para>
+           Many broken libraries have been removed.
+         </para>
+       </listitem>
       </itemizedlist>
       See the <link
       xlink:href="https://nixos.org/nixpkgs/manual/#agda">new
diff --git a/nixos/doc/varlistentry-fixer.rb b/nixos/doc/varlistentry-fixer.rb
index 6c7cc1e6439b..02168016b554 100755
--- a/nixos/doc/varlistentry-fixer.rb
+++ b/nixos/doc/varlistentry-fixer.rb
@@ -15,8 +15,8 @@ require "rexml/document"
 include REXML
 
 if ARGV.length < 1 then
-	$stderr.puts "Needs a filename."
-	exit 1
+  $stderr.puts "Needs a filename."
+  exit 1
 end
 
 filename = ARGV.shift
@@ -51,17 +51,17 @@ $touched = false
 # 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
+  ["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
 
 
@@ -75,17 +75,17 @@ end
 # 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
+  ["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>
@@ -104,21 +104,21 @@ end
 # 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
+  ["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"))
+  doc.context[:attribute_quote] = :quote
+  doc.write(output: File.open(filename, "w"))
 end

From b44a26bd24e89c4491cb866bc85e233ba72ef0ad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 04:32:14 +0000
Subject: [PATCH 2242/3942] spectre-meltdown-checker: 0.43 -> 0.44

---
 pkgs/tools/security/spectre-meltdown-checker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix
index 4d58095c43b1..b8f4eeea338f 100644
--- a/pkgs/tools/security/spectre-meltdown-checker/default.nix
+++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "spectre-meltdown-checker";
-  version = "0.43";
+  version = "0.44";
 
   src = fetchFromGitHub {
     owner = "speed47";
     repo = "spectre-meltdown-checker";
     rev = "v${version}";
-    sha256 = "1ys5m1yvm26qjlsjpqqd33lwpb880p0ay289hmifxjjawkqddjgg";
+    sha256 = "1b47wlc52jnp2d5c7kbqnxmlm4g3cfbv25q30llv5mlmzs6d7bam";
   };
 
   prePatch = ''

From bcbc529b91aa1ea5171de0834b51556d1935216e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 05:31:41 +0000
Subject: [PATCH 2243/3942] stella: 6.3 -> 6.4

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

diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index 33cd1879ce6a..ece734ef4bca 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "stella";
-  version = "6.3";
+  version = "6.4";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = pname;
     rev = version;
-    sha256 = "sha256-5rH2a/Uvi0HuyU/86y87g5FN/dunlP65+K3j0Bo+yCg=";
+    sha256 = "0gva6pw5c1pplcf2g48zmm24h1134v0vr705rbzj4v6ifp3adrsl";
   };
 
   nativeBuildInputs = [ pkg-config ];

From ccbcbe27b3d5158dedacd165320318581faa010b Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Wed, 11 Nov 2020 21:51:05 -0800
Subject: [PATCH 2244/3942] jcumming -> add github and githubId

---
 maintainers/maintainer-list.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c3970f3e02fb..3ac19f4b7887 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3883,6 +3883,8 @@
   };
   jcumming = {
     email = "jack@mudshark.org";
+    github = "jcumming";
+    githubId = 1982341;
     name = "Jack Cummings";
   };
   jD91mZM2 = {

From c3b1e7e7a9077e2bc431fff7eef26bfbd4eefb50 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Tue, 10 Nov 2020 13:31:02 +0800
Subject: [PATCH 2245/3942] audiofile: fix static build

Fixes https://github.com/NixOS/nixpkgs/issues/103215
---
 pkgs/development/libraries/audiofile/default.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 46c29e2fa125..9f945b15dec2 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -28,6 +28,21 @@ stdenv.mkDerivation rec {
   # fix build with gcc9
   NIX_CFLAGS_LINK = lib.optional (stdenv.system == "i686-linux") "-lgcc";
 
+  # Even when statically linking, libstdc++.la is put in dependency_libs here,
+  # and hence libstdc++.so passed to the linker, just pass -lstdc++ and let the
+  # compiler do what it does best.  (libaudiofile.la is a generated file, so we
+  # have to run `make` that far first).
+  #
+  # Without this, the executables in this package (sfcommands and examples)
+  # fail to build: https://github.com/NixOS/nixpkgs/issues/103215
+  #
+  # There might be a more sensible way to do this with autotools, but I am not
+  # smart enough to discover it.
+  preBuild = lib.optionalString stdenv.targetPlatform.isStatic ''
+    make -C libaudiofile $makeFlags
+    sed -i "s/dependency_libs=.*/dependency_libs=' -lstdc++'/" libaudiofile/libaudiofile.la
+  '';
+
   patches = [
     ./gcc-6.patch
     ./CVE-2015-7747.patch

From 6bd33c694b334794bf64544d01d2f5450d259b95 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 06:19:20 +0000
Subject: [PATCH 2246/3942] stripe-cli: 1.5.3 -> 1.5.4

---
 pkgs/tools/admin/stripe-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix
index 3ceb0e8509c5..51f6499f8e36 100644
--- a/pkgs/tools/admin/stripe-cli/default.nix
+++ b/pkgs/tools/admin/stripe-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "stripe-cli";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "stripe";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0anrn7dkxgbzilh45gyqrp2930bkg3g3diarb50qp0rlim302sgy";
+    sha256 = "1gb9xk40drj7z6sw6a2hva4kvim508q4f3cfjpmr7yjzspqy32p0";
   };
 
   vendorSha256 = "05cyn9cgmijj6dl075slwm5qc6fj6m5sm414wqm50xz2fjs0400r";

From abeb10d2f7fce2b4d83b529cf9b4e3e697f80974 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 06:39:12 +0000
Subject: [PATCH 2247/3942] syncthingtray: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index bb4b3ac90ce1..beccfe5477bb 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -20,14 +20,14 @@
 }:
 
 mkDerivation rec {
-  version = "1.0.0";
+  version = "1.0.1";
   pname = "syncthingtray";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "syncthingtray";
     rev = "v${version}";
-    sha256 = "sha256-mB23UOUrOfEmbFfVsAXyi3iod0NAfp/sl7Gkklqfmbo=";
+    sha256 = "1dln5gh3p8nz9qmg07cw2s0lpzp3rfhyrwdhczj89g27bwk0lr4k";
   };
 
   buildInputs = [ qtbase cpp-utilities qtutilities ]

From 29ec51502508335caa8f19b19ca93effd7ba20c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 06:49:50 +0000
Subject: [PATCH 2248/3942] tanka: 0.11.1 -> 0.12.0

---
 pkgs/applications/networking/cluster/tanka/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix
index 1793af1085a9..293cdb673711 100644
--- a/pkgs/applications/networking/cluster/tanka/default.nix
+++ b/pkgs/applications/networking/cluster/tanka/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tanka";
-  version = "0.11.1";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0hp10qgalglsdhh6z6v4azh2hsr89mdrv1g5lssfl5jyink409yd";
+    sha256 = "1f67b236njz1qdxjyf2568vkigjmpylqlra29jlgm6vhd5qky7ia";
   };
 
-  vendorSha256 = "15x8fqz2d2793ivgxpd9jyr34njzi1xpyxdlfyj1b01n2vr3xg4m";
+  vendorSha256 = "1pr265g11lcviqw974lf05q52qrfpwnpn9a64q6088g0nfp4ly06";
 
   doCheck = false;
 

From 28bc8eadd10fe19d30479f4f034d57dbac017a20 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 11 Nov 2020 14:39:32 -0800
Subject: [PATCH 2249/3942] ocrmypdf: 11.0.1 -> 11.3.3, fix build

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

diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
index bfa22a4fd182..1e2b76c008e0 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@@ -29,14 +29,14 @@ let
 in
 buildPythonApplication rec {
   pname = "ocrmypdf";
-  version = "11.0.1";
+  version = "11.3.3";
   disabled = ! python3Packages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "jbarlow83";
     repo = "OCRmyPDF";
     rev = "v${version}";
-    sha256 = "194ds9i1zd80ynzwgv7kprax0crh7bbchayawdcvg2lyr64a82xn";
+    sha256 = "0qv34clid65p11dgqalyk7b7myn5ibiz8i9xxhxkmjblw297p6ak";
   };
 
   nativeBuildInputs = with python3Packages; [

From 5a5122418ae3f4c7cafaa867915826afda3a5b5d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 9 Nov 2020 10:37:15 -0800
Subject: [PATCH 2250/3942] python310: 3.10.0a1 -> 3.10.0a2

---
 .../python/cpython/3.10/no-ldconfig.patch     | 33 +++++++++++--------
 .../interpreters/python/cpython/default.nix   |  3 ++
 .../interpreters/python/default.nix           |  4 +--
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch
index a1f9d68eb166..c259aed72b99 100644
--- a/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch
+++ b/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch
@@ -1,18 +1,18 @@
-From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk <fridh@fridh.nl>
-Date: Mon, 28 Aug 2017 09:24:06 +0200
-Subject: [PATCH] Don't use ldconfig
+From 084c6dd6352077e64f10cf7aa168f95d800f3819 Mon Sep 17 00:00:00 2001
+From: Jonathan Ringer <jonringer117@gmail.com>
+Date: Mon, 9 Nov 2020 10:24:35 -0800
+Subject: [PATCH] CPython: Don't use ldconfig
 
 ---
- Lib/ctypes/util.py | 70 ++----------------------------------------------------
- 1 file changed, 2 insertions(+), 68 deletions(-)
+ Lib/ctypes/util.py | 77 ++--------------------------------------------
+ 1 file changed, 2 insertions(+), 75 deletions(-)
 
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 5e8b31a854..7b45ce6c15 100644
+index 0c2510e..7fb98af 100644
 --- a/Lib/ctypes/util.py
 +++ b/Lib/ctypes/util.py
-@@ -94,46 +94,7 @@ elif os.name == "posix":
-     import re, tempfile
+@@ -100,53 +100,7 @@ elif os.name == "posix":
+             return thefile.read(4) == elf_header
  
      def _findLib_gcc(name):
 -        # Run GCC's linker with the -t (aka --trace) option and examine the
@@ -51,15 +51,22 @@ index 5e8b31a854..7b45ce6c15 100644
 -                # Raised if the file was already removed, which is the normal
 -                # behaviour of GCC if linking fails
 -                pass
--        res = re.search(expr, trace)
+-        res = re.findall(expr, trace)
 -        if not res:
 -            return None
--        return os.fsdecode(res.group(0))
+-
+-        for file in res:
+-            # Check if the given file is an elf file: gcc can report
+-            # some files that are linker scripts and not actual
+-            # shared objects. See bpo-41976 for more details
+-            if not _is_elf(file):
+-                continue
+-            return os.fsdecode(file)
 +        return None
  
  
      if sys.platform == "sunos5":
-@@ -255,34 +216,7 @@ elif os.name == "posix":
+@@ -268,34 +222,7 @@ elif os.name == "posix":
      else:
  
          def _findSoname_ldconfig(name):
@@ -96,5 +103,5 @@ index 5e8b31a854..7b45ce6c15 100644
          def _findLib_ld(name):
              # See issue #9998 for why this is needed
 -- 
-2.15.0
+2.28.0
 
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 143662abcc93..77512c02d555 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -14,6 +14,7 @@
 , self
 , configd
 , autoreconfHook
+, autoconf-archive
 , python-setup-hook
 , nukeReferences
 # For the Python package set
@@ -67,6 +68,8 @@ let
 
   nativeBuildInputs = optionals (!stdenv.isDarwin) [
     autoreconfHook
+  ] ++ optionals (!stdenv.isDarwin && passthru.pythonAtLeast "3.10") [
+    autoconf-archive # needed for AX_CHECK_COMPILE_FLAG
   ] ++ [
     nukeReferences
   ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index a8db9bc92576..ae666d44f57b 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -122,9 +122,9 @@ in {
       major = "3";
       minor = "10";
       patch = "0";
-      suffix = "a1";
+      suffix = "a2";
     };
-    sha256 = "0q59a99w1yad808mx4w6l0j7bk7dbd2kakngbk0w1h9z4dhr8wyv";
+    sha256 = "0zl5h61s8n2w2v1n40af0mwaw7lqh5fl1ys7kyjgcph60vb9wzjr";
     inherit (darwin) configd;
     inherit passthruFun;
   };

From ee4559129a93fcac2dacd63cbfe7988ac1b95993 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 5 Nov 2020 08:34:23 +0100
Subject: [PATCH 2251/3942] compcert: remove annoying assertions

---
 pkgs/development/compilers/compcert/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 8c8a56d8e28f..3dea91970e24 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -3,9 +3,6 @@
 , tools ? stdenv.cc
 }:
 
-assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02";
-assert lib.versionAtLeast coq.coq-version "8.8.0";
-
 let
   ocaml-pkgs      = with ocamlPackages; [ ocaml findlib menhir ];
   ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux";

From 005461a0a6d948735de009f2cf039bad7d6a968a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 07:26:25 +0000
Subject: [PATCH 2252/3942] terraform-providers.lxd: 1.3.0 -> 1.4.0

---
 .../networking/cluster/terraform-providers/lxd/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
index d64178b1e658..a583bc335142 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "terraform-provider-lxd";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "sl1pm4t";
     repo = "terraform-provider-lxd";
     rev = "v${version}";
-    sha256 = "1k54021178zybh9dqly2ly8ji9x5rka8dn9xd6rv7gkcl5w3y6fv";
+    sha256 = "00gj7zj45wm9sf7a7nybjijdrdr00g2yf8h41c6j679a6nfnx0fd";
   };
 
-  vendorSha256 = "1shdpl1zsbbpc3mfs0l65ykq2h15ggvqylaixcap4j4lfl7m9my0";
+  vendorSha256 = "0xq8zgx8h47pc88nkdvy5skpr8vk87b4212mm5msfxk8n7nl4fi2";
 
   doCheck = false;
 

From b1dc6b0a29225d6407f8742f71c97c878cf40e62 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 07:37:06 +0000
Subject: [PATCH 2253/3942] terraformer: 0.8.8 -> 0.8.9

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

diff --git a/pkgs/development/tools/misc/terraformer/default.nix b/pkgs/development/tools/misc/terraformer/default.nix
index 6ff0dd77aae2..07333d7e24aa 100644
--- a/pkgs/development/tools/misc/terraformer/default.nix
+++ b/pkgs/development/tools/misc/terraformer/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "terraformer";
-  version = "0.8.8";
+  version = "0.8.9";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = pname;
     rev = version;
-    sha256 = "1lzf30vpa0blbkz4ngnhrn3hpbqflqd4sni4bly9yqh4fnc44nvi";
+    sha256 = "11j7yra0qbjadg4cb57qbdxf0di7crfv0aqam6gc1zng3fzlh4w9";
   };
 
-  vendorSha256 = "087448wkaw6jxv9d26hck4w3vdh06vcgywna6ydkqvxr0hp011b6";
+  vendorSha256 = "1lsg5svdnmqiradpr4h2420y5jmml3af8pp0np1735n3wh1q1blh";
 
   subPackages = [ "." ];
 

From 691e251aa5a14b1892dc686d8378fc2b62ccdba5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 07:48:07 +0000
Subject: [PATCH 2254/3942] thanos: 0.15.0 -> 0.16.0

---
 pkgs/servers/monitoring/thanos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index 8e6800f48f97..68fb973038c2 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -1,16 +1,16 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "thanos";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "thanos-io";
     repo = "thanos";
-    sha256 = "099waxv4p6jq2nimc3ql80j8ikhbzqwr2470x8m96x5kcirmz8nl";
+    sha256 = "0432pxpl071wjsijc5b7176mc4lr7sqdwyzqn7dvwkrvvq3n6g5k";
   };
 
-  vendorSha256 = "0vfl6bra6487vzv0hd1pnkq7888m4ddn12q69gcm6a7w1z5wvj5b";
+  vendorSha256 = "0pbnkqwpp74vanyk3cljj4kgbcid16y9mb5my3iiimbrziw2dkwr";
 
   doCheck = false;
 

From 5efb8b4b5211d0176cc2a225ecaff83184b54405 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 07:54:19 +0000
Subject: [PATCH 2255/3942] theme-obsidian2: 2.15 -> 2.16

---
 pkgs/data/themes/obsidian2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix
index cb2660ed058c..4e9087995056 100644
--- a/pkgs/data/themes/obsidian2/default.nix
+++ b/pkgs/data/themes/obsidian2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "theme-obsidian2";
-  version = "2.15";
+  version = "2.16";
 
   src = fetchurl {
     url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz";
-    sha256 = "1d6h8jsg8r1jbv2izshhpvlwsrwpi2f2dm461kr1zpwcw5glf9jx";
+    sha256 = "0a5268w8b413i62ggipgy19k83va1n0ni8bvfwrp17r0n97wbqx2";
   };
 
   sourceRoot = ".";

From f6c54e8f08b356ccbd098f0cd349f7f55eec9912 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Wed, 16 Sep 2020 20:28:32 +0900
Subject: [PATCH 2256/3942] qt512.qtbase: patch framework detection to support
 tbd frameworks

---
 pkgs/development/libraries/qt-5/5.12/default.nix  |  4 ++++
 .../0015-qtbase-tbd-frameworks.patch              | 15 +++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0015-qtbase-tbd-frameworks.patch

diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index fcceb6d6cf2b..95da38206e47 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -55,6 +55,10 @@ let
         ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
         ./qtbase.patch.d/0002-qtbase-mac.patch
         ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
+
+        # Patch framework detection to support X.framework/X.tbd,
+        # extending the current support for X.framework/X.
+        ./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch
       ]
       ++ [
         ./qtbase.patch.d/0003-qtbase-mkspecs.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0015-qtbase-tbd-frameworks.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0015-qtbase-tbd-frameworks.patch
new file mode 100644
index 000000000000..8a5939978a6b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0015-qtbase-tbd-frameworks.patch
@@ -0,0 +1,15 @@
+diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
+index 84dbbfebd4..615bfed124 100644
+--- a/src/gui/Qt5GuiConfigExtras.cmake.in
++++ b/src/gui/Qt5GuiConfigExtras.cmake.in
+@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
+             if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
+                 set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
+             endif()
++            set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd")
++            if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
++                set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
++            endif()
+ !!ENDIF
+             if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY)
+                 # The above find_library call doesn\'t work for finding

From 1f52024720e48ade2745b91ce19fbd2e300ef39e Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Thu, 12 Nov 2020 16:18:13 +0900
Subject: [PATCH 2257/3942] qt514.qtbase: patch framework detection to support
 tbd frameworks

---
 pkgs/development/libraries/qt-5/5.14/default.nix  |  4 ++++
 .../0012-qtbase-tbd-frameworks.patch              | 15 +++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch

diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix
index 469157a5f727..7bc9b5f19bd6 100644
--- a/pkgs/development/libraries/qt-5/5.14/default.nix
+++ b/pkgs/development/libraries/qt-5/5.14/default.nix
@@ -55,6 +55,10 @@ let
       optionals stdenv.isDarwin [
         ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
         ./qtbase.patch.d/0002-qtbase-mac.patch
+
+        # Patch framework detection to support X.framework/X.tbd,
+        # extending the current support for X.framework/X.
+        ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch
       ]
       ++ [
         ./qtbase.patch.d/0003-qtbase-mkspecs.patch
diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch
new file mode 100644
index 000000000000..8a5939978a6b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch
@@ -0,0 +1,15 @@
+diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
+index 84dbbfebd4..615bfed124 100644
+--- a/src/gui/Qt5GuiConfigExtras.cmake.in
++++ b/src/gui/Qt5GuiConfigExtras.cmake.in
+@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
+             if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
+                 set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
+             endif()
++            set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd")
++            if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
++                set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
++            endif()
+ !!ENDIF
+             if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY)
+                 # The above find_library call doesn\'t work for finding

From 16075a712c867d2ecc74d0ccfdcf831b2c7dd9b5 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Thu, 12 Nov 2020 16:18:37 +0900
Subject: [PATCH 2258/3942] qt515.qtbase: patch framework detection to support
 tbd frameworks

---
 pkgs/development/libraries/qt-5/5.15/default.nix  |  4 ++++
 .../0012-qtbase-tbd-frameworks.patch              | 15 +++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 1a90c610a5b5..22fb9392d6d7 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -55,6 +55,10 @@ let
       optionals stdenv.isDarwin [
         ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
         ./qtbase.patch.d/0002-qtbase-mac.patch
+
+        # Patch framework detection to support X.framework/X.tbd,
+        # extending the current support for X.framework/X.
+        ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch
       ]
       ++ [
         ./qtbase.patch.d/0003-qtbase-mkspecs.patch
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch
new file mode 100644
index 000000000000..8a5939978a6b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch
@@ -0,0 +1,15 @@
+diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
+index 84dbbfebd4..615bfed124 100644
+--- a/src/gui/Qt5GuiConfigExtras.cmake.in
++++ b/src/gui/Qt5GuiConfigExtras.cmake.in
+@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
+             if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
+                 set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
+             endif()
++            set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd")
++            if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
++                set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
++            endif()
+ !!ENDIF
+             if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY)
+                 # The above find_library call doesn\'t work for finding

From 47c770e0e603f5db7dc3daafcb2dba14fd2300bc Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Wed, 9 Sep 2020 09:50:35 +0900
Subject: [PATCH 2259/3942] darwin/make-bootstrap-tools: remove references to
 old libSystem

---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 53 ++++++---------------
 1 file changed, 15 insertions(+), 38 deletions(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 31e129639376..1243b96e5051 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -28,11 +28,8 @@ in rec {
     buildCommand = ''
       mkdir -p $out/bin $out/lib $out/lib/system
 
-      # We're not going to bundle the actual libSystem.dylib; instead we reconstruct it on
-      # the other side. See the notes in stdenv/darwin/default.nix for more information.
-      # We also need the .o files for various low-level boot stuff.
+      # Copy libSystem's .o files for various low-level boot stuff.
       cp -d ${darwin.Libsystem}/lib/*.o $out/lib
-      cp -d ${darwin.Libsystem}/lib/system/*.dylib $out/lib/system
 
       # Resolv is actually a link to another package, so let's copy it properly
       cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib
@@ -208,39 +205,6 @@ in rec {
         fi
       done
 
-      install_name_tool \
-        -id $out/lib/system/libsystem_c.dylib \
-        $out/lib/system/libsystem_c.dylib
-
-      install_name_tool \
-        -id $out/lib/system/libsystem_kernel.dylib \
-        $out/lib/system/libsystem_kernel.dylib
-
-      # TODO: this logic basically duplicates similar logic in the Libsystem expression. Deduplicate them!
-      libs=$(cat $reexportedLibrariesFile | grep -v '^#')
-
-      for i in $libs; do
-        if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then
-          args="$args -reexport_library $i"
-        fi
-      done
-
-      ld -macosx_version_min 10.7 \
-         -arch x86_64 \
-         -dylib \
-         -o $out/lib/libSystem.B.dylib \
-         -compatibility_version 1.0 \
-         -current_version 1226.10.1 \
-         -reexport_library $out/lib/system/libsystem_c.dylib \
-         -reexport_library $out/lib/system/libsystem_kernel.dylib \
-         $args
-
-      ln -s libSystem.B.dylib $out/lib/libSystem.dylib
-
-      for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do
-        ln -s libSystem.dylib $out/lib/lib$name.dylib
-      done
-
       ln -s libresolv.9.dylib $out/lib/libresolv.dylib
 
       for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
@@ -309,7 +273,20 @@ in rec {
 
       ${build}/on-server/sh -c 'echo Hello World'
 
-      export flags="-idirafter ${unpack}/include-Libsystem --sysroot=${unpack} -L${unpack}/lib"
+      # This approximates a bootstrap version of libSystem can that be
+      # assembled via fetchurl. Adapted from main libSystem expression.
+      mkdir libSystem-boot
+      cp -vr \
+        ${darwin.darwin-stubs}/usr/lib/libSystem.B.tbd \
+        ${darwin.darwin-stubs}/usr/lib/system \
+        libSystem-boot
+
+      substituteInPlace libSystem-boot/libSystem.B.tbd \
+        --replace "/usr/lib/system/" "$PWD/libSystem-boot/system/"
+      ln -s libSystem.B.tbd libSystem-boot/libSystem.tbd
+      # End of bootstrap libSystem
+
+      export flags="-idirafter ${unpack}/include-Libsystem --sysroot=${unpack} -L${unpack}/lib -L$PWD/libSystem-boot"
 
       export CPP="clang -E $flags"
       export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v -Wl,-sdk_version,10.10"

From 70f3863540a8c6350b92b93cb5c13a66e54200d2 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Tue, 10 Nov 2020 11:23:49 +0900
Subject: [PATCH 2260/3942] trash-cli: remove reference to libSystem.dylib
 proxy on darwin

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

diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 141cceff24d3..33c8792d4184 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -16,8 +16,10 @@ python3Packages.buildPythonApplication rec {
     (substituteAll {
       src = ./nix-paths.patch;
       df = "${coreutils}/bin/df";
-      libc = let ext = if stdenv.isDarwin then ".dylib" else ".so.6";
-             in "${stdenv.cc.libc}/lib/libc${ext}";
+      libc =
+        if stdenv.hostPlatform.isDarwin
+          then "/usr/lib/libSystem.dylib"
+          else "${stdenv.cc.libc}/lib/libc.so.6";
     })
 
     # Fix build on Python 3.6.

From 7e49fb6592a6af157d861d07315b683d5724f96e Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Thu, 12 Nov 2020 16:50:06 +0900
Subject: [PATCH 2261/3942] darwin/apple-sdk: explain why Kernel.framework has
 no .tbd file

---
 pkgs/os-specific/darwin/apple-sdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index dbfd3b05fa54..97523cf15a8d 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -108,6 +108,7 @@ let
 
         local tbd_source=${darwin-stubs}/System/Library/Frameworks/$nested_path/Versions/$current
         if [ "${name}" != "Kernel" ]; then
+          # The Kernel.framework has headers but no actual library component.
           cp -v $tbd_source/*.tbd .
         fi
 

From f2b81a021eccc072029f8a93b45b2c9a9ce0aa2a Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Thu, 12 Nov 2020 16:50:26 +0900
Subject: [PATCH 2262/3942] darwin/print-reexports: add an overview comment

---
 .../darwin/apple-sdk/print-reexports/main.c   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/os-specific/darwin/apple-sdk/print-reexports/main.c b/pkgs/os-specific/darwin/apple-sdk/print-reexports/main.c
index 7ad793eb4252..df46e3f18e89 100644
--- a/pkgs/os-specific/darwin/apple-sdk/print-reexports/main.c
+++ b/pkgs/os-specific/darwin/apple-sdk/print-reexports/main.c
@@ -1,3 +1,22 @@
+/**
+ * Display the list of re-exported libraries from a TAPI v2 .tbd file, one per
+ * line on stdout.
+ *
+ * TAPI files are the equivalent of library files for the purposes of linking.
+ * Like dylib files, they may re-export other libraries. In upstream usage
+ * these refer to the absolute paths of dylibs, and are resolved to .tbd files
+ * in combination with the syslibroot option. In nixpkgs, the .tbd files refer
+ * directly to other .tbd files without a syslibroot. Note that each .tbd file
+ * contains an install name, so the re-exported path does not affect the final
+ * result.
+ *
+ * In nixpkgs each framework is a distinct store path and some frameworks
+ * re-export other frameworks. The re-exported names are rewritten to refer to
+ * the store paths of dependencies via textual substitution. This utility is
+ * used to emit every file that is listed as a re-exported library, which
+ * allows the framework builder to verify their existence.
+ */
+
 #include <stdio.h>
 #include <sys/errno.h>
 #include <yaml.h>

From 5c08c8eb2a64f36fdffc8a9df6d56c505d33f36c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 08:03:21 +0000
Subject: [PATCH 2263/3942] throttled: 0.7 -> 0.8

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

diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix
index 71bb6dfb357d..b19e4c471c00 100644
--- a/pkgs/tools/system/throttled/default.nix
+++ b/pkgs/tools/system/throttled/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "throttled";
-  version = "0.7";
+  version = "0.8";
 
   src = fetchFromGitHub {
     owner = "erpalma";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1y1sczvj2qc8ml9i1rdzr8hklvci9bdphm3mmri2ncaqys8wdbh4";
+    sha256 = "0qw124gdgjqij3xhgg8j1mdsg6j0xg340as5qf8hd3gwc38sqi9x";
   };
 
   nativeBuildInputs = [ python3Packages.wrapPython ];

From 5679335357cf71ed84c2111d614c022891d22ebd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 08:15:19 +0000
Subject: [PATCH 2264/3942] tiledb: 2.0.7 -> 2.1.2

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

diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix
index 89318dd4e75b..5fe6b57f0444 100644
--- a/pkgs/development/libraries/tiledb/default.nix
+++ b/pkgs/development/libraries/tiledb/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tiledb";
-  version = "2.0.7";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB";
     rev = version;
-    sha256 = "00g8ibsbnl4wjfx3qg4qy6s7z6dsj898j0yqfhw1gjr1pb5dsapb";
+    sha256 = "12f3jvb9b6ji5w2n2k3sjn156ikaf06mriwbqlc54ii1zznaw43r";
   };
 
   # (bundled) blosc headers have a warning on some archs that it will be using

From 5b1105bd46601ce7d3a6f3a9949c42943744f3fc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 08:53:26 +0000
Subject: [PATCH 2265/3942] toxic: 0.8.3 -> 0.8.4

---
 .../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 540aa3fcea4d..8560a8b94473 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 {
   pname = "toxic";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner  = "Tox";
     repo   = "toxic";
     rev    = "v${version}";
-    sha256 = "09l2j3lwvrq7bf3051vjsnml9w63790ly3iylgf26gkrmld6k31w";
+    sha256 = "0p1cmj1kyp506y5xm04mhlznhf5wcylvgsn6b307ms91vjqs3fg2";
   };
 
   makeFlags = [ "PREFIX=$(out)"];

From 8d47a25b0cbb1fe16bda322ea0fb7466c7c70b60 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 09:09:36 +0000
Subject: [PATCH 2266/3942] traefik: 2.3.1 -> 2.3.2

---
 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 bc0f052adc6b..dffb92326b88 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "traefik";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchzip {
     url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
-    sha256 = "09328yb6pbrikd1dljmf6spg177w1ymqk1i2152m5srd39mc6ixv";
+    sha256 = "1h8wflkzjzz0nr81d99f8vksihqa6q4vmkqq40170a8js06fgizx";
     stripRoot = false;
   };
 
-  vendorSha256 = "026yxahwvbw41vf7yfycwmw797fpw19g1nyi1wcxkkkw383v7dsk";
+  vendorSha256 = "16y6cyw4xipadwz7wlzl55sn81by9hc37crf143dfb4c3kmwb581";
 
   doCheck = false;
 

From d93f1c96476014f8334e53c2b6170991fc5b92c5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 09:23:23 +0000
Subject: [PATCH 2267/3942] trompeloeil: 38 -> 39

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

diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix
index 625b16cc99a0..929627f3e1bf 100644
--- a/pkgs/development/libraries/trompeloeil/default.nix
+++ b/pkgs/development/libraries/trompeloeil/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "trompeloeil";
-  version = "38";
+  version = "39";
 
   src = fetchFromGitHub {
     owner = "rollbear";
     repo = "trompeloeil";
     rev = "v${version}";
-    sha256 = "068q4xx09vwjs7i89w47qzymdb4l6jqi27gx2jmd3yb6fp2k7nsb";
+    sha256 = "1053iw4isi7qsy94fqmh570wki999sg9n70jhqy8kfy1bniczh0l";
   };
 
   nativeBuildInputs = [ cmake ];

From 0d4ac47717c8815da374ea36764dc71568052f45 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 09:41:50 +0000
Subject: [PATCH 2268/3942] ugrep: 2.5.5 -> 3.0.4

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

diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix
index 6f44c360267f..40266a5440bb 100644
--- a/pkgs/tools/text/ugrep/default.nix
+++ b/pkgs/tools/text/ugrep/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ugrep";
-  version = "2.5.5";
+  version = "3.0.4";
 
   src = fetchFromGitHub {
     owner = "Genivia";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0ba9h0m9c28rllym1djij3b97k4rj06nsgajmbxg5mpxfzplgxy2";
+    sha256 = "0z3l6dm7v5fdki70nmz2qzrzqmkj3lngiwpswqmyygm7v8gvmimv";
   };
 
   buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];

From cd11c0c817300e151de334b86844d034e77951bb Mon Sep 17 00:00:00 2001
From: Julian Stecklina <julian.stecklina@cyberus-technology.de>
Date: Thu, 12 Nov 2020 10:40:07 +0100
Subject: [PATCH 2269/3942] haskellPackages.hail: relax cabal dependencies to
 unbreak

The upstream version still contains very strict dependency
constraints. I've updated the patches to a version that relax these.
This unbreaks hail for me.
---
 pkgs/development/haskell-modules/configuration-common.nix   | 6 +++---
 .../haskell-modules/configuration-hackage2nix.yaml          | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ff3a7be3b134..02cb1d10aaa0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1110,9 +1110,9 @@ self: super: {
       })
       (pkgs.fetchpatch {
         # Relax dependency constraints,
-        # upstream PR: https://github.com/james-preston/hail/pull/15
-        url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/15.patch";
-        sha256 = "03kdvr8hxi6isb8yxp5rgcmz855n19m1yacn3d56a4i58j2mldjw";
+        # upstream PR: https://github.com/james-preston/hail/pull/16
+        url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/16.patch";
+        sha256 = "0dpagpn654zjrlklihsg911lmxjj8msylbm3c68xa5aad1s9gcf7";
       })
     ];
   });
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4328d6a75894..2c7af6097cc6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5717,7 +5717,6 @@ broken-packages:
   - Haggressive
   - hahp
   - haiji
-  - hail
   - hailgun-send
   - hairy
   - hakaru

From bea630e60698c9779f9335dfd6773d370d409e65 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 09:57:10 +0000
Subject: [PATCH 2270/3942] vale: 2.5.0 -> 2.6.1

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

diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index 4011df997062..5ae858d79db7 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "vale";
-  version = "2.5.0";
+  version = "2.6.1";
 
   subPackages = [ "." ];
   outputs = [ "out" "data" ];
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "errata-ai";
     repo   = "vale";
     rev    = "v${version}";
-    sha256 = "0favaijdddm0lajlv0a277mg286jh12kwfndf98zdp0vfq9lv00d";
+    sha256 = "1xn3i1d8z2zlnykcz0z779naashn92kd7fnnssamjqblclr8dsp8";
   };
 
   vendorSha256 = null;

From 4534a5e36213b55f9942e1e729fbf4ce479ae3ce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 10:08:36 +0000
Subject: [PATCH 2271/3942] vips: 8.10.1 -> 8.10.2

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

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index eb5afebaa675..c85e89581243 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vips";
-  version = "8.10.1";
+  version = "8.10.2";
 
   outputs = [ "bin" "out" "man" "dev" ];
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "libvips";
     repo = "libvips";
     rev = "v${version}";
-    sha256 = "0zfhp86vbxs5qdnjy8hvdcjslfkafvd3s3rjr2dppwm0iz4gdbfx";
+    sha256 = "1psi39a4h0awwbyizbsk467z0djwq0rh8hvkklbsd5b92m7768sp";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     extraPostFetch = ''

From c0599d86db00c7e65717e7643222ff88eb1ca2a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 10:25:49 +0000
Subject: [PATCH 2272/3942] wasabiwallet: 1.1.12 -> 1.1.12.2

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

diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix
index 3b4ec1c49c4c..e566661d36a2 100644
--- a/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/pkgs/applications/blockchains/wasabiwallet/default.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "wasabiwallet";
-  version = "1.1.12";
+  version = "1.1.12.2";
 
   src = fetchurl {
     url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
-    sha256 = "0nfd0pwsgrkaxcxfs8wb3i8kslfcqnc91iahw3rmlcxdzb81kjs4";
+    sha256 = "0nl7n24nsy3gyzrxa6llx81pvsjqcwi0a4qdv34dpcq483aclp2r";
   };
 
   dontBuild = true;

From 04b5e932a3896d2ebba4a4604e2bf31339842e5b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 10:41:56 +0000
Subject: [PATCH 2273/3942] wavemon: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix
index dab52720a029..8549495e8f82 100644
--- a/pkgs/tools/networking/wavemon/default.nix
+++ b/pkgs/tools/networking/wavemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.1";
+  version = "0.9.2";
   baseName = "wavemon";
   name = "${baseName}-${version}";
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "uoaerg";
     repo = "wavemon";
     rev = "v${version}";
-    sha256 = "109ycwnjjqc2vpnd8b86njfifczlxglnyv4rh2qmbn2i5nw2wryg";
+    sha256 = "0y984wm03lzqf7bk06a07mw7d1fzjsp9x7zxcvlx4xqmv7wlgb29";
   };
 
   meta = with stdenv.lib; {

From 281a7ba7427f1e068cb1d6876005dacc4a1c6d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 12 Nov 2020 11:42:57 +0100
Subject: [PATCH 2274/3942] _1password-gui: 0.9.2-1 -> 0.9.3

Changelog:
https://releases.1password.com/linux/0.9/#1password-for-linux-0.9.3
---
 pkgs/tools/security/1password-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix
index 0a76a04196c3..3a02fceeaba6 100644
--- a/pkgs/tools/security/1password-gui/default.nix
+++ b/pkgs/tools/security/1password-gui/default.nix
@@ -13,11 +13,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "1password";
-  version = "0.9.2-1";
+  version = "0.9.3";
 
   src = fetchurl {
     url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
-    sha256 = "19m8qfhmdzgz76xba9wi5cb12jqwr17afqzajvgq681i52fij0lr";
+    sha256 = "wO1HwXl6Lf7+2fXX7i8nrD/hi9dAWn50Jkoztx6aT0Q=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 2edac44b201f5a3c6a761a1434dae66c93910621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 12 Nov 2020 11:52:14 +0100
Subject: [PATCH 2275/3942] python3Packages.srsly: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix
index 77bd9cdf5847..ee53af641a05 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/pkgs/development/python-modules/srsly/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "srsly";
-  version = "2.3.1";
+  version = "2.3.2";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3dcce93c69ff18e8a8d7decfdfdf8e1fd44c4446cdee8d0e5d545d6b172dc377";
+    sha256 = "f78eaef8d982e98921ce026d4205e652a9333137259f0b621f5c7b579e746e9d";
   };
 
   nativeBuildInputs = [ cython ];

From 8acd7a354020ebb18f7b703dd207c3ac4417841a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 10:54:47 +0000
Subject: [PATCH 2276/3942] workcraft: 3.3.0 -> 3.3.1

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

diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix
index 4038db17f938..971eb93e2a14 100644
--- a/pkgs/applications/science/logic/workcraft/default.nix
+++ b/pkgs/applications/science/logic/workcraft/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "workcraft";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
-    sha256 = "072i7kan2c9f4s9jxwqr4ccsi9979c12xhwr385sbq06rwyrna85";
+    sha256 = "1xcdf3c8rlvjmhiah3g2j83c889qh9x04kv3kb4nsa2imrpsqaqk";
   };
 
   buildInputs = [ makeWrapper ];

From 6818de3026a176271c1cb29f7ada943bac9b9f1c Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Sun, 8 Nov 2020 16:45:47 +0100
Subject: [PATCH 2277/3942] pythonPackages.urwidtrees: 1.0.2 -> 1.0.3

---
 .../python-modules/urwidtrees/default.nix            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix
index 1b5c58b9ca50..c441d93f6f76 100644
--- a/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/pkgs/development/python-modules/urwidtrees/default.nix
@@ -3,21 +3,29 @@
 , fetchFromGitHub
 , glibcLocales
 , urwid
+, fetchpatch
 }:
 
 buildPythonPackage rec {
   pname = "urwidtrees";
-  version  = "1.0.2";
+  version  = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "pazz";
     repo = "urwidtrees";
     rev = version;
-    sha256 = "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2";
+    sha256 = "sha256-yGSjwagCd5TiwEFtF6ZhDuVqj4PTa5pVXhs8ebr2O/g=";
   };
 
   propagatedBuildInputs = [ urwid ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/pazz/urwidtrees/commit/ed39dbc4fc67b0e0249bf108116a88cd18543aa9.patch";
+    sha256 = "sha256-fA+30d2uVaoNCg4rtoWLNPvrZtq41Co4vcmM80hkURs=";
+    })
+  ];
+
   checkInputs = [ glibcLocales ];
   LC_ALL="en_US.UTF-8";
 

From c589847526735d0c525bb132e850af262cfccc81 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 03:06:52 -0800
Subject: [PATCH 2278/3942] viu: 1.1 -> 1.2.1 (#103582)

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

diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix
index a434b38453eb..39b12326e806 100644
--- a/pkgs/tools/graphics/viu/default.nix
+++ b/pkgs/tools/graphics/viu/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "viu";
-  version = "1.1";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "atanunq";
     repo = "viu";
     rev = "v${version}";
-    sha256 = "1algvndpl63g3yzp3hhbgm7839njpbmw954nsiwf0j591spz4lph";
+    sha256 = "1q248jnbv64mkvg18465dpvjkw2v2hfqyvdvdixyrwyrnlv5cicv";
   };
   # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40
   doCheck = false;
 
-  cargoSha256 = "1jccaln72aqa9975nbs95gimndqx5kgfkjmh40z6chx1hvn4m2ga";
+  cargoSha256 = "18rskn8fchlgk295yk8sc2g1x6h43rmhqif871hgzdx1i35sbajr";
 
   meta = with lib; {
     description = "A command-line application to view images from the terminal written in Rust";

From c1ebf6c096f2e3048ab5eef664f5808a8981a519 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 11:25:32 +0000
Subject: [PATCH 2279/3942] xmrig-proxy: 6.3.0 -> 6.4.0

---
 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 a166ca3b50a5..1b8f79415838 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/applications/misc/xmrig/proxy.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmrig-proxy";
-  version = "6.3.0";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig-proxy";
     rev = "v${version}";
-    sha256 = "1jh527bcl74018jd0qi32y4pcgmnbm21dyfhj4kg0j0ip15mx9j6";
+    sha256 = "0bcbil9b5z95haqbmdqaslckvjflw7h77fqrcdxc6lrn29575nnf";
   };
 
   nativeBuildInputs = [ cmake ];

From bc7a68ac6cdb2ed6c432b676e339a1ce890ed973 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 12 Nov 2020 12:26:42 +0100
Subject: [PATCH 2280/3942] rpm-ostree: 2020.5 -> 2020.7

new website

- https://github.com/coreos/rpm-ostree/releases/tag/v2020.7
- https://github.com/coreos/rpm-ostree/releases/tag/v2020.6
---
 pkgs/tools/misc/rpm-ostree/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index 456798d816f1..16d088c00980 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rpm-ostree";
-  version = "2020.5";
+  version = "2020.7";
 
   outputs = [ "out" "dev" "man" "devdoc" ];
 
   src = fetchurl {
     url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "MLLCmnStvGuSbVBdfOm2Sdzzz7LvPQkgDt9G0CDqCkA=";
+    sha256 = "1f8ajri6k5ni2rm8c75nydl8wcza0q6bv2bia3aqd0mr7iw31pbm";
   };
 
   nativeBuildInputs = [
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";
-    homepage = "https://rpm-ostree.readthedocs.io/en/latest/";
+    homepage = "https://coreos.github.io/rpm-ostree/";
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ copumpkin ];
     platforms = platforms.linux;

From a532edc6cd2cb5dfbd522b8bcd7c460cd6988aa8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 11:31:44 +0000
Subject: [PATCH 2281/3942] yafaray-core: 3.5.0 -> 3.5.1

---
 pkgs/tools/graphics/yafaray-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix
index 3ca9a7b5e8d6..9a52d4531854 100644
--- a/pkgs/tools/graphics/yafaray-core/default.nix
+++ b/pkgs/tools/graphics/yafaray-core/default.nix
@@ -7,13 +7,13 @@
 stdenv.mkDerivation rec {
 
     pname = "yafaray-core";
-    version = "3.5.0";
+    version = "3.5.1";
 
     src = fetchFromGitHub {
       owner  = "YafaRay";
       repo   = "Core";
       rev    = "v${version}";
-      sha256 = "05r08ynm6p9jq9l3v1v3lqkrfx3bm6zlqcxm1yk7mdv1zv2yxikd";
+      sha256 = "043ixf3h4ay2fahsw9lh0pha82f7ri04mlfhvn2pg251012jvhrx";
     };
 
     preConfigure = ''

From 8d8c115dbbc8d6064ef546e372406878e9441b2f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 12 Nov 2020 12:35:28 +0100
Subject: [PATCH 2282/3942] inxi: 3.1.08-1 -> 3.1.09-1

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

diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
index 2ede543cd39f..4257e2f2fd1b 100644
--- a/pkgs/tools/system/inxi/default.nix
+++ b/pkgs/tools/system/inxi/default.nix
@@ -22,13 +22,13 @@ let
     ++ recommendedDisplayInformationPrograms;
 in stdenv.mkDerivation rec {
   pname = "inxi";
-  version = "3.1.08-1";
+  version = "3.1.09-1";
 
   src = fetchFromGitHub {
     owner = "smxi";
     repo = "inxi";
     rev = version;
-    sha256 = "15b0fn8kv09k7kzyzix1pr1wmjw5yinzgw01v8pf9p547m4a899a";
+    sha256 = "0m6s8kxjppy3jm39is5i1lbrah29cw86rq0vamvx46izbdyf84y5";
   };
 
   buildInputs = [ perl makeWrapper ];

From b91153fd7ad32bfe5363844857e7a15f89c0a693 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 12 Nov 2020 12:36:38 +0100
Subject: [PATCH 2283/3942] chromium: 86.0.4240.193 -> 86.0.4240.198

https://chromereleases.googleblog.com/2020/11/stable-channel-update-for-desktop_11.html

This update includes 2 security fixes. Google is aware of reports that
exploits for CVE-2020-16013 and CVE-2020-16017 exist in the wild.

CVEs: CVE-2020-16013 CVE-2020-16017
---
 .../networking/browsers/chromium/upstream-info.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 8a6ed0453a1a..b88a63f27a4e 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,8 +1,8 @@
 {
   "stable": {
-    "version": "86.0.4240.193",
-    "sha256": "0d55xkw3fygqpa3a5bvz7vqmzb0d9w1kis72h54cnwsqgw4xag90",
-    "sha256bin64": "1x1f8fv0fi965apk2a5v6jmhz8j5m3rz0k5x5vmkwqprvlblfjpw",
+    "version": "86.0.4240.198",
+    "sha256": "0i3s1il0x5yi3528gdsg3bhnyhs2x24zh7p1nd5apv3va9g85ax0",
+    "sha256bin64": "0qfhs73r6j0r3nyqbnscnf7h1rs1s68lfl5ndsyd32dmip7ma01x",
     "deps": {
       "gn": {
         "version": "2020-08-07",

From 05d994f064a4f41e48f357dcac45340c47619d99 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 11:41:29 +0000
Subject: [PATCH 2284/3942] yarn: 1.22.5 -> 1.22.10

---
 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 22ce3553352f..7151c872e4d0 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "yarn";
-  version = "1.22.5";
+  version = "1.22.10";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "1yb1pb80jhw6mx1r28hf7zd54dygmnrf30r3fz7kn9nrgdpl5in8";
+    sha256 = "0pdimll8lhsnqfafhdaxd6h6mgxhj1c7h56r111cmxhzw462y3mr";
   };
 
   buildInputs = [ nodejs ];

From 457d3469eebe50f13f347870a5ecb408f12af0b0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 03:00:34 +0000
Subject: [PATCH 2285/3942] signal-cli: 0.6.10 -> 0.6.11

---
 .../networking/instant-messengers/signal-cli/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index c1b9cdc122c4..995c050d90ca 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "signal-cli";
-  version = "0.6.10";
+  version = "0.6.11";
 
   # Building from source would be preferred, but is much more involved.
   src = fetchurl {
     url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
-    sha256 = "0zglcx5ylqjc3hjkzi84mjhp9dchnnkv12qq75q5pqkx1w45rmim";
+    sha256 = "0gkaxhx87yn8gmkqjdn78m1axfnfkw07sw9qsn7821966fd5l5ax";
   };
 
   buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];

From aece293ebfe51a19afb41aa64a29840d28c32387 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 12 Nov 2020 12:48:12 +0100
Subject: [PATCH 2286/3942] gns3-{gui,server}: 2.2.15 -> 2.2.16

---
 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 d9168d7a2988..a0f35f3779d1 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
 { callPackage, libsForQt5 }:
 
 let
-  stableVersion = "2.2.15";
+  stableVersion = "2.2.16";
   previewVersion = stableVersion;
   addVersion = args:
     let version = if args.stable then stableVersion else previewVersion;
@@ -26,8 +26,8 @@ let
   };
   mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
   mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
-  guiSrcHash = "149yphmxc47bhc2f942lp4bx354qj3cyrpn10s1xabkn2hwrsm0d";
-  serverSrcHash = "03cfg48xzgz362ra5x853k8r244dgbrmszcprs2lg70i3m722345";
+  guiSrcHash = "1kz5gr5rwqp1hn9fw17v6sy2467506zks574nqcd2vgxzhr6cy6x";
+  serverSrcHash = "1r6qj1l8jgyjm67agn83zp9c2n7pgfzwyh8a5q314zxi18nm6rqp";
 in {
   guiStable = mkGui {
     stable = true;

From 39eadbb3c4e1ca48709d0c3d5edfd156450375b7 Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Thu, 12 Nov 2020 13:05:39 +0100
Subject: [PATCH 2287/3942] kubernetes: 1.19.3 -> 1.19.4

---
 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 a56db4331945..9a8bbe09a508 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -15,13 +15,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "kubernetes";
-  version = "1.19.3";
+  version = "1.19.4";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "0fpkgrykkjmkrh327g6zf3r6s39bnv5w1wlqsvvzyp2zsswgw81v";
+    sha256 = "05gisihrklkzsdsrrmvmqlfwfdx73jbwd5668n5wa5hp432qyvwi";
   };
 
   nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];

From 6b9f23267e4187828e1fbd2a767f87c4e879d5bc Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Thu, 12 Nov 2020 13:09:04 +0100
Subject: [PATCH 2288/3942] linuxPackages.wireguard: 1.0.20200908 ->
 1.0.20201112

---
 pkgs/os-specific/linux/wireguard/default.nix         |  8 ++------
 .../linux/wireguard/linux-5.4.76-fix.patch           | 12 ------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index ef81dd54a736..25a59b14ab82 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -7,17 +7,13 @@ assert stdenv.lib.versionOlder kernel.version "5.6";
 
 stdenv.mkDerivation rec {
   pname = "wireguard";
-  version = "1.0.20200908";
+  version = "1.0.20201112";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
-    sha256 = "1nd2kc3c62907kxm1084dw7krd8xsy3hxydmcpz4jvk03vm5dnkg";
+    sha256 = "sha256-HnYvjZ3VUH79NwNIvyTTygWYbVqEL2ttvlOlLiHhb5s=";
   };
 
-  patches = [
-    ./linux-5.4.76-fix.patch
-  ];
-
   hardeningDisable = [ "pic" ];
 
   KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
diff --git a/pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch b/pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch
deleted file mode 100644
index 78c3365bcb32..000000000000
--- a/pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h
---- wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h	2020-09-08 16:22:40.000000000 +0000
-+++ wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h	2020-11-10 15:05:43.720093522 +0000
-@@ -40,7 +40,7 @@
- #undef pull
- #endif
- 
--#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76)
- #define SYM_FUNC_START ENTRY
- #define SYM_FUNC_END ENDPROC
- #endif

From d42055441f1a402a37c2387bd1cda23c03e6c9c4 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Thu, 12 Nov 2020 15:14:13 +0300
Subject: [PATCH 2289/3942] =?UTF-8?q?gpxsee:=207.35=20=E2=86=92=207.36?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 1bfe642752be..11b373ac1311 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "gpxsee";
-  version = "7.35";
+  version = "7.36";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "1schmymcsd8s0r26qwyx56z107ql8pgrk1pnqy19mc7fyirdwmp5";
+    sha256 = "18vsw6hw6kn5wmr4iarhx1v8q455j60fhf0hq69jkfyarl56b99j";
   };
 
   patches = (substituteAll {

From 4e29e393eba4583bed844c2d8fc5881f07807ae8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 12:22:08 +0000
Subject: [PATCH 2290/3942] yq-go: 3.4.0 -> 3.4.1

---
 pkgs/development/tools/yq-go/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix
index 3d9d6cf0a0cb..479494e515d7 100644
--- a/pkgs/development/tools/yq-go/default.nix
+++ b/pkgs/development/tools/yq-go/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "yq-go";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "mikefarah";
     rev = version;
     repo = "yq";
-    sha256 = "1rvs27c5mz55zqq9c7yif0dms53bd30d8ylh45f3y3zgh82jihp8";
+    sha256 = "09kcqa15assjhp3kdffa3yhc2vykinzgscjzg996qa85kjircy9b";
   };
 
   vendorSha256 = "0l5bhbp8dfq04hb4xcpx96ksfwx4xvk0pj5ma00rk3z913ikygcd";

From d817bf140be2083a8b3db5ff70c10e095b9c631c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 13:07:55 +0000
Subject: [PATCH 2291/3942] zef: 0.8.5 -> 0.9.1

---
 pkgs/development/interpreters/rakudo/zef.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix
index c82053446933..c72eaedef9d6 100644
--- a/pkgs/development/interpreters/rakudo/zef.nix
+++ b/pkgs/development/interpreters/rakudo/zef.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zef";
-  version = "0.8.5";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "ugexe";
     repo = "zef";
     rev = "v${version}";
-    sha256 = "17a5ns0ph8626q3b4wv9v2n0zqmhqbqyzjzxa387kr19qs933yy6";
+    sha256 = "1qw8g809gnr0s6hmj4qsd81g1dhsacml6n1fdgk4q45l1mxjfdmv";
   };
 
   buildInputs = [ rakudo makeWrapper ];

From 03b9d34df65b4bb21181b80fc84fbeab703ad701 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 13:29:06 +0000
Subject: [PATCH 2292/3942] batsignal: 1.1.3 -> 1.2.0

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

diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix
index 18dbcc9ce26a..90fca4ce28ce 100644
--- a/pkgs/applications/misc/batsignal/default.nix
+++ b/pkgs/applications/misc/batsignal/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "batsignal";
-  version = "1.1.3";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "electrickite";
     repo = "batsignal";
     rev = version;
-    sha256 = "12hj0j18db34x0xzgj6xmhvxm966d05z0rl3d9rlrcd2q96lilwf";
+    sha256 = "0yc7xgwb3i4m8m9kg2xspqig3s2qgh2i9bkalvnkziayjb7y59qn";
   };
 
   buildInputs = [ libnotify glib ];

From 8fbb662a06018735dc0e5ee4ddd99b368eb38fae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 13:47:30 +0000
Subject: [PATCH 2293/3942] gremlin-console: 3.3.4 -> 3.4.8

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

diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix
index a4932943fa23..74485e2004aa 100644
--- a/pkgs/applications/misc/gremlin-console/default.nix
+++ b/pkgs/applications/misc/gremlin-console/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "gremlin-console";
-  version = "3.3.4";
+  version = "3.4.8";
   src = fetchzip {
     url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
-    sha256 = "14xr0yqklmm4jvj1hnkj89lj83zzs2l1375ni0jbf12gy31jlb2w";
+    sha256 = "13ycr6ppyrz9rq7dasabjdk8lcsxdj3krb4j7d2jmbh2hij1rdvf";
   };
 
   buildInputs = [ makeWrapper ];

From 0c01e11ddb97f94ff6adb6b601cd9dc22b94b00d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 14:12:30 +0000
Subject: [PATCH 2294/3942] bazarr: 0.9.0.5 -> 0.9.0.6

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

diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix
index f220f4002a06..2a835c346cea 100644
--- a/pkgs/servers/bazarr/default.nix
+++ b/pkgs/servers/bazarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bazarr";
-  version = "0.9.0.5";
+  version = "0.9.0.6";
 
   src = fetchurl {
     url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz";
-    sha256 = "1mm8qghkif48jr7fq28kp7zk5x71zm43isf0a96crpi9qi91sdd5";
+    sha256 = "1mgvsi8y3camj215vnbw20f1z6jvpbyrj1hrcj4szxfcjkxdg2hv";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b235552837175841fcb5a1d273157047b644fc2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 12 Nov 2020 11:29:22 +0100
Subject: [PATCH 2295/3942] ruby: check disallowed references with jitSupport
 disabled

This makes it easier to detect regressions.
---
 pkgs/development/interpreters/ruby/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index cfd5c7e5180e..7d58dcdafbc1 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -210,6 +210,8 @@ let
           sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
         '';
 
+        disallowedRequisites = op (!jitSupport) stdenv.cc.cc;
+
         meta = with stdenv.lib; {
           description = "The Ruby language";
           homepage    = "http://www.ruby-lang.org/en/";

From 47f576caf80d991ab374eb95a6801f3521ebcc75 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 12 Nov 2020 16:27:47 +0100
Subject: [PATCH 2296/3942] k3b: remove qtwebkit dependency (#103164)

The dependeny is optional and k3b works without it.
---
 pkgs/applications/kde/k3b.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index 4bf707cd0430..35d55787ec78 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,6 +1,5 @@
 { mkDerivation, lib
 , extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info
-, qtwebkit
 , libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
 , flac, lame, libmad, libmpcdec, libvorbis
 , libsamplerate, libsndfile, taglib
@@ -17,8 +16,6 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
   buildInputs = [
-    # qt
-    qtwebkit
     # kde
     libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
     # formats

From 69683ddbc869c37bbb3fee78b288d81cc82abc6c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 15:41:40 +0000
Subject: [PATCH 2297/3942] armadillo: 10.1.1 -> 10.1.2

---
 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 a306a02be069..450182138a40 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "10.1.1";
+  version = "10.1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "13hwynp1dnk3flw8ly00wjj12x2wsvj2da39bzay8c08m3dj3q4m";
+    sha256 = "0pb3ypdaiiw0895x1zzzjvkrfp39bsl3s4f6zb5bzv4wbjv7kvwn";
   };
 
   nativeBuildInputs = [ cmake ];

From 4117c0b7dfed3b4ada58a00bf2bd8b61357c65d4 Mon Sep 17 00:00:00 2001
From: Chuck <chuck@intelligence.org>
Date: Wed, 11 Nov 2020 23:47:57 -0800
Subject: [PATCH 2298/3942] tor-browser-bundle-bin: Fix extension path.  Fixes
 NoScript.

---
 .../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 f6f6deb7380e..ff2501d47ce0 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -231,9 +231,10 @@ stdenv.mkDerivation rec {
 
     # Preload extensions by moving into the runtime instead of storing under the
     # user's profile directory.
-    mkdir -p "$TBB_IN_STORE/browser/extensions"
+    # See https://support.mozilla.org/en-US/kb/deploying-firefox-with-extensions
+    mkdir -p "$TBB_IN_STORE/distribution/extensions"
     mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \
-      "$TBB_IN_STORE/browser/extensions"
+      "$TBB_IN_STORE/distribution/extensions"
 
     # Hard-code paths to geoip data files.  TBB resolves the geoip files
     # relative to torrc-defaults_path but if we do not hard-code them
@@ -409,6 +410,5 @@ stdenv.mkDerivation rec {
     # the compound is "libre" in a strict sense (some components place certain
     # restrictions on redistribution), it's free enough for our purposes.
     license = licenses.free;
-    broken = true;
   };
 }

From e580eacd575685539c2f081eaa4ef985317916c1 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 12 Nov 2020 17:14:18 +0100
Subject: [PATCH 2299/3942] opencascade-occt: 7.4.0p1 -> 7.5.0

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

diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix
index 42ca50ae8f99..ac2b8ba6d1ed 100644
--- a/pkgs/development/libraries/opencascade-occt/default.nix
+++ b/pkgs/development/libraries/opencascade-occt/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "opencascade-occt";
-  version = "7.4.0p1";
+  version = "7.5.0";
   commit = "V${builtins.replaceStrings ["."] ["_"] version}";
 
   src = fetchurl {
     name = "occt-${commit}.tar.gz";
     url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";
-    sha256 = "0b9hs3akx1f3hhg4zdip6qdv04ssqqcf9kk12amkidgvsl73z2hs";
+    sha256 = "0bpzpaqki3k6i7xmhan0f1c1fr05smpcmgrp4vh572j61lwpq1r3";
   };
 
   nativeBuildInputs = [ cmake ninja ];

From 65977c6a8284b09d44cc7e4037c81b1c1b991b27 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 16:28:00 +0000
Subject: [PATCH 2300/3942] bfs: 2.0 -> 2.1

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

diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index dceb6730670b..c0755fafc06a 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bfs";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
     rev = version;
-    sha256 = "0cx650cz4ap1ng25n17pkz0n6zcs87l4bs0mabhqr289rfkf3ddd";
+    sha256 = "1iricyigm0rsc8fr91vk3krvyafbnp0y3ww1rjv94l6jbdl7rrlb";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];

From f32beb311ad822aebedfdb3cec58507f8121231a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 16:46:04 +0000
Subject: [PATCH 2301/3942] ayatana-ido: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix
index 7b24f08822bf..127fe1c97504 100644
--- a/pkgs/development/libraries/ayatana-ido/default.nix
+++ b/pkgs/development/libraries/ayatana-ido/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ayatana-ido";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = pname;
     rev = version;
-    sha256 = "1jmdvvgrgicpnpnygc24qcisqb9y026541gb6lw6fwapvc9aj73p";
+    sha256 = "1mcw6gmacrzx4cyg4223dpwcmj3qf8l30mxsg43292lajzwsm2hz";
   };
 
   nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc vala gobject-introspection ];

From e72ebfe79dfd2d10cfce3649f1825e8e4d07cee9 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Thu, 12 Nov 2020 15:59:26 +0100
Subject: [PATCH 2302/3942] python3Packages.bitstring: 3.1.5 -> 3.1.7

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

diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix
index 23f4257a3574..a2ba5b10268c 100644
--- a/pkgs/development/python-modules/bitstring/default.nix
+++ b/pkgs/development/python-modules/bitstring/default.nix
@@ -2,12 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bitstring";
-  version = "3.1.5";
+  version = "3.1.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1";
-    extension = "zip";
+    sha256 = "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx";
   };
 
   meta = with stdenv.lib; {

From 220f6933ef06aae2aa14025593e0f3b56e4472d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 17:28:52 +0000
Subject: [PATCH 2303/3942] cockroachdb: 20.1.7 -> 20.1.8

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

diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 3418335d418f..3e7548fea34f 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -14,13 +14,13 @@ let
 in
 buildGoPackage rec {
   pname = "cockroach";
-  version = "20.1.7";
+  version = "20.1.8";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
 
   src = fetchurl {
     url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
-    sha256 = "1m1jziby0mzfbpwsak1marh1k9sx8vhc17ix6lgikxip4dpf52qg";
+    sha256 = "0mm3hfr778c7djza8gr1clwa8wca4d3ldh9hlg80avw4x664y5zi";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ];

From 9cb3292bdcb2ec9a350b8ceddb990ff29eda4ea2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 11:19:43 +0000
Subject: [PATCH 2304/3942] xmenu: 4.3.1 -> 4.4.1

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

diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/applications/misc/xmenu/default.nix
index ecbb205c98e9..e84f95e09981 100644
--- a/pkgs/applications/misc/xmenu/default.nix
+++ b/pkgs/applications/misc/xmenu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmenu";
-  version = "4.3.1";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "phillbush";
     repo = "xmenu";
     rev = "v${version}";
-    sha256 = "0m97w1nwak5drcxxlyisqb73fxkapy2rlph9mg531kbx3k2h30r1";
+    sha256 = "1s70zvsaqnsjqs298vw3py0vcvia68xlks1wcz37pb88bwligz1x";
   };
 
   buildInputs = [ imlib2 libX11 libXft libXinerama ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A menu utility for X";
     homepage = "https://github.com/phillbush/xmenu";
-    license = licenses.publicDomain;
+    license = licenses.mit;
     maintainers = with maintainers; [ neonfuz ];
     platforms = platforms.all;
   };

From db215ca08d68eef7baed7eac090cabc427f6f733 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Thu, 12 Nov 2020 18:50:01 +0100
Subject: [PATCH 2305/3942] linux_mptcp_94: remove (outdated)

few years old by now, use linux_mptcp_95 instead.
---
 .../linux/kernel/linux-mptcp-94.nix           | 26 -------------------
 pkgs/top-level/all-packages.nix               | 12 ---------
 2 files changed, 38 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-mptcp-94.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix b/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix
deleted file mode 100644
index e53c3ceb5c46..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args:
-let
-  mptcpVersion = "0.94.6";
-  modDirVersion = "4.14.127";
-in
-buildLinux ({
-  version = "${modDirVersion}-mptcp_v${mptcpVersion}";
-  inherit modDirVersion;
-
-  extraMeta = {
-    branch = "4.4";
-    maintainers = with stdenv.lib.maintainers; [ teto layus ];
-  };
-
-  src = fetchFromGitHub {
-    owner = "multipath-tcp";
-    repo = "mptcp";
-    rev = "v${mptcpVersion}";
-    sha256 = "071cx9205wpzhi5gc2da79w2abs3czd60jg0xml7j1szc5wl4yfn";
-  };
-
-  structuredExtraConfig = stdenv.lib.mkMerge [
-    (import ./mptcp-config.nix { inherit stdenv; })
-    structuredExtraConfig
-  ];
-} // args)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8cb08bce062d..9aebab472813 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17939,18 +17939,6 @@ in
 
   linux_mptcp = linux_mptcp_95;
 
-  linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        kernelPatches.request_key_helper
-        kernelPatches.cpu-cgroup-v2."4.11"
-        kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((stdenv.hostPlatform.platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
   };
 
   linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix {

From 015939bece33c8bf973ad7d2634c14b203f78230 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Thu, 12 Nov 2020 18:50:47 +0100
Subject: [PATCH 2306/3942] linux_mptcp_5_9: MPTCP in upstream linux

linux_mptcp_5_9 enables Multipath TCP in the upstream kernel.

I keep linux_mptcp_95 even if it is out of tree because it has "more" features
than linux_mptcp_5_9.
---
 pkgs/top-level/all-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9aebab472813..78eb6c2d1f1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17939,6 +17939,11 @@ in
 
   linux_mptcp = linux_mptcp_95;
 
+  linux_mptcp_5_9 = linux_5_9.override {
+    structuredExtraConfig = with lib.kernel; {
+      MPTCP      = yes;
+      MPTCP_IPV6 = yes;
+    };
   };
 
   linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix {

From 950cf2bc565a0720f1ec1dd69bd597f972ced16f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 12 Nov 2020 11:45:33 +0100
Subject: [PATCH 2307/3942] python3Packages.setuptools-rust: 0.11.4 -> 0.11.5

Changelog
https://github.com/PyO3/setuptools-rust/releases/tag/v0.11.5
---
 pkgs/development/python-modules/setuptools-rust/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index b04fa39149cc..84465cd475d0 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "setuptools-rust";
-  version = "0.11.4";
+  version = "0.11.5";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9714fcb94c78e6ab1864ddac7750049e105fd4f7c52103aecf40d408e94a722f";
+    sha256 = "04ea21f1bd029046fb87d098be4d7dc74663a58dd1f9fc6edcf8f3e4123ec4a8";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From c53d8793098271f69af257d9275fc043cc160bd4 Mon Sep 17 00:00:00 2001
From: Reed <mrnitsuj1@gmail.com>
Date: Thu, 12 Nov 2020 13:18:00 -0500
Subject: [PATCH 2308/3942] noisetorch: 0.7.2-beta -> 0.8.0-beta

---
 pkgs/applications/audio/noisetorch/config.patch | 13 -------------
 pkgs/applications/audio/noisetorch/default.nix  |  6 +++---
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/applications/audio/noisetorch/config.patch

diff --git a/pkgs/applications/audio/noisetorch/config.patch b/pkgs/applications/audio/noisetorch/config.patch
deleted file mode 100644
index f6e258862db6..000000000000
--- a/pkgs/applications/audio/noisetorch/config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config.go b/config.go
-index de16249..fb91ec0 100644
---- a/config.go
-+++ b/config.go
-@@ -20,7 +20,7 @@ const configFile = "config.toml"
- 
- func initializeConfigIfNot() {
- 	log.Println("Checking if config needs to be initialized")
--	conf := config{Threshold: 95, DisplayMonitorSources: false, EnableUpdates: true}
-+	conf := config{Threshold: 95, DisplayMonitorSources: false, EnableUpdates: false}
- 	configdir := configDir()
- 	ok, err := exists(configdir)
- 	if err != nil {
diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix
index 4b6bd07e7432..15335c15d2af 100644
--- a/pkgs/applications/audio/noisetorch/default.nix
+++ b/pkgs/applications/audio/noisetorch/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "NoiseTorch";
-  version = "0.7.2-beta";
+  version = "0.8.0-beta";
 
   src = fetchFromGitHub {
     owner = "lawl";
     repo = "NoiseTorch";
     rev = version;
-    sha256 = "06xlqjma8h7lcnqgc9226blps6m9dp487hk71lslfxj0jkay548k";
+    sha256 = "0cb9vbszxrgq83q5p5y5vgs2fvywlwmjglcamhibscag2zdd8kdp";
   };
 
-  patches = [ ./version.patch ./config.patch ./embedlibrnnoise.patch ];
+  patches = [ ./version.patch ./embedlibrnnoise.patch ];
 
   vendorSha256 = null;
 

From 791b3b4197f072d0339a066735a94466fe2dada4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 18:30:38 +0000
Subject: [PATCH 2309/3942] cloudflared: 2020.10.2 -> 2020.11.3

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

diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index d61d32e40e95..49abbc7f2cc4 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2020.10.2";
+  version = "2020.11.3";
 
   src = fetchFromGitHub {
     owner  = "cloudflare";
     repo   = "cloudflared";
     rev    = version;
-    sha256 = "0ppl74gb46r2x65hl7z1hjdqlr8la0pvhy8af8isk11sbxmprqjj";
+    sha256 = "1v262wr1z0z3frb9avg6bgsv973cn6gmn4w6wghpcjwsm6jld575";
   };
 
   vendorSha256 = null;

From 3fceafce1eaa82c36a21153efbf7c1ee87af7b0e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 7 Nov 2020 15:36:46 +0100
Subject: [PATCH 2310/3942] buildPython*: remove pythonRecompileBytecodeHook as
 dependency

This hook was added to get reproducible bytecode. Because it was causing
issues it was disabled, but still kept as a dependency. Now the main
issue with bytecode reproducibility has been resolved by updating pip to
20.2.4, we remove this hook as a dependency.

If a package with Python code is not yet reproducible, one could add
this hook to `nativeBuildInputs`.
---
 .../interpreters/python/mk-python-derivation.nix          | 5 -----
 pkgs/development/python-modules/3to2/default.nix          | 2 --
 pkgs/development/python-modules/invoke/default.nix        | 3 ---
 pkgs/development/python-modules/linecache2/default.nix    | 8 ++------
 pkgs/development/python-modules/pexpect/default.nix       | 4 ----
 pkgs/development/tools/documentation/gtk-doc/default.nix  | 4 ----
 pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix  | 1 -
 7 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index c3be76790ebd..c85a59390558 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -17,7 +17,6 @@
 , pythonCatchConflictsHook
 , pythonImportsCheckHook
 , pythonNamespacesHook
-, pythonRecompileBytecodeHook
 , pythonRemoveBinBytecodeHook
 , pythonRemoveTestsDirHook
 , setuptoolsBuildHook
@@ -113,7 +112,6 @@ let
       python
       wrapPython
       ensureNewerSourcesForZipFilesHook  # move to wheel installer (pip) or builder (setuptools, flit, ...)?
-      pythonRecompileBytecodeHook  # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441
       pythonRemoveTestsDirHook
     ] ++ lib.optionals catchConflicts [
       setuptools pythonCatchConflictsHook
@@ -167,9 +165,6 @@ let
     # Python packages built through cross-compilation are always for the host platform.
     disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ];
 
-    # For now, revert recompilation of bytecode.
-    dontUsePythonRecompileBytecode = true;
-
     meta = {
       # default to python's platforms
       platforms = python.meta.platforms;
diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix
index 8870388c2846..ff64a6d1a473 100644
--- a/pkgs/development/python-modules/3to2/default.nix
+++ b/pkgs/development/python-modules/3to2/default.nix
@@ -24,8 +24,6 @@ buildPythonPackage rec {
   # Test failing due to upstream issue (https://bitbucket.org/amentajo/lib3to2/issues/50/testsuite-fails-with-new-python-35)
   doCheck = false;
 
-  dontUsePythonRecompileBytecode = true;
-
   meta = {
     homepage = "https://bitbucket.org/amentajo/lib3to2";
     description = "Refactors valid 3.x syntax into valid 2.x syntax, if a syntactical conversion is possible";
diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix
index 7189727cf3a8..45f3ee7a04db 100644
--- a/pkgs/development/python-modules/invoke/default.nix
+++ b/pkgs/development/python-modules/invoke/default.nix
@@ -20,9 +20,6 @@ buildPythonPackage rec {
   # errors with vendored libs
   doCheck = false;
 
-  # has vendored python2 code
-  dontUsePythonRecompileBytecode = true;
-
   meta = {
     description = "Pythonic task execution";
     license = lib.licenses.bsd2;
diff --git a/pkgs/development/python-modules/linecache2/default.nix b/pkgs/development/python-modules/linecache2/default.nix
index a2c7080e2701..ba2525155d30 100644
--- a/pkgs/development/python-modules/linecache2/default.nix
+++ b/pkgs/development/python-modules/linecache2/default.nix
@@ -5,7 +5,7 @@
 , isPy3k
 }:
 
-buildPythonPackage (rec {
+buildPythonPackage rec {
   pname = "linecache2";
   version = "1.0.0";
 
@@ -23,8 +23,4 @@ buildPythonPackage (rec {
     homepage = "https://github.com/testing-cabal/linecache2";
     license = licenses.psfl;
   };
-# TODO: move into main set, this was to avoid a rebuild
-} // stdenv.lib.optionalAttrs (!isPy3k ) {
-  # syntax error in tests. Tests are likely Python 3 only.
-  dontUsePythonRecompileBytecode = !isPy3k;
-})
+}
diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix
index aead62913c7b..60655708beae 100644
--- a/pkgs/development/python-modules/pexpect/default.nix
+++ b/pkgs/development/python-modules/pexpect/default.nix
@@ -41,8 +41,4 @@ buildPythonPackage (rec {
       any platform that supports the standard Python pty module.
     '';
   };
-# TODO: move into main set, this was to avoid a rebuild
-} // lib.optionalAttrs (!isPy3k ) {
-  # syntax error in _async module, likely intended only for Python 3.
-  dontUsePythonRecompileBytecode = !isPy3k;
 })
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index d7779540f97d..4645c63e71da 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -68,10 +68,6 @@ python3.pkgs.buildPythonApplication rec {
       --replace "${python3}" ""
   '';
 
-  # find: ‘...-gtk-doc-1.32/lib/python3.8/site-packages’: No such file or directory
-  # https://github.com/NixOS/nixpkgs/pull/90208#issuecomment-644051108
-  dontUsePythonRecompileBytecode = true;
-
   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/poetry2nix/poetry2nix/plugins.nix b/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix
index b5e807c6e2d9..e7125c2ff57c 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix
@@ -23,7 +23,6 @@ let
 
       dontConfigure = true;
       dontBuild = true;
-      dontUsePythonRecompileBytecode = true;
 
       passthru = {
         inherit (drv.passthru) withPlugins;

From 1b5a1c697da8269ea49249461ced87662d120924 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 1 Aug 2020 23:20:32 +0200
Subject: [PATCH 2311/3942] nixos/tests/postfix: migrate test to use
 tlsTrustedAuthorities

Fixes: 632104e ("postfix: deprecated `sslCACert` in favour of
`tlsTrustedAuthorities`")
---
 nixos/tests/postfix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/postfix.nix b/nixos/tests/postfix.nix
index 37ae76afec10..29e263cd7e78 100644
--- a/nixos/tests/postfix.nix
+++ b/nixos/tests/postfix.nix
@@ -11,7 +11,7 @@ import ./make-test-python.nix {
       enable = true;
       enableSubmission = true;
       enableSubmissions = true;
-      sslCACert = certs.ca.cert;
+      tlsTrustedAuthorities = certs.ca.cert;
       sslCert = certs.${domain}.cert;
       sslKey = certs.${domain}.key;
       submissionsOptions = {

From 5b44f469135d52c5c9205ea5ee8374f57ea9eefb Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Nov 2020 17:45:09 +0100
Subject: [PATCH 2312/3942] diffoscope: 160 -> 161

https://diffoscope.org/news/diffoscope-161-released/
---
 pkgs/tools/misc/diffoscope/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 011c5432089d..76c868f9b583 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -16,11 +16,11 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "160";
+  version = "161";
 
   src = fetchurl {
     url    = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    sha256 = "1nshcgq31nrbh4r70i5azs7s0wfc4llb60ka1w8rncy22rg8rabc";
+    sha256 = "sha256-Frk+aVUQhWn/TvlG4zy5+R2z92rFIwO4NPRXYkS0rN4=";
   };
 
   outputs = [ "out" "man" ];

From 02a1379d454e5749951604035c17ca2651535691 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Nov 2020 17:45:57 +0100
Subject: [PATCH 2313/3942] EmptyEpsilon: 2020.08.07 -> 2020.08.25

https://github.com/daid/EmptyEpsilon/releases/tag/EE-2020.08.25
---
 pkgs/games/empty-epsilon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index 098ed35406f4..c006adcb2719 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -4,7 +4,7 @@ let
 
   major = "2020";
   minor = "08";
-  patch = "07";
+  patch = "25";
 
   version = "${major}.${minor}.${patch}";
 
@@ -16,7 +16,7 @@ let
       owner = "daid";
       repo = "SeriousProton";
       rev = "EE-${version}";
-      sha256 = "1mfizhmwh6xgb5n34l3wrbxm21f7gsvsyacsmnxw9rkz0ya7ch30";
+      sha256 = "sha256-LiMEgsUpNBtduFO85ct6NYr/Smbzd8yE8Vce3voErLY=";
     };
 
     nativeBuildInputs = [ cmake ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     owner = "daid";
     repo = "EmptyEpsilon";
     rev = "EE-${version}";
-    sha256 = "0p41wx9yk09xjmfkjpdgi3b2999ps2am3xqwd866q11f6ci7viv5";
+    sha256 = "sha256-3QREWTq1Jq9T/FtGFVU4MidZeUQvRSVChn9JKxv2SiQ=";
   };
 
   nativeBuildInputs = [ cmake ];

From e7053a87adf9fd31362a34c79d54d4e1305d31b8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Nov 2020 17:47:39 +0100
Subject: [PATCH 2314/3942] evcxr: 0.5.3 -> 0.6.0

Since version `0.6.0` the `rust-src` component (or declaring
`RUST_SRC_PATH`) is needed. Just like in `rust-analyzer`, this is solved by
setting `RUST_SRC_PATH` to `rustPlatform.rustLibSrc` for tests and
wrapped executables.

ChangeLog: https://github.com/google/evcxr/blob/v0.6.0/RELEASE_NOTES.md#version-060
---
 .../interpreters/evcxr/default.nix            | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix
index 11b9cd1ba505..a97f132b3b2f 100644
--- a/pkgs/development/interpreters/evcxr/default.nix
+++ b/pkgs/development/interpreters/evcxr/default.nix
@@ -2,22 +2,30 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "evcxr";
-  version = "0.5.3";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "evcxr";
     rev = "v${version}";
-    sha256 = "144xqi19d2nj9qgmhpx6d1kfhx9vfkmk7rnq6nzybpx4mbbl3ki2";
+    sha256 = "sha256-QpUhUE65/IuT/VenziPX6z+CbJswbPPIv/ZnTthZpEU=";
   };
 
-  cargoSha256 = "07lzxh0wh6azrlzfaacg29zmkn8jdnkdqbwgd5ajy79y8nii3c7z";
+  cargoSha256 = "sha256-iUzVd4XtD+41yTV/BmqWLenzAUNPfS7vIHm1KfuPe9A=";
+
+  RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
 
   nativeBuildInputs = [ pkgconfig makeWrapper cmake ];
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
-  postInstall = ''
-    wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]}
-    wrapProgram $out/bin/evcxr_jupyter --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]}
+  postInstall = let
+    wrap = exe: ''
+      wrapProgram $out/bin/${exe} \
+        --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} \
+        --set-default RUST_SRC_PATH "$RUST_SRC_PATH"
+    '';
+  in ''
+    ${wrap "evcxr"}
+    ${wrap "evcxr_jupyter"}
     rm $out/bin/testing_runtime
   '';
 

From f94859f1999f44530b9ea3220e1556702cf9c789 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Nov 2020 18:28:16 +0100
Subject: [PATCH 2315/3942] epson-escpr2: 1.1.23 -> 1.1.24

---
 pkgs/misc/drivers/epson-escpr2/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix
index 0fdf7ecf96d1..afde25ee6b4e 100644
--- a/pkgs/misc/drivers/epson-escpr2/default.nix
+++ b/pkgs/misc/drivers/epson-escpr2/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "epson-inkjet-printer-escpr2";
-  version = "1.1.23";
+  version = "1.1.24";
 
   src = fetchurl {
     # To find new versions, visit
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
     # version.  
     # NOTE: Don't forget to update the webarchive link too!
     urls = [
-      "https://download3.ebz.epson.net/dsc/f/03/00/12/04/34/22448566e405c21c3f4436dfd8927176add3e680/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm"
-      "https://web.archive.org/web/20201019154323if_/https://download3.ebz.epson.net/dsc/f/03/00/12/04/34/22448566e405c21c3f4436dfd8927176add3e680/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm"
+      "https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"
+      "https://web.archive.org/web/20201112163802if_/https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"
     ];
-    sha256 = "1d5zd8cwgp3n25ramdqwqb770iim7kh4l7hmhf6a6ivpy0cxpwx6";
+    sha256 = "sha256-DPzjKKsTWbfDk1MsVPXNsO5D7C/RiNegmwq2sEMx2co=";
   };
 
   patches = [ ./cups-filter-ppd-dirs.patch ];

From e19567abb9075df8a4c9e30b75f7dad2ce0c4f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
Date: Thu, 12 Nov 2020 18:15:45 +0100
Subject: [PATCH 2316/3942] dino: 0.1.0 -> 0.2.0

---
 .../networking/instant-messengers/dino/default.nix  | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 795f71a3cd01..03508c2ffb53 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -18,24 +18,15 @@
 
 stdenv.mkDerivation rec {
   pname = "dino";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
     rev = "v${version}";
-    sha256 = "1k5cgj5n8s40i71wqdh6m1q0njl45ichfdbbywx9rga5hljz1c54";
+    sha256 = "0wy1hb3kz3k4gqqwx308n37cqag2d017jwfz0b5s30nkx2pbwspw";
   };
 
-  patches = [
-    (fetchpatch {
-      # Allow newer versions of libsignal-protocol-c
-      url = "https://github.com/dino/dino/commit/fbd70ceaac5ebbddfa21a580c61165bf5b861303.patch";
-      sha256 = "0ydpwsmwrzfsry89fsffkfalhki4n1dw99ixjvpiingdrhjmwyl2";
-      excludes = [ "plugins/signal-protocol/libsignal-protocol-c" ];
-    })
-  ];
-
   nativeBuildInputs = [
     vala
     cmake

From 9309563332a0a8a03447b8a5f1602ffb88b2f7ac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Aug 2020 03:46:09 +0200
Subject: [PATCH 2317/3942] postfix: add passthru tests

---
 nixos/tests/postfix.nix               | 6 +++---
 pkgs/servers/mail/postfix/default.nix | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/postfix.nix b/nixos/tests/postfix.nix
index 29e263cd7e78..6d22b4edba0a 100644
--- a/nixos/tests/postfix.nix
+++ b/nixos/tests/postfix.nix
@@ -11,9 +11,9 @@ import ./make-test-python.nix {
       enable = true;
       enableSubmission = true;
       enableSubmissions = true;
-      tlsTrustedAuthorities = certs.ca.cert;
-      sslCert = certs.${domain}.cert;
-      sslKey = certs.${domain}.key;
+      tlsTrustedAuthorities = "${certs.ca.cert}";
+      sslCert = "${certs.${domain}.cert}";
+      sslKey = "${certs.${domain}.key}";
       submissionsOptions = {
           smtpd_sasl_auth_enable = "yes";
           smtpd_client_restrictions = "permit";
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 9aee89db9b70..a4346bdbd2b1 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl
 , coreutils, findutils, gnugrep, gawk, icu, pcre, m4
-, buildPackages
+, buildPackages, nixosTests
 , withLDAP ? true, openldap
 , withPgSQL ? false, postgresql
 , withMySQL ? false, libmysqlclient
@@ -96,6 +96,8 @@ in stdenv.mkDerivation rec {
       --prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep gawk gnused ]}
   '';
 
+  passthru.tests = { inherit (nixosTests) postfix postfix-raise-smtpd-tls-security-level; };
+
   meta = with lib; {
     homepage = "http://www.postfix.org/";
     description = "A fast, easy to administer, and secure mail server";

From eaf889aea041d1dbaf1e7da8180b1401f7457a28 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 12 Nov 2020 20:05:40 +0100
Subject: [PATCH 2318/3942] microcodeIntel: 20201110 -> 20201112

Update to Pentium Silver N/J5xxx, Celeron N/J4xxx

https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00381.html
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00389.html

Fixes: CVE-2020-8694, CVE-2020-8695, CVE-2020-8696, CVE-2020-8698
---
 pkgs/os-specific/linux/microcode/intel.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 8a975b4fb3d2..19487fb70587 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "microcode-intel";
-  version = "20201110";
+  version = "20201112";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "Intel-Linux-Processor-Microcode-Data-Files";
     rev = "microcode-${version}";
-    sha256 = "03a89mh5f8zwwg750pahr25qagkjh2rw27bm28vp0586hrd36ll6";
+    sha256 = "104l3py5z6405wpa2fscqpc5r9dgrf1ckaf27hrswivi32gvp7f2";
   };
 
   nativeBuildInputs = [ iucode-tool libarchive ];

From eb065adbdefa5446af7ea08d912caff8254995b0 Mon Sep 17 00:00:00 2001
From: Reed <mrnitsuj1@gmail.com>
Date: Thu, 12 Nov 2020 14:11:42 -0500
Subject: [PATCH 2319/3942] noisetorch: 0.8.0-beta -> 0.8.2

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

diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix
index 15335c15d2af..1932f239cfd7 100644
--- a/pkgs/applications/audio/noisetorch/default.nix
+++ b/pkgs/applications/audio/noisetorch/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "NoiseTorch";
-  version = "0.8.0-beta";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "lawl";
     repo = "NoiseTorch";
     rev = version;
-    sha256 = "0cb9vbszxrgq83q5p5y5vgs2fvywlwmjglcamhibscag2zdd8kdp";
+    sha256 = "14i04rmraxbddcvk0k9c6ak9invln7002g5jms54kcjzv9p39hbf";
   };
 
   patches = [ ./version.patch ./embedlibrnnoise.patch ];

From c80ddf3b2502ed5d03c1d70abfc67cbf720107d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 12 Nov 2020 20:22:57 +0100
Subject: [PATCH 2320/3942] makemkv: 1.15.2 -> 1.15.3

Changelog (summarized):

- Massive internanal rewrite.
- Improved handling of disks with mastering errors.
- MakeMKV now can extract Dolby Vision metadata from elementary stream
  data.
- MakeMKV now forces low speed when reading data around disc edges,
  working around firmware bugs
---
 pkgs/applications/video/makemkv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 6575fa0634dc..6f47307f4a6a 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -13,21 +13,21 @@
 }:
 
 let
-  version = "1.15.2";
+  version = "1.15.3";
   # Using two URLs as the first one will break as soon as a new version is released
   src_bin = fetchurl {
     urls = [
       "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
       "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
     ];
-    sha256 = "1dbips0qllbwhak44c50nlwn8n3kx8i6773cal5zl3dv4v2nf6ql";
+    hash = "sha256-Y23aetnwqLGaBIgJ/AP0oCrh8P5jpVrcMJgmc0Oe+i8=";
   };
   src_oss = fetchurl {
     urls = [
       "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
       "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
     ];
-    sha256 = "1wnhzlz5fw6qwh82hjcpimg60xb3a9a54zb6gcjhqr9zdly2zphy";
+    hash = "sha256-Qruq9YKAaNF1pDtOhptP95UjFL2NA4EuROR4v6XZHEw=";
   };
 in mkDerivation {
   pname = "makemkv";

From f70ecb65e71837e1029796d83af253a904ab38b6 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 30 Sep 2020 21:47:42 +0200
Subject: [PATCH 2321/3942] python3Packages.fastecdsa: init at 2.1.5

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

diff --git a/pkgs/development/python-modules/fastecdsa/default.nix b/pkgs/development/python-modules/fastecdsa/default.nix
new file mode 100644
index 000000000000..04d9da87c5c1
--- /dev/null
+++ b/pkgs/development/python-modules/fastecdsa/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, gmp
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "fastecdsa";
+  version = "2.1.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d0772f7fe243e8a82d33e95c542ea6cc0ef7f3cfcced7440d6defa71a35addfa";
+  };
+
+  buildInputs = [ gmp ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  # skip tests which require being online to download test vectors
+  pytestFlags = [
+     "--ignore=fastecdsa/tests/test_wycheproof_vectors.py"
+     "--ignore=fastecdsa/tests/test_rfc6979_ecdsa.py"
+  ];
+
+  # skip tests for now, they fail with
+  # ImportError: cannot import name '_ecdsa' from 'fastecdsa'
+  # but the installed package works just fine
+  doCheck = false;
+
+  pythonImportsCheck = [ "fastecdsa" ];
+
+  meta = with lib; {
+    description = "Fast elliptic curve digital signatures";
+    homepage = "https://github.com/AntonKueltz/fastecdsa";
+    license = licenses.unlicense;
+    maintainers = with maintainers; [ prusnak ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 044f30e76174..d84b4c366243 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2012,6 +2012,8 @@ in {
 
   fastdtw = callPackage ../development/python-modules/fastdtw { };
 
+  fastecdsa = callPackage ../development/python-modules/fastecdsa { };
+
   fasteners = callPackage ../development/python-modules/fasteners { };
 
   fastentrypoints = callPackage ../development/python-modules/fastentrypoints { };

From fb0f4c5652c029c4aa9967f5427449084c9b9994 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 20:03:56 +0000
Subject: [PATCH 2322/3942] criu: 3.14 -> 3.15

---
 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 462658396c8a..92fabffcd029 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "criu";
-  version = "3.14";
+  version = "3.15";
 
   src = fetchurl {
     url    = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2";
-    sha256 = "1jrr3v99g18gc0hriz0avq6ccdvyya0j6wwz888sdsc4icc30gzn";
+    sha256 = "09d0j24x0cyc7wkgi7cnxqgfjk7kbdlm79zxpj8d356sa3rw2z24";
   };
 
   enableParallelBuilding = true;

From 8f4df972e034a57261fc2fdf114b71728222cdfc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 18:54:12 +0000
Subject: [PATCH 2323/3942] colord: 1.4.4 -> 1.4.5

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

diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 79d27129173a..1db776c8ff0d 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "colord";
-  version = "1.4.4";
+  version = "1.4.5";
 
   outputs = [ "out" "dev" "devdoc" "man" "installedTests" ];
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz";
-    sha256 = "19f0938fr7nvvm3jr263dlknaq7md40zrac2npfyz25zc00yh3ws";
+    sha256 = "05sydi6qqqx1rrqwnga1vbg9srkf89wdcfw5w4p4m7r37m2flx5p";
   };
 
   patches = [

From 331e2376cd47b0282bdb30c00e1c506a6759fa13 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 12 Nov 2020 21:38:49 +0100
Subject: [PATCH 2324/3942] libplacebo: 2.72.0 -> 2.72.2

---
 pkgs/development/libraries/libplacebo/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix
index 0b36efa189bb..ac8552fa9ef4 100644
--- a/pkgs/development/libraries/libplacebo/default.nix
+++ b/pkgs/development/libraries/libplacebo/default.nix
@@ -15,24 +15,16 @@
 
 stdenv.mkDerivation rec {
   pname = "libplacebo";
-  version = "2.72.0";
+  version = "2.72.2";
 
   src = fetchFromGitLab {
     domain = "code.videolan.org";
     owner = "videolan";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1yhf9xyxdawbihsx89dpjlac800wrmpwx63rphad2nj225y9q40f";
+    sha256 = "1ijqpx1pagc6qg63ynqrinvckwc8aaw1i0lx48gg5szwk8afib4i";
   };
 
-  patches = [
-    # to work with latest glslang, remove on release >2.72.0
-    (fetchpatch {
-      url = "https://code.videolan.org/videolan/libplacebo/-/commit/523056828ab86c2f17ea65f432424d48b6fdd389.patch";
-      sha256 = "051vhd0l3yad1fzn5zayi08kqs9an9j8p7m63kgqyfv1ksnydpcs";
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja

From a7cb88c3def629f4d950d819254c27c1b328b2ac Mon Sep 17 00:00:00 2001
From: Jonas Chevalier <zimbatm@zimbatm.com>
Date: Thu, 12 Nov 2020 22:22:18 +0100
Subject: [PATCH 2325/3942] tree-wide: unify Bash completions outputs (#103421)

Use $out/share/bash-completion/completions to store the Bash completions
---
 pkgs/applications/misc/gammu/bashcomp-dir.patch             | 2 +-
 pkgs/applications/misc/prevo/tools.nix                      | 2 +-
 pkgs/applications/office/todo.txt-cli/default.nix           | 4 ++--
 .../version-management/git-and-tools/git-bug/default.nix    | 2 +-
 .../version-management/git-and-tools/git-stree/default.nix  | 4 ++--
 .../version-management/git-and-tools/git/default.nix        | 4 ++--
 .../version-management/git-and-tools/topgit/default.nix     | 4 ++--
 .../development/compilers/purescript/purescript/default.nix | 4 ++--
 pkgs/development/tools/backblaze-b2/default.nix             | 4 ++--
 pkgs/os-specific/linux/trace-cmd/default.nix                | 2 +-
 pkgs/tools/admin/awscli/default.nix                         | 6 ++++--
 pkgs/tools/admin/awscli2/default.nix                        | 6 ++++--
 pkgs/tools/admin/bluemix-cli/default.nix                    | 2 +-
 pkgs/tools/admin/google-cloud-sdk/default.nix               | 4 ++--
 pkgs/tools/backup/tarsnap/default.nix                       | 2 +-
 pkgs/tools/filesystems/btrfs-progs/default.nix              | 2 +-
 pkgs/tools/filesystems/ceph/default.nix                     | 4 ++--
 pkgs/tools/filesystems/yandex-disk/default.nix              | 5 +++--
 pkgs/tools/misc/gibo/default.nix                            | 6 +++---
 pkgs/tools/misc/powerline-rs/default.nix                    | 2 +-
 pkgs/tools/security/pass/extensions/import.nix              | 2 +-
 pkgs/tools/security/pass/extensions/update.nix              | 2 +-
 pkgs/tools/virtualization/awsebcli/default.nix              | 4 ++--
 pkgs/tools/virtualization/nixos-container/default.nix       | 2 +-
 pkgs/top-level/perl-packages.nix                            | 6 +++---
 25 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/misc/gammu/bashcomp-dir.patch b/pkgs/applications/misc/gammu/bashcomp-dir.patch
index d41aa432cf35..de402595cd38 100644
--- a/pkgs/applications/misc/gammu/bashcomp-dir.patch
+++ b/pkgs/applications/misc/gammu/bashcomp-dir.patch
@@ -5,7 +5,7 @@
      macro_optional_find_package (BashCompletion)
      if (NOT BASH_COMPLETION_FOUND)
 -      set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d")
-+      set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d")
++      set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions" CACHE PATH "Location of bash_completion.d")
      endif (NOT BASH_COMPLETION_FOUND)
      install (
          FILES bash-completion/gammu
diff --git a/pkgs/applications/misc/prevo/tools.nix b/pkgs/applications/misc/prevo/tools.nix
index 6a85e73bf851..39c54b73b2fe 100644
--- a/pkgs/applications/misc/prevo/tools.nix
+++ b/pkgs/applications/misc/prevo/tools.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib expat ];
 
   postInstall = ''
-    installShellCompletion --bash $out/etc/bash_completion.d/prevo-completion
+    installShellCompletion --bash src/prevo-completion
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix
index 489b759f48c4..8db5691ed84d 100644
--- a/pkgs/applications/office/todo.txt-cli/default.nix
+++ b/pkgs/applications/office/todo.txt-cli/default.nix
@@ -13,8 +13,8 @@ in stdenv.mkDerivation {
   installPhase = ''
     install -vd $out/bin
     install -vm 755 todo.sh $out/bin
-    install -vd $out/etc/bash_completion.d
-    install -vm 644 todo_completion $out/etc/bash_completion.d/todo
+    install -vd $out/share/bash-completion/completions
+    install -vm 644 todo_completion $out/share/bash-completion/completions/todo
     install -vd $out/etc/todo
     install -vm 644 todo.cfg $out/etc/todo/config
   '';
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index 44eba8c4b39c..7c345639e9f8 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   '';
 
   postInstall = ''
-    install -D -m 0644 misc/bash_completion/git-bug "$out/etc/bash_completion.d/git-bug"
+    install -D -m 0644 misc/bash_completion/git-bug "$out/share/bash-completion/completions/git-bug"
     install -D -m 0644 misc/zsh_completion/git-bug "$out/share/zsh/site-functions/git-bug"
     install -D -m 0644 -t "$out/share/man/man1" doc/man/*
   '';
diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
index dc636571acc0..aa53529933ff 100644
--- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    mkdir -p $out/bin $out/etc/bash_completion.d
+    mkdir -p $out/bin $out/share/bash-completion/completions
     install -m 0755 git-stree $out/bin/
-    install -m 0644 git-stree-completion.bash $out/etc/bash_completion.d/
+    install -m 0644 git-stree-completion.bash $out/share/bash-completion/completions/
   '';
 
   meta = with lib; {
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 b6efb78513cd..8ab97127294a 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -153,8 +153,8 @@ stdenv.mkDerivation {
       cp -a contrib $out/share/git/
       mkdir -p $out/share/bash-completion/completions
       ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git
-      mkdir -p $out/etc/bash_completion.d
-      ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/
+      mkdir -p $out/share/bash-completion/completions
+      ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/
 
       # grep is a runtime dependency, need to patch so that it's found
       substituteInPlace $out/libexec/git-core/git-sh-setup \
diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
index 0da0cfa02b63..9577b56b6c73 100644
--- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl git ];
 
   postInstall = ''
-    install -Dm644 README -t"$out/share/doc/${pname}-${version}/"
-    install -Dm755 contrib/tg-completion.bash -t "$out/etc/bash_completion.d/"
+    install -Dm644 README -t "$out/share/doc/${pname}-${version}/"
+    install -Dm755 contrib/tg-completion.bash -t "$out/share/bash-completion/completions/"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index 8a7fb96723a7..8dd19ecf8586 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -47,8 +47,8 @@ in stdenv.mkDerivation rec {
     install -D -m555 -T purs $PURS
     ${patchelf libPath}
 
-    mkdir -p $out/etc/bash_completion.d/
-    $PURS --bash-completion-script $PURS > $out/etc/bash_completion.d/purs-completion.bash
+    mkdir -p $out/share/bash-completion/completions
+    $PURS --bash-completion-script $PURS > $out/share/bash-completion/completions/purs-completion.bash
   '';
 
   passthru.tests = {
diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
index 46e54465ab67..32161a437986 100644
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -35,8 +35,8 @@ python3Packages.buildPythonApplication rec {
 
     sed 's/b2/backblaze-b2/' -i contrib/bash_completion/b2
 
-    mkdir -p "$out/etc/bash_completion.d"
-    cp contrib/bash_completion/b2 "$out/etc/bash_completion.d/backblaze-b2"
+    mkdir -p "$out/share/bash-completion/completions"
+    cp contrib/bash_completion/b2 "$out/share/bash-completion/completions/backblaze-b2"
   '';
 
   meta = with lib; {
diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index a80635c53cef..ddd411702151 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     "man_dir=${placeholder "man"}/share/man"
     "libdir=${placeholder "lib"}/lib"
     "includedir=${placeholder "dev"}/include"
-    "BASH_COMPLETE_DIR=${placeholder "out"}/etc/bash_completion.d"
+    "BASH_COMPLETE_DIR=${placeholder "out"}/share/bash-completion/completions"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 79d6f42628f3..7c78587a05e5 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -47,10 +47,12 @@ in with py.pkgs; buildPythonApplication rec {
   ];
 
   postInstall = ''
-    mkdir -p $out/etc/bash_completion.d
-    echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
+    mkdir -p $out/share/bash-completion/completions
+    echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli
+
     mkdir -p $out/share/zsh/site-functions
     mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
+
     rm $out/bin/aws.cmd
   '';
 
diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index e89df04e3bd1..b6844767e608 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -67,10 +67,12 @@ with py.pkgs; buildPythonApplication rec {
   ];
 
   postInstall = ''
-    mkdir -p $out/etc/bash_completion.d
-    echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
+    mkdir -p $out/share/bash-completion/completions
+    echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli
+
     mkdir -p $out/share/zsh/site-functions
     mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
+
     rm $out/bin/aws.cmd
   '';
 
diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix
index f97a6e5df891..b0a5af35def5 100644
--- a/pkgs/tools/admin/bluemix-cli/default.nix
+++ b/pkgs/tools/admin/bluemix-cli/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     install -m755 -D -t $out/bin/cfcli bin/cfcli/cf
     ln -sv $out/bin/ibmcloud $out/bin/bx
     ln -sv $out/bin/ibmcloud $out/bin/bluemix
-    install -D -t "$out/etc/bash_completion.d" bx/bash_autocomplete
+    install -D -t "$out/share/bash-completion/completions" bx/bash_autocomplete
     install -D -t "$out/share/zsh/site-functions" bx/zsh_autocomplete
   '';
 
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 53cbaf1229aa..904cab312286 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -74,8 +74,8 @@ in stdenv.mkDerivation rec {
     disable_update_check = true" >> $out/google-cloud-sdk/properties
 
     # setup bash completion
-    mkdir -p $out/etc/bash_completion.d
-    mv $out/google-cloud-sdk/completion.bash.inc $out/etc/bash_completion.d/gcloud.inc
+    mkdir -p $out/share/bash-completion/completions
+    mv $out/google-cloud-sdk/completion.bash.inc $out/share/bash-completion/completions/gcloud.inc
 
     # This directory contains compiled mac binaries. We used crcmod from
     # nixpkgs instead.
diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index 8d23e955095a..34955a979a41 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d"
+    configureFlags="--with-bash-completion-dir=$out/share/bash-completion/completions"
   '';
 
   patchPhase = ''
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 3358d1c02776..03db1d913e2b 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   postPatch = "sed -i s/-O1/-O2/ configure";
 
   postInstall = ''
-    install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs
+    install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs
   '';
 
   configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace";
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index b221025f85b8..7ada070aba68 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -208,12 +208,12 @@ in rec {
   ceph-client = runCommand "ceph-client-${version}" {
       meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices";
     } ''
-      mkdir -p $out/{bin,etc,${sitePackages}}
+      mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions}
       cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin
       cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin
       cp -r ${ceph}/bin/rbd-replay* $out/bin
       cp -r ${ceph}/${sitePackages} $out/${sitePackages}
-      cp -r ${ceph}/etc/bash_completion.d $out/etc
+      cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions
       # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths
       substituteInPlace $out/bin/ceph          --replace ${ceph} $out
       substituteInPlace $out/bin/.ceph-wrapped --replace ${ceph} $out
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 334aa6ad9c60..152fd1d7a71e 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -32,12 +32,13 @@ stdenv.mkDerivation rec {
     cd unpacked
     ${rpmextract}/bin/rpmextract $src
 
+    mkdir -p $out/share/bash-completion/completions
     cp -r -t $out/bin usr/bin/*
     cp -r -t $out/share usr/share/*
-    cp -r -t $out/etc etc/*
+    cp -r -t $out/share/bash-completion/completions etc/bash_completion.d/*
 
     sed -i 's@have@${which}/bin/which >/dev/null 2>\&1@' \
-      $out/etc/bash_completion.d/yandex-disk-completion.bash
+      $out/share/bash-completion/completions/yandex-disk-completion.bash
 
     ${patchelf}/bin/patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix
index abee4950d879..1357ab5196d7 100644
--- a/pkgs/tools/misc/gibo/default.nix
+++ b/pkgs/tools/misc/gibo/default.nix
@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
 
   installPhase = ''
-    mkdir -p $out/bin $out/etc/bash_completion.d
+    mkdir -p $out/bin $out/share/bash-completion/completions
     cp gibo $out/bin
-    cp gibo-completion.bash $out/etc/bash_completion.d
+    cp gibo-completion.bash $out/share/bash-completion/completions
 
     sed -e 's|\<git |${git}/bin/git |g' \
         -e 's|\<basename |${coreutils}/bin/basename |g' \
         -i "$out/bin/gibo"
     sed -e 's|\<find |${findutils}/bin/find |g' \
-        -i "$out/etc/bash_completion.d/gibo-completion.bash"
+        -i "$out/share/bash-completion/completions/gibo-completion.bash"
   '';
 
   meta = {
diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index df0d344afaa9..6df48f0effba 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   COMPLETION_OUT = "out";
   postInstall = ''
-    install -Dm 755 "${COMPLETION_OUT}/${pname}.bash" "$out/etc/bash_completion.d/${pname}"
+    install -Dm 755 "${COMPLETION_OUT}/${pname}.bash" "$out/share/bash-completion/completions/${pname}"
     install -Dm 755 "${COMPLETION_OUT}/${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}"
   '';
 
diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix
index cc5f0c94e119..bd41ae0c593c 100644
--- a/pkgs/tools/security/pass/extensions/import.nix
+++ b/pkgs/tools/security/pass/extensions/import.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
 
   installFlags = [
     "PREFIX=$(out)"
-    "BASHCOMPDIR=$(out)/etc/bash_completion.d"
+    "BASHCOMPDIR=$(out)/share/bash-completion/completions"
   ];
 
   postFixup = ''
diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix
index b2f331f13757..c364c341bda5 100644
--- a/pkgs/tools/security/pass/extensions/update.nix
+++ b/pkgs/tools/security/pass/extensions/update.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace Makefile \
-      --replace "BASHCOMPDIR ?= /etc/bash_completion.d" "BASHCOMPDIR ?= $out/etc/bash_completion.d"
+      --replace "BASHCOMPDIR ?= /etc/bash_completion.d" "BASHCOMPDIR ?= $out/share/bash-completion/completions"
   '';
 
   dontBuild = true;
diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index aff00519a2dc..00f8ed89a2bf 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -83,8 +83,8 @@ in with localPython.pkgs; buildPythonApplication rec {
   ];
 
   postInstall = ''
-    mkdir -p $out/etc/bash_completion.d
-    mv $out/bin/eb_completion.bash $out/etc/bash_completion.d
+    mkdir -p $out/share/bash-completion/completions
+    mv $out/bin/eb_completion.bash $out/share/bash-completion/completions/
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/tools/virtualization/nixos-container/default.nix
index 94a19c5375ea..32a7c1e2c336 100644
--- a/pkgs/tools/virtualization/nixos-container/default.nix
+++ b/pkgs/tools/virtualization/nixos-container/default.nix
@@ -10,7 +10,7 @@ substituteAll {
     inherit utillinux;
 
     postInstall = ''
-      t=$out/etc/bash_completion.d
+      t=$out/share/bash-completion/completions
       mkdir -p $t
       cp ${./nixos-container-completion.sh} $t/nixos-container
     '';
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 123f7484a79a..c0581211150b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -511,10 +511,10 @@ let
     buildInputs = [ DataDump FileWhich Readonly TestDifferences TestTrap ];
     preCheck = "rm t/30cluster.t"; # do not run failing tests
     postInstall = ''
-      mkdir -p $out/etc/bash_completion.d
+      mkdir -p $out/share/bash-completion/completions
       mv $out/bin/clusterssh_bash_completion.dist \
-         $out/etc/bash_completion.d/clusterssh_bash_completion
-      substituteInPlace $out/etc/bash_completion.d/clusterssh_bash_completion \
+         $out/share/bash-completion/completions/clusterssh_bash_completion
+      substituteInPlace $out/share/bash-completion/completions/clusterssh_bash_completion \
          --replace '/bin/true' '${pkgs.coreutils}/bin/true' \
          --replace 'grep' '${pkgs.gnugrep}/bin/grep' \
          --replace 'sed' '${pkgs.gnused}/bin/sed'

From 9a7e4982ddc163fc0cef44deaa6d5a177cb58c67 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 12 Nov 2020 14:14:08 -0600
Subject: [PATCH 2326/3942] klayout: 0.26.6 -> 0.26.8

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/misc/klayout/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix
index 0a8d7ce547f3..60905be3b1b2 100644
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -5,13 +5,13 @@
 
 mkDerivation rec {
   pname = "klayout";
-  version = "0.26.6";
+  version = "0.26.8";
 
   src = fetchFromGitHub {
     owner = "KLayout";
     repo = "klayout";
     rev = "v${version}";
-    sha256 = "0z17pdjdc2r2m5yi5bfz504dzzs978z8p6bhlf08v2npvigp8vz1";
+    sha256 = "0pkhvxcfk70dnmgczyyq585mxrfwqai44ikshs4c1imh92z25llq";
   };
 
   postPatch = ''

From 58a906a7bf05482842cc9688a6a898e59b267de7 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 12 Nov 2020 14:14:08 -0600
Subject: [PATCH 2327/3942] iverilog: unstable-2020-08-24 ->
 unstable-2020-10-24

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/electronics/verilog/default.nix   | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix
index df1ce7b7235f..abe80378024d 100644
--- a/pkgs/applications/science/electronics/verilog/default.nix
+++ b/pkgs/applications/science/electronics/verilog/default.nix
@@ -6,40 +6,35 @@
 
 let
   iverilog-test = fetchFromGitHub {
-    owner = "steveicarus";
-    repo = "ivtest";
-    rev = "6882cb8ec08926c4e356c6092f0c5f8c23328d5c";
-    sha256 = "04sj5nqzwls1y760kgnd9c2whkcrr8kvj9lisd5rvk0w580kjb2x";
+    owner  = "steveicarus";
+    repo   = "ivtest";
+    rev    = "d4c80beb845cad92136c05074b3910b822a9315f";
+    sha256 = "13cpnkki3xmhsh2v4bp2s35mhwknapcikdh85g4q6925ka940r45";
   };
 in
 stdenv.mkDerivation rec {
-  pname = "iverilog";
-  version = "unstable-2020-08-24";
+  pname   = "iverilog";
+  version = "unstable-2020-10-24";
 
   src = fetchFromGitHub {
-    owner = "steveicarus";
-    repo = pname;
-    rev = "d8556e4c86e1465b68bdc8d5ba2056ba95a42dfd";
-    sha256 = "sha256-sT9j/0Q2FD5MOGpH/quMGvAuM7t7QavRHKD9lX7Elfs=";
+    owner  = "steveicarus";
+    repo   = pname;
+    rev    = "d6e01d0c557253414109a4dde46b2966a5a3fb08";
+    sha256 = "1bl75mbycj9zpjbpay8z12384yk9ih5q9agsrjh9pva0vv3h4y4y";
   };
 
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    chmod +x $PWD/autoconf.sh
-    $PWD/autoconf.sh
-  '';
-
   nativeBuildInputs = [ autoconf gperf flex bison ];
-
   buildInputs = [ readline ncurses bzip2 zlib ];
 
-  # tests from .travis.yml
-  doCheck = true; # runs ``make check``
-  # most tests pass, but some that rely on exact text of floating-point numbers fail on aarch64.
+  preConfigure = "bash $PWD/autoconf.sh";
+
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  # most tests pass, but some that rely on exact text of floating-point numbers
+  # fail on aarch64.
   doInstallCheck = !stdenv.isAarch64;
   installCheckInputs = [ perl ];
-
   installCheckPhase = ''
     # copy tests to allow writing results
     export TESTDIR=$(mktemp -d)
@@ -58,9 +53,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Icarus Verilog compiler";
-    homepage = "http://iverilog.icarus.com/";
-    license = with licenses; [ gpl2Plus lgpl21Plus] ;
-    maintainers = with maintainers; [ winden ];
-    platforms = platforms.all;
+    homepage    = "http://iverilog.icarus.com/";
+    license     = with licenses; [ gpl2Plus lgpl21Plus ];
+    maintainers = with maintainers; [ winden thoughtpolice ];
+    platforms   = platforms.all;
   };
 }

From e80eeae690e24302f1a2d74a1c9fae4ff387ffed Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 12 Nov 2020 14:14:08 -0600
Subject: [PATCH 2328/3942] yosys: 2020.10.20 -> 0.9+3675 (new version scheme)

Yosys now has their own official scheme for tagging unstable builds;
an automation robot appears from the darkness once every few hours,
bumps the version number, and disappears as silently as they came.

While Nix packages use a date-based version format for unstable
packages, many (most!) users of Yosys use an unstable version.  And so
synchronizing the version of the Nix package with the repository version
is significantly less confusing to users. This also adds a safeguard to
ensure others don't forget to bump the version number correctly in the
future.

The testsuite also saw an overhaul (now parallel to help build time), so
some tweaks were needed to get it working again.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/yosys/default.nix | 39 ++++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index dcb32690eb5c..f34c4fb7fe1f 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -14,15 +14,32 @@
 , zlib
 }:
 
+# NOTE: as of late 2020, yosys has switched to an automation robot that
+# automatically tags their repository Makefile with a new build number every
+# day when changes are committed. please MAKE SURE that the version number in
+# the 'version' field exactly matches the YOSYS_VER field in the Yosys
+# makefile!
+#
+# if a change in yosys isn't yet available under a build number like this (i.e.
+# it was very recently merged, within an hour), wait a few hours for the
+# automation robot to tag the new version, like so:
+#
+#     https://github.com/YosysHQ/yosys/commit/71ca9a825309635511b64b3ec40e5e5e9b6ad49b
+#
+# note that while most nix packages for "unstable versions" use a date-based
+# version scheme, synchronizing the nix package version here with the unstable
+# yosys version number helps users report better bugs upstream, and is
+# ultimately less confusing than using dates.
+
 stdenv.mkDerivation rec {
   pname   = "yosys";
-  version = "2020.10.20";
+  version = "0.9+3675";
 
   src = fetchFromGitHub {
     owner  = "YosysHQ";
     repo   = "yosys";
-    rev    = "06347b119b08257eff37cdd10ed802e794c1a3cf";
-    sha256 = "07058r8095192gwkiy2yyvj9vxv09fcw9bqi2b39wn85lh5kx2k2";
+    rev    = "71ca9a825309635511b64b3ec40e5e5e9b6ad49b";
+    sha256 = "03jlhfvm5rxx8yybf94nqd3ld2y6brp8r0k6gfi56chv3iqqavy3";
   };
 
   enableParallelBuilding = true;
@@ -55,11 +72,17 @@ stdenv.mkDerivation rec {
     (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto)
 
     if ! grep -q "ABCREV = ${shortAbcRev}" Makefile; then
-      echo "yosys isn't compatible with the provided abc (${shortAbcRev}), failing."
+      echo "ERROR: yosys isn't compatible with the provided abc (${shortAbcRev}), failing."
+      exit 1
+    fi
+
+    if ! grep -q "YOSYS_VER := ${version}" Makefile; then
+      echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing."
       exit 1
     fi
   '';
 
+  checkTarget = "test";
   doCheck = true;
   checkInputs = [ verilog ];
 
@@ -68,10 +91,10 @@ stdenv.mkDerivation rec {
   # they just assume that 'yosys-abc' is available -- but it's not installed
   # when using ABCEXTERNAL
   #
-  # add a symlink to fake things so that both variants work the same way.
-  postInstall = ''
-    ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc
-  '';
+  # add a symlink to fake things so that both variants work the same way. this
+  # is also needed at build time for the test suite.
+  postBuild   = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc";
+  postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc";
 
   meta = with stdenv.lib; {
     description = "Open RTL synthesis framework and tools";

From bf094b11b8486268564e2fa43417e0dd5d168933 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 12 Nov 2020 14:14:08 -0600
Subject: [PATCH 2329/3942] trellis: 2020.07.27 -> 2020.11.07

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/trellis/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix
index 21f14adc2f71..89287b2ac4fa 100644
--- a/pkgs/development/tools/trellis/default.nix
+++ b/pkgs/development/tools/trellis/default.nix
@@ -8,26 +8,26 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "trellis";
-  version = "2020.07.27";
+  version = "2020.11.07";
 
   # git describe --tags
   realVersion = with stdenv.lib; with builtins;
-    "1.0-182-g${substring 0 7 (elemAt srcs 0).rev}";
+    "1.0-469-g${substring 0 7 (elemAt srcs 0).rev}";
 
   srcs = [
     (fetchFromGitHub {
        owner  = "SymbiFlow";
        repo   = "prjtrellis";
-       rev    = "8c0a6382e11b160ed88d17af8493c12a897617ed";
-       sha256 = "1g0ppjfw8dq5cg5kl2p1p87grb0i88apaim4f5b6wj4sfqz8iln8";
+       rev    = "b013a135a9b95c18ece559e19aa73ad6c84446c9";
+       sha256 = "09bx30jm9bgdxmbxf49a27spg4yd1nk5r5mympq7xi28hq1xwjnf";
        name   = "trellis";
      })
 
     (fetchFromGitHub {
       owner  = "SymbiFlow";
       repo   = "prjtrellis-db";
-      rev    = "c137076fdd8bfca3d2bf9cdacda9983dbbec599a";
-      sha256 = "1br0vw8wwcn2qhs8kxkis5xqlr2nw7r3mf1qwjp8xckd6fa1wlcw";
+      rev    = "2cf058e7a3ba36134d21e34823e9b2ecaaceac2c";
+      sha256 = "1hjaw5jkwiaiznm2z0smy88m2cdz63cd51z4nibajfih7ikvkj6g";
       name   = "trellis-database";
     })
   ];

From a22061adef027ce9927bdac6a5f66ec3cbb018a1 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 12 Nov 2020 14:14:08 -0600
Subject: [PATCH 2330/3942] nextpnr: 2020.08.22 -> 2020.11.10

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/nextpnr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index 5dfefa612206..1f5c6a3d4c43 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -14,14 +14,14 @@ let
 in
 with stdenv; mkDerivation rec {
   pname = "nextpnr";
-  version = "2020.08.22";
+  version = "2020.11.10";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "YosysHQ";
       repo   = "nextpnr";
-      rev    = "c8ecb8341ca766e1e7565cc2b652b63eaba67508";
-      sha256 = "1cf9ad7w5x452qdc6m9c3in6v9yzip3n1as978lbdh76f5mc00fv";
+      rev    = "cf331ca2a7fa92d3414fabf003ce6fc7b515f76b";
+      sha256 = "0ka8ncfq3v8v70m3gwb3nd2rb39sy4vz0lx9hi277cbdsprmf55j";
       name   = "nextpnr";
     })
     (fetchFromGitHub {

From c1661fa7e1a08e2558f9a17c48740a224ff04bd5 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 12 Nov 2020 14:14:08 -0600
Subject: [PATCH 2331/3942] magic-vlsi: 8.3.5 -> 8.3.80, co-maintain

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../electronics/magic-vlsi/default.nix        | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix
index 96849c300298..6667f2be9c3d 100644
--- a/pkgs/applications/science/electronics/magic-vlsi/default.nix
+++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, m4, tcsh, libX11, tcl, tk, cairo, ncurses, mesa_glu, python3 }:
+{ stdenv, fetchurl
+, m4, tcsh, libX11, tcl, tk
+, cairo, ncurses, mesa_glu, python3
+}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "magic-vlsi";
-  version = "8.3.5";
+  version = "8.3.80";
 
   src = fetchurl {
-    url = "http://opencircuitdesign.com/magic/archive/magic-8.3.5.tgz";
-    sha256 = "0wv4zmxlqjfaakgp802icn0cd9f8ylkz2sppix83axq8p5cg90yq";
+    url    = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
+    sha256 = "0a5x4sh5xsr79pqbgv6221jc4fvaxkg2pvrdhy1cs4bmsc1sbm9j";
   };
 
   buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ];
   nativeBuildInputs = [ python3 ];
+  enableParallelBuilding = true;
 
   configureFlags = [
     "--with-tcl=${tcl}"
@@ -22,6 +26,8 @@ stdenv.mkDerivation {
     patchShebangs scripts/*
   '';
 
+  NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
+
   patches = [
     ./0001-strip-bin-prefix.patch
     ./0002-fix-format-security.patch
@@ -29,8 +35,8 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "VLSI layout tool written in Tcl";
-    homepage = "http://opencircuitdesign.com/magic/";
-    license = licenses.mit;
-    maintainers = [ maintainers.anna328p ];
+    homepage    = "http://opencircuitdesign.com/magic/";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ anna328p thoughtpolice ];
   };
 }

From fcdefb90c4569ce8c5ded6b0747879416484c6a3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 21:31:01 +0000
Subject: [PATCH 2332/3942] broot: 1.0.4 -> 1.0.5

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

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 077d5dc777c1..b46d6490c4c0 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "06gq7xn9g5wk6d5p732998q7lxbw2g6qb8vsv95jcnybarf88n1v";
+    sha256 = "0b28xdc3dwhr4vb3w19fsrbj2m82zwkg44l4an3r4mi2vgb25nv2";
   };
 
-  cargoSha256 = "1cbvi3jgj78gly3xkqbn8ai0ra5hpdphpdy7cphlrym0aj77ck4a";
+  cargoSha256 = "07gsga5hf4l64kyjadqvmbg5bay7mad9kg2pi4grjxdw6lsxky0f";
 
   nativeBuildInputs = [
     makeWrapper

From 7a9c3739a41fa5cc5e5050a91d1945f3628ba2ce Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 21 Aug 2018 21:11:44 +0000
Subject: [PATCH 2333/3942] LAStools: init at 180812

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

diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix
new file mode 100644
index 000000000000..ef0fd4818f5d
--- /dev/null
+++ b/pkgs/development/libraries/LAStools/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake, fetchurl}:
+stdenv.mkDerivation rec {
+
+  version = "180812";
+  name = "LAStools-${version}";
+
+  src = fetchFromGitHub {
+    owner = "LAStools";
+    repo = "LAStools";
+    rev = "162cf032f25cac492712a8568a08b224a5fb40c2";
+    sha256 = "117c9csbfwsx424ha695l7d99cswi316k8q338mzk1lxlk8p3xbz";
+  };
+
+  nativeBuildInputs = [cmake];
+
+  meta = {
+    description = "Efficient tools for LiDAR processing.";
+    homepage = https://www.laszip.org;
+    license = stdenv.lib.licenses.lgpl2;
+    maintainers = [ stdenv.lib.maintainers.mpickering ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04579795c56a..2fe2de7bad54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13461,6 +13461,8 @@ in
 
   lasso = callPackage ../development/libraries/lasso { };
 
+  LAStools = callPackage ../development/libraries/LAStools { };
+
   LASzip = callPackage ../development/libraries/LASzip { };
   LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { };
 

From 7ab97fdc443c20326b70b99a9a7eae49c27a58c1 Mon Sep 17 00:00:00 2001
From: StephenWithPH <StephenWithPH@users.noreply.github.com>
Date: Mon, 9 Nov 2020 16:59:03 -0800
Subject: [PATCH 2334/3942] LAStools: 180812 -> 201003

---
 .../libraries/LAStools/default.nix            | 36 ++++++++++++-------
 .../libraries/LAStools/drop-64-suffix.patch   | 13 +++++++
 2 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/libraries/LAStools/drop-64-suffix.patch

diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix
index ef0fd4818f5d..c231361acb55 100644
--- a/pkgs/development/libraries/LAStools/default.nix
+++ b/pkgs/development/libraries/LAStools/default.nix
@@ -1,23 +1,33 @@
-{ stdenv, fetchFromGitHub, cmake, fetchurl}:
-stdenv.mkDerivation rec {
+{ stdenv, fetchFromGitHub, cmake }:
 
-  version = "180812";
-  name = "LAStools-${version}";
+stdenv.mkDerivation rec {
+  pname = "LAStools";
+  version = "201003"; # LAStools makes release-ish commits with a message containing their version number as YYMMDD; these align with their website changelog
 
   src = fetchFromGitHub {
     owner = "LAStools";
     repo = "LAStools";
-    rev = "162cf032f25cac492712a8568a08b224a5fb40c2";
-    sha256 = "117c9csbfwsx424ha695l7d99cswi316k8q338mzk1lxlk8p3xbz";
+    rev = "635b76b42cc4912762da31b92f875df5310e1714";
+    sha256 = "0682ca3bp51lmfp46vsjnd1bqpn05g95pf4kclvjv1y8qivkxsaq";
   };
 
-  nativeBuildInputs = [cmake];
+  patches = [
+    ./drop-64-suffix.patch # necessary to prevent '64' from being appended to the names of the executables
+  ];
 
-  meta = {
-    description = "Efficient tools for LiDAR processing.";
-    homepage = https://www.laszip.org;
-    license = stdenv.lib.licenses.lgpl2;
-    maintainers = [ stdenv.lib.maintainers.mpickering ];
-    platforms = stdenv.lib.platforms.unix;
+  hardeningDisable = [
+    "format"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Software for rapid LiDAR processing";
+    homepage = http://lastools.org/;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ stephenwithph ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/LAStools/drop-64-suffix.patch b/pkgs/development/libraries/LAStools/drop-64-suffix.patch
new file mode 100644
index 000000000000..2090baeb3b2b
--- /dev/null
+++ b/pkgs/development/libraries/LAStools/drop-64-suffix.patch
@@ -0,0 +1,13 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -32,6 +32,6 @@ endforeach(TARGET)
+ foreach(TARGET ${ALL_TARGETS})
+ 	target_link_libraries(${TARGET} LASlib)
+ 	set_target_properties(${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin64)
+-	set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET}64)
++	set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET})
+ 	install(TARGETS ${TARGET} RUNTIME DESTINATION bin)
+ endforeach(TARGET)
+-- 
+2.28.0
+

From 9f5cba0aaabc176bde6daf2b0079bc870f009615 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@gmail.com>
Date: Mon, 9 Nov 2020 18:33:43 -0500
Subject: [PATCH 2335/3942] wine: add MinGW-w64 support

---
 pkgs/misc/emulators/wine/base.nix     | 12 +++++++++---
 pkgs/misc/emulators/wine/default.nix  |  3 ++-
 pkgs/misc/emulators/wine/packages.nix |  5 ++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 025158b07173..9b228fba095d 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, pkgArches, callPackage,
-  name, version, src, monos, geckos, platforms,
+  name, version, src, mingwGccs, monos, geckos, platforms,
   pkgconfig, fontforge, makeWrapper, flex, bison,
   supportFlags,
   buildScript ? null, configureFlags ? []
@@ -15,9 +15,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
 }) // rec {
   inherit name src configureFlags;
 
+  # Fixes "Compiler cannot create executables" building wineWow with mingwSupport
+  strictDeps = true;
+
   nativeBuildInputs = [
     pkgconfig fontforge makeWrapper flex bison
-  ];
+  ]
+  ++ lib.optionals supportFlags.mingwSupport mingwGccs;
 
   buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs:
   [ pkgs.freetype ]
@@ -92,6 +96,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
   # drive_c/windows/system32 will only contain a few files instead of
   # hundreds, there will be an error about winemenubuilder and MountMgr
   # on startup of Wine, and the Drives tab in winecfg will show an error.
+  # TODO: binutils 2.34 contains a fix for this bug, re-enable stripping once available.
   dontStrip = true;
 
   ## FIXME
@@ -136,7 +141,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
   # https://bugs.winehq.org/show_bug.cgi?id=43530
   # https://github.com/NixOS/nixpkgs/issues/31989
   hardeningDisable = [ "bindnow" ]
-    ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify";
+    ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify"
+    ++ lib.optional (supportFlags.mingwSupport) "format";
 
   passthru = { inherit pkgArches; };
   meta = {
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 368e2845ca40..24f827b25ffe 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -44,6 +44,7 @@
   sdlSupport ? false,
   faudioSupport ? false,
   vkd3dSupport ? false,
+  mingwSupport ? false,
 }:
 
 let wine-build = build: release:
@@ -56,7 +57,7 @@ let wine-build = build: release:
                   gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
                   pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
                   openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport
-                  vkd3dSupport;
+                  vkd3dSupport mingwSupport;
         };
       });
 
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index 3ea60e62c665..31d21058e3aa 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -1,4 +1,4 @@
-{ stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage,
+{ stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage,
   wineRelease ? "stable",
   supportFlags
 }:
@@ -10,6 +10,7 @@ in with src; {
     inherit src version supportFlags;
     pkgArches = [ pkgsi686Linux ];
     geckos = [ gecko32 ];
+    mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
     monos =  [ mono ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
@@ -17,6 +18,7 @@ in with src; {
     name = "wine64-${version}";
     inherit src version supportFlags;
     pkgArches = [ pkgs ];
+    mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
     geckos = [ gecko64 ];
     monos =  [ mono ];
     configureFlags = [ "--enable-win64" ];
@@ -28,6 +30,7 @@ in with src; {
     stdenv = stdenv_32bit;
     pkgArches = [ pkgs pkgsi686Linux ];
     geckos = [ gecko32 gecko64 ];
+    mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ];
     monos =  [ mono ];
     buildScript = ./builder-wow.sh;
     platforms = [ "x86_64-linux" ];

From b1680e3f7193e486782c03d1ced53d8daef047ef Mon Sep 17 00:00:00 2001
From: David Birks <david@birks.dev>
Date: Thu, 12 Nov 2020 18:13:46 -0500
Subject: [PATCH 2336/3942] gnomeExtensions.material-shell: 9 -> 10 (#103628)

---
 pkgs/desktops/gnome-3/extensions/material-shell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/pkgs/desktops/gnome-3/extensions/material-shell/default.nix
index 7b5156997b25..1b8341a281f8 100644
--- a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/material-shell/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-material-shell";
-  version = "9";
+  version = "10";
 
   src = fetchFromGitHub {
     owner = "material-shell";
     repo = "material-shell";
     rev = version;
-    sha256 = "154ids72hkkvibqpq3522wf6h9qw7zkjnf8dgz50vxbkiiy015xn";
+    sha256 = "18d813n8s7ns8xp75zmlna7a8mi23rn9yqps51xvdd0sdgn72a1c";
   };
 
   # This package has a Makefile, but it's used for building a zip for

From 2deeb58f49480f468adca6b08291322de4dbce6b Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 12 Nov 2020 23:50:31 +0000
Subject: [PATCH 2337/3942] soundtouch: 2.1.2 -> 2.2 (#103382)

---
 pkgs/development/libraries/soundtouch/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix
index 71c7915c2ede..b29095f7e199 100644
--- a/pkgs/development/libraries/soundtouch/default.nix
+++ b/pkgs/development/libraries/soundtouch/default.nix
@@ -2,23 +2,26 @@
 
 stdenv.mkDerivation rec {
   pname = "soundtouch";
-  version = "2.1.2";
+  version = "2.2";
 
   src = fetchFromGitLab {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "174wgm3s0inmbnkrlnspxjwm2014qhjhkbdqa5r8rbfi0nzqxzsz";
+    sha256 = "12i6yg8vvqwyk412lxl2krbfby6hnxld8qxy0k4m5xp4g94jiq4p";
   };
 
   nativeBuildInputs = [ autoconf automake libtool ];
 
   preConfigure = "./bootstrap";
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     description = "A program and library for changing the tempo, pitch and playback rate of audio";
-    homepage = "http://www.surina.net/soundtouch/";
-    license = licenses.lgpl21;
+    homepage = "https://www.surina.net/soundtouch/";
+    license = licenses.lgpl21Plus;
     platforms = platforms.all;
+    maintainers = with maintainers; [ orivej ];
   };
 }

From 1692a8a584c6fd1f3755eeaff897d0c4916cbcd7 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 13 Nov 2020 08:58:37 +1000
Subject: [PATCH 2338/3942] go_1_14: 1.14.11 -> 1.14.12

---
 pkgs/development/compilers/go/1.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix
index 67f9184d8d9b..8b1dda5ebc86 100644
--- a/pkgs/development/compilers/go/1.14.nix
+++ b/pkgs/development/compilers/go/1.14.nix
@@ -36,11 +36,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.14.11";
+  version = "1.14.12";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "05hgnyda5bpm29gnx1956syq54jmpk4k9cf976vypw8ckg9g6w8q";
+    sha256 = "0wdr85l3rr6w50dmlbsib895gs9cc19z5piblp0v9slrsxx4nkxk";
   };
 
   # perl is used for testing go vet

From a25913605b4bdc6dc224b60e9c9297d6af2b796b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 13 Nov 2020 08:58:38 +1000
Subject: [PATCH 2339/3942] go_1_15: 1.15.4 -> 1.15.5

---
 pkgs/development/compilers/go/1.15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix
index 61531fb62b15..5dd55dee95a2 100644
--- a/pkgs/development/compilers/go/1.15.nix
+++ b/pkgs/development/compilers/go/1.15.nix
@@ -36,11 +36,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.15.4";
+  version = "1.15.5";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "0rr3gp99bmdzg381x5fdwa15brllihn57175l0c82sqqljlscg86";
+    sha256 = "1wc43h3pmi92r6ypmh58vq13vm44rl1di09assz3xdwlry86n1y1";
   };
 
   # perl is used for testing go vet

From b3eb8130fe1bc29211879b2658fb69b35416bb24 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Thu, 12 Nov 2020 21:11:18 -0500
Subject: [PATCH 2340/3942] pdsh: enable optional slurm support

---
 pkgs/tools/networking/pdsh/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index 9dd1a5581c55..3f00964bfd35 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, readline, rsh, ssh }:
+{ stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }:
 
 stdenv.mkDerivation rec {
   name = "pdsh-2.34";
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1s91hmhrz7rfb6h3l5k97s393rcm1ww3svp8dx5z8vkkc933wyxl";
   };
 
-  buildInputs = [ perl readline ssh ];
+  buildInputs = [ perl readline ssh ]
+    ++ (stdenv.lib.optional slurmSupport slurm);
 
   preConfigure = ''
     configureFlagsArray=(
@@ -18,6 +19,7 @@ stdenv.mkDerivation rec {
       ${if readline == null then "--without-readline" else "--with-readline"}
       ${if ssh == null then "--without-ssh" else "--with-ssh"}
       ${if rsh == false then "--without-rsh" else "--with-rsh"}
+      ${if slurmSupport then "--with-slurm" else "--without-slurm"}
       "--with-dshgroups"
       "--with-xcpu"
       "--disable-debug"

From e86b050938a1fb83faa1638f4e1b0dbd2d96dff4 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Fri, 13 Nov 2020 10:16:55 +0800
Subject: [PATCH 2341/3942] go-ethereum: 1.9.23 -> 1.9.24

---
 pkgs/applications/blockchains/go-ethereum.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index 8e9321950676..b0f464cbfdc8 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "go-ethereum";
-  version = "1.9.23";
+  version = "1.9.24";
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0w65sln5l3sxwzxwjvyaial0m1kxhivhw8xwl5faxxxlk50rs4wm";
+    sha256 = "0nrx5fwfij9wajd3lj76hh1yv4zg4q3jc76a76m22djn1njl0n5j";
   };
 
   runVend = true;

From 0ace9e28fe45369aa81a606241ec38effc001a7a Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Fri, 13 Nov 2020 02:35:13 +0000
Subject: [PATCH 2342/3942] b3sum: 0.3.4 -> 0.3.7

---
 ...{add-cargo-lock.patch => cargo-lock.patch} | 166 ++++++++++--------
 pkgs/tools/security/b3sum/default.nix         |  10 +-
 .../tools/security/b3sum/update-cargo-lock.sh |  19 ++
 3 files changed, 113 insertions(+), 82 deletions(-)
 rename pkgs/tools/security/b3sum/{add-cargo-lock.patch => cargo-lock.patch} (77%)
 create mode 100755 pkgs/tools/security/b3sum/update-cargo-lock.sh

diff --git a/pkgs/tools/security/b3sum/add-cargo-lock.patch b/pkgs/tools/security/b3sum/cargo-lock.patch
similarity index 77%
rename from pkgs/tools/security/b3sum/add-cargo-lock.patch
rename to pkgs/tools/security/b3sum/cargo-lock.patch
index ecbb2b0bab9c..1f8494089477 100644
--- a/pkgs/tools/security/b3sum/add-cargo-lock.patch
+++ b/pkgs/tools/security/b3sum/cargo-lock.patch
@@ -1,9 +1,9 @@
-diff --git a/b3sum/Cargo.lock b/b3sum/Cargo.lock
+diff --git a/Cargo.lock b/Cargo.lock
 new file mode 100644
-index 0000000..1ce7abc
+index 0000000..1dff162
 --- /dev/null
 +++ b/Cargo.lock
-@@ -0,0 +1,495 @@
+@@ -0,0 +1,507 @@
 +# This file is automatically @generated by Cargo.
 +# It is not intended for manual editing.
 +[[package]]
@@ -17,9 +17,9 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "anyhow"
-+version = "1.0.31"
++version = "1.0.34"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f"
++checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
 +
 +[[package]]
 +name = "arrayref"
@@ -29,9 +29,9 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "arrayvec"
-+version = "0.5.1"
++version = "0.5.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 +
 +[[package]]
 +name = "atty"
@@ -46,13 +46,13 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "autocfg"
-+version = "1.0.0"
++version = "1.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 +
 +[[package]]
 +name = "b3sum"
-+version = "0.3.4"
++version = "0.3.7"
 +dependencies = [
 + "anyhow",
 + "blake3",
@@ -73,12 +73,12 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "blake3"
-+version = "0.3.4"
++version = "0.3.7"
 +dependencies = [
 + "arrayref",
 + "arrayvec",
 + "cc",
-+ "cfg-if",
++ "cfg-if 0.1.10",
 + "constant_time_eq",
 + "crypto-mac",
 + "digest",
@@ -87,9 +87,9 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "cc"
-+version = "1.0.57"
++version = "1.0.62"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe"
++checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
 +
 +[[package]]
 +name = "cfg-if"
@@ -98,10 +98,16 @@ index 0000000..1ce7abc
 +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 +
 +[[package]]
-+name = "clap"
-+version = "2.33.1"
++name = "cfg-if"
++version = "1.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
++name = "clap"
++version = "2.33.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 +dependencies = [
 + "ansi_term",
 + "atty",
@@ -113,64 +119,69 @@ index 0000000..1ce7abc
 +]
 +
 +[[package]]
++name = "const_fn"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
++
++[[package]]
 +name = "constant_time_eq"
 +version = "0.1.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 +
 +[[package]]
-+name = "crossbeam-deque"
-+version = "0.7.3"
++name = "crossbeam-channel"
++version = "0.5.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
++checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
 +dependencies = [
++ "cfg-if 1.0.0",
++ "crossbeam-utils",
++]
++
++[[package]]
++name = "crossbeam-deque"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
++dependencies = [
++ "cfg-if 1.0.0",
 + "crossbeam-epoch",
 + "crossbeam-utils",
-+ "maybe-uninit",
 +]
 +
 +[[package]]
 +name = "crossbeam-epoch"
-+version = "0.8.2"
++version = "0.9.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
++checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
 +dependencies = [
-+ "autocfg",
-+ "cfg-if",
++ "cfg-if 1.0.0",
++ "const_fn",
 + "crossbeam-utils",
 + "lazy_static",
-+ "maybe-uninit",
 + "memoffset",
 + "scopeguard",
 +]
 +
 +[[package]]
-+name = "crossbeam-queue"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
-+dependencies = [
-+ "cfg-if",
-+ "crossbeam-utils",
-+ "maybe-uninit",
-+]
-+
-+[[package]]
 +name = "crossbeam-utils"
-+version = "0.7.2"
++version = "0.8.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
++checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
 +dependencies = [
 + "autocfg",
-+ "cfg-if",
++ "cfg-if 1.0.0",
++ "const_fn",
 + "lazy_static",
 +]
 +
 +[[package]]
 +name = "crypto-mac"
-+version = "0.7.0"
++version = "0.8.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
++checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 +dependencies = [
 + "generic-array",
 + "subtle",
@@ -178,9 +189,9 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "digest"
-+version = "0.8.1"
++version = "0.9.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
++checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 +dependencies = [
 + "generic-array",
 +]
@@ -199,26 +210,27 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "either"
-+version = "1.5.3"
++version = "1.6.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 +
 +[[package]]
 +name = "generic-array"
-+version = "0.12.3"
++version = "0.14.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
++checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
 +dependencies = [
 + "typenum",
++ "version_check",
 +]
 +
 +[[package]]
 +name = "getrandom"
-+version = "0.1.14"
++version = "0.1.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
++checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
 +dependencies = [
-+ "cfg-if",
++ "cfg-if 0.1.10",
 + "libc",
 + "wasi",
 +]
@@ -231,9 +243,9 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "hermit-abi"
-+version = "0.1.15"
++version = "0.1.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
++checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
 +dependencies = [
 + "libc",
 +]
@@ -252,15 +264,9 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "libc"
-+version = "0.2.71"
++version = "0.2.80"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
-+
-+[[package]]
-+name = "maybe-uninit"
-+version = "2.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
++checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
 +
 +[[package]]
 +name = "memmap"
@@ -274,9 +280,9 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "memoffset"
-+version = "0.5.5"
++version = "0.5.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
++checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
 +dependencies = [
 + "autocfg",
 +]
@@ -293,9 +299,9 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "once_cell"
-+version = "1.4.0"
++version = "1.5.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
++checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
 +
 +[[package]]
 +name = "os_pipe"
@@ -309,9 +315,9 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "ppv-lite86"
-+version = "0.2.8"
++version = "0.2.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 +
 +[[package]]
 +name = "rand"
@@ -356,9 +362,9 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "rayon"
-+version = "1.3.1"
++version = "1.5.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
++checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
 +dependencies = [
 + "autocfg",
 + "crossbeam-deque",
@@ -368,12 +374,12 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "rayon-core"
-+version = "1.7.1"
++version = "1.9.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
++checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
 +dependencies = [
++ "crossbeam-channel",
 + "crossbeam-deque",
-+ "crossbeam-queue",
 + "crossbeam-utils",
 + "lazy_static",
 + "num_cpus",
@@ -381,9 +387,9 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "redox_syscall"
-+version = "0.1.56"
++version = "0.1.57"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 +
 +[[package]]
 +name = "remove_dir_all"
@@ -418,9 +424,9 @@ index 0000000..1ce7abc
 +
 +[[package]]
 +name = "subtle"
-+version = "1.0.0"
++version = "2.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
++checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
 +
 +[[package]]
 +name = "tempfile"
@@ -428,7 +434,7 @@ index 0000000..1ce7abc
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 +dependencies = [
-+ "cfg-if",
++ "cfg-if 0.1.10",
 + "libc",
 + "rand",
 + "redox_syscall",
@@ -464,6 +470,12 @@ index 0000000..1ce7abc
 +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 +
 +[[package]]
++name = "version_check"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
++
++[[package]]
 +name = "wasi"
 +version = "0.9.0+wasi-snapshot-preview1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix
index dd6a538d11d0..d36dfc8e18cb 100644
--- a/pkgs/tools/security/b3sum/default.nix
+++ b/pkgs/tools/security/b3sum/default.nix
@@ -2,25 +2,25 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "b3sum";
-  version = "0.3.4";
+  version = "0.3.7";
 
   src = fetchFromGitHub {
     owner = "BLAKE3-team";
     repo = "BLAKE3";
     rev = version;
-    sha256 = "02yyv91wvy5w7i05z6f3kzxm5x34a4xgkgmcqxnb0ivsxnnld73h";
+    sha256 = "0r3nj7jbrpb2gkkfa9h6nv6blrbv6dlrhxg131qnh340q1ysh0x7";
   };
 
   sourceRoot = "source/b3sum";
 
-  cargoSha256 = "0ycn5788dc925wx28sgfs121w4x7yggm4mnmwij829ka8859bymk";
+  cargoSha256 = "0n8hp83hw7g260vmf4qcicpca75faam7k0zmb0k4cdzsar96gdrr";
 
-  cargoPatches = [ ./add-cargo-lock.patch ];
+  cargoPatches = [ ./cargo-lock.patch ];
 
   meta = {
     description = "BLAKE3 cryptographic hash function";
     homepage = "https://github.com/BLAKE3-team/BLAKE3/";
-    maintainers = with lib.maintainers; [ fpletz ];
+    maintainers = with lib.maintainers; [ fpletz ivan ];
     license = with lib.licenses; [ cc0 asl20 ];
   };
 }
diff --git a/pkgs/tools/security/b3sum/update-cargo-lock.sh b/pkgs/tools/security/b3sum/update-cargo-lock.sh
new file mode 100755
index 000000000000..8c52ad5cf6c0
--- /dev/null
+++ b/pkgs/tools/security/b3sum/update-cargo-lock.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# This updates cargo-lock.patch for the b3sum version listed in default.nix.
+
+set -eu -o verbose
+
+here=$PWD
+version=$(cat default.nix | grep '^  version = "' | cut -d '"' -f 2)
+checkout=$(mktemp -d)
+git clone -b "$version" --depth=1 https://github.com/BLAKE3-team/BLAKE3 "$checkout"
+cd "$checkout"
+
+(cd b3sum && cargo generate-lockfile)
+mv b3sum/Cargo.lock ./
+git add -f Cargo.lock
+git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
+
+cd "$here"
+rm -rf "$checkout"

From 91b3ce2953e006ea7aa9f906f6b1aaf658503365 Mon Sep 17 00:00:00 2001
From: sveitser <sveitser@gmail.com>
Date: Fri, 13 Nov 2020 11:54:34 +0800
Subject: [PATCH 2343/3942] nix-prefetch-github: 4.0.1 -> 4.0.2

---
 .../python-modules/nix-prefetch-github/default.nix         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix
index 152ceddb91fd..d7f203aa4d8d 100644
--- a/pkgs/development/python-modules/nix-prefetch-github/default.nix
+++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix
@@ -8,18 +8,17 @@
 , jinja2
 , git
 , pytestCheckHook
-, pytest-black
 , pytestcov
 , pytest-isort
 }:
 
 buildPythonPackage rec {
   pname = "nix-prefetch-github";
-  version = "4.0.1";
+  version = "4.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "asfRohjOgYxMV/wprKvxUD328GVJQkAYnuAkE09kKgs=";
+    sha256 = "ZdaWIkpJk8AvTZmA76VMTXeOUTrWLe+W3vh/e0zwWB4=";
   };
 
   propagatedBuildInputs = [
@@ -29,7 +28,7 @@ buildPythonPackage rec {
     jinja2
   ];
 
-  checkInputs = [ pytestCheckHook pytest-black pytestcov pytest-isort git ];
+  checkInputs = [ pytestCheckHook pytestcov pytest-isort git ];
   checkPhase = ''
     pytest -m 'not network'
   '';

From 4bdd40df0402c3a609e2dc3de318e21f051e3279 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Nov 2020 04:20:00 +0000
Subject: [PATCH 2344/3942] awsweeper: 0.7.0 -> 0.10.2

---
 pkgs/tools/admin/awsweeper/default.nix | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix
index 2417854fcad9..f148bd088f4b 100644
--- a/pkgs/tools/admin/awsweeper/default.nix
+++ b/pkgs/tools/admin/awsweeper/default.nix
@@ -1,29 +1,25 @@
-{ lib, buildGoModule, fetchurl, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "awsweeper";
-  version = "0.7.0";
-
-  # Requires go generate to be run with mockgen, but doesn't check in the results.
-  patches = fetchurl {
-    url = "https://raw.githubusercontent.com/c00w/patches/master/awskeeper.patch";
-    sha256 = "0dz553ffxc37m2iwygrbhxf7pm91hxdriic8a1gjf8q3nyn13npl";
-  };
+  version = "0.10.2";
 
   src = fetchFromGitHub {
-    owner = "cloudetc";
+    owner = "jckuester";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28";
+    sha256 = "1ln4s04n1qd1wv88ahhvvvphlxf6c9krqz9lmbcx3n67sb8xngm5";
   };
 
-  vendorSha256 = "0hnpb1xp135z2qpn1b6xad59739hffhs8dfpr3n5drmrvajpn4xp";
+  vendorSha256 = "0zlhb84fmrnwq71d0h83p28aqlfclcydndl0z2j9nx2skjlxax2i";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X github.com/jckuester/awsweeper/internal.version=${version} -X github.com/jckuester/awsweeper/internal.commit=${src.rev} -X github.com/jckuester/awsweeper/internal.date=unknown" ];
 
   doCheck = false;
 
   meta = with lib; {
     description = "A tool to clean out your AWS account";
-    homepage = "https://github.com/cloudetc/awsweeper/";
+    homepage = "https://github.com/jckuester/awsweeper";
     license = licenses.mpl20;
     maintainers = [ maintainers.marsam ];
   };

From dce3b4517fbe502eb04a56d7eea073f08778841d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Nov 2020 04:20:00 +0000
Subject: [PATCH 2345/3942] wal-g: 0.2.17 -> 0.2.18

---
 pkgs/tools/backup/wal-g/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix
index 85a6b169f745..278ee3ad25ed 100644
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/pkgs/tools/backup/wal-g/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "wal-g";
-  version = "0.2.17";
+  version = "0.2.18";
 
   src = fetchFromGitHub {
     owner = "wal-g";
     repo = "wal-g";
     rev = "v${version}";
-    sha256 = "0r6vy2b3xqwa22286srwngk63sq4aza6aj7brwc130vypcps7svp";
+    sha256 = "1clsh42sgfrzyg3vr215wrpi93cb8y8ky3cb1v2l6cs4psh3py1q";
   };
 
-  vendorSha256 = "0r73l4kxzldca1vg5mshq6iqsxcrndcbmbp3d7i9pxyb2kig8gv5";
+  vendorSha256 = "1ax8niw4zfwvh5ikxnkbsjc9fdz1lziqlwig9nwrhzfp45ysbakh";
 
   buildInputs = [ brotli ];
 

From 6b4ef62e113e644e5c2cd2be393619accf372b29 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 04:51:14 +0000
Subject: [PATCH 2346/3942] eksctl: 0.30.0 -> 0.31.0

---
 pkgs/tools/admin/eksctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 271034fa889c..6de26c81e623 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.30.0";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    sha256 = "0kg966czixkmaaznl7xm751jpx4252nkm99vaigg1iwhlx2yczh9";
+    sha256 = "08vdcbgi0s9rm8rh025yifacqma2c0dxf6jdfnacrz1gj2s7s4rd";
   };
 
   vendorSha256 = "1lhs1h0x3ryq0bd5w9ny7i2j9d0x2904br1vlxy677w2xsa9213p";

From c05095f0af0061b637b9b18b276bc3ed023b6680 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 05:25:05 +0000
Subject: [PATCH 2347/3942] exodus: 20.10.23 -> 20.11.10

---
 pkgs/applications/blockchains/exodus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix
index c48cd7bb49c7..5630cb20d4de 100644
--- a/pkgs/applications/blockchains/exodus/default.nix
+++ b/pkgs/applications/blockchains/exodus/default.nix
@@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }:
 
 stdenv.mkDerivation rec {
   pname = "exodus";
-  version = "20.10.23";
+  version = "20.11.10";
 
   src = fetchurl {
     url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
-    sha256 = "083hcxljqg36ilpy6xa4j455ngpc775qgam0dbj26kg7sh33dz2c";
+    sha256 = "1a7qrh5mdkqpz5cpk5jdq0s2cfrvn7ja76r5cmhs70ba1xnzd8rq";
   };
 
   sourceRoot = ".";

From e4ac103c7df82ac2cda0aad42125fb923c82c739 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 06:08:30 +0000
Subject: [PATCH 2348/3942] dar: 2.6.12 -> 2.6.13

---
 pkgs/tools/backup/dar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index 8689bc9cd86f..593e9b34da9f 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -8,12 +8,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.6.12";
+  version = "2.6.13";
   pname = "dar";
 
   src = fetchurl {
     url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
-    sha256 = "0jwgaim2p93skdpjwiz5qgibd3j9965ycqn47wrrjlcvzk93mvyk";
+    sha256 = "15yhpzyzw7h7d74xxh104cnbh19639yxx0502xz85fazwpwrzsiz";
   };
 
   outputs = [ "out" "dev" ];

From 027bcf83c759f4a1f27eaec0ea638246605ccb8f Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Thu, 12 Nov 2020 23:17:47 -0800
Subject: [PATCH 2349/3942] tailscale: 1.2.1 -> 1.2.6

Signed-off-by: David Anderson <dave@natulte.net>
---
 pkgs/servers/tailscale/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index 4c36d865da96..353ac4d5d882 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "tailscale";
-  version = "1.2.1";
-  tagHash = "614f6730fe7f46bc6e2128b9efd33bee92f3ff93"; # from `git rev-parse v1.2.1`
+  version = "1.2.6";
+  tagHash = "0423683af6500dacbbc0194cb97eedaa312a34f2"; # from `git rev-parse v1.2.6`
 
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tailscale";
     rev = "v${version}";
-    sha256 = "1xkzh9b67fgp7flfvjja6328254j8gmlzmpnmb69klj3km5v6qmy";
+    sha256 = "0p2ygv2vwpjq6yhhaxis8j9gxkv0qcx0byxlf0vbmy9xqb03cs87";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a226183b32f03b5659d9dc77b5f1a7b2e0a138bc Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 26 Oct 2018 22:55:03 +0200
Subject: [PATCH 2350/3942] hetzner-kube: support for bash completion

---
 .../networking/cluster/hetzner-kube/default.nix     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
index 7409d71fe8ff..d0afe6d2e436 100644
--- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix
+++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "hetzner-kube";
@@ -20,6 +20,17 @@ buildGoModule rec {
     -X github.com/xetys/hetzner-kube/cmd.version=${version}
   '';
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  postInstall = ''
+    $out/bin/hetzner-kube completion bash > hetzner-kube
+    $out/bin/hetzner-kube completion zsh > _hetzner-kube
+    installShellCompletion --zsh _hetzner-kube
+    installShellCompletion --bash hetzner-kube
+  '';
+
   meta = {
     description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud";
     homepage = "https://github.com/xetys/hetzner-kube";

From d2a55a7fc53e60c6268b73ada88804083f9dbaaf Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 13 Nov 2020 10:02:17 +0200
Subject: [PATCH 2351/3942] gnomeExtensions.gsconnect: 43 -> 44

---
 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index 5e51b995a54b..3d969f5c0bfd 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-gsconnect";
-  version = "43";
+  version = "44";
 
   outputs = [ "out" "installedTests" ];
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "andyholmes";
     repo = "gnome-shell-extension-gsconnect";
     rev = "v${version}";
-    sha256 = "0hm14hg4nhv9hrmjcf9dgm7dsvzpjfifihjmb6yc78y9yjw0i3v7";
+    sha256 = "C+8mhK4UOs2iZplDyY45bCX0mMGgwVV/ZfaPpYUlWxA=";
   };
 
   patches = [

From 897ce96ba7569df678419a00289b7618e6fc4248 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Fri, 13 Nov 2020 09:23:42 +0100
Subject: [PATCH 2352/3942] kustomize: 3.8.1 -> 3.8.7

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/development/tools/kustomize/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index 63a3c7746688..79c484586111 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -2,9 +2,9 @@
 
 buildGoModule rec {
   pname = "kustomize";
-  version = "3.8.1";
-  # rev is the 3.8.1 commit, mainly for kustomize version command output
-  rev = "6a50372dd5686df22750b0c729adaf369fbf193c";
+  version = "3.8.7";
+  # rev is the 3.8.7 commit, mainly for kustomize version command output
+  rev = "ad092cc7a91c07fdf63a2e4b7f13fa588a39af4f";
 
   buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in
     ''
@@ -17,13 +17,13 @@ buildGoModule rec {
     owner = "kubernetes-sigs";
     repo = pname;
     rev = "kustomize/v${version}";
-    sha256 = "07zdp6xv8viwnaz1qacwhg82dlzcrgb8dls6yz9qk4qcnsk6badx";
+    sha256 = "1942cyaj6knf8mc3q2vcz6rqqc6lxdd6nikry9m0idk5l1b09x1m";
   };
 
   # avoid finding test and development commands
   sourceRoot = "source/kustomize";
 
-  vendorSha256 = "01ff3w4hwp4ynqhg8cplv0i2ixs811d2x2j6xbh1lslyyh3z3wc5";
+  vendorSha256 = "0y77ykfcbn4l0x85c3hb1lgjpy64kimx3s1qkn38gpmi4lphvkkl";
 
   meta = with lib; {
     description = "Customization of kubernetes YAML configurations";

From 91852f17ef6ad9c882c39675ad5b30b6b2e3194b Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Fri, 13 Nov 2020 09:24:48 +0100
Subject: [PATCH 2353/3942] elvis: update meta.homepage

---
 pkgs/applications/editors/elvis/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix
index 3a6c8c97b221..df8f255de5e0 100644
--- a/pkgs/applications/editors/elvis/default.nix
+++ b/pkgs/applications/editors/elvis/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
   configureFlags = [ "--ioctl=termios" ];
 
   meta = {
-    homepage = "http://elvis.vi-editor.org/";
+    homepage = "http://elvis.the-little-red-haired-girl.org/";
     description = "A vi clone for Unix and other operating systems";
     license = stdenv.lib.licenses.free;
   };

From be0555b8a84b6c3813e58492f232a3714b891424 Mon Sep 17 00:00:00 2001
From: Max Bruckner <max@maxbruckner.de>
Date: Fri, 13 Dec 2019 20:42:42 +0100
Subject: [PATCH 2354/3942] nixos/doc: Add note about /usr/sbin and /sbin

An installation from Debian buster may fail without adding /usr/sbin to
$PATH because chroot is not in the PATH of a non-root user.
---
 .../manual/installation/installing-from-other-distro.xml   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index 8ed45899fd7f..2947f9d5a0b9 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -161,6 +161,13 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
      existing systems without the help of a rescue USB drive or similar.
     </para>
    </warning>
+   <note>
+    <para>
+     On some distributions there are separate PATHS for programs intended only for root.
+     In order for the installation to succeed, you might have to use <literal>PATH="$PATH:/usr/sbin:/sbin"</literal>
+     in the following command.
+    </para>
+   </note>
 <screen><prompt>$ </prompt>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

From e5d4ce724a45dfd85c2d01efc2cce736e38fe879 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 08:36:54 +0000
Subject: [PATCH 2355/3942] discord-canary: 0.0.114 -> 0.0.115

---
 .../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 8672f64be386..bb37380a6822 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -27,10 +27,10 @@ in {
     pname = "discord-canary";
     binaryName = "DiscordCanary";
     desktopName = "Discord Canary";
-    version = "0.0.114";
+    version = "0.0.115";
     src = fetchurl {
       url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-      sha256 = "0j3w4jf4jisrpz03462sqjsrvjw50kqqq3psyympw0jb1wjccc41";
+      sha256 = "0w9i3plbiiy2kp4yahsdvz0f4wpszsgqdnlgzbnx7wj0xk4qrkcx";
     };
   };
 }.${branch}

From 29c95b2e814f9fc019bce3cea5760086b9425b8b Mon Sep 17 00:00:00 2001
From: Gauvain 'GovanifY' Roussel-Tarbouriech <gauvain@govanify.com>
Date: Fri, 13 Nov 2020 08:26:56 +0100
Subject: [PATCH 2356/3942] maintainers: add govanify

---
 maintainers/maintainer-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2838f60ad003..f672bf035559 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3311,6 +3311,16 @@
     githubId = 1621335;
     name = "Andrew Trachenko";
   };
+  govanify = {
+    name = "Gauvain 'GovanifY' Roussel-Tarbouriech";
+    email = "gauvain@govanify.com";
+    github = "govanify";
+    githubId = 6375438;
+    keys = [{
+      longkeyid = "rsa4096/0xDE62E1E2A6145556";
+      fingerprint = "5214 2D39 A7CE F8FA 872B  CA7F DE62 E1E2 A614 5556";
+    }];
+  };
   gpyh = {
     email = "yacine.hmito@gmail.com";
     github = "yacinehmito";

From 1eda035e1cb485564218799b71913da6c170eac2 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Fri, 13 Nov 2020 09:52:28 +0100
Subject: [PATCH 2357/3942] lvtk: update meta.homepage

---
 pkgs/development/libraries/audio/lvtk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index d4a0f671e8f8..6bc487e26162 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A set C++ wrappers around the LV2 C API";
-    homepage = "http://lvtoolkit.org";
+    homepage = "https://lvtk.org/";
     license = licenses.gpl3;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;

From a9927ef53319de0d7f934c7818eaa725442fe36e Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Fri, 13 Nov 2020 09:59:38 +0100
Subject: [PATCH 2358/3942] muse-sequencer: update meta.homepage

---
 pkgs/applications/audio/muse/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index 6ba29226b585..e7332aa18759 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "https://www.muse-sequencer.org/";
+    homepage = "https://muse-sequencer.github.io/";
     description = "MIDI/Audio sequencer with recording and editing capabilities";
     longDescription = ''
       MusE is a MIDI/Audio sequencer with recording and editing capabilities

From 9b3475be2655378536e9bb555785368e28811414 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Fri, 13 Nov 2020 10:06:11 +0100
Subject: [PATCH 2359/3942] openlibm: update meta.homepage

---
 pkgs/development/libraries/science/math/openlibm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index 3553833443f7..96812dcbf2b0 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High quality system independent, portable, open source libm implementation";
-    homepage = "https://www.openlibm.org/";
+    homepage = "https://openlibm.org/";
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.ttuegel ];
     platforms = stdenv.lib.platforms.all;

From 2d9157262cb023acd0f4fcf8f8d73a30ba5797e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 09:20:29 +0000
Subject: [PATCH 2360/3942] dump1090: 3.8.1 -> 4.0

---
 pkgs/applications/radio/dump1090/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix
index 11c5c46ae681..6e70a9f8d032 100644
--- a/pkgs/applications/radio/dump1090/default.nix
+++ b/pkgs/applications/radio/dump1090/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dump1090";
-  version = "3.8.1";
+  version = "4.0";
 
   src = fetchFromGitHub {
     owner = "flightaware";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0xg8rzrxqklx1m9ncxsd96dlkbjcsxfi2mrb859v50f07xysdyd8";
+    sha256 = "1zacsqaqsiapljhzw31dwc4nld2rp98jm3ivkyznrhzk9n156p42";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 10fc2a3ac976f3014d5e8fffa0aed3e566c40f9a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 9 Nov 2020 08:26:31 +0100
Subject: [PATCH 2361/3942] ocamlPackages.mstruct: remove at 1.4.0

---
 .../ocaml-modules/mstruct/default.nix         | 24 -------------------
 pkgs/top-level/ocaml-packages.nix             |  2 --
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/mstruct/default.nix

diff --git a/pkgs/development/ocaml-modules/mstruct/default.nix b/pkgs/development/ocaml-modules/mstruct/default.nix
deleted file mode 100644
index ae26f879ef8c..000000000000
--- a/pkgs/development/ocaml-modules/mstruct/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, cstruct }:
-
-buildDunePackage rec {
-	pname = "mstruct";
-	version = "1.4.0";
-
-  minimumOCamlVersion = "4.02";
-
-	src = fetchFromGitHub {
-		owner = "mirage";
-		repo = "ocaml-${pname}";
-		rev = "v${version}";
-		sha256 = "1p4ygwzs3n1fj4apfib0z0sabpph21bkq1dgjk4bsa59pq4prncm";
-	};
-
-	propagatedBuildInputs = [ cstruct ];
-
-	meta = {
-		description = "A thin mutable layer on top of cstruct";
-		license = stdenv.lib.licenses.isc;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		inherit (src.meta) homepage;
-	};
-}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 757a77f0403a..2947b369ed8c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -599,8 +599,6 @@ let
 
     mparser =  callPackage ../development/ocaml-modules/mparser { };
 
-    mstruct =  callPackage ../development/ocaml-modules/mstruct { };
-
     mtime =  callPackage ../development/ocaml-modules/mtime { };
 
     mustache =  callPackage ../development/ocaml-modules/mustache { };

From 13419bf372128507409ec7edce7980b13054c403 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Fri, 13 Nov 2020 11:05:56 +0100
Subject: [PATCH 2362/3942] phonon: update meta.homepage

---
 pkgs/development/libraries/phonon/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index bb43604db0c5..85ba37a9d8a6 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   version = "4.11.1";
 
   meta = {
-    homepage = "https://phonon.kde.org/";
+    homepage = "https://community.kde.org/Phonon";
     description = "Multimedia API for Qt";
     license = stdenv.lib.licenses.lgpl2;
     platforms = stdenv.lib.platforms.linux;

From 568d95e11e1f4507e6f123b9c9af2d1ab6f35a2a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 10:12:04 +0000
Subject: [PATCH 2363/3942] forkstat: 0.02.15 -> 0.02.16

---
 pkgs/os-specific/linux/forkstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index d42091085baf..09c9c660285e 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/pkgs/os-specific/linux/forkstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "forkstat";
-  version = "0.02.15";
+  version = "0.02.16";
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz";
-    sha256 = "11dvg7bbklpfywx6i6vb29vvc28pbfk3mff0g18n5imxvzsd7jxs";
+    sha256 = "1rrzvlws9725dy2jq5k4zfv669ngrb2klhla6wvir8nwh53jms4w";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''

From 26f1edbb21059b4e2913cb806984dca5ac632f48 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 10:26:25 +0000
Subject: [PATCH 2364/3942] fortune: 3.2.0 -> 3.4.1

---
 pkgs/tools/misc/fortune/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix
index 0804d8b06377..bc23d9dd8462 100644
--- a/pkgs/tools/misc/fortune/default.nix
+++ b/pkgs/tools/misc/fortune/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fortune-mod";
-  version = "3.2.0";
+  version = "3.4.1";
 
   # We use fetchurl instead of fetchFromGitHub because the release pack has some
   # special files.
   src = fetchurl {
     url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz";
-    sha256 = "0j554ja4min5rbqni8qn5gzk4xiyd643b8r50jyi32pcs88dwp7n";
+    sha256 = "02hjf432mq5qpbf1hywid7b356jys5n9brrrmm6z6r05jpzybbg3";
   };
 
   nativeBuildInputs = [ cmake perl ];

From 25faf53f18931df2c9e32abb172d46ea5cdf18b1 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Fri, 13 Nov 2020 11:27:11 +0100
Subject: [PATCH 2365/3942] psqlodbc: update meta.homepage

---
 pkgs/development/libraries/psqlodbc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix
index fdc35f149a33..43da67d3d9b6 100644
--- a/pkgs/development/libraries/psqlodbc/default.nix
+++ b/pkgs/development/libraries/psqlodbc/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-iodbc=${libiodbc}" ];
 
   meta = with stdenv.lib; {
-    homepage = "http://psqlodbc.projects.postgresql.org/";
+    homepage = "https://odbc.postgresql.org/";
     description = "ODBC driver for PostgreSQL";
     license = licenses.lgpl2;
     platforms = platforms.linux;

From cf30b008c992c87387599951888a879e94187633 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 13 Nov 2020 20:08:01 +1000
Subject: [PATCH 2366/3942] vgrep: 2.5.0 -> 2.5.1

https://github.com/vrothberg/vgrep/releases/tag/v2.5.1
---
 pkgs/tools/text/vgrep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/vgrep/default.nix b/pkgs/tools/text/vgrep/default.nix
index c51fce43467e..a2ac4b51001a 100644
--- a/pkgs/tools/text/vgrep/default.nix
+++ b/pkgs/tools/text/vgrep/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "vgrep";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "vrothberg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1waxp66286q325avvsq58s8qkfjqa39s5p8c3z59scpm0244nr80";
+    sha256 = "06rnmg6ljj4f1g602wdp2wy9v0m1m0sj6jl6wywyjl8grjqc3vac";
   };
 
   vendorSha256 = null;

From 1ce26aacd1bb418672de796ac64edae162ffd109 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 7 Nov 2020 14:35:57 +0100
Subject: [PATCH 2367/3942] =?UTF-8?q?ocamlPackages.digestif:=200.8.0=20?=
 =?UTF-8?q?=E2=86=92=200.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/digestif/default.nix        | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix
index d02104decba3..dd8a0f571649 100644
--- a/pkgs/development/ocaml-modules/digestif/default.nix
+++ b/pkgs/development/ocaml-modules/digestif/default.nix
@@ -1,27 +1,27 @@
-{ lib, fetchurl, fetchpatch, buildDunePackage
+{ lib, ocaml, fetchurl, buildDunePackage
 , bigarray-compat, eqaf, stdlib-shims
-, alcotest
+, alcotest, astring, bos, findlib, fpath
 }:
 
 buildDunePackage rec {
   pname = "digestif";
-  version = "0.8.0";
+  version = "0.9.0";
+
+  useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz";
-    sha256 = "09g4zngqiw97cljv8ds4m063wcxz3y7c7vzaprsbpjzi0ja5jdcy";
+    sha256 = "0vk9prgjp46xs8qizq7szkj6mqjj2ymncs2016bc8zswcdc1a3q4";
   };
 
-  # Fix tests with alcotest ≥ 1
-  patches = [ (fetchpatch {
-    url = "https://github.com/mirage/digestif/commit/b65d996c692d75da0a81323253429e07d14b72b6.patch";
-    sha256 = "0sf7qglcp19dhs65pwrrc7d9v57icf18jsrhpmvwskx8b4dchfiv";
-  })];
-
-  buildInputs = lib.optional doCheck alcotest;
   propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ];
 
-  doCheck = true;
+  checkInputs = [ alcotest astring bos fpath ];
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
+
+  postCheck = ''
+    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ test/test_runes.ml
+  '';
 
   meta = {
     description = "Simple hash algorithms in OCaml";

From 423276f6647af23a3d7e7e247291ee3ca1507907 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 11:16:56 +0000
Subject: [PATCH 2368/3942] geekbench: 5.2.5 -> 5.3.0

---
 pkgs/tools/misc/geekbench/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix
index 56292f3ad7dd..b2aa0a16f921 100644
--- a/pkgs/tools/misc/geekbench/default.nix
+++ b/pkgs/tools/misc/geekbench/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "geekbench";
-  version = "5.2.5";
+  version = "5.3.0";
 
   src = fetchurl {
     url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
-    sha256 = "0mq33khmsay646csr7j7mqb1fr2dlacb58hjqyxfbh83r0a1q67p";
+    sha256 = "0g7yj2a3cddaaa0n38zjqq79w5xs3sqa9zwqn2ffr2wr6y80754i";
   };
 
   dontConfigure = true;

From f883d885008349dd851e7a36809575b0931da970 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 11:31:42 +0000
Subject: [PATCH 2369/3942] flrig: 1.3.51 -> 1.3.52

---
 pkgs/applications/radio/flrig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix
index d95d894bdef7..d7c4b0359662 100644
--- a/pkgs/applications/radio/flrig/default.nix
+++ b/pkgs/applications/radio/flrig/default.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.51";
+  version = "1.3.52";
   pname = "flrig";
 
   src = fetchurl {
     url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
-    sha256 = "0aq4x0ai9q08ypfhzfj2inc4z3q39zq1l6h9as1kil9yn4zbay61";
+    sha256 = "18c154080vl25cy4l5amh96abm6kzm7mzld9h58pabc28yqq8zl8";
   };
 
   buildInputs = [

From 9e8f4ff79ac066fa0158dca37459be094bd9048a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Fri, 13 Nov 2020 10:40:48 +0100
Subject: [PATCH 2370/3942] tor-browser-bundle-bin: 10.0.2 -> 10.0.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 ff2501d47ce0..e340e3a052e9 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -91,19 +91,19 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "10.0.2";
+  version = "10.0.4";
 
   lang = "en-US";
 
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
-      sha256 = "sha256-JBJDMC44VSh1ekXPxsVvFk5nOB8Ro4UGtD32pG1weP8=";
+      sha256 = "sha256-2Ye1+mhFnkZnAYQXgKZ5YIOiIVaiunTCyCOM+ZExw2I==";
     };
 
     i686-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
-      sha256 = "sha256-EanW2Q8TtCPY5FSp8zfgBXMte9+RfKE24fu8ROtArK0=";
+      sha256 = "sha256-B0WGkIt8KDtma/WGyenQ04ctKE7AantUtYnwsjAZZb0=";
     };
   };
 in

From f70fe4af35ec7f2599a0d7ee66ecc2ecdb73f913 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 13 Nov 2020 13:26:52 +0100
Subject: [PATCH 2371/3942] =?UTF-8?q?webkitgtk:=202.30.1=20=E2=86=92=202.3?=
 =?UTF-8?q?0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://webkitgtk.org/2020/10/23/webkitgtk2.30.2-released.html
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 814a1f22592f..8d52e8703a94 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -59,7 +59,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "webkitgtk";
-  version = "2.30.1";
+  version = "2.30.2";
 
   outputs = [ "out" "dev" ];
 
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "1cfnsl5kvwrbclmp7v9q9ynrz702i9ncb6xmx6972dxpmpyrvi8p";
+    sha256 = "0ak8slddg7gpk6m096xzkiqw9bfsrrizvqr815bw44665fyf0ry4";
   };
 
   patches = optionals stdenv.isLinux [

From 4bcbf9f57db8ebe472d7ce1887cb6fc03fe39501 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 12:51:04 +0000
Subject: [PATCH 2372/3942] filezilla: 3.50.0 -> 3.51.0

---
 pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 0cb0d17cc5a2..17306059e996 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "filezilla";
-  version = "3.50.0";
+  version = "3.51.0";
 
   src = fetchurl {
     url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
-    sha256 = "sha256-4NuHJpylIIqtFKAkFTN7T57+PEnC1NFOZukhx4oTXBA=";
+    sha256 = "0k3c7gm16snc6dr9a3xgq14ajyqj4hxcrd6hk6jk5fsi9x51rgl2";
   };
 
   # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769

From e9267c8890f920f7b600596d51b0e83faedf829b Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 13 Nov 2020 13:56:57 +0100
Subject: [PATCH 2373/3942] abcl: update source archive hash

Seems like the source archive for abcl 1.8.0 was replaced on 2020-10-30
on both common-lisp.net and abcl.org. Now using the new hash and
abcl.org for src.
---
 pkgs/development/compilers/abcl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
index f27abda03d18..22f6ca7a0dd2 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
     url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz";
-    sha256 = "0wpfj7q9vq2k2mkp2wx2yvrcq0v8229ddyk8viiaizs7msn588ac";
+    sha256 = "0zr5mmqyj484vza089l8vc88d07g0m8ymxzglvar3ydwyvi1x1qx";
   };
   configurePhase = ''
     mkdir nix-tools

From c68e9c54606b95d421ae228aa91f09039607d53a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 12:57:12 +0000
Subject: [PATCH 2374/3942] flyway: 7.1.1 -> 7.2.0

---
 pkgs/development/tools/flyway/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 2d8814dd2f72..e6338d3e3f29 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, jre_headless, makeWrapper }:
   let
-    version = "7.1.1";
+    version = "7.2.0";
   in
     stdenv.mkDerivation {
       pname = "flyway";
       inherit version;
       src = fetchurl {
         url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
-        sha256 = "0ssspvgikn5avb49aldljx9avplhj33isbmwijk3548dg6dvh2da";
+        sha256 = "1rqj2aq1cwh9rsnnlwvg0b5jpyqsij9jamd873i18rf87q6cdsk4";
       };
       nativeBuildInputs = [ makeWrapper ];
       dontBuild = true;

From 08ca1ee82715eeb2006d112fee7aea76974a506e Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Thu, 12 Nov 2020 13:48:45 +0100
Subject: [PATCH 2375/3942] turbo-geth: 2020.11.01 -> 2020.11.02

---
 pkgs/applications/blockchains/turbo-geth.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix
index 163d87ee8881..eae1b812a3d9 100644
--- a/pkgs/applications/blockchains/turbo-geth.nix
+++ b/pkgs/applications/blockchains/turbo-geth.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "turbo-geth";
-  version = "2020.11.01";
+  version = "2020.11.02";
 
   src = fetchFromGitHub {
     owner = "ledgerwatch";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0hm8kqd0w231mlclsmsghf15r8pbrs5g064mkpx59qpqzk37lgss";
+    sha256 = "1bfywbg6mm3q4wd0mslcv5sj779277izzlqawqvqy3yxnpb6cwj5";
   };
 
-  vendorSha256 = "0b7ldrnwkz3r1d4fw95hvvpi3bz56d9v8p2mjzdvlpk5zhl2a37p";
+  vendorSha256 = "16vawkky612zf45d8dhipjmhrprmi28z9wdcnjy07x3bxdyfbhfr";
   runVend = true;
 
   subPackages = [

From 325d97780d713c04d06736621d781015168c1dac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 13:08:06 +0000
Subject: [PATCH 2376/3942] geany: 1.37 -> 1.37.1

---
 pkgs/applications/editors/geany/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index d56e5acc71bf..124d4ee0417a 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "geany";
-  version = "1.37";
+  version = "1.37.1";
 
   outputs = [ "out" "dev" "doc" "man" ];
 
   src = fetchurl {
     url = "https://download.geany.org/${pname}-${version}.tar.bz2";
-    sha256 = "dde52584823b769c56704c27dbedddb7a6bbaf4eacb9587d10bbc387816e3d51";
+    sha256 = "060sachn33xpx3a609f09y97qq5ky17gvv686zbvrn618ij7bi8q";
   };
 
   nativeBuildInputs = [

From bca0c78dc493e310616582a77c97d55c7c87d745 Mon Sep 17 00:00:00 2001
From: JesusMtnez <jesusmartinez93@gmail.com>
Date: Fri, 13 Nov 2020 14:10:26 +0100
Subject: [PATCH 2377/3942] vscodium: 1.51.0 -> 1.51.1

---
 pkgs/applications/editors/vscode/vscodium.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 6cfcb491afe4..b8ca7e3f262e 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -11,8 +11,8 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "0qims8qypx6aackw1b47pb7hkf0lffh94c69bm5rld2swzczcfnj";
-    x86_64-darwin = "1i96qhynjl1ihycq25xjakqlyvszindg5g8kgyhd6ab0q0zhmxqy";
+    x86_64-linux = "0hn4pqmabz3qf3bbqnn1fz7fcgzdkp2lwr2yzgmx8hhh3cff8bnb";
+    x86_64-darwin = "1x3wx0d99ihyya0n89qclc3jlhh0m72hs8hj7l0h3z6zmh6q2vzv";
   }.${system};
 
   sourceRoot = {
@@ -27,7 +27,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.51.0";
+    version = "1.51.1";
     pname = "vscodium";
 
     executableName = "codium";

From aa9a29c4ce2c53d9f287bb552834c9c242cabf11 Mon Sep 17 00:00:00 2001
From: JesusMtnez <jesusmartinez93@gmail.com>
Date: Fri, 13 Nov 2020 14:11:54 +0100
Subject: [PATCH 2378/3942] vscode: 1.51.0 -> 1.51.1

---
 pkgs/applications/editors/vscode/vscode.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index ce6122bddc41..70f621177105 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -11,8 +11,8 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "18fx2nsgn09l2gzgr1abi0cp4g8z2v9177sdl2rqr0yvmwk5i3p0";
-    x86_64-darwin = "14qdfz8q1dz0skkcgpamksgdvgsid2mcm9h09cvkh4z3v458100r";
+    x86_64-linux = "0yv6584y4idkl9vvmpxj5ix5brshm1vadiwf7ima84snm0fipb0n";
+    x86_64-darwin = "0igndxkwkxyjc9rkf9hbj8903hvfv7ab41q0s3gw8w5qh4b8s48x";
   }.${system};
 in
   callPackage ./generic.nix rec {
@@ -21,7 +21,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.51.0";
+    version = "1.51.1";
     pname = "vscode";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";

From 09eabf6afdcfaa4b75ff17b2d8b8d2e0a1c5f18d Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Fri, 13 Nov 2020 13:31:29 +0100
Subject: [PATCH 2379/3942] kitty: use installShellCompletion to install the
 shell completions

---
 pkgs/applications/terminal-emulators/kitty/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index e2eda846d60f..4813f5890f8f 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -53,10 +53,10 @@ buildPythonApplication rec {
 
   nativeBuildInputs = [
     pkgconfig sphinx ncurses
+    installShellFiles
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     imagemagick
     libicns  # For the png2icns tool.
-    installShellFiles
   ];
 
   propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL;
@@ -113,10 +113,10 @@ buildPythonApplication rec {
     wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ncurses.dev ]}"
     runHook postInstall
 
-    mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
-    "$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish"
-    "$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash"
-    "$out/bin/kitty" + complete setup zsh > "$out/share/zsh/site-functions/_kitty"
+    installShellCompletion --cmd kitty \
+      --bash <("$out/bin/kitty" + complete setup bash) \
+      --fish <("$out/bin/kitty" + complete setup fish) \
+      --zsh  <("$out/bin/kitty" + complete setup zsh)
   '';
 
   postInstall = ''

From 182b7cfb71f794aea8320cee547ff941c98e1607 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Fri, 13 Nov 2020 13:31:41 +0100
Subject: [PATCH 2380/3942] kitty: 0.19.1 -> 0.19.2

https://github.com/kovidgoyal/kitty/releases/tag/v0.19.2
---
 pkgs/applications/terminal-emulators/kitty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index 4813f5890f8f..b6a93aefb594 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -21,14 +21,14 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.19.1";
+  version = "0.19.2";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "145fx4nnn0gszawllfwqf1h65ak0ij6ffargs7y0cgaxsc991s6m";
+    sha256 = "06mlrc283k5f75y36fmmaxnj29jfc1s8vaykjph6a86m1gcl5wgi";
   };
 
   buildInputs = [

From 694139a12cca52835532d653bf4136790e3673c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 13:38:10 +0000
Subject: [PATCH 2381/3942] intel-gmmlib: 20.3.2 -> 20.3.3

---
 pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index d271313f95de..8d9a323fa497 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gmmlib";
-  version = "20.3.2";
+  version = "20.3.3";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "gmmlib";
     rev    = "${pname}-${version}";
-    sha256 = "0727pr7sknqi859gb5z472kgbbwx40574iyls8fgirm7lcz6gbd9";
+    sha256 = "1diq1gqpfv5bawvag6bzwnd3ilhacwmwx3bl67abjvbb0m3jw4lk";
   };
 
   nativeBuildInputs = [ cmake ];

From 22140b27f2d38dc9c52ffd7d0a7e8da932f0d67c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 8 Nov 2020 14:29:58 +0100
Subject: [PATCH 2382/3942] librdf_raptor2: add patch for CVE-2017-18926

Fixes two heap overflows in the raptor2 rdf parsing library.

https://www.openwall.com/lists/oss-security/2017/06/07/1
---
 pkgs/development/libraries/librdf/raptor2.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
index b4141d4ff079..4645b5ea0d83 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -1,13 +1,22 @@
 { stdenv, fetchurl, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "raptor2-2.0.15";
+  pname = "raptor2";
+  version = "2.0.15";
 
   src = fetchurl {
-    url = "http://download.librdf.org/source/${name}.tar.gz";
+    url = "http://download.librdf.org/source/${pname}-${version}.tar.gz";
     sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed";
   };
 
+  patches = [
+    (fetchurl {
+      name = "CVE-2017-18926.patch";
+      url = "https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f.patch";
+      sha256 = "1qlpb5rm3j2yi0x6zgdi5apymg5zlvwq3g1zl417gkjrlvxmndgp";
+    })
+  ];
+
   buildInputs = [ libxml2 libxslt ];
 
   postInstall = "rm -rvf $out/share/gtk-doc";

From 8775e3975718c8e4e47195579ac2f606a020072a Mon Sep 17 00:00:00 2001
From: Aamaruvi Yogamani <38222826+Technical27@users.noreply.github.com>
Date: Fri, 13 Nov 2020 09:06:08 -0500
Subject: [PATCH 2383/3942] wofi: 1.2.1 -> 1.2.3

This also fixes a GDK Protocol error.
---
 pkgs/applications/misc/wofi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix
index 4aeff6c9ec8d..7b9e38c87d17 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/pkgs/applications/misc/wofi/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "wofi";
-  version = "1.2.1";
+  version = "1.2.3";
 
   src = fetchhg {
     url = "https://hg.sr.ht/~scoopta/wofi";
     rev = "v${version}";
-    sha256 = "0hx61br19dlmc3lay23ww3n9ry06m7b6xrkjx7sk4vrg1422iq99";
+    sha256 = "0glpb2gf5n78s01z3rn614ak8ibxhfr824gy6xlljbxclgds264i";
   };
 
   nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ];

From 67394b5efdc8d5e554a668681fab029b1eb3ad70 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Fri, 13 Nov 2020 09:18:31 -0500
Subject: [PATCH 2384/3942] gnomeExtensions.dash-to-panel: 39 -> 40

---
 pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
index 8a0314cd8b4e..923faa00a149 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-dash-to-panel";
-  version = "39";
+  version = "40";
 
   src = fetchFromGitHub {
     owner = "home-sweet-gnome";
     repo = "dash-to-panel";
     rev = "v${version}";
-    sha256 = "0r7kbmrizl9ilqy7gzzvjwxcv8xpp13n5n0a8s84blg97cih0hw2";
+    sha256 = "07jq8d16nn62ikis896nyfn3q02f5srj754fmiblhz472q4ljc3p";
   };
 
   buildInputs = [

From a36f37b77833e2586b37903e123aa9797394dee2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 14:19:59 +0000
Subject: [PATCH 2385/3942] gmsh: 4.6.0 -> 4.7.0

---
 pkgs/applications/science/math/gmsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index db7e238e8ded..41c9846b23b2 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation rec {
   pname = "gmsh";
-  version = "4.6.0";
+  version = "4.7.0";
 
   src = fetchurl {
     url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
-    sha256 = "075dyblmlfdlhgbb1dwk6jzlqx93q90n6zwpr3mpii5n1zjmab0g";
+    sha256 = "03ij2hnh393gw59hgrz3qrmgc4qw82bc9nd98sks4jrp5gwk4zz2";
   };
 
   buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL

From 7a36556e6400bdc9a99d89441c8ca4556e86fc79 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 13 Nov 2020 14:18:32 +0000
Subject: [PATCH 2386/3942] =?UTF-8?q?oh-my-zsh:=202020-11-11=20=E2=86=92?=
 =?UTF-8?q?=202020-11-12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 35d6e706eaaa..adeab519a0b7 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
 
 stdenv.mkDerivation rec {
-  version = "2020-11-11";
+  version = "2020-11-12";
   pname = "oh-my-zsh";
-  rev = "1beac5958ede29855ef2ac4313ada83ed37f5ea8";
+  rev = "9b119866dd0e2d5054abd992f4dfbf346ac81b0d";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "01pm1g4dhdg05fd9jqp148xi4aw9fkd6kyrvmxizbvsbbz8m751h";
+    sha256 = "0m65ii79lp8mhl4adicg4qqzj93321gxpg6s91h0wbpkdgd53qxw";
   };
 
   installPhase = ''

From eb64d1518f08dc580780dcf179306606727548cd Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 13 Nov 2020 09:25:36 -0500
Subject: [PATCH 2387/3942] linux-rt_5_4: 5.4.74-rt41 -> 5.4.74-rt42

---
 pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
index 3ea7d620595d..11a5387cac3d 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "5.4.74-rt41"; # updated by ./update-rt.sh
+  version = "5.4.74-rt42"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -21,7 +21,7 @@ in buildLinux (args // {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0ap5zvdx6zxwqh2cy67rha4zgz3k8vqzd2vhll1mx81d10fmvmp8";
+      sha256 = "11hk5ps2nsffcjmccp839l55nzbl9irss0ralj2y1xah1ikbs7fh";
     };
   }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
 

From 3457f85820802837d412c948479ab47c79ca82a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 14:37:53 +0000
Subject: [PATCH 2388/3942] gp2c: 0.0.11pl4 -> 0.0.12

---
 pkgs/applications/science/math/pari/gp2c.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
index 7726a0d789e9..082ff60c3e8d 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gp2c";
-  version = "0.0.11pl4";
+  version = "0.0.12";
 
   src = fetchurl {
     url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz";
-    sha256 = "sha256-QGocEXxTahB5fHhlWtHXgMEl6brQ34LNwScxHNuB1rI=";
+    sha256 = "039ip7qkwwv46wrcdrz7y12m30kazzkjr44kqbc0h137g4wzd7zf";
   };
 
   buildInputs = [ pari perl ];

From 7fb1069a13462abb5dd83cb0f9ff461a43b6dbb9 Mon Sep 17 00:00:00 2001
From: cmacrae <hi@cmacr.ae>
Date: Fri, 13 Nov 2020 11:23:05 +0000
Subject: [PATCH 2389/3942] yabai: 3.3.0 -> 3.3.3

---
 pkgs/os-specific/darwin/yabai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix
index 742a3948707e..3c3378b323ad 100644
--- a/pkgs/os-specific/darwin/yabai/default.nix
+++ b/pkgs/os-specific/darwin/yabai/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yabai";
-  version = "3.3.0";
+  version = "3.3.3";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0y4idivqkmi3xsc8yjdzh1b15qzgyqlw7ifs26v3dc91lkjhfc4x";
+    sha256 = "0rxl0in3rhmrgg3v3l91amr497x37i2w1jqm52k0jb9my1sk67rs";
   };
 
   buildInputs = [ Carbon Cocoa ScriptingBridge xxd ];

From 74d354a3973d3963280d5c6433f104343d749310 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Fri, 13 Nov 2020 16:14:41 +0100
Subject: [PATCH 2390/3942] nixos/codimd: add package option, refactor
 prettyJSON

This adds a `package` option to allow for easier overriding of the used
CodiMD version and `runCommandLocal` with `nativeBuildInputs` is now
used to pretty print the configuration.
---
 nixos/modules/services/web-apps/codimd.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix
index c787c36b877c..0fbc9ee820e6 100644
--- a/nixos/modules/services/web-apps/codimd.nix
+++ b/nixos/modules/services/web-apps/codimd.nix
@@ -6,8 +6,10 @@ let
   cfg = config.services.codimd;
 
   prettyJSON = conf:
-    pkgs.runCommand "codimd-config.json" { preferLocalBuild = true; } ''
-      echo '${builtins.toJSON conf}' | ${pkgs.jq}/bin/jq \
+    pkgs.runCommandLocal "codimd-config.json" {
+      nativeBuildInputs = [ pkgs.jq ];
+    } ''
+      echo '${builtins.toJSON conf}' | jq \
         '{production:del(.[]|nulls)|del(.[][]?|nulls)}' > $out
     '';
 in
@@ -878,7 +880,6 @@ in
       };
     };
 
-
     environmentFile = mkOption {
       type = with types; nullOr path;
       default = null;
@@ -908,6 +909,14 @@ in
         <literal>CodiMD</literal> is running.
       '';
     };
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.codimd;
+      description = ''
+        Package that provides CodiMD.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -938,7 +947,7 @@ in
       '';
       serviceConfig = {
         WorkingDirectory = cfg.workDir;
-        ExecStart = "${pkgs.codimd}/bin/codimd";
+        ExecStart = "${cfg.package}/bin/codimd";
         EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
         Environment = [
           "CMD_CONFIG_FILE=${cfg.workDir}/config.json"

From 4fb71e299d94f3813df6f24a448cf9f2fa16b046 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 15:19:20 +0000
Subject: [PATCH 2391/3942] haproxy: 2.2.4 -> 2.3.0

---
 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 16670ea175f8..41dd747315ba 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
 
 stdenv.mkDerivation rec {
   pname = "haproxy";
-  version = "2.2.4";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
-    sha256 = "1qhvaixns0xgxgd095kvqid0pi6jxsld9ghvnr60khwdzzadk947";
+    sha256 = "1z3qzwm2brpi36kxhvw2xvm1ld9yz9c373rcixw3z21pw1cxrfh8";
   };
 
   buildInputs = [ openssl zlib ]

From 9ebf4409d2302d859f0dfa1c52ec23f0f4730078 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Fri, 13 Nov 2020 16:25:01 +0100
Subject: [PATCH 2392/3942] pastebinit: fix basic usage

---
 pkgs/tools/misc/pastebinit/default.nix | 29 +++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix
index a3134f57397c..9b4202504a0f 100644
--- a/pkgs/tools/misc/pastebinit/default.nix
+++ b/pkgs/tools/misc/pastebinit/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, python3 }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, python3
+}:
 
 stdenv.mkDerivation rec {
   version = "1.5";
@@ -9,7 +13,26 @@ stdenv.mkDerivation rec {
     sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2";
   };
 
-  buildInputs = [ python3 ];
+  buildInputs = [
+    (python3.withPackages (p: [ p.distro ]))
+  ];
+
+  patchFlags = [ "-p0" ];
+
+  patches = [
+    # Required to allow pastebinit 1.5 to run on Python 3.8
+    (fetchpatch {
+      name = "use-distro-module.patch";
+      url = "https://bazaar.launchpad.net/~arnouten/pastebinit/python38/diff/264?context=3";
+      sha256 = "1gp5inp4xald65xbb7fc5aqq5s2fhw464niwjjja9anqyp3zhawj";
+    })
+    # Required because pastebin.com now redirects http requests to https
+    (fetchpatch {
+      name = "pastebin-com-https.patch";
+      url = "https://bazaar.launchpad.net/~arnouten/pastebinit/pastebin-com-https/diff/264?context=3";
+      sha256 = "0hxhhfcai0mll8qfyhdl3slmbf34ynb759b648x63274m9nd2kji";
+    })
+  ];
 
   installPhase = ''
     mkdir -p $out/bin
@@ -22,7 +45,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "https://launchpad.net/pastebinit";
     description = "A software that lets you send anything you want directly to a pastebin from the command line";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = with maintainers; [ lethalman raboof ];
     license = licenses.gpl2;
     platforms = platforms.linux;
   };

From 65ac9e26af258a8cf82b138a906799415af34e23 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 16:17:17 +0000
Subject: [PATCH 2393/3942] k6: 0.28.0 -> 0.29.0

---
 pkgs/development/tools/k6/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix
index 4dbd890df180..35972f9cce53 100644
--- a/pkgs/development/tools/k6/default.nix
+++ b/pkgs/development/tools/k6/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "k6";
-  version = "0.28.0";
+  version = "0.29.0";
 
   goPackagePath = "github.com/loadimpact/k6";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "loadimpact";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0zpkavl6sg6kcb7wc92lzi4svvv3284xs20zbmgq4i9i5z1njdkx";
+    sha256 = "1zkw7jga8nsqycvrwnqxifbb5la2z4bmxg3l5638i4xlpn58g711";
   };
 
   subPackages = [ "./" ];

From c9845cdaeda85ceac5697e05e880380156c52868 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 13 Nov 2020 11:33:33 -0500
Subject: [PATCH 2394/3942] linux: 5.10-rc2 -> 5.10-rc3

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 7931c5a05379..4cc8e38915b9 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.10-rc2";
+  version = "5.10-rc3";
   extraMeta.branch = "5.10";
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1qh353xd48mbvavpw61r2lz1cn8007yyc2xqiacbn8xsj7xdlxkj";
+    sha256 = "08zwz6rjpd6nzhzs1hwix3709w22495sxcs0ajizyq50pydn77vd";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 04d5b2f80c857654cb0eddd52695f65786f06ace Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 16:53:31 +0000
Subject: [PATCH 2395/3942] icewm: 1.9.0 -> 1.9.2

---
 pkgs/applications/window-managers/icewm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 3e3065301d98..b86e598a4d08 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -9,13 +9,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "icewm";
-  version = "1.9.0";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner  = "bbidulock";
     repo = pname;
     rev = version;
-    sha256 = "08prc9ip96bxbmkkab0ymma9yisgs5yzymg4gjcvr945bj4q7crb";
+    sha256 = "16a9ikknjmhrrlc5r6z2ilkjj5vzyfk4ypwab39mg7vcmd7jzc41";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl asciidoc ];

From d01e5dc66bf4fe0e01e6356380107d0e78010167 Mon Sep 17 00:00:00 2001
From: Jack Kelly <dev@j-k.io>
Date: Fri, 13 Nov 2020 17:03:10 +0000
Subject: [PATCH 2396/3942] octant: init at 0.16.0 (#99546)

---
 .../networking/cluster/octant/default.nix     | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/octant/default.nix

diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix
new file mode 100644
index 000000000000..9e37bb6afe25
--- /dev/null
+++ b/pkgs/applications/networking/cluster/octant/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl }:
+let
+  version = "0.16.0";
+
+  system = stdenv.hostPlatform.system;
+  suffix = {
+    x86_64-linux = "Linux-64bit";
+    aarch64-linux = "Linux-arm64";
+    x86_64-darwin = "macOS-64bit";
+  }."${system}" or (throw "Unsupported system: ${system}");
+
+  baseurl = "https://github.com/vmware-tanzu/octant/releases/download";
+  fetchsrc = sha256: fetchurl {
+    url = "${baseurl}/v${version}/octant_${version}_${suffix}.tar.gz";
+    sha256 = sha256."${system}";
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "octant";
+  inherit version;
+
+  src = fetchsrc {
+    x86_64-linux = "1i6i42hwxaczkfv8ldxn3wp6bslgwfkycvh88khfmapw2f5f9mhr";
+    aarch64-linux = "1ka5vscyqxckxnhnymp06yi0r2ljw42q0g62yq7qv4safljd452p";
+    x86_64-darwin = "1c50c2r2hq2fi8jcijq6vn336w96ar7b6qccv5w2240i0szsxxql";
+  };
+
+  doBuild = false;
+  doCheck = false;
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mv octant $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters.";
+    longDescription = ''
+      Octant is a tool for developers to understand how applications run on a Kubernetes cluster.
+      It aims to be part of the developer's toolkit for gaining insight and approaching complexity found in Kubernetes.
+      Octant offers a combination of introspective tooling, cluster navigation, and object management along with a
+      plugin system to further extend its capabilities.
+    '';
+    homepage = "https://octant.dev/";
+    license = licenses.asl20;
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+    maintainers = with maintainers; [ jk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96433c6e788d..3667a63a03e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -479,6 +479,8 @@ in
 
   ociTools = callPackage ../build-support/oci-tools { };
 
+  octant = callPackage ../applications/networking/cluster/octant { };
+
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
 
   pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; }

From 0428243fb3dd2412d121cd53dfeb38246874ce36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 17:05:07 +0000
Subject: [PATCH 2397/3942] jotta-cli: 0.7.33634 -> 0.7.35160

---
 pkgs/applications/misc/jotta-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix
index a924bd181c0e..069d98111cc4 100644
--- a/pkgs/applications/misc/jotta-cli/default.nix
+++ b/pkgs/applications/misc/jotta-cli/default.nix
@@ -5,10 +5,10 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "jotta-cli";
-  version = "0.7.33634";
+  version = "0.7.35160";
   src = fetchzip {
       url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
-      sha256 = "0apbdk4fvmn52w9qyh6hvpk3k0sa810jvvndpsbysnlmi7gv5w62";
+      sha256 = "00fzycy199l9y738cj71s88qz96ppczb5sqsk3x9w4jj4m6ks239";
       stripRoot = false;
     };
 

From 4e9c5d190294e62b061c9fd218f1911947857888 Mon Sep 17 00:00:00 2001
From: Zyansheep <zyansheep@gmail.com>
Date: Fri, 13 Nov 2020 12:27:18 -0500
Subject: [PATCH 2398/3942] maintainers: add zyansheep

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 48f847b3d197..806060d851b8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9748,6 +9748,12 @@
     githubId = 10643;
     name = "Jason A. Donenfeld";
   };
+  zyansheep = {
+    email = "zyansheep@protonmail.com";
+    github = "zyansheep";
+    githubId = 20029431;
+    name = "Zyansheep";
+  };
   zzamboni = {
     email = "diego@zzamboni.org";
     github = "zzamboni";

From 660864eb6f93ec27edceb4c1257baed33361db78 Mon Sep 17 00:00:00 2001
From: Zyansheep <zyansheep@gmail.com>
Date: Fri, 13 Nov 2020 12:27:46 -0500
Subject: [PATCH 2399/3942] lunar-client: init at 4.2.0

---
 pkgs/games/lunar-client/default.nix | 41 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/games/lunar-client/default.nix

diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix
new file mode 100644
index 000000000000..f5c0e3faf77a
--- /dev/null
+++ b/pkgs/games/lunar-client/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, appimageTools, lib, fetchurl, makeDesktopItem }:
+let
+  name = "lunar-client";
+  version = "2.4.0";
+
+  desktopItem = makeDesktopItem {
+    name = "Lunar Client";
+    exec = "lunar-client";
+    icon = "lunarclient";
+    comment = "Optimized Minecraft Client for 1.7.10 and 1.8.9";
+    desktopName = "Lunar Client";
+    genericName = "Minecraft Client";
+    categories = "Game;";
+  };
+
+  appimageContents = appimageTools.extract {
+    inherit name src;
+  };
+
+  src = fetchurl {
+    url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
+    name = "lunar-client.AppImage";
+    sha256 = "bb85a62127a9b3848cc60796c20ac75655794f1d3cd17cb6b5499bbf19d16019";
+  };
+in appimageTools.wrapType1 rec {
+  inherit name src;
+
+  extraInstallCommands = ''
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications
+    cp -r ${appimageContents}/usr/share/icons/ $out/share/
+  '';
+
+  meta = with lib; {
+    description = "Minecraft 1.7.10 & 1.8.9 PVP Client";
+    homepage = "https://www.lunarclient.com/";
+    license = with licenses; [ unfree ];
+    maintainers = with maintainers; [ zyansheep ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f431626c380..58625e24253b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5112,6 +5112,8 @@ in
 
   ltwheelconf = callPackage ../applications/misc/ltwheelconf { };
 
+  lunar-client = callPackage ../games/lunar-client {};
+
   lvmsync = callPackage ../tools/backup/lvmsync { };
 
   kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { };

From f525d54c557d254cad6e973d7c9e98d8642d6627 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Nov 2020 00:33:51 -0800
Subject: [PATCH 2400/3942] zfsUnstable: 2.0.0-rc5 -> 2.0.0-rc6

---
 pkgs/os-specific/linux/zfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index b9a8c83060b5..80fb7389877a 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -203,9 +203,9 @@ in {
     # incompatibleKernelVersion = "4.19";
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2.0.0-rc5";
+    version = "2.0.0-rc6";
 
-    sha256 = "0vnldx95c36yy18v1hfr8r4cmmh3hw4n6pwz30drkwgywakjwnsd";
+    sha256 = "0p027x9hsawniwa9h3yayfbcx010anwcfy45rqgkg2r91zr2nfvw";
     isUnstable = true;
   };
 }

From 5eeff0d2bc197b48a6d9e8e29030f665bad8f06a Mon Sep 17 00:00:00 2001
From: Will Badart <will@willbadart.com>
Date: Fri, 13 Nov 2020 11:48:53 -0500
Subject: [PATCH 2401/3942] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 352 ++++++++++++++--------------
 1 file changed, 176 insertions(+), 176 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 41a1e6c90c75..82e23f3fc01c 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -221,12 +221,12 @@ let
 
   barbar-nvim = buildVimPluginFrom2Nix {
     pname = "barbar-nvim";
-    version = "2020-11-06";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "romgrk";
       repo = "barbar.nvim";
-      rev = "92e70f9e369d106476de283354bc30e37a94e864";
-      sha256 = "17az4flcsry4f2p4xnmgw0ymbbybcfycajm25g6r692hcbgkg5dx";
+      rev = "16fee1a0309910645f28caa1a3cac607a4ea47a3";
+      sha256 = "1h5cn9z9446pjzdpr4nnay7g4cfyl4cf541nmy6r0v7mq68zfijc";
     };
     meta.homepage = "https://github.com/romgrk/barbar.nvim/";
   };
@@ -401,12 +401,12 @@ let
 
   coc-explorer = buildVimPluginFrom2Nix {
     pname = "coc-explorer";
-    version = "2020-11-02";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "weirongxu";
       repo = "coc-explorer";
-      rev = "3530aaf09473366e3d21811a708d9cde7e1f4a02";
-      sha256 = "1qksmhgn71rax5gz5zjxp80wx3xabgv9k8y9pbldr19r777gb14r";
+      rev = "6be196d41f9738b6678de07f5509f56a58c149ec";
+      sha256 = "1gmc2m2i7i11hx8v18bvz18pzwf82234z740syl66xm2q9z1d1sb";
     };
     meta.homepage = "https://github.com/weirongxu/coc-explorer/";
   };
@@ -425,12 +425,12 @@ let
 
   coc-markdownlint = buildVimPluginFrom2Nix {
     pname = "coc-markdownlint";
-    version = "2020-11-02";
+    version = "2020-11-12";
     src = fetchFromGitHub {
       owner = "fannheyward";
       repo = "coc-markdownlint";
-      rev = "56af4992a9f48a5ae210a0bf346e00a08075908a";
-      sha256 = "0gjfs3mrxv88z8fvm4rc51hw8kghami80pbvz7jcz0bf9bfwgdaw";
+      rev = "a9304f7b096871e15c2992d0d09e7c7f3a3675d4";
+      sha256 = "0r7mr4qmw04hhxihfn4pndpv0dakwjcj6jf1jccgydxc35qv14vj";
     };
     meta.homepage = "https://github.com/fannheyward/coc-markdownlint/";
   };
@@ -473,12 +473,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2020-11-05";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "815d105fe9bada4fda9c85f98557005b70a9e667";
-      sha256 = "0hxrja25hwcnw31bwcrs8krvjdxwvb6wxjrrx9zwbplj4x7xbkyp";
+      rev = "02a058c5fb563ce79bead38a49bbff21664c016e";
+      sha256 = "1dhfi86i0cx1llaj6ywk8wv3ym595fkscg5w4qrbxazsmbjgrbaq";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -606,12 +606,12 @@ let
 
   Coqtail = buildVimPluginFrom2Nix {
     pname = "Coqtail";
-    version = "2020-10-30";
+    version = "2020-11-09";
     src = fetchFromGitHub {
       owner = "whonore";
       repo = "Coqtail";
-      rev = "778f5f5868aec79bb5415f790c8f18b8253fd99c";
-      sha256 = "1p7lg6ln9vkw6ds3bllyf1rlpnlhb5cyly6cab1v9zgjz4xagx80";
+      rev = "42625407e022ff3cd56c53ac87270ad9fb70f605";
+      sha256 = "0rm5vvdzl63lm76fmp52l51619bd62gk7ddg1j8vzb074nlyc66m";
     };
     meta.homepage = "https://github.com/whonore/Coqtail/";
   };
@@ -702,24 +702,24 @@ let
 
   ctrlp-vim = buildVimPluginFrom2Nix {
     pname = "ctrlp-vim";
-    version = "2020-10-16";
+    version = "2020-11-12";
     src = fetchFromGitHub {
       owner = "ctrlpvim";
       repo = "ctrlp.vim";
-      rev = "3866ae170a342fb40d83e1538c37c81c7977b821";
-      sha256 = "1ksi46g33ghdrp0nff0fyysxnzw0sr1x5b1ln6xzjv4hkdxiz51k";
+      rev = "971c4d41880b72dbbf1620b3ad91418a6a6f6b9c";
+      sha256 = "0n68hg59h4rjn0ziqbsh5pr03l3kr98zk54659ny6vq107af1w96";
     };
     meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/";
   };
 
   dart-vim-plugin = buildVimPluginFrom2Nix {
     pname = "dart-vim-plugin";
-    version = "2020-08-14";
+    version = "2020-11-10";
     src = fetchFromGitHub {
       owner = "dart-lang";
       repo = "dart-vim-plugin";
-      rev = "378bddc9f0e109607935ab9a4ac717df008deac7";
-      sha256 = "0idaph0wdaf2rk9mh468zg8c4gf5hyvad5zqlpcd9q1f576ysswy";
+      rev = "8ff9e1abd264f16fd1d192024348f6c63b514a0d";
+      sha256 = "15rkgh68j9agbj4144a0jis7qpcfjfspp6598laqjz1qzrx82pmf";
     };
     meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
   };
@@ -908,12 +908,12 @@ let
 
   deoplete-jedi = buildVimPluginFrom2Nix {
     pname = "deoplete-jedi";
-    version = "2020-08-06";
+    version = "2020-11-07";
     src = fetchFromGitHub {
       owner = "deoplete-plugins";
       repo = "deoplete-jedi";
-      rev = "2786058b9022ce6e50db7f75088e69e07185e52c";
-      sha256 = "0myn6rgwq7yd3hpxdxa7kj3dlk2x9ljqlznqg95qcm8i0w53z1wg";
+      rev = "2d61fe45e348f89979c8faf663b3e88c61435f47";
+      sha256 = "0qmszwrchp272zc4rf727k9l0x472lxbbql8k2pyj1vd1ks97q1i";
     };
     meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/";
   };
@@ -1040,12 +1040,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2020-11-04";
+    version = "2020-11-11";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "9aacded51b323f338859f01fcdca30a4acaf7dcc";
-      sha256 = "07gmj9cljbn4h7naxayq05p38930ffby97zg3x2c98x3hxldqsq8";
+      rev = "44a3e2393a99d5975ac7f282be10d008f4c70251";
+      sha256 = "1ikaqqmms0zcf997wf9jysdzmn2r1w9gqjqn58sw5drnnfamwvml";
     };
     meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
   };
@@ -1076,12 +1076,12 @@ let
 
   diagnostic-nvim = buildVimPluginFrom2Nix {
     pname = "diagnostic-nvim";
-    version = "2020-10-01";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "diagnostic-nvim";
-      rev = "bef1c6140563cb6416081b2517ae9953cd4e05ab";
-      sha256 = "05f2hr3229zph3x9lhmabb9rzdf61r92f3ybj2gs40hfbak0c3pb";
+      rev = "a8401479822e638fa70472009949e7be8b24e0fd";
+      sha256 = "1dl4b8xhvnb2x9fw220jis7hqmiwfz0969d44l96p41bj68qbbs9";
     };
     meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/";
   };
@@ -1112,12 +1112,12 @@ let
 
   dracula-vim = buildVimPluginFrom2Nix {
     pname = "dracula-vim";
-    version = "2020-11-04";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "8242b8f5aaa07fb3102d8ef649797454039b261b";
-      sha256 = "15sjrn8ajagbymxswa5qmaqbw517s2j9xavzhfxmfffv9h10rs3c";
+      rev = "ba00ac0432541811955e50b8420c25b22762c7c9";
+      sha256 = "1rp0zip0p07rbfiz8b5nvm6k1d80yvdgn4h59v3bg8j9qan7rg3h";
     };
     meta.homepage = "https://github.com/dracula/vim/";
   };
@@ -1343,12 +1343,12 @@ let
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2020-11-03";
+    version = "2020-11-11";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "61c4b6d1ed30287edcbfd3dbaed4e43b5c251c93";
-      sha256 = "09fx5bg9kaw2zv98vvvx5pix0b0dn06kxk3mq9khiak2liyq96lv";
+      rev = "53b3aea0da5e3581e224c958dbc13558cbe5daee";
+      sha256 = "0r19v3431ps7mmq2vb0vf1phwmgi1xp0n7z43wa68i4ilyjhbnr6";
     };
     meta.homepage = "https://github.com/junegunn/fzf.vim/";
   };
@@ -1559,12 +1559,12 @@ let
 
   hoon-vim = buildVimPluginFrom2Nix {
     pname = "hoon-vim";
-    version = "2020-10-15";
+    version = "2020-11-09";
     src = fetchFromGitHub {
       owner = "urbit";
       repo = "hoon.vim";
-      rev = "aeb307427f2ffaf756cb04574f5ed0d77626d51e";
-      sha256 = "11nsws8q54lya6lk51zkwhv47rmidg1wclgd4vq7v4jwc25gw8id";
+      rev = "91b1922f8627bb0a55341bb088f2526d0f43a6ac";
+      sha256 = "0h87r7r74iljwvfc6mb1maa08cxwnk6k89gc6vnwqm1zx6qxw1js";
     };
     meta.homepage = "https://github.com/urbit/hoon.vim/";
   };
@@ -1655,12 +1655,12 @@ let
 
   indentLine = buildVimPluginFrom2Nix {
     pname = "indentLine";
-    version = "2020-10-12";
+    version = "2020-11-11";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "indentLine";
-      rev = "6107214eff0cac5d9810d29ae8614ddfdfcd986b";
-      sha256 = "1aycs427w9w5hjnif5c13wf3jd872a3i94zzdfisfrispbs3ad2m";
+      rev = "9662ef8f0443211b11fd87919343d12179bca548";
+      sha256 = "1mdbppz3xb8dzbw61fcv3gn3ad4hgia9i5s96vyw5frwxlkfyqpm";
     };
     meta.homepage = "https://github.com/Yggdroot/indentLine/";
   };
@@ -1920,12 +1920,12 @@ let
 
   lh-vim-lib = buildVimPluginFrom2Nix {
     pname = "lh-vim-lib";
-    version = "2020-10-27";
+    version = "2020-11-10";
     src = fetchFromGitHub {
       owner = "LucHermitte";
       repo = "lh-vim-lib";
-      rev = "b5959b4fa3635d9a7eac587a5c223effca14a970";
-      sha256 = "0rfl5c2bf0j6kn1knzg4kywi7xvqhr6impwfh5466ncb4p529vlk";
+      rev = "38a20127dc8aaf76f686b0b96023b51c466969b9";
+      sha256 = "19pw4mmhp4cj2xjb6ygiahmix2wq123a738whjg5137zkrzfqz2j";
     };
     meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";
   };
@@ -1956,11 +1956,11 @@ let
 
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
-    version = "2020-11-05";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "53176a0b75d6389d775d7bce0d494e58fc654f38";
+      rev = "fdccae8c9dc243d58f48c428b99be4920f89d1a0";
       sha256 = "0wg0nrjbr8my98ivaawj3khyx1fkkgbafwhmq6mlb8j8aj47pigx";
     };
     meta.homepage = "https://github.com/itchyny/lightline.vim/";
@@ -2280,12 +2280,12 @@ let
 
   neco-vim = buildVimPluginFrom2Nix {
     pname = "neco-vim";
-    version = "2020-09-13";
+    version = "2020-11-10";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neco-vim";
-      rev = "e7b5a73cba668a351b0953063b6e18e1dc1773b2";
-      sha256 = "0mfli085rpr5assb4n21wnd59fnnsbfilim7impcwr9imvrw6ymf";
+      rev = "2b1dca6ca16d6f5655748fcd4d54d772fcfd0d81";
+      sha256 = "1prnclm9i7m09v1ip0sgkgddxwclas3x48zc8c800vxmmvjhzd7j";
     };
     meta.homepage = "https://github.com/Shougo/neco-vim/";
   };
@@ -2316,12 +2316,12 @@ let
 
   neoformat = buildVimPluginFrom2Nix {
     pname = "neoformat";
-    version = "2020-11-02";
+    version = "2020-11-05";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "2132bc678f5389593cea1b82ec1ea630cde0041a";
-      sha256 = "0h4ymq4jgxw48s2ccvsj5612pmb8vdsqq2hgx877rjji1chxk432";
+      rev = "0b1c3ed1d19fceb3c7367fe40ef9934819effb13";
+      sha256 = "0479vh85cdrijrghpkva5s4sv0q66hs5n2gl5nhqplz52may0xxg";
     };
     meta.homepage = "https://github.com/sbdchd/neoformat/";
   };
@@ -2340,12 +2340,12 @@ let
 
   neomake = buildVimPluginFrom2Nix {
     pname = "neomake";
-    version = "2020-07-15";
+    version = "2020-11-09";
     src = fetchFromGitHub {
       owner = "neomake";
       repo = "neomake";
-      rev = "a3082cca83424e28730c738cf33157326b0be5ba";
-      sha256 = "0jxxy6ibj73xh77rvfkcqr98q1pr563zsmzq1qdm3s9lb6xvzka6";
+      rev = "3b611ca24a7b78f7842facf6361404724717af1a";
+      sha256 = "0x710kk7cac4m6s7xlqbm8pch1kfbwkmk6myvmsgf2qflj2qxn2j";
     };
     meta.homepage = "https://github.com/neomake/neomake/";
   };
@@ -2364,12 +2364,12 @@ let
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
     pname = "neosnippet-snippets";
-    version = "2020-10-08";
+    version = "2020-11-10";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet-snippets";
-      rev = "7448233dfd40e7f0a1075fefa76d1d5a84e5d28a";
-      sha256 = "0dy7fgdhkz06720ws4r5gyksqg60hb2v157vkbzii3jqd5fx8mkf";
+      rev = "4b0829cc82704d98ac65a95e9317b8dd1fe90dee";
+      sha256 = "0yvkixv8ls4j7blfnk4a4bkxr47qfq0rs7ddzsfc6m3w2zms7c6j";
     };
     meta.homepage = "https://github.com/Shougo/neosnippet-snippets/";
   };
@@ -2400,12 +2400,12 @@ let
 
   neoterm = buildVimPluginFrom2Nix {
     pname = "neoterm";
-    version = "2020-09-30";
+    version = "2020-11-05";
     src = fetchFromGitHub {
       owner = "kassio";
       repo = "neoterm";
-      rev = "e24d0edc1ac932da813e3034b6ecee9179c4b0e9";
-      sha256 = "1n21i2y8w58ijqsj8c798s60in6lbw3ayx35vm781sk2gfrf1ckl";
+      rev = "78461935fcd6888c02e4368126a2cb645b80816e";
+      sha256 = "07szw3jd5vj4sxzmrdalk79pdba7cm0c7k3rvn5bw4lyjgzml7ll";
     };
     meta.homepage = "https://github.com/kassio/neoterm/";
   };
@@ -2472,24 +2472,24 @@ let
 
   nerdtree-git-plugin = buildVimPluginFrom2Nix {
     pname = "nerdtree-git-plugin";
-    version = "2020-10-16";
+    version = "2020-11-11";
     src = fetchFromGitHub {
       owner = "Xuyuanp";
       repo = "nerdtree-git-plugin";
-      rev = "01b84c63b9ba48628285779fbdfd046dd2bc2970";
-      sha256 = "1bmnm5my7r8ranafanwc33qksic444p47i23qsnkkphxk2hiq5q7";
+      rev = "9e33a3fe8aa90f5ece2439f3b1b3a98fe7e35f85";
+      sha256 = "1qv526rn4yysvpka6pigs4p6gk5izqh0ik32b5aa2qk3059lkpx4";
     };
     meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/";
   };
 
   neuron-vim = buildVimPluginFrom2Nix {
     pname = "neuron-vim";
-    version = "2020-10-29";
+    version = "2020-11-11";
     src = fetchFromGitHub {
       owner = "fiatjaf";
       repo = "neuron.vim";
-      rev = "2b4321bf12a4d0b589cd8c26aabb7e31311dab26";
-      sha256 = "0h8m72n4jdl9fa308wrchckn6xsbs3b5w8b0714qf9rdpg8jzwa6";
+      rev = "1f0d334aaee523c9269811809d64b0d2057a3fdf";
+      sha256 = "18shra0cff76vsla9ydzmbi41d2iqgb6fh7f9i994lknjqlhfcgw";
     };
     meta.homepage = "https://github.com/fiatjaf/neuron.vim/";
   };
@@ -2604,12 +2604,12 @@ let
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2020-11-04";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "6e80f426bf9dc44c14b73d3589c6e19cbe9aa682";
-      sha256 = "14nprh59sif0kvkdxqw8ij7wnnm4d5zcv4cfgah4y7mj5a99na53";
+      rev = "1f98c2e92810f02afcd7ce981beac5142e34ea87";
+      sha256 = "1g9f1w9xghzmy9npf208ywb67wx6ryz6vfl2k0shwk7iym0fxpyp";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -2640,12 +2640,12 @@ let
 
   oceanic-next = buildVimPluginFrom2Nix {
     pname = "oceanic-next";
-    version = "2019-04-10";
+    version = "2020-11-08";
     src = fetchFromGitHub {
       owner = "mhartington";
       repo = "oceanic-next";
-      rev = "08158eec24cd154afd1623686aeb336fad580be7";
-      sha256 = "1s2h9mnhl54ww7zpdllwlxz93d5i7l7rx3s9mr8w6sv8azcak3v8";
+      rev = "9fa644b0f545cad22ee28ee3dd9a719a9a6bf75b";
+      sha256 = "0xxc6im5rvd2c14i0jpnsgjhcsc7l5zs30razc4gqvv753g663qs";
     };
     meta.homepage = "https://github.com/mhartington/oceanic-next/";
   };
@@ -2676,12 +2676,12 @@ let
 
   open-browser-github-vim = buildVimPluginFrom2Nix {
     pname = "open-browser-github-vim";
-    version = "2020-07-08";
+    version = "2020-11-11";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "open-browser-github.vim";
-      rev = "7c31cd0093fdf89d53fa02b210c82b1326b00a8c";
-      sha256 = "1r3b16b7siyxj3n44z899spma5vamc5g76p947h95m9d0rc6sfnk";
+      rev = "ee132b0f8ea180f996a2e34c5e977d23c615b47a";
+      sha256 = "17da42h05840vv8n4sj0im4rc18g2drb9sh0grjlpnz86mc8fqj0";
     };
     meta.homepage = "https://github.com/tyru/open-browser-github.vim/";
   };
@@ -2712,12 +2712,12 @@ let
 
   papercolor-theme = buildVimPluginFrom2Nix {
     pname = "papercolor-theme";
-    version = "2020-06-16";
+    version = "2020-11-09";
     src = fetchFromGitHub {
       owner = "NLKNguyen";
       repo = "papercolor-theme";
-      rev = "c657f5c2d5964bbae633f8a42c16f8316f6d6733";
-      sha256 = "1vv1gd64isrgyxc4fyp5mzlhffwkzdc8agnv0aka4v7qdaca45ni";
+      rev = "0428fc228afc50085326bfd43746b7734e42c428";
+      sha256 = "092zp0f5jvfwh2q8asxdnkrhz9djgw0lqzg70g38xk606fxy16a9";
     };
     meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/";
   };
@@ -3132,12 +3132,12 @@ let
 
   skim-vim = buildVimPluginFrom2Nix {
     pname = "skim-vim";
-    version = "2020-10-20";
+    version = "2020-11-11";
     src = fetchFromGitHub {
       owner = "lotabout";
       repo = "skim.vim";
-      rev = "2908249af6b759c79c7834862bd42af3a8bc6d4e";
-      sha256 = "1819niha13yzhk7sya1mx8qigjwacd4mdp6s2hkk03l1s6x84dj7";
+      rev = "83faea7f2581005d4adc9256ec76e0fe3f8a15e6";
+      sha256 = "0wppb2wgpk085cwh9kmqzv6f30j2hb3brqx2ik371gkrcfbpf4ly";
     };
     meta.homepage = "https://github.com/lotabout/skim.vim/";
   };
@@ -3313,12 +3313,12 @@ let
 
   syntastic = buildVimPluginFrom2Nix {
     pname = "syntastic";
-    version = "2020-11-04";
+    version = "2020-11-06";
     src = fetchFromGitHub {
       owner = "vim-syntastic";
       repo = "syntastic";
-      rev = "5788b1c6df63bc31ae93d6c1a3523e0602c60901";
-      sha256 = "1a6mr5ffwx7f7yclp9i2hvkq2lf3zm1j4761vqmc8nq73w4sbd2z";
+      rev = "63741646a9e87bbe105674747555aded6f52c490";
+      sha256 = "0x1rn76zjig4kdbs719fcpc22mbh2jz93ni8zpzpkn8r186f05s5";
     };
     meta.homepage = "https://github.com/vim-syntastic/syntastic/";
   };
@@ -3361,12 +3361,12 @@ let
 
   tagbar = buildVimPluginFrom2Nix {
     pname = "tagbar";
-    version = "2020-11-03";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "tagbar";
-      rev = "53c8e196764ec74353c0e9c758daa108b9fe4c38";
-      sha256 = "07ayc60w86w4mnm49jh4h89pwz5ry2a5vagy8xsv5hy1r6wqirpy";
+      rev = "68a77323cb707e227d16302d39d35949dbb0f85a";
+      sha256 = "1038p1w7pfwg6ydqxbahb9plab8d40mdqmnbm6z36y7yrssmjhsj";
     };
     meta.homepage = "https://github.com/preservim/tagbar/";
   };
@@ -3409,12 +3409,12 @@ let
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2020-11-03";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "telescope.nvim";
-      rev = "1f3110bf54877b975956e42911e05d517d8f4993";
-      sha256 = "1172fj2vzf9p86pvl9b297xp9qmikwmcj7j3qv3dgk3rdh4f66mg";
+      rev = "3e58e1ab7d4c80fec7d9b02e3f27503bd72f21ff";
+      sha256 = "0ilxdffipa7mcaam1x21h0k578q2mq76a4ajnmmmis7066jk39z4";
     };
     meta.homepage = "https://github.com/nvim-lua/telescope.nvim/";
   };
@@ -3554,24 +3554,24 @@ let
 
   ultisnips = buildVimPluginFrom2Nix {
     pname = "ultisnips";
-    version = "2020-10-21";
+    version = "2020-11-09";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
-      rev = "e6478871c04bb75f3c6cb9b90e171fffbf9c8ff3";
-      sha256 = "17f1q0hv89l5mdiv3xrk1l3lnlxj6gbg8pnzcpx5dk4sd14xivd3";
+      rev = "b837416c1ffe39b168baee35c0938739e96211c5";
+      sha256 = "1c1ahpdw0d18x5g5s5mpv7mcf0igrpla33k2khmk4q739ywb21qc";
     };
     meta.homepage = "https://github.com/SirVer/ultisnips/";
   };
 
   undotree = buildVimPluginFrom2Nix {
     pname = "undotree";
-    version = "2019-03-13";
+    version = "2020-11-10";
     src = fetchFromGitHub {
       owner = "mbbill";
       repo = "undotree";
-      rev = "be23eacb2a63380bd79e207a738c728214ecc9d3";
-      sha256 = "00zyvff32zp7pyjzkq8da9xhr378mlpi8gj717yfr9wbwwarwfd7";
+      rev = "9ceb50062135dd30de3da000d5fd46125f51887d";
+      sha256 = "1vwjggf3csbysavk3yyfzjklyq8xwfvk17rprmj660h2whgjjzvg";
     };
     meta.homepage = "https://github.com/mbbill/undotree/";
   };
@@ -3902,12 +3902,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2020-11-05";
+    version = "2020-11-10";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "d64e5f8dd7ac0b094f0caacc63453a0418b37fdb";
-      sha256 = "0kspf0m00slrscld6qg5rj3i4lr9pwv25xvqqldyk8h884b182g7";
+      rev = "731bdb11d2f57365e02bdb8adaeb59a8b93db27d";
+      sha256 = "1b6l1460319rnl4p3zzpz3ngc114bfyqicbdyq6pk4sy5hbn15j1";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
   };
@@ -3926,12 +3926,12 @@ let
 
   vim-airline-themes = buildVimPluginFrom2Nix {
     pname = "vim-airline-themes";
-    version = "2020-11-05";
+    version = "2020-11-08";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
-      rev = "3dafdfc0424716bae21f5340314f7d90a9ddf4f2";
-      sha256 = "1j18anw9202cplfzgmsy8y6pl8zrxwnrhyn9djy580slakrk1s8k";
+      rev = "cd6f16978d5af4b9fb861be9d728732d72789df3";
+      sha256 = "0ifb43q053grj2fvjjw52xsr79xnpc00k9302xnx1x4li9s5l64d";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
   };
@@ -4046,12 +4046,12 @@ let
 
   vim-bsv = buildVimPluginFrom2Nix {
     pname = "vim-bsv";
-    version = "2019-07-11";
+    version = "2020-11-08";
     src = fetchFromGitHub {
       owner = "mtikekar";
       repo = "vim-bsv";
-      rev = "dc775cb06891dd0923b5e2a882f5dcee6451540a";
-      sha256 = "18wsbvypi62nwgcazw2m47d6k8ymlv1zwabs2gwl931n710ldkfc";
+      rev = "b03893b98f5b772297e48671a9c5f92f1c7d10eb";
+      sha256 = "1cd0jmxmb30c50a0ssa96a34qm2r3vasnn0x6ah9azx75k4anrcx";
     };
     meta.homepage = "https://github.com/mtikekar/vim-bsv/";
   };
@@ -4130,12 +4130,12 @@ let
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2020-11-04";
+    version = "2020-11-07";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "992c2d43318ba096eedac0592a0c2d6f90fed236";
-      sha256 = "1nl29l1zb9prsm5iz0psiav846fv2ybwxd06rmf2mcigg96502vr";
+      rev = "45a91bf706e9dcf85172c126bbac8964e209a4ae";
+      sha256 = "1b7sb9dqdy48w28pjhh9vsr20w0gd5lillrlynskywab9x99ifkx";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -4178,12 +4178,12 @@ let
 
   vim-codefmt = buildVimPluginFrom2Nix {
     pname = "vim-codefmt";
-    version = "2020-09-09";
+    version = "2020-11-12";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
-      rev = "9346c381c94c0f9312c6e7970a4ab15419935464";
-      sha256 = "03nymldw5ifc57z5vr0xaz00vml6v854zp2fnzm4q9v9n295kh66";
+      rev = "d418de02d5a6225883b08466414e33e80a509685";
+      sha256 = "1lsl2xcsyjj7ri32p89d425bq1lhpkbfac72hnwc7k6xwq87ibgm";
     };
     meta.homepage = "https://github.com/google/vim-codefmt/";
   };
@@ -4586,12 +4586,12 @@ let
 
   vim-exchange = buildVimPluginFrom2Nix {
     pname = "vim-exchange";
-    version = "2020-06-24";
+    version = "2020-11-09";
     src = fetchFromGitHub {
       owner = "tommcdo";
       repo = "vim-exchange";
-      rev = "0e95600517aad244d947b955a2e34ec30bdd09ff";
-      sha256 = "1dh8xc5szm5rrv7xp299hcfhgp1155k5kfipzz6q2r69blhwyl1d";
+      rev = "8bb662407f8576fa645fb6908b63b6473e236580";
+      sha256 = "08q39xg1s90gkp24v374kbvsw6lzin61b1mkp4ibkl76h2lp0r3g";
     };
     meta.homepage = "https://github.com/tommcdo/vim-exchange/";
   };
@@ -4694,12 +4694,12 @@ let
 
   vim-floaterm = buildVimPluginFrom2Nix {
     pname = "vim-floaterm";
-    version = "2020-10-19";
+    version = "2020-11-10";
     src = fetchFromGitHub {
       owner = "voldikss";
       repo = "vim-floaterm";
-      rev = "f6654e2f9c29bd85039a11f305acd4e5222b03f8";
-      sha256 = "07bh7hkajfg5gchmi0psy0anaz2rdvhii3p09xml9dfkvrapzdrx";
+      rev = "3c34e84282f542be7dc75c3d2154c1f25df4a47e";
+      sha256 = "1c48s8655fg1bddnzxpqfl8cxdk3dsc4a45ixsc7s910bk8rlxn6";
     };
     meta.homepage = "https://github.com/voldikss/vim-floaterm/";
   };
@@ -4802,12 +4802,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2020-10-30";
+    version = "2020-11-05";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "696a6ed389e5b54c8bf480f44ee4e8fc59e6f903";
-      sha256 = "1x38qi9kzhvhfyrzhfbzj8xvgmi02prqg6zcvpnwdmxcs5asgj39";
+      rev = "987a33355ef424161fdbc4e5d625b5b5aed9704c";
+      sha256 = "1qg5ri74wipf0krnwgii2jqdzy36hpwnx8nvgf7vkw8a3l90rswj";
     };
     meta.homepage = "https://github.com/airblade/vim-gitgutter/";
   };
@@ -4838,12 +4838,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-11-01";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "35ea9acf5fc409d1eed341333789f18c2d135c66";
-      sha256 = "0n6yj1ql2c2kq9y407zr9d6pkpwp7jjzssbd0fyl68cb9rxzg3j8";
+      rev = "e3d6ada0530190300a5227bb0b417ee71b994cc2";
+      sha256 = "1kyyidicghhgnsc9x2gynnxh4x6yzjdg5d633sb74xkkhgvxx9yn";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -4862,12 +4862,12 @@ let
 
   vim-graphql = buildVimPluginFrom2Nix {
     pname = "vim-graphql";
-    version = "2020-10-04";
+    version = "2020-11-12";
     src = fetchFromGitHub {
       owner = "jparise";
       repo = "vim-graphql";
-      rev = "51c5b178cce145c3aaa22fbc37fd5d64065baebc";
-      sha256 = "0kgnyc94fd5i7456vdnad58yn1qcanfp0lg7xdf5dbs1nbarzywg";
+      rev = "c2fe34c8c950aceb56b9b4c69e9e95922fa7a78e";
+      sha256 = "1q7v0qyd1my9hgxyhz921fr4c6x9ipfgqlm41546iz097vnv715p";
     };
     meta.homepage = "https://github.com/jparise/vim-graphql/";
   };
@@ -5271,12 +5271,12 @@ let
 
   vim-jsx-pretty = buildVimPluginFrom2Nix {
     pname = "vim-jsx-pretty";
-    version = "2020-09-29";
+    version = "2020-11-07";
     src = fetchFromGitHub {
       owner = "MaxMEllon";
       repo = "vim-jsx-pretty";
-      rev = "3a24dca8f8cc9b88efca3faf446db41f5b7da121";
-      sha256 = "0gn9rlwndq0awv51gxvd3gsxlh5sb76cvc60bh0lsh4f4lhmyy3r";
+      rev = "8059c9269ab62ffc4ccca587e2a2a894806fa5e6";
+      sha256 = "04jmmyz79mrq7mpl9kqrc8v28gn50jl93lzkyyhzp7dyhixgbgkm";
     };
     meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/";
   };
@@ -5439,12 +5439,12 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2020-10-17";
+    version = "2020-11-08";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "9230c11dfb630ef4a9dadf491f1e1c1b2d86ace8";
-      sha256 = "13w3fjwy3iy6j48f16g3bg956dd0fl9ynywd1nqvk4ba305g6crx";
+      rev = "c8f04821a9b92fd5675ed9ad54c59bec9af37eaf";
+      sha256 = "1m6cr2c3srnddxmmly8icnx1jyzh5cjxf9sffp3f871cgq954jy7";
     };
     meta.homepage = "https://github.com/natebosch/vim-lsc/";
   };
@@ -5643,12 +5643,12 @@ let
 
   vim-mundo = buildVimPluginFrom2Nix {
     pname = "vim-mundo";
-    version = "2020-07-20";
+    version = "2020-11-08";
     src = fetchFromGitHub {
       owner = "simnalamburt";
       repo = "vim-mundo";
-      rev = "f6b24082b1d22932cb834673c37aa936b6f4f6da";
-      sha256 = "1xr7g5wxfdd2rzdr94p2sasfm6zyha2rhjr3rx5mnpbcik7l3j61";
+      rev = "33a91cc55ebc7a55b8846c46f0ab50ec0d81613f";
+      sha256 = "18qbmnwlwf9hmak73zam44daf6c50hi72b9g8ra7v1l5psgi39z7";
     };
     meta.homepage = "https://github.com/simnalamburt/vim-mundo/";
   };
@@ -5871,12 +5871,12 @@ let
 
   vim-pandoc = buildVimPluginFrom2Nix {
     pname = "vim-pandoc";
-    version = "2020-07-30";
+    version = "2020-11-07";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
-      rev = "049ece9fa8f21afaa62215865afac22daa6fd30f";
-      sha256 = "0wjrbp06ffh9ficd22lcijrc99n72b7gbg5lqpms9r0442fb88kq";
+      rev = "0aeed75603a55887c2b492d1fe19ac8065dae671";
+      sha256 = "13xjpkq9lbb04igwif23zmb3395awk48kdyfshsga2gbv5h1i9fn";
     };
     meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";
   };
@@ -6051,12 +6051,12 @@ let
 
   vim-projectionist = buildVimPluginFrom2Nix {
     pname = "vim-projectionist";
-    version = "2020-05-05";
+    version = "2020-10-31";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
-      rev = "1d95458273a8ecdb678e65db918c045f9bb7e220";
-      sha256 = "1h5gb29rs64cfr55g12s1f0w0cqzqs2nhfw8qfbfch5jbh21p10p";
+      rev = "0c6967d3a8c3bd3d3b42013531c3f12c843aff80";
+      sha256 = "1s6yxnlwxlblj5m9gxlc8699g2a1d7cbjacp4fk4fa9mrkga7bv8";
     };
     meta.homepage = "https://github.com/tpope/vim-projectionist/";
   };
@@ -6495,12 +6495,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2020-11-02";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "0f3d4d187c842419fe6e131fe20f5f3336418a62";
-      sha256 = "09phzarfakz5mv3jshsab60iiq8byv6xggb0qiasafvxfrcx8c2s";
+      rev = "3e30104f106a2aaf4dc5f7072aba7d97fdf8bb2d";
+      sha256 = "1pxh5s9r20wbawyrcalkb6nr21xsmsc00wdaf2ryz5vhpakai72w";
     };
     meta.homepage = "https://github.com/honza/vim-snippets/";
   };
@@ -6844,12 +6844,12 @@ let
 
   vim-tmux-navigator = buildVimPluginFrom2Nix {
     pname = "vim-tmux-navigator";
-    version = "2020-09-29";
+    version = "2020-11-12";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-tmux-navigator";
-      rev = "6c0b5d2faa49f2059331a4004b34a916c96abcb3";
-      sha256 = "11kq87drp0ca5rj9j34rpajbzv79wxm3k2cf249dxvi0chcl41ma";
+      rev = "6a1e58c3ca3bc7acca36c90521b3dfae83b2a602";
+      sha256 = "17219h69vd6b994qrywg1rpx80y1rmycbfsmf9wb6c693sx721sn";
     };
     meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/";
   };
@@ -6880,12 +6880,12 @@ let
 
   vim-trailing-whitespace = buildVimPluginFrom2Nix {
     pname = "vim-trailing-whitespace";
-    version = "2020-06-29";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "bronson";
       repo = "vim-trailing-whitespace";
-      rev = "610ca1a97c8dc85cdeb38635e5a4703317c4b94d";
-      sha256 = "1bh15yw2aysvpn2ndnc0s6jzc0y93x6q1blc5pph67rdix5bm7gy";
+      rev = "b5289251ae8f93473febdcf2fd10e39a8287d9fd";
+      sha256 = "083zlwm3a85cclb28ryas4rpd3b4ph8n7chb1nwvcc22g447pfsl";
     };
     meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/";
   };
@@ -7000,24 +7000,24 @@ let
 
   vim-vsnip = buildVimPluginFrom2Nix {
     pname = "vim-vsnip";
-    version = "2020-10-27";
+    version = "2020-11-08";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "vim-vsnip";
-      rev = "562cabf644314c97224a025ad2594a47966e6207";
-      sha256 = "1i1b8la3w9x8lay63kqx958k4csxnqmdw9bfmhyh2vf1p0cdqv6l";
+      rev = "5fedeec956359d05496ad92fb6fd02231aeb4c76";
+      sha256 = "18k44h3fvg8vm8dwxy78jpl1zv8sbr0kiviyxm03hy3n6sb2czlg";
     };
     meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
   };
 
   vim-vsnip-integ = buildVimPluginFrom2Nix {
     pname = "vim-vsnip-integ";
-    version = "2020-10-25";
+    version = "2020-11-09";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "vim-vsnip-integ";
-      rev = "383573b9b07fd37caf98247dfdbb1d4711eecee9";
-      sha256 = "1kavjyr53cbg630snri2x94f7h80p2vl6vlskqfwi3djfdvn68x6";
+      rev = "8f171eac11eb7668a33991953f9ae5af9556cc59";
+      sha256 = "0a8f1nblgwdv7z0ycxlx5arx68dgg5qzvwwgws18lpf201qp07sx";
     };
     meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
   };
@@ -7264,12 +7264,12 @@ let
 
   vimspector = buildVimPluginFrom2Nix {
     pname = "vimspector";
-    version = "2020-10-23";
+    version = "2020-11-09";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "7b048367f7d4921e4eeea1bb82e6f368b418d89a";
-      sha256 = "0n1kqiki5gag7nd5c5gmnv6czv90kzsfndbb92n3wzvwxhpf1ff6";
+      rev = "30741f88139931c5ee83ef906cf16ee1187bf8f3";
+      sha256 = "01b3q4zmys5xnikwl8jg28057d5war0hk1wzizw3rly3kjmmkx8y";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -7277,12 +7277,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-10-29";
+    version = "2020-11-12";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "982185bb454942a5c04d41b647ab58fceb4e7683";
-      sha256 = "16vy97k6lgl62pibhdfdigfv2gp16hvzlfywv1i6wx46hycb3swq";
+      rev = "01762d18f86422ddc85361c86b849f9707f23ef3";
+      sha256 = "0ncgfd23x8g5n568amzd9x7bvvm5mgjs7qqmr9qn7hjpprad5icq";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
@@ -7325,12 +7325,12 @@ let
 
   vista-vim = buildVimPluginFrom2Nix {
     pname = "vista-vim";
-    version = "2020-10-10";
+    version = "2020-11-10";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vista.vim";
-      rev = "27889ff58d4340167bb8dd4abbe9ff4a8869da8f";
-      sha256 = "1asc8fqyv6rfmdd0g5n78mzzssn7rcanzy2d30gddgfa3gr65yms";
+      rev = "bc3b2a74efb253be4b79cc7b70b192e1360f26c1";
+      sha256 = "0qfdykp7sf4p2h8gfx40qmnfj94p4hksngqqkzrhzi9z3i6fqk2a";
     };
     meta.homepage = "https://github.com/liuchengxu/vista.vim/";
   };
@@ -7349,12 +7349,12 @@ let
 
   wal-vim = buildVimPluginFrom2Nix {
     pname = "wal-vim";
-    version = "2020-03-06";
+    version = "2020-11-08";
     src = fetchFromGitHub {
       owner = "dylanaraps";
       repo = "wal.vim";
-      rev = "10f228ce1e7947f62be412f916229131b7710239";
-      sha256 = "0aiwsrcqnazam56cvwmck4bf7w543cr219bkmq0ngqzna72h9735";
+      rev = "c72ba0d18946f29aab9c95eb6975d321c68b3681";
+      sha256 = "03hrn0d6mqjlrixwx5l270jfgwgkzr6xg00h39i49j7k3f1ql078";
     };
     meta.homepage = "https://github.com/dylanaraps/wal.vim/";
   };
@@ -7445,12 +7445,12 @@ let
 
   yats-vim = buildVimPluginFrom2Nix {
     pname = "yats-vim";
-    version = "2020-11-01";
+    version = "2020-11-09";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "fc97ad973a2bbf932dffb74c5560e97f60d21ce7";
-      sha256 = "07gx88vapcb579nvmkbmps16spvd1y8kvmi28955lw31rxi1n7b3";
+      rev = "d4f95eebcf8b765bf1198b57045e45f976ab0c19";
+      sha256 = "04blzfgklh9x0xb1qa9bndhha8cnks83v0xn2pr8wzi2i0r3r4mx";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";
@@ -7458,12 +7458,12 @@ let
 
   YouCompleteMe = buildVimPluginFrom2Nix {
     pname = "YouCompleteMe";
-    version = "2020-10-30";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "ycm-core";
       repo = "YouCompleteMe";
-      rev = "fa8c985dee864d33e48e3b3e803b541bdc433ffa";
-      sha256 = "1cc9wyp3dbh4fvic9zvh2bxqw0nrb3zwzlfj106cs2qbrpkiqszd";
+      rev = "604a2a02e070bbd46f58c79a46f4df048e26a97c";
+      sha256 = "0m9wfpm855cp9zzg0nsd6bb7ijmgj9vhfhm7x5nhmqjqjfyl8282";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";

From f53113e56c346d0c83de32e9440129d17587f37f Mon Sep 17 00:00:00 2001
From: Will Badart <will@willbadart.com>
Date: Fri, 13 Nov 2020 11:55:42 -0500
Subject: [PATCH 2402/3942] vimPlugins: resolve github repository redirects

---
 pkgs/misc/vim-plugins/generated.nix    | 4 ++--
 pkgs/misc/vim-plugins/vim-plugin-names | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 82e23f3fc01c..b5cab43d31bd 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3411,12 +3411,12 @@ let
     pname = "telescope-nvim";
     version = "2020-11-13";
     src = fetchFromGitHub {
-      owner = "nvim-lua";
+      owner = "nvim-telescope";
       repo = "telescope.nvim";
       rev = "3e58e1ab7d4c80fec7d9b02e3f27503bd72f21ff";
       sha256 = "0ilxdffipa7mcaam1x21h0k578q2mq76a4ajnmmmis7066jk39z4";
     };
-    meta.homepage = "https://github.com/nvim-lua/telescope.nvim/";
+    meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
 
   tender-vim = buildVimPluginFrom2Nix {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 2cc00b630f5b..3ddd3f5c132d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -373,7 +373,7 @@ nvie/vim-flake8
 nvim-lua/completion-nvim
 nvim-lua/diagnostic-nvim
 nvim-lua/lsp_extensions.nvim
-nvim-lua/telescope.nvim
+nvim-telescope/telescope.nvim
 nvim-treesitter/completion-treesitter
 nvim-treesitter/nvim-treesitter
 ocaml/vim-ocaml

From d4da5f9d3daab3db3ae37287e35bb19223b0ecee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 18:09:23 +0000
Subject: [PATCH 2403/3942] jetty: 9.4.31.v20200723 -> 9.4.34.v20201102

---
 pkgs/servers/http/jetty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 20370fd37c70..b8374d62ddfc 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jetty";
-  version = "9.4.31.v20200723";
+  version = "9.4.34.v20201102";
   src = fetchurl {
     url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
     name = "jetty-distribution-${version}.tar.gz";
-    sha256 = "1j1dhlrlj7xnijp55c1hd9r47m6bq37vpjkaf8f9fg7q9m2z9x6x";
+    sha256 = "0c5zsnzcg2bz6z1s6hdzwzn813cgs26h1hwjjfhh1msfzyig30ma";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From 82d11130137924a9207aacdf859d0277d366fae7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 18:25:51 +0000
Subject: [PATCH 2404/3942] igv: 2.8.11 -> 2.8.12

---
 pkgs/applications/science/biology/igv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index 0b990dc541b5..86a16c4f0474 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "igv";
-  version = "2.8.11";
+  version = "2.8.12";
   src = fetchzip {
     url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip";
-    sha256 = "1hiwnrrh42qzc7kdc7bypgcgn488pz8g462xzchbhgx7jjdbbwhm";
+    sha256 = "0zxmk417j9s5nms0np1fsip7r0jhwkj1d1x424ljr9krcb2zwcyq";
   };
 
   installPhase = ''

From 55be94fd284917dd7465f246c15e9dc4f3395f3d Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Fri, 13 Nov 2020 18:51:06 +0000
Subject: [PATCH 2405/3942] open-policy-agent: move to buildGoModule

Move from buildGoPackage to buildGoModule since opa is a go module.
---
 .../tools/open-policy-agent/default.nix           | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix
index d6dbbcc493db..7be36021b42a 100644
--- a/pkgs/development/tools/open-policy-agent/default.nix
+++ b/pkgs/development/tools/open-policy-agent/default.nix
@@ -1,10 +1,9 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "open-policy-agent";
   version = "0.24.0";
 
-  goPackagePath = "github.com/open-policy-agent/opa";
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
@@ -12,12 +11,14 @@ buildGoPackage rec {
     sha256 = "0fv2rq8a01hapcpgfqp71v113iyyzs5w1sam14h9clyr1vqrbcf2";
   };
 
+  vendorSha256 = null;
+
   subPackages = [ "." ];
 
-  buildFlagsArray = ''
-    -ldflags=
-      -X ${goPackagePath}/version.Version=${version}
-  '';
+  buildFlagsArray = [
+    "-ldflags="
+    "-X github.com/open-policy-agent/opa/version.Version=${version}"
+  ];
 
   meta = with lib; {
     description = "General-purpose policy engine";

From ea12d880e0fd9b2f08f4f974c8af849bfd59a230 Mon Sep 17 00:00:00 2001
From: Jonas Meurer <jmpunkt@outlook.com>
Date: Fri, 13 Nov 2020 19:49:40 +0100
Subject: [PATCH 2406/3942] libreoffice-qt: wrap application

Libreoffice-qt is not wrapped, thus does not launch. Notice that
wrapQtQAppsHook is used manually since all executables are shell
scripts which are not wrapped automatically.
---
 pkgs/applications/office/libreoffice/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 2f961f43da0a..1023af9234c9 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -17,6 +17,7 @@
 , withHelp ? true
 , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null
 , ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null
+, wrapQtAppsHook ? null
 , variant ? "fresh"
 } @ args:
 
@@ -303,8 +304,15 @@ in (mkDrv rec {
 
     mkdir -p $dev
     cp -r include $dev
+  '' + lib.optionalString kdeIntegration ''
+      for prog in $out/bin/*
+      do
+        wrapQtApp $prog
+      done
   '';
 
+  dontWrapQtApps = true;
+
   configureFlags = [
     (if withHelp then "" else "--without-help")
     "--with-boost=${boost.dev}"
@@ -382,7 +390,8 @@ in (mkDrv rec {
 
   nativeBuildInputs = [
     gdb fontforge autoconf automake bison pkgconfig libtool
-  ] ++ lib.optional (!kdeIntegration) wrapGAppsHook;
+  ] ++ lib.optional (!kdeIntegration) wrapGAppsHook
+    ++ lib.optional kdeIntegration wrapQtAppsHook;
 
   buildInputs = with xorg;
     [ ant ArchiveZip boost cairo clucene_core

From 4c4742cb583fcb98b582c1c1159bc98b30214486 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Fri, 13 Nov 2020 18:56:15 +0000
Subject: [PATCH 2407/3942] open-policy-agent: add a longDescription

Added a long description of OPA
---
 pkgs/development/tools/open-policy-agent/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix
index 7be36021b42a..8706a308011a 100644
--- a/pkgs/development/tools/open-policy-agent/default.nix
+++ b/pkgs/development/tools/open-policy-agent/default.nix
@@ -22,6 +22,12 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "General-purpose policy engine";
+    longDescription = ''
+      The Open Policy Agent (OPA, pronounced "oh-pa") is an open source, general-purpose policy engine that unifies
+      policy enforcement across the stack. OPA provides a high-level declarative language that let’s you specify policy
+      as code and simple APIs to offload policy decision-making from your software. You can use OPA to enforce policies
+      in microservices, Kubernetes, CI/CD pipelines, API gateways, and more.
+    '';
     homepage = "https://www.openpolicyagent.org";
     license = licenses.asl20;
     maintainers = with maintainers; [ lewo ];

From c62f9475fa8ae63e1e2d67bb187a0dd032438e3d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Nov 2020 09:48:56 -0800
Subject: [PATCH 2408/3942] zathura: 0.4.5 -> 0.4.7

---
 pkgs/applications/misc/zathura/core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 58b1a81c90fc..2fc158daf62f 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "zathura";
-  version = "0.4.5";
+  version = "0.4.7";
 
   src = fetchurl {
     url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
-    sha256 = "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c";
+    sha256 = "1rx1fk9s556fk59lmqgvhwrmv71ashh89bx9adjq46wq5gzdn4p0";
   };
 
   outputs = [ "bin" "man" "dev" "out" ];

From 6e9b71f0e197a8e15a7b70eab6060147fa4ecaca Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Nov 2020 10:19:37 -0800
Subject: [PATCH 2409/3942] zathura-pdf-mupdf: 0.3.5 -> 0.3.6, fix linking

---
 .../misc/zathura/pdf-mupdf/default.nix        | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index 32a2ec420110..97f36f828472 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -1,29 +1,45 @@
 { stdenv, lib, meson, ninja, fetchurl, fetchpatch
-, pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }:
+, cairo
+, girara
+, gtk-mac-integration
+, gumbo
+, jbig2dec
+, libjpeg
+, mupdf
+, openjpeg_2
+, pkgconfig
+, zathura_core
+}:
 
 stdenv.mkDerivation rec {
-  version = "0.3.5";
+  version = "0.3.6";
   pname = "zathura-pdf-mupdf";
 
   src = fetchurl {
     url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
-    sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq";
+    sha256 = "1r3v37k9fl2rxipvacgxr36llywvy7n20a25h3ajlyk70697sa66";
   };
 
-  patches = [
-    # compatibility with MuPDF 1.17
-    (fetchpatch {
-      url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/commit/c7f341addb76d5e6fd8c24c666d8fe97c451a4cb.patch";
-      sha256 = "12rikx2j7dpngfma9x4i504w58a8xx3rc0gmyz183v19hn54c075";
-    })
-  ];
-
   nativeBuildInputs = [ meson ninja pkgconfig ];
 
   buildInputs = [
-    zathura_core girara mupdf cairo
+    cairo
+    girara
+    gumbo
+    jbig2dec
+    libjpeg
+    mupdf
+    openjpeg_2
+    zathura_core
   ] ++ lib.optional stdenv.isDarwin gtk-mac-integration;
 
+  mesonFlags = [
+    "-Dlink-external=true"
+  ];
+
+  # avoid: undefined symbol: gumbo_destroy_output
+  NIX_LDFLAGS = [ "-lgumbo" ];
+
   PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura";
 
   meta = with lib; {

From 73ca6f3e306af4cdf925cf130e45fd1b3a99b8ff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 19:03:00 +0000
Subject: [PATCH 2410/3942] intel-media-sdk: 20.3.1 -> 20.4.1

---
 pkgs/development/libraries/intel-media-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix
index e59015832314..71e6d3d700ab 100644
--- a/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-media-sdk";
-  version = "20.3.1";
+  version = "20.4.1";
 
   src = fetchFromGitHub {
     owner = "Intel-Media-SDK";
     repo = "MediaSDK";
     rev = "intel-mediasdk-${version}";
-    sha256 = "13b698zp9b228x81yly0qx3zvj821niz3yad74b229i3z7rf8wzd";
+    sha256 = "0qnq43qjcmzkn6v2aymzi3kycndk9xw6m5f5g5sz5x53nz556bp0";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 3bf200de7d9ad1396b85d06e727824636e6cdef3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Nov 2020 20:01:01 +0100
Subject: [PATCH 2411/3942] hackage2nix: disable broken builds to fix
 evaluation errors on Hydra

---
 .../haskell-modules/configuration-hackage2nix.yaml    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2c7af6097cc6..c232eb7162ad 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3324,6 +3324,7 @@ broken-packages:
   - bdd
   - bdo
   - beam
+  - beam-automigrate
   - beam-core
   - beam-migrate
   - beam-mysql
@@ -3932,7 +3933,6 @@ broken-packages:
   - cmt
   - cmv
   - cnc-spec-compiler
-  - co-log
   - co-log-polysemy-formatting
   - co-log-sys
   - Coadjute
@@ -3990,7 +3990,6 @@ broken-packages:
   - commsec
   - commsec-keyexchange
   - ComonadSheet
-  - compact
   - compact-map
   - compact-mutable
   - compact-mutable-vector
@@ -7287,6 +7286,7 @@ broken-packages:
   - language-lua-qq
   - language-lua2
   - language-mixal
+  - language-Modula2
   - language-ninja
   - language-oberon
   - language-objc
@@ -8774,14 +8774,14 @@ broken-packages:
   - polysemy-http
   - polysemy-kvstore-jsonfile
   - polysemy-methodology
-  - polysemy-optics
+  - polysemy-methodology-composite
   - polysemy-path
   - polysemy-RandomFu
   - polysemy-resume
   - polysemy-test
   - polysemy-time
+  - polysemy-vinyl
   - polysemy-webserver
-  - polysemy-zoo
   - polyseq
   - polytypeable
   - polytypeable-utils
@@ -10777,7 +10777,6 @@ broken-packages:
   - typelevel-tensor
   - TypeNat
   - typeparams
-  - typerep-map
   - types-compat
   - typesafe-precure
   - typescript-docs
@@ -11517,4 +11516,4 @@ broken-packages:
   - zuramaru
   - Zwaluw
   - zxcvbn-dvorak
-  - zxcvbn-hs
+  - zxcvbn-h

From 1f021c26570f347260a6001e168780fc890d8498 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 7 Nov 2020 02:30:26 +0100
Subject: [PATCH 2412/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-27-g11a103b from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/cb01aa6d8923bf74fadca03373572c16ba77013c.
---
 .../haskell-modules/hackage-packages.nix      | 1353 +++++++++++++----
 1 file changed, 1041 insertions(+), 312 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6ad8267d4483..8262fdb54c68 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -13180,6 +13180,8 @@ self: {
        pname = "MIP";
        version = "0.1.0.0";
        sha256 = "0790jcwqjd33i8sqhzxarda8ihhv5iapj0apjmlqjppbipwa6awa";
+       revision = "1";
+       editedCabalFile = "16nxbkmkyb9n0jbyrmpazg40gf6aadnm1rk4sqwxkcx7qa99wrnd";
        libraryHaskellDepends = [
          base bytestring bytestring-encoding case-insensitive containers
          data-default-class extended-reals filepath intern lattices
@@ -20767,8 +20769,8 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "VulkanMemoryAllocator";
-       version = "0.3.7.1";
-       sha256 = "18al9vr5zy8smn090dd7fwnm4pqcsxld97azrxni7xsqdb22kja8";
+       version = "0.3.8";
+       sha256 = "1fm2y3v9dcd2yaca212vk2awj90nzamgbsxf39d3s8h3yhjf95ll";
        libraryHaskellDepends = [
          base bytestring transformers vector vulkan
        ];
@@ -24458,17 +24460,16 @@ self: {
      }) {};
 
   "aeson-commit" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, containers, hspec, mtl
-     , some, tasty, tasty-hspec, text, transformers
+    ({ mkDerivation, aeson, aeson-qq, base, mtl, tasty, tasty-hspec
+     , text
      }:
      mkDerivation {
        pname = "aeson-commit";
-       version = "1.2";
-       sha256 = "09h0gjq9kg1krfsxsy1x697ndi6rajsyqk6j4kkcrq48ynq9vfxr";
+       version = "1.3";
+       sha256 = "1w185p6s91pxd0kmgxxv62v81q7f77q4bgs8iv02xv34wp1jm9jv";
        libraryHaskellDepends = [ aeson base mtl text ];
        testHaskellDepends = [
-         aeson aeson-qq base containers hspec mtl some tasty tasty-hspec
-         text transformers
+         aeson aeson-qq base tasty tasty-hspec text
        ];
        description = "Parse Aeson data with commitment";
        license = stdenv.lib.licenses.bsd3;
@@ -24780,8 +24781,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-iproute";
-       version = "0.2";
-       sha256 = "13r6vyyw1pbk5sz32ari5kig23vsg57a5pir037adi7xicrm6kgf";
+       version = "0.2.1";
+       sha256 = "1130mr5fqwi4d74xg6nkvpqycc0vvd6rsiahm1pdhbrx3wvra8p2";
        libraryHaskellDepends = [
          aeson base iproute text unordered-containers
        ];
@@ -30126,6 +30127,8 @@ self: {
        pname = "ansi-pretty";
        version = "0.1.2.2";
        sha256 = "0q72y2pnx5qx7jk1waq3qdry1azq07wygb9hcgjqz78lbszg19cm";
+       revision = "1";
+       editedCabalFile = "1y5bdvaafhfs4plrbs5iqvwh86xcxjcz5gas0fb3fkfyjhj87pck";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base bytestring containers generics-sop
          nats scientific semigroups tagged text time unordered-containers
@@ -30908,8 +30911,8 @@ self: {
      }:
      mkDerivation {
        pname = "apecs-stm";
-       version = "0.1.3";
-       sha256 = "0wp5mydn1cmf4p70jsnfxqzy48p6d3x01xxpvdbnvkkqrpyrwgxg";
+       version = "0.1.4";
+       sha256 = "1x9bc3b0x7s7sphr4wzz4mnzz97n2rz3kn48rs889cvqa825dgr9";
        libraryHaskellDepends = [
          apecs base containers list-t stm stm-containers template-haskell
          vector
@@ -31880,6 +31883,32 @@ self: {
        broken = true;
      }) {};
 
+  "approx" = callPackage
+    ({ mkDerivation, base, containers, hashable, QuickCheck, text, time
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "approx";
+       version = "0.1.0.0";
+       sha256 = "1vc6k0w4zr355gfvprb5syh5jpmkdvp6wjibi4l95q9zwwdwhjn2";
+       revision = "1";
+       editedCabalFile = "0k34bjsazp4wbv7zzmvh5vnqv7yzyq20h99q30mcrn4g2bvpc0q1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers hashable text time unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         base containers hashable text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base containers hashable QuickCheck text time unordered-containers
+         vector
+       ];
+       description = "Easy-to-use reasonable way of emulating approximate in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "approx-rand-test" = callPackage
     ({ mkDerivation, base, Chart, Chart-diagrams, colour, conduit
      , containers, data-default, data-default-class, filepath, HUnit
@@ -32233,8 +32262,8 @@ self: {
      }:
      mkDerivation {
        pname = "arch-hs";
-       version = "0.3.0.0";
-       sha256 = "068si2cq7557rp86ni5psaig7z89vq38p56743l8yk92i1x1xz9j";
+       version = "0.4.0.0";
+       sha256 = "022vvznfqkia0w6s6wc586cbzj3l6yabkf73bx2biy8axsls2g4p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -37985,8 +38014,8 @@ self: {
        pname = "base16";
        version = "0.3.0.1";
        sha256 = "10id9h9mas4kb4kfiz7hhp2hhwnb9mh92pr327c53jqxi4hazgnd";
-       revision = "2";
-       editedCabalFile = "1ryc4228j4v9mcfjkgallfmww7g19y4awkqyq4j4734rgvkvgslw";
+       revision = "3";
+       editedCabalFile = "15r912hb0l92f2cajpq2b6ky4g5qwfmb502nfv1vrg02a1h25xb6";
        libraryHaskellDepends = [
          base bytestring deepseq primitive text text-short
        ];
@@ -39098,6 +39127,45 @@ self: {
        broken = true;
      }) {};
 
+  "beam-automigrate" = callPackage
+    ({ mkDerivation, aeson, base, beam-core, beam-postgres, bytestring
+     , containers, criterion, deepseq, dlist
+     , gargoyle-postgresql-connect, microlens, mtl, postgresql-simple
+     , pretty-simple, QuickCheck, quickcheck-instances, resource-pool
+     , scientific, splitmix, string-conv, tasty, tasty-quickcheck, text
+     , time, transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "beam-automigrate";
+       version = "0.1.0.0";
+       sha256 = "1a9pjmzzyibp6fgrn0p9scczzc2afx5n1947qn5ifcz23hnwnj55";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base beam-core beam-postgres bytestring containers deepseq
+         dlist microlens mtl postgresql-simple pretty-simple QuickCheck
+         quickcheck-instances scientific splitmix string-conv text time
+         transformers uuid vector
+       ];
+       executableHaskellDepends = [
+         aeson base beam-core beam-postgres bytestring containers
+         gargoyle-postgresql-connect postgresql-simple resource-pool text
+         time
+       ];
+       testHaskellDepends = [
+         base containers pretty-simple QuickCheck tasty tasty-quickcheck
+         text
+       ];
+       benchmarkHaskellDepends = [
+         base beam-postgres bytestring containers criterion deepseq
+         postgresql-simple QuickCheck splitmix
+       ];
+       description = "DB migration library for beam, targeting Postgres";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "beam-core" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, dlist, free
      , ghc-prim, hashable, microlens, mtl, network-uri, scientific
@@ -45879,8 +45947,8 @@ self: {
        pname = "broadcast-chan-tests";
        version = "0.2.1.1";
        sha256 = "0qx8j9sfky5qvrxrn4is9sja4qh6jh7jahq3zkyyq3a54jkwc8d3";
-       revision = "3";
-       editedCabalFile = "1x34m1wk5m9ryfhp86wm4bmvwdghrknsmir356nnb3y3xm8558b4";
+       revision = "4";
+       editedCabalFile = "04hgr1ik1z9v317x8rw6amxqrmc94g6cghzxghddszqismz44gaq";
        libraryHaskellDepends = [
          async base broadcast-chan clock containers optparse-applicative
          paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis
@@ -46420,8 +46488,8 @@ self: {
      }:
      mkDerivation {
        pname = "buffet";
-       version = "0.5.0";
-       sha256 = "0xi5hr51fwksc9983qzgji6p9lhxqfkhnczs6hamddj9glanf183";
+       version = "1.0.1";
+       sha256 = "0y8qinbsnc3dm3yl5ik65lgnn9xq54087mqi7p1qfql9nfcx3g6r";
        isLibrary = false;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48623,8 +48691,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-file";
-       version = "0.1.0";
-       sha256 = "1khf39awvpnqxs0rlqa6n5810x9kkn31975v6kbmwwdrjjp2qlqw";
+       version = "0.1.1";
+       sha256 = "05sah1w0nbvirnvj520ijyz2jrdbp5cciryhziyrgaimfvi9kbnb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48685,8 +48753,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-fmt";
-       version = "0.1.5";
-       sha256 = "1fsnjipd3j4vx77pmslkrdkf2wzqalqhwpcp5drxksl68nnxy8ad";
+       version = "0.1.5.1";
+       sha256 = "0z8zc48lb6nnf12477j3x5dq7nkfk877q8q1kcrdsvdkz07nzz57";
        isLibrary = false;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -49713,8 +49781,8 @@ self: {
      }:
      mkDerivation {
        pname = "cachix";
-       version = "0.5.0";
-       sha256 = "05z5gnj5fkl0pqhinlvnq9zf51v5xhc6lhgnm061aj89rclhm6bg";
+       version = "0.5.1";
+       sha256 = "13xl87jgpa1swgppr86dylp8ndisasdr8zcmk1l2jjb7vgyly8mb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -49732,7 +49800,8 @@ self: {
        executableHaskellDepends = [ base cachix-api ];
        executableToolDepends = [ hspec-discover ];
        testHaskellDepends = [
-         base cachix-api directory here hspec protolude temporary
+         base cachix-api directory here hspec protolude servant-auth-client
+         temporary
        ];
        description = "Command line client for Nix binary cache hosting https://cachix.org";
        license = stdenv.lib.licenses.asl20;
@@ -51066,6 +51135,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "casa-types_0_0_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, hashable, path-pieces, persistent, text
+     }:
+     mkDerivation {
+       pname = "casa-types";
+       version = "0.0.2";
+       sha256 = "1c3qvph690pgnqmj132sn1zh878n3ljvmp913vvhwynfhyixs1v7";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring hashable
+         path-pieces persistent text
+       ];
+       description = "Types for Casa";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "casadi-bindings" = callPackage
     ({ mkDerivation, base, binary, casadi, casadi-bindings-core
      , casadi-bindings-internal, cereal, containers, doctest, HUnit
@@ -55127,6 +55213,35 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "clash-ghc_1_2_5" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, Cabal
+     , clash-lib, clash-prelude, concurrent-supply, containers, deepseq
+     , directory, filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable
+     , haskeline, integer-gmp, lens, mtl, primitive, process, reflection
+     , split, template-haskell, text, time, transformers, uniplate, unix
+     , unordered-containers, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "clash-ghc";
+       version = "1.2.5";
+       sha256 = "1wxlhcpwq0m7k4f12x16ybvp4s5m45p9qk27wjkgk133fw35y3pz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bifunctors bytestring Cabal clash-lib clash-prelude
+         concurrent-supply containers deepseq directory filepath ghc
+         ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat
+         ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens
+         mtl primitive process reflection split template-haskell text time
+         transformers uniplate unix unordered-containers utf8-string vector
+       ];
+       executableHaskellDepends = [ base ];
+       description = "CAES Language for Synchronous Hardware";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-lib" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary
      , bytestring, clash-prelude, concurrent-supply, containers
@@ -55164,6 +55279,44 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "clash-lib_1_2_5" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary
+     , bytestring, clash-prelude, concurrent-supply, containers
+     , data-binary-ieee754, data-default, deepseq, directory, dlist
+     , errors, exceptions, extra, filepath, ghc, ghc-boot-th
+     , ghc-typelits-knownnat, hashable, haskell-src-exts
+     , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl
+     , ordered-containers, parsers, prettyprinter, primitive, process
+     , reducers, tasty, tasty-hunit, template-haskell, temporary
+     , terminal-size, text, text-show, time, transformers, trifecta
+     , unordered-containers, utf8-string, vector
+     , vector-binary-instances
+     }:
+     mkDerivation {
+       pname = "clash-lib";
+       version = "1.2.5";
+       sha256 = "14xi0llzm6f3ymlcfwq67d16ggdkqxrxkvr6rwmykxrca3j1b6r3";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal attoparsec base binary bytestring clash-prelude
+         concurrent-supply containers data-binary-ieee754 data-default
+         deepseq directory dlist errors exceptions extra filepath ghc
+         ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate
+         lens mtl ordered-containers parsers prettyprinter primitive process
+         reducers template-haskell temporary terminal-size text text-show
+         time transformers trifecta unordered-containers utf8-string vector
+         vector-binary-instances
+       ];
+       testHaskellDepends = [
+         base clash-prelude concurrent-supply containers data-default
+         deepseq ghc ghc-typelits-knownnat haskell-src-exts lens tasty
+         tasty-hunit template-haskell text transformers unordered-containers
+       ];
+       description = "CAES Language for Synchronous Hardware - As a Library";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-multisignal" = callPackage
     ({ mkDerivation, base, clash-prelude, deepseq
      , ghc-typelits-knownnat, QuickCheck
@@ -55217,6 +55370,45 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "clash-prelude_1_2_5" = callPackage
+    ({ mkDerivation, array, base, bifunctors, binary, bytestring, Cabal
+     , cabal-doctest, constraints, containers, criterion
+     , data-binary-ieee754, data-default-class, deepseq, doctest
+     , ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, half, hashable, hedgehog, hint
+     , integer-gmp, interpolate, lens, QuickCheck
+     , quickcheck-classes-base, recursion-schemes, reflection
+     , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, text-show, th-abstraction, th-lift
+     , th-orphans, time, transformers, type-errors, uniplate, vector
+     }:
+     mkDerivation {
+       pname = "clash-prelude";
+       version = "1.2.5";
+       sha256 = "0q97ap4a6cbf6s06934639pws9z1yyzmmaw6gj05p8jv7r4is239";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         array base bifunctors binary bytestring constraints containers
+         data-binary-ieee754 data-default-class deepseq ghc-prim
+         ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise
+         half hashable integer-gmp interpolate lens QuickCheck
+         recursion-schemes reflection singletons template-haskell text
+         text-show th-abstraction th-lift th-orphans time transformers
+         type-errors uniplate vector
+       ];
+       testHaskellDepends = [
+         base doctest ghc-typelits-extra ghc-typelits-knownnat
+         ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base
+         tasty tasty-hedgehog tasty-hunit tasty-quickcheck template-haskell
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq template-haskell
+       ];
+       description = "CAES Language for Synchronous Hardware - Prelude library";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-prelude-quickcheck" = callPackage
     ({ mkDerivation, base, clash-prelude, QuickCheck }:
      mkDerivation {
@@ -55494,8 +55686,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.26.2.3";
-       sha256 = "1bark213l3kx5gbr5nxnlhnrif5sg9z5v3igpcl47yisy99695p4";
+       version = "0.26.3";
+       sha256 = "119hybfny3sriscgk8zjf56yfc36jxnzydkhb04wxfip9r84mn03";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
@@ -57155,8 +57347,6 @@ self: {
        testHaskellDepends = [ base co-log-core hedgehog ];
        description = "Composable Contravariant Comonadic Logging Library";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "co-log-concurrent" = callPackage
@@ -57184,6 +57374,21 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "co-log-json" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, co-log-core, containers
+     , string-conv, text
+     }:
+     mkDerivation {
+       pname = "co-log-json";
+       version = "0.0.1.0";
+       sha256 = "1ap62gq3s08fif96jwssp7aj6kldsiwf2qx0f5yffl3zna4h6j2p";
+       libraryHaskellDepends = [
+         aeson base bytestring co-log-core containers string-conv text
+       ];
+       description = "Structured messages support in co-log ecosystem";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "co-log-polysemy" = callPackage
     ({ mkDerivation, base, co-log-core, polysemy }:
      mkDerivation {
@@ -57298,8 +57503,8 @@ self: {
      }:
      mkDerivation {
        pname = "cobot-io";
-       version = "0.1.3.10";
-       sha256 = "0fdx96f9kn09nwpcdqpys3rvxlwrvynba5ipb509vriny96p7vrr";
+       version = "0.1.3.12";
+       sha256 = "1jj9ip12zmy8qh080skm9fawasxprfbwiyzywilga7lr573wxb88";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-msgpack
          deepseq http-conduit hyraxAbif lens linear mtl split text vector
@@ -58970,8 +59175,6 @@ self: {
        testHaskellDepends = [ base directory ];
        description = "Non-GC'd, contiguous storage for immutable data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compact-list" = callPackage
@@ -59774,8 +59977,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "3.0.0.0";
-       sha256 = "14dpxpcbpchlppx64k3i7rwq94f1x4vvnd0d6bnwfcpw46hbjlsl";
+       version = "3.0.0.2";
+       sha256 = "151inlk43m96pnasc6llsjh8vxyc9b1i7xdgf1sp5p5072bzq305";
        libraryHaskellDepends = [ base ];
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -64954,8 +65157,8 @@ self: {
      }:
      mkDerivation {
        pname = "crdt-event-fold";
-       version = "1.1.0.0";
-       sha256 = "084vbx98b8ca5q2p6icbz0hv0hh4djk8iain7vv60w18453pz8fc";
+       version = "1.2.0.0";
+       sha256 = "0ald9rjynck8a0x2vicq4kq6hji2jyh0n78ghf49gh70swik5hsc";
        libraryHaskellDepends = [
          base binary containers data-default-class data-dword
        ];
@@ -66657,6 +66860,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "csv-conduit_0_7_2_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.2.0";
+       sha256 = "1bclavsan00mv0n0dy0ap6byk4w5fwnhpvxhdhx94r7bxfqi2r0q";
+       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
@@ -70021,13 +70251,18 @@ self: {
      }) {};
 
   "data-validation" = callPackage
-    ({ mkDerivation, base, containers, hspec, template-haskell }:
+    ({ mkDerivation, base, containers, hspec, regex-tdfa
+     , template-haskell
+     }:
      mkDerivation {
        pname = "data-validation";
-       version = "0.1.0.2";
-       sha256 = "15mc3m48jnn5fjr3bm02j9raxclqwd8qnb0bx0w2jz5y3asnfx5f";
-       libraryHaskellDepends = [ base containers template-haskell ];
+       version = "0.1.2.0";
+       sha256 = "1qka2f0gl48yi2hfiqphk94srh5lq7i14vx0qmj09fgv8xn65n15";
+       libraryHaskellDepends = [
+         base containers regex-tdfa template-haskell
+       ];
        testHaskellDepends = [ base containers hspec template-haskell ];
+       doHaddock = false;
        description = "A library for creating type safe validations";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71642,6 +71877,24 @@ self: {
        broken = true;
      }) {};
 
+  "deep-transformations" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, doctest, generic-lens
+     , markdown-unlit, rank2classes, template-haskell
+     }:
+     mkDerivation {
+       pname = "deep-transformations";
+       version = "0.1";
+       sha256 = "007j67gx2nq77d5zcikywjjc5hs14x95hn94sbzrjh708azbb7gc";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base generic-lens rank2classes template-haskell
+       ];
+       testHaskellDepends = [ base doctest rank2classes ];
+       testToolDepends = [ markdown-unlit ];
+       description = "Deep natural and unnatural tree transformations, including attribute grammars";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "deepcontrol" = callPackage
     ({ mkDerivation, base, containers, doctest, HUnit, mmorph, mtl
      , QuickCheck, safe, transformers
@@ -82872,8 +83125,8 @@ self: {
      }:
      mkDerivation {
        pname = "elynx";
-       version = "0.4.1";
-       sha256 = "0pz4s53mn1511hda16qi7l28whq05fcyrf1s8ywq42a3mbayw964";
+       version = "0.5.0";
+       sha256 = "0paxrh39ags55jg7pxb29dwb6cn7sakxdpkdf1fffrqsr3inpr9n";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82893,8 +83146,8 @@ self: {
      }:
      mkDerivation {
        pname = "elynx-markov";
-       version = "0.4.1";
-       sha256 = "1qzyfxzg6qq7ajm7b3v62qqychhzh4ms2677acvzjgvc51syk1fq";
+       version = "0.5.0";
+       sha256 = "0l66zaf4mj117pz16apdr4fi47xv9slay459lzjpdawmm6ppwlgc";
        libraryHaskellDepends = [
          async attoparsec base bytestring containers elynx-seq hmatrix
          integration math-functions mwc-random parallel primitive statistics
@@ -82913,8 +83166,8 @@ self: {
     ({ mkDerivation, attoparsec, base, bytestring, hspec }:
      mkDerivation {
        pname = "elynx-nexus";
-       version = "0.4.1";
-       sha256 = "0p2kww6fqmfv3bmd5z0c3n8s0rhfbm480jqh16s794xndbbxd15i";
+       version = "0.5.0";
+       sha256 = "03rhhbyhd1z95kl0ds204z4zywgy9anvhashpw2p311dq1g4axrs";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        testHaskellDepends = [ base hspec ];
        description = "Import and export Nexus files";
@@ -82930,8 +83183,8 @@ self: {
      }:
      mkDerivation {
        pname = "elynx-seq";
-       version = "0.4.1";
-       sha256 = "1mdl7fzzax4dn68paxivms96jfxriladbkwkbq6hff1z5xdwvj2h";
+       version = "0.5.0";
+       sha256 = "0bqlv3i7qhnkal8yiwvkp7175jdb9bcg7szkx0b352zfr4qhhmpa";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers matrices mwc-random
          parallel primitive vector vector-th-unbox word8
@@ -82954,8 +83207,8 @@ self: {
      }:
      mkDerivation {
        pname = "elynx-tools";
-       version = "0.4.1";
-       sha256 = "0dxhwmpaf9r8kr67sa2kn1i7w06skcl1hvxkcranw0xvijwm8g5r";
+       version = "0.5.0";
+       sha256 = "0lhkgi6wa90wniszkhmnnzmxa3cx1bvzbsy7cwrslmg8iqcxyin0";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring
          cryptohash-sha256 deepseq directory fast-logger hmatrix
@@ -82972,13 +83225,13 @@ self: {
   "elynx-tree" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad
      , containers, criterion, deepseq, double-conversion, elynx-nexus
-     , elynx-tools, hspec, math-functions, mwc-random, parallel
-     , primitive, QuickCheck, statistics
+     , elynx-tools, hspec, math-functions, microlens, mwc-random
+     , parallel, primitive, QuickCheck, statistics
      }:
      mkDerivation {
        pname = "elynx-tree";
-       version = "0.4.1";
-       sha256 = "1yd2gk0y55vjaw6b2m6cm25qidmznmvhrb3ypr4rb3bg4yck5ydh";
+       version = "0.5.0";
+       sha256 = "0b3dmz6hlbawwpnn84qx0w1g5jymgs7b05jxvx83q365vw8pw6aj";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring comonad containers deepseq
          double-conversion elynx-nexus math-functions mwc-random parallel
@@ -82988,7 +83241,8 @@ self: {
          attoparsec base bytestring containers elynx-tools hspec QuickCheck
        ];
        benchmarkHaskellDepends = [
-         base bytestring criterion deepseq elynx-tools mwc-random parallel
+         base bytestring criterion deepseq elynx-tools microlens mwc-random
+         parallel
        ];
        description = "Handle phylogenetic trees";
        license = stdenv.lib.licenses.gpl3Plus;
@@ -96852,10 +97106,8 @@ self: {
      }:
      mkDerivation {
        pname = "futhark";
-       version = "0.18.1";
-       sha256 = "12nbksr3qywqg88cj4yy5z9qnn24cdxjg8ym70bxym8a8m52928c";
-       revision = "1";
-       editedCabalFile = "0598rwva6svavwka9m6vr1raz1x8wvn9bfvcc7j8kvdh6m6y9w4m";
+       version = "0.18.3";
+       sha256 = "15x528wskfl158909y0qapq72084kq4rjbpp2yd96gh2ycgawz7b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98362,8 +98614,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-aeson";
-       version = "0.2.0.10";
-       sha256 = "0dz7kib81234xmp7lzwww4vfnbpkq1pdalzvxxxqcjj31l0i803c";
+       version = "0.2.0.11";
+       sha256 = "0pwmfkw0ydbb9422ic4cpnj8lv0l80mj7y1par0s3qk4vz6vvg97";
        libraryHaskellDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -100201,6 +100453,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-check_0_5_0_3" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, ghc
+     , ghc-paths, process, safe-exceptions, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ghc-check";
+       version = "0.5.0.3";
+       sha256 = "0crhlqs296zsz7bhy3zqaqhglxg45i6z7d1iqj9v7nr9crimxyjn";
+       libraryHaskellDepends = [
+         base containers directory filepath ghc ghc-paths process
+         safe-exceptions template-haskell transformers
+       ];
+       description = "detect mismatches between compile-time and run-time versions of the ghc api";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-clippy-plugin" = callPackage
     ({ mkDerivation, base, dhall, ghc, text, text-icu
      , text-regex-replace
@@ -100467,15 +100737,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-exactprint_0_6_3_2" = callPackage
+  "ghc-exactprint_0_6_3_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
      , silently, syb
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.6.3.2";
-       sha256 = "1bzf8mafz20pn7cq2483b9w3hjrwfbb0ahbcb3y7xy5yy52qvmln";
+       version = "0.6.3.3";
+       sha256 = "1psrr6iaa7k5f3zz7j82crg052n3x1h2dljyb16qzbv98bqny6nb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101254,6 +101524,30 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-extra_0_4_1" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-prim
+     , ghc-tcplugins-extra, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-extra";
+       version = "0.4.1";
+       sha256 = "0wfv0cympdrz999qml8j1cqrqppb22xm4gcn4k8i2hd31j748zb6";
+       libraryHaskellDepends = [
+         base containers 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
+       ];
+       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-prim, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
@@ -101554,11 +101848,11 @@ self: {
     ({ mkDerivation, aeson, array, async, base, base16-bytestring
      , binary, bytestring, Chart, Chart-diagrams, containers
      , cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg
-     , directory, extra, filepath, fuzzy, ghc, ghc-boot, ghc-boot-th
-     , ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev
-     , haddock-library, hashable, haskell-lsp, haskell-lsp-types
-     , hie-bios, hslogger, implicit-hie-cradle, lens, lsp-test, mtl
-     , network-uri, optparse-applicative, prettyprinter
+     , directory, extra, filepath, fingertree, fuzzy, ghc, ghc-boot
+     , ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev
+     , Glob, haddock-library, hashable, haskell-lsp, haskell-lsp-types
+     , hie-bios, hie-compat, hslogger, implicit-hie-cradle, lens
+     , lsp-test, mtl, network-uri, optparse-applicative, prettyprinter
      , prettyprinter-ansi-terminal, process, QuickCheck
      , quickcheck-instances, record-dot-preprocessor, record-hasfield
      , regex-tdfa, rope-utf16-splay, safe, safe-exceptions, shake
@@ -101568,25 +101862,26 @@ self: {
      }:
      mkDerivation {
        pname = "ghcide";
-       version = "0.4.0";
-       sha256 = "0h714pfdjkb4rbq9kz3ilj52nxdvr3c0w5nms5znxjlaysgaqp5l";
+       version = "0.5.0";
+       sha256 = "1l3h12jksxh1ds68zkslwmssfsdspxvyp0gqr5n8hgkymr4p896a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson array async base base16-bytestring binary bytestring
          containers cryptohash-sha1 data-default deepseq directory extra
-         filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths
-         haddock-library hashable haskell-lsp haskell-lsp-types hie-bios
-         hslogger implicit-hie-cradle mtl network-uri prettyprinter
-         prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay safe
-         safe-exceptions shake sorted-list stm syb text time transformers
-         unix unordered-containers utf8-string
+         filepath fingertree fuzzy ghc ghc-boot ghc-boot-th ghc-check
+         ghc-paths Glob haddock-library hashable haskell-lsp
+         haskell-lsp-types hie-bios hie-compat hslogger implicit-hie-cradle
+         mtl network-uri prettyprinter prettyprinter-ansi-terminal
+         regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list
+         stm syb text time transformers unix unordered-containers
+         utf8-string
        ];
        executableHaskellDepends = [
          aeson base bytestring containers data-default directory extra
          filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios
-         lens lsp-test optparse-applicative process safe-exceptions text
-         unordered-containers
+         lens lsp-test optparse-applicative process safe-exceptions shake
+         text unordered-containers
        ];
        testHaskellDepends = [
          aeson base binary bytestring containers directory extra filepath
@@ -103738,8 +104033,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-brunch";
-       version = "1.4.2.0";
-       sha256 = "0zbbd3hga2qh043xw6igsjk14wh0d3hq5naxich88wg1ig4w28j5";
+       version = "1.4.4.0";
+       sha256 = "0kj22hx2ibidrnx19wb8kh6vyv4v0b5im616bywwhjqzspjqppmi";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -104486,19 +104781,19 @@ self: {
 
   "githud" = callPackage
     ({ mkDerivation, base, bytestring, daemons, data-default, directory
-     , mtl, network, parsec, process, tasty, tasty-hunit
+     , filelock, mtl, network, parsec, process, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck, temporary, text, unix
      , utf8-string
      }:
      mkDerivation {
        pname = "githud";
-       version = "3.2.1";
-       sha256 = "1vvqn7wvalywnimv5kxz44pv4szm5csmvk54jbmsls2x0qginmqb";
+       version = "3.2.2";
+       sha256 = "19z21w6qxfndh381gcyi1ap14map886pkkc3nax8s417mv744ag3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring daemons data-default directory mtl network parsec
-         process temporary text unix utf8-string
+         base bytestring daemons data-default directory filelock mtl network
+         parsec process temporary text unix utf8-string
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -104911,8 +105206,8 @@ self: {
     ({ mkDerivation, base, linear }:
      mkDerivation {
        pname = "gjk2d";
-       version = "0.1.0.2";
-       sha256 = "163av54lmkqbayx9vkvviv3mdqq60zwkk9kjn75j7mk13d0iwpp3";
+       version = "0.1.0.3";
+       sha256 = "1wpaiaki61a7wl56qv6ycz9hgc9f8wvqdcqxpxaqvndxmri4njsv";
        libraryHaskellDepends = [ base linear ];
        testHaskellDepends = [ base linear ];
        license = stdenv.lib.licenses.bsd3;
@@ -105446,6 +105741,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gloss_1_13_2_1" = callPackage
+    ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
+     , gloss-rendering, GLUT, OpenGL
+     }:
+     mkDerivation {
+       pname = "gloss";
+       version = "1.13.2.1";
+       sha256 = "0ladpnk2zw27bz895b9gphhrmawb0gwvzrmnisk56msjdxwqq5pn";
+       libraryHaskellDepends = [
+         base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
+       ];
+       description = "Painless 2D vector graphics, animations and simulations";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gloss-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, gloss, gloss-rendering
      , linear-accelerate
@@ -109429,20 +109740,22 @@ self: {
      }) {};
 
   "grammatical-parsers" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, checkers, containers
-     , criterion, deepseq, doctest, markdown-unlit, monoid-subclasses
-     , parsers, QuickCheck, rank2classes, size-based, tasty
-     , tasty-quickcheck, testing-feat, text, transformers
+    ({ mkDerivation, attoparsec, base, bytestring, Cabal, cabal-doctest
+     , checkers, containers, criterion, deepseq, doctest, input-parsers
+     , markdown-unlit, monoid-subclasses, parsers, QuickCheck
+     , rank2classes, size-based, tasty, tasty-quickcheck, testing-feat
+     , text, transformers
      }:
      mkDerivation {
        pname = "grammatical-parsers";
-       version = "0.4.1.2";
-       sha256 = "0aa7lqny3627f4d3z7xjmr9ywh94h5akhg89jabh05mvaykr34kf";
+       version = "0.5";
+       sha256 = "1kf3wwbk1skp6cm78h6fs2494597sdz82gaq5zx3cwfzgn4swmgx";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         base containers monoid-subclasses parsers rank2classes transformers
+         attoparsec base bytestring containers input-parsers
+         monoid-subclasses parsers rank2classes transformers
        ];
        executableHaskellDepends = [
          base containers monoid-subclasses parsers rank2classes
@@ -110037,8 +110350,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphql";
-       version = "0.10.0.0";
-       sha256 = "0j0l8jmfnn3aw9vmk5z571ly9vk711hsz7cdklc243539vfnsywn";
+       version = "0.11.0.0";
+       sha256 = "1jg0cdyq0z1r752cx9mnbxj2rxd5s723zfvpk3mwcsvx5ygkhm0p";
        libraryHaskellDepends = [
          aeson base conduit containers exceptions hspec-expectations
          megaparsec parser-combinators scientific text transformers
@@ -110050,7 +110363,7 @@ self: {
          raw-strings-qq scientific text transformers unordered-containers
        ];
        description = "Haskell GraphQL implementation";
-       license = stdenv.lib.licenses.bsd3;
+       license = "MPL-2.0 AND BSD-3-Clause";
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -114145,8 +114458,6 @@ self: {
        ];
        description = "A service for pull-based continuous deployment based on hydra";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hailgun" = callPackage
@@ -116505,10 +116816,8 @@ self: {
     ({ mkDerivation, base, Chart, Chart-diagrams }:
      mkDerivation {
        pname = "happy-hour";
-       version = "0.0.0.1";
-       sha256 = "1dhqgv7q2qw9fc19mpsnfkc4y3h0d68433p2mrpx5fz81slfy4cf";
-       revision = "1";
-       editedCabalFile = "1yvz6nbqwxjyw7ffs95na7x75xc9ap8hp6m5jdvfqlgqcwlzmd6j";
+       version = "0.0.0.2";
+       sha256 = "1pj61x1ynspk3avfsy9735blzggz78r4b35gin1bza619gp9yzsb";
        libraryHaskellDepends = [ base Chart Chart-diagrams ];
        description = "Generate simple okay-looking bar plots without much effort";
        license = stdenv.lib.licenses.mit;
@@ -118194,8 +118503,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-formatter";
-       version = "2.0.2";
-       sha256 = "0rnx34nkgw4zsyagl38vqd322fzp3kfi16p60dhffadga8v4gajd";
+       version = "2.0.3";
+       sha256 = "16r5pq9sk5ra4ba29w6i88pcfwasffrfd85yhran68b6d8d7s2aj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129465,8 +129774,8 @@ self: {
        pname = "hlrdb";
        version = "0.3.1.0";
        sha256 = "19sxpyv331sjldanf40gw598gcj98n9xwc985cz9k2m38ck3vwhr";
-       revision = "1";
-       editedCabalFile = "0ikina8r7b3n7gywj0fclarj8g4m20wd23vxwlswikbx4f9mpwgf";
+       revision = "2";
+       editedCabalFile = "11f2vv95kmk4k07yzvzma7714p148sfyn9k3zx94h5y0zihgn49g";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cryptonite hashable hedis
          hlrdb-core memory random store time unordered-containers
@@ -129485,6 +129794,8 @@ self: {
        pname = "hlrdb-core";
        version = "0.1.6.0";
        sha256 = "13hb0657y5cqhbl2m27v28b6zl9mgcq17r983rds3l3bccn67ayv";
+       revision = "1";
+       editedCabalFile = "163scamdjq98zk039qv3r4xqz7hmixa136gfkifx757fy4nigdiy";
        libraryHaskellDepends = [
          base bytestring hashable hedis lens mtl profunctors random time
          unordered-containers
@@ -129509,18 +129820,16 @@ self: {
 
   "hls-plugin-api" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default, Diff, ghc
-     , ghc-boot-th, ghcide, haskell-lsp, hslogger, lens, process
-     , regex-tdfa, shake, text, unordered-containers
+     , ghc-boot-th, ghcide, hashable, haskell-lsp, hslogger, lens
+     , process, regex-tdfa, shake, text, unordered-containers
      }:
      mkDerivation {
        pname = "hls-plugin-api";
-       version = "0.4.1.0";
-       sha256 = "00ms2m9sn7a935fh6l3grzvbfq67acjymqmy9rjpn30d0slr1672";
-       revision = "1";
-       editedCabalFile = "09fd4br6s8lddl98nmwybayqr0z58k8h8fdw5r3jxw00cr13vw31";
+       version = "0.5.0.0";
+       sha256 = "18bahpndgic8g259v4blckybc5mlp7snaqh1gmnd7kh39p8kf1v4";
        libraryHaskellDepends = [
          aeson base containers data-default Diff ghc ghc-boot-th ghcide
-         haskell-lsp hslogger lens process regex-tdfa shake text
+         hashable haskell-lsp hslogger lens process regex-tdfa shake text
          unordered-containers
        ];
        description = "Haskell Language Server API for plugin communication";
@@ -134418,23 +134727,23 @@ self: {
      , bytestring, cryptonite, data-default, http-types, HUnit, hxt
      , hxt-charproperties, hxt-http, hxt-unicode, invertible
      , invertible-hxt, lens, libxml2, memory, mtl, network-uri, process
-     , semigroups, template-haskell, time, x509, zlib
+     , semigroups, string-conversions, template-haskell, time
+     , utf8-string, x509, zlib
      }:
      mkDerivation {
        pname = "hsaml2";
-       version = "0.1";
-       sha256 = "0mpw13cicx16zhsk7km2qsndah9cdmyylz4r5ank5cxj0rzmkjck";
-       revision = "1";
-       editedCabalFile = "0xvyzq2y94za0ggrlcxvpz4g29jxdcjp3ga8f77hr0f4hfz4z10l";
+       version = "0.1.1";
+       sha256 = "1jlsmsnrr3ya7az4mpb6f2spwcw3m45yzix2p3lkajbz8a6kfzac";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base base64-bytestring bytestring
          cryptonite data-default http-types hxt hxt-charproperties
          hxt-unicode invertible invertible-hxt lens memory mtl network-uri
-         process semigroups template-haskell time x509 zlib
+         process semigroups template-haskell time utf8-string x509 zlib
        ];
        libraryPkgconfigDepends = [ libxml2 ];
        testHaskellDepends = [
-         base bytestring HUnit hxt hxt-http network-uri semigroups time x509
+         base base64-bytestring bytestring cryptonite HUnit hxt hxt-http
+         network-uri semigroups string-conversions time x509
        ];
        description = "OASIS Security Assertion Markup Language (SAML) V2.0";
        license = stdenv.lib.licenses.asl20;
@@ -141037,14 +141346,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hvega_0_10_0_0" = callPackage
+  "hvega_0_11_0_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , filepath, tasty, tasty-golden, text, unordered-containers
      }:
      mkDerivation {
        pname = "hvega";
-       version = "0.10.0.0";
-       sha256 = "0jp9sfmyvscxn415z3mv5i2kjrwwabwy4v4qc709qkrfgzd9mmwn";
+       version = "0.11.0.0";
+       sha256 = "1lz5f04yi97wkqhyxvav262ayyvvl96xrgvgzyk1ca1g299dw866";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base text unordered-containers ];
@@ -144585,8 +144894,8 @@ self: {
     ({ mkDerivation, aeson, base, hvega, ihaskell, text }:
      mkDerivation {
        pname = "ihaskell-hvega";
-       version = "0.3.1.0";
-       sha256 = "1zfk58f10r8mkj9wwi4mgqm6hyf2x6zkrxm7rdi8yfvfya38m7fy";
+       version = "0.3.2.0";
+       sha256 = "0k7h33cqj58dv4hrsdjgnbykh036mrvbw6cbr98xlkdq5062pnzp";
        libraryHaskellDepends = [ aeson base hvega ihaskell text ];
        description = "IHaskell display instance for hvega types";
        license = stdenv.lib.licenses.bsd3;
@@ -145300,8 +145609,8 @@ self: {
      }:
      mkDerivation {
        pname = "implicit-hie";
-       version = "0.1.2.0";
-       sha256 = "0scg27iz2yhkfrsj5hw11qi1gdivgnskmcl4v4111zlvyy14lhc9";
+       version = "0.1.2.3";
+       sha256 = "0gz2rrzlj6031w837whpsh932jjihf49yk7rh05dw13zxvn19fl8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145328,8 +145637,8 @@ self: {
      }:
      mkDerivation {
        pname = "implicit-hie-cradle";
-       version = "0.2.0.1";
-       sha256 = "1l2i05w547sdgh7dhvwvc8x6i100lb2l3zwr6bhjmapdj5sjnqd1";
+       version = "0.3.0.0";
+       sha256 = "0zbgqx7dzkpsf6pnxvfrkgl2v70vvm5h4by65m7yi73qjxrcghd1";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers directory extra
          filepath hie-bios hslogger implicit-hie process temporary text time
@@ -150096,8 +150405,8 @@ self: {
      }:
      mkDerivation {
        pname = "j";
-       version = "0.1.2.0";
-       sha256 = "053n10j75mv2iwrra51nv4vf48ki8q5aksqjbrlnzbhbm125jhf3";
+       version = "0.2.0.0";
+       sha256 = "0ggs57f07na6m3r6m65cdxh48qxwhl3hfvarhsbhv16l92x1rpap";
        libraryHaskellDepends = [ base bytestring repa unix ];
        testHaskellDepends = [ base bytestring repa tasty tasty-hunit ];
        description = "J in Haskell";
@@ -151225,6 +151534,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "js-chart" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "js-chart";
+       version = "2.9.4.1";
+       sha256 = "03mxr6xr9z20m2hy7hvl9cq3a67k0n9zaqwi7wlqy6xx6pfyy20a";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       description = "Obtain minified chart.js code";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "js-dgtable" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -152169,6 +152491,37 @@ self: {
        broken = true;
      }) {};
 
+  "json-to-haskell" = callPackage
+    ({ mkDerivation, aeson, aeson-extra, ansi-wl-pprint, base, bimap
+     , bytestring, casing, containers, hspec, microlens-platform, mtl
+     , nonempty-containers, optparse-applicative, raw-strings-qq
+     , recursion-schemes, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "json-to-haskell";
+       version = "0.1.1.2";
+       sha256 = "0l4i613xd00vrfihh7yrkj1vp99vyvxgbb4902yla9bl80qb3khz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-extra base bimap casing containers microlens-platform
+         mtl nonempty-containers recursion-schemes text unordered-containers
+         vector
+       ];
+       executableHaskellDepends = [
+         aeson aeson-extra ansi-wl-pprint base bimap bytestring casing
+         containers microlens-platform mtl nonempty-containers
+         optparse-applicative raw-strings-qq recursion-schemes text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-extra base bimap bytestring casing containers hspec
+         microlens-platform mtl nonempty-containers raw-strings-qq
+         recursion-schemes text unordered-containers vector
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "json-togo" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-trans, base
      , bytestring, scientific, text, transformers, unordered-containers
@@ -154662,6 +155015,20 @@ self: {
        broken = true;
      }) {};
 
+  "ki" = callPackage
+    ({ mkDerivation, atomic-primops, base, concurrency, containers
+     , dejafu, stm
+     }:
+     mkDerivation {
+       pname = "ki";
+       version = "0.1.0";
+       sha256 = "0lzr9i3zrg3qw9pvkp4scy7p5qi2g2x8kvz6h7sph4k61f78kfxg";
+       libraryHaskellDepends = [ atomic-primops base containers stm ];
+       testHaskellDepends = [ base concurrency dejafu stm ];
+       description = "A lightweight, structured concurrency library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "kibro" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -156631,6 +156998,40 @@ self: {
        broken = true;
      }) {};
 
+  "language-Modula2" = callPackage
+    ({ mkDerivation, base, containers, deep-transformations, directory
+     , either, filepath, grammatical-parsers, input-parsers
+     , language-oberon, optparse-applicative, parsers, prettyprinter
+     , rank2classes, repr-tree-syb, tasty, tasty-hunit, template-haskell
+     , text
+     }:
+     mkDerivation {
+       pname = "language-Modula2";
+       version = "0.1";
+       sha256 = "0bwgvag1y5ik3rn9c45y7lldqpsg62yc9cr8ahvijpfz0f4hlq1m";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers deep-transformations directory filepath
+         grammatical-parsers input-parsers language-oberon parsers
+         prettyprinter rank2classes template-haskell text
+       ];
+       executableHaskellDepends = [
+         base containers deep-transformations either filepath
+         grammatical-parsers language-oberon optparse-applicative
+         prettyprinter rank2classes repr-tree-syb text
+       ];
+       testHaskellDepends = [
+         base deep-transformations directory either filepath
+         grammatical-parsers language-oberon prettyprinter tasty tasty-hunit
+         text
+       ];
+       description = "Parser, pretty-printer, and more for the Modula-2 programming language";
+       license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "language-asn" = callPackage
     ({ mkDerivation, aeson, base, bytestring, contravariant, hashable
      , pretty, primitive, text, vector
@@ -157516,31 +157917,33 @@ self: {
      }) {};
 
   "language-oberon" = callPackage
-    ({ mkDerivation, base, containers, directory, either, filepath
-     , grammatical-parsers, optparse-applicative, parsers, prettyprinter
-     , rank2classes, repr-tree-syb, tasty, tasty-hunit, template-haskell
-     , text, transformers
+    ({ mkDerivation, base, base-orphans, containers
+     , deep-transformations, directory, either, filepath
+     , grammatical-parsers, input-parsers, optparse-applicative, parsers
+     , prettyprinter, rank2classes, repr-tree-syb, tasty, tasty-hunit
+     , template-haskell, text, transformers
      }:
      mkDerivation {
        pname = "language-oberon";
-       version = "0.2.1";
-       sha256 = "1ia0m9bgrz1jksw349a0pgmkfvy5ykc29n55w7w457c60y37bs02";
+       version = "0.3";
+       sha256 = "0rpx80zyq4g71sjarjdyx6z919k3140d00ffmv4g14njnd6xb9fw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers directory either filepath grammatical-parsers
-         parsers prettyprinter rank2classes template-haskell text
-         transformers
+         base base-orphans containers deep-transformations directory either
+         filepath grammatical-parsers input-parsers parsers prettyprinter
+         rank2classes template-haskell text transformers
        ];
        executableHaskellDepends = [
-         base containers either filepath grammatical-parsers
-         optparse-applicative prettyprinter rank2classes repr-tree-syb text
+         base containers deep-transformations either filepath
+         grammatical-parsers input-parsers optparse-applicative
+         prettyprinter rank2classes repr-tree-syb text
        ];
        testHaskellDepends = [
-         base directory either filepath grammatical-parsers prettyprinter
-         tasty tasty-hunit text
+         base deep-transformations directory either filepath
+         grammatical-parsers prettyprinter tasty tasty-hunit text
        ];
-       description = "Parser, pretty-printer, and type checker for the Oberon programming language";
+       description = "Parser, pretty-printer, and more for the Oberon programming language";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -160046,8 +160449,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.4.0.0";
-       sha256 = "1f5jcprb2l65nyysxgdkhd9vsg1ixn8qfpjgmgvi8cqm0zp28zw7";
+       version = "1.4.1.0";
+       sha256 = "07zlmds8450sa54axx91ppxil6jfafx78ba3lxrr6jpdvzc73w55";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160490,8 +160893,8 @@ self: {
      }:
      mkDerivation {
        pname = "libarchive";
-       version = "3.0.0.0";
-       sha256 = "0qwnp5jzmlvi7bpbh1dhz3lp91qf5phr8hb7m3h5q0a50d72dqpp";
+       version = "3.0.1.1";
+       sha256 = "1i5801prr06vachxrpcc31bsxhsb6f8ik91mx7a9hmqkwhpr986b";
        setupHaskellDepends = [ base Cabal chs-cabal ];
        libraryHaskellDepends = [
          base bytestring composition-prelude deepseq dlist filepath mtl
@@ -160613,13 +161016,13 @@ self: {
      }) {ffi = null;};
 
   "libfuse3" = callPackage
-    ({ mkDerivation, base, bytestring, clock, directory, filepath
-     , fuse3, hspec, process, resourcet, temporary, time, unix
+    ({ mkDerivation, base, bytestring, clock, criterion, directory
+     , filepath, fuse3, hspec, process, resourcet, temporary, time, unix
      }:
      mkDerivation {
        pname = "libfuse3";
-       version = "0.1.1.1";
-       sha256 = "0fvkyfdl342zi436n1xqvsvazflkm60wdcq0qzspg6q5pr7s094f";
+       version = "0.1.2.0";
+       sha256 = "0a59b4xag5vzisrnvf4v1zkdsdzky96h8w2mdj6cip3vgr196frb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -160629,6 +161032,7 @@ self: {
        testHaskellDepends = [
          base bytestring directory filepath hspec process temporary unix
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion unix ];
        description = "A Haskell binding for libfuse-3.x";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165928,8 +166332,8 @@ self: {
      }:
      mkDerivation {
        pname = "lorentz";
-       version = "0.7.0";
-       sha256 = "1nwz7cdjy0s1fa64q4ymyds2m6yhqx8vxjp0p9qn7b4l7civhk9c";
+       version = "0.7.1";
+       sha256 = "0qqlbpvifh4n6w8b4brc9fybvaxx8aahj9da6y16zlxlf3n6jbv5";
        libraryHaskellDepends = [
          aeson-pretty base bimap bytestring constraints containers
          data-default first-class-families fmt interpolate lens morley
@@ -167785,8 +168189,8 @@ self: {
      }:
      mkDerivation {
        pname = "magicbane";
-       version = "0.4.0";
-       sha256 = "0n2yn3jbklibb21pm2ifiy9035d3xmrh8cgywnpawm51p5q3klwl";
+       version = "0.5.1";
+       sha256 = "18kxixk0cj32pjpwp96mpnppy21xn4gy4xksb97m31j30kmlas91";
        libraryHaskellDepends = [
          aeson aeson-qq attoparsec base bytestring conduit
          conduit-combinators data-has ekg-core ekg-wai envy errors
@@ -170505,18 +170909,19 @@ self: {
 
   "mcmc" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , data-default, directory, double-conversion, hspec, hspec-discover
-     , log-domain, microlens, mwc-random, QuickCheck, statistics, time
-     , transformers, vector, zlib
+     , data-default, directory, dirichlet, double-conversion, hspec
+     , hspec-discover, log-domain, math-functions, microlens, mwc-random
+     , primitive, QuickCheck, statistics, time, transformers, vector
+     , zlib
      }:
      mkDerivation {
        pname = "mcmc";
-       version = "0.2.4";
-       sha256 = "17ahxp7p1klg1j416gvs76a3x1hii5j0fv80rxfrw0w076gn3yy1";
+       version = "0.3.0";
+       sha256 = "1xkg16gmhqh60z69gz6d51c9yb7q9j2w8aylhpxgh18yz35mw4j1";
        libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory
-         double-conversion log-domain microlens mwc-random statistics time
-         transformers vector zlib
+         aeson base bytestring containers data-default directory dirichlet
+         double-conversion log-domain math-functions microlens mwc-random
+         primitive statistics time transformers vector zlib
        ];
        testHaskellDepends = [
          base directory hspec hspec-discover log-domain mwc-random
@@ -173738,16 +174143,20 @@ self: {
      }) {};
 
   "minizinc-process" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , hashable, process-extras, stringsearch, text
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , directory, hashable, hedgehog, hspec, hspec-hedgehog, process
+     , process-extras, template-haskell, text
      }:
      mkDerivation {
        pname = "minizinc-process";
-       version = "0.1.0.0";
-       sha256 = "0p2jb69k2n3dy47vx56pwh6pafccsm9r0nzqd60zss5fdrnxddf8";
+       version = "0.1.4.1";
+       sha256 = "0sihpmjzda7kph8mds4p4fn4pgbiay6v680pcqv2d116a5di2c5g";
        libraryHaskellDepends = [
-         aeson base bytestring containers directory hashable process-extras
-         stringsearch text
+         aeson attoparsec base bytestring containers directory hashable
+         process process-extras template-haskell text
+       ];
+       testHaskellDepends = [
+         aeson base hashable hedgehog hspec hspec-hedgehog
        ];
        description = "A set of helpers to call minizinc models";
        license = stdenv.lib.licenses.asl20;
@@ -174136,8 +174545,8 @@ self: {
      }:
      mkDerivation {
        pname = "miv";
-       version = "0.4.4";
-       sha256 = "0is2ckkglh9wnhwnvyhhjy7as67mk7bs4az98q32nk3hx0yj9nq8";
+       version = "0.4.6";
+       sha256 = "1xf4frjvccjvkzgx9ha9q2i6ig5bx3z37igjb3s7a9zvqnvig06g";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -174485,20 +174894,22 @@ self: {
 
   "mmsyn6ukr" = callPackage
     ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3
-     , mmsyn5, process, vector
+     , mmsyn5, process, ukrainian-phonetics-basic, vector
      }:
      mkDerivation {
        pname = "mmsyn6ukr";
-       version = "0.8.3.0";
-       sha256 = "017q1jf9490sddb0f6wjizcsv423izjqirgq7ymzpxcd4sbcdhyn";
+       version = "0.9.0.0";
+       sha256 = "1knq7yqgsk3hjvpfb1f3igq7flrmsjafp669d24ww7ijcxs7rpda";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bytestring directory mmsyn2 mmsyn3 mmsyn5 process vector
+         base bytestring directory mmsyn2 mmsyn3 mmsyn5 process
+         ukrainian-phonetics-basic vector
        ];
        executableHaskellDepends = [
-         base bytestring directory mmsyn2 mmsyn3 mmsyn5 process vector
+         base bytestring directory mmsyn2 mmsyn3 mmsyn5 process
+         ukrainian-phonetics-basic vector
        ];
        description = "A musical instrument synthesizer or a tool for Ukrainian language listening";
        license = stdenv.lib.licenses.mit;
@@ -177405,8 +177816,8 @@ self: {
      }:
      mkDerivation {
        pname = "morley";
-       version = "1.8.1";
-       sha256 = "1lchr282394vjwgi5l0innc7szxkp7pibrbma0yza37l3q295xz2";
+       version = "1.9";
+       sha256 = "17fkh2dbi79lgc61nj9v0fyj26n7lzsj824nvi94q0f9qi6ifk5j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177793,8 +178204,8 @@ self: {
      }:
      mkDerivation {
        pname = "moss";
-       version = "0.1.0.0";
-       sha256 = "19gy0x191gk6wa85vp5nhh0xgmr3mj2daiqx8bap452fm1y85qcr";
+       version = "0.2.0.0";
+       sha256 = "17ac31r26c8zddp3qdk573lyry2bz7c0y49q0adln3psd39czzw0";
        libraryHaskellDepends = [
          base bytestring conduit-extra mtl network network-simple
          unix-compat
@@ -192738,7 +193149,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_11_1" = callPackage
+  "pandoc_2_11_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , case-insensitive, citeproc, commonmark, commonmark-extensions
@@ -192757,8 +193168,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.11.1";
-       sha256 = "0gvpal4v92x8vscmm5h3jjlx9q03a4qbz0zwcbw24y02xmaz09d8";
+       version = "2.11.1.1";
+       sha256 = "0i16klsffqqbiann3p3rqcpbiwmbffg8ycmm35yrc9g705hi2r38";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -193698,7 +194109,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pantry_0_5_1_3" = callPackage
+  "pantry_0_5_1_4" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
      , casa-client, casa-types, conduit, conduit-extra, containers
      , cryptonite, cryptonite-conduit, digest, exceptions, filelock
@@ -193712,8 +194123,8 @@ self: {
      }:
      mkDerivation {
        pname = "pantry";
-       version = "0.5.1.3";
-       sha256 = "0yx30zhyq0wbda6z8a9lvp8c83b3nj4l2s8lcxnvwgnzkanvlkss";
+       version = "0.5.1.4";
+       sha256 = "1q66pxacjxc43gbmjjrvs99wcrzp8yya4gx35qhbb6hgkzwssqhb";
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring Cabal casa-client casa-types
          conduit conduit-extra containers cryptonite cryptonite-conduit
@@ -196226,6 +196637,35 @@ self: {
        broken = true;
      }) {};
 
+  "pcapng" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-arbitrary, cereal
+     , cereal-conduit, conduit, conduit-extra, directory, filepath
+     , genvalidity-hspec, genvalidity-property, hspec, hspec-core, lens
+     , QuickCheck, resourcet, text, unliftio-core, validity
+     }:
+     mkDerivation {
+       pname = "pcapng";
+       version = "0.1.0.0";
+       sha256 = "1mvxl8fjsfs8xvm8v9nrqjidv52sgxqydgfnxh0bckhbzcc7gqaq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cereal cereal-conduit conduit conduit-extra lens
+         resourcet text unliftio-core
+       ];
+       executableHaskellDepends = [
+         base bytestring cereal cereal-conduit conduit conduit-extra lens
+         resourcet text unliftio-core
+       ];
+       testHaskellDepends = [
+         base bytestring bytestring-arbitrary cereal cereal-conduit conduit
+         conduit-extra directory filepath genvalidity-hspec
+         genvalidity-property hspec hspec-core lens QuickCheck resourcet
+         text unliftio-core validity
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pcd-loader" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq
      , directory, HUnit, lens, linear, mtl, string-qq, test-framework
@@ -197774,8 +198214,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-documentation";
-       version = "0.1.0.1";
-       sha256 = "027fxb3ggzyxg2ykml7sdk2hycacd237161yr3w5cwi320b9ghyg";
+       version = "0.1.0.2";
+       sha256 = "0ys864vjzl97c9qv0gg5q9zviammrfvm0schvh7ckr9pdg062z17";
        libraryHaskellDepends = [
          base containers mtl persistent template-haskell text
        ];
@@ -197849,8 +198289,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-iproute";
-       version = "0.2.4";
-       sha256 = "1lsprnlgcnj8v38cnbgf2vpj9ivgsvgi3yy3nh1gmvyj7maznkq5";
+       version = "0.2.5";
+       sha256 = "0x5vsincd2gll20agkrsgl8f092x7pc7b22fn5ardcm2fnyl2x8i";
        libraryHaskellDepends = [
          aeson aeson-iproute base bytestring http-api-data iproute
          path-pieces persistent text
@@ -199131,30 +199571,56 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "phonetic-languages-constaints" = callPackage
+    ({ mkDerivation, base, vector }:
+     mkDerivation {
+       pname = "phonetic-languages-constaints";
+       version = "0.3.0.0";
+       sha256 = "17n4m9zbl1h6g76wxrqxc3wwcd0m5qjmbiakvmvbcdv7nffc8xyh";
+       libraryHaskellDepends = [ base vector ];
+       description = "Constraints to filter the needed permutations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "phonetic-languages-constraints" = callPackage
+    ({ mkDerivation, base, vector }:
+     mkDerivation {
+       pname = "phonetic-languages-constraints";
+       version = "0.3.2.0";
+       sha256 = "16gq0vr20bk3mg8b1w7gdlv32wr5vf9q0dj4f6x42x476fd4dcj3";
+       libraryHaskellDepends = [ base vector ];
+       description = "Constraints to filter the needed permutations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "phonetic-languages-examples" = callPackage
-    ({ mkDerivation, base, parallel, phonetic-languages-common
-     , phonetic-languages-general, phonetic-languages-plus
-     , phonetic-languages-properties, phonetic-languages-ukrainian
+    ({ mkDerivation, base, mmsyn2, parallel, phonetic-languages-common
+     , phonetic-languages-constraints, phonetic-languages-general
+     , phonetic-languages-plus, phonetic-languages-properties
+     , phonetic-languages-rhythmicity, phonetic-languages-ukrainian
      , phonetic-languages-vector, print-info, subG
      , ukrainian-phonetics-basic, uniqueness-periods-vector-filters
      , uniqueness-periods-vector-stats, vector
      }:
      mkDerivation {
        pname = "phonetic-languages-examples";
-       version = "0.1.1.0";
-       sha256 = "1i95kglsif5zd5k7yri69mwh8n3a63cqwh3kvn91qpyxqf8zgdzz";
+       version = "0.5.0.0";
+       sha256 = "1ypv9x2jsz20dmky8mzmni0pmwq8vslyhi2s0s2ji99qsg7y5rwi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base phonetic-languages-common phonetic-languages-properties
+         base mmsyn2 phonetic-languages-common
+         phonetic-languages-constraints phonetic-languages-properties
          phonetic-languages-vector vector
        ];
        executableHaskellDepends = [
-         base parallel phonetic-languages-common phonetic-languages-general
+         base mmsyn2 parallel phonetic-languages-common
+         phonetic-languages-constraints phonetic-languages-general
          phonetic-languages-plus phonetic-languages-properties
-         phonetic-languages-ukrainian phonetic-languages-vector print-info
-         subG ukrainian-phonetics-basic uniqueness-periods-vector-filters
-         uniqueness-periods-vector-stats vector
+         phonetic-languages-rhythmicity phonetic-languages-ukrainian
+         phonetic-languages-vector print-info subG ukrainian-phonetics-basic
+         uniqueness-periods-vector-filters uniqueness-periods-vector-stats
+         vector
        ];
        description = "A generalization of the uniqueness-periods-vector-examples functionality";
        license = stdenv.lib.licenses.mit;
@@ -199166,8 +199632,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-general";
-       version = "0.1.0.0";
-       sha256 = "1vv1n58npgwy1shp7xhm48fdqm9a8kqb3lbqkl0sn7qwkph5x53k";
+       version = "0.2.0.0";
+       sha256 = "1sfaqg3v31188zk70c290ww5k80ph30h2kcgpc8pxj8v3baj5p8x";
        libraryHaskellDepends = [
          base phonetic-languages-common phonetic-languages-plus print-info
          subG vector
@@ -199202,8 +199668,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-properties";
-       version = "0.1.1.0";
-       sha256 = "1c312i66rpwxfk34rpzh8ai3m4lbxwj4ayqh1vzbj17mciachaqf";
+       version = "0.3.0.0";
+       sha256 = "1bf0k2wlypaiff84alnf94c5adbkbz1d3bkdbmd04bq937yc3rfq";
        libraryHaskellDepends = [
          base phonetic-languages-common phonetic-languages-rhythmicity
          phonetic-languages-vector ukrainian-phonetics-basic vector
@@ -202970,12 +203436,10 @@ self: {
     ({ mkDerivation, base, containers, polysemy, polysemy-zoo }:
      mkDerivation {
        pname = "polysemy-extra";
-       version = "0.1.0.0";
-       sha256 = "1y5k935jh6dfs87kdih1ibb61ljkp39wyrkg1n2zss020cdhbi7g";
-       revision = "1";
-       editedCabalFile = "0nh9laqwr40dhkh0806v748zqg61agmv3ih4fyidzr9h30lcl0q8";
+       version = "0.1.4.0";
+       sha256 = "1lv5zw3wwgyxnsa3c1cfgpqaqj1w4ybph5r8hqr2h7xxaa6wajsx";
        libraryHaskellDepends = [ base containers polysemy polysemy-zoo ];
-       description = "Extra transformations functions for polysemy";
+       description = "Extra Input and Output functions for polysemy..";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -203071,8 +203535,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-methodology";
-       version = "0.1.5.0";
-       sha256 = "1gi2rjf1vgcamjyqqi4wnasv9i5yaazlh14hbjspvsyv8h2zyl4i";
+       version = "0.1.6.0";
+       sha256 = "0wsl39hznf6wpq4yd4n0sz9d5yw36xclyg9mrhifzc04mzn3dbi3";
        libraryHaskellDepends = [
          base co-log-polysemy polysemy polysemy-plugin polysemy-zoo
        ];
@@ -203082,6 +203546,24 @@ self: {
        broken = true;
      }) {};
 
+  "polysemy-methodology-composite" = callPackage
+    ({ mkDerivation, base, composite-base, polysemy, polysemy-extra
+     , polysemy-methodology, polysemy-vinyl, vinyl
+     }:
+     mkDerivation {
+       pname = "polysemy-methodology-composite";
+       version = "0.1.2.0";
+       sha256 = "1gp3jwhhkrbxdmwvcd08x7vphqd99y2zyj81s3ni3249yb3mjcpm";
+       libraryHaskellDepends = [
+         base composite-base polysemy polysemy-extra polysemy-methodology
+         polysemy-vinyl vinyl
+       ];
+       description = "Functions for using polysemy-methodology with composite";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "polysemy-optics" = callPackage
     ({ mkDerivation, base, optics, polysemy, polysemy-zoo }:
      mkDerivation {
@@ -203091,8 +203573,6 @@ self: {
        libraryHaskellDepends = [ base optics polysemy polysemy-zoo ];
        description = "Optics for Polysemy";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-path" = callPackage
@@ -203220,6 +203700,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "polysemy-vinyl" = callPackage
+    ({ mkDerivation, base, polysemy, polysemy-extra, vinyl }:
+     mkDerivation {
+       pname = "polysemy-vinyl";
+       version = "0.1.2.0";
+       sha256 = "0cg170avw16cdssirjz5di466z2i5fh3y7whq5cpwc7dqqffxdak";
+       libraryHaskellDepends = [ base polysemy polysemy-extra vinyl ];
+       description = "Functions for mapping vinyl records in polysemy";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "polysemy-webserver" = callPackage
     ({ mkDerivation, base, bytestring, hspec, http-conduit, http-types
      , polysemy, polysemy-plugin, text, wai, wai-websockets, warp
@@ -203265,8 +203758,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Experimental, user-contributed effects and interpreters for polysemy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polyseq" = callPackage
@@ -205871,8 +206362,8 @@ self: {
      }:
      mkDerivation {
        pname = "predicate-typed";
-       version = "0.7.4.2";
-       sha256 = "0n1r8ysjyc61pr107y5kkarc30crjzps865kx9k25kjcmk5ynlgz";
+       version = "0.7.4.3";
+       sha256 = "122v0c8zkpv3fdk8wqk4b6q2hicdj7hn1kaavcsf0z266w089ryg";
        libraryHaskellDepends = [
          aeson aeson-pretty base binary bytestring comonad constraints
          containers deepseq directory hashable lens lens-action pcre-heavy
@@ -208576,8 +209067,8 @@ self: {
      }:
      mkDerivation {
        pname = "prolude";
-       version = "0.0.0.6";
-       sha256 = "1f3apqs82lv7fq69mjqycs8ynj3hhprg1rrclvs3yix2lc3465vf";
+       version = "0.0.0.7";
+       sha256 = "0wcjb7svvp5q3lzsddkxp2c0jvr765pva9hwnmmc5ak91yj6lgpw";
        libraryHaskellDepends = [
          aeson base bytestring cassava containers mongoDB safe-exceptions
          scientific text time vector
@@ -210422,17 +210913,18 @@ self: {
      }) {};
 
   "purescheme-wai-routing-core" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-media, http-types
-     , interpolate, text, wai, warp
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , http-media, http-types, interpolate, text, wai, warp
      }:
      mkDerivation {
        pname = "purescheme-wai-routing-core";
-       version = "0.1.0.0";
-       sha256 = "18ngmq6yb3l1ywigl38jm2x6wi097wjdym5z3hh5qkjndcygkjji";
+       version = "0.1.3.0";
+       sha256 = "0fwgxvn0vblyma3fpbyj9rvbwsrgsqzyd27mripa3yyvm6ygh4s6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring http-media http-types interpolate text wai
+         aeson base bytestring case-insensitive http-media http-types
+         interpolate text wai
        ];
        executableHaskellDepends = [
          aeson base bytestring http-types text wai warp
@@ -213160,6 +213652,26 @@ self: {
        broken = true;
      }) {};
 
+  "r-glpk-phonetic-languages-ukrainian-durations" = callPackage
+    ({ mkDerivation, base, lists-flines, mmsyn2
+     , ukrainian-phonetics-basic, vector
+     }:
+     mkDerivation {
+       pname = "r-glpk-phonetic-languages-ukrainian-durations";
+       version = "0.2.1.0";
+       sha256 = "0g3xw2a9id28wpvs868xjjmx2hh17876fiwpzjzngcjijr5351b4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base lists-flines mmsyn2 ukrainian-phonetics-basic vector
+       ];
+       executableHaskellDepends = [
+         base lists-flines mmsyn2 ukrainian-phonetics-basic vector
+       ];
+       description = "Can be used to calculate the durations of the approximations of the Ukrainian phonemes";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "r3x-haskell-sdk" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring
      , case-insensitive, containers, cookie, http-types, mtl, regex-pcre
@@ -214302,15 +214814,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "rank2classes_1_4_0_1" = callPackage
+  "rank2classes_1_4_1" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest
      , markdown-unlit, tasty, tasty-hunit, template-haskell
      , transformers
      }:
      mkDerivation {
        pname = "rank2classes";
-       version = "1.4.0.1";
-       sha256 = "1r72z98jvnih16x074izb0wp9gwbsjs2ihvj8a72xxyakdad71r9";
+       version = "1.4.1";
+       sha256 = "1cmc7xqnvjdvzgfyz7i3nmnhdm92rwfc9bqlpjcirmnkn47va4kb";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base distributive template-haskell transformers
@@ -217393,18 +217905,18 @@ self: {
   "reflex-gadt-api" = callPackage
     ({ mkDerivation, aeson, aeson-gadt-th, base, bytestring
      , constraints, constraints-extras, containers, data-default
-     , dependent-sum, jsaddle, reflex, reflex-dom-core, text, time
+     , jsaddle, reflex, reflex-dom-core, some, text, time
      }:
      mkDerivation {
        pname = "reflex-gadt-api";
-       version = "0.2.0.1";
-       sha256 = "0lyzabjyx1fyxrkxpmzhwhkpph9358hw7bpnmsppvwsdaq3m1yqq";
+       version = "0.2.1.0";
+       sha256 = "1mcxa87z6cldbc9p2mkdif5a8qa8sa0nhmawwm1gjqgvhzp7kmdp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-gadt-th base bytestring constraints constraints-extras
-         containers data-default dependent-sum jsaddle reflex
-         reflex-dom-core text time
+         containers data-default jsaddle reflex reflex-dom-core some text
+         time
        ];
        executableHaskellDepends = [
          aeson aeson-gadt-th base constraints-extras reflex-dom-core text
@@ -219558,8 +220070,8 @@ self: {
        pname = "repa";
        version = "3.4.1.4";
        sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23";
-       revision = "4";
-       editedCabalFile = "0bay8j0fm7l2nhrbdvy9fvrb6hgkrk5qx9y03az2kakvjdc4gvvh";
+       revision = "6";
+       editedCabalFile = "09b2b98pqbjxp4xign29b67yn6za8lfxxqlv1j52sbvh5bbmbd7s";
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
@@ -220977,6 +221489,17 @@ self: {
        broken = true;
      }) {};
 
+  "restartable" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, unix }:
+     mkDerivation {
+       pname = "restartable";
+       version = "0.3.0.0";
+       sha256 = "0bar7sy53pylq13wkbb4j3i7y81g6y203njkh9vlid7nh109j409";
+       libraryHaskellDepends = [ aeson base bytestring unix ];
+       description = "Minimal live coding library for model-view-event-update applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "restful-snap" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
      , data-default, digestive-functors, errors, heist, lens, map-syntax
@@ -228621,8 +229144,8 @@ self: {
     ({ mkDerivation, base, containers, lattices }:
      mkDerivation {
        pname = "semibounded-lattices";
-       version = "0.1.0.1";
-       sha256 = "0xqxmh0chq4vgga5lx2d5pcz4rq000kgpkglj8jgdv2nx6rf8pka";
+       version = "0.1.1.0";
+       sha256 = "0nlmh84bmizs5dllf3292svs4a5d9yj0l78mcryqmblf1bzp74f4";
        libraryHaskellDepends = [ base containers lattices ];
        testHaskellDepends = [ base ];
        description = "A Haskell implementation of semibounded lattices";
@@ -233282,20 +233805,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sexp-grammar_2_2_1" = callPackage
+  "sexp-grammar_2_3_0" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
-     , criterion, deepseq, happy, invertible-grammar, prettyprinter
-     , QuickCheck, recursion-schemes, scientific, semigroups, tasty
-     , tasty-hunit, tasty-quickcheck, text, utf8-string
+     , criterion, data-fix, deepseq, happy, invertible-grammar
+     , prettyprinter, QuickCheck, recursion-schemes, scientific
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck, text
+     , utf8-string
      }:
      mkDerivation {
        pname = "sexp-grammar";
-       version = "2.2.1";
-       sha256 = "0nf3b3cibqi2jv9jg742jknqpfgwvc7iwjw7a2jgpf55nrgs6lvz";
+       version = "2.3.0";
+       sha256 = "1ky0jj47xp6g8shk5znrhncj71sg0p653csj1ds2yl36s7fiwgdk";
        libraryHaskellDepends = [
-         array base bytestring containers deepseq invertible-grammar
-         prettyprinter recursion-schemes scientific semigroups text
-         utf8-string
+         array base bytestring containers data-fix deepseq
+         invertible-grammar prettyprinter recursion-schemes scientific
+         semigroups text utf8-string
        ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
@@ -234808,6 +235332,8 @@ self: {
        pname = "shh";
        version = "0.7.1.0";
        sha256 = "03b8h6sjnrlksvpr9f451469j5xngqpb6g3hyxmxp7h7h4xrsvq2";
+       revision = "1";
+       editedCabalFile = "1sv4rxkwvsb1j42k6bhbvig8215xzmgmqaxacljq03aqqv3x3jf2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -234833,8 +235359,8 @@ self: {
        pname = "shh-extras";
        version = "0.1.0.1";
        sha256 = "0w4ddjszs0lrpr4zcggcwb80bg3yd8lr628jngmh4a05ypv3hxkk";
-       revision = "1";
-       editedCabalFile = "0kcnk1f1jgaxaqsrnhv2s17firjsms9xvx8d7jvv6ys5iq4nynya";
+       revision = "2";
+       editedCabalFile = "1sfj2li0p0bq1dmk85i74jmgcz28vb2q151d16rcjzx8x07kyrq4";
        libraryHaskellDepends = [ base hostname shh time ];
        testHaskellDepends = [ base tasty ];
        description = "Utility functions for using shh";
@@ -238164,8 +238690,8 @@ self: {
      }:
      mkDerivation {
        pname = "slynx";
-       version = "0.4.1";
-       sha256 = "1cmbk2ynyd5il0jlci5jbc2mn4vhwgrbr7041vgivnqg3p5mb1lx";
+       version = "0.5.0";
+       sha256 = "0n1d90bmqbiw3w5abncqlk39vca59hd5zkk02q5ickf97zfqik00";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -243805,6 +244331,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stack-all" = callPackage
+    ({ mkDerivation, base, config-ini, directory, extra, filepath
+     , process, simple-cmd, simple-cmd-args, text
+     }:
+     mkDerivation {
+       pname = "stack-all";
+       version = "0.1";
+       sha256 = "0gn20y7lyfpzzxg296rb4fd6nn1v0p3al6x1q78bdyhixjgk2plc";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base config-ini directory extra filepath process simple-cmd
+         simple-cmd-args text
+       ];
+       description = "CLI tool for building across Stackage major versions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stack-bump" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, filepath
      , Glob, hspec, lens, lens-aeson, optparse-applicative, process
@@ -247690,6 +248234,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "strict-tuple_0_1_4" = callPackage
+    ({ mkDerivation, base, bifunctors, deepseq, hashable }:
+     mkDerivation {
+       pname = "strict-tuple";
+       version = "0.1.4";
+       sha256 = "06fyf58kl3c5xpfdd5h7368ggbfadm5n67h3kqajrsgh3yl84hrq";
+       libraryHaskellDepends = [ base bifunctors deepseq hashable ];
+       testHaskellDepends = [ base ];
+       description = "Strict tuples";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "strict-tuple-lens" = callPackage
     ({ mkDerivation, base, lens, strict-tuple }:
      mkDerivation {
@@ -253528,6 +254085,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-hspec_1_1_6" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-hspec";
+       version = "1.1.6";
+       sha256 = "02s82ijs2ringqxsqbm7m3vcy5brmwxa617azxv0v2phi3rdkjvl";
+       libraryHaskellDepends = [
+         base hspec hspec-core QuickCheck tasty tasty-quickcheck
+         tasty-smallcheck
+       ];
+       description = "Hspec support for the Tasty test framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-html" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers, filepath
      , generic-deriving, mtl, semigroups, stm, tagged, tasty, text
@@ -254420,6 +254994,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "technique" = callPackage
+    ({ mkDerivation, async, base, containers, core-data, core-program
+     , core-text, dlist, free, hashable, hspec, ivar-simple, megaparsec
+     , mtl, parser-combinators, prettyprinter, text, transformers
+     , uuid-types
+     }:
+     mkDerivation {
+       pname = "technique";
+       version = "0.2.5";
+       sha256 = "03z8m5hmchrpc2bvs9r2dkbjfdx05y92wwc5vl04rc9895k74g3l";
+       isLibrary = false;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base containers core-data core-program core-text dlist free
+         hashable ivar-simple megaparsec mtl parser-combinators
+         prettyprinter text transformers uuid-types
+       ];
+       executableHaskellDepends = [
+         base containers core-data core-program core-text dlist free
+         ivar-simple megaparsec parser-combinators prettyprinter text
+       ];
+       testHaskellDepends = [
+         async base containers core-data core-program core-text dlist free
+         hashable hspec ivar-simple megaparsec mtl parser-combinators
+         prettyprinter text transformers uuid-types
+       ];
+       doHaddock = false;
+       description = "Procedures and Sequences";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "teeth" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -254525,8 +255130,8 @@ self: {
      }:
      mkDerivation {
        pname = "telegram-bot-simple";
-       version = "0.3.3";
-       sha256 = "0lbk7j6y2hzkd5hhd1wsdvsixgnim1xzy1nram2msm5jin9wy9rb";
+       version = "0.3.4";
+       sha256 = "1a007ldp20lcmv55zjca5hc0pszvp2n5yprl4lri9dn49xa8mf6k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -254537,10 +255142,11 @@ self: {
          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
+         aeson aeson-pretty base bytestring cron filepath hashable
+         http-api-data http-client http-client-tls monad-control mtl
+         pretty-show profunctors servant servant-client servant-multipart
+         split stm template-haskell text time transformers
+         unordered-containers
        ];
        description = "Easy to use library for building Telegram bots";
        license = stdenv.lib.licenses.bsd3;
@@ -255683,8 +256289,8 @@ self: {
      }:
      mkDerivation {
        pname = "tesla";
-       version = "0.2.0.0";
-       sha256 = "0gpzkrh5238n42h158np1k14a28y11kgicwbv6w4br6h0rnbr9d3";
+       version = "0.3.0.1";
+       sha256 = "0idn4pgzkg1n1xq5z3qihrb7nrpaxba3y98vcx52nl35c4flps4p";
        libraryHaskellDepends = [
          aeson base bytestring casing containers exceptions generic-deriving
          lens lens-aeson monad-logger mtl template-haskell text time
@@ -260668,20 +261274,20 @@ self: {
        broken = true;
      }) {};
 
-  "tldr_0_8_0" = callPackage
+  "tldr_0_9_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmark, containers
-     , directory, filepath, optparse-applicative, semigroups, tasty
-     , tasty-golden, text, typed-process
+     , directory, filepath, http-conduit, optparse-applicative
+     , semigroups, tasty, tasty-golden, text, time, zip-archive
      }:
      mkDerivation {
        pname = "tldr";
-       version = "0.8.0";
-       sha256 = "02by0mj2mk2k8xwcn92zd0cns8fj6fibi0wx5h2zlnm5aj53nffv";
+       version = "0.9.0";
+       sha256 = "0dixx8i6ka3ksfcr6bjybs1i3ry0wpiffsmskh56cxxcys0jgm5h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring cmark containers directory filepath
-         optparse-applicative semigroups text typed-process
+         http-conduit optparse-applicative semigroups text time zip-archive
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-golden ];
@@ -260781,8 +261387,8 @@ self: {
      }:
      mkDerivation {
        pname = "tlynx";
-       version = "0.4.1";
-       sha256 = "07fql189rm0xc7vx3ch86n5xrhd57zn2h80gxwmr9qaqc5p9b2qp";
+       version = "0.5.0";
+       sha256 = "1q7mca9gg9fshj5d2yhbvv3ll33z7h7ga3lbli3fax6dk2ncw6pm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -262173,6 +262779,28 @@ self: {
        broken = true;
      }) {};
 
+  "tracing_0_0_5_2" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , case-insensitive, containers, hspec, http-client, mtl, network
+     , random, stm, text, time, transformers, unliftio
+     }:
+     mkDerivation {
+       pname = "tracing";
+       version = "0.0.5.2";
+       sha256 = "0h0ga56pikym7igqzbb4lm1qnjnfzn533z0mx7jz3hjpgflk8xxs";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring case-insensitive containers
+         http-client mtl network random stm text time transformers unliftio
+       ];
+       testHaskellDepends = [
+         base containers hspec mtl stm text unliftio
+       ];
+       description = "Distributed tracing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "tracing-control" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , case-insensitive, containers, hspec, http-client, lifted-base
@@ -262291,8 +262919,8 @@ self: {
      }:
      mkDerivation {
        pname = "trade-journal";
-       version = "0.0.1";
-       sha256 = "1zmpqwrgwf26l9gwcavhgq8d9w0bc9c5sjqkr0i7d1rbiqiqf94j";
+       version = "0.0.2";
+       sha256 = "0832dn76mfsm0a6hgw9dxzjzvn8rxkrycw5rf439gq7piqcjbbbp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -265986,15 +266614,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "type-of-html_1_6_0_0" = callPackage
+  "type-of-html_1_6_1_2" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim
      , hspec, QuickCheck, random, text, weigh
      }:
      mkDerivation {
        pname = "type-of-html";
-       version = "1.6.0.0";
-       sha256 = "1blwdwr0ryq3as7dc1wh9ixxy81q600hmm5d4bw768a5kbjc1sj6";
+       version = "1.6.1.2";
+       sha256 = "0dgfj4jk9bs6fjmmvsjxjpnvrd4nxmrnhdgvmawlfs5nib4r4al6";
        libraryHaskellDepends = [
          base bytestring containers double-conversion ghc-prim text
        ];
@@ -266665,8 +267293,6 @@ self: {
        doHaddock = false;
        description = "Efficient implementation of a dependent map with types as keys";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "types-compat" = callPackage
@@ -267311,8 +267937,8 @@ self: {
     ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }:
      mkDerivation {
        pname = "ukrainian-phonetics-basic";
-       version = "0.1.10.0";
-       sha256 = "14rc2jx621brka5sgxa8m5s38bqyzqdc1jw808zw6mll4hg6scvx";
+       version = "0.2.0.2";
+       sha256 = "016q1wq4wbwxjd3a4fbj68h525q8gc2v1gn211mq3divhzc3rhwz";
        libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ];
        description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
        license = stdenv.lib.licenses.mit;
@@ -268225,6 +268851,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uniplate_1_6_13" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, hashable, syb
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "uniplate";
+       version = "1.6.13";
+       sha256 = "1lis5qcb5j7yzd1cqjaqpb6bmkyjfb7l4nhk3ykmcma4513cjxz7";
+       libraryHaskellDepends = [
+         base containers ghc-prim hashable syb unordered-containers
+       ];
+       description = "Help writing simple, concise and fast generic operations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uniprot-kb" = callPackage
     ({ mkDerivation, attoparsec, base, hspec, neat-interpolation
      , QuickCheck, text
@@ -268393,8 +269035,8 @@ self: {
      }:
      mkDerivation {
        pname = "uniqueness-periods-vector-examples";
-       version = "0.14.1.0";
-       sha256 = "191ihc62lzgdnzr0z0skgrxb5zg1jbnv2g6faafy9krla3j4rn4s";
+       version = "0.14.5.0";
+       sha256 = "0c30dd5x1bgk40gzfa5wdrnlam0j41z0cpd1dhmcj6fzwd1l2nra";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -268430,8 +269072,8 @@ self: {
      }:
      mkDerivation {
        pname = "uniqueness-periods-vector-general";
-       version = "0.5.2.0";
-       sha256 = "08jprdi4rlq6i923q9lg6mjbiyphh26ray6kbi1pk84im3y0s6bm";
+       version = "0.5.3.0";
+       sha256 = "080s606ckbm34d5r4lr1dyvnd0zjs5mc8nn2g04xyw6ym9fsxjaa";
        libraryHaskellDepends = [
          base print-info uniqueness-periods-vector-common vector
        ];
@@ -269704,8 +270346,8 @@ self: {
      }:
      mkDerivation {
        pname = "update-nix-fetchgit";
-       version = "0.2.3";
-       sha256 = "1fmpmwg31gnablwp22a90l7q5hj6xxd57cxf3zbp3mv1xabd341k";
+       version = "0.2.4";
+       sha256 = "0ginchdkd4ihcji8m0350fam4js5z5pnbmammvnv4abgvqq05mqy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -271125,19 +271767,14 @@ self: {
      }) {};
 
   "uusi" = callPackage
-    ({ mkDerivation, base, Cabal, colourista, directory, microlens
-     , optparse-applicative, process, text
-     }:
+    ({ mkDerivation, base, Cabal, text }:
      mkDerivation {
        pname = "uusi";
-       version = "0.0.1.0";
-       sha256 = "1kxhrkfsw6n2ic5f41bw2cjpix1k9ij5s3fhvsxgfiiwn7h5g7x2";
+       version = "0.1.0.0";
+       sha256 = "1b56rasvypkp8scyxmc090jxk431lbjn72kj4md06cl9z0dg3w2r";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [
-         base Cabal colourista directory microlens optparse-applicative
-         process text
-       ];
+       executableHaskellDepends = [ base Cabal text ];
        description = "Remove all version constraints of dependencies in .cabal file";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -274048,7 +274685,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vty_5_31" = callPackage
+  "vty_5_32" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, blaze-builder
      , bytestring, Cabal, containers, deepseq, directory, filepath
      , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl
@@ -274059,8 +274696,8 @@ self: {
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.31";
-       sha256 = "0w71qnp1plqpib0b9c5kqyhybfmlw50hnlckw9jwr7m0mfssbqdb";
+       version = "5.32";
+       sha256 = "0ydbifik7xilb33phglpjkgf6r8vifipyyq0wb6111azzj7dmszs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -274161,8 +274798,8 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "vulkan";
-       version = "3.6.12";
-       sha256 = "1ysqa9vps8jkrcapbrans3k4aljw3wysqlq5z9qds29zrhki4dd0";
+       version = "3.6.13";
+       sha256 = "1js5wgjr5mcqmhaqvhyln2xq4008rk8kdhjiwh8lwsc3qjqxyibp";
        libraryHaskellDepends = [ base bytestring transformers vector ];
        librarySystemDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
@@ -274182,17 +274819,20 @@ self: {
      }) {};
 
   "vulkan-utils" = callPackage
-    ({ mkDerivation, base, bytestring, extra, file-embed, filepath
-     , template-haskell, temporary, typed-process, vulkan
+    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest
+     , extra, file-embed, filepath, template-haskell, temporary
+     , typed-process, vulkan
      }:
      mkDerivation {
        pname = "vulkan-utils";
-       version = "0.1.2.1";
-       sha256 = "1ixjw397aqw04p2gy1d1pg9c3rdww2czakqg21ihg7ldi894n8pa";
+       version = "0.1.3";
+       sha256 = "0f7bpck2g9bv1jgfj1paz305yfrhcsad3g70ybazddzh138qhgny";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bytestring extra file-embed filepath template-haskell
          temporary typed-process vulkan
        ];
+       testHaskellDepends = [ base doctest ];
        description = "Utils for the vulkan package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -275733,6 +276373,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-rate-limit" = callPackage
+    ({ mkDerivation, base, http-types, wai }:
+     mkDerivation {
+       pname = "wai-rate-limit";
+       version = "0.1.0.0";
+       sha256 = "1z7npcf0smzyfjvkmpa6dw08sg3ywx4cc4kafgxk95dh8yqnmidw";
+       libraryHaskellDepends = [ base http-types wai ];
+       description = "Rate limiting as WAI middleware";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "wai-rate-limit-redis" = callPackage
+    ({ mkDerivation, base, bytestring, hedis, http-types, tasty
+     , tasty-hedgehog, tasty-hunit, wai, wai-extra, wai-rate-limit, warp
+     }:
+     mkDerivation {
+       pname = "wai-rate-limit-redis";
+       version = "0.1.0.0";
+       sha256 = "1lwlx6krxq1pf5a2r2n4pc5crk4ia8r50xzdhrg3fjf9ydpcbv2n";
+       libraryHaskellDepends = [ base bytestring hedis wai-rate-limit ];
+       testHaskellDepends = [
+         base bytestring hedis http-types tasty tasty-hedgehog tasty-hunit
+         wai wai-extra wai-rate-limit warp
+       ];
+       description = "Redis backend for rate limiting as WAI middleware";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "wai-request-spec" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, http-types, text, wai
@@ -284747,6 +285415,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth-hashdb_1_7_1_5" = callPackage
+    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
+     , hspec, http-conduit, http-types, monad-logger, network-uri
+     , persistent, persistent-sqlite, resourcet, text
+     , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
+     , yesod-form, yesod-persistent, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-auth-hashdb";
+       version = "1.7.1.5";
+       sha256 = "14isl9mwxarba14aqhidi82yci36jdws6af2jirv7z8mfnrwysbi";
+       libraryHaskellDepends = [
+         aeson base bytestring persistent text yesod-auth yesod-core
+         yesod-form yesod-persistent
+       ];
+       testHaskellDepends = [
+         aeson base basic-prelude bytestring containers hspec http-conduit
+         http-types monad-logger network-uri persistent-sqlite resourcet
+         text unordered-containers wai-extra yesod yesod-auth yesod-core
+         yesod-test
+       ];
+       description = "Authentication plugin for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-hmac-keccak" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, mtl
      , persistent, random, shakespeare, text, yesod-auth, yesod-core
@@ -285187,6 +285881,44 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_6_18_6" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
+     , blaze-markup, bytestring, case-insensitive, cereal, clientsession
+     , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
+     , gauge, hspec, hspec-expectations, http-types, HUnit, memory
+     , monad-logger, mtl, network, parsec, path-pieces, primitive
+     , random, resourcet, 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.18.6";
+       sha256 = "1iay7lrc52krhnlkvr6bxchnwk9lj316fv2d47bh3bfay69wqc69";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-html blaze-markup bytestring
+         case-insensitive cereal clientsession conduit conduit-extra
+         containers cookie deepseq fast-logger http-types memory
+         monad-logger mtl parsec path-pieces primitive random resourcet
+         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 random resourcet shakespeare streaming-commons
+         template-haskell text transformers unliftio wai wai-extra warp
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring gauge shakespeare text
+       ];
+       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
@@ -285331,15 +286063,14 @@ self: {
 
   "yesod-eventsource" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, transformers, wai
-     , wai-eventsource, wai-extra, yesod-core
+     , wai-extra, yesod-core
      }:
      mkDerivation {
        pname = "yesod-eventsource";
-       version = "1.6.0";
-       sha256 = "12s11q6zga37xyynll7b30gpv02k7jmmzfassshci02y9niyrkkg";
+       version = "1.6.0.1";
+       sha256 = "0h8gyvlqvp6zm6kfmiwa0z7ic2377f0vi43fgcn5mlssv890z8gh";
        libraryHaskellDepends = [
-         base blaze-builder conduit transformers wai wai-eventsource
-         wai-extra yesod-core
+         base blaze-builder conduit transformers wai wai-extra yesod-core
        ];
        description = "Server-sent events support for Yesod apps";
        license = stdenv.lib.licenses.mit;
@@ -289269,8 +290000,6 @@ self: {
        ];
        description = "Password strength estimation based on zxcvbn";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
 }

From 9028b8f341a4fb6d1a86da37755403afa892364f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Nov 2020 22:00:45 +0100
Subject: [PATCH 2413/3942] haskell-time-compat: update to latest version so
 that binary-instances compiles

---
 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 02cb1d10aaa0..4ede06883ce8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1442,6 +1442,9 @@ self: super: {
 
   autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; };
 
+  # binary-instances needs the latest version.
+  time-compat = self.time-compat_1_9_4;
+
   # INSERT NEW OVERRIDES ABOVE THIS LINE
 } // (let
   inherit (self) hls-ghcide hls-brittany;

From a3d8c1284f573486267f5387fef354f92eb20a67 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Sat, 7 Nov 2020 12:36:06 +0800
Subject: [PATCH 2414/3942] haskell: add addTestToolDepends

---
 pkgs/development/haskell-modules/lib.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 58d50592ac42..192a531e5d14 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -156,6 +156,9 @@ rec {
   addBuildDepend = drv: x: addBuildDepends drv [x];
   addBuildDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.buildDepends or []) ++ xs; });
 
+  addTestToolDepend = drv: x: addTestToolDepends drv [x];
+  addTestToolDepends = drv: xs: overrideCabal drv (drv: { testToolDepends = (drv.testToolDepends or []) ++ xs; });
+
   addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x];
   addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; });
 

From 4f0af81b01bf3c4640b2318159b51dd49f757dfe Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Fri, 6 Nov 2020 14:53:08 +0800
Subject: [PATCH 2415/3942] haskellPackages.optparse-applicative_0_16_0_0: Fix
 for compgen error

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4ede06883ce8..02bf9fa2cea9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -85,6 +85,11 @@ self: super: {
     url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff";
     sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql";
   });
+  optparse-applicative_0_16_0_0 = appendPatch super.optparse-applicative_0_16_0_0 (pkgs.fetchpatch {
+    name = "optparse-applicative-0.15.1-hercules-ci-compgen.diff";
+    url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff";
+    sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql";
+  });
 
   # Fix test trying to access /home directory
   shell-conduit = overrideCabal super.shell-conduit (drv: {

From 738d4fef65684233ab7e603b324d0aaa0151d1db Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Fri, 6 Nov 2020 14:29:46 +0800
Subject: [PATCH 2416/3942] haskellPackages.optparse-generic_1_4_4: Correct
 version of dependency

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 02bf9fa2cea9..96686d990bf6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1450,6 +1450,10 @@ self: super: {
   # binary-instances needs the latest version.
   time-compat = self.time-compat_1_9_4;
 
+  optparse-generic_1_4_4 = super.optparse-generic_1_4_4.override {
+    optparse-applicative = self.optparse-applicative_0_16_0_0;
+  };
+
   # INSERT NEW OVERRIDES ABOVE THIS LINE
 } // (let
   inherit (self) hls-ghcide hls-brittany;

From b95bea03858c050fcd8cd2673a253aed45a0307a Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Fri, 6 Nov 2020 14:31:00 +0800
Subject: [PATCH 2417/3942] haskellPackages.update-nix-fetchgit: Several fixes

Fix versions of dependencies

Generate shell completions

Wrap executable so that required executables are in PATH

Make sure necessary executables for tests are present during build
---
 .../haskell-modules/configuration-common.nix    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 96686d990bf6..32a539c65735 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1450,6 +1450,23 @@ self: super: {
   # binary-instances needs the latest version.
   time-compat = self.time-compat_1_9_4;
 
+  # - Deps are required during the build for testing and also during execution,
+  #   so add them to build input and also wrap the resulting binary so they're in
+  #   PATH.
+  update-nix-fetchgit = let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ];
+  in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal
+    (addTestToolDepends (super.update-nix-fetchgit.overrideScope (self: super: {
+      optparse-generic = self.optparse-generic_1_4_4;
+      optparse-applicative = self.optparse-applicative_0_16_0_0;
+    })) deps) (drv: {
+      buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ];
+      postInstall = drv.postInstall or "" + ''
+        wrapProgram "$out/bin/update-nix-fetchgit" --prefix 'PATH' ':' "${
+          pkgs.lib.makeBinPath deps
+        }"
+      '';
+    }));
+
   optparse-generic_1_4_4 = super.optparse-generic_1_4_4.override {
     optparse-applicative = self.optparse-applicative_0_16_0_0;
   };

From e5570d9f8bb9500cbddc24923ca8291d58ed2a2e Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Fri, 6 Nov 2020 14:32:06 +0800
Subject: [PATCH 2418/3942] update-nix-fetchgit: standalone small closure

---
 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 3667a63a03e6..392504146027 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6209,6 +6209,8 @@ in
 
   update-dotdee = with python3Packages; toPythonApplication update-dotdee;
 
+  update-nix-fetchgit = haskell.lib.justStaticExecutables haskellPackages.update-nix-fetchgit;
+
   update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { };
 
   update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { };

From 407bb3ba3fa6a0e4313007e3d3eac768ff550c02 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Sat, 7 Nov 2020 13:03:29 +0800
Subject: [PATCH 2419/3942] haskell: whitespace fixes

---
 pkgs/development/haskell-modules/lib.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 192a531e5d14..4d0954a5d7af 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -86,11 +86,11 @@ rec {
      future.
 
      Instead of jailbreaking, you can patch the cabal file.
-     
+
      Note that jailbreaking at this time, doesn't lift bounds on
-     conditional branches. 
+     conditional branches.
      https://github.com/peti/jailbreak-cabal/issues/7 has further details.
-     
+
    */
   doJailbreak = drv: overrideCabal drv (drv: { jailbreak = true; });
 

From 01a403fb717f55ff3db000d02f4b555a2da6a696 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 7 Nov 2020 13:28:53 +0900
Subject: [PATCH 2420/3942] haskellPackages.quickcheck-instances: no longer
 needs doJailbreak in ghc-8.8.

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 220a8e5c207a..d0a070a72e15 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -69,7 +69,6 @@ self: super: {
   integer-logarithms = doJailbreak super.integer-logarithms;
   lucid = doJailbreak super.lucid;
   parallel = doJailbreak super.parallel;
-  quickcheck-instances = doJailbreak super.quickcheck-instances;
   setlocale = doJailbreak super.setlocale;
   split = doJailbreak super.split;
   system-fileio = doJailbreak super.system-fileio;

From bbb5016daa17b8a55d1cd77074e75787f956e88f Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 7 Nov 2020 14:11:41 +0900
Subject: [PATCH 2421/3942] haskellPackages.binary-instances: get building
 again

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 32a539c65735..cea7980be395 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1471,6 +1471,10 @@ self: super: {
     optparse-applicative = self.optparse-applicative_0_16_0_0;
   };
 
+  # Our quickcheck-instances is too old for the newer binary-instances, but
+  # quickcheck-instances is only used in the tests of binary-instances.
+  binary-instances = dontCheck super.binary-instances;
+
   # INSERT NEW OVERRIDES ABOVE THIS LINE
 } // (let
   inherit (self) hls-ghcide hls-brittany;

From 7673eda11d59309e1b9051252e44caffc98c8052 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Sat, 7 Nov 2020 17:50:17 +0800
Subject: [PATCH 2422/3942] haskell: Add documentationTarball to lib

---
 pkgs/development/haskell-modules/lib.nix      | 25 +++++++++++++++++++
 pkgs/test/default.nix                         |  1 +
 .../haskell-documentationTarball/default.nix  | 17 +++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/test/haskell-documentationTarball/default.nix

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 4d0954a5d7af..6bcc563164eb 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -235,6 +235,31 @@ rec {
     fixupPhase = ":";
   });
 
+  /* Create a documentation tarball suitable for uploading to Hackage instead
+     of building the package.
+   */
+  documentationTarball = pkg:
+    pkgs.lib.overrideDerivation pkg (drv: {
+      name = "${drv.name}-docs";
+      # Like sdistTarball, disable the "doc" output here.
+      outputs = [ "out" ];
+      buildPhase = ''
+        runHook preHaddock
+        ./Setup haddock --for-hackage
+        runHook postHaddock
+      '';
+      haddockPhase = ":";
+      checkPhase = ":";
+      installPhase = ''
+        runHook preInstall
+        mkdir -p "$out"
+        tar --format=ustar \
+          -czf "$out/${drv.name}-docs.tar.gz" \
+          -C dist/doc/html "${drv.name}-docs"
+        runHook postInstall
+      '';
+    });
+
   /* Use the gold linker. It is a linker for ELF that is designed
      "to run as fast as possible on modern systems"
    */
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index d9befb9350ad..7ee7d21fd56e 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -23,6 +23,7 @@ with pkgs;
   stdenv-inputs = callPackage ./stdenv-inputs { };
 
   haskell-shellFor = callPackage ./haskell-shellFor { };
+  haskell-documentationTarball = callPackage ./haskell-documentationTarball { };
 
   cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
   cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
diff --git a/pkgs/test/haskell-documentationTarball/default.nix b/pkgs/test/haskell-documentationTarball/default.nix
new file mode 100644
index 000000000000..aec3dc41f268
--- /dev/null
+++ b/pkgs/test/haskell-documentationTarball/default.nix
@@ -0,0 +1,17 @@
+{ pkgs, haskellPackages }:
+
+let
+  drv = haskellPackages.vector;
+  docs = pkgs.haskell.lib.documentationTarball drv;
+
+in pkgs.runCommand "test haskell.lib.documentationTarball" { } ''
+  tar xvzf "${docs}/${drv.name}-docs.tar.gz"
+
+  # Check for Haddock html
+  find "${drv.name}-docs" | grep -q "Data-Vector.html"
+
+  # Check for source html
+  find "${drv.name}-docs" | grep -q  "src/Data.Vector.html"
+
+  touch "$out"
+''

From bc1ffa457e87513096e3c01e8689524b5a5f3e47 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 9 Nov 2020 23:24:10 +0100
Subject: [PATCH 2423/3942] haskellPackages.pandoc: 2.11.1 -> 2.11.1.1

---
 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 cea7980be395..8280b225dcb6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1430,7 +1430,7 @@ self: super: {
   skylighting-core = doDistribute super.skylighting-core_0_10_0_3;
   hslua = doDistribute self.hslua_1_1_2;
   jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2;
-  pandoc = doDistribute self.pandoc_2_11_1;
+  pandoc = doDistribute self.pandoc_2_11_1_1;
   # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
   pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2);
   pandoc-types = doDistribute self.pandoc-types_1_22;

From 798e23c74fccbf4f4582aff3b3f24f5846412e0b Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 9 Nov 2020 23:25:18 +0100
Subject: [PATCH 2424/3942] haskellPackages.reflex-dom-core: Remove obsolete
 patches

---
 .../haskell-modules/configuration-common.nix  | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8280b225dcb6..e6a70c0e27cc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1261,25 +1261,7 @@ self: super: {
   patch = doJailbreak super.patch;
 
   # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
-  # Tests disabled because of very old dep: https://github.com/reflex-frp/reflex-dom/issues/393
-  reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatches super.reflex-dom-core [
-    # Upstream PR: https://github.com/reflex-frp/reflex-dom/pull/388
-    # Fix upper bounds
-    (pkgs.fetchpatch {
-      url = "https://github.com/reflex-frp/reflex-dom/commit/5ef04d8e478f410d2c63603b84af052c9273a533.patch";
-      sha256 ="0d0b819yh8mqw8ih5asdi9qcca2kmggfsi8gf22akfw1n7xvmavi";
-      stripLen = 2;
-      extraPrefix = "";
-    })
-    # Upstream PR: https://github.com/reflex-frp/reflex-dom/pull/394
-    # Bump dependent-map
-    (pkgs.fetchpatch {
-      url = "https://github.com/reflex-frp/reflex-dom/commit/695bd17d5dcdb1bf321ee8858670731637f651db.patch";
-      sha256 ="0llky3i37rakgsw9vqaqmwryv7s91w8ph8xjkh83nxjs14p5zfyk";
-      stripLen = 2;
-      extraPrefix = "";
-    })
-  ])));
+  reflex-dom-core = doDistribute (unmarkBroken (dontCheck super.reflex-dom-core));
 
   # add unreleased commit fixing version constraint as a patch
   # Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved

From becd5f5bc3c040b6220f1c8f1299ea5ff05c3a6a Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 11 Nov 2020 00:30:20 +0100
Subject: [PATCH 2425/3942] haskellPackages.matterhorn: Fix eval

---
 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 e6a70c0e27cc..364f6370e0f4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -340,7 +340,7 @@ self: super: {
   # Needs the latest version of vty and brick.
   matterhorn = super.matterhorn.overrideScope (self: super: {
     brick = self.brick_0_57;
-    vty = self.vty_5_31;
+    vty = self.vty_5_32;
   });
 
   memcache = dontCheck super.memcache;

From bf29c147c3fc616267868da67b28c3253e78b0c8 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Tue, 10 Nov 2020 22:07:19 +0100
Subject: [PATCH 2426/3942] haskellPackages.haskell-language-server: Fix build

In preparation of the upcoming 0.6.0 release I wanted to fix hls.

It introduces two new plugin packages, which are not on hackage yet.

I remove apply-refact overrides, because current apply-refact versions
are compatible with all ghcs we support, according to their changelog.

I override more of the hls dependencies globally on the whole package
set, to avoid a lot of duplicate compilations. And because @peti changed
my mind about this being a good practice.

hls now uses a released version of ghcide
---
 .../haskell-modules/configuration-common.nix  | 44 ++++++--------
 .../configuration-ghc-8.10.x.nix              |  3 -
 .../configuration-ghc-8.6.x.nix               |  3 -
 .../configuration-ghc-8.8.x.nix               |  3 -
 .../configuration-hackage2nix.yaml            |  4 --
 .../haskell-modules/non-hackage-packages.nix  |  3 +-
 .../haskell-language-server/default.nix       | 28 ++++-----
 .../haskell-language-server/hls-ghcide.nix    | 60 -------------------
 .../hls-hlint-plugin.nix                      | 26 ++++++++
 .../hls-tactics-plugin.nix                    | 32 ++++++++++
 .../haskell/haskell-language-server/update.sh | 20 +------
 11 files changed, 95 insertions(+), 131 deletions(-)
 delete mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
 create mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
 create mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 364f6370e0f4..c4b10e436ace 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1229,14 +1229,6 @@ self: super: {
     sha256 = "0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2";
   });
 
-  # this will probably need to get updated with every ghcide update,
-  # we need an override because ghcide is tracking haskell-lsp closely.
-  ghcide = dontCheck (super.ghcide.overrideScope (self: super: {
-    hie-bios = dontCheck super.hie-bios_0_7_1;
-    lsp-test = dontCheck self.lsp-test_0_11_0_7;
-  }));
-  implicit-hie-cradle = super.implicit-hie-cradle.override { hie-bios = dontCheck super.hie-bios_0_7_1; };
-
   # hasn‘t bumped upper bounds
   # upstream: https://github.com/obsidiansystems/which/pull/6
   which = doJailbreak super.which;
@@ -1459,25 +1451,27 @@ self: super: {
 
   # INSERT NEW OVERRIDES ABOVE THIS LINE
 } // (let
-  inherit (self) hls-ghcide hls-brittany;
-  hlsScopeOverride = self: super: {
-    # haskell-language-server uses its own fork of ghcide
-    # Test disabled: it seems to freeze (is it just that it takes a long time ?)
-    ghcide = dontCheck hls-ghcide;
-    # we are faster than stack here
-    hie-bios = dontCheck super.hie-bios_0_7_1;
-    lsp-test = dontCheck super.lsp-test_0_11_0_7;
-    # fourmolu can‘t compile with an older aeson
+  # fourmolu can‘t compile with an older aeson
+  overrideAeson = name: value: value.overrideScope (self: super: {
     aeson = dontCheck super.aeson_1_5_2_0;
-    # brittany has an aeson upper bound of 1.5
-    brittany = hls-brittany;
+  });
+  in pkgs.lib.mapAttrs overrideAeson {
+    # tons of overrides for bleeding edge versions for ghcide and hls
+    # overriding aeson on all of them to prevent double compilations
+    # this shouldn‘t break anything because nearly all their reverse deps are
+    # in this list or marked as broken anyways
+    haskell-language-server = dontCheck super.haskell-language-server;
+    fourmolu = dontCheck super.fourmolu;
+    stylish-haskell = super.stylish-haskell_0_12_2_0;
+    ghcide = dontCheck super.ghcide;
+    refinery = super.refinery_0_3_0_0;
     data-tree-print = doJailbreak super.data-tree-print;
     ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2;
-  };
-  in {
-    haskell-language-server = dontCheck (super.haskell-language-server.overrideScope hlsScopeOverride);
-    hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride);
-    hls-brittany = dontCheck (super.hls-brittany.overrideScope hlsScopeOverride);
-    fourmolu = dontCheck (super.fourmolu.overrideScope hlsScopeOverride);
+    hie-bios = dontCheck super.hie-bios_0_7_1;
+    lsp-test = dontCheck super.lsp-test_0_11_0_7;
+    # the hls brittany is objectively better, because there hasn‘t been a
+    # brittany release in a while and this version works with 8.10.
+    # And we need to build it anyways.
+    brittany = dontCheck super.hls-brittany;
   }
 )  // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 047c5ba481fb..b801a08a9eab 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -111,9 +111,6 @@ self: super: {
     sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
   });
 
-  # Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog
-  apply-refact = super.apply-refact_0_8_0_0;
-
   # https://github.com/commercialhaskell/pantry/issues/21
   pantry = appendPatch super.pantry (pkgs.fetchpatch {
     name = "add-cabal-3.2.x-support.patch";
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index f2da20426ace..0a64c20ea7a5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -91,7 +91,4 @@ self: super: {
 
   # ghc versions prior to 8.8.x needs additional dependency to compile successfully.
   ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser;
-
-  # Only 0.6 is compatible with ghc 8.6 https://hackage.haskell.org/package/apply-refact/changelog
-  apply-refact = super.apply-refact_0_6_0_0;
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index d0a070a72e15..718186c9f38f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -104,9 +104,6 @@ self: super: {
   # of issues with Cabal 3.x.
   darcs = dontDistribute super.darcs;
 
-  # Only 0.7 is compatible with ghc 8.7 https://hackage.haskell.org/package/apply-refact/changelog
-  apply-refact = super.apply-refact_0_7_0_0;
-
   # The package needs the latest Cabal version.
   cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c232eb7162ad..9ff253a42326 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2546,10 +2546,6 @@ extra-packages:
   - aeson-pretty < 0.8                  # required by elm compiler
   - Agda == 2.6.1                       # allows the agdaPackage set to be fixed to this version so that it won't break when another agda version is released.
   - ansi-terminal == 0.10.3             # required by cabal-plan, and policeman in ghc-8.8.x
-  - apply-refact < 0.4                  # newer versions don't work with GHC 8.0.x
-  - apply-refact == 0.6.0.0             # works with GHC 8.6.x https://hackage.haskell.org/package/apply-refact/changelog
-  - apply-refact == 0.7.0.0             # works with GHC 8.8.x https://hackage.haskell.org/package/apply-refact/changelog
-  - apply-refact == 0.8.0.0             # works with GHC 8.10.x https://hackage.haskell.org/package/apply-refact/changelog
   - 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
   - Cabal == 2.2.*                      # required for jailbreak-cabal etc.
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 52a2737ebb74..c79673a28646 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -22,8 +22,9 @@ self: super: {
   # HLS and its fork of ghcide that it uses
   # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh
   haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { };
-  hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { };
   hls-brittany = self.callPackage ../tools/haskell/haskell-language-server/hls-brittany.nix { };
+  hls-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-plugin.nix { };
+  hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { };
 
   nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
 
diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix
index 0c1b6d0dbcca..530ed7c28391 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/default.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix
@@ -1,22 +1,22 @@
 { mkDerivation, aeson, base, binary, blaze-markup, brittany
 , bytestring, containers, data-default, deepseq, directory, extra
-, fetchgit, filepath, fingertree, floskell, fourmolu, ghc
-, ghc-boot-th, ghc-exactprint, ghc-paths, ghc-source-gen, ghcide
-, gitrev, hashable, haskell-lsp, hie-bios, hls-plugin-api, hslogger
+, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th
+, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios
+, hls-hlint-plugin, hls-plugin-api, hls-tactics-plugin, hslogger
 , hspec, hspec-core, lens, lsp-test, mtl, optparse-applicative
-, optparse-simple, ormolu, process, refinery, regex-tdfa, retrie
-, safe-exceptions, shake, stdenv, stm, stylish-haskell, syb, tasty
+, optparse-simple, ormolu, process, regex-tdfa, retrie
+, safe-exceptions, shake, stdenv, stm, stylish-haskell, tasty
 , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit
 , tasty-rerun, temporary, text, time, transformers
 , unordered-containers, yaml
 }:
 mkDerivation {
   pname = "haskell-language-server";
-  version = "0.5.0.0";
+  version = "0.5.1.0";
   src = fetchgit {
     url = "https://github.com/haskell/haskell-language-server.git";
-    sha256 = "1qi762fa72487i8fspxmr8xizm9n2s1shxsvnvsl67vj9if573r9";
-    rev = "3ca2a6cd267f373aae19f59e1cf9e04b6524eff3";
+    sha256 = "1w15p988a5h11fcp25lllaj7j78f35gzg5bixy1vs7ld0p6jj7n9";
+    rev = "8682517e9ff92caa35e727e28445896f97c61e8d";
     fetchSubmodules = true;
   };
   isLibrary = true;
@@ -29,12 +29,12 @@ mkDerivation {
   ];
   executableHaskellDepends = [
     aeson base binary brittany bytestring containers deepseq directory
-    extra filepath fingertree floskell fourmolu ghc ghc-boot-th
-    ghc-exactprint ghc-paths ghc-source-gen ghcide gitrev hashable
-    haskell-lsp hie-bios hls-plugin-api hslogger lens mtl
-    optparse-applicative optparse-simple ormolu process refinery
-    regex-tdfa retrie safe-exceptions shake stylish-haskell syb
-    temporary text time transformers unordered-containers
+    extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide
+    gitrev hashable haskell-lsp hie-bios hls-hlint-plugin
+    hls-plugin-api hls-tactics-plugin hslogger lens mtl
+    optparse-applicative optparse-simple ormolu process regex-tdfa
+    retrie safe-exceptions shake stylish-haskell temporary text time
+    transformers unordered-containers
   ];
   testHaskellDepends = [
     aeson base blaze-markup bytestring containers data-default
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
deleted file mode 100644
index 450c665bef85..000000000000
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ mkDerivation, aeson, array, async, base, base16-bytestring
-, binary, bytestring, Chart, Chart-diagrams, containers
-, cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg
-, directory, extra, fetchgit, filepath, fingertree, fuzzy, ghc
-, ghc-boot, ghc-boot-th, ghc-check, ghc-paths
-, ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable
-, haskell-lsp, haskell-lsp-types, hie-bios, hslogger
-, implicit-hie-cradle, lens, lsp-test, mtl, network-uri
-, optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
-, process, QuickCheck, quickcheck-instances
-, record-dot-preprocessor, record-hasfield, regex-tdfa
-, rope-utf16-splay, safe, safe-exceptions, shake, sorted-list
-, stdenv, stm, syb, tasty, tasty-expected-failure, tasty-hunit
-, tasty-quickcheck, tasty-rerun, text, time, transformers, unix
-, unordered-containers, utf8-string, yaml
-}:
-mkDerivation {
-  pname = "ghcide";
-  version = "0.4.0";
-  src = fetchgit {
-    url = "https://github.com/haskell/ghcide";
-    sha256 = "0zv14mvfhmwwkhyzkr38qpvyffa8ywzp41lr1k55pbrc5b10fjr6";
-    rev = "0bfce3114c28bd00f7bf5729c32ec0f23a8d8854";
-    fetchSubmodules = true;
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson array async base base16-bytestring binary bytestring
-    containers cryptohash-sha1 data-default deepseq directory extra
-    filepath fingertree fuzzy ghc ghc-boot ghc-boot-th ghc-check
-    ghc-paths Glob haddock-library hashable haskell-lsp
-    haskell-lsp-types hie-bios hslogger implicit-hie-cradle mtl
-    network-uri prettyprinter prettyprinter-ansi-terminal regex-tdfa
-    rope-utf16-splay safe safe-exceptions shake sorted-list stm syb
-    text time transformers unix unordered-containers utf8-string
-  ];
-  executableHaskellDepends = [
-    aeson base bytestring containers data-default directory extra
-    filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios
-    lens lsp-test optparse-applicative process safe-exceptions text
-    unordered-containers
-  ];
-  testHaskellDepends = [
-    aeson base binary bytestring containers directory extra filepath
-    ghc ghc-typelits-knownnat haddock-library haskell-lsp
-    haskell-lsp-types lens lsp-test network-uri optparse-applicative
-    process QuickCheck quickcheck-instances record-dot-preprocessor
-    record-hasfield rope-utf16-splay safe safe-exceptions shake tasty
-    tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
-    text
-  ];
-  benchmarkHaskellDepends = [
-    aeson base Chart Chart-diagrams diagrams diagrams-svg directory
-    extra filepath shake text yaml
-  ];
-  homepage = "https://github.com/haskell/ghcide#readme";
-  description = "The core of an IDE";
-  license = stdenv.lib.licenses.asl20;
-}
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
new file mode 100644
index 000000000000..8fd3cdb2a32b
--- /dev/null
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
@@ -0,0 +1,26 @@
+{ mkDerivation, aeson, apply-refact, base, binary, bytestring
+, containers, data-default, deepseq, Diff, directory, extra
+, fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide
+, hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens
+, regex-tdfa, shake, stdenv, temporary, text, transformers
+, unordered-containers
+}:
+mkDerivation {
+  pname = "hls-hlint-plugin";
+  version = "0.1.0.0";
+  src = fetchgit {
+    url = "https://github.com/haskell/haskell-language-server.git";
+    sha256 = "1w15p988a5h11fcp25lllaj7j78f35gzg5bixy1vs7ld0p6jj7n9";
+    rev = "8682517e9ff92caa35e727e28445896f97c61e8d";
+    fetchSubmodules = true;
+  };
+  postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot";
+  libraryHaskellDepends = [
+    aeson apply-refact base binary bytestring containers data-default
+    deepseq Diff directory extra filepath ghc ghc-lib ghc-lib-parser-ex
+    ghcide hashable haskell-lsp hlint hls-plugin-api hslogger lens
+    regex-tdfa shake temporary text transformers unordered-containers
+  ];
+  description = "Hlint integration plugin with Haskell Language Server";
+  license = stdenv.lib.licenses.asl20;
+}
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
new file mode 100644
index 000000000000..5fa0f6ed0cf9
--- /dev/null
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
@@ -0,0 +1,32 @@
+{ mkDerivation, aeson, base, checkers, containers, deepseq
+, directory, extra, fetchgit, filepath, fingertree, generic-lens
+, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide
+, haskell-lsp, hie-bios, hls-plugin-api, hspec, lens, mtl
+, QuickCheck, refinery, retrie, shake, stdenv, syb, text
+, transformers
+}:
+mkDerivation {
+  pname = "hls-tactics-plugin";
+  version = "0.5.1.0";
+  src = fetchgit {
+    url = "https://github.com/haskell/haskell-language-server.git";
+    sha256 = "1w15p988a5h11fcp25lllaj7j78f35gzg5bixy1vs7ld0p6jj7n9";
+    rev = "8682517e9ff92caa35e727e28445896f97c61e8d";
+    fetchSubmodules = true;
+  };
+  postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot";
+  libraryHaskellDepends = [
+    aeson base containers deepseq directory extra filepath fingertree
+    generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide
+    haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text
+    transformers
+  ];
+  testHaskellDepends = [
+    base checkers containers ghc hie-bios hls-plugin-api hspec mtl
+    QuickCheck
+  ];
+  homepage = "https://github.com/isovector/hls-tactics-plugin#readme";
+  description = "LSP server for GHC";
+  license = "unknown";
+  hydraPlatforms = stdenv.lib.platforms.none;
+}
diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh
index fd22a80126d9..fbd97b5488a8 100755
--- a/pkgs/development/tools/haskell/haskell-language-server/update.sh
+++ b/pkgs/development/tools/haskell/haskell-language-server/update.sh
@@ -15,24 +15,6 @@ set -eo pipefail
 # This is the directory of this update.sh script.
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-# ===========================
-# ghcide fork on https://github.com/wz1000/ghcide
-# ===========================
-
-# ghcide derivation created with cabal2nix.
-ghcide_derivation_file="${script_dir}/hls-ghcide.nix"
-
-# This is the current revision of hls in Nixpkgs.
-ghcide_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$ghcide_derivation_file")"
-
-# This is the revision of ghcide used by hls on GitHub.
-ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/contents/ghcide" | jq '.sha' --raw-output)
-
-echo "Updating haskell-language-server's ghcide from old version $ghcide_old_version to new version $ghcide_new_version."
-echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..."
-
-cabal2nix --revision "$ghcide_new_version" "https://github.com/haskell/ghcide" > "$ghcide_derivation_file"
-
 # ===========================
 # HLS maintainer's Brittany fork
 # ===========================
@@ -67,5 +49,7 @@ echo "Updating haskell-language-server from old version $hls_old_version to new
 echo "Running cabal2nix and outputting to ${hls_derivation_file}..."
 
 cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file"
+cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix"
+cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix"
 
 echo "Finished."

From 13f96d5d655b2dfa02490d181e3784978deede69 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 11 Nov 2020 10:55:29 +0100
Subject: [PATCH 2427/3942] haskell-language-server: 0.6.0rc -> 0.6.0

---
 .../tools/haskell/haskell-language-server/default.nix       | 6 +++---
 .../haskell/haskell-language-server/hls-hlint-plugin.nix    | 4 ++--
 .../haskell/haskell-language-server/hls-tactics-plugin.nix  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix
index 530ed7c28391..a19e05759136 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/default.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix
@@ -12,11 +12,11 @@
 }:
 mkDerivation {
   pname = "haskell-language-server";
-  version = "0.5.1.0";
+  version = "0.6.0.0";
   src = fetchgit {
     url = "https://github.com/haskell/haskell-language-server.git";
-    sha256 = "1w15p988a5h11fcp25lllaj7j78f35gzg5bixy1vs7ld0p6jj7n9";
-    rev = "8682517e9ff92caa35e727e28445896f97c61e8d";
+    sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj";
+    rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c";
     fetchSubmodules = true;
   };
   isLibrary = true;
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
index 8fd3cdb2a32b..3a730dc71642 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
@@ -10,8 +10,8 @@ mkDerivation {
   version = "0.1.0.0";
   src = fetchgit {
     url = "https://github.com/haskell/haskell-language-server.git";
-    sha256 = "1w15p988a5h11fcp25lllaj7j78f35gzg5bixy1vs7ld0p6jj7n9";
-    rev = "8682517e9ff92caa35e727e28445896f97c61e8d";
+    sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj";
+    rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot";
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
index 5fa0f6ed0cf9..3d168622fb7d 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
@@ -10,8 +10,8 @@ mkDerivation {
   version = "0.5.1.0";
   src = fetchgit {
     url = "https://github.com/haskell/haskell-language-server.git";
-    sha256 = "1w15p988a5h11fcp25lllaj7j78f35gzg5bixy1vs7ld0p6jj7n9";
-    rev = "8682517e9ff92caa35e727e28445896f97c61e8d";
+    sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj";
+    rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot";

From 425d22e6cfb81c7c4a65407524c1134e2a910391 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 11 Nov 2020 11:42:14 +0100
Subject: [PATCH 2428/3942] haskellPackages: Fix eval errors

---
 .../haskell-modules/configuration-hackage2nix.yaml            | 2 ++
 pkgs/development/haskell-modules/hackage-packages.nix         | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 9ff253a42326..89a6f825ff89 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7727,6 +7727,7 @@ broken-packages:
   - mcl
   - mcm
   - mcmaster-gloss-examples
+  - mcmc
   - mcmc-samplers
   - mcmc-synthesis
   - mcpi
@@ -8559,6 +8560,7 @@ broken-packages:
   - pbc4hs
   - PBKDF2
   - pcap-enumerator
+  - pcapng
   - pcd-loader
   - pcf
   - pcf-font
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8262fdb54c68..5115cbcee680 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -170933,6 +170933,8 @@ self: {
        ];
        description = "Sample from a posterior using Markov chain Monte Carlo";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mcmc-samplers" = callPackage
@@ -196664,6 +196666,8 @@ self: {
          text unliftio-core validity
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcd-loader" = callPackage

From ed26917b674b1b42f0c970ec906e5f7e7f88f46a Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 11 Nov 2020 11:42:32 +0100
Subject: [PATCH 2429/3942] haskellPackages: Cleanup unneeded builds

---
 .../configuration-hackage2nix.yaml            |   2 -
 .../haskell-modules/hackage-packages.nix      | 182 ------------------
 2 files changed, 184 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 89a6f825ff89..11bf99d4516c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2586,8 +2586,6 @@ extra-packages:
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - network == 2.6.3.1                  # newer versions don't compile with GHC 7.4.x and below
   - network == 3.0.*                    # required by network-bsd, HTTP, and many others (2019-04-30)
-  - ormolu == 0.0.5.0                   # required by haskell-language-server
-  - pandoc-types == 1.21                # required by for pandoc_2_10_1
   - pantry == 0.2.0.0                   # required by stack-2.1.3.1
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
   - patience ^>= 0.1                    # required by chell-0.4.x
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 5115cbcee680..5ee222dcdfce 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -31683,136 +31683,6 @@ self: {
        broken = true;
      }) {};
 
-  "apply-refact_0_3_0_1" = callPackage
-    ({ mkDerivation, base, containers, directory, filemanip, filepath
-     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
-     , silently, syb, tasty, tasty-expected-failure, tasty-golden
-     , temporary, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "apply-refact";
-       version = "0.3.0.1";
-       sha256 = "0578ql80fzkbjiw589v4498qd9jd7l2sz626imkdybxr1lqbsm0p";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filemanip ghc ghc-exactprint mtl process
-         refact syb temporary transformers unix-compat
-       ];
-       executableHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact syb temporary transformers
-         unix-compat
-       ];
-       testHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact silently syb tasty
-         tasty-expected-failure tasty-golden temporary transformers
-         unix-compat
-       ];
-       description = "Perform refactorings specified by the refact library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "apply-refact_0_6_0_0" = callPackage
-    ({ mkDerivation, base, containers, directory, filemanip, filepath
-     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
-     , silently, syb, tasty, tasty-expected-failure, tasty-golden
-     , temporary, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "apply-refact";
-       version = "0.6.0.0";
-       sha256 = "0p2mqgjcqr1zcmk8zgr0yq7g8z1agsa6l493lkj6g3ya9lyhxgig";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filemanip ghc ghc-exactprint mtl process
-         refact syb temporary transformers unix-compat
-       ];
-       executableHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact syb temporary transformers
-         unix-compat
-       ];
-       testHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact silently syb tasty
-         tasty-expected-failure tasty-golden temporary transformers
-         unix-compat
-       ];
-       description = "Perform refactorings specified by the refact library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "apply-refact_0_7_0_0" = callPackage
-    ({ mkDerivation, base, containers, directory, filemanip, filepath
-     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
-     , silently, syb, tasty, tasty-expected-failure, tasty-golden
-     , temporary, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "apply-refact";
-       version = "0.7.0.0";
-       sha256 = "1facic5lbc9xih6w1kfr3inwvada6y98n9xgc6iv6r057zr8jfp0";
-       revision = "1";
-       editedCabalFile = "0ilyhm6nz1mkjdq13pgzgplmmfqrv6b5ailyhvbds362pqjqw72q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filemanip ghc ghc-exactprint mtl process
-         refact syb temporary transformers unix-compat
-       ];
-       executableHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact syb temporary transformers
-         unix-compat
-       ];
-       testHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact silently syb tasty
-         tasty-expected-failure tasty-golden temporary transformers
-         unix-compat
-       ];
-       description = "Perform refactorings specified by the refact library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "apply-refact_0_8_0_0" = callPackage
-    ({ mkDerivation, base, containers, directory, filemanip, filepath
-     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
-     , silently, syb, tasty, tasty-expected-failure, tasty-golden
-     , temporary, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "apply-refact";
-       version = "0.8.0.0";
-       sha256 = "0hh7flildjfbigs0knhd3bfd4r3wnhg4ji4cpkx1qagnp5cs4pk0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filemanip ghc ghc-exactprint mtl process
-         refact syb temporary transformers unix-compat
-       ];
-       executableHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact syb temporary transformers
-         unix-compat
-       ];
-       testHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact silently syb tasty
-         tasty-expected-failure tasty-golden temporary transformers
-         unix-compat
-       ];
-       description = "Perform refactorings specified by the refact library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "apply-refact" = callPackage
     ({ mkDerivation, base, containers, directory, extra, filemanip
      , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative
@@ -192063,34 +191933,6 @@ self: {
        broken = true;
      }) {};
 
-  "ormolu_0_0_5_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dlist, exceptions
-     , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl
-     , optparse-applicative, path, path-io, syb, text
-     }:
-     mkDerivation {
-       pname = "ormolu";
-       version = "0.0.5.0";
-       sha256 = "1sf22silpj89sldd7wanlr34nsv77bq0cf4i0q1x2r20pz7s4w4m";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers dlist exceptions ghc-lib-parser mtl syb
-         text
-       ];
-       executableHaskellDepends = [
-         base ghc-lib-parser gitrev optparse-applicative text
-       ];
-       testHaskellDepends = [
-         base containers filepath hspec path path-io text
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A formatter for Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "ormolu" = callPackage
     ({ mkDerivation, base, bytestring, containers, dlist, exceptions
      , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl
@@ -193761,30 +193603,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-types_1_21" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "pandoc-types";
-       version = "1.21";
-       sha256 = "1wbb0hhjiw0b66kj1ck3qipwgdac5v7qvjaqszsz5fll3cqp4sna";
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq ghc-prim QuickCheck syb
-         text transformers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers HUnit QuickCheck string-qq syb
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-       ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Types for representing a structured document";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "pandoc-types_1_22" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb

From 3cbe2b5bc3da7ba3fe685c31ac80d36877c070b1 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 11 Nov 2020 15:48:19 +0100
Subject: [PATCH 2430/3942] haskell-language-server: Fix hydra config for deps

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c4b10e436ace..d1e05f502aa9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1452,10 +1452,10 @@ self: super: {
   # INSERT NEW OVERRIDES ABOVE THIS LINE
 } // (let
   # fourmolu can‘t compile with an older aeson
-  overrideAeson = name: value: value.overrideScope (self: super: {
+  localOverride = name: value: doDistribute (value.overrideScope (self: super: {
     aeson = dontCheck super.aeson_1_5_2_0;
-  });
-  in pkgs.lib.mapAttrs overrideAeson {
+  }));
+  in pkgs.lib.mapAttrs localOverride {
     # tons of overrides for bleeding edge versions for ghcide and hls
     # overriding aeson on all of them to prevent double compilations
     # this shouldn‘t break anything because nearly all their reverse deps are
@@ -1469,6 +1469,8 @@ self: super: {
     ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2;
     hie-bios = dontCheck super.hie-bios_0_7_1;
     lsp-test = dontCheck super.lsp-test_0_11_0_7;
+    hls-plugin-api = super.hls-plugin-api;
+    implicit-hie-cradle = super.implicit-hie-cradle;
     # the hls brittany is objectively better, because there hasn‘t been a
     # brittany release in a while and this version works with 8.10.
     # And we need to build it anyways.

From bacdeffd804c1da6700d2ab424cf2b74ca7e5355 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 11 Nov 2020 22:17:28 +0100
Subject: [PATCH 2431/3942] haskellPackages.hls-hlint-plugin: Fix build on
 hydra

---
 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 d1e05f502aa9..20f5357f78a8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1470,6 +1470,7 @@ self: super: {
     hie-bios = dontCheck super.hie-bios_0_7_1;
     lsp-test = dontCheck super.lsp-test_0_11_0_7;
     hls-plugin-api = super.hls-plugin-api;
+    hls-hlint-plugin = super.hls-hlint-plugin;
     implicit-hie-cradle = super.implicit-hie-cradle;
     # the hls brittany is objectively better, because there hasn‘t been a
     # brittany release in a while and this version works with 8.10.

From c3b35f21f78a3d23aaf40b70fe8865598ddc6729 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 11 Nov 2020 10:36:19 +0800
Subject: [PATCH 2432/3942] lib: Add composeManyExtensions

---
 lib/default.nix      |  4 ++--
 lib/fixed-points.nix | 11 ++++++++++-
 lib/tests/misc.nix   | 20 ++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index d2239d26eadf..e3c1ed713463 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -5,7 +5,7 @@
  */
 let
 
-  inherit (import ./fixed-points.nix {}) makeExtensible;
+  inherit (import ./fixed-points.nix { inherit lib; }) makeExtensible;
 
   lib = makeExtensible (self: let
     callLibs = file: import file { lib = self; };
@@ -69,7 +69,7 @@ let
       importJSON importTOML warn info showWarnings nixpkgsVersion version mod compare
       splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits;
     inherit (self.fixedPoints) fix fix' converge extends composeExtensions
-      makeExtensible makeExtensibleWithCustomName;
+      composeManyExtensions makeExtensible makeExtensibleWithCustomName;
     inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath
       getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs
       filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs
diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix
index 968930526a63..f998bc74e1db 100644
--- a/lib/fixed-points.nix
+++ b/lib/fixed-points.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ lib, ... }:
 rec {
   # Compute the fixed point of the given function `f`, which is usually an
   # attribute set that expects its final, non-recursive representation as an
@@ -77,6 +77,15 @@ rec {
           super' = super // fApplied;
       in fApplied // g self super';
 
+  # Compose several extending functions of the type expected by 'extends' into
+  # one where changes made in preceding functions are made available to
+  # subsequent ones.
+  #
+  # composeManyExtensions : [packageSet -> packageSet -> packageSet] -> packageSet -> packageSet -> packageSet
+  #                          ^final        ^prev         ^overrides     ^final        ^prev         ^overrides
+  composeManyExtensions =
+    lib.foldr (x: y: composeExtensions x y) (self: super: {});
+
   # Create an overridable, recursive attribute set. For example:
   #
   #     nix-repl> obj = makeExtensible (self: { })
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 6175f15819a7..35a5801c724f 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -87,6 +87,26 @@ runTests {
     expected = true;
   };
 
+  testComposeManyExtensions0 = {
+    expr = let obj = makeExtensible (self: { foo = true; });
+               emptyComposition = composeManyExtensions [];
+               composed = obj.extend emptyComposition;
+           in composed.foo;
+    expected = true;
+  };
+
+  testComposeManyExtensions =
+    let f = self: super: { bar = false; baz = true; };
+        g = self: super: { bar = super.baz or false; };
+        h = self: super: { qux = super.bar or false; };
+        obj = makeExtensible (self: { foo = self.qux; });
+    in {
+    expr = let composition = composeManyExtensions [f g h];
+               composed = obj.extend composition;
+           in composed.foo;
+    expected = (obj.extend (composeExtensions f (composeExtensions g h))).foo;
+  };
+
   testBitAnd = {
     expr = (bitAnd 3 10);
     expected = 2;

From 07e697d22d91a4f1ae75da32c457a432f46d7bd1 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 11 Nov 2020 11:01:53 +0800
Subject: [PATCH 2433/3942] haskell: improve documentation on ghcWithHoogle and
 developPackage

---
 pkgs/development/haskell-modules/make-package-set.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index ac65fad35270..77060c8d8641 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -228,6 +228,9 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     # 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.
+    # If 'returnShellEnv' is true this returns a derivation which will give you
+    # an environment suitable for developing the listed packages with an
+    # incremental tool like cabal-install.
     developPackage =
       { root
       , name ? builtins.baseNameOf root
@@ -245,6 +248,13 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
 
     ghcWithPackages = selectFrom: withPackages (selectFrom self);
 
+    # Put 'hoogle' into the derivation's PATH with a database containing all
+    # the package's dependencies; run 'hoogle server --local' in a shell to
+    # host a search engine for the dependencies.
+    #
+    # To reload the Hoogle server automatically on .cabal file changes try
+    # this:
+    # echo *.cabal | entr -r -- nix-shell --run 'hoogle server --local'
     ghcWithHoogle = selectFrom:
       let
         packages = selectFrom self;

From a32c231007afc4a934bcca47a9ac7edb44a5f784 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 11 Nov 2020 11:02:05 +0800
Subject: [PATCH 2434/3942] haskell: add withHoogle option to developPackage

---
 pkgs/development/haskell-modules/make-package-set.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 77060c8d8641..2ce8ad989f8d 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -221,6 +221,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     #   , overrides : Defaulted (HaskellPackageOverrideSet)
     #   , modifier : Defaulted
     #   , returnShellEnv : Defaulted
+    #   , withHoogle : Defaulted
     #   } -> NixShellAwareDerivation
     # Given a path to a haskell package directory, an optional package name
     # which defaults to the base name of the path, an optional set of source
@@ -231,20 +232,26 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     # If 'returnShellEnv' is true this returns a derivation which will give you
     # an environment suitable for developing the listed packages with an
     # incremental tool like cabal-install.
+    # If 'withHoogle' is true (the default if a shell environment is requested)
+    # then 'ghcWithHoogle' is used to generate the derivation (instead of
+    # 'ghcWithPackages'), see the documentation there for more information.
     developPackage =
       { root
       , name ? builtins.baseNameOf root
       , source-overrides ? {}
       , overrides ? self: super: {}
       , modifier ? drv: drv
-      , returnShellEnv ? pkgs.lib.inNixShell }:
+      , returnShellEnv ? pkgs.lib.inNixShell
+      , withHoogle ? returnShellEnv }:
       let drv =
         (extensible-self.extend
            (pkgs.lib.composeExtensions
               (self.packageSourceOverrides source-overrides)
               overrides))
         .callCabal2nix name root {};
-      in if returnShellEnv then (modifier drv).env else modifier drv;
+      in if returnShellEnv
+           then (modifier drv).envFunc {inherit withHoogle;}
+           else modifier drv;
 
     ghcWithPackages = selectFrom: withPackages (selectFrom self);
 

From 49e9758ef335d7266d755556d12e55c6df4feb31 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Fri, 13 Nov 2020 13:37:40 +0800
Subject: [PATCH 2435/3942] haskell: Add cabal2nixOptions to developPackage

Also neaten documentation slightly
---
 .../haskell-modules/make-package-set.nix            | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 2ce8ad989f8d..4ae3f0b2427f 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -222,19 +222,27 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     #   , modifier : Defaulted
     #   , returnShellEnv : Defaulted
     #   , withHoogle : Defaulted
+    #   , cabal2nixOptions : Defaulted
     #   } -> NixShellAwareDerivation
+    #
     # Given a path to a haskell package directory, an optional package name
     # which defaults to the base name of the path, an optional set of source
     # overrides as appropriate for the 'packageSourceOverrides' 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.
+    #
     # If 'returnShellEnv' is true this returns a derivation which will give you
     # an environment suitable for developing the listed packages with an
     # incremental tool like cabal-install.
+    #
     # If 'withHoogle' is true (the default if a shell environment is requested)
     # then 'ghcWithHoogle' is used to generate the derivation (instead of
     # 'ghcWithPackages'), see the documentation there for more information.
+    #
+    # 'cabal2nixOptions' can contain extra command line arguments to pass to
+    # 'cabal2nix' when generating the package derivation, for example setting
+    # a cabal flag with '--flag=myflag'.
     developPackage =
       { root
       , name ? builtins.baseNameOf root
@@ -242,13 +250,14 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
       , overrides ? self: super: {}
       , modifier ? drv: drv
       , returnShellEnv ? pkgs.lib.inNixShell
-      , withHoogle ? returnShellEnv }:
+      , withHoogle ? returnShellEnv
+      , cabal2nixOptions ? "" }:
       let drv =
         (extensible-self.extend
            (pkgs.lib.composeExtensions
               (self.packageSourceOverrides source-overrides)
               overrides))
-        .callCabal2nix name root {};
+        .callCabal2nixWithOptions name root cabal2nixOptions {};
       in if returnShellEnv
            then (modifier drv).envFunc {inherit withHoogle;}
            else modifier drv;

From 0f1709ad236ca23fb2d935a7564e0fa891a56259 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 13 Nov 2020 11:20:42 +0100
Subject: [PATCH 2436/3942] haskell-language-server: Fix build

Fixing a bound problem in ghcide and bumping ghc-exactprint
---
 .../haskell-modules/configuration-common.nix           | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 20f5357f78a8..0a7070a34e66 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1463,10 +1463,16 @@ self: super: {
     haskell-language-server = dontCheck super.haskell-language-server;
     fourmolu = dontCheck super.fourmolu;
     stylish-haskell = super.stylish-haskell_0_12_2_0;
-    ghcide = dontCheck super.ghcide;
+    ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch {
+      # 2020-11-13: Bumping bounds via an already upstream merged change
+      # https://github.com/haskell/ghcide/pull/905
+      url = https://github.com/haskell/ghcide/commit/9b8aaf9b06846571cc0b5d46680e686e4f9153a3.patch;
+      sha256 = "0j8980dmvwjcs72ahq2zc14hwkyd5ybgzyy1az3zq5flp383fai6";
+      includes = [ "ghcide.cabal" ];
+    }));
     refinery = super.refinery_0_3_0_0;
     data-tree-print = doJailbreak super.data-tree-print;
-    ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2;
+    ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_3;
     hie-bios = dontCheck super.hie-bios_0_7_1;
     lsp-test = dontCheck super.lsp-test_0_11_0_7;
     hls-plugin-api = super.hls-plugin-api;

From bf2b91cfc0571cc077299c5bc37cec8f63d01bd7 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 13 Nov 2020 11:24:08 +0100
Subject: [PATCH 2437/3942] haskellPackages.stack: Fix eval error

---
 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 0a7070a34e66..9a084b2311a4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1414,7 +1414,7 @@ self: super: {
   domain-auth = dontCheck super.domain-auth;
 
   # stack-2.5.1 needs a more current version of pantry to compile
-  pantry = self.pantry_0_5_1_3;
+  pantry = self.pantry_0_5_1_4;
 
   # Too tight version bounds, see https://github.com/haskell-hvr/microaeson/pull/4
   microaeson = doJailbreak super.microaeson;

From 9ea5a41df060f5ca990a71fe6c7ef52b69d7447d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Nov 2020 20:51:00 +0100
Subject: [PATCH 2438/3942] haskell-pantry: update overrides for the new
 version

---
 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 7c233ade7427..f8c7689c57a0 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -654,7 +654,7 @@ self: super: builtins.intersectAttrs super {
   # Tests require internet
   http-download = dontCheck super.http-download;
   pantry = dontCheck super.pantry;
-  pantry_0_5_1_3 = dontCheck super.pantry_0_5_1_3;
+  pantry_0_5_1_4 = dontCheck super.pantry_0_5_1_4;
 
   # gtk2hs-buildtools is listed in setupHaskellDepends, but we
   # need it during the build itself, too.

From 986d973ff42a9dd0ba25b0c47a4a70d1bf5eaf9f Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Fri, 13 Nov 2020 01:14:58 +0300
Subject: [PATCH 2439/3942] qvge: init at 0.6.1

---
 pkgs/applications/graphics/qvge/default.nix   | 39 +++++++++++++++++++
 .../graphics/qvge/set-graphviz-path.patch     | 13 +++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/applications/graphics/qvge/default.nix
 create mode 100644 pkgs/applications/graphics/qvge/set-graphviz-path.patch

diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix
new file mode 100644
index 000000000000..d8080e6fbb44
--- /dev/null
+++ b/pkgs/applications/graphics/qvge/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, substituteAll
+, qmake
+, qtx11extras
+, graphviz
+}:
+
+mkDerivation rec {
+  pname = "qvge";
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "ArsMasiuk";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0j4ih03nl6iihhnxrfldkarg9hvxb62lpr58xspn417d3gj6xjll";
+  };
+
+  prePatch = "cd src";
+
+  patches = (substituteAll {
+    src = ./set-graphviz-path.patch;
+    inherit graphviz;
+  });
+
+  nativeBuildInputs = [ qmake ];
+
+  buildInputs = [ qtx11extras ];
+
+  meta = with lib; {
+    description = "Qt Visual Graph Editor";
+    homepage = "https://github.com/ArsMasiuk/qvge";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sikmir ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/applications/graphics/qvge/set-graphviz-path.patch b/pkgs/applications/graphics/qvge/set-graphviz-path.patch
new file mode 100644
index 000000000000..d18eb81c5d04
--- /dev/null
+++ b/pkgs/applications/graphics/qvge/set-graphviz-path.patch
@@ -0,0 +1,13 @@
+diff --git i/commonui/CNodeEditorUIController.cpp w/commonui/CNodeEditorUIController.cpp
+index 7dacd48..64983e4 100644
+--- i/commonui/CNodeEditorUIController.cpp
++++ w/commonui/CNodeEditorUIController.cpp
+@@ -123,7 +123,7 @@ CNodeEditorUIController::CNodeEditorUIController(CMainWindow *parent) :
+ 	QString pathToGraphviz = QCoreApplication::applicationDirPath() + "/../tools/graphviz";
+ 	m_optionsData.graphvizPath = QFileInfo(pathToGraphviz).absoluteFilePath();
+ #else
+-	m_optionsData.graphvizPath = "";
++	m_optionsData.graphvizPath = "@graphviz@/bin";
+ #endif
+ 	m_gvController->setPathToGraphviz(m_optionsData.graphvizPath);
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 551b285d419a..5b99a286d1c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6723,6 +6723,8 @@ in
 
   quota = if stdenv.isLinux then linuxquota else unixtools.quota;
 
+  qvge = libsForQt5.callPackage ../applications/graphics/qvge { };
+
   qview = libsForQt5.callPackage ../applications/graphics/qview {};
 
   wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { };

From 473b341fb1aa01c23eb0ed942a03463cf029e21b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 7 Nov 2020 14:46:53 +1000
Subject: [PATCH 2440/3942] bintools-wrapper: remove redundant arg

cctools 949.0.1 warns if min version is passed twice.
---
 pkgs/build-support/bintools-wrapper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index b9cdd0b1b2e2..0acae87329ac 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -253,7 +253,7 @@ stdenv.mkDerivation {
 
     # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID.
     + optionalString stdenv.targetPlatform.isMacOS ''
-      echo "-macosx_version_min 10.12 -sdk_version 10.12 -no_uuid" >> $out/nix-support/libc-ldflags-before
+      echo "-sdk_version 10.12 -no_uuid" >> $out/nix-support/libc-ldflags-before
     ''
 
     ##

From 051812b8cfed50d14d72b3bfce0b9b3ca6316841 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 7 Nov 2020 14:52:38 +1000
Subject: [PATCH 2441/3942] Revert "ruby: fix build on darwin"

This reverts commit d73cc1e58601a4d12cfc353e7478fee8b18126cd.
---
 pkgs/development/interpreters/ruby/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 7d58dcdafbc1..87aa5aca1e14 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -140,10 +140,6 @@ let
             "--with-out-ext=tk"
             # on yosemite, "generating encdb.h" will hang for a very long time without this flag
             "--with-setjmp-type=setjmp"
-            # silence linker warnings after upgrading darwin.cctools to 949.0.1,
-            # which ruby treats as problem with LDFLAGS
-            # https://github.com/NixOS/nixpkgs/issues/101330
-            "LDFLAGS=-Wl,-w"
           ]
           ++ op (stdenv.hostPlatform != stdenv.buildPlatform)
              "--with-baseruby=${buildRuby}";

From 5a5cb550dd75263ee7f2f6b4fc428989aa8b5934 Mon Sep 17 00:00:00 2001
From: Christoph Stich <cstich@users.noreply.github.com>
Date: Fri, 13 Nov 2020 21:43:50 +0000
Subject: [PATCH 2442/3942] julia: init at 1.5 (#101933)

---
 pkgs/development/compilers/julia/1.5.nix | 160 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |   6 +
 2 files changed, 166 insertions(+)
 create mode 100644 pkgs/development/compilers/julia/1.5.nix

diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix
new file mode 100644
index 000000000000..151cf83cecef
--- /dev/null
+++ b/pkgs/development/compilers/julia/1.5.nix
@@ -0,0 +1,160 @@
+{ stdenv, fetchurl, fetchzip, fetchFromGitHub
+# build tools
+, gfortran, m4, makeWrapper, patchelf, perl, which, python2
+, cmake
+# libjulia dependencies
+, libunwind, readline, utf8proc, zlib
+# standard library dependencies
+, curl, fftwSinglePrec, fftw, libgit2, mpfr, openlibm, openspecfun, pcre2
+# linear algebra
+, blas, lapack, arpack
+# Darwin frameworks
+, CoreServices, ApplicationServices
+}:
+
+assert (!blas.isILP64) && (!lapack.isILP64);
+
+with stdenv.lib;
+
+let
+  majorVersion = "1";
+  minorVersion = "5";
+  maintenanceVersion = "3";
+  src_sha256 = "sha256:0jds8lrhk4hfdv7dg5p2ibzin9ivga7wrx7zwcmz6dqp3x792n1i";
+  version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
+in
+
+stdenv.mkDerivation rec {
+  pname = "julia";
+  inherit version;
+
+   src = fetchzip {
+     url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
+     sha256 = src_sha256;
+   };
+
+  patches = [
+    ./use-system-utf8proc-julia-1.3.patch
+
+    # Julia recompiles a precompiled file if the mtime stored *in* the
+    # .ji file differs from the mtime of the .ji file.  This
+    # doesn't work in Nix because Nix changes the mtime of files in
+    # the Nix store to 1. So patch Julia to accept mtimes of 1.
+    ./allow_nix_mtime.patch
+  ];
+
+  postPatch = ''
+    patchShebangs . contrib
+    for i in backtrace cmdlineargs; do
+      mv test/$i.jl{,.off}
+      touch test/$i.jl
+    done
+    rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl
+    rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl
+    # LibGit2 fails with a weird error, so we skip it as well now
+    rm stdlib/LibGit2/test/runtests.jl && touch stdlib/LibGit2/test/runtests.jl
+    sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl
+    sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl
+  '';
+
+  dontUseCmakeConfigure = true;
+
+  buildInputs = [
+    arpack fftw fftwSinglePrec libgit2 libunwind mpfr
+    pcre2.dev blas lapack openlibm openspecfun readline utf8proc
+    zlib
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices];
+
+  nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which cmake ];
+
+  makeFlags =
+    let
+      arch = head (splitString "-" stdenv.system);
+      march = {
+        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+        i686 = "pentium4";
+        aarch64 = "armv8-a";
+      }.${arch}
+              or (throw "unsupported architecture: ${arch}");
+      # Julia requires Pentium 4 (SSE2) or better
+      cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch}
+                  or (throw "unsupported architecture: ${arch}");
+    # Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM
+    # https://github.com/JuliaLang/julia/tree/master/deps/patches
+    in [
+      "ARCH=${arch}"
+      "MARCH=${march}"
+      "JULIA_CPU_TARGET=${cpuTarget}"
+      "PREFIX=$(out)"
+      "prefix=$(out)"
+      "SHELL=${stdenv.shell}"
+
+      "USE_SYSTEM_BLAS=1"
+      "USE_BLAS64=${if blas.isILP64 then "1" else "0"}"
+
+      "USE_SYSTEM_LAPACK=1"
+
+      "USE_SYSTEM_ARPACK=1"
+      "USE_SYSTEM_FFTW=1"
+      "USE_SYSTEM_GMP=0"
+      "USE_SYSTEM_LIBGIT2=1"
+      "USE_SYSTEM_LIBUNWIND=1"
+
+      "USE_SYSTEM_MPFR=1"
+      "USE_SYSTEM_OPENLIBM=1"
+      "USE_SYSTEM_OPENSPECFUN=1"
+      "USE_SYSTEM_PATCHELF=1"
+      "USE_SYSTEM_PCRE=1"
+      "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
+      "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
+      "USE_SYSTEM_READLINE=1"
+      "USE_SYSTEM_UTF8PROC=1"
+      "USE_SYSTEM_ZLIB=1"
+
+      "USE_BINARYBUILDER=0"
+    ];
+
+  LD_LIBRARY_PATH = makeLibraryPath [
+    arpack fftw fftwSinglePrec libgit2 mpfr blas openlibm
+    openspecfun pcre2 lapack
+  ];
+
+  enableParallelBuilding = true;
+
+  # Julia's tests require read/write access to $HOME
+  preCheck = ''
+    export HOME="$NIX_BUILD_TOP"
+  '';
+
+  preBuild = ''
+    sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
+    sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+  '';
+
+  postInstall = ''
+    # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
+    # as using a wrapper with LD_LIBRARY_PATH causes segmentation
+    # faults when program returns an error:
+    #   $ julia -e 'throw(Error())'
+    find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
+      if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
+        ln -sv $lib $out/lib/julia/$(basename $lib)
+      fi
+    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/";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
+    broken = stdenv.isi686;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 392504146027..74b21e526bae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9525,6 +9525,12 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
   };
 
+julia_15 = callPackage ../development/compilers/julia/1.5.nix {
+    inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
+  };
+
+
+
   julia_1 = julia_10;
   julia = julia_1;
 

From dd8591d752f8210c2c0f8eaa2facaea79f9daee6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 22:05:46 +0000
Subject: [PATCH 2443/3942] jmol: 14.31.14 -> 14.31.17

---
 pkgs/applications/science/chemistry/jmol/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index cba3f1d09463..3035a69dc193 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,14 +17,14 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "14.31.14";
+  version = "14.31.17";
   pname = "jmol";
 
   src = let
     baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
   in fetchurl {
     url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    sha256 = "1qmy4iqn5xgd4m9hs4w9cn9rzkwmpgdb5azd93cypp05s4nmjsnm";
+    sha256 = "1cg3a56bbvlq5wfjgwclg9vsj61kmj6fnqvgf7fdvklhdvnijla2";
   };
 
   patchPhase = ''

From c1dfbaa8ade7df9cabc2615664f052c593f04cab Mon Sep 17 00:00:00 2001
From: scalavision <scalavision@gmail.com>
Date: Sat, 14 Nov 2020 00:15:01 +0100
Subject: [PATCH 2444/3942] mill: removing MILL_VERSION variable (#103736)

---
 pkgs/development/tools/build-managers/mill/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index 3fc893fd07cf..384385356d04 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
     # can't use wrapProgram because it sets --argv0
     makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" \
       --prefix PATH : "${jre}/bin" \
-      --set JAVA_HOME "${jre}" \
-      --set MILL_VERSION "${version}"
+      --set JAVA_HOME "${jre}"
     runHook postInstall
   '';
 

From a698dfa0a25d974cb0b9a4826bef3c2e92c96649 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 23:30:53 +0000
Subject: [PATCH 2445/3942] last: 1133 -> 1145

---
 pkgs/applications/science/biology/last/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix
index 775852931163..0976e5a10802 100644
--- a/pkgs/applications/science/biology/last/default.nix
+++ b/pkgs/applications/science/biology/last/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "last";
-  version = "1133";
+  version = "1145";
 
   src = fetchurl {
     url = "http://last.cbrc.jp/last-${version}.zip";
-    sha256 = "0a600p1fymm1ylaxzjwg46zdwz6ilaaak1f4n8xr3hp3ir9rgfjq";
+    sha256 = "0g54nmxxrirgid1i1k5i6rf7vnjpk9548sy06yqb4fj7vdzqgq99";
   };
 
   nativeBuildInputs = [ unzip ];

From d4a4860e31a346cf174c789b9a5375e909609cb6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 23:41:23 +0000
Subject: [PATCH 2446/3942] kpt: 0.36.1 -> 0.37.0

---
 pkgs/applications/networking/cluster/kpt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix
index e50f6e3462c1..712761eeef29 100644
--- a/pkgs/applications/networking/cluster/kpt/default.nix
+++ b/pkgs/applications/networking/cluster/kpt/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kpt";
-  version = "0.36.1";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0j9a7lxspgw63xzz1f8r5fb67jxm5isdvfi5450v20virxch9afi";
+    sha256 = "1b1sgwax67pazcs1lly3h3bb7ww91lcd3nr0w3r3f46d1c6iy8mn";
   };
 
-  vendorSha256 = "06kx85bf8mjmyhz5gp0la4fr8psnfz6i2rchc22sz2pgmsng1dfr";
+  vendorSha256 = "0dn6nryf3vn7r0xna02va4wbgkq0z6x8sj6g2mskfywrk0mfhadv";
 
   subPackages = [ "." ];
 

From 7e35db005f8b061b36113f45304af1ead8a0ecaa Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Nov 2020 19:00:00 -0500
Subject: [PATCH 2447/3942] protobuf3_13: 3.13.0 -> 3.13.0.1

---
 pkgs/development/libraries/protobuf/3.13.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/3.13.nix b/pkgs/development/libraries/protobuf/3.13.nix
index 3e3740a7c501..8499ac069e84 100644
--- a/pkgs/development/libraries/protobuf/3.13.nix
+++ b/pkgs/development/libraries/protobuf/3.13.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }:
 
 callPackage ./generic-v3.nix {
-  version = "3.13.0";
-  sha256 = "1nqsvi2yfr93kiwlinz8z7c68ilg1j75b2vcpzxzvripxx5h6xhd";
+  version = "3.13.0.1";
+  sha256 = "1r3hvbvjjww6pdk0mlg1lym7avxn8851xm8dg98bf4zq4vyrcw12";
 }

From 11453fa4363e30b6cfe60e6ab6cd92c1e0ef2ac9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Nov 2020 19:01:00 -0500
Subject: [PATCH 2448/3942] protobuf: 3.13.0.1 -> 3.14.0

https://github.com/protocolbuffers/protobuf/releases/tag/v3.14.0
---
 pkgs/development/libraries/protobuf/3.14.nix | 6 ++++++
 pkgs/top-level/all-packages.nix              | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/protobuf/3.14.nix

diff --git a/pkgs/development/libraries/protobuf/3.14.nix b/pkgs/development/libraries/protobuf/3.14.nix
new file mode 100644
index 000000000000..82896b0dadee
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.14.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+  version = "3.14.0";
+  sha256 = "1k4kkb78kdbz732wsph07v3zy3cz7l1msk2byrfvp0nb02sfl3a4";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04b27b531e56..b698966c213a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15145,8 +15145,9 @@ in
     python = python37;
   };
 
-  protobuf = protobuf3_13;
+  protobuf = protobuf3_14;
 
+  protobuf3_14 = callPackage ../development/libraries/protobuf/3.14.nix { };
   protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { };
   protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { };
   protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { };

From 001a975b752011a2a84413817d1c43a2200e6c74 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 13 Nov 2020 18:46:13 -0500
Subject: [PATCH 2449/3942] python3Packages.dipy: 1.2.0 -> 1.3.0

---
 pkgs/development/python-modules/dipy/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix
index a1360ada2257..51d689f98596 100644
--- a/pkgs/development/python-modules/dipy/default.nix
+++ b/pkgs/development/python-modules/dipy/default.nix
@@ -9,11 +9,12 @@
 , scipy
 , h5py
 , nibabel
+, tqdm
 }:
 
 buildPythonPackage rec {
   pname = "dipy";
-  version = "1.2.0";
+  version = "1.3.0";
 
   disabled = isPy27;
 
@@ -21,7 +22,7 @@ buildPythonPackage rec {
     owner  = "dipy";
     repo   = pname;
     rev    = version;
-    sha256 = "0x49lph400ndlvk419nd2g9ss4jg75xr7xh88ggv5d2ama19v7py";
+    sha256 = "0555abx0fwqmk6dc3im7r45d9j7r9xh6gm9mbwfwvlf7laf8h098";
   };
 
   nativeBuildInputs = [ cython packaging ];
@@ -30,6 +31,7 @@ buildPythonPackage rec {
     scipy
     h5py
     nibabel
+    tqdm
   ];
 
   checkInputs = [ pytest ];

From 698c471340111744db6c7dc55288cf4a8aab098d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Nov 2020 16:18:19 -0800
Subject: [PATCH 2450/3942] PULL_REQUEST_TEMPLATE.md: use rendered docs

---
 .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 48b84f8c36ce..ce630e77e940 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,7 +5,7 @@ comment describing what you have tested in the relevant package/service.
 Reviewing helps to reduce the average time-to-merge for everyone.
 Thanks a lot if you do!
 List of open PRs: https://github.com/NixOS/nixpkgs/pulls
-Reviewing guidelines: https://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download/1/nixpkgs/manual.html#chap-reviewing-contributions
+Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions
 -->
 
 ###### Motivation for this change

From 6d730efa650946b07f75d64f67446a55d2df768d Mon Sep 17 00:00:00 2001
From: Jeff Labonte <grimsleepless@protonmail.com>
Date: Fri, 13 Nov 2020 19:42:23 -0500
Subject: [PATCH 2451/3942] brave: 1.16.72 -> 1.16.76

---
 pkgs/applications/networking/browsers/brave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index f0abf2a79fe3..ac924730989e 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -86,11 +86,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.16.72";
+  version = "1.16.76";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "0gcmbqkrkdrjj0cc34bp56iqawhyfz46k7q8x82pw9b1rbjp1x6k";
+    sha256 = "1nbgiwflmr3ik428yarmnpx10dmqai2m4k910miqd92mwmfb0pib";
   };
 
   dontConfigure = true;

From c881ca60ede6524fee8e2c0d6efb66e828d3ee5e Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 20 Aug 2020 15:32:06 -0400
Subject: [PATCH 2452/3942] python3Packages.pytorch-metric-learning: 0.9.81 ->
 0.9.94

---
 .../pytorch-metric-learning/default.nix       | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
index daf6accb8935..64564a4dca55 100644
--- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix
+++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
@@ -4,6 +4,7 @@
 , isPy27
 , numpy
 , scikitlearn
+, pytestCheckHook
 , pytorch
 , torchvision
 , tqdm
@@ -11,15 +12,15 @@
 
 buildPythonPackage rec {
   pname   = "pytorch-metric-learning";
-  version = "0.9.81";
+  version = "0.9.94";
 
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "KevinMusgrave";
     repo = pname;
-    rev = "cb23328aba64f7f4658374cc2920ef5d56cda5c8";  # no version tag
-    sha256 = "0c2dyi4qi7clln43481xq66f6r4fadrz84jphjc5phz97bp33ds8";
+    rev = "v${version}";
+    sha256 = "1i2m651isa6xk3zj8dhzdbmd1bdzl51bh6rxifx6gg22hfa5dj9a";
   };
 
   propagatedBuildInputs = [
@@ -30,6 +31,22 @@ buildPythonPackage rec {
     tqdm
   ];
 
+  preCheck = ''
+    export HOME=$TMP
+    export TEST_DEVICE=cpu
+    export TEST_DTYPES=float32,float64  # half-precision tests fail on CPU
+  '';
+  # package only requires `unittest`, but use `pytest` to exclude tests
+  checkInputs = [ pytestCheckHook ];
+  disabledTests = [
+    # requires FAISS (not in Nixpkgs)
+    "test_accuracy_calculator_and_faiss"
+    # require network access:
+    "test_get_nearest_neighbors"
+    "test_tuplestoweights_sampler"
+    "test_untrained_indexer"
+  ];
+
   meta = {
     description = "Metric learning library for PyTorch";
     homepage = "https://github.com/KevinMusgrave/pytorch-metric-learning";

From d1a603b5c38c0023606e90064acadaa8e052e44b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 01:21:43 +0000
Subject: [PATCH 2453/3942] kubernetes-helm: 3.4.0 -> 3.4.1

---
 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 a0daba8d8f28..86d1fd1383c3 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "helm";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${version}";
-    sha256 = "1z5s8c6yrc1v2y54lx2mbyz31schzpaz2r304m0wwxhn06p43sl0";
+    sha256 = "13w0s11319qg9mmmxc24mlj0hrp0r529p3ny4gfzsl0vn3qzd6i2";
   };
-  vendorSha256 = "0vcvmbvfmj0bi5msjhy9qcqabiscjpfqpnb1lxy49mshs902qc14";
+  vendorSha256 = "0x3dcvnrl7cs8faaiq9ybfgg0lkac5ppf61i724cja270nmpmazl";
 
   doCheck = false;
 

From 7a5047bede8f7851eac2fcc4d257d07cc5f6eda7 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 10 Nov 2020 12:54:24 +0100
Subject: [PATCH 2454/3942] ubootRockPi4: init

This adds support for the Radxa Rock Pi 4 board which is based on
RK3399. The u-boot outputs from the introduced build are suitable to
build a generic image for the Rock Pi 4 by setting the following in a
custom build of $nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix:

```
  sdImage.postBuildCommands = ''
    dd if=${pkgs.ubootRockPi4}/idbloader.img of=$img seek=64 conv=notrunc
    dd if=${pkgs.ubootROckPi4}/u-boot.itb of=$img seek=16384 conv=notrunc
  '';
```
---
 pkgs/misc/uboot/default.nix     | 7 +++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 8 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index d3ce3e598761..0a178b398006 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -394,4 +394,11 @@ in {
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.img" "SPL"];
   };
+
+  ubootRockPi4 = buildUBoot {
+    defconfig = "rock-pi-4-rk3399_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareRK3399}/bl31.elf";
+    filesToInstall = [ "u-boot.itb" "idbloader.img"];
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3667a63a03e6..4dfc8d937ff0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18988,6 +18988,7 @@ in
     ubootRaspberryPi3_64bit
     ubootRaspberryPiZero
     ubootRock64
+    ubootRockPi4
     ubootRockPro64
     ubootROCPCRK3399
     ubootSheevaplug

From 2f4bd22364e139d5f3ddadc493793a2930650645 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 02:41:51 +0000
Subject: [PATCH 2455/3942] libthreadar: 1.3.0 -> 1.3.1

---
 pkgs/development/libraries/libthreadar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix
index 96c0418f74c8..587ef2e208a3 100644
--- a/pkgs/development/libraries/libthreadar/default.nix
+++ b/pkgs/development/libraries/libthreadar/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.3.0";
+  version = "1.3.1";
   pname = "libthreadar";
 
   src = fetchurl {
     url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz";
-    sha256 = "0g2wxykawlsj6ma9slbbk0bxynqvmkwhaln2fiwc21x7nhjvpn9z";
+    sha256 = "0x1kkccy81rcqbhlw88sw7lykp7398vmrvp6f9yy42k9bl4yxn2q";
   };
 
   outputs = [ "out" "dev" ];

From 32160d80dc30501dc7460c1d6e54db6b047204b4 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evan.stoll@rjginc.com>
Date: Fri, 13 Nov 2020 22:01:32 -0500
Subject: [PATCH 2456/3942] gping: 1.1 -> 0.1.6

---
 pkgs/tools/networking/gping/default.nix | 29 ++++++++++---------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix
index 092f3611abb7..76fdecf5e14c 100644
--- a/pkgs/tools/networking/gping/default.nix
+++ b/pkgs/tools/networking/gping/default.nix
@@ -1,32 +1,25 @@
 { lib
-, iputils
-, python3
-, python3Packages
+, rustPlatform
+, fetchFromGitHub
 }:
 
-python3Packages.buildPythonApplication rec {
+rustPlatform.buildRustPackage rec {
   pname = "gping";
-  version = "1.1";
+  version = "0.1.6";
 
-  propagatedBuildInputs = with python3Packages; [ colorama ];
-
-  src = python3Packages.fetchPypi {
-    inherit version;
-    pname  = "pinggraph";
-    sha256 = "0q5ma98457zb6vxsnhmrr3p38j1vg0gl155y0adzfg67wlniac92";
+  src = fetchFromGitHub {
+    owner = "orf";
+    repo = "gping";
+    rev = "v${version}";
+    sha256 = "1scwwrrj30ff9yr776gpn4jyl3lbrx2s2dv0pc8b1zj7mvwp3as2";
   };
 
-  # Make path to ping explicit
-  postFixup = ''
-    substituteInPlace $out/${python3.sitePackages}/gping/pinger.py \
-      --replace 'subprocess.getoutput("ping ' 'subprocess.getoutput("${iputils}/bin/ping ' \
-      --replace 'args = ["ping"]' 'args = ["${iputils}/bin/ping"]'
-  '';
+  cargoSha256 = "1dsfrl5cajl9nmzl6p43j7j50xn1z7dymqaz8kqs7zalj9zadm8k";
 
   meta = with lib; {
     description = "Ping, but with a graph";
     homepage = "https://github.com/orf/gping";
-    license = licenses.gpl2;
+    license = licenses.mit;
     maintainers = with maintainers; [ andrew-d ];
   };
 }

From f61b91cec4654ce730141c1f58a9ec521ab70888 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 14 Nov 2020 00:24:57 -0300
Subject: [PATCH 2457/3942] antiprism: init at 0.26

---
 .../science/geometry/antiprism/default.nix    | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/science/geometry/antiprism/default.nix

diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix
new file mode 100644
index 000000000000..4691291a4257
--- /dev/null
+++ b/pkgs/applications/science/geometry/antiprism/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, libX11
+, libGL
+, libGLU
+, freeglut }:
+
+stdenv.mkDerivation rec {
+  pname = "antiprism";
+  version = "0.26";
+
+  src = fetchFromGitHub {
+    owner = "antiprism";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-5FE6IbYKk7eMT985R9NCX3GDXE8SrdVHFcCpKeJvKtQ=";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.antiprism.com";
+    description = "A collection of programs for generating, manipulating, transforming and viewing polyhedra";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ AndersonTorres ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74b21e526bae..b30e42e100d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1163,6 +1163,8 @@ in
 
   gaia = callPackage ../development/libraries/gaia { };
 
+  antiprism = callPackage ../applications/science/geometry/antiprism { };
+
   gama = callPackage ../applications/science/geometry/gama { };
 
   gamecube-tools = callPackage ../development/tools/gamecube-tools { };

From fb1c3a2e1d9af4419af34651e8e0a300b4e69479 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 14 Nov 2020 00:48:32 -0300
Subject: [PATCH 2458/3942] all-packages.nix: a small reorganization

Now the science/geometry expressions are in a same block of the all-packages
file.
---
 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 b30e42e100d8..017ac9c7a13e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1163,10 +1163,6 @@ in
 
   gaia = callPackage ../development/libraries/gaia { };
 
-  antiprism = callPackage ../applications/science/geometry/antiprism { };
-
-  gama = callPackage ../applications/science/geometry/gama { };
-
   gamecube-tools = callPackage ../development/tools/gamecube-tools { };
 
   gammy = qt5.callPackage ../tools/misc/gammy { };
@@ -26163,6 +26159,10 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
   ### SCIENCE/GEOMETRY
 
+  antiprism = callPackage ../applications/science/geometry/antiprism { };
+
+  gama = callPackage ../applications/science/geometry/gama { };
+
   drgeo = callPackage ../applications/science/geometry/drgeo {
     inherit (gnome2) libglade;
     guile = guile_1_8;

From 7225ae36c3b02056449d0b6d567d02d1ab6dab3f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 14 Nov 2020 04:20:00 +0000
Subject: [PATCH 2459/3942] haproxy: add passthru.tests

---
 pkgs/tools/networking/haproxy/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 41dd747315ba..80b135e524bf 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,7 +1,7 @@
 { useLua ? !stdenv.isDarwin
 , usePcre ? true
 , withPrometheusExporter ? true
-, stdenv, lib, fetchurl
+, stdenv, lib, fetchurl, nixosTests
 , openssl, zlib
 , lua5_3 ? null, pcre ? null, systemd ? null
 }:
@@ -51,6 +51,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  passthru.tests.haproxy = nixosTests.haproxy;
+
   meta = with lib; {
     description = "Reliable, high performance TCP/HTTP load balancer";
     longDescription = ''

From ac676f133242cb1d341a68082d0742354291672f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 14 Nov 2020 04:20:00 +0000
Subject: [PATCH 2460/3942] cloud-nuke: 0.1.18 -> 0.1.23

---
 pkgs/development/tools/cloud-nuke/default.nix |  14 +-
 pkgs/development/tools/cloud-nuke/deps.nix    | 219 ------------------
 2 files changed, 8 insertions(+), 225 deletions(-)
 delete mode 100644 pkgs/development/tools/cloud-nuke/deps.nix

diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix
index 6e070f3cc5f2..e124f6c7ca54 100644
--- a/pkgs/development/tools/cloud-nuke/default.nix
+++ b/pkgs/development/tools/cloud-nuke/default.nix
@@ -1,19 +1,21 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "cloud-nuke";
-  version = "0.1.18";
+  version = "0.1.23";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1amk9bjrc9svvgllif2vr6xx7kc3xmwjbyb8prnm5zp82hymk5f1";
+    sha256 = "0qqvjw6lqdrfg1mjfxljslcv9714cpxcnkf65wkf46r5g8fwzr1f";
   };
 
-  goPackagePath = "github.com/gruntwork-io/cloud-nuke";
+  vendorSha256 = "0bw0xcbyns94vy1abr962876zr7aq6q9qq7y9vr1yqw4hqmi3ndi";
 
-  goDeps = ./deps.nix;
+  buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
+
+  doCheck = false;
 
   meta = with lib; {
     homepage = "https://github.com/gruntwork-io/cloud-nuke";
diff --git a/pkgs/development/tools/cloud-nuke/deps.nix b/pkgs/development/tools/cloud-nuke/deps.nix
deleted file mode 100644
index c354bd985fd3..000000000000
--- a/pkgs/development/tools/cloud-nuke/deps.nix
+++ /dev/null
@@ -1,219 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
-  {
-    goPackagePath  = "github.com/aws/aws-sdk-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/aws/aws-sdk-go";
-      rev =  "1f4898f67806740d2a91c9dfe9a8be8a61523eb4";
-      sha256 = "1znjv4irzqxwizdp3dxgb5w9x06xjs79a3s68afzrblz97kf94kc";
-    };
-  }
-  {
-    goPackagePath  = "github.com/bgentry/speakeasy";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bgentry/speakeasy";
-      rev =  "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd";
-      sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s";
-    };
-  }
-  {
-    goPackagePath  = "github.com/boombuler/barcode";
-    fetch = {
-      type = "git";
-      url = "https://github.com/boombuler/barcode";
-      rev =  "3cfea5ab600ae37946be2b763b8ec2c1cf2d272d";
-      sha256 = "1fzb8wz1ny2sc78g9rm0bcm80pgwvkm2k6lmim2sb4jgm1j3sajd";
-    };
-  }
-  {
-    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/go-errors/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-errors/errors";
-      rev =  "d98b870cc4e05f1545532a80e9909be8216095b6";
-      sha256 = "1skj4vh9h7c5lk1pw8y6740w2k99z398jl0aasn63x83viqjf1zw";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-sql-driver/mysql";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-sql-driver/mysql";
-      rev =  "72cd26f257d44c1114970e19afddcd812016007e";
-      sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/mock";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/mock";
-      rev =  "b48cb6623c04dae64c28537143aca42d16561daf";
-      sha256 = "1zb4n285mv85dh3y2f8fqbs30h2dhzw7vbczr6z0zg2gqr6vzg0q";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/uuid";
-      rev =  "064e2069ce9c359c118179501254f67d7d37ba24";
-      sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gruntwork-io/gruntwork-cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gruntwork-io/gruntwork-cli";
-      rev =  "94044eeeb0a48b5e8dd52190fa0d0daba53e157f";
-      sha256 = "1x6g2s4f66c4pb8dwvjnj4i70ik43ak2x189v2ys218nz4zkjs74";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gruntwork-io/terratest";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gruntwork-io/terratest";
-      rev =  "bd5fdfc1564ec40a149a6e579d6ca20ebf2eaca4";
-      sha256 = "1vbipykcwhmzs2qxfxdnq3gdi3i5ds6pykjjxqw3f1llad2dihby";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jmespath/go-jmespath";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jmespath/go-jmespath";
-      rev =  "c2b33e84";
-      sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-colorable";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-colorable";
-      rev =  "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
-      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-isatty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-isatty";
-      rev =  "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
-      sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pquerna/otp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pquerna/otp";
-      rev =  "43bebefda392017900e7a7b237b4c914c6a55b50";
-      sha256 = "088njs8i7b0syyz20hzd3lcjxy61chc518d71lvykw2g9c9wsc7l";
-    };
-  }
-  {
-    goPackagePath  = "github.com/sirupsen/logrus";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sirupsen/logrus";
-      rev =  "d682213848ed68c0a260ca37d6dd5ace8423f5ba";
-      sha256 = "0nzyqwzx3k7nqfq8q7yv32gaf3ymq3bpwhkmw1hj2zakq5a93d8x";
-    };
-  }
-  {
-    goPackagePath  = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev =  "3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9";
-      sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
-    };
-  }
-  {
-    goPackagePath  = "github.com/urfave/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/urfave/cli";
-      rev =  "cfb38830724cc34fedffe9a2a29fb54fa9169cd1";
-      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev =  "13931e22f9e72ea58bb73048bc752b48c6d4d4ac";
-      sha256 = "1621j82c1hiw4pxjdvaf5qyirwv5c0bqwlrhhna9pnjsgr5pkw33";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev =  "ca1201d0de80cfde86cb01aea620983605dfe99b";
-      sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev =  "2c42eef0765b9837fbdab12011af7830f55f88f0";
-      sha256 = "0gj9nwryyzf9rn33gl3zm6rxvg1zhrhwi36akipqj37x4g86h3gz";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/appengine";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/appengine";
-      rev =  "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880";
-      sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-yaml/yaml";
-      rev =  "53403b58ad1b561927d19068c655246f2db79d48";
-      sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
-    };
-  }
-]
\ No newline at end of file

From a398eb859ce94b6538e74c02ff64e6e6c43eedb3 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 14 Nov 2020 04:20:00 +0000
Subject: [PATCH 2461/3942] lxd: 4.7 -> 4.8

https://discuss.linuxcontainers.org/t/lxd-4-8-has-been-released/9458
---
 pkgs/tools/admin/lxd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index 331960e6857f..9bff8332c34b 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -18,13 +18,13 @@ let
 in
 buildGoPackage rec {
   pname = "lxd";
-  version = "4.7";
+  version = "4.8";
 
   goPackagePath = "github.com/lxc/lxd";
 
   src = fetchurl {
     url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "1v95cnbs54gzyhzflwb8x0ykja202nll5p48l2nra7cpdsk4a5q1";
+    sha256 = "0zrk6l2wwc2hmzwd9fayq54qxshp9pin638dihsyp324f5n0jkyy";
   };
 
   postPatch = ''

From 06d328c3460bc07db4271bc3e63481c5ec1b45cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 05:05:51 +0000
Subject: [PATCH 2462/3942] liblinear: 2.41 -> 2.42

---
 pkgs/development/libraries/liblinear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix
index 86d306d0a07f..67eb8748f16c 100644
--- a/pkgs/development/libraries/liblinear/default.nix
+++ b/pkgs/development/libraries/liblinear/default.nix
@@ -4,13 +4,13 @@ let
   soVersion = "4";
 in stdenv.mkDerivation rec {
   pname = "liblinear";
-  version = "2.41";
+  version = "2.42";
 
   src = fetchFromGitHub {
     owner = "cjlin1";
     repo = "liblinear";
     rev = "v${builtins.replaceStrings ["."] [""] version}";
-    sha256 = "1mykrzka2wxnvvjh21hisabs5fsxqzdhkxw9m08h24c58vfiwsd8";
+    sha256 = "0p0hpjajfkskhd7jiv5zwhfa8hi49q3mgifjlkqvy99xspv98ijj";
   };
 
   outputs = [ "bin" "dev" "out" ];

From d347acc7c3858a8edf8f6eaab751ba5039b02e5f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 05:33:04 +0000
Subject: [PATCH 2463/3942] vimwiki-markdown: 0.3.1 -> 0.3.2

---
 pkgs/tools/misc/vimwiki-markdown/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix
index 58fc991beb3e..6e6a985d44f4 100644
--- a/pkgs/tools/misc/vimwiki-markdown/default.nix
+++ b/pkgs/tools/misc/vimwiki-markdown/default.nix
@@ -6,12 +6,12 @@
 }:
 
 buildPythonApplication rec {
-  version = "0.3.1";
+  version = "0.3.2";
   pname = "vimwiki-markdown";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "50032c62947422c8afbc1733e50526818df7d885d1cc41a27ff65fc26cd3c1c5";
+    sha256 = "e8dc7de7fc7f88480acb940aa51088464b9911c85cc3d5cca962a45e75ff9b81";
   };
 
   propagatedBuildInputs= [

From df7db2b3ed9db2a3c2d3950b4b84e8e937fb2f7a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 06:25:20 +0000
Subject: [PATCH 2464/3942] mavproxy: 1.8.22 -> 1.8.23

---
 pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix
index 9c7166afc2a9..dcc2114a4886 100644
--- a/pkgs/applications/science/robotics/mavproxy/default.nix
+++ b/pkgs/applications/science/robotics/mavproxy/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonApplication rec {
   pname = "MAVProxy";
-  version = "1.8.22";
+  version = "1.8.23";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "87d7f9c0b8f4f1db3ce3521f67cd244fe3b89ffead797e92f35a7f71bbe8b958";
+    sha256 = "46c70e013d3e465daae5523f6a1aad553e6ee0f4db137bb935a3273f7ffcc22e";
   };
 
   propagatedBuildInputs = [

From ec06cbd399632b54d83476b12e18111386d6ea94 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 06:41:04 +0000
Subject: [PATCH 2465/3942] gnomecast: 1.4.1 -> 1.9.11

---
 pkgs/applications/video/gnomecast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix
index 3a3ca044bb88..e4814e40c1fd 100644
--- a/pkgs/applications/video/gnomecast/default.nix
+++ b/pkgs/applications/video/gnomecast/default.nix
@@ -3,11 +3,11 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "gnomecast";
-  version = "1.4.1";
+  version = "1.9.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0mn03gqbwmhch0055bzgdwkzsl304qdyqwrgyiq0k5c5d2gyala5";
+    sha256 = "4d8cd7a71f352137252c5a9ee13475bd67fb99594560ecff1efb0f718d8bbaac";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

From 95bbf889f7e27ea303180416fec779ded960f537 Mon Sep 17 00:00:00 2001
From: alexameen <alex.ameen.tx@gmail.com>
Date: Sat, 14 Nov 2020 00:55:22 -0600
Subject: [PATCH 2466/3942] Remove AdobeBlank-Regular.ttf from google-fonts
 package

	modified:   default.nix
---
 pkgs/data/fonts/google-fonts/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index 7a3b488212df..eabc1713a722 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -30,7 +30,11 @@ stdenv.mkDerivation {
     rm -rv ofl/comfortaa/*.ttf \
       ofl/mavenpro/*.ttf \
       ofl/muli/*.ttf \
-      ofl/oswald/*.ttf
+      ofl/oswald/*.ttf \
+
+    # This abomination of a font causes crashes with `libfontconfig',
+    # It has an absurd number of symbols
+    rm -r ofl/adobeblank/
 
     if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then
       echo "error: duplicate font names"

From 5e76b77ff60a7b5acf8f3ac9468ab4884a6113d1 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 13 Nov 2020 22:44:07 +0100
Subject: [PATCH 2467/3942] openocd: unstable-2020-09-02 -> unstable-2020-11-11

fix build failure with hidapi 0.10.0
---
 .../tools/misc/openocd/default.nix            | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 47212e9967d0..5c8e95f7fd4b 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -1,18 +1,27 @@
-{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }:
+{ stdenv
+, lib
+, fetchgit
+, autoreconfHook
+, pkg-config
+, hidapi
+, libftdi1
+, libusb1
+}:
 
 stdenv.mkDerivation rec {
   pname = "openocd";
-  version = "2020-09-02";
+  version = "unstable-2020-11-11";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/openocd/code";
-    rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3";
-    sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9";
+    rev = "06c7a53f1fff20bcc4be9e63f83ae98664777f34";
+    sha256 = "0g0w7g94r88ylfpwswnhh8czlf5iqvd991ssn4gfcfd725lpdb01";
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [ libftdi1 libusb1 hidapi ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+  buildInputs = [ hidapi libftdi1 libusb1 ];
 
   configureFlags = [
     "--enable-jtag_vpi"
@@ -29,6 +38,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
     "-Wno-error=cpp"
+    "-Wno-error=strict-prototypes" # fixes build failure with hidapi 0.10.0
   ];
 
   postInstall = lib.optionalString stdenv.isLinux ''

From 1f9b39678550d9e2c55fe5c26ef8314c75552e6b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 07:45:33 +0000
Subject: [PATCH 2468/3942] python37Packages.vowpalwabbit: 8.8.1 -> 8.9.0

---
 pkgs/development/python-modules/vowpalwabbit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
index ddd36a98cb6d..da13ad21026d 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "vowpalwabbit";
-  version = "8.8.1";
+  version = "8.9.0";
 
   src = fetchPypi{
     inherit pname version;
-    sha256 = "17fw1g4ka9jppd41srw39zbp2b8h81izc71bbggxgf2r0xbdpga6";
+    sha256 = "37fb7a400f3a7923a04df9921b3eef1bbe96117424ef083dcfed0e4eea77fa08";
   };
 
   nativeBuildInputs = [

From 0e6f020463b738e4e2a113c23c7bb0ac91d81d00 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 6 Nov 2020 21:55:11 +0100
Subject: [PATCH 2469/3942] ocamlPackages.mirage-unix: use Dune 2

---
 pkgs/development/ocaml-modules/mirage-unix/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/mirage-unix/default.nix b/pkgs/development/ocaml-modules/mirage-unix/default.nix
index 696181f7f602..1e6dc0ef144f 100644
--- a/pkgs/development/ocaml-modules/mirage-unix/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-unix/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
   pname = "mirage-unix";
   version = "4.0.0";
 
+  useDune2 = true;
+
   src = fetchurl {
     url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
     sha256 = "0kyd83bkpjhn382b4mw3a4325xr8vms78znxqvifpcyfvfnlx7hj";

From 7fb0a750f7b4b99d19b86dc1a9e0b7ac1b121381 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 6 Nov 2020 21:55:17 +0100
Subject: [PATCH 2470/3942] ocamlPackages.mirage-runtime: use Dune 2

---
 pkgs/development/ocaml-modules/mirage/runtime.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix
index b3f308979f46..9c9a479d5295 100644
--- a/pkgs/development/ocaml-modules/mirage/runtime.nix
+++ b/pkgs/development/ocaml-modules/mirage/runtime.nix
@@ -5,6 +5,8 @@ buildDunePackage rec {
   pname = "mirage-runtime";
   version = "3.9.0";
 
+  useDune2 = true;
+
   minimumOCamlVersion = "4.08";
 
   src = fetchurl {

From 9ca92f0a5b627f0189b6b6adcd4185ab16aa02f6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 6 Nov 2020 21:55:22 +0100
Subject: [PATCH 2471/3942] ocamlPackages.mirage: init at 3.9.0

---
 .../ocaml-modules/mirage/default.nix          | 25 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/mirage/default.nix

diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix
new file mode 100644
index 000000000000..9a4d3f21cb87
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildDunePackage, ocaml
+, functoria, mirage-runtime
+}:
+
+buildDunePackage rec {
+  pname = "mirage";
+  inherit (mirage-runtime) version src;
+
+  useDune2 = true;
+
+  outputs = [ "out" "dev" ];
+
+  propagatedBuildInputs = [ functoria mirage-runtime ];
+
+  installPhase = ''
+    runHook preInstall
+    dune install --prefix=$out --libdir=$dev/lib/ocaml/${ocaml.version}/site-lib/ ${pname}
+    runHook postInstall
+  '';
+
+  meta = mirage-runtime.meta // {
+    description = "The MirageOS library operating system";
+  };
+
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 2947b369ed8c..7fd321425082 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -539,6 +539,8 @@ let
 
     minisat = callPackage ../development/ocaml-modules/minisat { };
 
+    mirage = callPackage ../development/ocaml-modules/mirage { };
+
     mirage-block = callPackage ../development/ocaml-modules/mirage-block { };
 
     mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { };

From 302cbf171c9e1de1b4d65d5aff6131a3badd6456 Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Fri, 4 Sep 2020 01:14:26 +0900
Subject: [PATCH 2472/3942] arc_unpacker: init at unstable-2019-01-28

---
 pkgs/tools/archivers/arc_unpacker/default.nix | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/tools/archivers/arc_unpacker/default.nix

diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix
new file mode 100644
index 000000000000..76eb9a7fccbc
--- /dev/null
+++ b/pkgs/tools/archivers/arc_unpacker/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libjpeg, zlib
+, openssl, libwebp, catch }:
+
+stdenv.mkDerivation rec {
+  pname = "arc_unpacker-unstable";
+  version = "2019-01-28";
+
+  src = fetchFromGitHub {
+    owner = "vn-tools";
+    repo = "arc_unpacker";
+    # Since the latest release (0.11) doesn't build, we've opened an upstream
+    # issue in https://github.com/vn-tools/arc_unpacker/issues/187 to ask if a
+    # a new release is upcoming
+    rev = "b9843a13e2b67a618020fc12918aa8d7697ddfd5";
+    sha256 = "0wpl30569cip3im40p3n22s11x0172a3axnzwmax62aqlf8kdy14";
+  };
+
+  nativeBuildInputs = [ cmake makeWrapper catch ];
+  buildInputs = [ boost libpng libjpeg zlib openssl libwebp ];
+
+  postPatch = ''
+    cp ${catch}/include/catch/catch.hpp tests/test_support/catch.h
+  '';
+
+  checkPhase = ''
+    pushd ..
+    ./build/run_tests
+    popd
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/doc/arc_unpacker $out/libexec/arc_unpacker
+    cp arc_unpacker $out/libexec/arc_unpacker/arc_unpacker
+    cp ../GAMELIST.{htm,js} $out/share/doc/arc_unpacker
+    cp -r ../etc $out/libexec/arc_unpacker
+    makeWrapper $out/libexec/arc_unpacker/arc_unpacker $out/bin/arc_unpacker
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "A tool to extract files from visual novel archives";
+    homepage = "https://github.com/vn-tools/arc_unpacker";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ midchildan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e0efbb8d70a..d3a43d0632da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -603,6 +603,8 @@ in
 
   adlplug = callPackage ../applications/audio/adlplug { };
 
+  arc_unpacker = callPackage ../tools/archivers/arc_unpacker { };
+
   tuijam = callPackage ../applications/audio/tuijam { inherit (python3Packages) buildPythonApplication; };
 
   opnplug = callPackage ../applications/audio/adlplug {

From 76ca3425720cade81ac877f46493a42fa5ee6e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 14 Nov 2020 10:38:19 +0100
Subject: [PATCH 2473/3942] python3Packages.transformers: 3.4.0 -> 3.5.1

Changelog:

https://github.com/huggingface/transformers/releases/tag/v3.5.1
https://github.com/huggingface/transformers/releases/tag/v3.5.0
---
 .../python-modules/transformers/default.nix            | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 95e982f8ec01..d3559d319089 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "transformers";
-  version = "3.4.0";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1v09gryxsg57d2cjwagna1535m8mbxlazdbhsww210lxa818m5qj";
+    sha256 = "02z5zz0rq7mbgdmsm2ccfdbca57qy7iqp0vc7jspsmdfif4acwia";
   };
 
   propagatedBuildInputs = [
@@ -47,7 +47,8 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "tokenizers == 0.9.2" "tokenizers"
+      --replace "tokenizers == 0.9.3" "tokenizers" \
+      --replace "sentencepiece == 0.1.91" "sentencepiece"
   '';
 
   preCheck = ''
@@ -70,11 +71,13 @@ buildPythonPackage rec {
   disabledTests = [
     "BlenderbotSmallTokenizerTest"
     "Blenderbot3BTokenizerTests"
+    "GetFromCacheTests"
     "TokenizationTest"
     "TestTokenizationBart"
     "test_all_tokenizers"
     "test_batch_encoding_is_fast"
     "test_batch_encoding_pickle"
+    "test_batch_encoding_word_to_tokens"
     "test_config_from_model_shortcut"
     "test_config_model_type_from_model_identifier"
     "test_from_pretrained_use_fast_toggle"
@@ -89,6 +92,7 @@ buildPythonPackage rec {
     "test_tokenizer_from_pretrained"
     "test_tokenizer_from_tokenizer_class"
     "test_tokenizer_identifier_with_correct_config"
+    "test_tokenizer_identifier_non_existent"
   ];
 
   meta = with stdenv.lib; {

From a5e2e4caa6436f5154d7f3637fdb52ffd874da89 Mon Sep 17 00:00:00 2001
From: Jiehong Ma <email@majiehong.com>
Date: Sat, 14 Nov 2020 11:09:17 +0100
Subject: [PATCH 2474/3942] ttf-tw-moe: no_verion -> 2020-11-14

---
 pkgs/data/fonts/ttf-tw-moe/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/data/fonts/ttf-tw-moe/default.nix
index aeda5cd695d6..1115b48b7095 100644
--- a/pkgs/data/fonts/ttf-tw-moe/default.nix
+++ b/pkgs/data/fonts/ttf-tw-moe/default.nix
@@ -1,20 +1,23 @@
 { stdenv, fetchzip }:
-
+let
+  version = "2020-11-14";
+in
 fetchzip {
   name = "ttf-tw-moe";
 
-  url = "https://github.com/Jiehong/TW-fonts/archive/b30ae75e9dc299afd61e31cfd43f7a0a157dfb1f.zip";
+  url = "https://github.com/Jiehong/TW-fonts/archive/${version}.zip";
 
   postFetch = ''
     mkdir -p $out/share/fonts
-    unzip -j $downloadedFile TW-fonts-b30ae75e9dc299afd61e31cfd43f7a0a157dfb1f/\*.ttf -d $out/share/fonts/truetype
+    unzip -j $downloadedFile TW-fonts-${version}/\*.ttf -d $out/share/fonts/truetype
   '';
 
-  sha256 = "0khgxih9z6pqf7pdp21xjp24wb9ygsrdcmzpjb7vr9x8n78i1fbs";
+  sha256 = "1jd3gjjfa4vadp6d499n0irz5b22z611kd7q5qgqf6s2fwbxfhiz";
 
   meta = with stdenv.lib; {
     homepage = "http://www.moe.gov.tw/";
     description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan";
+    version = version;
     longDescription = ''
       Installs 2 TTF fonts: MOESongUN and TW-MOE-Std-Kai.
       Both are provided by the Ministry of Education of Taiwan; each character's shape

From 91a41b057f77587cd705be9f727c211e4211ba06 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 10:14:45 +0000
Subject: [PATCH 2475/3942] python37Packages.sshtunnel: 0.2.1 -> 0.2.2

---
 pkgs/development/python-modules/sshtunnel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix
index f37ba1545748..b8f2ab998266 100644
--- a/pkgs/development/python-modules/sshtunnel/default.nix
+++ b/pkgs/development/python-modules/sshtunnel/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.2.1";
+  version = "0.2.2";
   pname = "sshtunnel";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ce28bf9abe6c6b00c5d10343a68c1325f8409ebfb9bf1c1d863a31afa3983cd7";
+    sha256 = "1801b144b42b9bdb2f931923e85837f9193b877f3d490cd5776e1d4062c62fb4";
   };
 
   propagatedBuildInputs = [ paramiko ];

From 3098d5045a5b785bdf991d262c3170ad556ec71a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 11:20:48 +0000
Subject: [PATCH 2476/3942] python37Packages.gtts: 2.1.1 -> 2.1.2

---
 pkgs/development/python-modules/gtts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix
index 934f3bd58202..a8b6d7199bcd 100644
--- a/pkgs/development/python-modules/gtts/default.nix
+++ b/pkgs/development/python-modules/gtts/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "gtts";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "pndurette";
     repo = "gTTS";
     rev = "v${version}";
-    sha256 = "1d0r6dnb8xvgyvxz7nfj4q4xqmpmvcwcsjghxrh76m6p364lh1hj";
+    sha256 = "1vcsxzqzl61h50lm934hd7q5nl7l10wwymgq1mcynmqxbm1s4rnl";
   };
 
   propagatedBuildInputs = [

From b5794556b43d749bc3a279052213ac5538812e5a Mon Sep 17 00:00:00 2001
From: SCOTT-HAMILTON <sgn.hamilton+github@protonmail.com>
Date: Sat, 14 Nov 2020 12:49:32 +0100
Subject: [PATCH 2477/3942] openssh: fix hpn sha256

---
 pkgs/tools/networking/openssh/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 1a96cc58d58a..a8199273c77c 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   src = if hpnSupport then
       fetchurl {
         url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz";
-        sha256 = "06mr2q8d9kbj145r7mzmpm3a4ilnssibwlbjyy0bjsqrqnrll3zl";
+        sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540";
       }
     else
       fetchurl {

From 6c861dc0ba081a9abb857f30f67bc02ec24613c4 Mon Sep 17 00:00:00 2001
From: Gauvain 'GovanifY' Roussel-Tarbouriech <gauvain@govanify.com>
Date: Wed, 11 Nov 2020 15:26:00 +0100
Subject: [PATCH 2478/3942] pcsx2: unstable-2020-10-10 -> unstable-2020-11-13

---
 pkgs/misc/emulators/pcsx2/default.nix | 41 ++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix
index a08ee4f057f7..5bbf70004abe 100644
--- a/pkgs/misc/emulators/pcsx2/default.nix
+++ b/pkgs/misc/emulators/pcsx2/default.nix
@@ -1,17 +1,41 @@
-{ alsaLib, cmake, fetchFromGitHub, gcc-unwrapped, gettext, glib, gtk3, harfbuzz
-, libaio, libpcap, libpng, libxml2, makeWrapper, perl, pkgconfig, portaudio
-, SDL2, soundtouch, stdenv, udev, wrapGAppsHook, wxGTK, zlib
+{ alsaLib
+, cmake
+, fetchFromGitHub
+, fmt
+, gcc-unwrapped
+, gettext
+, glib
+, gtk3
+, harfbuzz
+, libaio
+, libpcap
+, libpng
+, libpulseaudio
+, libsamplerate
+, libxml2
+, makeWrapper
+, perl
+, pkgconfig
+, portaudio
+, SDL2
+, soundtouch
+, stdenv
+, udev
+, wrapGAppsHook
+, wxGTK
+, zlib
 }:
 
 stdenv.mkDerivation {
   pname = "pcsx2";
-  version = "unstable-2020-10-10";
+  version = "unstable-2020-11-13";
 
   src = fetchFromGitHub {
     owner = "PCSX2";
     repo = "pcsx2";
-    rev = "7e2ccd64e8e6049b6059141e8767037463421c33";
-    sha256 = "0c7m74ch68p4y9xlld34a9r38kb2py6wlkg4vranc6dicxvi1b3r";
+    fetchSubmodules = true;
+    rev = "319287dbe552c8405720b25dfdf5fa518deeee0b";
+    sha256 = "1kswc8vw9hbv2nigp8cxrgf2s0ik7p4i203cbqci8zjmnkaqpsai";
   };
 
   cmakeFlags = [
@@ -48,6 +72,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     alsaLib
+    fmt
     gettext
     glib
     gtk3
@@ -55,6 +80,8 @@ stdenv.mkDerivation {
     libaio
     libpcap
     libpng
+    libpulseaudio
+    libsamplerate
     libxml2
     portaudio
     SDL2
@@ -74,7 +101,7 @@ stdenv.mkDerivation {
       PC, with many additional features and benefits.
     '';
     homepage = "https://pcsx2.net";
-    maintainers = with maintainers; [ hrdinka samuelgrf ];
+    maintainers = with maintainers; [ hrdinka samuelgrf govanify ];
 
     # PCSX2's source code is released under LGPLv3+. It However ships
     # additional data files and code that are licensed differently.

From c07706efde310616b703976656b40ca0d14553ce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 12:34:23 +0000
Subject: [PATCH 2479/3942] python37Packages.internetarchive: 1.9.5 -> 1.9.6

---
 pkgs/development/python-modules/internetarchive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index 2683f0f1afcf..879c90c40a42 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -19,11 +19,11 @@
 
 buildPythonPackage rec {
   pname = "internetarchive";
-  version = "1.9.5";
+  version = "1.9.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "759053685c75e6e969d690043b82643c4016500abcbbc44e4daf52ec097a9a15";
+    sha256 = "0e9b24577086283280a5089b3e65086640b4e42d61ca4af913639f45b02b9e4c";
   };
 
   propagatedBuildInputs = [

From e4b6e569f16df3546ef00ad2a888eec5359d2def Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 12:51:36 +0000
Subject: [PATCH 2480/3942] python37Packages.sphinxcontrib-katex: 0.6.1 ->
 0.7.1

---
 .../python-modules/sphinxcontrib-katex/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix
index 95bd4b592010..6fcafd438ba0 100644
--- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-katex";
-  version = "0.6.1";
+  version = "0.7.1";
 
   # pkgutil namespaces are broken in nixpkgs (because they can't scan multiple
   # directories). But python2 is EOL, so not supporting it should be ok.
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "88320b2780f350d67f84a5424973ce24aee65701e8e163a7f5856c5df3353188";
+    sha256 = "fa80aba8af9d78f70a0a255815d44e33e8aca8e806ca6101e0eb18b2b7243246";
   };
 
   propagatedBuildInputs = [ sphinx ];

From fccd10f426449e3916d9a8bda056451bc5230734 Mon Sep 17 00:00:00 2001
From: Stephan Renatus <stephan.renatus@gmail.com>
Date: Fri, 13 Nov 2020 19:48:57 +0100
Subject: [PATCH 2481/3942] wabt: 1.0.19 -> 1.0.20

For some unknown reason, the version built here reports
itself as 1.0.13 (e.g. in `wasm-objdump --version`).

That is unfortunate, but seems to match what happened in
the release binaries published on github:
- https://github.com/WebAssembly/wabt/releases/tag/1.0.20
  these report 1.0.13 for me, too, on macos.
- https://github.com/WebAssembly/wabt/issues/1463

Signed-off-by: Stephan Renatus <stephan.renatus@gmail.com>
---
 pkgs/development/tools/wabt/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index a8ade2b815cc..b910a31e1552 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -2,22 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "wabt";
-  version = "1.0.19";
+  version = "1.0.20";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "wabt";
     rev = version;
-    sha256 = "0g1iy1icnjfkc0dadkrif4nlixpvq626023rgj02m9al64gf9hvx";
+    sha256 = "1wwyljppxz03slvgx809g87mdrglpimz4xaici71a9mqwjpgj0l8";
     fetchSubmodules = true;
   };
 
-  # https://github.com/WebAssembly/wabt/pull/1408
-  patches = [ (fetchpatch {
-    url = "https://github.com/WebAssembly/wabt/pull/1408/commits/28505f4db6e4561cf6840af5c304a9aa900c4987.patch";
-    sha256 = "1nh1ddsak6w51np17xf2r7i0czxrjslz1i4impmmp88h5bp2yjba";
-  }) ];
-
   nativeBuildInputs = [ cmake ];
   cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ];
   buildInputs = [ python3 ];

From 2ac6d50e1696250eabee99e50fb830e741692c33 Mon Sep 17 00:00:00 2001
From: Jamie McClymont <jamie@kwiius.com>
Date: Sat, 14 Nov 2020 03:25:59 +1300
Subject: [PATCH 2482/3942] vte-ng: update patches to apply on vte 0.62

---
 .../terminal-emulators/termite/default.nix    | 23 +++----
 ...function-for-setting-cursor-position.patch | 61 +++++++++++++++++++
 ...tion-for-setting-the-text-selections.patch | 56 +++++++++++++++++
 ...nction-for-getting-the-selected-text.patch | 29 +++++++++
 4 files changed, 154 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch
 create mode 100644 pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch
 create mode 100644 pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch

diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix
index 63565e207f77..2f991ca1c7e6 100644
--- a/pkgs/applications/terminal-emulators/termite/default.nix
+++ b/pkgs/applications/terminal-emulators/termite/default.nix
@@ -4,6 +4,8 @@ let
 
   # termite requires VTE with some internals exposed
   # https://github.com/thestinger/vte-ng
+  #
+  # three of the patches have been locally modified to cleanly apply on 0.62
   vte-ng =  vte.overrideAttrs (attrs: {
     patches = attrs.patches or [] ++ [
       (fetchpatch {
@@ -11,26 +13,17 @@ let
         url = "https://github.com/thestinger/vte-ng/commit/342e26574f50dcd40bbeaad9e839c2a6144d0c1c.patch";
         sha256 = "1b0k9ys545q85vfki417p21kis9f36yd0hyp12phayynss6fn715";
       })
-      (fetchpatch {
-        name = "0002-expose-function-for-setting-cursor-position.patch";
-        url = "https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch";
-        sha256 = "091sb44g2pl0zbxnxidpfmsqqc65dmkakhjb0wvlnsjckqalhs89";
-      })
-      (fetchpatch {
-        name = "0003-add-function-for-setting-the-text-selections.patch";
-        url = "https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch";
-        sha256 = "12rq3svbj1nzridbssxsvmmb8njky3w8qdnkymz7850b3kqg277x";
-      })
+      # Derived from https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch
+      ./vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch
+      # Derived from https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch
+      ./vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch
       (fetchpatch {
         name = "0004-add-functions-to-get-set-block-selection-mode.patch";
         url = "https://github.com/thestinger/vte-ng/commit/08748fd9cb82bd191e5c476b1682ca71f7732572.patch";
         sha256 = "1cnhd8f7ywdgcyd6xmcd2nn39jjxzkxp4d0zsj2k7m5v74nhcs1g";
       })
-      (fetchpatch {
-        name = "0005-expose-function-for-getting-the-selected-text.patch";
-        url = "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch";
-        sha256 = "0pbnbkwqxm4p9xsgvqwayvh8srk5z1kyjnigmahf9mlqn7hi6v27";
-      })
+      # Derived from "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch";
+      ./vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch
     ];
   });
 
diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch
new file mode 100644
index 000000000000..8f5c0dab39ad
--- /dev/null
+++ b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch
@@ -0,0 +1,61 @@
+From 5ae3acb69474fe5bc43767a4a3625e9ed23607a1 Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle@vdwaa.nl>
+Date: Sat, 13 Feb 2016 22:18:01 +0100
+Subject: [PATCH] expose function for setting cursor position
+
+---
+ src/vte/vteterminal.h |  5 +++++
+ src/vtegtk.cc         | 24 ++++++++++++++++++++++++
+ 2 files changed, 29 insertions(+)
+
+diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
+index a607e5da..9701320d 100644
+--- a/src/vte/vteterminal.h
++++ b/src/vte/vteterminal.h
+@@ -378,6 +378,11 @@ _VTE_PUBLIC
+ void vte_terminal_get_cursor_position(VteTerminal *terminal,
+ 				      glong *column,
+                                       glong *row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
++_VTE_PUBLIC
++void vte_terminal_set_cursor_position(VteTerminal *terminal,
++                                      glong column,
++                                      glong row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
++
+ 
+ _VTE_PUBLIC
+ char *vte_terminal_hyperlink_check_event(VteTerminal *terminal,
+diff --git a/src/vtegtk.cc b/src/vtegtk.cc
+index b11b780b..bdf36eac 100644
+--- a/src/vtegtk.cc
++++ b/src/vtegtk.cc
+@@ -2415,6 +2415,30 @@ vte_terminal_get_cursor_position(VteTerminal *terminal,
+ 	}
+ }
+ 
++/**
++ * vte_terminal_set_cursor_position
++ * @terminal: a #VteTerminal
++ * @column: the new cursor column
++ * @row: the new cursor row
++ *
++ * Set the location of the cursor.
++ */
++void
++vte_terminal_set_cursor_position(VteTerminal *terminal,
++		                 long column, long row) noexcept
++{
++	g_return_if_fail(VTE_IS_TERMINAL(terminal));
++
++        auto impl = IMPL(terminal);
++	impl->invalidate_cursor_once(FALSE);
++	impl->m_screen->cursor.col = column;
++	impl->m_screen->cursor.row = row;
++	impl->invalidate_cursor_once(FALSE);
++	impl->check_cursor_blink();
++	impl->queue_cursor_moved();
++
++}
++
+ /**
+  * vte_terminal_pty_new_sync:
+  * @terminal: a #VteTerminal
diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch
new file mode 100644
index 000000000000..203228dae34d
--- /dev/null
+++ b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch
@@ -0,0 +1,56 @@
+From 742d57ecf15e24f6a5f2133a81b6c70acc8ff03c Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle@vdwaa.nl>
+Date: Sat, 13 Feb 2016 22:25:19 +0100
+Subject: [PATCH] add function for setting the text selections
+
+---
+ src/vte/vteterminal.h |  4 ++++
+ src/vtegtk.cc         | 20 ++++++++++++++++++++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
+index 9701320d..a11b4cb7 100644
+--- a/src/vte/vteterminal.h
++++ b/src/vte/vteterminal.h
+@@ -196,6 +196,10 @@ _VTE_PUBLIC
+ void vte_terminal_select_all(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
+ _VTE_PUBLIC
+ void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
++_VTE_PUBLIC
++void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row,
++			      long end_col, long end_row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
++
+ 
+ /* By-word selection */
+ _VTE_PUBLIC
+diff --git a/src/vtegtk.cc b/src/vtegtk.cc
+index bdf36eac..d9e9f2ed 100644
+--- a/src/vtegtk.cc
++++ b/src/vtegtk.cc
+@@ -2390,6 +2390,26 @@ vte_terminal_unselect_all(VteTerminal *terminal)
+         IMPL(terminal)->deselect_all();
+ }
+ 
++/**
++ * vte_terminal_select_text:
++ * @terminal: a #VteTerminal
++ * @start_col: the starting column for the selection
++ * @start_row: the starting row for the selection
++ * @end_col: the end column for the selection
++ * @end_row: the end row for the selection
++ *
++ * Sets the current selection region.
++ */
++void
++vte_terminal_select_text(VteTerminal *terminal,
++		         long start_col, long start_row,
++			 long end_col, long end_row) noexcept
++{
++	g_return_if_fail (VTE_IS_TERMINAL (terminal));
++
++        IMPL(terminal)->select_text(start_col, start_row, end_col, end_row);
++}
++
+ /**
+  * vte_terminal_get_cursor_position:
+  * @terminal: a #VteTerminal
diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch
new file mode 100644
index 000000000000..0a2c52722268
--- /dev/null
+++ b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch
@@ -0,0 +1,29 @@
+--- a/src/vte/vteterminal.h
++++ b/src/vte/vteterminal.h
+@@ -204,7 +204,9 @@
+ _VTE_PUBLIC
+ void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row,
+ 			      long end_col, long end_row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
+-
++_VTE_PUBLIC
++char *
++vte_terminal_get_selection(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1);
+ 
+ /* By-word selection */
+ _VTE_PUBLIC
+--- a/src/vtegtk.cc
++++ b/src/vtegtk.cc
+@@ -2435,6 +2435,13 @@
+         IMPL(terminal)->select_text(start_col, start_row, end_col, end_row);
+ }
+ 
++char *
++vte_terminal_get_selection(VteTerminal *terminal) noexcept
++{
++	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
++	return g_strdup (IMPL(terminal)->m_selection[VTE_SELECTION_PRIMARY]->str);
++}
++
+ /**
+  * vte_terminal_get_cursor_position:
+  * @terminal: a #VteTerminal

From 80ceb60cb16d63c9d31ed83ffdb505301aa15454 Mon Sep 17 00:00:00 2001
From: Gauvain 'GovanifY' Roussel-Tarbouriech <gauvain@govanify.com>
Date: Sat, 14 Nov 2020 00:26:24 +0100
Subject: [PATCH 2483/3942] ghidra: 9.1.2 -> 9.2

---
 pkgs/tools/security/ghidra/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix
index d31e1f2c2758..e11d028f1f8b 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/pkgs/tools/security/ghidra/default.nix
@@ -14,13 +14,15 @@
   };
 
 
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
 
-  name = "ghidra-9.1.2";
+  pname = "ghidra";
+  version = "9.2";
+  versiondate = "20201113";
 
   src = fetchzip {
-    url = "https://ghidra-sre.org/ghidra_9.1.2_PUBLIC_20200212.zip";
-    sha256 = "0j48pijypg44bw06azbrgfqjkigb13ljfdxib70sxwyqia3vkbbm";
+    url = "https://www.ghidra-sre.org/ghidra_${version}_PUBLIC_${versiondate}.zip";
+    sha256 = "0lcvmbq04qkdsf0bz509frgw79bhyxyixkqg1k712p3576ng3nby";
   };
 
   nativeBuildInputs = [
@@ -62,7 +64,7 @@ in stdenv.mkDerivation {
     homepage = "https://ghidra-sre.org/";
     platforms = [ "x86_64-linux" ];
     license = licenses.asl20;
-    maintainers = [ maintainers.ck3d ];
+    maintainers = with maintainers; [ ck3d govanify ];
   };
 
 }

From aaad9fd0daadffa53a65cdeff3a060f0c59db417 Mon Sep 17 00:00:00 2001
From: Mike Sperber <sperber@deinprogramm.de>
Date: Sat, 2 May 2020 16:18:29 +0200
Subject: [PATCH 2484/3942] nixos/doc: Rudimentary documentation for
 Subversion-inside-Apache HTTP.

Content thanks to: Aaron Andersen
---
 .../manual/configuration/configuration.xml    |   1 +
 nixos/doc/manual/configuration/subversion.xml | 140 ++++++++++++++++++
 2 files changed, 141 insertions(+)
 create mode 100644 nixos/doc/manual/configuration/subversion.xml

diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 6eb8f50bacac..2d7d22e3bb5a 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -22,6 +22,7 @@
  <xi:include href="xfce.xml" />
  <xi:include href="networking.xml" />
  <xi:include href="linux-kernel.xml" />
+ <xi:include href="subversion.xml" />
  <xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />
  <xi:include href="profiles.xml" />
  <xi:include href="kubernetes.xml" />
diff --git a/nixos/doc/manual/configuration/subversion.xml b/nixos/doc/manual/configuration/subversion.xml
new file mode 100644
index 000000000000..940d63cc4e6d
--- /dev/null
+++ b/nixos/doc/manual/configuration/subversion.xml
@@ -0,0 +1,140 @@
+<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-subversion">
+  <title>Subversion</title>
+
+ <para>
+  <link xlink:href="https://subversion.apache.org/">Subversion</link>
+  is a centralized version-control system.  It can use a <link
+  xlink:href="http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.choosing">variety
+  of protocols</link> for communication between client and server.
+ </para>
+ <section xml:id="module-services-subversion-apache-httpd">
+  <title>Subversion inside Apache HTTP</title>
+
+   <para>
+   This section focuses on configuring a web-based server on top of
+   the Apache HTTP server, which uses
+   <link xlink:href="http://www.webdav.org/">WebDAV</link>/<link
+   xlink:href="http://www.webdav.org/deltav/WWW10/deltav-intro.htm">DeltaV</link>
+   for communication.
+   </para>
+
+   <para>For more information on the general setup, please refer to
+   the <link
+   xlink:href="http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd">the
+   appropriate section of the Subversion book</link>.
+   </para>
+
+   <para>To configure, include in
+   <literal>/etc/nixos/configuration.nix</literal> code to activate
+   Apache HTTP, setting <xref linkend="opt-services.httpd.adminAddr" />
+   appropriately:
+   </para>
+
+    <para>
+<programlisting>
+  services.httpd.enable = true;
+  services.httpd.adminAddr = ...;
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
+</programlisting>
+    </para>
+
+    <para>For a simple Subversion server with basic authentication,
+    configure the Subversion module for Apache as follows, setting
+    <literal>hostName</literal> and <literal>documentRoot</literal>
+    appropriately, and <literal>SVNParentPath</literal> to the parent
+    directory of the repositories,
+    <literal>AuthzSVNAccessFile</literal> to the location of the
+    <code>.authz</code> file describing access permission, and
+    <literal>AuthUserFile</literal> to the password file.
+    </para>
+    <para>
+<programlisting>
+services.httpd.extraModules = [
+    # note that order is *super* important here
+    { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; }
+    { name = "authz_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so"; }
+  ];
+  services.httpd.virtualHosts = {
+    "svn" = {
+       hostName = HOSTNAME;
+       documentRoot = DOCUMENTROOT;
+       locations."/svn".extraConfig = ''
+           DAV svn
+           SVNParentPath REPO_PARENT
+           AuthzSVNAccessFile ACCESS_FILE
+           AuthName "SVN Repositories"
+           AuthType Basic
+           AuthUserFile PASSWORD_FILE
+           Require valid-user
+      '';
+    }
+</programlisting>
+    </para>
+
+    <para>
+    The key <code>"svn"</code> is just a symbolic name identifying the
+    virtual host.  The <code>"/svn"</code> in
+    <code>locations."/svn".extraConfig</code> is the path underneath
+    which the repositories will be served.
+    </para>
+
+    <para><link
+              xlink:href="https://wiki.archlinux.org/index.php/Subversion">This
+    page</link> explains how to set up the Subversion configuration
+    itself.  This boils down to the following:
+    </para>
+    <para>
+      Underneath <literal>REPO_PARENT</literal> repositories can be set up
+      as follows:
+    </para>
+    <para>
+<screen>
+<prompt>$ </prompt> svn create REPO_NAME
+</screen>
+    </para>
+    <para>Repository files need to be accessible by
+    <literal>wwwrun</literal>:
+    </para>
+    <para>
+<screen>
+<prompt>$ </prompt> chown -R wwwrun:wwwrun REPO_PARENT
+</screen>
+    </para>
+    <para>
+      The password file <literal>PASSWORD_FILE</literal> can be created as follows:
+    </para>
+    <para>
+<screen>
+<prompt>$ </prompt> htpasswd -cs PASSWORD_FILE USER_NAME
+</screen>
+    </para>
+    <para>
+    Additional users can be set up similarly, omitting the
+    <code>c</code> flag:
+    </para>
+    <para>
+<screen>
+<prompt>$ </prompt> htpasswd -s PASSWORD_FILE USER_NAME
+</screen>
+    </para>
+    <para>
+      The file describing access permissions
+      <literal>ACCESS_FILE</literal> will look something like
+      the following:
+    </para>
+    <para>
+<programlisting>
+[/]
+* = r
+
+[REPO_NAME:/]
+USER_NAME = rw
+</programlisting>
+    </para>
+    <para>The Subversion repositories will be accessible as <code>http://HOSTNAME/svn/REPO_NAME</code>.</para>
+ </section>
+</chapter>

From 99d3a69d5b97020cefd25f876ca5a2c505cc5548 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Sat, 14 Nov 2020 23:06:33 +0900
Subject: [PATCH 2485/3942] musescore: fix unpack on darwin (#103651)

---
 pkgs/applications/audio/musescore/darwin.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix
index 8870a144c9f5..4a2ae29f36ad 100644
--- a/pkgs/applications/audio/musescore/darwin.nix
+++ b/pkgs/applications/audio/musescore/darwin.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
   pname = "musescore-darwin";
   version = concatStringsSep "." versionComponents;
 
+  # The disk image contains the .app and a symlink to /Applications.
+  sourceRoot = "${appName}.app";
+
   src = fetchurl {
     url =  "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg";
     sha256 = "19xkaxlkbrhvfip6n3iw6q7463ngr6y5gfisrpjqg2xl2igyl795";

From f89b4dc45057343af8c625bd78738b0433a7f2b0 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Sat, 4 Jan 2020 00:44:27 +0100
Subject: [PATCH 2486/3942] utsushi: 3.59.2 -> unstable-2020-11-10

+ master should be roughly equivalent to 3.62.0
+ moving to the community repo because they are way better at fixing
  things, while upstream epson almost never merges fixes
+ great thanks to @mwilsoncoding for debugging the problem:
   + `autoconf-archive` was missing
---
 pkgs/misc/drivers/utsushi/default.nix | 46 +++++++++++++++++----------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix
index 294bb8a0203e..10b5e570d0fa 100644
--- a/pkgs/misc/drivers/utsushi/default.nix
+++ b/pkgs/misc/drivers/utsushi/default.nix
@@ -1,20 +1,32 @@
-{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, boost, gtkmm2
-, imagemagick, sane-backends, tesseract4, udev, libusb1}:
+{ stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config
+, autoconf-archive, libxslt, boost , gtkmm2 , imagemagick, sane-backends
+, tesseract4, udev, libusb1, gnum4 }:
 
-stdenv.mkDerivation rec {
+
+let
+  fakegit = writeScriptBin "git" ''
+    #! ${stdenv.shell} -e
+    if [ "$1" = "describe" ]; then
+      [ -r .rev ] && cat .rev || true
+    fi
+  '';
+in stdenv.mkDerivation rec {
   pname = "utsushi";
-  version = "3.59.2";
+  version = "unstable-2020-11-10";
 
-  src = fetchFromGitLab{
+  src = fetchFromGitLab {
     owner = pname;
-    repo = "imagescan";
-    rev = version;
-    sha256 = "06gp97dfnf43l6kb988scmm66q9n5rc7ndwv3rykrdpyhy8rbi05";
+    repo = pname;
+    rev = "04700043e2d16062eb8bd27f4efff3024f387d32";
+    sha256 = "0rxv5n0985d414i6hwichsn7hybwgwsimpy5s4hmcsvxqcpks4li";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
+    autoconf-archive
+    fakegit
+    libxslt
   ];
 
   buildInputs = [
@@ -26,19 +38,21 @@ stdenv.mkDerivation rec {
     libusb1.dev
   ];
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=parentheses -Wno-error=unused-variable";
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-error=deprecated-declarations"
+    "-Wno-error=parentheses"
+    "-Wno-error=unused-variable"
+  ];
+
 
   postPatch = ''
-    # remove vendored dependencies
-    rm -r upstream/boost
-
     # create fake udev and sane config
     mkdir -p $out/etc/{sane.d,udev/rules.d}
     touch $out/etc/sane.d/dll.conf
-
-    # absolute paths to conver & tesseract
+    # absolute paths to convert & tesseract
+    sed -i '/\[AC_DEFINE(\[HAVE_IMAGE_MAGICK\], \[1\])/a \             MAGICK_CONVERT="${imagemagick}/bin/convert"' configure.ac
     substituteInPlace filters/magick.cpp \
-      --replace '"convert' '"${imagemagick}/bin/convert'
+      --replace 'convert ' '${imagemagick}/bin/convert '
     substituteInPlace filters/reorient.cpp \
       --replace '"tesseract' '"${tesseract4}/bin/tesseract'
     substituteInPlace filters/get-text-orientation \
@@ -61,7 +75,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doInstallCheck = true;
+  doInstallCheck = false;
 
   meta = with stdenv.lib; {
     description = "SANE utsushi backend for some Epson scanners";

From 5d08fb8fd6a9eab20d2480b93687655c5ff81728 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 15:02:54 +0000
Subject: [PATCH 2487/3942] python37Packages.hyperopt: 0.1.2 -> 0.2.5

---
 pkgs/development/python-modules/hyperopt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix
index 7a907224993e..16599214ede7 100644
--- a/pkgs/development/python-modules/hyperopt/default.nix
+++ b/pkgs/development/python-modules/hyperopt/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "hyperopt";
-  version = "0.1.2";
+  version = "0.2.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "34xIpivBYUvcN/XMVwBkqTpLgaFlWWIduazuP2U2tlg=";
+    sha256 = "bc6047d50f956ae64eebcb34b1fd40f186a93e214957f20e87af2f10195295cc";
   };
 
   propagatedBuildInputs = [ future cloudpickle numpy networkx six tqdm scipy pymongo ];

From 9750813b89bfa38d2c319a28d8537d8754047d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 22 Aug 2020 08:17:40 +0100
Subject: [PATCH 2488/3942] nixos/telegraf: add support for native ping

---
 nixos/modules/services/monitoring/telegraf.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix
index 5d131557e8be..c6b0b8906fd6 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixos/modules/services/monitoring/telegraf.nix
@@ -60,6 +60,8 @@ in {
         ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         User = "telegraf";
         Restart = "on-failure";
+        # for ping probes
+        AmbientCapabilities = [ "CAP_NET_RAW" ];
       };
     };
 

From 157d7354d6e66153352e5ef2c054ef4398c67187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 22 Aug 2020 11:31:34 +0100
Subject: [PATCH 2489/3942] nixos/telegraf: add environmentFile option

---
 .../modules/services/monitoring/telegraf.nix  | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix
index c6b0b8906fd6..c0733f6b89cf 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixos/modules/services/monitoring/telegraf.nix
@@ -26,6 +26,19 @@ in {
         type = types.package;
       };
 
+      environmentFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/run/keys/telegraf.env";
+        description = ''
+          File to load as environment file. Environment variables
+          from this file will be interpolated into the config file
+          using envsubst with this syntax:
+          <literal>$ENVIRONMENT ''${VARIABLE}</literal>
+          This is useful to avoid putting secrets into the nix store.
+        '';
+      };
+
       extraConfig = mkOption {
         default = {};
         description = "Extra configuration options for telegraf";
@@ -51,15 +64,23 @@ in {
 
   ###### implementation
   config = mkIf config.services.telegraf.enable {
-    systemd.services.telegraf = {
+    systemd.services.telegraf = let
+      finalConfigFile = if config.services.telegraf.environmentFile == null
+                        then configFile
+                        else "/tmp/config.toml";
+    in {
       description = "Telegraf Agent";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-online.target" ];
       serviceConfig = {
-        ExecStart=''${cfg.package}/bin/telegraf -config "${configFile}"'';
+        EnvironmentFile = config.services.telegraf.environmentFile;
+        ExecStartPre = lib.optional (config.services.telegraf.environmentFile != null)
+          ''${pkgs.envsubst}/bin/envsubst -o /tmp/config.toml -i "${configFile}"'';
+        ExecStart=''${cfg.package}/bin/telegraf -config ${finalConfigFile}'';
         ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         User = "telegraf";
         Restart = "on-failure";
+        PrivateTmp = true;
         # for ping probes
         AmbientCapabilities = [ "CAP_NET_RAW" ];
       };

From 8edc4619abc884d97583c1ec714c9f7c795fbbac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 8 Sep 2020 07:59:50 +0200
Subject: [PATCH 2490/3942] nixos/telegraf: switch to setting types

This allows to split up configuration into multiple modules
---
 .../modules/services/monitoring/telegraf.nix  | 21 ++++++++-----------
 nixos/tests/telegraf.nix                      |  5 ++++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix
index c0733f6b89cf..12a360e7229a 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixos/modules/services/monitoring/telegraf.nix
@@ -5,14 +5,8 @@ with lib;
 let
   cfg = config.services.telegraf;
 
-  configFile = pkgs.runCommand "config.toml" {
-    buildInputs = [ pkgs.remarshal ];
-    preferLocalBuild = true;
-  } ''
-    remarshal -if json -of toml \
-      < ${pkgs.writeText "config.json" (builtins.toJSON cfg.extraConfig)} \
-      > $out
-  '';
+  settingsFormat = pkgs.formats.toml {};
+  configFile = settingsFormat.generate "config.toml" cfg.extraConfig;
 in {
   ###### interface
   options = {
@@ -42,7 +36,7 @@ in {
       extraConfig = mkOption {
         default = {};
         description = "Extra configuration options for telegraf";
-        type = types.attrs;
+        type = settingsFormat.type;
         example = {
           outputs = {
             influxdb = {
@@ -67,7 +61,7 @@ in {
     systemd.services.telegraf = let
       finalConfigFile = if config.services.telegraf.environmentFile == null
                         then configFile
-                        else "/tmp/config.toml";
+                        else "/var/run/telegraf/config.toml";
     in {
       description = "Telegraf Agent";
       wantedBy = [ "multi-user.target" ];
@@ -75,12 +69,15 @@ in {
       serviceConfig = {
         EnvironmentFile = config.services.telegraf.environmentFile;
         ExecStartPre = lib.optional (config.services.telegraf.environmentFile != null)
-          ''${pkgs.envsubst}/bin/envsubst -o /tmp/config.toml -i "${configFile}"'';
+          (pkgs.writeShellScript "pre-start" ''
+            umask 077
+            ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > /var/run/telegraf/config.toml
+          '');
         ExecStart=''${cfg.package}/bin/telegraf -config ${finalConfigFile}'';
         ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        RuntimeDirectory = "telegraf";
         User = "telegraf";
         Restart = "on-failure";
-        PrivateTmp = true;
         # for ping probes
         AmbientCapabilities = [ "CAP_NET_RAW" ];
       };
diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix
index 73f741b11357..483a5ae7e540 100644
--- a/nixos/tests/telegraf.nix
+++ b/nixos/tests/telegraf.nix
@@ -6,12 +6,15 @@ import ./make-test-python.nix ({ pkgs, ...} : {
 
   machine = { ... }: {
     services.telegraf.enable = true;
+    services.telegraf.environmentFile = pkgs.writeText "secrets" ''
+      SECRET=example
+    '';
     services.telegraf.extraConfig = {
       agent.interval = "1s";
       agent.flush_interval = "1s";
       inputs.exec = {
         commands = [
-          "${pkgs.runtimeShell} -c 'echo example,tag=a i=42i'"
+          "${pkgs.runtimeShell} -c 'echo $SECRET,tag=a i=42i'"
         ];
         timeout = "5s";
         data_format = "influx";

From 7534d92648cc4a7c708718e72c21b9483aca385d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 12 Nov 2020 13:49:00 +0100
Subject: [PATCH 2491/3942] nixos/telegraf: allow multiple env files

---
 nixos/modules/services/monitoring/telegraf.nix | 12 ++++++------
 nixos/tests/telegraf.nix                       |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix
index 12a360e7229a..1fc17ec72daf 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixos/modules/services/monitoring/telegraf.nix
@@ -20,9 +20,9 @@ in {
         type = types.package;
       };
 
-      environmentFile = mkOption {
-        type = types.nullOr types.path;
-        default = null;
+      environmentFiles = mkOption {
+        type = types.nullOr (types.listOf types.path);
+        default = [];
         example = "/run/keys/telegraf.env";
         description = ''
           File to load as environment file. Environment variables
@@ -59,7 +59,7 @@ in {
   ###### implementation
   config = mkIf config.services.telegraf.enable {
     systemd.services.telegraf = let
-      finalConfigFile = if config.services.telegraf.environmentFile == null
+      finalConfigFile = if config.services.telegraf.environmentFiles == []
                         then configFile
                         else "/var/run/telegraf/config.toml";
     in {
@@ -67,8 +67,8 @@ in {
       wantedBy = [ "multi-user.target" ];
       after = [ "network-online.target" ];
       serviceConfig = {
-        EnvironmentFile = config.services.telegraf.environmentFile;
-        ExecStartPre = lib.optional (config.services.telegraf.environmentFile != null)
+        EnvironmentFile = config.services.telegraf.environmentFiles;
+        ExecStartPre = lib.optional (config.services.telegraf.environmentFiles != [])
           (pkgs.writeShellScript "pre-start" ''
             umask 077
             ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > /var/run/telegraf/config.toml
diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix
index 483a5ae7e540..938bbd518b5a 100644
--- a/nixos/tests/telegraf.nix
+++ b/nixos/tests/telegraf.nix
@@ -6,9 +6,9 @@ import ./make-test-python.nix ({ pkgs, ...} : {
 
   machine = { ... }: {
     services.telegraf.enable = true;
-    services.telegraf.environmentFile = pkgs.writeText "secrets" ''
+    services.telegraf.environmentFiles = [pkgs.writeText "secrets" ''
       SECRET=example
-    '';
+    ''];
     services.telegraf.extraConfig = {
       agent.interval = "1s";
       agent.flush_interval = "1s";

From b696d7962f4f2724918622fd086a781220fcfade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Nov 2020 09:26:41 +0100
Subject: [PATCH 2492/3942] telegraf: 1.15.2 -> 1.16.2

---
 pkgs/servers/monitoring/telegraf/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index a12b9e50adb5..fa94a3332a82 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "telegraf";
-  version = "1.15.2";
+  version = "1.16.2";
 
   excludedPackages = "test";
 
@@ -12,19 +12,10 @@ buildGoModule rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "v${version}";
-    sha256 = "045wjpq29dr0s48ns3a4p8pw1j0ssfcw6m91iim4pkrppj7bm2di";
+    sha256 = "sha256-XdlXUwGn2isGn7SqCGaAjntposBEd6WbbdfN6dEycDI=";
   };
 
-  patches = [
-    # https://github.com/influxdata/telegraf/pull/7988
-    # fix broken cgo vendoring
-    (fetchpatch {
-      url = "https://github.com/influxdata/telegraf/commit/63e1f41d8ff246d191d008ff7f69d69cc34b4fae.patch";
-      sha256 = "0ikifc4414bid3g6hhxz18cw71z63s5g805klx98vrndjlpbqkzw";
-    })
-  ];
-
-  vendorSha256 = "0f95xigpkindd7dmci8kqpqq5dlirimbqh8ai73142asbrd5h4yr";
+  vendorSha256 = "02fqx817w6f9grfc69ri06a6qygbr5chan6w9waq2y0mxvmypz28";
 
   buildFlagsArray = [ ''-ldflags=
     -w -s -X main.version=${version}

From f0250226b279983c07cc33c06d0309903dfc1df9 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 14 Nov 2020 11:12:49 +0200
Subject: [PATCH 2493/3942] alacritty: 0.5.0 -> 0.6.0-rc1

---
 pkgs/applications/terminal-emulators/alacritty/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix
index 72e00cb15a70..d7e5b07c51d4 100644
--- a/pkgs/applications/terminal-emulators/alacritty/default.nix
+++ b/pkgs/applications/terminal-emulators/alacritty/default.nix
@@ -52,16 +52,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "alacritty";
-  version = "0.5.0";
+  # 0.5.0 is not compatible with gnome 3.38
+  version = "0.6.0-rc1";
 
   src = fetchFromGitHub {
     owner = "alacritty";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1948j57xhqvc5y876s929x9rhd6j0xnw5c91g1zqw2rfncn602g2";
+    sha256 = "RuIJvB0J/BQFqemOkEUiqS1uz0gMS49Dd8UQt0nbrQ0=";
   };
 
-  cargoSha256 = "17lyzcj07f0vyki3091vgjd0w8ki11sw5m8gb3bxdph1dl04rria";
+  cargoSha256 = "+3iZywLvy+8C7j6g9bqij2DSLjBoE2u1GXgfV04cWRY=";
 
   nativeBuildInputs = [
     cmake

From 68f44d990df3b2d33773a05921a4ff19b41329bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 08:39:20 -0800
Subject: [PATCH 2494/3942] fahviewer: 7.6.13 -> 7.6.21 (#103688)

---
 pkgs/applications/science/misc/foldingathome/viewer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix
index cdeed6536efa..a383de621f29 100644
--- a/pkgs/applications/science/misc/foldingathome/viewer.nix
+++ b/pkgs/applications/science/misc/foldingathome/viewer.nix
@@ -11,7 +11,7 @@
 }:
 let
   majMin = stdenv.lib.versions.majorMinor version;
-  version = "7.6.13";
+  version = "7.6.21";
 in
 stdenv.mkDerivation rec {
   inherit version;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb";
-    sha256 = "09yfvk16j1iwx8h1xg678ks3bc8760gfdn7n32j8r893kd32cwyk";
+    sha256 = "00fd00pf6fcpplcaahvy9ir60mk69d9rcmwsyq3jrv9mxqm9aq7p";
   };
 
   nativeBuildInputs = [

From e3cf6e12bc39401e26b4e45ed121e71c828d8d3a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 08:39:37 -0800
Subject: [PATCH 2495/3942] fahcontrol: 7.6.13 -> 7.6.21 (#103677)

---
 pkgs/applications/science/misc/foldingathome/control.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix
index 91c3b8c779cd..85be61f6686d 100644
--- a/pkgs/applications/science/misc/foldingathome/control.nix
+++ b/pkgs/applications/science/misc/foldingathome/control.nix
@@ -8,7 +8,7 @@
 }:
 let
   majMin = stdenv.lib.versions.majorMinor version;
-  version = "7.6.13";
+  version = "7.6.21";
 
   python = python2.withPackages
     (
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb";
-    sha256 = "0qfvhwc29cgqkwf2bkhq4gr2d1c4jgccfs58916ss03n4rwz9gng";
+    sha256 = "1vfrdqkrvdlyxaw3f6z92w5dllrv6810lmf8yhcmjcwmphipvf71";
   };
 
   nativeBuildInputs = [

From 8578fb314495b24e1bb3b533d18542459f6031c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 8 Jun 2020 16:27:01 +0200
Subject: [PATCH 2496/3942] phonemizer: init at 2.2.1

---
 .../phonemizer/backend-paths.patch            | 29 ++++++++
 .../python-modules/phonemizer/default.nix     | 73 +++++++++++++++++++
 .../drop-readme-festival-test.patch           | 12 +++
 .../remove-intertwined-festival-test.patch    | 22 ++++++
 pkgs/top-level/python-packages.nix            |  2 +
 5 files changed, 138 insertions(+)
 create mode 100644 pkgs/development/python-modules/phonemizer/backend-paths.patch
 create mode 100644 pkgs/development/python-modules/phonemizer/default.nix
 create mode 100644 pkgs/development/python-modules/phonemizer/drop-readme-festival-test.patch
 create mode 100644 pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch

diff --git a/pkgs/development/python-modules/phonemizer/backend-paths.patch b/pkgs/development/python-modules/phonemizer/backend-paths.patch
new file mode 100644
index 000000000000..1734addb0ef1
--- /dev/null
+++ b/pkgs/development/python-modules/phonemizer/backend-paths.patch
@@ -0,0 +1,29 @@
+diff --git a/phonemizer/backend/espeak.py b/phonemizer/backend/espeak.py
+index 387c11c..ceb5e7e 100644
+--- a/phonemizer/backend/espeak.py
++++ b/phonemizer/backend/espeak.py
+@@ -81,10 +81,7 @@ class BaseEspeakBackend(BaseBackend):
+         if _ESPEAK_DEFAULT_PATH:
+             return _ESPEAK_DEFAULT_PATH
+ 
+-        espeak = distutils.spawn.find_executable('espeak-ng')
+-        if not espeak:  # pragma: nocover
+-            espeak = distutils.spawn.find_executable('espeak')
+-        return espeak
++        return "@espeak@"
+ 
+     @classmethod
+     def is_available(cls):
+diff --git a/phonemizer/backend/festival.py b/phonemizer/backend/festival.py
+index b5bc56d..0833160 100644
+--- a/phonemizer/backend/festival.py
++++ b/phonemizer/backend/festival.py
+@@ -78,7 +78,7 @@ class FestivalBackend(BaseBackend):
+         if _FESTIVAL_DEFAULT_PATH:
+             return _FESTIVAL_DEFAULT_PATH
+ 
+-        return distutils.spawn.find_executable('festival')
++        return "@festival@"
+ 
+     @classmethod
+     def is_available(cls):
diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix
new file mode 100644
index 000000000000..2d6531794313
--- /dev/null
+++ b/pkgs/development/python-modules/phonemizer/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, substituteAll
+, buildPythonApplication
+, fetchPypi
+, python3Packages
+, pkgs
+, joblib
+, segments
+, attrs
+, espeak-ng
+, pytestCheckHook
+, pytestrunner
+, pytestcov
+}:
+
+buildPythonApplication rec {
+  pname = "phonemizer";
+  version = "2.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "127n4f10zxq60qd8xvlc1amji4wbghqb90rfp25rzdk716kvgwab";
+  };
+
+  postPatch = ''
+    sed -i -e '/\'pytest-runner\'/d setup.py
+  '';
+
+  patches = [
+    (substituteAll {
+      src = ./backend-paths.patch;
+      espeak = "${lib.getBin espeak-ng}/bin/espeak";
+      # override festival path should you try to integrate it
+      festival = "";
+    })
+    ./remove-intertwined-festival-test.patch
+  ];
+
+  propagatedBuildInputs = [
+    joblib
+    segments
+    attrs
+  ];
+
+  preCheck = ''
+    export HOME=$TMPDIR
+  '';
+
+  checkInputs = [
+    pytestCheckHook
+    pytestcov
+  ];
+
+  # We tried to package festvial, but were unable to get the backend running,
+  # so let's disable related tests.
+  pytestFlagsArray = [
+    "--ignore=test/test_festival.py"
+  ];
+
+  disabledTests = [
+    "test_festival"
+    "test_relative"
+    "test_absolute"
+    "test_readme_festival_syll"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/bootphon/phonemizer";
+    description = "Simple text to phones converter for multiple languages";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/development/python-modules/phonemizer/drop-readme-festival-test.patch b/pkgs/development/python-modules/phonemizer/drop-readme-festival-test.patch
new file mode 100644
index 000000000000..a60cdf2645a5
--- /dev/null
+++ b/pkgs/development/python-modules/phonemizer/drop-readme-festival-test.patch
@@ -0,0 +1,12 @@
+diff --git a/test/test_main.py b/test/test_main.py
+index 71d605a..d137cd7 100644
+--- a/test/test_main.py
++++ b/test/test_main.py
+@@ -63,7 +63,6 @@ def test_readme():
+     _test(u'hello world', u'həloʊ wɜːld ')
+     _test(u'hello world', u'həloʊ wɜːld ', '--verbose')
+     _test(u'hello world', u'həloʊ wɜːld ', '--quiet')
+-    _test(u'hello world', u'hhaxlow werld', '-b festival --strip')
+     _test(u'hello world', u'həloʊ wɜːld ', '-l en-us')
+     _test(u'bonjour le monde', u'bɔ̃ʒuʁ lə mɔ̃d ', '-l fr-fr')
+     _test(u'bonjour le monde', u'b ɔ̃ ʒ u ʁ ;eword l ə ;eword m ɔ̃ d ;eword ',
diff --git a/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch b/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch
new file mode 100644
index 000000000000..d7d605df7f98
--- /dev/null
+++ b/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch
@@ -0,0 +1,22 @@
+diff --git a/test/test_main.py b/test/test_main.py
+index 71d605a..0ea3c74 100644
+--- a/test/test_main.py
++++ b/test/test_main.py
+@@ -63,17 +63,12 @@ def test_readme():
+     _test(u'hello world', u'həloʊ wɜːld ')
+     _test(u'hello world', u'həloʊ wɜːld ', '--verbose')
+     _test(u'hello world', u'həloʊ wɜːld ', '--quiet')
+-    _test(u'hello world', u'hhaxlow werld', '-b festival --strip')
+     _test(u'hello world', u'həloʊ wɜːld ', '-l en-us')
+     _test(u'bonjour le monde', u'bɔ̃ʒuʁ lə mɔ̃d ', '-l fr-fr')
+     _test(u'bonjour le monde', u'b ɔ̃ ʒ u ʁ ;eword l ə ;eword m ɔ̃ d ;eword ',
+           '-l fr-fr -p " " -w ";eword "')
+ 
+ 
+-@pytest.mark.skipif(
+-    '2.1' in backend.FestivalBackend.version(),
+-    reason='festival-2.1 gives different results than further versions '
+-    'for syllable boundaries')
+ def test_readme_festival_syll():
+     _test(u'hello world',
+           u'hh ax ;esyll l ow ;esyll ;eword w er l d ;esyll ;eword ',
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d84b4c366243..51ae93b0eb18 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5290,6 +5290,8 @@ in {
 
   pyomo = callPackage ../development/python-modules/pyomo { };
 
+  phonemizer = callPackage ../development/python-modules/phonemizer { };
+
   pyopencl = callPackage ../development/python-modules/pyopencl { };
 
   pyopengl = callPackage ../development/python-modules/pyopengl { };

From d686ded08ce6b38dbb8316c46f505907a2a2a3ad Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Sun, 15 Nov 2020 02:32:52 +0900
Subject: [PATCH 2497/3942] git: fix darwin build (#103774)

The install step for the darwin specific $out/etc/gitconfig file
assumed that $out/etc already existed. This assumption is no longer
true after f5e2ff1ed80dac74bfb0afa92f34641cce098a49 in #103421. This
change makes make sure the directory exists before adding to it.
---
 .../version-management/git-and-tools/git/default.nix             | 1 +
 1 file changed, 1 insertion(+)

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 8ab97127294a..b7e4f3e6c483 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -249,6 +249,7 @@ stdenv.mkDerivation {
      '')
    + stdenv.lib.optionalString stdenv.isDarwin ''
     # enable git-credential-osxkeychain by default if darwin
+    mkdir -p $out/etc
     cat > $out/etc/gitconfig << EOF
     [credential]
       helper = osxkeychain

From 00251c0689046f194551ba509ef4249f8e1f50d3 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 26 Sep 2020 13:49:39 +0200
Subject: [PATCH 2498/3942] =?UTF-8?q?sacc:=201.01=20=E2=86=92=201.02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/networking/gopher/sacc/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix
index 71726056a554..e10d97aeb42b 100644
--- a/pkgs/applications/networking/gopher/sacc/default.nix
+++ b/pkgs/applications/networking/gopher/sacc/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, fetchgit, ncurses
+{ stdenv, fetchurl, ncurses
 , patches ? [] # allow users to easily override config.def.h
 }:
 
 stdenv.mkDerivation rec {
   pname = "sacc";
-  version = "1.01";
+  version = "1.02";
 
-  src = fetchgit {
-    url = "git://bitreich.org/sacc";
-    rev = version;
-    sha256 = "0n6ghbi715m7hrxzqggx1bpqj8h7569s72b9bzk6m4gd29jaq9hz";
+  src = fetchurl {
+    url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tgz";
+    sha512 = "18ja95cscgjaj1xqn70dj0482f76d0561bdcc47flqfsjh4mqckjqr65qv7awnw6rzm03i5cp45j1qx12y0y83skgsar4pplmy8q014";
   };
 
   inherit patches;

From d6decf82dd6638a159a662298af1bda485f5ba15 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 18:51:07 +0000
Subject: [PATCH 2499/3942] python37Packages.gssapi: 1.6.9 -> 1.6.10

---
 pkgs/development/python-modules/gssapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index 9013c7d978fd..e5149f6025ad 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "gssapi";
-  version = "1.6.9";
+  version = "1.6.10";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "pythongssapi";
     repo = "python-${pname}";
     rev = "v${version}";
-    sha256 = "1shm3pc0l2r91qadkpq4bx45my0165nw3kdcp0gw4lk50z215hag";
+    sha256 = "11w8z9ik6zzv3pw3319mz91cgbfkgx0mffxbapqnhilzij2jad4q";
   };
 
   # It's used to locate headers

From 960b4816a54ce683392ffb6225c982675467087d Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Thu, 5 Nov 2020 17:27:58 +0100
Subject: [PATCH 2500/3942] verilog: unstable-2020-10-24 -> 11.0

---
 .../science/electronics/verilog/default.nix   | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix
index abe80378024d..6217df2db8f8 100644
--- a/pkgs/applications/science/electronics/verilog/default.nix
+++ b/pkgs/applications/science/electronics/verilog/default.nix
@@ -1,40 +1,47 @@
-{ stdenv, fetchFromGitHub, autoconf, gperf, flex, bison, readline, ncurses
-, bzip2, zlib
-# Test inputs
+{ stdenv
+, fetchFromGitHub
+, autoconf
+, bison
+, bzip2
+, flex
+, gperf
+, ncurses
 , perl
+, readline
+, zlib
 }:
 
 let
   iverilog-test = fetchFromGitHub {
     owner  = "steveicarus";
     repo   = "ivtest";
-    rev    = "d4c80beb845cad92136c05074b3910b822a9315f";
-    sha256 = "13cpnkki3xmhsh2v4bp2s35mhwknapcikdh85g4q6925ka940r45";
+    rev    = "253609b89576355b3bef2f91e90db62223ecf2be";
+    sha256 = "18i7jlr2csp7mplcrwjhllwvb6w3v7x7mnx7vdw48nd3g5scrydx";
   };
 in
 stdenv.mkDerivation rec {
   pname   = "iverilog";
-  version = "unstable-2020-10-24";
+  version = "11.0";
 
   src = fetchFromGitHub {
     owner  = "steveicarus";
     repo   = pname;
-    rev    = "d6e01d0c557253414109a4dde46b2966a5a3fb08";
-    sha256 = "1bl75mbycj9zpjbpay8z12384yk9ih5q9agsrjh9pva0vv3h4y4y";
+    rev    = "v${stdenv.lib.replaceStrings ["."] ["_"] version}";
+    sha256 = "0nzcyi6l2zv9wxzsv9i963p3igyjds0n55x0ph561mc3pfbc7aqp";
   };
 
-  nativeBuildInputs = [ autoconf gperf flex bison ];
-  buildInputs = [ readline ncurses bzip2 zlib ];
+  nativeBuildInputs = [ autoconf bison flex gperf ];
 
-  preConfigure = "bash $PWD/autoconf.sh";
+  buildInputs = [ bzip2 ncurses readline zlib ];
+
+  preConfigure = "sh autoconf.sh";
 
   enableParallelBuilding = true;
+
   doCheck = true;
 
-  # most tests pass, but some that rely on exact text of floating-point numbers
-  # fail on aarch64.
-  doInstallCheck = !stdenv.isAarch64;
   installCheckInputs = [ perl ];
+
   installCheckPhase = ''
     # copy tests to allow writing results
     export TESTDIR=$(mktemp -d)
@@ -53,7 +60,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Icarus Verilog compiler";
-    homepage    = "http://iverilog.icarus.com/";
+    homepage    = "http://iverilog.icarus.com/";  # https does not work
     license     = with licenses; [ gpl2Plus lgpl21Plus ];
     maintainers = with maintainers; [ winden thoughtpolice ];
     platforms   = platforms.all;

From 610d3377646c1882773b4155bb4aedcaacfc3b01 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 14 Nov 2020 19:53:42 +0100
Subject: [PATCH 2501/3942] vhd2vl: fix compatibility with verilog 11.0

---
 .../science/electronics/vhd2vl/default.nix             | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix
index 43dfdcabd02f..be9e890fc8d5 100644
--- a/pkgs/applications/science/electronics/vhd2vl/default.nix
+++ b/pkgs/applications/science/electronics/vhd2vl/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchFromGitHub
+, fetchpatch
 , bison
 , flex
 , verilog
@@ -16,6 +17,15 @@ stdenv.mkDerivation rec {
     sha256 = "17va2pil4938j8c93anhy45zzgnvq3k71a7glj02synfrsv6fs8n";
   };
 
+  patches = stdenv.lib.optionals (!stdenv.isAarch64) [
+    # fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15
+    # for some strange reason, this is not needed for aarch64
+    (fetchpatch {
+      url = "https://github.com/ldoolitt/vhd2vl/commit/ce9b8343ffd004dfe8779a309f4b5a594dbec45e.patch";
+      sha256 = "1qaqhm2mk66spb2dir9n91b385rarglc067js1g6pcg8mg5v3hhf";
+    })
+  ];
+
   nativeBuildInputs = [
     bison
     flex

From 65bd03c8d3eb21a3dd849e0b4b38a39529ead058 Mon Sep 17 00:00:00 2001
From: SCOTT-HAMILTON <sgn.hamilton+github@protonmail.com>
Date: Wed, 11 Nov 2020 17:23:02 +0100
Subject: [PATCH 2502/3942] hsetroot: 1.0.2 -> 1.0.5

---
 pkgs/tools/X11/hsetroot/default.nix | 46 ++++++++++++++++-------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix
index 3bfe98a7a211..0d42687bf0b0 100644
--- a/pkgs/tools/X11/hsetroot/default.nix
+++ b/pkgs/tools/X11/hsetroot/default.nix
@@ -1,36 +1,40 @@
-{ stdenv, fetchurl, autoconf, automake, imlib2, libtool, libX11, pkgconfig, xorgproto }:
+{ stdenv
+, fetchFromGitHub
+, pkg-config
+, imlib2
+, libX11
+, libXinerama
+}:
 
 stdenv.mkDerivation rec {
   pname = "hsetroot";
-  version = "1.0.2";
+  version = "1.0.5";
 
-  # The primary download site seems to no longer exist; use Gentoo's mirror for now.
-  src = fetchurl {
-    url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-${version}.tar.gz";
-    sha256 = "d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7";
+  src = fetchFromGitHub {
+    owner = "himdel";
+    repo = "hsetroot";
+    rev = version;
+    sha256 = "1jbk5hlxm48zmjzkaq5946s58rqwg1v1ds2sdyd2ba029hmvr722";
   };
 
-  # See https://bugs.gentoo.org/show_bug.cgi?id=504056
-  underlinkingPatch = fetchurl {
-    url = "http://www.gtlib.gatech.edu/pub/gentoo/gentoo-x86-portage/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch";
-    name = "hsetroot-1.0.2-underlinking.patch";
-    sha256 = "1px1p3wz7ji725z9nlwb0x0h6lnnvnpz15sblzzq7zrijl3wz65x";
-  };
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    imlib2
+    libX11
+    libXinerama
+  ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake imlib2 libtool libX11 xorgproto ];
+  makeFlags = [ "PREFIX=$(out)" ];
 
-  patches = [ underlinkingPatch ];
-
-  patchFlags = [ "-p0" ];
-
-  preConfigure = "./autogen.sh";
+  preInstall = ''
+    mkdir -p "$out/bin"
+  '';
 
   meta = with stdenv.lib; {
     description = "Allows you to compose wallpapers ('root pixmaps') for X";
-    homepage = "https://thegraveyard.org/hsetroot.html";
+    homepage = "https://github.com/himdel/hsetroot";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.henrytill ];
+    maintainers = with maintainers; [ henrytill shamilton ];
     platforms = platforms.unix;
   };
 }

From fb397ae7d88d1867981148e62a1c15c08c5a3afe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 19:44:09 +0000
Subject: [PATCH 2503/3942] python37Packages.casbin: 0.9.0 -> 0.10.0

---
 pkgs/development/python-modules/casbin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix
index 117b6374f918..bb111bfbbd69 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "casbin";
-  version = "0.9.0";
+  version = "0.10.0";
 
   disabled = isPy27;
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "pycasbin";
     rev = "v${version}";
-    sha256 = "16bqa2f5l2cns2izc4siy8jw23q9vrqm9wnyp696fj83y77nkp75";
+    sha256 = "13r8alja25yd5gk5124y1v6frwphmz6wl5z5gz1fafb5nv2zgqw9";
   };
 
   propagatedBuildInputs = [

From 6769ad9f119a41f19e04b1cb755c43b73bb8cf28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 14 Nov 2020 21:06:48 +0100
Subject: [PATCH 2504/3942] Revert "Merge #102138: thunderbird: set build
 timeout at eight hours"

This reverts commit ef543fb416353320ba2876754e3d3240d338865e, reversing
changes made to 0d657b9c61d1b568584805717f640b2bbc5a9b0e.
See the parent commit.
---
 pkgs/applications/networking/mailreaders/thunderbird/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index e92e89c7126c..e228258efcf7 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -332,6 +332,5 @@ stdenv.mkDerivation rec {
     ];
     platforms = platforms.linux;
     license = licenses.mpl20;
-    timeout = 28800; # eight hours
   };
 }

From 477a1763fcecfdd1120b113b6b0f136dcee9d144 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 14 Nov 2020 21:20:18 +0100
Subject: [PATCH 2505/3942] jadx: 1.1.0 -> 1.2.0

---
 pkgs/tools/security/jadx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix
index 961f1e6954a1..770062736bf1 100644
--- a/pkgs/tools/security/jadx/default.nix
+++ b/pkgs/tools/security/jadx/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "jadx";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "skylot";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1dx3g0sm46qy57gggpg8bpmin5glzbxdbf0qzvha9r2dwh4mrwlg";
+    sha256 = "1w1wc81mkjcsgjbrihbsphxkcmwnfnf555pmlsd2vs2a04nki01y";
   };
 
   deps = stdenv.mkDerivation {
@@ -33,7 +33,7 @@ let
 
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = "083r4hg6m9cxzm2m8nckf10awq8kh901v5i39r60x47xk5yw84ps";
+    outputHash = "05fsycpd90dbak2vgdpd9cz08liq5j78ag9ry9y1s62ld776g0hz";
   };
 in stdenv.mkDerivation {
   inherit pname version src;

From 0c0b533fa7fb401517d3a7fe6103d6ecde6affeb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 14 Nov 2020 15:21:48 -0500
Subject: [PATCH 2506/3942] linux-rt_5_4: 5.4.74-rt42 -> 5.4.77-rt43

---
 pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
index 11a5387cac3d..53020a1ab8dd 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "5.4.74-rt42"; # updated by ./update-rt.sh
+  version = "5.4.77-rt43"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -14,14 +14,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "1drs2pngr5w3rmpydljirmibp30qb4hdrhqsi92knshlw6nz817c";
+    sha256 = "1xyvml0mps7bsa11bgpa4l0w8x6pasdz9yab2z4ds394f1lkxq53";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "11hk5ps2nsffcjmccp839l55nzbl9irss0ralj2y1xah1ikbs7fh";
+      sha256 = "1i0d52iq9n72i3dipskh2hwy2x19wsr9vsx5vvj2hvz21jv6z5m0";
     };
   }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
 

From a429039a1f936b0df442d5d334fab75dd911769a Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sat, 14 Nov 2020 23:21:01 +0200
Subject: [PATCH 2507/3942] pijul: 1.0.0-alpha -> 1.0.0-alpha.1

---
 pkgs/applications/version-management/pijul/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 0eadb51fd1a8..f62d3982b59e 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pijul";
-  version = "1.0.0-alpha";
+  version = "1.0.0-alpha.1";
 
   src = fetchCrate {
     inherit version pname;
-    sha256 = "0dnw2cxsxb20my81szyqjsmmnkakxawvsk6cnd1fi88k4lr0z2xh";
+    sha256 = "113j7f6l9yvgm3x65p268940hk2svspg0n63lg0dpp8hakk3mslq";
   };
 
-  cargoSha256 = "130vryqs0g4a0328ivqafdylwqs64g4mp8vgmz6nz4c9l3h9wgcx";
+  cargoSha256 = "0lciyhh4yv2z9aii0xph8sird4f9624pk9hynx7441hwjjdmgy59";
 
   cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";
   LIBCLANG_PATH = "${libclang}/lib";

From 990ddd496863623fccc79937384e848fc6417741 Mon Sep 17 00:00:00 2001
From: Philipp Kern <pkern@google.com>
Date: Sat, 31 Oct 2020 21:17:16 +0100
Subject: [PATCH 2508/3942] terraria-server: 1.4.0.5 -> 1.4.1.2

---
 pkgs/games/terraria-server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix
index e16a771d272e..94fb9d063b32 100644
--- a/pkgs/games/terraria-server/default.nix
+++ b/pkgs/games/terraria-server/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "terraria-server";
-  version = "1.4.0.5";
+  version = "1.4.1.2";
   urlVersion = lib.replaceChars [ "." ] [ "" ] version;
 
   src = fetchurl {
-    url = "https://terraria.org/system/dedicated_servers/archives/000/000/039/original/terraria-server-${urlVersion}.zip";
-    sha256 = "1bvcafpjxp7ddrbhm3z0xamgi71ymbi41dlx990daz0b5kbdir8y";
+    url = "https://terraria.org/system/dedicated_servers/archives/000/000/042/original/terraria-server-${urlVersion}.zip";
+    sha256 = "18hcy7jfizyyp0h66rga8z948xg3nyk32rzl7hgv7ar1w43airhh";
   };
 
   buildInputs = [ file unzip ];

From c7463be402da29b10396e8fb6b62823b625aa838 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 14 Nov 2020 17:57:06 -0300
Subject: [PATCH 2509/3942] simh: init at 3.11-1

---
 pkgs/misc/emulators/simh/default.nix | 62 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/misc/emulators/simh/default.nix

diff --git a/pkgs/misc/emulators/simh/default.nix b/pkgs/misc/emulators/simh/default.nix
new file mode 100644
index 000000000000..50e02a8f2403
--- /dev/null
+++ b/pkgs/misc/emulators/simh/default.nix
@@ -0,0 +1,62 @@
+{ stdenv
+, fetchFromGitHub
+, SDL2
+, SDL2_ttf
+, libpcap
+, vde2
+, pcre
+}:
+
+stdenv.mkDerivation rec {
+  pname = "simh";
+  version = "3.11-1";
+
+  src = fetchFromGitHub {
+    owner = "simh";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-65+YfOWpVXPeT64TZcSaWJY+ODQ0q/pwF9jb8xGdpIs=";
+  };
+
+  buildInputs = [ SDL2 SDL2_ttf libpcap vde2 pcre ];
+
+  dontConfigure = true;
+
+  makeFlags = [ "GCC=cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ];
+
+  preInstall = ''
+    install -d ${placeholder "out"}/bin
+    install -d ${placeholder "out"}/share/simh
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    for i in BIN/*; do
+      install -D $i ${placeholder "out"}/bin
+    done
+    for i in VAX/*bin; do
+      install -D $i ${placeholder "out"}/share/simh
+    done
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    (cd $out/bin; for i in *; do ln -s $i simh-$i; done)
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://simh.trailing-edge.com/";
+    description = "A collection of simulators of historic hardware";
+    longDescription = ''
+      SimH (History Simulator) is a collection of simulators for historically
+      significant or just plain interesting computer hardware and software from
+      the past. The goal of the project is to create highly portable system
+      simulators and to publish them as freeware on the Internet, with freely
+      available copies of significant or representative software.
+    '';
+    license = with licenses; mit;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; unix;
+  };
+}
+# TODO: install documentation
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e0efbb8d70a..22e43fc1ef49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1589,6 +1589,8 @@ in
 
   bsod = callPackage ../misc/emulators/bsod { };
 
+  simh = callPackage ../misc/emulators/simh { };
+
   btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
 
   btrbk = callPackage ../tools/backup/btrbk {

From 6bf0226686caf35d8fe5ea2522a12b0de5f11601 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Sun, 8 Nov 2020 17:00:17 +0100
Subject: [PATCH 2510/3942] pythonPackages.notmuch2: init at 0.31

generates bindings via cffi
---
 pkgs/development/python-modules/notmuch/2.nix | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/notmuch/2.nix

diff --git a/pkgs/development/python-modules/notmuch/2.nix b/pkgs/development/python-modules/notmuch/2.nix
new file mode 100644
index 000000000000..593eed6c2514
--- /dev/null
+++ b/pkgs/development/python-modules/notmuch/2.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, notmuch
+, python
+, cffi
+}:
+
+buildPythonPackage {
+  pname = "notmuch2";
+  inherit (notmuch) version src;
+
+  sourceRoot = "${notmuch.src.name}/bindings/python-cffi";
+
+  buildInputs = [ python notmuch cffi ];
+
+  meta = with stdenv.lib; {
+    description = "Pythonic bindings for the notmuch mail database using CFFI";
+    homepage = "https://notmuchmail.org/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ teto ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 51ae93b0eb18..d9862a193e45 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4140,6 +4140,7 @@ in {
   notify-py = callPackage ../development/python-modules/notify-py { };
 
   notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; };
+  notmuch2 = callPackage ../development/python-modules/notmuch/2.nix { inherit (pkgs) notmuch; };
 
   nototools = callPackage ../data/fonts/noto-fonts/tools.nix { };
 

From 0e89c426c7e4693bba4d3f70d38bbe920d4af88c Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Nov 2020 17:40:36 -0800
Subject: [PATCH 2511/3942] doc/contributing: remove label instructions

ofborg largely does this now
---
 doc/contributing/reviewing-contributions.xml | 48 --------------------
 1 file changed, 48 deletions(-)

diff --git a/doc/contributing/reviewing-contributions.xml b/doc/contributing/reviewing-contributions.xml
index 4fe51677f181..96bf44da9723 100644
--- a/doc/contributing/reviewing-contributions.xml
+++ b/doc/contributing/reviewing-contributions.xml
@@ -47,18 +47,6 @@
   </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>
-    </itemizedlist>
-   </listitem>
    <listitem>
     <para>
      Ensure that the package versioning fits the guidelines.
@@ -186,18 +174,6 @@
   </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>
-    </itemizedlist>
-   </listitem>
    <listitem>
     <para>
      Ensure that the package versioning is fitting the guidelines.
@@ -302,18 +278,6 @@
   </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>
-    </itemizedlist>
-   </listitem>
    <listitem>
     <para>
      Ensure that the module maintainers are notified.
@@ -406,18 +370,6 @@
   </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.

From f8117489691491865287253735ee796745dcabb9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 01:06:24 +0000
Subject: [PATCH 2512/3942] cargo-about: 0.2.2 -> 0.2.3

---
 pkgs/tools/package-management/cargo-about/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix
index 3f61fdd583ec..c2cda02ca255 100644
--- a/pkgs/tools/package-management/cargo-about/default.nix
+++ b/pkgs/tools/package-management/cargo-about/default.nix
@@ -1,16 +1,16 @@
 { lib, rustPlatform, fetchFromGitHub }:
 rustPlatform.buildRustPackage rec {
   pname = "cargo-about";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-about";
     rev = version;
-    sha256 = "00ing1v6vjqfvirp3mbayn8rwvxf72wnhz9249k2iifw8bl2r2hd";
+    sha256 = "1jdp5ksxm4rsqhirgl5zwpiahrz2lx046pkvf6xvr6ms70l2xiwj";
   };
 
-  cargoSha256 = "1wmw7knkx79fbwizaj9qkcnw0ld1lsfhca8mfpn5f0daxa5v5y97";
+  cargoSha256 = "07bjxsg5kgx8dg3wf6mvi5460db206l68irqc21hz10plz5llmnr";
 
   meta = with lib; {
     description = "Cargo plugin to generate list of all licenses for a crate";

From 3c95611c2f93ea7b9d92192b8b6ffc49a450928d Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Sun, 15 Nov 2020 02:12:26 +0100
Subject: [PATCH 2513/3942] uefitool.new-engine: A57 -> A58

---
 pkgs/tools/system/uefitool/variants.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/uefitool/variants.nix b/pkgs/tools/system/uefitool/variants.nix
index 470c8a0ca4d5..0e8d7285aab6 100644
--- a/pkgs/tools/system/uefitool/variants.nix
+++ b/pkgs/tools/system/uefitool/variants.nix
@@ -3,8 +3,8 @@ let
   common = opts: libsForQt5.callPackage (import ./common.nix opts) {};
 in rec {
   new-engine = common rec {
-    version = "A57";
-    sha256 = "0algfdlxfjs582hsqmagbcmw06p8qlh0k5xczfkscs3prdn2vm7n";
+    version = "A58";
+    sha256 = "131hkyr07fg7rnr938yyj0gk528x3402dhisav221c27v84zb7pn";
     installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ];
   };
   old-engine = common rec {

From c39f4075532cdb446689f318799e19027b7ac70a Mon Sep 17 00:00:00 2001
From: alexameen <alex.ameen.tx@gmail.com>
Date: Sat, 14 Nov 2020 19:39:55 -0600
Subject: [PATCH 2514/3942] Made AdobeBlank-Regular.ttf available with
 google-fonts.adobeBlank

---
 pkgs/data/fonts/google-fonts/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index eabc1713a722..153f37c88e0a 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -4,6 +4,8 @@ stdenv.mkDerivation {
   pname = "google-fonts";
   version = "2019-07-14";
 
+  outputs = [ "out" "adobeBlank" ];
+
   src = fetchFromGitHub {
     owner = "google";
     repo = "fonts";
@@ -30,11 +32,7 @@ stdenv.mkDerivation {
     rm -rv ofl/comfortaa/*.ttf \
       ofl/mavenpro/*.ttf \
       ofl/muli/*.ttf \
-      ofl/oswald/*.ttf \
-
-    # This abomination of a font causes crashes with `libfontconfig',
-    # It has an absurd number of symbols
-    rm -r ofl/adobeblank/
+      ofl/oswald/*.ttf
 
     if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then
       echo "error: duplicate font names"
@@ -43,6 +41,9 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
+    adobeBlankDest=$adobeBlank/share/fonts/truetype
+    install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf
+    rm -r ofl/adobeblank
     dest=$out/share/fonts/truetype
     find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' +
   '';

From 2fa89880cb8426c744143a698748fa73280d0569 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sat, 14 Nov 2020 20:45:41 -0500
Subject: [PATCH 2515/3942] nvidia-x11: 455.28 -> 455.38 (#103830)

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 75ce13da0d35..5fc60b404d89 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -22,10 +22,10 @@ rec {
   # Policy: use the highest stable version as the default (on our master).
   stable = if stdenv.hostPlatform.system == "x86_64-linux"
     then generic {
-      version = "455.28";
-      sha256_64bit = "03ysf61qrb272yqkn7bhn9d65lcfhmqc2c0dbh5prp5f2ndlkqg4";
-      settingsSha256 = "0r9vclmh48yhcrnz9yrswfipj5450ga73jywdjg19gaq2s2aaf1f";
-      persistencedSha256 = "04v9d2g1r0x5dgyy9hqqyp0p9a3qxy1kzl13vklfqrwswb8jw7z1";
+      version = "455.38";
+      sha256_64bit = "0x6w2kcjm5q9z9l6rkxqabway4qq4h3ynngn36i8ky2dpxc1wzfq";
+      settingsSha256 = "1hk4yvbb7xhfwm8jiwq6fj5m7vg3w7yvgglhfyhq7bbrlklfb4hm";
+      persistencedSha256 = "00mmazv8sy93jvp60v7p954n250f4q3kxc13l4f8fmi28lgv0844";
     }
     else legacy_390;
 

From f48ec9844443e5b6218d860535879530c6c79dde Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 01:59:18 +0000
Subject: [PATCH 2516/3942] cloudflared: 2020.11.3 -> 2020.11.5

---
 pkgs/applications/networking/cloudflared/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 49abbc7f2cc4..738917f37991 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2020.11.3";
+  version = "2020.11.5";
 
   src = fetchFromGitHub {
     owner  = "cloudflare";
     repo   = "cloudflared";
     rev    = version;
-    sha256 = "1v262wr1z0z3frb9avg6bgsv973cn6gmn4w6wghpcjwsm6jld575";
+    sha256 = "09bjqcrz7s40m7afb80dpx7jncp5prn2p6bksspv5wqc84l2nn5d";
   };
 
   vendorSha256 = null;

From ac49fb46e20b829c4ea49a5f76ce0aaa1e4814c7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 02:07:08 +0000
Subject: [PATCH 2517/3942] conftest: 0.21.0 -> 0.22.0

---
 pkgs/development/tools/conftest/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index ee048466a3d5..8c7d50becbb8 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "conftest";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "conftest";
     rev = "v${version}";
-    sha256 = "15xdsjv53hjgmdxzdakj07ggickw1jkcii31ycb3q8nh1ki05rhq";
+    sha256 = "1mjfb39h6z8dbrqxlvrvnzid7la6wj709kx7dva4126i84cmpyf1";
   };
 
-  vendorSha256 = "0795npr09680nmxiz9riq5v6rp91qgkvw1lc2mn9gzakv1ywl5rq";
+  vendorSha256 = "08c4brwvjp9f7cpzywxns6dkhl3jzq9ckyvphm2jnm2kxmkawbbn";
 
   doCheck = false;
 

From c8f7b02dfe74b0ed11042f43476933221e1e36f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 02:34:21 +0000
Subject: [PATCH 2518/3942] dasel: 1.2.0 -> 1.5.1

---
 pkgs/applications/misc/dasel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
index 0e5c33c00b5b..49a16b583661 100644
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "dasel";
-  version = "1.2.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "TomWright";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Un9tqODwiWsaw66t2m8NyaDF0+hq/e0tmRFi3/T4LMI=";
+    sha256 = "14xh5fjh0ngf8rmhqgfxmz25yz7far3sf8yza9iprs7y7ad61qz9";
   };
 
-  vendorSha256 = "sha256:1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw";
+  vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw";
 
   meta = with stdenv.lib; {
     description = "Query and update data structures from the command line";

From fbdb0d9953f7d01530fd9d3912ccc68c2e4d8139 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 03:11:48 +0000
Subject: [PATCH 2519/3942] doctl: 1.51.0 -> 1.52.0

---
 pkgs/development/tools/doctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index 51dffdbe2bed..53d0f791a35d 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.51.0";
+  version = "1.52.0";
 
   vendorSha256 = null;
 
@@ -32,7 +32,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     rev = "v${version}";
-    sha256 = "1pc1nyzjzgnwchxbhgwiq46rysxpvxv7nmshvmphqm7avxfsmdzf";
+    sha256 = "0x4ri36ivmhg42bvh62jvgawbwwypl3a4vr8m9gk19nndds9q5zv";
   };
 
   meta = with lib; {

From f00a9fee3fa9d50456321fa28cbb29b60b7bb98f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 03:21:09 +0000
Subject: [PATCH 2520/3942] dolt: 0.21.4 -> 0.22.0

---
 pkgs/servers/sql/dolt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index 08b873ea0345..24406d1c5c29 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
     pname = "dolt";
-    version = "0.21.4";
+    version = "0.22.0";
 
     src = fetchFromGitHub {
         owner = "liquidata-inc";
         repo = "dolt";
         rev = "v${version}";
-        sha256 = "13dr3iq3v14i9zlcpv8yvq6yp90b70512bk2jkr5arlk2bilba8c";
+        sha256 = "14km34wjhijfwxvqcplf2jmh69zj7llsrimafmz94jy8cy85cpa1";
     };
 
     modRoot = "./go";
     subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
-  vendorSha256 = "1x3a4q629jrgh7x8b81n2iapbxjfd389pj1wc2zd6c5l9r70xr97";
+  vendorSha256 = "01lf5f2iigv8pihblwxyqx0pgj6gqir3b7rcna0xkirrfpvzd38c";
 
   doCheck = false;
 

From 18005fbd58126b0d6fe7ae6d49247f67c15b48c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 03:30:32 +0000
Subject: [PATCH 2521/3942] doppler: 3.16.1 -> 3.17.0

---
 pkgs/tools/security/doppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix
index d31ad30ff61f..114807bf124a 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/tools/security/doppler/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "doppler";
-  version = "3.16.1";
+  version = "3.17.0";
 
   src = fetchFromGitHub {
     owner = "dopplerhq";
     repo = "cli";
     rev = version;
-    sha256 = "141ic9vgkqv3hdcpj1dlb4lawzd2rm7h2np21x28mmsd0hlg6v7y";
+    sha256 = "178kn9bn17xgv4vfg38mcb3gdnxxhjk09p8qywiwjypbjqg4zidi";
   };
 
   vendorSha256 = "1s8zwjfk9kcddn8cywr7llh9v5m140kvmi5lmy2glvwh3rwccgxf";

From d8c9dd18e4a32d41d1e216d07b6b43e9d4e4d051 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 03:38:04 +0000
Subject: [PATCH 2522/3942] drawio: 13.7.9 -> 13.9.5

---
 pkgs/applications/graphics/drawio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index 5c76e523c026..2d630c8ccbd6 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "drawio";
-  version = "13.7.9";
+  version = "13.9.5";
 
   src = fetchurl {
     url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
-    sha256 = "1h0baxh9gvshdfqb77x5m8v95lw4lw4djj3gwrna0jjpfhmcs4vq";
+    sha256 = "1glklqpbx28ssi41cdshckgvix24wkqmsw0rgf964vjc28qgfy1s";
   };
 
   nativeBuildInputs = [

From 4a98748fd168b01729d63e47a17808031264393a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 04:43:12 +0000
Subject: [PATCH 2523/3942] flow: 0.137.0 -> 0.138.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 27675652eb87..23f35c2c7881 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.137.0";
+  version = "0.138.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "1bwrm0jab3pjq1md584szdb3vk4r2cka49qn6f9znnb1ji589x5q";
+    sha256 = "08f7rihk663bwfxccl6fh6p5qn31025lhr5fmcxi3hl3jirwzb6n";
   };
 
   installPhase = ''

From e542a2d22e50ed55813a331eaa7246e464aa504d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 04:50:11 +0000
Subject: [PATCH 2524/3942] flyctl: 0.0.146 -> 0.0.149

---
 pkgs/development/web/flyctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 73450d086777..0ba7784ab2ff 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.0.146";
+  version = "0.0.149";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    sha256 = "0qqrzzgr7r2j5cwhbfwfl1z6k9qgqpsdf8f0n545hg48i52q0p2q";
+    sha256 = "0wscyakl415504yzqb93mysi2n4gqrbfzg20mdj316r9krqcbzpg";
   };
 
   preBuild = ''

From a37ccc733c811c7376fad94f34ba070ff089c7dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 05:00:35 +0000
Subject: [PATCH 2525/3942] font-manager: 0.7.8 -> 0.7.9

---
 pkgs/applications/misc/font-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index b2001c21bf76..defbe7520d7c 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "font-manager";
-  version = "0.7.8";
+  version = "0.7.9";
 
   src = fetchFromGitHub {
     owner = "FontManager";
     repo = "master";
     rev = version;
-    sha256 = "0s1l30y55l45rrqd9lygvp2gzrqw25rmjgnnja6s5rzs79gc668c";
+    sha256 = "1nc0i824v2szz0j9a5rwl8gygih15xbxnxpnx9d3wr0yq9057q6q";
   };
 
   nativeBuildInputs = [

From 168747920a1fb2c05d462b25fd58693bb6b9c37c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 05:25:31 +0000
Subject: [PATCH 2526/3942] ft2-clone: 1.39 -> 1.40

---
 pkgs/applications/audio/ft2-clone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index 5ee7a4d9c744..05f24d84e353 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ft2-clone";
-  version = "1.39";
+  version = "1.40";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
     rev = "v${version}";
-    sha256 = "0vc7gni24q649b53flz7rlgnc5xl2dqdklgwc2brj380a5s7g6m7";
+    sha256 = "0qc3hai6fhn4amk5ixmxx3yswsi25qpax0r9nvvnyhbcb6crqcs1";
   };
 
   nativeBuildInputs = [ cmake ];

From acf82008ab569d3e19cf3237a6efe80f243f3183 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 05:44:05 +0000
Subject: [PATCH 2527/3942] git-cola: 3.5 -> 3.8

---
 .../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 858383f96641..fa77b5307a37 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
@@ -5,13 +5,13 @@ let
 
 in buildPythonApplication rec {
   pname = "git-cola";
-  version = "3.5";
+  version = "3.8";
 
   src = fetchFromGitHub {
     owner = "git-cola";
     repo = "git-cola";
     rev = "v${version}";
-    sha256 = "09b60jbpdr4czx7h4vqahqmmi7m9vn77jlkpjfhys7crrdnxjp9i";
+    sha256 = "1qxv2k8lxcxpqx46ka7f042xk90xns5w9lc4009cxmsqvcdba03a";
   };
 
   buildInputs = [ git gettext ];

From ae2e0fcb8fb5e1e68a0dedf94cf8abbb9ff31955 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 06:32:52 +0000
Subject: [PATCH 2528/3942] helmfile: 0.134.0 -> 0.134.1

---
 pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 64106a7507b4..fe68d90dd920 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "helmfile";
-  version = "0.134.0";
+  version = "0.134.1";
 
   src = fetchFromGitHub {
     owner = "roboll";
     repo = "helmfile";
     rev = "v${version}";
-    sha256 = "0s64l3dj5ydal7rfyg1avckb2ri7a34y2x7rhbplam8lk0vdzx03";
+    sha256 = "14qlz6b4iddc5qxm4w4pvhkbzv60qzymn3bkyrpbx189b2yfvh6c";
   };
 
-  vendorSha256 = "1p5m5v5lpdyzywq2ybsa9zkygixdkaifn2szxj7v8x162bzf16r5";
+  vendorSha256 = "0nk2f38qjmhy45pw9yz53acmsdy2fdxswqnasvbmfzrb85b0fnfq";
 
   doCheck = false;
 

From 72c798ddcb7da96159686457e256b1d133b4f0b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 06:56:28 +0000
Subject: [PATCH 2529/3942] hugo: 0.78.1 -> 0.78.2

---
 pkgs/applications/misc/hugo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 0882b0974497..5372b556ecdb 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.78.1";
+  version = "0.78.2";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1rzv6az7fb1xvjxxq31rs42waqpwvks4h03lzjxv0kj8i43z116k";
+    sha256 = "1xjxyx520wa6sgvighjp82qqfi0ykfskp0za5j95167c56ss8lm4";
   };
 
-  vendorSha256 = "06cw3qj57nhrxrbbxcyrqn53j6g11rd2q7bxw89fdn901mc26s03";
+  vendorSha256 = "00jjcw76l12ppx3q1xhly7q10jfi2kx62a8z3r1k7m2593k8c4vq";
 
   doCheck = false;
 

From 8ac3a1503af31ed444b6997ff9eea781c2507348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 14 Nov 2020 14:40:32 +0100
Subject: [PATCH 2530/3942] nixos/lvm2-activation-generator: fix warnings on
 activation

---
 nixos/modules/tasks/lvm.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
index 2c3cc4c5467d..98a0e2ddef90 100644
--- a/nixos/modules/tasks/lvm.nix
+++ b/nixos/modules/tasks/lvm.nix
@@ -21,6 +21,10 @@ in {
   };
 
   config = mkMerge [
+    ({
+      # minimal configuration file to make lvmconfig/lvm2-activation-generator happy
+      environment.etc."lvm/lvm.conf".text = "config {}";
+    })
     (mkIf (!config.boot.isContainer) {
       systemd.tmpfiles.packages = [ cfg.package.out ];
       environment.systemPackages = [ cfg.package ];

From bc412a012d0837ea1563a1dc7dce1cb7fee76422 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 07:20:00 +0000
Subject: [PATCH 2531/3942] iconpack-obsidian: 4.13 -> 4.14

---
 pkgs/data/icons/iconpack-obsidian/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
index 8fe21aabe36f..165801f52eb8 100644
--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "iconpack-obsidian";
-  version = "4.13";
+  version = "4.14";
 
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1hh0hnd2d08l4n5r73fkngv08f8230pp94k9qq8xgmchvjfg6j8y";
+    sha256 = "1rhs8k88gh6673flr22cb3gbbw37wyzhd6jyysx6qgjjsnjvl2h8";
   };
 
   nativeBuildInputs = [ gtk3 ];

From cba0c4780141d1a762ad311da81f9e2dc5daa23f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 07:46:53 +0000
Subject: [PATCH 2532/3942] jackett: 0.16.2131 -> 0.16.2152

---
 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 a2ae37efe896..497d1fa25409 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jackett";
-  version = "0.16.2131";
+  version = "0.16.2152";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "1689w80cjji7wq1x3sgkpmx0n543mqkzvhb3hdmz6f66h479hcpk";
+    sha256 = "1q1bydyhddhz110xzbhhjj3gm0rwvjrjgc8j8wsj7xd9k0laygqd";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From efe6b12a35e38e4da9d651e4898079c8e7263d99 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 17:34:28 +0000
Subject: [PATCH 2533/3942] python37Packages.pyvips: 2.1.12 -> 2.1.13

---
 pkgs/development/python-modules/pyvips/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix
index 0f5f9a4b43ad..5853538610a1 100644
--- a/pkgs/development/python-modules/pyvips/default.nix
+++ b/pkgs/development/python-modules/pyvips/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "pyvips";
-  version = "2.1.12";
+  version = "2.1.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0pg0dxhxgi2m7bb5bi5wpx9hgnbi8ws1bz6w2dldbhi52pizghl4";
+    sha256 = "4f1f6fa19893048bf6b950eb7eb2d4cdfeb8b940a9defaca5d4f79e5acd5085f";
   };
 
   nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ];

From e038ae53292e8ecbc1b6810e33037d0b7d08779e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 17:09:01 +0000
Subject: [PATCH 2534/3942] python37Packages.dropbox: 10.8.0 -> 10.10.0

---
 pkgs/development/python-modules/dropbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index 20576e5e47a4..b58d24e3fecf 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "dropbox";
-  version = "10.8.0";
+  version = "10.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2312a0314d7698f6aa6944bf6d73a756f4ff7d7d90fa26c323a418a84dc3b533";
+    sha256 = "df43e9e0bdcae6d610dd754a5ec72f2f91a311bbc2c8a28d076df69695b18398";
   };
 
   # Set DROPBOX_TOKEN environment variable to a valid token.

From 05d4955a96608ce8309124140360cee4c9a1390c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 21:37:14 +0000
Subject: [PATCH 2535/3942] python37Packages.versioneer: 0.18 -> 0.19

---
 pkgs/development/python-modules/versioneer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix
index 8094a15a32e7..f8ad6b16c81f 100644
--- a/pkgs/development/python-modules/versioneer/default.nix
+++ b/pkgs/development/python-modules/versioneer/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
 
   pname = "versioneer";
-  version = "0.18";
+  version = "0.19";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dgkzg1r7mjg91xp81sv9z4mabyxl39pkd11jlc1200md20zglga";
+    sha256 = "a4fed39bbebcbd2d07f8a86084773f303cb442709491955a0e6754858e47afae";
   };
 
   # Couldn't get tests to work because, for instance, they used virtualenv and

From a0ea37d21d8a13bb4ecb647e9d77d651733695b9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 14 Nov 2020 23:58:07 -0800
Subject: [PATCH 2536/3942] python2Packages.versioneer: disable python2

---
 pkgs/development/python-modules/versioneer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix
index f8ad6b16c81f..31042c8cc1c4 100644
--- a/pkgs/development/python-modules/versioneer/default.nix
+++ b/pkgs/development/python-modules/versioneer/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchPypi, isPy27 }:
 
 
 buildPythonPackage rec {
-
   pname = "versioneer";
   version = "0.19";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;

From 986e9cfd6c44fe727eb3e3b436673bc9982f59fc Mon Sep 17 00:00:00 2001
From: Jonathan Strickland <djanatyn@gmail.com>
Date: Wed, 11 Nov 2020 19:15:54 -0500
Subject: [PATCH 2537/3942] licenses: add HPND-sell-variant

---
 lib/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index a704a6884c7d..850de29e7d13 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -392,6 +392,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
     fullName = "Historic Permission Notice and Disclaimer";
   };
 
+  hpndSellVariant = spdx {
+    fullName = "Historical Permission Notice and Disclaimer - sell variant";
+    spdxId = "HPND-sell-variant";
+  };
+
   # Intel's license, seems free
   iasl = {
     fullName = "iASL";

From d2928191c60ad82cc5b3acea8da3535dd843d5fc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 11:13:35 +0000
Subject: [PATCH 2538/3942] python37Packages.cmd2: 1.3.11 -> 1.4.0

---
 pkgs/development/python-modules/cmd2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 335649c6be92..889ef3fba15c 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -6,11 +6,11 @@
 }:
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "1.3.11";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "826a288ee6d9c4ec1184e64e9566c09d3b73be8f4283c1898fa4332f1daf8dbf";
+    sha256 = "e59fa932418603af4e046a96c8985812b05af8a73bfd9d7a386cd1b02c6ab687";
   };
 
   LC_ALL="en_US.UTF-8";

From a198e2f39b8d7d5a413ebc3f5d993619a42c46b9 Mon Sep 17 00:00:00 2001
From: Jonathan Strickland <djanatyn@gmail.com>
Date: Sat, 14 Nov 2020 23:42:02 -0500
Subject: [PATCH 2539/3942] xlife: init at 6.7.5

---
 pkgs/applications/graphics/xlife/default.nix | 28 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/graphics/xlife/default.nix

diff --git a/pkgs/applications/graphics/xlife/default.nix b/pkgs/applications/graphics/xlife/default.nix
new file mode 100644
index 000000000000..cc7013739985
--- /dev/null
+++ b/pkgs/applications/graphics/xlife/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchsvn, xorg }:
+
+stdenv.mkDerivation {
+  pname = "xlife";
+  version = "6.7.5";
+
+  src = fetchsvn {
+    url = "https://svn.code.sf.net/p/xlife-cal/xlife/trunk";
+    rev = "365";
+    sha256 = "1gadlcp32s179kd7ypxr8cymd6s060p6z4c2vnx94i8bmiw3nn8h";
+  };
+
+  nativeBuildInputs = with xorg; [ imake gccmakedep ];
+  buildInputs = [ xorg.libX11 ];
+
+  hardeningDisable = [ "format" ];
+  installPhase = ''
+    install -Dm755 xlife -t $out/bin
+    install -Dm755 lifeconv -t $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://litwr2.atspace.eu/xlife.php";
+    description = "Conway's Game of Life and other cellular automata, for X";
+    license = licenses.hpndSellVariant;
+    maintainers = with maintainers; [ djanatyn ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 551b285d419a..0675427d4c70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24738,6 +24738,8 @@ in
 
   xkblayout-state = callPackage ../applications/misc/xkblayout-state { };
 
+  xlife = callPackage ../applications/graphics/xlife { };
+
   xmobar = haskellPackages.xmobar;
 
   xmonad-log = callPackage ../tools/misc/xmonad-log { };

From 7d129704d042894e75f78141a4f59cc04b8bea73 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 11:03:33 +0000
Subject: [PATCH 2540/3942] python37Packages.azure-mgmt-policyinsights: 0.5.0
 -> 0.6.0

---
 .../python-modules/azure-mgmt-policyinsights/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
index ad8a2a0fbe23..b60cd66725c1 100644
--- a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-policyinsights";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "ed229e3845c477e88dde413825d4fba0d38b3a5ffab4e694c7d0da995f3db0f3";
+    sha256 = "2c64533f6eab08dc16450fc5d7c7651557fc0edc8ef1278dda336333d648a7c4";
   };
 
   propagatedBuildInputs = [

From 0e77efac27638eea96e7be01f611c132803c8fb1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 20:22:07 +0000
Subject: [PATCH 2541/3942] python37Packages.bpython: 0.20 -> 0.20.1

---
 pkgs/development/python-modules/bpython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix
index bbdca0a00974..7dfe8053ca24 100644
--- a/pkgs/development/python-modules/bpython/default.nix
+++ b/pkgs/development/python-modules/bpython/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "bpython";
-  version = "0.20";
+  version = "0.20.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fec7d97be9912a50d8f5b34ca10d70715c99a33f0cd0b9e4977c1b0f617fa913";
+    sha256 = "6e7738806013b469be57b0117082b9c4557ed7c92c70ceb79f96d674d89c7503";
   };
 
   patches = [ (substituteAll {

From fa962c1d243aaed47d4f083bff013d55f85addd0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 14:03:02 +0000
Subject: [PATCH 2542/3942] python37Packages.distributed: 2.30.0 -> 2.30.1

---
 pkgs/development/python-modules/distributed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 0267e959e5ba..f4be407fade2 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -28,12 +28,12 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2.30.0";
+  version = "2.30.1";
 
   # get full repository need conftest.py to run tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3eb8e4173625cea6ebda2f0a079b813eeabbffd1b24584855cf063ed1cca60b3";
+    sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e";
   };
 
   disabled = pythonOlder "3.6";

From aaa295cf8b0b1a86d604e0cab8ab0bf8b7638b16 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 08:32:55 +0000
Subject: [PATCH 2543/3942] kube3d: 3.2.0 -> 3.2.1

---
 pkgs/applications/networking/cluster/kube3d/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index f6306ef9043d..69119673f308 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "kube3d";
-  version = "3.2.0";
+  version = "3.2.1";
   k3sVersion = "1.18.9-k3s1";
 
   excludedPackages = ''tools'';
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "rancher";
     repo   = "k3d";
     rev    = "v${version}";
-    sha256 = "0jy0l8rvmwi0qznnvv97v50lfkpc2bwjmbnq4pxnmf9ih970wjwh";
+    sha256 = "1910vir9yc3xvb23260xljnfpznyhnk4gddy752rrndz7rk1b5c3";
   };
 
   buildFlagsArray = ''

From b94a294363990d58be6b59863cab58c454935127 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 8 Nov 2020 15:34:09 +0100
Subject: [PATCH 2544/3942] scheherazade-new: init at 3.000

---
 pkgs/data/fonts/scheherazade/default.nix | 26 +++++++++++++++---------
 pkgs/top-level/all-packages.nix          |  4 +++-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix
index e7651f22d6a0..8639d29066c3 100644
--- a/pkgs/data/fonts/scheherazade/default.nix
+++ b/pkgs/data/fonts/scheherazade/default.nix
@@ -1,11 +1,16 @@
-{ lib, fetchzip }:
+{ lib, fetchzip, version ? "3.000" }:
 
 let
-  version = "2.100";
-in fetchzip rec {
-  name = "scheherazade-${version}";
+  new = lib.versionAtLeast version "3.000";
+  sha256 = {
+    "2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z";
+    "3.000" = "12sd2mjqb80ijc73y7p0iw6j3wy9i60a3aar3ywrxz4khpya48jw";
+  }."${version}";
 
-  url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade-${version}.zip";
+in fetchzip rec {
+  name = "scheherazade${lib.optionalString new "-new"}-${version}";
+
+  url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade${lib.optionalString new "New"}-${version}.zip";
 
   postFetch = ''
     mkdir -p $out/share/{doc,fonts}
@@ -15,16 +20,17 @@ in fetchzip rec {
     unzip -j $downloadedFile \*/documentation/\*           -d $out/share/doc/${name}/documentation
   '';
 
-  sha256 = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z";
+  inherit sha256;
 
   meta = with lib; {
     homepage = "https://software.sil.org/scheherazade/";
     description = "A font designed in a similar style to traditional Naskh typefaces";
     longDescription = ''
-      Scheherazade, named after the heroine of the classic Arabian Nights tale,
-      is designed in a similar style to traditional typefaces such as Monotype
-      Naskh, extended to cover the Unicode Arabic repertoire through Unicode
-      8.0.
+
+      Scheherazade${lib.optionalString new " New"}, named after the heroine of
+      the classic Arabian Nights tale, is designed in a similar style to
+      traditional typefaces such as Monotype Naskh, extended to cover the
+      Unicode Arabic repertoire through Unicode ${if new then "13.0" else "8.0"}.
 
       Scheherazade provides a “simplified” rendering of Arabic script, using
       basic connecting glyphs but not including a wide variety of additional
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 115b23032375..d1d1b8a84a00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19714,7 +19714,9 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
   shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { };
 
-  scheherazade = callPackage ../data/fonts/scheherazade { };
+  scheherazade = callPackage ../data/fonts/scheherazade { version = "2.100"; };
+
+  scheherazade-new = callPackage ../data/fonts/scheherazade { };
 
   signwriting = callPackage ../data/fonts/signwriting { };
 

From 1ff209c9884706c60e63ef4c3a4c7e6a49585eca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 08:40:47 +0000
Subject: [PATCH 2545/3942] lazydocker: 0.9 -> 0.10

---
 pkgs/tools/misc/lazydocker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix
index d0c4d71c58a6..4ab4e40de98d 100644
--- a/pkgs/tools/misc/lazydocker/default.nix
+++ b/pkgs/tools/misc/lazydocker/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "lazydocker";
-  version = "0.9";
+  version = "0.10";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazydocker";
     rev = "v${version}";
-    sha256 = "08j2qp632fdmswnb92wxa9lhnal4mrmq6gmxaxngnxiqgkfx37zy";
+    sha256 = "04j5bcsxm2yf74zkphnjrg8j3w0v6bsny8sg2k4gbisgshl1i3p8";
   };
 
   goPackagePath = "github.com/jesseduffield/lazydocker";

From 4e46afa069fdd7212746bb9dac974cdea1c111f2 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Sun, 15 Nov 2020 09:42:29 +0100
Subject: [PATCH 2546/3942] hydra-cli: 0.2.0 -> 0.3.0

---
 pkgs/development/tools/misc/hydra-cli/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix
index 6cd439a898b8..10ecd8174af4 100644
--- a/pkgs/development/tools/misc/hydra-cli/default.nix
+++ b/pkgs/development/tools/misc/hydra-cli/default.nix
@@ -2,16 +2,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hydra-cli";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "nlewo";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1jdlmc45hwblcxs6hvy3gi2dr7qyzs1sg5zr26jrpxrbvqqzrdhc";
+    sha256 = "1fd3swdjx249971ak1bgndm5kh6rlzbfywmydn122lhfi6ry6a03";
   };
-
-  cargoSha256 = "1sj80a99iakxxa698gggiszsrxwlwhr2sx4wmsni0cshx6z2x6za";
+  cargoSha256 = "1fjzcgayyha270bdxl5p6c337nq8zj4h81rk4ih9czyz3yaxga3f";
 
   buildInputs = [ openssl ]
                 ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

From 2a11c6ceac234bf1a7ac1766d3c1fa8a9bd144da Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 09:02:30 +0000
Subject: [PATCH 2547/3942] libcint: 4.0.2 -> 4.0.6

---
 pkgs/development/libraries/libcint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix
index b7dd32a056c4..8415b964bb99 100644
--- a/pkgs/development/libraries/libcint/default.nix
+++ b/pkgs/development/libraries/libcint/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libcint";
-  version = "4.0.2";
+  version = "4.0.6";
 
   src = fetchFromGitHub {
     owner = "sunqm";
     repo = "libcint";
     rev = "v${version}";
-    sha256 = "0j8fkkp3vb1936qy80sc08c327b47qxh0x2aadd1225jjq6xqxmn";
+    sha256 = "1bgzsyz1i0hvla5ax0lawp1kw25fkhzh9ddhq92mplizrj9y05c1";
   };
 
   nativeBuildInputs = [ cmake ];

From 681ad8e638fa36897cf907dca93984914cfe8b8c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 09:40:40 +0000
Subject: [PATCH 2548/3942] liquibase: 4.1.1 -> 4.2.0

---
 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 93698e8d8e97..b70c2a80e4a3 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -10,11 +10,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "liquibase";
-  version = "4.1.1";
+  version = "4.2.0";
 
   src = fetchurl {
     url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "0gq3y2cgqb1dky5baqjydwmnaimczvsfg8dqc55c7aqcgy7hp3pg";
+    sha256 = "0xj2gg1z9l1f4aqrsbz5hww8hvrhiyz8fdrpr9861jmbxyzl03y7";
   };
 
   buildInputs = [ jre makeWrapper ];

From 018696cbf2574806a11273ce713bfc18247361d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 09:59:18 +0000
Subject: [PATCH 2549/3942] matcha-gtk-theme: 2020-10-23 -> 2020-11-11-0

---
 pkgs/data/themes/matcha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 7ed6acb2800e..8adaa3b18350 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matcha-gtk-theme";
-  version = "2020-10-23";
+  version = "2020-11-11-0";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "125wcvr457lbs8zxp8r18q7gzagp0wbg518iynzmbax8gsjds8w3";
+    sha256 = "00nl887nm1syy23s9y590ycjlrl15h5scp9hp0yvg0n6jd78rsc7";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];

From dbf134a71bf771b37957ce75162dff552dad3df2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 15 Nov 2020 11:56:16 +0100
Subject: [PATCH 2550/3942] html-proofer: 3.16.0 -> 3.17.0

---
 pkgs/tools/misc/html-proofer/Gemfile.lock | 4 ++--
 pkgs/tools/misc/html-proofer/gemset.nix   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock
index 489fa555c5de..c918577fded7 100644
--- a/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
     ethon (0.12.0)
       ffi (>= 1.3.0)
     ffi (1.13.1)
-    html-proofer (3.16.0)
+    html-proofer (3.17.0)
       addressable (~> 2.3)
       mercenary (~> 0.3)
       nokogumbo (~> 2.0)
@@ -20,7 +20,7 @@ GEM
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
-    parallel (1.19.2)
+    parallel (1.20.0)
     public_suffix (4.0.6)
     rainbow (3.0.0)
     typhoeus (1.4.0)
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix
index bdd0bbc20c9f..b617ebe7b0e5 100644
--- a/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -37,10 +37,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18s8l3nys0lvdkqpfg3c1rd84c5j4dmlx503wnksw9skbzn7l93m";
+      sha256 = "0vjy9r9lwr0rfxxadj4rfkl94b2rz6avgq4h54g6b7x1jmx6b3sd";
       type = "gem";
     };
-    version = "3.16.0";
+    version = "3.17.0";
   };
   mercenary = {
     groups = ["default"];
@@ -89,10 +89,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
+      sha256 = "1wci3dimgrap91nw5vnq4qa2vfmxga27m6sfmn8caskhzwxwv1dg";
       type = "gem";
     };
-    version = "1.19.2";
+    version = "1.20.0";
   };
   public_suffix = {
     groups = ["default"];

From 2806eb27431abf2ffcff7404783198c4b767e6de Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Nov 2020 09:58:39 +0100
Subject: [PATCH 2551/3942] =?UTF-8?q?coq=5F8=5F12:=208.12.0=20=E2=86=92=20?=
 =?UTF-8?q?8.12.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/science/logic/coq/default.nix | 1 +
 pkgs/top-level/coq-packages.nix                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 946cba41b143..dc9e40912d53 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -35,6 +35,7 @@ let
    "8.11.1" = "0qriy9dy36dajsv5qmli8gd6v55mah02ya334nw49ky19v7518m0";
    "8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa";
    "8.12.0" = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz";
+   "8.12.1" = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q";
   }.${version};
   coq-version = stdenv.lib.versions.majorMinor version;
   versionAtLeast = stdenv.lib.versionAtLeast coq-version;
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index fe6cd81f9ea1..605db554363b 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -119,7 +119,7 @@ in rec {
     version = "8.11.2";
   };
   coq_8_12 = callPackage ../applications/science/logic/coq {
-    version = "8.12.0";
+    version = "8.12.1";
   };
 
   coqPackages_8_5 = mkCoqPackages coq_8_5;

From 3e6fdd843ca6b8d909c71da53d03ed5ff1cd92f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 11:06:51 +0000
Subject: [PATCH 2552/3942] musikcube: 0.94.0 -> 0.95.0

---
 pkgs/applications/audio/musikcube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix
index 5f0eb61a5bea..c6d1a264a9c3 100644
--- a/pkgs/applications/audio/musikcube/default.nix
+++ b/pkgs/applications/audio/musikcube/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "musikcube";
-  version = "0.94.0";
+  version = "0.95.0";
 
   src = fetchFromGitHub {
     owner = "clangen";
     repo = pname;
     rev = version;
-    sha256 = "0hifyawsr38vsx12aqw38nms4kzbaghihib1r80x56f1jjsdhww0";
+    sha256 = "16ksr4yjkg88bpij1i49dzi07ffhqq8b36r090y4fq5czrc420rc";
   };
 
   nativeBuildInputs = [

From 5848e9845b00e4b063431bc020f5903d5d3a95d5 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 15 Nov 2020 12:15:20 +0100
Subject: [PATCH 2553/3942] mutt: 2.0.0 -> 2.0.1

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 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 49a4790f8a83..696fb504c1b8 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 {
   pname = "mutt";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
-    sha256 = "1bxf8976mrl3vbn3s5i32i1lf908yag5rsf84n76dllmly61794k";
+    sha256 = "1nr1n0lshif6lrn4c5ym473jrg0jaka5wfyy06qmbxhnavmgvx8c";
   };
 
   patches = optional smimeSupport (fetchpatch {

From e0cf1be8639e8b7db349de5354e3b318bcc54114 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 11:15:37 +0000
Subject: [PATCH 2554/3942] nfpm: 1.10.0 -> 1.10.1

---
 pkgs/tools/package-management/nfpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
index 62baff512bb2..66ea91a56d41 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "nfpm";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1pgdajbphqfn430jwm052czz1d4ynl6n4z2wjzmblv7lwkbh9j3d";
+    sha256 = "1j9b6kkhlw2sx6qwnxkhsk7bj9vm2vr0z1hj1jf257fxw9m2q6mz";
   };
 
   vendorSha256 = "0x7r7qn4852q57fx5mcrw3aqdydmidk9g0hvj6apj81q77k5svqs";

From db391fa91604da60c8f4c464aaeebb99e76ffeb0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 12:57:28 +0000
Subject: [PATCH 2555/3942] photoflare: 1.6.5 -> 1.6.6

---
 pkgs/applications/graphics/photoflare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix
index 43b12c40d965..f619d79c0f55 100644
--- a/pkgs/applications/graphics/photoflare/default.nix
+++ b/pkgs/applications/graphics/photoflare/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "photoflare";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchFromGitHub {
     owner = "PhotoFlare";
     repo = "photoflare";
     rev = "v${version}";
-    sha256 = "0a394324h7ds567z3i3pw6kkii78n4qwdn129kgkkm996yh03q89";
+    sha256 = "07lrlxagv1bljj607s8m0zsbzx9jrvi18bnxahnm7r4i5car5x2d";
   };
 
   nativeBuildInputs = [ qmake qttools ];

From 046002f4722b898800ae2c83293f27772ea78939 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 14 Nov 2020 02:55:29 +0100
Subject: [PATCH 2556/3942] firefox: 82.0.2 -> 82.0.3

---
 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 de0180834d2f..d65ae7037beb 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,10 +7,10 @@ in
 rec {
   firefox = common rec {
     pname = "firefox";
-    ffversion = "82.0.2";
+    ffversion = "82.0.3";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "25wkgsqnafmq30m1kd1axkm454dhl2bmz6100i3ccqnn31vw3nyy6k3k1apsn62siqswpm55iclzcb10y4dfyyqcszvflim47c8i37k";
+      sha512 = "0j5s5fkph9bm87lv53d4xvfj02qjfqzj5graxcc8air49iqswfmqjdzghna6bj9m8fbn6f5klgm6jbrmavdsycbps0y88x23b6kab5i";
     };
 
     patches = [

From d93868a92b849e112559e70c56b725833aa696c7 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 15 Nov 2020 14:35:19 +0100
Subject: [PATCH 2557/3942] firefox-esr: 78.4.0esr -> 78.4.1esr

---
 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 d65ae7037beb..5786e4113946 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -35,10 +35,10 @@ rec {
 
   firefox-esr-78 = common rec {
     pname = "firefox-esr";
-    ffversion = "78.4.0esr";
+    ffversion = "78.4.1esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "13640ssp1nq9dsfv8jqfw2paqk3wzwc4r47mvbhb4l9h990gzzb2chhlcjq066b7r3q9s0nq3iyk847vzi7z1yvhrhsnzfgk9g9gpnr";
+      sha512 = "3gfhipbihyznnh822lxams6rm0bcslh31b58lzibjx8a9dn99hy3p04h07slygcqazbz1rrs7b2b8q321fknp27aisk0sz8cynrcw18";
     };
 
     patches = [

From 95bea3d7831537e0cd0bb3d1e02d2d6f45a83023 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 13:38:25 +0000
Subject: [PATCH 2558/3942] pmix: 3.2.0 -> 3.2.1

---
 pkgs/development/libraries/pmix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix
index 32e5c5381b64..60215c9531c2 100644
--- a/pkgs/development/libraries/pmix/default.nix
+++ b/pkgs/development/libraries/pmix/default.nix
@@ -3,7 +3,7 @@
 } :
 
 let
-  version = "3.2.0";
+  version = "3.2.1";
 
 in stdenv.mkDerivation {
   pname = "pmix";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
     repo = "openpmix";
     owner = "openpmix";
     rev = "v${version}";
-    sha256 = "171hpz0m6lpyjd1hkxy7fl06fcgymz8cssqgbxzg92b7x595276b";
+    sha256 = "0c9q9a18kdilj6ddqlsvalyv4js79qvslnccn79xl2gl3wm3lyzh";
   };
 
   postPatch = ''

From 79b78663e52de262f662e8a2ee472209e07f0b63 Mon Sep 17 00:00:00 2001
From: Mark Hudnall <me@markhudnall.com>
Date: Sun, 15 Nov 2020 06:11:56 -0800
Subject: [PATCH 2559/3942] chicken: support darwin platform (#103748)

Darwin was not included as a supported platform for chicken. However, it compiled and
worked fine after bypassing unsupported platforms.

We make two changes to chicken's derivation. First, we add darwin as a supported
platform.

Second, we set some envvars that force the build to use nix-supplied build
tools. Chicken's Makefile for macOS hardcodes paths to gcc and other build tools
(see
https://code.call-cc.org/cgi-bin/gitweb.cgi?p=chicken-core.git;a=blob;f=Makefile.macosx;h=5d4d9b0aa1bb4c95e1ba7a55f9586fa86ee5034f;hb=317468e4994e6245d787400359726a9fb97d5d60#l31). We
override these envvars to use the wrapped $CC and bintools provided by nix to make
the build pure.
---
 .../compilers/chicken/4/chicken.nix           | 26 ++++++++++++-------
 .../compilers/chicken/5/chicken.nix           | 19 +++++++++-----
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix
index 11f4eaada604..50126fdac92c 100644
--- a/pkgs/development/compilers/chicken/4/chicken.nix
+++ b/pkgs/development/compilers/chicken/4/chicken.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:
+{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
 
 let
   version = "4.13.0";
@@ -21,31 +21,39 @@ stdenv.mkDerivation {
     sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd";
   };
 
-  setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
+  setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh;
 
-  buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ];
-  installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ];
+  # -fno-strict-overflow is not a supported argument in clang on darwin
+  hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"];
+
+  makeFlags = [
+    "PLATFORM=${platform}" "PREFIX=$(out)"
+    "VARDIR=$(out)/var/lib"
+  ] ++ (lib.optionals stdenv.isDarwin [
+    "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
+    "C_COMPILER=$(CC)"
+  ]);
 
   # We need a bootstrap-chicken to regenerate the c-files after
   # applying a patch to add support for CHICKEN_REPOSITORY_EXTRA
-  patches = lib.ifEnable (bootstrap-chicken != null) [
+  patches = lib.optionals (bootstrap-chicken != null) [
     ./0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch
   ];
 
   buildInputs = [
     makeWrapper
-  ] ++ (lib.ifEnable (bootstrap-chicken != null) [
+  ] ++ (lib.optionals (bootstrap-chicken != null) [
     bootstrap-chicken
   ]);
 
-  preBuild = lib.ifEnable (bootstrap-chicken != null) ''
+  preBuild = lib.optionalString (bootstrap-chicken != null) ''
     # Backup the build* files - those are generated from hostname,
     # git-tag, etc. and we don't need/want that
     mkdir -p build-backup
     mv buildid buildbranch buildtag.h build-backup
 
     # Regenerate eval.c after the patch
-    make spotless $buildFlags
+    make spotless $makeFlags
 
     mv build-backup/* .
   '';
@@ -64,7 +72,7 @@ stdenv.mkDerivation {
     homepage = "http://www.call-cc.org/";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ corngood ];
-    platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix
     description = "A portable compiler for the Scheme programming language";
     longDescription = ''
       CHICKEN is a compiler for the Scheme programming language.
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix
index f07b63ea26f4..712012643f33 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:
+{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
 
 let
   version = "5.2.0";
@@ -21,14 +21,21 @@ stdenv.mkDerivation {
     sha256 = "1yl0hxm9cirgcp8jgxp6vv29lpswfvaw3zfkh6rsj0vkrv44k4c1";
   };
 
-  setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
+  setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh;
 
-  buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ];
-  installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ];
+  # -fno-strict-overflow is not a supported argument in clang on darwin
+  hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"];
+
+  makeFlags = [
+    "PLATFORM=${platform}" "PREFIX=$(out)"
+  ] ++ (lib.optionals stdenv.isDarwin [
+    "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
+    "C_COMPILER=$(CC)"
+  ]);
 
   buildInputs = [
     makeWrapper
-  ] ++ (lib.ifEnable (bootstrap-chicken != null) [
+  ] ++ (lib.optionals (bootstrap-chicken != null) [
     bootstrap-chicken
   ]);
 
@@ -46,7 +53,7 @@ stdenv.mkDerivation {
     homepage = "http://www.call-cc.org/";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ corngood ];
-    platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix
     description = "A portable compiler for the Scheme programming language";
     longDescription = ''
       CHICKEN is a compiler for the Scheme programming language.

From 74b9066a3949f673f37d6a39bafabff707c121d0 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 31 Oct 2020 12:00:00 +0000
Subject: [PATCH 2560/3942] paperwork: 1.3.1 -> 2.0

---
 .../applications/office/paperwork/backend.nix | 48 ------------
 .../office/paperwork/openpaperwork-core.nix   | 42 ++++++++++
 .../office/paperwork/openpaperwork-gtk.nix    | 52 +++++++++++++
 .../office/paperwork/paperwork-backend.nix    | 77 +++++++++++++++++++
 .../{default.nix => paperwork-gtk.nix}        | 59 +++++++-------
 .../office/paperwork/paperwork-shell.nix      | 59 ++++++++++++++
 pkgs/applications/office/paperwork/src.nix    | 12 +++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  5 +-
 9 files changed, 278 insertions(+), 78 deletions(-)
 delete mode 100644 pkgs/applications/office/paperwork/backend.nix
 create mode 100644 pkgs/applications/office/paperwork/openpaperwork-core.nix
 create mode 100644 pkgs/applications/office/paperwork/openpaperwork-gtk.nix
 create mode 100644 pkgs/applications/office/paperwork/paperwork-backend.nix
 rename pkgs/applications/office/paperwork/{default.nix => paperwork-gtk.nix} (57%)
 create mode 100644 pkgs/applications/office/paperwork/paperwork-shell.nix
 create mode 100644 pkgs/applications/office/paperwork/src.nix

diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix
deleted file mode 100644
index af0d4c430590..000000000000
--- a/pkgs/applications/office/paperwork/backend.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ buildPythonPackage, lib, fetchFromGitLab
-
-, isPy3k, isPyPy
-
-, pyenchant, simplebayes, pillow, pycountry, whoosh, termcolor
-, python-Levenshtein, pygobject3, pyocr, natsort, libinsane
-, distro
-
-, pkgs
-}:
-
-buildPythonPackage rec {
-  pname = "paperwork-backend";
-  version = "1.3.1";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    repo = "paperwork";
-    group = "World";
-    owner = "OpenPaperwork";
-    rev = version;
-    sha256 = "1219yz8z4r1yn6miq8zc2z1m1lnhf3dmkhwfw23n05bg842nvg65";
-  };
-
-  sourceRoot = "source/paperwork-backend";
-
-  # Python 2.x is not supported.
-  disabled = !isPy3k && !isPyPy;
-
-  patchPhase = ''
-    echo 'version = "${version}"' > paperwork_backend/_version.py
-  '';
-
-  preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend";
-
-  propagatedBuildInputs = [
-    pyenchant simplebayes pillow pycountry whoosh termcolor
-    python-Levenshtein libinsane pygobject3 pyocr natsort
-    pkgs.poppler_gi pkgs.gtk3 distro
-  ];
-
-  meta = {
-    description = "Backend part of Paperwork (Python API, no UI)";
-    homepage = "https://openpaper.work/";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ aszlig symphorien ];
-  };
-}
diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix
new file mode 100644
index 000000000000..cae55ae95f1c
--- /dev/null
+++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix
@@ -0,0 +1,42 @@
+{ buildPythonPackage, lib, fetchFromGitLab
+
+, isPy3k, isPyPy
+
+, distro, setuptools
+
+, pkgs
+}:
+
+buildPythonPackage rec {
+  pname = "openpaperwork-core";
+  inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
+
+  sourceRoot = "source/openpaperwork-core";
+
+  # Python 2.x is not supported.
+  disabled = !isPy3k && !isPyPy;
+
+  patchPhase = ''
+    echo 'version = "${version}"' > src/openpaperwork_core/_version.py
+    chmod a+w -R ..
+    patchShebangs ../tools
+  '';
+
+  propagatedBuildInputs = [
+    distro
+    setuptools
+  ];
+
+  nativeBuildInputs = [ pkgs.gettext pkgs.which ];
+
+  preBuild = ''
+    make l10n_compile
+  '';
+
+  meta = {
+    description = "Backend part of Paperwork (Python API, no UI)";
+    homepage = "https://openpaper.work/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ aszlig symphorien ];
+  };
+}
diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix
new file mode 100644
index 000000000000..5dae745ce2eb
--- /dev/null
+++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix
@@ -0,0 +1,52 @@
+{ buildPythonPackage
+, lib
+, fetchFromGitLab
+
+, isPy3k
+, isPyPy
+
+, openpaperwork-core
+, pillow
+, pygobject3
+, distro
+
+, pkgs
+}:
+
+buildPythonPackage rec {
+  pname = "openpaperwork-gtk";
+  inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
+
+  sourceRoot = "source/openpaperwork-gtk";
+
+  # Python 2.x is not supported.
+  disabled = !isPy3k && !isPyPy;
+
+  patchPhase = ''
+    echo 'version = "${version}"' > src/openpaperwork_gtk/_version.py
+    chmod a+w -R ..
+    patchShebangs ../tools
+  '';
+
+  nativeBuildInputs = [ pkgs.gettext pkgs.which ];
+  preBuild = ''
+    make l10n_compile
+  '';
+
+  propagatedBuildInputs = [
+    pillow
+    pygobject3
+    pkgs.poppler_gi
+    pkgs.gtk3
+    distro
+    pkgs.pango
+    openpaperwork-core
+  ];
+
+  meta = {
+    description = "Reusable GTK components of Paperwork";
+    homepage = "https://openpaper.work/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ aszlig symphorien ];
+  };
+}
diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix
new file mode 100644
index 000000000000..a033bd695db6
--- /dev/null
+++ b/pkgs/applications/office/paperwork/paperwork-backend.nix
@@ -0,0 +1,77 @@
+{ buildPythonPackage
+, lib
+, fetchFromGitLab
+
+, isPy3k
+, isPyPy
+
+, pyenchant
+, simplebayes
+, pypillowfight
+, pycountry
+, whoosh
+, termcolor
+, python-Levenshtein
+, pygobject3
+, pyocr
+, natsort
+, libinsane
+, distro
+, openpaperwork-core
+, openpaperwork-gtk
+, psutil
+
+, pkgs
+}:
+
+buildPythonPackage rec {
+  pname = "paperwork-backend";
+  inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
+
+  sourceRoot = "source/paperwork-backend";
+
+  # Python 2.x is not supported.
+  disabled = !isPy3k && !isPyPy;
+
+  patchPhase = ''
+    echo 'version = "${version}"' > src/paperwork_backend/_version.py
+    chmod a+w -R ..
+    patchShebangs ../tools
+  '';
+
+  propagatedBuildInputs = [
+    pyenchant
+    simplebayes
+    pypillowfight
+    pycountry
+    whoosh
+    termcolor
+    python-Levenshtein
+    libinsane
+    pygobject3
+    pyocr
+    natsort
+    pkgs.poppler_gi
+    pkgs.gtk3
+    distro
+    openpaperwork-core
+  ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  nativeBuildInputs = [ pkgs.gettext pkgs.which ];
+  preBuild = ''
+    make l10n_compile
+  '';
+
+  checkInputs = [ openpaperwork-gtk psutil ];
+
+  meta = {
+    description = "Backend part of Paperwork (Python API, no UI)";
+    homepage = "https://openpaper.work/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ aszlig symphorien ];
+  };
+}
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix
similarity index 57%
rename from pkgs/applications/office/paperwork/default.nix
rename to pkgs/applications/office/paperwork/paperwork-gtk.nix
index 102c3cd2564c..c493421dd11b 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix
@@ -10,45 +10,36 @@
 , dbus
 , libnotify
 , wrapGAppsHook
+, fetchFromGitLab
+, which
+, gettext
+, gobject-introspection
 }:
 
 python3Packages.buildPythonApplication rec {
-  inherit (python3Packages.paperwork-backend) version src;
+  inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
   pname = "paperwork";
 
   sourceRoot = "source/paperwork-gtk";
 
   # Patch out a few paths that assume that we're using the FHS:
   postPatch = ''
-    themeDir="$(echo "${gnome3.adwaita-icon-theme}/share/icons/"*)"
-    sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py
+    chmod a+w -R ..
+    patchShebangs ../tools
 
-    sed -i -e 's,sys\.prefix,"",g' \
-      src/paperwork/frontend/aboutdialog/__init__.py \
-      src/paperwork/frontend/mainwindow/__init__.py \
-      setup.py
+    export HOME=$(mktemp -d)
 
-    sed -i -e '/^UI_FILES_DIRS = \[/,/^\]$/ {
-      c UI_FILES_DIRS = ["'"$out/share/paperwork"'"]
-    }' src/paperwork/frontend/util/__init__.py
-
-    sed -i -e '/^LOCALE_PATHS = \[/,/^\]$/ {
-      c LOCALE_PATHS = ["'"$out/share"'"]
-    }' src/paperwork/paperwork.py
-
-    sed -i -e 's/"icon"/"icon-name"/g' \
-      src/paperwork/frontend/mainwindow/mainwindow.glade
-
-    sed -i -e 's/"logo"/"logo-icon-name"/g' \
-      src/paperwork/frontend/aboutdialog/aboutdialog.glade
-
-    cat - ../AUTHORS.py > src/paperwork/_version.py <<EOF
+    cat - ../AUTHORS.py > src/paperwork_gtk/_version.py <<EOF
     # -*- coding: utf-8 -*-
     version = "${version}"
     authors_code=""
     EOF
   '';
 
+  preBuild = ''
+    make l10n_compile
+  '';
+
   ASPELL_CONF = "dict-dir ${buildEnv {
     name = "aspell-all-dicts";
     paths = lib.collect lib.isDerivation aspellDicts;
@@ -56,37 +47,49 @@ python3Packages.buildPythonApplication rec {
 
   postInstall = ''
     # paperwork-shell needs to be re-wrapped with access to paperwork
-    cp ${python3Packages.paperwork-backend}/bin/.paperwork-shell-wrapped $out/bin/paperwork-shell
+    cp ${python3Packages.paperwork-shell}/bin/.paperwork-cli-wrapped $out/bin/paperwork-cli
     # install desktop files and icons
-    XDG_DATA_HOME=$out/share $out/bin/paperwork-shell install
+    XDG_DATA_HOME=$out/share $out/bin/paperwork-gtk install --user
   '';
 
-  checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]);
+  checkInputs = [ xvfb_run dbus.daemon ];
 
   nativeBuildInputs = [
     wrapGAppsHook
+    gobject-introspection
+    (lib.getBin gettext)
+    which
   ];
 
   buildInputs = [
     gnome3.adwaita-icon-theme
     libnotify
     librsvg
+    gtk3
+    cairo
   ];
 
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   # A few parts of chkdeps need to have a display and a dbus session, so we not
   # only need to run a virtual X server + dbus but also have a large enough
   # resolution, because the Cairo test tries to draw a 200x200 window.
   preCheck = ''
     xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
       --config-file=${dbus.daemon}/share/dbus-1/session.conf \
-      paperwork-shell chkdeps paperwork
+      $out/bin/paperwork-gtk chkdeps
   '';
 
   propagatedBuildInputs = with python3Packages; [
     paperwork-backend
+    paperwork-shell
+    openpaperwork-gtk
+    openpaperwork-core
     pypillowfight
-    gtk3
-    cairo
     pyxdg
     dateutil
     setuptools
diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix
new file mode 100644
index 000000000000..1be6f329e3cf
--- /dev/null
+++ b/pkgs/applications/office/paperwork/paperwork-shell.nix
@@ -0,0 +1,59 @@
+{ buildPythonPackage
+, lib
+, fetchFromGitLab
+
+, isPy3k
+, isPyPy
+
+, openpaperwork-core
+, openpaperwork-gtk
+, paperwork-backend
+, fabulous
+, getkey
+
+, pkgs
+}:
+
+buildPythonPackage rec {
+  pname = "paperwork-shell";
+  inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
+
+  sourceRoot = "source/paperwork-shell";
+
+  # Python 2.x is not supported.
+  disabled = !isPy3k && !isPyPy;
+
+  patchPhase = ''
+    echo 'version = "${version}"' > src/paperwork_shell/_version.py
+    chmod a+w -R ..
+    patchShebangs ../tools
+  '';
+
+  propagatedBuildInputs = [
+    openpaperwork-core
+    paperwork-backend
+    fabulous
+    getkey
+  ];
+
+  checkInputs = [
+    openpaperwork-gtk
+  ];
+
+  nativeBuildInputs = [ pkgs.gettext pkgs.which ];
+  preBuild = ''
+    make l10n_compile
+  '';
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+    "$out/bin/paperwork-cli" chkdeps
+  '';
+
+  meta = {
+    description = "CLI for Paperwork";
+    homepage = "https://openpaper.work/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ aszlig symphorien ];
+  };
+}
diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix
new file mode 100644
index 000000000000..d77e8bc043e7
--- /dev/null
+++ b/pkgs/applications/office/paperwork/src.nix
@@ -0,0 +1,12 @@
+{fetchFromGitLab}:
+rec {
+  version = "2.0";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    repo = "paperwork";
+    group = "World";
+    owner = "OpenPaperwork";
+    rev = version;
+    sha256 = "0879wvl3hk74kwnaa64q6prfg2kjaa7nrzahaw2zcipdpf5h2mkm";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b04ab9e25b5..a45d46ee14c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6143,7 +6143,7 @@ in
 
   paperless = callPackage ../applications/office/paperless { };
 
-  paperwork = callPackage ../applications/office/paperwork { };
+  paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };
 
   papertrail = callPackage ../tools/text/papertrail { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62eb91840377..d4757bd2792d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4306,7 +4306,10 @@ in {
 
   paperspace = callPackage ../development/python-modules/paperspace { };
 
-  paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { };
+  openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { };
+  openpaperwork-gtk = callPackage ../applications/office/paperwork/openpaperwork-gtk.nix { };
+  paperwork-backend = callPackage ../applications/office/paperwork/paperwork-backend.nix { };
+  paperwork-shell = callPackage ../applications/office/paperwork/paperwork-shell.nix { };
 
   papis = callPackage ../development/python-modules/papis { };
 

From 3c9707d4a3fc2990d0385cf913d6731824036e56 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Thu, 5 Nov 2020 12:00:00 +0000
Subject: [PATCH 2561/3942] nixos: add release notes for the paperwork update.

---
 nixos/doc/manual/release-notes/rl-2103.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 374ea1cbd165..af73b307325f 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -99,6 +99,13 @@
       to <literal>/run/pdns-recursor</literal> to match upstream.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      Paperwork was updated to version 2. The on-disk format slightly changed,
+      and it is not possible to downgrade from Paperwork 2 back to Paperwork
+      1.3. Back your documents up before upgrading. See <link xlink:href="https://forum.openpaper.work/t/paperwork-2-0/112/5">this thread</link> for more details.
+    </para>
+   </listitem>
    <listitem>
     <para>
       PowerDNS has been updated from <literal>4.2.x</literal> to <literal>4.3.x</literal>. Please

From 0c38b12059e6a0222445d64c968c68ff960ad2b6 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 15 Nov 2020 14:30:39 +0100
Subject: [PATCH 2562/3942] paperwork: 2.0 -> 2.0.1

---
 pkgs/applications/office/paperwork/src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix
index d77e8bc043e7..70770676edde 100644
--- a/pkgs/applications/office/paperwork/src.nix
+++ b/pkgs/applications/office/paperwork/src.nix
@@ -1,12 +1,12 @@
 {fetchFromGitLab}:
 rec {
-  version = "2.0";
+  version = "2.0.1";
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     repo = "paperwork";
     group = "World";
     owner = "OpenPaperwork";
     rev = version;
-    sha256 = "0879wvl3hk74kwnaa64q6prfg2kjaa7nrzahaw2zcipdpf5h2mkm";
+    sha256 = "16pc4drwpjl4937wdavs6wk0j1qs474b072wplhs8ywxfgqip1h4";
   };
 }

From 9c698f5f93dc2701a6b459b0d45fd7afcc84e35a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 15:01:36 +0000
Subject: [PATCH 2563/3942] ptcollab: 0.3.4.1 -> 0.3.5

---
 pkgs/applications/audio/ptcollab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix
index 85890d8e83bf..da4db5f159a5 100644
--- a/pkgs/applications/audio/ptcollab/default.nix
+++ b/pkgs/applications/audio/ptcollab/default.nix
@@ -9,13 +9,13 @@
 
 mkDerivation rec {
   pname = "ptcollab";
-  version = "0.3.4.1";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "yuxshao";
     repo = "ptcollab";
     rev = "v${version}";
-    sha256 = "0rjyhxfad864w84n0bxyhc1jjxhzwwdx26r6psba2582g90cv024";
+    sha256 = "0mgn7lkpgj72hsybnnj0kpfyls4aha1qvv4nhdyclqdfbb6mldxg";
   };
 
   nativeBuildInputs = [ qmake ];

From e4fcc9aed14abc5fd5acd38ca4d5384d993a625b Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Sun, 15 Nov 2020 10:59:19 -0500
Subject: [PATCH 2564/3942] emacs: properly include source code when withCsrc
 is true

Previously, we just copied it into a separate directory in the build
directory. That's not useful, and not what was intended.
---
 pkgs/applications/editors/emacs/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix
index f2904f3e012b..402a6a13cec7 100644
--- a/pkgs/applications/editors/emacs/generic.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@@ -142,7 +142,7 @@ in stdenv.mkDerivation {
     rm -rf $siteVersionDir
   '' + lib.optionalString withCsrc ''
     for srcdir in src lisp lwlib ; do
-      dstdir=$siteVersionDir/$srcdir
+      dstdir=$out/share/emacs/$siteVersionDir/$srcdir
       mkdir -p $dstdir
       find $srcdir -name "*.[chm]" -exec cp {} $dstdir \;
       cp $srcdir/TAGS $dstdir

From ebffae65980bb9815d67f284257d00c910b5802a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 16:22:22 +0000
Subject: [PATCH 2565/3942] rpm-ostree: 2020.7 -> 2020.8

---
 pkgs/tools/misc/rpm-ostree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index 16d088c00980..0ba72852c40f 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rpm-ostree";
-  version = "2020.7";
+  version = "2020.8";
 
   outputs = [ "out" "dev" "man" "devdoc" ];
 
   src = fetchurl {
     url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "1f8ajri6k5ni2rm8c75nydl8wcza0q6bv2bia3aqd0mr7iw31pbm";
+    sha256 = "1iyl6bjkj3drlwds579bh25xcmlwj9lkkbdmcdanq5b3shbmpyhi";
   };
 
   nativeBuildInputs = [

From cda5a96bc8896f8b08226965771bfe606c852f20 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 16:30:05 +0000
Subject: [PATCH 2566/3942] rtsp-simple-server: 0.12.0 -> 0.12.1

---
 pkgs/servers/rtsp-simple-server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix
index 892ac1921a2b..254c24754c2e 100644
--- a/pkgs/servers/rtsp-simple-server/default.nix
+++ b/pkgs/servers/rtsp-simple-server/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "rtsp-simple-server";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "aler9";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0mslag208410bvnhnd5hr7zvj8026m291ivkvr9sz3v6rh68cisy";
+    sha256 = "0x8di6zkbn7v77awlybp3m722a27kw20vrpjgalifv8p87238x24";
   };
 
-  vendorSha256 = "1884lbfsalry68m0kzfvbrk4dz9y19d2xxaivafwb7nc0wp64734";
+  vendorSha256 = "0p7d0c6zgbzj7wd2qdz578cgamydl6mp5sc8jmvnwb50h10n45af";
 
   # Tests need docker
   doCheck = false;

From 99847951934f5a67d65cd69495721e78a28c36c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 17:20:39 +0000
Subject: [PATCH 2567/3942] seaweedfs: 2.09 -> 2.10

---
 pkgs/applications/networking/seaweedfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix
index da54ecf44dbc..80e108b355f6 100644
--- a/pkgs/applications/networking/seaweedfs/default.nix
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "seaweedfs";
-  version = "2.09";
+  version = "2.10";
 
   src = fetchFromGitHub {
     owner = "chrislusf";
     repo = "seaweedfs";
     rev = version;
-    sha256 = "0yy5a7hr597vj6xbn7f5vzqdwnr637b3l1d62cmk0h7qbmh4anji";
+    sha256 = "0ymkkj7nf70rwlzfj6x78dx07mv32qvcb6dp8m92hc4s2ckdz3ly";
   };
 
   vendorSha256 = "1r7k0rzizs61r4gqqll7l2j7mdpi3w1ja6l4w6vxgzb45h2sjhi7";

From 110a7885dc860ef275ca2a983076a557e3815eed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 17:27:54 +0000
Subject: [PATCH 2568/3942] shaarli: 0.11.1 -> 0.12.1

---
 pkgs/servers/web-apps/shaarli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 288c30734fe1..a4374b833908 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "shaarli";
-  version = "0.11.1";
+  version = "0.12.1";
 
   src = fetchurl {
     url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
-    sha256 = "1psijcmi24hk0gxh1zdsm299xj11i7find2045nnx3r96cgnwjpn";
+    sha256 = "02zwfr92bmr8pnkrg6my31wx2qapddcgmfsq44msfpmvvnxfj57n";
   };
 
   outputs = [ "out" "doc" ];

From dcb2e4982655f7c58852e9f4aa4975ecfbb45193 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 17:35:05 +0000
Subject: [PATCH 2569/3942] sickgear: 0.22.15 -> 0.23.0

---
 pkgs/servers/sickbeard/sickgear.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
index 4eab9d364e10..c47980a577c5 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -4,13 +4,13 @@ let
   pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
 in stdenv.mkDerivation rec {
   pname = "sickgear";
-  version = "0.22.15";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "SickGear";
     repo = "SickGear";
     rev = "release_${version}";
-    sha256 = "1hc0aahfxyv05d3bskfxcv7ik5zvd1j22r3z964idhch8csxw92l";
+    sha256 = "1cn5335zpcqwra3widwnwqan2r1ardxc6ac7z5nn98r7kd3kll5v";
   };
 
   dontBuild = true;

From 50ac9db524979e18c06e2ba3c421dee17592c2c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 17:46:06 +0000
Subject: [PATCH 2570/3942] sigil: 1.3.0 -> 1.4.0

---
 pkgs/applications/editors/sigil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index 869c20c1d6c4..ba9abd1ad4fb 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -6,13 +6,13 @@
 
 mkDerivation rec {
   pname = "sigil";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     repo = "Sigil";
     owner = "Sigil-Ebook";
     rev = version;
-    sha256 = "02bkyi9xpaxdcivm075y3praxgvfay9z0189gvr6g8yc3ml1miyr";
+    sha256 = "1vywybnx2zy75mkx647fhq4xvh5k64b33w69hdjw2v7jz27h4sab";
   };
 
   pythonPath = with python3Packages; [ lxml ];

From 802fa5b9d1b166568243a514a64bb9fc78ceb60d Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Sun, 15 Nov 2020 13:32:05 -0500
Subject: [PATCH 2571/3942] emacs: properly calculate the path of the src
 directory

---
 pkgs/applications/editors/emacs/site-start.el | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el
index de4708b88908..2f02d6d1a86d 100644
--- a/pkgs/applications/editors/emacs/site-start.el
+++ b/pkgs/applications/editors/emacs/site-start.el
@@ -52,9 +52,6 @@ least specific (the system profile)"
          (file-name-directory load-file-name)))) ; .../emacs/site-lisp/
       (version
        (file-name-as-directory
-        (concat
-         (number-to-string emacs-major-version)
-         "."
-         (number-to-string emacs-minor-version))))
+        emacs-version))
       (src (file-name-as-directory "src")))
   (setq find-function-C-source-directory (concat emacs version src)))

From 198a576820ef3f6b41fdf4f5e5303433b2165005 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 19:12:28 +0000
Subject: [PATCH 2572/3942] terraform-providers.libvirt: 0.6.2 -> 0.6.3

---
 .../cluster/terraform-providers/libvirt/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
index 42ed3d21066f..4662a315a8c4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
@@ -19,7 +19,7 @@
 
 buildGoPackage rec {
   pname = "terraform-provider-libvirt";
-  version = "0.6.2";
+  version = "0.6.3";
 
   goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
 
@@ -27,7 +27,7 @@ buildGoPackage rec {
     owner = "dmacvicar";
     repo = "terraform-provider-libvirt";
     rev = "v${version}";
-    sha256 = "1wkpns047ccff0clfb1108wjax1qb5v06hky0i3h2wpzysll7r7b";
+    sha256 = "0ak2lpnv6h0i7lzfcggd90jpfhvsasdr6nflkflk2drlcpalggj9";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

From 794b8f9a9e51451157ff1dff44fb86d4cd20bd40 Mon Sep 17 00:00:00 2001
From: Yves Fischer <yvesf+git@xapek.org>
Date: Sun, 15 Nov 2020 20:22:04 +0100
Subject: [PATCH 2573/3942] firefox: fix wayland-lto issue reference number

---
 pkgs/applications/networking/browsers/firefox/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 03cf35e1a6be..2451b8d5be26 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -23,7 +23,7 @@
 , ffmpegSupport ? true
 , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
 , waylandSupport ? true, libxkbcommon
-# LTO is disabled since it caused segfaults on wayland see https://github.com/NixOS/nixpkgs/issues/10142
+# LTO is disabled since it caused segfaults on wayland see https://github.com/NixOS/nixpkgs/issues/101429
 , ltoSupport ? false, overrideCC, buildPackages
 , gssSupport ? true, kerberos
 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire

From 86e6e8164a466b35157170ed41ed55d848c526ee Mon Sep 17 00:00:00 2001
From: Vincent Desjardins <vdesjardins@gmail.com>
Date: Sun, 15 Nov 2020 21:13:06 +0000
Subject: [PATCH 2574/3942] velero: rename completion file names

Prevent collision with Helm package.
---
 pkgs/applications/networking/cluster/velero/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix
index 0d5835a8cde1..1cc72cb62bc5 100644
--- a/pkgs/applications/networking/cluster/velero/default.nix
+++ b/pkgs/applications/networking/cluster/velero/default.nix
@@ -27,9 +27,9 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = ''
-    $out/bin/velero completion bash > helm.bash
-    $out/bin/velero completion zsh > helm.zsh
-    installShellCompletion helm.{bash,zsh}
+    $out/bin/velero completion bash > velero.bash
+    $out/bin/velero completion zsh > velero.zsh
+    installShellCompletion velero.{bash,zsh}
   '';
 
   meta = with stdenv.lib; {

From 956ba19bd7b455f95b634182c58cb73583a8185f Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Sun, 15 Nov 2020 22:34:18 +0100
Subject: [PATCH 2575/3942] rtl_433: 20.02 -> 20.11

Also change to using cmake for the build (this is best supported by
upstream) and enable the automated tests for rtl_433.

The description could also use some love, so improved that as well.
---
 pkgs/applications/radio/rtl_433/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix
index 78d0f8befc98..c84160c19eae 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/pkgs/applications/radio/rtl_433/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
 , libusb1, rtl-sdr, soapysdr-with-plugins
 }:
 
-stdenv.mkDerivation {
-
-  version = "20.02";
+stdenv.mkDerivation rec {
+  version = "20.11";
   pname = "rtl_433";
 
   src = fetchFromGitHub {
     owner = "merbanan";
     repo = "rtl_433";
-    rev = "20.02";
-    sha256 = "11991xky9gawkragdyg27qsf7kw5bhlg7ygvf3fn7ng00x4xbh1z";
+    rev = version;
+    sha256 = "093bxjxkg7yf78wqj5gpijbfa2p05ny09qqsj84kzi1svnzsa369";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ pkgconfig cmake ];
 
   buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ];
 
+  doCheck = true;
+
   meta = with stdenv.lib; {
-    description = "Decode traffic from devices that broadcast on 433.9 MHz";
+    description = "Decode traffic from devices that broadcast on 433.9 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz";
     homepage = "https://github.com/merbanan/rtl_433";
     license = licenses.gpl2;
     maintainers = with maintainers; [ earldouglas ];

From 0916fa453ef95bae87054db2e68c1de078c63c3b Mon Sep 17 00:00:00 2001
From: buffet <niclas@countingsort.com>
Date: Sun, 15 Nov 2020 21:42:11 +0000
Subject: [PATCH 2576/3942] kak-prelude: Fix installation path

---
 pkgs/applications/editors/kakoune/plugins/kak-prelude.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
index ee9c125827c8..8fd5fba7d7ed 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
+++ b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/share/kak/autoload/plugins
-    cp -r rc $out/share/kak/autoload/plugins/auto-pairs
+    cp -r rc $out/share/kak/autoload/plugins/prelude
   '';
 
   meta = with stdenv.lib;

From d024fa5ef8a6a01d4016302363b6e0fd2f85bbb5 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 26 Oct 2020 16:15:18 -0300
Subject: [PATCH 2577/3942] cc65: init at 2.18

---
 pkgs/development/compilers/cc65/default.nix | 57 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/compilers/cc65/default.nix

diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/development/compilers/cc65/default.nix
new file mode 100644
index 000000000000..944e0f729002
--- /dev/null
+++ b/pkgs/development/compilers/cc65/default.nix
@@ -0,0 +1,57 @@
+{ stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cc65";
+  version = "2.18";
+
+  src = fetchFromGitHub {
+    owner = "cc65";
+    repo = pname;
+    rev = "V${version}";
+    sha256 = "sha256-XRGhukYite1GtPkO9clmkwvvU62OnYphO8V1Rrr7yMg=";
+  };
+
+  makeFlags = [ "PREFIX=${placeholder "out"}"];
+
+  meta = with stdenv.lib; {
+    homepage = "https://cc65.github.io/";
+    description = "C compiler for processors of 6502 family";
+    longDescription = ''
+      cc65 is a complete cross development package for 65(C)02 systems,
+      including a powerful macro assembler, a C compiler, linker, librarian and
+      several other tools.
+
+      cc65 has C and runtime library support for many of the old 6502 machines,
+      including the following Commodore machines:
+
+      - VIC20
+      - C16/C116 and Plus/4
+      - C64
+      - C128
+      - CBM 510 (aka P500)
+      - the 600/700 family
+      - newer PET machines (not 2001).
+      - the Apple ][+ and successors.
+      - the Atari 8-bit machines.
+      - the Atari 2600 console.
+      - the Atari 5200 console.
+      - GEOS for the C64, C128 and Apple //e.
+      - the Bit Corporation Gamate console.
+      - the NEC PC-Engine (aka TurboGrafx-16) console.
+      - the Nintendo Entertainment System (NES) console.
+      - the Watara Supervision console.
+      - the VTech Creativision console.
+      - the Oric Atmos.
+      - the Oric Telestrat.
+      - the Lynx console.
+      - the Ohio Scientific Challenger 1P.
+
+      The libraries are fairly portable, so creating a version for other 6502s
+      shouldn't be too much work.
+    '';
+    license = licenses.zlib;
+    maintainers = with maintainers; [ AndersonTorres ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3563968d8d7f..b006d0c6f649 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8707,6 +8707,8 @@ in
     chicken
     egg2nix;
 
+  cc65 = callPackage ../development/compilers/cc65 { };
+
   ccl = callPackage ../development/compilers/ccl {
     inherit (buildPackages.darwin) bootstrap_cmds;
   };

From c7b9b3dee5db2af470607c6283107e8ba478c531 Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Sun, 24 May 2020 11:46:13 -0700
Subject: [PATCH 2578/3942] cockroachdb: fix license information

---
 pkgs/servers/sql/cockroachdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 3e7548fea34f..1822cf58a743 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -56,7 +56,7 @@ buildGoPackage rec {
   meta = with stdenv.lib; {
     homepage    = "https://www.cockroachlabs.com";
     description = "A scalable, survivable, strongly-consistent SQL database";
-    license     = licenses.asl20;
+    license     = licenses.bsl11;
     platforms   = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ rushmorem thoughtpolice rvolosatovs ];
   };

From a83e5c42451ca7acf3fdaec3c73a0854089598e6 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 15 Nov 2020 21:28:23 -0600
Subject: [PATCH 2579/3942] firecracker: 0.22.0 -> 0.23.0

Closes #102789.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../virtualization/firecracker/default.nix             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix
index 9513457d86d3..98b95fa2bec3 100644
--- a/pkgs/applications/virtualization/firecracker/default.nix
+++ b/pkgs/applications/virtualization/firecracker/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv }:
 
 let
-  version = "0.22.0";
+  version = "0.23.0";
 
   suffix = {
     x86_64-linux  = "x86_64";
@@ -15,13 +15,13 @@ let
   };
 
   firecracker-bin = fetchbin "firecracker" {
-    x86_64-linux  = "1jl7cmw53fbykcji8a0bkdy82mgpfr8km3ab6iwsrswvahh4srx7";
-    aarch64-linux = "15vi6441gr4jy0698ifashgv1ic7iz0kbm7c28m2jd8z08p6bnlz";
+    x86_64-linux  = "11h6qkq55y1w0mlkfkbnpxxai73rzxkiz07i747m7a9azbrmldp8";
+    aarch64-linux = "0zyx7md54w0fhqk1anfyjfdqrkg2mjyy17y9jk17p34yrw8j9y29";
   };
 
   jailer-bin = fetchbin "jailer" {
-    x86_64-linux  = "0wir7fi1iqvw02908axfaqzp9q5qyg4yk5jicp8s493iz3vhm9h7";
-    aarch64-linux = "1l3yc9j27vxfyn89xmxi1ir635v7l8ikwpw9a30dhh50wa3rm4jy";
+    x86_64-linux  = "15slr2azqvyqlhvlh7zk1n0rkfq282kj0pllp19r0yl1w8ns1gw5";
+    aarch64-linux = "1d92jhd6fb7w7ciz15rcfp8jf74r2503w2fl1b6pznpc8h4qscfd";
   };
 
 in

From 10712e7b5fbb7ea05d142df681bee81f79716a05 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 16 Nov 2020 05:12:53 +0100
Subject: [PATCH 2580/3942] firefox-bin: 82.0.2 -> 82.0.3

---
 .../browsers/firefox-bin/release_sources.nix  | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index a69f288be587..b52e4fc8e7e3 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "82.0.2";
+  version = "82.0.3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ach/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ach/firefox-82.0.3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "7850a7cdf7f842d8ebac2d7d24f0823b1743b7fe139987554bc3f54af47c31f9";
+      sha256 = "cebf34988221418454b7674778aeb165cfa5d455c93a7b1ff8461c1460f28913";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/af/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/af/firefox-82.0.3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "c43b0e976a553840da783139ecf2c8a59823da6a31a1d3b5588c496c270260e6";
+      sha256 = "cffc807143433dc414415843eb14b34ca3d3f18d5fa26e6ccec090032bb98965";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/an/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/an/firefox-82.0.3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "4f9103c6043e2fa7ceb0021e09e8616a4e4484d19641e6fc67cde0b60136d8aa";
+      sha256 = "1c7b084e089ed4d938f30ecb338f6a20001fc5c92b7ddd7d54dfebabcee67549";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ar/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ar/firefox-82.0.3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "7f8bddc573ca33cd48b6e29709c80d8dd617a46f1435303fa0931ecc413b69e2";
+      sha256 = "10930a02e0a902d67b2e3eab8d9cd45dc93611bb77834f6ac7b7ef109d592cb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ast/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ast/firefox-82.0.3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "d0bac8231fd4e9e777754378ff5b2e697379666b682c512d4d4d17a3bd82ad10";
+      sha256 = "91191ea0d52b33f2815b02be6af05ed462f394d112218638c427fccd7aef56e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/az/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/az/firefox-82.0.3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "3d0a5facfdce39e798ef72d22e737860327a669f1752deee7192877a2635ce97";
+      sha256 = "47dc248859683863c2907867e3c411c4d3620c2ae3001c5a0c693b485a0e5b87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/be/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/be/firefox-82.0.3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "70606a5e490c3a0dcd1bf9b291c5d16525e044eca667166abbf1d75b58f3922b";
+      sha256 = "2e4ddfdbb28d7444b30f58235f634f9f16f88989fd61e7ef8dbf238c0a8455de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/bg/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/bg/firefox-82.0.3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "501ba77092a68b32ba6048360f8695f52756593241f4a8d210a072260792cde2";
+      sha256 = "4c19e9af25e58bbc70d913f5cbaf8551443beee81c854ff8af2f81019b516534";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/bn/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/bn/firefox-82.0.3.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "f465d794e887b6867bae0e9f768e468876ae7f31a78e91725ccc8f7d965ebfd2";
+      sha256 = "40628ea1443ef7c8840ee65767d684f90ddb8ee547ec62367c6bb2e0833e7d8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/br/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/br/firefox-82.0.3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "977beb4edf63e823087ce9e62ebb1c1d122991de4a350cfcfc93427b3f381608";
+      sha256 = "7a44ab9c67ec58f098cc8ca210ec2e37f922587aaf7495bb0dea60f1b0330e72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/bs/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/bs/firefox-82.0.3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "3951d25f3f1eeadde330e0a68fd581595fa56fc5e98bb4baa3fa707879377674";
+      sha256 = "017d91858f3df6744eaf2b6764f4f2a303712cb23eaa8ab8ccf58f9b8b215a27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ca-valencia/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ca-valencia/firefox-82.0.3.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "466fe1080eac737ed87cd83580f585fe5e685090b0d5b6a4c2c5a01ca33175bc";
+      sha256 = "f97c9f63139c23167c90b0cb91eddc1e887a827e2f839a7ab9d7a8cb1ec971ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ca/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ca/firefox-82.0.3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "6e13af5bdbbe50b8101e60a15d22f9f561d1846e67689a23a933f6fffa73b9ce";
+      sha256 = "631ae73074f22c446899ac82713c1f5404fbf63efbdde7aa93612f828d64a5af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/cak/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/cak/firefox-82.0.3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "a96ca82a2723e90595b76279b3b2a902cf4f121afa448784bf684cf26c514c8c";
+      sha256 = "72085e68e7f8cccbe4bf4244e11ddbbfa94f6a16c3dfa582fab94ca7ef191e68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/cs/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/cs/firefox-82.0.3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "bfeac431918060b210d35ac74e7333b0c0f851435275c81f2ae76af34e3a05e8";
+      sha256 = "41da43aa44eaa092aa6481269d7100792a675764be92af7375e3bbbb21663ae2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/cy/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/cy/firefox-82.0.3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "7f81dd91072ff34551394ef969c62baae625c648f5d880f5754862855f71dc74";
+      sha256 = "b61d03510d351c0c00f7a2e8cc459e736f72cec01e596cb0b95ef53d32e0ce26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/da/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/da/firefox-82.0.3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "b21dcd0ecd9f0010852a143a38d5d0a77dc9240a49d959b00f101491d3a01e10";
+      sha256 = "5c495d632ae0ce2e3f990b41473c12551e66269b612b32ca0a2bf0f9ebddb268";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/de/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/de/firefox-82.0.3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "56429f714fc1bb06efded1c601741ba3cc98788ed54ae345518328f9dcdf7f5d";
+      sha256 = "c9c7c2d8f5dea3639d213185718f64266fce8e267d2bc2b6afa9313e1452fd83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/dsb/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/dsb/firefox-82.0.3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "bafc42263929851718a7cf38163aa3c020b0631b0a0e5ce8fe238849f7cd76e2";
+      sha256 = "f8c563b71e221e6ced9ecf927e37d9a351ab83303b252e52fc4aae51d6db0703";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/el/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/el/firefox-82.0.3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "e1e8bb8cf866ea69465250a3f760a3cf9e9b06fe15ad03737c6739da5a5df2be";
+      sha256 = "dc0c4e503cab7913cba4186f22c96ebe3f80af59fdb5c9ef1373c799c0f6fc8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/en-CA/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/en-CA/firefox-82.0.3.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "f3a252002ceae09c56334010167861abb84840466c939fc87f0ce39aa1537566";
+      sha256 = "735a3a4eddc0f660029020ec694d06e5dcf62b95b6b18dc90453a5a2262d18f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/en-GB/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/en-GB/firefox-82.0.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "2f384fdadb06254d12aa1c39b7cff6c26be4b7617d0b845a0efef2c92515cbf0";
+      sha256 = "985ee60c7d017569db4f455cd1fdaf252432057ed153d6449594d72139833d0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/en-US/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/en-US/firefox-82.0.3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "d95758297ac2db1a050e6431b637855c4a58222db7d9014c3a8322448083a4d2";
+      sha256 = "54e1f9516aee97ef2858e04a67d691956a461591fdcfecc9bdf9c34c3f026472";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/eo/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/eo/firefox-82.0.3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "0591aa9225572cdce7036eff924dd3337b85625bdeb6d59aacdc7a06c5af1f71";
+      sha256 = "b07fc960e9204d1995e040ca3e70a61aa531e34bf0dfe6e09cfc35583559f988";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-AR/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/es-AR/firefox-82.0.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "455b211bf85363089721803255829e4e7891cb43b2b6f35f85bf8a7242c360b3";
+      sha256 = "b8c5d160a92bfe94b66fc9554e3343b3385d39e2551bc6b9b0a917135f4f0407";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-CL/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/es-CL/firefox-82.0.3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "b5d22bbd082eb5b6df2ab8002b465f64afdfb2c06b352a90c72e491aeab81336";
+      sha256 = "c89601e6a8dbd91723d8d9174cbba25f43a2729da5bfdf92919abd8972dfa3fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-ES/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/es-ES/firefox-82.0.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "678c9ecf360ad9231f31a8f761a48e793b6438b598d200619e5fd54a3296e1d5";
+      sha256 = "4643c154924c5153123796dbef8f759070b7446a31e056259be1f246fdf91ec3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-MX/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/es-MX/firefox-82.0.3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "daf28e88dacd3202c759caec279244aa9bf418420df9ea11896658e53c966061";
+      sha256 = "026c72bcc1e22092a605145952fed6697a1de4945e81ee9f02b95f6654bc2f2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/et/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/et/firefox-82.0.3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "c42572576da4d6fd4cfbe5cc518b2c7dc68353141f952eaeadbd9b8679b98d95";
+      sha256 = "e69266e61365d94fb32b3d4f6560a66b94e5e793fe0e36d6cf075ac6ddb31b1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/eu/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/eu/firefox-82.0.3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "5945c782ae8d23473ec1d4682d7fc5a0c524e494393e96c98e3202061fa6551a";
+      sha256 = "3107f667f558c443ae1925d77b3c2a4b2b2b9257da16af3a3a0f5f03a28d9bf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fa/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/fa/firefox-82.0.3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "8b5f607d7726333fa9f012d5d9e74170350e205717f7ad0bd7aceec60620ab16";
+      sha256 = "bcdc8928b712bd988ef21065207bd8ce40ec7b40958094aaa15261457954f6d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ff/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ff/firefox-82.0.3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "996f0efe4c3eab9152a254077a53e994888fb20345302ed1718f8edba67a9bf0";
+      sha256 = "1bd27b188cd1527512d3de37af6b6e0d49064f8e1688a1257c17c16c1cd632f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fi/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/fi/firefox-82.0.3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "2830c7775e54f3adbda827b5fae13fdde7fb4b3c8b37644273a88da33db78f2a";
+      sha256 = "2072f0847eb952e937de66bc0dc2a3b5e2cfa267909232b43b19c5f2e0a16622";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fr/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/fr/firefox-82.0.3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "bec556a28a30c478e36c3ea1463950039458d1a7442bd7a9807f31cc4ca003fb";
+      sha256 = "d858bffb885d64aefc589835f783bd8ff22cc962ff718bc142aa2fbb9f728795";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fy-NL/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/fy-NL/firefox-82.0.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "b549eb7900d15f8606face90c521aac596230b25705f7dc459c039e8ef559698";
+      sha256 = "7eb1301dfc9266093232c5dc8fe4da7b5139d1312b67266b2e3073e6a29d346b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ga-IE/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ga-IE/firefox-82.0.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "5a69d9bd67dbae5e8659bf3980d373c485bc67d5719c3b37948d2054f92ecdfe";
+      sha256 = "d08167164f083ddcff337da35d289dad0b83097243d9fe8bd77186d75b9dc8fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gd/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/gd/firefox-82.0.3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "6d76b0659f3d0b0793cbc963dfbd6d20c7c91aa46aec1ab9cf9192d003eda3dc";
+      sha256 = "d8a6fa4815c170661b132256274250c2e5fa238d89156f17ce95eeb938ab142b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gl/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/gl/firefox-82.0.3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "4cdfa36bd0d880135ff959a04eed53b958684253f99469c45aea39cb4a25d1ec";
+      sha256 = "b0ebff09180e34dffacd325465b0fb1a54dd2b59c757c8e1fe8425c86fcd44fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gn/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/gn/firefox-82.0.3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "3cd0ffe9756155181cf68d2fdbc858a93be41104cfbac408adc98b72bcbb215d";
+      sha256 = "f0f514ed9bba07b1cf72846a452bc74e1d2e13b8bf5ee664382e613ddf351a72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gu-IN/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/gu-IN/firefox-82.0.3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "083ee03240b7b1f4238a464844bfad31334a21a8dd025f1d12a252c2cca1049a";
+      sha256 = "9c61f223ea072bcbe97e247f7e8cce8f0350366078dd2da276e5fc581b94f919";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/he/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/he/firefox-82.0.3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "36f8951cb387fb733d689ff2a77b563e8315f76b434c283867aaedc264b227c5";
+      sha256 = "c19534b8c5e0af42c09f4afc091dedba6f15d9498183692d0a5e0285a0f743ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hi-IN/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hi-IN/firefox-82.0.3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "6d041154437f97a0dc4b3ec3125f2cbebc10dd2089ed0f98df1c1a6a85b7a536";
+      sha256 = "3f25c2b8a33984a085622494b19d22005e6fe5694ff7e277f02b638848d473f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hr/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hr/firefox-82.0.3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "4c5b7921cba2d915240d6d9b0bf515f9299827e75a84eb089626561cc9042db3";
+      sha256 = "33bf5520c090f078daa53dbb3a2cdbdacafea8cae8ded68f7b0da30233f41916";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hsb/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hsb/firefox-82.0.3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "4123ec9fda1e94d4433107999905d7cca0dc2b6cfa5c5c78d3a1d29983a5960b";
+      sha256 = "11628732d6da9db696f95d6fcc0df2faa756e9782d77bc00b633f99be5921d1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hu/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hu/firefox-82.0.3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "4c0afb928ad0b87a3efb26f09da8c5ef1ac415e14ac47b30463663ddb1955376";
+      sha256 = "e33f6bfae267454b3f541b4193ef2634ae66dfc7387c7bfbf7a8609f803cc131";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hy-AM/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hy-AM/firefox-82.0.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "a2676e1450d88ab97b41cb4ee012da2a6240b739eca68e53d9607bbe0f7a313b";
+      sha256 = "0d9ea1d3adb92be4c6e40be915ab3d692eeee9e3c593b977b893e003fc7ddcbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ia/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ia/firefox-82.0.3.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "8494561d37a9d41d0c8683e793419d51ba3780b8229fe98a819ce675f8dc6aa3";
+      sha256 = "bf3ad1ba8f77920ed6cb5574bb836f9780e7f19d5c34feb2d562a175ca9e7552";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/id/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/id/firefox-82.0.3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "3bbc1f1acba6fe029ef1a526e3e16f6000cac1ff226be21850e9e52348b5fe49";
+      sha256 = "ffba9aefa174ff86bf963daa569796a39a3fbacb295b1932dd00a4d72f12cf86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/is/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/is/firefox-82.0.3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "16fa5428d2a467bbe458c82544a3859386cfd8051de266d7af5656430a408535";
+      sha256 = "182c827998a8bead2b5f76477b01e91b66fa0b0b6ad9c20bb71684c951758728";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/it/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/it/firefox-82.0.3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "5b891f5a9bd4362c6b00cbcd846d724926f2862887c3db2d6fa55f968c7e0d3f";
+      sha256 = "3ef3bfcc25ed9e1c9883bd890c60a32acefd243db37bd13eaec71a0c556c2b70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ja/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ja/firefox-82.0.3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "a3469c0b8fa55dd271768ddd491ddf1730d732d9abd697dbf779fa820f4b6d4b";
+      sha256 = "67858f54408487c9d4414dd4f072790b686379cd02aaedea165aa2f42ad9f638";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ka/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ka/firefox-82.0.3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "8115d086a7330139f03a25209384651209b0e998a3b754ba1f79f26beddd28ce";
+      sha256 = "da27168c3eeb9d0836df349e5e258b9f5936cd715374b1614c90fbb4292776a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/kab/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/kab/firefox-82.0.3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "c2a7cf201875831fad0eec3b558a4be41c847279f7a66fb8e1006084a385c5d8";
+      sha256 = "4f523312e1ff88ed06ead886ad8957be6b655063ecd451fcf502b387d4144e82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/kk/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/kk/firefox-82.0.3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "33aecd099402158a1fd6dc47ccdddc1476f21e31a1f25c6cd8518226de7f5d23";
+      sha256 = "b2cff1f5f94e94091d2f0d174ae5a979db34c554f4432891c9b894f0c07a7fd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/km/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/km/firefox-82.0.3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "060686475df4e47104229d02d42760e5762fc1a9d8d785a8116670a24b7cb897";
+      sha256 = "0c7b18f57c87d6d94c273b6678ce0dc891afabf9cb9bff3c03a347214bb52cc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/kn/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/kn/firefox-82.0.3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "3b86716fd6da73f439593a3915d24710176d9be1aa3d19313c2554962e55dc51";
+      sha256 = "bf0c5dfcf7c23c033b6180cc4916a014e5c7b44464377f8e1c400db7bd7ddcc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ko/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ko/firefox-82.0.3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "5fd1b0b428c57886552aabdaea3f691227f40cc19d18f851a2c880b1a1c8141f";
+      sha256 = "a1b30b45cce0d3bd1a4acb3a9f335592a819bc740455e56626968f2d66a07839";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/lij/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/lij/firefox-82.0.3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "227f8dfd5b861f9e8edf1037c8f374dcae3aceefc61effab0e51907603fc21d8";
+      sha256 = "8802eef13ecf4b61adbb6f3350893ef7e4fead3395aebd290df95c7d5dc2bfe7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/lt/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/lt/firefox-82.0.3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "9ef7177b9fa3965a394dde8a39503fd8975829faca86e281d046f8fed50bdf27";
+      sha256 = "3fb34783d2768452aebfc20ff59b84a83139f2dcb04b1e11369b4984560f94d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/lv/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/lv/firefox-82.0.3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "ac98c34657aca401de5943724a7f8607d1370b78f80c211547010911a11be498";
+      sha256 = "ad3a91899e2a1e2d22f0f15d15956c9c569b8ec0af50b7f194369d969fe9a339";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/mk/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/mk/firefox-82.0.3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "457fd0ccb4d43e99f39c89db76dc5d4cd79c560a578d1ff3229cd1d49493356d";
+      sha256 = "b98a27b50ae6c21e20f0bdc43cdf176b0d434a85ace230474bef86cb0411e925";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/mr/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/mr/firefox-82.0.3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "3bad6fb96f29a3fac72eef3f53b48e9ff10a273da069eda050fa24bdf3ee8ec1";
+      sha256 = "6f32b1ed9fe14162366d11ece5b53c185afa314131ba56105ff3aaf9c61cb621";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ms/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ms/firefox-82.0.3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "20573511691d2615c9095988cea73d7fbb522a0b4ae958da1749ae8ee1ff31d8";
+      sha256 = "4c7ca7b1e504a9a4c14b7954987f4a2fc3843f341e26f088113aad09c2ed1727";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/my/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/my/firefox-82.0.3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "4f4a7abd9a1409ab49ad956cc1cad0adb9254b3203d9d19b7fc967284d051554";
+      sha256 = "52b234e2c32f52197d38e618b2d542c584012253d5da9b46dbb47c4198e1319a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/nb-NO/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/nb-NO/firefox-82.0.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "c0480f74895deecbad2f58b1b4876fdfc2c920269f4c91143c9cac41d67162f1";
+      sha256 = "63baeaf173b4c83c65b160bc12102038be1729f7ab4e535e01726c83d6af4751";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ne-NP/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ne-NP/firefox-82.0.3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "11fff99c2bf87ce9b5c315ffab4a305bed0d5170ffc4f65d00d5b5b380687214";
+      sha256 = "c95567889ad498059516e5c4c38e74fae0d937ad85b91813135cb4205b4be527";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/nl/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/nl/firefox-82.0.3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "a19b8a18022f9317303e7aba19415f45133b19849fae440ec41ec5e9016a532c";
+      sha256 = "6ab74c0caa49412b41e9c26af51c18b4b23c9a2990868bb76ee640f77cf7ec81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/nn-NO/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/nn-NO/firefox-82.0.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "cc68e10b523681110a597c7583ede6ae08d20529bc001fa5059c9056287f3587";
+      sha256 = "8ab6be8b9883cd41a0b5ee84fed125b0592c526bd60b57658e3949e675b10909";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/oc/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/oc/firefox-82.0.3.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "a54056be66f78421a7f70cd5860ad5e804abd35017b02ca600c459c86c82ef50";
+      sha256 = "ffa788bf89e7d0533e14c706830e3e5a7995cf0d8827dd6f56e7a02eda85ba63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pa-IN/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/pa-IN/firefox-82.0.3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "6a64174c90146c52b462a2e8b921880927774b6d9b6478df26ea194735c6eb6c";
+      sha256 = "300caec712dfd4c2a0d615671468ad6ff249b5300d94a1bf18552ec205fc96fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pl/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/pl/firefox-82.0.3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "558f08956b019d8046ac6c0e3a9922f79176d9997129e795901f40ce04651e55";
+      sha256 = "61cefb394f5490950de3a86312bf13864490c7b77f400881ba67c4e6e04c4585";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pt-BR/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/pt-BR/firefox-82.0.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "bcc8c4d9a55c8669cd378b2f89cfa61da82e54be360fb754be78289c2ab8434f";
+      sha256 = "d22845a258c133004216d692071f64c8e639caab6475b09de8e880dd26a808fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pt-PT/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/pt-PT/firefox-82.0.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "29ef81f9675b589122d311dd0f3075d48c99fb34aee9f9906d490585bd407468";
+      sha256 = "390270b8a04f3e7e7185ebe895741c6d3b82de55bd8a88384f58a2412b1156db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/rm/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/rm/firefox-82.0.3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "390bd332f1fae6f5a48cc7b8bdd285b282689446977d859e37d8a097920dec9e";
+      sha256 = "c9f916a4bd9d01dbfa7c07988f25db6fc754e98fdf8fb0c6d28c7cf23799fd6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ro/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ro/firefox-82.0.3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "1398529679e4220844a0b1880c0ff174fe2faa8b1c30c6041c1cd790d16a83fd";
+      sha256 = "3079e818963ce30e63f984ef3d24a321bccde52021f68abf7c38e166b63dd3df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ru/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ru/firefox-82.0.3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "a9ba4ded0a67ae842896aa75de3dda2b427d0748244649aa9c2db17dd35a9d02";
+      sha256 = "5d5f1d4cf24e1f41f4f49edd2918790f3395bc45656bc385ff863ae996a2e964";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/si/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/si/firefox-82.0.3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "a95b03c4085c096207a895d3ad193be7823da4e894793c0378391da5faaf01e5";
+      sha256 = "182d4f9f65d923aa4c190eadb2822813a0153d46a7dd789bd03e2c87deaaeee4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sk/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sk/firefox-82.0.3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "ce09728fc05f18a549c9083d383c58d4a62371d69a01d30f5aba782a60ec70b6";
+      sha256 = "9f38a513c7a35aa403bc570c50d1269fab04f3e0e78a2ee729bd306513b34655";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sl/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sl/firefox-82.0.3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "c344aa40296d249f2c6c85718fd6a9b30be0407b7df7eb73f1810cc873f03477";
+      sha256 = "916cb70157af7c6f44558954ab38b22c0e35472ae449b2cd1b3355e24f69d8ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/son/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/son/firefox-82.0.3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "3356b16e9174c90cc8e1deee262b8381fbfc34e9cd03e6f7bd48072861de5be5";
+      sha256 = "4790b6f7fad51191663549d6c06a9a27d2a6edf153caf66c8cbaefc6a2e33547";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sq/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sq/firefox-82.0.3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "a90e1dada0ef38114f1a8ba7236d8bc97285dc46f81334c86ee7a9a03c8d2b0d";
+      sha256 = "3265c849c77d482145bdd6e67078ec82e1ba339a807ec15692431a4c43358e2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sr/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sr/firefox-82.0.3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "d44891e53c9a41770dffb2fa744e3cea0a655194e218b70881e1f070aef07d69";
+      sha256 = "3d5616ad78372ad3e64e0bd81046680f075de53641c3c1f73edb2aed66f54d96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sv-SE/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sv-SE/firefox-82.0.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "e53a4ca8a04d7858c30260999b6acc09b8146ae8a8f4e558d62cca1ce18e7689";
+      sha256 = "bf1122a7ba4cbb5525d35d7245a68bc2534d191639955a6c9810f57dc6b41efc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ta/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ta/firefox-82.0.3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "a89ab7047cbbabde8a03e301f8067b130d37eb0ad7ddaf750051175dd721b6d0";
+      sha256 = "8ad3ac098bec9283218e0e33dc106457b8f2f21b15aa7b821a5f061566d058fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/te/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/te/firefox-82.0.3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "6f80b934ff3bf696b4753f2cbf146d9151f40def404d6d749cf8de022be194ff";
+      sha256 = "a366052f680073f1d0c300a5a8e45d6cbd1be7651463067db268626d2fe1a5ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/th/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/th/firefox-82.0.3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "c37a9708768ddf723a2423ba0999e88b09a51028d7736234ffcaf8a32f56df8b";
+      sha256 = "509dcd38435c2923a5bac14bb5b2dc4838606f139c29138a0bd5d090fdcb0142";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/tl/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/tl/firefox-82.0.3.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "5ab670b24e2ee1c4b4c7fe518e9d3967c85f0e27ea2c7a4ba82bbdaabc6c4fd9";
+      sha256 = "37f39b2df1209fdfa9005e6213d31aa50a8b62c55ed269625ed90f5fefcd5169";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/tr/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/tr/firefox-82.0.3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "7e51ae3fca81e691675196b298a9b03de9e798f4fc032da8e5da295820a7d2c6";
+      sha256 = "6417ff882cd86cbb7238414fd8100769ed6dea0a3532af09ed9d7e05ea322f22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/trs/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/trs/firefox-82.0.3.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "60263ac369cdc9aa9a8ab0dcb60219f3e14563fed709b99d8352c1b0469e9433";
+      sha256 = "2fa044fcba5f6155ed55501938df4646dcf83f7d67f53ea8ca945e319db54c29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/uk/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/uk/firefox-82.0.3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "38f8e0ed748427991ee9c45694460d3eee28a5f94ee1ff59eafcf9eb93fab9c3";
+      sha256 = "345be40eeaa42900bf7091fc8098a92d16369ecea3992974e4a2ad8856f58f3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ur/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ur/firefox-82.0.3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "65e19c2395ff45bff79beb1aa4d9c18faaceb5a7000c6de672f6c1d6964571e0";
+      sha256 = "47679117a1295b74a4b06b1407ce0dd38fc45326af970f4a20caa4ed8343e739";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/uz/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/uz/firefox-82.0.3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "d3967c3bbbd0ddd880a7cab3a359b946a7b99515c9b82bba044a33138822d864";
+      sha256 = "85dc93248a9db047cd9c97a87e0f36ccd25456c167390bff19e0e84dc93b6756";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/vi/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/vi/firefox-82.0.3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "a142d7ddc06c688666811ace6a9c32f28e74006f29eff4aa4aaae105f64a34ac";
+      sha256 = "7882f5c1e3330a567967444fde09e0bca8e2259e4f836603bac61d7fc4de47ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/xh/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/xh/firefox-82.0.3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "a696daecebfb59e8a798dcc6eb241ce10562438a013f243dd60ac8671091f585";
+      sha256 = "fcb914c24f93751ea1ba760818bee0323e5220c14ef95f3d6f302f80d58a0271";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/zh-CN/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/zh-CN/firefox-82.0.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "d1167e254dc6c16d5d4e38cd8b98bbc065e369d7bd7414e6871b028c601118a2";
+      sha256 = "0e3635c27c594395f2364d6f4c140eac66173130afa0130bc4043e500fd91481";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/zh-TW/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/zh-TW/firefox-82.0.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "453ebd33173b2ae4a5120d73e3e0fdde57b480e3f66ef2fffaba27390ae945ae";
+      sha256 = "7c3588bdac4147a43d5a40e376f359823a3503c3ae491e3d98b66b285c924e25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ach/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ach/firefox-82.0.3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "c7840623cb65c9c28285d41694a85990e0bda181697e229ad4b71478dec8bf2c";
+      sha256 = "ed00c332dc5069a5b4755a759c4096112aa07b5fabaf0827fe63dcc8f96c70f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/af/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/af/firefox-82.0.3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "24915613ccc58840ccb1564ebacc906b96c7f171822f722265e02b8ee41b0dca";
+      sha256 = "41b4929336370eacd9fcf61bf56adc26377305f253ef8beacae8a3528949a2d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/an/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/an/firefox-82.0.3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "d7acf25c0fce89775827a1e8198fccd117b94dafe5fd9820f557cee88379da8b";
+      sha256 = "d8138aebfe43f67f634f4a70142b5463497799396cd4e5ac6fcdd91a1c370d12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ar/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ar/firefox-82.0.3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "d24c74365c1b9384e8954f9b6ce4f2742bea269de7a20f448971a957f096ecf2";
+      sha256 = "f58e993bde013b674863586dd016d4ac9f8a245a4dfffcca36ea8044afec20a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ast/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ast/firefox-82.0.3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "0b858a243143f6afa68bb14f836fbf4a7245cb2856432004222422ceeb4c4d57";
+      sha256 = "7fa1d61e805f7f3f94abafd6dd73c5ec3ac518c3192c6fdb7e31f155cfb2d8a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/az/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/az/firefox-82.0.3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "80ef7662e88c0fc1711bf385443917b325dfa46252b837f043f41fab0139967b";
+      sha256 = "354db7168cec8c18431e33d5d13efec2b2e1de6b38e462338935ec4157521f46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/be/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/be/firefox-82.0.3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "93c087192c67e074ab3b00fdf55d485f39c7b86cba4fd801e61d2f61e511a191";
+      sha256 = "bfc5689bfcd37bc6afd6438130fac2486670616ebcf3f40e40dbff85f2323ed8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/bg/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/bg/firefox-82.0.3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "19afb87d93e3a01305c24b725b8ed764f8ae2e31e72a8ce4132f1d6451589321";
+      sha256 = "18bc052d5ba75cd4406aa726648609bc95d869a633ad99f3dcb24dd2621b81c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/bn/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/bn/firefox-82.0.3.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "e607dd2195d4a19d366de1f084bcdc91d4832287752c4a449d445eb7aaaff463";
+      sha256 = "896eaf0144040b5eb7281f46280b918bca93ab8ebcd3d8a9176d6468a7f82850";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/br/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/br/firefox-82.0.3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "dbd5fa26f0b9b20933820005022af238a5f72c8688dc10a4aafa0318af67b342";
+      sha256 = "7af967b1fa2aeb7d9e97cc883bd118b4d04a98c8cf56ea2f4f435ee13d1a087b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/bs/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/bs/firefox-82.0.3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "7d3d4e3bc630e69b655f4668365359996266d15864b776fbe2e6a8773e212410";
+      sha256 = "990778d72c382920590a92ff0c861f8d64274d09da56fa989b5ca124731eb1e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ca-valencia/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ca-valencia/firefox-82.0.3.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "a14d58cd78c72c29307887a91b534a7553ad2b4e81da5615bfb8a918d4abce60";
+      sha256 = "ec0594197bea5db1058fe3dca4a5e3bdbda53797e87a2fb0af070664b7a7fe3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ca/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ca/firefox-82.0.3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "2aac2aa56702b1269b5b5755da2663621da1603e6ad956afe07d86ff54d3e64e";
+      sha256 = "42a25d4006fe6e4f8e7f685304f13f715654d79df775cc6e740a49bf72e691d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/cak/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/cak/firefox-82.0.3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "333cf7d04c22f644f0286102b498727dc448339de26fa1a1cfd353ad1b05a1ae";
+      sha256 = "452438f73a0da6bc5922de9178c66ab95a0ddc94420a97b771d44d76053d1e71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/cs/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/cs/firefox-82.0.3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "3d3756f69b0acfc95abd5ab21b9b77cd2272afdcb7056fa4b961c1528e467447";
+      sha256 = "fa827fd11c25b37f2e93938be3461061b8c0bd3ca1391c0b50657981cd0e2ba6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/cy/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/cy/firefox-82.0.3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "97d16b2b8def95897751397a8f5293931e1620d2b17b6a6f036d47abc79ae822";
+      sha256 = "12708a5c0f3559d8557f5eb11a5a654b999b2e758d075fa723d78434f1f0fbc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/da/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/da/firefox-82.0.3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "f97a2ded9c529e992df15b797afe0622a1d02cdf3e01fa46794b4ddddcfed0ac";
+      sha256 = "660f0af8ecfbb07df68d5e28eb63b69065eec5ae1e31acbe8f89a7aac66596c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/de/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/de/firefox-82.0.3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "4d9aba854f86075d29772957d7f31804ecdc1bc465315afbf0bd807a40f39bc5";
+      sha256 = "16492891efe70c69774e10a83465a5b7ada5a25a1057de0a744c347126667a1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/dsb/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/dsb/firefox-82.0.3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "bdf18303c3e67f6bda97c709460214bcad60dc11c35fb996bb628f79bb7d0a9b";
+      sha256 = "7c830c85f67d2d54b63ddfb94765f5fe1270df06d72e05cc5e0a1dc745e3dbbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/el/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/el/firefox-82.0.3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "29e9a29e97fea8cb4eb03c8ad67c8fb37e534199073202f381c6a9c50a9d6572";
+      sha256 = "f4c42a7b3b7c8faea5a54affeb47083f7070a37e3e05a85bd26d53eb2571182a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/en-CA/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/en-CA/firefox-82.0.3.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "7fd41cc61c01491048cd37db223007a568a8470eea693e76e3f3394901b1af5b";
+      sha256 = "fb55f47dd07ba7b8e1d4637d0cf693db8de3bae5b729bced9f22e6a3a7136e37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/en-GB/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/en-GB/firefox-82.0.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "818d44931c9ed4b4c258de26b33040409ebfe9a4856eb1f80715d15687ea9fdb";
+      sha256 = "98fcf28312060007364b6ae7e73b4e5ec5f78d5cf6b92c68deef49b8aac39e66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/en-US/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/en-US/firefox-82.0.3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "54a64c8fbb263df7e05b8532f0d6f50bd34f6b3cf3080ffc99c123b6b7009210";
+      sha256 = "53e1cd6dd28b764fc0e824174de5cb1d70a2b795f7f7e6d1ed400a84d996295b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/eo/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/eo/firefox-82.0.3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "87e497515f1a90d315e58f592d9360baef382bb986cc17a1a20e9ea9013550fc";
+      sha256 = "0277e0d4f5296fcb5d360e3949991783808362014220eebdab8fd031203d03a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-AR/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/es-AR/firefox-82.0.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "3306113b2e5249c9bef8cbe3ee30a76855402f39385ef730725fe19c650248fe";
+      sha256 = "db90a491dde00c0625bfb91f12820235ed4b23ace245520bcea8129bc0fe99ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-CL/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/es-CL/firefox-82.0.3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "72fc2f9c4269255c5c9b6c65f11ce8613dd68a1b382c53cab159c56af91d4f12";
+      sha256 = "da7ab44cfe8fef8a89be8180f503477d632e1b0d0e13b410e005971f1eab65cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-ES/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/es-ES/firefox-82.0.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "720687e90a863bc08a79e7b98f52439efbf655cc170397095dcf2212839eeb77";
+      sha256 = "b774a59300369f9aa5e695eecf2923036ac28b790a2b265bff39fa004221351d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-MX/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/es-MX/firefox-82.0.3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "32db50431886cf3e181a440eb40e4d9e93ebb0dd6c7e9eb3f6bb4cb203530d37";
+      sha256 = "f227f0904d927a9b7696dbd42c33e247b93a517ac465e63658297d266636dd63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/et/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/et/firefox-82.0.3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "21c2de424dad554b4e74509df0b40a49c23b77c406d44c611ea0e08eb98d1886";
+      sha256 = "40c66a997e4a244775c4e094b313d8de66fdd8ca9b59b14b1858e331f0c1760e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/eu/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/eu/firefox-82.0.3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "96e3609f488fc8bdf899f07333121893dc5f74f520856536facb1a5b376773f0";
+      sha256 = "cc346925123d138c8f39f8feaaa830c87b31ec9f3e6d66d62f3c4201389528b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fa/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/fa/firefox-82.0.3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "572a6fe2bc5c0751077344e327ff11d434eeb26eade478dd79578822bc8ea167";
+      sha256 = "74ef4fb696e3a551e920d95341e6b24ebed1abc0f50c3753b5719e649ee6569b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ff/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ff/firefox-82.0.3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "08daf54db1c3927ff10c38ae462c806b0968abe89509e2a7251b39e2f3e3e43d";
+      sha256 = "300bd1d7ad740efdf7e783a19bbfbab32d699ded795857005e3d836086414ecf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fi/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/fi/firefox-82.0.3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "c2bfa5646d0f39262c79dbae82f2a443e145b0b318d4213e42f265dd378a0a73";
+      sha256 = "be9e639888e7fe25508d1fecce9dff0d25fb8f4cc1df9485c06fd34dd1964341";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fr/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/fr/firefox-82.0.3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "3e8ae367878e625b796e68fdc413ed4fa32a06260db7ecb000f3c089f7755a6d";
+      sha256 = "a722540cedb2694bdd8cd347cce80f0e7bd6092227a0d69d64e35cd644f9eb77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fy-NL/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/fy-NL/firefox-82.0.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "29dcf0040b32d2a183cc79f220ff37c6b8059a399fd111b9c4ab8f851b638acc";
+      sha256 = "d8292b69187d3b69d3e6d38076e9e448cc1851ae560432d524c9ceb25b980302";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ga-IE/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ga-IE/firefox-82.0.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "d2f0c91780ef7dd353d58e41e539b917e6c957231579517d1d75cef89769a5b8";
+      sha256 = "3d72fde2daf9dee7d7521dbdcc257aac3e5a3090f07a02aaa4eb1247e4dae774";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gd/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/gd/firefox-82.0.3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "1c305c577072a792aee284559202b4ca8108df8f96b1ef17c20d6918498b3599";
+      sha256 = "b599939ac3927e3da21a8b85dfcfb2bbbfbc5ca9833543b7df3e8937184fcb0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gl/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/gl/firefox-82.0.3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "86c829c97c30e5c49081283cc8ff5073d357ab09520194c56df63ab56858b083";
+      sha256 = "f7d8f6915d9867e740aeeb06614ac3c2a9c29ad914937fef99490c37c329e822";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gn/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/gn/firefox-82.0.3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "11a41052cb779cd11fa2e9c1f2f4367a190e78e36dce900f2fd84c451a6001be";
+      sha256 = "940c94891a5bf80b12c24b49276e87c50f6edc601c1876a75ddfb36853f94c02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gu-IN/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/gu-IN/firefox-82.0.3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "6dfb8e60f2225a8db6a2b1ce31b23b51803d5fe9642cb85ff9f440e53c887616";
+      sha256 = "8961e66ea0bab00b29ccd365351517d932c75af5fceb9381a0670e225bb9a20e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/he/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/he/firefox-82.0.3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "8d2f9ed875b38e6d19776c0bfb3a66fe030215d43ee247c9f1a5b85c7dcf0105";
+      sha256 = "a253c246e6a2820a6552a81291f9887007174120e13f3becd3e3f06d55e12457";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hi-IN/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hi-IN/firefox-82.0.3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "cf160dc3ff74855a206882e045395dc1ddd69d545184d7f02acb20289465842a";
+      sha256 = "39f7bd90f28ce92b83c46580e8297367d02042eb274809a0c94f58f6fbd2d0f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hr/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hr/firefox-82.0.3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "e62b04dba13d6d8dfada3976f23715cd221d5a9f0c9d2ea9a0b828c87222b8db";
+      sha256 = "37237b7a1b28028c31118b3f6012f6122b428ed81cd0289b224aff910700c92e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hsb/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hsb/firefox-82.0.3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "fbf8420109b4b7470bf8e5b889cbb51b5a9d827b9cedb2aeb5089f31e74b0211";
+      sha256 = "e4c1d598ebd277309e1d9bec979373162cb34ec7874637a7140184c07e590653";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hu/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hu/firefox-82.0.3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "161c7f91df6806310a10631f6d338cf86138f5056d265e4dfcc2823634a1cc79";
+      sha256 = "a273f90e185fea5e02fa7be0e859d6569d5a18690dca2485db39719f04f96821";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hy-AM/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hy-AM/firefox-82.0.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "a35885c431f6b160716355766c5e8f60ac94dc86675e91905c4781071de6c2a4";
+      sha256 = "0da0b1db8a5632776a38d8ca53fc59bb2922b9caeecb779e4fd69086330eb153";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ia/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ia/firefox-82.0.3.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "e162f166587a94aaaf9a6419fdd9da21f949c7db0d1ad223016d470841e124cc";
+      sha256 = "53fc34e4f99ace2f287a39dc8ce1d13546574da940dc85703fd81f7bfa7c4483";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/id/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/id/firefox-82.0.3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "bee0a6a4a0a9fa3c13650bcb4fefaaa07cce21211d2d4fc0030f4f9133781eab";
+      sha256 = "33088caa35f9939e24e1686a97762c86e6bfde246467544383b4dd20a477ce01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/is/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/is/firefox-82.0.3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "8994bc2da81e1b17ac112e7ca7a43be9f578c049e879651a4014730937c83283";
+      sha256 = "e8651697dd1c6507e950dab2a7c1a3e61c7a1fff5507fa6967577c076aca43d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/it/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/it/firefox-82.0.3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "7fa77ed489b07954543ba117dc3cf67fc70341a5e486d35596cc8f80f630482f";
+      sha256 = "faed37a9099007b2a06a66f0d2baf19f743a5370d354d9295d3c04d283a840c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ja/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ja/firefox-82.0.3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "76d299e4d71a82e72bc2e446bcafcc1b1d63b54c57e9aeb7ff11e7bff8611811";
+      sha256 = "cc403028cdfecfab642f99e4fbf6920cb036f71da9ca05343b41990c01e3974a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ka/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ka/firefox-82.0.3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "6c027f7dbdff43c097a73ecad83aec6c7d623cfc8cdd77049d4dcab70984b403";
+      sha256 = "279655a3c1a9151af171066bf164c71a4541344d5bddc02e208faae5af61052b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/kab/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/kab/firefox-82.0.3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "ebd32284e83a0df7228f34263ea03b5b3f418fa5db193e01d20ef15f7ccc393d";
+      sha256 = "febad3151c3b6dbd0e3747a4814d2451e7703d8907407255810cd87383a5d665";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/kk/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/kk/firefox-82.0.3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "39dcaefc6135f51157802878702debd14950a82a32b57862c9428236425de620";
+      sha256 = "25135a1305e6c4269ef9beec7353669d403023fd552ae43cb7a4b8042eaa9a40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/km/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/km/firefox-82.0.3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "30b0fc4885498d9453dd3179a82d7fd12bcdb5a2b1f3d6227d7a7a68123544eb";
+      sha256 = "80daab49e0fd64640fc1b0a7ecaf3b764a0a7b38020aa4a758f1e5e8ee639b9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/kn/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/kn/firefox-82.0.3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "ab0f33c172a47fd5fe1e3caa014938647dc870a97e9db0d1ed7e9b09a3fc920b";
+      sha256 = "dd911926a98835fe4a0a97ad0ee88867bc637a673743b9c6ee75aefea1cf60b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ko/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ko/firefox-82.0.3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "7e20d1d2c16e6278e1e8290c18b39833e23b12cc9bbcfcf3135e52d3c155118d";
+      sha256 = "975f10dc01c190604cac28705f98b0abb352adf21aa1adb031a11c8061fdb4d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/lij/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/lij/firefox-82.0.3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "5da50a6a54b1ce15af8ca26bdb2756449622f6d441593bae4f558c079ef732ce";
+      sha256 = "9f6183b484eeabfbd4440d644d3da60c1068af430638b1bf9e4e5a4fe47e123a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/lt/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/lt/firefox-82.0.3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "a4bf43fd06f915720f3050750f226629a602aed690b74df728cfd616f8d1d063";
+      sha256 = "e95b0760385490b65c774943f72835423c3339030a9b347eeaa7a3cd172065bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/lv/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/lv/firefox-82.0.3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "8f8eaf80606a140616cfa17fb69bc611ac631a8ec1e4d204fb0de1c073b767aa";
+      sha256 = "6a2387d24680d541e12547f6fe38c56e9960beb317e450a39cfdd481b56485d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/mk/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/mk/firefox-82.0.3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "869715dd3d72c48db3007557aabc96fee78b73ecdc747ec0f361365eb1072111";
+      sha256 = "c95e5e94680ce2dd06adb6cc6ab7cb2545e2283b34f9f6702db9c4ee48635d7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/mr/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/mr/firefox-82.0.3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "ae921995425812eb2b70a479dc1d6bc319d397c7c16e020460d2d1f65cdc9305";
+      sha256 = "6e2ac911d8b4ff89fa5719593b390ffb68f31ea9c53ca075ae91c47907ed67bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ms/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ms/firefox-82.0.3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "55fc6ca427864cd885fa8da786f50f4e88ef2d9adf331e55a6f8e781fe5f7838";
+      sha256 = "4c573fc813f878c9baf9ebd2aee71f5459160a2449c424e1bcfbb8035b3b7c50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/my/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/my/firefox-82.0.3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "26377b5108cd1208d111792dad61cf521fda0f4c4206d17e4907b06e4ab5e7d8";
+      sha256 = "a42129e772ecef6e437aff59390da05595f55872c990122bfa07509aae204757";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/nb-NO/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/nb-NO/firefox-82.0.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "19bcb61803f6d6bbecfd94eb769b3d302a951ac5d7f337b6937f9282cbb8222a";
+      sha256 = "3d72dd2b24c1c99fc1257a9eecf91fd694e67a161b511b991a7294c6dade77c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ne-NP/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ne-NP/firefox-82.0.3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "4575f7730e5964fa5be7ec351907d97794c06bf101bea5a98785238304d1fea9";
+      sha256 = "a85fa695c3c7a221ee54bee11b5eb88dab9d087d3535f63c143fc8fea759a83e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/nl/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/nl/firefox-82.0.3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "f22f33b1a1127a4dc91781031c0112b05e8cd5fbbb8c732a6e18b5beeb5627ec";
+      sha256 = "48aa468f774d67526e41488882f3796a399ef1789b70793570407e14bf112251";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/nn-NO/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/nn-NO/firefox-82.0.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "d59e605d47601c18d12e6a2a57cfb8c8752fea2711e8cb0d822b18a4f7a2c049";
+      sha256 = "857abf782407625492859630cd47be120e5daf8843dbdcb61535fafaa0d5d3cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/oc/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/oc/firefox-82.0.3.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "859b0b3b7317a4b94292edcb8f159d4c42404efcf67a170f435131b0b2331422";
+      sha256 = "b8606e264be062dcafc162b5d69191d2962b547fa906e76e68345395378ea471";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pa-IN/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/pa-IN/firefox-82.0.3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "b8553bcc65ce5a075875849508876f34478a0d8166b048b4b8d0b37aacad359e";
+      sha256 = "7279685c4da5b614f6ae0832636676b06ec3384667e1cc1e25379d61b52ebe5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pl/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/pl/firefox-82.0.3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "8428f5438edadd7f3e531aeb905bd46f52a3a624e1a36706b3e0e79d29366b94";
+      sha256 = "436d60ea9bb7b84bb20973ac39ebaf1fbd6c7966b5fe5677fa829935d76f4932";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pt-BR/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/pt-BR/firefox-82.0.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "021cb4431781ef19cf7be1f987b6859c2c8b7db67f1428cec475d4de82d38118";
+      sha256 = "47e972cd908b61b1ffb3a194ef12bb1b9e0033a3b30804e0201a94a5dc4c9d42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pt-PT/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/pt-PT/firefox-82.0.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "e55fe5ebb512e184e2c67dc6b866a0f727fa89bda6fb2ed763195761b67bc79c";
+      sha256 = "cab8ffd436e69f7102519bc9ef73d7473336a0a45452f1e85cb0b0ce7c50d197";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/rm/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/rm/firefox-82.0.3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "30bc0d66c940ddaeaff516e900f85c652a3dee07d2ede81710efd31c5858e72e";
+      sha256 = "26e71bcc89580f7a2510f7018481b86c7674b0534070a85f675a2f576de2d9c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ro/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ro/firefox-82.0.3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "e467c27dafce634f4e507ba5520ea4dfc3d3fca2f751a8ae55fb3fb26a073b3f";
+      sha256 = "2c9838ca56e808cbcc0f08987c1b21615119d94dc93cf94dba915491130a0706";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ru/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ru/firefox-82.0.3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "d0ea589f932e1dd4a1f6d12a758210e22213794f5d45ec5bb85621aa1ba206d2";
+      sha256 = "4f9b41754a1dd74d8979940eb17be6578c6907b0deea700697eb340fe607a586";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/si/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/si/firefox-82.0.3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "6a22d47d1c193a2a048c7535ec49f2198bd2616e123353af0391272db9decd3b";
+      sha256 = "203b50ef0d0d76ab3db56bed03a1b78f3f20819cc804cb5ce470470bd6b6148b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sk/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sk/firefox-82.0.3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "c38f8f2f172c0de6d526be926c874a765116f14af5f50cb65cd7771a46cdcfe0";
+      sha256 = "650cf2fe9ad5628b927f655fe1e88e9260c98543b7fdf6dd5faf9a1cbdf50f08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sl/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sl/firefox-82.0.3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "f39c27bb7d334f20e09fed97c3589db6aae988d3e538d7e2dbae690ab4b4e521";
+      sha256 = "7c0aadbc5d6dfff44906eca393acc08388238fb502d183653a094f4ef7095d02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/son/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/son/firefox-82.0.3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "7edcdcb248e6cb9a78fd4061a2ab54e03692834f87c6d565ed9b777c952ba5fa";
+      sha256 = "7e60dd64c8ac8052cbc6efb8cba46713ebefd17e66626a6fa2896a3bf88e9553";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sq/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sq/firefox-82.0.3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "db3a6edc2a4008c09ba931e965e9853404dd272455ec8d6b20bf86e14a095bea";
+      sha256 = "d8fa2f61a2fdace3374effb32484504afb78651406216c1dc900f6958ed52561";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sr/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sr/firefox-82.0.3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "aa6bf3ed3402813f56b6d6c53a70da8c7decad3f9d3c3af66336aadc632e334c";
+      sha256 = "f58146fd202221fec3980ed9fbe7bf84d26465fb63c334826b3271c705e5bc61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sv-SE/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sv-SE/firefox-82.0.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "8ffe039f7ed159150c6ad804e980c597741439dcc339841e464589ebd535eb38";
+      sha256 = "23f71c61978bcf531790a3894e86c7bcd7c930464f9276e4d4464de3d199db53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ta/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ta/firefox-82.0.3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "a46c944cc5b22fefe8503cf079be32cc5aeb2cd1b78e5642f5ec55f8baf28586";
+      sha256 = "78fda229fc9583bcfb3b1ee12d494d04955845a703a594e836e9bf3ae67531a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/te/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/te/firefox-82.0.3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "a7ce32a838d4add3123116628301fb6642311fd3f6fffe0ca4ed6cb314c162fe";
+      sha256 = "86aef155c9b1db83727d8e2df9cf73148ef7146aa6ec77f751f7e548e1ff3e72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/th/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/th/firefox-82.0.3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "3ed82ac4d015d397cb53149f30e2842614092413d84dd6add365428b80c40cdd";
+      sha256 = "ae647ba530f60dfad84c95d0b70ee8dba7ef183f1b76c9861b2ef3da6d95779d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/tl/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/tl/firefox-82.0.3.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "cdd9b16ad2fefdccbdea8bad3863e3177bd166fb595609f74b1afb7d279c4390";
+      sha256 = "137722d3de0ae236bb17dfc940b8eccd5ac7ed291d22a59486c2e79505d3b34d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/tr/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/tr/firefox-82.0.3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "4b75d68d159ee4463854b53d0f68364648c2b36e6c0fc8937573cf2a1262ad0b";
+      sha256 = "0a2c8be857398f202cafeb97db2a8ac963695e285137c8e7e7df40a9673f0c2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/trs/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/trs/firefox-82.0.3.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "b0947e9e8f45d848093805ff34a59d6c74a5559df91da5bf2255e2a24d386f95";
+      sha256 = "6c2d08829057be94edc1923b176fd52ee8cac5cc40e2484c38577865d179cde1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/uk/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/uk/firefox-82.0.3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "a4ff8ded991f00825e10ebe69be7183899d8bca0692eae4e2c60049e80d6710d";
+      sha256 = "b2b9b997a9bcbe12d3378cf18928ce8cb842a4c3962a0629f6abdd41340f36e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ur/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ur/firefox-82.0.3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "ee50b6ac2818824211c5fb871f19eb0582a5f50c3873139d6aed613d9a853197";
+      sha256 = "b91073657e73985254dde8542ca420087111de7297d7efa368204a45cd8c0932";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/uz/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/uz/firefox-82.0.3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "6c530bd3bb2d1a3072513b203afd44affadd4cd3e8f9136f2b7e4e942d7cbd27";
+      sha256 = "6e966992653870494fc3f44a44c8e3a4863b477c506e21c384905ecf7d79077e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/vi/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/vi/firefox-82.0.3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "ebfba78fe1778b0e724822adf1f448f005f4575c4c47eaf4d7347c808d2fe5a2";
+      sha256 = "8b1d1fdac04d9fd18a52497bdd2351c511fdd7480914b142e9e83a67b8c2d352";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/xh/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/xh/firefox-82.0.3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "e9e9b4b5cf377ab18c857242d1915ec0198393d35fd93c4ead4ac1d790db4d97";
+      sha256 = "74156e07e1a42d2cdcf8dd533f191673bb7acd6c14fffde0a2ca557cd15bb05e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/zh-CN/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/zh-CN/firefox-82.0.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "c7d8459ff0eaaac129f168c54454af90f9618c8515f9df2a35de578611700372";
+      sha256 = "4ff34ab97154152f0c1ae67640a7bfd51bf40fdcaa55635573cf9dd315566d5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/zh-TW/firefox-82.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/zh-TW/firefox-82.0.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "b9a3074700de458cd43721b683597f95f2ad81834a15d5ebde22dfc324d92fb3";
+      sha256 = "3c6e1b67a2e4132be1a506bbb1ff25c61519be5a1daa962ef629e0d1f8b670c9";
     }
     ];
 }

From c2a2081d8e3c7c4e3f2675b55a5fb553b17226e9 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Mon, 16 Nov 2020 00:33:39 -0500
Subject: [PATCH 2581/3942] starship: 0.46.2 -> 0.47.0

---
 pkgs/tools/misc/starship/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index d9eaa3f32726..073752cf97e5 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.46.2";
+  version = "0.47.0";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = pname;
     rev = "v${version}";
-    sha256 = "092nqxl3vdk8k589bv3g05c598k77f4wsxcgymfb1h1fc0lfzqs4";
+    sha256 = "0vdfdwsaqrah0hgvr62qsww7s5znb1rg5kk068qpf06lmyc4gd8w";
   };
 
   nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
     done
   '';
 
-  cargoSha256 = "1smz7084ppz79p8migpy0cqp6azf7sixv9ga65l2f3zfna7kbk78";
+  cargoSha256 = "01brsckfa2zy1aqs9vjwrn4w416i8b621bvkhicanz9q56xlnd77";
 
   checkFlags = [
     "--skip=directory_in_home"

From 1c682556bb1b0178eeef12d84068be55d2f6feaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Mon, 16 Nov 2020 07:57:59 +0100
Subject: [PATCH 2582/3942] android-file-transfer: 3.9 -> 4.0

---
 pkgs/tools/filesystems/android-file-transfer/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix
index 48e964bf687d..cd6c4302188a 100644
--- a/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }:
+{ stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase, qttools }:
 
 mkDerivation rec {
   pname = "android-file-transfer";
-  version = "3.9";
+  version = "4.0";
 
   src = fetchFromGitHub {
     owner = "whoozle";
     repo = "android-file-transfer-linux";
     rev = "v${version}";
-    sha256 = "1pwayyd5xrmngfrmv2vwr8ns2wi199xkxf7dks8fl9zmlpizg3c3";
+    sha256 = "11d4n4ybmc25gz18nlps3v11m3y8dw5bcb817gkik5m4nvqnbcsf";
   };
 
   nativeBuildInputs = [ cmake readline pkgconfig ];
-  buildInputs = [ fuse qtbase ];
+  buildInputs = [ fuse qtbase qttools ];
 
   meta = with stdenv.lib; {
     description = "Reliable MTP client with minimalistic UI";

From 89e35b3fd3fa8ab5be5f90c782a4ddc170de38ea Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 16 Nov 2020 08:47:14 +0100
Subject: [PATCH 2583/3942] =?UTF-8?q?pdfpc:=204.4.0=20=E2=86=92=204.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 4e172e5fd7c1..fc0bf62f1e9f 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.4.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     repo = product;
     owner = product;
     rev = "v${version}";
-    sha256 = "0vh2r32akvasdrghkaq7ard24r2qncp34jfiyshi3zxabm9bhfaa";
+    sha256 = "11n925c5jj3yfwnqkgxzqrmsrpqh8ls1g4idmqqzpsanpam1xvna";
   };
 
   nativeBuildInputs = [

From 1594881eb60f5750bee8012566eb63a2c13c54c5 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Mon, 16 Nov 2020 15:46:03 +0800
Subject: [PATCH 2584/3942] vulkan-validation-layers: Add output for generated
 include files

These are dependencies of other layers such as the layers in LunarG Vulkan Tools
---
 pkgs/development/tools/vulkan-validation-layers/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index ec696339fdcb..6e89f03e5137 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -51,6 +51,11 @@ stdenv.mkDerivation rec {
   pname = "vulkan-validation-layers";
   version = "1.2.141.0";
 
+  # If we were to use "dev" here instead of headers, the setupHook would be
+  # placed in that output instead of "out".
+  outputs = ["out" "headers"];
+  outputInclude = "headers";
+
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ValidationLayers";
@@ -78,6 +83,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DGLSLANG_INSTALL_DIR=${localGlslang}"
+    "-DBUILD_LAYER_SUPPORT_FILES=ON"
   ];
 
   # Help vulkan-loader find the validation layers

From 30c889090a3034a339a9acbd941f892ea1a60330 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 27 Oct 2020 14:02:44 +0300
Subject: [PATCH 2585/3942] pakcs: 2.2.0 -> 2.2.1

---
 pkgs/development/compilers/pakcs/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index 0183039b11d8..9f876ea914af 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -4,13 +4,14 @@
 , curl, git, unzip, gnutar, coreutils, sqlite }:
 
 let
-  name = "pakcs-2.2.0";
+  pname = "pakcs";
+  version = "2.2.1";
 
-  # Don't switch to development release without a reason, because its
-  # source updates without version bump. Prefer current release instead.
+  # Don't switch to "Current release" without a reason, because its
+  # source updates without version bump. Prefer last from "Older releases" instead.
   src = fetchurl {
-    url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz";
-    sha256 = "0c0a6cp9lwha5i90kv9ya2zi1ggnvkf4gwjfzbffgwwa77s2wz2l";
+    url = "https://www.informatik.uni-kiel.de/~pakcs/download/pakcs-${version}-src.tar.gz";
+    sha256 = "1jyg29j8r8pgcin7ixdya6c3zzfjdi66rghpwrfnkk133fz4iz7s";
   };
 
   curry-frontend = (haskellPackages.override {
@@ -26,7 +27,7 @@ let
     };
   }).curry-frontend;
 in stdenv.mkDerivation {
-  inherit name src;
+  inherit pname version src;
 
   buildInputs = [ swiProlog ];
   nativeBuildInputs = [ which makeWrapper ];

From 41f94c0b7225d5c44e11ae7a5275ca159327dcc8 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 20 Oct 2020 12:17:28 +0300
Subject: [PATCH 2586/3942] lazpaint: 7.1.4 -> 7.1.5

---
 pkgs/applications/graphics/lazpaint/default.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix
index 3f8d507e9927..e53c36b59cd9 100644
--- a/pkgs/applications/graphics/lazpaint/default.nix
+++ b/pkgs/applications/graphics/lazpaint/default.nix
@@ -7,24 +7,24 @@ let
   bgrabitmap = fetchFromGitHub {
     owner = "bgrabitmap";
     repo = "bgrabitmap";
-    rev = "v11.2.4";
-    sha256 = "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md";
+    rev = "v11.2.5";
+    sha256 = "0w5pdihsxn039kalkf4cx23j69hz5r09qmhd358h2n74irv1r3x1";
   };
   bgracontrols = fetchFromGitHub {
     owner = "bgrabitmap";
     repo = "bgracontrols";
-    rev = "v6.9";
-    sha256 = "0hwjlqlwqs4fqxlgay84hccs1lm3c6i9nmq9sxzrip410mggnjyw";
+    rev = "v7.0";
+    sha256 = "0qz3cscrc9jvhrix1hbmzhdxv6mxk0mz9azr46canflsydda8fjy";
   };
 in stdenv.mkDerivation rec {
   pname = "lazpaint";
-  version = "7.1.4";
+  version = "7.1.5";
 
   src = fetchFromGitHub {
     owner = "bgrabitmap";
     repo = "lazpaint";
     rev = "v${version}";
-    sha256 = "19b0wrjjyvz3g2d2gdsz8ihc1clda5v22yb597an8j9sblp9m0nf";
+    sha256 = "0bpk3rlqzbxvgrxmrzs0hcrgwhsqnpjqv1kdd9cp09knimmksvy5";
   };
 
   nativeBuildInputs = [ lazarus fpc makeWrapper ];
@@ -56,10 +56,6 @@ in stdenv.mkDerivation rec {
     # Python is needed for scripts
     makeWrapper $out/share/lazpaint/lazpaint $out/bin/lazpaint \
       --prefix PATH : ${stdenv.lib.makeBinPath [ python3 ]}
-
-    substituteInPlace $out/share/applications/lazpaint.desktop \
-      --replace /usr/share/pixmaps/lazpaint.png $out/share/pixmaps/lazpaint.png \
-      --replace /usr/share/lazpaint/lazpaint $out/bin/lazpaint
   '';
 
   meta = with stdenv.lib; {

From c2acc89018c195581e76e473e1c59644ad5f2777 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 27 Oct 2020 12:53:31 +0300
Subject: [PATCH 2587/3942] openmpt123: 0.5.2 -> 0.5.3

---
 pkgs/applications/audio/openmpt123/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index 0646407582ed..91bf47dddd6b 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/pkgs/applications/audio/openmpt123/default.nix
@@ -2,14 +2,14 @@
 , usePulseAudio ? config.pulseaudio or false, libpulseaudio }:
 
 let
-  version = "0.5.2";
+  version = "0.5.3";
 in stdenv.mkDerivation {
   pname = "openmpt123";
   inherit version;
 
   src = fetchurl {
     url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
-    sha256 = "1cwpc4j90dpxa2siia68rg9qwwm2xk6bhxnslfjj364507jy6s4l";
+    sha256 = "1f155yf5v57dwhzb7z0kh67lckr3yq4x8040dm54qgbxw582la77";
   };
 
   enableParallelBuilding = true;

From c1407066c4967c191b4b1c648b912cd62c518180 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Mon, 16 Nov 2020 11:41:34 +0000
Subject: [PATCH 2588/3942] metamath: 0.182 -> 0.193

---
 pkgs/development/interpreters/metamath/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index 66352cfdda4b..cccb7434797a 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation {
   pname = "metamath";
-  version = "0.182";
+  version = "0.193";
 
   buildInputs = [ autoreconfHook ];
 
   src = fetchFromGitHub {
     owner = "metamath";
     repo = "metamath-exe";
-    rev = "5df616efe4119ff88daf77e7041d45b6fa39c578";
-    sha256 = "0amjdgy42c7jypf6sz98iczlxcyl9bqx67ws1q8w2zdqk2izsyjp";
+    rev = "f973c81222ebe36580a24f0fa7bbb600990af7d6";
+    sha256 = "1s9hyknfvhj86g3giayyf3dxzg23iij0rs7bdvj075v9qbyhqn9b";
   };
 
   meta = with stdenv.lib; {

From 13be37662d7e05c2e950ff849cb3745f14632925 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 16 Nov 2020 13:02:48 +0100
Subject: [PATCH 2589/3942] kernel config: explicitly enable CONFIG_IPV6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We currently build CONFIG_IPV6=m.

This seems to be not really well-supported in mainline kernels - see
https://lore.kernel.org/netdev/20201115224509.2020651-1-flokli@flokli.de/T/#u

Compiling it as a module doesn't give too much benefit - even for people
who did explicitly set `enableIPv6` to false, the `ipv6` module was
still loaded, as soon as another module was loaded that requires it
(bridge,br_netfilter,wireguard,ip6table_mangle,sctp,…).

By compiling it in, we only loose the possibility to not add it to
`boot.kernelModules` anymore (as it's part of the kernel directly). The
space savings are negligible.

People wanting to disable IPv6 still get the appropriate sysctls and
options set (while having the kernel code loaded), nothing is really
changing here.
---
 nixos/modules/tasks/network-interfaces.nix      | 1 -
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index e5bd57753683..53c54c2e3980 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1062,7 +1062,6 @@ in
       ];
 
     boot.kernelModules = [ ]
-      ++ optional cfg.enableIPv6 "ipv6"
       ++ optional hasVirtuals "tun"
       ++ optional hasSits "sit"
       ++ optional hasBonds "bonding";
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 8bd5d0212044..94558b890de1 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -132,6 +132,7 @@ let
       IP_MROUTE_MULTIPLE_TABLES   = yes;
       IP_MULTICAST                = yes;
       IP_MULTIPLE_TABLES          = yes;
+      IPV6                        = yes;
       IPV6_ROUTER_PREF            = yes;
       IPV6_ROUTE_INFO             = yes;
       IPV6_OPTIMISTIC_DAD         = yes;

From 08f33ba4fb96a5933aa918a608e34bb6e52e2888 Mon Sep 17 00:00:00 2001
From: upkeep-bot <foo@bar.com>
Date: Mon, 16 Nov 2020 12:10:04 +0000
Subject: [PATCH 2590/3942] spotify-unwrapped: 1.1.42.622.gbd112320-37 ->
 1.1.46.916.g416cacf1

---
 pkgs/applications/audio/spotify/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 6fd52834b007..ff44f14476f1 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -10,14 +10,14 @@ let
   # If an update breaks things, one of those might have valuable info:
   # https://aur.archlinux.org/packages/spotify/
   # https://community.spotify.com/t5/Desktop-Linux
-  version = "1.1.42.622.gbd112320-37";
+  version = "1.1.46.916.g416cacf1";
   # To get the latest stable revision:
   # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
   # To get general information:
   # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
   # More examples of api usage:
   # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
-  rev = "42";
+  rev = "43";
 
   deps = [
     alsaLib
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
   # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
-    sha512 = "06371c6a285aba916a779cd9f2a933f97db8fb38393545baa94c8984302e003c559af7b1b35afd7df5f2c35e379e2cb80c00facf527bc22df09061cdb67d9d7a";
+    sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1";
   };
 
   buildInputs = [ squashfsTools makeWrapper ];

From 90126c3e48c01c910c5c6e6162a5414ed904f9ca Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 8 Nov 2020 11:23:30 +0100
Subject: [PATCH 2591/3942] vdirsyncer: delete default.nix, point vdirsyncer to
 stable.nix

TLDR: default.nix was pointing to an unmaintained code base whereas stable.nix is up-to-date and maintained.

History
1. At first their was one Python version of vdirsyncer that had been working fine for years. Then, maintenance decreased and the package was marked as broken in nixpkgs.
2. The original author (@untitaker on github.com) of vdirsyncer decided to re-implement (part of) vdirsyncer in Rust. Nixpkgs made `vdirsyncer` point to the Rust version and renamed the Python historical version to `vdirsyncerStable`.
3. Eventually, @untitaker gave up on the Rust version.
4. Someone else (@WhyNotHugo on github.com) decided to take over maintenance of the Python version.
5.  Mario Rodas (@marsam on github) and Damien Cassou updated the `vdirsyncerStable` to point to the work of @WhyNotHugo and mark the package as working again.
---
 .../python-modules/vdirsyncer/default.nix     | 109 ------------------
 pkgs/top-level/python-packages.nix            |   5 +-
 2 files changed, 1 insertion(+), 113 deletions(-)
 delete mode 100644 pkgs/development/python-modules/vdirsyncer/default.nix

diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix
deleted file mode 100644
index 1a5494634bb0..000000000000
--- a/pkgs/development/python-modules/vdirsyncer/default.nix
+++ /dev/null
@@ -1,109 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, isPy27
-, fetchpatch
-, rustPlatform
-, pkg-config
-, openssl
-, CoreServices
-, Security
-, click
-, click-log
-, click-threading
-, requests_toolbelt
-, requests
-, requests_oauthlib # required for google oauth sync
-, atomicwrites
-, milksnake
-, shippai
-, hypothesis
-, pytest
-, pytest-localserver
-, pytest-subtesthack
-, setuptools_scm
-}:
-
-# Packaging documentation at:
-# https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst
-buildPythonPackage rec {
-  version = "unstable-2018-08-05";
-  pname = "vdirsyncer";
-  name = "${pname}-${version}";
-  disabled = isPy27;
-
-  src = fetchFromGitHub {
-    owner = "spk";
-    repo = pname;
-    # fix-build-style branch, see https://github.com/pimutils/vdirsyncer/pull/798
-    rev = "2c62d03bd73f8b44a47c2e769ade046697896ae9";
-    sha256 = "1q6xvzz5rf5sqdaj3mdvhpgwy5b16isavgg7vardgjwqwv1yal28";
-  };
-
-  native = rustPlatform.buildRustPackage {
-    name = "${name}-native";
-    inherit src;
-    sourceRoot = "source/rust";
-    cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d";
-    nativeBuildInputs = [ pkg-config ];
-    buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
-  };
-
-  propagatedBuildInputs = [
-    click click-log click-threading
-    requests_toolbelt
-    requests
-    requests_oauthlib # required for google oauth sync
-    atomicwrites
-    milksnake
-    shippai
-  ];
-
-  nativeBuildInputs = [
-    setuptools_scm
-  ];
-
-  checkInputs = [
-    hypothesis
-    pytest
-    pytest-localserver
-    pytest-subtesthack
-  ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/pimutils/vdirsyncer/commit/7b636e8e40d69c495901f965b9c0686513659e44.patch";
-      sha256 = "0vl942ii5iad47y63v0ngmhfp37n30nxyk4j7h64b95fk38vfwx9";
-    })
-  ];
-
-  postPatch = ''
-    # see https://github.com/pimutils/vdirsyncer/pull/805
-    substituteInPlace setup.cfg --replace --duration --durations
-
-    # for setuptools_scm:
-    echo 'Version: ${version}' >PKG-INFO
-
-    sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py
-
-    # fixing test
-    sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py
-  '';
-
-  preBuild = ''
-    mkdir -p rust/target/release
-    ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/
-  '';
-
-  checkPhase = ''
-    rm -rf vdirsyncer
-    make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/unit/utils/test_vobject.py::test_replace_uid --deselect=tests/unit/sync/test_sync.py::TestSyncMachine" test
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/pimutils/vdirsyncer";
-    description = "Synchronize calendars and contacts";
-    maintainers = with maintainers; [ matthiasbeyer gebner ];
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d9862a193e45..f90af2c5d761 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7500,10 +7500,7 @@ in {
 
   vdf = callPackage ../development/python-modules/vdf { };
 
-  vdirsyncer = callPackage ../development/python-modules/vdirsyncer {
-    inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security;
-    inherit (pkgs) pkg-config openssl rustPlatform;
-  };
+  vdirsyncer = callPackage ../development/python-modules/vdirsyncer/stable.nix { };
 
   vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { };
 

From 452043842a107bfce4d0a1874f98f6af95082a78 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 8 Nov 2020 11:26:42 +0100
Subject: [PATCH 2592/3942] vdirsyncer: rename stable.nix to default.nix

---
 .../python-modules/vdirsyncer/{stable.nix => default.nix}     | 0
 pkgs/top-level/python-packages.nix                            | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/python-modules/vdirsyncer/{stable.nix => default.nix} (100%)

diff --git a/pkgs/development/python-modules/vdirsyncer/stable.nix b/pkgs/development/python-modules/vdirsyncer/default.nix
similarity index 100%
rename from pkgs/development/python-modules/vdirsyncer/stable.nix
rename to pkgs/development/python-modules/vdirsyncer/default.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f90af2c5d761..c096e5f4cbe4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7500,9 +7500,9 @@ in {
 
   vdf = callPackage ../development/python-modules/vdf { };
 
-  vdirsyncer = callPackage ../development/python-modules/vdirsyncer/stable.nix { };
+  vdirsyncer = callPackage ../development/python-modules/vdirsyncer { };
 
-  vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { };
+  vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer { };
 
   vega = callPackage ../development/python-modules/vega { };
 

From 89fae7b7c7dc68726a216321162811ec93879635 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 8 Nov 2020 11:32:53 +0100
Subject: [PATCH 2593/3942] vdirsyncerStable: deprecate

---
 pkgs/top-level/aliases.nix         | 1 +
 pkgs/top-level/all-packages.nix    | 2 --
 pkgs/top-level/python-packages.nix | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f8228f457012..05e3f83d9d61 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -643,6 +643,7 @@ mapAliases ({
   v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages";
   valadoc = throw "valadoc was deprecated on 2019-10-10: valadoc was merged into vala 0.38";
   vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26
+  vdirsyncerStable  = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
   vimbWrapper = vimb; # added 2015-01
   vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05
   vimprobable2-unwrapped = vimprobable2; # added 2019-12-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3563968d8d7f..956e6d30e4c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24128,8 +24128,6 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
   vdirsyncer = with python3Packages; toPythonApplication vdirsyncer;
 
-  vdirsyncerStable = with python3Packages; toPythonApplication vdirsyncerStable;
-
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 
   verbiste = callPackage ../applications/misc/verbiste {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c096e5f4cbe4..e867e5df84f8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7502,8 +7502,6 @@ in {
 
   vdirsyncer = callPackage ../development/python-modules/vdirsyncer { };
 
-  vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer { };
-
   vega = callPackage ../development/python-modules/vega { };
 
   vega_datasets = callPackage ../development/python-modules/vega_datasets { };

From b8065eeaef65ffdc95272dede63156e18293c4c0 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 13 Nov 2020 17:20:22 +0100
Subject: [PATCH 2594/3942] youtube-dl: 2020.11.01.1 -> 2020.11.12

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 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 7de5f2369bc0..d3d6118a9668 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2020.11.01.1";
+  version = "2020.11.12";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "06lhba4b9bm6f5yqrb5xvdr0l5shwd95djf9nlpg86prr5xihqks";
+    sha256 = "0c98sjaj6mvxnjp0qnwqbr6fibgb4dlizad2xvkiswf4g4h0pc5f";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];

From 4c1590a86e6a99099f52f5a32045215db90f0a4c Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Mon, 16 Nov 2020 14:06:36 +0100
Subject: [PATCH 2595/3942] dbeaver: 7.2.4 -> 7.2.5

---
 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 1a7f240ffda8..4f1d43911818 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "dbeaver-ce";
-  version = "7.2.4";
+  version = "7.2.5";
 
   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 = "sha256-RsXLznTz/U23e77xzyINi8HVuGqR4TrPaf+w++zPOH4=";
+    sha256 = "sha256-CRyAeizhaSDmVFGRhrYIW0Ofli9HnkgItiAGRJAETQM=";
   };
 
   installPhase = ''

From 654e49be539310987af8b84d34d45b8b653d2ebf Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 16 Nov 2020 14:07:22 +0100
Subject: [PATCH 2596/3942] documize-community: 3.8.0 -> 3.8.1

It seems as it was forgotten to add a git tag (I already reported that)
and the relevant changelogs, however the website and my self-hosted
instance notified about the new release.

It makes sense though to update now since this release fixes the
integration of `drawio` into the wiki.

For the sake of completeness, all changes made since `v3.8.0`
can be viewed in https://github.com/documize/community/compare/v3.8.0...30d12ba756101a3d360e874cc8fad2a53ec558ed
---
 pkgs/servers/documize-community/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix
index 09c511b4d6f2..29ad2ef9174d 100644
--- a/pkgs/servers/documize-community/default.nix
+++ b/pkgs/servers/documize-community/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "documize-community";
-  version = "3.8.0";
+  version = "3.8.1";
 
   src = fetchFromGitHub {
     owner = "documize";
     repo = "community";
-    rev = "v${version}";
-    sha256 = "0jrqab0c2nnw8632g1f6zll3dycn7xyk01ycmn969i5qxx70am50";
+    rev = "30d12ba756101a3d360e874cc8fad2a53ec558ed";
+    sha256 = "sha256-URQtOXwMavPD9/9n2YO1Z9Rg/i26gYb53OC8WEpbelk=";
   };
 
   vendorSha256 = null;

From 8e995109f28c0283c32939dd67273fbbd7e59807 Mon Sep 17 00:00:00 2001
From: Mazurel <mateusz.mazur@yahoo.com>
Date: Tue, 10 Nov 2020 12:12:53 +0100
Subject: [PATCH 2597/3942] devour: init at 12

---
 pkgs/tools/X11/devour/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/X11/devour/default.nix

diff --git a/pkgs/tools/X11/devour/default.nix b/pkgs/tools/X11/devour/default.nix
new file mode 100644
index 000000000000..4f39c0a98904
--- /dev/null
+++ b/pkgs/tools/X11/devour/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, libX11 }:
+
+stdenv.mkDerivation rec {
+  pname = "devour";
+  version = "12";
+
+  src = fetchFromGitHub {
+    owner = "salman-abedin";
+    repo = "devour";
+    rev = version;
+    sha256 = "1qq5l6d0fn8azg7sj7a4m2jsmhlpswl5793clcxs1p34vy4wb2lp";
+  };
+
+  installPhase = ''
+    install -Dm555 -t $out/bin devour
+  '';
+
+  buildInputs = [ libX11 ];
+
+  meta = with stdenv.lib; {
+    description = "Devour hides your current window when launching an external program";
+    longDescription = "Devour hides your current window before launching an external program and unhides it after quitting";
+    homepage = "https://github.com/salman-abedin/devour";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ mazurel ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8cb08bce062d..b2f3be85b594 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -226,6 +226,8 @@ in
 
   device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {};
 
+  devour = callPackage ../tools/X11/devour {};
+
   diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
 
   dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;

From 71998ddc339c9b5efafbe4d261bb0773ee8cff55 Mon Sep 17 00:00:00 2001
From: Vika <vika@fireburn.ru>
Date: Mon, 16 Nov 2020 16:13:09 +0300
Subject: [PATCH 2598/3942] rspamd: fix builds on non-x86_64-linux platforms

LuaJIT is built in rspamd only on x86_64-linux, and LuaJIT support
became enabled by default in 2.6, breaking builds without it. This
commit explicitly disables LuaJIT support on non-x86_64 architectures.
---
 pkgs/servers/mail/rspamd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 995dbf2e16d6..71205ee093a4 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
     "-DLOGDIR=/var/log/rspamd"
     "-DLOCAL_CONFDIR=/etc/rspamd"
     "-DENABLE_JEMALLOC=ON"
-  ] ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON";
+  ] ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"
+  ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF";
 
   passthru.tests.rspamd = nixosTests.rspamd;
 

From 9f9134c754f046338588e8f2316a6fd0787bcc4f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 16 Nov 2020 14:22:08 +0000
Subject: [PATCH 2599/3942] =?UTF-8?q?sbt:=201.4.2=20=E2=86=92=201.4.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 dbace29d7e74..ec97ba4acb74 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   pname = "sbt";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchurl {
     url =
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
-    sha256 = "1dw4l91sw4ybqxjid1hsb6r33ka5bl85rfdrbsr9m5vxl82a3mmc";
+    sha256 = "17h1lqnas276515y49fvpcysf8hkkrqq60kwbvyz68yvdrs5rrwr";
   };
 
   patchPhase = ''

From bc714f86a515a558c2f595e1a090e882d08bd7ca Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 16 Nov 2020 11:05:43 +0100
Subject: [PATCH 2600/3942] ocamlPackages.ca-certs: init at 0.1.2

---
 .../ocaml-modules/ca-certs/default.nix        | 29 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ca-certs/default.nix

diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix
new file mode 100644
index 000000000000..136187e9d3c4
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ca-certs/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildDunePackage, fetchurl
+, bos, fpath, rresult, ptime, mirage-crypto, x509
+}:
+
+buildDunePackage rec {
+  pname = "ca-certs";
+  version = "0.1.2";
+
+  minimumOCamlVersion = "4.07";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz";
+    sha256 = "10bbqbrsqcmslz56zc5407knalh3kqypbm7lblnzzbidbapa9wpz";
+  };
+
+  useDune2 = true;
+
+  propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 ];
+
+  # tests need access to network and systemwide ca cert chain
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Detect root CA certificates from the operating system";
+    maintainers = [ maintainers.sternenseemann ];
+    license = licenses.isc;
+    homepage = "https://github.com/mirage/ca-certs";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 7fd321425082..9cc95dd4f56b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -70,6 +70,8 @@ let
 
     bos = callPackage ../development/ocaml-modules/bos { };
 
+    ca-certs = callPackage ../development/ocaml-modules/ca-certs { };
+
     camlidl = callPackage ../development/tools/ocaml/camlidl { };
 
     camlp4 =

From 52d7e318743e8e7190dcad14ffb26228b8d3155a Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Sun, 27 Sep 2020 23:02:30 +0200
Subject: [PATCH 2601/3942] nodePackages.hsd: init at 2.2.0

---
 pkgs/development/node-packages/default.nix        | 4 ++++
 pkgs/development/node-packages/node-packages.json | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix
index d7482e7c6b89..908b48968456 100644
--- a/pkgs/development/node-packages/default.nix
+++ b/pkgs/development/node-packages/default.nix
@@ -69,6 +69,10 @@ let
       meta.broken = since "10";
     };
 
+    hsd = super.hsd.override {
+      buildInputs = [ self.node-gyp-build pkgs.unbound ];
+    };
+
     insect = super.insect.override (drv: {
       nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ];
     });
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 0e46f65c7823..cc440747ac73 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -94,6 +94,7 @@
 , "html-minifier"
 , "htmlhint"
 , "http-server"
+, "hsd"
 , "hueadm"
 , "inliner"
 , "imapnotify"

From 64c7186a28b89629201a55b5c79c45c9efb538ac Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Sun, 27 Sep 2020 23:02:49 +0200
Subject: [PATCH 2602/3942] nodePackages.hs-airdrop: init at 0.9.0

---
 pkgs/development/node-packages/node-packages.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index cc440747ac73..de53640a4313 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -95,6 +95,7 @@
 , "htmlhint"
 , "http-server"
 , "hsd"
+, "hs-airdrop"
 , "hueadm"
 , "inliner"
 , "imapnotify"

From c282ed87ae0332fd76f2d79261aec63108ef06c2 Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Sun, 27 Sep 2020 23:06:12 +0200
Subject: [PATCH 2603/3942] nodePackages.hs-client: init at 0.0.9

---
 pkgs/development/node-packages/node-packages.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index de53640a4313..4ee0b400e4dc 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -96,6 +96,7 @@
 , "http-server"
 , "hsd"
 , "hs-airdrop"
+, "hs-client"
 , "hueadm"
 , "inliner"
 , "imapnotify"

From 68761cb0160e7bd49dea2689ba114b3dabf20f62 Mon Sep 17 00:00:00 2001
From: Alex Good <alex.good@mypulse.ai>
Date: Mon, 16 Nov 2020 16:27:38 +0000
Subject: [PATCH 2604/3942] wrapProgram for phpdbg in pkgs.php*

---
 pkgs/development/interpreters/php/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index efd9441e9092..3730a61a1ea0 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -126,6 +126,10 @@ let
                   if test -e $out/bin/php-fpm; then
                     wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib
                   fi
+
+                  if test -e $out/bin/phpdbg; then
+                    wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib
+                  fi
                 '';
               };
             in

From a9a1423377ba23981361af583a648d00f44b74e6 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 16 Nov 2020 17:20:50 +0100
Subject: [PATCH 2605/3942] gitea: 1.12.5 -> 1.12.6

https://github.com/go-gitea/gitea/releases/tag/v1.12.6
---
 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 7c86318abac6..29c8fac962bf 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 
 buildGoPackage rec {
   pname = "gitea";
-  version = "1.12.5";
+  version = "1.12.6";
 
   src = fetchurl {
     url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
-    sha256 = "03p4nn7xklqr43h4d98qvv2xc14ly7mbb90njnxljj64yh7svw4n";
+    sha256 = "sha256-mEhtFcWLUhd+WK8wDhrGr6RvL4X2G42W6su/c8zxGR4=";
   };
 
   unpackPhase = ''

From edd3e40f91fa2535981706f45bb67253ccb50813 Mon Sep 17 00:00:00 2001
From: Basile Henry <bjm.henry@gmail.com>
Date: Mon, 16 Nov 2020 15:22:06 +0000
Subject: [PATCH 2606/3942] Make autogen.man reproducible

Keep the date format similar to what it is when we are not using the
MAN_PAGE_DATE env var. The man pages scripts seem to use different
formats in different pages, so we use the most common format for all.
---
 pkgs/development/tools/misc/autogen/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 87b8bde58add..23235499cfbd 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -42,6 +42,10 @@ stdenv.mkDerivation rec {
     guile libxml2
   ];
 
+  preConfigure = ''
+    export MAN_PAGE_DATE=$(date '+%Y-%m-%d' -d "@$SOURCE_DATE_EPOCH")
+  '';
+
   configureFlags =
     [
       # Make sure to use a static value for the timeout. If we do not set a value

From bb15fa742780543ef87df2e6ea7e1747eadfc82b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 16 Nov 2020 12:33:18 -0500
Subject: [PATCH 2607/3942] linux: 5.10-rc3 -> 5.10-rc4

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 4cc8e38915b9..959d0f33d009 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.10-rc3";
+  version = "5.10-rc4";
   extraMeta.branch = "5.10";
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "08zwz6rjpd6nzhzs1hwix3709w22495sxcs0ajizyq50pydn77vd";
+    sha256 = "1fc68lka76n1dygyn914c4vhxqzwv951pp4kdkrr0jv5nvdnyplb";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 1c1b18ba71bfd8f381bc5695a48762e061f38a81 Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Sat, 14 Nov 2020 18:43:15 +0000
Subject: [PATCH 2608/3942] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 112 ++++++++++++++--------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index b5cab43d31bd..dc4235dab2c6 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2020-11-04";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "1ec573bf0df6cbc5eef8b593f93081e4c1837c1b";
-      sha256 = "0h4aa3bd0wc9hz8af66biv9gcxw1m3bvp87jnc1jp3m3qxk93knl";
+      rev = "48fe0dd4f629bb1282277ba8a6757a84c13a4dda";
+      sha256 = "192wb50cv7yv6c4gmjmlmh8b5891v51xcxm396sm4d5y9pzw52mc";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
   };
@@ -221,12 +221,12 @@ let
 
   barbar-nvim = buildVimPluginFrom2Nix {
     pname = "barbar-nvim";
-    version = "2020-11-13";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "romgrk";
       repo = "barbar.nvim";
-      rev = "16fee1a0309910645f28caa1a3cac607a4ea47a3";
-      sha256 = "1h5cn9z9446pjzdpr4nnay7g4cfyl4cf541nmy6r0v7mq68zfijc";
+      rev = "2122af3641f138281a351611861900ca823a2324";
+      sha256 = "1wqkq6cwhwbr6cypn05mbb2n7ry6b5b7ic7ad8s1hmc4gxgfxk6h";
     };
     meta.homepage = "https://github.com/romgrk/barbar.nvim/";
   };
@@ -606,12 +606,12 @@ let
 
   Coqtail = buildVimPluginFrom2Nix {
     pname = "Coqtail";
-    version = "2020-11-09";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "whonore";
       repo = "Coqtail";
-      rev = "42625407e022ff3cd56c53ac87270ad9fb70f605";
-      sha256 = "0rm5vvdzl63lm76fmp52l51619bd62gk7ddg1j8vzb074nlyc66m";
+      rev = "5e40da6c7119bfc31b3737d7ced2b8098f56a99f";
+      sha256 = "0ggp8sw1dym9zlr8q0qhshjdgh83wr91cv5yh9b6im08rf89ddxf";
     };
     meta.homepage = "https://github.com/whonore/Coqtail/";
   };
@@ -1487,12 +1487,12 @@ let
 
   gruvbox-community = buildVimPluginFrom2Nix {
     pname = "gruvbox-community";
-    version = "2020-10-04";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "gruvbox-community";
       repo = "gruvbox";
-      rev = "9e71159ffa93be1e772d2cb3c78ee940f7b308ba";
-      sha256 = "0n3jzzjbfrs3r26bagry3pvqcy2asb1jkcfqvabmycs6y6w8sx01";
+      rev = "2636a0344d3fbacc62d9d914a456fcfdba8ca4cb";
+      sha256 = "1w9j97g3dzadwnqyal1zw12ia61b512hz8mhywqy5xq6v9f6zkw6";
     };
     meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
   };
@@ -1956,12 +1956,12 @@ let
 
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
-    version = "2020-11-13";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "fdccae8c9dc243d58f48c428b99be4920f89d1a0";
-      sha256 = "0wg0nrjbr8my98ivaawj3khyx1fkkgbafwhmq6mlb8j8aj47pigx";
+      rev = "543ee323a4a63fd32cc17dc57edea9c00962bb12";
+      sha256 = "1x75hd3ibnlrqnshhhrcg1z3i6z0gk58sfvjys22dvirv1r6lg37";
     };
     meta.homepage = "https://github.com/itchyny/lightline.vim/";
   };
@@ -2580,12 +2580,12 @@ let
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2020-09-07";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "60133c47e0fd82556d7ca092546ebfa8d047466e";
-      sha256 = "15ysbbvxlgy1qx8rjv2i9pgjshldcs3m1ff0my2y5mnr3cpqb3s6";
+      rev = "bd7127daf7129b0f81d44980825da54ec0461ebe";
+      sha256 = "0rsv37axgkgmikys2c75ddszwv0nb9pi7mzjjciarq7fffbjjjyn";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -3413,8 +3413,8 @@ let
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "3e58e1ab7d4c80fec7d9b02e3f27503bd72f21ff";
-      sha256 = "0ilxdffipa7mcaam1x21h0k578q2mq76a4ajnmmmis7066jk39z4";
+      rev = "24057365dae52e76d6f2afb67f99eb94b51b40fc";
+      sha256 = "00kk9yshrscvyyvaix7dk4l869xj3fhvss224gxzdivjn345bf4k";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -3902,12 +3902,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2020-11-10";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "731bdb11d2f57365e02bdb8adaeb59a8b93db27d";
-      sha256 = "1b6l1460319rnl4p3zzpz3ngc114bfyqicbdyq6pk4sy5hbn15j1";
+      rev = "536667191d5bdc0afa3a18d7df229731e778815e";
+      sha256 = "0ay2bkqj92gzp2r36f5s92rb9gnhwkf09cx4y67gvd4b6rbqrkwi";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
   };
@@ -4130,12 +4130,12 @@ let
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2020-11-07";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "45a91bf706e9dcf85172c126bbac8964e209a4ae";
-      sha256 = "1b7sb9dqdy48w28pjhh9vsr20w0gd5lillrlynskywab9x99ifkx";
+      rev = "107cbef4862e95fb7cb268dc8367769eddcb5f0c";
+      sha256 = "05bmbf8h161vgqqg5cnlggprj0m4fm420xdslb37ad1rkv45szzd";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -4694,12 +4694,12 @@ let
 
   vim-floaterm = buildVimPluginFrom2Nix {
     pname = "vim-floaterm";
-    version = "2020-11-10";
+    version = "2020-11-13";
     src = fetchFromGitHub {
       owner = "voldikss";
       repo = "vim-floaterm";
-      rev = "3c34e84282f542be7dc75c3d2154c1f25df4a47e";
-      sha256 = "1c48s8655fg1bddnzxpqfl8cxdk3dsc4a45ixsc7s910bk8rlxn6";
+      rev = "71334d9279b8b1d41c4c438d2aaca07316b0b2ef";
+      sha256 = "1djwzqc67v7j5b3h248dvbqxbkqdl9lkg2x64mynliwfavvzm1z7";
     };
     meta.homepage = "https://github.com/voldikss/vim-floaterm/";
   };
@@ -4838,12 +4838,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-11-13";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "e3d6ada0530190300a5227bb0b417ee71b994cc2";
-      sha256 = "1kyyidicghhgnsc9x2gynnxh4x6yzjdg5d633sb74xkkhgvxx9yn";
+      rev = "3cdd4c874f361a316f98e56e8f5746e2f1c292ef";
+      sha256 = "0abvwgh8ikc5rgskszq9jzkp80myvkap98q2b4zwv2pfib48q3kz";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -5174,12 +5174,12 @@ let
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
     pname = "vim-javacomplete2";
-    version = "2020-10-27";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "e25876fd386bb2feda519335587c22e493c78541";
-      sha256 = "0g92806r8g243apl0g4i1c9mhmqyy2n10776alii5bgyk6jblh82";
+      rev = "4ab52b4b3d57568d7545bf7a3094f63336714d81";
+      sha256 = "060jrjhl4zlb3z4pisqhjs2xh0livjc95qyrcvdhnnk7cjl3v5i2";
     };
     meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/";
   };
@@ -5439,24 +5439,24 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2020-11-08";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "c8f04821a9b92fd5675ed9ad54c59bec9af37eaf";
-      sha256 = "1m6cr2c3srnddxmmly8icnx1jyzh5cjxf9sffp3f871cgq954jy7";
+      rev = "b3d239f71c02b274fcb74ebc57b836810f978da9";
+      sha256 = "1vs50npx5bx13wmlbfl7dk48ifvn0kn1l4qal14sdzlv56y6hy57";
     };
     meta.homepage = "https://github.com/natebosch/vim-lsc/";
   };
 
   vim-lsp = buildVimPluginFrom2Nix {
     pname = "vim-lsp";
-    version = "2020-11-04";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "594751093da71a662c0ef371ee60c05c1c96b63b";
-      sha256 = "0wanchva7g455v2bic6sfsh9wdcn0x644k9bfsbr14s8kfwpyair";
+      rev = "45babeb9474e007935f279fcdb3fa95bcf63673e";
+      sha256 = "0298x2cz5z4d2z7b14ryp289d5pxazi8ccqjzqr6plihg5cv1pxz";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
   };
@@ -6687,12 +6687,12 @@ let
 
   vim-terraform = buildVimPluginFrom2Nix {
     pname = "vim-terraform";
-    version = "2020-10-10";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "6fd491d6a2ae40fef3aa6c414e096ce07664f030";
-      sha256 = "0iczgn4ifhlzszgwv1w43w7qzrf1pp8zpfv4vdpm82mli58xlnhc";
+      rev = "a6be9fea8757f6672397cadfb2784230914130c6";
+      sha256 = "1c8k170hly5y82f9a1ddqm70afab2hb6hcj45s5db1nkh486p0a0";
     };
     meta.homepage = "https://github.com/hashivim/vim-terraform/";
   };
@@ -6916,12 +6916,12 @@ let
 
   vim-twiggy = buildVimPluginFrom2Nix {
     pname = "vim-twiggy";
-    version = "2020-10-06";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "sodapopcan";
       repo = "vim-twiggy";
-      rev = "efe1d29979bd2b65d22cf49f08524d6e27e5244b";
-      sha256 = "0xqn39apmy6d8vqzbzvv6ic7p2pd5lpdgd4jay1afg2q73yi1rbv";
+      rev = "305fa5ab43514b76b15a57596bc514c072b9cdda";
+      sha256 = "1hn42fm9a2dvxwml17j5jvd8758s71dlipspn5vi9l545cg94jjf";
     };
     meta.homepage = "https://github.com/sodapopcan/vim-twiggy/";
   };
@@ -6976,12 +6976,12 @@ let
 
   vim-visual-multi = buildVimPluginFrom2Nix {
     pname = "vim-visual-multi";
-    version = "2020-10-27";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "812ca5cff230cc0a21cce6b9d71db3868a6d6f85";
-      sha256 = "1si42l80axlilbr65x8zw2ivyn9f8y9x1yg77xi4rjqpqj7af5ka";
+      rev = "3b9c8c630daba920741f1fbf6696b7d32d020660";
+      sha256 = "0hrsz624flscp8m6wjbr4sfqybw20ssbc78jdrh3q3n92gz1d50s";
     };
     meta.homepage = "https://github.com/mg979/vim-visual-multi/";
   };
@@ -7000,12 +7000,12 @@ let
 
   vim-vsnip = buildVimPluginFrom2Nix {
     pname = "vim-vsnip";
-    version = "2020-11-08";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "vim-vsnip";
-      rev = "5fedeec956359d05496ad92fb6fd02231aeb4c76";
-      sha256 = "18k44h3fvg8vm8dwxy78jpl1zv8sbr0kiviyxm03hy3n6sb2czlg";
+      rev = "67b7c4cf6de5ed180847581b65797f5a208d07f5";
+      sha256 = "1d7i4svffgzbnd0qy8lm1nagjfc4rp4x4r6a0y6y0rq8clyv1x27";
     };
     meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
   };
@@ -7264,12 +7264,12 @@ let
 
   vimspector = buildVimPluginFrom2Nix {
     pname = "vimspector";
-    version = "2020-11-09";
+    version = "2020-11-14";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "30741f88139931c5ee83ef906cf16ee1187bf8f3";
-      sha256 = "01b3q4zmys5xnikwl8jg28057d5war0hk1wzizw3rly3kjmmkx8y";
+      rev = "2bdb30a45ec020a837473011e4b52c1e295d1222";
+      sha256 = "0pdw9fxc2hk944rrsasjky7fr2i8k70aq861xgxmj26q0kwiipgd";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";

From c103097b8a226bcf164eca3d123dcf010f5d2d02 Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Sat, 14 Nov 2020 18:44:01 +0000
Subject: [PATCH 2609/3942] vimPlugins.codi-vim: init at 2020-07-25

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index dc4235dab2c6..0e6773884af0 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -483,6 +483,18 @@ let
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
 
+  codi-vim = buildVimPluginFrom2Nix {
+    pname = "codi-vim";
+    version = "2020-07-25";
+    src = fetchFromGitHub {
+      owner = "metakirby5";
+      repo = "codi.vim";
+      rev = "08e26f4dc4bdb0cbc790474beb29a48e7a9c8ceb";
+      sha256 = "1qwacymipshfvvg7ya7gsfz1r65q44qjjsgya6wm81n04q9rpxfx";
+    };
+    meta.homepage = "https://github.com/metakirby5/codi.vim/";
+  };
+
   colorizer = buildVimPluginFrom2Nix {
     pname = "colorizer";
     version = "2020-07-23";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 3ddd3f5c132d..f108bb4fa48c 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -305,6 +305,7 @@ mboughaba/i3config.vim
 megaannum/forms
 megaannum/self
 mengelbrecht/lightline-bufferline
+metakirby5/codi.vim
 mfukar/robotframework-vim
 mg979/vim-visual-multi
 mhartington/oceanic-next

From 3e504fa59733a08b0395d11b91a2495acfb7d835 Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Sat, 14 Nov 2020 18:45:51 +0000
Subject: [PATCH 2610/3942] vimPlugins.plenary-nvim: init at 2020-11-06

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 0e6773884af0..8d584f89d793 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2782,6 +2782,18 @@ let
     meta.homepage = "https://github.com/aklt/plantuml-syntax/";
   };
 
+  plenary-nvim = buildVimPluginFrom2Nix {
+    pname = "plenary-nvim";
+    version = "2020-11-06";
+    src = fetchFromGitHub {
+      owner = "nvim-lua";
+      repo = "plenary.nvim";
+      rev = "e2a73c8e238f0e8d70fe4c20f7120660ccecf6e7";
+      sha256 = "12l718c7r0jfnl95f6ifnzk5pyp08yp0mqxqa4nc8c2lwnc3pm6q";
+    };
+    meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
+  };
+
   pony-vim-syntax = buildVimPluginFrom2Nix {
     pname = "pony-vim-syntax";
     version = "2017-09-26";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index f108bb4fa48c..9aa725a4e1b3 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -374,6 +374,7 @@ nvie/vim-flake8
 nvim-lua/completion-nvim
 nvim-lua/diagnostic-nvim
 nvim-lua/lsp_extensions.nvim
+nvim-lua/plenary.nvim
 nvim-telescope/telescope.nvim
 nvim-treesitter/completion-treesitter
 nvim-treesitter/nvim-treesitter

From cc9c13ca4a7183ef7790bf2fd4eb5fe02101f7f9 Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Sat, 14 Nov 2020 18:47:57 +0000
Subject: [PATCH 2611/3942] vimPlugins.popup-nvim: init at 2020-10-08

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 8d584f89d793..3e4a688c506f 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2806,6 +2806,18 @@ let
     meta.homepage = "https://github.com/dleonard0/pony-vim-syntax/";
   };
 
+  popup-nvim = buildVimPluginFrom2Nix {
+    pname = "popup-nvim";
+    version = "2020-10-08";
+    src = fetchFromGitHub {
+      owner = "nvim-lua";
+      repo = "popup.nvim";
+      rev = "8f128cc7b2a1d759ce343ef92ea311526c6bbe13";
+      sha256 = "1jxy6lp7r1wvd296x4ql6c9w43iwdwaf8jzyg5azs3x9cdyx9b73";
+    };
+    meta.homepage = "https://github.com/nvim-lua/popup.nvim/";
+  };
+
   PreserveNoEOL = buildVimPluginFrom2Nix {
     pname = "PreserveNoEOL";
     version = "2013-06-14";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 9aa725a4e1b3..a6ff5ea0467e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -375,6 +375,7 @@ nvim-lua/completion-nvim
 nvim-lua/diagnostic-nvim
 nvim-lua/lsp_extensions.nvim
 nvim-lua/plenary.nvim
+nvim-lua/popup.nvim
 nvim-telescope/telescope.nvim
 nvim-treesitter/completion-treesitter
 nvim-treesitter/nvim-treesitter

From ba819f3300af39b24465d793d74e70a11518cecc Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Sat, 14 Nov 2020 18:49:26 +0000
Subject: [PATCH 2612/3942] vimPlugins.nvim-dap: init at 2020-11-14

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 3e4a688c506f..000d3ee010fd 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2566,6 +2566,18 @@ let
     meta.homepage = "https://github.com/roxma/nvim-completion-manager/";
   };
 
+  nvim-dap = buildVimPluginFrom2Nix {
+    pname = "nvim-dap";
+    version = "2020-11-14";
+    src = fetchFromGitHub {
+      owner = "mfussenegger";
+      repo = "nvim-dap";
+      rev = "926b049d7200ec7f0c69e5bcb6cbfa737207cafb";
+      sha256 = "0a1bkl5wg5q1w3yljii4qjry6pfvx6iyyz9ahkvb5ij015lg2lvg";
+    };
+    meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
+  };
+
   nvim-gdb = buildVimPluginFrom2Nix {
     pname = "nvim-gdb";
     version = "2020-10-01";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a6ff5ea0467e..f76062ab9de2 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -307,6 +307,7 @@ megaannum/self
 mengelbrecht/lightline-bufferline
 metakirby5/codi.vim
 mfukar/robotframework-vim
+mfussenegger/nvim-dap
 mg979/vim-visual-multi
 mhartington/oceanic-next
 mhinz/vim-crates

From a38c1bd528c724a66a764410a02b72960dd60c02 Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Sat, 14 Nov 2020 18:51:15 +0000
Subject: [PATCH 2613/3942] vimPlugins.nvim-dap-virtual-text: init at
 2020-11-09

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 000d3ee010fd..7cf345e1d69e 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2578,6 +2578,18 @@ let
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
   };
 
+  nvim-dap-virtual-text = buildVimPluginFrom2Nix {
+    pname = "nvim-dap-virtual-text";
+    version = "2020-11-09";
+    src = fetchFromGitHub {
+      owner = "theHamsta";
+      repo = "nvim-dap-virtual-text";
+      rev = "7c4bbfb1caa2b5be1e863962bd0bc142e10b801f";
+      sha256 = "1ry4799s4nj4nhfd2p0hbb3r8vp87zgwn0cw1h8w1hhyv9gfjn82";
+    };
+    meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
+  };
+
   nvim-gdb = buildVimPluginFrom2Nix {
     pname = "nvim-gdb";
     version = "2020-10-01";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index f76062ab9de2..0bc680236d9f 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -494,6 +494,7 @@ ternjs/tern_for_vim
 terryma/vim-expand-region
 terryma/vim-multiple-cursors
 tex/vimpreviewpandoc
+theHamsta/nvim-dap-virtual-text
 thinca/vim-ft-diff_fold
 thinca/vim-prettyprint
 thinca/vim-quickrun

From 6fdcc9004a0023a157cb7267c0aaab5198156fe8 Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Sat, 14 Nov 2020 19:15:03 +0000
Subject: [PATCH 2614/3942] vimPlugins.nvim-treesitter-refactor: init at
 2020-10-07

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 7cf345e1d69e..f67872925172 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2650,6 +2650,18 @@ let
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
 
+  nvim-treesitter-refactor = buildVimPluginFrom2Nix {
+    pname = "nvim-treesitter-refactor";
+    version = "2020-10-07";
+    src = fetchFromGitHub {
+      owner = "nvim-treesitter";
+      repo = "nvim-treesitter-refactor";
+      rev = "9d4b9daf2f138a5de538ee094bd899591004f8e2";
+      sha256 = "0ma5zsl70mi92b9y8nhgkppdiqfjj0bl3gklhjv1c3lg7kny7511";
+    };
+    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/";
+  };
+
   nvim-yarp = buildVimPluginFrom2Nix {
     pname = "nvim-yarp";
     version = "2020-04-08";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0bc680236d9f..10c45ecf7f34 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -380,6 +380,7 @@ nvim-lua/popup.nvim
 nvim-telescope/telescope.nvim
 nvim-treesitter/completion-treesitter
 nvim-treesitter/nvim-treesitter
+nvim-treesitter/nvim-treesitter-refactor
 ocaml/vim-ocaml
 octol/vim-cpp-enhanced-highlight
 Olical/conjure

From 103abbf0e1a9a83bec025379e737d3cb93385708 Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Sat, 14 Nov 2020 19:17:14 +0000
Subject: [PATCH 2615/3942] vimPlugins.nvim-treesitter-textobjects: init at
 2020-11-05

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index f67872925172..f6e6a38f9964 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2662,6 +2662,18 @@ let
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/";
   };
 
+  nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
+    pname = "nvim-treesitter-textobjects";
+    version = "2020-11-05";
+    src = fetchFromGitHub {
+      owner = "nvim-treesitter";
+      repo = "nvim-treesitter-textobjects";
+      rev = "2b4d0f3cce49c025146a020aea7ed069efd57bc1";
+      sha256 = "0ighv85xm62glbf1793lmya1cfbhizpq3nyl46xbx2y7akg799xb";
+    };
+    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
+  };
+
   nvim-yarp = buildVimPluginFrom2Nix {
     pname = "nvim-yarp";
     version = "2020-04-08";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 10c45ecf7f34..aca0379907cd 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -381,6 +381,7 @@ nvim-telescope/telescope.nvim
 nvim-treesitter/completion-treesitter
 nvim-treesitter/nvim-treesitter
 nvim-treesitter/nvim-treesitter-refactor
+nvim-treesitter/nvim-treesitter-textobjects
 ocaml/vim-ocaml
 octol/vim-cpp-enhanced-highlight
 Olical/conjure

From 324ed9d79ac2361914a7a2a75150f8cd11b4271a Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Sat, 14 Nov 2020 19:19:12 +0000
Subject: [PATCH 2616/3942] vimPlugins.playground: init at 2020-10-19

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index f6e6a38f9964..285819561bb4 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2830,6 +2830,18 @@ let
     meta.homepage = "https://github.com/aklt/plantuml-syntax/";
   };
 
+  playground = buildVimPluginFrom2Nix {
+    pname = "playground";
+    version = "2020-10-19";
+    src = fetchFromGitHub {
+      owner = "nvim-treesitter";
+      repo = "playground";
+      rev = "0cb0a18378db84c4c2bdb38c28e897958d2ec14d";
+      sha256 = "1808kwf3ccrjaqxr43l23kfj8s0zijdk0rpriymqk143b29nk52c";
+    };
+    meta.homepage = "https://github.com/nvim-treesitter/playground/";
+  };
+
   plenary-nvim = buildVimPluginFrom2Nix {
     pname = "plenary-nvim";
     version = "2020-11-06";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index aca0379907cd..86b39c7d7e34 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -382,6 +382,7 @@ nvim-treesitter/completion-treesitter
 nvim-treesitter/nvim-treesitter
 nvim-treesitter/nvim-treesitter-refactor
 nvim-treesitter/nvim-treesitter-textobjects
+nvim-treesitter/playground
 ocaml/vim-ocaml
 octol/vim-cpp-enhanced-highlight
 Olical/conjure

From 002a5f9de16130ac9f8e474de75d9b5eca7bf4bd Mon Sep 17 00:00:00 2001
From: Karol Chmist <info+github@chmist.com>
Date: Fri, 18 Sep 2020 10:41:27 +0200
Subject: [PATCH 2617/3942] Add sphinx autoapi 1.5.1

---
 .../sphinxcontrib-autoapi/default.nix         | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix

diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
new file mode 100644
index 000000000000..03ac746137f7
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, astroid
+, jinja2
+, sphinx
+, pyyaml
+, unidecode
+, mock
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "sphinx-autoapi";
+  version = "1.5.1";
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19m9yvlqwaw3b05lbb1vcla38irn4riw2ij0vjmnc2xq4f1qfl2d";
+  };
+
+  propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ];
+
+  checkInputs = [
+    mock
+    pytest
+  ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/readthedocs/sphinx-autoapi";
+    description = "Provides 'autodoc' style documentation";
+    longDescription = "Sphinx AutoAPI provides 'autodoc' style documentation for multiple programming languages without needing to load, run, or import the project being documented.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ karolchmist ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d40f9a1d154f..0b5f211684e2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6780,6 +6780,8 @@ in {
 
   sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { };
 
+  sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { };
+
   sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex { };
 
   sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { };

From 701df1a3dc5b2a60ab348a3c06600250d0382457 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 16 Nov 2020 12:56:38 -0500
Subject: [PATCH 2618/3942] nano: Add update script

---
 pkgs/applications/editors/nano/default.nix | 43 +++++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 6909af712fa0..63b849f06f99 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -1,10 +1,6 @@
-{ stdenv, fetchurl, fetchFromGitHub
-, ncurses
-, texinfo
-, gettext ? null
-, enableNls ? true
-, enableTiny ? false
-}:
+{ stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript
+, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, gettext ? null
+, enableNls ? true, enableTiny ? false }:
 
 assert enableNls -> (gettext != null);
 
@@ -44,13 +40,40 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  passthru = {
+    updateScript = writeScript "update.sh" ''
+      #!${stdenv.shell}
+      set -o errexit
+      PATH=${
+        stdenv.lib.makeBinPath [
+          common-updater-scripts
+          git
+          nixfmt
+          nix
+          coreutils
+          gnused
+        ]
+      }
+
+      oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
+      latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git://git.savannah.gnu.org/nano.git '*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
+
+      if [ ! "$oldVersion" = "$latestTag" ]; then
+        update-source-version ${pname} "$latestTag" --version-key=version --print-changes
+        nixpkgs="$(git rev-parse --show-toplevel)"
+        default_nix="$nixpkgs/pkgs/applications/editors/nano/default.nix"
+        nixfmt "$default_nix"
+      else
+        echo "${pname} is already up-to-date"
+      fi
+    '';
+  };
+
   meta = {
     homepage = "https://www.nano-editor.org/";
     description = "A small, user-friendly console text editor";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
-      joachifm
-    ];
+    maintainers = with maintainers; [ joachifm ];
     platforms = platforms.all;
   };
 }

From 500772adc97cc182bf98a0d9d90a99a4d4995db1 Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Mon, 16 Nov 2020 19:05:53 +0100
Subject: [PATCH 2619/3942] nodePackages: update

---
 .../node-packages/node-packages.nix           | 5471 ++++++++---------
 1 file changed, 2476 insertions(+), 2995 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 0d35f0fbd5fb..513febb5d795 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -22,40 +22,58 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.1002.0" = {
+    "@angular-devkit/architect-0.1100.1" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.1002.0";
+      version = "0.1100.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1002.0.tgz";
-        sha512 = "twM8V03ujBIGVpgV1PBlSDodUdxtUb7WakutfWafAvEHUsgwzfvQz2VtKWvjNZ9AiYjnCuwkQaclqVv0VHNo9w==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1100.1.tgz";
+        sha512 = "DIAvTRRY+k7T2xHf4RVV06P16D0V7wSf1MSpGSDWVpfWcA3HNOSGfsk1F+COMlbFehXuKztwieXarv5rXbBCng==";
       };
     };
-    "@angular-devkit/core-10.2.0" = {
+    "@angular-devkit/core-11.0.0" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
-      version = "10.2.0";
+      version = "11.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz";
-        sha512 = "XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.0.0.tgz";
+        sha512 = "fXZtSs3J4S12hboi3om1FA+QS0e8nuQMyzl2nkmtuhcELUFMmSrEl36dtCni5e7Svs46BUAZ5w8EazIkgGQDJg==";
       };
     };
-    "@angular-devkit/schematics-10.2.0" = {
+    "@angular-devkit/core-11.0.1" = {
+      name = "_at_angular-devkit_slash_core";
+      packageName = "@angular-devkit/core";
+      version = "11.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.0.1.tgz";
+        sha512 = "ui3g7w/0SpU9oq8uwN9upR8Y1eOXZ+P2p3NyDydBrR7ZEfEkRLS1mhozN/ib8farrwK5N3kIIJxMb5t3187Hng==";
+      };
+    };
+    "@angular-devkit/schematics-11.0.0" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
-      version = "10.2.0";
+      version = "11.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.2.0.tgz";
-        sha512 = "TQI5NnE6iM3ChF5gZQ9qb+lZgMWa7aLoF5ksOyT3zrmOuICiQYJhA6SsjV95q7J4M55qYymwBib8KTqU/xuQww==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.0.0.tgz";
+        sha512 = "oCz9E0thA5WdGDuv6biu3X5kw5/vNE4ZZOKT2sHBQMpAuuDYrDpfTYQJjXQtjfXWvmlr8L8aqDD9N4HXsE4Esw==";
       };
     };
-    "@angular-devkit/schematics-cli-0.1002.0" = {
+    "@angular-devkit/schematics-11.0.1" = {
+      name = "_at_angular-devkit_slash_schematics";
+      packageName = "@angular-devkit/schematics";
+      version = "11.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.0.1.tgz";
+        sha512 = "rAOnAndcybEH398xf5wzmcUPCoCi0dKiOo/+1dkKU5aTxynw1OUnANt5K6A+ZZTGnJmfjtP0ovkZGYun9IUDxQ==";
+      };
+    };
+    "@angular-devkit/schematics-cli-0.1100.1" = {
       name = "_at_angular-devkit_slash_schematics-cli";
       packageName = "@angular-devkit/schematics-cli";
-      version = "0.1002.0";
+      version = "0.1100.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1002.0.tgz";
-        sha512 = "wV5YPdcolPAXo5oyMu9vM3fm3grb3ZT9amrTMC9oc3OWQUVFySPCIzvguHf8bVGMQ/AHfel2TaYxIQv/LurBrQ==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1100.1.tgz";
+        sha512 = "6iGauhYKSkgsqA8HK7sul7lrVzrkxXAghGd3FcTHtXsmjh/leBezi7R82MphzcoYAOQ36COLMcOJnYurVG1Y6g==";
       };
     };
     "@antora/asciidoc-loader-2.3.4" = {
@@ -1363,6 +1381,15 @@ let
         sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==";
       };
     };
+    "@braintree/sanitize-url-3.1.0" = {
+      name = "_at_braintree_slash_sanitize-url";
+      packageName = "@braintree/sanitize-url";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz";
+        sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg==";
+      };
+    };
     "@bugsnag/browser-7.5.1" = {
       name = "_at_bugsnag_slash_browser";
       packageName = "@bugsnag/browser";
@@ -1417,13 +1444,13 @@ let
         sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA==";
       };
     };
-    "@chemzqm/neovim-5.2.8" = {
+    "@chemzqm/neovim-5.2.10" = {
       name = "_at_chemzqm_slash_neovim";
       packageName = "@chemzqm/neovim";
-      version = "5.2.8";
+      version = "5.2.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.8.tgz";
-        sha512 = "687yDuEK7A+aZ8PcJVD7xLWkbC1WMp41FcCg1SCHuBroEGn2cbIMl7zwM7LeHsPCDMSDyWfYPMqEgUiVgGfrsQ==";
+        url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.10.tgz";
+        sha512 = "IeXAS7yFgsz0EyZrQguX1/Rbbe5EYMZOm2OxosY1oht+LjxQj2vv0u91tvX/Qu67SIWCFoaudJZuDcgK88anyg==";
       };
     };
     "@cliqz-oss/firefox-client-0.3.1" = {
@@ -1561,24 +1588,6 @@ let
         sha512 = "HilPrVrCosYWqSyjfpDtaaN1kJwdlBpS+IAflP3z+e7nsEgk3JGJf1Vg0NgHJooTf5HDfXSyZqMVg+5jvXCK0g==";
       };
     };
-    "@emmetio/abbreviation-2.0.2" = {
-      name = "_at_emmetio_slash_abbreviation";
-      packageName = "@emmetio/abbreviation";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.0.2.tgz";
-        sha512 = "kpWg6jyR1YEj/yWceruvDj/fe1BhXqA0tGH3Z2ZiPFo8SDMH4JHg6FChqon5x0CCfLf4zVswrQa0gcZ4XtdRBQ==";
-      };
-    };
-    "@emmetio/css-abbreviation-2.1.2" = {
-      name = "_at_emmetio_slash_css-abbreviation";
-      packageName = "@emmetio/css-abbreviation";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.2.tgz";
-        sha512 = "CvYTzJltVpLqJaCZ1Qn97LVAKsl2Uwl2fzir1EX/WuMY3xWxgc3BWRCheL6k65km6GyDrLVl6RhrrNb/pxOiAQ==";
-      };
-    };
     "@emmetio/extract-abbreviation-0.1.6" = {
       name = "_at_emmetio_slash_extract-abbreviation";
       packageName = "@emmetio/extract-abbreviation";
@@ -1588,15 +1597,6 @@ let
         sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw==";
       };
     };
-    "@emmetio/scanner-1.0.0" = {
-      name = "_at_emmetio_slash_scanner";
-      packageName = "@emmetio/scanner";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.0.tgz";
-        sha512 = "8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA==";
-      };
-    };
     "@emotion/is-prop-valid-0.8.8" = {
       name = "_at_emotion_slash_is-prop-valid";
       packageName = "@emotion/is-prop-valid";
@@ -2047,13 +2047,13 @@ let
         sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ==";
       };
     };
-    "@fluentui/react-7.149.4" = {
+    "@fluentui/react-7.150.0" = {
       name = "_at_fluentui_slash_react";
       packageName = "@fluentui/react";
-      version = "7.149.4";
+      version = "7.150.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.149.4.tgz";
-        sha512 = "yZqU5EFYDlXZQfFLIm085/A/nYW9SL/YccPT6E+r51vwn4NlfRSQ6K0IFD5cGnMPOhA+mwyT79uFgxb3/I281A==";
+        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.150.0.tgz";
+        sha512 = "G/JohcQ6ZxxtoWTr5YwTQbV3pfKf7KkEVKF2ScJJ/rspNJRHFx7w4pzmb1jvNm78rAKiHA6sVlXeJmlTiivn1g==";
       };
     };
     "@fluentui/react-focus-7.16.17" = {
@@ -2110,13 +2110,13 @@ let
         sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q==";
       };
     };
-    "@graphql-tools/delegate-7.0.4" = {
+    "@graphql-tools/delegate-7.0.5" = {
       name = "_at_graphql-tools_slash_delegate";
       packageName = "@graphql-tools/delegate";
-      version = "7.0.4";
+      version = "7.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.4.tgz";
-        sha512 = "6/qL9V31FgECNPwc5As1359hpsAt4ASWsiYBSYWL+Iq9/K0YRcNeEmSseXIyCP4oh8k/9HS/w/m2lkMk/YSUpQ==";
+        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.5.tgz";
+        sha512 = "wkB/L9cRxlPB4m9k9WQJZYPbnRxfEu2bkxvI9pVGHMsmoQxMZiM2GkhCBHDTBYJb7cxCS6Wv3LJb1w0iEqw24w==";
       };
     };
     "@graphql-tools/graphql-file-loader-6.2.5" = {
@@ -2767,6 +2767,42 @@ let
         sha512 = "UK0Fu0eevQlpRXq5ff4o/71HJlpX9wJMddJjMYg9vUqCCl8ZnumRAljfShHFhGyO+Vc9IzN6dd8Y5JZZTp1KOw==";
       };
     };
+    "@joplinapp/fork-htmlparser2-4.1.8" = {
+      name = "_at_joplinapp_slash_fork-htmlparser2";
+      packageName = "@joplinapp/fork-htmlparser2";
+      version = "4.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@joplinapp/fork-htmlparser2/-/fork-htmlparser2-4.1.8.tgz";
+        sha512 = "EZUzKlV6K8KV8DMm9PJW8fToBStA6GvoNKzn/zso8xmwFtMFsyAj/N8++0q7ZyzxJ+7N15GJNgELhxE5f9JY/g==";
+      };
+    };
+    "@joplinapp/fork-sax-1.2.12" = {
+      name = "_at_joplinapp_slash_fork-sax";
+      packageName = "@joplinapp/fork-sax";
+      version = "1.2.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@joplinapp/fork-sax/-/fork-sax-1.2.12.tgz";
+        sha512 = "TDdIKTv/THRusbN6cRIIGDrVWAp1JC7lS7faaaQtrJlKLFYAM2oeBIGHmDmxkC0MBFN/XPMiZl5bWBdSuy+C9g==";
+      };
+    };
+    "@joplinapp/lib-1.0.9" = {
+      name = "_at_joplinapp_slash_lib";
+      packageName = "@joplinapp/lib";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@joplinapp/lib/-/lib-1.0.9.tgz";
+        sha512 = "fXRs/nKJNL36kZX/rfm4F3zaNse12cpXXZQNg+8txUcGTSFx7DBBu2r3x3QV33y6DxsjK9dW/CUM4NJUcXKMFQ==";
+      };
+    };
+    "@joplinapp/renderer-1.0.17" = {
+      name = "_at_joplinapp_slash_renderer";
+      packageName = "@joplinapp/renderer";
+      version = "1.0.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@joplinapp/renderer/-/renderer-1.0.17.tgz";
+        sha512 = "uX7V8peMH+OHwmceEw6u0bgVuKNhNhnFaZWqyhnH0aCoemOCnjZ45VQSJfTM/2ljL8xFo1VTA9MoWUmLdU/QCg==";
+      };
+    };
     "@kwsites/file-exists-1.1.1" = {
       name = "_at_kwsites_slash_file-exists";
       packageName = "@kwsites/file-exists";
@@ -3325,13 +3361,13 @@ let
         sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q==";
       };
     };
-    "@microsoft/load-themed-styles-1.10.126" = {
+    "@microsoft/load-themed-styles-1.10.133" = {
       name = "_at_microsoft_slash_load-themed-styles";
       packageName = "@microsoft/load-themed-styles";
-      version = "1.10.126";
+      version = "1.10.133";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.126.tgz";
-        sha512 = "6GoapdGJPmWq6WChTaImAZ6UjuPb2FWHeP/pTEHw6Dz+d4/4TnyWcVR9uDLx+8n6xn3ZpU6OtW0FEGzNNa+TUw==";
+        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.133.tgz";
+        sha512 = "jiGxZDBXmjD0uQPtZ+C/UPEdGwp5C50x1fYLy84dpkooZ8nT0jeWlXS3JJjWpHAL9URY37OIrBWzHu/FcBWFGQ==";
       };
     };
     "@mozilla/readability-0.3.0" = {
@@ -3361,13 +3397,13 @@ let
         sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg==";
       };
     };
-    "@nestjs/schematics-7.2.1" = {
+    "@nestjs/schematics-7.2.2" = {
       name = "_at_nestjs_slash_schematics";
       packageName = "@nestjs/schematics";
-      version = "7.2.1";
+      version = "7.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.1.tgz";
-        sha512 = "yTIwiclX65HYIeemJ/ih3SVlj3BhUHS5eeGy/6uFy1EiIujNadsgi/RZxFSwlCIDkSrGUykqoZdvzfdnsD1Itw==";
+        url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.2.tgz";
+        sha512 = "3y0LE1z50CEzXr5rFlOpaJ+0ctkyQWtREkMuvQd/SUILF75+6cNTqmfjjnUJw12vdkdkc+zsksgXFWEPkns4Pg==";
       };
     };
     "@netflix/nerror-1.1.3" = {
@@ -3379,13 +3415,13 @@ let
         sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
       };
     };
-    "@netlify/build-5.2.1" = {
+    "@netlify/build-5.3.1" = {
       name = "_at_netlify_slash_build";
       packageName = "@netlify/build";
-      version = "5.2.1";
+      version = "5.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/build/-/build-5.2.1.tgz";
-        sha512 = "o08VdNJmJvsxGvFkFScpgznrk+lkG72Rv7VHW+K4WkFXsYjbcitM5zjoQizSZwxgQ8/iee9EZn+8zWwjf/K1tw==";
+        url = "https://registry.npmjs.org/@netlify/build/-/build-5.3.1.tgz";
+        sha512 = "4Qb4TuqOoRP2fopebyAonjNu0Ay3GVjOQSqzJUcENPg7MNIwzqd/V7nY+OtQJyA8/1Xjd4cwdPP20SIoGoBvMQ==";
       };
     };
     "@netlify/cache-utils-1.0.6" = {
@@ -3406,13 +3442,13 @@ let
         sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw==";
       };
     };
-    "@netlify/config-2.3.6" = {
+    "@netlify/config-2.4.0" = {
       name = "_at_netlify_slash_config";
       packageName = "@netlify/config";
-      version = "2.3.6";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/config/-/config-2.3.6.tgz";
-        sha512 = "50cK+lEnmZdN1Es1jeiiBV8kT5tKbRK9yp4qlUo1CYp3MJxw4RY/duoYnCAy/D1wbdV5poDM5gZpHS+dxF7nmQ==";
+        url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.0.tgz";
+        sha512 = "MDp7A7AMHVOHpvX+o69t+c8nZjVtkxNcepxsSqE+9wuPVlSHWCqzkHVxKQU0ozuk74z/xHBRUpp/OMCXkiEugg==";
       };
     };
     "@netlify/functions-utils-1.3.2" = {
@@ -3649,13 +3685,13 @@ let
         sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==";
       };
     };
-    "@npmcli/run-script-1.7.4" = {
+    "@npmcli/run-script-1.7.5" = {
       name = "_at_npmcli_slash_run-script";
       packageName = "@npmcli/run-script";
-      version = "1.7.4";
+      version = "1.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.7.4.tgz";
-        sha512 = "GAeOB6P4/aYyvEbROVHXuSGPgy4wwQN/fGfXP993o9btyuCAOaz0T2cr5Y1y4nSeaBPfhk5W/E/AfFKDt6yG7w==";
+        url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.7.5.tgz";
+        sha512 = "G8taZCc0HExiLadB3Nv0/h1TWjQ9HhkqW/waaH9MNqMX26rPRyNORst1LlNXOO8QnxQF4tNdJfc/Z3TuEtiyww==";
       };
     };
     "@oclif/color-0.1.2" = {
@@ -3721,6 +3757,15 @@ let
         sha512 = "EJR6AIOEkt/NnARNIVAskPDVtdhtO5TTNXmhDrGqMoWVsr0R6DkkLrMyq95BmHvlVWM1nduoq4fQPuCyuF2jaA==";
       };
     };
+    "@oclif/errors-1.3.4" = {
+      name = "_at_oclif_slash_errors";
+      packageName = "@oclif/errors";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.4.tgz";
+        sha512 = "pJKXyEqwdfRTUdM8n5FIHiQQHg5ETM0Wlso8bF9GodczO40mF5Z3HufnYWJE7z8sGKxOeJCdbAVZbS8Y+d5GCw==";
+      };
+    };
     "@oclif/linewrap-1.0.0" = {
       name = "_at_oclif_slash_linewrap";
       packageName = "@oclif/linewrap";
@@ -3964,310 +4009,310 @@ let
         sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A==";
       };
     };
-    "@ot-builder/bin-composite-types-0.10.31" = {
+    "@ot-builder/bin-composite-types-0.10.33" = {
       name = "_at_ot-builder_slash_bin-composite-types";
       packageName = "@ot-builder/bin-composite-types";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.31.tgz";
-        sha512 = "SbyWNIMJZEqPdbJW6P1KaHnLTvTqinm3J9MiNmdOhrEuw1k4jLpatQCYT4jLMDHuD1bRLmzgRshcfbm5Rtb+Kg==";
+        url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.33.tgz";
+        sha512 = "6Ls0hv6JRVzyeT3By9wl34B1d2exTKp6eilU7z4MZzGR78MU73H6nVDp9NTlwhA545K1dqAk6lAN2ApUo60UaQ==";
       };
     };
-    "@ot-builder/bin-util-0.10.31" = {
+    "@ot-builder/bin-util-0.10.33" = {
       name = "_at_ot-builder_slash_bin-util";
       packageName = "@ot-builder/bin-util";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.31.tgz";
-        sha512 = "bbYcQ582m2uNcJajhPB7St2lXvN4hekaNrMVgQREfaDmHcQycV7NaqM3Q333IYbKNSHehSLBcJ3whVyN1oAOvw==";
+        url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.33.tgz";
+        sha512 = "ijm6023Wlv4l6jt04Zq/Ts2GJDtDN++NDD70VQ0PsKcX0N5/Ebzbn2v+2cNaTFirGY1O+H1tGtLcPFVR32aDLw==";
       };
     };
-    "@ot-builder/cli-help-shower-0.10.31" = {
+    "@ot-builder/cli-help-shower-0.10.33" = {
       name = "_at_ot-builder_slash_cli-help-shower";
       packageName = "@ot-builder/cli-help-shower";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.31.tgz";
-        sha512 = "96SdquA87vuHHuwPuTDKrFoKD7g89SddDsmowjdR57N+9tinbwGxNiz3jCK4DycMIebSRwWIq0ls20Veq0uT3g==";
+        url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.33.tgz";
+        sha512 = "720ibT7AxqrTfcYdOuPC4/RTQV8HgOt3W5yz1Z7tF0Dtj7Oka5X3qiLHlBiaNQYfRlmvap84NG1JXI9KedYtQA==";
       };
     };
-    "@ot-builder/cli-proc-0.10.31" = {
+    "@ot-builder/cli-proc-0.10.33" = {
       name = "_at_ot-builder_slash_cli-proc";
       packageName = "@ot-builder/cli-proc";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.31.tgz";
-        sha512 = "5rt5zCn681qoz8CwwB8HBrSdHv/axOtmtjOAkFuTm1HEOZeAmJt2nRVQwP+08lQLlPhZyiBM57XDqNgohGu+3A==";
+        url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.33.tgz";
+        sha512 = "ou8I9QUwwttYreAmeTsdRHSJeudclIEQdDitKXTDJFB3qombH2n1509BHN+lod5TbDEO/L/Nhyz82xQxmEnvUw==";
       };
     };
-    "@ot-builder/cli-shared-0.10.31" = {
+    "@ot-builder/cli-shared-0.10.33" = {
       name = "_at_ot-builder_slash_cli-shared";
       packageName = "@ot-builder/cli-shared";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.31.tgz";
-        sha512 = "54dJvtBCZ2ELNI38F98blPUURwD/cu09sOC68u7WghDrkmcql9UOjCgVsujoLDS52KdpD7DzOxhTu2j6upAZ2w==";
+        url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.33.tgz";
+        sha512 = "pZXxdWoIj/XntJ2+NbpW+N5IdRJzTRMa+0SQdKr/xqrLq9qIKkcBhaqeY8HzqKF8CXPDdwEsgtXrAvmrStE1VA==";
       };
     };
-    "@ot-builder/common-impl-0.10.31" = {
+    "@ot-builder/common-impl-0.10.33" = {
       name = "_at_ot-builder_slash_common-impl";
       packageName = "@ot-builder/common-impl";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.31.tgz";
-        sha512 = "9cGRXS45fPR9tau81G+zo6J8toEP9ouuE0gTTAL8ZHz84mAeUE3ybTL0pyiBO0fu01LtMgeLxl1w0rBze8T4jw==";
+        url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.33.tgz";
+        sha512 = "5lZxnaoP2qQ5/57BDhdtY3y5qdUScUi9AOBb0xIEG2MbzSEqruoY01AbxhNG47oJGeVCTrgRP9u0xPOhWY+4+A==";
       };
     };
-    "@ot-builder/errors-0.10.31" = {
+    "@ot-builder/errors-0.10.33" = {
       name = "_at_ot-builder_slash_errors";
       packageName = "@ot-builder/errors";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.31.tgz";
-        sha512 = "6UvEpFqukndJ2d9T5gvdtMUliK6H8j8g1JrLyG9WNNPMY9NZ7MAHz1vAzR3ZNN9cBZPMy/mYjUf7q1mjs8fiow==";
+        url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.33.tgz";
+        sha512 = "Eq3ghzkxLIZasfh2Sc49MDoaCwmW6c4xaqq9yZSmY1txd6s8WrzWisDBYdt7qwCHVW2EcbsJMNpSKECzAfegpA==";
       };
     };
-    "@ot-builder/io-bin-cff-0.10.31" = {
+    "@ot-builder/io-bin-cff-0.10.33" = {
       name = "_at_ot-builder_slash_io-bin-cff";
       packageName = "@ot-builder/io-bin-cff";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.31.tgz";
-        sha512 = "ypaCkzW/hDvItKwJ6i5JVsG4YxhLP9M3CNUxSOD5FNH8Ld/AvS2Mt8i1fJdj37O2tAJgFLUj3dET0bWL8Czlvg==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.33.tgz";
+        sha512 = "QffGC05YocTrzNDhNa2gF64/iZqarERvRM8EnGRyZM4THHE/LwWHVMtirDl/DI8V1Ex00XTpxfCPwRerhQWBvw==";
       };
     };
-    "@ot-builder/io-bin-encoding-0.10.31" = {
+    "@ot-builder/io-bin-encoding-0.10.33" = {
       name = "_at_ot-builder_slash_io-bin-encoding";
       packageName = "@ot-builder/io-bin-encoding";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.31.tgz";
-        sha512 = "BsU7+eeG+G7TaE1zdmqP2QqQk97KXYpaY08eAwrZBVoOWbOKClg+GKup4+Cbcy+2ckNZtviYnty18iwzfVNXSQ==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.33.tgz";
+        sha512 = "WUFSdfpv55uuiPTOepAPrcXqRLDeyLb3dY9OjUeX2bPbWTHoNH0n6SaKAf0PAKhCMeELoPibd6tXMe1BRtpVag==";
       };
     };
-    "@ot-builder/io-bin-ext-private-0.10.31" = {
+    "@ot-builder/io-bin-ext-private-0.10.33" = {
       name = "_at_ot-builder_slash_io-bin-ext-private";
       packageName = "@ot-builder/io-bin-ext-private";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.31.tgz";
-        sha512 = "xI/UUgCEfbulXwawyNtPpCNS2cIkDzz81sIK/u83sK7BVUIfrLQmsxX7Qfcnz3fbskbhY0oM2qIbJ5StfbOVHA==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.33.tgz";
+        sha512 = "fq97OoqCT+sdZ0tfwpPeWHXbji5a3dxZLNw4WkRRJ1Ih8/IwL8NNZPpwv4MbgWvl18Bwsfeu0VHXkwiZKmlo6Q==";
       };
     };
-    "@ot-builder/io-bin-font-0.10.31" = {
+    "@ot-builder/io-bin-font-0.10.33" = {
       name = "_at_ot-builder_slash_io-bin-font";
       packageName = "@ot-builder/io-bin-font";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.31.tgz";
-        sha512 = "lcXfk5enFMKNd8tGO5aZFVWDqqaHVDl3q6nSNlcrrYGcAxvuoMfwRExgqxT7WSrEn9RNc4GueKfR3CMz0B0dtg==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.33.tgz";
+        sha512 = "Kyf0e5g1ovpCX3ndbvyRUpdpNK227WWxr+KFRZzuy0vV+IJS+vbJ6TnLeYBCblIgrUGtGn12XJi7VL5wLN6eWg==";
       };
     };
-    "@ot-builder/io-bin-glyph-store-0.10.31" = {
+    "@ot-builder/io-bin-glyph-store-0.10.33" = {
       name = "_at_ot-builder_slash_io-bin-glyph-store";
       packageName = "@ot-builder/io-bin-glyph-store";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.31.tgz";
-        sha512 = "7uL/j0AE+eRE+gdUKVILmRL1lKlBofUk1WQ6JV/HMFI7WcKQNRguifXMUlKARYJLdVJE2XB85q7TejJ8ycPVSA==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.33.tgz";
+        sha512 = "0pMS9l8Ip+IWokPV90VC2x1Xqvm3oAmVxK+FUgY9kogbZAwnQXmMzkXSvNk+HDHv6yVXq73c/v9AzztPVzW3DQ==";
       };
     };
-    "@ot-builder/io-bin-layout-0.10.31" = {
+    "@ot-builder/io-bin-layout-0.10.33" = {
       name = "_at_ot-builder_slash_io-bin-layout";
       packageName = "@ot-builder/io-bin-layout";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.31.tgz";
-        sha512 = "gLrHGKulldU6G5kMlNyMAofBOz/9/Om0RBvkXvt2djp6ndVFvTXGiWqeS0SdU5CJZxAZWGvKARETWQ4d0foz2g==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.33.tgz";
+        sha512 = "GjGUw00uuPIownm+gQoF9ntBJuaInqofYtb43ScjS1gvQX+qcjg7ZMHoaOcF0N9MmbgQRoQYde0JFXuagHdlVg==";
       };
     };
-    "@ot-builder/io-bin-metadata-0.10.31" = {
+    "@ot-builder/io-bin-metadata-0.10.33" = {
       name = "_at_ot-builder_slash_io-bin-metadata";
       packageName = "@ot-builder/io-bin-metadata";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.31.tgz";
-        sha512 = "fYJlzf7gTGMntv+/OmIS2KlyGJuFwWQX69L1IH4swV1VJXYC9KlA4GojFyZ1oAZLWBORZ0kuUuvjD/4nox4QCA==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.33.tgz";
+        sha512 = "0Wf5CVkJH3e6imQSsqMKuGV3xX//Vj8Mf3dRkuxCj9EC7C1W1dZoVwrBwKg8DS25uYyERQCHrjuJ4+hbArnfcQ==";
       };
     };
-    "@ot-builder/io-bin-metric-0.10.31" = {
+    "@ot-builder/io-bin-metric-0.10.33" = {
       name = "_at_ot-builder_slash_io-bin-metric";
       packageName = "@ot-builder/io-bin-metric";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.31.tgz";
-        sha512 = "6RueaPhQ2r2dTQ4/vncM1TCYjPpJ+N5vyFT4w0SJP30C46g1kn0bryyrhdpG0jvl+pLkty7MbwKOpBxOQ0RtdA==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.33.tgz";
+        sha512 = "lJQWWJl5fZaB1/u+s8xp/5bOrG6WKdz6HV9C669HhiUF29RbeYVgHqUz7Mf4tlcXqulTUddDwDGS552GuyJEfw==";
       };
     };
-    "@ot-builder/io-bin-name-0.10.31" = {
+    "@ot-builder/io-bin-name-0.10.33" = {
       name = "_at_ot-builder_slash_io-bin-name";
       packageName = "@ot-builder/io-bin-name";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.31.tgz";
-        sha512 = "x7aI+idbaNwJf2Ty9RaEOS/E0aEh33QihM2EhrcT20ui67hnx+99aAUXjVwp7puY0zXARy/u0k99r91SATrLqw==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.33.tgz";
+        sha512 = "rCuiBuln5t7e8CGHAFJqa8duCVFlPbhSXGb7TsOyrqyNbEwZPrCDx40grMVB46xjKdAj8ZeE1Y1jikxSNlPW7g==";
       };
     };
-    "@ot-builder/io-bin-sfnt-0.10.31" = {
+    "@ot-builder/io-bin-sfnt-0.10.33" = {
       name = "_at_ot-builder_slash_io-bin-sfnt";
       packageName = "@ot-builder/io-bin-sfnt";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.31.tgz";
-        sha512 = "ssmHoGAuxMe1QkS24+GlxcgjpHoxQDsBQrdTSfh4pkmRP9aSfOrMWLksBgSQCTzRmOwf3lEJH2gz2r3NbsZldw==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.33.tgz";
+        sha512 = "vLRxvsh8LYOwLPqPEGdedG9/KqVpfeR6ceHa0zYc0Y/5FwOYjwbscIdr3SlyKJsPBFVvbOuzvmIBkKC7rASc8w==";
       };
     };
-    "@ot-builder/io-bin-ttf-0.10.31" = {
+    "@ot-builder/io-bin-ttf-0.10.33" = {
       name = "_at_ot-builder_slash_io-bin-ttf";
       packageName = "@ot-builder/io-bin-ttf";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.31.tgz";
-        sha512 = "pDWFXlUvguvygBDFpeliDMSKOg/rFprhiyCz6wPokRYwJg8fDS5EDtJOQ6p9/Y0C1V12PWA1O+fucYBfqUmSQw==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.33.tgz";
+        sha512 = "8yJoOjvwpRPyRMs45/uNNS9kBS3iQFLCSdLRlikH9cqxCHDpVH0vr74XHf0LCWwhnG/DJzcbB6L8LRnhl+QH2A==";
       };
     };
-    "@ot-builder/ot-0.10.31" = {
+    "@ot-builder/ot-0.10.33" = {
       name = "_at_ot-builder_slash_ot";
       packageName = "@ot-builder/ot";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.31.tgz";
-        sha512 = "5Cit1J+bxKOgLsB+6jey90eOXLPHiUzJbdNmHrIwUyM5C5ZRXRLg5VRnrYPYZoRCLPaVjG6AXFP+WvALdaLp8A==";
+        url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.33.tgz";
+        sha512 = "fFR3y7oFFmdOHSPQV0yU5hYj9Ahg+M0Y46rvcI8JaUDywIWeuDV0p0YBZ83x4p4wX5k571aiY5lxQtZrDAHSRA==";
       };
     };
-    "@ot-builder/ot-encoding-0.10.31" = {
+    "@ot-builder/ot-encoding-0.10.33" = {
       name = "_at_ot-builder_slash_ot-encoding";
       packageName = "@ot-builder/ot-encoding";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.31.tgz";
-        sha512 = "cVQZu7ZxOb/Fq2Ilh6ka7vzHXCVyZYOATFthrsV3uZFF3Iz+xefrrK0eh38UEoRopmbqMiPC9U3IHr6A86h+JA==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.33.tgz";
+        sha512 = "rAt3lLA3sWtQCfGB1IPfkEzDpSjE4xom/qR7+xT38FXKu5SUqWQYLIqmtLmXX9oSo6oQ3z1Urx4rbdGYdwHpwQ==";
       };
     };
-    "@ot-builder/ot-ext-private-0.10.31" = {
+    "@ot-builder/ot-ext-private-0.10.33" = {
       name = "_at_ot-builder_slash_ot-ext-private";
       packageName = "@ot-builder/ot-ext-private";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.31.tgz";
-        sha512 = "G+TV59TNTa2tKrQ2/wy55dVoOP5uSVv6LfUcM2al5aM6pAjeWMV84BtBzDWH0nPTjlovyEmmiqDoUFgrm2TqYw==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.33.tgz";
+        sha512 = "+cQV1aTbCFXX+OyEIvRohlLbHpXTlzPJ8E4PICOyfqe41fw1DHbDEdilyQRvdLQ6TJqvvxktBD4xt+IOluviPw==";
       };
     };
-    "@ot-builder/ot-glyphs-0.10.31" = {
+    "@ot-builder/ot-glyphs-0.10.33" = {
       name = "_at_ot-builder_slash_ot-glyphs";
       packageName = "@ot-builder/ot-glyphs";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.31.tgz";
-        sha512 = "qY+O9RIXFalVg707swyfRK9beGDHEAKCGd74Rt9HdZIaWWPYfb+CH22zbwI+gVJEV/NRCTMGpZB1WrdLRm4q4w==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.33.tgz";
+        sha512 = "jpPxTDct01TTpJptMFDIuKzXYxhiNXpQIfikydKXQU+M7jDQJJLjIjAnz33MVzeMxR6+8og0F2qgG/OFcDMpTQ==";
       };
     };
-    "@ot-builder/ot-layout-0.10.31" = {
+    "@ot-builder/ot-layout-0.10.33" = {
       name = "_at_ot-builder_slash_ot-layout";
       packageName = "@ot-builder/ot-layout";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.31.tgz";
-        sha512 = "j1WZRr6V48jIvl0VROBbzI1MPNYJUbrjwwiPdzMpi/Moj/k0tMAO5d/3FKhvVMcvpgXtN/Pe2V3yxz9yXD37pw==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.33.tgz";
+        sha512 = "aa2b4Oa5B2YFZ//A+MAEEVBcLv0XEKTjtUARAj3bTthHNnPWJHjGjHUpNPMccBJNWysKwlz37cxAItpMXgpgOg==";
       };
     };
-    "@ot-builder/ot-metadata-0.10.31" = {
+    "@ot-builder/ot-metadata-0.10.33" = {
       name = "_at_ot-builder_slash_ot-metadata";
       packageName = "@ot-builder/ot-metadata";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.31.tgz";
-        sha512 = "H/Pdmf667+hLQkx7zpBecvwOW8VppxRSLSvKIopd0+TSdiXo9iZrmkkqnIHxA9/KPdvVLh6a/gzfxj5KwMMeDw==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.33.tgz";
+        sha512 = "pwwf49hCU3mjWkUUT4mIN7dtJr7fBtXozcOQ70vVAzTPE3kUOD/eun4Vs2UqHGkPRvOU89eEQQgQ+5941aH8rg==";
       };
     };
-    "@ot-builder/ot-name-0.10.31" = {
+    "@ot-builder/ot-name-0.10.33" = {
       name = "_at_ot-builder_slash_ot-name";
       packageName = "@ot-builder/ot-name";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.31.tgz";
-        sha512 = "38oV/H2n9x9DKl44XDdMWf8fY5lsgIlykxMUXT+2XlBS0Fw1u/S4THLXGhRG8nwcM6eJRzF+diL6/yGPCtpYfQ==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.33.tgz";
+        sha512 = "32jR7zRnkMLWmkdiQzXryRaPycbiJNJiPY016/efcv4hYuHvrq/tpXA5P6bEV205njy7n5KA7txrkSWZP9+0JA==";
       };
     };
-    "@ot-builder/ot-sfnt-0.10.31" = {
+    "@ot-builder/ot-sfnt-0.10.33" = {
       name = "_at_ot-builder_slash_ot-sfnt";
       packageName = "@ot-builder/ot-sfnt";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.31.tgz";
-        sha512 = "hkTeDmNMZqeWq5OwBPy5zpy6cFecfkT/zO6ZiPyqbo8ND6Qp6WoLvkhIST6Bwesh2mApffTKyePbGnHrfWdnkw==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.33.tgz";
+        sha512 = "/T4TfeimVDhLMRXInKhz2EGKzzWLAgijNaQpc7OO+Cxy3z43g0B6d7EzlsAD8W9lauYpuMnXEItvznY0wBgi7A==";
       };
     };
-    "@ot-builder/ot-standard-glyph-namer-0.10.31" = {
+    "@ot-builder/ot-standard-glyph-namer-0.10.33" = {
       name = "_at_ot-builder_slash_ot-standard-glyph-namer";
       packageName = "@ot-builder/ot-standard-glyph-namer";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.31.tgz";
-        sha512 = "at6KH+5XDfi+7buSy1AayHp0C8N8iEql5PO8ZeTry22uE9mI80spqBShdTbYjI4m7S4rgKxK+Mtx5+Iq1pku1Q==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.33.tgz";
+        sha512 = "PDz2ZupCN7DmIRSOvJWrv/uCUwUqEmWZSSrzu9vaSpIglbjSzKtQ9axi/SZIAMughky9YMxME8yiKFpHzI/FGw==";
       };
     };
-    "@ot-builder/prelude-0.10.31" = {
+    "@ot-builder/prelude-0.10.33" = {
       name = "_at_ot-builder_slash_prelude";
       packageName = "@ot-builder/prelude";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.31.tgz";
-        sha512 = "0GhgWpPaCetCvzJfpC5o11WqEQ0O6ZE5BLyiCC1cLCd2i/4zsyOlXvAUZ2FLvvR8Oz3Q/EtF1uZ12iuIxR75Hw==";
+        url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.33.tgz";
+        sha512 = "3dUiOB4e4BUT4u6YssK1pe/W8wSMw2+XG9TqtW9ZRrnFAaVxmEnrh7okde5Y26Rq/TtMiMmd7zUaP+ut9x9VYg==";
       };
     };
-    "@ot-builder/primitive-0.10.31" = {
+    "@ot-builder/primitive-0.10.33" = {
       name = "_at_ot-builder_slash_primitive";
       packageName = "@ot-builder/primitive";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.31.tgz";
-        sha512 = "1woeCUkc1BxsBNVGw9ALcR4P0Lk3iTK7LkRnMM2VCP+NhoF6aYM81FK1TYMZbmf21nS6OQtyZaT/+10oaZ1Y2A==";
+        url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.33.tgz";
+        sha512 = "0wNZRIgJ9j2fqF8m3ldGmqlRrR7JJesBJe1841pD/yY756A0aY0/mkqBB2SKo58YYZA+HZicUT8dlD1EgNCbXw==";
       };
     };
-    "@ot-builder/rectify-0.10.31" = {
+    "@ot-builder/rectify-0.10.33" = {
       name = "_at_ot-builder_slash_rectify";
       packageName = "@ot-builder/rectify";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.31.tgz";
-        sha512 = "QpHhRMGu0Hj1eN3nBKm2BYNHb2UOGi+2ZJP/QmH2GXMdE4LFOWmSN9Mvvubfxr23cjt3VtHK1X/5OBmhcEVfyA==";
+        url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.33.tgz";
+        sha512 = "JqAcAgy2feCstg++bgeH9JofhOSc++Sx/ZjIGRNgtu8qiGRxRGP2MTZdn4zEy4etQYpRSgiuJbCx1K9XmwNXHA==";
       };
     };
-    "@ot-builder/stat-glyphs-0.10.31" = {
+    "@ot-builder/stat-glyphs-0.10.33" = {
       name = "_at_ot-builder_slash_stat-glyphs";
       packageName = "@ot-builder/stat-glyphs";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.31.tgz";
-        sha512 = "GxSEEaRstSZV40FkF3SDTZceZN9UboBx3f9Kx2mSW2wfmQk14cCvQszLehXJsXnZ2+h9oVgJ8fpzSU0jY5Ip8g==";
+        url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.33.tgz";
+        sha512 = "fwvn4vnmQGKHVHOVrNUA56I++k8bbxyYrMh/ifdZhn7FrlCldeM5UvQfPbjsVoU1aIKGkr+WM6BBF1WkbXPsxg==";
       };
     };
-    "@ot-builder/trace-0.10.31" = {
+    "@ot-builder/trace-0.10.33" = {
       name = "_at_ot-builder_slash_trace";
       packageName = "@ot-builder/trace";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.31.tgz";
-        sha512 = "hCeRQp1FusNIU3B5gWL+0E5Ionr8RNF3nFk9wIuqYbgQqeaYpJaEcD4brlGp5BrgCqQA6n9pOTpogPMZOffdFw==";
+        url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.33.tgz";
+        sha512 = "8AKK0zw3z90ozZI/V2vByGc2QPTN3fJol/MwEsyY1wART7s0YIo2/Q4gFq72T2sTw10aBNH3CQ5cP8DPRFqCwg==";
       };
     };
-    "@ot-builder/var-store-0.10.31" = {
+    "@ot-builder/var-store-0.10.33" = {
       name = "_at_ot-builder_slash_var-store";
       packageName = "@ot-builder/var-store";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.31.tgz";
-        sha512 = "adpNdlPmVCrBZBbDTPITLGe/EJpdfgoZJ7vTiR6tQ0gfwkD88r/i9I/YovWYi1v0VonXEIH9IyGlH3iU13zXuw==";
+        url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.33.tgz";
+        sha512 = "3+9BBDVQ3FmG10XWsJwsVTh6ViNdiVej2Zw5h0aXtUkS9InaFkE4aRGSaqfm9zVhunTaxZ/cFNwZAXXLAJKSrQ==";
       };
     };
-    "@ot-builder/variance-0.10.31" = {
+    "@ot-builder/variance-0.10.33" = {
       name = "_at_ot-builder_slash_variance";
       packageName = "@ot-builder/variance";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.31.tgz";
-        sha512 = "3M2HFcPQs2YGsNdx5XuW+s1fwTnWYW2d/FpdLN9VtVa5THeI3GfUtWHlWgHIrYWycakM9+XPTbueQDTCEf26Cg==";
+        url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.33.tgz";
+        sha512 = "Fk4yLjEK1lcvfbUgLFfyepWyYToHtAPYjh/A7KgDPhnq1MYc5kNx8w3r9Pq9vHXr5csl36kyP7+iJC6z1HHPsQ==";
       };
     };
     "@parcel/fs-1.11.0" = {
@@ -4342,13 +4387,13 @@ let
         sha512 = "CY/a6Nw72vrlp/FPx38l4jfEHp4gNEbo8i+WlSJ2cnWO6VE6CKmnC1zb4yQLvdP8f3EuzzoOBZVq6aGN20M82Q==";
       };
     };
-    "@pm2/js-api-0.6.0" = {
+    "@pm2/js-api-0.6.1" = {
       name = "_at_pm2_slash_js-api";
       packageName = "@pm2/js-api";
-      version = "0.6.0";
+      version = "0.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.0.tgz";
-        sha512 = "ZgM/0yI8s3FRyxP01wI5UzDrVTecS/SmD98z25C9fsHo2Wz3JB1DtS4uIBlPopq2/R5HIQynTUJPDNn4qo1d/Q==";
+        url = "https://registry.npmjs.org/@pm2/js-api/-/js-api-0.6.1.tgz";
+        sha512 = "LImZWHEzcpIrLZ7kt4z3Gllkoz+CChHk2waDretOWeinSItyTMrNpzcXcZd2QikP/57qPolLfHGFipHJmOKkwQ==";
       };
     };
     "@pm2/pm2-version-check-1.0.3" = {
@@ -4369,15 +4414,6 @@ let
         sha512 = "uc6FmPEegAZawSHjUMFQwU7EjaDn7zy1iD/KD/wBROL9F4378OES8MKMYHoRAKT61Fk7LxVKZSDR5VespMQiqw==";
       };
     };
-    "@prettier/plugin-pug-1.10.1" = {
-      name = "_at_prettier_slash_plugin-pug";
-      packageName = "@prettier/plugin-pug";
-      version = "1.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.10.1.tgz";
-        sha512 = "HyX0FN8pGdumKS1eiVJ8jbYh8bx2DdbvBOpuKf4+SNP1Z8OFDZorl/q4ShH7oCqMAnFj2kFCpZkuIOkD6gZv7Q==";
-      };
-    };
     "@primer/octicons-11.0.0" = {
       name = "_at_primer_slash_octicons";
       packageName = "@primer/octicons";
@@ -4621,31 +4657,31 @@ let
         sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==";
       };
     };
-    "@schematics/angular-10.2.0" = {
+    "@schematics/angular-11.0.1" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "10.2.0";
+      version = "11.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.2.0.tgz";
-        sha512 = "rJRTTTL8CMMFb3ebCvAVHKHxuNzRqy/HtbXhJ82l5Xo/jXcm74eV2Q0RBUrNo1yBKWFIR+FIwiXLJaGcC/R9Pw==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.0.1.tgz";
+        sha512 = "cYq3NhFn4DLSXXtbYYU2w0sginkMfN1w7pXjZLT/+etXXbtANQAXSPrPrDQql004ZNMbuDKuC0aoXjv8hgXOfw==";
       };
     };
-    "@schematics/schematics-0.1002.0" = {
+    "@schematics/schematics-0.1100.1" = {
       name = "_at_schematics_slash_schematics";
       packageName = "@schematics/schematics";
-      version = "0.1002.0";
+      version = "0.1100.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1002.0.tgz";
-        sha512 = "A6z0j+GCgj3NPAJ3+OZPgU/8KYLHcVWN+ZELuQTFXZgN6mpgbxCmM3yymfo7+riaF0xx1mXlt8G+tO7xDsLVvQ==";
+        url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1100.1.tgz";
+        sha512 = "Y5J/qafyZtsu6spEFywGLjYMqEgONSDx9m8c8KL4c45+KqqerQeh2QQHims3G0brKUFIK3nCw95zqw+RMsGcsA==";
       };
     };
-    "@schematics/update-0.1002.0" = {
+    "@schematics/update-0.1100.1" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.1002.0";
+      version = "0.1100.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.1002.0.tgz";
-        sha512 = "g2bfJSAj3x/YL0GNhnHsDSQmO6DoxSnLxoFLqNN5+ukxK5jq7OZNDwMJGxZ3X6RcSMWKEkIKL/wlq9yhj2T/kw==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.1100.1.tgz";
+        sha512 = "EVcqdM/d5rC5L1UYnwhFMk/TjHlNgL5LGfroE13C38A+WpKKJquAjgOQLj4nPvJ5csdEZqn3Sui9yeEWc3hklQ==";
       };
     };
     "@segment/loosely-validate-event-2.0.0" = {
@@ -4720,13 +4756,13 @@ let
         sha512 = "zTJBhzjWtDBogLFnzoz6NYiQ6CThsxuvHQxSbBLcNK4+VQPIkrZOxaQ+dNCNLeLN1Tb3NnZDPNGkoThvgGwq3Q==";
       };
     };
-    "@serverless/platform-client-china-2.0.8" = {
+    "@serverless/platform-client-china-2.0.9" = {
       name = "_at_serverless_slash_platform-client-china";
       packageName = "@serverless/platform-client-china";
-      version = "2.0.8";
+      version = "2.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.8.tgz";
-        sha512 = "20sceKHkGP56HnwMgrdHwD963bxew63+hE2aNrcu1DtLuUqcRvP5evaWO/CwMDTajJJDhEwi3wQDxPpxtKlJ7A==";
+        url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.9.tgz";
+        sha512 = "qec3a5lVaMH0nccgjVgvcEF8M+M95BXZbbYDGypVHEieJQxrKqj057+VVKsiHBeHYXzr4B3v6pIyQHst40vpIw==";
       };
     };
     "@serverless/platform-sdk-2.3.2" = {
@@ -4765,13 +4801,31 @@ let
         sha512 = "yZQT2f8LIZZlH2ibAIvK4C/Ks72Y8CIWmGz04XGCLPHa/ANA6KqlXTKV6zWg/n1PDy2yj2zgX+m509VpIZuDeQ==";
       };
     };
-    "@serverless/utils-china-1.0.10" = {
+    "@serverless/utils-china-1.0.11" = {
       name = "_at_serverless_slash_utils-china";
       packageName = "@serverless/utils-china";
-      version = "1.0.10";
+      version = "1.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.10.tgz";
-        sha512 = "pMl6uW672Tll5rjFAYILxu1EwxSaWBE7r/Tr38sCgDOh0t36sRXiI3oCBHIu/C0tqKFfU1s+coRZbZYKkirCiw==";
+        url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.11.tgz";
+        sha512 = "raOPIoPSTrkWKBDuozkYWvLXP2W65K9Uk4ud+lPcbhhBSamO3uVW40nuAkC19MdIoAsFi5oTGYpcc9UDx8b+lg==";
+      };
+    };
+    "@shiftkey/node-abi-2.19.2-pre" = {
+      name = "_at_shiftkey_slash_node-abi";
+      packageName = "@shiftkey/node-abi";
+      version = "2.19.2-pre";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@shiftkey/node-abi/-/node-abi-2.19.2-pre.tgz";
+        sha512 = "+LfXo6nd2uZ8cGSJ66zL3OuddvG2oMWMc9GzpDoX2ZNMLmYpu+ReoEKXtmoKVwd6JSavDymldebCxSJh9NQ9cg==";
+      };
+    };
+    "@shiftkey/prebuild-install-6.0.1-pre2" = {
+      name = "_at_shiftkey_slash_prebuild-install";
+      packageName = "@shiftkey/prebuild-install";
+      version = "6.0.1-pre2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@shiftkey/prebuild-install/-/prebuild-install-6.0.1-pre2.tgz";
+        sha512 = "wDV1DgFxi0F+kTpyGNdnDctdw3Rb9aP8RBAGFE2wXr1+pXSCJRRA+Qh5ko5dKc0LeNIBZzjEECjmtAykajv+Xw==";
       };
     };
     "@sindresorhus/is-0.14.0" = {
@@ -4900,13 +4954,13 @@ let
         sha512 = "/TOzXGh+JFgAu8pWdo1oLFKDNfFk99TnSQG2lbEu+vKLI2ZrGAk9oGO0geNogAN7Ib4EDQOEhgb7YwqwL7aA7w==";
       };
     };
-    "@snyk/docker-registry-v2-client-1.13.6" = {
+    "@snyk/docker-registry-v2-client-1.13.8" = {
       name = "_at_snyk_slash_docker-registry-v2-client";
       packageName = "@snyk/docker-registry-v2-client";
-      version = "1.13.6";
+      version = "1.13.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.6.tgz";
-        sha512 = "upbnvJOIDuoRgDhG9xBVM3QmyE/NRwlTTHMj1T5Tlfr1nrasVWTVqKmgXEc9RSfL1zlLmyUudGK2fVNgi2wdEg==";
+        url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.8.tgz";
+        sha512 = "3PYCDWQ79HDsdUs964H3mSmdbMEdC8pGNeuMirM7rxKOkNzF6CYijfNyYLPbjS9YvmF5e7jdvUNnaP8miV7n9w==";
       };
     };
     "@snyk/gemfile-1.2.0" = {
@@ -4918,22 +4972,13 @@ let
         sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA==";
       };
     };
-    "@snyk/java-call-graph-builder-1.16.0" = {
+    "@snyk/java-call-graph-builder-1.16.2" = {
       name = "_at_snyk_slash_java-call-graph-builder";
       packageName = "@snyk/java-call-graph-builder";
-      version = "1.16.0";
+      version = "1.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.16.0.tgz";
-        sha512 = "bHbBR7NKCxLPxlsSdJ2pn2gBSfguBr9SAdo/2re9bEvHO/0hTefQiS0h/EJ4OpMCJbPyUN1BW4eaFq00MzgMtA==";
-      };
-    };
-    "@snyk/java-call-graph-builder-1.16.1" = {
-      name = "_at_snyk_slash_java-call-graph-builder";
-      packageName = "@snyk/java-call-graph-builder";
-      version = "1.16.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.16.1.tgz";
-        sha512 = "rxvSS9sz5h6fNjvUG6NhqYpUI8eok+xLTzLShfnSuDllI3JLxPMc/f7EKv5mv3GLlh1sVCCVXYeyIw3RAg5xQg==";
+        url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.16.2.tgz";
+        sha512 = "tJF+dY/wTfexwYuCgFB3RpWl4RGcf2H9RT9yurkTVi5wwKfvcNwZMUMwSlTDEFOqwmAsJ7e0uNVRlkPQHekCcQ==";
       };
     };
     "@snyk/rpm-parser-2.2.1" = {
@@ -4954,22 +4999,13 @@ let
         sha512 = "A+1xHD+SpmXQa0p+dWmiApFZtz/y37qAW9aWmFx2B1j7fwRBf9Qr89/6RbJOznf1a4nEitjzE3fa98yNZk/MNg==";
       };
     };
-    "@snyk/snyk-docker-pull-3.2.0" = {
+    "@snyk/snyk-docker-pull-3.2.2" = {
       name = "_at_snyk_slash_snyk-docker-pull";
       packageName = "@snyk/snyk-docker-pull";
-      version = "3.2.0";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.0.tgz";
-        sha512 = "uWKtjh29I/d0mfmfBN7w6RwwNBQxQVKrauF5ND/gqb0PVsKV22GIpkI+viWjI7KNKso6/B0tMmsv7TX2tsNcLQ==";
-      };
-    };
-    "@sorg/log-2.2.1" = {
-      name = "_at_sorg_slash_log";
-      packageName = "@sorg/log";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sorg/log/-/log-2.2.1.tgz";
-        sha512 = "GGtgReHuH7M+FS0pGy6tb3QPNVipjUl5+RWvG8yMP3Hb+Lq0AqsFYgBUz+FVECQ9J3otvsAzgOfz+8BIqRUr0Q==";
+        url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.2.tgz";
+        sha512 = "EL7LegIJJDpXCOENEUu8ljI5sy9anE/RuXM/JdK+i8sEiUdybiSOCJOw43EOdMqYP+tK7l2JIaxYBzcDIxi3+g==";
       };
     };
     "@starptech/expression-parser-0.10.0" = {
@@ -5296,13 +5332,13 @@ let
         sha512 = "MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==";
       };
     };
-    "@types/babel__template-7.0.3" = {
+    "@types/babel__template-7.4.0" = {
       name = "_at_types_slash_babel__template";
       packageName = "@types/babel__template";
-      version = "7.0.3";
+      version = "7.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz";
-        sha512 = "uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==";
+        url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz";
+        sha512 = "NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==";
       };
     };
     "@types/babel__traverse-7.0.15" = {
@@ -5485,13 +5521,13 @@ let
         sha512 = "98rXVukLD6/ozrQ2O80NAlWDGA4INg+tqsEReWJldqyi2fulC9V7Use/n28SWgROXKm6003ycWV4gZHoF8GA6w==";
       };
     };
-    "@types/eslint-7.2.4" = {
+    "@types/eslint-7.2.5" = {
       name = "_at_types_slash_eslint";
       packageName = "@types/eslint";
-      version = "7.2.4";
+      version = "7.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.4.tgz";
-        sha512 = "YCY4kzHMsHoyKspQH+nwSe+70Kep7Vjt2X+dZe5Vs2vkRudqtoFoUIv1RlJmZB8Hbp7McneupoZij4PadxsK5Q==";
+        url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.5.tgz";
+        sha512 = "Dc6ar9x16BdaR3NSxSF7T4IjL9gxxViJq8RmFd+2UAyA+K6ck2W+gUwfgpG/y9TPyUuBL35109bbULpEynvltA==";
       };
     };
     "@types/eslint-scope-3.7.0" = {
@@ -5917,6 +5953,15 @@ let
         sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6";
       };
     };
+    "@types/minimist-1.2.1" = {
+      name = "_at_types_slash_minimist";
+      packageName = "@types/minimist";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz";
+        sha512 = "fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==";
+      };
+    };
     "@types/mithril-2.0.3" = {
       name = "_at_types_slash_mithril";
       packageName = "@types/mithril";
@@ -6007,13 +6052,13 @@ let
         sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==";
       };
     };
-    "@types/node-14.14.6" = {
+    "@types/node-14.14.7" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.6";
+      version = "14.14.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.6.tgz";
-        sha512 = "6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz";
+        sha512 = "Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==";
       };
     };
     "@types/node-6.14.13" = {
@@ -6196,13 +6241,13 @@ let
         sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==";
       };
     };
-    "@types/serve-static-1.13.6" = {
+    "@types/serve-static-1.13.7" = {
       name = "_at_types_slash_serve-static";
       packageName = "@types/serve-static";
-      version = "1.13.6";
+      version = "1.13.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.6.tgz";
-        sha512 = "nuRJmv7jW7VmCVTn+IgYDkkbbDGyIINOeu/G0d74X3lm6E5KfMeQPJhxIt1ayQeQB3cSxvYs1RA/wipYoFB4EA==";
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.7.tgz";
+        sha512 = "3diZWucbR+xTmbDlU+FRRxBf+31OhFew7cJXML/zh9NmvSPTNoFecAwHB66BUqFgENJtqMiyl7JAwUE/siqdLw==";
       };
     };
     "@types/sizzle-2.3.2" = {
@@ -6358,13 +6403,13 @@ let
         sha512 = "C/jZ35OT5k/rsJyAK8mS1kM++vMcm89oSWegkzxRCvHllIq0cToZAkIDs6eCY4SKrvik3nrhELizyLcM0onbQA==";
       };
     };
-    "@types/webpack-4.41.24" = {
+    "@types/webpack-4.41.25" = {
       name = "_at_types_slash_webpack";
       packageName = "@types/webpack";
-      version = "4.41.24";
+      version = "4.41.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.24.tgz";
-        sha512 = "1A0MXPwZiMOD3DPMuOKUKcpkdPo8Lq33UGggZ7xio6wJ/jV1dAu5cXDrOfGDnldUroPIRLsr/DT43/GqOA4RFQ==";
+        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz";
+        sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==";
       };
     };
     "@types/webpack-sources-2.0.0" = {
@@ -6385,13 +6430,13 @@ let
         sha512 = "f5WLMpezwVxCLm1xQe/kdPpQIOmL0TXYx2O15VYfYzc7hTIdxiOoOvez+McSIw3b7z/1zGovew9YSL7+h4h7/Q==";
       };
     };
-    "@types/ws-7.2.9" = {
+    "@types/ws-7.4.0" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
-      version = "7.2.9";
+      version = "7.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.9.tgz";
-        sha512 = "gmXYAXr7G4BrRMnkGQGkGonc3ArVro9VZd//C1uns/qqsJyl2dxaJdlPMhZbcq5MTxFFC+ttFWtHSfVW5+hlRA==";
+        url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.0.tgz";
+        sha512 = "Y29uQ3Uy+58bZrFLhX36hcI3Np37nqWE7ky5tjiDoy1GDZnIwVxS0CgF+s+1bXMzjKBFy+fqaRfb708iNzdinw==";
       };
     };
     "@types/yargs-13.0.11" = {
@@ -7807,15 +7852,6 @@ let
         sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
       };
     };
-    "ajv-6.12.4" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "6.12.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz";
-        sha512 = "eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==";
-      };
-    };
     "ajv-6.12.6" = {
       name = "ajv";
       packageName = "ajv";
@@ -7879,13 +7915,13 @@ let
         sha512 = "0mAYXMSauA8RZ7r+B4+EAOYcZEcO9OK5EiQCR7W7Cv4E44pJj56ZnkKLJ9/PAcOc0dT+LlV9fdDcq2TxVJfOYw==";
       };
     };
-    "alex-9.0.1" = {
+    "alex-9.1.0" = {
       name = "alex";
       packageName = "alex";
-      version = "9.0.1";
+      version = "9.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/alex/-/alex-9.0.1.tgz";
-        sha512 = "q560b+fVMXvu3WVkvoYBUGRHRXo9K9P/Fnt6Xcq1VhZow9MNqoQ5x7OJTYzSStAElaGxaJ7djTef9pJrM3GBXg==";
+        url = "https://registry.npmjs.org/alex/-/alex-9.1.0.tgz";
+        sha512 = "mlNQ0CBGinzZj1pjiXaSLsihjZ4Kzq0U0EjR+DrZ3IQQfM4pf4OtxHI1agBIiEwv0tQUzimjgTk+5t9iHeT7Vw==";
       };
     };
     "align-text-0.1.4" = {
@@ -8644,15 +8680,6 @@ let
         sha512 = "pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig==";
       };
     };
-    "app-module-path-2.2.0" = {
-      name = "app-module-path";
-      packageName = "app-module-path";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/app-module-path/-/app-module-path-2.2.0.tgz";
-        sha1 = "641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5";
-      };
-    };
     "append-0.1.1" = {
       name = "append";
       packageName = "append";
@@ -9697,6 +9724,15 @@ let
         sha1 = "125dd09de95d3ea30a378adbed021092179b03c9";
       };
     };
+    "async-write-2.1.0" = {
+      name = "async-write";
+      packageName = "async-write";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async-write/-/async-write-2.1.0.tgz";
+        sha1 = "1e762817d849ce44bfac07925a42036787061b15";
+      };
+    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -9778,13 +9814,13 @@ let
         sha512 = "kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==";
       };
     };
-    "atomically-1.6.0" = {
+    "atomically-1.7.0" = {
       name = "atomically";
       packageName = "atomically";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/atomically/-/atomically-1.6.0.tgz";
-        sha512 = "mu394MH+yY2TSKMyH+978PcGMZ8sRNks2PuVeH6c2ED4mimR2LEE039MVcIGVhtmG54cKEMh4gKhxKL/CLaX/w==";
+        url = "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz";
+        sha512 = "Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==";
       };
     };
     "attach-ware-1.1.1" = {
@@ -9868,13 +9904,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.786.0" = {
+    "aws-sdk-2.792.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.786.0";
+      version = "2.792.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.786.0.tgz";
-        sha512 = "oL+rDkoBdn0Q3AxiEzSemCE3WqW6kBf0A72SIjDQZJb4/NDvA2mL2rpNQGaxaFX3zMHEwfUGcMu7T3q7I6Q0lw==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.792.0.tgz";
+        sha512 = "h7oSlrCDtZkW5qNw/idKmMjjNJaaPlXFY+NbqtaTjejpCyVuIonUmFvm8GW16V58Avj/hujJfhpX9q0BMCg+VQ==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -9994,6 +10030,15 @@ let
         sha512 = "z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==";
       };
     };
+    "babel-eslint-10.1.0" = {
+      name = "babel-eslint";
+      packageName = "babel-eslint";
+      version = "10.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz";
+        sha512 = "ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==";
+      };
+    };
     "babel-extract-comments-1.0.0" = {
       name = "babel-extract-comments";
       packageName = "babel-extract-comments";
@@ -10084,6 +10129,15 @@ let
         sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==";
       };
     };
+    "babel-loader-8.2.1" = {
+      name = "babel-loader";
+      packageName = "babel-loader";
+      version = "8.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.1.tgz";
+        sha512 = "dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==";
+      };
+    };
     "babel-plugin-dynamic-import-node-2.3.3" = {
       name = "babel-plugin-dynamic-import-node";
       packageName = "babel-plugin-dynamic-import-node";
@@ -10615,6 +10669,15 @@ let
         sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
       };
     };
+    "base64-js-1.5.1" = {
+      name = "base64-js";
+      packageName = "base64-js";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz";
+        sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==";
+      };
+    };
     "base64-stream-1.0.0" = {
       name = "base64-stream";
       packageName = "base64-stream";
@@ -10696,6 +10759,15 @@ let
         sha1 = "dc34314f4e679318093fc760272525f94bf25c16";
       };
     };
+    "bcfg-0.1.6" = {
+      name = "bcfg";
+      packageName = "bcfg";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcfg/-/bcfg-0.1.6.tgz";
+        sha512 = "BR2vwQZwu24aRm588XHOnPVjjQtbK8sF0RopRFgMuke63/REJMWnePTa2YHKDBefuBYiVdgkowuB1/e4K7Ue3g==";
+      };
+    };
     "bcrypt-3.0.6" = {
       name = "bcrypt";
       packageName = "bcrypt";
@@ -10741,6 +10813,42 @@ let
         sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb";
       };
     };
+    "bcrypto-5.3.0" = {
+      name = "bcrypto";
+      packageName = "bcrypto";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcrypto/-/bcrypto-5.3.0.tgz";
+        sha512 = "SP48cpoc4BkEPNOErdsZ1VjbtdXY/C0f5wAywWniLne/Fd/5oOBqLbC6ZavngLvk4oik76g4I7PO5KduJoqECQ==";
+      };
+    };
+    "bcurl-0.1.9" = {
+      name = "bcurl";
+      packageName = "bcurl";
+      version = "0.1.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcurl/-/bcurl-0.1.9.tgz";
+        sha512 = "WV9LKCqFPtmGwIOqHexJx3Mm/9H/G5bwSCZxJXq9WRrnVQmd58L+Ltxgp/2QicveDG6AgTfepP6JtNiYWbbeHQ==";
+      };
+    };
+    "bdb-1.3.0" = {
+      name = "bdb";
+      packageName = "bdb";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bdb/-/bdb-1.3.0.tgz";
+        sha512 = "oJnWnHOTcnJhazwpEzQvPFtSR1IdHtS3PczuLY3klgZTTtRUbARX7tdphQS8iNUUwEVMfuO93eHDWwTICoeJlg==";
+      };
+    };
+    "bdns-0.1.5" = {
+      name = "bdns";
+      packageName = "bdns";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bdns/-/bdns-0.1.5.tgz";
+        sha512 = "LNVkfM7ynlAD0CvPvO9cKxW8YXt1KOCRQZlRsGZWeMyymUWVdHQpZudAzH9chaFAz6HiwAnQxwDemCKDPy6Mag==";
+      };
+    };
     "beeper-1.1.1" = {
       name = "beeper";
       packageName = "beeper";
@@ -10822,6 +10930,42 @@ let
         sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
       };
     };
+    "bevent-0.1.5" = {
+      name = "bevent";
+      packageName = "bevent";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bevent/-/bevent-0.1.5.tgz";
+        sha512 = "hs6T3BjndibrAmPSoKTHmKa3tz/c6Qgjv9iZw+tAoxuP6izfTCkzfltBQrW7SuK5xnY22gv9jCEf51+mRH+Qvg==";
+      };
+    };
+    "bfile-0.2.2" = {
+      name = "bfile";
+      packageName = "bfile";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bfile/-/bfile-0.2.2.tgz";
+        sha512 = "X205SsJ7zFAnjeJ/pBLqDqF10x/4Su3pBy8UdVKw4hdGJk7t5pLoRi+uG4rPaDAClGbrEfT/06PGUbYiMYKzTg==";
+      };
+    };
+    "bfilter-1.0.5" = {
+      name = "bfilter";
+      packageName = "bfilter";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bfilter/-/bfilter-1.0.5.tgz";
+        sha512 = "GupIidtCvLbKhXnA1sxvrwa+gh95qbjafy7P1U1x/2DHxNabXq4nGW0x3rmgzlJMYlVl+c8fMxoMRIwpKYlgcQ==";
+      };
+    };
+    "bheep-0.1.5" = {
+      name = "bheep";
+      packageName = "bheep";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bheep/-/bheep-0.1.5.tgz";
+        sha512 = "0KR5Zi8hgJBKL35+aYzndCTtgSGakOMxrYw2uszd5UmXTIfx3+drPGoETlVbQ6arTdAzSoQYA1j35vbaWpQXBg==";
+      };
+    };
     "biased-opener-0.2.8" = {
       name = "biased-opener";
       packageName = "biased-opener";
@@ -10957,6 +11101,15 @@ let
         sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==";
       };
     };
+    "binet-0.3.6" = {
+      name = "binet";
+      packageName = "binet";
+      version = "0.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/binet/-/binet-0.3.6.tgz";
+        sha512 = "6pm+Gc3uNiiJZEv0k8JDWqQlo9ki/o9UNAkLmr0EGm7hI5MboOJVIOlO1nw3YuDkLHWN78OPsaC4JhRkn2jMLw==";
+      };
+    };
     "bitfield-0.1.0" = {
       name = "bitfield";
       packageName = "bitfield";
@@ -11020,13 +11173,13 @@ let
         sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ==";
       };
     };
-    "bittorrent-lsd-1.0.0" = {
+    "bittorrent-lsd-1.1.0" = {
       name = "bittorrent-lsd";
       packageName = "bittorrent-lsd";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-lsd/-/bittorrent-lsd-1.0.0.tgz";
-        sha512 = "rM3ECQrtEiE1ef5TTdQbWJgbpd4NQur3bxrNs0r5VPcYfnFhXT85m75+whkyV5NIwNsndS7M/D+Uf/Mi/BUrWg==";
+        url = "https://registry.npmjs.org/bittorrent-lsd/-/bittorrent-lsd-1.1.0.tgz";
+        sha512 = "j9F+bDt1R//+kLfeSgkmc1A3x0u70gjb/FXaRgTtw+V3wIeYjOekiIlmsXf1SNKuxU5YHDkNL8CFNHx+MfSPSw==";
       };
     };
     "bittorrent-peerid-1.3.3" = {
@@ -11146,6 +11299,15 @@ let
         sha512 = "jLLXR9pjjm/T2jY0Q8OCCpuDquWiMULkPyT8YNaiLUR0j1MchTQK/Q7SiuD63jn9ekn9BrohwP1Kom/FylmeHQ==";
       };
     };
+    "blgr-0.1.8" = {
+      name = "blgr";
+      packageName = "blgr";
+      version = "0.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/blgr/-/blgr-0.1.8.tgz";
+        sha512 = "9AvDK+lc92q//63S8cHtkaB060YOZqoqd0DkMwn35mR1SrcY0FXnCHePHZFx6Oe1d/6wj8Lw7mKEGoShCUf3Yw==";
+      };
+    };
     "blob-0.0.2" = {
       name = "blob";
       packageName = "blob";
@@ -11191,6 +11353,24 @@ let
         sha512 = "1oI+RHHUEo64xomy1ozLgVJetFlHkIfQfJzTBQrj6xWnEMEPooeo2fZoqFjp0yzfHMBrgxwgh70tKp6T17+i3g==";
       };
     };
+    "blru-0.1.6" = {
+      name = "blru";
+      packageName = "blru";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/blru/-/blru-0.1.6.tgz";
+        sha512 = "34+xZ2u4ys/aUzWCU9m6Eee4nVuN1ywdxbi8b3Z2WULU6qvnfeHvCWEdGzlVfRbbhimG2xxJX6R77GD2cuVO6w==";
+      };
+    };
+    "blst-0.1.5" = {
+      name = "blst";
+      packageName = "blst";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/blst/-/blst-0.1.5.tgz";
+        sha512 = "TPl04Cx3CHdPFAJ2x9Xx1Z1FOfpAzmNPfHkfo+pGAaNH4uLhS58ExvamVkZh3jadF+B7V5sMtqvrqdf9mHINYA==";
+      };
+    };
     "bluebird-1.1.1" = {
       name = "bluebird";
       packageName = "bluebird";
@@ -11254,6 +11434,15 @@ let
         sha1 = "e05a63f796a6c1ff25f4771ec7adadc148c07233";
       };
     };
+    "bmutex-0.1.6" = {
+      name = "bmutex";
+      packageName = "bmutex";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bmutex/-/bmutex-0.1.6.tgz";
+        sha512 = "nXWOXtQHbfPaMl6jyEF/rmRMrcemj2qn+OCAI/uZYurjfx7Dg3baoXdPzHOL0U8Cfvn8CWxKcnM/rgxL7DR4zw==";
+      };
+    };
     "bn.js-4.11.9" = {
       name = "bn.js";
       packageName = "bn.js";
@@ -11290,6 +11479,15 @@ let
         sha1 = "e16661697452d436bf9886238cc791b08d66a61a";
       };
     };
+    "bns-0.13.0" = {
+      name = "bns";
+      packageName = "bns";
+      version = "0.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bns/-/bns-0.13.0.tgz";
+        sha512 = "2aRg/m7+fvXsf+CpR30f0iXTgAFdf2UdhreZNhxbgMpVTo83rnlGhb6QuMznGIiqDxj6akDnONVg50M8wADoIw==";
+      };
+    };
     "body-0.1.0" = {
       name = "body";
       packageName = "body";
@@ -11704,13 +11902,13 @@ let
         sha1 = "98dde8aa5c561fd6d3fe49bbaa102b74b396fdea";
       };
     };
-    "browserify-rsa-4.0.1" = {
+    "browserify-rsa-4.1.0" = {
       name = "browserify-rsa";
       packageName = "browserify-rsa";
-      version = "4.0.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
-        sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
+        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz";
+        sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==";
       };
     };
     "browserify-sign-4.2.1" = {
@@ -11758,13 +11956,31 @@ let
         sha512 = "TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==";
       };
     };
-    "browserslist-4.14.6" = {
+    "browserslist-4.14.7" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.14.6";
+      version = "4.14.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.6.tgz";
-        sha512 = "zeFYcUo85ENhc/zxHbiIp0LGzzTrE2Pv2JhxvS7kpUb9Q9D38kUX6Bie7pGutJ/5iF5rOxE7CepAuWD56xJ33A==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz";
+        sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==";
+      };
+    };
+    "brq-0.1.8" = {
+      name = "brq";
+      packageName = "brq";
+      version = "0.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brq/-/brq-0.1.8.tgz";
+        sha512 = "6SDY1lJMKXgt5TZ6voJQMH2zV1XPWWtm203PSkx3DSg9AYNYuRfOPFSBDkNemabzgpzFW9/neR4YhTvyJml8rQ==";
+      };
+    };
+    "bs32-0.1.6" = {
+      name = "bs32";
+      packageName = "bs32";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bs32/-/bs32-0.1.6.tgz";
+        sha512 = "usjDesQqZ8ihHXOnOEQuAdymBHnJEfSd+aELFSg1jN/V3iAf12HrylHlRJwIt6DTMmXpBDQ+YBg3Q3DIYdhRgQ==";
       };
     };
     "bser-2.1.1" = {
@@ -11776,6 +11992,42 @@ let
         sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==";
       };
     };
+    "bsert-0.0.10" = {
+      name = "bsert";
+      packageName = "bsert";
+      version = "0.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bsert/-/bsert-0.0.10.tgz";
+        sha512 = "NHNwlac+WPy4t2LoNh8pXk8uaIGH3NSaIUbTTRXGpE2WEbq0te/tDykYHkFK57YKLPjv/aGHmbqvnGeVWDz57Q==";
+      };
+    };
+    "bsock-0.1.9" = {
+      name = "bsock";
+      packageName = "bsock";
+      version = "0.1.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bsock/-/bsock-0.1.9.tgz";
+        sha512 = "/l9Kg/c5o+n/0AqreMxh2jpzDMl1ikl4gUxT7RFNe3A3YRIyZkiREhwcjmqxiymJSRI/Qhew357xGn1SLw/xEw==";
+      };
+    };
+    "bsocks-0.2.5" = {
+      name = "bsocks";
+      packageName = "bsocks";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bsocks/-/bsocks-0.2.5.tgz";
+        sha512 = "w1yG8JmfKPIaTDLuR9TIxJM2Ma6nAiInRpLNZ43g3qPnPHjawCC4SV6Bdy84bEJQX1zJWYTgdod/BnQlDhq4Gg==";
+      };
+    };
+    "btcp-0.1.5" = {
+      name = "btcp";
+      packageName = "btcp";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/btcp/-/btcp-0.1.5.tgz";
+        sha512 = "tkrtMDxeJorn5p0KxaLXELneT8AbfZMpOFeoKYZ5qCCMMSluNuwut7pGccLC5YOJqmuk0DR774vNVQLC9sNq/A==";
+      };
+    };
     "btoa-lite-1.0.0" = {
       name = "btoa-lite";
       packageName = "btoa-lite";
@@ -11803,6 +12055,15 @@ let
         sha1 = "7dad97f17128da396169bf37ada4acb195361e30";
       };
     };
+    "budp-0.1.6" = {
+      name = "budp";
+      packageName = "budp";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/budp/-/budp-0.1.6.tgz";
+        sha512 = "o+a8NPq3DhV91j4nInjht2md6mbU1XL+7ciPltP66rw5uD3KP1m5r8lA94LZVaPKcFdJ0l2HVVzRNxnY26Pefg==";
+      };
+    };
     "buefy-helper-json-1.0.3" = {
       name = "buefy-helper-json";
       packageName = "buefy-helper-json";
@@ -11839,6 +12100,15 @@ let
         sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==";
       };
     };
+    "buffer-6.0.2" = {
+      name = "buffer";
+      packageName = "buffer";
+      version = "6.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer/-/buffer-6.0.2.tgz";
+        sha512 = "XeXCUm+F7uY7fIzq4pKy+BLbZk4SgYS5xwlZOFYD3UEcAD+PwOoTaFr/SaXvhR1yRa8SKyPSZ7LNX4N65w7h8A==";
+      };
+    };
     "buffer-alloc-1.2.0" = {
       name = "buffer-alloc";
       packageName = "buffer-alloc";
@@ -11965,6 +12235,15 @@ let
         sha512 = "I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==";
       };
     };
+    "buffer-map-0.0.7" = {
+      name = "buffer-map";
+      packageName = "buffer-map";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-map/-/buffer-map-0.0.7.tgz";
+        sha512 = "95try3p/vMRkIAAnJDaGkFhGpT/65NoeW6XelEPjAomWYR58RQtW4khn0SwKj34kZoE7uxL7w2koZSwbnszvQQ==";
+      };
+    };
     "buffer-queue-1.0.0" = {
       name = "buffer-queue";
       packageName = "buffer-queue";
@@ -12055,6 +12334,15 @@ let
         sha1 = "7afd74a45f937fa422a1d338c08bbfdc76cd725d";
       };
     };
+    "bufio-1.0.7" = {
+      name = "bufio";
+      packageName = "bufio";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bufio/-/bufio-1.0.7.tgz";
+        sha512 = "bd1dDQhiC+bEbEfg56IdBv7faWa6OipMs/AFFFvtFnB3wAYjlwQpQRZ0pm6ZkgtfL0pILRXhKxOiQj6UzoMR7A==";
+      };
+    };
     "bufrw-1.3.0" = {
       name = "bufrw";
       packageName = "bufrw";
@@ -12145,6 +12433,15 @@ let
         sha512 = "tY6iaw+iYbCjlsAgAyO4CeA7Usnj5VndygMfd2PcHK++626oMoHANcdsH5tq5VxRPsbk9M1fbuk0a5pX9axV2w==";
       };
     };
+    "bupnp-0.2.6" = {
+      name = "bupnp";
+      packageName = "bupnp";
+      version = "0.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bupnp/-/bupnp-0.2.6.tgz";
+        sha512 = "J6ykzJhZMxXKN78K+1NzFi3v/51X2Mvzp2hW42BWwmxIVfau6PaN99gyABZ8x05e8MObWbsAis23gShhj9qpbw==";
+      };
+    };
     "busboy-0.2.14" = {
       name = "busboy";
       packageName = "busboy";
@@ -12163,6 +12460,24 @@ let
         sha512 = "y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw==";
       };
     };
+    "bval-0.1.6" = {
+      name = "bval";
+      packageName = "bval";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bval/-/bval-0.1.6.tgz";
+        sha512 = "jxNH9gSx7g749hQtS+nTxXYz/bLxwr4We1RHFkCYalNYcj12RfbW6qYWsKu0RYiKAdFcbNoZRHmWrIuXIyhiQQ==";
+      };
+    };
+    "bweb-0.1.10" = {
+      name = "bweb";
+      packageName = "bweb";
+      version = "0.1.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bweb/-/bweb-0.1.10.tgz";
+        sha512 = "3Kkz/rfsyAWUS+8DV5XYhwcgVN4DfDewrP+iFTcpQfdZzcF6+OypAq7dHOtXV0sW7U/3msA/sEEqz0MHZ9ERWg==";
+      };
+    };
     "byline-5.0.0" = {
       name = "byline";
       packageName = "byline";
@@ -12559,13 +12874,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001156" = {
+    "caniuse-lite-1.0.30001158" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001156";
+      version = "1.0.30001158";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001156.tgz";
-        sha512 = "z7qztybA2eFZTB6Z3yvaQBIoJpQtsewRD74adw2UbRWwsRq3jIPvgrQGawBMbfafekQaD21FWuXNcywtTDGGCw==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001158.tgz";
+        sha512 = "s5loVYY+yKpuVA3HyW8BarzrtJvwHReuzugQXlv1iR3LKSReoFXRm86mT6hT7PEF5RxW+XQZg+6nYjlywYzQ+g==";
       };
     };
     "canvas-2.6.1" = {
@@ -12784,15 +13099,6 @@ let
         sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==";
       };
     };
-    "chalk-4.0.0" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz";
-        sha512 = "N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==";
-      };
-    };
     "chalk-4.1.0" = {
       name = "chalk";
       packageName = "chalk";
@@ -13765,13 +14071,13 @@ let
         sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==";
       };
     };
-    "cliui-7.0.3" = {
+    "cliui-7.0.4" = {
       name = "cliui";
       packageName = "cliui";
-      version = "7.0.3";
+      version = "7.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-7.0.3.tgz";
-        sha512 = "Gj3QHTkVMPKqwP3f7B4KPkBZRMR9r4rfi5bXFpg1a+Svvj8l7q5CnkBkVQzfxT5DFSsGk2+PascOgL0JYkL2kw==";
+        url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz";
+        sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==";
       };
     };
     "clivas-0.1.4" = {
@@ -14143,6 +14449,15 @@ let
         sha512 = "jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==";
       };
     };
+    "color-3.1.2" = {
+      name = "color";
+      packageName = "color";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color/-/color-3.1.2.tgz";
+        sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==";
+      };
+    };
     "color-3.1.3" = {
       name = "color";
       packageName = "color";
@@ -14377,13 +14692,13 @@ let
         sha512 = "MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g==";
       };
     };
-    "command-line-usage-6.1.0" = {
+    "command-line-usage-6.1.1" = {
       name = "command-line-usage";
       packageName = "command-line-usage";
-      version = "6.1.0";
+      version = "6.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.0.tgz";
-        sha512 = "Ew1clU4pkUeo6AFVDFxCbnN7GIZfXl48HIOQeFQnkO3oOqvpI7wdqtLRwv9iOCZ/7A+z4csVZeiDdEcj8g6Wiw==";
+        url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.1.tgz";
+        sha512 = "F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA==";
       };
     };
     "commander-0.6.1" = {
@@ -15935,6 +16250,15 @@ let
         sha512 = "oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==";
       };
     };
+    "css-b64-images-0.2.5" = {
+      name = "css-b64-images";
+      packageName = "css-b64-images";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-b64-images/-/css-b64-images-0.2.5.tgz";
+        sha1 = "42005d83204b2b4a5d93b6b1a5644133b5927a02";
+      };
+    };
     "css-color-keywords-1.0.0" = {
       name = "css-color-keywords";
       packageName = "css-color-keywords";
@@ -16061,15 +16385,6 @@ let
         sha512 = "Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==";
       };
     };
-    "css-tree-1.0.0" = {
-      name = "css-tree";
-      packageName = "css-tree";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0.tgz";
-        sha512 = "CdVYz/Yuqw0VdKhXPBIgi8DO3NicJVYZNWeX9XcIuSp9ZoFT5IcleVRW07O5rMjdcx1mb+MEJPknTTEW7DdsYw==";
-      };
-    };
     "css-tree-1.0.0-alpha.37" = {
       name = "css-tree";
       packageName = "css-tree";
@@ -16079,6 +16394,15 @@ let
         sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==";
       };
     };
+    "css-tree-1.0.1" = {
+      name = "css-tree";
+      packageName = "css-tree";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.1.tgz";
+        sha512 = "WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA==";
+      };
+    };
     "css-what-1.0.0" = {
       name = "css-what";
       packageName = "css-what";
@@ -16196,13 +16520,13 @@ let
         sha1 = "178b43a44621221c27756086f531e02f42900ee8";
       };
     };
-    "csso-4.1.0" = {
+    "csso-4.1.1" = {
       name = "csso";
       packageName = "csso";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-4.1.0.tgz";
-        sha512 = "h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg==";
+        url = "https://registry.npmjs.org/csso/-/csso-4.1.1.tgz";
+        sha512 = "Rvq+e1e0TFB8E8X+8MQjHSY6vtol45s5gxtLI/018UsAn2IBMmwNEZRM/h+HVnAJRHjasLIKKUO3uvoMM28LvA==";
       };
     };
     "cssom-0.3.8" = {
@@ -16250,13 +16574,13 @@ let
         sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==";
       };
     };
-    "csstype-2.6.13" = {
+    "csstype-2.6.14" = {
       name = "csstype";
       packageName = "csstype";
-      version = "2.6.13";
+      version = "2.6.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csstype/-/csstype-2.6.13.tgz";
-        sha512 = "ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A==";
+        url = "https://registry.npmjs.org/csstype/-/csstype-2.6.14.tgz";
+        sha512 = "2mSc+VEpGPblzAxyeR+vZhJKgYg0Og0nnRi7pmRXFYYxSfnOnW8A5wwQb4n4cE2nIOzqKOAzLCaEX6aBmNEv8A==";
       };
     };
     "csurf-1.11.0" = {
@@ -16412,6 +16736,24 @@ let
         sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==";
       };
     };
+    "d3-5.16.0" = {
+      name = "d3";
+      packageName = "d3";
+      version = "5.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3/-/d3-5.16.0.tgz";
+        sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==";
+      };
+    };
+    "d3-array-1.2.4" = {
+      name = "d3-array";
+      packageName = "d3-array";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz";
+        sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==";
+      };
+    };
     "d3-array-2.8.0" = {
       name = "d3-array";
       packageName = "d3-array";
@@ -16421,6 +16763,51 @@ let
         sha512 = "6V272gsOeg7+9pTW1jSYOR1QE37g95I3my1hBmY+vOUNHRrk9yt4OTz/gK7PMkVAVDrYYq4mq3grTiZ8iJdNIw==";
       };
     };
+    "d3-axis-1.0.12" = {
+      name = "d3-axis";
+      packageName = "d3-axis";
+      version = "1.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.12.tgz";
+        sha512 = "ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==";
+      };
+    };
+    "d3-brush-1.1.6" = {
+      name = "d3-brush";
+      packageName = "d3-brush";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.6.tgz";
+        sha512 = "7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==";
+      };
+    };
+    "d3-chord-1.0.6" = {
+      name = "d3-chord";
+      packageName = "d3-chord";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.6.tgz";
+        sha512 = "JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==";
+      };
+    };
+    "d3-collection-1.0.7" = {
+      name = "d3-collection";
+      packageName = "d3-collection";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz";
+        sha512 = "ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==";
+      };
+    };
+    "d3-color-1.4.1" = {
+      name = "d3-color";
+      packageName = "d3-color";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz";
+        sha512 = "p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==";
+      };
+    };
     "d3-color-2.0.0" = {
       name = "d3-color";
       packageName = "d3-color";
@@ -16430,6 +16817,15 @@ let
         sha512 = "SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==";
       };
     };
+    "d3-contour-1.3.2" = {
+      name = "d3-contour";
+      packageName = "d3-contour";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-contour/-/d3-contour-1.3.2.tgz";
+        sha512 = "hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==";
+      };
+    };
     "d3-delaunay-5.3.0" = {
       name = "d3-delaunay";
       packageName = "d3-delaunay";
@@ -16439,6 +16835,15 @@ let
         sha512 = "amALSrOllWVLaHTnDLHwMIiz0d1bBu9gZXd1FiLfXf8sHcX9jrcj81TVZOqD4UX7MgBZZ07c8GxzEgBpJqc74w==";
       };
     };
+    "d3-dispatch-1.0.6" = {
+      name = "d3-dispatch";
+      packageName = "d3-dispatch";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz";
+        sha512 = "fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==";
+      };
+    };
     "d3-dispatch-2.0.0" = {
       name = "d3-dispatch";
       packageName = "d3-dispatch";
@@ -16448,6 +16853,24 @@ let
         sha512 = "S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA==";
       };
     };
+    "d3-drag-1.2.5" = {
+      name = "d3-drag";
+      packageName = "d3-drag";
+      version = "1.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz";
+        sha512 = "rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==";
+      };
+    };
+    "d3-dsv-1.2.0" = {
+      name = "d3-dsv";
+      packageName = "d3-dsv";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz";
+        sha512 = "9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==";
+      };
+    };
     "d3-dsv-2.0.0" = {
       name = "d3-dsv";
       packageName = "d3-dsv";
@@ -16457,6 +16880,33 @@ let
         sha512 = "E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w==";
       };
     };
+    "d3-ease-1.0.7" = {
+      name = "d3-ease";
+      packageName = "d3-ease";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.7.tgz";
+        sha512 = "lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==";
+      };
+    };
+    "d3-fetch-1.2.0" = {
+      name = "d3-fetch";
+      packageName = "d3-fetch";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-fetch/-/d3-fetch-1.2.0.tgz";
+        sha512 = "yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==";
+      };
+    };
+    "d3-force-1.2.1" = {
+      name = "d3-force";
+      packageName = "d3-force";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz";
+        sha512 = "HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==";
+      };
+    };
     "d3-force-2.1.1" = {
       name = "d3-force";
       packageName = "d3-force";
@@ -16466,6 +16916,15 @@ let
         sha512 = "nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew==";
       };
     };
+    "d3-format-1.4.5" = {
+      name = "d3-format";
+      packageName = "d3-format";
+      version = "1.4.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz";
+        sha512 = "J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==";
+      };
+    };
     "d3-format-2.0.0" = {
       name = "d3-format";
       packageName = "d3-format";
@@ -16475,6 +16934,15 @@ let
         sha512 = "Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==";
       };
     };
+    "d3-geo-1.12.1" = {
+      name = "d3-geo";
+      packageName = "d3-geo";
+      version = "1.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz";
+        sha512 = "XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==";
+      };
+    };
     "d3-geo-2.0.1" = {
       name = "d3-geo";
       packageName = "d3-geo";
@@ -16493,6 +16961,15 @@ let
         sha512 = "1JE+filVbkEX2bT25dJdQ05iA4QHvUwev6o0nIQHOSrNlHCAKfVss/U10vEM3pA4j5v7uQoFdQ4KLbx9BlEbWA==";
       };
     };
+    "d3-hierarchy-1.1.9" = {
+      name = "d3-hierarchy";
+      packageName = "d3-hierarchy";
+      version = "1.1.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz";
+        sha512 = "j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==";
+      };
+    };
     "d3-hierarchy-2.0.0" = {
       name = "d3-hierarchy";
       packageName = "d3-hierarchy";
@@ -16502,6 +16979,15 @@ let
         sha512 = "SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw==";
       };
     };
+    "d3-interpolate-1.4.0" = {
+      name = "d3-interpolate";
+      packageName = "d3-interpolate";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz";
+        sha512 = "V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==";
+      };
+    };
     "d3-interpolate-2.0.1" = {
       name = "d3-interpolate";
       packageName = "d3-interpolate";
@@ -16511,6 +16997,15 @@ let
         sha512 = "c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==";
       };
     };
+    "d3-path-1.0.9" = {
+      name = "d3-path";
+      packageName = "d3-path";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz";
+        sha512 = "VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==";
+      };
+    };
     "d3-path-2.0.0" = {
       name = "d3-path";
       packageName = "d3-path";
@@ -16520,6 +17015,24 @@ let
         sha512 = "ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA==";
       };
     };
+    "d3-polygon-1.0.6" = {
+      name = "d3-polygon";
+      packageName = "d3-polygon";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.6.tgz";
+        sha512 = "k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ==";
+      };
+    };
+    "d3-quadtree-1.0.7" = {
+      name = "d3-quadtree";
+      packageName = "d3-quadtree";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz";
+        sha512 = "RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==";
+      };
+    };
     "d3-quadtree-2.0.0" = {
       name = "d3-quadtree";
       packageName = "d3-quadtree";
@@ -16529,6 +17042,24 @@ let
         sha512 = "b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw==";
       };
     };
+    "d3-random-1.1.2" = {
+      name = "d3-random";
+      packageName = "d3-random";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz";
+        sha512 = "6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ==";
+      };
+    };
+    "d3-scale-2.2.2" = {
+      name = "d3-scale";
+      packageName = "d3-scale";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz";
+        sha512 = "LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==";
+      };
+    };
     "d3-scale-3.2.3" = {
       name = "d3-scale";
       packageName = "d3-scale";
@@ -16538,6 +17069,33 @@ let
         sha512 = "8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==";
       };
     };
+    "d3-scale-chromatic-1.5.0" = {
+      name = "d3-scale-chromatic";
+      packageName = "d3-scale-chromatic";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz";
+        sha512 = "ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==";
+      };
+    };
+    "d3-selection-1.4.2" = {
+      name = "d3-selection";
+      packageName = "d3-selection";
+      version = "1.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz";
+        sha512 = "SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==";
+      };
+    };
+    "d3-shape-1.3.7" = {
+      name = "d3-shape";
+      packageName = "d3-shape";
+      version = "1.3.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz";
+        sha512 = "EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==";
+      };
+    };
     "d3-shape-2.0.0" = {
       name = "d3-shape";
       packageName = "d3-shape";
@@ -16547,6 +17105,15 @@ let
         sha512 = "djpGlA779ua+rImicYyyjnOjeubyhql1Jyn1HK0bTyawuH76UQRWXd+pftr67H6Fa8hSwetkgb/0id3agKWykw==";
       };
     };
+    "d3-time-1.1.0" = {
+      name = "d3-time";
+      packageName = "d3-time";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz";
+        sha512 = "Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==";
+      };
+    };
     "d3-time-2.0.0" = {
       name = "d3-time";
       packageName = "d3-time";
@@ -16556,6 +17123,15 @@ let
         sha512 = "2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q==";
       };
     };
+    "d3-time-format-2.3.0" = {
+      name = "d3-time-format";
+      packageName = "d3-time-format";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz";
+        sha512 = "guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==";
+      };
+    };
     "d3-time-format-3.0.0" = {
       name = "d3-time-format";
       packageName = "d3-time-format";
@@ -16565,6 +17141,15 @@ let
         sha512 = "UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==";
       };
     };
+    "d3-timer-1.0.10" = {
+      name = "d3-timer";
+      packageName = "d3-timer";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz";
+        sha512 = "B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==";
+      };
+    };
     "d3-timer-2.0.0" = {
       name = "d3-timer";
       packageName = "d3-timer";
@@ -16574,6 +17159,33 @@ let
         sha512 = "TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==";
       };
     };
+    "d3-transition-1.3.2" = {
+      name = "d3-transition";
+      packageName = "d3-transition";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz";
+        sha512 = "sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==";
+      };
+    };
+    "d3-voronoi-1.1.4" = {
+      name = "d3-voronoi";
+      packageName = "d3-voronoi";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz";
+        sha512 = "dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==";
+      };
+    };
+    "d3-zoom-1.8.3" = {
+      name = "d3-zoom";
+      packageName = "d3-zoom";
+      version = "1.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.8.3.tgz";
+        sha512 = "VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==";
+      };
+    };
     "dag-map-1.0.2" = {
       name = "dag-map";
       packageName = "dag-map";
@@ -16583,6 +17195,24 @@ let
         sha1 = "e8379f041000ed561fc515475c1ed2c85eece8d7";
       };
     };
+    "dagre-0.8.5" = {
+      name = "dagre";
+      packageName = "dagre";
+      version = "0.8.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dagre/-/dagre-0.8.5.tgz";
+        sha512 = "/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==";
+      };
+    };
+    "dagre-d3-0.6.4" = {
+      name = "dagre-d3";
+      packageName = "dagre-d3";
+      version = "0.6.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dagre-d3/-/dagre-d3-0.6.4.tgz";
+        sha512 = "e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ==";
+      };
+    };
     "dargs-4.1.0" = {
       name = "dargs";
       packageName = "dargs";
@@ -16862,13 +17492,13 @@ let
         sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw==";
       };
     };
-    "dayjs-1.9.5" = {
+    "dayjs-1.9.6" = {
       name = "dayjs";
       packageName = "dayjs";
-      version = "1.9.5";
+      version = "1.9.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.5.tgz";
-        sha512 = "WULIw7UpW/E0y6VywewpbXAMH3d5cZijEhoHLwM+OMVbk/NtchKS/W+57H/0P1rqU7gHrAArjiRLHCUhgMQl6w==";
+        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.6.tgz";
+        sha512 = "HngNLtPEBWRo8EFVmHFmSXAjtCX8rGNqeXQI0Gh7wCTSqwaKgPIDqu9m07wABVopNwzvOeCb+2711vQhDlcIXw==";
       };
     };
     "deasync-0.1.15" = {
@@ -16880,13 +17510,13 @@ let
         sha512 = "pxMaCYu8cQIbGkA4Y1R0PLSooPIpH1WgFBLeJ+zLxQgHfkZG86ViJSmZmONSjZJ/R3NjwkMcIWZAzpLB2G9/CA==";
       };
     };
-    "deasync-0.1.20" = {
+    "deasync-0.1.21" = {
       name = "deasync";
       packageName = "deasync";
-      version = "0.1.20";
+      version = "0.1.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.20.tgz";
-        sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ==";
+        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.21.tgz";
+        sha512 = "kUmM8Y+PZpMpQ+B4AuOW9k2Pfx/mSupJtxOsLzmnHY2WqZUYRFccFn2RhzPAqt3Xb+sorK/badW2D4zNzqZz5w==";
       };
     };
     "death-1.1.0" = {
@@ -17555,15 +18185,6 @@ let
         sha512 = "1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==";
       };
     };
-    "del-cli-3.0.1" = {
-      name = "del-cli";
-      packageName = "del-cli";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/del-cli/-/del-cli-3.0.1.tgz";
-        sha512 = "BLHItGr82rUbHhjMu41d+vw9Md49i81jmZSV00HdTq4t+RTHywmEht/23mNFpUl2YeLYJZJyGz4rdlMAyOxNeg==";
-      };
-    };
     "delaunator-4.0.1" = {
       name = "delaunator";
       packageName = "delaunator";
@@ -17924,13 +18545,13 @@ let
         sha512 = "7/nIzKdQ8y2K0imjIP7dyg2GJ2h38Ps6VOMXWZHIarNDV3p6mTXyEugKFnkmsZ2DD58JEG34ILyVb3qdOMmP9w==";
       };
     };
-    "devtools-protocol-0.0.809251" = {
+    "devtools-protocol-0.0.818844" = {
       name = "devtools-protocol";
       packageName = "devtools-protocol";
-      version = "0.0.809251";
+      version = "0.0.818844";
       src = fetchurl {
-        url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.809251.tgz";
-        sha512 = "pf+2OY6ghMDPjKkzSWxHMq+McD+9Ojmq5XVRYpv/kPd9sTMQxzEt21592a31API8qRjro0iYYOc3ag46qF/1FA==";
+        url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz";
+        sha512 = "AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==";
       };
     };
     "dezalgo-1.0.3" = {
@@ -18896,13 +19517,13 @@ let
         sha512 = "vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==";
       };
     };
-    "easy-stack-1.0.0" = {
+    "easy-stack-1.0.1" = {
       name = "easy-stack";
       packageName = "easy-stack";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.0.tgz";
-        sha1 = "12c91b3085a37f0baa336e9486eac4bf94e3e788";
+        url = "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.1.tgz";
+        sha512 = "wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==";
       };
     };
     "ecc-jsbn-0.1.2" = {
@@ -19031,13 +19652,13 @@ let
         sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
       };
     };
-    "electron-to-chromium-1.3.589" = {
+    "electron-to-chromium-1.3.596" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.589";
+      version = "1.3.596";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.589.tgz";
-        sha512 = "rQItBTFnol20HaaLm26UgSUduX7iGerwW7pEYX17MB1tI6LzFajiLV7iZ7LVcUcsN/7HrZUoCLrBauChy/IqEg==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz";
+        sha512 = "nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -19113,15 +19734,6 @@ let
         sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==";
       };
     };
-    "emmet-2.1.6" = {
-      name = "emmet";
-      packageName = "emmet";
-      version = "2.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/emmet/-/emmet-2.1.6.tgz";
-        sha512 = "kfJMlze+k8jpX5CUx7xPYS83DxRNXuh8rQ98rQKnnf+wfo/KD+BG6pmpnEp5a7a1DWM9xmllKuOPfC7MeRmepQ==";
-      };
-    };
     "emoji-named-characters-1.0.2" = {
       name = "emoji-named-characters";
       packageName = "emoji-named-characters";
@@ -19347,13 +19959,13 @@ let
         sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==";
       };
     };
-    "engine.io-4.0.1" = {
+    "engine.io-4.0.2" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.1.tgz";
-        sha512 = "6EaSBxasBUwxRdf6B68SEYpD3tcrG80J4YTzHl/D+9Q+vM0AMHZabfYcc2WdnvEaQxZjX/UZsa+UdGoM0qQQkQ==";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.2.tgz";
+        sha512 = "sumdttqWLNjbuSMOSgDdL2xiEld9s5QZDk9VLyr4e28o+lzNNADhU3qpQDAY7cm2VZH0Otw/U0fL8mEjZ6kBMg==";
       };
     };
     "engine.io-client-1.3.1" = {
@@ -19491,6 +20103,15 @@ let
         sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==";
       };
     };
+    "entity-decode-2.0.2" = {
+      name = "entity-decode";
+      packageName = "entity-decode";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/entity-decode/-/entity-decode-2.0.2.tgz";
+        sha512 = "5CCY/3ci4MC1m2jlumNjWd7VBFt4VfFnmSqSNmVcXq4gxM3Vmarxtt+SvmBnzwLS669MWdVuXboNVj1qN2esVg==";
+      };
+    };
     "env-ci-3.2.2" = {
       name = "env-ci";
       packageName = "env-ci";
@@ -19671,13 +20292,13 @@ let
         sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==";
       };
     };
-    "es-get-iterator-1.1.0" = {
+    "es-get-iterator-1.1.1" = {
       name = "es-get-iterator";
       packageName = "es-get-iterator";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz";
-        sha512 = "UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==";
+        url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.1.tgz";
+        sha512 = "qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw==";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -20013,13 +20634,13 @@ let
         sha512 = "G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==";
       };
     };
-    "eslint-7.12.1" = {
+    "eslint-7.13.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "7.12.1";
+      version = "7.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz";
-        sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.13.0.tgz";
+        sha512 = "uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==";
       };
     };
     "eslint-plugin-no-unsanitized-3.1.4" = {
@@ -22101,13 +22722,13 @@ let
         sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==";
       };
     };
-    "flat-tree-1.6.0" = {
+    "flat-tree-1.7.0" = {
       name = "flat-tree";
       packageName = "flat-tree";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat-tree/-/flat-tree-1.6.0.tgz";
-        sha1 = "fca30cddb9006fb656eb5ebc79aeb274e7fde9ed";
+        url = "https://registry.npmjs.org/flat-tree/-/flat-tree-1.7.0.tgz";
+        sha512 = "dh9Dnlb5NLKDnJEtU6zP57FCDwusVoGhFAq3Uz1p/szjiuSlPdb3A3aoV31v4tlQMb3c8aDEUbqOpi+8DLDy7Q==";
       };
     };
     "flatiron-0.4.3" = {
@@ -22173,13 +22794,13 @@ let
         sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
       };
     };
-    "flow-parser-0.137.0" = {
+    "flow-parser-0.138.0" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.137.0";
+      version = "0.138.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.137.0.tgz";
-        sha512 = "i3KXJZ8lhlQI0n+BoZzIeH/rv+fNvAiu1i9/s64MklBV+HuhFbycUML7367J2eng0gapLnwvYPFNaPZys8POsA==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.138.0.tgz";
+        sha512 = "LFnTyjrv39UvCWl8NOcpByr/amj8a5k5z7isO2wv4T43nNrUnHQwX3rarTz9zcpHXkDAQv6X4MfQ4ZzJUptpbw==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -22218,13 +22839,13 @@ let
         sha1 = "ae049a714386bb83e342657a82924b70364a90d6";
       };
     };
-    "flumedb-2.1.8" = {
+    "flumedb-1.1.0" = {
       name = "flumedb";
       packageName = "flumedb";
-      version = "2.1.8";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flumedb/-/flumedb-2.1.8.tgz";
-        sha512 = "MtBCZFjj9GuqOQP8Ld87FbXm8ztQyLkLeuiHuB5+aACFuVn1kunnCis75R03ujFZTqCFmkBwFz7E016b3DB0zA==";
+        url = "https://registry.npmjs.org/flumedb/-/flumedb-1.1.0.tgz";
+        sha512 = "Bwol+72GU5z2DxZlnaxUA9A8qaRcQcdTprmRcgfqn2ldn147ByVh9Zyp90hVGPlo/oEN/yjOBUXcNkK3SYjbgA==";
       };
     };
     "flumelog-offset-3.4.4" = {
@@ -22470,13 +23091,13 @@ let
         sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ==";
       };
     };
-    "fork-ts-checker-webpack-plugin-5.2.1" = {
+    "fork-ts-checker-webpack-plugin-6.0.2" = {
       name = "fork-ts-checker-webpack-plugin";
       packageName = "fork-ts-checker-webpack-plugin";
-      version = "5.2.1";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz";
-        sha512 = "SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==";
+        url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.0.2.tgz";
+        sha512 = "3WrR/gNMcOAJ+macFpYTXxbt/xZDF9MLCYsPU3j9IUmS8LAvi8WoTiI001z1A8qkgmDtkoh6MTytTQqf8/7aOA==";
       };
     };
     "form-data-1.0.0-rc3" = {
@@ -22596,13 +23217,13 @@ let
         sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
       };
     };
-    "fp-ts-2.8.5" = {
+    "fp-ts-2.8.6" = {
       name = "fp-ts";
       packageName = "fp-ts";
-      version = "2.8.5";
+      version = "2.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.5.tgz";
-        sha512 = "g6do+Q/IQsxgsd2qU6+QnAbZaPR533seIbFyLGqWSxhNX4+F+cY37QdaYmMUOzekLOv/yg/2f15tc26tzDatgw==";
+        url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.6.tgz";
+        sha512 = "fGGpKf/Jy3UT4s16oM+hr/8F5QXFcZ+20NAvaZXH5Y5jsiLPMDCaNqffXq0z1Kr6ZUJj0346cH9tq+cI2SoJ4w==";
       };
     };
     "fragment-cache-0.2.1" = {
@@ -24136,6 +24757,15 @@ let
         sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew==";
       };
     };
+    "goosig-0.9.0" = {
+      name = "goosig";
+      packageName = "goosig";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/goosig/-/goosig-0.9.0.tgz";
+        sha512 = "RaCpYN0eStJQszrudhwf42hd8j/Nod6iRiUU81cnHjI0f3s4vhmVkvpPE7QktF/EUA9tkoG2hrYYr9NJXvgefg==";
+      };
+    };
     "gossip-query-2.0.2" = {
       name = "gossip-query";
       packageName = "gossip-query";
@@ -25261,13 +25891,13 @@ let
         sha1 = "b86ce808598e8a9d1892c571f3cedd86fc9f0653";
       };
     };
-    "highlight.js-10.1.1" = {
+    "highlight.js-10.3.2" = {
       name = "highlight.js";
       packageName = "highlight.js";
-      version = "10.1.1";
+      version = "10.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz";
-        sha512 = "b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg==";
+        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz";
+        sha512 = "3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw==";
       };
     };
     "highlight.js-8.2.0" = {
@@ -25423,6 +26053,15 @@ let
         sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2";
       };
     };
+    "hs-client-0.0.9" = {
+      name = "hs-client";
+      packageName = "hs-client";
+      version = "0.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hs-client/-/hs-client-0.0.9.tgz";
+        sha512 = "TAsexmpPhSVdCQ1iiX4bBnuqlThTSdGz/YKq+vjLSS1TZ2TwKxERJ8vZh1Wd6GGaMGLZl99uQR+2wUyk4HLSbg==";
+      };
+    };
     "hsl-regex-1.0.0" = {
       name = "hsl-regex";
       packageName = "hsl-regex";
@@ -25495,6 +26134,15 @@ let
         sha512 = "LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==";
       };
     };
+    "html-minifier-4.0.0" = {
+      name = "html-minifier";
+      packageName = "html-minifier";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz";
+        sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==";
+      };
+    };
     "html-minifier-terser-5.1.1" = {
       name = "html-minifier-terser";
       packageName = "html-minifier-terser";
@@ -25567,13 +26215,13 @@ let
         sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351";
       };
     };
-    "htmlnano-0.2.7" = {
+    "htmlnano-0.2.8" = {
       name = "htmlnano";
       packageName = "htmlnano";
-      version = "0.2.7";
+      version = "0.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.7.tgz";
-        sha512 = "ozbK3npguK3MTn77WCKngBtCDhc94fmEptPQsn+dO+uIWoEghIMKsjzCMnDJuu403M01ePg9GA5MpXhRBQ3PVg==";
+        url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.8.tgz";
+        sha512 = "q5gbo4SIDAE5sfJ5V0UD6uu+n1dcO/Mpr0B6SlDlJBoV7xKPne4uG4UwrT8vUWjdjIPJl95TY8EDuEbBW2TG0A==";
       };
     };
     "htmlparser2-3.10.1" = {
@@ -25612,15 +26260,6 @@ let
         sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==";
       };
     };
-    "htmlparser2-5.0.1" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz";
-        sha512 = "vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==";
-      };
-    };
     "http-auth-2.0.7" = {
       name = "http-auth";
       packageName = "http-auth";
@@ -25838,13 +26477,13 @@ let
         sha512 = "NwoTQYSJoFt34jSBbwzDHDofoA61NGXzu6wXh95o1Ry62EnmKjXb/nR/RknLeZ3G/uGwrlKNY2z7uPt+Cdl7Tw==";
       };
     };
-    "http-status-1.4.2" = {
+    "http-status-1.5.0" = {
       name = "http-status";
       packageName = "http-status";
-      version = "1.4.2";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-status/-/http-status-1.4.2.tgz";
-        sha512 = "mBnIohUwRw9NyXMEMMv8/GANnzEYUj0Y8d3uL01zDWFkxUjYyZ6rgCaAI2zZ1Wb34Oqtbx/nFZolPRDc8Xlm5A==";
+        url = "https://registry.npmjs.org/http-status/-/http-status-1.5.0.tgz";
+        sha512 = "wcGvY31MpFNHIkUcXHHnvrE4IKYlpvitJw5P/1u892gMBAM46muQ+RH7UN1d+Ntnfx5apnOnVY6vcLmrWHOLwg==";
       };
     };
     "http2-client-1.3.3" = {
@@ -27449,15 +28088,6 @@ let
         sha1 = "39acaa6be7fd1f3471dc42c7416e61c24317ac9f";
       };
     };
-    "is-expression-4.0.0" = {
-      name = "is-expression";
-      packageName = "is-expression";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz";
-        sha512 = "zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==";
-      };
-    };
     "is-extendable-0.1.1" = {
       name = "is-extendable";
       packageName = "is-extendable";
@@ -28943,22 +29573,22 @@ let
         sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA==";
       };
     };
-    "js-message-1.0.5" = {
+    "js-message-1.0.7" = {
       name = "js-message";
       packageName = "js-message";
-      version = "1.0.5";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-message/-/js-message-1.0.5.tgz";
-        sha1 = "2300d24b1af08e89dd095bc1a4c9c9cfcb892d15";
+        url = "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz";
+        sha512 = "efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA==";
       };
     };
-    "js-queue-2.0.0" = {
+    "js-queue-2.0.2" = {
       name = "js-queue";
       packageName = "js-queue";
-      version = "2.0.0";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-queue/-/js-queue-2.0.0.tgz";
-        sha1 = "362213cf860f468f0125fc6c96abc1742531f948";
+        url = "https://registry.npmjs.org/js-queue/-/js-queue-2.0.2.tgz";
+        sha512 = "pbKLsbCfi7kriM3s1J4DDCo7jQkI58zPLHi0heXPzPlj0hjUsm+FesPUbE0DSbIVIK503A36aUBoCN7eMFedkA==";
       };
     };
     "js-select-0.6.0" = {
@@ -29456,15 +30086,6 @@ let
         sha512 = "hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g==";
       };
     };
-    "jsonc-parser-2.3.0" = {
-      name = "jsonc-parser";
-      packageName = "jsonc-parser";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.0.tgz";
-        sha512 = "b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA==";
-      };
-    };
     "jsonc-parser-2.3.1" = {
       name = "jsonc-parser";
       packageName = "jsonc-parser";
@@ -29618,15 +30239,6 @@ let
         sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     };
-    "jssha-2.4.2" = {
-      name = "jssha";
-      packageName = "jssha";
-      version = "2.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jssha/-/jssha-2.4.2.tgz";
-        sha512 = "/jsi/9C0S70zfkT/4UlKQa5E1xKurDnXcQizcww9JSR/Fv+uIbWM2btG+bFcL3iNoK9jIGS0ls9HWLr1iw0kFg==";
-      };
-    };
     "jstransform-10.1.0" = {
       name = "jstransform";
       packageName = "jstransform";
@@ -29744,13 +30356,13 @@ let
         sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79";
       };
     };
-    "jwt-decode-3.1.1" = {
+    "jwt-decode-3.1.2" = {
       name = "jwt-decode";
       packageName = "jwt-decode";
-      version = "3.1.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.1.tgz";
-        sha512 = "EaH9dTD9ogCmxZRdiTsIUIJslqjoFfk8nEAi+Bq8u/aUjrVuhZ6eZjhWRH6SC9NBA0Lwr3K35H2zDnWvK/n4vQ==";
+        url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz";
+        sha512 = "UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==";
       };
     };
     "k-bucket-0.6.0" = {
@@ -29961,13 +30573,13 @@ let
         sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
       };
     };
-    "keytar-5.6.0" = {
+    "keytar-7.1.0" = {
       name = "keytar";
       packageName = "keytar";
-      version = "5.6.0";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keytar/-/keytar-5.6.0.tgz";
-        sha512 = "ueulhshHSGoryfRXaIvTj0BV1yB0KddBGhGoqCxSN9LR1Ks1GKuuCdVhF+2/YOs5fMl6MlTI9On1a4DHDXoTow==";
+        url = "https://registry.npmjs.org/keytar/-/keytar-7.1.0.tgz";
+        sha512 = "ciDrtCcvhKpmVfPMVAiKSeKKQd+8S2VWOIcJP0Rdwz/ezSxHxYrycpwufDGpEHJqLyi/F7C7iwoz0eKGllzcMw==";
       };
     };
     "keyv-3.0.0" = {
@@ -29997,6 +30609,15 @@ let
         sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==";
       };
     };
+    "khroma-1.1.0" = {
+      name = "khroma";
+      packageName = "khroma";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/khroma/-/khroma-1.1.0.tgz";
+        sha512 = "aTO+YX22tYOLEQJYFiatAj1lc5QZ+H5sHWFRBWNCiKwc5NWNUJZyeSeiHEPeURJ2a1GEVYcmyMUwGjjLe5ec5A==";
+      };
+    };
     "killable-1.0.1" = {
       name = "killable";
       packageName = "killable";
@@ -30960,6 +31581,15 @@ let
         sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==";
       };
     };
+    "loady-0.0.5" = {
+      name = "loady";
+      packageName = "loady";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loady/-/loady-0.0.5.tgz";
+        sha512 = "uxKD2HIj042/HBx77NBcmEPsD+hxCgAtjEWlYNScuUjIsh/62Uyu39GOR68TBR68v+jqDL9zfftCWoUo4y03sQ==";
+      };
+    };
     "locate-java-home-1.1.2" = {
       name = "locate-java-home";
       packageName = "locate-java-home";
@@ -32805,13 +33435,13 @@ let
         sha512 = "ZpqciThlbvE6KkyT5oxAup/6CwjePw1hdtR8NU5+vq2hn9Sp5b7w3bRiJRvo9fMHUj2dWSuVCdkqt9p4ed1V9Q==";
       };
     };
-    "magnet-uri-6.0.0" = {
+    "magnet-uri-6.1.0" = {
       name = "magnet-uri";
       packageName = "magnet-uri";
-      version = "6.0.0";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-6.0.0.tgz";
-        sha512 = "p9wst4k4u0seE7yPonAPKIUTaiC+fm706o2D8FrNoBalK5CcQdU4hB+RHQTqfIISYkFp0nZzsgyKPacPa6Yg/g==";
+        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-6.1.0.tgz";
+        sha512 = "731qLviHaqN/Ni96wm6gNKuvoip+QHWTznjHNz/4qDlsHh3/CWJoL8fZ18IIRhGJgnWoKJp8RVE5lZvQ60Khhw==";
       };
     };
     "make-dir-1.3.0" = {
@@ -33246,13 +33876,13 @@ let
         sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==";
       };
     };
-    "marked-1.2.3" = {
+    "marked-1.2.4" = {
       name = "marked";
       packageName = "marked";
-      version = "1.2.3";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-1.2.3.tgz";
-        sha512 = "RQuL2i6I6Gn+9n81IDNGbL0VHnta4a+8ZhqvryXEniTb/hQNtf3i26hi1XWUhzb9BgVyWHKR3UO8MaHtKoYibw==";
+        url = "https://registry.npmjs.org/marked/-/marked-1.2.4.tgz";
+        sha512 = "6x5TFGCTKSQBLTZtOburGxCxFEBJEGYVLwCMTBCxzvyuisGcC20UNzDSJhCr/cJ/Kmh6ulfJm10g6WWEAJ3kvg==";
       };
     };
     "marked-terminal-4.1.0" = {
@@ -33903,6 +34533,15 @@ let
         sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081";
       };
     };
+    "mermaid-8.8.3" = {
+      name = "mermaid";
+      packageName = "mermaid";
+      version = "8.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mermaid/-/mermaid-8.8.3.tgz";
+        sha512 = "+SK/kofUw9Y4u08hU5KhLuoMy3If6DMdZEmaWeNnq368FUHQBBZbe+Pr0hjuGbz81rbOkFqar1O1DJjXopjM+g==";
+      };
+    };
     "mersenne-0.0.4" = {
       name = "mersenne";
       packageName = "mersenne";
@@ -33912,13 +34551,13 @@ let
         sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085";
       };
     };
-    "metals-languageclient-0.3.2" = {
+    "metals-languageclient-0.3.3" = {
       name = "metals-languageclient";
       packageName = "metals-languageclient";
-      version = "0.3.2";
+      version = "0.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.3.2.tgz";
-        sha512 = "qpog+/luf+h3i6zvgDu05SMmDqEsPMYbcamy+odlysA9iT31k8j0mknR2uGAQ1ZLL4oWYCSct+2/zpxrYLiDng==";
+        url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.3.3.tgz";
+        sha512 = "lcYMlelg5pHFxFR1oz6vqZA9M6bi2IcCcPdkc/OAOg1KTkS5fGBrW8RXGnbKx/j+w0hQ3sUJsg16x5U/ikXVVA==";
       };
     };
     "metalsmith-2.3.0" = {
@@ -34299,6 +34938,15 @@ let
         sha512 = "LfHUYIA047rrqIZEn0gwbqbzarU5bmZ8yZ9SizeoiPwVq5cemE3foJTJZ3pCktUq/IPkKNGghFHJk1O8149mOA==";
       };
     };
+    "minify-4.1.3" = {
+      name = "minify";
+      packageName = "minify";
+      version = "4.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minify/-/minify-4.1.3.tgz";
+        sha512 = "ykuscavxivSmVpcCzsXmsVTukWYLUUtPhHj0w2ILvHDGqC+hsuTCihBn9+PJBd58JNvWTNg9132J9nrrI2anzA==";
+      };
+    };
     "minilog-3.1.0" = {
       name = "minilog";
       packageName = "minilog";
@@ -34659,13 +35307,13 @@ let
         sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d";
       };
     };
-    "mobx-6.0.3" = {
+    "mobx-6.0.4" = {
       name = "mobx";
       packageName = "mobx";
-      version = "6.0.3";
+      version = "6.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mobx/-/mobx-6.0.3.tgz";
-        sha512 = "DBMd0NXsMn25HJMUAWBndgJ2wRjOJPbpn6wdzUvZW0PVsyTnrw028XwQfzsjnxnKG+bAXGVNb38rvd+1o0G9uQ==";
+        url = "https://registry.npmjs.org/mobx/-/mobx-6.0.4.tgz";
+        sha512 = "wT2QJT9tW19VSHo9x7RPKU3z/I2Ps6wUS8Kb1OO+kzmg7UY3n4AkcaYG6jq95Lp1R9ohjC/NGYuT2PtuvBjhFg==";
       };
     };
     "mobx-react-6.3.1" = {
@@ -34812,13 +35460,22 @@ let
         sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
       };
     };
-    "moment-timezone-0.5.31" = {
+    "moment-mini-2.24.0" = {
+      name = "moment-mini";
+      packageName = "moment-mini";
+      version = "2.24.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment-mini/-/moment-mini-2.24.0.tgz";
+        sha512 = "9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ==";
+      };
+    };
+    "moment-timezone-0.5.32" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.31";
+      version = "0.5.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.31.tgz";
-        sha512 = "+GgHNg8xRhMXfEbv81iDtrVeTcWt0kWmTEY1XQK14dICTXnWJnT0dxdlPspwqF3keKMVPXwayEsk1DI0AA/jdA==";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.32.tgz";
+        sha512 = "Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA==";
       };
     };
     "monotonic-timestamp-0.0.9" = {
@@ -34929,6 +35586,15 @@ let
         sha512 = "LvghnKMFC70hKWMVykmhJarlO5e7lT3t9s9A2qPCUx+lazL3Mq55U+eCV0eLi7/nRRQYvEUWo/2tTo89EjnCJQ==";
       };
     };
+    "mrmr-0.1.10" = {
+      name = "mrmr";
+      packageName = "mrmr";
+      version = "0.1.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mrmr/-/mrmr-0.1.10.tgz";
+        sha512 = "NJRJs+yJyRWwcTqLRf7O32n56UP1+UQoTrGVEoB3LMj0h2jlon790drDbxKvi5mK5k4HfC0cpNkxqHcrJK/evg==";
+      };
+    };
     "ms-0.7.1" = {
       name = "ms";
       packageName = "ms";
@@ -35352,6 +36018,15 @@ let
         sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
       };
     };
+    "n64-0.2.10" = {
+      name = "n64";
+      packageName = "n64";
+      version = "0.2.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/n64/-/n64-0.2.10.tgz";
+        sha512 = "uH9geV4+roR1tohsrrqSOLCJ9Mh1iFcDI+9vUuydDlDxUS1UCAWUfuGb06p3dj3flzywquJNrGsQ7lHP8+4RVQ==";
+      };
+    };
     "nan-0.3.2" = {
       name = "nan";
       packageName = "nan";
@@ -35379,15 +36054,6 @@ let
         sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==";
       };
     };
-    "nan-2.14.1" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz";
-        sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==";
-      };
-    };
     "nan-2.14.2" = {
       name = "nan";
       packageName = "nan";
@@ -35857,13 +36523,13 @@ let
         sha512 = "pF8BiOr3Pa4kQLLiOu53I0d30EIUDM0DYqYvCQmKD96cMX2qLh/QsxT0Zh18IrL5a0IWQ236/o76lTe0yEEw6w==";
       };
     };
-    "netlify-redirector-0.2.0" = {
+    "netlify-redirector-0.2.1" = {
       name = "netlify-redirector";
       packageName = "netlify-redirector";
-      version = "0.2.0";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.2.0.tgz";
-        sha512 = "5SSUu++MXvE/tik90Hx7lzISBHCl5k4TqpVeTuBEoHp5K7uWitY7c3MjPNiY3kB83GSZiTNLbuIY7bo6mpyU3Q==";
+        url = "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.2.1.tgz";
+        sha512 = "17vDR9p1Loanp+vd57y+b6WlKb5X+qb0LZ44oTYsKJbdonz4Md+Ybv1lzH1w1aKm5YWWXHR8LMpWyY9bjlAJKw==";
       };
     };
     "netmask-1.0.6" = {
@@ -36073,6 +36739,15 @@ let
         sha512 = "ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==";
       };
     };
+    "node-addon-api-3.0.2" = {
+      name = "node-addon-api";
+      packageName = "node-addon-api";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz";
+        sha512 = "+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==";
+      };
+    };
     "node-appc-1.1.2" = {
       name = "node-appc";
       packageName = "node-appc";
@@ -36299,13 +36974,13 @@ let
         sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==";
       };
     };
-    "node-html-parser-1.4.8" = {
+    "node-html-parser-1.4.9" = {
       name = "node-html-parser";
       packageName = "node-html-parser";
-      version = "1.4.8";
+      version = "1.4.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.8.tgz";
-        sha512 = "goyDL2T1qnepirf64Qu1ttJ2UZmNGp1CPbG3pkh2VYc1yqzgPX0rjKN7vqThFcZmEIzC+ratLIod1O/MNXwgzg==";
+        url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.9.tgz";
+        sha512 = "UVcirFD1Bn0O+TSmloHeHqZZCxHjvtIeGdVdGMhyZ8/PWlEiZaZ5iJzR189yKZr8p0FXN58BUeC7RHRkf/KYGw==";
       };
     };
     "node-int64-0.4.0" = {
@@ -36317,13 +36992,13 @@ let
         sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b";
       };
     };
-    "node-ipc-9.1.1" = {
+    "node-ipc-9.1.3" = {
       name = "node-ipc";
       packageName = "node-ipc";
-      version = "9.1.1";
+      version = "9.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.1.tgz";
-        sha512 = "FAyICv0sIRJxVp3GW5fzgaf9jwwRQxAKDJlmNFUL5hOy+W4X/I5AypyHoq0DXXbo9o/gt79gj++4cMr4jVWE/w==";
+        url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.3.tgz";
+        sha512 = "8RS4RZyS/KMKKYG8mrje+cLxwATe9dBCuOiqKFSWND4oOuKytfuKCiR9yinvhoXF/nGdX/WnbywaUee+9U87zA==";
       };
     };
     "node-libs-browser-2.2.1" = {
@@ -36461,13 +37136,13 @@ let
         sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg==";
       };
     };
-    "node-releases-1.1.65" = {
+    "node-releases-1.1.66" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.65";
+      version = "1.1.66";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.65.tgz";
-        sha512 = "YpzJOe2WFIW0V4ZkJQd/DGR/zdVwc/pI4Nl1CZrBO19FdRcSTmsuhdttw9rsTzzJLrNcSloLiBbEYx1C4f6gpA==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz";
+        sha512 = "JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==";
       };
     };
     "node-source-walk-4.2.0" = {
@@ -36866,15 +37541,6 @@ let
         sha512 = "xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g==";
       };
     };
-    "npm-package-arg-8.0.1" = {
-      name = "npm-package-arg";
-      packageName = "npm-package-arg";
-      version = "8.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz";
-        sha512 = "/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==";
-      };
-    };
     "npm-package-arg-8.1.0" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
@@ -37578,13 +38244,13 @@ let
         sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==";
       };
     };
-    "office-ui-fabric-react-7.149.4" = {
+    "office-ui-fabric-react-7.150.0" = {
       name = "office-ui-fabric-react";
       packageName = "office-ui-fabric-react";
-      version = "7.149.4";
+      version = "7.150.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.149.4.tgz";
-        sha512 = "9gfzIGlQr9tijkR10S+chRkNhxtyf2bonPFwTvJh/vrJ3R2/CHanHEWh+k4KUjsz2+4bf/+aRY5mjKCpEG65qA==";
+        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.150.0.tgz";
+        sha512 = "2g617g8jp9eav54Qy9mRJzIqkF5Ugg0D7hUVgxCuQyxXMqSDCuuas6C+Fv+5pYi/AyTejbVp9EcT/bJ78oCf8A==";
       };
     };
     "omggif-1.0.10" = {
@@ -37803,15 +38469,6 @@ let
         sha512 = "lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA==";
       };
     };
-    "open-7.2.0" = {
-      name = "open";
-      packageName = "open";
-      version = "7.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-7.2.0.tgz";
-        sha512 = "4HeyhxCvBTI5uBePsAdi55C5fmqnWZ2e2MlmvWi5KW5tdH5rxoiv/aMtbeVxKZc3eWkT1GymMnLG8XC4Rq4TDQ==";
-      };
-    };
     "open-7.3.0" = {
       name = "open";
       packageName = "open";
@@ -38253,15 +38910,6 @@ let
         sha512 = "sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A==";
       };
     };
-    "ora-5.0.0" = {
-      name = "ora";
-      packageName = "ora";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ora/-/ora-5.0.0.tgz";
-        sha512 = "s26qdWqke2kjN/wC4dy+IQPBIMWBJlSU/0JZhk30ZDBLelW25rv66yutUWARMigpGPzcXHb+Nac5pNhN/WsARw==";
-      };
-    };
     "ora-5.1.0" = {
       name = "ora";
       packageName = "ora";
@@ -38397,22 +39045,22 @@ let
         sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
-    "ot-builder-0.10.31" = {
+    "ot-builder-0.10.33" = {
       name = "ot-builder";
       packageName = "ot-builder";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.31.tgz";
-        sha512 = "Cj/EsGzPQ4h59OWJJoXi5JEj94ULlxHB0ZwLvaRt6O3kmJ6PvZdp7MyEvi6fF0/BMcjFJOMOkcggbjAOCl/E3g==";
+        url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.33.tgz";
+        sha512 = "Xs2G7yDDlNcMOUTgBDHdtT4iLMs90uqwylB5T4l96+o9ePXSsa0TwtzrI7D5eFpiZY+u2PjXUNRcfvfh/HvQvw==";
       };
     };
-    "otb-ttc-bundle-0.10.31" = {
+    "otb-ttc-bundle-0.10.33" = {
       name = "otb-ttc-bundle";
       packageName = "otb-ttc-bundle";
-      version = "0.10.31";
+      version = "0.10.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.31.tgz";
-        sha512 = "PHT2rzKRD8QkwD7CrPDuh7tmtnaAVecK6JjALw7d4CajmNBvYbFlnb7fdpF1melyizJgnhigeN3hjHllEuqdMQ==";
+        url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.33.tgz";
+        sha512 = "xt7ZOSlNWN6DcWzH/2kYUVoB37FQjhe7ZZJ9JO7RysRQxlJWBciHpOK6oYHOm9rA1RGDbUYbVj9411yV5dqmXg==";
       };
     };
     "p-all-2.1.0" = {
@@ -39333,13 +39981,13 @@ let
         sha512 = "to8zT7+o6bVTyP35r2QgG1svuFGMFO1mE6ri1oWHgL9tlgnOtfjmfHmA3mOuP9HTIU/8OiZw0NG5zbyqVLxhvA==";
       };
     };
-    "parse-torrent-9.0.0" = {
+    "parse-torrent-9.1.0" = {
       name = "parse-torrent";
       packageName = "parse-torrent";
-      version = "9.0.0";
+      version = "9.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.0.0.tgz";
-        sha512 = "Er+VA8XwlGbuwEwss7LYIbWZRYvttS1c+0Td6FMxZhIog/0HDlU3A3qbRfL+1aOSM+L+kGL544yRoGbpTRWPsQ==";
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.0.tgz";
+        sha512 = "TVht2kv44bTHEd55KgmfEHyDh5djIBZMhaD6uFWnxLhJWUXy8lrIOsjPSs4Tfzs9PTGIgGM0k+UG6CFphHgOZQ==";
       };
     };
     "parse-torrent-file-2.1.4" = {
@@ -39639,15 +40287,6 @@ let
         sha512 = "nxl9nrnLQmh64iTzMfyylSlRozL7kAXIaxw1fVcLYdyhNkJCRUzirRZTikXGJsg+hc4fqpneTK6iU2H1Q8THSA==";
       };
     };
-    "patch-package-6.2.2" = {
-      name = "patch-package";
-      packageName = "patch-package";
-      version = "6.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz";
-        sha512 = "YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg==";
-      };
-    };
     "patel-0.33.1" = {
       name = "patel";
       packageName = "patel";
@@ -39873,13 +40512,13 @@ let
         sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0";
       };
     };
-    "patrisika-0.22.0" = {
+    "patrisika-0.22.2" = {
       name = "patrisika";
       packageName = "patrisika";
-      version = "0.22.0";
+      version = "0.22.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/patrisika/-/patrisika-0.22.0.tgz";
-        sha512 = "2ug3pMunBT5js9S6+6cpt7KkfQA+nQ35nZi6aiiS6S0GdqvXhcsaSvOnczJosEZK9Xrar4j8t9J1VpNnVMrHWw==";
+        url = "https://registry.npmjs.org/patrisika/-/patrisika-0.22.2.tgz";
+        sha512 = "8L6zlp+F4InnoFv0jjGdar948yEzP30bE96f6RHnECaUsU9BWRiTBhkAuhIobG4Lrr8CBscUcar7UWe0Bm1lqA==";
       };
     };
     "patrisika-scopes-0.11.1" = {
@@ -40044,13 +40683,13 @@ let
         sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==";
       };
     };
-    "pg-protocol-1.3.0" = {
+    "pg-protocol-1.4.0" = {
       name = "pg-protocol";
       packageName = "pg-protocol";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.3.0.tgz";
-        sha512 = "64/bYByMrhWULUaCd+6/72c9PMWhiVFs3EVxl9Ct6a3v/U8+rKgqP2w+kKg/BIGgMJyB+Bk/eNivT32Al+Jghw==";
+        url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz";
+        sha512 = "El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA==";
       };
     };
     "pg-types-2.2.0" = {
@@ -41251,22 +41890,22 @@ let
         sha512 = "BUIorsYJTvS9UhXxPTzupIztOMVNPa/HtAm9KHni9z6qEfiJ1bpOBL5DfUOL9XAc3XkLIEzBzpph+Zbm4AdRAg==";
       };
     };
-    "posthtml-parser-0.5.2" = {
+    "posthtml-parser-0.5.3" = {
       name = "posthtml-parser";
       packageName = "posthtml-parser";
-      version = "0.5.2";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.5.2.tgz";
-        sha512 = "rwRA0TyUTivQN6NAG8CLhi8KEdqjWQMZSAJQedxkuH1c8/hme99WDVOW+z8Ony+YLmoaH0sJRUk6RCWVFQ6Rkw==";
+        url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.5.3.tgz";
+        sha512 = "uHosRn0y+1wbnlYKrqMjBPoo/kK5LPYImLtiETszNFYfFwAD3cQdD1R2E13Mh5icBxkHj+yKtlIHozCsmVWD/Q==";
       };
     };
-    "posthtml-render-1.2.3" = {
+    "posthtml-render-1.3.0" = {
       name = "posthtml-render";
       packageName = "posthtml-render";
-      version = "1.2.3";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.2.3.tgz";
-        sha512 = "rGGayND//VwTlsYKNqdILsA7U/XP0WJa6SMcdAEoqc2WRM5QExplGg/h9qbTuHz7mc2PvaXU+6iNxItvr5aHMg==";
+        url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.3.0.tgz";
+        sha512 = "km+kuwydlc2lnx4FnHmTwejGtgmfjBT2fOqu9mDTJUoNecwwMnx4soRxngfJ1Qvpa/OLu1YIqZ+/0OiJDOnCzg==";
       };
     };
     "prebuild-install-5.3.0" = {
@@ -41278,13 +41917,13 @@ let
         sha512 = "aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg==";
       };
     };
-    "prebuild-install-5.3.3" = {
+    "prebuild-install-5.3.6" = {
       name = "prebuild-install";
       packageName = "prebuild-install";
-      version = "5.3.3";
+      version = "5.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.3.tgz";
-        sha512 = "GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g==";
+        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz";
+        sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg==";
       };
     };
     "precinct-6.3.1" = {
@@ -41368,15 +42007,6 @@ let
         sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==";
       };
     };
-    "prettier-2.0.5" = {
-      name = "prettier";
-      packageName = "prettier";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz";
-        sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==";
-      };
-    };
     "prettier-2.1.2" = {
       name = "prettier";
       packageName = "prettier";
@@ -42133,15 +42763,6 @@ let
         sha512 = "qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ==";
       };
     };
-    "pug-error-2.0.0" = {
-      name = "pug-error";
-      packageName = "pug-error";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz";
-        sha512 = "sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==";
-      };
-    };
     "pug-filters-3.1.1" = {
       name = "pug-filters";
       packageName = "pug-filters";
@@ -42160,15 +42781,6 @@ let
         sha512 = "i55yzEBtjm0mlplW4LoANq7k3S8gDdfC6+LThGEvsK4FuobcKfDAwt6V4jKPH9RtiE3a2Akfg5UpafZ1OksaPA==";
       };
     };
-    "pug-lexer-5.0.0" = {
-      name = "pug-lexer";
-      packageName = "pug-lexer";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.0.tgz";
-        sha512 = "52xMk8nNpuyQ/M2wjZBN5gXQLIylaGkAoTk5Y1pBhVqaopaoj8Z0iVzpbFZAqitL4RHNVDZRnJDsqEYe99Ti0A==";
-      };
-    };
     "pug-linker-3.0.6" = {
       name = "pug-linker";
       packageName = "pug-linker";
@@ -42232,15 +42844,6 @@ let
         sha1 = "7017a984c3b834de77bac38c10b776f22dfc1843";
       };
     };
-    "pull-abortable-4.1.1" = {
-      name = "pull-abortable";
-      packageName = "pull-abortable";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.1.1.tgz";
-        sha1 = "b3ad5aefb4116b25916d26db89393ac98d0dcea1";
-      };
-    };
     "pull-block-filter-1.0.0" = {
       name = "pull-block-filter";
       packageName = "pull-block-filter";
@@ -42817,13 +43420,13 @@ let
         sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==";
       };
     };
-    "puppeteer-5.4.1" = {
+    "puppeteer-5.5.0" = {
       name = "puppeteer";
       packageName = "puppeteer";
-      version = "5.4.1";
+      version = "5.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-5.4.1.tgz";
-        sha512 = "8u6r9tFm3gtMylU4uCry1W/CeAA8uczKMONvGvivkTsGqKA7iB7DWO2CBFYlB9GY6/IEoq9vkI5slJWzUBkwNw==";
+        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-5.5.0.tgz";
+        sha512 = "OM8ZvTXAhfgFA7wBIIGlPQzvyEETzDjeRa4mZRCRHxYL+GNH5WAuYUQdja3rpWZvkX/JKqmuVgbsxDNsDFjMEg==";
       };
     };
     "purgecss-2.3.0" = {
@@ -43465,13 +44068,13 @@ let
         sha512 = "XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ==";
       };
     };
-    "react-devtools-core-4.9.0" = {
+    "react-devtools-core-4.10.0" = {
       name = "react-devtools-core";
       packageName = "react-devtools-core";
-      version = "4.9.0";
+      version = "4.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.9.0.tgz";
-        sha512 = "3NyHXW1ClqxEXdHunawAytDxiIxs620oP3wB8DHsbx1fkGgqjMkwlyHVf0zmES/b4ffqzJySowRwSYds/uAHzw==";
+        url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.10.0.tgz";
+        sha512 = "5m5VBtpjuHI7odyk3GAR3BJq3/IHQ0fVZ0+h8zUvoHulSj7Z9hp9d9n4Y1HmSZZxv7NUKfBtsnH+NfLNFDtfog==";
       };
     };
     "react-dom-16.14.0" = {
@@ -44185,13 +44788,13 @@ let
         sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==";
       };
     };
-    "registry-auth-token-4.2.0" = {
+    "registry-auth-token-4.2.1" = {
       name = "registry-auth-token";
       packageName = "registry-auth-token";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz";
-        sha512 = "P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==";
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz";
+        sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==";
       };
     };
     "registry-url-3.1.0" = {
@@ -44329,15 +44932,6 @@ let
         sha1 = "802a38c3aa98c9e1e3ea015eeba211d27cb65e1f";
       };
     };
-    "remark-5.1.0" = {
-      name = "remark";
-      packageName = "remark";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/remark/-/remark-5.1.0.tgz";
-        sha1 = "cb463bd3dbcb4b99794935eee1cf71d7a8e3068c";
-      };
-    };
     "remark-8.0.0" = {
       name = "remark";
       packageName = "remark";
@@ -44392,15 +44986,6 @@ let
         sha512 = "k9bt7BYc3G7YBdmeAhvd3VavrPa/XlKWR3CyHjr4sLO9xJyly8WHHT3Sp+8HPR8lEUv+/sZaffL7IjMLV0f6BA==";
       };
     };
-    "remark-parse-1.1.0" = {
-      name = "remark-parse";
-      packageName = "remark-parse";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/remark-parse/-/remark-parse-1.1.0.tgz";
-        sha1 = "c3ca10f9a8da04615c28f09aa4e304510526ec21";
-      };
-    };
     "remark-parse-4.0.0" = {
       name = "remark-parse";
       packageName = "remark-parse";
@@ -44437,15 +45022,6 @@ let
         sha512 = "cYCchalpf25bTtfXF24ribYvqytPKq0TiEhqQDBHvVEEsApebwruPWP1cTcvTFBidmpXyqzycm+y8ng7Kmvc8Q==";
       };
     };
-    "remark-stringify-1.1.0" = {
-      name = "remark-stringify";
-      packageName = "remark-stringify";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-1.1.0.tgz";
-        sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092";
-      };
-    };
     "remark-stringify-4.0.0" = {
       name = "remark-stringify";
       packageName = "remark-stringify";
@@ -44725,13 +45301,13 @@ let
         sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==";
       };
     };
-    "requestretry-4.1.1" = {
+    "requestretry-4.1.2" = {
       name = "requestretry";
       packageName = "requestretry";
-      version = "4.1.1";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/requestretry/-/requestretry-4.1.1.tgz";
-        sha512 = "sV2lkWitASDXpIK+m0scC7dHBkW42EKj5iao6Cp8GCXsXY7qS4Q/min6PP5YBuqgV9W38lsA7LUhEkOezl1/Og==";
+        url = "https://registry.npmjs.org/requestretry/-/requestretry-4.1.2.tgz";
+        sha512 = "N1WAp+8eOy8NfsVBChcSxNCKvPY1azOpliQ4Sby4WDe0HFEhdKywlNZeROMBQ+BI3Jpc0eNOT1KVFGREawtahA==";
       };
     };
     "require-directory-2.1.1" = {
@@ -44860,6 +45436,15 @@ let
         sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==";
       };
     };
+    "resolve-1.19.0" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.19.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
+        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
+      };
+    };
     "resolve-2.0.0-next.2" = {
       name = "resolve";
       packageName = "resolve";
@@ -45085,13 +45670,13 @@ let
         sha512 = "yr1PgaBDde+25aJXrnt3p1jvT8FVLVat2Bx8XeAWX13KXo8OT+3nWGU3HWxM4YFJvmfqvJYJZG2d7xxaO774gw==";
       };
     };
-    "retext-equality-5.2.0" = {
+    "retext-equality-5.5.0" = {
       name = "retext-equality";
       packageName = "retext-equality";
-      version = "5.2.0";
+      version = "5.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/retext-equality/-/retext-equality-5.2.0.tgz";
-        sha512 = "qfyDsVvwI6RsbyBi5GDRnutDbRMQj5zzK5oVg6ddKhONle2ZmQ/DBg9mz9QLKdnGhp8aW5xoVskXgwHufSQa3g==";
+        url = "https://registry.npmjs.org/retext-equality/-/retext-equality-5.5.0.tgz";
+        sha512 = "ha7zrQ+Bq4xWifm21IcAzc9xhMWCJYfePUjRRNE2mXi8cFhaq1F8+cD78YA2nd6W2mxd11VGTVKY9O0DmzEywQ==";
       };
     };
     "retext-profanities-6.1.0" = {
@@ -45346,13 +45931,13 @@ let
         sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
       };
     };
-    "rollup-2.33.1" = {
+    "rollup-2.33.2" = {
       name = "rollup";
       packageName = "rollup";
-      version = "2.33.1";
+      version = "2.33.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz";
-        sha512 = "uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==";
+        url = "https://registry.npmjs.org/rollup/-/rollup-2.33.2.tgz";
+        sha512 = "QPQ6/fWCrzHtSXkI269rhKaC7qXGghYBwXU04b1JsDZ6ibZa3DJ9D1SFAYRMgx1inDg0DaTbb3N4Z1NK/r3fhw==";
       };
     };
     "rollup-plugin-babel-4.4.0" = {
@@ -45652,15 +46237,6 @@ let
         sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==";
       };
     };
-    "rxjs-6.6.2" = {
-      name = "rxjs";
-      packageName = "rxjs";
-      version = "6.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz";
-        sha512 = "BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==";
-      };
-    };
     "rxjs-6.6.3" = {
       name = "rxjs";
       packageName = "rxjs";
@@ -45670,15 +46246,6 @@ let
         sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==";
       };
     };
-    "s.color-0.0.15" = {
-      name = "s.color";
-      packageName = "s.color";
-      version = "0.0.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/s.color/-/s.color-0.0.15.tgz";
-        sha512 = "AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA==";
-      };
-    };
     "s3-stream-upload-2.0.2" = {
       name = "s3-stream-upload";
       packageName = "s3-stream-upload";
@@ -45832,15 +46399,6 @@ let
         sha512 = "ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==";
       };
     };
-    "sass-formatter-0.5.1" = {
-      name = "sass-formatter";
-      packageName = "sass-formatter";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.5.1.tgz";
-        sha512 = "hRIyMsN9eKQCx+tQec78EtbRs+Be7vamEh+B+JCdIyIc4t2Ku84FIZHC+qjeu+Q5LDtXcHoMxS61AijNA+SZvA==";
-      };
-    };
     "sax-0.5.8" = {
       name = "sax";
       packageName = "sax";
@@ -46615,13 +47173,13 @@ let
         sha512 = "y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==";
       };
     };
-    "sharp-0.23.4" = {
+    "sharp-0.26.2" = {
       name = "sharp";
       packageName = "sharp";
-      version = "0.23.4";
+      version = "0.26.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sharp/-/sharp-0.23.4.tgz";
-        sha512 = "fJMagt6cT0UDy9XCsgyLi0eiwWWhQRxbwGmqQT6sY8Av4s0SVsT/deg8fobBQCTDU5iXRgz0rAeXoE2LBZ8g+Q==";
+        url = "https://registry.npmjs.org/sharp/-/sharp-0.26.2.tgz";
+        sha512 = "bGBPCxRAvdK9bX5HokqEYma4j/Q5+w8Nrmb2/sfgQCLEUx/HblcpmOfp59obL3+knIKnOhyKmDb4tEOhvFlp6Q==";
       };
     };
     "shasum-1.0.2" = {
@@ -46939,6 +47497,15 @@ let
         sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg==";
       };
     };
+    "simple-git-2.22.0" = {
+      name = "simple-git";
+      packageName = "simple-git";
+      version = "2.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-2.22.0.tgz";
+        sha512 = "/8WMNrQ5slYl05jYOpeh4BIyMQc84PkEvk9YAcBHVJaPoAgoxzLzdRzUzWDZJ9U6Z2pUjLxkGcQC0kU4pbRN5Q==";
+      };
+    };
     "simple-markdown-0.4.4" = {
       name = "simple-markdown";
       packageName = "simple-markdown";
@@ -46957,13 +47524,13 @@ let
         sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3";
       };
     };
-    "simple-peer-9.8.0" = {
+    "simple-peer-9.9.3" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "9.8.0";
+      version = "9.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.8.0.tgz";
-        sha512 = "GK1KhJvEwtZILr6zWvQR3AnBNpLrxwr6b5wcduFxOrQNGLg9Hn92eFsHD7RYPnnWsapxGXFMJcBjNuicqBDRIQ==";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.9.3.tgz";
+        sha512 = "T3wuv0UqBpDTV0x0pJPPsz4thy0tC0fTOHE4g9+AF43RUxxT+MWeXVtdQcK5Xuzv/XTVrB2NrGzdfO1IFBqOkw==";
       };
     };
     "simple-plist-1.1.1" = {
@@ -47326,31 +47893,31 @@ let
         sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
       };
     };
-    "snyk-config-3.1.1" = {
+    "snyk-config-4.0.0-rc.2" = {
       name = "snyk-config";
       packageName = "snyk-config";
-      version = "3.1.1";
+      version = "4.0.0-rc.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.1.1.tgz";
-        sha512 = "wwrMIEDozfLJ8LmakCsCC1FQ0siIX5icCQPCbUKKgRbeVsZ27NjPJs37BpTXX4rcHkaWpe8TbH3yOtp23qmszg==";
+        url = "https://registry.npmjs.org/snyk-config/-/snyk-config-4.0.0-rc.2.tgz";
+        sha512 = "HIXpMCRp5IdQDFH/CY6WqOUt5X5Ec55KC9dFVjlMLe/2zeqsImJn1vbjpE5uBoLYIdYi1SteTqtsJhyJZWRK8g==";
       };
     };
-    "snyk-cpp-plugin-2.0.0" = {
+    "snyk-cpp-plugin-2.1.0" = {
       name = "snyk-cpp-plugin";
       packageName = "snyk-cpp-plugin";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-2.0.0.tgz";
-        sha512 = "/xcDy8H5wxhk+4E9e8zDDGfcNo5g+zpwy585sCDkH5KpHdZHmguPi0GmZ9ZCBTuGIodeTIqsDqkBiA1WXSH7+w==";
+        url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-2.1.0.tgz";
+        sha512 = "TcAlIkHtTvKdPIORxFRr/Ur//ucWK7eFBwlMR4gPeIhKbmEE/PZedBXW2IM8ZUdPIhG53lAP/Eq++1bVFSmZ9g==";
       };
     };
-    "snyk-docker-plugin-4.7.0" = {
+    "snyk-docker-plugin-4.7.2" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "4.7.0";
+      version = "4.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.7.0.tgz";
-        sha512 = "u8IFJfOBswBMGYMGalY2XrMr+uMBrNCDxRld8wNJJmGtM2yW7tQXKkCqtF266rFrYJnuqIgHHJb+NQiPBK2Ypw==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.7.2.tgz";
+        sha512 = "x9KT0EmWjdmQoooWmN0jToLmyWBXW+2rCb1yF5Tv8bPQzWtb2SNDOx/wxJl9rqureXjAFvGsUYFGDld5BXJwJQ==";
       };
     };
     "snyk-go-parser-1.4.1" = {
@@ -47371,13 +47938,13 @@ let
         sha512 = "FAM56z3bl1iuxeqkCEA/jyZ2hpwkQK8xQxQbhR+QppEK5lole7w1PQyWYgZAJ9oRY/BU32zdRAJwGuZbhk7G2Q==";
       };
     };
-    "snyk-gradle-plugin-3.10.1" = {
+    "snyk-gradle-plugin-3.10.2" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "3.10.1";
+      version = "3.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.1.tgz";
-        sha512 = "kChphbd9OHdUadkPbYILGeNozwm1QISeEYgAX0Lfth6Gi1ViB71vAErbzzY6MnErImo8m+9rQRuWsqEFv8CvAw==";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.2.tgz";
+        sha512 = "gTFKL0BLUN54asUQ4OIoa4lATGn27VZwWDJGQ0VuqSaaoy8I5W16Cbn/KN95oIKa7tgwrmasPLd5uviFWzo/Qw==";
       };
     };
     "snyk-module-1.9.1" = {
@@ -47407,40 +47974,31 @@ let
         sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw==";
       };
     };
-    "snyk-mvn-plugin-2.23.0" = {
+    "snyk-mvn-plugin-2.23.1" = {
       name = "snyk-mvn-plugin";
       packageName = "snyk-mvn-plugin";
-      version = "2.23.0";
+      version = "2.23.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.23.0.tgz";
-        sha512 = "aCmXPRvK89bcRNKjtU6mCqe6tnKaSR++/Co3V1XjqfJSRDiZ+c7A0LdtpTkRF/HbVdzZVHJ8glOn67yO/VGKhQ==";
+        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.23.1.tgz";
+        sha512 = "WPEZxCoUyZUs/vvsI3OF9nVQLbED8FlhrLG1HHtSM2JPZs4ashB2HqgM93zG0Vk5kxns3aiZcWL4q6vnZReyFA==";
       };
     };
-    "snyk-nodejs-lockfile-parser-1.28.1" = {
+    "snyk-nodejs-lockfile-parser-1.30.1" = {
       name = "snyk-nodejs-lockfile-parser";
       packageName = "snyk-nodejs-lockfile-parser";
-      version = "1.28.1";
+      version = "1.30.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.28.1.tgz";
-        sha512 = "0zbmtidYLI2ia/DQD4rZm2YKrhfHLvHlVBdF2cMAGPwhOoKW5ovG9eBO4wNQdvjxNi7b4VeUyAj8SfuhjDraDQ==";
+        url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.1.tgz";
+        sha512 = "QyhE4pmy7GI7fQrVmZ+qrQB8GGSbxN7OoYueS4BEP9nDxIyH4dJAz8dME5zOUeUxh3frcgBWoWgZoSzE4VOYpg==";
       };
     };
-    "snyk-nodejs-lockfile-parser-1.30.0" = {
-      name = "snyk-nodejs-lockfile-parser";
-      packageName = "snyk-nodejs-lockfile-parser";
-      version = "1.30.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.0.tgz";
-        sha512 = "OmrLyV9oZ2ItH0oNoRs5BjTlvS+lSsYuBw8PryvsdmcNK6VzfMoJ7RuevTau201gVvMz1imTi7LlTxcSoCCzJg==";
-      };
-    };
-    "snyk-nuget-plugin-1.19.3" = {
+    "snyk-nuget-plugin-1.19.4" = {
       name = "snyk-nuget-plugin";
       packageName = "snyk-nuget-plugin";
-      version = "1.19.3";
+      version = "1.19.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.19.3.tgz";
-        sha512 = "KwKoMumwcXVz/DQH80ifXfX7CTnm29bmHJ2fczjCGohxLGb4EKBGQtA3t7K98O7lTISQGgXDxnWIaM9ZXkxPdw==";
+        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.19.4.tgz";
+        sha512 = "6BvLJc7gpNdfPJSnvpmTL4BrbaOVbXh/9q1FNMs5OVp8NbnZ3l97iM+bpQXWTJHOa3BJBZz7iEg+3suH4AWoWw==";
       };
     };
     "snyk-paket-parser-1.6.0" = {
@@ -47461,13 +48019,13 @@ let
         sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA==";
       };
     };
-    "snyk-poetry-lockfile-parser-1.1.0" = {
+    "snyk-poetry-lockfile-parser-1.1.1" = {
       name = "snyk-poetry-lockfile-parser";
       packageName = "snyk-poetry-lockfile-parser";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.0.tgz";
-        sha512 = "FTMF6dVl9xOsDBcQT6k4gyoIurO7oZ2i78+rfb4X0W0XH4XYwSXeFw02vQLcWza2eNBvCcFmI0DtXRvQS880SA==";
+        url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.1.tgz";
+        sha512 = "G3LX27V2KUsKObwVN4vDDjrYr5BERad9pXHAf+SST5+vZsdPUUZjd1ZUIrHgCv7IQhwq+7mZrtqedY5x7+LIGA==";
       };
     };
     "snyk-policy-1.14.1" = {
@@ -47479,13 +48037,13 @@ let
         sha512 = "C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g==";
       };
     };
-    "snyk-python-plugin-1.18.0" = {
+    "snyk-python-plugin-1.19.1" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.18.0";
+      version = "1.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.18.0.tgz";
-        sha512 = "vt07qsO1rHRAjO7wKwaLUJ0uZyvh6Aceafokc88N9mDyRbY2sf4ptIKEZ718wlbSQDLu17uRXiIQ+9jSWwH6Ng==";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.1.tgz";
+        sha512 = "JoOUHnA76L3pekCblSuE9jQ9CuA5jt+GqXpsLQbEIZ0FQQTBa+0F7vfolg3Q7+s1it4ZdtgSbSWrlxCngIJt8g==";
       };
     };
     "snyk-resolve-1.0.1" = {
@@ -48046,13 +48604,13 @@ let
         sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11";
       };
     };
-    "spawn-please-0.4.1" = {
+    "spawn-please-1.0.0" = {
       name = "spawn-please";
       packageName = "spawn-please";
-      version = "0.4.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.4.1.tgz";
-        sha512 = "YJwFL/shPyY5fddOU1XXkShCDNVkMDGKsGlpB91FKOkRGa+pVAe+A5/CUUwLrZ3e89prqbTXaGapCzTlmc3HaA==";
+        url = "https://registry.npmjs.org/spawn-please/-/spawn-please-1.0.0.tgz";
+        sha512 = "Kz33ip6NRNKuyTRo3aDWyWxeGeM0ORDO552Fs6E1nj4pLWPkl37SrRtTnq+MEopVaqgmaO6bAvVS+v64BJ5M/A==";
       };
     };
     "spawn-sync-1.0.15" = {
@@ -48379,6 +48937,15 @@ let
         sha1 = "475393ff9e91479aea62dcaf0ca3d14983a7fb40";
       };
     };
+    "srcset-3.0.0" = {
+      name = "srcset";
+      packageName = "srcset";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/srcset/-/srcset-3.0.0.tgz";
+        sha512 = "D59vF08Qzu/C4GAOXVgMTLfgryt5fyWo93FZyhEWANo0PokFz/iWdDe13mX3O5TRf6l8vMTqckAfR4zPiaH0yQ==";
+      };
+    };
     "srt2vtt-1.3.1" = {
       name = "srt2vtt";
       packageName = "srt2vtt";
@@ -48442,13 +49009,13 @@ let
         sha512 = "DyCrGIsl01GkdHreAkkaDUorV7SAgRSqKn/htg4ZwbvH6g0NAdOi84x/8ehzDuojPev78hbkWjZXgIqi+/Jo0g==";
       };
     };
-    "ssb-db-20.3.0" = {
+    "ssb-db-19.2.0" = {
       name = "ssb-db";
       packageName = "ssb-db";
-      version = "20.3.0";
+      version = "19.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-db/-/ssb-db-20.3.0.tgz";
-        sha512 = "JOXCrS6k3+/kuOcFmZwc9vxPN55Czb7McFs5KEYA+/phykPwQ6e3hwjMT5YrVzSirCf8ptPS/mpOsCDog5Z2dg==";
+        url = "https://registry.npmjs.org/ssb-db/-/ssb-db-19.2.0.tgz";
+        sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung==";
       };
     };
     "ssb-ebt-5.6.7" = {
@@ -48460,13 +49027,13 @@ let
         sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q==";
       };
     };
-    "ssb-friends-4.2.1" = {
+    "ssb-friends-4.3.0" = {
       name = "ssb-friends";
       packageName = "ssb-friends";
-      version = "4.2.1";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.2.1.tgz";
-        sha512 = "DgArf97p2MQxOKn9jWmyxA/6HUiyZkk5QFYohS/qo7CAFJzBJobgoJuvEGjzCgszJAZ/WmGwjYTrKTqFHwMEuQ==";
+        url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.3.0.tgz";
+        sha512 = "5NgtiuYM8M2g8crzQF2nCpenM70zhsb6PNeL6B0iXalAl/IN2wwEWSUhU8++2gTh9dZ7icZJ8nC/kCzIoUdmgA==";
       };
     };
     "ssb-git-0.5.0" = {
@@ -48631,22 +49198,13 @@ let
         sha512 = "6yI5XBpBHkwFdAELpKwlf1C1V32Z0/AKEJYsoU7lk+Eh88blv8LKydo4a1DnjMiPy4ywn4lRU5oayQaPE5MRtQ==";
       };
     };
-    "ssb-plugins-1.0.4" = {
+    "ssb-plugins-1.0.0" = {
       name = "ssb-plugins";
       packageName = "ssb-plugins";
-      version = "1.0.4";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-plugins/-/ssb-plugins-1.0.4.tgz";
-        sha512 = "D48CcHdlkQwkFnaBmEQFt/rPDqHZ252JJ/dqAuFvdpFTnZ5ujYmdbIldOdBGcTm3Bn7GrRGmAGctOKwH/3X0dQ==";
-      };
-    };
-    "ssb-private1-1.0.1" = {
-      name = "ssb-private1";
-      packageName = "ssb-private1";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-private1/-/ssb-private1-1.0.1.tgz";
-        sha512 = "x69YHNhjxCrknkK7XbEJyk2P0P3p52t6NF74I8ObHIrBdWnyRrO6iUH8K5b8CkaHawM4giXdZG5cyrOPzPN/Fg==";
+        url = "https://registry.npmjs.org/ssb-plugins/-/ssb-plugins-1.0.0.tgz";
+        sha512 = "eM8vid+K8MhwZwzk/CDUhSNhUoS6wYgq9clJrrKaP0/Otdd3zZzcBQw54Xvm0olMcOgpTSlY3m2rT4iqjZPIBw==";
       };
     };
     "ssb-pull-requests-1.0.0" = {
@@ -48856,13 +49414,13 @@ let
         sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
       };
     };
-    "stack-utils-2.0.2" = {
+    "stack-utils-2.0.3" = {
       name = "stack-utils";
       packageName = "stack-utils";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz";
-        sha512 = "0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==";
+        url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz";
+        sha512 = "gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==";
       };
     };
     "stackframe-1.2.0" = {
@@ -49981,6 +50539,15 @@ let
         sha512 = "luHn2OAMGJouOnadm6Fim6WXodQ2AWDkWjYq0rMdyEwzO5PdE4LzoXAEn9LL2snmBAlwUp1URVOTF7lZR3KU+Q==";
       };
     };
+    "stylis-3.5.4" = {
+      name = "stylis";
+      packageName = "stylis";
+      version = "3.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz";
+        sha512 = "8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==";
+      };
+    };
     "stylus-0.54.8" = {
       name = "stylus";
       packageName = "stylus";
@@ -50062,15 +50629,6 @@ let
         sha512 = "es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA==";
       };
     };
-    "suf-regex-0.0.25" = {
-      name = "suf-regex";
-      packageName = "suf-regex";
-      version = "0.0.25";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.25.tgz";
-        sha512 = "0hd6oSzoeqwFgFLtXRoA6lMndzTpgPZCSU+/sCoin0HyKnqni/GX/BkUe9Qgs4uRIV1pxsZzE2pEIbaiFX61AQ==";
-      };
-    };
     "sugarss-1.0.1" = {
       name = "sugarss";
       packageName = "sugarss";
@@ -50350,13 +50908,13 @@ let
         sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw==";
       };
     };
-    "swagger-ui-dist-3.36.1" = {
+    "swagger-ui-dist-3.36.2" = {
       name = "swagger-ui-dist";
       packageName = "swagger-ui-dist";
-      version = "3.36.1";
+      version = "3.36.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.36.1.tgz";
-        sha512 = "p7lx/OubaaCzOfSYDuMbkRvf/a+rTnQAOySN/NhL+k6D5o9WXEEeKZwj/6fRHRoLSHKZq28jc1xQcz8HuYcgwQ==";
+        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.36.2.tgz";
+        sha512 = "jbxorhRC/FKk8yMx5zEbg1A1sXc/vsW2vrDTJ3clmaMr9F12zsy161kwnxjVt/vVkMglDOz+BC8ZMY01toxHwA==";
       };
     };
     "swagger2openapi-6.2.3" = {
@@ -50467,13 +51025,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.28.1" = {
+    "systeminformation-4.30.1" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.28.1";
+      version = "4.30.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.28.1.tgz";
-        sha512 = "g9WQy+Igsf0efbbTlXzDkV7iYeUerFJeqI/zh07F9sWHxclejmXn5hrGdgHf2ok+1DuRmC9t4mEh7XS0b8Zk9w==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.1.tgz";
+        sha512 = "FrZISqs8G/oZfnzodPU/zCk41JIfa0os2WY6CJKuk9FwIVc9UWMJfRlgP307AkFu8IRjuVI/HiCNiP4dAnURTA==";
       };
     };
     "syswide-cas-5.3.0" = {
@@ -50630,13 +51188,13 @@ let
         sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==";
       };
     };
-    "tapable-2.0.0" = {
+    "tapable-2.1.1" = {
       name = "tapable";
       packageName = "tapable";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-2.0.0.tgz";
-        sha512 = "bjzn0C0RWoffnNdTzNi7rNDhs1Zlwk2tRXgk8EiHKAOX1Mag3d6T0Y5zNa7l9CJ+EoUne/0UHdwS8tMbkh9zDg==";
+        url = "https://registry.npmjs.org/tapable/-/tapable-2.1.1.tgz";
+        sha512 = "Wib1S8m2wdpLbmQz0RBEVosIyvb/ykfKXf3ZIDqvWoMg/zTNm6G/tDSuUM61J1kNCDXWJrLHGSFeMhAG+gAGpQ==";
       };
     };
     "tape-2.3.3" = {
@@ -50693,15 +51251,6 @@ let
         sha512 = "tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==";
       };
     };
-    "tar-5.0.5" = {
-      name = "tar";
-      packageName = "tar";
-      version = "5.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-5.0.5.tgz";
-        sha512 = "MNIgJddrV2TkuwChwcSNds/5E9VijOiw7kAc1y5hTNJoLDSuIyid2QtLYiCYNnICebpuvjhPQZsXwUL0O3l7OQ==";
-      };
-    };
     "tar-6.0.5" = {
       name = "tar";
       packageName = "tar";
@@ -50720,13 +51269,13 @@ let
         sha512 = "NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==";
       };
     };
-    "tar-fs-2.1.0" = {
+    "tar-fs-2.1.1" = {
       name = "tar-fs";
       packageName = "tar-fs";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz";
-        sha512 = "9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==";
+        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz";
+        sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==";
       };
     };
     "tar-pack-3.4.1" = {
@@ -50837,13 +51386,13 @@ let
         sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA==";
       };
     };
-    "temp-0.9.2" = {
+    "temp-0.9.4" = {
       name = "temp";
       packageName = "temp";
-      version = "0.9.2";
+      version = "0.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/temp/-/temp-0.9.2.tgz";
-        sha512 = "KLVd6CXeUYsqmI/LBWDLg3bFkdZPg0Xr/Gn79GUuPNiISzp6v/EKUaCOrxqeH1w/wVNmrljyDRgKxhZV9JzyJA==";
+        url = "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz";
+        sha512 = "yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==";
       };
     };
     "temp-dir-1.0.0" = {
@@ -50972,13 +51521,13 @@ let
         sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==";
       };
     };
-    "terser-5.3.8" = {
+    "terser-5.4.0" = {
       name = "terser";
       packageName = "terser";
-      version = "5.3.8";
+      version = "5.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-5.3.8.tgz";
-        sha512 = "zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ==";
+        url = "https://registry.npmjs.org/terser/-/terser-5.4.0.tgz";
+        sha512 = "3dZunFLbCJis9TAF2VnX+VrQLctRUmt1p3W2kCsJuZE4ZgWqh//+1MZ62EanewrqKoUf4zIaDGZAvml4UDc0OQ==";
       };
     };
     "terser-webpack-plugin-1.4.5" = {
@@ -52151,6 +52700,15 @@ let
         sha1 = "405923909592d56f78a5818434b0b78489ca5f2b";
       };
     };
+    "try-catch-2.0.1" = {
+      name = "try-catch";
+      packageName = "try-catch";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/try-catch/-/try-catch-2.0.1.tgz";
+        sha512 = "LsOrmObN/2WdM+y2xG+t16vhYrQsnV8wftXIcIOWZhQcBJvKGYuamJGwnU98A7Jxs2oZNkJztXlphEOoA0DWqg==";
+      };
+    };
     "try-resolve-1.0.1" = {
       name = "try-resolve";
       packageName = "try-resolve";
@@ -52160,6 +52718,15 @@ let
         sha1 = "cfde6fabd72d63e5797cfaab873abbe8e700e912";
       };
     };
+    "try-to-catch-1.1.1" = {
+      name = "try-to-catch";
+      packageName = "try-to-catch";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/try-to-catch/-/try-to-catch-1.1.1.tgz";
+        sha512 = "ikUlS+/BcImLhNYyIgZcEmq4byc31QpC+46/6Jm5ECWkVFhf8SM2Fp/0pMVXPX6vk45SMCwrP4Taxucne8I0VA==";
+      };
+    };
     "ts-invariant-0.3.3" = {
       name = "ts-invariant";
       packageName = "ts-invariant";
@@ -52484,13 +53051,13 @@ let
         sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25";
       };
     };
-    "twig-1.15.2" = {
+    "twig-1.15.3" = {
       name = "twig";
       packageName = "twig";
-      version = "1.15.2";
+      version = "1.15.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/twig/-/twig-1.15.2.tgz";
-        sha512 = "n7w76E8gzguhcLyKcjlT3sYWGdBTgZY2DO/frcbZ5Fk7LwMRoTathvWMFxZyJ2HYRJ+rEzccw6nu3fsy7ceGGQ==";
+        url = "https://registry.npmjs.org/twig/-/twig-1.15.3.tgz";
+        sha512 = "ePfzzS7vzzn/Kb8vs/IkCvCNZltBPeBW8B/1blN/Bxh5ubxnZEGI5ysgr8t1Dr0/We9ahLDfqC78fNzDvCMkpw==";
       };
     };
     "twitter-1.7.1" = {
@@ -52601,13 +53168,13 @@ let
         sha512 = "eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==";
       };
     };
-    "type-fest-0.18.0" = {
+    "type-fest-0.18.1" = {
       name = "type-fest";
       packageName = "type-fest";
-      version = "0.18.0";
+      version = "0.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.18.0.tgz";
-        sha512 = "fbDukFPnJBdn2eZ3RR+5mK2slHLFd6gYHY7jna1KWWy4Yr4XysHuCdXRzy+RiG/HwG4WJat00vdC2UHky5eKiQ==";
+        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz";
+        sha512 = "OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==";
       };
     };
     "type-fest-0.3.1" = {
@@ -52844,13 +53411,13 @@ let
         sha512 = "FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw==";
       };
     };
-    "uglify-js-3.11.5" = {
+    "uglify-js-3.11.6" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.11.5";
+      version = "3.11.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz";
-        sha512 = "btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.6.tgz";
+        sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g==";
       };
     };
     "uglify-js-3.4.10" = {
@@ -52871,6 +53438,15 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
+    "uglifycss-0.0.29" = {
+      name = "uglifycss";
+      packageName = "uglifycss";
+      version = "0.0.29";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglifycss/-/uglifycss-0.0.29.tgz";
+        sha512 = "J2SQ2QLjiknNGbNdScaNZsXgmMGI0kYNrXaDlr4obnPW9ni1jljb1NeEVWAiTgZ8z+EBWP2ozfT9vpy03rjlMQ==";
+      };
+    };
     "uid-0.0.2" = {
       name = "uid";
       packageName = "uid";
@@ -52970,6 +53546,15 @@ let
         sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==";
       };
     };
+    "unbound-0.4.3" = {
+      name = "unbound";
+      packageName = "unbound";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unbound/-/unbound-0.4.3.tgz";
+        sha512 = "2ISqZLXtzp1l9f1V8Yr6S+zuhXxEwE1CjKHjXULFDHJcfhc9Gm3mn19hdPp4rlNGEdCivKYGKjYe3WRGnafYdA==";
+      };
+    };
     "unbzip2-stream-1.4.3" = {
       name = "unbzip2-stream";
       packageName = "unbzip2-stream";
@@ -53186,15 +53771,6 @@ let
         sha1 = "14bc6cd40d98ffff75b405506bad873ecbbac3ba";
       };
     };
-    "unified-4.2.1" = {
-      name = "unified";
-      packageName = "unified";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unified/-/unified-4.2.1.tgz";
-        sha1 = "76ff43aa8da430f6e7e4a55c84ebac2ad2cfcd2e";
-      };
-    };
     "unified-6.2.0" = {
       name = "unified";
       packageName = "unified";
@@ -53357,13 +53933,13 @@ let
         sha1 = "e2f7876828903a6a9308e362051f86b14f35b545";
       };
     };
-    "unist-util-find-1.0.1" = {
+    "unist-util-find-1.0.2" = {
       name = "unist-util-find";
       packageName = "unist-util-find";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-find/-/unist-util-find-1.0.1.tgz";
-        sha1 = "1062bbb6928c7a97c6adc89b53745d4c46c222a2";
+        url = "https://registry.npmjs.org/unist-util-find/-/unist-util-find-1.0.2.tgz";
+        sha512 = "ft06UDYzqi9o9RmGP0sZWI/zvLLQiBW2/MD+rW6mDqbOWDcmknGX9orQPspfuGRYWr8eSJAmfsBcvOpfGRJseA==";
       };
     };
     "unist-util-find-all-after-1.0.5" = {
@@ -53951,6 +54527,15 @@ let
         sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
       };
     };
+    "urkel-0.6.3" = {
+      name = "urkel";
+      packageName = "urkel";
+      version = "0.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/urkel/-/urkel-0.6.3.tgz";
+        sha512 = "aY/u3cpCRRwa3XjUGG8DcLcQJSNmQ0+qXDeT0igDytKhrK+yiusZ7mYdPRzmtbQ2CPozHhwsmVxCVBkPBp9jDQ==";
+      };
+    };
     "url-0.10.3" = {
       name = "url";
       packageName = "url";
@@ -55131,13 +55716,13 @@ let
         sha512 = "lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA==";
       };
     };
-    "videostream-3.2.1" = {
+    "videostream-3.2.2" = {
       name = "videostream";
       packageName = "videostream";
-      version = "3.2.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/videostream/-/videostream-3.2.1.tgz";
-        sha512 = "Z4EcsX9aYNJZD1M+0jCeQ0t+5ETlHE88B2SF1fCuVxfn+XxHGJVec6tbHGqpULk4esOOLJEipAScOCDGHk+teQ==";
+        url = "https://registry.npmjs.org/videostream/-/videostream-3.2.2.tgz";
+        sha512 = "4tz23yGGeATmbzj/ZnUm6wgQ4E1lzmMXu2mUA/c0G6adtWKxm1Di5YejdZdRsK6SdkLjKjhplFFYT7r+UUDKvA==";
       };
     };
     "vinyl-0.5.3" = {
@@ -55230,13 +55815,13 @@ let
         sha512 = "gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w==";
       };
     };
-    "vls-0.5.5" = {
+    "vls-0.5.9" = {
       name = "vls";
       packageName = "vls";
-      version = "0.5.5";
+      version = "0.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vls/-/vls-0.5.5.tgz";
-        sha512 = "DDfnr83S2jAXWA0TLOy3t2g+wgTzo+hUNz8aYcF4WQrCTlNVyDsZ3wtcCa5koZVYWbfDitfBAlbqkqIpjeaDng==";
+        url = "https://registry.npmjs.org/vls/-/vls-0.5.9.tgz";
+        sha512 = "9IGH1YFto0XvLHRKzdOQmkzqnIQOO/yTe77ieaOTJM4Zrr5dDqZKEBwboJyEpx5jy4R1TNUh7HTI+DwhWUtiLQ==";
       };
     };
     "vm-browserify-1.1.2" = {
@@ -55320,15 +55905,6 @@ let
         sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow==";
       };
     };
-    "vscode-emmet-helper-2.1.1" = {
-      name = "vscode-emmet-helper";
-      packageName = "vscode-emmet-helper";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.1.1.tgz";
-        sha512 = "598eqXynvHDBdjgZqjTTg3XNb0SIvlVIc22/DwqxKjTKJLqe4LDCWi0H1yYBvU0Eb1FAJSh/l04InFxuI/mDVg==";
-      };
-    };
     "vscode-html-languageservice-2.1.12" = {
       name = "vscode-html-languageservice";
       packageName = "vscode-html-languageservice";
@@ -55347,6 +55923,15 @@ let
         sha512 = "8IvuRSQnjznu+obqy6Dy4S4H68Ke7a3Kb+A0FcdctyAMAWEnrORpCpMOMqEYiPLm/OTYLVWJ7ql3qToDTozu4w==";
       };
     };
+    "vscode-json-languageservice-3.8.4" = {
+      name = "vscode-json-languageservice";
+      packageName = "vscode-json-languageservice";
+      version = "3.8.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.4.tgz";
+        sha512 = "njDG0+YJvYNKXH+6plQGZMxgbifATFrRpC6Qnm/SAn4IW8bMHxsYunsxrjtpqK42CVSz6Lr7bpbTEZbVuOmFLw==";
+      };
+    };
     "vscode-jsonrpc-3.5.0" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
@@ -55392,15 +55977,6 @@ let
         sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA==";
       };
     };
-    "vscode-jsonrpc-6.0.0-next.5" = {
-      name = "vscode-jsonrpc";
-      packageName = "vscode-jsonrpc";
-      version = "6.0.0-next.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.5.tgz";
-        sha512 = "IAgsltQPwg/pXOPsdXgbUTCaO9VSKZwirZN5SGtkdYQ/R3VjeC4v00WTVvoNayWMZpoC3O9u0ogqmsKzKhVasQ==";
-      };
-    };
     "vscode-jsonrpc-6.0.0-next.7" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
@@ -55491,15 +56067,6 @@ let
         sha512 = "UCXULa/RmT2zxcb6auNezl9ZIPwYHS15+a0XzybrpT2+xA0RbHEYQCsIQkTRYjGv8cm3yS9iPJMmxLilP+y1Xw==";
       };
     };
-    "vscode-languageserver-7.0.0-next.7" = {
-      name = "vscode-languageserver";
-      packageName = "vscode-languageserver";
-      version = "7.0.0-next.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0-next.7.tgz";
-        sha512 = "6La+usoCF0OnCYIbOLBTmqgzaZSAyIBpnsLjS/g7AnI8Pv9v6yzC38VhTvBoip4/ZBwf1U8vpdwatD/qCSKeWA==";
-      };
-    };
     "vscode-languageserver-protocol-3.14.1" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
@@ -55536,15 +56103,6 @@ let
         sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA==";
       };
     };
-    "vscode-languageserver-protocol-3.16.0-next.7" = {
-      name = "vscode-languageserver-protocol";
-      packageName = "vscode-languageserver-protocol";
-      version = "3.16.0-next.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.7.tgz";
-        sha512 = "tOjrg+K3RddJ547zpC9/LAgTbzadkPuHlqJFFWIcKjVhiJOh73XyY+Ngcu9wukGaTsuSGjJ0W8rlmwanixa0FQ==";
-      };
-    };
     "vscode-languageserver-protocol-3.5.1" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
@@ -55617,15 +56175,6 @@ let
         sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==";
       };
     };
-    "vscode-languageserver-types-3.16.0-next.3" = {
-      name = "vscode-languageserver-types";
-      packageName = "vscode-languageserver-types";
-      version = "3.16.0-next.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.3.tgz";
-        sha512 = "s/z5ZqSe7VpoXJ6JQcvwRiPPA3nG0nAcJ/HH03zoU6QaFfnkcgPK+HshC3WKPPnC2G08xA0iRB6h7kmyBB5Adg==";
-      };
-    };
     "vscode-languageserver-types-3.16.0-next.4" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
@@ -55734,15 +56283,6 @@ let
         sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==";
       };
     };
-    "vscode-web-custom-data-0.3.1" = {
-      name = "vscode-web-custom-data";
-      packageName = "vscode-web-custom-data";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-web-custom-data/-/vscode-web-custom-data-0.3.1.tgz";
-        sha512 = "pFWfUyoJoROfzk7l8+QK1aHsAcfb8fJP8iaEghMbASbYieaGOOnfovNjPIrJmhNf84RGn36R6r2030i9Eld7vA==";
-      };
-    };
     "vstream-0.1.0" = {
       name = "vstream";
       packageName = "vstream";
@@ -55914,6 +56454,15 @@ let
         sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==";
       };
     };
+    "watchpack-1.7.5" = {
+      name = "watchpack";
+      packageName = "watchpack";
+      version = "1.7.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz";
+        sha512 = "9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==";
+      };
+    };
     "watchpack-2.0.1" = {
       name = "watchpack";
       packageName = "watchpack";
@@ -55923,13 +56472,13 @@ let
         sha512 = "vO8AKGX22ZRo6PiOFM9dC0re8IcKh8Kd/aH2zeqUc6w4/jBGlTy2P7fTC6ekT0NjVeGjgU2dGC5rNstKkeLEQg==";
       };
     };
-    "watchpack-chokidar2-2.0.0" = {
+    "watchpack-chokidar2-2.0.1" = {
       name = "watchpack-chokidar2";
       packageName = "watchpack-chokidar2";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz";
-        sha512 = "9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==";
+        url = "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz";
+        sha512 = "nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==";
       };
     };
     "watershed-0.3.4" = {
@@ -57102,6 +57651,15 @@ let
         sha512 = "D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==";
       };
     };
+    "ws-7.4.0" = {
+      name = "ws";
+      packageName = "ws";
+      version = "7.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz";
+        sha512 = "kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==";
+      };
+    };
     "x-default-browser-0.3.1" = {
       name = "x-default-browser";
       packageName = "x-default-browser";
@@ -57679,15 +58237,6 @@ let
         sha512 = "2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==";
       };
     };
-    "yaml-ast-parser-custom-tags-0.0.43" = {
-      name = "yaml-ast-parser-custom-tags";
-      packageName = "yaml-ast-parser-custom-tags";
-      version = "0.0.43";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yaml-ast-parser-custom-tags/-/yaml-ast-parser-custom-tags-0.0.43.tgz";
-        sha512 = "R5063FF/JSAN6qXCmylwjt9PcDH6M0ExEme/nJBzLspc6FJDmHHIqM7xh2WfEmsTJqClF79A9VkXjkAqmZw9SQ==";
-      };
-    };
     "yaml-front-matter-3.4.1" = {
       name = "yaml-front-matter";
       packageName = "yaml-front-matter";
@@ -57706,13 +58255,13 @@ let
         sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec";
       };
     };
-    "yaml-language-server-0.11.1" = {
+    "yaml-language-server-0.12.0" = {
       name = "yaml-language-server";
       packageName = "yaml-language-server";
-      version = "0.11.1";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.11.1.tgz";
-        sha512 = "N3Tu3g4O6ZWV7W0LVsNk62DtKJDQkbnPZRDd7ntaAeEl8QkxL1vnMunI26uzDU4PwwG4tPJ8g/VRS6U+fVp/6A==";
+        url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.12.0.tgz";
+        sha512 = "EAr9fJi05wVWsFVgc4s0AI74nT6D2oN7xcy7W+7JCkvirbm0L7aPDRAjSz6z/dXVyYyFlEAgRWVThXzqguFyTw==";
       };
     };
     "yaml-language-server-parser-0.1.1" = {
@@ -57805,13 +58354,13 @@ let
         sha512 = "6+nLw8xa9uK1BOEOykaiYAJVh6/CjxWXK/q9b5FpRgNslt8s22F2xMBqVIKgCRjNgGvGPBy8Vog7WN7yh4amtA==";
       };
     };
-    "yargs-16.1.0" = {
+    "yargs-16.1.1" = {
       name = "yargs";
       packageName = "yargs";
-      version = "16.1.0";
+      version = "16.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-16.1.0.tgz";
-        sha512 = "upWFJOmDdHN0syLuESuvXDmrRcWd1QafJolHskzaw79uZa7/x53gxQKiR07W59GWY1tFhhU/Th9DrtSfpS782g==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-16.1.1.tgz";
+        sha512 = "hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w==";
       };
     };
     "yargs-3.10.0" = {
@@ -57913,13 +58462,13 @@ let
         sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
       };
     };
-    "yargs-parser-20.2.3" = {
+    "yargs-parser-20.2.4" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "20.2.3";
+      version = "20.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.3.tgz";
-        sha512 = "emOFRT9WVHw03QSvN5qor9QQT9+sw5vwxfYweivSMHTcAXPefwVae2FjO7JJjj8hCE4CzPOPeFM83VwT29HCww==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz";
+        sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==";
       };
     };
     "yargs-parser-4.2.1" = {
@@ -58189,28 +58738,27 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "10.2.0";
+    version = "11.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-10.2.0.tgz";
-      sha512 = "YBzwkFBmG6CdUJk8onsPXxHX/ByU5MERBQgYhLC873e2nZlXMUu+Ttq2Wai6apyskGvsXKxZNPOQSFZTGKXzXg==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-11.0.1.tgz";
+      sha512 = "zB20jTLQxLpkJjhbYelhRyMcgGsjwbD8pSYYAO6QX656Tx1tCtJ2UskEtf4ePQvgzu0Ds2dnAEfco+tekIMRTA==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.1002.0"
-      sources."@angular-devkit/core-10.2.0"
-      sources."@angular-devkit/schematics-10.2.0"
-      sources."@schematics/angular-10.2.0"
-      sources."@schematics/update-0.1002.0"
+      sources."@angular-devkit/architect-0.1100.1"
+      sources."@angular-devkit/core-11.0.1"
+      sources."@angular-devkit/schematics-11.0.1"
+      sources."@schematics/angular-11.0.1"
+      sources."@schematics/update-0.1100.1"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONStream-1.3.5"
       sources."agent-base-4.3.0"
       sources."agentkeepalive-3.5.2"
-      sources."ajv-6.12.4"
+      sources."ajv-6.12.6"
       sources."ansi-colors-4.1.1"
       sources."ansi-escapes-4.3.1"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."aproba-1.2.0"
-      sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
@@ -58229,7 +58777,6 @@ in
           sources."yallist-3.1.1"
         ];
       })
-      sources."call-bind-1.0.0"
       sources."caseless-0.12.0"
       sources."chalk-4.1.0"
       sources."chardet-0.7.0"
@@ -58251,12 +58798,9 @@ in
       sources."core-util-is-1.0.2"
       sources."cyclist-1.0.1"
       sources."dashdash-1.14.1"
-      sources."debug-4.1.1"
-      sources."debuglog-1.0.1"
+      sources."debug-4.2.0"
       sources."defaults-1.0.3"
-      sources."define-properties-1.1.3"
       sources."delayed-stream-1.0.0"
-      sources."dezalgo-1.0.3"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."emoji-regex-8.0.0"
@@ -58267,8 +58811,6 @@ in
       })
       sources."end-of-stream-1.4.4"
       sources."err-code-1.1.2"
-      sources."es-abstract-1.17.7"
-      sources."es-to-primitive-1.2.1"
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
@@ -58288,7 +58830,6 @@ in
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."genfun-5.0.0"
-      sources."get-intrinsic-1.0.1"
       sources."get-stream-4.1.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
@@ -58297,7 +58838,6 @@ in
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
-      sources."has-symbols-1.0.1"
       sources."hosted-git-info-3.0.7"
       sources."http-cache-semantics-3.8.1"
       (sources."http-proxy-agent-2.1.0" // {
@@ -58323,15 +58863,10 @@ in
       sources."ini-1.3.5"
       sources."inquirer-7.3.3"
       sources."ip-1.1.5"
-      sources."is-callable-1.2.2"
       sources."is-core-module-2.1.0"
-      sources."is-date-object-1.0.2"
       sources."is-docker-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-interactive-1.0.0"
-      sources."is-negative-zero-2.0.0"
-      sources."is-regex-1.1.1"
-      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-wsl-2.2.0"
       sources."isarray-1.0.0"
@@ -58339,11 +58874,10 @@ in
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-parse-better-errors-1.0.2"
-      sources."json-parse-even-better-errors-2.3.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonc-parser-2.3.0"
+      sources."jsonc-parser-2.3.1"
       sources."jsonparse-1.3.1"
       sources."jsprim-1.4.1"
       sources."lodash-4.17.20"
@@ -58386,7 +58920,7 @@ in
       sources."npm-bundled-1.1.1"
       sources."npm-install-checks-4.0.0"
       sources."npm-normalize-package-bin-1.0.1"
-      sources."npm-package-arg-8.0.1"
+      sources."npm-package-arg-8.1.0"
       sources."npm-packlist-1.4.8"
       sources."npm-pick-manifest-6.1.0"
       (sources."npm-registry-fetch-4.0.7" // {
@@ -58399,14 +58933,10 @@ in
         ];
       })
       sources."oauth-sign-0.9.0"
-      sources."object-inspect-1.8.0"
-      sources."object-keys-1.1.1"
-      sources."object.assign-4.1.2"
-      sources."object.getownpropertydescriptors-2.1.0"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."open-7.2.0"
-      sources."ora-5.0.0"
+      sources."open-7.3.0"
+      sources."ora-5.1.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
@@ -58438,14 +58968,11 @@ in
       })
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."read-package-json-2.1.2"
-      sources."read-package-tree-5.3.1"
       (sources."readable-stream-2.3.7" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
         ];
       })
-      sources."readdir-scoped-modules-1.1.0"
       (sources."request-2.88.2" // {
         dependencies = [
           sources."uuid-3.4.0"
@@ -58457,7 +58984,7 @@ in
       sources."rimraf-3.0.2"
       sources."run-async-2.4.1"
       sources."run-queue-1.0.3"
-      sources."rxjs-6.6.2"
+      sources."rxjs-6.6.3"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."semver-7.3.2"
@@ -58485,16 +59012,6 @@ in
       sources."stream-each-1.2.3"
       sources."stream-shift-1.0.1"
       sources."string-width-4.2.0"
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -58502,7 +59019,7 @@ in
       })
       sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
-      sources."symbol-observable-1.2.0"
+      sources."symbol-observable-2.0.3"
       (sources."tar-4.4.13" // {
         dependencies = [
           sources."yallist-3.1.1"
@@ -58526,8 +59043,7 @@ in
       })
       sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
-      sources."util-promisify-2.1.0"
-      sources."uuid-8.3.0"
+      sources."uuid-8.3.1"
       sources."validate-npm-package-license-3.0.4"
       sources."validate-npm-package-name-3.0.0"
       sources."verror-1.10.0"
@@ -58621,7 +59137,7 @@ in
       sources."braces-3.0.2"
       (sources."buffer-5.7.1" // {
         dependencies = [
-          sources."base64-js-1.3.1"
+          sources."base64-js-1.5.1"
         ];
       })
       sources."buffer-crc32-0.2.13"
@@ -58864,7 +59380,7 @@ in
         ];
       })
       sources."to-utf8-0.0.1"
-      sources."uglify-js-3.11.5"
+      sources."uglify-js-3.11.6"
       sources."unc-path-regex-0.1.2"
       sources."unique-stream-2.3.1"
       sources."universalify-0.1.2"
@@ -58904,10 +59420,10 @@ in
   "@bitwarden/cli" = nodeEnv.buildNodePackage {
     name = "_at_bitwarden_slash_cli";
     packageName = "@bitwarden/cli";
-    version = "1.12.1";
+    version = "1.13.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.12.1.tgz";
-      sha512 = "H1KuRpjyqNTzqQZZg3tTVmm+cDDDm23AcLvbA59A4EqfxMkVZ6gT+FqUtWEuQ7AFO28W56wdilYGSf9tQ6ySgA==";
+      url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.13.2.tgz";
+      sha512 = "DqNFJ3OgwJweYGc8pxYUW6mJGLSAMN3QH8mtXOwiy3I/SR5QY+ebbEd5XhCdibjHk5nIyLAiP8Erkdevhjuozw==";
     };
     dependencies = [
       sources."abab-2.0.5"
@@ -59070,20 +59586,15 @@ in
   "@nestjs/cli" = nodeEnv.buildNodePackage {
     name = "_at_nestjs_slash_cli";
     packageName = "@nestjs/cli";
-    version = "7.5.2";
+    version = "7.5.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.2.tgz";
-      sha512 = "qxh5aqQbxzQe8Tuc3CF8nLb1KsWCjLabSAZm+hlxrWYSJzbffbn947MPmsIwZdXgAXZ6AprmJV5KeB2U6DoM+w==";
+      url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.3.tgz";
+      sha512 = "PgpdXaNNtWMRAnDzMEXjbCXDiJWoNcmnKa6HhJ9iLJaqdXkIILiLthJx64sZxB6GiE4UYWjbX/KuPH3N2dx/6Q==";
     };
     dependencies = [
-      sources."@angular-devkit/core-10.2.0"
-      (sources."@angular-devkit/schematics-10.2.0" // {
-        dependencies = [
-          sources."chalk-4.1.0"
-          sources."ora-5.0.0"
-        ];
-      })
-      sources."@angular-devkit/schematics-cli-0.1002.0"
+      sources."@angular-devkit/core-11.0.1"
+      sources."@angular-devkit/schematics-11.0.1"
+      sources."@angular-devkit/schematics-cli-0.1100.1"
       sources."@babel/code-frame-7.10.4"
       sources."@babel/helper-validator-identifier-7.10.4"
       (sources."@babel/highlight-7.10.4" // {
@@ -59096,15 +59607,20 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      sources."@nestjs/schematics-7.2.1"
-      sources."@schematics/schematics-0.1002.0"
+      (sources."@nestjs/schematics-7.2.2" // {
+        dependencies = [
+          sources."@angular-devkit/core-11.0.0"
+          sources."@angular-devkit/schematics-11.0.0"
+        ];
+      })
+      sources."@schematics/schematics-0.1100.1"
       sources."@types/anymatch-1.3.1"
-      sources."@types/eslint-7.2.4"
+      sources."@types/eslint-7.2.5"
       sources."@types/eslint-scope-3.7.0"
       sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
       sources."@types/json5-0.0.29"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."@types/parse-json-4.0.0"
       sources."@types/source-list-map-0.1.2"
       sources."@types/tapable-1.0.6"
@@ -59113,7 +59629,7 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      (sources."@types/webpack-4.41.24" // {
+      (sources."@types/webpack-4.41.25" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -59140,10 +59656,11 @@ in
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."acorn-8.0.4"
-      sources."ajv-6.12.4"
+      sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
+      sources."ansi-colors-4.1.1"
       sources."ansi-escapes-4.3.1"
-      sources."ansi-regex-5.0.0"
+      sources."ansi-regex-3.0.0"
       sources."ansi-styles-4.3.0"
       sources."anymatch-3.1.1"
       sources."at-least-node-1.0.0"
@@ -59151,10 +59668,10 @@ in
       sources."binary-extensions-2.1.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.14.6"
+      sources."browserslist-4.14.7"
       sources."buffer-from-1.1.1"
       sources."callsites-3.1.0"
-      sources."caniuse-lite-1.0.30001156"
+      sources."caniuse-lite-1.0.30001158"
       sources."chalk-3.0.0"
       sources."chardet-0.7.0"
       sources."chokidar-3.4.3"
@@ -59166,6 +59683,7 @@ in
       sources."clone-1.0.4"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
+      sources."colorette-1.2.1"
       sources."colors-1.4.0"
       sources."commander-4.1.1"
       sources."concat-map-0.0.1"
@@ -59174,7 +59692,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.3.589"
+      sources."electron-to-chromium-1.3.596"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enhanced-resolve-4.3.0"
@@ -59197,7 +59715,7 @@ in
       sources."figures-3.2.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
-      (sources."fork-ts-checker-webpack-plugin-5.2.1" // {
+      (sources."fork-ts-checker-webpack-plugin-6.0.2" // {
         dependencies = [
           sources."chalk-4.1.0"
         ];
@@ -59221,9 +59739,11 @@ in
       sources."inherits-2.0.4"
       (sources."inquirer-7.3.3" // {
         dependencies = [
+          sources."ansi-regex-5.0.0"
           sources."chalk-4.1.0"
           sources."is-fullwidth-code-point-3.0.0"
           sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
         ];
       })
       sources."interpret-1.4.0"
@@ -59272,7 +59792,7 @@ in
       sources."mute-stream-0.0.8"
       sources."neo-async-2.6.2"
       sources."node-emoji-1.10.0"
-      sources."node-releases-1.1.65"
+      sources."node-releases-1.1.66"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-4.0.1"
       sources."object-assign-4.1.1"
@@ -59280,7 +59800,9 @@ in
       sources."onetime-5.1.2"
       (sources."ora-5.1.0" // {
         dependencies = [
+          sources."ansi-regex-5.0.0"
           sources."chalk-4.1.0"
+          sources."strip-ansi-6.0.0"
         ];
       })
       sources."os-name-4.0.0"
@@ -59306,12 +59828,12 @@ in
       sources."readable-stream-2.3.7"
       sources."readdirp-3.5.0"
       sources."rechoir-0.6.2"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-from-4.0.0"
       sources."restore-cursor-3.1.0"
       sources."rimraf-3.0.2"
       sources."run-async-2.4.1"
-      sources."rxjs-6.6.2"
+      sources."rxjs-6.6.3"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."schema-utils-2.7.0"
@@ -59329,27 +59851,21 @@ in
         ];
       })
       sources."sourcemap-codec-1.4.8"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
+      sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
-      sources."strip-ansi-6.0.0"
+      sources."strip-ansi-4.0.0"
       sources."strip-bom-3.0.0"
       sources."strip-final-newline-2.0.0"
       sources."supports-color-7.2.0"
-      sources."symbol-observable-1.2.0"
+      sources."symbol-observable-2.0.3"
       sources."tapable-1.1.3"
-      (sources."terser-5.3.8" // {
+      (sources."terser-5.4.0" // {
         dependencies = [
           sources."commander-2.20.3"
         ];
       })
       (sources."terser-webpack-plugin-5.0.3" // {
         dependencies = [
-          sources."ajv-6.12.6"
           sources."p-limit-3.0.2"
           sources."schema-utils-3.0.0"
           sources."source-map-0.6.1"
@@ -59380,10 +59896,9 @@ in
       sources."wcwidth-1.0.1"
       (sources."webpack-5.4.0" // {
         dependencies = [
-          sources."ajv-6.12.6"
           sources."enhanced-resolve-5.3.1"
           sources."schema-utils-3.0.0"
-          sources."tapable-2.0.0"
+          sources."tapable-2.1.1"
         ];
       })
       sources."webpack-node-externals-2.5.2"
@@ -59736,7 +60251,7 @@ in
       sources."@types/long-4.0.1"
       sources."@types/mime-2.0.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       (sources."@types/node-fetch-2.5.7" // {
         dependencies = [
           sources."form-data-3.0.0"
@@ -59745,9 +60260,9 @@ in
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
-      sources."@types/serve-static-1.13.6"
+      sources."@types/serve-static-1.13.7"
       sources."@types/through-0.0.30"
-      sources."@types/ws-7.2.9"
+      sources."@types/ws-7.4.0"
       sources."@types/zen-observable-0.8.1"
       sources."@vue/cli-shared-utils-4.5.8"
       (sources."@vue/cli-ui-4.5.8" // {
@@ -59909,7 +60424,7 @@ in
           sources."define-property-1.0.0"
         ];
       })
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
       sources."binary-extensions-1.13.1"
@@ -59949,7 +60464,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.14.6"
+      sources."browserslist-4.14.7"
       sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -59977,7 +60492,7 @@ in
       sources."callsites-2.0.0"
       sources."camel-case-4.1.1"
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001156"
+      sources."caniuse-lite-1.0.30001158"
       sources."capital-case-1.0.3"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
@@ -60068,6 +60583,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
+      sources."colorette-1.2.1"
       sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."commander-2.20.3"
@@ -60115,7 +60631,7 @@ in
       sources."crypto-random-string-1.0.0"
       sources."cssesc-3.0.0"
       sources."cssfilter-0.0.10"
-      sources."csstype-2.6.13"
+      sources."csstype-2.6.14"
       sources."csv-parser-1.12.1"
       sources."dashdash-1.14.1"
       sources."date-fns-1.30.1"
@@ -60181,11 +60697,11 @@ in
       })
       sources."download-git-repo-3.0.2"
       sources."duplexer3-0.1.4"
-      sources."easy-stack-1.0.0"
+      sources."easy-stack-1.0.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.589"
+      sources."electron-to-chromium-1.3.596"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
@@ -60276,7 +60792,7 @@ in
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.137.0"
+      sources."flow-parser-0.138.0"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -60500,8 +61016,8 @@ in
       sources."iterall-1.3.0"
       sources."java-properties-1.0.2"
       sources."javascript-stringify-1.6.0"
-      sources."js-message-1.0.5"
-      sources."js-queue-2.0.0"
+      sources."js-message-1.0.7"
+      sources."js-queue-2.0.2"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.0"
       sources."jsbn-0.1.1"
@@ -60664,14 +61180,14 @@ in
       sources."no-case-3.0.3"
       sources."node-dir-0.1.17"
       sources."node-fetch-2.6.1"
-      sources."node-ipc-9.1.1"
+      sources."node-ipc-9.1.3"
       sources."node-modules-regexp-1.0.0"
       (sources."node-notifier-6.0.0" // {
         dependencies = [
           sources."is-wsl-2.2.0"
         ];
       })
-      sources."node-releases-1.1.65"
+      sources."node-releases-1.1.66"
       (sources."nodemon-1.19.4" // {
         dependencies = [
           sources."debug-3.2.6"
@@ -60877,7 +61393,7 @@ in
       sources."request-2.88.2"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-from-3.0.0"
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
@@ -61561,7 +62077,7 @@ in
       sources."parse-passwd-1.0.0"
       sources."path-parse-1.0.6"
       sources."pkginfo-0.4.1"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."safe-buffer-5.1.2"
       sources."sax-0.5.8"
       sources."semver-5.7.1"
@@ -61598,7 +62114,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
@@ -61878,7 +62394,7 @@ in
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       (sources."rimraf-2.7.1" // {
         dependencies = [
           sources."glob-7.1.6"
@@ -61941,7 +62457,7 @@ in
       })
       sources."available-typed-arrays-1.0.2"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bn.js-5.1.3"
       sources."brace-expansion-1.1.11"
       sources."brorand-1.1.0"
@@ -61950,11 +62466,7 @@ in
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
-      (sources."browserify-rsa-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."browserify-rsa-4.1.0"
       (sources."browserify-sign-4.2.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -62087,7 +62599,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."ripemd160-2.0.2"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
@@ -62187,7 +62699,7 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bencode-2.0.1"
       sources."bep53-range-1.0.0"
@@ -62455,7 +62967,7 @@ in
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
       sources."request-2.88.2"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."rimraf-2.7.1"
       sources."router-0.6.2"
       sources."run-parallel-1.1.10"
@@ -62712,10 +63224,10 @@ in
   coc-diagnostic = nodeEnv.buildNodePackage {
     name = "coc-diagnostic";
     packageName = "coc-diagnostic";
-    version = "0.12.0";
+    version = "0.13.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.12.0.tgz";
-      sha512 = "onUfHm8s/nisp/VtrtPwjXvljhdnYUmQwc/VmB/MsZfaJW3hDLhl4gDbBHISR+CHDHANpkItHw/dpU53V/YC6g==";
+      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.13.0.tgz";
+      sha512 = "09jUr50HgKBPxlK88p6CrJXGdu5owMT5c951Ajxwp2lhmFlo26NYn5eVo69shEaZvkpFvlskQWn5lqvrDox0Vw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -62770,10 +63282,10 @@ in
   coc-git = nodeEnv.buildNodePackage {
     name = "coc-git";
     packageName = "coc-git";
-    version = "2.0.2";
+    version = "2.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.2.tgz";
-      sha512 = "j7Hs+NHSk6nMEVobAi6NCGLuU8ME7FAbjaOWSszbsYidkXKQ/pwKoNl459YWRjePC/uDZKBbLERPYqX+Y0xAQw==";
+      url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.4.tgz";
+      sha512 = "Ej4dq5XOkMfnJkHIgUj2FlARz3sU3ACsrSq4YmLD3zj11uf/1nkPf5or89GOngQ1/KyCa1Llj1ai8+oTHyJAQw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -62885,10 +63397,10 @@ in
   coc-jest = nodeEnv.buildNodePackage {
     name = "coc-jest";
     packageName = "coc-jest";
-    version = "1.1.2";
+    version = "1.1.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.1.2.tgz";
-      sha512 = "vQKfTnF+LMEJEDR/+oTWowOUylr2+3pkOHGUr+OgNMhdjQPy+K1/Kcuqkm4qTpmhQFwg7OzF7GYDfoQojEEmBQ==";
+      url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.1.3.tgz";
+      sha512 = "iE9zECMZPRdN/HUu1FqjNQ2bkBYePtFpwXOfLQSkb7C+8g3PB3ne3GpS7eLaqVnjgRz9mXzQ6xMBvFIp++7PFA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -62938,13 +63450,13 @@ in
   coc-metals = nodeEnv.buildNodePackage {
     name = "coc-metals";
     packageName = "coc-metals";
-    version = "0.9.5";
+    version = "0.9.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.5.tgz";
-      sha512 = "KZVd2kmQjUQVLEHM9c2aXxP4AbM8sRybPtdAR6lWfIK3VGj67O2PIoG30Ro17d7BgcASVBp2Ad86azK9Op8uDw==";
+      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.6.tgz";
+      sha512 = "5NSCyYUbOployL6Vfanw7LeIYAi9+8LTqXjKqmVCSRql/YpscZJj7Y3KnhUc4P6WYuORXTl7r9Wwau6T/McyQw==";
     };
     dependencies = [
-      sources."@chemzqm/neovim-5.2.8"
+      sources."@chemzqm/neovim-5.2.10"
       sources."@tootallnate/once-1.1.2"
       sources."agent-base-6.0.2"
       sources."arch-2.2.0"
@@ -62988,7 +63500,7 @@ in
       sources."fb-watchman-2.0.1"
       sources."flatted-2.0.2"
       sources."follow-redirects-1.13.0"
-      sources."fp-ts-2.8.5"
+      sources."fp-ts-2.8.6"
       sources."fs-extra-8.1.0"
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
@@ -63033,7 +63545,7 @@ in
       })
       sources."lodash-4.17.20"
       sources."log4js-6.3.0"
-      sources."metals-languageclient-0.3.2"
+      sources."metals-languageclient-0.3.3"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."minipass-3.1.3"
@@ -63220,7 +63732,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
-      sources."caniuse-lite-1.0.30001156"
+      sources."caniuse-lite-1.0.30001158"
       sources."capture-stack-trace-1.0.1"
       sources."ccount-1.1.0"
       sources."chalk-2.4.2"
@@ -63317,7 +63829,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.589"
+      sources."electron-to-chromium-1.3.596"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -63824,7 +64336,7 @@ in
       sources."require-from-string-2.0.2"
       sources."require-main-filename-1.0.1"
       sources."require-relative-0.8.7"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       (sources."resolve-cwd-2.0.0" // {
         dependencies = [
           sources."resolve-from-3.0.0"
@@ -64156,10 +64668,10 @@ in
   coc-rust-analyzer = nodeEnv.buildNodePackage {
     name = "coc-rust-analyzer";
     packageName = "coc-rust-analyzer";
-    version = "0.14.0";
+    version = "0.15.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.14.0.tgz";
-      sha512 = "2s1VTk/IgwO82Vf/YhywNUbijpdgAmUBa6+R9f8xPzl2MyYw9lKVqasxJPa3qA4CB6sqSAG5r3egP6LzqqDxbA==";
+      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.15.0.tgz";
+      sha512 = "0hSwXiDZTOVskAlCM7T5HqEixWw5FnSRnc1Uweq8slqxwBnGa6x68akVqa674MEM0KhbJi/H6TDE6q8LzUR58g==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64192,10 +64704,10 @@ in
   coc-snippets = nodeEnv.buildNodePackage {
     name = "coc-snippets";
     packageName = "coc-snippets";
-    version = "2.2.5";
+    version = "2.2.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.5.tgz";
-      sha512 = "YtWw6yFdKxgIxjoUyEgzmT3YVtp3JX7AZUOYDbbnPbneyck5poZyOpjwL+3Wu2TzohDtg2H4ivTDyttv2wXvRQ==";
+      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.9.tgz";
+      sha512 = "SjVr0CSmF97LS5e/qz2Lac5JYpx9F6U9MPLzbB3WfGSIBwlrbevgw47DJSIxCr1ZWNb1Um/esRWDGfkhrMjbmA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64260,7 +64772,7 @@ in
       sources."@nodelib/fs.walk-1.2.4"
       sources."@stylelint/postcss-css-in-js-0.37.2"
       sources."@stylelint/postcss-markdown-0.36.1"
-      sources."@types/minimist-1.2.0"
+      sources."@types/minimist-1.2.1"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse-json-4.0.0"
       sources."@types/unist-2.0.3"
@@ -64275,11 +64787,11 @@ in
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.14.6"
+      sources."browserslist-4.14.7"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001156"
+      sources."caniuse-lite-1.0.30001158"
       sources."ccount-1.1.0"
       (sources."chalk-4.1.0" // {
         dependencies = [
@@ -64320,7 +64832,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.589"
+      sources."electron-to-chromium-1.3.596"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -64418,7 +64930,7 @@ in
       })
       sources."mkdirp-0.5.5"
       sources."ms-2.1.2"
-      sources."node-releases-1.1.65"
+      sources."node-releases-1.1.66"
       sources."normalize-package-data-2.5.0"
       sources."normalize-range-0.1.2"
       sources."normalize-selector-0.2.0"
@@ -64476,7 +64988,7 @@ in
       sources."remark-stringify-8.1.1"
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-from-5.0.0"
       sources."reusify-1.0.4"
       sources."rimraf-2.6.3"
@@ -64623,7 +65135,7 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."semver-5.7.1"
       sources."sprintf-js-1.0.3"
       sources."supports-color-5.5.0"
@@ -64700,320 +65212,52 @@ in
   coc-vetur = nodeEnv.buildNodePackage {
     name = "coc-vetur";
     packageName = "coc-vetur";
-    version = "1.2.1";
+    version = "1.2.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.1.tgz";
-      sha512 = "ji3UHWxiAnEwEcAxedGMxZbwKffTB+7t0zT2mKozv9wYZGgc3Rexp0Nvl3J05Cfvz+FCrSEDSaxpo+JSfdYLIQ==";
+      url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.2.tgz";
+      sha512 = "nqfCmf1pAQnVFNkGni5Isw9ISX4jVt7qTDXZmr//eY1IFCbNXjq4+xJyHoJyeAq3SSVWPKoKoELfQevnwdBxOA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
       sources."@babel/helper-validator-identifier-7.10.4"
-      sources."@babel/highlight-7.10.4"
-      sources."@emmetio/abbreviation-2.0.2"
-      sources."@emmetio/css-abbreviation-2.1.2"
-      sources."@emmetio/scanner-1.0.0"
-      (sources."@eslint/eslintrc-0.2.1" // {
+      (sources."@babel/highlight-7.10.4" // {
         dependencies = [
-          sources."debug-4.3.0"
-          sources."ignore-4.0.6"
-          sources."strip-json-comments-3.1.1"
+          sources."chalk-2.4.2"
         ];
       })
-      sources."@mrmlnc/readdir-enhanced-2.2.1"
-      (sources."@nodelib/fs.scandir-2.1.3" // {
-        dependencies = [
-          sources."@nodelib/fs.stat-2.0.3"
-        ];
-      })
-      sources."@nodelib/fs.stat-1.1.3"
-      sources."@nodelib/fs.walk-1.2.4"
-      sources."@prettier/plugin-pug-1.10.1"
-      sources."@sindresorhus/is-0.14.0"
-      sources."@sorg/log-2.2.1"
-      sources."@starptech/expression-parser-0.10.0"
-      sources."@starptech/hast-util-from-webparser-0.10.0"
-      (sources."@starptech/prettyhtml-0.10.0" // {
-        dependencies = [
-          sources."prettier-1.19.1"
-        ];
-      })
-      (sources."@starptech/prettyhtml-formatter-0.10.0" // {
-        dependencies = [
-          sources."prettier-1.19.1"
-        ];
-      })
-      sources."@starptech/prettyhtml-hast-to-html-0.10.0"
-      sources."@starptech/prettyhtml-hastscript-0.10.0"
-      sources."@starptech/prettyhtml-sort-attributes-0.10.0"
-      sources."@starptech/rehype-minify-whitespace-0.10.0"
-      sources."@starptech/rehype-webparser-0.10.0"
-      sources."@starptech/webparser-0.10.0"
-      sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/eslint-visitor-keys-1.0.0"
-      sources."@types/glob-7.1.3"
-      sources."@types/json-schema-7.0.6"
-      sources."@types/minimatch-3.0.3"
-      sources."@types/minimist-1.2.0"
-      sources."@types/node-14.14.6"
-      sources."@types/normalize-package-data-2.4.0"
-      sources."@types/unist-2.0.3"
-      sources."@types/vfile-3.0.2"
-      sources."@types/vfile-message-2.0.0"
-      sources."@typescript-eslint/experimental-utils-3.10.1"
-      (sources."@typescript-eslint/parser-3.10.1" // {
-        dependencies = [
-          sources."eslint-visitor-keys-1.3.0"
-        ];
-      })
-      sources."@typescript-eslint/types-3.10.1"
-      (sources."@typescript-eslint/typescript-estree-3.10.1" // {
-        dependencies = [
-          sources."debug-4.3.0"
-          sources."semver-7.3.2"
-        ];
-      })
-      (sources."@typescript-eslint/visitor-keys-3.10.1" // {
-        dependencies = [
-          sources."eslint-visitor-keys-1.3.0"
-        ];
-      })
-      sources."abbrev-1.1.1"
+      sources."@eslint/eslintrc-0.2.1"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
-      (sources."aggregate-error-3.1.0" // {
-        dependencies = [
-          sources."indent-string-4.0.0"
-        ];
-      })
       sources."ajv-6.12.6"
-      (sources."ansi-align-3.0.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
       sources."ansi-colors-4.1.1"
-      (sources."ansi-escapes-4.3.1" // {
-        dependencies = [
-          sources."type-fest-0.11.0"
-        ];
-      })
-      sources."ansi-regex-3.0.0"
+      sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
-      sources."anymatch-3.1.1"
       sources."argparse-1.0.10"
-      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-iterate-1.1.4"
-      sources."array-union-1.0.2"
-      sources."array-uniq-1.0.3"
-      sources."array-unique-0.3.2"
-      sources."arrify-1.0.1"
-      sources."assign-symbols-1.0.0"
       sources."astral-regex-1.0.0"
-      sources."async-1.5.2"
-      sources."atob-2.1.2"
-      sources."bail-1.0.5"
       sources."balanced-match-1.0.0"
-      (sources."base-0.11.2" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-        ];
-      })
-      sources."binary-extensions-2.1.0"
-      sources."bootstrap-vue-helper-json-1.1.1"
-      (sources."boxen-3.2.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."camelcase-5.3.1"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
       sources."brace-expansion-1.1.11"
-      (sources."braces-2.3.2" // {
-        dependencies = [
-          sources."extend-shallow-2.0.1"
-        ];
-      })
-      sources."buffer-from-1.1.1"
-      sources."builtin-modules-1.1.1"
-      sources."cache-base-1.0.1"
-      (sources."cacheable-request-6.1.0" // {
-        dependencies = [
-          sources."get-stream-5.2.0"
-          sources."lowercase-keys-2.0.0"
-        ];
-      })
-      sources."call-me-maybe-1.0.1"
       sources."callsites-3.1.0"
-      sources."camelcase-4.1.0"
-      sources."camelcase-keys-4.2.0"
-      sources."ccount-1.1.0"
-      sources."chalk-2.4.2"
-      sources."character-entities-1.2.4"
-      sources."character-entities-html4-1.1.4"
-      sources."character-entities-legacy-1.1.4"
-      sources."character-parser-2.2.0"
-      sources."character-reference-invalid-1.1.4"
-      sources."chardet-0.7.0"
-      (sources."chokidar-3.0.2" // {
+      (sources."chalk-4.1.0" // {
         dependencies = [
-          sources."braces-3.0.2"
-          sources."fill-range-7.0.1"
-          sources."is-number-7.0.0"
-          sources."to-regex-range-5.0.1"
-        ];
-      })
-      sources."ci-info-2.0.0"
-      (sources."class-utils-0.3.6" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-buffer-1.1.6"
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
-        ];
-      })
-      sources."clean-stack-2.2.0"
-      sources."cli-boxes-2.2.1"
-      sources."cli-cursor-3.1.0"
-      sources."cli-width-3.0.0"
-      sources."cliui-4.1.0"
-      sources."clone-1.0.4"
-      sources."clone-response-1.0.2"
-      sources."code-point-at-1.1.0"
-      sources."collapse-white-space-1.0.6"
-      sources."collection-visit-1.0.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      (sources."columnify-1.5.4" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
-      sources."comma-separated-tokens-1.0.8"
-      sources."commander-2.20.3"
-      sources."common-tags-1.8.0"
-      sources."component-emitter-1.3.0"
-      sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
-      sources."config-chain-1.1.12"
-      sources."configstore-4.0.0"
-      sources."copy-descriptor-0.1.1"
-      sources."core-js-3.7.0"
-      sources."core-util-is-1.0.2"
-      sources."cross-spawn-5.1.0"
-      sources."crypto-random-string-1.0.0"
-      (sources."css-2.2.4" // {
-        dependencies = [
-          sources."source-map-0.6.1"
-        ];
-      })
-      sources."css-parse-2.0.0"
-      sources."currently-unhandled-0.4.1"
-      sources."debug-3.2.6"
-      sources."decamelize-1.2.0"
-      (sources."decamelize-keys-1.1.0" // {
-        dependencies = [
-          sources."map-obj-1.0.1"
-        ];
-      })
-      sources."decode-uri-component-0.2.0"
-      sources."decompress-response-3.3.0"
-      sources."deep-extend-0.6.0"
-      sources."deep-is-0.1.3"
-      sources."defaults-1.0.3"
-      sources."defer-to-connect-1.1.3"
-      sources."define-property-2.0.2"
-      (sources."del-5.1.0" // {
-        dependencies = [
-          sources."@nodelib/fs.stat-2.0.3"
-          sources."array-union-2.1.0"
-          sources."braces-3.0.2"
-          sources."dir-glob-3.0.1"
-          sources."fast-glob-3.2.4"
-          sources."fill-range-7.0.1"
-          sources."globby-10.0.2"
-          sources."ignore-5.1.8"
-          sources."is-number-7.0.0"
-          sources."is-path-inside-3.0.2"
-          sources."micromatch-4.0.2"
-          sources."path-type-4.0.0"
-          sources."rimraf-3.0.2"
-          sources."slash-3.0.0"
-          sources."to-regex-range-5.0.1"
-        ];
-      })
-      (sources."del-cli-3.0.1" // {
-        dependencies = [
-          sources."camelcase-5.3.1"
-          sources."camelcase-keys-6.2.2"
-          sources."indent-string-4.0.0"
-          sources."map-obj-4.1.0"
-          sources."meow-6.1.1"
-          sources."minimist-options-4.1.0"
-          sources."quick-lru-4.0.1"
-          sources."redent-3.0.0"
-          sources."strip-indent-3.0.0"
-          sources."trim-newlines-3.0.0"
-          sources."type-fest-0.13.1"
-          sources."yargs-parser-18.1.3"
-        ];
-      })
-      sources."diff-4.0.2"
-      sources."dir-glob-2.0.0"
-      sources."dlv-1.1.3"
-      sources."doctrine-3.0.0"
-      sources."dot-prop-4.2.1"
-      sources."duplexer3-0.1.4"
-      sources."editorconfig-0.15.3"
-      sources."element-helper-json-2.0.6"
-      sources."emmet-2.1.6"
-      sources."emoji-regex-7.0.3"
-      sources."end-of-stream-1.4.4"
-      sources."enquirer-2.3.6"
-      sources."error-ex-1.3.2"
-      sources."escape-string-regexp-1.0.5"
-      (sources."eslint-7.12.1" // {
-        dependencies = [
-          sources."ansi-regex-5.0.0"
           sources."ansi-styles-4.3.0"
-          sources."chalk-4.1.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
-          sources."cross-spawn-7.0.3"
-          sources."debug-4.3.0"
           sources."has-flag-4.0.0"
-          sources."ignore-4.0.6"
-          sources."path-key-3.1.1"
-          sources."semver-7.3.2"
-          sources."shebang-command-2.0.0"
-          sources."shebang-regex-3.0.0"
-          sources."strip-ansi-6.0.0"
-          sources."strip-json-comments-3.1.1"
           sources."supports-color-7.2.0"
-          sources."which-2.0.2"
-        ];
-      })
-      (sources."eslint-plugin-vue-7.1.0" // {
-        dependencies = [
-          sources."semver-7.3.2"
         ];
       })
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."concat-map-0.0.1"
+      sources."cross-spawn-7.0.3"
+      sources."debug-4.3.0"
+      sources."deep-is-0.1.3"
+      sources."doctrine-3.0.0"
+      sources."emoji-regex-7.0.3"
+      sources."enquirer-2.3.6"
+      sources."escape-string-regexp-1.0.5"
+      sources."eslint-7.13.0"
+      sources."eslint-plugin-vue-7.1.0"
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
         dependencies = [
@@ -65039,733 +65283,80 @@ in
       })
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
-      sources."execa-0.7.0"
-      (sources."expand-brackets-2.1.4" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."define-property-0.2.5"
-          sources."extend-shallow-2.0.1"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-buffer-1.1.6"
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      sources."extend-3.0.2"
-      (sources."extend-shallow-3.0.2" // {
-        dependencies = [
-          sources."is-extendable-1.0.1"
-        ];
-      })
-      sources."external-editor-3.1.0"
-      (sources."extglob-2.0.4" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-          sources."extend-shallow-2.0.1"
-        ];
-      })
       sources."fast-deep-equal-3.1.3"
-      (sources."fast-glob-2.2.7" // {
-        dependencies = [
-          (sources."glob-parent-3.1.0" // {
-            dependencies = [
-              sources."is-glob-3.1.0"
-            ];
-          })
-        ];
-      })
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."fastq-1.9.0"
-      sources."fault-1.0.4"
-      sources."figures-3.2.0"
       sources."file-entry-cache-5.0.1"
-      (sources."fill-range-4.0.0" // {
-        dependencies = [
-          sources."extend-shallow-2.0.1"
-        ];
-      })
-      sources."find-up-2.1.0"
       sources."flat-cache-2.0.1"
       sources."flatted-2.0.2"
-      sources."fn-name-2.0.1"
-      sources."for-in-1.0.2"
-      sources."format-0.2.2"
-      sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.2.1"
-      sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
-      sources."get-caller-file-1.0.3"
-      sources."get-stream-3.0.0"
-      sources."get-value-2.0.6"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
-      sources."glob-to-regexp-0.3.0"
-      sources."global-dirs-0.1.1"
-      (sources."globals-12.4.0" // {
-        dependencies = [
-          sources."type-fest-0.8.1"
-        ];
-      })
-      sources."globby-8.0.2"
-      (sources."got-9.6.0" // {
-        dependencies = [
-          sources."get-stream-4.1.0"
-        ];
-      })
-      sources."graceful-fs-4.2.4"
-      sources."gridsome-helper-json-1.0.3"
-      sources."hard-rejection-2.1.0"
-      sources."has-1.0.3"
-      (sources."has-ansi-2.0.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
+      sources."globals-12.4.0"
       sources."has-flag-3.0.0"
-      sources."has-symbols-1.0.1"
-      sources."has-value-1.0.0"
-      (sources."has-values-1.0.0" // {
-        dependencies = [
-          sources."is-buffer-1.1.6"
-          sources."kind-of-4.0.0"
-        ];
-      })
-      sources."has-yarn-2.1.0"
-      sources."hast-util-embedded-1.0.5"
-      sources."hast-util-has-property-1.0.4"
-      sources."hast-util-is-body-ok-link-1.0.4"
-      sources."hast-util-is-element-1.1.0"
-      sources."hast-util-parse-selector-2.2.5"
-      sources."hast-util-to-string-1.0.4"
-      sources."hast-util-whitespace-1.0.4"
-      sources."hosted-git-info-2.8.8"
-      sources."html-void-elements-1.0.5"
-      sources."html-whitespace-sensitive-tag-names-1.0.3"
-      sources."http-cache-semantics-4.1.0"
-      sources."iconv-lite-0.4.24"
-      sources."ignore-3.3.10"
-      (sources."import-fresh-3.2.2" // {
-        dependencies = [
-          sources."resolve-from-4.0.0"
-        ];
-      })
-      sources."import-lazy-2.1.0"
+      sources."ignore-4.0.6"
+      sources."import-fresh-3.2.2"
       sources."imurmurhash-0.1.4"
-      sources."indent-string-3.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-1.3.5"
-      (sources."inquirer-7.3.3" // {
-        dependencies = [
-          sources."ansi-regex-5.0.0"
-          sources."ansi-styles-4.3.0"
-          sources."chalk-4.1.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."emoji-regex-8.0.0"
-          sources."has-flag-4.0.0"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."string-width-4.2.0"
-          sources."strip-ansi-6.0.0"
-          sources."supports-color-7.2.0"
-        ];
-      })
-      sources."invert-kv-2.0.0"
-      sources."is-accessor-descriptor-1.0.0"
-      sources."is-alphabetical-1.0.4"
-      sources."is-alphanumerical-1.0.4"
-      sources."is-arrayish-0.2.1"
-      sources."is-binary-path-2.1.0"
-      sources."is-buffer-2.0.5"
-      sources."is-ci-2.0.0"
-      sources."is-core-module-2.1.0"
-      sources."is-data-descriptor-1.0.0"
-      sources."is-decimal-1.0.4"
-      sources."is-descriptor-1.0.2"
-      sources."is-empty-1.2.0"
-      sources."is-expression-4.0.0"
-      sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
-      sources."is-hexadecimal-1.0.4"
-      sources."is-hidden-1.1.3"
-      sources."is-installed-globally-0.1.0"
-      sources."is-npm-3.0.0"
-      (sources."is-number-3.0.0" // {
-        dependencies = [
-          sources."is-buffer-1.1.6"
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."is-obj-1.0.1"
-      sources."is-object-1.0.1"
-      sources."is-path-cwd-2.2.0"
-      sources."is-path-inside-1.0.1"
-      sources."is-plain-obj-1.1.0"
-      sources."is-plain-object-2.0.4"
-      sources."is-regex-1.1.1"
-      sources."is-stream-1.1.0"
-      sources."is-utf8-0.2.1"
-      sources."is-windows-1.0.2"
-      sources."is-yarn-global-0.3.0"
-      sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."isobject-3.0.1"
-      (sources."js-beautify-1.13.0" // {
-        dependencies = [
-          sources."mkdirp-1.0.4"
-        ];
-      })
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.0"
-      sources."json-buffer-3.0.0"
-      sources."json-parse-better-errors-1.0.2"
-      sources."json-parse-even-better-errors-2.3.1"
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
-      sources."json5-2.1.3"
-      sources."jsonc-parser-2.3.1"
-      sources."keyv-3.1.0"
-      sources."kind-of-6.0.3"
-      sources."latest-version-5.1.0"
-      sources."lcid-2.0.0"
       sources."levn-0.4.1"
-      sources."lines-and-columns-1.1.6"
-      sources."load-json-file-4.0.0"
-      sources."load-plugin-2.3.1"
-      sources."locate-path-2.0.0"
       sources."lodash-4.17.20"
-      sources."lodash.assign-4.2.0"
-      sources."lodash.defaults-4.2.0"
-      sources."lodash.iteratee-4.7.0"
-      sources."lodash.merge-4.6.2"
-      sources."loglevel-1.7.0"
-      (sources."loglevel-colored-level-prefix-1.0.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."ansi-styles-2.2.1"
-          sources."chalk-1.1.3"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-        ];
-      })
-      sources."longest-streak-1.0.0"
-      sources."loud-rejection-1.6.0"
-      sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.5"
-      sources."make-dir-1.3.0"
-      sources."map-age-cleaner-0.1.3"
-      sources."map-cache-0.2.2"
-      sources."map-obj-2.0.0"
-      sources."map-visit-1.0.0"
-      sources."markdown-table-0.4.0"
-      sources."mem-4.3.0"
-      (sources."meow-5.0.0" // {
-        dependencies = [
-          sources."read-pkg-up-3.0.0"
-        ];
-      })
-      sources."merge2-1.4.1"
-      sources."micromatch-3.1.10"
-      sources."mimic-fn-2.1.0"
-      sources."mimic-response-1.0.1"
-      sources."min-indent-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      sources."minimist-options-3.0.2"
-      (sources."mixin-deep-1.3.2" // {
-        dependencies = [
-          sources."is-extendable-1.0.1"
-        ];
-      })
       sources."mkdirp-0.5.5"
-      sources."mout-0.5.0"
       sources."ms-2.1.2"
-      sources."mute-stream-0.0.8"
-      sources."nanomatch-1.2.13"
       sources."natural-compare-1.4.0"
-      sources."nice-try-1.0.5"
-      sources."nopt-5.0.0"
-      sources."normalize-package-data-2.5.0"
-      sources."normalize-path-3.0.0"
-      sources."normalize-url-4.5.0"
-      sources."npm-prefix-1.2.0"
-      sources."npm-run-path-2.0.2"
-      sources."number-is-nan-1.0.1"
-      sources."nuxt-helper-json-1.0.0"
-      sources."object-assign-4.1.1"
-      (sources."object-copy-0.1.0" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          sources."is-accessor-descriptor-0.1.6"
-          sources."is-buffer-1.1.6"
-          sources."is-data-descriptor-0.1.4"
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."object-visit-1.0.1"
-      sources."object.pick-1.3.0"
       sources."once-1.4.0"
-      sources."onetime-5.1.2"
       sources."optionator-0.9.1"
-      sources."os-homedir-1.0.2"
-      (sources."os-locale-3.1.0" // {
-        dependencies = [
-          sources."cross-spawn-6.0.5"
-          sources."execa-1.0.0"
-          sources."get-stream-4.1.0"
-        ];
-      })
-      sources."os-tmpdir-1.0.2"
-      sources."p-cancelable-1.1.0"
-      sources."p-defer-1.0.0"
-      sources."p-finally-1.0.0"
-      sources."p-is-promise-2.1.0"
-      sources."p-limit-1.3.0"
-      sources."p-locate-2.0.0"
-      sources."p-map-3.0.0"
-      sources."p-try-1.0.0"
-      (sources."package-json-6.5.0" // {
-        dependencies = [
-          sources."semver-6.3.0"
-        ];
-      })
       sources."parent-module-1.0.1"
-      sources."parse-entities-1.2.2"
-      sources."parse-gitignore-1.0.1"
-      sources."parse-json-4.0.0"
-      sources."pascalcase-0.1.1"
-      sources."path-dirname-1.0.2"
-      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"
-      sources."path-parse-1.0.6"
-      sources."path-type-3.0.0"
-      sources."picomatch-2.2.2"
-      sources."pify-3.0.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      (sources."pkg-conf-1.1.3" // {
-        dependencies = [
-          sources."find-up-1.1.2"
-          sources."load-json-file-1.1.0"
-          sources."parse-json-2.2.0"
-          sources."path-exists-2.1.0"
-          sources."pify-2.3.0"
-          sources."strip-bom-2.0.0"
-        ];
-      })
-      sources."posix-character-classes-0.1.1"
+      sources."path-key-3.1.1"
       sources."prelude-ls-1.2.1"
-      sources."prepend-http-2.0.0"
-      sources."prettier-2.1.2"
-      (sources."prettier-eslint-11.0.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          (sources."cross-spawn-6.0.5" // {
-            dependencies = [
-              sources."semver-5.7.1"
-            ];
-          })
-          sources."debug-4.3.0"
-          sources."eslint-6.8.0"
-          sources."eslint-utils-1.4.3"
-          sources."eslint-visitor-keys-1.3.0"
-          sources."espree-6.2.1"
-          sources."ignore-4.0.6"
-          sources."indent-string-4.0.0"
-          sources."levn-0.3.0"
-          sources."optionator-0.8.3"
-          sources."prelude-ls-1.1.2"
-          sources."regexpp-2.0.1"
-          sources."semver-6.3.0"
-          sources."strip-ansi-5.2.0"
-          sources."strip-json-comments-3.1.1"
-          sources."type-check-0.3.2"
-          sources."typescript-3.9.7"
-        ];
-      })
-      sources."prettier-tslint-0.4.2"
-      sources."pretty-format-23.6.0"
-      sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
-      sources."property-information-5.6.0"
-      sources."proto-list-1.2.4"
-      sources."pseudomap-1.0.2"
-      sources."pug-error-2.0.0"
-      sources."pug-lexer-5.0.0"
-      sources."pump-3.0.0"
       sources."punycode-2.1.1"
-      sources."quick-lru-1.1.0"
-      sources."rc-1.2.8"
-      sources."read-pkg-3.0.0"
-      (sources."read-pkg-up-7.0.1" // {
-        dependencies = [
-          sources."find-up-4.1.0"
-          sources."locate-path-5.0.0"
-          sources."p-limit-2.3.0"
-          sources."p-locate-4.1.0"
-          sources."p-try-2.2.0"
-          sources."parse-json-5.1.0"
-          sources."path-exists-4.0.0"
-          (sources."read-pkg-5.2.0" // {
-            dependencies = [
-              sources."type-fest-0.6.0"
-            ];
-          })
-          sources."type-fest-0.8.1"
-        ];
-      })
-      sources."readable-stream-2.3.7"
-      sources."readdirp-3.5.0"
-      sources."redent-2.0.0"
-      sources."regex-not-1.0.2"
       sources."regexpp-3.1.0"
-      sources."registry-auth-token-4.2.0"
-      sources."registry-url-5.1.0"
-      sources."rehype-sort-attribute-values-2.0.1"
-      (sources."remark-5.1.0" // {
-        dependencies = [
-          sources."unified-4.2.1"
-          sources."vfile-1.4.0"
-        ];
-      })
-      sources."remark-parse-1.1.0"
-      (sources."remark-stringify-1.1.0" // {
-        dependencies = [
-          sources."stringify-entities-1.3.2"
-        ];
-      })
-      sources."repeat-element-1.1.3"
-      sources."repeat-string-1.6.1"
-      sources."replace-ext-1.0.0"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
-      sources."require-relative-0.8.7"
-      sources."resolve-1.18.1"
-      sources."resolve-from-5.0.0"
-      sources."resolve-url-0.2.1"
-      sources."responselike-1.0.2"
-      sources."restore-cursor-3.1.0"
-      sources."ret-0.1.15"
-      sources."reusify-1.0.4"
+      sources."resolve-from-4.0.0"
       sources."rimraf-2.6.3"
-      sources."run-async-2.4.1"
-      sources."run-parallel-1.1.10"
-      sources."rxjs-6.6.3"
-      sources."s.color-0.0.15"
-      sources."safe-buffer-5.1.2"
-      sources."safe-regex-1.1.0"
-      sources."safer-buffer-2.1.2"
-      sources."sass-formatter-0.5.1"
-      sources."sax-1.2.4"
-      sources."semver-5.7.1"
-      sources."semver-diff-2.1.0"
-      sources."set-blocking-2.0.0"
-      (sources."set-value-2.0.1" // {
-        dependencies = [
-          sources."extend-shallow-2.0.1"
-        ];
-      })
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."shellsubstitute-1.2.0"
-      sources."sigmund-1.0.1"
-      sources."signal-exit-3.0.3"
-      sources."slash-1.0.0"
+      sources."semver-7.3.2"
+      sources."shebang-command-2.0.0"
+      sources."shebang-regex-3.0.0"
       sources."slice-ansi-2.1.0"
-      (sources."snapdragon-0.8.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."define-property-0.2.5"
-          sources."extend-shallow-2.0.1"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-buffer-1.1.6"
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      (sources."snapdragon-node-2.1.1" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-        ];
-      })
-      (sources."snapdragon-util-3.0.1" // {
-        dependencies = [
-          sources."is-buffer-1.1.6"
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."source-map-0.5.7"
-      sources."source-map-resolve-0.5.3"
-      sources."source-map-url-0.4.0"
-      sources."space-separated-tokens-1.1.5"
-      sources."spdx-correct-3.1.1"
-      sources."spdx-exceptions-2.3.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.6"
-      sources."split-string-3.1.0"
       sources."sprintf-js-1.0.3"
-      sources."stampit-1.2.0"
-      (sources."static-extend-0.1.2" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-buffer-1.1.6"
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."is-descriptor-0.1.6"
-          sources."kind-of-5.1.0"
-        ];
-      })
-      sources."string-width-2.1.1"
-      sources."string_decoder-1.1.1"
-      sources."stringify-entities-2.0.0"
-      sources."strip-ansi-4.0.0"
-      sources."strip-bom-3.0.0"
-      sources."strip-eof-1.0.0"
-      sources."strip-indent-2.0.0"
-      sources."strip-json-comments-2.0.1"
-      (sources."stylint-2.0.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."ansi-styles-2.2.1"
-          sources."camelcase-3.0.0"
-          sources."chalk-1.1.3"
-          sources."cliui-3.2.0"
-          sources."find-up-1.1.2"
-          sources."glob-7.0.4"
-          sources."invert-kv-1.0.0"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."lcid-1.0.0"
-          sources."load-json-file-1.1.0"
-          sources."os-locale-1.4.0"
-          sources."parse-json-2.2.0"
-          sources."path-exists-2.1.0"
-          sources."path-type-1.1.0"
-          sources."pify-2.3.0"
-          sources."read-pkg-1.1.0"
-          sources."read-pkg-up-1.0.1"
-          sources."set-blocking-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."strip-bom-2.0.0"
-          sources."supports-color-2.0.0"
-          sources."yargs-4.7.1"
-          sources."yargs-parser-2.4.1"
-        ];
-      })
-      (sources."stylus-0.54.8" // {
-        dependencies = [
-          sources."debug-3.1.0"
-          sources."mkdirp-1.0.4"
-          sources."ms-2.0.0"
-          sources."semver-6.3.0"
-          sources."source-map-0.7.3"
-        ];
-      })
-      sources."stylus-supremacy-2.14.5"
-      sources."suf-regex-0.0.25"
-      sources."supports-color-5.5.0"
-      sources."symbol-0.2.3"
-      (sources."table-5.4.6" // {
+      (sources."string-width-3.1.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
-          sources."string-width-3.1.0"
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."term-size-1.2.0"
+      sources."strip-ansi-6.0.0"
+      sources."strip-json-comments-3.1.1"
+      sources."supports-color-5.5.0"
+      sources."table-5.4.6"
       sources."text-table-0.2.0"
-      sources."through-2.3.8"
-      sources."tmp-0.0.33"
-      (sources."to-object-path-0.3.0" // {
-        dependencies = [
-          sources."is-buffer-1.1.6"
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."to-readable-stream-1.0.0"
-      sources."to-regex-3.0.2"
-      sources."to-regex-range-2.1.1"
-      sources."to-vfile-6.1.0"
-      sources."trim-0.0.1"
-      sources."trim-newlines-2.0.0"
-      sources."trim-trailing-lines-1.1.4"
-      sources."trough-1.0.5"
-      sources."tslib-1.14.1"
-      (sources."tslint-5.20.1" // {
-        dependencies = [
-          sources."tsutils-2.29.0"
-        ];
-      })
-      sources."tsutils-3.17.1"
       sources."type-check-0.4.0"
-      sources."type-fest-0.3.1"
-      sources."typedarray-0.0.6"
-      sources."typescript-4.0.5"
-      sources."unherit-1.1.3"
-      (sources."unified-7.1.0" // {
-        dependencies = [
-          sources."unist-util-stringify-position-1.1.2"
-          sources."vfile-3.0.1"
-          sources."vfile-message-1.1.1"
-        ];
-      })
-      (sources."unified-engine-6.0.1" // {
-        dependencies = [
-          sources."to-vfile-4.0.0"
-          sources."unist-util-stringify-position-1.1.2"
-          sources."vfile-3.0.1"
-          sources."vfile-message-1.1.1"
-          (sources."vfile-reporter-5.1.2" // {
-            dependencies = [
-              sources."unist-util-stringify-position-2.0.3"
-            ];
-          })
-        ];
-      })
-      sources."union-value-1.0.1"
-      sources."unique-string-1.0.0"
-      sources."unist-util-find-1.0.1"
-      sources."unist-util-inspect-4.1.4"
-      sources."unist-util-is-2.1.3"
-      sources."unist-util-modify-children-1.1.6"
-      sources."unist-util-remove-position-1.1.4"
-      sources."unist-util-stringify-position-2.0.3"
-      sources."unist-util-visit-1.4.1"
-      (sources."unist-util-visit-parents-2.1.2" // {
-        dependencies = [
-          sources."unist-util-is-3.0.0"
-        ];
-      })
-      (sources."unset-value-1.0.0" // {
-        dependencies = [
-          (sources."has-value-0.3.1" // {
-            dependencies = [
-              sources."isobject-2.1.0"
-            ];
-          })
-          sources."has-values-0.1.4"
-        ];
-      })
-      sources."untildify-2.1.0"
-      sources."update-notifier-3.0.1"
+      sources."type-fest-0.8.1"
       sources."uri-js-4.4.0"
-      sources."urix-0.1.0"
-      sources."url-parse-lax-3.0.0"
-      sources."use-3.1.1"
-      sources."user-home-2.0.0"
-      sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-2.2.0"
-      sources."validate-npm-package-license-3.0.4"
-      sources."vfile-4.2.0"
-      sources."vfile-location-2.0.6"
-      sources."vfile-message-2.0.4"
-      (sources."vfile-reporter-6.0.1" // {
-        dependencies = [
-          sources."ansi-regex-5.0.0"
-          sources."emoji-regex-8.0.0"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."string-width-4.2.0"
-          sources."strip-ansi-6.0.0"
-          sources."supports-color-6.1.0"
-        ];
-      })
-      sources."vfile-sort-2.2.2"
-      sources."vfile-statistics-1.1.4"
-      sources."vls-0.5.5"
-      (sources."vscode-css-languageservice-4.3.5" // {
-        dependencies = [
-          sources."vscode-languageserver-types-3.16.0-next.2"
-        ];
-      })
-      (sources."vscode-emmet-helper-2.1.1" // {
-        dependencies = [
-          sources."vscode-languageserver-types-3.15.1"
-        ];
-      })
-      sources."vscode-jsonrpc-6.0.0-next.5"
-      sources."vscode-languageserver-7.0.0-next.7"
-      sources."vscode-languageserver-protocol-3.16.0-next.7"
-      sources."vscode-languageserver-textdocument-1.0.1"
-      sources."vscode-languageserver-types-3.16.0-next.3"
-      sources."vscode-nls-5.0.0"
-      sources."vscode-uri-2.1.2"
-      sources."vscode-web-custom-data-0.3.1"
+      sources."vls-0.5.9"
       (sources."vue-eslint-parser-7.1.1" // {
         dependencies = [
-          sources."debug-4.3.0"
           sources."eslint-visitor-keys-1.3.0"
           sources."espree-6.2.1"
         ];
       })
-      sources."vue-onsenui-helper-json-1.0.2"
-      sources."wcwidth-1.0.1"
-      sources."which-1.3.1"
-      sources."which-module-2.0.0"
-      sources."widest-line-2.0.1"
-      sources."window-size-0.2.0"
+      sources."which-2.0.2"
       sources."word-wrap-1.2.3"
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
       sources."wrappy-1.0.2"
       sources."write-1.0.3"
-      sources."write-file-atomic-2.4.3"
-      sources."x-is-array-0.1.0"
-      sources."x-is-string-0.1.0"
-      sources."xdg-basedir-3.0.0"
-      sources."xtend-4.0.2"
-      sources."y18n-3.2.1"
-      sources."yallist-2.1.2"
-      (sources."yargs-11.1.1" // {
-        dependencies = [
-          sources."yargs-parser-9.0.2"
-        ];
-      })
-      sources."yargs-parser-10.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -65814,10 +65405,10 @@ in
   coc-yaml = nodeEnv.buildNodePackage {
     name = "coc-yaml";
     packageName = "coc-yaml";
-    version = "1.1.0";
+    version = "1.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.1.0.tgz";
-      sha512 = "z35izd8vv80UcyoIs2Yw6Q/8qoe9U321StT76JKIDSLRXLqY27Q6wS8RpVCWsPb6aXxmPRMt2sjnjF8DExpaMQ==";
+      url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.1.2.tgz";
+      sha512 = "schv9IuNXZIGJqoSUQf/zDTgtSG1Kqht5s9yrlWGPhByHofheyffW3jrXrI/yMY9CT/5/Mg37udFrAbx8WCpCg==";
     };
     dependencies = [
       sources."agent-base-4.3.0"
@@ -65831,15 +65422,13 @@ in
       sources."js-yaml-3.14.0"
       sources."jsonc-parser-2.3.1"
       sources."ms-2.0.0"
-      sources."prettier-2.0.5"
-      sources."request-light-0.2.5"
-      sources."sprintf-js-1.0.3"
-      (sources."vscode-json-languageservice-3.10.0" // {
+      (sources."request-light-0.2.5" // {
         dependencies = [
-          sources."vscode-languageserver-types-3.16.0-next.2"
-          sources."vscode-nls-5.0.0"
+          sources."vscode-nls-4.1.2"
         ];
       })
+      sources."sprintf-js-1.0.3"
+      sources."vscode-json-languageservice-3.8.4"
       sources."vscode-jsonrpc-4.0.0"
       (sources."vscode-languageserver-5.2.1" // {
         dependencies = [
@@ -65852,11 +65441,16 @@ in
         ];
       })
       sources."vscode-languageserver-textdocument-1.0.1"
-      sources."vscode-languageserver-types-3.15.1"
-      sources."vscode-nls-4.1.2"
+      sources."vscode-languageserver-types-3.16.0-next.2"
+      sources."vscode-nls-5.0.0"
       sources."vscode-uri-2.1.2"
-      sources."yaml-ast-parser-custom-tags-0.0.43"
-      sources."yaml-language-server-0.11.1"
+      (sources."yaml-language-server-0.12.0" // {
+        dependencies = [
+          sources."vscode-languageserver-types-3.15.1"
+          sources."vscode-nls-4.1.2"
+        ];
+      })
+      sources."yaml-language-server-parser-0.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -65870,10 +65464,10 @@ in
   coc-yank = nodeEnv.buildNodePackage {
     name = "coc-yank";
     packageName = "coc-yank";
-    version = "1.1.8";
+    version = "1.1.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.8.tgz";
-      sha512 = "jDBtzTnFb3TnwmsqQt5b6KFRcXB7J5pdsebzdovqroaKwKT9YH19CG4qPeuJleT3dJ/AwfUw3WP3yZWkwvLbFg==";
+      url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.11.tgz";
+      sha512 = "pWJbOo12PmigwYTCk8ghckDlPE5K0qO4VxEZeLJ7ck4v6jhRaKi0lVlYfhBauPuCDv3Yqd0DoKyVLvrQXoRg1A==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -66055,7 +65649,7 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big-integer-1.6.48"
       (sources."body-parser-1.19.0" // {
@@ -66386,7 +65980,7 @@ in
       sources."read-1.0.7"
       sources."read-chunk-3.2.0"
       sources."read-package-json-2.1.2"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       (sources."request-2.88.2" // {
         dependencies = [
@@ -66394,7 +65988,7 @@ in
           sources."tough-cookie-2.5.0"
         ];
       })
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-from-4.0.0"
       sources."responselike-1.0.2"
       (sources."restore-cursor-2.0.0" // {
@@ -66450,7 +66044,7 @@ in
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.28.1"
+      sources."systeminformation-4.30.1"
       sources."term-size-2.2.1"
       sources."through-2.3.8"
       sources."tmp-0.2.1"
@@ -66536,8 +66130,8 @@ in
       sources."@nodelib/fs.stat-1.1.3"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/minimist-1.2.0"
-      sources."@types/node-14.14.6"
+      sources."@types/minimist-1.2.1"
+      sources."@types/node-14.14.7"
       sources."@types/normalize-package-data-2.4.0"
       sources."aggregate-error-3.1.0"
       sources."ansi-styles-3.2.1"
@@ -66787,7 +66381,7 @@ in
       sources."regex-not-1.0.2"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
       sources."safe-regex-1.1.0"
@@ -66908,7 +66502,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.2"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -67444,7 +67038,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."flat-tree-1.6.0"
+      sources."flat-tree-1.7.0"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -68010,10 +67604,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.34.0";
+    version = "6.39.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.34.0.tgz";
-      sha512 = "YpMFwMv6BhUg4xC1eJRkBzqonsOFf/gsSjOP3Dr6S89USW3DNrY4UTZn0D7rrfpCkSZPDDcEwqy5rpcfSNYN9Q==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.39.0.tgz";
+      sha512 = "BSjkKIOZRkaqXkotVO/0HILZ+mqc8PrRatspvcNFajHgXiIJYk3dU4PDfbU26Y8DkxlofZfEpbw0QWKh+pu4AQ==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
@@ -68022,10 +67616,10 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.786.0"
+      sources."aws-sdk-2.792.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
       sources."buffer-4.9.2"
@@ -68050,7 +67644,7 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."http-signature-1.2.0"
-      sources."http-status-1.4.2"
+      sources."http-status-1.5.0"
       sources."ieee754-1.1.13"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
@@ -68090,13 +67684,14 @@ in
         ];
       })
       sources."request-2.88.2"
-      sources."requestretry-4.1.1"
+      sources."requestretry-4.1.2"
       sources."s3-stream-upload-2.0.2"
       sources."s3signed-0.1.0"
       sources."s3urls-1.5.2"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.1"
+      sources."semver-5.7.1"
       sources."socks5-client-1.2.8"
       sources."socks5-http-client-1.0.4"
       sources."socks5-https-client-1.2.1"
@@ -68199,8 +67794,8 @@ in
       sources."@types/cacheable-request-6.0.1"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/minimist-1.2.0"
-      sources."@types/node-14.14.6"
+      sources."@types/minimist-1.2.1"
+      sources."@types/node-14.14.7"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/responselike-1.0.0"
       sources."@types/yoga-layout-1.9.2"
@@ -68215,7 +67810,7 @@ in
       sources."arch-2.2.0"
       sources."arrify-1.0.1"
       sources."astral-regex-2.0.0"
-      sources."atomically-1.6.0"
+      sources."atomically-1.7.0"
       sources."auto-bind-4.0.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
@@ -68399,7 +67994,7 @@ in
       sources."punycode-2.1.1"
       sources."quick-lru-5.1.1"
       sources."react-16.14.0"
-      sources."react-devtools-core-4.9.0"
+      sources."react-devtools-core-4.10.0"
       sources."react-is-16.13.1"
       sources."react-reconciler-0.24.0"
       (sources."read-pkg-5.2.0" // {
@@ -68417,7 +68012,7 @@ in
         ];
       })
       sources."redent-3.0.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-alpn-1.0.0"
       sources."resolve-from-3.0.0"
       sources."responselike-2.0.0"
@@ -68443,7 +68038,7 @@ in
       sources."spdx-exceptions-2.3.0"
       sources."spdx-expression-parse-3.0.1"
       sources."spdx-license-ids-3.0.6"
-      (sources."stack-utils-2.0.2" // {
+      (sources."stack-utils-2.0.3" // {
         dependencies = [
           sources."escape-string-regexp-2.0.0"
         ];
@@ -68476,7 +68071,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."yargs-parser-18.1.3"
       sources."yoga-layout-prebuilt-1.10.0"
     ];
@@ -68525,7 +68120,7 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.149.4"
+      sources."@fluentui/react-7.150.0"
       sources."@fluentui/react-focus-7.16.17"
       sources."@fluentui/react-window-provider-1.0.1"
       sources."@fluentui/theme-1.6.0"
@@ -68539,7 +68134,7 @@ in
           sources."normalize-path-2.1.1"
         ];
       })
-      sources."@microsoft/load-themed-styles-1.10.126"
+      sources."@microsoft/load-themed-styles-1.10.133"
       sources."@nodelib/fs.scandir-2.1.3"
       sources."@nodelib/fs.stat-2.0.3"
       sources."@nodelib/fs.walk-1.2.4"
@@ -68578,7 +68173,7 @@ in
           sources."form-data-2.5.1"
         ];
       })
-      sources."@types/serve-static-1.13.6"
+      sources."@types/serve-static-1.13.7"
       sources."@types/socket.io-2.1.11"
       sources."@types/socket.io-client-1.4.33"
       sources."@types/sqlite3-3.1.6"
@@ -68727,7 +68322,7 @@ in
         ];
       })
       sources."base64-arraybuffer-0.1.4"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."base64id-2.0.0"
       sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
@@ -68747,11 +68342,7 @@ in
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
-      (sources."browserify-rsa-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."browserify-rsa-4.1.0"
       (sources."browserify-sign-4.2.1" // {
         dependencies = [
           sources."inherits-2.0.4"
@@ -69561,7 +69152,7 @@ in
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
       sources."object.reduce-1.0.1"
-      sources."office-ui-fabric-react-7.149.4"
+      sources."office-ui-fabric-react-7.150.0"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -69645,7 +69236,7 @@ in
       sources."pg-connection-string-2.4.0"
       sources."pg-int8-1.0.1"
       sources."pg-pool-3.2.2"
-      sources."pg-protocol-1.3.0"
+      sources."pg-protocol-1.4.0"
       sources."pg-types-2.2.0"
       sources."pgpass-1.0.4"
       sources."picomatch-2.2.2"
@@ -69721,7 +69312,7 @@ in
       sources."rechoir-0.6.2"
       sources."regenerator-runtime-0.10.5"
       sources."regex-not-1.0.2"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."remove-bom-buffer-3.0.0"
       sources."remove-bom-stream-1.2.0"
@@ -69737,7 +69328,7 @@ in
       })
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-dir-1.0.1"
       sources."resolve-options-1.1.0"
       sources."resolve-url-0.2.1"
@@ -69931,7 +69522,7 @@ in
           sources."mkdirp-0.5.5"
         ];
       })
-      (sources."terser-5.3.8" // {
+      (sources."terser-5.4.0" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -70051,7 +69642,7 @@ in
         ];
       })
       sources."vm-browserify-1.1.2"
-      (sources."watchpack-1.7.4" // {
+      (sources."watchpack-1.7.5" // {
         dependencies = [
           sources."anymatch-3.1.1"
           sources."binary-extensions-2.1.0"
@@ -70061,7 +69652,7 @@ in
           sources."readdirp-3.5.0"
         ];
       })
-      sources."watchpack-chokidar2-2.0.0"
+      sources."watchpack-chokidar2-2.0.1"
       (sources."webpack-4.44.2" // {
         dependencies = [
           sources."acorn-6.4.2"
@@ -70115,7 +69706,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."xtend-4.0.2"
       sources."y18n-3.2.1"
@@ -70160,10 +69751,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "7.12.1";
+    version = "7.13.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz";
-      sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==";
+      url = "https://registry.npmjs.org/eslint/-/eslint-7.13.0.tgz";
+      sha512 = "uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -70355,7 +69946,7 @@ in
       sources."emoji-regex-7.0.3"
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-7.12.1"
+      sources."eslint-7.13.0"
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
         dependencies = [
@@ -70826,7 +70417,7 @@ in
       })
       sources."@npmcli/node-gyp-1.0.1"
       sources."@npmcli/promise-spawn-1.3.2"
-      sources."@npmcli/run-script-1.7.4"
+      sources."@npmcli/run-script-1.7.5"
       sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3"
       sources."@react-native-community/cli-debugger-ui-4.9.0"
       (sources."@react-native-community/cli-platform-android-4.13.0" // {
@@ -70904,7 +70495,7 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      (sources."@types/webpack-4.41.24" // {
+      (sources."@types/webpack-4.41.25" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -71066,7 +70657,7 @@ in
         ];
       })
       sources."base32.js-0.1.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."base64url-3.0.1"
       sources."batch-0.6.1"
       sources."bcrypt-pbkdf-1.0.2"
@@ -71104,11 +70695,7 @@ in
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
-      (sources."browserify-rsa-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."browserify-rsa-4.1.0"
       (sources."browserify-sign-4.2.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -71116,7 +70703,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.14.6"
+      sources."browserslist-4.14.7"
       sources."buffer-5.7.1"
       sources."buffer-equal-0.0.1"
       sources."buffer-from-1.1.1"
@@ -71155,7 +70742,7 @@ in
       })
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001156"
+      sources."caniuse-lite-1.0.30001158"
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       (sources."chalk-4.1.0" // {
@@ -71330,9 +70917,9 @@ in
       sources."cssnano-util-get-match-4.0.0"
       sources."cssnano-util-raw-cache-4.0.1"
       sources."cssnano-util-same-parent-4.0.1"
-      (sources."csso-4.1.0" // {
+      (sources."csso-4.1.1" // {
         dependencies = [
-          sources."css-tree-1.0.0"
+          sources."css-tree-1.0.1"
           sources."mdn-data-2.0.12"
           sources."source-map-0.6.1"
         ];
@@ -71341,7 +70928,7 @@ in
       sources."dag-map-1.0.2"
       sources."dashdash-1.14.1"
       sources."dateformat-3.0.3"
-      sources."dayjs-1.9.5"
+      sources."dayjs-1.9.6"
       sources."debug-4.3.0"
       sources."debuglog-1.0.1"
       sources."decache-4.4.0"
@@ -71414,7 +71001,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.589"
+      sources."electron-to-chromium-1.3.596"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -71449,11 +71036,7 @@ in
       sources."error-stack-parser-2.0.6"
       sources."errorhandler-1.5.1"
       sources."es-abstract-1.18.0-next.1"
-      (sources."es-get-iterator-1.1.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
       sources."es6-error-3.2.0"
       sources."escalade-3.1.1"
@@ -72058,7 +71641,7 @@ in
           sources."which-2.0.2"
         ];
       })
-      sources."node-html-parser-1.4.8"
+      sources."node-html-parser-1.4.9"
       (sources."node-libs-browser-2.2.1" // {
         dependencies = [
           sources."buffer-4.9.2"
@@ -72067,7 +71650,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.65"
+      sources."node-releases-1.1.66"
       sources."nopt-5.0.0"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
@@ -72570,7 +72153,7 @@ in
       sources."require-from-string-2.0.2"
       sources."require-main-filename-2.0.0"
       sources."requires-port-1.0.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-alpn-1.0.0"
       (sources."resolve-cwd-2.0.0" // {
         dependencies = [
@@ -72957,8 +72540,8 @@ in
       sources."verror-1.10.0"
       sources."vlq-1.0.1"
       sources."vm-browserify-1.1.2"
-      sources."watchpack-1.7.4"
-      (sources."watchpack-chokidar2-2.0.0" // {
+      sources."watchpack-1.7.5"
+      (sources."watchpack-chokidar2-2.0.1" // {
         dependencies = [
           sources."anymatch-2.0.0"
           sources."binary-extensions-1.13.1"
@@ -73358,7 +72941,7 @@ in
       sources."repeating-2.0.1"
       sources."request-2.88.2"
       sources."request-progress-2.0.1"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."restore-cursor-1.0.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -73441,15 +73024,13 @@ in
           sources."tslib-2.0.3"
         ];
       })
-      sources."@oclif/errors-1.3.3"
+      sources."@oclif/errors-1.3.4"
       sources."@oclif/linewrap-1.0.0"
       sources."@oclif/parser-3.8.5"
       (sources."@oclif/plugin-autocomplete-0.1.5" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."fs-extra-6.0.1"
-          sources."jsonfile-4.0.0"
-          sources."universalify-0.1.2"
         ];
       })
       (sources."@oclif/plugin-help-1.2.11" // {
@@ -73481,7 +73062,6 @@ in
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
       sources."asynckit-0.4.0"
-      sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
@@ -73491,7 +73071,7 @@ in
           sources."define-property-1.0.0"
         ];
       })
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
@@ -73543,10 +73123,8 @@ in
           sources."fs-extra-7.0.1"
           sources."indent-string-3.2.0"
           sources."is-wsl-1.1.0"
-          sources."jsonfile-4.0.0"
           sources."semver-5.7.1"
           sources."strip-ansi-5.2.0"
-          sources."universalify-0.1.2"
         ];
       })
       sources."clone-response-1.0.2"
@@ -73631,7 +73209,7 @@ in
       sources."form-data-2.3.3"
       sources."fragment-cache-0.2.1"
       sources."from2-2.3.0"
-      sources."fs-extra-9.0.1"
+      sources."fs-extra-8.1.0"
       sources."fs.realpath-1.0.0"
       sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
@@ -73734,11 +73312,7 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      (sources."jsonfile-6.1.0" // {
-        dependencies = [
-          sources."universalify-2.0.0"
-        ];
-      })
+      sources."jsonfile-4.0.0"
       sources."jsprim-1.4.1"
       sources."keyv-3.0.0"
       sources."kind-of-6.0.3"
@@ -73931,7 +73505,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."union-value-1.0.1"
-      sources."universalify-1.0.0"
+      sources."universalify-0.1.2"
       (sources."unset-value-1.0.0" // {
         dependencies = [
           (sources."has-value-0.3.1" // {
@@ -73988,7 +73562,7 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      sources."@types/minimist-1.2.0"
+      sources."@types/minimist-1.2.1"
       sources."@types/normalize-package-data-2.4.0"
       sources."aggregate-error-3.1.0"
       sources."ansi-escapes-4.3.1"
@@ -74118,7 +73692,7 @@ in
         ];
       })
       sources."redent-3.0.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."restore-cursor-3.1.0"
       sources."run-async-2.4.1"
       sources."rxjs-6.6.3"
@@ -74886,7 +74460,7 @@ in
       })
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/minimist-1.2.0"
+      sources."@types/minimist-1.2.1"
       sources."@types/normalize-package-data-2.4.0"
       sources."ajv-6.12.6"
       (sources."ansi-align-3.0.0" // {
@@ -74902,7 +74476,7 @@ in
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."arrify-1.0.1"
-      sources."atomically-1.6.0"
+      sources."atomically-1.7.0"
       (sources."boxen-4.2.0" // {
         dependencies = [
           sources."chalk-3.0.0"
@@ -75079,9 +74653,9 @@ in
         ];
       })
       sources."redent-3.0.0"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."responselike-1.0.2"
       sources."restore-cursor-3.1.0"
       sources."run-async-2.4.1"
@@ -75171,7 +74745,7 @@ in
           sources."@graphql-tools/utils-7.0.2"
         ];
       })
-      (sources."@graphql-tools/delegate-7.0.4" // {
+      (sources."@graphql-tools/delegate-7.0.5" // {
         dependencies = [
           sources."@graphql-tools/utils-7.0.2"
         ];
@@ -75216,7 +74790,7 @@ in
       sources."@nodelib/fs.walk-1.2.4"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."@types/parse-json-4.0.0"
       sources."@types/websocket-1.0.1"
       sources."aggregate-error-3.1.0"
@@ -75241,7 +74815,7 @@ in
       sources."aws4-1.11.0"
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
@@ -75316,11 +74890,7 @@ in
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
       sources."es-abstract-1.18.0-next.1"
-      (sources."es-get-iterator-1.1.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
       sources."es5-ext-0.10.53"
       sources."es6-iterator-2.0.3"
@@ -75596,7 +75166,7 @@ in
           sources."es-abstract-1.17.7"
         ];
       })
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."remove-trailing-separator-1.1.0"
       sources."request-2.88.2"
@@ -75704,11 +75274,11 @@ in
       (sources."yargs-16.0.3" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
-          sources."cliui-7.0.3"
+          sources."cliui-7.0.4"
           sources."strip-ansi-6.0.0"
           sources."wrap-ansi-7.0.0"
           sources."y18n-5.0.5"
-          sources."yargs-parser-20.2.3"
+          sources."yargs-parser-20.2.4"
         ];
       })
       sources."yargs-parser-18.1.3"
@@ -75899,7 +75469,7 @@ in
       sources."regex-not-1.0.2"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-dir-1.0.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
@@ -76082,7 +75652,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."systeminformation-4.28.1"
+      sources."systeminformation-4.30.1"
       sources."term-canvas-0.0.5"
       sources."type-fest-0.11.0"
       sources."wordwrap-0.0.3"
@@ -76430,7 +76000,7 @@ in
       sources."replace-homedir-1.0.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-dir-1.0.1"
       sources."resolve-options-1.1.0"
       sources."resolve-url-0.2.1"
@@ -76821,7 +76391,7 @@ in
       sources."replace-homedir-1.0.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-dir-1.0.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
@@ -76959,7 +76529,7 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.6.1"
-      sources."uglify-js-3.11.5"
+      sources."uglify-js-3.11.6"
       sources."upper-case-1.1.3"
     ];
     buildInputs = globalBuildInputs;
@@ -76975,10 +76545,10 @@ in
   htmlhint = nodeEnv.buildNodePackage {
     name = "htmlhint";
     packageName = "htmlhint";
-    version = "0.14.1";
+    version = "0.14.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.14.1.tgz";
-      sha512 = "VWKrljlwF8tEKH48YPfC30zYKhrsMqm70d7vXswivEqd3DSva8ZlIzfeCa3YWFEFRIIhiXKgKurlqEpCtYMCAA==";
+      url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.14.2.tgz";
+      sha512 = "lUCgGVZ/oyCkpgDkIa5IfClwX8Ppy11Dk7XdeVboAGSmKjIuOKx6yy86WS0W08KFtCRuxftzNy+KdQjM4UjqCA==";
     };
     dependencies = [
       sources."ajv-6.12.6"
@@ -76993,7 +76563,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."caseless-0.12.0"
-      sources."chalk-4.0.0"
+      sources."chalk-4.1.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."combined-stream-1.0.8"
@@ -77108,6 +76678,112 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  hsd = nodeEnv.buildNodePackage {
+    name = "hsd";
+    packageName = "hsd";
+    version = "2.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/hsd/-/hsd-2.2.0.tgz";
+      sha512 = "9U6ylEa3WPEb5AHb/TuwYDOJaXmR6mfKky8uJml3Y0xUAvO/yg/b4GfBXnMQ2wPQME5fG5Vkx0OLK7MyidtmAw==";
+    };
+    dependencies = [
+      sources."bcfg-0.1.6"
+      sources."bcrypto-5.3.0"
+      sources."bcurl-0.1.9"
+      sources."bdb-1.3.0"
+      sources."bdns-0.1.5"
+      sources."bevent-0.1.5"
+      sources."bfile-0.2.2"
+      sources."bfilter-1.0.5"
+      sources."bheep-0.1.5"
+      sources."binet-0.3.6"
+      sources."blgr-0.1.8"
+      sources."blru-0.1.6"
+      sources."blst-0.1.5"
+      sources."bmutex-0.1.6"
+      sources."bns-0.13.0"
+      sources."brq-0.1.8"
+      sources."bs32-0.1.6"
+      sources."bsert-0.0.10"
+      sources."bsock-0.1.9"
+      sources."bsocks-0.2.5"
+      sources."btcp-0.1.5"
+      sources."budp-0.1.6"
+      sources."buffer-map-0.0.7"
+      sources."bufio-1.0.7"
+      sources."bupnp-0.2.6"
+      sources."bval-0.1.6"
+      sources."bweb-0.1.10"
+      sources."goosig-0.9.0"
+      sources."hs-client-0.0.9"
+      sources."loady-0.0.5"
+      sources."mrmr-0.1.10"
+      sources."n64-0.2.10"
+      sources."unbound-0.4.3"
+      sources."urkel-0.6.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Cryptocurrency bike-shed";
+      homepage = https://github.com/handshake-org/hsd;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  hs-airdrop = nodeEnv.buildNodePackage {
+    name = "hs-airdrop";
+    packageName = "hs-airdrop";
+    version = "0.9.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/hs-airdrop/-/hs-airdrop-0.9.0.tgz";
+      sha512 = "eqN7mbITsdiBFdRlFHd91Vgudu5rajvIfPhZ8juWLFBZhxhuXzu1POMy4uHK+02jxNjX+upMMRyDxo4xS/ZudQ==";
+    };
+    dependencies = [
+      sources."bcrypto-5.3.0"
+      sources."bfile-0.2.2"
+      sources."brq-0.1.8"
+      sources."bsert-0.0.10"
+      sources."bufio-1.0.7"
+      sources."goosig-0.9.0"
+      sources."loady-0.0.5"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Handshake airdrop redemption";
+      homepage = https://github.com/handshake-org/hs-airdrop;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  hs-client = nodeEnv.buildNodePackage {
+    name = "hs-client";
+    packageName = "hs-client";
+    version = "0.0.9";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/hs-client/-/hs-client-0.0.9.tgz";
+      sha512 = "TAsexmpPhSVdCQ1iiX4bBnuqlThTSdGz/YKq+vjLSS1TZ2TwKxERJ8vZh1Wd6GGaMGLZl99uQR+2wUyk4HLSbg==";
+    };
+    dependencies = [
+      sources."bcfg-0.1.6"
+      sources."bcurl-0.1.9"
+      sources."brq-0.1.8"
+      sources."bsert-0.0.10"
+      sources."bsock-0.1.9"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "HSD node and wallet client";
+      homepage = https://github.com/handshake-org/hs-client;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   hueadm = nodeEnv.buildNodePackage {
     name = "hueadm";
     packageName = "hueadm";
@@ -77829,7 +77505,7 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-3.0.3"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."xregexp-2.0.0"
       sources."yallist-3.1.1"
     ];
@@ -77854,9 +77530,9 @@ in
     };
     dependencies = [
       sources."@iarna/toml-2.2.5"
-      sources."@ot-builder/bin-composite-types-0.10.31"
-      sources."@ot-builder/bin-util-0.10.31"
-      (sources."@ot-builder/cli-help-shower-0.10.31" // {
+      sources."@ot-builder/bin-composite-types-0.10.33"
+      sources."@ot-builder/bin-util-0.10.33"
+      (sources."@ot-builder/cli-help-shower-0.10.33" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
@@ -77866,7 +77542,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      (sources."@ot-builder/cli-proc-0.10.31" // {
+      (sources."@ot-builder/cli-proc-0.10.33" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
@@ -77876,7 +77552,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      (sources."@ot-builder/cli-shared-0.10.31" // {
+      (sources."@ot-builder/cli-shared-0.10.33" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
@@ -77886,35 +77562,35 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."@ot-builder/common-impl-0.10.31"
-      sources."@ot-builder/errors-0.10.31"
-      sources."@ot-builder/io-bin-cff-0.10.31"
-      sources."@ot-builder/io-bin-encoding-0.10.31"
-      sources."@ot-builder/io-bin-ext-private-0.10.31"
-      sources."@ot-builder/io-bin-font-0.10.31"
-      sources."@ot-builder/io-bin-glyph-store-0.10.31"
-      sources."@ot-builder/io-bin-layout-0.10.31"
-      sources."@ot-builder/io-bin-metadata-0.10.31"
-      sources."@ot-builder/io-bin-metric-0.10.31"
-      sources."@ot-builder/io-bin-name-0.10.31"
-      sources."@ot-builder/io-bin-sfnt-0.10.31"
-      sources."@ot-builder/io-bin-ttf-0.10.31"
-      sources."@ot-builder/ot-0.10.31"
-      sources."@ot-builder/ot-encoding-0.10.31"
-      sources."@ot-builder/ot-ext-private-0.10.31"
-      sources."@ot-builder/ot-glyphs-0.10.31"
-      sources."@ot-builder/ot-layout-0.10.31"
-      sources."@ot-builder/ot-metadata-0.10.31"
-      sources."@ot-builder/ot-name-0.10.31"
-      sources."@ot-builder/ot-sfnt-0.10.31"
-      sources."@ot-builder/ot-standard-glyph-namer-0.10.31"
-      sources."@ot-builder/prelude-0.10.31"
-      sources."@ot-builder/primitive-0.10.31"
-      sources."@ot-builder/rectify-0.10.31"
-      sources."@ot-builder/stat-glyphs-0.10.31"
-      sources."@ot-builder/trace-0.10.31"
-      sources."@ot-builder/var-store-0.10.31"
-      sources."@ot-builder/variance-0.10.31"
+      sources."@ot-builder/common-impl-0.10.33"
+      sources."@ot-builder/errors-0.10.33"
+      sources."@ot-builder/io-bin-cff-0.10.33"
+      sources."@ot-builder/io-bin-encoding-0.10.33"
+      sources."@ot-builder/io-bin-ext-private-0.10.33"
+      sources."@ot-builder/io-bin-font-0.10.33"
+      sources."@ot-builder/io-bin-glyph-store-0.10.33"
+      sources."@ot-builder/io-bin-layout-0.10.33"
+      sources."@ot-builder/io-bin-metadata-0.10.33"
+      sources."@ot-builder/io-bin-metric-0.10.33"
+      sources."@ot-builder/io-bin-name-0.10.33"
+      sources."@ot-builder/io-bin-sfnt-0.10.33"
+      sources."@ot-builder/io-bin-ttf-0.10.33"
+      sources."@ot-builder/ot-0.10.33"
+      sources."@ot-builder/ot-encoding-0.10.33"
+      sources."@ot-builder/ot-ext-private-0.10.33"
+      sources."@ot-builder/ot-glyphs-0.10.33"
+      sources."@ot-builder/ot-layout-0.10.33"
+      sources."@ot-builder/ot-metadata-0.10.33"
+      sources."@ot-builder/ot-name-0.10.33"
+      sources."@ot-builder/ot-sfnt-0.10.33"
+      sources."@ot-builder/ot-standard-glyph-namer-0.10.33"
+      sources."@ot-builder/prelude-0.10.33"
+      sources."@ot-builder/primitive-0.10.33"
+      sources."@ot-builder/rectify-0.10.33"
+      sources."@ot-builder/stat-glyphs-0.10.33"
+      sources."@ot-builder/trace-0.10.33"
+      sources."@ot-builder/var-store-0.10.33"
+      sources."@ot-builder/variance-0.10.33"
       sources."@unicode/unicode-13.0.0-1.0.2"
       sources."abbrev-1.1.1"
       sources."ajv-6.12.6"
@@ -78085,8 +77761,8 @@ in
       sources."os-locale-1.4.0"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
-      sources."ot-builder-0.10.31"
-      (sources."otb-ttc-bundle-0.10.31" // {
+      sources."ot-builder-0.10.33"
+      (sources."otb-ttc-bundle-0.10.33" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
@@ -78107,7 +77783,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."path-type-1.1.0"
-      sources."patrisika-0.22.0"
+      sources."patrisika-0.22.2"
       sources."patrisika-scopes-0.11.1"
       sources."pegjs-0.10.0"
       sources."performance-now-2.1.0"
@@ -78125,7 +77801,7 @@ in
       sources."request-2.88.2"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-url-0.2.1"
       sources."restore-cursor-3.1.0"
       sources."resumer-0.0.0"
@@ -78358,14 +78034,53 @@ in
   joplin = nodeEnv.buildNodePackage {
     name = "joplin";
     packageName = "joplin";
-    version = "1.3.3";
+    version = "1.4.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/joplin/-/joplin-1.3.3.tgz";
-      sha512 = "6QhCBf0amMaVX6u90Uy84hEdHLPthTrQIbgUBFccFpBC1bowdj85C3tSYEfrSCf72OtjwwT26OaHuRJgzCmb8A==";
+      url = "https://registry.npmjs.org/joplin/-/joplin-1.4.3.tgz";
+      sha512 = "29r23EaeUT0HupQVr5xNN1WuUpT+vn9agxrjbSwVJCYhV++kpkf2zvmuFe7fcTI3oAVu5yXLiK388DlJ7vaFPQ==";
     };
     dependencies = [
+      sources."@babel/code-frame-7.10.4"
+      (sources."@babel/generator-7.12.5" // {
+        dependencies = [
+          sources."source-map-0.5.7"
+        ];
+      })
+      sources."@babel/helper-function-name-7.10.4"
+      sources."@babel/helper-get-function-arity-7.10.4"
+      sources."@babel/helper-split-export-declaration-7.11.0"
+      sources."@babel/helper-validator-identifier-7.10.4"
+      (sources."@babel/highlight-7.10.4" // {
+        dependencies = [
+          sources."chalk-2.4.2"
+        ];
+      })
+      sources."@babel/parser-7.12.5"
+      sources."@babel/template-7.10.4"
+      (sources."@babel/traverse-7.12.5" // {
+        dependencies = [
+          sources."debug-4.3.0"
+        ];
+      })
+      sources."@babel/types-7.12.6"
+      sources."@braintree/sanitize-url-3.1.0"
       sources."@cronvel/get-pixels-3.4.0"
-      sources."@yarnpkg/lockfile-1.1.0"
+      sources."@joplinapp/fork-htmlparser2-4.1.8"
+      sources."@joplinapp/fork-sax-1.2.12"
+      sources."@joplinapp/lib-1.0.9"
+      (sources."@joplinapp/renderer-1.0.17" // {
+        dependencies = [
+          sources."fs-extra-8.1.0"
+          sources."jsonfile-4.0.0"
+          sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support"
+        ];
+      })
+      (sources."@shiftkey/node-abi-2.19.2-pre" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
+      sources."@shiftkey/prebuild-install-6.0.1-pre2"
       sources."abab-2.0.5"
       sources."abbrev-1.1.1"
       sources."acorn-7.4.1"
@@ -78383,102 +78098,72 @@ in
       })
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
-      sources."app-module-path-2.2.0"
+      sources."anymatch-3.1.1"
       sources."aproba-1.2.0"
-      (sources."are-we-there-yet-1.1.5" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."are-we-there-yet-1.1.5"
       (sources."argparse-1.0.10" // {
         dependencies = [
           sources."sprintf-js-1.0.3"
         ];
       })
-      sources."arr-diff-4.0.0"
-      sources."arr-flatten-1.1.0"
-      sources."arr-union-3.1.0"
       sources."array-back-2.0.0"
       sources."array-equal-1.0.0"
-      sources."array-unique-0.3.2"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
-      sources."assign-symbols-1.0.0"
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.786.0" // {
+      (sources."aws-sdk-2.792.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
           sources."xml2js-0.4.19"
+          sources."xmlbuilder-9.0.7"
         ];
       })
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
+      sources."babel-eslint-10.1.0"
       sources."balanced-match-1.0.0"
-      (sources."base-0.11.2" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-        ];
-      })
       sources."base-64-0.1.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."base64-stream-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
+      sources."binary-extensions-2.1.0"
       (sources."bl-4.0.3" // {
         dependencies = [
           sources."buffer-5.7.1"
+          sources."readable-stream-3.6.0"
         ];
       })
       sources."brace-expansion-1.1.11"
-      (sources."braces-2.3.2" // {
-        dependencies = [
-          sources."extend-shallow-2.0.1"
-        ];
-      })
+      sources."braces-3.0.2"
       sources."browser-process-hrtime-1.0.0"
       sources."buffer-4.9.2"
+      sources."buffer-from-1.1.1"
       sources."builtin-modules-3.1.0"
-      sources."cache-base-1.0.1"
       sources."camel-case-3.0.0"
       sources."camelcase-4.1.0"
       sources."caseless-0.12.0"
-      sources."chalk-2.4.2"
+      (sources."chalk-4.1.0" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.2.0"
+        ];
+      })
       sources."charenc-0.0.2"
+      sources."chokidar-3.4.3"
       sources."chownr-1.1.4"
       sources."chroma-js-2.1.0"
-      sources."ci-info-2.0.0"
-      (sources."class-utils-0.3.6" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          (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."kind-of-5.1.0"
-        ];
-      })
       sources."clean-css-4.2.3"
-      (sources."clean-html-1.5.0" // {
-        dependencies = [
-          sources."htmlparser2-3.10.1"
-        ];
-      })
+      sources."clean-html-1.5.0"
       sources."cliss-0.0.2"
       sources."code-point-at-1.1.0"
-      sources."collection-visit-1.0.0"
-      sources."color-3.1.3"
+      sources."color-3.1.2"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."color-string-1.5.4"
@@ -78486,23 +78171,14 @@ in
       sources."command-line-usage-4.1.0"
       sources."commander-2.17.1"
       sources."compare-version-0.1.2"
-      sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
-      sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
-      (sources."cross-env-6.0.3" // {
-        dependencies = [
-          sources."cross-spawn-7.0.3"
-          sources."path-key-3.1.1"
-          sources."shebang-command-2.0.0"
-          sources."shebang-regex-3.0.0"
-          sources."which-2.0.2"
-        ];
-      })
-      sources."cross-spawn-6.0.5"
+      sources."cross-env-6.0.3"
+      sources."cross-spawn-7.0.3"
       sources."crypt-0.0.2"
       sources."css-2.2.4"
+      sources."css-b64-images-0.2.5"
       sources."cssom-0.4.4"
       (sources."cssstyle-2.3.0" // {
         dependencies = [
@@ -78510,31 +78186,59 @@ in
         ];
       })
       sources."cwise-compiler-1.1.3"
+      sources."d3-5.16.0"
+      sources."d3-array-1.2.4"
+      sources."d3-axis-1.0.12"
+      sources."d3-brush-1.1.6"
+      sources."d3-chord-1.0.6"
+      sources."d3-collection-1.0.7"
+      sources."d3-color-1.4.1"
+      sources."d3-contour-1.3.2"
+      sources."d3-dispatch-1.0.6"
+      sources."d3-drag-1.2.5"
+      sources."d3-dsv-1.2.0"
+      sources."d3-ease-1.0.7"
+      sources."d3-fetch-1.2.0"
+      sources."d3-force-1.2.1"
+      sources."d3-format-1.4.5"
+      sources."d3-geo-1.12.1"
+      sources."d3-hierarchy-1.1.9"
+      sources."d3-interpolate-1.4.0"
+      sources."d3-path-1.0.9"
+      sources."d3-polygon-1.0.6"
+      sources."d3-quadtree-1.0.7"
+      sources."d3-random-1.1.2"
+      sources."d3-scale-2.2.2"
+      sources."d3-scale-chromatic-1.5.0"
+      sources."d3-selection-1.4.2"
+      sources."d3-shape-1.3.7"
+      sources."d3-time-1.1.0"
+      sources."d3-time-format-2.3.0"
+      sources."d3-timer-1.0.10"
+      sources."d3-transition-1.3.2"
+      sources."d3-voronoi-1.1.4"
+      sources."d3-zoom-1.8.3"
+      sources."dagre-0.8.5"
+      sources."dagre-d3-0.6.4"
       sources."dashdash-1.14.1"
       sources."data-urls-1.1.0"
-      sources."debug-2.6.9"
+      sources."debug-3.2.6"
       sources."decode-uri-component-0.2.0"
       sources."decompress-response-4.2.1"
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."deepmerge-2.2.1"
-      sources."define-property-2.0.2"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
       sources."detect-libc-1.0.3"
       sources."diacritics-1.3.0"
       sources."diff-match-patch-1.0.5"
-      (sources."dom-serializer-0.2.2" // {
-        dependencies = [
-          sources."domelementtype-2.0.2"
-          sources."entities-2.1.0"
-        ];
-      })
-      sources."domelementtype-1.3.1"
+      sources."dom-serializer-1.1.0"
+      sources."domelementtype-2.0.2"
       sources."domexception-1.0.1"
-      sources."domhandler-2.4.2"
-      sources."domutils-1.7.0"
+      sources."domhandler-3.3.0"
+      sources."domutils-2.4.2"
       sources."ecc-jsbn-0.1.2"
       (sources."emphasize-1.5.0" // {
         dependencies = [
@@ -78551,45 +78255,18 @@ in
         ];
       })
       sources."end-of-stream-1.4.4"
-      sources."entities-1.1.2"
+      sources."entities-2.1.0"
+      sources."entity-decode-2.0.2"
       sources."es6-promise-pool-2.5.0"
       sources."escape-string-regexp-1.0.5"
       sources."escodegen-1.14.3"
+      sources."eslint-visitor-keys-1.3.0"
       sources."esprima-4.0.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."events-1.1.1"
-      (sources."expand-brackets-2.1.4" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          sources."extend-shallow-2.0.1"
-          (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."kind-of-5.1.0"
-        ];
-      })
       sources."expand-template-2.0.3"
       sources."extend-3.0.2"
-      (sources."extend-shallow-3.0.2" // {
-        dependencies = [
-          sources."is-extendable-1.0.1"
-        ];
-      })
-      (sources."extglob-2.0.4" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-          sources."extend-shallow-2.0.1"
-        ];
-      })
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
@@ -78597,30 +78274,25 @@ in
       sources."fault-1.0.4"
       sources."file-type-10.11.0"
       sources."file-uri-to-path-1.0.0"
-      (sources."fill-range-4.0.0" // {
-        dependencies = [
-          sources."extend-shallow-2.0.1"
-        ];
-      })
+      sources."fill-range-7.0.1"
       sources."find-up-2.1.0"
-      (sources."find-yarn-workspace-root-1.2.1" // {
-        dependencies = [
-          sources."fs-extra-4.0.3"
-        ];
-      })
       sources."follow-redirects-1.13.0"
       sources."font-awesome-filetypes-2.1.0"
       sources."for-each-property-0.0.4"
       sources."for-each-property-deep-0.0.3"
-      sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.5.1"
       sources."format-0.2.2"
-      sources."fragment-cache-0.2.1"
       sources."fs-constants-1.0.0"
-      sources."fs-extra-5.0.0"
-      sources."fs-minipass-2.1.0"
+      (sources."fs-extra-5.0.0" // {
+        dependencies = [
+          sources."jsonfile-4.0.0"
+        ];
+      })
+      sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
+      sources."fsevents-2.1.3"
+      sources."function-bind-1.1.1"
       (sources."gauge-2.7.4" // {
         dependencies = [
           sources."strip-ansi-3.0.1"
@@ -78628,34 +78300,38 @@ in
       })
       sources."get-prototype-chain-1.0.1"
       sources."get-stdin-5.0.1"
-      sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."github-from-package-0.0.0"
       sources."glob-7.1.6"
+      sources."glob-parent-5.1.1"
+      sources."globals-11.12.0"
       sources."graceful-fs-4.2.4"
+      sources."graphlib-2.1.8"
+      sources."growly-1.3.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
+      sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
-      sources."has-value-1.0.0"
-      (sources."has-values-1.0.0" // {
-        dependencies = [
-          sources."kind-of-4.0.0"
-        ];
-      })
       sources."he-1.2.0"
-      sources."highlight.js-10.1.1"
+      sources."highlight.js-10.3.2"
       sources."html-encoding-sniffer-1.0.2"
       sources."html-entities-1.3.1"
       sources."html-minifier-3.5.21"
-      (sources."htmlparser2-4.1.0" // {
+      (sources."htmlparser2-3.10.1" // {
         dependencies = [
-          sources."dom-serializer-1.1.0"
-          sources."domelementtype-2.0.2"
-          sources."domhandler-3.3.0"
-          sources."domutils-2.4.2"
-          sources."entities-2.1.0"
+          (sources."dom-serializer-0.2.2" // {
+            dependencies = [
+              sources."domelementtype-2.0.2"
+              sources."entities-2.1.0"
+            ];
+          })
+          sources."domelementtype-1.3.1"
+          sources."domhandler-2.4.2"
+          sources."domutils-1.7.0"
+          sources."entities-1.1.2"
+          sources."readable-stream-3.6.0"
         ];
       })
       sources."http-errors-1.8.0"
@@ -78666,7 +78342,6 @@ in
       (sources."image-data-uri-2.0.1" // {
         dependencies = [
           sources."fs-extra-0.26.7"
-          sources."jsonfile-2.4.0"
         ];
       })
       sources."image-type-3.1.0"
@@ -78703,21 +78378,15 @@ in
       sources."iota-array-1.0.0"
       sources."ip-regex-2.1.0"
       sources."is-absolute-0.2.6"
-      sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.3.2"
+      sources."is-binary-path-2.1.0"
       sources."is-buffer-1.1.6"
-      sources."is-ci-2.0.0"
-      sources."is-data-descriptor-1.0.0"
-      sources."is-descriptor-1.0.2"
+      sources."is-core-module-2.1.0"
       sources."is-docker-2.1.1"
-      sources."is-extendable-0.1.1"
+      sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-1.0.0"
-      (sources."is-number-3.0.0" // {
-        dependencies = [
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."is-plain-object-2.0.4"
+      sources."is-glob-4.0.1"
+      sources."is-number-7.0.0"
       sources."is-relative-0.2.1"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
@@ -78731,7 +78400,7 @@ in
       })
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."isobject-3.0.1"
+      sources."isobject-2.1.0"
       sources."isstream-0.1.2"
       sources."jmespath-0.15.0"
       sources."joplin-turndown-4.0.30"
@@ -78739,22 +78408,25 @@ in
       sources."jpeg-js-0.4.2"
       sources."js-tokens-4.0.0"
       sources."jsbn-0.1.1"
-      sources."jsdom-15.2.1"
+      (sources."jsdom-15.2.1" // {
+        dependencies = [
+          sources."tough-cookie-3.0.1"
+        ];
+      })
+      sources."jsesc-2.5.2"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-4.0.0"
+      sources."jsonfile-2.4.0"
       sources."jsprim-1.4.1"
-      sources."jssha-2.4.2"
       (sources."katex-0.12.0" // {
         dependencies = [
           sources."commander-2.20.3"
         ];
       })
-      sources."keytar-5.6.0"
-      sources."kind-of-6.0.3"
+      sources."keytar-7.1.0"
+      sources."khroma-1.1.0"
       sources."klaw-1.3.1"
-      sources."klaw-sync-6.0.0"
       sources."lazyness-1.2.0"
       sources."levenshtein-1.0.5"
       sources."levn-0.3.0"
@@ -78774,8 +78446,6 @@ in
         ];
       })
       sources."magicli-0.0.8"
-      sources."map-cache-0.2.2"
-      sources."map-visit-1.0.0"
       (sources."markdown-it-10.0.0" // {
         dependencies = [
           sources."entities-2.0.3"
@@ -78802,52 +78472,60 @@ in
       sources."md5-2.3.0"
       sources."md5-file-4.0.0"
       sources."mdurl-1.0.1"
-      sources."micromatch-3.1.10"
-      sources."mime-2.4.6"
+      sources."mermaid-8.8.3"
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
       sources."mimic-response-2.1.0"
-      sources."minimatch-3.0.4"
-      sources."minimist-1.2.5"
-      sources."minipass-3.1.3"
-      sources."minizlib-2.1.2"
-      (sources."mixin-deep-1.3.2" // {
+      (sources."minify-4.1.3" // {
         dependencies = [
-          sources."is-extendable-1.0.1"
+          sources."commander-2.20.3"
+          sources."debug-4.3.0"
+          sources."html-minifier-4.0.0"
+          sources."uglify-js-3.11.6"
         ];
       })
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.5"
+      sources."minipass-2.9.0"
+      sources."minizlib-1.3.3"
       sources."mkdirp-0.5.5"
       sources."mkdirp-classic-0.5.3"
       sources."moment-2.29.1"
-      sources."ms-2.0.0"
+      sources."moment-mini-2.24.0"
+      sources."ms-2.1.2"
       sources."multiparty-4.2.2"
-      sources."nan-2.14.1"
+      sources."mustache-4.0.1"
+      sources."nan-2.14.2"
       sources."nanoid-3.1.16"
-      (sources."nanomatch-1.2.13" // {
-        dependencies = [
-          sources."is-windows-1.0.2"
-        ];
-      })
       sources."napi-build-utils-1.0.2"
       sources."ndarray-1.0.19"
       sources."ndarray-pack-1.2.1"
-      (sources."needle-2.5.2" // {
+      sources."needle-2.5.2"
+      sources."nextgen-events-1.3.3"
+      sources."no-case-2.3.2"
+      (sources."node-abi-2.19.1" // {
         dependencies = [
-          sources."debug-3.2.6"
-          sources."ms-2.1.2"
+          sources."semver-5.7.1"
         ];
       })
-      sources."nextgen-events-1.3.3"
-      sources."nice-try-1.0.5"
-      sources."no-case-2.3.2"
-      sources."node-abi-2.19.1"
+      sources."node-addon-api-3.0.2"
       sources."node-bitmap-0.0.1"
       sources."node-emoji-1.10.0"
       sources."node-fetch-1.7.3"
+      (sources."node-notifier-8.0.0" // {
+        dependencies = [
+          sources."uuid-8.3.1"
+        ];
+      })
       sources."node-persist-2.1.0"
-      sources."node-pre-gyp-0.11.0"
+      (sources."node-pre-gyp-0.11.0" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
       sources."noop-logger-0.1.1"
       sources."nopt-4.0.3"
+      sources."normalize-path-3.0.0"
       sources."npm-bundled-1.1.1"
       sources."npm-normalize-package-bin-1.0.1"
       sources."npm-packlist-1.4.8"
@@ -78856,27 +78534,12 @@ in
       sources."nwsapi-2.2.0"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
-      (sources."object-copy-0.1.0" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          sources."is-accessor-descriptor-0.1.6"
-          sources."is-data-descriptor-0.1.4"
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
-          sources."kind-of-3.2.2"
-        ];
-      })
       (sources."object-to-arguments-0.0.8" // {
         dependencies = [
           sources."inspect-parameters-declaration-0.0.10"
           sources."magicli-0.0.5"
         ];
       })
-      sources."object-visit-1.0.1"
-      sources."object.pick-1.3.0"
       sources."omggif-1.0.10"
       sources."once-1.4.0"
       sources."open-7.3.0"
@@ -78889,29 +78552,24 @@ in
       sources."p-try-1.0.0"
       sources."param-case-2.1.1"
       sources."parse5-5.1.0"
-      sources."pascalcase-0.1.1"
-      (sources."patch-package-6.2.2" // {
-        dependencies = [
-          sources."fs-extra-7.0.1"
-        ];
-      })
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-key-2.0.1"
+      sources."path-key-3.1.1"
+      sources."path-parse-1.0.6"
       sources."performance-now-2.1.0"
+      sources."picomatch-2.2.2"
       sources."pify-3.0.0"
       sources."pipe-functions-1.3.0"
       sources."pn-1.1.0"
       sources."pngjs-5.0.0"
-      sources."posix-character-classes-0.1.1"
-      sources."prebuild-install-5.3.3"
+      sources."prebuild-install-5.3.6"
       sources."prelude-ls-1.1.2"
       sources."process-nextick-args-2.0.1"
       sources."promise-7.3.1"
       sources."proper-lockfile-2.0.1"
       sources."psl-1.8.0"
       sources."pump-3.0.0"
-      sources."punycode-1.3.2"
+      sources."punycode-2.1.1"
       sources."q-1.1.2"
       sources."qs-6.5.2"
       sources."query-string-4.3.4"
@@ -78921,144 +78579,83 @@ in
       sources."rc-1.2.8"
       sources."re-reselect-4.0.0"
       sources."read-chunk-2.1.0"
-      sources."readable-stream-3.6.0"
-      sources."reduce-flatten-1.0.1"
-      sources."redux-3.7.2"
-      sources."regex-not-1.0.2"
-      sources."relateurl-0.2.7"
-      (sources."relative-3.0.2" // {
+      (sources."readable-stream-2.3.7" // {
         dependencies = [
-          sources."isobject-2.1.0"
+          sources."safe-buffer-5.1.2"
         ];
       })
-      sources."repeat-element-1.1.3"
-      sources."repeat-string-1.6.1"
+      sources."readdirp-3.5.0"
+      sources."reduce-flatten-1.0.1"
+      sources."redux-3.7.2"
+      sources."relateurl-0.2.7"
+      sources."relative-3.0.2"
       (sources."request-2.88.2" // {
         dependencies = [
           sources."form-data-2.3.3"
-          sources."punycode-2.1.1"
-          sources."tough-cookie-2.5.0"
         ];
       })
       sources."request-promise-core-1.1.4"
-      (sources."request-promise-native-1.0.9" // {
-        dependencies = [
-          sources."punycode-2.1.1"
-          sources."tough-cookie-2.5.0"
-        ];
-      })
+      sources."request-promise-native-1.0.9"
       sources."requires-port-1.0.0"
       sources."reselect-4.0.0"
+      sources."resolve-1.19.0"
       sources."resolve-url-0.2.1"
-      sources."ret-0.1.15"
       sources."retry-0.10.1"
       sources."rimraf-2.7.1"
+      sources."rw-1.3.3"
       sources."safe-buffer-5.2.1"
-      sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."saxes-3.1.11"
-      sources."semver-5.7.1"
+      sources."semver-7.3.2"
       sources."server-destroy-1.0.1"
       sources."set-blocking-2.0.0"
-      (sources."set-value-2.0.1" // {
-        dependencies = [
-          sources."extend-shallow-2.0.1"
-        ];
-      })
       sources."setimmediate-1.0.5"
       sources."setprototypeof-1.2.0"
       sources."seventh-0.7.36"
-      (sources."sharp-0.23.4" // {
+      (sources."sharp-0.26.2" // {
         dependencies = [
-          sources."semver-6.3.0"
-          sources."tar-5.0.5"
+          sources."decompress-response-6.0.0"
+          sources."mimic-response-3.1.0"
+          sources."simple-get-4.0.0"
         ];
       })
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
+      sources."shebang-command-2.0.0"
+      sources."shebang-regex-3.0.0"
+      sources."shellwords-0.1.1"
       sources."signal-exit-3.0.3"
       sources."simple-concat-1.0.1"
       sources."simple-get-3.1.0"
       sources."simple-swizzle-0.2.2"
-      sources."slash-2.0.0"
       (sources."slice-ansi-1.0.0" // {
         dependencies = [
           sources."is-fullwidth-code-point-2.0.0"
         ];
       })
-      (sources."snapdragon-0.8.2" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          sources."extend-shallow-2.0.1"
-          (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."kind-of-5.1.0"
-          sources."source-map-0.5.7"
-        ];
-      })
-      (sources."snapdragon-node-2.1.1" // {
-        dependencies = [
-          sources."define-property-1.0.0"
-        ];
-      })
-      (sources."snapdragon-util-3.0.1" // {
-        dependencies = [
-          sources."kind-of-3.2.2"
-        ];
-      })
       sources."source-map-0.6.1"
       sources."source-map-resolve-0.5.3"
+      sources."source-map-support-0.5.19"
       sources."source-map-url-0.4.0"
       sources."split-skip-0.0.2"
-      sources."split-string-3.1.0"
       sources."sprintf-js-1.1.2"
       sources."sqlite3-4.2.0"
       sources."sshpk-1.16.1"
-      (sources."static-extend-0.1.2" // {
-        dependencies = [
-          sources."define-property-0.2.5"
-          (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."kind-of-5.1.0"
-        ];
-      })
       sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."strict-uri-encode-1.1.0"
       sources."string-kit-0.11.8"
       sources."string-padding-1.0.2"
-      (sources."string-to-stream-1.1.1" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."string-to-stream-1.1.1"
       (sources."string-width-1.0.2" // {
         dependencies = [
           sources."strip-ansi-3.0.1"
         ];
       })
-      sources."string_decoder-1.3.0"
+      (sources."string_decoder-1.1.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       (sources."stringify-parameters-0.0.4" // {
         dependencies = [
           sources."magicli-0.0.5"
@@ -79070,21 +78667,19 @@ in
         ];
       })
       sources."strip-json-comments-2.0.1"
+      sources."stylis-3.5.4"
       sources."supports-color-5.5.0"
       sources."symbol-observable-1.2.0"
       sources."symbol-tree-3.2.4"
       sources."syswide-cas-5.3.0"
       sources."table-layout-0.4.5"
-      (sources."tar-4.4.13" // {
+      sources."tar-4.4.13"
+      sources."tar-fs-2.1.1"
+      (sources."tar-stream-2.1.4" // {
         dependencies = [
-          sources."fs-minipass-1.2.7"
-          sources."minipass-2.9.0"
-          sources."minizlib-1.3.3"
-          sources."yallist-3.1.1"
+          sources."readable-stream-3.6.0"
         ];
       })
-      sources."tar-fs-2.1.0"
-      sources."tar-stream-2.1.4"
       (sources."tcp-port-used-0.1.2" // {
         dependencies = [
           sources."debug-0.7.4"
@@ -79092,33 +78687,27 @@ in
         ];
       })
       sources."terminal-kit-1.44.0"
+      (sources."terser-4.8.0" // {
+        dependencies = [
+          sources."commander-2.20.3"
+        ];
+      })
       (sources."tkwidgets-0.5.26" // {
         dependencies = [
+          sources."chalk-2.4.2"
           sources."is-fullwidth-code-point-2.0.0"
           sources."node-emoji-git+https://github.com/laurent22/node-emoji.git"
           sources."string-width-2.1.1"
         ];
       })
-      sources."tmp-0.0.33"
-      (sources."to-object-path-0.3.0" // {
-        dependencies = [
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."to-regex-3.0.2"
-      sources."to-regex-range-2.1.1"
+      sources."to-fast-properties-2.0.0"
+      sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
-      (sources."tough-cookie-3.0.1" // {
-        dependencies = [
-          sources."punycode-2.1.1"
-        ];
-      })
-      (sources."tr46-1.0.1" // {
-        dependencies = [
-          sources."punycode-2.1.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
+      sources."tr46-1.0.1"
       sources."tree-kit-0.6.2"
+      sources."try-catch-2.0.1"
+      sources."try-to-catch-1.1.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
@@ -79129,33 +78718,22 @@ in
           sources."commander-2.19.0"
         ];
       })
+      sources."uglifycss-0.0.29"
       sources."uid-safe-2.1.5"
       sources."unc-path-regex-0.1.2"
-      sources."union-value-1.0.1"
       sources."uniq-1.0.1"
       sources."universalify-0.1.2"
       sources."unorm-1.6.0"
       sources."unpack-string-0.0.2"
-      (sources."unset-value-1.0.0" // {
-        dependencies = [
-          (sources."has-value-0.3.1" // {
-            dependencies = [
-              sources."isobject-2.1.0"
-            ];
-          })
-          sources."has-values-0.1.4"
-        ];
-      })
       sources."upper-case-1.1.3"
-      (sources."uri-js-4.4.0" // {
+      sources."uri-js-4.4.0"
+      sources."urix-0.1.0"
+      (sources."url-0.10.3" // {
         dependencies = [
-          sources."punycode-2.1.1"
+          sources."punycode-1.3.2"
         ];
       })
-      sources."urix-0.1.0"
-      sources."url-0.10.3"
       sources."url-parse-1.4.7"
-      sources."use-3.1.1"
       sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
@@ -79167,7 +78745,7 @@ in
       sources."whatwg-encoding-1.0.5"
       sources."whatwg-mimetype-2.3.0"
       sources."whatwg-url-7.1.0"
-      sources."which-1.3.1"
+      sources."which-2.0.2"
       sources."which-pm-runs-1.0.0"
       sources."wide-align-1.1.3"
       sources."word-wrap-1.2.3"
@@ -79179,16 +78757,12 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."xml-name-validator-3.0.0"
-      (sources."xml2js-0.4.23" // {
-        dependencies = [
-          sources."xmlbuilder-11.0.1"
-        ];
-      })
-      sources."xmlbuilder-9.0.7"
+      sources."xml2js-0.4.23"
+      sources."xmlbuilder-11.0.1"
       sources."xmlchars-2.2.0"
-      sources."yallist-4.0.0"
+      sources."yallist-3.1.1"
       sources."yargs-parser-7.0.0"
     ];
     buildInputs = globalBuildInputs;
@@ -79465,10 +79039,10 @@ in
   json-server = nodeEnv.buildNodePackage {
     name = "json-server";
     packageName = "json-server";
-    version = "0.16.2";
+    version = "0.16.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-server/-/json-server-0.16.2.tgz";
-      sha512 = "USmSODvmBvt9Z7M3e4AHGHzLBcFlNkQMVOOqtB/h/k79JQI4saPcWniYvD5zf0kE3oGNR9VJzcHKzT8fZ9kEtw==";
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.16.3.tgz";
+      sha512 = "tbsBONiefH7SR5EhSmK4EzwP3kCHuOduUq5hWAQjCwXTva4OBeKVcPrciHNWOK/+12ygtUnjuWcAxuHgqTuBLA==";
     };
     dependencies = [
       sources."@sindresorhus/is-0.14.0"
@@ -79484,7 +79058,11 @@ in
       sources."array-flatten-1.1.1"
       sources."basic-auth-2.0.1"
       sources."body-parser-1.19.0"
-      sources."boxen-4.2.0"
+      (sources."boxen-4.2.0" // {
+        dependencies = [
+          sources."chalk-3.0.0"
+        ];
+      })
       sources."bytes-3.1.0"
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
@@ -79493,10 +79071,10 @@ in
         ];
       })
       sources."camelcase-5.3.1"
-      sources."chalk-3.0.0"
+      sources."chalk-4.1.0"
       sources."ci-info-2.0.0"
       sources."cli-boxes-2.2.1"
-      (sources."cliui-6.0.0" // {
+      (sources."cliui-7.0.4" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."strip-ansi-6.0.0"
@@ -79520,7 +79098,6 @@ in
       sources."cors-2.8.5"
       sources."crypto-random-string-2.0.0"
       sources."debug-2.6.9"
-      sources."decamelize-1.2.0"
       sources."decompress-response-3.3.0"
       sources."deep-extend-0.6.0"
       sources."defer-to-connect-1.1.3"
@@ -79533,6 +79110,7 @@ in
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."errorhandler-1.5.1"
+      sources."escalade-3.1.1"
       sources."escape-goat-2.1.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
@@ -79543,7 +79121,6 @@ in
         ];
       })
       sources."finalhandler-1.1.2"
-      sources."find-up-4.1.0"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."get-caller-file-2.0.5"
@@ -79564,7 +79141,7 @@ in
       sources."is-ci-2.0.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.3.2"
-      sources."is-npm-4.0.0"
+      sources."is-npm-5.0.0"
       sources."is-obj-2.0.0"
       sources."is-path-inside-3.0.2"
       sources."is-promise-2.2.2"
@@ -79576,12 +79153,15 @@ in
       sources."json-parse-helpfulerror-1.0.3"
       sources."keyv-3.1.0"
       sources."latest-version-5.1.0"
-      sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."lodash-id-0.14.0"
       sources."lowdb-1.0.0"
       sources."lowercase-keys-1.0.1"
-      sources."make-dir-3.1.0"
+      (sources."make-dir-3.1.0" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
       (sources."method-override-3.0.0" // {
@@ -79601,7 +79181,7 @@ in
         ];
       })
       sources."ms-2.0.0"
-      sources."nanoid-2.1.11"
+      sources."nanoid-3.1.16"
       sources."negotiator-0.6.2"
       sources."normalize-url-4.5.0"
       sources."object-assign-4.1.1"
@@ -79609,12 +79189,12 @@ in
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."p-cancelable-1.1.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-try-2.2.0"
-      sources."package-json-6.5.0"
+      (sources."package-json-6.5.0" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."parseurl-1.3.3"
-      sources."path-exists-4.0.0"
       sources."path-to-regexp-0.1.7"
       sources."pify-3.0.0"
       sources."please-upgrade-node-3.2.0"
@@ -79627,16 +79207,19 @@ in
       sources."range-parser-1.2.1"
       sources."raw-body-2.4.0"
       sources."rc-1.2.8"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
       sources."responselike-1.0.2"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-6.3.0"
+      sources."semver-7.3.2"
       sources."semver-compare-1.0.0"
-      sources."semver-diff-3.1.1"
+      (sources."semver-diff-3.1.1" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       (sources."send-0.17.1" // {
         dependencies = [
           sources."ms-2.1.1"
@@ -79644,7 +79227,6 @@ in
       })
       sources."serve-static-1.14.1"
       sources."server-destroy-1.0.1"
-      sources."set-blocking-2.0.0"
       sources."setprototypeof-1.1.1"
       sources."signal-exit-3.0.3"
       sources."statuses-1.5.0"
@@ -79668,13 +79250,12 @@ in
       sources."typedarray-to-buffer-3.1.5"
       sources."unique-string-2.0.0"
       sources."unpipe-1.0.0"
-      sources."update-notifier-4.1.3"
+      sources."update-notifier-5.0.1"
       sources."url-parse-lax-3.0.0"
       sources."utils-merge-1.0.1"
       sources."vary-1.1.2"
-      sources."which-module-2.0.0"
       sources."widest-line-3.1.0"
-      (sources."wrap-ansi-6.2.0" // {
+      (sources."wrap-ansi-7.0.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."strip-ansi-6.0.0"
@@ -79683,9 +79264,9 @@ in
       sources."wrappy-1.0.2"
       sources."write-file-atomic-3.0.3"
       sources."xdg-basedir-4.0.0"
-      sources."y18n-4.0.0"
-      sources."yargs-15.4.1"
-      sources."yargs-parser-18.1.3"
+      sources."y18n-5.0.5"
+      sources."yargs-16.1.1"
+      sources."yargs-parser-20.2.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -79914,7 +79495,7 @@ in
       sources."which-module-2.0.0"
       sources."wrap-ansi-6.2.0"
       sources."wrappy-1.0.2"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."y18n-4.0.0"
       sources."yargs-15.4.1"
@@ -80426,8 +80007,8 @@ in
       sources."@octokit/types-5.5.0"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/minimist-1.2.0"
-      sources."@types/node-14.14.6"
+      sources."@types/minimist-1.2.1"
+      sources."@types/node-14.14.7"
       sources."@types/normalize-package-data-2.4.0"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
@@ -80929,9 +80510,9 @@ in
             ];
           })
           sources."semver-7.3.2"
-          sources."type-fest-0.18.0"
+          sources."type-fest-0.18.1"
           sources."yallist-4.0.0"
-          sources."yargs-parser-20.2.3"
+          sources."yargs-parser-20.2.4"
         ];
       })
       sources."merge2-1.4.1"
@@ -81099,7 +80680,7 @@ in
       sources."request-2.88.2"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       (sources."resolve-cwd-2.0.0" // {
         dependencies = [
           sources."resolve-from-3.0.0"
@@ -81252,7 +80833,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.11.5"
+      sources."uglify-js-3.11.6"
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
       sources."union-value-1.0.1"
@@ -82216,7 +81797,7 @@ in
       sources."uuid-3.4.0"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yeast-0.1.2"
     ];
@@ -82351,7 +81932,7 @@ in
       sources."@jest/types-25.5.0"
       sources."@types/babel__core-7.1.12"
       sources."@types/babel__generator-7.6.2"
-      sources."@types/babel__template-7.0.3"
+      sources."@types/babel__template-7.4.0"
       sources."@types/babel__traverse-7.0.15"
       sources."@types/estree-0.0.45"
       sources."@types/graceful-fs-4.1.4"
@@ -82359,7 +81940,7 @@ in
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-0.0.8"
       sources."@types/yargs-15.0.9"
@@ -82433,9 +82014,9 @@ in
       sources."babel-helper-remove-or-void-0.4.3"
       sources."babel-helper-to-multiple-sequence-expressions-0.5.0"
       sources."babel-jest-25.5.1"
-      (sources."babel-loader-8.1.0" // {
+      (sources."babel-loader-8.2.1" // {
         dependencies = [
-          sources."mkdirp-0.5.5"
+          sources."make-dir-2.1.0"
         ];
       })
       sources."babel-plugin-dynamic-import-node-2.3.3"
@@ -82479,7 +82060,7 @@ in
           sources."define-property-1.0.0"
         ];
       })
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
       sources."binary-extensions-2.1.0"
@@ -82509,11 +82090,7 @@ in
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
-      (sources."browserify-rsa-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."browserify-rsa-4.1.0"
       (sources."browserify-sign-4.2.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -82521,7 +82098,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.14.6"
+      sources."browserslist-4.14.7"
       sources."bser-2.1.1"
       sources."buffer-5.2.1"
       sources."buffer-from-1.1.1"
@@ -82537,7 +82114,7 @@ in
       sources."cached-path-relative-1.0.2"
       sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001156"
+      sources."caniuse-lite-1.0.30001158"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       (sources."chalk-3.0.0" // {
@@ -82587,6 +82164,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
+      sources."colorette-1.2.1"
       sources."colors-1.4.0"
       (sources."combine-source-map-0.8.0" // {
         dependencies = [
@@ -82660,7 +82238,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.589"
+      sources."electron-to-chromium-1.3.596"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -82966,7 +82544,7 @@ in
         ];
       })
       sources."node-modules-regexp-1.0.0"
-      sources."node-releases-1.1.65"
+      sources."node-releases-1.1.66"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-2.0.2"
@@ -83080,7 +82658,7 @@ in
       sources."request-2.88.2"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       (sources."resolve-cwd-2.0.0" // {
         dependencies = [
           sources."resolve-from-3.0.0"
@@ -83301,8 +82879,8 @@ in
       sources."vinyl-2.2.1"
       sources."vm-browserify-1.1.2"
       sources."walker-1.0.7"
-      sources."watchpack-1.7.4"
-      (sources."watchpack-chokidar2-2.0.0" // {
+      sources."watchpack-1.7.5"
+      (sources."watchpack-chokidar2-2.0.1" // {
         dependencies = [
           sources."anymatch-2.0.0"
           sources."binary-extensions-1.13.1"
@@ -83463,7 +83041,7 @@ in
       sources."link-check-4.5.2"
       sources."lodash-4.17.20"
       sources."markdown-link-extractor-1.2.6"
-      sources."marked-1.2.3"
+      sources."marked-1.2.4"
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
       sources."ms-2.1.2"
@@ -83721,7 +83299,7 @@ in
       sources."replace-ext-0.0.1"
       sources."request-2.88.0"
       sources."require-uncached-1.0.3"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-from-1.0.1"
       sources."restore-cursor-1.0.1"
       sources."rimraf-2.6.3"
@@ -83853,12 +83431,12 @@ in
       sha512 = "X9I7gwvqKVdqVvqi9AVfUWXnHQQYjssWJ2asKfhBDAkQn0vPagKkx6EjzKcRgyIroWGXN6ZpwkQ/gMvTPFlx7g==";
     };
     dependencies = [
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."@types/yauzl-2.9.1"
       sources."agent-base-5.1.1"
       sources."ansi-styles-4.3.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bl-4.0.3"
       sources."brace-expansion-1.1.11"
       sources."buffer-5.7.1"
@@ -83870,7 +83448,7 @@ in
       sources."commander-6.2.0"
       sources."concat-map-0.0.1"
       sources."debug-4.3.0"
-      sources."devtools-protocol-0.0.809251"
+      sources."devtools-protocol-0.0.818844"
       sources."end-of-stream-1.4.4"
       sources."extract-zip-2.0.1"
       sources."fd-slicer-1.1.0"
@@ -83900,19 +83478,19 @@ in
       sources."progress-2.0.3"
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
-      sources."puppeteer-5.4.1"
+      sources."puppeteer-5.5.0"
       sources."readable-stream-3.6.0"
       sources."rimraf-3.0.2"
       sources."safe-buffer-5.2.1"
       sources."string_decoder-1.3.0"
       sources."supports-color-7.2.0"
-      sources."tar-fs-2.1.0"
+      sources."tar-fs-2.1.1"
       sources."tar-stream-2.1.4"
       sources."through-2.3.8"
       sources."unbzip2-stream-1.4.3"
       sources."util-deprecate-1.0.2"
       sources."wrappy-1.0.2"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."yauzl-2.10.0"
     ];
     buildInputs = globalBuildInputs;
@@ -83937,11 +83515,11 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.149.4"
+      sources."@fluentui/react-7.150.0"
       sources."@fluentui/react-focus-7.16.17"
       sources."@fluentui/react-window-provider-1.0.1"
       sources."@fluentui/theme-1.6.0"
-      sources."@microsoft/load-themed-styles-1.10.126"
+      sources."@microsoft/load-themed-styles-1.10.133"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@uifabric/foundation-7.9.19"
@@ -83966,7 +83544,7 @@ in
         ];
       })
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."basic-auth-2.0.1"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
@@ -84076,7 +83654,7 @@ in
       sources."node-fetch-1.6.3"
       sources."normalize-url-4.5.0"
       sources."object-assign-4.1.1"
-      sources."office-ui-fabric-react-7.149.4"
+      sources."office-ui-fabric-react-7.150.0"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -84132,7 +83710,7 @@ in
       sources."react-is-16.13.1"
       sources."readable-stream-3.6.0"
       sources."regenerator-runtime-0.10.5"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
@@ -84175,7 +83753,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
       sources."swagger-schema-official-2.0.0-bab6bed"
-      sources."swagger-ui-dist-3.36.1"
+      sources."swagger-ui-dist-3.36.2"
       sources."tail-2.0.4"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
@@ -84462,10 +84040,10 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "2.68.0";
+    version = "2.68.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.68.0.tgz";
-      sha512 = "nrdMstEiFYtwLmPF+UsMxnOekeKIayUwRpEMzaLtK+i9Yf/IjCPxKwMF7Z+yc3wjYIjxjlWSBqq0I8bcwxUDnQ==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.68.5.tgz";
+      sha512 = "QEvYSfvIvMMN1are5UdbkSD95w6UAnyvC6EavB5nvdgCF65SzyOTPhe8zTmGzAspfzFP5/GnHrDlAsWOEM9IVg==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -84583,14 +84161,14 @@ in
       sources."@dabh/diagnostics-2.0.2"
       sources."@jest/types-24.9.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      (sources."@netlify/build-5.2.1" // {
+      (sources."@netlify/build-5.3.1" // {
         dependencies = [
           sources."chalk-3.0.0"
           sources."resolve-2.0.0-next.2"
         ];
       })
       sources."@netlify/cache-utils-1.0.6"
-      (sources."@netlify/config-2.3.6" // {
+      (sources."@netlify/config-2.4.0" // {
         dependencies = [
           sources."chalk-3.0.0"
         ];
@@ -84778,7 +84356,7 @@ in
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."@types/node-fetch-2.5.7"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse5-5.0.3"
@@ -84848,7 +84426,7 @@ in
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
-      (sources."aws-sdk-2.786.0" // {
+      (sources."aws-sdk-2.792.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -84864,7 +84442,7 @@ in
           sources."define-property-1.0.0"
         ];
       })
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."before-after-hook-2.1.0"
       sources."binary-extensions-2.1.0"
       (sources."bl-0.8.2" // {
@@ -84897,17 +84475,13 @@ in
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
       sources."browserify-fs-1.0.0"
-      (sources."browserify-rsa-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."browserify-rsa-4.1.0"
       (sources."browserify-sign-4.2.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
         ];
       })
-      sources."browserslist-4.14.6"
+      sources."browserslist-4.14.7"
       sources."btoa-lite-1.0.0"
       sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
@@ -84931,7 +84505,7 @@ in
       sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001156"
+      sources."caniuse-lite-1.0.30001158"
       sources."cardinal-2.1.1"
       sources."caw-2.0.1"
       sources."ccount-1.1.0"
@@ -85002,6 +84576,7 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."color-string-1.5.4"
+      sources."colorette-1.2.1"
       sources."colors-1.4.0"
       sources."colorspace-1.1.2"
       sources."combined-stream-1.0.8"
@@ -85182,7 +84757,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.589"
+      sources."electron-to-chromium-1.3.596"
       sources."elf-tools-1.1.2"
       (sources."elliptic-6.5.3" // {
         dependencies = [
@@ -85557,7 +85132,7 @@ in
       sources."json5-2.1.3"
       sources."jsonfile-4.0.0"
       sources."junk-3.1.0"
-      sources."jwt-decode-3.1.1"
+      sources."jwt-decode-3.1.2"
       sources."keep-func-props-3.0.1"
       sources."keyv-3.1.0"
       sources."kind-of-6.0.3"
@@ -85744,10 +85319,10 @@ in
           sources."chalk-3.0.0"
         ];
       })
-      sources."netlify-redirector-0.2.0"
+      sources."netlify-redirector-0.2.1"
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.1"
-      sources."node-releases-1.1.65"
+      sources."node-releases-1.1.66"
       sources."node-source-walk-4.2.0"
       sources."noop2-2.0.0"
       (sources."normalize-package-data-2.5.0" // {
@@ -85932,7 +85507,7 @@ in
       sources."regenerator-transform-0.14.5"
       sources."regex-not-1.0.2"
       sources."regexpu-core-4.7.1"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."regjsgen-0.5.2"
       (sources."regjsparser-0.6.4" // {
@@ -85950,7 +85525,7 @@ in
       sources."require-main-filename-2.0.0"
       sources."require-package-name-2.0.1"
       sources."requires-port-1.0.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
       (sources."restore-cursor-2.0.0" // {
@@ -85963,7 +85538,7 @@ in
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
       sources."ripemd160-2.0.2"
-      sources."rollup-2.33.1"
+      sources."rollup-2.33.2"
       sources."rollup-plugin-node-builtins-2.1.2"
       sources."rollup-plugin-terser-7.0.2"
       sources."run-async-2.4.1"
@@ -86156,7 +85731,7 @@ in
         ];
       })
       sources."term-size-2.2.1"
-      (sources."terser-5.3.8" // {
+      (sources."terser-5.4.0" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -86669,7 +86244,7 @@ in
           sources."qs-6.4.0"
         ];
       })
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."rimraf-2.2.8"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -86916,7 +86491,7 @@ in
       sources."aws4-1.11.0"
       sources."axios-0.19.2"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       (sources."basic-auth-2.0.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -87146,7 +86721,7 @@ in
       })
       sources."mkdirp-0.5.5"
       sources."moment-2.29.1"
-      sources."moment-timezone-0.5.31"
+      sources."moment-timezone-0.5.32"
       (sources."mqtt-4.2.4" // {
         dependencies = [
           sources."concat-stream-2.0.0"
@@ -87154,7 +86729,7 @@ in
           sources."ms-2.1.2"
           sources."readable-stream-3.6.0"
           sources."string_decoder-1.3.0"
-          sources."ws-7.3.1"
+          sources."ws-7.4.0"
         ];
       })
       (sources."mqtt-packet-6.6.0" // {
@@ -87483,7 +87058,7 @@ in
         ];
       })
       sources."request-2.88.2"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."retry-0.10.1"
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.2.1"
@@ -87511,7 +87086,7 @@ in
           sources."mkdirp-1.0.4"
         ];
       })
-      sources."temp-0.9.2"
+      sources."temp-0.9.4"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -87650,7 +87225,7 @@ in
       sources."pupa-2.1.1"
       sources."rc-1.2.8"
       sources."readdirp-3.5.0"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."responselike-1.0.2"
       sources."semver-5.7.1"
@@ -87722,10 +87297,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "9.2.4";
+    version = "10.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.2.4.tgz";
-      sha512 = "YXEIqKXzxOhtPWg670+JAp/jPtjfTdaBJVGSlWL3eHbUDY4O80ELQNGO/qDy8oxh3pOrxSdII7vNglDf4FDw4w==";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.1.1.tgz";
+      sha512 = "d1lwJqv0sRKJwXwaAUSZTNqBzvJJOQfTiEqkM674tThNmtPd5WU0Mqar//0BpDdSIRs2fEQkvKvg57+2Kbosaw==";
     };
     dependencies = [
       sources."@npmcli/ci-detect-1.3.0"
@@ -87734,7 +87309,7 @@ in
       sources."@npmcli/move-file-1.0.1"
       sources."@npmcli/node-gyp-1.0.1"
       sources."@npmcli/promise-spawn-1.3.2"
-      sources."@npmcli/run-script-1.7.4"
+      sources."@npmcli/run-script-1.7.5"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@tootallnate/once-1.1.2"
@@ -87971,7 +87546,7 @@ in
       sources."read-package-json-fast-1.2.1"
       sources."readable-stream-2.3.7"
       sources."readdir-scoped-modules-1.1.0"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."remote-git-tags-3.0.0"
       sources."request-2.88.2"
@@ -87994,7 +87569,7 @@ in
       sources."smart-buffer-4.1.0"
       sources."socks-2.5.0"
       sources."socks-proxy-agent-5.0.0"
-      sources."spawn-please-0.4.1"
+      sources."spawn-please-1.0.0"
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.16.1"
       sources."ssri-8.0.0"
@@ -88451,7 +88026,7 @@ in
           sources."define-property-1.0.0"
         ];
       })
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-extensions-1.13.1"
       sources."bindings-1.5.0"
@@ -88465,11 +88040,7 @@ in
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
-      (sources."browserify-rsa-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."browserify-rsa-4.1.0"
       (sources."browserify-sign-4.2.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -88481,7 +88052,7 @@ in
           sources."pako-1.0.11"
         ];
       })
-      sources."browserslist-4.14.6"
+      sources."browserslist-4.14.7"
       (sources."buffer-4.9.2" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -88498,7 +88069,7 @@ in
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001156"
+      sources."caniuse-lite-1.0.30001158"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -88513,6 +88084,7 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."color-string-1.5.4"
+      sources."colorette-1.2.1"
       sources."combined-stream-1.0.8"
       sources."command-exists-1.2.9"
       sources."commander-2.20.3"
@@ -88570,9 +88142,9 @@ in
       sources."cssnano-util-get-match-4.0.0"
       sources."cssnano-util-raw-cache-4.0.1"
       sources."cssnano-util-same-parent-4.0.1"
-      (sources."csso-4.1.0" // {
+      (sources."csso-4.1.1" // {
         dependencies = [
-          sources."css-tree-1.0.0"
+          sources."css-tree-1.0.1"
           sources."mdn-data-2.0.12"
         ];
       })
@@ -88580,7 +88152,7 @@ in
       sources."cssstyle-1.4.0"
       sources."dashdash-1.14.1"
       sources."data-urls-1.1.0"
-      sources."deasync-0.1.20"
+      sources."deasync-0.1.21"
       sources."debug-4.3.0"
       sources."decode-uri-component-0.2.0"
       sources."deep-is-0.1.3"
@@ -88624,11 +88196,7 @@ in
       sources."domain-browser-1.2.0"
       sources."domelementtype-1.3.1"
       sources."domexception-1.0.1"
-      (sources."domhandler-3.3.0" // {
-        dependencies = [
-          sources."domelementtype-2.0.2"
-        ];
-      })
+      sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."dotenv-5.0.1"
@@ -88636,7 +88204,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.589"
+      sources."electron-to-chromium-1.3.596"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -88739,19 +88307,16 @@ in
       sources."html-comment-regex-1.1.2"
       sources."html-encoding-sniffer-1.0.2"
       sources."html-tags-1.2.0"
-      (sources."htmlnano-0.2.7" // {
+      (sources."htmlnano-0.2.8" // {
         dependencies = [
           sources."posthtml-0.13.4"
-          sources."posthtml-parser-0.5.2"
+          sources."posthtml-parser-0.5.3"
           sources."terser-4.8.0"
         ];
       })
-      (sources."htmlparser2-5.0.1" // {
+      (sources."htmlparser2-3.10.1" // {
         dependencies = [
-          sources."dom-serializer-1.1.0"
-          sources."domelementtype-2.0.2"
-          sources."domutils-2.4.2"
-          sources."entities-2.1.0"
+          sources."readable-stream-3.6.0"
         ];
       })
       sources."http-errors-1.7.3"
@@ -88894,7 +88459,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.65"
+      sources."node-releases-1.1.66"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
       sources."nth-check-1.0.2"
@@ -88999,14 +88564,8 @@ in
       sources."postcss-unique-selectors-4.0.1"
       sources."postcss-value-parser-3.3.1"
       sources."posthtml-0.11.6"
-      (sources."posthtml-parser-0.4.2" // {
-        dependencies = [
-          sources."domhandler-2.4.2"
-          sources."htmlparser2-3.10.1"
-          sources."readable-stream-3.6.0"
-        ];
-      })
-      sources."posthtml-render-1.2.3"
+      sources."posthtml-parser-0.4.2"
+      sources."posthtml-render-1.3.0"
       sources."prelude-ls-1.1.2"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
@@ -89062,7 +88621,7 @@ in
       sources."request-2.88.2"
       sources."request-promise-core-1.1.4"
       sources."request-promise-native-1.0.9"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-from-3.0.0"
       sources."resolve-url-0.2.1"
       sources."restore-cursor-2.0.0"
@@ -89126,6 +88685,7 @@ in
         ];
       })
       sources."sprintf-js-1.0.3"
+      sources."srcset-3.0.0"
       sources."sshpk-1.16.1"
       sources."stable-0.1.8"
       (sources."static-eval-2.1.0" // {
@@ -89505,7 +89065,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
-      sources."uglify-js-3.11.5"
+      sources."uglify-js-3.11.6"
       sources."unix-dgram-2.0.4"
       sources."unpipe-1.0.0"
       sources."uri-js-4.4.0"
@@ -90046,7 +89606,7 @@ in
         ];
       })
       sources."repeating-2.0.1"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."restore-cursor-2.0.0"
       sources."reverse-http-1.3.0"
       sources."rimraf-2.7.1"
@@ -90167,7 +89727,7 @@ in
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.4"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."base64id-2.0.0"
       sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
@@ -90499,7 +90059,7 @@ in
       sources."verror-1.10.0"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."xtend-4.0.2"
       sources."yeast-0.1.2"
@@ -90566,7 +90126,7 @@ in
           sources."tslib-1.9.3"
         ];
       })
-      (sources."@pm2/js-api-0.6.0" // {
+      (sources."@pm2/js-api-0.6.1" // {
         dependencies = [
           sources."async-2.6.3"
           sources."debug-3.2.6"
@@ -90694,7 +90254,7 @@ in
       sources."mkdirp-1.0.4"
       sources."module-details-from-path-1.0.3"
       sources."moment-2.29.1"
-      sources."moment-timezone-0.5.31"
+      sources."moment-timezone-0.5.32"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
       (sources."needle-2.4.0" // {
@@ -90745,7 +90305,7 @@ in
       })
       sources."readdirp-3.5.0"
       sources."require-in-the-middle-5.0.3"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."run-series-1.1.9"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -90767,7 +90327,7 @@ in
       sources."statuses-1.5.0"
       sources."string_decoder-0.10.31"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.28.1"
+      sources."systeminformation-4.30.1"
       sources."thunkify-2.1.2"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
@@ -90802,10 +90362,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "5.10.4";
+    version = "5.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.10.4.tgz";
-      sha512 = "HWtg7vrXpNNCeroOc0IhsoNdwPmga/N7Nci/Mc9SadHrkMXPNpkFXCHT3g9e4HqtGlbDX2K30WKvYQu2umdM+w==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.12.0.tgz";
+      sha512 = "ag+ar3N2DgYM2Tx5XMr0rCnuFteAokiEUZQRNJjuWNt091i3m68FDLxxfBTqM14ZnI6Z55S70XYWkesPo232BQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -90852,7 +90412,7 @@ in
       sources."callsites-3.1.0"
       sources."chalk-4.1.0"
       sources."chokidar-3.4.3"
-      sources."cliui-7.0.3"
+      sources."cliui-7.0.4"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."colorette-1.2.1"
@@ -90928,8 +90488,8 @@ in
       sources."wrap-ansi-7.0.0"
       sources."y18n-5.0.5"
       sources."yaml-1.10.0"
-      sources."yargs-16.1.0"
-      sources."yargs-parser-20.2.3"
+      sources."yargs-16.1.1"
+      sources."yargs-parser-20.2.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -91022,7 +90582,7 @@ in
       })
       sources."async-1.5.2"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bn.js-5.1.3"
       sources."brace-expansion-1.1.11"
       sources."brorand-1.1.0"
@@ -91043,11 +90603,7 @@ in
           sources."jsonparse-0.0.5"
         ];
       })
-      (sources."browserify-rsa-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."browserify-rsa-4.1.0"
       (sources."browserify-sign-4.2.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -91200,7 +90756,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
       sources."safe-buffer-5.2.1"
@@ -91225,7 +90781,7 @@ in
       sources."string_decoder-1.3.0"
       sources."subarg-1.0.0"
       sources."syntax-error-1.4.0"
-      (sources."temp-0.9.2" // {
+      (sources."temp-0.9.4" // {
         dependencies = [
           sources."rimraf-2.6.3"
         ];
@@ -91316,10 +90872,10 @@ in
   purty = nodeEnv.buildNodePackage {
     name = "purty";
     packageName = "purty";
-    version = "6.2.0";
+    version = "6.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/purty/-/purty-6.2.0.tgz";
-      sha512 = "JfT8kJHSyxuOFQtRiH2x55SiPxXZsSdedQlZap8JehQ7KzB49B5C9cWwVybtSB36BdADQcxPvtw8D52z4EPnBw==";
+      url = "https://registry.npmjs.org/purty/-/purty-6.2.1.tgz";
+      sha512 = "7VkL+WEp0wCpzy4DWMSEHvNbylMWKGYHycwJ90ZjvdX90lI8akp2JM4hhyL/JOAkIP9DDd996PaW+x/Nre0IDA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -91334,10 +90890,10 @@ in
   pyright = nodeEnv.buildNodePackage {
     name = "pyright";
     packageName = "pyright";
-    version = "1.1.83";
+    version = "1.1.85";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.83.tgz";
-      sha512 = "uwaqJsuGxtY94lA8PL3Akp1xkUqUYWEFDLrIdW3FQY6JgFngkAZ51rPyUsuXQjoObm056OZ68wtzUMhDX5P5UA==";
+      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.85.tgz";
+      sha512 = "G27ke+PtyAyhoFwCpPwu1MgksAp4h3b2nQ3UAQ/A6GhLtYXr49TwP48bfuAZD89N9PaX1QFCaud3kchb89ktGA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -91373,11 +90929,7 @@ in
       sources."deep-equal-2.0.4"
       sources."define-properties-1.1.3"
       sources."es-abstract-1.18.0-next.1"
-      (sources."es-get-iterator-1.1.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."eyes-0.1.8"
@@ -91523,10 +91075,10 @@ in
   readability-cli = nodeEnv.buildNodePackage {
     name = "readability-cli";
     packageName = "readability-cli";
-    version = "1.1.5";
+    version = "1.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/readability-cli/-/readability-cli-1.1.5.tgz";
-      sha512 = "xMbRC9qGezXO4dqRlTpSfC/o4XuUpsRq0yLGEumtulcNVz1RJyOEbovgnqmOhulZYSgsLbRCm8gZ0nQ5n0up6w==";
+      url = "https://registry.npmjs.org/readability-cli/-/readability-cli-1.2.1.tgz";
+      sha512 = "oS0m68Y02lcMnrCYh3loRj3o8pGjhBAk8petnaJuvvE6eif3bjj60mTByFhZTlYRWNLuQaq/Yqe8Wk0yFI2wdQ==";
     };
     dependencies = [
       sources."@mozilla/readability-0.3.0"
@@ -91637,7 +91189,7 @@ in
       sources."whatwg-mimetype-2.3.0"
       sources."whatwg-url-8.4.0"
       sources."word-wrap-1.2.3"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."xml-name-validator-3.0.0"
       sources."xmlchars-2.2.0"
     ];
@@ -91702,7 +91254,7 @@ in
       })
       sources."babel-plugin-styled-components-1.11.1"
       sources."babel-plugin-syntax-jsx-6.18.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."better-ajv-errors-0.6.7"
       sources."binary-extensions-2.1.0"
       sources."bn.js-5.1.3"
@@ -91711,11 +91263,7 @@ in
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
-      (sources."browserify-rsa-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."browserify-rsa-4.1.0"
       (sources."browserify-sign-4.2.1" // {
         dependencies = [
           sources."inherits-2.0.4"
@@ -91846,7 +91394,7 @@ in
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimist-1.2.5"
       sources."mkdirp-1.0.4"
-      sources."mobx-6.0.3"
+      sources."mobx-6.0.4"
       sources."mobx-react-6.3.1"
       sources."mobx-react-lite-2.2.2"
       sources."ms-2.1.2"
@@ -91942,7 +91490,7 @@ in
       sources."to-regex-range-5.0.1"
       sources."tslib-2.0.3"
       sources."tty-browserify-0.0.0"
-      sources."uglify-js-3.11.5"
+      sources."uglify-js-3.11.6"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
@@ -92002,10 +91550,10 @@ in
   rollup = nodeEnv.buildNodePackage {
     name = "rollup";
     packageName = "rollup";
-    version = "2.33.1";
+    version = "2.33.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz";
-      sha512 = "uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==";
+      url = "https://registry.npmjs.org/rollup/-/rollup-2.33.2.tgz";
+      sha512 = "QPQ6/fWCrzHtSXkI269rhKaC7qXGghYBwXU04b1JsDZ6ibZa3DJ9D1SFAYRMgx1inDg0DaTbb3N4Z1NK/r3fhw==";
     };
     dependencies = [
       sources."fsevents-2.1.3"
@@ -92135,7 +91683,7 @@ in
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-7.12.1" // {
+      (sources."eslint-7.13.0" // {
         dependencies = [
           sources."eslint-visitor-keys-2.0.0"
           sources."semver-7.3.2"
@@ -92281,10 +91829,10 @@ in
       sources."regexpp-3.1.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-from-4.0.0"
       sources."rimraf-2.6.3"
-      sources."rollup-2.33.1"
+      sources."rollup-2.33.2"
       sources."safe-buffer-5.2.1"
       sources."semver-6.3.0"
       sources."serialize-javascript-5.0.1"
@@ -92680,10 +92228,10 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "2.11.0";
+    version = "2.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-2.11.0.tgz";
-      sha512 = "xR6ntWPdLA2gMauiuXAXUImUEFEVe8vmPbIZ4pbc34VwbztyeAnhUf4JyOL9wfDHStdJC2vqZ/zDngTJbM0DxQ==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-2.11.1.tgz";
+      sha512 = "BQN53zkm/HWh+QtzaR/uXHRAxAcabHkstyRMo4+9JJc+DM7cQM9cyRBm15BW9PKMO9c3aCKYNTJSb5cegn7qmw==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
@@ -92731,7 +92279,7 @@ in
       sources."@serverless/enterprise-plugin-4.1.2"
       sources."@serverless/event-mocks-1.1.1"
       sources."@serverless/platform-client-3.1.2"
-      sources."@serverless/platform-client-china-2.0.8"
+      sources."@serverless/platform-client-china-2.0.9"
       (sources."@serverless/platform-sdk-2.3.2" // {
         dependencies = [
           sources."chalk-2.4.2"
@@ -92750,7 +92298,7 @@ in
           sources."write-file-atomic-3.0.3"
         ];
       })
-      sources."@serverless/utils-china-1.0.10"
+      sources."@serverless/utils-china-1.0.11"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@tencent-sdk/capi-1.1.6"
@@ -92760,7 +92308,7 @@ in
       sources."@types/keyv-3.1.1"
       sources."@types/lodash-4.14.165"
       sources."@types/long-4.0.1"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."@types/request-2.48.5"
       sources."@types/request-promise-native-1.0.17"
       sources."@types/responselike-1.0.0"
@@ -92817,7 +92365,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.786.0" // {
+      (sources."aws-sdk-2.792.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -92830,7 +92378,7 @@ in
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.4"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
       sources."binary-extensions-2.1.0"
@@ -92950,7 +92498,7 @@ in
         ];
       })
       sources."dashdash-1.14.1"
-      sources."dayjs-1.9.5"
+      sources."dayjs-1.9.6"
       sources."debug-3.1.0"
       sources."decode-uri-component-0.2.0"
       sources."decompress-4.2.1"
@@ -93348,7 +92896,7 @@ in
       sources."readdir-glob-1.1.1"
       sources."readdirp-3.5.0"
       sources."regenerator-runtime-0.13.7"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."replaceall-0.1.6"
       (sources."request-2.88.2" // {
@@ -93380,7 +92928,7 @@ in
       sources."signal-exit-3.0.3"
       sources."simple-concat-1.0.1"
       sources."simple-get-2.8.1"
-      (sources."simple-git-2.21.0" // {
+      (sources."simple-git-2.22.0" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."ms-2.1.2"
@@ -93523,7 +93071,7 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.4.3"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."xml2js-0.4.19"
       sources."xmlbuilder-9.0.7"
       sources."xmlhttprequest-ssl-1.5.5"
@@ -93531,7 +93079,7 @@ in
       sources."yallist-4.0.0"
       sources."yaml-ast-parser-0.0.43"
       sources."yamljs-0.3.0"
-      sources."yargs-parser-20.2.3"
+      sources."yargs-parser-20.2.4"
       sources."yauzl-2.10.0"
       sources."yeast-0.1.2"
       sources."zip-stream-4.0.2"
@@ -94173,10 +93721,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.424.4";
+    version = "1.427.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.424.4.tgz";
-      sha512 = "l+p0PgYx7+xmAYNGy4hvd8hXtDIcQzYM1SrI7uM4CtlxR0Hjze93p0TcE3GYxSuia3IUDub95DIVtWmxLCeCMw==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.427.0.tgz";
+      sha512 = "0T0pvkP7FSzvNdf8E/us1bB/aUWf2gr+ClsKexfVoKPcJYPuStFDaolmDMN0nvXD5yrYaLneYbQieuZrGtdlJQ==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -94184,16 +93732,16 @@ in
       sources."@snyk/cocoapods-lockfile-parser-3.5.2"
       sources."@snyk/composer-lockfile-parser-1.4.1"
       sources."@snyk/dep-graph-1.19.4"
-      sources."@snyk/docker-registry-v2-client-1.13.6"
+      sources."@snyk/docker-registry-v2-client-1.13.8"
       sources."@snyk/gemfile-1.2.0"
-      sources."@snyk/java-call-graph-builder-1.16.0"
+      sources."@snyk/java-call-graph-builder-1.16.2"
       sources."@snyk/rpm-parser-2.2.1"
       (sources."@snyk/snyk-cocoapods-plugin-2.5.1" // {
         dependencies = [
           sources."tslib-2.0.3"
         ];
       })
-      (sources."@snyk/snyk-docker-pull-3.2.0" // {
+      (sources."@snyk/snyk-docker-pull-3.2.2" // {
         dependencies = [
           sources."tmp-0.1.0"
         ];
@@ -94206,7 +93754,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/js-yaml-3.12.5"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."@types/responselike-1.0.0"
       sources."@types/semver-5.5.0"
       sources."@yarnpkg/lockfile-1.1.0"
@@ -94232,9 +93780,9 @@ in
           sources."tslib-2.0.3"
         ];
       })
-      sources."async-1.5.2"
+      sources."async-3.2.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       (sources."bl-4.0.3" // {
         dependencies = [
@@ -94246,7 +93794,6 @@ in
       (sources."boxen-4.2.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
-          sources."camelcase-5.3.1"
           sources."chalk-3.0.0"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
@@ -94267,7 +93814,7 @@ in
           sources."get-stream-5.2.0"
         ];
       })
-      sources."camelcase-2.1.1"
+      sources."camelcase-5.3.1"
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
       sources."child-process-1.0.2"
@@ -94276,18 +93823,8 @@ in
       sources."cli-cursor-3.1.0"
       sources."cli-spinner-0.2.10"
       sources."cli-width-3.0.0"
-      (sources."cliui-3.2.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."wrap-ansi-2.1.0"
-        ];
-      })
       sources."clone-response-1.0.2"
       sources."co-4.6.0"
-      sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."concat-map-0.0.1"
@@ -94301,7 +93838,6 @@ in
       sources."crypto-random-string-2.0.0"
       sources."data-uri-to-buffer-1.2.0"
       sources."debug-4.3.0"
-      sources."decamelize-1.2.0"
       (sources."decompress-response-6.0.0" // {
         dependencies = [
           sources."mimic-response-3.1.0"
@@ -94410,7 +93946,6 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."invert-kv-1.0.0"
       sources."ip-1.1.5"
       sources."is-ci-2.0.0"
       sources."is-deflate-1.0.0"
@@ -94437,7 +93972,6 @@ in
       })
       sources."keyv-4.0.3"
       sources."latest-version-5.1.0"
-      sources."lcid-1.0.0"
       sources."levn-0.3.0"
       sources."lie-3.3.0"
       sources."lodash-4.17.20"
@@ -94468,7 +94002,6 @@ in
       sources."mkdirp-1.0.4"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
-      sources."nconf-0.10.0"
       (sources."needle-2.5.0" // {
         dependencies = [
           sources."debug-3.2.6"
@@ -94478,13 +94011,11 @@ in
       sources."nice-try-1.0.5"
       sources."normalize-url-4.5.0"
       sources."npm-run-path-2.0.2"
-      sources."number-is-nan-1.0.1"
       sources."object-hash-2.0.3"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
       sources."open-7.3.0"
       sources."optionator-0.8.3"
-      sources."os-locale-1.4.0"
       sources."os-name-3.1.0"
       sources."os-tmpdir-1.0.2"
       sources."p-cancelable-2.0.0"
@@ -94542,7 +94073,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."resolve-alpn-1.0.0"
       sources."responselike-2.0.0"
@@ -94553,7 +94084,6 @@ in
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."secure-keys-1.0.0"
       sources."semver-6.3.0"
       sources."semver-diff-3.1.1"
       sources."set-immediate-shim-1.0.1"
@@ -94562,8 +94092,8 @@ in
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.3"
       sources."smart-buffer-4.1.0"
-      sources."snyk-config-3.1.1"
-      (sources."snyk-cpp-plugin-2.0.0" // {
+      sources."snyk-config-4.0.0-rc.2"
+      (sources."snyk-cpp-plugin-2.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
@@ -94574,10 +94104,9 @@ in
           sources."tslib-2.0.3"
         ];
       })
-      (sources."snyk-docker-plugin-4.7.0" // {
+      (sources."snyk-docker-plugin-4.7.2" // {
         dependencies = [
           sources."rimraf-3.0.2"
-          sources."snyk-nodejs-lockfile-parser-1.30.0"
           sources."tmp-0.2.1"
           sources."uuid-8.3.1"
         ];
@@ -94589,7 +94118,7 @@ in
           sources."tmp-0.2.1"
         ];
       })
-      (sources."snyk-gradle-plugin-3.10.1" // {
+      (sources."snyk-gradle-plugin-3.10.2" // {
         dependencies = [
           (sources."@snyk/cli-interface-2.9.1" // {
             dependencies = [
@@ -94608,16 +94137,19 @@ in
         ];
       })
       sources."snyk-module-3.1.0"
-      (sources."snyk-mvn-plugin-2.23.0" // {
+      (sources."snyk-mvn-plugin-2.23.1" // {
         dependencies = [
           sources."@snyk/cli-interface-2.9.1"
-          sources."@snyk/java-call-graph-builder-1.16.1"
           sources."tmp-0.1.0"
           sources."tslib-1.11.1"
         ];
       })
-      sources."snyk-nodejs-lockfile-parser-1.28.1"
-      (sources."snyk-nuget-plugin-1.19.3" // {
+      (sources."snyk-nodejs-lockfile-parser-1.30.1" // {
+        dependencies = [
+          sources."uuid-8.3.1"
+        ];
+      })
+      (sources."snyk-nuget-plugin-1.19.4" // {
         dependencies = [
           sources."jszip-3.4.0"
           sources."pako-1.0.11"
@@ -94629,7 +94161,7 @@ in
           sources."tslib-1.11.1"
         ];
       })
-      (sources."snyk-poetry-lockfile-parser-1.1.0" // {
+      (sources."snyk-poetry-lockfile-parser-1.1.1" // {
         dependencies = [
           (sources."@snyk/dep-graph-1.20.0" // {
             dependencies = [
@@ -94650,7 +94182,7 @@ in
           })
         ];
       })
-      sources."snyk-python-plugin-1.18.0"
+      sources."snyk-python-plugin-1.19.1"
       (sources."snyk-resolve-1.0.1" // {
         dependencies = [
           sources."debug-3.2.6"
@@ -94756,7 +94288,6 @@ in
       sources."vscode-languageserver-types-3.15.1"
       sources."which-1.3.1"
       sources."widest-line-3.1.0"
-      sources."window-size-0.1.4"
       sources."windows-release-3.3.3"
       sources."word-wrap-1.2.3"
       (sources."wrap-ansi-5.1.0" // {
@@ -94773,17 +94304,8 @@ in
       sources."xmlbuilder-11.0.1"
       sources."xregexp-2.0.0"
       sources."xtend-4.0.2"
-      sources."y18n-3.2.1"
       sources."yallist-3.1.1"
       sources."yaml-1.10.0"
-      (sources."yargs-3.32.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -94798,10 +94320,10 @@ in
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
-    version = "3.0.0";
+    version = "3.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.0.tgz";
-      sha512 = "arLQtd+UoJ08NXBRBGUJDyQ9B+cc9WwD67hc5s1WQcs2DyAkYzI5HWg4U0CrFtK00kjyAWxBGhLwVbfOeMqz1A==";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.1.tgz";
+      sha512 = "oVYbCQ4sCwm4wVi+f1bsE3YFXcvd6b4JjVP8D7IZnQqBeJOKX9XrdgJWSbXqBEqUXPY3jdTqb1M3s4KFTa/IHg==";
     };
     dependencies = [
       sources."accepts-1.3.7"
@@ -94810,7 +94332,7 @@ in
       sources."cookie-0.4.1"
       sources."cors-2.8.5"
       sources."debug-4.1.1"
-      sources."engine.io-4.0.1"
+      sources."engine.io-4.0.2"
       sources."engine.io-parser-4.0.1"
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
@@ -94820,7 +94342,7 @@ in
       sources."socket.io-adapter-2.0.3"
       sources."socket.io-parser-4.0.1"
       sources."vary-1.1.2"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -94956,7 +94478,7 @@ in
       sources."redent-2.0.0"
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."restore-cursor-2.0.0"
       sources."round-to-3.0.0"
       sources."safe-buffer-5.2.1"
@@ -95010,10 +94532,10 @@ in
   ssb-server = nodeEnv.buildNodePackage {
     name = "ssb-server";
     packageName = "ssb-server";
-    version = "16.0.1";
+    version = "15.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ssb-server/-/ssb-server-16.0.1.tgz";
-      sha512 = "cast7wQRxqUSiRVyFoaTtymeukwSh5nlfDj5ShHmdnh0qmfi4uQnvPuBA5BBgC3WEtI/ozgNjAc1/vqJFgILig==";
+      url = "https://registry.npmjs.org/ssb-server/-/ssb-server-15.3.0.tgz";
+      sha512 = "+KXfMBecoFFAo0C4FTfSsH2ZXtrL2aQDXgVlQ0NrYdNLHW2TEnibV0hG3yq3hOlAEUQmrwVHZATfVToO825gxA==";
     };
     dependencies = [
       sources."abstract-leveldown-6.0.3"
@@ -95034,13 +94556,9 @@ in
       sources."assign-symbols-1.0.0"
       sources."async-each-1.0.3"
       sources."async-single-1.0.5"
+      sources."async-write-2.1.0"
       sources."atob-2.1.2"
-      (sources."atomic-file-2.1.1" // {
-        dependencies = [
-          sources."flumecodec-0.0.1"
-          sources."level-codec-6.2.0"
-        ];
-      })
+      sources."atomic-file-1.1.5"
       sources."attach-ware-1.1.1"
       sources."available-typed-arrays-1.0.2"
       sources."bail-1.0.5"
@@ -95051,7 +94569,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."base64-url-2.3.3"
       sources."bash-color-0.0.4"
       sources."binary-extensions-1.13.1"
@@ -95157,9 +94675,8 @@ in
       sources."epidemic-broadcast-trees-7.0.0"
       sources."errno-0.1.7"
       sources."es-abstract-1.18.0-next.1"
-      (sources."es-get-iterator-1.1.0" // {
+      (sources."es-get-iterator-1.1.1" // {
         dependencies = [
-          sources."es-abstract-1.17.7"
           sources."isarray-2.0.5"
         ];
       })
@@ -95185,39 +94702,37 @@ in
           sources."level-codec-6.2.0"
         ];
       })
-      (sources."flumedb-2.1.8" // {
-        dependencies = [
-          sources."pull-abortable-4.1.1"
-        ];
-      })
+      sources."flumedb-1.1.0"
       sources."flumelog-offset-3.4.4"
-      (sources."flumeview-hashtable-1.1.1" // {
-        dependencies = [
-          sources."atomic-file-1.1.5"
-        ];
-      })
-      (sources."flumeview-level-4.0.4" // {
-        dependencies = [
-          sources."abstract-leveldown-6.2.3"
-          sources."level-6.0.1"
-          sources."level-js-5.0.2"
-          sources."mkdirp-1.0.4"
-        ];
-      })
+      sources."flumeview-hashtable-1.1.1"
+      sources."flumeview-level-3.0.14"
       (sources."flumeview-links-1.0.1" // {
         dependencies = [
           sources."deep-equal-2.0.4"
-          sources."flumeview-level-3.0.14"
           sources."isarray-2.0.5"
           sources."map-filter-reduce-3.2.2"
         ];
       })
       (sources."flumeview-query-8.0.0" // {
         dependencies = [
+          sources."abstract-leveldown-6.2.3"
+          sources."flumeview-level-4.0.4"
+          sources."level-6.0.1"
+          sources."level-js-5.0.2"
           sources."map-filter-reduce-3.2.2"
+          sources."mkdirp-1.0.4"
+        ];
+      })
+      (sources."flumeview-reduce-1.3.17" // {
+        dependencies = [
+          (sources."atomic-file-2.1.1" // {
+            dependencies = [
+              sources."flumecodec-0.0.1"
+            ];
+          })
+          sources."level-codec-6.2.0"
         ];
       })
-      sources."flumeview-reduce-1.3.17"
       sources."for-each-0.3.3"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
@@ -95355,7 +94870,6 @@ in
       sources."libnested-1.5.0"
       sources."libsodium-0.7.8"
       sources."libsodium-wrappers-0.7.8"
-      sources."lodash.clonedeep-4.5.0"
       sources."lodash.get-4.4.2"
       sources."log-symbols-1.0.2"
       sources."log-update-1.0.2"
@@ -95688,20 +95202,10 @@ in
       sources."ssb-caps-1.1.0"
       sources."ssb-client-4.9.0"
       sources."ssb-config-3.4.5"
-      (sources."ssb-db-20.3.0" // {
-        dependencies = [
-          sources."glob-7.1.6"
-          sources."mkdirp-1.0.4"
-          sources."rimraf-3.0.2"
-        ];
-      })
+      sources."ssb-db-19.2.0"
       sources."ssb-ebt-5.6.7"
-      sources."ssb-friends-4.2.1"
-      (sources."ssb-gossip-1.1.1" // {
-        dependencies = [
-          sources."atomic-file-1.1.5"
-        ];
-      })
+      sources."ssb-friends-4.3.0"
+      sources."ssb-gossip-1.1.1"
       (sources."ssb-invite-2.1.6" // {
         dependencies = [
           sources."abstract-leveldown-6.2.3"
@@ -95723,8 +95227,7 @@ in
           sources."level-codec-6.2.0"
         ];
       })
-      sources."ssb-plugins-1.0.4"
-      sources."ssb-private1-1.0.1"
+      sources."ssb-plugins-1.0.0"
       sources."ssb-query-2.4.5"
       sources."ssb-ref-2.14.2"
       sources."ssb-replicate-1.3.2"
@@ -95933,7 +95436,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.786.0" // {
+      (sources."aws-sdk-2.792.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -95952,7 +95455,7 @@ in
       })
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.4"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."base64id-2.0.0"
       sources."base64url-3.0.1"
       sources."basic-auth-1.1.0"
@@ -96073,7 +95576,7 @@ in
         dependencies = [
           sources."cookie-0.3.1"
           sources."debug-4.1.1"
-          sources."ws-7.3.1"
+          sources."ws-7.4.0"
         ];
       })
       (sources."engine.io-client-3.4.4" // {
@@ -96429,7 +95932,7 @@ in
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."requires-port-1.0.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."ret-0.2.2"
       sources."rethinkdb-2.4.2"
       sources."retry-0.9.0"
@@ -96729,9 +96232,9 @@ in
       sources."css-select-base-adapter-0.1.1"
       sources."css-tree-1.0.0-alpha.37"
       sources."css-what-3.4.2"
-      (sources."csso-4.1.0" // {
+      (sources."csso-4.1.1" // {
         dependencies = [
-          sources."css-tree-1.0.0"
+          sources."css-tree-1.0.1"
           sources."mdn-data-2.0.12"
         ];
       })
@@ -97369,7 +96872,7 @@ in
       sources."truncate-utf8-bytes-1.0.2"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.11.5"
+      sources."uglify-js-3.11.6"
       sources."undefsafe-2.0.3"
       (sources."union-value-1.0.1" // {
         dependencies = [
@@ -97764,7 +97267,7 @@ in
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
       sources."require-from-string-2.0.2"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.1.2"
       sources."semver-5.7.1"
@@ -97924,11 +97427,11 @@ in
       sources."@textlint/ast-node-types-4.3.4"
       sources."@textlint/types-1.4.5"
       sources."@types/hast-2.3.1"
-      sources."@types/minimist-1.2.0"
+      sources."@types/minimist-1.2.1"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse5-5.0.3"
       sources."@types/unist-2.0.3"
-      sources."alex-9.0.1"
+      sources."alex-9.1.0"
       (sources."ansi-align-3.0.0" // {
         dependencies = [
           sources."string-width-3.1.0"
@@ -98164,7 +97667,7 @@ in
       })
       sources."readable-stream-1.0.34"
       sources."redent-3.0.0"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."rehype-parse-7.0.1"
       sources."rehype-retext-2.0.4"
@@ -98176,11 +97679,11 @@ in
       sources."remark-stringify-8.1.1"
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-from-5.0.0"
       sources."responselike-1.0.2"
       sources."retext-english-3.0.4"
-      sources."retext-equality-5.2.0"
+      sources."retext-equality-5.5.0"
       sources."retext-profanities-6.1.0"
       sources."safe-buffer-5.2.1"
       sources."semver-5.7.1"
@@ -98723,7 +98226,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
@@ -99042,7 +98545,7 @@ in
       sources."readable-stream-3.6.0"
       sources."readable-web-to-node-stream-2.0.0"
       sources."regenerator-runtime-0.13.7"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       (sources."request-2.88.2" // {
         dependencies = [
@@ -99138,7 +98641,7 @@ in
       sources."wide-align-1.1.3"
       sources."with-open-file-0.1.7"
       sources."wrappy-1.0.2"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yallist-3.1.1"
       sources."yarn-1.22.4"
@@ -99641,10 +99144,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.11.5";
+    version = "3.11.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz";
-      sha512 = "btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w==";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.6.tgz";
+      sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -99687,7 +99190,7 @@ in
       sources."@primer/octicons-11.0.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."after-0.8.2"
@@ -99720,7 +99223,7 @@ in
         ];
       })
       sources."callsite-1.0.0"
-      sources."cliui-7.0.3"
+      sources."cliui-7.0.4"
       sources."clone-2.1.2"
       sources."clone-response-1.0.2"
       sources."color-3.0.0"
@@ -99892,7 +99395,7 @@ in
       sources."raw-body-2.4.0"
       sources."rc-1.2.8"
       sources."readable-stream-3.6.0"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."require-directory-2.1.1"
       sources."responselike-1.0.2"
@@ -99947,7 +99450,7 @@ in
       })
       sources."strip-ansi-6.0.0"
       sources."strip-json-comments-2.0.1"
-      (sources."temp-0.9.2" // {
+      (sources."temp-0.9.4" // {
         dependencies = [
           sources."mkdirp-0.5.5"
           sources."rimraf-2.6.3"
@@ -99975,12 +99478,12 @@ in
       })
       sources."wrap-ansi-7.0.0"
       sources."wrappy-1.0.2"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."y18n-5.0.5"
       sources."yallist-2.1.2"
-      sources."yargs-16.1.0"
-      sources."yargs-parser-20.2.3"
+      sources."yargs-16.1.1"
+      sources."yargs-parser-20.2.4"
       sources."yeast-0.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -100011,7 +99514,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."canvas-2.6.1"
       sources."chownr-1.1.4"
-      (sources."cliui-7.0.3" // {
+      (sources."cliui-7.0.4" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."is-fullwidth-code-point-3.0.0"
@@ -100096,7 +99599,7 @@ in
       sources."rc-1.2.8"
       sources."readable-stream-2.3.7"
       sources."require-directory-2.1.1"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."rimraf-2.7.1"
       sources."rw-1.3.3"
       sources."safe-buffer-5.1.2"
@@ -100156,7 +99659,7 @@ in
       sources."wrappy-1.0.2"
       sources."y18n-5.0.5"
       sources."yallist-3.1.1"
-      (sources."yargs-16.1.0" // {
+      (sources."yargs-16.1.1" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."is-fullwidth-code-point-3.0.0"
@@ -100164,7 +99667,7 @@ in
           sources."strip-ansi-6.0.0"
         ];
       })
-      sources."yargs-parser-20.2.3"
+      sources."yargs-parser-20.2.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -100190,7 +99693,7 @@ in
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."array-flat-polyfill-1.0.1"
-      sources."cliui-7.0.3"
+      sources."cliui-7.0.4"
       sources."clone-2.1.2"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
@@ -100211,7 +99714,7 @@ in
       sources."wrap-ansi-7.0.0"
       sources."y18n-5.0.5"
       sources."yargs-16.0.3"
-      sources."yargs-parser-20.2.3"
+      sources."yargs-parser-20.2.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -100424,7 +99927,7 @@ in
           sources."define-property-1.0.0"
         ];
       })
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."big.js-5.2.2"
       sources."binary-extensions-2.1.0"
       sources."bindings-1.5.0"
@@ -100438,11 +99941,7 @@ in
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
-      (sources."browserify-rsa-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."browserify-rsa-4.1.0"
       (sources."browserify-sign-4.2.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -101093,13 +100592,13 @@ in
       sources."vsce-1.81.1"
       sources."vscode-debugadapter-testsupport-1.42.0"
       sources."vscode-debugprotocol-1.42.0"
-      (sources."watchpack-1.7.4" // {
+      (sources."watchpack-1.7.5" // {
         dependencies = [
           sources."chokidar-3.4.3"
           sources."readdirp-3.5.0"
         ];
       })
-      (sources."watchpack-chokidar2-2.0.0" // {
+      (sources."watchpack-chokidar2-2.0.1" // {
         dependencies = [
           sources."anymatch-2.0.0"
           sources."binary-extensions-1.13.1"
@@ -101217,7 +100716,7 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bl-1.2.3"
       sources."bluebird-3.7.2"
@@ -101442,7 +100941,7 @@ in
       sources."tslib-1.14.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uglify-js-3.11.5"
+      sources."uglify-js-3.11.6"
       sources."uid-0.0.2"
       sources."unbzip2-stream-1.4.3"
       sources."unyield-0.0.1"
@@ -101501,7 +101000,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -101590,10 +101089,8 @@ in
       sources."camelcase-keys-4.2.0"
       sources."ccount-1.1.0"
       sources."chalk-2.4.2"
-      sources."character-entities-1.2.4"
       sources."character-entities-html4-1.1.4"
       sources."character-entities-legacy-1.1.4"
-      sources."character-reference-invalid-1.1.4"
       sources."chardet-0.7.0"
       (sources."chokidar-3.0.2" // {
         dependencies = [
@@ -101921,7 +101418,6 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      sources."longest-streak-1.0.0"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.5"
@@ -101930,7 +101426,6 @@ in
       sources."map-cache-0.2.2"
       sources."map-obj-2.0.0"
       sources."map-visit-1.0.0"
-      sources."markdown-table-0.4.0"
       (sources."mem-4.3.0" // {
         dependencies = [
           sources."mimic-fn-2.1.0"
@@ -102010,7 +101505,6 @@ in
         ];
       })
       sources."parent-module-1.0.1"
-      sources."parse-entities-1.2.2"
       sources."parse-gitignore-1.0.1"
       sources."parse-json-4.0.0"
       sources."pascalcase-0.1.1"
@@ -102095,21 +101589,9 @@ in
       sources."regenerator-runtime-0.11.1"
       sources."regex-not-1.0.2"
       sources."regexpp-2.0.1"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."rehype-sort-attribute-values-2.0.1"
-      (sources."remark-5.1.0" // {
-        dependencies = [
-          sources."unified-4.2.1"
-          sources."vfile-1.4.0"
-        ];
-      })
-      sources."remark-parse-1.1.0"
-      (sources."remark-stringify-1.1.0" // {
-        dependencies = [
-          sources."stringify-entities-1.3.2"
-        ];
-      })
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
@@ -102121,7 +101603,7 @@ in
           sources."resolve-from-1.0.1"
         ];
       })
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-from-5.0.0"
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
@@ -102282,9 +101764,7 @@ in
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
       sources."to-vfile-6.1.0"
-      sources."trim-0.0.1"
       sources."trim-newlines-2.0.0"
-      sources."trim-trailing-lines-1.1.4"
       sources."trough-1.0.5"
       sources."tslib-1.14.1"
       sources."tslint-5.20.1"
@@ -102298,7 +101778,6 @@ in
           sources."semver-5.5.0"
         ];
       })
-      sources."unherit-1.1.3"
       (sources."unified-7.1.0" // {
         dependencies = [
           sources."unist-util-stringify-position-1.1.2"
@@ -102321,11 +101800,10 @@ in
       })
       sources."union-value-1.0.1"
       sources."unique-string-1.0.0"
-      sources."unist-util-find-1.0.1"
+      sources."unist-util-find-1.0.2"
       sources."unist-util-inspect-4.1.4"
       sources."unist-util-is-2.1.3"
       sources."unist-util-modify-children-1.1.6"
-      sources."unist-util-remove-position-1.1.4"
       sources."unist-util-stringify-position-2.0.3"
       sources."unist-util-visit-1.4.1"
       (sources."unist-util-visit-parents-2.1.2" // {
@@ -102353,7 +101831,6 @@ in
       sources."util-deprecate-1.0.2"
       sources."validate-npm-package-license-3.0.4"
       sources."vfile-4.2.0"
-      sources."vfile-location-2.0.6"
       sources."vfile-message-2.0.4"
       (sources."vfile-reporter-6.0.1" // {
         dependencies = [
@@ -102465,7 +101942,7 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."JSONSelect-0.2.1"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
@@ -102521,7 +101998,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-extensions-2.1.0"
       sources."bindings-1.5.0"
@@ -103110,7 +102587,7 @@ in
         ];
       })
       sources."regexpp-3.1.0"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       (sources."relaxed-json-1.0.3" // {
         dependencies = [
@@ -103304,7 +102781,7 @@ in
       sources."v8-compile-cache-2.2.0"
       sources."verror-1.10.0"
       sources."watchpack-1.7.4"
-      (sources."watchpack-chokidar2-2.0.0" // {
+      (sources."watchpack-chokidar2-2.0.1" // {
         dependencies = [
           sources."anymatch-2.0.0"
           sources."binary-extensions-1.13.1"
@@ -103409,11 +102886,11 @@ in
       sha512 = "udpYTyqz8toTTdaOsL2QKPLeZLt2IEm9qY7yTXuFEQhKu5bk0yQD9BtAdVQksmz4jFbbWOiWmm3NHarO0zr/ng==";
     };
     dependencies = [
-      sources."@types/eslint-7.2.4"
+      sources."@types/eslint-7.2.5"
       sources."@types/eslint-scope-3.7.0"
       sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
       sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -103437,12 +102914,13 @@ in
       sources."acorn-8.0.4"
       sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
-      sources."browserslist-4.14.6"
+      sources."browserslist-4.14.7"
       sources."buffer-from-1.1.1"
-      sources."caniuse-lite-1.0.30001156"
+      sources."caniuse-lite-1.0.30001158"
       sources."chrome-trace-event-1.0.2"
+      sources."colorette-1.2.1"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.589"
+      sources."electron-to-chromium-1.3.596"
       sources."enhanced-resolve-5.3.1"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"
@@ -103468,7 +102946,7 @@ in
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
       sources."neo-async-2.6.2"
-      sources."node-releases-1.1.65"
+      sources."node-releases-1.1.66"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
@@ -103483,8 +102961,8 @@ in
       sources."source-map-0.6.1"
       sources."source-map-support-0.5.19"
       sources."supports-color-7.2.0"
-      sources."tapable-2.0.0"
-      (sources."terser-5.3.8" // {
+      sources."tapable-2.1.1"
+      (sources."terser-5.4.0" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -103527,7 +103005,7 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."colorette-1.2.1"
-      sources."command-line-usage-6.1.0"
+      sources."command-line-usage-6.1.1"
       sources."commander-6.2.0"
       sources."cross-spawn-7.0.3"
       sources."deep-extend-0.6.0"
@@ -103565,7 +103043,7 @@ in
       sources."pump-3.0.0"
       sources."rechoir-0.7.0"
       sources."reduce-flatten-2.0.0"
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-cwd-3.0.0"
       sources."resolve-from-5.0.0"
       sources."shebang-command-2.0.0"
@@ -103602,7 +103080,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
       sources."ajv-errors-1.0.1"
@@ -104188,10 +103666,10 @@ in
   copy-webpack-plugin = nodeEnv.buildNodePackage {
     name = "copy-webpack-plugin";
     packageName = "copy-webpack-plugin";
-    version = "6.3.0";
+    version = "6.3.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.0.tgz";
-      sha512 = "kQ2cGGQLO6Ov2fe7rEGVxObI17dPeFkv8bRGnUAGZehOcrrObyAR9yWYlFGlJsyWM4EeuC/ytQNQkXxjYotMzg==";
+      url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.1.tgz";
+      sha512 = "SyIMdP6H3v+zPU+VIhKRsK0ZEF82KZ93JBlKOoIW8SkkuI84FSrHxG+aMTE1u4csbi9PLRqqWTIK+bfJ2xsFuQ==";
     };
     dependencies = [
       sources."@nodelib/fs.scandir-2.1.3"
@@ -104302,10 +103780,10 @@ in
   webtorrent-cli = nodeEnv.buildNodePackage {
     name = "webtorrent-cli";
     packageName = "webtorrent-cli";
-    version = "3.0.7";
+    version = "3.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.0.7.tgz";
-      sha512 = "7psSgPvy+nL4hQ8zIv1RW1pdFZVrxB6jHnIEwmDU6xP6zst/t5pgerrdnZerzgQBzlGjpRQQ9fQtZoHxK7zgtw==";
+      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.2.0.tgz";
+      sha512 = "7XNNVzaGIoUuPouqLYNji+59kmNZSqeN0uqla4Z/i0x5XqlhocRGcm7gfhvBLXShyVcxyveUNjTOz3Z5NTTQTg==";
     };
     dependencies = [
       sources."@protobufjs/aspromise-1.1.2"
@@ -104323,6 +103801,7 @@ in
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
       sources."balanced-match-1.0.0"
+      sources."base64-js-1.5.1"
       sources."bencode-2.0.1"
       sources."bep53-range-1.0.0"
       sources."binary-search-1.3.6"
@@ -104333,7 +103812,7 @@ in
           sources."ms-2.1.2"
         ];
       })
-      (sources."bittorrent-lsd-1.0.0" // {
+      (sources."bittorrent-lsd-1.1.0" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."ms-2.1.2"
@@ -104361,6 +103840,7 @@ in
       sources."bn.js-5.1.3"
       sources."brace-expansion-1.1.11"
       sources."browserify-package-json-1.0.1"
+      sources."buffer-6.0.2"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-fill-1.0.0"
@@ -104427,6 +103907,7 @@ in
       sources."he-1.2.0"
       sources."http-node-git://github.com/feross/http-node#webtorrent"
       sources."http-parser-js-0.4.13"
+      sources."ieee754-1.2.1"
       sources."immediate-chunk-store-2.1.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -104529,7 +104010,7 @@ in
       sources."semver-5.1.1"
       sources."simple-concat-1.0.1"
       sources."simple-get-2.8.1"
-      (sources."simple-peer-9.8.0" // {
+      (sources."simple-peer-9.9.3" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."ms-2.1.2"
@@ -104584,23 +104065,23 @@ in
       sources."utf-8-validate-5.0.3"
       sources."util-deprecate-1.0.2"
       sources."utp-native-2.2.1"
-      sources."videostream-3.2.1"
+      sources."videostream-3.2.2"
       sources."vlc-command-1.2.0"
       (sources."webtorrent-0.110.1" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."decompress-response-6.0.0"
           sources."get-stdin-8.0.0"
-          sources."magnet-uri-6.0.0"
+          sources."magnet-uri-6.1.0"
           sources."mimic-response-3.1.0"
           sources."ms-2.1.2"
-          sources."parse-torrent-9.0.0"
+          sources."parse-torrent-9.1.0"
           sources."simple-get-4.0.0"
         ];
       })
       sources."winreg-1.2.4"
       sources."wrappy-1.0.2"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
       sources."xmldom-0.1.31"
@@ -104750,7 +104231,7 @@ in
       sources."@sindresorhus/is-0.7.0"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.6"
+      sources."@types/node-14.14.7"
       sources."@types/normalize-package-data-2.4.0"
       sources."JSONStream-1.3.5"
       sources."aggregate-error-3.1.0"
@@ -105342,7 +104823,7 @@ in
           sources."tough-cookie-2.5.0"
         ];
       })
-      sources."resolve-1.18.1"
+      sources."resolve-1.19.0"
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
@@ -105524,7 +105005,7 @@ in
       sources."tunnel-0.0.6"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."twig-1.15.2"
+      sources."twig-1.15.3"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
       sources."union-value-1.0.1"

From 4180533bbfaee6e802c35fe34cf7803acf8beae3 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 16 Nov 2020 19:22:59 +0100
Subject: [PATCH 2620/3942] gammastep: 2.0.2 -> 2.0.5

---
 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 86c787df62aa..a450b2e3eb77 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -127,13 +127,13 @@ rec {
 
   gammastep = mkRedshift rec {
     pname = "gammastep";
-    version = "2.0.2";
+    version = "2.0.5";
 
     src = fetchFromGitLab {
       owner = "chinstrap";
       repo = pname;
       rev = "v${version}";
-      sha256 = "09wqlz3yya955galhs20014qfwm2yk0lxhyqdsw8gwddvcpyprzg";
+      sha256 = "1l3x4gnichwzbb0529bhm723xpryn5svhhsfdiwlw122q1vmz2q7";
     };
 
     meta = redshift.meta // {

From 1e1eb0eb446ea7aa6abd5e90a7c2d61f8f896537 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 16 Nov 2020 19:32:00 +0100
Subject: [PATCH 2621/3942] gpgme: 1.14.0 -> 1.15.0 (#103919)

---
 pkgs/development/libraries/gpgme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index ed07d8ba0580..067d62a11a27 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -14,11 +14,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gpgme";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2";
-    sha256 = "01s3rlspykbm9vmi5rfbdm3d20ip6yni69r48idqzlmhlq8ggwff";
+    sha256 = "0nqfipv5s4npfidsm1rs3kpq0r0av9bfqfd5r035jibx5k0jniqb";
   };
 
   patches = [

From f909429a9a2ad46f0fdf3007edb1cc7391bbea8c Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 16 Nov 2020 19:50:36 +0100
Subject: [PATCH 2622/3942] lz4: 1.9.2 -> 1.9.3

---
 pkgs/tools/compression/lz4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 6bc365b8e1e1..0124a0b3d63b 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   pname = "lz4";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
-    sha256 = "0lpaypmk70ag2ks3kf2dl4ac3ba40n5kc1ainkp9wfjawz76mh61";
+    sha256 = "1w02kazh1fps3sji2sn89fz862j1199c5ajrqcgl1bnlxj09kcbz";
     rev = "v${version}";
     repo = pname;
     owner = pname;

From 0338f728c01329427c407ccd0bf6e527eee2358c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 16 Nov 2020 13:59:36 -0500
Subject: [PATCH 2623/3942] nano: Add test

---
 nixos/release-combined.nix                 |  1 +
 nixos/tests/all-tests.nix                  |  1 +
 nixos/tests/nano.nix                       | 44 ++++++++++++++++++++++
 pkgs/applications/editors/nano/default.nix |  8 ++--
 4 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 nixos/tests/nano.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 384ae5765b8c..d8b9a5f9b4bc 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -97,6 +97,7 @@ in rec {
         (onFullSupported "nixos.tests.login")
         (onFullSupported "nixos.tests.misc")
         (onFullSupported "nixos.tests.mutableUsers")
+        (onFullSupported "nixos.tests.nano")
         (onFullSupported "nixos.tests.nat.firewall-conntrack")
         (onFullSupported "nixos.tests.nat.firewall")
         (onFullSupported "nixos.tests.nat.standalone")
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 868f15a1da37..485b298662be 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -225,6 +225,7 @@ in
   mysql-backup = handleTest ./mysql/mysql-backup.nix {};
   mysql-replication = handleTest ./mysql/mysql-replication.nix {};
   nagios = handleTest ./nagios.nix {};
+  nano = handleTest ./nano.nix {};
   nar-serve = handleTest ./nar-serve.nix {};
   nat.firewall = handleTest ./nat.nix { withFirewall = true; };
   nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; };
diff --git a/nixos/tests/nano.nix b/nixos/tests/nano.nix
new file mode 100644
index 000000000000..9e0a9e147f2c
--- /dev/null
+++ b/nixos/tests/nano.nix
@@ -0,0 +1,44 @@
+import ./make-test-python.nix ({ pkgs, ...} : {
+  name = "nano";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  machine = { lib, ... }: {
+    environment.systemPackages = [ pkgs.nano ];
+  };
+
+  testScript = { ... }: ''
+    start_all()
+
+    with subtest("Create user and log in"):
+        machine.wait_for_unit("multi-user.target")
+        machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
+        machine.succeed("useradd -m alice")
+        machine.succeed("(echo foobar; echo foobar) | passwd alice")
+        machine.wait_until_tty_matches(1, "login: ")
+        machine.send_chars("alice\n")
+        machine.wait_until_tty_matches(1, "login: alice")
+        machine.wait_until_succeeds("pgrep login")
+        machine.wait_until_tty_matches(1, "Password: ")
+        machine.send_chars("foobar\n")
+        machine.wait_until_succeeds("pgrep -u alice bash")
+        machine.screenshot("prompt")
+
+    with subtest("Use nano"):
+        machine.send_chars("nano /tmp/foo")
+        machine.send_key("ret")
+        machine.sleep(2)
+        machine.send_chars("42")
+        machine.sleep(1)
+        machine.send_key("ctrl-x")
+        machine.sleep(1)
+        machine.send_key("y")
+        machine.sleep(1)
+        machine.screenshot("nano")
+        machine.sleep(1)
+        machine.send_key("ret")
+        machine.wait_for_file("/tmp/foo")
+        assert "42" in machine.succeed("cat /tmp/foo")
+  '';
+})
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 63b849f06f99..04bd6c7b4b8b 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript
-, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, gettext ? null
-, enableNls ? true, enableTiny ? false }:
+, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, nixosTests
+, gettext ? null, enableNls ? true, enableTiny ? false }:
 
 assert enableNls -> (gettext != null);
 
@@ -41,6 +41,8 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru = {
+    tests = { inherit (nixosTests) nano; };
+
     updateScript = writeScript "update.sh" ''
       #!${stdenv.shell}
       set -o errexit
@@ -73,7 +75,7 @@ in stdenv.mkDerivation rec {
     homepage = "https://www.nano-editor.org/";
     description = "A small, user-friendly console text editor";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ joachifm ];
+    maintainers = with maintainers; [ joachifm nequissimus ];
     platforms = platforms.all;
   };
 }

From 0f322400ea579452a10e524aa72f034172fbf9db Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 5 May 2020 13:03:56 -0400
Subject: [PATCH 2624/3942] nvidia_x11: fix vulkan icd filename

---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index dbe18ace40a2..5baa4aa51e59 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -84,8 +84,14 @@ installPhase() {
             else
                 sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_icd.json > nvidia_icd.json.fixed
             fi
-            install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia.json
+
+            if [ "$system" = "i686-linux" ]; then
+                install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.i686.json
+            else
+                install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.json
+            fi
         fi
+
         if [ -e nvidia_layers.json ]; then
             sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_layers.json > nvidia_layers.json.fixed
             install -Dm644 nvidia_layers.json.fixed $i/share/vulkan/implicit_layer.d/nvidia_layers.json

From 65e0474c7ab0a937f174daf0083198f4e9e924dd Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Mon, 16 Nov 2020 21:49:15 +0200
Subject: [PATCH 2625/3942] pijul: 1.0.0-alpha.1 -> 1.0.0-alpha.3

---
 pkgs/applications/version-management/pijul/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index f62d3982b59e..43890c92039a 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pijul";
-  version = "1.0.0-alpha.1";
+  version = "1.0.0-alpha.3";
 
   src = fetchCrate {
     inherit version pname;
-    sha256 = "113j7f6l9yvgm3x65p268940hk2svspg0n63lg0dpp8hakk3mslq";
+    sha256 = "0bz38vvzjrplb2mgcypg2p4kq33v6m58yivg15s2ghr7ly9k5ybx";
   };
 
-  cargoSha256 = "0lciyhh4yv2z9aii0xph8sird4f9624pk9hynx7441hwjjdmgy59";
+  cargoSha256 = "0p9djvdjzyjzsn3fyw6f74fix39s3y92246cgzcqhc1qlwwz67rl";
 
   cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";
   LIBCLANG_PATH = "${libclang}/lib";

From b320df0d5b7ea1521d9e09abde3fd4b7a7f96b88 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 16 Nov 2020 19:54:39 +0000
Subject: [PATCH 2626/3942] deno: 1.5.2 -> 1.5.3

---
 pkgs/development/web/deno/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 5fe6eb0575d9..8f7452fc6d66 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "deno";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0dpx74zp85a3qcabfmwnsh1kl0c74ygafybqzmyvwjmax0hdgkq6";
+    sha256 = "0dxjcab10kqfkflq1x9np5wxlysq33swdwi2f28bi7q312sw5x2y";
     fetchSubmodules = true;
   };
-  cargoSha256 = "0358vbpda9x0ib0vla4crn052lk299x2hg14g8lzymg33277lk3p";
+  cargoSha256 = "0lhdrsvmf5b4fq2yg9vc00q1sgc1fjk0fh5axs2zffcpsp73ay2k";
 
   # Install completions post-install
   nativeBuildInputs = [ installShellFiles ];

From 47f8d830c5703108c1bf58c1205009e4d77961af Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Mon, 16 Nov 2020 21:16:36 +0100
Subject: [PATCH 2627/3942] 
 elmPackages.{elm-language-server,create-elm-app,elm-optimize-level-2}: update

---
 .../compilers/elm/packages/node-packages.nix  | 888 +++++++-----------
 1 file changed, 332 insertions(+), 556 deletions(-)

diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix
index 58c9b9a4e918..2685871df0fa 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/pkgs/development/compilers/elm/packages/node-packages.nix
@@ -31,13 +31,13 @@ let
         sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
       };
     };
-    "@babel/compat-data-7.12.1" = {
+    "@babel/compat-data-7.12.5" = {
       name = "_at_babel_slash_compat-data";
       packageName = "@babel/compat-data";
-      version = "7.12.1";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz";
-        sha512 = "725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ==";
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz";
+        sha512 = "DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==";
       };
     };
     "@babel/core-7.12.3" = {
@@ -49,13 +49,13 @@ let
         sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==";
       };
     };
-    "@babel/generator-7.12.1" = {
+    "@babel/generator-7.12.5" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.12.1";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz";
-        sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz";
+        sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==";
       };
     };
     "@babel/helper-annotate-as-pure-7.10.4" = {
@@ -76,13 +76,13 @@ let
         sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==";
       };
     };
-    "@babel/helper-compilation-targets-7.12.1" = {
+    "@babel/helper-compilation-targets-7.12.5" = {
       name = "_at_babel_slash_helper-compilation-targets";
       packageName = "@babel/helper-compilation-targets";
-      version = "7.12.1";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz";
-        sha512 = "jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g==";
+        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz";
+        sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==";
       };
     };
     "@babel/helper-create-class-features-plugin-7.12.1" = {
@@ -157,13 +157,13 @@ let
         sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==";
       };
     };
-    "@babel/helper-module-imports-7.12.1" = {
+    "@babel/helper-module-imports-7.12.5" = {
       name = "_at_babel_slash_helper-module-imports";
       packageName = "@babel/helper-module-imports";
-      version = "7.12.1";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz";
-        sha512 = "ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==";
+        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz";
+        sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==";
       };
     };
     "@babel/helper-module-transforms-7.12.1" = {
@@ -211,13 +211,13 @@ let
         sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==";
       };
     };
-    "@babel/helper-replace-supers-7.12.1" = {
+    "@babel/helper-replace-supers-7.12.5" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
-      version = "7.12.1";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz";
-        sha512 = "zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==";
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz";
+        sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==";
       };
     };
     "@babel/helper-simple-access-7.12.1" = {
@@ -274,13 +274,13 @@ let
         sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==";
       };
     };
-    "@babel/helpers-7.12.1" = {
+    "@babel/helpers-7.12.5" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.12.1";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz";
-        sha512 = "9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz";
+        sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==";
       };
     };
     "@babel/highlight-7.10.4" = {
@@ -292,13 +292,13 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.12.3" = {
+    "@babel/parser-7.12.5" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.12.3";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz";
-        sha512 = "kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz";
+        sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==";
       };
     };
     "@babel/plugin-proposal-async-generator-functions-7.12.1" = {
@@ -364,13 +364,13 @@ let
         sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==";
       };
     };
-    "@babel/plugin-proposal-numeric-separator-7.12.1" = {
+    "@babel/plugin-proposal-numeric-separator-7.12.5" = {
       name = "_at_babel_slash_plugin-proposal-numeric-separator";
       packageName = "@babel/plugin-proposal-numeric-separator";
-      version = "7.12.1";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz";
-        sha512 = "MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz";
+        sha512 = "UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==";
       };
     };
     "@babel/plugin-proposal-object-rest-spread-7.12.1" = {
@@ -841,13 +841,13 @@ let
         sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==";
       };
     };
-    "@babel/runtime-7.12.1" = {
+    "@babel/runtime-7.12.5" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
-      version = "7.12.1";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz";
-        sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz";
+        sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==";
       };
     };
     "@babel/template-7.10.4" = {
@@ -859,22 +859,22 @@ let
         sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==";
       };
     };
-    "@babel/traverse-7.12.1" = {
+    "@babel/traverse-7.12.5" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.12.1";
+      version = "7.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz";
-        sha512 = "MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz";
+        sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==";
       };
     };
-    "@babel/types-7.12.1" = {
+    "@babel/types-7.12.6" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.12.1";
+      version = "7.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz";
-        sha512 = "BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz";
+        sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==";
       };
     };
     "@hapi/address-2.1.4" = {
@@ -922,24 +922,6 @@ let
         sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==";
       };
     };
-    "@jest/types-25.5.0" = {
-      name = "_at_jest_slash_types";
-      packageName = "@jest/types";
-      version = "25.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz";
-        sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==";
-      };
-    };
-    "@jest/types-26.6.0" = {
-      name = "_at_jest_slash_types";
-      packageName = "@jest/types";
-      version = "26.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@jest/types/-/types-26.6.0.tgz";
-        sha512 = "8pDeq/JVyAYw7jBGU83v8RMYAkdrRxLG3BGnAJuqaQAUd6GWBmND2uyl+awI88+hit48suLoLjNFtR+ZXxWaYg==";
-      };
-    };
     "@mrmlnc/readdir-enhanced-2.2.1" = {
       name = "_at_mrmlnc_slash_readdir-enhanced";
       packageName = "@mrmlnc/readdir-enhanced";
@@ -1075,51 +1057,6 @@ let
         sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==";
       };
     };
-    "@types/istanbul-lib-coverage-2.0.3" = {
-      name = "_at_types_slash_istanbul-lib-coverage";
-      packageName = "@types/istanbul-lib-coverage";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz";
-        sha512 = "sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==";
-      };
-    };
-    "@types/istanbul-lib-report-3.0.0" = {
-      name = "_at_types_slash_istanbul-lib-report";
-      packageName = "@types/istanbul-lib-report";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz";
-        sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==";
-      };
-    };
-    "@types/istanbul-reports-1.1.2" = {
-      name = "_at_types_slash_istanbul-reports";
-      packageName = "@types/istanbul-reports";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz";
-        sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==";
-      };
-    };
-    "@types/istanbul-reports-3.0.0" = {
-      name = "_at_types_slash_istanbul-reports";
-      packageName = "@types/istanbul-reports";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz";
-        sha512 = "nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==";
-      };
-    };
-    "@types/jest-26.0.14" = {
-      name = "_at_types_slash_jest";
-      packageName = "@types/jest";
-      version = "26.0.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz";
-        sha512 = "Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg==";
-      };
-    };
     "@types/json-schema-7.0.6" = {
       name = "_at_types_slash_json-schema";
       packageName = "@types/json-schema";
@@ -1147,13 +1084,13 @@ let
         sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
       };
     };
-    "@types/node-14.11.10" = {
+    "@types/node-14.14.7" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.11.10";
+      version = "14.14.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.11.10.tgz";
-        sha512 = "yV1nWZPlMFpoXyoknm4S56y2nlTAuFYaJuQtYRAOU7xA/FJ9RY0Xm7QOkaYMMmr8ESdHIuUb6oQgR/0+2NqlyA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz";
+        sha512 = "Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==";
       };
     };
     "@types/parse-json-4.0.0" = {
@@ -1201,22 +1138,22 @@ let
         sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==";
       };
     };
-    "@types/uglify-js-3.11.0" = {
+    "@types/uglify-js-3.11.1" = {
       name = "_at_types_slash_uglify-js";
       packageName = "@types/uglify-js";
-      version = "3.11.0";
+      version = "3.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.0.tgz";
-        sha512 = "I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q==";
+        url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz";
+        sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q==";
       };
     };
-    "@types/webpack-4.41.22" = {
+    "@types/webpack-4.41.25" = {
       name = "_at_types_slash_webpack";
       packageName = "@types/webpack";
-      version = "4.41.22";
+      version = "4.41.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.22.tgz";
-        sha512 = "JQDJK6pj8OMV9gWOnN1dcLCyU9Hzs6lux0wBO4lr1+gyEhIBR9U3FMrz12t2GPkg110XAxEAw2WHF6g7nZIbRQ==";
+        url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz";
+        sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==";
       };
     };
     "@types/webpack-sources-2.0.0" = {
@@ -1228,24 +1165,6 @@ let
         sha512 = "a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==";
       };
     };
-    "@types/yargs-15.0.9" = {
-      name = "_at_types_slash_yargs";
-      packageName = "@types/yargs";
-      version = "15.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz";
-        sha512 = "HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g==";
-      };
-    };
-    "@types/yargs-parser-15.0.0" = {
-      name = "_at_types_slash_yargs-parser";
-      packageName = "@types/yargs-parser";
-      version = "15.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz";
-        sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==";
-      };
-    };
     "@webassemblyjs/ast-1.9.0" = {
       name = "_at_webassemblyjs_slash_ast";
       packageName = "@webassemblyjs/ast";
@@ -1867,13 +1786,13 @@ let
         sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==";
       };
     };
-    "autoprefixer-10.0.1" = {
+    "autoprefixer-10.0.2" = {
       name = "autoprefixer";
       packageName = "autoprefixer";
-      version = "10.0.1";
+      version = "10.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.1.tgz";
-        sha512 = "aQo2BDIsoOdemXUAOBpFv4ZQa2DrOtEufarYhtFsK1088Ca0TUwu/aQWf0M3mrILXZ3mTIVn1lR3hPW8acacsw==";
+        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.2.tgz";
+        sha512 = "okBmu9OMdt6DNEcZmnl0IYVv8Xl/xYWRSnc2OJ9UJEOt1u30opG1B8aLsViqKryBaYv1SKB4f85fOGZs5zYxHQ==";
       };
     };
     "aws-sign2-0.7.0" = {
@@ -1885,13 +1804,13 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.10.1" = {
+    "aws4-1.11.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.10.1";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz";
-        sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz";
+        sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
       };
     };
     "babel-extract-comments-1.0.0" = {
@@ -1903,13 +1822,13 @@ let
         sha512 = "qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ==";
       };
     };
-    "babel-loader-8.1.0" = {
+    "babel-loader-8.2.1" = {
       name = "babel-loader";
       packageName = "babel-loader";
-      version = "8.1.0";
+      version = "8.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz";
-        sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==";
+        url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.1.tgz";
+        sha512 = "dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==";
       };
     };
     "babel-plugin-dynamic-import-node-2.3.3" = {
@@ -1984,13 +1903,13 @@ let
         sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==";
       };
     };
-    "base64-js-1.3.1" = {
+    "base64-js-1.5.1" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.3.1";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
-        sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz";
+        sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==";
       };
     };
     "batch-0.6.1" = {
@@ -2200,13 +2119,13 @@ let
         sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==";
       };
     };
-    "browserify-rsa-4.0.1" = {
+    "browserify-rsa-4.1.0" = {
       name = "browserify-rsa";
       packageName = "browserify-rsa";
-      version = "4.0.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
-        sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
+        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz";
+        sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==";
       };
     };
     "browserify-sign-4.2.1" = {
@@ -2236,22 +2155,13 @@ let
         sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q==";
       };
     };
-    "browserslist-4.14.5" = {
+    "browserslist-4.14.7" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.14.5";
+      version = "4.14.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz";
-        sha512 = "Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==";
-      };
-    };
-    "bs-logger-0.2.6" = {
-      name = "bs-logger";
-      packageName = "bs-logger";
-      version = "0.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz";
-        sha512 = "pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz";
+        sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==";
       };
     };
     "buffer-4.9.2" = {
@@ -2380,6 +2290,15 @@ let
         sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==";
       };
     };
+    "call-bind-1.0.0" = {
+      name = "call-bind";
+      packageName = "call-bind";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz";
+        sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==";
+      };
+    };
     "call-me-maybe-1.0.1" = {
       name = "call-me-maybe";
       packageName = "call-me-maybe";
@@ -2452,13 +2371,13 @@ let
         sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
       };
     };
-    "camelcase-6.1.0" = {
+    "camelcase-6.2.0" = {
       name = "camelcase";
       packageName = "camelcase";
-      version = "6.1.0";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz";
-        sha512 = "WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ==";
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz";
+        sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==";
       };
     };
     "caniuse-api-3.0.0" = {
@@ -2470,13 +2389,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001148" = {
+    "caniuse-lite-1.0.30001158" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001148";
+      version = "1.0.30001158";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz";
-        sha512 = "E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001158.tgz";
+        sha512 = "s5loVYY+yKpuVA3HyW8BarzrtJvwHReuzugQXlv1iR3LKSReoFXRm86mT6hT7PEF5RxW+XQZg+6nYjlywYzQ+g==";
       };
     };
     "case-sensitive-paths-webpack-plugin-2.3.0" = {
@@ -2632,15 +2551,6 @@ let
         sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==";
       };
     };
-    "ci-info-2.0.0" = {
-      name = "ci-info";
-      packageName = "ci-info";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz";
-        sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==";
-      };
-    };
     "cipher-base-1.0.4" = {
       name = "cipher-base";
       packageName = "cipher-base";
@@ -2893,13 +2803,13 @@ let
         sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==";
       };
     };
-    "commander-6.1.0" = {
+    "commander-6.2.0" = {
       name = "commander";
       packageName = "commander";
-      version = "6.1.0";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz";
-        sha512 = "wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==";
+        url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz";
+        sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==";
       };
     };
     "common-tags-1.8.0" = {
@@ -3118,13 +3028,13 @@ let
         sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==";
       };
     };
-    "core-js-compat-3.6.5" = {
+    "core-js-compat-3.7.0" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.6.5";
+      version = "3.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz";
-        sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz";
+        sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -3316,13 +3226,13 @@ let
         sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==";
       };
     };
-    "css-tree-1.0.0-alpha.39" = {
+    "css-tree-1.0.1" = {
       name = "css-tree";
       packageName = "css-tree";
-      version = "1.0.0-alpha.39";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz";
-        sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==";
+        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.1.tgz";
+        sha512 = "WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA==";
       };
     };
     "css-what-2.1.3" = {
@@ -3406,13 +3316,13 @@ let
         sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==";
       };
     };
-    "csso-4.0.3" = {
+    "csso-4.1.1" = {
       name = "csso";
       packageName = "csso";
-      version = "4.0.3";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz";
-        sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==";
+        url = "https://registry.npmjs.org/csso/-/csso-4.1.1.tgz";
+        sha512 = "Rvq+e1e0TFB8E8X+8MQjHSY6vtol45s5gxtLI/018UsAn2IBMmwNEZRM/h+HVnAJRHjasLIKKUO3uvoMM28LvA==";
       };
     };
     "cycle-1.0.3" = {
@@ -3667,15 +3577,6 @@ let
         sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==";
       };
     };
-    "diff-sequences-25.2.6" = {
-      name = "diff-sequences";
-      packageName = "diff-sequences";
-      version = "25.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz";
-        sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==";
-      };
-    };
     "diffie-hellman-5.0.3" = {
       name = "diffie-hellman";
       packageName = "diffie-hellman";
@@ -3874,13 +3775,13 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
-    "electron-to-chromium-1.3.582" = {
+    "electron-to-chromium-1.3.596" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.582";
+      version = "1.3.596";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.582.tgz";
-        sha512 = "0nCJ7cSqnkMC+kUuPs0YgklFHraWGl/xHqtZWWtOeVtyi+YqkoAOMGuZQad43DscXCQI/yizcTa3u6B5r+BLww==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz";
+        sha512 = "nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg==";
       };
     };
     "elliptic-6.5.3" = {
@@ -4307,13 +4208,13 @@ let
         sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
       };
     };
-    "execa-4.0.3" = {
+    "execa-4.1.0" = {
       name = "execa";
       packageName = "execa";
-      version = "4.0.3";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz";
-        sha512 = "WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==";
+        url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz";
+        sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==";
       };
     };
     "expand-brackets-2.1.4" = {
@@ -4478,13 +4379,13 @@ let
         sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
       };
     };
-    "fastq-1.8.0" = {
+    "fastq-1.9.0" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.8.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz";
-        sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz";
+        sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==";
       };
     };
     "faye-websocket-0.10.0" = {
@@ -4523,13 +4424,13 @@ let
         sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
       };
     };
-    "file-loader-6.1.1" = {
+    "file-loader-6.2.0" = {
       name = "file-loader";
       packageName = "file-loader";
-      version = "6.1.1";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/file-loader/-/file-loader-6.1.1.tgz";
-        sha512 = "Klt8C4BjWSXYQAfhpYYkG4qHNTna4toMHEbWrI5IuVoxbU6uiDKeKAP99R8mmbJi3lvewn/jQBOgU4+NS3tDQw==";
+        url = "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz";
+        sha512 = "qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==";
       };
     };
     "file-uri-to-path-1.0.0" = {
@@ -4901,6 +4802,15 @@ let
         sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==";
       };
     };
+    "fsevents-2.2.1" = {
+      name = "fsevents";
+      packageName = "fsevents";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.1.tgz";
+        sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA==";
+      };
+    };
     "function-bind-1.1.1" = {
       name = "function-bind";
       packageName = "function-bind";
@@ -4910,13 +4820,13 @@ let
         sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
       };
     };
-    "gensync-1.0.0-beta.1" = {
+    "gensync-1.0.0-beta.2" = {
       name = "gensync";
       packageName = "gensync";
-      version = "1.0.0-beta.1";
+      version = "1.0.0-beta.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz";
-        sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==";
+        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz";
+        sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
       };
     };
     "get-caller-file-1.0.3" = {
@@ -4937,6 +4847,15 @@ let
         sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
       };
     };
+    "get-intrinsic-1.0.1" = {
+      name = "get-intrinsic";
+      packageName = "get-intrinsic";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz";
+        sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==";
+      };
+    };
     "get-own-enumerable-property-symbols-3.0.2" = {
       name = "get-own-enumerable-property-symbols";
       packageName = "get-own-enumerable-property-symbols";
@@ -5558,13 +5477,13 @@ let
         sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==";
       };
     };
-    "ieee754-1.1.13" = {
+    "ieee754-1.2.1" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.1.13";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz";
-        sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz";
+        sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==";
       };
     };
     "iferr-0.1.5" = {
@@ -5612,13 +5531,13 @@ let
         sha1 = "d81355c15612d386c61f9ddd3922d4304822a546";
       };
     };
-    "import-fresh-3.2.1" = {
+    "import-fresh-3.2.2" = {
       name = "import-fresh";
       packageName = "import-fresh";
-      version = "3.2.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz";
-        sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==";
+        url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz";
+        sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==";
       };
     };
     "import-local-2.0.0" = {
@@ -5855,15 +5774,6 @@ let
         sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
       };
     };
-    "is-ci-2.0.0" = {
-      name = "is-ci";
-      packageName = "is-ci";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz";
-        sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==";
-      };
-    };
     "is-color-stop-1.1.0" = {
       name = "is-color-stop";
       packageName = "is-color-stop";
@@ -5873,6 +5783,15 @@ let
         sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345";
       };
     };
+    "is-core-module-2.1.0" = {
+      name = "is-core-module";
+      packageName = "is-core-module";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz";
+        sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==";
+      };
+    };
     "is-data-descriptor-0.1.4" = {
       name = "is-data-descriptor";
       packageName = "is-data-descriptor";
@@ -6278,33 +6197,6 @@ let
         sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==";
       };
     };
-    "jest-diff-25.5.0" = {
-      name = "jest-diff";
-      packageName = "jest-diff";
-      version = "25.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz";
-        sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==";
-      };
-    };
-    "jest-get-type-25.2.6" = {
-      name = "jest-get-type";
-      packageName = "jest-get-type";
-      version = "25.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz";
-        sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==";
-      };
-    };
-    "jest-util-26.6.0" = {
-      name = "jest-util";
-      packageName = "jest-util";
-      version = "26.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jest-util/-/jest-util-26.6.0.tgz";
-        sha512 = "/cUGqcnKeZMjvTQLfJo65nBOEZ/k0RB/8usv2JpfYya05u0XvBmKkIH5o5c4nCh9DD61B1YQjMGGqh1Ha0aXdg==";
-      };
-    };
     "js-tokens-4.0.0" = {
       name = "js-tokens";
       packageName = "js-tokens";
@@ -6827,15 +6719,6 @@ let
         sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
       };
     };
-    "make-error-1.3.6" = {
-      name = "make-error";
-      packageName = "make-error";
-      version = "1.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz";
-        sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
-      };
-    };
     "map-cache-0.2.2" = {
       name = "map-cache";
       packageName = "map-cache";
@@ -6872,6 +6755,15 @@ let
         sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
       };
     };
+    "mdn-data-2.0.12" = {
+      name = "mdn-data";
+      packageName = "mdn-data";
+      version = "2.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.12.tgz";
+        sha512 = "ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==";
+      };
+    };
     "mdn-data-2.0.4" = {
       name = "mdn-data";
       packageName = "mdn-data";
@@ -6881,15 +6773,6 @@ let
         sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==";
       };
     };
-    "mdn-data-2.0.6" = {
-      name = "mdn-data";
-      packageName = "mdn-data";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz";
-        sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==";
-      };
-    };
     "media-typer-0.3.0" = {
       name = "media-typer";
       packageName = "media-typer";
@@ -7187,15 +7070,6 @@ let
         sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
       };
     };
-    "mkdirp-1.0.4" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz";
-        sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==";
-      };
-    };
     "moment-2.29.1" = {
       name = "moment";
       packageName = "moment";
@@ -7304,13 +7178,13 @@ let
         sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==";
       };
     };
-    "nanoid-3.1.12" = {
+    "nanoid-3.1.16" = {
       name = "nanoid";
       packageName = "nanoid";
-      version = "3.1.12";
+      version = "3.1.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz";
-        sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==";
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.16.tgz";
+        sha512 = "+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w==";
       };
     };
     "nanomatch-1.2.13" = {
@@ -7403,13 +7277,13 @@ let
         sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==";
       };
     };
-    "node-releases-1.1.63" = {
+    "node-releases-1.1.66" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.63";
+      version = "1.1.66";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.63.tgz";
-        sha512 = "ukW3iCfQaoxJkSPN+iK7KznTeqDGVJatAEuXsJERYHa9tn/KaT5lBdIyxQjLEVTzSkyjJEuQ17/vaEjrOauDkg==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz";
+        sha512 = "JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==";
       };
     };
     "node-watch-0.5.5" = {
@@ -7610,13 +7484,13 @@ let
         sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
       };
     };
-    "object.assign-4.1.1" = {
+    "object.assign-4.1.2" = {
       name = "object.assign";
       packageName = "object.assign";
-      version = "4.1.1";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz";
-        sha512 = "VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==";
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
+        sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
       };
     };
     "object.entries-1.1.2" = {
@@ -8348,13 +8222,13 @@ let
         sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==";
       };
     };
-    "postcss-8.1.2" = {
+    "postcss-8.1.7" = {
       name = "postcss";
       packageName = "postcss";
-      version = "8.1.2";
+      version = "8.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-8.1.2.tgz";
-        sha512 = "mToqEVFq8jF9TFhlIK4HhE34zknFJuNTgqtsr60vUvrWn+9TIYugCwiV1JZRxCuOrej2jjstun1bn4Bc7/1HkA==";
+        url = "https://registry.npmjs.org/postcss/-/postcss-8.1.7.tgz";
+        sha512 = "llCQW1Pz4MOPwbZLmOddGM9eIJ8Bh7SZ2Oj5sxZva77uVaotYDsYTch1WBTNu7fUY0fpWp0fdt7uW40D4sRiiQ==";
       };
     };
     "postcss-calc-7.0.5" = {
@@ -8735,15 +8609,6 @@ let
         sha512 = "EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==";
       };
     };
-    "pretty-format-25.5.0" = {
-      name = "pretty-format";
-      packageName = "pretty-format";
-      version = "25.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz";
-        sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==";
-      };
-    };
     "process-0.11.10" = {
       name = "process";
       packageName = "process";
@@ -9059,15 +8924,6 @@ let
         sha512 = "X1Y+0jR47ImDVr54Ab6V9eGk0Hnu7fVWGeHQSOXHf/C2pF9c6uy3gef8QUeuUiWlNb0i08InPSE5a/KJzNzw1Q==";
       };
     };
-    "react-is-16.13.1" = {
-      name = "react-is";
-      packageName = "react-is";
-      version = "16.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz";
-        sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==";
-      };
-    };
     "read-1.0.7" = {
       name = "read";
       packageName = "read";
@@ -9167,13 +9023,13 @@ let
         sha512 = "Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==";
       };
     };
-    "regenerate-1.4.1" = {
+    "regenerate-1.4.2" = {
       name = "regenerate";
       packageName = "regenerate";
-      version = "1.4.1";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz";
-        sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==";
+        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz";
+        sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==";
       };
     };
     "regenerate-unicode-properties-8.2.0" = {
@@ -9248,13 +9104,13 @@ let
         sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==";
       };
     };
-    "registry-auth-token-4.2.0" = {
+    "registry-auth-token-4.2.1" = {
       name = "registry-auth-token";
       packageName = "registry-auth-token";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz";
-        sha512 = "P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==";
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz";
+        sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==";
       };
     };
     "registry-url-5.1.0" = {
@@ -9401,13 +9257,13 @@ let
         sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
       };
     };
-    "resolve-1.17.0" = {
+    "resolve-1.19.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.17.0";
+      version = "1.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz";
-        sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
+        sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
       };
     };
     "resolve-cwd-2.0.0" = {
@@ -9572,13 +9428,13 @@ let
         sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==";
       };
     };
-    "run-parallel-1.1.9" = {
+    "run-parallel-1.1.10" = {
       name = "run-parallel";
       packageName = "run-parallel";
-      version = "1.1.9";
+      version = "1.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
-        sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==";
+        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz";
+        sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==";
       };
     };
     "run-queue-1.0.3" = {
@@ -10373,22 +10229,22 @@ let
         sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==";
       };
     };
-    "string.prototype.trimend-1.0.1" = {
+    "string.prototype.trimend-1.0.2" = {
       name = "string.prototype.trimend";
       packageName = "string.prototype.trimend";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
-        sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==";
+        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz";
+        sha512 = "8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==";
       };
     };
-    "string.prototype.trimstart-1.0.1" = {
+    "string.prototype.trimstart-1.0.2" = {
       name = "string.prototype.trimstart";
       packageName = "string.prototype.trimstart";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
-        sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==";
+        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz";
+        sha512 = "7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==";
       };
     };
     "string_decoder-0.10.31" = {
@@ -10616,13 +10472,13 @@ let
         sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==";
       };
     };
-    "temp-0.9.1" = {
+    "temp-0.9.4" = {
       name = "temp";
       packageName = "temp";
-      version = "0.9.1";
+      version = "0.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz";
-        sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA==";
+        url = "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz";
+        sha512 = "yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==";
       };
     };
     "terser-4.8.0" = {
@@ -10688,13 +10544,13 @@ let
         sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==";
       };
     };
-    "timers-browserify-2.0.11" = {
+    "timers-browserify-2.0.12" = {
       name = "timers-browserify";
       packageName = "timers-browserify";
-      version = "2.0.11";
+      version = "2.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz";
-        sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz";
+        sha512 = "9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==";
       };
     };
     "timsort-0.3.0" = {
@@ -10868,15 +10724,6 @@ let
         sha512 = "+TztZrH7GnAD5CKxUohIAqIVHLrtivsYT7tZCLeRTCaBMSsfgYwprhA00kB/m0ezvYheOXJQqPfarAvgoayb7A==";
       };
     };
-    "ts-jest-26.4.1" = {
-      name = "ts-jest";
-      packageName = "ts-jest";
-      version = "26.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ts-jest/-/ts-jest-26.4.1.tgz";
-        sha512 = "F4aFq01aS6mnAAa0DljNmKr/Kk9y4HVZ1m6/rtJ0ED56cuxINGq3Q9eVAh+z5vcYKe5qnTMvv90vE8vUMFxomg==";
-      };
-    };
     "ts-union-2.3.0" = {
       name = "ts-union";
       packageName = "ts-union";
@@ -10895,13 +10742,13 @@ let
         sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
       };
     };
-    "tsyringe-4.3.0" = {
+    "tsyringe-4.4.0" = {
       name = "tsyringe";
       packageName = "tsyringe";
-      version = "4.3.0";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.3.0.tgz";
-        sha512 = "Vzty1M/EQXSsEE8aoIOLl1l793chcPyQAnFJaS1mFDtFvNPY+jknSPwMIF6yfcjua+2GTgwxWFzuA3cjIx4NZA==";
+        url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.4.0.tgz";
+        sha512 = "SlMApe1lhIq546CDp7bF+IdF4RB6d+9C5T7B0AS0P/Bm+Qpizj/gEmZzvw9J/KlXPEt4qHTbi1TRvX3rCPSdTg==";
       };
     };
     "tty-browserify-0.0.0" = {
@@ -11390,22 +11237,22 @@ let
         sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==";
       };
     };
-    "watchpack-1.7.4" = {
+    "watchpack-1.7.5" = {
       name = "watchpack";
       packageName = "watchpack";
-      version = "1.7.4";
+      version = "1.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz";
-        sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==";
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz";
+        sha512 = "9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==";
       };
     };
-    "watchpack-chokidar2-2.0.0" = {
+    "watchpack-chokidar2-2.0.1" = {
       name = "watchpack-chokidar2";
       packageName = "watchpack-chokidar2";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz";
-        sha512 = "9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==";
+        url = "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz";
+        sha512 = "nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==";
       };
     };
     "wbuf-1.7.3" = {
@@ -11507,13 +11354,13 @@ let
         sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
       };
     };
-    "whatwg-fetch-3.4.1" = {
+    "whatwg-fetch-3.5.0" = {
       name = "whatwg-fetch";
       packageName = "whatwg-fetch";
-      version = "3.4.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz";
-        sha512 = "sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ==";
+        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz";
+        sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A==";
       };
     };
     "which-1.3.1" = {
@@ -11804,13 +11651,13 @@ let
         sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==";
       };
     };
-    "ws-7.3.1" = {
+    "ws-7.4.0" = {
       name = "ws";
       packageName = "ws";
-      version = "7.3.1";
+      version = "7.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz";
-        sha512 = "D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==";
+        url = "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz";
+        sha512 = "kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==";
       };
     };
     "xmlbuilder-13.0.2" = {
@@ -11930,15 +11777,6 @@ let
         sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
       };
     };
-    "yargs-parser-20.2.3" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "20.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.3.tgz";
-        sha512 = "emOFRT9WVHw03QSvN5qor9QQT9+sw5vwxfYweivSMHTcAXPefwVae2FjO7JJjj8hCE4CzPOPeFM83VwT29HCww==";
-      };
-    };
     "yargs-parser-4.2.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -11977,7 +11815,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."babel-runtime-6.18.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."body-parser-1.19.0"
@@ -12165,7 +12003,7 @@ in
       sources."astral-regex-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
@@ -12510,7 +12348,7 @@ in
       sources."raw-body-2.4.0"
       sources."rc-1.2.8"
       sources."readdirp-3.5.0"
-      sources."registry-auth-token-4.2.0"
+      sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
       sources."responselike-1.0.2"
       sources."rimraf-2.7.1"
@@ -12546,7 +12384,7 @@ in
       sources."vary-1.1.2"
       sources."which-2.0.2"
       sources."wrappy-1.0.2"
-      sources."ws-7.3.1"
+      sources."ws-7.4.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -12561,10 +12399,10 @@ in
   "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage {
     name = "_at_elm-tooling_slash_elm-language-server";
     packageName = "@elm-tooling/elm-language-server";
-    version = "1.13.1";
+    version = "1.13.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.13.1.tgz";
-      sha512 = "uE80GpQYlec/kJfjZD1LNByhBGpP8XnxIFB5hsCBAK0leGPSfaaqqEQPGZBwiRfssnnIDN7j081txZy0Y3u1Uw==";
+      url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.13.2.tgz";
+      sha512 = "3bRD+Hut+XPLDY4r0t25tHhfWsXH2UPeruwDfsp/b991AjGpd3HlMNKVAnyu4DD2brUqo6xoHhpp3qTdHPJ2Pw==";
     };
     dependencies = [
       sources."@nodelib/fs.scandir-2.1.3"
@@ -12579,7 +12417,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."babel-runtime-6.18.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."body-parser-1.19.0"
@@ -12609,7 +12447,7 @@ in
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-4.0.0"
       sources."etag-1.8.1"
-      (sources."execa-4.0.3" // {
+      (sources."execa-4.1.0" // {
         dependencies = [
           sources."is-stream-2.0.0"
         ];
@@ -12626,7 +12464,7 @@ in
       sources."fast-diff-1.2.0"
       sources."fast-glob-3.2.4"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fastq-1.8.0"
+      sources."fastq-1.9.0"
       sources."fill-range-7.0.1"
       sources."finalhandler-1.1.2"
       sources."find-0.2.7"
@@ -12712,7 +12550,7 @@ in
         ];
       })
       sources."reusify-1.0.4"
-      sources."run-parallel-1.1.9"
+      sources."run-parallel-1.1.10"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       (sources."send-0.17.1" // {
@@ -12739,7 +12577,7 @@ in
       sources."traverse-chain-0.1.0"
       sources."ts-debounce-2.0.1"
       sources."tslib-1.14.1"
-      sources."tsyringe-4.3.0"
+      sources."tsyringe-4.4.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
@@ -12822,7 +12660,7 @@ in
       sources."finalhandler-1.1.2"
       sources."follow-redirects-1.13.0"
       sources."fresh-0.5.2"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.2.1"
       sources."get-stream-4.1.0"
       sources."glob-parent-5.1.1"
       sources."has-ansi-2.0.0"
@@ -12911,7 +12749,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
@@ -13004,7 +12842,7 @@ in
       sources."stealthy-require-1.1.1"
       sources."supports-color-7.2.0"
       sources."tar-4.4.13"
-      sources."temp-0.9.1"
+      sources."temp-0.9.4"
       sources."through-2.3.8"
       sources."to-regex-range-5.0.1"
       sources."tough-cookie-2.5.0"
@@ -13045,7 +12883,7 @@ in
       sources."@types/cacheable-request-6.0.1"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.7"
       sources."@types/responselike-1.0.0"
       sources."cacheable-lookup-2.0.1"
       sources."cacheable-request-7.0.1"
@@ -13127,7 +12965,7 @@ in
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-0.3.0"
@@ -13352,20 +13190,20 @@ in
   create-elm-app = nodeEnv.buildNodePackage {
     name = "create-elm-app";
     packageName = "create-elm-app";
-    version = "5.9.0";
+    version = "5.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.9.0.tgz";
-      sha512 = "aZR8Jxb5FUyY8G+eV4Tn7CXMLo00owwEhQ0ugJVR+QgHS3wMtbMhGPtZLIPlm471XsUwncmGDNbL/Oy9MkaclQ==";
+      url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.14.0.tgz";
+      sha512 = "OKd2nESweQXnBYjhKVsSeJZXP2YnGmhEEra+CGNeO7YvMdJUoD7CHKZ6FimehrTYlOlnN7aXmGwwPe+Tp2cJRg==";
     };
     dependencies = [
       sources."@babel/cli-7.12.1"
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/compat-data-7.12.1"
+      sources."@babel/compat-data-7.12.5"
       sources."@babel/core-7.12.3"
-      sources."@babel/generator-7.12.1"
+      sources."@babel/generator-7.12.5"
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
-      sources."@babel/helper-compilation-targets-7.12.1"
+      sources."@babel/helper-compilation-targets-7.12.5"
       sources."@babel/helper-create-class-features-plugin-7.12.1"
       sources."@babel/helper-create-regexp-features-plugin-7.12.1"
       sources."@babel/helper-define-map-7.10.5"
@@ -13374,22 +13212,22 @@ in
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-hoist-variables-7.10.4"
       sources."@babel/helper-member-expression-to-functions-7.12.1"
-      sources."@babel/helper-module-imports-7.12.1"
+      sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
       sources."@babel/helper-optimise-call-expression-7.10.4"
       sources."@babel/helper-plugin-utils-7.10.4"
       sources."@babel/helper-regex-7.10.5"
       sources."@babel/helper-remap-async-to-generator-7.12.1"
-      sources."@babel/helper-replace-supers-7.12.1"
+      sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
       sources."@babel/helper-split-export-declaration-7.11.0"
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/helper-validator-option-7.12.1"
       sources."@babel/helper-wrap-function-7.12.3"
-      sources."@babel/helpers-7.12.1"
+      sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.3"
+      sources."@babel/parser-7.12.5"
       sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
       sources."@babel/plugin-proposal-dynamic-import-7.12.1"
@@ -13397,7 +13235,7 @@ in
       sources."@babel/plugin-proposal-json-strings-7.12.1"
       sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-      sources."@babel/plugin-proposal-numeric-separator-7.12.1"
+      sources."@babel/plugin-proposal-numeric-separator-7.12.5"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
       sources."@babel/plugin-proposal-optional-chaining-7.12.1"
@@ -13450,10 +13288,10 @@ in
       sources."@babel/plugin-transform-unicode-regex-7.12.1"
       sources."@babel/preset-env-7.12.1"
       sources."@babel/preset-modules-0.1.4"
-      sources."@babel/runtime-7.12.1"
+      sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.1"
-      sources."@babel/types-7.12.1"
+      sources."@babel/traverse-7.12.5"
+      sources."@babel/types-7.12.6"
       sources."@hapi/address-2.1.4"
       sources."@hapi/bourne-1.3.2"
       sources."@hapi/hoek-8.5.1"
@@ -13467,17 +13305,17 @@ in
       sources."@types/http-proxy-1.17.4"
       sources."@types/json-schema-7.0.6"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.11.10"
+      sources."@types/node-14.14.7"
       sources."@types/parse-json-4.0.0"
       sources."@types/q-1.5.4"
       sources."@types/source-list-map-0.1.2"
       sources."@types/tapable-1.0.6"
-      (sources."@types/uglify-js-3.11.0" // {
+      (sources."@types/uglify-js-3.11.1" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
-      (sources."@types/webpack-4.41.22" // {
+      (sources."@types/webpack-4.41.25" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -13557,11 +13395,11 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      sources."autoprefixer-10.0.1"
+      sources."autoprefixer-10.0.2"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.10.1"
+      sources."aws4-1.11.0"
       sources."babel-extract-comments-1.0.0"
-      sources."babel-loader-8.1.0"
+      sources."babel-loader-8.2.1"
       sources."babel-plugin-dynamic-import-node-2.3.3"
       sources."babel-plugin-syntax-object-rest-spread-6.13.0"
       sources."babel-plugin-transform-object-rest-spread-6.26.0"
@@ -13578,7 +13416,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."base64-js-1.3.1"
+      sources."base64-js-1.5.1"
       sources."batch-0.6.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
@@ -13608,11 +13446,7 @@ in
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
-      (sources."browserify-rsa-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.11.9"
-        ];
-      })
+      sources."browserify-rsa-4.1.0"
       (sources."browserify-sign-4.2.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -13620,7 +13454,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.14.5"
+      sources."browserslist-4.14.7"
       sources."buffer-4.9.2"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
@@ -13634,6 +13468,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
+      sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
@@ -13641,7 +13476,7 @@ in
       sources."camel-case-4.1.1"
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001148"
+      sources."caniuse-lite-1.0.30001158"
       sources."case-sensitive-paths-webpack-plugin-2.3.0"
       sources."caseless-0.12.0"
       sources."chainsaw-0.1.0"
@@ -13729,7 +13564,7 @@ in
         ];
       })
       sources."core-js-2.6.11"
-      (sources."core-js-compat-3.6.5" // {
+      (sources."core-js-compat-3.7.0" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -13749,7 +13584,7 @@ in
       sources."css-declaration-sorter-4.0.1"
       (sources."css-loader-4.3.0" // {
         dependencies = [
-          sources."camelcase-6.1.0"
+          sources."camelcase-6.2.0"
           sources."loader-utils-2.0.0"
           sources."semver-7.3.2"
         ];
@@ -13769,10 +13604,10 @@ in
       sources."cssnano-util-get-match-4.0.0"
       sources."cssnano-util-raw-cache-4.0.1"
       sources."cssnano-util-same-parent-4.0.1"
-      (sources."csso-4.0.3" // {
+      (sources."csso-4.1.1" // {
         dependencies = [
-          sources."css-tree-1.0.0-alpha.39"
-          sources."mdn-data-2.0.6"
+          sources."css-tree-1.0.1"
+          sources."mdn-data-2.0.12"
           sources."source-map-0.6.1"
         ];
       })
@@ -13836,7 +13671,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.582"
+      sources."electron-to-chromium-1.3.596"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -13871,7 +13706,7 @@ in
       sources."entities-2.1.0"
       sources."errno-0.1.7"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.17.7"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-html-1.0.3"
@@ -13974,7 +13809,7 @@ in
           sources."escape-string-regexp-1.0.5"
         ];
       })
-      (sources."file-loader-6.1.1" // {
+      (sources."file-loader-6.2.0" // {
         dependencies = [
           sources."loader-utils-2.0.0"
           sources."schema-utils-3.0.0"
@@ -14009,8 +13844,9 @@ in
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.1.3"
       sources."function-bind-1.1.1"
-      sources."gensync-1.0.0-beta.1"
+      sources."gensync-1.0.0-beta.2"
       sources."get-caller-file-1.0.3"
+      sources."get-intrinsic-1.0.1"
       sources."get-own-enumerable-property-symbols-3.0.2"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
@@ -14101,7 +13937,7 @@ in
       sources."i-0.3.6"
       sources."iconv-lite-0.4.24"
       sources."icss-utils-4.1.1"
-      sources."ieee754-1.1.13"
+      sources."ieee754-1.2.1"
       sources."iferr-0.1.5"
       sources."ignore-3.3.10"
       sources."immer-1.7.2"
@@ -14135,6 +13971,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-color-stop-1.1.0"
+      sources."is-core-module-2.1.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -14260,7 +14097,7 @@ in
       sources."mustache-3.2.1"
       sources."mute-stream-0.0.8"
       sources."nan-2.14.2"
-      sources."nanoid-3.1.12"
+      sources."nanoid-3.1.16"
       sources."nanomatch-1.2.13"
       sources."ncp-1.0.1"
       sources."negotiator-0.6.2"
@@ -14282,7 +14119,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.63"
+      sources."node-releases-1.1.66"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-3.0.0"
       sources."normalize-range-0.1.2"
@@ -14311,34 +14148,26 @@ in
         ];
       })
       sources."object-inspect-1.8.0"
-      sources."object-is-1.1.3"
+      (sources."object-is-1.1.3" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."object-keys-1.1.1"
       (sources."object-visit-1.0.1" // {
         dependencies = [
           sources."isobject-3.0.1"
         ];
       })
-      sources."object.assign-4.1.1"
-      (sources."object.entries-1.1.2" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."object.getownpropertydescriptors-2.1.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."object.assign-4.1.2"
+      sources."object.entries-1.1.2"
+      sources."object.getownpropertydescriptors-2.1.0"
       (sources."object.pick-1.3.0" // {
         dependencies = [
           sources."isobject-3.0.1"
         ];
       })
-      (sources."object.values-1.1.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."object.values-1.1.1"
       sources."obuf-1.1.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
@@ -14433,7 +14262,7 @@ in
       (sources."postcss-loader-4.0.4" // {
         dependencies = [
           sources."cosmiconfig-7.0.0"
-          sources."import-fresh-3.2.1"
+          sources."import-fresh-3.2.2"
           sources."loader-utils-2.0.0"
           sources."parse-json-5.1.0"
           sources."path-type-4.0.0"
@@ -14531,7 +14360,7 @@ in
       })
       (sources."postcss-safe-parser-5.0.2" // {
         dependencies = [
-          sources."postcss-8.1.2"
+          sources."postcss-8.1.7"
           sources."source-map-0.6.1"
         ];
       })
@@ -14628,16 +14457,12 @@ in
       sources."readable-stream-2.3.7"
       sources."readdirp-3.5.0"
       sources."recursive-readdir-2.2.2"
-      sources."regenerate-1.4.1"
+      sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.13.7"
       sources."regenerator-transform-0.14.5"
       sources."regex-not-1.0.2"
-      (sources."regexp.prototype.flags-1.3.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."regexp.prototype.flags-1.3.0"
       sources."regexpu-core-4.7.1"
       sources."regjsgen-0.5.2"
       (sources."regjsparser-0.6.4" // {
@@ -14660,7 +14485,7 @@ in
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."requires-port-1.0.0"
-      sources."resolve-1.17.0"
+      sources."resolve-1.19.0"
       sources."resolve-cwd-2.0.0"
       sources."resolve-dir-1.0.1"
       sources."resolve-from-3.0.0"
@@ -14824,14 +14649,14 @@ in
           sources."strip-ansi-3.0.1"
         ];
       })
-      (sources."string.prototype.trimend-1.0.1" // {
+      (sources."string.prototype.trimend-1.0.2" // {
         dependencies = [
-          sources."es-abstract-1.17.7"
+          sources."es-abstract-1.18.0-next.1"
         ];
       })
-      (sources."string.prototype.trimstart-1.0.1" // {
+      (sources."string.prototype.trimstart-1.0.2" // {
         dependencies = [
-          sources."es-abstract-1.17.7"
+          sources."es-abstract-1.18.0-next.1"
         ];
       })
       sources."string_decoder-1.1.1"
@@ -14868,7 +14693,7 @@ in
       })
       sources."tapable-1.1.3"
       sources."tar-4.4.13"
-      (sources."temp-0.9.1" // {
+      (sources."temp-0.9.4" // {
         dependencies = [
           sources."rimraf-2.6.3"
         ];
@@ -14889,7 +14714,7 @@ in
       sources."through-2.3.8"
       sources."through2-2.0.5"
       sources."thunky-1.1.0"
-      sources."timers-browserify-2.0.11"
+      sources."timers-browserify-2.0.12"
       sources."timsort-0.3.0"
       sources."tmp-0.0.33"
       sources."to-arraybuffer-1.0.1"
@@ -14994,8 +14819,8 @@ in
       sources."vendors-1.0.4"
       sources."verror-1.10.0"
       sources."vm-browserify-1.1.2"
-      sources."watchpack-1.7.4"
-      (sources."watchpack-chokidar2-2.0.0" // {
+      sources."watchpack-1.7.5"
+      (sources."watchpack-chokidar2-2.0.1" // {
         dependencies = [
           sources."anymatch-2.0.0"
           sources."binary-extensions-1.13.1"
@@ -15094,7 +14919,7 @@ in
       })
       sources."websocket-driver-0.7.4"
       sources."websocket-extensions-0.1.4"
-      sources."whatwg-fetch-3.4.1"
+      sources."whatwg-fetch-3.5.0"
       sources."which-2.0.2"
       sources."which-module-1.0.0"
       (sources."winston-2.1.1" // {
@@ -15161,97 +14986,48 @@ in
   elm-optimize-level-2 = nodeEnv.buildNodePackage {
     name = "elm-optimize-level-2";
     packageName = "elm-optimize-level-2";
-    version = "0.1.4";
+    version = "0.1.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-optimize-level-2/-/elm-optimize-level-2-0.1.4.tgz";
-      sha512 = "3pWWNCurTBfjTfRQViECVUaK+ygwp4gQ0KAPKpYYlGl2KmlBy0JqRcgcSXIgqO4C9Tmeb+20J1qZplCaY/2r/w==";
+      url = "https://registry.npmjs.org/elm-optimize-level-2/-/elm-optimize-level-2-0.1.5.tgz";
+      sha512 = "9vaPjQEjdxzUXewbCJn1X3oIwUgdBssgy+uQvsqyDSpyEwYWxQCgX4qX3NtqKNgsHEZ+TYFzKlzdKvcRKbjOUg==";
     };
     dependencies = [
-      (sources."@jest/types-25.5.0" // {
-        dependencies = [
-          sources."chalk-3.0.0"
-        ];
-      })
-      sources."@types/istanbul-lib-coverage-2.0.3"
-      sources."@types/istanbul-lib-report-3.0.0"
-      sources."@types/istanbul-reports-1.1.2"
-      sources."@types/jest-26.0.14"
-      sources."@types/node-14.11.10"
-      sources."@types/yargs-15.0.9"
-      sources."@types/yargs-parser-15.0.0"
-      sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."braces-3.0.2"
-      sources."bs-logger-0.2.6"
-      sources."buffer-from-1.1.1"
       sources."chalk-4.1.0"
-      sources."ci-info-2.0.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      sources."commander-6.1.0"
+      sources."commander-6.2.0"
       sources."concat-map-0.0.1"
-      (sources."cross-spawn-6.0.5" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
-      sources."diff-sequences-25.2.6"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fill-range-7.0.1"
+      sources."cross-spawn-6.0.5"
       sources."find-elm-dependencies-2.0.4"
       sources."firstline-1.3.1"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.6"
-      sources."graceful-fs-4.2.4"
       sources."has-flag-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."is-ci-2.0.0"
-      sources."is-number-7.0.0"
       sources."isexe-2.0.0"
-      (sources."jest-diff-25.5.0" // {
-        dependencies = [
-          sources."chalk-3.0.0"
-        ];
-      })
-      sources."jest-get-type-25.2.6"
-      (sources."jest-util-26.6.0" // {
-        dependencies = [
-          sources."@jest/types-26.6.0"
-          sources."@types/istanbul-reports-3.0.0"
-        ];
-      })
-      sources."json5-2.1.3"
       sources."lodash-4.17.20"
-      sources."lodash.memoize-4.1.2"
-      sources."make-error-1.3.6"
-      sources."micromatch-4.0.2"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      sources."mkdirp-1.0.4"
+      sources."mkdirp-0.5.5"
       sources."nice-try-1.0.5"
       sources."node-elm-compiler-5.0.5"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
-      sources."picomatch-2.2.2"
-      sources."pretty-format-25.5.0"
-      sources."react-is-16.13.1"
       sources."rimraf-2.6.3"
-      sources."semver-7.3.2"
+      sources."semver-5.7.1"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."supports-color-7.2.0"
-      sources."temp-0.9.1"
-      sources."to-regex-range-5.0.1"
-      sources."ts-jest-26.4.1"
+      sources."temp-0.9.4"
       sources."ts-union-2.3.0"
       sources."typescript-3.9.7"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
-      sources."yargs-parser-20.2.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {

From 1b86837cce358c28d0ed6076dccd6db97d562eeb Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sun, 15 Nov 2020 23:19:25 -0500
Subject: [PATCH 2628/3942] ocamlPackages.owl: 0.10.0 -> 1.0.0

---
 pkgs/development/ocaml-modules/owl-base/default.nix | 4 ++--
 pkgs/development/ocaml-modules/owl/default.nix      | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix
index 7a454e9ef441..b930ea88654b 100644
--- a/pkgs/development/ocaml-modules/owl-base/default.nix
+++ b/pkgs/development/ocaml-modules/owl-base/default.nix
@@ -2,13 +2,13 @@
 
 buildDunePackage rec {
   pname = "owl-base";
-  version = "0.10.0";
+  version = "1.0.0";
 
   useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz";
-    sha256 = "148ny2cdzga1l36kcibvlz5xlyi5zvkywifxaqn8lf79n1swmlzf";
+    sha256 = "1gny4351ws2r7dp53nampfyh39l0z6qqvxj5v3d05mpdi2aa06yr";
   };
 
   minimumOCamlVersion = "4.10";
diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix
index 7dd1d525a462..980efd3bf5c6 100644
--- a/pkgs/development/ocaml-modules/owl/default.nix
+++ b/pkgs/development/ocaml-modules/owl/default.nix
@@ -5,7 +5,6 @@
 , alcotest
 , eigen
 , stdio
-, stdlib-shims
 , openblasCompat
 , owl-base
 , npy
@@ -18,9 +17,9 @@ buildDunePackage rec {
   inherit (owl-base) version src meta useDune2;
 
   checkInputs = [ alcotest ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator stdio ];
   propagatedBuildInputs = [
-    eigen stdio stdlib-shims openblasCompat owl-base npy
+    eigen openblasCompat owl-base npy
   ];
 
   doCheck = !stdenv.isDarwin;  # https://github.com/owlbarn/owl/issues/462

From 204f52ce65513c0448a283959902fb166adc39f5 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Mon, 16 Nov 2020 18:36:21 +0100
Subject: [PATCH 2629/3942] buildah: 1.17.0 -> 1.18.0

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/development/tools/buildah/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index ecd714176330..e69e35442b3f 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -14,13 +14,13 @@
 
 buildGoModule rec {
   pname = "buildah";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "buildah";
     rev = "v${version}";
-    sha256 = "1bghi5m1rg42a781sgh194hqmqiflhwdrnxxn7cbb2b6jfiik08l";
+    sha256 = "0kn31y5g7269mjaw5ddfsiaan93s62i8zzxg4xl01dg3dkkadwc4";
   };
 
   outputs = [ "out" "man" ];

From ec87b7398fadfbe42b85804bab9a1a0da7c43673 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 16 Nov 2020 21:36:24 +0000
Subject: [PATCH 2630/3942] tektoncd-cli: update to new
 installShellConfiguration format

---
 .../networking/cluster/tektoncd-cli/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
index 1e2a21d46679..43ab976445c5 100644
--- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
@@ -27,10 +27,10 @@ buildGoModule rec {
     mkdir -p "$out/share/man/man1"
     cp docs/man/man1/* "$out/share/man/man1"
 
-    # TODO: Move to enhanced installShellCompletion when merged: PR #83630
-    $out/bin/tkn completion bash > tkn.bash
-    $out/bin/tkn completion zsh  > _tkn
-    installShellCompletion tkn.bash --zsh _tkn
+    installShellCompletion --cmd tkn \
+      --bash <($out/bin/tkn completion bash) \
+      --fish <($out/bin/tkn completion fish) \
+      --zsh <($out/bin/tkn completion zsh)
   '';
 
   meta = with lib; {

From bcfdcaed7902c9b42b247f31cde84e69a3604bcc Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 16 Nov 2020 21:36:49 +0000
Subject: [PATCH 2631/3942] tektoncd-cli: 0.13.1 -> 0.14.0

---
 pkgs/applications/networking/cluster/tektoncd-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
index 43ab976445c5..aeaff2ff5f15 100644
--- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "tektoncd-cli";
-  version = "0.13.1";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "tektoncd";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "0cjih8h64wwdp022pn70xqxafdk34z2y2ipxb86dlf2zdrf9xv53";
+    sha256 = "1mkbwh4cmhx9in928vlvs7xjjklpsxbv5niv8jmsbnifflg1an8p";
   };
 
   vendorSha256 = null;

From 8c1059399f26dd2df24e667fb794444b2722ef2e Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Tue, 5 May 2020 15:08:27 +0800
Subject: [PATCH 2632/3942] koreader: 2020.09 -> 2020.10.1

---
 pkgs/applications/misc/koreader/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix
index f49eebad6b4d..78af1f0ca708 100644
--- a/pkgs/applications/misc/koreader/default.nix
+++ b/pkgs/applications/misc/koreader/default.nix
@@ -11,12 +11,12 @@
 let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
 in stdenv.mkDerivation rec {
   pname = "koreader";
-  version = "2020.09";
+  version = "2020.10.1";
 
   src = fetchurl {
     url =
       "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
-    sha256 = "12kiw3mw8g8d9fb8ywd4clm2bgblhq2gqcxzadwpmf0wxq7p0v8z";
+    sha256 = "0pdcc7j7pgr9xdwh93x2zfc8qbhc318nj1rls7k027g2h9y53192";
   };
 
   sourceRoot = ".";

From 10fd7fa0ae19726e37c7993ccd2c50b226d8a203 Mon Sep 17 00:00:00 2001
From: Sage Raflik <neonfuz@gmail.com>
Date: Mon, 16 Nov 2020 15:31:53 -0600
Subject: [PATCH 2633/3942] koreader: 2020.10.1 -> 2020.11

---
 pkgs/applications/misc/koreader/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix
index 78af1f0ca708..4ffd3f6fbf65 100644
--- a/pkgs/applications/misc/koreader/default.nix
+++ b/pkgs/applications/misc/koreader/default.nix
@@ -11,12 +11,12 @@
 let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
 in stdenv.mkDerivation rec {
   pname = "koreader";
-  version = "2020.10.1";
+  version = "2020.11";
 
   src = fetchurl {
     url =
       "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
-    sha256 = "0pdcc7j7pgr9xdwh93x2zfc8qbhc318nj1rls7k027g2h9y53192";
+    sha256 = "15nw8kyjyhqlr742gkpzn1b9906rdm6cssnc6jbbph5pjdlzspc4";
   };
 
   sourceRoot = ".";

From 1a6c252dcb4f01db42456370540963e47b574175 Mon Sep 17 00:00:00 2001
From: JesusMtnez <jesusmartinez93@gmail.com>
Date: Mon, 16 Nov 2020 07:29:21 +0100
Subject: [PATCH 2634/3942] slack: 4.10.3 -> 4.11.1

---
 .../networking/instant-messengers/slack/default.nix    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index d27bd6a521de..5f367c76a928 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -25,6 +25,7 @@
 , libpulseaudio
 , libuuid
 , libxcb
+, libxkbcommon
 , mesa
 , nspr
 , nss
@@ -40,11 +41,11 @@ let
 
   pname = "slack";
 
-  x86_64-darwin-version = "4.10.3";
-  x86_64-darwin-sha256 = "0r77l57vr603xamich4h4gbdd5vdcj0sjs6yjpymfx9s0f98v8bb";
+  x86_64-darwin-version = "4.11.1";
+  x86_64-darwin-sha256 = "0a5rq8zhgdckwxnyjv6nrgpnj682j1rd9yc4nwvsbvpzv15kmd35";
 
-  x86_64-linux-version = "4.10.3";
-  x86_64-linux-sha256 = "1gnjj2iyk8cwjajg8h9qpmzx10j4qjxjzciq8csg45qfzwkr3drf";
+  x86_64-linux-version = "4.11.1";
+  x86_64-linux-sha256 = "1r43g3xnla5aq38l3mpba8jb1gx9m2b6pr84prsclz27nr0rfm6g";
 
   version = {
     x86_64-darwin = x86_64-darwin-version;
@@ -99,6 +100,7 @@ let
       libpulseaudio
       libuuid
       libxcb
+      libxkbcommon
       mesa
       nspr
       nss

From 35db176b85e495bd7dd7ddee681950a595a5a6cb Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Mon, 16 Nov 2020 23:11:35 +0100
Subject: [PATCH 2635/3942] wine: only use strictDeps when mingwSupport is
 enabled

9f5cba0aaabc176bde6daf2b0079bc870f009615 broke regular wineStaging
---
 pkgs/misc/emulators/wine/base.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 9b228fba095d..c4858c6c579d 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
   inherit name src configureFlags;
 
   # Fixes "Compiler cannot create executables" building wineWow with mingwSupport
-  strictDeps = true;
+  # FIXME Breaks wineStaging builds
+  strictDeps = supportFlags.mingwSupport;
 
   nativeBuildInputs = [
     pkgconfig fontforge makeWrapper flex bison

From 621f649bfb210146e3db5141f4040d93afa877d5 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 10 Nov 2020 15:01:58 -0500
Subject: [PATCH 2636/3942] libsForQt5.libopenshot-audio: enable on darwin

---
 .../video/openshot-qt/libopenshot-audio.nix        | 14 +++++++++++---
 pkgs/top-level/all-packages.nix                    |  4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index d1a368b43ba2..b6bb87e66512 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen, alsaLib , libX11, libXft, libXrandr, libXinerama, libXext, libXcursor }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen
+, alsaLib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor
+, zlib, AGL, Cocoa, Foundation
+}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -16,7 +19,12 @@ stdenv.mkDerivation rec {
   [ pkgconfig cmake doxygen ];
 
   buildInputs =
-  [ alsaLib libX11 libXft libXrandr libXinerama libXext libXcursor ];
+    optionals stdenv.isLinux [ alsaLib ]
+    ++ (if stdenv.isDarwin then
+          [ zlib AGL Cocoa Foundation ]
+        else
+          [ libX11 libXft libXrandr libXinerama libXext libXcursor ])
+  ;
 
   doCheck = false;
 
@@ -30,6 +38,6 @@ stdenv.mkDerivation rec {
     '';
     license = with licenses; gpl3Plus;
     maintainers = with maintainers; [ AndersonTorres ];
-    platforms = with platforms; linux;
+    platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a66fefcf4495..ea41ea9810af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15355,7 +15355,9 @@ in
 
     packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { };
 
-    libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };
+    libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix {
+      inherit (darwin.apple_sdk.frameworks) AGL Cocoa Foundation;
+    };
 
     libqglviewer = callPackage ../development/libraries/libqglviewer {
       inherit (darwin.apple_sdk.frameworks) AGL;

From fcd325c97482e56157e3daf4be21d7d08d69669a Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 10 Nov 2020 15:05:59 -0500
Subject: [PATCH 2637/3942] libsForQt5.libopenshot: enable on darwin

---
 pkgs/applications/video/openshot-qt/libopenshot.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index e24b6ee41f85..1b6084a1d2f9 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -3,7 +3,9 @@
 , libopenshot-audio, imagemagick, ffmpeg_3
 , swig, python3
 , unittest-cpp, cppzmq, zeromq
-, qtbase, qtmultimedia }:
+, qtbase, qtmultimedia
+, llvmPackages
+}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -27,7 +29,9 @@ stdenv.mkDerivation rec {
 
   buildInputs =
   [ imagemagick ffmpeg_3 swig python3 unittest-cpp
-    cppzmq zeromq qtbase qtmultimedia ];
+    cppzmq zeromq qtbase qtmultimedia ]
+    ++ optional stdenv.isDarwin llvmPackages.openmp
+  ;
 
   LIBOPENSHOT_AUDIO_DIR = libopenshot-audio;
   "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++";
@@ -46,6 +50,6 @@ stdenv.mkDerivation rec {
     '';
     license = with licenses; gpl3Plus;
     maintainers = with maintainers; [ AndersonTorres ];
-    platforms = with platforms; linux;
+    platforms = with platforms; unix;
   };
 }

From 972bcb496d13063543c2d38415d22da58bbd44c3 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 10 Nov 2020 15:08:26 -0500
Subject: [PATCH 2638/3942] openshot-qt: enable on darwin

---
 .../video/openshot-qt/default.nix             | 11 ++++++++--
 pkgs/top-level/all-packages.nix               | 21 ++++++++-----------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index cd3176249f8a..ede47ad061f6 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,6 +1,7 @@
 { stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch
 , doxygen, python3Packages, libopenshot
-, wrapGAppsHook, gtk3 }:
+, wrapGAppsHook, gtk3
+, qtsvg }:
 
 mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "openshot-qt";
@@ -29,6 +30,12 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
 
   postFixup = ''
     wrapProgram $out/bin/openshot-qt \
+  ''
+  # Fix toolbar icons on Darwin
+  + stdenv.lib.optionalString stdenv.isDarwin ''
+      --suffix QT_PLUGIN_PATH : "${stdenv.lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \
+  ''
+  + ''
       "''${gappsWrapperArgs[@]}" \
       "''${qtWrapperArgs[@]}"
   '';
@@ -47,6 +54,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     '';
     license = with licenses; gpl3Plus;
     maintainers = with maintainers; [ AndersonTorres ];
-    platforms = with platforms; linux;
+    platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea41ea9810af..75d7b2863fad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9445,18 +9445,15 @@ in
     graalvm8-ee
     graalvm11-ee;
 
-  openshot-qt = let
-    # Cannot use a newer Qt (5.15) version because it requires qtwebkit
-    # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b
-    pkgs_ = pkgs.extend(_: prev: {
-      pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
-        pkgs = oldAttrs.pkgs.extend(_: _: {
-          qt5 = pkgs.qt514;
-          libsForQt5 = pkgs.libsForQt514;
-        });
-      });
-    });
-  in pkgs_.libsForQt514.callPackage ../applications/video/openshot-qt { };
+  # Cannot use a newer Qt (5.15) version because it requires qtwebkit
+  # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b
+  openshot-qt = (pkgs.extend (final: prev: rec {
+    qt5 = if stdenv.isDarwin then prev.qt5 else prev.qt514;
+    libsForQt5 = if stdenv.isDarwin then prev.libsForQt5 else prev.libsForQt514;
+    pythonInterpreters = prev.pythonInterpreters.override {
+      pkgs = final;
+    };
+  })).libsForQt5.callPackage ../applications/video/openshot-qt { };
 
   openspin = callPackage ../development/compilers/openspin { };
 

From c2d85c30ae31f9f0d8fb1df15678257047baf4a6 Mon Sep 17 00:00:00 2001
From: bhpdt <no-reply@pdt-partners.com>
Date: Mon, 16 Nov 2020 18:42:48 -0500
Subject: [PATCH 2639/3942] woff2: use canonical prefixes

When building with a native stdenv, which wraps CC, we need to resolve nix store
symlinks when building woff2.
---
 pkgs/development/web/woff2/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix
index ff0484547fc2..d770fb627536 100644
--- a/pkgs/development/web/woff2/default.nix
+++ b/pkgs/development/web/woff2/default.nix
@@ -18,8 +18,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ]
-    ++ stdenv.lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE";
+  cmakeFlags = [
+    "-DCANONICAL_PREFIXES=ON"
+    "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
+  ] ++ stdenv.lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE";
 
   propagatedBuildInputs = [ brotli ];
 

From 168f36153b1e89ff9482398f37ba23825da9bf3e Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Mon, 16 Nov 2020 14:37:12 -0800
Subject: [PATCH 2640/3942] tailscale: 1.2.6 -> 1.2.8

Signed-off-by: David Anderson <dave@natulte.net>
---
 pkgs/servers/tailscale/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index 353ac4d5d882..a32f8115e273 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "tailscale";
-  version = "1.2.6";
-  tagHash = "0423683af6500dacbbc0194cb97eedaa312a34f2"; # from `git rev-parse v1.2.6`
+  version = "1.2.8";
+  tagHash = "37adb62a35d818f4af638924d3fc1526bdeaf215"; # from `git rev-parse v1.2.7`
 
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tailscale";
     rev = "v${version}";
-    sha256 = "0p2ygv2vwpjq6yhhaxis8j9gxkv0qcx0byxlf0vbmy9xqb03cs87";
+    sha256 = "0305n5gwp2w36z3yh0w8x3ma8a074zr913cx3y73szln56jz88hg";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c5b0f56ae4e4ff22ecb56676bc583c6e750a5688 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Tue, 17 Nov 2020 10:03:07 +0900
Subject: [PATCH 2641/3942] release: disable darwin bootstrapped stdenv test

---
 pkgs/top-level/release.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5fc6e91b3118..cacc77fea30d 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -173,8 +173,13 @@ let
             in {
               # Lightweight distribution and test
               inherit (bootstrap) dist test;
+
               # Test a full stdenv bootstrap from the bootstrap tools definition
-              inherit (bootstrap.test-pkgs) stdenv;
+              # Temporarily disabled. The darwin bootstrap is transitioning the
+              # structure of bootstrap tools. The tools that are generated as
+              # part of the current package set cannot be unpacked in the same
+              # way as the tools used by the current package set.
+              # inherit (bootstrap.test-pkgs) stdenv;
             };
           };
 

From f86a943450fd57496f266fafeb0536055da7806c Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Tue, 17 Nov 2020 02:14:08 +0100
Subject: [PATCH 2642/3942] home-assistant: loosen aiohttp version pin to
 unbreak build

nixpkgs's aiohttp is currently 3.6.3, which is API compatible with 3.6.2
required by home-assistant.
---
 pkgs/servers/home-assistant/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index fb2909c32538..8e5435350eee 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -91,6 +91,7 @@ in with py.pkgs; buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace setup.py \
+      --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \
       --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
       --replace "cryptography==3.2" "cryptography" \
       --replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100"

From 9d39bd3e003f85e26570253fd9849bb721f0db18 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 3 Sep 2020 03:46:35 +0200
Subject: [PATCH 2643/3942] sofia-sip: 1.12.11 -> 1.13.2

this last release on sourceforge is from 2011-03-11
freeswitch seems to be using this and working on it, so we're switching
to their repo
---
 .../development/libraries/sofia-sip/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
index 6758bf7a459f..f8b1c1028520 100644
--- a/pkgs/development/libraries/sofia-sip/default.nix
+++ b/pkgs/development/libraries/sofia-sip/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, glib, openssl, pkgconfig }:
+{ stdenv, fetchFromGitHub, glib, openssl, pkgconfig, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "sofia-sip-1.12.11";
+  pname = "sofia-sip";
+  version = "1.13.2";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/sofia-sip/${name}.tar.gz";
-    sha256 = "10bwsdfijpbk9ahlfpk94kzdapxiahl9mljpgwghvq1630pbq09b";
+  src = fetchFromGitHub {
+    owner = "freeswitch";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "01xj30hhm1ji76igkqkn63rw42vvzq3azkr9qz6fy83iwqaybgyn";
   };
 
   buildInputs = [ glib openssl ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
-    homepage = "http://sofia-sip.sourceforge.net/";
+    homepage = "https://github.com/freeswitch/sofia-sip";
     platforms = platforms.linux;
     license = licenses.lgpl2;
   };

From e184cede9210608ebe5d04972d79338e92ca4b60 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 3 Sep 2020 03:47:48 +0200
Subject: [PATCH 2644/3942] spandsp: 0.0.6 -> 3.0.0

this looks like a new upstream and freeswitch uses this
---
 .../development/libraries/spandsp/default.nix | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index 1f9834c08f47..92a6f66d6364 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -1,23 +1,24 @@
-{stdenv, fetchurl, audiofile, libtiff}:
+{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
 stdenv.mkDerivation rec {
-  version = "0.0.6";
+  version = "3.0.0";
   pname = "spandsp";
-  src=fetchurl {
-    url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
-    sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
+  src = fetchFromGitHub {
+    owner = "freeswitch";
+    repo = pname;
+    rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
+    sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
   };
 
   outputs = [ "out" "dev" ];
 
-  propagatedBuildInputs = [audiofile libtiff];
+  nativeBuildInputs = [ autoreconfHook ];
+  propagatedBuildInputs = [ audiofile libtiff ];
+
   meta = {
     description = "A portable and modular SIP User-Agent with audio and video support";
-    homepage = "http://www.creytiv.com/baresip.html";
+    homepage = "https://github.com/freeswitch/spandsp";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = stdenv.lib.licenses.gpl2;
-    downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
-    inherit version;
-    updateWalker = true;
   };
 }

From 8385c2f9c69fdfbe7bc3d3a4ff6fa6c350f52e82 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 3 Sep 2020 03:48:40 +0200
Subject: [PATCH 2645/3942] freeswitch: 1.10.3 -> 1.10.5

now depends on spandsp and sofia_sip instead of carrying them in-tree
---
 pkgs/servers/sip/freeswitch/default.nix | 17 +++++++++++++----
 pkgs/servers/sip/freeswitch/modules.nix |  6 ++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index f665e6d2a906..975ea9596b3f 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -1,6 +1,6 @@
-{ fetchFromGitHub, stdenv, lib, pkgconfig, autoreconfHook
+{ fetchFromGitHub, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook
 , ncurses, gnutls, readline
-, openssl, perl, sqlite, libjpeg, speex, pcre
+, openssl, perl, sqlite, libjpeg, speex, pcre, libuuid
 , ldns, libedit, yasm, which, libsndfile, libtiff
 
 , callPackage
@@ -88,13 +88,21 @@ in
 
 stdenv.mkDerivation rec {
   pname = "freeswitch";
-  version = "1.10.3";
+  version = "1.10.5";
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0rp4sxqxd2wsb5iyv0mh11l16zxvh7rbgfg0vcgns823gvh8lqai";
+    sha256 = "18dhyb19k28dcm1i8mhqvvgm2phsrmrwyjmfn79glk8pdlalvcha";
   };
+
+  patches = [
+    # https://github.com/signalwire/freeswitch/pull/812 fix mod_spandsp, mod_gsmopen build, drop when updating from 1.10.5
+    (fetchpatch {
+      url = "https://github.com/signalwire/freeswitch/commit/51fba83ed3ed2d9753d8e6b13e13001aca50b493.patch";
+      sha256 = "0h2bmifsyyasxjka3pczbmqym1chvz91fmb589njrdbwpkjyvqh3";
+    })
+  ];
   postPatch = ''
     patchShebangs     libs/libvpx/build/make/rtcd.pl
     substituteInPlace libs/libvpx/build/make/configure.sh \
@@ -114,6 +122,7 @@ stdenv.mkDerivation rec {
     openssl ncurses gnutls readline perl libjpeg
     sqlite pcre speex ldns libedit yasm which
     libsndfile libtiff
+    libuuid
   ]
   ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules)
   ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
diff --git a/pkgs/servers/sip/freeswitch/modules.nix b/pkgs/servers/sip/freeswitch/modules.nix
index 794b45cd227e..226ad90ee1f5 100644
--- a/pkgs/servers/sip/freeswitch/modules.nix
+++ b/pkgs/servers/sip/freeswitch/modules.nix
@@ -9,6 +9,8 @@
 , ffmpeg
 , libmysqlclient
 , postgresql
+, spandsp
+, sofia_sip
 }:
 
 let
@@ -68,7 +70,7 @@ in
     snom = mk "applications/mod_snom" [];
     sonar = mk "applications/mod_sonar" [];
     soundtouch = mk "applications/mod_soundtouch" [];
-    spandsp = mk "applications/mod_spandsp" [];
+    spandsp = mk "applications/mod_spandsp" [ spandsp ];
     spy = mk "applications/mod_spy" [];
     stress = mk "applications/mod_stress" [];
     translate = mk "applications/mod_translate" [];
@@ -136,7 +138,7 @@ in
     rtc = mk "endpoints/mod_rtc" [];
     rtmp = mk "endpoints/mod_rtmp" [];
     skinny = mk "endpoints/mod_skinny" [];
-    sofia = mk "endpoints/mod_sofia" [];
+    sofia = mk "endpoints/mod_sofia" [ sofia_sip ];
     verto = mk "endpoints/mod_verto" [];
   };
 

From 6dda0115ae6166bd27f2b01e9a9ed6b3693dbb75 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 16 Nov 2020 21:24:38 -0500
Subject: [PATCH 2646/3942] xterm: Add update script

---
 .../terminal-emulators/xterm/default.nix      | 80 +++++++++++++++----
 1 file changed, 63 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix
index 109444fc5180..079df1ceffd1 100644
--- a/pkgs/applications/terminal-emulators/xterm/default.nix
+++ b/pkgs/applications/terminal-emulators/xterm/default.nix
@@ -1,29 +1,41 @@
-{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper
-, enableDecLocator ? true
-}:
+{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig
+, makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix
+, gnused, coreutils, enableDecLocator ? true }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-353";
+  pname = "xterm";
+  version = "353";
 
   src = fetchurl {
     urls = [
-     "ftp://ftp.invisible-island.net/xterm/${name}.tgz"
-     "https://invisible-mirror.net/archives/xterm/${name}.tgz"
-   ];
+      "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
+      "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
+    ];
     sha256 = "0s5pkfn4r8iy09s1q1y78zhnr9f3sm6wgbqir7azaqggkppd68g5";
   };
 
-  buildInputs =
-    [ xorg.libXaw xorg.xorgproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
-      ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper
-    ];
+  buildInputs = [
+    xorg.libXaw
+    xorg.xorgproto
+    xorg.libXt
+    xorg.libXext
+    xorg.libX11
+    xorg.libSM
+    xorg.libICE
+    ncurses
+    freetype
+    fontconfig
+    pkgconfig
+    xorg.libXft
+    xorg.luit
+    makeWrapper
+  ];
 
-  patches = [
-    ./sixel-256.support.patch
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl
-    (fetchpatch {
+  patches = [ ./sixel-256.support.patch ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
       name = "posix-ptys.patch";
-      url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1";
+      url =
+        "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1";
       sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr";
     });
 
@@ -62,10 +74,44 @@ stdenv.mkDerivation rec {
     install -D -t $out/share/icons/hicolor/48x48/apps icons/xterm-color_48x48.xpm
   '';
 
+  passthru = {
+    updateScript = let
+      # Tags that end in letters are unstable
+      suffixes = stdenv.lib.concatStringsSep " "
+        (map (c: "-c versionsort.suffix='${c}'")
+          (stdenv.lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz"));
+    in writeScript "update.sh" ''
+      #!${stdenv.shell}
+      set -o errexit
+      PATH=${
+        stdenv.lib.makeBinPath [
+          common-updater-scripts
+          git
+          nixfmt
+          nix
+          coreutils
+          gnused
+        ]
+      }
+
+      oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
+      latestTag="$(git ${suffixes} ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:ThomasDickey/xterm-snapshots.git 'xterm-*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^xterm-||g')"
+
+      if [ ! "$oldVersion" = "$latestTag" ]; then
+        update-source-version ${pname} "$latestTag" --version-key=version --print-changes
+        nixpkgs="$(git rev-parse --show-toplevel)"
+        default_nix="$nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix"
+        nixfmt "$default_nix"
+      else
+        echo "${pname} is already up-to-date"
+      fi
+    '';
+  };
+
   meta = {
     homepage = "https://invisible-island.net/xterm";
     license = with stdenv.lib.licenses; [ mit ];
-    maintainers = with stdenv.lib.maintainers; [vrthra];
+    maintainers = with stdenv.lib.maintainers; [ nequissimus vrthra ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From d2d6b5031ceea77ce9318d077a69d3550872272b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 17 Nov 2020 02:32:43 +0000
Subject: [PATCH 2647/3942] =?UTF-8?q?xterm:=20353=20=E2=86=92=20362?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/terminal-emulators/xterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix
index 079df1ceffd1..d5113ebf8fa8 100644
--- a/pkgs/applications/terminal-emulators/xterm/default.nix
+++ b/pkgs/applications/terminal-emulators/xterm/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "xterm";
-  version = "353";
+  version = "362";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
       "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
     ];
-    sha256 = "0s5pkfn4r8iy09s1q1y78zhnr9f3sm6wgbqir7azaqggkppd68g5";
+    sha256 = "HU/+Im+o8CGFm7wwB3iP9jpGoxJC2b2ae9fr4k6BrKI=";
   };
 
   buildInputs = [

From 61e56265c24ed24527962f2b3d5d049983749c8c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 16 Nov 2020 22:13:13 -0500
Subject: [PATCH 2648/3942] xterm: Add test

---
 nixos/tests/all-tests.nix |  1 +
 nixos/tests/xterm.nix     | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 nixos/tests/xterm.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 868f15a1da37..478d1b1a8d15 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -388,6 +388,7 @@ in
   xmonad = handleTest ./xmonad.nix {};
   xrdp = handleTest ./xrdp.nix {};
   xss-lock = handleTest ./xss-lock.nix {};
+  xterm = handleTest ./xterm.nix {};
   yabar = handleTest ./yabar.nix {};
   yggdrasil = handleTest ./yggdrasil.nix {};
   zfs = handleTest ./zfs.nix {};
diff --git a/nixos/tests/xterm.nix b/nixos/tests/xterm.nix
new file mode 100644
index 000000000000..9f30543bf385
--- /dev/null
+++ b/nixos/tests/xterm.nix
@@ -0,0 +1,23 @@
+import ./make-test-python.nix ({ pkgs, ...} : {
+  name = "xterm";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  machine = { pkgs, ... }:
+    {
+      imports = [ ./common/x11.nix ];
+      services.xserver.desktopManager.xterm.enable = false;
+    };
+
+  testScript =
+    ''
+      machine.wait_for_x()
+      machine.succeed("DISPLAY=:0 xterm -title testterm -class testterm -fullscreen &")
+      machine.sleep(2)
+      machine.send_chars("echo $XTERM_VERSION >> /tmp/xterm_version\n")
+      machine.wait_for_file("/tmp/xterm_version")
+      assert "${pkgs.xterm.version}" in machine.succeed("cat /tmp/xterm_version")
+      machine.screenshot("window")
+    '';
+})

From 48ca228bb353b4527ed48a0b508644d6dc2a153d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 17 Nov 2020 03:43:56 +0000
Subject: [PATCH 2649/3942] _1password-gui: 0.9.3 -> 0.9.4-1

---
 pkgs/tools/security/1password-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix
index 3a02fceeaba6..cce49acacd60 100644
--- a/pkgs/tools/security/1password-gui/default.nix
+++ b/pkgs/tools/security/1password-gui/default.nix
@@ -13,11 +13,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "1password";
-  version = "0.9.3";
+  version = "0.9.4-1";
 
   src = fetchurl {
     url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
-    sha256 = "wO1HwXl6Lf7+2fXX7i8nrD/hi9dAWn50Jkoztx6aT0Q=";
+    sha256 = "1d5k7066hzc7j2nncrj6b85nklpjbn88izlyisznb3m1yxi8jm5i";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 62dad96c3923288b467aa3a0a892b4d15939768d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 17 Nov 2020 04:57:52 +0100
Subject: [PATCH 2650/3942] zigbee2mqtt: 1.16.0 -> 1.16.1

---
 pkgs/servers/zigbee2mqtt/default.nix       |   4 +-
 pkgs/servers/zigbee2mqtt/node-packages.nix | 225 +++++++++++++++------
 2 files changed, 170 insertions(+), 59 deletions(-)

diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix
index 10fa4e3340c9..2998bf630c41 100644
--- a/pkgs/servers/zigbee2mqtt/default.nix
+++ b/pkgs/servers/zigbee2mqtt/default.nix
@@ -3,7 +3,7 @@ let
   package = (import ./node.nix { inherit pkgs system; }).package;
 in
 package.override rec {
-  version = "1.16.0";
+  version = "1.16.1";
   reconstructLock = true;
 
   postInstall = ''
@@ -20,7 +20,7 @@ package.override rec {
     owner = "Koenkk";
     repo = "zigbee2mqtt";
     rev = version;
-    sha256 = "0hahzvp3099g0i4jqbkcq6vndpjigx7b6mg1vjcs5v0wyllxdlwp";
+    sha256 = "16pizkiic7m8w9q56lgzdpy3hpvnw7fwrkkmldg57wpmqmq1r3dj";
   };
 
   passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;
diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix
index 89f3be7119d4..14aa9ccf5683 100644
--- a/pkgs/servers/zigbee2mqtt/node-packages.nix
+++ b/pkgs/servers/zigbee2mqtt/node-packages.nix
@@ -1957,6 +1957,15 @@ let
         sha512 = "cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg==";
       };
     };
+    "buffer-5.7.1" = {
+      name = "buffer";
+      packageName = "buffer";
+      version = "5.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz";
+        sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==";
+      };
+    };
     "buffer-crc32-0.2.13" = {
       name = "buffer-crc32";
       packageName = "buffer-crc32";
@@ -2299,13 +2308,13 @@ let
         sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "concat-stream-2.0.0" = {
+    "concat-stream-1.6.2" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "2.0.0";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz";
-        sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
+        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
       };
     };
     "console-control-strings-1.1.0" = {
@@ -2398,6 +2407,15 @@ let
         sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==";
       };
     };
+    "d-1.0.1" = {
+      name = "d";
+      packageName = "d";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz";
+        sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==";
+      };
+    };
     "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
@@ -2740,6 +2758,60 @@ let
         sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
+    "es5-ext-0.10.53" = {
+      name = "es5-ext";
+      packageName = "es5-ext";
+      version = "0.10.53";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz";
+        sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==";
+      };
+    };
+    "es6-iterator-2.0.3" = {
+      name = "es6-iterator";
+      packageName = "es6-iterator";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz";
+        sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
+      };
+    };
+    "es6-map-0.1.5" = {
+      name = "es6-map";
+      packageName = "es6-map";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz";
+        sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0";
+      };
+    };
+    "es6-set-0.1.5" = {
+      name = "es6-set";
+      packageName = "es6-set";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz";
+        sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1";
+      };
+    };
+    "es6-symbol-3.1.1" = {
+      name = "es6-symbol";
+      packageName = "es6-symbol";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
+        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
+      };
+    };
+    "es6-symbol-3.1.3" = {
+      name = "es6-symbol";
+      packageName = "es6-symbol";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz";
+        sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==";
+      };
+    };
     "escalade-3.1.1" = {
       name = "escalade";
       packageName = "escalade";
@@ -2920,6 +2992,15 @@ let
         sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
       };
     };
+    "event-emitter-0.3.5" = {
+      name = "event-emitter";
+      packageName = "event-emitter";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
+        sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
+      };
+    };
     "eventemitter3-4.0.7" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
@@ -2992,6 +3073,15 @@ let
         sha512 = "BRfxIBHagghMmr1D2MRY0Qv5d3Nc8HCqgbDwNXw/9izmM5eBb42a2YjLKSbsqle76ozGkAEPELQX4IdNHAKRNA==";
       };
     };
+    "ext-1.4.0" = {
+      name = "ext";
+      packageName = "ext";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz";
+        sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==";
+      };
+    };
     "extend-3.0.2" = {
       name = "extend";
       packageName = "extend";
@@ -4963,13 +5053,13 @@ let
         sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==";
       };
     };
-    "mqtt-4.2.4" = {
+    "mqtt-4.2.1" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "4.2.4";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.4.tgz";
-        sha512 = "g3tJt5UOS1Wqn/xntl4JhlJW51OM8CvgEmY8cwZ1zecE5G7uuwjSUUvgGeVDiEMWJ5vXCfZz2VMCQGNvKhzfEQ==";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.1.tgz";
+        sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg==";
       };
     };
     "mqtt-packet-6.6.0" = {
@@ -5053,6 +5143,15 @@ let
         sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==";
       };
     };
+    "next-tick-1.0.0" = {
+      name = "next-tick";
+      packageName = "next-tick";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz";
+        sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
+      };
+    };
     "nice-try-1.0.5" = {
       name = "nice-try";
       packageName = "nice-try";
@@ -6889,6 +6988,24 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
+    "type-1.2.0" = {
+      name = "type";
+      packageName = "type";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz";
+        sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==";
+      };
+    };
+    "type-2.1.0" = {
+      name = "type";
+      packageName = "type";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type/-/type-2.1.0.tgz";
+        sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==";
+      };
+    };
     "type-check-0.3.2" = {
       name = "type-check";
       packageName = "type-check";
@@ -7523,7 +7640,7 @@ let
   args = {
     name = "zigbee2mqtt";
     packageName = "zigbee2mqtt";
-    version = "1.16.0";
+    version = "1.16.1";
     src = ./.;
     dependencies = [
       sources."@dabh/diagnostics-2.0.2"
@@ -7533,17 +7650,15 @@ let
       sources."balanced-match-1.0.0"
       sources."base64-js-1.3.1"
       sources."bindings-1.5.0"
-      sources."bl-4.0.3"
-      sources."brace-expansion-1.1.11"
-      sources."buffer-5.7.0"
-      sources."buffer-from-1.1.1"
-      (sources."callback-stream-1.1.0" // {
+      (sources."bl-4.0.3" // {
         dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
+          sources."readable-stream-3.6.0"
         ];
       })
+      sources."brace-expansion-1.1.11"
+      sources."buffer-5.7.1"
+      sources."buffer-from-1.1.1"
+      sources."callback-stream-1.1.0"
       sources."color-3.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -7552,27 +7667,37 @@ let
       sources."colorspace-1.1.2"
       sources."commist-1.1.0"
       sources."concat-map-0.0.1"
-      sources."concat-stream-2.0.0"
+      sources."concat-stream-1.6.2"
       sources."core-util-is-1.0.2"
+      sources."d-1.0.1"
       sources."debounce-1.2.0"
       sources."debug-2.6.9"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
-      (sources."duplexify-3.7.1" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."duplexify-3.7.1"
       sources."ee-first-1.1.1"
       sources."enabled-2.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
+      sources."es5-ext-0.10.53"
+      sources."es6-iterator-2.0.3"
+      sources."es6-map-0.1.5"
+      (sources."es6-set-0.1.5" // {
+        dependencies = [
+          sources."es6-symbol-3.1.1"
+        ];
+      })
+      sources."es6-symbol-3.1.3"
       sources."escape-html-1.0.3"
       sources."esprima-4.0.1"
       sources."etag-1.8.1"
+      sources."event-emitter-0.3.5"
       sources."eventemitter3-4.0.7"
+      (sources."ext-1.4.0" // {
+        dependencies = [
+          sources."type-2.1.0"
+        ];
+      })
       sources."extend-3.0.2"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
@@ -7587,13 +7712,7 @@ let
       sources."git-last-commit-1.0.0"
       sources."glob-7.1.6"
       sources."glob-parent-3.1.0"
-      (sources."glob-stream-6.1.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."glob-stream-6.1.0"
       sources."glossy-0.1.7"
       sources."help-me-1.1.0"
       sources."http-errors-1.7.3"
@@ -7627,7 +7746,7 @@ let
       sources."minimist-1.2.5"
       sources."mkdir-recursive-0.4.0"
       sources."moment-2.29.1"
-      (sources."mqtt-4.2.4" // {
+      (sources."mqtt-4.2.1" // {
         dependencies = [
           sources."debug-4.2.0"
           sources."ms-2.1.2"
@@ -7641,17 +7760,12 @@ let
       })
       sources."ms-2.0.0"
       sources."nan-2.14.2"
+      sources."next-tick-1.0.0"
       sources."object-assign-deep-0.4.0"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."one-time-1.0.0"
-      (sources."ordered-read-streams-1.0.1" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."ordered-read-streams-1.0.1"
       sources."parseurl-1.3.3"
       sources."path-dirname-1.0.2"
       sources."path-is-absolute-1.0.1"
@@ -7664,12 +7778,12 @@ let
       })
       sources."punycode-2.1.1"
       sources."range-parser-1.2.1"
-      sources."readable-stream-3.6.0"
+      sources."readable-stream-2.3.7"
       sources."reinterval-1.1.0"
       sources."remove-trailing-separator-1.1.0"
       sources."requires-port-1.0.0"
       sources."rimraf-3.0.2"
-      sources."safe-buffer-5.2.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-7.3.2"
       (sources."send-0.17.1" // {
         dependencies = [
@@ -7679,24 +7793,23 @@ let
       sources."serve-static-1.14.1"
       sources."setprototypeof-1.1.1"
       sources."simple-swizzle-0.2.2"
-      sources."split2-3.2.2"
+      (sources."split2-3.2.2" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."sprintf-js-1.0.3"
       sources."stack-trace-0.0.10"
       sources."statuses-1.5.0"
       sources."stream-shift-1.0.1"
-      sources."string_decoder-1.3.0"
+      sources."string_decoder-1.1.1"
       sources."text-hex-1.0.0"
-      (sources."through2-2.0.5" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."through2-2.0.5"
       sources."through2-filter-3.0.0"
       sources."to-absolute-glob-2.0.2"
       sources."toidentifier-1.0.0"
       sources."triple-beam-1.3.0"
+      sources."type-1.2.0"
       sources."typedarray-0.0.6"
       sources."unc-path-regex-0.1.2"
       sources."unique-stream-2.3.1"
@@ -7704,15 +7817,13 @@ let
       sources."unpipe-1.0.0"
       sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
-      sources."winston-3.3.3"
-      sources."winston-syslog-2.4.4"
-      (sources."winston-transport-4.4.0" // {
+      (sources."winston-3.3.3" // {
         dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
+          sources."readable-stream-3.6.0"
         ];
       })
+      sources."winston-syslog-2.4.4"
+      sources."winston-transport-4.4.0"
       sources."wrappy-1.0.2"
       sources."ws-7.3.1"
       sources."xtend-4.0.2"

From 646d46127727c277cf32826391368eff0008ba26 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 17 Nov 2020 07:46:47 +0300
Subject: [PATCH 2651/3942] =?UTF-8?q?nnn:=203.4=20=E2=86=92=203.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 9ec5018c4e3f..fe6f8922adca 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 {
   pname = "nnn";
-  version = "3.4";
+  version = "3.5";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0lyrpyhzzs2bdgx3ifq1c5dq3s2v30xdiaq0j8zjc64s6bghfxnd";
+    sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy";
   };
 
   configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf);

From c7b3e43be0994f14e0afff63ea124dc2f9424615 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 16 Nov 2020 21:08:44 -0800
Subject: [PATCH 2652/3942] shaarli-material: remove package

This has been marked broken since Oct 2019 and has no maintainer.
---
 .../web-apps/shaarli/material-theme.nix       | 38 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 40 deletions(-)
 delete mode 100644 pkgs/servers/web-apps/shaarli/material-theme.nix

diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix
deleted file mode 100644
index bce08646a3b5..000000000000
--- a/pkgs/servers/web-apps/shaarli/material-theme.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "shaarli-material";
-  version = "0.10.4";
-
-  src = fetchFromGitHub {
-    owner = "kalvn";
-    repo = "Shaarli-Material";
-    rev = "v${version}";
-    sha256 = "161kf7linyl2l2d7y60v96xz3fwa572fqm1vbm58mjgkzkfndhrv";
-  };
-
-  patchPhase = ''
-    for f in material/*.html
-    do
-      substituteInPlace $f \
-        --replace '.min.css?v={$version_hash}"' '.min.css#"' \
-        --replace '.min.js?v={$version_hash}"'  '.min.js#"' \
-        --replace '.png"'     '.png#"'
-    done
-  '';
-
-  installPhase = ''
-    mv material/ $out
-  '';
-
-  meta = with stdenv.lib; {
-    # This package has not been updated for the new build process
-    # introduced in 0.10.3 which depends on npm and gulp.
-    broken = true;
-    description = "A theme base on Google's Material Design for Shaarli, the superfast delicious clone";
-    license = licenses.mit;
-    homepage = "https://github.com/kalvn/Shaarli-Material";
-    maintainers = with maintainers; [ ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85d7890dd6e7..8e4bb6bdd448 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17518,8 +17518,6 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
   shaarli = callPackage ../servers/web-apps/shaarli { };
 
-  shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { };
-
   shiori = callPackage ../servers/web-apps/shiori { };
 
   inherit (callPackages ../servers/web-apps/matomo {})

From aa760bf5a5e0131f4ffc62eba6391723a9ea97f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 17 Nov 2020 05:39:14 +0000
Subject: [PATCH 2653/3942] bitwarden: 1.22.2 -> 1.23.0

---
 pkgs/tools/security/bitwarden/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
index 113c00b88887..c35a4d60e9e7 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -17,11 +17,11 @@ let
   pname = "bitwarden";
 
   version = {
-    x86_64-linux = "1.22.2";
+    x86_64-linux = "1.23.0";
   }.${system} or "";
 
   sha256 = {
-    x86_64-linux = "1yx550whld0dg3b10x57r2nzizydla4i40zqqm6dzd3wic8yi365";
+    x86_64-linux = "1z1r8327xymqf2h98wb2fb02s41pxc6fh5w4bxmdgpx7k1jx5kvg";
   }.${system} or "";
 
   meta = with stdenv.lib; {

From 0f049c8d118752a35c146c74c2e344814fb880ec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 06:07:16 +0000
Subject: [PATCH 2654/3942] strawberry: 0.8.2 -> 0.8.3

---
 pkgs/applications/audio/strawberry/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index fa6ee383c9e6..9243bc66544e 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -35,13 +35,13 @@
 
 mkDerivation rec {
   pname = "strawberry";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "jonaski";
     repo = pname;
     rev = version;
-    sha256 = "sha256-tJcpjviCXA1Y/PX1jlXphXZZMWBAAg3kdbsj41tmunE=";
+    sha256 = "0v3rbpaz6pqkam0cj86ydq8gc2rhas8mhwgvy31djvxng9nv3h5j";
   };
 
   buildInputs = [

From 7b21c0b5c7772c55700df8670f1bd2f579898563 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 17 Nov 2020 06:42:48 +0000
Subject: [PATCH 2655/3942] cinnamon.cinnamon-control-center: 4.6.0 -> 4.6.2

---
 pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
index ef934d2389f9..50eeb23b6819 100644
--- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-control-center";
-  version = "4.6.0";
+  version = "4.6.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "0ls2ys4x6qqp0j727c4n7a6319m4k1qsy1ybxkfzlzgf750v9xda";
+    sha256 = "0fbgi2r2xikpa04k431qq9akngi9akyflq1kcks8f095qs5gsana";
   };
 
   buildInputs = [

From 929db7f52fcd8e4bb43f97925649973403f33837 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Mon, 16 Nov 2020 15:47:55 +0800
Subject: [PATCH 2656/3942] vulkan-tools: Correct description in metadata

Use the github repo here as the homepage as lunarg.com has heaps of
stuff besides these tools.
---
 pkgs/tools/graphics/vulkan-tools/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index e320e4e6ef3b..ff620ef8287b 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -30,8 +30,13 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    description = "LunarG Vulkan loader";
-    homepage    = "https://www.lunarg.com";
+    description = "Khronos official Vulkan Tools and Utilities";
+    longDescription = ''
+      This project provides Vulkan tools and utilities that can assist
+      development by enabling developers to verify their applications correct
+      use of the Vulkan API.
+    '';
+    homepage    = "https://github.com/KhronosGroup/Vulkan-Tools";
     platforms   = platforms.linux;
     license     = licenses.asl20;
     maintainers = [ maintainers.ralith ];

From b2fae2dbdfae191dddc825ef29c3badd83678016 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Mon, 16 Nov 2020 15:47:55 +0800
Subject: [PATCH 2657/3942] vulkan-tools-lunarg: init at 1.2.141.0

---
 .../graphics/vulkan-tools-lunarg/default.nix  | 86 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 87 insertions(+)
 create mode 100644 pkgs/tools/graphics/vulkan-tools-lunarg/default.nix

diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
new file mode 100644
index 000000000000..9ce87b4cb671
--- /dev/null
+++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
@@ -0,0 +1,86 @@
+{ stdenv, cmake, expat, fetchFromGitHub, jq, lib, libXdmcp, libXrandr, libffi
+, libxcb, pkgconfig, python3, symlinkJoin, vulkan-headers, vulkan-loader
+, vulkan-validation-layers, wayland, writeText, xcbutilkeysyms, xcbutilwm
+, xlibsWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "vulkan-tools-lunarg";
+  # The version must match that in vulkan-headers
+  version = "1.2.141.0";
+
+  src = (assert version == vulkan-headers.version; fetchFromGitHub {
+    owner = "LunarG";
+    repo = "VulkanTools";
+    rev = "sdk-${version}";
+    sha256 = "1zsgc1hdmivdahzrarx7a5byhgnmm5ahz366l92fmdb8pffgq42g";
+    fetchSubmodules = true;
+  });
+
+  nativeBuildInputs = [ cmake pkgconfig python3 jq ];
+
+  buildInputs = [
+    expat
+    libXdmcp
+    libXrandr
+    libffi
+    libxcb
+    wayland
+    xcbutilkeysyms
+    xcbutilwm
+    xlibsWrapper
+  ];
+
+  cmakeFlags = [
+    "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
+    "-DVULKAN_LOADER_INSTALL_DIR=${vulkan-loader}"
+    "-DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=${
+      symlinkJoin {
+        name = "vulkan-validation-layers-merged";
+        paths = [ vulkan-validation-layers.headers vulkan-validation-layers ];
+      }
+    }"
+  ];
+
+  preConfigure = ''
+    # We need to run this update script which generates some source files,
+    # Remove the line in it which calls 'git submodule update' though.
+    # Also patch the scripts in ./scripts
+    update=update_external_sources.sh
+    patchShebangs $update
+    patchShebangs scripts/*
+    sed -i '/^git /d' $update
+    ./$update
+  '';
+
+  # Include absolute paths to layer libraries in their associated
+  # layer definition json files.
+  preFixup = ''
+    for f in "$out"/etc/vulkan/explicit_layer.d/*.json "$out"/etc/vulkan/implicit_layer.d/*.json; do
+      jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path"
+      mv tmp.json "$f"
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  # Same as vulkan-validation-layers
+  libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];
+  dontPatchELF = true;
+
+  # Help vulkan-loader find the validation layers
+  setupHook = writeText "setup-hook" ''
+    export XDG_CONFIG_DIRS=@out@/etc''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "LunarG Vulkan Tools and Utilities";
+    longDescription = ''
+      Tools to aid in Vulkan development including useful layers, trace and
+      replay, and tests.
+    '';
+    homepage = "https://github.com/LunarG/VulkanTools";
+    platforms = platforms.linux;
+    license = licenses.asl20;
+    maintainers = [ maintainers.expipiplus1 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36025ad06f5a..06536bb15cca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16159,6 +16159,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
   vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
   vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
   vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };
+  vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
   vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
 
   vtkWithQt5 = vtk.override { qtLib = qt514; };

From e5e032a5320a6b5be27786fe89e3234a210fa8f1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 10 Nov 2020 05:53:24 +0100
Subject: [PATCH 2658/3942] =?UTF-8?q?ocamlPackages.camlimages:=205.0.3=20?=
 =?UTF-8?q?=E2=86=92=205.0.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/camlimages/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix
index 5874e7a52d35..ba36cfa05b99 100644
--- a/pkgs/development/ocaml-modules/camlimages/default.nix
+++ b/pkgs/development/ocaml-modules/camlimages/default.nix
@@ -1,8 +1,10 @@
-{ lib, fetchFromGitLab, buildDunePackage, dune-configurator, cppo, lablgtk, stdio }:
+{ lib, fetchFromGitLab, buildDunePackage, dune-configurator, cppo
+, graphics, lablgtk, stdio
+}:
 
 buildDunePackage rec {
   pname = "camlimages";
-  version = "5.0.3";
+  version = "5.0.4";
 
   useDune2 = true;
 
@@ -12,10 +14,10 @@ buildDunePackage rec {
     owner = "camlspotter";
     repo = pname;
     rev = version;
-    sha256 = "1ng9pkvrzlibfyf97iqvmbsqcykz8v1ln106xhq9nigih5i68zyd";
+    sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4";
   };
 
-  buildInputs = [ dune-configurator cppo lablgtk stdio ];
+  buildInputs = [ dune-configurator cppo graphics lablgtk stdio ];
 
   meta = with lib; {
     branch = "5.0";

From b9a2a8a26152f7c30ac8da865965912ad7d57a17 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 17 Nov 2020 07:52:26 +0800
Subject: [PATCH 2659/3942] lgogdownloader: 3.5 -> 3.7

---
 pkgs/games/lgogdownloader/default.nix | 37 +++++++++++++++------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix
index 69200bd184fc..6fba4da3a0e4 100644
--- a/pkgs/games/lgogdownloader/default.nix
+++ b/pkgs/games/lgogdownloader/default.nix
@@ -1,33 +1,36 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, curl, boost, liboauth, jsoncpp
-, htmlcxx, rhash, tinyxml-2, help2man, fetchpatch }:
+{ stdenv
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, curl
+, boost
+, liboauth
+, jsoncpp
+, htmlcxx
+, rhash
+, tinyxml-2
+, help2man
+}:
 
 stdenv.mkDerivation rec {
   pname = "lgogdownloader";
-  version = "3.5";
+  version = "3.7";
 
   src = fetchFromGitHub {
     owner = "Sude-";
     repo = "lgogdownloader";
     rev = "v${version}";
-    sha256 = "0a3rrkgqwdqxx3ghzw182jx88gzzw6ldp3jasmgnr4l7gpxkmwws";
+    sha256 = "sha256-3xFlFokqdD1Nstu7TSUCaHUxvSodIb12QNVjmNgn9gs=";
   };
 
   nativeBuildInputs = [ cmake pkgconfig help2man ];
 
-  buildInputs = [ curl boost liboauth jsoncpp htmlcxx rhash tinyxml-2 ];
+  buildInputs = [ boost curl htmlcxx jsoncpp liboauth rhash tinyxml-2 ];
 
-  patches = [
-    # Fix find_path for newer jsoncpp. Remove with the next release
-    (fetchpatch {
-      url = "https://github.com/Sude-/lgogdownloader/commit/ff353126ecda61824cf866d3807c9ebada96282e.patch";
-      sha256 = "1xr1lwxlrncrj662s9l1is1x1mhs1jbwlj8qafixz5hw2kx22w19";
-    })
-  ];
-
-  meta = {
-    homepage = "https://github.com/Sude-/lgogdownloader";
+  meta = with stdenv.lib; {
     description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader";
-    license = stdenv.lib.licenses.wtfpl;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://github.com/Sude-/lgogdownloader";
+    license = licenses.wtfpl;
+    platforms = platforms.linux;
   };
 }

From 88aedac5d34990bac0c3ebe4515b547e744e34fb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 17 Nov 2020 08:22:33 +0000
Subject: [PATCH 2660/3942] cimg: 2.9.2 -> 2.9.3

---
 pkgs/development/libraries/cimg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index c50838bc0d52..400326f6fcaf 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cimg";
-  version = "2.9.2";
+  version = "2.9.3";
 
   src = fetchFromGitHub {
     owner = "dtschump";
     repo = "CImg";
     rev = "v.${version}";
-    sha256 = "01hvjlxclbmrzqb8qz1h2sdkpybpg14q81na8kfi94w3bkkkmzzf";
+    sha256 = "1pkjbwpi0047lbc55cva99rj6p70gbw09l14vrym0igwipnxxx0z";
   };
 
   installPhase = ''

From 54e33fd2762a90880723996f7194d273b12f7c89 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 17 Nov 2020 08:33:33 +0000
Subject: [PATCH 2661/3942] clipgrab: 3.8.15 -> 3.9.2

---
 pkgs/applications/video/clipgrab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index d53c189986d7..d979a25d2d1b 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -5,10 +5,10 @@
 
 mkDerivation rec {
   pname = "clipgrab";
-  version = "3.8.15";
+  version = "3.9.2";
 
   src = fetchurl {
-    sha256 = "1anp8hhwbkirsvc7mn11k272f0d85vzb5ppiw3gg9ss2hdai563n";
+    sha256 = "1ckcprqck96ns752vk9bzlc3gm6b5f0piff2d3m55zrvdh7wpgy5";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
   };

From ba9d95ca8f5dfe6b48456b368f27a90f4a67f5b5 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 14 Nov 2020 10:29:40 +0200
Subject: [PATCH 2662/3942] julia_10: rewrite

Don't use ./shared.nix as it's not shared anymore.
Fix tests with an upstream patch and a few commands in postPatch.
Assert that blas and lapack are compatible.
Rename utf8proc patch.
---
 pkgs/development/compilers/julia/1.0.nix      | 206 ++++++++++++++++-
 .../compilers/julia/diagonal-test.patch       |  27 +++
 pkgs/development/compilers/julia/shared.nix   | 210 ------------------
 ...ch => use-system-utf8proc-julia-1.0.patch} |   0
 pkgs/top-level/all-packages.nix               |   1 +
 5 files changed, 233 insertions(+), 211 deletions(-)
 create mode 100644 pkgs/development/compilers/julia/diagonal-test.patch
 delete mode 100644 pkgs/development/compilers/julia/shared.nix
 rename pkgs/development/compilers/julia/{0001.1-use-system-utf8proc.patch => use-system-utf8proc-julia-1.0.patch} (100%)

diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix
index 3cd9daee1416..a98b69f50e9f 100644
--- a/pkgs/development/compilers/julia/1.0.nix
+++ b/pkgs/development/compilers/julia/1.0.nix
@@ -1,4 +1,19 @@
-import ./shared.nix {
+{ stdenv, fetchpatch, fetchurl, fetchzip
+# build tools
+, gfortran, m4, makeWrapper, patchelf, perl, which, python2
+, cmake
+# libjulia dependencies
+, libunwind, readline, utf8proc, zlib
+# standard library dependencies
+, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
+# linear algebra
+, blas, lapack, arpack
+# Darwin frameworks
+, CoreServices, ApplicationServices
+}:
+
+
+let
   majorVersion = "1";
   minorVersion = "0";
   maintenanceVersion = "4";
@@ -6,4 +21,193 @@ import ./shared.nix {
 
   libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e";
   libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs";
+
+  dsfmtVersion = "2.2.3";
+  dsfmt = fetchurl {
+    url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
+    sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
+  };
+
+  libuv = fetchurl {
+    url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
+    sha256 = libuvSha256;
+  };
+
+  rmathVersion = "0.1";
+  rmath-julia = fetchurl {
+    url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
+    sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
+  };
+
+  virtualenvVersion = "15.0.0";
+  virtualenv = fetchurl {
+    url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
+    sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
+  };
+
+  libwhichVersion = "81e9723c0273d78493dc8c8ed570f68d9ce7e89e";
+  libwhich = fetchurl {
+    url = "https://api.github.com/repos/vtjnash/libwhich/tarball/${libwhichVersion}";
+    sha256 = "1p7zg31kpmpbmh1znrk1xrbd074agx13b9q4dcw8n2zrwwdlbz3b";
+  };
+
+  llvmVersion = "6.0.0";
+  llvm = fetchurl {
+    url = "http://releases.llvm.org/6.0.0/llvm-${llvmVersion}.src.tar.xz";
+    sha256 = "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z";
+  };
+
+  suitesparseVersion = "4.4.5";
+  suitesparse = fetchurl {
+    url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${suitesparseVersion}.tar.gz";
+    sha256 = "1jcbxb8jx5wlcixzf6n5dca2rcfx6mlcms1k2rl5gp67ay3bix43";
+  };
+  version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
+in
+
+stdenv.mkDerivation rec {
+  pname = "julia";
+  inherit version;
+
+  src = fetchzip {
+    url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
+    sha256 = src_sha256;
+  };
+
+  nativeBuildInputs = [ cmake curl gfortran m4 makeWrapper patchelf perl python2 which ];
+  # cmake is only used to build the bundled deps
+  dontUseCmakeConfigure = true;
+
+  # We assert that compatible blas and lapack are used.
+  buildInputs = assert (blas.isILP64 == lapack.isILP64); [
+    arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
+    pcre2.dev blas lapack openlibm openspecfun readline utf8proc
+    zlib
+  ]
+  ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
+  ;
+
+  patches = [
+    # Julia recompiles a precompiled file if the mtime stored *in* the
+    # .ji file differs from the mtime of the .ji file.  This
+    # doesn't work in Nix because Nix changes the mtime of files in
+    # the Nix store to 1. So patch Julia to accept mtimes of 1.
+    ./allow_nix_mtime.patch
+    ./diagonal-test.patch
+    ./use-system-utf8proc-julia-1.0.patch
+  ];
+
+  postPatch = ''
+    patchShebangs . contrib
+    for i in backtrace cmdlineargs; do
+      mv test/$i.jl{,.off}
+      touch test/$i.jl
+    done
+    rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl
+    rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl
+    sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl
+    sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl
+  '';
+  prePatch = ''
+    mkdir deps/srccache
+    cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
+    cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
+    cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
+    cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
+    cp "${libwhich}" "./deps/srccache/libwhich-${libwhichVersion}.tar.gz"
+    cp "${llvm}" "./deps/srccache/llvm-${llvmVersion}.src.tar.xz"
+    cp "${suitesparse}" "./deps/srccache/SuiteSparse-${suitesparseVersion}.tar.gz"
+  '';
+
+  makeFlags =
+    let
+      arch = stdenv.lib.head (stdenv.lib.splitString "-" stdenv.system);
+      march = {
+        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+        i686 = "pentium4";
+        aarch64 = "armv8-a";
+      }.${arch}
+              or (throw "unsupported architecture: ${arch}");
+      # Julia requires Pentium 4 (SSE2) or better
+      cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch}
+                  or (throw "unsupported architecture: ${arch}");
+    in [
+      "ARCH=${arch}"
+      "MARCH=${march}"
+      "JULIA_CPU_TARGET=${cpuTarget}"
+      "PREFIX=$(out)"
+      "prefix=$(out)"
+      "SHELL=${stdenv.shell}"
+
+      "USE_SYSTEM_BLAS=1"
+      "USE_BLAS64=${if blas.isILP64 then "1" else "0"}"
+
+      "USE_SYSTEM_LAPACK=1"
+
+      "USE_SYSTEM_ARPACK=1"
+      "USE_SYSTEM_FFTW=1"
+      "USE_SYSTEM_GMP=1"
+      "USE_SYSTEM_LIBGIT2=1"
+      "USE_SYSTEM_LIBUNWIND=1"
+
+      # We will probably never do that
+      #"USE_SYSTEM_LLVM=1"
+      "LLVM_VER=6.0.0"
+
+      "USE_SYSTEM_MPFR=1"
+      "USE_SYSTEM_OPENLIBM=1"
+      "USE_SYSTEM_OPENSPECFUN=1"
+      "USE_SYSTEM_PATCHELF=1"
+      "USE_SYSTEM_PCRE=1"
+      "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
+      "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
+      "USE_SYSTEM_READLINE=1"
+      "USE_SYSTEM_UTF8PROC=1"
+      "USE_SYSTEM_ZLIB=1"
+    ];
+
+  LD_LIBRARY_PATH = assert (blas.isILP64 == lapack.isILP64); (stdenv.lib.makeLibraryPath [
+    arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm
+    openspecfun pcre2
+  ]);
+
+  enableParallelBuilding = true;
+
+  doCheck = !stdenv.isDarwin;
+  checkTarget = "testall";
+  # Julia's tests require read/write access to $HOME
+  preCheck = ''
+    export HOME="$NIX_BUILD_TOP"
+  '';
+
+  preBuild = ''
+    sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
+    sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+  '';
+
+  postInstall = ''
+    # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
+    # as using a wrapper with LD_LIBRARY_PATH causes segmentation
+    # faults when program returns an error:
+    #   $ julia -e 'throw(Error())'
+    find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
+      if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
+        ln -sv $lib $out/lib/julia/$(basename $lib)
+      fi
+    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/";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
+  };
 }
diff --git a/pkgs/development/compilers/julia/diagonal-test.patch b/pkgs/development/compilers/julia/diagonal-test.patch
new file mode 100644
index 000000000000..dd31e67e9d34
--- /dev/null
+++ b/pkgs/development/compilers/julia/diagonal-test.patch
@@ -0,0 +1,27 @@
+From 9eb180c523b877a53b9e1cf53a4d5e6dad3d7bfe Mon Sep 17 00:00:00 2001
+From: Lars Jellema <lars.jellema@gmail.com>
+Date: Sat, 19 Sep 2020 13:52:20 +0200
+Subject: [PATCH] Use approximate comparisons for diagonal tests
+
+---
+ stdlib/LinearAlgebra/test/diagonal.jl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/stdlib/LinearAlgebra/test/diagonal.jl b/stdlib/LinearAlgebra/test/diagonal.jl
+index e420d5bc6d..7f1b5d0aec 100644
+--- a/stdlib/LinearAlgebra/test/diagonal.jl
++++ b/stdlib/LinearAlgebra/test/diagonal.jl
+@@ -450,8 +450,8 @@ end
+         M = randn(T, 5, 5)
+         MM = [randn(T, 2, 2) for _ in 1:2, _ in 1:2]
+         for transform in (identity, adjoint, transpose, Adjoint, Transpose)
+-            @test lmul!(transform(D), copy(M)) == *(transform(Matrix(D)), M)
+-            @test rmul!(copy(M), transform(D)) == *(M, transform(Matrix(D)))
++            @test lmul!(transform(D), copy(M)) ≈ *(transform(Matrix(D)), M)
++            @test rmul!(copy(M), transform(D)) ≈ *(M, transform(Matrix(D)))
+             @test lmul!(transform(DD), copy(MM)) == *(transform(fullDD), MM)
+             @test rmul!(copy(MM), transform(DD)) == *(MM, transform(fullDD))
+         end
+-- 
+2.28.0
+
diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix
deleted file mode 100644
index 29ac41150506..000000000000
--- a/pkgs/development/compilers/julia/shared.nix
+++ /dev/null
@@ -1,210 +0,0 @@
-{ majorVersion
-, minorVersion
-, maintenanceVersion
-, src_sha256
-# source deps
-, libuvVersion
-, libuvSha256
-}:
-{ stdenv, fetchurl, fetchzip
-# build tools
-, gfortran, m4, makeWrapper, patchelf, perl, which, python2
-, cmake
-# libjulia dependencies
-, libunwind, readline, utf8proc, zlib
-# standard library dependencies
-, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
-# linear algebra
-, blas, lapack, arpack
-# Darwin frameworks
-, CoreServices, ApplicationServices
-}:
-
-with stdenv.lib;
-
-assert (!blas.isILP64) && (!lapack.isILP64);
-
-let
-  dsfmtVersion = "2.2.3";
-  dsfmt = fetchurl {
-    url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
-    sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
-  };
-
-  libuv = fetchurl {
-    url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
-    sha256 = libuvSha256;
-  };
-
-  rmathVersion = "0.1";
-  rmath-julia = fetchurl {
-    url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
-    sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
-  };
-
-  virtualenvVersion = "15.0.0";
-  virtualenv = fetchurl {
-    url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
-    sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
-  };
-
-  libwhichVersion = "81e9723c0273d78493dc8c8ed570f68d9ce7e89e";
-  libwhich = fetchurl {
-    url = "https://api.github.com/repos/vtjnash/libwhich/tarball/${libwhichVersion}";
-    sha256 = "1p7zg31kpmpbmh1znrk1xrbd074agx13b9q4dcw8n2zrwwdlbz3b";
-  };
-
-  llvmVersion = "6.0.0";
-  llvm = fetchurl {
-    url = "http://releases.llvm.org/6.0.0/llvm-${llvmVersion}.src.tar.xz";
-    sha256 = "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z";
-  };
-
-  suitesparseVersion = "4.4.5";
-  suitesparse = fetchurl {
-    url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${suitesparseVersion}.tar.gz";
-    sha256 = "1jcbxb8jx5wlcixzf6n5dca2rcfx6mlcms1k2rl5gp67ay3bix43";
-  };
-  version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
-in
-
-stdenv.mkDerivation rec {
-  pname = "julia";
-  inherit version;
-
-  src = fetchzip {
-    url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = src_sha256;
-  };
-  prePatch = ''
-    export PATH=$PATH:${cmake}/bin
-    mkdir deps/srccache
-    cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
-    cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
-    cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
-    cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
-    cp "${libwhich}" "./deps/srccache/libwhich-${libwhichVersion}.tar.gz"
-    cp "${llvm}" "./deps/srccache/llvm-${llvmVersion}.src.tar.xz"
-    cp "${suitesparse}" "./deps/srccache/SuiteSparse-${suitesparseVersion}.tar.gz"
-  '';
-
-  patches = [
-    ./0001.1-use-system-utf8proc.patch
-
-    # Julia recompiles a precompiled file if the mtime stored *in* the
-    # .ji file differs from the mtime of the .ji file.  This
-    # doesn't work in Nix because Nix changes the mtime of files in
-    # the Nix store to 1. So patch Julia to accept mtimes of 1.
-    ./allow_nix_mtime.patch
-  ];
-
-  postPatch = ''
-    patchShebangs . contrib
-    for i in backtrace cmdlineargs; do
-      mv test/$i.jl{,.off}
-      touch test/$i.jl
-    done
-    rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl
-    rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl
-    sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl
-    sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl
-  '';
-
-  buildInputs = [
-    arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
-    pcre2.dev blas lapack openlibm openspecfun readline utf8proc
-    zlib
-  ]
-  ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
-  ;
-
-  nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
-
-  makeFlags =
-    let
-      arch = head (splitString "-" stdenv.system);
-      march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch}
-              or (throw "unsupported architecture: ${arch}");
-      # Julia requires Pentium 4 (SSE2) or better
-      cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch}
-                  or (throw "unsupported architecture: ${arch}");
-    in [
-      "ARCH=${arch}"
-      "MARCH=${march}"
-      "JULIA_CPU_TARGET=${cpuTarget}"
-      "PREFIX=$(out)"
-      "prefix=$(out)"
-      "SHELL=${stdenv.shell}"
-
-      "USE_SYSTEM_BLAS=1"
-      "USE_BLAS64=${if blas.isILP64 then "1" else "0"}"
-
-      "USE_SYSTEM_LAPACK=1"
-
-      "USE_SYSTEM_ARPACK=1"
-      "USE_SYSTEM_FFTW=1"
-      "USE_SYSTEM_GMP=1"
-      "USE_SYSTEM_LIBGIT2=1"
-      "USE_SYSTEM_LIBUNWIND=1"
-
-      #"USE_SYSTEM_LLVM=1"
-      "LLVM_VER=6.0.0"
-
-      "USE_SYSTEM_MPFR=1"
-      "USE_SYSTEM_OPENLIBM=1"
-      "USE_SYSTEM_OPENSPECFUN=1"
-      "USE_SYSTEM_PATCHELF=1"
-      "USE_SYSTEM_PCRE=1"
-      "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
-      "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
-      "USE_SYSTEM_READLINE=1"
-      "USE_SYSTEM_UTF8PROC=1"
-      "USE_SYSTEM_ZLIB=1"
-    ];
-
-  LD_LIBRARY_PATH = makeLibraryPath [
-    arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm
-    openspecfun pcre2
-  ];
-
-  enableParallelBuilding = true;
-
-  doCheck = !stdenv.isDarwin;
-  checkTarget = "testall";
-  # Julia's tests require read/write access to $HOME
-  preCheck = ''
-    export HOME="$NIX_BUILD_TOP"
-  '';
-
-  preBuild = ''
-    sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
-    sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-  '';
-
-  postInstall = ''
-    # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
-    # as using a wrapper with LD_LIBRARY_PATH causes segmentation
-    # faults when program returns an error:
-    #   $ julia -e 'throw(Error())'
-    find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
-      if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
-        ln -sv $lib $out/lib/julia/$(basename $lib)
-      fi
-    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/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
-    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
-    broken = stdenv.isi686;
-  };
-}
diff --git a/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch b/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.0.patch
similarity index 100%
rename from pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch
rename to pkgs/development/compilers/julia/use-system-utf8proc-julia-1.0.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e0efbb8d70a..e7fa87cf8887 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9518,6 +9518,7 @@ in
   julia_10 = callPackage ../development/compilers/julia/1.0.nix {
     gmp = gmp6;
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
+    libgit2 = libgit2_0_27;
   };
 
   julia_13 = callPackage ../development/compilers/julia/1.3.nix {

From 18e21a5a7d8dea3ec24a48112ba089727cefe254 Mon Sep 17 00:00:00 2001
From: Evax Software <contact@evax.fr>
Date: Tue, 17 Nov 2020 10:09:52 +0100
Subject: [PATCH 2663/3942] Remove VueScan

The author is forbidding packaging of his software.
---
 .../applications/graphics/vuescan/default.nix | 107 ------------------
 pkgs/top-level/all-packages.nix               |   2 -
 2 files changed, 109 deletions(-)
 delete mode 100644 pkgs/applications/graphics/vuescan/default.nix

diff --git a/pkgs/applications/graphics/vuescan/default.nix b/pkgs/applications/graphics/vuescan/default.nix
deleted file mode 100644
index 142e8f0b69f0..000000000000
--- a/pkgs/applications/graphics/vuescan/default.nix
+++ /dev/null
@@ -1,107 +0,0 @@
-{ stdenv
-, fetchurl
-, gnutar
-, autoPatchelfHook
-, glibc
-, gtk2
-, xorg
-, libgudev
-, undmg
-}:
-
-let
-  inherit (stdenv.hostPlatform) system;
-  throwSystem = throw "Unsupported system: ${system}";
-
-  pname = "vuescan";
-
-  # Minor versions are released using the same file name
-  version = "9.7";
-  versionString = builtins.replaceStrings ["."] [""] version;
-
-  src = let
-    base = "https://www.hamrick.com/files/";
-  in {
-    x86_64-darwin = fetchurl {
-      url = "${base}/vuex64${versionString}.dmg";
-      sha256 = "045ihd2pj0zmzjfwn2qmv5114yvs9vf6mw6sf4x3hwcdmpk40sfh";
-    };
-    i686-darwin = fetchurl {
-      url = "${base}/vuex32${versionString}.dmg";
-      sha256 = "0nny1jm3s1nr7xm03mcy3zgxvslznnvc8a5gn93gjww6gwg9rcn6";
-    };
-    x86_64-linux = fetchurl {
-      url = "${base}/vuex64${versionString}.tgz";
-      sha256 = "0jkj92w3y66dcxwq3kkg7vhqxljwf9dqs563xbkh1r7piyjfwycm";
-    };
-    i686-linux = fetchurl {
-      url = "${base}/vuex32${versionString}.tgz";
-      sha256 = "03qac9c0sg21jwz91nzzwk3ml8byv06ay9wiq00dl62nmhs20r5m";
-    };
-    aarch64-linux = fetchurl {
-      url = "${base}/vuea64${versionString}.tgz";
-      sha256 = "17viy7kcb78j0p3ik99psabmkgpwpmgvk96wjhn9aar48gpyr1wj";
-    };
-    armv6l-linux = fetchurl {
-      url = "${base}/vuea32${versionString}.tgz";
-      sha256 = "0m7sp18bdf2l2yf3q3z6c3i0bm4mq2h4ndm6qfvyknip0h11gv7i";
-    };
-  }.${system} or throwSystem;
-
-  meta = with stdenv.lib; {
-    description = "Scanner software supporting a wide range of devices";
-    homepage = "https://hamrick.com/";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ evax ];
-    platforms = [
-      "x86_64-darwin" "i686-darwin"
-      "x86_64-linux" "i686-linux"
-      "aarch64-linux" "armv6l-linux"
-    ];
-  };
-
-  linux = stdenv.mkDerivation rec {
-    inherit pname version src meta;
-
-    # Stripping the binary breaks the license form
-    dontStrip = true;
-
-    nativeBuildInputs = [
-      gnutar
-      autoPatchelfHook
-    ];
-
-    buildInputs = [
-      glibc
-      gtk2
-      xorg.libSM
-      libgudev
-    ];
-
-    unpackPhase = ''
-      tar xfz $src
-    '';
-
-    installPhase = ''
-      install -m755 -D VueScan/vuescan $out/bin/vuescan
-    '';
-  };
-
-  darwin = stdenv.mkDerivation {
-    inherit pname version src meta;
-
-    nativeBuildInputs = [ undmg ];
-
-    sourceRoot = {
-      x86_64-darwin = "vuex64${versionString}.dmg";
-      i686-darwin = "vuex32${versionString}.dmg";
-    }.${system} or throwSystem;
-
-    installPhase = ''
-      mkdir -p $out/Applications/VueScan.app
-      cp -R . $out/Applications/VueScan.app
-    '';
-  };
-in if stdenv.isDarwin
-  then darwin
-  else linux
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index abfd21e2b4e7..8c0fd95f1e0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24126,8 +24126,6 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
     inherit (gnome2) libgnomeui;
   };
 
-  vuescan = callPackage ../applications/graphics/vuescan { };
-
   vim = callPackage ../applications/editors/vim {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };

From cbf437c442695e4a2c1c7307ec4ef96f6be3899e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 17 Nov 2020 09:20:12 +0000
Subject: [PATCH 2664/3942] cdk: 5.0-20190224 -> 5.0-20200923

---
 pkgs/development/libraries/cdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
index 8487435981ca..4613eefd3b90 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "cdk";
-  version ="5.0-20190224";
+  version ="5.0-20200923";
 
   buildInputs = [
     ncurses
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
       "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz"
       "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz"
     ];
-    sha256 = "0767xqwm377ak909c589vqm0v83slsnkm2ycq7bg545xx5nycncs";
+    sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0";
   };
 
   meta = with stdenv.lib; {

From b605b989c5fa327625eb1027b06368bd26f08dd1 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Wed, 11 Nov 2020 11:39:49 +0100
Subject: [PATCH 2665/3942] scribusUnstable: 1.5.5 -> 1.5.6.1

---
 pkgs/applications/office/scribus/unstable.nix | 45 ++-----------------
 1 file changed, 4 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
index ff69329140bf..c2c300b87486 100644
--- a/pkgs/applications/office/scribus/unstable.nix
+++ b/pkgs/applications/office/scribus/unstable.nix
@@ -18,7 +18,7 @@
 , podofo
 , poppler
 , poppler_data
-, python2
+, python3
 , qtbase
 , qtimageformats
 , qttools
@@ -26,7 +26,7 @@
 }:
 
 let
-  pythonEnv = python2.withPackages (
+  pythonEnv = python3.withPackages (
     ps: [
       ps.pillow
       ps.tkinter
@@ -36,50 +36,13 @@ in
 mkDerivation rec {
   pname = "scribus";
 
-  version = "1.5.5";
+  version = "1.5.6.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
-    sha256 = "0w9zzsiaq3f7vpxybk01c9z2b4qqg67mzpyfb2gjchz8dhdb423r";
+    sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s=";
   };
 
-  patches = [
-    # Poppler patches from
-    # https://github.com/scribusproject/scribus/commits/master/scribus/plugins/import/pdf
-
-    # fix build with Poppler 0.82
-    (fetchpatch {
-      url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch";
-      sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939";
-    })
-    # fix build with Poppler 0.83
-    (fetchpatch {
-      url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch";
-      sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx";
-    })
-    # fix build with Poppler 0.84
-    # TODO: Remove patches with scribus version > 1.5.5 as it should be fixed upstream in next version
-    (fetchpatch {
-      url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch";
-      sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y";
-    })
-    # Formating changes needed for the Poppler 0.86 patch to apply
-    (fetchpatch {
-      url = "https://github.com/scribusproject/scribus/commit/58613b5ce44335f202a55ab15ed303d97fe274cb.patch";
-      sha256 = "16n3wch2mkabgkb06iywggdkckr4idrw4in56k5jh2jqjl0ra2db";
-    })
-    (fetchpatch {
-      url = "https://github.com/scribusproject/scribus/commit/24aba508aac3f672f5f8cd629744a3b71e58ec37.patch";
-      sha256 = "0g6l3qc75wiykh59059ajraxjczh11wkm68942d0skl144i893rr";
-      includes = [ "scribus/plugins/import/pdf/*" ];
-    })
-    # fix build with Poppler 0.86
-    (fetchpatch {
-      url = "https://github.com/scribusproject/scribus/commit/67f8771aaff2f55d61b8246f420e762f4b526944.patch";
-      sha256 = "1lszpzlpgdhm79nywvqji25aklfhzb2qfsfiyld7yv51h82zwp77";
-    })
-  ];
-
   enableParallelBuilding = true;
 
   nativeBuildInputs = [

From 025af7c4f585b0d3686e124d932d00a549adbb0e Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 17 Nov 2020 11:15:30 +0100
Subject: [PATCH 2666/3942] polkit: 0.116 -> 0.118 (#103998)

---
 pkgs/development/libraries/polkit/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 43dc2550b12b..6aea70530143 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, expat, pam, perl, fetchpatch
-, intltool, spidermonkey_60 , gobject-introspection, libxslt, docbook_xsl, dbus
+, intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus
 , docbook_xml_dtd_412, gtk-doc, coreutils
 , useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind
 , withIntrospection ? true
@@ -19,11 +19,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "polkit";
-  version = "0.116";
+  version = "0.118";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.gz";
-    sha256 = "1c9lbpndh5zis22f154vjrhnqw65z8s85nrgl42v738yf6g0q5w8";
+    sha256 = "0swmg37jsxsxfsd2b3qm0l3zxr9ldvhpjw8lsgq3j8q7wy2fjm3d";
   };
 
   patches = [
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     [ glib gtk-doc pkgconfig intltool perl ]
     ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
   buildInputs =
-    [ expat pam spidermonkey_60 ]
+    [ expat pam spidermonkey_78 ]
     # On Linux, fall back to elogind when systemd support is off.
     ++ stdenv.lib.optional stdenv.isLinux (if useSystemd then systemd else elogind)
     ++ stdenv.lib.optional withIntrospection gobject-introspection;
@@ -102,6 +102,10 @@ stdenv.mkDerivation rec {
   inherit doCheck;
   checkInputs = [ dbus ];
   checkPhase = ''
+    # unfortunately this test needs python-dbusmock, but python-dbusmock needs polkit,
+    # leading to a circular dependency
+    substituteInPlace test/Makefile --replace polkitbackend ""
+
     # tests need access to the system bus
     dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check'
   '';

From 6e4fbac88b9f892d397eec36d3d38c6503699447 Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <sebastian.neubauer@amd.com>
Date: Tue, 17 Nov 2020 11:18:15 +0100
Subject: [PATCH 2667/3942] amdvlk: 2020.Q4.3 -> 2020.Q4.4

---
 pkgs/development/libraries/amdvlk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index 033780b8ef65..541e15ea769f 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -21,13 +21,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "amdvlk";
-  version = "2020.Q4.3";
+  version = "2020.Q4.4";
 
   src = fetchRepoProject {
     name = "${pname}-src";
     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
     rev = "refs/tags/v-${version}";
-    sha256 = "O1+w2R9Fvoc+1vegiCkBA9pE/yi/p0aK82fY4jML/2c=";
+    sha256 = "vlTmJlBHRZOiQFsziefh9VIomFPv8oUr9paagC+q6+8=";
   };
 
   buildInputs = [

From 2d9839d431b123de6742563de4bd8929119cf06d Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 17 Nov 2020 11:31:39 +0100
Subject: [PATCH 2668/3942] mailutils: update guile to current version
 (#103209)

Apparently a previous version of mailutils didn't compile
with guile 2.2, but this does no longer appear to be the case.

This is particularly relevant because mailutils is part of
the iso_minimal test set we are currently focusing on for
getting more of NixOS reproducible, and guile_2_0 is not
reproducible (https://r13y.com/)
---
 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 b698966c213a..cc6d4868f62a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5524,7 +5524,6 @@ in
   mailpile = callPackage ../applications/networking/mailreaders/mailpile { };
 
   mailutils = callPackage ../tools/networking/mailutils {
-    guile = guile_2_0;  # compilation fails with guile 2.2
     sasl = gsasl;
   };
 

From 512c3c0a059cd420aa557317955a46e1cb233169 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Tue, 17 Nov 2020 13:02:06 +0200
Subject: [PATCH 2669/3942] maintainers: rename filalex77 -> Br1ght0ne

---
 maintainers/maintainer-list.nix               | 20 +++++++++----------
 nixos/modules/programs/bandwhich.nix          |  2 +-
 nixos/tests/caddy.nix                         |  2 +-
 nixos/tests/riak.nix                          |  2 +-
 pkgs/applications/audio/spotifyd/default.nix  |  2 +-
 pkgs/applications/editors/glow/default.nix    |  2 +-
 pkgs/applications/editors/lite/default.nix    |  2 +-
 pkgs/applications/graphics/akira/default.nix  |  2 +-
 pkgs/applications/graphics/rx/default.nix     |  2 +-
 pkgs/applications/misc/epr/default.nix        |  2 +-
 pkgs/applications/misc/googler/default.nix    |  2 +-
 pkgs/applications/misc/hugo/default.nix       |  2 +-
 pkgs/applications/misc/imag/default.nix       |  2 +-
 pkgs/applications/misc/kondo/default.nix      |  2 +-
 pkgs/applications/misc/nnn/default.nix        |  2 +-
 pkgs/applications/misc/polybar/default.nix    |  2 +-
 pkgs/applications/misc/tmatrix/default.nix    |  2 +-
 pkgs/applications/misc/tuir/default.nix       |  2 +-
 .../networking/cluster/fluxctl/default.nix    |  2 +-
 .../networking/hydroxide/default.nix          |  2 +-
 .../networking/irc/tiny/default.nix           |  2 +-
 .../networking/mullvad-vpn/default.nix        |  2 +-
 .../networking/termius/default.nix            |  2 +-
 .../science/misc/rink/default.nix             |  2 +-
 .../terminal-emulators/alacritty/default.nix  |  2 +-
 .../git-and-tools/gitui/default.nix           |  2 +-
 .../git-and-tools/thicket/default.nix         |  2 +-
 .../virtualization/docker-slim/default.nix    |  2 +-
 pkgs/development/compilers/gleam/default.nix  |  2 +-
 .../interpreters/elixir/generic-builder.nix   |  2 +-
 .../interpreters/wasmer/default.nix           |  2 +-
 pkgs/development/libraries/hyphen/default.nix |  2 +-
 .../python-modules/ueberzug/default.nix       |  2 +-
 pkgs/development/tools/lazygit/default.nix    |  2 +-
 pkgs/development/tools/misc/act/default.nix   |  2 +-
 pkgs/development/tools/misc/scc/default.nix   |  2 +-
 pkgs/development/tools/oq/default.nix         |  2 +-
 pkgs/development/tools/overcommit/default.nix |  2 +-
 pkgs/development/tools/packet-cli/default.nix |  2 +-
 pkgs/development/tools/rq/default.nix         |  2 +-
 pkgs/development/tools/run/default.nix        |  2 +-
 .../tools/rust/cargo-cache/default.nix        |  2 +-
 pkgs/development/tools/scry/default.nix       |  2 +-
 pkgs/development/tools/vultr-cli/default.nix  |  2 +-
 pkgs/development/tools/wrangler/default.nix   |  2 +-
 pkgs/servers/caddy/default.nix                |  2 +-
 pkgs/servers/search/meilisearch/default.nix   |  2 +-
 pkgs/servers/sozu/default.nix                 |  2 +-
 pkgs/shells/nushell/default.nix               |  2 +-
 pkgs/shells/zsh/antibody/default.nix          |  2 +-
 pkgs/tools/admin/procs/default.nix            |  2 +-
 pkgs/tools/backup/monolith/default.nix        |  2 +-
 pkgs/tools/inputmethods/fusuma/default.nix    |  2 +-
 pkgs/tools/misc/3mux/default.nix              |  2 +-
 pkgs/tools/misc/fselect/default.nix           |  2 +-
 pkgs/tools/misc/fzf/default.nix               |  2 +-
 pkgs/tools/misc/intermodal/default.nix        |  2 +-
 pkgs/tools/misc/lazydocker/default.nix        |  2 +-
 pkgs/tools/misc/licensor/default.nix          |  2 +-
 pkgs/tools/misc/lsd/default.nix               |  2 +-
 pkgs/tools/misc/neo-cowsay/default.nix        |  2 +-
 pkgs/tools/misc/onefetch/default.nix          |  2 +-
 pkgs/tools/misc/pg_flame/default.nix          |  2 +-
 pkgs/tools/misc/starship/default.nix          |  2 +-
 pkgs/tools/misc/topgrade/default.nix          |  2 +-
 pkgs/tools/misc/tydra/default.nix             |  2 +-
 pkgs/tools/misc/websocat/default.nix          |  2 +-
 pkgs/tools/networking/6tunnel/default.nix     |  2 +-
 pkgs/tools/networking/aria2/default.nix       |  2 +-
 pkgs/tools/networking/bandwhich/default.nix   |  2 +-
 pkgs/tools/networking/clash/default.nix       |  2 +-
 pkgs/tools/networking/drill/default.nix       |  2 +-
 pkgs/tools/networking/findomain/default.nix   |  2 +-
 pkgs/tools/networking/frp/default.nix         |  2 +-
 pkgs/tools/networking/hey/default.nix         |  2 +-
 pkgs/tools/networking/nebula/default.nix      |  2 +-
 pkgs/tools/networking/subfinder/default.nix   |  2 +-
 pkgs/tools/networking/tunnelto/default.nix    |  2 +-
 .../package-management/cargo-deb/default.nix  |  2 +-
 .../package-management/cargo-edit/default.nix |  2 +-
 .../cargo-update/default.nix                  |  2 +-
 .../package-management/emplace/default.nix    |  2 +-
 pkgs/tools/security/keybase/default.nix       |  2 +-
 pkgs/tools/security/keybase/gui.nix           |  2 +-
 pkgs/tools/text/ruplacer/default.nix          |  2 +-
 pkgs/tools/text/sd/default.nix                |  2 +-
 86 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 586aa2d6e5d6..649c7a9b2508 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1218,6 +1218,16 @@
     githubId = 5525646;
     name = "Brice Waegeneire";
   };
+  Br1ght0ne = {
+    email = "brightone@protonmail.com";
+    github = "Br1ght0ne";
+    githubId = 12615679;
+    name = "Oleksii Filonenko";
+    keys = [{
+      longkeyid = "rsa3072/0xA1BC8428323ECFE8";
+      fingerprint = "F549 3B7F 9372 5578 FDD3  D0B8 A1BC 8428 323E CFE8";
+    }];
+  };
   bsima = {
     email = "ben@bsima.me";
     github = "bsima";
@@ -2907,16 +2917,6 @@
     githubId = 8182846;
     name = "Francesco Gazzetta";
   };
-  filalex77 = {
-    email = "brightone@protonmail.com";
-    github = "filalex77";
-    githubId = 12615679;
-    name = "Oleksii Filonenko";
-    keys = [{
-      longkeyid = "rsa3072/0xA1BC8428323ECFE8";
-      fingerprint = "F549 3B7F 9372 5578 FDD3  D0B8 A1BC 8428 323E CFE8";
-    }];
-  };
   fionera = {
     email = "nix@fionera.de";
     github = "fionera";
diff --git a/nixos/modules/programs/bandwhich.nix b/nixos/modules/programs/bandwhich.nix
index 5413044f4614..1cffb5fa2765 100644
--- a/nixos/modules/programs/bandwhich.nix
+++ b/nixos/modules/programs/bandwhich.nix
@@ -4,7 +4,7 @@ with lib;
 
 let cfg = config.programs.bandwhich;
 in {
-  meta.maintainers = with maintainers; [ filalex77 ];
+  meta.maintainers = with maintainers; [ Br1ght0ne ];
 
   options = {
     programs.bandwhich = {
diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix
index f2de34ff2da2..a21dbec248ab 100644
--- a/nixos/tests/caddy.nix
+++ b/nixos/tests/caddy.nix
@@ -1,7 +1,7 @@
 import ./make-test-python.nix ({ pkgs, ... }: {
   name = "caddy";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ xfix filalex77 ];
+    maintainers = [ xfix Br1ght0ne ];
   };
 
   nodes = {
diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix
index 6915779e7e9c..3dd4e333d669 100644
--- a/nixos/tests/riak.nix
+++ b/nixos/tests/riak.nix
@@ -1,7 +1,7 @@
 import ./make-test-python.nix ({ lib, pkgs, ... }: {
   name = "riak";
   meta = with lib.maintainers; {
-    maintainers = [ filalex77 ];
+    maintainers = [ Br1ght0ne ];
   };
 
   machine = {
diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index 121f9cbc960f..dcb5737afa6a 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
     description = "An open source Spotify client running as a UNIX daemon";
     homepage = "https://github.com/Spotifyd/spotifyd";
     license = with licenses; [ gpl3 ];
-    maintainers = with maintainers; [ anderslundstedt filalex77 marsam ];
+    maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix
index 1dc140f3e095..0ba13c996712 100644
--- a/pkgs/applications/editors/glow/default.nix
+++ b/pkgs/applications/editors/glow/default.nix
@@ -21,6 +21,6 @@ buildGoModule rec {
     description = "Render markdown on the CLI, with pizzazz!";
     homepage = "https://github.com/charmbracelet/glow";
     license = licenses.mit;
-    maintainers = with maintainers; [ ehmry filalex77 penguwin ];
+    maintainers = with maintainers; [ ehmry Br1ght0ne penguwin ];
   };
 }
diff --git a/pkgs/applications/editors/lite/default.nix b/pkgs/applications/editors/lite/default.nix
index 908ecf2bdd71..2f4397234984 100644
--- a/pkgs/applications/editors/lite/default.nix
+++ b/pkgs/applications/editors/lite/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     description = "A lightweight text editor written in Lua";
     homepage = "https://github.com/rxi/lite";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix
index 4038d653a3da..4d0cc46bb596 100644
--- a/pkgs/applications/graphics/akira/default.nix
+++ b/pkgs/applications/graphics/akira/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     description = "Native Linux Design application built in Vala and GTK";
     homepage = "https://github.com/akiraux/Akira";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ filalex77 neonfuz ] ++ pantheon.maintainers;
+    maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ pantheon.maintainers;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix
index 53e8109fef51..9350d7c5cd78 100644
--- a/pkgs/applications/graphics/rx/default.nix
+++ b/pkgs/applications/graphics/rx/default.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
     description = "Modern and extensible pixel editor implemented in Rust";
     homepage = "https://rx.cloudhead.io/";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ minijackson filalex77 ];
+    maintainers = with maintainers; [ minijackson Br1ght0ne ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/misc/epr/default.nix b/pkgs/applications/misc/epr/default.nix
index f67c15f0a994..478422a1c5c8 100644
--- a/pkgs/applications/misc/epr/default.nix
+++ b/pkgs/applications/misc/epr/default.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
     description = "CLI Epub Reader";
     homepage = "https://github.com/wustho/epr";
     license = licenses.mit;
-    maintainers = [ maintainers.filalex77 ];
+    maintainers = [ maintainers.Br1ght0ne ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index 1eca26d7be02..7a096b52314a 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/jarun/googler";
     description = "Google Search, Google Site Search, Google News from the terminal";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ koral filalex77 ];
+    maintainers = with maintainers; [ koral Br1ght0ne ];
     platforms = python.meta.platforms;
   };
 }
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 5372b556ecdb..5bad48edca1e 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -25,6 +25,6 @@ buildGoModule rec {
     description = "A fast and modern static website engine";
     homepage = "https://gohugo.io";
     license = licenses.asl20;
-    maintainers = with maintainers; [ schneefux filalex77 Frostman ];
+    maintainers = with maintainers; [ schneefux Br1ght0ne Frostman ];
   };
 }
diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix
index bb6956aaa596..f00433a658f7 100644
--- a/pkgs/applications/misc/imag/default.nix
+++ b/pkgs/applications/misc/imag/default.nix
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
     description = "Commandline personal information management suite";
     homepage = "https://imag-pim.org/";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ filalex77 minijackson ];
+    maintainers = with maintainers; [ Br1ght0ne minijackson ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix
index 6b23d1d0437f..f47458f0f3ff 100644
--- a/pkgs/applications/misc/kondo/default.nix
+++ b/pkgs/applications/misc/kondo/default.nix
@@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec {
     description = "Save disk space by cleaning unneeded files from software projects";
     homepage = "https://github.com/tbillington/kondo";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index fe6f8922adca..81f2f648e5f0 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/jarun/nnn";
     license = licenses.bsd2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ jfrankenau filalex77 ];
+    maintainers = with maintainers; [ jfrankenau Br1ght0ne ];
   };
 }
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index c324a3f8be40..14d9b3015f49 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
         having a black belt in shell scripting.
       '';
       license = licenses.mit;
-      maintainers = with maintainers; [ afldcr filalex77 ];
+      maintainers = with maintainers; [ afldcr Br1ght0ne ];
       platforms = platforms.linux;
     };
 
diff --git a/pkgs/applications/misc/tmatrix/default.nix b/pkgs/applications/misc/tmatrix/default.nix
index c03918c4875e..e63370566880 100644
--- a/pkgs/applications/misc/tmatrix/default.nix
+++ b/pkgs/applications/misc/tmatrix/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/M4444/TMatrix";
     license = licenses.gpl2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ infinisil filalex77 ];
+    maintainers = with maintainers; [ infinisil Br1ght0ne ];
   };
 }
diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix
index 11bf70cb56b3..c086cdb9503b 100644
--- a/pkgs/applications/misc/tuir/default.nix
+++ b/pkgs/applications/misc/tuir/default.nix
@@ -27,6 +27,6 @@ buildPythonApplication rec {
     description = "Browse Reddit from your Terminal (fork of rtv)";
     homepage = "https://gitlab.com/ajak/tuir/";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 matthiasbeyer ];
+    maintainers = with maintainers; [ Br1ght0ne matthiasbeyer ];
   };
 }
diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix
index fe45b9ccb402..c47896619513 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -32,6 +32,6 @@ buildGoModule rec {
     description = "CLI client for Flux, the GitOps Kubernetes operator";
     homepage = "https://github.com/fluxcd/flux";
     license = licenses.asl20;
-    maintainers = with maintainers; [ Gonzih filalex77 ];
+    maintainers = with maintainers; [ Gonzih Br1ght0ne ];
   };
 }
diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix
index cf872b77b8d1..a54a47b9c8f2 100644
--- a/pkgs/applications/networking/hydroxide/default.nix
+++ b/pkgs/applications/networking/hydroxide/default.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
     description = "A third-party, open-source ProtonMail bridge";
     homepage = "https://github.com/emersion/hydroxide";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix
index d6b19fc77dd5..980221afb61f 100644
--- a/pkgs/applications/networking/irc/tiny/default.nix
+++ b/pkgs/applications/networking/irc/tiny/default.nix
@@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec {
     description = "A console IRC client";
     homepage = "https://github.com/osa1/tiny";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index 52adbca18b17..da49ece4c68f 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md";
     license = licenses.gpl3;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 
 }
diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix
index 09b9bfa571b8..66856264f345 100644
--- a/pkgs/applications/networking/termius/default.nix
+++ b/pkgs/applications/networking/termius/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     homepage = "https://termius.com/";
     downloadPage = "https://termius.com/linux/";
     license = licenses.unfree;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix
index b868706a05f9..0b1ef2b16ea9 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     description = "Unit-aware calculator";
     homepage = "https://rinkcalc.app";
     license = with licenses; [ mpl20 gpl3 ];
-    maintainers = with maintainers; [ sb0 filalex77 ];
+    maintainers = with maintainers; [ sb0 Br1ght0ne ];
   };
 }
diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix
index 72e00cb15a70..9b7d5ae1b821 100644
--- a/pkgs/applications/terminal-emulators/alacritty/default.nix
+++ b/pkgs/applications/terminal-emulators/alacritty/default.nix
@@ -136,7 +136,7 @@ rustPlatform.buildRustPackage rec {
     description = "A cross-platform, GPU-accelerated terminal emulator";
     homepage = "https://github.com/alacritty/alacritty";
     license = licenses.asl20;
-    maintainers = with maintainers; [ filalex77 mic92 cole-h ma27 ];
+    maintainers = with maintainers; [ Br1ght0ne mic92 cole-h ma27 ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix
index ef77a8e7fe5e..21e382a44bc8 100644
--- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix
@@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
     description = "Blazing fast terminal-ui for git written in rust";
     homepage = "https://github.com/extrawurst/gitui";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 yanganto ];
+    maintainers = with maintainers; [ Br1ght0ne yanganto ];
   };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix
index 4a02baa465c6..3abfd3a31392 100644
--- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix
@@ -29,6 +29,6 @@ in crystal.buildCrystalPackage rec {
     description = "A better one-line git log";
     homepage = "https://github.com/taylorthurlow/thicket";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index 058f6fd8ccca..84e0135f665b 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -40,6 +40,6 @@ buildGoPackage rec {
     description = "Minify and secure Docker containers";
     homepage = "https://dockersl.im/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ filalex77 marsam mbrgm ];
+    maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ];
   };
 }
diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index 00f1247f5da5..aa3ab8bc94b2 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
     description = "A statically typed language for the Erlang VM";
     homepage = "https://gleam.run/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index f821baf66c5d..8dddd5befd4d 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -69,6 +69,6 @@ in
 
       license = licenses.epl10;
       platforms = platforms.unix;
-      maintainers = with maintainers; [ havvy couchemar ankhers filalex77 ];
+      maintainers = with maintainers; [ havvy couchemar ankhers Br1ght0ne ];
     };
   })
diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix
index c620b1686ea6..7b390c547163 100644
--- a/pkgs/development/interpreters/wasmer/default.nix
+++ b/pkgs/development/interpreters/wasmer/default.nix
@@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://wasmer.io/";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/development/libraries/hyphen/default.nix b/pkgs/development/libraries/hyphen/default.nix
index 9f30ff54823f..9251b2853f1c 100644
--- a/pkgs/development/libraries/hyphen/default.nix
+++ b/pkgs/development/libraries/hyphen/default.nix
@@ -22,6 +22,6 @@ in stdenv.mkDerivation rec {
     homepage = "https://sourceforge.net/projects/hunspell/files/Hyphen/";
     platforms = platforms.all;
     license = with licenses; [ gpl2 lgpl21 mpl11 ];
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix
index d80009e64788..c1672849c965 100644
--- a/pkgs/development/python-modules/ueberzug/default.nix
+++ b/pkgs/development/python-modules/ueberzug/default.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/seebye/ueberzug";
     description = "An alternative for w3mimgdisplay";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
index f92eaf3ebf8f..b04a42d57b6b 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -20,6 +20,6 @@ buildGoModule rec {
     description = "Simple terminal UI for git commands";
     homepage = "https://github.com/jesseduffield/lazygit";
     license = licenses.mit;
-    maintainers = with maintainers; [ fpletz equirosa filalex77 ];
+    maintainers = with maintainers; [ fpletz equirosa Br1ght0ne ];
   };
 }
diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix
index bd4017ed4405..4bb2d3d62456 100644
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/pkgs/development/tools/misc/act/default.nix
@@ -22,6 +22,6 @@ buildGoModule rec {
     homepage = "https://github.com/nektos/act";
     changelog = "https://github.com/nektos/act/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix
index 8a6a1471d0a4..5fc23547615a 100644
--- a/pkgs/development/tools/misc/scc/default.nix
+++ b/pkgs/development/tools/misc/scc/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   meta = with stdenv.lib; {
     homepage = "https://github.com/boyter/scc";
     description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go";
-    maintainers = with maintainers; [ sigma filalex77 ];
+    maintainers = with maintainers; [ sigma Br1ght0ne ];
     license = with licenses; [ unlicense /* or */ mit ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix
index 04526eb70b6e..3a3e8addf73c 100644
--- a/pkgs/development/tools/oq/default.nix
+++ b/pkgs/development/tools/oq/default.nix
@@ -40,7 +40,7 @@ crystal.buildCrystalPackage rec {
     description = "A performant, and portable jq wrapper";
     homepage = "https://blacksmoke16.github.io/oq/";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/overcommit/default.nix b/pkgs/development/tools/overcommit/default.nix
index 5fa3dfa0f03a..6b90160245d8 100644
--- a/pkgs/development/tools/overcommit/default.nix
+++ b/pkgs/development/tools/overcommit/default.nix
@@ -9,7 +9,7 @@ bundlerApp {
     description = "Tool to manage and configure Git hooks";
     homepage    = "https://github.com/sds/overcommit";
     license     = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix
index 6b603ef00602..4c4cb6a28d42 100644
--- a/pkgs/development/tools/packet-cli/default.nix
+++ b/pkgs/development/tools/packet-cli/default.nix
@@ -23,6 +23,6 @@ buildGoModule rec {
     description = "Official Packet CLI";
     homepage = "https://github.com/packethost/packet-cli";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
index 68d3bfce06b0..838740d1fd0e 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
     description = "A tool for doing record analysis and transformation";
     homepage = "https://github.com/dflemstr/rq";
     license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ aristid filalex77 ];
+    maintainers = with maintainers; [ aristid Br1ght0ne ];
   };
 }
diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix
index 41d1a8a29fd8..7ec08d02020a 100644
--- a/pkgs/development/tools/run/default.nix
+++ b/pkgs/development/tools/run/default.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
     description = "Easily manage and invoke small scripts and wrappers";
     homepage    = "https://github.com/TekWizely/run";
     license     = licenses.mit;
-    maintainers = with maintainers; [ rawkode filalex77 ];
+    maintainers = with maintainers; [ rawkode Br1ght0ne ];
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix
index 0f3571045d67..3271e7951fac 100644
--- a/pkgs/development/tools/rust/cargo-cache/default.nix
+++ b/pkgs/development/tools/rust/cargo-cache/default.nix
@@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
     description = "Manage cargo cache (\${CARGO_HOME}, ~/.cargo/), print sizes of dirs and remove dirs selectively";
     homepage = "https://github.com/matthiaskrgr/cargo-cache";
     license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix
index ed823896ad0f..dcb8087372da 100644
--- a/pkgs/development/tools/scry/default.nix
+++ b/pkgs/development/tools/scry/default.nix
@@ -38,6 +38,6 @@ in crystal.buildCrystalPackage rec {
     description = "Code analysis server for the Crystal programming language";
     homepage = "https://github.com/crystal-lang-tools/scry";
     license = licenses.mit;
-    maintainers = with maintainers; [ peterhoeg filalex77 ];
+    maintainers = with maintainers; [ peterhoeg Br1ght0ne ];
   };
 }
diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix
index c0b34fe3ca68..41f1524536e1 100644
--- a/pkgs/development/tools/vultr-cli/default.nix
+++ b/pkgs/development/tools/vultr-cli/default.nix
@@ -19,6 +19,6 @@ buildGoModule rec {
     description = "Official command line tool for Vultr services";
     homepage = "https://github.com/vultr/vultr-cli";
     license = licenses.asl20;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix
index d62e2e377d00..b7020eacdc32 100644
--- a/pkgs/development/tools/wrangler/default.nix
+++ b/pkgs/development/tools/wrangler/default.nix
@@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec {
     description = "A CLI tool designed for folks who are interested in using Cloudflare Workers";
     homepage = "https://github.com/cloudflare/wrangler";
     license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 37f3f1082ec0..1eb33dc32267 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -21,6 +21,6 @@ buildGoModule rec {
     homepage = "https://caddyserver.com";
     description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS";
     license = licenses.asl20;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix
index f2484dffa636..d6bee327412d 100644
--- a/pkgs/servers/search/meilisearch/default.nix
+++ b/pkgs/servers/search/meilisearch/default.nix
@@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec {
     description = "Ultra relevant and instant full-text search API";
     homepage = "https://meilisearch.com/";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix
index 16561da7d297..137d5b24d18b 100644
--- a/pkgs/servers/sozu/default.nix
+++ b/pkgs/servers/sozu/default.nix
@@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
       "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures";
     homepage = "https://www.sozu.io";
     license = licenses.agpl3;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 20624293e85a..411d6eba0000 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
     description = "A modern shell written in Rust";
     homepage = "https://www.nushell.sh/";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 johntitor marsam ];
+    maintainers = with maintainers; [ Br1ght0ne johntitor marsam ];
     platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
   };
 
diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
index 325bae4f9cce..bcf091f8e769 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -21,6 +21,6 @@ buildGoModule rec {
     description = "The fastest shell plugin manager";
     homepage = "https://github.com/getantibody/antibody";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 worldofpeace ];
+    maintainers = with maintainers; [ Br1ght0ne worldofpeace ];
   };
 }
diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 05d0f7c7c290..4e0a093ad51c 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     description = "A modern replacement for ps written in Rust";
     homepage = "https://github.com/dalance/procs";
     license = licenses.mit;
-    maintainers = with maintainers; [ dalance filalex77 ];
+    maintainers = with maintainers; [ dalance Br1ght0ne ];
     platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix
index 9d33ce1f3f85..4d17209be893 100644
--- a/pkgs/tools/backup/monolith/default.nix
+++ b/pkgs/tools/backup/monolith/default.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     description = "Bundle any web page into a single HTML file";
     homepage = "https://github.com/Y2Z/monolith";
     license = licenses.unlicense;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/inputmethods/fusuma/default.nix b/pkgs/tools/inputmethods/fusuma/default.nix
index a8901dfb0e43..dc6d3a09bfa4 100644
--- a/pkgs/tools/inputmethods/fusuma/default.nix
+++ b/pkgs/tools/inputmethods/fusuma/default.nix
@@ -18,7 +18,7 @@ bundlerApp {
     description = "Multitouch gestures with libinput driver on X11, Linux";
     homepage = "https://github.com/iberianpig/fusuma";
     license = licenses.mit;
-    maintainers = with maintainers; [ jfrankenau nicknovitski filalex77 ];
+    maintainers = with maintainers; [ jfrankenau nicknovitski Br1ght0ne ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix
index 04335d3f33a9..945ebea0cb89 100644
--- a/pkgs/tools/misc/3mux/default.nix
+++ b/pkgs/tools/misc/3mux/default.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/aaronjanse/3mux";
     license = licenses.mit;
-    maintainers = with maintainers; [ aaronjanse filalex77 ];
+    maintainers = with maintainers; [ aaronjanse Br1ght0ne ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix
index bf0496037b5f..4c30dc4b785c 100644
--- a/pkgs/tools/misc/fselect/default.nix
+++ b/pkgs/tools/misc/fselect/default.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     description = "Find files with SQL-like queries";
     homepage = "https://github.com/jhspetersson/fselect";
     license = with licenses; [ asl20 mit ];
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index de9e58251144..b92236d35e6e 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -69,7 +69,7 @@ buildGoModule rec {
     homepage = "https://github.com/junegunn/fzf";
     description = "A command-line fuzzy finder written in Go";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ma27 zowoq ];
+    maintainers = with maintainers; [ Br1ght0ne ma27 zowoq ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix
index 438758a79499..c96aa90cb233 100644
--- a/pkgs/tools/misc/intermodal/default.nix
+++ b/pkgs/tools/misc/intermodal/default.nix
@@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec {
     description = "User-friendly and featureful command-line BitTorrent metainfo utility";
     homepage = "https://github.com/casey/intermodal";
     license = licenses.cc0;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix
index 4ab4e40de98d..5c70c7fba7d1 100644
--- a/pkgs/tools/misc/lazydocker/default.nix
+++ b/pkgs/tools/misc/lazydocker/default.nix
@@ -19,6 +19,6 @@ buildGoPackage rec {
     description = "A simple terminal UI for both docker and docker-compose";
     homepage = "https://github.com/jesseduffield/lazydocker";
     license = licenses.mit;
-    maintainers = with maintainers; [ das-g filalex77 ];
+    maintainers = with maintainers; [ das-g Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix
index 3a87e0a1bb89..b7ea30f8d3f8 100644
--- a/pkgs/tools/misc/licensor/default.nix
+++ b/pkgs/tools/misc/licensor/default.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
     description = "Write licenses to stdout";
     homepage = "https://github.com/raftario/licensor";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix
index e38da5180944..ea80a2995103 100644
--- a/pkgs/tools/misc/lsd/default.nix
+++ b/pkgs/tools/misc/lsd/default.nix
@@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Peltoche/lsd";
     description = "The next gen ls command";
     license = licenses.asl20;
-    maintainers = with maintainers; [ filalex77 marsam zowoq ];
+    maintainers = with maintainers; [ Br1ght0ne marsam zowoq ];
   };
 }
diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/tools/misc/neo-cowsay/default.nix
index 4473f869a380..4ed1bd51696c 100644
--- a/pkgs/tools/misc/neo-cowsay/default.nix
+++ b/pkgs/tools/misc/neo-cowsay/default.nix
@@ -21,6 +21,6 @@ buildGoModule rec {
     description = "Cowsay reborn, written in Go";
     homepage = "https://github.com/Code-Hex/Neo-cowsay";
     license = with licenses; [artistic1 /* or */ gpl3];
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix
index 4b35d23940de..4bb8ff9ef350 100644
--- a/pkgs/tools/misc/onefetch/default.nix
+++ b/pkgs/tools/misc/onefetch/default.nix
@@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
     description = "Git repository summary on your terminal";
     homepage = "https://github.com/o2sh/onefetch";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 kloenk ];
+    maintainers = with maintainers; [ Br1ght0ne kloenk ];
   };
 }
diff --git a/pkgs/tools/misc/pg_flame/default.nix b/pkgs/tools/misc/pg_flame/default.nix
index b8345210e599..7625e67e0010 100644
--- a/pkgs/tools/misc/pg_flame/default.nix
+++ b/pkgs/tools/misc/pg_flame/default.nix
@@ -19,6 +19,6 @@ buildGoModule rec {
     description = "Flamegraph generator for Postgres EXPLAIN ANALYZE output";
     homepage = "https://github.com/mgartner/pg_flame";
     license = licenses.asl20;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 073752cf97e5..7e318b45a1f2 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -48,6 +48,6 @@ rustPlatform.buildRustPackage rec {
     description = "A minimal, blazing fast, and extremely customizable prompt for any shell";
     homepage = "https://starship.rs";
     license = licenses.isc;
-    maintainers = with maintainers; [ bbigras davidtwco filalex77 Frostman marsam ];
+    maintainers = with maintainers; [ bbigras davidtwco Br1ght0ne Frostman marsam ];
   };
 }
diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index 01c52ba6cc53..715bbc879cd4 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
     description = "Upgrade all the things";
     homepage = "https://github.com/r-darwish/topgrade";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ filalex77 hugoreeves ];
+    maintainers = with maintainers; [ Br1ght0ne hugoreeves ];
   };
 }
diff --git a/pkgs/tools/misc/tydra/default.nix b/pkgs/tools/misc/tydra/default.nix
index c6d7c86c7efd..c19f808397af 100644
--- a/pkgs/tools/misc/tydra/default.nix
+++ b/pkgs/tools/misc/tydra/default.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     description = "Shortcut menu-based task runner, inspired by Emacs Hydra";
     homepage = "https://github.com/Mange/tydra";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix
index c936b1599638..f2bcfd8b7813 100644
--- a/pkgs/tools/misc/websocat/default.nix
+++ b/pkgs/tools/misc/websocat/default.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     description = "Command-line client for WebSockets (like netcat/socat)";
     homepage = "https://github.com/vi/websocat";
     license = licenses.mit;
-    maintainers = with maintainers; [ thoughtpolice filalex77 ];
+    maintainers = with maintainers; [ thoughtpolice Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/networking/6tunnel/default.nix b/pkgs/tools/networking/6tunnel/default.nix
index bf0e8ba33162..fbdd23f754ef 100644
--- a/pkgs/tools/networking/6tunnel/default.nix
+++ b/pkgs/tools/networking/6tunnel/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "Tunnelling for application that don't speak IPv6";
     homepage = "https://github.com/wojtekka/6tunnel";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 5ede0db598c9..614584a5f565 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     description = "A lightweight, multi-protocol, multi-source, command-line download utility";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ filalex77 koral ];
+    maintainers = with maintainers; [ Br1ght0ne koral ];
   };
 }
diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix
index 909f08e7bdde..46739742bd44 100644
--- a/pkgs/tools/networking/bandwhich/default.nix
+++ b/pkgs/tools/networking/bandwhich/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/imsnif/bandwhich";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ma27 ];
+    maintainers = with maintainers; [ Br1ght0ne ma27 ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix
index 912716894129..3a37f345c969 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/pkgs/tools/networking/clash/default.nix
@@ -24,6 +24,6 @@ buildGoModule rec {
     description = "A rule-based tunnel in Go";
     homepage = "https://github.com/Dreamacro/clash";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ contrun filalex77 ];
+    maintainers = with maintainers; [ contrun Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix
index 572dc0d83848..78ba291b1519 100644
--- a/pkgs/tools/networking/drill/default.nix
+++ b/pkgs/tools/networking/drill/default.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     description = "HTTP load testing application inspired by Ansible syntax";
     homepage = "https://github.com/fcsonline/drill";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix
index a98c634f9039..761e9eb4619b 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/pkgs/tools/networking/findomain/default.nix
@@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec {
     description = "The fastest and cross-platform subdomain enumerator";
     homepage = "https://github.com/Edu4rdSHL/findomain";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix
index 582ec78d09dc..fd454c3d7763 100644
--- a/pkgs/tools/networking/frp/default.nix
+++ b/pkgs/tools/networking/frp/default.nix
@@ -27,6 +27,6 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/fatedier/frp";
     license = licenses.asl20;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix
index 22f933a4b654..9add729cf2f0 100644
--- a/pkgs/tools/networking/hey/default.nix
+++ b/pkgs/tools/networking/hey/default.nix
@@ -19,6 +19,6 @@ buildGoModule rec {
     description = "HTTP load generator, ApacheBench (ab) replacement";
     homepage = "https://github.com/rakyll/hey";
     license = licenses.asl20;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix
index b3cd0d830245..61f0a00a9b81 100644
--- a/pkgs/tools/networking/nebula/default.nix
+++ b/pkgs/tools/networking/nebula/default.nix
@@ -38,7 +38,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/slackhq/nebula";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 
 }
diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix
index 70820ea03208..f812f7ffa91f 100644
--- a/pkgs/tools/networking/subfinder/default.nix
+++ b/pkgs/tools/networking/subfinder/default.nix
@@ -24,6 +24,6 @@ buildGoPackage rec {
     '';
     homepage = "https://github.com/projectdiscovery/subfinder";
     license = licenses.mit;
-    maintainers = with maintainers; [ fpletz filalex77 ];
+    maintainers = with maintainers; [ fpletz Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix
index c0dce98c4447..4bf251be81fc 100644
--- a/pkgs/tools/networking/tunnelto/default.nix
+++ b/pkgs/tools/networking/tunnelto/default.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     description = "Expose your local web server to the internet with a public URL";
     homepage = "https://tunnelto.dev";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix
index 43a2fccd8789..668a623ee2a5 100644
--- a/pkgs/tools/package-management/cargo-deb/default.nix
+++ b/pkgs/tools/package-management/cargo-deb/default.nix
@@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
     description = "Generate Debian packages from information in Cargo.toml";
     homepage = "https://github.com/mmstick/cargo-deb";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index b81e1b00f4be..78e428b5c7e9 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec {
     description = "A utility for managing cargo dependencies from the command line";
     homepage = "https://github.com/killercup/cargo-edit";
     license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ gerschtli jb55 filalex77 killercup ];
+    maintainers = with maintainers; [ gerschtli jb55 Br1ght0ne killercup ];
   };
 }
diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix
index 9a3cc23c05ac..1158d10ed296 100644
--- a/pkgs/tools/package-management/cargo-update/default.nix
+++ b/pkgs/tools/package-management/cargo-update/default.nix
@@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec {
     description = "A cargo subcommand for checking and applying updates to installed executables";
     homepage = "https://github.com/nabijaczleweli/cargo-update";
     license = licenses.mit;
-    maintainers = with maintainers; [ gerschtli filalex77 johntitor ];
+    maintainers = with maintainers; [ gerschtli Br1ght0ne johntitor ];
   };
 }
diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index 3356e7cf1021..a214c327fe6f 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec {
     description = "Mirror installed software on multiple machines";
     homepage = "https://github.com/tversteeg/emplace";
     license = licenses.agpl3;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index bd1ee471b7a2..e7fc67c51d84 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -35,7 +35,7 @@ buildGoPackage rec {
     homepage = "https://www.keybase.io/";
     description = "The Keybase official command-line utility and service";
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ avaq carlsverre np rvolosatovs filalex77 ];
+    maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne ];
     license = licenses.bsd3;
   };
 }
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 20c1bb8f7f16..fd1123dca22f 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.keybase.io/";
     description = "The Keybase official GUI";
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np filalex77 ];
+    maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne ];
     license = licenses.bsd3;
   };
 }
diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix
index 7ebf739414a2..f4b3ed3dca4c 100644
--- a/pkgs/tools/text/ruplacer/default.nix
+++ b/pkgs/tools/text/ruplacer/default.nix
@@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec {
     description = "Find and replace text in source files";
     homepage = "https://github.com/TankerHQ/ruplacer";
     license = [ licenses.bsd3 ];
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
   };
 }
diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix
index 1fa508b1ef60..66529514ec7b 100644
--- a/pkgs/tools/text/sd/default.nix
+++ b/pkgs/tools/text/sd/default.nix
@@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec {
     description = "Intuitive find & replace CLI (sed alternative)";
     homepage = "https://github.com/chmln/sd";
     license = licenses.mit;
-    maintainers = with maintainers; [ amar1729 filalex77 ];
+    maintainers = with maintainers; [ amar1729 Br1ght0ne ];
   };
 }

From b4b17543c37fbdbb0a6ff5b8c8bebf47d21721b4 Mon Sep 17 00:00:00 2001
From: Robbert Gurdeep Singh <git@beardhatcode.be>
Date: Tue, 17 Nov 2020 12:38:59 +0100
Subject: [PATCH 2670/3942] languagetool: 5.0 -> 5.1

---
 pkgs/tools/text/languagetool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 0dd01d382ed0..fc0ec487ad50 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "LanguageTool";
-  version = "5.0";
+  version = "5.1";
 
   src = fetchzip {
     url = "https://www.languagetool.org/download/${pname}-${version}.zip";
-    sha256 = "1jyd4z62ldwhqx9r7v4b9k4pl300wr4b7ggj4f0yjf0gpwg7l9p7";
+    sha256 = "07a2cxsa04lzifphlf5mv88xpnixalmryd0blawblxsmdyhmvg3y";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];

From d1fb8eaeb197eb604943e7458863102f478e4ed0 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Tue, 17 Nov 2020 12:05:15 +0000
Subject: [PATCH 2671/3942] franz: 5.5.0 -> 5.6.1

---
 .../networking/instant-messengers/franz/default.nix          | 4 ++--
 .../networking/instant-messengers/franz/generic.nix          | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 52bc60b5affd..646a790fed25 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -3,10 +3,10 @@
 mkFranzDerivation rec {
   pname = "franz";
   name = "Franz";
-  version = "5.5.0";
+  version = "5.6.1";
   src = fetchurl {
     url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
-    sha256 = "0kgfjai0pz0gpbxsmn3hbha7zr2kax0s1j3ygcsy4kzghla990wm";
+    sha256 = "1gn0n1hr6z2gsdnpxysyq6sm8y7cjr9jafhsam8ffw0bq74kph7p";
   };
   meta = with stdenv.lib; {
     description = "A free messaging app that combines chat & messaging services into one application";
diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix
index 3f05e3d7a5d3..96865374bed1 100644
--- a/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -28,7 +28,7 @@
 # Helper function for building a derivation for Franz and forks.
 
 { pname, name, version, src, meta }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   inherit pname version src meta;
 
   # Don't remove runtime deps.
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
     expat
     stdenv.cc.cc
   ];
-  runtimeDependencies = [ (lib.getLib udev) libnotify ];
+  runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify ];
 
   unpackPhase = "dpkg-deb -x $src .";
 
@@ -84,6 +84,7 @@ stdenv.mkDerivation {
 
   postFixup = ''
     wrapProgram $out/opt/${name}/${pname} \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \
       --prefix PATH : ${xdg_utils}/bin \
       "''${gappsWrapperArgs[@]}"
   '';

From 668f3772d274541508f9cfac71da1e55e6cc18b6 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Tue, 17 Nov 2020 15:01:00 +0100
Subject: [PATCH 2672/3942] firefox-bin: 82.0.3 -> 83.0

---
 .../browsers/firefox-bin/release_sources.nix  | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index b52e4fc8e7e3..431ed105f0dc 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "82.0.3";
+  version = "83.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ach/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ach/firefox-83.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "cebf34988221418454b7674778aeb165cfa5d455c93a7b1ff8461c1460f28913";
+      sha256 = "cea6ad61bd402e6c84a81a3f504f1b9292079c9d48d2353b51db4f03a8837fb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/af/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/af/firefox-83.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "cffc807143433dc414415843eb14b34ca3d3f18d5fa26e6ccec090032bb98965";
+      sha256 = "d4bd0a9579f38d53f559412cc3cc04f11871ba22c81eee54dd9ab16c56303513";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/an/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/an/firefox-83.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "1c7b084e089ed4d938f30ecb338f6a20001fc5c92b7ddd7d54dfebabcee67549";
+      sha256 = "10741a6921210643250013c45e9e21bc295da8e41f2bb5c5fadcd86c0e828c80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ar/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ar/firefox-83.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "10930a02e0a902d67b2e3eab8d9cd45dc93611bb77834f6ac7b7ef109d592cb3";
+      sha256 = "3fd4aeef281e5aafdda572d4814e70295c018b7fae6d214c40dabcac367ace69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ast/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ast/firefox-83.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "91191ea0d52b33f2815b02be6af05ed462f394d112218638c427fccd7aef56e2";
+      sha256 = "237e8ff5b3fbc9d7c4095951ca014a5c26cc076305aee705ca943d81e72541dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/az/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/az/firefox-83.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "47dc248859683863c2907867e3c411c4d3620c2ae3001c5a0c693b485a0e5b87";
+      sha256 = "79ca0c798243841cc34281f917aad06c2f546a5e11b443a96e5030aefb8de9b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/be/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/be/firefox-83.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "2e4ddfdbb28d7444b30f58235f634f9f16f88989fd61e7ef8dbf238c0a8455de";
+      sha256 = "c15b0f929b3e3c6ad5618ccf6f9f6b143f893b6f77e176b52ecc608ca3157ab8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/bg/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bg/firefox-83.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "4c19e9af25e58bbc70d913f5cbaf8551443beee81c854ff8af2f81019b516534";
+      sha256 = "fd2094c59a057e8c35054f7d09c31699aeef927cf9688a87559a8ba69a93f600";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/bn/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bn/firefox-83.0.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "40628ea1443ef7c8840ee65767d684f90ddb8ee547ec62367c6bb2e0833e7d8f";
+      sha256 = "c9755c408ca1a4f426f1432339020ef3d7c675d426fae9d8697cded4c7d493f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/br/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/br/firefox-83.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "7a44ab9c67ec58f098cc8ca210ec2e37f922587aaf7495bb0dea60f1b0330e72";
+      sha256 = "d47b889d31b945a5b768b3bbb336fdc43d62c9cc86f13916225cbfe68a560972";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/bs/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bs/firefox-83.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "017d91858f3df6744eaf2b6764f4f2a303712cb23eaa8ab8ccf58f9b8b215a27";
+      sha256 = "c36da445560b989ae9cf16a1ec72cd2cae82db670f90d27abe0499f8cc025eee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ca-valencia/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ca-valencia/firefox-83.0.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "f97c9f63139c23167c90b0cb91eddc1e887a827e2f839a7ab9d7a8cb1ec971ea";
+      sha256 = "ef5ee80cc0d6b1b299bc8bb6577b8e26f5de8b541530ddda231e2fafa863e6a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ca/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ca/firefox-83.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "631ae73074f22c446899ac82713c1f5404fbf63efbdde7aa93612f828d64a5af";
+      sha256 = "7c349aa7406899835bc9e70893f28c8109e17ee9ef018e7a723085117f8dd32f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/cak/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cak/firefox-83.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "72085e68e7f8cccbe4bf4244e11ddbbfa94f6a16c3dfa582fab94ca7ef191e68";
+      sha256 = "3e7aabe665ce423bd47e7d0474039d7bfeb9958849c18e98c37f28def5fae1aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/cs/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cs/firefox-83.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "41da43aa44eaa092aa6481269d7100792a675764be92af7375e3bbbb21663ae2";
+      sha256 = "97d5e4c255fc87430751c81edc62186e1b4ec901ccf17bfdad7a8ef918077bc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/cy/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cy/firefox-83.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "b61d03510d351c0c00f7a2e8cc459e736f72cec01e596cb0b95ef53d32e0ce26";
+      sha256 = "c1856b51dedc5788b40671faee8f8cb996108eb514d1263de998043377f2f7c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/da/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/da/firefox-83.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "5c495d632ae0ce2e3f990b41473c12551e66269b612b32ca0a2bf0f9ebddb268";
+      sha256 = "990da1f47d04ec9200d41fa401b23d9607a8e4c11d7cc78989e81785b9633cb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/de/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/de/firefox-83.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "c9c7c2d8f5dea3639d213185718f64266fce8e267d2bc2b6afa9313e1452fd83";
+      sha256 = "94ad875d88a18f24ae38f20b324d074a367969368e660ea2b4b0645e31300c94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/dsb/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/dsb/firefox-83.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "f8c563b71e221e6ced9ecf927e37d9a351ab83303b252e52fc4aae51d6db0703";
+      sha256 = "c3edd46c44bae1b00803e587e6f52560b28ddc2fc935c1fe62714bf16fa72d80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/el/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/el/firefox-83.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "dc0c4e503cab7913cba4186f22c96ebe3f80af59fdb5c9ef1373c799c0f6fc8b";
+      sha256 = "3572a260ec17f76631ca627747ed53d1911ee1180d3e574051b3baf0afd9dcd1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/en-CA/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-CA/firefox-83.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "735a3a4eddc0f660029020ec694d06e5dcf62b95b6b18dc90453a5a2262d18f9";
+      sha256 = "e3c9363e8b93c625234624ac5c3ab0274055c5b8f4f854da955409b9bdf28d52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/en-GB/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-GB/firefox-83.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "985ee60c7d017569db4f455cd1fdaf252432057ed153d6449594d72139833d0c";
+      sha256 = "240a732c034bf2ac286cefc33b02b56df205c4e175457cd84adb7666418e0be4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/en-US/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-US/firefox-83.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "54e1f9516aee97ef2858e04a67d691956a461591fdcfecc9bdf9c34c3f026472";
+      sha256 = "93ff827fdcba92ddb71851c46ac8192a727ed61402e896c6262943e382f92412";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/eo/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/eo/firefox-83.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "b07fc960e9204d1995e040ca3e70a61aa531e34bf0dfe6e09cfc35583559f988";
+      sha256 = "456933a6c1fb1e6ad5b2217a7e3730bd54ff037d3d718414b2c92557fea3659d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/es-AR/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-AR/firefox-83.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "b8c5d160a92bfe94b66fc9554e3343b3385d39e2551bc6b9b0a917135f4f0407";
+      sha256 = "040e8a4a74b8bc77e1d485c3376690f4c5ba85015b360f679ceacd848b0ca574";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/es-CL/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-CL/firefox-83.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "c89601e6a8dbd91723d8d9174cbba25f43a2729da5bfdf92919abd8972dfa3fa";
+      sha256 = "80e8189ce09c736af1d9927d4943e08e30bc70e9aa7e116f150f14c0dab3fb15";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/es-ES/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-ES/firefox-83.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "4643c154924c5153123796dbef8f759070b7446a31e056259be1f246fdf91ec3";
+      sha256 = "f48489abac5358a10d8ed36b77398493b6a9189a8327bf61bec6ceaca51ab696";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/es-MX/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-MX/firefox-83.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "026c72bcc1e22092a605145952fed6697a1de4945e81ee9f02b95f6654bc2f2b";
+      sha256 = "0d4805b30f05fb8a65b81a42337a8a3732c7664b322557e844929d2b049d0111";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/et/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/et/firefox-83.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "e69266e61365d94fb32b3d4f6560a66b94e5e793fe0e36d6cf075ac6ddb31b1f";
+      sha256 = "eb4a463b9271fdde45bddad28ce871953739b55126ae5613963a69a319908fb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/eu/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/eu/firefox-83.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "3107f667f558c443ae1925d77b3c2a4b2b2b9257da16af3a3a0f5f03a28d9bf7";
+      sha256 = "3a662c575554d3a542e65950352c527cc51e82ae7a8f9d7ca1b69e30a683731e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/fa/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fa/firefox-83.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "bcdc8928b712bd988ef21065207bd8ce40ec7b40958094aaa15261457954f6d0";
+      sha256 = "b5ad3a5d39674d60b6e97cd656c77d7d2fb90943a66a590a29e4d42ec1e18c42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ff/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ff/firefox-83.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "1bd27b188cd1527512d3de37af6b6e0d49064f8e1688a1257c17c16c1cd632f7";
+      sha256 = "2db83d638474186f52fde5fe1ee25201e84b198e44397074203d7ce50e23e74c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/fi/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fi/firefox-83.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "2072f0847eb952e937de66bc0dc2a3b5e2cfa267909232b43b19c5f2e0a16622";
+      sha256 = "98bd9c50b5db43bf5fcdc829aa295975d3ec106bbc598fda3d7f26679c0ba08c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/fr/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fr/firefox-83.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "d858bffb885d64aefc589835f783bd8ff22cc962ff718bc142aa2fbb9f728795";
+      sha256 = "ab3427f5cf7cc88d5108b8be21806197420bd775f33d3f2dc983f0f4dec44d5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/fy-NL/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fy-NL/firefox-83.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "7eb1301dfc9266093232c5dc8fe4da7b5139d1312b67266b2e3073e6a29d346b";
+      sha256 = "9f21d91d1529a05a2da7ba29cc8e875b23ffb4b453077b5e899133cf31813397";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ga-IE/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ga-IE/firefox-83.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "d08167164f083ddcff337da35d289dad0b83097243d9fe8bd77186d75b9dc8fa";
+      sha256 = "4c22b166cccede0bcea4e75f826e100dfa4f2def01f904fbffcef789d2d61695";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/gd/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gd/firefox-83.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "d8a6fa4815c170661b132256274250c2e5fa238d89156f17ce95eeb938ab142b";
+      sha256 = "6ca04d381205121dc695dff78ff646499a21976ae64c110763845eda0598b414";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/gl/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gl/firefox-83.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "b0ebff09180e34dffacd325465b0fb1a54dd2b59c757c8e1fe8425c86fcd44fb";
+      sha256 = "d08f4ea821af5e38c21364037c17b8c97c775d60f0697eb0817dcfc7c6d4c7dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/gn/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gn/firefox-83.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "f0f514ed9bba07b1cf72846a452bc74e1d2e13b8bf5ee664382e613ddf351a72";
+      sha256 = "90a8b2fdf1d3471311671761e81637d6771a61744eb480c0788cf03d295c30ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/gu-IN/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gu-IN/firefox-83.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "9c61f223ea072bcbe97e247f7e8cce8f0350366078dd2da276e5fc581b94f919";
+      sha256 = "bfe65e5c9795ecdff4dc947d2e2e84d01da894b0ae55c08d73f9397c5730ce17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/he/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/he/firefox-83.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "c19534b8c5e0af42c09f4afc091dedba6f15d9498183692d0a5e0285a0f743ae";
+      sha256 = "2dc01c5a929aa79056a66feb522d50cbbb567bc85589f8106e553c9ddfc02a7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hi-IN/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hi-IN/firefox-83.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "3f25c2b8a33984a085622494b19d22005e6fe5694ff7e277f02b638848d473f8";
+      sha256 = "ef2a61dce3ee713a4be3cee5a9dda8498095a7db69304a7d6585ac674970958a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hr/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hr/firefox-83.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "33bf5520c090f078daa53dbb3a2cdbdacafea8cae8ded68f7b0da30233f41916";
+      sha256 = "ab8357cc1f36965ccbd6f4298ffdbb3d77b09cc4b789a3be708d2c51468402bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hsb/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hsb/firefox-83.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "11628732d6da9db696f95d6fcc0df2faa756e9782d77bc00b633f99be5921d1e";
+      sha256 = "6a34074a96be7911672b7e83151244f1f963a8cc8930c8d1d113afe8a49c9529";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hu/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hu/firefox-83.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "e33f6bfae267454b3f541b4193ef2634ae66dfc7387c7bfbf7a8609f803cc131";
+      sha256 = "ffec1646df872a757b771a03c00e3e6df3397e7f4af46bd1d6c0fcab242b1721";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/hy-AM/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hy-AM/firefox-83.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "0d9ea1d3adb92be4c6e40be915ab3d692eeee9e3c593b977b893e003fc7ddcbe";
+      sha256 = "1b9da538ced466302584fef4ecf415aeae5bee51a87d38bd0a6bb3ea155af66d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ia/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ia/firefox-83.0.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "bf3ad1ba8f77920ed6cb5574bb836f9780e7f19d5c34feb2d562a175ca9e7552";
+      sha256 = "5f8582508155f858c7e52e623579daa7da1aa77bb4e41c2c46d3e6ae8ace6b1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/id/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/id/firefox-83.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "ffba9aefa174ff86bf963daa569796a39a3fbacb295b1932dd00a4d72f12cf86";
+      sha256 = "e5690dcc6b933ddbd27fcfb22f8ab9fc4e4c999d935b6088da38c87af2c567d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/is/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/is/firefox-83.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "182c827998a8bead2b5f76477b01e91b66fa0b0b6ad9c20bb71684c951758728";
+      sha256 = "3776fe6aad623e9b74807a48e105d1619143e78e122906360c4efbc73c2891ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/it/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/it/firefox-83.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "3ef3bfcc25ed9e1c9883bd890c60a32acefd243db37bd13eaec71a0c556c2b70";
+      sha256 = "eb54c4596602150c619db6d0d5572a59f7d9c4def68a34cb874cbc6535939e2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ja/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ja/firefox-83.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "67858f54408487c9d4414dd4f072790b686379cd02aaedea165aa2f42ad9f638";
+      sha256 = "54b70bef0507611ad1ea7560668b46385661b5275c7a0ecaad723db44fd8af88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ka/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ka/firefox-83.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "da27168c3eeb9d0836df349e5e258b9f5936cd715374b1614c90fbb4292776a7";
+      sha256 = "56e72349133297d61dfdec4933a01c2cd8fa3d0da3d784e0598506c2db05938c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/kab/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kab/firefox-83.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "4f523312e1ff88ed06ead886ad8957be6b655063ecd451fcf502b387d4144e82";
+      sha256 = "45f554342449405990c84e910dc6436489046acd00fdc4a0ddabb4b28d7c1284";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/kk/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kk/firefox-83.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "b2cff1f5f94e94091d2f0d174ae5a979db34c554f4432891c9b894f0c07a7fd2";
+      sha256 = "3463c4ea5df4e072dfca22e8983fdc016adbe2326bf186a0168ea9ee2c36b3bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/km/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/km/firefox-83.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "0c7b18f57c87d6d94c273b6678ce0dc891afabf9cb9bff3c03a347214bb52cc6";
+      sha256 = "3bb7d2c3e5278d9c51b87d8140096ae01532e99160b866164d1920fb012c085c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/kn/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kn/firefox-83.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "bf0c5dfcf7c23c033b6180cc4916a014e5c7b44464377f8e1c400db7bd7ddcc0";
+      sha256 = "c9086912382dbff66045c79130403385b9f075bf782220aeb84f03f62a563638";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ko/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ko/firefox-83.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "a1b30b45cce0d3bd1a4acb3a9f335592a819bc740455e56626968f2d66a07839";
+      sha256 = "6f70169cd58ee1559ab224c3ea6f5309bf75267d9f315e389b7971e8e1feed09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/lij/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lij/firefox-83.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "8802eef13ecf4b61adbb6f3350893ef7e4fead3395aebd290df95c7d5dc2bfe7";
+      sha256 = "0b089e6f7954f4d99e9e59bd25148c4be620f9486f8d36c3db68fec5ea700d94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/lt/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lt/firefox-83.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "3fb34783d2768452aebfc20ff59b84a83139f2dcb04b1e11369b4984560f94d2";
+      sha256 = "b76c545aad6e5b66bd8ab34bf02f7d4f69ecee348381b16c271f4de0243c660d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/lv/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lv/firefox-83.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "ad3a91899e2a1e2d22f0f15d15956c9c569b8ec0af50b7f194369d969fe9a339";
+      sha256 = "8504d5c00c5569f008b2e308a9193cf62130e89a6e61b33fc842081e4d504322";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/mk/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/mk/firefox-83.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "b98a27b50ae6c21e20f0bdc43cdf176b0d434a85ace230474bef86cb0411e925";
+      sha256 = "636a421f6238de1fee37014c3af147220af6a1f3c04e2ce6ec9dd17898bc7c20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/mr/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/mr/firefox-83.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "6f32b1ed9fe14162366d11ece5b53c185afa314131ba56105ff3aaf9c61cb621";
+      sha256 = "1e00d369be11ad8bfb2dda0ceeb3b7b516fd66427d9e85bff4cc1d699ff3659f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ms/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ms/firefox-83.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "4c7ca7b1e504a9a4c14b7954987f4a2fc3843f341e26f088113aad09c2ed1727";
+      sha256 = "0590f2bff7e43b9f6c081d57276299f8327df73415a8e2a2243e3c4ec9154200";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/my/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/my/firefox-83.0.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "52b234e2c32f52197d38e618b2d542c584012253d5da9b46dbb47c4198e1319a";
+      sha256 = "ae43f0e8d4ff32274b25a1b78e0af44446ea6989edc4eb3c0d9fae36fcf80908";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/nb-NO/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nb-NO/firefox-83.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "63baeaf173b4c83c65b160bc12102038be1729f7ab4e535e01726c83d6af4751";
+      sha256 = "9c3a74fc7670e2202be1f4f75208f0113c115169ef70614af631cf16879e081f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ne-NP/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ne-NP/firefox-83.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "c95567889ad498059516e5c4c38e74fae0d937ad85b91813135cb4205b4be527";
+      sha256 = "d830f802cccc7351a447fc59ed64562cac1521d281ddf218c84d1c9af8a65cb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/nl/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nl/firefox-83.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "6ab74c0caa49412b41e9c26af51c18b4b23c9a2990868bb76ee640f77cf7ec81";
+      sha256 = "ecfd03850a48ebf7c3ec9400838100514826b8f35744b0167f61c9086893ae66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/nn-NO/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nn-NO/firefox-83.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "8ab6be8b9883cd41a0b5ee84fed125b0592c526bd60b57658e3949e675b10909";
+      sha256 = "ad0e4a89afabf1929d441129066dfcbf532d37da31c76bc79108d123cf5cc649";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/oc/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/oc/firefox-83.0.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "ffa788bf89e7d0533e14c706830e3e5a7995cf0d8827dd6f56e7a02eda85ba63";
+      sha256 = "9b9bbba334c4d7d3907f55a6647cecdf0bb2cd6294569a0008d866cd6eb70a35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/pa-IN/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pa-IN/firefox-83.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "300caec712dfd4c2a0d615671468ad6ff249b5300d94a1bf18552ec205fc96fd";
+      sha256 = "083266958874618042ee8f2a6162184cd71bc725a994aeb68158d59edb0cafaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/pl/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pl/firefox-83.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "61cefb394f5490950de3a86312bf13864490c7b77f400881ba67c4e6e04c4585";
+      sha256 = "cb7c72fdc91cd9269a2e53725a26ee94db0e2e608a60ff1120fbe5c1627814bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/pt-BR/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pt-BR/firefox-83.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "d22845a258c133004216d692071f64c8e639caab6475b09de8e880dd26a808fd";
+      sha256 = "a2a188a222fc6054ca59d24370528e8c8d4d7dc8e4ab18f71510b415dde73d05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/pt-PT/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pt-PT/firefox-83.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "390270b8a04f3e7e7185ebe895741c6d3b82de55bd8a88384f58a2412b1156db";
+      sha256 = "528e1893438ead94afd4013d3c4f4f51107a5d0c4b6d6e018a0687f0d25f9e53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/rm/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/rm/firefox-83.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "c9f916a4bd9d01dbfa7c07988f25db6fc754e98fdf8fb0c6d28c7cf23799fd6c";
+      sha256 = "e4d6e53b642da4de5c7f30297c6fec22b37921a55cb744962dc0d60e26812549";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ro/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ro/firefox-83.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "3079e818963ce30e63f984ef3d24a321bccde52021f68abf7c38e166b63dd3df";
+      sha256 = "04ffa3eda69ea0dfc6251564c4c6bc742d5f8e5dbaf6184b4ee9461226ce5c86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ru/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ru/firefox-83.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "5d5f1d4cf24e1f41f4f49edd2918790f3395bc45656bc385ff863ae996a2e964";
+      sha256 = "697ddeb8ec024b5459492ebd652a612cfa1911267071b230f5ea6ac78a1e3075";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/si/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/si/firefox-83.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "182d4f9f65d923aa4c190eadb2822813a0153d46a7dd789bd03e2c87deaaeee4";
+      sha256 = "a3256c648ea75ce36009306a3c039af228e645ea2e54361fe239ad0cf0869ead";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sk/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sk/firefox-83.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "9f38a513c7a35aa403bc570c50d1269fab04f3e0e78a2ee729bd306513b34655";
+      sha256 = "1ae0f898d34c74ea427228d93646ae47990834d14bc4f5563427409dba066f8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sl/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sl/firefox-83.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "916cb70157af7c6f44558954ab38b22c0e35472ae449b2cd1b3355e24f69d8ac";
+      sha256 = "9e14b4ad7bd9a8026074e0a3da3d3ba74dbb1be31a2e9cae787802d090c7a965";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/son/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/son/firefox-83.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "4790b6f7fad51191663549d6c06a9a27d2a6edf153caf66c8cbaefc6a2e33547";
+      sha256 = "1b928ca974133a346950ffc663fbed9d1876a4c0bca53fd807d8077d031531d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sq/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sq/firefox-83.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "3265c849c77d482145bdd6e67078ec82e1ba339a807ec15692431a4c43358e2f";
+      sha256 = "7bb9bcfe490bf5d577e55e9b612c932c93ac58252cef592b2af39c17987e700b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sr/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sr/firefox-83.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "3d5616ad78372ad3e64e0bd81046680f075de53641c3c1f73edb2aed66f54d96";
+      sha256 = "90e496a5fe9c5d8c38dfcf5a1a07ea04be983fe78c68cb13a2b99067b0f02e7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/sv-SE/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sv-SE/firefox-83.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "bf1122a7ba4cbb5525d35d7245a68bc2534d191639955a6c9810f57dc6b41efc";
+      sha256 = "eab8a1e51a90d36b58901db6175e724f38afb91270b05c51a93c03f8c51fe432";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ta/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ta/firefox-83.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "8ad3ac098bec9283218e0e33dc106457b8f2f21b15aa7b821a5f061566d058fb";
+      sha256 = "bb6d49500393d20134a6f749a77de1fc4cae2feba4e49261862f8a634b4b9276";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/te/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/te/firefox-83.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "a366052f680073f1d0c300a5a8e45d6cbd1be7651463067db268626d2fe1a5ea";
+      sha256 = "a1104e292f949976e423b587fe9728fc741b7a11e276e7d747afd3a93abe3eb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/th/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/th/firefox-83.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "509dcd38435c2923a5bac14bb5b2dc4838606f139c29138a0bd5d090fdcb0142";
+      sha256 = "403e4a86b5f95cb22cdb2100372c55d92fcb4708e3f719da72b643637c711458";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/tl/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/tl/firefox-83.0.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "37f39b2df1209fdfa9005e6213d31aa50a8b62c55ed269625ed90f5fefcd5169";
+      sha256 = "993cf86a1b045a477fd4c683e503314fc2aea5a0a52f1faaacd18a0fdc5c7def";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/tr/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/tr/firefox-83.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "6417ff882cd86cbb7238414fd8100769ed6dea0a3532af09ed9d7e05ea322f22";
+      sha256 = "8e9e96d0b1a2014dc7374ea893fe72bc72f3840742d305a6e73417468dd6245b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/trs/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/trs/firefox-83.0.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "2fa044fcba5f6155ed55501938df4646dcf83f7d67f53ea8ca945e319db54c29";
+      sha256 = "3590ebb4c888cf92ebd615df9eda2413fd0a3031293d68809fef74fc92fa759b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/uk/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/uk/firefox-83.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "345be40eeaa42900bf7091fc8098a92d16369ecea3992974e4a2ad8856f58f3f";
+      sha256 = "7a3a2bae67ddd2afd2d6953f5f045a831595ea29e5cc6ad7083b8ac89e55917b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/ur/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ur/firefox-83.0.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "47679117a1295b74a4b06b1407ce0dd38fc45326af970f4a20caa4ed8343e739";
+      sha256 = "445a599ba623d8673d71f6ebde70c64a93e28e57b6859e325b0151240f1d49e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/uz/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/uz/firefox-83.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "85dc93248a9db047cd9c97a87e0f36ccd25456c167390bff19e0e84dc93b6756";
+      sha256 = "b63e6c1c6afdc3694ee1d2b21175f4a5603c4454e43f0a08e87ccf800862b6bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/vi/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/vi/firefox-83.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "7882f5c1e3330a567967444fde09e0bca8e2259e4f836603bac61d7fc4de47ed";
+      sha256 = "7127340d189ff601f96ba6f5e6a6175d850e822599e10762908d406b2174a256";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/xh/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xh/firefox-83.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "fcb914c24f93751ea1ba760818bee0323e5220c14ef95f3d6f302f80d58a0271";
+      sha256 = "41772e457eaf385230086a461033854ad214b4160c6f99f7eb6c4df8dd137dc5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/zh-CN/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/zh-CN/firefox-83.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "0e3635c27c594395f2364d6f4c140eac66173130afa0130bc4043e500fd91481";
+      sha256 = "013fe88aea216fbc4de9fdaaf559d65678ba389049bcff896540dae8d0a9564d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-x86_64/zh-TW/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/zh-TW/firefox-83.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "7c3588bdac4147a43d5a40e376f359823a3503c3ae491e3d98b66b285c924e25";
+      sha256 = "7e9eea2a326842f652aad4995f796af9550d03c034587d171e4b2a33da934645";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ach/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ach/firefox-83.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "ed00c332dc5069a5b4755a759c4096112aa07b5fabaf0827fe63dcc8f96c70f9";
+      sha256 = "9974b19f4f15d9aa33b5432cceea05efe44f31c4123596aca9fb5cd3dd734152";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/af/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/af/firefox-83.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "41b4929336370eacd9fcf61bf56adc26377305f253ef8beacae8a3528949a2d9";
+      sha256 = "5600ad5fad398648d2e7a2d7bdf7901769fa428f9ef9f79046917133e12a7eb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/an/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/an/firefox-83.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "d8138aebfe43f67f634f4a70142b5463497799396cd4e5ac6fcdd91a1c370d12";
+      sha256 = "d8e0843dafcaf1b010773b83a665fd593741858b60aaba61d4c308a86f765146";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ar/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ar/firefox-83.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "f58e993bde013b674863586dd016d4ac9f8a245a4dfffcca36ea8044afec20a6";
+      sha256 = "952b2ad360662341b9281cfdd93a141fe2efd16f73baa4fc4be1de7b8f12c8c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ast/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ast/firefox-83.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "7fa1d61e805f7f3f94abafd6dd73c5ec3ac518c3192c6fdb7e31f155cfb2d8a9";
+      sha256 = "a7728b09f7e96983a031a32b1b938fa362e1a1e58722b37ec03a4048a152f0b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/az/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/az/firefox-83.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "354db7168cec8c18431e33d5d13efec2b2e1de6b38e462338935ec4157521f46";
+      sha256 = "c6019a3f7ef56583445acc5ab310770c937b44182a1bb3ed54ac452e6e19f8fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/be/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/be/firefox-83.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "bfc5689bfcd37bc6afd6438130fac2486670616ebcf3f40e40dbff85f2323ed8";
+      sha256 = "12ead04878e308682f04afb6ac9ce9ab134a5a542af328e029cd973c14fe7444";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/bg/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bg/firefox-83.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "18bc052d5ba75cd4406aa726648609bc95d869a633ad99f3dcb24dd2621b81c3";
+      sha256 = "7134539d5c259cdf6dd316205b857acae87730ca01bd6ef2efcca75f9d06d027";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/bn/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bn/firefox-83.0.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "896eaf0144040b5eb7281f46280b918bca93ab8ebcd3d8a9176d6468a7f82850";
+      sha256 = "a97524e0d6f6f61045b2573ac2fe98e31fa372429f5f53c25fb4cb4d32a31940";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/br/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/br/firefox-83.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "7af967b1fa2aeb7d9e97cc883bd118b4d04a98c8cf56ea2f4f435ee13d1a087b";
+      sha256 = "4619705703a6878fba4de4227d90143abb92237ba556a8c5f4a51c9701671821";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/bs/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bs/firefox-83.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "990778d72c382920590a92ff0c861f8d64274d09da56fa989b5ca124731eb1e4";
+      sha256 = "2131babd061761fa1119a536ae354145315875c5d8cd300405a35924bbbfcc34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ca-valencia/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ca-valencia/firefox-83.0.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "ec0594197bea5db1058fe3dca4a5e3bdbda53797e87a2fb0af070664b7a7fe3d";
+      sha256 = "73238eb95ac828f4bc2ac220e4b953b950a75b88600b457bf3bd528245574cd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ca/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ca/firefox-83.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "42a25d4006fe6e4f8e7f685304f13f715654d79df775cc6e740a49bf72e691d5";
+      sha256 = "73e65093a587c89c9a392e3b65375ad2158c88e2905ab116eaf8da7cc5841cda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/cak/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cak/firefox-83.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "452438f73a0da6bc5922de9178c66ab95a0ddc94420a97b771d44d76053d1e71";
+      sha256 = "7f2dd3fdf1e0cae21a1517286b60bbbabd310dfc0dc18588fbe21ba671e97dd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/cs/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cs/firefox-83.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "fa827fd11c25b37f2e93938be3461061b8c0bd3ca1391c0b50657981cd0e2ba6";
+      sha256 = "5f639cc6d14b06ae62f73fc01b909182efea32710dfd817be60499f4da3eafd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/cy/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cy/firefox-83.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "12708a5c0f3559d8557f5eb11a5a654b999b2e758d075fa723d78434f1f0fbc9";
+      sha256 = "7a3e9921b2e6e407ebeeb22f1ac4b529222a1f5fbdc84c44fc902b8db6aeb1ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/da/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/da/firefox-83.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "660f0af8ecfbb07df68d5e28eb63b69065eec5ae1e31acbe8f89a7aac66596c6";
+      sha256 = "05dc3274927f692ec3c60f8353a30e2bcb1a36b54f4ddff90407e2818a497a38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/de/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/de/firefox-83.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "16492891efe70c69774e10a83465a5b7ada5a25a1057de0a744c347126667a1a";
+      sha256 = "c95affb4655b7a0ad6959651cf10090970035c74601ea141366cbb5d44f8a526";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/dsb/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/dsb/firefox-83.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "7c830c85f67d2d54b63ddfb94765f5fe1270df06d72e05cc5e0a1dc745e3dbbe";
+      sha256 = "c9baf7df51fdebbb2521dd10830f759110a9c92dcdb579fad99d0c4112126e66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/el/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/el/firefox-83.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "f4c42a7b3b7c8faea5a54affeb47083f7070a37e3e05a85bd26d53eb2571182a";
+      sha256 = "52afcd2037b9cda2c66975dd184276bcccca27833cd7a6da989e32c591a06060";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/en-CA/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-CA/firefox-83.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "fb55f47dd07ba7b8e1d4637d0cf693db8de3bae5b729bced9f22e6a3a7136e37";
+      sha256 = "375d3a11f236560f06397f157209b1ce476197a0e7b327cf187dc2002d053c90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/en-GB/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-GB/firefox-83.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "98fcf28312060007364b6ae7e73b4e5ec5f78d5cf6b92c68deef49b8aac39e66";
+      sha256 = "610657a623b5680c2ea350a5f3d1ec676e9dac8720e0e67b3e627e37a58b0ad6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/en-US/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-US/firefox-83.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "53e1cd6dd28b764fc0e824174de5cb1d70a2b795f7f7e6d1ed400a84d996295b";
+      sha256 = "ac4df9d78ac0321f6be266e7fbf6b79d80bee7cfdf1b00c433072d2283c5fdf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/eo/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/eo/firefox-83.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "0277e0d4f5296fcb5d360e3949991783808362014220eebdab8fd031203d03a5";
+      sha256 = "f23479cb30cf27fa368e9e04591aad2051eedde5e69d105bfc9ba6168792b44b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/es-AR/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-AR/firefox-83.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "db90a491dde00c0625bfb91f12820235ed4b23ace245520bcea8129bc0fe99ad";
+      sha256 = "5657636c105d301474cf5d2707733a35ac5f5687790002d5778dffb32a727adc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/es-CL/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-CL/firefox-83.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "da7ab44cfe8fef8a89be8180f503477d632e1b0d0e13b410e005971f1eab65cb";
+      sha256 = "896f2ac45b98eccd487de64b6c5aa98733d97bd4422dd1a16d02883e3a06c132";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/es-ES/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-ES/firefox-83.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "b774a59300369f9aa5e695eecf2923036ac28b790a2b265bff39fa004221351d";
+      sha256 = "9d337fc821dae150c4f3ce26c427ad0efa22c53f3b311b4ce7693b33c9ea4d7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/es-MX/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-MX/firefox-83.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "f227f0904d927a9b7696dbd42c33e247b93a517ac465e63658297d266636dd63";
+      sha256 = "f9cbd03f9813157835ef7faf9fa2374e488144930ffdec765c370a95a9c72120";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/et/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/et/firefox-83.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "40c66a997e4a244775c4e094b313d8de66fdd8ca9b59b14b1858e331f0c1760e";
+      sha256 = "4f33cbb67003da1b4db4dc12ee2e7b9fe942bc6e6d770608361355ce7fcf8214";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/eu/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/eu/firefox-83.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "cc346925123d138c8f39f8feaaa830c87b31ec9f3e6d66d62f3c4201389528b8";
+      sha256 = "31970c98d028a83a6198dcee9c5f8191343cd84ec6a7fa032a31730db2cc7b00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/fa/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fa/firefox-83.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "74ef4fb696e3a551e920d95341e6b24ebed1abc0f50c3753b5719e649ee6569b";
+      sha256 = "1125c534f2067e57701fab7ae3df55c52dc10693b069817021072c74b8b9bdcf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ff/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ff/firefox-83.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "300bd1d7ad740efdf7e783a19bbfbab32d699ded795857005e3d836086414ecf";
+      sha256 = "ef6c66b0d8a6edce0c982eaee55cd14a4ac4d365478976a0c4f1cd48a6c10c6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/fi/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fi/firefox-83.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "be9e639888e7fe25508d1fecce9dff0d25fb8f4cc1df9485c06fd34dd1964341";
+      sha256 = "bcd529c0227bd64403dc023ef91459556fbb186e072c12075b705d50293d86c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/fr/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fr/firefox-83.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "a722540cedb2694bdd8cd347cce80f0e7bd6092227a0d69d64e35cd644f9eb77";
+      sha256 = "47c56fe2b88054d97622e9c0ff2043323b7a916da1e11541e96cf7b05c3e7d52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/fy-NL/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fy-NL/firefox-83.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "d8292b69187d3b69d3e6d38076e9e448cc1851ae560432d524c9ceb25b980302";
+      sha256 = "b0ed17e5022b0817d6b4f58ef990ce22774bde875151c60be1f7251ec90cb189";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ga-IE/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ga-IE/firefox-83.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "3d72fde2daf9dee7d7521dbdcc257aac3e5a3090f07a02aaa4eb1247e4dae774";
+      sha256 = "380aad276cadff8221e4f675751278ba994e08ddb46a0ebde12d87b741c23263";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/gd/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gd/firefox-83.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "b599939ac3927e3da21a8b85dfcfb2bbbfbc5ca9833543b7df3e8937184fcb0f";
+      sha256 = "0489ed6e1e9150a0facb4e6fb59bea7673e89669d167806d5651224b939fada5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/gl/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gl/firefox-83.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "f7d8f6915d9867e740aeeb06614ac3c2a9c29ad914937fef99490c37c329e822";
+      sha256 = "bc41c2b611ecb4ccdedbbf480138a3bc6326106d6c1641d6a06e40f502427af0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/gn/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gn/firefox-83.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "940c94891a5bf80b12c24b49276e87c50f6edc601c1876a75ddfb36853f94c02";
+      sha256 = "ade8fe9ab75b0a5f75ce80ba0f8065c4b4cbf54d7772f4c3be96886ca166b373";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/gu-IN/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gu-IN/firefox-83.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "8961e66ea0bab00b29ccd365351517d932c75af5fceb9381a0670e225bb9a20e";
+      sha256 = "bc20ad60eee0e6a3d532e436d9b62175872fcb27dab4c9a5083ed6f4bda5f036";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/he/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/he/firefox-83.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "a253c246e6a2820a6552a81291f9887007174120e13f3becd3e3f06d55e12457";
+      sha256 = "a08862d8ebdfa2d6c4f038b91f264c9abe873537d1a7cd2997a1eb4d73bf6f4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hi-IN/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hi-IN/firefox-83.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "39f7bd90f28ce92b83c46580e8297367d02042eb274809a0c94f58f6fbd2d0f4";
+      sha256 = "8ed5b454bdc38f07c79924a1dc08e76e65a48bd671991744a441693185683916";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hr/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hr/firefox-83.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "37237b7a1b28028c31118b3f6012f6122b428ed81cd0289b224aff910700c92e";
+      sha256 = "97356a661d56d51a9210109db8ad75d61e3e00e4c7570d4e824712b52337af27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hsb/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hsb/firefox-83.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "e4c1d598ebd277309e1d9bec979373162cb34ec7874637a7140184c07e590653";
+      sha256 = "5706aa76b23161baf24b79d2b45dd706006fb73aeedd06f41f3273f8078f371b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hu/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hu/firefox-83.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "a273f90e185fea5e02fa7be0e859d6569d5a18690dca2485db39719f04f96821";
+      sha256 = "3b894beaef35012df54ba4c7509a06ece1a0cdf741308b3510ddc702c4eb3656";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/hy-AM/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hy-AM/firefox-83.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "0da0b1db8a5632776a38d8ca53fc59bb2922b9caeecb779e4fd69086330eb153";
+      sha256 = "b2894092de59b7d6bd6dcd2111fa4591b1a4ed054fd107e2093bd0962edb4405";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ia/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ia/firefox-83.0.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "53fc34e4f99ace2f287a39dc8ce1d13546574da940dc85703fd81f7bfa7c4483";
+      sha256 = "9d9ee7e05a02078b7d4041c3b63e79f91f0a888b919cf726e2e69090ff05f71d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/id/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/id/firefox-83.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "33088caa35f9939e24e1686a97762c86e6bfde246467544383b4dd20a477ce01";
+      sha256 = "13e54589a23323e9043d4dac5586a31e5d43bdde0356b1a00a86f91ee5813eb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/is/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/is/firefox-83.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "e8651697dd1c6507e950dab2a7c1a3e61c7a1fff5507fa6967577c076aca43d6";
+      sha256 = "955a8a4ff1c5ba7124593b3c8537201ffb1fe33ea5c3edd6ab30e80e6b28f60a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/it/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/it/firefox-83.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "faed37a9099007b2a06a66f0d2baf19f743a5370d354d9295d3c04d283a840c2";
+      sha256 = "23927419191d7aee8b29da29d213ee9c7ff39363f3fc9171c70d801158cb895b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ja/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ja/firefox-83.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "cc403028cdfecfab642f99e4fbf6920cb036f71da9ca05343b41990c01e3974a";
+      sha256 = "4ffaf6df345922bcd82942956a0f344c4b52ac49ec64879fef7307a0c34eb8e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ka/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ka/firefox-83.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "279655a3c1a9151af171066bf164c71a4541344d5bddc02e208faae5af61052b";
+      sha256 = "df1027754efd054bae379b35228067799e75820b08ca7e6aff5a527fdaf046a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/kab/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kab/firefox-83.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "febad3151c3b6dbd0e3747a4814d2451e7703d8907407255810cd87383a5d665";
+      sha256 = "6fc1e5d662ce742a48c003145b1b4b58cb296b43a20f718bdcffdc05e386078f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/kk/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kk/firefox-83.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "25135a1305e6c4269ef9beec7353669d403023fd552ae43cb7a4b8042eaa9a40";
+      sha256 = "52cb3ac3a33da1227c3aa5e47e04620be2cc020bc520fcf013fe11ad74ad6378";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/km/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/km/firefox-83.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "80daab49e0fd64640fc1b0a7ecaf3b764a0a7b38020aa4a758f1e5e8ee639b9a";
+      sha256 = "c598fa97bb79f56d01afb30caeff29a2c7dd1f162d2fb49c0632ee259d0fe860";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/kn/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kn/firefox-83.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "dd911926a98835fe4a0a97ad0ee88867bc637a673743b9c6ee75aefea1cf60b9";
+      sha256 = "d6795f3f3c0978dbc399768fd824cceb6a3c1c883c153f65102ef476f74d6408";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ko/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ko/firefox-83.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "975f10dc01c190604cac28705f98b0abb352adf21aa1adb031a11c8061fdb4d5";
+      sha256 = "b4d0b62cdfd332d8e9878b75918a0362a7b68db0b62e4e4508dfa176e79b8ed7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/lij/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lij/firefox-83.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "9f6183b484eeabfbd4440d644d3da60c1068af430638b1bf9e4e5a4fe47e123a";
+      sha256 = "257eec8bead076119b0c3679feb4f3de34c9cf66bd05215e7d76936e6d3ce052";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/lt/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lt/firefox-83.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "e95b0760385490b65c774943f72835423c3339030a9b347eeaa7a3cd172065bb";
+      sha256 = "326925d68306ec6e5b7334eb413cff395ce6a27abf5b0981dee25a7888c64079";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/lv/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lv/firefox-83.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "6a2387d24680d541e12547f6fe38c56e9960beb317e450a39cfdd481b56485d8";
+      sha256 = "036264de51a7a81b3d636b8217db571db70631231d485f353e64e9f43f0192f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/mk/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/mk/firefox-83.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "c95e5e94680ce2dd06adb6cc6ab7cb2545e2283b34f9f6702db9c4ee48635d7d";
+      sha256 = "6d4966ae49ba7746395b17b98c158c07d33293b68a6c648d0238107812ccfc03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/mr/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/mr/firefox-83.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "6e2ac911d8b4ff89fa5719593b390ffb68f31ea9c53ca075ae91c47907ed67bf";
+      sha256 = "88a90205bfd157fbcb0697efbd4884772a463f776f5110aae9903dbc1151fcbc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ms/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ms/firefox-83.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "4c573fc813f878c9baf9ebd2aee71f5459160a2449c424e1bcfbb8035b3b7c50";
+      sha256 = "67d3651739404a73f263251896c129dc121808d4859169b3469b640345433e9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/my/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/my/firefox-83.0.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "a42129e772ecef6e437aff59390da05595f55872c990122bfa07509aae204757";
+      sha256 = "d7e9a1fe6d2e0e32c2ab9a773d198de241ac2a7d330d9eddce4f3afb9a67671b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/nb-NO/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nb-NO/firefox-83.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "3d72dd2b24c1c99fc1257a9eecf91fd694e67a161b511b991a7294c6dade77c6";
+      sha256 = "66c165884d4397db3e420151d2b6fa3d7bb7c6de790e6d284815cdcc323da3fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ne-NP/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ne-NP/firefox-83.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "a85fa695c3c7a221ee54bee11b5eb88dab9d087d3535f63c143fc8fea759a83e";
+      sha256 = "f75832bd74f5ce8db3765201eee058f0386f196f407223e186c0be3d2a665fcf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/nl/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nl/firefox-83.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "48aa468f774d67526e41488882f3796a399ef1789b70793570407e14bf112251";
+      sha256 = "beb68fb193dfcccbe22369f9adcbebe701fd4c9ab5943ec685d5d20398a1ea5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/nn-NO/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nn-NO/firefox-83.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "857abf782407625492859630cd47be120e5daf8843dbdcb61535fafaa0d5d3cd";
+      sha256 = "de2716b8f4c13c6ef76537ef52f1d0529016302ce220a90d9b5062af9becb5b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/oc/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/oc/firefox-83.0.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "b8606e264be062dcafc162b5d69191d2962b547fa906e76e68345395378ea471";
+      sha256 = "af2a788560a65cb9f3d2ce98acce4ecd3b3105b6c924c6a4de1a9deb6f2a4d42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/pa-IN/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pa-IN/firefox-83.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "7279685c4da5b614f6ae0832636676b06ec3384667e1cc1e25379d61b52ebe5c";
+      sha256 = "a3575371b20bab63a8bccc110343e0cd0736cffbc5c72dd7aa371c646a057060";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/pl/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pl/firefox-83.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "436d60ea9bb7b84bb20973ac39ebaf1fbd6c7966b5fe5677fa829935d76f4932";
+      sha256 = "daa554b493ce1efa90a1b040e78d2f2e7ad8ca70c16ee19312c69ed4a12f00e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/pt-BR/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pt-BR/firefox-83.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "47e972cd908b61b1ffb3a194ef12bb1b9e0033a3b30804e0201a94a5dc4c9d42";
+      sha256 = "4f3fe4a1ce0e12383b37832f44b59fbb40b8fb6e95786edc57ea67ea3d5530bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/pt-PT/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pt-PT/firefox-83.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "cab8ffd436e69f7102519bc9ef73d7473336a0a45452f1e85cb0b0ce7c50d197";
+      sha256 = "c16bcb116b845a6b28b72096ae43d50f19c7b9868c8bbb833db60eaaa70b001d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/rm/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/rm/firefox-83.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "26e71bcc89580f7a2510f7018481b86c7674b0534070a85f675a2f576de2d9c1";
+      sha256 = "334d3dcf333a66f4bd169536f7f3b56ba4b257793dfd0837badff2a77b3668f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ro/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ro/firefox-83.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "2c9838ca56e808cbcc0f08987c1b21615119d94dc93cf94dba915491130a0706";
+      sha256 = "1e6ad9735fe0046beaf80ac35d0a1831aade14f388d08991b9bc583135ebd94c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ru/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ru/firefox-83.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "4f9b41754a1dd74d8979940eb17be6578c6907b0deea700697eb340fe607a586";
+      sha256 = "a252bcd66f01375fbc4ce040b89c853c34745e8dede116d200303c56d6307f15";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/si/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/si/firefox-83.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "203b50ef0d0d76ab3db56bed03a1b78f3f20819cc804cb5ce470470bd6b6148b";
+      sha256 = "ebc5ce83b456f75b671694ac954258ca480caee563e0cb395786692aedf24d88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sk/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sk/firefox-83.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "650cf2fe9ad5628b927f655fe1e88e9260c98543b7fdf6dd5faf9a1cbdf50f08";
+      sha256 = "28aac94a71298c459f14949c9c82b379762d3192a16d92e90605ab8925cb31ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sl/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sl/firefox-83.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "7c0aadbc5d6dfff44906eca393acc08388238fb502d183653a094f4ef7095d02";
+      sha256 = "7fe0eb68a898488bcb697120542fbdcfd1d972c658b4c361bba351a8f5eb76e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/son/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/son/firefox-83.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "7e60dd64c8ac8052cbc6efb8cba46713ebefd17e66626a6fa2896a3bf88e9553";
+      sha256 = "f9cb1327834b6a6e41d4abf531410391a40f33a8d168d562dc367faf31d9e042";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sq/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sq/firefox-83.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "d8fa2f61a2fdace3374effb32484504afb78651406216c1dc900f6958ed52561";
+      sha256 = "15370cc0527797f451a5a1f47637c6663437c8f49fc5c056ccbc2e7510cd6c94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sr/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sr/firefox-83.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "f58146fd202221fec3980ed9fbe7bf84d26465fb63c334826b3271c705e5bc61";
+      sha256 = "c44773c36eb39067e429fb4a4b57676abc7eb9fcf45bd6654d96761f64747c6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/sv-SE/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sv-SE/firefox-83.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "23f71c61978bcf531790a3894e86c7bcd7c930464f9276e4d4464de3d199db53";
+      sha256 = "aa8d2dc50dce8a53a926c71a4a7a57023a017d5fbd54cd1e446ef74b5eef7dea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ta/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ta/firefox-83.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "78fda229fc9583bcfb3b1ee12d494d04955845a703a594e836e9bf3ae67531a7";
+      sha256 = "5fc3e8a048ec24e49c4c4a0e36712b378687e927c30dc8ecb3ec63bcf983062a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/te/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/te/firefox-83.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "86aef155c9b1db83727d8e2df9cf73148ef7146aa6ec77f751f7e548e1ff3e72";
+      sha256 = "ff123410cec64c47d239a432d32eaefa494e7cd7fb0157cc45917fe04b2916ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/th/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/th/firefox-83.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "ae647ba530f60dfad84c95d0b70ee8dba7ef183f1b76c9861b2ef3da6d95779d";
+      sha256 = "cb7cbf97884a5b4f62c4e0932ead0e5de018c9623590ac3798a86986916258dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/tl/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/tl/firefox-83.0.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "137722d3de0ae236bb17dfc940b8eccd5ac7ed291d22a59486c2e79505d3b34d";
+      sha256 = "0d55a23e2c0b7da80a6c042e50fc3c9364c3f24309cf255bfbe55a320ec2cf00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/tr/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/tr/firefox-83.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "0a2c8be857398f202cafeb97db2a8ac963695e285137c8e7e7df40a9673f0c2f";
+      sha256 = "bfc1adb570f79b4f095bc87ab5a54c6b5179579840ded61319a10ad5ff39d52f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/trs/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/trs/firefox-83.0.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "6c2d08829057be94edc1923b176fd52ee8cac5cc40e2484c38577865d179cde1";
+      sha256 = "05b5a2252380147ec47561e29514e3f994414b46aae3dd168909f03e7dec16ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/uk/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/uk/firefox-83.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "b2b9b997a9bcbe12d3378cf18928ce8cb842a4c3962a0629f6abdd41340f36e1";
+      sha256 = "7e34b52f4d46a735e36f549295d0f9704113024058a7d8d69a8ee6a023d03755";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/ur/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ur/firefox-83.0.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "b91073657e73985254dde8542ca420087111de7297d7efa368204a45cd8c0932";
+      sha256 = "1d48e536c09f862bc00fcaf9a175eaeffac1e0aaff66d71ca49123c00cc885bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/uz/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/uz/firefox-83.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "6e966992653870494fc3f44a44c8e3a4863b477c506e21c384905ecf7d79077e";
+      sha256 = "1f1cf131b3196886aa0f923c5dbaa279b86c3473dc048ce23d58fe811ca1266c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/vi/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/vi/firefox-83.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "8b1d1fdac04d9fd18a52497bdd2351c511fdd7480914b142e9e83a67b8c2d352";
+      sha256 = "b98507cd809abd28c51514448bf995661dede7c727808ab8c2db46da8da0a164";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/xh/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/xh/firefox-83.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "74156e07e1a42d2cdcf8dd533f191673bb7acd6c14fffde0a2ca557cd15bb05e";
+      sha256 = "73de4ec29cd09610359909ada39820a119a15c3ae0cc1658c2e9b874801a9015";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/zh-CN/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/zh-CN/firefox-83.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "4ff34ab97154152f0c1ae67640a7bfd51bf40fdcaa55635573cf9dd315566d5e";
+      sha256 = "fea085476f4456133c1f0973121319f1c3efadcc50134cbf5ccde351bbe2ff06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.3/linux-i686/zh-TW/firefox-82.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/zh-TW/firefox-83.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "3c6e1b67a2e4132be1a506bbb1ff25c61519be5a1daa962ef629e0d1f8b670c9";
+      sha256 = "5aebd374f2e73f83bec4c14239555d9f2771d3379280fc55f90f1ae0909be009";
     }
     ];
 }

From fc6948cd478ee0506608f8513ba64c7a5e23bfe3 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Tue, 17 Nov 2020 14:02:37 +0000
Subject: [PATCH 2673/3942] nixos/malloc: fix Scudo

Fixes segmentation faults.
https://github.com/NixOS/nixpkgs/issues/100799
---
 nixos/modules/config/malloc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix
index 31a659ee83fe..a3eb55d8a42e 100644
--- a/nixos/modules/config/malloc.nix
+++ b/nixos/modules/config/malloc.nix
@@ -23,7 +23,7 @@ let
     };
 
     scudo = {
-      libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-x86_64.so";
+      libPath = "${pkgs.llvmPackages_latest.compiler-rt}/lib/linux/libclang_rt.scudo-x86_64.so";
       description = ''
         A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator,
         which aims at providing additional mitigations against heap based

From bc029589d497af96c4367462200e7690dd61ae69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Mon, 16 Nov 2020 13:32:03 -0600
Subject: [PATCH 2674/3942] crystal: refactor and add 0.35.1

---
 .../development/compilers/crystal/default.nix | 262 ++++++++++--------
 pkgs/top-level/all-packages.nix               |   3 +-
 2 files changed, 151 insertions(+), 114 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index a04d48dd0e5a..fa8198fabad9 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,7 +1,29 @@
-{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
-, coreutils, git, gmp, hostname, openssl, readline, tzdata, libxml2, libyaml
-, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib, pkgconfig
-, callPackage }:
+{ stdenv
+, callPackage
+, fetchFromGitHub
+, fetchurl
+, lib
+# Dependencies
+, boehmgc
+, coreutils
+, git
+, gmp
+, hostname
+, libatomic_ops
+, libevent
+, libiconv
+, libxml2
+, libyaml
+, llvmPackages
+, makeWrapper
+, openssl
+, pcre
+, pkgconfig
+, readline
+, tzdata
+, which
+, zlib
+}:
 
 # We need multiple binaries as a given binary isn't always able to build
 # (even slightly) older or newer versions.
@@ -43,144 +65,152 @@ let
   ] ++ extraBuildInputs
     ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
 
+  generic = (
+    { version
+    , sha256
+    , binary
+    , doCheck ? true
+    , extraBuildInputs ? []
+    , buildFlags ? ["all" "docs"]
+    }:
+      lib.fix (compiler: stdenv.mkDerivation {
+        pname = "crystal";
+        inherit buildFlags doCheck version;
 
-  generic = ({ version, sha256, binary, doCheck ? true, extraBuildInputs ? [] }:
-  lib.fix (compiler: stdenv.mkDerivation {
-    pname = "crystal";
-    inherit doCheck version;
+        src = fetchFromGitHub {
+          owner = "crystal-lang";
+          repo  = "crystal";
+          rev   = version;
+          inherit sha256;
+        };
 
-    src = fetchFromGitHub {
-      owner  = "crystal-lang";
-      repo   = "crystal";
-      rev    = version;
-      inherit sha256;
-    };
+        outputs = [ "out" "lib" "bin" ];
 
-    outputs = [ "out" "lib" "bin" ];
+        postPatch = ''
+          # Add dependency of crystal to docs to avoid issue on flag changes between releases
+          # https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782
+          substituteInPlace Makefile \
+            --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation'
 
-    postPatch = ''
-      substituteInPlace src/crystal/system/unix/time.cr \
-        --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo
+          substituteInPlace src/crystal/system/unix/time.cr \
+            --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo
 
-      ln -sf spec/compiler spec/std
+          ln -sf spec/compiler spec/std
 
-      # Dirty fix for when no sandboxing is enabled
-      rm -rf /tmp/crystal
-      mkdir -p /tmp/crystal
+          # Dirty fix for when no sandboxing is enabled
+          rm -rf /tmp/crystal
+          mkdir -p /tmp/crystal
 
-      substituteInPlace spec/std/file_spec.cr \
-        --replace '/bin/ls' '${coreutils}/bin/ls' \
-        --replace '/usr/share' '/tmp/crystal' \
-        --replace '/usr' '/tmp'
+          substituteInPlace spec/std/file_spec.cr \
+            --replace '/bin/ls' '${coreutils}/bin/ls' \
+            --replace '/usr/share' '/tmp/crystal' \
+            --replace '/usr' '/tmp'
 
-      substituteInPlace spec/std/process_spec.cr \
-        --replace '/bin/cat' '${coreutils}/bin/cat' \
-        --replace '/bin/ls' '${coreutils}/bin/ls' \
-        --replace '/usr/bin/env' '${coreutils}/bin/env' \
-        --replace '"env"' '"${coreutils}/bin/env"' \
-        --replace '"/usr"' '"/tmp"'
+          substituteInPlace spec/std/process_spec.cr \
+            --replace '/bin/cat' '${coreutils}/bin/cat' \
+            --replace '/bin/ls' '${coreutils}/bin/ls' \
+            --replace '/usr/bin/env' '${coreutils}/bin/env' \
+            --replace '"env"' '"${coreutils}/bin/env"' \
+            --replace '"/usr"' '"/tmp"'
 
-      substituteInPlace spec/std/socket/tcp_server_spec.cr \
-        --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "'
+          substituteInPlace spec/std/socket/tcp_server_spec.cr \
+            --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "'
 
-      substituteInPlace spec/std/system_spec.cr \
-        --replace '`hostname`' '`${hostname}/bin/hostname`'
+          substituteInPlace spec/std/system_spec.cr \
+            --replace '`hostname`' '`${hostname}/bin/hostname`'
 
-      # See https://github.com/crystal-lang/crystal/pull/8640
-      substituteInPlace spec/std/http/cookie_spec.cr \
-        --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}'
+          # See https://github.com/crystal-lang/crystal/pull/8640
+          substituteInPlace spec/std/http/cookie_spec.cr \
+            --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}'
 
-      # See https://github.com/crystal-lang/crystal/issues/8629
-      substituteInPlace spec/std/socket/udp_socket_spec.cr \
-        --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"'
+          # See https://github.com/crystal-lang/crystal/issues/8629
+          substituteInPlace spec/std/socket/udp_socket_spec.cr \
+            --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"'
 
-      # See https://github.com/crystal-lang/crystal/pull/8699
-      substituteInPlace spec/std/xml/xml_spec.cr \
-        --replace 'it "handles errors"' 'pending "handles errors"'
-    '';
+          # See https://github.com/crystal-lang/crystal/pull/8699
+          substituteInPlace spec/std/xml/xml_spec.cr \
+            --replace 'it "handles errors"' 'pending "handles errors"'
+        '';
 
-    buildInputs = commonBuildInputs extraBuildInputs;
+        buildInputs = commonBuildInputs extraBuildInputs;
 
-    nativeBuildInputs = [ binary makeWrapper which pkgconfig llvm ];
+        nativeBuildInputs = [ binary makeWrapper which pkgconfig llvmPackages.llvm ];
 
-    makeFlags = [
-      "CRYSTAL_CONFIG_VERSION=${version}"
-    ];
+        makeFlags = [
+          "CRYSTAL_CONFIG_VERSION=${version}"
+        ];
 
-    buildFlags = [
-      "all" "docs"
-    ];
+        LLVM_CONFIG = "${llvmPackages.llvm}/bin/llvm-config";
 
-    LLVM_CONFIG = "${llvm}/bin/llvm-config";
+        FLAGS = [
+          "--release"
+          "--single-module" # needed for deterministic builds
+        ];
 
-    FLAGS = [
-      "--release"
-      "--single-module" # needed for deterministic builds
-    ];
+        # This makes sure we don't keep depending on the previous version of
+        # crystal used to build this one.
+        CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal";
 
-    # This makes sure we don't keep depending on the previous version of
-    # crystal used to build this one.
-    CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal";
+        # We *have* to add `which` to the PATH or crystal is unable to build
+        # stuff later if which is not available.
+        installPhase = ''
+          runHook preInstall
 
-    # We *have* to add `which` to the PATH or crystal is unable to build stuff
-    # later if which is not available.
-    installPhase = ''
-      runHook preInstall
+          install -Dm755 .build/crystal $bin/bin/crystal
+          wrapProgram $bin/bin/crystal \
+            --suffix PATH : ${lib.makeBinPath [ pkgconfig llvmPackages.clang which ]} \
+            --suffix CRYSTAL_PATH : lib:$lib/crystal \
+            --suffix CRYSTAL_LIBRARY_PATH : ${
+              lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
+            }
+          install -dm755 $lib/crystal
+          cp -r src/* $lib/crystal/
 
-      install -Dm755 .build/crystal $bin/bin/crystal
-      wrapProgram $bin/bin/crystal \
-          --suffix PATH : ${lib.makeBinPath [ pkgconfig clang which ]} \
-          --suffix CRYSTAL_PATH : lib:$lib/crystal \
-          --suffix CRYSTAL_LIBRARY_PATH : ${
-            lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
-          }
-      install -dm755 $lib/crystal
-      cp -r src/* $lib/crystal/
+          install -dm755 $out/share/doc/crystal/api
+          cp -r docs/* $out/share/doc/crystal/api/
+          cp -r samples $out/share/doc/crystal/
 
-      install -dm755 $out/share/doc/crystal/api
-      cp -r docs/* $out/share/doc/crystal/api/
-      cp -r samples $out/share/doc/crystal/
+          install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
+          install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
 
-      install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
-      install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
+          install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
 
-      install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
+          install -Dm644 -t $out/share/licenses/crystal LICENSE README.md
 
-      install -Dm644 -t $out/share/licenses/crystal LICENSE README.md
+          mkdir -p $out
+          ln -s $bin/bin $out/bin
+          ln -s $lib $out/lib
 
-      mkdir -p $out
-      ln -s $bin/bin $out/bin
-      ln -s $lib $out/lib
+          runHook postInstall
+        '';
 
-      runHook postInstall
-    '';
+        enableParallelBuilding = true;
 
-    enableParallelBuilding = true;
+        dontStrip = true;
 
-    dontStrip = true;
+        checkTarget = "compiler_spec";
 
-    checkTarget = "spec";
+        preCheck = ''
+          export HOME=/tmp
+          mkdir -p $HOME/test
 
-    preCheck = ''
-      export HOME=/tmp
-      mkdir -p $HOME/test
+          export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH
+          export PATH=${lib.makeBinPath checkInputs}:$PATH
+        '';
 
-      export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH
-      export PATH=${lib.makeBinPath checkInputs}:$PATH
-    '';
+        passthru.buildCrystalPackage = callPackage ./build-package.nix {
+          crystal = compiler;
+        };
 
-    passthru.buildCrystalPackage = callPackage ./build-package.nix {
-      crystal = compiler;
-    };
-
-    meta = with lib; {
-      description = "A compiled language with Ruby like syntax and type inference";
-      homepage = "https://crystal-lang.org/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ manveru david50407 peterhoeg ];
-      platforms = builtins.attrNames archs;
-    };
-  }));
+        meta = with lib; {
+          description = "A compiled language with Ruby like syntax and type inference";
+          homepage = "https://crystal-lang.org/";
+          license = licenses.asl20;
+          maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];
+          platforms = builtins.attrNames archs;
+        };
+      })
+  );
 
 in rec {
   binaryCrystal_0_31 = genericBinary {
@@ -202,24 +232,30 @@ in rec {
   crystal_0_32 = generic {
     version = "0.32.1";
     sha256  = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6";
-    binary = binaryCrystal_0_31;
+    binary = crystal_0_31;
   };
 
   crystal_0_33 = generic {
     version = "0.33.0";
     sha256  = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi";
-    binary = binaryCrystal_0_31;
-    doCheck = false; # 4 checks are failing now
+    binary = crystal_0_32;
   };
 
   crystal_0_34 = generic {
     version = "0.34.0";
     sha256  = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4";
     binary = crystal_0_33;
-    doCheck = false; # 4 checks are failing now
   };
 
-  crystal = crystal_0_34;
+  crystal_0_35 = generic {
+    version = "0.35.1";
+    sha256  = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69";
+    binary = crystal_0_34;
+    # Needs git to build as per https://github.com/crystal-lang/crystal/issues/9789
+    extraBuildInputs = [ git ];
+  };
+
+  crystal = crystal_0_35;
 
   crystal2nix = callPackage ./crystal2nix.nix {};
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95007595ddb2..e216a76cc6ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8799,12 +8799,13 @@ in
   copper = callPackage ../development/compilers/copper {};
 
   inherit (callPackages ../development/compilers/crystal {
-    inherit (llvmPackages_10) stdenv clang llvm;
+    llvmPackages = llvmPackages_10;
   })
     crystal_0_31
     crystal_0_32
     crystal_0_33
     crystal_0_34
+    crystal_0_35
     crystal
     crystal2nix;
 

From 085da94aceb11bb819c39775359ff4a1f9d1eb12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Mon, 16 Nov 2020 18:14:12 -0600
Subject: [PATCH 2675/3942] shards: refactor and 0.11.0 -> {0.11.1, 0.12.0}

---
 .../tools/build-managers/shards/default.nix   | 74 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  5 +-
 2 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index 53bc057fc131..dc990af910fe 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -1,30 +1,56 @@
-{ stdenv, fetchFromGitHub, crystal }:
+{ stdenv
+, fetchFromGitHub
+, crystal_0_34
+, crystal_0_35
+}:
 
-crystal.buildCrystalPackage rec {
-  pname = "shards";
-  version = "0.10.0";
+let
+  generic = (
+    { version
+    , sha256
+    , crystal
+    }:
 
-  src = fetchFromGitHub {
-    owner = "crystal-lang";
-    repo = "shards";
-    rev = "v${version}";
-    sha256 = "1bjy3hcdqq8769bx73f3pwn26rnkj23dngyfbw4iv32bw23x1d49";
+    crystal.buildCrystalPackage {
+      pname = "shards";
+      inherit version;
+
+      src = fetchFromGitHub {
+        owner = "crystal-lang";
+        repo  = "shards";
+        rev   = "v${version}";
+        inherit sha256;
+      };
+
+      # we cannot use `make` here as it would introduce a dependency on itself
+      format = "crystal";
+      shardsFile = ./shards.nix;
+      crystalBinaries.shards.src = "./src/shards.cr";
+
+      # tries to execute git which fails spectacularly
+      doCheck = false;
+
+      meta = with stdenv.lib; {
+        description = "Dependency manager for the Crystal language";
+        license = licenses.asl20;
+        maintainers = with maintainers; [ peterhoeg ];
+        inherit (crystal.meta) homepage platforms;
+      };
+    }
+  );
+
+in rec {
+  shards_0_11 = generic {
+    version = "0.11.1";
+    sha256 = "05qnhc23xbmicdl4fwyxfpcvd8jq4inzh6v7jsjjw4n76vzb1f71";
+    crystal = crystal_0_34;
   };
 
-  # we cannot use `make` here as it would introduce a dependency on itself
-  format = "crystal";
-
-  shardsFile = ./shards.nix;
-
-  crystalBinaries.shards.src = "./src/shards.cr";
-
-  # tries to execute git which fails spectacularly
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "Dependency manager for the Crystal language";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ peterhoeg ];
-    inherit (crystal.meta) homepage platforms;
+  shards_0_12 = generic {
+    version = "0.12.0";
+    sha256 = "0dginczw1gc5qlb9k4b6ldxzqz8n97jrrnjvj3mm9wcdbc9j6h3c";
+    crystal = crystal_0_35;
   };
+
+  shards = shards_0_12;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e216a76cc6ce..5c8a88d4ba9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11825,7 +11825,10 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
   shallot = callPackage ../tools/misc/shallot { };
 
-  shards = callPackage ../development/tools/build-managers/shards { };
+  inherit (callPackage ../development/tools/build-managers/shards { })
+    shards_0_11
+    shards_0_12
+    shards;
 
   shellcheck = callPackage ../development/tools/shellcheck {};
 

From 2f4fa8d755265abd872573a726f70734141aa97f Mon Sep 17 00:00:00 2001
From: meutraa <paul@lost.host>
Date: Tue, 17 Nov 2020 14:37:23 +0000
Subject: [PATCH 2676/3942] mm: 2016.11.04 -> 2020.11.17

---
 .../instant-messengers/mm/default.nix         | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix
index 3bdfcbfe7d1d..681757743a08 100644
--- a/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mm/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, buildGoPackage, fetchFromGitLab }:
+{ stdenv, buildGoModule, fetchgit }:
 
-buildGoPackage {
+buildGoModule {
   pname = "mm";
-  version = "2016.11.04";
+  version = "2020.11.17";
 
-  goPackagePath = "gitlab.com/meutraa/mm";
-
-  src = fetchFromGitLab {
-    owner = "meutraa";
-    repo = "mm";
-    rev = "473fdd97285168054b672dbad2ffc4047324c518";
-    sha256 = "1s8v5gxpw1sms1g3i8nq2x2mmmyz97qkmxs1fzlspfcd6i8vknkp";
+  src = fetchgit {
+    url = "https://git.lost.host/meutraa/mm.git";
+    rev = "e5fa8eeb845aac8f28fc36013ee8a1dbe1e5710c";
+    sha256 = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk=";
   };
 
+  vendorSha256 = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM=";
+
   meta = {
     description = "A file system based matrix client";
-    homepage = "https://gitlab.com/meutraa/mm";
+    homepage = "https://git.lost.host/meutraa/mm";
     license = stdenv.lib.licenses.isc;
   };
 }

From 15eb465cd949d50ea6fa69cc5114c340af1f27c9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 17 Nov 2020 14:40:20 +0000
Subject: [PATCH 2677/3942] =?UTF-8?q?coursier:=202.0.6=20=E2=86=92=202.0.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/tools/coursier/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 662cea9558c7..0d42bcff7cf6 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -2,7 +2,7 @@
 , coreutils, git, gnused, nix, nixfmt }:
 
 let
-  version = "2.0.6";
+  version = "2.0.7";
 
   zshCompletion = fetchurl {
     url =
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url =
       "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
-    sha256 = "MnKCEFY62LH18rqDa9zvn+f0Zd0hnsPcB7coQuI64H0=";
+    sha256 = "1m6b12cqbwsk4xf2r79y51154j6ws6f0kiw1yj57gylw7pjkgfnk";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From f3dc13bd09bde8307210cab5e0b9c8c755f5953a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 17 Nov 2020 14:40:28 +0000
Subject: [PATCH 2678/3942] =?UTF-8?q?sbt-extras:=202020-11-08=20=E2=86=92?=
 =?UTF-8?q?=202020-11-17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/tools/build-managers/sbt-extras/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index 291c3539f35e..b7c632fb1edd 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "sbt-extras";
-  rev = "a36958f50bf8806c13f7c67ab0f13936e189351b";
-  version = "2020-11-08";
+  rev = "b3ecc86936d005dc3327ebd6b61a33d625d60ee6";
+  version = "2020-11-17";
 
   src = fetchFromGitHub {
     owner = "paulp";
     repo = "sbt-extras";
     inherit rev;
-    sha256 = "1xp5r7ia8r2nr4g76wp0mnh95d5ha0dblsqvgicq240dgc28360r";
+    sha256 = "0cnwvjqs81ca0ssj02x41fq6fn1drqwzpbc7v006vgbard8ww9xb";
   };
 
   dontBuild = true;

From 9af958340a9ede33e3501ebaa8bdab77f904a85f Mon Sep 17 00:00:00 2001
From: Nicolas Martin <penguwin@penguwin.eu>
Date: Wed, 11 Nov 2020 19:43:00 +0100
Subject: [PATCH 2679/3942] nextinspace: init at 1.0.6

---
 .../science/misc/nextinspace/default.nix      | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/science/misc/nextinspace/default.nix

diff --git a/pkgs/applications/science/misc/nextinspace/default.nix b/pkgs/applications/science/misc/nextinspace/default.nix
new file mode 100644
index 000000000000..390b2c58ca68
--- /dev/null
+++ b/pkgs/applications/science/misc/nextinspace/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+  pname = "nextinspace";
+  version = "1.0.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1h3dksxyy5gq071fa7i2p73s50918y1bkk38hgfwr4226c3wipvg";
+  };
+
+  pythonPath = with python3Packages; [
+    requests
+    tzlocal
+    colorama
+  ];
+
+  meta = with lib; {
+    description = "Print upcoming space-related events in your terminal";
+    homepage = "https://github.com/The-Kid-Gid/nextinspace";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ penguwin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1a58cd05b8f..ad5a051fbeab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26973,6 +26973,8 @@ in
 
   netlogo = callPackage ../applications/science/misc/netlogo { };
 
+  nextinspace = python3Packages.callPackage ../applications/science/misc/nextinspace { };
+
   ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
 
   root = callPackage ../applications/science/misc/root {

From d39e238ff437102bae0ab2e89116a34d20ae5a31 Mon Sep 17 00:00:00 2001
From: meutraa <paul@lost.host>
Date: Tue, 17 Nov 2020 14:59:24 +0000
Subject: [PATCH 2680/3942] mm: add self as maintainer

---
 .../networking/instant-messengers/mm/default.nix             | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix
index 681757743a08..a9306a751ac8 100644
--- a/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mm/default.nix
@@ -12,9 +12,10 @@ buildGoModule {
 
   vendorSha256 = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM=";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A file system based matrix client";
     homepage = "https://git.lost.host/meutraa/mm";
-    license = stdenv.lib.licenses.isc;
+    license = licenses.isc;
+    maintainers = with maintainers; [ meutraa ];
   };
 }

From 0c74da134283f8cb7bbbee73d22c53843b2cc03e Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 11 Nov 2020 21:07:09 -0500
Subject: [PATCH 2681/3942] qt5{14,15}.qtbase: fix on darwin

---
 .../libraries/qt-5/5.14/default.nix           |   5 +-
 .../0001-qtbase-mkspecs-mac.patch             |   4 +-
 .../5.14/qtbase.patch.d/0002-qtbase-mac.patch | 116 -----------------
 .../0013-define-kiosurfacesuccess.patch       |  16 +++
 .../qtbase.patch.d/qtbase-sdk-10.12-mac.patch |  77 ++++++++++++
 .../libraries/qt-5/5.15/default.nix           |   5 +-
 .../0001-qtbase-mkspecs-mac.patch             |   4 +-
 .../5.15/qtbase.patch.d/0002-qtbase-mac.patch | 118 ------------------
 .../0013-define-kiosurfacesuccess.patch       |  16 +++
 .../qtbase.patch.d/qtbase-sdk-10.12-mac.patch |  77 ++++++++++++
 10 files changed, 196 insertions(+), 242 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch

diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix
index ecb95aaa2ab2..b4486bf025d7 100644
--- a/pkgs/development/libraries/qt-5/5.14/default.nix
+++ b/pkgs/development/libraries/qt-5/5.14/default.nix
@@ -54,7 +54,10 @@ let
     qtbase =
       optionals stdenv.isDarwin [
         ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
-        ./qtbase.patch.d/0002-qtbase-mac.patch
+
+        # Downgrade minimal required SDK to 10.12
+        ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
+        ./qtbase.patch.d/qtbase-sdk-10.12-mac.patch
 
         # Patch framework detection to support X.framework/X.tbd,
         # extending the current support for X.framework/X.
diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
index 0951b6646ab7..0f38ce0d7f61 100644
--- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
+++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
@@ -309,10 +309,8 @@ index e3534561a5..3b01424e67 100644
 -xcode_copy_phase_strip_setting.value = NO
 -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
 diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
-deleted file mode 100644
-index c40f58c987..0000000000
 --- a/mkspecs/features/mac/sdk.mk
-+++ /dev/null
++++ b/mkspecs/features/mac/sdk.mk
 @@ -1,25 +0,0 @@
 -
 -ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch
deleted file mode 100644
index 2e28466c5032..000000000000
--- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From ccaa916eab33093704293bc911eedd85fbe5f160 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
-Date: Fri, 3 Apr 2020 21:15:27 +0200
-Subject: [PATCH 02/10] qtbase-mac
-
----
- src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++--
- src/testlib/qappletestlogger.cpp |  2 +-
- src/testlib/qappletestlogger_p.h |  2 +-
- src/testlib/qtestcase.cpp        |  2 +-
- src/testlib/qtestlog.cpp         |  2 +-
- src/testlib/qtestlog_p.h         |  2 +-
- 6 files changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
-index 535d3579b2..3d70bf39c1 100644
---- a/src/corelib/kernel/qcore_mac_p.h
-+++ b/src/corelib/kernel/qcore_mac_p.h
-@@ -225,7 +225,7 @@ private:
- 
- // --------------------------------------------------------------------------
- 
--#if !defined(QT_BOOTSTRAPPED)
-+#if 0
- 
- QT_END_NAMESPACE
- #include <os/activity.h>
-@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current);
- 
- #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
- 
--#endif // !defined(QT_BOOTSTRAPPED)
-+#else // !defined(QT_BOOTSTRAPPED)
-+
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...)
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...)
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...)
-+
-+#define QT_APPLE_LOG_ACTIVITY2(...)
-+#define QT_APPLE_LOG_ACTIVITY1(...)
-+#define QT_APPLE_LOG_ACTIVITY(...)
-+
-+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...)
-+
-+#endif
- 
- // -------------------------------------------------------------------------
- 
-diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp
-index dfeadebdef..2a74330c1d 100644
---- a/src/testlib/qappletestlogger.cpp
-+++ b/src/testlib/qappletestlogger.cpp
-@@ -43,7 +43,7 @@
- 
- QT_BEGIN_NAMESPACE
- 
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
- 
- using namespace QTestPrivate;
- 
-diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h
-index 62c6d95c5a..f8e0a3b767 100644
---- a/src/testlib/qappletestlogger_p.h
-+++ b/src/testlib/qappletestlogger_p.h
-@@ -57,7 +57,7 @@
- 
- QT_BEGIN_NAMESPACE
- 
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
- class QAppleTestLogger : public QAbstractTestLogger
- {
- public:
-diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
-index 70733a692a..8bcda17858 100644
---- a/src/testlib/qtestcase.cpp
-+++ b/src/testlib/qtestcase.cpp
-@@ -852,7 +852,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool
- 
-     bool addFallbackLogger = !explicitLoggerRequested;
- 
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
-     // Any explicitly requested loggers will be added by now, so we can check if they use stdout
-     const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout();
-     if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) {
-diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
-index f3ebf343c5..9b4f526b2e 100644
---- a/src/testlib/qtestlog.cpp
-+++ b/src/testlib/qtestlog.cpp
-@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename)
-     case QTestLog::TAP:
-         logger = new QTapTestLogger(filename);
-         break;
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
-     case QTestLog::Apple:
-         logger = new QAppleTestLogger;
-         break;
-diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
-index fff36f290d..f737ccf064 100644
---- a/src/testlib/qtestlog_p.h
-+++ b/src/testlib/qtestlog_p.h
-@@ -72,7 +72,7 @@ public:
- 
-     enum LogMode {
-         Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
-         , Apple
- #endif
- #if defined(HAVE_XCTEST)
--- 
-2.25.1
-
diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
new file mode 100644
index 000000000000..a43a46d8a69b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
@@ -0,0 +1,16 @@
+diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
+index a367487e..c3aeca1d 100644
+--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
+@@ -49,6 +49,11 @@
+ // but was only added in the 10.14 SDK, so declare it just in case.
+ extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space);
+ 
++// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html
++#if !defined(kIOSurfaceSuccess)
++#define kIOSurfaceSuccess KERN_SUCCESS
++#endif
++
+ QT_BEGIN_NAMESPACE
+ 
+ Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface");
diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patch
new file mode 100644
index 000000000000..b2dff5aba8f6
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patch
@@ -0,0 +1,77 @@
+diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf
+--- a/mkspecs/common/macx.conf
++++ b/mkspecs/common/macx.conf
+@@ -10,7 +10,7 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64
+ 
+ # Should be 10.15, but as long as the CI builds with
+ # older SDKs we have to keep this.
+-QT_MAC_SDK_VERSION_MIN = 10.14
++QT_MAC_SDK_VERSION_MIN = 10.12
+ 
+ QT_MAC_SDK_VERSION_MAX = 10.15
+ 
+diff --git a/src/corelib/kernel/qcore_mac_objc.mm b/src/corelib/kernel/qcore_mac_objc.mm
+--- a/src/corelib/kernel/qcore_mac_objc.mm
++++ b/src/corelib/kernel/qcore_mac_objc.mm
+@@ -142,16 +142,10 @@ QMacAutoReleasePool::QMacAutoReleasePool()
+ 
+ #ifdef QT_DEBUG
+     void *poolFrame = nullptr;
+-    if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) {
+-        void *frame;
+-        if (backtrace_from_fp(__builtin_frame_address(0), &frame, 1))
+-            poolFrame = frame;
+-    } else {
+         static const int maxFrames = 3;
+         void *callstack[maxFrames];
+         if (backtrace(callstack, maxFrames) == maxFrames)
+             poolFrame = callstack[maxFrames - 1];
+-    }
+ 
+     if (poolFrame) {
+         Dl_info info;
+diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
+--- a/src/gui/rhi/qrhi.cpp
++++ b/src/gui/rhi/qrhi.cpp
+@@ -4050,7 +4050,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh
+ #endif
+     case Metal:
+ //#ifdef Q_OS_DARWIN
+-#ifdef Q_OS_MACOS
++#if 0
+         r->d = new QRhiMetal(static_cast<QRhiMetalInitParams *>(params),
+                              static_cast<QRhiMetalNativeHandles *>(importDevice));
+         break;
+diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri
+--- a/src/gui/rhi/rhi.pri
++++ b/src/gui/rhi/rhi.pri
+@@ -44,7 +44,7 @@ win32 {
+ }
+ 
+ # darwin {
+-macos {
++false {
+     HEADERS += \
+         rhi/qrhimetal_p.h \
+         rhi/qrhimetal_p_p.h
+diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
+--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
+@@ -134,7 +134,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
+     NSImage *nsimage = qt_mac_create_nsimage(pm);
+     [nsimage setSize:NSSizeFromCGSize(pmDeviceIndependentSize.toCGSize())];
+ 
+-    QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
++    QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND);
+     m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
+     dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
+ 
+@@ -145,7 +145,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
+     CGFloat flippedY = pmDeviceIndependentSize.height() - hotSpot.y();
+     event_location.y -= flippedY;
+     NSSize mouseOffset_unused = NSMakeSize(0.0, 0.0);
+-    NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
++    NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard];
+ 
+     [theWindow dragImage:nsimage
+         at:event_location
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 1f24cd2f2e11..b4e3d681c749 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -54,7 +54,10 @@ let
     qtbase =
       optionals stdenv.isDarwin [
         ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
-        ./qtbase.patch.d/0002-qtbase-mac.patch
+
+        # Downgrade minimal required SDK to 10.12
+        ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
+        ./qtbase.patch.d/qtbase-sdk-10.12-mac.patch
 
         # Patch framework detection to support X.framework/X.tbd,
         # extending the current support for X.framework/X.
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
index ba4c54b228c8..3a2900abdd6b 100644
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
+++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
@@ -309,10 +309,8 @@ index e3534561a5..3b01424e67 100644
 -xcode_copy_phase_strip_setting.value = NO
 -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
 diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
-deleted file mode 100644
-index c40f58c987..0000000000
 --- a/mkspecs/features/mac/sdk.mk
-+++ /dev/null
++++ b/mkspecs/features/mac/sdk.mk
 @@ -1,25 +0,0 @@
 -
 -ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch
deleted file mode 100644
index 4271b64679d7..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From a9ba67d3db7390d9ddc46751346e70b0a522711a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
-Date: Fri, 3 Apr 2020 21:15:27 +0200
-Subject: [PATCH 02/11] qtbase-mac
-
----
- src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++--
- src/testlib/qappletestlogger.cpp |  2 +-
- src/testlib/qappletestlogger_p.h |  2 +-
- src/testlib/qtestcase.cpp        |  2 +-
- src/testlib/qtestlog.cpp         |  2 +-
- src/testlib/qtestlog_p.h         |  4 ++--
- 6 files changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
-index 535d3579b2..3d70bf39c1 100644
---- a/src/corelib/kernel/qcore_mac_p.h
-+++ b/src/corelib/kernel/qcore_mac_p.h
-@@ -225,7 +225,7 @@ private:
- 
- // --------------------------------------------------------------------------
- 
--#if !defined(QT_BOOTSTRAPPED)
-+#if 0
- 
- QT_END_NAMESPACE
- #include <os/activity.h>
-@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current);
- 
- #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
- 
--#endif // !defined(QT_BOOTSTRAPPED)
-+#else // !defined(QT_BOOTSTRAPPED)
-+
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...)
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...)
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...)
-+
-+#define QT_APPLE_LOG_ACTIVITY2(...)
-+#define QT_APPLE_LOG_ACTIVITY1(...)
-+#define QT_APPLE_LOG_ACTIVITY(...)
-+
-+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...)
-+
-+#endif
- 
- // -------------------------------------------------------------------------
- 
-diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp
-index dfeadebdef..2a74330c1d 100644
---- a/src/testlib/qappletestlogger.cpp
-+++ b/src/testlib/qappletestlogger.cpp
-@@ -43,7 +43,7 @@
- 
- QT_BEGIN_NAMESPACE
- 
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
- 
- using namespace QTestPrivate;
- 
-diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h
-index 62c6d95c5a..f8e0a3b767 100644
---- a/src/testlib/qappletestlogger_p.h
-+++ b/src/testlib/qappletestlogger_p.h
-@@ -57,7 +57,7 @@
- 
- QT_BEGIN_NAMESPACE
- 
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
- class QAppleTestLogger : public QAbstractTestLogger
- {
- public:
-diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
-index f45999c7fa..d5b525dc12 100644
---- a/src/testlib/qtestcase.cpp
-+++ b/src/testlib/qtestcase.cpp
-@@ -849,7 +849,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool
- 
-     bool addFallbackLogger = !explicitLoggerRequested;
- 
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
-     // Any explicitly requested loggers will be added by now, so we can check if they use stdout
-     const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout();
-     if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) {
-diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
-index a388780532..63ab965101 100644
---- a/src/testlib/qtestlog.cpp
-+++ b/src/testlib/qtestlog.cpp
-@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename)
-     case QTestLog::TAP:
-         logger = new QTapTestLogger(filename);
-         break;
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
-     case QTestLog::Apple:
-         logger = new QAppleTestLogger;
-         break;
-diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
-index ddaf14ed9b..0c49c93a88 100644
---- a/src/testlib/qtestlog_p.h
-+++ b/src/testlib/qtestlog_p.h
-@@ -74,8 +74,8 @@ public:
-     Q_DISABLE_COPY_MOVE(QTestLog)
- 
-     enum LogMode {
--        Plain = 0, XML, LightXML, JUnitXML, CSV, TeamCity, TAP
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+        Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
-         , Apple
- #endif
- #if defined(HAVE_XCTEST)
--- 
-2.25.4
-
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
new file mode 100644
index 000000000000..a43a46d8a69b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
@@ -0,0 +1,16 @@
+diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
+index a367487e..c3aeca1d 100644
+--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
+@@ -49,6 +49,11 @@
+ // but was only added in the 10.14 SDK, so declare it just in case.
+ extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space);
+ 
++// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html
++#if !defined(kIOSurfaceSuccess)
++#define kIOSurfaceSuccess KERN_SUCCESS
++#endif
++
+ QT_BEGIN_NAMESPACE
+ 
+ Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface");
diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch
new file mode 100644
index 000000000000..3638268de7af
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch
@@ -0,0 +1,77 @@
+diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf
+--- a/mkspecs/common/macx.conf
++++ b/mkspecs/common/macx.conf
+@@ -10,7 +10,7 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64
+ 
+ # Should be 10.15, but as long as the CI builds with
+ # older SDKs we have to keep this.
+-QT_MAC_SDK_VERSION_MIN = 10.14
++QT_MAC_SDK_VERSION_MIN = 10.12
+ 
+ QT_MAC_SDK_VERSION_MAX = 10.15
+ 
+diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm
+--- a/src/corelib/kernel/qcore_mac.mm
++++ b/src/corelib/kernel/qcore_mac.mm
+@@ -261,16 +261,10 @@ QMacAutoReleasePool::QMacAutoReleasePool()
+ 
+ #ifdef QT_DEBUG
+     void *poolFrame = nullptr;
+-    if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) {
+-        void *frame;
+-        if (backtrace_from_fp(__builtin_frame_address(0), &frame, 1))
+-            poolFrame = frame;
+-    } else {
+         static const int maxFrames = 3;
+         void *callstack[maxFrames];
+         if (backtrace(callstack, maxFrames) == maxFrames)
+             poolFrame = callstack[maxFrames - 1];
+-    }
+ 
+     if (poolFrame) {
+         Dl_info info;
+diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
+--- a/src/gui/rhi/qrhi.cpp
++++ b/src/gui/rhi/qrhi.cpp
+@@ -4251,7 +4251,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh
+         break;
+ #endif
+     case Metal:
+-#if defined(Q_OS_MACOS) || defined(Q_OS_IOS)
++#if 0
+         r->d = new QRhiMetal(static_cast<QRhiMetalInitParams *>(params),
+                              static_cast<QRhiMetalNativeHandles *>(importDevice));
+         break;
+diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri
+--- a/src/gui/rhi/rhi.pri
++++ b/src/gui/rhi/rhi.pri
+@@ -43,7 +43,7 @@ win32 {
+     LIBS += -ld3d11 -ldxgi -ldxguid
+ }
+ 
+-macos|ios {
++false {
+     HEADERS += \
+         rhi/qrhimetal_p.h \
+         rhi/qrhimetal_p_p.h
+diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
+--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
+@@ -133,7 +133,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
+     NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()];
+     Q_ASSERT(dragImage);
+ 
+-    QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
++    QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND);
+     m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
+     dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
+ 
+@@ -144,7 +144,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
+     CGFloat flippedY = dragImage.size.height - hotSpot.y();
+     event_location.y -= flippedY;
+     NSSize mouseOffset_unused = NSMakeSize(0.0, 0.0);
+-    NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
++    NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard];
+ 
+     [theWindow dragImage:dragImage
+         at:event_location

From 62a34589b8cf2da71f3e7fdb5b5003b83710d00e Mon Sep 17 00:00:00 2001
From: Michael Raitza <michael.raitza@tu-dresden.de>
Date: Fri, 2 Oct 2020 11:58:46 +0200
Subject: [PATCH 2682/3942] openafs_1_8: Cleanup build and fix build issues

Parallel building is broken, leading to failing builds in very rare
cases. (volint.h not yet built while alredy needed when compiling volser.)
---
 pkgs/servers/openafs/1.8/default.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index 07f5560ff20a..4189ff9d0140 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -1,13 +1,15 @@
 { stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
-, yacc , glibc, perl, kerberos, libxslt, docbook_xsl
 , docbook_xml_dtd_43 , libtool_2, removeReferencesTo
-, ncurses # Extra ncurses utilities. Only needed for debugging.
+, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file
+, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
 , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
 }:
 
 with (import ./srcs.nix { inherit fetchurl; });
+let
+  inherit (stdenv.lib) optional optionalString optionals;
 
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
   pname = "openafs";
   inherit version srcs;
 
@@ -17,11 +19,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ kerberos ncurses ];
 
-  patches = [ ./bosserver.patch ./cross-build.patch ] ++ stdenv.lib.optional (tsmbac != null) ./tsmbac.patch;
+  patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
 
   outputs = [ "out" "dev" "man" "doc" "server" ];
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;
 
   setOutputFlags = false;
 
@@ -44,19 +46,20 @@ stdenv.mkDerivation {
 
     ./regen.sh
 
+
     configureFlagsArray=(
       "--with-gssapi"
       "--sysconfdir=/etc"
       "--localstatedir=/var"
       "--disable-kernel-module"
       "--disable-fuse-client"
-      "--with-html-xsl=${docbook_xsl}/share/xml/docbook-xsl/html/chunk.xsl"
-      ${stdenv.lib.optionalString (tsmbac != null) "--enable-tivoli-tsm"}
-      ${stdenv.lib.optionalString (ncurses == null) "--disable-gtx"}
+      "--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl"
+      ${optionalString (tsmbac != null) "--enable-tivoli-tsm"}
+      ${optionalString (ncurses == null) "--disable-gtx"}
       "--disable-linux-d_splice-alias-extra-iput"
       "--libexecdir=$server/libexec"
     )
-  '' + stdenv.lib.optionalString (tsmbac != null) ''
+  '' + optionalString (tsmbac != null) ''
     export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
     export XBSA_XLIBS="-ldl"
   '';

From f08099d0a724bee7123eebea81914c32610f967f Mon Sep 17 00:00:00 2001
From: Michael Raitza <michael.raitza@tu-dresden.de>
Date: Fri, 2 Oct 2020 12:07:28 +0200
Subject: [PATCH 2683/3942] openafs_1_8: Merge server output with out

User and server binaries cannot be shipped separately. The bos tool uses a
hard-coded path to the volume salvage command (which resides with the server
binaries). Splitting them into separate outputs invalidates the reference in the
bos tool (due to remove-references-to). This rendered the volume salvager
inoperable (which is obviously a bad thing).
---
 pkgs/servers/openafs/1.8/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index 4189ff9d0140..2247afbc0d95 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
-, docbook_xml_dtd_43 , libtool_2, removeReferencesTo
 , yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file
+, docbook_xml_dtd_43, libtool_2
 , ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
 , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
 }:
@@ -15,13 +15,13 @@ in stdenv.mkDerivation {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
-    removeReferencesTo which yacc ];
+    which yacc ];
 
   buildInputs = [ kerberos ncurses ];
 
   patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
 
-  outputs = [ "out" "dev" "man" "doc" "server" ];
+  outputs = [ "out" "dev" "man" "doc" ];
 
   enableParallelBuilding = false;
 
@@ -57,7 +57,6 @@ in stdenv.mkDerivation {
       ${optionalString (tsmbac != null) "--enable-tivoli-tsm"}
       ${optionalString (ncurses == null) "--disable-gtx"}
       "--disable-linux-d_splice-alias-extra-iput"
-      "--libexecdir=$server/libexec"
     )
   '' + optionalString (tsmbac != null) ''
     export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
@@ -86,8 +85,6 @@ in stdenv.mkDerivation {
   # binaries.
   preFixup = ''
     rm -rf "$(pwd)" && mkdir "$(pwd)"
-
-    find $out -type f -exec remove-references-to -t $server '{}' '+'
   '';
 
   meta = with stdenv.lib; {

From 54a69eb80480016341d4825f272b9017a3bd0ac1 Mon Sep 17 00:00:00 2001
From: Michael Raitza <michael.raitza@tu-dresden.de>
Date: Fri, 2 Oct 2020 12:12:26 +0200
Subject: [PATCH 2684/3942] openafs_1_8: Properly generate and split off
 developer documentation

---
 pkgs/servers/openafs/1.8/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index 2247afbc0d95..c26f8d3a23c5 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -1,6 +1,7 @@
 { stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
 , yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file
 , docbook_xml_dtd_43, libtool_2
+, withDevdoc ? false, doxygen, dblatex # Extra developer documentation
 , ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
 , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
 }:
@@ -15,13 +16,13 @@ in stdenv.mkDerivation {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
-    which yacc ];
+    which yacc ] ++ optionals withDevdoc [ doxygen dblatex ];
 
   buildInputs = [ kerberos ncurses ];
 
   patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
 
-  outputs = [ "out" "dev" "man" "doc" ];
+  outputs = [ "out" "dev" "man" "doc" ] ++ optional withDevdoc "devdoc";
 
   enableParallelBuilding = false;
 
@@ -69,16 +70,22 @@ in stdenv.mkDerivation {
     for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
       make -C "''${d}" index.html
     done
+  '' + optionalString withDevdoc ''
+    make dox
   '';
 
   postInstall = ''
     mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide}
-    cp -r doc/{pdf,protocol,txt} README LICENSE $doc/share/doc/openafs
+    cp -r doc/txt README LICENSE $doc/share/doc/openafs
     for d in AdminGuide QuickStartUnix UserGuide ; do
       cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}"
     done
 
     rm -r $out/lib/openafs
+  '' + optionalString withDevdoc ''
+    mkdir -p $devdoc/share/devhelp/openafs/doxygen
+    cp -r doc/{pdf,protocol} $devdoc/share/devhelp/openafs
+    cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen
   '';
 
   # Avoid references to $TMPDIR by removing it and let patchelf cleanup the

From 366159c6f5142b059384bb417cea61c6932cbd9e Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Tue, 17 Nov 2020 11:52:50 +0100
Subject: [PATCH 2685/3942] nodePackages.vscode-json-languageserver: init at
 1.3.1

---
 .../node-packages/node-packages.json          |   1 +
 .../node-packages/node-packages.nix           | 502 ++++++++++--------
 2 files changed, 295 insertions(+), 208 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 4ee0b400e4dc..983a21658730 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -219,6 +219,7 @@
 , "vim-language-server"
 , "vscode-css-languageserver-bin"
 , "vscode-html-languageserver-bin"
+, "vscode-json-languageserver"
 , "vscode-json-languageserver-bin"
 , { "vscode-lldb-build-deps": "../../misc/vscode-extensions/vscode-lldb/build-deps" }
 , "vue-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 513febb5d795..8ee583536742 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -2047,22 +2047,22 @@ let
         sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ==";
       };
     };
-    "@fluentui/react-7.150.0" = {
+    "@fluentui/react-7.150.1" = {
       name = "_at_fluentui_slash_react";
       packageName = "@fluentui/react";
-      version = "7.150.0";
+      version = "7.150.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.150.0.tgz";
-        sha512 = "G/JohcQ6ZxxtoWTr5YwTQbV3pfKf7KkEVKF2ScJJ/rspNJRHFx7w4pzmb1jvNm78rAKiHA6sVlXeJmlTiivn1g==";
+        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.150.1.tgz";
+        sha512 = "DgK9eR7eo/dYUtutkmPBqq7EiBls2L/4yNQO5Sv9JgE7GQPPbMMGvsK4ZAHa42E3K01CC5XO5SnP0BWD62B/RA==";
       };
     };
-    "@fluentui/react-focus-7.16.17" = {
+    "@fluentui/react-focus-7.16.18" = {
       name = "_at_fluentui_slash_react-focus";
       packageName = "@fluentui/react-focus";
-      version = "7.16.17";
+      version = "7.16.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.17.tgz";
-        sha512 = "Uioe+9tZoiXxp5aKam6Y+PyU46UDGMCF4xYctgP3tIpPyi7xfka7Aat6IyIFcTxN53UKea2IcCMzbOhpK0VTLg==";
+        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.18.tgz";
+        sha512 = "3GXZXhEIyX0OF1rBZmpRbx/llcOuKQa6cq5JTEcg7aLy7DWzmyRPm1eJLD/5anPPF8R68W0gT0pd57nhFreatg==";
       };
     };
     "@fluentui/react-window-provider-1.0.1" = {
@@ -2074,13 +2074,13 @@ let
         sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w==";
       };
     };
-    "@fluentui/theme-1.6.0" = {
+    "@fluentui/theme-1.7.0" = {
       name = "_at_fluentui_slash_theme";
       packageName = "@fluentui/theme";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.6.0.tgz";
-        sha512 = "X+uJx7+9ChfM0SAq+eDLgL9t65ZA8NAc1Ifrw4eek6cS3c1eY95/tgf1EkX+hOE9+oIuEATujM9THzk+4yd1VQ==";
+        url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.0.tgz";
+        sha512 = "pzqDZC2bVD6/S45Bnve4wmrXi4cN7XiCr+OhzvgmoQfDkm5vyXsa82/cVtif/zy1OFU96S9zOTtt3e+QQuGUUg==";
       };
     };
     "@graphql-cli/common-4.1.0" = {
@@ -3361,13 +3361,13 @@ let
         sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q==";
       };
     };
-    "@microsoft/load-themed-styles-1.10.133" = {
+    "@microsoft/load-themed-styles-1.10.134" = {
       name = "_at_microsoft_slash_load-themed-styles";
       packageName = "@microsoft/load-themed-styles";
-      version = "1.10.133";
+      version = "1.10.134";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.133.tgz";
-        sha512 = "jiGxZDBXmjD0uQPtZ+C/UPEdGwp5C50x1fYLy84dpkooZ8nT0jeWlXS3JJjWpHAL9URY37OIrBWzHu/FcBWFGQ==";
+        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.134.tgz";
+        sha512 = "TAXG7OEkzzhKcVzoE4p0WrY/2RzdaewzrggogGU38dScLy9eUiJXXs4osIsesMXvzG5BP/v5MS6kAbtb+HM0cQ==";
       };
     };
     "@mozilla/readability-0.3.0" = {
@@ -4711,13 +4711,13 @@ let
         sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
       };
     };
-    "@serverless/components-3.3.0" = {
+    "@serverless/components-3.3.1" = {
       name = "_at_serverless_slash_components";
       packageName = "@serverless/components";
-      version = "3.3.0";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/components/-/components-3.3.0.tgz";
-        sha512 = "QEjWK9jsIXMh9j/my8HJDtS04bL0TtiLPIr50jfPMUkqnl51thZGHswNwkkuCsmnvcQhZGspD68hIqWPlQRjMw==";
+        url = "https://registry.npmjs.org/@serverless/components/-/components-3.3.1.tgz";
+        sha512 = "4oGHMepZ18WmnNPj+PQ0GHevGZ1jU+RtMiu1bGhqS9BLdc28UDUKiCBxOjCCm/8Sdsw6NXYIhu5DDIYCpFExJQ==";
       };
     };
     "@serverless/core-1.1.2" = {
@@ -4954,13 +4954,13 @@ let
         sha512 = "/TOzXGh+JFgAu8pWdo1oLFKDNfFk99TnSQG2lbEu+vKLI2ZrGAk9oGO0geNogAN7Ib4EDQOEhgb7YwqwL7aA7w==";
       };
     };
-    "@snyk/docker-registry-v2-client-1.13.8" = {
+    "@snyk/docker-registry-v2-client-1.13.9" = {
       name = "_at_snyk_slash_docker-registry-v2-client";
       packageName = "@snyk/docker-registry-v2-client";
-      version = "1.13.8";
+      version = "1.13.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.8.tgz";
-        sha512 = "3PYCDWQ79HDsdUs964H3mSmdbMEdC8pGNeuMirM7rxKOkNzF6CYijfNyYLPbjS9YvmF5e7jdvUNnaP8miV7n9w==";
+        url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.9.tgz";
+        sha512 = "DIFLEhr8m1GrAwsLGInJmpcQMacjuhf3jcbpQTR+LeMvZA9IuKq+B7kqw2O2FzMiHMZmUb5z+tV+BR7+IUHkFQ==";
       };
     };
     "@snyk/gemfile-1.2.0" = {
@@ -4999,13 +4999,13 @@ let
         sha512 = "A+1xHD+SpmXQa0p+dWmiApFZtz/y37qAW9aWmFx2B1j7fwRBf9Qr89/6RbJOznf1a4nEitjzE3fa98yNZk/MNg==";
       };
     };
-    "@snyk/snyk-docker-pull-3.2.2" = {
+    "@snyk/snyk-docker-pull-3.2.3" = {
       name = "_at_snyk_slash_snyk-docker-pull";
       packageName = "@snyk/snyk-docker-pull";
-      version = "3.2.2";
+      version = "3.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.2.tgz";
-        sha512 = "EL7LegIJJDpXCOENEUu8ljI5sy9anE/RuXM/JdK+i8sEiUdybiSOCJOw43EOdMqYP+tK7l2JIaxYBzcDIxi3+g==";
+        url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.3.tgz";
+        sha512 = "hiFiSmWGLc2tOI7FfgIhVdFzO2f69im8O6p3OV4xEZ/Ss1l58vwtqudItoswsk7wj/azRlgfBW8wGu2MjoudQg==";
       };
     };
     "@starptech/expression-parser-0.10.0" = {
@@ -6556,22 +6556,22 @@ let
         sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";
       };
     };
-    "@uifabric/foundation-7.9.19" = {
+    "@uifabric/foundation-7.9.20" = {
       name = "_at_uifabric_slash_foundation";
       packageName = "@uifabric/foundation";
-      version = "7.9.19";
+      version = "7.9.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.19.tgz";
-        sha512 = "F/kKiFL4uSiosnqdv1BT3aQ3w9bQ3l+F3NiMqDbJpnlBAOMOlH2X7xAxZsNYbS66pgTPKsSP/8/SK3A+0wzMXg==";
+        url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.20.tgz";
+        sha512 = "AcOClWfs+rNK0XyPLKTK2Nqeom7zOESOfL3Tbwl5VuDlSrlGW9yNywuuo6gJSOyXCJQO5dJFVdGExmB0EM4vkw==";
       };
     };
-    "@uifabric/icons-7.5.16" = {
+    "@uifabric/icons-7.5.17" = {
       name = "_at_uifabric_slash_icons";
       packageName = "@uifabric/icons";
-      version = "7.5.16";
+      version = "7.5.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.16.tgz";
-        sha512 = "S+KGDZeN9y5sBJfg7Jgi3/598CxE0hvlMtl1XzzftKPdD2Jw8QCQazgYFqG8iZj6R5ILFjezoDr+yXYj6dMXMQ==";
+        url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.17.tgz";
+        sha512 = "2S1kse0gtseTuV2r59iWukLxxoOJ6GgP2Yhxt9oxzaP9QubpYdxCUepvJmfPQQvvy4GELdykDUWQ6/hbzliJyw==";
       };
     };
     "@uifabric/merge-styles-7.19.1" = {
@@ -6601,13 +6601,13 @@ let
         sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA==";
       };
     };
-    "@uifabric/styling-7.16.17" = {
+    "@uifabric/styling-7.16.18" = {
       name = "_at_uifabric_slash_styling";
       packageName = "@uifabric/styling";
-      version = "7.16.17";
+      version = "7.16.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.17.tgz";
-        sha512 = "9TZP5npZopaQUkb7V418bu2OzqjL+4uov9n59Kh/Ll2Bq9WyWg/kngGUMX793gxjOMy9w2IUEd2LN3odM05OlQ==";
+        url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.18.tgz";
+        sha512 = "jINFRMWfSIOZ4H29YNBHtwZU4f8JFprnyBX2E0Wq9rjqRzgcmdYbN2yn88gym6aC3houSDcYM0rdfG4ETjRQSA==";
       };
     };
     "@uifabric/utilities-7.33.2" = {
@@ -6646,40 +6646,40 @@ let
         sha512 = "OKI6clBZqvMBlPKbH1tv3ChmkqRcyCfB6ulHqEX+9asjN5BVXs7tH7aOi+SExCNsmCVB8uJ1ZcvjuwaHsCtUeg==";
       };
     };
-    "@vue/cli-shared-utils-4.5.8" = {
+    "@vue/cli-shared-utils-4.5.9" = {
       name = "_at_vue_slash_cli-shared-utils";
       packageName = "@vue/cli-shared-utils";
-      version = "4.5.8";
+      version = "4.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.8.tgz";
-        sha512 = "pa6oenhBO/5HeDLRSokiwVN01gROACEDy3ESXWuPmragOREGNmmFKtkPHlqeYavGEX6LFp7f0VK3uMX6UYS5mQ==";
+        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.9.tgz";
+        sha512 = "anvsrv+rkQC+hgxaT2nQQxnSWSsIzyysZ36LO7qPjXvDRBvcvKLAAviFlUkYbZ+ntbV8puzJ3zw+gUhQw4SEVA==";
       };
     };
-    "@vue/cli-ui-4.5.8" = {
+    "@vue/cli-ui-4.5.9" = {
       name = "_at_vue_slash_cli-ui";
       packageName = "@vue/cli-ui";
-      version = "4.5.8";
+      version = "4.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.8.tgz";
-        sha512 = "m2is3vx+ccdsH7kenZgCOnYaTH3jm541ZuUPo2pYY+W0mX1bujrtpQgAmpkpPVKfcAdWnzoLi7+zkYBH7nXl2Q==";
+        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.9.tgz";
+        sha512 = "JXQk29CLp7eBdO6uCr2s60xBoKjXPzr9ckpCicFMIWFLQOR0+DqWQpS1DIqETbgOmTYQj1LX+v1rkLeA74Lo2A==";
       };
     };
-    "@vue/cli-ui-addon-webpack-4.5.8" = {
+    "@vue/cli-ui-addon-webpack-4.5.9" = {
       name = "_at_vue_slash_cli-ui-addon-webpack";
       packageName = "@vue/cli-ui-addon-webpack";
-      version = "4.5.8";
+      version = "4.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.8.tgz";
-        sha512 = "kptiU6IWvilevgX7BJUvvQWzzG4xTHKnXySmdpYjltFaAZLLxmCSUzkbvJFzOAOlpSCRQiUrNQnYCwd2f3upCw==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.9.tgz";
+        sha512 = "fh79OvbqvZ2YQ7JI7DnDKeS3W72HoEMVS8m969g/kjrqkFM+Rt2cL81LBx3IgX5l/rZP999kof569vYsOyjVnA==";
       };
     };
-    "@vue/cli-ui-addon-widgets-4.5.8" = {
+    "@vue/cli-ui-addon-widgets-4.5.9" = {
       name = "_at_vue_slash_cli-ui-addon-widgets";
       packageName = "@vue/cli-ui-addon-widgets";
-      version = "4.5.8";
+      version = "4.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.8.tgz";
-        sha512 = "y3vnCLQxUgZ/entdvv6vut7uQwmIp+ichxBay4yy8TjtpBxdVH0EXAByi+6rJlO2sotlvmRdnZU7AV7tz1yLsw==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.9.tgz";
+        sha512 = "mFdUlfDGxoyreCQWO/SX4DvM/6epn37AimVGzLJLpSPJdWUerCnvxwzB6zL83SiYC6O6++cWEdzgz7EtKViFlA==";
       };
     };
     "@vue/compiler-core-3.0.2" = {
@@ -9103,6 +9103,15 @@ let
         sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==";
       };
     };
+    "array-flatten-3.0.0" = {
+      name = "array-flatten";
+      packageName = "array-flatten";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-3.0.0.tgz";
+        sha512 = "zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA==";
+      };
+    };
     "array-ify-1.0.0" = {
       name = "array-ify";
       packageName = "array-ify";
@@ -9904,13 +9913,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.792.0" = {
+    "aws-sdk-2.793.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.792.0";
+      version = "2.793.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.792.0.tgz";
-        sha512 = "h7oSlrCDtZkW5qNw/idKmMjjNJaaPlXFY+NbqtaTjejpCyVuIonUmFvm8GW16V58Avj/hujJfhpX9q0BMCg+VQ==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.793.0.tgz";
+        sha512 = "zBrDkYAUadS59+GVhhVT8f7medKv2FO/3sX3QDfgHt0ySUYi4umBwp3fXjoJU2oRG70IZ74Wclx4T4tynA+Gjg==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -11119,15 +11128,6 @@ let
         sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457";
       };
     };
-    "bitfield-3.0.0" = {
-      name = "bitfield";
-      packageName = "bitfield";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bitfield/-/bitfield-3.0.0.tgz";
-        sha512 = "hJmWKucJQfdSkQPDPBKmWogM9s8+NOSzDT9QVbJbjinXaQ0bJKPu/cn98qRWy3PDNWtKw4XaoUP3XruGRIKEgg==";
-      };
-    };
     "bitfield-4.0.0" = {
       name = "bitfield";
       packageName = "bitfield";
@@ -19652,13 +19652,13 @@ let
         sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
       };
     };
-    "electron-to-chromium-1.3.596" = {
+    "electron-to-chromium-1.3.597" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.596";
+      version = "1.3.597";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz";
-        sha512 = "nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.597.tgz";
+        sha512 = "VJI21MucKaqyFw0oe3j9BIg+nDF4MHzUZAmUwZzrxho+s8zPCD13Fds07Rgu+MTtAadO4tYTKFdAUksKYUyIJw==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -19959,13 +19959,13 @@ let
         sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==";
       };
     };
-    "engine.io-4.0.2" = {
+    "engine.io-4.0.3" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "4.0.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.2.tgz";
-        sha512 = "sumdttqWLNjbuSMOSgDdL2xiEld9s5QZDk9VLyr4e28o+lzNNADhU3qpQDAY7cm2VZH0Otw/U0fL8mEjZ6kBMg==";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.3.tgz";
+        sha512 = "EPA9Bbn0ZHumQvW6ibggmzUQGayR0E9gLIA4RJeoXEbZ9lJYoU8HU+dM1rtCdfyDPdbocUEFaZk4Muem33oiNA==";
       };
     };
     "engine.io-client-1.3.1" = {
@@ -23217,6 +23217,15 @@ let
         sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
       };
     };
+    "fp-and-or-0.1.2" = {
+      name = "fp-and-or";
+      packageName = "fp-and-or";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.2.tgz";
+        sha512 = "3P8x4W/BF5x5xreG06D28I1+sOKyNKo2rShYyEBg/0XJDGuocwcv2KnD4CeuK4OSokFQbuuTlkdb4NlWNHhcKQ==";
+      };
+    };
     "fp-ts-2.8.6" = {
       name = "fp-ts";
       packageName = "fp-ts";
@@ -35316,22 +35325,22 @@ let
         sha512 = "wT2QJT9tW19VSHo9x7RPKU3z/I2Ps6wUS8Kb1OO+kzmg7UY3n4AkcaYG6jq95Lp1R9ohjC/NGYuT2PtuvBjhFg==";
       };
     };
-    "mobx-react-6.3.1" = {
+    "mobx-react-7.0.5" = {
       name = "mobx-react";
       packageName = "mobx-react";
-      version = "6.3.1";
+      version = "7.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mobx-react/-/mobx-react-6.3.1.tgz";
-        sha512 = "IOxdJGnRSNSJrL2uGpWO5w9JH5q5HoxEqwOF4gye1gmZYdjoYkkMzSGMDnRCUpN/BNzZcFoMdHXrjvkwO7KgaQ==";
+        url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.0.5.tgz";
+        sha512 = "WmHl3Ni30ujVcOOnllmGmyccsbfFCKtAwpkIwncwxhgLcvXcE0Wa9lGJIhoqQdTJzGr0AJqGzMVAdwNc3Fj2DQ==";
       };
     };
-    "mobx-react-lite-2.2.2" = {
+    "mobx-react-lite-3.1.6" = {
       name = "mobx-react-lite";
       packageName = "mobx-react-lite";
-      version = "2.2.2";
+      version = "3.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-2.2.2.tgz";
-        sha512 = "2SlXALHIkyUPDsV4VTKVR9DW7K3Ksh1aaIv3NrNJygTbhXe2A9GrcKHZ2ovIiOp/BXilOcTYemfHHZubP431dg==";
+        url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.1.6.tgz";
+        sha512 = "MM3x9BLt5nC7iE/ILA5n2+hfrplEKYbFjqROEuGkzBdZP/KD+Z44+2gseczRrTG0xFuiPWfEzgT68+6/zqOiEw==";
       };
     };
     "mocha-2.5.3" = {
@@ -37136,13 +37145,13 @@ let
         sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg==";
       };
     };
-    "node-releases-1.1.66" = {
+    "node-releases-1.1.67" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.66";
+      version = "1.1.67";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz";
-        sha512 = "JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz";
+        sha512 = "V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==";
       };
     };
     "node-source-walk-4.2.0" = {
@@ -38244,13 +38253,13 @@ let
         sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==";
       };
     };
-    "office-ui-fabric-react-7.150.0" = {
+    "office-ui-fabric-react-7.150.1" = {
       name = "office-ui-fabric-react";
       packageName = "office-ui-fabric-react";
-      version = "7.150.0";
+      version = "7.150.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.150.0.tgz";
-        sha512 = "2g617g8jp9eav54Qy9mRJzIqkF5Ugg0D7hUVgxCuQyxXMqSDCuuas6C+Fv+5pYi/AyTejbVp9EcT/bJ78oCf8A==";
+        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.150.1.tgz";
+        sha512 = "S0ZtEyZs9lHdmVyT2Q9/4Y6XOmltndV4AtAB2dn4oanGMJQ1/o8jio9ZdE9Q2jc1YgK3EEYvXwck0E3kUfWU5w==";
       };
     };
     "omggif-1.0.10" = {
@@ -41917,13 +41926,13 @@ let
         sha512 = "aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg==";
       };
     };
-    "prebuild-install-5.3.6" = {
+    "prebuild-install-6.0.0" = {
       name = "prebuild-install";
       packageName = "prebuild-install";
-      version = "5.3.6";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz";
-        sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg==";
+        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.0.tgz";
+        sha512 = "h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==";
       };
     };
     "precinct-6.3.1" = {
@@ -42547,13 +42556,13 @@ let
         sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17";
       };
     };
-    "protobufjs-6.10.1" = {
+    "protobufjs-6.10.2" = {
       name = "protobufjs";
       packageName = "protobufjs";
-      version = "6.10.1";
+      version = "6.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.1.tgz";
-        sha512 = "pb8kTchL+1Ceg4lFd5XUpK8PdWacbvV5SK2ULH2ebrYtl4GjJmS24m6CKME67jzV53tbJxHlnNOSqQHbTsR9JQ==";
+        url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.2.tgz";
+        sha512 = "27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ==";
       };
     };
     "protocol-buffers-encodings-1.1.1" = {
@@ -44599,13 +44608,13 @@ let
         sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b";
       };
     };
-    "redoc-2.0.0-rc.45" = {
+    "redoc-2.0.0-rc.47" = {
       name = "redoc";
       packageName = "redoc";
-      version = "2.0.0-rc.45";
+      version = "2.0.0-rc.47";
       src = fetchurl {
-        url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.45.tgz";
-        sha512 = "yOgyXFybwBItvY+y9cFEA6X0W6KDdnkdeWK8LMkTxWN4HUecRwPFYPRdzx+SvDUb8ICh4PDtfyDU3Fo1e9N8Iw==";
+        url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.47.tgz";
+        sha512 = "weoRsJngABqWOuign5wXqVHLE0WRpODNQqwsZqtdKqCQ/paLxJRMBqSklAQdUnx4x5SEYvLxXatUGnw1mp2o4g==";
       };
     };
     "reduce-component-1.0.1" = {
@@ -45103,13 +45112,13 @@ let
         sha512 = "o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==";
       };
     };
-    "render-media-3.4.3" = {
+    "render-media-4.0.0" = {
       name = "render-media";
       packageName = "render-media";
-      version = "3.4.3";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/render-media/-/render-media-3.4.3.tgz";
-        sha512 = "Gyk9CYWqGmG2W83ZfQnK8ZGZbmKkrxnHHHiWxF32vH5Afd19IIPZFZADtlmeXVA2petJgCB9L1EbPUc6dS8jDg==";
+        url = "https://registry.npmjs.org/render-media/-/render-media-4.0.0.tgz";
+        sha512 = "HVvQP29EOTBSnj2CjjiNGhRTpvHM+kWf/AMf1rCB8Y2lKaYgvivTLrAHi9jrYs0EUkJ/7M98RgDI/7rguTnE+w==";
       };
     };
     "renderkid-2.0.4" = {
@@ -45265,6 +45274,15 @@ let
         sha512 = "eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw==";
       };
     };
+    "request-light-0.3.0" = {
+      name = "request-light";
+      packageName = "request-light";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-light/-/request-light-0.3.0.tgz";
+        sha512 = "xlVlZVT0ZvCT+c3zm3SjeFCzchoQxsUUmx5fkal0I6RIDJK+lmb1UYyKJ7WM4dTfnzHP4ElWwAf8Dli8c0/tVA==";
+      };
+    };
     "request-progress-2.0.1" = {
       name = "request-progress";
       packageName = "request-progress";
@@ -47173,13 +47191,13 @@ let
         sha512 = "y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==";
       };
     };
-    "sharp-0.26.2" = {
+    "sharp-0.26.3" = {
       name = "sharp";
       packageName = "sharp";
-      version = "0.26.2";
+      version = "0.26.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sharp/-/sharp-0.26.2.tgz";
-        sha512 = "bGBPCxRAvdK9bX5HokqEYma4j/Q5+w8Nrmb2/sfgQCLEUx/HblcpmOfp59obL3+knIKnOhyKmDb4tEOhvFlp6Q==";
+        url = "https://registry.npmjs.org/sharp/-/sharp-0.26.3.tgz";
+        sha512 = "NdEJ9S6AMr8Px0zgtFo1TJjMK/ROMU92MkDtYn2BBrDjIx3YfH9TUyGdzPC+I/L619GeYQc690Vbaxc5FPCCWg==";
       };
     };
     "shasum-1.0.2" = {
@@ -47911,13 +47929,13 @@ let
         sha512 = "TcAlIkHtTvKdPIORxFRr/Ur//ucWK7eFBwlMR4gPeIhKbmEE/PZedBXW2IM8ZUdPIhG53lAP/Eq++1bVFSmZ9g==";
       };
     };
-    "snyk-docker-plugin-4.7.2" = {
+    "snyk-docker-plugin-4.7.4" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "4.7.2";
+      version = "4.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.7.2.tgz";
-        sha512 = "x9KT0EmWjdmQoooWmN0jToLmyWBXW+2rCb1yF5Tv8bPQzWtb2SNDOx/wxJl9rqureXjAFvGsUYFGDld5BXJwJQ==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.7.4.tgz";
+        sha512 = "tGSuGCJjdhpW8Dpc6pvjISLPku6AOYUdJ8X98+6ntIeVeb974K9CpWeofWZIqTz5vKi+oFK5SbyVU9KDNAyHfQ==";
       };
     };
     "snyk-go-parser-1.4.1" = {
@@ -55977,6 +55995,15 @@ let
         sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA==";
       };
     };
+    "vscode-jsonrpc-6.0.0-next.2" = {
+      name = "vscode-jsonrpc";
+      packageName = "vscode-jsonrpc";
+      version = "6.0.0-next.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.2.tgz";
+        sha512 = "dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw==";
+      };
+    };
     "vscode-jsonrpc-6.0.0-next.7" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
@@ -56067,6 +56094,15 @@ let
         sha512 = "UCXULa/RmT2zxcb6auNezl9ZIPwYHS15+a0XzybrpT2+xA0RbHEYQCsIQkTRYjGv8cm3yS9iPJMmxLilP+y1Xw==";
       };
     };
+    "vscode-languageserver-7.0.0-next.3" = {
+      name = "vscode-languageserver";
+      packageName = "vscode-languageserver";
+      version = "7.0.0-next.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0-next.3.tgz";
+        sha512 = "qSt8eb546iFuoFIN+9MPl4Avru6Iz2/JP0UmS/3djf40ICa31Np/yJ7anX2j0Az5rCzb0fak8oeKwDioGeVOYg==";
+      };
+    };
     "vscode-languageserver-protocol-3.14.1" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
@@ -56103,6 +56139,15 @@ let
         sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA==";
       };
     };
+    "vscode-languageserver-protocol-3.16.0-next.4" = {
+      name = "vscode-languageserver-protocol";
+      packageName = "vscode-languageserver-protocol";
+      version = "3.16.0-next.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.4.tgz";
+        sha512 = "6GmPUp2MhJy2H1CTWp2B40Pa9BeC9glrXWmQWVG6A/0V9UbcAjVC9m56znm2GL32iyLDIprTBe8gBvvvcjbpaQ==";
+      };
+    };
     "vscode-languageserver-protocol-3.5.1" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
@@ -56769,13 +56814,13 @@ let
         sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
       };
     };
-    "webtorrent-0.110.1" = {
+    "webtorrent-0.111.0" = {
       name = "webtorrent";
       packageName = "webtorrent";
-      version = "0.110.1";
+      version = "0.111.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.110.1.tgz";
-        sha512 = "KLMkKbf/7G7k6ok45a/O/RGJwIyUI2I992mTp/sezY5n8P7Lh1Q00bSKI/CW4Eqile1XlQoOFMLrJLPChz/SSQ==";
+        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.111.0.tgz";
+        sha512 = "DrQVuFSLEB54dm+5tuRclXaeuH5tx7qlp0DYE0mCK7vbYEmn1UJr5GLXztYW/y4Yxie4CSSGeo5LjTxy59z0og==";
       };
     };
     "well-known-symbols-2.0.0" = {
@@ -59692,7 +59737,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.3.596"
+      sources."electron-to-chromium-1.3.597"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enhanced-resolve-4.3.0"
@@ -59792,7 +59837,7 @@ in
       sources."mute-stream-0.0.8"
       sources."neo-async-2.6.2"
       sources."node-emoji-1.10.0"
-      sources."node-releases-1.1.66"
+      sources."node-releases-1.1.67"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-4.0.1"
       sources."object-assign-4.1.1"
@@ -59925,10 +59970,10 @@ in
   "@vue/cli" = nodeEnv.buildNodePackage {
     name = "_at_vue_slash_cli";
     packageName = "@vue/cli";
-    version = "4.5.8";
+    version = "4.5.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.8.tgz";
-      sha512 = "/hKE03mkpt+CHAL2UIdQC3B1rbNKzvBpU0280Pz9Vt1QlB9ruqBL+1MLJnm70+9d2+VX5Vk/mlaXBOuQz0ID4w==";
+      url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.9.tgz";
+      sha512 = "R6fRau8+fqKI+94LrruKtJDaMQGVsJCNzrdefTJ+bn+ljtCS6j9H+XuU8zLa9+X0HBkX4VoBT7XjfwUAo1IIPA==";
     };
     dependencies = [
       sources."@akryum/winattr-3.0.0"
@@ -60264,14 +60309,14 @@ in
       sources."@types/through-0.0.30"
       sources."@types/ws-7.4.0"
       sources."@types/zen-observable-0.8.1"
-      sources."@vue/cli-shared-utils-4.5.8"
-      (sources."@vue/cli-ui-4.5.8" // {
+      sources."@vue/cli-shared-utils-4.5.9"
+      (sources."@vue/cli-ui-4.5.9" // {
         dependencies = [
           sources."clone-2.1.2"
         ];
       })
-      sources."@vue/cli-ui-addon-webpack-4.5.8"
-      sources."@vue/cli-ui-addon-widgets-4.5.8"
+      sources."@vue/cli-ui-addon-webpack-4.5.9"
+      sources."@vue/cli-ui-addon-widgets-4.5.9"
       (sources."@vue/compiler-core-3.0.2" // {
         dependencies = [
           sources."@babel/types-7.12.6"
@@ -60701,7 +60746,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.596"
+      sources."electron-to-chromium-1.3.597"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
@@ -61187,7 +61232,7 @@ in
           sources."is-wsl-2.2.0"
         ];
       })
-      sources."node-releases-1.1.66"
+      sources."node-releases-1.1.67"
       (sources."nodemon-1.19.4" // {
         dependencies = [
           sources."debug-3.2.6"
@@ -62927,7 +62972,7 @@ in
       sources."plist-3.0.1"
       sources."process-nextick-args-2.0.1"
       sources."promiscuous-0.6.0"
-      sources."protobufjs-6.10.1"
+      sources."protobufjs-6.10.2"
       sources."psl-1.8.0"
       (sources."pump-0.3.5" // {
         dependencies = [
@@ -63829,7 +63874,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.596"
+      sources."electron-to-chromium-1.3.597"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -64832,7 +64877,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.596"
+      sources."electron-to-chromium-1.3.597"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -64930,7 +64975,7 @@ in
       })
       sources."mkdirp-0.5.5"
       sources."ms-2.1.2"
-      sources."node-releases-1.1.66"
+      sources."node-releases-1.1.67"
       sources."normalize-package-data-2.5.0"
       sources."normalize-range-0.1.2"
       sources."normalize-selector-0.2.0"
@@ -65212,10 +65257,10 @@ in
   coc-vetur = nodeEnv.buildNodePackage {
     name = "coc-vetur";
     packageName = "coc-vetur";
-    version = "1.2.2";
+    version = "1.2.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.2.tgz";
-      sha512 = "nqfCmf1pAQnVFNkGni5Isw9ISX4jVt7qTDXZmr//eY1IFCbNXjq4+xJyHoJyeAq3SSVWPKoKoELfQevnwdBxOA==";
+      url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.3.tgz";
+      sha512 = "2SHFFjxkw2kl0hADDNUYX85OR/PbjqYPxFnpNp6G83SbeZBoJN8KDUl7TrIJ7BZ4UCiIilXnKQCHpxREiVPAEg==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -67604,10 +67649,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.39.0";
+    version = "6.41.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.39.0.tgz";
-      sha512 = "BSjkKIOZRkaqXkotVO/0HILZ+mqc8PrRatspvcNFajHgXiIJYk3dU4PDfbU26Y8DkxlofZfEpbw0QWKh+pu4AQ==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.41.0.tgz";
+      sha512 = "fQ5zyCWQzfCGDtPGCB9/cSyUpvhfInBcFxPHnjHfq++UwHBPSWQRkVbTpOnz+VO9wUaVqkHmNogqVsGYV7drDQ==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
@@ -67616,7 +67661,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.792.0"
+      sources."aws-sdk-2.793.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."base64-js-1.5.1"
@@ -68120,10 +68165,10 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.150.0"
-      sources."@fluentui/react-focus-7.16.17"
+      sources."@fluentui/react-7.150.1"
+      sources."@fluentui/react-focus-7.16.18"
       sources."@fluentui/react-window-provider-1.0.1"
-      sources."@fluentui/theme-1.6.0"
+      sources."@fluentui/theme-1.7.0"
       (sources."@gulp-sourcemaps/identity-map-1.0.2" // {
         dependencies = [
           sources."normalize-path-2.1.1"
@@ -68134,7 +68179,7 @@ in
           sources."normalize-path-2.1.1"
         ];
       })
-      sources."@microsoft/load-themed-styles-1.10.133"
+      sources."@microsoft/load-themed-styles-1.10.134"
       sources."@nodelib/fs.scandir-2.1.3"
       sources."@nodelib/fs.stat-2.0.3"
       sources."@nodelib/fs.walk-1.2.4"
@@ -68179,12 +68224,12 @@ in
       sources."@types/sqlite3-3.1.6"
       sources."@types/tough-cookie-4.0.0"
       sources."@types/url-join-4.0.0"
-      sources."@uifabric/foundation-7.9.19"
-      sources."@uifabric/icons-7.5.16"
+      sources."@uifabric/foundation-7.9.20"
+      sources."@uifabric/icons-7.5.17"
       sources."@uifabric/merge-styles-7.19.1"
       sources."@uifabric/react-hooks-7.13.9"
       sources."@uifabric/set-version-7.0.23"
-      sources."@uifabric/styling-7.16.17"
+      sources."@uifabric/styling-7.16.18"
       sources."@uifabric/utilities-7.33.2"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
@@ -69152,7 +69197,7 @@ in
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
       sources."object.reduce-1.0.1"
-      sources."office-ui-fabric-react-7.150.0"
+      sources."office-ui-fabric-react-7.150.1"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -71001,7 +71046,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.596"
+      sources."electron-to-chromium-1.3.597"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -71650,7 +71695,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.66"
+      sources."node-releases-1.1.67"
       sources."nopt-5.0.0"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
@@ -78108,13 +78153,14 @@ in
       })
       sources."array-back-2.0.0"
       sources."array-equal-1.0.0"
+      sources."array-flatten-3.0.0"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.792.0" // {
+      (sources."aws-sdk-2.793.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -78562,7 +78608,7 @@ in
       sources."pipe-functions-1.3.0"
       sources."pn-1.1.0"
       sources."pngjs-5.0.0"
-      sources."prebuild-install-5.3.6"
+      sources."prebuild-install-6.0.0"
       sources."prelude-ls-1.1.2"
       sources."process-nextick-args-2.0.1"
       sources."promise-7.3.1"
@@ -78613,8 +78659,9 @@ in
       sources."setimmediate-1.0.5"
       sources."setprototypeof-1.2.0"
       sources."seventh-0.7.36"
-      (sources."sharp-0.26.2" // {
+      (sources."sharp-0.26.3" // {
         dependencies = [
+          sources."color-3.1.3"
           sources."decompress-response-6.0.0"
           sources."mimic-response-3.1.0"
           sources."simple-get-4.0.0"
@@ -82238,7 +82285,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.596"
+      sources."electron-to-chromium-1.3.597"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -82544,7 +82591,7 @@ in
         ];
       })
       sources."node-modules-regexp-1.0.0"
-      sources."node-releases-1.1.66"
+      sources."node-releases-1.1.67"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-2.0.2"
@@ -83515,19 +83562,19 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.150.0"
-      sources."@fluentui/react-focus-7.16.17"
+      sources."@fluentui/react-7.150.1"
+      sources."@fluentui/react-focus-7.16.18"
       sources."@fluentui/react-window-provider-1.0.1"
-      sources."@fluentui/theme-1.6.0"
-      sources."@microsoft/load-themed-styles-1.10.133"
+      sources."@fluentui/theme-1.7.0"
+      sources."@microsoft/load-themed-styles-1.10.134"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@uifabric/foundation-7.9.19"
-      sources."@uifabric/icons-7.5.16"
+      sources."@uifabric/foundation-7.9.20"
+      sources."@uifabric/icons-7.5.17"
       sources."@uifabric/merge-styles-7.19.1"
       sources."@uifabric/react-hooks-7.13.9"
       sources."@uifabric/set-version-7.0.23"
-      sources."@uifabric/styling-7.16.17"
+      sources."@uifabric/styling-7.16.18"
       sources."@uifabric/utilities-7.33.2"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
@@ -83654,7 +83701,7 @@ in
       sources."node-fetch-1.6.3"
       sources."normalize-url-4.5.0"
       sources."object-assign-4.1.1"
-      sources."office-ui-fabric-react-7.150.0"
+      sources."office-ui-fabric-react-7.150.1"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -84426,7 +84473,7 @@ in
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
-      (sources."aws-sdk-2.792.0" // {
+      (sources."aws-sdk-2.793.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -84757,7 +84804,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.596"
+      sources."electron-to-chromium-1.3.597"
       sources."elf-tools-1.1.2"
       (sources."elliptic-6.5.3" // {
         dependencies = [
@@ -85322,7 +85369,7 @@ in
       sources."netlify-redirector-0.2.1"
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.1"
-      sources."node-releases-1.1.66"
+      sources."node-releases-1.1.67"
       sources."node-source-walk-4.2.0"
       sources."noop2-2.0.0"
       (sources."normalize-package-data-2.5.0" // {
@@ -87297,10 +87344,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "10.1.1";
+    version = "10.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.1.1.tgz";
-      sha512 = "d1lwJqv0sRKJwXwaAUSZTNqBzvJJOQfTiEqkM674tThNmtPd5WU0Mqar//0BpDdSIRs2fEQkvKvg57+2Kbosaw==";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.2.1.tgz";
+      sha512 = "p6FM1JXDs2ZfYZ5pyOPkiIWHi+dldjS26QoVYcfaBgF/SmGBqyU3m0WW/y3PSPvOdb610cnI+wzQxzFxTSx+5Q==";
     };
     dependencies = [
       sources."@npmcli/ci-detect-1.3.0"
@@ -87407,6 +87454,7 @@ in
       sources."find-up-5.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
+      sources."fp-and-or-0.1.2"
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
@@ -88204,7 +88252,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.596"
+      sources."electron-to-chromium-1.3.597"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -88459,7 +88507,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      sources."node-releases-1.1.66"
+      sources."node-releases-1.1.67"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
       sources."nth-check-1.0.2"
@@ -90824,10 +90872,10 @@ in
   purescript-language-server = nodeEnv.buildNodePackage {
     name = "purescript-language-server";
     packageName = "purescript-language-server";
-    version = "0.14.3";
+    version = "0.14.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.14.3.tgz";
-      sha512 = "nt5N6EusQO2dqEnbkma/z7fXxKuVCgMQ8BSJEGZdRiM9W8pa/AV8f8UyPFsN8AMpwZbZv6P9T9LDL6Q3+61S3Q==";
+      url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.14.4.tgz";
+      sha512 = "qsyk0PNStUQJnoxZKPAO0QTRBsZ2fu/PZwfMIAv6b1lHbdi5fsyC7BdCtZxzwAO2hF0OxCIANEeRkbUi+e55Fg==";
     };
     dependencies = [
       sources."isexe-2.0.0"
@@ -90890,10 +90938,10 @@ in
   pyright = nodeEnv.buildNodePackage {
     name = "pyright";
     packageName = "pyright";
-    version = "1.1.85";
+    version = "1.1.86";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.85.tgz";
-      sha512 = "G27ke+PtyAyhoFwCpPwu1MgksAp4h3b2nQ3UAQ/A6GhLtYXr49TwP48bfuAZD89N9PaX1QFCaud3kchb89ktGA==";
+      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.86.tgz";
+      sha512 = "/caEMnoD3tRPfrn/kVcZJ8gNV7NYnQEmnZYbzbVQlrdrbyMXNRXWOY/eDZizaMBYDm5FPV70A3hiA0BL9TqHdA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -91206,10 +91254,10 @@ in
   redoc-cli = nodeEnv.buildNodePackage {
     name = "redoc-cli";
     packageName = "redoc-cli";
-    version = "0.9.13";
+    version = "0.10.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.9.13.tgz";
-      sha512 = "6zNhK7KiiYPGaMIFISsIkgAJaXTY0n8hY3xGAeQuS52GRm/DR5bA1Jna52GUzWM/LXgyp6HSBvYucd+wmOQYCQ==";
+      url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.10.1.tgz";
+      sha512 = "RZqE1dFdIB3hBvxpBc+CRTjD10xDdPIUk3xA4moHzQMP5Gp2MeGCiRWyt747+4CV42s7oUQbxSMeeY1IMz0vAQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -91395,8 +91443,8 @@ in
       sources."minimist-1.2.5"
       sources."mkdirp-1.0.4"
       sources."mobx-6.0.4"
-      sources."mobx-react-6.3.1"
-      sources."mobx-react-lite-2.2.2"
+      sources."mobx-react-7.0.5"
+      sources."mobx-react-lite-3.1.6"
       sources."ms-2.1.2"
       sources."neo-async-2.6.2"
       sources."node-fetch-h2-2.3.0"
@@ -91451,7 +91499,7 @@ in
         ];
       })
       sources."readdirp-3.5.0"
-      sources."redoc-2.0.0-rc.45"
+      sources."redoc-2.0.0-rc.47"
       sources."reftools-1.1.6"
       sources."regenerator-runtime-0.13.7"
       sources."require-directory-2.1.1"
@@ -92263,7 +92311,7 @@ in
         ];
       })
       sources."@serverless/component-metrics-1.0.8"
-      (sources."@serverless/components-3.3.0" // {
+      (sources."@serverless/components-3.3.1" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."ramda-0.27.1"
@@ -92365,7 +92413,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.792.0" // {
+      (sources."aws-sdk-2.793.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -92876,7 +92924,7 @@ in
       sources."prettyoutput-1.2.0"
       sources."process-nextick-args-2.0.1"
       sources."promise-queue-2.2.5"
-      (sources."protobufjs-6.10.1" // {
+      (sources."protobufjs-6.10.2" // {
         dependencies = [
           sources."@types/node-13.13.30"
           sources."long-4.0.0"
@@ -93721,10 +93769,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.427.0";
+    version = "1.427.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.427.0.tgz";
-      sha512 = "0T0pvkP7FSzvNdf8E/us1bB/aUWf2gr+ClsKexfVoKPcJYPuStFDaolmDMN0nvXD5yrYaLneYbQieuZrGtdlJQ==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.427.1.tgz";
+      sha512 = "JSxh4JZm/cjaAOE77Es8WwE0hnBkQLwMgWZmuqZgIpJYIxGgyQYYChygyx/FzUzx+wMM6zOFUuh4zw2V4KMO2w==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -93732,7 +93780,7 @@ in
       sources."@snyk/cocoapods-lockfile-parser-3.5.2"
       sources."@snyk/composer-lockfile-parser-1.4.1"
       sources."@snyk/dep-graph-1.19.4"
-      sources."@snyk/docker-registry-v2-client-1.13.8"
+      sources."@snyk/docker-registry-v2-client-1.13.9"
       sources."@snyk/gemfile-1.2.0"
       sources."@snyk/java-call-graph-builder-1.16.2"
       sources."@snyk/rpm-parser-2.2.1"
@@ -93741,7 +93789,7 @@ in
           sources."tslib-2.0.3"
         ];
       })
-      (sources."@snyk/snyk-docker-pull-3.2.2" // {
+      (sources."@snyk/snyk-docker-pull-3.2.3" // {
         dependencies = [
           sources."tmp-0.1.0"
         ];
@@ -94104,7 +94152,7 @@ in
           sources."tslib-2.0.3"
         ];
       })
-      (sources."snyk-docker-plugin-4.7.2" // {
+      (sources."snyk-docker-plugin-4.7.4" // {
         dependencies = [
           sources."rimraf-3.0.2"
           sources."tmp-0.2.1"
@@ -94332,7 +94380,7 @@ in
       sources."cookie-0.4.1"
       sources."cors-2.8.5"
       sources."debug-4.1.1"
-      sources."engine.io-4.0.2"
+      sources."engine.io-4.0.3"
       sources."engine.io-parser-4.0.1"
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
@@ -95436,7 +95484,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.792.0" // {
+      (sources."aws-sdk-2.793.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -99810,6 +99858,46 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  vscode-json-languageserver = nodeEnv.buildNodePackage {
+    name = "vscode-json-languageserver";
+    packageName = "vscode-json-languageserver";
+    version = "1.3.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/vscode-json-languageserver/-/vscode-json-languageserver-1.3.1.tgz";
+      sha512 = "yP75lCPSZVkFUfA0pUA9yKu2OumueIIaht5i9c7XVwwm08PMt1GMDI8RNv/fPkUjU9uBnb5bJW20BHxWBATgrA==";
+    };
+    dependencies = [
+      sources."agent-base-4.3.0"
+      sources."debug-3.1.0"
+      sources."es6-promise-4.2.8"
+      sources."es6-promisify-5.0.0"
+      sources."http-proxy-agent-2.1.0"
+      sources."https-proxy-agent-2.2.4"
+      sources."jsonc-parser-2.3.1"
+      sources."ms-2.0.0"
+      sources."request-light-0.3.0"
+      (sources."vscode-json-languageservice-3.10.0" // {
+        dependencies = [
+          sources."vscode-nls-5.0.0"
+        ];
+      })
+      sources."vscode-jsonrpc-6.0.0-next.2"
+      sources."vscode-languageserver-7.0.0-next.3"
+      sources."vscode-languageserver-protocol-3.16.0-next.4"
+      sources."vscode-languageserver-textdocument-1.0.1"
+      sources."vscode-languageserver-types-3.16.0-next.2"
+      sources."vscode-nls-4.1.2"
+      sources."vscode-uri-2.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "JSON language server";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   vscode-json-languageserver-bin = nodeEnv.buildNodePackage {
     name = "vscode-json-languageserver-bin";
     packageName = "vscode-json-languageserver-bin";
@@ -102880,10 +102968,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "5.4.0";
+    version = "5.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.4.0.tgz";
-      sha512 = "udpYTyqz8toTTdaOsL2QKPLeZLt2IEm9qY7yTXuFEQhKu5bk0yQD9BtAdVQksmz4jFbbWOiWmm3NHarO0zr/ng==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-5.5.0.tgz";
+      sha512 = "gyr7VE8zXJP81ZvS8+5dDphS2kaE0r8bpVWX6SxkBlzlX3hYfBS96kaltuf2cYK/BKJlUw5Aex/fKC34HUn+hA==";
     };
     dependencies = [
       sources."@types/eslint-7.2.5"
@@ -102920,7 +103008,7 @@ in
       sources."chrome-trace-event-1.0.2"
       sources."colorette-1.2.1"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.596"
+      sources."electron-to-chromium-1.3.597"
       sources."enhanced-resolve-5.3.1"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"
@@ -102946,7 +103034,7 @@ in
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
       sources."neo-async-2.6.2"
-      sources."node-releases-1.1.66"
+      sources."node-releases-1.1.67"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
@@ -103805,7 +103893,7 @@ in
       sources."bencode-2.0.1"
       sources."bep53-range-1.0.0"
       sources."binary-search-1.3.6"
-      sources."bitfield-3.0.0"
+      sources."bitfield-4.0.0"
       (sources."bittorrent-dht-10.0.0" // {
         dependencies = [
           sources."debug-4.3.0"
@@ -103821,7 +103909,6 @@ in
       sources."bittorrent-peerid-1.3.3"
       (sources."bittorrent-protocol-3.2.0" // {
         dependencies = [
-          sources."bitfield-4.0.0"
           sources."debug-4.3.0"
           sources."ms-2.1.2"
         ];
@@ -103982,7 +104069,7 @@ in
       })
       sources."prettier-bytes-1.0.4"
       sources."process-nextick-args-2.0.1"
-      sources."protobufjs-6.10.1"
+      sources."protobufjs-6.10.2"
       sources."pump-3.0.0"
       sources."qap-3.3.1"
       sources."queue-microtask-1.2.0"
@@ -103994,7 +104081,7 @@ in
       sources."range-slice-stream-2.0.0"
       sources."readable-stream-3.6.0"
       sources."record-cache-1.1.0"
-      (sources."render-media-3.4.3" // {
+      (sources."render-media-4.0.0" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."ms-2.1.2"
@@ -104056,7 +104143,6 @@ in
       sources."url-join-4.0.1"
       (sources."ut_metadata-3.5.2" // {
         dependencies = [
-          sources."bitfield-4.0.0"
           sources."debug-4.3.0"
           sources."ms-2.1.2"
         ];
@@ -104067,7 +104153,7 @@ in
       sources."utp-native-2.2.1"
       sources."videostream-3.2.2"
       sources."vlc-command-1.2.0"
-      (sources."webtorrent-0.110.1" // {
+      (sources."webtorrent-0.111.0" // {
         dependencies = [
           sources."debug-4.3.0"
           sources."decompress-response-6.0.0"

From fe1a36fe5b6bfe4d0b69ae18a8c731b7d2fdad5c Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Tue, 17 Nov 2020 15:30:31 +0000
Subject: [PATCH 2686/3942] aacgain: fix src

---
 pkgs/applications/audio/aacgain/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix
index 194514c65b53..83b359b1b1cb 100644
--- a/pkgs/applications/audio/aacgain/default.nix
+++ b/pkgs/applications/audio/aacgain/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, fetchpatch }:
+{ stdenv, fetchFromGitLab, fetchpatch }:
 
 stdenv.mkDerivation {
   name = "aacgain-1.9.0";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitLab {
     owner = "mulx";
     repo = "aacgain";
     rev = "7c29dccd878ade1301710959aeebe87a8f0828f5";

From b654e021014cafe70bd0f5ded9990d06aa259d95 Mon Sep 17 00:00:00 2001
From: alexjg <alex@memoryandthought.me>
Date: Tue, 17 Nov 2020 16:06:00 +0000
Subject: [PATCH 2687/3942] libargon2: fixDarwinDylibNames for libargon2
 (#104041)

---
 pkgs/development/libraries/libargon2/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix
index 9bf05a679cc0..f559c10456bb 100644
--- a/pkgs/development/libraries/libargon2/default.nix
+++ b/pkgs/development/libraries/libargon2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch }:
+{ stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   pname = "libargon2";
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i";
   };
 
+  nativeBuildInputs = [ fixDarwinDylibNames ];
+
   patches = [
     # TODO: remove when https://github.com/P-H-C/phc-winner-argon2/pull/277 is merged + released
     (fetchpatch {

From 011ecb8f904daf95f238cc594f016f15a97cd7f3 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Mon, 16 Nov 2020 22:16:05 -0800
Subject: [PATCH 2688/3942] crate2nix: init at 0.8.0

crate2nix is a tool that "generates nix build files for rust crates
using cargo".

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 .../tools/rust/crate2nix/default.nix          | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/tools/rust/crate2nix/default.nix

diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix
new file mode 100644
index 000000000000..a941d43bb9d8
--- /dev/null
+++ b/pkgs/development/tools/rust/crate2nix/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, makeWrapper
+
+, cargo
+, nix
+, nix-prefetch-git
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "crate2nix";
+  version = "0.8.0";
+
+  src = fetchFromGitHub
+    {
+      owner = "kolloch";
+      repo = pname;
+      rev = version;
+      sha256 = "sha256-pqg1BsEq3kGmUzt1zpQvXgdnRcIsiuIyvtUBi3VxtZ4=";
+    } + "/crate2nix";
+
+  cargoSha256 = "sha256-dAMWrGNMleQ3lDbG46Hr4qvCyxR+QcPOUZw9r2/CxV4=";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  # Tests use nix(1), which tries (and fails) to set up /nix/var inside the
+  # sandbox
+  doCheck = false;
+
+  postFixup = ''
+    wrapProgram $out/bin/crate2nix \
+        --suffix PATH ":" ${lib.makeBinPath [ cargo nix nix-prefetch-git ]}
+  '';
+
+  meta = with lib; {
+    description = "A Nix build file generator for Rust crates.";
+    longDescription = ''
+      Crate2nix generates Nix files from Cargo.toml/lock files
+      so that you can build every crate individually in a Nix sandbox.
+    '';
+    homepage = "https://github.com/kolloch/crate2nix";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ kolloch andir cole-h ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a55699da1d0..6541b5fcbf94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9969,6 +9969,8 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  crate2nix = callPackage ../development/tools/rust/crate2nix { };
+
   maturin = callPackage ../development/tools/rust/maturin { };
   inherit (rustPackages) rls;
   rustfmt = rustPackages.rustfmt;

From ec4b52e968c50ee7cbf17f152f890e8e835fb498 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 14:26:17 +0000
Subject: [PATCH 2689/3942] =?UTF-8?q?gnome3.gnome-contacts:=203.38=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-contacts/-/commit/570af2285b2af97b7aeb7218c4fa8a1408811ddf
---
 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 23e3821ac8cc..4c75ed8418f6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-contacts";
-  version = "3.38";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "f8LuaJwfOcLmN163YLlOFlHOSoKK1AggbToD4TPaGa8=";
+    sha256 = "0hsq0dwxjahcaxnm1m4r1lync9k2fkwzybfmkchrmn95vqcwwvf9";
   };
 
   propagatedUserEnvPkgs = [ evolution-data-server ];

From 83d3362d1157c992b559394c2f50e488bd9766cb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 17:24:48 +0100
Subject: [PATCH 2690/3942] gnome3.gnome-contacts: clean up

---
 .../gnome-3/core/gnome-contacts/default.nix   | 78 +++++++++++++------
 1 file changed, 55 insertions(+), 23 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index 4c75ed8418f6..7e7730d9f6b2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -1,8 +1,30 @@
-{ stdenv, gettext, fetchurl, evolution-data-server, fetchpatch
-, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
-, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
-, wrapGAppsHook, folks, libxml2, gnome3
-, vala, meson, ninja, libhandy, gsettings-desktop-schemas
+{ stdenv
+, gettext
+, fetchurl
+, evolution-data-server
+, fetchpatch
+, pkgconfig
+, libxslt
+, docbook_xsl
+, docbook_xml_dtd_42
+, python3
+, gtk3
+, glib
+, cheese
+, libchamplain
+, clutter-gtk
+, geocode-glib
+, gnome-desktop
+, gnome-online-accounts
+, wrapGAppsHook
+, folks
+, libxml2
+, gnome3
+, vala
+, meson
+, ninja
+, libhandy
+, gsettings-desktop-schemas
 }:
 
 stdenv.mkDerivation rec {
@@ -14,22 +36,38 @@ stdenv.mkDerivation rec {
     sha256 = "0hsq0dwxjahcaxnm1m4r1lync9k2fkwzybfmkchrmn95vqcwwvf9";
   };
 
-  propagatedUserEnvPkgs = [ evolution-data-server ];
+  propagatedUserEnvPkgs = [
+    evolution-data-server
+  ];
 
   nativeBuildInputs = [
-    meson ninja pkgconfig vala gettext libxslt docbook_xsl docbook_xml_dtd_42 python3 wrapGAppsHook
+    meson
+    ninja
+    pkgconfig
+    vala
+    gettext
+    libxslt
+    docbook_xsl
+    docbook_xml_dtd_42
+    python3
+    wrapGAppsHook
   ];
 
   buildInputs = [
-    gtk3 glib evolution-data-server gsettings-desktop-schemas
-    folks gnome-desktop libhandy
-    libxml2 gnome-online-accounts cheese
-    gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib
-  ];
-
-  mesonFlags = [
-    # Upstream does not seem to maintain this properly: https://gitlab.gnome.org/GNOME/gnome-contacts/issues/103
-    "-Dtelepathy=false"
+    gtk3
+    glib
+    evolution-data-server
+    gsettings-desktop-schemas
+    folks
+    gnome-desktop
+    libhandy
+    libxml2
+    gnome-online-accounts
+    cheese
+    gnome3.adwaita-icon-theme
+    libchamplain
+    clutter-gtk
+    geocode-glib
   ];
 
   postPatch = ''
@@ -37,12 +75,6 @@ stdenv.mkDerivation rec {
     patchShebangs build-aux/meson_post_install.py
   '';
 
-  # In file included from src/gnome-contacts@exe/contacts-avatar-selector.c:30:0:
-  # /nix/store/*-cheese-3.28.0/include/cheese/cheese-widget.h:26:10: fatal error: clutter-gtk/clutter-gtk.h: No such file or directory
-  #  #include <clutter-gtk/clutter-gtk.h>
-  #           ^~~~~~~~~~~~~~~~~~~~~~~~~~~
-  NIX_CFLAGS_COMPILE = "-I${stdenv.lib.getDev clutter-gtk}/include/clutter-gtk-1.0";
-
   doCheck = true;
 
   passthru = {
@@ -56,7 +88,7 @@ stdenv.mkDerivation rec {
     homepage = "https://wiki.gnome.org/Apps/Contacts";
     description = "GNOME’s integrated address book";
     maintainers = teams.gnome.members;
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
 }

From bb8dcb6fb06c4271aaba62792f4cfe0090993291 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 14:26:27 +0000
Subject: [PATCH 2691/3942] =?UTF-8?q?gnome3.gnome-mahjongg:=203.38.2=20?=
 =?UTF-8?q?=E2=86=92=203.38.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-mahjongg/3.38/gnome-mahjongg-3.38.3.news
---
 pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index 7a97002bc569..9bb0db10da58 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-mahjongg";
-  version = "3.38.2";
+  version = "3.38.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1wslwhr782pdzrvca7wa6smvyid5yr42kjlra6qd9ji5qss0i1wj";
+    sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj";
   };
 
   nativeBuildInputs = [
@@ -24,10 +24,6 @@ stdenv.mkDerivation rec {
     librsvg
   ];
 
-  mesonFlags = [
-    "-Dcompile-schemas=enabled"
-  ];
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;

From 01788e28be09257aec191937db60db99f7bd3207 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 14:26:29 +0000
Subject: [PATCH 2692/3942] =?UTF-8?q?gnome3.gnome-nibbles:=203.38.1=20?=
 =?UTF-8?q?=E2=86=92=203.38.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-nibbles/3.38/gnome-nibbles-3.38.2.news
---
 pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index 770b8dde0c6e..b4f778c3ff1e 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-nibbles";
-  version = "3.38.1";
+  version = "3.38.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "096mk2hsa1za002rk4cnhm0h8ps99jzl47kap27i16s4m2ny71vk";
+    sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5";
   };
 
   nativeBuildInputs = [

From a7ca1e3d42c1d75c826a12e113d32e438345df9f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 14:28:53 +0000
Subject: [PATCH 2693/3942] =?UTF-8?q?gnome3.seahorse:=203.37.2=20=E2=86=92?=
 =?UTF-8?q?=203.38.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/seahorse/3.38/seahorse-3.38.0.news
https://ftp.gnome.org/pub/GNOME/sources/seahorse/3.38/seahorse-3.38.0.1.news
---
 pkgs/desktops/gnome-3/apps/seahorse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 370b7a07acf2..3cbd7a509fe4 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -22,16 +22,16 @@
 , p11-kit
 , openssh
 , gsettings-desktop-schemas
-, libhandy_0
+, libhandy
 }:
 
 stdenv.mkDerivation rec {
   pname = "seahorse";
-  version = "3.37.2";
+  version = "3.38.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-flpBYSYDDDTONYZuRR3V2sx637Mp1dMQJ79fUGLtRio=";
+    hash = "sha256-x0XdHebhog8ZorB6Q4uO98yiNaaqc0ENt/E3sCHpsqI=";
   };
 
   doCheck = true;
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     openssh
     openldap
     libpwquality
-    libhandy_0 # not yet ported to libhandy-1
+    libhandy
   ];
 
   postPatch = ''
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
     homepage = "https://wiki.gnome.org/Apps/Seahorse";
     description = "Application for managing encryption keys and passwords in the GnomeKeyring";
     maintainers = teams.gnome.members;
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
 }

From 9800410742f8af8f9b3893b95a30cfc7bb33a27e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 15:10:51 +0000
Subject: [PATCH 2694/3942] =?UTF-8?q?gnome-connections:=203.38.0=20?=
 =?UTF-8?q?=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

just translations
https://ftp.gnome.org/pub/GNOME/sources/connections/3.38/connections-3.38.1.news
---
 pkgs/desktops/gnome-3/apps/gnome-connections/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix
index 676e2359995d..02c2a4f3da84 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-connections";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/connections/${stdenv.lib.versions.majorMinor version}/connections-${version}.tar.xz";
-    hash = "sha256-Eob36/zoWIGdYMpWks280FoIHGL7AHUhinFA4cEqels=";
+    hash = "sha256-5c7uBFkh9Vsw6bWWUDjNTMDrrFqI5JEgYlsWpfyuTpA=";
   };
 
   nativeBuildInputs = [
@@ -60,7 +60,8 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome3.updateScript {
-      packageName = pname;
+      packageName = "connections";
+      attrPath = "gnome-connections";
     };
   };
 

From 9bf45755a85a4880e5e2f8d95718f58f35201706 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 15:23:16 +0000
Subject: [PATCH 2695/3942] =?UTF-8?q?gspell:=201.8.4=20=E2=86=92=201.9.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gspell/-/commit/5300d93dae00998801ef1be48da71dac4e2ebd1b
---
 pkgs/development/libraries/gspell/default.nix | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index 582244f4f497..37e54c825955 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -1,27 +1,50 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk3, enchant2, isocodes, vala, gobject-introspection, gnome3 }:
+{ stdenv
+, fetchurl
+, pkgconfig
+, libxml2
+, glib
+, gtk3
+, enchant2
+, icu
+, vala
+, gobject-introspection
+, gnome3
+}:
 
-let
+stdenv.mkDerivation rec {
   pname = "gspell";
-  version = "1.8.4";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "1.9.1";
 
   outputs = [ "out" "dev" ];
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1d23pl9956dkpy52pbndp0vrba0y030msh1issdl84z82skickfg";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw";
   };
 
-  propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig
+  nativeBuildInputs = [
+    pkgconfig
+    vala
+    gobject-introspection
+    libxml2
+  ];
 
-  nativeBuildInputs = [ pkgconfig vala gobject-introspection libxml2 ];
-  buildInputs = [ glib gtk3 isocodes ];
+  buildInputs = [
+    glib
+    gtk3
+    icu
+  ];
+
+  propagatedBuildInputs = [
+    # required for pkgconfig
+    enchant2
+  ];
 
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
+      versionPolicy = "none";
     };
   };
 

From 613f224d356931b3ff3b49f5aaf29ed0f4a662d2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 15:33:53 +0000
Subject: [PATCH 2696/3942] =?UTF-8?q?gnome-user-docs:=203.38.0=20=E2=86=92?=
 =?UTF-8?q?=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gnome-user-docs/3.38/gnome-user-docs-3.38.1.news
---
 pkgs/data/documentation/gnome-user-docs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix
index 91abb04116a9..688c606519a0 100644
--- a/pkgs/data/documentation/gnome-user-docs/default.nix
+++ b/pkgs/data/documentation/gnome-user-docs/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-user-docs";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "12pfvivsgz4qvx3y6zndxln28fgvbdv2kjy6l892i4f5bmdxplrq";
+    sha256 = "0j4yfv6b31dwv3aky20bnap6gql1xpl3fz3qzjx1lmr3bngz92jf";
   };
 
   nativeBuildInputs = [

From 673ef88de51a98d847fefa059ea5f598a63cbd66 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Tue, 17 Nov 2020 16:21:48 +0000
Subject: [PATCH 2697/3942] anarchism: fix src

---
 pkgs/data/documentation/anarchism/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/anarchism/default.nix b/pkgs/data/documentation/anarchism/default.nix
index 5b63e104d9db..3acb215db14a 100644
--- a/pkgs/data/documentation/anarchism/default.nix
+++ b/pkgs/data/documentation/anarchism/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     domain = "salsa.debian.org";
     owner = "debian";
     repo = pname;
-    rev = "debian%2F${version}"; # %2F = urlquote("/")
+    rev = "debian/${version}";
     sha256 = "04ylk0y5b3jml2awmyz7m1hnymni8y1n83m0k6ychdh0px8frhm5";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/share/doc/anarchism $out/share/applications $out/share/icons/hicolor/scalable/apps 
+    mkdir -p $out/share/doc/anarchism $out/share/applications $out/share/icons/hicolor/scalable/apps
     cp -r {html,markdown} $out/share/doc/anarchism
     cp debian/anarchism.svg $out/share/icons/hicolor/scalable/apps
     cp debian/anarchism.desktop $out/share/applications

From 805cedf8d3ac9df34cccd95069b37b13e1017e5b Mon Sep 17 00:00:00 2001
From: Pamplemousse <xav.maso@gmail.com>
Date: Tue, 17 Nov 2020 09:24:54 -0700
Subject: [PATCH 2698/3942] doc/builders: Remove out-of-date example

Signed-off-by: Pamplemousse <xav.maso@gmail.com>
---
 doc/builders/packages/shell-helpers.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/doc/builders/packages/shell-helpers.xml b/doc/builders/packages/shell-helpers.xml
index cb70d527d67b..a4ac9022c4ce 100644
--- a/doc/builders/packages/shell-helpers.xml
+++ b/doc/builders/packages/shell-helpers.xml
@@ -6,20 +6,16 @@
  <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>
-   </listitem>
    <listitem>
     <para>
      <literal>fzf</literal>: <command>fzf-share</command>
     </para>
    </listitem>
   </itemizedlist>
-  E.g. <literal>autojump</literal> can then used in the .bashrc like this:
+  E.g. <literal>fzf</literal> can then used in the .bashrc like this:
 <screen>
-  source "$(autojump-share)/autojump.bash"
+  source "$(fzf-share)/completion.bash"
+  source "$(fzf-share)/key-bindings.bash"
 </screen>
  </para>
 </section>

From f0e0e272de8900bc0e077477d4605666c22a0b0f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 15:34:35 +0000
Subject: [PATCH 2699/3942] =?UTF-8?q?glade:=203.36.0=20=E2=86=92=203.38.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/glade/3.37/glade-3.37.0.news
https://ftp.gnome.org/pub/GNOME/sources/glade/3.38/glade-3.38.0.news
https://ftp.gnome.org/pub/GNOME/sources/glade/3.38/glade-3.38.1.news
---
 pkgs/development/tools/glade/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix
index 85bc037b1976..4cc7dbd8a7c2 100644
--- a/pkgs/development/tools/glade/default.nix
+++ b/pkgs/development/tools/glade/default.nix
@@ -2,14 +2,19 @@
 , gettext
 , fetchurl
 , python3
+, meson
+, ninja
 , pkg-config
 , gtk3
 , glib
+, gjs
+, webkitgtk
 , gobject-introspection
 , wrapGAppsHook
 , itstool
 , libxml2
 , docbook-xsl-nons
+, docbook_xml_dtd_42
 , gnome3
 , gdk-pixbuf
 , libxslt
@@ -18,19 +23,22 @@
 
 stdenv.mkDerivation rec {
   pname = "glade";
-  version = "3.36.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "023gx8rj51njn8fsb6ma5kz1irjpxi4js0n8rwy22inc4ysldd8r";
+    sha256 = "1kfgs2dpjd8dnnjkfc4xdy8yjjavlzimqzyfr1pq1m1h96z506hp";
   };
 
   nativeBuildInputs = [
+    meson
+    ninja
     pkg-config
     gettext
     itstool
     wrapGAppsHook
     docbook-xsl-nons
+    docbook_xml_dtd_42
     libxslt
     libxml2
     gobject-introspection
@@ -39,6 +47,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk3
     glib
+    gjs
+    webkitgtk
     libxml2
     python3
     python3.pkgs.pygobject3
@@ -47,8 +57,6 @@ stdenv.mkDerivation rec {
     gnome3.adwaita-icon-theme
   ];
 
-  enableParallelBuilding = true;
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;

From f4ce49f9898f11f61f8b7f6369b42af4735f0636 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 16:36:21 +0100
Subject: [PATCH 2700/3942] =?UTF-8?q?gnome3.aisleriot:=203.22.11=20?=
 =?UTF-8?q?=E2=86=92=203.22.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/aisleriot/-/compare/3.22.11...3.22.13
---
 pkgs/desktops/gnome-3/games/aisleriot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index d58e608c9576..e441462921b5 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
@@ -19,14 +19,14 @@
 
 stdenv.mkDerivation rec {
   pname = "aisleriot";
-  version = "3.22.11";
+  version = "3.22.13";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = pname;
     rev = version;
-    sha256 = "1asm0y6485xqsysdg586y3hzz8bhxqwnc82k6vhfnxpxz7l62qa1";
+    sha256 = "05k84bbgrrxchxg08l1jjcz384kpjdmxd24g0wnf731aa9zcnp5k";
   };
 
   nativeBuildInputs = [

From bfadfd5fbaf600e098c78dfa2b0ce089663e1a6d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 15:42:53 +0000
Subject: [PATCH 2701/3942] =?UTF-8?q?libhandy:=201.0.1=20=E2=86=92=201.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/libhandy/1.0/libhandy-1.0.2.news
---
 pkgs/development/libraries/libhandy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index a008052c0ca8..7dce08b4cc24 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -23,14 +23,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libhandy";
-  version = "1.0.1";
+  version = "1.0.2";
 
   outputs = [ "out" "dev" "devdoc" "glade" ];
   outputBin = "dev";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "106qa4d2rcbvd3g3avbgkd59aq0bjvwpx8vfz1cikvwrarnfvql4";
+    sha256 = "0b8wvjabv5mg8jbng8rsd5g84lk571nm0qpna20pwp0njh2qvmrs";
   };
 
   nativeBuildInputs = [

From 9b7d444159cf9b4e0eaa40cccf35db3bdb6613cd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 17:02:37 +0100
Subject: [PATCH 2702/3942] =?UTF-8?q?deja-dup:=2042.4=20=E2=86=92=2042.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/World/deja-dup/-/releases/42.5
---
 pkgs/applications/backup/deja-dup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index c65d5bbc09aa..e4898baca54e 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -21,14 +21,14 @@
 
 stdenv.mkDerivation rec {
   pname = "deja-dup";
-  version = "42.4";
+  version = "42.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = pname;
     rev = version;
-    sha256 = "c4E6mHYVb8TWVTVlmHidcLa9ebHJ27iStsNNLJhY8vY=";
+    sha256 = "1xgsd9a9y36lv6f2vjw2nxi9zj2zl1gv6rcyzkqajf91vgmxwf8k";
   };
 
   patches = [

From 3a707939047059a6e1200697ac2b239df4365735 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 16:29:59 +0100
Subject: [PATCH 2703/3942] =?UTF-8?q?telepathy-mission-control:=205.16.5?=
 =?UTF-8?q?=20=E2=86=92=205.16.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

just includes a fix we were already cherry-picking:

https://github.com/TelepathyIM/telepathy-mission-control/commit/67df52b68b28e2a3755702b669a58747e21dd12b
---
 .../telepathy/mission-control/default.nix     | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index a6e74443f291..bc0657f7b1a7 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchurl
-, fetchpatch
-, pkgconfig
+, pkg-config
 , dconf
 , telepathy-glib
 , python3
@@ -11,31 +10,21 @@
 
 stdenv.mkDerivation rec {
   pname = "telepathy-mission-control";
-  version = "5.16.5";
+  version = "5.16.6";
 
   outputs = [ "out" "lib" "dev" ];
 
   src = fetchurl {
     url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc";
+    sha256 = "0ibs575pfr0wmhfcw6ln6iz7gw2y45l3bah11rksf6g9jlwsxy1d";
   };
 
-  patches = [
-    # Fix property name (new GLib is stricter)
-    # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-601494939
-    # https://gitlab.gnome.org/GNOME/polari/-/merge_requests/141
-    (fetchpatch {
-      url = "https://github.com/TelepathyIM/telepathy-mission-control/commit/d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910.patch";
-      sha256 = "1rchl0lyfj5c3yhl63spzvx9b6ny3967dlq4hgp9qhqn0zjra3sb";
-    })
-  ];
-
   buildInputs = [
     python3
   ]; # ToDo: optional stuff missing
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     libxslt
     makeWrapper
   ];
@@ -57,7 +46,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "An account manager and channel dispatcher for the Telepathy framework";
     homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/";
-    license = licenses.lgpl21;
+    license = licenses.lgpl21Only;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.unix;
   };

From ab7661ed7c43f5c10695d584a3b9cebe19e8251b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 15:34:10 +0000
Subject: [PATCH 2704/3942] =?UTF-8?q?gnome-online-accounts:=203.37.90=20?=
 =?UTF-8?q?=E2=86=92=203.38.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

just translations
https://ftp.gnome.org/pub/GNOME/sources/gnome-online-accounts/3.38/gnome-online-accounts-3.38.0.news
---
 .../libraries/gnome-online-accounts/default.nix    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix
index b8369db59fbc..342cfcbc4da2 100644
--- a/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/pkgs/development/libraries/gnome-online-accounts/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , fetchFromGitLab
-, pkgconfig
+, pkg-config
 , vala
 , glib
 , meson
@@ -18,7 +18,7 @@
 , icu
 , glib-networking
 , libsoup
-, docbook_xsl
+, docbook-xsl-nons
 , docbook_xml_dtd_412
 , gnome3
 , gcr
@@ -30,7 +30,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-online-accounts";
-  version = "3.37.90";
+  version = "3.38.0";
 
   # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
   src = fetchFromGitLab {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "GNOME";
     repo = "gnome-online-accounts";
     rev = version;
-    sha256 = "05ahib6bjbfyj2gbqjijzg9i7x1q0r67hyph0fbrgnnadlpk2cv8";
+    sha256 = "sha256-NRGab/CMJxe31rr20+5wYZF2rOzoSNdztfNVojBd5ag=";
   };
 
   outputs = [ "out" "man" "dev" "devdoc" ];
@@ -52,16 +52,16 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    dbus # used for checks and pkgconfig to install dbus service/s
+    dbus # used for checks and pkg-config to install dbus service/s
     docbook_xml_dtd_412
-    docbook_xsl
+    docbook-xsl-nons
     gettext
     gobject-introspection
     gtk-doc
     libxslt
     meson
     ninja
-    pkgconfig
+    pkg-config
     python3
     vala
     wrapGAppsHook

From 4a99872c976bfff4fc422b79bd4411bf64d36fd5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 18:13:36 +0100
Subject: [PATCH 2705/3942] libhandy_0: disable glade catalog

It does not work with recent glade.
---
 pkgs/development/libraries/libhandy/0.x.nix | 23 +++++----------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix
index 2923f2da25d0..9cf4f615dd28 100644
--- a/pkgs/development/libraries/libhandy/0.x.nix
+++ b/pkgs/development/libraries/libhandy/0.x.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala
+{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
-, gtk3, gnome3, glade
+, gtk3, gnome3
 , dbus, xvfb_run, libxml2
 , hicolor-icon-theme
 }:
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "libhandy";
   version = "0.0.13";
 
-  outputs = [ "out" "dev" "devdoc" "glade" ];
+  outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
   src = fetchFromGitLab {
@@ -20,32 +20,19 @@ stdenv.mkDerivation rec {
     sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
   };
 
-  patches = [
-    # Fix build with Glade 3.36.0
-    # https://source.puri.sm/Librem5/libhandy/merge_requests/451
-    (fetchpatch {
-      url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch";
-      sha256 = "0qgh4i0l1028qxqmig4x2c10yj5s80skl70qnc5wnp71s45alvk5";
-      excludes = [ "glade/glade-hdy-header-bar.c" ];
-    })
-  ];
-
   nativeBuildInputs = [
     meson ninja pkgconfig gobject-introspection vala libxml2
     gtk-doc docbook_xsl docbook_xml_dtd_43
   ];
-  buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ];
+  buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ];
   checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
 
   mesonFlags = [
     "-Dgtk_doc=true"
-    "-Dglade_catalog=enabled"
+    "-Dglade_catalog=disabled"
     "-Dintrospection=enabled"
   ];
 
-  PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
-  PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
-
   doCheck = true;
 
   checkPhase = ''

From d72a58a6848c4b9e15a8eb4c09975f4bc828d737 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 16 Nov 2020 23:28:37 +0100
Subject: [PATCH 2706/3942] python3Packages.requests: 2.24.0 -> 2.25.0

---
 pkgs/development/python-modules/requests/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index 9ed590ba19ba..47431274b2c6 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "requests";
-  version = "2.24.0";
+  version = "2.25.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b";
+    sha256 = "1y6mb8c0ipd64d5axq2p368yxndp3f966hmabjka2q2a5y9hn6kz";
   };
 
   nativeBuildInputs = [ pytest ];

From 8e8eecd5c795ee8edbc2c3a00deda0b3039da226 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Tue, 17 Nov 2020 17:20:01 +0000
Subject: [PATCH 2707/3942] ledger-live-desktop: 2.15.0 -> 2.16.0

---
 pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index da0449f41d1f..4c4f3f2b29e3 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.15.0";
+  version = "2.16.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
-    sha256 = "06sm4ah05j0f3bxb1sbdi8mazmxk166y2gaycll6p2xhd105ins3";
+    sha256 = "16z2cy41vxbrvjblj09in6669pks1p9y3rgx8b7afjwf102ba9yi";
   };
 
   appimageContents = appimageTools.extractType2 {

From 8f7cec22975b172500ce5e83ecdcc23aea6fb262 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 17 Nov 2020 08:31:06 -0800
Subject: [PATCH 2708/3942] python3Packages.numpy: fix tests for >64 core
 machines

---
 pkgs/development/python-modules/numpy/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index b8faccb155b5..622f784fb8ba 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -58,9 +58,13 @@ in buildPythonPackage rec {
     ./numpy-distutils-C++.patch
   ];
 
+  # we default openblas to build with 64 threads
+  # if a machine has more than 64 threads, it will segfault
+  # see https://github.com/xianyi/OpenBLAS/issues/2993
   preConfigure = ''
     sed -i 's/-faltivec//' numpy/distutils/system_info.py
     export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
+    export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES))
   '';
 
   preBuild = ''

From e949d758998fafbef608adcf9f54d79a6e7da4c8 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 17 Nov 2020 09:09:59 -0800
Subject: [PATCH 2709/3942] python2Packages.numpy: fix openblas threads

---
 pkgs/development/python-modules/numpy/1.16.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/numpy/1.16.nix b/pkgs/development/python-modules/numpy/1.16.nix
index ab4991cad145..1ab958a15f07 100644
--- a/pkgs/development/python-modules/numpy/1.16.nix
+++ b/pkgs/development/python-modules/numpy/1.16.nix
@@ -60,6 +60,7 @@ in buildPythonPackage rec {
   preConfigure = ''
     sed -i 's/-faltivec//' numpy/distutils/system_info.py
     export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
+    export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES))
   '';
 
   preBuild = ''

From 04320e77e12e0db4eff5de0b17ca124b553fc1c4 Mon Sep 17 00:00:00 2001
From: Jonas Chevalier <zimbatm@zimbatm.com>
Date: Tue, 17 Nov 2020 18:43:25 +0100
Subject: [PATCH 2710/3942] gopls: 0.5.1 -> 0.5.3 (#104065)

---
 pkgs/development/tools/gopls/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix
index 290500376e85..49b8c8a3306f 100644
--- a/pkgs/development/tools/gopls/default.nix
+++ b/pkgs/development/tools/gopls/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gopls";
-  version = "0.5.1";
+  version = "0.5.3";
 
   src = fetchgit {
     rev = "gopls/v${version}";
     url = "https://go.googlesource.com/tools";
-    sha256 = "1vnidc8kaisdyprylsibddpdksm84c6qr528768yvi93crdmddls";
+    sha256 = "04dkrvk5190kyfa9swxpl0m3xq9g90qp8j7yxhi87wyb8giqbll2";
   };
 
   modRoot = "gopls";
-  vendorSha256 = "048qs6ygav8al3sz9vwf6fqaahkr8wr3dj1yd2jhr7c5h30n4rs2";
+  vendorSha256 = "0ml8n6qnq9nprn7kv138qy0i2q8qawzd0lhh3v2qw39j0aj5fb7z";
 
   doCheck = false;
 

From 4c0678ca9a4ba96eccceba80856581ef80cc1a3e Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 17 Nov 2020 19:43:19 +0100
Subject: [PATCH 2711/3942] tor: 0.4.4.5 -> 0.4.4.6

---
 pkgs/tools/security/tor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 791ba8028866..04bf598d132a 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tor";
-  version = "0.4.4.5";
+  version = "0.4.4.6";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
-    sha256 = "09lr6l98qmc69pzsi8r02z86v969dbfwjrwphfm3npknzq5a0p54";
+    sha256 = "1p0zpqmbskygx0wmiijhprg8r45n2wqbbjl7kv4gbb83b0alq5az";
   };
 
   outputs = [ "out" "geoip" ];
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
 
     maintainers = with maintainers;
-      [ phreedom thoughtpolice joachifm ];
+      [ phreedom thoughtpolice joachifm prusnak ];
     platforms = platforms.unix;
   };
 }

From 49325a0d7f727bb23464f2d996da613cc5c758a2 Mon Sep 17 00:00:00 2001
From: Jason Lau <github.com@dotkr.nl>
Date: Mon, 16 Nov 2020 20:32:28 -0800
Subject: [PATCH 2712/3942] reattach-to-user-namespace: 2.8 -> 2.9

---
 .../darwin/reattach-to-user-namespace/default.nix    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
index 768ca6cf9c97..685837768504 100644
--- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
+++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "reattach-to-user-namespace";
-  version = "2.8";
+  version = "2.9";
 
-  src = fetchurl {
-    url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard/archive/v${version}.tar.gz";
-    sha256 = "0xxxdd26rcplhpvi2vy6crxadk3d1qkq4xry10lwq6dyya2jf6wb";
+  src = fetchFromGitHub {
+    owner = "ChrisJohnsen";
+    repo = "tmux-MacOSX-pasteboard";
+    rev = "v${version}";
+    sha256 = "1qgimh58hcx5f646gj2kpd36ayvrdkw616ad8cb3lcm11kg0ag79";
   };
 
   buildFlags = [ "ARCHES=x86_64" ];

From 3087df3e8f563152c9333e0d3e1b6e74235cde2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 12 Nov 2020 18:57:50 +0100
Subject: [PATCH 2713/3942] knot-resolver: add support for new DoH
 implementation

By default.  I'm not a DoH fan, but the difference in runtime closure
is really tiny (216 KiB by du).  I somehow forgot this during update.

Some of the newly running tests were failing and got disabled.
---
 pkgs/servers/dns/knot-resolver/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index aabfcd9796e4..f7a07acf04b4 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -3,6 +3,7 @@
 , runCommand, pkgconfig, meson, ninja, makeWrapper
 # build+runtime deps.
 , knot-dns, luajitPackages, libuv, gnutls, lmdb, systemd, dns-root-data
+, nghttp2
 # test-only deps.
 , cmocka, which, cacert
 , extraFeatures ? false /* catch-all if defaults aren't enough */
@@ -11,7 +12,7 @@ let # un-indented, over the whole file
 
 result = if extraFeatures then wrapped-full else unwrapped;
 
-inherit (stdenv.lib) optional optionals;
+inherit (stdenv.lib) optional optionals optionalString;
 lua = luajitPackages;
 
 unwrapped = stdenv.mkDerivation rec {
@@ -38,6 +39,11 @@ unwrapped = stdenv.mkDerivation rec {
     # ExecStart can't be overwritten in overrides.
     # We need that to use wrapped executable and correct config file.
     sed '/^ExecStart=/d' -i systemd/kresd@.service.in
+  ''
+    # some tests have issues with network sandboxing, apparently
+  + optionalString doInstallCheck ''
+    echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua
+    sed '/^[[:blank:]]*test_dstaddr,$/d' -i tests/config/doh2.test.lua
   '';
 
   preConfigure = ''
@@ -49,6 +55,7 @@ unwrapped = stdenv.mkDerivation rec {
   # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
   buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
     ++ optional stdenv.isLinux systemd # passing sockets, sd_notify
+    ++ [ nghttp2 ]
     ## optional dependencies; TODO: libedit, dnstap
     ;
 
@@ -71,7 +78,7 @@ unwrapped = stdenv.mkDerivation rec {
   '';
 
   doInstallCheck = with stdenv; hostPlatform == buildPlatform;
-  installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx ];
+  installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ];
   installCheckPhase = ''
     meson test --print-errorlogs
   '';

From e61ef63e4e4644a451a4ed66f2f2ac7b48f2c26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 12 Nov 2020 19:04:12 +0100
Subject: [PATCH 2714/3942] kresd service: switch .listenDoH to new
 implementation

Beware: extraFeatures are not needed *for this* anymore,
but their removal may still cause a regression in some configs
(example: prefill module).
---
 nixos/modules/services/networking/kresd.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index ccb34163d5f3..6f1c4c48b430 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -23,18 +23,14 @@ let
       '';
 
   configFile = pkgs.writeText "kresd.conf" (
-    optionalString (cfg.listenDoH != []) ''
-      modules.load('http')
-    ''
+    ""
     + concatMapStrings (mkListen "dns") cfg.listenPlain
     + concatMapStrings (mkListen "tls") cfg.listenTLS
-    + concatMapStrings (mkListen "doh") cfg.listenDoH
+    + concatMapStrings (mkListen "doh2") cfg.listenDoH
     + cfg.extraConfig
   );
 
-  package = if cfg.listenDoH == []
-    then pkgs.knot-resolver # never force `extraFeatures = false`
-    else pkgs.knot-resolver.override { extraFeatures = true; };
+  package = pkgs.knot-resolver;
 in {
   meta.maintainers = [ maintainers.vcunat /* upstream developer */ ];
 
@@ -92,7 +88,7 @@ in {
       default = [];
       example = [ "198.51.100.1:443" "[2001:db8::1]:443" "443" ];
       description = ''
-        Addresses and ports on which kresd should provide DNS over HTTPS (see RFC 8484).
+        Addresses and ports on which kresd should provide DNS over HTTPS/2 (see RFC 8484).
         For detailed syntax see ListenStream in man systemd.socket.
       '';
     };

From cd5c7c0ee6ccfa1c1b3b9b0831604bc180cee4b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 12 Nov 2020 19:16:04 +0100
Subject: [PATCH 2715/3942] knot-resolver: drop capabilities after startup

By default.  I forgot to add this a long time ago.
The difference in runtime closure is really tiny (232 KiB by du).
---
 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 f7a07acf04b4..cdbdbdc56eba 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -3,7 +3,7 @@
 , runCommand, pkgconfig, meson, ninja, makeWrapper
 # build+runtime deps.
 , knot-dns, luajitPackages, libuv, gnutls, lmdb, systemd, dns-root-data
-, nghttp2
+, nghttp2, libcap_ng # optionals, in principle
 # test-only deps.
 , cmocka, which, cacert
 , extraFeatures ? false /* catch-all if defaults aren't enough */
@@ -55,7 +55,7 @@ unwrapped = stdenv.mkDerivation rec {
   # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
   buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
     ++ optional stdenv.isLinux systemd # passing sockets, sd_notify
-    ++ [ nghttp2 ]
+    ++ [ nghttp2 libcap_ng ]
     ## optional dependencies; TODO: libedit, dnstap
     ;
 

From 335798d243cc550a6b32a411c63a55f361f9e32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 17 Nov 2020 20:05:51 +0100
Subject: [PATCH 2716/3942] knot-resolver: fix a stupid system breaking
 non-systemd

I hope this will fix darwin build (no good way of testing locally).
---
 pkgs/servers/dns/knot-resolver/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index cdbdbdc56eba..f88772bda0bc 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -74,6 +74,7 @@ unwrapped = stdenv.mkDerivation rec {
   postInstall = ''
     rm "$out"/lib/libkres.a
     rm "$out"/lib/knot-resolver/upgrade-4-to-5.lua # not meaningful on NixOS
+  '' + optionalString stdenv.targetPlatform.isLinux ''
     rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
   '';
 

From 86f2d455cb792cea24da7fe076c5a3cabc744eed Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 19:36:30 +0100
Subject: [PATCH 2717/3942] =?UTF-8?q?gnomeExtensions.sound-output-device-c?=
 =?UTF-8?q?hooser:=2028=20=E2=86=92=2032?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/kgshank/gse-sound-output-device-chooser/compare/28...32
---
 .../sound-output-device-chooser/default.nix   |  4 ++--
 .../fix-paths.patch                           | 20 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
index 870ac448bb4e..9f80fbe28cd7 100644
--- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-sound-output-device-chooser";
-  version = "28";
+  version = "32";
 
   src = fetchFromGitHub {
     owner = "kgshank";
     repo = "gse-sound-output-device-chooser";
     rev = version;
-    sha256 = "1vmf8mgb52x7my3sidaw8kh26d5niadn18bgrl6bjcakmj5x8q16";
+    sha256 = "1s83scr80qv5xmlfsy6dnsj96lwg2rr4pbsw9inld3ylblgvi35l";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
index a0a6551fcf81..5957cb956f7a 100644
--- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
@@ -1,14 +1,18 @@
+diff --git a/sound-output-device-chooser@kgshank.net/convenience.js b/sound-output-device-chooser@kgshank.net/convenience.js
+index 54ad06f..0860531 100644
 --- a/sound-output-device-chooser@kgshank.net/convenience.js
 +++ b/sound-output-device-chooser@kgshank.net/convenience.js
-@@ -111,7 +111,7 @@ function refreshCards() {
-         log("New logic");
+@@ -129,7 +129,7 @@ function refreshCards() {
+     if(_settings.get_boolean(Prefs.NEW_PROFILE_ID))    {
+         _log("New logic");
          let pyLocation =  Me.dir.get_child('utils/pa_helper.py').get_path();
-         try {
--            let [result, out, err, exit_code] = GLib.spawn_command_line_sync('python ' + pyLocation);
-+            let [result, out, err, exit_code] = GLib.spawn_command_line_sync('@python@ ' + pyLocation);
-             // log("result" + result +" out"+out + " exit_code" + exit_code + "
-             // err" +err);
-             if(result && !exit_code) {
+-        let pythonExec = 'python';
++        let pythonExec = '@python@';
+         let pyVer = 3;
+         while(!isCmdFound(pythonExec) && pyVer >=2){
+             _log(pythonExec + " is not found. Try next");
+diff --git a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
+index c4d2484..262608d 100644
 --- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
 +++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
 @@ -86,7 +86,7 @@ else:

From 955548855dad8a3d249bc9ab36a2578aaa6d12fe Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 17 Nov 2020 20:12:43 +0100
Subject: [PATCH 2718/3942] aliases: rfkill is replaced by utillinux, not
 util-linux

---
 pkgs/top-level/aliases.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4bdb91651f74..ddd94bc9b9a4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -488,7 +488,7 @@ mapAliases ({
   recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
   gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
   qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
-  rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
+  rfkill = throw "rfkill has been removed, as it's included in utillinux"; # added 2020-08-23
   riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
   rkt = throw "rkt was archived by upstream"; # added 2020-05-16
   ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby";

From 9fb57ebd5064669e98ad66c4bbf625d142c919cb Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Fri, 4 Sep 2020 17:25:51 +0200
Subject: [PATCH 2719/3942] sweethome3d: 6.3 -> 6.4.2

---
 pkgs/applications/misc/sweethome3d/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 94875de7ebc8..bf2db2966508 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -51,7 +51,12 @@ let
 
       cp "${sweethome3dItem}/share/applications/"* $out/share/applications
 
+      # MESA_GL_VERSION_OVERRIDE is needed since the update from MESA 19.3.3 to 20.0.2:
+      # without it a "Profiles [GL4bc, GL3bc, GL2, GLES1] not available on device null"
+      # exception is thrown on startup.
+      # https://discourse.nixos.org/t/glx-not-recognised-after-mesa-update/6753
       makeWrapper ${jre}/bin/java $out/bin/$exec \
+        --set MESA_GL_VERSION_OVERRIDE 2.1 \
         --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
         --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}"
     '';
@@ -73,14 +78,14 @@ in {
 
   application = mkSweetHome3D rec {
     pname = stdenv.lib.toLower module + "-application";
-    version = "6.3";
+    version = "6.4.2";
     module = "SweetHome3D";
     description = "Design and visualize your future home";
     license = stdenv.lib.licenses.gpl2Plus;
     src = fetchsvn {
       url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/";
-      sha256 = "1c13g0f73jgbzmjhdm9knqq1kh3vdl04zl3xlp30g9a1n0jkr38i";
-      rev = "6896";
+      sha256 = "13rczayakwb5246hqnp8lnw61p0p7ywr2294bnlp4zwsrz1in9z4";
+      rev = "7504";
     };
     desktopName = "Sweet Home 3D";
     icons = {

From 3a30b1fc16d746792e939ac604931a6e699df56b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 17 Nov 2020 20:57:14 +0100
Subject: [PATCH 2720/3942] python3Packages.pyee: init at 7.0.4

---
 .../python-modules/pyee/default.nix           | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyee/default.nix

diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix
new file mode 100644
index 000000000000..0b2f4560d354
--- /dev/null
+++ b/pkgs/development/python-modules/pyee/default.nix
@@ -0,0 +1,37 @@
+{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, stdenv, isPy27 }:
+
+buildPythonPackage rec {
+  pname = "pyee";
+  version = "7.0.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "105n8jzw8vy6cm8mm5sm86mwyaqqr8zjh8w9xvcb7hp29p0vrihm";
+  };
+
+  buildInputs = [
+    vcversioner
+  ];
+
+  checkInputs = [
+    mock
+    pyhamcrest
+    pytest
+    pytest-asyncio
+    pytest-trio
+    pytestrunner
+    twisted
+  ] ++ stdenv.lib.optional isPy27 [
+    attrs
+    futures
+    pyparsing
+    zipp
+  ];
+
+  meta = {
+    description = "A port of Node.js's EventEmitter to python";
+    homepage = "https://github.com/jfhbrook/pyee";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kmein ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b5f211684e2..1e196bd0c824 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4984,6 +4984,8 @@ in {
 
   pyechonest = callPackage ../development/python-modules/pyechonest { };
 
+  pyee = callPackage ../development/python-modules/pyee { };
+
   pyelftools = callPackage ../development/python-modules/pyelftools { };
 
   pyemd = callPackage ../development/python-modules/pyemd { };

From 327a00a7cf11f9d5fc12d4bab6cba58ab58006a4 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Tue, 17 Nov 2020 21:02:04 +0100
Subject: [PATCH 2721/3942] gumbo: Add darwin to platforms

---
 pkgs/development/libraries/gumbo/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix
index 9acc48ae0b85..e8035d8b1cf9 100644
--- a/pkgs/development/libraries/gumbo/default.nix
+++ b/pkgs/development/libraries/gumbo/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "C99 HTML parsing algorithm";
     homepage = "https://github.com/google/gumbo-parser";
     maintainers = [ maintainers.nico202 ];
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
     license = licenses.asl20;
   };
 }

From 097f5a54a6061ad97312060a322f90de8be198bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 17 Nov 2020 20:58:03 +0100
Subject: [PATCH 2722/3942] python3Packages.pyppeteer: init at 0.2.2

---
 .../python-modules/pyppeteer/default.nix      | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyppeteer/default.nix

diff --git a/pkgs/development/python-modules/pyppeteer/default.nix b/pkgs/development/python-modules/pyppeteer/default.nix
new file mode 100644
index 000000000000..09d2415f8e0a
--- /dev/null
+++ b/pkgs/development/python-modules/pyppeteer/default.nix
@@ -0,0 +1,29 @@
+{ buildPythonPackage, fetchPypi, lib, urllib3, pyee, tqdm, websockets, appdirs }:
+
+buildPythonPackage rec {
+  pname = "pyppeteer";
+  version = "0.2.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1s92izan7s3iffc85wpwi1qv9brcq0rlfqyi84wmpmg1dxk64g0m";
+  };
+
+  # tests want to write to /homeless-shelter
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    appdirs
+    websockets
+    tqdm
+    pyee
+    urllib3
+  ];
+
+  meta = {
+    description = "Headless chrome/chromium automation library (unofficial port of puppeteer)";
+    homepage = "https://github.com/pyppeteer/pyppeteer";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kmein ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1e196bd0c824..228098d57867 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5346,6 +5346,8 @@ in {
 
   pypoppler = callPackage ../development/python-modules/pypoppler { };
 
+  pyppeteer = callPackage ../development/python-modules/pyppeteer { };
+
   pyprind = callPackage ../development/python-modules/pyprind { };
 
   pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { };

From 5ad6a3b27003c1fe0fb8d5656a58cec6431887d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 17 Nov 2020 20:58:17 +0100
Subject: [PATCH 2723/3942] urlwatch: 2.19 -> 2.21

---
 pkgs/tools/networking/urlwatch/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index f23aed3707be..e4b821be1f46 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.19";
+  version = "2.21";
 
   src = fetchFromGitHub {
     owner  = "thp";
     repo   = "urlwatch";
     rev    = version;
-    sha256 = "05vxs0x8gnsv2r9cy0brqny1y5jnj2mw11lqc8lqahx84xcs2m00";
+    sha256 = "1s6bigkwymxdp9bkgvwg3lbf465i6k8kmak2w7czf4mhwavcfq63";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -20,12 +20,13 @@ python3Packages.buildPythonApplication rec {
     pycodestyle
     pyyaml
     requests
+    pyppeteer
   ];
 
   meta = with stdenv.lib; {
     description = "A tool for monitoring webpages for updates";
     homepage = "https://thp.io/2008/urlwatch/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ tv ];
+    maintainers = with maintainers; [ kmein tv ];
   };
 }

From 1f323ec2b47c53246ac7b0ebab53680af4c995e8 Mon Sep 17 00:00:00 2001
From: Michael Raitza <git@spacefrogg.net>
Date: Tue, 17 Nov 2020 21:00:40 +0100
Subject: [PATCH 2724/3942] openafs: remove 1.6; point to openafs_1_8

---
 nixos/doc/manual/release-notes/rl-2103.xml    |  6 ++
 .../network-filesystems/openafs/server.nix    |  1 -
 pkgs/servers/openafs/1.6/default.nix          | 91 -------------------
 pkgs/servers/openafs/1.6/module.nix           | 77 ----------------
 pkgs/servers/openafs/1.6/srcs.nix             | 14 ---
 pkgs/servers/openafs/1.6/tsmbac.patch         | 62 -------------
 pkgs/servers/openafs/1.8/module.nix           |  2 +-
 pkgs/top-level/all-packages.nix               |  6 +-
 8 files changed, 11 insertions(+), 248 deletions(-)
 delete mode 100644 pkgs/servers/openafs/1.6/default.nix
 delete mode 100644 pkgs/servers/openafs/1.6/module.nix
 delete mode 100644 pkgs/servers/openafs/1.6/srcs.nix
 delete mode 100644 pkgs/servers/openafs/1.6/tsmbac.patch

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 5c017c65a253..da4f083d01ac 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -172,6 +172,12 @@
       please note that your non-root pools will now be forcibly imported.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     <package>openafs</package> now points to <package>openafs_1_8</package>,
+     which is the new stable release.  OpenAFS 1.6 was removed.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix
index 095024d2c8af..d782f7821656 100644
--- a/nixos/modules/services/network-filesystems/openafs/server.nix
+++ b/nixos/modules/services/network-filesystems/openafs/server.nix
@@ -251,7 +251,6 @@ in {
         wantedBy = [ "multi-user.target" ];
         restartIfChanged = false;
         unitConfig.ConditionPathExists = [
-          "|/etc/openafs/server/rxkad.keytab"
           "|/etc/openafs/server/KeyFileExt"
         ];
         preStart = ''
diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix
deleted file mode 100644
index 8835024c1df0..000000000000
--- a/pkgs/servers/openafs/1.6/default.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
-, glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43
-, ncurses # Extra ncurses utilities. Only needed for debugging.
-, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
-}:
-
-with (import ./srcs.nix { inherit fetchurl; });
-
-stdenv.mkDerivation {
-  pname = "openafs";
-  inherit version srcs;
-
-  nativeBuildInputs = [ autoconf automake flex yacc perl which libxslt ];
-
-  buildInputs = [ ncurses ];
-
-  patches = stdenv.lib.optional (tsmbac != null) ./tsmbac.patch;
-
-  outputs = [ "out" "dev" "man" "doc" ];
-
-  preConfigure = ''
-
-    patchShebangs .
-    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
-      echo "Patch /usr/include and /usr/src in $i"
-      substituteInPlace $i \
-        --replace "/usr/include" "${glibc.dev}/include" \
-        --replace "/usr/src" "$TMP"
-    done
-
-    for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do
-      substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
-        "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
-    done
-
-    ./regen.sh
-
-    ${stdenv.lib.optionalString (kerberos != null)
-      "export KRB5_CONFIG=${kerberos.dev}/bin/krb5-config"}
-
-    export AFS_SYSKVERS=26
-
-    configureFlagsArray=(
-      ${stdenv.lib.optionalString (kerberos != null) "--with-krb5"}
-      "--sysconfdir=/etc"
-      "--localstatedir=/var"
-      "--disable-kernel-module"
-      "--disable-fuse-client"
-      "--with-html-xsl=${docbook_xsl}/share/xml/docbook-xsl/html/chunk.xsl"
-      ${stdenv.lib.optionalString (tsmbac != null) "--enable-tivoli-tsm"}
-      ${stdenv.lib.optionalString (ncurses == null) "--disable-gtx"}
-      "--disable-linux-d_splice-alias-extra-iput"
-    )
-  '' + stdenv.lib.optionalString (tsmbac != null) ''
-    export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
-    export XBSA_XLIBS="-ldl"
-  '';
-
-  buildFlags = [ "all_nolibafs" ];
-
-  postBuild = ''
-    for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
-      make -C "''${d}" html
-    done
-  '';
-
-  postInstall = ''
-    mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide}
-    cp -r doc/{arch,examples,pdf,protocol,txt} README NEWS $doc/share/doc/openafs
-    for d in AdminGuide QuickStartUnix UserGuide ; do
-      cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}"
-    done
-
-    rm -r $out/lib/{openafs,afs,*.a}
-    rm $out/bin/kpasswd
-    rm $out/sbin/{kas,kdb,ka-forwarder,kadb_check}
-    rm $out/libexec/openafs/kaserver
-    rm $man/share/man/man{1/kpasswd*,5/kaserver*,8/{ka*,kdb*}}
-  '';
-
-  meta = with stdenv.lib; {
-    outputsToInstall = [ "out" "doc" "man" ];
-    description = "Open AFS client";
-    homepage = "https://www.openafs.org";
-    license = licenses.ipl10;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
-    # Package will be removed in 21.03
-    broken = true;
-  };
-}
diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix
deleted file mode 100644
index 3354d8508efa..000000000000
--- a/pkgs/servers/openafs/1.6/module.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, which, autoconf, automake, flex, bison
-, kernel, glibc, perl }:
-
-with (import ./srcs.nix { inherit fetchurl; });
-
-let
-  modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
-  kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-
-in stdenv.mkDerivation {
-  name = "openafs-${version}-${kernel.modDirVersion}";
-  inherit version src;
-
-  patches = [
-    # Linux 4.20
-    (fetchpatch {
-      name = "openafs_1_6-current_kernel_time.patch";
-      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=b9936e944a2b4f5773d66864cbb297993b050e65";
-      sha256 = "16fl9kp0l95dqm166jx3x4ijbzhf2bc9ilnipn3k1j00mfy4lnia";
-    })
-    (fetchpatch {
-      name = "openafs_1_6-do_settimeofday.patch";
-      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=fe6fb38b3d4095351955b9872d0fd6cba64f8784";
-      sha256 = "0k6kgk1ybhm9xx2l0wbcyv7jimkr9mfs2ywvxy8hpyhcm7rbwjkp";
-    })
-    # Linux 5.0
-    (fetchpatch {
-      name = "openafs_1_6-super_block.patch";
-      url = "http://git.openafs.org/?p=openafs.git;a=patch;h=61db15f1badabd83e289efd622e274c47f0aefda";
-      sha256 = "0cdd76s1h1bhxj0hl7r6mcha1jcy5vhlvc5dc8m2i83a6281yjsa";
-    })
-  ];
-  nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies;
-
-  hardeningDisable = [ "pic" ];
-
-  configureFlags = [
-    "--with-linux-kernel-build=${kernelBuildDir}"
-    "--sysconfdir=/etc"
-    "--localstatedir=/var"
-    "--disable-linux-d_splice-alias-extra-iput"
-  ];
-
-  preConfigure = ''
-    patchShebangs .
-    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
-      echo "Patch /usr/include and /usr/src in $i"
-      substituteInPlace $i \
-        --replace "/usr/include" "${glibc.dev}/include" \
-        --replace "/usr/src" "${kernelBuildDir}"
-    done
-
-    ./regen.sh -q
-
-  '';
-
-  buildPhase = ''
-    make V=1 only_libafs
-  '';
-
-  installPhase = ''
-    mkdir -p ${modDestDir}
-    cp src/libafs/MODLOAD-*/libafs-${kernel.modDirVersion}.* ${modDestDir}/libafs.ko
-    xz -f ${modDestDir}/libafs.ko
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Open AFS client kernel module";
-    homepage = "https://www.openafs.org";
-    license = licenses.ipl10;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
-    # Package will be removed in 21.03
-    broken = true;
-  };
-
-}
diff --git a/pkgs/servers/openafs/1.6/srcs.nix b/pkgs/servers/openafs/1.6/srcs.nix
deleted file mode 100644
index 888cef2f1eaa..000000000000
--- a/pkgs/servers/openafs/1.6/srcs.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ fetchurl }:
-rec {
-  version = "1.6.24";
-  src = fetchurl {
-    url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
-    sha256 = "1dxzc1y5mmx3ap0m94sx80vfs3qxkckid3wc1xm0wr5i6fh7zn1h";
-  };
-
-  srcs = [ src
-    (fetchurl {
-      url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
-      sha256 = "0aq9ipqpr2ksmk30h2dc4mlrkrqs16xnmspwfb6xj3rgr1pwszlx";
-    })];
-}
diff --git a/pkgs/servers/openafs/1.6/tsmbac.patch b/pkgs/servers/openafs/1.6/tsmbac.patch
deleted file mode 100644
index 412765fe8a5b..000000000000
--- a/pkgs/servers/openafs/1.6/tsmbac.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ru3 openafs-1.6.18.1/acinclude.m4 openafs-1.6.18.1.new/acinclude.m4
---- openafs-1.6.18.1/acinclude.m4	2016-06-21 17:13:39.000000000 +0200
-+++ openafs-1.6.18.1.new/acinclude.m4	2016-11-02 18:44:30.423039662 +0100
-@@ -1373,45 +1373,7 @@
- 
- dnl check for tivoli
- AC_MSG_CHECKING(for tivoli tsm butc support)
--XBSA_CFLAGS=""
--if test "$enable_tivoli_tsm" = "yes"; then
--	XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen
--	XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen
--	XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample
--	XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample
--	XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample
--	XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample
--
--	if test -r "$XBSADIR3/dsmapifp.h"; then
--		XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3"
--		XBSA_XLIBS="-ldl"
--		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
--	elif test -r "$XBSADIR4/dsmapifp.h"; then
--		XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4"
--		XBSA_XLIBS="-ldl"
--		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
--	elif test -r "$XBSADIR5/dsmapifp.h"; then
--		XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5"
--		XBSA_XLIBS="-ldl"
--		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
--	elif test -r "$XBSADIR6/dsmapifp.h"; then
--		XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6"
--		XBSA_XLIBS="-ldl"
--		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
--	elif test -r "$XBSADIR1/xbsa.h"; then
--		XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
--		XBSA_XLIBS=""
--		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
--	elif test -r "$XBSADIR2/xbsa.h"; then
--		XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
--		XBSA_XLIBS=""
--		AC_MSG_RESULT([yes, $XBSA_CFLAGS])
--	else
--		AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files])
--	fi
--else
--	AC_MSG_RESULT([no])
--fi
-+AC_MSG_RESULT([yes])
- AC_SUBST(XBSA_CFLAGS)
- AC_SUBST(XBSA_XLIBS) 
- 
-diff -ru3 openafs-1.6.18.1/src/butc/afsxbsa.c openafs-1.6.18.1.new/src/butc/afsxbsa.c
---- openafs-1.6.18.1/src/butc/afsxbsa.c	2016-06-21 17:13:39.000000000 +0200
-+++ openafs-1.6.18.1.new/src/butc/afsxbsa.c	2016-11-02 18:45:10.734662987 +0100
-@@ -651,7 +651,7 @@
- #if defined(AFS_AIX_ENV)
-         dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER);
- #elif defined (AFS_AMD64_LINUX26_ENV)
--	dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL);
-+	dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL);
- #elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV)
-         dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL);
- #else
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 8cb04ea7cdb5..722e514ea016 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -75,7 +75,7 @@ in stdenv.mkDerivation {
     license = licenses.ipl10;
     platforms = platforms.linux;
     maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
-    broken = versionOlder kernel.version "3.18";
+    broken = versionOlder kernel.version "3.18" || kernel.isHardened;
   };
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b29cd7a0d5d7..1c3908f6537a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17024,8 +17024,9 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
   openbgpd = callPackage ../servers/openbgpd { };
 
-  openafs = callPackage ../servers/openafs/1.6 { tsmbac = null; ncurses = null; };
   openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; };
+  # Current stable release; don't backport release updates!
+  openafs = openafs_1_8;
 
   openresty = callPackage ../servers/http/openresty {
     withPerl = false;
@@ -18278,8 +18279,9 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
     rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { };
 
-    openafs = callPackage ../servers/openafs/1.6/module.nix { };
     openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
+    # Current stable release; don't backport release updates!
+    openafs = openafs_1_8;
 
     facetimehd = callPackage ../os-specific/linux/facetimehd { };
 

From 7d3811e2160ae58e3499527210a46323ad2cb625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 17 Nov 2020 21:42:14 +0100
Subject: [PATCH 2725/3942] matterbridge: 1.18.0 -> 1.19.0

---
 pkgs/servers/matterbridge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index b864c4d830b2..cab386d18f1e 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "matterbridge";
-  version = "1.18.0";
+  version = "1.19.0";
 
   vendorSha256 = null;
 
@@ -10,7 +10,7 @@ buildGoModule rec {
 
   src = fetchurl {
     url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz";
-    sha256 = "0ax2lis37ppxah4k9aqw1aj6pl5yz6npfriaw70g4952abvbkivw";
+    sha256 = "1s9y7m5xzmzcp8bphc1najrmci8rf8yvz8kwm2ggmchykw2q3jjg";
   };
 
   meta = with stdenv.lib; {

From 05e0aa3040e4e94be4ee53dd22d754aaca9da133 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 17 Nov 2020 22:20:48 +0100
Subject: [PATCH 2726/3942] gcc: update to isl 0.20.0 for bootstrapping and
 recent versions (#103311)

---
 pkgs/stdenv/linux/default.nix              | 4 ++--
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +-
 pkgs/top-level/all-packages.nix            | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 6c396b277469..6d6bca870bf9 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -274,9 +274,9 @@ in
       gmp = super.gmp.override { stdenv = self.makeStaticLibraries self.stdenv; };
       mpfr = super.mpfr.override { stdenv = self.makeStaticLibraries self.stdenv; };
       libmpc = super.libmpc.override { stdenv = self.makeStaticLibraries self.stdenv; };
-      isl_0_17 = super.isl_0_17.override { stdenv = self.makeStaticLibraries self.stdenv; };
+      isl_0_20 = super.isl_0_20.override { stdenv = self.makeStaticLibraries self.stdenv; };
       gcc-unwrapped = super.gcc-unwrapped.override {
-        isl = isl_0_17;
+        isl = isl_0_20;
       };
     };
     extraNativeBuildInputs = [ prevStage.patchelf ] ++
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index ec5f1092a469..421bb8502a4c 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -152,7 +152,7 @@ in with pkgs; rec {
         # These needed for cross but not native tools because the stdenv
         # GCC has certain things built in statically. See
         # pkgs/stdenv/linux/default.nix for the details.
-        cp -d ${isl_0_17.out}/lib/libisl*.so* $out/lib
+        cp -d ${isl_0_20.out}/lib/libisl*.so* $out/lib
 
       '' + ''
         cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc6d4868f62a..56dc881d0137 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8934,7 +8934,7 @@ in
         inherit noSysDirs;
         # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
         profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
-        isl = if !stdenv.isDarwin then isl_0_17 else null;
+        isl = if !stdenv.isDarwin then isl_0_20 else null;
 
         # just for stage static
         crossStageStatic = true;
@@ -9027,7 +9027,7 @@ in
     libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
     threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
 
-    isl = if !stdenv.isDarwin then isl_0_17 else null;
+    isl = if !stdenv.isDarwin then isl_0_20 else null;
   }));
 
   gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 {
@@ -9041,7 +9041,7 @@ in
     libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
     threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
 
-    isl = if !stdenv.isDarwin then isl_0_17 else null;
+    isl = if !stdenv.isDarwin then isl_0_20 else null;
   }));
 
   gcc_latest = gcc10;

From 5545c83c17321cdddb02c97cbd3a8cd78ce9fcb7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 17 Nov 2020 21:38:25 +0100
Subject: [PATCH 2727/3942] signal-desktop: 1.37.3 -> 1.38.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 9656db0bd843..f8a3c4b4bf02 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -25,7 +25,7 @@ let
       else "");
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "1.37.3"; # Please backport all updates to the stable channel.
+  version = "1.38.1"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "0gyg67qhrqqn1676m7ki8h9akhn29fh1sxmj0kw5j7dx4cyc4mid";
+    sha256 = "0d146l1s37qxawh1k7yrkv78kxxfzf0yzzzcn1q1v1ndrwrvwhjz";
   };
 
   nativeBuildInputs = [

From 2a0fbf08da06c25eaa5cf985457e0c837f78c091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 17 Nov 2020 19:14:29 +0100
Subject: [PATCH 2728/3942] libmicrodns: Change platforms to `unix`. See
 #104062.

It builds on Darwin as well.
---
 pkgs/development/libraries/libmicrodns/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix
index 0a9c8e69733e..69dd052dc036 100644
--- a/pkgs/development/libraries/libmicrodns/default.nix
+++ b/pkgs/development/libraries/libmicrodns/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "Minimal mDNS resolver library, used by VLC";
     homepage = "https://github.com/videolabs/libmicrodns";
     license = licenses.lgpl21;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.shazow ];
   };
 }

From 54673b1f3b4fef504f9057bd5b8fdc22f714ea6a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 17 Nov 2020 22:35:07 +0100
Subject: [PATCH 2729/3942] chromium: 86.0.4240.198 -> 87.0.4280.66

https://chromereleases.googleblog.com/2020/11/stable-channel-update-for-desktop_17.html

This update includes 33 security fixes.

CVEs:
CVE-2020-16018 CVE-2020-16019 CVE-2020-16020 CVE-2020-16021
CVE-2020-16022 CVE-2020-16015 CVE-2020-16014 CVE-2020-16023
CVE-2020-16024 CVE-2020-16025 CVE-2020-16026 CVE-2020-16027
CVE-2020-16028 CVE-2020-16029 CVE-2020-16030 CVE-2019-8075
CVE-2020-16031 CVE-2020-16032 CVE-2020-16033 CVE-2020-16034
CVE-2020-16035 CVE-2020-16012 CVE-2020-16036

Note: We'll finally build with use_ozone=true on Hydra now :) \o/
---
 .../networking/browsers/chromium/common.nix    |  3 ---
 .../networking/browsers/chromium/default.nix   |  5 ++---
 .../browsers/chromium/upstream-info.json       | 18 +++++++++---------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 92403598a038..7e453d6e0540 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -152,9 +152,6 @@ let
       ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
       ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
       # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
-    ] ++ optionals (useVaapi && versionRange "86" "87") [
-      # Check for enable-accelerated-video-decode on Linux:
-      (githubPatch "54deb9811ca9bd2327def5c05ba6987b8c7a0897" "11jvxjlkzz1hm0pvfyr88j7z3zbwzplyl5idkx92l2lzv4459c8d")
     ];
 
     postPatch = ''
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 0f64b859579d..845a4ac3b61b 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -15,7 +15,7 @@
 , enablePepperFlash ? false
 , enableWideVine ? false
 , enableVaapi ? false # Disabled by default due to unofficial support
-, useOzone ? false
+, useOzone ? true
 , cupsSupport ? true
 , pulseSupport ? config.pulseaudio or stdenv.isLinux
 , commandLineArgs ? ""
@@ -41,8 +41,7 @@ let
           inherit (upstream-info.deps.gn) url rev sha256;
         };
       });
-    } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") {
-      useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/
+      # TODO: Cleanup useOzone and useVaapi in common.nix:
       useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine)
     });
 
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index b88a63f27a4e..1f360191937a 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,21 +1,21 @@
 {
   "stable": {
-    "version": "86.0.4240.198",
-    "sha256": "0i3s1il0x5yi3528gdsg3bhnyhs2x24zh7p1nd5apv3va9g85ax0",
-    "sha256bin64": "0qfhs73r6j0r3nyqbnscnf7h1rs1s68lfl5ndsyd32dmip7ma01x",
+    "version": "87.0.4280.66",
+    "sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19",
+    "sha256bin64": "09hjhxjihhxq5i2wadpa0g72a6iis0igarr8arrcah4122icdr77",
     "deps": {
       "gn": {
-        "version": "2020-08-07",
+        "version": "2020-09-09",
         "url": "https://gn.googlesource.com/gn",
-        "rev": "e327ffdc503815916db2543ec000226a8df45163",
-        "sha256": "0kvlfj3www84zp1vmxh76x8fdjm9hyk8lkh2vdsidafpmm75fphr"
+        "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
+        "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
       }
     }
   },
   "beta": {
-    "version": "87.0.4280.47",
-    "sha256": "0a3c4kz85857wrbcxqknbqmai250d36nq332l66a83r8sidhbxfq",
-    "sha256bin64": "0bjls2airr4p448rx7im1a7gff68yfnfb5vymr4bin4kz0s38mpw",
+    "version": "87.0.4280.66",
+    "sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19",
+    "sha256bin64": "15n01jia8sxv3a7vfbla40rq45x54pyksg0kg14bm0br6m3n65pz",
     "deps": {
       "gn": {
         "version": "2020-09-09",

From ba453a40d5c4e10de113c5ff9094910b1c7d23e0 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 17 Nov 2020 16:58:50 -0500
Subject: [PATCH 2730/3942] yoda: 1.8.3 -> 1.8.4

---
 pkgs/development/libraries/physics/yoda/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index 1a8d5a6fd390..273566adc03f 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "yoda";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
-    sha256 = "12msmjiajvy2xj2m64n2fxblai5xg06a829wi7scsc7nw2jhxpfr";
+    sha256 = "03hm7hax0n5irqi0kzjag6fyr9zws9jqz95hr8afpikwkcfa894x";
   };
 
   nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];

From 69300bba326eff2ab83f3d635191a78149320701 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 12 Nov 2020 15:19:00 -0500
Subject: [PATCH 2731/3942] python3Packages.awkward1: 0.2.38 -> 0.4.4

---
 pkgs/development/python-modules/awkward1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix
index 591035461857..0f2243645e0d 100644
--- a/pkgs/development/python-modules/awkward1/default.nix
+++ b/pkgs/development/python-modules/awkward1/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "awkward1";
-  version = "0.2.38";
+  version = "0.4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f25db4920677029a92e92b994f1056902724b6a947549254c1446bdc6e388671";
+    sha256 = "72b63e25c1c0d85ee4b36b094c7103ef0e40678265eb1e240322ee19fe334368";
   };
 
   nativeBuildInputs = [ cmake ];

From 4e9f7bbf8573d07f7b0c87d97c026cd4aad5a758 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 29 Oct 2020 13:27:20 +1000
Subject: [PATCH 2732/3942] buildGo{Package,Module}: set trimpath in GOFLAGS

Also drop removeReferencesTo

`-trimpath` removes all file system paths from the compiled executable,
this should improve reproducibility.
---
 pkgs/development/go-modules/generic/default.nix  | 14 +++-----------
 pkgs/development/go-packages/generic/default.nix | 13 +++----------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 7180ab7bf967..3714a1f6f0fb 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,4 +1,4 @@
-{ go, cacert, git, lib, removeReferencesTo, stdenv, vend }:
+{ go, cacert, git, lib, stdenv, vend }:
 
 { name ? "${args'.pname}-${args'.version}"
 , src
@@ -43,10 +43,6 @@ with builtins;
 let
   args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "disabled" ];
 
-  removeReferences = [ ] ++ lib.optional (!allowGoReference) go;
-
-  removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
-
   go-modules = if vendorSha256 != null then go.stdenv.mkDerivation (let modArgs = {
 
     name = "${name}-go-modules";
@@ -121,12 +117,12 @@ let
   ) // overrideModAttrs modArgs) else "";
 
   package = go.stdenv.mkDerivation (args // {
-    nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs;
+    nativeBuildInputs = [ go ] ++ nativeBuildInputs;
 
     inherit (go) GOOS GOARCH;
 
     GO111MODULE = "on";
-    GOFLAGS = "-mod=vendor";
+    GOFLAGS = [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ];
 
     configurePhase = args.configurePhase or ''
       runHook preConfigure
@@ -229,10 +225,6 @@ let
       runHook postInstall
     '';
 
-    preFixup = (args.preFixup or "") + ''
-      find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true
-    '';
-
     strictDeps = true;
 
     disallowedReferences = lib.optional (!allowGoReference) go;
diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index 5c54e04652f7..ab8ee9166f98 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/pkgs/development/go-packages/generic/default.nix
@@ -1,5 +1,5 @@
 { go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync
-, removeReferencesTo, fetchFromGitHub, stdenv }:
+, fetchFromGitHub, stdenv }:
 
 { buildInputs ? []
 , nativeBuildInputs ? []
@@ -44,10 +44,6 @@
 with builtins;
 
 let
-  removeReferences = [ ] ++ lib.optional (!allowGoReference) go;
-
-  removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
-
   dep2src = goDep:
     {
       inherit (goDep) goPackagePath;
@@ -78,7 +74,7 @@ let
   package = stdenv.mkDerivation (
     (builtins.removeAttrs args [ "goPackageAliases" "disabled" "extraSrcs"]) // {
 
-    nativeBuildInputs = [ removeReferencesTo go ]
+    nativeBuildInputs = [ go ]
       ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
     buildInputs = buildInputs;
 
@@ -88,6 +84,7 @@ let
     GOHOSTOS = go.GOHOSTOS or null;
 
     GO111MODULE = "off";
+    GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ];
 
     GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
 
@@ -225,10 +222,6 @@ let
       runHook postInstall
     '';
 
-    preFixup = preFixup + ''
-      find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true
-    '';
-
     strictDeps = true;
 
     shellHook = ''

From 33822cb12fc887eb3d56c4dbca4a7009f0a8ad28 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 29 Oct 2020 13:27:20 +1000
Subject: [PATCH 2733/3942] docker: drop redundant removeReferencesTo

---
 pkgs/applications/virtualization/docker/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 4d6f53ceb5db..dad5b43e5b05 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage
-, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig
+, makeWrapper, installShellFiles, pkgconfig
 , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
 , sqlite, iproute, lvm2, systemd
 , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git
@@ -94,7 +94,7 @@ rec {
 
     goPackagePath = "github.com/docker/docker-ce";
 
-    nativeBuildInputs = [ pkgconfig go-md2man go libtool removeReferencesTo installShellFiles ];
+    nativeBuildInputs = [ pkgconfig go-md2man go libtool installShellFiles ];
     buildInputs = [
       makeWrapper
     ] ++ optionals (stdenv.isLinux) [
@@ -184,12 +184,6 @@ rec {
       installManPage man/*/*.[1-9]
     '';
 
-    preFixup = ''
-      find $out -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' +
-    '' + optionalString (stdenv.isLinux) ''
-      find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' +
-    '';
-
     meta = {
       homepage = "https://www.docker.com/";
       description = "An open source project to pack, ship and run any application as a lightweight container";

From 90bb6fbb24321c6e82967714f62bcf9ce7d49a65 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 29 Oct 2020 13:27:20 +1000
Subject: [PATCH 2734/3942] singularity: drop unneeded removeReferencesTo

---
 pkgs/applications/virtualization/singularity/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index a6d6cf76041d..8d04b871e49b 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -1,5 +1,4 @@
 {stdenv
-, removeReferencesTo
 , lib
 , fetchurl
 , utillinux
@@ -28,7 +27,7 @@ buildGoPackage rec {
   goPackagePath = "github.com/sylabs/singularity";
 
   buildInputs = [ gpgme openssl libuuid ];
-  nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper cryptsetup ];
+  nativeBuildInputs = [ utillinux which makeWrapper cryptsetup ];
   propagatedBuildInputs = [ coreutils squashfsTools ];
 
   postPatch = ''

From d1884cbadf4babd58c4844b8a8d9ce3ae149a2d5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 29 Oct 2020 13:27:21 +1000
Subject: [PATCH 2735/3942] minio: drop redundant trimpath flag

---
 pkgs/servers/minio/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 4a14dca660b3..c333450aace7 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -29,7 +29,6 @@ buildGoModule rec {
 
   buildFlagsArray = [
     "-tags=kqueue"
-    "-trimpath"
   ];
 
   passthru.tests.minio = nixosTests.minio;

From 11c19be426d82b5fc2f9ce27210f87955abf0efd Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 30 Oct 2020 07:42:14 +1000
Subject: [PATCH 2736/3942] direnv: workaround hardcoded GOFLAGS

---
 pkgs/tools/misc/direnv/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index f0c7aefc69ab..a659c576d8fb 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -18,6 +18,11 @@ buildGoModule rec {
     stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows)
     "${bash}/bin/bash";
 
+  # fix hardcoded GOFLAGS in makefile. remove once https://github.com/direnv/direnv/issues/718 is closed.
+  postPatch = ''
+    substituteInPlace GNUmakefile --replace "export GOFLAGS=-mod=vendor" ""
+  '';
+
   # replace the build phase to use the GNUMakefile instead
   buildPhase = ''
     make BASH_PATH=$BASH_PATH

From 702c242558200447ce3d34ed256eac3741f4fd98 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 2 Nov 2020 15:24:25 +1000
Subject: [PATCH 2737/3942] quorum: workaround trimpath build failure

---
 pkgs/applications/blockchains/quorum.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix
index 5a525dec9995..eb98777c587d 100644
--- a/pkgs/applications/blockchains/quorum.nix
+++ b/pkgs/applications/blockchains/quorum.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoPackage, git, which }:
+{ stdenv, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }:
 
 buildGoPackage rec {
   pname = "quorum";
@@ -25,6 +25,12 @@ buildGoPackage rec {
     cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin
   '';
 
+  # fails with `GOFLAGS=-trimpath`
+  allowGoReference = true;
+  preFixup = ''
+    find $out -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${go} '{}' +
+  '';
+
   meta = with stdenv.lib; {
     description = "A permissioned implementation of Ethereum supporting data privacy";
     homepage = "https://www.goquorum.com/";

From 87aa3671e803f32617e899980c72dd7bc308cd1e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 2 Nov 2020 15:24:25 +1000
Subject: [PATCH 2738/3942] cockroachdb: workaround trimpath build failure

---
 pkgs/servers/sql/cockroachdb/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 1822cf58a743..ee156e37173a 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -2,6 +2,7 @@
 , cmake, xz, which, autoconf
 , ncurses6, libedit, libunwind
 , installShellFiles
+, removeReferencesTo, go
 }:
 
 let
@@ -53,6 +54,12 @@ buildGoPackage rec {
 
   outputs = [ "out" "man" ];
 
+  # fails with `GOFLAGS=-trimpath`
+  allowGoReference = true;
+  preFixup = ''
+    find $out -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${go} '{}' +
+  '';
+
   meta = with stdenv.lib; {
     homepage    = "https://www.cockroachlabs.com";
     description = "A scalable, survivable, strongly-consistent SQL database";

From 1e97f1d45528e722d89d2e8ea249db08d762d370 Mon Sep 17 00:00:00 2001
From: Michael Raitza <git@spacefrogg.net>
Date: Tue, 17 Nov 2020 23:32:21 +0100
Subject: [PATCH 2739/3942] openafs_1_9: init at 1.9.0

---
 pkgs/servers/openafs/1.9/bosserver.patch   |  30 +++
 pkgs/servers/openafs/1.9/cross-build.patch | 223 +++++++++++++++++++++
 pkgs/servers/openafs/1.9/default.nix       | 105 ++++++++++
 pkgs/servers/openafs/1.9/module.nix        |  64 ++++++
 pkgs/servers/openafs/1.9/srcs.nix          |  14 ++
 pkgs/servers/openafs/1.9/tsmbac.patch      |  62 ++++++
 pkgs/top-level/all-packages.nix            |   2 +
 7 files changed, 500 insertions(+)
 create mode 100644 pkgs/servers/openafs/1.9/bosserver.patch
 create mode 100644 pkgs/servers/openafs/1.9/cross-build.patch
 create mode 100644 pkgs/servers/openafs/1.9/default.nix
 create mode 100644 pkgs/servers/openafs/1.9/module.nix
 create mode 100644 pkgs/servers/openafs/1.9/srcs.nix
 create mode 100644 pkgs/servers/openafs/1.9/tsmbac.patch

diff --git a/pkgs/servers/openafs/1.9/bosserver.patch b/pkgs/servers/openafs/1.9/bosserver.patch
new file mode 100644
index 000000000000..094d9871f64f
--- /dev/null
+++ b/pkgs/servers/openafs/1.9/bosserver.patch
@@ -0,0 +1,30 @@
+diff -u openafs-1.8.0/src/bozo/bosserver.c /tmp/buffer-content-13110-gd
+--- openafs-1.8.0/src/bozo/bosserver.c
++++ #<buffer bosserver.c>
+@@ -244,24 +244,6 @@
+ static int
+ CreateDirs(const char *coredir)
+ {
+-    if ((!strncmp
+-	 (AFSDIR_USR_DIRPATH, AFSDIR_CLIENT_ETC_DIRPATH,
+-	  strlen(AFSDIR_USR_DIRPATH)))
+-	||
+-	(!strncmp
+-	 (AFSDIR_USR_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH,
+-	  strlen(AFSDIR_USR_DIRPATH)))) {
+-	if (MakeDir(AFSDIR_USR_DIRPATH))
+-	    return errno;
+-    }
+-    if (!strncmp
+-	(AFSDIR_SERVER_AFS_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH,
+-	 strlen(AFSDIR_SERVER_AFS_DIRPATH))) {
+-	if (MakeDir(AFSDIR_SERVER_AFS_DIRPATH))
+-	    return errno;
+-    }
+-    if (MakeDir(AFSDIR_SERVER_BIN_DIRPATH))
+-	return errno;
+     if (MakeDir(AFSDIR_SERVER_ETC_DIRPATH))
+ 	return errno;
+     if (MakeDir(AFSDIR_SERVER_LOCAL_DIRPATH))
+
+Diff finished.  Fri Jun 29 15:45:46 2018
diff --git a/pkgs/servers/openafs/1.9/cross-build.patch b/pkgs/servers/openafs/1.9/cross-build.patch
new file mode 100644
index 000000000000..62254164a1b1
--- /dev/null
+++ b/pkgs/servers/openafs/1.9/cross-build.patch
@@ -0,0 +1,223 @@
+diff -Nur --unidirectional-new-file openafs-1.8.2/configure.ac openafs-1.8.2.new/configure.ac
+--- openafs-1.8.2/configure.ac	2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/configure.ac	2018-10-16 15:56:36.512277860 +0200
+@@ -23,6 +23,7 @@
+ AFS_LT_INIT
+ 
+ AC_PROG_CC
++AX_PROG_CC_FOR_BUILD
+ 
+ AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])
+ AC_SUBST([PATH_CPP])
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4
+--- openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4	1970-01-01 01:00:00.000000000 +0100
++++ openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4	2018-10-16 16:20:40.278641658 +0200
+@@ -0,0 +1,125 @@
++# ===========================================================================
++#   https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_PROG_CC_FOR_BUILD
++#
++# DESCRIPTION
++#
++#   This macro searches for a C compiler that generates native executables,
++#   that is a C compiler that surely is not a cross-compiler. This can be
++#   useful if you have to generate source code at compile-time like for
++#   example GCC does.
++#
++#   The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
++#   needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
++#   The value of these variables can be overridden by the user by specifying
++#   a compiler with an environment variable (like you do for standard CC).
++#
++#   It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
++#   file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
++#   the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
++#   substituted in the Makefile.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 9
++
++AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
++AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_CPP])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++
++dnl Use the standard macros, but make them use other variable names
++dnl
++pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
++pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
++pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
++pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
++pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
++pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
++pushdef([ac_cv_objext], ac_cv_build_objext)dnl
++pushdef([ac_exeext], ac_build_exeext)dnl
++pushdef([ac_objext], ac_build_objext)dnl
++pushdef([CC], CC_FOR_BUILD)dnl
++pushdef([CPP], CPP_FOR_BUILD)dnl
++pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
++pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
++pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
++pushdef([host], build)dnl
++pushdef([host_alias], build_alias)dnl
++pushdef([host_cpu], build_cpu)dnl
++pushdef([host_vendor], build_vendor)dnl
++pushdef([host_os], build_os)dnl
++pushdef([ac_cv_host], ac_cv_build)dnl
++pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
++pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
++pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
++pushdef([ac_cv_host_os], ac_cv_build_os)dnl
++pushdef([ac_cpp], ac_build_cpp)dnl
++pushdef([ac_compile], ac_build_compile)dnl
++pushdef([ac_link], ac_build_link)dnl
++
++save_cross_compiling=$cross_compiling
++save_ac_tool_prefix=$ac_tool_prefix
++cross_compiling=no
++ac_tool_prefix=
++
++AC_PROG_CC
++AC_PROG_CPP
++AC_EXEEXT
++
++ac_tool_prefix=$save_ac_tool_prefix
++cross_compiling=$save_cross_compiling
++
++dnl Restore the old definitions
++dnl
++popdef([ac_link])dnl
++popdef([ac_compile])dnl
++popdef([ac_cpp])dnl
++popdef([ac_cv_host_os])dnl
++popdef([ac_cv_host_vendor])dnl
++popdef([ac_cv_host_cpu])dnl
++popdef([ac_cv_host_alias])dnl
++popdef([ac_cv_host])dnl
++popdef([host_os])dnl
++popdef([host_vendor])dnl
++popdef([host_cpu])dnl
++popdef([host_alias])dnl
++popdef([host])dnl
++popdef([LDFLAGS])dnl
++popdef([CPPFLAGS])dnl
++popdef([CFLAGS])dnl
++popdef([CPP])dnl
++popdef([CC])dnl
++popdef([ac_objext])dnl
++popdef([ac_exeext])dnl
++popdef([ac_cv_objext])dnl
++popdef([ac_cv_exeext])dnl
++popdef([ac_cv_prog_cc_g])dnl
++popdef([ac_cv_prog_cc_cross])dnl
++popdef([ac_cv_prog_cc_works])dnl
++popdef([ac_cv_prog_gcc])dnl
++popdef([ac_cv_prog_CPP])dnl
++
++dnl Finally, set Makefile variables
++dnl
++BUILD_EXEEXT=$ac_build_exeext
++BUILD_OBJEXT=$ac_build_objext
++AC_SUBST(BUILD_EXEEXT)dnl
++AC_SUBST(BUILD_OBJEXT)dnl
++AC_SUBST([CFLAGS_FOR_BUILD])dnl
++AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
++AC_SUBST([LDFLAGS_FOR_BUILD])dnl
++])
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/comerr/Makefile.in openafs-1.8.2.new/src/comerr/Makefile.in
+--- openafs-1.8.2/src/comerr/Makefile.in	2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/src/comerr/Makefile.in	2018-10-16 15:48:19.678898925 +0200
+@@ -38,11 +38,14 @@
+ compile_et:	compile_et.o error_table.o
+ 	$(Q)case $(SYS_NAME) in \
+ 	*_linux* | *_umlinux* | *_darwin* ) \
+-	$(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr $(buildtool_roken) $(MT_LIBS);; \
++	$(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build $(buildtool_roken) $(MT_LIBS);; \
+ 	* ) \
+-	$(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll $(buildtool_roken) $(MT_LIBS);; \
++	$(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build -ll $(buildtool_roken) $(MT_LIBS);; \
+ 	esac
+ 
++compile_et compile_et.o error_table.o: CC=$(CC_FOR_BUILD)
++compile_et compile_et.o error_table.o: LD=$(CC_FOR_BUILD)
++
+ libafscom_err.a: $(LT_objs)
+ 	$(LT_LDLIB_lwp) $(LT_objs)
+ 
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/config/Makefile.in openafs-1.8.2.new/src/config/Makefile.in
+--- openafs-1.8.2/src/config/Makefile.in	2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/src/config/Makefile.in	2018-10-16 15:48:19.677898926 +0200
+@@ -54,6 +54,8 @@
+ 
+ config.o: config.c AFS_component_version_number.c
+ 
++config mkvers config.o mc.o: CC=$(CC_FOR_BUILD)
++
+ #
+ # Include installation targets
+ #
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/opr/Makefile.in openafs-1.8.2.new/src/opr/Makefile.in
+--- openafs-1.8.2/src/opr/Makefile.in	2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/src/opr/Makefile.in	2018-10-16 15:48:19.678898925 +0200
+@@ -21,7 +21,7 @@
+ 	  $(TOP_INCDIR)/opr/time.h \
+ 	  $(TOP_INCDIR)/opr/uuid.h
+ 
+-all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a
++all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a $(TOP_LIBDIR)/libopr_build.a
+ 
+ liboafs_opr.la: liboafs_opr.la.sym $(LT_objs) $(LT_deps)
+ 	$(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
+@@ -29,12 +29,26 @@
+ libopr.a: $(LT_objs)
+ 	$(LT_LDLIB_static) $(LT_objs)
+ 
++LT_objs_build = $(patsubst %.lo, %_build.lo, $(LT_objs))
++
++%_build.lo: %.c
++	$(LT_CCRULE) $<
++
++libopr_build.a: $(LT_objs_build)
++	$(LT_LDLIB_static) $(LT_objs_build)
++
++libopr_build.a $(LT_objs_build): CC=$(CC_FOR_BUILD)
++libopr_build.a $(LT_objs_build): LD=$(CC_FOR_BUILD)
++
+ libopr_pic.la: $(LT_objs)
+ 	$(LT_LDLIB_pic) $(LT_objs)
+ 
+ $(TOP_LIBDIR)/libopr.a: libopr.a
+ 	$(INSTALL_DATA) libopr.a $@
+ 
++$(TOP_LIBDIR)/libopr_build.a: libopr_build.a
++	$(INSTALL_DATA) libopr_build.a $@
++
+ $(TOP_LIBDIR)/libopr_pic.a: libopr_pic.la
+ 	$(INSTALL_DATA) .libs/libopr_pic.a $@
+ 
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/rxgen/Makefile.in openafs-1.8.2.new/src/rxgen/Makefile.in
+--- openafs-1.8.2/src/rxgen/Makefile.in	2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/src/rxgen/Makefile.in	2018-10-16 15:48:19.677898926 +0200
+@@ -25,6 +25,8 @@
+ 
+ CFLAGS_rpc_main.o= -DPATH_CPP="\"$(PATH_CPP)\""
+ 
++rxgen $(OBJS): CC=$(CC_FOR_BUILD)
++
+ #
+ # Install targets
+ #
diff --git a/pkgs/servers/openafs/1.9/default.nix b/pkgs/servers/openafs/1.9/default.nix
new file mode 100644
index 000000000000..c26f8d3a23c5
--- /dev/null
+++ b/pkgs/servers/openafs/1.9/default.nix
@@ -0,0 +1,105 @@
+{ stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
+, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file
+, docbook_xml_dtd_43, libtool_2
+, withDevdoc ? false, doxygen, dblatex # Extra developer documentation
+, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
+, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
+}:
+
+with (import ./srcs.nix { inherit fetchurl; });
+let
+  inherit (stdenv.lib) optional optionalString optionals;
+
+in stdenv.mkDerivation {
+  pname = "openafs";
+  inherit version srcs;
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
+    which yacc ] ++ optionals withDevdoc [ doxygen dblatex ];
+
+  buildInputs = [ kerberos ncurses ];
+
+  patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
+
+  outputs = [ "out" "dev" "man" "doc" ] ++ optional withDevdoc "devdoc";
+
+  enableParallelBuilding = false;
+
+  setOutputFlags = false;
+
+  # Makefiles don't include install targets for all new shared libs, yet.
+  dontDisableStatic = true;
+
+  preConfigure = ''
+    patchShebangs .
+    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
+      echo "Patch /usr/include and /usr/src in $i"
+      substituteInPlace $i \
+        --replace "/usr/include" "${glibc.dev}/include" \
+        --replace "/usr/src" "$TMP"
+    done
+
+    for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do
+      substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+        "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
+    done
+
+    ./regen.sh
+
+
+    configureFlagsArray=(
+      "--with-gssapi"
+      "--sysconfdir=/etc"
+      "--localstatedir=/var"
+      "--disable-kernel-module"
+      "--disable-fuse-client"
+      "--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl"
+      ${optionalString (tsmbac != null) "--enable-tivoli-tsm"}
+      ${optionalString (ncurses == null) "--disable-gtx"}
+      "--disable-linux-d_splice-alias-extra-iput"
+    )
+  '' + optionalString (tsmbac != null) ''
+    export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
+    export XBSA_XLIBS="-ldl"
+  '';
+
+  buildFlags = [ "all_nolibafs" ];
+
+  postBuild = ''
+    for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
+      make -C "''${d}" index.html
+    done
+  '' + optionalString withDevdoc ''
+    make dox
+  '';
+
+  postInstall = ''
+    mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide}
+    cp -r doc/txt README LICENSE $doc/share/doc/openafs
+    for d in AdminGuide QuickStartUnix UserGuide ; do
+      cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}"
+    done
+
+    rm -r $out/lib/openafs
+  '' + optionalString withDevdoc ''
+    mkdir -p $devdoc/share/devhelp/openafs/doxygen
+    cp -r doc/{pdf,protocol} $devdoc/share/devhelp/openafs
+    cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen
+  '';
+
+  # Avoid references to $TMPDIR by removing it and let patchelf cleanup the
+  # binaries.
+  preFixup = ''
+    rm -rf "$(pwd)" && mkdir "$(pwd)"
+  '';
+
+  meta = with stdenv.lib; {
+    outputsToInstall = [ "out" "doc" "man" ];
+    description = "Open AFS client";
+    homepage = "https://www.openafs.org";
+    license = licenses.ipl10;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
+  };
+}
diff --git a/pkgs/servers/openafs/1.9/module.nix b/pkgs/servers/openafs/1.9/module.nix
new file mode 100644
index 000000000000..547134726221
--- /dev/null
+++ b/pkgs/servers/openafs/1.9/module.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
+, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }:
+
+with (import ./srcs.nix {
+  inherit fetchurl;
+});
+
+let
+  modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
+  kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+
+in stdenv.mkDerivation {
+  name = "openafs-${version}-${kernel.modDirVersion}";
+  inherit version src;
+
+  nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
+    ++ kernel.moduleBuildDependencies;
+
+  buildInputs = [ kerberos ];
+
+  patches = [];
+
+  hardeningDisable = [ "pic" ];
+
+  configureFlags = [
+    "--with-linux-kernel-build=${kernelBuildDir}"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-gssapi"
+    "--disable-linux-d_splice-alias-extra-iput"
+  ];
+
+  preConfigure = ''
+    patchShebangs .
+    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
+      echo "Patch /usr/include and /usr/src in $i"
+      substituteInPlace $i \
+        --replace "/usr/include" "${glibc.dev}/include" \
+        --replace "/usr/src" "${kernelBuildDir}"
+    done
+
+    ./regen.sh -q
+  '';
+
+  buildPhase = ''
+    make V=1 only_libafs
+  '';
+
+  installPhase = ''
+    mkdir -p ${modDestDir}
+    cp src/libafs/MODLOAD-*/libafs-${kernel.modDirVersion}.* ${modDestDir}/libafs.ko
+    xz -f ${modDestDir}/libafs.ko
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open AFS client kernel module";
+    homepage = "https://www.openafs.org";
+    license = licenses.ipl10;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
+    broken = versionOlder kernel.version "3.18" || kernel.isHardened;
+  };
+
+}
diff --git a/pkgs/servers/openafs/1.9/srcs.nix b/pkgs/servers/openafs/1.9/srcs.nix
new file mode 100644
index 000000000000..8c5f63cac111
--- /dev/null
+++ b/pkgs/servers/openafs/1.9/srcs.nix
@@ -0,0 +1,14 @@
+{ fetchurl }:
+rec {
+  version = "1.9.0";
+  src = fetchurl {
+    url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
+    sha256 = "1jw99zwisq25l0smdm8f0gfwhynk532s2ch44blrvxyd7all8kcd";
+  };
+
+  srcs = [ src
+    (fetchurl {
+      url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
+      sha256 = "03x1pv8l4bv2fdns1l4sfy200nggy0a4b1f7qd0mnggdaj12c4jp";
+    })];
+}
diff --git a/pkgs/servers/openafs/1.9/tsmbac.patch b/pkgs/servers/openafs/1.9/tsmbac.patch
new file mode 100644
index 000000000000..f68c777b6f09
--- /dev/null
+++ b/pkgs/servers/openafs/1.9/tsmbac.patch
@@ -0,0 +1,62 @@
+diff -ru openafs-1.8.0/src/butc/afsxbsa.c openafs-1.8.0.new/src/butc/afsxbsa.c
+--- openafs-1.8.0/src/butc/afsxbsa.c	2018-04-06 03:21:12.000000000 +0200
++++ openafs-1.8.0.new/src/butc/afsxbsa.c	2018-06-12 16:26:26.272522305 +0200
+@@ -651,7 +651,7 @@
+ #if defined(AFS_AIX_ENV)
+         dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER);
+ #elif defined (AFS_AMD64_LINUX26_ENV)
+-	dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL);
++	dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL);
+ #elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV)
+         dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL);
+ #else
+diff -ru openafs-1.8.0/src/cf/tivoli.m4 openafs-1.8.0.new/src/cf/tivoli.m4
+--- openafs-1.8.0/src/cf/tivoli.m4	2018-04-06 03:21:12.000000000 +0200
++++ openafs-1.8.0.new/src/cf/tivoli.m4	2018-06-12 16:26:26.072522485 +0200
+@@ -1,45 +1,7 @@
+ AC_DEFUN([OPENAFS_TIVOLI_TESTS],[
+ dnl check for tivoli
+ AC_MSG_CHECKING(for tivoli tsm butc support)
+-XBSA_CFLAGS=""
+-if test "$enable_tivoli_tsm" = "yes"; then
+-        XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen
+-        XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen
+-        XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample
+-        XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample
+-        XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample
+-        XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample
+-
+-        if test -r "$XBSADIR3/dsmapifp.h"; then
+-                XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3"
+-                XBSA_XLIBS="-ldl"
+-                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-        elif test -r "$XBSADIR4/dsmapifp.h"; then
+-                XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4"
+-                XBSA_XLIBS="-ldl"
+-                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-        elif test -r "$XBSADIR5/dsmapifp.h"; then
+-                XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5"
+-                XBSA_XLIBS="-ldl"
+-                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-        elif test -r "$XBSADIR6/dsmapifp.h"; then
+-                XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6"
+-                XBSA_XLIBS="-ldl"
+-                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-        elif test -r "$XBSADIR1/xbsa.h"; then
+-                XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
+-                XBSA_XLIBS=""
+-                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-        elif test -r "$XBSADIR2/xbsa.h"; then
+-                XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
+-                XBSA_XLIBS=""
+-                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+-        else
+-                AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files])
+-        fi
+-else
+-        AC_MSG_RESULT([no])
+-fi
++AC_MSG_RESULT([yes])
+ AC_SUBST(XBSA_CFLAGS)
+ AC_SUBST(XBSA_XLIBS)
+ XLIBS="$XBSA_XLIBS $XLIBS"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c3908f6537a..ca92d87413bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17025,6 +17025,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
   openbgpd = callPackage ../servers/openbgpd { };
 
   openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; };
+  openafs_1_9 = callPackage ../servers/openafs/1.9 { tsmbac = null; ncurses = null; };
   # Current stable release; don't backport release updates!
   openafs = openafs_1_8;
 
@@ -18280,6 +18281,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
     rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { };
 
     openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
+    openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { };
     # Current stable release; don't backport release updates!
     openafs = openafs_1_8;
 

From 68e06c19d6f6633db6cd2d519dd0d9d7f97e84f7 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 17 Nov 2020 17:37:35 -0500
Subject: [PATCH 2740/3942] snakemake: 5.19.3 -> 5.28.0

---
 pkgs/applications/science/misc/snakemake/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix
index 2b7532a93454..a03f7682a51c 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@@ -2,7 +2,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
-  version = "5.19.3";
+  version = "5.28.0";
 
   propagatedBuildInputs = with python3Packages; [
     appdirs
@@ -13,6 +13,7 @@ python3Packages.buildPythonApplication rec {
     jsonschema
     nbformat
     psutil
+    pulp
     pyyaml
     ratelimiter
     requests
@@ -22,7 +23,7 @@ python3Packages.buildPythonApplication rec {
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "b83f3ef73e25dafcb39b3565030e33fa2f7e80ed70256c535dc7e58ea762305d";
+    sha256 = "2367ce91baf7f8fa7738d33aff9670ffdf5410bbac49aeb209f73b45a3425046";
   };
 
   doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json

From 283900f4d2125f891bf99672a81bf5bd8fc419ef Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 15 Nov 2020 17:35:43 -0800
Subject: [PATCH 2741/3942] python3Packages.xmlschema: 1.2.5 -> 1.3.1

---
 pkgs/development/python-modules/xmlschema/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
index d06bbd409b5c..55b45fb51714 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -5,14 +5,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.2.5";
+  version = "1.3.1";
   pname = "xmlschema";
 
   src = fetchFromGitHub {
     owner = "sissaschool";
     repo = "xmlschema";
     rev = "v${version}";
-    sha256 = "0rsa75x86gdjalvy4riq7613szb616hff80crx006chyppzdkxmq";
+    sha256 = "08p6fm15600h40r5h7f3gfv34cys481f89pf57dv3y8gf6y2if56";
   };
 
   propagatedBuildInputs = [ elementpath ];

From 9ca12dc4c7ba8c738150f73640514c2824662c9f Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Thu, 12 Nov 2020 16:23:53 +0100
Subject: [PATCH 2742/3942] python3Packages.reedsolo: init at 1.5.4

reedsolo: maintain, add tests, fix cython

reedsolo: Apply suggestions from code review

Co-authored-by: Jonathan Ringer <jonringer@users.noreply.github.com>
---
 .../python-modules/reedsolo/default.nix       | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/reedsolo/default.nix

diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix
new file mode 100644
index 000000000000..2a22907ebe6c
--- /dev/null
+++ b/pkgs/development/python-modules/reedsolo/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, cython, nose }:
+
+buildPythonPackage rec {
+  pname = "reedsolo";
+  version = "1.5.4";
+
+  # Pypi does not have the tests
+  src = fetchFromGitHub {
+    owner = "tomerfiliba";
+    repo = "reedsolomon";
+    # https://github.com/tomerfiliba/reedsolomon/issues/28
+    rev = "73926cdf81b39009bd6e46c8d49f3bbc0eaad4e4";
+    sha256 = "03wrr0c32dsl7h9k794b8fwnyzklvmxgriy49mjvvd3val829cc1";
+  };
+
+  nativeBuildInputs = [ cython ];
+
+  checkInputs = [ nose ];
+  checkPhase = "nosetests";
+
+  meta = with stdenv.lib; {
+    description = "Pure-python universal errors-and-erasures Reed-Solomon Codec";
+    homepage = "https://github.com/tomerfiliba/reedsolomon";
+    license = licenses.publicDomain;
+    maintainers = with maintainers; [ yorickvp ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e1e3618eb81..ae79ca29f696 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6185,6 +6185,8 @@ in {
 
   rednose = callPackage ../development/python-modules/rednose { };
 
+  reedsolo = callPackage ../development/python-modules/reedsolo { };
+
   regex = callPackage ../development/python-modules/regex { };
 
   regional = callPackage ../development/python-modules/regional { };

From c05b2e7eea2501cc298fed3c1291fb835ca7f209 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 02:04:29 +0100
Subject: [PATCH 2743/3942] gns3-server: relax aiohttp pin

---
 pkgs/applications/networking/gns3/server.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index bbf3f0514c45..ad346104f969 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -35,7 +35,9 @@ in python.pkgs.buildPythonPackage {
 
   postPatch = ''
     # yarl 1.4+ only requires Python 3.6+
-    sed -iE "s/yarl==1.3.0//" requirements.txt
+    substituteInPlace requirements.txt \
+      --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \
+      --replace "yarl==1.3.0" ""
   '';
 
   propagatedBuildInputs = with python.pkgs; [

From 0b087b19d6011b4e337cf6737694d70e11a9a9ca Mon Sep 17 00:00:00 2001
From: Simonas Kazlauskas <git@kazlauskas.me>
Date: Wed, 18 Nov 2020 03:15:15 +0200
Subject: [PATCH 2744/3942] tracy: 0.7.3 -> 0.7.4

---
 pkgs/development/tools/tracy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix
index 5839a7771d0f..4efef71f6ad0 100644
--- a/pkgs/development/tools/tracy/default.nix
+++ b/pkgs/development/tools/tracy/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tracy";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "wolfpld";
     repo = "tracy";
     rev = "v${version}";
-    sha256 = "06xznk7nslw9km7hia2pfb5filjqalgx6cah48skxnah148svq2y";
+    sha256 = "0s39kimpc03x48kh7lyhblfs8y4mdzcz3g7f806h90x7zndsmfxj";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 52d3cc44385384a64ed39af7bdb13a5620e07568 Mon Sep 17 00:00:00 2001
From: Aaron Janse <aaron@ajanse.me>
Date: Tue, 17 Nov 2020 15:03:53 -0800
Subject: [PATCH 2745/3942] tomb: 2.7 -> 2.8

---
 pkgs/os-specific/linux/tomb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index 150c64a04514..ccf341e212fe 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tomb";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchFromGitHub {
     owner  = "dyne";
     repo   = "Tomb";
     rev    = "v${version}";
-    sha256 = "1vzkpzci6cp1r1q2n34pcgcns78i726k8d89dd6pibyj0vfnkl57";
+    sha256 = "sha256-bmkUwj0FFq51MUPbNK7xsyyq4swjZcwFeMwOO3fXCzA=";
   };
 
   buildInputs = [ sudo zsh pinentry ];

From 832add5165aa9326cd24ec9f0bae92c6e5f4ecc1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 03:36:01 +0100
Subject: [PATCH 2746/3942] python3Packages.csvw: 1.8.0 -> 1.8.1

---
 pkgs/development/python-modules/csvw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix
index 76f7cb73b4c4..70e817dc2991 100644
--- a/pkgs/development/python-modules/csvw/default.nix
+++ b/pkgs/development/python-modules/csvw/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "csvw";
-  version = "1.8.0";
+  version = "1.8.1";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "cldf";
     repo = "csvw";
     rev = "v${version}";
-    sha256 = "0maxrsiv9i9hkg627hwqyq8g6jg3g8iv8gdqaxz4aysjd9xddydd";
+    sha256 = "1cafwgkspkc299shsa5x8wfzkx1d63p9rvslj9jwr68fipd1830w";
   };
 
   patchPhase = ''

From ed6d6ebca78afabc76f143ac1ab027eff7ca93bb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 03:41:12 +0100
Subject: [PATCH 2747/3942] python3Packages.mocket: 3.9.2 -> 3.9.3

---
 pkgs/development/python-modules/mocket/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index ab9be69e58eb..9adf675a9feb 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -9,17 +9,16 @@
 
 buildPythonPackage rec {
   pname = "mocket";
-  version = "3.9.2";
+  version = "3.9.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "25aba0b343784b27b1d77e731ed868a728d5209911f9f4728f33088582e491c9";
+    sha256 = "15npwf0f8g5vmwpmyvmsyi4p9ia1w95z8jips0nkfs978pnjy69g";
   };
 
   patchPhase = ''
-    substituteInPlace requirements.txt \
-      --replace "python-magic==0.4.18" "python-magic" \
-      --replace "urllib3==1.25.10" "urllib3"
+    sed -iE "s,python-magic==.*,python-magic," requirements.txt
+    sed -iE "s,urllib3==.*,urllib3," requirements.txt
     substituteInPlace setup.py --replace 'setup_requires=["pipenv"]' "setup_requires=[]"
   '';
 

From 5c4a4a5d6fc9320ac47d7d7c8501ea27a2960c78 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 03:43:43 +0100
Subject: [PATCH 2748/3942] python3Packages.async_stagger: 0.3.0 -> 0.3.1

---
 .../python-modules/async_stagger/default.nix        | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/async_stagger/default.nix b/pkgs/development/python-modules/async_stagger/default.nix
index 034a8329b121..bb57a7f1ecf3 100644
--- a/pkgs/development/python-modules/async_stagger/default.nix
+++ b/pkgs/development/python-modules/async_stagger/default.nix
@@ -10,23 +10,14 @@
 
 buildPythonPackage rec {
   pname = "async_stagger";
-  version = "0.3.0";
+  version = "0.3.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "007l54fbk2dfzv3vmqz98m1i37mzxkkva5r4fiwq2pg8nb61fy0w";
+    sha256 = "1mj3daaqxjdavbxcjrdwx5ky9maa2blbv53aa6d7w9zxkrz3b7xa";
   };
 
-  patches = [
-    (fetchpatch {
-      # Fix test failures on Python 3.8
-      # https://github.com/twisteroidambassador/async_stagger/issues/4
-      url = "https://github.com/twisteroidambassador/async_stagger/commit/736ab20ff9c172628d911f1e6f72420399ec9631.patch";
-      sha256 = "1ygqd9n56sj83lvgmv6nrx3m0sp3646s5k7z697qx43xslixj731";
-    })
-  ];
-
   checkInputs = [
     pytestCheckHook
     pytest-asyncio

From 46463b7d470b232b0139fe5ff0112f2e871d6ad9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 03:47:28 +0100
Subject: [PATCH 2749/3942] python3Packages.async-upnp-client: 0.14.14 ->
 0.14.15

---
 .../python-modules/async-upnp-client/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix
index b1ed1c45f85a..6697cb5d13e8 100644
--- a/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -1,17 +1,17 @@
 { lib, buildPythonPackage, fetchFromGitHub, pythonOlder
 , voluptuous, aiohttp, async-timeout, python-didl-lite, defusedxml
-, pytest, pytest-asyncio }:
+, pytest_6, pytest-asyncio }:
 
 buildPythonPackage rec {
   pname = "async-upnp-client";
-  version = "0.14.14";
+  version = "0.14.15";
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "StevenLooman";
     repo = "async_upnp_client";
     rev = version;
-    sha256 = "1ysj72l4z78h427ar95x7af0jw0xq1cbca0k8b34vqyyhgs8wc6y";
+    sha256 = "1mr65msdc51wq7326z3q41x79yi9dsmcjrmyzkgj9h9vgpxdk2nw";
   };
 
   propagatedBuildInputs = [
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    pytest
+    pytest_6
     pytest-asyncio
   ];
 

From 77e9b46697db899476a205906a64c568019ff4ab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 03:48:53 +0100
Subject: [PATCH 2750/3942] python3Packages.brother: 0.1.17 -> 0.1.18

---
 pkgs/development/python-modules/brother/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix
index e79ee03241dc..394021ff2b21 100644
--- a/pkgs/development/python-modules/brother/default.nix
+++ b/pkgs/development/python-modules/brother/default.nix
@@ -4,14 +4,14 @@
 
 buildPythonPackage rec {
   pname = "brother";
-  version = "0.1.17";
+  version = "0.1.18";
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = pname;
     rev = version;
-    sha256 = "03gjcpbq8rwnjzplgwhwr8wb7a1zh940dr6iwnq9srklqzzj691m";
+    sha256 = "14fiwhgcgymgqsl9kcfb0597rcjxvdknhwbakpdf0xp2ph6cj266";
   };
 
   propagatedBuildInputs = [

From 204501b9cfd50eee9616e14319f34e710aff33ef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 03:50:00 +0100
Subject: [PATCH 2751/3942] python3Packages.clldutils: 3.5.2 -> 3.5.4

---
 pkgs/development/python-modules/clldutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix
index 69813e6a2eb7..19daa2de573d 100644
--- a/pkgs/development/python-modules/clldutils/default.nix
+++ b/pkgs/development/python-modules/clldutils/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "clldutils";
-  version = "3.5.2";
+  version = "3.5.4";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "clld";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0qlqp9yq4lbi9ik2psgw0svxlb7raadqaxdh2dgkn85d7h20y4nd";
+    sha256 = "0yirww9abp6hffxz57ms7ljyjw0pamw2bhfrf7cshpwwb6sx5ycf";
   };
 
   patchPhase = ''

From cfef6dd82ce4dc63e15503a0ca59bc1ebf7ce07d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 04:00:21 +0100
Subject: [PATCH 2752/3942] python3Packages.ircrobots: 0.3.3 -> 0.3.5

---
 .../python-modules/ircrobots/default.nix           | 12 +++++++-----
 .../ircrobots/relax-dependencies.patch             | 14 --------------
 2 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/development/python-modules/ircrobots/relax-dependencies.patch

diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix
index 359cf3e6934f..74496e402200 100644
--- a/pkgs/development/python-modules/ircrobots/default.nix
+++ b/pkgs/development/python-modules/ircrobots/default.nix
@@ -13,19 +13,21 @@
 
 buildPythonPackage rec {
   pname = "ircrobots";
-  version = "0.3.3";
+  version = "0.3.5";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "jesopo";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0ykn6ch7aazv2cx13q2gr94arh6f96d8hwjwnrcjai3i3x4q2pkq";
+    sha256 = "1w04gif227fhzalrds9rscqmckv5h0x2p8600s876i19w41swi32";
   };
 
-  patches = [
-    ./relax-dependencies.patch
-  ];
+  postPatch = ''
+    # too specific pins https://github.com/jesopo/ircrobots/issues/3
+    sed -iE 's/==.*//' requirements.txt
+    sed -iE 's/dataclasses.*/dataclasses; python_version < "3.7"/' requirements.txt
+  '';
 
   propagatedBuildInputs = [
     anyio
diff --git a/pkgs/development/python-modules/ircrobots/relax-dependencies.patch b/pkgs/development/python-modules/ircrobots/relax-dependencies.patch
deleted file mode 100644
index 9aed3577f63d..000000000000
--- a/pkgs/development/python-modules/ircrobots/relax-dependencies.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/requirements.txt b/requirements.txt
-index 87a2d31..4e0efb1 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,6 +1,6 @@
--anyio            ==1.3.0
-+anyio
- asyncio-throttle ==1.0.1
--dataclasses      ==0.6
--ircstates        ==0.11.2
-+dataclasses; python_version < "3.7"
-+ircstates        >=0.11.2
- async_stagger    ==0.3.0
- async_timeout    ==3.0.1

From c63c4f71fc6b05811dc24c6c5ba18d53d9452a2f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 04:03:08 +0100
Subject: [PATCH 2753/3942] python3Packages.ircstates: 0.11.3 -> 0.11.5

---
 .../development/python-modules/ircstates/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix
index 857b0358aff2..3cd4fb09f90a 100644
--- a/pkgs/development/python-modules/ircstates/default.nix
+++ b/pkgs/development/python-modules/ircstates/default.nix
@@ -10,24 +10,16 @@
 
 buildPythonPackage rec {
   pname = "ircstates";
-  version = "0.11.3";
+  version = "0.11.5";
   disabled = pythonOlder "3.6";  # f-strings
 
   src = fetchFromGitHub {
     owner = "jesopo";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1v8r6ma8gzvn5ym3xx9qlb0rc4l67pxr3z8njzk1ffxn1x3mxd3i";
+    sha256 = "1b1py1q02wbp4fmkjvchvazklfqibqd6pb28gdq7dg1bwwwd7vda";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "relax-pendulum-version.patch";
-      url = "https://github.com/jesopo/ircstates/commit/f51f1b689e592020d1c91ccab6c03927aadb9f94.patch";
-      sha256 = "0qbp3b9hlqbbx7b474q1mcgnzzzwcm4g89x26iqgmlgxzmv3y5xp";
-    })
-  ];
-
   propagatedBuildInputs = [
     irctokens
     pendulum

From 492c60ccf05b491f36ada4c863193bd6be0652ff Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 04:07:05 +0100
Subject: [PATCH 2754/3942] python3Packages.ntc-templates: 1.5.0 -> 1.6.0

---
 pkgs/development/python-modules/ntc-templates/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix
index 923f8c196986..a85bd0f8fc37 100644
--- a/pkgs/development/python-modules/ntc-templates/default.nix
+++ b/pkgs/development/python-modules/ntc-templates/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "ntc-templates";
-  version = "1.5.0";
+  version = "1.6.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "networktocode";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "0pvd9n7hcmxl9cr8m1xlqcjmy3k2hga0qmn2k3x9hripjis7pbbi";
+    rev = "dc27599b0c5f3bb6ff23049e781b5dab2849c2c3";  # not tagged
+    sha256 = "1vg5y5c51vc9dj3b8qcffh6dz85ri11zb1azxmyvgbq86pcvbx9f";
   };
 
   propagatedBuildInputs = [ textfsm ];

From f1064430665904d2fbd2df577fa6d3a0ea4031b1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 04:10:46 +0100
Subject: [PATCH 2755/3942] python3Packages.PyRMVtransport: 0.2.9 -> 0.2.10

Disables the test, because they require pytest-httpx, which has not been
packaged yet.
---
 .../python-modules/PyRMVtransport/default.nix     | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/PyRMVtransport/default.nix b/pkgs/development/python-modules/PyRMVtransport/default.nix
index 1624a5fda2a6..86fb75f14548 100644
--- a/pkgs/development/python-modules/PyRMVtransport/default.nix
+++ b/pkgs/development/python-modules/PyRMVtransport/default.nix
@@ -1,13 +1,13 @@
 { lib, buildPythonPackage, fetchFromGitHub
 , flit
-, lxml, aiohttp
-, pytest, pytestcov, pytest-asyncio, pytest-mock, pytest-aiohttp, aresponses
+, lxml, httpx
+, pytest, pytestcov, pytest-asyncio, pytest-mock, aresponses
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "PyRMVtransport";
-  version = "0.2.9";
+  version = "0.2.10";
   format = "pyproject";
   disabled = pythonOlder "3.6";
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     owner = "cgtobi";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1h3d0yxzrfi47zil5gr086v0780q768z8v5psvcikqw852f93vxb";
+    sha256 = "03qrylidb1d6zw6a22d1drdf73cvfxqcqaa8qi8x4pli1axcfh5w";
   };
 
   nativeBuildInputs = [
@@ -23,16 +23,19 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    aiohttp
+    httpx
     lxml
   ];
 
+  # requires pytest-httpx
+  doCheck = false;
+
   checkInputs = [
     pytest
     pytestcov
     pytest-asyncio
     pytest-mock
-    pytest-aiohttp
+    # pytest-httpx is missing
     aresponses
   ];
   checkPhase = ''

From a823dee9d9cdcbf9a3fd22a073e75a5bfb2b36eb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 04:12:28 +0100
Subject: [PATCH 2756/3942] python3Packages.python-didl-lite: 1.2.4 -> 1.2.5

---
 pkgs/development/python-modules/python-didl-lite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-didl-lite/default.nix b/pkgs/development/python-modules/python-didl-lite/default.nix
index e160c1aa623f..edde064a3335 100644
--- a/pkgs/development/python-modules/python-didl-lite/default.nix
+++ b/pkgs/development/python-modules/python-didl-lite/default.nix
@@ -4,14 +4,14 @@
 
 buildPythonPackage rec {
   pname = "python-didl-lite";
-  version = "1.2.4";
+  version = "1.2.5";
   disabled = pythonOlder "3.5.3";
 
   src = fetchFromGitHub {
     owner = "StevenLooman";
     repo = pname;
     rev = version;
-    sha256 = "0jf1d5m4r8qd3pn0hh1xqbkblkx9wzrrcmk7qa7q8lzfysp4z217";
+    sha256 = "0wm831g8k9xahw20y0461cvy6lp45sxppicxah1rg9isdc3vy3nh";
   };
 
   propagatedBuildInputs = [

From 5544734b23ce054c49f484dbb2dcee67ec2a2c7d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 03:46:26 +0000
Subject: [PATCH 2757/3942] gitkraken: 7.3.2 -> 7.4.0

---
 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 827d9539dba6..8b93bf2176ac 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gitkraken";
-  version = "7.3.2";
+  version = "7.4.0";
 
   src = fetchzip {
     url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-    sha256 = "0bw75m87qbnnn1gjphik3xcjx2zwczsa37rpr16la1zjhqjl5m7j";
+    sha256 = "0ih0jxdm74vr4dgslhnl3llvi31zin0g2xjw6a4pdji2y2kajkzk";
   };
 
   dontBuild = true;

From 4b6e4a64219c83d23182fea34864fc0b0915709f Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Wed, 18 Nov 2020 04:14:55 +0000
Subject: [PATCH 2758/3942] creddump: fix src

---
 pkgs/tools/security/creddump/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/security/creddump/default.nix b/pkgs/tools/security/creddump/default.nix
index d37c58a51591..ffa2fd2311c1 100644
--- a/pkgs/tools/security/creddump/default.nix
+++ b/pkgs/tools/security/creddump/default.nix
@@ -7,8 +7,7 @@ python2Packages.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "kalilinux";
     repo = "packages/creddump";
-    # url-encoding workaround: https://github.com/NixOS/nixpkgs/issues/65796#issuecomment-517829019
-    rev = "debian%2F${version}-1kali2"; # %2F = urlquote("/")
+    rev = "debian/${version}-1kali2";
     sha256 = "0r3rs2hggsvv619l3fh3c0jli6d3ryyj30ni3hz0nz670z5smzcf";
   };
 

From 8540c1c3b3f0b2b20c8b7c3b8560b1f130c5ce5e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 17 Nov 2020 23:20:00 -0500
Subject: [PATCH 2759/3942] nodejs-12_x: 12.19.0 -> 12.19.1

https://github.com/nodejs/node/releases/tag/v12.19.1
---
 pkgs/development/web/nodejs/v12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix
index 83ba9f5d56f3..c38944c5b562 100644
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/pkgs/development/web/nodejs/v12.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "12.19.0";
-    sha256 = "1qainpkakkl3xip9xz2wbs74g95gvc6125cc05z6vyckqi2iqrrv";
+    version = "12.19.1";
+    sha256 = "0zdis5wd84c57qjdiry8mmhpp009wqhb51f67iphl06vqc67w1vl";
   }

From 42573fcf46023430960f2f1d030817f8f829abfd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 18 Nov 2020 04:20:00 +0000
Subject: [PATCH 2760/3942] pueue: install zsh completions

---
 pkgs/applications/misc/pueue/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix
index 21cc9d7cf720..3cd9d5db0067 100644
--- a/pkgs/applications/misc/pueue/default.nix
+++ b/pkgs/applications/misc/pueue/default.nix
@@ -18,11 +18,10 @@ rustPlatform.buildRustPackage rec {
   checkFlags = [ "--skip=test_single_huge_payload" "--skip=test_create_unix_socket" ];
 
   postInstall = ''
-    # zsh completion generation fails. See: https://github.com/Nukesor/pueue/issues/57
-    for shell in bash fish; do
+    for shell in bash fish zsh; do
       $out/bin/pueue completions $shell .
-      installShellCompletion pueue.$shell
     done
+    installShellCompletion pueue.{bash,fish} _pueue
   '';
 
   meta = with lib; {

From fde2e637696c8e013d64704a11201579ccc0f592 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 18 Nov 2020 04:20:00 +0000
Subject: [PATCH 2761/3942] nodejs-14_x: 14.15.0 -> 14.15.1

https://github.com/nodejs/node/releases/tag/v12.19.1
---
 pkgs/development/web/nodejs/v14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix
index 820deb5884db..9c0c518b62ec 100644
--- a/pkgs/development/web/nodejs/v14.nix
+++ b/pkgs/development/web/nodejs/v14.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "14.15.0";
-    sha256 = "0fzv05f8rnc0s1a11k0cqfpgv9yawfbdd8qcl8zr25kv5ridhdip";
+    version = "14.15.1";
+    sha256 = "1g61vqsgq3jsipw2fckj68i4a4pi1iz1kbw7mlw8jmzp8rl46q81";
   }

From 1edae8aa7b95c82652200c8879c3b33a8a8377d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 05:13:07 +0000
Subject: [PATCH 2762/3942] btfs: 2.22 -> 2.23

---
 pkgs/os-specific/linux/btfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix
index b4107e8ba001..762baa587112 100644
--- a/pkgs/os-specific/linux/btfs/default.nix
+++ b/pkgs/os-specific/linux/btfs/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "btfs";
-  version = "2.22";
+  version = "2.23";
 
   src = fetchFromGitHub {
     owner  = "johang";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1z88bk1z4sns3jdn56x83mvh06snxg0lr5h4v0c24lzlf5wbdifz";
+    sha256 = "1cfjhyn9cjyyxyd0f08b2ra258pzkljwvkj0iwrjpd0nrbl6wkq5";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From d6a09adb5fc2d515a008e7863b8e9f550d4f5570 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Wed, 18 Nov 2020 15:02:58 +0900
Subject: [PATCH 2763/3942] tcpreplay: fix darwin build

---
 pkgs/tools/networking/tcpreplay/default.nix | 10 +++++++---
 pkgs/top-level/all-packages.nix             |  4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix
index b40df721c83e..fdf7965311d0 100644
--- a/pkgs/tools/networking/tcpreplay/default.nix
+++ b/pkgs/tools/networking/tcpreplay/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libpcap, tcpdump }:
+{ stdenv, fetchurl, libpcap, tcpdump, Carbon, CoreServices }:
 
 stdenv.mkDerivation rec {
   pname = "tcpreplay";
@@ -9,7 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1plgjm3dr9rr5q71s7paqk2wgrvkihbk2yrf9g3zaks3m750497d";
   };
 
-  buildInputs = [ libpcap ];
+  buildInputs = [ libpcap ]
+    ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
+      Carbon CoreServices
+    ];
+
 
   configureFlags = [
     "--disable-local-libopts"
@@ -26,6 +30,6 @@ stdenv.mkDerivation rec {
     homepage = "http://tcpreplay.appneta.com/";
     license = with licenses; [ bsd3 gpl3 ];
     maintainers = with maintainers; [ eleanor ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7429bbda5b40..206cd8f77fcd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7517,7 +7517,9 @@ in
 
   tcpkali = callPackage ../applications/networking/tcpkali { };
 
-  tcpreplay = callPackage ../tools/networking/tcpreplay { };
+  tcpreplay = callPackage ../tools/networking/tcpreplay {
+    inherit (darwin.apple_sdk.frameworks) Carbon CoreServices;
+  };
 
   tdns-cli = callPackage ../tools/networking/tdns-cli { };
 

From b7f5d97eb3dfed354f1653bc83628deea7d73b3d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 07:07:01 +0000
Subject: [PATCH 2764/3942] fluent-bit: 1.6.3 -> 1.6.4

---
 pkgs/tools/misc/fluent-bit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 7616e6a5b304..f787ab1ef0ba 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "0c8b5xg1shdncw24jsnzwk96ln4qmw1h2qlxv6467lf083kz0azw";
+    sha256 = "1hfkix5pjcrm68bm4k71dlkkdlnwffzlw4kxhiq9pmg09z8s6kq3";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From 597e7748d1fa603062a66cb74ff8d5f5eaf2f481 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 11 Nov 2020 06:42:30 +0100
Subject: [PATCH 2765/3942] =?UTF-8?q?ocamlPackages.dispatch:=200.4.1=20?=
 =?UTF-8?q?=E2=86=92=200.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.webmachine: 0.6.2 → 0.7.0
---
 pkgs/development/ocaml-modules/dispatch/default.nix  | 12 +++++++-----
 .../development/ocaml-modules/webmachine/default.nix |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/dispatch/default.nix b/pkgs/development/ocaml-modules/dispatch/default.nix
index 03f2afbd3141..65baa3dc4982 100644
--- a/pkgs/development/ocaml-modules/dispatch/default.nix
+++ b/pkgs/development/ocaml-modules/dispatch/default.nix
@@ -1,21 +1,23 @@
-{ lib, buildDunePackage, fetchFromGitHub, alcotest, result }:
+{ lib, buildDunePackage, fetchFromGitHub, ocaml, alcotest, result }:
 
 buildDunePackage rec {
   pname = "dispatch";
-  version = "0.4.1";
+  version = "0.5.0";
+
+  useDune2 = true;
 
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = "ocaml-dispatch";
     rev = version;
-    sha256 = "05kb9zcihk50r2haqz8vrlr7kmaka6vrs4j1z500lmnl877as6qr";
+    sha256 = "12r39ylbxc297cbwjadhd1ghxnwwcdzfjk68r97wim8hcgzxyxv4";
   };
 
   propagatedBuildInputs = [ result ];
 
-  checkInputs = lib.optional doCheck alcotest;
+  checkInputs = [ alcotest ];
 
-  doCheck = true;
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
 
   meta = {
     inherit (src.meta) homepage;
diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix
index 14b1d2d2321f..c7ad92efe768 100644
--- a/pkgs/development/ocaml-modules/webmachine/default.nix
+++ b/pkgs/development/ocaml-modules/webmachine/default.nix
@@ -5,7 +5,7 @@
 
 buildDunePackage rec {
   pname = "webmachine";
-  version = "0.6.2";
+  version = "0.7.0";
   useDune2 = true;
 
   minimumOCamlVersion = "4.04";
@@ -14,12 +14,12 @@ buildDunePackage rec {
     owner = "inhabitedtype";
     repo = "ocaml-webmachine";
     rev = version;
-    sha256 = "1zi1vsm589y2njwzsqkmdbxvs9s4xlgbd62xqw2scp60mccp09nk";
+    sha256 = "03ynb1l2jjqba88m9r8m5hwlm8izpfp617r4vcab5kmdim1l2ffx";
   };
 
   propagatedBuildInputs = [ cohttp dispatch ptime ];
 
-  checkInputs = lib.optional doCheck ounit;
+  checkInputs = [ ounit ];
 
   doCheck = true;
 

From 47b02b30e32a5f8f47ed4cf370a0ddf3b9aa9ba8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Nov 2020 09:42:16 +0100
Subject: [PATCH 2766/3942] =?UTF-8?q?ocamlPackages.ppx=5Fblob:=200.4.0=20?=
 =?UTF-8?q?=E2=86=92=200.7.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/ppx_blob/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix
index d7d662e74a5e..a64ff9cbef2d 100644
--- a/pkgs/development/ocaml-modules/ppx_blob/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix
@@ -2,16 +2,18 @@
 
 buildDunePackage rec {
   pname = "ppx_blob";
-  version = "0.4.0";
+  version = "0.7.1";
+
+  useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz";
-    sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16";
+    sha256 = "0m616ri6kmawflphiwm6j4djds27v0fjvi8xjz1fq5ydc1sq8d0l";
   };
 
-  checkInputs = lib.optional doCheck alcotest;
+  checkInputs = [ alcotest ];
   buildInputs = [ ocaml-migrate-parsetree ];
-  doCheck = lib.versionAtLeast ocaml.version "4.03";
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
 
   meta = with lib; {
     homepage = "https://github.com/johnwhitington/ppx_blob";

From 9a38c3a11b8db6c20611e536236d3b4831ef4498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 18 Nov 2020 08:38:23 +0100
Subject: [PATCH 2767/3942] knot-resolver: fix evaluation on darwin

I somehow forgot that libcap_ng is linux-only.  I'm missing ofborg's
darwin builder, but I might've tested evaluation at least...
---
 pkgs/servers/dns/knot-resolver/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index f88772bda0bc..2ec9a6dfdd90 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -2,8 +2,8 @@
 # native deps.
 , runCommand, pkgconfig, meson, ninja, makeWrapper
 # build+runtime deps.
-, knot-dns, luajitPackages, libuv, gnutls, lmdb, systemd, dns-root-data
-, nghttp2, libcap_ng # optionals, in principle
+, knot-dns, luajitPackages, libuv, gnutls, lmdb
+, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle
 # test-only deps.
 , cmocka, which, cacert
 , extraFeatures ? false /* catch-all if defaults aren't enough */
@@ -54,9 +54,9 @@ unwrapped = stdenv.mkDerivation rec {
 
   # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
   buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
-    ++ optional stdenv.isLinux systemd # passing sockets, sd_notify
-    ++ [ nghttp2 libcap_ng ]
-    ## optional dependencies; TODO: libedit, dnstap
+    ++ optionals stdenv.isLinux [ systemd libcap_ng ]
+    ++ [ nghttp2 ]
+    ## optional dependencies; TODO: dnstap
     ;
 
   mesonFlags = [

From 98437b586949e642b8c157115153f50af034f320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 18 Nov 2020 08:39:59 +0100
Subject: [PATCH 2768/3942] drawio: 13.9.5 -> 13.9.9

Changelog:
https://github.com/jgraph/drawio-desktop/releases/tag/v13.9.9
---
 pkgs/applications/graphics/drawio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index 2d630c8ccbd6..892d81753e65 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "drawio";
-  version = "13.9.5";
+  version = "13.9.9";
 
   src = fetchurl {
     url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
-    sha256 = "1glklqpbx28ssi41cdshckgvix24wkqmsw0rgf964vjc28qgfy1s";
+    hash = "sha256-+rNbLHpkFnvM7gDFbZ9AItPIA2IVTmscz+gTXF8riIY=";
   };
 
   nativeBuildInputs = [

From 7edf1ced82d7ff951fce735ee60e48f4e34b0066 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Tue, 17 Nov 2020 20:43:36 -0800
Subject: [PATCH 2769/3942] pypy: enable aarch64-linux platform

---
 pkgs/development/interpreters/python/pypy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 10073602071a..482ba5df54ce 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -151,7 +151,7 @@ in with passthru; stdenv.mkDerivation rec {
     homepage = "http://pypy.org/";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     license = licenses.mit;
-    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+    platforms = [ "aarch64-linux" "i686-linux" "x86_64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ andersk ];
   };
 }

From 060d20de2415fdb4a9b8d8be18dff4e7e4b7ca06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 2 Nov 2020 22:11:38 +0100
Subject: [PATCH 2770/3942] dbus: Enable AppArmor mediation support

---
 pkgs/development/libraries/dbus/default.nix           | 8 ++++++--
 pkgs/development/libraries/dbus/make-dbus-conf.nix    | 5 ++++-
 pkgs/development/libraries/dbus/make-session-conf.xsl | 4 ++++
 pkgs/development/libraries/dbus/make-system-conf.xsl  | 4 ++++
 pkgs/top-level/all-packages.nix                       | 4 ++--
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index b3723f1b4d21..4480d197fa7c 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -5,6 +5,8 @@
 , expat
 , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
 , systemd
+, audit
+, libapparmor
 , libX11 ? null
 , libICE ? null
 , libSM ? null
@@ -70,7 +72,8 @@ stdenv.mkDerivation rec {
       libX11
       libICE
       libSM
-    ] ++ lib.optional enableSystemd systemd;
+    ] ++ lib.optional enableSystemd systemd
+    ++ lib.optionals (!stdenv.isDarwin) [ audit libapparmor ];
   # ToDo: optional selinux?
 
   configureFlags = [
@@ -86,7 +89,8 @@ stdenv.mkDerivation rec {
     "--with-system-socket=/run/dbus/system_bus_socket"
     "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
     "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user"
-  ] ++ lib.optional (!x11Support) "--without-x";
+  ] ++ lib.optional (!x11Support) "--without-x"
+  ++ lib.optionals (!stdenv.isDarwin) [ "--enable-apparmor" "--enable-libaudit" ];
 
   # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
   # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix
index e714b96b7e9f..ce5c0b3b5772 100644
--- a/pkgs/development/libraries/dbus/make-dbus-conf.nix
+++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix
@@ -1,6 +1,7 @@
 { runCommand, writeText, libxslt, dbus
 , serviceDirectories ? []
 , suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper"
+, apparmor ? "disabled" # one of enabled, disabled, required
 }:
 
 /* DBus has two configuration parsers -- normal and "trivial", which is used
@@ -10,7 +11,7 @@
  */
 runCommand "dbus-1"
   {
-    inherit serviceDirectories suidHelper;
+    inherit serviceDirectories suidHelper apparmor;
     preferLocalBuild = true;
     allowSubstitutes = false;
     XML_CATALOG_FILES = writeText "dbus-catalog.xml" ''
@@ -33,10 +34,12 @@ runCommand "dbus-1"
     xsltproc --nonet \
       --stringparam serviceDirectories "$serviceDirectories" \
       --stringparam suidHelper "$suidHelper" \
+      --stringparam apparmor "$apparmor" \
       ${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \
       > $out/system.conf
     xsltproc --nonet \
       --stringparam serviceDirectories "$serviceDirectories" \
+      --stringparam apparmor "$apparmor" \
       ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
       > $out/session.conf
   ''
diff --git a/pkgs/development/libraries/dbus/make-session-conf.xsl b/pkgs/development/libraries/dbus/make-session-conf.xsl
index 6a19ee14a22c..a744905cdd39 100644
--- a/pkgs/development/libraries/dbus/make-session-conf.xsl
+++ b/pkgs/development/libraries/dbus/make-session-conf.xsl
@@ -15,12 +15,16 @@
   <xsl:output method='xml' encoding="UTF-8" doctype-system="busconfig.dtd" />
 
   <xsl:param name="serviceDirectories" />
+  <xsl:param name="apparmor" />
 
   <xsl:template match="/busconfig">
     <busconfig>
       <!-- We leave <standard_session_servicedirs/> because it includes XDG dirs and therefore user Nix profile. -->
       <xsl:copy-of select="child::node()[name() != 'include' and name() != 'servicedir' and name() != 'includedir']" />
 
+      <!-- configure AppArmor -->
+      <apparmor mode="{$apparmor}"/>
+
       <xsl:for-each select="str:tokenize($serviceDirectories)">
         <servicedir><xsl:value-of select="." />/share/dbus-1/services</servicedir>
         <includedir><xsl:value-of select="." />/etc/dbus-1/session.d</includedir>
diff --git a/pkgs/development/libraries/dbus/make-system-conf.xsl b/pkgs/development/libraries/dbus/make-system-conf.xsl
index dd644b4bce7c..06233e764e16 100644
--- a/pkgs/development/libraries/dbus/make-system-conf.xsl
+++ b/pkgs/development/libraries/dbus/make-system-conf.xsl
@@ -16,11 +16,15 @@
 
   <xsl:param name="serviceDirectories" />
   <xsl:param name="suidHelper" />
+  <xsl:param name="apparmor" />
 
   <xsl:template match="/busconfig">
     <busconfig>
       <xsl:copy-of select="child::node()[name() != 'include' and name() != 'standard_system_servicedirs' and name() != 'servicehelper' and name() != 'servicedir' and name() != 'includedir']" />
 
+      <!-- configure AppArmor -->
+      <apparmor mode="{$apparmor}"/>
+
       <!-- set suid helper -->
       <servicehelper><xsl:value-of select="$suidHelper" /></servicehelper>
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc6d4868f62a..9a5592790d4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12471,9 +12471,9 @@ in
   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 { };
 
-  makeDBusConf = { suidHelper, serviceDirectories }:
+  makeDBusConf = { suidHelper, serviceDirectories, apparmor }:
     callPackage ../development/libraries/dbus/make-dbus-conf.nix {
-      inherit suidHelper serviceDirectories;
+      inherit suidHelper serviceDirectories apparmor;
     };
 
   dee = callPackage ../development/libraries/dee { };

From e5e9887e38da3a34519930a21fa6d2ae97ebc407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 2 Nov 2020 22:42:55 +0100
Subject: [PATCH 2771/3942] nixos/dbus: Add AppArmor support

---
 nixos/modules/services/system/dbus.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index f8d909a4a3cc..d4cacb85694b 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -11,6 +11,7 @@ let
   homeDir = "/run/dbus";
 
   configDir = pkgs.makeDBusConf {
+    inherit (cfg) apparmor;
     suidHelper = "${config.security.wrapperDir}/dbus-daemon-launch-helper";
     serviceDirectories = cfg.packages;
   };
@@ -51,6 +52,20 @@ in
         '';
       };
 
+      apparmor = mkOption {
+        type = types.enum [ "enabled" "disabled" "required" ];
+        description = ''
+          AppArmor mode for dbus.
+
+          <literal>enabled</literal> enables mediation when it's
+          supported in the kernel, <literal>disabled</literal>
+          always disables AppArmor even with kernel support, and
+          <literal>required</literal> fails when AppArmor was not found
+          in the kernel.
+        '';
+        default = "disabled";
+      };
+
       socketActivated = mkOption {
         type = types.nullOr types.bool;
         default = null;

From e32f7fd2d1e6f06a50bfe34effdacfc5c06c7db9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 09:30:08 +0000
Subject: [PATCH 2772/3942] gthumb: 3.10.0 -> 3.10.1

---
 pkgs/applications/graphics/gthumb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index 27e8e00bdb3a..7dbe03d9f281 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -33,11 +33,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gthumb";
-  version = "3.10.0";
+  version = "3.10.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0j7cxp4hhkvkckyvll6pmqkv5rwrknlzq9j1my0grb01b8wzhw9y";
+    sha256 = "0gm7q6n9lnjsdqpx5b0cqjayhzwnplqb6p5pshzhbfp2zqd2g9ss";
   };
 
   nativeBuildInputs = [

From c132add6ce8c49a1450d86bea44dc8166af11f17 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 09:57:19 +0000
Subject: [PATCH 2773/3942] highlight: 3.57 -> 3.59

---
 pkgs/tools/text/highlight/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index a918770aa7b9..e4e80e694fe1 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -5,13 +5,13 @@ with stdenv.lib;
 let
   self = stdenv.mkDerivation rec {
     pname = "highlight";
-    version = "3.57";
+    version = "3.59";
 
     src = fetchFromGitLab {
       owner = "saalen";
       repo = "highlight";
       rev = "v${version}";
-      sha256 = "1xrk7c7akjiwh3wh9bll0qh4g0kqvbzjz9ancpadnk0k7bqi0kxf";
+      sha256 = "0sqdzivnak3gcinvkf6rkgp1p5gjx5my6cb2790nh0v53y67v2pb";
     };
 
     enableParallelBuilding = true;

From 0788a95557f33a9345a75aa6e138b9e623301a07 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Sun, 8 Nov 2020 12:05:54 +0100
Subject: [PATCH 2774/3942] linuxPackages.ndiswrapper: 1.62-pre -> 1.63

---
 pkgs/os-specific/linux/ndiswrapper/default.nix   | 15 ++++++---------
 pkgs/os-specific/linux/ndiswrapper/no-sbin.patch |  6 ++----
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index 34c77bc3e6a7..92da7f6fb828 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, kernel, perl, kmod, libelf }:
+{ stdenv, fetchurl, kernel, perl, kmod, libelf }:
 let
-  version = "1.62-pre";
+  version = "1.63";
 in
 stdenv.mkDerivation {
   name = "ndiswrapper-${version}-${kernel.version}";
@@ -14,7 +14,6 @@ stdenv.mkDerivation {
   kernel = kernel.dev;
 
   buildPhase = "
-    cd ndiswrapper
     echo make KBUILD=$(echo \$kernel/lib/modules/*/build);
     echo -n $kernel/lib/modules/*/build > kbuild_path
     export PATH=${kmod}/sbin:$PATH
@@ -30,12 +29,9 @@ stdenv.mkDerivation {
     patchShebangs $out/sbin
   '';
 
-  # should we use unstable?
-  src = fetchFromGitHub {
-    owner = "pgiri";
-    repo = "ndiswrapper";
-    rev = "5e29f6a9d41df949b435066c173e3b1947f179d3";
-    sha256 = "0sprrmxxkf170bmh1nz9xw00gs89dddr84djlf666bn5bhy6jffi";
+  src = fetchurl {
+    url = "mirror://sourceforge/ndiswrapper/files/stable/ndiswrapper-${version}.tar.gz";
+    sha256 = "1v6b66jhisl110jfl00hm43lmnrav32vs39d85gcbxrjqnmcx08g";
   };
 
   buildInputs = [ perl libelf ];
@@ -45,5 +41,6 @@ stdenv.mkDerivation {
     homepage = "https://sourceforge.net/projects/ndiswrapper";
     license = "GPL";
     platforms = [ "i686-linux" "x86_64-linux" ];
+    broken = stdenv.lib.versionAtLeast kernel.version "5.8";
   };
 }
diff --git a/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch b/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch
index 34965540d248..373965fb0853 100644
--- a/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch
+++ b/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch
@@ -1,7 +1,5 @@
-diff --git a/ndiswrapper/driver/Makefile b/ndiswrapper/driver/Makefile
-index bf42f7bc..ad23aa2d 100644
---- a/ndiswrapper/driver/Makefile
-+++ b/ndiswrapper/driver/Makefile
+--- a/driver/Makefile
++++ b/driver/Makefile
 @@ -191,7 +191,7 @@ clean:
  	rm -rf .tmp_versions
  

From e453e9ef98986ff25970391c9b6d4ebada48fd14 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 18 Nov 2020 11:52:19 +0100
Subject: [PATCH 2775/3942] grafana: 7.3.2 -> 7.3.3

---
 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 85420f237f0f..f13759dcc0db 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "grafana";
-  version = "7.3.2";
+  version = "7.3.3";
 
   excludedPackages = [ "release_publisher" ];
 
@@ -10,12 +10,12 @@ buildGoModule rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0lknymp203bgrwq8g05pk07p385k2hh9wap4ql4lxylsn89szs65";
+    sha256 = "1891whg244s1lj8lm3sxsxaimjb1yr1n4v7kgjjz7hi9fkscswbw";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "08smddc86jm3ign1pb1arw1zqkh72dbddizzn1bqg4lanx2xwjca";
+    sha256 = "0ybzlnaq7j1v6valyb997wiydpbsgb2ycb8r92wyb901hd4frj7h";
   };
 
   vendorSha256 = "09rb96fm7ij16r843lbwcxb26vmjyahs1bi5pnnqz0mnm0vvmsjb";

From b4143113d5f560d2ae82fb829d6f51be8e5f4da3 Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Wed, 18 Nov 2020 13:11:15 +0100
Subject: [PATCH 2776/3942] btc-rpc-explorer: init at 2.0.2

---
 .../node-packages/node-packages.json          |    1 +
 .../node-packages/node-packages.nix           | 1537 ++++++++++++++---
 2 files changed, 1255 insertions(+), 283 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 983a21658730..0216222136e3 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -16,6 +16,7 @@
 , "bower"
 , "bower2nix"
 , "browserify"
+, "btc-rpc-explorer"
 , "castnow"
 , "clean-css-cli"
 , "clubhouse-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 8ee583536742..3782f5e8f5f4 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -2020,6 +2020,24 @@ let
         sha512 = "+YWCOSJi6CoBLSgktJfy8/ijQGK3WbPUmujndcxY/WPmCe+Wek6kajmxclMMuDVAjg4RFXdH/fuLwOb/abOU5g==";
       };
     };
+    "@fast-csv/format-4.3.5" = {
+      name = "_at_fast-csv_slash_format";
+      packageName = "@fast-csv/format";
+      version = "4.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@fast-csv/format/-/format-4.3.5.tgz";
+        sha512 = "8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A==";
+      };
+    };
+    "@fast-csv/parse-4.3.3" = {
+      name = "_at_fast-csv_slash_parse";
+      packageName = "@fast-csv/parse";
+      version = "4.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@fast-csv/parse/-/parse-4.3.3.tgz";
+        sha512 = "mXrCmyyZxbcdW/kZ8tVMrb1DJrJMNGWxHmB4OSuEL96so/X14E1O0w5QFiyodfs+oXoNGwbku8bx2Lq2tiODAA==";
+      };
+    };
     "@fluentui/date-time-utilities-7.9.0" = {
       name = "_at_fluentui_slash_date-time-utilities";
       packageName = "@fluentui/date-time-utilities";
@@ -3361,13 +3379,13 @@ let
         sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q==";
       };
     };
-    "@microsoft/load-themed-styles-1.10.134" = {
+    "@microsoft/load-themed-styles-1.10.136" = {
       name = "_at_microsoft_slash_load-themed-styles";
       packageName = "@microsoft/load-themed-styles";
-      version = "1.10.134";
+      version = "1.10.136";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.134.tgz";
-        sha512 = "TAXG7OEkzzhKcVzoE4p0WrY/2RzdaewzrggogGU38dScLy9eUiJXXs4osIsesMXvzG5BP/v5MS6kAbtb+HM0cQ==";
+        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.136.tgz";
+        sha512 = "D8wWUiW7HQKFp4Qgy5GsDvEymKew/4uK+4dSWSO/+6LfSI15kqDNS7g4Nf/VxL5FBmjwXqQV1d59ucgWiKUjJg==";
       };
     };
     "@mozilla/readability-0.3.0" = {
@@ -3541,58 +3559,58 @@ let
         sha512 = "xPJDEMkHnIoHk19enEbg4qiIwszXS8XOUi8UpD4YMA81GXGT0xi16Z17kOACipDG6Tmmy5Jl6pe3cKqQvM/WyQ==";
       };
     };
-    "@node-red/editor-api-1.2.3" = {
+    "@node-red/editor-api-1.2.5" = {
       name = "_at_node-red_slash_editor-api";
       packageName = "@node-red/editor-api";
-      version = "1.2.3";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.3.tgz";
-        sha512 = "7xw02VV69E08jx4cnLkVaOaX+XrQNPlFCRSobAQyj6KKGizMbclWKbsIF6gWSnWEHJdQR/kbAuaK0Qm/F19YuA==";
+        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.5.tgz";
+        sha512 = "ZoWCBDPtuP9wxKxC/SK5hzTMTg6QQlvouoZelZ5h2nS2UGL3Mk+udsJL56FwSYrb/w4JfqG58wmG+DEsmjBKGg==";
       };
     };
-    "@node-red/editor-client-1.2.3" = {
+    "@node-red/editor-client-1.2.5" = {
       name = "_at_node-red_slash_editor-client";
       packageName = "@node-red/editor-client";
-      version = "1.2.3";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.3.tgz";
-        sha512 = "nYmt4B2GwZOAQIAeHDj6dj85aJ2KnyXdX4nHqRkpBO3UMqfaZuG2WuhDful/TOUEhgTOXWLzXVPQwzFt3q9fRA==";
+        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.5.tgz";
+        sha512 = "pqf+JSp0mNQ3o8fnEH6NKJQNj7/QJQKAHGKjmm1uAnaOJMGpOeO7Wap6/obPKzf0o67uVteYKD81LfhsI0afgQ==";
       };
     };
-    "@node-red/nodes-1.2.3" = {
+    "@node-red/nodes-1.2.5" = {
       name = "_at_node-red_slash_nodes";
       packageName = "@node-red/nodes";
-      version = "1.2.3";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.3.tgz";
-        sha512 = "HHWRtbronw4OaFGlF58CYSCFHTVzvfzT+mWmqTucP7iD14658hDHUAVPC8eFmP6E2tbo+Vy3+Rdu80djcaRyUQ==";
+        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.5.tgz";
+        sha512 = "4rHYyIGYrLSZWlxX/KWyOQ4+M6srPd/0i3Idw/68PMBCw9ygyn9DpcBGd6IEqbkSa4BRdcjkomOpmmGsRuCDkw==";
       };
     };
-    "@node-red/registry-1.2.3" = {
+    "@node-red/registry-1.2.5" = {
       name = "_at_node-red_slash_registry";
       packageName = "@node-red/registry";
-      version = "1.2.3";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.3.tgz";
-        sha512 = "wGJ1KK1+NycM+Sbmib6FIL4/OwWxB0sx4IHLI5tYdGYLaf7MYSKTcNxpLvUwjsE2k0ngeiqW43oPhyFrK01Ihw==";
+        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.5.tgz";
+        sha512 = "NPF+9abbj2bF/WKgV6sC+hskAJh1AUZPUx1aM/x6xk0tCtotOqx7KRDZlbzKMqT1hKb7V1tsBYtzdIMmCdJncQ==";
       };
     };
-    "@node-red/runtime-1.2.3" = {
+    "@node-red/runtime-1.2.5" = {
       name = "_at_node-red_slash_runtime";
       packageName = "@node-red/runtime";
-      version = "1.2.3";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.3.tgz";
-        sha512 = "qFEJ8Xgg5lgtlYPW/Zfi2r8HBMzTzwP+ws7f9So28fG76SGcXk8MfNnx2GTSGRnp+a9Mn1/SRlunNQqw9bQ/LA==";
+        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.5.tgz";
+        sha512 = "5RR90HtNAs194+hqh803MmaKZxmfUboGYHMO5dcAhv+e1Fh5SM2lDpGJDLM7j3QI4bWRqdi82qd1y2kXvLqgYA==";
       };
     };
-    "@node-red/util-1.2.3" = {
+    "@node-red/util-1.2.5" = {
       name = "_at_node-red_slash_util";
       packageName = "@node-red/util";
-      version = "1.2.3";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.3.tgz";
-        sha512 = "myAbQ35tk/oIJJfwUehpQbobFcAkeLxRKmRE5FOda8S79RHJh3OJVdISSm2lgUh0QlwFl4D8fZvu+2wZ5GoB0Q==";
+        url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.5.tgz";
+        sha512 = "V+/bWsEg8PIZemgzpjqcpq+/zcjuj/fJ3qoJNRDWFYQ+6VU24W+cGiz795z1KfmyloeMLw3LPikp7lQGikTtIw==";
       };
     };
     "@nodelib/fs.scandir-2.1.3" = {
@@ -3685,13 +3703,13 @@ let
         sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==";
       };
     };
-    "@npmcli/run-script-1.7.5" = {
+    "@npmcli/run-script-1.8.0" = {
       name = "_at_npmcli_slash_run-script";
       packageName = "@npmcli/run-script";
-      version = "1.7.5";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.7.5.tgz";
-        sha512 = "G8taZCc0HExiLadB3Nv0/h1TWjQ9HhkqW/waaH9MNqMX26rPRyNORst1LlNXOO8QnxQF4tNdJfc/Z3TuEtiyww==";
+        url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.0.tgz";
+        sha512 = "ljPLRbQM5byhqacWl9kIjt/yPMee0heaTskaMBFaFvYzOXNJ64h27xV96Sr+LnjJpqR0qJejG36QzJkXILvghQ==";
       };
     };
     "@oclif/color-0.1.2" = {
@@ -5107,13 +5125,13 @@ let
         sha512 = "nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==";
       };
     };
-    "@stylelint/postcss-markdown-0.36.1" = {
+    "@stylelint/postcss-markdown-0.36.2" = {
       name = "_at_stylelint_slash_postcss-markdown";
       packageName = "@stylelint/postcss-markdown";
-      version = "0.36.1";
+      version = "0.36.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.1.tgz";
-        sha512 = "iDxMBWk9nB2BPi1VFQ+Dc5+XpvODBHw2n3tYpaBZuEAFQlbtF9If0Qh5LTTwSi/XwdbJ2jt+0dis3i8omyggpw==";
+        url = "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz";
+        sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==";
       };
     };
     "@szmarczak/http-timer-1.1.2" = {
@@ -5440,6 +5458,15 @@ let
         sha512 = "P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg==";
       };
     };
+    "@types/cookie-0.4.0" = {
+      name = "_at_types_slash_cookie";
+      packageName = "@types/cookie";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz";
+        sha512 = "y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg==";
+      };
+    };
     "@types/cookiejar-2.1.2" = {
       name = "_at_types_slash_cookiejar";
       packageName = "@types/cookiejar";
@@ -5593,6 +5620,15 @@ let
         sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ==";
       };
     };
+    "@types/express-4.17.9" = {
+      name = "_at_types_slash_express";
+      packageName = "@types/express";
+      version = "4.17.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.9.tgz";
+        sha512 = "SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw==";
+      };
+    };
     "@types/express-serve-static-core-4.17.13" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
@@ -5926,6 +5962,15 @@ let
         sha512 = "559S2XW9YMwHznROJ4WFhZJOerJPuxLfqOX+LIKukyLo2NbVgpULwXUsrBlCwhZ4+ACHgVAE23CC3RS52lFxwA==";
       };
     };
+    "@types/mdast-3.0.3" = {
+      name = "_at_types_slash_mdast";
+      packageName = "@types/mdast";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz";
+        sha512 = "SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==";
+      };
+    };
     "@types/mime-2.0.3" = {
       name = "_at_types_slash_mime";
       packageName = "@types/mime";
@@ -6016,13 +6061,22 @@ let
         sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw==";
       };
     };
-    "@types/node-10.17.44" = {
+    "@types/node-10.12.18" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.17.44";
+      version = "10.12.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.17.44.tgz";
-        sha512 = "vHPAyBX1ffLcy4fQHmDyIUMUb42gHZjPHU66nhvbMzAWJqHnySGZ6STwN3rwrnSd1FHB0DI/RWgGELgKSYRDmw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz";
+        sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==";
+      };
+    };
+    "@types/node-10.17.45" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "10.17.45";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-10.17.45.tgz";
+        sha512 = "a+oe0zGtwRsSDynACia/z1e4gKPNnDhAV3G6GWY6ZNCzaujNCdKC7dE2JFkGHAlUhCRHgXNmWbh417bi9dEXBw==";
       };
     };
     "@types/node-12.7.12" = {
@@ -6034,13 +6088,13 @@ let
         sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==";
       };
     };
-    "@types/node-13.13.30" = {
+    "@types/node-13.13.31" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.13.30";
+      version = "13.13.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.13.30.tgz";
-        sha512 = "HmqFpNzp3TSELxU/bUuRK+xzarVOAsR00hzcvM0TXrMlt/+wcSLa5q6YhTb6/cA6wqDCZLDcfd8fSL95x5h7AA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.13.31.tgz";
+        sha512 = "gBk54XbcRj8EKTi7Syo4JU4purbRJaZpkvMVs7+t+b9JaOtwsGo7vCbXdVJN3gH/wu/GyZGD8lAKo0qpQuNjOw==";
       };
     };
     "@types/node-14.11.1" = {
@@ -6052,13 +6106,13 @@ let
         sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==";
       };
     };
-    "@types/node-14.14.7" = {
+    "@types/node-14.14.8" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.7";
+      version = "14.14.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz";
-        sha512 = "Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.8.tgz";
+        sha512 = "z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA==";
       };
     };
     "@types/node-6.14.13" = {
@@ -6241,13 +6295,13 @@ let
         sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==";
       };
     };
-    "@types/serve-static-1.13.7" = {
+    "@types/serve-static-1.13.8" = {
       name = "_at_types_slash_serve-static";
       packageName = "@types/serve-static";
-      version = "1.13.7";
+      version = "1.13.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.7.tgz";
-        sha512 = "3diZWucbR+xTmbDlU+FRRxBf+31OhFew7cJXML/zh9NmvSPTNoFecAwHB66BUqFgENJtqMiyl7JAwUE/siqdLw==";
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz";
+        sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA==";
       };
     };
     "@types/sizzle-2.3.2" = {
@@ -6448,13 +6502,13 @@ let
         sha512 = "NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==";
       };
     };
-    "@types/yargs-15.0.9" = {
+    "@types/yargs-15.0.10" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "15.0.9";
+      version = "15.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz";
-        sha512 = "HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.10.tgz";
+        sha512 = "z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ==";
       };
     };
     "@types/yargs-parser-15.0.0" = {
@@ -6646,6 +6700,15 @@ let
         sha512 = "OKI6clBZqvMBlPKbH1tv3ChmkqRcyCfB6ulHqEX+9asjN5BVXs7tH7aOi+SExCNsmCVB8uJ1ZcvjuwaHsCtUeg==";
       };
     };
+    "@uphold/request-logger-2.0.0" = {
+      name = "_at_uphold_slash_request-logger";
+      packageName = "@uphold/request-logger";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@uphold/request-logger/-/request-logger-2.0.0.tgz";
+        sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084";
+      };
+    };
     "@vue/cli-shared-utils-4.5.9" = {
       name = "_at_vue_slash_cli-shared-utils";
       packageName = "@vue/cli-shared-utils";
@@ -9913,13 +9976,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.793.0" = {
+    "aws-sdk-2.794.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.793.0";
+      version = "2.794.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.793.0.tgz";
-        sha512 = "zBrDkYAUadS59+GVhhVT8f7medKv2FO/3sX3QDfgHt0ySUYi4umBwp3fXjoJU2oRG70IZ74Wclx4T4tynA+Gjg==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.794.0.tgz";
+        sha512 = "Qqz8v0WfeGveaZTPo9+52nNUep/CTuo18OcdCwF4WrnNBv7bAxExUOwN9XkqhoxLjBDk/LuMmHGhOXRljFQgRw==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -10606,6 +10669,15 @@ let
         sha1 = "780a99c84e7d600260361511c4877613bf24f6bb";
       };
     };
+    "base-x-3.0.8" = {
+      name = "base-x";
+      packageName = "base-x";
+      version = "3.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz";
+        sha512 = "Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==";
+      };
+    };
     "base32.js-0.1.0" = {
       name = "base32.js";
       packageName = "base32.js";
@@ -10858,6 +10930,15 @@ let
         sha512 = "LNVkfM7ynlAD0CvPvO9cKxW8YXt1KOCRQZlRsGZWeMyymUWVdHQpZudAzH9chaFAz6HiwAnQxwDemCKDPy6Mag==";
       };
     };
+    "bech32-1.1.4" = {
+      name = "bech32";
+      packageName = "bech32";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz";
+        sha512 = "s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==";
+      };
+    };
     "beeper-1.1.1" = {
       name = "beeper";
       packageName = "beeper";
@@ -11011,6 +11092,15 @@ let
         sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==";
       };
     };
+    "bignumber.js-4.1.0" = {
+      name = "bignumber.js";
+      packageName = "bignumber.js";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz";
+        sha512 = "eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==";
+      };
+    };
     "bignumber.js-9.0.0" = {
       name = "bignumber.js";
       packageName = "bignumber.js";
@@ -11119,6 +11209,69 @@ let
         sha512 = "6pm+Gc3uNiiJZEv0k8JDWqQlo9ki/o9UNAkLmr0EGm7hI5MboOJVIOlO1nw3YuDkLHWN78OPsaC4JhRkn2jMLw==";
       };
     };
+    "bintrees-1.0.1" = {
+      name = "bintrees";
+      packageName = "bintrees";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz";
+        sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524";
+      };
+    };
+    "bip174-2.0.1" = {
+      name = "bip174";
+      packageName = "bip174";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bip174/-/bip174-2.0.1.tgz";
+        sha512 = "i3X26uKJOkDTAalYAp0Er+qGMDhrbbh2o93/xiPyAN2s25KrClSpe3VXo/7mNJoqA5qfko8rLS2l3RWZgYmjKQ==";
+      };
+    };
+    "bip32-2.0.6" = {
+      name = "bip32";
+      packageName = "bip32";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bip32/-/bip32-2.0.6.tgz";
+        sha512 = "HpV5OMLLGTjSVblmrtYRfFFKuQB+GArM0+XP8HGWfJ5vxYBqo+DesvJwOdC2WJ3bCkZShGf0QIfoIpeomVzVdA==";
+      };
+    };
+    "bip66-1.1.5" = {
+      name = "bip66";
+      packageName = "bip66";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz";
+        sha1 = "01fa8748785ca70955d5011217d1b3139969ca22";
+      };
+    };
+    "bitcoin-core-2.3.0" = {
+      name = "bitcoin-core";
+      packageName = "bitcoin-core";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bitcoin-core/-/bitcoin-core-2.3.0.tgz";
+        sha512 = "SMbw2kFu09iBajicODSE4pn/K0tOibWyqct71TlzR8cYUBk+u7rkhqGY7US2iYz0HmP851IW7F7eXfXvz09yXA==";
+      };
+    };
+    "bitcoin-ops-1.4.1" = {
+      name = "bitcoin-ops";
+      packageName = "bitcoin-ops";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bitcoin-ops/-/bitcoin-ops-1.4.1.tgz";
+        sha512 = "pef6gxZFztEhaE9RY9HmWVmiIHqCb2OyS4HPKkpc6CIiiOa3Qmuoylxc5P2EkU3w+5eTSifI9SEZC88idAIGow==";
+      };
+    };
+    "bitcoinjs-lib-5.2.0" = {
+      name = "bitcoinjs-lib";
+      packageName = "bitcoinjs-lib";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-5.2.0.tgz";
+        sha512 = "5DcLxGUDejgNBYcieMIUfjORtUeNWl828VWLHJGVKZCb4zIS1oOySTUr0LGmcqJBQgTBz3bGbRQla4FgrdQEIQ==";
+      };
+    };
     "bitfield-0.1.0" = {
       name = "bitfield";
       packageName = "bitfield";
@@ -11983,6 +12136,24 @@ let
         sha512 = "usjDesQqZ8ihHXOnOEQuAdymBHnJEfSd+aELFSg1jN/V3iAf12HrylHlRJwIt6DTMmXpBDQ+YBg3Q3DIYdhRgQ==";
       };
     };
+    "bs58-4.0.1" = {
+      name = "bs58";
+      packageName = "bs58";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz";
+        sha1 = "be161e76c354f6f788ae4071f63f34e8c4f0a42a";
+      };
+    };
+    "bs58check-2.1.2" = {
+      name = "bs58check";
+      packageName = "bs58check";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz";
+        sha512 = "0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==";
+      };
+    };
     "bser-2.1.1" = {
       name = "bser";
       packageName = "bser";
@@ -12874,13 +13045,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001158" = {
+    "caniuse-lite-1.0.30001159" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001158";
+      version = "1.0.30001159";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001158.tgz";
-        sha512 = "s5loVYY+yKpuVA3HyW8BarzrtJvwHReuzugQXlv1iR3LKSReoFXRm86mT6hT7PEF5RxW+XQZg+6nYjlywYzQ+g==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz";
+        sha512 = "w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA==";
       };
     };
     "canvas-2.6.1" = {
@@ -16214,6 +16385,15 @@ let
         sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==";
       };
     };
+    "crypto-js-3.1.9-1" = {
+      name = "crypto-js";
+      packageName = "crypto-js";
+      version = "3.1.9-1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz";
+        sha1 = "fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8";
+      };
+    };
     "crypto-random-string-1.0.0" = {
       name = "crypto-random-string";
       packageName = "crypto-random-string";
@@ -16394,13 +16574,13 @@ let
         sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==";
       };
     };
-    "css-tree-1.0.1" = {
+    "css-tree-1.1.0" = {
       name = "css-tree";
       packageName = "css-tree";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.1.tgz";
-        sha512 = "WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA==";
+        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.0.tgz";
+        sha512 = "SKwwAnwRPotiopzQBpK4o+W6Uu8PA759iWdJ1EXy3zkj+sSUcsdhnhvdv4dy5AtjcX0OGXxS7h73YAMXu8QXBw==";
       };
     };
     "css-what-1.0.0" = {
@@ -17663,6 +17843,15 @@ let
         sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492";
       };
     };
+    "debugnyan-1.0.0" = {
+      name = "debugnyan";
+      packageName = "debugnyan";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debugnyan/-/debugnyan-1.0.0.tgz";
+        sha1 = "90386d5ebc2c63588f17f272be5c2a93b7665d83";
+      };
+    };
     "decache-4.4.0" = {
       name = "decache";
       packageName = "decache";
@@ -19301,6 +19490,15 @@ let
         sha512 = "1l9K4UnQQHSfKgeHeLrxnB53AidCZqPyf9dkRL4/fZl8//NPiiDD43zHtgylw8DHlO7gvM8+O5a0UPHesNYZKw==";
       };
     };
+    "double-ended-queue-2.1.0-0" = {
+      name = "double-ended-queue";
+      packageName = "double-ended-queue";
+      version = "2.1.0-0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz";
+        sha1 = "103d3527fd31528f40188130c841efdd78264e5c";
+      };
+    };
     "downgrade-root-1.2.2" = {
       name = "downgrade-root";
       packageName = "downgrade-root";
@@ -19652,13 +19850,23 @@ let
         sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
       };
     };
-    "electron-to-chromium-1.3.597" = {
+    "electron-to-chromium-1.3.598" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.597";
+      version = "1.3.598";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.597.tgz";
-        sha512 = "VJI21MucKaqyFw0oe3j9BIg+nDF4MHzUZAmUwZzrxho+s8zPCD13Fds07Rgu+MTtAadO4tYTKFdAUksKYUyIJw==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.598.tgz";
+        sha512 = "G5Ztk23/ubLYVPxPXnB1uu105uzIPd4xB/D8ld8x1GaSC9+vU9NZL16nYZya8H77/7CCKKN7dArzJL3pBs8N7A==";
+      };
+    };
+    "electrum-client-git://github.com/janoside/electrum-client" = {
+      name = "electrum-client";
+      packageName = "electrum-client";
+      version = "1.1.7";
+      src = fetchgit {
+        url = "git://github.com/janoside/electrum-client";
+        rev = "d98e929028d2b05c88a41fe37652737912bead79";
+        sha256 = "d6dfc396ae69eba6efa303039d6ebb46a5cd51d1b79a293f915609057b9062be";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -19959,13 +20167,13 @@ let
         sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==";
       };
     };
-    "engine.io-4.0.3" = {
+    "engine.io-4.0.4" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.3.tgz";
-        sha512 = "EPA9Bbn0ZHumQvW6ibggmzUQGayR0E9gLIA4RJeoXEbZ9lJYoU8HU+dM1rtCdfyDPdbocUEFaZk4Muem33oiNA==";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.4.tgz";
+        sha512 = "4ggUX5pICZU17OTZNFv5+uFE/ZyoK+TIXv2SvxWWX8lwStllQ6Lvvs4lDBqvKpV9EYXNcvlNOcjKChd/mo+8Tw==";
       };
     };
     "engine.io-client-1.3.1" = {
@@ -21831,6 +22039,15 @@ let
         sha512 = "t8HYqkuE3YEqNcyWlAfh55479aTxO+GpYwvQvJppYqyBfSmRdNIhzY2m09FKN/MENTzq4wH6heHOIvsPyMAwvQ==";
       };
     };
+    "fast-csv-4.3.5" = {
+      name = "fast-csv";
+      packageName = "fast-csv";
+      version = "4.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-csv/-/fast-csv-4.3.5.tgz";
+        sha512 = "7csO4GADMDhVcf8UI5/TPdZbNkeToUx2HaRC1KPxYNWjAZ/SAFBBRJGhzlDWg0vgKm92toH6gR7+tsMcc0Fx8Q==";
+      };
+    };
     "fast-deep-equal-1.1.0" = {
       name = "fast-deep-equal";
       packageName = "fast-deep-equal";
@@ -22218,6 +22435,15 @@ let
         sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==";
       };
     };
+    "file-entry-cache-6.0.0" = {
+      name = "file-entry-cache";
+      packageName = "file-entry-cache";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz";
+        sha512 = "fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==";
+      };
+    };
     "file-loader-6.0.0" = {
       name = "file-loader";
       packageName = "file-loader";
@@ -22722,6 +22948,15 @@ let
         sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==";
       };
     };
+    "flat-cache-3.0.4" = {
+      name = "flat-cache";
+      packageName = "flat-cache";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz";
+        sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==";
+      };
+    };
     "flat-tree-1.7.0" = {
       name = "flat-tree";
       packageName = "flat-tree";
@@ -22767,6 +23002,15 @@ let
         sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
       };
     };
+    "flatted-3.1.0" = {
+      name = "flatted";
+      packageName = "flatted";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz";
+        sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==";
+      };
+    };
     "flatten-0.0.1" = {
       name = "flatten";
       packageName = "flatten";
@@ -26945,13 +27189,13 @@ let
         sha512 = "O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==";
       };
     };
-    "immer-7.0.14" = {
+    "immer-7.0.15" = {
       name = "immer";
       packageName = "immer";
-      version = "7.0.14";
+      version = "7.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/immer/-/immer-7.0.14.tgz";
-        sha512 = "BxCs6pJwhgSEUEOZjywW7OA8DXVzfHjkBelSEl0A+nEu0+zS4cFVdNOONvt55N4WOm8Pu4xqSPYxhm1Lv2iBBA==";
+        url = "https://registry.npmjs.org/immer/-/immer-7.0.15.tgz";
+        sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA==";
       };
     };
     "import-cwd-3.0.0" = {
@@ -27629,6 +27873,15 @@ let
         sha512 = "Mb6kv78bTi4RNAIIWL8Bbre7hXOR2pNUi3j8FaQkLaitf/ZWxkq3/iIwXNYk2ACO3IMfdVdQrOkUtwZblO7uBA==";
       };
     };
+    "ip-set-2.1.0" = {
+      name = "ip-set";
+      packageName = "ip-set";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ip-set/-/ip-set-2.1.0.tgz";
+        sha512 = "JdHz4tSMx1IeFj8yEcQU0i58qiSkOlmZXkZ8+HJ0ROV5KcgLRDO9F703oJ1GeZCvqggrcCbmagD/V7hghY62wA==";
+      };
+    };
     "ipaddr.js-0.1.3" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
@@ -29798,6 +30051,15 @@ let
         sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
       };
     };
+    "json-bigint-0.2.3" = {
+      name = "json-bigint";
+      packageName = "json-bigint";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-bigint/-/json-bigint-0.2.3.tgz";
+        sha1 = "118d7f6ff1d38659f19f94cf73e64a75a3f988a8";
+      };
+    };
     "json-buffer-2.0.11" = {
       name = "json-buffer";
       packageName = "json-buffer";
@@ -30266,6 +30528,15 @@ let
         sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3";
       };
     };
+    "jstransformer-markdown-it-2.1.0" = {
+      name = "jstransformer-markdown-it";
+      packageName = "jstransformer-markdown-it";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jstransformer-markdown-it/-/jstransformer-markdown-it-2.1.0.tgz";
+        sha1 = "69ec30ce4518bed5997b38f027648e8c285e92f7";
+      };
+    };
     "jszip-2.6.1" = {
       name = "jszip";
       packageName = "jszip";
@@ -30726,13 +30997,13 @@ let
         sha512 = "wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q==";
       };
     };
-    "known-css-properties-0.19.0" = {
+    "known-css-properties-0.20.0" = {
       name = "known-css-properties";
       packageName = "known-css-properties";
-      version = "0.19.0";
+      version = "0.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.19.0.tgz";
-        sha512 = "eYboRV94Vco725nKMlpkn3nV2+96p9c3gKXRsYqAJSswSENvBhN7n5L+uDhY58xQa0UukWsDMTGELzmD8Q+wTA==";
+        url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.20.0.tgz";
+        sha512 = "URvsjaA9ypfreqJ2/ylDr5MUERhJZ+DhguoWRr2xgS5C7aGCalXo+ewL+GixgKBfhT2vuL02nbIgNGqVWgTOYw==";
       };
     };
     "known-css-properties-0.5.0" = {
@@ -31491,13 +31762,13 @@ let
         sha512 = "8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA==";
       };
     };
-    "load-ip-set-2.1.1" = {
+    "load-ip-set-2.1.2" = {
       name = "load-ip-set";
       packageName = "load-ip-set";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-2.1.1.tgz";
-        sha512 = "LC7BWnATJOrKZa94qKNU8I/cWvVCgHPGSEMZ9hNCd3C5Th+XIUuU5lws6KhCK9QYeSD2xADnLUzkUbzYaRJ/lQ==";
+        url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-2.1.2.tgz";
+        sha512 = "AgO3AGwWPru+tJboq0l2+hIkFqbAE3tbG74z2SCpt+c3h0PFI3t2mHamS707OzSc3b+GBVBKjZxPFz97YZNisA==";
       };
     };
     "load-json-file-1.1.0" = {
@@ -32220,6 +32491,15 @@ let
         sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698";
       };
     };
+    "lodash.escaperegexp-4.1.2" = {
+      name = "lodash.escaperegexp";
+      packageName = "lodash.escaperegexp";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz";
+        sha1 = "64762c48618082518ac3df4ccf5d5886dae20347";
+      };
+    };
     "lodash.filter-4.6.0" = {
       name = "lodash.filter";
       packageName = "lodash.filter";
@@ -32436,6 +32716,15 @@ let
         sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1";
       };
     };
+    "lodash.isfunction-3.0.9" = {
+      name = "lodash.isfunction";
+      packageName = "lodash.isfunction";
+      version = "3.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz";
+        sha512 = "AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==";
+      };
+    };
     "lodash.isinteger-4.0.4" = {
       name = "lodash.isinteger";
       packageName = "lodash.isinteger";
@@ -32463,6 +32752,15 @@ let
         sha1 = "756cb5150ca3ba6f11085a78849645f188f85f37";
       };
     };
+    "lodash.isnil-4.0.0" = {
+      name = "lodash.isnil";
+      packageName = "lodash.isnil";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isnil/-/lodash.isnil-4.0.0.tgz";
+        sha1 = "49e28cd559013458c814c5479d3c663a21bfaa6c";
+      };
+    };
     "lodash.isnumber-3.0.3" = {
       name = "lodash.isnumber";
       packageName = "lodash.isnumber";
@@ -32508,6 +32806,15 @@ let
         sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451";
       };
     };
+    "lodash.isundefined-3.0.1" = {
+      name = "lodash.isundefined";
+      packageName = "lodash.isundefined";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz";
+        sha1 = "23ef3d9535565203a66cefd5b830f848911afb48";
+      };
+    };
     "lodash.iteratee-4.7.0" = {
       name = "lodash.iteratee";
       packageName = "lodash.iteratee";
@@ -34128,6 +34435,24 @@ let
         sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==";
       };
     };
+    "mdast-util-from-markdown-0.8.1" = {
+      name = "mdast-util-from-markdown";
+      packageName = "mdast-util-from-markdown";
+      version = "0.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.1.tgz";
+        sha512 = "qJXNcFcuCSPqUF0Tb0uYcFDIq67qwB3sxo9RPdf9vG8T90ViKnksFqdB/Coq2a7sTnxL/Ify2y7aIQXDkQFH0w==";
+      };
+    };
+    "mdast-util-to-markdown-0.5.3" = {
+      name = "mdast-util-to-markdown";
+      packageName = "mdast-util-to-markdown";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.5.3.tgz";
+        sha512 = "sr8q7fQJ1xoCqZSXW6dO/MYu2Md+a4Hfk9uO+XHCfiBhVM0EgWtfAV7BuN+ff6otUeu2xDyt1o7vhZGwOG3+BA==";
+      };
+    };
     "mdast-util-to-nlcst-4.0.1" = {
       name = "mdast-util-to-nlcst";
       packageName = "mdast-util-to-nlcst";
@@ -34137,6 +34462,15 @@ let
         sha512 = "Y4ffygj85MTt70STKnEquw6k73jYWJBaYcb4ITAKgSNokZF7fH8rEHZ1GsRY/JaxqUevMaEnsDmkVv5Z9uVRdg==";
       };
     };
+    "mdast-util-to-string-1.1.0" = {
+      name = "mdast-util-to-string";
+      packageName = "mdast-util-to-string";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz";
+        sha512 = "jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==";
+      };
+    };
     "mdmanifest-1.0.8" = {
       name = "mdmanifest";
       packageName = "mdmanifest";
@@ -34155,13 +34489,13 @@ let
         sha512 = "yjM/OG0krZIgi+XrhJWS3CJ9UQuGM4FfjIUIt2f65er6qczkM+WjtNEv/9ZF9DxDs/2GR3SO6hDaZLplTRrrfw==";
       };
     };
-    "mdn-data-2.0.12" = {
+    "mdn-data-2.0.14" = {
       name = "mdn-data";
       packageName = "mdn-data";
-      version = "2.0.12";
+      version = "2.0.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.12.tgz";
-        sha512 = "ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==";
+        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz";
+        sha512 = "dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==";
       };
     };
     "mdn-data-2.0.4" = {
@@ -34533,6 +34867,15 @@ let
         sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==";
       };
     };
+    "merkle-lib-2.0.10" = {
+      name = "merkle-lib";
+      packageName = "merkle-lib";
+      version = "2.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/merkle-lib/-/merkle-lib-2.0.10.tgz";
+        sha1 = "82b8dbae75e27a7785388b73f9d7725d0f6f3326";
+      };
+    };
     "merkle-tree-stream-3.0.3" = {
       name = "merkle-tree-stream";
       packageName = "merkle-tree-stream";
@@ -34704,6 +35047,15 @@ let
         sha512 = "jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==";
       };
     };
+    "micromark-2.10.1" = {
+      name = "micromark";
+      packageName = "micromark";
+      version = "2.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/micromark/-/micromark-2.10.1.tgz";
+        sha512 = "fUuVF8sC1X7wsCS29SYQ2ZfIZYbTymp0EYr6sab3idFjigFFjGa5UwoniPlV9tAgntjuapW1t9U+S0yDYeGKHQ==";
+      };
+    };
     "micromatch-2.3.11" = {
       name = "micromatch";
       packageName = "micromatch";
@@ -35469,6 +35821,15 @@ let
         sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
       };
     };
+    "moment-duration-format-2.3.2" = {
+      name = "moment-duration-format";
+      packageName = "moment-duration-format";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.3.2.tgz";
+        sha512 = "cBMXjSW+fjOb4tyaVHuaVE/A5TqkukDWiOfxxAjY+PEqmmBQlLwn+8OzwPiG3brouXKY5Un4pBjAeB6UToXHaQ==";
+      };
+    };
     "moment-mini-2.24.0" = {
       name = "moment-mini";
       packageName = "moment-mini";
@@ -35577,13 +35938,13 @@ let
         sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw==";
       };
     };
-    "mqtt-4.2.4" = {
+    "mqtt-4.2.5" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "4.2.4";
+      version = "4.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.4.tgz";
-        sha512 = "g3tJt5UOS1Wqn/xntl4JhlJW51OM8CvgEmY8cwZ1zecE5G7uuwjSUUvgGeVDiEMWJ5vXCfZz2VMCQGNvKhzfEQ==";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.5.tgz";
+        sha512 = "l19iRa4en8qM19xYCsdkt2VWg/JPTQTUL0Gq//p1rRUSEBxywicylfGZQy4Ru2Pl/nN5gI0q5E66DIVybGSaRg==";
       };
     };
     "mqtt-packet-6.6.0" = {
@@ -36721,13 +37082,13 @@ let
         sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg==";
       };
     };
-    "node-abi-2.19.1" = {
+    "node-abi-2.19.3" = {
       name = "node-abi";
       packageName = "node-abi";
-      version = "2.19.1";
+      version = "2.19.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz";
-        sha512 = "HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==";
+        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz";
+        sha512 = "9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==";
       };
     };
     "node-addon-api-1.7.2" = {
@@ -38514,13 +38875,13 @@ let
         sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow==";
       };
     };
-    "openapi-framework-7.1.0" = {
+    "openapi-framework-7.2.0" = {
       name = "openapi-framework";
       packageName = "openapi-framework";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.1.0.tgz";
-        sha512 = "GB1TUdv51fYKdvzy0Xg3fLtsuHXJY0v0PR6XGjdSKgxLYK8PA1/dQfxtTRftzx7XVI6uMegdG8aCAPwYTsypWQ==";
+        url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.2.0.tgz";
+        sha512 = "rC4U+SIBVxoTujSIrk84PMquBwkNJfhYC7KTTDUUc7yfIyMVKRat5TOuMDyc49Ovsv+7bdkx1stf7d0N9LbtLg==";
       };
     };
     "openapi-jsonschema-parameters-1.2.0" = {
@@ -38568,13 +38929,13 @@ let
         sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg==";
       };
     };
-    "openapi-request-validator-7.0.2" = {
+    "openapi-request-validator-7.2.0" = {
       name = "openapi-request-validator";
       packageName = "openapi-request-validator";
-      version = "7.0.2";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.0.2.tgz";
-        sha512 = "0JV3gdHNqJgcHwgojPj2f6RqUI02uHI5yUBcKAtLhvQ9tkrgcVTAHdengPyfoLT35NDRWhhQuc8VhS/mUtFI0g==";
+        url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.2.0.tgz";
+        sha512 = "LgXvKco6XR5SKr8QBaM6v0++QXY5MP2yvvKv0Ckutef3css9MAyIcokDsBj6DYYzNnjmFxPx4ntuY7CZTC2ZFA==";
       };
     };
     "openapi-response-validator-4.0.0" = {
@@ -41908,13 +42269,13 @@ let
         sha512 = "uHosRn0y+1wbnlYKrqMjBPoo/kK5LPYImLtiETszNFYfFwAD3cQdD1R2E13Mh5icBxkHj+yKtlIHozCsmVWD/Q==";
       };
     };
-    "posthtml-render-1.3.0" = {
+    "posthtml-render-1.4.0" = {
       name = "posthtml-render";
       packageName = "posthtml-render";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.3.0.tgz";
-        sha512 = "km+kuwydlc2lnx4FnHmTwejGtgmfjBT2fOqu9mDTJUoNecwwMnx4soRxngfJ1Qvpa/OLu1YIqZ+/0OiJDOnCzg==";
+        url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.4.0.tgz";
+        sha512 = "W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw==";
       };
     };
     "prebuild-install-5.3.0" = {
@@ -42367,6 +42728,15 @@ let
         sha512 = "JymvIR4IJ0qTyma7ExefBeJGp2IGaXYGWv8Z//Jq+AhrCd0uKlMPK9IWJ0LL6zbXbAN8fhLe1TL1hl1ZKOljDw==";
       };
     };
+    "prom-client-11.5.3" = {
+      name = "prom-client";
+      packageName = "prom-client";
+      version = "11.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prom-client/-/prom-client-11.5.3.tgz";
+        sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q==";
+      };
+    };
     "promiscuous-0.6.0" = {
       name = "promiscuous";
       packageName = "promiscuous";
@@ -42844,6 +43214,15 @@ let
         sha512 = "GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA==";
       };
     };
+    "puka-1.0.1" = {
+      name = "puka";
+      packageName = "puka";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/puka/-/puka-1.0.1.tgz";
+        sha512 = "ssjRZxBd7BT3dte1RR3VoeT2cT/ODH8x+h0rUF1rMqB0srHYf48stSDWfiYakTp5UBZMxroZhB2+ExLDHm7W3g==";
+      };
+    };
     "pull-abortable-4.0.0" = {
       name = "pull-abortable";
       packageName = "pull-abortable";
@@ -43465,6 +43844,15 @@ let
         sha512 = "pdE/OKi/jnp9DqGgNRzLY0oVHffn/8TXJmBPzv+ikdvpkeA0J//l5d7TZk1yWwZj9P0JcOIEVDOuHzhXaeBlmw==";
       };
     };
+    "pushdata-bitcoin-1.0.1" = {
+      name = "pushdata-bitcoin";
+      packageName = "pushdata-bitcoin";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pushdata-bitcoin/-/pushdata-bitcoin-1.0.1.tgz";
+        sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7";
+      };
+    };
     "q-0.9.7" = {
       name = "q";
       packageName = "q";
@@ -43510,6 +43898,15 @@ let
         sha512 = "8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==";
       };
     };
+    "qrcode-1.4.4" = {
+      name = "qrcode";
+      packageName = "qrcode";
+      version = "1.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qrcode/-/qrcode-1.4.4.tgz";
+        sha512 = "oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q==";
+      };
+    };
     "qrcode-terminal-0.11.0" = {
       name = "qrcode-terminal";
       packageName = "qrcode-terminal";
@@ -44608,6 +45005,33 @@ let
         sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b";
       };
     };
+    "redis-2.8.0" = {
+      name = "redis";
+      packageName = "redis";
+      version = "2.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz";
+        sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==";
+      };
+    };
+    "redis-commands-1.6.0" = {
+      name = "redis-commands";
+      packageName = "redis-commands";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.6.0.tgz";
+        sha512 = "2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ==";
+      };
+    };
+    "redis-parser-2.6.0" = {
+      name = "redis-parser";
+      packageName = "redis-parser";
+      version = "2.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz";
+        sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b";
+      };
+    };
     "redoc-2.0.0-rc.47" = {
       name = "redoc";
       packageName = "redoc";
@@ -44923,13 +45347,13 @@ let
         sha512 = "b7wGPo7o2KE/g7SqkJDDbav6zmrEeP4TK2VpITU72J/M949TLe/23y/ZHJo+pskcGM52xIfFoT9hydwmgr1AEg==";
       };
     };
-    "remark-12.0.1" = {
+    "remark-13.0.0" = {
       name = "remark";
       packageName = "remark";
-      version = "12.0.1";
+      version = "13.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/remark/-/remark-12.0.1.tgz";
-        sha512 = "gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==";
+        url = "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz";
+        sha512 = "HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==";
       };
     };
     "remark-3.2.3" = {
@@ -45022,6 +45446,15 @@ let
         sha512 = "E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==";
       };
     };
+    "remark-parse-9.0.0" = {
+      name = "remark-parse";
+      packageName = "remark-parse";
+      version = "9.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz";
+        sha512 = "geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==";
+      };
+    };
     "remark-retext-4.0.0" = {
       name = "remark-retext";
       packageName = "remark-retext";
@@ -45049,6 +45482,15 @@ let
         sha512 = "q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==";
       };
     };
+    "remark-stringify-9.0.0" = {
+      name = "remark-stringify";
+      packageName = "remark-stringify";
+      version = "9.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.0.tgz";
+        sha512 = "8x29DpTbVzEc6Dwb90qhxCtbZ6hmj3BxWWDpMhA+1WM4dOEGH5U5/GFe3Be5Hns5MvPSFAr1e2KSVtKZkK5nUw==";
+      };
+    };
     "remote-git-tags-3.0.0" = {
       name = "remote-git-tags";
       packageName = "remote-git-tags";
@@ -45949,13 +46391,13 @@ let
         sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
       };
     };
-    "rollup-2.33.2" = {
+    "rollup-2.33.3" = {
       name = "rollup";
       packageName = "rollup";
-      version = "2.33.2";
+      version = "2.33.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup/-/rollup-2.33.2.tgz";
-        sha512 = "QPQ6/fWCrzHtSXkI269rhKaC7qXGghYBwXU04b1JsDZ6ibZa3DJ9D1SFAYRMgx1inDg0DaTbb3N4Z1NK/r3fhw==";
+        url = "https://registry.npmjs.org/rollup/-/rollup-2.33.3.tgz";
+        sha512 = "RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w==";
       };
     };
     "rollup-plugin-babel-4.4.0" = {
@@ -47047,13 +47489,13 @@ let
         sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd";
       };
     };
-    "service-runner-2.7.8" = {
+    "service-runner-2.8.0" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.7.8";
+      version = "2.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.7.8.tgz";
-        sha512 = "YZBOj9wRzWEiBgIfrvq7OFVf9wr0u/llyeIsZjrd6tyrjJz2ywB9DiGpWb7/+MVswi970bgAw6+OUCq+9luyuw==";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.8.0.tgz";
+        sha512 = "U5hxzVsLFxZgd3hLecTgdhKNZfTsjcp0407ceICGdC5X2Qrz31pHsoMMSH1s+9/Fac+Y3NKpgd6vPvmJvl/bvw==";
       };
     };
     "set-blocking-1.0.0" = {
@@ -49459,6 +49901,15 @@ let
         sha1 = "51f9c6a08c146473fcd021af551c9f32ed5c7b9d";
       };
     };
+    "standard-error-1.1.0" = {
+      name = "standard-error";
+      packageName = "standard-error";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/standard-error/-/standard-error-1.1.0.tgz";
+        sha1 = "23e5168fa1c0820189e5812701a79058510d0d34";
+      };
+    };
     "stat-mode-0.2.2" = {
       name = "stat-mode";
       packageName = "stat-mode";
@@ -50530,13 +50981,13 @@ let
         sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==";
       };
     };
-    "stylelint-13.7.2" = {
+    "stylelint-13.8.0" = {
       name = "stylelint";
       packageName = "stylelint";
-      version = "13.7.2";
+      version = "13.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stylelint/-/stylelint-13.7.2.tgz";
-        sha512 = "mmieorkfmO+ZA6CNDu1ic9qpt4tFvH2QUB7vqXgrMVHe5ENU69q7YDq0YUg/UHLuCsZOWhUAvcMcLzLDIERzSg==";
+        url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz";
+        sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ==";
       };
     };
     "stylelint-8.4.0" = {
@@ -51350,6 +51801,15 @@ let
         sha1 = "9450e8768c83b416fd4d1a6a9449eeccbf496c29";
       };
     };
+    "tdigest-0.1.1" = {
+      name = "tdigest";
+      packageName = "tdigest";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz";
+        sha1 = "2e3cb2c39ea449e55d1e6cd91117accca4588021";
+      };
+    };
     "telegraf-3.38.0" = {
       name = "telegraf";
       packageName = "telegraf";
@@ -51989,6 +52449,15 @@ let
         sha512 = "pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==";
       };
     };
+    "tiny-secp256k1-1.1.5" = {
+      name = "tiny-secp256k1";
+      packageName = "tiny-secp256k1";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.5.tgz";
+        sha512 = "duE2hSLSQIpHGzmK48OgRrGTi+4OTkXLC6aa86uOYQ6LLCYZSarVKIAvEtY7MoXjoL6bOXMSerEGMzrvW4SkDw==";
+      };
+    };
     "tinycolor-0.0.1" = {
       name = "tinycolor";
       packageName = "tinycolor";
@@ -53276,6 +53745,15 @@ let
         sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
+    "typeforce-1.18.0" = {
+      name = "typeforce";
+      packageName = "typeforce";
+      version = "1.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typeforce/-/typeforce-1.18.0.tgz";
+        sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==";
+      };
+    };
     "typescript-2.9.2" = {
       name = "typescript";
       packageName = "typescript";
@@ -53420,15 +53898,6 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.11.4" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "3.11.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.4.tgz";
-        sha512 = "FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw==";
-      };
-    };
     "uglify-js-3.11.6" = {
       name = "uglify-js";
       packageName = "uglify-js";
@@ -55194,6 +55663,15 @@ let
         sha512 = "lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==";
       };
     };
+    "varuint-bitcoin-1.1.2" = {
+      name = "varuint-bitcoin";
+      packageName = "varuint-bitcoin";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/varuint-bitcoin/-/varuint-bitcoin-1.1.2.tgz";
+        sha512 = "4EVb+w4rx+YfVM32HQX42AbbT7/1f5zwAYhIujKXKk8NQK+JfRVl3pqT3hjNn/L+RstigmGGKVwHA/P0wgITZw==";
+      };
+    };
     "vary-1.1.2" = {
       name = "vary";
       packageName = "vary";
@@ -56229,6 +56707,15 @@ let
         sha512 = "NlKJyGcET/ZBCCLBYIPaGo2c37R03bPYeWXozUtnjyye7+9dhlbMSODyoG2INcQf8zFmB4qhm2UOJjgYEgPCNA==";
       };
     };
+    "vscode-languageserver-types-3.16.0-next.5" = {
+      name = "vscode-languageserver-types";
+      packageName = "vscode-languageserver-types";
+      version = "3.16.0-next.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.5.tgz";
+        sha512 = "lf8Y1XXMtF1r2oDDAmJe+drizNXkybSRXAQQk5dPy2rYJsY9SPXYNO074L3THu9zNYepzV5fRJZUPo/V/TLBRQ==";
+      };
+    };
     "vscode-languageserver-types-3.5.0" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
@@ -57039,6 +57526,15 @@ let
         sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==";
       };
     };
+    "wif-2.0.6" = {
+      name = "wif";
+      packageName = "wif";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz";
+        sha1 = "08d3f52056c66679299726fade0d432ae74b4704";
+      };
+    };
     "wikimedia-langconv-0.1.0" = {
       name = "wikimedia-langconv";
       packageName = "wikimedia-langconv";
@@ -58768,6 +59264,15 @@ let
         sha1 = "66c6de82cc36b09734b820703776490a6fbbe624";
       };
     };
+    "zwitch-1.0.5" = {
+      name = "zwitch";
+      packageName = "zwitch";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz";
+        sha512 = "V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==";
+      };
+    };
     "zxcvbn-4.4.2" = {
       name = "zxcvbn";
       packageName = "zxcvbn";
@@ -59665,7 +60170,7 @@ in
       sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
       sources."@types/json5-0.0.29"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/parse-json-4.0.0"
       sources."@types/source-list-map-0.1.2"
       sources."@types/tapable-1.0.6"
@@ -59716,7 +60221,7 @@ in
       sources."browserslist-4.14.7"
       sources."buffer-from-1.1.1"
       sources."callsites-3.1.0"
-      sources."caniuse-lite-1.0.30001158"
+      sources."caniuse-lite-1.0.30001159"
       sources."chalk-3.0.0"
       sources."chardet-0.7.0"
       sources."chokidar-3.4.3"
@@ -59737,7 +60242,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.3.597"
+      sources."electron-to-chromium-1.3.598"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enhanced-resolve-4.3.0"
@@ -59980,7 +60485,7 @@ in
       sources."@apollo/federation-0.20.4"
       (sources."@apollo/protobufjs-1.0.5" // {
         dependencies = [
-          sources."@types/node-10.17.44"
+          sources."@types/node-10.17.45"
         ];
       })
       sources."@apollographql/apollo-tools-0.4.8"
@@ -60296,7 +60801,7 @@ in
       sources."@types/long-4.0.1"
       sources."@types/mime-2.0.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       (sources."@types/node-fetch-2.5.7" // {
         dependencies = [
           sources."form-data-3.0.0"
@@ -60305,7 +60810,7 @@ in
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
-      sources."@types/serve-static-1.13.7"
+      sources."@types/serve-static-1.13.8"
       sources."@types/through-0.0.30"
       sources."@types/ws-7.4.0"
       sources."@types/zen-observable-0.8.1"
@@ -60537,7 +61042,7 @@ in
       sources."callsites-2.0.0"
       sources."camel-case-4.1.1"
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001158"
+      sources."caniuse-lite-1.0.30001159"
       sources."capital-case-1.0.3"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
@@ -60746,7 +61251,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.597"
+      sources."electron-to-chromium-1.3.598"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
@@ -62159,7 +62664,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
@@ -62707,6 +63212,451 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  btc-rpc-explorer = nodeEnv.buildNodePackage {
+    name = "btc-rpc-explorer";
+    packageName = "btc-rpc-explorer";
+    version = "2.0.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-2.0.2.tgz";
+      sha512 = "TTdFGXzJ8HLn4PCNYRS4S7P3SgglZkBtJeNQP8r7tTjbugoameVvzDOLgVAy/zPQVoUXBuBPfnbm4Sky9VJOmw==";
+    };
+    dependencies = [
+      sources."@types/babel-types-7.0.9"
+      sources."@types/babylon-6.16.5"
+      sources."@types/node-10.12.18"
+      sources."@uphold/request-logger-2.0.0"
+      sources."accepts-1.3.7"
+      sources."acorn-3.3.0"
+      (sources."acorn-globals-3.1.0" // {
+        dependencies = [
+          sources."acorn-4.0.13"
+        ];
+      })
+      sources."ajv-6.12.6"
+      sources."align-text-0.1.4"
+      sources."ansi-regex-4.1.0"
+      sources."ansi-styles-3.2.1"
+      sources."argparse-1.0.10"
+      sources."array-find-index-1.0.2"
+      sources."array-flatten-1.1.1"
+      sources."arrify-1.0.1"
+      sources."asap-2.0.6"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."async-3.2.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.11.0"
+      sources."babel-runtime-6.26.0"
+      sources."babel-types-6.26.0"
+      sources."babylon-6.18.0"
+      sources."balanced-match-1.0.0"
+      sources."base-x-3.0.8"
+      sources."base64-js-1.5.1"
+      sources."basic-auth-2.0.1"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."bech32-1.1.4"
+      sources."bignumber.js-4.1.0"
+      sources."bindings-1.5.0"
+      sources."bip174-2.0.1"
+      sources."bip32-2.0.6"
+      sources."bip66-1.1.5"
+      (sources."bitcoin-core-2.3.0" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
+      sources."bitcoin-ops-1.4.1"
+      sources."bitcoinjs-lib-5.2.0"
+      sources."bluebird-3.7.2"
+      sources."bn.js-4.11.9"
+      (sources."body-parser-1.19.0" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
+      sources."brace-expansion-1.1.11"
+      sources."brorand-1.1.0"
+      sources."bs58-4.0.1"
+      sources."bs58check-2.1.2"
+      sources."buffer-5.7.1"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
+      sources."buffer-fill-1.0.0"
+      sources."buffer-from-1.1.1"
+      sources."bunyan-1.8.14"
+      sources."bytes-3.1.0"
+      sources."camelcase-4.1.0"
+      sources."camelcase-keys-4.2.0"
+      sources."caseless-0.12.0"
+      sources."center-align-0.1.3"
+      sources."character-parser-2.2.0"
+      sources."charenc-0.0.2"
+      sources."cipher-base-1.0.4"
+      sources."clean-css-4.2.3"
+      sources."cliui-2.1.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."combined-stream-1.0.8"
+      sources."concat-map-0.0.1"
+      sources."constantinople-3.1.2"
+      sources."content-disposition-0.5.3"
+      sources."content-type-1.0.4"
+      sources."cookie-0.4.0"
+      sources."cookie-parser-1.4.5"
+      sources."cookie-signature-1.0.6"
+      sources."core-js-2.6.11"
+      sources."core-util-is-1.0.2"
+      sources."create-hash-1.2.0"
+      sources."create-hmac-1.1.7"
+      sources."crypt-0.0.2"
+      sources."crypto-js-3.1.9-1"
+      sources."csrf-3.1.0"
+      (sources."csurf-1.11.0" // {
+        dependencies = [
+          sources."http-errors-1.7.3"
+        ];
+      })
+      sources."currently-unhandled-0.4.1"
+      sources."dashdash-1.14.1"
+      (sources."debug-4.1.1" // {
+        dependencies = [
+          sources."ms-2.1.2"
+        ];
+      })
+      (sources."debugnyan-1.0.0" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
+      sources."decamelize-1.2.0"
+      (sources."decamelize-keys-1.1.0" // {
+        dependencies = [
+          sources."map-obj-1.0.1"
+        ];
+      })
+      sources."decimal.js-10.2.1"
+      sources."delayed-stream-1.0.0"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."dijkstrajs-1.0.1"
+      sources."doctypes-1.1.0"
+      sources."dotenv-8.2.0"
+      sources."double-ended-queue-2.1.0-0"
+      sources."dtrace-provider-0.8.8"
+      sources."ecc-jsbn-0.1.2"
+      sources."ee-first-1.1.1"
+      sources."electrum-client-git://github.com/janoside/electrum-client"
+      sources."elliptic-6.5.3"
+      sources."emoji-regex-7.0.3"
+      sources."encodeurl-1.0.2"
+      sources."entities-1.1.2"
+      sources."error-ex-1.3.2"
+      sources."escape-html-1.0.3"
+      sources."esutils-2.0.3"
+      sources."etag-1.8.1"
+      (sources."express-4.17.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
+      (sources."express-session-1.17.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."depd-2.0.0"
+          sources."safe-buffer-5.2.0"
+        ];
+      })
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-3.1.3"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."file-uri-to-path-1.0.0"
+      (sources."finalhandler-1.1.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
+      sources."find-up-2.1.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."forwarded-0.1.2"
+      sources."fresh-0.5.2"
+      sources."function-bind-1.1.1"
+      sources."get-caller-file-2.0.5"
+      sources."getpass-0.1.7"
+      sources."glob-6.0.4"
+      sources."graceful-fs-4.2.4"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.5"
+      sources."has-1.0.3"
+      sources."has-symbols-1.0.1"
+      (sources."hash-base-3.1.0" // {
+        dependencies = [
+          sources."safe-buffer-5.2.1"
+        ];
+      })
+      sources."hash.js-1.1.7"
+      sources."hmac-drbg-1.0.1"
+      sources."hosted-git-info-2.8.8"
+      (sources."http-errors-1.7.2" // {
+        dependencies = [
+          sources."inherits-2.0.3"
+        ];
+      })
+      sources."http-signature-1.2.0"
+      sources."iconv-lite-0.4.24"
+      sources."ieee754-1.2.1"
+      sources."indent-string-3.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."ipaddr.js-1.9.1"
+      sources."is-arrayish-0.2.1"
+      sources."is-buffer-1.1.6"
+      sources."is-core-module-2.1.0"
+      (sources."is-expression-3.0.0" // {
+        dependencies = [
+          sources."acorn-4.0.13"
+        ];
+      })
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-plain-obj-1.1.0"
+      sources."is-promise-2.2.2"
+      sources."is-regex-1.1.1"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-2.0.5"
+      sources."isstream-0.1.2"
+      sources."js-stringify-1.0.2"
+      sources."jsbn-0.1.1"
+      sources."json-bigint-0.2.3"
+      sources."json-parse-better-errors-1.0.2"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
+      sources."jstransformer-1.0.0"
+      sources."jstransformer-markdown-it-2.1.0"
+      sources."kind-of-3.2.2"
+      sources."lazy-cache-1.0.4"
+      sources."linkify-it-2.2.0"
+      sources."load-json-file-4.0.0"
+      sources."locate-path-2.0.0"
+      sources."lodash-4.17.20"
+      sources."longest-1.0.1"
+      sources."loud-rejection-1.6.0"
+      sources."lru-cache-5.1.1"
+      sources."map-obj-2.0.0"
+      sources."markdown-it-8.4.2"
+      sources."marked-0.7.0"
+      sources."md5-2.3.0"
+      sources."md5.js-1.3.5"
+      sources."mdurl-1.0.1"
+      sources."media-typer-0.3.0"
+      sources."meow-5.0.0"
+      sources."merge-descriptors-1.0.1"
+      sources."merkle-lib-2.0.10"
+      sources."methods-1.1.2"
+      sources."mime-1.6.0"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
+      sources."minimalistic-assert-1.0.1"
+      sources."minimalistic-crypto-utils-1.0.1"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.5"
+      sources."minimist-options-3.0.2"
+      sources."mkdirp-0.5.5"
+      sources."moment-2.29.1"
+      sources."moment-duration-format-2.3.2"
+      (sources."morgan-1.10.0" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."depd-2.0.0"
+        ];
+      })
+      sources."ms-2.0.0"
+      sources."mv-2.1.1"
+      sources."nan-2.14.2"
+      sources."ncp-2.0.0"
+      sources."negotiator-0.6.2"
+      (sources."normalize-package-data-2.5.0" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
+      sources."oauth-sign-0.9.0"
+      sources."object-assign-4.1.1"
+      sources."on-finished-2.3.0"
+      sources."on-headers-1.0.2"
+      sources."once-1.4.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."parse-json-4.0.0"
+      sources."parseurl-1.3.3"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-parse-1.0.6"
+      sources."path-to-regexp-0.1.7"
+      sources."path-type-3.0.0"
+      sources."performance-now-2.1.0"
+      sources."pify-3.0.0"
+      sources."pngjs-3.4.0"
+      sources."promise-7.3.1"
+      sources."proxy-addr-2.0.6"
+      sources."psl-1.8.0"
+      sources."pug-2.0.4"
+      sources."pug-attrs-2.0.4"
+      sources."pug-code-gen-2.0.2"
+      sources."pug-error-1.3.3"
+      sources."pug-filters-3.1.1"
+      sources."pug-lexer-4.1.0"
+      sources."pug-linker-3.0.6"
+      sources."pug-load-2.0.12"
+      sources."pug-parser-5.0.1"
+      sources."pug-runtime-2.0.5"
+      sources."pug-strip-comments-1.0.4"
+      sources."pug-walk-1.1.8"
+      sources."punycode-2.1.1"
+      sources."pushdata-bitcoin-1.0.1"
+      (sources."qrcode-1.4.4" // {
+        dependencies = [
+          sources."camelcase-5.3.1"
+          sources."cliui-5.0.0"
+          sources."find-up-3.0.0"
+          sources."locate-path-3.0.0"
+          sources."p-limit-2.3.0"
+          sources."p-locate-3.0.0"
+          sources."p-try-2.2.0"
+          sources."yargs-13.3.2"
+          sources."yargs-parser-13.1.2"
+        ];
+      })
+      sources."qs-6.7.0"
+      sources."quick-lru-1.1.0"
+      sources."random-bytes-1.0.0"
+      sources."randombytes-2.1.0"
+      sources."range-parser-1.2.1"
+      sources."raw-body-2.4.0"
+      sources."read-pkg-3.0.0"
+      sources."read-pkg-up-3.0.0"
+      sources."readable-stream-3.6.0"
+      sources."redent-2.0.0"
+      sources."redis-2.8.0"
+      sources."redis-commands-1.6.0"
+      sources."redis-parser-2.6.0"
+      sources."regenerator-runtime-0.11.1"
+      sources."repeat-string-1.6.1"
+      (sources."request-2.88.2" // {
+        dependencies = [
+          sources."qs-6.5.2"
+        ];
+      })
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-2.0.0"
+      sources."resolve-1.19.0"
+      sources."right-align-0.1.3"
+      sources."rimraf-2.4.5"
+      sources."ripemd160-2.0.2"
+      sources."rndm-1.2.0"
+      sources."safe-buffer-5.1.2"
+      sources."safe-json-stringify-1.2.0"
+      sources."safer-buffer-2.1.2"
+      sources."semver-7.3.2"
+      (sources."send-0.17.1" // {
+        dependencies = [
+          (sources."debug-2.6.9" // {
+            dependencies = [
+              sources."ms-2.0.0"
+            ];
+          })
+          sources."ms-2.1.1"
+        ];
+      })
+      (sources."serve-favicon-2.5.0" // {
+        dependencies = [
+          sources."ms-2.1.1"
+          sources."safe-buffer-5.1.1"
+        ];
+      })
+      sources."serve-static-1.14.1"
+      sources."set-blocking-2.0.0"
+      sources."setprototypeof-1.1.1"
+      sources."sha.js-2.4.11"
+      sources."signal-exit-3.0.3"
+      sources."simple-git-1.132.0"
+      sources."source-map-0.6.1"
+      sources."spdx-correct-3.1.1"
+      sources."spdx-exceptions-2.3.0"
+      sources."spdx-expression-parse-3.0.1"
+      sources."spdx-license-ids-3.0.6"
+      sources."sprintf-js-1.0.3"
+      sources."sshpk-1.16.1"
+      sources."standard-error-1.1.0"
+      sources."statuses-1.5.0"
+      sources."string-width-3.1.0"
+      (sources."string_decoder-1.3.0" // {
+        dependencies = [
+          sources."safe-buffer-5.2.1"
+        ];
+      })
+      sources."strip-ansi-5.2.0"
+      sources."strip-bom-3.0.0"
+      sources."strip-indent-2.0.0"
+      sources."tiny-secp256k1-1.1.5"
+      sources."to-fast-properties-1.0.3"
+      sources."toidentifier-1.0.0"
+      sources."token-stream-0.0.1"
+      sources."tough-cookie-2.5.0"
+      sources."trim-newlines-2.0.0"
+      sources."tsscmp-1.0.6"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-is-1.6.18"
+      sources."typeforce-1.18.0"
+      sources."uc.micro-1.0.6"
+      (sources."uglify-js-2.8.29" // {
+        dependencies = [
+          sources."source-map-0.5.7"
+        ];
+      })
+      sources."uglify-to-browserify-1.0.2"
+      sources."uid-safe-2.1.5"
+      sources."unpipe-1.0.0"
+      sources."uri-js-4.4.0"
+      sources."util-deprecate-1.0.2"
+      sources."utils-merge-1.0.1"
+      sources."uuid-3.4.0"
+      sources."validate-npm-package-license-3.0.4"
+      sources."varuint-bitcoin-1.1.2"
+      sources."vary-1.1.2"
+      sources."verror-1.10.0"
+      sources."void-elements-2.0.1"
+      sources."which-module-2.0.0"
+      sources."wif-2.0.6"
+      sources."window-size-0.1.0"
+      sources."with-5.1.1"
+      sources."wordwrap-0.0.2"
+      sources."wrap-ansi-5.1.0"
+      sources."wrappy-1.0.2"
+      sources."y18n-4.0.0"
+      sources."yallist-3.1.1"
+      (sources."yargs-3.10.0" // {
+        dependencies = [
+          sources."camelcase-1.2.1"
+        ];
+      })
+      sources."yargs-parser-10.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Open-source, self-hosted Bitcoin explorer";
+      homepage = "https://github.com/janoside/btc-rpc-explorer#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   castnow = nodeEnv.buildNodePackage {
     name = "castnow";
     packageName = "castnow";
@@ -62727,7 +63677,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.30"
+      sources."@types/node-13.13.31"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
       sources."ajv-6.12.6"
@@ -63777,7 +64727,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
-      sources."caniuse-lite-1.0.30001158"
+      sources."caniuse-lite-1.0.30001159"
       sources."capture-stack-trace-1.0.1"
       sources."ccount-1.1.0"
       sources."chalk-2.4.2"
@@ -63874,7 +64824,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.597"
+      sources."electron-to-chromium-1.3.598"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -64713,10 +65663,10 @@ in
   coc-rust-analyzer = nodeEnv.buildNodePackage {
     name = "coc-rust-analyzer";
     packageName = "coc-rust-analyzer";
-    version = "0.15.0";
+    version = "0.16.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.15.0.tgz";
-      sha512 = "0hSwXiDZTOVskAlCM7T5HqEixWw5FnSRnc1Uweq8slqxwBnGa6x68akVqa674MEM0KhbJi/H6TDE6q8LzUR58g==";
+      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.16.0.tgz";
+      sha512 = "fZk7sIDnex4PCibUZX14cIkJZvMb4ibZtdLHvSF1dtQsRvxxifSPHsnUsLwvHMm/rxStFTD2q27B20ZXaFbpgg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64816,7 +65766,8 @@ in
       sources."@nodelib/fs.stat-2.0.3"
       sources."@nodelib/fs.walk-1.2.4"
       sources."@stylelint/postcss-css-in-js-0.37.2"
-      sources."@stylelint/postcss-markdown-0.36.1"
+      sources."@stylelint/postcss-markdown-0.36.2"
+      sources."@types/mdast-3.0.3"
       sources."@types/minimist-1.2.1"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse-json-4.0.0"
@@ -64836,8 +65787,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001158"
-      sources."ccount-1.1.0"
+      sources."caniuse-lite-1.0.30001159"
       (sources."chalk-4.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -64848,11 +65798,9 @@ in
         ];
       })
       sources."character-entities-1.2.4"
-      sources."character-entities-html4-1.1.4"
       sources."character-entities-legacy-1.1.4"
       sources."character-reference-invalid-1.1.4"
       sources."clone-regexp-2.2.0"
-      sources."collapse-white-space-1.0.6"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."colorette-1.2.1"
@@ -64877,7 +65825,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.597"
+      sources."electron-to-chromium-1.3.598"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -64891,11 +65839,11 @@ in
       sources."fast-json-stable-stringify-2.1.0"
       sources."fastest-levenshtein-1.0.12"
       sources."fastq-1.9.0"
-      sources."file-entry-cache-5.0.1"
+      sources."file-entry-cache-6.0.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
-      sources."flat-cache-2.0.1"
-      sources."flatted-2.0.2"
+      sources."flat-cache-3.0.4"
+      sources."flatted-3.1.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.2"
@@ -64911,7 +65859,7 @@ in
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
-      sources."hosted-git-info-2.8.8"
+      sources."hosted-git-info-3.0.7"
       sources."html-tags-3.1.0"
       sources."htmlparser2-3.10.1"
       sources."ignore-5.1.8"
@@ -64928,7 +65876,6 @@ in
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
       sources."is-alphabetical-1.0.4"
-      sources."is-alphanumeric-1.0.0"
       sources."is-alphanumerical-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-2.0.5"
@@ -64942,8 +65889,6 @@ in
       sources."is-plain-obj-2.1.0"
       sources."is-regexp-2.1.0"
       sources."is-typedarray-1.0.0"
-      sources."is-whitespace-character-1.0.4"
-      sources."is-word-character-1.0.4"
       sources."isexe-2.0.0"
       sources."js-tokens-4.0.0"
       sources."jsesc-2.5.2"
@@ -64951,19 +65896,21 @@ in
       sources."json-schema-traverse-0.4.1"
       sources."json5-2.1.3"
       sources."kind-of-6.0.3"
-      sources."known-css-properties-0.19.0"
+      sources."known-css-properties-0.20.0"
       sources."lines-and-columns-1.1.6"
       sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."log-symbols-4.0.0"
       sources."longest-streak-2.0.4"
+      sources."lru-cache-6.0.0"
       sources."map-obj-4.1.0"
-      sources."markdown-escapes-1.0.4"
-      sources."markdown-table-2.0.0"
       sources."mathml-tag-names-2.1.3"
-      sources."mdast-util-compact-2.0.1"
-      sources."meow-7.1.1"
+      sources."mdast-util-from-markdown-0.8.1"
+      sources."mdast-util-to-markdown-0.5.3"
+      sources."mdast-util-to-string-1.1.0"
+      sources."meow-8.0.0"
       sources."merge2-1.4.1"
+      sources."micromark-2.10.1"
       sources."micromatch-4.0.2"
       sources."min-indent-1.0.1"
       sources."minimatch-3.0.4"
@@ -64973,10 +65920,13 @@ in
           sources."is-plain-obj-1.1.0"
         ];
       })
-      sources."mkdirp-0.5.5"
       sources."ms-2.1.2"
       sources."node-releases-1.1.67"
-      sources."normalize-package-data-2.5.0"
+      (sources."normalize-package-data-3.0.0" // {
+        dependencies = [
+          sources."semver-7.3.2"
+        ];
+      })
       sources."normalize-range-0.1.2"
       sources."normalize-selector-0.2.0"
       sources."num2fraction-1.2.2"
@@ -65018,6 +65968,8 @@ in
       sources."quick-lru-4.0.1"
       (sources."read-pkg-5.2.0" // {
         dependencies = [
+          sources."hosted-git-info-2.8.8"
+          sources."normalize-package-data-2.5.0"
           sources."type-fest-0.6.0"
         ];
       })
@@ -65028,15 +65980,15 @@ in
       })
       sources."readable-stream-3.6.0"
       sources."redent-3.0.0"
-      sources."remark-12.0.1"
-      sources."remark-parse-8.0.3"
-      sources."remark-stringify-8.1.1"
+      sources."remark-13.0.0"
+      sources."remark-parse-9.0.0"
+      sources."remark-stringify-9.0.0"
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
       sources."resolve-1.19.0"
       sources."resolve-from-5.0.0"
       sources."reusify-1.0.4"
-      sources."rimraf-2.6.3"
+      sources."rimraf-3.0.2"
       sources."run-parallel-1.1.10"
       sources."safe-buffer-5.1.2"
       sources."semver-5.7.1"
@@ -65055,45 +66007,36 @@ in
       sources."spdx-expression-parse-3.0.1"
       sources."spdx-license-ids-3.0.6"
       sources."specificity-0.4.1"
-      sources."state-toggle-1.0.3"
       sources."string-width-4.2.0"
       (sources."string_decoder-1.3.0" // {
         dependencies = [
           sources."safe-buffer-5.2.1"
         ];
       })
-      sources."stringify-entities-3.1.0"
       sources."strip-ansi-6.0.0"
       sources."strip-indent-3.0.0"
       sources."style-search-0.1.0"
-      sources."stylelint-13.7.2"
+      sources."stylelint-13.8.0"
       sources."sugarss-2.0.0"
       sources."supports-color-5.5.0"
       sources."svg-tags-1.0.0"
       sources."table-6.0.3"
       sources."to-fast-properties-2.0.0"
       sources."to-regex-range-5.0.1"
-      sources."trim-0.0.1"
       sources."trim-newlines-3.0.0"
-      sources."trim-trailing-lines-1.1.4"
       sources."trough-1.0.5"
-      sources."type-fest-0.13.1"
+      sources."type-fest-0.18.1"
       sources."typedarray-to-buffer-3.1.5"
-      sources."unherit-1.1.3"
       sources."unified-9.2.0"
       sources."uniq-1.0.1"
       sources."unist-util-find-all-after-3.0.2"
       sources."unist-util-is-4.0.3"
-      sources."unist-util-remove-position-2.0.1"
       sources."unist-util-stringify-position-2.0.3"
-      sources."unist-util-visit-2.0.3"
-      sources."unist-util-visit-parents-3.1.1"
       sources."uri-js-4.4.0"
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-2.2.0"
       sources."validate-npm-package-license-3.0.4"
       sources."vfile-4.2.0"
-      sources."vfile-location-3.2.0"
       sources."vfile-message-2.0.4"
       sources."vscode-jsonrpc-5.1.0-next.1"
       sources."vscode-languageserver-6.2.0-next.2"
@@ -65103,15 +66046,15 @@ in
         ];
       })
       sources."vscode-languageserver-textdocument-1.0.1"
-      sources."vscode-languageserver-types-3.16.0-next.4"
+      sources."vscode-languageserver-types-3.16.0-next.5"
       sources."vscode-uri-2.1.2"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
-      sources."write-1.0.3"
       sources."write-file-atomic-3.0.3"
-      sources."xtend-4.0.2"
+      sources."yallist-4.0.0"
       sources."yaml-1.10.0"
-      sources."yargs-parser-18.1.3"
+      sources."yargs-parser-20.2.4"
+      sources."zwitch-1.0.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -66176,7 +67119,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/normalize-package-data-2.4.0"
       sources."aggregate-error-3.1.0"
       sources."ansi-styles-3.2.1"
@@ -66547,7 +67490,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.2"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -67649,19 +68592,22 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.41.0";
+    version = "6.43.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.41.0.tgz";
-      sha512 = "fQ5zyCWQzfCGDtPGCB9/cSyUpvhfInBcFxPHnjHfq++UwHBPSWQRkVbTpOnz+VO9wUaVqkHmNogqVsGYV7drDQ==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.43.0.tgz";
+      sha512 = "0xS3XRHG+6k2Si0+mbLIg1HOSmPkTR6cbzFaTS0u96QxrAPHqxHPC1FWZ2x4PcApLH7FI+KSDquU049Sja6kKw==";
     };
     dependencies = [
+      sources."@fast-csv/format-4.3.5"
+      sources."@fast-csv/parse-4.3.3"
+      sources."@types/node-14.14.8"
       sources."JSONStream-1.3.5"
       sources."ajv-6.12.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.793.0"
+      sources."aws-sdk-2.794.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."base64-js-1.5.1"
@@ -67681,6 +68627,7 @@ in
       sources."events-1.1.1"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
+      sources."fast-csv-4.3.5"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."forever-agent-0.6.1"
@@ -67709,6 +68656,14 @@ in
       sources."jsonparse-1.3.1"
       sources."jsprim-1.4.1"
       sources."lodash-4.17.20"
+      sources."lodash.escaperegexp-4.1.2"
+      sources."lodash.groupby-4.6.0"
+      sources."lodash.isboolean-3.0.3"
+      sources."lodash.isequal-4.5.0"
+      sources."lodash.isfunction-3.0.9"
+      sources."lodash.isnil-4.0.0"
+      sources."lodash.isundefined-3.0.1"
+      sources."lodash.uniq-4.5.0"
       sources."lossless-json-1.0.4"
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
@@ -67840,7 +68795,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/responselike-1.0.0"
       sources."@types/yoga-layout-1.9.2"
@@ -68179,7 +69134,7 @@ in
           sources."normalize-path-2.1.1"
         ];
       })
-      sources."@microsoft/load-themed-styles-1.10.134"
+      sources."@microsoft/load-themed-styles-1.10.136"
       sources."@nodelib/fs.scandir-2.1.3"
       sources."@nodelib/fs.stat-2.0.3"
       sources."@nodelib/fs.walk-1.2.4"
@@ -68218,7 +69173,7 @@ in
           sources."form-data-2.5.1"
         ];
       })
-      sources."@types/serve-static-1.13.7"
+      sources."@types/serve-static-1.13.8"
       sources."@types/socket.io-2.1.11"
       sources."@types/socket.io-client-1.4.33"
       sources."@types/sqlite3-3.1.6"
@@ -69203,10 +70158,10 @@ in
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."openapi-default-setter-7.0.1"
-      sources."openapi-framework-7.1.0"
+      sources."openapi-framework-7.2.0"
       sources."openapi-jsonschema-parameters-7.0.2"
       sources."openapi-request-coercer-7.1.0"
-      sources."openapi-request-validator-7.0.2"
+      sources."openapi-request-validator-7.2.0"
       sources."openapi-response-validator-7.0.1"
       sources."openapi-schema-validator-7.0.1"
       sources."openapi-security-handler-7.0.1"
@@ -70462,7 +71417,7 @@ in
       })
       sources."@npmcli/node-gyp-1.0.1"
       sources."@npmcli/promise-spawn-1.3.2"
-      sources."@npmcli/run-script-1.7.5"
+      sources."@npmcli/run-script-1.8.0"
       sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3"
       sources."@react-native-community/cli-debugger-ui-4.9.0"
       (sources."@react-native-community/cli-platform-android-4.13.0" // {
@@ -70550,7 +71505,7 @@ in
           sources."source-map-0.7.3"
         ];
       })
-      sources."@types/yargs-15.0.9"
+      sources."@types/yargs-15.0.10"
       sources."@types/yargs-parser-15.0.0"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
@@ -70787,7 +71742,7 @@ in
       })
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001158"
+      sources."caniuse-lite-1.0.30001159"
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       (sources."chalk-4.1.0" // {
@@ -70964,8 +71919,8 @@ in
       sources."cssnano-util-same-parent-4.0.1"
       (sources."csso-4.1.1" // {
         dependencies = [
-          sources."css-tree-1.0.1"
-          sources."mdn-data-2.0.12"
+          sources."css-tree-1.1.0"
+          sources."mdn-data-2.0.14"
           sources."source-map-0.6.1"
         ];
       })
@@ -71046,7 +72001,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.597"
+      sources."electron-to-chromium-1.3.598"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -72053,6 +73008,7 @@ in
           sources."bn.js-4.11.9"
         ];
       })
+      sources."puka-1.0.1"
       sources."pump-3.0.0"
       (sources."pumpify-1.5.1" // {
         dependencies = [
@@ -74835,7 +75791,7 @@ in
       sources."@nodelib/fs.walk-1.2.4"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/parse-json-4.0.0"
       sources."@types/websocket-1.0.1"
       sources."aggregate-error-3.1.0"
@@ -78160,7 +79116,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.793.0" // {
+      (sources."aws-sdk-2.794.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -78391,7 +79347,7 @@ in
         ];
       })
       sources."image-type-3.1.0"
-      sources."immer-7.0.14"
+      sources."immer-7.0.15"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
@@ -78549,7 +79505,7 @@ in
       sources."needle-2.5.2"
       sources."nextgen-events-1.3.3"
       sources."no-case-2.3.2"
-      (sources."node-abi-2.19.1" // {
+      (sources."node-abi-2.19.3" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
@@ -80055,7 +81011,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/normalize-package-data-2.4.0"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
@@ -81987,10 +82943,10 @@ in
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-0.0.8"
-      sources."@types/yargs-15.0.9"
+      sources."@types/yargs-15.0.10"
       sources."@types/yargs-parser-15.0.0"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
@@ -82161,7 +83117,7 @@ in
       sources."cached-path-relative-1.0.2"
       sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001158"
+      sources."caniuse-lite-1.0.30001159"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       (sources."chalk-3.0.0" // {
@@ -82285,7 +83241,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.597"
+      sources."electron-to-chromium-1.3.598"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -83478,7 +84434,7 @@ in
       sha512 = "X9I7gwvqKVdqVvqi9AVfUWXnHQQYjssWJ2asKfhBDAkQn0vPagKkx6EjzKcRgyIroWGXN6ZpwkQ/gMvTPFlx7g==";
     };
     dependencies = [
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/yauzl-2.9.1"
       sources."agent-base-5.1.1"
       sources."ansi-styles-4.3.0"
@@ -83566,7 +84522,7 @@ in
       sources."@fluentui/react-focus-7.16.18"
       sources."@fluentui/react-window-provider-1.0.1"
       sources."@fluentui/theme-1.7.0"
-      sources."@microsoft/load-themed-styles-1.10.134"
+      sources."@microsoft/load-themed-styles-1.10.136"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@uifabric/foundation-7.9.20"
@@ -84403,7 +85359,7 @@ in
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/node-fetch-2.5.7"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse5-5.0.3"
@@ -84473,7 +85429,7 @@ in
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
-      (sources."aws-sdk-2.793.0" // {
+      (sources."aws-sdk-2.794.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -84552,7 +85508,7 @@ in
       sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001158"
+      sources."caniuse-lite-1.0.30001159"
       sources."cardinal-2.1.1"
       sources."caw-2.0.1"
       sources."ccount-1.1.0"
@@ -84804,7 +85760,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.597"
+      sources."electron-to-chromium-1.3.598"
       sources."elf-tools-1.1.2"
       (sources."elliptic-6.5.3" // {
         dependencies = [
@@ -85585,7 +86541,7 @@ in
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
       sources."ripemd160-2.0.2"
-      sources."rollup-2.33.2"
+      sources."rollup-2.33.3"
       sources."rollup-plugin-node-builtins-2.1.2"
       sources."rollup-plugin-terser-7.0.2"
       sources."run-async-2.4.1"
@@ -86480,16 +87436,16 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "1.2.3";
+    version = "1.2.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-1.2.3.tgz";
-      sha512 = "2SnJJ8YPTz0IzbRyEVpMZmDukm5DiAbNS+Nvv4g8dEtHFgOMj2Qid3OgqbSsYyRE5aH5FZ8xVLyFrBMPMRj24g==";
+      url = "https://registry.npmjs.org/node-red/-/node-red-1.2.5.tgz";
+      sha512 = "Z/f5ZjZVQgQSP+UU/RN5mJvTR875R3Fgb1lWd2kBxy44gVxxbtfN66ndgV9oV2S1h8nDTj0s+UhXvEXgo0PlqQ==";
     };
     dependencies = [
       sources."@babel/runtime-7.12.5"
-      sources."@node-red/editor-api-1.2.3"
-      sources."@node-red/editor-client-1.2.3"
-      (sources."@node-red/nodes-1.2.3" // {
+      sources."@node-red/editor-api-1.2.5"
+      sources."@node-red/editor-client-1.2.5"
+      (sources."@node-red/nodes-1.2.5" // {
         dependencies = [
           sources."cookie-0.4.1"
           sources."http-errors-1.7.3"
@@ -86503,9 +87459,9 @@ in
           })
         ];
       })
-      sources."@node-red/registry-1.2.3"
-      sources."@node-red/runtime-1.2.3"
-      sources."@node-red/util-1.2.3"
+      sources."@node-red/registry-1.2.5"
+      sources."@node-red/runtime-1.2.5"
+      sources."@node-red/util-1.2.5"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       (sources."agent-base-6.0.2" // {
@@ -86769,7 +87725,7 @@ in
       sources."mkdirp-0.5.5"
       sources."moment-2.29.1"
       sources."moment-timezone-0.5.32"
-      (sources."mqtt-4.2.4" // {
+      (sources."mqtt-4.2.5" // {
         dependencies = [
           sources."concat-stream-2.0.0"
           sources."debug-4.3.0"
@@ -86935,7 +87891,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.11.4"
+      sources."uglify-js-3.11.6"
       sources."uid-safe-2.1.5"
       sources."uid2-0.0.3"
       sources."unc-path-regex-0.1.2"
@@ -87356,7 +88312,7 @@ in
       sources."@npmcli/move-file-1.0.1"
       sources."@npmcli/node-gyp-1.0.1"
       sources."@npmcli/promise-spawn-1.3.2"
-      sources."@npmcli/run-script-1.7.5"
+      sources."@npmcli/run-script-1.8.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@tootallnate/once-1.1.2"
@@ -87585,6 +88541,7 @@ in
       sources."promise-retry-1.1.1"
       sources."prompts-2.4.0"
       sources."psl-1.8.0"
+      sources."puka-1.0.1"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."pupa-2.1.1"
@@ -88117,7 +89074,7 @@ in
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001158"
+      sources."caniuse-lite-1.0.30001159"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -88192,8 +89149,8 @@ in
       sources."cssnano-util-same-parent-4.0.1"
       (sources."csso-4.1.1" // {
         dependencies = [
-          sources."css-tree-1.0.1"
-          sources."mdn-data-2.0.12"
+          sources."css-tree-1.1.0"
+          sources."mdn-data-2.0.14"
         ];
       })
       sources."cssom-0.3.8"
@@ -88252,7 +89209,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.597"
+      sources."electron-to-chromium-1.3.598"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -88613,7 +89570,7 @@ in
       sources."postcss-value-parser-3.3.1"
       sources."posthtml-0.11.6"
       sources."posthtml-parser-0.4.2"
-      sources."posthtml-render-1.3.0"
+      sources."posthtml-render-1.4.0"
       sources."prelude-ls-1.1.2"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
@@ -88897,6 +89854,7 @@ in
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bindings-1.5.0"
+      sources."bintrees-1.0.1"
       sources."bl-1.2.3"
       sources."bluebird-3.7.2"
       (sources."body-parser-1.19.0" // {
@@ -89050,6 +90008,7 @@ in
       sources."pn-1.1.0"
       sources."prfun-2.1.5"
       sources."process-nextick-args-2.0.1"
+      sources."prom-client-11.5.3"
       sources."promise-8.1.0"
       sources."proxy-addr-2.0.6"
       sources."prr-1.0.1"
@@ -89091,7 +90050,7 @@ in
         ];
       })
       sources."serve-static-1.14.1"
-      (sources."service-runner-2.7.8" // {
+      (sources."service-runner-2.8.0" // {
         dependencies = [
           sources."semver-7.3.2"
           sources."yargs-14.2.3"
@@ -89108,6 +90067,7 @@ in
       sources."string-width-3.1.0"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-5.2.0"
+      sources."tdigest-0.1.1"
       sources."toidentifier-1.0.0"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
@@ -90410,10 +91370,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "5.12.0";
+    version = "5.13.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.12.0.tgz";
-      sha512 = "ag+ar3N2DgYM2Tx5XMr0rCnuFteAokiEUZQRNJjuWNt091i3m68FDLxxfBTqM14ZnI6Z55S70XYWkesPo232BQ==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.13.1.tgz";
+      sha512 = "FXdcPmd7hld2FrM+GvBwXH85T4iMQre0teZferGxm7xyzzfkCP0qkA/qaXqpCEJ4r3f24FyEgRl9WUvpxNHBEQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -90428,10 +91388,10 @@ in
   postcss-cli = nodeEnv.buildNodePackage {
     name = "postcss-cli";
     packageName = "postcss-cli";
-    version = "8.2.0";
+    version = "8.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.2.0.tgz";
-      sha512 = "N7tgPpB/2yXk/04irc/RiImCkftVw42STaploQBeOT1xvrIkyG+YW+TsHAJ57xWwL+b0AjXnqs5/RL/1XIh2Lw==";
+      url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.3.0.tgz";
+      sha512 = "GqWohD9VmH+LCe+xsv6VCdcgNylNBmsrbxJlyXUGteGGdcmazj2YxSiJMUmQpg8pE6LRox9idtsTB7JZq5a+rw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -90920,10 +91880,10 @@ in
   purty = nodeEnv.buildNodePackage {
     name = "purty";
     packageName = "purty";
-    version = "6.2.1";
+    version = "6.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/purty/-/purty-6.2.1.tgz";
-      sha512 = "7VkL+WEp0wCpzy4DWMSEHvNbylMWKGYHycwJ90ZjvdX90lI8akp2JM4hhyL/JOAkIP9DDd996PaW+x/Nre0IDA==";
+      url = "https://registry.npmjs.org/purty/-/purty-6.3.0.tgz";
+      sha512 = "l70uQyz+t5GvCPzOorUbIhRX3oQW9i8Kgwr0LvS6nUq+UM4rMJdYcHazuupcLVInvNsbd290EnpjaRgAITt0dw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -91284,7 +92244,7 @@ in
       sources."@emotion/unitless-0.7.5"
       sources."@exodus/schemasafe-1.0.0-rc.3"
       sources."@redocly/react-dropdown-aria-2.0.11"
-      sources."@types/node-13.13.30"
+      sources."@types/node-13.13.31"
       sources."ajv-5.5.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
@@ -91598,10 +92558,10 @@ in
   rollup = nodeEnv.buildNodePackage {
     name = "rollup";
     packageName = "rollup";
-    version = "2.33.2";
+    version = "2.33.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/rollup/-/rollup-2.33.2.tgz";
-      sha512 = "QPQ6/fWCrzHtSXkI269rhKaC7qXGghYBwXU04b1JsDZ6ibZa3DJ9D1SFAYRMgx1inDg0DaTbb3N4Z1NK/r3fhw==";
+      url = "https://registry.npmjs.org/rollup/-/rollup-2.33.3.tgz";
+      sha512 = "RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w==";
     };
     dependencies = [
       sources."fsevents-2.1.3"
@@ -91880,7 +92840,7 @@ in
       sources."resolve-1.19.0"
       sources."resolve-from-4.0.0"
       sources."rimraf-2.6.3"
-      sources."rollup-2.33.2"
+      sources."rollup-2.33.3"
       sources."safe-buffer-5.2.1"
       sources."semver-6.3.0"
       sources."serialize-javascript-5.0.1"
@@ -92356,7 +93316,7 @@ in
       sources."@types/keyv-3.1.1"
       sources."@types/lodash-4.14.165"
       sources."@types/long-4.0.1"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/request-2.48.5"
       sources."@types/request-promise-native-1.0.17"
       sources."@types/responselike-1.0.0"
@@ -92413,7 +93373,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.793.0" // {
+      (sources."aws-sdk-2.794.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -92862,7 +93822,7 @@ in
       sources."nested-error-stacks-2.1.0"
       sources."next-tick-1.0.0"
       sources."nice-try-1.0.5"
-      (sources."node-abi-2.19.1" // {
+      (sources."node-abi-2.19.3" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
@@ -92926,7 +93886,7 @@ in
       sources."promise-queue-2.2.5"
       (sources."protobufjs-6.10.2" // {
         dependencies = [
-          sources."@types/node-13.13.30"
+          sources."@types/node-13.13.31"
           sources."long-4.0.0"
         ];
       })
@@ -93769,10 +94729,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.427.1";
+    version = "1.428.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.427.1.tgz";
-      sha512 = "JSxh4JZm/cjaAOE77Es8WwE0hnBkQLwMgWZmuqZgIpJYIxGgyQYYChygyx/FzUzx+wMM6zOFUuh4zw2V4KMO2w==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.428.0.tgz";
+      sha512 = "yV1f28PPVG7sJ0c4GAMO3nhuJMIJNDagYJRQVwA0zLCr5u3UraE0qK2wRxo2j53ICkMBslp0b073EIoaB0lVkA==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -93802,7 +94762,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/js-yaml-3.12.5"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/responselike-1.0.0"
       sources."@types/semver-5.5.0"
       sources."@yarnpkg/lockfile-1.1.0"
@@ -94368,19 +95328,30 @@ in
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
-    version = "3.0.1";
+    version = "3.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.1.tgz";
-      sha512 = "oVYbCQ4sCwm4wVi+f1bsE3YFXcvd6b4JjVP8D7IZnQqBeJOKX9XrdgJWSbXqBEqUXPY3jdTqb1M3s4KFTa/IHg==";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.2.tgz";
+      sha512 = "CFnVFhzOy6eHOnZhElG5dtacsEC3jO45KfIWwDSoKavBuWmuK4k4j1eSMj0RymrTA9WuXG5+yD+sxxtMK8rCIA==";
     };
     dependencies = [
+      sources."@types/body-parser-1.19.0"
+      sources."@types/connect-3.4.33"
+      sources."@types/cookie-0.4.0"
+      sources."@types/cors-2.8.8"
+      sources."@types/express-4.17.9"
+      sources."@types/express-serve-static-core-4.17.13"
+      sources."@types/mime-2.0.3"
+      sources."@types/node-14.14.8"
+      sources."@types/qs-6.9.5"
+      sources."@types/range-parser-1.2.3"
+      sources."@types/serve-static-1.13.8"
       sources."accepts-1.3.7"
       sources."base64id-2.0.0"
       sources."component-emitter-1.3.0"
       sources."cookie-0.4.1"
       sources."cors-2.8.5"
       sources."debug-4.1.1"
-      sources."engine.io-4.0.3"
+      sources."engine.io-4.0.4"
       sources."engine.io-parser-4.0.1"
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
@@ -95484,7 +96455,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.793.0" // {
+      (sources."aws-sdk-2.794.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -96282,8 +97253,8 @@ in
       sources."css-what-3.4.2"
       (sources."csso-4.1.1" // {
         dependencies = [
-          sources."css-tree-1.0.1"
-          sources."mdn-data-2.0.12"
+          sources."css-tree-1.1.0"
+          sources."mdn-data-2.0.14"
         ];
       })
       sources."define-properties-1.1.3"
@@ -98274,7 +99245,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
@@ -99238,7 +100209,7 @@ in
       sources."@primer/octicons-11.0.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."after-0.8.2"
@@ -101088,7 +102059,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -102030,7 +103001,7 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."JSONSelect-0.2.1"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
@@ -102978,7 +103949,7 @@ in
       sources."@types/eslint-scope-3.7.0"
       sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
       sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -103004,11 +103975,11 @@ in
       sources."ajv-keywords-3.5.2"
       sources."browserslist-4.14.7"
       sources."buffer-from-1.1.1"
-      sources."caniuse-lite-1.0.30001158"
+      sources."caniuse-lite-1.0.30001159"
       sources."chrome-trace-event-1.0.2"
       sources."colorette-1.2.1"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.597"
+      sources."electron-to-chromium-1.3.598"
       sources."enhanced-resolve-5.3.1"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"
@@ -103168,7 +104139,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
       sources."ajv-errors-1.0.1"
@@ -103885,7 +104856,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.30"
+      sources."@types/node-13.13.31"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
       sources."balanced-match-1.0.0"
@@ -103999,7 +104970,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ip-1.1.5"
-      sources."ip-set-1.0.2"
+      sources."ip-set-2.1.0"
       sources."ipaddr.js-2.0.0"
       sources."is-ascii-1.0.0"
       sources."is-docker-2.1.1"
@@ -104012,7 +104983,7 @@ in
       sources."k-rpc-5.1.0"
       sources."k-rpc-socket-1.11.1"
       sources."last-one-wins-1.0.4"
-      (sources."load-ip-set-2.1.1" // {
+      (sources."load-ip-set-2.1.2" // {
         dependencies = [
           sources."decompress-response-6.0.0"
           sources."mimic-response-3.1.0"
@@ -104317,7 +105288,7 @@ in
       sources."@sindresorhus/is-0.7.0"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.7"
+      sources."@types/node-14.14.8"
       sources."@types/normalize-package-data-2.4.0"
       sources."JSONStream-1.3.5"
       sources."aggregate-error-3.1.0"

From 8061cdaf6492a5adc5994858c67901b0c5a1aa89 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@utzutzutz.net>
Date: Wed, 18 Nov 2020 12:20:20 +0000
Subject: [PATCH 2777/3942] matrix-synapse: 1.22.1 -> 1.23.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 fbdce3a2220e..e6266268a935 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -10,11 +10,11 @@ let
 in
 buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.22.1";
+  version = "1.23.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pbxdqpfa7wzdz61p6x58x7841vng1g65qayxgcw73bn1shl50jb";
+    sha256 = "18an6nvxq2g21rq5ph3xlnkl75dmilcrz4ykdydz37hs09z6q1al";
   };
 
   patches = [

From 7e25b7113271cf80eb0f950da2e1aa7b382eb268 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Wed, 18 Nov 2020 13:58:24 +0100
Subject: [PATCH 2778/3942] nixos: use nativeBuildInputs in make- iso9660-image
 and system-tarball

The tools used to create iso9660 images and tarballs are independent of
the platform of the closure contained within.
---
 nixos/lib/make-iso9660-image.nix  | 2 +-
 nixos/lib/make-system-tarball.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix
index 6a0e0e7c635a..549530965f6e 100644
--- a/nixos/lib/make-iso9660-image.nix
+++ b/nixos/lib/make-iso9660-image.nix
@@ -48,7 +48,7 @@ assert usbBootable -> isohybridMbrImage != "";
 stdenv.mkDerivation {
   name = isoName;
   builder = ./make-iso9660-image.sh;
-  buildInputs = [ xorriso syslinux zstd libossp_uuid ];
+  nativeBuildInputs = [ xorriso syslinux zstd libossp_uuid ];
 
   inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable;
 
diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix
index dee91a6ce3f4..dab168f4a481 100644
--- a/nixos/lib/make-system-tarball.nix
+++ b/nixos/lib/make-system-tarball.nix
@@ -37,7 +37,7 @@ in
 stdenv.mkDerivation {
   name = "tarball";
   builder = ./make-system-tarball.sh;
-  buildInputs = extraInputs;
+  nativeBuildInputs = extraInputs;
 
   inherit fileName extraArgs extraCommands compressCommand;
 

From 345813e6de02b892f8da468b8af85be598f92665 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 18 Nov 2020 15:33:03 +0200
Subject: [PATCH 2779/3942] julia_13: Disable tests

---
 pkgs/development/compilers/julia/1.3.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix
index 15694734d487..406ea73f2aed 100644
--- a/pkgs/development/compilers/julia/1.3.nix
+++ b/pkgs/development/compilers/julia/1.3.nix
@@ -72,13 +72,15 @@ stdenv.mkDerivation rec {
   makeFlags =
     let
       arch = head (splitString "-" stdenv.system);
-      march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch}
+      march = {
+        x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
+        i686 = "pentium4";
+        aarch64 = "armv8-a";
+      }.${arch}
               or (throw "unsupported architecture: ${arch}");
       # Julia requires Pentium 4 (SSE2) or better
-      cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch}
+      cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch}
                   or (throw "unsupported architecture: ${arch}");
-      # Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM
-      # https://github.com/JuliaLang/julia/tree/master/deps/patches
     in [
       "ARCH=${arch}"
       "MARCH=${march}"
@@ -119,7 +121,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = !stdenv.isDarwin;
+  # Other versions of Julia pass the tests, but we are not sure why these fail.
+  doCheck = false;
   checkTarget = "testall";
   # Julia's tests require read/write access to $HOME
   preCheck = ''

From 1e4c335a94b2df4e74a1e447d2f7074a09ada478 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 18 Nov 2020 15:33:18 +0200
Subject: [PATCH 2780/3942] julia: Make 15 the default version

---
 pkgs/top-level/all-packages.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2efe9633b92..dc319c87b836 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9534,14 +9534,12 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
   };
 
-julia_15 = callPackage ../development/compilers/julia/1.5.nix {
+  julia_15 = callPackage ../development/compilers/julia/1.5.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
   };
 
-
-
   julia_1 = julia_10;
-  julia = julia_1;
+  julia = julia_15;
 
   jwasm =  callPackage ../development/compilers/jwasm { };
 

From 00b385c61226a3f3c396581fd7b4851d99e20910 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 18 Nov 2020 15:36:03 +0100
Subject: [PATCH 2781/3942] dsview: 0.99 -> 1.12

Adapted the patches and took a commit from upstream master branch to
allow the migration to Qt5.15.

Had to copy the patch because of the custom sourceRoot.
---
 .../science/electronics/dsview/default.nix    | 32 +++++++++++--------
 .../science/electronics/dsview/install.patch  |  8 ++---
 .../science/electronics/dsview/qt515.patch    | 13 ++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 36 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/applications/science/electronics/dsview/qt515.patch

diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix
index 4d3acb331d5d..e61017ea330d 100644
--- a/pkgs/applications/science/electronics/dsview/default.nix
+++ b/pkgs/applications/science/electronics/dsview/default.nix
@@ -1,42 +1,46 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake,
-libzip, boost, fftw, qtbase,
-libusb1, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl
+{ lib, mkDerivation, fetchFromGitHub, pkgconfig, cmake
+, libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl
+, libsigrokdecode4dsl, python3, fetchpatch
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "dsview";
 
-  version = "0.99";
+  version = "1.12";
 
   src = fetchFromGitHub {
       owner = "DreamSourceLab";
       repo = "DSView";
-      rev = version;
-      sha256 = "189i3baqgn8k3aypalayss0g489xi0an9hmvyggvxmgg1cvcwka2";
+      rev = "v${version}";
+      sha256 = "q7F4FuK/moKkouXTNPZDVon/W/ZmgtNHJka4MiTxA0U=";
   };
 
-  postUnpack = ''
-    export sourceRoot=$sourceRoot/DSView
-  '';
+  sourceRoot = "source/DSView";
 
   patches = [
     # Fix absolute install paths
     ./install.patch
+
+    # Fix buld with Qt5.15 already merged upstream for future release
+    # Using local file instead of content of commit #33e3d896a47 because
+    # sourceRoot make it unappliable
+    ./qt515.patch
   ];
 
-  nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-   boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl
+    boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl
+    python3
   ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc";
     homepage = "https://www.dreamsourcelab.com/";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.bachp ];
+    maintainers = with maintainers; [ bachp ];
   };
 }
diff --git a/pkgs/applications/science/electronics/dsview/install.patch b/pkgs/applications/science/electronics/dsview/install.patch
index e30a28d80fa3..75c3e9628656 100644
--- a/pkgs/applications/science/electronics/dsview/install.patch
+++ b/pkgs/applications/science/electronics/dsview/install.patch
@@ -2,10 +2,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index c1c33e1..208a184 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -403,8 +403,8 @@ install(DIRECTORY res DESTINATION share/${PROJECT_NAME})
- install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png)
- install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS)
- install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf)
+@@ -427,8 +427,8 @@
+ install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31)
+ install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf)
+ install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf)
 -install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
 -install(FILES DSView.desktop DESTINATION /usr/share/applications/)
 +install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/)
diff --git a/pkgs/applications/science/electronics/dsview/qt515.patch b/pkgs/applications/science/electronics/dsview/qt515.patch
new file mode 100644
index 000000000000..552f2062ec57
--- /dev/null
+++ b/pkgs/applications/science/electronics/dsview/qt515.patch
@@ -0,0 +1,13 @@
+diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
+index 921d3db..16cdce9 100755
+--- a/pv/view/viewport.cpp
++++ b/pv/view/viewport.cpp
+@@ -37,7 +37,7 @@
+ 
+ #include <QMouseEvent>
+ #include <QStyleOption>
+-
++#include <QPainterPath>
+ 
+ #include <math.h>
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2efe9633b92..e97d83dcfd3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3414,7 +3414,7 @@ in
 
   dropbear = callPackage ../tools/networking/dropbear { };
 
-  dsview = libsForQt514.callPackage ../applications/science/electronics/dsview { };
+  dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { };
 
   dtach = callPackage ../tools/misc/dtach { };
 

From 39955760108d8825b2d704fa49c81cddcbb9b42a Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Wed, 18 Nov 2020 14:37:57 +0000
Subject: [PATCH 2782/3942] deskew: fix src

---
 pkgs/applications/graphics/deskew/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/applications/graphics/deskew/default.nix
index 422c7a0e15e8..6af6d93477a5 100644
--- a/pkgs/applications/graphics/deskew/default.nix
+++ b/pkgs/applications/graphics/deskew/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchFromBitbucket, libtiff, fpc }:
+{ stdenv, fetchFromGitHub, libtiff, fpc }:
 
 stdenv.mkDerivation rec {
 
   pname = "deskew";
   version = "1.25";
 
-  src = fetchFromBitbucket {
+  src = fetchFromGitHub {
     owner = "galfar";
-    repo = "app-deskew";
+    repo = pname;
     rev = "v${version}";
     sha256 = "0zjjj66qhgqkmfxl3q7p78dv4xl4ci918pgl4d5259pqdj1bfgc8";
   };

From abbe6217245a13e78ee341082a4adf5abcadf107 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 17 Nov 2020 17:38:02 +0100
Subject: [PATCH 2783/3942] openldap: 2.4.51 -> 2.4.56

Drop patch for what became CVE-2020-25692, it was fixed in 2.4.55.

Fixes: CVE-2020-25709, CVE-2020-25710
---
 pkgs/development/libraries/openldap/default.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 1304799f56c9..fdf3298a6fad 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,23 +1,14 @@
 { stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "openldap-2.4.51";
+  pname = "openldap";
+  version = "2.4.56";
 
   src = fetchurl {
-    url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
-    sha256 = "0qmy2jkk6v9iqwrsdsn8s7lwzaplr01a2mgf21r6nl66lig7g47l";
+    url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz";
+    sha256 = "1q0m26kbab96r73y0dll0c36411kvfillal0i75kngy9cc1hwli5";
   };
 
-  patches = [
-    (fetchurl {
-      # Fix a null-ptr dereference for unauthenticated packet in slapd
-      # NO CVE yet
-      # https://bugs.openldap.org/show_bug.cgi?id=9370
-      url = "https://git.openldap.org/openldap/openldap/-/commit/4c774220a752bf8e3284984890dc0931fe73165d.patch";
-      sha256 = "1vkbb6szscnhch5zzf6iq104l3dkwd50rih8jk9y0s2vgyz76mil";
-    })
-  ];
-
   # TODO: separate "out" and "bin"
   outputs = [ "out" "dev" "man" "devdoc" ];
 

From 548db366fdfe49c4418967c7582130313241dc03 Mon Sep 17 00:00:00 2001
From: Basile Henry <bjm.henry@gmail.com>
Date: Wed, 18 Nov 2020 15:41:27 +0100
Subject: [PATCH 2784/3942] pythonPackages.setuptools: reproducible sdist
 (#104009)

* setuptools: Remove date from release tag

* setuptools: Fix timestamps in sdist

* setuptools: Move untar/retar to buildPhase

* setuptools: Reproducible 44.0

* setuptools: Use $SOURCE_DATE_EPOCH for src

Co-authored-by: Pavol Rusnak <pavol@rusnak.io>

Co-authored-by: Pavol Rusnak <pavol@rusnak.io>
---
 pkgs/development/python-modules/setuptools/44.0.nix  | 11 ++++++++++-
 .../python-modules/setuptools/default.nix            | 11 ++++++++++-
 .../python-modules/setuptools/tag-date.patch         | 12 ++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/setuptools/tag-date.patch

diff --git a/pkgs/development/python-modules/setuptools/44.0.nix b/pkgs/development/python-modules/setuptools/44.0.nix
index 66330ca250f8..c2f6eb230b47 100644
--- a/pkgs/development/python-modules/setuptools/44.0.nix
+++ b/pkgs/development/python-modules/setuptools/44.0.nix
@@ -27,14 +27,23 @@ let
       name = "${pname}-${version}-source";
     };
 
+    patches = [
+      ./tag-date.patch
+    ];
+
     buildPhase = ''
       ${python.pythonForBuild.interpreter} bootstrap.py
       ${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar
+
+      # Here we untar the sdist and retar it in order to control the timestamps
+      # of all the files included
+      tar -xzf dist/${pname}-${version}.post0.tar.gz -C dist/
+      tar -czf dist/${name} -C dist/ --mtime="@$SOURCE_DATE_EPOCH" ${pname}-${version}.post0
     '';
 
     installPhase = ''
       echo "Moving sdist..."
-      mv dist/*.tar.gz $out
+      mv dist/${name} $out
     '';
   };
 in buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index b618ec6f634b..54eacea892ef 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -27,14 +27,23 @@ let
       name = "${pname}-${version}-source";
     };
 
+    patches = [
+      ./tag-date.patch
+    ];
+
     buildPhase = ''
       ${python.pythonForBuild.interpreter} bootstrap.py
       ${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar
+
+      # Here we untar the sdist and retar it in order to control the timestamps
+      # of all the files included
+      tar -xzf dist/${pname}-${version}.post0.tar.gz -C dist/
+      tar -czf dist/${name} -C dist/ --mtime="@$SOURCE_DATE_EPOCH"  ${pname}-${version}.post0
     '';
 
     installPhase = ''
       echo "Moving sdist..."
-      mv dist/*.tar.gz $out
+      mv dist/${name} $out
     '';
   };
 in buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/setuptools/tag-date.patch b/pkgs/development/python-modules/setuptools/tag-date.patch
new file mode 100644
index 000000000000..441177a5d17e
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools/tag-date.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.cfg b/setup.cfg
+index f23714b6..8aaeb330 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,6 +1,6 @@
+ [egg_info]
+ tag_build = .post
+-tag_date = 1
++tag_date = 0
+
+ [aliases]
+ clean_egg_info = egg_info -Db ''

From 62f4f2299855a05e345f5f40304171078b46a5c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 15:50:00 +0000
Subject: [PATCH 2785/3942] recode: 3.7.7 -> 3.7.8

---
 pkgs/tools/text/recode/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix
index b6503f888483..e8dd5c8bbf77 100644
--- a/pkgs/tools/text/recode/default.nix
+++ b/pkgs/tools/text/recode/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "recode";
-  version = "3.7.7";
+  version = "3.7.8";
 
   # Use official tarball, avoid need to bootstrap/generate build system
   src = fetchurl {
     url = "https://github.com/rrthomas/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "1yrqgw74qrdmy82lxd1cxlfclrf2fqi0qp7afjmfc6b7f0xzcih9";
+    sha256 = "19yg20z1smj9kag1axgvc4s4kd6jmw75h0pa8xqxl3xqqyn5rdsg";
   };
 
   nativeBuildInputs = [ python3 python3.pkgs.cython perl intltool flex texinfo libiconv ];

From 6dd536a3cb57531aa1356743f2496f551f2bffe2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Nov 2020 02:10:50 +0000
Subject: [PATCH 2786/3942] libinput: 1.16.2 -> 1.16.3

---
 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 3a651087510b..18a5dcbab65c 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -27,14 +27,14 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libinput";
-  version = "1.16.2";
+  version = "1.16.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "0qii6yh3dlhgv9z970cpzbz19ii8zjvq4k7pg75sy2gmia7smwd1";
+    sha256 = "0dj2m92kh3xpnjmzp416c73hpw6ban0f6yj39chwxckdgyliak6z";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 9451ae5974fe55e38504980a447b178cdacbe639 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Fri, 13 Nov 2020 19:10:27 +0100
Subject: [PATCH 2787/3942] gdbm: Fix multiple definitions error when building
 with clang

---
 .../0001-Remove-duplicate-assignments.patch   | 25 +++++++++++++++++++
 pkgs/development/libraries/gdbm/default.nix   |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch

diff --git a/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch b/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch
new file mode 100644
index 000000000000..7583deb81098
--- /dev/null
+++ b/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch
@@ -0,0 +1,25 @@
+From 2c31a95d9e57a4308c5159c50e69b5c9178dee72 Mon Sep 17 00:00:00 2001
+From: Christian Kampka <christian@kampka.net>
+Date: Fri, 13 Nov 2020 16:52:12 +0100
+Subject: [PATCH] Remove duplicate assignments
+
+---
+ src/parseopt.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/parseopt.c b/src/parseopt.c
+index 268e080..a4c8576 100644
+--- a/src/parseopt.c
++++ b/src/parseopt.c
+@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin)
+ }
+ 
+ char *parseopt_program_name;
+-char *parseopt_program_doc;
+-char *parseopt_program_args;
+ const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
+ void (*parseopt_help_hook) (FILE *stream);
+ 
+-- 
+2.25.4
+
diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix
index 6cee01e799e7..3d333e503b2e 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true; # not cross;
 
+  patches = [ ./0001-Remove-duplicate-assignments.patch ];
+
   # Linking static stubs on cygwin requires correct ordering.
   # Consider upstreaming this.
 

From 6463b27df9d8798c05e826ee42e832ec0f8cadc5 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Wed, 9 Sep 2020 21:57:24 +0200
Subject: [PATCH 2788/3942] fontconfig: build manpages, install them in bin
 output

We exclude man3, as it is pretty large and probably not so relevant.
---
 pkgs/development/libraries/fontconfig/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 72df121200e0..e08149903a2b 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -83,7 +83,6 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
     "--with-arch=${stdenv.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}"
   ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
@@ -108,6 +107,9 @@ stdenv.mkDerivation rec {
       ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \
       > fonts.conf.tmp
     mv fonts.conf.tmp $out/etc/fonts/fonts.conf
+    # We don't keep section 3 of the manpages, as they are quite large and
+    # probably not so useful.
+    rm -r $bin/share/man/man3
   '';
 
   meta = with stdenv.lib; {

From f2e4de720d80775eb198b252f0f31af6cbcce99e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 14:06:03 +0000
Subject: [PATCH 2789/3942] libgda: 5.2.9 -> 5.2.10

---
 pkgs/development/libraries/libgda/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index a46b2aa74118..f0b430c91d81 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -9,11 +9,11 @@ assert postgresSupport -> postgresql != null;
 
 (if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
   pname = "libgda";
-  version = "5.2.9";
+  version = "5.2.10";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "16vxv2qvysh22s8h9h6irx96sacagxkz0i4qgi1wc6ibly6fvjjr";
+    sha256 = "1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g";
   };
   configureFlags = with stdenv.lib; [
     "--enable-gi-system-install=no"

From 96fb471fc76ee76604ef63b43bb8e9ef0205f48b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 23:28:26 +0000
Subject: [PATCH 2790/3942] libevdev: 1.9.1 -> 1.10.0

---
 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 fdd5e20640ad..ba846ed07db2 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libevdev";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "1jvsphdrs1i54ccjcn6ll26jy42am7h28lbsvwa6pmxgqm43qq7m";
+    sha256 = "0jidjv78lay8kl3yigwhx9fii908sk7gn9nfd2ny12ql5ipc48im";
   };
 
   nativeBuildInputs = [ python3 ];

From d0878be870c0b4de898aa62de2ad43ef921c3b09 Mon Sep 17 00:00:00 2001
From: CrystalGamma <user@talos-nixos.local>
Date: Tue, 20 Oct 2020 12:51:51 +0200
Subject: [PATCH 2791/3942] orc: 0.4.29 -> 0.4.32

* transition from name to pname + version
* change the build system to meson, as autotools is no longer supported by upstream
* optionally build devdoc output
* whatever the reason for manipulating the pkgconfig,
  omitting it doesn't seem to break the build of orc
  or any of its direct reverse dependencies
---
 pkgs/development/compilers/orc/default.nix | 34 +++++++++++++---------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 34e79945f612..210aa786cddf 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -1,23 +1,31 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "orc-0.4.29";
+{ stdenv, fetchurl, meson, ninja
+, gtk-doc ? null, file, docbook_xsl
+, buildDevDoc ? gtk-doc != null
+}: let
+  inherit (stdenv.lib) optional optionals;
+in stdenv.mkDerivation rec {
+  pname = "orc";
+  version = "0.4.32";
 
   src = fetchurl {
-    url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
-    sha256 = "1cisbbn69p9c8vikn0nin14q0zscby5m8cyvzxyw2pjb2kwh32ag";
+    url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz";
+    sha256 = "1w0qmyj3v9sb2g7ff39pp38b9850y9hyy0bag26ifrby5f7ksvm6";
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" ]
+     ++ optional buildDevDoc "devdoc"
+  ;
   outputBin = "dev"; # compilation tools
 
-  postInstall = ''
-    sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc
-  '';
+  mesonFlags =
+    optional (!buildDevDoc) [ "-Dgtk_doc=disabled" ]
+  ;
 
-  # i686   https://gitlab.freedesktop.org/gstreamer/orc/issues/18
-  # armv7l https://gitlab.freedesktop.org/gstreamer/orc/issues/9
-  doCheck = (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isAarch32);
+  nativeBuildInputs = [ meson ninja ]
+    ++ optionals buildDevDoc [ gtk-doc file docbook_xsl ]
+  ;
+
+  doCheck = true;
 
   meta = with stdenv.lib; {
     description = "The Oil Runtime Compiler";

From 2f7ce5fdc3c7c53ad997544091d39106e6f15e51 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 31 Oct 2020 18:38:30 +0300
Subject: [PATCH 2792/3942] nftables: 0.9.6 -> 0.9.7

---
 pkgs/os-specific/linux/nftables/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 9ec42ad66b06..c5879fcc0214 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -10,17 +10,17 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "0.9.6";
+  version = "0.9.7";
   pname = "nftables";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2";
-    sha256 = "0vmn6xwqa1nq6crfxshh049b199d0aj6hfgin7k068xhibzgvmk8";
+    sha256 = "1c1c2475nifncv0ng8z77h2dpanlsx0bhqm15k00jb3a6a68lszy";
   };
 
   nativeBuildInputs = [
     pkgconfig bison file flex
-    asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt 
+    asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt
   ];
 
   buildInputs = [
@@ -45,5 +45,6 @@ stdenv.mkDerivation rec {
     homepage = "https://netfilter.org/projects/nftables/";
     license = licenses.gpl2;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ izorkin ];
   };
 }

From ceb3fde6ba40aee57e0c06a558e558e16c3f0afd Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 26 Oct 2020 23:03:38 +0100
Subject: [PATCH 2793/3942] libpaper: 1.1.24 -> 1.1.28

---
 pkgs/development/libraries/libpaper/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix
index 28c6030a0ffb..d7863e29d58d 100644
--- a/pkgs/development/libraries/libpaper/default.nix
+++ b/pkgs/development/libraries/libpaper/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.24";
+  version = "1.1.28";
   pname = "libpaper";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz";
-    sha256 = "0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q";
+    sha256 = "sha256-yLuUbsk9PCxyu7HXJX6QFyoipEoHoH+2uAKluyyV/dw=";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   # The configure script of libpaper is buggy: it uses AC_SUBST on a headerfile
   # to compile sysconfdir into the library. Autoconf however defines sysconfdir
   # as "${prefix}/etc", which is not expanded by AC_SUBST so libpaper will look

From a41a2375c95160440947d572cb1f73755320a9b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 21 Oct 2020 17:52:31 +0000
Subject: [PATCH 2794/3942] bison: 3.7.2 -> 3.7.3

---
 pkgs/development/tools/parsing/bison/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index 70fd733e1ee5..2fe17a23fc2b 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bison";
-  version = "3.7.2";
+  version = "3.7.3";
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "111ax2imnydvrpcys5ami8ixn0a50m7a5pims7cbyysi8h8djp21";
+    sha256 = "1ixk4wglpign8glpil9qziph96ki7flqiy4xlpjb8ai1y89fjkqh";
   };
 
   nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;

From 0f05f224fa0cb4ecacb2ea209b62736a4b4bd2d1 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Tue, 20 Oct 2020 18:48:13 +0000
Subject: [PATCH 2795/3942] fribidi: 1.0.7 -> 1.0.10

https://github.com/fribidi/fribidi/releases/tag/v1.0.8
https://github.com/fribidi/fribidi/releases/tag/v1.0.9
https://github.com/fribidi/fribidi/releases/tag/v1.0.10
---
 pkgs/development/libraries/fribidi/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index 35ae4c8e6ca9..0022cbde7c55 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, fetchpatch
 , meson
 , ninja
 , pkgconfig
@@ -10,24 +9,16 @@
 
 stdenv.mkDerivation rec {
   pname = "fribidi";
-  version = "1.0.7";
+  version = "1.0.10";
 
   outputs = [ "out" "devdoc" ];
 
   # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
   src = fetchurl {
-    url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "0pckda4fcn0aw32lpycwdp25r2m7vca8zspq815ppi9gkwgg5das";
+    url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz";
+    sha256 = "009wcpgk4jj5x52skjkfs6xar6x38mcngs75rb59nj9ig1y6h73z";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2019-18397.patch";
-      url = "https://github.com/fribidi/fribidi/commit/034c6e9a1d296286305f4cfd1e0072b879f52568.patch";
-      sha256 = "102xrbf1l5gvavkxd6csx8pj3rlgcw10c0y4h4d40yhn84b1p0y8";
-    })
-  ];
-
   postPatch = ''
     patchShebangs test
   '';

From 51524e717632984ec288b9e1fbc6a79bd621bfde Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Sun, 15 Nov 2020 10:26:05 -0600
Subject: [PATCH 2796/3942] plex: 1.20.3.3483 -> 1.20.5.3600

---
 pkgs/servers/plex/raw.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index f06b0a486985..28cadc221296 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.20.3.3483-211702a9f";
+  version = "1.20.5.3600-47c0d9038";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "0b05mxmvjn2sr0aqy8s2c41gz0vlpmwjwx42jpqddk3qzidvwkbd";
+    sha256 = "0vqsmmgqcvvhxiqaw87qz9fdisyf9smp6ab069dz3nq39x7n9na0";
   };
 
   outputs = [ "out" "basedb" ];

From 253650f6d0d3f7886442292addd93456811db7ad Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Sun, 15 Nov 2020 10:26:38 -0600
Subject: [PATCH 2797/3942] plex: add badmutex (myself) to maintainers list

---
 pkgs/servers/plex/raw.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 28cadc221296..925c22091356 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
     license = licenses.unfree;
     platforms = platforms.linux;
     maintainers = with maintainers; [
+      badmutex
       colemickens
       forkk
       lnl7

From d9b359d8fe9fb8a83dc95d413d6552fc72b550c6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 31 Oct 2020 19:31:06 +0000
Subject: [PATCH 2798/3942] faad2: 2.9.2 -> 2.10.0

---
 pkgs/development/libraries/faad2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix
index 6842f191abe3..90b1a182e553 100644
--- a/pkgs/development/libraries/faad2/default.nix
+++ b/pkgs/development/libraries/faad2/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "faad2";
-  version = "2.9.2";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "knik0";
     repo = "faad2";
     rev = builtins.replaceStrings [ "." ] [ "_" ] version;
-    sha256 = "0rdi6bmyryhkwf4mpprrsp78m6lv1nppav2f0lf1ywifm92ng59c";
+    sha256 = "0q52kdd95ls6ihzyspx176wg9x22425v5qsknrmrjq30q25qmmlg";
   };
 
   configureFlags = []

From bd6a7d4fa3d71a14bb26d605460d4f45e0a855ad Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 18 Nov 2020 16:11:55 +0100
Subject: [PATCH 2799/3942] akonadi: disable Qt5 <5.13

---
 pkgs/applications/kde/akonadi/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index 7bb4e9217942..6ffe1e2de8aa 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib, kdepimTeam,
-  extra-cmake-modules, shared-mime-info,
+  extra-cmake-modules, shared-mime-info, qtbase,
   boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin,
   ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
 }:
@@ -10,6 +10,7 @@ mkDerivation {
   meta = {
     license = [ lib.licenses.lgpl21 ];
     maintainers = kdepimTeam;
+    broken = lib.versionOlder qtbase.version "5.13";
   };
   patches = [
     ./0001-akonadi-paths.patch

From 1096a6d77e0cfad231980d8cbc1087b29721120d Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Wed, 18 Nov 2020 16:19:14 +0100
Subject: [PATCH 2800/3942] vector: include the "unix" cargo feature if
 targetPlatform isUnix

---
 pkgs/tools/misc/vector/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 701e86dbf901..1525d3a22963 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -8,6 +8,8 @@
      then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
      else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
      ++
+     (lib.optional stdenv.targetPlatform.isUnix "unix")
+     ++
      [ "sinks" "sources" "transforms" ])
 , coreutils
 , CoreServices

From 6aec7072b70159cf88c3fd4e42c905642eea5f82 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 18 Nov 2020 16:46:47 +0100
Subject: [PATCH 2801/3942] kpkpass: remove before Qt5.13

---
 pkgs/applications/kde/kpkpass.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix
index e9505a72e85e..15dfe7f2e49e 100644
--- a/pkgs/applications/kde/kpkpass.nix
+++ b/pkgs/applications/kde/kpkpass.nix
@@ -8,6 +8,7 @@ mkDerivation {
   meta = {
     license = with lib.licenses; [ lgpl21 ];
     maintainers = [ lib.maintainers.bkchr ];
+    broken = lib.versionOlder qtbase.version "5.13";
   };
   nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
   buildInputs = [ qtbase karchive ];

From 99b47e71117510f59a7d0592ef9d1fe31c5e1613 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 18 Nov 2020 17:05:22 +0100
Subject: [PATCH 2802/3942] Revert "spandsp: 0.0.6 -> 3.0.0"

This reverts commit e184cede9210608ebe5d04972d79338e92ca4b60.
---
 .../development/libraries/spandsp/default.nix | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index 92a6f66d6364..1f9834c08f47 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
+{stdenv, fetchurl, audiofile, libtiff}:
 stdenv.mkDerivation rec {
-  version = "3.0.0";
+  version = "0.0.6";
   pname = "spandsp";
-  src = fetchFromGitHub {
-    owner = "freeswitch";
-    repo = pname;
-    rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
-    sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
+  src=fetchurl {
+    url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
+    sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ autoreconfHook ];
-  propagatedBuildInputs = [ audiofile libtiff ];
-
+  propagatedBuildInputs = [audiofile libtiff];
   meta = {
     description = "A portable and modular SIP User-Agent with audio and video support";
-    homepage = "https://github.com/freeswitch/spandsp";
+    homepage = "http://www.creytiv.com/baresip.html";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = stdenv.lib.licenses.gpl2;
+    downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
+    inherit version;
+    updateWalker = true;
   };
 }

From 4897c239043d372b17d0232f9aae7a305de81d48 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 18 Nov 2020 17:06:42 +0100
Subject: [PATCH 2803/3942] spandsp3: init at 3.0.0

---
 pkgs/development/libraries/spandsp/3.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/spandsp/3.nix

diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix
new file mode 100644
index 000000000000..ac587f0492b0
--- /dev/null
+++ b/pkgs/development/libraries/spandsp/3.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
+stdenv.mkDerivation rec {
+  version = "3.0.0";
+  pname = "spandsp";
+  src = fetchFromGitHub {
+    owner = "freeswitch";
+    repo = pname;
+    rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
+    sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ autoreconfHook ];
+  propagatedBuildInputs = [ audiofile libtiff ];
+
+  meta = {
+    description = "A portable and modular SIP User-Agent with audio and video support";
+    homepage = "https://github.com/freeswitch/spandsp";
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [ ajs124 ];
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2efe9633b92..6ae76b9242d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15794,6 +15794,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
   soundtouch = callPackage ../development/libraries/soundtouch {};
 
   spandsp = callPackage ../development/libraries/spandsp {};
+  spandsp3 = callPackage ../development/libraries/spandsp/3.nix {};
 
   spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt {};
 

From 19ddb6e657d008c15ae37157bc68fb06e57fc865 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 18 Nov 2020 17:07:28 +0100
Subject: [PATCH 2804/3942] freeswitch: use spandsp3

---
 pkgs/servers/sip/freeswitch/modules.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sip/freeswitch/modules.nix b/pkgs/servers/sip/freeswitch/modules.nix
index 226ad90ee1f5..202461d2cf9f 100644
--- a/pkgs/servers/sip/freeswitch/modules.nix
+++ b/pkgs/servers/sip/freeswitch/modules.nix
@@ -9,7 +9,7 @@
 , ffmpeg
 , libmysqlclient
 , postgresql
-, spandsp
+, spandsp3
 , sofia_sip
 }:
 
@@ -70,7 +70,7 @@ in
     snom = mk "applications/mod_snom" [];
     sonar = mk "applications/mod_sonar" [];
     soundtouch = mk "applications/mod_soundtouch" [];
-    spandsp = mk "applications/mod_spandsp" [ spandsp ];
+    spandsp = mk "applications/mod_spandsp" [ spandsp3 ];
     spy = mk "applications/mod_spy" [];
     stress = mk "applications/mod_stress" [];
     translate = mk "applications/mod_translate" [];

From 21339b41bf60847b0b8880b8ca5ceb2867044bf1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 18 Nov 2020 11:42:32 -0500
Subject: [PATCH 2805/3942] nixos: openstack: have its own metadata fetcher
 expression

These two APIs have diverged over time and are no longer compatible.
---
 .../virtualisation/openstack-config.nix       |  2 +-
 .../openstack-metadata-fetcher.nix            | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/virtualisation/openstack-metadata-fetcher.nix

diff --git a/nixos/modules/virtualisation/openstack-config.nix b/nixos/modules/virtualisation/openstack-config.nix
index c2da5d0d2301..d01e0f23aba1 100644
--- a/nixos/modules/virtualisation/openstack-config.nix
+++ b/nixos/modules/virtualisation/openstack-config.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  metadataFetcher = import ./ec2-metadata-fetcher.nix {
+  metadataFetcher = import ./openstack-metadata-fetcher.nix {
     targetRoot = "/";
     wgetExtraOptions = "--retry-connrefused";
   };
diff --git a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix
new file mode 100644
index 000000000000..b531787c31a2
--- /dev/null
+++ b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix
@@ -0,0 +1,23 @@
+{ targetRoot, wgetExtraOptions }:
+''
+  metaDir=${targetRoot}etc/ec2-metadata
+  mkdir -m 0755 -p "$metaDir"
+
+  echo "getting EC2 instance metadata..."
+
+  if ! [ -e "$metaDir/ami-manifest-path" ]; then
+    wget ${wgetExtraOptions} -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
+  fi
+
+  if ! [ -e "$metaDir/user-data" ]; then
+    wget ${wgetExtraOptions} -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data"
+  fi
+
+  if ! [ -e "$metaDir/hostname" ]; then
+    wget ${wgetExtraOptions} -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
+  fi
+
+  if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then
+    wget ${wgetExtraOptions} -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+  fi
+''

From 0263591e4ff4b3ea6d3ea5150f8092cf9493e072 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Wed, 18 Nov 2020 16:51:47 +0000
Subject: [PATCH 2806/3942] ebook2cw: 0.8.2 -> 0.8.3

---
 pkgs/applications/radio/ebook2cw/Makefile.patch   | 12 ++++++++++++
 pkgs/applications/radio/ebook2cw/configfile.patch | 11 -----------
 pkgs/applications/radio/ebook2cw/default.nix      | 15 ++++++++-------
 3 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/applications/radio/ebook2cw/Makefile.patch
 delete mode 100644 pkgs/applications/radio/ebook2cw/configfile.patch

diff --git a/pkgs/applications/radio/ebook2cw/Makefile.patch b/pkgs/applications/radio/ebook2cw/Makefile.patch
new file mode 100644
index 000000000000..be6c32e41470
--- /dev/null
+++ b/pkgs/applications/radio/ebook2cw/Makefile.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index 005d60d..f69c7fe 100644
+--- a/Makefile
++++ b/Makefile
+@@ -41,6 +41,7 @@ install:
+ 	install -d -v                      $(DESTDIR)/bin/
+ 	install -d -v                      $(DESTDIR)/share/doc/ebook2cw/
+ 	install -d -v                      $(DESTDIR)/share/doc/ebook2cw/examples/
++	install -d -v                      $(DESTDIR)/share/locale/de/LC_MESSAGES/
+ 	install -s -m 0755 ebook2cw        $(DESTDIR)/bin/
+ 	install    -m 0644 ebook2cw.1      $(DESTDIR)/share/man/man1/
+ 	install    -m 0644 README          $(DESTDIR)/share/doc/ebook2cw/
diff --git a/pkgs/applications/radio/ebook2cw/configfile.patch b/pkgs/applications/radio/ebook2cw/configfile.patch
deleted file mode 100644
index c7aafe5227a5..000000000000
--- a/pkgs/applications/radio/ebook2cw/configfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ebook2cw.c	2017-11-08 19:52:58.298131348 -0700
-+++ b/ebook2cw.c	2017-11-08 19:53:02.588231067 -0700
-@@ -136,7 +136,7 @@
- 	char isomap[256][4]; 		/* by these strings */
- 	char utf8map[256][8];
- 
--	char configfile[1025];
-+	char configfile[2048];
- 
- 	char id3_author[80],
- 		id3_title[80],
diff --git a/pkgs/applications/radio/ebook2cw/default.nix b/pkgs/applications/radio/ebook2cw/default.nix
index d273594f4c90..5bd9e47ab716 100644
--- a/pkgs/applications/radio/ebook2cw/default.nix
+++ b/pkgs/applications/radio/ebook2cw/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchsvn, lame, libvorbis }:
+{ stdenv, fetchgit, lame, libvorbis, gettext }:
 
 stdenv.mkDerivation rec {
   pname = "ebook2cw";
-  version = "0.8.2";
+  version = "0.8.3";
 
-  src = fetchsvn {
-    url = "svn://svn.fkurz.net/ebook2cw/tags/${pname}-${version}";
-    sha256 = "1mvp3nz3k76v757792n9b7fcm5jm3jcwarl1k7cila9fi0c2rsiw";
+  src = fetchgit {
+    url = "https://git.fkurz.net/dj1yfk/ebook2cw.git";
+    rev = "${pname}-${version}";
+    sha256 = "0jqmnjblv3wzr0ppqzndzd8wg02nlkvzg1fqw14vyyp76sdjsh46";
   };
 
-  buildInputs = [ lame libvorbis ];
+  buildInputs = [ lame libvorbis gettext ];
 
-  patches = [ ./configfile.patch ];
+  patches = [ ./Makefile.patch ];
 
   makeFlags = [ "DESTDIR=$(out)" ];
 

From 2caa1782b5abfe3977011a2d2475d43b71cfef43 Mon Sep 17 00:00:00 2001
From: Victor Luft <victor@luft.io>
Date: Wed, 18 Nov 2020 11:58:31 -0500
Subject: [PATCH 2807/3942] sublime-merge: 2032 -> 2039

---
 .../applications/version-management/sublime-merge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix
index 773a2c3b4f51..7b01ab21f495 100644
--- a/pkgs/applications/version-management/sublime-merge/default.nix
+++ b/pkgs/applications/version-management/sublime-merge/default.nix
@@ -4,8 +4,8 @@ let
   common = opts: callPackage (import ./common.nix opts);
 in {
   sublime-merge = common {
-    buildVersion = "2032";
-    sha256 = "b782c768383893ba7803c2cffd428b09bec46be8a65e61a5f17964bdcc2aaf7c";
+    buildVersion = "2039";
+    sha256 = "0l82408jli7g6nc267bnnnz0zz015lvpwva5fxj53mval32ii4i8";
   } {};
 
   sublime-merge-dev = common {

From d09c7c44a1d24ebb3d11c18f9685fd2cc4f2f9b5 Mon Sep 17 00:00:00 2001
From: cmacrae <hi@cmacr.ae>
Date: Wed, 18 Nov 2020 17:09:55 +0000
Subject: [PATCH 2808/3942] spacebar: 1.1.1 -> 1.2.1

---
 pkgs/os-specific/darwin/spacebar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/spacebar/default.nix b/pkgs/os-specific/darwin/spacebar/default.nix
index 7af7e408223a..6d47499b8350 100644
--- a/pkgs/os-specific/darwin/spacebar/default.nix
+++ b/pkgs/os-specific/darwin/spacebar/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "spacebar";
-  version = "1.1.1";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "cmacrae";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1x0wzm380nv81j26jqqg4y4dwanydnpdsca41ndw6xyj9zlv73f7";
+    sha256 = "0f5ddn3sx13rwwh0nfl784160s8ml3m5593d5fz2b1996aznzrsx";
   };
 
   buildInputs = [ Carbon Cocoa ScriptingBridge ];

From ca07ef0fc41cc142a82bc6108683d7d5388dc38e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 17:11:09 +0000
Subject: [PATCH 2809/3942] libgpiod: 1.6 -> 1.6.1

---
 pkgs/development/libraries/libgpiod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
index 23ef2c067a62..e49fad551daf 100644
--- a/pkgs/development/libraries/libgpiod/default.nix
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libgpiod";
-  version = "1.6";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
-    sha256 = "0xcwrg4p4w925lijmz4ci4500z83kj5gs1n501q4vhi54bdzn2k5";
+    sha256 = "0p3vjf4zj137miix1gbi8rv6g4wvi8kmyhwwxyirw00ankxbxp1n";
   };
 
   patches = [

From 69d9d5d88ef6d971046714db120372993403b287 Mon Sep 17 00:00:00 2001
From: cmacrae <hi@cmacr.ae>
Date: Wed, 18 Nov 2020 17:14:53 +0000
Subject: [PATCH 2810/3942] yabai: 3.3.3 -> 3.3.4

---
 pkgs/os-specific/darwin/yabai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix
index 3c3378b323ad..d4471da4781f 100644
--- a/pkgs/os-specific/darwin/yabai/default.nix
+++ b/pkgs/os-specific/darwin/yabai/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yabai";
-  version = "3.3.3";
+  version = "3.3.4";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0rxl0in3rhmrgg3v3l91amr497x37i2w1jqm52k0jb9my1sk67rs";
+    sha256 = "1pvyjdxgy7yxxz4x87f8an0dlxvxbnmv5kya8hkzw2na453ihvab";
   };
 
   buildInputs = [ Carbon Cocoa ScriptingBridge xxd ];

From 69023bfbb2ae5ff9ecf1b7e3bb90427435750150 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 17 Nov 2020 19:24:42 +0000
Subject: [PATCH 2811/3942] terragrunt: 0.26.2 -> 0.26.3

---
 pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index e607a9ee75ba..895f4a36a8df 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "terragrunt";
-  version = "0.26.2";
+  version = "0.26.3";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0bp43rsnkq2ysdl0v28i9agan738m0zk5yn8zza6js28sx0y7kns";
+    sha256 = "0414xmmx8lzv779zvr1k265c9kh3jlx9c5acg56hl5zzvifl774r";
   };
 
   vendorSha256 = "0l85jx02dj9qvxs8l0ln5fln8vssi0fisblm5i1scz9x4a1jqg9n";

From 68e63a27ef695191f97c6aeabb3b18dbb37dee58 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 18 Nov 2020 17:17:05 +0000
Subject: [PATCH 2812/3942] terragrunt: 0.26.3 -> 0.26.4

---
 pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 895f4a36a8df..1868c3e95ac1 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "terragrunt";
-  version = "0.26.3";
+  version = "0.26.4";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0414xmmx8lzv779zvr1k265c9kh3jlx9c5acg56hl5zzvifl774r";
+    sha256 = "0q1dzrjfg97bk1prknwpdgcf5vnpdi0f41wb5ni4550zzqsz3rnk";
   };
 
   vendorSha256 = "0l85jx02dj9qvxs8l0ln5fln8vssi0fisblm5i1scz9x4a1jqg9n";

From 45ed0b7018f0e2db1bb06fbc909b213077c29b17 Mon Sep 17 00:00:00 2001
From: sevenfourk <sevenfourk@protonmail.ch>
Date: Wed, 18 Nov 2020 19:58:28 +0200
Subject: [PATCH 2813/3942] terragrunt: removing terraform dependency (#103670)

Since terragrunt would trigger downloading all the plugins and basing on terraform 0.12 branch whereas people could use it against 0.11 or 0.13 terraform.
---
 .../applications/networking/cluster/terragrunt/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index e607a9ee75ba..68c41c64d86f 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, makeWrapper, terraform }:
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper }:
 
 buildGoModule rec {
   pname = "terragrunt";
@@ -19,11 +19,6 @@ buildGoModule rec {
 
   buildFlagsArray = [ "-ldflags=" "-X main.VERSION=v${version}" ];
 
-  postInstall = ''
-    wrapProgram $out/bin/terragrunt \
-      --set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform
-  '';
-
   meta = with lib; {
     description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices";
     homepage = "https://github.com/gruntwork-io/terragrunt/";

From 377c7b160b54e15c2723ec892414d95bc8bb7c7b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 09:59:01 -0800
Subject: [PATCH 2814/3942] direnv: 2.23.1 -> 2.24.0 (#104109)

---
 pkgs/tools/misc/direnv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index a659c576d8fb..f84a51486d98 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "direnv";
-  version = "2.23.1";
+  version = "2.24.0";
 
   vendorSha256 = null;
 
@@ -10,7 +10,7 @@ buildGoModule rec {
     owner = "direnv";
     repo = "direnv";
     rev = "v${version}";
-    sha256 = "02b27imda9pg65z5xw2q398p2281d5d46vgs3i9mrwcfsbpl5s6d";
+    sha256 = "1hgivmz6f5knpchkyi3njj1h81hixm77ad5g2v0m9bid09b97nh8";
   };
 
   # we have no bash at the moment for windows

From 52f5b947f6c4471de8f2e3659a9790bf7e4c777c Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 19 Nov 2020 03:12:19 +0900
Subject: [PATCH 2815/3942] thunderbird-bin: 78.4.3 -> 78.5.0

---
 .../thunderbird-bin/release_sources.nix       | 530 +++++++++---------
 1 file changed, 265 insertions(+), 265 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 9a411d4a82df..b052c839534f 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,665 +1,665 @@
 {
-  version = "78.4.3";
+  version = "78.5.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/af/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/af/thunderbird-78.5.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "03d4e32b23408b003de5347b2a26d9e3e734f7c3e811510ba81114eff80e6fa3";
+      sha256 = "011468ce085f2b5da8968b0622733d9fa25b47ec5e83b3bf4171323948aebb35";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ar/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ar/thunderbird-78.5.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "5aefbc61f46d59de19061a0e76949642e254a13867881b40b6bac289791c281e";
+      sha256 = "661b0f1981b21df20b910f9d833d86c2812b189097ad7e1affc7338abb4f0c5c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ast/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ast/thunderbird-78.5.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "1e328339808efed1db23ed372841ff65f64e1bda8e1d4be81fd00039468bbb1f";
+      sha256 = "c1acc2b6d5dd22adeab3106c3c6925ce0c1a434e1d38b3f699fab4ca319eab14";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/be/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/be/thunderbird-78.5.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "f42230768f2907fb3d23a03a56fc20f14ff5ded7b4418debb3e77c4942eb7db8";
+      sha256 = "6f76341164c182dd8392d2d1abbb0408a3ab773a7389dbf1eb9bb4042d49f500";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/bg/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/bg/thunderbird-78.5.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "27a72288cbaaaaee6a24a36bb2e463a0426810e97938cbfe012dceb1a3800fd0";
+      sha256 = "4e97b38383d3a145645ca518449e37e42b5b25cbb98cb72f52657b4813f2b343";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/br/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/br/thunderbird-78.5.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "fa1b6c891e3d9d097857a08181030e1df2201240ae466c4adc6fc0be0982d002";
+      sha256 = "1d5bcb706bf2eb589aa0c64589fc5b22021977947d6e1099f339a46c55a56f84";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ca/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ca/thunderbird-78.5.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "6bcc123c7ecccbf42022e302b63683cdf77f6f6f2a615b12c5ea9e6a081fb900";
+      sha256 = "3284b98707ee67977f148bd20d88750cc03799d9ba4aa5668c44901846fb8bcf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cak/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/cak/thunderbird-78.5.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "392cc166ee9be6c5cf8294f727f97cb21b6ad7ebb77d263bba273f02cb15e661";
+      sha256 = "7998d66eaf3edc4ee156dff06a30de8abae08ff66b380ea93d7ec0b827a0ea29";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cs/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/cs/thunderbird-78.5.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "60f5ea97e75f965ac0947e51c8cb8e709e5fa8f67ea478babe936032dee5a912";
+      sha256 = "5ba37c9dd7a1fc291bcc8b24ef025432dbd5f8a45ea2a4d1273177c6a7c8f6bd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cy/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/cy/thunderbird-78.5.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "93aa92633d2414ad59aedea8b1a820b158a21c042cbfaedd8abd2b5a41e31c5c";
+      sha256 = "baaad2ef28f51b6f57fa6f0583e8e0125c50ea3b4c94dea5854faf9826aecad0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/da/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/da/thunderbird-78.5.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "dc263e9d186f4ca8cd404b6e5bd13f9d2874e0e2507eaa55e99a6b5ab3b05179";
+      sha256 = "6113ed3f5a36f16e64f0cc499eb683a0d7d377d0cce37882f46f203893b789d8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/de/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/de/thunderbird-78.5.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "d9dbf07f3c57f688b08f75673074562ad9d4a9b138159f353415d63f9ccac80b";
+      sha256 = "81490e8cd8110285177c27f4057ff48ed1bdb55c94c83cc78e262b9cfcbd87ea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/dsb/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/dsb/thunderbird-78.5.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "084ef3ef3628d003c75dea9a9fa5897424e6e564cb18fb5bca33b341c8c511cc";
+      sha256 = "4c6abc365842c902ff184b403a6c271760bd8e71da9efa90d30310e032b03729";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/el/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/el/thunderbird-78.5.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "4e91e7d21d0a3d524de7e41201ce8af58518a7e0292c11fc2961a84e9b7d04fb";
+      sha256 = "d492a83d3ddaf5beead77fd90a2334ca4ed90023d4c4ad478249a360f49cd5be";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-CA/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/en-CA/thunderbird-78.5.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "922220811fb0083e8dc51c7cbd703530acdfeb0e9403d1a0909ba1618db020bf";
+      sha256 = "d7ddc5a22e89827067255726824e46d3355906441051c9faa04e6241cb833955";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-GB/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/en-GB/thunderbird-78.5.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "090806f6ebf12efbc5c20a920451feeb0d88d1e7366a074553b79080869687c4";
+      sha256 = "10ff106bb933374661e3398ea4ce02c205242d1f7a647504161e295b5e3d1e11";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-US/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/en-US/thunderbird-78.5.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "7fa3769297600c47c54902bac696e718053c48fc02e54698cb05ef81a4eec873";
+      sha256 = "297429aff3f10ab7c2859a37ec351b6b0a478495b8a34e8b492ae3473f052c7f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/es-AR/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/es-AR/thunderbird-78.5.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "51be3a453bb3e3f1353b88ab31fffa3fc0c135cb91facb7807c967a9d4afa659";
+      sha256 = "c8bafb3476d127d28f565ea5dd749b0c870087f395e0aabfb848a004846498e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/es-ES/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/es-ES/thunderbird-78.5.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "8828e5ff82e84c5f69afd60ae5dbba445d766e2a2d7fbbcd8f0dc8f255d8fc02";
+      sha256 = "d8c5350627e7e6f48fbfa863bed1971254104ee299d81d1f36b99d6c6ee54313";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/et/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/et/thunderbird-78.5.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "d58404701341bcd9b859f1afb87cb3340fc4b8334cc9490e8ea21446e3f308eb";
+      sha256 = "f2a1001b0bb87965e40cd832102d2233b732273930d36715ff2db900b37c9ed2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/eu/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/eu/thunderbird-78.5.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "5570472164329f23d3f0be51911402c2b454ea704419ef16b46b359a2c93e821";
+      sha256 = "30c6da377a8fc4596f6a67b189c1c9f7a9075df96ed3a59b4da7e0e77157d950";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fa/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/fa/thunderbird-78.5.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "cc56e14f1fa17e8b4ec9431ae9ada10159bd90bcade39432c647ba401791e3fe";
+      sha256 = "8f98dd01764a5d244c25c3c409b8dbcaa1d3daf7b3a970c60d3d37fd5ffc4294";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fi/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/fi/thunderbird-78.5.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "5175e312e8957490b013dd515b84fe4dfcdf57d30c6806f8bdee67caf39659f7";
+      sha256 = "be5f152b28ee21d916b184999023a1a5adddd1d2c7448e7eb37bd08948f6a14c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fr/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/fr/thunderbird-78.5.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "5239f8a07f0f6bc4f69b3d4315570dab33c331ab775479a9df39479b71542cc7";
+      sha256 = "c1b2d725c43196dfe3f9bfd291dfae84ba392151222589d80e3921e627667d59";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fy-NL/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/fy-NL/thunderbird-78.5.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "5747be2c7f9d5463f9c14fd02fd5e66a8f6c4c8adca3a1bf8c3b4333f1ea2adf";
+      sha256 = "622c42950cc7d3889372b6e0c5833dc5c5f608ab23ca9962e0af67ce4b2f8ff5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ga-IE/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ga-IE/thunderbird-78.5.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "8e15ffc9235742ad88a1ecaf587a178f5aeb0bc57e075b33f792e2d458362ab9";
+      sha256 = "7293859380e07d362192cd9dcf88b8da04cde6e102f0b8d51a00021bf8fd9e98";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/gd/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/gd/thunderbird-78.5.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "72f53918cd04e587319d59100da05657a3084f97d70acba7d1ef7b7321add6ff";
+      sha256 = "f54b892150bd49d028337a88d3a0b2df896a47a6904067b381d385281d2c681e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/gl/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/gl/thunderbird-78.5.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "28beb85fe0ea27a659e5063f7094877e906729602ef2e155f0e55e9e9f6d56ad";
+      sha256 = "58c88bf739fde7e0f7e279106622abde617a0aa267f34f1c10f8d886800dc50b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/he/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/he/thunderbird-78.5.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "718f8605fc8d418c645a0485ce86d97ae1eeded8b776a990e137ced78eb91a68";
+      sha256 = "8278c7580356c360c74ad161a6ee052e9398e39a2a5b75217ac0239db28ee4cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hr/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/hr/thunderbird-78.5.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "febadac023152dc30e72026f6df203c8051b65ad4da0c4e7059a14ab0b4b5f37";
+      sha256 = "b20bef1b7fab8d63c5cc6336dd59264e7c62a9a4c6f2db4232ed27624b26a3cb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hsb/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/hsb/thunderbird-78.5.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "faaaf4606fde4baca3216ed5801209f13cd1bbf34c9671cfc7a7648bb0ac7351";
+      sha256 = "ad4797a36c713b5026a4da131fc46f341cb8b72e5ad2f07a677bfedca8401163";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hu/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/hu/thunderbird-78.5.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "353633956336852193510c8e77251834355c92ec503ab827a389a0dbc21c05bc";
+      sha256 = "1f3dea138c4f82f91b9aaf891b9959d1cdda273f20af811d967ed55058f69064";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hy-AM/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/hy-AM/thunderbird-78.5.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "1b5dba6f05ecc8449522d8a54c1d4e7aa5ec7a2e26fafbaefbd754ee3ea5780f";
+      sha256 = "836668531a555d9bd23fbb3c3b27cc647a327d02e6db1903248fc6b3d59c5dc1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/id/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/id/thunderbird-78.5.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "470151868d745ce829f0f38c6377f4ead87be829d43f4383d2e5c3541b93e8d2";
+      sha256 = "1d74cd88cddf7b22ef8b19ee6cfedaaade15cecf68712ec8568888d0708c9c81";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/is/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/is/thunderbird-78.5.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "e9d6b36beb61445c3f96ffe6e11b238a8539b398d5f3911f2ded7ee96ec0766c";
+      sha256 = "a6e3320211b207e9a36c6197dbf97e746d2e9e9b7bda444a8511550b5846d329";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/it/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/it/thunderbird-78.5.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "95a02afcebb834b14986b8ccd92d5381a8ac64d3ebbba13860ffbd0313a594e1";
+      sha256 = "f0e659e6888590394a652033f3d15b29ff9318b4c88faae51d6347f1441201b3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ja/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ja/thunderbird-78.5.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "d1c4e2a551a5266839da96b843372e71616346ea00361dccc8e1a62628e6315f";
+      sha256 = "a2ffc461e6d942222bef4229a820bf8536ef41dce83efc458d82476d5f98f5a4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ka/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ka/thunderbird-78.5.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "9eb37a69a370b2619724c91c6789471b9ef579190c08363f633f320563dc4df1";
+      sha256 = "6a374b791fac25bfc3f10726d93497291163dd95b1372dc09db70c098822f4f9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/kab/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/kab/thunderbird-78.5.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "bce07886dc5251ef401141d387c926f27f61d13450f35cb9a9cbc8403b43260a";
+      sha256 = "a23dc5cfef7bcbe32c32363d0048813a24cfbb19f17c3041b23fc751936dcadc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/kk/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/kk/thunderbird-78.5.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "222647dd8106134d46bbad6dad8638090e5441a64aa2a6725aa5b1d959a2832a";
+      sha256 = "2187f7d763d34787de0d9870f746548459bd0a2ef0676286d2f9ce9bc9092ef1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ko/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ko/thunderbird-78.5.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "be2346d5a48e5323d5cc8c1077adf054927d8aececd2fb45fc2f5c0a9f0b8dc2";
+      sha256 = "ff88da9f6c77e8f5c1bebab542abc51266ba03d97fc5d22b86cf52a26db75e63";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/lt/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/lt/thunderbird-78.5.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "da5cde252d5e167025fb06861a32b67a2d0f7171c767bdd8c5d2ba9fc90d7739";
+      sha256 = "77531cad8587aba9c4091bd22c79e40e45d3c57083b5af3e54af3576ed45134b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ms/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ms/thunderbird-78.5.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "d6ab0652184cbbfe9126a49f61c25fe8852725b88460ad92c37dc1c4d969368f";
+      sha256 = "aaa346d9bcc1cbd84beedb75c9949d4a2cd8bf80496a31e2018c2493fed68339";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nb-NO/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/nb-NO/thunderbird-78.5.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "2485cc4df1b1dafd0c5fb7d7723e923e7fea10af1dbf9764d5d7447f38825e49";
+      sha256 = "dac3f1eeef73c247f9c79a09b7ffab1498be6c96865b5f21ee28d398941430a1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nl/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/nl/thunderbird-78.5.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "0795d2ae4364def43056e77106ea19053c3111e2f95758dbb41875071655ba47";
+      sha256 = "e0b3df7064e08e34f85b9a83d2bef990f66ad0e1bc86f764139fc57d005d1aa3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nn-NO/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/nn-NO/thunderbird-78.5.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "b774035d8bff615646d3b3d73228277531d50309fb5dbf3978346e2b988b2491";
+      sha256 = "eb420586e8be191ffc41f4a920506336cc9dccbf229c260a7f193cbe169a6da4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pa-IN/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/pa-IN/thunderbird-78.5.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "2a38813c8aa0eaef3d2ec0ac379ab5c85d0b8c2df1f6a2d36ae066f7b0445447";
+      sha256 = "12f7c97b130ce40dd1dcd00a16a20000113b7be33c87ab9002848439ce626abd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pl/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/pl/thunderbird-78.5.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "21cdb977bff1f0c07bf913b4feab2075a429b4594760de52ac358538179d9c66";
+      sha256 = "5ad96dee4b422c820da8a76ab64e62e919c21d99b01b92f346a55acada7cf8ac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pt-BR/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/pt-BR/thunderbird-78.5.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "d903ccd23367c39779ac2cdd3abe636a0f9e72f8d133a567bead8a739e651589";
+      sha256 = "7d6568c067796f21079a4f6bf3374a1b91807a9b30270587cf815892d86e1590";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pt-PT/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/pt-PT/thunderbird-78.5.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "f220a8bc90b05dd796c402aa5e79c62a8aa91a4d80dacbdf57abf77ec51d73b0";
+      sha256 = "22058d65e2ba94f39ca6ada6750beacf2bacac0f296a34542fde01e897e4a4e2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/rm/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/rm/thunderbird-78.5.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "805d08f629e9dda7d6db36bd41dbcc128defe59b4610e4b7d5d47408a07e47b8";
+      sha256 = "c61ff10e4260eb2650fc1a4e0ca8df6c4e4e2e9525168ceaef86a9b8b2ddba54";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ro/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ro/thunderbird-78.5.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "3b09b2c59f32a09938a45270e04740616b2a13f8b8a6f40503650d9b0f72fc35";
+      sha256 = "2ec34bfd9fe4a0f0cf17f132146ab2a589c986a8b4317124f3bfc34ac48f732a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ru/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ru/thunderbird-78.5.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "2022473752da127d2ebe4eef7f834ac5feafe38dedbe64ad30defb8ae69c6ebd";
+      sha256 = "b835dd1757f5cdc580a2b91f01a8089c1396d9eacee665fe9976019f8523fdec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/si/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/si/thunderbird-78.5.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "dc5166b0b24bd0a9e98f7dfc483a6bff184a4bfffb0eff8a4007b96fe8205254";
+      sha256 = "3722e47d39024c13dd799e0c89cf79a1302817605f7025388cd5f62fea15d168";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sk/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/sk/thunderbird-78.5.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "d30e4d3218fbf13a5c531d45f55f0f366aac10aa2d180886ced778c7459c0610";
+      sha256 = "4717620562c338f533053677d8956490d2d42abfd52beb6a0d41466ba3e72a36";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sl/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/sl/thunderbird-78.5.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "f968618f7b13b6dc4441a09882ac5c826017a5b0ca3887b7cdca8ef6a3b3c266";
+      sha256 = "d712c5b3dddfa181877353d28667d410bea3a1f3d85e92dc058a3f3ac5ff4824";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sq/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/sq/thunderbird-78.5.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "f4400c6e55859e07705b353cbf211e863e8c3f373490f3fff6bd3e6d360d5b7f";
+      sha256 = "8443ae1161c6b3e807c9d4abc01824e894a11b6f6c9a52d3097b8301461ac0c3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sr/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/sr/thunderbird-78.5.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "f6437ffb64b1a98b5c5630f3b386b12866a514467c641fb02c8e86560e4b62d9";
+      sha256 = "13f093880d41748efa8f1566e5884d632f2fa80d4eb4f1a8dd1dc20ea626cee8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sv-SE/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/sv-SE/thunderbird-78.5.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "f1af8019698347ac94bad5c33b5e094b65e8ebed9181f5fed5e740cf2029bcef";
+      sha256 = "ee9d7262a8b6cd8460b2f1c4c0102b68f9a0983e1f021f2283ead172f07e3f37";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/th/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/th/thunderbird-78.5.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "75830b637302032bbc70342b71012f391b333a2645d8fefb8f4232d432c9dde1";
+      sha256 = "09cd7b862cb8caa511b6d550bb668f0fd51fdfee5b2f6a31814282785688e4de";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/tr/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/tr/thunderbird-78.5.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "3691e5aca6b9713fab9c8a15952d1ceae50d67cc60e362eacc9513a362875dfd";
+      sha256 = "0d9f63aa7b63d571d7414755bd4e8bc27b7c5fd093ee46ed0fc2db469940dcd5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/uk/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/uk/thunderbird-78.5.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "c4aca974c3a541c312029eb66fb8fdb1c5ecd787deb67a10bda3195f0ca06263";
+      sha256 = "0aa64449381edeed7c37d18e03f74dac2f5038a6c3c5de9fa6ad037b139bb5bb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/uz/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/uz/thunderbird-78.5.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "2052c0a9a41c81a37aa23fbf28775e286b8350594b01aff629604ccbd74ae90d";
+      sha256 = "eabd24b838a072cb1aa9bebf3c573b3a6e7a364b759aebd62d12b16911956a00";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/vi/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/vi/thunderbird-78.5.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "b142f463cd953bfc423be210eb891f66e948308129de74cdfd415409d4b0cb03";
+      sha256 = "ce9b5afcb60fc0f17a384a9096b26626f3d3f570222910a46872688009aee262";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/zh-CN/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/zh-CN/thunderbird-78.5.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "0664f379ce4e464e2e6dcc3cfa749bd6ae4a597b008b7fd1c97bb6219727da6d";
+      sha256 = "9d69c7ef37282a7741d2392456c9ef5f5700fa1b718889e93bf7010fa99617db";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/zh-TW/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/zh-TW/thunderbird-78.5.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "2ba4d49b52e6cd699f7bb1fa8f024c330f67d6b9df543a77fea7c3dc87985cc4";
+      sha256 = "6001d4e74212b72b2a3583438925d2431bb28994a661b4b47e77268e7790e526";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/af/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/af/thunderbird-78.5.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "60f62dc28a8433e571b894d33c0d9670c3aebc6a8c556c65f12d8d574e5edceb";
+      sha256 = "e30adc9074f08e04a4477f59eff6af83bcdf22ccafa1aef5ace219a830c50f38";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ar/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ar/thunderbird-78.5.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "cf0fc7d7af09b20dbb35364ac0e47615919ae1627a0b729acf2f13dd99198400";
+      sha256 = "6d9456fd3f76de33a3f7c46d8197d83c36c832922b83de64cf4c2f5a56f7729d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ast/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ast/thunderbird-78.5.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "cb7ed53eedb55858fa5a5aadab1ed0ae4f2f9e2714406488b211660e56785d21";
+      sha256 = "1427f7741ba5c5da163ecfce3053bdab7b14c8fc2e8c046c244f7eea6d015a2e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/be/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/be/thunderbird-78.5.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "b04239a6caf488d3fcb5be0373ddf83554643897d41bd197edb6dbaee15b9a4d";
+      sha256 = "97258efe6425869e4710c07e880df2a3f6c14d626e6512374043cff226f141fb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/bg/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/bg/thunderbird-78.5.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "fabd2c79cee02328166954d6b793b70bb94cb41162b904ecb124cdf91e5cff0d";
+      sha256 = "a30496a969a954525dbcf1ec0e94d8533baea3809e61d6c1c6e299f883d9676d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/br/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/br/thunderbird-78.5.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "66584e5c63c58c10cb4f2f8fb81048c4201046adbad03d58faf8f36e405a8e40";
+      sha256 = "16dfc1b869bb10ce7c56f1b22981586678cd81a42e13c4075ebc1da76728258d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ca/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ca/thunderbird-78.5.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "eca54850e9ed41a19bb4cd23de9c11d9d2851ac1573507b32b4fd33431ad7889";
+      sha256 = "bd29d4b8376355090adca0185194d3c9b6124c336bec0dababaa4a214f9945fb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cak/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/cak/thunderbird-78.5.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "ff8e285bf3198c225c2b5b216678bde7f978443c1f354193e39c0c5d3d7237bd";
+      sha256 = "b9723a8f8b8a61d01f09b18f1dff6529d22c89653586ad032831c87683da12b8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cs/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/cs/thunderbird-78.5.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "72a18f3ac0168478c7b9c8d2641922ba7be5d129b63b711b7f7f133ba3cb1d75";
+      sha256 = "55ff98744b2f120a855c8a3bc435d39209504b7eda92560be40b8cb3fbe007f0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cy/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/cy/thunderbird-78.5.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "16fecfef3f81870befcadf833db5ecf54b7b83d587f2a211c5eaceeaf7a5796f";
+      sha256 = "818a93f5a4f02e8cf7b3373c31c435dffca3fc1f86d5acc3fd4355bca21f9cf0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/da/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/da/thunderbird-78.5.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "7aac88184c6e2539003905b3a7609116cb2180943a8df219449354297b323455";
+      sha256 = "7df66098805f276e1498fa28c00aa7eaa8a8993b561261c54f7091a808ff6766";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/de/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/de/thunderbird-78.5.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "f3f487f8852b7f50ed49b5375ae97376470282a0f5639c8fc4cb7040da30f946";
+      sha256 = "194831e85294b41a4c1bcec8a2f20f337786054525d50e2fd6dfd6134385d2d8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/dsb/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/dsb/thunderbird-78.5.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "842a084fc74c29d3c7573e473666cfa01f205b75fe6c1ee83acc25cca68d3666";
+      sha256 = "e7344c6b2c90bca56adfca1619e1bfdc0e473f7230d4c1059d6516cee8d51759";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/el/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/el/thunderbird-78.5.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "8df4c2a688b435f60fe0d5646ac5172dad33d254fdd68e35a29a6a83c4bda905";
+      sha256 = "e2d4680ced58f78699f7bdc2c3493d6157cf2c9261aa697cd6092ed0687a7bbe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-CA/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/en-CA/thunderbird-78.5.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "8eab7a0b08e3c65eb5c373eb018d5e1df519b28f8774b06203a5b7743b146cd5";
+      sha256 = "6afd7bb703c62763b787d77b7467881f07d12e73d32d07c6461642307e3b9f5f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-GB/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/en-GB/thunderbird-78.5.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "23c819e15ca0ff1ad366f2d5fb76e934dcea0fae9cec6674b39339e14a3c4254";
+      sha256 = "78114f1a1dff6c5430b148fbb8707e03cd3ec1d05af48082755190ae45e94dd4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-US/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/en-US/thunderbird-78.5.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "5cdf4b40f337352a8e966046a2eb1a368c0feef4fb069fd4c22d4f986ea1ed3f";
+      sha256 = "beb328b15c7b981b10f26cad6325a04257be20e25e819fa771f88fe5e5c98aec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/es-AR/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/es-AR/thunderbird-78.5.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "e7947542ef45cb432991ac5435523987c79811889e9bd5cb6fe4c698897a241e";
+      sha256 = "3c096d5225f8fe273b6f0adc119ea419cf60e7a7723fb3a63a6dec1be6e4c3ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/es-ES/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/es-ES/thunderbird-78.5.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "95121f74bc1389e62dfe7acb286d2a4cd60a536f28054c8e367cdfd867babde1";
+      sha256 = "68796cda86944bfb70207b79c162c0b2fdb66b17511300c799204fce58d2c2b2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/et/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/et/thunderbird-78.5.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "87aedd276bc54360887e81bf2e3b07c54a365b78814d7e478f7ad5ec15c1d451";
+      sha256 = "6187058a289cb43e89916e484ac46c2359fc9c452d07dd4dab2e3ff8ae397c47";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/eu/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/eu/thunderbird-78.5.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "66168f09ed77b7f31faaf21daff48e9a8bf75314fcab585fad67160db52471b9";
+      sha256 = "ad587a3b25de553b69ab9aa61b9d99c4f4d7dd37b05672540eda7907b21f2857";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fa/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/fa/thunderbird-78.5.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "2848f0277f75dc58f371e2025bebdeca1c37d543055fa78258df67d05c67f5bc";
+      sha256 = "8c06bbd83b5485b113bf4d0ca69af9ca21c7854ff38b19831eadae0c586dc606";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fi/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/fi/thunderbird-78.5.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "725f0dcd456245e188e32a32401ecd40400b7786da3a39d9f6965c1f674ee954";
+      sha256 = "bac6ecf3d22f6097f8cccb7da81866941426ee7bbb690937a2333b411a305fbd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fr/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/fr/thunderbird-78.5.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "d24ab35a8db7cb32d6098defb9f7b6b007b5c993a070c1a3a5c8991451165e37";
+      sha256 = "859457a9c0bae23e4acf901d38de814858c60fe1a5e28ee897b2c2f4c86bc29a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fy-NL/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/fy-NL/thunderbird-78.5.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "ea3a88b57166b3b8f04922a5c2f6d8d9f94f1a7bb5f3a9e2d6b5f11a13528c18";
+      sha256 = "d5a91d212e0c9c6c533bd7f05edca3dbea93eba0bf0d34eabd1e9ba7c7138e8b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ga-IE/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ga-IE/thunderbird-78.5.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "763bc901967ec61e1f7f543bbf248bb03ea68b01c000677505408ec8e8c3cbb4";
+      sha256 = "980e053f0bcd5096753213fd6cc252be388312980032132bf912af2d4249278a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/gd/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/gd/thunderbird-78.5.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "7394f43ae2ff5816dcf9b37255fd9770dc48dd7309d685ab378bc2de8a5a39b1";
+      sha256 = "7b61b433d2f55191f7ecc63e04ceabcebcc85ab211553b71de575bbf14db05ee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/gl/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/gl/thunderbird-78.5.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "7daaacf6af75b34d37d440e2c0b252ef03c3b432523f5acb8ef71f83b5d7b6cb";
+      sha256 = "2dbb2021eacf17f5d42d0f8edc32a3f4d0ae3964cc8b44b0875fcee9bbd8ebbe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/he/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/he/thunderbird-78.5.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "4831ef263de0a08df6494b13a280475642c3eed7f34c7415fd7b59af192398dc";
+      sha256 = "b64fdf97d7f3029ffe465bbe621735970c73682cbde03935c2ad94325a7a77cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hr/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/hr/thunderbird-78.5.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "6860b40fc2ba7f9b8ddedcaf50acca8ac01b6451c0895c325b36485f188b5dda";
+      sha256 = "05606268efa91e8266a75f9f53dae8e8095fd70bc1095e2cc160171eb32e9a0a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hsb/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/hsb/thunderbird-78.5.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "681fc8200f6f9346e911c21d6a1c8206e5ee5ad1adfaa56ddfbc5088225fc561";
+      sha256 = "8a2dd27b17cbfad0846a40b4863c72e0754137e4ae581998ff291b4428a069ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hu/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/hu/thunderbird-78.5.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "8909d02e58f5b333fa51b15e4ddb5df162d01e36a8052827482c479949da2cb4";
+      sha256 = "01daa9ab4f5d096a9a5e138db4debeee302fb875f885e644eea88103c5c62111";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hy-AM/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/hy-AM/thunderbird-78.5.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "12dee2dbe126d2243b674bed4617ffcec7c93f850d266f6253d802c6af5b6d6d";
+      sha256 = "69159084189c5700e5c8c27bf4cc0345fcafe0879b7f7cca285246a41e411578";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/id/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/id/thunderbird-78.5.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "5564c24b01f9a952def885a4fb56e3246643ca30bc5066d6ffa4ed6c6982b33b";
+      sha256 = "798203a12f76cb3c698363da72b235fc9abfc5a68913f3265c9b17b14318eb73";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/is/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/is/thunderbird-78.5.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "fedea70297479b2c828aa19a9a4aa3090597c5490ee842a0f521d0096615d6db";
+      sha256 = "19544548a0b0217f5f5256949d74897c784298dfe762174487ab2ba2557a55e7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/it/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/it/thunderbird-78.5.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "8466f3dc9988270d4a9166b82dba764d8dbfa14e8c26a1931d35abe011c3160a";
+      sha256 = "b1ae17f3d4533db0107ab280ec4e8ecc610db9581d44ed52d8ca87c821c37c1b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ja/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ja/thunderbird-78.5.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "3ffe4ae508896ac961a27940a93f5955bb8b29640c88e5378a8251827b4e9ab8";
+      sha256 = "c16c27372c28063a06e31fc440294a655fb72bc033efbfd797d150e99e6ebaed";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ka/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ka/thunderbird-78.5.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "7c099596fbc4666e053bd1079f6b7c45511b2b44db73cd5c099fd392bec8e3e3";
+      sha256 = "3057efd5078776f1690890d601153a73e2450051a0edb61e92d196318b644679";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/kab/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/kab/thunderbird-78.5.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "5e64e5a276a6e77250ad7647f9b4ecc2b8c9dc360c486f9504b3b17b8da3e467";
+      sha256 = "ce8010b362b601819fac825ce27b9efd8af8f0965f8f1cabb21bfcddb2ec7315";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/kk/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/kk/thunderbird-78.5.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "4562bced5900bc447a79c53d381b250a1e13b9f076979cb9760f9adaa89c54b3";
+      sha256 = "b73930d1508bdcaecfb9ce280f0d86fd5dc7a3d26160caa0eabbe47243956139";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ko/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ko/thunderbird-78.5.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "b6cb53893d67bedb077547f1262a833a5487e49395187a49eb977659d019e7f8";
+      sha256 = "24d6e557b6419bb3a512646edb6e1e4d01ce1c0e134b9bb9cc54ad5acb6a0675";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/lt/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/lt/thunderbird-78.5.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "6291d36e9347729920f89a28b949c943d8c92863cba1a03624801c7136eff997";
+      sha256 = "c9dc7dc77a1c1acdc1e244e6b1201ecd3305b5c10ef946ceb880fb66d57c249a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ms/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ms/thunderbird-78.5.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "5dee2e40dbceea93fbe3b35b744d00472b89b88e745025127a1d07afc79d7df8";
+      sha256 = "d3a0b9fc5b38de919515df9dc6ca696c7c70f629b192e8cae099a55432d466d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nb-NO/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/nb-NO/thunderbird-78.5.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "491115e7ad1c4245da34dc328e179de3916291d4e42a85ee5fd4fadeae1fcdcd";
+      sha256 = "80f552a61288f1d1a6346d302919fd90f63c2d349a2d33921eac9a65c341a7d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nl/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/nl/thunderbird-78.5.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "c4631681eb3354a3093acd5a76d5c7ca5ef3e76ac2cef9f1fa4007c40c1e282d";
+      sha256 = "89007857be04b59bf724a2f6c295c0948a885c8da8c7a7060922e04f616baf30";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nn-NO/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/nn-NO/thunderbird-78.5.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "aa4d383b90b7cd48ff18f098c9bba429f09fcfb72a2f2a086a992778718a3b1d";
+      sha256 = "b7a8060d3138a55a29374d890b326e77105f41e809053d34c24464a892c6bdbc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pa-IN/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/pa-IN/thunderbird-78.5.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "c5fb66455a59383494890e06559d4529c0762ecf76d17e5ad784eb413277438d";
+      sha256 = "69f803555cc9b3ba7fbf638e101b76bef10a234747cd0764e906e5d2adbb9a97";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pl/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/pl/thunderbird-78.5.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "720eea0998d9934960a5dc97466f57c7e68b2048f88125a987569539a8a00579";
+      sha256 = "4cd4da857d9cbdc5d89e07529d30df28a758c3c105160d2217b50206147c21e5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pt-BR/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/pt-BR/thunderbird-78.5.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "d27ab836f5d8753d740e980291a4403656735c206cedbaf7d5c13df26d327150";
+      sha256 = "43fca4ac927932589b58e60f7b3b1cdcdc1d73b6f9073e0c1eb2993527afe9be";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pt-PT/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/pt-PT/thunderbird-78.5.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "2b996d07174c24df1b066c41bd92c8b24ebab82767c47d8c658f2205eeff9cb4";
+      sha256 = "25591b73b7ae5d28441baeeae3fb3a5a47f36ea21db763b95782494fd8491122";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/rm/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/rm/thunderbird-78.5.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "206b2bf82b88ab733bf585e11a3eba49a779c8b8fb7bb249716022fc7ee1a18a";
+      sha256 = "14a0725f1083ab9c4baafe6944604cc5781cc9d3d44cbc406874b5ce01df785d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ro/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ro/thunderbird-78.5.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "2d06d671114d70ba4e39b2c639eab1debe7ad33de11795113f30f27708d13ae4";
+      sha256 = "f32af00602a13e262e6b34c8b5783b31a991dee72d82c841086d21e37d669dcd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ru/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ru/thunderbird-78.5.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "08e71802964c340dfbcddf963382d1ccc5b8fd2e262daa1316488cffd04f449f";
+      sha256 = "367e7865f1c5d10eb912fce96a34bf6ce25ca48e4ec9209bce8af06412be7781";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/si/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/si/thunderbird-78.5.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "0f59d187fa15bd08ffe0e08e643bb76954f7eb7730c3768079514385c53df5d3";
+      sha256 = "da0494be7a26f0a531d108ca20a0bc9763860e44adaa6149ea059f46daabbe0c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sk/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/sk/thunderbird-78.5.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "5109939226907517fac9ae9c4e6ee96d732de9a67b9139e390d32cbdea892ef7";
+      sha256 = "1c5078f413207049a35c69be32c6996cad169cadc009b3f079b3adc8a932ca22";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sl/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/sl/thunderbird-78.5.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "c56fb54ad65dd453b487813b1f0dde8d83ed6a2f7e428af55c40a80d1c9a35ca";
+      sha256 = "d8a5edf78b5a87c0b3baf0199231e6e9224e1afdf4eff05780b6c9b98657c1ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sq/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/sq/thunderbird-78.5.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "0b3814c80014108032c9f0376a62c09864704441f36a084accba1c7c0f8156de";
+      sha256 = "fefcb88c0c5f6ee62ba8224417a629d8a4f0c18b20fcb037c36af772b0d2b71c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sr/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/sr/thunderbird-78.5.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "80b01424fae7d18c98a77a0026dd4b50f1913f5f3cce2d3f85d9e56da633a537";
+      sha256 = "c42818c409de6447c1aa00f8aa6422a9fbb6fa16f01d5076331937c1145a4b87";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sv-SE/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/sv-SE/thunderbird-78.5.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "ef0154595d85c13d0eac381a907a51da19e9d93d2758c7dc0f052b7b76a7f31f";
+      sha256 = "c27d87cde88f38f3611358b5fb3622611c38860ee37d1d90aaabcb4db614a031";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/th/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/th/thunderbird-78.5.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "939f56c4951e8dbfdff257efe7f0212e93c1bb55547ce1e934f7d908932d3116";
+      sha256 = "df9b827a723675e70131d147fa6f6325f6e6a14a6b95f6f5b6fae4552501c6b0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/tr/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/tr/thunderbird-78.5.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "66f4f2cb06f20fca47e59b37d52f07a9e1215b03f0bbf9320cd1436e1d1a7c35";
+      sha256 = "7a9d6e1b5927c7c54b73062a59d366cd5153896a89e95005177fdf4b789eda42";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/uk/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/uk/thunderbird-78.5.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "33f3b9812b442184c075056cbe7da924655729865d849856093bdaa2d7d84660";
+      sha256 = "c421df09d5bbb5e4de273258757df28e5a6eba291a4eabbf28db71a50cb11da7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/uz/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/uz/thunderbird-78.5.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "5abbc17bb66700093eeef5eb97bcab0a5d040ffe20ecf79d8239123248b1affb";
+      sha256 = "296ca42b0c9f67ef0bb545f458334ec26e03be3327fd1e1b066d8324965704b2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/vi/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/vi/thunderbird-78.5.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "de5071c3b4a5cf7494f91c69f4a7cf4678bcf57227115e1b6e50cc65a3e716dd";
+      sha256 = "46579d9723f5ccc84700c2544f3d1235db338471306d87a1caa0ac4fb337c8bd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/zh-CN/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/zh-CN/thunderbird-78.5.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "07afc2b794439475d0d4db82c7b694728aa5b8e6e80ac79789bae662757ae8d2";
+      sha256 = "9bf0df6568eadf611891f49591975166da95eb4e78e1191eb3354a81637907d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/zh-TW/thunderbird-78.4.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/zh-TW/thunderbird-78.5.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "70a71d0c26fd2cd18dd599374cc6f1c39d22246f3b3c8e8d17659cb7c33a5a77";
+      sha256 = "8fee4fd8980d551317fc8f98f29938034f5ff90b765e73ef8cd09f8fe68f90c8";
     }
     ];
 }

From 19682545d91b4589544fe2f040320dbe7e28a66f Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 19 Nov 2020 03:12:47 +0900
Subject: [PATCH 2816/3942] thunderbird: 78.4.3 -> 78.5.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 57d12b38dcdc..8b5cb081f319 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true;
 
 stdenv.mkDerivation rec {
   pname = "thunderbird";
-  version = "78.4.3";
+  version = "78.5.0";
 
   src = fetchurl {
     url =
       "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
     sha512 =
-      "0h5ddqp1z2dphyy4mjcb7v9mrrxlnjw8rwklm0yqsbvs9m96pc1yyp4clb3wmgs7kzh3wxdwi450842m3b13wdg5h0ls7rhamd1yi0c";
+      "0c32dz8p7rrr0w13l2ynf9snj59ij1v2ld3s75vz1hvks4dikwgcbm44wmvmbisvgyfgzdsphafzlq3kz3j1ja30qjigl0dj709vr6s";
   };
 
   nativeBuildInputs = [

From c27fa30028316dd8d8c9907e8b9deb4cedbef7b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 18:56:03 +0000
Subject: [PATCH 2817/3942] libavif: 0.8.2 -> 0.8.3

---
 pkgs/development/libraries/libavif/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix
index e8fdc6eb206b..e19e03032939 100644
--- a/pkgs/development/libraries/libavif/default.nix
+++ b/pkgs/development/libraries/libavif/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libavif";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "AOMediaCodec";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0f0l8ywz2jhc9mkfrzdxdvr3q39a404yn9wcyvqshfbkbprsan4p";
+    sha256 = "1d6ql4vq338dvz61d5im06dh8m9rqfk37f9i356j3njpq604i1f6";
   };
 
   # reco: encode libaom slowest but best, decode dav1d fastest

From 95a170cda042ca425f67937bb1845f6a8b4f5be0 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 18 Nov 2020 15:51:36 +0100
Subject: [PATCH 2818/3942] python3Packages.sockjs: init at 0.11.0

---
 .../python-modules/sockjs/default.nix         | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/sockjs/default.nix

diff --git a/pkgs/development/python-modules/sockjs/default.nix b/pkgs/development/python-modules/sockjs/default.nix
new file mode 100644
index 000000000000..d589179338fd
--- /dev/null
+++ b/pkgs/development/python-modules/sockjs/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, aiohttp }:
+
+buildPythonPackage rec {
+  pname = "sockjs";
+  version = "0.11.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "A0fUBO2e8xllBnh+2AGPh+5OLQuupJ1CDN1TqWm+wik=";
+  };
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  pythonImportsCheck = [ "sockjs" ];
+
+  meta = with lib; {
+    description = "Sockjs server";
+    homepage = "https://github.com/aio-libs/sockjs";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ae79ca29f696..5c7370e023eb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6737,6 +6737,8 @@ in {
     usePython = true;
   });
 
+  sockjs = callPackage ../development/python-modules/sockjs { };
+
   sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { };
 
   socksipy-branch = callPackage ../development/python-modules/socksipy-branch { };

From 5dea442d0936cfc2768607362d7092cde15a2736 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 18 Nov 2020 15:52:17 +0100
Subject: [PATCH 2819/3942] appdaemon: 4.0.1 -> 4.0.5

---
 pkgs/servers/home-assistant/appdaemon.nix | 49 ++++++++++++-----------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 2c0854d0a8b4..ef92ff9550ff 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -4,34 +4,18 @@ let
   python = python3.override {
     packageOverrides = self: super: {
       bcrypt = super.bcrypt.overridePythonAttrs (oldAttrs: rec {
-        version = "3.1.4";
+        version = "3.1.7";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "13cyrnqwkhc70rs6dg65z4yrrr3dc42fhk11804fqmci9hvimvb7";
+          sha256 = "CwBpx1LsFBcsX3ggjxhj161nVab65v527CyA0TvkHkI=";
         };
       });
 
       yarl = super.yarl.overridePythonAttrs (oldAttrs: rec {
-        version = "1.1.0";
+        version = "1.4.2";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "6af895b45bd49254cc309ac0fe6e1595636a024953d710e01114257736184698";
-        };
-      });
-
-      jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec {
-        version = "2.10.1";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013";
-        };
-      });
-
-      aiohttp-jinja2 = super.aiohttp-jinja2.overridePythonAttrs (oldAttrs: rec {
-        version = "0.15.0";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "0f390693f46173d8ffb95669acbb0e2a3ec54ecce676703510ad47f1a6d9dc83";
+          sha256 = "WM2cRp7O1VjNgao/SEspJOiJcEngaIno/yUQQ1t+90s=";
         };
       });
     };
@@ -39,26 +23,43 @@ let
 
 in python.pkgs.buildPythonApplication rec {
   pname = "appdaemon";
-  version = "4.0.1";
+  version = "4.0.5";
 
   src = fetchFromGitHub {
     owner = "home-assistant";
     repo = "appdaemon";
     rev = version;
-    sha256 = "13qzjv11b0c7s1c66j70qmc222a78805n10lv2svj9yyk1v4xhjv";
+    sha256 = "7o6DrTufAC+qK3dDfpkuQMQWuduCZ6Say/knI4Y07QM=";
   };
 
   propagatedBuildInputs = with python.pkgs; [
     daemonize astral requests websocket_client aiohttp yarl jinja2
     aiohttp-jinja2 pyyaml voluptuous feedparser iso8601 bcrypt paho-mqtt setuptools
-    deepdiff dateutil bcrypt python-socketio pid
+    deepdiff dateutil bcrypt python-socketio pid pytz sockjs pygments
+    azure-mgmt-compute azure-mgmt-storage azure-mgmt-resource azure-keyvault-secrets azure-storage-blob
   ];
 
   # no tests implemented
   doCheck = false;
 
   postPatch = ''
-    substituteInPlace requirements.txt --replace "pyyaml==5.1" "pyyaml"
+    substituteInPlace requirements.txt \
+      --replace "pyyaml==5.3" "pyyaml" \
+      --replace "pid==2.2.5" "pid" \
+      --replace "Jinja2==2.11.1" "Jinja2" \
+      --replace "pytz==2019.3" "pytz" \
+      --replace "aiohttp==3.6.2" "aiohttp>=3.6" \
+      --replace "iso8601==0.1.12" "iso8601>=0.1" \
+      --replace "azure==4.0.0" "azure-mgmt-compute
+    azure-mgmt-storage
+    azure-mgmt-resource
+    azure-keyvault-secrets
+    azure-storage-blob" \
+      --replace "sockjs==0.10.0" "sockjs" \
+      --replace "deepdiff==4.3.1" "deepdiff" \
+      --replace "voluptuous==0.11.7" "voluptuous" \
+      --replace "astral==1.10.1" "astral" \
+      --replace "python-socketio==4.4.0" "python-socketio"
   '';
 
   meta = with lib; {

From 37080b5c614dbcc1a20c68b8b7643ca012961de4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 17 Nov 2020 08:39:27 +0000
Subject: [PATCH 2820/3942] cointop: 1.5.4 -> 1.5.5

---
 pkgs/applications/misc/cointop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix
index a74a3962996b..e57ffd352717 100644
--- a/pkgs/applications/misc/cointop/default.nix
+++ b/pkgs/applications/misc/cointop/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "cointop";
-  version = "1.5.4";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "miguelmota";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1gkrwh5g69mywlllszy310xpahr8rz8nghjjpiamd85djf1iz43b";
+    sha256 = "051jxa07c58ym1w0mwckwxh60v28gqcpqw5nv8sm5wxil1crcayr";
   };
 
   goPackagePath = "github.com/miguelmota/cointop";

From 8e80af2e892997e799072a99776907b5097806c7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 17 Nov 2020 05:01:29 +0000
Subject: [PATCH 2821/3942] bluefish: 2.2.11 -> 2.2.12

---
 pkgs/applications/editors/bluefish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix
index c7ac671c15bf..48c83b053108 100644
--- a/pkgs/applications/editors/bluefish/default.nix
+++ b/pkgs/applications/editors/bluefish/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bluefish-2.2.11";
+  name = "bluefish-2.2.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/bluefish/${name}.tar.bz2";
-    sha256 = "1zy2ppdg3nq9iy3zgfhnw93bq5zbbhyampf7bk3grpfvq5zqfk25";
+    sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d";
   };
 
   nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];

From 193ace7e8a54de72c0d4f7671a605eb1fbb26a70 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 17 Nov 2020 06:25:24 +0000
Subject: [PATCH 2822/3942] ckbcomp: 1.197 -> 1.198

---
 pkgs/tools/X11/ckbcomp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 7b41791be322..2254cb4038e9 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ckbcomp";
-  version = "1.197";
+  version = "1.198";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "installer-team";
     repo = "console-setup";
     rev = version;
-    sha256 = "0m2q30f94vd1wb2zqpiyplpgfchjlm8j41xiyxcqdjzdgqbs7l27";
+    sha256 = "04ahnn8gi24x9kjz6q4nm6gswc4gcav87rvq9sajj4g2hkrxfn0c";
   };
 
   buildInputs = [ perl ];

From 94448baf6d53714b249e91c150e8a7121508bf52 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 18 Nov 2020 15:51:51 +0100
Subject: [PATCH 2823/3942] cacert: decouple from NSS to reduce rebuild amount

In [#100765] @vcunat pointed out that we could decouple cacert from the
NSS package to make it more rebuild friendly. Just rebuilding packages
that depend on NSS seems to be about ~100. Rebuilding all the packages
that depend on cacert is >9k as of this writing. This makes it much more
feasible to upgrade high-profile packages that are (rightfully) pedantic
on their NSS version like firefox and thunderbird.

[#100765]: https://github.com/NixOS/nixpkgs/pull/100765
---
 pkgs/data/misc/cacert/default.nix          | 11 +++++--
 pkgs/data/misc/cacert/update.sh            | 34 ++++++++++++++++++++++
 pkgs/development/libraries/nss/default.nix |  6 ++++
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100755 pkgs/data/misc/cacert/update.sh

diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index f72431c5a27c..34e0ec132a9f 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -13,12 +13,17 @@ let
     sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy";
   };
 
+  version = "3.57";
+  underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
 in
 
 stdenv.mkDerivation {
-  name = "nss-cacert-${nss.version}";
+  name = "nss-cacert-${version}";
 
-  src = nss.src;
+  src = fetchurl {
+    url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz";
+    sha256 = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382";
+  };
 
   outputs = [ "out" "unbundled" ];
 
@@ -60,6 +65,8 @@ stdenv.mkDerivation {
 
   setupHook = ./setup-hook.sh;
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     homepage = "https://curl.haxx.se/docs/caextract.html";
     description = "A bundle of X.509 certificates of public Certificate Authorities (CA)";
diff --git a/pkgs/data/misc/cacert/update.sh b/pkgs/data/misc/cacert/update.sh
new file mode 100755
index 000000000000..7bf3d46cb02f
--- /dev/null
+++ b/pkgs/data/misc/cacert/update.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix common-updater-scripts jq
+
+# Build both the cacert package and an overriden version where we use the source attribute of NSS.
+# Cacert and NSS are both from the same upstream sources. They are decoupled as
+# the cacert output only cares about a few infrequently changing files in the
+# sources while the NSS source code changes frequently.
+#
+# By having cacert on a older source revision that produces the same
+# certificate output as a newer version we can avoid large amounts of
+# unnecessary rebuilds.
+#
+# As of this writing there are a few magnitudes more packages depending on
+# cacert than on nss.
+
+
+set -ex
+
+BASEDIR="$(dirname "$0")/../../../.."
+
+
+CURRENT_PATH=$(nix-build --no-out-link -A cacert.out)
+PATCHED_PATH=$(nix-build --no-out-link -E "with import $BASEDIR {}; (cacert.overrideAttrs (_: { inherit (nss) src version; })).out")
+
+# Check the hash of the etc subfolder
+# We can't check the entire output as that contains the nix-support folder
+# which contains the output path itself.
+CURRENT_HASH=$(nix-hash "$CURRENT_PATH/etc")
+PATCHED_HASH=$(nix-hash "$PATCHED_PATH/etc")
+
+if [[ "$CURRENT_HASH" !=  "$PATCHED_HASH" ]]; then
+    NSS_VERSION=$(nix-instantiate --json --eval -E "with import $BASEDIR {}; nss.version" | jq -r .)
+    update-source-version cacert "$NSS_VERSION"
+fi
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index cc9ad333d822..9153ff776167 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -9,6 +9,12 @@ let
     url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
     sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
   };
+
+  # NOTE: Whenever you updated this version check if the `cacert` package also
+  #       needs an update. You can run the regular updater script for cacerts.
+  #       It will rebuild itself using the version of this package (NSS) and if
+  #       an update is required do the required changes to the expression.
+  #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
   version = "3.57";
   underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
 

From 398cdab5ceeea9d8e4b2441334813a27ad791181 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 18 Nov 2020 12:47:05 +0100
Subject: [PATCH 2824/3942] firefox: prepare pipewire patches for firefox 83

---
 .../networking/browsers/firefox/common.nix    | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index a98891df4d13..bae6b945107f 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -116,12 +116,37 @@ buildStdenv.mkDerivation ({
 
   patches = [
     ./env_var_for_system_dir.patch
-  ] ++ lib.optional pipewireSupport
+  ] ++
+
+  # there are two flavors of pipewire support
+  # The patches for the ESR release and the patches for the current stable
+  # release.
+  # Until firefox upstream stabilizes pipewire support we will have to continue
+  # tracking multiple versions here.
+  lib.optional (pipewireSupport && lib.versionOlder ffversion "83")
     (fetchpatch {
       # https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch
       url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch";
       sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab";
     })
+    ++
+    # This picks pipewire patches from fedora that are part of https://bugzilla.mozilla.org/show_bug.cgi?id=1672944
+    lib.optionals (pipewireSupport && lib.versionAtLeast ffversion "83") (let
+      fedora_revision = "d6756537dd8cf4d9816dc63ada66ea026e0fd128";
+      mkPWPatch = spec: fetchpatch {
+        inherit (spec) name sha256;
+        url = "https://src.fedoraproject.org/rpms/firefox/raw/${fedora_revision}/f/${spec.name}";
+      };
+    in map mkPWPatch [
+        { name = "pw1.patch"; sha256 = "1a7zvngn3k7dg886zmi38kmrsdzh2rrr46aw59bhr1gfmq8wlwn0"; }
+        { name = "pw2.patch"; sha256 = "17irg3yb2mchcy0z0nr4k65mwvkps467cvvczr10fnm06lhkhw1l"; }
+        { name = "pw3.patch"; sha256 = "12p6ql5ff2lfzlni6xkpz63h2xr6n2a9zf8hhjl99fj56rif6706"; }
+        { name = "pw4.patch"; sha256 = "0rvysc92rdm98s47w5lvbnrklrf7d299k3918qnldniyb4b9p4mg"; }
+        { name = "pw5.patch"; sha256 = "0kk2yxq4qkfwc4px6m08jrn18a7a7dhrngfiaw84r9ga6sgn0z00"; }
+        { name = "pw6.patch"; sha256 = "12lhx9wjpw0ahbfmw07wsx76bb223mr453q9cg8cq951vyskch3s"; }
+        { name = "pw7.patch"; sha256 = "0afw7cfd48vn62zb9y5kd2l26fg44s3aq1kyg3gm4q3rj34xidf6"; }
+    ])
+
   ++ patches;
 
 
@@ -172,7 +197,7 @@ buildStdenv.mkDerivation ({
 
   postPatch = ''
     rm -rf obj-x86_64-pc-linux-gnu
-  '' + lib.optionalString pipewireSupport ''
+  '' + lib.optionalString (pipewireSupport && lib.versionOlder ffversion "83") ''
     # substitute the /usr/include/ lines for the libraries that pipewire provides.
     # The patch we pick from fedora only contains the generated moz.build files
     # which hardcode the dependency paths instead of running pkg_config.

From cbd0f8931c16fc101ebb89cb0d2e663d667beedd Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 18 Nov 2020 15:15:36 +0100
Subject: [PATCH 2825/3942] nss_3_53: init

---
 pkgs/development/libraries/nss/3.53.nix | 169 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |   3 +
 2 files changed, 172 insertions(+)
 create mode 100644 pkgs/development/libraries/nss/3.53.nix

diff --git a/pkgs/development/libraries/nss/3.53.nix b/pkgs/development/libraries/nss/3.53.nix
new file mode 100644
index 000000000000..dcd9ade629b7
--- /dev/null
+++ b/pkgs/development/libraries/nss/3.53.nix
@@ -0,0 +1,169 @@
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja
+, # allow FIPS mode. Note that this makes the output non-reproducible.
+  # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6
+  enableFIPS ? false
+}:
+
+let
+  nssPEM = fetchurl {
+    url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
+    sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
+  };
+  version = "3.53.1";
+  underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
+
+in stdenv.mkDerivation rec {
+  pname = "nss";
+  inherit version;
+
+  src = fetchurl {
+    url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
+    sha256 = "05jk65x3zy6q8lx2djj8ik7kg741n88iy4n3bblw89cv0xkxxk1d";
+  };
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
+    ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
+
+  buildInputs = [ zlib sqlite ];
+
+  propagatedBuildInputs = [ nspr ];
+
+  prePatch = ''
+    # strip the trailing whitespace from the patch line and the renamed CKO_NETSCAPE_ enum to CKO_NSS_
+    xz -d < ${nssPEM} | sed \
+       -e 's/-DIRS = builtins $/-DIRS = . builtins/g' \
+       -e 's/CKO_NETSCAPE_/CKO_NSS_/g' \
+       -e 's/CKT_NETSCAPE_/CKT_NSS_/g' \
+       | patch -p1
+
+    patchShebangs nss
+
+    for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do
+      substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env"
+    done
+
+    substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep"
+  '';
+
+  patches =
+    [
+      # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
+      ./85_security_load.patch
+      ./ckpem.patch
+      ./fix-cross-compilation.patch
+    ];
+
+  patchFlags = [ "-p0" ];
+
+  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+     substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
+     substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
+   '';
+
+  outputs = [ "out" "dev" "tools" ];
+
+  preConfigure = "cd nss";
+
+  buildPhase = let
+    getArch = platform: if platform.isx86_64 then "x64"
+          else if platform.isx86_32 then "ia32"
+          else if platform.isAarch32 then "arm"
+          else if platform.isAarch64 then "arm64"
+          else if platform.isPower && platform.is64bit then (
+            if platform.isLittleEndian then "ppc64le" else "ppc64"
+          )
+          else platform.parsed.cpu.name;
+    # yes, this is correct. nixpkgs uses "host" for the platform the binary will run on whereas nss uses "host" for the platform that the build is running on
+    target = getArch stdenv.hostPlatform;
+    host = getArch stdenv.buildPlatform;
+  in ''
+    runHook preBuild
+
+    sed -i 's|nss_dist_dir="$dist_dir"|nss_dist_dir="'$out'"|;s|nss_dist_obj_dir="$obj_dir"|nss_dist_obj_dir="'$out'"|' build.sh
+    ./build.sh -v --opt \
+      --with-nspr=${nspr.dev}/include:${nspr.out}/lib \
+      --system-sqlite \
+      --enable-legacy-db \
+      --target ${target} \
+      -Dhost_arch=${host} \
+      -Duse_system_zlib=1 \
+      --enable-libpkix \
+      ${stdenv.lib.optionalString enableFIPS "--enable-fips"} \
+      ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \
+      ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}
+
+    runHook postBuild
+  '';
+
+  NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\"";
+
+  installPhase = ''
+    runHook preInstall
+
+    rm -rf $out/private
+    find $out -name "*.TOC" -delete
+    mv $out/public $out/include
+
+    ln -s lib $out/lib64
+
+    # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672
+    # https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch?id=af1acce6c6d2c3adb17689261dfe2c2b6771ab8a
+    NSS_MAJOR_VERSION=`grep "NSS_VMAJOR" lib/nss/nss.h | awk '{print $3}'`
+    NSS_MINOR_VERSION=`grep "NSS_VMINOR" lib/nss/nss.h | awk '{print $3}'`
+    NSS_PATCH_VERSION=`grep "NSS_VPATCH" lib/nss/nss.h | awk '{print $3}'`
+    PREFIX="$out"
+
+    mkdir -p $out/lib/pkgconfig
+    sed -e "s,%prefix%,$PREFIX," \
+        -e "s,%exec_prefix%,$PREFIX," \
+        -e "s,%libdir%,$PREFIX/lib64," \
+        -e "s,%includedir%,$dev/include/nss," \
+        -e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \
+        -e "s,%NSPR_VERSION%,4.16,g" \
+        pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc
+    chmod 0644 $out/lib/pkgconfig/nss.pc
+
+    sed -e "s,@prefix@,$PREFIX," \
+        -e "s,@MOD_MAJOR_VERSION@,$NSS_MAJOR_VERSION," \
+        -e "s,@MOD_MINOR_VERSION@,$NSS_MINOR_VERSION," \
+        -e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \
+        pkg/pkg-config/nss-config.in > $out/bin/nss-config
+    chmod 0755 $out/bin/nss-config
+  '';
+
+  postFixup = let
+    isCross = stdenv.hostPlatform != stdenv.buildPlatform;
+    nss = if isCross then buildPackages.nss.tools else "$out";
+  in
+  (stdenv.lib.optionalString enableFIPS (''
+    for libname in freebl3 nssdbm3 softokn3
+    do '' +
+    (if stdenv.isDarwin
+     then ''
+       libfile="$out/lib/lib$libname.dylib"
+       DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \
+     '' else ''
+       libfile="$out/lib/lib$libname.so"
+       LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \
+     '') + ''
+        ${nss}/bin/shlibsign -v -i "$libfile"
+    done
+  '')) +
+  ''
+    moveToOutput bin "$tools"
+    moveToOutput bin/nss-config "$dev"
+    moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example
+    rm -f "$out"/lib/*.a
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://developer.mozilla.org/en-US/docs/NSS";
+    description = "A set of libraries for development of security-enabled client and server applications";
+    license = licenses.mpl20;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2efe9633b92..8236c4f07f91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14896,6 +14896,9 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
   nss_3_44 = lowPrio (callPackage ../development/libraries/nss/3.44.nix { });
   nssTools = nss.tools;
 
+  # required for stable thunderbird and firefox-esr-78
+  nss_3_53 = lowPrio (callPackage ../development/libraries/nss/3.53.nix { });
+
   nss_wrapper = callPackage ../development/libraries/nss_wrapper { };
 
   nsss = skawarePackages.nsss;

From c1cfe8b84edac1915a6fa219d0be0679481d43a0 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 18 Nov 2020 15:15:01 +0100
Subject: [PATCH 2826/3942] firefox: fallback to nss_3_53 when version is below
 83

---
 pkgs/applications/networking/browsers/firefox/common.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index bae6b945107f..fd3982a7c62c 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -4,7 +4,7 @@
 
 { lib, stdenv, pkgconfig, pango, perl, python2, python3, zip
 , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
-, freetype, fontconfig, file, nspr, nss, libnotify
+, freetype, fontconfig, file, nspr, nss, nss_3_53, libnotify
 , yasm, libGLU, libGL, sqlite, unzip, makeWrapper
 , hunspell, libXdamage, libevent, libstartup_notification
 , libvpx_1_8
@@ -106,6 +106,8 @@ let
   # 78 ESR won't build with rustc 1.47
   inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45)
     rustc cargo;
+
+  nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss;
 in
 
 buildStdenv.mkDerivation ({
@@ -169,7 +171,7 @@ buildStdenv.mkDerivation ({
     # yasm can potentially be removed in future versions
     # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796
     # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
-    nspr nss
+    nspr nss_pkg
   ]
   ++ lib.optional  alsaSupport alsaLib
   ++ lib.optional  pulseaudioSupport libpulseaudio # only headers are needed
@@ -190,7 +192,7 @@ buildStdenv.mkDerivation ({
 
   NIX_CFLAGS_COMPILE = toString [
     "-I${glib.dev}/include/gio-unix-2.0"
-    "-I${nss.dev}/include/nss"
+    "-I${nss_pkg.dev}/include/nss"
   ];
 
   MACH_USE_SYSTEM_PYTHON = "1";

From 6c33216fcb3d993636b2a2380e215e10cb9904b6 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 18 Nov 2020 14:06:39 +0100
Subject: [PATCH 2827/3942] nss: 3.57 -> 3.58

https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.58_release_notes
---
 pkgs/development/libraries/nss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 9153ff776167..12316451c6ab 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -15,7 +15,7 @@ let
   #       It will rebuild itself using the version of this package (NSS) and if
   #       an update is required do the required changes to the expression.
   #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
-  version = "3.57";
+  version = "3.58";
   underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
 
 in stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
-    sha256 = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382";
+    sha256 = "1h2kjdicnxprwf6brw0qinlay34vc0dmafajisbrn42zkdwcywwz";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From fddfa3915c5cf12fb047448ae3020f7d98fca6ee Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 18 Nov 2020 14:06:24 +0100
Subject: [PATCH 2828/3942] firefox: 82.0.3 -> 83.0

---
 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 5786e4113946..b39cc303ffac 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,10 +7,10 @@ in
 rec {
   firefox = common rec {
     pname = "firefox";
-    ffversion = "82.0.3";
+    ffversion = "83.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "0j5s5fkph9bm87lv53d4xvfj02qjfqzj5graxcc8air49iqswfmqjdzghna6bj9m8fbn6f5klgm6jbrmavdsycbps0y88x23b6kab5i";
+      sha512 = "3va5a9471677jfzkhqp8xkba45n0bcpphbabhqbcbnps6p85m3y98pl5jy9q7cpq3a6gxc4ax7bp90yz2nfvfq7i64iz397xpprri2a";
     };
 
     patches = [

From ccb42da9a940947a7d3e27fb9e1a1ffa4589580c Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 18 Nov 2020 15:08:22 +0100
Subject: [PATCH 2829/3942] firefox-esr-78: 78.4.1esr -> 78.5.0esr

---
 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 b39cc303ffac..352e7bac5e9c 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -35,10 +35,10 @@ rec {
 
   firefox-esr-78 = common rec {
     pname = "firefox-esr";
-    ffversion = "78.4.1esr";
+    ffversion = "78.5.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "3gfhipbihyznnh822lxams6rm0bcslh31b58lzibjx8a9dn99hy3p04h07slygcqazbz1rrs7b2b8q321fknp27aisk0sz8cynrcw18";
+      sha512 = "20h53cn7p4dds1yfm166iwbjdmw4fkv5pfk4z0pni6x8ddjvg19imzs6ggmpnfhaji8mnlknm7xp5j7x9vi24awvdxdds5n88rh25hd";
     };
 
     patches = [

From fce1a3ee1ad7e064e323c2798a1d6407552601fb Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Sat, 17 Oct 2020 00:07:48 +0200
Subject: [PATCH 2830/3942] nss: 3.58 -> 3.59

https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.59_release_notes
---
 pkgs/development/libraries/nss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 12316451c6ab..ef1cef84df5f 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -15,7 +15,7 @@ let
   #       It will rebuild itself using the version of this package (NSS) and if
   #       an update is required do the required changes to the expression.
   #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
-  version = "3.58";
+  version = "3.59";
   underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
 
 in stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
-    sha256 = "1h2kjdicnxprwf6brw0qinlay34vc0dmafajisbrn42zkdwcywwz";
+    sha256 = "096fs3z21r171q24ca3rq53p1389xmvqz1f2rpm7nlm8r9s82ag6";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From 218b43a7fa4716df89a15ffcb3664bd54e58108b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 18:20:38 +0000
Subject: [PATCH 2831/3942] ssmsh: 1.4.3 -> 1.4.4

---
 pkgs/tools/admin/ssmsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix
index 03fa9156aad2..1d4275c65cbd 100644
--- a/pkgs/tools/admin/ssmsh/default.nix
+++ b/pkgs/tools/admin/ssmsh/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ssmsh";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "bwhaley";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0rvvawn4cavqhbrrp616mi5ipn4q6j22227h4rbjh0zxdlna23gm";
+    sha256 = "0mgx4q21f6rxih79l0hwgzwafxviz5a33dpvc5k0z172sfw0dmj1";
   };
 
-  vendorSha256 = "127xni0i7w42075bspmm5r61j858i1p59jr2ib8f9r1pbizh63xw";
+  vendorSha256 = "147f02bl3sf073dy2ximbavdcbphdn7djgisla1cyyy4ng6dhf7f";
 
   doCheck = true;
 

From 1be3bc423a3a99ddcb87166762fdd2cebca3b66a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 19:31:52 +0000
Subject: [PATCH 2832/3942] mednafen: 1.24.3 -> 1.26.1

---
 pkgs/misc/emulators/mednafen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index e356e636c5a2..cb4b7997383f 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mednafen";
-  version = "1.24.3";
+  version = "1.26.1";
 
   src = fetchurl {
     url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz";
-    sha256 = "03zplcfvmnnv7grhacmr1zy789pb2wda36wylmzmar23g0zqbsix";
+    sha256 = "1x7xhxjhwsdbak8l0iyb497f043xkhibk73w96xck4j2bk10fac4";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From ba4642eb6a2a4807e54881ff537bfcfae6cf85d7 Mon Sep 17 00:00:00 2001
From: Max Wilson <max@maxwilson.dev>
Date: Sun, 15 Nov 2020 09:35:46 -0500
Subject: [PATCH 2833/3942] update contact info

---
 maintainers/maintainer-list.nix                           | 8 ++++----
 .../python-modules/azure-applicationinsights/default.nix  | 2 +-
 pkgs/development/python-modules/azure-batch/default.nix   | 2 +-
 pkgs/development/python-modules/azure-common/default.nix  | 2 +-
 .../python-modules/azure-cosmosdb-nspkg/default.nix       | 2 +-
 .../python-modules/azure-cosmosdb-table/default.nix       | 2 +-
 .../python-modules/azure-datalake-store/default.nix       | 2 +-
 .../python-modules/azure-eventgrid/default.nix            | 2 +-
 .../python-modules/azure-graphrbac/default.nix            | 2 +-
 .../python-modules/azure-loganalytics/default.nix         | 2 +-
 .../python-modules/azure-mgmt-advisor/default.nix         | 2 +-
 .../azure-mgmt-applicationinsights/default.nix            | 2 +-
 .../python-modules/azure-mgmt-authorization/default.nix   | 2 +-
 .../python-modules/azure-mgmt-batch/default.nix           | 2 +-
 .../python-modules/azure-mgmt-batchai/default.nix         | 2 +-
 .../python-modules/azure-mgmt-billing/default.nix         | 2 +-
 .../development/python-modules/azure-mgmt-cdn/default.nix | 2 +-
 .../azure-mgmt-cognitiveservices/default.nix              | 2 +-
 .../python-modules/azure-mgmt-commerce/default.nix        | 2 +-
 .../python-modules/azure-mgmt-common/default.nix          | 2 +-
 .../python-modules/azure-mgmt-compute/default.nix         | 2 +-
 .../python-modules/azure-mgmt-consumption/default.nix     | 2 +-
 .../azure-mgmt-containerinstance/default.nix              | 2 +-
 .../azure-mgmt-containerservice/default.nix               | 2 +-
 .../python-modules/azure-mgmt-cosmosdb/default.nix        | 2 +-
 .../python-modules/azure-mgmt-datafactory/default.nix     | 2 +-
 .../azure-mgmt-datalake-analytics/default.nix             | 2 +-
 .../python-modules/azure-mgmt-datalake-nspkg/default.nix  | 2 +-
 .../python-modules/azure-mgmt-datalake-store/default.nix  | 2 +-
 .../python-modules/azure-mgmt-datamigration/default.nix   | 2 +-
 .../python-modules/azure-mgmt-devspaces/default.nix       | 2 +-
 .../python-modules/azure-mgmt-devtestlabs/default.nix     | 2 +-
 .../development/python-modules/azure-mgmt-dns/default.nix | 2 +-
 .../python-modules/azure-mgmt-eventgrid/default.nix       | 2 +-
 .../python-modules/azure-mgmt-eventhub/default.nix        | 2 +-
 .../python-modules/azure-mgmt-hanaonazure/default.nix     | 2 +-
 .../python-modules/azure-mgmt-iotcentral/default.nix      | 2 +-
 .../python-modules/azure-mgmt-iothub/default.nix          | 2 +-
 .../azure-mgmt-iothubprovisioningservices/default.nix     | 2 +-
 .../python-modules/azure-mgmt-keyvault/default.nix        | 2 +-
 .../python-modules/azure-mgmt-loganalytics/default.nix    | 2 +-
 .../python-modules/azure-mgmt-logic/default.nix           | 2 +-
 .../azure-mgmt-machinelearningcompute/default.nix         | 2 +-
 .../azure-mgmt-managementgroups/default.nix               | 2 +-
 .../azure-mgmt-managementpartner/default.nix              | 2 +-
 .../python-modules/azure-mgmt-maps/default.nix            | 2 +-
 .../azure-mgmt-marketplaceordering/default.nix            | 2 +-
 .../python-modules/azure-mgmt-media/default.nix           | 2 +-
 .../python-modules/azure-mgmt-monitor/default.nix         | 2 +-
 .../development/python-modules/azure-mgmt-msi/default.nix | 2 +-
 .../python-modules/azure-mgmt-network/default.nix         | 2 +-
 .../azure-mgmt-notificationhubs/default.nix               | 2 +-
 .../python-modules/azure-mgmt-nspkg/default.nix           | 2 +-
 .../python-modules/azure-mgmt-policyinsights/default.nix  | 2 +-
 .../python-modules/azure-mgmt-powerbiembedded/default.nix | 2 +-
 .../python-modules/azure-mgmt-rdbms/default.nix           | 2 +-
 .../azure-mgmt-recoveryservices/default.nix               | 2 +-
 .../azure-mgmt-recoveryservicesbackup/default.nix         | 2 +-
 .../python-modules/azure-mgmt-redis/default.nix           | 2 +-
 .../python-modules/azure-mgmt-relay/default.nix           | 2 +-
 .../python-modules/azure-mgmt-reservations/default.nix    | 2 +-
 .../python-modules/azure-mgmt-resource/default.nix        | 2 +-
 .../python-modules/azure-mgmt-scheduler/default.nix       | 2 +-
 .../python-modules/azure-mgmt-search/default.nix          | 2 +-
 .../python-modules/azure-mgmt-servicebus/default.nix      | 2 +-
 .../python-modules/azure-mgmt-servicefabric/default.nix   | 2 +-
 .../python-modules/azure-mgmt-signalr/default.nix         | 2 +-
 .../development/python-modules/azure-mgmt-sql/default.nix | 2 +-
 .../python-modules/azure-mgmt-storage/default.nix         | 2 +-
 .../python-modules/azure-mgmt-subscription/default.nix    | 2 +-
 .../python-modules/azure-mgmt-trafficmanager/default.nix  | 2 +-
 .../development/python-modules/azure-mgmt-web/default.nix | 2 +-
 pkgs/development/python-modules/azure-nspkg/default.nix   | 2 +-
 .../python-modules/azure-servicebus/default.nix           | 2 +-
 .../python-modules/azure-servicefabric/default.nix        | 2 +-
 .../azure-servicemanagement-legacy/default.nix            | 2 +-
 .../python-modules/azure-storage-blob/default.nix         | 2 +-
 pkgs/development/python-modules/msrest/default.nix        | 2 +-
 pkgs/development/python-modules/uamqp/default.nix         | 2 +-
 pkgs/servers/http/showoff/default.nix                     | 2 +-
 80 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ceec2f8073e1..e273e90c2956 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6159,10 +6159,10 @@
     githubId = 6455574;
     name = "Matt Votava";
   };
-  mwilsoninsight = {
-    email = "max.wilson@insight.com";
-    github = "mwilsoninsight";
-    githubId = 47782621;
+  maxwilson = {
+    email = "nixpkgs@maxwilson.dev";
+    github = "mwilsoncoding";
+    githubId = 43796009;
     name = "Max Wilson";
   };
   myrl = {
diff --git a/pkgs/development/python-modules/azure-applicationinsights/default.nix b/pkgs/development/python-modules/azure-applicationinsights/default.nix
index f0e70b8d86c0..e43e37720217 100644
--- a/pkgs/development/python-modules/azure-applicationinsights/default.nix
+++ b/pkgs/development/python-modules/azure-applicationinsights/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Application Insights Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix
index 05021c73edb0..906461252dc7 100644
--- a/pkgs/development/python-modules/azure-batch/default.nix
+++ b/pkgs/development/python-modules/azure-batch/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Batch Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix
index abf27b5d7ef2..be51a1248a22 100644
--- a/pkgs/development/python-modules/azure-common/default.nix
+++ b/pkgs/development/python-modules/azure-common/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure common code";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ olcai mwilsoninsight ];
+    maintainers = with maintainers; [ olcai maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
index 7a7c0e7215d5..a2b686af6887 100644
--- a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure CosmosDB namespace package";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
index c11ffae1e3dd..5c580ccd3e2f 100644
--- a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
+++ b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Log Analytics Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix
index d7164affd9b8..0e97752ae578 100644
--- a/pkgs/development/python-modules/azure-datalake-store/default.nix
+++ b/pkgs/development/python-modules/azure-datalake-store/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "This project is the Python filesystem library for Azure Data Lake Store";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix
index 19a0210cc5eb..29392699ce2b 100644
--- a/pkgs/development/python-modules/azure-eventgrid/default.nix
+++ b/pkgs/development/python-modules/azure-eventgrid/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-graphrbac/default.nix b/pkgs/development/python-modules/azure-graphrbac/default.nix
index 57fec6ff5251..2b05d9ac83d8 100644
--- a/pkgs/development/python-modules/azure-graphrbac/default.nix
+++ b/pkgs/development/python-modules/azure-graphrbac/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Graph RBAC Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/pkgs/development/python-modules/azure-loganalytics/default.nix
index beca4018baba..1eed45d72f5a 100644
--- a/pkgs/development/python-modules/azure-loganalytics/default.nix
+++ b/pkgs/development/python-modules/azure-loganalytics/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Log Analytics Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight jonringer ];
+    maintainers = with maintainers; [ maxwilson jonringer ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
index f801d2a05932..a04f28f2a513 100644
--- a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Advisor Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
index 0208d082284d..7330ef5fb3e1 100644
--- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Application Insights Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ jonringer mwilsoninsight ];
+    maintainers = with maintainers; [ jonringer maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
index 3a9d2e5de2e8..400d421ee098 100644
--- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Authorization Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix
index 5a1b7600ecfc..aa188e87efa1 100644
--- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Batch Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
index 8186f87fd727..6f7aedacfae2 100644
--- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Batch AI Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix
index 9aeaf50ce4ed..d1cb009355de 100644
--- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Billing Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
index d6aa79c6915d..172e33d08cd2 100644
--- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure CDN Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
index f6ee7fce5216..c138dde95d01 100644
--- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Cognitive Services Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
index 43829dcb59e3..1460cdb9ca37 100644
--- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Commerce Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight jonringer ];
+    maintainers = with maintainers; [ maxwilson jonringer ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix
index da8dc95dad00..28043046d8aa 100644
--- a/pkgs/development/python-modules/azure-mgmt-common/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Resource Management common code";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ olcai mwilsoninsight ];
+    maintainers = with maintainers; [ olcai maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index 9acf4ddadc40..8ce4201a2d4e 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Compute Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ olcai mwilsoninsight ];
+    maintainers = with maintainers; [ olcai maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
index 7e5771645115..175dd9de6e87 100644
--- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Consumption Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
index 2dfff00dfa61..a693820a14f6 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Container Instance Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index 9bc7207e1e2a..41089fdeaedb 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Container Service Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
index 38b580df2522..b91a9ea398c9 100644
--- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Cosmos DB Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index 2601f829d908..92597b3b910c 100644
--- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Data Factory Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix
index 1e4cdd88c957..8fc8b44f3e6a 100644
--- a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Data Lake Analytics Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix
index ce4f623657eb..8af5fbd0c2e0 100644
--- a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Data Lake Management namespace package";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
index 4f985e37e6fa..b149584b6a99 100644
--- a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Data Lake Store Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ jonringer mwilsoninsight ];
+    maintainers = with maintainers; [ jonringer maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
index 1162b0405a71..f8f0818598d3 100644
--- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Data Migration Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ jonringer mwilsoninsight ];
+    maintainers = with maintainers; [ jonringer maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix
index 08cdcd721827..5ca30f45de29 100644
--- a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Dev Spaces Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
index 78f149e2f7da..7c5e6a1d7bab 100644
--- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure DevTestLabs Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ jonringer mwilsoninsight ];
+    maintainers = with maintainers; [ jonringer maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix
index ce467dba31da..37511456fe6f 100644
--- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure DNS Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ jonringer mwilsoninsight ];
+    maintainers = with maintainers; [ jonringer maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
index f5ddbf0fcc7c..df48be1281ce 100644
--- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure EventGrid Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
index 3aa02dd8831e..6b86973bccd9 100644
--- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure EventHub Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
index fd0c527344c0..9a23d31309b2 100644
--- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure SAP Hana on Azure Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
index 963d794d5505..b514488ff4a4 100644
--- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure IoTCentral Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
index 1e13919f340a..e36e30fc16e1 100644
--- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure IoTHub Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
index c668e5ed4d66..3401ed898c8f 100644
--- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure IoTHub Provisioning Services Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ jonringer mwilsoninsight ];
+    maintainers = with maintainers; [ jonringer maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
index 6ad96d60bc9c..10c4604ec186 100644
--- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Key Vault Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ jonringer mwilsoninsight ];
+    maintainers = with maintainers; [ jonringer maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
index 95c1831f720e..d77f187d65e3 100644
--- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Log Analytics Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/pkgs/development/python-modules/azure-mgmt-logic/default.nix
index 345f11f86269..8c2b3c8fd8db 100644
--- a/pkgs/development/python-modules/azure-mgmt-logic/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-logic/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Logic Apps Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix
index 47e91ecf49f3..543589b7aecb 100644
--- a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Machine Learning Compute Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
index 080647bae96b..e09646373b6e 100644
--- a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Management Groups Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix
index c546a7eeba38..d42fb5b05c39 100644
--- a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure ManagementPartner Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix
index db87b81c8380..c0f418ed725c 100644
--- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Maps Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
index db30d30d7554..a8a138d27bde 100644
--- a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Market Place Ordering Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix
index 75d1159857e5..90effb44c69c 100644
--- a/pkgs/development/python-modules/azure-mgmt-media/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Media Services Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
index 3b85c9e9e834..742556ef34f6 100644
--- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Monitor Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix
index 2b1b65d60aec..4bd0a493ddae 100644
--- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure MSI Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index b08a729d5f46..da1ec78a8c9a 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure SDK for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ olcai mwilsoninsight jonringer ];
+    maintainers = with maintainers; [ olcai maxwilson jonringer ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
index a8ebba576485..7b4985c53331 100644
--- a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Notification Hubs Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
index fd2664b0ec0e..b3503e23d613 100644
--- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure SDK for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ olcai mwilsoninsight ];
+    maintainers = with maintainers; [ olcai maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
index b60cd66725c1..6522b3c8c435 100644
--- a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Policy Insights Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix
index 537e576b2b5a..24b446146856 100644
--- a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Power BI Embedded Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
index 7bee1f5856a7..0e96647f4925 100644
--- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure RDBMS Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
index 224f7971b352..7f4de1a463b7 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Recovery Services Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
index 75781dab8ed3..ed40cb69c721 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Recovery Services Backup Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix
index 9274bd53cf69..81b886bed226 100644
--- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Redis Cache Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix
index d3bf3f31fc20..46db2d3528cf 100644
--- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Relay Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
index d5e4226b5ccc..61ef82d74acc 100644
--- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Reservations Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index 5467537f08b8..bdba89498877 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure SDK for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ olcai mwilsoninsight jonringer ];
+    maintainers = with maintainers; [ olcai maxwilson jonringer ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix
index 366e8df9a751..7fc7a152cb41 100644
--- a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Scheduler Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix
index 6f0fd6f3b368..c6c525176c77 100644
--- a/pkgs/development/python-modules/azure-mgmt-search/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Search Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
index e192a8f9d3e3..1c63c61e24e2 100644
--- a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Service Bus Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
index 60ffeae2b518..abb117d00466 100644
--- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Service Fabric Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
index 8192064626ea..4a452cb919cb 100644
--- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure SignalR Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
index aa60cde71425..5fe942a220f6 100644
--- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure SQL Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 71302be53d79..2f1032c2bb9b 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Storage Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ jonringer olcai mwilsoninsight ];
+    maintainers = with maintainers; [ jonringer olcai maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
index ee6616272225..d0a5845d9055 100644
--- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Subscription Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
index 946be6f34cad..dd7ed3b19b21 100644
--- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Traffic Manager Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix
index a99dd764c1a6..32c0542ca453 100644
--- a/pkgs/development/python-modules/azure-mgmt-web/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Web Apps Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-nspkg/default.nix b/pkgs/development/python-modules/azure-nspkg/default.nix
index 5be901941947..25636053a6b3 100644
--- a/pkgs/development/python-modules/azure-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-nspkg/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure SDK for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ olcai mwilsoninsight ];
+    maintainers = with maintainers; [ olcai maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix
index 2a3552d1fb5f..9c48f5b56c2d 100644
--- a/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/pkgs/development/python-modules/azure-servicebus/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Service Bus Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix
index f34d3d62ba3b..743f0abd9256 100644
--- a/pkgs/development/python-modules/azure-servicefabric/default.nix
+++ b/pkgs/development/python-modules/azure-servicefabric/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "This project provides a client library in Python that makes it easy to consume Microsoft Azure Storage services";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
index 13d577362a36..b54e17db283e 100644
--- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
+++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Service Management Legacy Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ olcai mwilsoninsight ];
+    maintainers = with maintainers; [ olcai maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix
index 20d0248cc416..dc955ff3799d 100644
--- a/pkgs/development/python-modules/azure-storage-blob/default.nix
+++ b/pkgs/development/python-modules/azure-storage-blob/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Client library for Microsoft Azure Storage services containing the blob service APIs";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ cmcdragonkai mwilsoninsight ];
+    maintainers = with maintainers; [ cmcdragonkai maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix
index 14ed57457b29..1f21778f7db8 100644
--- a/pkgs/development/python-modules/msrest/default.nix
+++ b/pkgs/development/python-modules/msrest/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "The runtime library 'msrest' for AutoRest generated Python clients.";
     homepage = "https://github.com/Azure/msrest-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ bendlas jonringer mwilsoninsight ];
+    maintainers = with maintainers; [ bendlas jonringer maxwilson ];
   };
 }
diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix
index 47a0d6cc2699..a0d24785eb69 100644
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ b/pkgs/development/python-modules/uamqp/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "An AMQP 1.0 client library for Python";
     homepage = "https://github.com/Azure/azure-uamqp-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ maxwilson ];
   };
 }
diff --git a/pkgs/servers/http/showoff/default.nix b/pkgs/servers/http/showoff/default.nix
index 0a10c806e5ed..ecfd034e05b3 100644
--- a/pkgs/servers/http/showoff/default.nix
+++ b/pkgs/servers/http/showoff/default.nix
@@ -13,6 +13,6 @@ bundlerApp {
     homepage = "https://puppetlabs.github.io/showoff/";
     license = with licenses; mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ mwilsoninsight nicknovitski ];
+    maintainers = with maintainers; [ maxwilson nicknovitski ];
   };
 }

From 713b47e8159844253445eca7d2a6bf756d3c2236 Mon Sep 17 00:00:00 2001
From: Max Wilson <max@maxwilson.dev>
Date: Sun, 15 Nov 2020 09:36:39 -0500
Subject: [PATCH 2834/3942] add self to utsushi

---
 pkgs/misc/drivers/utsushi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix
index 10b5e570d0fa..20701c5cc4df 100644
--- a/pkgs/misc/drivers/utsushi/default.nix
+++ b/pkgs/misc/drivers/utsushi/default.nix
@@ -146,7 +146,7 @@ in stdenv.mkDerivation rec {
     '';
     homepage = "https://gitlab.com/utsushi/imagescan";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ wucke13 ];
+    maintainers = with maintainers; [ wucke13 maxwilson ];
     platforms = platforms.linux;
   };
 }

From eafb0c886dcc8977f48020faa9e61547af8383a3 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Wed, 4 Nov 2020 21:14:25 +0100
Subject: [PATCH 2835/3942] vimPlugins.vim-markdown-composer: init at
 2020-08-15

---
 pkgs/misc/vim-plugins/generated.nix    | 13 +++++++++++++
 pkgs/misc/vim-plugins/overrides.nix    | 15 +++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 3 files changed, 29 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 285819561bb4..def5fadba114 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -5617,6 +5617,19 @@ let
     meta.homepage = "https://github.com/plasticboy/vim-markdown/";
   };
 
+  vim-markdown-composer = buildVimPluginFrom2Nix {
+    pname = "vim-markdown-composer";
+    version = "2020-08-15";
+    src = fetchFromGitHub {
+      owner = "euclio";
+      repo = "vim-markdown-composer";
+      rev = "c0f98ec3d6c4cb49455c18f2aeb83c0dcbad1bc4";
+      sha256 = "10vb3p8gksjy8zfzlkhirdsjwgvh1yv19plxwr404x87j393rs7n";
+      fetchSubmodules = true;
+    };
+    meta.homepage = "https://github.com/euclio/vim-markdown-composer/";
+  };
+
   vim-matchup = buildVimPluginFrom2Nix {
     pname = "vim-matchup";
     version = "2020-09-07";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 88e535da5b03..0031b6e7dc72 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -468,6 +468,21 @@ self: super: {
     '';
   });
 
+  vim-markdown-composer =
+  let
+    vim-markdown-composer-bin = rustPlatform.buildRustPackage rec {
+      pname = "vim-markdown-composer-bin";
+      inherit (super.vim-markdown-composer) src version;
+      cargoSha256 = "iuhq2Zhdkib8hw4uvXBjwE5ZiN1kzairlzufaGuVkWc=";
+    };
+  in super.vim-markdown-composer.overrideAttrs(oldAttrs: rec {
+    preFixup = ''
+      substituteInPlace "$out"/share/vim-plugins/vim-markdown-composer/after/ftplugin/markdown/composer.vim \
+        --replace "let l:args = [s:plugin_root . '/target/release/markdown-composer']" \
+        "let l:args = ['${vim-markdown-composer-bin}/bin/markdown-composer']"
+    '';
+  });
+
   vim-metamath = super.vim-metamath.overrideAttrs(old: {
     preInstall = "cd vim";
   });
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 86b39c7d7e34..db3a0e070d34 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -103,6 +103,7 @@ enricobacis/vim-airline-clock
 ensime/ensime-vim
 ervandew/supertab
 esneider/YUNOcommit.vim
+euclio/vim-markdown-composer
 fannheyward/coc-markdownlint
 farmergreg/vim-lastplace
 fatih/vim-go

From 04a641bd4fee0f6b5bf8563d1f98434e1f692814 Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Sat, 14 Nov 2020 11:29:46 -0500
Subject: [PATCH 2836/3942] pythonPackages.aioextensions: init at 20.11.1517005

---
 .../python-modules/aioextensions/default.nix  | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/aioextensions/default.nix

diff --git a/pkgs/development/python-modules/aioextensions/default.nix b/pkgs/development/python-modules/aioextensions/default.nix
new file mode 100644
index 000000000000..62a6b90e9f8d
--- /dev/null
+++ b/pkgs/development/python-modules/aioextensions/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, pythonOlder
+
+# Python dependencies
+, uvloop
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "aioextensions";
+  version = "20.11.1517005";
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10b8ddhd77ixxi2i8mw86m388smp324f7rr0mdpkwdb0ra99ra8m";
+  };
+
+  propagatedBuildInputs = [ uvloop ];
+
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    cd test/
+    pytest
+  '';
+
+  meta = with lib; {
+    description = "High performance functions to work with the async IO";
+    homepage = "https://kamadorueda.github.io/aioextensions";
+    license = licenses.mit;
+    maintainers = with maintainers; [ kamadorueda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c7370e023eb..988f3fc886f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -202,6 +202,8 @@ in {
 
   aioeventlet = callPackage ../development/python-modules/aioeventlet { };
 
+  aioextensions = callPackage ../development/python-modules/aioextensions { };
+
   aiofiles = callPackage ../development/python-modules/aiofiles { };
 
   aioftp = callPackage ../development/python-modules/aioftp { };

From 691e6e4c26007f70b91f608e585f486aaf1f16ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 17 Nov 2020 22:36:07 +0100
Subject: [PATCH 2837/3942] gst_all_1.gst-plugins-bad: libva/v4l2codecs are
 Linux-only. Fixes #104062

---
 pkgs/development/libraries/gstreamer/bad/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index a29fad8a4c94..0863d7d1a3e7 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -161,7 +161,6 @@ in stdenv.mkDerivation rec {
     soundtouch
     srtp
     fluidsynth
-    libva
     libvdpau
     libwebp
     xvidcore
@@ -180,6 +179,7 @@ in stdenv.mkDerivation rec {
     faac
   ] ++ optionals stdenv.isLinux [
     bluez
+    libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs
     wayland
     wayland-protocols
   ] ++ optionals (!stdenv.isDarwin) [
@@ -259,6 +259,9 @@ in stdenv.mkDerivation rec {
     "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing
     "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing
   ]
+  ++ optionals (!stdenv.isLinux) [
+    "-Dva=disabled" # see comment on `libva` in `buildInputs`
+  ]
   ++ optionals stdenv.isDarwin [
     "-Dbluez=disabled"
     "-Dchromaprint=disabled"
@@ -272,6 +275,7 @@ in stdenv.mkDerivation rec {
     "-Ddvb=disabled"
     "-Dfbdev=disabled"
     "-Duvch264=disabled" # requires gudev
+    "-Dv4l2codecs=disabled" # requires gudev
     "-Dladspa=disabled" # requires lrdf
     "-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs
     "-Dwildmidi=disabled" # see dependencies above

From 230fd90dccbb0d42cf8dd7e8bf4a16aa3c6affb4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 06:31:36 +0000
Subject: [PATCH 2838/3942] gmic: 2.9.2 -> 2.9.3

---
 pkgs/tools/graphics/gmic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index ccc4a23cb558..435cafe001d1 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gmic";
-  version = "2.9.2";
+  version = "2.9.3";
 
   outputs = [ "out" "lib" "dev" "man" ];
 
   src = fetchurl {
     url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
-    sha256 = "14acph914a8lp6qqfmp319ggqjg3i3hmalmnpk3mp07m7vpv2p9q";
+    sha256 = "1pj3rwycwnspw2lm5j0w4647677y6s3446zsx9s6br9bc7v7w5s6";
   };
 
   nativeBuildInputs = [

From e4883cb78ec9db5467398e971ab1e165a3e5f9bf Mon Sep 17 00:00:00 2001
From: James Ravn <james@r-vn.org>
Date: Wed, 18 Nov 2020 20:24:48 +0000
Subject: [PATCH 2839/3942] gnome3.pomodoro: 0.17.0 -> 0.18.0

Needed to work with the current Gnome 3 version in master.
---
 pkgs/desktops/gnome-3/misc/pomodoro/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index b9489526dd71..4676155c3c1c 100644
--- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-pomodoro";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "codito";
     repo = "gnome-pomodoro";
     rev = version;
-    sha256 = "0s9wzx7wbynpqgj7nlgs5wwx4w2akz7nli89sy7pxcn4xpnahqgn";
+    sha256 = "0990m8ydryd77kv25nfqli1n209i0h5dkjg9gkyww8bfrjhw47mc";
   };
 
   nativeBuildInputs = [

From ff8338343b3f70f32fe5f4a2b8ad559c3d50cd5c Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 17 Nov 2020 20:41:33 +0100
Subject: [PATCH 2840/3942] maintainers: create sage team

Maintaining all the packages whose updates might break some aspect of
sage.

For reference:
https://github.com/NixOS/nixpkgs/pull/103810#issuecomment-727536510
---
 maintainers/team-list.nix                                 | 8 ++++++++
 pkgs/applications/science/chemistry/jmol/default.nix      | 2 +-
 pkgs/applications/science/math/R/default.nix              | 2 +-
 pkgs/applications/science/math/lrcalc/default.nix         | 2 +-
 pkgs/applications/science/math/nauty/default.nix          | 2 +-
 pkgs/applications/science/math/palp/default.nix           | 2 +-
 pkgs/applications/science/math/pari/default.nix           | 2 +-
 pkgs/applications/science/math/pynac/default.nix          | 2 +-
 pkgs/applications/science/math/sage/flask-oldsessions.nix | 2 +-
 pkgs/applications/science/math/sage/flask-openid.nix      | 2 +-
 pkgs/applications/science/math/sage/pybrial.nix           | 2 +-
 pkgs/applications/science/math/sage/python-openid.nix     | 2 +-
 pkgs/applications/science/math/sage/sage.nix              | 2 +-
 pkgs/applications/science/math/sage/sagenb.nix            | 2 +-
 pkgs/applications/science/math/singular/default.nix       | 2 +-
 pkgs/applications/science/math/symmetrica/default.nix     | 2 +-
 pkgs/data/misc/combinatorial_designs/default.nix          | 2 +-
 pkgs/data/misc/conway_polynomials/default.nix             | 2 +-
 pkgs/data/misc/elliptic_curves/default.nix                | 2 +-
 pkgs/data/misc/graphs/default.nix                         | 2 +-
 pkgs/data/misc/pari-galdata/default.nix                   | 2 +-
 pkgs/data/misc/pari-seadata-small/default.nix             | 2 +-
 pkgs/data/misc/polytopes_db/default.nix                   | 2 +-
 pkgs/development/libraries/arb/default.nix                | 2 +-
 pkgs/development/libraries/cddlib/default.nix             | 2 +-
 pkgs/development/libraries/eclib/default.nix              | 2 +-
 pkgs/development/libraries/fflas-ffpack/default.nix       | 2 +-
 pkgs/development/libraries/fplll/default.nix              | 2 +-
 pkgs/development/libraries/gf2x/default.nix               | 2 +-
 pkgs/development/libraries/glpk/default.nix               | 8 ++++----
 pkgs/development/libraries/linbox/default.nix             | 8 ++++----
 pkgs/development/libraries/ntl/default.nix                | 2 +-
 pkgs/development/libraries/science/math/brial/default.nix | 2 +-
 .../libraries/science/math/cliquer/default.nix            | 2 +-
 .../libraries/science/math/flintqs/default.nix            | 2 +-
 pkgs/development/libraries/science/math/lcalc/default.nix | 2 +-
 .../libraries/science/math/libbraiding/default.nix        | 2 +-
 .../libraries/science/math/libhomfly/default.nix          | 2 +-
 pkgs/development/libraries/science/math/m4ri/default.nix  | 2 +-
 pkgs/development/libraries/science/math/m4rie/default.nix | 2 +-
 .../libraries/science/math/planarity/default.nix          | 2 +-
 .../libraries/science/math/rankwidth/default.nix          | 2 +-
 .../development/libraries/science/math/rubiks/default.nix | 2 +-
 .../development/libraries/science/math/sympow/default.nix | 2 +-
 .../libraries/science/math/zn_poly/default.nix            | 2 +-
 .../backports_shutil_get_terminal_size/default.nix        | 2 +-
 pkgs/development/python-modules/cypari2/default.nix       | 2 +-
 pkgs/development/python-modules/cysignals/default.nix     | 6 +++---
 .../python-modules/flask-autoindex/default.nix            | 2 +-
 pkgs/development/python-modules/flask-babel/default.nix   | 2 +-
 pkgs/development/python-modules/flask-silk/default.nix    | 2 +-
 pkgs/development/python-modules/fpylll/default.nix        | 6 +++---
 pkgs/development/python-modules/pplpy/default.nix         | 2 +-
 pkgs/development/python-modules/sympy/1_5.nix             | 4 ++--
 pkgs/development/python-modules/sympy/default.nix         | 4 ++--
 55 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 9763c78789aa..9f56686e24f2 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -108,4 +108,12 @@ with lib.maintainers; {
     ];
     scope = "Maintain Podman and CRI-O related packages and modules.";
   };
+
+  sage = {
+    members = [
+      timokau
+      omasanori
+    ];
+    scope = "Maintain SageMath and the dependencies that are likely to break it.";
+  };
 }
diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index 3035a69dc193..9adb8e3674b8 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
      homepage = "https://sourceforge.net/projects/jmol";
      license = licenses.lgpl2;
      platforms = platforms.all;
-     maintainers = with maintainers; [ timokau mounium ];
+     maintainers = with maintainers; [ mounium ] ++ teams.sage.members;
   };
 }
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 25ee66e8f75a..e4fbe8a7f2de 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -113,6 +113,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     hydraPlatforms = platforms.linux;
 
-    maintainers = with maintainers; [ peti timokau ];
+    maintainers = with maintainers; [ peti ] ++ teams.sage.members;
   };
 }
diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix
index 438a84c0e0be..ddd470e621a0 100644
--- a/pkgs/applications/science/math/lrcalc/default.nix
+++ b/pkgs/applications/science/math/lrcalc/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Littlewood-Richardson calculator";
     homepage = "http://math.rutgers.edu/~asbuch/lrcalc/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index d75fc9731cdf..53549ae6cb7b 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = ''Programs for computing automorphism groups of graphs and digraphs'';
     license = licenses.asl20;
-    maintainers = with maintainers; [ raskin timokau ];
+    maintainers = with maintainers; [ raskin ] ++ teams.sage.members;
     platforms = platforms.unix;
     # I'm not sure if the filename will remain the same for future changelog or
     # if it will track changes to minor releases. Lets see. Better than nothing
diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix
index c383438002f4..9ae4fe1ba920 100644
--- a/pkgs/applications/science/math/palp/default.nix
+++ b/pkgs/applications/science/math/palp/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     # version was released that pointed to gplv2 however, so thats probably
     # the right license.
     license = licenses.gpl2;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index bd730a1eaaaa..c1d63b006a9a 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     homepage = "http://pari.math.u-bordeaux.fr";
     downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ertes raskin AndersonTorres timokau ];
+    maintainers = with maintainers; [ ertes raskin AndersonTorres ] ++ teams.sage.members;
     platforms = platforms.linux ++ platforms.darwin;
     updateWalker = true;
   };
diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index 82e331216712..3e6057c9aef0 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     '';
     homepage    = "http://pynac.org";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/pkgs/applications/science/math/sage/flask-oldsessions.nix
index 403dc8708fab..86fe9912c19e 100644
--- a/pkgs/applications/science/math/sage/flask-oldsessions.nix
+++ b/pkgs/applications/science/math/sage/flask-oldsessions.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Provides a session class that works like the one in Flask before 0.10.";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     homepage = "https://github.com/mitsuhiko/flask-oldsessions";
   };
 }
diff --git a/pkgs/applications/science/math/sage/flask-openid.nix b/pkgs/applications/science/math/sage/flask-openid.nix
index 527173dec80a..900b033429ef 100644
--- a/pkgs/applications/science/math/sage/flask-openid.nix
+++ b/pkgs/applications/science/math/sage/flask-openid.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Adds openid support to flask applications";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     homepage = "https://pythonhosted.org/Flask-OpenID/";
   };
 }
diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/pkgs/applications/science/math/sage/pybrial.nix
index 718414126ae8..5fc8a4aa6f48 100644
--- a/pkgs/applications/science/math/sage/pybrial.nix
+++ b/pkgs/applications/science/math/sage/pybrial.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
     meta = with stdenv.lib; {
       description = "python implementation of BRiAl";
       license = licenses.gpl2;
-      maintainers = with maintainers; [ timokau ];
+      maintainers = teams.sage.members;
     };
 }
diff --git a/pkgs/applications/science/math/sage/python-openid.nix b/pkgs/applications/science/math/sage/python-openid.nix
index 4c7fdadadaf0..1e8a908ac79a 100644
--- a/pkgs/applications/science/math/sage/python-openid.nix
+++ b/pkgs/applications/science/math/sage/python-openid.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "OpenID library for Python";
     license = licenses.asl20;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     homepage = "https://github.com/openid/python-openid/";
   };
 }
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
index 4fa8ae6270ba..e2acef7b8eb5 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
   };
 }
diff --git a/pkgs/applications/science/math/sage/sagenb.nix b/pkgs/applications/science/math/sage/sagenb.nix
index 77b2168ad974..ad5c53b6c118 100644
--- a/pkgs/applications/science/math/sage/sagenb.nix
+++ b/pkgs/applications/science/math/sage/sagenb.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Sage Notebook";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
   };
 
   # let sagenb use mathjax
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index a8c4f6bb9a09..63ebd270cd3d 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A CAS for polynomial computations";
-    maintainers = with maintainers; [ raskin timokau ];
+    maintainers = with maintainers; [ raskin ] ++ teams.sage.members;
     # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'`
     platforms = subtractLists platforms.i686 platforms.unix;
     license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
index b363137fb99c..9ed8e248adf1 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = ''A collection of routines for representation theory and combinatorics'';
     license = licenses.isc;
-    maintainers = with maintainers; [raskin timokau];
+    maintainers = with maintainers; [raskin] ++ teams.sage.members;
     platforms = platforms.unix;
     homepage = "https://gitlab.com/sagemath/symmetrica";
   };
diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/pkgs/data/misc/combinatorial_designs/default.nix
index 5df7343f3be7..a14e13749589 100644
--- a/pkgs/data/misc/combinatorial_designs/default.nix
+++ b/pkgs/data/misc/combinatorial_designs/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.publicDomain;
     platforms = platforms.all;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
   };
 }
diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix
index f51d2293a7ef..d6413439dede 100644
--- a/pkgs/data/misc/conway_polynomials/default.nix
+++ b/pkgs/data/misc/conway_polynomials/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     description = "Contains a small database of Conway polynomials";
     license = licenses.gpl2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
   };
 }
diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix
index 49b8736b0846..9b296487670d 100644
--- a/pkgs/data/misc/elliptic_curves/default.nix
+++ b/pkgs/data/misc/elliptic_curves/default.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
   };
 }
diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/data/misc/graphs/default.nix
index 14551c6a4a47..bf7f8d4fd0e8 100644
--- a/pkgs/data/misc/graphs/default.nix
+++ b/pkgs/data/misc/graphs/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "A database of graphs";
     license = licenses.gpl2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
   };
 }
diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix
index b07be5a0c050..644a50a8ddeb 100644
--- a/pkgs/data/misc/pari-galdata/default.nix
+++ b/pkgs/data/misc/pari-galdata/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
     homepage = "http://pari.math.u-bordeaux.fr/";
     license = licenses.gpl2Plus;
     platforms = platforms.all;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
   };
 }
diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix
index 01ffd6db64fb..a9c9a62839ce 100644
--- a/pkgs/data/misc/pari-seadata-small/default.nix
+++ b/pkgs/data/misc/pari-seadata-small/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
     homepage = "http://pari.math.u-bordeaux.fr/";
     license = licenses.gpl2Plus;
     platforms = platforms.all;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
   };
 }
diff --git a/pkgs/data/misc/polytopes_db/default.nix b/pkgs/data/misc/polytopes_db/default.nix
index 8fec9a854260..95ca8af82a7b 100644
--- a/pkgs/data/misc/polytopes_db/default.nix
+++ b/pkgs/data/misc/polytopes_db/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "Reflexive polytopes database";
     license = licenses.gpl2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
   };
 }
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index 6393e25f561d..09bd998327cf 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = ''A library for arbitrary-precision interval arithmetic'';
     homepage = "http://arblib.org/";
     license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = with maintainers; [ raskin timokau ];
+    maintainers = with maintainers; [ raskin ] ++ teams.sage.members;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix
index a9a10fc6317b..404ce6960d72 100644
--- a/pkgs/development/libraries/cddlib/default.nix
+++ b/pkgs/development/libraries/cddlib/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron'';
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [raskin timokau];
+    maintainers = with maintainers; [raskin] ++ teams.sage.members;
     platforms = platforms.unix;
     homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html";
   };
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index b6dfd429d75a..358a55d92bd3 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     description = ''Elliptic curve tools'';
     homepage = "https://github.com/JohnCremona/eclib";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ raskin timokau ];
+    maintainers = with maintainers; [ raskin ] ++ teams.sage.members;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index 23b31fe439fd..69865c08291f 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = ''Finite Field Linear Algebra Subroutines'';
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ raskin timokau ];
+    maintainers = with maintainers; [ raskin ] ++ teams.sage.members;
     platforms = platforms.unix;
     homepage = "https://linbox-team.github.io/fflas-ffpack/";
   };
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index 107635267c6f..b91d0b1332d3 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       "https://groups.google.com/forum/#!searchin/fplll-devel/FPLLL$20${version}"
     ];
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [raskin timokau];
+    maintainers = with maintainers; [raskin] ++ teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix
index 2409ee314d64..21159f2663fa 100644
--- a/pkgs/development/libraries/gf2x/default.nix
+++ b/pkgs/development/libraries/gf2x/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     description = ''Routines for fast arithmetic in GF(2)[x]'';
     homepage = "http://gf2x.gforge.inria.fr";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ raskin timokau ];
+    maintainers = with maintainers; [ raskin ] ++ teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index 124e03baee19..d771f7df7892 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "The GNU Linear Programming Kit";
 
     longDescription =
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
       '';
 
     homepage = "https://www.gnu.org/software/glpk/";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ bjg timokau ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = with maintainers; [ bjg ] ++ teams.sage.members;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index 4072dcd1d251..7bca0c295c4b 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -70,12 +70,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     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.unix;
+    license = licenses.lgpl21Plus;
+    maintainers = teams.sage.members;
+    platforms = platforms.unix;
     homepage = "https://linalg.org/";
   };
 }
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index 0d9d39f39581..23d82d4ba2fa 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.shoup.net/ntl/";
     # also locally at "${src}/doc/tour-changes.html";
     changelog = "https://www.shoup.net/ntl/doc/tour-changes.html";
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     license = licenses.gpl2Plus;
     platforms = platforms.all;
   };
diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
index 2e85732f3f3d..175de67ad7ee 100644
--- a/pkgs/development/libraries/science/math/brial/default.nix
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/BRiAl/BRiAl";
     description = "Legacy version of PolyBoRi maintained by sagemath developers";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix
index e56952abcb28..7fe80c323f68 100644
--- a/pkgs/development/libraries/science/math/cliquer/default.nix
+++ b/pkgs/development/libraries/science/math/cliquer/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       easy to use.
     '';
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix
index 327fea3955d2..32fb70978cf9 100644
--- a/pkgs/development/libraries/science/math/flintqs/default.nix
+++ b/pkgs/development/libraries/science/math/flintqs/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/sagemath/FlintQS";
     description = "Highly optimized multi-polynomial quadratic sieve for integer factorization";
     license = with licenses; [ gpl2 ];
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix
index 3f00547efcec..6f80e1fd23e0 100644
--- a/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html";
     description = "A program for calculating with L-functions";
     license = with licenses; [ gpl2 ];
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix
index 2c6bc4c8711e..36d4ad54c3df 100644
--- a/pkgs/development/libraries/science/math/libbraiding/default.nix
+++ b/pkgs/development/libraries/science/math/libbraiding/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       A library to compute several properties of braids, including centralizer and conjugacy check.
     '';
     license = licenses.gpl3;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix
index d9b50a0fb2d1..788f534cc779 100644
--- a/pkgs/development/libraries/science/math/libhomfly/default.nix
+++ b/pkgs/development/libraries/science/math/libhomfly/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/miguelmarco/libhomfly/";
     description = "Library to compute the homfly polynomial of knots and links";
     license = licenses.unlicense;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix
index d8b4cbbffb48..f50c15abbdf1 100644
--- a/pkgs/development/libraries/science/math/m4ri/default.nix
+++ b/pkgs/development/libraries/science/math/m4ri/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = "https://malb.bitbucket.io/m4ri/";
     description = "Library to do fast arithmetic with dense matrices over F_2";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix
index e1f86b346d7f..532285991a3c 100644
--- a/pkgs/development/libraries/science/math/m4rie/default.nix
+++ b/pkgs/development/libraries/science/math/m4rie/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       It uses the M4RI library, implementing the same operations over the finite field F2.
     '';
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix
index 7767e23934cf..b1d6a072e130 100644
--- a/pkgs/development/libraries/science/math/planarity/default.nix
+++ b/pkgs/development/libraries/science/math/planarity/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite";
     description = "A library for implementing graph algorithms";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix
index ded7b7dc90ac..53f4313a2069 100644
--- a/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Calculates rank-width and rank-decompositions";
     license = with licenses; [ gpl2Plus ];
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix
index 6eeaddba0418..44f8150386e7 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
       gpl2 # Michael Reid's and Eric Dietz software
       mit # Dik T. Winter's software
     ];
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix
index ae7a7c778de0..a83e2c835461 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/pkgs/development/libraries/science/math/sympow/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
       fullName = "Custom, BSD-like. See COPYING file.";
       free = true;
     };
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix
index a94a52936e8f..0d1a331798cf 100644
--- a/pkgs/development/libraries/science/math/zn_poly/default.nix
+++ b/pkgs/development/libraries/science/math/zn_poly/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     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 ];
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
index 34a7ddefa47f..7fd9bca3a796 100644
--- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
+++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
@@ -30,6 +30,6 @@ if !(pythonOlder "3.3") then null else buildPythonPackage {
     description = "A backport of the get_terminal_size function from Python 3.3’s shutil.";
     homepage = "https://github.com/chrippa/backports.shutil_get_terminal_size";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
   };
 }
diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index 9308a13fb503..1cef3514e90a 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Cython bindings for PARI";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     homepage = "https://github.com/defeo/cypari2";
   };
 }
diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix
index 137451b6b5cf..736afab4257c 100644
--- a/pkgs/development/python-modules/cysignals/default.nix
+++ b/pkgs/development/python-modules/cysignals/default.nix
@@ -42,10 +42,10 @@ buildPythonPackage rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with lib; {
     description = "Interrupt and signal handling for Cython";
     homepage = "https://github.com/sagemath/cysignals/";
-    maintainers = with lib.maintainers; [ timokau ];
-    license = lib.licenses.lgpl3Plus;
+    maintainers = teams.sage.members;
+    license = licenses.lgpl3Plus;
   };
 }
diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix
index 26b6977116fd..fff8859e86e0 100644
--- a/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
       The result is just like mod_autoindex, but the look is more awesome!
     '';
     license = licenses.bsd2;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     homepage = "https://pythonhosted.org/Flask-AutoIndex/";
   };
 }
diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix
index 2d542411fa23..d052a7c51c1f 100644
--- a/pkgs/development/python-modules/flask-babel/default.nix
+++ b/pkgs/development/python-modules/flask-babel/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
       installed automatically for you if you install this library.
     '';
     license = licenses.bsd2;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     homepage = "https://github.com/python-babel/flask-babel";
   };
 }
diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix
index 831eb03a09b0..fc8c57be99a4 100644
--- a/pkgs/development/python-modules/flask-silk/default.nix
+++ b/pkgs/development/python-modules/flask-silk/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage {
   meta = with stdenv.lib; {
     description = "Adds silk icons to your Flask application or module, or extension";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     homepage = "https://github.com/sublee/flask-silk";
   };
 }
diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix
index 558765797237..da246966c932 100644
--- a/pkgs/development/python-modules/fpylll/default.nix
+++ b/pkgs/development/python-modules/fpylll/default.nix
@@ -67,11 +67,11 @@ buildPythonPackage rec {
     PY_IGNORE_IMPORTMISMATCH=1 pytest
   '';
 
-  meta = {
+  meta = with lib; {
     description = "A Python interface for fplll";
     changelog = "https://github.com/fplll/fpylll/releases/tag/${version}";
     homepage = "https://github.com/fplll/fpylll";
-    maintainers = with lib.maintainers; [ timokau ];
-    license = lib.licenses.gpl2Plus;
+    maintainers = teams.sage.members;
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix
index 706c6251d3ac..de37c338bfa2 100644
--- a/pkgs/development/python-modules/pplpy/default.nix
+++ b/pkgs/development/python-modules/pplpy/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A Python wrapper for ppl";
     homepage = "https://gitlab.com/videlec/pplpy";
-    maintainers = with maintainers; [ timokau ];
+    maintainers = teams.sage.members;
     license = licenses.gpl3;
   };
 }
diff --git a/pkgs/development/python-modules/sympy/1_5.nix b/pkgs/development/python-modules/sympy/1_5.nix
index 3a03fae154d7..00125f43bfc3 100644
--- a/pkgs/development/python-modules/sympy/1_5.nix
+++ b/pkgs/development/python-modules/sympy/1_5.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "sympy";
-  version = "1.5.1"; # Upgrades may break sage. Please test or ping @timokau.
+  version = "1.5.1";
 
   src = fetchPypi {
     inherit pname version;
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "A Python library for symbolic mathematics";
     homepage    = "https://www.sympy.org/";
     license     = licenses.bsd3;
-    maintainers = with maintainers; [ lovek323 timokau ];
+    maintainers = with maintainers; [ lovek323 ] ++ teams.sage.members;
   };
 }
diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix
index 52e2bb5af127..9c3353aa2e74 100644
--- a/pkgs/development/python-modules/sympy/default.nix
+++ b/pkgs/development/python-modules/sympy/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "sympy";
-  version = "1.6.2"; # Upgrades may break sage. Please test or ping @timokau.
+  version = "1.6.2";
 
   src = fetchPypi {
     inherit pname version;
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "A Python library for symbolic mathematics";
     homepage    = "https://www.sympy.org/";
     license     = licenses.bsd3;
-    maintainers = with maintainers; [ lovek323 timokau ];
+    maintainers = with maintainers; [ lovek323 ] ++ teams.sage.members;
   };
 }

From b7319d2d35e5f50e777723b3b1c448ad05dc9e9a Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 18 Nov 2020 21:29:24 +0100
Subject: [PATCH 2841/3942] maintainers: add raskin to the sage team

https://github.com/NixOS/nixpkgs/pull/104083#issuecomment-729168625
---
 pkgs/applications/science/math/nauty/default.nix      | 2 +-
 pkgs/applications/science/math/pari/default.nix       | 2 +-
 pkgs/applications/science/math/singular/default.nix   | 2 +-
 pkgs/applications/science/math/symmetrica/default.nix | 2 +-
 pkgs/development/libraries/arb/default.nix            | 2 +-
 pkgs/development/libraries/cddlib/default.nix         | 2 +-
 pkgs/development/libraries/eclib/default.nix          | 2 +-
 pkgs/development/libraries/fflas-ffpack/default.nix   | 2 +-
 pkgs/development/libraries/fplll/default.nix          | 2 +-
 pkgs/development/libraries/gf2x/default.nix           | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index 53549ae6cb7b..76e7c796a138 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = ''Programs for computing automorphism groups of graphs and digraphs'';
     license = licenses.asl20;
-    maintainers = with maintainers; [ raskin ] ++ teams.sage.members;
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
     # I'm not sure if the filename will remain the same for future changelog or
     # if it will track changes to minor releases. Lets see. Better than nothing
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index c1d63b006a9a..a3e2f99ab274 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     homepage = "http://pari.math.u-bordeaux.fr";
     downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ertes raskin AndersonTorres ] ++ teams.sage.members;
+    maintainers = with maintainers; [ ertes AndersonTorres ] ++ teams.sage.members;
     platforms = platforms.linux ++ platforms.darwin;
     updateWalker = true;
   };
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 63ebd270cd3d..8c5eac2c06d2 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A CAS for polynomial computations";
-    maintainers = with maintainers; [ raskin ] ++ teams.sage.members;
+    maintainers = teams.sage.members;
     # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'`
     platforms = subtractLists platforms.i686 platforms.unix;
     license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
index 9ed8e248adf1..ca752259797f 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = ''A collection of routines for representation theory and combinatorics'';
     license = licenses.isc;
-    maintainers = with maintainers; [raskin] ++ teams.sage.members;
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
     homepage = "https://gitlab.com/sagemath/symmetrica";
   };
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index 09bd998327cf..a9fb5de0bd9f 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = ''A library for arbitrary-precision interval arithmetic'';
     homepage = "http://arblib.org/";
     license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = with maintainers; [ raskin ] ++ teams.sage.members;
+    maintainers = teams.sage.members;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix
index 404ce6960d72..f286c881e46c 100644
--- a/pkgs/development/libraries/cddlib/default.nix
+++ b/pkgs/development/libraries/cddlib/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron'';
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [raskin] ++ teams.sage.members;
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
     homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html";
   };
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index 358a55d92bd3..9273fb7fd78e 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     description = ''Elliptic curve tools'';
     homepage = "https://github.com/JohnCremona/eclib";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ raskin ] ++ teams.sage.members;
+    maintainers = teams.sage.members;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index 69865c08291f..faa8ed3c70e4 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = ''Finite Field Linear Algebra Subroutines'';
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ raskin ] ++ teams.sage.members;
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
     homepage = "https://linbox-team.github.io/fflas-ffpack/";
   };
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index b91d0b1332d3..82d56ea2af41 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       "https://groups.google.com/forum/#!searchin/fplll-devel/FPLLL$20${version}"
     ];
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [raskin] ++ teams.sage.members;
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix
index 21159f2663fa..14ea3021914a 100644
--- a/pkgs/development/libraries/gf2x/default.nix
+++ b/pkgs/development/libraries/gf2x/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     description = ''Routines for fast arithmetic in GF(2)[x]'';
     homepage = "http://gf2x.gforge.inria.fr";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ raskin ] ++ teams.sage.members;
+    maintainers = teams.sage.members;
     platforms = platforms.unix;
   };
 }

From ce815fae50d33d13c3600fd596937860015af3eb Mon Sep 17 00:00:00 2001
From: pulsation <philippe.sam-long@laposte.net>
Date: Thu, 12 Nov 2020 18:54:01 +0100
Subject: [PATCH 2842/3942] quisk: 4.1.72 -> 4.1.73

---
 pkgs/applications/radio/quisk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix
index 1a032554e193..86edfadcce11 100644
--- a/pkgs/applications/radio/quisk/default.nix
+++ b/pkgs/applications/radio/quisk/default.nix
@@ -3,11 +3,11 @@
 
 python38Packages.buildPythonApplication rec {
   pname = "quisk";
-  version = "4.1.72";
+  version = "4.1.73";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qw00b9d0l3ysdrmd3nr5a2zlwg9ygdil7krnk2gjp5g8bb778k7";
+    sha256 = "37dfb02a32341025c086b07d66ddf1608d4ee1ae1c62fb51f87c97662f13e0d8";
   };
 
   buildInputs = [ fftw alsaLib pulseaudio ];

From 69caedcc4240f1a70d28cec6bf2c67d0f2ade8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Nov 2020 21:29:12 +0100
Subject: [PATCH 2843/3942] nixos/telegraf: null value for environmentFiles is
 invalid

it's also not needed given that empty list covers all use cases.
---
 nixos/modules/services/monitoring/telegraf.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix
index 1fc17ec72daf..4bfede2e37ba 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixos/modules/services/monitoring/telegraf.nix
@@ -21,7 +21,7 @@ in {
       };
 
       environmentFiles = mkOption {
-        type = types.nullOr (types.listOf types.path);
+        type = types.listOf types.path;
         default = [];
         example = "/run/keys/telegraf.env";
         description = ''

From 0f84e08fcde535c4513b038220f57cb73924f85d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Nov 2020 21:30:04 +0100
Subject: [PATCH 2844/3942] nixos/telegraf: make example a bit more compact

---
 nixos/modules/services/monitoring/telegraf.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix
index 4bfede2e37ba..b341a9005c2a 100644
--- a/nixos/modules/services/monitoring/telegraf.nix
+++ b/nixos/modules/services/monitoring/telegraf.nix
@@ -38,17 +38,13 @@ in {
         description = "Extra configuration options for telegraf";
         type = settingsFormat.type;
         example = {
-          outputs = {
-            influxdb = {
-              urls = ["http://localhost:8086"];
-              database = "telegraf";
-            };
+          outputs.influxdb = {
+            urls = ["http://localhost:8086"];
+            database = "telegraf";
           };
-          inputs = {
-            statsd = {
-              service_address = ":8125";
-              delete_timings = true;
-            };
+          inputs.statsd = {
+            service_address = ":8125";
+            delete_timings = true;
           };
         };
       };

From 58bf9ed18b74b7981dbbe4199937019ef61b1a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Nov 2020 21:30:29 +0100
Subject: [PATCH 2845/3942] nixos/telegraf: fix test

---
 nixos/tests/telegraf.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix
index 938bbd518b5a..7f4b36752582 100644
--- a/nixos/tests/telegraf.nix
+++ b/nixos/tests/telegraf.nix
@@ -6,9 +6,9 @@ import ./make-test-python.nix ({ pkgs, ...} : {
 
   machine = { ... }: {
     services.telegraf.enable = true;
-    services.telegraf.environmentFiles = [pkgs.writeText "secrets" ''
+    services.telegraf.environmentFiles = [(pkgs.writeText "secrets" ''
       SECRET=example
-    ''];
+    '')];
     services.telegraf.extraConfig = {
       agent.interval = "1s";
       agent.flush_interval = "1s";

From 77baa3710f95bf16a57e3e09b9bce200d8872e96 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:50:25 +0400
Subject: [PATCH 2846/3942] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 264 ++++++++++++++--------------
 1 file changed, 132 insertions(+), 132 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index def5fadba114..b1777a881ee4 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -401,24 +401,24 @@ let
 
   coc-explorer = buildVimPluginFrom2Nix {
     pname = "coc-explorer";
-    version = "2020-11-13";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "weirongxu";
       repo = "coc-explorer";
-      rev = "6be196d41f9738b6678de07f5509f56a58c149ec";
-      sha256 = "1gmc2m2i7i11hx8v18bvz18pzwf82234z740syl66xm2q9z1d1sb";
+      rev = "654fe4ece0ff49b62d3f19d678436522f92c3a08";
+      sha256 = "1j38g0c81rnk502vr6n7zf7r1v3p48mimsd13dc7cqsvnhrh34ix";
     };
     meta.homepage = "https://github.com/weirongxu/coc-explorer/";
   };
 
   coc-fzf = buildVimPluginFrom2Nix {
     pname = "coc-fzf";
-    version = "2020-10-22";
+    version = "2020-11-17";
     src = fetchFromGitHub {
       owner = "antoinemadec";
       repo = "coc-fzf";
-      rev = "ca80d81fdb61d1ea32cfaa498153e1f0cb651994";
-      sha256 = "1p5i415jk6af4yiqzkgghrhs52x491nrz4d3wrdxad8ydlf64jvx";
+      rev = "f3d792518982d58a7d7f846f31f01f0ef0c5434a";
+      sha256 = "10xl2gx1n9c34amca7zq4chczfc126dwz7733fi55ks29fdl708c";
     };
     meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
   };
@@ -473,12 +473,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2020-11-13";
+    version = "2020-11-17";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "02a058c5fb563ce79bead38a49bbff21664c016e";
-      sha256 = "1dhfi86i0cx1llaj6ywk8wv3ym595fkscg5w4qrbxazsmbjgrbaq";
+      rev = "103d5e995127937bdeb42cf248c2325cce93b9eb";
+      sha256 = "1llgy5m8smrvbsaafirx4a0sdzvia2rxwk57jylm5hh376kll6kl";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -546,12 +546,12 @@ let
 
   completion-nvim = buildVimPluginFrom2Nix {
     pname = "completion-nvim";
-    version = "2020-10-23";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "completion-nvim";
-      rev = "3b6774ed1c1b4720efe3385f06883483f5e16884";
-      sha256 = "1vldm13lbfmphim946lnyl30276chw4gnnnq2hxnf67k8a9x8ssc";
+      rev = "8c028d007ca314d7734d83dcc05db1ed103db9b5";
+      sha256 = "0ym17vamf5hk4lqmkfknkf0mm91vsjayhjnjyvnvc0qhyyhgsi67";
     };
     meta.homepage = "https://github.com/nvim-lua/completion-nvim/";
   };
@@ -594,12 +594,12 @@ let
 
   conjure = buildVimPluginFrom2Nix {
     pname = "conjure";
-    version = "2020-11-01";
+    version = "2020-11-17";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "a4c31e1c0136e943fa7dd48ecc11849158d3554e";
-      sha256 = "0xvz1s3lx75k9fgn319b0q6d8vj7cpw6mj2xkh73qmaqvvx3bni1";
+      rev = "bcdaf3761b762dafb4314389d84294232dd61ed6";
+      sha256 = "0ivbxr90h61zcw3ydkaajsmd5dbwcqqri3qw367kpmfsndk9k9s9";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
   };
@@ -762,12 +762,12 @@ let
 
   defx-nvim = buildVimPluginFrom2Nix {
     pname = "defx-nvim";
-    version = "2020-11-02";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "defx.nvim";
-      rev = "042c40816befafa2348d2268274a88d767850ba8";
-      sha256 = "1az0hwpvbrrwc0zd5ckap3vq2bk59br841dlhvcq1hpwgh431p0h";
+      rev = "c5b0eaa606af67fccd0d0e972ae5e8f16678ef9e";
+      sha256 = "0d54gg0brcflijv2xq3x06d561z9vj2b2y658pcv9bwjmbr3pwyy";
     };
     meta.homepage = "https://github.com/Shougo/defx.nvim/";
   };
@@ -810,12 +810,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2020-10-27";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "48f485e080c2b6a21a374b5b2000c091d30c5f56";
-      sha256 = "0wg1dz57hz0rq14f5lyqh9hbdyw3c1hdwpgwckd7qrncbcfbvbw2";
+      rev = "3868302180248a19967f32a3d0f2d0057612ae34";
+      sha256 = "0p3gmh9ag442zx67rkf15qdlciiwzd0aazd9sribximgl3a5jq6r";
     };
     meta.homepage = "https://github.com/Shougo/denite.nvim/";
   };
@@ -895,12 +895,12 @@ let
 
   deoplete-go = buildVimPluginFrom2Nix {
     pname = "deoplete-go";
-    version = "2020-01-01";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "deoplete-plugins";
       repo = "deoplete-go";
-      rev = "4f1ccd2ed70211fd025d052ec725c0b835bea487";
-      sha256 = "0zmx98kz6pxfpakizr8xm1nrv1rjr0frz19pkik29mk6aj2b2l08";
+      rev = "a6657ff9b91c7301ad1f6a01a7f0113691ef0667";
+      sha256 = "02lv900k3vw33nknz58kl0hd4gr05jqq0xabi1zd4mvnk7vyqbd2";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/deoplete-plugins/deoplete-go/";
@@ -956,12 +956,12 @@ let
 
   deoplete-lsp = buildVimPluginFrom2Nix {
     pname = "deoplete-lsp";
-    version = "2020-10-28";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete-lsp";
-      rev = "fb51bfebd8ac57282154d119f80368b4b94199b7";
-      sha256 = "09k2i02vrgn0qc3bhjz3hzaiab3h2cwqvk619a1xp5bpxr9qc78w";
+      rev = "134e970130d57c6683052a506776fa12e04bd3de";
+      sha256 = "1drbjkqx8ss2m1ns3sk5dhsg7l6xm0lvlj8kqgapqq9v5gb876j2";
     };
     meta.homepage = "https://github.com/Shougo/deoplete-lsp/";
   };
@@ -1004,12 +1004,12 @@ let
 
   deoplete-tabnine = buildVimPluginFrom2Nix {
     pname = "deoplete-tabnine";
-    version = "2020-03-29";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "tbodt";
       repo = "deoplete-tabnine";
-      rev = "eef0e2340e19aea05fe5759b7da3b13cadd375c4";
-      sha256 = "0q10zcjhjgak3w365pagd4ym5mmj3yd1lfsxv0d4wr4lp9a51sd7";
+      rev = "f3427c7633d9a79fbeea7942d2046e5b43f824dd";
+      sha256 = "0xixn23k4a6s8bqp636gm5ws71r9xgg8r92xgcv1d1whx5p2yvl9";
     };
     meta.homepage = "https://github.com/tbodt/deoplete-tabnine/";
   };
@@ -1052,12 +1052,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2020-11-11";
+    version = "2020-11-17";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "44a3e2393a99d5975ac7f282be10d008f4c70251";
-      sha256 = "1ikaqqmms0zcf997wf9jysdzmn2r1w9gqjqn58sw5drnnfamwvml";
+      rev = "27c5ddba448e50e182985e1582dd519342986cef";
+      sha256 = "09i3p0r4vjc5xipqrykm83wa9p96k609c1p1c2frakskhy7zkidz";
     };
     meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
   };
@@ -1100,12 +1100,12 @@ let
 
   direnv-vim = buildVimPluginFrom2Nix {
     pname = "direnv-vim";
-    version = "2020-10-10";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "direnv";
       repo = "direnv.vim";
-      rev = "983bbce66b39cd17e4b8348078a41a5782cd73a0";
-      sha256 = "1n144nihbcaljgbxv4kfg8af3dxvf9i4cxdz5qq12rzslwqgdsi1";
+      rev = "def4982fa3a613cfb59a4cd8d35d4c99e4e1688c";
+      sha256 = "1xrr8pdxmpxz79qgw1kl5wdb4i2afmvl5zjxhkjinvpqnmimx0xz";
     };
     meta.homepage = "https://github.com/direnv/direnv.vim/";
   };
@@ -1148,12 +1148,12 @@ let
 
   editorconfig-vim = buildVimPluginFrom2Nix {
     pname = "editorconfig-vim";
-    version = "2020-10-21";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
-      rev = "8f6eba5fd6c306e0480ea72917902a2bde162d73";
-      sha256 = "057k0fdqgc6m1d6zzql5m1q5lsdsp2s28s9f80h9sgxvrzy36z7y";
+      rev = "047c4b455b9d56adee63a52d6d7cdf5bb6521d53";
+      sha256 = "0v7zbvpwmp1ypv5q0xy6p98l5g4ywcgyz3w1zrh9pz3m9hxa354d";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@@ -1956,12 +1956,12 @@ let
 
   lightline-bufferline = buildVimPluginFrom2Nix {
     pname = "lightline-bufferline";
-    version = "2020-10-29";
+    version = "2020-11-17";
     src = fetchFromGitHub {
       owner = "mengelbrecht";
       repo = "lightline-bufferline";
-      rev = "3933dcda3630474ba448cb486e8c630dade7b2ce";
-      sha256 = "09p759i41acyyyqk629sbcp36v66xf5y369xagjy8n2gzczj0mwa";
+      rev = "ad6f73578316dc6d1e016f9083ef35a4538c02d9";
+      sha256 = "19496bhdzyrykxs8j2mx69ml9a8548jdz0s0n5qq72cxhm2b3p03";
     };
     meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
   };
@@ -2376,12 +2376,12 @@ let
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
     pname = "neosnippet-snippets";
-    version = "2020-11-10";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet-snippets";
-      rev = "4b0829cc82704d98ac65a95e9317b8dd1fe90dee";
-      sha256 = "0yvkixv8ls4j7blfnk4a4bkxr47qfq0rs7ddzsfc6m3w2zms7c6j";
+      rev = "415dc1a83087173e2307a6b4e3e7c86a3cfa3183";
+      sha256 = "18amifx20y9vhx1sl4pyhzdqsgznmn52c58nws4jsqszp12xmk0a";
     };
     meta.homepage = "https://github.com/Shougo/neosnippet-snippets/";
   };
@@ -2496,12 +2496,12 @@ let
 
   neuron-vim = buildVimPluginFrom2Nix {
     pname = "neuron-vim";
-    version = "2020-11-11";
+    version = "2020-11-17";
     src = fetchFromGitHub {
       owner = "fiatjaf";
       repo = "neuron.vim";
-      rev = "1f0d334aaee523c9269811809d64b0d2057a3fdf";
-      sha256 = "18shra0cff76vsla9ydzmbi41d2iqgb6fh7f9i994lknjqlhfcgw";
+      rev = "ccaf20fdd028f21cf7281e7b94a0687ecf4e203b";
+      sha256 = "1c5dk3xr4lgnc8226rhjmz4c1wjv18p5iqbc4z4bk3m32bq7rhxp";
     };
     meta.homepage = "https://github.com/fiatjaf/neuron.vim/";
   };
@@ -2568,12 +2568,12 @@ let
 
   nvim-dap = buildVimPluginFrom2Nix {
     pname = "nvim-dap";
-    version = "2020-11-14";
+    version = "2020-11-15";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "926b049d7200ec7f0c69e5bcb6cbfa737207cafb";
-      sha256 = "0a1bkl5wg5q1w3yljii4qjry6pfvx6iyyz9ahkvb5ij015lg2lvg";
+      rev = "52f38f925a3116c6bad0b7f4d54d5daa576a5cdf";
+      sha256 = "0806zbrwc1la4k6nnwih5kx8zv97dw9p9hnpyxqd3s45rnb7izsa";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
   };
@@ -2616,12 +2616,12 @@ let
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2020-11-14";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "bd7127daf7129b0f81d44980825da54ec0461ebe";
-      sha256 = "0rsv37axgkgmikys2c75ddszwv0nb9pi7mzjjciarq7fffbjjjyn";
+      rev = "4f19567fb76438d39ed196ae5b4e06b749e75e16";
+      sha256 = "16iddpk10mgh4pah9lc35ijh7idinc7v37pkbyaixnljjm64jwqw";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -2640,12 +2640,12 @@ let
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2020-11-13";
+    version = "2020-11-17";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "1f98c2e92810f02afcd7ce981beac5142e34ea87";
-      sha256 = "1g9f1w9xghzmy9npf208ywb67wx6ryz6vfl2k0shwk7iym0fxpyp";
+      rev = "00d5408527ffff3deffc750a8f46c1e916e730b8";
+      sha256 = "1fdpvq0613j0sdadw3nng895vhvhj4x504nd0x255qdn7k8l7pl8";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -2664,12 +2664,12 @@ let
 
   nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-textobjects";
-    version = "2020-11-05";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "2b4d0f3cce49c025146a020aea7ed069efd57bc1";
-      sha256 = "0ighv85xm62glbf1793lmya1cfbhizpq3nyl46xbx2y7akg799xb";
+      rev = "be31f77bcf66fdf07bef286382e7eb563c2643fc";
+      sha256 = "02y4y4na91hjj6kw944wiww16xby7brd306jkhd5bzsb8asi223n";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
   };
@@ -2844,12 +2844,12 @@ let
 
   plenary-nvim = buildVimPluginFrom2Nix {
     pname = "plenary-nvim";
-    version = "2020-11-06";
+    version = "2020-11-17";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "plenary.nvim";
-      rev = "e2a73c8e238f0e8d70fe4c20f7120660ccecf6e7";
-      sha256 = "12l718c7r0jfnl95f6ifnzk5pyp08yp0mqxqa4nc8c2lwnc3pm6q";
+      rev = "7d555b5dad0376dd075e19f26e4e40705efe5dba";
+      sha256 = "0c2i6lp17lgsrivacix1jcis2bh12wsg0hgmssdhmq8vr43q14sk";
     };
     meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
   };
@@ -3493,24 +3493,24 @@ let
 
   tcomment_vim = buildVimPluginFrom2Nix {
     pname = "tcomment_vim";
-    version = "2020-10-28";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "tomtom";
       repo = "tcomment_vim";
-      rev = "c28fdd5c59144a4725a31f011738991696896170";
-      sha256 = "03nqhdnq4i4r75ma7gslr5mlfxia7xscykdywc70glrdqfrpsa5g";
+      rev = "2037d05870e10e03b2e157a09ae007c179efd253";
+      sha256 = "1z7c95rzgpm1f2cdmx3yv3f0ai7kq0kx8wd6mp4aqpdysi1qh9jk";
     };
     meta.homepage = "https://github.com/tomtom/tcomment_vim/";
   };
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2020-11-13";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "24057365dae52e76d6f2afb67f99eb94b51b40fc";
-      sha256 = "00kk9yshrscvyyvaix7dk4l869xj3fhvss224gxzdivjn345bf4k";
+      rev = "aff22f5bf107af69b0a6189debae613e36d3455f";
+      sha256 = "1l1c8za5qffvz7klzmxbyk0sv6j0869cpq8njrqzgzzah301pmlq";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -4226,12 +4226,12 @@ let
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2020-11-14";
+    version = "2020-11-15";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "107cbef4862e95fb7cb268dc8367769eddcb5f0c";
-      sha256 = "05bmbf8h161vgqqg5cnlggprj0m4fm420xdslb37ad1rkv45szzd";
+      rev = "b2fe93fbee23c3dba24439e0e0bf8c5b77eb5447";
+      sha256 = "03grw812c67m63gpdaayn7dfdlkzrhcki2fkcpfq3a80cwq1fvzf";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -4442,12 +4442,12 @@ let
 
   vim-cute-python = buildVimPluginFrom2Nix {
     pname = "vim-cute-python";
-    version = "2016-04-04";
+    version = "2020-11-17";
     src = fetchFromGitHub {
       owner = "ehamberg";
       repo = "vim-cute-python";
-      rev = "d7a6163f794500447242df2bedbe20bd751b92da";
-      sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf";
+      rev = "18cd5e0f63ae5ae74398051c0de9a27d1746e5a5";
+      sha256 = "1svr8r1rva6lq9ypzazrlw5gabnipjyhd2bs43cpfcwx0ms04d2k";
     };
     meta.homepage = "https://github.com/ehamberg/vim-cute-python/";
   };
@@ -4682,12 +4682,12 @@ let
 
   vim-exchange = buildVimPluginFrom2Nix {
     pname = "vim-exchange";
-    version = "2020-11-09";
+    version = "2020-11-15";
     src = fetchFromGitHub {
       owner = "tommcdo";
       repo = "vim-exchange";
-      rev = "8bb662407f8576fa645fb6908b63b6473e236580";
-      sha256 = "08q39xg1s90gkp24v374kbvsw6lzin61b1mkp4ibkl76h2lp0r3g";
+      rev = "13d3895709277d7b35bb4e30cc6ad0409a30ff0a";
+      sha256 = "0fgdqbkpk4220q1l00c7wcim24pbpxqj30lcfid2afkf953zhzhp";
     };
     meta.homepage = "https://github.com/tommcdo/vim-exchange/";
   };
@@ -4790,12 +4790,12 @@ let
 
   vim-floaterm = buildVimPluginFrom2Nix {
     pname = "vim-floaterm";
-    version = "2020-11-13";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "voldikss";
       repo = "vim-floaterm";
-      rev = "71334d9279b8b1d41c4c438d2aaca07316b0b2ef";
-      sha256 = "1djwzqc67v7j5b3h248dvbqxbkqdl9lkg2x64mynliwfavvzm1z7";
+      rev = "be20785a72925df1ff19a54ce5259d006bc92598";
+      sha256 = "1ns9za11w2b5xvcbd8kh4a5pasy3dd4qx7zs4k4f2ay49f98c7v1";
     };
     meta.homepage = "https://github.com/voldikss/vim-floaterm/";
   };
@@ -4934,12 +4934,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-11-14";
+    version = "2020-11-17";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "3cdd4c874f361a316f98e56e8f5746e2f1c292ef";
-      sha256 = "0abvwgh8ikc5rgskszq9jzkp80myvkap98q2b4zwv2pfib48q3kz";
+      rev = "baaf2d6ebcffd8d5674c9c5518cc0e2b5cdd0db4";
+      sha256 = "1kbmncrny39v671czcy7mmr7ighmjhr27zajq01xadr6sdmrrbr0";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -5174,12 +5174,12 @@ let
 
   vim-illuminate = buildVimPluginFrom2Nix {
     pname = "vim-illuminate";
-    version = "2020-10-24";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "vim-illuminate";
-      rev = "3f8a03701f271c3dc44313fa1254527021afe748";
-      sha256 = "1nwzdp708s5j63qldrmf1vvq2vy6vl89hmlnfygdch9dvmzhbvha";
+      rev = "1d2ec93a4d08106daf0fd85cee459488deb57436";
+      sha256 = "16nvxr4xvg4r42j4dc91f9p26msksmg5zha95fwf9g84bnsbz98j";
     };
     meta.homepage = "https://github.com/RRethy/vim-illuminate/";
   };
@@ -5270,12 +5270,12 @@ let
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
     pname = "vim-javacomplete2";
-    version = "2020-11-14";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "4ab52b4b3d57568d7545bf7a3094f63336714d81";
-      sha256 = "060jrjhl4zlb3z4pisqhjs2xh0livjc95qyrcvdhnnk7cjl3v5i2";
+      rev = "1a0cd30af7a4d3a0fd2a053b380c92057431325a";
+      sha256 = "1p82shirc11z78w82h13d7ih9l1akas6brbylkp3qwrp0pxkxpnw";
     };
     meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/";
   };
@@ -5547,12 +5547,12 @@ let
 
   vim-lsp = buildVimPluginFrom2Nix {
     pname = "vim-lsp";
-    version = "2020-11-14";
+    version = "2020-11-15";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "45babeb9474e007935f279fcdb3fa95bcf63673e";
-      sha256 = "0298x2cz5z4d2z7b14ryp289d5pxazi8ccqjzqr6plihg5cv1pxz";
+      rev = "b8c9256f61fd0e1e1256f7f03eda386ebcfb4c93";
+      sha256 = "067pzkxxjna3775za58v7g7lvzw9ykxc9lpkjxh5l35xph0dhw64";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
   };
@@ -5728,12 +5728,12 @@ let
 
   vim-mucomplete = buildVimPluginFrom2Nix {
     pname = "vim-mucomplete";
-    version = "2020-05-21";
+    version = "2020-11-15";
     src = fetchFromGitHub {
       owner = "lifepillar";
       repo = "vim-mucomplete";
-      rev = "56ded939230b13ba5b93a38e79e2b61675a8f6ef";
-      sha256 = "1z6h8qwr12isr0xhpdqjf9imprz84gijaqgr761vgh7l2q1piqqv";
+      rev = "80b13cbc30d258a4474b053fcdc6baaf199320a1";
+      sha256 = "054g80n09mmxxlh8xaic29bn8bgn3clvv732rymljdyvbj1mlhwd";
     };
     meta.homepage = "https://github.com/lifepillar/vim-mucomplete/";
   };
@@ -5824,12 +5824,12 @@ let
 
   vim-nix = buildVimPluginFrom2Nix {
     pname = "vim-nix";
-    version = "2020-06-23";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "LnL7";
       repo = "vim-nix";
-      rev = "d733cb96707a2a6bdc6102b6d89f947688e0e959";
-      sha256 = "12k2gwm8b1n02361gpjhsldql99yd7qsh80a3lbwc5c5gz5j8jsb";
+      rev = "7542a2bf66d72cb86fc80529867accbc787f744b";
+      sha256 = "1kgziwckdjg3sb1z4anwsn1c72hny60vhimxpb6424bylk1qy22j";
     };
     meta.homepage = "https://github.com/LnL7/vim-nix/";
   };
@@ -6124,12 +6124,12 @@ let
 
   vim-polyglot = buildVimPluginFrom2Nix {
     pname = "vim-polyglot";
-    version = "2020-11-03";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
-      rev = "4af1321588c7dcb718022226cb27ec325973c2f0";
-      sha256 = "1dghqg23c47qmicmlrhjh6i1fan5bj5s21yinpf58ki7l68rf881";
+      rev = "c228e993ad6a8b79db5a5a77aecfdbd8e92ea31f";
+      sha256 = "1cvdrisarw4yc4lwm80q99k7kb72zq9bd6w98786djas6asdfnll";
     };
     meta.homepage = "https://github.com/sheerun/vim-polyglot/";
   };
@@ -6532,12 +6532,12 @@ let
 
   vim-slime = buildVimPluginFrom2Nix {
     pname = "vim-slime";
-    version = "2020-10-25";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "jpalardy";
       repo = "vim-slime";
-      rev = "4e319f2bde4e65ab2f21719cb5c0371221d19f51";
-      sha256 = "01zjg2r103p543lcyrkssw6agrj58m1ymqhf7fbzhpra9ykdpsp6";
+      rev = "2a75f2424e259d3b9a287f8bb9bd748255c94b44";
+      sha256 = "1jswyib5czgi8finv1p30hsnfk259bnkdkj0ly653vbblwp00pyi";
     };
     meta.homepage = "https://github.com/jpalardy/vim-slime/";
   };
@@ -6604,12 +6604,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2020-11-13";
+    version = "2020-11-15";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "3e30104f106a2aaf4dc5f7072aba7d97fdf8bb2d";
-      sha256 = "1pxh5s9r20wbawyrcalkb6nr21xsmsc00wdaf2ryz5vhpakai72w";
+      rev = "e438b06d59115d4b491f7aa73d3140af44f86175";
+      sha256 = "0z9c6rgix722d023jb53ynbns9zvibwaglzcb2q2h4jp1xbwq4qq";
     };
     meta.homepage = "https://github.com/honza/vim-snippets/";
   };
@@ -6736,12 +6736,12 @@ let
 
   vim-swap = buildVimPluginFrom2Nix {
     pname = "vim-swap";
-    version = "2019-06-07";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "machakann";
       repo = "vim-swap";
-      rev = "e52ff679c88f4aa7a7afe77fb42af78c93ed33c8";
-      sha256 = "0rqvxqqk961syawmyc2qdfb4w9ilb1r3mxxij2ja1jbhl1f3w4vq";
+      rev = "699b7492c965a3dd96128d16b6b68a15091a931a";
+      sha256 = "0vw4d1375xhp1fbv88fp96ry0hzyqkbfn4dccrlfl4sanvkh0r6y";
     };
     meta.homepage = "https://github.com/machakann/vim-swap/";
   };
@@ -6821,12 +6821,12 @@ let
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2020-10-22";
+    version = "2020-11-17";
     src = fetchFromGitHub {
       owner = "vim-test";
       repo = "vim-test";
-      rev = "58dde91c0477fa58d18d5c0fde10b2a60a526b0f";
-      sha256 = "1l23fb1q86ikrz8dg4n23l7bqp1xa68fwdhv0j0by73ymcp4zn1s";
+      rev = "e11fa044b312f87843313edbdfa0d7bb8db0d040";
+      sha256 = "0qmpddmnj7g6l82xnbj9qjmrf885qs7flpni3cqkm0g4dzapkscf";
     };
     meta.homepage = "https://github.com/vim-test/vim-test/";
   };
@@ -6905,12 +6905,12 @@ let
 
   vim-themis = buildVimPluginFrom2Nix {
     pname = "vim-themis";
-    version = "2020-08-23";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-themis";
-      rev = "51bec3386b661d28fda7736006475b8b2ebe343d";
-      sha256 = "05988ila63kj1r62v7ii76972fgw2300h4dbaml81i643yw0p81p";
+      rev = "5d65b4e4fba91b499dc3c7db47d2ca0491ae6084";
+      sha256 = "0nv2a1wfykncyfr7k9whxybhi66v7y6f348jz4rjyvcl0996hzbb";
     };
     meta.homepage = "https://github.com/thinca/vim-themis/";
   };
@@ -6989,12 +6989,12 @@ let
 
   vim-trailing-whitespace = buildVimPluginFrom2Nix {
     pname = "vim-trailing-whitespace";
-    version = "2020-11-13";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "bronson";
       repo = "vim-trailing-whitespace";
-      rev = "b5289251ae8f93473febdcf2fd10e39a8287d9fd";
-      sha256 = "083zlwm3a85cclb28ryas4rpd3b4ph8n7chb1nwvcc22g447pfsl";
+      rev = "05f068ebd9dbdf71d2d334d02abd99deb0311c40";
+      sha256 = "1bh15yw2aysvpn2ndnc0s6jzc0y93x6q1blc5pph67rdix5bm7gy";
     };
     meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/";
   };
@@ -7109,12 +7109,12 @@ let
 
   vim-vsnip = buildVimPluginFrom2Nix {
     pname = "vim-vsnip";
-    version = "2020-11-14";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "vim-vsnip";
-      rev = "67b7c4cf6de5ed180847581b65797f5a208d07f5";
-      sha256 = "1d7i4svffgzbnd0qy8lm1nagjfc4rp4x4r6a0y6y0rq8clyv1x27";
+      rev = "70af9531f131b2f1e6674780dfe1e81893de02ab";
+      sha256 = "0gjcifybfjwa33njy2pkfcmblgna922c5hg1sf8kwyahmn4v5ix8";
     };
     meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
   };
@@ -7265,12 +7265,12 @@ let
 
   vimagit = buildVimPluginFrom2Nix {
     pname = "vimagit";
-    version = "2020-01-12";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "jreybert";
       repo = "vimagit";
-      rev = "bf7b16e99e075b019e56f2fbfb96c493ca3635e2";
-      sha256 = "1f7gvlhrvvkf69y5vfrkvidhx8aa03n1aqmdhk9qjd6sglfg5w0i";
+      rev = "aaf1278f03e866f0b978d4b0f0cc7084db251129";
+      sha256 = "1k23q1p6wgjlk1cpmv1ijjggjklz8hgg6s7bx6mrk0aw5j2s1pdh";
     };
     meta.homepage = "https://github.com/jreybert/vimagit/";
   };
@@ -7373,12 +7373,12 @@ let
 
   vimspector = buildVimPluginFrom2Nix {
     pname = "vimspector";
-    version = "2020-11-14";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "2bdb30a45ec020a837473011e4b52c1e295d1222";
-      sha256 = "0pdw9fxc2hk944rrsasjky7fr2i8k70aq861xgxmj26q0kwiipgd";
+      rev = "b7de25e3d1e9d003df63d85a8781e16cbc7635ee";
+      sha256 = "06wk6hgpb2n83g3bpn7cwsyz06mpxgc0wyjwbmh2skac81piilrv";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -7554,12 +7554,12 @@ let
 
   yats-vim = buildVimPluginFrom2Nix {
     pname = "yats-vim";
-    version = "2020-11-09";
+    version = "2020-11-16";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "d4f95eebcf8b765bf1198b57045e45f976ab0c19";
-      sha256 = "04blzfgklh9x0xb1qa9bndhha8cnks83v0xn2pr8wzi2i0r3r4mx";
+      rev = "9404065e3ba943a1204d11d333980c9ae7ab2a22";
+      sha256 = "1pfkbmy38ppl1fw0fw4zh53f7dazflvzfyb02gsj6bpyg6jvjqdz";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";

From e7434f18e49de8148db0cc3d493f129e2600a3af Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:51:13 +0400
Subject: [PATCH 2847/3942] vimPlugins.nvim-tree-lua: init at 2020-10-31

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index b1777a881ee4..40c1875944bd 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2638,6 +2638,18 @@ let
     meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/";
   };
 
+  nvim-tree-lua = buildVimPluginFrom2Nix {
+    pname = "nvim-tree-lua";
+    version = "2020-10-31";
+    src = fetchFromGitHub {
+      owner = "kyazdani42";
+      repo = "nvim-tree.lua";
+      rev = "ef893b523d366a0dde44b61d9cb327f2bea65f1d";
+      sha256 = "0g4sz0q5mipa6f8hybbkd42jg6ayw3ih2lv1ml4pjyp378cqbkg6";
+    };
+    meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
+  };
+
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
     version = "2020-11-17";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index db3a0e070d34..919461d45fd4 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -243,6 +243,7 @@ kristijanhusak/vim-carbon-now-sh
 kristijanhusak/vim-dirvish-git
 kristijanhusak/vim-hybrid-material
 kshenoy/vim-signature
+kyazdani42/nvim-tree.lua
 lambdalisue/vim-gista
 lambdalisue/vim-manpager
 lambdalisue/vim-pager

From ae3ee916a9bdf23a0073f1e5fef06db35987e6a6 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:52:01 +0400
Subject: [PATCH 2848/3942] vimPlugins.nvim-web-devicons: init at 2020-11-08

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 40c1875944bd..6f42c17f3d85 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2686,6 +2686,18 @@ let
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
   };
 
+  nvim-web-devicons = buildVimPluginFrom2Nix {
+    pname = "nvim-web-devicons";
+    version = "2020-11-08";
+    src = fetchFromGitHub {
+      owner = "kyazdani42";
+      repo = "nvim-web-devicons";
+      rev = "61693bf98df40dc17354edd5f92311e2aaa0f5cc";
+      sha256 = "0siifa9gxj6kz9w4fpnra6afyri6y0b34605aqkf7820krhcmckz";
+    };
+    meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
+  };
+
   nvim-yarp = buildVimPluginFrom2Nix {
     pname = "nvim-yarp";
     version = "2020-04-08";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 919461d45fd4..95ffae300eed 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -244,6 +244,7 @@ kristijanhusak/vim-dirvish-git
 kristijanhusak/vim-hybrid-material
 kshenoy/vim-signature
 kyazdani42/nvim-tree.lua
+kyazdani42/nvim-web-devicons
 lambdalisue/vim-gista
 lambdalisue/vim-manpager
 lambdalisue/vim-pager

From 1edb7b016bc5b981060453a3c24619dfaba0b859 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:52:47 +0400
Subject: [PATCH 2849/3942] vimPlugins.popfix: init at 2020-11-16

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 6f42c17f3d85..47bc7d443790 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2890,6 +2890,18 @@ let
     meta.homepage = "https://github.com/dleonard0/pony-vim-syntax/";
   };
 
+  popfix = buildVimPluginFrom2Nix {
+    pname = "popfix";
+    version = "2020-11-16";
+    src = fetchFromGitHub {
+      owner = "RishabhRD";
+      repo = "popfix";
+      rev = "f7bb13a4e22716154904f8417928cb91e4284f22";
+      sha256 = "1xmqhryr1san24386fxd60j7qrjlqx6zka87x3bjgg66rq4wqcrh";
+    };
+    meta.homepage = "https://github.com/RishabhRD/popfix/";
+  };
+
   popup-nvim = buildVimPluginFrom2Nix {
     pname = "popup-nvim";
     version = "2020-10-08";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 95ffae300eed..03a12d684126 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -437,6 +437,7 @@ rhysd/git-messenger.vim
 rhysd/vim-clang-format
 rhysd/vim-grammarous
 rhysd/vim-operator-surround
+RishabhRD/popfix
 rodjek/vim-puppet
 romainl/vim-cool
 roman/golden-ratio

From 3f1970afab2f26b828d457eaee67935569e6eaf8 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:53:33 +0400
Subject: [PATCH 2850/3942] vimPlugins.nvim-lsputils: init at 2020-11-13

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 47bc7d443790..a872d29bbad7 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2626,6 +2626,18 @@ let
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
 
+  nvim-lsputils = buildVimPluginFrom2Nix {
+    pname = "nvim-lsputils";
+    version = "2020-11-13";
+    src = fetchFromGitHub {
+      owner = "RishabhRD";
+      repo = "nvim-lsputils";
+      rev = "6abfc5411c8292eea756816b2db9f0ee9ab344ff";
+      sha256 = "07s3psv27nr99f6d6173cykvqqiv22dqljy89j8wnqkh2rskzfrq";
+    };
+    meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
+  };
+
   nvim-terminal-lua = buildVimPluginFrom2Nix {
     pname = "nvim-terminal-lua";
     version = "2019-10-17";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 03a12d684126..6b9ea2fbcc75 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -437,6 +437,7 @@ rhysd/git-messenger.vim
 rhysd/vim-clang-format
 rhysd/vim-grammarous
 rhysd/vim-operator-surround
+RishabhRD/nvim-lsputils
 RishabhRD/popfix
 rodjek/vim-puppet
 romainl/vim-cool

From afeb9976ad27ecd277801837010fc4419bfe6d6e Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:54:19 +0400
Subject: [PATCH 2851/3942] vimPlugins.ci_dark: init at 2020-11-07

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index a872d29bbad7..677ef1748fad 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -351,6 +351,18 @@ let
     meta.homepage = "https://github.com/chrisbra/CheckAttach/";
   };
 
+  ci_dark = buildVimPluginFrom2Nix {
+    pname = "ci_dark";
+    version = "2020-11-07";
+    src = fetchFromGitHub {
+      owner = "chuling";
+      repo = "ci_dark";
+      rev = "8a53f6267dffd1dea3f50adc4b61653178c00115";
+      sha256 = "1bwprg23d593pplm5cwfkg5yj0i8k2gqb3aj8yp8sdiccikfbswk";
+    };
+    meta.homepage = "https://github.com/chuling/ci_dark/";
+  };
+
   clang_complete = buildVimPluginFrom2Nix {
     pname = "clang_complete";
     version = "2020-09-18";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 6b9ea2fbcc75..1ea2b5acc056 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -53,6 +53,7 @@ chrisgeo/sparkup
 chriskempson/base16-vim
 christoomey/vim-sort-motion
 christoomey/vim-tmux-navigator
+chuling/ci_dark
 ckarnell/antonys-macro-repeater
 cloudhead/neovim-fuzzy
 CoatiSoftware/vim-sourcetrail

From 9dc13101bc7f64c21900d60cb44ff305bc5633d2 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:55:05 +0400
Subject: [PATCH 2852/3942] vimPlugins.completion-buffers: init at 2020-09-26

---
 pkgs/misc/vim-plugins/generated.nix    | 18 +++++++++++++++---
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 677ef1748fad..4054d290c615 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -556,6 +556,18 @@ let
     meta.homepage = "https://github.com/rhysd/committia.vim/";
   };
 
+  completion-buffers = buildVimPluginFrom2Nix {
+    pname = "completion-buffers";
+    version = "2020-09-26";
+    src = fetchFromGitHub {
+      owner = "steelsojka";
+      repo = "completion-buffers";
+      rev = "441a58b77c04409e8ccb35fd4970598ae551462f";
+      sha256 = "14q5n7h5kaqf71cfd9mlhwb0xsihm6d3kizrxhlfnzxk6zkn8p0s";
+    };
+    meta.homepage = "https://github.com/steelsojka/completion-buffers/";
+  };
+
   completion-nvim = buildVimPluginFrom2Nix {
     pname = "completion-nvim";
     version = "2020-11-16";
@@ -2676,12 +2688,12 @@ let
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2020-11-17";
+    version = "2020-11-18";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "00d5408527ffff3deffc750a8f46c1e916e730b8";
-      sha256 = "1fdpvq0613j0sdadw3nng895vhvhj4x504nd0x255qdn7k8l7pl8";
+      rev = "289cdc9da8f7f21dcbf814032e9277ef0e9790a0";
+      sha256 = "0fqsl6rva6rb0zdpkv8myn7x5frxg5nmjykhx0jxc23zx5q65nj3";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 1ea2b5acc056..0f9b712d85ce 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -491,6 +491,7 @@ slashmili/alchemist.vim
 sodapopcan/vim-twiggy
 solarnz/arcanist.vim
 sonph/onehalf
+steelsojka/completion-buffers
 stefandtw/quickfix-reflector.vim
 stephpy/vim-yaml
 sunaku/vim-dasht

From 9c773d9a6bcddc233346e2d9a2c52e121b5cdc4b Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:55:50 +0400
Subject: [PATCH 2853/3942] vimPlugins.nvim-highlite: init at 2020-11-18

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4054d290c615..e9a737508891 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2626,6 +2626,18 @@ let
     meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
   };
 
+  nvim-highlite = buildVimPluginFrom2Nix {
+    pname = "nvim-highlite";
+    version = "2020-11-18";
+    src = fetchFromGitHub {
+      owner = "Iron-E";
+      repo = "nvim-highlite";
+      rev = "b8b78237b8002f6a1cda1a205db11770ca748777";
+      sha256 = "136zd50kj3mzvh5m1f73spbfl7wsmac7676p8yhw4mhg9wv0vv7w";
+    };
+    meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
+  };
+
   nvim-hs-vim = buildVimPluginFrom2Nix {
     pname = "nvim-hs-vim";
     version = "2020-08-29";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0f9b712d85ce..25126eef5a4b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -165,6 +165,7 @@ idris-hackers/idris-vim
 Inazuma110/deoplete-greek
 inkarkat/vim-SyntaxRange
 int3/vim-extradite
+Iron-E/nvim-highlite
 itchyny/calendar.vim
 itchyny/lightline.vim
 itchyny/thumbnail.vim

From 4a60d940f9f23bed2df0d4b2f343ec541c060934 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:56:34 +0400
Subject: [PATCH 2854/3942] vimPlugins.vim-qf: init at 2020-11-18

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e9a737508891..b7c4305c4fa5 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -6326,6 +6326,18 @@ let
     meta.homepage = "https://github.com/Vimjas/vim-python-pep8-indent/";
   };
 
+  vim-qf = buildVimPluginFrom2Nix {
+    pname = "vim-qf";
+    version = "2020-11-18";
+    src = fetchFromGitHub {
+      owner = "romainl";
+      repo = "vim-qf";
+      rev = "23c9d67cdd0739c9d74ac9e4a494b7cb7351170c";
+      sha256 = "15kj1wvd3wlmn982l2v8sv2lc3q39bz3jw94jvmkh7nz51xvmfqc";
+    };
+    meta.homepage = "https://github.com/romainl/vim-qf/";
+  };
+
   vim-qml = buildVimPluginFrom2Nix {
     pname = "vim-qml";
     version = "2020-11-03";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 25126eef5a4b..160e418e63a9 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -443,6 +443,7 @@ RishabhRD/nvim-lsputils
 RishabhRD/popfix
 rodjek/vim-puppet
 romainl/vim-cool
+romainl/vim-qf
 roman/golden-ratio
 romgrk/barbar.nvim
 ron89/thesaurus_query.vim

From b3a6ed9f764f090bc2c9e89e770b6513631517f3 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:57:20 +0400
Subject: [PATCH 2855/3942] vimPlugins.nlua-nvim: init at 2020-11-16

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index b7c4305c4fa5..99bd2741d188 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2542,6 +2542,18 @@ let
     meta.homepage = "https://github.com/zah/nim.vim/";
   };
 
+  nlua-nvim = buildVimPluginFrom2Nix {
+    pname = "nlua-nvim";
+    version = "2020-11-16";
+    src = fetchFromGitHub {
+      owner = "tjdevries";
+      repo = "nlua.nvim";
+      rev = "92fdfb1eb791e79ff1d6403dd26b59ce61dd09c6";
+      sha256 = "1ka8k8rxn406glrc0qz8rk3zrxhpdaky040v1a65g5alb50af9hz";
+    };
+    meta.homepage = "https://github.com/tjdevries/nlua.nvim/";
+  };
+
   nord-vim = buildVimPluginFrom2Nix {
     pname = "nord-vim";
     version = "2020-07-06";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 160e418e63a9..d7430b6b431d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -517,6 +517,7 @@ thirtythreeforty/lessspace.vim
 thosakwe/vim-flutter
 tiagofumo/vim-nerdtree-syntax-highlight
 tikhomirov/vim-glsl
+tjdevries/nlua.nvim
 tmhedberg/SimpylFold
 tmsvg/pear-tree
 tmux-plugins/vim-tmux

From 8733417e3bb12c288c86294f118495ff6b150865 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:58:05 +0400
Subject: [PATCH 2856/3942] vimPlugins.BetterLua-vim: init at 2020-08-14

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 99bd2741d188..d5fa48370758 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -267,6 +267,18 @@ let
     meta.homepage = "https://github.com/rbgrouleff/bclose.vim/";
   };
 
+  BetterLua-vim = buildVimPluginFrom2Nix {
+    pname = "BetterLua-vim";
+    version = "2020-08-14";
+    src = fetchFromGitHub {
+      owner = "euclidianAce";
+      repo = "BetterLua.vim";
+      rev = "d2d6c115575d09258a794a6f20ac60233eee59d5";
+      sha256 = "1rvlx21kw8865dg6q97hx9i2s1n8mn1nyhn0m7dkx625pghsx3js";
+    };
+    meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/";
+  };
+
   bufexplorer = buildVimPluginFrom2Nix {
     pname = "bufexplorer";
     version = "2020-02-17";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index d7430b6b431d..1329ca7d5f50 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -104,6 +104,7 @@ enricobacis/vim-airline-clock
 ensime/ensime-vim
 ervandew/supertab
 esneider/YUNOcommit.vim
+euclidianAce/BetterLua.vim
 euclio/vim-markdown-composer
 fannheyward/coc-markdownlint
 farmergreg/vim-lastplace

From fa56e18f3a29badcfbcc6e2da6c7bf859316b3b2 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:58:54 +0400
Subject: [PATCH 2857/3942] vimPlugins.nvim-treesitter-context: init at
 2020-11-14

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index d5fa48370758..438f643ad6af 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2734,6 +2734,18 @@ let
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
 
+  nvim-treesitter-context = buildVimPluginFrom2Nix {
+    pname = "nvim-treesitter-context";
+    version = "2020-11-14";
+    src = fetchFromGitHub {
+      owner = "romgrk";
+      repo = "nvim-treesitter-context";
+      rev = "f70b9e30ff0b149c0eb2c1e4bdbdef594bdab30b";
+      sha256 = "04mjl32gahaw2xky8yaghmgakiiy47dcjj6k4p793xfcs1kf4bsh";
+    };
+    meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";
+  };
+
   nvim-treesitter-refactor = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-refactor";
     version = "2020-10-07";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 1329ca7d5f50..0647e755ccb3 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -447,6 +447,7 @@ romainl/vim-cool
 romainl/vim-qf
 roman/golden-ratio
 romgrk/barbar.nvim
+romgrk/nvim-treesitter-context
 ron89/thesaurus_query.vim
 roxma/nvim-cm-racer
 roxma/nvim-completion-manager

From 1ffe18341df71de31b21b9ca184e7c398b51e6eb Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 00:59:41 +0400
Subject: [PATCH 2858/3942] vimPlugins.nvcode-color-schemes-vim: init at
 2020-11-15

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 438f643ad6af..462ac122e751 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2590,6 +2590,18 @@ let
     meta.homepage = "https://github.com/chrisbra/NrrwRgn/";
   };
 
+  nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
+    pname = "nvcode-color-schemes-vim";
+    version = "2020-11-15";
+    src = fetchFromGitHub {
+      owner = "ChristianChiarulli";
+      repo = "nvcode-color-schemes.vim";
+      rev = "de6b08e0e2f4dc8b8fd0c862a36cb17b9faecf14";
+      sha256 = "1a7ygblpwgrnnwqjrwmc7ppgla22z1yr1n33qw5h2wp0hlvy7z3l";
+    };
+    meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
+  };
+
   nvim-cm-racer = buildVimPluginFrom2Nix {
     pname = "nvim-cm-racer";
     version = "2017-07-27";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0647e755ccb3..c964de70fd28 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -51,6 +51,7 @@ chrisbra/Recover.vim
 chrisbra/unicode.vim
 chrisgeo/sparkup
 chriskempson/base16-vim
+ChristianChiarulli/nvcode-color-schemes.vim
 christoomey/vim-sort-motion
 christoomey/vim-tmux-navigator
 chuling/ci_dark

From 54804c0ea439334c3c361e9d1a20ad0b9d781274 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Thu, 19 Nov 2020 01:00:33 +0400
Subject: [PATCH 2859/3942] vimPlugins.vim-hexokinase: init at 2020-11-03

---
 pkgs/misc/vim-plugins/generated.nix    | 13 +++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 462ac122e751..e39fac50d89d 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -5184,6 +5184,19 @@ let
     meta.homepage = "https://github.com/bitc/vim-hdevtools/";
   };
 
+  vim-hexokinase = buildVimPluginFrom2Nix {
+    pname = "vim-hexokinase";
+    version = "2020-11-03";
+    src = fetchFromGitHub {
+      owner = "RRethy";
+      repo = "vim-hexokinase";
+      rev = "776f1b2a5df00249e89112655dcda6f9a8492bdb";
+      sha256 = "1zxl6injhhsp9r7qjrfjq626yy32vza2lcrcgxsv8m7mf2b11zdp";
+      fetchSubmodules = true;
+    };
+    meta.homepage = "https://github.com/RRethy/vim-hexokinase/";
+  };
+
   vim-hier = buildVimPluginFrom2Nix {
     pname = "vim-hier";
     version = "2011-08-27";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index c964de70fd28..197f445bd357 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -454,6 +454,7 @@ roxma/nvim-cm-racer
 roxma/nvim-completion-manager
 roxma/nvim-yarp
 roxma/vim-tmux-clipboard
+RRethy/vim-hexokinase
 RRethy/vim-illuminate
 rust-lang/rust.vim
 ryanoasis/vim-devicons

From ad55d8353a70b9f16330f7ec977c5c7f5cab72bd Mon Sep 17 00:00:00 2001
From: Andrey Kuznetsov <fear@loathing.in>
Date: Thu, 24 Sep 2020 02:19:28 +0300
Subject: [PATCH 2860/3942] vimPlugins.vim-hexokinase: build bin

---
 pkgs/misc/vim-plugins/overrides.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 0031b6e7dc72..0ee45658a2ae 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , python, cmake, meson, vim, ruby
 , which, fetchFromGitHub, fetchgit, fetchurl, fetchzip, fetchpatch
-, llvmPackages, rustPlatform
+, llvmPackages, rustPlatform, buildGoModule
 , pkgconfig, curl, openssl, libgit2, libiconv
 , xkb-switch, fzf, skim, stylish-haskell
 , python3, boost, icu, ncurses
@@ -595,6 +595,20 @@ self: super: {
       '';
   });
 
+  vim-hexokinase = super.vim-hexokinase.overrideAttrs(old: {
+    preFixup = let
+      hexokinase = buildGoModule {
+        name = "hexokinase";
+        src = old.src + "/hexokinase";
+        vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+      };
+    in ''
+      ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase
+    '';
+
+    meta.platforms = stdenv.lib.platforms.all;
+  });
+
   vim-clap = super.vim-clap.overrideAttrs(old: {
     preFixup = let
       maple-bin = rustPlatform.buildRustPackage {

From 5a4772e2603edf809b67878f3faa1f53ad7bf44e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 21:03:39 +0000
Subject: [PATCH 2861/3942] marvin: 20.19.0 -> 20.20.0

---
 pkgs/applications/science/chemistry/marvin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
index 84a1034849f7..ddab526ebe79 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "marvin";
-  version = "20.19.0";
+  version = "20.20.0";
 
   src = fetchurl {
     name = "marvin-${version}.deb";
     url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
-    sha256 = "0b9a0yl3mxfb2dfdkgs2wphhxsgwixqk6nl2hsn1ly3gz53cws1q";
+    sha256 = "1a8b0drb0c95c8arm3aa0z0sbdm9ilj4h1g90i0qyn4g2wk2xsal";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper ];

From b0d21af997e0b66eaa2ddfb85f5044b83ba9e79c Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 18 Nov 2020 22:05:23 +0100
Subject: [PATCH 2862/3942] unicon-lang: unbreak adding libnsl

---
 pkgs/development/interpreters/unicon-lang/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix
index d908346f1962..9bdd31f400a8 100644
--- a/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/pkgs/development/interpreters/unicon-lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, libX11, libXt }:
+{ stdenv, fetchurl, unzip, libX11, libXt, libnsl }:
 
 stdenv.mkDerivation {
   pname = "unicon-lang";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     url = "http://unicon.org/dist/uni-2-4-2010.zip";
     sha256 = "1g9l2dfp99dqih2ir2limqfjgagh3v9aqly6x0l3qavx3qkkwf61";
   };
-  buildInputs = [ libX11 libXt unzip ];
+  buildInputs = [ libnsl libX11 libXt unzip ];
 
   hardeningDisable = [ "fortify" ];
 

From 3c9c52db4907bd674e3ea32acaf2c9641c1c44bc Mon Sep 17 00:00:00 2001
From: Wulfsta <wulfstawulfsta@gmail.com>
Date: Fri, 13 Nov 2020 00:49:05 -0500
Subject: [PATCH 2863/3942] pythonPackages.flatbuffers: init at 1.12.0

---
 .../python-modules/flatbuffers/default.nix      | 17 +++++++++++++++++
 pkgs/top-level/python-packages.nix              |  6 ++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/flatbuffers/default.nix

diff --git a/pkgs/development/python-modules/flatbuffers/default.nix b/pkgs/development/python-modules/flatbuffers/default.nix
new file mode 100644
index 000000000000..065808dfe6ef
--- /dev/null
+++ b/pkgs/development/python-modules/flatbuffers/default.nix
@@ -0,0 +1,17 @@
+{ stdenv
+, buildPythonPackage
+, flatbuffers
+}:
+
+buildPythonPackage rec {
+  inherit (flatbuffers) pname version src;
+
+  sourceRoot = "source/python";
+
+  pythonImportsCheck = [ "flatbuffers" ];
+
+  meta = flatbuffers.meta // {
+    description = "Python runtime library for use with the Flatbuffers serialization format";
+    maintainers = with stdenv.lib.maintainers; [ wulfsta ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 988f3fc886f1..4fef3c3946fc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2197,6 +2197,10 @@ in {
 
   flask_wtf = callPackage ../development/python-modules/flask-wtf { };
 
+  flatbuffers = callPackage ../development/python-modules/flatbuffers {
+    inherit (pkgs) flatbuffers;
+  };
+
   flexmock = callPackage ../development/python-modules/flexmock { };
 
   flickrapi = callPackage ../development/python-modules/flickrapi { };
@@ -7083,6 +7087,7 @@ in {
     nccl = pkgs.nccl_cudatoolkit_10;
     openssl = pkgs.openssl_1_1;
     inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
+    inherit (pkgs) flatbuffers;
   };
 
   tensorflow-build_2 = callPackage ../development/python-modules/tensorflow/2 {
@@ -7092,6 +7097,7 @@ in {
     nccl = pkgs.nccl_cudatoolkit_11;
     openssl = pkgs.openssl_1_1;
     inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
+    inherit (pkgs) flatbuffers;
   };
 
   tensorflow-build = self.tensorflow-build_1;

From 8ec3ec72263e69f39039cab13359a64fb8eba63d Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 19 Nov 2020 07:45:18 +1000
Subject: [PATCH 2864/3942] Revert "prometheus: pin to go 1.14"

This reverts commit ba17782524508c5e4f8af646bfeb7553185d4a6e.

Fixed in https://github.com/prometheus/prometheus/releases/tag/v2.21.0
---
 pkgs/top-level/all-packages.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ae76b9242d3..384502f21115 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17291,10 +17291,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
   postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
 
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
-  prometheus = callPackage ../servers/monitoring/prometheus {
-    buildGoPackage = buildGo114Package;
-    go = go_1_14;
-  };
+  prometheus = callPackage ../servers/monitoring/prometheus { };
   prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
   prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
   prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { };

From e4c6febee706cc66fba28beeab8bdd3b308975cf Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 18 Nov 2020 23:06:38 +0100
Subject: [PATCH 2865/3942] electrum: 4.0.4 -> 4.0.5

---
 pkgs/applications/misc/electrum/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index f2d779c8a650..40ecd61304f1 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -19,7 +19,7 @@
 }:
 
 let
-  version = "4.0.4";
+  version = "4.0.5";
 
   # electrum is not compatible with dnspython 2.0.0 yet
   # use the latest 1.x release instead
@@ -43,7 +43,7 @@ let
     owner = "spesmilo";
     repo = "electrum";
     rev = version;
-    sha256 = "0bzvyfqnd0r0l8syf95hr3nsh8rmmmcs74bvc7v04v0nm5m0fmf1";
+    sha256 = "0fdsgxzgsxvx6hhjag894nzzdfq989bx1d4anljzcz2ppy4ivpxg";
 
     extraPostFetch = ''
       mv $out ./all
@@ -58,7 +58,7 @@ py.pkgs.buildPythonApplication {
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "03dc5jwgp18sism5v4lbqfyn2zljchng8j2yi07yf8i01ivy2mmv";
+    sha256 = "06ml9lwa5k2dp56sm5s7dsl6qirqmgim7rn853cqcq9n45z41437";
   };
 
   postUnpack = ''
@@ -154,6 +154,6 @@ py.pkgs.buildPythonApplication {
     homepage = "https://electrum.org/";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ehmry joachifm np ];
+    maintainers = with maintainers; [ ehmry joachifm np prusnak ];
   };
 }

From 20f3e3a02be1c76dfcf7b74527c669a8e56ecfea Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 19 Nov 2020 08:08:09 +1000
Subject: [PATCH 2866/3942] prometheus: 2.22.1 -> 2.22.2

https://github.com/prometheus/prometheus/releases/tag/v2.22.2
---
 pkgs/servers/monitoring/prometheus/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 445872bbe5fb..6ab1c80ecedf 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,13 +1,13 @@
-{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }:
+{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }:
 
 let
-  version = "2.22.1";
+  version = "2.22.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "prometheus";
     repo = "prometheus";
-    sha256 = "0wilx675b0a8ww7bj36hzcaip0zqzndkzan04rjsjigz5bw6kba0";
+    sha256 = "04pf3shdfd25wf8snkan5hzv1gjzazjw06i11xaamnc8gfahnzdv";
   };
 
   webui = mkYarnPackage {
@@ -59,7 +59,7 @@ in buildGoPackage rec {
     cp -a $src/console_libraries $src/consoles $out/etc/prometheus
   '';
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1
 
   passthru.tests = { inherit (nixosTests) prometheus; };
 

From 07edcc54fa931a1db968263a13ab08a86c54d6a7 Mon Sep 17 00:00:00 2001
From: Adam Scott <ascott.ca@gmail.com>
Date: Wed, 18 Nov 2020 17:13:10 -0500
Subject: [PATCH 2867/3942] tilt: 0.17.2 -> 0.17.11

---
 pkgs/applications/networking/cluster/tilt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index c3ec58df35d4..ae47545ae4e7 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,13 +5,13 @@ buildGoModule rec {
   /* Do not use "dev" as a version. If you do, Tilt will consider itself
     running in development environment and try to serve assets from the
     source tree, which is not there once build completes.  */
-  version = "0.17.2";
+  version = "0.17.11";
 
   src = fetchFromGitHub {
     owner  = "tilt-dev";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0wiqnlam4f7085n3djvb5phhvw9df61bj8w6c5rcpffykg33vhmi";
+    sha256 = "0ggr8l93xpfm4ljjxw0g6kbm0q64hviaamcb5r2vrx9nabz95n95";
   };
   vendorSha256 = null;
 

From 88db71c9aae7938d9b375ccc7c78d9582d078c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Wed, 18 Nov 2020 23:20:04 +0100
Subject: [PATCH 2868/3942] libavif: disable libaom decoder

---
 pkgs/development/libraries/libavif/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix
index e19e03032939..09456433c1ac 100644
--- a/pkgs/development/libraries/libavif/default.nix
+++ b/pkgs/development/libraries/libavif/default.nix
@@ -24,8 +24,9 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
-    "-DAVIF_CODEC_AOM=ON"
-    "-DAVIF_CODEC_DAV1D=ON"
+    "-DAVIF_CODEC_AOM=ON" # best encoder (slow but small)
+    "-DAVIF_CODEC_DAV1D=ON" # best decoder (fast)
+    "-DAVIF_CODEC_AOM_DECODE=OFF"
     "-DAVIF_BUILD_APPS=ON"
   ];
 

From 033ced84a31274ba4fcb4740900b5507967119ee Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Wed, 18 Nov 2020 16:51:07 +0000
Subject: [PATCH 2869/3942] dasel: 1.5.1 -> 1.6.1

---
 pkgs/applications/misc/dasel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
index 49a16b583661..4bd81d4b78dd 100644
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "dasel";
-  version = "1.5.1";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "TomWright";
     repo = pname;
     rev = "v${version}";
-    sha256 = "14xh5fjh0ngf8rmhqgfxmz25yz7far3sf8yza9iprs7y7ad61qz9";
+    sha256 = "sha256-KjwMBiLxV0ZGostSAZLhHqFQ8BLPKAAN5/vtuWJwgR4=";
   };
 
   vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw";

From d0b5ba2d4fa672b229d8b6e8a1c0cdba2d5a8468 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Wed, 18 Nov 2020 19:21:42 +0000
Subject: [PATCH 2870/3942] dasel: 1.6.1 -> 1.6.2

---
 pkgs/applications/misc/dasel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
index 4bd81d4b78dd..d3aff8e6b1ba 100644
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "dasel";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "TomWright";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-KjwMBiLxV0ZGostSAZLhHqFQ8BLPKAAN5/vtuWJwgR4=";
+    sha256 = "sha256-LGrFs9JNb0gjXg6IRkUfUOWS+sr1nukzOEWK4XUfkfw=";
   };
 
   vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw";

From aa03778083167947ea87a06b9682d5efd1ee0181 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 19 Nov 2020 08:27:24 +1000
Subject: [PATCH 2871/3942] youtube-dl: 2020.11.12 -> 2020.11.19

https://github.com/ytdl-org/youtube-dl/releases/tag/2020.11.18
https://github.com/ytdl-org/youtube-dl/releases/tag/2020.11.19
---
 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 d3d6118a9668..a2a316a575cf 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2020.11.12";
+  version = "2020.11.19";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0c98sjaj6mvxnjp0qnwqbr6fibgb4dlizad2xvkiswf4g4h0pc5f";
+    sha256 = "17my2k6ksj2gch2j85laa5y8c448j4n6zfg85ljfg3zxnag4vhgq";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];

From 259056fae4d2ddb9ab1ac5abaed31e80c931764e Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 18 Nov 2020 23:54:29 +0100
Subject: [PATCH 2872/3942] rippled: unbreak adding libnsl

---
 pkgs/servers/rippled/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
index c9095339cc34..c95d043106cd 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchgit, fetchurl, runCommand, git, cmake, pkgconfig
-, openssl,  zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8 }:
+, openssl,  zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8, libnsl }:
 
 let
   sqlite3 = fetchurl rec {
@@ -9,7 +9,7 @@ let
   };
 
   boostSharedStatic = boost.override {
-    enableShared = true; 
+    enableShared = true;
     enabledStatic = true;
   };
 
@@ -130,7 +130,7 @@ in stdenv.mkDerivation rec {
   cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"];
 
   nativeBuildInputs = [ pkgconfig cmake git ];
-  buildInputs = [ openssl openssl.dev boostSharedStatic zlib grpc c-ares c-ares.cmake-config abseil-cpp protobuf3_8 ];
+  buildInputs = [ openssl openssl.dev boostSharedStatic zlib grpc c-ares c-ares.cmake-config abseil-cpp protobuf3_8 libnsl ];
 
   preConfigure = ''
     export HOME=$PWD
@@ -146,9 +146,9 @@ in stdenv.mkDerivation rec {
     git config --global url."file://${google-test}".insteadOf "${google-test.url}"
     git config --global url."file://${date}".insteadOf "${date.url}"
 
-    substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" 
-    substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "https://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" 
-    substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" 
+    substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www.sqlite.org/2018/sqlite-amalgamation-3260000.zip" ""
+    substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "https://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" ""
+    substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" ""
     substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "URL ${sqlite3.url}" "URL ${sqlite3}"
   '';
 

From ecd3ac0fbdb94a4cacf84e9c2ca6f1f8d670cba4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 10:28:17 +0000
Subject: [PATCH 2873/3942] minikube: 1.14.2 -> 1.15.0

---
 pkgs/applications/networking/cluster/minikube/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 134d25ae678e..6281d652d0c3 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -11,9 +11,9 @@
 
 buildGoModule rec {
   pname = "minikube";
-  version = "1.14.2";
+  version = "1.15.0";
 
-  vendorSha256 = "057mlmja3mygfdf0cp0bcm0chq7s30bjcs5hqacwl6c79ivrjf89";
+  vendorSha256 = "1xkk4f8qjqx5x878iniclni3jm2f7ka47va756vc3vk8p5s6vpdk";
 
   doCheck = false;
 
@@ -21,7 +21,7 @@ buildGoModule rec {
     owner = "kubernetes";
     repo = "minikube";
     rev = "v${version}";
-    sha256 = "1fidvfm9x3rbqfjn9zm5kx9smk94dmjm4gb98rrdmgsld5fg99xj";
+    sha256 = "1n1jhsa0lrfpqvl7m5il37l3f22ffgg4zv8g42xq24cgna951a1z";
   };
 
   nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];

From ac28ce4137c953ad892d559c39089b18f2c82fa0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 23:22:56 +0000
Subject: [PATCH 2874/3942] lldpd: 1.0.6 -> 1.0.7

---
 pkgs/tools/networking/lldpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index 5d7c648b2205..229f261c8c3e 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lldpd";
-  version = "1.0.6";
+  version = "1.0.7";
 
   src = fetchurl {
     url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
-    sha256 = "1v5fd8vwxracvzvgrsswvhppwyx5c4srj89g1cnvy73w831mpq95";
+    sha256 = "1qc7k83zpcq27hpjv1lmgrj4la2zy1gspwk5jas43j49siwr3xqx";
   };
 
   configureFlags = [

From fe4cc65814bcfc0e248d6e8d5b6bd56cde61e8c9 Mon Sep 17 00:00:00 2001
From: Andreas Wiese <aw-nixos@meterriblecrew.net>
Date: Thu, 19 Nov 2020 00:42:36 +0100
Subject: [PATCH 2875/3942] matrix-dl: (unstable-)2019-09-22 ->
 unstable-2020-07-14

Update, also change from

  pname = "package-unstable";
  version = "YYYY-MM-DD";

to

  pname = "package";
  version = "unstable-YYYY-MM-DD";

This allows $pname as $repo in fetchFromGitHub and also seems to be the
more common way in nixpkgs.
---
 .../instant-messengers/matrix-dl/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
index 97f775220229..caf6669e120b 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
@@ -1,14 +1,14 @@
 { lib, python3Packages, fetchFromGitHub }:
 
 python3Packages.buildPythonApplication rec {
-  pname = "matrix-dl-unstable";
-  version = "2019-09-22";
+  pname = "matrix-dl";
+  version = "unstable-2020-07-14";
 
   src = fetchFromGitHub {
     owner = "rubo77";
-    repo = "matrix-dl";
-    rev = "e91610f45b7b3b0aca34923309fc83ba377f8a69";
-    sha256 = "036xfdd21pcfjlilknc67z5jqpk0vz07853wwcsiac32iypc6f2q";
+    repo = pname;
+    rev = "b1a86d1421f39ee327284e1023f09dc165e3c8a5";
+    sha256 = "1l8nh8z7kz24v0wcy3ll3w6in2yxwa1yz8lyc3x0blz37d8ss4ql";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 056a35ad9796417bf82de7e4eac4094617440478 Mon Sep 17 00:00:00 2001
From: Pamplemousse <xav.maso@gmail.com>
Date: Tue, 20 Oct 2020 08:58:17 -0700
Subject: [PATCH 2876/3942] radare2-cutter: Use Qt 5.15

Signed-off-by: Pamplemousse <xav.maso@gmail.com>
---
 pkgs/development/tools/analysis/radare2/cutter.nix | 6 +++---
 pkgs/top-level/all-packages.nix                    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix
index 1cef52a34443..d4c554f8ff63 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ fetchFromGitHub, lib, mkDerivation
 # nativeBuildInputs
 , qmake, pkgconfig
 # Qt
@@ -8,7 +8,7 @@
 , python3
 , wrapQtAppsHook }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "radare2-cutter";
   version = "1.12.0";
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Qt and C++ GUI for radare2 reverse engineering framework";
     homepage = src.meta.homepage;
     license = licenses.gpl3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b29cd7a0d5d7..047b4a3981f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11735,7 +11735,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
     lua = lua5;
   } // (config.radare or {}))) radare2 r2-for-cutter;
 
-  radare2-cutter = libsForQt514.callPackage ../development/tools/analysis/radare2/cutter.nix { };
+  radare2-cutter = libsForQt515.callPackage ../development/tools/analysis/radare2/cutter.nix { };
 
   ragel = ragelStable;
 

From f9716740ce434d758e2c2a717ff7464670bed87d Mon Sep 17 00:00:00 2001
From: Pamplemousse <xav.maso@gmail.com>
Date: Fri, 23 Oct 2020 16:13:29 -0700
Subject: [PATCH 2877/3942] radare2-cutter: Support Python plugins

Signed-off-by: Pamplemousse <xav.maso@gmail.com>
---
 .../tools/analysis/radare2/cutter.nix            | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix
index d4c554f8ff63..d4a102ac097b 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -30,18 +30,28 @@ mkDerivation rec {
       --replace "include(lib_radare2.pri)" ""
   '';
 
-  nativeBuildInputs = [ qmake pkgconfig ];
-  buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 wrapQtAppsHook ];
+  nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ];
+  propagatedBuildInputs = [ python3.pkgs.pyside2 ];
+  buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ];
 
-  qmakeFlags = [
+  qmakeFlags = with python3.pkgs; [
     "CONFIG+=link_pkgconfig"
     "PKGCONFIG+=r_core"
     # Leaving this enabled doesn't break build but generates errors
     # at runtime (to console) about being unable to load needed bits.
     # Disable until can be looked at.
     "CUTTER_ENABLE_JUPYTER=false"
+    # Enable support for Python plugins
+    "CUTTER_ENABLE_PYTHON=true"
+    "CUTTER_ENABLE_PYTHON_BINDINGS=true"
+    "SHIBOKEN_EXTRA_OPTIONS+=-I${r2-for-cutter}/include/libr"
   ];
 
+  preBuild = ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS $(pkg-config --libs python3-embed)"
+    qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
+  '';
+
   enableParallelBuilding = true;
 
   meta = with lib; {

From a322b32e9d74fb476944ff6cfb55833dc69cfaaa Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 19 Nov 2020 01:13:47 +0100
Subject: [PATCH 2878/3942] thunderbird: use nss_3_53 instead of nss

This fixes up the changes done in #104176 where I forgot to include this
now required change.
---
 .../networking/mailreaders/thunderbird/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 57d12b38dcdc..c982f6db485b 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -32,7 +32,7 @@
 , nasm
 , nodejs
 , nspr
-, nss
+, nss_3_53
 , pango
 , perl
 , pkgconfig
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
     libvpx
     libwebp
     nspr
-    nss
+    nss_3_53
     pango
     perl
     sqlite
@@ -142,7 +142,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE =[
     "-I${glib.dev}/include/gio-unix-2.0"
-    "-I${nss.dev}/include/nss"
+    "-I${nss_3_53.dev}/include/nss"
   ];
 
   patches = [

From 7f6ff7e7f2a83bc9a7deefd17bfc333e59bab2f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 00:39:23 +0000
Subject: [PATCH 2879/3942] man-pages: 5.08 -> 5.09

---
 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 6d0cbc50aeca..d4fc2eb98eb4 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "man-pages";
-  version = "5.08";
+  version = "5.09";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
-    sha256 = "1xzp3f6wvw3wplk1a1x09zfv0jp0pdc9wh95czndh3h8z0qwv9yf";
+    sha256 = "1whbxim4diyan97y9pz9k4ck16rmjalw5i1m0dg6ycv3pxv386nz";
   };
 
   makeFlags = [ "MANDIR=$(out)/share/man" ];

From 1e7c662e954371a3f92142620186286ba5fd5640 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 01:23:19 +0000
Subject: [PATCH 2880/3942] mpd: 0.22.2 -> 0.22.3

---
 pkgs/servers/mpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index c025da8752de..c403d160e2bc 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -115,13 +115,13 @@ let
 
     in stdenv.mkDerivation rec {
       pname = "mpd";
-      version = "0.22.2";
+      version = "0.22.3";
 
       src = fetchFromGitHub {
         owner  = "MusicPlayerDaemon";
         repo   = "MPD";
         rev    = "v${version}";
-        sha256 = "1pg3h3bvrsp24pv53yvwl5kr4m2csaxffdbrj5rm3b7w6pbqpfix";
+        sha256 = "0323zxmgyrkbklnqm8i6napz8pva50cw14mzr9bvmyg64x404jgj";
       };
 
       buildInputs = [

From 92e49dda6123f91519ffc8a04915a80cd9fd6e30 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 01:50:44 +0000
Subject: [PATCH 2881/3942] nodejs-15_x: 15.2.0 -> 15.2.1

---
 pkgs/development/web/nodejs/v15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix
index b5319493dad3..45e7b372e666 100644
--- a/pkgs/development/web/nodejs/v15.nix
+++ b/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "15.2.0";
-    sha256 = "022kw29sjf46mgvwciihi2cmf9sfjpqi0xih8xpk7xiwfmx02ypn";
+    version = "15.2.1";
+    sha256 = "0gp8z68h888x2ql64aiicgs7k065lg755cbjlnkbzdih5bh32qjn";
   }

From 85513a7940d7f246942e6c0f4aa17de1ad9d1f5f Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@protonmail.com>
Date: Wed, 18 Nov 2020 20:42:33 -0600
Subject: [PATCH 2882/3942] rav1e: 0.3.4 -> 0.4.0-alpha

---
 pkgs/tools/video/rav1e/default.nix | 32 +++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix
index ae7a45b562d9..1951afd7ab92 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/pkgs/tools/video/rav1e/default.nix
@@ -1,18 +1,32 @@
-{ rustPlatform, fetchFromGitHub, lib, nasm, cargo-c }:
+{ stdenv, rustPlatform, fetchurl, fetchFromGitHub, lib, nasm, cargo-c }:
 
 rustPlatform.buildRustPackage rec {
   pname = "rav1e";
-  version = "0.3.4";
+  version = "0.4.0-alpha";
 
-  src = fetchFromGitHub {
-    owner = "xiph";
-    repo = "rav1e";
-    rev = "v${version}";
-    sha256 = "0zwjg0sv504i1ahzfy2jgng6qwmyvcrvdrp4n3s90r4kvwjkv8xs";
+  src = stdenv.mkDerivation rec {
+    name = "${pname}-${version}-source";
+
+    src = fetchFromGitHub {
+      owner = "xiph";
+      repo = "rav1e";
+      rev = "v${version}";
+      sha256 = "1fw1gxi8330kfhl9hfzpn0lcmyn5604lc74d6g6iadzz2hmv4mb9";
+    };
+
+    cargoLock = fetchurl {
+      url = "https://github.com/xiph/rav1e/releases/download/v0.4.0-alpha/Cargo.lock";
+      sha256 = "002s2wlzpifn5p2ahdrjdkjl48c1wr6fslg0if4gf9qpl8qj05fl";
+    };
+
+    installPhase = ''
+      mkdir -p $out
+      cp -r ./* $out/
+      cp ${cargoLock} $out/Cargo.lock
+    '';
   };
 
-  cargoSha256 = "1mfzshcbxky27nskxhcyrj99wd3v5f597ymgv7nb67lzp5lsyb24";
-
+  cargoSha256 = "1i5ldqb77rrhfxxf9krp7f6yj3h6rsqak6hf23fd2znhgmi7psb1";
   nativeBuildInputs = [ nasm cargo-c ];
 
   postBuild = ''

From 2aff61f6092b1012c9cf99013424cd087134787f Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@protonmail.com>
Date: Wed, 18 Nov 2020 20:42:50 -0600
Subject: [PATCH 2883/3942] ffmpeg-full: re-enable rav1e

---
 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 7429bbda5b40..687c46546fbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12641,7 +12641,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
     openal = if stdenv.isDarwin then null else openal;
     libmfx = if stdenv.isDarwin then null else intel-media-sdk;
     libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
-    rav1e = null;
+    rav1e = if stdenv.isDarwin then null else rav1e;
     samba = if stdenv.isDarwin then null else samba;
     vid-stab = if stdenv.isDarwin then null else vid-stab;
     x265 = if stdenv.isDarwin then null else x265;

From a0bbcb7632a674a44accf15be6b2ec43add4c1a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 12 Nov 2020 17:43:08 +0100
Subject: [PATCH 2884/3942] fedora-backgrounds.f33: init at 33.0.7

---
 pkgs/data/misc/fedora-backgrounds/default.nix | 23 ++++++++++
 .../f33-fix-xfce-path.patch                   | 15 +++++++
 pkgs/data/misc/fedora-backgrounds/generic.nix | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 82 insertions(+)
 create mode 100644 pkgs/data/misc/fedora-backgrounds/default.nix
 create mode 100644 pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch
 create mode 100644 pkgs/data/misc/fedora-backgrounds/generic.nix

diff --git a/pkgs/data/misc/fedora-backgrounds/default.nix b/pkgs/data/misc/fedora-backgrounds/default.nix
new file mode 100644
index 000000000000..31bc28a9f9c1
--- /dev/null
+++ b/pkgs/data/misc/fedora-backgrounds/default.nix
@@ -0,0 +1,23 @@
+{ callPackage, lib, fetchurl }:
+
+let
+  fedoraBackground = callPackage ./generic.nix { };
+in {
+  f32 = fedoraBackground rec {
+    version = "32.2.2";
+    src = fetchurl {
+      url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";
+      hash = "sha256-1F75aae7Jj7M2IPn/vWKcUF+O5mZ0Yey7hWuFj/4Fhg=";
+    };
+  };
+
+  f33 = fedoraBackground rec {
+    version = "33.0.7";
+    src = fetchurl {
+      url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";
+      hash = "sha256-lAn5diEYebCo2ZJCOn9rD87rOasUU0qnSOr0EnZKW4o=";
+    };
+    # Fix broken symlinks in the Xfce background directory.
+    patches = [ ./f33-fix-xfce-path.patch ];
+  };
+}
diff --git a/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch b/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch
new file mode 100644
index 000000000000..eabdacddaa53
--- /dev/null
+++ b/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch
@@ -0,0 +1,15 @@
+diff --git a/default/Makefile b/default/Makefile
+index ec8095a..9391f8f 100644
+--- a/default/Makefile
++++ b/default/Makefile
+@@ -48,8 +48,8 @@ install:
+ 	
+ 	#~ XFCE background
+ 	$(MKDIR) $(XFCE_BG_DIR)
+-	$(LN_S) ../default/$(WP_NAME)-02-day.png \
++	$(LN_S) ../../backgrounds/$(WP_NAME)/default/$(WP_NAME)-02-day.png \
+ 			$(XFCE_BG_DIR)/$(WP_NAME).png
+ 	for tod in 01-dawn 03-dusk 04-night; do \
+-	   $(LN_S) ../default/$(WP_NAME)-$${tod}.png $(XFCE_BG_DIR)/$(WP_NAME)-$${tod}.png; \
++	   $(LN_S) ../../backgrounds/$(WP_NAME)/default/$(WP_NAME)-$${tod}.png $(XFCE_BG_DIR)/$(WP_NAME)-$${tod}.png; \
+ 	done;
diff --git a/pkgs/data/misc/fedora-backgrounds/generic.nix b/pkgs/data/misc/fedora-backgrounds/generic.nix
new file mode 100644
index 000000000000..25043c34e5d9
--- /dev/null
+++ b/pkgs/data/misc/fedora-backgrounds/generic.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, coreutils
+}:
+
+{ version
+, src
+, patches ? [ ]
+}:
+
+stdenv.mkDerivation {
+  inherit patches src version;
+
+  pname = "fedora${stdenv.lib.versions.major version}-backgrounds";
+
+  dontBuild = true;
+
+  postPatch = ''
+    for f in default/Makefile extras/Makefile; do
+      substituteInPlace $f \
+        --replace "usr/share" "share" \
+        --replace "/usr/bin/" "" \
+        --replace "/bin/" ""
+    done
+
+    for f in $(find . -name '*.xml'); do
+      substituteInPlace $f \
+        --replace "/usr/share" "$out/share"
+    done;
+  '';
+
+  installFlags = [
+    "DESTDIR=$(out)"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/fedoradesign/backgrounds";
+    description = "A set of default and supplemental wallpapers for Fedora";
+    license = licenses.cc-by-sa-40;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ danieldk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f1c9c47b3ec..0fc1b9d97a5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1056,6 +1056,8 @@ in
 
   container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
 
+  fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { };
+
   fedora-coreos-config-transpiler = callPackage ../development/tools/fedora-coreos-config-transpiler { };
 
   ccextractor = callPackage ../applications/video/ccextractor { };

From 26afe7aa19f18cb0aeb641d26d8c7f5fabd22fed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 03:03:59 +0000
Subject: [PATCH 2885/3942] metabase: 0.37.0.2 -> 0.37.1

---
 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 6d75011575ad..fb86600eaa6a 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "metabase";
-  version = "0.37.0.2";
+  version = "0.37.1";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "7f95f9823bdf567d4044925e9f14c820a6b4a176624ec027d911cac33813bf96";
+    sha256 = "1mqkaagd452kygch47jsqzcjcsian4pp5xcvr3nnm3p3mah79wyi";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b2a5ce6a90045c24c1e56f4630fc74897fc22271 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 16 Nov 2020 05:08:37 +0100
Subject: [PATCH 2886/3942] convos: 4.40 -> 5.00

---
 pkgs/applications/networking/irc/convos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix
index 9487780634da..551953d43375 100644
--- a/pkgs/applications/networking/irc/convos/default.nix
+++ b/pkgs/applications/networking/irc/convos/default.nix
@@ -6,13 +6,13 @@ with stdenv.lib;
 
 perlPackages.buildPerlPackage rec {
   pname = "convos";
-  version = "4.40";
+  version = "5.00";
 
   src = fetchFromGitHub {
     owner = "Nordaaker";
     repo = pname;
     rev = version;
-    sha256 = "0yyykr86d494xq1ga5ncr6jmdf0ny1r4gm0wzwn49bxn2x1l0xck";
+    sha256 = "0mdbh9q1vclwgnjwvb3z637s7v804h65zxazbhmd7qi3zislnhg1";
   };
 
   nativeBuildInputs = [ makeWrapper ]

From af9a60a1263f8f9f5c840bec95b0e2af99956b51 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Thu, 19 Nov 2020 05:00:04 +0100
Subject: [PATCH 2887/3942] perlPackages.TextMultiMarkdown: init at 1.000035

---
 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 1b0e299fe045..f53e0deb04ba 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -21107,6 +21107,21 @@ let
     };
   };
 
+  TextMultiMarkdown = buildPerlPackage {
+    pname = "Text-MultiMarkdown";
+    version = "1.000035";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Text-MultiMarkdown-1.000035.tar.gz";
+      sha256 = "2467dd13751dc2979d7c880b24e762952130fdf42a1ed3ee04fdf72d4b52646a";
+    };
+    buildInputs = [ ListMoreUtils TestException ];
+    propagatedBuildInputs = [ HTMLParser TextMarkdown ];
+    meta = {
+      description = "Convert MultiMarkdown syntax to (X)HTML";
+      license = stdenv.lib.licenses.bsd3;
+    };
+  };
+
   TestNumberDelta = buildPerlPackage {
     pname = "Test-Number-Delta";
     version = "1.06";

From 56805ce709f7ed877bad29510b3e802ca55f4368 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 04:31:34 +0000
Subject: [PATCH 2888/3942] mpop: 1.4.10 -> 1.4.11

---
 pkgs/applications/networking/mpop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix
index f6c979b5173b..e2f1f0e828d3 100644
--- a/pkgs/applications/networking/mpop/default.nix
+++ b/pkgs/applications/networking/mpop/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "mpop";
-  version = "1.4.10";
+  version = "1.4.11";
 
   src = fetchurl {
     url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
-    sha256 = "1243hazpiwgvz2m3p48cdh0yw1019i6xjxgc7qyhmxcdy0inb6wy";
+    sha256 = "1gcxvhin5y0q47svqbf90r5aip0cgywm8sq6m84ygda7km8xylwv";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From b5a2e19005ac8202f031378ccb015100e632e436 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 18 Nov 2020 16:42:16 +0100
Subject: [PATCH 2889/3942] python3Packages.kaggle: unbreak, removing useless
 slugify dep

---
 pkgs/development/python-modules/kaggle/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix
index 12b46be69b94..15fecba25890 100644
--- a/pkgs/development/python-modules/kaggle/default.nix
+++ b/pkgs/development/python-modules/kaggle/default.nix
@@ -20,10 +20,12 @@ buildPythonPackage rec {
   };
 
   # The version bounds in the setup.py file are unnecessarily restrictive.
+  # They have both python-slugify and slugify, don't know why
   patchPhase = ''
     substituteInPlace setup.py \
-      --replace 'urllib3 >= 1.21.1, < 1.25' 'urllib3'
-  '';
+      --replace 'urllib3 >= 1.21.1, < 1.25' 'urllib3' \
+      --replace " 'slugify'," " "
+    '';
 
   propagatedBuildInputs = [
     certifi

From caa738142fbbbebb7e801b65134fddf4064e52d2 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 19 Nov 2020 00:34:32 +0100
Subject: [PATCH 2890/3942] python3Packages.python-bidi: init at 0.4.2

---
 .../python-modules/python-bidi/default.nix    | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-bidi/default.nix

diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix
new file mode 100644
index 000000000000..1a4a5d5b77cc
--- /dev/null
+++ b/pkgs/development/python-modules/python-bidi/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, six }:
+
+buildPythonPackage rec {
+  pname = "python-bidi";
+  version = "0.4.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "U0f3HoKz6Zdtxlfwne0r/jm6jWd3yoGlssVsMBIcSW4=";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  meta = with lib; {
+    homepage = "https://github.com/MeirKriheli/python-bidi";
+    description = "Pure python implementation of the BiDi layout algorithm";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4fef3c3946fc..6acb7a778977 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5774,6 +5774,8 @@ in {
 
   python-baseconv = callPackage ../development/python-modules/python-baseconv { };
 
+  python-bidi = callPackage ../development/python-modules/python-bidi { };
+
   python-binance = callPackage ../development/python-modules/python-binance { };
 
   python-constraint = callPackage ../development/python-modules/python-constraint { };

From 813255b8160ac5422921fcc9b8b3b0f33459b1cd Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 19 Nov 2020 00:35:50 +0100
Subject: [PATCH 2891/3942] python3Packages.arabic-reshaper: init at 2.1.1

---
 .../arabic-reshaper/default.nix               | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/arabic-reshaper/default.nix

diff --git a/pkgs/development/python-modules/arabic-reshaper/default.nix b/pkgs/development/python-modules/arabic-reshaper/default.nix
new file mode 100644
index 000000000000..ad5f64146a69
--- /dev/null
+++ b/pkgs/development/python-modules/arabic-reshaper/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, future, configparser, isPy27 }:
+
+buildPythonPackage rec {
+  pname = "arabic_reshaper";
+  version = "2.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "zzGPpdUdLSJPpJv2vbu0aE9r0sBot1z84OYH+JrBmdw=";
+  };
+
+  propagatedBuildInputs = [ future ]
+    ++ lib.optionals isPy27 [ configparser ];
+
+  # Tests are not published on pypi
+  doCheck = false;
+
+  pythonImportsCheck = [ "arabic_reshaper" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/mpcabd/python-arabic-reshaper";
+    description = "Reconstruct Arabic sentences to be used in applications that don't support Arabic";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6acb7a778977..ce4ba25bf2c5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -358,6 +358,8 @@ in {
 
   apsw = callPackage ../development/python-modules/apsw { };
 
+  arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { };
+
   area = callPackage ../development/python-modules/area { };
 
   arelle = callPackage ../development/python-modules/arelle { gui = true; };

From 12de08a7e225becc20b9f2eb86689c9ba7387e28 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 19 Nov 2020 00:36:22 +0100
Subject: [PATCH 2892/3942] python3Packages.xhtml2pdf: unbreak dependencies

Needing to add setuptools, python-bidi and arabic-reshaper
to make the package compile and run
---
 pkgs/development/python-modules/xhtml2pdf/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix
index c35d0b484d37..88143b2193f4 100644
--- a/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/pkgs/development/python-modules/xhtml2pdf/default.nix
@@ -6,13 +6,19 @@
 , pypdf2
 , reportlab
 , six
+, python-bidi
+, arabic-reshaper
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "xhtml2pdf";
   version = "0.2.5";
 
-  propagatedBuildInputs = [pillow html5lib pypdf2 reportlab six];
+  propagatedBuildInputs = [
+    pillow html5lib pypdf2 reportlab six
+    setuptools python-bidi arabic-reshaper
+  ];
 
   src = fetchPypi {
     inherit pname version;

From a6218c058b3e994779147dd7286606c750be7d73 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 18 Nov 2020 12:12:34 -0500
Subject: [PATCH 2893/3942] lib: Create `makeScopeWithSplicing`

It's ugly as hell, but I suppose it is needed to codify how to make
spliced package sets.
---
 lib/customisation.nix | 27 +++++++++++++++++++++++++++
 lib/default.nix       |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index dc5dd7691976..37a7951896b0 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -217,4 +217,31 @@ rec {
         };
     in self;
 
+  /* Like the above, but aims to support cross compilation. It's still ugly, but
+     hopefully it helps a little bit. */
+  makeScopeWithSplicing = splicePackages: newScope: otherSplices: keep: f:
+    let
+      spliced = splicePackages {
+        pkgsBuildBuild = otherSplices.selfBuildBuild;
+        pkgsBuildHost = otherSplices.selfBuildHost;
+        pkgsBuildTarget = otherSplices.selfBuildTarget;
+        pkgsHostHost = otherSplices.selfHostHost;
+        pkgsHostTarget = self; # Not `otherSplices.selfHostTarget`;
+        pkgsTargetTarget = otherSplices.selfTargetTarget;
+      } // keep self;
+      self = f self // {
+        newScope = scope: newScope (spliced // scope);
+        callPackage = newScope spliced; # == self.newScope {};
+        # N.B. the other stages of the package set spliced in are *not*
+        # overridden.
+        overrideScope = g: makeScopeWithSplicing
+          splicePackages
+          newScope
+          otherSplices
+          keep
+          (lib.fixedPoints.extends g f);
+        packages = f;
+      };
+    in self;
+
 }
diff --git a/lib/default.nix b/lib/default.nix
index e3c1ed713463..f985266ed938 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -101,7 +101,7 @@ let
       noDepEntry fullDepEntry packEntry stringAfter;
     inherit (self.customisation) overrideDerivation makeOverridable
       callPackageWith callPackagesWith extendDerivation hydraJob
-      makeScope;
+      makeScope makeScopeWithSplicing;
     inherit (self.meta) addMetaAttrs dontDistribute setName updateName
       appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio
       hiPrioSet;

From 1160d58c8d4e47084d8700111269959a9aa77952 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 05:26:22 +0000
Subject: [PATCH 2894/3942] msmtp: 1.8.12 -> 1.8.13

---
 pkgs/applications/networking/msmtp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index ee5ea9d7e030..bfa98b94d0a8 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "msmtp";
-  version = "1.8.12";
+  version = "1.8.13";
 
   src = fetchurl {
     url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
-    sha256 = "0m33m5bc7ajmgy7vivnzj3mhybg37259hx79xypj769kfyafyvx8";
+    sha256 = "1fcv99nis7c6yc63n04cncjysv9jndrp469gcfxh54aiinmlbadd";
   };
 
   patches = [

From 3bc05c26024f57d28bcae1ca28536869e3d5416d Mon Sep 17 00:00:00 2001
From: Colin Atkinson <colin.william.atkinson@gmail.com>
Date: Thu, 19 Nov 2020 00:49:00 -0500
Subject: [PATCH 2895/3942] cgit: strip debug symbols from cgit.cgi

The debug symbols result in an unneeded runtime dependency on GCC, and
properly stripping them shrinks the size of the closure significantly.
---
 .../version-management/git-and-tools/cgit/default.nix           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 8debc642b457..79c118a200c1 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -69,6 +69,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  stripDebugList = [ "cgit" ];
+
   meta = {
     homepage = "https://git.zx2c4.com/cgit/about/";
     repositories.git = "git://git.zx2c4.com/cgit";

From da64a164c55730bdd0945feec3f547ca5abdbaff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 05:53:24 +0000
Subject: [PATCH 2896/3942] nx-libs: 3.5.99.24 -> 3.5.99.25

---
 pkgs/tools/X11/nx-libs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix
index c08a2fd21855..807282fae598 100644
--- a/pkgs/tools/X11/nx-libs/default.nix
+++ b/pkgs/tools/X11/nx-libs/default.nix
@@ -4,12 +4,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nx-libs";
-  version = "3.5.99.24";
+  version = "3.5.99.25";
   src = fetchFromGitHub {
     owner = "ArcticaProject";
     repo = "nx-libs";
     rev = version;
-    sha256 = "0knx4phya90ahjxaflkvnnb7w22vdwjf7r78dhzmbmlccnlvwi7q";
+    sha256 = "01aqdwy0i4nxdyfa24bwnrqjz93q0idihdaqals2yjqpg160nwfc";
   };
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig which

From b99a5b810dd1032f0724e41038ceb8cae536e8eb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 12 Nov 2020 08:19:44 +0100
Subject: [PATCH 2897/3942] ocamlPackages.dns: use Dune 2

---
 pkgs/development/ocaml-modules/dns/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix
index 09753c14b35d..21d9d02da4b8 100644
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@@ -6,6 +6,7 @@ buildDunePackage rec {
   pname = "dns";
   version = "4.6.2";
 
+  useDune2 = true;
   minimumOCamlVersion = "4.07";
 
   src = fetchurl {

From 9785d7c7aa756dfc12f644993c8f728abf0e63ee Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 12 Nov 2020 08:19:49 +0100
Subject: [PATCH 2898/3942] =?UTF-8?q?ocamlPackages.metrics:=200.1.0=20?=
 =?UTF-8?q?=E2=86=92=200.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/metrics/default.nix | 8 +++++---
 pkgs/development/ocaml-modules/metrics/lwt.nix     | 6 +++---
 pkgs/development/ocaml-modules/metrics/unix.nix    | 6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/metrics/default.nix b/pkgs/development/ocaml-modules/metrics/default.nix
index 893b667f8364..58fcab5313a2 100644
--- a/pkgs/development/ocaml-modules/metrics/default.nix
+++ b/pkgs/development/ocaml-modules/metrics/default.nix
@@ -2,18 +2,20 @@
 
 buildDunePackage rec {
   pname = "metrics";
-  version = "0.1.0";
+  version = "0.2.0";
+
+  useDune2 = true;
 
   minimumOCamlVersion = "4.04";
 
   src = fetchurl {
     url = "https://github.com/mirage/metrics/releases/download/${version}/metrics-${version}.tbz";
-    sha256 = "0jy88anrx3rh19046rrbrjmx922zvz3wlqkk8asilqv9pbvpnp1a";
+    sha256 = "0j215cji3n78lghzi9m6kgr3r1s91v681hfnn7cgybb31d7gjkqg";
   };
 
   propagatedBuildInputs = [ fmt ];
 
-  checkInputs = lib.optional doCheck alcotest;
+  checkInputs = [ alcotest ];
 
   doCheck = true;
 
diff --git a/pkgs/development/ocaml-modules/metrics/lwt.nix b/pkgs/development/ocaml-modules/metrics/lwt.nix
index 47b91e430c65..7085ff58148b 100644
--- a/pkgs/development/ocaml-modules/metrics/lwt.nix
+++ b/pkgs/development/ocaml-modules/metrics/lwt.nix
@@ -1,11 +1,11 @@
-{ buildDunePackage, ocaml_lwt, metrics }:
+{ buildDunePackage, logs, ocaml_lwt, metrics }:
 
 buildDunePackage {
   pname = "metrics-lwt";
 
-  inherit (metrics) version src;
+  inherit (metrics) version useDune2 src;
 
-  propagatedBuildInputs = [ ocaml_lwt metrics ];
+  propagatedBuildInputs = [ logs ocaml_lwt metrics ];
 
   meta = metrics.meta // {
     description = "Lwt backend for the Metrics library";
diff --git a/pkgs/development/ocaml-modules/metrics/unix.nix b/pkgs/development/ocaml-modules/metrics/unix.nix
index 45a92f108038..5a7bae1b29f3 100644
--- a/pkgs/development/ocaml-modules/metrics/unix.nix
+++ b/pkgs/development/ocaml-modules/metrics/unix.nix
@@ -1,14 +1,14 @@
-{ lib, buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }:
+{ buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }:
 
 buildDunePackage rec {
 
   pname = "metrics-unix";
 
-  inherit (metrics) version src;
+  inherit (metrics) version useDune2 src;
 
   propagatedBuildInputs = [ gnuplot ocaml_lwt metrics mtime uuidm ];
 
-  checkInputs = lib.optional doCheck metrics-lwt;
+  checkInputs = [ metrics-lwt ];
 
   doCheck = true;
 

From 7346475c9ffa605e354f487426ecce196018af85 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 13 Nov 2020 11:52:57 +0100
Subject: [PATCH 2899/3942] ocamlPackages.metrics-influx: init at 0.2.0

---
 pkgs/development/ocaml-modules/metrics/influx.nix | 14 ++++++++++++++
 pkgs/top-level/ocaml-packages.nix                 |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/metrics/influx.nix

diff --git a/pkgs/development/ocaml-modules/metrics/influx.nix b/pkgs/development/ocaml-modules/metrics/influx.nix
new file mode 100644
index 000000000000..8394ec0c0f94
--- /dev/null
+++ b/pkgs/development/ocaml-modules/metrics/influx.nix
@@ -0,0 +1,14 @@
+{ buildDunePackage, metrics
+, astring, duration, fmt, lwt
+}:
+
+buildDunePackage rec {
+  pname = "metrics-influx";
+  inherit (metrics) version useDune2 src;
+
+  propagatedBuildInputs = [ astring duration fmt lwt metrics ];
+
+  meta = metrics.meta // {
+    description = "Influx reporter for the Metrics library";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9cc95dd4f56b..8a50c1c870d4 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -531,6 +531,8 @@ let
 
     metrics = callPackage ../development/ocaml-modules/metrics { };
 
+    metrics-influx = callPackage ../development/ocaml-modules/metrics/influx.nix { };
+
     metrics-lwt = callPackage ../development/ocaml-modules/metrics/lwt.nix { };
 
     metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix {

From 229060146d3347788bb07c640721c2e29584fb68 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 13 Nov 2020 11:57:32 +0100
Subject: [PATCH 2900/3942] ocamlPackages.metrics-mirage: init at 0.2.0

---
 pkgs/development/ocaml-modules/metrics/mirage.nix | 14 ++++++++++++++
 pkgs/top-level/ocaml-packages.nix                 |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/metrics/mirage.nix

diff --git a/pkgs/development/ocaml-modules/metrics/mirage.nix b/pkgs/development/ocaml-modules/metrics/mirage.nix
new file mode 100644
index 000000000000..4a891505ac71
--- /dev/null
+++ b/pkgs/development/ocaml-modules/metrics/mirage.nix
@@ -0,0 +1,14 @@
+{ buildDunePackage, metrics, metrics-influx
+, cstruct, ipaddr, logs, lwt, mirage-clock, mirage-stack
+}:
+
+buildDunePackage {
+  pname = "metrics-mirage";
+  inherit (metrics) version useDune2 src;
+
+  propagatedBuildInputs = [ cstruct ipaddr logs lwt metrics metrics-influx mirage-clock mirage-stack ];
+
+  meta = metrics.meta // {
+    description = "Mirage backend for the Metrics library";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 8a50c1c870d4..235ffb67c9b0 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -535,6 +535,8 @@ let
 
     metrics-lwt = callPackage ../development/ocaml-modules/metrics/lwt.nix { };
 
+    metrics-mirage = callPackage ../development/ocaml-modules/metrics/mirage.nix { };
+
     metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix {
       inherit (pkgs) gnuplot;
     };

From d480d9336d56385a3c6cd5cda74c4473469b3dd3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 14 Nov 2020 22:48:57 +0100
Subject: [PATCH 2901/3942] python3Packages.zigpy-zigate: 0.6.2 -> 0.7.1

---
 pkgs/development/python-modules/zigpy-zigate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index a906ff4f4195..b1f881fd2aa3 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy-zigate";
-  version = "0.6.2";
+  version = "0.7.2";
   # https://github.com/Martiusweb/asynctest/issues/152
   # broken by upstream python bug with asynctest and
   # is used exclusively by home-assistant with python 3.8
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-zigate";
-    rev = version;
+    rev = "v${version}";
     sha256 = "EV6DV+BytUcPMtzYVKDnq/Uv2efg3stjL5uVlL62II4=";
   };
 

From b6bb71c337e9736b7f8e89cf41690aeb9cb59542 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 16 Nov 2020 23:07:02 +0100
Subject: [PATCH 2902/3942] python3Packages.hass-nabucasa: 0.37.1 -> 0.37.2

---
 pkgs/development/python-modules/hass-nabucasa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index 6ecd91580931..1739183c3a81 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
-  version = "0.37.1";
+  version = "0.37.2";
 
   src = fetchFromGitHub {
     owner = "nabucasa";
     repo = pname;
     rev = version;
-    sha256 = "/GFNrLi1I69gUDIwnHa2q/pxkiRl9PKxpKtb56JrmuA=";
+    sha256 = "0gv8p9nba7269qhc05ds0i79wz4419qjfhn7k9kcngfj1yngb6dm";
   };
 
   postPatch = ''

From 9e8e0c78d7220ef912a4a3230180872732ec3ec2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 19:59:07 +0100
Subject: [PATCH 2903/3942] homeassistant: 0.117.6 -> 0.118.0

---
 pkgs/servers/home-assistant/component-packages.nix | 11 ++++++-----
 pkgs/servers/home-assistant/default.nix            | 12 ++++--------
 pkgs/servers/home-assistant/frontend.nix           |  4 ++--
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index fa54c2b5f265..52f114bfe7f5 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.117.6";
+  version = "0.118.0";
   components = {
     "abode" = ps: with ps; [ abodepy ];
     "accuweather" = ps: with ps; [ accuweather ];
@@ -85,6 +85,7 @@
     "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt
     "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api
     "bloomsky" = ps: with ps; [ ];
+    "blueprint" = ps: with ps; [ ];
     "bluesound" = ps: with ps; [ xmltodict ];
     "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
     "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez
@@ -126,6 +127,7 @@
     "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal
     "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase
     "coinmarketcap" = ps: with ps; [ coinmarketcap ];
+    "color_extractor" = ps: with ps; [ ]; # missing inputs: colorthief
     "comed_hourly_pricing" = ps: with ps; [ ];
     "comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect
     "command_line" = ps: with ps; [ ];
@@ -367,7 +369,6 @@
     "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti
     "hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser
     "hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py
-    "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm
     "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter
     "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink
     "icloud" = ps: with ps; [ pyicloud ];
@@ -528,7 +529,7 @@
     "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi
     "nello" = ps: with ps; [ ]; # missing inputs: pynello
     "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient
-    "nest" = ps: with ps; [ aiohttp-cors python-nest ]; # missing inputs: google-nest-sdm
+    "nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm
     "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ];
     "netdata" = ps: with ps; [ ]; # missing inputs: netdata
     "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear
@@ -623,7 +624,7 @@
     "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint
     "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense
     "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall
-    "profiler" = ps: with ps; [ pyprof2calltree ];
+    "profiler" = ps: with ps; [ objgraph pyprof2calltree ]; # missing inputs: guppy3
     "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw
     "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix
     "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
@@ -659,7 +660,7 @@
     "random" = ps: with ps; [ ];
     "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats
     "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client
-    "recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste
+    "recollect_waste" = ps: with ps; [ ]; # missing inputs: aiorecollect
     "recorder" = ps: with ps; [ sqlalchemy ];
     "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch
     "reddit" = ps: with ps; [ praw ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 8e5435350eee..b7350a4efd27 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -24,11 +24,6 @@ let
     (mkOverride "astral" "1.10.1"
       "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
 
-    # Pinned due to an API change in pyowm>=3.0
-    # Remove after https://github.com/home-assistant/core/pull/39839 gets merged
-    (mkOverride "pyowm" "2.10.0"
-      "1xvcv3sbcn9na8cwz21nnjlixysfk5lymnf65d1nqkbgacc1mm4g")
-
     # Pinned, because v1.5.0 broke the google_translate integration
     # https://github.com/home-assistant/core/pull/38428
     (mkOverride "yarl" "1.4.2"
@@ -67,7 +62,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.117.6";
+  hassVersion = "0.118.0";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -83,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    sha256 = "1f9w7migwmdvnbiv4bi0b31zdfrsg87zgiz2l3gymn6w89f3h8y1";
+    sha256 = "0q3kjsxp82r11gqsnwcw8rnqhgi46214hw84ibw8956w7h75ik5m";
   };
 
   # leave this in, so users don't have to constantly update their downstream patch handling
@@ -91,9 +86,10 @@ in with py.pkgs; buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \
+      --replace "aiohttp==3.7.1" "aiohttp>=3.6.3" \
       --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
       --replace "cryptography==3.2" "cryptography" \
+      --replace "requests==2.25.0" "requests>=2.24.0" \
       --replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100"
     substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
   '';
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index ce3403b8f537..825576e92ad1 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20201021.4";
+  version = "20201111.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "138h4cgvkn26xlr53ziz6d0zc00zw4wk40cpi4c4nia1lv6cqkxd";
+    sha256 = "1pk4l78j72zn6gxc0yr3azdlcqwkvf7ki0khm176qpvs34scs1l8";
   };
 
   # no Python tests implemented

From 72f6df338d4518008aa0722467a33c5396785d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Nov 2020 17:50:53 +0100
Subject: [PATCH 2904/3942] remove genesis maintainer

genesis has no longer access to github
---
 maintainers/maintainer-list.nix                  |  6 ------
 pkgs/applications/audio/cadence/default.nix      |  2 +-
 pkgs/applications/kde/kmahjongg.nix              |  2 +-
 pkgs/applications/kde/ksudoku.nix                |  2 +-
 pkgs/applications/kde/libkmahjongg.nix           |  2 +-
 pkgs/applications/misc/navit/default.nix         |  2 +-
 pkgs/applications/misc/xkbd/default.nix          |  2 +-
 .../networking/p2p/soulseekqt/default.nix        |  2 +-
 .../networking/ps2client/default.nix             |  2 +-
 .../astronomy/astrolabe-generator/default.nix    |  2 +-
 pkgs/development/compilers/rasm/default.nix      |  2 +-
 pkgs/development/compilers/z88dk/default.nix     |  2 +-
 pkgs/development/python-modules/tld/default.nix  |  2 +-
 pkgs/games/assaultcube/default.nix               |  2 +-
 pkgs/games/gscrabble/default.nix                 |  2 +-
 pkgs/games/gweled/default.nix                    |  2 +-
 pkgs/games/lugaru/default.nix                    |  2 +-
 pkgs/games/pentobi/default.nix                   |  2 +-
 pkgs/games/pysolfc/default.nix                   |  2 +-
 pkgs/games/sgt-puzzles/default.nix               |  2 +-
 pkgs/misc/emulators/caprice32/default.nix        |  2 +-
 pkgs/misc/emulators/libdsk/default.nix           |  2 +-
 pkgs/misc/emulators/qmc2/default.nix             |  2 +-
 pkgs/misc/emulators/xcpc/default.nix             |  2 +-
 pkgs/tools/filesystems/cpcfs/default.nix         |  2 +-
 pkgs/tools/filesystems/idsk/default.nix          |  2 +-
 pkgs/tools/filesystems/romdirfs/default.nix      |  2 +-
 pkgs/tools/filesystems/squashfuse/default.nix    | 16 ++++++++--------
 pkgs/tools/networking/photon/default.nix         |  2 +-
 pkgs/tools/text/poedit/default.nix               |  2 +-
 30 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e273e90c2956..f2e33938e051 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3193,12 +3193,6 @@
     githubId = 313929;
     name = "Gabriel Ebner";
   };
-  genesis = {
-    email = "ronan@aimao.org";
-    github = "bignaux";
-    githubId = 149484;
-    name = "Ronan Bignaux";
-  };
   georgewhewell = {
     email = "georgerw@gmail.com";
     github = "georgewhewell";
diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix
index 4f4ad4b8c5b0..53adb3f146f1 100644
--- a/pkgs/applications/audio/cadence/default.nix
+++ b/pkgs/applications/audio/cadence/default.nix
@@ -94,7 +94,7 @@ mkDerivation rec {
     homepage = "https://github.com/falkTX/Cadence/";
     description = "Collection of tools useful for audio production";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ genesis worldofpeace ];
+    maintainers = with stdenv.lib.maintainers; [ worldofpeace ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/kde/kmahjongg.nix b/pkgs/applications/kde/kmahjongg.nix
index b51d0d147e2e..93588b241e11 100644
--- a/pkgs/applications/kde/kmahjongg.nix
+++ b/pkgs/applications/kde/kmahjongg.nix
@@ -14,6 +14,6 @@ mkDerivation {
   buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ];
   meta = {
     license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ genesis ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix
index 3641c1b33323..678c21d5870e 100644
--- a/pkgs/applications/kde/ksudoku.nix
+++ b/pkgs/applications/kde/ksudoku.nix
@@ -13,6 +13,6 @@ mkDerivation {
   buildInputs = [ libGLU kdeclarative libkdegames ];
   meta = {
     license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ genesis ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix
index 4b7b8538290c..295b97842686 100644
--- a/pkgs/applications/kde/libkmahjongg.nix
+++ b/pkgs/applications/kde/libkmahjongg.nix
@@ -9,7 +9,7 @@ mkDerivation {
   name = "libkmahjongg";
   meta = {
     license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ genesis ];
+    maintainers = with lib.maintainers; [ ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons ki18n
diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix
index 099bcbfb25df..e04669d68964 100644
--- a/pkgs/applications/misc/navit/default.nix
+++ b/pkgs/applications/misc/navit/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.navit-project.org";
     description = "Car navigation system with routing engine using OSM maps";
     license = licenses.gpl2;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix
index d03d78a9fd1d..cbca2a33d59e 100644
--- a/pkgs/applications/misc/xkbd/default.nix
+++ b/pkgs/applications/misc/xkbd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mahatma-kaganovich/xkbd";
     description = "onscreen soft keyboard for X11";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index 2a8a06227133..c9c2d5bfef99 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -53,7 +53,7 @@ mkDerivation rec {
     description = "Official Qt SoulSeek client";
     homepage = "https://www.slsknet.org";
     license = licenses.unfree;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix
index 02b14b72c18b..e0891f621495 100644
--- a/pkgs/applications/networking/ps2client/default.nix
+++ b/pkgs/applications/networking/ps2client/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     description = "Desktop clients to interact with ps2link and ps2netfs";
     homepage = "https://github.com/ps2dev/ps2client";
     license = licenses.bsd3;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
index cb3f3131ea14..4a6bdd9d1e9c 100644
--- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
+++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.astrolabeproject.com";
     description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools";
     license = licenses.gpl3;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix
index 87dae128f732..37e07a230aec 100644
--- a/pkgs/development/compilers/rasm/default.nix
+++ b/pkgs/development/compilers/rasm/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "Z80 assembler";
     # use -n option to display all licenses
     license = licenses.mit; # expat version
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix
index a76e57a08078..890924dddc12 100644
--- a/pkgs/development/compilers/z88dk/default.nix
+++ b/pkgs/development/compilers/z88dk/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     homepage    = "https://www.z88dk.org";
     description = "z80 Development Kit";
     license     = licenses.clArtistic;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix
index a8d00d075142..6300111e4ce2 100644
--- a/pkgs/development/python-modules/tld/default.nix
+++ b/pkgs/development/python-modules/tld/default.nix
@@ -33,7 +33,7 @@ python.pkgs.buildPythonPackage rec {
     homepage = "https://github.com/barseghyanartur/tld";
     description = "Extracts the top level domain (TLD) from the URL given";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ genesis ];
+    maintainers = with maintainers; [ ];
   };
 
 }
diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix
index 6c3a7f1168e6..8fa5b64095ad 100644
--- a/pkgs/games/assaultcube/default.nix
+++ b/pkgs/games/assaultcube/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Fast and fun first-person-shooter based on the Cube fps";
     homepage = "https://assault.cubers.net";
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux; # should work on darwin with a little effort.
     license = stdenv.lib.licenses.zlib;
   };
diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix
index 307c09dfa1b3..cab509a3e9a6 100644
--- a/pkgs/games/gscrabble/default.nix
+++ b/pkgs/games/gscrabble/default.nix
@@ -35,6 +35,6 @@ buildPythonApplication {
     homepage = "https://github.com/RaaH/gscrabble/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix
index d5d4f5c40153..fce5ec09c79c 100644
--- a/pkgs/games/gweled/default.nix
+++ b/pkgs/games/gweled/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gweled.org";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/lugaru/default.nix b/pkgs/games/lugaru/default.nix
index d938c0316525..877a3880a00e 100644
--- a/pkgs/games/lugaru/default.nix
+++ b/pkgs/games/lugaru/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Third person ninja rabbit fighting game";
     homepage = "https://osslugaru.gitlab.io";
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux;
     license = stdenv.lib.licenses.gpl2Plus;
   };
diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix
index 2b5a86ad52c9..f0f6ccb8a129 100644
--- a/pkgs/games/pentobi/default.nix
+++ b/pkgs/games/pentobi/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     description = "A computer opponent for the board game Blokus";
     homepage = "https://pentobi.sourceforge.io";
     license = licenses.gpl3;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix
index 5689edf4f4c4..31dbe7f6bbcc 100644
--- a/pkgs/games/pysolfc/default.nix
+++ b/pkgs/games/pysolfc/default.nix
@@ -43,6 +43,6 @@ buildPythonApplication rec {
     description = "A collection of more than 1000 solitaire card games";
     homepage = "https://pysolfc.sourceforge.io";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ kierdavis genesis ];
+    maintainers = with maintainers; [ kierdavis ];
   };
 }
diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index ba6a3601328f..4cac596282e2 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Simon Tatham's portable puzzle collection";
     license = licenses.mit;
-    maintainers = [ maintainers.raskin maintainers.genesis ];
+    maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
     homepage = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/";
   };
diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix
index 8694d4d2d5ae..4b2b6208bb40 100644
--- a/pkgs/misc/emulators/caprice32/default.nix
+++ b/pkgs/misc/emulators/caprice32/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "A complete emulation of CPC464, CPC664 and CPC6128";
     homepage = "https://github.com/ColinPitrat/caprice32";
     license = licenses.gpl2;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix
index 6a2f94e77e6c..219875ba6fcb 100644
--- a/pkgs/misc/emulators/libdsk/default.nix
+++ b/pkgs/misc/emulators/libdsk/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     description = "A library for accessing discs and disc image files";
     homepage = "http://www.seasip.info/Unix/LibDsk/";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix
index 1242a1ef11ac..0ed03f810542 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/pkgs/misc/emulators/qmc2/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "A Qt frontend for MAME/MESS";
     homepage = "https://qmc2.batcom-it.net";
     license = licenses.gpl2;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux;
     broken = true;
   };
diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/misc/emulators/xcpc/default.nix
index 3806d25e5d00..75c30280e21f 100644
--- a/pkgs/misc/emulators/xcpc/default.nix
+++ b/pkgs/misc/emulators/xcpc/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "A portable Amstrad CPC 464/664/6128 emulator written in C";
     homepage = "https://www.xcpc-emulator.net";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix
index 46635aa67412..222b9cf68bf0 100644
--- a/pkgs/tools/filesystems/cpcfs/default.nix
+++ b/pkgs/tools/filesystems/cpcfs/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "Manipulating CPC dsk images and files";
     homepage = "https://github.com/derikz/cpcfs/" ;
     license = licenses.bsd2;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix
index 6de0d586ad94..a8e2cc3f0974 100644
--- a/pkgs/tools/filesystems/idsk/default.nix
+++ b/pkgs/tools/filesystems/idsk/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Manipulating CPC dsk images and files";
     homepage = "https://github.com/cpcsdk/idsk" ;
     license = licenses.mit;
-    maintainers = [ maintainers.genesis ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix
index 96389214c7e0..040889903480 100644
--- a/pkgs/tools/filesystems/romdirfs/default.nix
+++ b/pkgs/tools/filesystems/romdirfs/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mlafeldt/romdirfs";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ genesis ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix
index 27335a9cf5da..9f9c4a605c6a 100644
--- a/pkgs/tools/filesystems/squashfuse/default.nix
+++ b/pkgs/tools/filesystems/squashfuse/default.nix
@@ -8,14 +8,6 @@ stdenv.mkDerivation rec {
   pname = "squashfuse";
   version = "0.1.103";
 
-  meta = {
-    description = "FUSE filesystem to mount squashfs archives";
-    homepage = "https://github.com/vasi/squashfuse";
-    maintainers = [ maintainers.genesis ];
-    platforms = platforms.linux;
-    license = "BSD-2-Clause";
-  };
-
   # platforms.darwin should be supported : see PLATFORMS file in src.
   # we could use a nix fuseProvider, and let the derivation choose the OS
   # specific implementation.
@@ -29,4 +21,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];
   buildInputs = [ lz4 xz zlib lzo zstd fuse ];
+
+  meta = {
+    description = "FUSE filesystem to mount squashfs archives";
+    homepage = "https://github.com/vasi/squashfuse";
+    maintainers = [  ];
+    platforms = platforms.linux;
+    license = "BSD-2-Clause";
+  };
 }
diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix
index 22da1320803e..edaaa4b17142 100644
--- a/pkgs/tools/networking/photon/default.nix
+++ b/pkgs/tools/networking/photon/default.nix
@@ -29,6 +29,6 @@ python3Packages.buildPythonApplication rec {
     description = "a lightning fast web crawler which extracts URLs, files, intel & endpoints from a target";
     homepage = "https://github.com/s0md3v/Photon";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ genesis ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index 05241033c6af..cc1cedffb0e0 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.poedit.net/";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ domenkozar genesis ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 }

From 8313dacb11a9f835fbfa8a9d785ad1e31171eae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Nov 2020 09:42:33 +0100
Subject: [PATCH 2905/3942] treewide: remove trailing whitespace

---
 pkgs/applications/networking/p2p/soulseekqt/default.nix | 2 +-
 pkgs/applications/networking/ps2client/default.nix      | 2 +-
 pkgs/games/assaultcube/default.nix                      | 2 +-
 pkgs/misc/emulators/qmc2/default.nix                    | 2 +-
 pkgs/tools/filesystems/cpcfs/default.nix                | 2 +-
 pkgs/tools/networking/photon/default.nix                | 2 +-
 pkgs/tools/text/poedit/default.nix                      | 8 ++++----
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index c9c2d5bfef99..0d2fc0fd833c 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -23,7 +23,7 @@ mkDerivation rec {
 
   dontBuild = true;
   dontConfigure = true;
-  
+
   nativeBuildInputs = [ imagemagick autoPatchelfHook desktop-file-utils ];
   buildInputs = [ qtmultimedia stdenv.cc.cc ];
 
diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix
index e0891f621495..444a6dcf45c7 100644
--- a/pkgs/applications/networking/ps2client/default.nix
+++ b/pkgs/applications/networking/ps2client/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   patchPhase = ''
    sed -i -e "s|-I/usr/include||g" -e "s|-I/usr/local/include||g" Makefile
   '';
-  
+
   installPhase = ''
     make PREFIX=$out install
   '';
diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix
index 8fa5b64095ad..423130a53561 100644
--- a/pkgs/games/assaultcube/default.nix
+++ b/pkgs/games/assaultcube/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
       cp ${desktop}/share/applications/* $out/share/applications
       install -Dpm644 packages/misc/icon.png $out/share/icons/assaultcube.png
       install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png
-      
+
       makeWrapper $out/bin/ac_client $out/bin/${pname} \
         --run "cd $out/$gamedatadir" --add-flags "--home=\$HOME/.assaultcube/v1.2next --init"
     fi
diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix
index 0ed03f810542..d089ddf2695b 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/pkgs/misc/emulators/qmc2/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
       url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz";
       sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns";
   };
-  
+
   preBuild = ''
     patchShebangs scripts
   '';
diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix
index 222b9cf68bf0..1c639dfc29ec 100644
--- a/pkgs/tools/filesystems/cpcfs/default.nix
+++ b/pkgs/tools/filesystems/cpcfs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
 
   pname = "cpcfs";
   version = "0.85.4";
-  
+
   src = fetchFromGitHub {
     owner = "derikz";
     repo = "cpcfs";
diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix
index edaaa4b17142..db6917ef0b76 100644
--- a/pkgs/tools/networking/photon/default.nix
+++ b/pkgs/tools/networking/photon/default.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   installPhase = ''
     mkdir -p "$out"/{bin,share/photon}
     cp -R photon.py core plugins $out/share/photon
- 
+
     makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \
       --set PYTHONPATH "$PYTHONPATH:$out/share/photon" \
       --add-flags "-O $out/share/photon/photon.py"
diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index cc1cedffb0e0..9ece11c74260 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "0pvd903j2x3h9wh38fhlcn23d0jkjlqnfbdpbvnbhy6al1ngx72w";
   };
 
-  nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook 
+  nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
     libxslt xmlto boost libtool pkgconfig ];
 
   buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ];
 
   propagatedBuildInputs = [ gettext ];
-  
+
   preConfigure = "
     patchShebangs bootstrap
     ./bootstrap
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
     "--with-boost-libdir=${boost.out}/lib"
     "CPPFLAGS=-I${nlohmann_json}/include/nlohmann/"
   ];
- 
+
   preFixup = ''
     gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}")
   '';
- 
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

From f78411700d46a5157b6e8d498df60b0b2e2d3d42 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 19 Nov 2020 01:09:05 +0100
Subject: [PATCH 2906/3942] python3Packages.ndjson: init at 0.3.1

---
 .../python-modules/ndjson/default.nix         | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/ndjson/default.nix

diff --git a/pkgs/development/python-modules/ndjson/default.nix b/pkgs/development/python-modules/ndjson/default.nix
new file mode 100644
index 000000000000..175b04d31074
--- /dev/null
+++ b/pkgs/development/python-modules/ndjson/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, wheel, watchdog, flake8
+, pytest, pytestrunner, coverage, sphinx, twine }:
+
+buildPythonPackage rec {
+  pname = "ndjson";
+  version = "0.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY=";
+  };
+
+  checkInputs = [ pytest pytestrunner flake8 twine sphinx coverage watchdog ];
+
+  meta = with lib; {
+    homepage = "https://github.com/rhgrant10/ndjson";
+    description = "JsonDecoder";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ce4ba25bf2c5..5fca264fd3d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4026,6 +4026,8 @@ in {
 
   ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { };
 
+  ndjson = callPackage ../development/python-modules/ndjson { };
+
   ndtypes = callPackage ../development/python-modules/ndtypes { };
 
   neo = callPackage ../development/python-modules/neo { };

From 5a9ac6d42912c3b93772a4d4d7bdd31047e6fef2 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 19 Nov 2020 01:09:49 +0100
Subject: [PATCH 2907/3942] python3Packages.labelbox: unbreak deps

---
 pkgs/development/python-modules/labelbox/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index b761b7168533..063a223cbd5a 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -6,6 +6,9 @@
 , pillow
 , rasterio
 , shapely
+, ndjson
+, backoff
+, google_api_core
 }:
 
 buildPythonPackage rec {
@@ -17,11 +20,16 @@ buildPythonPackage rec {
     sha256 = "2be6c03dafce0a786cfab5d120196efccaf300cab5aee4d2fdad644b7bee1aef";
   };
 
-  propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ];
+  propagatedBuildInputs = [
+    jinja2 requests pillow rasterio shapely ndjson backoff
+    google_api_core
+  ];
 
   # Test cases are not running on pypi or GitHub
   doCheck = false;
 
+  pythonImportsCheck = [ "labelbox" ];
+
   meta = with lib; {
     homepage = "https://github.com/Labelbox/Labelbox";
     description = "Platform API for LabelBox";

From c999bcbf8971470f6dda8f430237af4f4ea1d6c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 05:25:24 +0000
Subject: [PATCH 2908/3942] fldigi: 4.1.15 -> 4.1.16

---
 pkgs/applications/radio/fldigi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix
index 3811c8fd6f26..5f7ee88a029b 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/applications/radio/fldigi/default.nix
@@ -2,12 +2,12 @@
   libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
 
 stdenv.mkDerivation rec {
-  version = "4.1.15";
+  version = "4.1.16";
   pname = "fldigi";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1fzbcv2dgg6byb2l8m2d6i69yn0a44pq52mpmms756jdf6z622i6";
+    sha256 = "1dfkvhs0ri5kbyskk730ik8ix5z138qys26b31p6kixd8jjkw3k4";
   };
 
   buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio

From 6bc59577144521f43a9d4877662c3bd60713fa97 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 19 Nov 2020 00:12:02 +0100
Subject: [PATCH 2909/3942] python3Packages.youtube-dlc: init at
 2020.11.11.post3

---
 .../python-modules/youtube-dlc/default.nix    | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/youtube-dlc/default.nix

diff --git a/pkgs/development/python-modules/youtube-dlc/default.nix b/pkgs/development/python-modules/youtube-dlc/default.nix
new file mode 100644
index 000000000000..9599828e65ee
--- /dev/null
+++ b/pkgs/development/python-modules/youtube-dlc/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "youtube_dlc";
+  version = "2020.11.11.post3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "WqoKpfvVPZrN+pW6s8JoApJusn5CXyPcg9VcsY8R0FM=";
+  };
+
+  # They are broken
+  doCheck = false;
+
+  pythonImportsCheck = [ "youtube_dlc" ];
+
+  meta = with lib; {
+    homepage = "Media downloader supporting various sites such as youtube";
+    description = "https://github.com/blackjack4494/yt-dlc";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4fef3c3946fc..c7e5ea279748 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7839,6 +7839,8 @@ in {
     phantomjsSupport = false;
   };
 
+  youtube-dlc = callPackage ../development/python-modules/youtube-dlc { };
+
   yowsup = callPackage ../development/python-modules/yowsup { };
 
   yq = callPackage ../development/python-modules/yq { };

From 442bd5b4d18b0aba779e61acb6f01b141d3ab78c Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 19 Nov 2020 00:12:55 +0100
Subject: [PATCH 2910/3942] python3Packages.tubeup: unbreak wrong youtube dep

There are two packages used to download from youtube:
youtube-dl and youtube-dlc, this packaged was using the
wrong one
---
 pkgs/development/python-modules/tubeup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix
index 02269cdbfb28..297642599107 100644
--- a/pkgs/development/python-modules/tubeup/default.nix
+++ b/pkgs/development/python-modules/tubeup/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , internetarchive
 , fetchPypi
-, youtube-dl
+, youtube-dlc
 , docopt
 , isPy27
 }:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "docopt==0.6.2" "docopt"
   '';
 
-  propagatedBuildInputs = [ internetarchive docopt youtube-dl ];
+  propagatedBuildInputs = [ internetarchive docopt youtube-dlc ];
 
   pythonImportsCheck = [ "tubeup" ];
 

From e62c0ade1c96be05a555a3394266b8d189f9255d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 07:15:50 +0000
Subject: [PATCH 2911/3942] mongodb-compass: 1.22.1 -> 1.23.0

---
 pkgs/tools/misc/mongodb-compass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix
index 93fca738dc40..28a1339e9a37 100644
--- a/pkgs/tools/misc/mongodb-compass/default.nix
+++ b/pkgs/tools/misc/mongodb-compass/default.nix
@@ -3,7 +3,7 @@
 , gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }:
 
 let
-  version = "1.22.1";
+  version = "1.23.0";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -49,7 +49,7 @@ let
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
-        sha256 = "1wbjj2w4dii644lprvmwnlval53yqh4y0f58cad657jjw8101rd9";
+        sha256 = "1kmhki4kq28z8h249p4imcpb0nz2dx5bmpv8ldhhqh3rcq5vzxsv";
       }
     else
       throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";

From 6de789ea9bfee9b63baef72ce30300e6f4a94bdc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 07:25:34 +0000
Subject: [PATCH 2912/3942] mlterm: 3.9.0 -> 3.9.1

---
 pkgs/applications/terminal-emulators/mlterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index 853fe22f0bf2..e3e8fcd32a5d 100644
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mlterm";
-  version = "3.9.0";
+  version = "3.9.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "17h6j4nmbyvsx2shm8mqm7smzq9i7mbqxjw19c2m0rhf5yzqhr3k";
+    sha256 = "03fnynwv7d1aicwk2rp31sgncv5m65agvygqvsgn59v9di40gnnb";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ];

From 989698944e1fa01f2bd51316662b0187fd901ca8 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 18 Nov 2020 17:39:33 +0100
Subject: [PATCH 2913/3942] python2Packages.bayesian-optimization: remove

---
 .../python-modules/bayesian-optimization/default.nix            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix
index a1739bf4773e..c41181ca7b04 100644
--- a/pkgs/development/python-modules/bayesian-optimization/default.nix
+++ b/pkgs/development/python-modules/bayesian-optimization/default.nix
@@ -5,11 +5,13 @@
 , scikitlearn
 , scipy
 , pytest
+, isPy27
 }:
 
 buildPythonPackage rec {
   pname = "bayesian-optimization";
   version = "1.2.0";
+  disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "fmfn";

From 75aeb18680aa25c524d0510838bad184876275d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 08:09:29 +0000
Subject: [PATCH 2914/3942] oil: 0.8.3 -> 0.8.4

---
 pkgs/shells/oil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index e1d4ff1585f8..3dbe95f35b6b 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "oil";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchurl {
     url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    sha256 = "1jrw8lbcya5wza1g65b5mgm432a2r00d8i0p1plz0kp8rl3ccy1z";
+    sha256 = "0ydqwyghnkgbpsdi49vnrx2khs3y0d0bzdzcvjjr999ycmnirz88";
   };
 
   postPatch = ''

From 3e35be8e94a776fee5beb8708936f957025deb6f Mon Sep 17 00:00:00 2001
From: Marc 'risson' Schmitt <marc.schmitt@risson.space>
Date: Thu, 19 Nov 2020 09:24:14 +0100
Subject: [PATCH 2915/3942] netdata: go.d.plugin: 0.20.0 -> 0.25.0

Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
---
 pkgs/tools/system/netdata/go.d.plugin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix
index e2392df495f0..3cf3a1b116bf 100644
--- a/pkgs/tools/system/netdata/go.d.plugin.nix
+++ b/pkgs/tools/system/netdata/go.d.plugin.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "netdata-go.d.plugin";
-  version = "0.20.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "netdata";
     repo = "go.d.plugin";
     rev = "v${version}";
-    sha256 = "0wd1wg56q955jm5ksq2zqzlms1nlxx7n7vv43l096k1578fv93jv";
+    sha256 = "0cp1asw10a8ndndzq8r57mncrm8521aw3x081vrlfqvhp6qahr3j";
   };
 
-  vendorSha256 = "1k84l97fw4s9jdwbka4p168m7l7wil0c4cpijis8ypj3g1xfrw90";
+  vendorSha256 = "16b6i9cpk8j7292qgjvida70rg7nixi6g94wayzikx01vmdbis5r";
 
   doCheck = false;
 

From d2408110385157e11b619411851975c0952464c8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 08:48:17 +0000
Subject: [PATCH 2916/3942] libosip: 5.1.2 -> 5.2.0

---
 pkgs/development/libraries/osip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index ed854e8a4609..8b2dce1d950f 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
-  version = "5.1.2";
+  version = "5.2.0";
   src = fetchurl {
     url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
-    sha256 = "148j1i0zkwf09qdpk3nc5sssj1dvppw7p0n9rgrg8k56447l1h1b";
+    sha256 = "0xdk3cszkzb8nb757gl47slrr13mf6xz43ab4k343fv8llp8pd2g";
   };
   pname = "libosip2";
 

From 1bdeea7fc83ccc69136c73b74c62f4c23b0bcb74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 19 Nov 2020 10:19:54 +0100
Subject: [PATCH 2917/3942] cudnn_cudatoolkit_10: 10.1 -> 10.2

cudatoolkit_10 is currently CUDA 10.2, whereas cudnn_cudatoolkit_10
was using CuDNN with CUDA 10.1. This change rectifies that
discrepancy.
---
 pkgs/development/libraries/science/math/cudnn/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
index 9495366eaaa8..d99149c0e965 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@@ -79,7 +79,7 @@ in rec {
     sha256 = "084c13vzjdkb5s1996yilybg6dgav1lscjr1xdcgvlmfrbr6f0k0";
   };
 
-  cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_1;
+  cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2;
 
   cudnn_cudatoolkit_11_0 = generic rec {
     version = "8.0.2";

From d7695d13ffbe37ffba1e27f0d535e3f473618ab1 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Thu, 19 Nov 2020 09:40:32 +0000
Subject: [PATCH 2918/3942] firmwareLinuxNonfree: 2020-10-22 -> 2020-11-18

---
 .../linux/firmware/firmware-linux-nonfree/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index fcebea126fe9..6938750dd649 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "firmware-linux-nonfree";
-  version = "2020-10-22";
+  version = "2020-11-18";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
     rev = lib.replaceStrings ["-"] [""] version;
-    sha256 = "15l32993pfm0albx7ky64c5i60vph150hrdkg87md15919a6naia";
+    sha256 = "107p7h13gncsxqhixqq9zmmswvs910sck54ab10s4m5cafvnaf94";
   };
 
   installFlags = [ "DESTDIR=$(out)" ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   outputHashMode = "recursive";
   outputHashAlgo = "sha256";
-  outputHash = "0y2dpp3gklzym2gr0w9wddf6cn6p0sv9n2xh401j1299sjsr57m9";
+  outputHash = "1319qr3mhbbvbnl8q151pgfpahwzfv9zg0fvpj34z5h0wnvmlr2v";
 
   meta = with stdenv.lib; {
     description = "Binary firmware collection packaged by kernel.org";

From 3fc60a21e17e013003b8c71720786d34531f0375 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Wed, 18 Nov 2020 03:37:53 +0000
Subject: [PATCH 2919/3942] cpuminer-multi: fix src

---
 pkgs/tools/misc/cpuminer-multi/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix
index dba42e4bfea8..2856bc2f1e0c 100644
--- a/pkgs/tools/misc/cpuminer-multi/default.nix
+++ b/pkgs/tools/misc/cpuminer-multi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, curl, jansson, autoconf, automake
+{ stdenv, fetchFromGitHub, curl, jansson, autoconf, automake
 , aesni ? stdenv.hostPlatform.aesSupport }:
 
 let
@@ -8,9 +8,10 @@ in
 stdenv.mkDerivation {
   name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
+    owner = "hyc";
+    repo = "cpuminer-multi";
     inherit rev;
-    url = "https://github.com/wolf9466/cpuminer-multi.git";
     sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v";
   };
 

From b364168989544a8c52de56b3a4ed15cd49b05254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Wed, 18 Nov 2020 17:47:54 +0100
Subject: [PATCH 2920/3942] clojure: Mimic upstream install script

Also installs exec.jar in the expected location
---
 .../interpreters/clojure/default.nix          | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index bebb5376b8a2..f12645ec2b62 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -14,22 +14,28 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
+  # See https://github.com/clojure/brew-install/blob/1.10.1/src/main/resources/clojure/install/linux-install.sh
   installPhase =
     let
       binPath = stdenv.lib.makeBinPath [ rlwrap jdk ];
     in
     ''
-      mkdir -p $out/libexec
-      cp clojure-tools-${version}.jar $out/libexec
-      cp example-deps.edn $out
-      cp deps.edn $out
-      cp exec.jar $out
+      clojure_lib_dir=$out
+      bin_dir=$out/bin
 
+      echo "Installing libs into $clojure_lib_dir"
+      install -Dm644 deps.edn "$clojure_lib_dir/deps.edn"
+      install -Dm644 example-deps.edn "$clojure_lib_dir/example-deps.edn"
+      install -Dm644 exec.jar "$clojure_lib_dir/libexec/exec.jar"
+      install -Dm644 clojure-tools-${version}.jar "$clojure_lib_dir/libexec/clojure-tools-${version}.jar"
+
+      echo "Installing clojure and clj into $bin_dir"
       substituteInPlace clojure --replace PREFIX $out
+      install -Dm755 clojure "$bin_dir/clojure"
+      install -Dm755 clj "$bin_dir/clj"
 
-      install -Dt $out/bin clj clojure
-      wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
-      wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
+      wrapProgram $bin_dir/clojure --prefix PATH : $out/bin:${binPath}
+      wrapProgram $bin_dir/clj --prefix PATH : $out/bin:${binPath}
 
       installManPage clj.1 clojure.1
     '';

From ba322dcb497c5e769c528ba7528b1e27690ad65f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 19 Nov 2020 08:43:18 +0100
Subject: [PATCH 2921/3942] spdlog: 1.7.0 -> 1.8.1

---
 pkgs/development/libraries/spdlog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index 22266bfd4b01..9787c7e92da8 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -35,8 +35,8 @@ let
 in
 {
   spdlog_1 = generic {
-    version = "1.7.0";
-    sha256 = "1ryaa22ppj60461hcdb8nk7jwj84arp4iw4lyw594py92g4vnx3j";
+    version = "1.8.1";
+    sha256 = "sha256-EyZhYgcdtZC+vsOUKShheY57L0tpXltduHWwaoy6G9k=";
   };
 
   spdlog_0 = generic {

From b23d2973b6f1237b13a4d4ef5d85763443a9ad4a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 19 Nov 2020 08:50:02 +1000
Subject: [PATCH 2922/3942] grobi: fix failing test on go 1.15

---
 pkgs/tools/X11/grobi/default.nix | 10 +++++++++-
 pkgs/top-level/all-packages.nix  |  4 +---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix
index 111d064ad887..9d10dd478818 100644
--- a/pkgs/tools/X11/grobi/default.nix
+++ b/pkgs/tools/X11/grobi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, fetchpatch }:
 
 buildGoModule rec {
   version = "0.6.0";
@@ -13,6 +13,14 @@ buildGoModule rec {
 
   vendorSha256 = "1ibwx5rbxkygfx78j3g364dmbwwa5b34qmzq3sqcbrsnv8rzrwvj";
 
+  patches = [
+    # fix failing test on go 1.15
+    (fetchpatch {
+      url = "https://github.com/fd0/grobi/commit/176988ab087ff92d1408fbc454c77263457f3d7e.patch";
+      sha256 = "0j8y3gns4lm0qxqxzmdn2ll0kq34mmfhf83lvsq13iqhp5bx3y31";
+    })
+  ];
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/fd0/grobi";
     description = "Automatically configure monitors/outputs for Xorg via RANDR";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b1eb03c8008..5037d5119e88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2236,9 +2236,7 @@ in
 
   gringo = callPackage ../tools/misc/gringo { };
 
-  grobi = callPackage ../tools/X11/grobi {
-    buildGoModule = buildGo114Module;
-  };
+  grobi = callPackage ../tools/X11/grobi { };
 
   gscan2pdf = callPackage ../applications/graphics/gscan2pdf { };
 

From 04fb8ad352eb977a6ffcbd21239daadb5843cdef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 10:42:50 +0000
Subject: [PATCH 2923/3942] buildpack: 0.14.2 -> 0.15.0

---
 pkgs/development/tools/buildpack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix
index 8845e39f1d69..ea417daa584a 100644
--- a/pkgs/development/tools/buildpack/default.nix
+++ b/pkgs/development/tools/buildpack/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pack";
-  version = "0.14.2";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0m2hcd7fdvlqy8yp3pa2ccpk9wbnknjh2f8qic31v9yh3zm8aga7";
+    sha256 = "0i3lzfn5m38f8aiwqydffdq2j8gfcnkmcgasfjxbn6rrs0hw5g92";
   };
 
-  vendorSha256 = "1c38g169kq9kv6x0x1rlg39ywbc1q66fndby0v85b3ri3xb52869";
+  vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 5bd56b350df5f465323cd7ba704de536230200da Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <sebastian.neubauer@amd.com>
Date: Thu, 19 Nov 2020 11:55:44 +0100
Subject: [PATCH 2924/3942] amdvlk: 2020.Q4.4 -> 2020.Q4.5

---
 pkgs/development/libraries/amdvlk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index 541e15ea769f..c3e526115546 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -21,13 +21,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "amdvlk";
-  version = "2020.Q4.4";
+  version = "2020.Q4.5";
 
   src = fetchRepoProject {
     name = "${pname}-src";
     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
     rev = "refs/tags/v-${version}";
-    sha256 = "vlTmJlBHRZOiQFsziefh9VIomFPv8oUr9paagC+q6+8=";
+    sha256 = "1CcupEm19ZGEma0TIkGxOa0doKhlPbfXFX2S44EBNp0=";
   };
 
   buildInputs = [

From 02fc4fce9a884083994252db2585f9b64e773295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 19 Nov 2020 13:33:37 +0100
Subject: [PATCH 2925/3942] waybar: fix build with spdlog 1.8.1

---
 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 35bef78609d0..24bac4dec9bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21645,9 +21645,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
   swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { };
 
-  waybar = callPackage ../applications/misc/waybar {
-    fmt = fmt_6;
-  };
+  waybar = callPackage ../applications/misc/waybar {};
 
   hikari = callPackage ../applications/window-managers/hikari { };
 

From 827fbf9dfd1dff92e457c0b7b85fb409f8e104de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 19 Nov 2020 13:37:13 +0100
Subject: [PATCH 2926/3942] gerbera: fix build with spdklog

---
 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 24bac4dec9bf..93b44d2a3a66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16832,9 +16832,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
   grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { };
 
-  gerbera = callPackage ../servers/gerbera {
-    fmt = fmt_6;
-  };
+  gerbera = callPackage ../servers/gerbera {};
 
   gobetween = callPackage ../servers/gobetween { };
 

From f428c626796c88d3e9bd35306a5fbf6988f23292 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 12:44:10 +0000
Subject: [PATCH 2927/3942] passExtensions.pass-genphrase: 0.2 -> 0.3

---
 pkgs/tools/security/pass/extensions/genphrase.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix
index 48db0094db94..d45e35d9bbc0 100644
--- a/pkgs/tools/security/pass/extensions/genphrase.nix
+++ b/pkgs/tools/security/pass/extensions/genphrase.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pass-genphrase";
-  version = "0.2";
+  version = "0.3";
 
   src = fetchFromGitHub {
     owner = "congma";
     repo = "pass-genphrase";
     rev = version;
-    sha256 = "1sdkmz5s6wdx4vdlgqf5kmyrm17zwzy3n52s13qpx32bnnajap1h";
+    sha256 = "01dff2jlp111y7vlmp1wbgijzphhlzc19m02fs8nzmn5vxyffanx";
   };
 
   dontBuild = true;

From a19b005867b65f5f41175d6b63db222b6edd0ade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 19 Nov 2020 13:58:53 +0100
Subject: [PATCH 2928/3942] fmt_6: remove

---
 pkgs/development/libraries/fmt/default.nix | 28 ----------------------
 pkgs/top-level/all-packages.nix            |  3 +--
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index 6cb3ec5a2b30..3b2a061153f2 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -41,34 +41,6 @@ let
     };
 in
 {
-  fmt_6 = generic {
-    version = "6.2.1";
-    sha256 = "1i6nfxazq4d05r3sxyc3ziwkqq7s8rdbv9p16afv66aqmsbqqqic";
-
-    patches = [
-      # Fix BC break breaking Kodi
-      # https://github.com/xbmc/xbmc/issues/17629
-      # https://github.com/fmtlib/fmt/issues/1620
-      (fetchpatch {
-        url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch";
-        sha256 = "0v8hm5958ih1bmnjr16fsbcmdnq4ykyf6b0hg6dxd5hxd126vnxx";
-      })
-
-      # Fix paths in pkg-config file
-      # https://github.com/fmtlib/fmt/pull/1657
-      (fetchpatch {
-        url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch";
-        sha256 = "1hqp96zl9l3qyvsm7pxl6ah8c26z035q2mz2pqhqa0wvzd1klcc6";
-      })
-
-      # Fix cmake config paths.
-      (fetchpatch {
-        url = "https://github.com/fmtlib/fmt/pull/1702.patch";
-        sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3";
-      })
-    ];
-  };
-
   fmt_7 = generic {
     version = "7.0.3";
     sha256 = "17q2fdzakk5p0s3fx3724gs5k2b5ylp8f1d6j2m3wgvlfldx9k9a";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93b44d2a3a66..591f7e9d7379 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12686,8 +12686,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
   flyway = callPackage ../development/tools/flyway { };
 
-  inherit (callPackages ../development/libraries/fmt { })
-    fmt_6 fmt_7;
+  inherit (callPackages ../development/libraries/fmt { }) fmt_7;
 
   fmt = fmt_7;
 

From 8bc6e956862dd1acbd972cd00d9354ab1573614a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 19 Nov 2020 23:07:16 +1000
Subject: [PATCH 2929/3942] rav1e: fix eval

---
 pkgs/tools/video/rav1e/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix
index 1951afd7ab92..ae300f47b19e 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/pkgs/tools/video/rav1e/default.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
       libaom (the reference encoder) is too slow.
       Features: https://github.com/xiph/rav1e#features
     '';
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/xiph/rav1e";
     changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}";
     license = licenses.bsd2;
     maintainers = [ maintainers.primeos ];

From 4313ac6b292708158cb413420c8848f7b8012305 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 19 Nov 2020 14:31:14 +0100
Subject: [PATCH 2930/3942] dockerTools.buildLayeredImage: Fix cross
 compilation

---
 pkgs/build-support/docker/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index ba76ce2b817d..b072c291f77f 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -48,7 +48,7 @@ let
     # A user is required by nix
     # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478
     export USER=nobody
-    ${nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration
+    ${buildPackages.nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration
 
     mkdir -p nix/var/nix/gcroots/docker/
     for i in ${lib.concatStringsSep " " contentsList}; do
@@ -443,7 +443,7 @@ rec {
       runCommand "${name}.tar.gz" {
         inherit (stream) imageName;
         passthru = { inherit (stream) imageTag; };
-        buildInputs = [ pigz ];
+        nativeBuildInputs = [ pigz ];
       } "${stream} | pigz -nT > $out";
 
   # 1. extract the base image
@@ -762,7 +762,7 @@ rec {
             else
               lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath));
         paths = referencesByPopularity overallClosure;
-        buildInputs = [ jq ];
+        nativeBuildInputs = [ jq ];
       } ''
         ${if (tag == null) then ''
           outName="$(basename "$out")"
@@ -826,7 +826,7 @@ rec {
           # take images can know in advance how the image is supposed to be used.
           isExe = true;
         };
-        buildInputs = [ makeWrapper ];
+        nativeBuildInputs = [ makeWrapper ];
       } ''
         makeWrapper ${streamScript} $out --add-flags ${conf}
       '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 372aecc9668b..7391f0d12a02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -239,7 +239,7 @@ in
   grsync = callPackage ../applications/misc/grsync { };
 
   dockerTools = callPackage ../build-support/docker {
-    writePython3 = writers.writePython3;
+    writePython3 = buildPackages.writers.writePython3;
   };
 
   snapTools = callPackage ../build-support/snap { };

From b388a2eccea2b7a966f91b58e0955272de59ae73 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 13:34:42 +0000
Subject: [PATCH 2931/3942] php73Packages.psalm: 4.1.0 -> 4.1.1

---
 pkgs/development/php-packages/psalm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix
index 07a9392b2528..129fbaf4ed39 100644
--- a/pkgs/development/php-packages/psalm/default.nix
+++ b/pkgs/development/php-packages/psalm/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "psalm";
-  version = "4.1.0";
+  version = "4.1.1";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
-    sha256 = "1mpbw9q0fgh6vdfwsm222fz1vi9jrw6l5k1mz4gyv5kxvbyzmn4c";
+    sha256 = "05qjrg8wxlqxihv7xl31n73ygx7ykvcpbh2gq958iin4rr1bcy88";
   };
 
   phases = [ "installPhase" ];

From d5eb9fbe53dbe8363a65397ae919f7fc8f0a99b3 Mon Sep 17 00:00:00 2001
From: Florian Franzen <Florian.Franzen@gmail.com>
Date: Thu, 19 Nov 2020 14:35:19 +0100
Subject: [PATCH 2932/3942] texmacs: 1.99.14 -> 1.99.15

---
 pkgs/applications/editors/texmacs/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index 32892c7c26e7..9c37d00c9ee1 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, callPackage, fetchurl, fetchpatch,
+{ lib, mkDerivation, callPackage, fetchFromGitHub,
   guile_1_8, qtbase, xmodmap, which, freetype,
   libjpeg,
   sqlite,
@@ -16,7 +16,7 @@
 
 let
   pname = "TeXmacs";
-  version = "1.99.14";
+  version = "1.99.15";
   common = callPackage ./common.nix {
     inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
   };
@@ -24,9 +24,11 @@ in
 mkDerivation {
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
-    sha256 = "1zbl1ddhppgnn3j213jl1b9mn8zmwnknxiqswm25p4llj0mqcgna";
+  src = fetchFromGitHub {
+    owner = "texmacs";
+    repo = "texmacs";
+    rev = "v${version}";
+    sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105";
   };
 
   enableParallelBuilding = true;

From 2f1d8550bbc5e6a8227c21a553c52f3fcf456090 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Nov 2020 08:56:37 -0500
Subject: [PATCH 2933/3942] linux: 4.14.206 -> 4.14.207

---
 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 99f20985cddd..2ab56a3c9302 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.206";
+  version = "4.14.207";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "1b46f0s15xnlam43cmw8w41rrvcwrhm6km0278lq6f86lpx3w8qw";
+    sha256 = "0a804hwh7cwbdd2gnr5n9i32b4s6gppd8iqihah4sn4q1nbm79vq";
   };
 } // (args.argsOverride or {}))

From 7486ce6765cdbde454159ef6194d5aba8ac7e9f6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Nov 2020 08:56:49 -0500
Subject: [PATCH 2934/3942] linux: 4.19.157 -> 4.19.158

---
 pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 6458f02da664..1d3a837b1f14 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.157";
+  version = "4.19.158";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0mgpgv2ny49bb7kgaygy2ay6ckjgw7mg091viivi66jw4mjs7p3n";
+    sha256 = "0p5pim9izcscnk1a1kdlxbvyvxnnq9lqr1kwl86kfskr7yqy8n6n";
   };
 } // (args.argsOverride or {}))

From 6cad3d1cf3e113fcb95a929808222bf89e223f07 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Nov 2020 08:56:58 -0500
Subject: [PATCH 2935/3942] linux: 4.4.243 -> 4.4.244

---
 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 ad34346b9139..67a5fcd341b7 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, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.243";
+  version = "4.4.244";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1daqbmj9ka9wdkkym625hqwqaxq5n11y7c4yc9ln3xkjpnv4dplm";
+    sha256 = "0brdj6z7flchig80ja0dhzcrpl743lh74s4r4r6prbgkksif9ahp";
   };
 } // (args.argsOverride or {}))

From 695ac805afaf759adf118df72414b8242b9b3051 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Nov 2020 08:57:10 -0500
Subject: [PATCH 2936/3942] linux: 4.9.243 -> 4.9.244

---
 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 3682f6fd5ea8..ecedd3dc59f6 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, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.243";
+  version = "4.9.244";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "111rlzx6z4kf8zwxncib96d9wy6qmkbs0cq3dhnybipwlyf1iank";
+    sha256 = "02givxp0y04qma5nlqbpyxdcl7xdb41p3gw7kgj2rmwdanhzaylr";
   };
 } // (args.argsOverride or {}))

From 199efec0a58a5aaa3bd23d6efc05bb4b81cc6047 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Nov 2020 08:57:28 -0500
Subject: [PATCH 2937/3942] linux: 5.4.77 -> 5.4.78

---
 pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 93f7fc599b73..25a5c05d8387 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.77";
+  version = "5.4.78";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1xyvml0mps7bsa11bgpa4l0w8x6pasdz9yab2z4ds394f1lkxq53";
+    sha256 = "0z8skj0w9jfrz9pfxaqfzqh82l13bz5lhza2wjsxk02cyhhnm226";
   };
 } // (args.argsOverride or {}))

From 6eb958ae76559fe70483ce81da9db0e4aa2f3be9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Nov 2020 08:57:36 -0500
Subject: [PATCH 2938/3942] linux: 5.9.8 -> 5.9.9

---
 pkgs/os-specific/linux/kernel/linux-5.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix
index 0f8143114756..95bb00a01427 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.9.8";
+  version = "5.9.9";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "19l67gzk97higd2cbggipcb0wi21pv0ag0mc4qh6cqk564xp6mkn";
+    sha256 = "1b8zysy0br131ydhc7ycxhh8d88r44xrmkf2q2lffy0jmy3d60m3";
   };
 } // (args.argsOverride or {}))

From 6f4bd3959f1a78219134f405ee3b429af655a8ff Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Nov 2020 08:57:53 -0500
Subject: [PATCH 2939/3942] linux_latest-libre: 17762 -> 17768

---
 pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index a6ef21fe917f..f0d362b02ce0 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "17762";
-    sha256 = "1fj77j9x20w8xwk2xmga625dv81c145gj01z8yxz8i3x2cxwccrs";
+    rev = "17768";
+    sha256 = "0j85bjxylvl88xzf3nji1xadz3ws1kfbyhbn47haipigncvccndj";
   }
 , ...
 }:

From caebe2fa9ad4626d8b7180b8f0e8565cec3e43ea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 14:10:52 +0000
Subject: [PATCH 2940/3942] python27Packages.asciimatics: 1.11.0 -> 1.12.0

---
 pkgs/development/python-modules/asciimatics/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix
index 09bf4e6a3da2..7fcf67687929 100644
--- a/pkgs/development/python-modules/asciimatics/default.nix
+++ b/pkgs/development/python-modules/asciimatics/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "asciimatics";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "132y3gc0dj9vmgajmzz2fyc3icrrgsvynwfl0g31bylm7h9p220x";
+    sha256 = "4120461a3fb345638dee4fe0f8a3d3f9b6d2d2e003f95c5f914523f94463158d";
   };
 
   nativeBuildInputs = [

From a296b76d025fcd23eb4a133f439b4440f1234888 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 19 Nov 2020 15:15:00 +0100
Subject: [PATCH 2941/3942] python3Packages.zigpy-zigate: 0.6.2 -> 0.7.2

The src hash update was missing in d480d9336d56385a3c6cd5cda74c4473469b3dd3.
---
 pkgs/development/python-modules/zigpy-zigate/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index b1f881fd2aa3..e07451c26334 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -4,6 +4,7 @@
 , fetchFromGitHub
 , pyserial
 , pyserial-asyncio
+, pyusb
 , pytest-asyncio
 , pytestCheckHook
 , pythonOlder
@@ -21,12 +22,13 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy-zigate";
     rev = "v${version}";
-    sha256 = "EV6DV+BytUcPMtzYVKDnq/Uv2efg3stjL5uVlL62II4=";
+    sha256 = "0ycrsmp3n3awiyj0gbq6xnaa2s9mpc5l7mlmfc00rfnx7rr2z4ha";
   };
 
   buildInputs = [
     pyserial
     pyserial-asyncio
+    pyusb
     zigpy
   ];
 

From 3340d4f057fa107bc603023a46fd4b129a8ea48a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 14:22:47 +0000
Subject: [PATCH 2942/3942] poedit: 2.4.1 -> 2.4.2

---
 pkgs/tools/text/poedit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index 05241033c6af..0fb17713e373 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "poedit";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchurl {
     url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz";
-    sha256 = "0pvd903j2x3h9wh38fhlcn23d0jkjlqnfbdpbvnbhy6al1ngx72w";
+    sha256 = "1kry3xphrdccx8znfm9pw5872c5w0ri7cknlad4qcps54b25nnzk";
   };
 
   nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook 

From 6d930a657dbe489ef6b0c37d5e2e72858b9d3fe8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 15:05:27 +0000
Subject: [PATCH 2943/3942] php73Packages.composer2: 2.0.4 -> 2.0.7

---
 pkgs/development/php-packages/composer/2.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/composer/2.0.nix b/pkgs/development/php-packages/composer/2.0.nix
index 858884628d3e..c3bd63de7faa 100644
--- a/pkgs/development/php-packages/composer/2.0.nix
+++ b/pkgs/development/php-packages/composer/2.0.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "composer";
-  version = "2.0.4";
+  version = "2.0.7";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://getcomposer.org/download/${version}/composer.phar";
-    sha256 = "03bnaifywh8pmpzl0b8r3rm3radj0rz176vzkz327j99fi3vrcn3";
+    sha256 = "1sgbawai2jwriyfdlc7xp0qz535hd61xcbsnqiaxwp0xmy60w1ha";
   };
 
   dontUnpack = true;

From ad97250bb7fb2bef9fe683e38f9d01cfc1358864 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 15:25:26 +0000
Subject: [PATCH 2944/3942] projectm: 3.1.7 -> 3.1.8

---
 pkgs/applications/audio/projectm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix
index d55b79ece595..845435be60eb 100644
--- a/pkgs/applications/audio/projectm/default.nix
+++ b/pkgs/applications/audio/projectm/default.nix
@@ -13,13 +13,13 @@
 
 mkDerivation rec {
   pname = "projectm";
-  version = "3.1.7";
+  version = "3.1.8";
 
   src = fetchFromGitHub {
     owner = "projectM-visualizer";
     repo = "projectM";
     rev = "v${version}";
-    sha256 = "1wm5fym6c1yb972pmil7j9axinqqwrj68cwd2sc7ky8c5z2fsdna";
+    sha256 = "17zyxj1q0zj17jskq8w9bn2ijn34ldvdq61wy01yf5wgngax2r4z";
   };
 
   nativeBuildInputs = [

From 4718ba1ab10d109e2383854c5c56c2c2340c00c1 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 19 Nov 2020 15:13:31 +0100
Subject: [PATCH 2945/3942] =?UTF-8?q?ocamlPackages.ca-certs:=200.1.2=20?=
 =?UTF-8?q?=E2=86=92=200.1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/ca-certs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix
index 136187e9d3c4..65b411c52d52 100644
--- a/pkgs/development/ocaml-modules/ca-certs/default.nix
+++ b/pkgs/development/ocaml-modules/ca-certs/default.nix
@@ -1,21 +1,21 @@
 { lib, buildDunePackage, fetchurl
-, bos, fpath, rresult, ptime, mirage-crypto, x509
+, bos, fpath, rresult, ptime, mirage-crypto, x509, astring, logs
 }:
 
 buildDunePackage rec {
   pname = "ca-certs";
-  version = "0.1.2";
+  version = "0.1.3";
 
   minimumOCamlVersion = "4.07";
 
   src = fetchurl {
     url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz";
-    sha256 = "10bbqbrsqcmslz56zc5407knalh3kqypbm7lblnzzbidbapa9wpz";
+    sha256 = "0jpghxjp2n8wx6ig0d2x87ycaql6mb92w8ai3xh3jb288m7g02zn";
   };
 
   useDune2 = true;
 
-  propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 ];
+  propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 astring logs ];
 
   # tests need access to network and systemwide ca cert chain
   doCheck = false;

From 859cf9822e2590a20eee00a846623cd5e2dc2cdb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 15:52:38 +0000
Subject: [PATCH 2946/3942] php73Packages.phpstan: 0.12.52 -> 0.12.55

---
 pkgs/development/php-packages/phpstan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index ddc8516742a1..411c6353ea7f 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, pkgs, lib, php }:
 let
   pname = "phpstan";
-  version = "0.12.52";
+  version = "0.12.55";
 in
 mkDerivation {
   inherit pname version;
 
   src = pkgs.fetchurl {
     url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
-    sha256 = "0zhbpcja7fyhqi2p8mky7v3dv50dgi4yxpj2hvmxs61kp9irf0nb";
+    sha256 = "1qyywsivfal1d8485v2iyg5x3f9krnviv5nidgfv53ywrm9k4lgp";
   };
 
   phases = [ "installPhase" ];

From e9a59fe898dc13aa652348ba3adbf67079540010 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 15:59:37 +0000
Subject: [PATCH 2947/3942] python27Packages.asana: 0.8.2 -> 0.10.3

---
 pkgs/development/python-modules/asana/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix
index 7c08cf1acbbc..71c003ef9b0a 100644
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "asana";
-  version = "0.8.2";
+  version = "0.10.3";
 
   # upstream reportedly doesn't support 3.7 yet, blocked on
   # https://bugs.python.org/issue34226
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     owner = "asana";
     repo = "python-asana";
     rev = "v${version}";
-    sha256 = "113zwnrpim1pdw8dzid2wpp5gzr2zk26jjl4wrwhgj0xk1cw94yi";
+    sha256 = "11nsfygcfpc2qb2gy4npi9w00cqfh88g7k3rsfq7xambz1zjdz1n";
   };
 
   checkInputs = [ pytest responses ];

From 1027c0635dcb2d09e42bc1df710b2bc208fabe91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Thu, 19 Nov 2020 17:13:38 +0100
Subject: [PATCH 2948/3942] asterisk: Bump all packages

---
 pkgs/servers/asterisk/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index aa4b2a64150e..9a393cdeb009 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -98,15 +98,15 @@ in rec {
   # Series  Type       Rel. Date   Sec. Fixes  EOL
   # 13.x    LTS        2014-10-24  2020-10-24  2021-10-24
   # 16.x    LTS        2018-10-09  2022-10-09  2023-10-09
+  # 17.x    Standard   2019-10-28  2020-10-28  2021-10-28
   # 18.x    LTS        2020-10-20  2024-10-20  2025-10-20
   asterisk-lts = asterisk_18;
-  # 17.x    Standard   2019-10-28  2020-10-28  2021-10-28
   asterisk-stable = asterisk_18;
   asterisk = asterisk_18;
 
   asterisk_13 = common {
-    version = "13.37.1";
-    sha256 = "1zc3104zw4y7i8bhhgrgy3snq0zr1904p64ykfc3ldh4xyfy3ld6";
+    version = "13.38.0";
+    sha256 = "1kxff6pbry8nydkspi0mqllidz2lw3d3g3r127x8jwgx021x0rik";
     externals = {
       "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
       "addons/mp3" = mp3-202;
@@ -114,8 +114,8 @@ in rec {
   };
 
   asterisk_16 = common {
-    version = "16.14.1";
-    sha256 = "1lhh3npyy8hvy29jwjgapnxfjv1ahp2qdi4iq1d6a61ffhd20vfs";
+    version = "16.15.0";
+    sha256 = "12nc7ywm6w1xyn720kdc1sqz5wkjjrkxr25wisl02f4v5wz8py7m";
     externals = {
       "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
       "addons/mp3" = mp3-202;
@@ -123,8 +123,8 @@ in rec {
   };
 
   asterisk_17 = common {
-    version = "17.8.1";
-    sha256 = "0m7gw01kpvsc0f9lb1hiq5b4g1fdh4gdfyxlqxp6m37vgxh2a48p";
+    version = "17.9.0";
+    sha256 = "1fnm1z7g45m883ivkm36r4kqb7163bzazi70mwf0fc2rc28jd1z4";
     externals = {
       "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
       "addons/mp3" = mp3-202;
@@ -132,8 +132,8 @@ in rec {
   };
 
   asterisk_18 = common {
-    version = "18.0.1";
-    sha256 = "1kyly10pk7bpfqg3mjbvb8p795fnj9lvd29yp2xsxwgsqi1dn9p8";
+    version = "18.1.0";
+    sha256 = "1pq2nrf60xnvh2h1rv82bdfbxxxd277g68xas0vbfgr4531gc4nc";
     externals = {
       "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
       "addons/mp3" = mp3-202;

From 47ee51869f3f0058d16f49b540415d201f04f19e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 16:14:56 +0000
Subject: [PATCH 2949/3942] postfix: 3.5.7 -> 3.5.8

---
 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 a4346bdbd2b1..694d7044b8a2 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
 
   pname = "postfix";
 
-  version = "3.5.7";
+  version = "3.5.8";
 
   src = fetchurl {
     url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
-    sha256 = "0q89iwan5yd84yrzdv3sqg1zanmw56bl2f5gyv5wfg8m9vqp995p";
+    sha256 = "0vs50z5p5xcrdbbkb0dnbx1sk5fx8d2z97sw2p2iip1yrwl2cn12";
   };
 
   nativeBuildInputs = [ makeWrapper m4 ];

From 330d4680022c92d8893f926624e51480c9e254ee Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 18 Nov 2020 14:13:05 -0500
Subject: [PATCH 2950/3942] python: Use packages from previous stage in
 setup-hooks

This makes sense as these are tools we want to run at build time.
---
 pkgs/development/interpreters/python/hooks/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
index d14eb9cbb09d..456aea4c5d8c 100644
--- a/pkgs/development/interpreters/python/hooks/default.nix
+++ b/pkgs/development/interpreters/python/hooks/default.nix
@@ -1,7 +1,6 @@
 # Hooks for building Python packages.
 { python
 , lib
-, callPackage
 , makeSetupHook
 , disabledIf
 , isPy3k
@@ -9,6 +8,7 @@
 }:
 
 let
+  callPackage = python.pythonForBuild.pkgs.callPackage;
   pythonInterpreter = python.pythonForBuild.interpreter;
   pythonSitePackages = python.sitePackages;
   pythonCheckInterpreter = python.interpreter;

From b57c5d44569e236edbc142c0f95772fca2bb6dad Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 18 Nov 2020 12:13:11 -0500
Subject: [PATCH 2951/3942] python: Use `makeScopeWithSplicing`

Now non-`buildInputs` that are python packages should be resolved
correctly.
---
 .../python/cpython/2.7/default.nix            | 11 ++-
 .../interpreters/python/cpython/default.nix   | 12 +++-
 .../interpreters/python/default.nix           | 70 +++++++++++++++++--
 .../interpreters/python/pypy/default.nix      |  8 ++-
 pkgs/top-level/python-packages.nix            | 13 ++--
 5 files changed, 95 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 2cfaa69a4c8b..26bd8a8f3609 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -19,6 +19,10 @@
 # For the Python package set
 , packageOverrides ? (self: super: {})
 , buildPackages
+, pkgsBuildBuild
+, pkgsBuildTarget
+, pkgsHostHost
+, pkgsTargetTarget
 , sourceVersion
 , sha256
 , passthruFun
@@ -35,7 +39,8 @@ with stdenv.lib;
 
 let
 
-  pythonForBuild = buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"};
+  pythonAttr = "python${sourceVersion.major}${sourceVersion.minor}";
+  pythonForBuild = buildPackages.${pythonAttr};
 
   passthru = passthruFun rec {
     inherit self sourceVersion packageOverrides;
@@ -45,6 +50,10 @@ let
     pythonVersion = with sourceVersion; "${major}.${minor}";
     sitePackages = "lib/${libPrefix}/site-packages";
     inherit hasDistutilsCxxPatch pythonForBuild;
+    pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
+    pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
+    pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
+    pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
   } // {
     inherit ucsEncoding;
   };
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 77512c02d555..02777063a772 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -20,7 +20,11 @@
 # For the Python package set
 , packageOverrides ? (self: super: {})
 , buildPackages
-, pythonForBuild ? buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"}
+, pkgsBuildBuild
+, pkgsBuildTarget
+, pkgsHostHost
+, pkgsTargetTarget
+, pythonForBuild ? buildPackages.${pythonAttr}
 , sourceVersion
 , sha256
 , passthruFun
@@ -36,6 +40,7 @@
 # Not using optimizations on Darwin
 # configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found.
 , enableOptimizations ? (!stdenv.isDarwin)
+, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
 }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
@@ -54,6 +59,7 @@ with stdenv.lib;
 
 let
 
+
   passthru = passthruFun rec {
     inherit self sourceVersion packageOverrides;
     implementation = "cpython";
@@ -62,6 +68,10 @@ let
     pythonVersion = with sourceVersion; "${major}.${minor}";
     sitePackages = "lib/${libPrefix}/site-packages";
     inherit hasDistutilsCxxPatch pythonForBuild;
+    pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
+    pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
+    pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
+    pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
   };
 
   version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index ae666d44f57b..19a7f44de369 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -14,13 +14,70 @@ with pkgs;
     , packageOverrides
     , sitePackages
     , hasDistutilsCxxPatch
-    , pythonForBuild
-    , self
+    , pythonPackagesBuildBuild
+    , pythonForBuild # provides pythonPackagesBuildHost
+    , pythonPackagesBuildTarget
+    , pythonPackagesHostHost
+    , self # is pythonPackagesHostTarget
+    , pythonPackagesTargetTarget
     }: let
-      pythonPackages = callPackage ../../../top-level/python-packages.nix {
-        python = self;
-        overrides = packageOverrides;
-      };
+      pythonPackages = callPackage
+        ({ pkgs, stdenv, python, overrides }: let
+          pythonPackagesFun = import ../../../top-level/python-packages.nix {
+            inherit stdenv pkgs;
+            python = self;
+          };
+          otherSplices = {
+            selfBuildBuild = pythonPackagesBuildBuild;
+            selfBuildHost = pythonForBuild.pkgs;
+            selfBuildTarget = pythonPackagesBuildTarget;
+            selfHostHost = pythonPackagesHostHost;
+            selfTargetTarget = pythonPackagesTargetTarget;
+          };
+          keep = self: {
+            # TODO maybe only define these here so nothing is needed to be kept in sync.
+            inherit (self)
+              isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder
+              python bootstrapped-pip buildPythonPackage buildPythonApplication
+              fetchPypi
+              hasPythonModule requiredPythonModules makePythonPath disabledIf
+              toPythonModule toPythonApplication
+              buildSetupcfg
+
+              eggUnpackHook
+              eggBuildHook
+              eggInstallHook
+              flitBuildHook
+              pipBuildHook
+              pipInstallHook
+              pytestCheckHook
+              pythonCatchConflictsHook
+              pythonImportsCheckHook
+              pythonNamespacesHook
+              pythonRecompileBytecodeHook
+              pythonRemoveBinBytecodeHook
+              pythonRemoveTestsDirHook
+              setuptoolsBuildHook
+              setuptoolsCheckHook
+              venvShellHook
+              wheelUnpackHook
+
+              wrapPython
+
+              pythonPackages
+
+              recursivePthLoader
+            ;
+          };
+        in lib.makeScopeWithSplicing
+          pkgs.splicePackages
+          pkgs.newScope
+          otherSplices
+          keep
+          (lib.extends overrides pythonPackagesFun))
+        {
+          overrides = packageOverrides;
+        };
     in rec {
         isPy27 = pythonVersion == "2.7";
         isPy35 = pythonVersion == "3.5";
@@ -48,7 +105,6 @@ with pkgs;
           python = self;
         };
   };
-
 in {
 
   python27 = callPackage ./cpython/2.7 {
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 482ba5df54ce..0647ce878642 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -22,9 +22,15 @@ let
     implementation = "pypy";
     libPrefix = "pypy${pythonVersion}";
     executable = "pypy${if isPy3k then "3" else ""}";
-    pythonForBuild = self; # No cross-compiling for now.
     sitePackages = "site-packages";
     hasDistutilsCxxPatch = false;
+
+    # No cross-compiling for now.
+    pythonForBuild = self;
+    pythonPackagesBuildBuild = {};
+    pythonPackagesBuildTarget = {};
+    pythonPackagesHostHost = {};
+    pythonPackagesTargetTarget = {};
   };
   pname = passthru.executable;
   version = with sourceVersion; "${major}.${minor}.${patch}";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ae79ca29f696..909cd5cfe0aa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9,19 +9,16 @@
 { pkgs
 , stdenv
 , python
-, overrides ? (self: super: {})
 }:
 
 with pkgs.lib;
 
-let
-  packages = ( self:
+self:
 
 let
+  inherit (self) callPackage;
   inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
 
-  callPackage = pkgs.newScope self;
-
   namePrefix = python.libPrefix + "-";
 
   bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { };
@@ -102,7 +99,7 @@ in {
 
   inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
   inherit python bootstrapped-pip buildPythonPackage buildPythonApplication;
-  inherit fetchPypi callPackage;
+  inherit fetchPypi;
   inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;
   inherit toPythonModule toPythonApplication;
   inherit buildSetupcfg;
@@ -7960,6 +7957,4 @@ in {
 
   zxcvbn = callPackage ../development/python-modules/zxcvbn { };
 
-});
-
-in fix' (extends overrides packages)
+}

From 8a3b33baed9458a0af56a710b535bedf6d6c2598 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 19 Nov 2020 15:03:44 +0100
Subject: [PATCH 2952/3942] dockerTools: Set correct architecture when cross
 compiling

---
 pkgs/build-support/docker/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index b072c291f77f..e4e8f794bc4c 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -31,6 +31,7 @@
   writeScript,
   writeText,
   writePython3,
+  system,  # Note: This is the cross system we're compiling for
 }:
 
 # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future.
@@ -56,6 +57,16 @@ let
     done;
   '';
 
+  # Map nixpkgs architecture to Docker notation
+  # Reference: https://github.com/docker-library/official-images#architectures-other-than-amd64
+  getArch = nixSystem: {
+    aarch64-linux = "arm64v8";
+    armv7l-linux = "arm32v7";
+    x86_64-linux = "amd64";
+    powerpc64le-linux = "ppc64le";
+    i686-linux = "i386";
+  }.${nixSystem} or "Can't map Nix system ${nixSystem} to Docker architecture notation. Please check that your input and your requested build are correct or update the mapping in Nixpkgs.";
+
 in
 rec {
 
@@ -72,7 +83,7 @@ rec {
     , imageDigest
     , sha256
     , os ? "linux"
-    , arch ? buildPackages.go.GOARCH
+    , arch ? getArch system
 
       # This is used to set name to the pulled image
     , finalImageName ? imageName
@@ -488,7 +499,7 @@ rec {
       baseJson = let
           pure = writeText "${baseName}-config.json" (builtins.toJSON {
             inherit created config;
-            architecture = buildPackages.go.GOARCH;
+            architecture = getArch system;
             os = "linux";
           });
           impure = runCommand "${baseName}-config.json"
@@ -715,7 +726,7 @@ rec {
       streamScript = writePython3 "stream" {} ./stream_layered_image.py;
       baseJson = writeText "${name}-base.json" (builtins.toJSON {
          inherit config;
-         architecture = buildPackages.go.GOARCH;
+         architecture = getArch system;
          os = "linux";
       });
 

From 5357abf49a9c19de84ec5333fcd07a10c05585cc Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 19 Nov 2020 17:31:38 +0100
Subject: [PATCH 2953/3942] dockerTools: Add cross example

---
 pkgs/build-support/docker/examples.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 4a611add8a12..cd91c721241b 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -7,7 +7,7 @@
 #  $ nix-build '<nixpkgs>' -A dockerTools.examples.redis
 #  $ docker load < result
 
-{ pkgs, buildImage, pullImage, shadowSetup, buildImageWithNixDb }:
+{ pkgs, buildImage, pullImage, shadowSetup, buildImageWithNixDb, pkgsCross }:
 
 rec {
   # 1. basic example
@@ -407,4 +407,11 @@ rec {
       contents = [ pkgs.bash pkgs.coreutils ] ++ nonRootShadowSetup { uid = 999; user = "somebody"; };
     };
 
+  # basic example, with cross compilation
+  cross-aarch64 = pkgsCross.aarch64-multiplatform.dockerTools.buildImage {
+    name = "hello-cross";
+    tag = "latest";
+    contents = pkgsCross.aarch64-multiplatform.hello;
+  };
+
 }

From 11367b2db107f318c5ca5634a94c85d185f2c498 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 19 Nov 2020 18:12:36 +0100
Subject: [PATCH 2954/3942] dockerTools: Add cross compilation test

---
 nixos/tests/docker-tools.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index c1c41b0fc110..a20a08fc90db 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -234,5 +234,17 @@ import ./make-test-python.nix ({ pkgs, ... }: {
             "docker run --rm file-in-store nix-store --verify --check-contents",
             "docker run --rm file-in-store |& grep 'some data'",
         )
+
+    with subtest("Ensure cross compiled image can be loaded and has correct arch."):
+        docker.succeed(
+            "docker load --input='${pkgs.dockerTools.examples.cross-aarch64}'",
+        )
+        assert (
+            docker.succeed(
+                "docker inspect ${pkgs.dockerTools.examples.cross-aarch64.imageName} "
+                + "| ${pkgs.jq}/bin/jq -r .[].Architecture"
+            ).strip()
+            == "arm64v8"
+        )
   '';
 })

From 3a6f097fb82faa6cb29c1beff2129f2bc59ce2e3 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Thu, 19 Nov 2020 18:23:19 +0100
Subject: [PATCH 2955/3942] mlterm: fetch from GitHub instead of Sourceforge

---
 .../applications/terminal-emulators/mlterm/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index e3e8fcd32a5d..9c01430d6dfc 100644
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, autoconf, makeDesktopItem
+{ stdenv, lib, fetchFromGitHub, pkgconfig, autoconf, makeDesktopItem
 , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte
 , harfbuzz #substituting glyphs with opentype fonts
 , fribidi, m17n_lib #bidi and encoding
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
   pname = "mlterm";
   version = "3.9.1";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "03fnynwv7d1aicwk2rp31sgncv5m65agvygqvsgn59v9di40gnnb";
+  src = fetchFromGitHub {
+    owner = "arakiken";
+    repo = pname;
+    rev = "rel-${lib.replaceStrings [ "." ] [ "_" ] version}"; # 3.9.1 -> rel-3_9_1
+    sha256 = "1hh196kz2n3asv8r8r2bdk5b2w93zq7rw4880ciiq1554h0ib7fj";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ];

From 96a4eba4ce51308a4b47c9c060b9cccbb982bea8 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Wed, 18 Nov 2020 00:58:42 -0800
Subject: [PATCH 2956/3942] pythonPackages.psycopg2: document pypy
 incompatibility

---
 pkgs/development/python-modules/psycopg2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index 604431612a09..4e0a2771e9a8 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -4,6 +4,8 @@ buildPythonPackage rec {
   pname = "psycopg2";
   version = "2.8.6";
 
+  # Extension modules don't work well with PyPy. Use psycopg2cffi instead.
+  # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892
   disabled = isPyPy;
 
   src = fetchPypi {

From 83ea88e03fe2775601636c5f578b63276910a538 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 18 Nov 2020 11:56:15 -0500
Subject: [PATCH 2957/3942] nixos: ec2 ami: support IMDSv2

AWS's metadata service has two versions. Version 1 allowed plain HTTP
requests to get metadata. However, this was frequently abused when a
user could trick an AWS-hosted server in to proxying requests to the
metadata service. Since the metadata service is frequently used to
generate AWS access keys, this is pretty gnarly. Version two is
identical except it requires the caller to request a token and provide
it on each request.

Today, starting a NixOS AMI in EC2 where the metadata service is
configured to only allow v2 requests fails: the user's SSH key is not
placed, and configuration provided by the user-data is not applied.
The server is useless. This patch addresses that.

Note the dependency on curl is not a joyful one, and it expand the
initrd by 30M. However, see the added comment for more information
about why this is needed. Note the idea of using `echo` and `nc` are
laughable. Don't do that.
---
 nixos/modules/virtualisation/amazon-image.nix |  1 +
 .../virtualisation/ec2-metadata-fetcher.nix   | 45 ++++++++++++++++---
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 44cb60809452..819e93a43e57 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -11,6 +11,7 @@ with lib;
 let
   cfg = config.ec2;
   metadataFetcher = import ./ec2-metadata-fetcher.nix {
+    inherit (pkgs) curl;
     targetRoot = "$targetRoot/";
     wgetExtraOptions = "-q";
   };
diff --git a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
index b531787c31a2..247bcf513c51 100644
--- a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
+++ b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
@@ -1,23 +1,58 @@
-{ targetRoot, wgetExtraOptions }:
+{ curl, targetRoot, wgetExtraOptions }:
+# Note: be very cautious about dependencies, each dependency grows
+# the closure of the initrd. Ideally we would not even require curl,
+# but there is no reasonable way to send an HTTP PUT request without
+# it. Note: do not be fooled: the wget referenced in this script
+# is busybox's wget, not the fully featured one with --method support.
+#
+# Make sure that every package you depend on here is already listed as
+# a channel blocker for both the full-sized and small channels.
+# Otherwise, we risk breaking user deploys in released channels.
 ''
   metaDir=${targetRoot}etc/ec2-metadata
   mkdir -m 0755 -p "$metaDir"
 
+  get_imds_token() {
+    # retry-delay of 1 selected to give the system a second to get going,
+    # but not add a lot to the bootup time
+    ${curl}/bin/curl \
+      -v \
+      --retry 3 \
+      --retry-delay 1 \
+      --fail \
+      -X PUT \
+      --connect-timeout 1 \
+      -H "X-aws-ec2-metadata-token-ttl-seconds: 600" \
+      http://169.254.169.254/latest/api/token
+  }
+
+  try=1
+  while [ $try -le 3 ]; do
+    echo "(attempt $try/3) getting an EC2 instance metadata service v2 token..."
+    IMDS_TOKEN=$(get_imds_token) && break
+    try=$((try + 1))
+    sleep 1
+  done
+
+  if [ "x$IMDS_TOKEN" == "x" ]; then
+    echo "failed to fetch an IMDS2v token."
+  fi
+
   echo "getting EC2 instance metadata..."
 
   if ! [ -e "$metaDir/ami-manifest-path" ]; then
-    wget ${wgetExtraOptions} -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
+    wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
   fi
 
   if ! [ -e "$metaDir/user-data" ]; then
-    wget ${wgetExtraOptions} -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data"
+    wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data"
   fi
 
   if ! [ -e "$metaDir/hostname" ]; then
-    wget ${wgetExtraOptions} -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
+    wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
   fi
 
   if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then
-    wget ${wgetExtraOptions} -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+    wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
   fi
 ''

From 1f402a59b169e1b9b4993ca93ed1d374dad3bd81 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 18:44:02 +0000
Subject: [PATCH 2958/3942] pipenv: 2020.11.4 -> 2020.11.15

---
 pkgs/development/tools/pipenv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix
index f8b800745dc6..2eff05b04ea7 100644
--- a/pkgs/development/tools/pipenv/default.nix
+++ b/pkgs/development/tools/pipenv/default.nix
@@ -18,11 +18,11 @@ let
 
 in buildPythonApplication rec {
   pname = "pipenv";
-  version = "2020.11.4";
+  version = "2020.11.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d6ac39d1721517b23aca12cdb4c726dc318ec4d7bdede5c1220bbb81775005c3";
+    sha256 = "8253fe6f9cfb3791a54da8a0571f73c918cb3457dd908684c1800a13a06ec4c1";
   };
 
   LC_ALL = "en_US.UTF-8";

From f2cfecdec357c1c449aef2884c70b6a4d79b30e3 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 19 Nov 2020 12:59:07 -0500
Subject: [PATCH 2959/3942] nixos ami: preflight the imds token

According to Freenode's ##AWS, the metadata server can sometimes
take a few moments to get its shoes on, and the very first boot
of a machine can see failed requests for a few moments.
---
 .../virtualisation/ec2-metadata-fetcher.nix   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
index 247bcf513c51..812e93ec4aab 100644
--- a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
+++ b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
@@ -26,6 +26,19 @@
       http://169.254.169.254/latest/api/token
   }
 
+  preflight_imds_token() {
+    # retry-delay of 1 selected to give the system a second to get going,
+    # but not add a lot to the bootup time
+    ${curl}/bin/curl \
+      -v \
+      --retry 3 \
+      --retry-delay 1 \
+      --fail \
+      --connect-timeout 1 \
+      -H "X-aws-ec2-metadata-token: $IMDS_TOKEN" \
+      http://169.254.169.254/1.0/meta-data/instance-id
+  }
+
   try=1
   while [ $try -le 3 ]; do
     echo "(attempt $try/3) getting an EC2 instance metadata service v2 token..."
@@ -38,6 +51,14 @@
     echo "failed to fetch an IMDS2v token."
   fi
 
+  try=1
+  while [ $try -le 10 ]; do
+    echo "(attempt $try/10) validating the EC2 instance metadata service v2 token..."
+    preflight_imds_token && break
+    try=$((try + 1))
+    sleep 1
+  done
+
   echo "getting EC2 instance metadata..."
 
   if ! [ -e "$metaDir/ami-manifest-path" ]; then

From 0d87ce610ed934ee0a24ddc73d770f4b9caa5d96 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 18 Nov 2020 18:02:08 -0500
Subject: [PATCH 2960/3942] nixos: release: add amazonImage as a channel
 blocker

---
 nixos/release-combined.nix | 1 +
 nixos/release-small.nix    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index d8b9a5f9b4bc..1ef357463a10 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -49,6 +49,7 @@ in rec {
         [ "nixos.channel" ]
         (onFullSupported "nixos.dummy")
         (onAllSupported "nixos.iso_minimal")
+        (onAllSupported "nixos.amazonImage")
         (onSystems ["x86_64-linux"] "nixos.iso_plasma5")
         (onSystems ["x86_64-linux"] "nixos.iso_gnome")
         (onFullSupported "nixos.manual")
diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 6da2c59cedd4..84bc71752c55 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -92,6 +92,7 @@ in rec {
       [ "nixos.channel"
         "nixos.dummy.x86_64-linux"
         "nixos.iso_minimal.x86_64-linux"
+        "nixos.amazonImage.x86_64-linux"
         "nixos.manual.x86_64-linux"
         "nixos.tests.boot.biosCdrom.x86_64-linux"
         "nixos.tests.containers-imperative.x86_64-linux"

From 635485b85c3ce70c9c42b316477fe6ced65ad197 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 19 Nov 2020 11:25:52 -0800
Subject: [PATCH 2961/3942] mercurial: remove dulwich dependency

---
 pkgs/applications/version-management/mercurial/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index c7a1c4149870..88ce129b449f 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  inherit (python3Packages) docutils dulwich python;
+  inherit (python3Packages) docutils python;
 
 in python3Packages.buildPythonApplication rec {
   pname = "mercurial";
@@ -17,13 +17,11 @@ in python3Packages.buildPythonApplication rec {
 
   format = "other";
 
-  inherit python; # pass it so that the same version can be used in hg2git
+  passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
 
   buildInputs = [ makeWrapper docutils unzip ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ];
 
-  propagatedBuildInputs = [ dulwich ];
-
   makeFlags = [ "PREFIX=$(out)" ];
 
   postInstall = (stdenv.lib.optionalString guiSupport ''

From c81c3c3daff4a96980da2fce2d80a9e57f9db953 Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <tom@codedown.io>
Date: Thu, 19 Nov 2020 12:29:02 -0700
Subject: [PATCH 2962/3942] cling: init at 0.7.0 (#64319)

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
---
 .../interpreters/cling/default.nix            | 102 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 2 files changed, 104 insertions(+)
 create mode 100644 pkgs/development/interpreters/cling/default.nix

diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix
new file mode 100644
index 000000000000..68819fa7ab06
--- /dev/null
+++ b/pkgs/development/interpreters/cling/default.nix
@@ -0,0 +1,102 @@
+{ stdenv
+, python
+, libffi
+, git
+, cmake
+, zlib
+, fetchgit
+, makeWrapper
+, runCommand
+, runCommandNoCC
+, llvmPackages_5
+, glibc
+}:
+
+let
+  unwrapped = stdenv.mkDerivation rec {
+    pname = "cling-unwrapped";
+    version = "0.7";
+
+    src = fetchgit {
+      url = "http://root.cern/git/clang.git";
+      # This commit has the tag cling-0.7 so we use it, even though cpt.py
+      # tries to use refs/tags/cling-patches-rrelease_50
+      rev = "354b25b5d915ff3b1946479ad07f3f2768ea1621";
+      branchName = "cling-patches";
+      sha256 = "0q8q2nnvjx3v59ng0q3qqqhzmzf4pmfqqiy3rz1f3drx5w3lgyjg";
+    };
+
+    clingSrc = fetchgit {
+      url = "http://root.cern/git/cling.git";
+      rev = "70163975eee5a76b45a1ca4016bfafebc9b57e07";
+      sha256 = "1mv2fhk857kp5rq714bq49iv7gy9fgdwibydj5wy1kq2m3sf3ysi";
+    };
+
+    preConfigure = ''
+      echo "add_llvm_external_project(cling)" >> tools/CMakeLists.txt
+      cp -r $clingSrc ./tools/cling
+      chmod -R a+w ./tools/cling
+    '';
+
+    nativeBuildInputs = [ python git cmake ];
+    buildInputs = [ libffi llvmPackages_5.llvm zlib ];
+
+    cmakeFlags = [
+      "-DLLVM_TARGETS_TO_BUILD=host;NVPTX"
+      "-DLLVM_ENABLE_RTTI=ON"
+
+      # Setting -DCLING_INCLUDE_TESTS=ON causes the cling/tools targets to be built;
+      # see cling/tools/CMakeLists.txt
+      "-DCLING_INCLUDE_TESTS=ON"
+    ];
+
+    meta = with stdenv.lib; {
+      description = "The Interactive C++ Interpreter";
+      homepage = "https://root.cern/cling/";
+      license = with licenses; [ lgpl21 ncsa ];
+      maintainers = with maintainers; [ thomasjm ];
+      platforms = platforms.unix;
+    };
+  };
+
+  # The flags passed to the wrapped cling should
+  # a) prevent it from searching for system include files and libs, and
+  # b) provide it with the include files and libs it needs (C and C++ standard library)
+
+  # These are also exposed as cling.flags/cling.compilerIncludeFlags because it's handy to be
+  # able to pass them to tools that wrap Cling, particularly Jupyter kernels such as xeus-cling
+  # and the built-in jupyter-cling-kernel. Both of these use Cling as a library by linking against
+  # libclingJupyter.so, so the makeWrapper approach to wrapping the binary doesn't work.
+  # Thus, if you're packaging a Jupyter kernel, you either need to pass these flags as extra
+  # args to xcpp (for xeus-cling) or put them in the environment variable CLING_OPTS
+  # (for jupyter-cling-kernel)
+  flags = [
+    "-nostdinc"
+    "-nostdinc++"
+    "-isystem" "${glibc.dev}/include"
+    "-I" "${unwrapped}/include"
+    "-I" "${unwrapped}/lib/clang/5.0.2/include"
+  ];
+
+  # Autodetect the include paths for the compiler used to build Cling, in the same way Cling does at
+  # https://github.com/root-project/cling/blob/v0.7/lib/Interpreter/CIFactory.cpp#L107:L111
+  # Note: it would be nice to just put the compiler in Cling's PATH and let it do this by itself, but
+  # unfortunately passing -nostdinc/-nostdinc++ disables Cling's autodetection logic.
+  compilerIncludeFlags = runCommandNoCC "compiler-include-flags.txt" {} ''
+    export LC_ALL=C
+    ${stdenv.cc}/bin/c++ -xc++ -E -v /dev/null 2>&1 | sed -n -e '/^.include/,''${' -e '/^ \/.*++/p' -e '}' > tmp
+    sed -e 's/^/-isystem /' -i tmp
+    tr '\n' ' ' < tmp > $out
+  '';
+
+in
+
+runCommand "cling-${unwrapped.version}" {
+  buildInputs = [ makeWrapper ];
+  inherit unwrapped flags compilerIncludeFlags;
+  inherit (unwrapped) meta;
+} ''
+  makeWrapper $unwrapped/bin/cling $out/bin/cling \
+    --add-flags "$(cat "$compilerIncludeFlags")" \
+    --add-flags "$flags"
+''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c96a8b961a2..0d9893de7fe1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10190,6 +10190,8 @@ in
 
   ceptre = callPackage ../development/interpreters/ceptre { };
 
+  cling = callPackage ../development/interpreters/cling { };
+
   clips = callPackage ../development/interpreters/clips { };
 
   clisp = callPackage ../development/interpreters/clisp { };

From 81d1cea1c0be2d01a0f1382e3365c5a9b20057f1 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 19 Nov 2020 11:29:46 -0800
Subject: [PATCH 2963/3942] mercurial: 5.4.2 -> 5.6

---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 88ce129b449f..e0400fd46c65 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -8,11 +8,11 @@ let
 
 in python3Packages.buildPythonApplication rec {
   pname = "mercurial";
-  version = "5.4.2";
+  version = "5.6";
 
   src = fetchurl {
     url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
-    sha256 = "0ls8nwx3nz26pibphw54fg8pxqb365zmmqx95lqrxqqyf3d972sw";
+    sha256 = "1hk2y30zzdnlv8f71kabvh0xi9c7qhp28ksh20vpd0r712sv79yz";
   };
 
   format = "other";

From 5928d667043949e3532dce3e60b05ad2d2007d51 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 19 Nov 2020 20:30:53 +0100
Subject: [PATCH 2964/3942] microcodeIntel: 20201112 -> 20201118

Fixes a regression on some "OEM platforms".

Relates to #104301
---
 pkgs/os-specific/linux/microcode/intel.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 19487fb70587..50055102dbbe 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "microcode-intel";
-  version = "20201112";
+  version = "20201118";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "Intel-Linux-Processor-Microcode-Data-Files";
     rev = "microcode-${version}";
-    sha256 = "104l3py5z6405wpa2fscqpc5r9dgrf1ckaf27hrswivi32gvp7f2";
+    sha256 = "1xs3f2rbfqnpz9qs7a1kl363qdyb8fybmmyd37v573clqf7l4lgg";
   };
 
   nativeBuildInputs = [ iucode-tool libarchive ];

From a1d06b98cea4c5cfd9b8db7f255758f22eaa6e56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 19:49:01 +0000
Subject: [PATCH 2965/3942] petsc: 3.14.0 -> 3.14.1

---
 pkgs/development/libraries/science/math/petsc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix
index 0946f8f2f66b..608064353ca7 100644
--- a/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/pkgs/development/libraries/science/math/petsc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "petsc";
-  version = "3.14.0";
+  version = "3.14.1";
 
   src = fetchurl {
     url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
-    sha256 = "1hq3igm90bnl44vyjdbkpqmqk7496pakcswzc2vq57l8d27nhdxz";
+    sha256 = "1y3fhg0l69qp9qn6vjyqdhqhhbvsa7jp8g7zcm0pwzm7gkcldqnx";
   };
 
   nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ];

From 4b51d8ae6cd45feffbd8c03e37f86515959b9da6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 19 Nov 2020 21:31:27 +0100
Subject: [PATCH 2966/3942] homeassistant: 0.118.0 -> 0.118.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 52f114bfe7f5..38b8cca170b2 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.118.0";
+  version = "0.118.1";
   components = {
     "abode" = ps: with ps; [ abodepy ];
     "accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index b7350a4efd27..018cf82b961b 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -62,7 +62,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.118.0";
+  hassVersion = "0.118.1";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -78,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    sha256 = "0q3kjsxp82r11gqsnwcw8rnqhgi46214hw84ibw8956w7h75ik5m";
+    sha256 = "1l2jqvq3amwdr4v6xq7df19bf75s1dpgcgnaacsx7k7pfwsyn63f";
   };
 
   # leave this in, so users don't have to constantly update their downstream patch handling

From 82a9f2331cc5e900100d17db48bdca033df392c2 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 8 Nov 2020 20:58:33 -0500
Subject: [PATCH 2967/3942] bind: fix cross-compilation

Upstream accidently broke cross-compilation. It has been fixed but not released
yet, so we temporarily add the patch here.
---
 pkgs/servers/dns/bind/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 16d031d49fea..61ab6f98d21c 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
   patches = [
     ./dont-keep-configure-flags.patch
     ./remove-mkdir-var.patch
+    # Fix cross-compilation (will be included in next release after 9.16.8)
+    (fetchpatch {
+      url = "https://gitlab.isc.org/isc-projects/bind9/-/commit/35ca6df07277adff4df7472a0b01ea5438cdf1ff.patch";
+      sha256 = "1sj0hcd0wgkam7hrbp2vw2yymmni4azr9ixd9shz1l6ja90bdj9h";
+    })
   ];
 
   nativeBuildInputs = [ perl pkg-config ];

From a4c39a624c9658beb96c95fa7947aed988ed7c59 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 14 Nov 2020 15:55:16 -0500
Subject: [PATCH 2968/3942] mailutils: 3.9 -> 3.10

---
 pkgs/tools/networking/mailutils/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index adcd2f1dc131..bc0abf53f517 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -3,13 +3,12 @@
 , python3, gss, libmysqlclient, system-sendmail }:
 
 stdenv.mkDerivation rec {
-  name = "${project}-${version}";
-  project = "mailutils";
-  version = "3.9";
+  pname = "mailutils";
+  version = "3.10";
 
   src = fetchurl {
-    url = "mirror://gnu/${project}/${name}.tar.xz";
-    sha256 = "1g1xf2lal04nsnf1iym9n9n0wxjpqbcr9nysxpm98v4pniinqwsz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "17smrxjdgbbzbzakik30vj46q4iib85ksqhb82jr4vjp57akszh9";
   };
 
   postPatch = ''
@@ -32,6 +31,12 @@ stdenv.mkDerivation rec {
   patches = [
     ./fix-build-mb-len-max.patch
     ./path-to-cat.patch
+    # mailquota.c:277: undefined reference to `get_size'
+    # https://lists.gnu.org/archive/html/bug-mailutils/2020-08/msg00002.html
+    (fetchpatch {
+      url = "http://git.savannah.gnu.org/cgit/mailutils.git/patch/?id=37713b42a501892469234b90454731d8d8b7a3e6";
+      sha256 = "1mwj77nxvf4xvqf26yjs59jyksnizj0lmbymbzg4kmqynzq3zjny";
+    })
   ];
 
   enableParallelBuilding = false;

From f7ec01ab6c91b30cc1df54cd49151e401b3fdcb0 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 14 Nov 2020 16:05:34 -0500
Subject: [PATCH 2969/3942] mailutils: fix cross-compilation

Add a patch that I submitted upstream to fix cross-compilation.
---
 pkgs/tools/networking/mailutils/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index bc0abf53f517..ff7d4176bd2e 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -37,6 +37,12 @@ stdenv.mkDerivation rec {
       url = "http://git.savannah.gnu.org/cgit/mailutils.git/patch/?id=37713b42a501892469234b90454731d8d8b7a3e6";
       sha256 = "1mwj77nxvf4xvqf26yjs59jyksnizj0lmbymbzg4kmqynzq3zjny";
     })
+    # Fix cross-compilation
+    # https://lists.gnu.org/archive/html/bug-mailutils/2020-11/msg00038.html
+    (fetchpatch {
+      url = "https://lists.gnu.org/archive/html/bug-mailutils/2020-11/txtiNjqcNpqOk.txt";
+      sha256 = "0ghzqb8qx2q8cffbvqzw19mivv7r5f16whplzhm7hdj0j2i6xf6s";
+    })
   ];
 
   enableParallelBuilding = false;

From c7928b01cfb124aed8db65ba5f8b83db5039747e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 21:34:01 +0000
Subject: [PATCH 2970/3942] php73Extensions.mongodb: 1.8.1 -> 1.8.2

---
 pkgs/development/php-packages/mongodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix
index 9802242e5b6c..852c3b63c4ed 100644
--- a/pkgs/development/php-packages/mongodb/default.nix
+++ b/pkgs/development/php-packages/mongodb/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "mongodb";
 
-  version = "1.8.1";
-  sha256 = "0xxrll17c7nz146g9gww4cg41xc3qg41n73syb06546q9skqabyl";
+  version = "1.8.2";
+  sha256 = "01l300204ph9nd7khd9qazpdbi1biqvmjqbxbngdfjk9n5d8vvzw";
 
   nativeBuildInputs = [ pkgs.pkgconfig ];
   buildInputs = with pkgs; [

From 48a3cdb957a408803416be413a52c5ce83a2933e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 21:44:56 +0000
Subject: [PATCH 2971/3942] postgresql11Packages.pgroonga: 2.2.6 -> 2.2.7

---
 pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index 2e69444ccdd5..05fc6c5ca6a9 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pgroonga";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchurl {
     url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "0anlxw4j6c3rd7q34j9mgph6i0zb1nff3warcxrkwvnnd1jbb6vr";
+    sha256 = "1rd3cxap9rqpg5y8y48r5bd7rki3lck6qsrb0bqdqm9xffnibw8j";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6825ff7acacd09e66b423cf7cdaf3d95183d0c25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 21:59:51 +0000
Subject: [PATCH 2972/3942] php73Extensions.protobuf: 3.13.0.1 -> 3.14.0

---
 pkgs/development/php-packages/protobuf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix
index f5f0d7ac3ece..10b045897373 100644
--- a/pkgs/development/php-packages/protobuf/default.nix
+++ b/pkgs/development/php-packages/protobuf/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "protobuf";
 
-  version = "3.13.0.1";
-  sha256 = "0vzxwisa8g3xgzcwa5b6cx6nyf41gkm71rxiisnnz1axz4q0hzqf";
+  version = "3.14.0";
+  sha256 = "1ldc4s28hq61cfg8l4c06pgicj0ng7k37f28a0dnnbs7xkr7cibd";
 
   buildInputs = [ pcre' ];
 

From bd36a2da980cb11deb8fbd10b3c25701b6628ddf Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 17 Nov 2020 10:11:18 -0300
Subject: [PATCH 2973/3942] berry: 0.1.5 -> 0.1.7

---
 .../window-managers/berry/default.nix         | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix
index 2a41a3d3c073..367d0214129c 100644
--- a/pkgs/applications/window-managers/berry/default.nix
+++ b/pkgs/applications/window-managers/berry/default.nix
@@ -1,18 +1,30 @@
-{ stdenv, fetchFromGitHub
-, libX11, libXft, libXinerama, fontconfig, freetype }:
+{ stdenv
+, fetchFromGitHub
+, libX11
+, libXft
+, libXinerama
+, fontconfig
+, freetype
+}:
 
 stdenv.mkDerivation rec {
   pname = "berry";
-  version = "0.1.5";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "JLErvin";
-    repo = "berry";
+    repo = pname;
     rev = version;
-    sha256 = "1wxbjzpwqb9x7vd7kb095fiqj271rki980dnwcxjxpqlmmrmjzyl";
+    sha256 = "sha256-2kFVOE5l1KQvDb5KDL7y0p4M7awJLrxJF871cyc0YZ8=";
   };
 
-  buildInputs = [ libX11 libXft libXinerama fontconfig freetype ];
+  buildInputs =[
+    libX11
+    libXft
+    libXinerama
+    fontconfig
+    freetype
+  ];
 
   preBuild = ''
     makeFlagsArray+=( PREFIX="${placeholder "out"}"

From da0c48706a553c01a6f4d672f5d9da5c68250073 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 17 Nov 2020 10:20:02 -0300
Subject: [PATCH 2974/3942] sawfish: cleanup

---
 .../window-managers/sawfish/default.nix       | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix
index f163715456c4..062597745194 100644
--- a/pkgs/applications/window-managers/sawfish/default.nix
+++ b/pkgs/applications/window-managers/sawfish/default.nix
@@ -1,25 +1,32 @@
-{ stdenv, fetchurl
-, pkgconfig, which, autoreconfHook
-, rep-gtk, pango, gdk-pixbuf-xlib
-, imlib, gettext, texinfo
-, libXinerama, libXrandr, libXtst, libICE, libSM
+{ stdenv
+, fetchurl
+, pkg-config
+, which
+, autoreconfHook
+, rep-gtk
+, pango
+, gdk-pixbuf-xlib
+, imlib
+, gettext
+, texinfo
+, libXinerama
+, libXrandr
+, libXtst
+, libICE
+, libSM
 , makeWrapper
 }:
 
-with stdenv.lib;
-
 stdenv.mkDerivation rec {
-
   pname = "sawfish";
   version = "1.12.90";
-  sourceName = "sawfish_${version}";
 
   src = fetchurl {
-    url = "https://download.tuxfamily.org/sawfish/${sourceName}.tar.xz";
+    url = "https://download.tuxfamily.org/sawfish/${pname}_${version}.tar.xz";
     sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ which
     rep-gtk pango gdk-pixbuf-xlib imlib gettext texinfo
     libXinerama libXrandr libXtst libICE libSM
@@ -31,14 +38,15 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about  $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do
+    for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about \
+             $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do
       wrapProgram $i \
         --prefix REP_DL_LOAD_PATH : "$out/lib/rep" \
         --set REP_LOAD_PATH "$out/share/sawfish/lisp"
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An extensible, Lisp-based window manager";
     longDescription = ''
       Sawfish is an extensible window manager using a Lisp-based scripting language.
@@ -47,7 +55,7 @@ stdenv.mkDerivation rec {
       All high-level WM functions are implemented in Lisp for future extensibility
       or redefinition.
     '';
-    homepage = "http://sawfish.wikia.com";
+    homepage = "https://sawfish.fandom.com/wiki/Main_Page";
     license = licenses.gpl2;
     maintainers = [ maintainers.AndersonTorres ];
   };

From c56cde86ca3b6faebf59a147a682ccadb67aca1b Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Thu, 19 Nov 2020 13:25:47 -0300
Subject: [PATCH 2975/3942] 1oom: init at 1.0

---
 pkgs/games/1oom/default.nix     | 32 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/games/1oom/default.nix

diff --git a/pkgs/games/1oom/default.nix b/pkgs/games/1oom/default.nix
new file mode 100644
index 000000000000..70c21a3cc1d8
--- /dev/null
+++ b/pkgs/games/1oom/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitLab, autoreconfHook, libsamplerate, SDL2, SDL2_mixer, readline }:
+
+stdenv.mkDerivation rec {
+  pname = "1oom";
+  version = "1.0";
+
+  src = fetchFromGitLab {
+    owner = "KilgoreTroutMaskReplicant";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-+HwSykSyAGHtITVOu4nIG87kWwVxGyFXb/NRSjhWlvs=";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ libsamplerate SDL2 SDL2_mixer readline ];
+
+  outputs = [ "out" "doc" ];
+
+  postInstall = ''
+    install -d $doc/share/doc/${pname}
+    install -t $doc/share/doc/${pname} \
+      HACKING NEWS PHILOSOPHY README doc/*.txt
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://kilgoretroutmaskreplicant.gitlab.io/plain-html/";
+    description = "Master of Orion (1993) game engine recreation";
+    license = licenses.gpl2Only;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2efe9633b92..93e3ef95c2e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25043,6 +25043,8 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
   ### GAMES
 
+  _1oom = callPackage ../games/1oom { };
+
   _2048-in-terminal = callPackage ../games/2048-in-terminal { };
 
   _20kly = callPackage ../games/20kly { };

From 248be693b30f4cd20f50975b694a247e33e8aad4 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 19 Nov 2020 21:54:19 +0100
Subject: [PATCH 2976/3942] m/x32edit: 3.2 -> 4.1

---
 pkgs/applications/audio/midas/generic.nix | 4 ++--
 pkgs/applications/audio/midas/m32edit.nix | 9 +++++----
 pkgs/applications/audio/midas/x32edit.nix | 9 +++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix
index 293d1b0b6c82..769593919d46 100644
--- a/pkgs/applications/audio/midas/generic.nix
+++ b/pkgs/applications/audio/midas/generic.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, lib, libX11, libXext, alsaLib, freetype, brand, type, version, homepage, sha256, ... }:
+{ stdenv, fetchurl, lib, libX11, libXext, alsaLib, freetype, brand, type, version, homepage, url, sha256, ... }:
 stdenv.mkDerivation rec {
   inherit type;
   baseName = "${type}-Edit";
   name = "${lib.toLower baseName}-${version}";
 
   src = fetchurl {
-    url = "http://downloads.music-group.com/software/behringer/${type}/${type}-Edit_LINUX_64bit_${version}.tar.gz";
+    inherit url;
     inherit sha256;
   };
 
diff --git a/pkgs/applications/audio/midas/m32edit.nix b/pkgs/applications/audio/midas/m32edit.nix
index 6af11d42e31f..082da1621be3 100644
--- a/pkgs/applications/audio/midas/m32edit.nix
+++ b/pkgs/applications/audio/midas/m32edit.nix
@@ -1,9 +1,10 @@
 { callPackage, ... } @ args:
 
-callPackage ./generic.nix (args // {
+callPackage ./generic.nix (args // rec {
   brand = "Midas";
   type = "M32";
-  version = "3.2";
-  sha256 = "1cds6qinz37086l6pmmgrzrxadygjr2z96sjjyznnai2wz4z2nrd";
-  homepage = "http://www.musictri.be/Categories/Midas/Mixers/Digital/M32/p/P0B3I/downloads";
+  version = "4.1";
+  url = "https://mediadl.musictribe.com/download/software/midas_${type}/${type}-Edit_LINUX_64-Bit_${version}.tar.gz";
+  sha256 = "0aqhdrxqa49liyvbbw5x32kwk0h1spzvmizmdxklrfs64vvr9bvh";
+  homepage = "https://midasconsoles.com/midas/product?modelCode=P0B3I";
 })
diff --git a/pkgs/applications/audio/midas/x32edit.nix b/pkgs/applications/audio/midas/x32edit.nix
index 7e364ff984a5..a07c83a9dfe4 100644
--- a/pkgs/applications/audio/midas/x32edit.nix
+++ b/pkgs/applications/audio/midas/x32edit.nix
@@ -1,9 +1,10 @@
 { callPackage, ... } @ args:
 
-callPackage ./generic.nix (args // {
+callPackage ./generic.nix (args // rec {
   brand = "Behringer";
   type = "X32";
-  version = "3.2";
-  sha256 = "1lzmhd0sqnlzc0khpwm82sfi48qhv7rg153a57qjih7hhhy41mzk";
-  homepage = "http://www.musictri.be/Categories/Behringer/Mixers/Digital/X32/p/P0ASF/downloads";
+  version = "4.1";
+  url = "https://mediadl.musictribe.com/download/software/behringer/${type}/${type}-Edit_LINUX_64-Bit_${version}.tar.gz";
+  sha256 = "0zsw7qfmcci87skkpq8vx5zxk35phn8y4byispvki9ascifnnb33";
+  homepage = "https://www.behringer.com/behringer/product?modelCode=P0ASF";
 })

From 1ef139f3b048bd7e419d0690e5c544588bc1c9bd Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 19 Nov 2020 17:45:40 -0500
Subject: [PATCH 2977/3942] nixos/release-small: add amazonImage

fixup breakage from #104193
---
 nixos/release-small.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 6da2c59cedd4..9b6716e89e02 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -28,7 +28,7 @@ let
 in rec {
 
   nixos = {
-    inherit (nixos') channel manual options iso_minimal dummy;
+    inherit (nixos') channel manual options iso_minimal amazonImage dummy;
     tests = {
       inherit (nixos'.tests)
         containers-imperative

From af787d41a536ccf8f7919e819a53fe476f2b53a7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 15:39:04 +0000
Subject: [PATCH 2978/3942] php73Extensions.blackfire: 1.43.0 -> 1.44.0

---
 pkgs/development/tools/misc/blackfire/php-probe.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix
index a14f5b0edb6b..8a02f6157304 100644
--- a/pkgs/development/tools/misc/blackfire/php-probe.nix
+++ b/pkgs/development/tools/misc/blackfire/php-probe.nix
@@ -17,11 +17,11 @@ let
   }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version.");
 in stdenv.mkDerivation rec {
   pname = "php-blackfire";
-  version = "1.43.0";
+  version = "1.44.0";
 
   src = fetchurl {
     url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb";
-    sha256 = "1038qbpqkamd51ip25z6fbbz69faggahhdw75lnsd8prrwjcpli7";
+    sha256 = "15y1244bbs07i7rg6cy8kynp1may4mbkmmwbxgq8q5zma3ldc8ci";
   };
 
   nativeBuildInputs = [

From e2989e0fd90e618c19aace1078c25b961af4a3d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 22:27:17 +0000
Subject: [PATCH 2979/3942] python37Packages.aiokafka: 0.6.0 -> 0.7.0

---
 pkgs/development/python-modules/aiokafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix
index c6cfe99297b0..ba32976b96b1 100644
--- a/pkgs/development/python-modules/aiokafka/default.nix
+++ b/pkgs/development/python-modules/aiokafka/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "aiokafka";
-  version = "0.6.0";
+  version = "0.7.0";
 
   disabled = isPy27;
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "aiokafka";
     rev = "v${version}";
-    sha256 = "1l5nkz9blmfrbsj7m76vm8vcfdgvab33anzpq62384scp9yf8dln";
+    sha256 = "16pcgv38syqy6sj3w7zx95zgynpd642n3i95dpiw0ivhpqrxxhrf";
   };
 
   nativeBuildInputs = [

From b22a7ad7b0a30995cf65c70643242b896fa80c72 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 13:50:11 +0000
Subject: [PATCH 2980/3942] python37Packages.alerta-server: 8.0.3 -> 8.1.0

---
 pkgs/development/python-modules/alerta-server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix
index dd3e4ab1b116..f8a3b9684805 100644
--- a/pkgs/development/python-modules/alerta-server/default.nix
+++ b/pkgs/development/python-modules/alerta-server/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "alerta-server";
-  version = "8.0.3";
+  version = "8.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "894d240c51428225264867a80094b9743d71272635a18ddfefa5832b61fed2c6";
+    sha256 = "32a97eee95aea5527f6efa844c18b727fe4a6d61356ea3c0769a29a163ddcb7e";
   };
 
   propagatedBuildInputs = [
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     pymongo
     python-dateutil
     pytz
-    pyyaml  
+    pyyaml
     requests
     requests-hawk
     sentry-sdk

From b8fa662585ca5342954b77bfc303d34562575c6d Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Thu, 21 May 2020 11:50:27 +0300
Subject: [PATCH 2981/3942] pythonPackages.littleutils: init at 0.2.2

---
 .../python-modules/littleutils/default.nix    | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/littleutils/default.nix

diff --git a/pkgs/development/python-modules/littleutils/default.nix b/pkgs/development/python-modules/littleutils/default.nix
new file mode 100644
index 000000000000..ea490f19fe5d
--- /dev/null
+++ b/pkgs/development/python-modules/littleutils/default.nix
@@ -0,0 +1,25 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+}:
+
+buildPythonPackage rec {
+  pname = "littleutils";
+  version = "0.2.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0vwijrylppmk0nbddqvn527r9cg3zw8d6zk6r58hslry42jf7jp6";
+  };
+
+  # This tiny package has no unit tests at all
+  doCheck = false;
+  pythonImportsCheck = [ "littleutils" ];
+
+  meta = with lib; {
+    description = "Small collection of Python utility functions";
+    homepage = "https://github.com/alexmojaki/littleutils";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d74d95f17f4c..8c2dfad58284 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3517,6 +3517,8 @@ in {
 
   lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; }));
 
+  littleutils = callPackage ../development/python-modules/littleutils { };
+
   livelossplot = callPackage ../development/python-modules/livelossplot { };
 
   livereload = callPackage ../development/python-modules/livereload { };

From 854f78d1555e55d4f623b46b528d180a5c2a5008 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Thu, 21 May 2020 11:56:46 +0300
Subject: [PATCH 2982/3942] pythonPackages.stack-data: init at 0.0.7

---
 .../python-modules/stack-data/default.nix     | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/stack-data/default.nix

diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix
new file mode 100644
index 000000000000..71f114e3528b
--- /dev/null
+++ b/pkgs/development/python-modules/stack-data/default.nix
@@ -0,0 +1,54 @@
+{ asttokens
+, buildPythonPackage
+, executing
+, fetchFromGitHub
+, git
+, lib
+, littleutils
+, pure-eval
+, pygments
+, pytestCheckHook
+, setuptools_scm
+, toml
+, typeguard
+}:
+
+buildPythonPackage rec {
+  pname = "stack_data";
+  version = "0.0.7";
+
+  src = fetchFromGitHub {
+    owner = "alexmojaki";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "148lhxihak8jm5dvryhsiykmn3s4mrlba8ki4dy1nbd8jnz06a4w";
+  };
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    git
+    setuptools_scm
+    toml
+  ];
+
+  propagatedBuildInputs = [
+    asttokens
+    executing
+    pure-eval
+  ];
+
+  checkInputs = [
+    littleutils
+    pygments
+    pytestCheckHook
+    typeguard
+  ];
+
+  meta = with lib; {
+    description = "Extract data from stack frames and tracebacks";
+    homepage = "https://github.com/alexmojaki/stack_data/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8c2dfad58284..015d27c56608 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6928,6 +6928,8 @@ in {
 
   sslyze = callPackage ../development/python-modules/sslyze { };
 
+  stack-data = callPackage ../development/python-modules/stack-data { };
+
   starlette = callPackage ../development/python-modules/starlette { };
 
   staticjinja = callPackage ../development/python-modules/staticjinja { };

From b339462460e7930553eacf9df9d11cea52bd4b24 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 19 Nov 2020 19:34:23 -0500
Subject: [PATCH 2983/3942] nixos: release-combined: only build the amazon
 image for x86_64,aarch64-linux -- exclude i686

---
 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 1ef357463a10..5f8a64702a82 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -49,7 +49,7 @@ in rec {
         [ "nixos.channel" ]
         (onFullSupported "nixos.dummy")
         (onAllSupported "nixos.iso_minimal")
-        (onAllSupported "nixos.amazonImage")
+        (onSystems ["x86_64-linux" "aarch64-linux"] "nixos.amazonImage")
         (onSystems ["x86_64-linux"] "nixos.iso_plasma5")
         (onSystems ["x86_64-linux"] "nixos.iso_gnome")
         (onFullSupported "nixos.manual")

From 7263f7c433c840c042d315e8c2ebdb51ed19fe96 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Thu, 19 Nov 2020 19:42:22 -0500
Subject: [PATCH 2984/3942] mathematica: Prefer building locally (#100856)

There is little benefit to copying a 4GB tarball over the network,
just to perform an I/O-bound operation and then copy the
multi-gigabyte result back.
---
 pkgs/applications/science/math/mathematica/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index ace5ee55d7b1..d04a89bd8842 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -144,6 +144,9 @@ stdenv.mkDerivation rec {
   '';
 
   dontBuild = true;
+  
+  # This is primarily an IO bound build; there's little benefit to building remotely.
+  preferLocalBuild = true;
 
   # all binaries are already stripped
   dontStrip = true;

From b9049a50a8bafd3995f4547da0ca05ae88bf4334 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 20 Nov 2020 01:46:46 +0100
Subject: [PATCH 2985/3942] pythonPackages.asciimatics: add pythonImportsCheck

---
 pkgs/development/python-modules/asciimatics/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix
index 7fcf67687929..aafbaa15ffe7 100644
--- a/pkgs/development/python-modules/asciimatics/default.nix
+++ b/pkgs/development/python-modules/asciimatics/default.nix
@@ -39,6 +39,13 @@ buildPythonPackage rec {
   # which is too complicated to setup here
   doCheck = false;
 
+  pythonImportsCheck =  [
+    "asciimatics.effects"
+    "asciimatics.renderers"
+    "asciimatics.scene"
+    "asciimatics.screen"
+  ];
+
   meta = with lib; {
     description = "Helps to create full-screen text UIs (from interactive forms to ASCII animations) on any platform";
     homepage = "https://github.com/peterbrittain/asciimatics";

From 9df15228fcdc53d0a6d056a90219ee20e6b0f539 Mon Sep 17 00:00:00 2001
From: Ivar <ivar.scholten@protonmail.com>
Date: Mon, 2 Nov 2020 17:33:03 +0100
Subject: [PATCH 2986/3942] nuclear: init at 0.6.6

---
 pkgs/applications/audio/nuclear/default.nix | 32 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/audio/nuclear/default.nix

diff --git a/pkgs/applications/audio/nuclear/default.nix b/pkgs/applications/audio/nuclear/default.nix
new file mode 100644
index 000000000000..6b2a5b67122d
--- /dev/null
+++ b/pkgs/applications/audio/nuclear/default.nix
@@ -0,0 +1,32 @@
+{ appimageTools, lib, fetchurl }:
+let
+  pname = "nuclear";
+  version = "0.6.6";
+  name = "${pname}-v${version}";
+
+  src = fetchurl {
+    url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${name}.AppImage";
+    sha256 = "0c1335m76fv0wfbk07s8r6ln7zbmlqd66052gqfisakl8a1aafl6";
+  };
+
+  appimageContents = appimageTools.extract { inherit name src; };
+in appimageTools.wrapType2 {
+  inherit name src;
+
+  extraInstallCommands = ''
+    mv $out/bin/${name} $out/bin/${pname}
+
+    install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace 'Exec=AppRun' 'Exec=$out/bin/nuclear'
+    cp -r ${appimageContents}/usr/share/icons $out/share
+  '';
+
+  meta = with lib; {
+    description = "Streaming music player that finds free music for you";
+    homepage = "https://nuclear.js.org/";
+    license = licenses.agpl3Plus;
+    maintainers = [ maintainers.ivar ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6825cd25c2c..37ee3b8bdc77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19414,6 +19414,8 @@ in
   inherit (callPackages ../data/fonts/noto-fonts {})
     noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra;
 
+  nuclear = callPackage ../applications/audio/nuclear { };
+
   nullmailer = callPackage ../servers/mail/nullmailer {
     stdenv = gccStdenv;
   };

From d0aeb6581cc39b54264d33af14a32fcdfbaaf750 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 19 Nov 2020 15:28:55 -0800
Subject: [PATCH 2987/3942] Revert "python3Packages.greenlet: 0.4.16 -> 0.4.17"

This reverts commit 4bfbcbeb383e442bb9b60d82fc401340bc38536a.

0.4.17 can cause segfaults, and some packages such as `dulwich`
will fail during tests
---
 pkgs/development/python-modules/greenlet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index 5b7581ada8f0..c325c9652491 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "greenlet";
-  version = "0.4.17";
+  version = "0.4.16";
   disabled = isPyPy;  # builtin for pypy
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "41d8835c69a78de718e466dd0e6bfd4b46125f21a67c3ff6d76d8d8059868d6b";
+    sha256 = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c";
   };
 
   propagatedBuildInputs = [ six ];

From 97698cb9ae46b379a9376e8a6679e71999c7516f Mon Sep 17 00:00:00 2001
From: Ivan Petkov <ivanppetkov@gmail.com>
Date: Thu, 19 Nov 2020 17:01:15 -0800
Subject: [PATCH 2988/3942] topgrade: 5.9.1 -> 6.0.0

---
 pkgs/tools/misc/topgrade/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index 01c52ba6cc53..9c3439c9c2b5 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "topgrade";
-  version = "5.9.1";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "r-darwish";
     repo = pname;
     rev = "v${version}";
-    sha256 = "17vrnwx8qv2s2m9sj7h4gxxrnppqs9yzjzp8jsyfnpqd66h60wcg";
+    sha256 = "15ad30svvr775dxp5gwlq73xydsqwfpw650c3c3ma4jshw36w0x4";
   };
 
-  cargoSha256 = "1k5lslin5qpmgz1zkz6xazjnapbr0i5r2ifzcz7bdbxwkaaliksd";
+  cargoSha256 = "0bwy2y44czhvckipvjn28j6ds1pnbj38i29hvlv4f782imfn92hz";
 
   buildInputs = lib.optional stdenv.isDarwin Foundation;
 

From 272dcd8f9a4072abe51ba4210ae64997e8290fc7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Nov 2020 04:55:59 +0100
Subject: [PATCH 2989/3942] snallygaster: init at 0.0.9

---
 pkgs/tools/security/snallygaster/default.nix | 38 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/security/snallygaster/default.nix

diff --git a/pkgs/tools/security/snallygaster/default.nix b/pkgs/tools/security/snallygaster/default.nix
new file mode 100644
index 000000000000..36ea37edbb9a
--- /dev/null
+++ b/pkgs/tools/security/snallygaster/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, python3Packages
+, fetchFromGitHub
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "snallygaster";
+  version = "0.0.9";
+
+  src = fetchFromGitHub {
+    owner = "hannob";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1gan5asgrxdgfi9lalhxzj3vs7nkazi8nqia36bpz1qb5fz7jrx3";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    urllib3
+    beautifulsoup4
+    dnspython
+  ];
+
+  checkInputs = with python3Packages; [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    # we are not interested in linting the project
+    "--ignore=tests/test_codingstyle.py"
+  ];
+
+  meta = with lib; {
+    description = "Tool to scan for secret files on HTTP servers";
+    homepage = "https://github.com/hannob/snallygaster";
+    license = licenses.cc0;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7429bbda5b40..edc85b279ff1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7237,7 +7237,9 @@ in
 
   sn0int = callPackage ../tools/security/sn0int { };
 
-  snabb = callPackage ../tools/networking/snabb { } ;
+  snabb = callPackage ../tools/networking/snabb { };
+
+  snallygaster = callPackage ../tools/security/snallygaster { };
 
   snapcast = callPackage ../applications/audio/snapcast { };
 

From aac1ccef72af14b21a7d1db8f200b8fb21bf36ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 23:48:07 +0000
Subject: [PATCH 2990/3942] python37Packages.batchspawner: 1.0.0 -> 1.0.1

---
 pkgs/development/python-modules/batchspawner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix
index 29109a2e0914..2acfa5ecd171 100644
--- a/pkgs/development/python-modules/batchspawner/default.nix
+++ b/pkgs/development/python-modules/batchspawner/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "batchspawner";
-  version = "1.0.0";
+  version = "1.0.1";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "jupyterhub";
     repo = "batchspawner";
     rev = "v${version}";
-    sha256 = "0yn312sjfjpjjfciagbczfmqprk2fj4lbb3vsbzj17p948acq5w2";
+    sha256 = "0vqf3qc2yp52441s6xwgixgl37976qqgpd9sshbgh924j314v1yv";
   };
 
   propagatedBuildInputs = [

From cd423a2d155b950125eda9b0669eb2d9d54a5da9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 22:59:31 +0000
Subject: [PATCH 2991/3942] python27Packages.docrep: 0.2.7 -> 0.3.1

---
 pkgs/development/python-modules/docrep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/docrep/default.nix b/pkgs/development/python-modules/docrep/default.nix
index b467802b62f7..cd1971234a3b 100644
--- a/pkgs/development/python-modules/docrep/default.nix
+++ b/pkgs/development/python-modules/docrep/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "docrep";
-  version = "0.2.7";
+  version = "0.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c48939ae14d79172839a5bbaf5a570add47f6cc44d2c18f6b1fac8f1c38dec4d";
+    sha256 = "ef6e7433716c0d2c59889aae8bff800b48e82d7e759dfd934b93100dc7bccaa1";
   };
 
   checkInputs = [ pytest ];

From 293ab6cd1a3670a3a46e74f7bd7ffb4b726a532f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 00:15:50 +0000
Subject: [PATCH 2992/3942] python27Packages.braintree: 4.4.0 -> 4.5.0

---
 pkgs/development/python-modules/braintree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix
index 2c05d646827c..7eba4743f0ff 100644
--- a/pkgs/development/python-modules/braintree/default.nix
+++ b/pkgs/development/python-modules/braintree/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "braintree";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "79ddadaa9db60b81762a10af0c0d994fd60d21616c7d9229d6f7ce1930f8d343";
+    sha256 = "98b9775e3d5f793c0a47df6b3649cd175705ee2d9163f7853e8c73acec7b923f";
   };
 
   propagatedBuildInputs = [ requests ];

From e37934ae5d24c977a020bb3df813f6b88a325796 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 00:25:40 +0000
Subject: [PATCH 2993/3942] python27Packages.dependency-injector: 3.30.4 ->
 4.4.1

---
 .../python-modules/dependency-injector/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index 1a90462a245f..dac3484e4538 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -9,11 +9,11 @@ in
 
 buildPythonPackage rec {
   pname = "dependency-injector";
-  version = "3.30.4";
+  version = "4.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "717388a9346883eb5def3e96def7275763f2a607cac48c272f352e3834e0bd0d";
+    sha256 = "8c3d9ec6502e2d8051dcdf2603cccb4a87da292a1770e9854814fe928fa4a9b1";
   };
 
   propagatedBuildInputs = [ six ];

From ac963ef717ecdf383d70e8001ea928aa18d20e1c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 20 Nov 2020 09:51:24 +1000
Subject: [PATCH 2994/3942] mmv-go: init at 0.1.2

---
 pkgs/tools/misc/mmv-go/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/mmv-go/default.nix

diff --git a/pkgs/tools/misc/mmv-go/default.nix b/pkgs/tools/misc/mmv-go/default.nix
new file mode 100644
index 000000000000..d05614d579ab
--- /dev/null
+++ b/pkgs/tools/misc/mmv-go/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "mmv-go";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "itchyny";
+    repo = "mmv";
+    rev = "v${version}";
+    sha256 = "0kpf6abzhsikm7vyk5735p8sfjhsh7klla9qnmc43mgh0560f020";
+  };
+
+  vendorSha256 = "1nnfi5zad7nlp44mj0fdg09q8pm093di7rr7pknl9whqghv36dfi";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X main.revision=${src.rev}" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/itchyny/mmv";
+    description = "Rename multiple files using your $EDITOR";
+    license = licenses.mit;
+    maintainers = with maintainers; [ zowoq ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e86d35b273d7..817e475979d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5203,6 +5203,8 @@ in
 
   mmv = callPackage ../tools/misc/mmv { };
 
+  mmv-go = callPackage ../tools/misc/mmv-go { };
+
   most = callPackage ../tools/misc/most { };
 
   motion = callPackage ../applications/video/motion { };

From c07523a6b1268c2748dc264f5fb10b82bf38e230 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 20:27:26 +0000
Subject: [PATCH 2995/3942] python27Packages.arpeggio: 1.9.2 -> 1.10.1

---
 pkgs/development/python-modules/arpeggio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix
index 42d1ce0a219a..29c5e4381036 100644
--- a/pkgs/development/python-modules/arpeggio/default.nix
+++ b/pkgs/development/python-modules/arpeggio/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "Arpeggio";
-  version = "1.9.2";
+  version = "1.10.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "948ce06163a48a72c97f4fe79ad3d1c1330b6fec4f22ece182fb60ef60bd022b";
+    sha256 = "920d12cc762edb2eb56daae64a14c93e43dc181b481c88fc79314c0df6ee639e";
   };
 
   # Shall not be needed for next release

From 02f13a4245a391514a9278ed210b8831b07af4c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2020 21:41:17 +0000
Subject: [PATCH 2996/3942] xmrig: 5.11.3 -> 6.2.2

---
 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 d4d93c77ed42..99afc44d2b4d 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmrig";
-  version = "5.11.3";
+  version = "6.2.2";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "019g64rp6g0b0w17bm9l4q5lh7szc6ai8r3bfmy98ngi929r4rl7";
+    sha256 = "0ph9mrg8i6cv2xjx79118hlm1gcynfavcmp0x2mvvlraxmghfp7a";
   };
 
   nativeBuildInputs = [ cmake ];

From 14b3445b684d9d85a28ce789502abd32371a4db7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 00:07:15 +0000
Subject: [PATCH 2997/3942] python27Packages.eradicate: 1.0 -> 2.0.0

---
 pkgs/development/python-modules/eradicate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix
index 18a7a9ab27f1..45f0599ea2d7 100644
--- a/pkgs/development/python-modules/eradicate/default.nix
+++ b/pkgs/development/python-modules/eradicate/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "eradicate";
-  version = "1.0";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06nhs8wml5f5k96gbq7jl417bmsqnxy8aykpzbzrvm3gmqmaizag";
+    sha256 = "27434596f2c5314cc9b31410c93d8f7e8885747399773cd088d3adea647a60c8";
   };
 
   meta = with lib; {

From f7c76390700eb6486ce1699c86fc6f368d67e842 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 04:03:37 +0000
Subject: [PATCH 2998/3942] python37Packages.azure-mgmt-netapp: 0.13.0 ->
 0.14.0

---
 pkgs/development/python-modules/azure-mgmt-netapp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index ad74d2cf77c5..a57bbe07f563 100644
--- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.13.0";
+  version = "0.14.0";
   pname = "azure-mgmt-netapp";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e86034d073144bd5dbafe17e20fef3f48b5bf98a31b27cc0de462dc8f98303bb";
+    sha256 = "6fd915e68d314bec8b56c6ece194005d2c4fc97478fc1f797639d4a6913c1539";
     extension = "zip";
   };
 

From 0deec106da11bd1c7fb85dc57112fbfd2c179efd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 03:38:32 +0000
Subject: [PATCH 2999/3942] python27Packages.elasticsearch: 7.9.1 -> 7.10.0

---
 pkgs/development/python-modules/elasticsearch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix
index 38522b233d4c..573b01d23954 100644
--- a/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/pkgs/development/python-modules/elasticsearch/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage (rec {
   pname = "elasticsearch";
-  version = "7.9.1";
+  version = "7.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5e08776fbb30c6e92408c7fa8c37d939210d291475ae2f364f0497975918b6fe";
+    sha256 = "9053ca99bc9db84f5d80e124a79a32dfa0f7079b2112b546a03241c0dbeda36d";
   };
 
   # Check is disabled because running them destroy the content of the local cluster!

From da1dccaf237ed99d09580121d843f9e0c605bcc2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 03:07:21 +0000
Subject: [PATCH 3000/3942] python37Packages.dogpile_cache: 1.0.2 -> 1.1.0

---
 pkgs/development/python-modules/dogpile.cache/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix
index 32cb213af4f3..1bbe6da3a9c4 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "dogpile.cache";
-  version = "1.0.2";
+  version = "1.1.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "64fda39d25b46486a4876417ca03a4af06f35bfadba9f59613f9b3d748aa21ef";
+    sha256 = "eba3eb532be75a930f7a70c40c9a66829a3f7281650ad3cd3a786b2e4ba68e83";
   };
 
   # Disable concurrency tests that often fail,

From 16cc70b79ab21b5f25e64cb4d516a234802cb676 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 02:40:29 +0000
Subject: [PATCH 3001/3942] python27Packages.bitarray: 1.6.0 -> 1.6.1

---
 pkgs/development/python-modules/bitarray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
index fe4e442e3084..08e81476ba6f 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bitarray";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ba157ddebddc723fe021fc80595b3c70924d69ee58286b62bfca21da48edfc9d";
+    sha256 = "ab85b38365dd9956264226b30dababa02161ed49bb36c7ee82cc6545e07b1599";
   };
 
   meta = with lib; {

From e5709796787544af9f3c8dcb816fcaf2ea556815 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 02:33:03 +0000
Subject: [PATCH 3002/3942] python37Packages.breathe: 4.23.0 -> 4.24.0

---
 pkgs/development/python-modules/breathe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index 9c8440b9f7f1..1ebc230f61ce 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,13 +1,13 @@
 { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
 
 buildPythonPackage rec {
-  version = "4.23.0";
+  version = "4.24.0";
   pname = "breathe";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c28e251ad8a42e4d3dd6c0861a66128b400131614b36f19df505ea34c934f801";
+    sha256 = "cd959f259361473896857d5720386963800f8401d29b696705ebb01711d96e35";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];

From 51f4c33ef7b0cea0f5eafec5486cd074dda8a0f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 04:29:09 +0000
Subject: [PATCH 3003/3942] python37Packages.bleak: 0.7.1 -> 0.9.1

---
 pkgs/development/python-modules/bleak/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index 63371fc6eecf..09ba8f7b5f52 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "bleak";
-  version = "0.7.1";
+  version = "0.9.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "25f630cf558efda5cbf620d921b85a80ae963c537feaa18cc934f7fa38dc482d";
+    sha256 = "f81b0069e5c1570883144c1910b884e5cefe16d3c2ed09e579b6d8f853f08588";
   };
 
   postPatch = ''

From 8b374c345d8e4d324a5fd066508af3d714e42c1c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 01:29:23 +0000
Subject: [PATCH 3004/3942] python27Packages.elasticsearch-dsl: 7.2.1 -> 7.3.0

---
 pkgs/development/python-modules/elasticsearch-dsl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
index 68d658f4989e..06c4e4045ce1 100644
--- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix
+++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "elasticsearch-dsl";
-  version = "7.2.1";
+  version = "7.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e345535164cb684de4b825e1d0daf81b75554b30d3905446584a9e4af0cc3e7";
+    sha256 = "0ed75f6ff037e36b2397a8e92cae0ddde79b83adc70a154b8946064cb62f7301";
   };
 
   propagatedBuildInputs = [ elasticsearch python-dateutil six ]

From f2273b18fa266227b97c61295cb9f4caf7739bed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 02:52:10 +0000
Subject: [PATCH 3005/3942] python27Packages.devpi-common: 3.5.0 -> 3.6.0

---
 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 ac83c0dd938d..7e2a315b413e 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "devpi-common";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4f1eb1bf85a5dabd4f4ecc11ad99588e01cc204989a9f424c2dbe5809c6c3745";
+    sha256 = "fc14aa6b74d4d9e27dc2e9cbff000ed9be5cd723d3ac9672e66e4e8fce797227";
   };
 
   propagatedBuildInputs = [

From e24fb3a461b3bc95618dad4cae1ec78cc3f2af13 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 22:39:57 +0000
Subject: [PATCH 3006/3942] python37Packages.aiounifi: 23 -> 25

---
 pkgs/development/python-modules/aiounifi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix
index 3b05d2c3811e..a39b4566419c 100644
--- a/pkgs/development/python-modules/aiounifi/default.nix
+++ b/pkgs/development/python-modules/aiounifi/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "aiounifi";
-  version = "23";
+  version = "25";
 
   disabled = ! isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0628058b644776132f2f893f1a2201a0142a38b6acf089c6b11a63ad5a752ba7";
+    sha256 = "1777effcc4ec8683e53603437887c43fa650f09ef4d148904ce06e2aa11044b7";
   };
 
   propagatedBuildInputs = [ aiohttp ];

From c40846190439f5977d93c99e2667a1ec52fa435c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 13 Nov 2020 08:12:34 +0100
Subject: [PATCH 3007/3942] =?UTF-8?q?ocamlPackages.httpaf:=200.4.1=20?=
 =?UTF-8?q?=E2=86=92=200.6.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/httpaf/default.nix          | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix
index 42e7c1eac1b6..fbc21108bd02 100644
--- a/pkgs/development/ocaml-modules/httpaf/default.nix
+++ b/pkgs/development/ocaml-modules/httpaf/default.nix
@@ -1,19 +1,31 @@
-{ lib, fetchFromGitHub, buildDunePackage, ocaml, angstrom, faraday, alcotest }:
+{ lib, fetchFromGitHub, fetchpatch, buildDunePackage
+, angstrom, faraday, alcotest
+}:
 
 buildDunePackage rec {
   pname = "httpaf";
-  version = "0.4.1";
+  version = "0.6.6";
+
+  useDune2 = true;
 
   src = fetchFromGitHub {
     owner = "inhabitedtype";
     repo = pname;
     rev = version;
-    sha256 = "0i2r004ihj00hd97475y8nhjqjln58xx087zcjl0dfp0n7q80517";
+    sha256 = "065ikryv8zw9cbk6ddcjcind88ckk0inz9m3sqj9nwyfw4v4scm6";
   };
 
-  checkInputs = lib.optional doCheck alcotest;
+  patches = [
+    # Fix tests with angstrom ≥ 0.14
+    (fetchpatch {
+      url = "https://github.com/inhabitedtype/httpaf/commit/fc0de5f2f1bd8df953ae4d4c9a61032392436c84.patch";
+      sha256 = "1a8ca76ifbgyaq1bqfyq18mmxinjjparzkrr7ljbj0y1z1rl748z";
+    })
+  ];
+
+  checkInputs = [ alcotest ];
   propagatedBuildInputs = [ angstrom faraday ];
-  doCheck = lib.versions.majorMinor ocaml.version != "4.07";
+  doCheck = true;
 
   meta = {
     description = "A high-performance, memory-efficient, and scalable web server for OCaml";

From 5323dd676d3661d4d602910aa24e833ff7644296 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 14:37:32 +0000
Subject: [PATCH 3008/3942] libinsane: 1.0.7 -> 1.0.8

---
 pkgs/development/libraries/libinsane/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/development/libraries/libinsane/default.nix
index cbc4c001b151..075d5761036c 100644
--- a/pkgs/development/libraries/libinsane/default.nix
+++ b/pkgs/development/libraries/libinsane/default.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libinsane";
-  version = "1.0.7";
+  version = "1.0.8";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     group = "World";
     owner = "OpenPaperwork";
     rev = version;
-    sha256 = "03r6niyzfahnlpvhn68h59i6926ciwz88krqbf0akd9f42y9zf2k";
+    sha256 = "0mcvqpixilzs4d4afkbxa1nqm6ddmhpaz5j56pfvc5wpv6s99h44";
   };
 
   nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ];

From f5a21c70fda45a78056bc142278db1de883f6d5c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 13:26:14 +0000
Subject: [PATCH 3009/3942] leftwm: 0.2.4 -> 0.2.5

---
 pkgs/applications/window-managers/leftwm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix
index e2b3e4a55a4a..13c0818101f7 100644
--- a/pkgs/applications/window-managers/leftwm/default.nix
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@@ -6,16 +6,16 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "leftwm";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "leftwm";
     repo = "leftwm";
     rev = version;
-    sha256 = "0xmkhkdpz1bpczrar9y6assdzhd7qxybnkjqs36h099fk9xqmsav";
+    sha256 = "03kk3vg0r88317zv8j2bj44wq2fwxi25rv1aasvayrh1i5j6zr10";
   };
 
-  cargoSha256 = "06wnx81fhs19pz5qnir6h2v2kmj73y1g354nadcx6650q9pnhdv4";
+  cargoSha256 = "0m4sv4chxzk60njixlyja44rpn04apf3bm04fgd3v7abpr169f2s";
 
   buildInputs = [ makeWrapper libX11 libXinerama ];
 

From ca4e0ad7ca13c2affbbdad86cd9d5c7f118910a5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 21:54:16 +0000
Subject: [PATCH 3010/3942] matio: 1.5.18 -> 1.5.19

---
 pkgs/development/libraries/matio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix
index 7bcef2b65531..bc629dc25064 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/pkgs/development/libraries/matio/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "matio-1.5.18";
+  name = "matio-1.5.19";
   src = fetchurl {
     url = "mirror://sourceforge/matio/${name}.tar.gz";
-    sha256 = "09gy507zm1gxxyxf5qapzgars51pm16wis7lqqf84kc57ak73baz";
+    sha256 = "0vr8c1mz1k6mz0sgh6n3scl5c3a71iqmy5fnydrgq504icj4vym4";
   };
 
   meta = with stdenv.lib; {

From 57cce36d965c092f3d5d14d18c94b38787cadfbb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 17 Nov 2020 21:28:20 +0000
Subject: [PATCH 3011/3942] fio: 3.23 -> 3.24

---
 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 2a945c78f821..4e47b8f568b3 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fio";
-  version = "3.23";
+  version = "3.24";
 
   src = fetchFromGitHub {
     owner  = "axboe";
     repo   = "fio";
     rev    = "fio-${version}";
-    sha256 = "0xr1d1jh7zhdhf0zfv8w6r99hk8h5d22v36h13hrd8mqyaz1g8m0";
+    sha256 = "0wkbs8gzfvclsn576fcx5sqzb5qs7annn7ra4kk2i578a32q4sxw";
   };
 
   buildInputs = [ python zlib ]

From 789f51c4fb2b36df188351c2a2145950a26261c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 02:04:55 +0000
Subject: [PATCH 3012/3942] enet: 1.3.16 -> 1.3.17

---
 pkgs/development/libraries/enet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index 8a264d73b621..61b8c1be4f2b 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "enet-1.3.16";
+  name = "enet-1.3.17";
 
   src = fetchurl {
     url = "http://enet.bespin.org/download/${name}.tar.gz";
-    sha256 = "1lggc82rbzscci057dqqyhkbq4j6mr5k01hbrvn06jkzc2xpxdxv";
+    sha256 = "1p6f9mby86af6cs7pv6h48032ip9g32c05cb7d9mimam8lchz3x3";
   };
 
   meta = {

From ad7b1987864d1feb90748b38d22436b3d9cfd76b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 06:29:56 +0000
Subject: [PATCH 3013/3942] python37Packages.dask-gateway-server: 0.8.0 ->
 0.9.0

---
 .../python-modules/dask-gateway-server/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix
index 9d28d2671917..d2f040609d32 100644
--- a/pkgs/development/python-modules/dask-gateway-server/default.nix
+++ b/pkgs/development/python-modules/dask-gateway-server/default.nix
@@ -12,12 +12,12 @@
 buildPythonPackage rec {
   pname = "dask-gateway-server";
   # update dask-gateway-server lock step with dask-gateway
-  version = "0.8.0";
+  version = "0.9.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "272134933b7e2068cd89a17a5012c76a29fbd9e40a78164345a2b15353d4b40a";
+    sha256 = "82bca8a98fc1dbda9f67c8eceac59cb92abe07db6227c120a1eb1d040ea40fda";
   };
 
   nativeBuildInputs = [

From 4b038d151ed1b9f2ac1d7096e2b1b18674a84438 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 04:36:59 +0000
Subject: [PATCH 3014/3942] gnomeExtensions.workspace-matrix: 4.0.1 -> 4.0.2

---
 pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
index 4dcb4a8941cd..6c466a8eca4b 100644
--- a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-workspace-matrix";
-  version = "4.0.1";
+  version = "4.0.2";
 
   src = fetchFromGitHub {
     owner = "mzur";
     repo = "gnome-shell-wsmatrix";
     rev = "v${version}";
-    sha256 = "1xx2h8k981657lws614f7x4mqjk900xq9907j2h5jdhbbic5ppy6";
+    sha256 = "0dbn6b3fdd7yblk0mhsmaiqs3mwgcf3khkx1dsnlqn5hcs0a3myd";
   };
 
   uuid = "wsmatrix@martin.zurowietz.de";

From 01d13735d14d4003729243568d882a90a24fec86 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Nov 2020 07:25:36 +0000
Subject: [PATCH 3015/3942] gleam: 0.12.0 -> 0.12.1

---
 pkgs/development/compilers/gleam/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index aa3ab8bc94b2..f96f2f724a60 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gleam";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1hlbskpfqdh5avmqnry69s7x0wj6l6yaqkayx7lj6z99p58p9zrz";
+    sha256 = "0n23pn7jk4i2waczw5cczsb7v4lal4x6xqmp01y280hb2vk176fg";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ] ++
     stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "1djznh7v6ha4ks8l8arwwn301qclmb7iih774q5y7sbzqrv7sw0q";
+  cargoSha256 = "0rnf9agpzlvk53x8zrg32w6r0gxcbank3fs32ydv53frvqv1spj3";
 
   meta = with stdenv.lib; {
     description = "A statically typed language for the Erlang VM";

From 26803925aa41f3ba67d70facc5c020aa20cf70a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Nov 2020 04:03:04 +0000
Subject: [PATCH 3016/3942] ngspice: 32 -> 33

---
 pkgs/applications/science/electronics/ngspice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index ab2861d53f20..5113dc778f62 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ngspice";
-  version = "32";
+  version = "33";
 
   src = fetchurl {
     url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
-    sha256 = "1wiys30c9mqzxr7iv1sws0jnn4xi0mj3lanhnk2qfvaiji70rn9w";
+    sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr";
   };
 
   nativeBuildInputs = [ flex bison ];

From 161a78037bd55f7a0c6761f0a61af82a52df99d8 Mon Sep 17 00:00:00 2001
From: Tristan Gosselin-Hane <starcraft66@gmail.com>
Date: Fri, 20 Nov 2020 02:24:12 -0500
Subject: [PATCH 3017/3942] obs-move-transition: init at 2.0.2

---
 .../video/obs-studio/obs-move-transition.nix  | 60 +++++++++++++++++++
 .../rename-obs-move-transition-cmake.patch    | 34 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 96 insertions(+)
 create mode 100644 pkgs/applications/video/obs-studio/obs-move-transition.nix
 create mode 100644 pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch

diff --git a/pkgs/applications/video/obs-studio/obs-move-transition.nix b/pkgs/applications/video/obs-studio/obs-move-transition.nix
new file mode 100644
index 000000000000..70985b438c6b
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/obs-move-transition.nix
@@ -0,0 +1,60 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, fetchurl
+, cmake
+, obs-studio
+}:
+
+stdenv.mkDerivation rec {
+  pname = "obs-move-transition";
+  version = "2.0.2";
+
+  src = fetchFromGitHub {
+    owner = "exeldro";
+    repo = "obs-move-transition";
+    rev = version;
+    sha256 = "0kr868lxlanq0y98f2hb70y92ac2nla8khsj879kjf3z6dqdpd66";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ obs-studio ];
+
+  cmakeFlags = with lib; [
+    "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs"
+    "-Wno-dev"
+  ];
+
+  preConfigure = ''
+    cp ${obs-studio.src}/cmake/external/FindLibobs.cmake FindLibobs.cmake
+  '';
+
+  patches = [ ./rename-obs-move-transition-cmake.patch ];
+
+  postPatch = ''
+    substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
+    substituteInPlace move-value-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
+    substituteInPlace move-transition.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
+  '';
+
+  # obs-studio expects the shared object to be located in bin/32bit or bin/64bit
+  # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48
+  postInstall = let
+    pluginPath = {
+      i686-linux = "bin/32bit";
+      x86_64-linux = "bin/64bit";
+    }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}");
+  in ''
+    mkdir -p $out/share/obs/obs-plugins/move-transition/${pluginPath}
+    ln -s $out/lib/obs-plugins/move-transition.so $out/share/obs/obs-plugins/move-transition/${pluginPath}
+  '';
+
+  meta = with lib; {
+    description = "Plugin for OBS Studio to move source to a new position during scene transition";
+    homepage = "https://github.com/exeldro/obs-move-transition";
+    maintainers = with maintainers; [ starcraft66 ];
+    license = licenses.gpl2Plus;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}
diff --git a/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch b/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch
new file mode 100644
index 000000000000..24c1848c10ba
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d116619..a1366ce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,17 @@
++if (POLICY CMP0048)
++	cmake_policy(SET CMP0048 NEW)
++endif (POLICY CMP0048)
++
+ project(move-transition VERSION 2.0.2)
+ set(PROJECT_FULL_NAME "Move Transition")
+ 
++include(FindLibobs.cmake)
++find_package(LibObs REQUIRED)
++
++include_directories(
++	"${LIBOBS_INCLUDE_DIR}/../plugins/obs-transitions"
++	"${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api")
++
+ set(move-transition_HEADERS
+ 	move-transition.h
+ 	easing.h)
+@@ -34,4 +45,10 @@ target_link_libraries(move-transition
+ 	libobs)
+ 
+ set_target_properties(move-transition PROPERTIES FOLDER "plugins/exeldro")
+-install_obs_plugin_with_data(move-transition data)
++set_target_properties(move-transition PROPERTIES PREFIX "")
++
++install(TARGETS move-transition
++	LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/obs-plugins)
++
++install(DIRECTORY data/locale/
++	DESTINATION "${CMAKE_INSTALL_PREFIX}/share/obs/obs-plugins/move-transition/locale")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4af1fd95ce78..efd4a79ce85c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22845,6 +22845,8 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
   obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };
 
+  obs-move-transition = callPackage ../applications/video/obs-studio/obs-move-transition.nix { };
+
   obs-v4l2sink = libsForQt514.callPackage ../applications/video/obs-studio/v4l2sink.nix { };
 
   obs-ndi = libsForQt514.callPackage ../applications/video/obs-studio/obs-ndi.nix { };

From c8d117125473ef369803daa689a4d68cf6bd293d Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Fri, 20 Nov 2020 01:07:46 +0800
Subject: [PATCH 3018/3942] vulkan-extension-layer: init at 2020-08-25

There are no tags or releases on the repo, so just use the date as version.

Khronos strikes again with terrible naming here.
---
 .../vulkan-extension-layer/default.nix        | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/graphics/vulkan-extension-layer/default.nix

diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix
new file mode 100644
index 000000000000..cea582851e49
--- /dev/null
+++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, cmake, writeText, vulkan-headers, jq }:
+
+stdenv.mkDerivation rec {
+  pname = "vulkan-extension-layer";
+  version = "2020-08-25";
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "Vulkan-ExtensionLayer";
+    rev = "352f8e3e269ff2c650da50ce36313547c2a1fbb6";
+    sha256 = "1503z1zj1xvjpry2h7fpg1frx7lcm54zs3azcgiv5i3ar4wqfkz9";
+  };
+
+  nativeBuildInputs = [ cmake jq ];
+
+  buildInputs = [ vulkan-headers ];
+
+  # Help vulkan-loader find the validation layers
+  setupHook = writeText "setup-hook" ''
+    export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS
+  '';
+
+  # Include absolute paths to layer libraries in their associated
+  # layer definition json files.
+  preFixup = ''
+    for f in "$out"/share/vulkan/explicit_layer.d/*.json "$out"/share/vulkan/implicit_layer.d/*.json; do
+      jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path"
+      mv tmp.json "$f"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Layers providing Vulkan features when native support is unavailable";
+    homepage = "https://github.com/KhronosGroup/Vulkan-ExtensionLayer/";
+    platforms = platforms.linux;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ expipiplus1 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c96a8b961a2..c9586dae594e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16160,6 +16160,7 @@ in
                                           CoreText IOSurface ImageIO OpenGL GLUT;
   };
 
+  vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { };
   vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
   vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
   vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };

From f18d43efb5b906d53d11471be6874456b414321f Mon Sep 17 00:00:00 2001
From: cw <789@c-w.li>
Date: Fri, 2 Oct 2020 11:01:19 +0200
Subject: [PATCH 3019/3942] rebar3: 3.12.0 -> 3.14.2

---
 .../tools/build-managers/rebar3/default.nix   | 109 ++++++++++--------
 1 file changed, 58 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index 5c0fff134a7e..bf28868d0e70 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -3,79 +3,85 @@
   tree }:
 
 let
-  version = "3.12.0";
+  version = "3.14.2";
 
+  # Dependencies should match the ones in:
+  # https://github.com/erlang/rebar3/blob/${version}/rebar.lock
+  # `sha256` could also be taken from https://hex.pm - Checksum
+
+  bbmustache = fetchHex {
+    pkg = "bbmustache";
+    version = "1.10.0";
+    sha256 = "43effa3fd4bb9523157af5a9e2276c493495b8459fc8737144aa186cb13ce2ee";
+  };
+  certifi = fetchHex {
+    pkg = "certifi";
+    version = "2.5.2";
+    sha256 = "3b3b5f36493004ac3455966991eaf6e768ce9884693d9968055aeeeb1e575040";
+  };
+  cf = fetchHex {
+    pkg = "cf";
+    version = "0.3.1";
+    sha256 = "315e8d447d3a4b02bcdbfa397ad03bbb988a6e0aa6f44d3add0f4e3c3bf97672";
+  };
+  cth_readable = fetchHex {
+    pkg = "cth_readable";
+    version = "1.4.9";
+    sha256 = "b4c6ababdb046c5f2fbb3c22f030b4c5a679083956dcdd29c1df0cb30b18da24";
+  };
   erlware_commons = fetchHex {
     pkg = "erlware_commons";
     version = "1.3.1";
     sha256 = "7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166";
   };
-  ssl_verify_fun = fetchHex {
-    pkg = "ssl_verify_fun";
-    version = "1.1.3";
-    sha256 = "2e120e6505d6e9ededb2836611dfe2f7028432dc280957998e154307b5ea92fe";
-  };
-  certifi = fetchHex {
-    pkg = "certifi";
-    version = "2.3.1";
-    sha256 = "e12d667d042c11d130594bae2b0097e63836fe8b1e6d6b2cc48f8bb7a2cf7d68";
-  };
-  providers = fetchHex {
-    pkg = "providers";
-    version = "1.7.0";
-    sha256 = "8be66129ca85c2fa74efd8737cdaedd31c1c1af51dd2fd601495a6def4cae4a6";
-  };
-  getopt = fetchHex {
-    pkg = "getopt";
-    version = "1.0.1";
-    sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c";
-  };
-  bbmustache = fetchHex {
-    pkg = "bbmustache";
-    version = "1.6.0";
-    sha256 = "53e02d296512a57be03a98c91541b34d2ca64930268030b2d12364a0332015df";
-  };
-  relx = fetchHex {
-    pkg = "relx";
-    version = "3.28.0";
-    sha256 = "8afb871c0a2a27f0063d973903fc64d2207bc705ecc3607462920683d24ac7b5";
-  };
-  cf = fetchHex {
-    pkg = "cf";
-    version = "0.2.2";
-    sha256 = "08cvy7skn5d2k4manlx5k3anqgjdvajjhc5jwxbaszxw34q3na28";
-  };
-  cth_readable = fetchHex {
-    pkg = "cth_readable";
-    version = "1.4.3";
-    sha256 = "0wr0hba6ka74s3628jrrd7ynjdh7syxigkh7ildg8fgi20ab88fd";
-  };
   eunit_formatters = fetchHex {
     pkg = "eunit_formatters";
     version = "0.5.0";
     sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n";
   };
-  hex_core = fetchHex {
-    pkg = "hex_core";
-    version = "0.4.0";
-    sha256 = "8ace8c6cfa10df4cb8be876f42f7446890e124203c094cc7b4e7616fb8de5d7f";
+  getopt = fetchHex {
+    pkg = "getopt";
+    version = "1.0.1";
+    sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c";
   };
   parse_trans = fetchHex {
     pkg = "parse_trans";
     version = "3.3.0";
-    sha256 = "0q5r871bzx1a8fa06yyxdi3xkkp7v5yqazzah03d6yl3vsmn7vqp";
+    sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960";
+  };
+  providers = fetchHex {
+    pkg = "providers";
+    version = "1.8.1";
+    sha256 = "e45745ade9c476a9a469ea0840e418ab19360dc44f01a233304e118a44486ba0";
+  };
+  relx = fetchHex {
+    pkg = "relx";
+    version = "4.1.0";
+    sha256 = "b94a3f96697a479ee5217a853345e0f4977bdf40d3c040af0d3d80fadad82af4";
+  };
+  ssl_verify_fun = fetchHex {
+    pkg = "ssl_verify_fun";
+    version = "1.1.6";
+    sha256 = "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680";
   };
 
+  hex_core = fetchHex {
+    pkg = "hex_core";
+    version = "0.7.1";
+    sha256 = "05c60411511b6dc79affcd99a93e67d71e1b9d6abcb28ba75cd4ebc8585b8d02";
+  };
 in
 stdenv.mkDerivation rec {
   pname = "rebar3";
   inherit version erlang;
 
+  # How to obtain `sha256`:
+  # nix-prefetch-url --unpack https://github.com/erlang/rebar3/archive/${version}.tar.gz
   src = fetchFromGitHub {
     owner = "erlang";
     repo = pname;
     rev = version;
-    sha256 = "0936ix7lfwsamssap58b265zid7x2m97azrr2qpjcln3xysd16lg";
+    sha256 = "02gz6xs8j5rm14r6dndcpdm8q3rl4mcj363gnnx4y5xvvfnv9bfa";
   };
 
   bootstrapper = ./rebar3-nix-bootstrap;
@@ -86,18 +92,19 @@ stdenv.mkDerivation rec {
     mkdir -p _checkouts
     mkdir -p _build/default/lib/
 
-    cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons
-    cp --no-preserve=mode -R ${providers} _checkouts/providers
-    cp --no-preserve=mode -R ${getopt} _checkouts/getopt
     cp --no-preserve=mode -R ${bbmustache} _checkouts/bbmustache
     cp --no-preserve=mode -R ${certifi} _checkouts/certifi
     cp --no-preserve=mode -R ${cf} _checkouts/cf
     cp --no-preserve=mode -R ${cth_readable} _checkouts/cth_readable
+    cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons
     cp --no-preserve=mode -R ${eunit_formatters} _checkouts/eunit_formatters
+    cp --no-preserve=mode -R ${getopt} _checkouts/getopt
+    cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans
+    cp --no-preserve=mode -R ${providers} _checkouts/providers
     cp --no-preserve=mode -R ${relx} _checkouts/relx
     cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun
+
     cp --no-preserve=mode -R ${hex_core} _checkouts/hex_core
-    cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans
 
     # Bootstrap script expects the dependencies in _build/default/lib
     # TODO: Make it accept checkouts?

From 4a0aa9fb7996d236fb7234fa814fa1ee1a222552 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Fri, 20 Nov 2020 09:54:12 +0100
Subject: [PATCH 3020/3942] Sylk: 2.9.2 -> 2.9.3

---
 pkgs/applications/networking/Sylk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix
index 3ba91b6abc55..9f5378d761aa 100644
--- a/pkgs/applications/networking/Sylk/default.nix
+++ b/pkgs/applications/networking/Sylk/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "Sylk";
-  version = "2.9.2";
+  version = "2.9.3";
 in
 
 appimageTools.wrapType2 rec {
@@ -10,7 +10,7 @@ appimageTools.wrapType2 rec {
 
   src = fetchurl {
     url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage";
-    hash = "sha256-pfzTeKxY2fs98mgvhzaI/uBbYYkxfnQ+6jQ+gTSeEkA=";
+    hash = "sha256-JH/TUGAYZTIb/L926CoYb5yzPtbOKVmnWRmHO6DxDyY=";
   };
 
   profile = ''

From 8f2db79bfa5610b5e1bc0c0fcd59916a3ee226aa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 09:43:24 +0000
Subject: [PATCH 3021/3942] python37Packages.bip_utils: 1.5.0 -> 1.6.0

---
 pkgs/development/python-modules/bip_utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix
index 2b9e16b6a639..17f996bfd709 100644
--- a/pkgs/development/python-modules/bip_utils/default.nix
+++ b/pkgs/development/python-modules/bip_utils/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "bip_utils";
-  version = "1.5.0";
+  version = "1.6.0";
 
   disabled = pythonOlder "3.6";
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "ebellocchia";
     repo = pname;
     rev = "v${version}";
-    sha256 = "06ls1lara7sklqw6wrw5d3wpxwgyv6paxwjp37x7b3kfskm14cmd";
+    sha256 = "0zbjrgl4dd65r3liyp8syxr106z1wn7ngfcm5dlfcxqwj8zkf56m";
   };
 
   propagatedBuildInputs = [ ecdsa pysha3 ];

From b7b22c5814471e783fbba057cd2e7bb136b88260 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 20 Nov 2020 11:57:56 +0100
Subject: [PATCH 3022/3942] dockerTools: Always cross compile for another arch
 in the cross example

The example fails to build on aarch64, so lets cross build for gnu64.
---
 nixos/tests/docker-tools.nix           | 6 +++---
 pkgs/build-support/docker/examples.nix | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index a20a08fc90db..8e0e82d64cc7 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -237,14 +237,14 @@ import ./make-test-python.nix ({ pkgs, ... }: {
 
     with subtest("Ensure cross compiled image can be loaded and has correct arch."):
         docker.succeed(
-            "docker load --input='${pkgs.dockerTools.examples.cross-aarch64}'",
+            "docker load --input='${pkgs.dockerTools.examples.cross}'",
         )
         assert (
             docker.succeed(
-                "docker inspect ${pkgs.dockerTools.examples.cross-aarch64.imageName} "
+                "docker inspect ${pkgs.dockerTools.examples.cross.imageName} "
                 + "| ${pkgs.jq}/bin/jq -r .[].Architecture"
             ).strip()
-            == "arm64v8"
+            == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64v8"}"
         )
   '';
 })
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index cd91c721241b..3f30f1a2adb4 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -408,10 +408,15 @@ rec {
     };
 
   # basic example, with cross compilation
-  cross-aarch64 = pkgsCross.aarch64-multiplatform.dockerTools.buildImage {
+  cross = let
+    # Cross compile for x86_64 if on aarch64
+    crossPkgs =
+      if pkgs.system == "aarch64-linux" then pkgsCross.gnu64
+      else pkgsCross.aarch64-multiplatform;
+  in crossPkgs.dockerTools.buildImage {
     name = "hello-cross";
     tag = "latest";
-    contents = pkgsCross.aarch64-multiplatform.hello;
+    contents = crossPkgs.hello;
   };
 
 }

From 80097e57c90cd95ef55589a5fa9e06bad51d3746 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 20 Nov 2020 13:03:04 +0100
Subject: [PATCH 3023/3942] nix: 2.3.8 -> 2.3.9

---
 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 bd70bd20013b..699fb555615b 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/qxayqjmlpqnmwg5yfsjjayw220ls8i2r-nix-2.3.8";
-  i686-linux = "/nix/store/5834psaay75048jp6d07liqh4j0v1swd-nix-2.3.8";
-  aarch64-linux = "/nix/store/pic90a5fxvifz05jzkd0zak21f9mjin6-nix-2.3.8";
-  x86_64-darwin = "/nix/store/cjx3f8z12wlayp5983kli2a52ipi8jz2-nix-2.3.8";
+  x86_64-linux = "/nix/store/fwak7l5jjl0py4wldsqjbv7p7rdzql0b-nix-2.3.9";
+  i686-linux = "/nix/store/jlqrx9zw3vkwcczndaar5ban1j8g519z-nix-2.3.9";
+  aarch64-linux = "/nix/store/kzvpzlm12185hw27l5znrprgvcja54d0-nix-2.3.9";
+  x86_64-darwin = "/nix/store/kanh3awpf370pxfnjfvkh2m343wr3hj0-nix-2.3.9";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 2762a3df7381..8e53a082c34f 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -188,10 +188,10 @@ in rec {
   nix = nixStable;
 
   nixStable = callPackage common (rec {
-    name = "nix-2.3.8";
+    name = "nix-2.3.9";
     src = fetchurl {
       url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "c7119823c1eabdcc9e527cc96a91f11a0b0e63f3840a02fe7573538dad2dad2a";
+      sha256 = "72331fdba220517a0ccabcf5c9735703c31674bfb4ef0b64da5d8f715d6022fa";
     };
 
     inherit storeDir stateDir confDir boehmgc;

From 4dd5da0ad0efec7e140f77b2d8988a84f5d72f14 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 19 Nov 2020 17:06:53 +0100
Subject: [PATCH 3024/3942] nixUnstable: pre20201102_550e11f ->
 pre20201118_79aa7d9

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
---
 pkgs/tools/package-management/nix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 2762a3df7381..54f545ea09f9 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -199,13 +199,13 @@ in rec {
 
   nixUnstable = lib.lowPrio (callPackage common rec {
     name = "nix-2.4${suffix}";
-    suffix = "pre20201102_550e11f";
+    suffix = "pre20201118_79aa7d9";
 
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "550e11f077ae508abde5a33998a9d4029880e7b2";
-      sha256 = "186grfxsfqg7r92wgwbma66xc7p3iywn43ff7s59m4g6bvb0qgcl";
+      rev = "79aa7d95183cbe6c0d786965f0dbff414fd1aa67";
+      sha256 = "0aa0xggrczylwp3da3q9m4ad9j6gzi7wpa3ph4i8a1ng36kl91c7";
     };
 
     inherit storeDir stateDir confDir boehmgc;

From 768b1c3c268144f06c0ab00a28d99e5cb16e85a6 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Fri, 20 Nov 2020 20:40:32 +0800
Subject: [PATCH 3025/3942] vulkan-extension-layer: 2020-08-25 -> 2020-11-20

---
 pkgs/tools/graphics/vulkan-extension-layer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix
index cea582851e49..3a7473530d60 100644
--- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix
+++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-extension-layer";
-  version = "2020-08-25";
+  version = "2020-11-20";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ExtensionLayer";
-    rev = "352f8e3e269ff2c650da50ce36313547c2a1fbb6";
-    sha256 = "1503z1zj1xvjpry2h7fpg1frx7lcm54zs3azcgiv5i3ar4wqfkz9";
+    rev = "7474cb8e1f70e9f4a8bf382708a7f15465453af5";
+    sha256 = "1lxkgcnv32wqk4hlckv13xy84g38jzgc4qxp9vsbkrgz87hkdvwj";
   };
 
   nativeBuildInputs = [ cmake jq ];

From 00c451ad4083416be2287bc980a8f0190aafce68 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 20 Nov 2020 07:31:19 -0600
Subject: [PATCH 3026/3942] librepcb: touch ups, co-maintain

Fixes a bug where the build system tried to call `git` to embed the
release tag revision into the binary, which isn't allowed. Easily fixed
with `substituteInPlace`.

Also updates the expression to be a little closer to "standard"
expressions (e.g. consistent indentation, importing `stdenv` instead of
`lib` and `mkDerivation`, etc.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/electronics/librepcb/default.nix  | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index 494a5cf2931b..4b0a4108ab22 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -1,39 +1,47 @@
-{ lib, mkDerivation, fetchFromGitHub, qtbase, qttools, qmake, wrapQtAppsHook }:
+{ stdenv, lib, fetchFromGitHub
+, qtbase, qttools, qmake, wrapQtAppsHook
+}:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "librepcb";
   version = "0.1.5";
 
   src = fetchFromGitHub {
-    owner = "LibrePCB";
-    repo = "LibrePCB";
-    fetchSubmodules = true;
-    rev = version;
+    owner  = pname;
+    repo   = pname;
+    rev    = version;
     sha256 = "0ag8h3id2c1k9ds22rfrvyhf2vjhkv82xnrdrz4n1hnlr9566vcx";
+    fetchSubmodules = true;
   };
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
-
   buildInputs = [ qtbase ];
 
   qmakeFlags = ["-r"];
+  enableParallelBuilding = true;
 
   postInstall = ''
-      mkdir -p $out/share/librepcb/fontobene
-      cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/
-    '';
+    mkdir -p $out/share/librepcb/fontobene
+    cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/
+  '';
+
+  # the build system tries to use 'git' at build time to find the HEAD hash.
+  # that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment
+  # at the end of the line to remove the git call.
+  patchPhase = ''
+    substituteInPlace ./libs/librepcb/common/common.pro \
+      --replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # '
+  '';
 
   preFixup = ''
     wrapQtApp $out/bin/librepcb
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A free EDA software to develop printed circuit boards";
-    homepage = "https://librepcb.org/";
-    maintainers = with maintainers; [ luz ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
+    homepage    = "https://librepcb.org/";
+    maintainers = with maintainers; [ luz thoughtpolice ];
+    license     = licenses.gpl3;
+    platforms   = platforms.linux;
   };
 }

From f6d423470a86c31852f82818e92bcd167342fc0d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 20 Nov 2020 07:32:14 -0600
Subject: [PATCH 3027/3942] picat: 3.0p2 -> 3.0p3, co-maintain

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/picat/default.nix | 25 +++++++-------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix
index 12a020240c84..8fe3031e6b35 100644
--- a/pkgs/development/compilers/picat/default.nix
+++ b/pkgs/development/compilers/picat/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation {
   pname = "picat";
-  version = "3.0p2";
+  version = "3.0p3";
 
   src = fetchurl {
-    url    = "http://picat-lang.org/download/picat30_2_src.tar.gz";
-    sha256 = "0sn4fqj2ryalcndx1df5kx5rzb4pfcrza5ljlg9dkfbqv02xgxkd";
+    url    = "http://picat-lang.org/download/picat30_3_src.tar.gz";
+    sha256 = "052w0vk2xfmky5nv280ysb8in6vaph7i79yvbddqmahzszarq5hw";
   };
 
   buildInputs = [ zlib ];
@@ -18,25 +18,18 @@ stdenv.mkDerivation {
   hardeningDisable = [ "format" ];
   enableParallelBuilding = true;
 
-  buildPhase = ''
-    cd emu
-    make -f Makefile.$ARCH
-  '';
+  buildPhase = "cd emu && make -j $NIX_BUILD_CORES -f Makefile.$ARCH";
 
   installPhase = ''
     mkdir -p $out/bin
     cp picat $out/bin/picat
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Logic-based programming langage";
-    longDescription = ''
-      Picat is a simple, and yet powerful, logic-based multi-paradigm
-      programming language aimed for general-purpose applications.
-    '';
-    homepage = "http://picat-lang.org/";
-    license = stdenv.lib.licenses.mpl20;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.earldouglas ];
+    homepage    = "http://picat-lang.org/";
+    license     = licenses.mpl20;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ earldouglas thoughtpolice ];
   };
 }

From c73b85d2c3673a68fd9c860d243d05a4cf25466d Mon Sep 17 00:00:00 2001
From: Ivan Kovnatsky <sevenfourk@protonmail.ch>
Date: Fri, 20 Nov 2020 15:35:44 +0200
Subject: [PATCH 3028/3942] terraform-providers.gitlab: 2.9.0 -> 3.1.0

---
 .../cluster/terraform-providers/providers.json           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 3136529baed4..30a339e7ee0c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -333,11 +333,12 @@
     "version": "3.1.0"
   },
   "gitlab": {
-    "owner": "terraform-providers",
+    "owner": "gitlabhq",
+    "provider-source-address": "registry.terraform.io/gitlabhq/gitlab",
     "repo": "terraform-provider-gitlab",
-    "rev": "v2.9.0",
-    "sha256": "0l0b69nxxskpsylcgli2sm9qq7p4hw96dsri24w38shhnxmpysbb",
-    "version": "2.9.0"
+    "rev": "v3.1.0",
+    "sha256": "1an34ckz7lz1k25lkjpbmls55zp9pacr46vjnjjpqx6bx5s95f5g",
+    "version": "3.1.0"
   },
   "google": {
     "owner": "terraform-providers",

From eecd658af06a93f2af5aa76950fddcac2bde1a9b Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Wed, 18 Nov 2020 14:00:14 +0000
Subject: [PATCH 3029/3942] davix: fix src

---
 pkgs/tools/networking/davix/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
index 797791e1c0b9..ca9e7b033c51 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/pkgs/tools/networking/davix/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig python3 ];
   buildInputs = [ openssl libxml2 boost libuuid ];
 
-  # using the url below since the 0.7.6 release did carry a broken CMake file,
-  # supposedly fixed in the next release
-  # https://github.com/cern-fts/davix/issues/40
+  # using the url below since the github release page states
+  # "please ignore the GitHub-generated tarballs, as they are incomplete"
+  # https://github.com/cern-fts/davix/releases/tag/R_0_7_6
   src = fetchurl {
-    url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz";
+    url = "https://github.com/cern-fts/${pname}/releases/download/R_${stdenv.lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz";
     sha256 = "0wq66spnr616cns72f9dvr2xfvkdvfqqmc6d7dx29fpp57zzvrx2";
   };
 

From e875f355e34b9291cbdfdf321b463ff09e410997 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Wed, 18 Nov 2020 15:24:28 +0000
Subject: [PATCH 3030/3942] dsniff: fix src

---
 pkgs/tools/networking/dsniff/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix
index 7d8cf97f46d8..db9c608e931b 100644
--- a/pkgs/tools/networking/dsniff/default.nix
+++ b/pkgs/tools/networking/dsniff/default.nix
@@ -38,7 +38,7 @@ let
     inherit (openssl) name;
     paths = with openssl.override { static = true; }; [ out dev ];
   };
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   pname = "dsniff";
   version = "2.4b1";
   # upstream is so old that nearly every distribution packages the beta version.
@@ -49,7 +49,7 @@ in stdenv.mkDerivation {
     domain = "salsa.debian.org";
     owner = "pkg-security-team";
     repo = "dsniff";
-    rev = "debian%2F2.4b1%2Bdebian-29"; # %2B = urlquote("+"), %2F = urlquote("/")
+    rev = "debian/${version}+debian-29";
     sha256 = "10zz9krf65jsqvlcr72ycp5cd27xwr18jkc38zqp2i4j6x0caj2g";
     name = "dsniff.tar.gz";
   };

From fd38f3aa6b2e52a825673901976d97b3bd0c3d5e Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Wed, 18 Nov 2020 04:06:13 +0000
Subject: [PATCH 3031/3942] cre2: 0.3.0 -> 0.3.6

---
 pkgs/development/libraries/cre2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix
index 6f101fb5d471..fa4f5d232aa3 100644
--- a/pkgs/development/libraries/cre2/default.nix
+++ b/pkgs/development/libraries/cre2/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cre2";
-  version = "0.3.0";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "marcomaggi";
-    repo = "cre2";
+    repo = pname;
     rev = "v${version}";
     sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q";
   };

From a01da8ff91acd94ae2c16f490c7d71264b4b04b3 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 17 Nov 2020 16:06:10 +0100
Subject: [PATCH 3032/3942] electron: 8.5.2 -> 8.5.5

---
 pkgs/development/tools/electron/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 1c024ee4e5b5..c0b2ce25ae62 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -47,12 +47,12 @@ rec {
     aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066";
   };
 
-  electron_8 = mkElectron "8.5.2" {
-    x86_64-linux = "c5b8c95b410436066b06165e9759b31336c907268339433db4f8610ccf644a51";
-    x86_64-darwin = "079d951a28cfb7d1e0d3660e0fcb2dab85bd9e9f6848df5a06a7ac88ab3aa14c";
-    i686-linux = "0d108ac2420a437100f7a8d06aa019cd8138da4372fb94039b6d23c6253a6aea";
-    armv7l-linux = "f06ed475d1b206c3aa31e768add3517a64aabce5e2946e4d9707e615e6f398c0";
-    aarch64-linux = "e9765584bbedad8a806f96ac1381c114a357fdbed8c67573decefde2d15d9cd7";
+  electron_8 = mkElectron "8.5.5" {
+    x86_64-linux = "8058442ab4a18d73ca644d4a6f001e374c3736bc7e37db0275c29011681f1f22";
+    x86_64-darwin = "02bb9f672c063b23782bee6e336864609eed72cffeeea875a3b43c868c6bd8b3";
+    i686-linux = "c8ee6c3d86576fe7546fb31b9318cb55a9cd23c220357a567d1cb4bf1b8d7f74";
+    armv7l-linux = "0130d1fcd741552d2823bc8166eae9f8fc9f17cd7c0b2a7a5889d753006c0874";
+    aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5";
   };
 
   electron_9 = mkElectron "9.3.3" {

From 4bfad39416a5eee21dba7abc9f292d9217c86ecd Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 17 Nov 2020 16:06:35 +0100
Subject: [PATCH 3033/3942] electron: 9.3.3 -> 9.3.4

---
 pkgs/development/tools/electron/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index c0b2ce25ae62..fa5631504bb2 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -55,12 +55,12 @@ rec {
     aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5";
   };
 
-  electron_9 = mkElectron "9.3.3" {
-    x86_64-linux = "17f4db5e040ea20ce89d1d492ac575ed0b9ba451ef9cb0e8cd50918505c85243";
-    x86_64-darwin = "bb6188178ed1250ddaf29a2f232758c0f7878f1541ddb2ae2a0d20298599c7f4";
-    i686-linux = "e413b0879247b32bfbcc114e8d49109267137b2ece97db13eaf0ce3ac6187881";
-    armv7l-linux = "313abeb91efbc29d4f807a01937640580940a5fb2699c70b1c303b184ac7bec4";
-    aarch64-linux = "263eb89ccb47920baef43898d373531d369d2adc8b2f9e5ebc6429fe44b2fd5a";
+  electron_9 = mkElectron "9.3.4" {
+    x86_64-linux = "4791d854886cba4f461f37db41e6be1fbd8e41e7da01f215324f1fe19ad18ebf";
+    x86_64-darwin = "d6878093683ef901727d3b557f1ac928de86b7fffd2abd2c8315d0a9cfe20375";
+    i686-linux = "bd3cc9ddab3a9e54499f98e68b12f0aa30554c6527e1434b78743041aaae9417";
+    armv7l-linux = "1b175fe3e83494015714afb298b756187053dd84604746c60649a2abbb49ee36";
+    aarch64-linux = "626e4f79e9de57aef9e33f9788bf64375095ef43089eda6c6a87835ba58a7aa3";
   };
 
   electron_10 = mkElectron "10.1.5" {

From 0c93e105099d0ec3674fafb24ae513c5a33fd1cd Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Thu, 19 Nov 2020 11:05:03 +0100
Subject: [PATCH 3034/3942] electron: 10.1.5 -> 10.1.6

---
 pkgs/development/tools/electron/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index fa5631504bb2..2250c43d58a6 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -63,11 +63,11 @@ rec {
     aarch64-linux = "626e4f79e9de57aef9e33f9788bf64375095ef43089eda6c6a87835ba58a7aa3";
   };
 
-  electron_10 = mkElectron "10.1.5" {
-    x86_64-linux = "9db65dfe26d4fa9524b3005c6002d858ab256722cefb6a058de8e72e2d5c4083";
-    x86_64-darwin = "30dc5d5a913c38c6ae7fa6913b1a907545f0230157efc066e2d5a7affd26cd1e";
-    i686-linux = "bf8e1731e8b9b972c9054964b219d9b1b6baae9612afc8a5edf3503b815dd8c3";
-    armv7l-linux = "e270eab1a87283d7ae25c8127d904a52f130d53cc399bd288af7f99563273f33";
-    aarch64-linux = "03fa2418472f762377149fdd45d1e6ff0a324be3eb1b04e58c63d41df3dd0f16";
+  electron_10 = mkElectron "10.1.6" {
+    x86_64-linux = "d538ed7bb632d213a4b88d13bb038de65b85ae7b28a574c9efac7dc5a502ebbf";
+    x86_64-darwin = "7f24c666cc59935a49e5b82b4d4c1d008e4d6fac49c78d0645596f2cc8c7218d";
+    i686-linux = "009bbee26ddbf748b33588714ccc565257ff697cde2110e6b6547e3f510da85e";
+    armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951";
+    aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da";
   };
 }

From 8cde96396721ef55823be92c4f3e5722ef738d87 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 17 Nov 2020 16:03:53 +0100
Subject: [PATCH 3035/3942] electron_11: init at 11.0.2

make electron point to electron_11
---
 pkgs/development/tools/electron/default.nix | 27 +++++++++++++++++++--
 pkgs/development/tools/electron/generic.nix | 23 ++++++++++++++++--
 pkgs/top-level/all-packages.nix             |  2 +-
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 2250c43d58a6..d394103cb703 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,11 +1,26 @@
-{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core, libdrm, mesa }@args:
+{ stdenv
+, libXScrnSaver
+, makeWrapper
+, fetchurl
+, wrapGAppsHook
+, glib
+, gtk3
+, unzip
+, atomEnv
+, libuuid
+, at-spi2-atk
+, at-spi2-core
+, libdrm
+, mesa
+, libxkbcommon
+}@args:
 
 let
   mkElectron = import ./generic.nix args;
 in
 rec {
 
-  electron = electron_10;
+  electron = electron_11;
 
   electron_3 = mkElectron "3.1.13" {
     x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark";
@@ -70,4 +85,12 @@ rec {
     armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951";
     aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da";
   };
+
+  electron_11 = mkElectron "11.0.2" {
+    x86_64-linux = "a6e4f789d99e2ed879b48e7cbca2051805c3727360074edfe903231756eb5636";
+    x86_64-darwin = "4a562646440c3f4fa1ec4bbdb238da420158e19f294a0fbcdf32004465dbd516";
+    i686-linux = "ffcb2e40f98ee521ac50aa849cd911e62dae8a610bcca3f6d393b3f8d9bb85d8";
+    armv7l-linux = "7552f0c2aad05844ceacaaf13588b06b16e9aadd947084e8249214b24d1da38d";
+    aarch64-linux = "56b5ae4a33a9aa666fbe1463c7780d4c737c84119eff77d403fb969e8ff90ce0";
+  };
 }
diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix
index f24358676dd7..4e3f3511b961 100644
--- a/pkgs/development/tools/electron/generic.nix
+++ b/pkgs/development/tools/electron/generic.nix
@@ -1,4 +1,19 @@
-{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core, libdrm, mesa }:
+{ stdenv
+, libXScrnSaver
+, makeWrapper
+, fetchurl
+, wrapGAppsHook
+, glib
+, gtk3
+, unzip
+, atomEnv
+, libuuid
+, at-spi2-atk
+, at-spi2-core
+, libdrm
+, mesa
+, libxkbcommon
+}:
 
 version: hashes:
 let
@@ -34,7 +49,11 @@ let
     src = fetcher version (get tags platform) (get hashes platform);
   };
 
-  electronLibPath = with stdenv.lib; makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]);
+  electronLibPath = with stdenv.lib; makeLibraryPath (
+    [ libuuid at-spi2-atk at-spi2-core ]
+    ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]
+    ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ]
+  );
 
   linux = {
     buildInputs = [ glib gtk3 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 817e475979d3..8b61989dd253 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10804,7 +10804,7 @@ in
   aws-adfs = with python3Packages; toPythonApplication aws-adfs;
 
   inherit (callPackages ../development/tools/electron { })
-    electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10;
+    electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11;
 
   autobuild = callPackage ../development/tools/misc/autobuild { };
 

From 055e7e6f1ce7edc4637df7be8b13a4fc88cd1118 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 16:26:39 +0000
Subject: [PATCH 3036/3942] you-get: 0.4.1475 -> 0.4.1488

---
 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 155081db36a1..053d2ae59d2a 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.1475";
+  version = "0.4.1488";
 
   # 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 = "432c04170bb5f4881ca6af9c802b6c90e81759811487b8d7918762dcd674697f";
+    sha256 = "28aec2f15e86ea1cbf9900827ade41388aa3f1ac43b4ab49999bce48f37cf9c3";
   };
 
   meta = with stdenv.lib; {

From a57bf2dc18d03f3d805d84e3da205f4bc09c6204 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Nov 2020 16:27:38 +0000
Subject: [PATCH 3037/3942] =?UTF-8?q?oh-my-zsh:=202020-11-12=20=E2=86=92?=
 =?UTF-8?q?=202020-11-20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 adeab519a0b7..f9cf4f54aad9 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
 
 stdenv.mkDerivation rec {
-  version = "2020-11-12";
+  version = "2020-11-20";
   pname = "oh-my-zsh";
-  rev = "9b119866dd0e2d5054abd992f4dfbf346ac81b0d";
+  rev = "d57131dc49500a056c5b78b0fb444c7cb1ca83cd";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "0m65ii79lp8mhl4adicg4qqzj93321gxpg6s91h0wbpkdgd53qxw";
+    sha256 = "073c6ni7a74gvb98y9z7xsc4x0i6p1r2sxp6bwdv3z8lsj8mfbd7";
   };
 
   installPhase = ''

From be0c84f362beaeed912472733292d1e7a0e4e8f0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Nov 2020 16:27:42 +0000
Subject: [PATCH 3038/3942] =?UTF-8?q?scala:=202.13.3=20=E2=86=92=202.13.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/scala/2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix
index 02b9b99d84d2..91fe0b07d2e9 100644
--- a/pkgs/development/compilers/scala/2.x.nix
+++ b/pkgs/development/compilers/scala/2.x.nix
@@ -109,8 +109,8 @@ in {
   };
 
   scala_2_13 = common {
-    version = "2.13.3";
-    sha256 = "yfNzG8zybPOaxUExcvtBZGyxn2O4ort1846JZ1ziaX8=";
+    version = "2.13.4";
+    sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw";
     test = { inherit (nixosTests) scala_2_13; };
     pname = "scala_2_13";
   };

From f9441847382a7cba34784939d987f2439ebfc47c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Nov 2020 16:27:43 +0000
Subject: [PATCH 3039/3942] =?UTF-8?q?sbt-extras:=202020-11-17=20=E2=86=92?=
 =?UTF-8?q?=202020-11-20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/tools/build-managers/sbt-extras/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index b7c632fb1edd..c4228602871d 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "sbt-extras";
-  rev = "b3ecc86936d005dc3327ebd6b61a33d625d60ee6";
-  version = "2020-11-17";
+  rev = "42d33338e52cee115cebc3e4ee2acc1ca766f319";
+  version = "2020-11-20";
 
   src = fetchFromGitHub {
     owner = "paulp";
     repo = "sbt-extras";
     inherit rev;
-    sha256 = "0cnwvjqs81ca0ssj02x41fq6fn1drqwzpbc7v006vgbard8ww9xb";
+    sha256 = "0k0n8q8695rdy1vas9n9m9819rpmf38d3bbkffnn7mf7qa01mxq1";
   };
 
   dontBuild = true;

From c9737f0870093888d9f5504e45cb4c78bdac6298 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Nov 2020 11:31:25 -0500
Subject: [PATCH 3040/3942] linux/hardened/patches/4.14: 4.14.206.a ->
 4.14.207.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 101b8fdb6c80..26e80895f7ee 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,8 +1,8 @@
 {
     "4.14": {
-        "name": "linux-hardened-4.14.206.a.patch",
-        "sha256": "17pd23lvhkpa923nw24g5b0gv0kmzj9jkkmc8366k86r0zxk6z53",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.206.a/linux-hardened-4.14.206.a.patch"
+        "name": "linux-hardened-4.14.207.a.patch",
+        "sha256": "0rkpsp3hs8wypg8pgz804hgrncdchv2xmzy5ji7mkkjnasa6nr4w",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.207.a/linux-hardened-4.14.207.a.patch"
     },
     "4.19": {
         "name": "linux-hardened-4.19.157.a.patch",

From 674e6d9c0fc9d4237fb52cd5255f502292cf6176 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Nov 2020 11:31:27 -0500
Subject: [PATCH 3041/3942] linux/hardened/patches/4.19: 4.19.157.a ->
 4.19.158.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 26e80895f7ee..a78a054e784b 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -5,9 +5,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.207.a/linux-hardened-4.14.207.a.patch"
     },
     "4.19": {
-        "name": "linux-hardened-4.19.157.a.patch",
-        "sha256": "159v7z1a55b5kcmkrdna18hvcnscxf79r00kvr0kl8flvsnhf1p0",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.157.a/linux-hardened-4.19.157.a.patch"
+        "name": "linux-hardened-4.19.158.a.patch",
+        "sha256": "0qjqnw3i6i6q80clfyrpid2gxg4r7vgskpxf1wk7x5wmfz9qahyn",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.158.a/linux-hardened-4.19.158.a.patch"
     },
     "5.4": {
         "name": "linux-hardened-5.4.77.a.patch",

From 1c6f19bfbeb5e7347ffb643dd9a73c928f44b8a5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Nov 2020 11:31:29 -0500
Subject: [PATCH 3042/3942] linux/hardened/patches/5.4: 5.4.77.a -> 5.4.78.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index a78a054e784b..6112023fc777 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -10,9 +10,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.158.a/linux-hardened-4.19.158.a.patch"
     },
     "5.4": {
-        "name": "linux-hardened-5.4.77.a.patch",
-        "sha256": "0b47id64vi55s7lmyasmvhwbfcv9cjwfhw9g4lf220g0rnl6h8jm",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.77.a/linux-hardened-5.4.77.a.patch"
+        "name": "linux-hardened-5.4.78.a.patch",
+        "sha256": "1k98c9ija8s1ggs7jq1r02l7y1g276hrqdvx6sn66ldkspkx4vmr",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.78.a/linux-hardened-5.4.78.a.patch"
     },
     "5.8": {
         "name": "linux-hardened-5.8.18.a.patch",

From b5fdfc2ec689326fe53848ef1df5cb1aadbcbb6a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Nov 2020 11:31:31 -0500
Subject: [PATCH 3043/3942] linux/hardened/patches/5.9: 5.9.8.a -> 5.9.9.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 6112023fc777..59dc1a61d425 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -20,8 +20,8 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch"
     },
     "5.9": {
-        "name": "linux-hardened-5.9.8.a.patch",
-        "sha256": "1sb4rsd3yfh49aqg5j24zav9x38c44q7d9pyx6pb8pl368rd26l4",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.8.a/linux-hardened-5.9.8.a.patch"
+        "name": "linux-hardened-5.9.9.a.patch",
+        "sha256": "0qm4rs22rcclhcw691adwy939ch28ibq4ncngzp2x0wlvb2zggy2",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.9.a/linux-hardened-5.9.9.a.patch"
     }
 }

From dd1afe3207da66fb72fbe1b32fa452a76739da45 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 17:14:33 +0000
Subject: [PATCH 3044/3942] picard: 2.5.1 -> 2.5.2

---
 pkgs/applications/audio/picard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 2cb4ff09803c..fb6f59d0ded7 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -12,13 +12,13 @@ let
   ;
 in pythonPackages.buildPythonApplication rec {
   pname = "picard";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
     owner = "metabrainz";
     repo = pname;
     rev = "release-${version}";
-    sha256 = "13q926iqwdba6ds5s3ir57c9bkg8gcv6dhqvhmg00fnzkq9xqk3d";
+    sha256 = "193pk6fhrqar2ra8krj6xdd7sm5qfw0p708iazzwk4b8c8g0q72j";
   };
 
   nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]

From 11c8754ef977d795738bd6e9106c819b69aed607 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Thu, 19 Nov 2020 09:12:21 +0100
Subject: [PATCH 3045/3942] skalibs: 2.9.1.0 -> 2.9.3.0

---
 pkgs/development/libraries/skalibs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 1628120ca583..a691107f9a1d 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "skalibs";
-  version = "2.9.2.1";
-  sha256 = "0ff551181vv9d1z5sv7yg6n4b88ajcdircs4p4nif4yl7nsrj2r5";
+  version = "2.9.3.0";
+  sha256 = "0i1vg3bh0w3bpj7cv0kzs6q9v2dd8wa2by8h8j39fh1qkl20f6ph";
 
   description = "A set of general-purpose C programming libraries";
 

From 193fccc7633b751d5a77ae63ebca879a3b71bac1 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Thu, 19 Nov 2020 09:16:04 +0100
Subject: [PATCH 3046/3942] s6: 2.9.1.0 -> 2.9.2.0

---
 pkgs/tools/system/s6/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index 3ce97a9d97bd..a0419c2d2ad4 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "s6";
-  version = "2.9.1.0";
-  sha256 = "1xqzl2wnvcmcyhppk7mc10h1ac7fkik3i6gpyliwpf3d5i9mkqh5";
+  version = "2.9.2.0";
+  sha256 = "1pfxx50shncg2s47ic4kp02jh1cxfjq75j3mnxjagyzzz0mbfg9n";
 
   description = "skarnet.org's small & secure supervision software suite";
 

From cdf4a0afe9a95003972ac4763558f4827cd55e61 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Thu, 19 Nov 2020 09:18:15 +0100
Subject: [PATCH 3047/3942] execline: 2.6.1.0 -> 2.6.1.1

---
 pkgs/tools/misc/execline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index ecedd2b0b417..dfc2b1756feb 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -7,8 +7,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "execline";
-  version = "2.6.1.0";
-  sha256 = "0mj565xml3hvw27finydms0s9abbbpgbr29vnr8gwi7zjzq7ck52";
+  version = "2.6.1.1";
+  sha256 = "0mmsnai3bkyhng0cxdz6bf7d6b7kbsxs4p39m63215lz6kq0hhrr";
 
   description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
 

From 561832ef7bc89166796c2c04993d241e908d7607 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Thu, 19 Nov 2020 09:20:51 +0100
Subject: [PATCH 3048/3942] s6-rc: 0.5.1.2 -> 0.5.2.0

---
 pkgs/tools/system/s6-rc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index 4ddc7fbecc01..328dd3242d84 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "s6-rc";
-  version = "0.5.1.2";
-  sha256 = "18m8jsx3bkj566p6xwwnsvdckk10n8wqnhp0na2k88i295h4rnjp";
+  version = "0.5.2.0";
+  sha256 = "1qpygkajalaziszhwfv5rr6hc27q05z8dayyv7im06z6vndimchs";
 
   description = "A service manager for s6-based systems";
   platforms = stdenv.lib.platforms.linux;

From ecaa0e1058103ed291949d1f79908697184872df Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Thu, 19 Nov 2020 09:24:00 +0100
Subject: [PATCH 3049/3942] s6-linux-utils: 2.5.1.2 -> 2.5.1.3

---
 pkgs/os-specific/linux/s6-linux-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index 74bf913df982..5c4fc7622453 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "s6-linux-utils";
-  version = "2.5.1.2";
-  sha256 = "0w4jms9qyb5kx9zcyd3gzri60rrii2rbmh08s59ckg4awy27py86";
+  version = "2.5.1.3";
+  sha256 = "0wbv02zxaami88xbj2zg63kspz05bbplswg0c6ncb5g9khf52wa4";
 
   description = "A set of minimalistic Linux-specific system utilities";
   platforms = stdenv.lib.platforms.linux;

From bc49e5f6efae8c5dd8aeb54543bd0e599e69222d Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Thu, 19 Nov 2020 09:25:28 +0100
Subject: [PATCH 3050/3942] s6-portable-utils: 2.2.2.2 -> 2.2.3.0

---
 pkgs/tools/misc/s6-portable-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index bc32489c588e..fee6ae14bbde 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -7,8 +7,8 @@ let
 
 in buildPackage {
   pname = pname;
-  version = "2.2.2.2";
-  sha256 = "1k3la37q46n93vjwk9wm9ym4w87z6lqzv43f03qd0vqj9k94mpv3";
+  version = "2.2.3.0";
+  sha256 = "063zwifigg2b3wsixdcz4h9yvr6fkqssvx0iyfsprjfmm1yapfi9";
 
   description = "A set of tiny general Unix utilities optimized for simplicity and small size";
 

From 1cbdc2123d3187a9ee57a7321a5ddec1a4fcfeb5 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Thu, 19 Nov 2020 05:23:02 +0100
Subject: [PATCH 3051/3942] perlPackages.WWWTwilioAPI: init at 0.21

---
 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 f88b68d73c7d..aa4bdd5f13ad 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -22461,6 +22461,21 @@ let
     };
   };
 
+  WWWTwilioAPI = buildPerlPackage {
+    pname = "WWW-Twilio-API";
+    version = "0.21";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SC/SCOTTW/WWW-Twilio-API-0.21.tar.gz";
+      sha256 = "582db53a091f8da3670c037733314f2510af5e8ee0ba42a0e391e2f2e3ca7734";
+    };
+    prePatch = "rm examples.pl";
+    propagatedBuildInputs = [ LWPProtocolhttps ];
+    meta = {
+      description = "Accessing Twilio's REST API with Perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   WWWYoutubeViewer = callPackage ../development/perl-modules/WWW-YoutubeViewer { };
 
   Want = buildPerlPackage {

From 11672f2d562997f47f1fc98c439ef67d3db45081 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 17:21:45 +0000
Subject: [PATCH 3052/3942] thonny: 3.2.7 -> 3.3.0

---
 pkgs/applications/editors/thonny/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix
index 706d3fd71763..c3710cf5b22b 100644
--- a/pkgs/applications/editors/thonny/default.nix
+++ b/pkgs/applications/editors/thonny/default.nix
@@ -4,13 +4,13 @@ with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "thonny";
-  version = "3.2.7";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0gzvdgg5l4j0wgkh7lp4wjabrpxvvs5m7mnpszqixxijdffjd4cj";
+    sha256 = "1k1iy01az65w463j6id7iyrbinjbjd220i100mrnxyn569dxmf34";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From a20cf479b3f6c802a311e2185140be7f122e24b3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 19 Nov 2020 20:17:54 -0800
Subject: [PATCH 3053/3942] python2Packages.locustio: remove, unmaintained

---
 .../python-modules/locustio/default.nix       | 35 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 37 deletions(-)
 delete mode 100644 pkgs/development/python-modules/locustio/default.nix

diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix
deleted file mode 100644
index 0b64fc39feb7..000000000000
--- a/pkgs/development/python-modules/locustio/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ buildPythonPackage, fetchFromGitHub, isPy38
-, flask
-, gevent
-, mock
-, msgpack
-, pyzmq
-, requests
-, unittest2
-}:
-
-buildPythonPackage rec {
-  pname = "locustio";
-  version = "0.14.4";
-  # tests hang on python38
-  disabled = isPy38;
-
-  src = fetchFromGitHub {
-    owner = "locustio";
-    repo = "locust";
-    rev = version;
-    sha256 = "1645d63ig4ymw716b6h53bhmjqqc13p9r95k1xfx66ck6vdqnisd";
-  };
-
-  propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ];
-  checkInputs = [ mock unittest2 ];
-  # remove file which attempts to do GET request
-  preCheck = ''
-    rm locust/test/test_stats.py
-  '';
-
-  meta = {
-    homepage = "https://locust.io/";
-    description = "A load testing tool";
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 015d27c56608..540d5a8974ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3547,8 +3547,6 @@ in {
 
   lockfile = callPackage ../development/python-modules/lockfile { };
 
-  locustio = callPackage ../development/python-modules/locustio { };
-
   Logbook = callPackage ../development/python-modules/Logbook { };
 
   logfury = callPackage ../development/python-modules/logfury { };

From 338a4dbd327f7d6cbc8320f6b2105da1c1ed3d3b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 15:56:54 +0000
Subject: [PATCH 3054/3942] python27Packages.glom: 20.8.0 -> 20.11.0

---
 pkgs/development/python-modules/glom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix
index 916812f15354..cae43e59c288 100644
--- a/pkgs/development/python-modules/glom/default.nix
+++ b/pkgs/development/python-modules/glom/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "glom";
-  version = "20.8.0";
+  version = "20.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5fa3a9d99c7f3e5410a810fa8a158c0f71e39036c47b77745c7f2e4630372f82";
+    sha256 = "54051072bccc9cdb3ebbd8af0559195137a61d308f04bff19678e4b61350eb12";
   };
 
   propagatedBuildInputs = [ boltons attrs face ];

From 7042bc3fe9c68834ad3460c88814777e31e4694c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 15:29:03 +0000
Subject: [PATCH 3055/3942] python27Packages.jsonrpc-base: 1.0.3 -> 1.1.0

---
 pkgs/development/python-modules/jsonrpc-base/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix
index 3505a13bbd1f..9318fc09373c 100644
--- a/pkgs/development/python-modules/jsonrpc-base/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-base/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "jsonrpc-base";
-  version = "1.0.3";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7bda99589b4566f5027c2aeae122f409d8ccf4c811b278b8cfb616903871efb2";
+    sha256 = "7f374c57bfa1cb16d1f340d270bc0d9f1f5608fb1ac6c9ea15768c0e6ece48b7";
   };
 
   propagatedBuildInputs = [ ];

From 87e9b49fc785a6ff20080a1c80b35dfb95c8c222 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@gmail.com>
Date: Tue, 17 Nov 2020 20:50:06 -0500
Subject: [PATCH 3056/3942] pythonPackages.debugpy: 1.1.0 -> 1.2.0

---
 .../python-modules/debugpy/default.nix        | 16 +++---
 .../debugpy/hardcode-version.patch            | 51 +++++++++++++++++++
 2 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/python-modules/debugpy/hardcode-version.patch

diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 5f10b7897e96..75a11d8cf263 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "debugpy";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1f6a62hg82fn9ddrl6g11x2h27zng8jmrlfbnnra6q590i5v1ixr";
+    sha256 = "1r5w5ngipj5fgjylrmlw3jrh5y2n67n68l91sj9329549x4ww8dh";
   };
 
   patches = [
@@ -34,6 +34,11 @@ buildPythonPackage rec {
       inherit gdb;
     })
 
+    (substituteAll {
+      src = ./hardcode-version.patch;
+      inherit version;
+    })
+
     # Fix importing debugpy in:
     # - test_nodebug[module-launch(externalTerminal)]
     # - test_nodebug[module-launch(integratedTerminal)]
@@ -45,13 +50,6 @@ buildPythonPackage rec {
     ./fix-test-pythonpath.patch
   ];
 
-  postPatch = ''
-    # Use nixpkgs version instead of versioneer
-    substituteInPlace setup.py \
-      --replace "cmds = versioneer.get_cmdclass()" "cmds = {}" \
-      --replace "version=versioneer.get_version()" "version='${version}'"
-  '';
-
   # Remove pre-compiled "attach" libraries and recompile for host platform
   # Compile flags taken from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh
   preBuild = ''(
diff --git a/pkgs/development/python-modules/debugpy/hardcode-version.patch b/pkgs/development/python-modules/debugpy/hardcode-version.patch
new file mode 100644
index 000000000000..2879716f704d
--- /dev/null
+++ b/pkgs/development/python-modules/debugpy/hardcode-version.patch
@@ -0,0 +1,51 @@
+diff --git a/setup.py b/setup.py
+index cfec60d..32ca206 100644
+--- a/setup.py
++++ b/setup.py
+@@ -24,7 +24,6 @@ elif "--abi" in sys.argv:
+ from setuptools import setup  # noqa
+ 
+ sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+-import versioneer  # noqa
+ 
+ del sys.path[0]
+ 
+@@ -86,7 +85,7 @@ if __name__ == "__main__":
+     if not os.getenv("SKIP_CYTHON_BUILD"):
+         cython_build()
+ 
+-    cmds = versioneer.get_cmdclass()
++    cmds = {}
+     cmds["bdist_wheel"] = bdist_wheel
+ 
+     extras = {}
+@@ -96,7 +95,7 @@ if __name__ == "__main__":
+ 
+     setup(
+         name="debugpy",
+-        version=versioneer.get_version(),
++        version="@version@",
+         description="An implementation of the Debug Adapter Protocol for Python",  # noqa
+         long_description=long_description,
+         long_description_content_type="text/markdown",
+diff --git a/src/debugpy/__init__.py b/src/debugpy/__init__.py
+index baa5a7c..5355327 100644
+--- a/src/debugpy/__init__.py
++++ b/src/debugpy/__init__.py
+@@ -27,7 +27,6 @@ __all__ = [
+ import codecs
+ import os
+ 
+-from debugpy import _version
+ from debugpy.common import compat
+ 
+ 
+@@ -204,7 +203,7 @@ def trace_this_thread(should_trace):
+     return api.trace_this_thread(should_trace)
+ 
+ 
+-__version__ = _version.get_versions()["version"]
++__version__ = "@version@"
+ 
+ # Force absolute path on Python 2.
+ __file__ = os.path.abspath(__file__)

From 22d4da89702511c514a7ee5c45420ed3dd1faf02 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Fri, 20 Nov 2020 18:25:29 +0100
Subject: [PATCH 3057/3942] metals: 0.9.5 -> 0.9.6

---
 pkgs/development/tools/metals/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index 19e666ced11a..37c99eaca857 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "metals";
-  version = "0.9.5";
+  version = "0.9.6";
 
   deps = stdenv.mkDerivation {
     name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "1hcfnxxahh3yfkpz6ybfr9xsf5mx008rhn7q6p8pmfxrgkdh4c1l";
+    outputHash     = "0cjivkrykvp2m8bj3x9fsk7nsr5vxf87jfh4rjn24kfliljwfh2w";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ae6ad232ef0d46eb5603d243f0f95cbadd7c05d3 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 20 Nov 2020 18:31:50 +0100
Subject: [PATCH 3058/3942] neomutt: 20200925 -> 20201120

---
 .../networking/mailreaders/neomutt/default.nix   | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 8d3fb26b06c4..c068357a0f65 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -6,14 +6,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "20200925";
+  version = "20201120";
   pname = "neomutt";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = version;
-    sha256 = "1q931n9sijq1iin3swzk57rz7qmy485hvr1fahy5i2wd1xx9yhb2";
+    sha256 = "0z6xavgd0zv9pqvfsdyvhhi1q3y7zxhgg24isbnn9r6mldafqwna";
   };
 
   buildInputs = [
@@ -22,18 +22,6 @@ stdenv.mkDerivation rec {
     mailcap sqlite
   ];
 
-  patches = [
-    # To be removed on next release. Fixes two bugs in the sidebar behavior.
-    (fetchpatch {
-      url = "https://github.com/neomutt/neomutt/commit/96753674e70edb695c1dc7af73e3317956c1b259.patch";
-      sha256 = "0yjmgdfhn8ra7bc3d40c3c29imgpgbhzphjxp6575llh9kw5h53s";
-    })
-    (fetchpatch {
-      url = "https://github.com/neomutt/neomutt/commit/6078653c9233644ca76c24bdb64e49bd443dd714.patch";
-      sha256 = "1s1p86bqpc9xq9z5qfh0mxxh6syps8shq0dm7bbkg1bz7qya5phy";
-    })
-  ];
-
   nativeBuildInputs = [
     docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m
   ];

From 4615d67ac6ae6cf1657cf01d861caa56a29b573e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 17:43:07 +0000
Subject: [PATCH 3059/3942] mavproxy: 1.8.23 -> 1.8.24

---
 pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix
index dcc2114a4886..b245ae384ae6 100644
--- a/pkgs/applications/science/robotics/mavproxy/default.nix
+++ b/pkgs/applications/science/robotics/mavproxy/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonApplication rec {
   pname = "MAVProxy";
-  version = "1.8.23";
+  version = "1.8.24";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "46c70e013d3e465daae5523f6a1aad553e6ee0f4db137bb935a3273f7ffcc22e";
+    sha256 = "768deb3c1d96ed8d734a2fe2eb7cc3877309b17fb5353e9d7036830283806885";
   };
 
   propagatedBuildInputs = [

From 6f6c9af4bce9b023d52309efce1aa4f5b2cb7828 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 09:36:02 +0000
Subject: [PATCH 3060/3942] python27Packages.databricks-cli: 0.11.0 -> 0.14.0

---
 pkgs/development/python-modules/databricks-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix
index 952f0723c7c2..8672f0776242 100644
--- a/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/pkgs/development/python-modules/databricks-cli/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "databricks-cli";
-  version = "0.11.0";
+  version = "0.14.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b3c7205dd8cb9935c475794ebd41b53aba79a53e028d3cf6b5871eec83c89ec0";
+    sha256 = "68e5cdcf4ca26d3c628bca26e44563d58e64d3b2805b9adb94b4006976d9c7e1";
   };
 
   checkInputs = [

From b80ab1565de292d9e9c2cc3186f9ae84d73a01e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 16:03:26 +0000
Subject: [PATCH 3061/3942] python27Packages.ijson: 3.1.1 -> 3.1.2.post0

---
 pkgs/development/python-modules/ijson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix
index d877c0983540..a09fb7b1eff0 100644
--- a/pkgs/development/python-modules/ijson/default.nix
+++ b/pkgs/development/python-modules/ijson/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "ijson";
-  version = "3.1.1";
+  version = "3.1.2.post0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "815e9ce9d2de7ddd58ba01834d8f55790b7daddbac6c844cba0fc459b7d5005a";
+    sha256 = "04fd8ebb8edb39db81f49b75b101d1e2a4d0728460e253fd9c98e3e17f9caa16";
   };
 
   doCheck = false; # something about yajl

From 323452033720e53aad793a70a27bc9ebd7013a38 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 19 Nov 2020 17:24:08 -0800
Subject: [PATCH 3062/3942] python3Packages.gevent: 20.5.2 -> 20.9.0

---
 pkgs/development/python-modules/gevent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix
index 4eb5c7cdbb9f..bf066f519065 100644
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/pkgs/development/python-modules/gevent/default.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "gevent";
-  version = "20.5.2";
+  version = "20.9.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2756de36f56b33c46f6cc7146a74ba65afcd1471922c95b6771ce87b279d689c";
+    sha256 = "13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz";
   };
 
   buildInputs = [ libev ];

From 0aeddb448d9c265e73b2d76cdf5b6f77d250da4e Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 19 Nov 2020 17:35:14 -0800
Subject: [PATCH 3063/3942] python3Packages.greenlet: 0.4.16 -> 0.4.17

---
 pkgs/development/python-modules/greenlet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index c325c9652491..9d00e93739c3 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "greenlet";
-  version = "0.4.16";
+  version = "0.4.17";
   disabled = isPyPy;  # builtin for pypy
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c";
+    sha256 = "0swdhrcq13bdszv3yz5645gi4ijbzmmhxpb6whcfg3d7d5f87n21";
   };
 
   propagatedBuildInputs = [ six ];

From 06003e01f88ed8d29df0b10bfb6610ec7c2ad3cd Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 19 Nov 2020 18:26:24 -0800
Subject: [PATCH 3064/3942] python3Packages.cassandra-driver: mark broken

geomet doesn't exist in nixpkgs
---
 pkgs/development/python-modules/cassandra-driver/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix
index ecb1edf5958a..32cf844cf00c 100644
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -42,5 +42,6 @@ buildPythonPackage rec {
     description = "A Python client driver for Apache Cassandra";
     homepage = "http://datastax.github.io/python-driver";
     license = licenses.asl20;
+    broken = true; # geomet doesn't exist
   };
 }

From 58cc7968be79057f56b756863fb03641ac85c8a0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 19 Nov 2020 19:53:31 -0800
Subject: [PATCH 3065/3942] python3Packages.gipc: mark broken

no longer compatible with a recent version of gevent
---
 pkgs/development/python-modules/gipc/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix
index 3fe26f4a934b..04dc8b0c068d 100644
--- a/pkgs/development/python-modules/gipc/default.nix
+++ b/pkgs/development/python-modules/gipc/default.nix
@@ -27,6 +27,8 @@ buildPythonPackage rec {
     '';
     homepage = "http://gehrcke.de/gipc";
     license = licenses.mit;
+    # gipc only has support for older versions of gevent
+    broken = versionOlder "1.6" gevent.version;
   };
 
 }

From ebf2f217a43ab4f39dcb8751e4a28d7d19c66806 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 05:15:28 +0000
Subject: [PATCH 3066/3942] python27Packages.broadlink: 0.14.1 -> 0.16.0

---
 pkgs/development/python-modules/broadlink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix
index 685ca57b7efd..dcb1368f4116 100644
--- a/pkgs/development/python-modules/broadlink/default.nix
+++ b/pkgs/development/python-modules/broadlink/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "broadlink";
-  version = "0.14.1";
+  version = "0.16.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5c443d4639b737069e5e27df451b6e89c5ed50be81899e4ea02adb355bf3d724";
+    sha256 = "637dabc6f47b283b72bc521322554462da7a247f04614e458d65df8574d03a41";
   };
 
   postPatch = ''

From a7a38974b1dc5f012b754112a3e5bc16e0068571 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 05:47:06 +0000
Subject: [PATCH 3067/3942] python27Packages.dockerfile-parse: 1.0.0 -> 1.1.0

---
 pkgs/development/python-modules/dockerfile-parse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix
index c0b14bf88ca5..e3a998126e9c 100644
--- a/pkgs/development/python-modules/dockerfile-parse/default.nix
+++ b/pkgs/development/python-modules/dockerfile-parse/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }:
 
 buildPythonPackage rec {
-  version = "1.0.0";
+  version = "1.1.0";
   pname = "dockerfile-parse";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9ed92ede29a646094b52b8b302e477f08e63465b6ee524f5750810280143712e";
+    sha256 = "f37bfa327fada7fad6833aebfaac4a3aaf705e4cf813b737175feded306109e8";
   };
 
   postPatch = ''

From 83cad7d019ab3be56fc794545aca25d811817064 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 06:07:51 +0000
Subject: [PATCH 3068/3942] python38Packages.atom: 0.5.2 -> 0.6.0

---
 pkgs/development/python-modules/atom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix
index 60fa12d4a661..cb9503fe6e9c 100644
--- a/pkgs/development/python-modules/atom/default.nix
+++ b/pkgs/development/python-modules/atom/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "atom";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "99b4c94b833aafffc0b34ab8f98b697f575be3230bff38ebf863d065403333e0";
+    sha256 = "df65a654744ccdc4843ce09c38612fd8f702c84be501b1d955c3ac0b9ad28dc5";
   };
 
   buildInputs = [ cppy ];

From ad9256dd3ea32c480a0f679f7204199174180656 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 20 Nov 2020 19:09:03 +0100
Subject: [PATCH 3069/3942] mutt: 2.0.1 -> 2.0.2

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 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 696fb504c1b8..0a6f3d1a1381 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 {
   pname = "mutt";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
-    sha256 = "1nr1n0lshif6lrn4c5ym473jrg0jaka5wfyy06qmbxhnavmgvx8c";
+    sha256 = "1j0i2jmlk5sc78af9flj3ynj0iiwa8biw7jgf12qm5lppsx1h4j7";
   };
 
   patches = optional smimeSupport (fetchpatch {

From 8b010d890466ec0dc6a255b7e1e2f562d6f881bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 06:22:28 +0000
Subject: [PATCH 3070/3942] python27Packages.azure-mgmt-loganalytics: 1.0.0 ->
 2.0.0

---
 .../python-modules/azure-mgmt-loganalytics/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
index d77f187d65e3..525a72a7009d 100644
--- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-loganalytics";
-  version = "1.0.0";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "7eb052a1c4bb037c06a0aff740378bd54a6ae256bf5cb71faa14b4eb61281488";
+    sha256 = "947cada6e52fea6ecae7011d7532cf8edbe90250753a58749c473b863331fcc6";
   };
 
   propagatedBuildInputs = [

From c16a97738623b85eaa685eb1e1b5f16182641215 Mon Sep 17 00:00:00 2001
From: Jeff Slight <jslight90@gmail.com>
Date: Mon, 28 Sep 2020 14:42:57 -0700
Subject: [PATCH 3071/3942] gitlab: 13.0.14 -> 13.4.3

13.4.3
---
 .../version-management/gitlab/data.json       |   14 +-
 .../version-management/gitlab/default.nix     |    6 +-
 .../version-management/gitlab/gitaly/Gemfile  |   10 +-
 .../gitlab/gitaly/Gemfile.lock                |   46 +-
 .../gitlab/gitaly/default.nix                 |    6 +-
 .../version-management/gitlab/gitaly/deps.nix |   12 +-
 .../gitlab/gitaly/fix-executable-check.patch  |   10 +-
 .../gitlab/gitaly/gemset.nix                  |   68 +-
 .../gitlab/gitlab-shell/default.nix           |    8 +-
 .../gitlab/gitlab-shell/deps.nix              | 1288 ++++++-
 .../remove-hardcoded-locations.patch          |   16 +-
 .../gitlab/gitlab-workhorse/default.nix       |    4 +-
 .../gitlab/gitlab-workhorse/deps.nix          |  932 ++++-
 .../gitlab/remove-hardcoded-locations.patch   |   10 +-
 .../version-management/gitlab/rubyEnv/Gemfile |  110 +-
 .../gitlab/rubyEnv/Gemfile.lock               |  616 ++--
 .../gitlab/rubyEnv/gemset.nix                 |  891 +++--
 .../version-management/gitlab/yarnPkgs.nix    | 3008 ++++++++++-------
 18 files changed, 5018 insertions(+), 2037 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 9389934ffc68..0c6f40550f96 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
 {
-  "version": "13.0.14",
-  "repo_hash": "15is18x631ifsj4iwmrs1s9lc3i99hwsxxf5v42qldbmsys31l1k",
+  "version": "13.4.3",
+  "repo_hash": "19nk692ik26qcc1gcvbbrvadg6169v34gd8h7d5bwfjk12idj1id",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v13.0.14-ee",
+  "rev": "v13.4.3-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "13.0.14",
-    "GITLAB_PAGES_VERSION": "1.18.0",
-    "GITLAB_SHELL_VERSION": "13.2.0",
-    "GITLAB_WORKHORSE_VERSION": "8.31.2"
+    "GITALY_SERVER_VERSION": "13.4.3",
+    "GITLAB_PAGES_VERSION": "1.25.0",
+    "GITLAB_SHELL_VERSION": "13.7.0",
+    "GITLAB_WORKHORSE_VERSION": "8.46.0"
   }
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 76127681bbd9..549d1a1f5601 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
-, ruby, tzdata, git, nettools, nixosTests, nodejs
+, ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
 , gitlabEnterprise ? false, callPackage, yarn
 , fixup_yarn_lock, replace
 }:
@@ -28,6 +28,10 @@ let
           patches = [ ./fix-grpc-ar.patch ];
           dontBuild = false;
         };
+        # the openssl needs the openssl include files
+        openssl = x.openssl // {
+          buildInputs = [ openssl ];
+        };
       };
     groups = [
       "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index 8a35c8c3b475..cdb388b5d8df 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -10,9 +10,9 @@ gem 'activesupport', '~> 6.0.3.1'
 gem 'rdoc', '~> 6.0'
 gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false
 gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
-gem 'grpc', '~> 1.24.0'
-gem 'sentry-raven', '~> 2.9.0', require: false
-gem 'faraday', '~> 0.12'
+gem 'grpc', '~> 1.30.2'
+gem 'sentry-raven', '~> 3.0', require: false
+gem 'faraday', '~> 1.0'
 gem 'rbtrace', require: false
 
 # Labkit provides observability functionality
@@ -22,7 +22,7 @@ gem 'gitlab-labkit', '~> 0.12.0'
 # This version needs to be in sync with GitLab CE/EE
 gem 'licensee', '~> 8.9.0'
 
-gem 'google-protobuf', '~> 3.8.0'
+gem 'google-protobuf', '~> 3.12'
 
 group :development, :test do
   gem 'rubocop', '~> 0.69', require: false
@@ -32,7 +32,7 @@ group :development, :test do
   gem 'factory_bot', require: false
   gem 'pry', '~> 0.12.2', require: false
 
-  gem 'grpc-tools', '= 1.0.1'
+  gem 'grpc-tools', '= 1.30.2'
 
   # gitlab-shell spec gems
   gem 'listen', '~> 0.5.0'
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index f409ebb9b414..143409eba6b5 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -45,9 +45,9 @@ GEM
     escape_utils (1.2.1)
     factory_bot (5.0.2)
       activesupport (>= 4.2.0)
-    faraday (0.15.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
+    ffi (1.13.1)
     gemojione (3.3.0)
       json
     github-linguist (7.9.0)
@@ -75,13 +75,13 @@ GEM
       opentracing (~> 0.4)
       redis (> 3.0.0, < 5.0.0)
     gitlab-markup (1.7.1)
-    google-protobuf (3.8.0)
-    googleapis-common-protos-types (1.0.4)
-      google-protobuf (~> 3.0)
-    grpc (1.24.0)
-      google-protobuf (~> 3.8)
+    google-protobuf (3.12.4)
+    googleapis-common-protos-types (1.0.5)
+      google-protobuf (~> 3.11)
+    grpc (1.30.2)
+      google-protobuf (~> 3.12)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.0.1)
+    grpc-tools (1.30.2)
     hashdiff (0.3.9)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
@@ -100,20 +100,20 @@ GEM
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2020.0512)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
-    msgpack (1.3.1)
-    multipart-post (2.0.0)
-    nokogiri (1.10.9)
+    msgpack (1.3.3)
+    multipart-post (2.1.1)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     nokogumbo (1.5.0)
       nokogiri
     opentracing (0.5.0)
-    optimist (3.0.0)
+    optimist (3.0.1)
     parallel (1.17.0)
     parser (2.7.0.5)
       ast (~> 2.4.0)
@@ -135,13 +135,13 @@ GEM
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rainbow (3.0.0)
-    rbtrace (0.4.11)
+    rbtrace (0.4.14)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rdoc (6.2.0)
     redis (4.1.3)
-    rouge (3.19.0)
+    rouge (3.20.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -175,8 +175,8 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
-    sentry-raven (2.9.0)
-      faraday (>= 0.7.6, < 1.0)
+    sentry-raven (3.0.4)
+      faraday (>= 1.0)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -211,15 +211,15 @@ DEPENDENCIES
   activesupport (~> 6.0.3.1)
   bundler (>= 1.17.3)
   factory_bot
-  faraday (~> 0.12)
+  faraday (~> 1.0)
   github-linguist (~> 7.9)
   gitlab-gollum-lib (~> 4.2.7.9)
   gitlab-gollum-rugged_adapter (~> 0.4.4.2)
   gitlab-labkit (~> 0.12.0)
   gitlab-markup (~> 1.7.1)
-  google-protobuf (~> 3.8.0)
-  grpc (~> 1.24.0)
-  grpc-tools (= 1.0.1)
+  google-protobuf (~> 3.12)
+  grpc (~> 1.30.2)
+  grpc-tools (= 1.30.2)
   licensee (~> 8.9.0)
   listen (~> 0.5.0)
   pry (~> 0.12.2)
@@ -229,7 +229,7 @@ DEPENDENCIES
   rspec-parameterized
   rubocop (~> 0.69)
   rugged (~> 0.28)
-  sentry-raven (~> 2.9.0)
+  sentry-raven (~> 3.0)
   simplecov (~> 0.17.1)
   timecop
   vcr (~> 4.0.0)
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 84cf1e500a22..91fbc657b2f0 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -19,14 +19,14 @@ let
       };
   };
 in buildGoPackage rec {
-  version = "13.0.14";
+  version = "13.4.3";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "16ynkwiv0faa60msashj5w1bc4rdh7yv2qjmpcbf7dwq54gqmlbv";
+    sha256 = "0gyy8l3xbdrpbq8zmdqvn7x34hxc48in4klhw5klacs1mgi3vqax";
   };
 
   # Fix a check which assumes that hook files are writeable by their
@@ -44,7 +44,7 @@ in buildGoPackage rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ];
   goDeps = ./deps.nix;
-  preBuild = "rm -r go/src/gitlab.com/gitlab-org/labkit/vendor";
+  preBuild = "rm -rf go/src/gitlab.com/gitlab-org/labkit/vendor";
 
   postInstall = ''
     mkdir -p $ruby
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
index 221ce16163d8..95a7750efa7b 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@@ -1787,8 +1787,8 @@
     fetch = {
       type = "git";
       url = "https://gitlab.com/gitlab-org/gitlab-shell.git";
-      rev = "716e30c55e89";
-      sha256 = "0g2bgwm5rf93xfd40j3d2a5js1a212r2l2qdbds3gp7h0v73npjw";
+      rev = "82ec8144fb2a";
+      sha256 = "1gh3rwnd6688v7q07g2y69fdz2nyy7disjqifvbl7z1cpfw4h45b";
     };
   }
   {
@@ -1796,8 +1796,8 @@
     fetch = {
       type = "git";
       url = "https://gitlab.com/gitlab-org/labkit.git";
-      rev = "0149780c759d";
-      sha256 = "1krp5jkwpckpdznbl9xp4yvq6cii750r24agcni3snbbs8hd8gb1";
+      rev = "45895e129029";
+      sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48";
     };
   }
   {
@@ -1913,8 +1913,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "v0.3.2";
-      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+      rev = "v0.3.3";
+      sha256 = "19pihqm3phyndmiw6i42pdv6z1rbvlqlsnhsyqf9gsnn0qnmqqlh";
     };
   }
   {
diff --git a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch b/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch
index 65e130078b7f..7221377e33cd 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch
+++ b/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch
@@ -1,8 +1,8 @@
-diff --git a/internal/config/config.go b/internal/config/config.go
-index 037c9602..3d5409dc 100644
---- a/internal/config/config.go
-+++ b/internal/config/config.go
-@@ -185,7 +185,7 @@ func checkExecutable(path string) error {
+diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go
+index 993e095d..f9bbb943 100644
+--- a/internal/gitaly/config/config.go
++++ b/internal/gitaly/config/config.go
+@@ -217,7 +217,7 @@ func checkExecutable(path string) error {
  		return err
  	}
  
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index f693d5b4c7ba..d30b3a0a15f0 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -203,20 +203,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
+      sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq";
       type = "gem";
     };
-    version = "0.15.4";
+    version = "1.0.1";
   };
   ffi = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
+      sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
       type = "gem";
     };
-    version = "1.12.2";
+    version = "1.13.1";
   };
   gemojione = {
     dependencies = ["json"];
@@ -294,10 +294,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4";
+      sha256 = "1m3la0yid3bqx9b30raisqbp27d0q7vdrlslazrdasf8v1vhifxj";
       type = "gem";
     };
-    version = "3.8.0";
+    version = "3.12.4";
   };
   googleapis-common-protos-types = {
     dependencies = ["google-protobuf"];
@@ -305,10 +305,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1";
+      sha256 = "1aava1b75n056s24gn7ajrkmm6s3xa3swl62dl5q9apw4marghji";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "1.0.5";
   };
   grpc = {
     dependencies = ["google-protobuf" "googleapis-common-protos-types"];
@@ -316,20 +316,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf";
+      sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5";
       type = "gem";
     };
-    version = "1.24.0";
+    version = "1.30.2";
   };
   grpc-tools = {
     groups = ["development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pjs2sm43mai2fy0jsbxl8rs9bych8f5j8hv630fjwh0323cmcc9";
+      sha256 = "0k9zhsqhamp02ryzgfb4y2bbick151vlhrhj0kqbbz9lyhms0bd4";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.30.2";
   };
   hashdiff = {
     groups = ["default" "development" "test"];
@@ -438,22 +438,24 @@
   };
   mime-types = {
     dependencies = ["mime-types-data"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
+      sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
       type = "gem";
     };
-    version = "3.2.2";
+    version = "3.3.1";
   };
   mime-types-data = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
+      sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
       type = "gem";
     };
-    version = "3.2019.0331";
+    version = "3.2020.0512";
   };
   mini_mime = {
     groups = ["default"];
@@ -488,18 +490,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1";
+      sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.3.3";
   };
   multipart-post = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.1.1";
   };
   nokogiri = {
     dependencies = ["mini_portile2"];
@@ -507,10 +511,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
+      sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
       type = "gem";
     };
-    version = "1.10.9";
+    version = "1.10.10";
   };
   nokogumbo = {
     dependencies = ["nokogiri"];
@@ -532,12 +536,14 @@
     version = "0.5.0";
   };
   optimist = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+      sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.0.1";
   };
   parallel = {
     groups = ["default" "development" "test"];
@@ -647,12 +653,14 @@
   };
   rbtrace = {
     dependencies = ["ffi" "msgpack" "optimist"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
+      sha256 = "0s8prj0klfgpmpfcpdzbf149qrrsdxgnb6w6kkqc9gyars4vyaqn";
       type = "gem";
     };
-    version = "0.4.11";
+    version = "0.4.14";
   };
   rdoc = {
     groups = ["default"];
@@ -679,10 +687,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35";
+      sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic";
       type = "gem";
     };
-    version = "3.19.0";
+    version = "3.20.0";
   };
   rspec = {
     dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
@@ -803,10 +811,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
+      sha256 = "17j4br2lpnd8066d50mkg9kwk9v70hn3zfiqkvysd8p9nffmqnm0";
       type = "gem";
     };
-    version = "2.9.0";
+    version = "3.0.4";
   };
   simplecov = {
     dependencies = ["docile" "json" "simplecov-html"];
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index 3e32e90a6d2a..3289697279fa 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -2,12 +2,12 @@
 
 buildGoPackage rec {
   pname = "gitlab-shell";
-  version = "13.2.0";
+  version = "13.7.0";
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "0drdpg4nmhzrmy8sl1f3hcd1278bpapgf0wmhi94xlyayh47j53a";
+    sha256 = "1gh3rwnd6688v7q07g2y69fdz2nyy7disjqifvbl7z1cpfw4h45b";
   };
 
   buildInputs = [ ruby ];
@@ -17,6 +17,10 @@ buildGoPackage rec {
   goPackagePath = "gitlab.com/gitlab-org/gitlab-shell";
   goDeps = ./deps.nix;
 
+  preBuild = ''
+    rm -rf "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/labkit/vendor"
+  '';
+
   postInstall = ''
     cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin
     cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
index 72c0f2cdf513..43da3cd8b0b7 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
@@ -14,8 +14,26 @@
     fetch = {
       type = "git";
       url = "https://github.com/googleapis/google-cloud-go";
-      rev = "v0.26.0";
-      sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1";
+      rev = "v0.50.0";
+      sha256 = "0pbz5migljd5whxh6z1w79cwx93n85mcs3x1bckl27yzaa4lvqsl";
+    };
+  }
+  {
+    goPackagePath = "dmitri.shuralyov.com/gpu/mtl";
+    fetch = {
+      type = "git";
+      url = "https://dmitri.shuralyov.com/gpu/mtl";
+      rev = "666a987793e9";
+      sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z";
+    };
+  }
+  {
+    goPackagePath = "github.com/AndreasBriese/bbloom";
+    fetch = {
+      type = "git";
+      url = "https://github.com/AndreasBriese/bbloom";
+      rev = "e2d15f34fcf9";
+      sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds";
     };
   }
   {
@@ -27,6 +45,60 @@
       sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
     };
   }
+  {
+    goPackagePath = "github.com/BurntSushi/xgb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/xgb";
+      rev = "27f122750802";
+      sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj";
+    };
+  }
+  {
+    goPackagePath = "github.com/CloudyKit/fastprinter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/CloudyKit/fastprinter";
+      rev = "74b38d55f37a";
+      sha256 = "07wkq3503j7sd5knsgp3lwzfdwm6sj7a3l6i71i52yb3fd8md235";
+    };
+  }
+  {
+    goPackagePath = "github.com/Joker/hpp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Joker/hpp";
+      rev = "v1.0.0";
+      sha256 = "1xnqkjkmqdj48w80qa74rwcmgar8dcilpkcrcn1f53djk45k1gq2";
+    };
+  }
+  {
+    goPackagePath = "github.com/Joker/jade";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Joker/jade";
+      rev = "d475f43051e7";
+      sha256 = "0yigzvxp5qd05pai0yimzkpl2m23358a2fqqs585psrdmwsic2pn";
+    };
+  }
+  {
+    goPackagePath = "github.com/Shopify/goreferrer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Shopify/goreferrer";
+      rev = "ec9c9a553398";
+      sha256 = "0d740psj8czks1hl0nr6nlrwfbwq3nc51jj2p91d1wyhhmgn6jmn";
+    };
+  }
+  {
+    goPackagePath = "github.com/ajg/form";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ajg/form";
+      rev = "v1.5.1";
+      sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a";
+    };
+  }
   {
     goPackagePath = "github.com/alecthomas/template";
     fetch = {
@@ -45,6 +117,15 @@
       sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
     };
   }
+  {
+    goPackagePath = "github.com/armon/consul-api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/armon/consul-api";
+      rev = "eb2c6b5be1b6";
+      sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
+    };
+  }
   {
     goPackagePath = "github.com/beorn7/perks";
     fetch = {
@@ -63,6 +144,33 @@
       sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4";
     };
   }
+  {
+    goPackagePath = "github.com/chzyer/logex";
+    fetch = {
+      type = "git";
+      url = "https://github.com/chzyer/logex";
+      rev = "v1.1.10";
+      sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4";
+    };
+  }
+  {
+    goPackagePath = "github.com/chzyer/readline";
+    fetch = {
+      type = "git";
+      url = "https://github.com/chzyer/readline";
+      rev = "2972be24d48e";
+      sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
+    };
+  }
+  {
+    goPackagePath = "github.com/chzyer/test";
+    fetch = {
+      type = "git";
+      url = "https://github.com/chzyer/test";
+      rev = "a1ea475d72b1";
+      sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k";
+    };
+  }
   {
     goPackagePath = "github.com/client9/misspell";
     fetch = {
@@ -72,6 +180,15 @@
       sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
     };
   }
+  {
+    goPackagePath = "github.com/client9/reopen";
+    fetch = {
+      type = "git";
+      url = "https://github.com/client9/reopen";
+      rev = "v1.0.0";
+      sha256 = "0f0dpdbmvk7w518c6zjhlmp65y55vvx47x4lq9pgzvcbsvjsf18s";
+    };
+  }
   {
     goPackagePath = "github.com/cloudflare/tableflip";
     fetch = {
@@ -90,6 +207,51 @@
       sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57";
     };
   }
+  {
+    goPackagePath = "github.com/codegangsta/inject";
+    fetch = {
+      type = "git";
+      url = "https://github.com/codegangsta/inject";
+      rev = "33e0aa1cb7c0";
+      sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/etcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/etcd";
+      rev = "v3.3.10";
+      sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-etcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-etcd";
+      rev = "v2.0.0";
+      sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-semver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-semver";
+      rev = "v0.2.0";
+      sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
+    };
+  }
+  {
+    goPackagePath = "github.com/cpuguy83/go-md2man";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cpuguy83/go-md2man";
+      rev = "v1.0.10";
+      sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i";
+    };
+  }
   {
     goPackagePath = "github.com/davecgh/go-spew";
     fetch = {
@@ -99,6 +261,87 @@
       sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
     };
   }
+  {
+    goPackagePath = "github.com/dgraph-io/badger";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgraph-io/badger";
+      rev = "v1.6.0";
+      sha256 = "1vzibjqhb10q6s2chbzlwndij2d9ybjnq7h28hx4akr119avd0d5";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev = "v3.2.0";
+      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgryski/go-farm";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgryski/go-farm";
+      rev = "6a90982ecee2";
+      sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix";
+    };
+  }
+  {
+    goPackagePath = "github.com/dustin/go-humanize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dustin/go-humanize";
+      rev = "v1.0.0";
+      sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
+    };
+  }
+  {
+    goPackagePath = "github.com/eknkc/amber";
+    fetch = {
+      type = "git";
+      url = "https://github.com/eknkc/amber";
+      rev = "cdade1c07385";
+      sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9";
+    };
+  }
+  {
+    goPackagePath = "github.com/etcd-io/bbolt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/etcd-io/bbolt";
+      rev = "v1.3.3";
+      sha256 = "0dn0zngks9xiz0rrrb3911f73ghl64z84jsmzai2yfmzqr7cdkqc";
+    };
+  }
+  {
+    goPackagePath = "github.com/fasthttp-contrib/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fasthttp-contrib/websocket";
+      rev = "1f3b11f56072";
+      sha256 = "1yacmwmil625p0pzj800h9dnmiab6bjwfmi48p9fcrvy2yyv9b97";
+    };
+  }
+  {
+    goPackagePath = "github.com/fatih/structs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/structs";
+      rev = "v1.1.0";
+      sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q";
+    };
+  }
+  {
+    goPackagePath = "github.com/flosch/pongo2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/flosch/pongo2";
+      rev = "bbf5a6c351f4";
+      sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq";
+    };
+  }
   {
     goPackagePath = "github.com/fsnotify/fsnotify";
     fetch = {
@@ -108,6 +351,15 @@
       sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
     };
   }
+  {
+    goPackagePath = "github.com/gavv/httpexpect";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gavv/httpexpect";
+      rev = "v2.0.0";
+      sha256 = "0dqb7lsinciz594q6jg59hrvk4g4awbs2ybsr580j22j2xag53vs";
+    };
+  }
   {
     goPackagePath = "github.com/getsentry/raven-go";
     fetch = {
@@ -117,6 +369,60 @@
       sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
     };
   }
+  {
+    goPackagePath = "github.com/getsentry/sentry-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getsentry/sentry-go";
+      rev = "v0.5.1";
+      sha256 = "1kfn0gcb4c6amhagv04ydpl6p9cqw7f0lxas688a0rf89iwdzz89";
+    };
+  }
+  {
+    goPackagePath = "github.com/gin-contrib/sse";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gin-contrib/sse";
+      rev = "5545eab6dad3";
+      sha256 = "0jhcvi66rn7c1wg3rf7q7sylrvlk7c40yk79c5lypnz1dpsdcrb5";
+    };
+  }
+  {
+    goPackagePath = "github.com/gin-gonic/gin";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gin-gonic/gin";
+      rev = "v1.4.0";
+      sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-check/check";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-check/check";
+      rev = "788fd7840127";
+      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-errors/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-errors/errors";
+      rev = "v1.0.1";
+      sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-gl/glfw";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-gl/glfw";
+      rev = "12ad95a8df72";
+      sha256 = "0ahw4a1lk7wqn6m0sjngsv2zc08kxxj259ai6g4kf11lmidszm9s";
+    };
+  }
   {
     goPackagePath = "github.com/go-kit/kit";
     fetch = {
@@ -135,6 +441,15 @@
       sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
     };
   }
+  {
+    goPackagePath = "github.com/go-martini/martini";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-martini/martini";
+      rev = "22fa46961aab";
+      sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh";
+    };
+  }
   {
     goPackagePath = "github.com/go-stack/stack";
     fetch = {
@@ -144,6 +459,33 @@
       sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
     };
   }
+  {
+    goPackagePath = "github.com/gobwas/httphead";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/httphead";
+      rev = "2c6c146eadee";
+      sha256 = "0j7nlrf79cafl8ap69ri2c7v3psr2y133cr2wn735z7yn3dz3kss";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobwas/pool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/pool";
+      rev = "v0.2.0";
+      sha256 = "1avpa8c75j1y4hs7awazrjjy7w0pjfw80l424ddn5zyizvh7s67i";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobwas/ws";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/ws";
+      rev = "v1.0.2";
+      sha256 = "070mfcjbfb40bglc9aw9zjvd4jb1hp3l1s12ww6mjlwbjcg0mm9s";
+    };
+  }
   {
     goPackagePath = "github.com/gogo/protobuf";
     fetch = {
@@ -162,6 +504,15 @@
       sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
     };
   }
+  {
+    goPackagePath = "github.com/golang/groupcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/groupcache";
+      rev = "215e87163ea7";
+      sha256 = "07555csk49ara636bhl2vbzziayls3qks8964z0q29g065zliy9j";
+    };
+  }
   {
     goPackagePath = "github.com/golang/lint";
     fetch = {
@@ -176,8 +527,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/mock";
-      rev = "v1.1.1";
-      sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy";
+      rev = "v1.3.1";
+      sha256 = "1wnfa8njxdym1qb664dmfnkpm4pmqy22hqjlqpwaaiqhglb5g9d1";
     };
   }
   {
@@ -189,13 +540,67 @@
       sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
     };
   }
+  {
+    goPackagePath = "github.com/gomodule/redigo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gomodule/redigo";
+      rev = "574c33c3df38";
+      sha256 = "1qpw8mq9xqj1hmpag1av941swkx39qikahsajyhn34rc2q54f4z6";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/btree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/btree";
+      rev = "v1.0.0";
+      sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
+    };
+  }
   {
     goPackagePath = "github.com/google/go-cmp";
     fetch = {
       type = "git";
       url = "https://github.com/google/go-cmp";
-      rev = "v0.2.0";
-      sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
+      rev = "v0.4.0";
+      sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-querystring";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-querystring";
+      rev = "v1.0.0";
+      sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/martian";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/martian";
+      rev = "v2.1.0";
+      sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/pprof";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/pprof";
+      rev = "d4f498aebedc";
+      sha256 = "1r4pn70yy5vfl38jx9v8224n7jkhcm5wg28vv48izgznlgv7h024";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/renameio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/renameio";
+      rev = "v0.1.0";
+      sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx";
     };
   }
   {
@@ -207,6 +612,33 @@
       sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
     };
   }
+  {
+    goPackagePath = "github.com/googleapis/gax-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/googleapis/gax-go";
+      rev = "v2.0.5";
+      sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx";
+    };
+  }
+  {
+    goPackagePath = "github.com/gopherjs/gopherjs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gopherjs/gopherjs";
+      rev = "0766667cb4d1";
+      sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev = "v1.4.0";
+      sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
+    };
+  }
   {
     goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware";
     fetch = {
@@ -225,6 +657,33 @@
       sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl";
     };
   }
+  {
+    goPackagePath = "github.com/hashicorp/go-version";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-version";
+      rev = "v1.2.0";
+      sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/golang-lru";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev = "v0.5.1";
+      sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "v1.0.0";
+      sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
+    };
+  }
   {
     goPackagePath = "github.com/hpcloud/tail";
     fetch = {
@@ -234,6 +693,69 @@
       sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
     };
   }
+  {
+    goPackagePath = "github.com/ianlancetaylor/demangle";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ianlancetaylor/demangle";
+      rev = "5e5cf60278f6";
+      sha256 = "1fhjk11cip9c3jyj1byz9z77n6n2rlxmyz0xjx1zpn1da3cvri75";
+    };
+  }
+  {
+    goPackagePath = "github.com/imkira/go-interpol";
+    fetch = {
+      type = "git";
+      url = "https://github.com/imkira/go-interpol";
+      rev = "v1.1.0";
+      sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph";
+    };
+  }
+  {
+    goPackagePath = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev = "v1.0.0";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath = "github.com/iris-contrib/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/iris-contrib/blackfriday";
+      rev = "v2.0.0";
+      sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im";
+    };
+  }
+  {
+    goPackagePath = "github.com/iris-contrib/go.uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/iris-contrib/go.uuid";
+      rev = "v2.0.0";
+      sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35";
+    };
+  }
+  {
+    goPackagePath = "github.com/iris-contrib/i18n";
+    fetch = {
+      type = "git";
+      url = "https://github.com/iris-contrib/i18n";
+      rev = "987a633949d0";
+      sha256 = "0yslm7hmacc57v970jbys4x5c5yxgcjgff982ngivg9v1a16kifq";
+    };
+  }
+  {
+    goPackagePath = "github.com/iris-contrib/schema";
+    fetch = {
+      type = "git";
+      url = "https://github.com/iris-contrib/schema";
+      rev = "v0.0.1";
+      sha256 = "1a1lk2ll2xv3ljffmfw4q8mqqw727pj8dzs6c8g2hh0b0b050g79";
+    };
+  }
   {
     goPackagePath = "github.com/json-iterator/go";
     fetch = {
@@ -243,6 +765,51 @@
       sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
     };
   }
+  {
+    goPackagePath = "github.com/jstemmer/go-junit-report";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jstemmer/go-junit-report";
+      rev = "v0.9.1";
+      sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw";
+    };
+  }
+  {
+    goPackagePath = "github.com/jtolds/gls";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jtolds/gls";
+      rev = "v4.20.0";
+      sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6";
+    };
+  }
+  {
+    goPackagePath = "github.com/juju/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/juju/errors";
+      rev = "089d3ea4e4d5";
+      sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r";
+    };
+  }
+  {
+    goPackagePath = "github.com/juju/loggo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/juju/loggo";
+      rev = "584905176618";
+      sha256 = "0hzi0652y74jf62wwyi9gf8bzrs7ynvhjfqc8rwr4l799d7i5gd4";
+    };
+  }
+  {
+    goPackagePath = "github.com/juju/testing";
+    fetch = {
+      type = "git";
+      url = "https://github.com/juju/testing";
+      rev = "472a3e8b2073";
+      sha256 = "05wjc2k0kwbam7anaxwnj30pl03dcdbrsz32icd70zl70ipsqsw4";
+    };
+  }
   {
     goPackagePath = "github.com/julienschmidt/httprouter";
     fetch = {
@@ -252,6 +819,51 @@
       sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
     };
   }
+  {
+    goPackagePath = "github.com/k0kubun/colorstring";
+    fetch = {
+      type = "git";
+      url = "https://github.com/k0kubun/colorstring";
+      rev = "9440f1994b88";
+      sha256 = "0isskya7ky4k9znrh85crfc2pxwyfz2s8j1a5cbjb8b8zf2v0qbj";
+    };
+  }
+  {
+    goPackagePath = "github.com/kataras/golog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kataras/golog";
+      rev = "v0.0.9";
+      sha256 = "160hd3z93c9i33q9g1bhfdxmsqg1lanncnrqcsr2444dy5j6ly3i";
+    };
+  }
+  {
+    goPackagePath = "github.com/kataras/iris";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kataras/iris";
+      rev = "v12.0.1";
+      sha256 = "0k1jhamvf0byx6d317gzg6r2jls7bajhhf2spvdinarl2cjnakm5";
+    };
+  }
+  {
+    goPackagePath = "github.com/kataras/neffos";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kataras/neffos";
+      rev = "v0.0.10";
+      sha256 = "0mkqrxff28rcc71nw5qqsywn0fm2jz7magwp9hhvh1s01lgghjdp";
+    };
+  }
+  {
+    goPackagePath = "github.com/kataras/pio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kataras/pio";
+      rev = "ea782b38602d";
+      sha256 = "0ca29wmkpx19qwnvi4fja3avkxkzz14x9wyzmg1l9074bxbj8cgj";
+    };
+  }
   {
     goPackagePath = "github.com/kelseyhightower/envconfig";
     fetch = {
@@ -270,13 +882,31 @@
       sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
     };
   }
+  {
+    goPackagePath = "github.com/klauspost/compress";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/compress";
+      rev = "v1.9.0";
+      sha256 = "07vndz6mdaliwagj2xq0y5c5w2zld14p9i5y7r0bkhb7klfyamfk";
+    };
+  }
+  {
+    goPackagePath = "github.com/klauspost/cpuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/cpuid";
+      rev = "v1.2.1";
+      sha256 = "1071wchrs37bvpb99fwf19fjrpz0yaqipi2y2hjvim419flvd49x";
+    };
+  }
   {
     goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
     fetch = {
       type = "git";
       url = "https://github.com/konsorten/go-windows-terminal-sequences";
-      rev = "v1.0.1";
-      sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
+      rev = "v1.0.2";
+      sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
     };
   }
   {
@@ -288,6 +918,51 @@
       sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
     };
   }
+  {
+    goPackagePath = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty";
+      rev = "v0.1.0";
+      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pty";
+      rev = "v1.1.1";
+      sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev = "v0.1.0";
+      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+    };
+  }
+  {
+    goPackagePath = "github.com/labstack/echo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/labstack/echo";
+      rev = "v4.1.11";
+      sha256 = "0b14vgwzznn7wzyjb98xdmq4wjg16l3y62njiwfz4qsm4pwzk405";
+    };
+  }
+  {
+    goPackagePath = "github.com/labstack/gommon";
+    fetch = {
+      type = "git";
+      url = "https://github.com/labstack/gommon";
+      rev = "v0.3.0";
+      sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0";
+    };
+  }
   {
     goPackagePath = "github.com/libgit2/git2go";
     fetch = {
@@ -306,6 +981,33 @@
       sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb";
     };
   }
+  {
+    goPackagePath = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev = "v1.8.0";
+      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev = "v0.1.2";
+      sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "v0.0.9";
+      sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m";
+    };
+  }
   {
     goPackagePath = "github.com/mattn/go-shellwords";
     fetch = {
@@ -315,6 +1017,15 @@
       sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d";
     };
   }
+  {
+    goPackagePath = "github.com/mattn/goveralls";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/goveralls";
+      rev = "v0.0.2";
+      sha256 = "13ffdikvc594g1mryhi94m87skr7irwkjnpxp8ad2kprn6syfslp";
+    };
+  }
   {
     goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
     fetch = {
@@ -324,6 +1035,51 @@
       sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
     };
   }
+  {
+    goPackagePath = "github.com/mediocregopher/mediocre-go-lib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mediocregopher/mediocre-go-lib";
+      rev = "cb65787f37ed";
+      sha256 = "0lg6q76fxjhxv05m80k4l6nrkj9qwzafs2mb2gbvhznxh8m0cv9j";
+    };
+  }
+  {
+    goPackagePath = "github.com/mediocregopher/radix";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mediocregopher/radix";
+      rev = "v3.3.0";
+      sha256 = "0pchn5z2g4wnf87350war5fr9pqpdksia1ffvw7cphg4q9blggfx";
+    };
+  }
+  {
+    goPackagePath = "github.com/microcosm-cc/bluemonday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/microcosm-cc/bluemonday";
+      rev = "v1.0.2";
+      sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "v1.1.0";
+      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "v1.1.2";
+      sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
+    };
+  }
   {
     goPackagePath = "github.com/modern-go/concurrent";
     fetch = {
@@ -342,6 +1098,15 @@
       sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
     };
   }
+  {
+    goPackagePath = "github.com/moul/http2curl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/moul/http2curl";
+      rev = "v1.0.0";
+      sha256 = "15bpx33d3ygya8dg8hbsn24h7acpajl27006pj8lw1c0bfvbnrl0";
+    };
+  }
   {
     goPackagePath = "github.com/mwitkow/go-conntrack";
     fetch = {
@@ -351,13 +1116,40 @@
       sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
     };
   }
+  {
+    goPackagePath = "github.com/nats-io/nats.go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nats-io/nats.go";
+      rev = "v1.8.1";
+      sha256 = "0h9zzpjl6ac227bhf0i4ram9a5jlibq53pawv0zzxdirxrnp1vkj";
+    };
+  }
+  {
+    goPackagePath = "github.com/nats-io/nkeys";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nats-io/nkeys";
+      rev = "v0.0.2";
+      sha256 = "0kibc1g60w031rssk3vs74gfick3jdl3igckn1v4k8b5grawcks1";
+    };
+  }
+  {
+    goPackagePath = "github.com/nats-io/nuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nats-io/nuid";
+      rev = "v1.0.1";
+      sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg";
+    };
+  }
   {
     goPackagePath = "github.com/onsi/ginkgo";
     fetch = {
       type = "git";
       url = "https://github.com/onsi/ginkgo";
-      rev = "v1.7.0";
-      sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
+      rev = "v1.10.3";
+      sha256 = "00a40by9f5ylycnar8h3p9b4z5rcsvfvg4j3v5s5mchdqrqjv1pc";
     };
   }
   {
@@ -365,8 +1157,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/onsi/gomega";
-      rev = "v1.4.3";
-      sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
+      rev = "v1.7.1";
+      sha256 = "06p3x0910cdaa64l7d44s728d4j3yhps315dlcvrbjzhljjj7mam";
     };
   }
   {
@@ -387,13 +1179,31 @@
       sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k";
     };
   }
+  {
+    goPackagePath = "github.com/otiai10/curr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/otiai10/curr";
+      rev = "v1.0.0";
+      sha256 = "0fpw20adq2wff7l4c87zaavj9jra4d64a8bbjixiiv3bbarim987";
+    };
+  }
   {
     goPackagePath = "github.com/otiai10/mint";
     fetch = {
       type = "git";
       url = "https://github.com/otiai10/mint";
-      rev = "v1.2.3";
-      sha256 = "00slgv9mw2m22ix5prz2a98ji6kpzr0ap6bqs568rfdmk6hm5f0k";
+      rev = "v1.3.0";
+      sha256 = "0kfc95jc2hfgwzcpdfa5hrxgj7s6rzx5jc0n1sn863bsngx2q1ca";
+    };
+  }
+  {
+    goPackagePath = "github.com/pelletier/go-toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-toml";
+      rev = "v1.2.0";
+      sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
     };
   }
   {
@@ -405,13 +1215,22 @@
       sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
     };
   }
+  {
+    goPackagePath = "github.com/pingcap/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pingcap/errors";
+      rev = "v0.11.4";
+      sha256 = "02k6b30m42aya763fnwx3paq4r8h28yav4i2kv2z4r28r70xxcgn";
+    };
+  }
   {
     goPackagePath = "github.com/pkg/errors";
     fetch = {
       type = "git";
       url = "https://github.com/pkg/errors";
-      rev = "v0.8.0";
-      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+      rev = "v0.8.1";
+      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
     };
   }
   {
@@ -437,8 +1256,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_model";
-      rev = "fd36f4220a90";
-      sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
+      rev = "14fe0d1b01d4";
+      sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550";
     };
   }
   {
@@ -459,13 +1278,139 @@
       sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
     };
   }
+  {
+    goPackagePath = "github.com/rogpeppe/go-internal";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rogpeppe/go-internal";
+      rev = "v1.3.0";
+      sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216";
+    };
+  }
+  {
+    goPackagePath = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev = "v1.5.2";
+      sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c";
+    };
+  }
+  {
+    goPackagePath = "github.com/ryanuber/columnize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ryanuber/columnize";
+      rev = "v2.1.0";
+      sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6";
+    };
+  }
+  {
+    goPackagePath = "github.com/sebest/xff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sebest/xff";
+      rev = "6c115e0ffa35";
+      sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h";
+    };
+  }
+  {
+    goPackagePath = "github.com/sergi/go-diff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sergi/go-diff";
+      rev = "v1.0.0";
+      sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
+    };
+  }
+  {
+    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/sanitized_anchor_name";
+      rev = "v1.0.0";
+      sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
+    };
+  }
   {
     goPackagePath = "github.com/sirupsen/logrus";
     fetch = {
       type = "git";
       url = "https://github.com/sirupsen/logrus";
-      rev = "v1.2.0";
-      sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
+      rev = "v1.3.0";
+      sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk";
+    };
+  }
+  {
+    goPackagePath = "github.com/smartystreets/assertions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/smartystreets/assertions";
+      rev = "b2de0cb4f26d";
+      sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y";
+    };
+  }
+  {
+    goPackagePath = "github.com/smartystreets/goconvey";
+    fetch = {
+      type = "git";
+      url = "https://github.com/smartystreets/goconvey";
+      rev = "v1.6.4";
+      sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev = "v1.1.2";
+      sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev = "v1.3.0";
+      sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev = "v0.0.5";
+      sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev = "v1.0.0";
+      sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "v1.0.3";
+      sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev = "v1.3.2";
+      sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh";
     };
   }
   {
@@ -482,8 +1427,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "v1.3.0";
-      sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+      rev = "v1.4.0";
+      sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
     };
   }
   {
@@ -522,6 +1467,132 @@
       sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q";
     };
   }
+  {
+    goPackagePath = "github.com/ugorji/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ugorji/go";
+      rev = "v1.1.7";
+      sha256 = "068gja55kbh2iivp03x4n9dcml0rxv0k64ivkmq06si2ar1835rm";
+    };
+  }
+  {
+    goPackagePath = "github.com/urfave/negroni";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/negroni";
+      rev = "v1.0.0";
+      sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp";
+    };
+  }
+  {
+    goPackagePath = "github.com/valyala/bytebufferpool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/bytebufferpool";
+      rev = "v1.0.0";
+      sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
+    };
+  }
+  {
+    goPackagePath = "github.com/valyala/fasthttp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/fasthttp";
+      rev = "v1.6.0";
+      sha256 = "1r1hm4rv9w6x829jjg75y8xd523b76parsyyvjwyz8k2l6bm4h0b";
+    };
+  }
+  {
+    goPackagePath = "github.com/valyala/fasttemplate";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/fasttemplate";
+      rev = "v1.0.1";
+      sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq";
+    };
+  }
+  {
+    goPackagePath = "github.com/valyala/tcplisten";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/tcplisten";
+      rev = "ceec8f93295a";
+      sha256 = "0ksbj1gsdqanbnhly5w1wcc107bib4w0zpnyl00prr89zch3imnf";
+    };
+  }
+  {
+    goPackagePath = "github.com/xeipuuv/gojsonpointer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xeipuuv/gojsonpointer";
+      rev = "4e3ac2762d5f";
+      sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q";
+    };
+  }
+  {
+    goPackagePath = "github.com/xeipuuv/gojsonreference";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xeipuuv/gojsonreference";
+      rev = "bd5ef7bd5415";
+      sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5";
+    };
+  }
+  {
+    goPackagePath = "github.com/xeipuuv/gojsonschema";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xeipuuv/gojsonschema";
+      rev = "v1.2.0";
+      sha256 = "1mqiq0r8qw4qlfp3ls8073r6514rmzwrmdn4j33rppk3zh942i6l";
+    };
+  }
+  {
+    goPackagePath = "github.com/xordataexchange/crypt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xordataexchange/crypt";
+      rev = "b2862e3d0a77";
+      sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
+    };
+  }
+  {
+    goPackagePath = "github.com/yalp/jsonpath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/yalp/jsonpath";
+      rev = "5cc68e5049a0";
+      sha256 = "0kkyxp1cg3kfxy5hhwzxg132jin4xb492z5jpqq94ix15v6rdf4b";
+    };
+  }
+  {
+    goPackagePath = "github.com/yudai/gojsondiff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/yudai/gojsondiff";
+      rev = "v1.0.0";
+      sha256 = "0qnymi0027mb8kxm24mmd22bvjrdkc56c7f4q3lbdf93x1vxbbc2";
+    };
+  }
+  {
+    goPackagePath = "github.com/yudai/golcs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/yudai/golcs";
+      rev = "ecda9a501e82";
+      sha256 = "0mx6wc5fz05yhvg03vvps93bc5mw4vnng98fhmixd47385qb29pq";
+    };
+  }
+  {
+    goPackagePath = "github.com/yudai/pp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/yudai/pp";
+      rev = "v2.0.1";
+      sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk";
+    };
+  }
   {
     goPackagePath = "gitlab.com/gitlab-org/gitaly";
     fetch = {
@@ -536,8 +1607,17 @@
     fetch = {
       type = "git";
       url = "https://gitlab.com/gitlab-org/labkit.git";
-      rev = "0c3fc7cdd57c";
-      sha256 = "0fpn37v7dhhdgd63v4mq9cna9wdzrsfams13qmjmps3xpdw2wr9i";
+      rev = "0149780c759d";
+      sha256 = "1krp5jkwpckpdznbl9xp4yvq6cii750r24agcni3snbbs8hd8gb1";
+    };
+  }
+  {
+    goPackagePath = "go.opencensus.io";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-instrumentation/opencensus-go";
+      rev = "v0.22.2";
+      sha256 = "0lz7fid63pdrcvyzk5kn7vlcva102h61igmw7pz824wvj9k3hy4q";
     };
   }
   {
@@ -554,8 +1634,26 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "20be4c3c3ed5";
-      sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb";
+      rev = "87dc89f01550";
+      sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/exp";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/exp";
+      rev = "da58074b4299";
+      sha256 = "1pgvdbjm3n47505diw3mm2hisp9b9q2lyvgl9m6xh2wx83b0cj48";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/image";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/image";
+      rev = "cff245a6509b";
+      sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84";
     };
   }
   {
@@ -563,8 +1661,26 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/lint";
-      rev = "d0100b6bd8b3";
-      sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7";
+      rev = "fdd1cda4f05f";
+      sha256 = "0a23pc90fqar8sm1b480sls15ss20rqk13yrf63b6rnyd2c6z0x2";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/mobile";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/mobile";
+      rev = "d2bd2a29d028";
+      sha256 = "1nv6vvhnjr01nx9y06q46ww87dppdwpbqrlsfg1xf2587wxl8xiv";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/mod";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/mod";
+      rev = "c90efee705ee";
+      sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf";
     };
   }
   {
@@ -572,8 +1688,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "d28f0bde5980";
-      sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf";
+      rev = "6afb5195e5aa";
+      sha256 = "1aiz41q2yxgg3dxfkn33ff54vhaxbiwcps9j3ia1xx4cqxim38zw";
     };
   }
   {
@@ -581,8 +1697,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/oauth2";
-      rev = "d2e6202438be";
-      sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
+      rev = "bf48bf16ab8d";
+      sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg";
     };
   }
   {
@@ -590,8 +1706,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sync";
-      rev = "112230192c58";
-      sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
+      rev = "cd5d95a43a6e";
+      sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds";
     };
   }
   {
@@ -599,8 +1715,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "953cdadca894";
-      sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1";
+      rev = "86b910548bc1";
+      sha256 = "1z8l2wp27q0bd4nc46j31lc7cr6kiw52zi6ix3i121pd3rcyrw44";
     };
   }
   {
@@ -608,8 +1724,17 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "v0.3.0";
-      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+      rev = "v0.3.2";
+      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/time";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/time";
+      rev = "9d24e82272b4";
+      sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb";
     };
   }
   {
@@ -617,8 +1742,26 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/tools";
-      rev = "2c0ae7006135";
-      sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk";
+      rev = "43d50277825c";
+      sha256 = "1168q4da36wq9w2591iqzsfy5ymwfi2g46bv5dnyyspg155ld19k";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/xerrors";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/xerrors";
+      rev = "9bdfabe68543";
+      sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/googleapis/google-api-go-client";
+      rev = "v0.15.0";
+      sha256 = "1ljhwv5xsgsbqia70f35q19vwrsm47sh08ljbwdyfa867ff17qdh";
     };
   }
   {
@@ -626,8 +1769,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/appengine";
-      rev = "v1.1.0";
-      sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
+      rev = "v1.6.5";
+      sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w";
     };
   }
   {
@@ -635,8 +1778,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/googleapis/go-genproto";
-      rev = "bd91e49a0898";
-      sha256 = "1f5q04h03q6fksbfkhz13ai5849rkkb8xrmmi7cxs4lzsi6ixkg8";
+      rev = "ca5a22157cba";
+      sha256 = "0ldkh6f0g0wzfkp09ib15a62bmcbpsxj93saikqmc86242bcxij0";
     };
   }
   {
@@ -671,8 +1814,17 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/check.v1";
-      rev = "20d25e280405";
-      sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+      rev = "788fd7840127";
+      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/errgo.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/errgo.v2";
+      rev = "v2.1.0";
+      sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2";
     };
   }
   {
@@ -684,6 +1836,33 @@
       sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
     };
   }
+  {
+    goPackagePath = "gopkg.in/go-playground/assert.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/go-playground/assert.v1";
+      rev = "v1.2.1";
+      sha256 = "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/go-playground/validator.v8";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/go-playground/validator.v8";
+      rev = "v8.18.2";
+      sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/mgo.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/mgo.v2";
+      rev = "9856a29383ce";
+      sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw";
+    };
+  }
   {
     goPackagePath = "gopkg.in/tomb.v1";
     fetch = {
@@ -698,8 +1877,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "v2.2.2";
-      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+      rev = "v2.2.4";
+      sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2";
     };
   }
   {
@@ -707,8 +1886,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/dominikh/go-tools";
-      rev = "ea95bdfd59fc";
-      sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic";
+      rev = "v0.0.1-2019.2.3";
+      sha256 = "1rwwahmbs4dwxncwjj56likir1kps9937vm2id3rygxzzla40zal";
+    };
+  }
+  {
+    goPackagePath = "rsc.io/binaryregexp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rsc/binaryregexp";
+      rev = "v0.2.0";
+      sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b";
     };
   }
 ]
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
index ee00070df2d7..6c54e8884f29 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
@@ -30,18 +30,18 @@ index 2231851..c869930 100644
  
  func newFromFile(filename string) (*Config, error) {
 diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go
-index c29a320..c44b701 100644
+index e2abb82..7e9c481 100644
 --- a/internal/keyline/key_line.go
 +++ b/internal/keyline/key_line.go
-@@ -36,7 +36,7 @@ func NewPrincipalKeyLine(keyId string, principal string, rootDir string) (*KeyLi
- }
- 
+@@ -38,7 +38,7 @@ func NewPrincipalKeyLine(keyId, principal string, config *config.Config) (*KeyLi
+
  func (k *KeyLine) ToString() string {
--	command := fmt.Sprintf("%s %s-%s", path.Join(k.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id)
+ 	sslCertDirEnvVar := k.sslCertDirEnvVar()
+-	command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id)
 +	command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.Id)
- 
- 	return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value)
- }
+
+ 	if sslCertDirEnvVar != "" {
+ 		sslCertDirEnvVar = fmt.Sprintf(`%s `, sslCertDirEnvVar)
 diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb
 index 52ac5ee..d96baa3 100644
 --- a/support/gitlab_config.rb
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 6386a9cc5aa7..e1b177c3b457 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   pname = "gitlab-workhorse";
 
-  version = "8.31.2";
+  version = "8.46.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "0wvhhjfb490mjdrmc9xwr3qfh3941xn3b02c757ghrvzwv329wvg";
+    sha256 = "1qhaln1k6vcjzphmxdqhwz1cwdx77gclyq0b2ibzgy7xg9l91n99";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
index 530eb073c7b5..33b122a52e28 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
@@ -1,12 +1,57 @@
 # file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
 [
+  {
+    goPackagePath = "bazil.org/fuse";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bazil/fuse";
+      rev = "65cc252bf669";
+      sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk";
+    };
+  }
   {
     goPackagePath = "cloud.google.com/go";
     fetch = {
       type = "git";
-      url = "https://code.googlesource.com/gocloud";
-      rev = "v0.50.0";
-      sha256 = "0pbz5migljd5whxh6z1w79cwx93n85mcs3x1bckl27yzaa4lvqsl";
+      url = "https://github.com/googleapis/google-cloud-go";
+      rev = "v0.58.0";
+      sha256 = "1mcnnvx55yqcj02y4f1hl10ril06q4y9pcsbkb27wgrwimi6fl2n";
+    };
+  }
+  {
+    goPackagePath = "contrib.go.opencensus.io/exporter/aws";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-ecosystem/opencensus-go-exporter-aws";
+      rev = "2befc13012d0";
+      sha256 = "0adnzms874ddcp67mgsgaw43r3fih4pzjn8n424bbi8fhwajsi29";
+    };
+  }
+  {
+    goPackagePath = "contrib.go.opencensus.io/exporter/stackdriver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver";
+      rev = "v0.12.1";
+      sha256 = "0y0v3v97qg5yl83vq4kjzgaidnp8iraw1d7llnm9i7s5lkmydiwb";
+    };
+  }
+  {
+    goPackagePath = "contrib.go.opencensus.io/integrations/ocsql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencensus-integrations/ocsql";
+      rev = "v0.1.4";
+      sha256 = "06w9vm8dq0gg0v7slnv3zij90i8i9qiz2fbg148jih6jdpyakqrq";
+    };
+  }
+  {
+    goPackagePath = "contrib.go.opencensus.io/resource";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-ecosystem/opencensus-go-resource";
+      rev = "v0.1.1";
+      sha256 = "1g9vjrh7w8f2k2kxjcwmmcza2dfp61wmsgaipfk6992hyyccl3sh";
     };
   }
   {
@@ -18,6 +63,69 @@
       sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z";
     };
   }
+  {
+    goPackagePath = "github.com/AndreasBriese/bbloom";
+    fetch = {
+      type = "git";
+      url = "https://github.com/AndreasBriese/bbloom";
+      rev = "e2d15f34fcf9";
+      sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds";
+    };
+  }
+  {
+    goPackagePath = "github.com/Azure/azure-amqp-common-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-amqp-common-go";
+      rev = "v3.0.0";
+      sha256 = "0sxghycqkxaygwi6f85w9pqijm5ms2dk4qkz4d711dmi3b74512j";
+    };
+  }
+  {
+    goPackagePath = "github.com/Azure/azure-pipeline-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-pipeline-go";
+      rev = "v0.2.2";
+      sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6";
+    };
+  }
+  {
+    goPackagePath = "github.com/Azure/azure-sdk-for-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-sdk-for-go";
+      rev = "v37.1.0";
+      sha256 = "163ryyfg5x227013vyjnjsvww8pvi4kfc80x419d31mx88cs24ic";
+    };
+  }
+  {
+    goPackagePath = "github.com/Azure/azure-service-bus-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-service-bus-go";
+      rev = "v0.10.1";
+      sha256 = "11d1b5wbv23qzp54qhmkhdwwmrmbfqnc2ddxsg9hg2m258id8hl5";
+    };
+  }
+  {
+    goPackagePath = "github.com/Azure/azure-storage-blob-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-storage-blob-go";
+      rev = "v0.10.0";
+      sha256 = "1w64h4h1w4nclr115i1haigzy0b8z9dbdjfi8zsf5viqqzhlwqgm";
+    };
+  }
+  {
+    goPackagePath = "github.com/Azure/go-amqp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/go-amqp";
+      rev = "v0.12.7";
+      sha256 = "0gy3kxn5lqpliwfa2ys367hgbsa2n88bsiy04i44ba3aass7m6h4";
+    };
+  }
   {
     goPackagePath = "github.com/BurntSushi/toml";
     fetch = {
@@ -36,6 +144,15 @@
       sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj";
     };
   }
+  {
+    goPackagePath = "github.com/CloudyKit/fastprinter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/CloudyKit/fastprinter";
+      rev = "74b38d55f37a";
+      sha256 = "07wkq3503j7sd5knsgp3lwzfdwm6sj7a3l6i71i52yb3fd8md235";
+    };
+  }
   {
     goPackagePath = "github.com/FZambia/sentinel";
     fetch = {
@@ -45,13 +162,22 @@
       sha256 = "14cfngdy0n5rg7nrvxg1ydcjd18v0s8h33jx9wkln5ms0d59kfly";
     };
   }
+  {
+    goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/GoogleCloudPlatform/cloudsql-proxy";
+      rev = "e802c2cb94ae";
+      sha256 = "035z6yk7i53ba91pp0hl20ks1syjaw5f5mdx5c0kbib7k4xcgv96";
+    };
+  }
   {
     goPackagePath = "github.com/Joker/hpp";
     fetch = {
       type = "git";
       url = "https://github.com/Joker/hpp";
-      rev = "6893e659854a";
-      sha256 = "0lsx63c28rzqigv3lwzznqacpk7nr0dn6ig37v023x8lzc728ix5";
+      rev = "v1.0.0";
+      sha256 = "1xnqkjkmqdj48w80qa74rwcmgar8dcilpkcrcn1f53djk45k1gq2";
     };
   }
   {
@@ -59,8 +185,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/Joker/jade";
-      rev = "v1.0.0";
-      sha256 = "0k9b8dcwwhajw6rzjmakqwmhw9z192pzzdhppcvam6dy63yl4zjf";
+      rev = "d475f43051e7";
+      sha256 = "0yigzvxp5qd05pai0yimzkpl2m23358a2fqqs585psrdmwsic2pn";
     };
   }
   {
@@ -81,6 +207,51 @@
       sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a";
     };
   }
+  {
+    goPackagePath = "github.com/alecthomas/assert";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/assert";
+      rev = "405dbfeb8e38";
+      sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/chroma";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/chroma";
+      rev = "v0.7.3";
+      sha256 = "0wlw1bq7gdyxjm2j5vqbkn42ma28irc5wygkz9bj5z6idah4wl8k";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/colour";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/colour";
+      rev = "60882d9e2721";
+      sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/kong";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/kong";
+      rev = "v0.2.4";
+      sha256 = "0lv8xk71p5729igwmp6slhmf9x1g5z3zmkfx1mg1y2spn2ck4q7l";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/repr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/repr";
+      rev = "117648cd9897";
+      sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp";
+    };
+  }
   {
     goPackagePath = "github.com/alecthomas/template";
     fetch = {
@@ -100,12 +271,21 @@
     };
   }
   {
-    goPackagePath = "github.com/aymerick/raymond";
+    goPackagePath = "github.com/armon/consul-api";
     fetch = {
       type = "git";
-      url = "https://github.com/aymerick/raymond";
-      rev = "v2.0.2";
-      sha256 = "1w6am4142k8lyjnwwcgx94c2d8zviflzi0a9c81gn2j0gyx475i3";
+      url = "https://github.com/armon/consul-api";
+      rev = "eb2c6b5be1b6";
+      sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
+    };
+  }
+  {
+    goPackagePath = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "v1.31.13";
+      sha256 = "170yaj7ffrkw56z9kmng06wwnyblqj16zm9x39q76fi4pdnn5rqc";
     };
   }
   {
@@ -117,6 +297,24 @@
       sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
     };
   }
+  {
+    goPackagePath = "github.com/boltdb/bolt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/boltdb/bolt";
+      rev = "v1.3.1";
+      sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
+    };
+  }
+  {
+    goPackagePath = "github.com/census-instrumentation/opencensus-proto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-instrumentation/opencensus-proto";
+      rev = "v0.2.1";
+      sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj";
+    };
+  }
   {
     goPackagePath = "github.com/certifi/gocertifi";
     fetch = {
@@ -180,6 +378,15 @@
       sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8";
     };
   }
+  {
+    goPackagePath = "github.com/cncf/udpa";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cncf/udpa";
+      rev = "269d4d468f6f";
+      sha256 = "0i1jiaw2k3hlwwmg4hap81vb4s1p25xp9kdfww37v0fbgjariccs";
+    };
+  }
   {
     goPackagePath = "github.com/codahale/hdrhistogram";
     fetch = {
@@ -198,6 +405,51 @@
       sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj";
     };
   }
+  {
+    goPackagePath = "github.com/coreos/etcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/etcd";
+      rev = "v3.3.10";
+      sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-etcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-etcd";
+      rev = "v2.0.0";
+      sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/go-semver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-semver";
+      rev = "v0.2.0";
+      sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
+    };
+  }
+  {
+    goPackagePath = "github.com/cpuguy83/go-md2man";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cpuguy83/go-md2man";
+      rev = "v1.0.10";
+      sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i";
+    };
+  }
+  {
+    goPackagePath = "github.com/danwakefield/fnmatch";
+    fetch = {
+      type = "git";
+      url = "https://github.com/danwakefield/fnmatch";
+      rev = "cbb64ac3d964";
+      sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
+    };
+  }
   {
     goPackagePath = "github.com/davecgh/go-spew";
     fetch = {
@@ -207,6 +459,24 @@
       sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
     };
   }
+  {
+    goPackagePath = "github.com/devigned/tab";
+    fetch = {
+      type = "git";
+      url = "https://github.com/devigned/tab";
+      rev = "v0.1.1";
+      sha256 = "17r98k3bcyjkq5mz2k9i2sxbzgkq05h5pqg5mn7nyrvsf09x99g5";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgraph-io/badger";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgraph-io/badger";
+      rev = "v1.6.0";
+      sha256 = "1vzibjqhb10q6s2chbzlwndij2d9ybjnq7h28hx4akr119avd0d5";
+    };
+  }
   {
     goPackagePath = "github.com/dgrijalva/jwt-go";
     fetch = {
@@ -216,6 +486,42 @@
       sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
     };
   }
+  {
+    goPackagePath = "github.com/dgryski/go-farm";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgryski/go-farm";
+      rev = "6a90982ecee2";
+      sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix";
+    };
+  }
+  {
+    goPackagePath = "github.com/dimchansky/utfbom";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dimchansky/utfbom";
+      rev = "v1.1.0";
+      sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww";
+    };
+  }
+  {
+    goPackagePath = "github.com/dlclark/regexp2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dlclark/regexp2";
+      rev = "v1.2.0";
+      sha256 = "011l1prsywvhhi0yc7qmpsca1cwavmawyyld5kjzi0ff9ghvj4ng";
+    };
+  }
+  {
+    goPackagePath = "github.com/dustin/go-humanize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dustin/go-humanize";
+      rev = "v1.0.0";
+      sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
+    };
+  }
   {
     goPackagePath = "github.com/eknkc/amber";
     fetch = {
@@ -225,6 +531,42 @@
       sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9";
     };
   }
+  {
+    goPackagePath = "github.com/envoyproxy/go-control-plane";
+    fetch = {
+      type = "git";
+      url = "https://github.com/envoyproxy/go-control-plane";
+      rev = "v0.9.4";
+      sha256 = "0m0crzx70lp7vz13v20wxb1fcfdnzp7h3mkh3bn6a8mbfz6w5asj";
+    };
+  }
+  {
+    goPackagePath = "github.com/envoyproxy/protoc-gen-validate";
+    fetch = {
+      type = "git";
+      url = "https://github.com/envoyproxy/protoc-gen-validate";
+      rev = "v0.1.0";
+      sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy";
+    };
+  }
+  {
+    goPackagePath = "github.com/etcd-io/bbolt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/etcd-io/bbolt";
+      rev = "v1.3.3";
+      sha256 = "0dn0zngks9xiz0rrrb3911f73ghl64z84jsmzai2yfmzqr7cdkqc";
+    };
+  }
+  {
+    goPackagePath = "github.com/fasthttp-contrib/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fasthttp-contrib/websocket";
+      rev = "1f3b11f56072";
+      sha256 = "1yacmwmil625p0pzj800h9dnmiab6bjwfmi48p9fcrvy2yyv9b97";
+    };
+  }
   {
     goPackagePath = "github.com/fatih/structs";
     fetch = {
@@ -243,6 +585,15 @@
       sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq";
     };
   }
+  {
+    goPackagePath = "github.com/fortytw2/leaktest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fortytw2/leaktest";
+      rev = "v1.3.0";
+      sha256 = "0487zghyxqzk6zdbhd2j074pcc2l15l4sfg5clrjqwfbql7519wx";
+    };
+  }
   {
     goPackagePath = "github.com/fsnotify/fsnotify";
     fetch = {
@@ -252,6 +603,15 @@
       sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
     };
   }
+  {
+    goPackagePath = "github.com/gavv/httpexpect";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gavv/httpexpect";
+      rev = "v2.0.0";
+      sha256 = "0dqb7lsinciz594q6jg59hrvk4g4awbs2ybsr580j22j2xag53vs";
+    };
+  }
   {
     goPackagePath = "github.com/gavv/monotime";
     fetch = {
@@ -275,8 +635,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/getsentry/sentry-go";
-      rev = "v0.3.0";
-      sha256 = "1919lhvg1swcqyfa6mck6nz53c7n4df21jsz46f7x4wncb6f5il1";
+      rev = "v0.5.1";
+      sha256 = "1kfn0gcb4c6amhagv04ydpl6p9cqw7f0lxas688a0rf89iwdzz89";
     };
   }
   {
@@ -320,8 +680,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-gl/glfw";
-      rev = "12ad95a8df72";
-      sha256 = "0ahw4a1lk7wqn6m0sjngsv2zc08kxxj259ai6g4kf11lmidszm9s";
+      rev = "e6da0acd62b1";
+      sha256 = "0prvx5r7q8yrhqvnwibv4xz3dayjbq36yajzqvh0z4lqsh4hyhch";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-ini/ini";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ini/ini";
+      rev = "v1.25.4";
+      sha256 = "0b6cql5ripbiyrm18d6bfd1rfjnwcbskppw3d0vb80l0wy72d0c6";
     };
   }
   {
@@ -351,6 +720,15 @@
       sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh";
     };
   }
+  {
+    goPackagePath = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev = "v1.5.0";
+      sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v";
+    };
+  }
   {
     goPackagePath = "github.com/go-stack/stack";
     fetch = {
@@ -360,6 +738,33 @@
       sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
     };
   }
+  {
+    goPackagePath = "github.com/gobwas/httphead";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/httphead";
+      rev = "2c6c146eadee";
+      sha256 = "0j7nlrf79cafl8ap69ri2c7v3psr2y133cr2wn735z7yn3dz3kss";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobwas/pool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/pool";
+      rev = "v0.2.0";
+      sha256 = "1avpa8c75j1y4hs7awazrjjy7w0pjfw80l424ddn5zyizvh7s67i";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobwas/ws";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/ws";
+      rev = "v1.0.2";
+      sha256 = "070mfcjbfb40bglc9aw9zjvd4jb1hp3l1s12ww6mjlwbjcg0mm9s";
+    };
+  }
   {
     goPackagePath = "github.com/gogo/protobuf";
     fetch = {
@@ -392,8 +797,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/groupcache";
-      rev = "215e87163ea7";
-      sha256 = "07555csk49ara636bhl2vbzziayls3qks8964z0q29g065zliy9j";
+      rev = "8c9f03a8e57e";
+      sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh";
     };
   }
   {
@@ -410,8 +815,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/mock";
-      rev = "v1.3.1";
-      sha256 = "1wnfa8njxdym1qb664dmfnkpm4pmqy22hqjlqpwaaiqhglb5g9d1";
+      rev = "v1.4.3";
+      sha256 = "1p37xnja1dgq5ykx24n7wincwz2gahjh71b95p8vpw7ss2g8j8wx";
     };
   }
   {
@@ -419,8 +824,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "v1.3.2";
-      sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+      rev = "v1.4.2";
+      sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw";
     };
   }
   {
@@ -446,8 +851,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/google/go-cmp";
-      rev = "v0.4.0";
-      sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2";
+      rev = "v0.4.1";
+      sha256 = "0l1mi8lw1nlq39hqx52v9lz0369ajfi948521cxwrcb4qwm275p6";
     };
   }
   {
@@ -459,22 +864,13 @@
       sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
     };
   }
-  {
-    goPackagePath = "github.com/google/martian";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/martian";
-      rev = "v2.1.0";
-      sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp";
-    };
-  }
   {
     goPackagePath = "github.com/google/pprof";
     fetch = {
       type = "git";
       url = "https://github.com/google/pprof";
-      rev = "d4f498aebedc";
-      sha256 = "1r4pn70yy5vfl38jx9v8224n7jkhcm5wg28vv48izgznlgv7h024";
+      rev = "427632fa3b1c";
+      sha256 = "065r8435mr8zzdiifkixzc948c4ivx0hhqjsppy71zcxmm9jhxgx";
     };
   }
   {
@@ -486,6 +882,15 @@
       sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx";
     };
   }
+  {
+    goPackagePath = "github.com/google/subcommands";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/subcommands";
+      rev = "v1.0.1";
+      sha256 = "0rw5wwjfi0pd1kfbh09mfmyjy6h22ip7cawp0dj7v6rq4cy98ymz";
+    };
+  }
   {
     goPackagePath = "github.com/google/uuid";
     fetch = {
@@ -495,6 +900,15 @@
       sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
     };
   }
+  {
+    goPackagePath = "github.com/google/wire";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/wire";
+      rev = "v0.4.0";
+      sha256 = "1z3nrccxsrhphpb6yrmc1hn4njy8qbayg3w6m9zsbi77yaiigxni";
+    };
+  }
   {
     goPackagePath = "github.com/googleapis/gax-go";
     fetch = {
@@ -549,6 +963,15 @@
       sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl";
     };
   }
+  {
+    goPackagePath = "github.com/hashicorp/go-version";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-version";
+      rev = "v1.2.0";
+      sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z";
+    };
+  }
   {
     goPackagePath = "github.com/hashicorp/golang-lru";
     fetch = {
@@ -558,6 +981,15 @@
       sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy";
     };
   }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "v1.0.0";
+      sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
+    };
+  }
   {
     goPackagePath = "github.com/hpcloud/tail";
     fetch = {
@@ -585,6 +1017,15 @@
       sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph";
     };
   }
+  {
+    goPackagePath = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev = "v1.0.0";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
   {
     goPackagePath = "github.com/iris-contrib/blackfriday";
     fetch = {
@@ -622,12 +1063,48 @@
     };
   }
   {
-    goPackagePath = "github.com/jfbus/httprs";
+    goPackagePath = "github.com/iris-contrib/i18n";
     fetch = {
       type = "git";
-      url = "https://github.com/jfbus/httprs";
-      rev = "b0af8319bb15";
-      sha256 = "05cg9a27i9g92n3bivqrrqznccl5lfadlk97sp9izmd368dl5qvc";
+      url = "https://github.com/iris-contrib/i18n";
+      rev = "987a633949d0";
+      sha256 = "0yslm7hmacc57v970jbys4x5c5yxgcjgff982ngivg9v1a16kifq";
+    };
+  }
+  {
+    goPackagePath = "github.com/iris-contrib/schema";
+    fetch = {
+      type = "git";
+      url = "https://github.com/iris-contrib/schema";
+      rev = "v0.0.1";
+      sha256 = "1a1lk2ll2xv3ljffmfw4q8mqqw727pj8dzs6c8g2hh0b0b050g79";
+    };
+  }
+  {
+    goPackagePath = "github.com/jmespath/go-jmespath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jmespath/go-jmespath";
+      rev = "v0.3.0";
+      sha256 = "12qgp7yb7yfjxhd311kb820fcjmg7gd4hp2fc4v6x8s7121pwnjp";
+    };
+  }
+  {
+    goPackagePath = "github.com/johannesboyne/gofakes3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/johannesboyne/gofakes3";
+      rev = "02d71f533bec";
+      sha256 = "0igx9andbkrmwspjbq9sa8pady2hpyvvjj4hfmghnry02kq23fwn";
+    };
+  }
+  {
+    goPackagePath = "github.com/joho/godotenv";
+    fetch = {
+      type = "git";
+      url = "https://github.com/joho/godotenv";
+      rev = "v1.3.0";
+      sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm";
     };
   }
   {
@@ -716,8 +1193,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/kataras/golog";
-      rev = "99c81de45f40";
-      sha256 = "1dgrsvhzymgj7da54ldv8plkxk3n8zh3kc995qxl6mrpz65j801p";
+      rev = "v0.0.9";
+      sha256 = "160hd3z93c9i33q9g1bhfdxmsqg1lanncnrqcsr2444dy5j6ly3i";
     };
   }
   {
@@ -725,8 +1202,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/kataras/iris";
-      rev = "v11.1.1";
-      sha256 = "1rxpr5hdj9mji26mlfp4zic0pc6nh93akzccw24a5kynj07g68wg";
+      rev = "v12.0.1";
+      sha256 = "0k1jhamvf0byx6d317gzg6r2jls7bajhhf2spvdinarl2cjnakm5";
+    };
+  }
+  {
+    goPackagePath = "github.com/kataras/neffos";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kataras/neffos";
+      rev = "v0.0.10";
+      sha256 = "0mkqrxff28rcc71nw5qqsywn0fm2jz7magwp9hhvh1s01lgghjdp";
     };
   }
   {
@@ -761,8 +1247,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/klauspost/compress";
-      rev = "v1.4.0";
-      sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s";
+      rev = "v1.9.0";
+      sha256 = "07vndz6mdaliwagj2xq0y5c5w2zld14p9i5y7r0bkhb7klfyamfk";
     };
   }
   {
@@ -770,8 +1256,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/klauspost/cpuid";
-      rev = "e7e905edc00e";
-      sha256 = "0cmyv3rwv5r5iqvvfhbiwp3jsfa40c6xfm42nxbngd5lygjcwwgf";
+      rev = "v1.2.1";
+      sha256 = "1071wchrs37bvpb99fwf19fjrpz0yaqipi2y2hjvim419flvd49x";
     };
   }
   {
@@ -824,8 +1310,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/labstack/echo";
-      rev = "v4.1.10";
-      sha256 = "0qg9ykmhgldiv2v1w8sz8x0j0bgqf11ghzrim59fb6pxz8qgg25h";
+      rev = "v4.1.11";
+      sha256 = "0b14vgwzznn7wzyjb98xdmq4wjg16l3y62njiwfz4qsm4pwzk405";
     };
   }
   {
@@ -837,6 +1323,15 @@
       sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0";
     };
   }
+  {
+    goPackagePath = "github.com/lib/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lib/pq";
+      rev = "v1.1.1";
+      sha256 = "0g64wlg1l1ybq4x44idksl4pgm055s58jxc6r6x4qhqm5q76h0km";
+    };
+  }
   {
     goPackagePath = "github.com/libgit2/git2go";
     fetch = {
@@ -855,13 +1350,31 @@
       sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb";
     };
   }
+  {
+    goPackagePath = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev = "v1.8.0";
+      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+    };
+  }
   {
     goPackagePath = "github.com/mattn/go-colorable";
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-colorable";
-      rev = "v0.1.2";
-      sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n";
+      rev = "v0.1.6";
+      sha256 = "0zv9ix7g0qf71jdhv7gbab9hjfkgbxl22kwhpz9ck1y6m4g1zxaw";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-ieproxy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-ieproxy";
+      rev = "v0.0.1";
+      sha256 = "0x1ijwwp22s20vjbca5ac7y7bx2jp6jizzqa38ks4943q7vi4w09";
     };
   }
   {
@@ -869,8 +1382,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-isatty";
-      rev = "v0.0.9";
-      sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m";
+      rev = "v0.0.12";
+      sha256 = "1dfsh27d52wmz0nmmzm2382pfrs2fcijvh6cgir7jbb4pnigr5w4";
     };
   }
   {
@@ -891,6 +1404,24 @@
       sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
     };
   }
+  {
+    goPackagePath = "github.com/mediocregopher/mediocre-go-lib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mediocregopher/mediocre-go-lib";
+      rev = "cb65787f37ed";
+      sha256 = "0lg6q76fxjhxv05m80k4l6nrkj9qwzafs2mb2gbvhznxh8m0cv9j";
+    };
+  }
+  {
+    goPackagePath = "github.com/mediocregopher/radix";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mediocregopher/radix";
+      rev = "v3.3.0";
+      sha256 = "0pchn5z2g4wnf87350war5fr9pqpdksia1ffvw7cphg4q9blggfx";
+    };
+  }
   {
     goPackagePath = "github.com/microcosm-cc/bluemonday";
     fetch = {
@@ -909,6 +1440,24 @@
       sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr";
     };
   }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "v1.1.0";
+      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "v1.1.2";
+      sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
+    };
+  }
   {
     goPackagePath = "github.com/mitchellh/reflectwalk";
     fetch = {
@@ -954,13 +1503,40 @@
       sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
     };
   }
+  {
+    goPackagePath = "github.com/nats-io/nats.go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nats-io/nats.go";
+      rev = "v1.8.1";
+      sha256 = "0h9zzpjl6ac227bhf0i4ram9a5jlibq53pawv0zzxdirxrnp1vkj";
+    };
+  }
+  {
+    goPackagePath = "github.com/nats-io/nkeys";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nats-io/nkeys";
+      rev = "v0.0.2";
+      sha256 = "0kibc1g60w031rssk3vs74gfick3jdl3igckn1v4k8b5grawcks1";
+    };
+  }
+  {
+    goPackagePath = "github.com/nats-io/nuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nats-io/nuid";
+      rev = "v1.0.1";
+      sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg";
+    };
+  }
   {
     goPackagePath = "github.com/onsi/ginkgo";
     fetch = {
       type = "git";
       url = "https://github.com/onsi/ginkgo";
-      rev = "v1.10.1";
-      sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d";
+      rev = "v1.10.3";
+      sha256 = "00a40by9f5ylycnar8h3p9b4z5rcsvfvg4j3v5s5mchdqrqjv1pc";
     };
   }
   {
@@ -968,8 +1544,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/onsi/gomega";
-      rev = "v1.7.0";
-      sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y";
+      rev = "v1.7.1";
+      sha256 = "06p3x0910cdaa64l7d44s728d4j3yhps315dlcvrbjzhljjj7mam";
     };
   }
   {
@@ -981,6 +1557,15 @@
       sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
     };
   }
+  {
+    goPackagePath = "github.com/pelletier/go-toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-toml";
+      rev = "v1.2.0";
+      sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
+    };
+  }
   {
     goPackagePath = "github.com/philhofer/fwd";
     fetch = {
@@ -995,8 +1580,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pingcap/errors";
-      rev = "v0.11.1";
-      sha256 = "00wr0l4cwq0qx8jw51j0n7pbh9l7hdq2874x9rf1mz5svz1wbmcp";
+      rev = "v0.11.4";
+      sha256 = "02k6b30m42aya763fnwx3paq4r8h28yav4i2kv2z4r28r70xxcgn";
     };
   }
   {
@@ -1004,8 +1589,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pkg/errors";
-      rev = "v0.8.1";
-      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
+      rev = "v0.9.1";
+      sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq";
     };
   }
   {
@@ -1071,6 +1656,15 @@
       sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216";
     };
   }
+  {
+    goPackagePath = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev = "v1.5.2";
+      sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c";
+    };
+  }
   {
     goPackagePath = "github.com/ryanuber/columnize";
     fetch = {
@@ -1080,6 +1674,15 @@
       sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6";
     };
   }
+  {
+    goPackagePath = "github.com/ryszard/goskiplist";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ryszard/goskiplist";
+      rev = "2dfbae5fcf46";
+      sha256 = "1135gmvcwnmk36zryxq554fmikrmg5c6y5ml00arqpagn5xhnmnl";
+    };
+  }
   {
     goPackagePath = "github.com/sebest/xff";
     fetch = {
@@ -1098,6 +1701,15 @@
       sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
     };
   }
+  {
+    goPackagePath = "github.com/shabbyrobe/gocovmerge";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shabbyrobe/gocovmerge";
+      rev = "3e036491d500";
+      sha256 = "1wb5xlknnmyamf7ksnd6fwyc73pip90gkjbm6qcc47flbdfdl4xg";
+    };
+  }
   {
     goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
     fetch = {
@@ -1130,17 +1742,71 @@
     fetch = {
       type = "git";
       url = "https://github.com/smartystreets/goconvey";
-      rev = "505e41936337";
+      rev = "v1.6.4";
       sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m";
     };
   }
+  {
+    goPackagePath = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev = "v1.2.1";
+      sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev = "v1.3.0";
+      sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev = "v0.0.5";
+      sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev = "v1.0.0";
+      sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "v1.0.3";
+      sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev = "v1.3.2";
+      sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh";
+    };
+  }
   {
     goPackagePath = "github.com/stretchr/objx";
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/objx";
-      rev = "v0.1.1";
-      sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+      rev = "v0.2.0";
+      sha256 = "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k";
     };
   }
   {
@@ -1148,8 +1814,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "v1.4.0";
-      sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
+      rev = "v1.5.1";
+      sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
     };
   }
   {
@@ -1193,8 +1859,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/ugorji/go";
-      rev = "v1.1.4";
-      sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
+      rev = "v1.1.7";
+      sha256 = "068gja55kbh2iivp03x4n9dcml0rxv0k64ivkmq06si2ar1835rm";
     };
   }
   {
@@ -1220,8 +1886,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/valyala/fasthttp";
-      rev = "v1.4.0";
-      sha256 = "0kypc7r91n61fm6qsadza1aiy9n6byghvcxzvx7agi6yzrllk956";
+      rev = "v1.6.0";
+      sha256 = "1r1hm4rv9w6x829jjg75y8xd523b76parsyyvjwyz8k2l6bm4h0b";
     };
   }
   {
@@ -1265,8 +1931,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/xeipuuv/gojsonschema";
-      rev = "v1.1.0";
-      sha256 = "10gn5y4l72zknj21mff29d9vnk4pz7jnw39xnlsb373lsiih91xg";
+      rev = "v1.2.0";
+      sha256 = "1mqiq0r8qw4qlfp3ls8073r6514rmzwrmdn4j33rppk3zh942i6l";
+    };
+  }
+  {
+    goPackagePath = "github.com/xordataexchange/crypt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xordataexchange/crypt";
+      rev = "b2862e3d0a77";
+      sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
     };
   }
   {
@@ -1305,6 +1980,15 @@
       sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk";
     };
   }
+  {
+    goPackagePath = "github.com/yuin/goldmark";
+    fetch = {
+      type = "git";
+      url = "https://github.com/yuin/goldmark";
+      rev = "v1.1.27";
+      sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923";
+    };
+  }
   {
     goPackagePath = "gitlab.com/gitlab-org/gitaly";
     fetch = {
@@ -1319,8 +2003,8 @@
     fetch = {
       type = "git";
       url = "https://gitlab.com/gitlab-org/labkit.git";
-      rev = "fac94cb428e6";
-      sha256 = "19wvfjij6zm88fxbx0cngr6ny4yh3fw469d6vlv741b37s07w3j0";
+      rev = "96e583c57891";
+      sha256 = "15h6yvyq5rhhblwmahz89b0kgkfvfrpg20d23jvshyxs5xjh7y8f";
     };
   }
   {
@@ -1328,8 +2012,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/census-instrumentation/opencensus-go";
-      rev = "v0.22.2";
-      sha256 = "0lz7fid63pdrcvyzk5kn7vlcva102h61igmw7pz824wvj9k3hy4q";
+      rev = "v0.22.3";
+      sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw";
     };
   }
   {
@@ -1341,13 +2025,22 @@
       sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
     };
   }
+  {
+    goPackagePath = "gocloud.dev";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-cloud";
+      rev = "v0.20.0";
+      sha256 = "0zmqm8k4gxvivhpq3gpdqf9lnm9qj1ryyg9nm0rh3cvman5y07ci";
+    };
+  }
   {
     goPackagePath = "golang.org/x/crypto";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "87dc89f01550";
-      sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
+      rev = "e9b2fee46413";
+      sha256 = "18sz5426h320l9gdll9n43lzzxg2dmqv0s5fjy6sbvbkkpjs1m28";
     };
   }
   {
@@ -1355,8 +2048,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/exp";
-      rev = "da58074b4299";
-      sha256 = "1pgvdbjm3n47505diw3mm2hisp9b9q2lyvgl9m6xh2wx83b0cj48";
+      rev = "6cc2880d07d6";
+      sha256 = "1iia6hiif6hcp0cg1i6nq63qg0pmvm2kq24pf2r2il3597rfmlgy";
     };
   }
   {
@@ -1373,8 +2066,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/lint";
-      rev = "fdd1cda4f05f";
-      sha256 = "0a23pc90fqar8sm1b480sls15ss20rqk13yrf63b6rnyd2c6z0x2";
+      rev = "738671d3881b";
+      sha256 = "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c";
     };
   }
   {
@@ -1391,8 +2084,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/mod";
-      rev = "c90efee705ee";
-      sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf";
+      rev = "v0.3.0";
+      sha256 = "0ldgbx2zpprbsfn6p8pfgs4nn87gwbfcv2z0fa7n8alwsq2yw78q";
     };
   }
   {
@@ -1400,8 +2093,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "6afb5195e5aa";
-      sha256 = "1aiz41q2yxgg3dxfkn33ff54vhaxbiwcps9j3ia1xx4cqxim38zw";
+      rev = "627f9648deb9";
+      sha256 = "0ziz7i9mhz6dy2f58dsa83flkk165w1cnazm7yksql5i9m7x099z";
     };
   }
   {
@@ -1418,8 +2111,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sync";
-      rev = "cd5d95a43a6e";
-      sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds";
+      rev = "43a5402ce75a";
+      sha256 = "0j6zrrb81qjr1926kkwmn0di9a0jn8qyjd9dw614rfkihxgq1vsm";
     };
   }
   {
@@ -1427,8 +2120,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "d101bd2416d5";
-      sha256 = "1ksxf37b0ym21n8j29m3wgbaiw1kcjw3hgf88kipc1ry2j13l98p";
+      rev = "6fdc65e7d980";
+      sha256 = "0al5gzij4qkrp11i1h8j7288pg6y716zyh2v0886pv2knha7gjvj";
     };
   }
   {
@@ -1445,8 +2138,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/time";
-      rev = "9d24e82272b4";
-      sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb";
+      rev = "555d28b269f0";
+      sha256 = "1rhl4lyz030kwfsg63yk83yd3ivryv1afmzdz9sxbhcj84ym6h4r";
     };
   }
   {
@@ -1454,8 +2147,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/tools";
-      rev = "43d50277825c";
-      sha256 = "1168q4da36wq9w2591iqzsfy5ymwfi2g46bv5dnyyspg155ld19k";
+      rev = "1b747fd94509";
+      sha256 = "0r53sxrkkycdpi0l5ljqpd9dzmcgns4csl3zgsaxdy1l0r0bfnyc";
     };
   }
   {
@@ -1471,9 +2164,9 @@
     goPackagePath = "google.golang.org/api";
     fetch = {
       type = "git";
-      url = "https://code.googlesource.com/google-api-go-client";
-      rev = "v0.15.0";
-      sha256 = "1ljhwv5xsgsbqia70f35q19vwrsm47sh08ljbwdyfa867ff17qdh";
+      url = "https://github.com/googleapis/google-api-go-client";
+      rev = "v0.26.0";
+      sha256 = "0niqb2hkpj7sgk8q2xbpgjhbql0s4756nzbjs1msynbc94c9g7hy";
     };
   }
   {
@@ -1481,17 +2174,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/appengine";
-      rev = "v1.6.5";
-      sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w";
+      rev = "v1.6.6";
+      sha256 = "15c38h6fbv06cnkr6yknygfrpibyms2mya4w0l29kaxf42jn1qi5";
     };
   }
   {
     goPackagePath = "google.golang.org/genproto";
     fetch = {
       type = "git";
-      url = "https://github.com/google/go-genproto";
-      rev = "ca5a22157cba";
-      sha256 = "0ldkh6f0g0wzfkp09ib15a62bmcbpsxj93saikqmc86242bcxij0";
+      url = "https://github.com/googleapis/go-genproto";
+      rev = "7c474a2e3482";
+      sha256 = "00337qngl2rr45qpmlysc7wm7q27vbvjr2s36w1lc08fx7ba1wk9";
     };
   }
   {
@@ -1499,8 +2192,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/grpc/grpc-go";
+      rev = "v1.29.1";
+      sha256 = "1465947r6536si36cl2ppx7929la9zba1y6xfczfyp4kgf8988hf";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/protobuf";
       rev = "v1.24.0";
-      sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6";
+      sha256 = "0x3qyn3rizbs671gs7f8v50rmiwf9h7kbaradpivw9718mhbg1gn";
     };
   }
   {
@@ -1589,8 +2291,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "v2.2.2";
-      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+      rev = "v2.2.8";
+      sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
     };
   }
   {
@@ -1598,8 +2300,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/dominikh/go-tools";
-      rev = "v0.0.1-2019.2.3";
-      sha256 = "1rwwahmbs4dwxncwjj56likir1kps9937vm2id3rygxzzla40zal";
+      rev = "v0.0.1-2020.1.5";
+      sha256 = "1ry3ywncc9qkmh8ihh67v6k8nmqhq2gvfyrl1ykl4z6s56b7f9za";
     };
   }
   {
@@ -1611,4 +2313,22 @@
       sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b";
     };
   }
+  {
+    goPackagePath = "rsc.io/quote";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rsc/quote";
+      rev = "v3.1.0";
+      sha256 = "0nvv97hwwrl1mx5gzsbdm1ndnwpg3m7i2jb10ig9wily7zmvki0i";
+    };
+  }
+  {
+    goPackagePath = "rsc.io/sampler";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rsc/sampler";
+      rev = "v1.3.0";
+      sha256 = "0byxk2ynba50py805kcvbvjzh59l1r308i1xgyzpw6lff4xx9xjh";
+    };
+  }
 ]
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index 846bdeff48d3..fcb954e38843 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -34,12 +34,12 @@ diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.
 index 0bea8a4f4b..290248547b 100644
 --- a/config/initializers/1_settings.rb
 +++ b/config/initializers/1_settings.rb
-@@ -255,7 +255,7 @@ Settings.gitlab['user']       ||= 'git'
- Settings.gitlab['user_home']  ||= begin
+@@ -177,7 +177,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab['user']
+ Settings.gitlab['user_home'] ||= begin
    Etc.getpwnam(Settings.gitlab['user']).dir
- rescue ArgumentError # no user configured
--  '/home/' + Settings.gitlab['user']
-+  '/homeless-shelter'
+                                  rescue ArgumentError # no user configured
+-                                   '/home/' + Settings.gitlab['user']
++                                   '/homeless-shelter'
  end
  Settings.gitlab['time_zone'] ||= nil
  Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 9c8c5e8b30d7..0e28aa7a2d43 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 6.0.3'
+gem 'rails', '~> 6.0.3.1'
 
 gem 'bootsnap', '~> 1.4.6'
 
@@ -19,15 +19,15 @@ gem 'default_value_for', '~> 3.3.0'
 gem 'pg', '~> 1.1'
 
 gem 'rugged', '~> 0.28'
-gem 'grape-path-helpers', '~> 1.2'
+gem 'grape-path-helpers', '~> 1.3'
 
-gem 'faraday', '~> 0.12'
-gem 'marginalia', '~> 1.8.0'
+gem 'faraday', '~> 1.0'
+gem 'marginalia', '~> 1.9.0'
 
 # Authentication libraries
 gem 'devise', '~> 4.6'
-gem 'doorkeeper', '~> 5.0.3'
-gem 'doorkeeper-openid_connect', '~> 1.6.3'
+gem 'doorkeeper', '~> 5.3.0'
+gem 'doorkeeper-openid_connect', '~> 1.7.4'
 gem 'omniauth', '~> 1.8'
 gem 'omniauth-auth0', '~> 2.0.0'
 gem 'omniauth-azure-oauth2', '~> 0.0.9'
@@ -41,11 +41,11 @@ gem 'omniauth-oauth2-generic', '~> 0.2.2'
 gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth-shibboleth', '~> 1.3.0'
 gem 'omniauth-twitter', '~> 1.4'
-gem 'omniauth_crowd', '~> 2.2.0'
+gem 'omniauth_crowd', '~> 2.4.0'
 gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'omniauth_openid_connect', '~> 0.3.3'
-gem "omniauth-ultraauth", '~> 0.0.2'
+gem 'omniauth_openid_connect', '~> 0.3.5'
 gem 'omniauth-salesforce', '~> 1.0.5'
+gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
 gem 'rack-oauth2', '~> 1.9.3'
 gem 'jwt', '~> 2.1.0'
 
@@ -64,13 +64,13 @@ gem 'attr_encrypted', '~> 3.1.0'
 gem 'u2f', '~> 0.2.1'
 
 # GitLab Pages
-gem 'validates_hostname', '~> 1.0.6'
+gem 'validates_hostname', '~> 1.0.10'
 gem 'rubyzip', '~> 2.0.0', require: 'zip'
 # GitLab Pages letsencrypt support
-gem 'acme-client', '~> 2.0.5'
+gem 'acme-client', '~> 2.0', '>= 2.0.6'
 
 # Browser detection
-gem 'browser', '~> 2.5'
+gem 'browser', '~> 4.2'
 
 # GPG
 gem 'gpgme', '~> 2.0.19'
@@ -82,17 +82,19 @@ gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
 gem 'net-ldap'
 
 # API
-gem 'grape', '~> 1.1.0'
+# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged
+# Remove config/initializers/grape_patch.rb
+gem 'grape', '= 1.4.0'
 gem 'grape-entity', '~> 0.7.1'
 gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
 
 # GraphQL API
-gem 'graphql', '~> 1.10.5'
+gem 'graphql', '~> 1.11.4'
 # NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
 # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
 # https://gitlab.com/gitlab-org/gitlab/issues/31747
 gem 'graphiql-rails', '~> 1.4.10'
-gem 'apollo_upload_server', '~> 2.0.0.beta3'
+gem 'apollo_upload_server', '~> 2.0.2'
 gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
 
 # Disable strong_params so that Mash does not respond to :permitted?
@@ -113,14 +115,15 @@ gem 'fog-aws', '~> 3.5'
 # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
 # Also see config/initializers/fog_core_patch.rb.
 gem 'fog-core', '= 2.1.0'
-gem 'fog-google', '~> 1.9'
+gem 'fog-google', '~> 1.10'
 gem 'fog-local', '~> 0.6'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'
 gem 'fog-aliyun', '~> 0.3'
+gem 'gitlab-fog-azure-rm', '~> 1.0', require: false
 
 # for Google storage
-gem 'google-api-client', '~> 0.23'
+gem 'google-api-client', '~> 0.33'
 
 # for aws storage
 gem 'unf', '~> 0.1.4'
@@ -131,9 +134,11 @@ gem 'seed-fu', '~> 2.3.7'
 # Search
 gem 'elasticsearch-model', '~> 6.1'
 gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
-gem 'elasticsearch-api',   '~> 6.8'
-gem 'aws-sdk'
-gem 'faraday_middleware-aws-signers-v4'
+gem 'elasticsearch-api',   '~> 6.8.2'
+gem 'aws-sdk-core', '~> 3'
+gem 'aws-sdk-cloudformation', '~> 1'
+gem 'aws-sdk-s3', '~> 1'
+gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
 
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.12'
@@ -141,6 +146,7 @@ gem 'deckar01-task_list', '2.3.1'
 gem 'gitlab-markup', '~> 1.7.1'
 gem 'github-markup', '~> 1.7.0', require: 'github/markup'
 gem 'commonmarker', '~> 0.20'
+gem 'kramdown', '~> 2.3.0'
 gem 'RedCloth', '~> 4.3.2'
 gem 'rdoc', '~> 6.1.2'
 gem 'org-ruby', '~> 0.9.12'
@@ -149,7 +155,7 @@ gem 'wikicloth', '0.8.1'
 gem 'asciidoctor', '~> 2.0.10'
 gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
 gem 'asciidoctor-plantuml', '~> 0.0.12'
-gem 'rouge', '~> 3.19.0'
+gem 'rouge', '~> 3.21.0'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
 gem 'nokogiri', '~> 1.10.9'
@@ -164,6 +170,8 @@ gem 'diff_match_patch', '~> 0.1.0'
 
 # Application server
 gem 'rack', '~> 2.0.9'
+# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
+gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
 
 group :unicorn do
   gem 'unicorn', '~> 5.5'
@@ -173,7 +181,6 @@ end
 group :puma do
   gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false
   gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
-  gem 'rack-timeout', require: false
 end
 
 # State machine
@@ -185,7 +192,7 @@ gem 'acts-as-taggable-on', '~> 6.0'
 # Background jobs
 gem 'sidekiq', '~> 5.2.7'
 gem 'sidekiq-cron', '~> 1.0'
-gem 'redis-namespace', '~> 1.6.0'
+gem 'redis-namespace', '~> 1.7.0'
 gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch'
 
 # Cron Parser
@@ -211,7 +218,7 @@ gem 're2', '~> 1.2.0'
 gem 'version_sorter', '~> 2.2.4'
 
 # Export Ruby Regex to Javascript
-gem 'js_regex', '~> 3.1'
+gem 'js_regex', '~> 3.4'
 
 # User agent parsing
 gem 'device_detector'
@@ -243,7 +250,7 @@ gem 'slack-messenger', '~> 2.3.3'
 gem 'hangouts-chat', '~> 0.0.5'
 
 # Asana integration
-gem 'asana', '~> 0.9'
+gem 'asana', '0.10.2'
 
 # FogBugz integration
 gem 'ruby-fogbugz', '~> 0.2.1'
@@ -252,7 +259,7 @@ gem 'ruby-fogbugz', '~> 0.2.1'
 gem 'kubeclient', '~> 4.6.0'
 
 # Sanitize user input
-gem 'sanitize', '~> 4.6'
+gem 'sanitize', '~> 5.2.1'
 gem 'babosa', '~> 1.0.2'
 
 # Sanitizes SVG input
@@ -296,19 +303,19 @@ gem "gitlab-license", "~> 1.0"
 gem 'rack-attack', '~> 6.3.0'
 
 # Sentry integration
-gem 'sentry-raven', '~> 2.9'
+gem 'sentry-raven', '~> 3.0'
 
 gem 'premailer-rails', '~> 1.10.3'
 
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.12.0'
+gem 'gitlab-labkit', '0.12.1'
 
 # I18n
 gem 'ruby_parser', '~> 3.8', require: false
 gem 'rails-i18n', '~> 6.0'
 gem 'gettext_i18n_rails', '~> 1.8.0'
 gem 'gettext_i18n_rails_js', '~> 1.3'
-gem 'gettext', '~> 3.2.2', require: false, group: :development
+gem 'gettext', '~> 3.3', require: false, group: :development
 
 gem 'batch-loader', '~> 1.4.0'
 
@@ -320,31 +327,29 @@ gem 'snowplow-tracker', '~> 0.6.1'
 
 # Metrics
 group :metrics do
-  gem 'method_source', '~> 0.8', require: false
+  gem 'method_source', '~> 1.0', require: false
 
   # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.10.0'
+  gem 'prometheus-client-mmap', '~> 0.11.0'
   gem 'raindrops', '~> 0.18'
 end
 
 group :development do
   gem 'brakeman', '~> 4.2', require: false
-  gem 'danger', '~> 6.0', require: false
+  gem 'danger', '~> 8.0', require: false
 
   gem 'letter_opener_web', '~> 1.3.4'
-  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
 
   # Better errors handler
-  gem 'better_errors', '~> 2.5.0'
-  gem 'binding_of_caller', '~> 0.8.0'
+  gem 'better_errors', '~> 2.7.1'
 
   # thin instead webrick
   gem 'thin', '~> 1.7.0'
 end
 
 group :development, :test do
-  gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
-  gem 'pry-byebug', '~> 3.5.1', platform: :mri
+  gem 'bullet', '~> 6.1.0'
+  gem 'pry-byebug', '~> 3.9.0', platform: :mri
   gem 'pry-rails', '~> 0.3.9'
 
   gem 'awesome_print', require: false
@@ -362,15 +367,16 @@ group :development, :test do
   gem 'spring', '~> 2.0.0'
   gem 'spring-commands-rspec', '~> 1.0.4'
 
-  gem 'gitlab-styles', '~> 3.2.0', require: false
+  gem 'gitlab-styles', '~> 4.3.0', require: false
   # Pin these dependencies, otherwise a new rule could break the CI pipelines
-  gem 'rubocop', '~> 0.74.0'
-  gem 'rubocop-performance', '~> 1.4.1'
+  gem 'rubocop', '~> 0.82.0'
+  gem 'rubocop-performance', '~> 1.5.2'
   gem 'rubocop-rspec', '~> 1.37.0'
 
   gem 'scss_lint', '~> 0.56.0', require: false
   gem 'haml_lint', '~> 0.34.0', require: false
   gem 'simplecov', '~> 0.18.5', require: false
+  gem 'simplecov-cobertura', '~> 1.3.1', require: false
   gem 'bundler-audit', '~> 0.6.1', require: false
 
   gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -384,6 +390,8 @@ group :development, :test do
   gem 'png_quantizator', '~> 0.2.1', require: false
 
   gem 'parallel', '~> 1.19', require: false
+
+  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
 end
 
 # Gems required in omnibus-gitlab pipeline
@@ -397,17 +405,16 @@ group :test do
   gem 'rspec_profiling', '~> 0.0.5'
   gem 'rspec-parameterized', require: false
 
-  gem 'capybara', '~> 3.22.0'
+  gem 'capybara', '~> 3.33.0'
   gem 'capybara-screenshot', '~> 1.0.22'
   gem 'selenium-webdriver', '~> 3.142'
 
   gem 'shoulda-matchers', '~> 4.0.1', require: false
   gem 'email_spec', '~> 2.2.0'
-  gem 'json-schema', '~> 2.8.0'
   gem 'webmock', '~> 3.5.1'
   gem 'rails-controller-testing'
   gem 'concurrent-ruby', '~> 1.1'
-  gem 'test-prof', '~> 0.10.0'
+  gem 'test-prof', '~> 0.12.0'
   gem 'rspec_junit_formatter'
   gem 'guard-rspec'
 
@@ -418,7 +425,7 @@ end
 gem 'octokit', '~> 4.15'
 
 # https://gitlab.com/gitlab-org/gitlab/issues/207207
-gem 'gitlab-mail_room', '~> 0.0.4', require: 'mail_room'
+gem 'gitlab-mail_room', '~> 0.0.6', require: 'mail_room'
 
 gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
@@ -434,7 +441,7 @@ gem 'activerecord-explain-analyze', '~> 0.1', require: false
 gem 'oauth2', '~> 1.4'
 
 # Health check
-gem 'health_check', '~> 2.6.0'
+gem 'health_check', '~> 3.0'
 
 # System information
 gem 'vmstat', '~> 2.3.0'
@@ -454,11 +461,11 @@ group :ed25519 do
 end
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.0.0.pre.rc1'
+gem 'gitaly', '~> 13.3.0-rc1'
 
-gem 'grpc', '~> 1.24.0'
+gem 'grpc', '~> 1.30.2'
 
-gem 'google-protobuf', '~> 3.8.0'
+gem 'google-protobuf', '~> 3.12'
 
 gem 'toml-rb', '~> 1.0.0'
 
@@ -498,3 +505,10 @@ gem 'valid_email', '~> 0.1'
 
 # JSON
 gem 'json', '~> 2.3.0'
+gem 'json-schema', '~> 2.8.0'
+gem 'json_schemer', '~> 0.2.12'
+gem 'oj', '~> 3.10.6'
+gem 'multi_json', '~> 1.14.1'
+gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'
+
+gem 'webauthn', '~> 2.3'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index e6407161f8eb..9b0b34e6ed2c 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -4,61 +4,61 @@ GEM
     RedCloth (4.3.2)
     abstract_type (0.0.7)
     ace-rails-ap (4.1.2)
-    acme-client (2.0.5)
-      faraday (~> 0.9, >= 0.9.1)
-    actioncable (6.0.3)
-      actionpack (= 6.0.3)
+    acme-client (2.0.6)
+      faraday (>= 0.17, < 2.0.0)
+    actioncable (6.0.3.1)
+      actionpack (= 6.0.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3)
-      actionpack (= 6.0.3)
-      activejob (= 6.0.3)
-      activerecord (= 6.0.3)
-      activestorage (= 6.0.3)
-      activesupport (= 6.0.3)
+    actionmailbox (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.3)
-      actionpack (= 6.0.3)
-      actionview (= 6.0.3)
-      activejob (= 6.0.3)
+    actionmailer (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      actionview (= 6.0.3.1)
+      activejob (= 6.0.3.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3)
-      actionview (= 6.0.3)
-      activesupport (= 6.0.3)
+    actionpack (6.0.3.1)
+      actionview (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3)
-      actionpack (= 6.0.3)
-      activerecord (= 6.0.3)
-      activestorage (= 6.0.3)
-      activesupport (= 6.0.3)
+    actiontext (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3)
-      activesupport (= 6.0.3)
+    actionview (6.0.3.1)
+      activesupport (= 6.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3)
-      activesupport (= 6.0.3)
+    activejob (6.0.3.1)
+      activesupport (= 6.0.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.3)
-      activesupport (= 6.0.3)
-    activerecord (6.0.3)
-      activemodel (= 6.0.3)
-      activesupport (= 6.0.3)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
     activerecord-explain-analyze (0.1.0)
       activerecord (>= 4)
       pg
-    activestorage (6.0.3)
-      actionpack (= 6.0.3)
-      activejob (= 6.0.3)
-      activerecord (= 6.0.3)
+    activestorage (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
       marcel (~> 0.3.1)
-    activesupport (6.0.3)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -73,12 +73,13 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.0.1)
     akismet (3.0.0)
-    apollo_upload_server (2.0.0.beta.3)
+    android_key_attestation (0.3.0)
+    apollo_upload_server (2.0.2)
       graphql (>= 1.8)
       rails (>= 4.2)
-    asana (0.9.3)
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.9)
+    asana (0.10.2)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0)
       faraday_middleware-multi_json (~> 0.0)
       oauth2 (~> 1.4)
     asciidoctor (2.0.10)
@@ -93,20 +94,33 @@ GEM
       encryptor (~> 3.0.0)
     attr_required (1.0.1)
     awesome_print (1.8.0)
-    aws-eventstream (1.0.3)
-    aws-sdk (2.11.374)
-      aws-sdk-resources (= 2.11.374)
-    aws-sdk-core (2.11.374)
-      aws-sigv4 (~> 1.0)
+    awrence (1.1.1)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.345.0)
+    aws-sdk-cloudformation (1.41.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-core (3.104.3)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.374)
-      aws-sdk-core (= 2.11.374)
-    aws-sigv4 (1.1.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
+    aws-sdk-kms (1.36.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.75.0)
+      aws-sdk-core (~> 3, >= 3.104.1)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    azure-storage-blob (2.0.0)
+      azure-storage-common (~> 2.0)
+      nokogiri (~> 1.10.4)
+    azure-storage-common (2.0.1)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0.0.rc1)
+      nokogiri (~> 1.10.4)
     babosa (1.0.2)
     base32 (0.3.2)
     batch-loader (1.4.0)
@@ -115,30 +129,28 @@ GEM
     benchmark-ips (2.3.0)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
-    better_errors (2.5.0)
+    better_errors (2.7.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindata (2.4.3)
     binding_ninja (0.2.3)
-    binding_of_caller (0.8.0)
-      debug_inspector (>= 0.0.1)
     bootsnap (1.4.6)
       msgpack (~> 1.0)
     bootstrap_form (4.2.0)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
     brakeman (4.2.1)
-    browser (2.5.3)
+    browser (4.2.0)
     builder (3.2.4)
-    bullet (6.0.2)
+    bullet (6.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     bundler-audit (0.6.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
-    byebug (9.1.0)
-    capybara (3.22.0)
+    byebug (11.1.3)
+    capybara (3.33.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -153,7 +165,8 @@ GEM
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    character_set (1.1.2)
+    cbor (0.5.9.6)
+    character_set (1.4.0)
     charlock_holmes (0.7.6)
     childprocess (3.0.0)
     chunky_png (1.3.5)
@@ -163,9 +176,7 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    coderay (1.1.2)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
+    coderay (1.1.3)
     colored2 (3.1.2)
     commonmarker (0.20.1)
       ruby-enum (~> 0.5)
@@ -177,6 +188,9 @@ GEM
     contracts (0.11.0)
     cork (0.3.0)
       colored2 (~> 3.1)
+    cose (1.0.0)
+      cbor (~> 0.5.9)
+      openssl-signature_algorithm (~> 0.4.0)
     countries (3.0.0)
       i18n_data (~> 0.8.0)
       sixarm_ruby_unaccent (~> 1.1)
@@ -188,21 +202,20 @@ GEM
     css_parser (1.7.0)
       addressable
     daemons (1.2.6)
-    danger (6.0.9)
+    danger (8.0.5)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
-      faraday (~> 0.9)
+      faraday (>= 0.9.0, < 2.0)
       faraday-http-cache (~> 2.0)
-      git (~> 1.5)
-      kramdown (~> 2.0)
+      git (~> 1.7)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
     database_cleaner (1.7.0)
-    debug_inspector (0.0.3)
     debugger-ruby_core_source (1.3.8)
     deckar01-task_list (2.3.1)
       html-pipeline
@@ -221,8 +234,6 @@ GEM
       ruby-statistics (>= 2.1)
       thor (>= 0.19, < 2)
       unicode_plot (>= 0.0.4, < 1.0.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
     device_detector (1.0.0)
     devise (4.7.1)
       bcrypt (~> 3.0)
@@ -244,24 +255,48 @@ GEM
     docile (1.3.2)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.0.3)
-      railties (>= 4.2)
-    doorkeeper-openid_connect (1.6.3)
-      doorkeeper (>= 5.0, < 5.2)
-      json-jwt (~> 1.6)
+    doorkeeper (5.3.3)
+      railties (>= 5)
+    doorkeeper-openid_connect (1.7.4)
+      doorkeeper (>= 5.2, < 5.5)
+      json-jwt (>= 1.11.0)
+    dry-configurable (0.11.5)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.4, >= 0.4.7)
+      dry-equalizer (~> 0.2)
+    dry-container (0.7.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.4.9)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.3.0)
+    dry-inflector (0.2.0)
+    dry-logic (1.0.6)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-types (1.4.0)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer (~> 0.3)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
+    ecma-re-validator (0.2.1)
+      regexp_parser (~> 1.2)
     ed25519 (1.2.4)
-    elasticsearch (6.8.0)
-      elasticsearch-api (= 6.8.0)
-      elasticsearch-transport (= 6.8.0)
-    elasticsearch-api (6.8.0)
+    elasticsearch (6.8.2)
+      elasticsearch-api (= 6.8.2)
+      elasticsearch-transport (= 6.8.2)
+    elasticsearch-api (6.8.2)
       multi_json
-    elasticsearch-model (6.1.0)
+    elasticsearch-model (6.1.1)
       activesupport (> 3)
-      elasticsearch (> 1)
+      elasticsearch (~> 6)
       hashie
-    elasticsearch-rails (6.1.0)
-    elasticsearch-transport (6.8.0)
-      faraday
+    elasticsearch-rails (6.1.1)
+    elasticsearch-transport (6.8.2)
+      faraday (~> 1)
       multi_json
     email_reply_trimmer (0.1.6)
     email_spec (2.2.0)
@@ -286,22 +321,25 @@ GEM
     factory_bot_rails (5.1.0)
       factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
-    faraday (0.15.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (2.0.0)
-      faraday (~> 0.8)
-    faraday_middleware (0.12.2)
-      faraday (>= 0.7.4, < 1.0)
-    faraday_middleware-aws-signers-v4 (0.1.7)
-      aws-sdk-resources (~> 2)
-      faraday (~> 0.9)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    faraday_middleware-aws-sigv4 (0.3.0)
+      aws-sigv4 (~> 1.0)
+      faraday (>= 0.15)
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
       multi_json
     fast_blank (1.0.0)
     fast_gettext (1.6.0)
     ffaker (2.10.0)
-    ffi (1.12.2)
+    ffi (1.13.1)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -330,11 +368,11 @@ GEM
       excon (~> 0.58)
       formatador (~> 0.2)
       mime-types
-    fog-google (1.9.1)
+    fog-google (1.10.0)
       fog-core (<= 2.1.0)
       fog-json (~> 1.2)
       fog-xml (~> 0.1.0)
-      google-api-client (~> 0.23.0)
+      google-api-client (>= 0.32, < 0.34)
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
@@ -366,7 +404,7 @@ GEM
       json
     get_process_mem (0.2.5)
       ffi (~> 1.0)
-    gettext (3.2.9)
+    gettext (3.3.6)
       locale (>= 2.0.5)
       text (>= 1.3.0)
     gettext_i18n_rails (1.8.0)
@@ -376,13 +414,21 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    git (1.5.0)
-    gitaly (13.0.0.pre.rc1)
+    git (1.7.0)
+      rchardet (~> 1.8)
+    gitaly (13.3.0.pre.rc2)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab-chronic (0.10.5)
       numerizer (~> 0.2)
-    gitlab-labkit (0.12.0)
+    gitlab-fog-azure-rm (1.0.0)
+      azure-storage-blob (~> 2.0)
+      azure-storage-common (~> 2.0)
+      fog-core (= 2.1.0)
+      fog-json (~> 1.2.0)
+      mime-types
+      ms_rest_azure (~> 0.12.0)
+    gitlab-labkit (0.12.1)
       actionpack (>= 5.0.0, < 6.1.0)
       activesupport (>= 5.0.0, < 6.1.0)
       grpc (~> 1.19)
@@ -390,21 +436,21 @@ GEM
       opentracing (~> 0.4)
       redis (> 3.0.0, < 5.0.0)
     gitlab-license (1.0.0)
-    gitlab-mail_room (0.0.4)
+    gitlab-mail_room (0.0.6)
     gitlab-markup (1.7.1)
     gitlab-net-dns (0.9.1)
-    gitlab-puma (4.3.3.gitlab.2)
+    gitlab-puma (4.3.5.gitlab.3)
       nio4r (~> 2.0)
     gitlab-puma_worker_killer (0.1.1.gitlab.1)
       get_process_mem (~> 0.2)
       gitlab-puma (>= 2.7, < 5)
     gitlab-sidekiq-fetcher (0.5.2)
       sidekiq (~> 5)
-    gitlab-styles (3.2.0)
-      rubocop (~> 0.74.0)
+    gitlab-styles (4.3.0)
+      rubocop (~> 0.82.0)
       rubocop-gitlab-security (~> 0.1.0)
-      rubocop-performance (~> 1.4.1)
-      rubocop-rails (~> 2.0)
+      rubocop-performance (~> 1.5.2)
+      rubocop-rails (~> 2.5)
       rubocop-rspec (~> 1.36)
     gitlab_chronic_duration (0.10.6.2)
       numerizer (~> 0.2)
@@ -419,38 +465,39 @@ GEM
       actionpack (>= 3.0)
       multi_json
       request_store (>= 1.0)
-    google-api-client (0.23.4)
+    google-api-client (0.33.2)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.7.0)
+      googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
+      mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    google-protobuf (3.8.0)
-    googleapis-common-protos-types (1.0.4)
-      google-protobuf (~> 3.0)
-    googleauth (0.6.6)
-      faraday (~> 0.12)
+      signet (~> 0.12)
+    google-protobuf (3.12.4)
+    googleapis-common-protos-types (1.0.5)
+      google-protobuf (~> 3.11)
+    googleauth (0.12.0)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.12)
+      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.7)
+      signet (~> 0.14)
     gpgme (2.0.20)
       mini_portile2 (~> 2.3)
-    grape (1.1.0)
+    grape (1.4.0)
       activesupport
       builder
+      dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-      virtus (>= 1.0.0)
     grape-entity (0.7.1)
       activesupport (>= 4.0)
       multi_json (>= 1.3.2)
-    grape-path-helpers (1.2.0)
+    grape-path-helpers (1.3.0)
       activesupport
-      grape (~> 1.0)
+      grape (~> 1.3)
       rake (~> 12)
     grape_logging (1.8.3)
       grape
@@ -458,7 +505,7 @@ GEM
     graphiql-rails (1.4.10)
       railties
       sprockets-rails
-    graphql (1.10.5)
+    graphql (1.11.4)
     graphql-docs (1.6.0)
       commonmarker (~> 0.16)
       escape_utils (~> 1.2)
@@ -467,12 +514,12 @@ GEM
       graphql (~> 1.6)
       html-pipeline (~> 2.8)
       sass (~> 3.4)
-    grpc (1.24.0)
-      google-protobuf (~> 3.8)
+    grpc (1.30.2)
+      google-protobuf (~> 3.12)
       googleapis-common-protos-types (~> 1.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
-    guard (2.15.1)
+    guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -498,13 +545,14 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
+    hana (1.3.6)
     hangouts-chat (0.0.5)
     hashdiff (0.3.8)
     hashie (3.6.0)
     hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
-    health_check (2.6.0)
-      rails (>= 4.0)
+    health_check (3.0.0)
+      railties (>= 5.0)
     heapy (0.1.4)
     hipchat (1.5.2)
       httparty
@@ -529,7 +577,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     i18n_data (0.8.0)
     icalendar (2.4.1)
@@ -547,9 +595,9 @@ GEM
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
     jmespath (1.4.0)
-    js_regex (3.1.1)
-      character_set (~> 1.1)
-      regexp_parser (~> 1.1)
+    js_regex (3.4.0)
+      character_set (~> 1.4)
+      regexp_parser (~> 1.5)
       regexp_property_values (~> 0.3)
     json (2.3.0)
     json-jwt (1.11.0)
@@ -558,6 +606,11 @@ GEM
       bindata
     json-schema (2.8.0)
       addressable (>= 2.4)
+    json_schemer (0.2.12)
+      ecma-re-validator (~> 0.2)
+      hana (~> 1.3)
+      regexp_parser (~> 1.5)
+      uri_template (~> 0.7)
     jwt (2.1.0)
     kaminari (1.2.1)
       activesupport (>= 4.1.0)
@@ -574,7 +627,8 @@ GEM
     kgio (2.11.3)
     knapsack (1.17.0)
       rake
-    kramdown (2.1.0)
+    kramdown (2.3.0)
+      rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     kubeclient (4.6.0)
@@ -598,13 +652,12 @@ GEM
       xml-simple
     licensee (8.9.2)
       rugged (~> 0.24)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    locale (2.1.2)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    locale (2.1.3)
     lockbox (0.3.3)
-    lograge (0.10.0)
+    lograge (0.11.2)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
@@ -613,36 +666,46 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
-    lumberjack (1.0.13)
+    lumberjack (1.2.7)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    marginalia (1.8.0)
+    marginalia (1.9.0)
       actionpack (>= 2.3)
       activerecord (>= 2.3)
     memoist (0.16.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     memory_profiler (0.9.14)
-    method_source (0.9.2)
-    mime-types (3.2.2)
+    method_source (1.0.0)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2020.0512)
     mimemagic (0.3.5)
     mini_histogram (0.1.3)
     mini_magick (4.9.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    msgpack (1.3.1)
+    ms_rest (0.7.6)
+      concurrent-ruby (~> 1.0)
+      faraday (>= 0.9, < 2.0.0)
+      timeliness (~> 0.3.10)
+    ms_rest_azure (0.12.0)
+      concurrent-ruby (~> 1.0)
+      faraday (>= 0.9, < 2.0.0)
+      faraday-cookie_jar (~> 0.0.6)
+      ms_rest (~> 0.7.6)
+    msgpack (1.3.3)
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     murmurhash3 (0.1.6)
-    mustermann (1.0.3)
-    mustermann-grape (1.0.0)
-      mustermann (~> 1.0.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    mustermann-grape (1.0.1)
+      mustermann (>= 1.0.0)
     nakayoshi_fork (0.0.4)
     nap (1.1.0)
     nenv (0.3.0)
@@ -652,17 +715,17 @@ GEM
     netrc (0.11.0)
     nio4r (2.5.2)
     no_proxy_fix (0.1.2)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    nokogumbo (1.5.0)
-      nokogiri
+    nokogumbo (2.0.2)
+      nokogiri (~> 1.8, >= 1.8.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     numerizer (0.2.0)
     oauth (0.5.4)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
@@ -670,9 +733,13 @@ GEM
     octokit (4.15.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
+    oj (3.10.6)
     omniauth (1.9.0)
       hashie (>= 3.4.6, < 3.7.0)
       rack (>= 1.6.2, < 3)
+    omniauth-atlassian-oauth2 (0.2.0)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.5)
     omniauth-auth0 (2.0.0)
       omniauth-oauth2 (~> 1.4)
     omniauth-authentiq (0.3.3)
@@ -722,13 +789,11 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    omniauth-ultraauth (0.0.2)
-      omniauth_openid_connect (~> 0.3.0)
-    omniauth_crowd (2.2.3)
+    omniauth_crowd (2.4.0)
       activesupport
       nokogiri (>= 1.4.4)
       omniauth (~> 1.0)
-    omniauth_openid_connect (0.3.3)
+    omniauth_openid_connect (0.3.5)
       addressable (~> 2.5)
       omniauth (~> 1.9)
       openid_connect (~> 1.1)
@@ -743,19 +808,21 @@ GEM
       validate_email
       validate_url
       webfinger (>= 1.0.1)
+    openssl (2.2.0)
+    openssl-signature_algorithm (0.4.0)
     opentracing (0.5.0)
-    optimist (3.0.0)
+    optimist (3.0.1)
     org-ruby (0.9.12)
       rubypants (~> 0.2)
     orm_adapter (0.5.0)
     os (1.0.0)
     parallel (1.19.1)
-    parser (2.7.0.4)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
     parslet (1.8.2)
     peek (1.1.0)
       railties (>= 4.0.0)
-    pg (1.2.2)
+    pg (1.2.3)
     png_quantizator (0.2.1)
     po_to_json (1.0.1)
       json (>= 1.6.0)
@@ -771,13 +838,13 @@ GEM
       parser
       unparser
     procto (0.0.3)
-    prometheus-client-mmap (0.10.0)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.5.1)
-      byebug (~> 9.1)
-      pry (~> 0.10)
+    prometheus-client-mmap (0.11.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.3)
@@ -802,21 +869,21 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rack-timeout (0.5.1)
-    rails (6.0.3)
-      actioncable (= 6.0.3)
-      actionmailbox (= 6.0.3)
-      actionmailer (= 6.0.3)
-      actionpack (= 6.0.3)
-      actiontext (= 6.0.3)
-      actionview (= 6.0.3)
-      activejob (= 6.0.3)
-      activemodel (= 6.0.3)
-      activerecord (= 6.0.3)
-      activestorage (= 6.0.3)
-      activesupport (= 6.0.3)
+    rack-timeout (0.5.2)
+    rails (6.0.3.1)
+      actioncable (= 6.0.3.1)
+      actionmailbox (= 6.0.3.1)
+      actionmailer (= 6.0.3.1)
+      actionpack (= 6.0.3.1)
+      actiontext (= 6.0.3.1)
+      actionview (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.3)
+      railties (= 6.0.3.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -830,24 +897,25 @@ GEM
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    railties (6.0.3)
-      actionpack (= 6.0.3)
-      activesupport (= 6.0.3)
+    railties (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     raindrops (0.19.1)
     rake (12.3.3)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     rblineprof (0.3.6)
       debugger-ruby_core_source (~> 1.3)
-    rbtrace (0.4.11)
+    rbtrace (0.4.14)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
+    rchardet (1.8.0)
     rdoc (6.1.2)
     re2 (1.2.0)
     recaptcha (4.13.1)
@@ -861,7 +929,7 @@ GEM
     redis-activesupport (5.2.0)
       activesupport (>= 3, < 7)
       redis-store (>= 1.3, < 2)
-    redis-namespace (1.6.0)
+    redis-namespace (1.7.0)
       redis (>= 3.0.4)
     redis-rack (2.1.2)
       rack (>= 2.0.8, < 3)
@@ -873,7 +941,7 @@ GEM
     redis-store (1.8.1)
       redis (>= 4, < 5)
     regexp_parser (1.5.1)
-    regexp_property_values (0.3.4)
+    regexp_property_values (0.3.5)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -888,9 +956,10 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.1.2)
+    rexml (3.2.4)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (3.19.0)
+    rouge (3.21.0)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -931,18 +1000,20 @@ GEM
       pg
       rails
       sqlite3
-    rubocop (0.74.0)
+    rubocop (0.82.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-gitlab-security (0.1.1)
       rubocop (>= 0.51)
-    rubocop-performance (1.4.1)
+    rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
-    rubocop-rails (2.4.0)
+    rubocop-rails (2.5.2)
+      activesupport
       rack (>= 1.1)
       rubocop (>= 0.72.0)
     rubocop-rspec (1.37.0)
@@ -956,7 +1027,7 @@ GEM
     ruby-saml (1.7.2)
       nokogiri (>= 1.5.10)
     ruby-statistics (2.1.2)
-    ruby_dep (1.5.0)
+    ruby2_keywords (0.0.2)
     ruby_parser (3.13.1)
       sexp_processor (~> 4.9)
     rubyntlm (0.6.2)
@@ -964,10 +1035,12 @@ GEM
     rubyzip (2.0.0)
     rugged (0.28.4.1)
     safe_yaml (1.0.4)
-    sanitize (4.6.6)
+    safety_net_attestation (0.4.0)
+      jwt (~> 2.0)
+    sanitize (5.2.1)
       crass (~> 1.0.2)
-      nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
     sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -988,36 +1061,39 @@ GEM
     scss_lint (0.56.0)
       rake (>= 0.9, < 13)
       sass (~> 3.5.3)
+    securecompare (1.0.0)
     seed-fu (2.3.7)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
     selenium-webdriver (3.142.6)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    sentry-raven (2.9.0)
-      faraday (>= 0.7.6, < 1.0)
+    sentry-raven (3.0.4)
+      faraday (>= 1.0)
     settingslogic (2.0.9)
     sexp_processor (4.12.0)
     shellany (0.0.1)
     shoulda-matchers (4.0.1)
       activesupport (>= 4.2.0)
-    sidekiq (5.2.7)
+    sidekiq (5.2.9)
       connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
+      rack (~> 2.0)
       rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+      redis (>= 3.3.5, < 4.2)
     sidekiq-cron (1.0.4)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
-    signet (0.11.0)
+    signet (0.14.0)
       addressable (~> 2.3)
-      faraday (~> 0.9)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simple_po_parser (1.1.2)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+    simplecov-cobertura (1.3.1)
+      simplecov (~> 0.8)
     simplecov-html (0.12.2)
     sixarm_ruby_unaccent (1.2.0)
     slack-messenger (2.3.3)
@@ -1054,7 +1130,7 @@ GEM
     temple (0.8.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    test-prof (0.10.0)
+    test-prof (0.12.0)
     text (1.3.1)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
@@ -1065,11 +1141,15 @@ GEM
     thrift (0.11.0.0)
     tilt (2.0.10)
     timecop (0.9.1)
+    timeliness (0.3.10)
     timfel-krb5-auth (0.8.3)
     toml (0.2.0)
       parslet (~> 1.8.0)
     toml-rb (1.0.0)
       citrus (~> 3.0, > 3.0)
+    tpm-key_attestation (0.9.0)
+      bindata (~> 2.4)
+      openssl-signature_algorithm (~> 0.4.0)
     truncato (0.7.11)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.7.0, <= 2.0)
@@ -1083,7 +1163,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
     unicode_plot (0.0.4)
       enumerable-statistics (>= 2.0.1)
     unicode_utils (1.4.0)
@@ -1104,6 +1184,7 @@ GEM
       equalizer (~> 0.0.9)
       parser (>= 2.6.5)
       procto (~> 0.0.2)
+    uri_template (0.7.0)
     valid_email (0.1.3)
       activemodel
       mail (>= 2.6.1)
@@ -1113,18 +1194,23 @@ GEM
     validate_url (1.0.8)
       activemodel (>= 3.0.0)
       public_suffix
-    validates_hostname (1.0.6)
+    validates_hostname (1.0.10)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
     version_sorter (2.2.4)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
     vmstat (2.3.0)
     warden (1.2.8)
       rack (>= 2.0.6)
+    webauthn (2.3.0)
+      android_key_attestation (~> 0.3.0)
+      awrence (~> 1.1)
+      bindata (~> 2.4)
+      cbor (~> 0.5.9)
+      cose (~> 1.0)
+      openssl (~> 2.0)
+      safety_net_attestation (~> 0.4.0)
+      securecompare (~> 1.0)
+      tpm-key_attestation (~> 0.9.0)
     webfinger (1.1.0)
       activesupport
       httpclient (>= 2.4)
@@ -1136,7 +1222,7 @@ GEM
       railties (>= 3.2.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     wikicloth (0.8.1)
       builder
       expression_parser
@@ -1145,6 +1231,7 @@ GEM
     xml-simple (1.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    yajl-ruby (1.4.1)
     zeitwerk (2.3.0)
 
 PLATFORMS
@@ -1153,35 +1240,36 @@ PLATFORMS
 DEPENDENCIES
   RedCloth (~> 4.3.2)
   ace-rails-ap (~> 4.1.0)
-  acme-client (~> 2.0.5)
+  acme-client (~> 2.0, >= 2.0.6)
   activerecord-explain-analyze (~> 0.1)
   acts-as-taggable-on (~> 6.0)
   addressable (~> 2.7)
   akismet (~> 3.0)
-  apollo_upload_server (~> 2.0.0.beta3)
-  asana (~> 0.9)
+  apollo_upload_server (~> 2.0.2)
+  asana (= 0.10.2)
   asciidoctor (~> 2.0.10)
   asciidoctor-include-ext (~> 0.3.1)
   asciidoctor-plantuml (~> 0.0.12)
   atlassian-jwt (~> 0.2.0)
   attr_encrypted (~> 3.1.0)
   awesome_print
-  aws-sdk
+  aws-sdk-cloudformation (~> 1)
+  aws-sdk-core (~> 3)
+  aws-sdk-s3 (~> 1)
   babosa (~> 1.0.2)
   base32 (~> 0.3.0)
   batch-loader (~> 1.4.0)
   bcrypt_pbkdf (~> 1.0)
   benchmark-ips (~> 2.3.0)
   benchmark-memory (~> 0.1)
-  better_errors (~> 2.5.0)
-  binding_of_caller (~> 0.8.0)
+  better_errors (~> 2.7.1)
   bootsnap (~> 1.4.6)
   bootstrap_form (~> 4.2.0)
   brakeman (~> 4.2)
-  browser (~> 2.5)
-  bullet (~> 6.0.2)
+  browser (~> 4.2)
+  bullet (~> 6.1.0)
   bundler-audit (~> 0.6.1)
-  capybara (~> 3.22.0)
+  capybara (~> 3.33.0)
   capybara-screenshot (~> 1.0.22)
   carrierwave (~> 1.3)
   charlock_holmes (~> 0.7.5)
@@ -1190,7 +1278,7 @@ DEPENDENCIES
   connection_pool (~> 2.0)
   countries (~> 3.0)
   creole (~> 0.5.0)
-  danger (~> 6.0)
+  danger (~> 8.0)
   database_cleaner (~> 1.7.0)
   deckar01-task_list (= 2.3.1)
   default_value_for (~> 3.3.0)
@@ -1201,10 +1289,10 @@ DEPENDENCIES
   diff_match_patch (~> 0.1.0)
   diffy (~> 3.3)
   discordrb-webhooks-blackst0ne (~> 3.3)
-  doorkeeper (~> 5.0.3)
-  doorkeeper-openid_connect (~> 1.6.3)
+  doorkeeper (~> 5.3.0)
+  doorkeeper-openid_connect (~> 1.7.4)
   ed25519 (~> 1.2)
-  elasticsearch-api (~> 6.8)
+  elasticsearch-api (~> 6.8.2)
   elasticsearch-model (~> 6.1)
   elasticsearch-rails (~> 6.1)
   email_reply_trimmer (~> 0.1)
@@ -1212,8 +1300,8 @@ DEPENDENCIES
   erubi (~> 1.9.0)
   escape_utils (~> 1.1)
   factory_bot_rails (~> 5.1.0)
-  faraday (~> 0.12)
-  faraday_middleware-aws-signers-v4
+  faraday (~> 1.0)
+  faraday_middleware-aws-sigv4 (~> 0.3.0)
   fast_blank
   ffaker (~> 2.10)
   flipper (~> 0.17.1)
@@ -1223,7 +1311,7 @@ DEPENDENCIES
   fog-aliyun (~> 0.3)
   fog-aws (~> 3.5)
   fog-core (= 2.1.0)
-  fog-google (~> 1.9)
+  fog-google (~> 1.10)
   fog-local (~> 0.6)
   fog-openstack (~> 1.0)
   fog-rackspace (~> 0.1.1)
@@ -1231,42 +1319,43 @@ DEPENDENCIES
   fugit (~> 1.2.1)
   fuubar (~> 2.2.0)
   gemojione (~> 3.3)
-  gettext (~> 3.2.2)
+  gettext (~> 3.3)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 13.0.0.pre.rc1)
+  gitaly (~> 13.3.0.pre.rc1)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
-  gitlab-labkit (= 0.12.0)
+  gitlab-fog-azure-rm (~> 1.0)
+  gitlab-labkit (= 0.12.1)
   gitlab-license (~> 1.0)
-  gitlab-mail_room (~> 0.0.4)
+  gitlab-mail_room (~> 0.0.6)
   gitlab-markup (~> 1.7.1)
   gitlab-net-dns (~> 0.9.1)
   gitlab-puma (~> 4.3.3.gitlab.2)
   gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
   gitlab-sidekiq-fetcher (= 0.5.2)
-  gitlab-styles (~> 3.2.0)
+  gitlab-styles (~> 4.3.0)
   gitlab_chronic_duration (~> 0.10.6.2)
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.2)
-  google-api-client (~> 0.23)
-  google-protobuf (~> 3.8.0)
+  google-api-client (~> 0.33)
+  google-protobuf (~> 3.12)
   gpgme (~> 2.0.19)
-  grape (~> 1.1.0)
+  grape (= 1.4.0)
   grape-entity (~> 0.7.1)
-  grape-path-helpers (~> 1.2)
+  grape-path-helpers (~> 1.3)
   grape_logging (~> 1.7)
   graphiql-rails (~> 1.4.10)
-  graphql (~> 1.10.5)
+  graphql (~> 1.11.4)
   graphql-docs (~> 1.6.0)
-  grpc (~> 1.24.0)
+  grpc (~> 1.30.2)
   gssapi
   guard-rspec
   haml_lint (~> 0.34.0)
   hamlit (~> 2.11.0)
   hangouts-chat (~> 0.0.5)
   hashie-forbidden_attributes
-  health_check (~> 2.6.0)
+  health_check (~> 3.0)
   hipchat (~> 1.5.0)
   html-pipeline (~> 2.12)
   html2text
@@ -1274,12 +1363,14 @@ DEPENDENCIES
   icalendar
   invisible_captcha (~> 0.12.1)
   jira-ruby (~> 2.0.0)
-  js_regex (~> 3.1)
+  js_regex (~> 3.4)
   json (~> 2.3.0)
   json-schema (~> 2.8.0)
+  json_schemer (~> 0.2.12)
   jwt (~> 2.1.0)
   kaminari (~> 1.0)
   knapsack (~> 1.17)
+  kramdown (~> 2.3.0)
   kubeclient (~> 4.6.0)
   letter_opener_web (~> 1.3.4)
   license_finder (~> 5.4)
@@ -1289,12 +1380,13 @@ DEPENDENCIES
   loofah (~> 2.2)
   lru_redux
   mail (= 2.7.1)
-  marginalia (~> 1.8.0)
+  marginalia (~> 1.9.0)
   memory_profiler (~> 0.9)
-  method_source (~> 0.8)
+  method_source (~> 1.0)
   mimemagic (~> 0.3.2)
   mini_magick
   minitest (~> 5.11.0)
+  multi_json (~> 1.14.1)
   nakayoshi_fork (~> 0.0.4)
   net-ldap
   net-ntp
@@ -1302,7 +1394,9 @@ DEPENDENCIES
   nokogiri (~> 1.10.9)
   oauth2 (~> 1.4)
   octokit (~> 4.15)
+  oj (~> 3.10.6)
   omniauth (~> 1.8)
+  omniauth-atlassian-oauth2 (~> 0.2.0)
   omniauth-auth0 (~> 2.0.0)
   omniauth-authentiq (~> 0.3.3)
   omniauth-azure-oauth2 (~> 0.0.9)
@@ -1317,25 +1411,24 @@ DEPENDENCIES
   omniauth-saml (~> 1.10)
   omniauth-shibboleth (~> 1.3.0)
   omniauth-twitter (~> 1.4)
-  omniauth-ultraauth (~> 0.0.2)
-  omniauth_crowd (~> 2.2.0)
-  omniauth_openid_connect (~> 0.3.3)
+  omniauth_crowd (~> 2.4.0)
+  omniauth_openid_connect (~> 0.3.5)
   org-ruby (~> 0.9.12)
   parallel (~> 1.19)
   peek (~> 1.1)
   pg (~> 1.1)
   png_quantizator (~> 0.2.1)
   premailer-rails (~> 1.10.3)
-  prometheus-client-mmap (~> 0.10.0)
-  pry-byebug (~> 3.5.1)
+  prometheus-client-mmap (~> 0.11.0)
+  pry-byebug (~> 3.9.0)
   pry-rails (~> 0.3.9)
   rack (~> 2.0.9)
   rack-attack (~> 6.3.0)
   rack-cors (~> 1.0.6)
   rack-oauth2 (~> 1.9.3)
   rack-proxy (~> 0.6.0)
-  rack-timeout
-  rails (~> 6.0.3)
+  rack-timeout (~> 0.5.1)
+  rails (~> 6.0.3.1)
   rails-controller-testing
   rails-i18n (~> 6.0)
   rainbow (~> 3.0)
@@ -1346,20 +1439,20 @@ DEPENDENCIES
   re2 (~> 1.2.0)
   recaptcha (~> 4.11)
   redis (~> 4.0)
-  redis-namespace (~> 1.6.0)
+  redis-namespace (~> 1.7.0)
   redis-rails (~> 5.0.2)
   request_store (~> 1.5)
   responders (~> 3.0)
   retriable (~> 3.1.2)
-  rouge (~> 3.19.0)
+  rouge (~> 3.21.0)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
   rspec-rails (~> 4.0.0)
   rspec-retry (~> 0.6.1)
   rspec_junit_formatter
   rspec_profiling (~> 0.0.5)
-  rubocop (~> 0.74.0)
-  rubocop-performance (~> 1.4.1)
+  rubocop (~> 0.82.0)
+  rubocop-performance (~> 1.5.2)
   rubocop-rspec (~> 1.37.0)
   ruby-fogbugz (~> 0.2.1)
   ruby-prof (~> 1.3.0)
@@ -1367,18 +1460,19 @@ DEPENDENCIES
   ruby_parser (~> 3.8)
   rubyzip (~> 2.0.0)
   rugged (~> 0.28)
-  sanitize (~> 4.6)
+  sanitize (~> 5.2.1)
   sassc-rails (~> 2.1.0)
   scss_lint (~> 0.56.0)
   seed-fu (~> 2.3.7)
   selenium-webdriver (~> 3.142)
-  sentry-raven (~> 2.9)
+  sentry-raven (~> 3.0)
   settingslogic (~> 2.0.9)
   shoulda-matchers (~> 4.0.1)
   sidekiq (~> 5.2.7)
   sidekiq-cron (~> 1.0)
   simple_po_parser (~> 1.1.2)
   simplecov (~> 0.18.5)
+  simplecov-cobertura (~> 1.3.1)
   slack-messenger (~> 2.3.3)
   snowplow-tracker (~> 0.6.1)
   spring (~> 2.0.0)
@@ -1388,7 +1482,7 @@ DEPENDENCIES
   stackprof (~> 0.2.15)
   state_machines-activerecord (~> 0.6.0)
   sys-filesystem (~> 1.1.6)
-  test-prof (~> 0.10.0)
+  test-prof (~> 0.12.0)
   thin (~> 1.7.0)
   timecop (~> 0.9.1)
   toml-rb (~> 1.0.0)
@@ -1400,12 +1494,14 @@ DEPENDENCIES
   unicorn-worker-killer (~> 0.4.4)
   unleash (~> 0.1.5)
   valid_email (~> 0.1)
-  validates_hostname (~> 1.0.6)
+  validates_hostname (~> 1.0.10)
   version_sorter (~> 2.2.4)
   vmstat (~> 2.3.0)
+  webauthn (~> 2.3)
   webmock (~> 3.5.1)
   webpack-rails (~> 0.9.10)
   wikicloth (= 0.8.1)
+  yajl-ruby (~> 1.4.1)
 
 BUNDLED WITH
    2.1.4
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index 7156347be05e..7b12e9df6abc 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -25,10 +25,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1k9pddds2kfw0br2c153csly4248w9rppkvslx46gncadp9gdb4n";
+      sha256 = "1nwkzjamvg946xh2pv82hkwxb7vqq6gakig014gflss0cwx7bbxp";
       type = "gem";
     };
-    version = "2.0.5";
+    version = "2.0.6";
   };
   actioncable = {
     dependencies = ["actionpack" "nio4r" "websocket-driver"];
@@ -36,10 +36,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lvbyv15j3g3xhywr8jdgv5rjn26mz7430886njjfrd12x812szy";
+      sha256 = "13z4l65jjihd0cgl9ahv66wvlgx09xnivbinqfdg41i7bx8ysahc";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   actionmailbox = {
     dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@@ -47,10 +47,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nwvx83lha87052jywaiqq284nabp3h5lfq7vrb01myh6cr3ggaq";
+      sha256 = "1s95rfv1i7j7dy9kvlhxbs7izvm8k371m3grchcpvim4bw73icrp";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   actionmailer = {
     dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
@@ -58,10 +58,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16d40j1hcak5p9185dbb015difw12m5f3wjfbh4mw9w8agqsc8mr";
+      sha256 = "0ivgxava9wcs70vyqvv2zmkslv3zxprw0l2s77n6m2wqay6g46wl";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   actionpack = {
     dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@@ -69,10 +69,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1v885hs35r8217py08z5k1wvgfzfml64g9wf5v3djgh8mhlf5nfn";
+      sha256 = "1665r4ffqdpykxwpgdnaq7xsaz1nfswc5wjs2qr0npx8bq7g49kh";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   actiontext = {
     dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
@@ -80,10 +80,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00w8a5vxs1rlbn0innhrwhjjavmgx0scnkz8h7k83df9l1s7f70j";
+      sha256 = "0kjjd506y50byjms9cmingx3ls5qxfgfys6bhf5rgcir9bjj2b1k";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   actionview = {
     dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -91,10 +91,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s6fr50l714rvzr9vavg1ckgx5xjj5zz7dca42xxjp4jkr7jva7q";
+      sha256 = "1n21pswh3k7m33vzhxyrbi5lj64b1138yqv34jjhkhlq3474b4rh";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   activejob = {
     dependencies = ["activesupport" "globalid"];
@@ -102,10 +102,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qr5p1sijan8k2m39w602s1mn3bwwsl7jm14drsgdhvdx5ilwg7b";
+      sha256 = "0skanrib6cdxlxipzm07gb5zl930ws9pg1q1dbg1v5br0g8j818l";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   activemodel = {
     dependencies = ["activesupport"];
@@ -113,10 +113,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pi9waxcvb8gxwp4i4wmxszyqhr28gn9jzbq1ivy84g1q658lmqz";
+      sha256 = "12kqqjzpmdx0dspvfj8my2acmmk94xz1q9iyvvvq2wkw8l11h1yv";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   activerecord = {
     dependencies = ["activemodel" "activesupport"];
@@ -124,10 +124,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wkm8741i00l5cq88wl9nr131wh955x4cjg2q2d60m3qhpqbxirv";
+      sha256 = "1rw3kpb0mpvj73chp6m011955sgmngnlavnf7gkm1305s9s5gfc8";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   activerecord-explain-analyze = {
     dependencies = ["activerecord" "pg"];
@@ -146,10 +146,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yy832p0q7gxp1vbncb677y35y112d2f6mvf131n0m2w35ig9m4f";
+      sha256 = "1x13z9hvwbz2vj55mwzx7pws3ccvgrf9k5m1474k71iksn6zlgvc";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   activesupport = {
     dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@@ -157,10 +157,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0shh34xx9ygxb57s8mag8l22klvjfnk1c4jbjvchk16r6z0ps326";
+      sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   acts-as-taggable-on = {
     dependencies = ["activerecord"];
@@ -215,16 +215,26 @@
     };
     version = "3.0.0";
   };
+  android_key_attestation = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02spc1sh7zsljl02v9d5rdb717b628vw2k7jkkplifyjk4db0zj6";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
   apollo_upload_server = {
     dependencies = ["graphql" "rails"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0riijpyicbkqsr46w4mfhh3pq2yrmakkz8mmgbrfjhzbyzac25na";
+      sha256 = "0xk54h9mmzhrbgbmk33v38pavb8w6421mx2yrgsdarkfl9fr90y3";
       type = "gem";
     };
-    version = "2.0.0.beta.3";
+    version = "2.0.2";
   };
   asana = {
     dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
@@ -232,10 +242,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19yr6ibz481jizvx0cjfvql142v8izi474c4vmwy9qzksyq2xhdj";
+      sha256 = "0c8n8i3jb2q09l6rgcw0lb4sq85jzz6vywqlrd0ivq989zh3sq2l";
       type = "gem";
     };
-    version = "0.9.3";
+    version = "0.10.2";
   };
   asciidoctor = {
     groups = ["default"];
@@ -321,48 +331,79 @@
     };
     version = "1.8.0";
   };
+  awrence = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15zwdli370jfsj6jypv7vrqf4vv4ac4784faw7ar5v88fk4q9rcv";
+      type = "gem";
+    };
+    version = "1.1.1";
+  };
   aws-eventstream = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6";
+      sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.1.0";
   };
-  aws-sdk = {
-    dependencies = ["aws-sdk-resources"];
+  aws-partitions = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yvl9bxzaxgcyzix2yw46cgll9nl0xfg5qx1j6y3xc1i78rk7vy0";
+      sha256 = "12q3swh4f44iqlq2md9lphg8csi0hd35jhgmkkkji9n0mgay4ggh";
       type = "gem";
     };
-    version = "2.11.374";
+    version = "1.345.0";
+  };
+  aws-sdk-cloudformation = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09kb3k5vpymg846gajc5d3wznww63yiv3ygdf4v42d4pf4wpbr1i";
+      type = "gem";
+    };
+    version = "1.41.0";
   };
   aws-sdk-core = {
-    dependencies = ["aws-sigv4" "jmespath"];
+    dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1d7nw1jihv7rglcmkd3hhidjflbzq5ik63n43q27pmx8ki108rd9";
+      sha256 = "1xfv8nfz8n700z29di51mcyyrnmbpq7flff4hx9mm92avnly1ysy";
       type = "gem";
     };
-    version = "2.11.374";
+    version = "3.104.3";
   };
-  aws-sdk-resources = {
-    dependencies = ["aws-sdk-core"];
+  aws-sdk-kms = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qx2a67vsw8rz1y0m04f97p1q4zx7miy06a5ck78hm77nvsigjj4";
+      sha256 = "0rpwpj4f4q9wdrbgiqngzwfdaaqyz0iif8sv16z6z0mm6y3cb06q";
       type = "gem";
     };
-    version = "2.11.374";
+    version = "1.36.0";
+  };
+  aws-sdk-s3 = {
+    dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "068xx6wp86wkmikdzg4wqxmg570hc3ydp8211j02g13djjr3k28n";
+      type = "gem";
+    };
+    version = "1.75.0";
   };
   aws-sigv4 = {
     dependencies = ["aws-eventstream"];
@@ -370,21 +411,32 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs";
+      sha256 = "0aknh3q37rq3ixxa84x2p26g8a15zmiig2rm1pmailsb9vqhfh3j";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.2.1";
   };
-  axiom-types = {
-    dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
+  azure-storage-blob = {
+    dependencies = ["azure-storage-common" "nokogiri"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
+      sha256 = "0qpvjyaq8478hw4cxcf8lr303wn8g9mhrfmvihyzn3zn9hll4zvd";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "2.0.0";
+  };
+  azure-storage-common = {
+    dependencies = ["faraday" "faraday_middleware" "nokogiri"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nhjw77r65xrkdn2h6cd76mglgx676hyr58igyfb9f7zbgvjp69s";
+      type = "gem";
+    };
+    version = "2.0.1";
   };
   babosa = {
     groups = ["default"];
@@ -463,10 +515,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pqnxxsqqs7vnqvamk5bzs84dv584g9s0qaf2vqb1v2aj5dabcg7";
+      sha256 = "0kn7rv81i2r462k56v29i3s8abcmfcpfj9axia736mwjvv0app2k";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.7.1";
   };
   bindata = {
     groups = ["default"];
@@ -488,17 +540,6 @@
     };
     version = "0.2.3";
   };
-  binding_of_caller = {
-    dependencies = ["debug_inspector"];
-    groups = ["development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g";
-      type = "gem";
-    };
-    version = "0.8.0";
-  };
   bootsnap = {
     dependencies = ["msgpack"];
     groups = ["default"];
@@ -536,10 +577,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sdx0ny34i6vqxdsc7sy9g0nafdbrw8kvvb5xh9m18x1bzpqk92f";
+      sha256 = "0q1yzvbqp0mykswipq3w00ljw9fgkhjfrij3hkwi7cx85r14n6gw";
       type = "gem";
     };
-    version = "2.5.3";
+    version = "4.2.0";
   };
   builder = {
     groups = ["default" "development" "test"];
@@ -557,10 +598,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1h16vrqblcdlizgbidk7bgmhcfb96a9y5jw117my5yhs07yp0i3s";
+      sha256 = "18ifwnvn13755qkfigapyj5bflpby3phxzbb7x5336d0kzv5k7d9";
       type = "gem";
     };
-    version = "6.0.2";
+    version = "6.1.0";
   };
   bundler-audit = {
     dependencies = ["thor"];
@@ -582,21 +623,21 @@
     }];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vv7s88w8jb1qg4qz3jrs3x3y5d9jfyyl7wfiz78b5x95ydvx41q";
+      sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194";
       type = "gem";
     };
-    version = "9.1.0";
+    version = "11.1.3";
   };
   capybara = {
     dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"];
-    groups = ["development" "test"];
+    groups = ["test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y7ncfji4s3h3wdr2hwsrd32k0va92a6lyx2x8w6a3vkbc94kpch";
+      sha256 = "0ji9kyb01dpnjbvpyb0c481cpnisd6wx6div6rywi9fihk66627w";
       type = "gem";
     };
-    version = "3.22.0";
+    version = "3.33.0";
   };
   capybara-screenshot = {
     dependencies = ["capybara" "launchy"];
@@ -620,15 +661,25 @@
     };
     version = "1.3.1";
   };
+  cbor = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0511idr8xps9625nh3kxr68sdy6l3xy2kcz7r57g47fxb1v18jj3";
+      type = "gem";
+    };
+    version = "0.5.9.6";
+  };
   character_set = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9";
+      sha256 = "0affq9n77vwy897ri2zhmfinfagf37hcwwimrccy1bcxan9mj3h3";
       type = "gem";
     };
-    version = "1.1.2";
+    version = "1.4.0";
   };
   charlock_holmes = {
     groups = ["default"];
@@ -700,21 +751,10 @@
     }];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
+      sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw";
       type = "gem";
     };
-    version = "1.1.2";
-  };
-  coercible = {
-    dependencies = ["descendants_tracker"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
-      type = "gem";
-    };
-    version = "1.0.0";
+    version = "1.1.3";
   };
   colored2 = {
     groups = ["default" "development"];
@@ -789,6 +829,17 @@
     };
     version = "0.3.0";
   };
+  cose = {
+    dependencies = ["cbor" "openssl-signature_algorithm"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1h1vcirk1vpr992xmnwf5z77fpizjwn4xzq2vrrjhvdmjynvl3jj";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
   countries = {
     dependencies = ["i18n_data" "sixarm_ruby_unaccent" "unicode_utils"];
     groups = ["default"];
@@ -858,10 +909,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0gyxfs7pkcg90llhpl2nwfqqcqi0qngqhk8gpyrffj6m0lm1m6wl";
+      sha256 = "1qishwv7mixfl4v7mdmwai3rhf94hpzj6hmj20vb4mvk7gk0y2la";
       type = "gem";
     };
-    version = "6.0.9";
+    version = "8.0.5";
   };
   database_cleaner = {
     groups = ["development" "test"];
@@ -873,16 +924,6 @@
     };
     version = "1.7.0";
   };
-  debug_inspector = {
-    groups = ["default" "development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0";
-      type = "gem";
-    };
-    version = "0.0.3";
-  };
   debugger-ruby_core_source = {
     groups = ["default" "development"];
     platforms = [{
@@ -950,17 +991,6 @@
     };
     version = "1.7.0";
   };
-  descendants_tracker = {
-    dependencies = ["thread_safe"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
-      type = "gem";
-    };
-    version = "0.0.4";
-  };
   device_detector = {
     groups = ["default"];
     platforms = [];
@@ -1061,10 +1091,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w554smil33j64h50w29xavgg4k7172r0c2rrygfbp5p4ap9py9c";
+      sha256 = "01scvhvrw44ksv1aaywpp9kfm4c8qs4gwnnha40r5mq0vpc0qrny";
       type = "gem";
     };
-    version = "5.0.3";
+    version = "5.3.3";
   };
   doorkeeper-openid_connect = {
     dependencies = ["doorkeeper" "json-jwt"];
@@ -1072,10 +1102,96 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qcl11dw9b0si45id7sqwv19g8am4i221sqkigimnvhc1cci2yfw";
+      sha256 = "1yylcg4j7msxma0s8rx8990bfgr0c414a7vafs3gpgmbwy47wq45";
       type = "gem";
     };
-    version = "1.6.3";
+    version = "1.7.4";
+  };
+  dry-configurable = {
+    dependencies = ["concurrent-ruby" "dry-core" "dry-equalizer"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "033x4gvynfm33pchmpd5iw9n4c9q46j8vbwbcdmvb8b2r0gpzfdn";
+      type = "gem";
+    };
+    version = "0.11.5";
+  };
+  dry-container = {
+    dependencies = ["concurrent-ruby" "dry-configurable"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1npnhs3x2xcwwijpys5c8rpcvymrlab0y8806nr4h425ld5q4wd0";
+      type = "gem";
+    };
+    version = "0.7.2";
+  };
+  dry-core = {
+    dependencies = ["concurrent-ruby"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k9ff2sr4ymiwzg4mchzv66mn6rdsgjlinm6s4x5x91yhd0h4vpk";
+      type = "gem";
+    };
+    version = "0.4.9";
+  };
+  dry-equalizer = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rsqpk0gjja6j6pjm0whx2px06cxr3h197vrwxp6k042p52r4v46";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  dry-inflector = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17mkdwglqsd9fg272y3zms7rixjgkb1km1xcb88ir5lxvk1jkky7";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  dry-logic = {
+    dependencies = ["concurrent-ruby" "dry-core" "dry-equalizer"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cqvylwv71sm9zrb0lpxmghn20zxnjswxwyhaj8y2wfniffyjgkc";
+      type = "gem";
+    };
+    version = "1.0.6";
+  };
+  dry-types = {
+    dependencies = ["concurrent-ruby" "dry-container" "dry-core" "dry-equalizer" "dry-inflector" "dry-logic"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1px1r5khlf4lw32gsrnnnsx7dvl2d94axx3h0b6zwxrhvfq3n038";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+  ecma-re-validator = {
+    dependencies = ["regexp_parser"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hjnd6phkhwmd846hqkzbiiyf7n6v9s85agizkxrkha1z0g3q5fc";
+      type = "gem";
+    };
+    version = "0.2.1";
   };
   ed25519 = {
     groups = ["ed25519"];
@@ -1093,10 +1209,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jp7amblk18dag3w0yrzdzkhkbfap2d6xpbyv9314parxw98mgq0";
+      sha256 = "152z76sp2ymyaqrbm8c6y0p1ydkckwrr6iif66mdsc5s0433va3f";
       type = "gem";
     };
-    version = "6.8.0";
+    version = "6.8.2";
   };
   elasticsearch-api = {
     dependencies = ["multi_json"];
@@ -1104,10 +1220,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kq6ljssd5nd2fjaznbnyf4bhkk5q17ava5rq3bjfvjh1wyzagca";
+      sha256 = "12rjfamnqspvkjs90bvpa5zs7g0nlr9pvlvj228mj71k5pym1x8p";
       type = "gem";
     };
-    version = "6.8.0";
+    version = "6.8.2";
   };
   elasticsearch-model = {
     dependencies = ["activesupport" "elasticsearch" "hashie"];
@@ -1115,20 +1231,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ifm8vh8nr9r1wnpnfa6kjm7v54jwsgvpg060r08haydqcv5lbsy";
+      sha256 = "1q66mp28696qnr6xgsl1dym2l5wk4j2ifd673r09yi70hn9y5ji8";
       type = "gem";
     };
-    version = "6.1.0";
+    version = "6.1.1";
   };
   elasticsearch-rails = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zxqj7pgb0b32qda84jlg6kay4b9qbpjlfk2b0m23hxnkbbmf1bd";
+      sha256 = "06k97w4xdkdj982b2mgz4bv0gvkpbscn4wxsrqj6kr1x7dxia394";
       type = "gem";
     };
-    version = "6.1.0";
+    version = "6.1.1";
   };
   elasticsearch-transport = {
     dependencies = ["faraday" "multi_json"];
@@ -1136,10 +1252,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0c1scz8l4z84x7g3iwf9kmvrpgjjq0gaxaswviiy9zg3csn720mc";
+      sha256 = "02z7b26vl0wmvkzy10qp530vx5c7pdv2ynfsd7mc5qmz6m0z5pxp";
       type = "gem";
     };
-    version = "6.8.0";
+    version = "6.8.2";
   };
   email_reply_trimmer = {
     groups = ["default"];
@@ -1302,10 +1418,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
+      sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq";
       type = "gem";
     };
-    version = "0.15.4";
+    version = "1.0.1";
+  };
+  faraday-cookie_jar = {
+    dependencies = ["faraday" "http-cookie"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk";
+      type = "gem";
+    };
+    version = "0.0.7";
   };
   faraday-http-cache = {
     dependencies = ["faraday"];
@@ -1313,10 +1440,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08j86fgcwl7z792qyijdsq680arzpfiydqd24ja405z2rbm7r2i0";
+      sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.2.0";
   };
   faraday_middleware = {
     dependencies = ["faraday"];
@@ -1324,21 +1451,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d";
+      sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r";
       type = "gem";
     };
-    version = "0.12.2";
+    version = "1.0.0";
   };
-  faraday_middleware-aws-signers-v4 = {
-    dependencies = ["aws-sdk-resources" "faraday"];
+  faraday_middleware-aws-sigv4 = {
+    dependencies = ["aws-sigv4" "faraday"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp";
+      sha256 = "1gk2qakcvvbgfvvfd8cgf13sligv5mp816ykmra9llqmbfym8ikl";
       type = "gem";
     };
-    version = "0.1.7";
+    version = "0.3.0";
   };
   faraday_middleware-multi_json = {
     dependencies = ["faraday_middleware" "multi_json"];
@@ -1386,10 +1513,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
+      sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
       type = "gem";
     };
-    version = "1.12.2";
+    version = "1.13.1";
   };
   ffi-compiler = {
     dependencies = ["ffi" "rake"];
@@ -1484,10 +1611,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1784xynmgvj1x9phy42nbd3fcgj040zps6wn7msi6vnj1sg4wpfy";
+      sha256 = "10gwq4lz09386wdl4y9sqkdwy16phs439bfii7vz47s64fvg9gn5";
       type = "gem";
     };
-    version = "1.9.1";
+    version = "1.10.0";
   };
   fog-json = {
     dependencies = ["fog-core" "multi_json"];
@@ -1625,10 +1752,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr";
+      sha256 = "04xlj00sm4mbgvyq0qkbxim75i7cpyn6iylpfwnyagl35wdvsszf";
       type = "gem";
     };
-    version = "3.2.9";
+    version = "3.3.6";
   };
   gettext_i18n_rails = {
     dependencies = ["fast_gettext"];
@@ -1653,14 +1780,15 @@
     version = "1.3.0";
   };
   git = {
+    dependencies = ["rchardet"];
     groups = ["default" "development"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bf83icwypi3p3pd97vlqbnp3hvf31ncd440m9kh9y7x6yk74wyh";
+      sha256 = "0y8n1m2kys3q79b9kp8bs4803isshpf0f401a2hfy4iyh5jwzx11";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.7.0";
   };
   gitaly = {
     dependencies = ["grpc"];
@@ -1668,10 +1796,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01ki2isvqyhfw503z3ahksbfb0s0m3psi4din9azdpgcqyv1pxlh";
+      sha256 = "06l4c4a7ngq250m1y5i2asl6a63h0jix9rmz47xzj32qg6nlylak";
       type = "gem";
     };
-    version = "13.0.0.pre.rc1";
+    version = "13.3.0.pre.rc2";
   };
   github-markup = {
     groups = ["default"];
@@ -1694,16 +1822,27 @@
     };
     version = "0.10.5";
   };
+  gitlab-fog-azure-rm = {
+    dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04l7ps0vvrqq8i25q7ic2zy2n8f8f1l7sn1shf5wccy1cbyj9pig";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
   gitlab-labkit = {
     dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0a63zgjll83b25hiq8m4sk75jci2rj8z46lss0j3bc6zi3pxnzax";
+      sha256 = "1zpprxxis0aziy0vmig0jpc6bxj05xfv25i1aisliiyd7dsjdqrh";
       type = "gem";
     };
-    version = "0.12.0";
+    version = "0.12.1";
   };
   gitlab-license = {
     groups = ["default"];
@@ -1720,10 +1859,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10ajr3l8vasy4zkc0p481m806g7k7idnw7mi6rlkmx4gkgb0z46j";
+      sha256 = "0kjxw7fq0slihawxz6nwvikdzp8xc0nydbsvjlz80m936cykmk9h";
       type = "gem";
     };
-    version = "0.0.4";
+    version = "0.0.6";
   };
   gitlab-markup = {
     groups = ["default"];
@@ -1751,10 +1890,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0i1gv7mgjpa46v6jr97rjk0zv3jny3gc3q3bq8wd6rv59lv5s4wi";
+      sha256 = "05hazn3cq079zynj0viagly6bgh4x7pb2vqki9rgf2k39ljwrmld";
       type = "gem";
     };
-    version = "4.3.3.gitlab.2";
+    version = "4.3.5.gitlab.3";
   };
   gitlab-puma_worker_killer = {
     dependencies = ["get_process_mem" "gitlab-puma"];
@@ -1784,10 +1923,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1il4jqvz7b2l6pcxw6pfjvljpngn92mghfm47g0mfickih1i2r55";
+      sha256 = "1vw4kbmxiccq7r1ijgccq35cqf34bvy2l5p9chxr2g8hlx5rd4kw";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "4.3.0";
   };
   gitlab_chronic_duration = {
     dependencies = ["numerizer"];
@@ -1834,25 +1973,25 @@
     version = "6.2.0";
   };
   google-api-client = {
-    dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
+    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05h2lca9b334ayabgs3h0mzc2wg3csvkqv1lv3iirpgf90ypbk1k";
+      sha256 = "13y6xara8w211y88pxa8bcbg6y40vkidqk854zl7z4csmgfnplxq";
       type = "gem";
     };
-    version = "0.23.4";
+    version = "0.33.2";
   };
   google-protobuf = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4";
+      sha256 = "1m3la0yid3bqx9b30raisqbp27d0q7vdrlslazrdasf8v1vhifxj";
       type = "gem";
     };
-    version = "3.8.0";
+    version = "3.12.4";
   };
   googleapis-common-protos-types = {
     dependencies = ["google-protobuf"];
@@ -1860,10 +1999,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1";
+      sha256 = "1aava1b75n056s24gn7ajrkmm6s3xa3swl62dl5q9apw4marghji";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "1.0.5";
   };
   googleauth = {
     dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -1871,10 +2010,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l";
+      sha256 = "0rsk471ld98pxhvzig3lnw9i13454c9nschvzxvq6vjqnn9ip0yh";
       type = "gem";
     };
-    version = "0.6.6";
+    version = "0.12.0";
   };
   gpgme = {
     dependencies = ["mini_portile2"];
@@ -1888,15 +2027,15 @@
     version = "2.0.20";
   };
   grape = {
-    dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
+    dependencies = ["activesupport" "builder" "dry-types" "mustermann-grape" "rack" "rack-accept"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c";
+      sha256 = "03ylzpn9mng9kwk472xbsfnqcbnm0qcjjlscp17hijvpvafd8a09";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.4.0";
   };
   grape-entity = {
     dependencies = ["activesupport" "multi_json"];
@@ -1915,10 +2054,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "170aw6yvr8l5srlfjz1yqpxr7klr8jypr4i0gj41gn6v4iamyl79";
+      sha256 = "1zgifvvdh1dyhxl4ywspkvpy6srhlqliihfprp09k35kikxlmjqc";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.3.0";
   };
   grape_logging = {
     dependencies = ["grape" "rack"];
@@ -1947,10 +2086,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zj729kxig2klhm4naqsgrfi4xgba4vh2pazvvi7iaikaa3vfh48";
+      sha256 = "01ldxhn59lfg5ivxc9m11v1qhw29ql95qcvwwcap49n0z7d1i3k5";
       type = "gem";
     };
-    version = "1.10.5";
+    version = "1.11.4";
   };
   graphql-docs = {
     dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"];
@@ -1969,10 +2108,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf";
+      sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5";
       type = "gem";
     };
-    version = "1.24.0";
+    version = "1.30.2";
   };
   gssapi = {
     dependencies = ["ffi"];
@@ -1991,10 +2130,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "000hn5cdqz3wl99b245q958c5byi2dlsqi814q5gmyljv7i47zwf";
+      sha256 = "1fwgvkmrg97xfswwgfrfcl1nc937yxwazfvpmf8vxj7cvnx7mfki";
       type = "gem";
     };
-    version = "2.15.1";
+    version = "2.16.2";
   };
   guard-compat = {
     groups = ["default" "test"];
@@ -2050,6 +2189,16 @@
     };
     version = "2.11.0";
   };
+  hana = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ij5clmkfl5ij9wdzr62b0w7j2qg7pb65mhvxa6mf1kv1xp6l585";
+      type = "gem";
+    };
+    version = "1.3.6";
+  };
   hangouts-chat = {
     groups = ["default"];
     platforms = [];
@@ -2092,15 +2241,15 @@
     version = "0.1.1";
   };
   health_check = {
-    dependencies = ["rails"];
+    dependencies = ["railties"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mfa180nyzz1j0abfihm5nm3lmzq99362ibcphky6rh5vwhckvm8";
+      sha256 = "07wrbfsfsprfmykc0qbkkgxpf8vlx4a8sp77acqrjsh395f6qcqv";
       type = "gem";
     };
-    version = "2.6.0";
+    version = "3.0.0";
   };
   heapy = {
     groups = ["default"];
@@ -2225,10 +2374,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm";
+      sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "1.8.3";
   };
   i18n_data = {
     groups = ["default"];
@@ -2329,10 +2478,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq";
+      sha256 = "1zia0pxa2lrybwv51xzhj26rf3gx8zwg1cghbdk640rbsyr8sf9a";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.4.0";
   };
   json = {
     groups = ["default"];
@@ -2366,6 +2515,17 @@
     };
     version = "2.8.0";
   };
+  json_schemer = {
+    dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "194898b70ylkjqg7vhy4lps4a5g31n7xxb3vfacwfs40azkn83zm";
+      type = "gem";
+    };
+    version = "0.2.12";
+  };
   jwt = {
     groups = ["default"];
     platforms = [];
@@ -2441,14 +2601,15 @@
     version = "1.17.0";
   };
   kramdown = {
+    dependencies = ["rexml"];
     groups = ["default" "development"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688";
+      sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.3.0";
   };
   kramdown-parser-gfm = {
     dependencies = ["kramdown"];
@@ -2528,25 +2689,25 @@
     version = "8.9.2";
   };
   listen = {
-    dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
+    dependencies = ["rb-fsevent" "rb-inotify"];
     groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx";
+      sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi";
       type = "gem";
     };
-    version = "3.1.5";
+    version = "3.2.1";
   };
   locale = {
     groups = ["default" "development"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
+      sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn";
       type = "gem";
     };
-    version = "2.1.2";
+    version = "2.1.3";
   };
   lockbox = {
     groups = ["default"];
@@ -2564,10 +2725,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00lcn7s3slfn32di4qwlx2yj5f9r2pcnd0naxrvqqwypcg1z2sdd";
+      sha256 = "1vrjm4yqn5l6q5gsl72fmk95fl6j9z1a05gzbrwmsm3gp1a1bgac";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.11.2";
   };
   loofah = {
     dependencies = ["crass" "nokogiri"];
@@ -2595,10 +2756,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06im7gcg42x77yhz2w5da2ly9xz0n0c36y5ks7xs53v0l9g0vf5n";
+      sha256 = "07rvqrizmqzbjzhdsh4l4fyif26a7czb506dvch18kr3nkkamim5";
       type = "gem";
     };
-    version = "1.0.13";
+    version = "1.2.7";
   };
   mail = {
     dependencies = ["mini_mime"];
@@ -2628,10 +2789,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1akbiibmg64liw8ya6xzf9lavh2n2707hxsnf9sfslsk36iwx0yn";
+      sha256 = "0n870r50z859dkcjz6dqvbvm895rpzw047basvbbfv9gi22rlxlv";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.9.0";
   };
   memoist = {
     groups = ["default"];
@@ -2673,10 +2834,10 @@
     }];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
+      sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp";
       type = "gem";
     };
-    version = "0.9.2";
+    version = "1.0.0";
   };
   mime-types = {
     dependencies = ["mime-types-data"];
@@ -2684,20 +2845,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
+      sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
       type = "gem";
     };
-    version = "3.2.2";
+    version = "3.3.1";
   };
   mime-types-data = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
+      sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
       type = "gem";
     };
-    version = "3.2019.0331";
+    version = "3.2020.0512";
   };
   mimemagic = {
     groups = ["default" "test"];
@@ -2759,15 +2920,37 @@
     };
     version = "5.11.3";
   };
+  ms_rest = {
+    dependencies = ["concurrent-ruby" "faraday" "timeliness"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jiha1bda5knpjqjymwik6i41n69gb0phcrgvmgc5icl4mcisai7";
+      type = "gem";
+    };
+    version = "0.7.6";
+  };
+  ms_rest_azure = {
+    dependencies = ["concurrent-ruby" "faraday" "faraday-cookie_jar" "ms_rest"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06i37b84r2q206kfm5vsi9s1qiiy09091vhvc5pzb7320h0hc1ih";
+      type = "gem";
+    };
+    version = "0.12.0";
+  };
   msgpack = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1";
+      sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.3.3";
   };
   multi_json = {
     groups = ["default"];
@@ -2810,14 +2993,15 @@
     version = "0.1.6";
   };
   mustermann = {
+    dependencies = ["ruby2_keywords"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1";
+      sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.1.1";
   };
   mustermann-grape = {
     dependencies = ["mustermann"];
@@ -2825,10 +3009,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10xdggddjl8nraq7pbli31lwgrzxzz8gp558i811lsv71fqbmhzr";
+      sha256 = "0djlbi7nh161a5mwjdm1ya4hc6lyzc493ah48gn37gk6vyri5kh0";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.1";
   };
   nakayoshi_fork = {
     groups = ["default"];
@@ -2926,10 +3110,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
+      sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
       type = "gem";
     };
-    version = "1.10.9";
+    version = "1.10.10";
   };
   nokogumbo = {
     dependencies = ["nokogiri"];
@@ -2937,10 +3121,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09qc1c7acv9qm48vk2kzvnrq4ij8jrql1cv33nmv2nwmlggy0jyj";
+      sha256 = "0sxjnpjvrn10gdmfw2dimhch861lz00f28hvkkz0b1gc2rb65k9s";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "2.0.2";
   };
   notiffany = {
     dependencies = ["nenv" "shellany"];
@@ -2979,10 +3163,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0av6nlb5y2sm6m8fx669ywrqa9858yqaqfqzny75nqp3anag89qh";
+      sha256 = "1bhakjh30vi8scqwnhd1c9qkac9r8hh2lr0dbs5ynwmrc5djxknm";
       type = "gem";
     };
-    version = "1.4.1";
+    version = "1.4.4";
   };
   octokit = {
     dependencies = ["faraday" "sawyer"];
@@ -2995,6 +3179,16 @@
     };
     version = "4.15.0";
   };
+  oj = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zik71a9dj2c0cnbqxjfzgrg6r2l3f7584813z6asl50nfdbf7jw";
+      type = "gem";
+    };
+    version = "3.10.6";
+  };
   omniauth = {
     dependencies = ["hashie" "rack"];
     groups = ["default" "kerberos"];
@@ -3006,6 +3200,17 @@
     };
     version = "1.9.0";
   };
+  omniauth-atlassian-oauth2 = {
+    dependencies = ["omniauth" "omniauth-oauth2"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jbnbp0pnasyrf0mgyig72hx8bdwhv78na6ffqrs1f4a3155f1zb";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
   omniauth-auth0 = {
     dependencies = ["omniauth-oauth2"];
     groups = ["default"];
@@ -3193,27 +3398,16 @@
     };
     version = "1.4.0";
   };
-  omniauth-ultraauth = {
-    dependencies = ["omniauth_openid_connect"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1z8gz8ql4vb8y5n4lr67afnjmp23bpqi18dmda5psigvd2jddyn8";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
   omniauth_crowd = {
     dependencies = ["activesupport" "nokogiri" "omniauth"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7";
+      sha256 = "1wiq1vnwjddzw2qzkpr3nqzx6glmcz5pfylw10pc7vkzdcmkpy37";
       type = "gem";
     };
-    version = "2.2.3";
+    version = "2.4.0";
   };
   omniauth_openid_connect = {
     dependencies = ["addressable" "omniauth" "openid_connect"];
@@ -3221,10 +3415,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0awybp2jnai0w2qfgqnr3f478g3nbg5r0vcm6pa5g8k5f4rs19qr";
+      sha256 = "1wxf52yggvwmyg6f9fiykh1sk51xx34i6x6m8f06ia56npslc4aw";
       type = "gem";
     };
-    version = "0.3.3";
+    version = "0.3.5";
   };
   open4 = {
     groups = ["default" "development"];
@@ -3247,6 +3441,26 @@
     };
     version = "1.1.8";
   };
+  openssl = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03wbynzkhay7l1x76srjkg91q48mxl575vrxb3blfxlpqwsvvp0w";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
+  openssl-signature_algorithm = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14d95jr5z6dgvpwf52p7ckjf3w3cihin2k6g9599711pfxdj4fp5";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
   opentracing = {
     groups = ["default"];
     platforms = [];
@@ -3262,10 +3476,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+      sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.0.1";
   };
   org-ruby = {
     dependencies = ["rubypants"];
@@ -3314,10 +3528,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19nxgcl6fbnr6da958hyvnycv441ryp2dw4ccmldah5bm8885z39";
+      sha256 = "1xgsl3dvmidvr1y4lp63m5avjxykl2gradgav8xfp5z86rfqhpr0";
       type = "gem";
     };
-    version = "2.7.0.4";
+    version = "2.7.1.2";
   };
   parslet = {
     groups = ["default" "development" "test"];
@@ -3345,10 +3559,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1r01bqqhnk272dsyhg3cqx6j0aiwbcdnrwp7vxzc969mb5dgnnrl";
+      sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.2.3";
   };
   png_quantizator = {
     groups = ["development" "test"];
@@ -3419,10 +3633,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00d2c79xhz5k3fcclarjr1ffxbrvc6236f4rrvriad9kwqr7c1mp";
+      sha256 = "0plfcsscg0nagi8srzh4n4g0riqzivsm5rwrn18k73ajaxbqpwc6";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.11.0";
   };
   pry = {
     dependencies = ["coderay" "method_source"];
@@ -3434,10 +3648,10 @@
     }];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g";
+      sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk";
       type = "gem";
     };
-    version = "0.11.3";
+    version = "0.13.1";
   };
   pry-byebug = {
     dependencies = ["byebug" "pry"];
@@ -3449,10 +3663,10 @@
     }];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1f9kj1qp14qb8crg2rdzf22pr6ngxvy4n6ipymla8q1yjr842625";
+      sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.9.0";
   };
   pry-rails = {
     dependencies = ["pry"];
@@ -3583,14 +3797,14 @@
     version = "1.1.0";
   };
   rack-timeout = {
-    groups = ["puma"];
+    groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15xph8h6v0lvq9pxm3bc9i9pnk2k68rgdr1mp0dw4l7v1xvhs78a";
+      sha256 = "0d4dgbf8rgqx03lwsm8j6i20lzawk1bsvzfj5bhzrsycfyfk25aj";
       type = "gem";
     };
-    version = "0.5.1";
+    version = "0.5.2";
   };
   rails = {
     dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
@@ -3598,10 +3812,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rvkzj2hn1rlxc0ndn742mgbdpq0l38i6pjhhwgpaq519jpkk41r";
+      sha256 = "1cka2c0g9qd02i7xl0hnhkbf4vjrjlax1vwpillpi4x0zc30ssl4";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   rails-controller-testing = {
     dependencies = ["actionpack" "actionview" "activesupport"];
@@ -3653,10 +3867,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01h2ifvvmlzmq8dmpqkhrrmj704v79r1vkcrnvmrqhf4a9bbyqsi";
+      sha256 = "1drghlbjchn889ssiv1rzq6psp0469brf2838kfm4kzz1fhmbh2d";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.3.1";
   };
   rainbow = {
     groups = ["default" "development" "test"];
@@ -3693,10 +3907,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
+      sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87";
       type = "gem";
     };
-    version = "0.10.2";
+    version = "0.10.4";
   };
   rb-inotify = {
     dependencies = ["ffi"];
@@ -3704,10 +3918,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
+      sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
       type = "gem";
     };
-    version = "0.9.10";
+    version = "0.10.1";
   };
   rblineprof = {
     dependencies = ["debugger-ruby_core_source"];
@@ -3730,10 +3944,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
+      sha256 = "0s8prj0klfgpmpfcpdzbf149qrrsdxgnb6w6kkqc9gyars4vyaqn";
       type = "gem";
     };
-    version = "0.4.11";
+    version = "0.4.14";
+  };
+  rchardet = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9";
+      type = "gem";
+    };
+    version = "1.8.0";
   };
   rdoc = {
     groups = ["default"];
@@ -3824,10 +4048,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r7daagrjjribn098dxwbv9zivrbq2rsffbkj2ccxyn9lmjjbgah";
+      sha256 = "1wb4x8bg2d0plv3izpmi1sd7nd1ix8nxw7b43hd9bac08f4w62mx";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.7.0";
   };
   redis-rack = {
     dependencies = ["rack" "redis-store"];
@@ -3877,10 +4101,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr";
+      sha256 = "1iwapp91sbvafqp12cq834rgy1ydrmrsh5w1a0wfsk4scdxcdwlb";
       type = "gem";
     };
-    version = "0.3.4";
+    version = "0.3.5";
   };
   representable = {
     dependencies = ["declarative" "declarative-option" "uber"];
@@ -3936,6 +4160,16 @@
     };
     version = "3.1.2";
   };
+  rexml = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
+      type = "gem";
+    };
+    version = "3.2.4";
+  };
   rinku = {
     groups = ["default"];
     platforms = [];
@@ -3961,10 +4195,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35";
+      sha256 = "1agrrmj88k9jkk36ra1ml2c1jffpp595pkxmcla74ac9ia09vn3s";
       type = "gem";
     };
-    version = "3.19.0";
+    version = "3.21.0";
   };
   rqrcode = {
     dependencies = ["chunky_png"];
@@ -4098,15 +4332,15 @@
     version = "0.0.5";
   };
   rubocop = {
-    dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"];
     groups = ["development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk";
+      sha256 = "0pyjx2lbai93p6q3w57cxdhlcwhxfvm299xqicgarhdrv73mnv1d";
       type = "gem";
     };
-    version = "0.74.0";
+    version = "0.82.0";
   };
   rubocop-gitlab-security = {
     dependencies = ["rubocop"];
@@ -4125,21 +4359,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ssizdnyai2hxdp6nd4b9hqyrc4gwhjlznhrdliz8wj4p8cvas44";
+      sha256 = "1fk9nd3b24avgsqp726hy2pl1iyfjrh6jni97wkky6kqy0lq6zq2";
       type = "gem";
     };
-    version = "1.4.1";
+    version = "1.5.2";
   };
   rubocop-rails = {
-    dependencies = ["rack" "rubocop"];
+    dependencies = ["activesupport" "rack" "rubocop"];
     groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vvrwcxzbqiqdjxakxmjg4c3dcrlpb00i1d3i0s1gdk0ch79byag";
+      sha256 = "087fwq48n9k10c6npp7n5vbpx34nmaq3xkhw9n0v75m3l9rn8s34";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.5.2";
   };
   rubocop-rspec = {
     dependencies = ["rubocop"];
@@ -4215,15 +4449,15 @@
     };
     version = "2.1.2";
   };
-  ruby_dep = {
-    groups = ["default" "test"];
+  ruby2_keywords = {
+    groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5";
+      sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "0.0.2";
   };
   ruby_parser = {
     dependencies = ["sexp_processor"];
@@ -4286,16 +4520,27 @@
     };
     version = "1.0.4";
   };
+  safety_net_attestation = {
+    dependencies = ["jwt"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1khq0y5w7lf2b9a220298hphf3pakd216jc9a4x4a9pdwxs2vgln";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
   sanitize = {
     dependencies = ["crass" "nokogiri" "nokogumbo"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j4j2a2mkk1a70vbx959pvx0gvr1zb9snjwvsppwj28bp0p0b2bv";
+      sha256 = "18m3zcf207gcrmghx288w3n2kpphc22lbmbc1wdx1nzcn8g2yddh";
       type = "gem";
     };
-    version = "4.6.6";
+    version = "5.2.1";
   };
   sass = {
     dependencies = ["sass-listen"];
@@ -4363,6 +4608,16 @@
     };
     version = "0.56.0";
   };
+  securecompare = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ay65wba4i7bvfqyvf5i4r48q6g70s5m724diz9gdvdavscna36b";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
   seed-fu = {
     dependencies = ["activerecord" "activesupport"];
     groups = ["default"];
@@ -4391,10 +4646,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
+      sha256 = "17j4br2lpnd8066d50mkg9kwk9v70hn3zfiqkvysd8p9nffmqnm0";
       type = "gem";
     };
-    version = "2.9.0";
+    version = "3.0.4";
   };
   settingslogic = {
     groups = ["default"];
@@ -4443,10 +4698,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "131zv8i341bkacxx7n1id2cmblkbs379farnibqg8c7bycd1iajq";
+      sha256 = "0kw4z9mr8h1rddx6f81gf7glw9pf90w0kvgc2fx4g9hspgh9xh7y";
       type = "gem";
     };
-    version = "5.2.7";
+    version = "5.2.9";
   };
   sidekiq-cron = {
     dependencies = ["fugit" "sidekiq"];
@@ -4465,10 +4720,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4";
+      sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp";
       type = "gem";
     };
-    version = "0.11.0";
+    version = "0.14.0";
   };
   simple_po_parser = {
     groups = ["development" "test"];
@@ -4491,6 +4746,17 @@
     };
     version = "0.18.5";
   };
+  simplecov-cobertura = {
+    dependencies = ["simplecov"];
+    groups = ["development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07ikl2y382g6ibzfflsamh13qlsr2769bx09kxdcs894cl882wwv";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
   simplecov-html = {
     groups = ["default" "development" "test"];
     platforms = [];
@@ -4696,10 +4962,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ag33hv8ky8nxpsra9jkam9npi1jjwb7f7zmvi2najci5mdr10nr";
+      sha256 = "1pdb0szrj4mbczhlx2inszpj54rgnayvy2f2fff4q7jll2iz61i0";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.12.0";
   };
   text = {
     groups = ["default" "development"];
@@ -4772,6 +5038,16 @@
     };
     version = "0.9.1";
   };
+  timeliness = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gvp9b7yn4pykn794cibylc9ys1lw7fzv7djx1433icxw4y26my3";
+      type = "gem";
+    };
+    version = "0.3.10";
+  };
   timfel-krb5-auth = {
     groups = ["default" "kerberos"];
     platforms = [];
@@ -4804,6 +5080,17 @@
     };
     version = "1.0.0";
   };
+  tpm-key_attestation = {
+    dependencies = ["bindata" "openssl-signature_algorithm"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kdqyanz211wmxjzfiz2wg17gj6p4431qvjr0i6sp3d6268sssg4";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
   truncato = {
     dependencies = ["htmlentities" "nokogiri"];
     groups = ["default"];
@@ -4883,10 +5170,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
+      sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.7.0";
   };
   unicode_plot = {
     dependencies = ["enumerable-statistics"];
@@ -4963,6 +5250,16 @@
     };
     version = "0.4.7";
   };
+  uri_template = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0p8qbxlpmg3msw0ihny6a3gsn0yvydx9ksh5knn8dnq06zhqyb1i";
+      type = "gem";
+    };
+    version = "0.7.0";
+  };
   valid_email = {
     dependencies = ["activemodel" "mail"];
     groups = ["default"];
@@ -5002,10 +5299,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja";
+      sha256 = "066hkh3ihzhrp5a9knjgqqfi5dyv4z5hfrpdj4fpgxjkvkfaxivy";
       type = "gem";
     };
-    version = "1.0.6";
+    version = "1.0.10";
   };
   version_sorter = {
     groups = ["default"];
@@ -5017,17 +5314,6 @@
     };
     version = "2.2.4";
   };
-  virtus = {
-    dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk";
-      type = "gem";
-    };
-    version = "1.0.5";
-  };
   vmstat = {
     groups = ["default"];
     platforms = [];
@@ -5049,6 +5335,17 @@
     };
     version = "1.2.8";
   };
+  webauthn = {
+    dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "securecompare" "tpm-key_attestation"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17nqmi6n4s3i6pmcd7myf7w49q9xd5xlcvz9vbqijlm4yicyxywn";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
   webfinger = {
     dependencies = ["activesupport" "httpclient"];
     groups = ["default"];
@@ -5098,10 +5395,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
+      sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw";
       type = "gem";
     };
-    version = "0.1.4";
+    version = "0.1.5";
   };
   wikicloth = {
     dependencies = ["builder" "expression_parser" "rinku"];
@@ -5145,6 +5442,16 @@
     };
     version = "3.2.0";
   };
+  yajl-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
   zeitwerk = {
     groups = ["default" "development" "test"];
     platforms = [];
diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
index 797329c613e4..484ce7203d26 100644
--- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
@@ -2,315 +2,323 @@
   offline_cache = linkFarm "offline" packages;
   packages = [
     {
-      name = "_babel_code_frame___code_frame_7.8.3.tgz";
+      name = "_babel_code_frame___code_frame_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_code_frame___code_frame_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz";
-        sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e";
+        name = "_babel_code_frame___code_frame_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz";
+        sha1 = "d5481c5095daa1c57e16e54c6f9198443afb49ff";
       };
     }
     {
-      name = "_babel_compat_data___compat_data_7.8.5.tgz";
+      name = "_babel_compat_data___compat_data_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_compat_data___compat_data_7.8.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.5.tgz";
-        sha1 = "d28ce872778c23551cbb9432fc68d28495b613b9";
+        name = "_babel_compat_data___compat_data_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.1.tgz";
+        sha1 = "b1085ffe72cd17bf2c0ee790fc09f9626011b2db";
       };
     }
     {
-      name = "_babel_core___core_7.8.4.tgz";
+      name = "_babel_core___core_7.10.2.tgz";
       path = fetchurl {
-        name = "_babel_core___core_7.8.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz";
-        sha1 = "d496799e5c12195b3602d0fddd77294e3e38e80e";
+        name = "_babel_core___core_7.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz";
+        sha1 = "bd6786046668a925ac2bd2fd95b579b92a23b36a";
       };
     }
     {
-      name = "_babel_generator___generator_7.8.4.tgz";
+      name = "_babel_generator___generator_7.10.2.tgz";
       path = fetchurl {
-        name = "_babel_generator___generator_7.8.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz";
-        sha1 = "35bbc74486956fe4251829f9f6c48330e8d0985e";
+        name = "_babel_generator___generator_7.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz";
+        sha1 = "0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9";
       };
     }
     {
-      name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz";
+      name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz";
-        sha1 = "60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee";
+        name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz";
+        sha1 = "f6d08acc6f70bbd59b436262553fb2e259a1a268";
       };
     }
     {
-      name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz";
+      name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz";
-        sha1 = "c84097a427a061ac56a1c30ebf54b7b22d241503";
+        name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz";
+        sha1 = "0ec7d9be8174934532661f87783eb18d72290059";
       };
     }
     {
-      name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.tgz";
+      name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.2.tgz";
       path = fetchurl {
-        name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz";
-        sha1 = "de82619898aa605d409c42be6ffb8d7204579692";
+        name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz";
+        sha1 = "a17d9723b6e2c750299d2a14d4637c76936d8285";
       };
     }
     {
-      name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz";
+      name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.2.tgz";
       path = fetchurl {
-        name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz";
-        sha1 = "03d7ecd454b7ebe19a254f76617e61770aed2c88";
+        name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz";
+        sha1 = "7474295770f217dbcf288bf7572eb213db46ee67";
       };
     }
     {
-      name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.tgz";
+      name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz";
-        sha1 = "5b94be88c255f140fd2c10dd151e7f98f4bff397";
+        name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz";
+        sha1 = "1b8feeab1594cbcfbf3ab5a3bbcabac0468efdbd";
       };
     }
     {
-      name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.tgz";
+      name = "_babel_helper_define_map___helper_define_map_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz";
-        sha1 = "c774268c95ec07ee92476a3862b75cc2839beb79";
+        name = "_babel_helper_define_map___helper_define_map_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz";
+        sha1 = "5e69ee8308648470dd7900d159c044c10285221d";
       };
     }
     {
-      name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz";
+      name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz";
-        sha1 = "a0655cad5451c3760b726eba875f1cd8faa02c15";
+        name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz";
+        sha1 = "e9d76305ee1162ca467357ae25df94f179af2b7e";
       };
     }
     {
-      name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz";
+      name = "_babel_helper_function_name___helper_function_name_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz";
-        sha1 = "a728dc5b4e89e30fc2dfc7d04fa28a930653f982";
+        name = "_babel_helper_function_name___helper_function_name_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz";
+        sha1 = "92bd63829bfc9215aca9d9defa85f56b539454f4";
       };
     }
     {
-      name = "_babel_helper_function_name___helper_function_name_7.8.3.tgz";
+      name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_function_name___helper_function_name_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz";
-        sha1 = "eeeb665a01b1f11068e9fb86ad56a1cb1a824cca";
+        name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz";
+        sha1 = "7303390a81ba7cb59613895a192b93850e373f7d";
       };
     }
     {
-      name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz";
+      name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz";
-        sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5";
+        name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz";
+        sha1 = "7e77c82e5dcae1ebf123174c385aaadbf787d077";
       };
     }
     {
-      name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz";
+      name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz";
-        sha1 = "1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134";
+        name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz";
+        sha1 = "432967fd7e12a4afef66c4687d4ca22bc0456f15";
       };
     }
     {
-      name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz";
+      name = "_babel_helper_module_imports___helper_module_imports_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz";
-        sha1 = "659b710498ea6c1d9907e0c73f206eee7dadc24c";
+        name = "_babel_helper_module_imports___helper_module_imports_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz";
+        sha1 = "dd331bd45bccc566ce77004e9d05fe17add13876";
       };
     }
     {
-      name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz";
+      name = "_babel_helper_module_transforms___helper_module_transforms_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz";
-        sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498";
+        name = "_babel_helper_module_transforms___helper_module_transforms_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz";
+        sha1 = "24e2f08ee6832c60b157bb0936c86bef7210c622";
       };
     }
     {
-      name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.tgz";
+      name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz";
-        sha1 = "d305e35d02bee720fbc2c3c3623aa0c316c01590";
+        name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz";
+        sha1 = "b4a1f2561870ce1247ceddb02a3860fa96d72543";
       };
     }
     {
-      name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz";
+      name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz";
-        sha1 = "7ed071813d09c75298ef4f208956006b6111ecb9";
+        name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz";
+        sha1 = "ec5a5cf0eec925b66c60580328b122c01230a127";
       };
     }
     {
-      name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz";
+      name = "_babel_helper_regex___helper_regex_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz";
-        sha1 = "9ea293be19babc0f52ff8ca88b34c3611b208670";
+        name = "_babel_helper_regex___helper_regex_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.1.tgz";
+        sha1 = "021cf1a7ba99822f993222a001cc3fec83255b96";
       };
     }
     {
-      name = "_babel_helper_regex___helper_regex_7.8.3.tgz";
+      name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_regex___helper_regex_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz";
-        sha1 = "139772607d51b93f23effe72105b319d2a4c6965";
+        name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz";
+        sha1 = "bad6aaa4ff39ce8d4b82ccaae0bfe0f7dbb5f432";
       };
     }
     {
-      name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz";
+      name = "_babel_helper_replace_supers___helper_replace_supers_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz";
-        sha1 = "273c600d8b9bf5006142c1e35887d555c12edd86";
+        name = "_babel_helper_replace_supers___helper_replace_supers_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz";
+        sha1 = "ec6859d20c5d8087f6a2dc4e014db7228975f13d";
       };
     }
     {
-      name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.tgz";
+      name = "_babel_helper_simple_access___helper_simple_access_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz";
-        sha1 = "91192d25f6abbcd41da8a989d4492574fb1530bc";
+        name = "_babel_helper_simple_access___helper_simple_access_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz";
+        sha1 = "08fb7e22ace9eb8326f7e3920a1c2052f13d851e";
       };
     }
     {
-      name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz";
+      name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz";
-        sha1 = "7f8109928b4dab4654076986af575231deb639ae";
+        name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz";
+        sha1 = "c6f4be1cbc15e3a868e4c64a17d5d31d754da35f";
       };
     }
     {
-      name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz";
+      name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz";
-        sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9";
+        name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz";
+        sha1 = "5770b0c1a826c4f53f5ede5e153163e0318e94b5";
       };
     }
     {
-      name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz";
+      name = "_babel_helper_wrap_function___helper_wrap_function_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz";
-        sha1 = "9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610";
+        name = "_babel_helper_wrap_function___helper_wrap_function_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz";
+        sha1 = "956d1310d6696257a7afd47e4c42dfda5dfcedc9";
       };
     }
     {
-      name = "_babel_helpers___helpers_7.8.4.tgz";
+      name = "_babel_helpers___helpers_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_helpers___helpers_7.8.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz";
-        sha1 = "754eb3ee727c165e0a240d6c207de7c455f36f73";
+        name = "_babel_helpers___helpers_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz";
+        sha1 = "a6827b7cb975c9d9cef5fd61d919f60d8844a973";
       };
     }
     {
-      name = "_babel_highlight___highlight_7.8.3.tgz";
+      name = "_babel_highlight___highlight_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_highlight___highlight_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz";
-        sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797";
+        name = "_babel_highlight___highlight_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz";
+        sha1 = "841d098ba613ba1a427a2b383d79e35552c38ae0";
       };
     }
     {
-      name = "_babel_parser___parser_7.8.4.tgz";
+      name = "_babel_parser___parser_7.10.2.tgz";
       path = fetchurl {
-        name = "_babel_parser___parser_7.8.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz";
-        sha1 = "d1dbe64691d60358a974295fa53da074dd2ce8e8";
+        name = "_babel_parser___parser_7.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz";
+        sha1 = "871807f10442b92ff97e4783b9b54f6a0ca812d0";
       };
     }
     {
-      name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz";
+      name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz";
-        sha1 = "bad329c670b382589721b27540c7d288601c6e6f";
+        name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz";
+        sha1 = "6911af5ba2e615c4ff3c497fe2f47b35bf6d7e55";
       };
     }
     {
-      name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.tgz";
+      name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz";
-        sha1 = "5e06654af5cd04b608915aada9b2a6788004464e";
+        name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz";
+        sha1 = "046bc7f6550bb08d9bd1d4f060f5f5a4f1087e01";
       };
     }
     {
-      name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz";
+      name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz";
-        sha1 = "38c4fe555744826e97e2ae930b0fb4cc07e66054";
+        name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz";
+        sha1 = "e36979dc1dc3b73f6d6816fc4951da2363488ef0";
       };
     }
     {
-      name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz";
+      name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz";
-        sha1 = "da5216b238a98b58a1e05d6852104b10f9a70d6b";
+        name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz";
+        sha1 = "b1e691ee24c651b5a5e32213222b2379734aff09";
       };
     }
     {
-      name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.tgz";
+      name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz";
-        sha1 = "e4572253fdeed65cddeecfdab3f928afeb2fd5d2";
+        name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz";
+        sha1 = "02dca21673842ff2fe763ac253777f235e9bbf78";
       };
     }
     {
-      name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.tgz";
+      name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz";
-        sha1 = "eb5ae366118ddca67bed583b53d7554cad9951bb";
+        name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz";
+        sha1 = "a9a38bc34f78bdfd981e791c27c6fdcec478c123";
       };
     }
     {
-      name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz";
+      name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz";
-        sha1 = "9dee96ab1650eed88646ae9734ca167ac4a9c5c9";
+        name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz";
+        sha1 = "cba44908ac9f142650b4a65b8aa06bf3478d5fb6";
       };
     }
     {
-      name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.tgz";
+      name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz";
-        sha1 = "ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543";
+        name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz";
+        sha1 = "c9f86d99305f9fa531b568ff5ab8c964b8b223d2";
       };
     }
     {
-      name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.8.3.tgz";
+      name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.8.3.tgz";
-        sha1 = "01248c6c8dc292116b3b4ebd746150f4f0728bab";
+        name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz";
+        sha1 = "15f5d6d22708629451a91be28f8facc55b0e818c";
       };
     }
     {
-      name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz";
+      name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz";
-        sha1 = "b646c3adea5f98800c9ab45105ac34d06cd4a47f";
+        name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz";
+        sha1 = "ed85e8058ab0fe309c3f448e5e1b73ca89cdb598";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.1.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz";
+        sha1 = "dc04feb25e2dd70c12b05d680190e138fa2c0c6f";
       };
     }
     {
@@ -321,6 +329,14 @@
         sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d";
       };
     }
+    {
+      name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.1.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz";
+        sha1 = "d5bc0645913df5b17ad7eda0fa2308330bde34c5";
+      };
+    }
     {
       name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz";
       path = fetchurl {
@@ -330,11 +346,11 @@
       };
     }
     {
-      name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.8.3.tgz";
+      name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.8.3.tgz";
-        sha1 = "230afff79d3ccc215b5944b438e4e266daf3d84d";
+        name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.1.tgz";
+        sha1 = "3e59120ed8b3c2ccc5abb1cfc7aaa3ea01cd36b6";
       };
     }
     {
@@ -353,6 +369,14 @@
         sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9";
       };
     }
+    {
+      name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.1.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz";
+        sha1 = "25761ee7410bc8cf97327ba741ee94e4a61b7d99";
+      };
+    }
     {
       name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz";
       path = fetchurl {
@@ -378,155 +402,155 @@
       };
     }
     {
-      name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz";
+      name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz";
-        sha1 = "3acdece695e6b13aaf57fc291d1a800950c71391";
+        name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz";
+        sha1 = "8b8733f8c57397b3eaa47ddba8841586dcaef362";
       };
     }
     {
-      name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz";
+      name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz";
-        sha1 = "82776c2ed0cd9e1a49956daeb896024c9473b8b6";
+        name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz";
+        sha1 = "cb5ee3a36f0863c06ead0b409b4cc43a889b295b";
       };
     }
     {
-      name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz";
+      name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz";
-        sha1 = "4308fad0d9409d71eafb9b1a6ee35f9d64b64086";
+        name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz";
+        sha1 = "e5153eb1a3e028f79194ed8a7a4bf55f862b2062";
       };
     }
     {
-      name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz";
+      name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz";
-        sha1 = "437eec5b799b5852072084b3ae5ef66e8349e8a3";
+        name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz";
+        sha1 = "146856e756d54b20fff14b819456b3e01820b85d";
       };
     }
     {
-      name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz";
+      name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz";
-        sha1 = "97d35dab66857a437c166358b91d09050c868f3a";
+        name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz";
+        sha1 = "47092d89ca345811451cd0dc5d91605982705d5e";
       };
     }
     {
-      name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.tgz";
+      name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz";
-        sha1 = "46fd7a9d2bb9ea89ce88720477979fe0d71b21b8";
+        name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz";
+        sha1 = "6e11dd6c4dfae70f540480a4702477ed766d733f";
       };
     }
     {
-      name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz";
+      name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz";
-        sha1 = "96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b";
+        name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz";
+        sha1 = "59aa399064429d64dce5cf76ef9b90b7245ebd07";
       };
     }
     {
-      name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.tgz";
+      name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz";
-        sha1 = "20ddfbd9e4676906b1056ee60af88590cc7aaa0b";
+        name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz";
+        sha1 = "abd58e51337815ca3a22a336b85f62b998e71907";
       };
     }
     {
-      name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz";
+      name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz";
-        sha1 = "c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e";
+        name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz";
+        sha1 = "920b9fec2d78bb57ebb64a644d5c2ba67cc104ee";
       };
     }
     {
-      name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz";
+      name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz";
-        sha1 = "8d12df309aa537f272899c565ea1768e286e21f1";
+        name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz";
+        sha1 = "c900a793beb096bc9d4d0a9d0cde19518ffc83b9";
       };
     }
     {
-      name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz";
+      name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz";
-        sha1 = "581a6d7f56970e06bf51560cd64f5e947b70d7b7";
+        name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz";
+        sha1 = "279c3116756a60dd6e6f5e488ba7957db9c59eb3";
       };
     }
     {
-      name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz";
+      name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz";
-        sha1 = "6fe8eae5d6875086ee185dd0b098a8513783b47d";
+        name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz";
+        sha1 = "ff01119784eb0ee32258e8646157ba2501fcfda5";
       };
     }
     {
-      name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz";
+      name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz";
-        sha1 = "279373cb27322aaad67c2683e776dfc47196ed8b";
+        name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz";
+        sha1 = "4ed46fd6e1d8fde2a2ec7b03c66d853d2c92427d";
       };
     }
     {
-      name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz";
+      name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz";
-        sha1 = "aef239823d91994ec7b68e55193525d76dbd5dc1";
+        name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz";
+        sha1 = "5794f8da82846b22e4e6631ea1658bce708eb46a";
       };
     }
     {
-      name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz";
+      name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz";
-        sha1 = "963fed4b620ac7cbf6029c755424029fa3a40410";
+        name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz";
+        sha1 = "90347cba31bca6f394b3f7bd95d2bbfd9fce2f39";
       };
     }
     {
-      name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.tgz";
+      name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz";
-        sha1 = "65606d44616b50225e76f5578f33c568a0b876a5";
+        name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz";
+        sha1 = "65950e8e05797ebd2fe532b96e19fc5482a1d52a";
       };
     }
     {
-      name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz";
+      name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz";
-        sha1 = "df251706ec331bd058a34bdd72613915f82928a5";
+        name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz";
+        sha1 = "d5ff4b4413ed97ffded99961056e1fb980fb9301";
       };
     }
     {
-      name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz";
+      name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz";
-        sha1 = "d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420";
+        name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz";
+        sha1 = "9962e4b0ac6aaf2e20431ada3d8ec72082cbffb6";
       };
     }
     {
-      name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz";
+      name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz";
-        sha1 = "592d578ce06c52f5b98b02f913d653ffe972661a";
+        name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz";
+        sha1 = "ea080911ffc6eb21840a5197a39ede4ee67b1595";
       };
     }
     {
@@ -538,139 +562,171 @@
       };
     }
     {
-      name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz";
+      name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz";
-        sha1 = "60cc2ae66d85c95ab540eb34babb6434d4c70c43";
+        name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz";
+        sha1 = "6ee41a5e648da7632e22b6fb54012e87f612f324";
       };
     }
     {
-      name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz";
+      name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz";
-        sha1 = "ebb6a1e7a86ffa96858bd6ac0102d65944261725";
+        name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz";
+        sha1 = "2e3016b0adbf262983bf0d5121d676a5ed9c4fde";
       };
     }
     {
-      name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.tgz";
+      name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz";
-        sha1 = "1d5155de0b65db0ccf9971165745d3bb990d77d3";
+        name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz";
+        sha1 = "b25938a3c5fae0354144a720b07b32766f683ddd";
       };
     }
     {
-      name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz";
+      name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz";
-        sha1 = "33194300d8539c1ed28c62ad5087ba3807b98263";
+        name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz";
+        sha1 = "cffc7315219230ed81dc53e4625bf86815b6050d";
       };
     }
     {
-      name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz";
+      name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz";
-        sha1 = "b31031e8059c07495bf23614c97f3d9698bc6ec8";
+        name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz";
+        sha1 = "10e175cbe7bdb63cc9b39f9b3f823c5c7c5c5490";
       };
     }
     {
-      name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz";
+      name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz";
-        sha1 = "9a0635ac4e665d29b162837dd3cc50745dfdf1f5";
+        name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz";
+        sha1 = "0fc1027312b4d1c3276a57890c8ae3bcc0b64a86";
       };
     }
     {
-      name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz";
+      name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz";
-        sha1 = "28545216e023a832d4d3a1185ed492bcfeac08c8";
+        name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz";
+        sha1 = "e8b54f238a1ccbae482c4dce946180ae7b3143f3";
       };
     }
     {
-      name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz";
+      name = "_babel_plugin_transform_spread___plugin_transform_spread_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz";
-        sha1 = "9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8";
+        name = "_babel_plugin_transform_spread___plugin_transform_spread_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz";
+        sha1 = "0c6d618a0c4461a274418460a28c9ccf5239a7c8";
       };
     }
     {
-      name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz";
+      name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz";
-        sha1 = "be7a1290f81dae767475452199e1f76d6175b100";
+        name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz";
+        sha1 = "90fc89b7526228bed9842cff3588270a7a393b00";
       };
     }
     {
-      name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz";
+      name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz";
-        sha1 = "7bfa4732b455ea6a43130adc0ba767ec0e402a80";
+        name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz";
+        sha1 = "914c7b7f4752c570ea00553b4284dad8070e8628";
       };
     }
     {
-      name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz";
+      name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz";
-        sha1 = "ede4062315ce0aaf8a657a920858f1a2f35fc412";
+        name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz";
+        sha1 = "60c0239b69965d166b80a84de7315c1bc7e0bb0e";
       };
     }
     {
-      name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz";
+      name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz";
-        sha1 = "0cef36e3ba73e5c57273effb182f46b91a1ecaad";
+        name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz";
+        sha1 = "add0f8483dab60570d9e03cecef6c023aa8c9940";
       };
     }
     {
-      name = "_babel_preset_env___preset_env_7.8.4.tgz";
+      name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.1.tgz";
       path = fetchurl {
-        name = "_babel_preset_env___preset_env_7.8.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz";
-        sha1 = "9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e";
+        name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz";
+        sha1 = "6b58f2aea7b68df37ac5025d9c88752443a6b43f";
       };
     }
     {
-      name = "_babel_standalone___standalone_7.8.3.tgz";
+      name = "_babel_preset_env___preset_env_7.10.2.tgz";
       path = fetchurl {
-        name = "_babel_standalone___standalone_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.8.3.tgz";
-        sha1 = "0674730a8c5fbb9352de5342bf0c0c040d658380";
+        name = "_babel_preset_env___preset_env_7.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.2.tgz";
+        sha1 = "715930f2cf8573b0928005ee562bed52fb65fdfb";
       };
     }
     {
-      name = "_babel_template___template_7.8.3.tgz";
+      name = "_babel_preset_modules___preset_modules_0.1.3.tgz";
       path = fetchurl {
-        name = "_babel_template___template_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz";
-        sha1 = "e02ad04fe262a657809327f578056ca15fd4d1b8";
+        name = "_babel_preset_modules___preset_modules_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz";
+        sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72";
       };
     }
     {
-      name = "_babel_traverse___traverse_7.8.4.tgz";
+      name = "_babel_runtime_corejs3___runtime_corejs3_7.10.2.tgz";
       path = fetchurl {
-        name = "_babel_traverse___traverse_7.8.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz";
-        sha1 = "f0845822365f9d5b0e312ed3959d3f827f869e3c";
+        name = "_babel_runtime_corejs3___runtime_corejs3_7.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.2.tgz";
+        sha1 = "3511797ddf9a3d6f3ce46b99cc835184817eaa4e";
       };
     }
     {
-      name = "_babel_types___types_7.8.3.tgz";
+      name = "_babel_runtime___runtime_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_types___types_7.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz";
-        sha1 = "5a383dffa5416db1b73dedffd311ffd0788fb31c";
+        name = "_babel_runtime___runtime_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz";
+        sha1 = "a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99";
+      };
+    }
+    {
+      name = "_babel_standalone___standalone_7.10.2.tgz";
+      path = fetchurl {
+        name = "_babel_standalone___standalone_7.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.10.2.tgz";
+        sha1 = "49dbbadcbc4b199df064d7d8b3e21c915b84abdb";
+      };
+    }
+    {
+      name = "_babel_template___template_7.10.1.tgz";
+      path = fetchurl {
+        name = "_babel_template___template_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz";
+        sha1 = "e167154a94cb5f14b28dc58f5356d2162f539811";
+      };
+    }
+    {
+      name = "_babel_traverse___traverse_7.10.1.tgz";
+      path = fetchurl {
+        name = "_babel_traverse___traverse_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz";
+        sha1 = "bbcef3031e4152a6c0b50147f4958df54ca0dd27";
+      };
+    }
+    {
+      name = "_babel_types___types_7.10.2.tgz";
+      path = fetchurl {
+        name = "_babel_types___types_7.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz";
+        sha1 = "30283be31cad0dbf6fb00bd40641ca0ea675172d";
       };
     }
     {
@@ -698,27 +754,27 @@
       };
     }
     {
-      name = "_gitlab_eslint_plugin___eslint_plugin_3.1.0.tgz";
+      name = "_gitlab_eslint_plugin___eslint_plugin_4.0.0.tgz";
       path = fetchurl {
-        name = "_gitlab_eslint_plugin___eslint_plugin_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-3.1.0.tgz";
-        sha1 = "18e03630d10788defbb4c2d746620aec09517295";
+        name = "_gitlab_eslint_plugin___eslint_plugin_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-4.0.0.tgz";
+        sha1 = "7beba53dea74f458d92040a8b2652e4fd60a6cc7";
       };
     }
     {
-      name = "_gitlab_svgs___svgs_1.127.0.tgz";
+      name = "_gitlab_svgs___svgs_1.164.0.tgz";
       path = fetchurl {
-        name = "_gitlab_svgs___svgs_1.127.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.127.0.tgz";
-        sha1 = "1f7ffdffe44d6a82b372535f93d78f3a895d1960";
+        name = "_gitlab_svgs___svgs_1.164.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.164.0.tgz";
+        sha1 = "6cefad871c45f945ef92b99015d0f510b1d2de4a";
       };
     }
     {
-      name = "_gitlab_ui___ui_14.10.0.tgz";
+      name = "_gitlab_ui___ui_21.3.1.tgz";
       path = fetchurl {
-        name = "_gitlab_ui___ui_14.10.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-14.10.0.tgz";
-        sha1 = "39c04d62c914fcefe96c7ec32fdf31b1f98f1119";
+        name = "_gitlab_ui___ui_21.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.3.1.tgz";
+        sha1 = "027b767804540539da73d4874370895d7398adea";
       };
     }
     {
@@ -769,6 +825,14 @@
         sha1 = "2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1";
       };
     }
+    {
+      name = "_jest_fake_timers___fake_timers_25.5.0.tgz";
+      path = fetchurl {
+        name = "_jest_fake_timers___fake_timers_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.5.0.tgz";
+        sha1 = "46352e00533c024c90c2bc2ad9f2959f7f114185";
+      };
+    }
     {
       name = "_jest_reporters___reporters_24.8.0.tgz";
       path = fetchurl {
@@ -817,6 +881,22 @@
         sha1 = "f31e25948c58f0abd8c845ae26fcea1491dea7ad";
       };
     }
+    {
+      name = "_jest_types___types_25.5.0.tgz";
+      path = fetchurl {
+        name = "_jest_types___types_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz";
+        sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d";
+      };
+    }
+    {
+      name = "_miragejs_pretender_node_polyfill___pretender_node_polyfill_0.1.2.tgz";
+      path = fetchurl {
+        name = "_miragejs_pretender_node_polyfill___pretender_node_polyfill_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/@miragejs/pretender-node-polyfill/-/pretender-node-polyfill-0.1.2.tgz";
+        sha1 = "d26b6b7483fb70cd62189d05c95d2f67153e43f2";
+      };
+    }
     {
       name = "_mrmlnc_readdir_enhanced___readdir_enhanced_2.2.1.tgz";
       path = fetchurl {
@@ -842,91 +922,115 @@
       };
     }
     {
-      name = "_rails_actioncable___actioncable_6.0.3.tgz";
+      name = "_rails_actioncable___actioncable_6.0.3_1.tgz";
       path = fetchurl {
-        name = "_rails_actioncable___actioncable_6.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3.tgz";
-        sha1 = "722b4b639936129307ddbab3a390f6bcacf3e7bc";
+        name = "_rails_actioncable___actioncable_6.0.3_1.tgz";
+        url  = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3-1.tgz";
+        sha1 = "9b9eb8858a6507162911007d355d9a206e1c5caa";
       };
     }
     {
-      name = "_sentry_browser___browser_5.10.2.tgz";
+      name = "_sentry_browser___browser_5.22.3.tgz";
       path = fetchurl {
-        name = "_sentry_browser___browser_5.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.10.2.tgz";
-        sha1 = "0bbb05505c58ea998c833cffec3f922fe4b4fa58";
+        name = "_sentry_browser___browser_5.22.3.tgz";
+        url  = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.22.3.tgz";
+        sha1 = "7a64bd1cf01bf393741a3e4bf35f82aa927f5b4e";
       };
     }
     {
-      name = "_sentry_core___core_5.10.2.tgz";
+      name = "_sentry_core___core_5.22.3.tgz";
       path = fetchurl {
-        name = "_sentry_core___core_5.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/@sentry/core/-/core-5.10.2.tgz";
-        sha1 = "1cb64489e6f8363c3249415b49d3f1289814825f";
+        name = "_sentry_core___core_5.22.3.tgz";
+        url  = "https://registry.yarnpkg.com/@sentry/core/-/core-5.22.3.tgz";
+        sha1 = "030f435f2b518f282ba8bd954dac90cd70888bd7";
       };
     }
     {
-      name = "_sentry_hub___hub_5.10.2.tgz";
+      name = "_sentry_hub___hub_5.22.3.tgz";
       path = fetchurl {
-        name = "_sentry_hub___hub_5.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.10.2.tgz";
-        sha1 = "25d9f36b8f7c5cb65cf486737fa61dc9bf69b7e3";
+        name = "_sentry_hub___hub_5.22.3.tgz";
+        url  = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.22.3.tgz";
+        sha1 = "08309a70d2ea8d5e313d05840c1711f34f2fffe5";
       };
     }
     {
-      name = "_sentry_minimal___minimal_5.10.2.tgz";
+      name = "_sentry_minimal___minimal_5.22.3.tgz";
       path = fetchurl {
-        name = "_sentry_minimal___minimal_5.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.10.2.tgz";
-        sha1 = "267c2f3aa6877a0fe7a86971942e83f3ee616580";
+        name = "_sentry_minimal___minimal_5.22.3.tgz";
+        url  = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.22.3.tgz";
+        sha1 = "706e4029ae5494123d3875c658ba8911aa5cc440";
       };
     }
     {
-      name = "_sentry_types___types_5.10.0.tgz";
+      name = "_sentry_types___types_5.22.3.tgz";
       path = fetchurl {
-        name = "_sentry_types___types_5.10.0.tgz";
-        url  = "https://registry.yarnpkg.com/@sentry/types/-/types-5.10.0.tgz";
-        sha1 = "4f0ba31b6e4d5371112c38279f11f66c73b43746";
+        name = "_sentry_types___types_5.22.3.tgz";
+        url  = "https://registry.yarnpkg.com/@sentry/types/-/types-5.22.3.tgz";
+        sha1 = "d1d547b30ee8bd7771fa893af74c4f3d71f0fd18";
       };
     }
     {
-      name = "_sentry_utils___utils_5.10.2.tgz";
+      name = "_sentry_utils___utils_5.22.3.tgz";
       path = fetchurl {
-        name = "_sentry_utils___utils_5.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.10.2.tgz";
-        sha1 = "261f575079d30aaf604e59f5f4de0aa21db22252";
+        name = "_sentry_utils___utils_5.22.3.tgz";
+        url  = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.22.3.tgz";
+        sha1 = "e3bda3e789239eb16d436f768daa12829f33d18f";
       };
     }
     {
-      name = "_sourcegraph_code_host_integration___code_host_integration_0.0.46.tgz";
+      name = "_sindresorhus_is___is_0.14.0.tgz";
       path = fetchurl {
-        name = "_sourcegraph_code_host_integration___code_host_integration_0.0.46.tgz";
-        url  = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.46.tgz";
-        sha1 = "05e4cda671ed00450be12461e6a3caff473675aa";
+        name = "_sindresorhus_is___is_0.14.0.tgz";
+        url  = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz";
+        sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea";
       };
     }
     {
-      name = "_toast_ui_editor___editor_2.0.1.tgz";
+      name = "_sinonjs_commons___commons_1.8.0.tgz";
       path = fetchurl {
-        name = "_toast_ui_editor___editor_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.0.1.tgz";
-        sha1 = "749e5be1f02f42ded51488d1575ab1c19ca59952";
+        name = "_sinonjs_commons___commons_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz";
+        sha1 = "c8d68821a854c555bba172f3b06959a0039b236d";
       };
     }
     {
-      name = "_toast_ui_vue_editor___vue_editor_2.0.1.tgz";
+      name = "_sourcegraph_code_host_integration___code_host_integration_0.0.50.tgz";
       path = fetchurl {
-        name = "_toast_ui_vue_editor___vue_editor_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.0.1.tgz";
-        sha1 = "c9c8c8da4c0a67b9fbc4240464388c67d72a0c22";
+        name = "_sourcegraph_code_host_integration___code_host_integration_0.0.50.tgz";
+        url  = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.50.tgz";
+        sha1 = "3f91be4c1b117efbf3d49c73033a6b1880db1c70";
       };
     }
     {
-      name = "_types_anymatch___anymatch_1.3.0.tgz";
+      name = "_szmarczak_http_timer___http_timer_1.1.2.tgz";
       path = fetchurl {
-        name = "_types_anymatch___anymatch_1.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.0.tgz";
-        sha1 = "d1d55958d1fccc5527d4aba29fc9c4b942f563ff";
+        name = "_szmarczak_http_timer___http_timer_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz";
+        sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421";
+      };
+    }
+    {
+      name = "_testing_library_dom___dom_7.16.2.tgz";
+      path = fetchurl {
+        name = "_testing_library_dom___dom_7.16.2.tgz";
+        url  = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.16.2.tgz";
+        sha1 = "f7a20b5548817e5c7ed26077913372d977be90af";
+      };
+    }
+    {
+      name = "_toast_ui_editor___editor_2.4.0.tgz";
+      path = fetchurl {
+        name = "_toast_ui_editor___editor_2.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.4.0.tgz";
+        sha1 = "0ed082da7e0160162dbc8f69d00ad3ab2adf81bc";
+      };
+    }
+    {
+      name = "_toast_ui_vue_editor___vue_editor_2.4.0.tgz";
+      path = fetchurl {
+        name = "_toast_ui_vue_editor___vue_editor_2.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.4.0.tgz";
+        sha1 = "18b6629006f2dac5bfef4a26388499931d5fa869";
       };
     }
     {
@@ -969,6 +1073,14 @@
         sha1 = "861f1bcb3100c0a064567c5400f2981cf4ae8ca7";
       };
     }
+    {
+      name = "_types_color_name___color_name_1.1.1.tgz";
+      path = fetchurl {
+        name = "_types_color_name___color_name_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz";
+        sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0";
+      };
+    }
     {
       name = "_types_estree___estree_0.0.44.tgz";
       path = fetchurl {
@@ -1057,14 +1169,6 @@
         sha1 = "0a851d3bd96498fa25c33ab7278ed3bd65f06c3e";
       };
     }
-    {
-      name = "_types_tapable___tapable_1.0.4.tgz";
-      path = fetchurl {
-        name = "_types_tapable___tapable_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz";
-        sha1 = "b4ffc7dc97b498c969b360a41eee247f82616370";
-      };
-    }
     {
       name = "_types_tern___tern_0.23.3.tgz";
       path = fetchurl {
@@ -1073,14 +1177,6 @@
         sha1 = "4b54538f04a88c9ff79de1f6f94f575a7f339460";
       };
     }
-    {
-      name = "_types_uglify_js___uglify_js_3.0.4.tgz";
-      path = fetchurl {
-        name = "_types_uglify_js___uglify_js_3.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.4.tgz";
-        sha1 = "96beae23df6f561862a830b4288a49e86baac082";
-      };
-    }
     {
       name = "_types_unist___unist_2.0.3.tgz";
       path = fetchurl {
@@ -1106,11 +1202,11 @@
       };
     }
     {
-      name = "_types_webpack___webpack_4.4.23.tgz";
+      name = "_types_yargs_parser___yargs_parser_15.0.0.tgz";
       path = fetchurl {
-        name = "_types_webpack___webpack_4.4.23.tgz";
-        url  = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.23.tgz";
-        sha1 = "059d6f4598cfd65ddee0e2db38317ef989696712";
+        name = "_types_yargs_parser___yargs_parser_15.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz";
+        sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d";
       };
     }
     {
@@ -1121,6 +1217,14 @@
         sha1 = "45dd1d0638e8c8f153e87d296907659296873916";
       };
     }
+    {
+      name = "_types_yargs___yargs_15.0.5.tgz";
+      path = fetchurl {
+        name = "_types_yargs___yargs_15.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz";
+        sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79";
+      };
+    }
     {
       name = "_types_zen_observable___zen_observable_0.8.0.tgz";
       path = fetchurl {
@@ -1354,11 +1458,11 @@
       };
     }
     {
-      name = "abab___abab_2.0.0.tgz";
+      name = "abab___abab_2.0.3.tgz";
       path = fetchurl {
-        name = "abab___abab_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz";
-        sha1 = "aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f";
+        name = "abab___abab_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz";
+        sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a";
       };
     }
     {
@@ -1385,6 +1489,14 @@
         sha1 = "e3b6f8da3c1552a95ae627571f7dd6923bb54103";
       };
     }
+    {
+      name = "acorn_globals___acorn_globals_6.0.0.tgz";
+      path = fetchurl {
+        name = "acorn_globals___acorn_globals_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz";
+        sha1 = "46cdd39f0f8ff08a876619b55f5ac8a6dc770b45";
+      };
+    }
     {
       name = "acorn_jsx___acorn_jsx_5.1.0.tgz";
       path = fetchurl {
@@ -1401,6 +1513,14 @@
         sha1 = "123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c";
       };
     }
+    {
+      name = "acorn_walk___acorn_walk_7.1.1.tgz";
+      path = fetchurl {
+        name = "acorn_walk___acorn_walk_7.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz";
+        sha1 = "345f0dffad5c735e7373d2fec9a1023e6a44b83e";
+      };
+    }
     {
       name = "acorn___acorn_5.7.3.tgz";
       path = fetchurl {
@@ -1418,11 +1538,11 @@
       };
     }
     {
-      name = "acorn___acorn_7.1.0.tgz";
+      name = "acorn___acorn_7.2.0.tgz";
       path = fetchurl {
-        name = "acorn___acorn_7.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz";
-        sha1 = "949d36f2c292535da602283586c2477c57eb2d6c";
+        name = "acorn___acorn_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz";
+        sha1 = "17ea7e40d7c8640ff54a694c889c26f31704effe";
       };
     }
     {
@@ -1474,11 +1594,11 @@
       };
     }
     {
-      name = "ansi_align___ansi_align_2.0.0.tgz";
+      name = "ansi_align___ansi_align_3.0.0.tgz";
       path = fetchurl {
-        name = "ansi_align___ansi_align_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz";
-        sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
+        name = "ansi_align___ansi_align_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz";
+        sha1 = "b536b371cf687caaef236c18d3e21fe3797467cb";
       };
     }
     {
@@ -1537,6 +1657,14 @@
         sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997";
       };
     }
+    {
+      name = "ansi_regex___ansi_regex_5.0.0.tgz";
+      path = fetchurl {
+        name = "ansi_regex___ansi_regex_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz";
+        sha1 = "388539f55179bf39339c81af30a654d69f87cb75";
+      };
+    }
     {
       name = "ansi_styles___ansi_styles_2.2.1.tgz";
       path = fetchurl {
@@ -1553,6 +1681,14 @@
         sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d";
       };
     }
+    {
+      name = "ansi_styles___ansi_styles_4.2.1.tgz";
+      path = fetchurl {
+        name = "ansi_styles___ansi_styles_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz";
+        sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359";
+      };
+    }
     {
       name = "anymatch___anymatch_2.0.0.tgz";
       path = fetchurl {
@@ -1562,83 +1698,83 @@
       };
     }
     {
-      name = "anymatch___anymatch_3.0.3.tgz";
+      name = "anymatch___anymatch_3.1.1.tgz";
       path = fetchurl {
-        name = "anymatch___anymatch_3.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.3.tgz";
-        sha1 = "2fb624fe0e84bccab00afee3d0006ed310f22f09";
+        name = "anymatch___anymatch_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz";
+        sha1 = "c55ecf02185e2469259399310c173ce31233b142";
       };
     }
     {
-      name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.3.tgz";
+      name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.6.tgz";
       path = fetchurl {
-        name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.3.tgz";
-        url  = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz";
-        sha1 = "826861d20baca4abc45f7ca7a874105905b8525d";
+        name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.6.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.6.tgz";
+        sha1 = "56d1f2a463a6b9db32e9fa990af16d2a008206fd";
       };
     }
     {
-      name = "apollo_cache___apollo_cache_1.3.2.tgz";
+      name = "apollo_cache___apollo_cache_1.3.5.tgz";
       path = fetchurl {
-        name = "apollo_cache___apollo_cache_1.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz";
-        sha1 = "df4dce56240d6c95c613510d7e409f7214e6d26a";
+        name = "apollo_cache___apollo_cache_1.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.5.tgz";
+        sha1 = "9dbebfc8dbe8fe7f97ba568a224bca2c5d81f461";
       };
     }
     {
-      name = "apollo_client___apollo_client_2.6.4.tgz";
+      name = "apollo_client___apollo_client_2.6.10.tgz";
       path = fetchurl {
-        name = "apollo_client___apollo_client_2.6.4.tgz";
-        url  = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.4.tgz";
-        sha1 = "872c32927263a0d34655c5ef8a8949fbb20b6140";
+        name = "apollo_client___apollo_client_2.6.10.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.10.tgz";
+        sha1 = "86637047b51d940c8eaa771a4ce1b02df16bea6a";
       };
     }
     {
-      name = "apollo_link_batch_http___apollo_link_batch_http_1.2.11.tgz";
+      name = "apollo_link_batch_http___apollo_link_batch_http_1.2.14.tgz";
       path = fetchurl {
-        name = "apollo_link_batch_http___apollo_link_batch_http_1.2.11.tgz";
-        url  = "https://registry.yarnpkg.com/apollo-link-batch-http/-/apollo-link-batch-http-1.2.11.tgz";
-        sha1 = "ae42dbcc02820658e1e267d05bf2aae7ac208088";
+        name = "apollo_link_batch_http___apollo_link_batch_http_1.2.14.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-link-batch-http/-/apollo-link-batch-http-1.2.14.tgz";
+        sha1 = "4502109d3f32a94d88eabd3a89274ae3a6e2f56f";
       };
     }
     {
-      name = "apollo_link_batch___apollo_link_batch_1.1.12.tgz";
+      name = "apollo_link_batch___apollo_link_batch_1.1.15.tgz";
       path = fetchurl {
-        name = "apollo_link_batch___apollo_link_batch_1.1.12.tgz";
-        url  = "https://registry.yarnpkg.com/apollo-link-batch/-/apollo-link-batch-1.1.12.tgz";
-        sha1 = "64eb231082f182b0395ef7ab903600627f6c7fe8";
+        name = "apollo_link_batch___apollo_link_batch_1.1.15.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-link-batch/-/apollo-link-batch-1.1.15.tgz";
+        sha1 = "3a5b8c7d9cf1b7840ce630238249b95070e75e54";
       };
     }
     {
-      name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz";
+      name = "apollo_link_http_common___apollo_link_http_common_0.2.16.tgz";
       path = fetchurl {
-        name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz";
-        url  = "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.13.tgz";
-        sha1 = "c688f6baaffdc7b269b2db7ae89dae7c58b5b350";
+        name = "apollo_link_http_common___apollo_link_http_common_0.2.16.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz";
+        sha1 = "756749dafc732792c8ca0923f9a40564b7c59ecc";
       };
     }
     {
-      name = "apollo_link___apollo_link_1.2.11.tgz";
+      name = "apollo_link___apollo_link_1.2.14.tgz";
       path = fetchurl {
-        name = "apollo_link___apollo_link_1.2.11.tgz";
-        url  = "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz";
-        sha1 = "493293b747ad3237114ccd22e9f559e5e24a194d";
+        name = "apollo_link___apollo_link_1.2.14.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.14.tgz";
+        sha1 = "3feda4b47f9ebba7f4160bef8b977ba725b684d9";
       };
     }
     {
-      name = "apollo_upload_client___apollo_upload_client_10.0.0.tgz";
+      name = "apollo_upload_client___apollo_upload_client_13.0.0.tgz";
       path = fetchurl {
-        name = "apollo_upload_client___apollo_upload_client_10.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-10.0.0.tgz";
-        sha1 = "6cc3d0ea2aef40bc237b655f5042809cacee1859";
+        name = "apollo_upload_client___apollo_upload_client_13.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-13.0.0.tgz";
+        sha1 = "146d1ddd85d711fcac8ca97a72d3ca6787f2b71b";
       };
     }
     {
-      name = "apollo_utilities___apollo_utilities_1.3.2.tgz";
+      name = "apollo_utilities___apollo_utilities_1.3.4.tgz";
       path = fetchurl {
-        name = "apollo_utilities___apollo_utilities_1.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz";
-        sha1 = "8cbdcf8b012f664cd6cb5767f6130f5aed9115c9";
+        name = "apollo_utilities___apollo_utilities_1.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.4.tgz";
+        sha1 = "6129e438e8be201b6c55b0f13ce49d2c7175c9cf";
       };
     }
     {
@@ -1673,6 +1809,14 @@
         sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911";
       };
     }
+    {
+      name = "aria_query___aria_query_4.2.0.tgz";
+      path = fetchurl {
+        name = "aria_query___aria_query_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.0.tgz";
+        sha1 = "3774158e138a84c4790b58afc17e09711071d888";
+      };
+    }
     {
       name = "arr_diff___arr_diff_4.0.0.tgz";
       path = fetchurl {
@@ -1841,14 +1985,6 @@
         sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9";
       };
     }
-    {
-      name = "async_each___async_each_1.0.3.tgz";
-      path = fetchurl {
-        name = "async_each___async_each_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz";
-        sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf";
-      };
-    }
     {
       name = "async_foreach___async_foreach_0.1.3.tgz";
       path = fetchurl {
@@ -1938,11 +2074,11 @@
       };
     }
     {
-      name = "axios___axios_0.19.0.tgz";
+      name = "axios___axios_0.20.0.tgz";
       path = fetchurl {
-        name = "axios___axios_0.19.0.tgz";
-        url  = "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz";
-        sha1 = "8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8";
+        name = "axios___axios_0.20.0.tgz";
+        url  = "https://registry.yarnpkg.com/axios/-/axios-0.20.0.tgz";
+        sha1 = "057ba30f04884694993a8cd07fa394cff11c50bd";
       };
     }
     {
@@ -1970,11 +2106,11 @@
       };
     }
     {
-      name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz";
+      name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz";
       path = fetchurl {
-        name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz";
-        sha1 = "f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f";
+        name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz";
+        sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3";
       };
     }
     {
@@ -2001,14 +2137,6 @@
         sha1 = "4f6844358a1340baed182adbeffa8df9967bc196";
       };
     }
-    {
-      name = "babel_plugin_rewire___babel_plugin_rewire_1.2.0.tgz";
-      path = fetchurl {
-        name = "babel_plugin_rewire___babel_plugin_rewire_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/babel-plugin-rewire/-/babel-plugin-rewire-1.2.0.tgz";
-        sha1 = "822562d72ed2c84e47c0f95ee232c920853e9d89";
-      };
-    }
     {
       name = "babel_preset_jest___babel_preset_jest_24.6.0.tgz";
       path = fetchurl {
@@ -2121,14 +2249,6 @@
         sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328";
       };
     }
-    {
-      name = "binary_extensions___binary_extensions_1.11.0.tgz";
-      path = fetchurl {
-        name = "binary_extensions___binary_extensions_1.11.0.tgz";
-        url  = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz";
-        sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205";
-      };
-    }
     {
       name = "binary_extensions___binary_extensions_2.0.0.tgz";
       path = fetchurl {
@@ -2145,6 +2265,14 @@
         sha1 = "3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935";
       };
     }
+    {
+      name = "bindings___bindings_1.5.0.tgz";
+      path = fetchurl {
+        name = "bindings___bindings_1.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz";
+        sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df";
+      };
+    }
     {
       name = "blob___blob_0.0.4.tgz";
       path = fetchurl {
@@ -2194,27 +2322,27 @@
       };
     }
     {
-      name = "bootstrap_vue___bootstrap_vue_2.1.0.tgz";
+      name = "bootstrap_vue___bootstrap_vue_2.13.1.tgz";
       path = fetchurl {
-        name = "bootstrap_vue___bootstrap_vue_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.1.0.tgz";
-        sha1 = "41c0cd265a6cea14ffe29eeea71543ec396d1789";
+        name = "bootstrap_vue___bootstrap_vue_2.13.1.tgz";
+        url  = "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.13.1.tgz";
+        sha1 = "dcefca78f2b0345508fbb85adb0a9897cce65fa1";
       };
     }
     {
-      name = "bootstrap___bootstrap_4.3.1.tgz";
+      name = "bootstrap___bootstrap_4.4.1.tgz";
       path = fetchurl {
-        name = "bootstrap___bootstrap_4.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz";
-        sha1 = "280ca8f610504d99d7b6b4bfc4b68cec601704ac";
+        name = "bootstrap___bootstrap_4.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz";
+        sha1 = "8582960eea0c5cd2bede84d8b0baf3789c3e8b01";
       };
     }
     {
-      name = "boxen___boxen_1.3.0.tgz";
+      name = "boxen___boxen_4.2.0.tgz";
       path = fetchurl {
-        name = "boxen___boxen_1.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz";
-        sha1 = "55c6c39a8ba58d9c61ad22cd877532deb665a20b";
+        name = "boxen___boxen_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz";
+        sha1 = "e411b62357d6d6d36587c8ac3d5d974daa070e64";
       };
     }
     {
@@ -2250,11 +2378,11 @@
       };
     }
     {
-      name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz";
+      name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz";
       path = fetchurl {
-        name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz";
-        sha1 = "616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4";
+        name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz";
+        sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626";
       };
     }
     {
@@ -2314,11 +2442,11 @@
       };
     }
     {
-      name = "browserslist___browserslist_4.8.7.tgz";
+      name = "browserslist___browserslist_4.12.0.tgz";
       path = fetchurl {
-        name = "browserslist___browserslist_4.8.7.tgz";
-        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz";
-        sha1 = "ec8301ff415e6a42c949d0e66b405eb539c532d0";
+        name = "browserslist___browserslist_4.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz";
+        sha1 = "06c6d5715a1ede6c51fc39ff67fd647f740b656d";
       };
     }
     {
@@ -2433,6 +2561,14 @@
         sha1 = "9948cae353aec0a1fcb1eafda2300816ec85387e";
       };
     }
+    {
+      name = "cacheable_request___cacheable_request_6.1.0.tgz";
+      path = fetchurl {
+        name = "cacheable_request___cacheable_request_6.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz";
+        sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912";
+      };
+    }
     {
       name = "call_me_maybe___call_me_maybe_1.0.1.tgz";
       path = fetchurl {
@@ -2538,11 +2674,11 @@
       };
     }
     {
-      name = "caniuse_lite___caniuse_lite_1.0.30001030.tgz";
+      name = "caniuse_lite___caniuse_lite_1.0.30001081.tgz";
       path = fetchurl {
-        name = "caniuse_lite___caniuse_lite_1.0.30001030.tgz";
-        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz";
-        sha1 = "78076c4c6d67d3e41d6eb9399853fb27fe6e44ee";
+        name = "caniuse_lite___caniuse_lite_1.0.30001081.tgz";
+        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001081.tgz";
+        sha1 = "40615a3c416a047c5a4d45673e5257bf128eb3b5";
       };
     }
     {
@@ -2553,14 +2689,6 @@
         sha1 = "fb953bfaebeb781f62898239dabb426d08a509a4";
       };
     }
-    {
-      name = "capture_stack_trace___capture_stack_trace_1.0.0.tgz";
-      path = fetchurl {
-        name = "capture_stack_trace___capture_stack_trace_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";
-        sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
-      };
-    }
     {
       name = "caseless___caseless_0.12.0.tgz";
       path = fetchurl {
@@ -2601,6 +2729,14 @@
         sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
       };
     }
+    {
+      name = "chalk___chalk_3.0.0.tgz";
+      path = fetchurl {
+        name = "chalk___chalk_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz";
+        sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4";
+      };
+    }
     {
       name = "character_entities_html4___character_entities_html4_1.1.2.tgz";
       path = fetchurl {
@@ -2649,30 +2785,6 @@
         sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
       };
     }
-    {
-      name = "chart.js___chart.js_2.7.2.tgz";
-      path = fetchurl {
-        name = "chart.js___chart.js_2.7.2.tgz";
-        url  = "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.2.tgz";
-        sha1 = "3c9fde4dc5b95608211bdefeda7e5d33dffa5714";
-      };
-    }
-    {
-      name = "chartjs_color_string___chartjs_color_string_0.5.0.tgz";
-      path = fetchurl {
-        name = "chartjs_color_string___chartjs_color_string_0.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz";
-        sha1 = "8d3752d8581d86687c35bfe2cb80ac5213ceb8c1";
-      };
-    }
-    {
-      name = "chartjs_color___chartjs_color_2.2.0.tgz";
-      path = fetchurl {
-        name = "chartjs_color___chartjs_color_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz";
-        sha1 = "84a2fb755787ed85c39dd6dd8c7b1d88429baeae";
-      };
-    }
     {
       name = "check_types___check_types_7.3.0.tgz";
       path = fetchurl {
@@ -2682,19 +2794,11 @@
       };
     }
     {
-      name = "chokidar___chokidar_2.1.8.tgz";
+      name = "chokidar___chokidar_3.4.0.tgz";
       path = fetchurl {
-        name = "chokidar___chokidar_2.1.8.tgz";
-        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz";
-        sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917";
-      };
-    }
-    {
-      name = "chokidar___chokidar_3.0.2.tgz";
-      path = fetchurl {
-        name = "chokidar___chokidar_3.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz";
-        sha1 = "0d1cd6d04eb2df0327446188cd13736a3367d681";
+        name = "chokidar___chokidar_3.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz";
+        sha1 = "b30611423ce376357c765b9b8f904b9fba3c0be8";
       };
     }
     {
@@ -2713,14 +2817,6 @@
         sha1 = "234090ee97c7d4ad1a2c4beae27505deffc608a4";
       };
     }
-    {
-      name = "ci_info___ci_info_1.6.0.tgz";
-      path = fetchurl {
-        name = "ci_info___ci_info_1.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz";
-        sha1 = "2ca20dbb9ceb32d4524a683303313f0304b1e497";
-      };
-    }
     {
       name = "ci_info___ci_info_2.0.0.tgz";
       path = fetchurl {
@@ -2745,14 +2841,6 @@
         sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463";
       };
     }
-    {
-      name = "classlist_polyfill___classlist_polyfill_1.2.0.tgz";
-      path = fetchurl {
-        name = "classlist_polyfill___classlist_polyfill_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz";
-        sha1 = "935bc2dfd9458a876b279617514638bcaa964a2e";
-      };
-    }
     {
       name = "clean_css___clean_css_4.2.1.tgz";
       path = fetchurl {
@@ -2770,11 +2858,11 @@
       };
     }
     {
-      name = "cli_boxes___cli_boxes_1.0.0.tgz";
+      name = "cli_boxes___cli_boxes_2.2.0.tgz";
       path = fetchurl {
-        name = "cli_boxes___cli_boxes_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz";
-        sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143";
+        name = "cli_boxes___cli_boxes_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz";
+        sha1 = "538ecae8f9c6ca508e3c3c95b453fe93cb4c168d";
       };
     }
     {
@@ -2801,6 +2889,14 @@
         sha1 = "360d6d6946e99a7a1fef395e42ba92b5e9b5a16b";
       };
     }
+    {
+      name = "clipboard___clipboard_2.0.6.tgz";
+      path = fetchurl {
+        name = "clipboard___clipboard_2.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz";
+        sha1 = "52921296eec0fdf77ead1749421b21c968647376";
+      };
+    }
     {
       name = "cliui___cliui_3.2.0.tgz";
       path = fetchurl {
@@ -2841,6 +2937,14 @@
         sha1 = "7d65e00885cd8796405c35a737e7a86b7429e36f";
       };
     }
+    {
+      name = "clone_response___clone_response_1.0.2.tgz";
+      path = fetchurl {
+        name = "clone_response___clone_response_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz";
+        sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b";
+      };
+    }
     {
       name = "co___co_4.6.0.tgz";
       path = fetchurl {
@@ -2905,14 +3009,6 @@
         sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0";
       };
     }
-    {
-      name = "color_convert___color_convert_0.5.3.tgz";
-      path = fetchurl {
-        name = "color_convert___color_convert_0.5.3.tgz";
-        url  = "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz";
-        sha1 = "bdb6c69ce660fadffe0b0007cc447e1b9f7282bd";
-      };
-    }
     {
       name = "color_convert___color_convert_1.9.3.tgz";
       path = fetchurl {
@@ -2921,6 +3017,22 @@
         sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8";
       };
     }
+    {
+      name = "color_convert___color_convert_2.0.1.tgz";
+      path = fetchurl {
+        name = "color_convert___color_convert_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz";
+        sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3";
+      };
+    }
+    {
+      name = "color_convert___color_convert_0.5.3.tgz";
+      path = fetchurl {
+        name = "color_convert___color_convert_0.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz";
+        sha1 = "bdb6c69ce660fadffe0b0007cc447e1b9f7282bd";
+      };
+    }
     {
       name = "color_name___color_name_1.1.3.tgz";
       path = fetchurl {
@@ -2929,6 +3041,14 @@
         sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
       };
     }
+    {
+      name = "color_name___color_name_1.1.4.tgz";
+      path = fetchurl {
+        name = "color_name___color_name_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz";
+        sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2";
+      };
+    }
     {
       name = "colors___colors_1.3.3.tgz";
       path = fetchurl {
@@ -3058,11 +3178,11 @@
       };
     }
     {
-      name = "configstore___configstore_3.1.1.tgz";
+      name = "configstore___configstore_5.0.1.tgz";
       path = fetchurl {
-        name = "configstore___configstore_3.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz";
-        sha1 = "094ee662ab83fad9917678de114faaea8fcdca90";
+        name = "configstore___configstore_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz";
+        sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96";
       };
     }
     {
@@ -3225,6 +3345,14 @@
         sha1 = "938476569ebb6cda80d339bcf199fae4f16fff17";
       };
     }
+    {
+      name = "core_js_pure___core_js_pure_3.6.5.tgz";
+      path = fetchurl {
+        name = "core_js_pure___core_js_pure_3.6.5.tgz";
+        url  = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz";
+        sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813";
+      };
+    }
     {
       name = "core_js___core_js_3.6.4.tgz";
       path = fetchurl {
@@ -3265,14 +3393,6 @@
         sha1 = "888c723596cdf7612f6498233eebd7a35301737d";
       };
     }
-    {
-      name = "create_error_class___create_error_class_3.0.2.tgz";
-      path = fetchurl {
-        name = "create_error_class___create_error_class_3.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz";
-        sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
-      };
-    }
     {
       name = "create_hash___create_hash_1.1.3.tgz";
       path = fetchurl {
@@ -3289,6 +3409,14 @@
         sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06";
       };
     }
+    {
+      name = "cron_validator___cron_validator_1.1.1.tgz";
+      path = fetchurl {
+        name = "cron_validator___cron_validator_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/cron-validator/-/cron-validator-1.1.1.tgz";
+        sha1 = "0a27bb75508c7bc03c8b840d2d9f170eeacb5615";
+      };
+    }
     {
       name = "cropper___cropper_2.3.0.tgz";
       path = fetchurl {
@@ -3313,14 +3441,6 @@
         sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982";
       };
     }
-    {
-      name = "cross_spawn___cross_spawn_5.1.0.tgz";
-      path = fetchurl {
-        name = "cross_spawn___cross_spawn_5.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz";
-        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
-      };
-    }
     {
       name = "crypt___crypt_0.0.2.tgz";
       path = fetchurl {
@@ -3338,11 +3458,11 @@
       };
     }
     {
-      name = "crypto_random_string___crypto_random_string_1.0.0.tgz";
+      name = "crypto_random_string___crypto_random_string_2.0.0.tgz";
       path = fetchurl {
-        name = "crypto_random_string___crypto_random_string_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz";
-        sha1 = "a230f64f568310e1498009940790ec99545bca7e";
+        name = "crypto_random_string___crypto_random_string_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz";
+        sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5";
       };
     }
     {
@@ -3410,11 +3530,19 @@
       };
     }
     {
-      name = "cssom___cssom_0.3.4.tgz";
+      name = "cssom___cssom_0.3.8.tgz";
       path = fetchurl {
-        name = "cssom___cssom_0.3.4.tgz";
-        url  = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz";
-        sha1 = "8cd52e8a3acfd68d3aed38ee0a640177d2f9d797";
+        name = "cssom___cssom_0.3.8.tgz";
+        url  = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz";
+        sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a";
+      };
+    }
+    {
+      name = "cssom___cssom_0.4.4.tgz";
+      path = fetchurl {
+        name = "cssom___cssom_0.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz";
+        sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10";
       };
     }
     {
@@ -3425,6 +3553,14 @@
         sha1 = "18b038a9c44d65f7a8e428a653b9f6fe42faf5fb";
       };
     }
+    {
+      name = "cssstyle___cssstyle_2.3.0.tgz";
+      path = fetchurl {
+        name = "cssstyle___cssstyle_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz";
+        sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852";
+      };
+    }
     {
       name = "currently_unhandled___currently_unhandled_0.4.1.tgz";
       path = fetchurl {
@@ -3625,6 +3761,14 @@
         sha1 = "6642e506c6fa3a648595d2b2469788a8d12529d3";
       };
     }
+    {
+      name = "d3_sankey___d3_sankey_0.12.3.tgz";
+      path = fetchurl {
+        name = "d3_sankey___d3_sankey_0.12.3.tgz";
+        url  = "https://registry.yarnpkg.com/d3-sankey/-/d3-sankey-0.12.3.tgz";
+        sha1 = "b3c268627bd72e5d80336e8de6acbfec9d15d01d";
+      };
+    }
     {
       name = "d3_scale_chromatic___d3_scale_chromatic_1.3.3.tgz";
       path = fetchurl {
@@ -3650,11 +3794,11 @@
       };
     }
     {
-      name = "d3_shape___d3_shape_1.2.0.tgz";
+      name = "d3_shape___d3_shape_1.3.7.tgz";
       path = fetchurl {
-        name = "d3_shape___d3_shape_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz";
-        sha1 = "45d01538f064bafd05ea3d6d2cb748fd8c41f777";
+        name = "d3_shape___d3_shape_1.3.7.tgz";
+        url  = "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz";
+        sha1 = "df63801be07bc986bc54f63789b4fe502992b5d7";
       };
     }
     {
@@ -3706,11 +3850,11 @@
       };
     }
     {
-      name = "d3___d3_5.15.0.tgz";
+      name = "d3___d3_5.16.0.tgz";
       path = fetchurl {
-        name = "d3___d3_5.15.0.tgz";
-        url  = "https://registry.yarnpkg.com/d3/-/d3-5.15.0.tgz";
-        sha1 = "ffd44958e6a3cb8a59a84429c45429b8bca5677a";
+        name = "d3___d3_5.16.0.tgz";
+        url  = "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz";
+        sha1 = "9c5e8d3b56403c79d4ed42fbd62f6113f199c877";
       };
     }
     {
@@ -3745,6 +3889,14 @@
         sha1 = "15ee0582baa5e22bb59c77140da8f9c76963bbfe";
       };
     }
+    {
+      name = "data_urls___data_urls_2.0.0.tgz";
+      path = fetchurl {
+        name = "data_urls___data_urls_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz";
+        sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b";
+      };
+    }
     {
       name = "date_format___date_format_2.1.0.tgz";
       path = fetchurl {
@@ -3785,14 +3937,6 @@
         sha1 = "5d128515df134ff327e90a4c93f4e077a536341f";
       };
     }
-    {
-      name = "debug___debug_3.1.0.tgz";
-      path = fetchurl {
-        name = "debug___debug_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz";
-        sha1 = "5bb5a0672628b64149566ba16819e61518c67261";
-      };
-    }
     {
       name = "debug___debug_3.2.6.tgz";
       path = fetchurl {
@@ -3809,6 +3953,14 @@
         sha1 = "3b72260255109c6b589cee050f1d516139664791";
       };
     }
+    {
+      name = "debug___debug_3.1.0.tgz";
+      path = fetchurl {
+        name = "debug___debug_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz";
+        sha1 = "5bb5a0672628b64149566ba16819e61518c67261";
+      };
+    }
     {
       name = "decamelize_keys___decamelize_keys_1.1.0.tgz";
       path = fetchurl {
@@ -3825,6 +3977,14 @@
         sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
       };
     }
+    {
+      name = "decimal.js___decimal.js_10.2.0.tgz";
+      path = fetchurl {
+        name = "decimal.js___decimal.js_10.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.0.tgz";
+        sha1 = "39466113a9e036111d02f82489b5fd6b0b5ed231";
+      };
+    }
     {
       name = "deckar01_task_list___deckar01_task_list_2.3.1.tgz";
       path = fetchurl {
@@ -3841,6 +4001,14 @@
         sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
       };
     }
+    {
+      name = "decompress_response___decompress_response_3.3.0.tgz";
+      path = fetchurl {
+        name = "decompress_response___decompress_response_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz";
+        sha1 = "80a4dd323748384bfa248083622aedec982adff3";
+      };
+    }
     {
       name = "deep_equal___deep_equal_1.0.1.tgz";
       path = fetchurl {
@@ -3889,6 +4057,14 @@
         sha1 = "f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7";
       };
     }
+    {
+      name = "defer_to_connect___defer_to_connect_1.1.3.tgz";
+      path = fetchurl {
+        name = "defer_to_connect___defer_to_connect_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz";
+        sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591";
+      };
+    }
     {
       name = "define_properties___define_properties_1.1.3.tgz";
       path = fetchurl {
@@ -3993,14 +4169,6 @@
         sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7";
       };
     }
-    {
-      name = "detect_libc___detect_libc_1.0.3.tgz";
-      path = fetchurl {
-        name = "detect_libc___detect_libc_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz";
-        sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b";
-      };
-    }
     {
       name = "detect_newline___detect_newline_2.1.0.tgz";
       path = fetchurl {
@@ -4113,6 +4281,14 @@
         sha1 = "3335d4578df6a1536a34595b91cca36dd5db61d7";
       };
     }
+    {
+      name = "dom_accessibility_api___dom_accessibility_api_0.4.5.tgz";
+      path = fetchurl {
+        name = "dom_accessibility_api___dom_accessibility_api_0.4.5.tgz";
+        url  = "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.4.5.tgz";
+        sha1 = "d9c1cefa89f509d8cf132ab5d250004d755e76e3";
+      };
+    }
     {
       name = "dom_event_types___dom_event_types_1.0.0.tgz";
       path = fetchurl {
@@ -4137,6 +4313,14 @@
         sha1 = "1afb81f533717175d478655debc5e332d9f9bb51";
       };
     }
+    {
+      name = "dom_walk___dom_walk_0.1.2.tgz";
+      path = fetchurl {
+        name = "dom_walk___dom_walk_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz";
+        sha1 = "0c548bef048f4d1f2a97249002236060daa3fd84";
+      };
+    }
     {
       name = "domain_browser___domain_browser_1.1.7.tgz";
       path = fetchurl {
@@ -4169,6 +4353,14 @@
         sha1 = "937442644ca6a31261ef36e3ec677fe805582c90";
       };
     }
+    {
+      name = "domexception___domexception_2.0.1.tgz";
+      path = fetchurl {
+        name = "domexception___domexception_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz";
+        sha1 = "fb44aefba793e1574b0af6aed2801d057529f304";
+      };
+    }
     {
       name = "domhandler___domhandler_2.4.1.tgz";
       path = fetchurl {
@@ -4178,11 +4370,11 @@
       };
     }
     {
-      name = "domhandler___domhandler_3.0.0.tgz";
+      name = "dompurify___dompurify_2.0.12.tgz";
       path = fetchurl {
-        name = "domhandler___domhandler_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/domhandler/-/domhandler-3.0.0.tgz";
-        sha1 = "51cd13efca31da95bbb0c5bee3a48300e333b3e9";
+        name = "dompurify___dompurify_2.0.12.tgz";
+        url  = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.0.12.tgz";
+        sha1 = "284a2b041e1c60b8e72d7b4d2fadad36141254ae";
       };
     }
     {
@@ -4193,14 +4385,6 @@
         sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff";
       };
     }
-    {
-      name = "domutils___domutils_2.0.0.tgz";
-      path = fetchurl {
-        name = "domutils___domutils_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz";
-        sha1 = "15b8278e37bfa8468d157478c58c367718133c08";
-      };
-    }
     {
       name = "dot_prop___dot_prop_4.2.0.tgz";
       path = fetchurl {
@@ -4209,6 +4393,14 @@
         sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
       };
     }
+    {
+      name = "dot_prop___dot_prop_5.2.0.tgz";
+      path = fetchurl {
+        name = "dot_prop___dot_prop_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz";
+        sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb";
+      };
+    }
     {
       name = "dropzone___dropzone_4.2.0.tgz";
       path = fetchurl {
@@ -4290,11 +4482,11 @@
       };
     }
     {
-      name = "electron_to_chromium___electron_to_chromium_1.3.360.tgz";
+      name = "electron_to_chromium___electron_to_chromium_1.3.466.tgz";
       path = fetchurl {
-        name = "electron_to_chromium___electron_to_chromium_1.3.360.tgz";
-        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.360.tgz";
-        sha1 = "1db9cb8d43f4c772546d94ea9be8b677a8ecb483";
+        name = "electron_to_chromium___electron_to_chromium_1.3.466.tgz";
+        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.466.tgz";
+        sha1 = "89f716db3afc4bb482ea2aaaa16c4808f89f762a";
       };
     }
     {
@@ -4418,11 +4610,19 @@
       };
     }
     {
-      name = "entities___entities_2.0.0.tgz";
+      name = "entities___entities_2.0.3.tgz";
       path = fetchurl {
-        name = "entities___entities_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz";
-        sha1 = "68d6084cab1b079767540d80e56a39b423e4abf4";
+        name = "entities___entities_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz";
+        sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f";
+      };
+    }
+    {
+      name = "entity_decode___entity_decode_2.0.2.tgz";
+      path = fetchurl {
+        name = "entity_decode___entity_decode_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/entity-decode/-/entity-decode-2.0.2.tgz";
+        sha1 = "e4f807e52c3294246e9347d1f2b02b07fd5f92e7";
       };
     }
     {
@@ -4465,6 +4665,14 @@
         sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6";
       };
     }
+    {
+      name = "escape_goat___escape_goat_2.1.1.tgz";
+      path = fetchurl {
+        name = "escape_goat___escape_goat_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz";
+        sha1 = "1b2dc77003676c457ec760b2dc68edb648188675";
+      };
+    }
     {
       name = "escape_html___escape_html_1.0.3.tgz";
       path = fetchurl {
@@ -4490,11 +4698,11 @@
       };
     }
     {
-      name = "escodegen___escodegen_1.11.0.tgz";
+      name = "escodegen___escodegen_1.14.2.tgz";
       path = fetchurl {
-        name = "escodegen___escodegen_1.11.0.tgz";
-        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz";
-        sha1 = "b27a9389481d5bfd5bec76f7bb1eb3f8f4556589";
+        name = "escodegen___escodegen_1.14.2.tgz";
+        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.2.tgz";
+        sha1 = "14ab71bf5026c2aa08173afba22c6f3173284a84";
       };
     }
     {
@@ -4673,14 +4881,6 @@
         sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d";
       };
     }
-    {
-      name = "esprima___esprima_3.1.3.tgz";
-      path = fetchurl {
-        name = "esprima___esprima_3.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
-      };
-    }
     {
       name = "esprima___esprima_4.0.1.tgz";
       path = fetchurl {
@@ -4785,14 +4985,6 @@
         sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b";
       };
     }
-    {
-      name = "execa___execa_0.7.0.tgz";
-      path = fetchurl {
-        name = "execa___execa_0.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz";
-        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
-      };
-    }
     {
       name = "execa___execa_1.0.0.tgz";
       path = fetchurl {
@@ -4898,11 +5090,11 @@
       };
     }
     {
-      name = "extract_files___extract_files_5.0.1.tgz";
+      name = "extract_files___extract_files_8.1.0.tgz";
       path = fetchurl {
-        name = "extract_files___extract_files_5.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/extract-files/-/extract-files-5.0.1.tgz";
-        sha1 = "c9492a8410be643e260a376f0151361993d5f659";
+        name = "extract_files___extract_files_8.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/extract-files/-/extract-files-8.1.0.tgz";
+        sha1 = "46a0690d0fe77411a2e3804852adeaa65cd59288";
       };
     }
     {
@@ -4921,6 +5113,14 @@
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     }
+    {
+      name = "fake_xml_http_request___fake_xml_http_request_2.1.1.tgz";
+      path = fetchurl {
+        name = "fake_xml_http_request___fake_xml_http_request_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.1.1.tgz";
+        sha1 = "279fdac235840d7a4dff77d98ec44bce9fc690a6";
+      };
+    }
     {
       name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
       path = fetchurl {
@@ -5017,6 +5217,14 @@
         sha1 = "cb56c070efc0e40666424309bd0d9e45ac6f2bb8";
       };
     }
+    {
+      name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz";
+      path = fetchurl {
+        name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
+        sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd";
+      };
+    }
     {
       name = "fileset___fileset_2.0.3.tgz";
       path = fetchurl {
@@ -5154,11 +5362,19 @@
       };
     }
     {
-      name = "follow_redirects___follow_redirects_1.5.10.tgz";
+      name = "follow_redirects___follow_redirects_1.13.0.tgz";
       path = fetchurl {
-        name = "follow_redirects___follow_redirects_1.5.10.tgz";
-        url  = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz";
-        sha1 = "7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a";
+        name = "follow_redirects___follow_redirects_1.13.0.tgz";
+        url  = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz";
+        sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db";
+      };
+    }
+    {
+      name = "font_awesome___font_awesome_4.7.0.tgz";
+      path = fetchurl {
+        name = "font_awesome___font_awesome_4.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz";
+        sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133";
       };
     }
     {
@@ -5193,14 +5409,6 @@
         sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b";
       };
     }
-    {
-      name = "formdata_polyfill___formdata_polyfill_3.0.19.tgz";
-      path = fetchurl {
-        name = "formdata_polyfill___formdata_polyfill_3.0.19.tgz";
-        url  = "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-3.0.19.tgz";
-        sha1 = "72f517db3a646a5dd8c31af0edf111fd8f1e4cee";
-      };
-    }
     {
       name = "forwarded___forwarded_0.1.2.tgz";
       path = fetchurl {
@@ -5241,14 +5449,6 @@
         sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9";
       };
     }
-    {
-      name = "fs_minipass___fs_minipass_1.2.6.tgz";
-      path = fetchurl {
-        name = "fs_minipass___fs_minipass_1.2.6.tgz";
-        url  = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz";
-        sha1 = "2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07";
-      };
-    }
     {
       name = "fs_minipass___fs_minipass_2.0.0.tgz";
       path = fetchurl {
@@ -5274,19 +5474,19 @@
       };
     }
     {
-      name = "fsevents___fsevents_1.2.9.tgz";
+      name = "fsevents___fsevents_1.2.13.tgz";
       path = fetchurl {
-        name = "fsevents___fsevents_1.2.9.tgz";
-        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz";
-        sha1 = "3f5ed66583ccd6f400b5a00db6f7e861363e388f";
+        name = "fsevents___fsevents_1.2.13.tgz";
+        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz";
+        sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38";
       };
     }
     {
-      name = "fsevents___fsevents_2.0.7.tgz";
+      name = "fsevents___fsevents_2.1.3.tgz";
       path = fetchurl {
-        name = "fsevents___fsevents_2.0.7.tgz";
-        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz";
-        sha1 = "382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a";
+        name = "fsevents___fsevents_2.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz";
+        sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e";
       };
     }
     {
@@ -5393,14 +5593,6 @@
         sha1 = "122e161591e21ff4c52530305693f20e6393a398";
       };
     }
-    {
-      name = "get_stream___get_stream_3.0.0.tgz";
-      path = fetchurl {
-        name = "get_stream___get_stream_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz";
-        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
-      };
-    }
     {
       name = "get_stream___get_stream_4.1.0.tgz";
       path = fetchurl {
@@ -5409,6 +5601,14 @@
         sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5";
       };
     }
+    {
+      name = "get_stream___get_stream_5.1.0.tgz";
+      path = fetchurl {
+        name = "get_stream___get_stream_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz";
+        sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9";
+      };
+    }
     {
       name = "get_value___get_value_2.0.6.tgz";
       path = fetchurl {
@@ -5450,11 +5650,11 @@
       };
     }
     {
-      name = "glob_parent___glob_parent_5.0.0.tgz";
+      name = "glob_parent___glob_parent_5.1.1.tgz";
       path = fetchurl {
-        name = "glob_parent___glob_parent_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz";
-        sha1 = "1dc99f0f39b006d3e92c2c284068382f0c20e954";
+        name = "glob_parent___glob_parent_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz";
+        sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229";
       };
     }
     {
@@ -5482,11 +5682,11 @@
       };
     }
     {
-      name = "global_dirs___global_dirs_0.1.1.tgz";
+      name = "global_dirs___global_dirs_2.0.1.tgz";
       path = fetchurl {
-        name = "global_dirs___global_dirs_0.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz";
-        sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445";
+        name = "global_dirs___global_dirs_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz";
+        sha1 = "acdf3bb6685bcd55cb35e8a052266569e9469201";
       };
     }
     {
@@ -5521,6 +5721,14 @@
         sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97";
       };
     }
+    {
+      name = "global___global_4.4.0.tgz";
+      path = fetchurl {
+        name = "global___global_4.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz";
+        sha1 = "3e7b105179006a323ed71aafca3e9c57a5cc6406";
+      };
+    }
     {
       name = "globals___globals_11.12.0.tgz";
       path = fetchurl {
@@ -5594,19 +5802,19 @@
       };
     }
     {
-      name = "got___got_6.7.1.tgz";
+      name = "got___got_9.6.0.tgz";
       path = fetchurl {
-        name = "got___got_6.7.1.tgz";
-        url  = "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz";
-        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
+        name = "got___got_9.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz";
+        sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85";
       };
     }
     {
-      name = "graceful_fs___graceful_fs_4.2.3.tgz";
+      name = "graceful_fs___graceful_fs_4.2.4.tgz";
       path = fetchurl {
-        name = "graceful_fs___graceful_fs_4.2.3.tgz";
-        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz";
-        sha1 = "4a12ff1b60376ef09862c2093edd908328be8423";
+        name = "graceful_fs___graceful_fs_4.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz";
+        sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb";
       };
     }
     {
@@ -5634,11 +5842,19 @@
       };
     }
     {
-      name = "graphql___graphql_14.0.2.tgz";
+      name = "graphql___graphql_14.7.0.tgz";
       path = fetchurl {
-        name = "graphql___graphql_14.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/graphql/-/graphql-14.0.2.tgz";
-        sha1 = "7dded337a4c3fd2d075692323384034b357f5650";
+        name = "graphql___graphql_14.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/graphql/-/graphql-14.7.0.tgz";
+        sha1 = "7fa79a80a69be4a31c27dda824dc04dac2035a72";
+      };
+    }
+    {
+      name = "gray_matter___gray_matter_4.0.2.tgz";
+      path = fetchurl {
+        name = "gray_matter___gray_matter_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.2.tgz";
+        sha1 = "9aa379e3acaf421193fce7d2a28cebd4518ac454";
       };
     }
     {
@@ -5777,6 +5993,14 @@
         sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
       };
     }
+    {
+      name = "has_yarn___has_yarn_2.1.0.tgz";
+      path = fetchurl {
+        name = "has_yarn___has_yarn_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz";
+        sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77";
+      };
+    }
     {
       name = "has___has_1.0.3.tgz";
       path = fetchurl {
@@ -5881,6 +6105,14 @@
         sha1 = "e70d84b94da53aa375e11fe3a351be6642ca46f8";
       };
     }
+    {
+      name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz";
+      path = fetchurl {
+        name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz";
+        sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3";
+      };
+    }
     {
       name = "html_entities___html_entities_1.2.1.tgz";
       path = fetchurl {
@@ -5922,11 +6154,11 @@
       };
     }
     {
-      name = "htmlparser2___htmlparser2_4.1.0.tgz";
+      name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz";
       path = fetchurl {
-        name = "htmlparser2___htmlparser2_4.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz";
-        sha1 = "9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78";
+        name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz";
+        sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390";
       };
     }
     {
@@ -6033,14 +6265,6 @@
         sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09";
       };
     }
-    {
-      name = "ignore_walk___ignore_walk_3.0.1.tgz";
-      path = fetchurl {
-        name = "ignore_walk___ignore_walk_3.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz";
-        sha1 = "a83e62e7d272ac0e3b551aaa82831a19b69f82f8";
-      };
-    }
     {
       name = "ignore___ignore_3.3.10.tgz";
       path = fetchurl {
@@ -6058,11 +6282,11 @@
       };
     }
     {
-      name = "ignore___ignore_5.1.2.tgz";
+      name = "ignore___ignore_5.1.8.tgz";
       path = fetchurl {
-        name = "ignore___ignore_5.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.2.tgz";
-        sha1 = "e28e584d43ad7e92f96995019cc43b9e1ac49558";
+        name = "ignore___ignore_5.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz";
+        sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57";
       };
     }
     {
@@ -6074,11 +6298,11 @@
       };
     }
     {
-      name = "immer___immer_5.2.1.tgz";
+      name = "immer___immer_7.0.7.tgz";
       path = fetchurl {
-        name = "immer___immer_5.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/immer/-/immer-5.2.1.tgz";
-        sha1 = "7d4f74c242178e87151d595f48db1b5c51580485";
+        name = "immer___immer_7.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/immer/-/immer-7.0.7.tgz";
+        sha1 = "9dfe713d49bf871cc59aedfce59b1992fa37a977";
       };
     }
     {
@@ -6193,6 +6417,14 @@
         sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467";
       };
     }
+    {
+      name = "inflected___inflected_2.0.4.tgz";
+      path = fetchurl {
+        name = "inflected___inflected_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/inflected/-/inflected-2.0.4.tgz";
+        sha1 = "323770961ccbe992a98ea930512e9a82d3d3ef77";
+      };
+    }
     {
       name = "inflight___inflight_1.0.6.tgz";
       path = fetchurl {
@@ -6297,6 +6529,14 @@
         sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65";
       };
     }
+    {
+      name = "ipaddr.js___ipaddr.js_1.9.1.tgz";
+      path = fetchurl {
+        name = "ipaddr.js___ipaddr.js_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
+        sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3";
+      };
+    }
     {
       name = "is_absolute_url___is_absolute_url_3.0.3.tgz";
       path = fetchurl {
@@ -6353,14 +6593,6 @@
         sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
       };
     }
-    {
-      name = "is_binary_path___is_binary_path_1.0.1.tgz";
-      path = fetchurl {
-        name = "is_binary_path___is_binary_path_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz";
-        sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
-      };
-    }
     {
       name = "is_binary_path___is_binary_path_2.1.0.tgz";
       path = fetchurl {
@@ -6393,14 +6625,6 @@
         sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab";
       };
     }
-    {
-      name = "is_ci___is_ci_1.2.1.tgz";
-      path = fetchurl {
-        name = "is_ci___is_ci_1.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz";
-        sha1 = "e3779c8ee17fccf428488f6e281187f2e632841c";
-      };
-    }
     {
       name = "is_ci___is_ci_2.0.0.tgz";
       path = fetchurl {
@@ -6554,19 +6778,19 @@
       };
     }
     {
-      name = "is_installed_globally___is_installed_globally_0.1.0.tgz";
+      name = "is_installed_globally___is_installed_globally_0.3.2.tgz";
       path = fetchurl {
-        name = "is_installed_globally___is_installed_globally_0.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz";
-        sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80";
+        name = "is_installed_globally___is_installed_globally_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz";
+        sha1 = "fd3efa79ee670d1187233182d5b0a1dd00313141";
       };
     }
     {
-      name = "is_npm___is_npm_1.0.0.tgz";
+      name = "is_npm___is_npm_4.0.0.tgz";
       path = fetchurl {
-        name = "is_npm___is_npm_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz";
-        sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
+        name = "is_npm___is_npm_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz";
+        sha1 = "c90dd8380696df87a7a6d823c20d0b12bbe3c84d";
       };
     }
     {
@@ -6593,6 +6817,14 @@
         sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
       };
     }
+    {
+      name = "is_obj___is_obj_2.0.0.tgz";
+      path = fetchurl {
+        name = "is_obj___is_obj_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz";
+        sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982";
+      };
+    }
     {
       name = "is_path_cwd___is_path_cwd_2.2.0.tgz";
       path = fetchurl {
@@ -6609,14 +6841,6 @@
         sha1 = "bfe2dca26c69f397265a4009963602935a053acb";
       };
     }
-    {
-      name = "is_path_inside___is_path_inside_1.0.0.tgz";
-      path = fetchurl {
-        name = "is_path_inside___is_path_inside_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz";
-        sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f";
-      };
-    }
     {
       name = "is_path_inside___is_path_inside_2.1.0.tgz";
       path = fetchurl {
@@ -6625,6 +6849,14 @@
         sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2";
       };
     }
+    {
+      name = "is_path_inside___is_path_inside_3.0.2.tgz";
+      path = fetchurl {
+        name = "is_path_inside___is_path_inside_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz";
+        sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017";
+      };
+    }
     {
       name = "is_plain_obj___is_plain_obj_1.1.0.tgz";
       path = fetchurl {
@@ -6641,6 +6873,14 @@
         sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677";
       };
     }
+    {
+      name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz";
+        sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397";
+      };
+    }
     {
       name = "is_promise___is_promise_2.1.0.tgz";
       path = fetchurl {
@@ -6649,14 +6889,6 @@
         sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
       };
     }
-    {
-      name = "is_redirect___is_redirect_1.0.0.tgz";
-      path = fetchurl {
-        name = "is_redirect___is_redirect_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz";
-        sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
-      };
-    }
     {
       name = "is_regex___is_regex_1.0.5.tgz";
       path = fetchurl {
@@ -6681,14 +6913,6 @@
         sha1 = "cd734a56864e23b956bf4e7c66c396a4c0b22c2d";
       };
     }
-    {
-      name = "is_retry_allowed___is_retry_allowed_1.1.0.tgz";
-      path = fetchurl {
-        name = "is_retry_allowed___is_retry_allowed_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz";
-        sha1 = "11a060568b67339444033d0125a61a20d564fb34";
-      };
-    }
     {
       name = "is_stream___is_stream_1.1.0.tgz";
       path = fetchurl {
@@ -6761,6 +6985,14 @@
         sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
       };
     }
+    {
+      name = "is_yarn_global___is_yarn_global_0.3.0.tgz";
+      path = fetchurl {
+        name = "is_yarn_global___is_yarn_global_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz";
+        sha1 = "d502d3382590ea3004893746754c89139973e232";
+      };
+    }
     {
       name = "isarray___isarray_1.0.0.tgz";
       path = fetchurl {
@@ -7001,6 +7233,14 @@
         sha1 = "a05fd2bf94ddc0b1da66c6d13ec2457f35e52775";
       };
     }
+    {
+      name = "jest_environment_jsdom_sixteen___jest_environment_jsdom_sixteen_1.0.3.tgz";
+      path = fetchurl {
+        name = "jest_environment_jsdom_sixteen___jest_environment_jsdom_sixteen_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/jest-environment-jsdom-sixteen/-/jest-environment-jsdom-sixteen-1.0.3.tgz";
+        sha1 = "e222228fac537ef15cca5ad470b19b47d9690165";
+      };
+    }
     {
       name = "jest_environment_jsdom___jest_environment_jsdom_24.8.0.tgz";
       path = fetchurl {
@@ -7073,6 +7313,14 @@
         sha1 = "0d6891e72a4beacc0292b638685df42e28d6218b";
       };
     }
+    {
+      name = "jest_message_util___jest_message_util_25.5.0.tgz";
+      path = fetchurl {
+        name = "jest_message_util___jest_message_util_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.5.0.tgz";
+        sha1 = "ea11d93204cc7ae97456e1d8716251185b8880ea";
+      };
+    }
     {
       name = "jest_mock___jest_mock_24.8.0.tgz";
       path = fetchurl {
@@ -7081,6 +7329,14 @@
         sha1 = "2f9d14d37699e863f1febf4e4d5a33b7fdbbde56";
       };
     }
+    {
+      name = "jest_mock___jest_mock_25.5.0.tgz";
+      path = fetchurl {
+        name = "jest_mock___jest_mock_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.5.0.tgz";
+        sha1 = "a91a54dabd14e37ecd61665d6b6e06360a55387a";
+      };
+    }
     {
       name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz";
       path = fetchurl {
@@ -7161,6 +7417,14 @@
         sha1 = "41f0e945da11df44cc76d64ffb915d0716f46cd1";
       };
     }
+    {
+      name = "jest_util___jest_util_25.5.0.tgz";
+      path = fetchurl {
+        name = "jest_util___jest_util_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-util/-/jest-util-25.5.0.tgz";
+        sha1 = "31c63b5d6e901274d264a4fec849230aa3fa35b0";
+      };
+    }
     {
       name = "jest_validate___jest_validate_24.8.0.tgz";
       path = fetchurl {
@@ -7226,11 +7490,11 @@
       };
     }
     {
-      name = "jquery___jquery_3.4.1.tgz";
+      name = "jquery___jquery_3.5.1.tgz";
       path = fetchurl {
-        name = "jquery___jquery_3.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz";
-        sha1 = "714f1f8d9dde4bdfa55764ba37ef214630d80ef2";
+        name = "jquery___jquery_3.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz";
+        sha1 = "d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5";
       };
     }
     {
@@ -7313,6 +7577,14 @@
         sha1 = "1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8";
       };
     }
+    {
+      name = "jsdom___jsdom_16.2.2.tgz";
+      path = fetchurl {
+        name = "jsdom___jsdom_16.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz";
+        sha1 = "76f2f7541646beb46a938f5dc476b88705bedf2b";
+      };
+    }
     {
       name = "jsesc___jsesc_2.5.2.tgz";
       path = fetchurl {
@@ -7329,6 +7601,14 @@
         sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d";
       };
     }
+    {
+      name = "json_buffer___json_buffer_3.0.0.tgz";
+      path = fetchurl {
+        name = "json_buffer___json_buffer_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz";
+        sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898";
+      };
+    }
     {
       name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz";
       path = fetchurl {
@@ -7378,11 +7658,11 @@
       };
     }
     {
-      name = "json5___json5_2.1.0.tgz";
+      name = "json5___json5_2.1.3.tgz";
       path = fetchurl {
-        name = "json5___json5_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz";
-        sha1 = "e7a0c62c48285c628d20a10b85c89bb807c32850";
+        name = "json5___json5_2.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz";
+        sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43";
       };
     }
     {
@@ -7393,6 +7673,14 @@
         sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe";
       };
     }
+    {
+      name = "jsonc_parser___jsonc_parser_2.2.1.tgz";
+      path = fetchurl {
+        name = "jsonc_parser___jsonc_parser_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.1.tgz";
+        sha1 = "db73cd59d78cce28723199466b2a03d1be1df2bc";
+      };
+    }
     {
       name = "jsonfile___jsonfile_4.0.0.tgz";
       path = fetchurl {
@@ -7497,6 +7785,14 @@
         sha1 = "da562e5d0d5cc3aa602e27af8a9b8710bfbce765";
       };
     }
+    {
+      name = "keyv___keyv_3.1.0.tgz";
+      path = fetchurl {
+        name = "keyv___keyv_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz";
+        sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9";
+      };
+    }
     {
       name = "killable___killable_1.0.1.tgz";
       path = fetchurl {
@@ -7562,11 +7858,11 @@
       };
     }
     {
-      name = "latest_version___latest_version_3.1.0.tgz";
+      name = "latest_version___latest_version_5.1.0.tgz";
       path = fetchurl {
-        name = "latest_version___latest_version_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz";
-        sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
+        name = "latest_version___latest_version_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz";
+        sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face";
       };
     }
     {
@@ -7721,6 +8017,14 @@
         sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0";
       };
     }
+    {
+      name = "lodash.assign___lodash.assign_4.2.0.tgz";
+      path = fetchurl {
+        name = "lodash.assign___lodash.assign_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz";
+        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
+      };
+    }
     {
       name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz";
       path = fetchurl {
@@ -7737,6 +8041,14 @@
         sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef";
       };
     }
+    {
+      name = "lodash.compact___lodash.compact_3.0.1.tgz";
+      path = fetchurl {
+        name = "lodash.compact___lodash.compact_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.compact/-/lodash.compact-3.0.1.tgz";
+        sha1 = "540ce3837745975807471e16b4a2ba21e7256ca5";
+      };
+    }
     {
       name = "lodash.differencewith___lodash.differencewith_4.5.0.tgz";
       path = fetchurl {
@@ -7746,11 +8058,11 @@
       };
     }
     {
-      name = "lodash.escaperegexp___lodash.escaperegexp_4.1.2.tgz";
+      name = "lodash.find___lodash.find_4.6.0.tgz";
       path = fetchurl {
-        name = "lodash.escaperegexp___lodash.escaperegexp_4.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz";
-        sha1 = "64762c48618082518ac3df4ccf5d5886dae20347";
+        name = "lodash.find___lodash.find_4.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz";
+        sha1 = "cb0704d47ab71789ffa0de8b97dd926fb88b13b1";
       };
     }
     {
@@ -7761,6 +8073,46 @@
         sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f";
       };
     }
+    {
+      name = "lodash.forin___lodash.forin_4.4.0.tgz";
+      path = fetchurl {
+        name = "lodash.forin___lodash.forin_4.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.forin/-/lodash.forin-4.4.0.tgz";
+        sha1 = "5d3f20ae564011fbe88381f7d98949c9c9519731";
+      };
+    }
+    {
+      name = "lodash.get___lodash.get_4.4.2.tgz";
+      path = fetchurl {
+        name = "lodash.get___lodash.get_4.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz";
+        sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99";
+      };
+    }
+    {
+      name = "lodash.has___lodash.has_4.5.2.tgz";
+      path = fetchurl {
+        name = "lodash.has___lodash.has_4.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz";
+        sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862";
+      };
+    }
+    {
+      name = "lodash.invokemap___lodash.invokemap_4.6.0.tgz";
+      path = fetchurl {
+        name = "lodash.invokemap___lodash.invokemap_4.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz";
+        sha1 = "1748cda5d8b0ef8369c4eb3ec54c21feba1f2d62";
+      };
+    }
+    {
+      name = "lodash.isempty___lodash.isempty_4.4.0.tgz";
+      path = fetchurl {
+        name = "lodash.isempty___lodash.isempty_4.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz";
+        sha1 = "6f86cbedd8be4ec987be9aaf33c9684db1b31e7e";
+      };
+    }
     {
       name = "lodash.isequal___lodash.isequal_4.5.0.tgz";
       path = fetchurl {
@@ -7769,6 +8121,22 @@
         sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
       };
     }
+    {
+      name = "lodash.isfunction___lodash.isfunction_3.0.9.tgz";
+      path = fetchurl {
+        name = "lodash.isfunction___lodash.isfunction_3.0.9.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz";
+        sha1 = "06de25df4db327ac931981d1bdb067e5af68d051";
+      };
+    }
+    {
+      name = "lodash.isinteger___lodash.isinteger_4.0.4.tgz";
+      path = fetchurl {
+        name = "lodash.isinteger___lodash.isinteger_4.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz";
+        sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343";
+      };
+    }
     {
       name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
       path = fetchurl {
@@ -7777,14 +8145,6 @@
         sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb";
       };
     }
-    {
-      name = "lodash.isstring___lodash.isstring_4.0.1.tgz";
-      path = fetchurl {
-        name = "lodash.isstring___lodash.isstring_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz";
-        sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451";
-      };
-    }
     {
       name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz";
       path = fetchurl {
@@ -7794,11 +8154,35 @@
       };
     }
     {
-      name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz";
+      name = "lodash.lowerfirst___lodash.lowerfirst_4.3.1.tgz";
       path = fetchurl {
-        name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz";
-        sha1 = "617121f89ac55f59047c7aec1ccd6654c6590f55";
+        name = "lodash.lowerfirst___lodash.lowerfirst_4.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.lowerfirst/-/lodash.lowerfirst-4.3.1.tgz";
+        sha1 = "de3c7b12e02c6524a0059c2f6cb7c5c52655a13d";
+      };
+    }
+    {
+      name = "lodash.map___lodash.map_4.6.0.tgz";
+      path = fetchurl {
+        name = "lodash.map___lodash.map_4.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz";
+        sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3";
+      };
+    }
+    {
+      name = "lodash.mapvalues___lodash.mapvalues_4.6.0.tgz";
+      path = fetchurl {
+        name = "lodash.mapvalues___lodash.mapvalues_4.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz";
+        sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c";
+      };
+    }
+    {
+      name = "lodash.pick___lodash.pick_4.4.0.tgz";
+      path = fetchurl {
+        name = "lodash.pick___lodash.pick_4.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz";
+        sha1 = "52f05610fff9ded422611441ed1fc123a03001b3";
       };
     }
     {
@@ -7817,6 +8201,22 @@
         sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438";
       };
     }
+    {
+      name = "lodash.uniq___lodash.uniq_4.5.0.tgz";
+      path = fetchurl {
+        name = "lodash.uniq___lodash.uniq_4.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz";
+        sha1 = "d0225373aeb652adc1bc82e4945339a842754773";
+      };
+    }
+    {
+      name = "lodash.uniqby___lodash.uniqby_4.7.0.tgz";
+      path = fetchurl {
+        name = "lodash.uniqby___lodash.uniqby_4.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz";
+        sha1 = "d99c07a669e9e6d24e1362dfe266c67616af1302";
+      };
+    }
     {
       name = "lodash.upperfirst___lodash.upperfirst_4.3.1.tgz";
       path = fetchurl {
@@ -7826,11 +8226,19 @@
       };
     }
     {
-      name = "lodash___lodash_4.17.15.tgz";
+      name = "lodash.values___lodash.values_4.3.0.tgz";
       path = fetchurl {
-        name = "lodash___lodash_4.17.15.tgz";
-        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz";
-        sha1 = "b447f6670a0455bbfeedd11392eff330ea097548";
+        name = "lodash.values___lodash.values_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz";
+        sha1 = "a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347";
+      };
+    }
+    {
+      name = "lodash___lodash_4.17.20.tgz";
+      path = fetchurl {
+        name = "lodash___lodash_4.17.20.tgz";
+        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz";
+        sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52";
       };
     }
     {
@@ -7865,6 +8273,14 @@
         sha1 = "b3e034233188c68b889f5b862415306f565e2c56";
       };
     }
+    {
+      name = "lolex___lolex_5.1.2.tgz";
+      path = fetchurl {
+        name = "lolex___lolex_5.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz";
+        sha1 = "953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367";
+      };
+    }
     {
       name = "longest_streak___longest_streak_2.0.2.tgz";
       path = fetchurl {
@@ -7898,11 +8314,19 @@
       };
     }
     {
-      name = "lowercase_keys___lowercase_keys_1.0.0.tgz";
+      name = "lowercase_keys___lowercase_keys_1.0.1.tgz";
       path = fetchurl {
-        name = "lowercase_keys___lowercase_keys_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
-        sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306";
+        name = "lowercase_keys___lowercase_keys_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
+        sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f";
+      };
+    }
+    {
+      name = "lowercase_keys___lowercase_keys_2.0.0.tgz";
+      path = fetchurl {
+        name = "lowercase_keys___lowercase_keys_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz";
+        sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479";
       };
     }
     {
@@ -7937,14 +8361,6 @@
         sha1 = "c0d8eaf36059f705796e1e344811cf4c498d3a26";
       };
     }
-    {
-      name = "make_dir___make_dir_1.3.0.tgz";
-      path = fetchurl {
-        name = "make_dir___make_dir_1.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz";
-        sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c";
-      };
-    }
     {
       name = "make_dir___make_dir_2.1.0.tgz";
       path = fetchurl {
@@ -8034,11 +8450,11 @@
       };
     }
     {
-      name = "markdown_it___markdown_it_9.0.1.tgz";
+      name = "markdown_it___markdown_it_10.0.0.tgz";
       path = fetchurl {
-        name = "markdown_it___markdown_it_9.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-9.0.1.tgz";
-        sha1 = "aafe363c43718720b6575fd10625cde6e4ff2d47";
+        name = "markdown_it___markdown_it_10.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz";
+        sha1 = "abfc64f141b1722d663402044e43927f1f50a8dc";
       };
     }
     {
@@ -8058,19 +8474,27 @@
       };
     }
     {
-      name = "markdownlint_cli___markdownlint_cli_0.18.0.tgz";
+      name = "markdownlint_cli___markdownlint_cli_0.23.2.tgz";
       path = fetchurl {
-        name = "markdownlint_cli___markdownlint_cli_0.18.0.tgz";
-        url  = "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.18.0.tgz";
-        sha1 = "bd1cee72739049d42dcea5f6db0c0f57c6eb8096";
+        name = "markdownlint_cli___markdownlint_cli_0.23.2.tgz";
+        url  = "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.23.2.tgz";
+        sha1 = "43f0a96e2699542b74fb5e6188c025e4934357fc";
       };
     }
     {
-      name = "markdownlint___markdownlint_0.16.0.tgz";
+      name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.11.0.tgz";
       path = fetchurl {
-        name = "markdownlint___markdownlint_0.16.0.tgz";
-        url  = "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.16.0.tgz";
-        sha1 = "69f73cc755a44231fbe5dc7c37a5909cedc0ac6e";
+        name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.11.0.tgz";
+        sha1 = "faaaae4337771c7d88ca38ef6265afb4fbe0fb3f";
+      };
+    }
+    {
+      name = "markdownlint___markdownlint_0.20.4.tgz";
+      path = fetchurl {
+        name = "markdownlint___markdownlint_0.20.4.tgz";
+        url  = "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.20.4.tgz";
+        sha1 = "3b34681494cdad174e14a27182b5cdefaa537823";
       };
     }
     {
@@ -8202,11 +8626,19 @@
       };
     }
     {
-      name = "mermaid___mermaid_8.4.8.tgz";
+      name = "mermaid___mermaid_8.5.2.tgz";
       path = fetchurl {
-        name = "mermaid___mermaid_8.4.8.tgz";
-        url  = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.8.tgz";
-        sha1 = "8adcfdbc505d6bca52df167cff690427c9727b60";
+        name = "mermaid___mermaid_8.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.5.2.tgz";
+        sha1 = "0f1914cda53d4ea5377380e5ce07a38bef2ea7e8";
+      };
+    }
+    {
+      name = "mersenne_twister___mersenne_twister_1.1.0.tgz";
+      path = fetchurl {
+        name = "mersenne_twister___mersenne_twister_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz";
+        sha1 = "f916618ee43d7179efcf641bec4531eb9670978a";
       };
     }
     {
@@ -8281,6 +8713,22 @@
         sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b";
       };
     }
+    {
+      name = "mimic_response___mimic_response_1.0.1.tgz";
+      path = fetchurl {
+        name = "mimic_response___mimic_response_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz";
+        sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b";
+      };
+    }
+    {
+      name = "min_document___min_document_2.19.0.tgz";
+      path = fetchurl {
+        name = "min_document___min_document_2.19.0.tgz";
+        url  = "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz";
+        sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685";
+      };
+    }
     {
       name = "minify___minify_4.1.2.tgz";
       path = fetchurl {
@@ -8338,11 +8786,11 @@
       };
     }
     {
-      name = "minimist___minimist_1.2.0.tgz";
+      name = "minimist___minimist_1.2.5.tgz";
       path = fetchurl {
-        name = "minimist___minimist_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+        name = "minimist___minimist_1.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz";
+        sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602";
       };
     }
     {
@@ -8369,14 +8817,6 @@
         sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a";
       };
     }
-    {
-      name = "minipass___minipass_2.3.5.tgz";
-      path = fetchurl {
-        name = "minipass___minipass_2.3.5.tgz";
-        url  = "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz";
-        sha1 = "cacebe492022497f656b0f0f51e2682a9ed2d848";
-      };
-    }
     {
       name = "minipass___minipass_3.1.1.tgz";
       path = fetchurl {
@@ -8386,11 +8826,11 @@
       };
     }
     {
-      name = "minizlib___minizlib_1.2.1.tgz";
+      name = "miragejs___miragejs_0.1.40.tgz";
       path = fetchurl {
-        name = "minizlib___minizlib_1.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz";
-        sha1 = "dd27ea6136243c7c880684e8672bb3a45fd9b614";
+        name = "miragejs___miragejs_0.1.40.tgz";
+        url  = "https://registry.yarnpkg.com/miragejs/-/miragejs-0.1.40.tgz";
+        sha1 = "5bcba7634312c012748ae7f294e1516b74b37182";
       };
     }
     {
@@ -8401,14 +8841,6 @@
         sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022";
       };
     }
-    {
-      name = "mitt___mitt_1.2.0.tgz";
-      path = fetchurl {
-        name = "mitt___mitt_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz";
-        sha1 = "cb24e6569c806e31bd4e3995787fe38a04fdf90d";
-      };
-    }
     {
       name = "mixin_deep___mixin_deep_1.3.2.tgz";
       path = fetchurl {
@@ -8425,6 +8857,14 @@
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     }
+    {
+      name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz";
+      path = fetchurl {
+        name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.4.0.tgz";
+        sha1 = "556a6090b1816dbf07e51093b652aca84aee979e";
+      };
+    }
     {
       name = "moment_mini___moment_mini_2.22.1.tgz";
       path = fetchurl {
@@ -8434,35 +8874,35 @@
       };
     }
     {
-      name = "moment___moment_2.24.0.tgz";
+      name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.0.tgz";
       path = fetchurl {
-        name = "moment___moment_2.24.0.tgz";
-        url  = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz";
-        sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b";
+        name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.9.0.tgz";
+        sha1 = "5b547281b9f404057dc5d8c5722390df9ac90be6";
       };
     }
     {
-      name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.7.0.tgz";
+      name = "monaco_editor___monaco_editor_0.20.0.tgz";
       path = fetchurl {
-        name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.7.0.tgz";
-        sha1 = "920cbeecca25f15d70d568a7e11b0ba4daf1ae83";
+        name = "monaco_editor___monaco_editor_0.20.0.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.20.0.tgz";
+        sha1 = "5d5009343a550124426cb4d965a4d27a348b4dea";
       };
     }
     {
-      name = "monaco_editor___monaco_editor_0.18.1.tgz";
+      name = "monaco_yaml___monaco_yaml_2.4.1.tgz";
       path = fetchurl {
-        name = "monaco_editor___monaco_editor_0.18.1.tgz";
-        url  = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.18.1.tgz";
-        sha1 = "ced7c305a23109875feeaf395a504b91f6358cfc";
+        name = "monaco_yaml___monaco_yaml_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-yaml/-/monaco-yaml-2.4.1.tgz";
+        sha1 = "f0d3384b1f10cc7af2b60e3a30b0adc6683b728a";
       };
     }
     {
-      name = "mousetrap___mousetrap_1.4.6.tgz";
+      name = "mousetrap___mousetrap_1.6.5.tgz";
       path = fetchurl {
-        name = "mousetrap___mousetrap_1.4.6.tgz";
-        url  = "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.4.6.tgz";
-        sha1 = "eaca72e22e56d5b769b7555873b688c3332e390a";
+        name = "mousetrap___mousetrap_1.6.5.tgz";
+        url  = "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz";
+        sha1 = "8a766d8c272b08393d5f56074e0b5ec183485bf9";
       };
     }
     {
@@ -8514,11 +8954,11 @@
       };
     }
     {
-      name = "nan___nan_2.14.0.tgz";
+      name = "nan___nan_2.14.1.tgz";
       path = fetchurl {
-        name = "nan___nan_2.14.0.tgz";
-        url  = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz";
-        sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c";
+        name = "nan___nan_2.14.1.tgz";
+        url  = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz";
+        sha1 = "d7be34dfa3105b91494c3147089315eff8874b01";
       };
     }
     {
@@ -8537,14 +8977,6 @@
         sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7";
       };
     }
-    {
-      name = "needle___needle_2.4.0.tgz";
-      path = fetchurl {
-        name = "needle___needle_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz";
-        sha1 = "6833e74975c444642590e15a750288c5f939b57c";
-      };
-    }
     {
       name = "negotiator___negotiator_0.6.2.tgz";
       path = fetchurl {
@@ -8642,19 +9074,11 @@
       };
     }
     {
-      name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz";
+      name = "node_releases___node_releases_1.1.58.tgz";
       path = fetchurl {
-        name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz";
-        sha1 = "39ba4bb1439da030295f899e3b520b7785766149";
-      };
-    }
-    {
-      name = "node_releases___node_releases_1.1.50.tgz";
-      path = fetchurl {
-        name = "node_releases___node_releases_1.1.50.tgz";
-        url  = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz";
-        sha1 = "803c40d2c45db172d0410e4efec83aa8c6ad0592";
+        name = "node_releases___node_releases_1.1.58.tgz";
+        url  = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz";
+        sha1 = "8ee20eef30fa60e52755fcc0942def5a734fe935";
       };
     }
     {
@@ -8666,11 +9090,11 @@
       };
     }
     {
-      name = "nodemon___nodemon_1.18.9.tgz";
+      name = "nodemon___nodemon_2.0.4.tgz";
       path = fetchurl {
-        name = "nodemon___nodemon_1.18.9.tgz";
-        url  = "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.9.tgz";
-        sha1 = "90b467efd3b3c81b9453380aeb2a2cba535d0ead";
+        name = "nodemon___nodemon_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.4.tgz";
+        sha1 = "55b09319eb488d6394aa9818148c0c2d1c04c416";
       };
     }
     {
@@ -8681,14 +9105,6 @@
         sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
       };
     }
-    {
-      name = "nopt___nopt_4.0.1.tgz";
-      path = fetchurl {
-        name = "nopt___nopt_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz";
-        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
-      };
-    }
     {
       name = "nopt___nopt_1.0.10.tgz";
       path = fetchurl {
@@ -8697,6 +9113,14 @@
         sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     }
+    {
+      name = "nopt___nopt_4.0.1.tgz";
+      path = fetchurl {
+        name = "nopt___nopt_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz";
+        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+      };
+    }
     {
       name = "normalize_package_data___normalize_package_data_2.5.0.tgz";
       path = fetchurl {
@@ -8738,19 +9162,11 @@
       };
     }
     {
-      name = "npm_bundled___npm_bundled_1.0.6.tgz";
+      name = "normalize_url___normalize_url_4.5.0.tgz";
       path = fetchurl {
-        name = "npm_bundled___npm_bundled_1.0.6.tgz";
-        url  = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz";
-        sha1 = "e7ba9aadcef962bb61248f91721cd932b3fe6bdd";
-      };
-    }
-    {
-      name = "npm_packlist___npm_packlist_1.4.1.tgz";
-      path = fetchurl {
-        name = "npm_packlist___npm_packlist_1.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz";
-        sha1 = "19064cdf988da80ea3cee45533879d90192bbfbc";
+        name = "normalize_url___normalize_url_4.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz";
+        sha1 = "453354087e6ca96957bd8f5baf753f5982142129";
       };
     }
     {
@@ -8786,11 +9202,11 @@
       };
     }
     {
-      name = "nwsapi___nwsapi_2.0.9.tgz";
+      name = "nwsapi___nwsapi_2.2.0.tgz";
       path = fetchurl {
-        name = "nwsapi___nwsapi_2.0.9.tgz";
-        url  = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz";
-        sha1 = "77ac0cdfdcad52b6a1151a84e73254edc33ed016";
+        name = "nwsapi___nwsapi_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz";
+        sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7";
       };
     }
     {
@@ -9033,6 +9449,14 @@
         sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410";
       };
     }
+    {
+      name = "p_cancelable___p_cancelable_1.1.0.tgz";
+      path = fetchurl {
+        name = "p_cancelable___p_cancelable_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz";
+        sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc";
+      };
+    }
     {
       name = "p_defer___p_defer_1.0.0.tgz";
       path = fetchurl {
@@ -9154,11 +9578,11 @@
       };
     }
     {
-      name = "package_json___package_json_4.0.1.tgz";
+      name = "package_json___package_json_6.5.0.tgz";
       path = fetchurl {
-        name = "package_json___package_json_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz";
-        sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed";
+        name = "package_json___package_json_6.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz";
+        sha1 = "6feedaca35e75725876d0b0e64974697fed145b0";
       };
     }
     {
@@ -9250,11 +9674,11 @@
       };
     }
     {
-      name = "parse5___parse5_5.0.0.tgz";
+      name = "parse5___parse5_5.1.1.tgz";
       path = fetchurl {
-        name = "parse5___parse5_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/parse5/-/parse5-5.0.0.tgz";
-        sha1 = "4d02710d44f3c3846197a11e205d4ef17842b81a";
+        name = "parse5___parse5_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz";
+        sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178";
       };
     }
     {
@@ -9418,11 +9842,11 @@
       };
     }
     {
-      name = "picomatch___picomatch_2.0.7.tgz";
+      name = "picomatch___picomatch_2.2.2.tgz";
       path = fetchurl {
-        name = "picomatch___picomatch_2.0.7.tgz";
-        url  = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz";
-        sha1 = "514169d8c7cd0bdbeecc8a2609e34a7163de69f6";
+        name = "picomatch___picomatch_2.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz";
+        sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad";
       };
     }
     {
@@ -9513,6 +9937,14 @@
         sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3";
       };
     }
+    {
+      name = "pkg_up___pkg_up_2.0.0.tgz";
+      path = fetchurl {
+        name = "pkg_up___pkg_up_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz";
+        sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f";
+      };
+    }
     {
       name = "pn___pn_1.1.0.tgz";
       path = fetchurl {
@@ -9546,11 +9978,11 @@
       };
     }
     {
-      name = "portal_vue___portal_vue_2.1.6.tgz";
+      name = "portal_vue___portal_vue_2.1.7.tgz";
       path = fetchurl {
-        name = "portal_vue___portal_vue_2.1.6.tgz";
-        url  = "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.6.tgz";
-        sha1 = "a7d4790b14a79af7fd159a60ec88c30cddc6c639";
+        name = "portal_vue___portal_vue_2.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz";
+        sha1 = "ea08069b25b640ca08a5b86f67c612f15f4e4ad4";
       };
     }
     {
@@ -9729,14 +10161,6 @@
         sha1 = "99a983d365f7b2ad8d0f9b8c3094926eab4b936d";
       };
     }
-    {
-      name = "postcss___postcss_7.0.27.tgz";
-      path = fetchurl {
-        name = "postcss___postcss_7.0.27.tgz";
-        url  = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz";
-        sha1 = "cc67cdc6b0daa375105b7c424a85567345fc54d9";
-      };
-    }
     {
       name = "postcss___postcss_7.0.30.tgz";
       path = fetchurl {
@@ -9754,11 +10178,19 @@
       };
     }
     {
-      name = "prepend_http___prepend_http_1.0.4.tgz";
+      name = "prepend_http___prepend_http_2.0.0.tgz";
       path = fetchurl {
-        name = "prepend_http___prepend_http_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz";
-        sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
+        name = "prepend_http___prepend_http_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz";
+        sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897";
+      };
+    }
+    {
+      name = "pretender___pretender_3.4.3.tgz";
+      path = fetchurl {
+        name = "pretender___pretender_3.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/pretender/-/pretender-3.4.3.tgz";
+        sha1 = "a3b4160516007075d29127262f3a0063d19896e9";
       };
     }
     {
@@ -9777,6 +10209,14 @@
         sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea";
       };
     }
+    {
+      name = "prettier___prettier_1.19.1.tgz";
+      path = fetchurl {
+        name = "prettier___prettier_1.19.1.tgz";
+        url  = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz";
+        sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb";
+      };
+    }
     {
       name = "pretty_format___pretty_format_24.8.0.tgz";
       path = fetchurl {
@@ -9785,6 +10225,14 @@
         sha1 = "8dae7044f58db7cb8be245383b565a963e3c27f2";
       };
     }
+    {
+      name = "pretty_format___pretty_format_25.5.0.tgz";
+      path = fetchurl {
+        name = "pretty_format___pretty_format_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz";
+        sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a";
+      };
+    }
     {
       name = "pretty___pretty_2.0.0.tgz";
       path = fetchurl {
@@ -9794,11 +10242,11 @@
       };
     }
     {
-      name = "prismjs___prismjs_1.6.0.tgz";
+      name = "prismjs___prismjs_1.21.0.tgz";
       path = fetchurl {
-        name = "prismjs___prismjs_1.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.6.0.tgz";
-        sha1 = "118d95fb7a66dba2272e343b345f5236659db365";
+        name = "prismjs___prismjs_1.21.0.tgz";
+        url  = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.21.0.tgz";
+        sha1 = "36c086ec36b45319ec4218ee164c110f9fc015a3";
       };
     }
     {
@@ -10002,19 +10450,19 @@
       };
     }
     {
-      name = "psl___psl_1.1.29.tgz";
+      name = "psl___psl_1.8.0.tgz";
       path = fetchurl {
-        name = "psl___psl_1.1.29.tgz";
-        url  = "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz";
-        sha1 = "60f580d360170bb722a797cc704411e6da850c67";
+        name = "psl___psl_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz";
+        sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24";
       };
     }
     {
-      name = "pstree.remy___pstree.remy_1.1.6.tgz";
+      name = "pstree.remy___pstree.remy_1.1.8.tgz";
       path = fetchurl {
-        name = "pstree.remy___pstree.remy_1.1.6.tgz";
-        url  = "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz";
-        sha1 = "73a55aad9e2d95814927131fbf4dc1b62d259f47";
+        name = "pstree.remy___pstree.remy_1.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz";
+        sha1 = "c242224f4a67c21f686839bbdb4ac282b8373d3a";
       };
     }
     {
@@ -10057,14 +10505,6 @@
         sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
       };
     }
-    {
-      name = "punycode___punycode_1.4.1.tgz";
-      path = fetchurl {
-        name = "punycode___punycode_1.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
-      };
-    }
     {
       name = "punycode___punycode_2.1.1.tgz";
       path = fetchurl {
@@ -10073,6 +10513,14 @@
         sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec";
       };
     }
+    {
+      name = "pupa___pupa_2.0.1.tgz";
+      path = fetchurl {
+        name = "pupa___pupa_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz";
+        sha1 = "dbdc9ff48ffbea4a26a069b6f9f7abb051008726";
+      };
+    }
     {
       name = "qjobs___qjobs_1.2.0.tgz";
       path = fetchurl {
@@ -10186,11 +10634,11 @@
       };
     }
     {
-      name = "react_is___react_is_16.8.6.tgz";
+      name = "react_is___react_is_16.13.1.tgz";
       path = fetchurl {
-        name = "react_is___react_is_16.8.6.tgz";
-        url  = "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz";
-        sha1 = "5bbc1e2d29141c9fbdfed456343fe2bc430a6a16";
+        name = "react_is___react_is_16.13.1.tgz";
+        url  = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz";
+        sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4";
       };
     }
     {
@@ -10282,19 +10730,11 @@
       };
     }
     {
-      name = "readdirp___readdirp_2.2.1.tgz";
+      name = "readdirp___readdirp_3.4.0.tgz";
       path = fetchurl {
-        name = "readdirp___readdirp_2.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz";
-        sha1 = "0e87622a3325aa33e892285caf8b4e846529a525";
-      };
-    }
-    {
-      name = "readdirp___readdirp_3.1.1.tgz";
-      path = fetchurl {
-        name = "readdirp___readdirp_3.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.1.tgz";
-        sha1 = "b158123ac343c8b0f31d65680269cc0fc1025db1";
+        name = "readdirp___readdirp_3.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz";
+        sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada";
       };
     }
     {
@@ -10322,11 +10762,11 @@
       };
     }
     {
-      name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz";
+      name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz";
       path = fetchurl {
-        name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz";
-        sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e";
+        name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz";
+        sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec";
       };
     }
     {
@@ -10338,11 +10778,19 @@
       };
     }
     {
-      name = "regenerator_transform___regenerator_transform_0.14.1.tgz";
+      name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz";
       path = fetchurl {
-        name = "regenerator_transform___regenerator_transform_0.14.1.tgz";
-        url  = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz";
-        sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb";
+        name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz";
+        url  = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz";
+        sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697";
+      };
+    }
+    {
+      name = "regenerator_transform___regenerator_transform_0.14.4.tgz";
+      path = fetchurl {
+        name = "regenerator_transform___regenerator_transform_0.14.4.tgz";
+        url  = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz";
+        sha1 = "5266857896518d1616a78a0479337a30ea974cc7";
       };
     }
     {
@@ -10362,43 +10810,43 @@
       };
     }
     {
-      name = "regexpu_core___regexpu_core_4.6.0.tgz";
+      name = "regexpu_core___regexpu_core_4.7.0.tgz";
       path = fetchurl {
-        name = "regexpu_core___regexpu_core_4.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz";
-        sha1 = "2037c18b327cfce8a6fea2a4ec441f2432afb8b6";
+        name = "regexpu_core___regexpu_core_4.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz";
+        sha1 = "fcbf458c50431b0bb7b45d6967b8192d91f3d938";
       };
     }
     {
-      name = "registry_auth_token___registry_auth_token_3.3.2.tgz";
+      name = "registry_auth_token___registry_auth_token_4.1.1.tgz";
       path = fetchurl {
-        name = "registry_auth_token___registry_auth_token_3.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz";
-        sha1 = "851fd49038eecb586911115af845260eec983f20";
+        name = "registry_auth_token___registry_auth_token_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.1.1.tgz";
+        sha1 = "40a33be1e82539460f94328b0f7f0f84c16d9479";
       };
     }
     {
-      name = "registry_url___registry_url_3.1.0.tgz";
+      name = "registry_url___registry_url_5.1.0.tgz";
       path = fetchurl {
-        name = "registry_url___registry_url_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz";
-        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
+        name = "registry_url___registry_url_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz";
+        sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009";
       };
     }
     {
-      name = "regjsgen___regjsgen_0.5.0.tgz";
+      name = "regjsgen___regjsgen_0.5.2.tgz";
       path = fetchurl {
-        name = "regjsgen___regjsgen_0.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz";
-        sha1 = "a7634dc08f89209c2049adda3525711fb97265dd";
+        name = "regjsgen___regjsgen_0.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz";
+        sha1 = "92ff295fb1deecbf6ecdab2543d207e91aa33733";
       };
     }
     {
-      name = "regjsparser___regjsparser_0.6.0.tgz";
+      name = "regjsparser___regjsparser_0.6.4.tgz";
       path = fetchurl {
-        name = "regjsparser___regjsparser_0.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz";
-        sha1 = "f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c";
+        name = "regjsparser___regjsparser_0.6.4.tgz";
+        url  = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz";
+        sha1 = "a769f8684308401a66e9b529d2436ff4d0666272";
       };
     }
     {
@@ -10474,27 +10922,27 @@
       };
     }
     {
-      name = "request_promise_core___request_promise_core_1.1.1.tgz";
+      name = "request_promise_core___request_promise_core_1.1.3.tgz";
       path = fetchurl {
-        name = "request_promise_core___request_promise_core_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz";
-        sha1 = "3eee00b2c5aa83239cfb04c5700da36f81cd08b6";
+        name = "request_promise_core___request_promise_core_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz";
+        sha1 = "e9a3c081b51380dfea677336061fea879a829ee9";
       };
     }
     {
-      name = "request_promise_native___request_promise_native_1.0.5.tgz";
+      name = "request_promise_native___request_promise_native_1.0.8.tgz";
       path = fetchurl {
-        name = "request_promise_native___request_promise_native_1.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz";
-        sha1 = "5281770f68e0c9719e5163fd3fab482215f4fda5";
+        name = "request_promise_native___request_promise_native_1.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz";
+        sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36";
       };
     }
     {
-      name = "request___request_2.88.0.tgz";
+      name = "request___request_2.88.2.tgz";
       path = fetchurl {
-        name = "request___request_2.88.0.tgz";
-        url  = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz";
-        sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef";
+        name = "request___request_2.88.2.tgz";
+        url  = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz";
+        sha1 = "d73c918731cb5a87da047e207234146f664d12b3";
       };
     }
     {
@@ -10617,6 +11065,14 @@
         sha1 = "1b7ca96073ebb52e741ffd799f6b39ea462c67f5";
       };
     }
+    {
+      name = "responselike___responselike_1.0.2.tgz";
+      path = fetchurl {
+        name = "responselike___responselike_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz";
+        sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7";
+      };
+    }
     {
       name = "restore_cursor___restore_cursor_3.1.0.tgz";
       path = fetchurl {
@@ -10681,6 +11137,14 @@
         sha1 = "49c4e5c2f54a48e990b050926771e2871bcb31ce";
       };
     }
+    {
+      name = "route_recognizer___route_recognizer_0.3.4.tgz";
+      path = fetchurl {
+        name = "route_recognizer___route_recognizer_0.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz";
+        sha1 = "39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3";
+      };
+    }
     {
       name = "rsvp___rsvp_4.8.4.tgz";
       path = fetchurl {
@@ -10753,14 +11217,6 @@
         sha1 = "ed881fd922733a6c461bc189dc2b6c006f3ffded";
       };
     }
-    {
-      name = "sanitize_html___sanitize_html_1.22.0.tgz";
-      path = fetchurl {
-        name = "sanitize_html___sanitize_html_1.22.0.tgz";
-        url  = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.0.tgz";
-        sha1 = "9df779c53cf5755adb2322943c21c1c1dffca7bf";
-      };
-    }
     {
       name = "sass_graph___sass_graph_2.2.4.tgz";
       path = fetchurl {
@@ -10785,6 +11241,14 @@
         sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9";
       };
     }
+    {
+      name = "saxes___saxes_5.0.1.tgz";
+      path = fetchurl {
+        name = "saxes___saxes_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz";
+        sha1 = "eebab953fa3b7608dbe94e5dadb15c888fa6696d";
+      };
+    }
     {
       name = "schema_utils___schema_utils_0.4.5.tgz";
       path = fetchurl {
@@ -10825,6 +11289,14 @@
         sha1 = "8eb06db9a9723333824d3f5530641149847ce5d1";
       };
     }
+    {
+      name = "section_matter___section_matter_1.0.0.tgz";
+      path = fetchurl {
+        name = "section_matter___section_matter_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz";
+        sha1 = "e9041953506780ec01d59f292a19c7b850b84167";
+      };
+    }
     {
       name = "select_hose___select_hose_2.0.0.tgz";
       path = fetchurl {
@@ -10858,11 +11330,11 @@
       };
     }
     {
-      name = "semver_diff___semver_diff_2.1.0.tgz";
+      name = "semver_diff___semver_diff_3.1.1.tgz";
       path = fetchurl {
-        name = "semver_diff___semver_diff_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz";
-        sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
+        name = "semver_diff___semver_diff_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz";
+        sha1 = "05f77ce59f325e00e2706afd67bb506ddb1ca32b";
       };
     }
     {
@@ -11305,14 +11777,6 @@
         sha1 = "23be9635520eb0ff43a741e7e830397266e88445";
       };
     }
-    {
-      name = "srcset___srcset_2.0.1.tgz";
-      path = fetchurl {
-        name = "srcset___srcset_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/srcset/-/srcset-2.0.1.tgz";
-        sha1 = "8f842d357487eb797f413d9c309de7a5149df5ac";
-      };
-    }
     {
       name = "sshpk___sshpk_1.15.2.tgz";
       path = fetchurl {
@@ -11441,6 +11905,14 @@
         sha1 = "8167d8496ed9f19f05ee4b158d9611321b8cacd9";
       };
     }
+    {
+      name = "string_hash___string_hash_1.1.3.tgz";
+      path = fetchurl {
+        name = "string_hash___string_hash_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz";
+        sha1 = "e8aafc0ac1855b4666929ed7dd1275df5d6c811b";
+      };
+    }
     {
       name = "string_length___string_length_2.0.0.tgz";
       path = fetchurl {
@@ -11474,11 +11946,11 @@
       };
     }
     {
-      name = "string_width___string_width_4.1.0.tgz";
+      name = "string_width___string_width_4.2.0.tgz";
       path = fetchurl {
-        name = "string_width___string_width_4.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz";
-        sha1 = "ba846d1daa97c3c596155308063e075ed1c99aff";
+        name = "string_width___string_width_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz";
+        sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5";
       };
     }
     {
@@ -11545,6 +12017,22 @@
         sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae";
       };
     }
+    {
+      name = "strip_ansi___strip_ansi_6.0.0.tgz";
+      path = fetchurl {
+        name = "strip_ansi___strip_ansi_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz";
+        sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532";
+      };
+    }
+    {
+      name = "strip_bom_string___strip_bom_string_1.0.0.tgz";
+      path = fetchurl {
+        name = "strip_bom_string___strip_bom_string_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz";
+        sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92";
+      };
+    }
     {
       name = "strip_bom___strip_bom_2.0.0.tgz";
       path = fetchurl {
@@ -11698,19 +12186,11 @@
       };
     }
     {
-      name = "svg4everybody___svg4everybody_2.1.9.tgz";
+      name = "swagger_ui_dist___swagger_ui_dist_3.32.4.tgz";
       path = fetchurl {
-        name = "svg4everybody___svg4everybody_2.1.9.tgz";
-        url  = "https://registry.yarnpkg.com/svg4everybody/-/svg4everybody-2.1.9.tgz";
-        sha1 = "5bd9f6defc133859a044646d4743fabc28db7e2d";
-      };
-    }
-    {
-      name = "swagger_ui_dist___swagger_ui_dist_3.26.2.tgz";
-      path = fetchurl {
-        name = "swagger_ui_dist___swagger_ui_dist_3.26.2.tgz";
-        url  = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.26.2.tgz";
-        sha1 = "22c700906c8911b1c9956da6c3fca371dba6219f";
+        name = "swagger_ui_dist___swagger_ui_dist_3.32.4.tgz";
+        url  = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.32.4.tgz";
+        sha1 = "6fa920a99e38eaaf129580ac158cf730494a2190";
       };
     }
     {
@@ -11722,11 +12202,11 @@
       };
     }
     {
-      name = "symbol_tree___symbol_tree_3.2.2.tgz";
+      name = "symbol_tree___symbol_tree_3.2.4.tgz";
       path = fetchurl {
-        name = "symbol_tree___symbol_tree_3.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz";
-        sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6";
+        name = "symbol_tree___symbol_tree_3.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz";
+        sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2";
       };
     }
     {
@@ -11770,19 +12250,11 @@
       };
     }
     {
-      name = "tar___tar_4.4.8.tgz";
+      name = "term_size___term_size_2.2.0.tgz";
       path = fetchurl {
-        name = "tar___tar_4.4.8.tgz";
-        url  = "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz";
-        sha1 = "b19eec3fde2a96e64666df9fdb40c5ca1bc3747d";
-      };
-    }
-    {
-      name = "term_size___term_size_1.2.0.tgz";
-      path = fetchurl {
-        name = "term_size___term_size_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz";
-        sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
+        name = "term_size___term_size_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz";
+        sha1 = "1f16adedfe9bdc18800e1776821734086fcc6753";
       };
     }
     {
@@ -11897,14 +12369,6 @@
         sha1 = "724e8c8833e3490676c7bb0a75f5daf20e558028";
       };
     }
-    {
-      name = "timed_out___timed_out_4.0.1.tgz";
-      path = fetchurl {
-        name = "timed_out___timed_out_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz";
-        sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
-      };
-    }
     {
       name = "timers_browserify___timers_browserify_2.0.10.tgz";
       path = fetchurl {
@@ -12009,6 +12473,14 @@
         sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af";
       };
     }
+    {
+      name = "to_readable_stream___to_readable_stream_1.0.0.tgz";
+      path = fetchurl {
+        name = "to_readable_stream___to_readable_stream_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz";
+        sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771";
+      };
+    }
     {
       name = "to_regex_range___to_regex_range_2.1.1.tgz";
       path = fetchurl {
@@ -12058,11 +12530,19 @@
       };
     }
     {
-      name = "tough_cookie___tough_cookie_2.4.3.tgz";
+      name = "tough_cookie___tough_cookie_2.5.0.tgz";
       path = fetchurl {
-        name = "tough_cookie___tough_cookie_2.4.3.tgz";
-        url  = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz";
-        sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781";
+        name = "tough_cookie___tough_cookie_2.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz";
+        sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2";
+      };
+    }
+    {
+      name = "tough_cookie___tough_cookie_3.0.1.tgz";
+      path = fetchurl {
+        name = "tough_cookie___tough_cookie_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz";
+        sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2";
       };
     }
     {
@@ -12074,11 +12554,19 @@
       };
     }
     {
-      name = "tributejs___tributejs_4.1.3.tgz";
+      name = "tr46___tr46_2.0.2.tgz";
       path = fetchurl {
-        name = "tributejs___tributejs_4.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/tributejs/-/tributejs-4.1.3.tgz";
-        sha1 = "2e1be7d9a1e403ed4c394f91d859812267e4691c";
+        name = "tr46___tr46_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz";
+        sha1 = "03273586def1595ae08fedb38d7733cee91d2479";
+      };
+    }
+    {
+      name = "tributejs___tributejs_5.1.3.tgz";
+      path = fetchurl {
+        name = "tributejs___tributejs_5.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/tributejs/-/tributejs-5.1.3.tgz";
+        sha1 = "980600fc72865be5868893078b4bfde721129eae";
       };
     }
     {
@@ -12153,14 +12641,6 @@
         sha1 = "027b69fa823225e551cace3ef03b11f6ab37c1d7";
       };
     }
-    {
-      name = "ts_invariant___ts_invariant_0.3.2.tgz";
-      path = fetchurl {
-        name = "ts_invariant___ts_invariant_0.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.2.tgz";
-        sha1 = "89a2ffeb70879b777258df1df1c59383c35209b0";
-      };
-    }
     {
       name = "ts_invariant___ts_invariant_0.4.4.tgz";
       path = fetchurl {
@@ -12178,11 +12658,11 @@
       };
     }
     {
-      name = "tslib___tslib_1.11.1.tgz";
+      name = "tslib___tslib_1.13.0.tgz";
       path = fetchurl {
-        name = "tslib___tslib_1.11.1.tgz";
-        url  = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz";
-        sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35";
+        name = "tslib___tslib_1.13.0.tgz";
+        url  = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz";
+        sha1 = "c881e13cc7015894ed914862d276436fa9a47043";
       };
     }
     {
@@ -12225,6 +12705,14 @@
         sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
       };
     }
+    {
+      name = "type_detect___type_detect_4.0.8.tgz";
+      path = fetchurl {
+        name = "type_detect___type_detect_4.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz";
+        sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c";
+      };
+    }
     {
       name = "type_fest___type_fest_0.5.2.tgz";
       path = fetchurl {
@@ -12249,6 +12737,14 @@
         sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131";
       };
     }
+    {
+      name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz";
+      path = fetchurl {
+        name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz";
+        sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080";
+      };
+    }
     {
       name = "typedarray___typedarray_0.0.6.tgz";
       path = fetchurl {
@@ -12321,14 +12817,6 @@
         sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
       };
     }
-    {
-      name = "unfetch___unfetch_4.1.0.tgz";
-      path = fetchurl {
-        name = "unfetch___unfetch_4.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz";
-        sha1 = "6ec2dd0de887e58a4dee83a050ded80ffc4137db";
-      };
-    }
     {
       name = "unherit___unherit_1.1.1.tgz";
       path = fetchurl {
@@ -12354,11 +12842,11 @@
       };
     }
     {
-      name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz";
+      name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz";
       path = fetchurl {
-        name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz";
-        sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277";
+        name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz";
+        sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531";
       };
     }
     {
@@ -12410,11 +12898,11 @@
       };
     }
     {
-      name = "unique_string___unique_string_1.0.0.tgz";
+      name = "unique_string___unique_string_2.0.0.tgz";
       path = fetchurl {
-        name = "unique_string___unique_string_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz";
-        sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
+        name = "unique_string___unique_string_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz";
+        sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d";
       };
     }
     {
@@ -12490,27 +12978,11 @@
       };
     }
     {
-      name = "unzip_response___unzip_response_2.0.1.tgz";
+      name = "update_notifier___update_notifier_4.1.0.tgz";
       path = fetchurl {
-        name = "unzip_response___unzip_response_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz";
-        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
-      };
-    }
-    {
-      name = "upath___upath_1.2.0.tgz";
-      path = fetchurl {
-        name = "upath___upath_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz";
-        sha1 = "8f66dbcd55a883acdae4408af8b035a5044c1894";
-      };
-    }
-    {
-      name = "update_notifier___update_notifier_2.5.0.tgz";
-      path = fetchurl {
-        name = "update_notifier___update_notifier_2.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz";
-        sha1 = "d0744593e13f161e406acb1d9408b72cad08aff6";
+        name = "update_notifier___update_notifier_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz";
+        sha1 = "4866b98c3bc5b5473c020b1250583628f9a328f3";
       };
     }
     {
@@ -12546,11 +13018,11 @@
       };
     }
     {
-      name = "url_parse_lax___url_parse_lax_1.0.0.tgz";
+      name = "url_parse_lax___url_parse_lax_3.0.0.tgz";
       path = fetchurl {
-        name = "url_parse_lax___url_parse_lax_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz";
-        sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73";
+        name = "url_parse_lax___url_parse_lax_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz";
+        sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c";
       };
     }
     {
@@ -12649,6 +13121,14 @@
         sha1 = "1b4af4955eb3077c501c23872fc6513811587131";
       };
     }
+    {
+      name = "uuid___uuid_8.1.0.tgz";
+      path = fetchurl {
+        name = "uuid___uuid_8.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz";
+        sha1 = "6f1536eb43249f473abc6bd58ff983da1ca30d8d";
+      };
+    }
     {
       name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz";
       path = fetchurl {
@@ -12729,6 +13209,86 @@
         sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
       };
     }
+    {
+      name = "vscode_json_languageservice___vscode_json_languageservice_3.7.0.tgz";
+      path = fetchurl {
+        name = "vscode_json_languageservice___vscode_json_languageservice_3.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.7.0.tgz";
+        sha1 = "0174417f139cf41dd60c84538fd052385bfb46f6";
+      };
+    }
+    {
+      name = "vscode_jsonrpc___vscode_jsonrpc_4.0.0.tgz";
+      path = fetchurl {
+        name = "vscode_jsonrpc___vscode_jsonrpc_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz";
+        sha1 = "a7bf74ef3254d0a0c272fab15c82128e378b3be9";
+      };
+    }
+    {
+      name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.14.1.tgz";
+      path = fetchurl {
+        name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.14.1.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz";
+        sha1 = "b8aab6afae2849c84a8983d39a1cf742417afe2f";
+      };
+    }
+    {
+      name = "vscode_languageserver_textdocument___vscode_languageserver_textdocument_1.0.1.tgz";
+      path = fetchurl {
+        name = "vscode_languageserver_textdocument___vscode_languageserver_textdocument_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz";
+        sha1 = "178168e87efad6171b372add1dea34f53e5d330f";
+      };
+    }
+    {
+      name = "vscode_languageserver_types___vscode_languageserver_types_3.14.0.tgz";
+      path = fetchurl {
+        name = "vscode_languageserver_types___vscode_languageserver_types_3.14.0.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz";
+        sha1 = "d3b5952246d30e5241592b6dde8280e03942e743";
+      };
+    }
+    {
+      name = "vscode_languageserver_types___vscode_languageserver_types_3.15.1.tgz";
+      path = fetchurl {
+        name = "vscode_languageserver_types___vscode_languageserver_types_3.15.1.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz";
+        sha1 = "17be71d78d2f6236d414f0001ce1ef4d23e6b6de";
+      };
+    }
+    {
+      name = "vscode_languageserver___vscode_languageserver_5.2.1.tgz";
+      path = fetchurl {
+        name = "vscode_languageserver___vscode_languageserver_5.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz";
+        sha1 = "0d2feddd33f92aadf5da32450df498d52f6f14eb";
+      };
+    }
+    {
+      name = "vscode_nls___vscode_nls_4.1.2.tgz";
+      path = fetchurl {
+        name = "vscode_nls___vscode_nls_4.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz";
+        sha1 = "ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167";
+      };
+    }
+    {
+      name = "vscode_uri___vscode_uri_1.0.8.tgz";
+      path = fetchurl {
+        name = "vscode_uri___vscode_uri_1.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz";
+        sha1 = "9769aaececae4026fb6e22359cb38946580ded59";
+      };
+    }
+    {
+      name = "vscode_uri___vscode_uri_2.1.2.tgz";
+      path = fetchurl {
+        name = "vscode_uri___vscode_uri_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz";
+        sha1 = "c8d40de93eb57af31f3c715dd650e2ca2c096f1c";
+      };
+    }
     {
       name = "vue_apollo___vue_apollo_3.0.3.tgz";
       path = fetchurl {
@@ -12778,11 +13338,11 @@
       };
     }
     {
-      name = "vue_router___vue_router_3.0.2.tgz";
+      name = "vue_router___vue_router_3.4.3.tgz";
       path = fetchurl {
-        name = "vue_router___vue_router_3.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.2.tgz";
-        sha1 = "dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be";
+        name = "vue_router___vue_router_3.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.3.tgz";
+        sha1 = "fa93768616ee338aa174f160ac965167fa572ffa";
       };
     }
     {
@@ -12842,19 +13402,19 @@
       };
     }
     {
-      name = "vuex___vuex_3.1.0.tgz";
+      name = "vuex___vuex_3.5.1.tgz";
       path = fetchurl {
-        name = "vuex___vuex_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/vuex/-/vuex-3.1.0.tgz";
-        sha1 = "634b81515cf0cfe976bd1ffe9601755e51f843b9";
+        name = "vuex___vuex_3.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/vuex/-/vuex-3.5.1.tgz";
+        sha1 = "f1b8dcea649bc25254cf4f4358081dbf5da18b3d";
       };
     }
     {
-      name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz";
+      name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz";
       path = fetchurl {
-        name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz";
-        sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045";
+        name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz";
+        sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd";
       };
     }
     {
@@ -12865,6 +13425,14 @@
         sha1 = "4e2219663760fd6535b7a1550f1552d71fc9372c";
       };
     }
+    {
+      name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz";
+      path = fetchurl {
+        name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz";
+        sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a";
+      };
+    }
     {
       name = "walker___walker_1.0.7.tgz";
       path = fetchurl {
@@ -12874,11 +13442,19 @@
       };
     }
     {
-      name = "watchpack___watchpack_1.6.0.tgz";
+      name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz";
       path = fetchurl {
-        name = "watchpack___watchpack_1.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz";
-        sha1 = "4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00";
+        name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz";
+        sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0";
+      };
+    }
+    {
+      name = "watchpack___watchpack_1.7.2.tgz";
+      path = fetchurl {
+        name = "watchpack___watchpack_1.7.2.tgz";
+        url  = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz";
+        sha1 = "c02e4d4d49913c3e7e122c3325365af9d331e9aa";
       };
     }
     {
@@ -12889,6 +13465,14 @@
         sha1 = "c1d8d149316d3ea852848895cb6a0bfe887b87df";
       };
     }
+    {
+      name = "web_vitals___web_vitals_0.2.4.tgz";
+      path = fetchurl {
+        name = "web_vitals___web_vitals_0.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/web-vitals/-/web-vitals-0.2.4.tgz";
+        sha1 = "ec3df43c834a207fd7cdefd732b2987896e08511";
+      };
+    }
     {
       name = "webidl_conversions___webidl_conversions_4.0.2.tgz";
       path = fetchurl {
@@ -12897,6 +13481,22 @@
         sha1 = "a855980b1f0b6b359ba1d5d9fb39ae941faa63ad";
       };
     }
+    {
+      name = "webidl_conversions___webidl_conversions_5.0.0.tgz";
+      path = fetchurl {
+        name = "webidl_conversions___webidl_conversions_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz";
+        sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff";
+      };
+    }
+    {
+      name = "webidl_conversions___webidl_conversions_6.1.0.tgz";
+      path = fetchurl {
+        name = "webidl_conversions___webidl_conversions_6.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz";
+        sha1 = "9111b4d7ea80acd40f5270d666621afa78b69514";
+      };
+    }
     {
       name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.6.0.tgz";
       path = fetchurl {
@@ -13009,6 +13609,14 @@
         sha1 = "fde926fa54a599f3adf82dff25a9f7be02dc6edd";
       };
     }
+    {
+      name = "whatwg_url___whatwg_url_8.1.0.tgz";
+      path = fetchurl {
+        name = "whatwg_url___whatwg_url_8.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.1.0.tgz";
+        sha1 = "c628acdcf45b82274ce7281ee31dd3c839791771";
+      };
+    }
     {
       name = "which_module___which_module_1.0.0.tgz";
       path = fetchurl {
@@ -13042,11 +13650,11 @@
       };
     }
     {
-      name = "widest_line___widest_line_2.0.0.tgz";
+      name = "widest_line___widest_line_3.1.0.tgz";
       path = fetchurl {
-        name = "widest_line___widest_line_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz";
-        sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273";
+        name = "widest_line___widest_line_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz";
+        sha1 = "8292333bbf66cb45ff0de1603b136b7ae1496eca";
       };
     }
     {
@@ -13113,6 +13721,14 @@
         sha1 = "d0b05463c188ae804396fd5ab2a370062af87529";
       };
     }
+    {
+      name = "write_file_atomic___write_file_atomic_3.0.3.tgz";
+      path = fetchurl {
+        name = "write_file_atomic___write_file_atomic_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz";
+        sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8";
+      };
+    }
     {
       name = "write___write_1.0.3.tgz";
       path = fetchurl {
@@ -13137,6 +13753,14 @@
         sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb";
       };
     }
+    {
+      name = "ws___ws_7.3.0.tgz";
+      path = fetchurl {
+        name = "ws___ws_7.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz";
+        sha1 = "4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd";
+      };
+    }
     {
       name = "ws___ws_3.3.3.tgz";
       path = fetchurl {
@@ -13154,11 +13778,19 @@
       };
     }
     {
-      name = "xdg_basedir___xdg_basedir_3.0.0.tgz";
+      name = "xdg_basedir___xdg_basedir_4.0.0.tgz";
       path = fetchurl {
-        name = "xdg_basedir___xdg_basedir_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz";
-        sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
+        name = "xdg_basedir___xdg_basedir_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz";
+        sha1 = "4bc8d9984403696225ef83a1573cbbcb4e79db13";
+      };
+    }
+    {
+      name = "xhr_mock___xhr_mock_2.5.1.tgz";
+      path = fetchurl {
+        name = "xhr_mock___xhr_mock_2.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/xhr-mock/-/xhr-mock-2.5.1.tgz";
+        sha1 = "c591498a8269cc1ce5fefac20d590357affd348b";
       };
     }
     {
@@ -13201,6 +13833,14 @@
         sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d";
       };
     }
+    {
+      name = "xmlchars___xmlchars_2.2.0.tgz";
+      path = fetchurl {
+        name = "xmlchars___xmlchars_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz";
+        sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb";
+      };
+    }
     {
       name = "xmlcreate___xmlcreate_1.0.2.tgz";
       path = fetchurl {
@@ -13354,11 +13994,11 @@
       };
     }
     {
-      name = "zen_observable_ts___zen_observable_ts_0.8.18.tgz";
+      name = "zen_observable_ts___zen_observable_ts_0.8.21.tgz";
       path = fetchurl {
-        name = "zen_observable_ts___zen_observable_ts_0.8.18.tgz";
-        url  = "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz";
-        sha1 = "ade44b1060cc4a800627856ec10b9c67f5f639c8";
+        name = "zen_observable_ts___zen_observable_ts_0.8.21.tgz";
+        url  = "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz";
+        sha1 = "85d0031fbbde1eba3cd07d3ba90da241215f421d";
       };
     }
     {

From f98a6322e6c91aabb56f909d961b0977b221c290 Mon Sep 17 00:00:00 2001
From: Jeff Slight <jslight90@gmail.com>
Date: Mon, 28 Sep 2020 17:41:25 -0700
Subject: [PATCH 3072/3942] nixos/gitlab: add changes for gitlab 13.4.x

---
 nixos/modules/services/misc/gitlab.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 122bc3000b41..56fd89c61232 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -43,9 +43,13 @@ let
 
     [gitlab-shell]
     dir = "${cfg.packages.gitlab-shell}"
+
+    [gitlab]
     secret_file = "${cfg.statePath}/gitlab_shell_secret"
-    gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}"
-    http_settings = { self_signed_cert = false }
+    url = "http+unix://${pathUrlQuote gitlabSocket}"
+
+    [gitlab.http-settings]
+    self_signed_cert = false
 
     ${concatStringsSep "\n" (attrValues (mapAttrs (k: v: ''
     [[storage]]
@@ -119,6 +123,7 @@ let
         receive_pack = true;
       };
       workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
+      gitlab_kas.secret_file = "${cfg.statePath}/.gitlab_kas_secret";
       git.bin_path = "git";
       monitoring = {
         ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
@@ -668,6 +673,7 @@ in {
             rm "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}"
         fi
         $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm"
+        $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS btree_gist;"
       '';
 
       serviceConfig = {

From 2cf524c825855b22c9870bb273f38424172af968 Mon Sep 17 00:00:00 2001
From: Jeff Slight <jslight90@gmail.com>
Date: Tue, 29 Sep 2020 13:39:23 -0700
Subject: [PATCH 3073/3942] gitlab: add new line to end of data.json file

---
 pkgs/applications/version-management/gitlab/data.json | 2 +-
 pkgs/applications/version-management/gitlab/update.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 0c6f40550f96..ca7ea78e4f7c 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -10,4 +10,4 @@
     "GITLAB_SHELL_VERSION": "13.7.0",
     "GITLAB_WORKHORSE_VERSION": "8.46.0"
   }
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index 3db5099598a7..98d994f00038 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -117,6 +117,7 @@ def update_data(rev: str):
 
     with open(data_file_path.as_posix(), 'w') as f:
         json.dump(data, f, indent=2)
+        f.write("\n")
 
 
 @cli.command('update-rubyenv')

From 4555a26b06d5861cefb2c7fd13053f0bcbbde6e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
Date: Thu, 22 Oct 2020 13:04:51 +0200
Subject: [PATCH 3074/3942] gitlab: 13.4.3 -> 13.5.1

---
 .../version-management/gitlab/data.json       |   14 +-
 .../version-management/gitlab/default.nix     |    3 +-
 .../version-management/gitlab/gitaly/Gemfile  |    4 +-
 .../gitlab/gitaly/Gemfile.lock                |   59 +-
 .../gitlab/gitaly/default.nix                 |    4 +-
 .../version-management/gitlab/gitaly/deps.nix |  223 +-
 .../gitlab/gitaly/gemset.nix                  |  119 +-
 .../gitlab/gitlab-shell/default.nix           |    4 +-
 .../gitlab/gitlab-shell/deps.nix              |  253 +-
 .../remove-hardcoded-locations.patch          |   21 +-
 .../gitlab/gitlab-workhorse/default.nix       |   14 +-
 .../gitlab/gitlab-workhorse/deps.nix          |  331 ++-
 .../version-management/gitlab/rubyEnv/Gemfile |   46 +-
 .../gitlab/rubyEnv/Gemfile.lock               |  230 +-
 .../gitlab/rubyEnv/gemset.nix                 |  256 +-
 .../version-management/gitlab/yarnPkgs.nix    | 2128 +++++++++--------
 16 files changed, 2178 insertions(+), 1531 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index ca7ea78e4f7c..a235462ce545 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
 {
-  "version": "13.4.3",
-  "repo_hash": "19nk692ik26qcc1gcvbbrvadg6169v34gd8h7d5bwfjk12idj1id",
+  "version": "13.5.1",
+  "repo_hash": "1mb2kyyf5bczm93qn4nj3fqjgncsq98rr3414wx52lhcf4gl5w00",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v13.4.3-ee",
+  "rev": "v13.5.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "13.4.3",
-    "GITLAB_PAGES_VERSION": "1.25.0",
-    "GITLAB_SHELL_VERSION": "13.7.0",
-    "GITLAB_WORKHORSE_VERSION": "8.46.0"
+    "GITALY_SERVER_VERSION": "13.5.1",
+    "GITLAB_PAGES_VERSION": "1.28.0",
+    "GITLAB_SHELL_VERSION": "13.11.0",
+    "GITLAB_WORKHORSE_VERSION": "8.51.0"
   }
 }
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 549d1a1f5601..ee6c8201fa3f 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -93,8 +93,9 @@ let
 
       bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production
       bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production
-      bundle exec rake webpack:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=3072"
+      bundle exec rake gitlab:assets:compile_webpack_if_needed RAILS_ENV=production NODE_ENV=production
       bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production
+      bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production
 
       runHook postBuild
     '';
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index cdb388b5d8df..9016a64a0873 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -4,9 +4,9 @@ source 'https://rubygems.org'
 gem 'bundler', '>= 1.17.3'
 
 gem 'rugged', '~> 0.28'
-gem 'github-linguist', '~> 7.9', require: 'linguist'
+gem 'github-linguist', '~> 7.11', require: 'linguist'
 gem 'gitlab-markup', '~> 1.7.1'
-gem 'activesupport', '~> 6.0.3.1'
+gem 'activesupport', '~> 6.0.3.3'
 gem 'rdoc', '~> 6.0'
 gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false
 gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index 143409eba6b5..451150f0eb3a 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -2,20 +2,20 @@ GEM
   remote: https://rubygems.org/
   specs:
     abstract_type (0.0.7)
-    actionpack (6.0.3.1)
-      actionview (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionpack (6.0.3.3)
+      actionview (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionview (6.0.3.3)
+      activesupport (= 6.0.3.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -29,12 +29,12 @@ GEM
     ast (2.4.0)
     binding_ninja (0.2.3)
     builder (3.2.4)
-    charlock_holmes (0.7.6)
+    charlock_holmes (0.7.7)
     coderay (1.1.2)
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
@@ -50,8 +50,8 @@ GEM
     ffi (1.13.1)
     gemojione (3.3.0)
       json
-    github-linguist (7.9.0)
-      charlock_holmes (~> 0.7.6)
+    github-linguist (7.11.0)
+      charlock_holmes (~> 0.7.7)
       escape_utils (~> 1.2.0)
       mini_mime (~> 1.0)
       rugged (>= 0.25.1)
@@ -83,18 +83,17 @@ GEM
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.30.2)
     hashdiff (0.3.9)
-    i18n (1.8.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     jaeger-client (0.10.0)
       opentracing (~> 0.3)
       thrift
-    jaro_winkler (1.5.2)
-    json (2.2.0)
+    json (2.3.1)
     licensee (8.9.2)
       rugged (~> 0.24)
     listen (0.5.3)
-    loofah (2.5.0)
+    loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     memoizable (0.4.2)
@@ -105,7 +104,7 @@ GEM
     mime-types-data (3.2020.0512)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.2)
     msgpack (1.3.3)
     multipart-post (2.1.1)
     nokogiri (1.10.10)
@@ -114,7 +113,7 @@ GEM
       nokogiri
     opentracing (0.5.0)
     optimist (3.0.1)
-    parallel (1.17.0)
+    parallel (1.19.2)
     parser (2.7.0.5)
       ast (~> 2.4.0)
     proc_to_ast (0.1.0)
@@ -126,7 +125,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.3)
-    rack (2.1.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -141,7 +140,9 @@ GEM
       optimist (>= 3.0.0)
     rdoc (6.2.0)
     redis (4.1.3)
-    rouge (3.20.0)
+    regexp_parser (1.8.1)
+    rexml (3.2.4)
+    rouge (3.24.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -161,14 +162,18 @@ GEM
       rspec (>= 2.13, < 4)
       unparser
     rspec-support (3.8.0)
-    rubocop (0.69.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.86.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.2.0)
+      parser (>= 2.7.0.1)
+    ruby-progressbar (1.10.1)
     rugged (0.28.4.1)
     safe_yaml (1.0.5)
     sanitize (4.6.6)
@@ -188,7 +193,7 @@ GEM
     timecop (0.9.1)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
     unparser (0.4.7)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
@@ -202,17 +207,17 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 6.0.3.1)
+  activesupport (~> 6.0.3.3)
   bundler (>= 1.17.3)
   factory_bot
   faraday (~> 1.0)
-  github-linguist (~> 7.9)
+  github-linguist (~> 7.11)
   gitlab-gollum-lib (~> 4.2.7.9)
   gitlab-gollum-rugged_adapter (~> 0.4.4.2)
   gitlab-labkit (~> 0.12.0)
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 91fbc657b2f0..0b1774e440a7 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -19,14 +19,14 @@ let
       };
   };
 in buildGoPackage rec {
-  version = "13.4.3";
+  version = "13.5.1";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "0gyy8l3xbdrpbq8zmdqvn7x34hxc48in4klhw5klacs1mgi3vqax";
+    sha256 = "1vkifmp56lkgj178na7pqd5h9yxffcy78yaz7ykd4rmgi4c8ayk8";
   };
 
   # Fix a check which assumes that hook files are writeable by their
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
index 95a7750efa7b..3aec5d10186f 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@@ -117,6 +117,15 @@
       sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
     };
   }
+  {
+    goPackagePath = "github.com/alexbrainman/sspi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alexbrainman/sspi";
+      rev = "4729b3d4d858";
+      sha256 = "12xy7gi9v48z8akm6h33qjk3m06f5nw1q15a6y2r61pd404bkdyc";
+    };
+  }
   {
     goPackagePath = "github.com/armon/consul-api";
     fetch = {
@@ -135,6 +144,15 @@
       sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4";
     };
   }
+  {
+    goPackagePath = "github.com/avast/retry-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/avast/retry-go";
+      rev = "v2.4.2";
+      sha256 = "0hb4b1668516a4gv8avmflr565b6c1h93phdb068hcjxxj8767ba";
+    };
+  }
   {
     goPackagePath = "github.com/beorn7/perks";
     fetch = {
@@ -315,6 +333,15 @@
       sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix";
     };
   }
+  {
+    goPackagePath = "github.com/dpotapov/go-spnego";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dpotapov/go-spnego";
+      rev = "c2c609116ad0";
+      sha256 = "1ba14j1y8sjlagx7rfjmvdwlyc90qblpplfb0p3zwsj8chqaijgf";
+    };
+  }
   {
     goPackagePath = "github.com/dustin/go-humanize";
     fetch = {
@@ -432,6 +459,51 @@
       sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d";
     };
   }
+  {
+    goPackagePath = "github.com/git-lfs/git-lfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/git-lfs/git-lfs";
+      rev = "9ea4eed5b112";
+      sha256 = "02xx8iw48zyccfxm30kc3r3hgwhc64yfrcy7c2bv4b1hqn09wwnz";
+    };
+  }
+  {
+    goPackagePath = "github.com/git-lfs/gitobj";
+    fetch = {
+      type = "git";
+      url = "https://github.com/git-lfs/gitobj";
+      rev = "v2.0.0";
+      sha256 = "15x3q3ad50jyi6rjjw4siw6gxcp1ppwwhmzq3916vs186b0rqdyv";
+    };
+  }
+  {
+    goPackagePath = "github.com/git-lfs/go-netrc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/git-lfs/go-netrc";
+      rev = "e0e9ca483a18";
+      sha256 = "16djli5hasqm4js2d72msk32ym0y5jmk3a4634nrgbncjksnfihi";
+    };
+  }
+  {
+    goPackagePath = "github.com/git-lfs/go-ntlm";
+    fetch = {
+      type = "git";
+      url = "https://github.com/git-lfs/go-ntlm";
+      rev = "c5056e7fa066";
+      sha256 = "1wrv3aczz0g4wqxjw5pvyy9z1cvj2b33q84h5mprik0f1hwyfwnh";
+    };
+  }
+  {
+    goPackagePath = "github.com/git-lfs/wildmatch";
+    fetch = {
+      type = "git";
+      url = "https://github.com/git-lfs/wildmatch";
+      rev = "v1.0.4";
+      sha256 = "19k8a9j9l0ddlv3asxnn7bblryz674fpm9dg8ds0s74fhix6a5dr";
+    };
+  }
   {
     goPackagePath = "github.com/go-check/check";
     fetch = {
@@ -572,8 +644,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gogo/protobuf";
-      rev = "v1.1.1";
-      sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
+      rev = "v1.2.1";
+      sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m";
     };
   }
   {
@@ -765,6 +837,15 @@
       sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49";
     };
   }
+  {
+    goPackagePath = "github.com/hashicorp/go-uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-uuid";
+      rev = "v1.0.2";
+      sha256 = "1azjn5a03cv0bdab3clmkfz8g9807nxxjwy9i7dy73p7d4sikhja";
+    };
+  }
   {
     goPackagePath = "github.com/hashicorp/go-version";
     fetch = {
@@ -864,6 +945,15 @@
       sha256 = "1a1lk2ll2xv3ljffmfw4q8mqqw727pj8dzs6c8g2hh0b0b050g79";
     };
   }
+  {
+    goPackagePath = "github.com/jcmturner/gofork";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jcmturner/gofork";
+      rev = "v1.0.0";
+      sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr";
+    };
+  }
   {
     goPackagePath = "github.com/joho/godotenv";
     fetch = {
@@ -990,6 +1080,15 @@
       sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw";
     };
   }
+  {
+    goPackagePath = "github.com/kisielk/errcheck";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kisielk/errcheck";
+      rev = "v1.1.0";
+      sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y";
+    };
+  }
   {
     goPackagePath = "github.com/kisielk/gotool";
     fetch = {
@@ -1022,8 +1121,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/konsorten/go-windows-terminal-sequences";
-      rev = "v1.0.2";
-      sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
+      rev = "v1.0.3";
+      sha256 = "1yrsd4s8vhjnxhwbigirymz89dn6qfjnhn28i33vvvdgf96j6ypl";
     };
   }
   {
@@ -1130,8 +1229,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-isatty";
-      rev = "v0.0.9";
-      sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m";
+      rev = "v0.0.12";
+      sha256 = "1dfsh27d52wmz0nmmzm2382pfrs2fcijvh6cgir7jbb4pnigr5w4";
     };
   }
   {
@@ -1305,6 +1404,15 @@
       sha256 = "1f4mwdh501p8105nfxayprlj5ld14fwzyyy2wbc04xk3wrm1wzlf";
     };
   }
+  {
+    goPackagePath = "github.com/olekukonko/ts";
+    fetch = {
+      type = "git";
+      url = "https://github.com/olekukonko/ts";
+      rev = "78ecb04241c0";
+      sha256 = "0k88n5rvs5k5zalbfa7c71jkjb8dhpk83s425z728qn6aq49c978";
+    };
+  }
   {
     goPackagePath = "github.com/onsi/ginkgo";
     fetch = {
@@ -1364,8 +1472,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev = "v1.2.0";
-      sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
+      rev = "v1.8.1";
+      sha256 = "1pi1r9ds0vxjza4qrbk52y98wxrzh1ghwzc9c2v1w6i02pdwdcz9";
     };
   }
   {
@@ -1467,6 +1575,15 @@
       sha256 = "0z7y7vsnzjswx51g9hlawnzmwnb8c7rks6ljzf6m1xbimhi4n3kz";
     };
   }
+  {
+    goPackagePath = "github.com/rubyist/tracerx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rubyist/tracerx";
+      rev = "787959303086";
+      sha256 = "1xj5213r00zjhb7d2l6wlwv62g6mss50jwjpf7g8fk8djv3l29zz";
+    };
+  }
   {
     goPackagePath = "github.com/russross/blackfriday";
     fetch = {
@@ -1517,8 +1634,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/sirupsen/logrus";
-      rev = "v1.4.2";
-      sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x";
+      rev = "v1.6.0";
+      sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj";
     };
   }
   {
@@ -1593,6 +1710,15 @@
       sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh";
     };
   }
+  {
+    goPackagePath = "github.com/ssgelm/cookiejarparser";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ssgelm/cookiejarparser";
+      rev = "v1.0.1";
+      sha256 = "0fnm53br0cg3iwzniil0lh9w4xd6xpzfypwfpdiammfqavlqgcw4";
+    };
+  }
   {
     goPackagePath = "github.com/stretchr/objx";
     fetch = {
@@ -1607,8 +1733,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "v1.4.0";
-      sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
+      rev = "v1.5.1";
+      sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
     };
   }
   {
@@ -1787,8 +1913,8 @@
     fetch = {
       type = "git";
       url = "https://gitlab.com/gitlab-org/gitlab-shell.git";
-      rev = "82ec8144fb2a";
-      sha256 = "1gh3rwnd6688v7q07g2y69fdz2nyy7disjqifvbl7z1cpfw4h45b";
+      rev = "1a2bfecd2f0e";
+      sha256 = "197b3yn7lp6dbzcgxrj3ns2a839adcfmcwi3h53i1sr6952ciayx";
     };
   }
   {
@@ -1814,8 +1940,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/uber-go/atomic";
-      rev = "v1.3.2";
-      sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
+      rev = "v1.4.0";
+      sha256 = "0c6yzx15c20719xii3dm0vyjd8i9jx45m0wh5yp1zf29b0gbljcy";
     };
   }
   {
@@ -1823,8 +1949,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "87dc89f01550";
-      sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
+      rev = "5c72a883971a";
+      sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d";
     };
   }
   {
@@ -1877,8 +2003,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "6afb5195e5aa";
-      sha256 = "1aiz41q2yxgg3dxfkn33ff54vhaxbiwcps9j3ia1xx4cqxim38zw";
+      rev = "62affa334b73";
+      sha256 = "0v88xr36220wawwck914f90n9zvvc6lcx33ak3iplkwq0xkgw5fr";
     };
   }
   {
@@ -1895,8 +2021,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sync";
-      rev = "cd5d95a43a6e";
-      sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds";
+      rev = "6e8e738ad208";
+      sha256 = "1avk27pszd5l5df6ff7j78wgla46ir1hhy2jwfl9a3c0ys602yx9";
     };
   }
   {
@@ -1904,8 +2030,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "86b910548bc1";
-      sha256 = "1z8l2wp27q0bd4nc46j31lc7cr6kiw52zi6ix3i121pd3rcyrw44";
+      rev = "af09f7315aff";
+      sha256 = "0kr94lzr8ngrc6913j5xh6g4r7g087dbdgnpzi6rjcl0bf8nsr22";
     };
   }
   {
@@ -2052,6 +2178,51 @@
       sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb";
     };
   }
+  {
+    goPackagePath = "gopkg.in/jcmturner/aescts.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/jcmturner/aescts.v1";
+      rev = "v1.0.1";
+      sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/jcmturner/dnsutils.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/jcmturner/dnsutils.v1";
+      rev = "v1.0.1";
+      sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/jcmturner/goidentity.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/jcmturner/goidentity.v2";
+      rev = "v2.0.0";
+      sha256 = "0sfkxrx57dmjlzz4sxfmbsfaxkm32wg6ymjhaga2ggkixlzdd4d7";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/jcmturner/gokrb5.v5";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/jcmturner/gokrb5.v5";
+      rev = "v5.3.0";
+      sha256 = "0jynpkncifdd2ib2pc9qhh0r8q7ab7yw0ygzpzgisdzv8ars1diq";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/jcmturner/rpc.v0";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/jcmturner/rpc.v0";
+      rev = "v0.0.2";
+      sha256 = "0hivgq52gwxsqs5x1my2047k7nqh7wx3yi0llsj3lc3h2mjy4yhd";
+    };
+  }
   {
     goPackagePath = "gopkg.in/mgo.v2";
     fetch = {
@@ -2075,8 +2246,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "v2.2.8";
-      sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
+      rev = "v2.3.0";
+      sha256 = "1md0hlyd9s6myv3663i9l59y74n4xjazifmmyxn43g86fgkc5lzj";
     };
   }
   {
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index d30b3a0a15f0..d09532187203 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -13,10 +13,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1665r4ffqdpykxwpgdnaq7xsaz1nfswc5wjs2qr0npx8bq7g49kh";
+      sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   actionview = {
     dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -24,10 +24,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n21pswh3k7m33vzhxyrbi5lj64b1138yqv34jjhkhlq3474b4rh";
+      sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   activesupport = {
     dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@@ -35,10 +35,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs";
+      sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   adamantium = {
     dependencies = ["ice_nine" "memoizable"];
@@ -89,12 +89,14 @@
     version = "3.2.4";
   };
   charlock_holmes = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
+      sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p";
       type = "gem";
     };
-    version = "0.7.6";
+    version = "0.7.7";
   };
   coderay = {
     source = {
@@ -118,10 +120,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
+      sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
       type = "gem";
     };
-    version = "1.1.6";
+    version = "1.1.7";
   };
   crack = {
     dependencies = ["safe_yaml"];
@@ -233,10 +235,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rhw05d88l928g6y2bngvmr66565b2z822hyynmb13b7khf07y1a";
+      sha256 = "12vwx6msqqdyf10zrrp2zdwr8ixrb82phriyin16rsmndb93cijv";
       type = "gem";
     };
-    version = "7.9.0";
+    version = "7.11.0";
   };
   github-markup = {
     source = {
@@ -347,10 +349,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm";
+      sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "1.8.5";
   };
   ice_nine = {
     source = {
@@ -371,25 +373,15 @@
     };
     version = "0.10.0";
   };
-  jaro_winkler = {
+  json = {
     groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l";
+      sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
       type = "gem";
     };
-    version = "1.5.2";
-  };
-  json = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
-      type = "gem";
-    };
-    version = "2.2.0";
+    version = "2.3.1";
   };
   licensee = {
     dependencies = ["rugged"];
@@ -414,10 +406,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040";
+      sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.7.0";
   };
   memoizable = {
     dependencies = ["thread_safe"];
@@ -480,10 +472,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
+      sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
       type = "gem";
     };
-    version = "5.14.0";
+    version = "5.14.2";
   };
   msgpack = {
     groups = ["default"];
@@ -550,10 +542,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
+      sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
       type = "gem";
     };
-    version = "1.17.0";
+    version = "1.19.2";
   };
   parser = {
     dependencies = ["ast"];
@@ -605,10 +597,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04qa0ry26hxfwkmvhi0fjlvbm8irzg66ahnpx2pp3bl6qbdc0i8w";
+      sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
       type = "gem";
     };
-    version = "2.1.2";
+    version = "2.2.3";
   };
   rack-test = {
     dependencies = ["rack"];
@@ -682,15 +674,35 @@
     };
     version = "4.1.3";
   };
+  regexp_parser = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0n9d14ppshnx71i3mi1pnm3hwhcbb6m6vsc0b0dqgsab8r2rs96n";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  rexml = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
+      type = "gem";
+    };
+    version = "3.2.4";
+  };
   rouge = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic";
+      sha256 = "1igl00gk0vaq4xxk44m7yflqdzsblgxlzcxj8saz96bmx7mg7392";
       type = "gem";
     };
-    version = "3.20.0";
+    version = "3.24.0";
   };
   rspec = {
     dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
@@ -758,23 +770,36 @@
     version = "3.8.0";
   };
   rubocop = {
-    dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
     groups = ["development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cmw8ajaiidvrzjcsljh47f4l3lmcazqrzljgalj3szkr8ibkk5i";
+      sha256 = "1jl3ghxw1bpj272s5s3gl07l2rbd1vwr9z9jmlxxaa2faldn9gms";
       type = "gem";
     };
-    version = "0.69.0";
+    version = "0.86.0";
   };
-  ruby-progressbar = {
+  rubocop-ast = {
+    dependencies = ["parser"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk";
+      sha256 = "1w5rjkwxaxkr2jr1sl5wz0nffal27ik6b1qfzx5skl43vfk2jz97";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "0.2.0";
+  };
+  ruby-progressbar = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
+      type = "gem";
+    };
+    version = "1.10.1";
   };
   rugged = {
     groups = ["default"];
@@ -889,10 +914,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
+      sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.7.0";
   };
   unparser = {
     dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
@@ -927,9 +952,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0";
+      sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
   };
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index 3289697279fa..f918bfb1cab6 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -2,12 +2,12 @@
 
 buildGoPackage rec {
   pname = "gitlab-shell";
-  version = "13.7.0";
+  version = "13.11.0";
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "1gh3rwnd6688v7q07g2y69fdz2nyy7disjqifvbl7z1cpfw4h45b";
+    sha256 = "1m18v5qax14qz0a0ifpl96i4p5caysls33hg93q1x83x1xryxd54";
   };
 
   buildInputs = [ ruby ];
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
index 43da3cd8b0b7..4f841c5fff09 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
@@ -126,13 +126,31 @@
       sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
     };
   }
+  {
+    goPackagePath = "github.com/armon/go-radix";
+    fetch = {
+      type = "git";
+      url = "https://github.com/armon/go-radix";
+      rev = "7fddfc383310";
+      sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4";
+    };
+  }
   {
     goPackagePath = "github.com/beorn7/perks";
     fetch = {
       type = "git";
       url = "https://github.com/beorn7/perks";
-      rev = "v1.0.0";
-      sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
+      rev = "v1.0.1";
+      sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7";
+    };
+  }
+  {
+    goPackagePath = "github.com/bgentry/speakeasy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bgentry/speakeasy";
+      rev = "v0.1.0";
+      sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s";
     };
   }
   {
@@ -194,8 +212,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/cloudflare/tableflip";
-      rev = "8392f1641731";
-      sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8";
+      rev = "4baec9811f2b";
+      sha256 = "095xb5gfz7dglljp91nh68dnscddvlf7q5ivvz972fq86r3ypq6q";
     };
   }
   {
@@ -261,6 +279,15 @@
       sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
     };
   }
+  {
+    goPackagePath = "github.com/denisenkom/go-mssqldb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/denisenkom/go-mssqldb";
+      rev = "cfbb681360f0";
+      sha256 = "0mr4y9vppiyl7mvad74k3zk4sc1jdkmc0lcd6lhm70iziw2xpncs";
+    };
+  }
   {
     goPackagePath = "github.com/dgraph-io/badger";
     fetch = {
@@ -324,6 +351,15 @@
       sha256 = "1yacmwmil625p0pzj800h9dnmiab6bjwfmi48p9fcrvy2yyv9b97";
     };
   }
+  {
+    goPackagePath = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev = "v1.7.0";
+      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+    };
+  }
   {
     goPackagePath = "github.com/fatih/structs";
     fetch = {
@@ -365,7 +401,7 @@
     fetch = {
       type = "git";
       url = "https://github.com/getsentry/raven-go";
-      rev = "v0.1.2";
+      rev = "v0.1.0";
       sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
     };
   }
@@ -450,6 +486,15 @@
       sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh";
     };
   }
+  {
+    goPackagePath = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev = "v1.4.1";
+      sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
+    };
+  }
   {
     goPackagePath = "github.com/go-stack/stack";
     fetch = {
@@ -459,6 +504,42 @@
       sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
     };
   }
+  {
+    goPackagePath = "github.com/gobuffalo/envy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobuffalo/envy";
+      rev = "v1.7.1";
+      sha256 = "1s1f05cgpkhgcs2qfh04ixxm1ggk8ms3fpwsxhb0mx7nfrcm106d";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobuffalo/logger";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobuffalo/logger";
+      rev = "v1.0.1";
+      sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobuffalo/packd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobuffalo/packd";
+      rev = "v0.3.0";
+      sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobuffalo/packr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobuffalo/packr";
+      rev = "v2.7.1";
+      sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9";
+    };
+  }
   {
     goPackagePath = "github.com/gobwas/httphead";
     fetch = {
@@ -495,6 +576,15 @@
       sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
     };
   }
+  {
+    goPackagePath = "github.com/golang-sql/civil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang-sql/civil";
+      rev = "cb61b32ac6fe";
+      sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay";
+    };
+  }
   {
     goPackagePath = "github.com/golang/glog";
     fetch = {
@@ -513,15 +603,6 @@
       sha256 = "07555csk49ara636bhl2vbzziayls3qks8964z0q29g065zliy9j";
     };
   }
-  {
-    goPackagePath = "github.com/golang/lint";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/lint";
-      rev = "06c8688daad7";
-      sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
-    };
-  }
   {
     goPackagePath = "github.com/golang/mock";
     fetch = {
@@ -657,6 +738,24 @@
       sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl";
     };
   }
+  {
+    goPackagePath = "github.com/hashicorp/errwrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/errwrap";
+      rev = "v1.0.0";
+      sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-multierror";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-multierror";
+      rev = "v1.0.0";
+      sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49";
+    };
+  }
   {
     goPackagePath = "github.com/hashicorp/go-version";
     fetch = {
@@ -756,6 +855,15 @@
       sha256 = "1a1lk2ll2xv3ljffmfw4q8mqqw727pj8dzs6c8g2hh0b0b050g79";
     };
   }
+  {
+    goPackagePath = "github.com/joho/godotenv";
+    fetch = {
+      type = "git";
+      url = "https://github.com/joho/godotenv";
+      rev = "v1.3.0";
+      sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm";
+    };
+  }
   {
     goPackagePath = "github.com/json-iterator/go";
     fetch = {
@@ -905,8 +1013,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/konsorten/go-windows-terminal-sequences";
-      rev = "v1.0.2";
-      sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
+      rev = "v1.0.3";
+      sha256 = "1yrsd4s8vhjnxhwbigirymz89dn6qfjnhn28i33vvvdgf96j6ypl";
     };
   }
   {
@@ -963,13 +1071,22 @@
       sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0";
     };
   }
+  {
+    goPackagePath = "github.com/lib/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lib/pq";
+      rev = "v1.2.0";
+      sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz";
+    };
+  }
   {
     goPackagePath = "github.com/libgit2/git2go";
     fetch = {
       type = "git";
       url = "https://github.com/libgit2/git2go";
-      rev = "ecaeb7a21d47";
-      sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr";
+      rev = "v30.0.5";
+      sha256 = "13jk4r8x8rb9lar35dxvh3g7hnzclq95jbpg88y4xklmh48yy3sk";
     };
   }
   {
@@ -1008,6 +1125,15 @@
       sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m";
     };
   }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "v0.0.4";
+      sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
+    };
+  }
   {
     goPackagePath = "github.com/mattn/go-shellwords";
     fetch = {
@@ -1017,6 +1143,15 @@
       sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d";
     };
   }
+  {
+    goPackagePath = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev = "v1.12.0";
+      sha256 = "0di8zy6202sbs0p9kx8lpii77ir5jwjhg6z0796y3nfvw87wk9iv";
+    };
+  }
   {
     goPackagePath = "github.com/mattn/goveralls";
     fetch = {
@@ -1062,6 +1197,15 @@
       sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2";
     };
   }
+  {
+    goPackagePath = "github.com/mitchellh/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/cli";
+      rev = "v1.0.0";
+      sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2";
+    };
+  }
   {
     goPackagePath = "github.com/mitchellh/go-homedir";
     fetch = {
@@ -1143,6 +1287,15 @@
       sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg";
     };
   }
+  {
+    goPackagePath = "github.com/olekukonko/tablewriter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/olekukonko/tablewriter";
+      rev = "v0.0.2";
+      sha256 = "1f4mwdh501p8105nfxayprlj5ld14fwzyyy2wbc04xk3wrm1wzlf";
+    };
+  }
   {
     goPackagePath = "github.com/onsi/ginkgo";
     fetch = {
@@ -1242,6 +1395,15 @@
       sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
     };
   }
+  {
+    goPackagePath = "github.com/posener/complete";
+    fetch = {
+      type = "git";
+      url = "https://github.com/posener/complete";
+      rev = "v1.1.1";
+      sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2";
+    };
+  }
   {
     goPackagePath = "github.com/prometheus/client_golang";
     fetch = {
@@ -1274,8 +1436,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/procfs";
-      rev = "v0.0.2";
-      sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
+      rev = "v0.0.3";
+      sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y";
     };
   }
   {
@@ -1283,8 +1445,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/rogpeppe/go-internal";
-      rev = "v1.3.0";
-      sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216";
+      rev = "v1.4.0";
+      sha256 = "17wisy8bapx5ki0gpissm8dvv7x0lmdnrl1fka75g05kpbyv6g2n";
+    };
+  }
+  {
+    goPackagePath = "github.com/rubenv/sql-migrate";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rubenv/sql-migrate";
+      rev = "06338513c237";
+      sha256 = "0z7y7vsnzjswx51g9hlawnzmwnb8c7rks6ljzf6m1xbimhi4n3kz";
     };
   }
   {
@@ -1337,8 +1508,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/sirupsen/logrus";
-      rev = "v1.3.0";
-      sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk";
+      rev = "v1.6.0";
+      sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj";
     };
   }
   {
@@ -1436,8 +1607,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/tinylib/msgp";
-      rev = "v1.1.0";
-      sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff";
+      rev = "v1.0.2";
+      sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
     };
   }
   {
@@ -1593,6 +1764,15 @@
       sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk";
     };
   }
+  {
+    goPackagePath = "github.com/ziutek/mymysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ziutek/mymysql";
+      rev = "v1.5.4";
+      sha256 = "172s7sv5bgc40x81k18hypf9c4n8hn9v5w5zwyr4mi5prbavqcci";
+    };
+  }
   {
     goPackagePath = "gitlab.com/gitlab-org/gitaly";
     fetch = {
@@ -1607,8 +1787,8 @@
     fetch = {
       type = "git";
       url = "https://gitlab.com/gitlab-org/labkit.git";
-      rev = "0149780c759d";
-      sha256 = "1krp5jkwpckpdznbl9xp4yvq6cii750r24agcni3snbbs8hd8gb1";
+      rev = "45895e129029";
+      sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48";
     };
   }
   {
@@ -1724,8 +1904,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "v0.3.2";
-      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+      rev = "v0.3.3";
+      sha256 = "19pihqm3phyndmiw6i42pdv6z1rbvlqlsnhsyqf9gsnn0qnmqqlh";
     };
   }
   {
@@ -1854,6 +2034,15 @@
       sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55";
     };
   }
+  {
+    goPackagePath = "gopkg.in/gorp.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/gorp.v1";
+      rev = "v1.7.2";
+      sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb";
+    };
+  }
   {
     goPackagePath = "gopkg.in/mgo.v2";
     fetch = {
@@ -1877,8 +2066,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "v2.2.4";
-      sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2";
+      rev = "v2.2.8";
+      sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
     };
   }
   {
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
index 6c54e8884f29..888994adc927 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
@@ -1,5 +1,5 @@
 diff --git a/internal/config/config.go b/internal/config/config.go
-index 2231851..c869930 100644
+index 79c2a36..12ba31e 100644
 --- a/internal/config/config.go
 +++ b/internal/config/config.go
 @@ -3,7 +3,6 @@ package config
@@ -10,7 +10,7 @@ index 2231851..c869930 100644
  	"path"
  	"path/filepath"
  
-@@ -38,16 +37,13 @@ type Config struct {
+@@ -59,16 +58,13 @@ func (c *Config) GetHttpClient() *client.HttpClient {
  }
  
  func New() (*Config, error) {
@@ -30,18 +30,18 @@ index 2231851..c869930 100644
  
  func newFromFile(filename string) (*Config, error) {
 diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go
-index e2abb82..7e9c481 100644
+index c6f2422..fb0426b 100644
 --- a/internal/keyline/key_line.go
 +++ b/internal/keyline/key_line.go
-@@ -38,7 +38,7 @@ func NewPrincipalKeyLine(keyId, principal string, config *config.Config) (*KeyLi
-
+@@ -37,7 +37,7 @@ func NewPrincipalKeyLine(keyId, principal string, config *config.Config) (*KeyLi
+ }
+ 
  func (k *KeyLine) ToString() string {
- 	sslCertDirEnvVar := k.sslCertDirEnvVar()
 -	command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id)
 +	command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.Id)
-
- 	if sslCertDirEnvVar != "" {
- 		sslCertDirEnvVar = fmt.Sprintf(`%s `, sslCertDirEnvVar)
+ 
+ 	return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value)
+ }
 diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb
 index 52ac5ee..d96baa3 100644
 --- a/support/gitlab_config.rb
@@ -55,3 +55,6 @@ index 52ac5ee..d96baa3 100644
    end
  
    def auth_file
+-- 
+2.28.0
+
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index e1b177c3b457..f6d633af2c47 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   pname = "gitlab-workhorse";
 
-  version = "8.46.0";
+  version = "8.51.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "1qhaln1k6vcjzphmxdqhwz1cwdx77gclyq0b2ibzgy7xg9l91n99";
+    sha256 = "012xbnd4lqfv478bbd2r9jhnb2f162gsa5y77z3by0kqqpsglgl5";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";
@@ -17,16 +17,6 @@ buildGoPackage rec {
   buildInputs = [ git ];
   buildFlagsArray = "-ldflags=-X main.Version=${version}";
 
-  # gitlab-workhorse depends on an older version of labkit which
-  # contains old, vendored versions of some packages; gitlab-workhorse
-  # also explicitly depends on newer versions of these libraries,
-  # but buildGoPackage exposes the vendored versions instead,
-  # leading to compilation errors. Since the vendored libraries
-  # aren't used here anyway, we'll just remove them.
-  postConfigure = ''
-    rm -r "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/labkit/vendor"
-  '';
-
   meta = with stdenv.lib; {
     homepage = "http://www.gitlab.com/";
     platforms = platforms.linux;
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
index 33b122a52e28..d8433778ae20 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
@@ -9,6 +9,15 @@
       sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk";
     };
   }
+  {
+    goPackagePath = "bou.ke/monkey";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bouk/monkey";
+      rev = "v1.0.1";
+      sha256 = "050y07pwx5zk7fchp0lhf35w417sml7lxkkzly8f932fy25rydz5";
+    };
+  }
   {
     goPackagePath = "cloud.google.com/go";
     fetch = {
@@ -279,6 +288,15 @@
       sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
     };
   }
+  {
+    goPackagePath = "github.com/armon/go-radix";
+    fetch = {
+      type = "git";
+      url = "https://github.com/armon/go-radix";
+      rev = "7fddfc383310";
+      sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4";
+    };
+  }
   {
     goPackagePath = "github.com/aws/aws-sdk-go";
     fetch = {
@@ -293,8 +311,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/beorn7/perks";
-      rev = "v1.0.0";
-      sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
+      rev = "v1.0.1";
+      sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7";
+    };
+  }
+  {
+    goPackagePath = "github.com/bgentry/speakeasy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bgentry/speakeasy";
+      rev = "v0.1.0";
+      sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s";
     };
   }
   {
@@ -374,8 +401,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/cloudflare/tableflip";
-      rev = "8392f1641731";
-      sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8";
+      rev = "4baec9811f2b";
+      sha256 = "095xb5gfz7dglljp91nh68dnscddvlf7q5ivvz972fq86r3ypq6q";
     };
   }
   {
@@ -459,6 +486,15 @@
       sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
     };
   }
+  {
+    goPackagePath = "github.com/denisenkom/go-mssqldb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/denisenkom/go-mssqldb";
+      rev = "cfbb681360f0";
+      sha256 = "0mr4y9vppiyl7mvad74k3zk4sc1jdkmc0lcd6lhm70iziw2xpncs";
+    };
+  }
   {
     goPackagePath = "github.com/devigned/tab";
     fetch = {
@@ -504,6 +540,15 @@
       sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww";
     };
   }
+  {
+    goPackagePath = "github.com/disintegration/imaging";
+    fetch = {
+      type = "git";
+      url = "https://github.com/disintegration/imaging";
+      rev = "v1.6.2";
+      sha256 = "1sl201nmk601h0aii4234sycn4v2b0rjxf8yhrnik4yjzd68q9x5";
+    };
+  }
   {
     goPackagePath = "github.com/dlclark/regexp2";
     fetch = {
@@ -567,6 +612,15 @@
       sha256 = "1yacmwmil625p0pzj800h9dnmiab6bjwfmi48p9fcrvy2yyv9b97";
     };
   }
+  {
+    goPackagePath = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev = "v1.7.0";
+      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+    };
+  }
   {
     goPackagePath = "github.com/fatih/structs";
     fetch = {
@@ -612,15 +666,6 @@
       sha256 = "0dqb7lsinciz594q6jg59hrvk4g4awbs2ybsr580j22j2xag53vs";
     };
   }
-  {
-    goPackagePath = "github.com/gavv/monotime";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gavv/monotime";
-      rev = "30dba4353424";
-      sha256 = "0w67yyc9y11dp7lp4b712dkcgbiln1qmgfx1nbbrw3mfkzr61d7g";
-    };
-  }
   {
     goPackagePath = "github.com/getsentry/raven-go";
     fetch = {
@@ -738,6 +783,42 @@
       sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
     };
   }
+  {
+    goPackagePath = "github.com/gobuffalo/envy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobuffalo/envy";
+      rev = "v1.7.1";
+      sha256 = "1s1f05cgpkhgcs2qfh04ixxm1ggk8ms3fpwsxhb0mx7nfrcm106d";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobuffalo/logger";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobuffalo/logger";
+      rev = "v1.0.1";
+      sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobuffalo/packd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobuffalo/packd";
+      rev = "v0.3.0";
+      sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobuffalo/packr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobuffalo/packr";
+      rev = "v2.7.1";
+      sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9";
+    };
+  }
   {
     goPackagePath = "github.com/gobwas/httphead";
     fetch = {
@@ -774,6 +855,15 @@
       sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
     };
   }
+  {
+    goPackagePath = "github.com/golang-sql/civil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang-sql/civil";
+      rev = "cb61b32ac6fe";
+      sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay";
+    };
+  }
   {
     goPackagePath = "github.com/golang/gddo";
     fetch = {
@@ -801,15 +891,6 @@
       sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh";
     };
   }
-  {
-    goPackagePath = "github.com/golang/lint";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/lint";
-      rev = "06c8688daad7";
-      sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
-    };
-  }
   {
     goPackagePath = "github.com/golang/mock";
     fetch = {
@@ -927,15 +1008,6 @@
       sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
     };
   }
-  {
-    goPackagePath = "github.com/gorilla/schema";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorilla/schema";
-      rev = "v1.1.0";
-      sha256 = "14d31i3h6bg83r7ncmwm2pirab66z9hza38in18l89pbazxyh2n9";
-    };
-  }
   {
     goPackagePath = "github.com/gorilla/websocket";
     fetch = {
@@ -963,6 +1035,24 @@
       sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl";
     };
   }
+  {
+    goPackagePath = "github.com/hashicorp/errwrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/errwrap";
+      rev = "v1.0.0";
+      sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-multierror";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-multierror";
+      rev = "v1.0.0";
+      sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49";
+    };
+  }
   {
     goPackagePath = "github.com/hashicorp/go-version";
     fetch = {
@@ -1035,15 +1125,6 @@
       sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im";
     };
   }
-  {
-    goPackagePath = "github.com/iris-contrib/formBinder";
-    fetch = {
-      type = "git";
-      url = "https://github.com/iris-contrib/formBinder";
-      rev = "v5.0.0";
-      sha256 = "0mqk6j7a9d3y28ad4ylqc7z5w4hmn1ws5wwnyll918xn1wkzr5rg";
-    };
-  }
   {
     goPackagePath = "github.com/iris-contrib/go.uuid";
     fetch = {
@@ -1053,15 +1134,6 @@
       sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35";
     };
   }
-  {
-    goPackagePath = "github.com/iris-contrib/httpexpect";
-    fetch = {
-      type = "git";
-      url = "https://github.com/iris-contrib/httpexpect";
-      rev = "ebe99fcebbce";
-      sha256 = "126c50c6r5l2gdn60jirpb54pqwswxag3wgrv6wcn998h9w9gv8c";
-    };
-  }
   {
     goPackagePath = "github.com/iris-contrib/i18n";
     fetch = {
@@ -1265,8 +1337,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/konsorten/go-windows-terminal-sequences";
-      rev = "v1.0.2";
-      sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
+      rev = "v1.0.3";
+      sha256 = "1yrsd4s8vhjnxhwbigirymz89dn6qfjnhn28i33vvvdgf96j6ypl";
     };
   }
   {
@@ -1328,8 +1400,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/lib/pq";
-      rev = "v1.1.1";
-      sha256 = "0g64wlg1l1ybq4x44idksl4pgm055s58jxc6r6x4qhqm5q76h0km";
+      rev = "v1.2.0";
+      sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz";
     };
   }
   {
@@ -1337,8 +1409,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/libgit2/git2go";
-      rev = "ecaeb7a21d47";
-      sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr";
+      rev = "v30.0.5";
+      sha256 = "13jk4r8x8rb9lar35dxvh3g7hnzclq95jbpg88y4xklmh48yy3sk";
     };
   }
   {
@@ -1386,6 +1458,33 @@
       sha256 = "1dfsh27d52wmz0nmmzm2382pfrs2fcijvh6cgir7jbb4pnigr5w4";
     };
   }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "v0.0.4";
+      sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-shellwords";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-shellwords";
+      rev = "2444a32a19f4";
+      sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev = "v1.12.0";
+      sha256 = "0di8zy6202sbs0p9kx8lpii77ir5jwjhg6z0796y3nfvw87wk9iv";
+    };
+  }
   {
     goPackagePath = "github.com/mattn/goveralls";
     fetch = {
@@ -1431,6 +1530,15 @@
       sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2";
     };
   }
+  {
+    goPackagePath = "github.com/mitchellh/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/cli";
+      rev = "v1.0.0";
+      sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2";
+    };
+  }
   {
     goPackagePath = "github.com/mitchellh/copystructure";
     fetch = {
@@ -1530,6 +1638,15 @@
       sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg";
     };
   }
+  {
+    goPackagePath = "github.com/olekukonko/tablewriter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/olekukonko/tablewriter";
+      rev = "v0.0.2";
+      sha256 = "1f4mwdh501p8105nfxayprlj5ld14fwzyyy2wbc04xk3wrm1wzlf";
+    };
+  }
   {
     goPackagePath = "github.com/onsi/ginkgo";
     fetch = {
@@ -1557,6 +1674,33 @@
       sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
     };
   }
+  {
+    goPackagePath = "github.com/otiai10/copy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/otiai10/copy";
+      rev = "v1.0.1";
+      sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k";
+    };
+  }
+  {
+    goPackagePath = "github.com/otiai10/curr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/otiai10/curr";
+      rev = "v1.0.0";
+      sha256 = "0fpw20adq2wff7l4c87zaavj9jra4d64a8bbjixiiv3bbarim987";
+    };
+  }
+  {
+    goPackagePath = "github.com/otiai10/mint";
+    fetch = {
+      type = "git";
+      url = "https://github.com/otiai10/mint";
+      rev = "v1.3.0";
+      sha256 = "0kfc95jc2hfgwzcpdfa5hrxgj7s6rzx5jc0n1sn863bsngx2q1ca";
+    };
+  }
   {
     goPackagePath = "github.com/pelletier/go-toml";
     fetch = {
@@ -1602,6 +1746,15 @@
       sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
     };
   }
+  {
+    goPackagePath = "github.com/posener/complete";
+    fetch = {
+      type = "git";
+      url = "https://github.com/posener/complete";
+      rev = "v1.1.1";
+      sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2";
+    };
+  }
   {
     goPackagePath = "github.com/prometheus/client_golang";
     fetch = {
@@ -1634,8 +1787,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/procfs";
-      rev = "v0.0.2";
-      sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
+      rev = "v0.0.3";
+      sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y";
     };
   }
   {
@@ -1652,8 +1805,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/rogpeppe/go-internal";
-      rev = "v1.3.0";
-      sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216";
+      rev = "v1.4.0";
+      sha256 = "17wisy8bapx5ki0gpissm8dvv7x0lmdnrl1fka75g05kpbyv6g2n";
+    };
+  }
+  {
+    goPackagePath = "github.com/rubenv/sql-migrate";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rubenv/sql-migrate";
+      rev = "06338513c237";
+      sha256 = "0z7y7vsnzjswx51g9hlawnzmwnb8c7rks6ljzf6m1xbimhi4n3kz";
     };
   }
   {
@@ -1724,8 +1886,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/sirupsen/logrus";
-      rev = "v1.3.0";
-      sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk";
+      rev = "v1.6.0";
+      sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj";
     };
   }
   {
@@ -1823,8 +1985,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/tinylib/msgp";
-      rev = "v1.1.0";
-      sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff";
+      rev = "v1.0.2";
+      sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
     };
   }
   {
@@ -1913,8 +2075,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/xeipuuv/gojsonpointer";
-      rev = "df4f5c81cb3b";
-      sha256 = "0dfwc66z5gq75m3z7va80c10c22ijiq99bahq86l26ki71g286xn";
+      rev = "4e3ac2762d5f";
+      sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q";
     };
   }
   {
@@ -1989,6 +2151,15 @@
       sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923";
     };
   }
+  {
+    goPackagePath = "github.com/ziutek/mymysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ziutek/mymysql";
+      rev = "v1.5.4";
+      sha256 = "172s7sv5bgc40x81k18hypf9c4n8hn9v5w5zwyr4mi5prbavqcci";
+    };
+  }
   {
     goPackagePath = "gitlab.com/gitlab-org/gitaly";
     fetch = {
@@ -1998,13 +2169,22 @@
       sha256 = "1gmrpzm4ijw8g1xj8b3vmvg4cmis7shvwxp5vl2r47a8mh2ql5pd";
     };
   }
+  {
+    goPackagePath = "gitlab.com/gitlab-org/gitlab-shell";
+    fetch = {
+      type = "git";
+      url = "https://gitlab.com/gitlab-org/gitlab-shell.git";
+      rev = "1a2bfecd2f0e";
+      sha256 = "197b3yn7lp6dbzcgxrj3ns2a839adcfmcwi3h53i1sr6952ciayx";
+    };
+  }
   {
     goPackagePath = "gitlab.com/gitlab-org/labkit";
     fetch = {
       type = "git";
       url = "https://gitlab.com/gitlab-org/labkit.git";
-      rev = "96e583c57891";
-      sha256 = "15h6yvyq5rhhblwmahz89b0kgkfvfrpg20d23jvshyxs5xjh7y8f";
+      rev = "45895e129029";
+      sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48";
     };
   }
   {
@@ -2057,8 +2237,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/image";
-      rev = "cff245a6509b";
-      sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84";
+      rev = "e7c1f5e7dbb8";
+      sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf";
     };
   }
   {
@@ -2129,8 +2309,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "v0.3.2";
-      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+      rev = "v0.3.3";
+      sha256 = "19pihqm3phyndmiw6i42pdv6z1rbvlqlsnhsyqf9gsnn0qnmqqlh";
     };
   }
   {
@@ -2268,6 +2448,15 @@
       sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55";
     };
   }
+  {
+    goPackagePath = "gopkg.in/gorp.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/gorp.v1";
+      rev = "v1.7.2";
+      sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb";
+    };
+  }
   {
     goPackagePath = "gopkg.in/mgo.v2";
     fetch = {
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 0e28aa7a2d43..51f9d36cef90 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -19,13 +19,15 @@ gem 'default_value_for', '~> 3.3.0'
 gem 'pg', '~> 1.1'
 
 gem 'rugged', '~> 0.28'
-gem 'grape-path-helpers', '~> 1.3'
+gem 'grape-path-helpers', '~> 1.4'
 
 gem 'faraday', '~> 1.0'
 gem 'marginalia', '~> 1.9.0'
 
 # Authentication libraries
-gem 'devise', '~> 4.6'
+gem 'devise', '~> 4.7.2'
+# TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828)
+gem 'bcrypt', '3.1.12'
 gem 'doorkeeper', '~> 5.3.0'
 gem 'doorkeeper-openid_connect', '~> 1.7.4'
 gem 'omniauth', '~> 1.8'
@@ -97,6 +99,7 @@ gem 'graphiql-rails', '~> 1.4.10'
 gem 'apollo_upload_server', '~> 2.0.2'
 gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
 
+gem 'hashie'
 # Disable strong_params so that Mash does not respond to :permitted?
 gem 'hashie-forbidden_attributes'
 
@@ -108,7 +111,7 @@ gem 'hamlit', '~> 2.11.0'
 
 # Files attachments
 gem 'carrierwave', '~> 1.3'
-gem 'mini_magick'
+gem 'mini_magick', '~> 4.10.1'
 
 # for backups
 gem 'fog-aws', '~> 3.5'
@@ -155,7 +158,7 @@ gem 'wikicloth', '0.8.1'
 gem 'asciidoctor', '~> 2.0.10'
 gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
 gem 'asciidoctor-plantuml', '~> 0.0.12'
-gem 'rouge', '~> 3.21.0'
+gem 'rouge', '~> 3.24.0'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
 gem 'nokogiri', '~> 1.10.9'
@@ -169,7 +172,7 @@ gem 'diffy', '~> 3.3'
 gem 'diff_match_patch', '~> 0.1.0'
 
 # Application server
-gem 'rack', '~> 2.0.9'
+gem 'rack', '~> 2.1.4'
 # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
 gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
 
@@ -244,7 +247,7 @@ gem 'atlassian-jwt', '~> 0.2.0'
 gem 'flowdock', '~> 0.7'
 
 # Slack integration
-gem 'slack-messenger', '~> 2.3.3'
+gem 'slack-messenger', '~> 2.3.4'
 
 # Hangouts Chat integration
 gem 'hangouts-chat', '~> 0.0.5'
@@ -256,7 +259,7 @@ gem 'asana', '0.10.2'
 gem 'ruby-fogbugz', '~> 0.2.1'
 
 # Kubernetes integration
-gem 'kubeclient', '~> 4.6.0'
+gem 'kubeclient', '~> 4.9.1'
 
 # Sanitize user input
 gem 'sanitize', '~> 5.2.1'
@@ -272,7 +275,7 @@ gem 'licensee', '~> 8.9'
 gem 'ace-rails-ap', '~> 4.1.0'
 
 # Detect and convert string character encoding
-gem 'charlock_holmes', '~> 0.7.5'
+gem 'charlock_holmes', '~> 0.7.7'
 
 # Detect mime content type from content
 gem 'mimemagic', '~> 0.3.2'
@@ -284,11 +287,10 @@ gem 'fast_blank'
 gem 'gitlab-chronic', '~> 0.10.5'
 gem 'gitlab_chronic_duration', '~> 0.10.6.2'
 
-gem 'webpack-rails', '~> 0.9.10'
 gem 'rack-proxy', '~> 0.6.0'
 
 gem 'sassc-rails', '~> 2.1.0'
-gem 'uglifier', '~> 2.7.2'
+gem 'terser', '1.0.2'
 
 gem 'addressable', '~> 2.7'
 gem 'font-awesome-rails', '~> 4.7'
@@ -308,7 +310,7 @@ gem 'sentry-raven', '~> 3.0'
 gem 'premailer-rails', '~> 1.10.3'
 
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.12.1'
+gem 'gitlab-labkit', '0.12.2'
 
 # I18n
 gem 'ruby_parser', '~> 3.8', require: false
@@ -330,13 +332,13 @@ group :metrics do
   gem 'method_source', '~> 1.0', require: false
 
   # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.11.0'
+  gem 'prometheus-client-mmap', '~> 0.12.0'
   gem 'raindrops', '~> 0.18'
 end
 
 group :development do
   gem 'brakeman', '~> 4.2', require: false
-  gem 'danger', '~> 8.0', require: false
+  gem 'danger', '~> 8.0.6', require: false
 
   gem 'letter_opener_web', '~> 1.3.4'
 
@@ -375,8 +377,6 @@ group :development, :test do
 
   gem 'scss_lint', '~> 0.56.0', require: false
   gem 'haml_lint', '~> 0.34.0', require: false
-  gem 'simplecov', '~> 0.18.5', require: false
-  gem 'simplecov-cobertura', '~> 1.3.1', require: false
   gem 'bundler-audit', '~> 0.6.1', require: false
 
   gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -394,9 +394,14 @@ group :development, :test do
   gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
 end
 
+group :development, :test, :coverage do
+  gem 'simplecov', '~> 0.18.5', require: false
+  gem 'simplecov-cobertura', '~> 1.3.1', require: false
+end
+
 # Gems required in omnibus-gitlab pipeline
 group :development, :test, :omnibus do
-  gem 'license_finder', '~> 5.4', require: false
+  gem 'license_finder', '~> 6.0', require: false
 end
 
 group :test do
@@ -411,7 +416,7 @@ group :test do
 
   gem 'shoulda-matchers', '~> 4.0.1', require: false
   gem 'email_spec', '~> 2.2.0'
-  gem 'webmock', '~> 3.5.1'
+  gem 'webmock', '~> 3.9.1'
   gem 'rails-controller-testing'
   gem 'concurrent-ruby', '~> 1.1'
   gem 'test-prof', '~> 0.12.0'
@@ -425,7 +430,7 @@ end
 gem 'octokit', '~> 4.15'
 
 # https://gitlab.com/gitlab-org/gitlab/issues/207207
-gem 'gitlab-mail_room', '~> 0.0.6', require: 'mail_room'
+gem 'gitlab-mail_room', '~> 0.0.7', require: 'mail_room'
 
 gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
@@ -461,7 +466,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.3.0-rc1'
+gem 'gitaly', '~> 13.5.0-rc2'
 
 gem 'grpc', '~> 1.30.2'
 
@@ -512,3 +517,6 @@ gem 'multi_json', '~> 1.14.1'
 gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'
 
 gem 'webauthn', '~> 2.3'
+
+# IPAddress utilities
+gem 'ipaddress', '~> 0.8.3'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index 9b0b34e6ed2c..2ad66f6e6c0d 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -6,59 +6,59 @@ GEM
     ace-rails-ap (4.1.2)
     acme-client (2.0.6)
       faraday (>= 0.17, < 2.0.0)
-    actioncable (6.0.3.1)
-      actionpack (= 6.0.3.1)
+    actioncable (6.0.3.3)
+      actionpack (= 6.0.3.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activejob (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
-      activestorage (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionmailbox (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      actionview (= 6.0.3.1)
-      activejob (= 6.0.3.1)
+    actionmailer (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      actionview (= 6.0.3.3)
+      activejob (= 6.0.3.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.1)
-      actionview (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionpack (6.0.3.3)
+      actionview (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
-      activestorage (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actiontext (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionview (6.0.3.3)
+      activesupport (= 6.0.3.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    activejob (6.0.3.3)
+      activesupport (= 6.0.3.3)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    activemodel (6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activerecord (6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
     activerecord-explain-analyze (0.1.0)
       activerecord (>= 4)
       pg
-    activestorage (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activejob (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
+    activestorage (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
       marcel (~> 0.3.1)
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -167,7 +167,7 @@ GEM
       mime-types (>= 1.16)
     cbor (0.5.9.6)
     character_set (1.4.0)
-    charlock_holmes (0.7.6)
+    charlock_holmes (0.7.7)
     childprocess (3.0.0)
     chunky_png (1.3.5)
     citrus (3.0.2)
@@ -183,7 +183,7 @@ GEM
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     connection_pool (2.2.2)
     contracts (0.11.0)
     cork (0.3.0)
@@ -202,7 +202,7 @@ GEM
     css_parser (1.7.0)
       addressable
     daemons (1.2.6)
-    danger (8.0.5)
+    danger (8.0.6)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -235,7 +235,7 @@ GEM
       thor (>= 0.19, < 2)
       unicode_plot (>= 0.0.4, < 1.0.0)
     device_detector (1.0.0)
-    devise (4.7.1)
+    devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -253,7 +253,7 @@ GEM
     discordrb-webhooks-blackst0ne (3.3.0)
       rest-client (~> 2.0)
     docile (1.3.2)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     doorkeeper (5.3.3)
       railties (>= 5)
@@ -312,7 +312,7 @@ GEM
       tzinfo
     eventmachine (1.2.7)
     excon (0.71.1)
-    execjs (2.6.0)
+    execjs (2.7.0)
     expression_parser (0.9.0)
     extended-markdown-filter (0.6.0)
       html-pipeline (~> 2.0)
@@ -416,7 +416,7 @@ GEM
       rails (>= 3.2.0)
     git (1.7.0)
       rchardet (~> 1.8)
-    gitaly (13.3.0.pre.rc2)
+    gitaly (13.5.0.pre.rc2)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab-chronic (0.10.5)
@@ -428,7 +428,7 @@ GEM
       fog-json (~> 1.2.0)
       mime-types
       ms_rest_azure (~> 0.12.0)
-    gitlab-labkit (0.12.1)
+    gitlab-labkit (0.12.2)
       actionpack (>= 5.0.0, < 6.1.0)
       activesupport (>= 5.0.0, < 6.1.0)
       grpc (~> 1.19)
@@ -436,7 +436,7 @@ GEM
       opentracing (~> 0.4)
       redis (> 3.0.0, < 5.0.0)
     gitlab-license (1.0.0)
-    gitlab-mail_room (0.0.6)
+    gitlab-mail_room (0.0.7)
     gitlab-markup (1.7.1)
     gitlab-net-dns (0.9.1)
     gitlab-puma (4.3.5.gitlab.3)
@@ -495,7 +495,7 @@ GEM
     grape-entity (0.7.1)
       activesupport (>= 4.0)
       multi_json (>= 1.3.2)
-    grape-path-helpers (1.3.0)
+    grape-path-helpers (1.4.0)
       activesupport
       grape (~> 1.3)
       rake (~> 12)
@@ -547,7 +547,7 @@ GEM
       tilt
     hana (1.3.6)
     hangouts-chat (0.0.5)
-    hashdiff (0.3.8)
+    hashdiff (1.0.1)
     hashie (3.6.0)
     hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
@@ -563,21 +563,22 @@ GEM
     html2text (0.2.0)
       nokogiri (~> 1.6)
     htmlentities (4.3.4)
-    http (4.2.0)
+    http (4.4.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
+      http-form_data (~> 2.2)
       http-parser (~> 1.2.0)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.1.1)
+    http-form_data (2.3.0)
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
     httparty (0.16.4)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.8.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     i18n_data (0.8.0)
     icalendar (2.4.1)
@@ -611,6 +612,9 @@ GEM
       hana (~> 1.3)
       regexp_parser (~> 1.5)
       uri_template (~> 0.7)
+    jsonpath (1.0.5)
+      multi_json
+      to_regexp (~> 0.2.1)
     jwt (2.1.0)
     kaminari (1.2.1)
       activesupport (>= 4.1.0)
@@ -631,9 +635,10 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    kubeclient (4.6.0)
+    kubeclient (4.9.1)
       http (>= 3.0, < 5.0)
-      recursive-open-struct (~> 1.0, >= 1.0.4)
+      jsonpath (~> 1.0)
+      recursive-open-struct (~> 1.1, >= 1.1.1)
       rest-client (~> 2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
@@ -643,9 +648,9 @@ GEM
       actionmailer (>= 3.2)
       letter_opener (~> 1.0)
       railties (>= 3.2)
-    license_finder (5.4.0)
+    license_finder (6.0.0)
       bundler
-      rubyzip
+      rubyzip (>= 1, < 3)
       thor
       toml (= 0.2.0)
       with_env (= 1.1.0)
@@ -662,7 +667,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.5.0)
+    loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
@@ -684,7 +689,7 @@ GEM
     mime-types-data (3.2020.0512)
     mimemagic (0.3.5)
     mini_histogram (0.1.3)
-    mini_magick (4.9.5)
+    mini_magick (4.10.1)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
@@ -713,7 +718,7 @@ GEM
     net-ntp (2.1.3)
     net-ssh (6.0.0)
     netrc (0.11.0)
-    nio4r (2.5.2)
+    nio4r (2.5.4)
     no_proxy_fix (0.1.2)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
@@ -838,7 +843,7 @@ GEM
       parser
       unparser
     procto (0.0.3)
-    prometheus-client-mmap (0.11.0)
+    prometheus-client-mmap (0.12.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -847,10 +852,10 @@ GEM
       pry (~> 0.13.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.3)
+    public_suffix (4.0.6)
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.1.6)
-    rack (2.0.9)
+    rack (2.1.4)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.3.0)
@@ -870,25 +875,25 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-timeout (0.5.2)
-    rails (6.0.3.1)
-      actioncable (= 6.0.3.1)
-      actionmailbox (= 6.0.3.1)
-      actionmailer (= 6.0.3.1)
-      actionpack (= 6.0.3.1)
-      actiontext (= 6.0.3.1)
-      actionview (= 6.0.3.1)
-      activejob (= 6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
-      activestorage (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    rails (6.0.3.3)
+      actioncable (= 6.0.3.3)
+      actionmailbox (= 6.0.3.3)
+      actionmailer (= 6.0.3.3)
+      actionpack (= 6.0.3.3)
+      actiontext (= 6.0.3.3)
+      actionview (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.1)
+      railties (= 6.0.3.3)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.4)
-      actionpack (>= 5.0.1.x)
-      actionview (>= 5.0.1.x)
-      activesupport (>= 5.0.1.x)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -897,9 +902,9 @@ GEM
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    railties (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    railties (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -920,7 +925,7 @@ GEM
     re2 (1.2.0)
     recaptcha (4.13.1)
       json
-    recursive-open-struct (1.1.1)
+    recursive-open-struct (1.1.2)
     redis (4.1.3)
     redis-actionpack (5.2.0)
       actionpack (>= 5, < 7)
@@ -951,7 +956,8 @@ GEM
     responders (3.0.0)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    rest-client (2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -959,7 +965,7 @@ GEM
     rexml (3.2.4)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (3.21.0)
+    rouge (3.24.0)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -1065,7 +1071,7 @@ GEM
     seed-fu (2.3.7)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
-    selenium-webdriver (3.142.6)
+    selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     sentry-raven (3.0.4)
@@ -1096,7 +1102,7 @@ GEM
       simplecov (~> 0.8)
     simplecov-html (0.12.2)
     sixarm_ruby_unaccent (1.2.0)
-    slack-messenger (2.3.3)
+    slack-messenger (2.3.4)
     snowplow-tracker (0.6.1)
       contracts (~> 0.7, <= 0.11)
     spring (2.0.2)
@@ -1106,7 +1112,7 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -1130,6 +1136,8 @@ GEM
     temple (0.8.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
+    terser (1.0.2)
+      execjs (>= 0.3.0, < 3)
     test-prof (0.12.0)
     text (1.3.1)
     thin (1.7.2)
@@ -1143,6 +1151,7 @@ GEM
     timecop (0.9.1)
     timeliness (0.3.10)
     timfel-krb5-auth (0.8.3)
+    to_regexp (0.2.1)
     toml (0.2.0)
       parslet (~> 1.8.0)
     toml-rb (1.0.0)
@@ -1157,12 +1166,9 @@ GEM
       thread_safe (~> 0.1)
     u2f (0.2.1)
     uber (0.1.0)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     unicode_plot (0.0.4)
       enumerable-statistics (>= 2.0.1)
@@ -1214,13 +1220,11 @@ GEM
     webfinger (1.1.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.5.1)
+    webmock (3.9.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
-    webpack-rails (0.9.11)
-      railties (>= 3.2.0)
-    websocket-driver (0.7.1)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wikicloth (0.8.1)
@@ -1232,7 +1236,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yajl-ruby (1.4.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -1259,6 +1263,7 @@ DEPENDENCIES
   babosa (~> 1.0.2)
   base32 (~> 0.3.0)
   batch-loader (~> 1.4.0)
+  bcrypt (= 3.1.12)
   bcrypt_pbkdf (~> 1.0)
   benchmark-ips (~> 2.3.0)
   benchmark-memory (~> 0.1)
@@ -1272,19 +1277,19 @@ DEPENDENCIES
   capybara (~> 3.33.0)
   capybara-screenshot (~> 1.0.22)
   carrierwave (~> 1.3)
-  charlock_holmes (~> 0.7.5)
+  charlock_holmes (~> 0.7.7)
   commonmarker (~> 0.20)
   concurrent-ruby (~> 1.1)
   connection_pool (~> 2.0)
   countries (~> 3.0)
   creole (~> 0.5.0)
-  danger (~> 8.0)
+  danger (~> 8.0.6)
   database_cleaner (~> 1.7.0)
   deckar01-task_list (= 2.3.1)
   default_value_for (~> 3.3.0)
   derailed_benchmarks
   device_detector
-  devise (~> 4.6)
+  devise (~> 4.7.2)
   devise-two-factor (~> 3.1.0)
   diff_match_patch (~> 0.1.0)
   diffy (~> 3.3)
@@ -1322,13 +1327,13 @@ DEPENDENCIES
   gettext (~> 3.3)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 13.3.0.pre.rc1)
+  gitaly (~> 13.5.0.pre.rc2)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
   gitlab-fog-azure-rm (~> 1.0)
-  gitlab-labkit (= 0.12.1)
+  gitlab-labkit (= 0.12.2)
   gitlab-license (~> 1.0)
-  gitlab-mail_room (~> 0.0.6)
+  gitlab-mail_room (~> 0.0.7)
   gitlab-markup (~> 1.7.1)
   gitlab-net-dns (~> 0.9.1)
   gitlab-puma (~> 4.3.3.gitlab.2)
@@ -1343,7 +1348,7 @@ DEPENDENCIES
   gpgme (~> 2.0.19)
   grape (= 1.4.0)
   grape-entity (~> 0.7.1)
-  grape-path-helpers (~> 1.3)
+  grape-path-helpers (~> 1.4)
   grape_logging (~> 1.7)
   graphiql-rails (~> 1.4.10)
   graphql (~> 1.11.4)
@@ -1354,6 +1359,7 @@ DEPENDENCIES
   haml_lint (~> 0.34.0)
   hamlit (~> 2.11.0)
   hangouts-chat (~> 0.0.5)
+  hashie
   hashie-forbidden_attributes
   health_check (~> 3.0)
   hipchat (~> 1.5.0)
@@ -1362,6 +1368,7 @@ DEPENDENCIES
   httparty (~> 0.16.4)
   icalendar
   invisible_captcha (~> 0.12.1)
+  ipaddress (~> 0.8.3)
   jira-ruby (~> 2.0.0)
   js_regex (~> 3.4)
   json (~> 2.3.0)
@@ -1371,9 +1378,9 @@ DEPENDENCIES
   kaminari (~> 1.0)
   knapsack (~> 1.17)
   kramdown (~> 2.3.0)
-  kubeclient (~> 4.6.0)
+  kubeclient (~> 4.9.1)
   letter_opener_web (~> 1.3.4)
-  license_finder (~> 5.4)
+  license_finder (~> 6.0)
   licensee (~> 8.9)
   lockbox (~> 0.3.3)
   lograge (~> 0.5)
@@ -1384,7 +1391,7 @@ DEPENDENCIES
   memory_profiler (~> 0.9)
   method_source (~> 1.0)
   mimemagic (~> 0.3.2)
-  mini_magick
+  mini_magick (~> 4.10.1)
   minitest (~> 5.11.0)
   multi_json (~> 1.14.1)
   nakayoshi_fork (~> 0.0.4)
@@ -1419,10 +1426,10 @@ DEPENDENCIES
   pg (~> 1.1)
   png_quantizator (~> 0.2.1)
   premailer-rails (~> 1.10.3)
-  prometheus-client-mmap (~> 0.11.0)
+  prometheus-client-mmap (~> 0.12.0)
   pry-byebug (~> 3.9.0)
   pry-rails (~> 0.3.9)
-  rack (~> 2.0.9)
+  rack (~> 2.1.4)
   rack-attack (~> 6.3.0)
   rack-cors (~> 1.0.6)
   rack-oauth2 (~> 1.9.3)
@@ -1444,7 +1451,7 @@ DEPENDENCIES
   request_store (~> 1.5)
   responders (~> 3.0)
   retriable (~> 3.1.2)
-  rouge (~> 3.21.0)
+  rouge (~> 3.24.0)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
   rspec-rails (~> 4.0.0)
@@ -1473,7 +1480,7 @@ DEPENDENCIES
   simple_po_parser (~> 1.1.2)
   simplecov (~> 0.18.5)
   simplecov-cobertura (~> 1.3.1)
-  slack-messenger (~> 2.3.3)
+  slack-messenger (~> 2.3.4)
   snowplow-tracker (~> 0.6.1)
   spring (~> 2.0.0)
   spring-commands-rspec (~> 1.0.4)
@@ -1482,13 +1489,13 @@ DEPENDENCIES
   stackprof (~> 0.2.15)
   state_machines-activerecord (~> 0.6.0)
   sys-filesystem (~> 1.1.6)
+  terser (= 1.0.2)
   test-prof (~> 0.12.0)
   thin (~> 1.7.0)
   timecop (~> 0.9.1)
   toml-rb (~> 1.0.0)
   truncato (~> 0.7.11)
   u2f (~> 0.2.1)
-  uglifier (~> 2.7.2)
   unf (~> 0.1.4)
   unicorn (~> 5.5)
   unicorn-worker-killer (~> 0.4.4)
@@ -1498,8 +1505,7 @@ DEPENDENCIES
   version_sorter (~> 2.2.4)
   vmstat (~> 2.3.0)
   webauthn (~> 2.3)
-  webmock (~> 3.5.1)
-  webpack-rails (~> 0.9.10)
+  webmock (~> 3.9.1)
   wikicloth (= 0.8.1)
   yajl-ruby (~> 1.4.1)
 
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index 7b12e9df6abc..c6425f3389c3 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -36,10 +36,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13z4l65jjihd0cgl9ahv66wvlgx09xnivbinqfdg41i7bx8ysahc";
+      sha256 = "1wpmxbprsqclna9xpa6b7sspjb89p6jqfxalasa9f984hx77dx27";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   actionmailbox = {
     dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@@ -47,10 +47,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1s95rfv1i7j7dy9kvlhxbs7izvm8k371m3grchcpvim4bw73icrp";
+      sha256 = "0smcxpn3glnmid3v2pk04sb3bdifbw7ad1c7fq6wfijkrpih8jiw";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   actionmailer = {
     dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
@@ -58,10 +58,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ivgxava9wcs70vyqvv2zmkslv3zxprw0l2s77n6m2wqay6g46wl";
+      sha256 = "1spq0dbfn0qkqg9sq0rsjn360b4j36zly8hawaivkrwr3rsvyz75";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   actionpack = {
     dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@@ -69,10 +69,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1665r4ffqdpykxwpgdnaq7xsaz1nfswc5wjs2qr0npx8bq7g49kh";
+      sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   actiontext = {
     dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
@@ -80,10 +80,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kjjd506y50byjms9cmingx3ls5qxfgfys6bhf5rgcir9bjj2b1k";
+      sha256 = "05ysfz9dwnncdx0g452by7jdr35yryz6lmcrbb4r5wgjm57b4n25";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   actionview = {
     dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -91,10 +91,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n21pswh3k7m33vzhxyrbi5lj64b1138yqv34jjhkhlq3474b4rh";
+      sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   activejob = {
     dependencies = ["activesupport" "globalid"];
@@ -102,10 +102,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0skanrib6cdxlxipzm07gb5zl930ws9pg1q1dbg1v5br0g8j818l";
+      sha256 = "0w54ckvc229iaax879hkhyc93j7z8p0v7acp6mk3h8xjfvmwy5jp";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   activemodel = {
     dependencies = ["activesupport"];
@@ -113,10 +113,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12kqqjzpmdx0dspvfj8my2acmmk94xz1q9iyvvvq2wkw8l11h1yv";
+      sha256 = "166jlx6kbby01vr37srh081a9fykgsz873yg5i9gl2ar3vw9gs56";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   activerecord = {
     dependencies = ["activemodel" "activesupport"];
@@ -124,10 +124,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rw3kpb0mpvj73chp6m011955sgmngnlavnf7gkm1305s9s5gfc8";
+      sha256 = "0y2a4ss6ld6yrhpcbcb3kjn5gj6zk9qklp2aq5rl1awl8vbdbdb7";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   activerecord-explain-analyze = {
     dependencies = ["activerecord" "pg"];
@@ -146,10 +146,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x13z9hvwbz2vj55mwzx7pws3ccvgrf9k5m1474k71iksn6zlgvc";
+      sha256 = "0nvfjkq979m1h4mk1ys7m4irwpswn4l9arb9yi06ffqpi1lpfl31";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   activesupport = {
     dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@@ -157,10 +157,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs";
+      sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   acts-as-taggable-on = {
     dependencies = ["activerecord"];
@@ -686,10 +686,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
+      sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p";
       type = "gem";
     };
-    version = "0.7.6";
+    version = "0.7.7";
   };
   childprocess = {
     groups = ["default" "test"];
@@ -793,10 +793,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
+      sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
       type = "gem";
     };
-    version = "1.1.6";
+    version = "1.1.7";
   };
   connection_pool = {
     groups = ["default"];
@@ -909,10 +909,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qishwv7mixfl4v7mdmwai3rhf94hpzj6hmj20vb4mvk7gk0y2la";
+      sha256 = "0lrifb0kbjk9033pzjnp8qqqkg2z212h8dgj71k15c6wb6rycqa7";
       type = "gem";
     };
-    version = "8.0.5";
+    version = "8.0.6";
   };
   database_cleaner = {
     groups = ["development" "test"];
@@ -1007,10 +1007,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0a64xq0dj6p0firpg4mrrfmlakpv17hky5yfrjhchs2sybmymr9i";
+      sha256 = "0syqkh0q9mcdgj68m2cf1innpxb8fv6xsayk1kgsdmq539rkv3ic";
       type = "gem";
     };
-    version = "4.7.1";
+    version = "4.7.3";
   };
   devise-two-factor = {
     dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
@@ -1080,10 +1080,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
+      sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
       type = "gem";
     };
-    version = "0.5.20180417";
+    version = "0.5.20190701";
   };
   doorkeeper = {
     dependencies = ["railties"];
@@ -1364,10 +1364,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0grlxwiccbnflxs30r3h7g23xnps5knav1jyqkk3anvm8363ifjw";
+      sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1";
       type = "gem";
     };
-    version = "2.6.0";
+    version = "2.7.0";
   };
   expression_parser = {
     groups = ["default"];
@@ -1796,10 +1796,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06l4c4a7ngq250m1y5i2asl6a63h0jix9rmz47xzj32qg6nlylak";
+      sha256 = "1q1l0c1yjnhr451jj845h2vd9s00grjiyj2w9r1b9y3bscsyzs0m";
       type = "gem";
     };
-    version = "13.3.0.pre.rc2";
+    version = "13.5.0.pre.rc2";
   };
   github-markup = {
     groups = ["default"];
@@ -1839,10 +1839,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zpprxxis0aziy0vmig0jpc6bxj05xfv25i1aisliiyd7dsjdqrh";
+      sha256 = "0k9f3a82727bhhhk8sjyjndpx4p5lwk3x03m06h4w59bpxa917sw";
       type = "gem";
     };
-    version = "0.12.1";
+    version = "0.12.2";
   };
   gitlab-license = {
     groups = ["default"];
@@ -1859,10 +1859,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kjxw7fq0slihawxz6nwvikdzp8xc0nydbsvjlz80m936cykmk9h";
+      sha256 = "14785l38sqrgf06y45ayhj3nhfqdar8vrsxna764vdsw01dngmin";
       type = "gem";
     };
-    version = "0.0.6";
+    version = "0.0.7";
   };
   gitlab-markup = {
     groups = ["default"];
@@ -2054,10 +2054,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zgifvvdh1dyhxl4ywspkvpy6srhlqliihfprp09k35kikxlmjqc";
+      sha256 = "175a07vv77k1kyilrgkhpr1vdswcywymgrmr4mmp434w17w0hlrg";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.0";
   };
   grape_logging = {
     dependencies = ["grape" "rack"];
@@ -2214,10 +2214,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
+      sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c";
       type = "gem";
     };
-    version = "0.3.8";
+    version = "1.0.1";
   };
   hashie = {
     groups = ["default" "kerberos"];
@@ -2310,10 +2310,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gsn0jmri7cavw1pv3pbynq6nldsff0r5dr6pa0mxz0rkpjsgjwl";
+      sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y";
       type = "gem";
     };
-    version = "4.2.0";
+    version = "4.4.1";
+  };
+  http-accept = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6";
+      type = "gem";
+    };
+    version = "1.7.0";
   };
   http-cookie = {
     dependencies = ["domain_name"];
@@ -2331,10 +2341,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15lpn604byf7cyxnw949xz4rvpcknqp7a48q73nm630gqxsa76f3";
+      sha256 = "1wx591jdhy84901pklh1n9sgh74gnvq1qyqxwchni1yrc49ynknc";
       type = "gem";
     };
-    version = "2.1.1";
+    version = "2.3.0";
   };
   http-parser = {
     dependencies = ["ffi-compiler"];
@@ -2374,10 +2384,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s";
+      sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
       type = "gem";
     };
-    version = "1.8.3";
+    version = "1.8.5";
   };
   i18n_data = {
     groups = ["default"];
@@ -2526,6 +2536,17 @@
     };
     version = "0.2.12";
   };
+  jsonpath = {
+    dependencies = ["multi_json" "to_regexp"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bwgk17dwraaf6grv6v99xjjy3ds1sqsf1v49fnlyfjkniy6ap8q";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
   jwt = {
     groups = ["default"];
     platforms = [];
@@ -2623,15 +2644,15 @@
     version = "1.1.0";
   };
   kubeclient = {
-    dependencies = ["http" "recursive-open-struct" "rest-client"];
+    dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1djf4zll2alrwv7wg4wk9v504wbri717wqaq773i1azg7cbisbw6";
+      sha256 = "07ygwvdrdhqmvqj3g7hsrgwimr1xcphk9d6qjdxr0iynqaahn0l7";
       type = "gem";
     };
-    version = "4.6.0";
+    version = "4.9.1";
   };
   launchy = {
     dependencies = ["addressable"];
@@ -2668,14 +2689,14 @@
   };
   license_finder = {
     dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"];
-    groups = ["development" "test"];
+    groups = ["development" "omnibus" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01rhqm5m3m22gq6q9f1x9fh3x3wrf9khnnsycblj0xg5frdjv77v";
+      sha256 = "0kc4bkaxy6mm6kpbpg8hdjsqpzybh7cy5b45qydc7bfa9c35vr93";
       type = "gem";
     };
-    version = "5.4.0";
+    version = "6.0.0";
   };
   licensee = {
     dependencies = ["rugged"];
@@ -2736,10 +2757,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040";
+      sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.7.0";
   };
   lru_redux = {
     groups = ["default"];
@@ -2885,10 +2906,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4";
+      sha256 = "0lpq12z70n10c1qshcddd5nib2pkcbkwzvmiqqzj60l01k3x4fg9";
       type = "gem";
     };
-    version = "4.9.5";
+    version = "4.10.1";
   };
   mini_mime = {
     groups = ["default" "development" "test"];
@@ -3089,10 +3110,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c";
+      sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk";
       type = "gem";
     };
-    version = "2.5.2";
+    version = "2.5.4";
   };
   no_proxy_fix = {
     groups = ["default" "development"];
@@ -3633,10 +3654,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0plfcsscg0nagi8srzh4n4g0riqzivsm5rwrn18k73ajaxbqpwc6";
+      sha256 = "1i0h9ixdvxw1n9ynxsrbc1lkx3dvd6r78iiwgwnqfz3fap6jgd9p";
       type = "gem";
     };
-    version = "0.11.0";
+    version = "0.12.0";
   };
   pry = {
     dependencies = ["coderay" "method_source"];
@@ -3684,10 +3705,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7";
+      sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
       type = "gem";
     };
-    version = "4.0.3";
+    version = "4.0.6";
   };
   pyu-ruby-sasl = {
     groups = ["default"];
@@ -3714,10 +3735,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mxzk12xylrz6d4n9jj5jasfscbf1pbk4idrb0nlf327lx9rwfkk";
+      sha256 = "1x72abm2snhk664s9g642pxjyk911y39qck8n9hbnqmb7ba1zbmz";
       type = "gem";
     };
-    version = "2.0.9";
+    version = "2.1.4";
   };
   rack-accept = {
     dependencies = ["rack"];
@@ -3812,10 +3833,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cka2c0g9qd02i7xl0hnhkbf4vjrjlax1vwpillpi4x0zc30ssl4";
+      sha256 = "1qqsiwsb13sxkvxj54aybjhbxqi45fyiykaz5isc1y9frm2yyw64";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   rails-controller-testing = {
     dependencies = ["actionpack" "actionview" "activesupport"];
@@ -3823,10 +3844,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1m1rklj6pvzi4fydxcmcv4q0xd7913hhhw1hw530nfz1wkl7vjlf";
+      sha256 = "151f303jcvs8s149mhx2g5mn67487x0blrf9dzl76q1nb7dlh53l";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "1.0.5";
   };
   rails-dom-testing = {
     dependencies = ["activesupport" "nokogiri"];
@@ -3867,10 +3888,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1drghlbjchn889ssiv1rzq6psp0469brf2838kfm4kzz1fhmbh2d";
+      sha256 = "05b79r0ms8jrs91zml1190qfxmnmks90g0sd820ks9msyr8xdp7j";
       type = "gem";
     };
-    version = "6.0.3.1";
+    version = "6.0.3.3";
   };
   rainbow = {
     groups = ["default" "development" "test"];
@@ -3995,10 +4016,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0acrxff186sn6sxdfiy7nacjgwak5cqd7jha9v3kshpf3sfr7qd1";
+      sha256 = "12manni00r5qn50z8w316pnm8mqn858i5kj6s9sr9sfl8qx8ws5g";
       type = "gem";
     };
-    version = "1.1.1";
+    version = "1.1.2";
   };
   RedCloth = {
     groups = ["default"];
@@ -4140,15 +4161,15 @@
     version = "3.0.0";
   };
   rest-client = {
-    dependencies = ["http-cookie" "mime-types" "netrc"];
+    dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j";
+      sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im";
       type = "gem";
     };
-    version = "2.0.2";
+    version = "2.1.0";
   };
   retriable = {
     groups = ["default"];
@@ -4195,10 +4216,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1agrrmj88k9jkk36ra1ml2c1jffpp595pkxmcla74ac9ia09vn3s";
+      sha256 = "1igl00gk0vaq4xxk44m7yflqdzsblgxlzcxj8saz96bmx7mg7392";
       type = "gem";
     };
-    version = "3.21.0";
+    version = "3.24.0";
   };
   rqrcode = {
     dependencies = ["chunky_png"];
@@ -4635,10 +4656,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11abil34dr8p1kw7hlaqd6kr430v4srmhzf72zzqvhcimlfvm4yb";
+      sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y";
       type = "gem";
     };
-    version = "3.142.6";
+    version = "3.142.7";
   };
   sentry-raven = {
     dependencies = ["faraday"];
@@ -4782,10 +4803,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1s2bff13nd21r28528vfb2ly5718r812izww2g0vxksjq7xgr2c7";
+      sha256 = "1h89asinyyyq88v89fdc3nw0g74vq2f7p59s18jrq3svpv913ij9";
       type = "gem";
     };
-    version = "2.3.3";
+    version = "2.3.4";
   };
   snowplow-tracker = {
     dependencies = ["contracts"];
@@ -4833,14 +4854,14 @@
   };
   sprockets-rails = {
     dependencies = ["actionpack" "activesupport" "sprockets"];
-    groups = ["default" "development" "test"];
+    groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";
+      sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2";
       type = "gem";
     };
-    version = "3.2.1";
+    version = "3.2.2";
   };
   sqlite3 = {
     groups = ["default" "development" "test"];
@@ -4957,6 +4978,17 @@
     };
     version = "1.8.0";
   };
+  terser = {
+    dependencies = ["execjs"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13mj7ds6kwl1z5dp8zg6b9l3vq9012g8yr99hlpf3d1dgsyf1hl0";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
   test-prof = {
     groups = ["test"];
     platforms = [];
@@ -5058,6 +5090,16 @@
     };
     version = "0.8.3";
   };
+  to_regexp = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rgabfhnql6l4fx09mmj5d0vza924iczqf2blmn82l782b6qqi9v";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
   toml = {
     dependencies = ["parslet"];
     groups = ["default" "development" "test"];
@@ -5133,17 +5175,6 @@
     };
     version = "0.1.0";
   };
-  uglifier = {
-    dependencies = ["execjs" "json"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz";
-      type = "gem";
-    };
-    version = "2.7.2";
-  };
   unf = {
     dependencies = ["unf_ext"];
     groups = ["default"];
@@ -5160,10 +5191,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
+      sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
       type = "gem";
     };
-    version = "0.0.7.5";
+    version = "0.0.7.7";
   };
   unicode-display_width = {
     groups = ["default" "development" "test"];
@@ -5363,21 +5394,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp";
+      sha256 = "0z9k677j9f6jrsj6nkxl2h969q0zyfzqj2ibxldznd5jaqj85xmw";
       type = "gem";
     };
-    version = "3.5.1";
-  };
-  webpack-rails = {
-    dependencies = ["railties"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr";
-      type = "gem";
-    };
-    version = "0.9.11";
+    version = "3.9.1";
   };
   websocket-driver = {
     dependencies = ["websocket-extensions"];
@@ -5385,10 +5405,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
+      sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh";
       type = "gem";
     };
-    version = "0.7.1";
+    version = "0.7.3";
   };
   websocket-extensions = {
     groups = ["default" "test"];
@@ -5457,9 +5477,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0";
+      sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
   };
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
index 484ce7203d26..899888ee2f1b 100644
--- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
@@ -2,11 +2,11 @@
   offline_cache = linkFarm "offline" packages;
   packages = [
     {
-      name = "_babel_code_frame___code_frame_7.10.1.tgz";
+      name = "_babel_code_frame___code_frame_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_code_frame___code_frame_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz";
-        sha1 = "d5481c5095daa1c57e16e54c6f9198443afb49ff";
+        name = "_babel_code_frame___code_frame_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz";
+        sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a";
       };
     }
     {
@@ -26,11 +26,11 @@
       };
     }
     {
-      name = "_babel_generator___generator_7.10.2.tgz";
+      name = "_babel_generator___generator_7.11.6.tgz";
       path = fetchurl {
-        name = "_babel_generator___generator_7.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz";
-        sha1 = "0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9";
+        name = "_babel_generator___generator_7.11.6.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz";
+        sha1 = "b868900f81b163b4d464ea24545c61cbac4dc620";
       };
     }
     {
@@ -90,19 +90,19 @@
       };
     }
     {
-      name = "_babel_helper_function_name___helper_function_name_7.10.1.tgz";
+      name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_function_name___helper_function_name_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz";
-        sha1 = "92bd63829bfc9215aca9d9defa85f56b539454f4";
+        name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";
+        sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a";
       };
     }
     {
-      name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.1.tgz";
+      name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz";
-        sha1 = "7303390a81ba7cb59613895a192b93850e373f7d";
+        name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";
+        sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2";
       };
     }
     {
@@ -114,43 +114,43 @@
       };
     }
     {
-      name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.10.1.tgz";
+      name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz";
       path = fetchurl {
-        name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz";
-        sha1 = "432967fd7e12a4afef66c4687d4ca22bc0456f15";
+        name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz";
+        sha1 = "ae69c83d84ee82f4b42f96e2a09410935a8f26df";
       };
     }
     {
-      name = "_babel_helper_module_imports___helper_module_imports_7.10.1.tgz";
+      name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_module_imports___helper_module_imports_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz";
-        sha1 = "dd331bd45bccc566ce77004e9d05fe17add13876";
+        name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz";
+        sha1 = "4c5c54be04bd31670a7382797d75b9fa2e5b5620";
       };
     }
     {
-      name = "_babel_helper_module_transforms___helper_module_transforms_7.10.1.tgz";
+      name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz";
       path = fetchurl {
-        name = "_babel_helper_module_transforms___helper_module_transforms_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz";
-        sha1 = "24e2f08ee6832c60b157bb0936c86bef7210c622";
+        name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz";
+        sha1 = "b16f250229e47211abdd84b34b64737c2ab2d359";
       };
     }
     {
-      name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.1.tgz";
+      name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz";
-        sha1 = "b4a1f2561870ce1247ceddb02a3860fa96d72543";
+        name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz";
+        sha1 = "50dc96413d594f995a77905905b05893cd779673";
       };
     }
     {
-      name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.1.tgz";
+      name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz";
-        sha1 = "ec5a5cf0eec925b66c60580328b122c01230a127";
+        name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz";
+        sha1 = "2f75a831269d4f677de49986dff59927533cf375";
       };
     }
     {
@@ -170,35 +170,35 @@
       };
     }
     {
-      name = "_babel_helper_replace_supers___helper_replace_supers_7.10.1.tgz";
+      name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_replace_supers___helper_replace_supers_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz";
-        sha1 = "ec6859d20c5d8087f6a2dc4e014db7228975f13d";
+        name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz";
+        sha1 = "d585cd9388ea06e6031e4cd44b6713cbead9e6cf";
       };
     }
     {
-      name = "_babel_helper_simple_access___helper_simple_access_7.10.1.tgz";
+      name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_simple_access___helper_simple_access_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz";
-        sha1 = "08fb7e22ace9eb8326f7e3920a1c2052f13d851e";
+        name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz";
+        sha1 = "0f5ccda2945277a2a7a2d3a821e15395edcf3461";
       };
     }
     {
-      name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.1.tgz";
+      name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz";
       path = fetchurl {
-        name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz";
-        sha1 = "c6f4be1cbc15e3a868e4c64a17d5d31d754da35f";
+        name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz";
+        sha1 = "f8a491244acf6a676158ac42072911ba83ad099f";
       };
     }
     {
-      name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.1.tgz";
+      name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz";
-        sha1 = "5770b0c1a826c4f53f5ede5e153163e0318e94b5";
+        name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz";
+        sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2";
       };
     }
     {
@@ -218,19 +218,19 @@
       };
     }
     {
-      name = "_babel_highlight___highlight_7.10.1.tgz";
+      name = "_babel_highlight___highlight_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_highlight___highlight_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz";
-        sha1 = "841d098ba613ba1a427a2b383d79e35552c38ae0";
+        name = "_babel_highlight___highlight_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz";
+        sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143";
       };
     }
     {
-      name = "_babel_parser___parser_7.10.2.tgz";
+      name = "_babel_parser___parser_7.11.5.tgz";
       path = fetchurl {
-        name = "_babel_parser___parser_7.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz";
-        sha1 = "871807f10442b92ff97e4783b9b54f6a0ca812d0";
+        name = "_babel_parser___parser_7.11.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz";
+        sha1 = "c7ff6303df71080ec7a4f5b8c003c58f1cf51037";
       };
     }
     {
@@ -329,6 +329,14 @@
         sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d";
       };
     }
+    {
+      name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz";
+        sha1 = "4c9a6f669f5d0cdf1b90a1671e9a146be5300cea";
+      };
+    }
     {
       name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.1.tgz";
       path = fetchurl {
@@ -346,11 +354,11 @@
       };
     }
     {
-      name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.1.tgz";
+      name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.1.tgz";
-        sha1 = "3e59120ed8b3c2ccc5abb1cfc7aaa3ea01cd36b6";
+        name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz";
+        sha1 = "ee601348c370fa334d2207be158777496521fd51";
       };
     }
     {
@@ -361,6 +369,14 @@
         sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a";
       };
     }
+    {
+      name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.1.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.1.tgz";
+        sha1 = "fffee77b4934ce77f3b427649ecdddbec1958550";
+      };
+    }
     {
       name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz";
       path = fetchurl {
@@ -530,11 +546,11 @@
       };
     }
     {
-      name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.1.tgz";
+      name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz";
-        sha1 = "d5ff4b4413ed97ffded99961056e1fb980fb9301";
+        name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz";
+        sha1 = "66667c3eeda1ebf7896d41f1f16b17105a2fbca0";
       };
     }
     {
@@ -690,11 +706,11 @@
       };
     }
     {
-      name = "_babel_runtime___runtime_7.10.4.tgz";
+      name = "_babel_runtime___runtime_7.11.2.tgz";
       path = fetchurl {
-        name = "_babel_runtime___runtime_7.10.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz";
-        sha1 = "a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99";
+        name = "_babel_runtime___runtime_7.11.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz";
+        sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736";
       };
     }
     {
@@ -706,27 +722,35 @@
       };
     }
     {
-      name = "_babel_template___template_7.10.1.tgz";
+      name = "_babel_template___template_7.10.4.tgz";
       path = fetchurl {
-        name = "_babel_template___template_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz";
-        sha1 = "e167154a94cb5f14b28dc58f5356d2162f539811";
+        name = "_babel_template___template_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz";
+        sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278";
       };
     }
     {
-      name = "_babel_traverse___traverse_7.10.1.tgz";
+      name = "_babel_traverse___traverse_7.11.5.tgz";
       path = fetchurl {
-        name = "_babel_traverse___traverse_7.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz";
-        sha1 = "bbcef3031e4152a6c0b50147f4958df54ca0dd27";
+        name = "_babel_traverse___traverse_7.11.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz";
+        sha1 = "be777b93b518eb6d76ee2e1ea1d143daa11e61c3";
       };
     }
     {
-      name = "_babel_types___types_7.10.2.tgz";
+      name = "_babel_types___types_7.11.5.tgz";
       path = fetchurl {
-        name = "_babel_types___types_7.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz";
-        sha1 = "30283be31cad0dbf6fb00bd40641ca0ea675172d";
+        name = "_babel_types___types_7.11.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz";
+        sha1 = "d9de577d01252d77c6800cee039ee64faf75662d";
+      };
+    }
+    {
+      name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz";
+      path = fetchurl {
+        name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz";
+        sha1 = "75a2e8b51cb758a7553d6804a5932d7aace75c39";
       };
     }
     {
@@ -738,11 +762,11 @@
       };
     }
     {
-      name = "_cnakazawa_watch___watch_1.0.3.tgz";
+      name = "_cnakazawa_watch___watch_1.0.4.tgz";
       path = fetchurl {
-        name = "_cnakazawa_watch___watch_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz";
-        sha1 = "099139eaec7ebf07a27c1786a3ff64f39464d2ef";
+        name = "_cnakazawa_watch___watch_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz";
+        sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a";
       };
     }
     {
@@ -762,19 +786,19 @@
       };
     }
     {
-      name = "_gitlab_svgs___svgs_1.164.0.tgz";
+      name = "_gitlab_svgs___svgs_1.171.0.tgz";
       path = fetchurl {
-        name = "_gitlab_svgs___svgs_1.164.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.164.0.tgz";
-        sha1 = "6cefad871c45f945ef92b99015d0f510b1d2de4a";
+        name = "_gitlab_svgs___svgs_1.171.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.171.0.tgz";
+        sha1 = "abc3092bf804f0898301626130e0f3231834924a";
       };
     }
     {
-      name = "_gitlab_ui___ui_21.3.1.tgz";
+      name = "_gitlab_ui___ui_21.33.0.tgz";
       path = fetchurl {
-        name = "_gitlab_ui___ui_21.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.3.1.tgz";
-        sha1 = "027b767804540539da73d4874370895d7398adea";
+        name = "_gitlab_ui___ui_21.33.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.33.0.tgz";
+        sha1 = "83dd7e4d65557f7b82ce1f9d7d6e7a1c54cb3dbc";
       };
     }
     {
@@ -794,91 +818,99 @@
       };
     }
     {
-      name = "_jest_console___console_24.7.1.tgz";
+      name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz";
       path = fetchurl {
-        name = "_jest_console___console_24.7.1.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz";
-        sha1 = "32a9e42535a97aedfe037e725bd67e954b459545";
+        name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz";
+        sha1 = "fd3db1d59ecf7cf121e80650bb86712f9b55eced";
       };
     }
     {
-      name = "_jest_core___core_24.8.0.tgz";
+      name = "_istanbuljs_schema___schema_0.1.2.tgz";
       path = fetchurl {
-        name = "_jest_core___core_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/core/-/core-24.8.0.tgz";
-        sha1 = "fbbdcd42a41d0d39cddbc9f520c8bab0c33eed5b";
+        name = "_istanbuljs_schema___schema_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz";
+        sha1 = "26520bf09abe4a5644cd5414e37125a8954241dd";
       };
     }
     {
-      name = "_jest_environment___environment_24.8.0.tgz";
+      name = "_jest_console___console_26.5.2.tgz";
       path = fetchurl {
-        name = "_jest_environment___environment_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/environment/-/environment-24.8.0.tgz";
-        sha1 = "0342261383c776bdd652168f68065ef144af0eac";
+        name = "_jest_console___console_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/console/-/console-26.5.2.tgz";
+        sha1 = "94fc4865b1abed7c352b5e21e6c57be4b95604a6";
       };
     }
     {
-      name = "_jest_fake_timers___fake_timers_24.8.0.tgz";
+      name = "_jest_core___core_26.5.2.tgz";
       path = fetchurl {
-        name = "_jest_fake_timers___fake_timers_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.8.0.tgz";
-        sha1 = "2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1";
+        name = "_jest_core___core_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/core/-/core-26.5.2.tgz";
+        sha1 = "e39f14676f4ba4632ecabfdc374071ab22131f22";
       };
     }
     {
-      name = "_jest_fake_timers___fake_timers_25.5.0.tgz";
+      name = "_jest_environment___environment_26.5.2.tgz";
       path = fetchurl {
-        name = "_jest_fake_timers___fake_timers_25.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.5.0.tgz";
-        sha1 = "46352e00533c024c90c2bc2ad9f2959f7f114185";
+        name = "_jest_environment___environment_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/environment/-/environment-26.5.2.tgz";
+        sha1 = "eba3cfc698f6e03739628f699c28e8a07f5e65fe";
       };
     }
     {
-      name = "_jest_reporters___reporters_24.8.0.tgz";
+      name = "_jest_fake_timers___fake_timers_26.5.2.tgz";
       path = fetchurl {
-        name = "_jest_reporters___reporters_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.8.0.tgz";
-        sha1 = "075169cd029bddec54b8f2c0fc489fd0b9e05729";
+        name = "_jest_fake_timers___fake_timers_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.5.2.tgz";
+        sha1 = "1291ac81680ceb0dc7daa1f92c059307eea6400a";
       };
     }
     {
-      name = "_jest_source_map___source_map_24.3.0.tgz";
+      name = "_jest_globals___globals_26.5.2.tgz";
       path = fetchurl {
-        name = "_jest_source_map___source_map_24.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz";
-        sha1 = "563be3aa4d224caf65ff77edc95cd1ca4da67f28";
+        name = "_jest_globals___globals_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/globals/-/globals-26.5.2.tgz";
+        sha1 = "c333f82c29e19ecb609a75d1a532915a5c956c59";
       };
     }
     {
-      name = "_jest_test_result___test_result_24.8.0.tgz";
+      name = "_jest_reporters___reporters_26.5.2.tgz";
       path = fetchurl {
-        name = "_jest_test_result___test_result_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz";
-        sha1 = "7675d0aaf9d2484caa65e048d9b467d160f8e9d3";
+        name = "_jest_reporters___reporters_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.5.2.tgz";
+        sha1 = "0f1c900c6af712b46853d9d486c9c0382e4050f6";
       };
     }
     {
-      name = "_jest_test_sequencer___test_sequencer_24.8.0.tgz";
+      name = "_jest_source_map___source_map_26.5.0.tgz";
       path = fetchurl {
-        name = "_jest_test_sequencer___test_sequencer_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz";
-        sha1 = "2f993bcf6ef5eb4e65e8233a95a3320248cf994b";
+        name = "_jest_source_map___source_map_26.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.5.0.tgz";
+        sha1 = "98792457c85bdd902365cd2847b58fff05d96367";
       };
     }
     {
-      name = "_jest_transform___transform_24.8.0.tgz";
+      name = "_jest_test_result___test_result_26.5.2.tgz";
       path = fetchurl {
-        name = "_jest_transform___transform_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz";
-        sha1 = "628fb99dce4f9d254c6fd9341e3eea262e06fef5";
+        name = "_jest_test_result___test_result_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.5.2.tgz";
+        sha1 = "cc1a44cfd4db2ecee3fb0bc4e9fe087aa54b5230";
       };
     }
     {
-      name = "_jest_types___types_24.8.0.tgz";
+      name = "_jest_test_sequencer___test_sequencer_26.5.2.tgz";
       path = fetchurl {
-        name = "_jest_types___types_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz";
-        sha1 = "f31e25948c58f0abd8c845ae26fcea1491dea7ad";
+        name = "_jest_test_sequencer___test_sequencer_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz";
+        sha1 = "c4559c7e134b27b020317303ee5399bf62917a4b";
+      };
+    }
+    {
+      name = "_jest_transform___transform_26.5.2.tgz";
+      path = fetchurl {
+        name = "_jest_transform___transform_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/transform/-/transform-26.5.2.tgz";
+        sha1 = "6a0033a1d24316a1c75184d010d864f2c681bef5";
       };
     }
     {
@@ -889,6 +921,14 @@
         sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d";
       };
     }
+    {
+      name = "_jest_types___types_26.5.2.tgz";
+      path = fetchurl {
+        name = "_jest_types___types_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/types/-/types-26.5.2.tgz";
+        sha1 = "44c24f30c8ee6c7f492ead9ec3f3c62a5289756d";
+      };
+    }
     {
       name = "_miragejs_pretender_node_polyfill___pretender_node_polyfill_0.1.2.tgz";
       path = fetchurl {
@@ -922,59 +962,19 @@
       };
     }
     {
-      name = "_rails_actioncable___actioncable_6.0.3_1.tgz";
+      name = "_rails_actioncable___actioncable_6.0.3_3.tgz";
       path = fetchurl {
-        name = "_rails_actioncable___actioncable_6.0.3_1.tgz";
-        url  = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3-1.tgz";
-        sha1 = "9b9eb8858a6507162911007d355d9a206e1c5caa";
+        name = "_rails_actioncable___actioncable_6.0.3_3.tgz";
+        url  = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3-3.tgz";
+        sha1 = "fb1a46d3d353512764d5fa3cea2f492391601b7a";
       };
     }
     {
-      name = "_sentry_browser___browser_5.22.3.tgz";
+      name = "_rails_ujs___ujs_6.0.3_2.tgz";
       path = fetchurl {
-        name = "_sentry_browser___browser_5.22.3.tgz";
-        url  = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.22.3.tgz";
-        sha1 = "7a64bd1cf01bf393741a3e4bf35f82aa927f5b4e";
-      };
-    }
-    {
-      name = "_sentry_core___core_5.22.3.tgz";
-      path = fetchurl {
-        name = "_sentry_core___core_5.22.3.tgz";
-        url  = "https://registry.yarnpkg.com/@sentry/core/-/core-5.22.3.tgz";
-        sha1 = "030f435f2b518f282ba8bd954dac90cd70888bd7";
-      };
-    }
-    {
-      name = "_sentry_hub___hub_5.22.3.tgz";
-      path = fetchurl {
-        name = "_sentry_hub___hub_5.22.3.tgz";
-        url  = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.22.3.tgz";
-        sha1 = "08309a70d2ea8d5e313d05840c1711f34f2fffe5";
-      };
-    }
-    {
-      name = "_sentry_minimal___minimal_5.22.3.tgz";
-      path = fetchurl {
-        name = "_sentry_minimal___minimal_5.22.3.tgz";
-        url  = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.22.3.tgz";
-        sha1 = "706e4029ae5494123d3875c658ba8911aa5cc440";
-      };
-    }
-    {
-      name = "_sentry_types___types_5.22.3.tgz";
-      path = fetchurl {
-        name = "_sentry_types___types_5.22.3.tgz";
-        url  = "https://registry.yarnpkg.com/@sentry/types/-/types-5.22.3.tgz";
-        sha1 = "d1d547b30ee8bd7771fa893af74c4f3d71f0fd18";
-      };
-    }
-    {
-      name = "_sentry_utils___utils_5.22.3.tgz";
-      path = fetchurl {
-        name = "_sentry_utils___utils_5.22.3.tgz";
-        url  = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.22.3.tgz";
-        sha1 = "e3bda3e789239eb16d436f768daa12829f33d18f";
+        name = "_rails_ujs___ujs_6.0.3_2.tgz";
+        url  = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.3-2.tgz";
+        sha1 = "e14c1f29086858215ce7ccd9ad6d8888c458b4a3";
       };
     }
     {
@@ -986,11 +986,19 @@
       };
     }
     {
-      name = "_sinonjs_commons___commons_1.8.0.tgz";
+      name = "_sinonjs_commons___commons_1.8.1.tgz";
       path = fetchurl {
-        name = "_sinonjs_commons___commons_1.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz";
-        sha1 = "c8d68821a854c555bba172f3b06959a0039b236d";
+        name = "_sinonjs_commons___commons_1.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz";
+        sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217";
+      };
+    }
+    {
+      name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz";
+      path = fetchurl {
+        name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz";
+        sha1 = "293674fccb3262ac782c7aadfdeca86b10c75c40";
       };
     }
     {
@@ -1010,11 +1018,11 @@
       };
     }
     {
-      name = "_testing_library_dom___dom_7.16.2.tgz";
+      name = "_testing_library_dom___dom_7.24.5.tgz";
       path = fetchurl {
-        name = "_testing_library_dom___dom_7.16.2.tgz";
-        url  = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.16.2.tgz";
-        sha1 = "f7a20b5548817e5c7ed26077913372d977be90af";
+        name = "_testing_library_dom___dom_7.24.5.tgz";
+        url  = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.24.5.tgz";
+        sha1 = "862124eec8c37ad184716379f09742476b23815d";
       };
     }
     {
@@ -1034,11 +1042,19 @@
       };
     }
     {
-      name = "_types_babel__core___babel__core_7.1.2.tgz";
+      name = "_types_aria_query___aria_query_4.2.0.tgz";
       path = fetchurl {
-        name = "_types_babel__core___babel__core_7.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz";
-        sha1 = "608c74f55928033fce18b99b213c16be4b3d114f";
+        name = "_types_aria_query___aria_query_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz";
+        sha1 = "14264692a9d6e2fa4db3df5e56e94b5e25647ac0";
+      };
+    }
+    {
+      name = "_types_babel__core___babel__core_7.1.9.tgz";
+      path = fetchurl {
+        name = "_types_babel__core___babel__core_7.1.9.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz";
+        sha1 = "77e59d438522a6fb898fa43dc3455c6e72f3963d";
       };
     }
     {
@@ -1058,11 +1074,11 @@
       };
     }
     {
-      name = "_types_babel__traverse___babel__traverse_7.0.6.tgz";
+      name = "_types_babel__traverse___babel__traverse_7.0.15.tgz";
       path = fetchurl {
-        name = "_types_babel__traverse___babel__traverse_7.0.6.tgz";
-        url  = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.6.tgz";
-        sha1 = "328dd1a8fc4cfe3c8458be9477b219ea158fd7b2";
+        name = "_types_babel__traverse___babel__traverse_7.0.15.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz";
+        sha1 = "db9e4238931eb69ef8aab0ad6523d4d4caa39d03";
       };
     }
     {
@@ -1106,11 +1122,19 @@
       };
     }
     {
-      name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz";
+      name = "_types_graceful_fs___graceful_fs_4.1.3.tgz";
       path = fetchurl {
-        name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz";
-        sha1 = "42995b446db9a48a11a07ec083499a860e9138ff";
+        name = "_types_graceful_fs___graceful_fs_4.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz";
+        sha1 = "039af35fe26bec35003e8d86d2ee9c586354348f";
+      };
+    }
+    {
+      name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.2.tgz";
+      path = fetchurl {
+        name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz";
+        sha1 = "79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5";
       };
     }
     {
@@ -1129,6 +1153,22 @@
         sha1 = "7a8cbf6a406f36c8add871625b278eaf0b0d255a";
       };
     }
+    {
+      name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz";
+      path = fetchurl {
+        name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz";
+        sha1 = "508b13aa344fa4976234e75dddcc34925737d821";
+      };
+    }
+    {
+      name = "_types_jest___jest_26.0.14.tgz";
+      path = fetchurl {
+        name = "_types_jest___jest_26.0.14.tgz";
+        url  = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz";
+        sha1 = "078695f8f65cb55c5a98450d65083b2b73e5a3f3";
+      };
+    }
     {
       name = "_types_json_schema___json_schema_7.0.4.tgz";
       path = fetchurl {
@@ -1153,6 +1193,14 @@
         sha1 = "a07bfa74331471e1dc22a47eb72026843f7b95c8";
       };
     }
+    {
+      name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz";
+      path = fetchurl {
+        name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
+        sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e";
+      };
+    }
     {
       name = "_types_parse5___parse5_5.0.0.tgz";
       path = fetchurl {
@@ -1162,11 +1210,19 @@
       };
     }
     {
-      name = "_types_stack_utils___stack_utils_1.0.1.tgz";
+      name = "_types_prettier___prettier_2.0.2.tgz";
       path = fetchurl {
-        name = "_types_stack_utils___stack_utils_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz";
-        sha1 = "0a851d3bd96498fa25c33ab7278ed3bd65f06c3e";
+        name = "_types_prettier___prettier_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.2.tgz";
+        sha1 = "5bb52ee68d0f8efa9cc0099920e56be6cc4e37f3";
+      };
+    }
+    {
+      name = "_types_stack_utils___stack_utils_2.0.0.tgz";
+      path = fetchurl {
+        name = "_types_stack_utils___stack_utils_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz";
+        sha1 = "7036640b4e21cc2f259ae826ce843d277dad8cff";
       };
     }
     {
@@ -1209,14 +1265,6 @@
         sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d";
       };
     }
-    {
-      name = "_types_yargs___yargs_12.0.12.tgz";
-      path = fetchurl {
-        name = "_types_yargs___yargs_12.0.12.tgz";
-        url  = "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz";
-        sha1 = "45dd1d0638e8c8f153e87d296907659296873916";
-      };
-    }
     {
       name = "_types_yargs___yargs_15.0.5.tgz";
       path = fetchurl {
@@ -1249,14 +1297,6 @@
         sha1 = "1b8e848b55144270255ffbfe4c63291f8f766615";
       };
     }
-    {
-      name = "_vue_component_compiler_utils___component_compiler_utils_2.6.0.tgz";
-      path = fetchurl {
-        name = "_vue_component_compiler_utils___component_compiler_utils_2.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz";
-        sha1 = "aa46d2a6f7647440b0b8932434d22f12371e543b";
-      };
-    }
     {
       name = "_vue_component_compiler_utils___component_compiler_utils_3.1.1.tgz";
       path = fetchurl {
@@ -1458,19 +1498,19 @@
       };
     }
     {
-      name = "abab___abab_2.0.3.tgz";
+      name = "abab___abab_2.0.5.tgz";
       path = fetchurl {
-        name = "abab___abab_2.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz";
-        sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a";
+        name = "abab___abab_2.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz";
+        sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a";
       };
     }
     {
-      name = "abbrev___abbrev_1.0.9.tgz";
+      name = "abbrev___abbrev_1.1.1.tgz";
       path = fetchurl {
-        name = "abbrev___abbrev_1.0.9.tgz";
-        url  = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz";
-        sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135";
+        name = "abbrev___abbrev_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz";
+        sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8";
       };
     }
     {
@@ -1481,14 +1521,6 @@
         sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd";
       };
     }
-    {
-      name = "acorn_globals___acorn_globals_4.3.0.tgz";
-      path = fetchurl {
-        name = "acorn_globals___acorn_globals_4.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz";
-        sha1 = "e3b6f8da3c1552a95ae627571f7dd6923bb54103";
-      };
-    }
     {
       name = "acorn_globals___acorn_globals_6.0.0.tgz";
       path = fetchurl {
@@ -1514,19 +1546,11 @@
       };
     }
     {
-      name = "acorn_walk___acorn_walk_7.1.1.tgz";
+      name = "acorn_walk___acorn_walk_7.2.0.tgz";
       path = fetchurl {
-        name = "acorn_walk___acorn_walk_7.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz";
-        sha1 = "345f0dffad5c735e7373d2fec9a1023e6a44b83e";
-      };
-    }
-    {
-      name = "acorn___acorn_5.7.3.tgz";
-      path = fetchurl {
-        name = "acorn___acorn_5.7.3.tgz";
-        url  = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz";
-        sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279";
+        name = "acorn_walk___acorn_walk_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz";
+        sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc";
       };
     }
     {
@@ -1538,11 +1562,11 @@
       };
     }
     {
-      name = "acorn___acorn_7.2.0.tgz";
+      name = "acorn___acorn_7.4.1.tgz";
       path = fetchurl {
-        name = "acorn___acorn_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz";
-        sha1 = "17ea7e40d7c8640ff54a694c889c26f31704effe";
+        name = "acorn___acorn_7.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz";
+        sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa";
       };
     }
     {
@@ -1578,11 +1602,11 @@
       };
     }
     {
-      name = "ajv___ajv_6.11.0.tgz";
+      name = "ajv___ajv_6.12.5.tgz";
       path = fetchurl {
-        name = "ajv___ajv_6.11.0.tgz";
-        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz";
-        sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9";
+        name = "ajv___ajv_6.12.5.tgz";
+        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz";
+        sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da";
       };
     }
     {
@@ -1609,14 +1633,6 @@
         sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf";
       };
     }
-    {
-      name = "ansi_escapes___ansi_escapes_3.2.0.tgz";
-      path = fetchurl {
-        name = "ansi_escapes___ansi_escapes_3.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz";
-        sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b";
-      };
-    }
     {
       name = "ansi_escapes___ansi_escapes_4.3.0.tgz";
       path = fetchurl {
@@ -1810,11 +1826,11 @@
       };
     }
     {
-      name = "aria_query___aria_query_4.2.0.tgz";
+      name = "aria_query___aria_query_4.2.2.tgz";
       path = fetchurl {
-        name = "aria_query___aria_query_4.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.0.tgz";
-        sha1 = "3774158e138a84c4790b58afc17e09711071d888";
+        name = "aria_query___aria_query_4.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz";
+        sha1 = "0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b";
       };
     }
     {
@@ -1841,14 +1857,6 @@
         sha1 = "e39b09aea9def866a8f206e288af63919bae39c4";
       };
     }
-    {
-      name = "array_equal___array_equal_1.0.0.tgz";
-      path = fetchurl {
-        name = "array_equal___array_equal_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz";
-        sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93";
-      };
-    }
     {
       name = "array_find_index___array_find_index_1.0.2.tgz";
       path = fetchurl {
@@ -2058,11 +2066,11 @@
       };
     }
     {
-      name = "aws4___aws4_1.8.0.tgz";
+      name = "aws4___aws4_1.10.1.tgz";
       path = fetchurl {
-        name = "aws4___aws4_1.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz";
-        sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f";
+        name = "aws4___aws4_1.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz";
+        sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428";
       };
     }
     {
@@ -2090,11 +2098,11 @@
       };
     }
     {
-      name = "babel_jest___babel_jest_24.8.0.tgz";
+      name = "babel_jest___babel_jest_26.5.2.tgz";
       path = fetchurl {
-        name = "babel_jest___babel_jest_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz";
-        sha1 = "5c15ff2b28e20b0f45df43fe6b7f2aae93dba589";
+        name = "babel_jest___babel_jest_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.5.2.tgz";
+        sha1 = "164f367a35946c6cf54eaccde8762dec50422250";
       };
     }
     {
@@ -2114,19 +2122,19 @@
       };
     }
     {
-      name = "babel_plugin_istanbul___babel_plugin_istanbul_5.1.0.tgz";
+      name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz";
       path = fetchurl {
-        name = "babel_plugin_istanbul___babel_plugin_istanbul_5.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.0.tgz";
-        sha1 = "6892f529eff65a3e2d33d87dc5888ffa2ecd4a30";
+        name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz";
+        sha1 = "e159ccdc9af95e0b570c75b4573b7c34d671d765";
       };
     }
     {
-      name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_24.6.0.tgz";
+      name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.5.0.tgz";
       path = fetchurl {
-        name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_24.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz";
-        sha1 = "f7f7f7ad150ee96d7a5e8e2c5da8319579e78019";
+        name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz";
+        sha1 = "3916b3a28129c29528de91e5784a44680db46385";
       };
     }
     {
@@ -2138,11 +2146,19 @@
       };
     }
     {
-      name = "babel_preset_jest___babel_preset_jest_24.6.0.tgz";
+      name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_0.1.4.tgz";
       path = fetchurl {
-        name = "babel_preset_jest___babel_preset_jest_24.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz";
-        sha1 = "66f06136eefce87797539c0d63f1769cc3915984";
+        name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz";
+        sha1 = "826f1f8e7245ad534714ba001f84f7e906c3b615";
+      };
+    }
+    {
+      name = "babel_preset_jest___babel_preset_jest_26.5.0.tgz";
+      path = fetchurl {
+        name = "babel_preset_jest___babel_preset_jest_26.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz";
+        sha1 = "f1b166045cd21437d1188d29f7fba470d5bdb0e7";
       };
     }
     {
@@ -2265,14 +2281,6 @@
         sha1 = "3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935";
       };
     }
-    {
-      name = "bindings___bindings_1.5.0.tgz";
-      path = fetchurl {
-        name = "bindings___bindings_1.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz";
-        sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df";
-      };
-    }
     {
       name = "blob___blob_0.0.4.tgz";
       path = fetchurl {
@@ -2385,14 +2393,6 @@
         sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626";
       };
     }
-    {
-      name = "browser_resolve___browser_resolve_1.11.3.tgz";
-      path = fetchurl {
-        name = "browser_resolve___browser_resolve_1.11.3.tgz";
-        url  = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz";
-        sha1 = "9b7cbb3d0f510e4cb86bdbd796124d28b5890af6";
-      };
-    }
     {
       name = "browserify_aes___browserify_aes_1.1.1.tgz";
       path = fetchurl {
@@ -2458,11 +2458,11 @@
       };
     }
     {
-      name = "bser___bser_2.0.0.tgz";
+      name = "bser___bser_2.1.1.tgz";
       path = fetchurl {
-        name = "bser___bser_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz";
-        sha1 = "9ac78d3ed5d915804fd87acb158bc797147a1719";
+        name = "bser___bser_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz";
+        sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05";
       };
     }
     {
@@ -2649,14 +2649,6 @@
         sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f";
       };
     }
-    {
-      name = "camelcase___camelcase_3.0.0.tgz";
-      path = fetchurl {
-        name = "camelcase___camelcase_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz";
-        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
-      };
-    }
     {
       name = "camelcase___camelcase_4.1.0.tgz";
       path = fetchurl {
@@ -2673,6 +2665,14 @@
         sha1 = "e3c9b31569e106811df242f715725a1f4c494320";
       };
     }
+    {
+      name = "camelcase___camelcase_6.0.0.tgz";
+      path = fetchurl {
+        name = "camelcase___camelcase_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz";
+        sha1 = "5259f7c30e35e278f1bdc2a4d91230b37cad981e";
+      };
+    }
     {
       name = "caniuse_lite___caniuse_lite_1.0.30001081.tgz";
       path = fetchurl {
@@ -2737,6 +2737,22 @@
         sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4";
       };
     }
+    {
+      name = "chalk___chalk_4.1.0.tgz";
+      path = fetchurl {
+        name = "chalk___chalk_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz";
+        sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a";
+      };
+    }
+    {
+      name = "char_regex___char_regex_1.0.2.tgz";
+      path = fetchurl {
+        name = "char_regex___char_regex_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz";
+        sha1 = "d744358226217f981ed58f479b1d6bcc29545dcf";
+      };
+    }
     {
       name = "character_entities_html4___character_entities_html4_1.1.2.tgz";
       path = fetchurl {
@@ -2897,14 +2913,6 @@
         sha1 = "52921296eec0fdf77ead1749421b21c968647376";
       };
     }
-    {
-      name = "cliui___cliui_3.2.0.tgz";
-      path = fetchurl {
-        name = "cliui___cliui_3.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz";
-        sha1 = "120601537a916d29940f934da3b48d585a39213d";
-      };
-    }
     {
       name = "cliui___cliui_4.1.0.tgz";
       path = fetchurl {
@@ -2921,6 +2929,14 @@
         sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5";
       };
     }
+    {
+      name = "cliui___cliui_6.0.0.tgz";
+      path = fetchurl {
+        name = "cliui___cliui_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz";
+        sha1 = "511d702c0c4e41ca156d7d0e96021f23e13225b1";
+      };
+    }
     {
       name = "clone_deep___clone_deep_4.0.1.tgz";
       path = fetchurl {
@@ -3001,6 +3017,14 @@
         sha1 = "c2495b699ab1ed380d29a1091e01063e75dbbe3a";
       };
     }
+    {
+      name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz";
+      path = fetchurl {
+        name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz";
+        sha1 = "cc2c8e94fc18bbdffe64d6534570c8a673b27f59";
+      };
+    }
     {
       name = "collection_visit___collection_visit_1.0.0.tgz";
       path = fetchurl {
@@ -3058,11 +3082,11 @@
       };
     }
     {
-      name = "combined_stream___combined_stream_1.0.7.tgz";
+      name = "combined_stream___combined_stream_1.0.8.tgz";
       path = fetchurl {
-        name = "combined_stream___combined_stream_1.0.7.tgz";
-        url  = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz";
-        sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828";
+        name = "combined_stream___combined_stream_1.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz";
+        sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f";
       };
     }
     {
@@ -3441,6 +3465,14 @@
         sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982";
       };
     }
+    {
+      name = "cross_spawn___cross_spawn_7.0.3.tgz";
+      path = fetchurl {
+        name = "cross_spawn___cross_spawn_7.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz";
+        sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6";
+      };
+    }
     {
       name = "crypt___crypt_0.0.2.tgz";
       path = fetchurl {
@@ -3505,14 +3537,6 @@
         sha1 = "c646755c73971f2bba6a601e2cf2fd71b1298929";
       };
     }
-    {
-      name = "cssesc___cssesc_2.0.0.tgz";
-      path = fetchurl {
-        name = "cssesc___cssesc_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz";
-        sha1 = "3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703";
-      };
-    }
     {
       name = "cssesc___cssesc_3.0.0.tgz";
       path = fetchurl {
@@ -3529,14 +3553,6 @@
         sha1 = "f4022fc8f9700c68029d542084afbaf425a3f3e3";
       };
     }
-    {
-      name = "cssom___cssom_0.3.8.tgz";
-      path = fetchurl {
-        name = "cssom___cssom_0.3.8.tgz";
-        url  = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz";
-        sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a";
-      };
-    }
     {
       name = "cssom___cssom_0.4.4.tgz";
       path = fetchurl {
@@ -3546,11 +3562,11 @@
       };
     }
     {
-      name = "cssstyle___cssstyle_1.1.1.tgz";
+      name = "cssom___cssom_0.3.8.tgz";
       path = fetchurl {
-        name = "cssstyle___cssstyle_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz";
-        sha1 = "18b038a9c44d65f7a8e428a653b9f6fe42faf5fb";
+        name = "cssom___cssom_0.3.8.tgz";
+        url  = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz";
+        sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a";
       };
     }
     {
@@ -3881,14 +3897,6 @@
         sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     }
-    {
-      name = "data_urls___data_urls_1.1.0.tgz";
-      path = fetchurl {
-        name = "data_urls___data_urls_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz";
-        sha1 = "15ee0582baa5e22bb59c77140da8f9c76963bbfe";
-      };
-    }
     {
       name = "data_urls___data_urls_2.0.0.tgz";
       path = fetchurl {
@@ -3978,11 +3986,11 @@
       };
     }
     {
-      name = "decimal.js___decimal.js_10.2.0.tgz";
+      name = "decimal.js___decimal.js_10.2.1.tgz";
       path = fetchurl {
-        name = "decimal.js___decimal.js_10.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.0.tgz";
-        sha1 = "39466113a9e036111d02f82489b5fd6b0b5ed231";
+        name = "decimal.js___decimal.js_10.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz";
+        sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3";
       };
     }
     {
@@ -4041,6 +4049,14 @@
         sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
       };
     }
+    {
+      name = "deepmerge___deepmerge_4.2.2.tgz";
+      path = fetchurl {
+        name = "deepmerge___deepmerge_4.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz";
+        sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955";
+      };
+    }
     {
       name = "default_gateway___default_gateway_4.2.0.tgz";
       path = fetchurl {
@@ -4170,11 +4186,11 @@
       };
     }
     {
-      name = "detect_newline___detect_newline_2.1.0.tgz";
+      name = "detect_newline___detect_newline_3.1.0.tgz";
       path = fetchurl {
-        name = "detect_newline___detect_newline_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz";
-        sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2";
+        name = "detect_newline___detect_newline_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz";
+        sha1 = "576f5dfc63ae1a192ff192d8ad3af6308991b651";
       };
     }
     {
@@ -4194,11 +4210,19 @@
       };
     }
     {
-      name = "diff_sequences___diff_sequences_24.3.0.tgz";
+      name = "diff_sequences___diff_sequences_25.2.6.tgz";
       path = fetchurl {
-        name = "diff_sequences___diff_sequences_24.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz";
-        sha1 = "0f20e8a1df1abddaf4d9c226680952e64118b975";
+        name = "diff_sequences___diff_sequences_25.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz";
+        sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd";
+      };
+    }
+    {
+      name = "diff_sequences___diff_sequences_26.5.0.tgz";
+      path = fetchurl {
+        name = "diff_sequences___diff_sequences_26.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.5.0.tgz";
+        sha1 = "ef766cf09d43ed40406611f11c6d8d9dd8b2fefd";
       };
     }
     {
@@ -4282,11 +4306,11 @@
       };
     }
     {
-      name = "dom_accessibility_api___dom_accessibility_api_0.4.5.tgz";
+      name = "dom_accessibility_api___dom_accessibility_api_0.5.3.tgz";
       path = fetchurl {
-        name = "dom_accessibility_api___dom_accessibility_api_0.4.5.tgz";
-        url  = "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.4.5.tgz";
-        sha1 = "d9c1cefa89f509d8cf132ab5d250004d755e76e3";
+        name = "dom_accessibility_api___dom_accessibility_api_0.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.3.tgz";
+        sha1 = "0ea493c924d4070dfbf531c4aaca3d7a2c601aab";
       };
     }
     {
@@ -4345,14 +4369,6 @@
         sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d";
       };
     }
-    {
-      name = "domexception___domexception_1.0.1.tgz";
-      path = fetchurl {
-        name = "domexception___domexception_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz";
-        sha1 = "937442644ca6a31261ef36e3ec677fe805582c90";
-      };
-    }
     {
       name = "domexception___domexception_2.0.1.tgz";
       path = fetchurl {
@@ -4370,11 +4386,11 @@
       };
     }
     {
-      name = "dompurify___dompurify_2.0.12.tgz";
+      name = "dompurify___dompurify_2.1.1.tgz";
       path = fetchurl {
-        name = "dompurify___dompurify_2.0.12.tgz";
-        url  = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.0.12.tgz";
-        sha1 = "284a2b041e1c60b8e72d7b4d2fadad36141254ae";
+        name = "dompurify___dompurify_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.1.1.tgz";
+        sha1 = "b5aa988676b093a9c836d8b855680a8598af25fe";
       };
     }
     {
@@ -4497,6 +4513,14 @@
         sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
       };
     }
+    {
+      name = "emittery___emittery_0.7.1.tgz";
+      path = fetchurl {
+        name = "emittery___emittery_0.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz";
+        sha1 = "c02375a927a40948c0345cc903072597f5270451";
+      };
+    }
     {
       name = "emoji_regex___emoji_regex_7.0.3.tgz";
       path = fetchurl {
@@ -4689,6 +4713,14 @@
         sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     }
+    {
+      name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz";
+      path = fetchurl {
+        name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz";
+        sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344";
+      };
+    }
     {
       name = "escaper___escaper_2.5.3.tgz";
       path = fetchurl {
@@ -4698,11 +4730,11 @@
       };
     }
     {
-      name = "escodegen___escodegen_1.14.2.tgz";
+      name = "escodegen___escodegen_1.14.3.tgz";
       path = fetchurl {
-        name = "escodegen___escodegen_1.14.2.tgz";
-        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.2.tgz";
-        sha1 = "14ab71bf5026c2aa08173afba22c6f3173284a84";
+        name = "escodegen___escodegen_1.14.3.tgz";
+        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz";
+        sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503";
       };
     }
     {
@@ -4906,11 +4938,11 @@
       };
     }
     {
-      name = "estraverse___estraverse_4.2.0.tgz";
+      name = "estraverse___estraverse_4.3.0.tgz";
       path = fetchurl {
-        name = "estraverse___estraverse_4.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz";
-        sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
+        name = "estraverse___estraverse_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz";
+        sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d";
       };
     }
     {
@@ -4978,11 +5010,11 @@
       };
     }
     {
-      name = "exec_sh___exec_sh_0.3.2.tgz";
+      name = "exec_sh___exec_sh_0.3.4.tgz";
       path = fetchurl {
-        name = "exec_sh___exec_sh_0.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz";
-        sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b";
+        name = "exec_sh___exec_sh_0.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz";
+        sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5";
       };
     }
     {
@@ -4993,6 +5025,14 @@
         sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8";
       };
     }
+    {
+      name = "execa___execa_4.0.3.tgz";
+      path = fetchurl {
+        name = "execa___execa_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz";
+        sha1 = "0a34dabbad6d66100bd6f2c576c8669403f317f2";
+      };
+    }
     {
       name = "execall___execall_2.0.0.tgz";
       path = fetchurl {
@@ -5026,11 +5066,11 @@
       };
     }
     {
-      name = "expect___expect_24.8.0.tgz";
+      name = "expect___expect_26.5.2.tgz";
       path = fetchurl {
-        name = "expect___expect_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz";
-        sha1 = "471f8ec256b7b6129ca2524b2a62f030df38718d";
+        name = "expect___expect_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/expect/-/expect-26.5.2.tgz";
+        sha1 = "3e0631c4a657a83dbec769ad246a2998953a55a6";
       };
     }
     {
@@ -5122,11 +5162,11 @@
       };
     }
     {
-      name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
+      name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
       path = fetchurl {
-        name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
-        sha1 = "545145077c501491e33b15ec408c294376e94ae4";
+        name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
+        sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525";
       };
     }
     {
@@ -5138,11 +5178,11 @@
       };
     }
     {
-      name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz";
+      name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz";
       path = fetchurl {
-        name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
-        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+        name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+        sha1 = "874bf69c6f404c2b5d99c481341399fd55892633";
       };
     }
     {
@@ -5178,11 +5218,11 @@
       };
     }
     {
-      name = "fb_watchman___fb_watchman_2.0.0.tgz";
+      name = "fb_watchman___fb_watchman_2.0.1.tgz";
       path = fetchurl {
-        name = "fb_watchman___fb_watchman_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz";
-        sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58";
+        name = "fb_watchman___fb_watchman_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz";
+        sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85";
       };
     }
     {
@@ -5217,14 +5257,6 @@
         sha1 = "cb56c070efc0e40666424309bd0d9e45ac6f2bb8";
       };
     }
-    {
-      name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz";
-      path = fetchurl {
-        name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
-        sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd";
-      };
-    }
     {
       name = "fileset___fileset_2.0.3.tgz";
       path = fetchurl {
@@ -5473,14 +5505,6 @@
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     }
-    {
-      name = "fsevents___fsevents_1.2.13.tgz";
-      path = fetchurl {
-        name = "fsevents___fsevents_1.2.13.tgz";
-        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz";
-        sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38";
-      };
-    }
     {
       name = "fsevents___fsevents_2.1.3.tgz";
       path = fetchurl {
@@ -5561,6 +5585,14 @@
         sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e";
       };
     }
+    {
+      name = "get_package_type___get_package_type_0.1.0.tgz";
+      path = fetchurl {
+        name = "get_package_type___get_package_type_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz";
+        sha1 = "8de2d803cff44df3bc6c456e6668b36c3926e11a";
+      };
+    }
     {
       name = "get_stdin___get_stdin_4.0.1.tgz";
       path = fetchurl {
@@ -5602,11 +5634,11 @@
       };
     }
     {
-      name = "get_stream___get_stream_5.1.0.tgz";
+      name = "get_stream___get_stream_5.2.0.tgz";
       path = fetchurl {
-        name = "get_stream___get_stream_5.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz";
-        sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9";
+        name = "get_stream___get_stream_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz";
+        sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3";
       };
     }
     {
@@ -5778,11 +5810,11 @@
       };
     }
     {
-      name = "globule___globule_1.2.1.tgz";
+      name = "globule___globule_1.3.2.tgz";
       path = fetchurl {
-        name = "globule___globule_1.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz";
-        sha1 = "5dffb1b191f22d20797a9369b49eab4e9839696d";
+        name = "globule___globule_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz";
+        sha1 = "d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4";
       };
     }
     {
@@ -5849,14 +5881,6 @@
         sha1 = "7fa79a80a69be4a31c27dda824dc04dac2035a72";
       };
     }
-    {
-      name = "gray_matter___gray_matter_4.0.2.tgz";
-      path = fetchurl {
-        name = "gray_matter___gray_matter_4.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.2.tgz";
-        sha1 = "9aa379e3acaf421193fce7d2a28cebd4518ac454";
-      };
-    }
     {
       name = "growly___growly_1.3.0.tgz";
       path = fetchurl {
@@ -5898,11 +5922,11 @@
       };
     }
     {
-      name = "har_validator___har_validator_5.1.3.tgz";
+      name = "har_validator___har_validator_5.1.5.tgz";
       path = fetchurl {
-        name = "har_validator___har_validator_5.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz";
-        sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080";
+        name = "har_validator___har_validator_5.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz";
+        sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd";
       };
     }
     {
@@ -6082,11 +6106,11 @@
       };
     }
     {
-      name = "hosted_git_info___hosted_git_info_2.2.0.tgz";
+      name = "hosted_git_info___hosted_git_info_2.8.8.tgz";
       path = fetchurl {
-        name = "hosted_git_info___hosted_git_info_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
-        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
+        name = "hosted_git_info___hosted_git_info_2.8.8.tgz";
+        url  = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
+        sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488";
       };
     }
     {
@@ -6097,14 +6121,6 @@
         sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2";
       };
     }
-    {
-      name = "html_encoding_sniffer___html_encoding_sniffer_1.0.2.tgz";
-      path = fetchurl {
-        name = "html_encoding_sniffer___html_encoding_sniffer_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz";
-        sha1 = "e70d84b94da53aa375e11fe3a351be6642ca46f8";
-      };
-    }
     {
       name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz";
       path = fetchurl {
@@ -6217,6 +6233,14 @@
         sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
       };
     }
+    {
+      name = "human_signals___human_signals_1.1.1.tgz";
+      path = fetchurl {
+        name = "human_signals___human_signals_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz";
+        sha1 = "c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3";
+      };
+    }
     {
       name = "iconv_lite___iconv_lite_0.4.24.tgz";
       path = fetchurl {
@@ -6345,6 +6369,14 @@
         sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d";
       };
     }
+    {
+      name = "import_local___import_local_3.0.2.tgz";
+      path = fetchurl {
+        name = "import_local___import_local_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz";
+        sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6";
+      };
+    }
     {
       name = "imports_loader___imports_loader_0.8.0.tgz";
       path = fetchurl {
@@ -6362,11 +6394,11 @@
       };
     }
     {
-      name = "in_publish___in_publish_2.0.0.tgz";
+      name = "in_publish___in_publish_2.0.1.tgz";
       path = fetchurl {
-        name = "in_publish___in_publish_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz";
-        sha1 = "e20ff5e3a2afc2690320b6dc552682a9c7fadf51";
+        name = "in_publish___in_publish_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz";
+        sha1 = "948b1a535c8030561cea522f73f78f4be357e00c";
       };
     }
     {
@@ -6489,14 +6521,6 @@
         sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6";
       };
     }
-    {
-      name = "invert_kv___invert_kv_1.0.0.tgz";
-      path = fetchurl {
-        name = "invert_kv___invert_kv_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz";
-        sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
-      };
-    }
     {
       name = "invert_kv___invert_kv_2.0.0.tgz";
       path = fetchurl {
@@ -6689,6 +6713,14 @@
         sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1";
       };
     }
+    {
+      name = "is_docker___is_docker_2.1.1.tgz";
+      path = fetchurl {
+        name = "is_docker___is_docker_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz";
+        sha1 = "4125a88e44e450d384e09047ede71adc2d144156";
+      };
+    }
     {
       name = "is_extendable___is_extendable_0.1.1.tgz";
       path = fetchurl {
@@ -6714,11 +6746,11 @@
       };
     }
     {
-      name = "is_finite___is_finite_1.0.2.tgz";
+      name = "is_finite___is_finite_1.1.0.tgz";
       path = fetchurl {
-        name = "is_finite___is_finite_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+        name = "is_finite___is_finite_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz";
+        sha1 = "904135c77fb42c0641d6aa1bcdbc4daa8da082f3";
       };
     }
     {
@@ -6921,6 +6953,14 @@
         sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
       };
     }
+    {
+      name = "is_stream___is_stream_2.0.0.tgz";
+      path = fetchurl {
+        name = "is_stream___is_stream_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz";
+        sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3";
+      };
+    }
     {
       name = "is_symbol___is_symbol_1.0.2.tgz";
       path = fetchurl {
@@ -6985,6 +7025,14 @@
         sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
       };
     }
+    {
+      name = "is_wsl___is_wsl_2.2.0.tgz";
+      path = fetchurl {
+        name = "is_wsl___is_wsl_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz";
+        sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271";
+      };
+    }
     {
       name = "is_yarn_global___is_yarn_global_0.3.0.tgz";
       path = fetchurl {
@@ -7089,6 +7137,14 @@
         sha1 = "a5f63d91f0bbc0c3e479ef4c5de027335ec6d630";
       };
     }
+    {
+      name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz";
+      path = fetchurl {
+        name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz";
+        sha1 = "873c6fff897450118222774696a3f28902d77c1d";
+      };
+    }
     {
       name = "istanbul_lib_report___istanbul_lib_report_2.0.8.tgz";
       path = fetchurl {
@@ -7113,6 +7169,14 @@
         sha1 = "284997c48211752ec486253da97e3879defba8c8";
       };
     }
+    {
+      name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz";
+      path = fetchurl {
+        name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz";
+        sha1 = "75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9";
+      };
+    }
     {
       name = "istanbul_reports___istanbul_reports_2.2.6.tgz";
       path = fetchurl {
@@ -7122,11 +7186,11 @@
       };
     }
     {
-      name = "istanbul_reports___istanbul_reports_3.0.0.tgz";
+      name = "istanbul_reports___istanbul_reports_3.0.2.tgz";
       path = fetchurl {
-        name = "istanbul_reports___istanbul_reports_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.0.tgz";
-        sha1 = "d4d16d035db99581b6194e119bbf36c963c5eb70";
+        name = "istanbul_reports___istanbul_reports_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz";
+        sha1 = "d593210e5000683750cb09fc0644e4b6e27fd53b";
       };
     }
     {
@@ -7186,219 +7250,211 @@
       };
     }
     {
-      name = "jest_changed_files___jest_changed_files_24.8.0.tgz";
+      name = "jest_changed_files___jest_changed_files_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_changed_files___jest_changed_files_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.8.0.tgz";
-        sha1 = "7e7eb21cf687587a85e50f3d249d1327e15b157b";
+        name = "jest_changed_files___jest_changed_files_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.5.2.tgz";
+        sha1 = "330232c6a5c09a7f040a5870e8f0a9c6abcdbed5";
       };
     }
     {
-      name = "jest_cli___jest_cli_24.8.0.tgz";
+      name = "jest_cli___jest_cli_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_cli___jest_cli_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz";
-        sha1 = "b075ac914492ed114fa338ade7362a301693e989";
+        name = "jest_cli___jest_cli_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.5.2.tgz";
+        sha1 = "0df114399b4036a3f046f0a9f25c50372c76b3a2";
       };
     }
     {
-      name = "jest_config___jest_config_24.8.0.tgz";
+      name = "jest_config___jest_config_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_config___jest_config_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-config/-/jest-config-24.8.0.tgz";
-        sha1 = "77db3d265a6f726294687cbbccc36f8a76ee0f4f";
+        name = "jest_config___jest_config_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-config/-/jest-config-26.5.2.tgz";
+        sha1 = "6e828e25f10124433dd008fbd83348636de0972a";
       };
     }
     {
-      name = "jest_diff___jest_diff_24.8.0.tgz";
+      name = "jest_diff___jest_diff_25.5.0.tgz";
       path = fetchurl {
-        name = "jest_diff___jest_diff_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz";
-        sha1 = "146435e7d1e3ffdf293d53ff97e193f1d1546172";
+        name = "jest_diff___jest_diff_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz";
+        sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9";
       };
     }
     {
-      name = "jest_docblock___jest_docblock_24.3.0.tgz";
+      name = "jest_diff___jest_diff_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_docblock___jest_docblock_24.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz";
-        sha1 = "b9c32dac70f72e4464520d2ba4aec02ab14db5dd";
+        name = "jest_diff___jest_diff_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.5.2.tgz";
+        sha1 = "8e26cb32dc598e8b8a1b9deff55316f8313c8053";
       };
     }
     {
-      name = "jest_each___jest_each_24.8.0.tgz";
+      name = "jest_docblock___jest_docblock_26.0.0.tgz";
       path = fetchurl {
-        name = "jest_each___jest_each_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-each/-/jest-each-24.8.0.tgz";
-        sha1 = "a05fd2bf94ddc0b1da66c6d13ec2457f35e52775";
+        name = "jest_docblock___jest_docblock_26.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz";
+        sha1 = "3e2fa20899fc928cb13bd0ff68bd3711a36889b5";
       };
     }
     {
-      name = "jest_environment_jsdom_sixteen___jest_environment_jsdom_sixteen_1.0.3.tgz";
+      name = "jest_each___jest_each_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_environment_jsdom_sixteen___jest_environment_jsdom_sixteen_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/jest-environment-jsdom-sixteen/-/jest-environment-jsdom-sixteen-1.0.3.tgz";
-        sha1 = "e222228fac537ef15cca5ad470b19b47d9690165";
+        name = "jest_each___jest_each_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-each/-/jest-each-26.5.2.tgz";
+        sha1 = "35e68d6906a7f826d3ca5803cfe91d17a5a34c31";
       };
     }
     {
-      name = "jest_environment_jsdom___jest_environment_jsdom_24.8.0.tgz";
+      name = "jest_environment_jsdom___jest_environment_jsdom_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_environment_jsdom___jest_environment_jsdom_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz";
-        sha1 = "300f6949a146cabe1c9357ad9e9ecf9f43f38857";
+        name = "jest_environment_jsdom___jest_environment_jsdom_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz";
+        sha1 = "5feab05b828fd3e4b96bee5e0493464ddd2bb4bc";
       };
     }
     {
-      name = "jest_environment_node___jest_environment_node_24.8.0.tgz";
+      name = "jest_environment_node___jest_environment_node_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_environment_node___jest_environment_node_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.8.0.tgz";
-        sha1 = "d3f726ba8bc53087a60e7a84ca08883a4c892231";
+        name = "jest_environment_node___jest_environment_node_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.5.2.tgz";
+        sha1 = "275a0f01b5e47447056f1541a15ed4da14acca03";
       };
     }
     {
-      name = "jest_get_type___jest_get_type_24.8.0.tgz";
+      name = "jest_get_type___jest_get_type_25.2.6.tgz";
       path = fetchurl {
-        name = "jest_get_type___jest_get_type_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz";
-        sha1 = "a7440de30b651f5a70ea3ed7ff073a32dfe646fc";
+        name = "jest_get_type___jest_get_type_25.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz";
+        sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877";
       };
     }
     {
-      name = "jest_haste_map___jest_haste_map_24.8.0.tgz";
+      name = "jest_get_type___jest_get_type_26.3.0.tgz";
       path = fetchurl {
-        name = "jest_haste_map___jest_haste_map_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.0.tgz";
-        sha1 = "51794182d877b3ddfd6e6d23920e3fe72f305800";
+        name = "jest_get_type___jest_get_type_26.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz";
+        sha1 = "e97dc3c3f53c2b406ca7afaed4493b1d099199e0";
       };
     }
     {
-      name = "jest_jasmine2___jest_jasmine2_24.8.0.tgz";
+      name = "jest_haste_map___jest_haste_map_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_jasmine2___jest_jasmine2_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz";
-        sha1 = "a9c7e14c83dd77d8b15e820549ce8987cc8cd898";
+        name = "jest_haste_map___jest_haste_map_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.5.2.tgz";
+        sha1 = "a15008abfc502c18aa56e4919ed8c96304ceb23d";
       };
     }
     {
-      name = "jest_junit___jest_junit_6.3.0.tgz";
+      name = "jest_jasmine2___jest_jasmine2_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_junit___jest_junit_6.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-junit/-/jest-junit-6.3.0.tgz";
-        sha1 = "99e64ebc54eddcb21238f0cc49f5820c89a8c785";
+        name = "jest_jasmine2___jest_jasmine2_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz";
+        sha1 = "0e33819d31b1f2aab5efd1e02ce502209c0e64a2";
       };
     }
     {
-      name = "jest_leak_detector___jest_leak_detector_24.8.0.tgz";
+      name = "jest_junit___jest_junit_12.0.0.tgz";
       path = fetchurl {
-        name = "jest_leak_detector___jest_leak_detector_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz";
-        sha1 = "c0086384e1f650c2d8348095df769f29b48e6980";
+        name = "jest_junit___jest_junit_12.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-junit/-/jest-junit-12.0.0.tgz";
+        sha1 = "3ebd4a6a84b50c4ab18323a8f7d9cceb9d845df6";
       };
     }
     {
-      name = "jest_matcher_utils___jest_matcher_utils_24.8.0.tgz";
+      name = "jest_leak_detector___jest_leak_detector_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_matcher_utils___jest_matcher_utils_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz";
-        sha1 = "2bce42204c9af12bde46f83dc839efe8be832495";
+        name = "jest_leak_detector___jest_leak_detector_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz";
+        sha1 = "83fcf9a4a6ef157549552cb4f32ca1d6221eea69";
       };
     }
     {
-      name = "jest_message_util___jest_message_util_24.8.0.tgz";
+      name = "jest_matcher_utils___jest_matcher_utils_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_message_util___jest_message_util_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz";
-        sha1 = "0d6891e72a4beacc0292b638685df42e28d6218b";
+        name = "jest_matcher_utils___jest_matcher_utils_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz";
+        sha1 = "6aa2c76ce8b9c33e66f8856ff3a52bab59e6c85a";
       };
     }
     {
-      name = "jest_message_util___jest_message_util_25.5.0.tgz";
+      name = "jest_message_util___jest_message_util_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_message_util___jest_message_util_25.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.5.0.tgz";
-        sha1 = "ea11d93204cc7ae97456e1d8716251185b8880ea";
+        name = "jest_message_util___jest_message_util_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.5.2.tgz";
+        sha1 = "6c4c4c46dcfbabb47cd1ba2f6351559729bc11bb";
       };
     }
     {
-      name = "jest_mock___jest_mock_24.8.0.tgz";
+      name = "jest_mock___jest_mock_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_mock___jest_mock_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz";
-        sha1 = "2f9d14d37699e863f1febf4e4d5a33b7fdbbde56";
+        name = "jest_mock___jest_mock_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.5.2.tgz";
+        sha1 = "c9302e8ef807f2bfc749ee52e65ad11166a1b6a1";
       };
     }
     {
-      name = "jest_mock___jest_mock_25.5.0.tgz";
+      name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz";
       path = fetchurl {
-        name = "jest_mock___jest_mock_25.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.5.0.tgz";
-        sha1 = "a91a54dabd14e37ecd61665d6b6e06360a55387a";
+        name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz";
+        sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c";
       };
     }
     {
-      name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz";
+      name = "jest_regex_util___jest_regex_util_26.0.0.tgz";
       path = fetchurl {
-        name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz";
-        sha1 = "ecdae604c077a7fbc70defb6d517c3c1c898923a";
+        name = "jest_regex_util___jest_regex_util_26.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz";
+        sha1 = "d25e7184b36e39fd466c3bc41be0971e821fee28";
       };
     }
     {
-      name = "jest_regex_util___jest_regex_util_24.3.0.tgz";
+      name = "jest_resolve_dependencies___jest_resolve_dependencies_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_regex_util___jest_regex_util_24.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz";
-        sha1 = "d5a65f60be1ae3e310d5214a0307581995227b36";
+        name = "jest_resolve_dependencies___jest_resolve_dependencies_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.2.tgz";
+        sha1 = "ee30b7cfea81c81bf5e195a9287d7ec07f893170";
       };
     }
     {
-      name = "jest_resolve_dependencies___jest_resolve_dependencies_24.8.0.tgz";
+      name = "jest_resolve___jest_resolve_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_resolve_dependencies___jest_resolve_dependencies_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz";
-        sha1 = "19eec3241f2045d3f990dba331d0d7526acff8e0";
+        name = "jest_resolve___jest_resolve_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.5.2.tgz";
+        sha1 = "0d719144f61944a428657b755a0e5c6af4fc8602";
       };
     }
     {
-      name = "jest_resolve___jest_resolve_24.8.0.tgz";
+      name = "jest_runner___jest_runner_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_resolve___jest_resolve_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz";
-        sha1 = "84b8e5408c1f6a11539793e2b5feb1b6e722439f";
+        name = "jest_runner___jest_runner_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.5.2.tgz";
+        sha1 = "4f9e6b0bb7eb4710c209a9e145b8a10894f4c19f";
       };
     }
     {
-      name = "jest_runner___jest_runner_24.8.0.tgz";
+      name = "jest_runtime___jest_runtime_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_runner___jest_runner_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.8.0.tgz";
-        sha1 = "4f9ae07b767db27b740d7deffad0cf67ccb4c5bb";
+        name = "jest_runtime___jest_runtime_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.5.2.tgz";
+        sha1 = "b72f5f79eb2fe0c46bfef4cdb9c1e01d1c69ba41";
       };
     }
     {
-      name = "jest_runtime___jest_runtime_24.8.0.tgz";
+      name = "jest_serializer___jest_serializer_26.5.0.tgz";
       path = fetchurl {
-        name = "jest_runtime___jest_runtime_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.8.0.tgz";
-        sha1 = "05f94d5b05c21f6dc54e427cd2e4980923350620";
+        name = "jest_serializer___jest_serializer_26.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.5.0.tgz";
+        sha1 = "f5425cc4c5f6b4b355f854b5f0f23ec6b962bc13";
       };
     }
     {
-      name = "jest_serializer___jest_serializer_24.4.0.tgz";
+      name = "jest_snapshot___jest_snapshot_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_serializer___jest_serializer_24.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz";
-        sha1 = "f70c5918c8ea9235ccb1276d232e459080588db3";
-      };
-    }
-    {
-      name = "jest_snapshot___jest_snapshot_24.8.0.tgz";
-      path = fetchurl {
-        name = "jest_snapshot___jest_snapshot_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz";
-        sha1 = "3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6";
+        name = "jest_snapshot___jest_snapshot_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.5.2.tgz";
+        sha1 = "0cf7642eaf8e8d2736bd443f619959bf237f9ccf";
       };
     }
     {
@@ -7410,51 +7466,43 @@
       };
     }
     {
-      name = "jest_util___jest_util_24.8.0.tgz";
+      name = "jest_util___jest_util_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_util___jest_util_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz";
-        sha1 = "41f0e945da11df44cc76d64ffb915d0716f46cd1";
+        name = "jest_util___jest_util_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-util/-/jest-util-26.5.2.tgz";
+        sha1 = "8403f75677902cc52a1b2140f568e91f8ed4f4d7";
       };
     }
     {
-      name = "jest_util___jest_util_25.5.0.tgz";
+      name = "jest_validate___jest_validate_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_util___jest_util_25.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-util/-/jest-util-25.5.0.tgz";
-        sha1 = "31c63b5d6e901274d264a4fec849230aa3fa35b0";
+        name = "jest_validate___jest_validate_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.5.2.tgz";
+        sha1 = "7ea266700b64234cd1c0cee982490c5a80e9b0f0";
       };
     }
     {
-      name = "jest_validate___jest_validate_24.8.0.tgz";
+      name = "jest_watcher___jest_watcher_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_validate___jest_validate_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz";
-        sha1 = "624c41533e6dfe356ffadc6e2423a35c2d3b4849";
+        name = "jest_watcher___jest_watcher_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.5.2.tgz";
+        sha1 = "2957f4461007e0769d74b537379ecf6b7c696916";
       };
     }
     {
-      name = "jest_watcher___jest_watcher_24.8.0.tgz";
+      name = "jest_worker___jest_worker_26.5.0.tgz";
       path = fetchurl {
-        name = "jest_watcher___jest_watcher_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.8.0.tgz";
-        sha1 = "58d49915ceddd2de85e238f6213cef1c93715de4";
+        name = "jest_worker___jest_worker_26.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz";
+        sha1 = "87deee86dbbc5f98d9919e0dadf2c40e3152fa30";
       };
     }
     {
-      name = "jest_worker___jest_worker_24.6.0.tgz";
+      name = "jest___jest_26.5.2.tgz";
       path = fetchurl {
-        name = "jest_worker___jest_worker_24.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz";
-        sha1 = "7f81ceae34b7cde0c9827a6980c35b7cdc0161b3";
-      };
-    }
-    {
-      name = "jest___jest_24.8.0.tgz";
-      path = fetchurl {
-        name = "jest___jest_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz";
-        sha1 = "d5dff1984d0d1002196e9b7f12f75af1b2809081";
+        name = "jest___jest_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest/-/jest-26.5.2.tgz";
+        sha1 = "c6791642b331fe7abd2f993b0a74aa546f7be0fb";
       };
     }
     {
@@ -7465,14 +7513,6 @@
         sha1 = "a3f222a9aae9f966f5d27c796510e28091764217";
       };
     }
-    {
-      name = "jquery_ujs___jquery_ujs_1.2.2.tgz";
-      path = fetchurl {
-        name = "jquery_ujs___jquery_ujs_1.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.2.tgz";
-        sha1 = "6a8ef1020e6b6dda385b90a4bddc128c21c56397";
-      };
-    }
     {
       name = "jquery.caret___jquery.caret_0.3.1.tgz";
       path = fetchurl {
@@ -7498,19 +7538,19 @@
       };
     }
     {
-      name = "js_base64___js_base64_2.5.1.tgz";
+      name = "js_base64___js_base64_2.6.4.tgz";
       path = fetchurl {
-        name = "js_base64___js_base64_2.5.1.tgz";
-        url  = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz";
-        sha1 = "1efa39ef2c5f7980bb1784ade4a8af2de3291121";
+        name = "js_base64___js_base64_2.6.4.tgz";
+        url  = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz";
+        sha1 = "f4e686c5de1ea1f867dbcad3d46d969428df98c4";
       };
     }
     {
-      name = "js_beautify___js_beautify_1.10.3.tgz";
+      name = "js_beautify___js_beautify_1.11.0.tgz";
       path = fetchurl {
-        name = "js_beautify___js_beautify_1.10.3.tgz";
-        url  = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.3.tgz";
-        sha1 = "c73fa10cf69d3dfa52d8ed624f23c64c0a6a94c1";
+        name = "js_beautify___js_beautify_1.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.11.0.tgz";
+        sha1 = "afb873dc47d58986360093dcb69951e8bcd5ded2";
       };
     }
     {
@@ -7570,19 +7610,11 @@
       };
     }
     {
-      name = "jsdom___jsdom_11.12.0.tgz";
+      name = "jsdom___jsdom_16.4.0.tgz";
       path = fetchurl {
-        name = "jsdom___jsdom_11.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz";
-        sha1 = "1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8";
-      };
-    }
-    {
-      name = "jsdom___jsdom_16.2.2.tgz";
-      path = fetchurl {
-        name = "jsdom___jsdom_16.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz";
-        sha1 = "76f2f7541646beb46a938f5dc476b88705bedf2b";
+        name = "jsdom___jsdom_16.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz";
+        sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb";
       };
     }
     {
@@ -7617,6 +7649,14 @@
         sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9";
       };
     }
+    {
+      name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz";
+      path = fetchurl {
+        name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz";
+        sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d";
+      };
+    }
     {
       name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz";
       path = fetchurl {
@@ -7865,14 +7905,6 @@
         sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face";
       };
     }
-    {
-      name = "lcid___lcid_1.0.0.tgz";
-      path = fetchurl {
-        name = "lcid___lcid_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz";
-        sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
-      };
-    }
     {
       name = "lcid___lcid_2.0.0.tgz";
       path = fetchurl {
@@ -7881,22 +7913,6 @@
         sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf";
       };
     }
-    {
-      name = "left_pad___left_pad_1.3.0.tgz";
-      path = fetchurl {
-        name = "left_pad___left_pad_1.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz";
-        sha1 = "5b8a3a7765dfe001261dde915589e782f8c94d1e";
-      };
-    }
-    {
-      name = "leven___leven_2.1.0.tgz";
-      path = fetchurl {
-        name = "leven___leven_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz";
-        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
-      };
-    }
     {
       name = "leven___leven_3.1.0.tgz";
       path = fetchurl {
@@ -7937,6 +7953,14 @@
         sha1 = "1f07638642ec645d70bdb69ab2777676f35a28f0";
       };
     }
+    {
+      name = "lines_and_columns___lines_and_columns_1.1.6.tgz";
+      path = fetchurl {
+        name = "lines_and_columns___lines_and_columns_1.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz";
+        sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00";
+      };
+    }
     {
       name = "linkify_it___linkify_it_2.1.0.tgz";
       path = fetchurl {
@@ -8177,6 +8201,14 @@
         sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c";
       };
     }
+    {
+      name = "lodash.memoize___lodash.memoize_4.1.2.tgz";
+      path = fetchurl {
+        name = "lodash.memoize___lodash.memoize_4.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz";
+        sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe";
+      };
+    }
     {
       name = "lodash.pick___lodash.pick_4.4.0.tgz";
       path = fetchurl {
@@ -8273,14 +8305,6 @@
         sha1 = "b3e034233188c68b889f5b862415306f565e2c56";
       };
     }
-    {
-      name = "lolex___lolex_5.1.2.tgz";
-      path = fetchurl {
-        name = "lolex___lolex_5.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz";
-        sha1 = "953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367";
-      };
-    }
     {
       name = "longest_streak___longest_streak_2.0.2.tgz";
       path = fetchurl {
@@ -8378,11 +8402,11 @@
       };
     }
     {
-      name = "make_error___make_error_1.3.5.tgz";
+      name = "make_error___make_error_1.3.6.tgz";
       path = fetchurl {
-        name = "make_error___make_error_1.3.5.tgz";
-        url  = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz";
-        sha1 = "efe4e81f6db28cadd605c70f29c831b58ef776c8";
+        name = "make_error___make_error_1.3.6.tgz";
+        url  = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz";
+        sha1 = "2eb2e37ea9b67c4891f684a1394799af484cf7a2";
       };
     }
     {
@@ -8610,11 +8634,11 @@
       };
     }
     {
-      name = "merge_stream___merge_stream_1.0.1.tgz";
+      name = "merge_stream___merge_stream_2.0.0.tgz";
       path = fetchurl {
-        name = "merge_stream___merge_stream_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz";
-        sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
+        name = "merge_stream___merge_stream_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz";
+        sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60";
       };
     }
     {
@@ -8674,19 +8698,19 @@
       };
     }
     {
-      name = "mime_db___mime_db_1.40.0.tgz";
+      name = "mime_db___mime_db_1.44.0.tgz";
       path = fetchurl {
-        name = "mime_db___mime_db_1.40.0.tgz";
-        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz";
-        sha1 = "a65057e998db090f732a68f6c276d387d4126c32";
+        name = "mime_db___mime_db_1.44.0.tgz";
+        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz";
+        sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92";
       };
     }
     {
-      name = "mime_types___mime_types_2.1.24.tgz";
+      name = "mime_types___mime_types_2.1.27.tgz";
       path = fetchurl {
-        name = "mime_types___mime_types_2.1.24.tgz";
-        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz";
-        sha1 = "b6f8d0b3e951efb77dedeca194cff6d16f676f81";
+        name = "mime_types___mime_types_2.1.27.tgz";
+        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz";
+        sha1 = "47949f98e279ea53119f5722e0f34e529bec009f";
       };
     }
     {
@@ -8849,6 +8873,14 @@
         sha1 = "1120b43dc359a785dce65b55b82e257ccf479566";
       };
     }
+    {
+      name = "mkdirp___mkdirp_1.0.4.tgz";
+      path = fetchurl {
+        name = "mkdirp___mkdirp_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz";
+        sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e";
+      };
+    }
     {
       name = "https___registry.npmjs.org_mkdirp___mkdirp_0.5.1.tgz";
       path = fetchurl {
@@ -9066,11 +9098,11 @@
       };
     }
     {
-      name = "node_notifier___node_notifier_5.4.0.tgz";
+      name = "node_notifier___node_notifier_8.0.0.tgz";
       path = fetchurl {
-        name = "node_notifier___node_notifier_5.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.0.tgz";
-        sha1 = "7b455fdce9f7de0c63538297354f3db468426e6a";
+        name = "node_notifier___node_notifier_8.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz";
+        sha1 = "a7eee2d51da6d0f7ff5094bc7108c911240c1620";
       };
     }
     {
@@ -9082,11 +9114,11 @@
       };
     }
     {
-      name = "node_sass___node_sass_4.12.0.tgz";
+      name = "node_sass___node_sass_4.14.1.tgz";
       path = fetchurl {
-        name = "node_sass___node_sass_4.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz";
-        sha1 = "0914f531932380114a30cc5fa4fa63233a25f017";
+        name = "node_sass___node_sass_4.14.1.tgz";
+        url  = "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz";
+        sha1 = "99c87ec2efb7047ed638fb4c9db7f3a42e2217b5";
       };
     }
     {
@@ -9105,6 +9137,14 @@
         sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
       };
     }
+    {
+      name = "nopt___nopt_4.0.3.tgz";
+      path = fetchurl {
+        name = "nopt___nopt_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz";
+        sha1 = "a375cad9d02fd921278d954c2254d5aa57e15e48";
+      };
+    }
     {
       name = "nopt___nopt_1.0.10.tgz";
       path = fetchurl {
@@ -9113,14 +9153,6 @@
         sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     }
-    {
-      name = "nopt___nopt_4.0.1.tgz";
-      path = fetchurl {
-        name = "nopt___nopt_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz";
-        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
-      };
-    }
     {
       name = "normalize_package_data___normalize_package_data_2.5.0.tgz";
       path = fetchurl {
@@ -9177,6 +9209,14 @@
         sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
       };
     }
+    {
+      name = "npm_run_path___npm_run_path_4.0.1.tgz";
+      path = fetchurl {
+        name = "npm_run_path___npm_run_path_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz";
+        sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea";
+      };
+    }
     {
       name = "npmlog___npmlog_4.1.2.tgz";
       path = fetchurl {
@@ -9281,14 +9321,6 @@
         sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b";
       };
     }
-    {
-      name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz";
-      path = fetchurl {
-        name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
-        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
-      };
-    }
     {
       name = "object.pick___object.pick_1.3.0.tgz";
       path = fetchurl {
@@ -9417,14 +9449,6 @@
         sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
       };
     }
-    {
-      name = "os_locale___os_locale_1.4.0.tgz";
-      path = fetchurl {
-        name = "os_locale___os_locale_1.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz";
-        sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
-      };
-    }
     {
       name = "os_locale___os_locale_3.1.0.tgz";
       path = fetchurl {
@@ -9466,11 +9490,11 @@
       };
     }
     {
-      name = "p_each_series___p_each_series_1.0.0.tgz";
+      name = "p_each_series___p_each_series_2.1.0.tgz";
       path = fetchurl {
-        name = "p_each_series___p_each_series_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz";
-        sha1 = "930f3d12dd1f50e7434457a22cd6f04ac6ad7f71";
+        name = "p_each_series___p_each_series_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz";
+        sha1 = "961c8dd3f195ea96c747e636b262b800a6b1af48";
       };
     }
     {
@@ -9545,14 +9569,6 @@
         sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d";
       };
     }
-    {
-      name = "p_reduce___p_reduce_1.0.0.tgz";
-      path = fetchurl {
-        name = "p_reduce___p_reduce_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz";
-        sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa";
-      };
-    }
     {
       name = "p_retry___p_retry_3.0.1.tgz";
       path = fetchurl {
@@ -9657,6 +9673,14 @@
         sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
       };
     }
+    {
+      name = "parse_json___parse_json_5.1.0.tgz";
+      path = fetchurl {
+        name = "parse_json___parse_json_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz";
+        sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646";
+      };
+    }
     {
       name = "parse_passwd___parse_passwd_1.0.0.tgz";
       path = fetchurl {
@@ -9665,14 +9689,6 @@
         sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
       };
     }
-    {
-      name = "parse5___parse5_4.0.0.tgz";
-      path = fetchurl {
-        name = "parse5___parse5_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz";
-        sha1 = "6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608";
-      };
-    }
     {
       name = "parse5___parse5_5.1.1.tgz";
       path = fetchurl {
@@ -9777,6 +9793,14 @@
         sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     }
+    {
+      name = "path_key___path_key_3.1.1.tgz";
+      path = fetchurl {
+        name = "path_key___path_key_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz";
+        sha1 = "581f6ade658cbba65a0d3380de7753295054f375";
+      };
+    }
     {
       name = "path_parse___path_parse_1.0.6.tgz";
       path = fetchurl {
@@ -9945,14 +9969,6 @@
         sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f";
       };
     }
-    {
-      name = "pn___pn_1.1.0.tgz";
-      path = fetchurl {
-        name = "pn___pn_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz";
-        sha1 = "e2f4cef0e219f463c179ab37463e4e1ecdccbafb";
-      };
-    }
     {
       name = "pngjs___pngjs_3.3.3.tgz";
       path = fetchurl {
@@ -10121,14 +10137,6 @@
         sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865";
       };
     }
-    {
-      name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz";
-      path = fetchurl {
-        name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz";
-        sha1 = "249044356697b33b64f1a8f7c80922dddee7195c";
-      };
-    }
     {
       name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz";
       path = fetchurl {
@@ -10193,14 +10201,6 @@
         sha1 = "a3b4160516007075d29127262f3a0063d19896e9";
       };
     }
-    {
-      name = "prettier___prettier_1.16.3.tgz";
-      path = fetchurl {
-        name = "prettier___prettier_1.16.3.tgz";
-        url  = "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz";
-        sha1 = "8c62168453badef702f34b45b6ee899574a6a65d";
-      };
-    }
     {
       name = "prettier___prettier_1.18.2.tgz";
       path = fetchurl {
@@ -10217,14 +10217,6 @@
         sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb";
       };
     }
-    {
-      name = "pretty_format___pretty_format_24.8.0.tgz";
-      path = fetchurl {
-        name = "pretty_format___pretty_format_24.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz";
-        sha1 = "8dae7044f58db7cb8be245383b565a963e3c27f2";
-      };
-    }
     {
       name = "pretty_format___pretty_format_25.5.0.tgz";
       path = fetchurl {
@@ -10233,6 +10225,14 @@
         sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a";
       };
     }
+    {
+      name = "pretty_format___pretty_format_26.5.2.tgz";
+      path = fetchurl {
+        name = "pretty_format___pretty_format_26.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.5.2.tgz";
+        sha1 = "5d896acfdaa09210683d34b6dc0e6e21423cd3e1";
+      };
+    }
     {
       name = "pretty___pretty_2.0.0.tgz";
       path = fetchurl {
@@ -10298,11 +10298,11 @@
       };
     }
     {
-      name = "prompts___prompts_2.1.0.tgz";
+      name = "prompts___prompts_2.3.2.tgz";
       path = fetchurl {
-        name = "prompts___prompts_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/prompts/-/prompts-2.1.0.tgz";
-        sha1 = "bf90bc71f6065d255ea2bdc0fe6520485c1b45db";
+        name = "prompts___prompts_2.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz";
+        sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068";
       };
     }
     {
@@ -10666,11 +10666,11 @@
       };
     }
     {
-      name = "read_pkg_up___read_pkg_up_4.0.0.tgz";
+      name = "read_pkg_up___read_pkg_up_7.0.1.tgz";
       path = fetchurl {
-        name = "read_pkg_up___read_pkg_up_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz";
-        sha1 = "1b221c6088ba7799601c808f91161c66e58f8978";
+        name = "read_pkg_up___read_pkg_up_7.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz";
+        sha1 = "f3a6135758459733ae2b95638056e1854e7ef507";
       };
     }
     {
@@ -10698,11 +10698,19 @@
       };
     }
     {
-      name = "readable_stream___readable_stream_2.3.6.tgz";
+      name = "read_pkg___read_pkg_5.2.0.tgz";
       path = fetchurl {
-        name = "readable_stream___readable_stream_2.3.6.tgz";
-        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz";
-        sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf";
+        name = "read_pkg___read_pkg_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz";
+        sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc";
+      };
+    }
+    {
+      name = "readable_stream___readable_stream_2.3.7.tgz";
+      path = fetchurl {
+        name = "readable_stream___readable_stream_2.3.7.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz";
+        sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57";
       };
     }
     {
@@ -10737,14 +10745,6 @@
         sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada";
       };
     }
-    {
-      name = "realpath_native___realpath_native_1.1.0.tgz";
-      path = fetchurl {
-        name = "realpath_native___realpath_native_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz";
-        sha1 = "2003294fea23fb0672f2476ebe22fcf498a2d65c";
-      };
-    }
     {
       name = "redent___redent_1.0.0.tgz";
       path = fetchurl {
@@ -10922,19 +10922,19 @@
       };
     }
     {
-      name = "request_promise_core___request_promise_core_1.1.3.tgz";
+      name = "request_promise_core___request_promise_core_1.1.4.tgz";
       path = fetchurl {
-        name = "request_promise_core___request_promise_core_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz";
-        sha1 = "e9a3c081b51380dfea677336061fea879a829ee9";
+        name = "request_promise_core___request_promise_core_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz";
+        sha1 = "3eedd4223208d419867b78ce815167d10593a22f";
       };
     }
     {
-      name = "request_promise_native___request_promise_native_1.0.8.tgz";
+      name = "request_promise_native___request_promise_native_1.0.9.tgz";
       path = fetchurl {
-        name = "request_promise_native___request_promise_native_1.0.8.tgz";
-        url  = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz";
-        sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36";
+        name = "request_promise_native___request_promise_native_1.0.9.tgz";
+        url  = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz";
+        sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28";
       };
     }
     {
@@ -11009,6 +11009,14 @@
         sha1 = "00a9f7387556e27038eae232caa372a6a59b665a";
       };
     }
+    {
+      name = "resolve_cwd___resolve_cwd_3.0.0.tgz";
+      path = fetchurl {
+        name = "resolve_cwd___resolve_cwd_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz";
+        sha1 = "0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d";
+      };
+    }
     {
       name = "resolve_dir___resolve_dir_1.0.1.tgz";
       path = fetchurl {
@@ -11050,19 +11058,11 @@
       };
     }
     {
-      name = "resolve___resolve_1.1.7.tgz";
+      name = "resolve___resolve_1.17.0.tgz";
       path = fetchurl {
-        name = "resolve___resolve_1.1.7.tgz";
-        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz";
-        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
-      };
-    }
-    {
-      name = "resolve___resolve_1.15.0.tgz";
-      path = fetchurl {
-        name = "resolve___resolve_1.15.0.tgz";
-        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz";
-        sha1 = "1b7ca96073ebb52e741ffd799f6b39ea462c67f5";
+        name = "resolve___resolve_1.17.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz";
+        sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444";
       };
     }
     {
@@ -11121,6 +11121,14 @@
         sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab";
       };
     }
+    {
+      name = "rimraf___rimraf_3.0.2.tgz";
+      path = fetchurl {
+        name = "rimraf___rimraf_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz";
+        sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a";
+      };
+    }
     {
       name = "ripemd160___ripemd160_2.0.1.tgz";
       path = fetchurl {
@@ -11218,11 +11226,11 @@
       };
     }
     {
-      name = "sass_graph___sass_graph_2.2.4.tgz";
+      name = "sass_graph___sass_graph_2.2.5.tgz";
       path = fetchurl {
-        name = "sass_graph___sass_graph_2.2.4.tgz";
-        url  = "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz";
-        sha1 = "13fbd63cd1caf0908b9fd93476ad43a51d1e0b49";
+        name = "sass_graph___sass_graph_2.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz";
+        sha1 = "a981c87446b8319d96dce0671e487879bd24c2e8";
       };
     }
     {
@@ -11233,14 +11241,6 @@
         sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
       };
     }
-    {
-      name = "sax___sax_1.2.4.tgz";
-      path = fetchurl {
-        name = "sax___sax_1.2.4.tgz";
-        url  = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz";
-        sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9";
-      };
-    }
     {
       name = "saxes___saxes_5.0.1.tgz";
       path = fetchurl {
@@ -11289,14 +11289,6 @@
         sha1 = "8eb06db9a9723333824d3f5530641149847ce5d1";
       };
     }
-    {
-      name = "section_matter___section_matter_1.0.0.tgz";
-      path = fetchurl {
-        name = "section_matter___section_matter_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz";
-        sha1 = "e9041953506780ec01d59f292a19c7b850b84167";
-      };
-    }
     {
       name = "select_hose___select_hose_2.0.0.tgz";
       path = fetchurl {
@@ -11353,6 +11345,14 @@
         sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e";
       };
     }
+    {
+      name = "semver___semver_7.3.2.tgz";
+      path = fetchurl {
+        name = "semver___semver_7.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz";
+        sha1 = "604962b052b81ed0786aae84389ffba70ffd3938";
+      };
+    }
     {
       name = "semver___semver_6.3.0.tgz";
       path = fetchurl {
@@ -11465,6 +11465,14 @@
         sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
       };
     }
+    {
+      name = "shebang_command___shebang_command_2.0.0.tgz";
+      path = fetchurl {
+        name = "shebang_command___shebang_command_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz";
+        sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea";
+      };
+    }
     {
       name = "shebang_regex___shebang_regex_1.0.0.tgz";
       path = fetchurl {
@@ -11473,6 +11481,14 @@
         sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
       };
     }
+    {
+      name = "shebang_regex___shebang_regex_3.0.0.tgz";
+      path = fetchurl {
+        name = "shebang_regex___shebang_regex_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz";
+        sha1 = "ae16f1644d873ecad843b0307b143362d4c42172";
+      };
+    }
     {
       name = "shellwords___shellwords_0.1.1.tgz";
       path = fetchurl {
@@ -11490,19 +11506,19 @@
       };
     }
     {
-      name = "signal_exit___signal_exit_3.0.2.tgz";
+      name = "signal_exit___signal_exit_3.0.3.tgz";
       path = fetchurl {
-        name = "signal_exit___signal_exit_3.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+        name = "signal_exit___signal_exit_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz";
+        sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c";
       };
     }
     {
-      name = "sisteransi___sisteransi_1.0.0.tgz";
+      name = "sisteransi___sisteransi_1.0.5.tgz";
       path = fetchurl {
-        name = "sisteransi___sisteransi_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz";
-        sha1 = "77d9622ff909080f1c19e5f4a1df0c1b0a27b88c";
+        name = "sisteransi___sisteransi_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz";
+        sha1 = "134d681297756437cc05ca01370d3a7a571075ed";
       };
     }
     {
@@ -11642,19 +11658,19 @@
       };
     }
     {
-      name = "source_map_resolve___source_map_resolve_0.5.2.tgz";
+      name = "source_map_resolve___source_map_resolve_0.5.3.tgz";
       path = fetchurl {
-        name = "source_map_resolve___source_map_resolve_0.5.2.tgz";
-        url  = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
-        sha1 = "72e2cc34095543e43b2c62b2c4c10d4a9054f259";
+        name = "source_map_resolve___source_map_resolve_0.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz";
+        sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a";
       };
     }
     {
-      name = "source_map_support___source_map_support_0.5.13.tgz";
+      name = "source_map_support___source_map_support_0.5.19.tgz";
       path = fetchurl {
-        name = "source_map_support___source_map_support_0.5.13.tgz";
-        url  = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz";
-        sha1 = "31b24a9c2e73c2de85066c0feb7d44767ed52932";
+        name = "source_map_support___source_map_support_0.5.19.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz";
+        sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61";
       };
     }
     {
@@ -11673,6 +11689,14 @@
         sha1 = "0fe96503ac86a5adb5de63f4e412ae4872cdbe86";
       };
     }
+    {
+      name = "source_map___source_map_0.5.6.tgz";
+      path = fetchurl {
+        name = "source_map___source_map_0.5.6.tgz";
+        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz";
+        sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
+      };
+    }
     {
       name = "source_map___source_map_0.4.4.tgz";
       path = fetchurl {
@@ -11681,14 +11705,6 @@
         sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
       };
     }
-    {
-      name = "source_map___source_map_0.5.7.tgz";
-      path = fetchurl {
-        name = "source_map___source_map_0.5.7.tgz";
-        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz";
-        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
-      };
-    }
     {
       name = "source_map___source_map_0.6.1.tgz";
       path = fetchurl {
@@ -11706,27 +11722,35 @@
       };
     }
     {
-      name = "spdx_correct___spdx_correct_1.0.2.tgz";
+      name = "spdx_correct___spdx_correct_3.1.1.tgz";
       path = fetchurl {
-        name = "spdx_correct___spdx_correct_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz";
-        sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
+        name = "spdx_correct___spdx_correct_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz";
+        sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9";
       };
     }
     {
-      name = "spdx_expression_parse___spdx_expression_parse_1.0.4.tgz";
+      name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz";
       path = fetchurl {
-        name = "spdx_expression_parse___spdx_expression_parse_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz";
-        sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c";
+        name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz";
+        sha1 = "3f28ce1a77a00372683eade4a433183527a2163d";
       };
     }
     {
-      name = "spdx_license_ids___spdx_license_ids_1.2.2.tgz";
+      name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz";
       path = fetchurl {
-        name = "spdx_license_ids___spdx_license_ids_1.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz";
-        sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57";
+        name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz";
+        sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679";
+      };
+    }
+    {
+      name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz";
+      path = fetchurl {
+        name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz";
+        sha1 = "c80757383c28abf7296744998cbc106ae8b854ce";
       };
     }
     {
@@ -11778,11 +11802,11 @@
       };
     }
     {
-      name = "sshpk___sshpk_1.15.2.tgz";
+      name = "sshpk___sshpk_1.16.1.tgz";
       path = fetchurl {
-        name = "sshpk___sshpk_1.15.2.tgz";
-        url  = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.2.tgz";
-        sha1 = "c946d6bd9b1a39d0e8635763f5242d6ed6dcb629";
+        name = "sshpk___sshpk_1.16.1.tgz";
+        url  = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz";
+        sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877";
       };
     }
     {
@@ -11802,11 +11826,11 @@
       };
     }
     {
-      name = "stack_utils___stack_utils_1.0.2.tgz";
+      name = "stack_utils___stack_utils_2.0.2.tgz";
       path = fetchurl {
-        name = "stack_utils___stack_utils_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz";
-        sha1 = "33eba3897788558bebfc2db059dc158ec36cebb8";
+        name = "stack_utils___stack_utils_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz";
+        sha1 = "5cf48b4557becb4638d0bc4f21d23f5d19586593";
       };
     }
     {
@@ -11914,11 +11938,11 @@
       };
     }
     {
-      name = "string_length___string_length_2.0.0.tgz";
+      name = "string_length___string_length_4.0.1.tgz";
       path = fetchurl {
-        name = "string_length___string_length_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz";
-        sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed";
+        name = "string_length___string_length_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz";
+        sha1 = "4a973bf31ef77c4edbceadd6af2611996985f8a1";
       };
     }
     {
@@ -12025,14 +12049,6 @@
         sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532";
       };
     }
-    {
-      name = "strip_bom_string___strip_bom_string_1.0.0.tgz";
-      path = fetchurl {
-        name = "strip_bom_string___strip_bom_string_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz";
-        sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92";
-      };
-    }
     {
       name = "strip_bom___strip_bom_2.0.0.tgz";
       path = fetchurl {
@@ -12049,6 +12065,14 @@
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     }
+    {
+      name = "strip_bom___strip_bom_4.0.0.tgz";
+      path = fetchurl {
+        name = "strip_bom___strip_bom_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz";
+        sha1 = "9c3505c1db45bcedca3d9cf7a16f5c5aa3901878";
+      };
+    }
     {
       name = "strip_css_comments___strip_css_comments_3.0.0.tgz";
       path = fetchurl {
@@ -12065,6 +12089,14 @@
         sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
       };
     }
+    {
+      name = "strip_final_newline___strip_final_newline_2.0.0.tgz";
+      path = fetchurl {
+        name = "strip_final_newline___strip_final_newline_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz";
+        sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad";
+      };
+    }
     {
       name = "strip_indent___strip_indent_1.0.1.tgz";
       path = fetchurl {
@@ -12170,11 +12202,19 @@
       };
     }
     {
-      name = "supports_color___supports_color_7.1.0.tgz";
+      name = "supports_color___supports_color_7.2.0.tgz";
       path = fetchurl {
-        name = "supports_color___supports_color_7.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz";
-        sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1";
+        name = "supports_color___supports_color_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz";
+        sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da";
+      };
+    }
+    {
+      name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz";
+      path = fetchurl {
+        name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz";
+        sha1 = "f663df252af5f37c5d49bbd7eeefa9e0b9e59e47";
       };
     }
     {
@@ -12257,6 +12297,14 @@
         sha1 = "1f16adedfe9bdc18800e1776821734086fcc6753";
       };
     }
+    {
+      name = "terminal_link___terminal_link_2.1.1.tgz";
+      path = fetchurl {
+        name = "terminal_link___terminal_link_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz";
+        sha1 = "14a64a27ab3c0df933ea546fba55f2d078edc994";
+      };
+    }
     {
       name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz";
       path = fetchurl {
@@ -12274,11 +12322,11 @@
       };
     }
     {
-      name = "test_exclude___test_exclude_5.0.0.tgz";
+      name = "test_exclude___test_exclude_6.0.0.tgz";
       path = fetchurl {
-        name = "test_exclude___test_exclude_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.0.0.tgz";
-        sha1 = "cdce7cece785e0e829cd5c2b27baf18bc583cfb7";
+        name = "test_exclude___test_exclude_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz";
+        sha1 = "04a8698661d805ea6fa293b6cb9e63ac044ef15e";
       };
     }
     {
@@ -12322,11 +12370,11 @@
       };
     }
     {
-      name = "throat___throat_4.1.0.tgz";
+      name = "throat___throat_5.0.0.tgz";
       path = fetchurl {
-        name = "throat___throat_4.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz";
-        sha1 = "89037cbc92c56ab18926e6ba4cbb200e15672a6a";
+        name = "throat___throat_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz";
+        sha1 = "c5199235803aad18754a667d659b5e72ce16764b";
       };
     }
     {
@@ -12545,14 +12593,6 @@
         sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2";
       };
     }
-    {
-      name = "tr46___tr46_1.0.1.tgz";
-      path = fetchurl {
-        name = "tr46___tr46_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz";
-        sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09";
-      };
-    }
     {
       name = "tr46___tr46_2.0.2.tgz";
       path = fetchurl {
@@ -12650,11 +12690,11 @@
       };
     }
     {
-      name = "ts_jest___ts_jest_24.0.0.tgz";
+      name = "ts_jest___ts_jest_26.4.1.tgz";
       path = fetchurl {
-        name = "ts_jest___ts_jest_24.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.0.tgz";
-        sha1 = "3f26bf2ec1fa584863a5a9c29bd8717d549efbf6";
+        name = "ts_jest___ts_jest_26.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.1.tgz";
+        sha1 = "08ec0d3fc2c3a39e4a46eae5610b69fafa6babd0";
       };
     }
     {
@@ -12721,6 +12761,14 @@
         sha1 = "d6ef42a0356c6cd45f49485c3b6281fc148e48a2";
       };
     }
+    {
+      name = "type_fest___type_fest_0.6.0.tgz";
+      path = fetchurl {
+        name = "type_fest___type_fest_0.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz";
+        sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b";
+      };
+    }
     {
       name = "type_fest___type_fest_0.8.1.tgz";
       path = fetchurl {
@@ -12754,11 +12802,11 @@
       };
     }
     {
-      name = "typescript___typescript_3.3.4000.tgz";
+      name = "typescript___typescript_3.9.7.tgz";
       path = fetchurl {
-        name = "typescript___typescript_3.3.4000.tgz";
-        url  = "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz";
-        sha1 = "76b0f89cfdbf97827e1112d64f283f1151d6adf0";
+        name = "typescript___typescript_3.9.7.tgz";
+        url  = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz";
+        sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa";
       };
     }
     {
@@ -12994,11 +13042,11 @@
       };
     }
     {
-      name = "uri_js___uri_js_4.2.2.tgz";
+      name = "uri_js___uri_js_4.4.0.tgz";
       path = fetchurl {
-        name = "uri_js___uri_js_4.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz";
-        sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0";
+        name = "uri_js___uri_js_4.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz";
+        sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602";
       };
     }
     {
@@ -13081,14 +13129,6 @@
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     }
-    {
-      name = "util.promisify___util.promisify_1.0.0.tgz";
-      path = fetchurl {
-        name = "util.promisify___util.promisify_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz";
-        sha1 = "440f7165a459c9a16dc145eb8e72f35687097030";
-      };
-    }
     {
       name = "util___util_0.10.3.tgz";
       path = fetchurl {
@@ -13129,6 +13169,22 @@
         sha1 = "6f1536eb43249f473abc6bd58ff983da1ca30d8d";
       };
     }
+    {
+      name = "uuid___uuid_3.4.0.tgz";
+      path = fetchurl {
+        name = "uuid___uuid_3.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz";
+        sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee";
+      };
+    }
+    {
+      name = "uuid___uuid_8.3.1.tgz";
+      path = fetchurl {
+        name = "uuid___uuid_8.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz";
+        sha1 = "2ba2e6ca000da60fce5a196954ab241131e05a31";
+      };
+    }
     {
       name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz";
       path = fetchurl {
@@ -13138,11 +13194,19 @@
       };
     }
     {
-      name = "validate_npm_package_license___validate_npm_package_license_3.0.1.tgz";
+      name = "v8_to_istanbul___v8_to_istanbul_5.0.1.tgz";
       path = fetchurl {
-        name = "validate_npm_package_license___validate_npm_package_license_3.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz";
-        sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc";
+        name = "v8_to_istanbul___v8_to_istanbul_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz";
+        sha1 = "0608f5b49a481458625edb058488607f25498ba5";
+      };
+    }
+    {
+      name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz";
+      path = fetchurl {
+        name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
+        sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a";
       };
     }
     {
@@ -13322,27 +13386,27 @@
       };
     }
     {
-      name = "vue_jest___vue_jest_4.0.0_beta.2.tgz";
+      name = "vue_jest___vue_jest_4.0.0_rc.0.tgz";
       path = fetchurl {
-        name = "vue_jest___vue_jest_4.0.0_beta.2.tgz";
-        url  = "https://registry.yarnpkg.com/vue-jest/-/vue-jest-4.0.0-beta.2.tgz";
-        sha1 = "f2120ea9d24224aad3a100c2010b0760d47ee6fe";
+        name = "vue_jest___vue_jest_4.0.0_rc.0.tgz";
+        url  = "https://registry.yarnpkg.com/vue-jest/-/vue-jest-4.0.0-rc.0.tgz";
+        sha1 = "0ce263c7f923441d0eeb99841620e8e9470336f4";
       };
     }
     {
-      name = "vue_loader___vue_loader_15.9.0.tgz";
+      name = "vue_loader___vue_loader_15.9.3.tgz";
       path = fetchurl {
-        name = "vue_loader___vue_loader_15.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.0.tgz";
-        sha1 = "5d4b0378a4606188fc83e587ed23c94bc3a10998";
+        name = "vue_loader___vue_loader_15.9.3.tgz";
+        url  = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.3.tgz";
+        sha1 = "0de35d9e555d3ed53969516cac5ce25531299dda";
       };
     }
     {
-      name = "vue_router___vue_router_3.4.3.tgz";
+      name = "vue_router___vue_router_3.4.7.tgz";
       path = fetchurl {
-        name = "vue_router___vue_router_3.4.3.tgz";
-        url  = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.3.tgz";
-        sha1 = "fa93768616ee338aa174f160ac965167fa572ffa";
+        name = "vue_router___vue_router_3.4.7.tgz";
+        url  = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.7.tgz";
+        sha1 = "bf189bafd16f4e4ef783c4a6250a3090f2c1fa1b";
       };
     }
     {
@@ -13362,11 +13426,11 @@
       };
     }
     {
-      name = "vue_template_compiler___vue_template_compiler_2.6.10.tgz";
+      name = "vue_template_compiler___vue_template_compiler_2.6.12.tgz";
       path = fetchurl {
-        name = "vue_template_compiler___vue_template_compiler_2.6.10.tgz";
-        url  = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz";
-        sha1 = "323b4f3495f04faa3503337a82f5d6507799c9cc";
+        name = "vue_template_compiler___vue_template_compiler_2.6.12.tgz";
+        url  = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz";
+        sha1 = "947ed7196744c8a5285ebe1233fe960437fcc57e";
       };
     }
     {
@@ -13386,11 +13450,11 @@
       };
     }
     {
-      name = "vue___vue_2.6.10.tgz";
+      name = "vue___vue_2.6.12.tgz";
       path = fetchurl {
-        name = "vue___vue_2.6.10.tgz";
-        url  = "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz";
-        sha1 = "a72b1a42a4d82a721ea438d1b6bf55e66195c637";
+        name = "vue___vue_2.6.12.tgz";
+        url  = "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz";
+        sha1 = "f5ebd4fa6bd2869403e29a896aed4904456c9123";
       };
     }
     {
@@ -13473,14 +13537,6 @@
         sha1 = "ec3df43c834a207fd7cdefd732b2987896e08511";
       };
     }
-    {
-      name = "webidl_conversions___webidl_conversions_4.0.2.tgz";
-      path = fetchurl {
-        name = "webidl_conversions___webidl_conversions_4.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz";
-        sha1 = "a855980b1f0b6b359ba1d5d9fb39ae941faa63ad";
-      };
-    }
     {
       name = "webidl_conversions___webidl_conversions_5.0.0.tgz";
       path = fetchurl {
@@ -13593,22 +13649,6 @@
         sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf";
       };
     }
-    {
-      name = "whatwg_url___whatwg_url_6.5.0.tgz";
-      path = fetchurl {
-        name = "whatwg_url___whatwg_url_6.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz";
-        sha1 = "f2df02bff176fd65070df74ad5ccbb5a199965a8";
-      };
-    }
-    {
-      name = "whatwg_url___whatwg_url_7.0.0.tgz";
-      path = fetchurl {
-        name = "whatwg_url___whatwg_url_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz";
-        sha1 = "fde926fa54a599f3adf82dff25a9f7be02dc6edd";
-      };
-    }
     {
       name = "whatwg_url___whatwg_url_8.1.0.tgz";
       path = fetchurl {
@@ -13617,14 +13657,6 @@
         sha1 = "c628acdcf45b82274ce7281ee31dd3c839791771";
       };
     }
-    {
-      name = "which_module___which_module_1.0.0.tgz";
-      path = fetchurl {
-        name = "which_module___which_module_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz";
-        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
-      };
-    }
     {
       name = "which_module___which_module_2.0.0.tgz";
       path = fetchurl {
@@ -13641,6 +13673,14 @@
         sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a";
       };
     }
+    {
+      name = "which___which_2.0.2.tgz";
+      path = fetchurl {
+        name = "which___which_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz";
+        sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1";
+      };
+    }
     {
       name = "wide_align___wide_align_1.1.3.tgz";
       path = fetchurl {
@@ -13705,6 +13745,14 @@
         sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09";
       };
     }
+    {
+      name = "wrap_ansi___wrap_ansi_6.2.0.tgz";
+      path = fetchurl {
+        name = "wrap_ansi___wrap_ansi_6.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz";
+        sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53";
+      };
+    }
     {
       name = "wrappy___wrappy_1.0.2.tgz";
       path = fetchurl {
@@ -13713,14 +13761,6 @@
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     }
-    {
-      name = "write_file_atomic___write_file_atomic_2.4.1.tgz";
-      path = fetchurl {
-        name = "write_file_atomic___write_file_atomic_2.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz";
-        sha1 = "d0b05463c188ae804396fd5ab2a370062af87529";
-      };
-    }
     {
       name = "write_file_atomic___write_file_atomic_3.0.3.tgz";
       path = fetchurl {
@@ -13737,14 +13777,6 @@
         sha1 = "0800e14523b923a387e415123c865616aae0f5c3";
       };
     }
-    {
-      name = "ws___ws_5.2.2.tgz";
-      path = fetchurl {
-        name = "ws___ws_5.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz";
-        sha1 = "dffef14866b8e8dc9133582514d1befaf96e980f";
-      };
-    }
     {
       name = "ws___ws_6.2.1.tgz";
       path = fetchurl {
@@ -13873,14 +13905,6 @@
         sha1 = "c9d14e48be6873aa46fb429f22f2165557fd2dea";
       };
     }
-    {
-      name = "y18n___y18n_3.2.1.tgz";
-      path = fetchurl {
-        name = "y18n___y18n_3.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz";
-        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
-      };
-    }
     {
       name = "y18n___y18n_4.0.0.tgz";
       path = fetchurl {
@@ -13913,6 +13937,14 @@
         sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72";
       };
     }
+    {
+      name = "yargs_parser___yargs_parser_20.2.1.tgz";
+      path = fetchurl {
+        name = "yargs_parser___yargs_parser_20.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.1.tgz";
+        sha1 = "28f3773c546cdd8a69ddae68116b48a5da328e77";
+      };
+    }
     {
       name = "yargs_parser___yargs_parser_10.1.0.tgz";
       path = fetchurl {
@@ -13930,19 +13962,19 @@
       };
     }
     {
-      name = "yargs_parser___yargs_parser_13.1.1.tgz";
+      name = "yargs_parser___yargs_parser_13.1.2.tgz";
       path = fetchurl {
-        name = "yargs_parser___yargs_parser_13.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz";
-        sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0";
+        name = "yargs_parser___yargs_parser_13.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz";
+        sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38";
       };
     }
     {
-      name = "yargs_parser___yargs_parser_5.0.0.tgz";
+      name = "yargs_parser___yargs_parser_18.1.3.tgz";
       path = fetchurl {
-        name = "yargs_parser___yargs_parser_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz";
-        sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a";
+        name = "yargs_parser___yargs_parser_18.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz";
+        sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0";
       };
     }
     {
@@ -13962,11 +13994,19 @@
       };
     }
     {
-      name = "yargs___yargs_7.1.0.tgz";
+      name = "yargs___yargs_13.3.2.tgz";
       path = fetchurl {
-        name = "yargs___yargs_7.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz";
-        sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8";
+        name = "yargs___yargs_13.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz";
+        sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd";
+      };
+    }
+    {
+      name = "yargs___yargs_15.4.1.tgz";
+      path = fetchurl {
+        name = "yargs___yargs_15.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz";
+        sha1 = "0d87a16de01aee9d8bec2bfbf74f67851730f4f8";
       };
     }
     {

From 2744d2e31ff8552c8893754b8311279789250e2e Mon Sep 17 00:00:00 2001
From: Philipp Riegger <philipp@riegger.name>
Date: Tue, 16 Jun 2020 17:06:51 +0200
Subject: [PATCH 3075/3942] vscode-extensions: add set for aliases

---
 pkgs/misc/vscode-extensions/default.nix | 494 ++++++++++++------------
 1 file changed, 250 insertions(+), 244 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index cd1d4ab28505..6e70852fdc21 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,248 +1,254 @@
-{ stdenv, callPackage, vscode-utils, llvmPackages_8, llvmPackages_latest }:
+{ stdenv, config, lib, callPackage, vscode-utils, llvmPackages_8, llvmPackages_latest }:
 
 let
   inherit (vscode-utils) buildVscodeMarketplaceExtension;
+
+  #
+  # Unless there is a good reason not to, we attempt to use the same name as the
+  # extension's unique identifier (the name the extension gets when installed
+  # from vscode under `~/.vscode`) and found on the marketplace extension page.
+  # So an extension's attribute name should be of the form:
+  # "${mktplcRef.publisher}.${mktplcRef.name}".
+  #
+  self = stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs)
+    {
+
+      alanz.vscode-hie-server = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-hie-server";
+          publisher = "alanz";
+          version = "0.0.27"; # see the note above
+          sha256 = "1mz0h5zd295i73hbji9ivla8hx02i4yhqcv6l4r23w3f07ql3i8h";
+        };
+        meta = {
+          license = stdenv.lib.licenses.mit;
+        };
+      };
+
+      bbenoist.Nix = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "Nix";
+          publisher = "bbenoist";
+          version = "1.0.1";
+          sha256 = "0zd0n9f5z1f0ckzfjr38xw2zzmcxg1gjrava7yahg5cvdcw6l35b";
+        };
+        meta = with stdenv.lib; {
+          license = licenses.mit;
+        };
+      };
+
+      cmschuetz12.wal = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "wal";
+          publisher = "cmschuetz12";
+          version = "0.1.0";
+          sha256 = "0q089jnzqzhjfnv0vlb5kf747s3mgz64r7q3zscl66zb2pz5q4zd";
+        };
+        meta = with stdenv.lib; {
+          license = licenses.mit;
+        };
+      };
+
+      dhall.dhall-lang = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "dhall-lang";
+          publisher = "dhall";
+          version = "0.0.4";
+          sha256 = "0sa04srhqmngmw71slnrapi2xay0arj42j4gkan8i11n7bfi1xpf";
+        };
+        meta = { license = stdenv.lib.licenses.mit; };
+      };
+
+      dhall.vscode-dhall-lsp-server = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-dhall-lsp-server";
+          publisher = "dhall";
+          version = "0.0.4";
+          sha256 = "1zin7s827bpf9yvzpxpr5n6mv0b5rhh3civsqzmj52mdq365d2js";
+        };
+        meta = { license = stdenv.lib.licenses.mit; };
+      };
+
+      formulahendry.auto-close-tag = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "auto-close-tag";
+          publisher = "formulahendry";
+          version = "0.5.6";
+          sha256 = "058jgmllqb0j6gg5anghdp35nkykii28igfcwqgh4bp10pyvspg0";
+        };
+        meta = {
+          license = stdenv.lib.licenses.mit;
+        };
+      };
+
+      haskell.haskell = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "haskell";
+          publisher = "haskell";
+          version = "1.1.0";
+          sha256 = "1wg06lyk0qn9jd6gi007sg7v0z9z8gwq7x2449d4ihs9n3w5l0gb";
+        };
+        meta = with stdenv.lib; {
+          license = licenses.mit;
+        };
+      };
+
+      james-yu.latex-workshop = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "latex-workshop";
+          publisher = "James-Yu";
+          version = "8.2.0";
+          sha256 = "1ai16aam4v5jzhxgms589q0l24kyk1a9in6z4i7g05b3sahyxab2";
+        };
+        meta = with stdenv.lib; {
+          license = licenses.mit;
+        };
+      };
+
+      justusadam.language-haskell = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "language-haskell";
+          publisher = "justusadam";
+          version = "3.2.1";
+          sha256 = "0lxp8xz17ciy93nj4lzxqvz71vw1zdyamrnh2n792yair8890rr6";
+        };
+        meta = {
+          license = stdenv.lib.licenses.bsd3;
+        };
+      };
+
+      ms-azuretools.vscode-docker = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-docker";
+          publisher = "ms-azuretools";
+          version = "0.8.1";
+          sha256 = "0n59whmcrx8946xix6skvc50f2vsc85ckvn8cs06w9mqmymm1q0s";
+        };
+        meta = {
+          license = stdenv.lib.licenses.mit;
+        };
+      };
+
+      ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-kubernetes-tools";
+          publisher = "ms-kubernetes-tools";
+          version = "1.0.6";
+          sha256 = "12a4phl1pddsajy3n0ld6rp607iy0pif6pqrs6ljbg2x97fyra28";
+        };
+        meta = {
+          license = stdenv.lib.licenses.mit;
+        };
+      };
+
+      ms-vscode.Go = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "Go";
+          publisher = "ms-vscode";
+          version = "0.11.7";
+          sha256 = "1l6jjdfivw1pn9y4d4i7zf80ls1k1b0ap1d828ah57ad3bgmyqfi";
+        };
+        meta = {
+          license = stdenv.lib.licenses.mit;
+        };
+      };
+
+      ms-vscode.cpptools = callPackage ./cpptools {};
+
+      ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {};
+
+      ms-python.python = callPackage ./python {
+        extractNuGet = callPackage ./python/extract-nuget.nix { };
+      };
+
+      redhat.vscode-yaml = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-yaml";
+          publisher = "redhat";
+          version = "0.5.3";
+          sha256 = "03swlsp906rqlrx6jf3ibh7pk36sm0zdr8jfy6sr3w5lqjg27gka";
+        };
+        meta = {
+          license = stdenv.lib.licenses.mit;
+        };
+      };
+
+      matklad.rust-analyzer = callPackage ./rust-analyzer {};
+
+      scala-lang.scala = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "scala";
+          publisher = "scala-lang";
+          version = "0.4.5";
+          sha256 = "0nrj32a7a86vwc9gfh748xs3mmfwbc304dp7nks61f0lx8b4wzxw";
+        };
+        meta = {
+          license = stdenv.lib.licenses.mit;
+        };
+      };
+
+      scalameta.metals = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "metals";
+          publisher = "scalameta";
+          version = "1.9.6";
+          sha256 = "12sjzk64kz7z8zqh3zg1dyb3v4c5xxgi1ain1jvw8hwf0hicqlgi";
+        };
+        meta = {
+          license = stdenv.lib.licenses.asl20;
+        };
+      };
+
+      skyapps.fish-vscode = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "fish-vscode";
+          publisher = "skyapps";
+          version = "0.2.1";
+          sha256 = "0y1ivymn81ranmir25zk83kdjpjwcqpnc9r3jwfykjd9x0jib2hl";
+        };
+        meta = with stdenv.lib; {
+          license = licenses.mit;
+        };
+      };
+
+      vadimcn.vscode-lldb = callPackage ./vscode-lldb {
+        lldb = llvmPackages_latest.lldb;
+      };
+
+      ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {};
+
+      vscodevim.vim = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vim";
+          publisher = "vscodevim";
+          version = "1.11.3";
+          sha256 = "1smzsgcrkhghbnpy51gp28kh74l7y4s2m8pfxabb4ffb751254j0";
+        };
+        meta = {
+          license = stdenv.lib.licenses.mit;
+        };
+      };
+
+      xaver.clang-format = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "clang-format";
+          publisher = "xaver";
+          version = "1.9.0";
+          sha256 = "abd0ef9176eff864f278c548c944032b8f4d8ec97d9ac6e7383d60c92e258c2f";
+        };
+        meta = with stdenv.lib; {
+          license = licenses.mit;
+          maintainers = [ maintainers.zeratax ];
+        };
+      };
+
+      llvm-org.lldb-vscode = llvmPackages_8.lldb;
+
+      WakaTime.vscode-wakatime = callPackage ./wakatime {};
+    } // lib.optionalAttrs (config.allowAliases or true) (
+    with self; {
+      # aliases
+    }
+  );
 in
-#
-# Unless there is a good reason not to, we attempt to use the same name as the
-# extension's unique identifier (the name the extension gets when installed
-# from vscode under `~/.vscode`) and found on the marketplace extension page.
-# So an extension's attribute name should be of the form:
-# "${mktplcRef.publisher}.${mktplcRef.name}".
-#
-stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs)
-{
-
-  alanz.vscode-hie-server = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "vscode-hie-server";
-      publisher = "alanz";
-      version = "0.0.27"; # see the note above
-      sha256 = "1mz0h5zd295i73hbji9ivla8hx02i4yhqcv6l4r23w3f07ql3i8h";
-    };
-    meta = {
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-  bbenoist.Nix = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-        name = "Nix";
-        publisher = "bbenoist";
-        version = "1.0.1";
-        sha256 = "0zd0n9f5z1f0ckzfjr38xw2zzmcxg1gjrava7yahg5cvdcw6l35b";
-    };
-    meta = with stdenv.lib; {
-      license = licenses.mit;
-    };
-  };
-
-  cmschuetz12.wal = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-        name = "wal";
-        publisher = "cmschuetz12";
-        version = "0.1.0";
-        sha256 = "0q089jnzqzhjfnv0vlb5kf747s3mgz64r7q3zscl66zb2pz5q4zd";
-    };
-    meta = with stdenv.lib; {
-      license = licenses.mit;
-    };
-  };
-
-  dhall.dhall-lang = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "dhall-lang";
-      publisher = "dhall";
-      version = "0.0.4";
-      sha256 = "0sa04srhqmngmw71slnrapi2xay0arj42j4gkan8i11n7bfi1xpf";
-    };
-    meta = { license = stdenv.lib.licenses.mit; };
-  };
-
-  dhall.vscode-dhall-lsp-server = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "vscode-dhall-lsp-server";
-      publisher = "dhall";
-      version = "0.0.4";
-      sha256 = "1zin7s827bpf9yvzpxpr5n6mv0b5rhh3civsqzmj52mdq365d2js";
-    };
-    meta = { license = stdenv.lib.licenses.mit; };
-  };
-
-  formulahendry.auto-close-tag = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "auto-close-tag";
-      publisher = "formulahendry";
-      version = "0.5.6";
-      sha256 = "058jgmllqb0j6gg5anghdp35nkykii28igfcwqgh4bp10pyvspg0";
-    };
-    meta = {
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-  haskell.haskell = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "haskell";
-      publisher = "haskell";
-      version = "1.1.0";
-      sha256 = "1wg06lyk0qn9jd6gi007sg7v0z9z8gwq7x2449d4ihs9n3w5l0gb";
-    };
-    meta = with stdenv.lib; {
-      license = licenses.mit;
-    };
-  };
-
-  james-yu.latex-workshop = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "latex-workshop";
-      publisher = "James-Yu";
-      version = "8.2.0";
-      sha256 = "1ai16aam4v5jzhxgms589q0l24kyk1a9in6z4i7g05b3sahyxab2";
-    };
-    meta = with stdenv.lib; {
-      license = licenses.mit;
-    };
-  };
-
-  justusadam.language-haskell = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "language-haskell";
-      publisher = "justusadam";
-      version = "3.2.1";
-      sha256 = "0lxp8xz17ciy93nj4lzxqvz71vw1zdyamrnh2n792yair8890rr6";
-    };
-    meta = {
-      license = stdenv.lib.licenses.bsd3;
-    };
-  };
-
-  ms-azuretools.vscode-docker = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "vscode-docker";
-      publisher = "ms-azuretools";
-      version = "0.8.1";
-      sha256 = "0n59whmcrx8946xix6skvc50f2vsc85ckvn8cs06w9mqmymm1q0s";
-    };
-    meta = {
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-  ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "vscode-kubernetes-tools";
-      publisher = "ms-kubernetes-tools";
-      version = "1.0.6";
-      sha256 = "12a4phl1pddsajy3n0ld6rp607iy0pif6pqrs6ljbg2x97fyra28";
-    };
-    meta = {
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-  ms-vscode.Go = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "Go";
-      publisher = "ms-vscode";
-      version = "0.11.7";
-      sha256 = "1l6jjdfivw1pn9y4d4i7zf80ls1k1b0ap1d828ah57ad3bgmyqfi";
-    };
-    meta = {
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-  ms-vscode.cpptools = callPackage ./cpptools {};
-
-  ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {};
-
-  ms-python.python = callPackage ./python {
-    extractNuGet = callPackage ./python/extract-nuget.nix { };
-  };
-
-  redhat.vscode-yaml = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "vscode-yaml";
-      publisher = "redhat";
-      version = "0.5.3";
-      sha256 = "03swlsp906rqlrx6jf3ibh7pk36sm0zdr8jfy6sr3w5lqjg27gka";
-    };
-    meta = {
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-  matklad.rust-analyzer = callPackage ./rust-analyzer {};
-
-  scala-lang.scala = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "scala";
-      publisher = "scala-lang";
-      version = "0.4.5";
-      sha256 = "0nrj32a7a86vwc9gfh748xs3mmfwbc304dp7nks61f0lx8b4wzxw";
-    };
-    meta = {
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-  scalameta.metals = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "metals";
-      publisher = "scalameta";
-      version = "1.9.6";
-      sha256 = "12sjzk64kz7z8zqh3zg1dyb3v4c5xxgi1ain1jvw8hwf0hicqlgi";
-    };
-    meta = {
-      license = stdenv.lib.licenses.asl20;
-    };
-  };
-
-  skyapps.fish-vscode = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "fish-vscode";
-      publisher = "skyapps";
-      version = "0.2.1";
-      sha256 = "0y1ivymn81ranmir25zk83kdjpjwcqpnc9r3jwfykjd9x0jib2hl";
-    };
-    meta = with stdenv.lib; {
-      license = licenses.mit;
-    };
-  };
-
-  vadimcn.vscode-lldb = callPackage ./vscode-lldb {
-    lldb = llvmPackages_latest.lldb;
-  };
-
-  ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {};
-
-  vscodevim.vim = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "vim";
-      publisher = "vscodevim";
-      version = "1.11.3";
-      sha256 = "1smzsgcrkhghbnpy51gp28kh74l7y4s2m8pfxabb4ffb751254j0";
-    };
-    meta = {
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-  xaver.clang-format = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      name = "clang-format";
-      publisher = "xaver";
-      version = "1.9.0";
-      sha256 = "abd0ef9176eff864f278c548c944032b8f4d8ec97d9ac6e7383d60c92e258c2f";
-    };
-    meta = with stdenv.lib; {
-      license = licenses.mit;
-      maintainers = [ maintainers.zeratax ];
-    };
-  };
-
-  llvm-org.lldb-vscode = llvmPackages_8.lldb;
-
-  WakaTime.vscode-wakatime = callPackage ./wakatime {};
-}
+self

From 9bc146db92e615cbb92362d8ac2390edfccab03b Mon Sep 17 00:00:00 2001
From: Philipp Riegger <philipp@riegger.name>
Date: Tue, 16 Jun 2020 17:08:18 +0200
Subject: [PATCH 3076/3942] vscode-extensions.golang.Go: init at 0.18.1

---
 pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 6e70852fdc21..5b0a93914453 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -81,6 +81,18 @@ let
         };
       };
 
+      golang.Go = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "Go";
+          publisher = "golang";
+          version = "0.18.1";
+          sha256 = "sha256-b2Wa3TULQQnBm1/xnDCB9SZjE+Wxz5wBttjDEtf8qlE=";
+        };
+        meta = {
+          license = stdenv.lib.licenses.mit;
+        };
+      };
+
       haskell.haskell = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "haskell";

From 5931f86233c0285e23249d01cd4c51b14991b95e Mon Sep 17 00:00:00 2001
From: Philipp Riegger <philipp@riegger.name>
Date: Tue, 16 Jun 2020 17:11:31 +0200
Subject: [PATCH 3077/3942] vscode-extensions.ms-vscode.Go: remove

According to the README.md:

"This is the new home for the VS Code Go extension. We just migrated
from Microsoft/vscode-go. Learn more about our move on the Go blog."

See also: https://blog.golang.org/vscode-go.
---
 pkgs/misc/vscode-extensions/default.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 5b0a93914453..d523e334018c 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -153,18 +153,6 @@ let
         };
       };
 
-      ms-vscode.Go = buildVscodeMarketplaceExtension {
-        mktplcRef = {
-          name = "Go";
-          publisher = "ms-vscode";
-          version = "0.11.7";
-          sha256 = "1l6jjdfivw1pn9y4d4i7zf80ls1k1b0ap1d828ah57ad3bgmyqfi";
-        };
-        meta = {
-          license = stdenv.lib.licenses.mit;
-        };
-      };
-
       ms-vscode.cpptools = callPackage ./cpptools {};
 
       ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {};
@@ -260,6 +248,7 @@ let
     } // lib.optionalAttrs (config.allowAliases or true) (
     with self; {
       # aliases
+      ms-vscode.Go = golang.Go;
     }
   );
 in

From 30afa507a3acf39910fcf278008e71c6a1e3ebb2 Mon Sep 17 00:00:00 2001
From: Martin Lavoie <broemartino@gmail.com>
Date: Fri, 20 Nov 2020 17:33:47 +0100
Subject: [PATCH 3078/3942] pynac: use python3 instead of python2

---
 pkgs/applications/science/math/pynac/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index 3e6057c9aef0..87fb205174bf 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -4,8 +4,9 @@
 , pkgconfig
 , flint
 , gmp
-, python2
+, python3
 , singular
+, ncurses
 }:
 
 stdenv.mkDerivation rec {
@@ -23,8 +24,8 @@ stdenv.mkDerivation rec {
     flint
     gmp
     singular
-    singular
-    python2
+    python3
+    ncurses
   ];
 
   nativeBuildInputs = [

From f74137c76f6eebee3cf52cc5ff441cdf642114d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Nov 2020 21:48:30 +0100
Subject: [PATCH 3079/3942] hackage2nix: update Haskell package set to Stackage
 Nightly 2020-11-11

This means we'll switch our default compiler from ghc-8.8.4 to 8.10.2.
---
 .../configuration-hackage2nix.yaml            | 1107 +++++++++--------
 1 file changed, 591 insertions(+), 516 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 11bf99d4516c..80d41552f1b2 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1,37 +1,38 @@
 # pkgs/development/haskell-modules/configuration-hackage2nix.yaml
 
-compiler: ghc-8.8.4
+compiler: ghc-8.10.2
 
 core-packages:
   - array-0.5.4.0
-  - base-4.13.0.0
-  - binary-0.8.7.0
+  - base-4.14.1.0
+  - binary-0.8.8.0
   - bytestring-0.10.10.0
-  - Cabal-3.0.1.0
+  - Cabal-3.2.0.0
   - containers-0.6.2.1
   - deepseq-1.4.4.0
   - directory-1.3.6.0
+  - exceptions-0.10.4
   - filepath-1.4.2.1
-  - ghc-8.8.3
-  - ghc-boot-8.8.3
-  - ghc-boot-th-8.8.3
+  - ghc-8.10.2
+  - ghc-boot-8.10.2
+  - ghc-boot-th-8.10.2
   - ghc-compact-0.1.0.0
-  - ghc-heap-8.8.3
-  - ghc-prim-0.5.3
-  - ghci-8.8.3
-  - haskeline-0.7.5.0
-  - hpc-0.6.0.3
-  - integer-gmp-1.0.2.0
-  - libiserv-8.8.3
+  - ghc-heap-8.10.2
+  - ghc-prim-0.6.1
+  - ghci-8.10.2
+  - haskeline-0.8.0.1
+  - hpc-0.6.1.0
+  - integer-gmp-1.0.3.0
+  - libiserv-8.10.2
   - mtl-2.2.2
   - parsec-3.1.14.0
   - pretty-1.1.3.6
-  - process-1.6.8.0
+  - process-1.6.9.0
   - rts-1.0
   - stm-2.5.0.0
-  - template-haskell-2.15.0.0
+  - template-haskell-2.16.0.0
   - terminfo-0.4.1.4
-  - text-1.2.4.0
+  - text-1.2.3.2
   - time-1.9.3
   - transformers-0.5.6.2
   - unix-2.7.2.2
@@ -75,19 +76,17 @@ default-package-overrides:
   # haskell-language-server 0.5.0.0 doesn't accept newer versions
   - fourmolu ==0.2.*
   - refinery ==0.2.*
-  # LTS Haskell 16.20
+  # Stackage Nightly 2020-11-11
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
   - accuerr ==0.2.0.2
   - ace ==0.6
   - action-permutations ==0.0.0.1
-  - active ==0.2.0.14
   - ad ==4.4.1
   - adjunctions ==4.4
   - adler32 ==0.1.2.0
-  - advent-of-code-api ==0.2.7.0
-  - aeson ==1.4.7.1
+  - aeson ==1.5.4.1
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.2.0.0
@@ -101,10 +100,11 @@ default-package-overrides:
   - aeson-picker ==0.1.0.5
   - aeson-pretty ==0.8.8
   - aeson-qq ==0.8.3
-  - aeson-schemas ==1.2.0
-  - aeson-utils ==0.3.0.2
+  - aeson-schemas ==1.3.2
+  - aeson-with ==0.1.2.0
   - aeson-yak ==0.1.1.3
-  - aeson-yaml ==1.0.6.0
+  - aeson-yaml ==1.1.0.0
+  - agda2lagda ==0.2020.11.1
   - al ==0.1.4.2
   - alarmclock ==0.7.0.5
   - alerts ==0.1.2.0
@@ -119,7 +119,6 @@ default-package-overrides:
   - alsa-seq ==0.6.0.7
   - alternative-vector ==0.0.0
   - ALUT ==2.4.0.3
-  - amazonka ==1.6.1
   - amazonka-apigateway ==1.6.1
   - amazonka-application-autoscaling ==1.6.1
   - amazonka-appstream ==1.6.1
@@ -214,35 +213,34 @@ default-package-overrides:
   - annotated-wl-pprint ==0.7.0
   - ansi-terminal ==0.10.3
   - ansi-wl-pprint ==0.6.9
-  - antiope-core ==7.5.3
-  - antiope-dynamodb ==7.5.3
-  - antiope-messages ==7.5.3
-  - antiope-s3 ==7.5.3
-  - antiope-sns ==7.5.3
-  - antiope-sqs ==7.5.3
   - ANum ==0.2.0.2
+  - ap-normalize ==0.1.0.0
   - apecs ==0.9.2
   - apecs-gloss ==0.2.4
   - apecs-physics ==0.4.4
   - api-field-json-th ==0.1.0.2
+  - app-settings ==0.2.0.12
   - appar ==0.1.8
   - appendmap ==0.1.5
+  - apply-refact ==0.8.2.1
   - apportionment ==0.0.0.3
   - approximate ==0.3.2
-  - app-settings ==0.2.0.12
+  - approximate-equality ==1.1.0.2
   - arbor-lru-cache ==0.1.1.1
-  - arithmoi ==0.10.0.0
+  - arbor-postgres ==0.0.5
+  - arithmoi ==0.11.0.1
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
   - ascii ==1.0.0.2
   - ascii-case ==1.0.0.2
   - ascii-char ==1.0.0.2
-  - asciidiagram ==1.3.3.3
   - ascii-group ==1.0.0.2
   - ascii-predicates ==1.0.0.2
   - ascii-progress ==0.3.3.0
   - ascii-superset ==1.0.0.2
   - ascii-th ==1.0.0.2
+  - asciidiagram ==1.3.3.3
+  - asif ==6.0.4
   - asn1-encoding ==0.9.6
   - asn1-parse ==0.9.5
   - asn1-types ==0.3.4
@@ -251,9 +249,9 @@ default-package-overrides:
   - astro ==0.4.2.1
   - async ==2.2.2
   - async-extra ==0.2.0.0
+  - async-pool ==0.9.1
   - async-refresh ==0.3.0.0
   - async-refresh-tokens ==0.4.0.0
-  - async-timer ==0.2.0.0
   - atom-basic ==0.2.5
   - atomic-primops ==0.8.4
   - atomic-write ==0.2.0.7
@@ -264,54 +262,57 @@ default-package-overrides:
   - attoparsec-iso8601 ==1.0.1.0
   - attoparsec-path ==0.0.0.1
   - audacity ==0.0.2
-  - aur ==7.0.4
-  - aura ==3.1.9
+  - aur ==7.0.5
+  - aura ==3.2.2
   - authenticate ==1.3.5
   - authenticate-oauth ==1.6.0.1
   - auto ==0.4.3.1
-  - autoexporter ==1.1.19
   - auto-update ==0.1.6
+  - autoexporter ==1.1.19
   - avers ==0.0.17.1
   - avro ==0.5.2.0
   - aws-cloudfront-signed-cookies ==0.2.0.6
+  - backtracking ==0.1.0
   - bank-holidays-england ==0.2.0.5
-  - base16 ==0.2.1.0
+  - barbies ==2.0.2.0
+  - base-compat ==0.11.2
+  - base-compat-batteries ==0.11.2
+  - base-orphans ==0.8.3
+  - base-prelude ==1.4
+  - base-unicode-symbols ==0.2.4.2
+  - base16 ==0.3.0.1
   - base16-bytestring ==0.1.1.7
-  - base16-lens ==0.1.2.0
-  - base32 ==0.1.1.2
+  - base16-lens ==0.1.3.0
+  - base32 ==0.2.0.0
   - base32-lens ==0.1.0.0
   - base32string ==0.9.1
+  - base58-bytestring ==0.1.0
   - base58string ==0.10.0
   - base64 ==0.4.2.2
-  - base64-bytestring ==1.0.0.3
+  - base64-bytestring ==1.1.0.0
   - base64-bytestring-type ==1.0.1
   - base64-lens ==0.3.0
   - base64-string ==0.2
-  - base-compat ==0.11.2
-  - base-compat-batteries ==0.11.2
   - basement ==0.0.11
-  - base-noprelude ==4.13.0.0
-  - base-orphans ==0.8.3
-  - base-prelude ==1.3
-  - base-unicode-symbols ==0.2.4.2
   - basic-prelude ==0.7.0
   - bazel-runfiles ==0.12
   - bbdb ==0.8
   - bcrypt ==0.0.11
-  - bech32 ==1.0.2
+  - bech32 ==1.1.0
   - bech32-th ==1.0.2
   - bench ==1.0.12
   - benchpress ==0.2.2.15
   - between ==0.11.0.0
   - bibtex ==0.1.0.6
-  - bifunctors ==5.5.7
+  - bifunctors ==5.5.8
   - bimap ==0.4.0
-  - bimaps ==0.1.0.2
   - bimap-server ==0.1.0.1
+  - bimaps ==0.1.0.2
   - bin ==0.1
   - binary-conduit ==1.3.1
   - binary-ext ==2.0.4
   - binary-ieee754 ==0.1.0.0
+  - binary-instances ==1.0.0.1
   - binary-list ==1.1.1.2
   - binary-orphans ==1.0.1
   - binary-parser ==0.5.6
@@ -319,6 +320,7 @@ default-package-overrides:
   - binary-search ==1.0.0.3
   - binary-shared ==0.8.3
   - binary-tagged ==0.3
+  - binaryen ==0.0.5.0
   - bindings-DSL ==1.0.25
   - bindings-GLFW ==3.3.2.0
   - bindings-libzip ==1.0.1
@@ -326,11 +328,11 @@ default-package-overrides:
   - bins ==0.1.2.0
   - bitarray ==0.0.1.1
   - bits ==0.5.2
-  - bitset-word8 ==0.1.1.2
   - bits-extra ==0.0.2.0
+  - bitset-word8 ==0.1.1.2
   - bitvec ==1.0.3.0
   - blake2 ==0.3.0
-  - blanks ==0.3.0
+  - blanks ==0.5.0
   - blas-carray ==0.1.0.1
   - blas-comfort-array ==0.0.0.2
   - blas-ffi ==0.1
@@ -341,37 +343,38 @@ default-package-overrides:
   - blaze-svg ==0.3.6.1
   - blaze-textual ==0.2.1.0
   - bmp ==1.2.6.3
+  - BNFC ==2.8.4
+  - board-games ==0.3
   - boltzmann-samplers ==0.1.1.0
   - Boolean ==0.2.4
   - boolean-like ==0.1.1.0
-  - boolean-normal-forms ==0.0.1.1
   - boolsimplifier ==0.1.8
   - boots ==0.2.0.1
   - bordacount ==0.1.0.0
   - boring ==0.1.3
   - both ==0.1.1.1
-  - bound ==2.0.1
-  - BoundedChan ==1.0.3.0
+  - bound ==2.0.2
   - bounded-queue ==1.0.0
+  - BoundedChan ==1.0.3.0
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.5
-  - brick ==0.52.1
-  - brittany ==0.12.1.1
+  - brick ==0.57
   - broadcast-chan ==0.2.1.1
   - bsb-http-chunked ==0.0.0.4
   - bson ==0.4.0.1
   - btrfs ==0.2.0.0
   - buffer-builder ==0.2.4.7
   - buffer-pipe ==0.0
-  - bugsnag-hs ==0.1.0.3
+  - bugsnag-hs ==0.2.0.3
+  - bugzilla-redhat ==0.3.0
+  - burrito ==1.1.0.2
   - butcher ==1.3.3.2
   - bv ==0.5
   - bv-little ==1.1.1
-  - byteable ==0.1.1
-  - byte-count-reader ==0.10.1.1
-  - bytedump ==1.0
   - byte-order ==0.1.2.0
+  - byteable ==0.1.1
+  - bytedump ==1.0
   - byteorder ==1.0.4
   - bytes ==0.17
   - byteset ==0.1.1.0
@@ -382,29 +385,33 @@ default-package-overrides:
   - bytestring-strict-builder ==0.4.5.3
   - bytestring-to-vector ==0.3.0.1
   - bytestring-tree-builder ==0.2.7.5
-  - bz2 ==1.0.0.1
+  - bz2 ==1.0.1.0
+  - bzlib ==0.5.1.0
   - bzlib-conduit ==0.3.0.2
+  - c14n ==0.1.0.1
   - c2hs ==0.28.6
-  - cabal-appimage ==0.3.0.0
-  - cabal-debian ==5.0.3
+  - ca-province-codes ==1.0.0.0
+  - cabal-debian ==5.1
   - cabal-doctest ==1.0.8
+  - cabal-file ==0.1.0
+  - cabal-flatpak ==0.1.0.2
+  - cabal-plan ==0.7.2.0
   - cabal-rpm ==2.0.7
   - cache ==0.1.3.0
   - cacophony ==0.10.1
   - calendar-recycling ==0.0.0.1
   - call-stack ==0.2.0
   - can-i-haz ==0.3.1.0
-  - ca-province-codes ==1.0.0.0
   - cardano-coin-selection ==1.0.1
   - carray ==0.1.6.8
   - casa-client ==0.0.1
   - casa-types ==0.0.1
-  - cased ==0.1.0.0
   - case-insensitive ==1.2.1.0
+  - cased ==0.1.0.0
   - cases ==0.1.4
   - casing ==0.1.4.1
   - cassava ==0.5.2.0
-  - cassava-conduit ==0.5.1
+  - cassava-conduit ==0.6.0
   - cassava-megaparsec ==2.0.2
   - cast ==0.1.0.2
   - category ==0.2.5.0
@@ -416,13 +423,13 @@ default-package-overrides:
   - cereal-text ==0.1.0.2
   - cereal-vector ==0.2.0.1
   - cfenv ==0.1.0.0
+  - cgi ==3001.5.0.0
   - chan ==0.0.4.1
   - ChannelT ==0.0.0.7
-  - character-cases ==0.1.0.4
+  - character-cases ==0.1.0.6
   - charset ==0.3.7.1
   - charsetdetect-ae ==1.1.0.4
   - Chart ==1.9.3
-  - Chart-diagrams ==1.9.3
   - chaselev-deque ==0.5.0.5
   - ChasingBottoms ==1.3.1.9
   - cheapskate ==0.1.1.2
@@ -442,12 +449,11 @@ default-package-overrides:
   - cipher-des ==0.0.6
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.6
-  - clash-ghc ==1.2.4
-  - clash-lib ==1.2.4
-  - clash-prelude ==1.2.4
+  - clash-ghc ==1.2.5
+  - clash-lib ==1.2.5
+  - clash-prelude ==1.2.5
   - classy-prelude ==1.5.0
   - classy-prelude-conduit ==1.5.0
-  - classy-prelude-yesod ==1.5.0
   - clay ==0.13.3
   - clientsession ==0.9.1.2
   - climb ==0.3.3
@@ -460,15 +466,13 @@ default-package-overrides:
   - cmark-gfm ==0.2.2
   - cmark-lucid ==0.1.0.0
   - cmdargs ==0.10.20
-  - codec-beam ==0.2.0
-  - codec-rpm ==0.2.2
-  - code-page ==0.2
-  - coercible-utils ==0.1.0
   - co-log ==0.4.0.1
   - co-log-concurrent ==0.5.0.0
   - co-log-core ==0.2.1.1
-  - co-log-polysemy ==0.0.1.2
-  - Color ==0.1.4
+  - code-page ==0.2
+  - codec-beam ==0.2.0
+  - codec-rpm ==0.2.2
+  - Color ==0.3.0
   - colorful-monoids ==0.2.1.3
   - colorize-haskell ==1.0.1
   - colour ==2.3.5
@@ -478,11 +482,21 @@ default-package-overrides:
   - comfort-graph ==0.0.3.1
   - commutative ==0.0.2
   - comonad ==5.0.6
+  - comonad-extras ==4.0.1
   - compactmap ==0.1.4.2.1
   - compensated ==0.8.1
   - compiler-warnings ==0.1.0
   - composable-associations ==0.1.0.0
   - composable-associations-aeson ==0.1.0.0
+  - composite-aeson ==0.7.4.0
+  - composite-aeson-path ==0.7.4.0
+  - composite-aeson-refined ==0.7.4.0
+  - composite-base ==0.7.4.0
+  - composite-binary ==0.7.4.0
+  - composite-ekg ==0.7.4.0
+  - composite-hashable ==0.7.4.0
+  - composite-tuple ==0.1.2.0
+  - composite-xstep ==0.1.0.0
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
   - concise ==0.1.0.1
@@ -503,17 +517,18 @@ default-package-overrides:
   - conferer-hspec ==0.4.0.1
   - conferer-source-json ==0.4.0.1
   - conferer-warp ==0.4.0.1
-  - ConfigFile ==1.1.4
   - config-ini ==0.2.4.0
+  - ConfigFile ==1.1.4
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
-  - configurator-pg ==0.2.4
+  - configurator-pg ==0.2.5
   - connection ==0.3.1
   - connection-pool ==0.2.2
   - console-style ==0.0.2.1
   - constraint ==0.1.4.0
-  - constraints ==0.12
   - constraint-tuples ==0.1.2
+  - constraints ==0.12
+  - construct ==0.3
   - contravariant ==1.5.2
   - contravariant-extras ==0.3.5.2
   - control-bool ==0.2.1
@@ -521,16 +536,17 @@ default-package-overrides:
   - control-monad-omega ==0.3.2
   - convertible ==1.1.1.0
   - cookie ==0.4.5
-  - core-data ==0.2.1.8
-  - core-program ==0.2.5.0
-  - core-text ==0.2.3.6
+  - core-data ==0.2.1.9
+  - core-program ==0.2.6.0
+  - core-text ==0.3.0.0
   - countable ==1.0
+  - country ==0.2.1
   - cpio-conduit ==0.7.0
   - cpphs ==1.20.9.1
   - cprng-aes ==0.6.1
   - cpu ==0.1.2
   - cpuinfo ==0.1.0.1
-  - crackNum ==2.3
+  - crackNum ==2.4
   - crc32c ==0.0.0
   - credential-store ==0.1.2
   - criterion ==1.5.7.0
@@ -538,28 +554,25 @@ default-package-overrides:
   - cron ==0.7.0
   - crypto-api ==0.13.3
   - crypto-cipher-types ==0.0.9
-  - cryptocompare ==0.1.2
   - crypto-enigma ==0.1.1.6
-  - cryptohash ==0.11.9
-  - cryptohash-cryptoapi ==0.1.4
-  - cryptohash-md5 ==0.11.100.1
-  - cryptohash-sha1 ==0.11.100.1
-  - cryptohash-sha256 ==0.11.101.0
-  - cryptohash-sha512 ==0.11.100.1
-  - cryptonite ==0.26
-  - cryptonite-conduit ==0.2.2
-  - cryptonite-openssl ==0.7
   - crypto-numbers ==0.2.7
   - crypto-pubkey ==0.2.8
   - crypto-pubkey-types ==0.4.3
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
-  - crypt-sha512 ==0
+  - cryptocompare ==0.1.2
+  - cryptohash ==0.11.9
+  - cryptohash-cryptoapi ==0.1.4
+  - cryptohash-md5 ==0.11.100.1
+  - cryptohash-sha1 ==0.11.100.1
+  - cryptohash-sha256 ==0.11.101.0
+  - cryptonite ==0.27
+  - cryptonite-conduit ==0.2.2
+  - cryptonite-openssl ==0.7
   - csp ==1.4.0
   - css-syntax ==0.1.0.0
   - css-text ==0.1.3.0
   - csv ==0.1.2
-  - csv-conduit ==0.7.1.0
   - ctrie ==0.2
   - cubicbezier ==0.6.0.6
   - cubicspline ==0.1.2
@@ -578,6 +591,7 @@ default-package-overrides:
   - d10 ==0.2.1.6
   - data-accessor ==0.2.3
   - data-accessor-mtl ==0.2.0.4
+  - data-accessor-template ==0.2.1.16
   - data-accessor-transformers ==0.2.1.7
   - data-ascii ==1.0.0.2
   - data-binary-ieee754 ==0.4.4
@@ -591,12 +605,12 @@ default-package-overrides:
   - data-default-instances-dlist ==0.0.1
   - data-default-instances-old-locale ==0.0.1
   - data-diverse ==4.7.0.0
-  - datadog ==0.2.5.0
   - data-dword ==0.3.2
   - data-endian ==0.1.1
-  - data-fix ==0.2.1
+  - data-fix ==0.3.0
   - data-forest ==0.1.0.8
   - data-has ==0.3.0.0
+  - data-hash ==0.2.0.1
   - data-interval ==2.0.1
   - data-inttrie ==0.1.4
   - data-lens-light ==0.1.2.2
@@ -609,7 +623,7 @@ default-package-overrides:
   - data-reify ==0.6.3
   - data-serializer ==0.3.4.1
   - data-textual ==0.3.0.3
-  - data-tree-print ==0.1.0.2
+  - datadog ==0.2.5.0
   - dataurl ==0.1.0.0
   - DAV ==1.3.4
   - DBFunctor ==0.1.1.1
@@ -624,37 +638,32 @@ default-package-overrides:
   - deepseq-generics ==0.2.0.0
   - deepseq-instances ==0.1.0.1
   - deferred-folds ==0.9.11
-  - dejafu ==2.3.0.1
+  - dejafu ==2.4.0.0
   - dense-linear-algebra ==0.1.0.0
   - depq ==0.4.1.0
   - deque ==0.4.3
+  - derive-topdown ==0.0.2.2
   - deriveJsonNoPrefix ==0.1.0.1
   - deriving-aeson ==0.2.6
-  - deriving-compat ==0.5.9
+  - deriving-compat ==0.5.10
   - derulo ==1.0.9
-  - detour-via-sci ==1.0.0
-  - dhall ==1.32.0
-  - dhall-bash ==1.0.30
-  - dhall-json ==1.6.4
-  - dhall-lsp-server ==1.0.8
-  - dhall-yaml ==1.1.0
-  - diagrams ==1.4
-  - diagrams-contrib ==1.4.4
-  - diagrams-core ==1.4.2
-  - diagrams-lib ==1.4.3
-  - diagrams-postscript ==1.5
-  - diagrams-rasterific ==1.4.2
-  - diagrams-solve ==0.1.2
-  - diagrams-svg ==1.4.3
-  - dialogflow-fulfillment ==0.1.1.3
+  - dhall ==1.36.0
+  - dhall-bash ==1.0.34
+  - dhall-json ==1.7.3
+  - dhall-lsp-server ==1.0.11
+  - dhall-yaml ==1.2.3
   - di-core ==1.0.4
+  - di-monad ==1.3.1
+  - diagrams-solve ==0.1.2
+  - dialogflow-fulfillment ==0.1.1.3
   - dictionary-sharing ==0.1.0.0
   - Diff ==0.4.0
   - digest ==0.0.1.2
   - digits ==0.3.1
   - dimensional ==1.3
-  - di-monad ==1.3.1
+  - direct-sqlite ==2.3.26
   - directory-tree ==0.12.1
+  - dirichlet ==0.1.0.0
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
   - distributed-closure ==0.4.2.0
@@ -665,15 +674,16 @@ default-package-overrides:
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
   - dns ==4.0.1
+  - do-list ==1.0.1
+  - do-notation ==0.1.0.2
   - dockerfile ==0.2.0
   - doclayout ==0.3
   - doctemplates ==0.8.2
   - doctest ==0.16.3
   - doctest-discover ==0.2.0.0
-  - doctest-driver-gen ==0.3.0.2
+  - doctest-exitcode-stdio ==0.0
+  - doctest-lib ==0.1
   - doldol ==0.4.1.2
-  - do-list ==1.0.1
-  - do-notation ==0.1.0.2
   - dotenv ==0.8.0.7
   - dotgen ==0.4.3
   - dotnet-timespan ==0.0.1.0
@@ -682,7 +692,6 @@ default-package-overrides:
   - drinkery ==0.4
   - dsp ==0.2.5.1
   - dual ==0.1.1.1
-  - dual-tree ==0.2.2.1
   - dublincore-xml-conduit ==0.1.0.2
   - dunai ==0.7.0
   - duration ==0.1.0.0
@@ -700,9 +709,9 @@ default-package-overrides:
   - edit-distance ==0.2.2.1
   - edit-distance-vector ==1.0.0.4
   - editor-open ==0.6.0.0
-  - egison ==4.0.3
-  - egison-pattern-src ==0.2.1.0
-  - egison-pattern-src-th-mode ==0.2.1.1
+  - egison ==4.1.2
+  - egison-pattern-src ==0.2.1.2
+  - egison-pattern-src-th-mode ==0.2.1.2
   - either ==5.0.1.1
   - either-both ==0.1.1.1
   - either-unwrap ==1.1
@@ -712,53 +721,61 @@ default-package-overrides:
   - ekg-statsd ==0.2.5.0
   - elerea ==2.9.0
   - elf ==0.30
-  - eliminators ==0.6
-  - elm2nix ==0.2
+  - eliminators ==0.7
   - elm-bridge ==0.6.1
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
-  - emacs-module ==0.1.1
+  - elm2nix ==0.2
+  - elynx ==0.5.0
+  - elynx-markov ==0.5.0
+  - elynx-nexus ==0.5.0
+  - elynx-seq ==0.5.0
+  - elynx-tools ==0.5.0
+  - elynx-tree ==0.5.0
   - email-validate ==2.3.2.13
   - emojis ==0.1
   - enclosed-exceptions ==1.0.3
   - ENIG ==0.0.1.0
   - entropy ==0.4.1.6
+  - enum-subset-generate ==0.1.0.0
   - enummapset ==0.6.0.3
   - enumset ==0.0.5
-  - enum-subset-generate ==0.1.0.0
   - envelope ==0.2.2.0
   - envy ==2.1.0.0
   - epub-metadata ==4.5
   - eq ==4.2.1
   - equal-files ==0.0.5.3
   - equational-reasoning ==0.6.0.3
+  - equivalence ==0.3.5
   - erf ==2.0.0.0
   - errors ==2.3.0
   - errors-ext ==0.4.2
   - ersatz ==0.4.8
-  - esqueleto ==3.3.4.0
-  - essence-of-live-coding ==0.1.0.3
-  - essence-of-live-coding-gloss ==0.1.0.3
-  - essence-of-live-coding-pulse ==0.1.0.3
-  - essence-of-live-coding-quickcheck ==0.1.0.3
+  - esqueleto ==3.4.0.1
+  - essence-of-live-coding ==0.2.4
+  - essence-of-live-coding-gloss ==0.2.4
+  - essence-of-live-coding-pulse ==0.2.4
+  - essence-of-live-coding-quickcheck ==0.2.4
   - etc ==0.4.1.0
+  - eve ==0.1.9.0
+  - event-list ==0.1.2
   - eventful-core ==0.2.0
   - eventful-test-helpers ==0.2.0
-  - event-list ==0.1.2
   - eventstore ==1.4.1
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.9
   - exact-pi ==0.5.0.1
   - exception-hierarchy ==0.1.0.4
   - exception-mtl ==0.4.0.1
-  - exceptions ==0.10.4
   - exception-transformers ==0.4.0.9
+  - exception-via ==0.1.0.0
+  - exceptions ==0.10.4
   - executable-path ==0.0.3.1
   - exit-codes ==1.0.0
   - exomizer ==1.0.0
+  - exp-pairs ==0.2.1.0
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.10
-  - exp-pairs ==0.2.0.0
   - express ==0.1.3
   - extended-reals ==0.2.4.0
   - extensible-effects ==5.0.0.1
@@ -768,8 +785,8 @@ default-package-overrides:
   - extrapolate ==0.4.2
   - fail ==4.9.0.0
   - failable ==1.2.4.0
-  - fakedata ==0.6.1
-  - farmhash ==0.1.0.5
+  - fakedata ==0.8.0
+  - fakedata-parser ==0.1.0.0
   - fast-digits ==0.3.0.0
   - fast-logger ==3.0.2
   - fast-math ==1.0.2
@@ -781,13 +798,12 @@ default-package-overrides:
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.6
   - fgl ==5.7.0.3
-  - filecache ==0.4.1
-  - file-embed ==0.0.11.2
+  - file-embed ==0.0.13.0
   - file-embed-lzma ==0
-  - filelock ==0.1.1.5
-  - filemanip ==0.3.6.3
   - file-modules ==0.1.2.4
   - file-path-th ==0.1.0.0
+  - filelock ==0.1.1.5
+  - filemanip ==0.3.6.3
   - filepattern ==0.1.2
   - fileplow ==0.1.0.0
   - filtrable ==0.1.4.0
@@ -807,7 +823,8 @@ default-package-overrides:
   - flags-applicative ==0.1.0.2
   - flat ==0.4.4
   - flat-mcmc ==1.5.2
-  - FloatingHex ==0.4
+  - flexible-defaults ==0.0.3
+  - FloatingHex ==0.5
   - floatshow ==0.2.4
   - flow ==1.0.21
   - flush-queue ==1.0.0
@@ -816,14 +833,12 @@ default-package-overrides:
   - fn ==0.3.0.2
   - focus ==1.0.1.4
   - focuslist ==0.1.0.2
-  - foldable1 ==0.1.0.0
   - fold-debounce ==0.2.0.9
-  - fold-debounce-conduit ==0.2.0.5
-  - foldl ==1.4.6
+  - foldable1 ==0.1.0.0
+  - foldl ==1.4.10
   - folds ==0.7.5
   - follow-file ==0.0.3
   - FontyFruity ==0.5.3.5
-  - force-layout ==0.4.0.6
   - foreign-store ==0.2
   - ForestStructures ==0.0.1.0
   - forkable-monad ==0.2.0.3
@@ -831,12 +846,12 @@ default-package-overrides:
   - format-numbers ==0.1.0.1
   - formatting ==6.3.7
   - foundation ==0.0.25
-  - free ==5.1.3
+  - free ==5.1.4
   - free-categories ==0.2.0.2
+  - free-vl ==0.1.4
   - freenect ==1.2.1
   - freer-simple ==1.2.1.1
   - freetype2 ==0.2.0
-  - free-vl ==0.1.4
   - friendly-time ==0.4.1
   - from-sum ==0.2.3.0
   - frontmatter ==0.1.0.2
@@ -847,34 +862,35 @@ default-package-overrides:
   - funcmp ==1.9
   - function-builder ==0.3.0.1
   - functor-classes-compat ==1
-  - fused-effects ==1.0.2.2
   - fusion-plugin ==0.2.1
   - fusion-plugin-types ==0.1.0
   - fuzzcheck ==0.1.1
   - fuzzy ==0.1.0.0
   - fuzzy-dates ==0.1.1.2
-  - fuzzyset ==0.2.0
   - fuzzy-time ==0.1.0.0
+  - fuzzyset ==0.2.0
   - gauge ==0.2.5
   - gd ==3000.7.3
   - gdp ==0.0.3.0
   - general-games ==1.1.1
   - generic-arbitrary ==0.1.0
   - generic-constraints ==1.1.1.1
-  - generic-data ==0.8.3.0
+  - generic-data ==0.9.2.0
+  - generic-data-surgery ==0.3.0.0
   - generic-deriving ==1.13.1
   - generic-lens ==2.0.0.0
   - generic-lens-core ==2.0.0.0
   - generic-monoid ==0.1.0.1
   - generic-optics ==2.0.0.0
-  - GenericPretty ==1.2.2
   - generic-random ==1.3.0.1
+  - GenericPretty ==1.2.2
   - generics-sop ==0.5.1.0
   - generics-sop-lens ==0.2.0.1
+  - geniplate-mirror ==0.7.7
   - genvalidity ==0.11.0.0
   - genvalidity-aeson ==0.3.0.0
   - genvalidity-bytestring ==0.6.0.0
-  - genvalidity-containers ==0.8.0.2
+  - genvalidity-containers ==0.9.0.0
   - genvalidity-criterion ==0.2.0.0
   - genvalidity-hspec ==0.7.0.4
   - genvalidity-hspec-aeson ==0.3.1.1
@@ -897,14 +913,10 @@ default-package-overrides:
   - geojson ==4.0.2
   - getopt-generics ==0.13.0.4
   - ghc-byteorder ==4.11.0.0.10
-  - ghc-check ==0.5.0.1
-  - ghc-compact ==0.1.0.0
+  - ghc-check ==0.5.0.2
   - ghc-core ==0.5.6
   - ghc-events ==0.13.0
-  - ghc-exactprint ==0.6.2
-  - ghcid ==0.8.7
-  - ghci-hexcalc ==0.1.1.0
-  - ghcjs-codemirror ==0.0.0.2
+  - ghc-exactprint ==0.6.3.2
   - ghc-lib ==8.10.2.20200916
   - ghc-lib-parser ==8.10.2.20200916
   - ghc-lib-parser-ex ==8.10.0.16
@@ -914,41 +926,47 @@ default-package-overrides:
   - ghc-source-gen ==0.4.0.0
   - ghc-syntax-highlighter ==0.0.6.0
   - ghc-tcplugins-extra ==0.4
-  - ghc-typelits-extra ==0.4
+  - ghc-trace-events ==0.1.2.1
+  - ghc-typelits-extra ==0.4.1
   - ghc-typelits-knownnat ==0.7.3
   - ghc-typelits-natnormalise ==0.7.2
   - ghc-typelits-presburger ==0.3.0.1
+  - ghci-hexcalc ==0.1.1.0
+  - ghcid ==0.8.7
+  - ghcjs-codemirror ==0.0.0.2
   - ghost-buster ==0.1.1.0
-  - gi-atk ==2.0.21
-  - gi-cairo ==1.0.23
-  - gi-cairo-connector ==0.0.1
-  - gi-cairo-render ==0.0.1
-  - gi-dbusmenu ==0.4.7
-  - gi-dbusmenugtk3 ==0.4.8
-  - gi-gdk ==3.0.22
-  - gi-gdkpixbuf ==2.0.23
-  - gi-gdkx11 ==3.0.9
-  - gi-gio ==2.0.26
-  - gi-glib ==2.0.23
-  - gi-gobject ==2.0.22
-  - gi-graphene ==1.0.1
-  - gi-gtk ==3.0.33
-  - gi-gtk-hs ==0.3.8.1
+  - gi-atk ==2.0.22
+  - gi-cairo ==1.0.24
+  - gi-cairo-connector ==0.1.0
+  - gi-cairo-render ==0.1.0
+  - gi-dbusmenu ==0.4.8
+  - gi-dbusmenugtk3 ==0.4.9
+  - gi-gdk ==3.0.23
+  - gi-gdkpixbuf ==2.0.24
+  - gi-gdkx11 ==3.0.10
+  - gi-gio ==2.0.27
+  - gi-glib ==2.0.24
+  - gi-gobject ==2.0.24
+  - gi-graphene ==1.0.2
+  - gi-gtk ==3.0.36
+  - gi-gtk-hs ==0.3.9
+  - gi-harfbuzz ==0.0.3
+  - gi-pango ==1.0.23
+  - gi-xlib ==2.0.9
   - ginger ==0.10.1.0
   - gingersnap ==0.3.1.0
-  - gi-pango ==1.0.22
-  - giphy-api ==0.7.0.0
-  - githash ==0.1.4.0
+  - githash ==0.1.5.0
+  - github-release ==1.3.3
   - github-rest ==1.0.3
   - github-types ==0.2.1
-  - gitlab-haskell ==0.1.8
+  - github-webhooks ==0.15.0
+  - gitlab-haskell ==0.2.3
   - gitrev ==1.3.1
-  - gi-xlib ==2.0.8
   - gl ==0.9
   - glabrous ==2.0.2
   - GLFW-b ==3.3.0.0
   - Glob ==0.10.1
-  - gloss ==1.13.1.2
+  - gloss ==1.13.2.1
   - gloss-rendering ==1.13.1.1
   - GLURaw ==2.0.0.4
   - GLUT ==2.7.0.15
@@ -958,60 +976,54 @@ default-package-overrides:
   - gothic ==0.1.5
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
+  - graph-wrapper ==0.2.6.0
   - graphite ==0.10.0.1
+  - graphql-client ==1.1.0
   - graphs ==0.7.1
   - graphviz ==2999.20.1.0
-  - graph-wrapper ==0.2.6.0
   - gravatar ==0.8.0
-  - greskell ==1.1.0.3
-  - greskell-core ==0.1.3.5
-  - greskell-websocket ==0.1.2.4
   - groom ==0.1.2.1
   - group-by-date ==0.1.0.3
-  - groups ==0.4.1.0
+  - groups ==0.5
   - gtk-sni-tray ==0.1.6.0
   - gtk-strut ==0.1.3.0
   - guarded-allocation ==0.0.1
   - hackage-db ==2.1.0
   - hackage-security ==0.6.0.1
-  - haddock-library ==1.8.0
-  - hadolint ==1.18.2
+  - haddock-library ==1.9.0
   - hadoop-streaming ==0.2.0.3
-  - hakyll ==4.13.4.0
   - half ==0.3
   - hall-symbols ==0.1.0.6
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
   - hapistrano ==0.4.1.2
-  - happstack-server ==7.6.1
-  - happy ==1.19.12
+  - happstack-server ==7.7.0
+  - happy ==1.20.0
   - HasBigDecimal ==0.1.1
-  - hasbolt ==0.1.4.3
   - hashable ==1.3.0.0
   - hashable-time ==0.2.0.2
   - hashids ==1.0.2.4
+  - hashing ==0.1.0.1
   - hashmap ==1.3.3
   - hashtables ==1.2.4.1
-  - haskeline ==0.7.5.0
-  - haskell-gi ==0.23.1
-  - haskell-gi-base ==0.23.0
+  - haskeline ==0.8.1.0
+  - haskell-gi ==0.24.5
+  - haskell-gi-base ==0.24.4
   - haskell-gi-overloading ==1.0
-  - haskell-igraph ==0.8.0
   - haskell-import-graph ==1.0.4
   - haskell-lexer ==1.1
   - haskell-lsp ==0.22.0.0
   - haskell-lsp-types ==0.22.0.0
   - haskell-names ==0.9.9
-  - haskell-src ==1.0.3.1
   - haskell-src-exts ==1.23.1
   - haskell-src-exts-util ==0.2.5
   - haskell-src-meta ==0.8.5
   - haskey-btree ==0.3.0.1
-  - haskoin-core ==0.13.4
-  - haskoin-node ==0.13.0
-  - hasql ==1.4.3
+  - hasql ==1.4.4.2
+  - hasql-notifications ==0.1.0.0
   - hasql-optparse-applicative ==0.3.0.6
   - hasql-pool ==0.5.2
+  - hasql-queue ==1.2.0.2
   - hasql-transaction ==1.0.0.1
   - hasty-hamiltonian ==1.3.3
   - HaTeX ==3.22.3.0
@@ -1021,11 +1033,12 @@ default-package-overrides:
   - hdaemonize ==0.5.6
   - HDBC ==2.4.0.3
   - HDBC-session ==0.1.2.0
-  - headroom ==0.2.2.1
+  - headroom ==0.3.1.0
   - heap ==1.0.4
   - heaps ==0.3.6.1
   - hebrew-time ==0.1.2
   - hedgehog ==1.0.3
+  - hedgehog-classes ==0.2.5.1
   - hedgehog-corpus ==0.2.0
   - hedgehog-fakedata ==0.0.1.3
   - hedgehog-fn ==1.0
@@ -1040,31 +1053,37 @@ default-package-overrides:
   - hexstring ==0.11.1
   - hformat ==0.3.3.1
   - hfsevents ==0.1.6
-  - hidapi ==0.1.5
-  - hie-bios ==0.5.1
+  - hgeometry ==0.11.0.0
+  - hgeometry-combinatorial ==0.11.0.0
+  - hgrev ==0.2.6
   - hi-file-parser ==0.1.0.0
-  - higher-leveldb ==0.5.0.2
+  - hidapi ==0.1.5
+  - hie-bios ==0.7.1
+  - higher-leveldb ==0.6.0.0
   - highlighting-kate ==0.6.4
   - hinfo ==0.0.3.0
-  - hinotify ==0.4
+  - hinotify ==0.4.1
   - hint ==0.9.0.3
   - hjsmin ==0.2.0.4
   - hkd-default ==1.1.0.0
   - hkgr ==0.2.6.1
   - hlibcpuid ==0.2.0
   - hlibgit2 ==0.18.0.16
+  - hlibsass ==0.1.10.1
   - hmatrix ==0.20.0.0
   - hmatrix-gsl ==0.19.0.1
   - hmatrix-gsl-stats ==0.4.1.8
   - hmatrix-morpheus ==0.1.1.2
   - hmatrix-vector-sized ==0.1.3.0
+  - hmm-lapack ==0.4
   - hmpfr ==0.4.4
+  - hnix-store-core ==0.2.0.0
   - hnock ==0.4.0
-  - hoauth2 ==1.14.0
-  - hOpenPGP ==2.9.4
-  - hopenpgp-tools ==0.23.1
+  - hoauth2 ==1.16.0
+  - hOpenPGP ==2.9.5
+  - hopenpgp-tools ==0.23.3
   - hopfli ==0.2.2.1
-  - hosc ==0.17
+  - hosc ==0.18.1
   - hostname ==1.0
   - hostname-validate ==1.0.0
   - hourglass ==0.2.12
@@ -1074,28 +1093,29 @@ default-package-overrides:
   - hpack-dhall ==0.5.2
   - hpc-codecov ==0.2.0.0
   - hpc-lcov ==1.0.1
-  - hreader ==1.1.0
-  - hreader-lens ==0.1.3.0
+  - hprotoc ==2.4.17
   - hruby ==0.3.8
   - hs-bibutils ==6.10.0.0
+  - hs-functors ==0.1.7.1
+  - hs-GeoIP ==0.3
+  - hs-php-session ==0.0.9.3
+  - hsass ==0.8.0
   - hsc2hs ==0.68.7
   - hscolour ==1.24.4
   - hsdns ==1.8
   - hsebaysdk ==0.4.1.0
-  - hsemail ==2.2.0
-  - hset ==2.2.0
-  - hs-functors ==0.1.7.1
-  - hs-GeoIP ==0.3
+  - hsemail ==2.2.1
   - hsini ==0.5.1.2
   - hsinstall ==2.6
   - HSlippyMap ==3.0.1
   - hslogger ==1.3.1.0
-  - hslua ==1.0.3.2
+  - hslua ==1.2.0
   - hslua-aeson ==1.0.3.1
-  - hslua-module-doclayout ==0.1.0
+  - hslua-module-doclayout ==0.2.0.1
   - hslua-module-system ==0.2.2.1
-  - hslua-module-text ==0.2.1
-  - HsOpenSSL ==0.11.4.20
+  - hslua-module-text ==0.3.0.1
+  - HsOpenSSL ==0.11.5.1
+  - HsOpenSSL-x509-system ==0.1.0.4
   - hsp ==0.10.0
   - hspec ==2.7.4
   - hspec-attoparsec ==0.1.0.2
@@ -1110,15 +1130,13 @@ default-package-overrides:
   - hspec-golden-aeson ==0.7.0.0
   - hspec-hedgehog ==0.0.1.2
   - hspec-leancheck ==0.0.4
-  - hspec-megaparsec ==2.1.0
+  - hspec-megaparsec ==2.2.0
   - hspec-meta ==2.6.0
-  - hspec-need-env ==0.1.0.5
   - hspec-parsec ==0
   - hspec-smallcheck ==0.5.2
   - hspec-tables ==0.0.1
   - hspec-wai ==0.10.1
   - hspec-wai-json ==0.10.1
-  - hs-php-session ==0.0.9.3
   - hsshellscript ==3.4.5
   - HStringTemplate ==0.8.7
   - HSvm ==0.1.1.3.22
@@ -1126,17 +1144,15 @@ default-package-overrides:
   - HsYAML-aeson ==0.2.0.0
   - hsyslog ==5.0.2
   - htaglib ==1.2.0
-  - HTF ==0.14.0.3
   - html ==1.0.1.2
   - html-conduit ==1.3.2.1
   - html-entities ==1.1.4.3
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
-  - http2 ==2.0.5
   - HTTP ==4000.3.15
   - http-api-data ==0.4.1.1
   - http-client ==0.6.4.1
-  - http-client-openssl ==0.3.1.0
+  - http-client-openssl ==0.3.2.0
   - http-client-overrides ==0.1.1.0
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.1
@@ -1144,37 +1160,51 @@ default-package-overrides:
   - http-date ==0.0.10
   - http-directory ==0.1.8
   - http-download ==0.2.0.0
-  - httpd-shed ==0.4.1.1
   - http-link-header ==1.0.3.1
   - http-media ==0.8.0.0
+  - http-query ==0.1.0
   - http-reverse-proxy ==0.6.0
   - http-streams ==0.8.7.2
   - http-types ==0.12.3
+  - http2 ==2.0.5
+  - httpd-shed ==0.4.1.1
   - human-readable-duration ==0.2.1.4
-  - HUnit ==1.6.0.0
+  - HUnit ==1.6.1.0
   - HUnit-approx ==1.1.1.1
   - hunit-dejafu ==2.0.0.4
   - hvect ==0.4.0.0
-  - hvega ==0.9.1.0
+  - hvega ==0.11.0.0
   - hw-balancedparens ==0.4.1.1
   - hw-bits ==0.7.2.1
   - hw-conduit ==0.2.1.0
   - hw-conduit-merges ==0.2.1.0
   - hw-diagnostics ==0.0.1.0
-  - hweblib ==0.6.3
+  - hw-dsv ==0.4.1.0
+  - hw-eliasfano ==0.1.2.0
   - hw-excess ==0.2.3.0
   - hw-fingertree ==0.1.2.0
   - hw-fingertree-strict ==0.1.2.0
   - hw-hedgehog ==0.1.1.0
   - hw-hspec-hedgehog ==0.1.1.0
   - hw-int ==0.0.2.0
+  - hw-ip ==2.4.2.0
+  - hw-json ==1.3.2.2
   - hw-json-simd ==0.1.1.0
+  - hw-json-simple-cursor ==0.1.1.0
+  - hw-json-standard-cursor ==0.2.3.1
+  - hw-kafka-client ==3.1.2
   - hw-mquery ==0.2.1.0
+  - hw-packed-vector ==0.2.1.0
   - hw-parser ==0.1.1.0
   - hw-prim ==0.6.3.0
+  - hw-rankselect ==0.13.4.0
   - hw-rankselect-base ==0.3.4.1
+  - hw-simd ==0.1.2.0
   - hw-streams ==0.0.1.0
   - hw-string-parse ==0.0.0.4
+  - hw-succinct ==0.1.0.1
+  - hw-xml ==0.5.1.0
+  - hweblib ==0.6.3
   - hxt ==9.3.1.18
   - hxt-charproperties ==9.4.0.0
   - hxt-css ==0.1.0.3
@@ -1185,9 +1215,9 @@ default-package-overrides:
   - hxt-tagsoup ==9.1.4
   - hxt-unicode ==9.0.2.4
   - hybrid-vectors ==0.2.2
+  - hyper ==0.1.0.3
   - hyperloglog ==0.4.3
   - hyphenation ==0.8
-  - hyraxAbif ==0.2.3.21
   - iconv ==0.4.1.3
   - identicon ==0.2.2
   - ieee754 ==0.8.0
@@ -1201,7 +1231,7 @@ default-package-overrides:
   - immortal ==0.3
   - immortal-queue ==0.1.0.1
   - include-file ==0.1.0.4
-  - incremental-parser ==0.4.0.2
+  - incremental-parser ==0.5
   - indents ==0.5.0.1
   - indexed ==0.1.3
   - indexed-containers ==0.1.0.2
@@ -1209,29 +1239,29 @@ default-package-overrides:
   - indexed-profunctors ==0.1
   - infer-license ==0.2.0
   - inflections ==0.4.0.6
-  - influxdb ==1.7.1.6
+  - influxdb ==1.9.0
   - ini ==0.4.1
   - inj ==1.0
   - inline-c ==0.9.1.3
   - inline-c-cpp ==0.4.0.2
   - inliterate ==0.1.0
+  - input-parsers ==0.1.0.1
   - insert-ordered-containers ==0.2.3.1
   - inspection-testing ==0.4.2.4
   - instance-control ==0.1.2.0
-  - int-cast ==0.2.0.0
-  - integer-logarithms ==1.0.3
+  - integer-logarithms ==1.0.3.1
   - integer-roots ==1.0
   - integration ==0.2.1
   - intern ==0.9.3
   - interpolate ==0.2.1
   - interpolatedstring-perl6 ==1.0.2
   - interpolation ==0.1.1.1
-  - interpolator ==1.0.0
+  - interpolator ==1.1.0.2
   - IntervalMap ==0.6.1.2
   - intervals ==0.9.1
-  - intro ==0.7.0.0
+  - intro ==0.9.0.0
   - intset-imperative ==0.1.0.0
-  - invariant ==0.5.3
+  - invariant ==0.5.4
   - invertible ==0.2.0.7
   - invertible-grammar ==0.1.3
   - io-machine ==0.2.0.0
@@ -1250,27 +1280,29 @@ default-package-overrides:
   - irc-client ==1.1.2.0
   - irc-conduit ==0.3.0.4
   - irc-ctcp ==0.1.3.0
-  - isbn ==1.0.0.0
+  - isbn ==1.1.0.1
   - islink ==0.1.0.0
   - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
   - iso8601-time ==0.1.5
-  - iterable ==3.0
   - it-has ==0.2.0.0
-  - ixset-typed ==0.5
+  - iterable ==3.0
   - ix-shapable ==0.1.0
+  - ixset-typed ==0.5
+  - ixset-typed-binary-instance ==0.1.0.2
+  - ixset-typed-conversions ==0.1.2.0
+  - ixset-typed-hashable-instance ==0.1.0.2
   - jack ==0.7.1.4
-  - jira-wiki-markup ==1.1.4
-  - jose ==0.8.3.1
+  - jira-wiki-markup ==1.3.2
+  - jose ==0.8.4
   - jose-jwt ==0.8.0
   - js-dgtable ==0.5.2
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
-  - json-alt ==1.0.0
   - json-feed ==1.0.11
-  - jsonpath ==0.2.0.0
   - json-rpc ==1.0.3
   - json-rpc-generic ==0.2.1.5
+  - jsonpath ==0.2.0.0
   - JuicyPixels ==3.3.5
   - JuicyPixels-blurhash ==0.1.0.3
   - JuicyPixels-extra ==0.4.1
@@ -1295,7 +1327,6 @@ default-package-overrides:
   - kubernetes-webhook-haskell ==0.2.0.3
   - l10n ==0.1.0.1
   - labels ==0.3.3
-  - lackey ==1.0.13
   - LambdaHack ==0.9.5.0
   - lame ==0.2.0
   - language-avro ==0.1.3.1
@@ -1303,11 +1334,11 @@ default-package-overrides:
   - language-c ==0.8.3
   - language-c-quote ==0.12.2.1
   - language-docker ==9.1.2
-  - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.7.1.0
   - language-protobuf ==1.0.1
-  - language-puppet ==1.4.6.5
+  - language-python ==0.5.8
+  - lapack ==0.3.2
   - lapack-carray ==0.0.3
   - lapack-comfort-array ==0.0.0.1
   - lapack-ffi ==0.0.2
@@ -1323,50 +1354,57 @@ default-package-overrides:
   - leancheck-instances ==0.0.4
   - leapseconds-announced ==2017.1.0.1
   - learn-physics ==0.6.5
-  - lens ==4.18.1
+  - lens ==4.19.2
   - lens-action ==0.2.4
   - lens-aeson ==1.1
+  - lens-csv ==0.1.1.0
   - lens-datetime ==0.3
   - lens-family ==2.0.0
   - lens-family-core ==2.0.0
   - lens-family-th ==0.5.1.0
   - lens-misc ==0.0.2.0
+  - lens-process ==0.3.0.2
   - lens-properties ==4.11.1
   - lens-regex ==0.1.1
+  - lens-regex-pcre ==1.1.0.0
   - lenz ==0.4.2.0
   - leveldb-haskell ==0.6.5
   - libffi ==0.1
   - libgit ==0.3.1
   - libgraph ==1.14
+  - libjwt-typed ==0.2
   - libmpd ==0.9.2.0
+  - liboath-hs ==0.0.1.2
   - libyaml ==0.1.2
   - LibZip ==1.0.1
   - life-sync ==1.1.1.0
+  - lift-generics ==0.2
   - lifted-async ==0.10.1.2
   - lifted-base ==0.2.3.12
-  - lift-generics ==0.1.3
   - line ==4.0.1
   - linear ==1.21.3
+  - linear-circuit ==0.1.0.2
   - linenoise ==0.3.2
   - linux-file-extents ==0.2.0.0
   - linux-namespaces ==0.1.3.0
+  - liquid-fixpoint ==0.8.10.2
   - List ==0.6.2
-  - ListLike ==4.7.2
   - list-predicate ==0.1.0.1
-  - listsafe ==0.1.0.1
   - list-singleton ==1.0.0.4
   - list-t ==1.0.4
+  - ListLike ==4.7.2
+  - listsafe ==0.1.0.1
   - ListTree ==0.2.3
-  - little-logger ==0.1.0
-  - little-rio ==0.1.1
+  - little-logger ==0.3.1
+  - little-rio ==0.2.2
   - llvm-hs ==9.0.1
   - llvm-hs-pure ==9.0.0
   - lmdb ==0.2.5
   - load-env ==0.2.1.0
-  - loc ==0.1.3.8
+  - loc ==0.1.3.10
+  - locators ==0.3.0.3
   - loch-th ==0.2.2
   - lockfree-queue ==0.2.3.1
-  - log-base ==0.8.0.1
   - log-domain ==0.13
   - logfloat ==0.13.3.3
   - logging ==3.0.5
@@ -1374,30 +1412,33 @@ default-package-overrides:
   - logging-facade-syslog ==1
   - logict ==0.7.0.3
   - loop ==0.3.0
-  - loopbreaker ==0.1.1.1
   - lrucache ==1.2.0.1
   - lrucaching ==0.3.3
-  - lsp-test ==0.10.3.0
+  - lsp-test ==0.11.0.5
   - lucid ==2.9.12
+  - lucid-cdn ==0.2.2.0
   - lucid-extras ==0.2.2
   - lukko ==0.1.1.2
+  - lz4-frame-conduit ==0.1.0.1
   - lzma ==0.0.0.3
   - lzma-conduit ==1.2.1
   - machines ==0.7.1
   - magic ==1.1
-  - mainland-pretty ==0.7.0.1
+  - magico ==0.0.2.1
   - main-tester ==0.2.0.1
+  - mainland-pretty ==0.7.0.1
   - makefile ==1.1.0.0
   - managed ==1.0.8
+  - MapWith ==0.2.0.0
   - markdown ==0.1.17.4
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
-  - massiv ==0.5.4.0
-  - massiv-io ==0.2.1.0
+  - massiv ==0.5.5.0
+  - massiv-io ==0.4.0.0
   - massiv-test ==0.1.4
-  - mathexpr ==0.3.0.0
   - math-extras ==0.1.1.0
   - math-functions ==0.3.4.1
+  - mathexpr ==0.3.0.0
   - matplotlib ==0.7.5
   - matrices ==0.5.0
   - matrix ==0.3.6.1
@@ -1407,11 +1448,13 @@ default-package-overrides:
   - maximal-cliques ==0.1.1
   - mbox ==0.3.4
   - mbox-utility ==0.0.3.1
+  - mcmc ==0.3.0
   - mcmc-types ==1.0.3
-  - medea ==1.1.2
+  - med-module ==0.1.2.1
+  - medea ==1.2.0
   - median-stream ==0.7.0.0
-  - megaparsec ==8.0.0
-  - megaparsec-tests ==8.0.0
+  - megaparsec ==9.0.1
+  - megaparsec-tests ==9.0.1
   - membrain ==0.0.0.2
   - memory ==0.15.0
   - MemoTrie ==0.6.10
@@ -1438,18 +1481,16 @@ default-package-overrides:
   - mime-mail ==0.5.0
   - mime-mail-ses ==0.4.3
   - mime-types ==0.1.0.9
+  - min-max-pqueue ==0.1.0.2
   - mini-egison ==1.0.0
   - minimal-configuration ==0.1.4
-  - minimorph ==0.2.2.0
-  - minio-hs ==1.5.2
-  - miniutter ==0.5.1.0
-  - min-max-pqueue ==0.1.0.2
+  - minimorph ==0.3.0.0
+  - minio-hs ==1.5.3
+  - miniutter ==0.5.1.1
   - mintty ==0.1.2
-  - miso ==1.6.0.0
   - missing-foreign ==0.1.1
   - MissingH ==1.4.3.0
   - mixed-types-num ==0.4.0.2
-  - mixpanel-client ==0.2.1
   - mltool ==0.2.0.1
   - mmap ==0.5.9
   - mmark ==0.0.7.2
@@ -1460,14 +1501,13 @@ default-package-overrides:
   - mockery ==0.3.5
   - mod ==0.1.2.0
   - model ==0.5
-  - modern-uri ==0.3.2.0
+  - modern-uri ==0.3.3.0
   - modular ==0.1.0.8
-  - monad-bayes ==0.1.1.0
+  - monad-chronicle ==1.0.0.1
   - monad-control ==1.0.2.3
   - monad-control-aligned ==0.0.1.1
   - monad-coroutine ==0.9.0.4
   - monad-extras ==0.6.0
-  - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
   - monad-logger ==0.3.35
   - monad-logger-json ==0.1.0.0
@@ -1476,49 +1516,53 @@ default-package-overrides:
   - monad-memo ==0.5.3
   - monad-metrics ==0.2.1.4
   - monad-par ==0.3.5
-  - monad-parallel ==0.7.2.3
   - monad-par-extras ==0.3.3
+  - monad-parallel ==0.7.2.3
   - monad-peel ==0.2.1.2
   - monad-products ==4.0.1
-  - MonadPrompt ==1.0.0.5
-  - MonadRandom ==0.5.2
   - monad-resumption ==0.1.4.0
   - monad-skeleton ==0.1.5
   - monad-st ==0.2.4.1
-  - monads-tf ==0.1.0.3
   - monad-time ==0.3.1.0
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.1
+  - monadic-arrays ==0.2.2
+  - monadlist ==0.0.2
+  - MonadPrompt ==1.0.0.5
+  - MonadRandom ==0.5.2
+  - monads-tf ==0.1.0.3
   - mongoDB ==2.7.0.0
-  - monoid-extras ==0.5.1
-  - monoid-subclasses ==1.0.1
-  - monoid-transformer ==0.0.4
   - mono-traversable ==1.0.15.1
   - mono-traversable-instances ==0.1.1.0
   - mono-traversable-keys ==0.1.0
+  - monoid-subclasses ==1.0.1
+  - monoid-transformer ==0.0.4
   - more-containers ==0.2.2.0
-  - morpheus-graphql ==0.12.0
-  - morpheus-graphql-core ==0.12.0
+  - morpheus-graphql ==0.16.0
+  - morpheus-graphql-client ==0.16.0
+  - morpheus-graphql-core ==0.16.0
+  - morpheus-graphql-subscriptions ==0.16.0
   - mountpoints ==1.0.2
   - mpi-hs ==0.7.2.0
   - mpi-hs-binary ==0.1.1.0
   - mpi-hs-cereal ==0.1.0.0
   - mtl-compat ==0.2.2
   - mtl-prelude ==2.0.3.1
-  - multiarg ==0.30.0.10
   - multi-containers ==0.1.1
+  - multiarg ==0.30.0.10
   - multimap ==1.2.1
+  - multipart ==0.2.1
   - multiset ==0.3.4.3
   - multistate ==0.8.0.3
-  - murmur3 ==1.0.4
   - murmur-hash ==0.1.0.9
+  - murmur3 ==1.0.4
   - MusicBrainz ==0.4.1
   - mustache ==2.3.1
   - mutable-containers ==0.3.4
   - mwc-probability ==2.3.1
   - mwc-random ==0.14.0.0
   - mx-state-codes ==1.0.0.0
-  - mysql ==0.1.7
+  - mysql ==0.1.7.2
   - mysql-simple ==0.4.5
   - n2o ==0.11.1
   - nagios-check ==0.3.2
@@ -1530,12 +1574,12 @@ default-package-overrides:
   - natural-sort ==0.1.2
   - natural-transformation ==0.4
   - ndjson-conduit ==0.1.0.5
-  - neat-interpolation ==0.3.2.6
+  - neat-interpolation ==0.5.1.2
+  - netcode-io ==0.0.2
   - netlib-carray ==0.1
   - netlib-comfort-array ==0.0.0.1
   - netlib-ffi ==0.1.1
   - netpbm ==1.0.3
-  - netrc ==0.2.0.0
   - nettle ==0.3.0
   - netwire ==5.0.3
   - netwire-input ==0.0.7
@@ -1558,29 +1602,34 @@ default-package-overrides:
   - nicify-lib ==1.0.1
   - NineP ==0.0.2.1
   - nix-paths ==1.0.1
+  - no-value ==1.0.0.0
+  - non-empty ==0.3.2
+  - non-empty-sequence ==0.2.0.4
+  - non-negative ==0.1.2
   - nonce ==1.0.7
   - nondeterminism ==1.4
-  - non-empty ==0.3.2
   - nonempty-containers ==0.3.4.1
-  - nonemptymap ==0.0.6.0
-  - non-empty-sequence ==0.2.0.4
   - nonempty-vector ==0.2.0.2
-  - non-negative ==0.1.2
+  - nonemptymap ==0.0.6.0
   - not-gloss ==0.7.7.0
-  - no-value ==1.0.0.0
   - nowdoc ==0.1.1.0
   - nqe ==0.6.3
+  - nri-env-parser ==0.1.0.2
+  - nri-prelude ==0.2.0.0
   - nsis ==0.3.3
   - numbers ==3000.2.0.2
   - numeric-extras ==0.1
   - numeric-prelude ==0.4.3.2
-  - numhask ==0.4.0
+  - numhask ==0.6.0.2
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.2
   - nuxeo ==0.3.2
+  - nvim-hs ==2.1.0.4
+  - nvim-hs-contrib ==2.0.0.0
+  - nvim-hs-ghcid ==2.0.0.0
+  - o-clock ==1.2.0
   - oauthenticated ==0.2.1.0
   - ObjectName ==1.1.0.1
-  - o-clock ==1.1.0
   - odbc ==0.2.2
   - oeis2 ==1.0.4
   - ofx ==0.4.4.0
@@ -1592,26 +1641,27 @@ default-package-overrides:
   - OneTuple ==0.2.2.1
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
-  - opaleye ==0.6.7006.1
-  - OpenAL ==1.7.0.5
+  - opaleye ==0.7.1.0
   - open-browser ==0.2.1.0
+  - OpenAL ==1.7.0.5
+  - openapi3 ==3.0.0.1
   - openexr-write ==0.1.0.2
   - OpenGL ==3.0.3.0
   - OpenGLRaw ==3.3.4.0
   - openpgp-asciiarmor ==0.1.2
   - opensource ==0.1.1.0
   - openssl-streams ==1.2.3.0
-  - opentelemetry ==0.4.2
-  - opentelemetry-extra ==0.4.2
-  - opentelemetry-lightstep ==0.4.2
-  - opentelemetry-wai ==0.4.2
+  - opentelemetry ==0.6.1
+  - opentelemetry-extra ==0.6.1
+  - opentelemetry-lightstep ==0.6.1
+  - opentelemetry-wai ==0.6.1
   - operational ==0.2.3.5
   - operational-class ==0.3.0.0
-  - optics ==0.2
-  - optics-core ==0.2
-  - optics-extra ==0.2
-  - optics-th ==0.2
-  - optics-vl ==0.2
+  - optics ==0.3
+  - optics-core ==0.3.0.1
+  - optics-extra ==0.3
+  - optics-th ==0.3.0.2
+  - optics-vl ==0.2.1
   - optional-args ==1.0.2
   - options ==1.2.1.1
   - optparse-applicative ==0.15.1.0
@@ -1619,23 +1669,18 @@ default-package-overrides:
   - optparse-simple ==0.1.1.3
   - optparse-text ==0.1.1.0
   - ordered-containers ==0.2.2
-  - ormolu ==0.1.3.0
+  - ormolu ==0.1.3.1
   - overhang ==1.0.0
   - packcheck ==0.5.1
+  - packdeps ==0.6.0.0
   - pager ==0.1.1.0
   - pagination ==0.2.1
   - pagure-cli ==0.2
-  - pandoc ==2.9.2.1
-  - pandoc-citeproc ==0.17.0.1
-  - pandoc-csv2table ==1.0.8
-  - pandoc-plot ==0.6.1.0
-  - pandoc-pyplot ==2.3.0.1
-  - pandoc-types ==1.20
-  - pantry ==0.4.0.2
-  - papillon ==0.1.1.1
+  - pandoc-types ==1.22
+  - pantry ==0.5.1.3
   - parallel ==3.2.2.0
   - parallel-io ==0.3.3
-  - paripari ==0.6.0.1
+  - paripari ==0.7.0.0
   - parseargs ==0.2.0.9
   - parsec-class ==1.0.0.0
   - parsec-numbers ==0.1.0
@@ -1650,13 +1695,17 @@ default-package-overrides:
   - password ==2.0.1.1
   - password-instances ==2.0.0.1
   - path ==0.7.0
+  - path-binary-instance ==0.1.0.1
+  - path-extensions ==0.1.1.0
   - path-extra ==0.2.0
   - path-io ==1.6.2
+  - path-like ==0.2.0.2
   - path-pieces ==0.2.1
   - path-text-utf8 ==0.0.1.6
   - pathtype ==0.8.1.1
   - pathwalk ==0.3.1.2
   - pattern-arrows ==0.0.2
+  - pava ==0.1.0.0
   - pcg-random ==0.1.3.6
   - pcre-heavy ==1.0.0.2
   - pcre-light ==0.4.1.0
@@ -1670,18 +1719,18 @@ default-package-overrides:
   - persist ==0.1.1.5
   - persistable-record ==0.6.0.5
   - persistable-types-HDBC-pg ==0.0.3.5
-  - persistent ==2.10.5.2
+  - persistent ==2.10.5.3
+  - persistent-documentation ==0.1.0.2
   - persistent-mysql ==2.10.2.3
   - persistent-pagination ==0.1.1.1
   - persistent-postgresql ==2.10.1.2
   - persistent-qq ==2.9.2
   - persistent-sqlite ==2.10.6.2
   - persistent-template ==2.8.2.3
-  - persistent-test ==2.0.3.1
   - persistent-typed-db ==0.1.0.1
   - pg-harness-client ==0.6.0
-  - pgp-wordlist ==0.1.0.3
   - pg-transact ==0.3.1.1
+  - pgp-wordlist ==0.1.0.3
   - phantom-state ==0.2.1.2
   - pid1 ==0.1.2.0
   - pipes ==4.3.14
@@ -1703,71 +1752,71 @@ default-package-overrides:
   - pipes-safe ==2.3.2
   - pipes-wai ==3.2.0
   - pkcs10 ==0.2.0.0
+  - pkgtreediff ==0.4
   - placeholders ==0.1
   - plaid ==0.1.0.4
-  - planb-token-introspection ==0.1.4.0
   - plotlyhs ==0.2.1
   - pointed ==5.0.2
   - pointedlist ==0.6.1
   - pointless-fun ==1.1.0.6
   - poll ==0.0.0.1
-  - poly ==0.4.0.0
+  - poly ==0.5.0.0
   - poly-arity ==0.1.0
   - polynomials-bernstein ==1.1.2
   - polyparse ==1.13
-  - polysemy ==1.3.0.0
   - pooled-io ==0.0.2.2
   - port-utils ==0.2.1.0
   - posix-paths ==0.2.1.6
   - possibly ==1.0.0.0
+  - post-mess-age ==0.2.1.0
   - postgres-options ==0.2.0.0
-  - postgresql-binary ==0.12.2
-  - postgresql-libpq ==0.9.4.2
+  - postgresql-binary ==0.12.3.1
+  - postgresql-libpq ==0.9.4.3
+  - postgresql-libpq-notify ==0.2.0.0
   - postgresql-orm ==0.5.1
   - postgresql-simple ==0.6.2
-  - postgrest ==7.0.0
-  - post-mess-age ==0.2.1.0
+  - postgresql-typed ==0.6.1.2
+  - postgrest ==7.0.1
   - pptable ==0.3.0.0
   - pqueue ==1.4.1.3
+  - prairie ==0.0.1.0
   - prefix-units ==0.2.0
   - prelude-compat ==0.0.0.2
   - prelude-safeenum ==0.1.1.2
-  - prettyclass ==1.0.0.0
   - pretty-class ==1.0.1.1
+  - pretty-diff ==0.2.0.3
   - pretty-hex ==1.1
+  - pretty-relative-time ==0.2.0.0
+  - pretty-show ==1.10
+  - pretty-simple ==3.3.0.0
+  - pretty-sop ==0.2.0.3
+  - pretty-terminal ==0.1.0.0
+  - prettyclass ==1.0.0.0
   - prettyprinter ==1.6.2
   - prettyprinter-ansi-terminal ==1.1.2
   - prettyprinter-compat-annotated-wl-pprint ==1
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
   - prettyprinter-compat-wl-pprint ==1.0.0.1
   - prettyprinter-convert-ansi-wl-pprint ==1.1.1
-  - pretty-relative-time ==0.2.0.0
-  - pretty-show ==1.10
-  - pretty-simple ==3.2.3.0
-  - pretty-sop ==0.2.0.3
-  - pretty-terminal ==0.1.0.0
-  - pretty-types ==0.3.0.1
   - primes ==0.2.1.0
-  - primitive ==0.7.0.1
+  - primitive ==0.7.1.0
   - primitive-addr ==0.1.0.2
   - primitive-unaligned ==0.1.1.1
   - print-console-colors ==0.1.0.0
+  - probability ==0.2.7
   - process-extras ==0.7.4
   - product-isomorphic ==0.0.3.3
-  - product-profunctors ==0.10.0.1
+  - product-profunctors ==0.11.0.1
   - profiterole ==0.1
   - profunctors ==5.5.2
-  - projectroot ==0.2.0.1
   - project-template ==0.2.1.0
+  - projectroot ==0.2.0.1
+  - prometheus ==2.2.2
   - prometheus-client ==1.0.1
+  - prometheus-wai-middleware ==1.0.1.0
   - promises ==0.3
   - prompt ==0.1.1.2
   - prospect ==0.1.0.0
-  - proto3-wire ==1.1.0
-  - protobuf ==0.2.1.3
-  - protobuf-simple ==0.1.1.0
-  - protocol-radius ==0.0.1.1
-  - protocol-radius-test ==0.1.0.1
   - proto-lens ==0.7.0.0
   - proto-lens-arbitrary ==0.1.2.9
   - proto-lens-optparse ==0.1.1.7
@@ -1775,7 +1824,14 @@ default-package-overrides:
   - proto-lens-protoc ==0.7.0.0
   - proto-lens-runtime ==0.7.0.0
   - proto-lens-setup ==0.4.0.4
-  - protolude ==0.2.4
+  - proto3-wire ==1.1.0
+  - protobuf ==0.2.1.3
+  - protobuf-simple ==0.1.1.0
+  - protocol-buffers ==2.4.17
+  - protocol-buffers-descriptor ==2.4.17
+  - protocol-radius ==0.0.1.1
+  - protocol-radius-test ==0.1.0.1
+  - protolude ==0.3.0
   - proxied ==0.3.1
   - psqueues ==0.2.7.2
   - publicsuffix ==0.20200526
@@ -1783,8 +1839,8 @@ default-package-overrides:
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.14.0.0
   - pushbullet-types ==0.4.1.0
-  - pusher-http-haskell ==1.5.1.14
-  - pvar ==0.2.0.0
+  - pusher-http-haskell ==2.0.0.2
+  - pvar ==1.0.0.0
   - PyF ==0.9.0.2
   - qchas ==1.1.0.1
   - qm-interpolated-string ==0.3.0.0
@@ -1797,6 +1853,7 @@ default-package-overrides:
   - quickcheck-assertions ==0.3.0
   - quickcheck-classes ==0.6.4.0
   - quickcheck-classes-base ==0.6.1.0
+  - quickcheck-higherorder ==0.1.0.0
   - quickcheck-instances ==0.3.23
   - quickcheck-io ==0.2.0
   - quickcheck-simple ==0.1.1.1
@@ -1805,54 +1862,61 @@ default-package-overrides:
   - quickcheck-transformer ==0.3.1.1
   - quickcheck-unicode ==1.0.1.0
   - quiet ==0.2
-  - radius ==0.6.1.0
+  - radius ==0.7.1.0
   - rainbow ==0.34.2.2
   - rainbox ==0.26.0.0
   - ral ==0.1
+  - rampart ==1.1.0.1
   - ramus ==0.1.2
   - rando ==0.0.0.4
   - random ==1.1
   - random-bytestring ==0.1.3.2
+  - random-fu ==0.2.7.4
   - random-shuffle ==0.0.4
+  - random-source ==0.3.0.8
   - random-tree ==0.6.0.5
   - range ==0.3.0.2
-  - Ranged-sets ==0.4.0
   - range-set-list ==0.1.3.1
+  - Ranged-sets ==0.4.0
   - rank1dynamic ==0.4.1
-  - rank2classes ==1.3.2.1
+  - rank2classes ==1.4.0.1
   - Rasterific ==0.7.5.3
   - rasterific-svg ==0.3.3.2
-  - ratel ==1.0.12
   - rate-limit ==1.4.2
+  - ratel ==1.0.12
   - ratel-wai ==1.1.3
+  - rattle ==0.2
+  - raw-strings-qq ==1.1
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
-  - raw-strings-qq ==1.1
   - rcu ==0.2.4
   - rdf ==0.1.0.4
   - rdtsc ==1.3.0.1
   - re2 ==0.3
-  - readable ==0.3.1
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
-  - reanimate ==0.3.3.0
-  - reanimate-svg ==0.9.8.0
+  - readable ==0.3.1
+  - reanimate ==1.1.2.1
+  - reanimate-svg ==0.13.0.0
   - rebase ==1.6.1
   - record-dot-preprocessor ==0.2.7
   - record-hasfield ==1.0
+  - record-wrangler ==0.1.1.0
   - records-sop ==0.1.0.3
-  - recursion-schemes ==5.1.3
+  - recursion-schemes ==5.2.1
   - reducers ==3.12.3
-  - refact ==0.3.0.2
   - ref-fd ==0.4.0.2
+  - ref-tf ==0.4.0.2
+  - refact ==0.3.0.2
+  - refined ==0.6.1
   - reflection ==2.1.6
   - reform ==0.2.7.4
   - reform-blaze ==0.2.4.3
   - reform-hamlet ==0.0.5.3
-  - reform-happstack ==0.2.5.3
+  - reform-happstack ==0.2.5.4
   - RefSerialize ==0.4.0
   - regex ==1.1.0.0
-  - regex-applicative ==0.3.3.1
+  - regex-applicative ==0.3.4
   - regex-applicative-text ==0.1.0.1
   - regex-base ==0.94.0.0
   - regex-compat ==0.95.2.0
@@ -1862,21 +1926,23 @@ default-package-overrides:
   - regex-posix ==0.96.0.0
   - regex-tdfa ==1.3.1.0
   - regex-with-pcre ==1.1.0.0
-  - registry ==0.1.9.3
+  - registry ==0.2.0.1
   - reinterpret-cast ==0.1.0
   - relapse ==1.0.0.0
   - relational-query ==0.12.2.3
   - relational-query-HDBC ==0.7.2.0
   - relational-record ==0.2.2.0
   - relational-schemas ==0.1.8.0
+  - reliable-io ==0.0.1
   - relude ==0.7.0.0
   - renderable ==0.2.0.1
   - replace-attoparsec ==1.4.2.0
   - replace-megaparsec ==1.4.3.0
-  - repline ==0.2.2.0
-  - req ==3.2.0
+  - repline ==0.4.0.0
+  - req ==3.7.0
   - req-conduit ==1.0.0
   - rerebase ==1.6.1
+  - resistor-cube ==0.0.1.2
   - resolv ==0.1.2.0
   - resource-pool ==0.2.3.2
   - resourcet ==1.2.4.2
@@ -1885,32 +1951,34 @@ default-package-overrides:
   - retry ==0.8.1.2
   - rev-state ==0.1.2
   - rfc1751 ==0.1.3
-  - rfc5051 ==0.1.0.4
-  - rhine ==0.6.0
-  - rhine-gloss ==0.6.0.1
+  - rfc5051 ==0.2
+  - rhine ==0.7.0
+  - rhine-gloss ==0.7.0
   - rigel-viz ==0.2.0.0
   - rio ==0.1.19.0
   - rio-orphans ==0.1.1.0
   - rio-prettyprint ==0.1.1.0
   - roc-id ==0.1.0.0
   - rocksdb-haskell ==1.0.1
-  - rocksdb-query ==0.3.2
+  - rocksdb-haskell-jprupp ==2.1.3
+  - rocksdb-query ==0.4.2
   - roles ==0.2.0.0
   - rope-utf16-splay ==0.3.1.0
   - rosezipper ==0.2
   - rot13 ==0.2.0.1
-  - rpmbuild-order ==0.3.1
+  - rpmbuild-order ==0.4.3.1
   - RSA ==2.4.1
   - runmemo ==1.0.0.1
+  - rvar ==0.2.0.6
   - safe ==0.3.19
-  - safecopy ==0.10.3
   - safe-decimal ==0.2.0.0
   - safe-exceptions ==0.1.7.1
-  - safe-exceptions-checked ==0.1.0
   - safe-foldable ==0.1.0.0
-  - safeio ==0.0.5.0
   - safe-json ==1.1.1
   - safe-money ==0.9
+  - safe-tensor ==0.2.1.0
+  - safecopy ==0.10.3
+  - safeio ==0.0.5.0
   - SafeSemaphore ==0.10.1
   - salak ==0.3.6
   - salak-yaml ==0.3.5.3
@@ -1925,20 +1993,23 @@ default-package-overrides:
   - scalpel-core ==0.6.2
   - scanf ==0.1.0.0
   - scanner ==0.3.1
-  - scheduler ==1.4.2.3
+  - scheduler ==1.5.0
   - scientific ==0.3.6.2
-  - scotty ==0.11.6
+  - scotty ==0.12
   - scrypt ==0.5.0
-  - sdl2 ==2.5.2.0
+  - sdl2 ==2.5.3.0
   - sdl2-gfx ==0.2
   - sdl2-image ==2.0.0
   - sdl2-mixer ==1.1.0
   - sdl2-ttf ==2.1.1
   - search-algorithms ==0.3.1
-  - secp256k1-haskell ==0.2.5
+  - secp256k1-haskell ==0.5.0
   - securemem ==0.1.10
   - selda ==0.5.1.0
   - selda-json ==0.1.1.0
+  - selda-postgresql ==0.1.8.1
+  - selda-sqlite ==0.1.7.1
+  - selections ==0.3.0.0
   - selective ==0.4.1.1
   - semialign ==1.1.0.1
   - semialign-indexed ==1.1
@@ -1946,66 +2017,54 @@ default-package-overrides:
   - semigroupoid-extras ==5
   - semigroupoids ==5.3.4
   - semigroups ==0.19.1
-  - semirings ==0.5.4
   - semiring-simple ==1.0.0.1
-  - semver ==0.3.4
+  - semirings ==0.5.4
+  - semver ==0.4.0.1
   - sendfile ==0.7.11.1
   - seqalign ==0.2.0.4
-  - sequence-formats ==1.4.1
+  - seqid ==0.6.2
+  - seqid-streams ==0.7.2
+  - sequence-formats ==1.5.1.4
   - sequenceTools ==1.4.0.5
   - serf ==0.1.1.0
   - serialise ==0.2.3.0
-  - servant ==0.16.2
-  - servant-auth ==0.3.2.0
-  - servant-auth-server ==0.4.5.1
-  - servant-auth-swagger ==0.2.10.0
-  - servant-blaze ==0.9
-  - servant-cassava ==0.10
-  - servant-checked-exceptions ==2.2.0.0
-  - servant-checked-exceptions-core ==2.2.0.0
-  - servant-client ==0.16.0.1
-  - servant-client-core ==0.16
+  - servant ==0.18.1
+  - servant-blaze ==0.9.1
+  - servant-client ==0.18.1
+  - servant-client-core ==0.18.1
   - servant-conduit ==0.15.1
-  - servant-docs ==0.11.4
-  - servant-docs-simple ==0.2.0.1
-  - servant-elm ==0.7.2
-  - servant-errors ==0.1.6.0
-  - servant-foreign ==0.15
-  - servant-js ==0.9.4.2
-  - servant-JuicyPixels ==0.3.0.5
-  - servant-lucid ==0.9
+  - servant-docs ==0.11.7
+  - servant-foreign ==0.15.2
+  - servant-http-streams ==0.18.1
   - servant-machines ==0.15.1
-  - servant-mock ==0.8.5
+  - servant-multipart ==0.12
+  - servant-openapi3 ==2.0.1.0
   - servant-pipes ==0.15.2
-  - servant-purescript ==0.10.0.0
-  - servant-rawm ==0.3.2.0
-  - servant-server ==0.16.2
-  - servant-static-th ==0.2.4.0
-  - servant-subscriber ==0.7.0.0
-  - servant-swagger ==1.1.7.1
-  - servant-swagger-ui ==0.3.4.3.23.11
+  - servant-rawm ==1.0.0.0
+  - servant-server ==0.18.1
+  - servant-swagger ==1.1.10
+  - servant-swagger-ui ==0.3.4.3.36.1
   - servant-swagger-ui-core ==0.3.3
-  - servant-swagger-ui-redoc ==0.3.3.1.22.3
-  - servant-websockets ==2.0.0
-  - servant-yaml ==0.1.0.1
-  - serverless-haskell ==0.11.3
+  - serverless-haskell ==0.12.4
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
   - ses-html ==0.4.0.0
   - set-cover ==0.1.1
   - setenv ==0.1.1.3
   - setlocale ==1.0.0.9
-  - sexp-grammar ==2.1.0
+  - sexp-grammar ==2.3.0
   - SHA ==1.6.4.4
-  - shake-plus ==0.1.10.0
+  - shake-plus ==0.3.3.1
+  - shake-plus-extended ==0.4.1.0
   - shakespeare ==2.0.25
   - shared-memory ==0.2.0.0
-  - shell-conduit ==4.7.0
+  - shell-conduit ==5.0.0
   - shell-escape ==0.2.0
+  - shell-utility ==0.1
   - shellmet ==0.0.3.1
   - shelltestrunner ==1.9
-  - shell-utility ==0.1
   - shelly ==1.9.0
+  - shikensu ==0.3.11
   - should-not-typecheck ==2.1.0
   - show-combinators ==0.2.0.0
   - siggy-chardust ==1.0.0
@@ -2018,37 +2077,39 @@ default-package-overrides:
   - simple-log ==0.9.12
   - simple-reflect ==0.3.3
   - simple-sendfile ==0.2.30
-  - simplest-sqlite ==0.1.0.2
   - simple-templates ==1.0.0
   - simple-vec3 ==0.6.0.1
   - simplistic-generics ==2.0.0
   - since ==0.0.0
   - singleton-bool ==0.1.5
   - singleton-nats ==0.4.5
-  - singletons ==2.6
+  - singletons ==2.7
   - singletons-presburger ==0.3.0.1
   - siphash ==1.0.3
   - sitemap-gen ==0.1.0.0
-  - size-based ==0.1.2.0
-  - sized ==0.4.0.0
+  - sized ==0.8.0.0
   - skein ==1.0.9.4
   - skews ==0.1.0.3
   - skip-var ==0.1.1.0
-  - skylighting ==0.8.5
-  - skylighting-core ==0.8.5
+  - skylighting ==0.10.0.3
+  - skylighting-core ==0.10.0.3
   - slack-api ==0.12
+  - slack-progressbar ==0.1.0.1
   - slist ==0.1.1.0
-  - smallcheck ==1.1.7
+  - slynx ==0.5.0
+  - smallcheck ==1.2.0
   - smash ==0.1.1.0
   - smash-aeson ==0.1.0.0
   - smash-lens ==0.1.0.1
   - smash-microlens ==0.1.0.0
   - smoothie ==0.4.2.11
+  - smtp-mail ==0.3.0.0
   - snap-blaze ==0.2.1.5
   - snap-core ==1.0.4.2
-  - snap-server ==1.1.1.2
+  - snap-server ==1.1.2.0
   - snowflake ==0.1.1.1
   - soap ==0.2.3.6
+  - soap-openssl ==0.1.0.2
   - soap-tls ==0.1.1.4
   - socks ==0.6.1
   - some ==1.0.1
@@ -2066,21 +2127,22 @@ default-package-overrides:
   - speedy-slice ==0.3.1
   - Spintax ==0.3.5
   - splice ==0.6.1.1
+  - splint ==1.0.1.2
   - split ==0.2.3.4
   - splitmix ==0.0.5
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.8
+  - sql-words ==0.1.6.4
   - sqlcli ==0.2.2.0
   - sqlcli-odbc ==0.2.0.1
-  - sql-words ==0.1.6.4
+  - sqlite-simple ==0.4.18.0
+  - squeal-postgresql ==0.7.0.1
   - squeather ==0.4.0.0
   - srcloc ==0.5.1.2
-  - stache ==2.1.1
-  - stackcollapse-ghc ==0.0.1.2
+  - stache ==2.2.0
   - stack-templatizer ==0.1.0.2
-  - starter ==0.3.0
+  - stackcollapse-ghc ==0.0.1.3
   - stateref ==0.3
-  - statestack ==0.3
   - StateVar ==1.2
   - static-text ==0.2.0.6
   - statistics ==0.15.2.0
@@ -2092,50 +2154,54 @@ default-package-overrides:
   - stm-delay ==0.1.1.1
   - stm-extras ==0.1.0.3
   - stm-split ==0.0.2.1
+  - STMonadTrans ==0.4.4
   - stopwatch ==0.1.0.6
   - storable-complex ==0.2.3.0
+  - storable-endian ==0.2.6
   - storable-record ==0.0.5
   - storable-tuple ==0.0.3.3
   - storablevector ==0.2.13.1
-  - stratosphere ==0.53.0
+  - store ==0.7.7
+  - store-core ==0.4.4.3
+  - store-streaming ==0.2.0.3
+  - stratosphere ==0.59.1
   - streaming ==0.2.3.0
-  - streaming-bytestring ==0.1.7
+  - streaming-attoparsec ==1.0.0.1
+  - streaming-bytestring ==0.2.0
   - streaming-commons ==0.2.2.1
-  - streamly ==0.7.2
-  - streamly-bytestring ==0.1.2
   - streams ==3.3
-  - strict ==0.3.2
-  - strict-base-types ==0.6.1
+  - strict ==0.4
   - strict-concurrency ==0.2.4.3
   - strict-list ==0.1.5
   - strict-tuple ==0.1.3
   - strict-tuple-lens ==0.1.0.1
-  - stringbuilder ==0.5.1
   - string-class ==0.1.7.0
   - string-combinators ==0.6.0.5
   - string-conv ==0.1.2
   - string-conversions ==0.4.0.1
-  - string-interpolate ==0.2.1.0
+  - string-interpolate ==0.3.0.2
   - string-qq ==0.0.4
-  - stringsearch ==0.3.6.6
+  - string-random ==0.1.3.0
   - string-transform ==1.1.1
+  - stringbuilder ==0.5.1
+  - stringsearch ==0.3.6.6
   - stripe-concepts ==1.0.2.4
-  - stripe-signature ==1.0.0.6
+  - stripe-core ==2.6.2
+  - stripe-haskell ==2.6.2
+  - stripe-http-client ==2.6.2
+  - stripe-tests ==2.6.2
   - strive ==5.0.12
-  - structs ==0.1.3
+  - structs ==0.1.4
   - structured ==0.1
-  - structured-cli ==2.5.2.0
-  - stylish-haskell ==0.11.0.3
-  - summoner ==2.0.1.1
-  - summoner-tui ==2.0.1.1
+  - structured-cli ==2.6.0.0
+  - subcategories ==0.1.0.0
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
   - superbuffer ==0.3.1.1
-  - svg-builder ==0.1.1
-  - SVGFonts ==1.7.0.1
   - svg-tree ==0.6.2.4
   - swagger ==0.3.0
-  - swagger2 ==2.5
+  - swagger2 ==2.6
+  - sweet-egison ==0.1.1.3
   - swish ==0.10.0.4
   - syb ==0.7.1
   - symbol ==0.2.4
@@ -2143,12 +2209,11 @@ default-package-overrides:
   - symmetry-operations-symbols ==0.0.2.1
   - sysinfo ==0.1.1
   - system-argv0 ==0.1.1
-  - systemd ==2.3.0
   - system-fileio ==0.3.16.4
   - system-filepath ==0.4.14
   - system-info ==0.5.1
+  - systemd ==2.3.0
   - tabular ==0.2.2.8
-  - taffybar ==3.2.2
   - tagchup ==0.4.1.1
   - tagged ==0.8.6
   - tagged-binary ==0.2.0.1
@@ -2175,9 +2240,10 @@ default-package-overrides:
   - tasty-lua ==0.2.3.1
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.10.1.1
-  - tasty-rerun ==1.1.17
+  - tasty-rerun ==1.1.18
   - tasty-silver ==3.1.15
   - tasty-smallcheck ==0.8.1
+  - tasty-test-reporter ==0.1.1.4
   - tasty-th ==0.1.7
   - tasty-wai ==0.1.1.1
   - Taxonomy ==2.1.0
@@ -2190,6 +2256,7 @@ default-package-overrides:
   - temporary-resourcet ==0.1.0.1
   - tensorflow-test ==0.1.0.0
   - tensors ==0.1.4
+  - termbox ==0.3.0
   - terminal-progress-bar ==0.4.1
   - terminal-size ==0.3.2.1
   - test-framework ==0.8.2.0
@@ -2197,82 +2264,89 @@ default-package-overrides:
   - test-framework-leancheck ==0.0.1
   - test-framework-quickcheck2 ==0.3.0.5
   - test-framework-smallcheck ==0.2
-  - test-framework-th ==0.2.4
-  - testing-feat ==1.1.0.0
+  - test-fun ==0.1.0.0
   - testing-type-modifiers ==0.1.0.1
   - texmath ==0.12.0.3
+  - text-ansi ==0.1.0.1
   - text-binary ==0.2.1.1
   - text-builder ==0.6.6.1
   - text-conversions ==0.3.1
+  - text-format ==0.3.2
   - text-icu ==0.7.0.1
   - text-latin1 ==0.3.1
   - text-ldap ==0.1.1.13
-  - textlocal ==0.1.0.5
   - text-manipulate ==0.2.0.1
   - text-metrics ==0.3.0
   - text-postgresql ==0.0.3.1
   - text-printer ==0.5.0.1
+  - text-regex-replace ==0.1.1.3
   - text-region ==0.3.1.0
   - text-short ==0.1.3
   - text-show ==3.8.5
   - text-show-instances ==3.8.4
   - text-zipper ==0.10.1
-  - tfp ==1.0.1.1
+  - textlocal ==0.1.0.5
   - tf-random ==0.5
-  - th-abstraction ==0.3.2.0
+  - tfp ==1.0.1.1
+  - th-abstraction ==0.4.0.0
   - th-bang-compat ==0.0.1.0
+  - th-compat ==0.1
   - th-constraint-compat ==0.0.1.0
   - th-data-compat ==0.1.0.0
-  - th-desugar ==1.10
+  - th-desugar ==1.11
   - th-env ==0.1.0.2
-  - these ==1.1.1.1
-  - these-lens ==1.0.1.1
-  - these-optics ==1.0.1.1
   - th-expand-syns ==0.4.6.0
   - th-extras ==0.0.0.4
   - th-lift ==0.8.2
   - th-lift-instances ==0.1.17
   - th-nowq ==0.1.0.5
-  - th-orphans ==0.13.10
+  - th-orphans ==0.13.11
   - th-printf ==0.7
-  - thread-hierarchy ==0.3.0.2
-  - thread-local-storage ==0.2
-  - threads ==0.5.1.6
-  - thread-supervisor ==0.1.0.1
-  - threepenny-gui ==0.9.0.0
   - th-reify-compat ==0.0.1.5
   - th-reify-many ==0.1.9
+  - th-strict-compat ==0.1.0.1
+  - th-test-utils ==1.1.0
+  - th-utilities ==0.2.4.0
+  - these ==1.1.1.1
+  - these-lens ==1.0.1.1
+  - these-optics ==1.0.1.1
+  - these-skinny ==0.7.4
+  - thread-hierarchy ==0.3.0.2
+  - thread-local-storage ==0.2
+  - thread-supervisor ==0.2.0.0
+  - threads ==0.5.1.6
+  - threepenny-gui ==0.9.0.0
   - throttle-io-stream ==0.2.0.1
   - through-text ==0.1.0.0
   - throwable-exceptions ==0.1.0.9
-  - th-strict-compat ==0.1.0.1
-  - th-test-utils ==1.0.2
   - thyme ==0.3.5.5
-  - tidal ==1.5.2
+  - tidal ==1.6.1
   - tile ==0.3.0.0
-  - time-compat ==1.9.3
-  - timeit ==2.0
-  - timelens ==0.2.0.2
+  - time-compat ==1.9.4
   - time-lens ==0.4.0.2
   - time-locale-compat ==0.1.1.5
   - time-locale-vietnamese ==1.0.0.0
   - time-manager ==0.0.0
   - time-parsers ==0.1.2.1
-  - timerep ==2.0.0.2
   - time-units ==1.0.0
+  - timeit ==2.0
+  - timelens ==0.2.0.2
+  - timer-wheel ==0.3.0
+  - timerep ==2.0.0.2
   - timezone-olson ==0.2.0
   - timezone-series ==0.1.9
   - tinylog ==0.15.0
   - titlecase ==1.0.1
-  - tldr ==0.6.4
+  - tldr ==0.9.0
   - tls ==1.5.4
   - tls-debug ==0.4.8
   - tls-session-manager ==0.0.4
+  - tlynx ==0.5.0
   - tmapchan ==0.0.3
   - tmapmvar ==0.0.4
   - tmp-postgres ==1.34.1.0
   - tomland ==1.3.1.0
-  - tonalude ==0.1.1.0
+  - tonalude ==0.1.1.1
   - topograph ==1.0.0.1
   - torsor ==0.1
   - tostring ==0.2.1.1
@@ -2287,43 +2361,41 @@ default-package-overrides:
   - tree-fun ==0.8.1.0
   - trifecta ==2.1
   - triplesec ==0.2.2.1
-  - trivial-constraint ==0.6.0.0
   - tsv2csv ==0.1.0.2
-  - ttc ==0.2.3.0
+  - ttc ==0.3.0.0
   - ttl-hashtables ==1.4.1.0
   - ttrie ==0.1.2.1
   - tuple ==0.3.0.2
-  - tuples-homogenous-h98 ==0.1.1.0
   - tuple-sop ==0.3.1.0
   - tuple-th ==0.2.5
+  - tuples-homogenous-h98 ==0.1.1.0
   - turtle ==1.5.20
-  - TypeCompose ==0.9.14
-  - typed-process ==0.2.6.0
-  - typed-uuid ==0.0.0.2
   - type-equality ==1
   - type-errors ==0.2.0.0
   - type-errors-pretty ==0.0.1.1
-  - type-fun ==0.1.2
   - type-hint ==0.1
   - type-level-integers ==0.0.1
   - type-level-kv-list ==1.1.0
+  - type-level-natural-number ==2.0
   - type-level-numbers ==0.1.1.1
   - type-map ==0.1.6.0
-  - type-natural ==0.8.3.1
-  - typenums ==0.1.2.1
-  - type-of-html ==1.5.2.0
-  - type-of-html-static ==0.1.0.2
+  - type-natural ==0.9.0.0
+  - type-of-html ==1.6.1.2
   - type-operators ==0.2.0.0
-  - typerep-map ==0.3.3.0
   - type-spec ==0.4.0.0
-  - tzdata ==0.1.20190911.0
+  - TypeCompose ==0.9.14
+  - typed-process ==0.2.6.0
+  - typed-uuid ==0.0.0.2
+  - typerep-map ==0.3.3.0
+  - tzdata ==0.2.20201021.0
   - ua-parser ==0.7.5.1
   - uglymemo ==0.1.0.1
   - ulid ==0.3.0.0
   - unagi-chan ==0.4.1.3
   - unbounded-delays ==0.1.1.0
   - unboxed-ref ==0.4.0.0
-  - unboxing-vector ==0.1.1.0
+  - unboxing-vector ==0.2.0.0
+  - uncaught-exception ==0.1.0
   - uncertain ==0.3.1.0
   - unconstrained ==0.1.0.2
   - unexceptionalio ==0.5.1
@@ -2333,7 +2405,8 @@ default-package-overrides:
   - unicode-transforms ==0.3.7.1
   - unification-fd ==0.10.0.1
   - union-find ==0.2
-  - uniplate ==1.6.12
+  - unipatterns ==0.0.0.0
+  - uniplate ==1.6.13
   - uniprot-kb ==0.1.2.0
   - uniq-deep ==1.2.0
   - unique ==0
@@ -2347,16 +2420,15 @@ default-package-overrides:
   - universe-instances-trans ==1.1
   - universe-reverse-instances ==1.1
   - universe-some ==1.2
-  - universum ==1.6.1
+  - universum ==1.7.1
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.2
   - unix-time ==0.4.7
-  - unliftio ==0.2.13
-  - unliftio-core ==0.1.2.0
+  - unliftio ==0.2.13.1
+  - unliftio-core ==0.2.0.1
   - unliftio-pool ==0.2.1.1
   - unlit ==0.4.0.0
-  - unordered-containers ==0.2.10.0
-  - unordered-intmap ==0.1.1
+  - unordered-containers ==0.2.13.0
   - unsafe ==0.0
   - urbit-hob ==0.3.3
   - uri-bytestring ==0.3.2.2
@@ -2381,7 +2453,7 @@ default-package-overrides:
   - validity-primitive ==0.0.0.1
   - validity-scientific ==0.2.0.3
   - validity-text ==0.3.1.1
-  - validity-time ==0.3.0.0
+  - validity-time ==0.4.0.0
   - validity-unordered-containers ==0.2.0.3
   - validity-uuid ==0.1.0.3
   - validity-vector ==0.2.0.3
@@ -2402,61 +2474,65 @@ default-package-overrides:
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.7
   - verbosity ==0.4.0.0
-  - versions ==3.5.4
+  - versions ==4.0.1
   - vformat ==0.14.1.0
   - vformat-aeson ==0.1.0.1
   - vformat-time ==0.1.0.0
   - ViennaRNAParser ==1.3.3
+  - vinyl ==0.13.0
   - void ==0.7.3
-  - vty ==5.28.2
+  - vty ==5.32
   - wai ==3.2.2.1
   - wai-app-static ==3.1.7.2
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.7
   - wai-enforce-https ==0.0.2.1
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.32
+  - wai-extra ==3.1.2
+  - wai-feature-flags ==0.1.0.1
   - wai-handler-launch ==3.0.3.1
   - wai-logger ==2.3.6
+  - wai-middleware-auth ==0.2.3.1
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-clacks ==0.1.0.1
-  - wai-middleware-static ==0.8.3
+  - wai-middleware-static ==0.9.0
+  - wai-saml2 ==0.2.1.2
   - wai-session ==0.3.3
   - wai-slack-middleware ==0.2.0
   - wai-websockets ==3.0.1.2
+  - wakame ==0.1.0.0
   - warp ==3.3.13
-  - warp-tls ==3.2.12
+  - warp-tls ==3.3.0
   - warp-tls-uid ==0.2.0.6
   - wave ==0.2.0
   - wcwidth ==0.0.2
+  - webby ==1.0.1
   - webdriver ==0.9.0.1
   - webex-teams-api ==0.2.0.1
   - webex-teams-conduit ==0.2.0.1
   - webex-teams-pipes ==0.2.0.1
+  - webgear-server ==0.2.0
   - webrtc-vad ==0.1.0.3
   - websockets ==0.12.7.1
   - websockets-snap ==0.10.3.1
   - weigh ==0.0.16
   - wide-word ==0.1.1.1
   - wikicfp-scraper ==0.1.0.11
-  - wild-bind ==0.1.2.6
-  - wild-bind-x11 ==0.2.0.10
   - Win32 ==2.6.1.0
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
-  - witherable-class ==0
-  - within ==0.1.1.0
   - with-location ==0.1.0
   - with-utf8 ==1.0.2.1
-  - witness ==0.4
+  - witherable-class ==0
+  - within ==0.2.0.1
   - wizards ==1.0.3
   - wl-pprint-annotated ==0.1.0.1
   - wl-pprint-console ==0.1.0.2
   - wl-pprint-text ==1.2.0.1
-  - word24 ==2.0.1
-  - word8 ==0.1.3
   - word-trie ==0.3.0
   - word-wrap ==0.4.1
+  - word24 ==2.0.1
+  - word8 ==0.1.3
   - world-peace ==1.0.2.0
   - wrap ==0.0.0
   - wreq ==0.5.3.2
@@ -2484,61 +2560,60 @@ default-package-overrides:
   - xml-basic ==0.1.3.1
   - xml-conduit ==1.9.0.0
   - xml-conduit-writer ==0.1.1.2
-  - xmlgen ==0.6.2.2
   - xml-hamlet ==0.5.0.1
   - xml-helpers ==1.0.0
-  - xml-html-qq ==0.1.0.1
   - xml-indexed-cursor ==0.1.1.0
   - xml-lens ==0.2
   - xml-picklers ==0.3.6
   - xml-to-json ==2.0.1
   - xml-to-json-fast ==2.0.0
   - xml-types ==0.3.8
+  - xmlgen ==0.6.2.2
   - xmonad ==0.15
   - xmonad-contrib ==0.16
   - xmonad-extras ==0.15.2
   - xss-sanitize ==0.3.6
-  - xturtle ==0.2.0.0
   - xxhash-ffi ==0.2.0.0
   - yaml ==0.11.5.0
   - yamlparse-applicative ==0.1.0.2
+  - yes-precure5-command ==5.5.3
   - yesod ==1.6.1.0
-  - yesod-auth ==1.6.10
-  - yesod-auth-fb ==1.10.1
-  - yesod-auth-hashdb ==1.7.1.2
+  - yesod-auth ==1.6.10.1
+  - yesod-auth-hashdb ==1.7.1.5
   - yesod-bin ==1.6.0.6
-  - yesod-core ==1.6.18.5
+  - yesod-core ==1.6.18.6
   - yesod-fb ==0.6.1
   - yesod-form ==1.6.7
-  - yesod-form-bootstrap4 ==3.0.0
   - yesod-gitrev ==0.2.1
   - yesod-newsfeed ==1.7.0.0
-  - yesod-persistent ==1.6.0.4
-  - yesod-recaptcha2 ==1.0.1
+  - yesod-persistent ==1.6.0.5
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.1.0
   - yesod-test ==1.6.10
   - yesod-websockets ==0.3.0.2
-  - yes-precure5-command ==5.5.3
   - yi-rope ==0.11
   - yjsvg ==0.2.0.1
   - yjtools ==0.9.18
   - yoga ==0.0.0.5
   - youtube ==0.2.1.1
-  - zasni-gerna ==0.0.7.1
+  - zenacy-html ==2.0.2
+  - zenacy-unicode ==1.0.0
   - zero ==0.1.5
   - zeromq4-haskell ==0.8.0
   - zeromq4-patterns ==0.3.1.0
   - zim-parser ==0.2.1.0
-  - zip ==1.5.0
+  - zio ==0.1.0.0
+  - zip ==1.6.0
   - zip-archive ==0.4.1
-  - zippers ==0.3
   - zip-stream ==0.2.0.1
+  - zipper-extra ==0.1.3.2
+  - zippers ==0.3
   - zlib ==0.6.2.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1
   - zot ==0.0.3
   - zstd ==0.1.2.0
+  - ztail ==1.2.0.2
 
 extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 7.6.x or earlier

From d8bf3503205c2e57300591b6e672be749ef084f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Nov 2020 22:01:48 +0100
Subject: [PATCH 3080/3942] haskellPackages: switch default package set to
 ghc-8.10.2

---
 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 45bff7bd1890..175211409d8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9229,7 +9229,7 @@ in
 
   # Please update doc/languages-frameworks/haskell.section.md, “Our
   # current default compiler is”, if you bump this:
-  haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc884;
+  haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8102;
 
   inherit (haskellPackages) ghc;
 

From 8a5501d14d859b41b3c82f590bfb13f735d39622 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Nov 2020 21:51:37 +0100
Subject: [PATCH 3081/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-28-gd194902 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/cb01aa6d8923bf74fadca03373572c16ba77013c.
---
 .../haskell-modules/hackage-packages.nix      | 6199 +----------------
 1 file changed, 248 insertions(+), 5951 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 5ee222dcdfce..3f513f1ea0bf 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -798,7 +798,7 @@ self: {
      , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable
      , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process
      , regex-tdfa, split, stm, strict, template-haskell, text, time
-     , transformers, unordered-containers, uri-encode, zlib
+     , unordered-containers, uri-encode, zlib
      }:
      mkDerivation {
        pname = "Agda";
@@ -813,7 +813,7 @@ self: {
          containers data-hash deepseq directory edit-distance equivalence
          exceptions filepath geniplate-mirror ghc-compact gitrev hashable
          hashtables haskeline ieee754 mtl murmur-hash pretty process
-         regex-tdfa split stm strict template-haskell text time transformers
+         regex-tdfa split stm strict template-haskell text time
          unordered-containers uri-encode zlib
        ];
        libraryToolDepends = [ alex happy ];
@@ -3366,28 +3366,6 @@ self: {
      }) {inherit (pkgs) libdevil;};
 
   "Color" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, colour, criterion
-     , data-default-class, deepseq, doctest, hspec, HUnit, JuicyPixels
-     , massiv, massiv-test, QuickCheck, random, template-haskell, vector
-     }:
-     mkDerivation {
-       pname = "Color";
-       version = "0.1.4";
-       sha256 = "155h0zyl7gqpks4441ib4vjcdqpijmza0hx19lifg6kjvygpfj6d";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ base data-default-class deepseq vector ];
-       testHaskellDepends = [
-         base colour doctest hspec HUnit JuicyPixels massiv massiv-test
-         QuickCheck random template-haskell vector
-       ];
-       benchmarkHaskellDepends = [ base colour criterion deepseq random ];
-       description = "Color spaces and conversions between them";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "Color_0_3_0" = callPackage
     ({ mkDerivation, base, colour, criterion, data-default-class
      , deepseq, doctest, hspec, HUnit, JuicyPixels, massiv, massiv-test
      , QuickCheck, random, vector
@@ -6177,17 +6155,6 @@ self: {
      }) {};
 
   "FloatingHex" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "FloatingHex";
-       version = "0.4";
-       sha256 = "0k524ms0hwws5q1vqkf4vrba1q6b33r8c5c3wdifqbcdni6haxxj";
-       libraryHaskellDepends = [ base template-haskell ];
-       description = "Read and write hexadecimal floating point numbers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "FloatingHex_0_5" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "FloatingHex";
@@ -6196,7 +6163,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Read and write hexadecimal floating point numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Focus" = callPackage
@@ -9526,18 +9492,6 @@ self: {
      }) {};
 
   "HUnit" = callPackage
-    ({ mkDerivation, base, call-stack, deepseq, filepath }:
-     mkDerivation {
-       pname = "HUnit";
-       version = "1.6.0.0";
-       sha256 = "1pnhwqq5v8h48gbp3ibv3skfj25mf4zs5svxcavq93p9cswycj3l";
-       libraryHaskellDepends = [ base call-stack deepseq ];
-       testHaskellDepends = [ base call-stack deepseq filepath ];
-       description = "A unit testing framework for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HUnit_1_6_1_0" = callPackage
     ({ mkDerivation, base, call-stack, deepseq, filepath }:
      mkDerivation {
        pname = "HUnit";
@@ -9547,7 +9501,6 @@ self: {
        testHaskellDepends = [ base call-stack deepseq filepath ];
        description = "A unit testing framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit-Diff" = callPackage
@@ -10848,20 +10801,6 @@ self: {
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
-     mkDerivation {
-       pname = "HsOpenSSL";
-       version = "0.11.4.20";
-       sha256 = "0l51pg3cpjq71dqdn0iwj37bqsgjnhfbm0q2ha5wksq4i0qnirf2";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base bytestring network time ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base bytestring ];
-       description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {inherit (pkgs) openssl;};
-
-  "HsOpenSSL_0_11_5_1" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
      mkDerivation {
        pname = "HsOpenSSL";
@@ -10873,7 +10812,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
@@ -24253,40 +24191,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson" = callPackage
-    ({ mkDerivation, attoparsec, base, base-compat
-     , base-compat-batteries, base-orphans, base16-bytestring
-     , bytestring, containers, deepseq, Diff, directory, dlist, filepath
-     , generic-deriving, ghc-prim, hashable, hashable-time
-     , integer-logarithms, primitive, QuickCheck, quickcheck-instances
-     , scientific, tagged, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, th-abstraction, time
-     , time-compat, unordered-containers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "aeson";
-       version = "1.4.7.1";
-       sha256 = "1502yjw4y5ggp1gmrx0d3pcgrx3zhwbmcz4jb4fcignrbxjldrq7";
-       revision = "1";
-       editedCabalFile = "1fih6nmhvg0dvhngk2bjsr9s0804lgng971qz4fjl4mpb7cjz3bd";
-       libraryHaskellDepends = [
-         attoparsec base base-compat-batteries bytestring containers deepseq
-         dlist ghc-prim hashable primitive scientific tagged
-         template-haskell text th-abstraction time time-compat
-         unordered-containers uuid-types vector
-       ];
-       testHaskellDepends = [
-         attoparsec base base-compat base-orphans base16-bytestring
-         bytestring containers Diff directory dlist filepath
-         generic-deriving ghc-prim hashable hashable-time integer-logarithms
-         QuickCheck quickcheck-instances scientific tagged tasty
-         tasty-golden tasty-hunit tasty-quickcheck template-haskell text
-         time time-compat unordered-containers uuid-types vector
-       ];
-       description = "Fast JSON parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "aeson_1_5_2_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat
      , base-compat-batteries, base-orphans, base16-bytestring
@@ -24320,7 +24224,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson_1_5_4_1" = callPackage
+  "aeson" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat
      , base-compat-batteries, base-orphans, base16-bytestring
      , bytestring, containers, data-fix, deepseq, Diff, directory, dlist
@@ -24350,7 +24254,6 @@ self: {
        ];
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-applicative" = callPackage
@@ -25065,31 +24968,6 @@ self: {
      }) {};
 
   "aeson-schemas" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, first-class-families
-     , megaparsec, QuickCheck, raw-strings-qq, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, template-haskell, text
-     , th-test-utils, unordered-containers
-     }:
-     mkDerivation {
-       pname = "aeson-schemas";
-       version = "1.2.0";
-       sha256 = "1fc8zzpkq6alkbl0v473h8diin8lqpliq6d3bsrh5bfny8yapvpk";
-       revision = "1";
-       editedCabalFile = "1kcsnpb4img9a122yz9lf7s0ils7ppbjyknbck2m8ip977kv04dp";
-       libraryHaskellDepends = [
-         aeson base bytestring first-class-families megaparsec
-         template-haskell text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring first-class-families megaparsec QuickCheck
-         raw-strings-qq tasty tasty-golden tasty-hunit tasty-quickcheck
-         template-haskell text th-test-utils unordered-containers
-       ];
-       description = "Easily consume JSON data on-demand with type-safety";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson-schemas_1_3_2" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, criterion, deepseq
      , first-class-families, hashable, hint, interpolate, megaparsec
      , QuickCheck, raw-strings-qq, tasty, tasty-golden, tasty-hunit
@@ -25116,7 +24994,6 @@ self: {
        ];
        description = "Easily consume JSON data on-demand with type-safety";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-serialize" = callPackage
@@ -25320,31 +25197,6 @@ self: {
      }) {};
 
   "aeson-yaml" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, string-qq, tasty
-     , tasty-discover, tasty-hunit, text, unordered-containers, vector
-     , yaml
-     }:
-     mkDerivation {
-       pname = "aeson-yaml";
-       version = "1.0.6.0";
-       sha256 = "16rm4jgl4wznsc4nna3vdx186qy3jl71r9y89dgcc7k00qvlxb7y";
-       revision = "1";
-       editedCabalFile = "1k1wv06fzic9c85c5fl2piang0w1kxi9kzq02hp4chgmbj983jmz";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring string-qq tasty tasty-discover tasty-hunit
-         unordered-containers yaml
-       ];
-       testToolDepends = [ tasty-discover ];
-       description = "Output any Aeson value as YAML (pure Haskell library)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson-yaml_1_1_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, string-qq, tasty
      , tasty-discover, tasty-hunit, text, unordered-containers, vector
      , yaml
@@ -25365,7 +25217,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Output any Aeson value as YAML (pure Haskell library)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "affection" = callPackage
@@ -32665,38 +32516,6 @@ self: {
      }) {};
 
   "arithmoi" = callPackage
-    ({ mkDerivation, array, base, constraints, containers, deepseq
-     , exact-pi, gauge, ghc-prim, integer-gmp, integer-logarithms
-     , QuickCheck, random, semirings, smallcheck, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, transformers, vector
-     }:
-     mkDerivation {
-       pname = "arithmoi";
-       version = "0.10.0.0";
-       sha256 = "1qrrmwg40bw5j51w658ilm5wg6awfbsylpmzjw0r0rgh6ml8irk9";
-       revision = "1";
-       editedCabalFile = "0vl9ki92sfsgqmgfg4f69rqqkl0q4a4klffsskhns6bjbcnzdg8z";
-       configureFlags = [ "-f-llvm" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base constraints containers deepseq exact-pi ghc-prim
-         integer-gmp integer-logarithms random semirings transformers vector
-       ];
-       testHaskellDepends = [
-         base containers exact-pi integer-gmp QuickCheck semirings
-         smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
-         transformers vector
-       ];
-       benchmarkHaskellDepends = [
-         array base constraints containers deepseq gauge integer-logarithms
-         random vector
-       ];
-       description = "Efficient basic number-theoretic functions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "arithmoi_0_11_0_1" = callPackage
     ({ mkDerivation, array, base, chimera, constraints, containers
      , deepseq, exact-pi, gauge, integer-gmp, integer-logarithms
      , integer-roots, mod, QuickCheck, quickcheck-classes, random
@@ -32724,7 +32543,6 @@ self: {
        ];
        description = "Efficient basic number-theoretic functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arity-generic-liftA" = callPackage
@@ -35205,26 +35023,6 @@ self: {
      }) {};
 
   "aur" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, tasty, tasty-hunit, text
-     }:
-     mkDerivation {
-       pname = "aur";
-       version = "7.0.4";
-       sha256 = "0zq1p255qpi1alnhm7k4aj9w4v8y4ybdywbw5w9jbx47imfqqp9y";
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-types text
-       ];
-       testHaskellDepends = [
-         base http-client http-client-tls tasty tasty-hunit
-       ];
-       description = "Access metadata from the Arch Linux User Repository";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "aur_7_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hashable, http-client
      , http-client-tls, http-types, tasty, tasty-hunit, text
      }:
@@ -35263,42 +35061,6 @@ self: {
      }) {};
 
   "aura" = callPackage
-    ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring
-     , containers, filepath, hashable, http-client, http-client-tls
-     , http-types, language-bash, megaparsec, network-uri
-     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
-     , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers
-     , typed-process, versions
-     }:
-     mkDerivation {
-       pname = "aura";
-       version = "3.1.9";
-       sha256 = "1q248qh2wpm0gq07pihw3gshd3ixjdl1l3bf1cpxabn0gjss4hma";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson algebraic-graphs aur base bytestring containers filepath
-         hashable http-client http-types language-bash megaparsec
-         network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler
-         stm text time transformers typed-process versions
-       ];
-       executableHaskellDepends = [
-         aeson aur base bytestring containers http-client http-client-tls
-         megaparsec optparse-applicative prettyprinter
-         prettyprinter-ansi-terminal rio scheduler text transformers
-         typed-process versions
-       ];
-       testHaskellDepends = [
-         base bytestring containers megaparsec rio tasty tasty-hunit text
-         versions
-       ];
-       description = "A secure package manager for Arch Linux and the AUR";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "aura_3_2_2" = callPackage
     ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring
      , containers, filepath, hashable, http-client, http-client-tls
      , http-types, language-bash, megaparsec, network-uri
@@ -37818,17 +37580,6 @@ self: {
      }) {};
 
   "base-prelude" = 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;
-     }) {};
-
-  "base-prelude_1_4" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-prelude";
@@ -37837,7 +37588,6 @@ self: {
        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
@@ -37852,30 +37602,6 @@ self: {
      }) {};
 
   "base16" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
-     , deepseq, memory, primitive, random-bytestring, tasty, tasty-hunit
-     , text, text-short
-     }:
-     mkDerivation {
-       pname = "base16";
-       version = "0.2.1.0";
-       sha256 = "192wnfqb97qhpjrjlq2da5jrjz9zjqjp57rgh1xdvdrnp7900r0s";
-       libraryHaskellDepends = [
-         base bytestring primitive text text-short
-       ];
-       testHaskellDepends = [
-         base base16-bytestring bytestring memory random-bytestring tasty
-         tasty-hunit text
-       ];
-       benchmarkHaskellDepends = [
-         base base16-bytestring bytestring criterion deepseq memory
-         random-bytestring text
-       ];
-       description = "RFC 4648-compliant Base16 encodings/decodings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "base16_0_3_0_1" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, criterion
      , deepseq, primitive, QuickCheck, random-bytestring, tasty
      , tasty-hunit, tasty-quickcheck, text, text-short
@@ -37899,7 +37625,6 @@ self: {
        ];
        description = "Fast RFC 4648-compliant Base16 encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base16-bytestring" = callPackage
@@ -37937,23 +37662,6 @@ self: {
      }) {};
 
   "base16-lens" = callPackage
-    ({ mkDerivation, base, base16, bytestring, Cabal, cabal-doctest
-     , doctest, lens, text
-     }:
-     mkDerivation {
-       pname = "base16-lens";
-       version = "0.1.2.0";
-       sha256 = "1mgy1adhlw2sra8lfc2cklfn9w7jj2f9pilifnnfk2jq6hwalpn8";
-       revision = "1";
-       editedCabalFile = "0ann8lmr7w1p11c0yxb1q1j776hi1dj8xm6xg8c2nq3x396gcnlp";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ base base16 bytestring lens text ];
-       testHaskellDepends = [ base doctest lens ];
-       description = "Optics for the Base16 library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "base16-lens_0_1_3_0" = callPackage
     ({ mkDerivation, base, base16, bytestring, Cabal, cabal-doctest
      , doctest, lens, text, text-short
      }:
@@ -37968,29 +37676,9 @@ self: {
        testHaskellDepends = [ base doctest lens ];
        description = "Optics for the Base16 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base32" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, memory
-     , random-bytestring, tasty, tasty-hunit, text
-     }:
-     mkDerivation {
-       pname = "base32";
-       version = "0.1.1.2";
-       sha256 = "1mnzjpbsz8lsmn13lsbhj4jxn722vfchv01wb2faxfncijji2qhf";
-       libraryHaskellDepends = [ base bytestring text ];
-       testHaskellDepends = [
-         base bytestring memory random-bytestring tasty tasty-hunit text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq memory random-bytestring text
-       ];
-       description = "RFC 4648-compliant Base32 encodings/decodings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "base32_0_2_0_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq
      , ghc-byteorder, memory, QuickCheck, random-bytestring, tasty
      , tasty-hunit, tasty-quickcheck, text, text-short
@@ -38013,7 +37701,6 @@ self: {
        ];
        description = "Fast RFC 4648-compliant Base32 encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base32-bytestring" = callPackage
@@ -38220,8 +37907,8 @@ self: {
      }:
      mkDerivation {
        pname = "base64-bytestring";
-       version = "1.0.0.3";
-       sha256 = "1iwg03z1w9n3n3q68siwk0dmwkb3sygmravbwbrs7h0lxih9s5gg";
+       version = "1.1.0.0";
+       sha256 = "1adcnkcx4nh3d59k94bkndj0wkgbvchz576qwlpaa7148a86q391";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring containers HUnit QuickCheck split test-framework
@@ -39251,28 +38938,6 @@ self: {
      }) {};
 
   "bech32" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , extra, hspec, hspec-discover, QuickCheck, text, vector
-     }:
-     mkDerivation {
-       pname = "bech32";
-       version = "1.0.2";
-       sha256 = "0km1jy3fhpnzqhi4pd5yn6y7214ij7rg47xwnp915c0x6j72ykym";
-       revision = "1";
-       editedCabalFile = "00zw8s5gp7l9872mhm4xcra6z1maw3pwb8klvaik9r7w3gwx6b4h";
-       libraryHaskellDepends = [
-         array base bytestring containers extra text
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq extra hspec QuickCheck text
-         vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "bech32_1_1_0" = callPackage
     ({ mkDerivation, array, base, base58-bytestring, bytestring
      , containers, deepseq, extra, hspec, hspec-discover, memory
      , optparse-applicative, process, QuickCheck, text, vector
@@ -39297,7 +38962,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bech32-th" = callPackage
@@ -39964,30 +39628,6 @@ self: {
      }) {};
 
   "bifunctors" = callPackage
-    ({ mkDerivation, base, base-orphans, comonad, containers, hspec
-     , hspec-discover, QuickCheck, tagged, template-haskell
-     , th-abstraction, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "bifunctors";
-       version = "5.5.7";
-       sha256 = "0cimvd64jzd6dyxjw2kx8wqhd1x0z89pj0ppmsikj4afa3aa5cw8";
-       revision = "2";
-       editedCabalFile = "0w7fscgxin56pcl2p04gbvd5g2y5pk0dg1cx9qrxwshn1x30gn8r";
-       libraryHaskellDepends = [
-         base base-orphans comonad containers tagged template-haskell
-         th-abstraction transformers
-       ];
-       testHaskellDepends = [
-         base hspec QuickCheck template-haskell transformers
-         transformers-compat
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Bifunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bifunctors_5_5_8" = callPackage
     ({ mkDerivation, base, base-orphans, comonad, containers, hspec
      , hspec-discover, QuickCheck, tagged, template-haskell
      , th-abstraction, transformers, transformers-compat
@@ -40007,7 +39647,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bighugethesaurus" = callPackage
@@ -40431,6 +40070,33 @@ self: {
      }) {};
 
   "binary-instances" = callPackage
+    ({ mkDerivation, aeson, base, binary, binary-orphans
+     , case-insensitive, hashable, QuickCheck, quickcheck-instances
+     , scientific, tagged, tasty, tasty-quickcheck, text, text-binary
+     , time-compat, unordered-containers, vector
+     , vector-binary-instances
+     }:
+     mkDerivation {
+       pname = "binary-instances";
+       version = "1.0.0.1";
+       sha256 = "0f8ilzpwj7gbyvlswlkd48dzpj9m13ipinw55lvjag0ir52idk9a";
+       revision = "1";
+       editedCabalFile = "19xmaj5vlabsifkdk1kpxp4nadfml7a51w316sd4fxd69ncvwd72";
+       libraryHaskellDepends = [
+         aeson base binary binary-orphans case-insensitive hashable
+         scientific tagged text text-binary time-compat unordered-containers
+         vector vector-binary-instances
+       ];
+       testHaskellDepends = [
+         aeson base binary case-insensitive hashable QuickCheck
+         quickcheck-instances scientific tagged tasty tasty-quickcheck text
+         time-compat unordered-containers vector
+       ];
+       description = "Orphan instances for binary";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "binary-instances_1_0_1" = callPackage
     ({ mkDerivation, aeson, base, binary, binary-orphans
      , case-insensitive, hashable, QuickCheck, quickcheck-instances
      , scientific, tagged, tasty, tasty-quickcheck, text, text-binary
@@ -40453,6 +40119,7 @@ self: {
        ];
        description = "Orphan instances for binary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-io" = callPackage
@@ -43259,31 +42926,6 @@ self: {
      }) {};
 
   "blanks" = callPackage
-    ({ mkDerivation, adjunctions, base, containers, distributive, mtl
-     , tasty, tasty-discover, tasty-hunit
-     }:
-     mkDerivation {
-       pname = "blanks";
-       version = "0.3.0";
-       sha256 = "1k2lyfmr0q30rcmhxgcagzf7far2k2qbm4249x296mdn1xzcijxq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         adjunctions base containers distributive mtl
-       ];
-       executableHaskellDepends = [
-         adjunctions base containers distributive mtl
-       ];
-       testHaskellDepends = [
-         adjunctions base containers distributive mtl tasty tasty-discover
-         tasty-hunit
-       ];
-       testToolDepends = [ tasty-discover ];
-       description = "Fill-in-the-blanks - A library factoring out substitution from ASTs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blanks_0_5_0" = callPackage
     ({ mkDerivation, adjunctions, base, containers, deepseq
      , distributive, megaparsec, mtl, tasty, tasty-hunit, text
      }:
@@ -43300,7 +42942,6 @@ self: {
        ];
        description = "Fill-in-the-blanks - A library factoring out substitution from ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blas" = callPackage
@@ -45021,31 +44662,6 @@ self: {
      }) {};
 
   "bound" = callPackage
-    ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
-     , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest
-     , functor-classes-compat, hashable, mmorph, profunctors
-     , template-haskell, transformers, transformers-compat, vector, void
-     }:
-     mkDerivation {
-       pname = "bound";
-       version = "2.0.1";
-       sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9";
-       revision = "9";
-       editedCabalFile = "1vy84wc79a64f9qa2x9s3rs8g0kz45khh3l6sjqpmfm8xafvv2hq";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base bifunctors binary bytes cereal comonad deepseq hashable mmorph
-         profunctors template-haskell transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base deriving-compat doctest functor-classes-compat transformers
-         transformers-compat vector void
-       ];
-       description = "Making de Bruijn Succ Less";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bound_2_0_2" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
      , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest
      , functor-classes-compat, hashable, mmorph, profunctors
@@ -45068,7 +44684,6 @@ self: {
        ];
        description = "Making de Bruijn Succ Less";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bound-extras" = callPackage
@@ -45453,32 +45068,6 @@ self: {
      }) {};
 
   "brick" = callPackage
-    ({ mkDerivation, base, bytestring, config-ini, containers
-     , contravariant, data-clist, deepseq, directory, dlist, exceptions
-     , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
-     , template-haskell, text, text-zipper, transformers, unix, vector
-     , vty, word-wrap
-     }:
-     mkDerivation {
-       pname = "brick";
-       version = "0.52.1";
-       sha256 = "1jqs75k7r98c6k8d14arhiz49xy7k0jaymlmijx0pma3yrha90pl";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring config-ini containers contravariant data-clist
-         deepseq directory dlist exceptions filepath microlens microlens-mtl
-         microlens-th stm template-haskell text text-zipper transformers
-         unix vector vty word-wrap
-       ];
-       testHaskellDepends = [
-         base containers microlens QuickCheck vector
-       ];
-       description = "A declarative terminal user interface library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "brick_0_57" = callPackage
     ({ mkDerivation, base, bytestring, config-ini, containers
      , contravariant, data-clist, deepseq, directory, dlist, exceptions
      , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
@@ -45502,7 +45091,6 @@ self: {
        ];
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brick-dropdownmenu" = callPackage
@@ -46450,24 +46038,6 @@ self: {
      }) {};
 
   "bugsnag-hs" = callPackage
-    ({ mkDerivation, aeson, auto-update, base, bytestring, hedgehog
-     , http-client, stm, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "bugsnag-hs";
-       version = "0.1.0.3";
-       sha256 = "0xm7qf4kzbgk3qnchns7bb2578x4ivmym5a93272849klybjjqk9";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson auto-update base bytestring http-client stm text time
-         unordered-containers
-       ];
-       testHaskellDepends = [ aeson base bytestring hedgehog stm ];
-       description = "A Bugsnag client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bugsnag-hs_0_2_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client
      , text, time, unordered-containers
      }:
@@ -46482,7 +46052,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring hedgehog ];
        description = "A Bugsnag client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bugzilla" = callPackage
@@ -46783,6 +46352,23 @@ self: {
      }) {};
 
   "burrito" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hspec, parsec
+     , QuickCheck, template-haskell, text, transformers
+     }:
+     mkDerivation {
+       pname = "burrito";
+       version = "1.1.0.2";
+       sha256 = "1k625j5syyiq66i88zy6q0mvwkjl5jsj79sxdmd1rbam3m39whx1";
+       libraryHaskellDepends = [
+         base bytestring containers parsec template-haskell text
+         transformers
+       ];
+       testHaskellDepends = [ base containers hspec QuickCheck text ];
+       description = "Parse and render URI templates";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
+  "burrito_1_2_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec, parsec
      , QuickCheck, template-haskell, text, transformers
      }:
@@ -46797,6 +46383,7 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck text ];
        description = "Parse and render URI templates";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "burst-detection" = callPackage
@@ -47847,30 +47434,6 @@ self: {
      }) {};
 
   "bz2" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, criterion, deepseq
-     , directory, filepath, tasty, tasty-golden, tasty-hunit, temporary
-     }:
-     mkDerivation {
-       pname = "bz2";
-       version = "1.0.0.1";
-       sha256 = "055sfi658z8sxznzdnj40hwzj89nfa0dk4x59b5z43lah9m3hpa2";
-       revision = "2";
-       editedCabalFile = "1kf9phb27cy7yk06sdd3bgh39ym0gb988h6zx315gcmlxncj71jb";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base bytestring ];
-       libraryToolDepends = [ c2hs ];
-       testHaskellDepends = [
-         base bytestring deepseq directory filepath tasty tasty-golden
-         tasty-hunit
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion filepath temporary
-       ];
-       description = "Bindings to libbz2";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bz2_1_0_1_0" = callPackage
     ({ mkDerivation, base, bytestring, bzlib, c2hs, cpphs, criterion
      , deepseq, directory, filepath, tasty, tasty-golden, tasty-hunit
      , temporary
@@ -47892,7 +47455,6 @@ self: {
        benchmarkToolDepends = [ cpphs ];
        description = "Bindings to libbz2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bzip-signature" = callPackage
@@ -48416,30 +47978,6 @@ self: {
      }) {};
 
   "cabal-debian" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal
-     , containers, data-default, debian, deepseq, Diff, directory
-     , exceptions, filepath, hsemail, HUnit, lens, mtl, network-uri
-     , newtype-generics, optparse-applicative, parsec, pretty, process
-     , pureMD5, regex-tdfa, syb, text, unix, unliftio, utf8-string
-     }:
-     mkDerivation {
-       pname = "cabal-debian";
-       version = "5.0.3";
-       sha256 = "11imbizfa65fdqydpxvcdv0a80gsd6szzl33b312myw3il2xr5hi";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base bifunctors Cabal containers data-default debian
-         deepseq Diff directory exceptions filepath hsemail HUnit lens mtl
-         network-uri newtype-generics optparse-applicative parsec pretty
-         process pureMD5 regex-tdfa syb text unix unliftio utf8-string
-       ];
-       executableHaskellDepends = [ base Cabal debian lens mtl pretty ];
-       description = "Create a Debianization for a Cabal package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cabal-debian_5_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal
      , containers, data-default, debian, deepseq, Diff, directory
      , exceptions, filepath, hsemail, HUnit, lens, mtl, network-uri
@@ -48461,7 +47999,6 @@ self: {
        executableHaskellDepends = [ base Cabal debian lens mtl pretty ];
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dependency-licenses" = callPackage
@@ -48555,6 +48092,29 @@ self: {
      }) {};
 
   "cabal-file" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, extra
+     , filepath, hackage-security, optparse-applicative, simple-cabal
+     , simple-cmd, simple-cmd-args, time
+     }:
+     mkDerivation {
+       pname = "cabal-file";
+       version = "0.1.0";
+       sha256 = "1khf39awvpnqxs0rlqa6n5810x9kkn31975v6kbmwwdrjjp2qlqw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal directory extra filepath hackage-security
+         optparse-applicative simple-cabal simple-cmd time
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal directory extra filepath optparse-applicative
+         simple-cabal simple-cmd simple-cmd-args
+       ];
+       description = "Cabal file access";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "cabal-file_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, extra
      , filepath, hackage-security, optparse-applicative, simple-cabal
      , simple-cmd, simple-cmd-args, time
@@ -48575,6 +48135,7 @@ self: {
        ];
        description = "Cabal file access";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-file-th" = callPackage
@@ -51514,28 +51075,6 @@ self: {
      }) {};
 
   "cassava-conduit" = callPackage
-    ({ mkDerivation, array, base, bifunctors, bytestring, cassava
-     , conduit, containers, criterion, mtl, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "cassava-conduit";
-       version = "0.5.1";
-       sha256 = "1y3pjvc273vxb8lr3wckliw23n8vninl034wc0zlfh1asplp4nxm";
-       libraryHaskellDepends = [
-         array base bifunctors bytestring cassava conduit containers mtl
-         text
-       ];
-       testHaskellDepends = [
-         base bytestring cassava conduit QuickCheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Conduit interface for cassava package";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "cassava-conduit_0_6_0" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
      , conduit, containers, criterion, mtl, QuickCheck, text
      }:
@@ -53001,25 +52540,6 @@ self: {
      }) {};
 
   "character-cases" = callPackage
-    ({ mkDerivation, base, containers, doctest, Glob, here, megaparsec
-     , prettyprinter, template-haskell
-     }:
-     mkDerivation {
-       pname = "character-cases";
-       version = "0.1.0.4";
-       sha256 = "0097d5p1q2l76jb1qm8zsqm7d3qfcr35v2ip0v52i1ri57b03iya";
-       libraryHaskellDepends = [
-         base containers here megaparsec prettyprinter template-haskell
-       ];
-       testHaskellDepends = [
-         base containers doctest Glob here megaparsec prettyprinter
-         template-haskell
-       ];
-       description = "Exposes subspecies types of Char. And naming cases.";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "character-cases_0_1_0_6" = callPackage
     ({ mkDerivation, base, containers, doctest, Glob, megaparsec
      , prettyprinter, template-haskell
      }:
@@ -53036,7 +52556,6 @@ self: {
        ];
        description = "Exposes subspecies types of Char. And naming cases.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "charade" = callPackage
@@ -55058,38 +54577,11 @@ self: {
   "clash-ghc" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, Cabal
      , clash-lib, clash-prelude, concurrent-supply, containers, deepseq
-     , directory, filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable
-     , haskeline, integer-gmp, lens, mtl, primitive, process, reflection
-     , split, template-haskell, text, time, transformers, uniplate, unix
-     , unordered-containers, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "clash-ghc";
-       version = "1.2.4";
-       sha256 = "1xzpz0bkdfvhkk496q4zr7f6ix23dgg6w5r14j5gxy4jb8f8bxln";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base bifunctors bytestring Cabal clash-lib clash-prelude
-         concurrent-supply containers deepseq directory filepath ghc
-         ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat
-         ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens
-         mtl primitive process reflection split template-haskell text time
-         transformers uniplate unix unordered-containers utf8-string vector
-       ];
-       executableHaskellDepends = [ base ];
-       description = "CAES Language for Synchronous Hardware";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "clash-ghc_1_2_5" = callPackage
-    ({ mkDerivation, array, base, bifunctors, bytestring, Cabal
-     , clash-lib, clash-prelude, concurrent-supply, containers, deepseq
-     , directory, filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable
-     , haskeline, integer-gmp, lens, mtl, primitive, process, reflection
-     , split, template-haskell, text, time, transformers, uniplate, unix
+     , directory, exceptions, filepath, ghc, ghc-boot, ghc-prim
+     , ghc-typelits-extra, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp
+     , lens, mtl, primitive, process, reflection, split
+     , template-haskell, text, time, transformers, uniplate, unix
      , unordered-containers, utf8-string, vector
      }:
      mkDerivation {
@@ -55100,8 +54592,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [
          array base bifunctors bytestring Cabal clash-lib clash-prelude
-         concurrent-supply containers deepseq directory filepath ghc
-         ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat
+         concurrent-supply containers deepseq directory exceptions filepath
+         ghc ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat
          ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens
          mtl primitive process reflection split template-haskell text time
          transformers uniplate unix unordered-containers utf8-string vector
@@ -55109,47 +54601,9 @@ self: {
        executableHaskellDepends = [ base ];
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-lib" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary
-     , bytestring, clash-prelude, concurrent-supply, containers
-     , data-binary-ieee754, data-default, deepseq, directory, dlist
-     , errors, exceptions, extra, filepath, ghc, ghc-boot-th
-     , ghc-typelits-knownnat, hashable, haskell-src-exts
-     , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl
-     , ordered-containers, parsers, prettyprinter, primitive, process
-     , reducers, tasty, tasty-hunit, template-haskell, temporary
-     , terminal-size, text, text-show, time, transformers, trifecta
-     , unordered-containers, utf8-string, vector
-     , vector-binary-instances
-     }:
-     mkDerivation {
-       pname = "clash-lib";
-       version = "1.2.4";
-       sha256 = "147cahsid3l6ff8d96ndzli1v79i9lbmad0bkmy0s5vcbgp90q7c";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal attoparsec base binary bytestring clash-prelude
-         concurrent-supply containers data-binary-ieee754 data-default
-         deepseq directory dlist errors exceptions extra filepath ghc
-         ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate
-         lens mtl ordered-containers parsers prettyprinter primitive process
-         reducers template-haskell temporary terminal-size text text-show
-         time transformers trifecta unordered-containers utf8-string vector
-         vector-binary-instances
-       ];
-       testHaskellDepends = [
-         base clash-prelude concurrent-supply containers data-default
-         deepseq ghc ghc-typelits-knownnat haskell-src-exts lens tasty
-         tasty-hunit template-haskell text transformers unordered-containers
-       ];
-       description = "CAES Language for Synchronous Hardware - As a Library";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "clash-lib_1_2_5" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary
      , bytestring, clash-prelude, concurrent-supply, containers
      , data-binary-ieee754, data-default, deepseq, directory, dlist
@@ -55184,7 +54638,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-multisignal" = callPackage
@@ -55204,43 +54657,6 @@ self: {
      }) {};
 
   "clash-prelude" = callPackage
-    ({ mkDerivation, array, base, bifunctors, binary, bytestring, Cabal
-     , cabal-doctest, constraints, containers, criterion
-     , data-binary-ieee754, data-default-class, deepseq, doctest
-     , ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat
-     , ghc-typelits-natnormalise, half, hashable, hint, integer-gmp
-     , interpolate, lens, QuickCheck, quickcheck-classes-base
-     , recursion-schemes, reflection, singletons, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, text-show
-     , th-abstraction, th-lift, th-orphans, time, transformers
-     , type-errors, uniplate, vector
-     }:
-     mkDerivation {
-       pname = "clash-prelude";
-       version = "1.2.4";
-       sha256 = "1yizprs6i4y2vyhjj6pvpd5xmdbxyqjwclk6saaws0g3xv008ffg";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         array base bifunctors binary bytestring constraints containers
-         data-binary-ieee754 data-default-class deepseq ghc-prim
-         ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise
-         half hashable integer-gmp interpolate lens QuickCheck
-         recursion-schemes reflection singletons template-haskell text
-         text-show th-abstraction th-lift th-orphans time transformers
-         type-errors uniplate vector
-       ];
-       testHaskellDepends = [
-         base doctest ghc-typelits-knownnat hint quickcheck-classes-base
-         tasty tasty-hunit tasty-quickcheck template-haskell
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq template-haskell
-       ];
-       description = "CAES Language for Synchronous Hardware - Prelude library";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "clash-prelude_1_2_5" = callPackage
     ({ mkDerivation, array, base, bifunctors, binary, bytestring, Cabal
      , cabal-doctest, constraints, containers, criterion
      , data-binary-ieee754, data-default-class, deepseq, doctest
@@ -55276,7 +54692,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - Prelude library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-prelude-quickcheck" = callPackage
@@ -61840,26 +61255,6 @@ self: {
      }) {};
 
   "configurator-pg" = callPackage
-    ({ mkDerivation, base, bytestring, containers, filepath, HUnit
-     , megaparsec, protolude, scientific, test-framework
-     , test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "configurator-pg";
-       version = "0.2.4";
-       sha256 = "07zhvfky3p4wv6hc48hclmgkz465wpbqwx4yfljby82hgnrkdarh";
-       libraryHaskellDepends = [
-         base containers megaparsec protolude scientific text
-       ];
-       testHaskellDepends = [
-         base bytestring filepath HUnit protolude test-framework
-         test-framework-hunit text
-       ];
-       description = "Reduced parser for configurator-ng config files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "configurator-pg_0_2_5" = callPackage
     ({ mkDerivation, base, bytestring, containers, filepath, HUnit
      , megaparsec, protolude, scientific, test-framework
      , test-framework-hunit, text
@@ -61877,7 +61272,6 @@ self: {
        ];
        description = "Reduced parser for configurator-ng config files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "confsolve" = callPackage
@@ -63720,24 +63114,6 @@ self: {
      }) {};
 
   "core-data" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, core-text
-     , hashable, prettyprinter, prettyprinter-ansi-terminal, scientific
-     , text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "core-data";
-       version = "0.2.1.8";
-       sha256 = "1hgvvkk3m3ykdndmf2hbm59v0pim68jwgl2a6n5hw1dv4xwd3fay";
-       libraryHaskellDepends = [
-         aeson base bytestring containers core-text hashable prettyprinter
-         prettyprinter-ansi-terminal scientific text unordered-containers
-         vector
-       ];
-       description = "Convenience wrappers around common data structures and encodings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "core-data_0_2_1_9" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, core-text
      , hashable, prettyprinter, scientific, text, unordered-containers
      , vector
@@ -63752,7 +63128,6 @@ self: {
        ];
        description = "Convenience wrappers around common data structures and encodings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "core-haskell" = callPackage
@@ -63773,27 +63148,6 @@ self: {
      }) {};
 
   "core-program" = callPackage
-    ({ mkDerivation, async, base, bytestring, chronologique, core-data
-     , core-text, directory, exceptions, filepath, fsnotify, hashable
-     , hourglass, mtl, prettyprinter, prettyprinter-ansi-terminal
-     , safe-exceptions, stm, template-haskell, terminal-size, text
-     , text-short, transformers, unix
-     }:
-     mkDerivation {
-       pname = "core-program";
-       version = "0.2.5.0";
-       sha256 = "0bgzlyxcmnn7bscw04v9rljny9wjhcg066nbqk47aphdd6b716dj";
-       libraryHaskellDepends = [
-         async base bytestring chronologique core-data core-text directory
-         exceptions filepath fsnotify hashable hourglass mtl prettyprinter
-         prettyprinter-ansi-terminal safe-exceptions stm template-haskell
-         terminal-size text text-short transformers unix
-       ];
-       description = "Opinionated Haskell Interoperability";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "core-program_0_2_6_0" = callPackage
     ({ mkDerivation, async, base, bytestring, chronologique, core-data
      , core-text, directory, exceptions, filepath, fsnotify, hashable
      , hourglass, mtl, prettyprinter, safe-exceptions, stm
@@ -63812,27 +63166,9 @@ self: {
        ];
        description = "Opinionated Haskell Interoperability";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "core-text" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable
-     , prettyprinter, prettyprinter-ansi-terminal, template-haskell
-     , text, text-short
-     }:
-     mkDerivation {
-       pname = "core-text";
-       version = "0.2.3.6";
-       sha256 = "13sdgym8xhljpc465bq1h066mrcvk77568viklhib255skjl56gn";
-       libraryHaskellDepends = [
-         base bytestring deepseq fingertree hashable prettyprinter
-         prettyprinter-ansi-terminal template-haskell text text-short
-       ];
-       description = "A rope type based on a finger tree over UTF-8 fragments";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "core-text_0_3_0_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq
      , fingertree, hashable, prettyprinter, template-haskell, text
      , text-short
@@ -63847,7 +63183,6 @@ self: {
        ];
        description = "A rope type based on a finger tree over UTF-8 fragments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "corebot-bliki" = callPackage
@@ -64779,20 +64114,6 @@ self: {
      }) {crack = null;};
 
   "crackNum" = callPackage
-    ({ mkDerivation, array, base, FloatingHex }:
-     mkDerivation {
-       pname = "crackNum";
-       version = "2.3";
-       sha256 = "1wrqq2g6hvqa8w0c4nad35d1favcjqi93ywnxqkc3i7pl37jb3s2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ array base FloatingHex ];
-       executableHaskellDepends = [ array base FloatingHex ];
-       description = "Crack various integer, floating-point data formats";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "crackNum_2_4" = callPackage
     ({ mkDerivation, array, base, FloatingHex }:
      mkDerivation {
        pname = "crackNum";
@@ -64804,7 +64125,6 @@ self: {
        executableHaskellDepends = [ array base FloatingHex ];
        description = "Crack various integer, floating-point data formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "craft" = callPackage
@@ -66247,28 +65567,6 @@ self: {
      }) {};
 
   "cryptonite" = callPackage
-    ({ mkDerivation, base, basement, bytestring, deepseq, gauge
-     , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
-     , tasty-kat, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "cryptonite";
-       version = "0.26";
-       sha256 = "1pdf0zzbfr0cdzls6bab6f6kpx08wa8c2qc1zfqzv5ajapgr0wy4";
-       libraryHaskellDepends = [
-         base basement bytestring deepseq ghc-prim integer-gmp memory
-       ];
-       testHaskellDepends = [
-         base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring deepseq gauge memory random
-       ];
-       description = "Cryptography Primitives sink";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cryptonite_0_27" = callPackage
     ({ mkDerivation, base, basement, bytestring, deepseq, gauge
      , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
      , tasty-kat, tasty-quickcheck
@@ -66288,7 +65586,6 @@ self: {
        ];
        description = "Cryptography Primitives sink";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptonite-conduit" = callPackage
@@ -66705,32 +66002,6 @@ self: {
      }) {};
 
   "csv-conduit" = 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.1.0";
-       sha256 = "01wmf2kzy483k3dbmcmf1mziwwrchdj7nxl63wakynsddh1zjv9v";
-       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;
-     }) {};
-
-  "csv-conduit_0_7_2_0" = callPackage
     ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
      , conduit, conduit-extra, containers, data-default, directory
      , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl
@@ -66754,7 +66025,6 @@ self: {
        ];
        description = "A flexible, fast, conduit-based CSV parser library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csv-enumerator" = callPackage
@@ -69157,19 +68427,6 @@ self: {
      }) {};
 
   "data-fix" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "data-fix";
-       version = "0.2.1";
-       sha256 = "05mhbcb04gxj1zl5y3zjss4p5lab5wyvzwk9pbg04ax2l24qmwih";
-       revision = "1";
-       editedCabalFile = "1rjz9w5rs48nia2imk4345h8daczlgk85ak2k0dssframi2w8v3s";
-       libraryHaskellDepends = [ base ];
-       description = "Fixpoint data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-fix_0_3_0" = callPackage
     ({ mkDerivation, base, deepseq, hashable }:
      mkDerivation {
        pname = "data-fix";
@@ -69178,7 +68435,6 @@ self: {
        libraryHaskellDepends = [ base deepseq hashable ];
        description = "Fixpoint data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-fix-cse" = callPackage
@@ -72106,22 +71362,6 @@ self: {
      }) {};
 
   "dejafu" = callPackage
-    ({ mkDerivation, base, concurrency, containers, contravariant
-     , deepseq, exceptions, leancheck, profunctors, random, transformers
-     }:
-     mkDerivation {
-       pname = "dejafu";
-       version = "2.3.0.1";
-       sha256 = "0klw2knnhqanmfjz2hjrj5sag6bqkh1g6vhgbvyk3d532m748wx1";
-       libraryHaskellDepends = [
-         base concurrency containers contravariant deepseq exceptions
-         leancheck profunctors random transformers
-       ];
-       description = "A library for unit-testing concurrent programs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "dejafu_2_4_0_0" = callPackage
     ({ mkDerivation, base, concurrency, containers, contravariant
      , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
@@ -72135,7 +71375,6 @@ self: {
        ];
        description = "A library for unit-testing concurrent programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deka" = callPackage
@@ -72927,31 +72166,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, void
-     }:
-     mkDerivation {
-       pname = "deriving-compat";
-       version = "0.5.9";
-       sha256 = "1i0sc77h2902b0xc722v87iwdnwayn1y5mpiy700nclmfrrw2jy4";
-       revision = "1";
-       editedCabalFile = "07vw03bi7gajfnampd98jyxjkidnkj4zyaxl7pr248qsgrvcf123";
-       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 void
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Backports of GHC deriving extensions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "deriving-compat_0_5_10" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, containers
      , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
      , template-haskell, th-abstraction, transformers
@@ -72972,7 +72186,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deriving-show-simple" = callPackage
@@ -73490,60 +72703,6 @@ self: {
      }) {};
 
   "dhall" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
-     , base, bytestring, case-insensitive, cborg, cborg-json, containers
-     , contravariant, cryptonite, data-fix, deepseq, Diff, directory
-     , doctest, dotgen, either, exceptions, filepath, foldl, gauge
-     , generic-random, half, hashable, haskeline, http-client
-     , http-client-tls, http-types, lens-family-core, megaparsec, memory
-     , mockery, mtl, network-uri, optparse-applicative
-     , parser-combinators, parsers, pretty-simple, prettyprinter
-     , prettyprinter-ansi-terminal, profunctors, QuickCheck
-     , quickcheck-instances, repline, scientific, semigroups, serialise
-     , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, text-manipulate
-     , th-lift-instances, transformers, transformers-compat, turtle
-     , unordered-containers, uri-encode, vector
-     }:
-     mkDerivation {
-       pname = "dhall";
-       version = "1.32.0";
-       sha256 = "1imj0bh5365pdizvjbw2wqz0g9hakigf1zm4fr6379qdchxpp90p";
-       revision = "4";
-       editedCabalFile = "17mq04cla4367gb14g8jlzywgg5m3dbz02xxqm6ynyf9k8dnnr2x";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty ansi-terminal atomic-write base bytestring
-         case-insensitive cborg cborg-json containers contravariant
-         cryptonite data-fix deepseq Diff directory dotgen either exceptions
-         filepath half hashable haskeline http-client http-client-tls
-         http-types lens-family-core megaparsec memory mtl network-uri
-         optparse-applicative parser-combinators parsers pretty-simple
-         prettyprinter prettyprinter-ansi-terminal profunctors repline
-         scientific serialise template-haskell text text-manipulate
-         th-lift-instances transformers transformers-compat
-         unordered-containers uri-encode vector
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base bytestring cborg containers data-fix deepseq directory doctest
-         either filepath foldl generic-random lens-family-core megaparsec
-         mockery prettyprinter QuickCheck quickcheck-instances scientific
-         semigroups serialise special-values spoon tasty
-         tasty-expected-failure tasty-hunit tasty-quickcheck
-         template-haskell text transformers turtle unordered-containers
-         vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers directory gauge serialise text
-       ];
-       doCheck = false;
-       description = "A configuration language guaranteed to terminate";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall_1_36_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
      , base, bytestring, case-insensitive, cborg, cborg-json, containers
      , contravariant, cryptonite, data-fix, deepseq, Diff, directory
@@ -73595,33 +72754,9 @@ self: {
        doCheck = false;
        description = "A configuration language guaranteed to terminate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-bash" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dhall
-     , neat-interpolation, optparse-generic, shell-escape, text
-     }:
-     mkDerivation {
-       pname = "dhall-bash";
-       version = "1.0.30";
-       sha256 = "1r2xr8c8kzmrxrb8m6f9dzjn81sqxzx97w0406kwrx9vzfj7ci1q";
-       revision = "1";
-       editedCabalFile = "0x7lkh86sr08qm53ycmka1vpxn7y60l01dm6hh70rhzn435ilvj1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers dhall neat-interpolation shell-escape
-         text
-       ];
-       executableHaskellDepends = [
-         base bytestring dhall optparse-generic text
-       ];
-       description = "Compile Dhall to Bash";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-bash_1_0_34" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall
      , neat-interpolation, optparse-generic, shell-escape, text
      }:
@@ -73640,7 +72775,6 @@ self: {
        ];
        description = "Compile Dhall to Bash";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-check" = callPackage
@@ -73728,37 +72862,6 @@ self: {
      }) {};
 
   "dhall-json" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal
-     , base, bytestring, containers, dhall, exceptions, filepath
-     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
-     , scientific, tasty, tasty-hunit, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "dhall-json";
-       version = "1.6.4";
-       sha256 = "0vr6a02frfk5bh0qj0m4qlc5pp08m29gxp8ixqihrqakkna6409z";
-       revision = "3";
-       editedCabalFile = "09yifah6mfy8k1qi5d2fibw62hjnxfcr7fx3wvyf4n16nq1mhshx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty aeson-yaml base bytestring containers dhall
-         exceptions filepath optparse-applicative prettyprinter scientific
-         text unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty ansi-terminal base bytestring dhall exceptions
-         optparse-applicative prettyprinter prettyprinter-ansi-terminal text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring dhall tasty tasty-hunit text
-       ];
-       description = "Convert between Dhall and JSON or YAML";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-json_1_7_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal
      , base, bytestring, containers, dhall, exceptions, filepath
      , lens-family-core, optparse-applicative, prettyprinter
@@ -73785,7 +72888,6 @@ self: {
        ];
        description = "Convert between Dhall and JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-lex" = callPackage
@@ -73808,35 +72910,6 @@ self: {
      }) {};
 
   "dhall-lsp-server" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , data-default, dhall, dhall-json, directory, doctest, filepath
-     , haskell-lsp, haskell-lsp-types, hslogger, lens, lens-family-core
-     , lsp-test, megaparsec, mtl, network-uri, optparse-applicative
-     , prettyprinter, QuickCheck, rope-utf16-splay, tasty, tasty-hspec
-     , text, transformers, unordered-containers, uri-encode
-     }:
-     mkDerivation {
-       pname = "dhall-lsp-server";
-       version = "1.0.8";
-       sha256 = "1ig90w8iwyq5qwx5rd9zrd0mvrfksn6x1qh0hqxqvjdxrxk9lqnk";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers data-default dhall
-         dhall-json directory filepath haskell-lsp hslogger lens
-         lens-family-core megaparsec mtl network-uri prettyprinter
-         rope-utf16-splay text transformers unordered-containers uri-encode
-       ];
-       executableHaskellDepends = [ base optparse-applicative ];
-       testHaskellDepends = [
-         base directory doctest filepath haskell-lsp-types lsp-test
-         QuickCheck tasty tasty-hspec text
-       ];
-       description = "Language Server Protocol (LSP) server for Dhall";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "dhall-lsp-server_1_0_11" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , data-default, dhall, dhall-json, directory, doctest, filepath
      , haskell-lsp, haskell-lsp-types, hslogger, lens, lens-family-core
@@ -73863,7 +72936,6 @@ self: {
        ];
        description = "Language Server Protocol (LSP) server for Dhall";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-nix" = callPackage
@@ -73962,38 +73034,6 @@ self: {
      }) {};
 
   "dhall-yaml" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall
-     , dhall-json, exceptions, HsYAML, HsYAML-aeson
-     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
-     , tasty, tasty-expected-failure, tasty-hunit, text, vector
-     }:
-     mkDerivation {
-       pname = "dhall-yaml";
-       version = "1.1.0";
-       sha256 = "06lwzis9jjfis6rv4r9gd0iq1da5ymcd6jl8x3rbcimg87k9r4bj";
-       revision = "2";
-       editedCabalFile = "1vflfl8j0fjvf5a8mz90d71myii4s2k98186gidxv0dkll8dix9a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring dhall dhall-json HsYAML HsYAML-aeson
-         optparse-applicative text vector
-       ];
-       executableHaskellDepends = [
-         aeson ansi-terminal base bytestring dhall dhall-json exceptions
-         optparse-applicative prettyprinter prettyprinter-ansi-terminal text
-       ];
-       testHaskellDepends = [
-         base bytestring dhall dhall-json tasty tasty-expected-failure
-         tasty-hunit text
-       ];
-       description = "Convert between Dhall and YAML";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "dhall-yaml_1_2_3" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall
      , dhall-json, exceptions, HsYAML, HsYAML-aeson
      , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
@@ -81627,43 +80667,6 @@ self: {
      }) {};
 
   "egison" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, deepseq
-     , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline
-     , HUnit, megaparsec, mini-egison, mtl, optparse-applicative, parsec
-     , parser-combinators, prettyprinter, process, random, regex-tdfa
-     , split, test-framework, test-framework-hunit, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "egison";
-       version = "4.0.3";
-       sha256 = "0wav3cbp8yxkx9ajhcfqws9y1xhs36gw01spwi7x7s4l6x7fkqlm";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base containers directory ghc ghc-paths hashable haskeline
-         megaparsec mini-egison mtl optparse-applicative parsec
-         parser-combinators prettyprinter process random regex-tdfa split
-         text transformers unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         array base containers directory filepath ghc ghc-paths haskeline
-         mtl optparse-applicative parsec prettyprinter process regex-tdfa
-         split text transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base filepath Glob HUnit mtl test-framework test-framework-hunit
-         transformers
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq mtl transformers
-       ];
-       description = "Programming language with non-linear pattern-matching against non-free data";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "egison_4_1_2" = callPackage
     ({ mkDerivation, array, base, containers, criterion, directory
      , exceptions, filepath, ghc, ghc-paths, Glob, hashable, haskeline
      , HUnit, megaparsec, mtl, optparse-applicative, parsec
@@ -81696,31 +80699,9 @@ self: {
        benchmarkHaskellDepends = [ base criterion transformers ];
        description = "Programming language with non-linear pattern-matching against non-free data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "egison-pattern-src" = callPackage
-    ({ mkDerivation, base, containers, free, megaparsec, mtl
-     , parser-combinators, prettyprinter, recursion-schemes, tasty
-     , tasty-discover, tasty-hunit, text
-     }:
-     mkDerivation {
-       pname = "egison-pattern-src";
-       version = "0.2.1.0";
-       sha256 = "0zfqrjmbzh7s88dkqc5mabb2yhb3xz88y10n5npkz9f6cjas4cxf";
-       libraryHaskellDepends = [
-         base containers free megaparsec mtl parser-combinators
-         prettyprinter recursion-schemes text
-       ];
-       testHaskellDepends = [
-         base megaparsec mtl tasty tasty-hunit text
-       ];
-       testToolDepends = [ tasty-discover ];
-       description = "Manipulating Egison patterns: abstract syntax, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "egison-pattern-src_0_2_1_2" = callPackage
     ({ mkDerivation, base, containers, free, megaparsec, mtl
      , parser-combinators, prettyprinter, recursion-schemes, tasty
      , tasty-discover, tasty-hunit, text
@@ -81739,7 +80720,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Manipulating Egison patterns: abstract syntax, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "egison-pattern-src-haskell-mode" = callPackage
@@ -81762,28 +80742,6 @@ self: {
      }) {};
 
   "egison-pattern-src-th-mode" = callPackage
-    ({ mkDerivation, base, egison-pattern-src, haskell-src-exts
-     , haskell-src-meta, mtl, pretty, tasty, tasty-discover, tasty-hunit
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "egison-pattern-src-th-mode";
-       version = "0.2.1.1";
-       sha256 = "110rykbxkpv9vrqvwdxm0fa73djy2g5swcxzpx61zh6cl4wk949g";
-       libraryHaskellDepends = [
-         base egison-pattern-src haskell-src-exts haskell-src-meta mtl
-         pretty template-haskell text
-       ];
-       testHaskellDepends = [
-         base egison-pattern-src haskell-src-exts mtl tasty tasty-hunit
-         template-haskell text
-       ];
-       testToolDepends = [ tasty-discover ];
-       description = "Parser and pretty printer for Egison pattern expressions to use with TH";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "egison-pattern-src-th-mode_0_2_1_2" = callPackage
     ({ mkDerivation, base, egison-pattern-src, haskell-src-exts
      , haskell-src-meta, mtl, pretty, tasty, tasty-discover, tasty-hunit
      , template-haskell, text
@@ -81803,7 +80761,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Parser and pretty printer for Egison pattern expressions to use with TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "egison-quote" = callPackage
@@ -82418,26 +81375,6 @@ self: {
      }) {};
 
   "eliminators" = callPackage
-    ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
-     , singletons, template-haskell, th-abstraction, th-desugar
-     }:
-     mkDerivation {
-       pname = "eliminators";
-       version = "0.6";
-       sha256 = "1mxjp2ygf72k3yaiqpfi4lrmhwhx69zkm5kznrb6wainw5r6h0if";
-       revision = "1";
-       editedCabalFile = "03gq3c04arywpp60n5cb6prvwn0yk7ccc5gfpbxl9vdjp5dbikkd";
-       libraryHaskellDepends = [
-         base extra singleton-nats singletons template-haskell
-         th-abstraction th-desugar
-       ];
-       testHaskellDepends = [ base hspec singleton-nats singletons ];
-       testToolDepends = [ hspec-discover ];
-       description = "Dependently typed elimination functions using singletons";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eliminators_0_7" = callPackage
     ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
      , singletons, template-haskell, th-abstraction, th-desugar
      }:
@@ -82455,7 +81392,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Dependently typed elimination functions using singletons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elision" = callPackage
@@ -85085,34 +84021,6 @@ self: {
      }) {};
 
   "esqueleto" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
-     , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql
-     , mysql-simple, persistent, persistent-mysql, persistent-postgresql
-     , persistent-sqlite, persistent-template, postgresql-libpq
-     , postgresql-simple, resourcet, tagged, text, time, transformers
-     , unliftio, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "esqueleto";
-       version = "3.3.4.0";
-       sha256 = "1w46sfh4rrj7lvsdyzwphcv8n00v6kr3padkk8v5lr0r40w5n60r";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-html bytestring conduit containers
-         monad-logger persistent resourcet tagged text time transformers
-         unliftio unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base blaze-html bytestring conduit containers
-         exceptions hspec monad-logger mtl mysql mysql-simple persistent
-         persistent-mysql persistent-postgresql persistent-sqlite
-         persistent-template postgresql-libpq postgresql-simple resourcet
-         tagged text time transformers unliftio unordered-containers vector
-       ];
-       description = "Type-safe EDSL for SQL queries on persistent backends";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "esqueleto_3_4_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
      , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql
      , mysql-simple, persistent, persistent-mysql, persistent-postgresql
@@ -85138,7 +84046,6 @@ self: {
        ];
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ess" = callPackage
@@ -85155,28 +84062,6 @@ self: {
      }) {};
 
   "essence-of-live-coding" = callPackage
-    ({ mkDerivation, base, foreign-store, QuickCheck, syb
-     , test-framework, test-framework-quickcheck2, transformers
-     , vector-sized
-     }:
-     mkDerivation {
-       pname = "essence-of-live-coding";
-       version = "0.1.0.3";
-       sha256 = "1kycm3a2rbz8shcjz8j1yl2c5pvpkr9mp3g3pgmcnhdr7wq4smlk";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base foreign-store syb transformers vector-sized
-       ];
-       executableHaskellDepends = [ base transformers ];
-       testHaskellDepends = [
-         base QuickCheck syb test-framework test-framework-quickcheck2
-       ];
-       description = "General purpose live coding framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "essence-of-live-coding_0_2_4" = callPackage
     ({ mkDerivation, base, containers, foreign-store, mtl, QuickCheck
      , syb, test-framework, test-framework-quickcheck2, time
      , transformers, vector-sized
@@ -85197,25 +84082,9 @@ self: {
        ];
        description = "General purpose live coding framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "essence-of-live-coding-gloss" = callPackage
-    ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss
-     , syb, transformers
-     }:
-     mkDerivation {
-       pname = "essence-of-live-coding-gloss";
-       version = "0.1.0.3";
-       sha256 = "0ggwh1d57isda9k5l4g7g92l77m1b9hj2vva3r0fvmnidsny41n0";
-       libraryHaskellDepends = [
-         base essence-of-live-coding foreign-store gloss syb transformers
-       ];
-       description = "General purpose live coding framework - Gloss backend";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "essence-of-live-coding-gloss_0_2_4" = callPackage
     ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss
      , syb, transformers
      }:
@@ -85228,7 +84097,6 @@ self: {
        ];
        description = "General purpose live coding framework - Gloss backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "essence-of-live-coding-gloss-example" = callPackage
@@ -85252,21 +84120,6 @@ self: {
      }) {};
 
   "essence-of-live-coding-pulse" = callPackage
-    ({ mkDerivation, base, essence-of-live-coding, foreign-store
-     , pulse-simple, transformers
-     }:
-     mkDerivation {
-       pname = "essence-of-live-coding-pulse";
-       version = "0.1.0.3";
-       sha256 = "044vjp637gaq2q2c8d83c9ixp6zg5x752ifw4nmnwigi1w53y1wq";
-       libraryHaskellDepends = [
-         base essence-of-live-coding foreign-store pulse-simple transformers
-       ];
-       description = "General purpose live coding framework - pulse backend";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "essence-of-live-coding-pulse_0_2_4" = callPackage
     ({ mkDerivation, base, essence-of-live-coding, foreign-store
      , pulse-simple, transformers
      }:
@@ -85279,7 +84132,6 @@ self: {
        ];
        description = "General purpose live coding framework - pulse backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "essence-of-live-coding-pulse-example" = callPackage
@@ -85303,22 +84155,6 @@ self: {
      }) {};
 
   "essence-of-live-coding-quickcheck" = callPackage
-    ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding
-     , QuickCheck, syb, transformers
-     }:
-     mkDerivation {
-       pname = "essence-of-live-coding-quickcheck";
-       version = "0.1.0.3";
-       sha256 = "1sp4s69jlc679yhix5smwx1n0gk8msrjmrsyca2lf59l71l3gadc";
-       libraryHaskellDepends = [
-         base boltzmann-samplers essence-of-live-coding QuickCheck syb
-         transformers
-       ];
-       description = "General purpose live coding framework - QuickCheck integration";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "essence-of-live-coding-quickcheck_0_2_4" = callPackage
     ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding
      , QuickCheck, syb, transformers
      }:
@@ -85332,7 +84168,6 @@ self: {
        ];
        description = "General purpose live coding framework - QuickCheck integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "essence-of-live-coding-warp" = callPackage
@@ -86659,7 +85494,7 @@ self: {
        broken = true;
      }) {};
 
-  "exceptions" = callPackage
+  "exceptions_0_10_4" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , transformers
@@ -86679,6 +85514,7 @@ self: {
        ];
        description = "Extensible optionally-pure exceptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exchangerates" = callPackage
@@ -87199,28 +86035,6 @@ self: {
      }) {};
 
   "exp-pairs" = callPackage
-    ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
-     , prettyprinter, QuickCheck, random, smallcheck, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "exp-pairs";
-       version = "0.2.0.0";
-       sha256 = "0ry9k89xfy2493j7yypyiqcj0v7h5x9w8gl60dy28w4597yinisp";
-       revision = "1";
-       editedCabalFile = "1fkllbgsygzm1lw3g3a9l8fg8ap74bx0x7ja8yx3lbrjjsaqh8pa";
-       libraryHaskellDepends = [
-         base containers deepseq ghc-prim prettyprinter
-       ];
-       testHaskellDepends = [
-         base matrix QuickCheck random smallcheck tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck
-       ];
-       description = "Linear programming over exponent pairs";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "exp-pairs_0_2_1_0" = callPackage
     ({ mkDerivation, base, bimap, containers, deepseq, gauge, ghc-prim
      , matrix, prettyprinter, QuickCheck, random, raw-strings-qq
      , smallcheck, tasty, tasty-hunit, tasty-quickcheck
@@ -87242,7 +86056,6 @@ self: {
        ];
        description = "Linear programming over exponent pairs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expand" = callPackage
@@ -88322,36 +87135,6 @@ self: {
      }) {inherit (pkgs.xorg) libXtst;};
 
   "fakedata" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , exceptions, filepath, gauge, hashable, hspec, hspec-discover
-     , random, template-haskell, text, time, unordered-containers
-     , vector, yaml
-     }:
-     mkDerivation {
-       pname = "fakedata";
-       version = "0.6.1";
-       sha256 = "0qqc0hq7lg1s5fpflmnalcsy0043vqd8iiblwa6lvm45h7af8ii2";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers directory exceptions filepath hashable
-         random template-haskell text time unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory exceptions filepath hashable
-         hspec hspec-discover random template-haskell text time
-         unordered-containers vector yaml
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base bytestring containers deepseq directory exceptions filepath
-         gauge hashable random template-haskell text time
-         unordered-containers vector yaml
-       ];
-       description = "Library for producing fake data";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fakedata_0_8_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
      , directory, exceptions, fakedata-parser, filepath, gauge, hashable
      , hspec, hspec-discover, random, string-random, template-haskell
@@ -88381,7 +87164,6 @@ self: {
        ];
        description = "Library for producing fake data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fakedata-parser" = callPackage
@@ -90469,22 +89251,6 @@ self: {
      }) {};
 
   "file-embed" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "file-embed";
-       version = "0.0.11.2";
-       sha256 = "0bgysf6z13cmr5lsrhzrkv33sw9x1lkfnga3la2mcakh1aa3ijm4";
-       libraryHaskellDepends = [
-         base bytestring directory filepath template-haskell
-       ];
-       testHaskellDepends = [ base filepath ];
-       description = "Use Template Haskell to embed file contents directly";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "file-embed_0_0_13_0" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath
      , template-haskell
      }:
@@ -90498,7 +89264,6 @@ self: {
        testHaskellDepends = [ base filepath ];
        description = "Use Template Haskell to embed file contents directly";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "file-embed-lzma" = callPackage
@@ -93299,27 +92064,6 @@ self: {
      }) {};
 
   "foldl" = callPackage
-    ({ mkDerivation, base, bytestring, comonad, containers
-     , contravariant, criterion, doctest, hashable, mwc-random
-     , primitive, profunctors, semigroupoids, semigroups, text
-     , transformers, unordered-containers, vector, vector-builder
-     }:
-     mkDerivation {
-       pname = "foldl";
-       version = "1.4.6";
-       sha256 = "1ah4i8w0ybdkkqsfjl990jbx16ar5q67x85qhg4l80xkkvlsl51a";
-       libraryHaskellDepends = [
-         base bytestring comonad containers contravariant hashable
-         mwc-random primitive profunctors semigroupoids semigroups text
-         transformers unordered-containers vector vector-builder
-       ];
-       testHaskellDepends = [ base doctest ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Composable, streaming, and efficient left folds";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "foldl_1_4_10" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, criterion, doctest, hashable, mwc-random
      , primitive, profunctors, semigroupoids, text, transformers
@@ -93338,7 +92082,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-exceptions" = callPackage
@@ -94701,25 +93444,6 @@ self: {
      }) {};
 
   "free" = callPackage
-    ({ mkDerivation, base, comonad, containers, distributive
-     , exceptions, mtl, profunctors, semigroupoids, template-haskell
-     , transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "free";
-       version = "5.1.3";
-       sha256 = "0b9f9jrfgkq13333px6p1faxpcypqvzi0m9dnbj2rm8s79pdcw1c";
-       revision = "1";
-       editedCabalFile = "0w0bxkdsspw1blhr01bb9n98wlmqpgjpdbbp2f50qmhapav2fk30";
-       libraryHaskellDepends = [
-         base comonad containers distributive exceptions mtl profunctors
-         semigroupoids template-haskell transformers transformers-base
-       ];
-       description = "Monads for free";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "free_5_1_4" = callPackage
     ({ mkDerivation, base, comonad, containers, distributive
      , exceptions, mtl, profunctors, semigroupoids, template-haskell
      , th-abstraction, transformers, transformers-base
@@ -94735,7 +93459,6 @@ self: {
        ];
        description = "Monads for free";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-algebras" = callPackage
@@ -96731,26 +95454,6 @@ self: {
      }) {};
 
   "fused-effects" = callPackage
-    ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn
-     , inspection-testing, markdown-unlit, tasty, tasty-hedgehog
-     , tasty-hunit, transformers
-     }:
-     mkDerivation {
-       pname = "fused-effects";
-       version = "1.0.2.2";
-       sha256 = "1n9nal5kz2gpi58jc7xspj100ibn582f8vgndc9ra84fbp380yy2";
-       libraryHaskellDepends = [ base transformers ];
-       testHaskellDepends = [
-         base containers hedgehog hedgehog-fn inspection-testing tasty
-         tasty-hedgehog tasty-hunit transformers
-       ];
-       testToolDepends = [ markdown-unlit ];
-       benchmarkHaskellDepends = [ base gauge ];
-       description = "A fast, flexible, fused effect system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fused-effects_1_1_0_0" = callPackage
     ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn
      , inspection-testing, markdown-unlit, tasty, tasty-hedgehog
      , tasty-hunit, transformers
@@ -96768,7 +95471,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge transformers ];
        description = "A fast, flexible, fused effect system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fused-effects-exceptions" = callPackage
@@ -96849,17 +95551,18 @@ self: {
      }) {};
 
   "fused-effects-readline" = callPackage
-    ({ mkDerivation, base, directory, filepath, fused-effects
-     , haskeline, prettyprinter, prettyprinter-ansi-terminal
-     , terminal-size, transformers
+    ({ mkDerivation, base, directory, exceptions, filepath
+     , fused-effects, haskeline, prettyprinter
+     , prettyprinter-ansi-terminal, terminal-size, transformers
      }:
      mkDerivation {
        pname = "fused-effects-readline";
        version = "0.1.0.1";
        sha256 = "1n1rdwrjww6hihryigk33bk9wcy69hi80c82kcbkclbmmaziz3j2";
        libraryHaskellDepends = [
-         base directory filepath fused-effects haskeline prettyprinter
-         prettyprinter-ansi-terminal terminal-size transformers
+         base directory exceptions filepath fused-effects haskeline
+         prettyprinter prettyprinter-ansi-terminal terminal-size
+         transformers
        ];
        testHaskellDepends = [ base ];
        description = "A readline-like effect and carrier for fused-effects";
@@ -98550,27 +97253,6 @@ self: {
      }) {};
 
   "generic-data" = callPackage
-    ({ mkDerivation, base, base-orphans, contravariant, criterion
-     , deepseq, doctest, generic-lens, ghc-boot-th, Glob, one-liner
-     , QuickCheck, show-combinators, tasty, tasty-hunit
-     }:
-     mkDerivation {
-       pname = "generic-data";
-       version = "0.8.3.0";
-       sha256 = "090qwd898sacn0d4ryfhbx0jdcvhy84df5f10929zng7swh88hk7";
-       libraryHaskellDepends = [
-         base base-orphans contravariant ghc-boot-th show-combinators
-       ];
-       testHaskellDepends = [
-         base doctest generic-lens Glob one-liner QuickCheck
-         show-combinators tasty tasty-hunit
-       ];
-       benchmarkHaskellDepends = [ base criterion deepseq ];
-       description = "Deriving instances with GHC.Generics and related utilities";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "generic-data_0_9_2_0" = callPackage
     ({ mkDerivation, ap-normalize, base, base-orphans, Cabal
      , cabal-doctest, contravariant, criterion, deepseq, doctest
      , generic-lens, ghc-boot-th, inspection-testing, one-liner
@@ -98594,7 +97276,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Deriving instances with GHC.Generics and related utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-data-surgery" = callPackage
@@ -99394,29 +98075,6 @@ self: {
      }) {};
 
   "genvalidity-containers" = callPackage
-    ({ mkDerivation, base, containers, criterion, genvalidity
-     , genvalidity-criterion, genvalidity-hspec, genvalidity-property
-     , hspec, QuickCheck, validity, validity-containers
-     }:
-     mkDerivation {
-       pname = "genvalidity-containers";
-       version = "0.8.0.2";
-       sha256 = "0nqxjs9nb080zlf2qys07dq1kfwwg1sg7jh0lnzl1zm9f228q701";
-       libraryHaskellDepends = [
-         base containers genvalidity QuickCheck validity validity-containers
-       ];
-       testHaskellDepends = [
-         base containers genvalidity genvalidity-hspec genvalidity-property
-         hspec validity
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion genvalidity-criterion QuickCheck
-       ];
-       description = "GenValidity support for containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-containers_0_9_0_0" = callPackage
     ({ mkDerivation, base, containers, criterion, genvalidity
      , genvalidity-criterion, genvalidity-hspec, genvalidity-property
      , hspec, QuickCheck, validity, validity-containers
@@ -99438,7 +98096,6 @@ self: {
        ];
        description = "GenValidity support for containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-criterion" = callPackage
@@ -100313,8 +98970,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-check";
-       version = "0.5.0.1";
-       sha256 = "08z7jgp2gdf1ki69w34i87g5bhrcv2laqsjma5ki97l62bgsr808";
+       version = "0.5.0.2";
+       sha256 = "1pncxn9lvwcxlgwf18yr20xbh2qxf80samf2laaxjhx09d31w8h2";
        libraryHaskellDepends = [
          base containers directory filepath ghc ghc-paths process
          safe-exceptions template-haskell transformers
@@ -100591,8 +99248,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.6.2";
-       sha256 = "1c36f7vjk3gapp761c7w1ncg9hyhx2kxwk51s0d9fvapi1bkxw9j";
+       version = "0.6.3.2";
+       sha256 = "1bzf8mafz20pn7cq2483b9w3hjrwfbb0ahbcb3y7xy5yy52qvmln";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100801,17 +99458,19 @@ self: {
 
   "ghc-lib-parser-ex" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, extra
-     , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate
+     , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
+     , uniplate
      }:
      mkDerivation {
        pname = "ghc-lib-parser-ex";
        version = "8.10.0.16";
        sha256 = "1kqff62ml38hxwfnfq7ni0z65b3d3l7xqa5c5lxf3kzm9h7bdwb8";
        libraryHaskellDepends = [
-         base bytestring containers ghc-lib-parser uniplate
+         base bytestring containers ghc ghc-boot ghc-boot-th uniplate
        ];
        testHaskellDepends = [
-         base directory extra filepath ghc-lib-parser tasty tasty-hunit
+         base directory extra filepath ghc ghc-boot ghc-boot-th tasty
+         tasty-hunit
        ];
        description = "Algorithms on GHC parse trees";
        license = stdenv.lib.licenses.bsd3;
@@ -101372,29 +100031,6 @@ self: {
      }) {};
 
   "ghc-typelits-extra" = callPackage
-    ({ mkDerivation, base, containers, ghc, ghc-prim
-     , ghc-tcplugins-extra, ghc-typelits-knownnat
-     , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
-     , transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-extra";
-       version = "0.4";
-       sha256 = "0511vpwn8hz1hvn58g49l95iqcgqr8l8bqy5qwijy2bzad2nhcbg";
-       libraryHaskellDepends = [
-         base containers 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
-       ];
-       description = "Additional type-level operations on GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-extra_0_4_1" = callPackage
     ({ mkDerivation, base, containers, ghc, ghc-prim
      , ghc-tcplugins-extra, ghc-typelits-knownnat
      , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
@@ -101415,7 +100051,6 @@ self: {
        ];
        description = "Additional type-level operations on GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
@@ -102125,25 +100760,6 @@ self: {
      }) {};
 
   "gi-atk" = callPackage
-    ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-atk";
-       version = "2.0.21";
-       sha256 = "0npcz82l5ssbrgzr99a94nlirmfdy9z5p2k0nrk7357bawpiv7sk";
-       setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ atk ];
-       description = "Atk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) atk;};
-
-  "gi-atk_2_0_22" = callPackage
     ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
      , text, transformers
@@ -102160,33 +100776,9 @@ self: {
        libraryPkgconfigDepends = [ atk ];
        description = "Atk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {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.23";
-       sha256 = "1y479ll6pzf5qjf18ziqgvfi6zq4jyajkq9zlggmh9pjhxpwj8nh";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ cairo ];
-       preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
-       '';
-       description = "Cairo bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) cairo;};
-
-  "gi-cairo_1_0_24" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -102207,7 +100799,6 @@ self: {
        '';
        description = "Cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo;};
 
   "gi-cairo-again" = callPackage
@@ -102228,23 +100819,6 @@ self: {
      }) {};
 
   "gi-cairo-connector" = callPackage
-    ({ mkDerivation, base, gi-cairo, gi-cairo-render, haskell-gi-base
-     , mtl
-     }:
-     mkDerivation {
-       pname = "gi-cairo-connector";
-       version = "0.0.1";
-       sha256 = "0lhaki2qjk8f6bn78sag4g38g549sjzbjbah27j2i46xj7j08png";
-       libraryHaskellDepends = [
-         base gi-cairo gi-cairo-render haskell-gi-base mtl
-       ];
-       description = "GI friendly Binding to the Cairo library";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "gi-cairo-connector_0_1_0" = callPackage
     ({ mkDerivation, base, gi-cairo, gi-cairo-render, haskell-gi-base
      , mtl
      }:
@@ -102262,27 +100836,6 @@ self: {
      }) {};
 
   "gi-cairo-render" = callPackage
-    ({ mkDerivation, array, base, bytestring, c2hs, cairo
-     , haskell-gi-base, mtl, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "gi-cairo-render";
-       version = "0.0.1";
-       sha256 = "0arbynn7ilrc3shddff1rxcvlg6k3m617lrq4fdsqfas3amxarm4";
-       revision = "1";
-       editedCabalFile = "10lpmb8js19zfgnph31yz4nzyv7kbqvq1lx07w12q702khqcqb7z";
-       libraryHaskellDepends = [
-         array base bytestring haskell-gi-base mtl text utf8-string
-       ];
-       libraryPkgconfigDepends = [ cairo ];
-       libraryToolDepends = [ c2hs ];
-       description = "GI friendly Binding to the Cairo library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {inherit (pkgs) cairo;};
-
-  "gi-cairo-render_0_1_0" = callPackage
     ({ mkDerivation, array, base, bytestring, c2hs, cairo
      , haskell-gi-base, mtl, text, utf8-string
      }:
@@ -102302,27 +100855,6 @@ self: {
      }) {inherit (pkgs) cairo;};
 
   "gi-dbusmenu" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
-     , libdbusmenu, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-dbusmenu";
-       version = "0.4.7";
-       sha256 = "0av2628vylmkk566f2zbzbwygni4rawrk14yamc6m9s9rsw2scf9";
-       setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ libdbusmenu ];
-       description = "Dbusmenu bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {inherit (pkgs) libdbusmenu;};
-
-  "gi-dbusmenu_0_4_8" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
      , libdbusmenu, text, transformers
@@ -102344,32 +100876,6 @@ self: {
      }) {inherit (pkgs) libdbusmenu;};
 
   "gi-dbusmenugtk3" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
-     , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk
-     , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading
-     , libdbusmenu-gtk3, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-dbusmenugtk3";
-       version = "0.4.8";
-       sha256 = "0ncn2i0bvsqsi785bjhdxr77hyxsp2dm26ihn7nxbvdkvn0mafhz";
-       setupHaskellDepends = [
-         base Cabal gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib
-         gi-gobject gi-gtk 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 = [ gtk3 libdbusmenu-gtk3 ];
-       description = "DbusmenuGtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
-
-  "gi-dbusmenugtk3_0_4_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk
      , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading
@@ -102396,30 +100902,6 @@ self: {
      }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
 
   "gi-gdk" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
-     , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-gdk";
-       version = "3.0.22";
-       sha256 = "0a6qkikk31n5qc85zp8l8kcaf0804c52gp02hban3c8a9rbq1lgr";
-       setupHaskellDepends = [
-         base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango
-         haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
-         gi-gobject gi-pango haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ gtk3 ];
-       description = "Gdk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gtk3;};
-
-  "gi-gdk_3_0_23" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
@@ -102441,7 +100923,6 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Gdk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gtk3;};
 
   "gi-gdk_4_0_2" = callPackage
@@ -102470,27 +100951,6 @@ self: {
      }) {gtk4 = null;};
 
   "gi-gdkpixbuf" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
-     , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gdkpixbuf";
-       version = "2.0.23";
-       sha256 = "0jphrxqdbls3l73is1k93fizghbxgkf14q57l4w3m559vgk34anp";
-       setupHaskellDepends = [
-         base Cabal gi-gio gi-glib gi-gobject haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ gdk-pixbuf ];
-       description = "GdkPixbuf bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gdk-pixbuf;};
-
-  "gi-gdkpixbuf_2_0_24" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
@@ -102509,7 +100969,6 @@ self: {
        libraryPkgconfigDepends = [ gdk-pixbuf ];
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gdk-pixbuf;};
 
   "gi-gdkx11" = callPackage
@@ -102519,8 +100978,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdkx11";
-       version = "3.0.9";
-       sha256 = "0z3vwwpv8a85nvg2bc4cdaa8w4jmdl5mm5bxfpwmssyxcnm1xdnc";
+       version = "3.0.10";
+       sha256 = "0kfn4l5jqhllz514zw5cxf7181ybb5c11r680nwhr99b97yy0q9f";
        setupHaskellDepends = [
          base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi
        ];
@@ -102582,25 +101041,6 @@ self: {
      }) {inherit (pkgs) libgit2-glib;};
 
   "gi-gio" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, glib, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gio";
-       version = "2.0.26";
-       sha256 = "0a75azw25aww3pbhmjpvqn2w3qr430c4s8kk70xf87af0nlv21sp";
-       setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       description = "Gio bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-gio_2_0_27" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
@@ -102617,7 +101057,6 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "Gio bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-girepository" = callPackage
@@ -102640,25 +101079,6 @@ self: {
      }) {inherit (pkgs) gobject-introspection;};
 
   "gi-glib" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, glib
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-glib";
-       version = "2.0.23";
-       sha256 = "1wsix558lj58i8mdwikb2q78941dxl3pchhd75xkk5hq8rknp37x";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       description = "GLib bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-glib_2_0_24" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -102675,29 +101095,9 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "GLib bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-gobject";
-       version = "2.0.22";
-       sha256 = "0c1ia60793dly5y5xd2s1qs5a37f0r3jypzc21r0yswgqdlsi7g6";
-       setupHaskellDepends = [ base Cabal gi-glib haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       description = "GObject bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-gobject_2_0_24" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -102714,31 +101114,9 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-graphene" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-graphene";
-       version = "1.0.1";
-       sha256 = "04aiq9zqjxaky48j57nakx0alhc9j1g6ydki7fww7r4jajmf6pjv";
-       setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ graphene-gobject ];
-       description = "Graphene bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {graphene-gobject = null;};
-
-  "gi-graphene_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
@@ -102916,30 +101294,6 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
-  "gi-gtk" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
-     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
-     , gi-pango, gtk3, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gtk";
-       version = "3.0.33";
-       sha256 = "03fvazdkg1m9svp39bn4gz7cfy23pp01yfcf6ambkdrq9msqsjak";
-       setupHaskellDepends = [
-         base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib
-         gi-gobject gi-pango haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ gtk3 ];
-       description = "Gtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gtk3;};
-
   "gi-gtk_3_0_35" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
@@ -102965,6 +101319,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gtk3;};
 
+  "gi-gtk" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
+     , gi-pango, gtk3, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gtk";
+       version = "3.0.36";
+       sha256 = "0bzb3xrax5k5r5fd6vv4by6hprmk77qrqr9mqn3dxqm6an8jwjn9";
+       setupHaskellDepends = [
+         base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib
+         gi-gobject gi-pango haskell-gi
+       ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
+         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       description = "Gtk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) gtk3;};
+
   "gi-gtk_4_0_2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
@@ -103037,25 +101415,6 @@ self: {
      }) {};
 
   "gi-gtk-hs" = callPackage
-    ({ mkDerivation, base, base-compat, containers, gi-gdk
-     , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gtk-hs";
-       version = "0.3.8.1";
-       sha256 = "05j26w01izxwjq2jg2nds20p6vgd5b974b07cr0m7w6hhm4v51hk";
-       libraryHaskellDepends = [
-         base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
-         gi-gtk haskell-gi-base mtl text transformers
-       ];
-       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;
-       broken = true;
-     }) {};
-
-  "gi-gtk-hs_0_3_9" = callPackage
     ({ mkDerivation, base, base-compat, containers, gi-gdk
      , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
      , text, transformers
@@ -103277,29 +101636,6 @@ self: {
      }) {inherit (pkgs) ostree;};
 
   "gi-pango" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, pango, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-pango";
-       version = "1.0.22";
-       sha256 = "09dz13wai7cyp24vhc6wxyyg2g89dsqq40r80j56xgpyvfki8yf2";
-       setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ cairo pango ];
-       preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
-       '';
-       description = "Pango bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
-
-  "gi-pango_1_0_23" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-glib, gi-gobject, gi-harfbuzz, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, pango, text, transformers
@@ -103322,7 +101658,6 @@ self: {
        '';
        description = "Pango bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
   "gi-pangocairo" = callPackage
@@ -103539,27 +101874,6 @@ self: {
      }) {inherit (pkgs) libwnck;};
 
   "gi-xlib" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
-     , haskell-gi-base, haskell-gi-overloading, text, transformers
-     , xlibsWrapper
-     }:
-     mkDerivation {
-       pname = "gi-xlib";
-       version = "2.0.8";
-       sha256 = "0gixgql24zx04sph7kn4n5gmgmz5xbw2f15mqfw0i5igad2pvsj3";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ xlibsWrapper ];
-       description = "xlib bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {inherit (pkgs) xlibsWrapper;};
-
-  "gi-xlib_2_0_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, text, transformers
      , xlibsWrapper
@@ -104351,25 +102665,6 @@ self: {
      }) {};
 
   "githash" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, hspec
-     , process, template-haskell, temporary, unliftio
-     }:
-     mkDerivation {
-       pname = "githash";
-       version = "0.1.4.0";
-       sha256 = "0rsz230srhszwybg5a40vhzzp9z0r4yvdz4xg2hwwwphmbi8pfy3";
-       libraryHaskellDepends = [
-         base bytestring directory filepath process template-haskell
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath hspec process template-haskell
-         temporary unliftio
-       ];
-       description = "Compile git revision info into Haskell projects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "githash_0_1_5_0" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, hspec
      , process, template-haskell, temporary, unliftio
      }:
@@ -104386,7 +102681,6 @@ self: {
        ];
        description = "Compile git revision info into Haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github" = callPackage
@@ -104492,6 +102786,28 @@ self: {
      }) {};
 
   "github-release" = callPackage
+    ({ mkDerivation, aeson, base, burrito, bytestring, http-client
+     , http-client-tls, http-types, mime-types, optparse-generic, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "github-release";
+       version = "1.3.3";
+       sha256 = "15im4vsz04sx0iq83xmvk5ak4p7rj33jawk5lxkmv1ajwvklbpk7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base burrito bytestring http-client http-client-tls
+         http-types mime-types optparse-generic text unordered-containers
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Upload files to GitHub releases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "github-release_1_3_5" = callPackage
     ({ mkDerivation, aeson, base, burrito, bytestring, http-client
      , http-client-tls, http-types, mime-types, optparse-generic, text
      , unordered-containers
@@ -104753,22 +103069,6 @@ self: {
      }) {};
 
   "gitlab-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, connection, http-conduit
-     , http-types, text, time, transformers, unliftio, unliftio-core
-     }:
-     mkDerivation {
-       pname = "gitlab-haskell";
-       version = "0.1.8";
-       sha256 = "13s2vpxvcm000b817p9w8v05frdmsq9xjm9g6i07v97vrgpch1mv";
-       libraryHaskellDepends = [
-         aeson base bytestring connection http-conduit http-types text time
-         transformers unliftio unliftio-core
-       ];
-       description = "A Haskell library for the GitLab web API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "gitlab-haskell_0_2_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, connection, http-conduit
      , http-types, tasty, tasty-hunit, text, time, transformers
      , unliftio, unliftio-core
@@ -104785,7 +103085,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
        description = "A Haskell library for the GitLab web API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib" = callPackage
@@ -105597,21 +103896,6 @@ self: {
      }) {};
 
   "gloss" = callPackage
-    ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
-     , gloss-rendering, GLUT, OpenGL
-     }:
-     mkDerivation {
-       pname = "gloss";
-       version = "1.13.1.2";
-       sha256 = "0jyvjpd1gzzb9aiw5708822p8qyw14jj6j19gby9q9wjbpd4sd4d";
-       libraryHaskellDepends = [
-         base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
-       ];
-       description = "Painless 2D vector graphics, animations and simulations";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gloss_1_13_2_1" = callPackage
     ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
      , gloss-rendering, GLUT, OpenGL
      }:
@@ -105624,7 +103908,6 @@ self: {
        ];
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-accelerate" = callPackage
@@ -111170,17 +109453,6 @@ self: {
      }) {};
 
   "groups" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "groups";
-       version = "0.4.1.0";
-       sha256 = "0ggkygkyxw5ga4cza82bjvdraavl294k0h6b62d2px7z3nvqhifx";
-       libraryHaskellDepends = [ base ];
-       description = "Haskell 98 groups";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groups_0_5" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "groups";
@@ -111189,7 +109461,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Groups";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groups-generic" = callPackage
@@ -112527,56 +110798,6 @@ self: {
      }) {};
 
   "hOpenPGP" = callPackage
-    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
-     , base16-bytestring, bifunctors, binary, binary-conduit, bytestring
-     , bz2, 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.9.4";
-       sha256 = "15895a6vqaz69za63hxkbn01sji91hlsqiyg3lbzwi1qfvl3b98b";
-       libraryHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
-         binary binary-conduit bytestring bz2 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 bz2 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 bifunctors binary binary-conduit
-         bytestring bz2 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
-       ];
-       description = "native Haskell implementation of OpenPGP (RFC4880)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hOpenPGP_2_9_5" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
      , base16-bytestring, bifunctors, binary, binary-conduit, bytestring
      , bz2, conduit, conduit-extra, containers, criterion
@@ -113974,30 +112195,6 @@ self: {
      }) {};
 
   "haddock-library" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
-     , directory, filepath, hspec, hspec-discover, optparse-applicative
-     , parsec, QuickCheck, text, transformers, tree-diff
-     }:
-     mkDerivation {
-       pname = "haddock-library";
-       version = "1.8.0";
-       sha256 = "15xpv29yh3kb9qq9gmws2l8m64i7phvf47y08vxc2j55101sg4vh";
-       revision = "1";
-       editedCabalFile = "09v6lq3ncf3ax7b6n36vhsflm488x0qc8sgc3w17m09x1jl48d99";
-       libraryHaskellDepends = [
-         base bytestring containers parsec text transformers
-       ];
-       testHaskellDepends = [
-         base base-compat bytestring containers deepseq directory filepath
-         hspec optparse-applicative parsec QuickCheck text transformers
-         tree-diff
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "haddock-library_1_9_0" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
      , directory, filepath, hspec, hspec-discover, optparse-applicative
      , parsec, QuickCheck, text, transformers, tree-diff
@@ -114017,7 +112214,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haddock-test" = callPackage
@@ -114566,45 +112762,6 @@ self: {
      }) {};
 
   "hakyll" = callPackage
-    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
-     , containers, cryptonite, data-default, deepseq, directory
-     , file-embed, filepath, fsnotify, http-conduit, http-types
-     , lrucache, memory, mtl, network-uri, optparse-applicative, pandoc
-     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
-     , resourcet, scientific, tagsoup, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, time
-     , time-locale-compat, unordered-containers, utillinux, vector, wai
-     , wai-app-static, warp, yaml
-     }:
-     mkDerivation {
-       pname = "hakyll";
-       version = "4.13.4.0";
-       sha256 = "0gcs79jmpayndfsmmb40avrgyl4f0f1brprm2l0mvybfah84h2m3";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring containers
-         cryptonite data-default deepseq directory file-embed filepath
-         fsnotify http-conduit http-types lrucache memory mtl network-uri
-         optparse-applicative pandoc pandoc-citeproc parsec process random
-         regex-tdfa resourcet scientific tagsoup template-haskell 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;
-       broken = true;
-     }) {inherit (pkgs) utillinux;};
-
-  "hakyll_4_13_4_1" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , containers, cryptonite, data-default, deepseq, directory
      , file-embed, filepath, fsnotify, http-conduit, http-types
@@ -116413,34 +114570,6 @@ self: {
      }) {};
 
   "happstack-server" = callPackage
-    ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
-     , containers, directory, exceptions, extensible-exceptions
-     , filepath, hslogger, html, HUnit, monad-control, mtl, network
-     , network-bsd, network-uri, old-locale, parsec, process, semigroups
-     , sendfile, syb, system-filepath, text, threads, time, transformers
-     , transformers-base, transformers-compat, unix, utf8-string, xhtml
-     , zlib
-     }:
-     mkDerivation {
-       pname = "happstack-server";
-       version = "7.6.1";
-       sha256 = "0l4vfw7jslsjgm2mszlwxlm2mql6ppim2blhwpwd23r7hw8kx5xx";
-       libraryHaskellDepends = [
-         base base64-bytestring blaze-html bytestring containers directory
-         exceptions extensible-exceptions filepath hslogger html
-         monad-control mtl network network-bsd network-uri old-locale parsec
-         process semigroups sendfile syb system-filepath text threads time
-         transformers transformers-base transformers-compat unix utf8-string
-         xhtml zlib
-       ];
-       testHaskellDepends = [
-         base bytestring containers HUnit parsec zlib
-       ];
-       description = "Web related tools and services";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "happstack-server_7_7_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
      , containers, directory, exceptions, extensible-exceptions
      , filepath, hslogger, html, HUnit, monad-control, mtl, network
@@ -116466,7 +114595,6 @@ self: {
        ];
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-server-tls" = callPackage
@@ -116634,21 +114762,6 @@ self: {
      }) {};
 
   "happy" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, process }:
-     mkDerivation {
-       pname = "happy";
-       version = "1.19.12";
-       sha256 = "03xlmq6qmdx4zvzw8bp33kd9g7yvcq5cz4wg50xilw812kj276pv";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [ array base containers mtl ];
-       testHaskellDepends = [ base process ];
-       description = "Happy is a parser generator for Haskell";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "happy_1_20_0" = callPackage
     ({ mkDerivation, array, base, containers, mtl, process }:
      mkDerivation {
        pname = "happy";
@@ -116661,7 +114774,6 @@ self: {
        testHaskellDepends = [ base process ];
        description = "Happy is a parser generator for Haskell";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happy-dot" = callPackage
@@ -118462,27 +116574,6 @@ self: {
      }) {};
 
   "haskell-gi" = callPackage
-    ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal
-     , containers, directory, doctest, filepath, glib
-     , gobject-introspection, haskell-gi-base, mtl, pretty-show, process
-     , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit
-     }:
-     mkDerivation {
-       pname = "haskell-gi";
-       version = "0.23.1";
-       sha256 = "1jvl9b229b43pcnp9fadkls7ym9laqyjcdzwxzdc4j2mpchysva8";
-       libraryHaskellDepends = [
-         ansi-terminal 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 gobject-introspection ];
-       testHaskellDepends = [ attoparsec base doctest process ];
-       description = "Generate Haskell bindings for GObject Introspection capable libraries";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
-
-  "haskell-gi_0_24_5" = callPackage
     ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal
      , cabal-doctest, containers, directory, doctest, filepath, glib
      , gobject-introspection, haskell-gi-base, mtl, pretty-show, process
@@ -118502,22 +116593,9 @@ self: {
        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) gobject-introspection;};
 
   "haskell-gi-base" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib, text }:
-     mkDerivation {
-       pname = "haskell-gi-base";
-       version = "0.23.0";
-       sha256 = "1f22d4pvmyy52w9hqa36b6psw34j562rayqgk052ng1ax9yvwzn0";
-       libraryHaskellDepends = [ base bytestring containers text ];
-       libraryPkgconfigDepends = [ glib ];
-       description = "Foundation for libraries generated by haskell-gi";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "haskell-gi-base_0_24_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
@@ -118527,7 +116605,6 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "Foundation for libraries generated by haskell-gi";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "haskell-gi-overloading_0_0" = callPackage
@@ -120791,36 +118868,6 @@ self: {
      }) {};
 
   "haskoin-core" = callPackage
-    ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
-     , cereal, conduit, containers, cryptonite, deepseq, entropy
-     , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3
-     , network, QuickCheck, safe, scientific, secp256k1-haskell, split
-     , string-conversions, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "haskoin-core";
-       version = "0.13.4";
-       sha256 = "0bxn1jfb2s308gpdiwwnvar606qc3fqnvf6k0hdz2x43pqkc15lb";
-       libraryHaskellDepends = [
-         aeson array base base16-bytestring bytestring cereal conduit
-         containers cryptonite deepseq entropy hashable memory mtl murmur3
-         network safe scientific secp256k1-haskell split string-conversions
-         text time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson array base base16-bytestring bytestring cereal conduit
-         containers cryptonite deepseq entropy hashable hspec HUnit memory
-         mtl murmur3 network QuickCheck safe scientific secp256k1-haskell
-         split string-conversions text time transformers
-         unordered-containers vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Bitcoin & Bitcoin Cash library for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "haskoin-core_0_17_1" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
      , cereal, conduit, containers, cryptonite, deepseq, entropy
      , hashable, hspec, hspec-discover, HUnit, lens, lens-aeson, memory
@@ -120849,7 +118896,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bitcoin & Bitcoin Cash library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-crypto" = callPackage
@@ -120877,38 +118923,6 @@ self: {
      }) {};
 
   "haskoin-node" = callPackage
-    ({ mkDerivation, base, base64, bytestring, cereal, conduit
-     , conduit-extra, containers, data-default, hashable, haskoin-core
-     , hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe
-     , random, resourcet, rocksdb-haskell, rocksdb-query, safe
-     , string-conversions, text, time, transformers, unliftio
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "haskoin-node";
-       version = "0.13.0";
-       sha256 = "0s6l25n9w4g5r2xafb6x1gdqaghfmrnzh9i3nn64c3g26xzk3vnp";
-       libraryHaskellDepends = [
-         base bytestring cereal conduit conduit-extra containers
-         data-default hashable haskoin-core monad-logger mtl network nqe
-         random resourcet rocksdb-haskell rocksdb-query string-conversions
-         text time transformers unliftio unordered-containers
-       ];
-       testHaskellDepends = [
-         base base64 bytestring cereal conduit conduit-extra containers
-         data-default hashable haskoin-core hspec HUnit monad-logger mtl
-         network nqe random resourcet rocksdb-haskell rocksdb-query safe
-         string-conversions text time transformers unliftio
-         unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "haskoin-node_0_17_0" = callPackage
     ({ mkDerivation, base, base64, bytestring, cereal, conduit
      , conduit-extra, containers, data-default, hashable, haskoin-core
      , hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe
@@ -121897,34 +119911,6 @@ self: {
      }) {inherit (pkgs) aspell;};
 
   "hasql" = callPackage
-    ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
-     , bytestring-strict-builder, contravariant, contravariant-extras
-     , criterion, dlist, hashable, hashtables, loch-th, mtl
-     , placeholders, postgresql-binary, postgresql-libpq, profunctors
-     , QuickCheck, quickcheck-instances, rebase, rerebase, tasty
-     , tasty-hunit, tasty-quickcheck, text, text-builder, transformers
-     , vector
-     }:
-     mkDerivation {
-       pname = "hasql";
-       version = "1.4.3";
-       sha256 = "1g9xm2md7zaja3kka6jdgdkjnp1vj96b7hjgymvjcd0dp59kkd2q";
-       libraryHaskellDepends = [
-         attoparsec base base-prelude bytestring bytestring-strict-builder
-         contravariant contravariant-extras dlist hashable hashtables
-         loch-th mtl placeholders postgresql-binary postgresql-libpq
-         profunctors text text-builder transformers vector
-       ];
-       testHaskellDepends = [
-         bug QuickCheck quickcheck-instances rebase rerebase tasty
-         tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ bug criterion rerebase ];
-       description = "An efficient PostgreSQL driver with a flexible mapping API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hasql_1_4_4_2" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
      , bytestring-strict-builder, contravariant, contravariant-extras
      , criterion, dlist, hashable, hashtables, loch-th, mtl
@@ -121950,7 +119936,6 @@ self: {
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "An efficient PostgreSQL driver with a flexible mapping API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-backend" = callPackage
@@ -124095,30 +122080,6 @@ self: {
      }) {};
 
   "headroom" = callPackage
-    ({ mkDerivation, aeson, base, doctest, either, file-embed, hspec
-     , mustache, optparse-applicative, pcre-light, QuickCheck, rio, time
-     , yaml
-     }:
-     mkDerivation {
-       pname = "headroom";
-       version = "0.2.2.1";
-       sha256 = "02s1s6v0fsn5a2anpi91za3dqafcp50lckr4xpir270l66lzdc2g";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base either file-embed mustache optparse-applicative
-         pcre-light rio time yaml
-       ];
-       executableHaskellDepends = [ base optparse-applicative rio ];
-       testHaskellDepends = [
-         aeson base doctest hspec optparse-applicative pcre-light QuickCheck
-         rio
-       ];
-       description = "License Header Manager";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "headroom_0_3_1_0" = callPackage
     ({ mkDerivation, aeson, base, data-default-class, doctest, either
      , file-embed, hspec, microlens, microlens-th, mustache
      , optparse-applicative, pcre-heavy, pcre-light, QuickCheck, rio
@@ -124142,7 +122103,6 @@ self: {
        ];
        description = "License Header Manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heap" = callPackage
@@ -127298,34 +125258,6 @@ self: {
      }) {};
 
   "hie-bios" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , conduit, conduit-extra, containers, cryptohash-sha1, deepseq
-     , directory, extra, file-embed, filepath, ghc, hslogger, process
-     , tasty, tasty-hunit, temporary, text, time, transformers
-     , unix-compat, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "hie-bios";
-       version = "0.5.1";
-       sha256 = "0b6kll3w8g0nb1ijz8kw39dmiksyaq30nk5b5gmdgjdycz5hp9vm";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring conduit conduit-extra
-         containers cryptohash-sha1 deepseq directory extra file-embed
-         filepath ghc hslogger process temporary text time transformers
-         unix-compat unordered-containers vector yaml
-       ];
-       executableHaskellDepends = [ base directory filepath ghc ];
-       testHaskellDepends = [
-         base directory extra filepath ghc tasty tasty-hunit text
-         unordered-containers yaml
-       ];
-       description = "Set up a GHC API session";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hie-bios_0_7_1" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , conduit, conduit-extra, containers, cryptohash-sha1, deepseq
      , directory, extra, file-embed, filepath, ghc, hslogger
@@ -127355,7 +125287,6 @@ self: {
        ];
        description = "Set up a GHC API session";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hie-compat" = callPackage
@@ -127601,27 +125532,6 @@ self: {
      }) {};
 
   "higher-leveldb" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, data-default, exceptions
-     , hspec, leveldb-haskell, mtl, process, resourcet, transformers
-     , transformers-base, unliftio, unliftio-core
-     }:
-     mkDerivation {
-       pname = "higher-leveldb";
-       version = "0.5.0.2";
-       sha256 = "1wmgz2aqz0vg0fnnigpg27gnzs9i6slyn6lb41myv6m20j0j5z1a";
-       libraryHaskellDepends = [
-         base bytestring cereal data-default exceptions leveldb-haskell mtl
-         resourcet transformers transformers-base unliftio-core
-       ];
-       testHaskellDepends = [
-         base bytestring cereal hspec leveldb-haskell mtl process resourcet
-         transformers transformers-base unliftio
-       ];
-       description = "A rich monadic API for working with leveldb databases";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "higher-leveldb_0_6_0_0" = callPackage
     ({ mkDerivation, base, bytestring, cereal, data-default, exceptions
      , hspec, leveldb-haskell, mtl, process, resourcet, transformers
      , transformers-base, unliftio, unliftio-core
@@ -127642,7 +125552,6 @@ self: {
        ];
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "higherorder" = callPackage
@@ -128080,20 +125989,6 @@ self: {
      }) {};
 
   "hinotify" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, directory
-     , unix
-     }:
-     mkDerivation {
-       pname = "hinotify";
-       version = "0.4";
-       sha256 = "1x1lm685ws2q0z0ibwq6x3l72xh67mj06s36xiga3al48d92q63x";
-       libraryHaskellDepends = [ async base bytestring containers unix ];
-       testHaskellDepends = [ base bytestring directory unix ];
-       description = "Haskell binding to inotify";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hinotify_0_4_1" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , unix
      }:
@@ -128105,7 +126000,6 @@ self: {
        testHaskellDepends = [ base bytestring directory unix ];
        description = "Haskell binding to inotify";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinotify-bytestring" = callPackage
@@ -129533,9 +127427,9 @@ self: {
   "hlint" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
      , containers, cpphs, data-default, directory, extra, file-embed
-     , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex
-     , hscolour, process, refact, text, transformers, uniplate
-     , unordered-containers, utf8-string, vector, yaml
+     , filepath, filepattern, ghc, ghc-boot, ghc-boot-th
+     , ghc-lib-parser-ex, hscolour, process, refact, text, transformers
+     , uniplate, unordered-containers, utf8-string, vector, yaml
      }:
      mkDerivation {
        pname = "hlint";
@@ -129546,8 +127440,8 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring cmdargs containers cpphs
-         data-default directory extra file-embed filepath filepattern
-         ghc-lib-parser ghc-lib-parser-ex hscolour process refact text
+         data-default directory extra file-embed filepath filepattern ghc
+         ghc-boot ghc-boot-th ghc-lib-parser-ex hscolour process refact text
          transformers uniplate unordered-containers utf8-string vector yaml
        ];
        executableHaskellDepends = [ base ];
@@ -130442,13 +128336,13 @@ self: {
     ({ mkDerivation, aeson, array, base, base16-bytestring, binary
      , bytestring, comonad, containers, criterion, data-fix, deepseq
      , deriving-compat, Diff, directory, exceptions, filepath, free
-     , gitrev, Glob, hashable, hashing, hedgehog, hnix-store-core
-     , http-client, http-client-tls, http-types, lens-family
-     , lens-family-core, lens-family-th, logict, megaparsec
+     , gitrev, Glob, hashable, hashing, haskeline, hedgehog
+     , hnix-store-core, http-client, http-client-tls, http-types
+     , lens-family, lens-family-core, lens-family-th, logict, megaparsec
      , monad-control, monadlist, mtl, neat-interpolation
      , optparse-applicative, parser-combinators, pretty-show
-     , prettyprinter, process, ref-tf, regex-tdfa, scientific, semialign
-     , semialign-indexed, serialise, some, split, syb, tasty
+     , prettyprinter, process, ref-tf, regex-tdfa, repline, scientific
+     , semialign, semialign-indexed, serialise, some, split, syb, tasty
      , tasty-hedgehog, tasty-hunit, tasty-th, template-haskell, text
      , these, time, transformers, transformers-base, unix
      , unordered-containers, vector, xml
@@ -130471,6 +128365,12 @@ self: {
          template-haskell text these time transformers transformers-base
          unix unordered-containers vector xml
        ];
+       executableHaskellDepends = [
+         aeson base base16-bytestring bytestring comonad containers data-fix
+         deepseq exceptions filepath free haskeline mtl optparse-applicative
+         pretty-show prettyprinter ref-tf repline serialise template-haskell
+         text time transformers unordered-containers
+       ];
        testHaskellDepends = [
          base base16-bytestring bytestring containers data-fix deepseq Diff
          directory exceptions filepath Glob hedgehog megaparsec mtl
@@ -130664,26 +128564,6 @@ self: {
      }) {};
 
   "hoauth2" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, exceptions
-     , http-conduit, http-types, microlens, text, unordered-containers
-     , uri-bytestring, uri-bytestring-aeson
-     }:
-     mkDerivation {
-       pname = "hoauth2";
-       version = "1.14.0";
-       sha256 = "0szcg4bvzs8djmq5k47czyk7hv9nassahd0ngd127hcab5afmbxk";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base binary bytestring exceptions http-conduit http-types
-         microlens text unordered-containers uri-bytestring
-         uri-bytestring-aeson
-       ];
-       description = "Haskell OAuth2 authentication client";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hoauth2_1_16_0" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, exceptions
      , http-conduit, http-types, microlens, text, unordered-containers
      , uri-bytestring, uri-bytestring-aeson
@@ -130701,7 +128581,6 @@ self: {
        ];
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hob" = callPackage
@@ -131784,40 +129663,6 @@ self: {
      }) {OpenCL = null;};
 
   "hopenpgp-tools" = callPackage
-    ({ mkDerivation, aeson, alex, array, attoparsec, base
-     , base16-bytestring, binary, binary-conduit, bytestring, conduit
-     , conduit-extra, containers, crypto-pubkey, cryptohash, cryptonite
-     , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client
-     , http-client-tls, http-types, ixset-typed, lens, monad-loops, mtl
-     , openpgp-asciiarmor, optparse-applicative, prettyprinter
-     , prettyprinter-ansi-terminal, prettyprinter-convert-ansi-wl-pprint
-     , resourcet, text, time, time-locale-compat, transformers
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "hopenpgp-tools";
-       version = "0.23.1";
-       sha256 = "0jq1if7c78758fnsb6wxsky0jn9mhmzwhb5jpyrpigx08diwd2mj";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson array attoparsec base base16-bytestring binary binary-conduit
-         bytestring conduit conduit-extra containers crypto-pubkey
-         cryptohash cryptonite directory errors fgl graphviz hOpenPGP
-         http-client http-client-tls http-types ixset-typed lens monad-loops
-         mtl openpgp-asciiarmor optparse-applicative prettyprinter
-         prettyprinter-ansi-terminal prettyprinter-convert-ansi-wl-pprint
-         resourcet text time time-locale-compat transformers
-         unordered-containers vector yaml
-       ];
-       executableToolDepends = [ alex happy ];
-       description = "hOpenPGP-based command-line tools";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hopenpgp-tools_0_23_3" = callPackage
     ({ mkDerivation, aeson, alex, array, base, base16-bytestring
      , binary, binary-conduit, bytestring, conduit, conduit-extra
      , containers, cryptonite, directory, errors, fgl, graphviz, happy
@@ -132098,23 +129943,6 @@ self: {
      }) {};
 
   "hosc" = callPackage
-    ({ mkDerivation, base, binary, blaze-builder, bytestring
-     , data-binary-ieee754, network, time, transformers
-     }:
-     mkDerivation {
-       pname = "hosc";
-       version = "0.17";
-       sha256 = "0340lldzim02ixj4n0smfwn20y5i0z7v0gqgbb0mdjs6c90rqhv6";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base binary blaze-builder bytestring data-binary-ieee754 network
-         time transformers
-       ];
-       description = "Haskell Open Sound Control";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "hosc_0_18_1" = callPackage
     ({ mkDerivation, base, binary, blaze-builder, bytestring
      , data-binary-ieee754, network, time, transformers
      }:
@@ -132129,7 +129957,6 @@ self: {
        ];
        description = "Haskell Open Sound Control";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hosc-json" = callPackage
@@ -135591,19 +133418,6 @@ self: {
      }) {};
 
   "hsemail" = callPackage
-    ({ mkDerivation, base, hspec, parsec, time, time-compat }:
-     mkDerivation {
-       pname = "hsemail";
-       version = "2.2.0";
-       sha256 = "0078n2snnrgsnl6az7c6jpmgyfsls4k1zr09f7ny7kn6g33g5z84";
-       libraryHaskellDepends = [ base parsec time time-compat ];
-       testHaskellDepends = [ base hspec parsec time ];
-       description = "Parsec parsers for the Internet Message format (e-mail)";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "hsemail_2_2_1" = callPackage
     ({ mkDerivation, base, hspec, parsec, time, time-compat }:
      mkDerivation {
        pname = "hsemail";
@@ -135613,7 +133427,6 @@ self: {
        testHaskellDepends = [ base hspec parsec time ];
        description = "Parsec parsers for the Internet Message format (e-mail)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -136164,29 +133977,6 @@ self: {
        broken = true;
      }) {};
 
-  "hslua" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
-     , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances
-     , tasty, tasty-hunit, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "hslua";
-       version = "1.0.3.2";
-       sha256 = "183bgl5jcx5y2r94lviqfw0a5w9089nxjd1z40k8vx9y2h60pm6j";
-       configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
-       libraryHaskellDepends = [
-         base bytestring containers exceptions fail mtl text
-       ];
-       librarySystemDepends = [ lua5_3 ];
-       testHaskellDepends = [
-         base bytestring containers exceptions fail mtl QuickCheck
-         quickcheck-instances tasty tasty-hunit tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
-       description = "Bindings to Lua, an embeddable scripting language";
-       license = stdenv.lib.licenses.mit;
-     }) {inherit (pkgs) lua5_3;};
-
   "hslua_1_1_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3
      , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit
@@ -136210,6 +134000,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) lua5_3;};
 
+  "hslua" = callPackage
+    ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3
+     , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit
+     , tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "hslua";
+       version = "1.2.0";
+       sha256 = "0a295zqpbrv8a2hw7msz5p7brlswag16sg08dyz399ij6b7q5x0h";
+       configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
+       libraryHaskellDepends = [
+         base bytestring containers exceptions mtl text
+       ];
+       librarySystemDepends = [ lua5_3 ];
+       testHaskellDepends = [
+         base bytestring containers exceptions mtl QuickCheck
+         quickcheck-instances tasty tasty-hunit tasty-quickcheck text
+       ];
+       description = "Bindings to Lua, an embeddable scripting language";
+       license = stdenv.lib.licenses.mit;
+     }) {inherit (pkgs) lua5_3;};
+
   "hslua_1_3_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3
      , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit
@@ -136255,22 +134067,6 @@ self: {
      }) {};
 
   "hslua-module-doclayout" = callPackage
-    ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit
-     , tasty-lua, text
-     }:
-     mkDerivation {
-       pname = "hslua-module-doclayout";
-       version = "0.1.0";
-       sha256 = "1hkzddgz427fh69bdyiyx5vyngslw3ab9xjg7i5rfjhzzmsn0hha";
-       libraryHaskellDepends = [ base doclayout hslua text ];
-       testHaskellDepends = [
-         base doclayout hslua tasty tasty-hunit tasty-lua
-       ];
-       description = "Lua module wrapping Text.DocLayout.";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hslua-module-doclayout_0_2_0_1" = callPackage
     ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit
      , tasty-lua, text
      }:
@@ -136284,7 +134080,6 @@ self: {
        ];
        description = "Lua module wrapping Text.DocLayout.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hslua-module-system" = callPackage
@@ -136306,19 +134101,6 @@ self: {
      }) {};
 
   "hslua-module-text" = callPackage
-    ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text
-     }:
-     mkDerivation {
-       pname = "hslua-module-text";
-       version = "0.2.1";
-       sha256 = "1ikdwvvxhbd5wmfr85dzs2ccamh9rbbpgy899z7s1vlv5q1dj0hk";
-       libraryHaskellDepends = [ base bytestring hslua text ];
-       testHaskellDepends = [ base hslua tasty tasty-hunit text ];
-       description = "Lua module for text";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hslua-module-text_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit
      , tasty-lua, text
      }:
@@ -136332,7 +134114,6 @@ self: {
        ];
        description = "Lua module for text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsluv-haskell" = callPackage
@@ -137056,22 +134837,6 @@ self: {
      }) {};
 
   "hspec-megaparsec" = callPackage
-    ({ mkDerivation, base, containers, hspec, hspec-expectations
-     , megaparsec
-     }:
-     mkDerivation {
-       pname = "hspec-megaparsec";
-       version = "2.1.0";
-       sha256 = "1x8qbih5ci9flc3b5c1g4cc8xgq504bw5q26cpkcnlaanrp01p5x";
-       libraryHaskellDepends = [
-         base containers hspec-expectations megaparsec
-       ];
-       testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
-       description = "Utility functions for testing Megaparsec parsers with Hspec";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hspec-megaparsec_2_2_0" = callPackage
     ({ mkDerivation, base, containers, hspec, hspec-expectations
      , megaparsec
      }:
@@ -137085,7 +134850,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
        description = "Utility functions for testing Megaparsec parsers with Hspec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-meta" = callPackage
@@ -139299,25 +137063,6 @@ self: {
      }) {};
 
   "http-client-openssl" = callPackage
-    ({ mkDerivation, base, bytestring, HsOpenSSL, hspec, http-client
-     , http-types, network
-     }:
-     mkDerivation {
-       pname = "http-client-openssl";
-       version = "0.3.1.0";
-       sha256 = "16h2f4ap35g63mdg66iihp10p1s4nwsrb06hplwm9i4akdr9gws2";
-       libraryHaskellDepends = [
-         base bytestring HsOpenSSL http-client network
-       ];
-       testHaskellDepends = [
-         base HsOpenSSL hspec http-client http-types
-       ];
-       doCheck = false;
-       description = "http-client backend using the OpenSSL library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client-openssl_0_3_2_0" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system
      , hspec, http-client, http-types, network
      }:
@@ -139334,7 +137079,6 @@ self: {
        doCheck = false;
        description = "http-client backend using the OpenSSL library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-overrides" = callPackage
@@ -141198,25 +138942,6 @@ self: {
      }) {};
 
   "hvega" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , filepath, tasty, tasty-golden, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "hvega";
-       version = "0.9.1.0";
-       sha256 = "0gy7f6amg5mvr1lc7s98ld445h4s0j8xjilpdq6c6yy5kgd5hdyp";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ aeson base text unordered-containers ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring containers filepath tasty
-         tasty-golden text unordered-containers
-       ];
-       description = "Create Vega-Lite visualizations (version 4) in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hvega_0_11_0_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , filepath, tasty, tasty-golden, text, unordered-containers
      }:
@@ -141233,7 +138958,6 @@ self: {
        ];
        description = "Create Vega-Lite visualizations (version 4) in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hvega-theme" = callPackage
@@ -145853,28 +143577,6 @@ self: {
      }) {};
 
   "incremental-parser" = callPackage
-    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
-     , monoid-subclasses, parsers, QuickCheck, rank2classes, tasty
-     , tasty-quickcheck, text, transformers
-     }:
-     mkDerivation {
-       pname = "incremental-parser";
-       version = "0.4.0.2";
-       sha256 = "11vip6qxw0y5yza4dcq4iah4kw3lyjsbxgbq1j17p1gr3c3xiafa";
-       libraryHaskellDepends = [
-         base monoid-subclasses parsers rank2classes transformers
-       ];
-       testHaskellDepends = [
-         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq monoid-subclasses text
-       ];
-       description = "Generic parser library capable of providing partial results from partial input";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "incremental-parser_0_5" = callPackage
     ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
      , input-parsers, monoid-subclasses, parsers, QuickCheck
      , rank2classes, tasty, tasty-quickcheck, text, transformers
@@ -145895,7 +143597,6 @@ self: {
        ];
        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
@@ -146429,33 +144130,6 @@ self: {
      }) {};
 
   "influxdb" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , cabal-doctest, clock, containers, doctest, foldl, http-client
-     , http-types, lens, network, optional-args, raw-strings-qq
-     , scientific, tagged, tasty, tasty-hunit, template-haskell, text
-     , time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "influxdb";
-       version = "1.7.1.6";
-       sha256 = "1psx9v95fhlapizhh7jdz4cvynwv9jiqn09z0843lhc74jqf65in";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clock containers foldl http-client
-         http-types lens network optional-args scientific tagged text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base containers doctest raw-strings-qq tasty tasty-hunit
-         template-haskell time
-       ];
-       description = "Haskell client library for InfluxDB";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "influxdb_1_9_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, lens, network, optional-args, raw-strings-qq
@@ -146480,7 +144154,6 @@ self: {
        ];
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "informative" = callPackage
@@ -147236,26 +144909,6 @@ self: {
      }) {};
 
   "integer-logarithms" = callPackage
-    ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
-     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "integer-logarithms";
-       version = "1.0.3";
-       sha256 = "05pc5hws66csvcvfswlwcr2fplwn1lbssvwifjxkbbwqhq0n5qjs";
-       revision = "2";
-       editedCabalFile = "0a6j3313vz7n7dn8abddyib4jggblaq89f87ib4imdwjxjajbm33";
-       libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
-       testHaskellDepends = [
-         base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck
-       ];
-       description = "Integer logarithms";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "integer-logarithms_1_0_3_1" = callPackage
     ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
      , smallcheck, tasty, tasty-hunit, tasty-quickcheck
      , tasty-smallcheck
@@ -147271,7 +144924,6 @@ self: {
        ];
        description = "Integer logarithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "integer-pure" = callPackage
@@ -147734,27 +145386,6 @@ self: {
      }) {};
 
   "interpolator" = callPackage
-    ({ mkDerivation, aeson, base, containers, either, hspec
-     , mono-traversable, mtl, product-profunctors, profunctors
-     , QuickCheck, template-haskell, text
-     }:
-     mkDerivation {
-       pname = "interpolator";
-       version = "1.0.0";
-       sha256 = "0kkasycgba525mag4362w8kirnxjydrmh7gjqk5xs6zgcp1ralb7";
-       libraryHaskellDepends = [
-         aeson base containers either mono-traversable mtl
-         product-profunctors profunctors QuickCheck template-haskell text
-       ];
-       testHaskellDepends = [
-         aeson base containers either hspec mono-traversable mtl
-         product-profunctors profunctors QuickCheck template-haskell text
-       ];
-       description = "Runtime interpolation of environment variables in records using profunctors";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "interpolator_1_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, containers, either, hspec
      , mono-traversable, mtl, product-profunctors, profunctors
      , QuickCheck, template-haskell, text
@@ -147773,7 +145404,6 @@ self: {
        ];
        description = "Runtime interpolation of environment variables in records using profunctors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interprocess" = callPackage
@@ -147931,28 +145561,6 @@ self: {
      }) {};
 
   "intro" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, dlist
-     , extra, hashable, lens, mtl, optics, QuickCheck, safe, text
-     , transformers, unordered-containers, writer-cps-mtl
-     }:
-     mkDerivation {
-       pname = "intro";
-       version = "0.7.0.0";
-       sha256 = "18ddkcm77jxqpqjaaqs1qmzvn8zgincrybb3d4zcsggrp6llghc3";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq dlist extra hashable mtl safe
-         text transformers unordered-containers writer-cps-mtl
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq dlist extra hashable lens mtl
-         optics QuickCheck safe text transformers unordered-containers
-         writer-cps-mtl
-       ];
-       description = "Safe and minimal prelude";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "intro_0_9_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, extra, hashable
      , lens, mtl, optics, QuickCheck, safe, text, transformers
      , unordered-containers, writer-cps-mtl
@@ -147972,7 +145580,6 @@ self: {
        ];
        description = "Safe and minimal prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intro-prelude" = callPackage
@@ -148068,30 +145675,6 @@ self: {
      }) {};
 
   "invariant" = callPackage
-    ({ mkDerivation, array, base, bifunctors, comonad, containers
-     , contravariant, ghc-prim, hspec, hspec-discover, profunctors
-     , QuickCheck, StateVar, stm, tagged, template-haskell
-     , th-abstraction, transformers, transformers-compat
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "invariant";
-       version = "0.5.3";
-       sha256 = "03245nhcqxx6b0yw81fzqaqd7cgllmx8awzhvs2xv7ys73pmsgnp";
-       revision = "2";
-       editedCabalFile = "0vsil8x0z283n4993nk9m0v0y0za1b6lph59k1rb2i4wj05syx2v";
-       libraryHaskellDepends = [
-         array base bifunctors comonad containers contravariant ghc-prim
-         profunctors StateVar stm tagged template-haskell th-abstraction
-         transformers transformers-compat unordered-containers
-       ];
-       testHaskellDepends = [ base hspec QuickCheck template-haskell ];
-       testToolDepends = [ hspec-discover ];
-       description = "Haskell98 invariant functors";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "invariant_0_5_4" = callPackage
     ({ mkDerivation, array, base, bifunctors, comonad, containers
      , contravariant, ghc-prim, hspec, hspec-discover, profunctors
      , QuickCheck, StateVar, stm, tagged, template-haskell
@@ -148111,7 +145694,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell98 invariant functors";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible" = callPackage
@@ -149231,18 +146813,6 @@ self: {
      }) {};
 
   "isbn" = callPackage
-    ({ mkDerivation, base, hspec, text }:
-     mkDerivation {
-       pname = "isbn";
-       version = "1.0.0.0";
-       sha256 = "0cxffahx54mf0baib9w2g2gbmcpmnzvpga71zggjaqkl0l7a7hf5";
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [ base hspec text ];
-       description = "ISBN Validation and Manipulation";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "isbn_1_1_0_1" = callPackage
     ({ mkDerivation, base, hspec, text }:
      mkDerivation {
        pname = "isbn";
@@ -149252,7 +146822,6 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "ISBN Validation and Manipulation";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "isdicom" = callPackage
@@ -150950,21 +148519,6 @@ self: {
      }) {};
 
   "jira-wiki-markup" = callPackage
-    ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }:
-     mkDerivation {
-       pname = "jira-wiki-markup";
-       version = "1.1.4";
-       sha256 = "0riwi6i0vvmfffprzd4gklxjivjv1x7cmb2vx43x6n8yfrd75yzv";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base mtl parsec text ];
-       executableHaskellDepends = [ base text ];
-       testHaskellDepends = [ base parsec tasty tasty-hunit text ];
-       description = "Handle Jira wiki markup";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "jira-wiki-markup_1_3_2" = callPackage
     ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }:
      mkDerivation {
        pname = "jira-wiki-markup";
@@ -150977,7 +148531,6 @@ self: {
        testHaskellDepends = [ base parsec tasty tasty-hunit text ];
        description = "Handle Jira wiki markup";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jmacro" = callPackage
@@ -151276,36 +148829,6 @@ self: {
      }) {};
 
   "jose" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bytestring, concise, containers, cryptonite, hspec, lens, memory
-     , monad-time, mtl, network-uri, pem, QuickCheck
-     , quickcheck-instances, safe, tasty, tasty-hspec, tasty-quickcheck
-     , template-haskell, text, time, unordered-containers, vector, x509
-     }:
-     mkDerivation {
-       pname = "jose";
-       version = "0.8.3.1";
-       sha256 = "14cbdah9khw8z876c1fn26asp1xa3azn7hh7a04chznmqagnmbmj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring bytestring concise
-         containers cryptonite lens memory monad-time mtl network-uri
-         QuickCheck quickcheck-instances safe template-haskell text time
-         unordered-containers vector x509
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base64-bytestring bytestring concise
-         containers cryptonite hspec lens memory monad-time mtl network-uri
-         pem QuickCheck quickcheck-instances safe tasty tasty-hspec
-         tasty-quickcheck template-haskell text time unordered-containers
-         vector x509
-       ];
-       description = "Javascript Object Signing and Encryption and JSON Web Token library";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "jose_0_8_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, concise, containers, cryptonite, hspec, lens, memory
      , monad-time, mtl, network-uri, pem, QuickCheck
@@ -151333,7 +148856,6 @@ self: {
        ];
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jose-jwt" = callPackage
@@ -159725,48 +157247,6 @@ self: {
      }) {};
 
   "lens" = callPackage
-    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
-     , Cabal, cabal-doctest, call-stack, comonad, containers
-     , contravariant, criterion, deepseq, directory, distributive
-     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
-     , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
-     , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
-     , tagged, template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th, text
-     , th-abstraction, transformers, transformers-compat, type-equality
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "lens";
-       version = "4.18.1";
-       sha256 = "1lmxjaj32v06l12gy00rpjp2lk1cblh3k7kwklk655ss2vas61ri";
-       revision = "1";
-       editedCabalFile = "1ajb19bhxyg9i11pj6b9p43y0c0wjg6ap4vk6jl0a67gdxyjkki1";
-       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
-       libraryHaskellDepends = [
-         array base base-orphans bifunctors bytestring call-stack comonad
-         containers contravariant distributive exceptions filepath free
-         ghc-prim hashable kan-extensions mtl parallel profunctors
-         reflection semigroupoids tagged template-haskell text
-         th-abstraction transformers transformers-compat type-equality
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory doctest filepath
-         generic-deriving HUnit mtl nats parallel QuickCheck semigroups
-         simple-reflect test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th text transformers
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring comonad containers criterion deepseq
-         generic-deriving transformers unordered-containers vector
-       ];
-       description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "lens_4_19_2" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, Cabal, cabal-doctest, call-stack, comonad, containers
      , contravariant, criterion, deepseq, directory, distributive
@@ -159805,7 +157285,6 @@ self: {
        ];
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-accelerate" = callPackage
@@ -161828,25 +159307,6 @@ self: {
      }) {};
 
   "lift-generics" = callPackage
-    ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim
-     , hspec, hspec-discover, template-haskell
-     }:
-     mkDerivation {
-       pname = "lift-generics";
-       version = "0.1.3";
-       sha256 = "0r2rbik5lh5x8psy5cblzd1ly1ybizdcyjdg8n79m7k3rqp2w6v7";
-       libraryHaskellDepends = [
-         base generic-deriving ghc-prim template-haskell
-       ];
-       testHaskellDepends = [
-         base base-compat generic-deriving hspec template-haskell
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lift-generics_0_2" = callPackage
     ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim
      , hspec, hspec-discover, mtl, template-haskell, th-compat
      }:
@@ -161866,7 +159326,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lift-read-show" = callPackage
@@ -163358,13 +160817,20 @@ self: {
      }) {};
 
   "liquid-platform" = callPackage
-    ({ mkDerivation }:
+    ({ mkDerivation, cmdargs, liquid-base, liquid-bytestring
+     , liquid-containers, liquid-prelude, liquid-vector, liquidhaskell
+     , process
+     }:
      mkDerivation {
        pname = "liquid-platform";
        version = "0.8.10.2";
        sha256 = "1rhpq04nl9gcm9rwjd261ssn8q59pdcpfna0xwkcv3gmkgirwzgf";
        isLibrary = false;
        isExecutable = true;
+       executableHaskellDepends = [
+         cmdargs liquid-base liquid-bytestring liquid-containers
+         liquid-prelude liquid-vector liquidhaskell process
+       ];
        description = "A battery-included platform for LiquidHaskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163986,21 +161452,6 @@ self: {
      }) {};
 
   "little-logger" = callPackage
-    ({ mkDerivation, base, co-log, co-log-core, microlens, mtl, text }:
-     mkDerivation {
-       pname = "little-logger";
-       version = "0.1.0";
-       sha256 = "1ibcvcjh5wfdzi2p30dy7q1n6ac34mjckybmp8cn0xwyf9zs9zlw";
-       libraryHaskellDepends = [
-         base co-log co-log-core microlens mtl text
-       ];
-       description = "Basic logging based on co-log";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "little-logger_0_3_1" = callPackage
     ({ mkDerivation, base, co-log, co-log-core, microlens, mtl, tasty
      , tasty-hunit, text, unliftio-core
      }:
@@ -164022,21 +161473,6 @@ self: {
      }) {};
 
   "little-rio" = callPackage
-    ({ mkDerivation, base, exceptions, microlens, microlens-mtl, mtl
-     , unliftio-core
-     }:
-     mkDerivation {
-       pname = "little-rio";
-       version = "0.1.1";
-       sha256 = "0yxxmad9709h1gpxzjhvqmjhn3m8dcishd9gs6bakc2hrapw2ss2";
-       libraryHaskellDepends = [
-         base exceptions microlens microlens-mtl mtl unliftio-core
-       ];
-       description = "When you need just the RIO monad";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "little-rio_0_2_2" = callPackage
     ({ mkDerivation, base, deepseq, exceptions, microlens
      , microlens-mtl, mtl, primitive, resourcet, unliftio-core
      }:
@@ -164050,7 +161486,6 @@ self: {
        ];
        description = "When you need just the RIO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "live-sequencer" = callPackage
@@ -164798,18 +162233,6 @@ self: {
      }) {};
 
   "loc" = callPackage
-    ({ mkDerivation, base, containers, doctest, hedgehog }:
-     mkDerivation {
-       pname = "loc";
-       version = "0.1.3.8";
-       sha256 = "11xlpi1g4m0wcjahf1brs77g52pn45g7rglkqz8c6y81y8vllppd";
-       libraryHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base containers doctest hedgehog ];
-       description = "Types representing line and column positions and ranges in text files";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "loc_0_1_3_10" = callPackage
     ({ mkDerivation, base, containers, doctest, hedgehog }:
      mkDerivation {
        pname = "loc";
@@ -164819,7 +162242,6 @@ self: {
        testHaskellDepends = [ base containers doctest hedgehog ];
        description = "Types representing line and column positions and ranges in text files";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "loc-test" = callPackage
@@ -165082,25 +162504,6 @@ self: {
      }) {};
 
   "log-base" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
-     , exceptions, mmorph, monad-control, monad-time, mtl, semigroups
-     , stm, text, time, transformers-base, unliftio-core
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "log-base";
-       version = "0.8.0.1";
-       sha256 = "0s8w464yalbcgq3vq819mw9fsgj6a9rfbf00843311kqryml2a49";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring deepseq exceptions mmorph
-         monad-control monad-time mtl semigroups stm text time
-         transformers-base unliftio-core unordered-containers
-       ];
-       description = "Structured logging solution (base package)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "log-base_0_9_0_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
      , exceptions, mmorph, monad-control, monad-time, mtl, semigroups
      , stm, text, time, transformers-base, unliftio-core
@@ -165117,7 +162520,6 @@ self: {
        ];
        description = "Structured logging solution (base package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-domain" = callPackage
@@ -166492,23 +163894,25 @@ self: {
   "lsp-test" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
      , bytestring, conduit, conduit-parse, containers, data-default
-     , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
+     , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl
      , parser-combinators, process, text, transformers, unix
      , unordered-containers
      }:
      mkDerivation {
        pname = "lsp-test";
-       version = "0.10.3.0";
-       sha256 = "1gj6f99k3kd0flh2nbpj5wnhi1ql5rlijw0vf4l53zwxy203r7k8";
+       version = "0.11.0.5";
+       sha256 = "0r038x65lc0ij6hs8klgj8v8f0fqqrn12dyxc0k8zf9pan9bwnph";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal async base bytestring conduit
-         conduit-parse containers data-default Diff directory filepath
+         conduit-parse containers data-default Diff directory filepath Glob
          haskell-lsp lens mtl parser-combinators process text transformers
          unix unordered-containers
        ];
        testHaskellDepends = [
-         aeson base data-default haskell-lsp hspec lens text
-         unordered-containers
+         aeson base data-default directory filepath haskell-lsp hspec lens
+         text unordered-containers
        ];
        description = "Functional test framework for LSP servers";
        license = stdenv.lib.licenses.bsd3;
@@ -169646,30 +167050,6 @@ self: {
      }) {};
 
   "massiv" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, deepseq
-     , doctest, exceptions, mersenne-random-pure64, primitive
-     , QuickCheck, random, scheduler, splitmix, template-haskell
-     , unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "massiv";
-       version = "0.5.4.0";
-       sha256 = "0dmm6x5izmjl1l803fvmxzqrh0jpg56z2aid228a4c44n620dzln";
-       libraryHaskellDepends = [
-         base bytestring data-default-class deepseq exceptions primitive
-         scheduler unliftio-core vector
-       ];
-       testHaskellDepends = [
-         base doctest mersenne-random-pure64 QuickCheck random splitmix
-         template-haskell
-       ];
-       description = "Massiv (Массив) is an Array Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "massiv_0_5_5_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, deepseq
      , doctest, exceptions, mersenne-random-pure64, primitive
      , QuickCheck, random, scheduler, splitmix, template-haskell
@@ -169694,33 +167074,6 @@ self: {
      }) {};
 
   "massiv-io" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color
-     , data-default-class, deepseq, doctest, exceptions, filepath, hspec
-     , JuicyPixels, massiv, massiv-test, netpbm, QuickCheck, random
-     , template-haskell, unliftio, vector
-     }:
-     mkDerivation {
-       pname = "massiv-io";
-       version = "0.2.1.0";
-       sha256 = "0p7z4nk0fv9lql17s9d18hi5mrnvr4zry6rghqnhjmhlp97g4yi6";
-       revision = "1";
-       editedCabalFile = "0sqlkva81p748537vwbg0pzgvlx8xs7560rpd0fjcxafhj32m03x";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base bytestring Color data-default-class deepseq exceptions
-         filepath JuicyPixels massiv netpbm unliftio vector
-       ];
-       testHaskellDepends = [
-         base bytestring doctest hspec JuicyPixels massiv massiv-test
-         QuickCheck random template-haskell
-       ];
-       description = "Import/export of Image files into massiv Arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "massiv-io_0_4_0_0" = callPackage
     ({ mkDerivation, base, bytestring, Color, data-default-class
      , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels
      , massiv, massiv-test, netpbm, QuickCheck, random, template-haskell
@@ -171065,33 +168418,6 @@ self: {
      }) {};
 
   "medea" = callPackage
-    ({ mkDerivation, aeson, algebraic-graphs, base, bytestring
-     , containers, deepseq, directory, filepath, free, hashable, hspec
-     , hspec-core, megaparsec, microlens-ghc, mtl, nonempty-containers
-     , parser-combinators, QuickCheck, quickcheck-instances, scientific
-     , text, unordered-containers, vector, vector-instances
-     }:
-     mkDerivation {
-       pname = "medea";
-       version = "1.1.2";
-       sha256 = "0s5ra1a9p8yj2ddwlz58i1ajd7dmxz9rxrdckfmajpzgq9vyskpl";
-       revision = "1";
-       editedCabalFile = "1ick6yjqdk7wg75fzd496r1nyzhphzpz21lcalpicd34bkbzk6dd";
-       libraryHaskellDepends = [
-         aeson algebraic-graphs base bytestring containers deepseq free
-         hashable megaparsec microlens-ghc mtl nonempty-containers
-         parser-combinators scientific text unordered-containers vector
-         vector-instances
-       ];
-       testHaskellDepends = [
-         aeson base directory filepath hspec hspec-core mtl QuickCheck
-         quickcheck-instances text unordered-containers vector
-       ];
-       description = "A schema language for JSON";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "medea_1_2_0" = callPackage
     ({ mkDerivation, aeson, algebraic-graphs, base, bytestring
      , containers, deepseq, directory, filepath, free, hashable, hspec
      , hspec-core, megaparsec, microlens-ghc, mtl, nonempty-containers
@@ -171116,7 +168442,6 @@ self: {
        ];
        description = "A schema language for JSON";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mediabus" = callPackage
@@ -171369,26 +168694,6 @@ self: {
      }) {};
 
   "megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , criterion, deepseq, mtl, parser-combinators, scientific, text
-     , transformers, weigh
-     }:
-     mkDerivation {
-       pname = "megaparsec";
-       version = "8.0.0";
-       sha256 = "0633rqzrxzhq43z6i7ancncd633fm2b8755683si4v818r3cdmxm";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers deepseq mtl
-         parser-combinators scientific text transformers
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq text weigh
-       ];
-       description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "megaparsec_9_0_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, mtl, parser-combinators, scientific, text
      , transformers, weigh
@@ -171406,36 +168711,9 @@ self: {
        ];
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "megaparsec-tests" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , hspec, hspec-discover, hspec-expectations, hspec-megaparsec
-     , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "megaparsec-tests";
-       version = "8.0.0";
-       sha256 = "1l71s16fhl2054myj02fnnjr71pfypjvwxd0hxzf83zwmqnv558f";
-       revision = "1";
-       editedCabalFile = "1hawpdlx2nwyi5s06vh5lvccyjzsxzns02mhggzy0kb33xb9c818";
-       libraryHaskellDepends = [
-         base bytestring containers hspec hspec-expectations
-         hspec-megaparsec megaparsec mtl QuickCheck text transformers
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive containers hspec
-         hspec-expectations hspec-megaparsec megaparsec mtl
-         parser-combinators QuickCheck scientific text transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Test utilities and the test suite of Megaparsec";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "megaparsec-tests_9_0_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , hspec, hspec-discover, hspec-expectations, hspec-megaparsec
      , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text
@@ -171457,7 +168735,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Test utilities and the test suite of Megaparsec";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meldable-heap" = callPackage
@@ -173726,22 +171003,6 @@ self: {
      }) {};
 
   "minimorph" = callPackage
-    ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
-     , text
-     }:
-     mkDerivation {
-       pname = "minimorph";
-       version = "0.2.2.0";
-       sha256 = "1fmnlv2qr8vnxk82b208fp7ckp920zrj9z9xv7lv6d5lgnsasf2c";
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit text
-       ];
-       description = "English spelling functions with an emphasis on simplicity";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "minimorph_0_3_0_0" = callPackage
     ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
      , text
      }:
@@ -173755,7 +171016,6 @@ self: {
        ];
        description = "English spelling functions with an emphasis on simplicity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minimung" = callPackage
@@ -173774,43 +171034,6 @@ self: {
      }) {};
 
   "minio-hs" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
-     , case-insensitive, conduit, conduit-extra, connection, cryptonite
-     , cryptonite-conduit, digest, directory, exceptions, filepath
-     , http-client, http-client-tls, http-conduit, http-types, ini
-     , memory, protolude, QuickCheck, raw-strings-qq, resourcet, retry
-     , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
-     , time, transformers, unliftio, unliftio-core, unordered-containers
-     , xml-conduit
-     }:
-     mkDerivation {
-       pname = "minio-hs";
-       version = "1.5.2";
-       sha256 = "1yhaijz0cazgwz0fdvnx951g1s64zybbnl6n93bmxbdd7m6ydbml";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base64-bytestring binary bytestring case-insensitive
-         conduit conduit-extra connection cryptonite cryptonite-conduit
-         digest directory exceptions filepath http-client http-client-tls
-         http-conduit http-types ini memory protolude raw-strings-qq
-         resourcet retry text time transformers unliftio unliftio-core
-         unordered-containers xml-conduit
-       ];
-       testHaskellDepends = [
-         aeson base base64-bytestring binary bytestring case-insensitive
-         conduit conduit-extra connection cryptonite cryptonite-conduit
-         digest directory exceptions filepath http-client http-client-tls
-         http-conduit http-types ini memory protolude QuickCheck
-         raw-strings-qq resourcet retry tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck text time transformers unliftio unliftio-core
-         unordered-containers xml-conduit
-       ];
-       description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "minio-hs_1_5_3" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
      , case-insensitive, conduit, conduit-extra, connection, cryptonite
      , cryptonite-conduit, digest, directory, exceptions, filepath
@@ -173845,7 +171068,6 @@ self: {
        ];
        description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minions" = callPackage
@@ -173980,23 +171202,6 @@ self: {
      }) {};
 
   "miniutter" = callPackage
-    ({ mkDerivation, base, binary, containers, HUnit, minimorph
-     , test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "miniutter";
-       version = "0.5.1.0";
-       sha256 = "0871hhpj5fl5si6rwg9l1lpdarlva3y888rgrrb4gaqsssnh0kk1";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base binary containers minimorph text ];
-       testHaskellDepends = [
-         base containers HUnit test-framework test-framework-hunit text
-       ];
-       description = "Simple English clause creation from arbitrary words";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "miniutter_0_5_1_1" = callPackage
     ({ mkDerivation, base, binary, containers, HUnit, minimorph
      , test-framework, test-framework-hunit, text
      }:
@@ -174011,7 +171216,6 @@ self: {
        ];
        description = "Simple English clause creation from arbitrary words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minizinc-process" = callPackage
@@ -174248,25 +171452,6 @@ self: {
      }) {};
 
   "miso" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
-     , http-types, lucid, network-uri, servant, servant-lucid, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "miso";
-       version = "1.6.0.0";
-       sha256 = "1mzsih2hga62sf33m4cwf1v0107p2ydc32wq7n3hsapzx69sm2j3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-api-data http-types lucid
-         network-uri servant servant-lucid text transformers vector
-       ];
-       description = "A tasty Haskell front-end framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "miso_1_7_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
      , http-types, lucid, network-uri, servant, servant-lucid, text
      , transformers, vector
@@ -174283,7 +171468,6 @@ self: {
        ];
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "miso-action-logger" = callPackage
@@ -175075,34 +172259,6 @@ self: {
      }) {};
 
   "modern-uri" = callPackage
-    ({ mkDerivation, base, bytestring, containers, contravariant
-     , criterion, deepseq, exceptions, hspec, hspec-discover
-     , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
-     , reflection, tagged, template-haskell, text, weigh
-     }:
-     mkDerivation {
-       pname = "modern-uri";
-       version = "0.3.2.0";
-       sha256 = "162s88yayalh4vlngman5gz3k0gnszxrksh1wk5227qihbpsiwhb";
-       revision = "3";
-       editedCabalFile = "1md8x7ql885g3n55yfd2kgs4np74d7s6rdzlw69bs4zk8074b4q0";
-       libraryHaskellDepends = [
-         base bytestring containers contravariant deepseq exceptions
-         megaparsec mtl profunctors QuickCheck reflection tagged
-         template-haskell text
-       ];
-       testHaskellDepends = [
-         base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq megaparsec text weigh
-       ];
-       description = "Modern library for working with URIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "modern-uri_0_3_3_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant
      , criterion, deepseq, exceptions, hspec, hspec-discover
      , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
@@ -175126,7 +172282,6 @@ self: {
        ];
        description = "Modern library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modify-fasta" = callPackage
@@ -177784,31 +174939,6 @@ self: {
      }) {};
 
   "morpheus-graphql" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, megaparsec
-     , morpheus-graphql-core, mtl, scientific, tasty, tasty-hunit
-     , template-haskell, text, transformers, unliftio-core
-     , unordered-containers, uuid, vector, websockets
-     }:
-     mkDerivation {
-       pname = "morpheus-graphql";
-       version = "0.12.0";
-       sha256 = "11f0niq2rv6kyrscl0dgi75vcxrz4vhy4yka2jxhrmx6klzi908p";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers megaparsec morpheus-graphql-core
-         mtl scientific template-haskell text transformers unliftio-core
-         unordered-containers uuid vector websockets
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers megaparsec morpheus-graphql-core
-         mtl scientific tasty tasty-hunit template-haskell text transformers
-         unliftio-core unordered-containers uuid vector websockets
-       ];
-       description = "Morpheus GraphQL";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "morpheus-graphql_0_16_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , morpheus-graphql-core, morpheus-graphql-subscriptions, mtl
      , relude, tasty, tasty-hunit, template-haskell, text, transformers
@@ -177830,7 +174960,6 @@ self: {
        ];
        description = "Morpheus GraphQL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "morpheus-graphql-cli" = callPackage
@@ -177881,30 +175010,6 @@ self: {
      }) {};
 
   "morpheus-graphql-core" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hashable, megaparsec
-     , scientific, tasty, tasty-hunit, template-haskell, text
-     , th-lift-instances, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "morpheus-graphql-core";
-       version = "0.12.0";
-       sha256 = "1ay37r73sqs5c8ixaz9mr9x1ps58jg4sgrlw5dmq7hkzy9993ccv";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring hashable megaparsec scientific
-         template-haskell text th-lift-instances transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hashable megaparsec scientific tasty
-         tasty-hunit template-haskell text th-lift-instances transformers
-         unordered-containers vector
-       ];
-       description = "Morpheus GraphQL Core";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "morpheus-graphql-core_0_16_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, hashable
      , megaparsec, mtl, relude, scientific, tasty, tasty-hunit
      , template-haskell, text, th-lift-instances, transformers
@@ -177927,7 +175032,6 @@ self: {
        ];
        description = "Morpheus GraphQL Core";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "morpheus-graphql-subscriptions" = callPackage
@@ -181419,21 +178523,6 @@ self: {
      }) {};
 
   "mysql" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
-     }:
-     mkDerivation {
-       pname = "mysql";
-       version = "0.1.7";
-       sha256 = "1nbj958nsr568c1mhwhcidz8d1p35c6b99m8xz2z0w8ig737nbgg";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base bytestring containers ];
-       librarySystemDepends = [ mysql ];
-       testHaskellDepends = [ base bytestring hspec ];
-       description = "A low-level MySQL client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) mysql;};
-
-  "mysql_0_1_7_2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
      }:
      mkDerivation {
@@ -181446,7 +178535,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mysql;};
 
   "mysql-effect" = callPackage
@@ -182688,24 +179776,6 @@ self: {
      }) {};
 
   "neat-interpolation" = callPackage
-    ({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances
-     , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     , text
-     }:
-     mkDerivation {
-       pname = "neat-interpolation";
-       version = "0.3.2.6";
-       sha256 = "10k5x47i84nycl54p61l8v1bpvi7mw663vnj8nn1qjpn03anz8z2";
-       libraryHaskellDepends = [ base megaparsec template-haskell text ];
-       testHaskellDepends = [
-         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       description = "A quasiquoter for neat and simple multiline text interpolation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "neat-interpolation_0_5_1_2" = callPackage
     ({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances
      , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell
      , text
@@ -182721,7 +179791,6 @@ self: {
        ];
        description = "A quasiquoter for neat and simple multiline text interpolation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "needle" = callPackage
@@ -187683,17 +184752,6 @@ self: {
      }) {};
 
   "numhask" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "numhask";
-       version = "0.4.0";
-       sha256 = "1wwhpsrbnaa0nmb9x31wnk66dbvajd54mflvbnifff2dkaha89x1";
-       libraryHaskellDepends = [ base ];
-       description = "numeric classes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "numhask_0_6_0_2" = callPackage
     ({ mkDerivation, base, bifunctors, mmorph, protolude, text
      , transformers
      }:
@@ -187706,7 +184764,6 @@ self: {
        ];
        description = "numeric classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numhask-array" = callPackage
@@ -188126,27 +185183,6 @@ self: {
      }) {};
 
   "o-clock" = callPackage
-    ({ mkDerivation, base, doctest, ghc-prim, Glob, hedgehog
-     , markdown-unlit, tasty, tasty-hedgehog, tasty-hspec, type-spec
-     }:
-     mkDerivation {
-       pname = "o-clock";
-       version = "1.1.0";
-       sha256 = "15lad2rjnam0b1ny5zccd0ir3q4i559y28r93sqkws4j74mx8b4c";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ghc-prim ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog
-         tasty-hspec type-spec
-       ];
-       testToolDepends = [ doctest markdown-unlit ];
-       description = "Type-safe time library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "o-clock_1_2_0" = callPackage
     ({ mkDerivation, base, doctest, ghc-prim, Glob, hedgehog
      , markdown-unlit, tasty, tasty-hedgehog, tasty-hspec, type-spec
      }:
@@ -188165,7 +185201,6 @@ self: {
        testToolDepends = [ doctest markdown-unlit ];
        description = "Type-safe time library";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oanda-rest-api" = callPackage
@@ -189432,34 +186467,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, scientific
-     , semigroups, text, time, time-locale-compat, transformers, uuid
-     , void
-     }:
-     mkDerivation {
-       pname = "opaleye";
-       version = "0.6.7006.1";
-       sha256 = "0qg42qdk6gcziwfvjsjbwyj629grna2ay4pmh8myy3d1rznp6s93";
-       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 bytestring containers contravariant dotenv hspec
-         hspec-discover multiset postgresql-simple product-profunctors
-         profunctors QuickCheck semigroups text time transformers uuid
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "An SQL-generating DSL targeting PostgreSQL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "opaleye_0_7_1_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , case-insensitive, containers, contravariant, dotenv, hspec
      , hspec-discover, multiset, postgresql-simple, pretty
@@ -189487,7 +186494,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opaleye-classy" = callPackage
@@ -190307,16 +187313,6 @@ self: {
      }) {};
 
   "opentelemetry" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions }:
-     mkDerivation {
-       pname = "opentelemetry";
-       version = "0.4.2";
-       sha256 = "12myg932dpf6zz38ahf9dmx449dkp9kf9pi79j8bdlz4v2fl3jzj";
-       libraryHaskellDepends = [ base bytestring exceptions ];
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "opentelemetry_0_6_1" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events
      , hashable
      }:
@@ -190328,46 +187324,9 @@ self: {
          base bytestring exceptions ghc-trace-events hashable
        ];
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opentelemetry-extra" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, clock, containers
-     , directory, exceptions, filepath, ghc-events, hashable
-     , http-client, http-client-tls, http-types, opentelemetry
-     , optparse-applicative, process, QuickCheck, random, scientific
-     , splitmix, stm, tasty, tasty-discover, tasty-hunit
-     , tasty-quickcheck, text, text-show, typed-process
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "opentelemetry-extra";
-       version = "0.4.2";
-       sha256 = "1qr2pz08n7kqx5jcyxhfwrsqlw7lbkkjbrm0fdj5mxykwznqidb8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring clock containers directory exceptions
-         filepath ghc-events hashable http-client http-client-tls http-types
-         opentelemetry random scientific splitmix stm text text-show
-         unordered-containers
-       ];
-       executableHaskellDepends = [
-         async base clock exceptions filepath http-client http-client-tls
-         opentelemetry optparse-applicative process text typed-process
-       ];
-       testHaskellDepends = [
-         base bytestring ghc-events hashable opentelemetry QuickCheck tasty
-         tasty-discover tasty-hunit tasty-quickcheck text text-show
-         unordered-containers
-       ];
-       testToolDepends = [ tasty-discover ];
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "opentelemetry-extra_0_6_1" = callPackage
     ({ mkDerivation, aeson, async, base, binary, bytestring, clock
      , containers, directory, exceptions, filepath, gauge
      , generic-arbitrary, ghc-events, hashable, hashtables, http-client
@@ -190421,34 +187380,6 @@ self: {
      }) {};
 
   "opentelemetry-lightstep" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, clock, containers
-     , exceptions, filepath, ghc-events, http-client, http-client-tls
-     , http-types, network, opentelemetry, opentelemetry-extra
-     , scientific, splitmix, stm, text, typed-process
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "opentelemetry-lightstep";
-       version = "0.4.2";
-       sha256 = "1srzm9d4sc9rgfgq2yyfn5avs9n8bjx9mhz124dhkn3j361sr5g2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring exceptions http-client http-client-tls
-         http-types network opentelemetry opentelemetry-extra scientific stm
-         text unordered-containers
-       ];
-       executableHaskellDepends = [
-         async base bytestring clock containers exceptions filepath
-         ghc-events http-client http-types opentelemetry opentelemetry-extra
-         splitmix text typed-process unordered-containers
-       ];
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "opentelemetry-lightstep_0_6_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, clock, containers
      , exceptions, filepath, ghc-events, http-client, http-client-tls
      , http-types, network, opentelemetry, opentelemetry-extra
@@ -190477,22 +187408,6 @@ self: {
      }) {};
 
   "opentelemetry-wai" = callPackage
-    ({ mkDerivation, base, bytestring, http-types, opentelemetry, text
-     , wai
-     }:
-     mkDerivation {
-       pname = "opentelemetry-wai";
-       version = "0.4.2";
-       sha256 = "01jim0634pzf49l18s7512y7a3dkjpif492k6a5j81jg1nylkm1a";
-       libraryHaskellDepends = [
-         base bytestring http-types opentelemetry text wai
-       ];
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "opentelemetry-wai_0_6_1" = callPackage
     ({ mkDerivation, base, bytestring, http-types, opentelemetry, text
      , wai
      }:
@@ -190940,32 +187855,6 @@ self: {
      }) {};
 
   "optics" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, criterion
-     , indexed-profunctors, inspection-testing, lens, mtl, optics-core
-     , optics-extra, optics-th, random, tasty, tasty-hunit
-     , template-haskell, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "optics";
-       version = "0.2";
-       sha256 = "0q80rambmw387dq23nsywzpwrvi8vjy9sg1fl2qwc2is6xki6pcl";
-       libraryHaskellDepends = [
-         array base containers mtl optics-core optics-extra optics-th
-         transformers
-       ];
-       testHaskellDepends = [
-         base containers indexed-profunctors inspection-testing mtl
-         optics-core random tasty tasty-hunit template-haskell
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion lens transformers
-         unordered-containers vector
-       ];
-       description = "Optics as an abstract interface";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optics_0_3" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, criterion
      , indexed-profunctors, inspection-testing, lens, mtl, optics-core
      , optics-extra, optics-th, QuickCheck, random, tasty, tasty-hunit
@@ -190991,27 +187880,9 @@ self: {
        ];
        description = "Optics as an abstract interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optics-core" = callPackage
-    ({ mkDerivation, array, base, containers, indexed-profunctors
-     , transformers
-     }:
-     mkDerivation {
-       pname = "optics-core";
-       version = "0.2";
-       sha256 = "19hsax8wxxgr28rjz6p9afb06f338xnyvws7salmm1dsik1ghzr8";
-       revision = "1";
-       editedCabalFile = "1sghrm6xyflzkv350phcm344ljv82wk2vjnwhwyvcqwirkwg8rk9";
-       libraryHaskellDepends = [
-         array base containers indexed-profunctors transformers
-       ];
-       description = "Optics as an abstract interface: core definitions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optics-core_0_3_0_1" = callPackage
     ({ mkDerivation, array, base, containers, indexed-profunctors
      , transformers
      }:
@@ -191024,27 +187895,9 @@ self: {
        ];
        description = "Optics as an abstract interface: core definitions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optics-extra" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, hashable
-     , indexed-profunctors, mtl, optics-core, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "optics-extra";
-       version = "0.2";
-       sha256 = "16n64dyii8b9w1prc73qwfjhinzixckd1xlmb4x8i1jlw2dbz5d1";
-       libraryHaskellDepends = [
-         array base bytestring containers hashable indexed-profunctors mtl
-         optics-core text transformers unordered-containers vector
-       ];
-       description = "Extra utilities and instances for optics-core";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optics-extra_0_3" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, hashable
      , indexed-profunctors, mtl, optics-core, text, transformers
      , unordered-containers, vector
@@ -191059,27 +187912,9 @@ self: {
        ];
        description = "Extra utilities and instances for optics-core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optics-th" = callPackage
-    ({ mkDerivation, base, containers, mtl, optics-core
-     , template-haskell, th-abstraction, transformers
-     }:
-     mkDerivation {
-       pname = "optics-th";
-       version = "0.2";
-       sha256 = "12hij9b5gqq1gdh7zbv09dsqbf9pr7wf2ywjnbf319sn20cn8fv8";
-       libraryHaskellDepends = [
-         base containers mtl optics-core template-haskell th-abstraction
-         transformers
-       ];
-       testHaskellDepends = [ base optics-core ];
-       description = "Optics construction using TemplateHaskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optics-th_0_3_0_2" = callPackage
     ({ mkDerivation, base, containers, mtl, optics-core, tagged
      , template-haskell, th-abstraction, transformers
      }:
@@ -191096,25 +187931,9 @@ self: {
        testHaskellDepends = [ base optics-core tagged ];
        description = "Optics construction using TemplateHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optics-vl" = callPackage
-    ({ mkDerivation, base, indexed-profunctors, optics-core
-     , profunctors
-     }:
-     mkDerivation {
-       pname = "optics-vl";
-       version = "0.2";
-       sha256 = "0gd61ha93bws7fchjghc6bca9g8jgli0v6cl24g8ii2c22jgga6x";
-       libraryHaskellDepends = [
-         base indexed-profunctors optics-core profunctors
-       ];
-       description = "Utilities for compatibility with van Laarhoven optics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optics-vl_0_2_1" = callPackage
     ({ mkDerivation, base, indexed-profunctors, optics-core
      , profunctors
      }:
@@ -191127,7 +187946,6 @@ self: {
        ];
        description = "Utilities for compatibility with van Laarhoven optics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optima" = callPackage
@@ -191934,35 +188752,6 @@ self: {
      }) {};
 
   "ormolu" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dlist, exceptions
-     , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl
-     , optparse-applicative, path, path-io, syb, text
-     }:
-     mkDerivation {
-       pname = "ormolu";
-       version = "0.1.3.0";
-       sha256 = "13s8irk1w7yrh9algbnvv5hjvnxmi3fndz34rncp33cyfnjv18j7";
-       revision = "1";
-       editedCabalFile = "1x8zkrrldalawrc7az5i1bdp4w1xvl195d9wq2mwyzkv5nih8gaa";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers dlist exceptions ghc-lib-parser mtl syb
-         text
-       ];
-       executableHaskellDepends = [
-         base ghc-lib-parser gitrev optparse-applicative text
-       ];
-       testHaskellDepends = [
-         base containers filepath hspec path path-io text
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A formatter for Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ormolu_0_1_3_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, dlist, exceptions
      , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl
      , optparse-applicative, path, path-io, syb, text
@@ -191987,7 +188776,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A formatter for Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orthotope" = callPackage
@@ -192937,63 +189725,6 @@ self: {
      }) {};
 
   "pandoc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base-compat
-     , base-noprelude, base64-bytestring, binary, blaze-html
-     , blaze-markup, bytestring, case-insensitive, cmark-gfm, containers
-     , criterion, data-default, deepseq, Diff, directory, doclayout
-     , doctemplates, emojis, exceptions, executable-path, filepath, Glob
-     , haddock-library, hslua, hslua-module-system, hslua-module-text
-     , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb
-     , jira-wiki-markup, JuicyPixels, mtl, network, network-uri
-     , pandoc-types, parsec, process, QuickCheck, random, safe
-     , scientific, SHA, skylighting, skylighting-core, split, syb
-     , tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua
-     , tasty-quickcheck, temporary, texmath, text, text-conversions
-     , time, unicode-transforms, unix, unordered-containers, vector
-     , weigh, xml, zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "pandoc";
-       version = "2.9.2.1";
-       sha256 = "0myz7firqkx4k0vrsd62j443gvm2pk09bi69c8qdbdzq5hvkavf2";
-       configureFlags = [ "-fhttps" "-f-trypandoc" ];
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty attoparsec base-compat base-noprelude
-         base64-bytestring binary blaze-html blaze-markup bytestring
-         case-insensitive cmark-gfm containers data-default deepseq
-         directory doclayout doctemplates emojis exceptions filepath Glob
-         haddock-library hslua hslua-module-system hslua-module-text HsYAML
-         HTTP http-client http-client-tls http-types ipynb jira-wiki-markup
-         JuicyPixels mtl network network-uri pandoc-types parsec process
-         random safe scientific SHA skylighting skylighting-core split syb
-         tagsoup temporary texmath text text-conversions time
-         unicode-transforms unix unordered-containers vector xml zip-archive
-         zlib
-       ];
-       executableHaskellDepends = [ base-compat base-noprelude ];
-       testHaskellDepends = [
-         base-compat base-noprelude base64-bytestring bytestring containers
-         Diff directory doctemplates executable-path filepath Glob hslua mtl
-         pandoc-types process QuickCheck tasty tasty-golden tasty-hunit
-         tasty-lua tasty-quickcheck temporary text time xml zip-archive
-       ];
-       benchmarkHaskellDepends = [
-         base-compat base-noprelude bytestring containers criterion mtl text
-         time weigh
-       ];
-       postInstall = ''
-         mkdir -p $out/share/man/man1
-         mv "man/"*.1 $out/share/man/man1/
-       '';
-       description = "Conversion between markup formats";
-       license = stdenv.lib.licenses.gpl2;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "pandoc_2_11_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , case-insensitive, citeproc, commonmark, commonmark-extensions
@@ -193047,48 +189778,10 @@ self: {
        '';
        description = "Conversion between markup formats";
        license = stdenv.lib.licenses.gpl2Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "pandoc-citeproc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , Cabal, containers, data-default, directory, filepath, hs-bibutils
-     , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc
-     , pandoc-types, parsec, process, rfc5051, safe, setenv, split, syb
-     , tagsoup, temporary, text, time, unordered-containers, vector
-     , xml-conduit, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-citeproc";
-       version = "0.17.0.1";
-       sha256 = "0hi31h4jxamnyw0jsbwnbzy9gkp3a03mhsgwy9w73hi13lywxrgk";
-       revision = "1";
-       editedCabalFile = "0z1gnaagylsjx8f1i49bp4zhcx2hlkc3w9wkwzsvvjq0qcfgzis0";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hs-bibutils HsYAML HsYAML-aeson mtl network 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 bytestring filepath libyaml
-         pandoc pandoc-types safe syb text yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath mtl pandoc
-         pandoc-types process temporary text yaml
-       ];
-       doCheck = false;
-       description = "Supports using pandoc with citeproc";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-citeproc_0_17_0_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
      , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc
@@ -193121,7 +189814,6 @@ self: {
        doCheck = false;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -193427,46 +190119,6 @@ self: {
      }) {};
 
   "pandoc-plot" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, criterion
-     , data-default-class, deepseq, directory, filepath, githash
-     , hashable, hspec, hspec-expectations, mtl, open-browser
-     , optparse-applicative, pandoc, pandoc-types, shakespeare, tasty
-     , tasty-hspec, tasty-hunit, template-haskell, temporary, text
-     , turtle, typed-process, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-plot";
-       version = "0.6.1.0";
-       sha256 = "0jyhb1ab6h990r159a3gdw0cbxxvjrjsd35yyca5bd5rqxzlvnay";
-       revision = "1";
-       editedCabalFile = "1kn5k6xrjs1gh273hc8zrp85w8g72g3rz79v5n4qk33n0pg6ydvw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         async base bytestring containers data-default-class directory
-         filepath hashable mtl pandoc pandoc-types shakespeare temporary
-         text turtle typed-process yaml
-       ];
-       executableHaskellDepends = [
-         base deepseq directory filepath githash open-browser
-         optparse-applicative pandoc pandoc-types template-haskell temporary
-         text
-       ];
-       testHaskellDepends = [
-         base containers data-default-class directory filepath hspec
-         hspec-expectations mtl pandoc-types tasty tasty-hspec tasty-hunit
-         temporary text
-       ];
-       benchmarkHaskellDepends = [
-         base criterion pandoc-types template-haskell text
-       ];
-       description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "pandoc-plot_1_0_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion
      , data-default, directory, filepath, githash, hashable, hspec
      , hspec-expectations, lifted-async, lifted-base, mtl
@@ -193579,31 +190231,6 @@ self: {
      }) {};
 
   "pandoc-types" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "pandoc-types";
-       version = "1.20";
-       sha256 = "0wz89ywyhvxz8daw4ia132kg6ynx5y4wva4g899wvq4kyjy1dixa";
-       revision = "1";
-       editedCabalFile = "16l4gy0v34nrb6z3pag6i3gl6m4af5j6wg6yzyiga124xpqzhql3";
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq ghc-prim QuickCheck syb
-         text transformers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers HUnit QuickCheck string-qq syb
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-       ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Types for representing a structured document";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-types_1_22" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -193624,7 +190251,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-unlit" = callPackage
@@ -193902,8 +190528,8 @@ self: {
      }:
      mkDerivation {
        pname = "pantry";
-       version = "0.4.0.2";
-       sha256 = "13rrd64qn96r9w623lns4cngalc2c0p2z1xzc0wv35kr3psnxwb4";
+       version = "0.5.1.3";
+       sha256 = "0yx30zhyq0wbda6z8a9lvp8c83b3nj4l2s8lcxnvwgnzkanvlkss";
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring Cabal casa-client casa-types
          conduit conduit-extra containers cryptonite cryptonite-conduit
@@ -194803,29 +191429,6 @@ self: {
      }) {};
 
   "paripari" = callPackage
-    ({ mkDerivation, base, bytestring, parser-combinators, random
-     , tasty, tasty-hunit, text
-     }:
-     mkDerivation {
-       pname = "paripari";
-       version = "0.6.0.1";
-       sha256 = "1i82rwd2ysplqazqnarnshdrg8gjsbgh9kzn0mc4avl2lfi3pk16";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring parser-combinators text
-       ];
-       executableHaskellDepends = [
-         base bytestring parser-combinators text
-       ];
-       testHaskellDepends = [
-         base bytestring parser-combinators random tasty tasty-hunit text
-       ];
-       description = "Parser combinators with fast-path and slower fallback for error reporting";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "paripari_0_7_0_0" = callPackage
     ({ mkDerivation, base, bytestring, parser-combinators, random
      , tasty, tasty-hunit, text
      }:
@@ -194846,7 +191449,6 @@ self: {
        ];
        description = "Parser combinators with fast-path and slower fallback for error reporting";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parport" = callPackage
@@ -197918,8 +194520,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent";
-       version = "2.10.5.2";
-       sha256 = "1jlkgqr11bprfajadr9z7n0j1w741n8ns6w4fmm3x7prislgnqh1";
+       version = "2.10.5.3";
+       sha256 = "18d9x12v4zldyzjm35gxzlcljqrmgpr1501zwdayy1h6iy7lbfb8";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html bytestring
          conduit containers fast-logger http-api-data monad-logger mtl
@@ -198713,29 +195315,6 @@ self: {
      }) {};
 
   "persistent-test" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit
-     , containers, exceptions, hspec, hspec-expectations, HUnit
-     , monad-control, monad-logger, path-pieces, persistent
-     , persistent-template, QuickCheck, quickcheck-instances, random
-     , resourcet, text, time, transformers, transformers-base, unliftio
-     , unliftio-core, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-test";
-       version = "2.0.3.1";
-       sha256 = "11aq5cy0n43jamf6mg4sr4300bc2zdbjxsczzxwjkb4hzs0ijsdv";
-       libraryHaskellDepends = [
-         aeson base blaze-html bytestring conduit containers exceptions
-         hspec hspec-expectations HUnit monad-control monad-logger
-         path-pieces persistent persistent-template QuickCheck
-         quickcheck-instances random resourcet text time transformers
-         transformers-base unliftio unliftio-core unordered-containers
-       ];
-       description = "Tests for Persistent";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "persistent-test_2_0_3_5" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit
      , containers, exceptions, hspec, hspec-expectations, HUnit
      , monad-control, monad-logger, mtl, path-pieces, persistent
@@ -198756,7 +195335,6 @@ self: {
        ];
        description = "Tests for Persistent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-typed-db" = callPackage
@@ -202921,27 +199499,6 @@ self: {
      }) {};
 
   "poly" = callPackage
-    ({ mkDerivation, base, deepseq, gauge, mod, primitive, QuickCheck
-     , quickcheck-classes, semirings, tasty, tasty-quickcheck, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "poly";
-       version = "0.4.0.0";
-       sha256 = "14fqwzpivk5ic06ip5b2axvmzyrfqsba8iq4mdl70k6icv7nc8jr";
-       libraryHaskellDepends = [
-         base deepseq primitive semirings vector vector-algorithms
-       ];
-       testHaskellDepends = [
-         base mod QuickCheck quickcheck-classes semirings tasty
-         tasty-quickcheck vector
-       ];
-       benchmarkHaskellDepends = [ base deepseq gauge semirings vector ];
-       description = "Polynomials";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "poly_0_5_0_0" = callPackage
     ({ mkDerivation, base, deepseq, doctest, finite-typelits, gauge
      , mod, primitive, QuickCheck, quickcheck-classes, semirings, tasty
      , tasty-quickcheck, vector, vector-algorithms, vector-sized
@@ -202963,7 +199520,6 @@ self: {
        ];
        description = "Polynomials";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "poly-arity" = callPackage
@@ -203140,41 +199696,6 @@ self: {
      }) {};
 
   "polysemy" = callPackage
-    ({ mkDerivation, async, base, Cabal, cabal-doctest, containers
-     , criterion, doctest, first-class-families, free, freer-simple
-     , hspec, hspec-discover, inspection-testing, mtl, QuickCheck, stm
-     , syb, template-haskell, th-abstraction, transformers, type-errors
-     , type-errors-pretty, unagi-chan
-     }:
-     mkDerivation {
-       pname = "polysemy";
-       version = "1.3.0.0";
-       sha256 = "0p5g1n5b0dfkadqpqf2ka25dblimwqhxwx5ax0mxwixb0jwd0pvb";
-       revision = "2";
-       editedCabalFile = "1dn5897ggd6rf5ffl6k52x4ghncgv2ls14nppayw9l9zi1mfjxps";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         async base containers first-class-families mtl QuickCheck stm syb
-         template-haskell th-abstraction transformers type-errors
-         type-errors-pretty unagi-chan
-       ];
-       testHaskellDepends = [
-         async base containers doctest first-class-families hspec
-         inspection-testing mtl QuickCheck stm syb template-haskell
-         th-abstraction transformers type-errors type-errors-pretty
-         unagi-chan
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         async base containers criterion first-class-families free
-         freer-simple mtl QuickCheck stm syb template-haskell th-abstraction
-         transformers type-errors type-errors-pretty unagi-chan
-       ];
-       description = "Higher-order, low-boilerplate, zero-cost free monads";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "polysemy_1_4_0_0" = callPackage
     ({ mkDerivation, async, base, Cabal, cabal-doctest, containers
      , criterion, doctest, first-class-families, free, freer-simple
      , hspec, hspec-discover, inspection-testing, mtl, QuickCheck, stm
@@ -203205,7 +199726,6 @@ self: {
        ];
        description = "Higher-order, low-boilerplate free monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polysemy-RandomFu" = callPackage
@@ -204632,35 +201152,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, text, time, transformers, unordered-containers
-     , uuid, vector
-     }:
-     mkDerivation {
-       pname = "postgresql-binary";
-       version = "0.12.2";
-       sha256 = "1zkhwl8g141p1zgnbxjhh0r6wgvzlpwdbvyl80z31fdxd5v29bv8";
-       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 ];
-       description = "Encoders and decoders for the PostgreSQL's binary format";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "postgresql-binary_0_12_3_1" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, bytestring-strict-builder, containers, conversion
      , conversion-bytestring, conversion-text, criterion, json-ast
@@ -204687,7 +201178,6 @@ self: {
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-common" = callPackage
@@ -204791,22 +201281,6 @@ self: {
      }) {};
 
   "postgresql-libpq" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
-     mkDerivation {
-       pname = "postgresql-libpq";
-       version = "0.9.4.2";
-       sha256 = "1y86kysakfcf3zq252yl2llrx3765vxvkdwda4q5ql7ikv3m786f";
-       revision = "2";
-       editedCabalFile = "1i0z3c0d657050kfggr5z8y4hmcqkckm2x1gn3fjbdzyx3p1rcaa";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base bytestring unix ];
-       librarySystemDepends = [ postgresql ];
-       testHaskellDepends = [ base bytestring ];
-       description = "low-level binding to libpq";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) postgresql;};
-
-  "postgresql-libpq_0_9_4_3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
      mkDerivation {
        pname = "postgresql-libpq";
@@ -204818,7 +201292,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "low-level binding to libpq";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
   "postgresql-libpq-notify" = callPackage
@@ -205400,52 +201873,6 @@ self: {
      }) {};
 
   "postgrest" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async
-     , auto-update, base, base64-bytestring, bytestring
-     , case-insensitive, cassava, configurator-pg, containers
-     , contravariant, contravariant-extras, cookie, directory, either
-     , gitrev, hasql, hasql-pool, hasql-transaction, heredoc, hspec
-     , hspec-wai, hspec-wai-json, HTTP, http-types
-     , insert-ordered-containers, interpolatedstring-perl6, jose, lens
-     , lens-aeson, monad-control, network, network-uri
-     , optparse-applicative, parsec, process, protolude, Ranged-sets
-     , regex-tdfa, retry, scientific, swagger2, text, time
-     , transformers-base, unix, unordered-containers, vector, wai
-     , wai-cors, wai-extra, wai-middleware-static, warp
-     }:
-     mkDerivation {
-       pname = "postgrest";
-       version = "7.0.0";
-       sha256 = "03iya4w39qp25ms8m58mw6pvlriw80h6rdg1cb7az7353m2ndzys";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint base base64-bytestring bytestring
-         case-insensitive cassava configurator-pg containers contravariant
-         contravariant-extras cookie either gitrev hasql hasql-pool
-         hasql-transaction heredoc HTTP http-types insert-ordered-containers
-         interpolatedstring-perl6 jose lens lens-aeson network-uri
-         optparse-applicative parsec protolude Ranged-sets regex-tdfa
-         scientific swagger2 text time unordered-containers vector wai
-         wai-cors wai-extra wai-middleware-static
-       ];
-       executableHaskellDepends = [
-         auto-update base base64-bytestring bytestring directory either
-         hasql hasql-pool hasql-transaction network protolude retry text
-         time unix wai warp
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq async auto-update base base64-bytestring bytestring
-         case-insensitive cassava containers contravariant hasql hasql-pool
-         hasql-transaction heredoc hspec hspec-wai hspec-wai-json http-types
-         lens lens-aeson monad-control process protolude regex-tdfa text
-         time transformers-base wai wai-extra
-       ];
-       description = "REST API for any Postgres database";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "postgrest_7_0_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async
      , auto-update, base, base64-bytestring, bytestring
      , case-insensitive, cassava, configurator-pg, containers
@@ -205491,7 +201918,6 @@ self: {
        ];
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgrest-ws" = callPackage
@@ -206860,8 +203286,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-simple";
-       version = "3.2.3.0";
-       sha256 = "1sr66sawacv0ks0znip0jxpz98lvjacara8sqfm53i0pqf8c0qla";
+       version = "3.3.0.0";
+       sha256 = "0g83958npqscqqz2lh5m0m666qp8ldwps4l5gvfip4b1zgy3f5nh";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -207364,24 +203790,6 @@ self: {
      }) {};
 
   "primitive" = callPackage
-    ({ mkDerivation, base, base-orphans, ghc-prim, QuickCheck
-     , semigroups, tagged, tasty, tasty-quickcheck, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "primitive";
-       version = "0.7.0.1";
-       sha256 = "1pgpjzlfn037lw7lsszpqmqhbf33fnd86jna1whdd4pl57cbg2yx";
-       libraryHaskellDepends = [ base ghc-prim transformers ];
-       testHaskellDepends = [
-         base base-orphans ghc-prim QuickCheck semigroups tagged tasty
-         tasty-quickcheck transformers transformers-compat
-       ];
-       description = "Primitive memory-related operations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "primitive_0_7_1_0" = callPackage
     ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, QuickCheck
      , quickcheck-classes-base, semigroups, tagged, tasty
      , tasty-quickcheck, transformers, transformers-compat
@@ -207398,7 +203806,6 @@ self: {
        ];
        description = "Primitive memory-related operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primitive-addr" = callPackage
@@ -208304,23 +204711,6 @@ self: {
      }) {};
 
   "product-profunctors" = callPackage
-    ({ mkDerivation, base, bifunctors, contravariant, criterion
-     , deepseq, profunctors, tagged, template-haskell
-     }:
-     mkDerivation {
-       pname = "product-profunctors";
-       version = "0.10.0.1";
-       sha256 = "15q6mgn42in4df61251q8h2d7hgvflik93xngc7jyyxj4ymaz5yh";
-       libraryHaskellDepends = [
-         base bifunctors contravariant profunctors tagged template-haskell
-       ];
-       testHaskellDepends = [ base profunctors ];
-       benchmarkHaskellDepends = [ base criterion deepseq ];
-       description = "product-profunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "product-profunctors_0_11_0_1" = callPackage
     ({ mkDerivation, base, bifunctors, contravariant, criterion
      , deepseq, profunctors, tagged, template-haskell
      }:
@@ -208337,7 +204727,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prof-flamegraph" = callPackage
@@ -209810,23 +206199,6 @@ self: {
      }) {};
 
   "protolude" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, containers
-     , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "protolude";
-       version = "0.2.4";
-       sha256 = "0vkrj1fxbndkmsja9d80k4q5c48gwdbjlnzx3iag02dlj05j34hi";
-       libraryHaskellDepends = [
-         array async base bytestring containers deepseq ghc-prim hashable
-         mtl mtl-compat stm text transformers transformers-compat
-       ];
-       description = "A small prelude";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "protolude_0_3_0" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text
      , transformers, transformers-compat
@@ -209843,7 +206215,6 @@ self: {
        ];
        description = "A small prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protolude-lifted" = callPackage
@@ -211105,30 +207476,6 @@ self: {
      }) {};
 
   "pusher-http-haskell" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , cryptonite, hashable, hspec, http-client, http-types, memory
-     , QuickCheck, scientific, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pusher-http-haskell";
-       version = "1.5.1.14";
-       sha256 = "0gfn5rfyyhbrl6sq7b6qyg86afww60c9g8y65m0qci6c91jbrv3a";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hashable
-         http-client http-types memory text time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hspec
-         http-client http-types QuickCheck scientific text time transformers
-         unordered-containers vector
-       ];
-       description = "Haskell client library for the Pusher Channels HTTP API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pusher-http-haskell_2_0_0_2" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , cryptonite, hashable, hspec, http-client, http-client-tls
      , http-types, memory, QuickCheck, text, time, unordered-containers
@@ -211147,7 +207494,6 @@ self: {
        ];
        description = "Haskell client library for the Pusher Channels HTTP API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pusher-ws" = callPackage
@@ -211290,22 +207636,6 @@ self: {
      }) {};
 
   "pvar" = callPackage
-    ({ mkDerivation, async, base, deepseq, genvalidity, hspec
-     , primitive, QuickCheck
-     }:
-     mkDerivation {
-       pname = "pvar";
-       version = "0.2.0.0";
-       sha256 = "183pc9xk4b62rrmchzqxi1wvys8k118zi7060wr0xm2azn7wny6h";
-       libraryHaskellDepends = [ base deepseq primitive ];
-       testHaskellDepends = [
-         async base deepseq genvalidity hspec primitive QuickCheck
-       ];
-       description = "Mutable variable with primitive values";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pvar_1_0_0_0" = callPackage
     ({ mkDerivation, async, base, deepseq, genvalidity, hspec
      , primitive, QuickCheck
      }:
@@ -211321,7 +207651,6 @@ self: {
        ];
        description = "Mutable variable with primitive values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pvd" = callPackage
@@ -213630,21 +209959,6 @@ self: {
      }) {};
 
   "radius" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cryptonite, iproute
-     , memory
-     }:
-     mkDerivation {
-       pname = "radius";
-       version = "0.6.1.0";
-       sha256 = "0q12vlqwpnsxr3i26b6v8z4rpvwmqsx0n171lhki9wc57v3mxgdy";
-       libraryHaskellDepends = [
-         base binary bytestring cryptonite iproute memory
-       ];
-       description = "Remote Authentication Dial In User Service (RADIUS)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "radius_0_7_1_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, cryptonite, iproute
      , lens, memory
      }:
@@ -213657,7 +209971,6 @@ self: {
        ];
        description = "Remote Authentication Dial In User Service (RADIUS)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radix" = callPackage
@@ -214282,6 +210595,25 @@ self: {
      }) {};
 
   "random-fu" = callPackage
+    ({ mkDerivation, base, erf, math-functions, monad-loops, mtl
+     , random-shuffle, random-source, rvar, syb, template-haskell
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "random-fu";
+       version = "0.2.7.4";
+       sha256 = "13dgx069lvdfxm7l2q2l6d7q0gd3wp41b8l4l6wmhlfbl5xici3m";
+       libraryHaskellDepends = [
+         base erf math-functions monad-loops mtl random-shuffle
+         random-source rvar syb template-haskell transformers vector
+       ];
+       description = "Random number generation";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "random-fu_0_2_7_7" = callPackage
     ({ mkDerivation, base, erf, math-functions, monad-loops, mtl
      , random, random-shuffle, random-source, rvar, syb
      , template-haskell, transformers, vector
@@ -214356,6 +210688,25 @@ self: {
      }) {};
 
   "random-source" = callPackage
+    ({ mkDerivation, base, flexible-defaults, mersenne-random-pure64
+     , mtl, mwc-random, primitive, random, stateref, syb
+     , template-haskell, th-extras
+     }:
+     mkDerivation {
+       pname = "random-source";
+       version = "0.3.0.8";
+       sha256 = "0kjvpmxhff6id99hhgjp3vvb4vlhs3shkrh1n5cbfm7450lpmmn2";
+       libraryHaskellDepends = [
+         base flexible-defaults mersenne-random-pure64 mtl mwc-random
+         primitive random stateref syb template-haskell th-extras
+       ];
+       description = "Generic basis for random number generators";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "random-source_0_3_0_11" = callPackage
     ({ mkDerivation, base, flexible-defaults, mersenne-random-pure64
      , mtl, mwc-random, primitive, random, stateref, syb
      , template-haskell, th-extras
@@ -214622,8 +210973,8 @@ self: {
      }:
      mkDerivation {
        pname = "rank2classes";
-       version = "1.3.2.1";
-       sha256 = "1sh2ks4qj3ksqs92rm8xzanpwc5ppml04s4mjzyngpgrihwi9924";
+       version = "1.4.0.1";
+       sha256 = "1r72z98jvnih16x074izb0wp9gwbsjs2ihvj8a72xxyakdad71r9";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base distributive template-haskell transformers
@@ -216219,35 +212570,6 @@ self: {
      }) {};
 
   "reanimate" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, array, attoparsec, base
-     , base64-bytestring, bytestring, cassava, cereal, chiphunk, colour
-     , containers, cubicbezier, directory, filepath, fingertree
-     , fsnotify, geojson, hashable, here, hmatrix, JuicyPixels, lens
-     , linear, matrix, mtl, open-browser, optparse-applicative, parallel
-     , process, random, random-shuffle, reanimate-svg, split, temporary
-     , text, time, vector, vector-space, websockets, xml
-     }:
-     mkDerivation {
-       pname = "reanimate";
-       version = "0.3.3.0";
-       sha256 = "0yyhspd13wws99kpb61cw3bc6yrvkxrq86y0p9w4sl66jdl1zbli";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint array attoparsec base base64-bytestring
-         bytestring cassava cereal chiphunk colour containers cubicbezier
-         directory filepath fingertree fsnotify geojson hashable here
-         hmatrix JuicyPixels lens linear matrix mtl open-browser
-         optparse-applicative parallel process random random-shuffle
-         reanimate-svg split temporary text time vector vector-space
-         websockets xml
-       ];
-       description = "Animation library based on SVGs";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "reanimate_1_1_2_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base
      , base64-bytestring, bytestring, cassava, cereal, colour
      , containers, cryptohash-sha256, cubicbezier, directory, filelock
@@ -216287,26 +212609,6 @@ self: {
      }) {};
 
   "reanimate-svg" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , double-conversion, hspec, JuicyPixels, lens, linear, mtl
-     , scientific, svg-tree, text, transformers, vector, xml
-     }:
-     mkDerivation {
-       pname = "reanimate-svg";
-       version = "0.9.8.0";
-       sha256 = "1q7ij7w7zyjmmhhvfpjcx60jvs1p0w4jq9fbcah4ywn4azvr7gjv";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers double-conversion JuicyPixels
-         lens linear mtl scientific text transformers vector xml
-       ];
-       testHaskellDepends = [
-         attoparsec base hspec linear scientific svg-tree
-       ];
-       description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "reanimate-svg_0_13_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, Diff
      , directory, double-conversion, filepath, hashable, JuicyPixels
      , lens, linear, mtl, process, QuickCheck, scientific, tasty
@@ -216329,7 +212631,6 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reason-export" = callPackage
@@ -216687,25 +212988,6 @@ self: {
      }) {};
 
   "recursion-schemes" = callPackage
-    ({ mkDerivation, base, base-orphans, comonad, free, HUnit
-     , template-haskell, th-abstraction, transformers
-     }:
-     mkDerivation {
-       pname = "recursion-schemes";
-       version = "5.1.3";
-       sha256 = "0a0mkwy3sxg5f1mdlblpn0xl3lwgilnmzs94jqab0pqx9gjkc5xj";
-       revision = "2";
-       editedCabalFile = "01q18gplv5k328qf74innnx2z2p15pg5nc6sikxq6fkkw4v3rkyb";
-       libraryHaskellDepends = [
-         base base-orphans comonad free template-haskell th-abstraction
-         transformers
-       ];
-       testHaskellDepends = [ base HUnit template-haskell transformers ];
-       description = "Representing common recursion patterns as higher-order functions";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "recursion-schemes_5_2_1" = callPackage
     ({ mkDerivation, base, base-orphans, comonad, containers, data-fix
      , free, HUnit, template-haskell, th-abstraction, transformers
      }:
@@ -216720,7 +213002,6 @@ self: {
        testHaskellDepends = [ base HUnit template-haskell transformers ];
        description = "Representing common recursion patterns as higher-order functions";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "recursion-schemes-ext" = callPackage
@@ -218031,21 +214312,6 @@ self: {
      }) {};
 
   "reform-happstack" = callPackage
-    ({ mkDerivation, base, bytestring, happstack-server, mtl, random
-     , reform, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "reform-happstack";
-       version = "0.2.5.3";
-       sha256 = "04fnn47rcm7n98q0qifyyg9jrh09mzchirwsgi2zzb6j9mciz6ci";
-       libraryHaskellDepends = [
-         base bytestring happstack-server mtl random reform text utf8-string
-       ];
-       description = "Happstack support for reform";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "reform-happstack_0_2_5_4" = callPackage
     ({ mkDerivation, base, bytestring, happstack-server, mtl, random
      , reform, text, utf8-string
      }:
@@ -218058,7 +214324,6 @@ self: {
        ];
        description = "Happstack support for reform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reform-hsp" = callPackage
@@ -218251,24 +214516,6 @@ self: {
      }) {};
 
   "regex-applicative" = callPackage
-    ({ mkDerivation, base, containers, criterion, smallcheck, tasty
-     , tasty-hunit, tasty-smallcheck, transformers
-     }:
-     mkDerivation {
-       pname = "regex-applicative";
-       version = "0.3.3.1";
-       sha256 = "0p0anx5vamrhrdvviwkh2zn6pa3pv2bjb7nfyc7dvz2q7g14y1lg";
-       libraryHaskellDepends = [ base containers transformers ];
-       testHaskellDepends = [
-         base containers smallcheck tasty tasty-hunit tasty-smallcheck
-         transformers
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Regex-based parsing with applicative interface";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "regex-applicative_0_3_4" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , criterion, deepseq, filtrable, megaparsec, parsec, parsers
      , parsers-megaparsec, smallcheck, tasty, tasty-hunit
@@ -218289,7 +214536,6 @@ self: {
        ];
        description = "Regex-based parsing with applicative interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-applicative-text" = callPackage
@@ -219008,35 +215254,6 @@ self: {
      }) {};
 
   "registry" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, directory
-     , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph
-     , MonadRandom, mtl, multimap, protolude, random, resourcet
-     , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog
-     , tasty-th, template-haskell, text, transformers-base, universum
-     }:
-     mkDerivation {
-       pname = "registry";
-       version = "0.1.9.3";
-       sha256 = "1x418lv2nnw5ryrinciq1dg7wgmz0zsvv8v3mfrp38rx5x88hbic";
-       libraryHaskellDepends = [
-         base containers exceptions hashable mmorph mtl protolude resourcet
-         semigroupoids semigroups template-haskell text transformers-base
-       ];
-       testHaskellDepends = [
-         async base bytestring containers directory exceptions generic-lens
-         hashable hedgehog io-memoize mmorph MonadRandom mtl multimap
-         protolude random resourcet semigroupoids semigroups tasty
-         tasty-discover tasty-hedgehog tasty-th template-haskell text
-         transformers-base universum
-       ];
-       testToolDepends = [ tasty-discover ];
-       description = "data structure for assembling components";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "registry_0_2_0_1" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph
      , MonadRandom, mtl, multimap, protolude, random, resourcet
@@ -220296,23 +216513,6 @@ self: {
        broken = true;
      }) {};
 
-  "repline" = callPackage
-    ({ mkDerivation, base, containers, exceptions, haskeline, mtl
-     , process
-     }:
-     mkDerivation {
-       pname = "repline";
-       version = "0.2.2.0";
-       sha256 = "06f5df05j295v84j5c4k8bffwkpmrncbz4kpw4sh1pjszp1yv4d1";
-       revision = "1";
-       editedCabalFile = "1x4f1cbn9ylg82h853mqhm0sda6lz76ssk45d0x842pjbn3y46xx";
-       libraryHaskellDepends = [
-         base containers exceptions haskeline mtl process
-       ];
-       description = "Haskeline wrapper for GHCi-like REPL interfaces";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
   "repline_0_3_0_0" = callPackage
     ({ mkDerivation, base, containers, exceptions, haskeline, mtl
      , process
@@ -220330,7 +216530,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "repline_0_4_0_0" = callPackage
+  "repline" = callPackage
     ({ mkDerivation, base, containers, exceptions, haskeline, mtl
      , process
      }:
@@ -220344,7 +216544,6 @@ self: {
        testHaskellDepends = [ base containers mtl process ];
        description = "Haskeline wrapper for GHCi-like REPL interfaces";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repo-based-blog" = callPackage
@@ -220488,36 +216687,6 @@ self: {
      }) {};
 
   "req" = callPackage
-    ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
-     , bytestring, case-insensitive, connection, hspec, hspec-core
-     , hspec-discover, http-api-data, http-client, http-client-tls
-     , http-types, modern-uri, monad-control, mtl, QuickCheck, retry
-     , template-haskell, text, time, transformers, transformers-base
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "req";
-       version = "3.2.0";
-       sha256 = "1r6fkhn99v6vil8khd23pdai3j6wgn724cy00q5x20fn3jz88ksw";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson authenticate-oauth base blaze-builder bytestring
-         case-insensitive connection http-api-data http-client
-         http-client-tls http-types modern-uri monad-control mtl retry
-         template-haskell text time transformers transformers-base
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive hspec
-         hspec-core http-client http-types modern-uri monad-control mtl
-         QuickCheck retry template-haskell text time unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       doCheck = false;
-       description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "req_3_7_0" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
      , bytestring, case-insensitive, connection, exceptions, hspec
      , hspec-core, hspec-discover, http-api-data, http-client
@@ -220546,7 +216715,6 @@ self: {
        doCheck = false;
        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
@@ -221945,19 +218113,6 @@ self: {
      }) {};
 
   "rfc5051" = callPackage
-    ({ mkDerivation, base, bytestring, containers }:
-     mkDerivation {
-       pname = "rfc5051";
-       version = "0.1.0.4";
-       sha256 = "1lxkq414ni986ciml4gbvf463fn55z299knky7pq3ixb1qislpb1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base bytestring containers ];
-       description = "Simple unicode collation as per RFC5051";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rfc5051_0_2" = callPackage
     ({ mkDerivation, base, containers, text }:
      mkDerivation {
        pname = "rfc5051";
@@ -221967,7 +218122,6 @@ self: {
        testHaskellDepends = [ base text ];
        description = "Simple unicode collation as per RFC5051";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rg" = callPackage
@@ -222001,23 +218155,6 @@ self: {
      }) {};
 
   "rhine" = callPackage
-    ({ mkDerivation, base, containers, deepseq, dunai, free
-     , MonadRandom, random, simple-affine-space, time, transformers
-     , vector-sized
-     }:
-     mkDerivation {
-       pname = "rhine";
-       version = "0.6.0";
-       sha256 = "0dmdf1i1z5xj5l9p6vlln8yyy3pa1nd6m1b7spwm8kpfzzw3545f";
-       libraryHaskellDepends = [
-         base containers deepseq dunai free MonadRandom random
-         simple-affine-space time transformers vector-sized
-       ];
-       description = "Functional Reactive Programming with type-level clocks";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rhine_0_7_0" = callPackage
     ({ mkDerivation, base, containers, deepseq, dunai, free
      , MonadRandom, random, simple-affine-space, time, transformers
      , vector-sized
@@ -222032,24 +218169,9 @@ self: {
        ];
        description = "Functional Reactive Programming with type-level clocks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rhine-gloss" = callPackage
-    ({ mkDerivation, base, dunai, gloss, rhine }:
-     mkDerivation {
-       pname = "rhine-gloss";
-       version = "0.6.0.1";
-       sha256 = "1j3sbdlfn6hkksfxa5nw874pm9yxmc8hy14msjfsl3g3y0d501bh";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base dunai gloss rhine ];
-       executableHaskellDepends = [ base ];
-       description = "Gloss backend for Rhine";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rhine-gloss_0_7_0" = callPackage
     ({ mkDerivation, base, dunai, gloss, rhine, transformers }:
      mkDerivation {
        pname = "rhine-gloss";
@@ -222061,7 +218183,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Gloss backend for Rhine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rhythm-game-tutorial" = callPackage
@@ -223152,26 +219273,6 @@ self: {
      }) {inherit (pkgs) rocksdb;};
 
   "rocksdb-query" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, conduit, data-default
-     , hspec, resourcet, rocksdb-haskell, unliftio
-     }:
-     mkDerivation {
-       pname = "rocksdb-query";
-       version = "0.3.2";
-       sha256 = "07bp96sfcj34f4vgi3bynxykrad672hlg9d8rsxc0xxai8iamzrm";
-       libraryHaskellDepends = [
-         base bytestring cereal conduit resourcet rocksdb-haskell unliftio
-       ];
-       testHaskellDepends = [
-         base cereal data-default hspec rocksdb-haskell unliftio
-       ];
-       description = "RocksDB database querying library for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "rocksdb-query_0_4_2" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, data-default
      , hspec, resourcet, rocksdb-haskell-jprupp, unliftio
      }:
@@ -224060,24 +220161,6 @@ self: {
      }) {};
 
   "rpmbuild-order" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, directory
-     , fgl, filepath, optparse-applicative, process, simple-cmd-args
-     }:
-     mkDerivation {
-       pname = "rpmbuild-order";
-       version = "0.3.1";
-       sha256 = "1xa4crcqm4avkpdcksj610gpzk7crfkwa2pk2nn1qsmjsrixfc2b";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring Cabal containers directory fgl filepath
-         optparse-applicative process simple-cmd-args
-       ];
-       description = "Order RPM packages by dependencies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rpmbuild-order_0_4_3_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , directory, extra, fgl, filepath, hspec, optparse-applicative
      , process, simple-cmd, simple-cmd-args, unix
@@ -224099,7 +220182,6 @@ self: {
        testHaskellDepends = [ base extra hspec simple-cmd unix ];
        description = "Order RPM packages by dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rrule" = callPackage
@@ -226708,28 +222790,6 @@ self: {
      }) {};
 
   "scheduler" = callPackage
-    ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions
-     , genvalidity-hspec, hspec, mwc-random, primitive, QuickCheck
-     , template-haskell, unliftio, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "scheduler";
-       version = "1.4.2.3";
-       sha256 = "0xf5gmla5h0k0a84f7b5xyk98xr72a9mygjlg5c913vc29i31ccx";
-       libraryHaskellDepends = [
-         atomic-primops base deepseq exceptions primitive unliftio-core
-       ];
-       testHaskellDepends = [
-         base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck
-         template-haskell unliftio vector
-       ];
-       description = "Work stealing scheduler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "scheduler_1_5_0" = callPackage
     ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions
      , genvalidity-hspec, hspec, mwc-random, primitive, pvar, QuickCheck
      , template-haskell, unliftio, unliftio-core, vector
@@ -227235,37 +223295,6 @@ self: {
      }) {};
 
   "scotty" = callPackage
-    ({ mkDerivation, aeson, async, base, base-compat-batteries
-     , blaze-builder, bytestring, case-insensitive, data-default-class
-     , directory, exceptions, fail, hspec, hspec-discover, hspec-wai
-     , http-types, lifted-base, lucid, monad-control, mtl, nats, network
-     , regex-compat, text, transformers, transformers-base
-     , transformers-compat, wai, wai-extra, warp, weigh
-     }:
-     mkDerivation {
-       pname = "scotty";
-       version = "0.11.6";
-       sha256 = "0ghn41nvkr8vajlm6y12wz3jbbyf4vyklspx0bhyisn1mps53p57";
-       libraryHaskellDepends = [
-         aeson base base-compat-batteries blaze-builder bytestring
-         case-insensitive data-default-class exceptions fail http-types
-         monad-control mtl nats network regex-compat text transformers
-         transformers-base transformers-compat wai wai-extra warp
-       ];
-       testHaskellDepends = [
-         async base bytestring data-default-class directory hspec hspec-wai
-         http-types lifted-base network text wai
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base bytestring data-default-class lucid mtl text transformers
-         weigh
-       ];
-       description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scotty_0_12" = callPackage
     ({ mkDerivation, aeson, async, base, base-compat-batteries
      , blaze-builder, bytestring, case-insensitive, data-default-class
      , directory, exceptions, fail, hspec, hspec-discover, hspec-wai
@@ -227296,7 +223325,6 @@ self: {
        ];
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-binding-play" = callPackage
@@ -227904,27 +223932,6 @@ self: {
      }) {};
 
   "sdl2" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, exceptions, linear
-     , SDL2, StateVar, text, transformers, vector, weigh
-     }:
-     mkDerivation {
-       pname = "sdl2";
-       version = "2.5.2.0";
-       sha256 = "18cgckkq4yj0xwj3pmsfsqxazl7rcmb3f7b45kv9nwvjwyqi0hcw";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring exceptions linear StateVar text transformers vector
-       ];
-       librarySystemDepends = [ SDL2 ];
-       libraryPkgconfigDepends = [ SDL2 ];
-       testHaskellDepends = [ base deepseq linear vector weigh ];
-       description = "Both high- and low-level bindings to the SDL library (version 2.0.6+).";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) SDL2;};
-
-  "sdl2_2_5_3_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, exceptions, linear
      , SDL2, StateVar, text, transformers, vector, weigh
      }:
@@ -227943,7 +223950,6 @@ self: {
        testHaskellDepends = [ base deepseq linear vector weigh ];
        description = "Both high- and low-level bindings to the SDL library (version 2.0.6+).";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2;};
 
   "sdl2-cairo" = callPackage
@@ -228390,29 +224396,6 @@ self: {
      }) {inherit (pkgs) secp256k1;};
 
   "secp256k1-haskell" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, cereal
-     , deepseq, entropy, hashable, hspec, hspec-discover, HUnit
-     , monad-par, mtl, QuickCheck, secp256k1, string-conversions
-     }:
-     mkDerivation {
-       pname = "secp256k1-haskell";
-       version = "0.2.5";
-       sha256 = "12hv8fi2acvv0pmk9scsw584sj2b9hfacr7bhbrry10sihrd4xv4";
-       libraryHaskellDepends = [
-         base base16-bytestring bytestring cereal deepseq entropy hashable
-         QuickCheck string-conversions
-       ];
-       libraryPkgconfigDepends = [ secp256k1 ];
-       testHaskellDepends = [
-         base base16-bytestring bytestring cereal deepseq entropy hashable
-         hspec HUnit monad-par mtl QuickCheck string-conversions
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Bindings for secp256k1";
-       license = stdenv.lib.licenses.mit;
-     }) {inherit (pkgs) secp256k1;};
-
-  "secp256k1-haskell_0_5_0" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, cereal
      , deepseq, entropy, hashable, hspec, hspec-discover, HUnit
      , monad-par, mtl, QuickCheck, secp256k1, string-conversions
@@ -228435,7 +224418,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) secp256k1;};
 
   "secp256k1-legacy" = callPackage
@@ -229144,22 +225126,6 @@ self: {
      }) {};
 
   "semver" = callPackage
-    ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable
-     , tasty, tasty-hunit, text
-     }:
-     mkDerivation {
-       pname = "semver";
-       version = "0.3.4";
-       sha256 = "0swffqyqraz2nxn64mwxp29zfdq7135q2j815yzwh2pk135xmns2";
-       libraryHaskellDepends = [ attoparsec base deepseq hashable text ];
-       testHaskellDepends = [ base tasty tasty-hunit text ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Representation, manipulation, and de/serialisation of Semantic Versions";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "semver_0_4_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable
      , tasty, tasty-hunit, text
      }:
@@ -229174,7 +225140,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Representation, manipulation, and de/serialisation of Semantic Versions";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semver-range" = callPackage
@@ -229589,29 +225554,6 @@ self: {
      }) {};
 
   "sequence-formats" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, errors
-     , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec
-     , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers
-     , vector
-     }:
-     mkDerivation {
-       pname = "sequence-formats";
-       version = "1.4.1";
-       sha256 = "1162qvpaj8zs1510pkq9v6pdny51r0r5bhwnpmrv1a6c8vm723n3";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers errors exceptions foldl
-         lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe
-         transformers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers foldl hspec pipes pipes-safe tasty
-         tasty-hunit transformers vector
-       ];
-       description = "A package with basic parsing utilities for several Bioinformatic data formats";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "sequence-formats_1_5_1_4" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, errors
      , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec
      , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers
@@ -229632,7 +225574,6 @@ self: {
        ];
        description = "A package with basic parsing utilities for several Bioinformatic data formats";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sequenceTools" = callPackage
@@ -229938,37 +225879,6 @@ self: {
      }) {};
 
   "servant" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors
-     , bytestring, Cabal, cabal-doctest, case-insensitive, deepseq
-     , doctest, hspec, hspec-discover, http-api-data, http-media
-     , http-types, mmorph, mtl, network-uri, QuickCheck
-     , quickcheck-instances, singleton-bool, string-conversions, tagged
-     , text, transformers, vault
-     }:
-     mkDerivation {
-       pname = "servant";
-       version = "0.16.2";
-       sha256 = "0yzl1yklbbymlh8jdc4ncrdxkalx2z349v4msbd6wxxrxfkxbz6n";
-       revision = "1";
-       editedCabalFile = "0v913vjklgwyfbn7k2v70943gy4i8ja3y6crpyrg5llxkb81jpbc";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat bifunctors bytestring
-         case-insensitive deepseq http-api-data http-media http-types mmorph
-         mtl network-uri QuickCheck singleton-bool string-conversions tagged
-         text transformers vault
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring doctest hspec http-media mtl
-         QuickCheck quickcheck-instances string-conversions text
-         transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A family of combinators for defining webservices APIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant_0_18_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors
      , bytestring, case-insensitive, deepseq, hspec, hspec-discover
      , http-api-data, http-media, http-types, mmorph, mtl, network-uri
@@ -229992,7 +225902,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-JuicyPixels" = callPackage
@@ -230043,19 +225952,6 @@ self: {
      }) {};
 
   "servant-auth" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "servant-auth";
-       version = "0.3.2.0";
-       sha256 = "12s1m7vqp0ka8nani4cnrb6fad2y5mxji95bba2b6b07ih8xbd3v";
-       revision = "2";
-       editedCabalFile = "06jpxqz5444k19p1n4i4yf2pvql37w9ngssp1grxl42dxk2bcg94";
-       libraryHaskellDepends = [ base ];
-       description = "Authentication combinators for servant";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, jose, lens, servant, text
      , unordered-containers
      }:
@@ -230068,7 +225964,6 @@ self: {
        ];
        description = "Authentication combinators for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-client" = callPackage
@@ -230191,34 +226086,6 @@ self: {
      }) {};
 
   "servant-auth-server" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
-     , bytestring, case-insensitive, cookie, data-default-class, entropy
-     , hspec, hspec-discover, http-client, http-types, jose, lens
-     , lens-aeson, markdown-unlit, memory, monad-time, mtl, QuickCheck
-     , servant, servant-auth, servant-server, tagged, text, time
-     , transformers, unordered-containers, wai, warp, wreq
-     }:
-     mkDerivation {
-       pname = "servant-auth-server";
-       version = "0.4.5.1";
-       sha256 = "10kcxdh9ba37jra6brrg11rzmx16jmwsk0yib92l0s3mkqp9was6";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring blaze-builder bytestring
-         case-insensitive cookie data-default-class entropy http-types jose
-         lens memory monad-time mtl servant servant-auth servant-server
-         tagged text time unordered-containers wai
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive hspec http-client http-types
-         jose lens lens-aeson mtl QuickCheck servant servant-auth
-         servant-server time transformers wai warp wreq
-       ];
-       testToolDepends = [ hspec-discover markdown-unlit ];
-       description = "servant-server/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth-server_0_4_6_0" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, case-insensitive, cookie, data-default-class, entropy
      , hspec, hspec-discover, http-client, http-types, jose, lens
@@ -230244,32 +226111,9 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-swagger" = callPackage
-    ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck
-     , servant, servant-auth, servant-swagger, swagger2, text
-     }:
-     mkDerivation {
-       pname = "servant-auth-swagger";
-       version = "0.2.10.0";
-       sha256 = "04ndbbhdmpgb8yshki6q2j46a5q8fzvlb4nn8x8gv0mqkriq79sh";
-       revision = "3";
-       editedCabalFile = "087faa5bg2hlxyhg7jzy2jj4fzs3dkp0znsbabrharcvdlkpqj1r";
-       libraryHaskellDepends = [
-         base lens servant servant-auth servant-swagger swagger2 text
-       ];
-       testHaskellDepends = [
-         base hspec lens QuickCheck servant servant-auth servant-swagger
-         swagger2 text
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "servant-swagger/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth-swagger_0_2_10_1" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck
      , servant, servant-auth, servant-swagger, swagger2, text
      }:
@@ -230287,7 +226131,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-swagger/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token" = callPackage
@@ -230455,22 +226298,6 @@ self: {
      }) {};
 
   "servant-blaze" = callPackage
-    ({ mkDerivation, base, blaze-html, http-media, servant
-     , servant-server, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-blaze";
-       version = "0.9";
-       sha256 = "1pfnpc6m7i8knndc1734fbzpfgmvdcpkd8cj0jyw139b70siz63r";
-       revision = "3";
-       editedCabalFile = "0pn9ca2jmx71clz0j9nlz1lwmr2xv39zqfda10al11am9mc4j8n4";
-       libraryHaskellDepends = [ base blaze-html http-media servant ];
-       testHaskellDepends = [ base blaze-html servant-server wai warp ];
-       description = "Blaze-html support for servant";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-blaze_0_9_1" = callPackage
     ({ mkDerivation, base, blaze-html, http-media, servant
      , servant-server, wai, warp
      }:
@@ -230482,7 +226309,6 @@ self: {
        testHaskellDepends = [ base blaze-html servant-server wai warp ];
        description = "Blaze-html support for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-cassava" = callPackage
@@ -230579,36 +226405,6 @@ self: {
      }) {};
 
   "servant-client" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
-     , deepseq, entropy, exceptions, hspec, hspec-discover
-     , http-api-data, http-client, http-media, http-types, HUnit
-     , kan-extensions, markdown-unlit, monad-control, mtl, network
-     , QuickCheck, semigroupoids, servant, servant-client-core
-     , servant-server, stm, tdigest, text, time, transformers
-     , transformers-base, transformers-compat, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-client";
-       version = "0.16.0.1";
-       sha256 = "1w6rw1bdm5x8swi9dy70n86gq9v85wlgmm6pglfxqbv7bgzpql8c";
-       libraryHaskellDepends = [
-         base base-compat bytestring containers deepseq exceptions
-         http-client http-media http-types kan-extensions monad-control mtl
-         semigroupoids servant servant-client-core stm text time
-         transformers transformers-base transformers-compat
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring entropy hspec http-api-data
-         http-client http-types HUnit kan-extensions markdown-unlit mtl
-         network QuickCheck servant servant-client-core servant-server stm
-         tdigest text transformers transformers-compat wai warp
-       ];
-       testToolDepends = [ hspec-discover markdown-unlit ];
-       description = "Automatic derivation of querying functions for servant";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-client_0_18_1" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, containers
      , deepseq, entropy, exceptions, hspec, hspec-discover
      , http-api-data, http-client, http-media, http-types, HUnit
@@ -230638,33 +226434,9 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-client-core" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
-     , bytestring, containers, deepseq, exceptions, free, hspec
-     , hspec-discover, http-media, http-types, network-uri, QuickCheck
-     , safe, servant, template-haskell, text, transformers
-     }:
-     mkDerivation {
-       pname = "servant-client-core";
-       version = "0.16";
-       sha256 = "0cvv9a7z6ahwjp433c4sxa9i1ifabbih63bx71r9gvqzl85pb3dz";
-       revision = "2";
-       editedCabalFile = "172diqnz0ddvlfznfjk0k1l02f1mb11i1dkzr6rizdmhb66qpqil";
-       libraryHaskellDepends = [
-         aeson base base-compat base64-bytestring bytestring containers
-         deepseq exceptions free http-media http-types network-uri safe
-         servant template-haskell text transformers
-       ];
-       testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
-       testToolDepends = [ hspec-discover ];
-       description = "Core functionality and class for client function generation for servant APIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-client-core_0_18_1" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , bytestring, containers, deepseq, exceptions, free, hspec
      , hspec-discover, http-media, http-types, network-uri, QuickCheck
@@ -230685,7 +226457,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Core functionality and class for client function generation for servant APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-client-js" = callPackage
@@ -230837,34 +226608,6 @@ self: {
      }) {};
 
   "servant-docs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-     , case-insensitive, hashable, http-media, http-types, lens, servant
-     , string-conversions, tasty, tasty-golden, tasty-hunit, text
-     , transformers, universe-base, unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-docs";
-       version = "0.11.4";
-       sha256 = "1z35rr55mxwi761pmqy176liglms443ynk0sjh8v8hcyfciymq0d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat bytestring case-insensitive
-         hashable http-media http-types lens servant string-conversions text
-         universe-base unordered-containers
-       ];
-       executableHaskellDepends = [
-         aeson base lens servant string-conversions text
-       ];
-       testHaskellDepends = [
-         aeson base base-compat lens servant string-conversions tasty
-         tasty-golden tasty-hunit transformers
-       ];
-       description = "generate API docs for your servant webservice";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-docs_0_11_7" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, hashable, http-media, http-types, lens, servant
      , string-conversions, tasty, tasty-golden, tasty-hunit, text
@@ -230890,32 +226633,9 @@ self: {
        ];
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-docs-simple" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec
-     , hspec-core, ordered-containers, prettyprinter, raw-strings-qq
-     , servant, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-docs-simple";
-       version = "0.2.0.1";
-       sha256 = "0r9lq4vv88fvh8dfw5z7kxsw57vr7877gixwjfmsy5q1yam91d9d";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring ordered-containers prettyprinter
-         servant text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring hspec hspec-core
-         ordered-containers prettyprinter raw-strings-qq servant text
-         unordered-containers
-       ];
-       description = "Generate endpoints overview for Servant API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "servant-docs-simple_0_3_0_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec
      , hspec-core, ordered-containers, prettyprinter, raw-strings-qq
      , servant, text, unordered-containers
@@ -230935,7 +226655,6 @@ self: {
        ];
        description = "Generate endpoints overview for Servant API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-ede" = callPackage
@@ -231107,25 +226826,6 @@ self: {
      }) {};
 
   "servant-foreign" = callPackage
-    ({ mkDerivation, base, base-compat, hspec, hspec-discover
-     , http-types, lens, servant, text
-     }:
-     mkDerivation {
-       pname = "servant-foreign";
-       version = "0.15";
-       sha256 = "0wxx9drycam46vcmf3kxp2lq1drlpxb1b6fxbxyb6dd7349py6gi";
-       revision = "2";
-       editedCabalFile = "0axz78g0vhasq5cvqg1lq0b2qanmb768f1bvzbfx58rn6arwflnj";
-       libraryHaskellDepends = [
-         base base-compat http-types lens servant text
-       ];
-       testHaskellDepends = [ base hspec servant ];
-       testToolDepends = [ hspec-discover ];
-       description = "Helpers for generating clients for servant APIs in any programming language";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-foreign_0_15_2" = callPackage
     ({ mkDerivation, base, base-compat, hspec, hspec-discover
      , http-types, lens, servant, text
      }:
@@ -231140,7 +226840,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Helpers for generating clients for servant APIs in any programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-generate" = callPackage
@@ -231481,22 +227180,6 @@ self: {
      }) {};
 
   "servant-lucid" = callPackage
-    ({ mkDerivation, base, http-media, lucid, servant, servant-server
-     , text, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-lucid";
-       version = "0.9";
-       sha256 = "1xamwcijd03cynml5c2hr577qairybyrqd90ixyb1a94lql6agbf";
-       revision = "3";
-       editedCabalFile = "10j29y9zjflh88csvn7zi4pm8jr9dxsglin94wypjrhcwy7yj1ic";
-       libraryHaskellDepends = [ base http-media lucid servant text ];
-       testHaskellDepends = [ base lucid servant-server wai warp ];
-       description = "Servant support for lucid";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-lucid_0_9_0_2" = callPackage
     ({ mkDerivation, base, http-media, lucid, servant, servant-server
      , text, wai, warp
      }:
@@ -231508,7 +227191,6 @@ self: {
        testHaskellDepends = [ base lucid servant-server wai warp ];
        description = "Servant support for lucid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-machines" = callPackage
@@ -231568,36 +227250,6 @@ self: {
      }) {};
 
   "servant-mock" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring
-     , bytestring-conversion, hspec, hspec-discover, hspec-wai
-     , http-types, QuickCheck, servant, servant-server, transformers
-     , wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-mock";
-       version = "0.8.5";
-       sha256 = "10bvqwyp5ca53k47a1xfbihdv22gjlj97spr1bn5plf5vlk70m5f";
-       revision = "3";
-       editedCabalFile = "1137vz9xm8iwj6x8h1q1yify6c1lahy0dxj6hpbhgi4s3mqkhm2g";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat bytestring http-types QuickCheck servant
-         servant-server transformers wai
-       ];
-       executableHaskellDepends = [
-         aeson base QuickCheck servant-server warp
-       ];
-       testHaskellDepends = [
-         aeson base bytestring-conversion hspec hspec-wai QuickCheck servant
-         servant-server wai
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Derive a mock server for free from your servant API types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-mock_0_8_7" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , bytestring-conversion, hspec, hspec-discover, hspec-wai
      , http-types, QuickCheck, servant, servant-server, transformers
@@ -231623,7 +227275,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-multipart" = callPackage
@@ -231971,34 +227622,6 @@ self: {
      }) {};
 
   "servant-rawm" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, filepath, Glob
-     , hspec-wai, http-client, http-media, http-types, lens, resourcet
-     , servant, servant-client, servant-client-core, servant-docs
-     , servant-server, tasty, tasty-hspec, tasty-hunit, text
-     , transformers, wai, wai-app-static, warp
-     }:
-     mkDerivation {
-       pname = "servant-rawm";
-       version = "0.3.2.0";
-       sha256 = "013d89zmlmwwwhgyc57xbzsd4phz347if5y6iz93wrw4lbvc341d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring filepath http-client http-media http-types lens
-         resourcet servant-client servant-client-core servant-docs
-         servant-server wai wai-app-static
-       ];
-       testHaskellDepends = [
-         base bytestring doctest Glob hspec-wai http-client http-media
-         http-types servant servant-client servant-client-core
-         servant-server tasty tasty-hspec tasty-hunit text transformers wai
-         warp
-       ];
-       description = "Embed a raw 'Application' in a Servant API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-rawm_1_0_0_0" = callPackage
     ({ mkDerivation, base, servant }:
      mkDerivation {
        pname = "servant-rawm";
@@ -232007,7 +227630,6 @@ self: {
        libraryHaskellDepends = [ base servant ];
        description = "Embed a raw 'Application' in a Servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-rawm-client" = callPackage
@@ -232214,45 +227836,6 @@ self: {
      }) {};
 
   "servant-server" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
-     , bytestring, Cabal, cabal-doctest, containers, directory, doctest
-     , exceptions, filepath, hspec, hspec-discover, hspec-wai
-     , http-api-data, http-media, http-types, monad-control, mtl
-     , network, network-uri, QuickCheck, resourcet, safe, servant
-     , should-not-typecheck, string-conversions, tagged, temporary, text
-     , transformers, transformers-base, transformers-compat, wai
-     , wai-app-static, wai-extra, warp, word8
-     }:
-     mkDerivation {
-       pname = "servant-server";
-       version = "0.16.2";
-       sha256 = "1l4kgjg5z775bi76hy7cb70qwvmkai4rxqkgp0ildsjgsvf8qb80";
-       revision = "1";
-       editedCabalFile = "017aw6wyhi5g7zkk59yj44r1n02zzin2w9wdskwqys7iqkvnvczn";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base base-compat base64-bytestring bytestring containers exceptions
-         filepath http-api-data http-media http-types monad-control mtl
-         network network-uri resourcet servant string-conversions tagged
-         text transformers transformers-base wai wai-app-static word8
-       ];
-       executableHaskellDepends = [
-         aeson base base-compat servant text wai warp
-       ];
-       testHaskellDepends = [
-         aeson base base-compat base64-bytestring bytestring directory
-         doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe
-         servant should-not-typecheck string-conversions temporary text
-         transformers transformers-compat wai wai-extra
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A family of combinators for defining webservices APIs and serving them";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-server_0_18_1" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , bytestring, containers, directory, exceptions, filepath, hspec
      , hspec-discover, hspec-wai, http-api-data, http-media, http-types
@@ -232287,7 +227870,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-server-namedargs" = callPackage
@@ -232535,36 +228117,6 @@ self: {
      }) {};
 
   "servant-swagger" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-     , Cabal, cabal-doctest, directory, doctest, filepath, hspec
-     , hspec-discover, http-media, insert-ordered-containers, lens
-     , lens-aeson, QuickCheck, servant, singleton-bool, swagger2
-     , template-haskell, text, time, unordered-containers, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "servant-swagger";
-       version = "1.1.7.1";
-       sha256 = "0vdjvn5bsd26q8wx1qdwn7vdfnd9jk8m9jzzm251gyn1ijxv8ild";
-       revision = "2";
-       editedCabalFile = "0ij93pd7lsq39grglhfrdjrg21bxigmhavy51xilg6rrpnfcj2wv";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat bytestring hspec http-media
-         insert-ordered-containers lens QuickCheck servant singleton-bool
-         swagger2 text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base base-compat directory doctest filepath hspec lens
-         lens-aeson QuickCheck servant swagger2 template-haskell text time
-         utf8-string vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger_1_1_10" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , Cabal, cabal-doctest, directory, doctest, filepath, hspec
      , hspec-discover, http-media, insert-ordered-containers, lens
@@ -232590,7 +228142,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger-tags" = callPackage
@@ -232612,24 +228163,6 @@ self: {
      }) {};
 
   "servant-swagger-ui" = callPackage
-    ({ mkDerivation, base, bytestring, file-embed-lzma, servant
-     , servant-server, servant-swagger-ui-core, swagger2, text
-     }:
-     mkDerivation {
-       pname = "servant-swagger-ui";
-       version = "0.3.4.3.23.11";
-       sha256 = "0ryr6h74vz6q6q0c9aixb7kwhq1vn95m3m0799cvc0xkfvm0ljha";
-       revision = "2";
-       editedCabalFile = "1wmxiihiwjkzwqqj2996fqmixz6jblj5gh43p7dxbww3g9fdz8qi";
-       libraryHaskellDepends = [
-         base bytestring file-embed-lzma servant servant-server
-         servant-swagger-ui-core swagger2 text
-       ];
-       description = "Servant swagger ui";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger-ui_0_3_4_3_36_1" = callPackage
     ({ mkDerivation, base, bytestring, file-embed-lzma, servant
      , servant-server, servant-swagger-ui-core, swagger2, text
      }:
@@ -232643,7 +228176,6 @@ self: {
        ];
        description = "Servant swagger ui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger-ui-core" = callPackage
@@ -232962,33 +228494,6 @@ self: {
      }) {};
 
   "serverless-haskell" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, amazonka-core
-     , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
-     , hspec, hspec-discover, http-client, http-types, iproute, lens
-     , raw-strings-qq, safe-exceptions, text, time, unix
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "serverless-haskell";
-       version = "0.11.3";
-       sha256 = "14jaykiwi5xzf9cvkkk35gqgk203yah1ln0skr7gi847bh95v7qf";
-       libraryHaskellDepends = [
-         aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
-         bytestring case-insensitive http-client http-types iproute lens
-         safe-exceptions text time unix unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
-         bytestring case-insensitive hspec hspec-discover http-client
-         http-types iproute lens raw-strings-qq safe-exceptions text time
-         unix unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Deploying Haskell code onto AWS Lambda using Serverless";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "serverless-haskell_0_12_4" = callPackage
     ({ mkDerivation, aeson, aeson-casing, amazonka-core
      , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
      , hspec, hspec-discover, http-client, http-types, iproute, lens
@@ -233013,7 +228518,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Deploying Haskell code onto AWS Lambda using Serverless";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession" = callPackage
@@ -233598,36 +229102,6 @@ self: {
      }) {};
 
   "sexp-grammar" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers
-     , criterion, deepseq, happy, invertible-grammar, prettyprinter
-     , QuickCheck, recursion-schemes, scientific, semigroups, tasty
-     , tasty-hunit, tasty-quickcheck, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "sexp-grammar";
-       version = "2.1.0";
-       sha256 = "139sqr50bba74h2r6gdivzsgkqjwq1gcah54zw2jkwzhlfk03fm1";
-       revision = "1";
-       editedCabalFile = "07rjcyk1zz775znhibaaqwxfkb8vfdbr5qsd20g5ywld0302scb1";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq invertible-grammar
-         prettyprinter recursion-schemes scientific semigroups text
-         utf8-string
-       ];
-       libraryToolDepends = [ alex happy ];
-       testHaskellDepends = [
-         base containers invertible-grammar prettyprinter QuickCheck
-         scientific semigroups tasty tasty-hunit tasty-quickcheck text
-         utf8-string
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq text
-       ];
-       description = "Invertible grammar combinators for S-expressions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sexp-grammar_2_3_0" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , criterion, data-fix, deepseq, happy, invertible-grammar
      , prettyprinter, QuickCheck, recursion-schemes, scientific
@@ -233654,7 +229128,6 @@ self: {
        ];
        description = "Invertible grammar combinators for S-expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sexp-show" = callPackage
@@ -234332,21 +229805,6 @@ self: {
      }) {};
 
   "shake-plus" = callPackage
-    ({ mkDerivation, aeson, base, comonad, extra, path, rio, shake
-     , within
-     }:
-     mkDerivation {
-       pname = "shake-plus";
-       version = "0.1.10.0";
-       sha256 = "0jp0b593162y2m9mxrh4fhgvjiwyxx4zk5spmr46aby5hhrgdwcr";
-       libraryHaskellDepends = [
-         aeson base comonad extra path rio shake within
-       ];
-       description = "Re-export of Shake using well-typed paths and ReaderT";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "shake-plus_0_3_3_1" = callPackage
     ({ mkDerivation, base, extra, path, rio, shake }:
      mkDerivation {
        pname = "shake-plus";
@@ -234355,7 +229813,6 @@ self: {
        libraryHaskellDepends = [ base extra path rio shake ];
        description = "Re-export of Shake using well-typed paths and ReaderT";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake-plus-extended" = callPackage
@@ -234834,29 +230291,6 @@ self: {
      }) {};
 
   "shell-conduit" = callPackage
-    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
-     , directory, filepath, hspec, hspec-expectations, monads-tf
-     , process, resourcet, semigroups, split, template-haskell, text
-     , transformers, unix, unliftio
-     }:
-     mkDerivation {
-       pname = "shell-conduit";
-       version = "4.7.0";
-       sha256 = "0c5yvm08l37qblqks1r23znixxas39gl1d3mlm6rq8a6zfvcacbg";
-       libraryHaskellDepends = [
-         async base bytestring conduit conduit-extra directory filepath
-         monads-tf process resourcet semigroups split template-haskell text
-         transformers unix unliftio
-       ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-extra hspec hspec-expectations
-         template-haskell
-       ];
-       description = "Write shell scripts with Conduit";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "shell-conduit_5_0_0" = callPackage
     ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
      , directory, filepath, hspec, hspec-expectations, monads-tf
      , process, resourcet, semigroups, split, template-haskell, text
@@ -234877,7 +230311,6 @@ self: {
        ];
        description = "Write shell scripts with Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shell-escape" = callPackage
@@ -237217,27 +232650,6 @@ self: {
      }) {};
 
   "singletons" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, filepath
-     , ghc-boot-th, mtl, pretty, process, syb, tasty, tasty-golden
-     , template-haskell, text, th-desugar, transformers, turtle
-     }:
-     mkDerivation {
-       pname = "singletons";
-       version = "2.6";
-       sha256 = "1lc6p1f3h0j4nq5ppqwjihrjlgcwl5sx5fsw449m9lvs07vp39xy";
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       libraryHaskellDepends = [
-         base containers ghc-boot-th mtl pretty syb template-haskell text
-         th-desugar transformers
-       ];
-       testHaskellDepends = [
-         base filepath process tasty tasty-golden text turtle
-       ];
-       description = "A framework for generating singleton types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "singletons_2_7" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, deepseq
      , directory, filepath, ghc-boot-th, mtl, pretty, process, syb
      , tasty, tasty-golden, template-haskell, text, th-desugar
@@ -237260,7 +232672,6 @@ self: {
        ];
        description = "A framework for generating singleton types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "singletons-presburger" = callPackage
@@ -237536,24 +232947,6 @@ self: {
      }) {};
 
   "sized" = callPackage
-    ({ mkDerivation, base, constraints, containers, deepseq
-     , equational-reasoning, ghc-typelits-presburger, hashable, lens
-     , ListLike, mono-traversable, singletons, type-natural, vector
-     }:
-     mkDerivation {
-       pname = "sized";
-       version = "0.4.0.0";
-       sha256 = "1s1j9riv0kms1hgyhv69nwvh44xa831jk20xlnwq1byw6mbalna9";
-       libraryHaskellDepends = [
-         base constraints containers deepseq equational-reasoning
-         ghc-typelits-presburger hashable lens ListLike mono-traversable
-         singletons type-natural vector
-       ];
-       description = "Sized sequence data-types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sized_0_8_0_0" = callPackage
     ({ mkDerivation, base, constraints, containers, deepseq
      , equational-reasoning, ghc-typelits-knownnat
      , ghc-typelits-presburger, hashable, hspec, inspection-testing
@@ -237575,7 +232968,6 @@ self: {
        ];
        description = "Sized sequence data-types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sized-grid" = callPackage
@@ -237884,28 +233276,6 @@ self: {
      }) {};
 
   "skylighting" = callPackage
-    ({ mkDerivation, base, binary, blaze-html, bytestring, containers
-     , directory, filepath, pretty-show, skylighting-core, text
-     }:
-     mkDerivation {
-       pname = "skylighting";
-       version = "0.8.5";
-       sha256 = "1b8m0spspp060p5hkl2qxarh3cwji0shq5kdwz2w93kiyl8hk8sv";
-       configureFlags = [ "-fexecutable" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers skylighting-core
-       ];
-       executableHaskellDepends = [
-         base blaze-html bytestring containers directory filepath
-         pretty-show text
-       ];
-       description = "syntax highlighting library";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "skylighting_0_10_0_3" = callPackage
     ({ mkDerivation, base, binary, blaze-html, bytestring, containers
      , directory, filepath, pretty-show, skylighting-core, text
      }:
@@ -237925,42 +233295,9 @@ self: {
        ];
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skylighting-core" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
-     , base64-bytestring, binary, blaze-html, bytestring
-     , case-insensitive, colour, containers, criterion, Diff, directory
-     , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
-     , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, text, transformers, utf8-string
-     }:
-     mkDerivation {
-       pname = "skylighting-core";
-       version = "0.8.5";
-       sha256 = "1azcq7g8c4p18q4akk7rl0bczjvp0vl4mnqvsfmzcdf7sdjlg9f7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal attoparsec base base64-bytestring binary
-         blaze-html bytestring case-insensitive colour containers directory
-         filepath hxt mtl regex-pcre-builtin safe text transformers
-         utf8-string
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers Diff directory filepath HUnit
-         pretty-show QuickCheck random tasty tasty-golden tasty-hunit
-         tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion directory filepath text
-       ];
-       description = "syntax highlighting library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "skylighting-core_0_10_0_3" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, criterion, Diff, directory
@@ -237989,7 +233326,6 @@ self: {
        ];
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skylighting-extensions" = callPackage
@@ -238578,17 +233914,6 @@ self: {
      }) {};
 
   "smallcheck" = callPackage
-    ({ mkDerivation, base, logict, mtl, pretty }:
-     mkDerivation {
-       pname = "smallcheck";
-       version = "1.1.7";
-       sha256 = "0dcnwg1mn1v57fbm9g5a94qfqwp9a6nzvxlwyxca4vf27qn9wpyh";
-       libraryHaskellDepends = [ base logict mtl pretty ];
-       description = "A property-based testing library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "smallcheck_1_2_0" = callPackage
     ({ mkDerivation, base, logict, mtl, pretty }:
      mkDerivation {
        pname = "smallcheck";
@@ -238597,7 +233922,6 @@ self: {
        libraryHaskellDepends = [ base logict mtl pretty ];
        description = "A property-based testing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallcheck-kind-generics" = callPackage
@@ -239680,48 +235004,6 @@ self: {
      }) {};
 
   "snap-server" = callPackage
-    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
-     , bytestring, bytestring-builder, case-insensitive, clock
-     , containers, criterion, deepseq, directory, filepath, HsOpenSSL
-     , http-common, http-streams, HUnit, io-streams, io-streams-haproxy
-     , lifted-base, monad-control, mtl, network, old-locale
-     , openssl-streams, parallel, QuickCheck, random, snap-core
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, threads, time, transformers, unix, unix-compat, vector
-     }:
-     mkDerivation {
-       pname = "snap-server";
-       version = "1.1.1.2";
-       sha256 = "1qprlgn59n9layslshpkizzjbsbd87v5h35iylva58vfnwwlmz77";
-       revision = "1";
-       editedCabalFile = "0bzda5wah6x4cx8g4m6ml4jkcn852i4cxvcgb61jxmwf910arbax";
-       configureFlags = [ "-fopenssl" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder bytestring bytestring-builder
-         case-insensitive clock containers filepath HsOpenSSL io-streams
-         io-streams-haproxy lifted-base mtl network old-locale
-         openssl-streams snap-core text time unix unix-compat vector
-       ];
-       testHaskellDepends = [
-         attoparsec base base16-bytestring blaze-builder bytestring
-         bytestring-builder case-insensitive clock containers deepseq
-         directory filepath HsOpenSSL http-common http-streams HUnit
-         io-streams io-streams-haproxy lifted-base monad-control mtl network
-         old-locale openssl-streams parallel QuickCheck random snap-core
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         threads time transformers unix unix-compat vector
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base blaze-builder bytestring bytestring-builder
-         criterion io-streams io-streams-haproxy snap-core vector
-       ];
-       description = "A web server for the Snap Framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "snap-server_1_1_2_0" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, clock
      , containers, criterion, deepseq, directory, filepath, HsOpenSSL
@@ -239761,7 +235043,6 @@ self: {
        ];
        description = "A web server for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-stream" = callPackage
@@ -243992,35 +239273,6 @@ self: {
      }) {};
 
   "stache" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, directory, file-embed, filepath, hspec, hspec-discover
-     , hspec-megaparsec, megaparsec, mtl, template-haskell, text
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "stache";
-       version = "2.1.1";
-       sha256 = "06pn7pm5vgk9f4bsh3m29cik514nv5w655ip04k7p5jv9xgmn4ld";
-       revision = "2";
-       editedCabalFile = "1a25mwi1x3yqq9clm9gz0dibpnppznbx392ixfwc21hnngn7kxsp";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq directory filepath
-         megaparsec mtl template-haskell text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers file-embed hspec hspec-megaparsec
-         megaparsec template-haskell text yaml
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         aeson base criterion deepseq megaparsec text
-       ];
-       description = "Mustache templates for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stache_2_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, directory, file-embed, filepath, gitrev, hspec
      , hspec-discover, hspec-megaparsec, megaparsec, mtl
@@ -244054,7 +239306,6 @@ self: {
        ];
        description = "Mustache templates for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack" = callPackage
@@ -244901,29 +240152,6 @@ self: {
      }) {};
 
   "stackcollapse-ghc" = callPackage
-    ({ mkDerivation, base, bytestring, containers, extra, foldl, hspec
-     , hspec-golden, recursion-schemes, rosezipper, safe, text
-     , transformers, utf8-string
-     }:
-     mkDerivation {
-       pname = "stackcollapse-ghc";
-       version = "0.0.1.2";
-       sha256 = "17ypxfscz9y7w6jh06133j779837dhdiq2a378mc73ji2m5fia1s";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring containers extra foldl recursion-schemes rosezipper
-         safe text transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers extra foldl hspec hspec-golden
-         recursion-schemes rosezipper safe text transformers utf8-string
-       ];
-       description = "Program to fold GHC prof files into flamegraph input";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "stackcollapse-ghc_0_0_1_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, extra, foldl, hspec
      , hspec-golden, recursion-schemes, rosezipper, safe, text
      , transformers, utf8-string
@@ -244944,7 +240172,6 @@ self: {
        ];
        description = "Program to fold GHC prof files into flamegraph input";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stacked-dag" = callPackage
@@ -246812,30 +242039,6 @@ self: {
      }) {};
 
   "stratosphere" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , hashable, hspec, hspec-discover, lens, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
-       version = "0.53.0";
-       sha256 = "0842sfn7vspbq5kc6rx7i2mvmk6zap87233khybbmvrzzyrp0sp2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable lens
-         template-haskell text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable hspec
-         hspec-discover lens template-haskell text unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_59_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
@@ -246857,7 +242060,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -247193,27 +242395,6 @@ self: {
      }) {};
 
   "streaming-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl
-     , resourcet, smallcheck, streaming, tasty, tasty-hunit
-     , tasty-smallcheck, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "streaming-bytestring";
-       version = "0.1.7";
-       sha256 = "12fd0aqd6vxm8c6ccgqd99m1hh3z3nb155hairnddzix0v3r8zvd";
-       libraryHaskellDepends = [
-         base bytestring deepseq exceptions mmorph mtl resourcet streaming
-         transformers transformers-base
-       ];
-       testHaskellDepends = [
-         base bytestring resourcet smallcheck streaming tasty tasty-hunit
-         tasty-smallcheck transformers
-       ];
-       description = "Fast, effectful byte streams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "streaming-bytestring_0_2_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim
      , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit
      , tasty-smallcheck, transformers, transformers-base
@@ -247232,7 +242413,6 @@ self: {
        ];
        description = "Fast, effectful byte streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-cassava" = callPackage
@@ -247855,17 +243035,6 @@ self: {
      }) {};
 
   "strict" = callPackage
-    ({ mkDerivation, array, base }:
-     mkDerivation {
-       pname = "strict";
-       version = "0.3.2";
-       sha256 = "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc";
-       libraryHaskellDepends = [ array base ];
-       description = "Strict data types and String IO";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "strict_0_4" = callPackage
     ({ mkDerivation, assoc, base, binary, bytestring, deepseq, ghc-prim
      , hashable, text, these, transformers
      }:
@@ -247879,7 +243048,6 @@ self: {
        ];
        description = "Strict data types and String IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-base" = callPackage
@@ -247896,22 +243064,6 @@ self: {
      }) {};
 
   "strict-base-types" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim
-     , hashable, lens, QuickCheck, strict
-     }:
-     mkDerivation {
-       pname = "strict-base-types";
-       version = "0.6.1";
-       sha256 = "0yihvjijag9g55ihrgqj0vwn6ksvscj3r0n2zzxz2qbxrhx6m1pq";
-       libraryHaskellDepends = [
-         aeson base bifunctors binary deepseq ghc-prim hashable lens
-         QuickCheck strict
-       ];
-       description = "Strict variants of the types provided in base";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "strict-base-types_0_7" = callPackage
     ({ mkDerivation, aeson, base, quickcheck-instances, strict
      , strict-lens
      }:
@@ -247924,7 +243076,6 @@ self: {
        ];
        description = "Strict variants of the types provided in base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-concurrency" = callPackage
@@ -248229,36 +243380,6 @@ self: {
      }) {};
 
   "string-interpolate" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, formatting
-     , haskell-src-exts, haskell-src-meta, hspec, interpolate
-     , neat-interpolation, QuickCheck, quickcheck-instances
-     , quickcheck-text, quickcheck-unicode, split, template-haskell
-     , text, text-conversions, unordered-containers, utf8-string
-     }:
-     mkDerivation {
-       pname = "string-interpolate";
-       version = "0.2.1.0";
-       sha256 = "0wply8lqfhc1xnqxq88xwygwqxbq86gjrwphygbn7nz66g2abgda";
-       revision = "2";
-       editedCabalFile = "00dsrl53aggn0d45cv3c7w6x82qhz3a059w957s9i3qdqfphbvx9";
-       libraryHaskellDepends = [
-         base bytestring haskell-src-exts haskell-src-meta split
-         template-haskell text text-conversions utf8-string
-       ];
-       testHaskellDepends = [
-         base bytestring hspec QuickCheck quickcheck-instances
-         quickcheck-text quickcheck-unicode template-haskell text
-         unordered-containers
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq formatting interpolate
-         neat-interpolation QuickCheck text
-       ];
-       description = "Haskell string/text/bytestring interpolation that just works";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "string-interpolate_0_3_0_2" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, formatting
      , haskell-src-exts, haskell-src-meta, hspec, hspec-core
      , interpolate, neat-interpolation, QuickCheck, quickcheck-instances
@@ -248286,7 +243407,6 @@ self: {
        ];
        description = "Haskell string/text/bytestring interpolation that just works";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "string-isos" = callPackage
@@ -248809,27 +243929,6 @@ self: {
      }) {};
 
   "structs" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory
-     , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck
-     , tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "structs";
-       version = "0.1.3";
-       sha256 = "1y8w44lsybzrkhnv2nrk4zpsp01hny66syibh3xwqpi06k18h2lr";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base deepseq ghc-prim primitive template-haskell
-       ];
-       testHaskellDepends = [
-         base directory doctest filepath parallel primitive QuickCheck tasty
-         tasty-hunit tasty-quickcheck
-       ];
-       description = "Strict GC'd imperative object-oriented programming with cheap pointers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "structs_0_1_4" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory
      , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck
      , tasty, tasty-hunit, tasty-quickcheck, template-haskell
@@ -248849,7 +243948,6 @@ self: {
        ];
        description = "Strict GC'd imperative object-oriented programming with cheap pointers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "structural-induction" = callPackage
@@ -248910,24 +244008,6 @@ self: {
      }) {};
 
   "structured-cli" = callPackage
-    ({ mkDerivation, base, data-default, haskeline, mtl, split
-     , transformers
-     }:
-     mkDerivation {
-       pname = "structured-cli";
-       version = "2.5.2.0";
-       sha256 = "0sq72gyqg73d3nxfkv8bynyk30l3lw1vfmfw9jg4smmj2ix7n5a0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base data-default haskeline mtl split transformers
-       ];
-       executableHaskellDepends = [ base data-default mtl split ];
-       description = "Application library for building interactive console CLIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "structured-cli_2_6_0_0" = callPackage
     ({ mkDerivation, base, data-default, exceptions, haskeline, mtl
      , split, transformers
      }:
@@ -248945,7 +244025,6 @@ self: {
        executableHaskellDepends = [ base data-default mtl split ];
        description = "Application library for building interactive console CLIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "structured-haskell-mode" = callPackage
@@ -249144,38 +244223,6 @@ self: {
      }) {};
 
   "stylish-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , directory, file-embed, filepath, haskell-src-exts, HsYAML
-     , HsYAML-aeson, HUnit, mtl, optparse-applicative, random
-     , semigroups, strict, syb, test-framework, test-framework-hunit
-     , text
-     }:
-     mkDerivation {
-       pname = "stylish-haskell";
-       version = "0.11.0.3";
-       sha256 = "10svl5q95n9i76rqvlxibi784qzvdyg8qfl1xwk7c32y84nyfibn";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring Cabal containers directory file-embed
-         filepath haskell-src-exts HsYAML HsYAML-aeson mtl semigroups syb
-         text
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring Cabal containers directory file-embed
-         filepath haskell-src-exts HsYAML HsYAML-aeson mtl
-         optparse-applicative strict syb
-       ];
-       testHaskellDepends = [
-         aeson base bytestring Cabal containers directory file-embed
-         filepath haskell-src-exts HsYAML HsYAML-aeson HUnit mtl random syb
-         test-framework test-framework-hunit text
-       ];
-       description = "Haskell code prettifier";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stylish-haskell_0_12_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , directory, file-embed, filepath, ghc-lib-parser, HsYAML
      , HsYAML-aeson, HUnit, mtl, optparse-applicative, random, strict
@@ -249203,7 +244250,6 @@ self: {
        ];
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylist" = callPackage
@@ -250496,38 +245542,6 @@ self: {
      }) {};
 
   "swagger2" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries
-     , bytestring, Cabal, cabal-doctest, containers, cookie, doctest
-     , generics-sop, Glob, hashable, hspec, hspec-discover, http-media
-     , HUnit, insert-ordered-containers, lens, mtl, network, optics-core
-     , optics-th, QuickCheck, quickcheck-instances, scientific
-     , template-haskell, text, time, transformers, transformers-compat
-     , unordered-containers, utf8-string, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "swagger2";
-       version = "2.5";
-       sha256 = "0ywj4536daz43vrxibqn271gq96bzkawx3qcwbm547315jfd4fqf";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat-batteries bytestring containers
-         cookie generics-sop hashable http-media insert-ordered-containers
-         lens mtl network optics-core optics-th QuickCheck scientific
-         template-haskell text time transformers transformers-compat
-         unordered-containers uuid-types vector
-       ];
-       testHaskellDepends = [
-         aeson base base-compat-batteries bytestring containers doctest Glob
-         hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
-         quickcheck-instances template-haskell text time
-         unordered-containers utf8-string vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Swagger 2.0 data model";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "swagger2_2_6" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries
      , bytestring, Cabal, cabal-doctest, containers, cookie, doctest
      , generics-sop, Glob, hashable, hspec, hspec-discover, http-media
@@ -250559,7 +245573,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swapper" = callPackage
@@ -254201,24 +249214,6 @@ self: {
      }) {};
 
   "tasty-rerun" = callPackage
-    ({ mkDerivation, base, containers, mtl, optparse-applicative, split
-     , stm, tagged, tasty, transformers
-     }:
-     mkDerivation {
-       pname = "tasty-rerun";
-       version = "1.1.17";
-       sha256 = "0hiafrknk700gi8rm675akz8q6abk8iwlmygwnlx1fy3znalkqad";
-       revision = "2";
-       editedCabalFile = "0jkkydcq8fx3ia92pn9dnbfhx18wz70366y7xlv9yj9zysqcr8yl";
-       libraryHaskellDepends = [
-         base containers mtl optparse-applicative split stm tagged tasty
-         transformers
-       ];
-       description = "Rerun only tests which failed in a previous test run";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-rerun_1_1_18" = callPackage
     ({ mkDerivation, base, containers, mtl, optparse-applicative, split
      , stm, tagged, tasty, transformers
      }:
@@ -254232,7 +249227,6 @@ self: {
        ];
        description = "Rerun only tests which failed in a previous test run";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-silver" = callPackage
@@ -258009,20 +253003,6 @@ self: {
      }) {};
 
   "th-abstraction" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "th-abstraction";
-       version = "0.3.2.0";
-       sha256 = "0ygbky8sk0nk4jyfjf6rj1ghv83rflcfcbsmnn7rnjzks0xg7zin";
-       libraryHaskellDepends = [
-         base containers ghc-prim template-haskell
-       ];
-       testHaskellDepends = [ base containers template-haskell ];
-       description = "Nicer interface for reified information about data types";
-       license = stdenv.lib.licenses.isc;
-     }) {};
-
-  "th-abstraction_0_4_0_0" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-abstraction";
@@ -258034,7 +253014,6 @@ self: {
        testHaskellDepends = [ base containers template-haskell ];
        description = "Nicer interface for reified information about data types";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-alpha" = callPackage
@@ -258159,29 +253138,6 @@ self: {
      }) {};
 
   "th-desugar" = callPackage
-    ({ mkDerivation, base, containers, fail, ghc-prim, hspec, HUnit
-     , mtl, ordered-containers, semigroups, syb, template-haskell
-     , th-abstraction, th-expand-syns, th-lift, th-orphans
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "th-desugar";
-       version = "1.10";
-       sha256 = "1g3v427qlpxl1m4klsbqzg2xas5sj4059j5pdx0vpbshpq9v3x8v";
-       libraryHaskellDepends = [
-         base containers fail ghc-prim mtl ordered-containers semigroups syb
-         template-haskell th-abstraction th-lift th-orphans
-         transformers-compat
-       ];
-       testHaskellDepends = [
-         base containers hspec HUnit mtl syb template-haskell th-expand-syns
-         th-lift th-orphans
-       ];
-       description = "Functions to desugar Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-desugar_1_11" = callPackage
     ({ mkDerivation, base, containers, fail, ghc-prim, hspec, HUnit
      , mtl, ordered-containers, semigroups, syb, template-haskell
      , th-abstraction, th-lift, th-orphans, transformers-compat
@@ -258201,7 +253157,6 @@ self: {
        ];
        description = "Functions to desugar Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-dict-discovery" = callPackage
@@ -258444,25 +253399,6 @@ self: {
      }) {};
 
   "th-orphans" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover
-     , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many
-     }:
-     mkDerivation {
-       pname = "th-orphans";
-       version = "0.13.10";
-       sha256 = "0a69jrvialwg9g1h3j729jahl47h9ar5xxjqbi3pxyfc94v5fcs4";
-       libraryHaskellDepends = [
-         base mtl template-haskell th-lift th-lift-instances th-reify-many
-       ];
-       testHaskellDepends = [
-         base bytestring ghc-prim hspec template-haskell th-lift
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Orphan instances for TH datatypes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-orphans_0_13_11" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover
      , mtl, template-haskell, th-compat, th-lift, th-lift-instances
      , th-reify-many
@@ -258481,7 +253417,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Orphan instances for TH datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-pprint" = callPackage
@@ -258586,22 +253521,6 @@ self: {
      }) {};
 
   "th-test-utils" = callPackage
-    ({ mkDerivation, base, tasty, tasty-hunit, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "th-test-utils";
-       version = "1.0.2";
-       sha256 = "1c0450d9q8ndk8zyj7x9ybl892jijrzn3pcxqm5igki9n8x3w37k";
-       libraryHaskellDepends = [ base template-haskell transformers ];
-       testHaskellDepends = [
-         base tasty tasty-hunit template-haskell transformers
-       ];
-       description = "Utility functions for testing Template Haskell code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-test-utils_1_1_0" = callPackage
     ({ mkDerivation, base, bytestring, tasty, tasty-golden, tasty-hunit
      , template-haskell, th-orphans, transformers
      }:
@@ -258620,7 +253539,6 @@ self: {
        ];
        description = "Utility functions for testing Template Haskell code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-to-exp" = callPackage
@@ -258993,25 +253911,6 @@ self: {
      }) {};
 
   "thread-supervisor" = callPackage
-    ({ mkDerivation, base, clock, containers, data-default, hspec
-     , hspec-discover, QuickCheck, unliftio
-     }:
-     mkDerivation {
-       pname = "thread-supervisor";
-       version = "0.1.0.1";
-       sha256 = "0x10i81cvp5m5rx48mdhrxcs5rpcmbr2xrv3aq9s3lqdchy2vqzy";
-       libraryHaskellDepends = [
-         base clock containers data-default unliftio
-       ];
-       testHaskellDepends = [
-         base clock data-default hspec QuickCheck unliftio
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A simplified implementation of Erlang/OTP like supervisor over thread";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "thread-supervisor_0_2_0_0" = callPackage
     ({ mkDerivation, base, clock, containers, data-default, hspec
      , hspec-discover, QuickCheck, unliftio
      }:
@@ -259028,7 +253927,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A simplified implementation of Erlang/OTP like supervisor over thread";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threadPool" = callPackage
@@ -259584,26 +254482,6 @@ self: {
      }) {};
 
   "tidal" = callPackage
-    ({ mkDerivation, base, bifunctors, bytestring, clock, colour
-     , containers, criterion, deepseq, hosc, microspec, network, parsec
-     , primitive, random, text, transformers, vector, weigh
-     }:
-     mkDerivation {
-       pname = "tidal";
-       version = "1.5.2";
-       sha256 = "03y1hfwc5frbqhcwvvfr6ykas0sy6pw982sgdgkvd3l0wbmnhdrz";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bifunctors bytestring clock colour containers deepseq hosc
-         network parsec primitive random text transformers vector
-       ];
-       testHaskellDepends = [ base containers microspec parsec ];
-       benchmarkHaskellDepends = [ base criterion weigh ];
-       description = "Pattern language for improvised music";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "tidal_1_6_1" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, clock, colour
      , containers, criterion, deepseq, hosc, microspec, network, parsec
      , primitive, random, text, transformers, vector, weigh
@@ -259621,7 +254499,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion weigh ];
        description = "Pattern language for improvised music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tidal-midi" = callPackage
@@ -259852,23 +254729,6 @@ self: {
      }) {};
 
   "time-compat" = callPackage
-    ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit
-     , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time
-     }:
-     mkDerivation {
-       pname = "time-compat";
-       version = "1.9.3";
-       sha256 = "126vlfzv3z91vnjlkqarkyhs91hrx4g08gnrvsldqpclczk48smv";
-       libraryHaskellDepends = [ base base-orphans deepseq time ];
-       testHaskellDepends = [
-         base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit
-         tasty-quickcheck time
-       ];
-       description = "Compatibility package for time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "time-compat_1_9_4" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit
      , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time
      }:
@@ -259883,7 +254743,6 @@ self: {
        ];
        description = "Compatibility package for time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-extras" = callPackage
@@ -261072,31 +255931,6 @@ self: {
      }) {};
 
   "tldr" = callPackage
-    ({ mkDerivation, ansi-terminal, base, bytestring, cmark, containers
-     , directory, filepath, optparse-applicative, semigroups, tasty
-     , tasty-golden, text, typed-process
-     }:
-     mkDerivation {
-       pname = "tldr";
-       version = "0.6.4";
-       sha256 = "0gg9zplk8widfiwm5q1pi7fl45hby68c3ljm8p4livrp72s10f9d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base bytestring cmark text
-       ];
-       executableHaskellDepends = [
-         base containers directory filepath optparse-applicative semigroups
-         typed-process
-       ];
-       testHaskellDepends = [ base tasty tasty-golden ];
-       description = "Haskell tldr client";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "tldr_0_9_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmark, containers
      , directory, filepath, http-conduit, optparse-applicative
      , semigroups, tasty, tasty-golden, text, time, zip-archive
@@ -261800,18 +256634,6 @@ self: {
      }) {};
 
   "tonalude" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, Glob, rio, unliftio }:
-     mkDerivation {
-       pname = "tonalude";
-       version = "0.1.1.0";
-       sha256 = "060hc1dydlq1zd1fn5scz7xhbflqm4fa86rz6275drymi5gwx82s";
-       libraryHaskellDepends = [ base bytestring rio unliftio ];
-       testHaskellDepends = [ base bytestring doctest Glob rio unliftio ];
-       description = "A standard library for Tonatona framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tonalude_0_1_1_1" = callPackage
     ({ mkDerivation, base, bytestring, doctest, Glob, rio, unliftio }:
      mkDerivation {
        pname = "tonalude";
@@ -261821,7 +256643,6 @@ self: {
        testHaskellDepends = [ base bytestring doctest Glob rio unliftio ];
        description = "A standard library for Tonatona framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tonaparser" = callPackage
@@ -264662,22 +259483,6 @@ self: {
      }) {};
 
   "ttc" = callPackage
-    ({ mkDerivation, base, bytestring, tasty, tasty-hunit
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "ttc";
-       version = "0.2.3.0";
-       sha256 = "0yp92aa62xzzgnlwaw45p8cp9m3w2mmpdr3r2h3zw3dcqvq6hx1l";
-       libraryHaskellDepends = [ base bytestring template-haskell text ];
-       testHaskellDepends = [
-         base bytestring tasty tasty-hunit template-haskell text
-       ];
-       description = "Textual Type Classes";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ttc_0_3_0_0" = callPackage
     ({ mkDerivation, base, bytestring, tasty, tasty-hunit
      , template-haskell, text
      }:
@@ -264691,7 +259496,6 @@ self: {
        ];
        description = "Textual Type Classes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ttl-hashtables" = callPackage
@@ -266377,26 +261181,6 @@ self: {
      }) {};
 
   "type-natural" = callPackage
-    ({ mkDerivation, base, constraints, equational-reasoning
-     , ghc-typelits-natnormalise, ghc-typelits-presburger, singletons
-     , singletons-presburger, template-haskell
-     }:
-     mkDerivation {
-       pname = "type-natural";
-       version = "0.8.3.1";
-       sha256 = "0nq54098jyrx6zz8vn0pw3kg9b6bwpxhnhxk3f5m18rpjjjjw4xs";
-       revision = "1";
-       editedCabalFile = "1nhv7wh3cgy5hhkgs3bgg3659qf3lpy8rm89ikbb0p69bbxdpmfa";
-       libraryHaskellDepends = [
-         base constraints equational-reasoning ghc-typelits-natnormalise
-         ghc-typelits-presburger singletons singletons-presburger
-         template-haskell
-       ];
-       description = "Type-level natural and proofs of their properties";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "type-natural_0_9_0_0" = callPackage
     ({ mkDerivation, base, constraints, equational-reasoning
      , ghc-typelits-natnormalise, ghc-typelits-presburger, singletons
      , singletons-presburger, template-haskell
@@ -266412,31 +261196,9 @@ self: {
        ];
        description = "Type-level natural and proofs of their properties";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-of-html" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, containers
-     , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim
-     , hspec, QuickCheck, random, text, weigh
-     }:
-     mkDerivation {
-       pname = "type-of-html";
-       version = "1.5.2.0";
-       sha256 = "0s53panifhmyg5xda78x509jvxpbcw2kqan7y4jxa4nysgz34qhc";
-       libraryHaskellDepends = [
-         base bytestring containers double-conversion ghc-prim text
-       ];
-       testHaskellDepends = [ base bytestring hspec QuickCheck ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring criterion deepseq ghc ghc-paths random
-         text weigh
-       ];
-       description = "High performance type driven html generation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "type-of-html_1_6_1_2" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim
      , hspec, QuickCheck, random, text, weigh
@@ -266455,7 +261217,6 @@ self: {
        ];
        description = "High performance type driven html generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-of-html-static" = callPackage
@@ -267291,27 +262052,6 @@ self: {
      }) {};
 
   "tzdata" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
-     , test-framework, test-framework-hunit, test-framework-th, unix
-     , vector
-     }:
-     mkDerivation {
-       pname = "tzdata";
-       version = "0.1.20190911.0";
-       sha256 = "156mq401xbrx325bc745va2nh7r5ybi01nlrwavm0gxijfs0i4b9";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers deepseq vector
-       ];
-       testHaskellDepends = [
-         base bytestring HUnit test-framework test-framework-hunit
-         test-framework-th unix
-       ];
-       description = "Time zone database (as files and as a module)";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "tzdata_0_2_20201021_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
      , test-framework, test-framework-hunit, test-framework-th, unix
      , vector
@@ -267330,7 +262070,6 @@ self: {
        ];
        description = "Time zone database (as files and as a module)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "u2f" = callPackage
@@ -268048,28 +262787,6 @@ self: {
      }) {};
 
   "unboxing-vector" = callPackage
-    ({ mkDerivation, base, deepseq, HUnit, mono-traversable, primitive
-     , should-not-typecheck, vector
-     }:
-     mkDerivation {
-       pname = "unboxing-vector";
-       version = "0.1.1.0";
-       sha256 = "0i2d5gzvrdi5alaj8inw0jzlh0kkd23pg5dwm24h8jyqh0kmnhj8";
-       libraryHaskellDepends = [
-         base deepseq mono-traversable primitive vector
-       ];
-       testHaskellDepends = [
-         base deepseq HUnit mono-traversable primitive should-not-typecheck
-         vector
-       ];
-       benchmarkHaskellDepends = [
-         base deepseq mono-traversable primitive vector
-       ];
-       description = "A newtype-friendly variant of unboxed vectors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unboxing-vector_0_2_0_0" = callPackage
     ({ mkDerivation, base, deepseq, HUnit, mono-traversable, primitive
      , should-not-typecheck, vector
      }:
@@ -268089,7 +262806,6 @@ self: {
        ];
        description = "A newtype-friendly variant of unboxed vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbreak" = callPackage
@@ -268657,23 +263373,6 @@ self: {
      }) {};
 
   "uniplate" = callPackage
-    ({ mkDerivation, base, containers, hashable, syb
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "uniplate";
-       version = "1.6.12";
-       sha256 = "1dx8f9aw27fz8kw0ad1nm6355w5rdl7bjvb427v2bsgnng30pipw";
-       revision = "1";
-       editedCabalFile = "0gsrs2mk58jg3x36dyzxi4y46isd5p6q0rd6m9l834h5r7ds6a54";
-       libraryHaskellDepends = [
-         base containers hashable syb unordered-containers
-       ];
-       description = "Help writing simple, concise and fast generic operations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "uniplate_1_6_13" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, hashable, syb
      , unordered-containers
      }:
@@ -268686,7 +263385,6 @@ self: {
        ];
        description = "Help writing simple, concise and fast generic operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uniprot-kb" = callPackage
@@ -269277,32 +263975,6 @@ self: {
      }) {};
 
   "universum" = 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, unordered-containers, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "universum";
-       version = "1.6.1";
-       sha256 = "007nh8kw5a2m681bjwvcdjdf69nb768kwdsckj2kdd7406mfgdm7";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq ghc-prim hashable microlens
-         microlens-mtl mtl safe-exceptions stm text transformers
-         unordered-containers utf8-string vector
-       ];
-       testHaskellDepends = [
-         base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
-         utf8-string
-       ];
-       benchmarkHaskellDepends = [
-         base containers gauge text unordered-containers
-       ];
-       description = "Custom prelude used in Serokell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "universum_1_7_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, doctest
      , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
      , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
@@ -269325,7 +263997,6 @@ self: {
        ];
        description = "Custom prelude used in Serokell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix_2_7_2_2" = callPackage
@@ -269528,31 +264199,6 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
-     , transformers, unix, unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio";
-       version = "0.2.13";
-       sha256 = "1wzrdrcclkbyfjchad60rs08r1b2d20mr7hcs55cx8x16962qmn2";
-       libraryHaskellDepends = [
-         async base bytestring deepseq directory filepath process stm time
-         transformers unix unliftio-core
-       ];
-       testHaskellDepends = [
-         async base bytestring containers deepseq directory filepath hspec
-         process QuickCheck stm time transformers unix unliftio-core
-       ];
-       benchmarkHaskellDepends = [
-         async base bytestring deepseq directory filepath gauge process stm
-         time transformers unix unliftio-core
-       ];
-       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "unliftio_0_2_13_1" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
      , transformers, unix, unliftio-core
@@ -269575,23 +264221,9 @@ self: {
        ];
        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 {
-       pname = "unliftio-core";
-       version = "0.1.2.0";
-       sha256 = "0y3siyx3drkw7igs380a87h8qfbbgcyxxlcnshp698hcc4yqphr4";
-       revision = "2";
-       editedCabalFile = "0jqrjjbgicx48wzcjxs1xmih48ay79rhmrz6081dldlfxynli6vz";
-       libraryHaskellDepends = [ base transformers ];
-       description = "The MonadUnliftIO typeclass for unlifting monads to IO";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "unliftio-core_0_2_0_1" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "unliftio-core";
@@ -269602,7 +264234,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unliftio-path" = callPackage
@@ -269690,31 +264321,6 @@ self: {
      }) {};
 
   "unordered-containers" = callPackage
-    ({ mkDerivation, base, bytestring, ChasingBottoms, containers
-     , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
-     , mtl, QuickCheck, random, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "unordered-containers";
-       version = "0.2.10.0";
-       sha256 = "0wy5hfrs880hh8hvp648bl07ws777n3kkmczzdszr7papnyigwb5";
-       revision = "1";
-       editedCabalFile = "01727lm2spbqfn0rl89zv9zhpsmnls0kmizyckqf5nc3j9d0k6sy";
-       libraryHaskellDepends = [ base deepseq hashable ];
-       testHaskellDepends = [
-         base ChasingBottoms containers hashable HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion deepseq deepseq-generics
-         hashable hashmap mtl random
-       ];
-       description = "Efficient hashing-based container types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unordered-containers_0_2_13_0" = callPackage
     ({ mkDerivation, base, bytestring, ChasingBottoms, containers
      , deepseq, gauge, hashable, hashmap, HUnit, mtl, QuickCheck, random
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -269734,7 +264340,6 @@ self: {
        ];
        description = "Efficient hashing-based container types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unordered-containers-rematch" = callPackage
@@ -272112,17 +266717,6 @@ self: {
      }) {};
 
   "validity-time" = callPackage
-    ({ mkDerivation, base, time, validity }:
-     mkDerivation {
-       pname = "validity-time";
-       version = "0.3.0.0";
-       sha256 = "1g8lp7sv8hs9jwsqphq30q2wr20kmmd430mqc1rm82i4cwsk8azx";
-       libraryHaskellDepends = [ base time validity ];
-       description = "Validity instances for time";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-time_0_4_0_0" = callPackage
     ({ mkDerivation, base, time, validity }:
      mkDerivation {
        pname = "validity-time";
@@ -272131,7 +266725,6 @@ self: {
        libraryHaskellDepends = [ base time validity ];
        description = "Validity instances for time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-unordered-containers" = callPackage
@@ -273510,23 +268103,6 @@ self: {
      }) {};
 
   "versions" = callPackage
-    ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "versions";
-       version = "3.5.4";
-       sha256 = "1n6mayi2qinlv12bf83qskiazwzgl37d4nxvglmwmddb7lpyxbrw";
-       libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
-       testHaskellDepends = [
-         base megaparsec microlens QuickCheck tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       description = "Types and parsers for software version numbers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "versions_4_0_1" = callPackage
     ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens
      , parser-combinators, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, text
@@ -273544,7 +268120,6 @@ self: {
        ];
        description = "Types and parsers for software version numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vflow-types" = callPackage
@@ -274473,41 +269048,6 @@ self: {
      }) {inherit (pkgs) vte;};
 
   "vty" = callPackage
-    ({ mkDerivation, ansi-terminal, base, binary, blaze-builder
-     , bytestring, Cabal, containers, deepseq, directory, filepath
-     , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl
-     , parallel, parsec, QuickCheck, quickcheck-assertions, random
-     , smallcheck, stm, string-qq, terminfo, test-framework
-     , test-framework-hunit, test-framework-smallcheck, text
-     , transformers, unix, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "vty";
-       version = "5.28.2";
-       sha256 = "0jfiha8hwpdpnz4i7d94dsgcrfd20y0kjp9crn3ds2jx8kln1prv";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base binary blaze-builder bytestring containers
-         deepseq directory filepath hashable microlens microlens-mtl
-         microlens-th mtl parallel parsec stm terminfo text transformers
-         unix utf8-string vector
-       ];
-       executableHaskellDepends = [
-         base containers directory filepath microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers deepseq HUnit
-         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
-         smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vty_5_32" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, blaze-builder
      , bytestring, Cabal, containers, deepseq, directory, filepath
      , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl
@@ -274540,7 +269080,6 @@ self: {
        ];
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -275039,35 +269578,6 @@ self: {
      }) {};
 
   "wai-extra" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
-     , bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, http2, HUnit, iproute, network, old-locale, resourcet
-     , streaming-commons, text, time, transformers, unix, unix-compat
-     , vault, void, wai, wai-logger, word8, zlib
-     }:
-     mkDerivation {
-       pname = "wai-extra";
-       version = "3.0.32";
-       sha256 = "1676mvyamlrkfsvdnrxj0cd2bl40b8lp4nrcpn67mnjxfs7qflh0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base base64-bytestring bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types http2 iproute network old-locale
-         resourcet streaming-commons text time transformers unix unix-compat
-         vault void wai wai-logger word8 zlib
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive cookie fast-logger hspec
-         http-types http2 HUnit resourcet text time transformers wai zlib
-       ];
-       description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-extra_3_1_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , bytestring, call-stack, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -275094,7 +269604,6 @@ self: {
        ];
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-feature-flags" = callPackage
@@ -276027,26 +270536,6 @@ self: {
      }) {};
 
   "wai-middleware-static" = callPackage
-    ({ mkDerivation, base, bytestring, containers, cryptonite
-     , directory, expiring-cache-map, filepath, http-types, memory
-     , mime-types, mtl, old-locale, semigroups, text, time, wai
-     }:
-     mkDerivation {
-       pname = "wai-middleware-static";
-       version = "0.8.3";
-       sha256 = "0l6az106r970v3jwx3z7fg7x8ja8x5hla0m5lwg7sjfs9vdh0bnl";
-       revision = "1";
-       editedCabalFile = "0jinswa97ll70xxj6hm4mxw7i1cfnm8jn87aczzccn9xscdpll4c";
-       libraryHaskellDepends = [
-         base bytestring containers cryptonite directory expiring-cache-map
-         filepath http-types memory mime-types mtl old-locale semigroups
-         text time wai
-       ];
-       description = "WAI middleware that serves requests to static files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-middleware-static_0_9_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, cryptonite
      , directory, expiring-cache-map, filepath, hspec, hspec-discover
      , hspec-expectations-lifted, hspec-wai, http-types, memory
@@ -276069,7 +270558,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-static-caching" = callPackage
@@ -276917,22 +271405,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.12";
-       sha256 = "1d75zcacr835m7d1b0n7j19432sdf0qwgqxdf6az3f9brg849ajd";
-       libraryHaskellDepends = [
-         base bytestring cryptonite data-default-class network
-         streaming-commons tls tls-session-manager wai warp
-       ];
-       description = "HTTP over TLS support for Warp via the TLS package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp-tls_3_3_0" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, streaming-commons, tls, tls-session-manager, wai, warp
      }:
@@ -276946,7 +271418,6 @@ self: {
        ];
        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
@@ -279328,19 +273799,6 @@ self: {
      }) {};
 
   "within" = callPackage
-    ({ mkDerivation, base, comonad, exceptions, free, hashable, path }:
-     mkDerivation {
-       pname = "within";
-       version = "0.1.1.0";
-       sha256 = "107gi32zsp7srb2lgmbmrdzry2irgshnznkf81sw3f1n07qhci40";
-       libraryHaskellDepends = [
-         base comonad exceptions free hashable path
-       ];
-       description = "A value within another path";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "within_0_2_0_1" = callPackage
     ({ mkDerivation, base, comonad, exceptions, free, hashable, path
      , path-like
      }:
@@ -279353,23 +273811,9 @@ self: {
        ];
        description = "A value within another path";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "witness" = callPackage
-    ({ mkDerivation, base, constraints, semigroupoids, transformers }:
-     mkDerivation {
-       pname = "witness";
-       version = "0.4";
-       sha256 = "180yy0dyvmn9jsl1gjbryxli3qkl2h6pvh297vsr9ax3h4vciilk";
-       libraryHaskellDepends = [
-         base constraints semigroupoids transformers
-       ];
-       description = "values that witness types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "witness_0_5" = callPackage
     ({ mkDerivation, base, constraints, countable, semigroupoids
      , transformers
      }:
@@ -279382,7 +273826,6 @@ self: {
        ];
        description = "values that witness types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "witty" = callPackage
@@ -285009,34 +279452,6 @@ self: {
      }) {};
 
   "yesod-auth" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, bytestring, conduit, conduit-extra, containers
-     , cryptonite, data-default, email-validate, file-embed, http-client
-     , http-client-tls, http-conduit, http-types, memory, network-uri
-     , nonce, persistent, random, safe, shakespeare, template-haskell
-     , text, time, transformers, unliftio, unliftio-core
-     , unordered-containers, wai, yesod-core, yesod-form
-     , yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
-       version = "1.6.10";
-       sha256 = "0nfrq61dqifzbnqx8m62j1q6nmlj04mis864yg2k36mra9njap27";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup bytestring conduit
-         conduit-extra containers cryptonite data-default email-validate
-         file-embed http-client http-client-tls http-conduit http-types
-         memory network-uri nonce persistent random safe shakespeare
-         template-haskell text time transformers unliftio unliftio-core
-         unordered-containers wai yesod-core yesod-form yesod-persistent
-       ];
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth_1_6_10_1" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
@@ -285062,7 +279477,6 @@ self: {
        ];
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -285213,31 +279627,6 @@ self: {
      }) {};
 
   "yesod-auth-hashdb" = callPackage
-    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
-     , hspec, http-conduit, http-types, monad-logger, network-uri
-     , persistent, persistent-sqlite, resourcet, text
-     , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
-     , yesod-form, yesod-persistent, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-auth-hashdb";
-       version = "1.7.1.2";
-       sha256 = "10f6lgjjcwlg0vsi43xhgmi9d9r4ncfwsrwb6lfz1if9cq7gbmhv";
-       libraryHaskellDepends = [
-         aeson base bytestring persistent text yesod-auth yesod-core
-         yesod-form yesod-persistent
-       ];
-       testHaskellDepends = [
-         aeson base basic-prelude bytestring containers hspec http-conduit
-         http-types monad-logger network-uri persistent-sqlite resourcet
-         text unordered-containers wai-extra yesod yesod-auth yesod-core
-         yesod-test
-       ];
-       description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth-hashdb_1_7_1_5" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , hspec, http-conduit, http-types, monad-logger, network-uri
      , persistent, persistent-sqlite, resourcet, text
@@ -285260,7 +279649,6 @@ self: {
        ];
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-hmac-keccak" = callPackage
@@ -285667,43 +280055,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, bytestring, case-insensitive, cereal, clientsession
-     , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
-     , gauge, hspec, hspec-expectations, http-types, HUnit, memory
-     , monad-logger, mtl, network, parsec, path-pieces, primitive
-     , random, resourcet, 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.18.5";
-       sha256 = "11f51x3slqnan07fp2bxswd3y994wccqg48gakdk272i2bcg2vfq";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq fast-logger http-types memory
-         monad-logger mtl parsec path-pieces primitive random resourcet
-         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 random resourcet shakespeare streaming-commons
-         template-haskell text transformers unliftio wai wai-extra warp
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text
-       ];
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_18_6" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, bytestring, case-insensitive, cereal, clientsession
      , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
@@ -285738,7 +280089,6 @@ self: {
        ];
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -286460,27 +280810,6 @@ self: {
      }) {};
 
   "yesod-persistent" = callPackage
-    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
-     , persistent-sqlite, persistent-template, resource-pool, resourcet
-     , text, transformers, wai-extra, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-persistent";
-       version = "1.6.0.4";
-       sha256 = "1gsiw2zx6z7za7a164h0fxfggkrdqz6fn0qyb2zn9qr7r2jbg1c0";
-       libraryHaskellDepends = [
-         base blaze-builder conduit persistent persistent-template
-         resource-pool resourcet transformers yesod-core
-       ];
-       testHaskellDepends = [
-         base blaze-builder conduit hspec persistent persistent-sqlite text
-         wai-extra yesod-core
-       ];
-       description = "Some helpers for using Persistent from Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-persistent_1_6_0_5" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet
      , text, transformers, wai-extra, yesod-core
@@ -286499,7 +280828,6 @@ self: {
        ];
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-platform" = callPackage
@@ -289003,36 +283331,6 @@ self: {
      }) {};
 
   "zip" = 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.5.0";
-       sha256 = "00lqf0bw6abxdj9rs658blbhabzr1fd1w9dh0qflyxqkd8fqj7h5";
-       revision = "1";
-       editedCabalFile = "08r12h84zp55lfqh53srmivf4xzyq2yyyiw12ja73ipnb0y2ag7i";
-       isLibrary = true;
-       isExecutable = true;
-       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
-       ];
-       executableHaskellDepends = [ base filepath ];
-       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;
-     }) {};
-
-  "zip_1_6_0" = callPackage
     ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
      , cereal, conduit, conduit-extra, conduit-zstd, containers, digest
      , directory, dlist, exceptions, filepath, hspec, monad-control, mtl
@@ -289058,7 +283356,6 @@ self: {
        ];
        description = "Operations on zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zip-archive" = callPackage

From 6aa6b8f0eb97c9f94b6e9b6b620e46da9810de49 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Nov 2020 22:02:27 +0100
Subject: [PATCH 3082/3942] haskell: drop overrides that have become obsolete
 in Stackage Nightly

---
 .../haskell-modules/configuration-common.nix     | 15 ---------------
 .../haskell-modules/configuration-ghc-8.10.x.nix | 16 ----------------
 2 files changed, 31 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9a084b2311a4..b30875774e77 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1395,20 +1395,10 @@ self: super: {
   liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; };
   Diff_0_3_4 = dontCheck super.Diff_0_3_4;
 
-  # We want the latest version of cryptonite. This is a first step towards
-  # resolving https://github.com/NixOS/nixpkgs/issues/81915.
-  cryptonite = doDistribute self.cryptonite_0_27;
-
   # We want the latest version of Pandoc.
-  skylighting = doDistribute super.skylighting_0_10_0_3;
-  skylighting-core = doDistribute super.skylighting-core_0_10_0_3;
   hslua = doDistribute self.hslua_1_1_2;
-  jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2;
-  pandoc = doDistribute self.pandoc_2_11_1_1;
   # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
   pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2);
-  pandoc-types = doDistribute self.pandoc-types_1_22;
-  rfc5051 = doDistribute self.rfc5051_0_2;
 
   # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
   domain-auth = dontCheck super.domain-auth;
@@ -1421,9 +1411,6 @@ self: super: {
 
   autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; };
 
-  # binary-instances needs the latest version.
-  time-compat = self.time-compat_1_9_4;
-
   # - Deps are required during the build for testing and also during execution,
   #   so add them to build input and also wrap the resulting binary so they're in
   #   PATH.
@@ -1462,7 +1449,6 @@ self: super: {
     # in this list or marked as broken anyways
     haskell-language-server = dontCheck super.haskell-language-server;
     fourmolu = dontCheck super.fourmolu;
-    stylish-haskell = super.stylish-haskell_0_12_2_0;
     ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch {
       # 2020-11-13: Bumping bounds via an already upstream merged change
       # https://github.com/haskell/ghcide/pull/905
@@ -1473,7 +1459,6 @@ self: super: {
     refinery = super.refinery_0_3_0_0;
     data-tree-print = doJailbreak super.data-tree-print;
     ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_3;
-    hie-bios = dontCheck super.hie-bios_0_7_1;
     lsp-test = dontCheck super.lsp-test_0_11_0_7;
     hls-plugin-api = super.hls-plugin-api;
     hls-hlint-plugin = super.hls-hlint-plugin;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index b801a08a9eab..a205c468e6e3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -57,24 +57,15 @@ self: super: {
     };
   });
 
-  # Deviate from Stackage LTS-15.x to fix the build.
-  haddock-library = self.haddock-library_1_9_0;
-
   # Jailbreak to fix the build.
   base-noprelude = doJailbreak super.base-noprelude;
   system-fileio = doJailbreak super.system-fileio;
   unliftio-core = doJailbreak super.unliftio-core;
 
   # Use the latest version to fix the build.
-  dhall = self.dhall_1_36_0;
-  lens = self.lens_4_19_2;
   optics = self.optics_0_3;
-  optics-core = self.optics-core_0_3_0_1;
   optics-extra = self.optics-extra_0_3;
   optics-th = self.optics-th_0_3_0_2;
-  repline = self.repline_0_4_0_0;
-  singletons = self.singletons_2_7;
-  th-desugar = self.th-desugar_1_11;
 
   insert-ordered-containers = super.insert-ordered-containers.override {
     optics-core = self.optics-core_0_3_0_1;
@@ -86,13 +77,6 @@ self: super: {
   # Jailbreaking because monoidal-containers hasn‘t bumped it's base dependency for 8.10.
   monoidal-containers = doJailbreak super.monoidal-containers;
 
-  # `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need
-  # the `ghc-lib-parser` dependency on GHC >= 8.8. However, because we have
-  # multiple verions of `ghc-lib-parser(-ex)` available, and the default ones
-  # are older ones, those older ones will complain. Because we have a newer
-  # GHC, we can just set the dependency to `null` as it is not used.
-  ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = null; };
-
   # Jailbreak to fix the build.
   brick = doJailbreak super.brick;
   exact-pi = doJailbreak super.exact-pi;

From 939e04ca726d99dfee838de841b16f3e91e5bc29 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Nov 2020 22:26:43 +0100
Subject: [PATCH 3083/3942] hackage2nix: No broken packages! For a while ...

---
 .../configuration-hackage2nix.yaml            | 8664 -----------------
 1 file changed, 8664 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 80d41552f1b2..d18388ffb835 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2924,8667 +2924,3 @@ dont-distribute-packages:
 
 broken-packages:
   # These packages don't compile or depend on packages that don't compile.
-  - 3dmodels
-  - 4Blocks
-  - a50
-  - AAI
-  - abcBridge
-  - abcnotation
-  - abeson
-  - abides
-  - abnf
-  - AbortT-monadstf
-  - AbortT-mtl
-  - AbortT-transformers
-  - abstract-par-accelerate
-  - abt
-  - AC-BuildPlatform
-  - AC-EasyRaster-GTK
-  - AC-HalfInteger
-  - ac-machine
-  - ac-machine-conduit
-  - AC-MiniTest
-  - AC-Terminal
-  - AC-VanillaArray
-  - AC-Vector
-  - AC-Vector-Fancy
-  - acc
-  - accelerate
-  - accelerate-arithmetic
-  - accelerate-fftw
-  - accelerate-fourier
-  - accelerate-io
-  - accelerate-kullback-liebler
-  - accelerate-llvm
-  - accelerate-llvm-native
-  - accelerate-random
-  - accelerate-typelits
-  - accelerate-utility
-  - accentuateus
-  - access-time
-  - access-token-provider
-  - achille
-  - acid-state-dist
-  - acid-state-tls
-  - ACME
-  - acme-all-monad
-  - acme-comonad
-  - acme-flipping-tables
-  - acme-hq9plus
-  - acme-http
-  - acme-inator
-  - acme-kitchen-sink
-  - acme-left-pad
-  - acme-miscorder
-  - acme-mutable-package
-  - acme-now
-  - acme-numbersystem
-  - acme-operators
-  - acme-php
-  - acme-schoenfinkel
-  - acme-strfry
-  - acme-stringly-typed
-  - acme-this
-  - acme-zero
-  - ActionKid
-  - activehs
-  - activehs-base
-  - activitypub
-  - activitystreams-aeson
-  - actor
-  - acts
-  - Adaptive
-  - Adaptive-Blaisorblade
-  - adaptive-containers
-  - adaptive-tuple
-  - adb
-  - addy
-  - adhoc-network
-  - adict
-  - adobe-swatch-exchange
-  - adp-multi
-  - adp-multi-monadiccp
-  - ADPfusionForest
-  - ADPfusionSet
-  - adtrees
-  - Advgame
-  - Advise-me
-  - AERN-Basics
-  - AERN-Net
-  - AERN-Real
-  - AERN-Real-Double
-  - AERN-Real-Interval
-  - AERN-RnToRm
-  - AERN-RnToRm-Plot
-  - aern2-mp
-  - aern2-real
-  - aeson-applicative
-  - aeson-commit
-  - aeson-decode
-  - aeson-diff-generic
-  - aeson-filthy
-  - aeson-flowtyped
-  - aeson-injector
-  - aeson-iproute
-  - aeson-native
-  - aeson-prefix
-  - aeson-schema
-  - aeson-smart
-  - aeson-streams
-  - aeson-t
-  - aeson-tiled
-  - aeson-typescript
-  - affection
-  - affine-invariant-ensemble-mcmc
-  - afv
-  - ag-pictgen
-  - Agata
-  - agda-server
-  - agda-snippets
-  - agda-snippets-hakyll
-  - agentx
-  - AGI
-  - AhoCorasick
-  - aig
-  - aip
-  - air-th
-  - airbrake
-  - airship
-  - airtable-api
-  - aivika-distributed
-  - ajhc
-  - AlanDeniseEricLauren
-  - alerta
-  - alex-prelude
-  - alfred
-  - alfred-margaret
-  - alga
-  - algebra-dag
-  - algebra-sql
-  - algebraic
-  - algebraic-prelude
-  - algo-s
-  - algolia
-  - AlgoRhythm
-  - AlgorithmW
-  - align-text
-  - AlignmentAlgorithms
-  - Allure
-  - alms
-  - alpha
-  - alphachar
-  - alsa
-  - alsa-gui
-  - alsa-midi
-  - alsa-pcm-tests
-  - alsa-seq-tests
-  - altcomposition
-  - alternative-extra
-  - alternative-io
-  - alto
-  - alure
-  - amazon-emailer
-  - amazon-emailer-client-snap
-  - amazon-products
-  - amby
-  - AMI
-  - ampersand
-  - amqp-conduit
-  - amqp-streamly
-  - analyze
-  - analyze-client
-  - anansi-pandoc
-  - anatomy
-  - android
-  - android-activity
-  - android-lint-summary
-  - AndroidViewHierarchyImporter
-  - angel
-  - angle
-  - Animas
-  - animascii
-  - animate
-  - animate-example
-  - animate-frames
-  - animate-preview
-  - animate-sdl2
-  - annah
-  - Annotations
-  - anonymous-sums
-  - anonymous-sums-tests
-  - ansigraph
-  - antagonist
-  - antfarm
-  - anticiv
-  - antigate
-  - antimirov
-  - antiope-dynamodb
-  - antisplice
-  - antlr-haskell
-  - antlrc
-  - anydbm
-  - aop-prelude
-  - aosd
-  - apart
-  - apecs-gloss
-  - apecs-physics
-  - apecs-physics-gloss
-  - apecs-stm
-  - apelsin
-  - api-builder
-  - api-rpc-factom
-  - api-rpc-pegnet
-  - api-tools
-  - api-yoti
-  - apiary
-  - apiary-authenticate
-  - apiary-clientsession
-  - apiary-cookie
-  - apiary-eventsource
-  - apiary-helics
-  - apiary-http-client
-  - apiary-logger
-  - apiary-memcached
-  - apiary-mongoDB
-  - apiary-persistent
-  - apiary-purescript
-  - apiary-redis
-  - apiary-session
-  - apiary-websockets
-  - apis
-  - apotiki
-  - app-lens
-  - appc
-  - ApplePush
-  - AppleScript
-  - applicative-fail
-  - applicative-parsec
-  - applicative-quoters
-  - applicative-splice
-  - approveapi
-  - ApproxFun-hs
-  - arb-fft
-  - arbb-vm
-  - arbor-datadog
-  - arbor-monad-counter
-  - arbor-monad-metric
-  - arbor-monad-metric-datadog
-  - arbor-postgres
-  - arbtt
-  - arch-hs
-  - archive-libarchive
-  - archive-tar-bytestring
-  - archiver
-  - archlinux
-  - archlinux-web
-  - archnews
-  - arduino-copilot
-  - arena
-  - arff
-  - arghwxhaskell
-  - argon
-  - argon2
-  - argparser
-  - arguedit
-  - ariadne
-  - arion
-  - arithmetic-circuits
-  - armada
-  - armor
-  - arpa
-  - arpack
-  - array-builder
-  - array-chunks
-  - array-forth
-  - array-list
-  - array-primops
-  - arrayfire
-  - arraylist
-  - ArrayRef
-  - arrow-improve
-  - arrow-list
-  - arrowapply-utils
-  - arrowp
-  - arrowp-qq
-  - ArrowVHDL
-  - artery
-  - artifact
-  - asap
-  - ascii
-  - ascii-cows
-  - ascii-flatten
-  - ascii-string
-  - ascii-table
-  - ascii-vector-avc
-  - ascii85-conduit
-  - asic
-  - asil
-  - asn
-  - asn1-codec
-  - asn1-data
-  - AspectAG
-  - assert
-  - assertions
-  - asset-map
-  - assimp
-  - assumpta
-  - ast-monad
-  - ast-monad-json
-  - astrds
-  - astview
-  - async-combinators
-  - async-dejafu
-  - async-manager
-  - async-timer
-  - asynchronous-exceptions
-  - aterm
-  - aterm-utils
-  - atlassian-connect-core
-  - atlassian-connect-descriptor
-  - atmos-dimensional-tf
-  - atndapi
-  - atom-conduit
-  - atom-msp430
-  - atomic-modify
-  - atomic-primops-foreign
-  - atomic-primops-vector
-  - atomo
-  - atp-haskell
-  - ats-pkg
-  - ats-setup
-  - ats-storable
-  - attempt
-  - attic-schedule
-  - atto-lisp
-  - AttoBencode
-  - AttoJson
-  - attomail
-  - attoparsec-enumerator
-  - attoparsec-ip
-  - attoparsec-iteratee
-  - attoparsec-text
-  - attoparsec-text-enumerator
-  - attoparsec-trans
-  - attoparsec-uri
-  - attosplit
-  - Attrac
-  - atuin
-  - audiovisual
-  - augeas
-  - augur
-  - aur
-  - aur-api
-  - aura
-  - Aurochs
-  - authenticate-ldap
-  - authinfo-hs
-  - authoring
-  - AutoForms
-  - autom
-  - automata
-  - autonix-deps
-  - autonix-deps-kf5
-  - avatar-generator
-  - avers
-  - avers-api
-  - avers-api-docs
-  - avers-server
-  - avl-static
-  - AvlTree
-  - avr-shake
-  - avro-piper
-  - avwx
-  - awesome-prelude
-  - awesomium
-  - awesomium-glut
-  - awesomium-raw
-  - aws-configuration-tools
-  - aws-dynamodb-conduit
-  - aws-dynamodb-streams
-  - aws-easy
-  - aws-ec2
-  - aws-ec2-knownhosts
-  - aws-elastic-transcoder
-  - aws-general
-  - aws-kinesis
-  - aws-kinesis-client
-  - aws-kinesis-reshard
-  - aws-lambda
-  - aws-lambda-haskell-runtime-wai
-  - aws-mfa-credentials
-  - aws-performance-tests
-  - aws-route53
-  - aws-sdk
-  - aws-sdk-text-converter
-  - aws-sdk-xml-unordered
-  - aws-sign4
-  - aws-simple
-  - aws-sns
-  - axel
-  - axiom
-  - azimuth-hs
-  - azubi
-  - azure-acs
-  - azure-email
-  - azure-functions-worker
-  - azure-service-api
-  - azure-servicebus
-  - azurify
-  - b-tree
-  - b9
-  - babylon
-  - backblaze-b2-hs
-  - backdropper
-  - backstop
-  - backtracking-exceptions
-  - backward-state
-  - bag
-  - Baggins
-  - bake
-  - ballast
-  - bamboo
-  - bamboo-launcher
-  - bamboo-plugin-highlight
-  - bamboo-plugin-photo
-  - bamboo-theme-blueprint
-  - bamboo-theme-mini-html5
-  - bamse
-  - bamstats
-  - Bang
-  - bank-holiday-usa
-  - banwords
-  - barbies-th
-  - barchart
-  - barcodes-code128
-  - barecheck
-  - Barracuda
-  - barrie
-  - barrier
-  - barrier-monad
-  - base-compat-migrate
-  - base-encoding
-  - base-feature-macros
-  - base-generics
-  - base-io-access
-  - base32-bytestring
-  - base62
-  - base64-bytes
-  - base64-conduit
-  - baserock-schema
-  - basex-client
-  - BASIC
-  - basic
-  - baskell
-  - batch
-  - batchd
-  - battlenet
-  - battlenet-yesod
-  - battleplace
-  - battleplace-api
-  - battleship-combinatorics
-  - battleships
-  - bayes-stack
-  - bazel-coverage-report-renderer
-  - bbi
-  - BCMtools
-  - bcp47
-  - bdcs
-  - bdcs-api
-  - bdd
-  - bdo
-  - beam
-  - beam-automigrate
-  - beam-core
-  - beam-migrate
-  - beam-mysql
-  - beam-newtype-field
-  - beam-postgres
-  - beam-sqlite
-  - beam-th
-  - beamable
-  - bearriver
-  - beautifHOL
-  - bed-and-breakfast
-  - beeminder-api
-  - Befunge93
-  - bein
-  - belka
-  - BenchmarkHistory
-  - benchpress
-  - bencodex
-  - berkeleydb
-  - BerkeleyDBXML
-  - BerlekampAlgorithm
-  - berp
-  - bert
-  - besout
-  - bet
-  - betacode
-  - betris
-  - bff
-  - bgmax
-  - bgzf
-  - bhoogle
-  - bibdb
-  - bidirectionalization-combined
-  - bidispec
-  - bidispec-extras
-  - BiGUL
-  - billboard-parser
-  - billeksah-forms
-  - billeksah-main
-  - billeksah-pane
-  - billeksah-services
-  - binary-bits
-  - binary-communicator
-  - binary-derive
-  - binary-ext
-  - binary-file
-  - binary-indexed-tree
-  - binary-protocol
-  - binary-protocol-zmq
-  - binary-search
-  - binary-streams
-  - binary-tagged
-  - binary-typed
-  - bind-marshal
-  - BinderAnn
-  - binding-core
-  - binding-gtk
-  - binding-wx
-  - bindings-apr
-  - bindings-apr-util
-  - bindings-bfd
-  - bindings-cctools
-  - bindings-common
-  - bindings-dc1394
-  - bindings-eskit
-  - bindings-EsounD
-  - bindings-fann
-  - bindings-fluidsynth
-  - bindings-friso
-  - bindings-gsl
-  - bindings-hamlib
-  - bindings-hdf5
-  - bindings-K8055
-  - bindings-libftdi
-  - bindings-libg15
-  - bindings-librrd
-  - bindings-libstemmer
-  - bindings-libusb
-  - bindings-libv4l2
-  - bindings-linux-videodev2
-  - bindings-monetdb-mapi
-  - bindings-mpdecimal
-  - bindings-ppdev
-  - bindings-sc3
-  - bindings-sipc
-  - bindings-wlc
-  - bindynamic
-  - binembed
-  - binembed-example
-  - bio
-  - bio-sequence
-  - bioace
-  - bioalign
-  - Biobase
-  - BiobaseBlast
-  - BiobaseDotP
-  - BiobaseENA
-  - BiobaseEnsembl
-  - BiobaseFasta
-  - BiobaseFR3D
-  - BiobaseHTTP
-  - BiobaseHTTPTools
-  - BiobaseInfernal
-  - BiobaseMAF
-  - BiobaseNewick
-  - BiobaseTrainingData
-  - BiobaseTurner
-  - BiobaseTypes
-  - BiobaseVienna
-  - BiobaseXNA
-  - biocore
-  - biofasta
-  - biofastq
-  - biohazard
-  - BioHMM
-  - bioinformatics-toolkit
-  - biophd
-  - biopsl
-  - biosff
-  - biostockholm
-  - birch-beer
-  - bird
-  - BirdPP
-  - birds-of-paradise
-  - bisect-binary
-  - bishbosh
-  - bit-array
-  - bit-stream
-  - bitcoin-address
-  - bitcoin-api
-  - bitcoin-api-extra
-  - bitcoin-block
-  - bitcoin-compact-filters
-  - bitcoin-hs
-  - bitcoin-rpc
-  - bitcoin-script
-  - bitcoin-scripting
-  - bitcoin-tx
-  - bitcoind-regtest
-  - bitcoind-rpc
-  - Bitly
-  - bitly-cli
-  - bitmaps
-  - bits-atomic
-  - bits-conduit
-  - bits-extras
-  - bitset
-  - bitspeak
-  - bitstream
-  - BitStringRandomMonad
-  - bittorrent
-  - bitx-bitcoin
-  - bizzlelude
-  - bizzlelude-js
-  - bkr
-  - bla
-  - blakesum
-  - blakesum-demo
-  - blas
-  - blas-hs
-  - BlastHTTP
-  - blastxml
-  - blatex
-  - blaze-builder-enumerator
-  - blaze-colonnade
-  - blaze-html-contrib
-  - blaze-html-hexpat
-  - blaze-html-truncate
-  - blaze-json
-  - blaze-textual-native
-  - blazeT
-  - ble
-  - blink1
-  - blip
-  - bliplib
-  - Blobs
-  - blockchain
-  - blockhash
-  - Blogdown
-  - blogination
-  - BlogLiterately
-  - BlogLiterately-diagrams
-  - bloodhound
-  - bloodhound-amazonka-auth
-  - bloomfilter-redis
-  - blosum
-  - bloxorz
-  - blubber
-  - blubber-server
-  - Blueprint
-  - bluetile
-  - bluetileutils
-  - blunk-hask-tests
-  - blunt
-  - bno055-haskell
-  - bogre-banana
-  - boilerplate
-  - bolt
-  - boltzmann-brain
-  - bond
-  - bond-haskell
-  - bond-haskell-compiler
-  - bookkeeper
-  - bookkeeper-permissions
-  - Bookshelf
-  - boolexpr
-  - boombox
-  - boomslang
-  - boopadoop
-  - boots-app
-  - boots-cloud
-  - boots-web
-  - borel
-  - boring-window-switcher
-  - bot
-  - botpp
-  - bounded-array
-  - bowntz
-  - box
-  - box-csv
-  - box-socket
-  - braid
-  - brain-bleep
-  - Bravo
-  - breakout
-  - brians-brain
-  - brick-dropdownmenu
-  - bricks
-  - bricks-internal
-  - bricks-internal-test
-  - bricks-parsec
-  - bricks-rendering
-  - bricks-syntax
-  - brillig
-  - broccoli
-  - brok
-  - broker-haskell
-  - bronyradiogermany-common
-  - bronyradiogermany-streaming
-  - brotli
-  - brotli-conduit
-  - brotli-streams
-  - browscap
-  - bsd-sysctl
-  - bson
-  - bson-generic
-  - bson-generics
-  - bson-lens
-  - bsparse
-  - btree
-  - btree-concurrent
-  - buchhaltung
-  - buffer
-  - buffer-builder
-  - buffer-builder-aeson
-  - BufferedSocket
-  - buffet
-  - buffon
-  - bugsnag-haskell
-  - bugzilla
-  - build
-  - buildable
-  - buildbox
-  - buildbox-tools
-  - buildwrapper
-  - bullet
-  - bulmex
-  - bumper
-  - bunz
-  - burnt-explorer
-  - burst-detection
-  - bus-pirate
-  - Buster
-  - buster
-  - buster-gtk
-  - buster-network
-  - butter
-  - butterflies
-  - bv-sized
-  - byline
-  - bytable
-  - bytearray-parsing
-  - bytebuild
-  - bytehash
-  - bytelog
-  - byteslice
-  - bytesmith
-  - bytestring-arbitrary
-  - bytestring-builder-varword
-  - bytestring-class
-  - bytestring-csv
-  - bytestring-handle
-  - bytestring-plain
-  - bytestring-read
-  - bytestring-rematch
-  - bytestring-show
-  - bytestring-substring
-  - bytestring-time
-  - bytestring-typenats
-  - bytestringparser
-  - bytestringparser-temporary
-  - bytestringreadp
-  - bzlib
-  - c-dsl
-  - c-io
-  - c-mosquitto
-  - c0check
-  - c0parser
-  - c10k
-  - c2ats
-  - cabal-audit
-  - cabal-auto-expose
-  - cabal-bundle-clib
-  - cabal-cache
-  - cabal-cargs
-  - cabal-constraints
-  - cabal-db
-  - cabal-dependency-licenses
-  - cabal-dev
-  - cabal-dir
-  - cabal-ghc-dynflags
-  - cabal-ghci
-  - cabal-graphdeps
-  - Cabal-ide-backend
-  - cabal-info
-  - cabal-install-bundle
-  - cabal-install-ghc72
-  - cabal-install-ghc74
-  - cabal-install-parsers
-  - cabal-meta
-  - cabal-mon
-  - cabal-nirvana
-  - cabal-progdeps
-  - cabal-query
-  - cabal-setup
-  - cabal-sort
-  - cabal-src
-  - cabal-test
-  - cabal-upload
-  - cabal2arch
-  - cabal2doap
-  - cabal2ebuild
-  - cabal2ghci
-  - cabalgraph
-  - cabalish
-  - cabalmdvrpm
-  - cabalQuery
-  - cabalrpmdeps
-  - CabalSearch
-  - cabalvchk
-  - cabin
-  - cabocha
-  - cached
-  - caching
-  - cacophony
-  - cafeteria-prelude
-  - caffegraph
-  - cairo-core
-  - cake
-  - cake3
-  - cakyrespa
-  - cal-layout
-  - cal3d
-  - cal3d-examples
-  - cal3d-opengl
-  - calamity
-  - calc
-  - calculator
-  - caldims
-  - caledon
-  - call
-  - call-alloy
-  - call-haskell-from-anything
-  - camfort
-  - campfire
-  - canon
-  - canonical-filepath
-  - canonical-json
-  - canteven-http
-  - canteven-listen-http
-  - canteven-log
-  - canteven-parsedate
-  - cantor
-  - cao
-  - cap
-  - Capabilities
-  - capability
-  - capataz
-  - capnp
-  - capped-list
-  - capri
-  - car-pool
-  - caramia
-  - carbonara
-  - carboncopy
-  - carettah
-  - CarneadesDSL
-  - CarneadesIntoDung
-  - carte
-  - cartel
-  - Cartesian
-  - casa-abbreviations-and-acronyms
-  - casadi-bindings
-  - casadi-bindings-control
-  - casadi-bindings-core
-  - casadi-bindings-internal
-  - casadi-bindings-ipopt-interface
-  - casadi-bindings-snopt-interface
-  - Cascade
-  - cascading
-  - cases
-  - cash
-  - cassandra-cql
-  - Cassava
-  - cassava-conduit
-  - cassava-records
-  - cassette
-  - cassy
-  - castle
-  - casui
-  - catamorphism
-  - Catana
-  - catch-fd
-  - categorical-algebra
-  - category-extras
-  - category-traced
-  - catnplus
-  - cautious-file
-  - cautious-gen
-  - cayley-client
-  - CBOR
-  - CC-delcont-alt
-  - CC-delcont-cxe
-  - CC-delcont-exc
-  - CC-delcont-ref
-  - CC-delcont-ref-tf
-  - CCA
-  - cci
-  - ccnx
-  - cctools-workqueue
-  - cedict
-  - cef
-  - cef3-raw
-  - cef3-simple
-  - ceilometer-common
-  - cellrenderer-cairo
-  - celtchar
-  - cerberus
-  - cereal-derive
-  - cereal-enumerator
-  - cereal-ieee754
-  - cereal-io-streams
-  - cereal-plus
-  - cereal-streams
-  - cereal-time
-  - certificate
-  - cf
-  - cfenv
-  - cfipu
-  - cflp
-  - cfopu
-  - cg
-  - cgen
-  - cgi-utils
-  - cgrep
-  - chainweb-mining-client
-  - chalkboard
-  - chalkboard-viewer
-  - charade
-  - chart-cli
-  - Chart-fltkhs
-  - chart-histogram
-  - Chart-simple
-  - chart-svg
-  - chart-svg-various
-  - chart-unit
-  - chatter
-  - chatty-text
-  - chatwork
-  - cheapskate-terminal
-  - check-pvp
-  - Checked
-  - checked
-  - checkmate
-  - chell-quickcheck
-  - chessIO
-  - chevalier-common
-  - chiasma
-  - chiphunk
-  - chitauri
-  - Chitra
-  - choose
-  - choose-exe
-  - chorale
-  - chorale-geo
-  - chp
-  - chp-mtl
-  - chp-plus
-  - chp-spec
-  - chp-transformers
-  - chr-core
-  - chr-lang
-  - chr-parse
-  - ChristmasTree
-  - chromatin
-  - chronograph
-  - chu2
-  - chunks
-  - chunky
-  - church
-  - church-maybe
-  - cielo
-  - cil
-  - cimple
-  - cinvoke
-  - cio
-  - cipher-blowfish
-  - ciphersaber2
-  - circlehs
-  - citation-resolve
-  - citeproc-hs
-  - citeproc-hs-pandoc-filter
-  - cj-token
-  - cjk
-  - clac
-  - clafer
-  - claferIG
-  - claferwiki
-  - clang-compilation-database
-  - clang-pure
-  - clanki
-  - clarifai
-  - CLASE
-  - clash
-  - clash-multisignal
-  - Clash-Royale-Hack-Cheats
-  - clash-systemverilog
-  - clash-verilog
-  - clash-vhdl
-  - classify-frog
-  - ClassLaws
-  - classy-influxdb-simple
-  - classy-miso
-  - classy-parallel
-  - classyplate
-  - ClassyPrelude
-  - clckwrks
-  - clckwrks-cli
-  - clckwrks-dot-com
-  - clckwrks-plugin-bugs
-  - clckwrks-plugin-ircbot
-  - clckwrks-plugin-mailinglist
-  - clckwrks-plugin-media
-  - clckwrks-plugin-page
-  - clckwrks-plugin-redirect
-  - clckwrks-theme-bootstrap
-  - clckwrks-theme-clckwrks
-  - clckwrks-theme-geo-bootstrap
-  - Clean
-  - clean-unions
-  - cless
-  - clevercss
-  - clexer
-  - CLI
-  - cli-builder
-  - cli-extras
-  - cli-git
-  - cli-nix
-  - clif
-  - clifford
-  - clifm
-  - clingo
-  - clippard
-  - clipper
-  - clippings
-  - clisparkline
-  - clit
-  - clocked
-  - clogparse
-  - clone-all
-  - closure
-  - cloud-haskell
-  - cloud-seeder
-  - cloudfront-signer
-  - clr-inline
-  - clua
-  - cluss
-  - ClustalParser
-  - clustering
-  - clustertools
-  - clutterhs
-  - cmark-highlight
-  - cmark-patterns
-  - cmark-sections
-  - cmath
-  - cmathml3
-  - CMCompare
-  - cmd-item
-  - cmdargs-browser
-  - cmdlib
-  - cmdtheline
-  - cmonad
-  - cmph
-  - cmptype
-  - CMQ
-  - cmt
-  - cmv
-  - cnc-spec-compiler
-  - co-log-polysemy-formatting
-  - co-log-sys
-  - Coadjute
-  - coalpit
-  - cobot-io
-  - cobot-tools
-  - code-builder
-  - codec
-  - codec-beam
-  - codec-libevent
-  - codec-rpm
-  - codecov-haskell
-  - codemonitor
-  - codepad
-  - codeworld-api
-  - codex
-  - codo-notation
-  - coin
-  - coinbase-exchange
-  - coinbase-pro
-  - coincident-root-loci
-  - colada
-  - colchis
-  - collada-output
-  - collapse-duplication
-  - collapse-util
-  - collection-json
-  - collections
-  - collections-api
-  - collections-base-instances
-  - colonnade
-  - Color
-  - color-counter
-  - colorless
-  - colorless-http-client
-  - colorless-scotty
-  - colour-accelerate
-  - colour-space
-  - coltrane
-  - columbia
-  - columnar
-  - com
-  - comark-syntax
-  - combinat
-  - combinat-diagrams
-  - combinator-interactive
-  - combinatorial-problems
-  - Combinatorrent
-  - combobuffer
-  - comic
-  - Command
-  - commander
-  - Commando
-  - commodities
-  - commsec
-  - commsec-keyexchange
-  - ComonadSheet
-  - compact-map
-  - compact-mutable
-  - compact-mutable-vector
-  - compact-socket
-  - compact-string
-  - compact-string-fix
-  - Compactable
-  - compactable
-  - compdata
-  - compdata-automata
-  - compdata-dags
-  - compdata-param
-  - compdoc
-  - compdoc-dhall-decoder
-  - competition
-  - compilation
-  - complexity
-  - compose-trans
-  - composite-aeson
-  - composite-aeson-cofree-list
-  - composite-aeson-path
-  - composite-aeson-refined
-  - composite-aeson-throw
-  - composite-aeson-writeonly
-  - composite-binary
-  - composite-ekg
-  - composite-opaleye
-  - composite-swagger
-  - composition-tree
-  - compound-types
-  - comprehensions-ghc
-  - compressed
-  - compstrat
-  - comptrans
-  - computational-algebra
-  - computational-geometry
-  - computations
-  - concraft
-  - concraft-hr
-  - concraft-pl
-  - concrete-haskell
-  - concrete-haskell-autogen
-  - concrete-relaxng-parser
-  - concrete-typerep
-  - concurrent-buffer
-  - Concurrent-Cache
-  - concurrent-machines
-  - concurrent-state
-  - concurrent-utilities
-  - Concurrential
-  - ConcurrentUtils
-  - Condor
-  - condor
-  - condorcet
-  - conductive-base
-  - conductive-hsc3
-  - conductive-song
-  - conduit-audio-lame
-  - conduit-audio-samplerate
-  - conduit-find
-  - conduit-iconv
-  - conduit-network-stream
-  - conduit-resumablesink
-  - conduit-throttle
-  - conduit-tokenize-attoparsec
-  - conduit-vfs
-  - conduit-vfs-zip
-  - conf
-  - confcrypt
-  - conferer-hedis
-  - conferer-provider-dhall
-  - conferer-provider-json
-  - conferer-provider-yaml
-  - conferer-snap
-  - conffmt
-  - confide
-  - config-parser
-  - config-select
-  - config-value-getopt
-  - ConfigFileTH
-  - Configger
-  - configifier
-  - Configurable
-  - configuration
-  - configuration-tools
-  - configurator-ng
-  - confsolve
-  - congruence-relation
-  - conjure
-  - conkin
-  - conlogger
-  - connection-string
-  - connections
-  - Conscript
-  - consistent
-  - console-program
-  - const-math-ghc-plugin
-  - constr-eq
-  - constrained-categories
-  - constrained-category
-  - constrained-dynamic
-  - constrained-monads
-  - constraint-manip
-  - ConstraintKinds
-  - constraints-emerge
-  - construct
-  - constructible
-  - constructive-algebra
-  - consul-haskell
-  - Consumer
-  - consumers
-  - container
-  - containers-benchmark
-  - containers-unicode-symbols
-  - containers-verified
-  - ContArrow
-  - content-store
-  - context-free-grammar
-  - context-stack
-  - ContextAlgebra
-  - contiguous
-  - contiguous-checked
-  - contiguous-fft
-  - continue
-  - continuum
-  - continuum-client
-  - Contract
-  - control
-  - control-iso
-  - control-monad-attempt
-  - control-monad-exception
-  - control-monad-exception-monadsfd
-  - control-monad-exception-monadstf
-  - control-monad-exception-mtl
-  - control-monad-failure
-  - control-monad-failure-mtl
-  - Control-Monad-MultiPass
-  - Control-Monad-ST2
-  - contstuff-monads-tf
-  - contstuff-transformers
-  - conversions
-  - convert
-  - convert-annotation
-  - convertible-ascii
-  - convertible-text
-  - coordinate
-  - copilot
-  - copilot-cbmc
-  - copilot-language
-  - copilot-libraries
-  - copilot-sbv
-  - copilot-theorem
-  - copr
-  - COrdering
-  - core
-  - core-haskell
-  - corebot-bliki
-  - CoreDump
-  - CoreErlang
-  - CoreFoundation
-  - corenlp-parser
-  - Coroutine
-  - coroutine-enumerator
-  - coroutine-iteratee
-  - coroutine-object
-  - couch-hs
-  - couch-simple
-  - CouchDB
-  - couchdb-conduit
-  - couchdb-enumerator
-  - countable-inflections
-  - counter
-  - country-codes
-  - courier
-  - court
-  - coverage
-  - coya
-  - cparsing
-  - CPBrainfuck
-  - cpio-conduit
-  - cpkg
-  - CPL
-  - cplusplus-th
-  - cprng-aes-effect
-  - cpuperf
-  - cpython
-  - cql-io
-  - cql-io-tinylog
-  - cqrs-core
-  - cqrs-example
-  - cqrs-memory
-  - cqrs-postgresql
-  - cqrs-sqlite3
-  - cqrs-test
-  - cqrs-testkit
-  - cr
-  - crack
-  - craft
-  - Craft3e
-  - craftwerk
-  - craftwerk-cairo
-  - craftwerk-gtk
-  - crawlchain
-  - craze
-  - crc
-  - crc16
-  - crdt
-  - creatur
-  - credential-store
-  - crf-chain1
-  - crf-chain1-constrained
-  - crf-chain2-generic
-  - crf-chain2-tiers
-  - critbit
-  - criterion-compare
-  - criterion-plus
-  - criterion-to-html
-  - criu-rpc
-  - criu-rpc-types
-  - crjdt-haskell
-  - crockford
-  - crocodile
-  - cron-compat
-  - cruncher-types
-  - crunghc
-  - crypto-cipher-benchmarks
-  - crypto-conduit
-  - crypto-multihash
-  - crypto-pubkey-openssh
-  - crypto-random-effect
-  - crypto-rng
-  - crypto-simple
-  - crypto-sodium
-  - cryptocipher
-  - cryptocompare
-  - cryptoconditions
-  - cryptoids
-  - cryptol
-  - cryptsy-api
-  - crystalfontz
-  - cse-ghc-plugin
-  - csg
-  - csound-catalog
-  - csound-expression
-  - csound-expression-dynamic
-  - csound-expression-opcodes
-  - csound-expression-typed
-  - csound-sampler
-  - CSPM-cspm
-  - CSPM-FiringRules
-  - CSPM-Frontend
-  - CSPM-Interpreter
-  - CSPM-ToProlog
-  - cspmchecker
-  - cspretty
-  - css
-  - css-selectors
-  - css-syntax
-  - csv-enumerator
-  - csv-nptools
-  - ctemplate
-  - ctkl
-  - ctpl
-  - cube
-  - cuboid
-  - cuckoo
-  - cudd
-  - curl-runnings
-  - currency-codes
-  - currency-convert
-  - curry-frontend
-  - CurryDB
-  - cursedcsv
-  - cursor-fuzzy-time-gen
-  - curve25519
-  - curves
-  - custom-prelude
-  - CV
-  - cv-combinators
-  - cypher
-  - d-bus
-  - d10
-  - d3js
-  - dag
-  - DAG-Tournament
-  - damnpacket
-  - Dangerous
-  - danibot
-  - Dao
-  - dao
-  - dapi
-  - darcs-benchmark
-  - darcs-beta
-  - darcs-buildpackage
-  - darcs-cabalized
-  - darcs-fastconvert
-  - darcs-graph
-  - darcs-monitor
-  - darcs2dot
-  - darcsden
-  - DarcsHelpers
-  - darcswatch
-  - darkplaces-demo
-  - darkplaces-rcon
-  - darkplaces-rcon-util
-  - darkplaces-text
-  - dash-haskell
-  - data-accessor-monads-fd
-  - data-accessor-monads-tf
-  - data-aviary
-  - data-base
-  - data-basic
-  - data-category
-  - data-check
-  - data-combinator-gen
-  - data-concurrent-queue
-  - data-construction
-  - data-cycle
-  - data-dispersal
-  - data-diverse-lens
-  - data-easy
-  - data-elf
-  - data-embed
-  - data-emoticons
-  - data-filepath
-  - data-fin
-  - data-fin-simple
-  - data-fix-cse
-  - data-flagset
-  - data-forest
-  - data-ivar
-  - data-kiln
-  - data-layer
-  - data-lens
-  - data-lens-fd
-  - data-lens-ixset
-  - data-lens-template
-  - data-map-multikey
-  - data-nat
-  - data-object
-  - data-object-json
-  - data-object-yaml
-  - data-pprint
-  - data-quotientref
-  - data-reify-cse
-  - data-repr
-  - data-result
-  - data-rev
-  - Data-Rope
-  - data-rope
-  - data-rtuple
-  - data-size
-  - data-spacepart
-  - data-standards
-  - data-store
-  - data-stringmap
-  - data-structure-inferrer
-  - data-sword
-  - data-transform
-  - data-type
-  - data-util
-  - data-validation
-  - data-variant
-  - database-id-groundhog
-  - database-study
-  - datadog
-  - datadog-tracing
-  - datafix
-  - dataflow
-  - datalog
-  - datapacker
-  - datasets
-  - DataTreeView
-  - dataurl
-  - DataVersion
-  - date-conversions
-  - dates
-  - datetime
-  - datetime-sb
-  - dawdle
-  - dawg
-  - dawg-ord
-  - dbcleaner
-  - dbf
-  - DBFunctor
-  - dbjava
-  - DBlimited
-  - dbm
-  - dbmigrations-mysql
-  - dbmigrations-postgresql
-  - dbmigrations-sqlite
-  - DBus
-  - dbus-client
-  - dbus-core
-  - dbus-qq
-  - dclabel
-  - dclabel-eci11
-  - dcpu16
-  - ddate
-  - ddc-base
-  - ddc-build
-  - ddc-code
-  - ddc-core
-  - ddc-core-babel
-  - ddc-core-eval
-  - ddc-core-flow
-  - ddc-core-llvm
-  - ddc-core-salt
-  - ddc-core-simpl
-  - ddc-core-tetra
-  - ddc-driver
-  - ddc-interface
-  - ddc-source-tetra
-  - ddc-tools
-  - ddc-war
-  - ddci-core
-  - dead-code-detection
-  - dead-simple-json
-  - Deadpan-DDP
-  - debug
-  - debug-me
-  - debug-trace-var
-  - debug-tracy
-  - decepticons
-  - decimal-arithmetic
-  - DecisionTree
-  - declarative
-  - decoder-conduit
-  - dedukti
-  - deepcontrol
-  - deeplearning-hs
-  - deepseq-bounded
-  - deepseq-magic
-  - deepseq-th
-  - deepzoom
-  - defargs
-  - DefendTheKing
-  - deka
-  - deka-tests
-  - delaunay
-  - delicious
-  - delimited-text
-  - delimiter-separated
-  - delta
-  - delta-h
-  - Delta-Lambda
-  - delude
-  - demarcate
-  - denominate
-  - dense
-  - dense-int-set
-  - dependent-hashmap
-  - dependent-monoidal-map
-  - dependent-state
-  - depends
-  - dephd
-  - deptrack-core
-  - deptrack-devops
-  - deptrack-dot
-  - derangement
-  - derivation-trees
-  - derive
-  - derive-enumerable
-  - derive-gadt
-  - derive-IG
-  - derive-monoid
-  - derive-topdown
-  - derive-trie
-  - derp-lib
-  - describe
-  - descript-lang
-  - deterministic-game-engine
-  - detour-via-uom
-  - deunicode
-  - devil
-  - devtools
-  - dewdrop
-  - dfinity-radix-tree
-  - Dflow
-  - dfsbuild
-  - dgim
-  - dgs
-  - dhall-check
-  - dhall-docs
-  - dhall-fly
-  - dhall-nix
-  - dhall-nixpkgs
-  - dhall-text
-  - dhall-to-cabal
-  - dhall-yaml
-  - dhcp-lease-parser
-  - dhrun
-  - di-polysemy
-  - dia-base
-  - dia-functions
-  - diagrams-boolean
-  - diagrams-builder
-  - diagrams-canvas
-  - diagrams-haddock
-  - diagrams-hsqml
-  - diagrams-html5
-  - diagrams-pandoc
-  - diagrams-pdf
-  - diagrams-qrcode
-  - diagrams-tikz
-  - diagrams-wx
-  - dialogflow-fulfillment
-  - dib
-  - dice
-  - dice-entropy-conduit
-  - dice2tex
-  - dicom
-  - dictionaries
-  - dictparser
-  - diet
-  - diff
-  - diffcabal
-  - difference-monoid
-  - DifferenceLogic
-  - differential
-  - DifferentialEvolution
-  - diffmap
-  - difftodo
-  - digestive-bootstrap
-  - digestive-foundation-lucid
-  - digestive-functors-aeson
-  - digestive-functors-happstack
-  - digestive-functors-hsp
-  - DigitalOcean
-  - digitalocean-kzs
-  - digits
-  - digraph
-  - dimensional-codata
-  - dimensional-tf
-  - DimensionalHash
-  - dingo-core
-  - dingo-example
-  - dingo-widgets
-  - diohsc
-  - diophantine
-  - diplomacy
-  - diplomacy-server
-  - direct-binary-files
-  - direct-fastcgi
-  - direct-http
-  - direct-plugins
-  - direct-rocksdb
-  - directed-cubical
-  - direm
-  - dirfiles
-  - dirichlet
-  - dirtree
-  - discogs-haskell
-  - discord-gateway
-  - discord-haskell
-  - discord-hs
-  - discord-register
-  - discord-rest
-  - discord-types
-  - discordian-calendar
-  - discrete
-  - DiscussionSupportSystem
-  - Dish
-  - disjoint-containers
-  - disjoint-set
-  - disjoint-set-stateful
-  - Dist
-  - dist-upload
-  - distance
-  - DisTract
-  - distributed-fork-aws-lambda
-  - distributed-process
-  - distributed-process-async
-  - distributed-process-azure
-  - distributed-process-client-server
-  - distributed-process-ekg
-  - distributed-process-execution
-  - distributed-process-extras
-  - distributed-process-fsm
-  - distributed-process-lifted
-  - distributed-process-monad-control
-  - distributed-process-p2p
-  - distributed-process-platform
-  - distributed-process-registry
-  - distributed-process-simplelocalnet
-  - distributed-process-supervisor
-  - distributed-process-systest
-  - distributed-process-task
-  - distributed-process-tests
-  - distributed-process-zookeeper
-  - distributed-static
-  - distribution
-  - distribution-plot
-  - diversity
-  - dixi
-  - djembe
-  - djinn-th
-  - dl-fedora
-  - dmenu
-  - dmenu-pkill
-  - dmenu-pmount
-  - dmenu-search
-  - DMuCheck
-  - DnaProteinAlignment
-  - dnscache
-  - dnsrbl
-  - dnssd
-  - doc-review
-  - doccheck
-  - docidx
-  - docker-build-cacher
-  - dockercook
-  - docopt
-  - DocTest
-  - doctest-discover-configurator
-  - doctest-driver-gen
-  - doctest-prop
-  - docusign-example
-  - docvim
-  - doi
-  - DOM
-  - dom-lt
-  - domain
-  - domain-core
-  - domain-optics
-  - domplate
-  - dot-linker
-  - dotfs
-  - doublify-toolkit
-  - dow
-  - download-media-content
-  - downloader
-  - dozenal
-  - dozens
-  - DP
-  - dph-base
-  - dph-examples
-  - dph-lifted-base
-  - dph-lifted-copy
-  - dph-lifted-vseg
-  - dph-prim-interface
-  - dph-prim-par
-  - dph-prim-seq
-  - dpkg
-  - DPM
-  - dpor
-  - dragen
-  - drawille
-  - drClickOn
-  - dresdner-verkehrsbetriebe
-  - DrHylo
-  - DrIFT
-  - DrIFT-cabalized
-  - drifter
-  - drifter-postgresql
-  - drifter-sqlite
-  - drmaa
-  - drone
-  - dropbox-sdk
-  - dropsolve
-  - ds-kanren
-  - DSA
-  - DSH
-  - dsh-sql
-  - dsmc
-  - dsmc-tools
-  - dson
-  - dson-parsec
-  - DSTM
-  - dstring
-  - DTC
-  - dtd
-  - dtd-text
-  - dtw
-  - dual-game
-  - dualizer
-  - duet
-  - dumb-cas
-  - dump-core
-  - dunai-core
-  - dunai-test
-  - Dung
-  - duplo
-  - dura
-  - Dust
-  - Dust-crypto
-  - Dust-tools
-  - Dust-tools-pcap
-  - dvault
-  - dvda
-  - dvdread
-  - dvi-processing
-  - dwarf
-  - dwarfadt
-  - dwergaz
-  - dyckword
-  - dyepack
-  - dynamic-cabal
-  - dynamic-graph
-  - dynamic-graphs
-  - dynamic-mvector
-  - dynamic-object
-  - dynamic-plot
-  - dynamic-pp
-  - DynamicTimeWarp
-  - dynamodb-simple
-  - dynloader
-  - dynobud
-  - DysFRP
-  - DysFRP-Cairo
-  - DysFRP-Craftwerk
-  - dywapitchtrack
-  - dzen-dhall
-  - dzen-utils
-  - earclipper
-  - ease
-  - easy-api
-  - easy-bitcoin
-  - easyjson
-  - easyplot
-  - easytest
-  - ebeats
-  - ebnf-bff
-  - eccrypto-ed25519-bindings
-  - ecma262
-  - ecu
-  - eddie
-  - edenmodules
-  - edenskel
-  - edentv
-  - edge
-  - edges
-  - edit
-  - edit-lenses
-  - editable
-  - editline
-  - EditTimeReport
-  - effect-handlers
-  - effect-monad
-  - effect-stack
-  - effin
-  - egison-quote
-  - egison-tutorial
-  - ehaskell
-  - ehs
-  - eibd-client-simple
-  - eigen
-  - Eight-Ball-Pool-Hack-Cheats
-  - either-unwrap
-  - EitherT
-  - ejdb2-binding
-  - ekg-bosun
-  - ekg-carbon
-  - ekg-elastic
-  - ekg-elasticsearch
-  - ekg-log
-  - ekg-push
-  - ekg-rrd
-  - ekg-wai
-  - elerea-examples
-  - elevator
-  - elision
-  - elm-street
-  - elm-websocket
-  - elynx
-  - elynx-markov
-  - elynx-nexus
-  - elynx-seq
-  - elynx-tools
-  - elynx-tree
-  - emacs-keys
-  - email
-  - email-header
-  - email-postmark
-  - emailparse
-  - embeddock
-  - embeddock-example
-  - embla
-  - embroidery
-  - emgm
-  - Emping
-  - Empty
-  - empty-monad
-  - enchant
-  - encoding
-  - encoding-io
-  - encryptable
-  - engine-io
-  - engine-io-growler
-  - engine-io-snap
-  - engine-io-wai
-  - engine-io-yesod
-  - entangle
-  - EntrezHTTP
-  - entwine
-  - enum-text
-  - enum-text-rio
-  - enum-utf8
-  - EnumContainers
-  - enumerate
-  - enumerate-function
-  - enumerator
-  - enumerator-fd
-  - enumerator-tf
-  - enumfun
-  - EnumMap
-  - enummapmap
-  - enummapset-th
-  - env-extra
-  - env-parser
-  - envstatus
-  - epanet-haskell
-  - epass
-  - epic
-  - epoll
-  - eprocess
-  - epubname
-  - Eq
-  - EqualitySolver
-  - erf-native
-  - erlang
-  - eros
-  - eros-client
-  - eros-http
-  - error-codes
-  - error-context
-  - error-continuations
-  - error-list
-  - error-loc
-  - error-message
-  - error-util
-  - errors-ext
-  - ersaconcat
-  - ersatz
-  - ersatz-toysat
-  - ert
-  - escoger
-  - esotericbot
-  - EsounD
-  - espial
-  - ess
-  - essence-of-live-coding-gloss-example
-  - essence-of-live-coding-pulse-example
-  - essence-of-live-coding-warp
-  - estimators
-  - EstProgress
-  - estreps
-  - Etage
-  - Etage-Graph
-  - EtaMOO
-  - eternal
-  - Eternal10Seconds
-  - eternity
-  - eternity-timestamped
-  - ether
-  - Etherbunny
-  - ethereum-analyzer
-  - ethereum-analyzer-cli
-  - ethereum-analyzer-webui
-  - ethereum-client-haskell
-  - ethereum-merkle-patricia-db
-  - eths-rlp
-  - euler-tour-tree
-  - euphoria
-  - eurofxref
-  - eve
-  - eve-cli
-  - event
-  - event-driven
-  - event-monad
-  - eventful-dynamodb
-  - eventful-postgresql
-  - eventful-sql-common
-  - eventful-sqlite
-  - eventlog2html
-  - eventloop
-  - EventSocket
-  - eventsource-geteventstore-store
-  - eventstore
-  - every-bit-counts
-  - ewe
-  - exact-cover
-  - exact-real-positional
-  - except-exceptions
-  - exception-monads-fd
-  - exceptional
-  - exceptionfree-readfile
-  - exchangerates
-  - execs
-  - executor
-  - exference
-  - exherbo-cabal
-  - exif
-  - exiftool
-  - exinst
-  - exinst-aeson
-  - exinst-bytes
-  - exinst-cereal
-  - exinst-deepseq
-  - exinst-hashable
-  - exinst-serialise
-  - exists
-  - exitcode
-  - expand
-  - expat-enumerator
-  - expiring-containers
-  - explain
-  - explicit-constraint-lens
-  - explicit-determinant
-  - explicit-iomodes
-  - explicit-iomodes-bytestring
-  - explicit-iomodes-text
-  - explicit-sharing
-  - explore
-  - exposed-containers
-  - expression-parser
-  - expressions
-  - expressions-z3
-  - expresso
-  - extcore
-  - extemp
-  - extended-categories
-  - extensible-data
-  - extensible-effects-concurrent
-  - extensible-skeleton
-  - external-sort
-  - Extra
-  - extract-dependencies
-  - extractelf
-  - extralife
-  - ez-couch
-  - ez3
-  - f-algebra-gen
-  - f-ree-hack-cheats-free-v-bucks-generator
-  - Facebook-Password-Hacker-Online-Latest-Version
-  - faceted
-  - factory
-  - Facts
-  - facts
-  - factual-api
-  - fadno
-  - fadno-braids
-  - fadno-xml
-  - failable-list
-  - failure-detector
-  - FailureT
-  - fake-type
-  - faktory
-  - falling-turnip
-  - fallingblocks
-  - family-tree
-  - fast-arithmetic
-  - fast-combinatorics
-  - fast-digits
-  - fast-nats
-  - fasta
-  - fastbayes
-  - fastedit
-  - fastirc
-  - fastly
-  - fastparser
-  - FastPush
-  - FastxPipe
-  - fathead-util
-  - fault-tree
-  - fay
-  - fay-base
-  - fay-builder
-  - fay-dom
-  - fay-geoposition
-  - fay-hsx
-  - fay-jquery
-  - fay-ref
-  - fay-simplejson
-  - fay-text
-  - fay-uri
-  - fay-websockets
-  - fb-persistent
-  - fbmessenger-api
-  - fca
-  - fcache
-  - fcd
-  - fcf-containers
-  - fcg
-  - fckeditor
-  - fclabels-monadlib
-  - fcm-client
-  - FComp
-  - fdo-trash
-  - feature-flipper
-  - feature-flipper-postgres
-  - fedora-img-dl
-  - fedora-packages
-  - feed-cli
-  - feed-collect
-  - feed-crawl
-  - feed-gipeda
-  - feed-translator
-  - feed2lj
-  - feed2twitter
-  - fei-base
-  - fei-cocoapi
-  - fei-dataiter
-  - fei-examples
-  - fei-nn
-  - feldspar-compiler
-  - feldspar-language
-  - fenfire
-  - FermatsLastMargin
-  - fernet
-  - FerryCore
-  - festung
-  - Feval
-  - fez-conf
-  - ffeed
-  - fficxx
-  - ffmpeg-light
-  - ffmpeg-tutorials
-  - ffunctor
-  - fgl-extras-decompositions
-  - fib
-  - fibon
-  - ficketed
-  - fields
-  - FieldTrip
-  - fieldwise
-  - fig
-  - file-collection
-  - file-command-qq
-  - file-location
-  - filediff
-  - FileManip
-  - FileManipCompat
-  - fileneglect
-  - filepath-crypto
-  - filepath-io-access
-  - FilePather
-  - filepather
-  - fileplow
-  - Files
-  - FileSystem
-  - filesystem-abstractions
-  - filesystem-conduit
-  - filesystem-enumerator
-  - filesystem-trees
-  - fillit
-  - final-pretty-printer
-  - Finance-Quote-Yahoo
-  - Finance-Treasury
-  - find-clumpiness
-  - find-conduit
-  - find-source-files
-  - findhttp
-  - fingertree-psqueue
-  - fingertree-tf
-  - finitary-derive
-  - finitary-optics
-  - FiniteMap
-  - firefly-example
-  - first-and-last
-  - first-class-instances
-  - firstify
-  - FirstOrderTheory
-  - fishfood
-  - fit
-  - fits-parse
-  - fitsio
-  - fix-parser-simple
-  - fix-symbols-gitit
-  - fixed-point
-  - fixed-point-vector
-  - fixed-point-vector-space
-  - fixed-precision
-  - fixed-storable-array
-  - fixed-timestep
-  - fixed-vector-binary
-  - fixed-vector-cborg
-  - fixed-vector-cereal
-  - fixed-width
-  - fixer
-  - fixfile
-  - fixhs
-  - fixie
-  - fizzbuzz
-  - fizzbuzz-as-a-service
-  - flac
-  - flac-picture
-  - flaccuraterip
-  - flamethrower
-  - flamingra
-  - flashblast
-  - flat-maybe
-  - flatbuffers
-  - flay
-  - flexible-time
-  - flexiwrap
-  - flexiwrap-smallcheck
-  - flickr
-  - flink-statefulfun
-  - Flippi
-  - flite
-  - float-binstring
-  - floating-bits
-  - flow-er
-  - flow2dot
-  - flowdock
-  - flowdock-api
-  - flowdock-rest
-  - flower
-  - flowlocks-framework
-  - flowsim
-  - flp
-  - fltkhs-fluid-examples
-  - fluent-logger
-  - fluffy-parser
-  - fluidsynth
-  - flux-monoid
-  - FM-SBLEX
-  - fmark
-  - FModExRaw
-  - fmt-for-rio
-  - fn-extra
-  - foldl-incremental
-  - foldl-statistics
-  - foldl-transduce
-  - foldl-transduce-attoparsec
-  - folds-common
-  - follow
-  - follower
-  - foma
-  - font-opengl-basic4x6
-  - foo
-  - for-free
-  - forbidden-fruit
-  - fordo
-  - forecast-io
-  - foreign-var
-  - forest
-  - forest-fire
-  - Forestry
-  - forger
-  - ForkableT
-  - formal
-  - FormalGrammars
-  - format
-  - format-status
-  - formattable
-  - forml
-  - formlets
-  - formlets-hsp
-  - formura
-  - ForSyDe
-  - forsyde-deep
-  - forth-hll
-  - Fortnite-Hack-Cheats-Free-V-Bucks-Generator
-  - fortran-src
-  - fortytwo
-  - foscam-directory
-  - foscam-filename
-  - foscam-sort
-  - Foster
-  - fpco-api
-  - fplll
-  - fpnla-examples
-  - FPretty
-  - fptest
-  - Fractaler
-  - fractals
-  - fraction
-  - frag
-  - Frames-beam
-  - Frames-dsv
-  - Frames-map-reduce
-  - franchise
-  - Frank
-  - fraxl
-  - freddy
-  - free-concurrent
-  - free-functors
-  - free-game
-  - free-http
-  - free-operational
-  - free-theorems
-  - free-theorems-counterexamples
-  - free-theorems-seq
-  - free-theorems-seq-webui
-  - free-theorems-webui
-  - free-v-bucks-generator-no-survey
-  - free-v-bucks-generator-ps4-no-survey
-  - freekick2
-  - freelude
-  - freer-converse
-  - freer-effects
-  - freer-simple-catching
-  - freer-simple-http
-  - freer-simple-profiling
-  - freer-simple-random
-  - freer-simple-time
-  - freesect
-  - freesound
-  - freetype-simple
-  - FreeTypeGL
-  - freq
-  - fresh
-  - friday-devil
-  - friday-scale-dct
-  - friendly
-  - front
-  - frown
-  - frp-arduino
-  - frpnow
-  - frpnow-gloss
-  - frpnow-gtk
-  - frpnow-gtk3
-  - frpnow-vty
-  - fs-events
-  - fsh-csv
-  - fsmActions
-  - fst
-  - fsutils
-  - fswait
-  - fswatch
-  - ft-generator
-  - ftdi
-  - FTGL-bytestring
-  - ftp-client
-  - ftp-client-conduit
-  - ftp-conduit
-  - ftphs
-  - FTPLine
-  - ftshell
-  - full-sessions
-  - fullstop
-  - funbot
-  - funbot-client
-  - funbot-git-hook
-  - funcons-lambda-cbv-mp
-  - funcons-simple
-  - funcons-tools
-  - funcons-values
-  - function-combine
-  - function-instances-algebra
-  - functional-arrow
-  - functor
-  - functor-infix
-  - functor-utils
-  - functorm
-  - funflow
-  - funflow-nix
-  - FunGEn
-  - Fungi
-  - funion
-  - funnyprint
-  - funpat
-  - funsat
-  - funspection
-  - fused-effects-exceptions
-  - fused-effects-mwc-random
-  - fused-effects-optics
-  - fused-effects-random
-  - fused-effects-readline
-  - fused-effects-squeal
-  - fused-effects-th
-  - fusion
-  - fusion-plugin
-  - futhark
-  - futun
-  - future
-  - fuzzy-time-gen
-  - fuzzy-timings
-  - fwgl
-  - fwgl-glfw
-  - fwgl-javascript
-  - g-npm
-  - g2
-  - g2q
-  - g4ip
-  - gact
-  - game-probability
-  - gameclock
-  - gamgee
-  - Gamgine
-  - gamma
-  - Ganymede
-  - garepinoh
-  - gargoyle
-  - gargoyle-postgresql
-  - gargoyle-postgresql-connect
-  - gargoyle-postgresql-nix
-  - gas
-  - gbu
-  - gc-monitoring-wai
-  - gconf
-  - gdax
-  - gdiff-ig
-  - gdiff-th
-  - GeBoP
-  - gedcom
-  - geek
-  - geek-server
-  - gegl
-  - gelatin
-  - gelatin-freetype2
-  - gelatin-fruity
-  - gelatin-gl
-  - gelatin-sdl2
-  - gelatin-shaders
-  - gemstone
-  - gen-imports
-  - gen-passwd
-  - Genbank
-  - gencheck
-  - gender
-  - genders
-  - Gene-CluEDO
-  - general-prelude
-  - GeneralTicTacToe
-  - generator
-  - generators
-  - generic-accessors
-  - generic-aeson
-  - generic-binary
-  - generic-church
-  - generic-enum
-  - generic-lens-labels
-  - generic-lucid-scaffold
-  - generic-maybe
-  - generic-pretty
-  - generic-server
-  - generic-storable
-  - generic-tree
-  - generic-trie
-  - generic-xml
-  - generics-mrsop
-  - generics-mrsop-gdiff
-  - genericserialize
-  - genesis
-  - genesis-test
-  - genetics
-  - GenI
-  - geni-gui
-  - geni-util
-  - geniconvert
-  - geniplate
-  - geniserver
-  - genprog
-  - GenSmsPdu
-  - gentlemark
-  - GenussFold
-  - genvalidity-mergeful
-  - geo-resolver
-  - geo-uk
-  - GeocoderOpenCage
-  - geodetic
-  - geodetic-types
-  - geojson-types
-  - geolite-csv
-  - geom2d
-  - GeomPredicates-SSE
-  - geos
-  - Get
-  - getemx
-  - getflag
-  - GGg
-  - ggtsTC
-  - gh-labeler
-  - ghc-core-smallstep
-  - ghc-datasize
-  - ghc-dump-core
-  - ghc-dump-tree
-  - ghc-dump-util
-  - ghc-dup
-  - ghc-events-analyze
-  - ghc-events-parallel
-  - ghc-generic-instances
-  - ghc-imported-from
-  - ghc-instances
-  - ghc-man-completion
-  - ghc-mod
-  - ghc-parmake
-  - ghc-pkg-autofix
-  - ghc-pkg-lib
-  - ghc-plugs-out
-  - ghc-proofs
-  - ghc-session
-  - ghc-simple
-  - ghc-srcspan-plugin
-  - ghc-syb
-  - ghc-syb-utils
-  - ghc-tags-core
-  - ghc-tags-plugin
-  - ghc-time-alloc-prof
-  - ghc-usage
-  - ghc-vis
-  - ghci-diagrams
-  - ghci-haskeline
-  - ghci-history-parser
-  - ghci-lib
-  - ghci-ng
-  - ghci-pretty
-  - ghcjs-dom-jsffi
-  - ghcjs-fetch
-  - ghcjs-hplay
-  - ghcjs-promise
-  - ghcjs-xhr
-  - ghclive
-  - ghcprofview
-  - ght
-  - gi-cairo-again
-  - gi-cairo-connector
-  - gi-cairo-render
-  - gi-dbusmenu
-  - gi-dbusmenugtk3
-  - gi-gdkx11
-  - gi-graphene
-  - gi-gsk
-  - gi-gstpbutils
-  - gi-gsttag
-  - gi-gtk-declarative
-  - gi-gtk-declarative-app-simple
-  - gi-gtk-hs
-  - gi-gtkosxapplication
-  - gi-gtksheet
-  - gi-handy
-  - gi-poppler
-  - gi-wnck
-  - gi-xlib
-  - giak
-  - Gifcurry
-  - ginsu
-  - gipeda
-  - GiST
-  - gist
-  - git
-  - git-all
-  - git-checklist
-  - git-config
-  - git-cuk
-  - git-date
-  - git-fmt
-  - git-gpush
-  - git-jump
-  - git-monitor
-  - git-object
-  - git-remote-ipfs
-  - git-repair
-  - git-sanity
-  - git-vogue
-  - gitdo
-  - github-backup
-  - github-data
-  - github-release
-  - github-tools
-  - github-utils
-  - github-webhook-handler
-  - github-webhook-handler-snap
-  - github-webhooks
-  - githud
-  - gitignore
-  - gitit
-  - gitlab-api
-  - gitlib
-  - gitlib-cmdline
-  - gitlib-cross
-  - gitlib-libgit2
-  - gitlib-s3
-  - gitlib-sample
-  - gitlib-test
-  - gitlib-utils
-  - gitson
-  - gitter
-  - glade
-  - gladexml-accessor
-  - glapp
-  - glazier
-  - glazier-pipes
-  - glazier-react
-  - glazier-react-examples
-  - glazier-react-widget
-  - Gleam
-  - GLFW
-  - GLFW-b-demo
-  - GLFW-OGL
-  - GLFW-task
-  - gli
-  - glicko
-  - glider-nlp
-  - GLMatrix
-  - glob-posix
-  - global
-  - global-config
-  - global-variables
-  - glome-hs
-  - GlomeTrace
-  - GlomeView
-  - gloss-accelerate
-  - gloss-algorithms
-  - gloss-banana
-  - gloss-devil
-  - gloss-examples
-  - gloss-export
-  - gloss-game
-  - gloss-raster
-  - gloss-sodium
-  - glpk-headers
-  - glpk-hs
-  - gltf-codec
-  - glue
-  - GLUtil
-  - gmap
-  - gmndl
-  - gnome-desktop
-  - gnomevfs
-  - gnss-converters
-  - gnuidn
-  - goa
-  - goal-core
-  - goal-geometry
-  - goal-probability
-  - goal-simulation
-  - goatee
-  - goatee-gtk
-  - gochan
-  - godot-haskell
-  - gofer-prelude
-  - gooey
-  - google-cloud
-  - google-drive
-  - google-html5-slide
-  - google-mail-filters
-  - google-maps-geocoding
-  - google-oauth2
-  - google-oauth2-easy
-  - google-search
-  - google-server-api
-  - google-static-maps
-  - google-translate
-  - GoogleCodeJam
-  - GoogleDirections
-  - googleplus
-  - googlepolyline
-  - GoogleSB
-  - GoogleTranslate
-  - gopherbot
-  - gopro-plus
-  - gore-and-ash
-  - gore-and-ash-actor
-  - gore-and-ash-async
-  - gore-and-ash-demo
-  - gore-and-ash-glfw
-  - gore-and-ash-lambdacube
-  - gore-and-ash-logging
-  - gore-and-ash-network
-  - gore-and-ash-sdl
-  - gore-and-ash-sync
-  - GotoT-transformers
-  - gotta-go-fast
-  - gpah
-  - GPipe
-  - GPipe-Collada
-  - GPipe-Examples
-  - GPipe-GLFW
-  - GPipe-TextureLoad
-  - gps
-  - gps2htmlReport
-  - GPX
-  - gpx-conduit
-  - graceful
-  - grafana
-  - graflog
-  - Grafos
-  - grakn
-  - grammar-combinators
-  - GrammarProducts
-  - grapefruit-examples
-  - grapefruit-frp
-  - grapefruit-records
-  - grapefruit-ui
-  - grapefruit-ui-gtk
-  - graph-core
-  - graph-matchings
-  - graph-rewriting
-  - graph-rewriting-cl
-  - graph-rewriting-gl
-  - graph-rewriting-lambdascope
-  - graph-rewriting-layout
-  - graph-rewriting-ski
-  - graph-rewriting-strategies
-  - graph-rewriting-trs
-  - graph-rewriting-ww
-  - graph-serialize
-  - graph-utils
-  - graph-visit
-  - Graph500
-  - graphbuilder
-  - graphene
-  - GraphHammer
-  - GraphHammer-examples
-  - graphics-drawingcombinators
-  - graphics-formats-collada
-  - graphicsFormats
-  - graphicstools
-  - graphmod-plugin
-  - graphql
-  - graphql-client
-  - graphql-engine
-  - graphql-utils
-  - graphql-w-persistent
-  - graphted
-  - graphtype
-  - graql
-  - grasp
-  - gray-code
-  - greencard
-  - greencard-lib
-  - greg-client
-  - gremlin-haskell
-  - Grempa
-  - grenade
-  - grid-proto
-  - gridbounds
-  - gridland
-  - grm
-  - groot
-  - gross
-  - GroteTrap
-  - groundhog-converters
-  - group-with
-  - grouped-list
-  - groups-generic
-  - growler
-  - GrowlNotify
-  - grpc-api-etcd
-  - grpc-etcd-client
-  - grpc-haskell
-  - grpc-haskell-core
-  - gruff
-  - gruff-examples
-  - gscholar-rss
-  - gsl-random
-  - gsl-random-fu
-  - gstorable
-  - gstreamer
-  - GTALib
-  - gtfs
-  - gtfs-realtime
-  - gtk-serialized-event
-  - gtk-sni-tray
-  - gtk-strut
-  - gtk-toy
-  - gtk2hs-hello
-  - gtk2hs-rpn
-  - Gtk2hsGenerics
-  - gtk3-mac-integration
-  - gtkglext
-  - GtkGLTV
-  - gtkimageview
-  - gtkrsync
-  - gtksourceview2
-  - gtksourceview3
-  - guarded-rewriting
-  - guess-combinator
-  - GuiHaskell
-  - GuiTV
-  - gulcii
-  - gw
-  - gyah-bin
-  - H
-  - h-booru
-  - h-gpgme
-  - h-reversi
-  - h2048
-  - h2c
-  - haar
-  - habit
-  - hablo
-  - hablog
-  - HABQT
-  - Hach
-  - hack-contrib
-  - hack-contrib-press
-  - hack-frontend-happstack
-  - hack-handler-cgi
-  - hack-handler-epoll
-  - hack-handler-evhttp
-  - hack-handler-fastcgi
-  - hack-handler-happstack
-  - hack-handler-hyena
-  - hack-handler-kibro
-  - hack-handler-simpleserver
-  - hack-middleware-cleanpath
-  - hack-middleware-clientsession
-  - hack-middleware-jsonp
-  - hack2-handler-happstack-server
-  - hack2-handler-mongrel2-http
-  - hack2-handler-snap-server
-  - hack2-handler-warp
-  - hackage-diff
-  - hackage-mirror
-  - hackage-processing
-  - hackage-proxy
-  - hackage-repo-tool
-  - hackage-security-HTTP
-  - hackage-server
-  - hackage-whatsnew
-  - hackage2hwn
-  - hackage2twitter
-  - hackager
-  - hackernews
-  - HackMail
-  - hackmanager
-  - hackport
-  - hactor
-  - hactors
-  - haddock-cheatsheet
-  - haddock-leksah
-  - haddock-test
-  - haddocset
-  - hadoop-formats
-  - hadoop-rpc
-  - hadoop-tools
-  - hafar
-  - haggis
-  - Haggressive
-  - hahp
-  - haiji
-  - hailgun-send
-  - hairy
-  - hakaru
-  - hakismet
-  - hakka
-  - hako
-  - hakyll
-  - hakyll-agda
-  - hakyll-alectryon
-  - hakyll-blaze-templates
-  - hakyll-contrib
-  - hakyll-contrib-csv
-  - hakyll-contrib-elm
-  - hakyll-contrib-hyphenation
-  - hakyll-contrib-links
-  - hakyll-convert
-  - hakyll-dhall
-  - hakyll-dir-list
-  - hakyll-favicon
-  - hakyll-filestore
-  - hakyll-images
-  - hakyll-ogmarkup
-  - hakyll-process
-  - hakyll-R
-  - hakyll-sass
-  - hakyll-series
-  - hakyll-shakespeare
-  - hakyll-shortcode
-  - hakyll-shortcut-links
-  - hakyll-typescript
-  - hal
-  - halberd
-  - HaLeX
-  - halfs
-  - halipeto
-  - halive
-  - hall-symbols
-  - halma-gui
-  - halma-telegram-bot
-  - halves
-  - ham
-  - HaMinitel
-  - hampp
-  - hamsql
-  - hamtmap
-  - hamusic
-  - hanabi-dealer
-  - handa-gdata
-  - handle-like
-  - HandlerSocketClient
-  - handsy
-  - Hangman
-  - hannahci
-  - hans
-  - hans-pcap
-  - hanspell
-  - haphviz
-  - hapistrano
-  - happindicator
-  - happindicator3
-  - happlets
-  - happlets-lib-gtk
-  - happraise
-  - HAppS-Data
-  - happs-hsp
-  - happs-hsp-template
-  - HAppS-IxSet
-  - HAppS-Server
-  - HAppS-State
-  - happs-tutorial
-  - HAppS-Util
-  - happstack
-  - happstack-auth
-  - happstack-authenticate
-  - happstack-clientsession
-  - happstack-contrib
-  - happstack-data
-  - happstack-dlg
-  - happstack-facebook
-  - happstack-fay
-  - happstack-fay-ajax
-  - happstack-foundation
-  - happstack-hamlet
-  - happstack-heist
-  - happstack-helpers
-  - happstack-hstringtemplate
-  - happstack-ixset
-  - happstack-jmacro
-  - happstack-lite
-  - happstack-monad-peel
-  - happstack-plugins
-  - happstack-server-tls-cryptonite
-  - happstack-state
-  - happstack-static-routing
-  - happstack-util
-  - happstack-yui
-  - happy-hour
-  - happybara
-  - happybara-webkit
-  - happybara-webkit-server
-  - HappyTree
-  - hapstone
-  - HaPy
-  - haquery
-  - haquil
-  - harchive
-  - hArduino
-  - hardware-edsl
-  - HaRe
-  - harg
-  - hark
-  - harmony
-  - HarmTrace
-  - haroonga
-  - haroonga-httpd
-  - harpy
-  - harvest-api
-  - has
-  - has-th
-  - HasCacBDD
-  - hascar
-  - hascard
-  - hascas
-  - Haschoo
-  - HasGP
-  - hash
-  - hashable-extras
-  - hashable-generics
-  - hashable-orphans
-  - hashabler
-  - hashed-storage
-  - Hashell
-  - hashflare
-  - hashring
-  - hashtables-plus
-  - hasim
-  - hask
-  - hask-home
-  - haskarrow
-  - haskbot-core
-  - haskdeep
-  - haskeem
-  - haskeline-class
-  - haskelisp
-  - haskell-abci
-  - haskell-aliyun
-  - haskell-awk
-  - haskell-bitmex-client
-  - haskell-bitmex-rest
-  - haskell-brainfuck
-  - haskell-ci
-  - haskell-cnc
-  - haskell-coffee
-  - haskell-compression
-  - haskell-course-preludes
-  - haskell-debug-adapter
-  - haskell-disque
-  - haskell-docs
-  - haskell-eigen-util
-  - haskell-exp-parser
-  - haskell-fake-user-agent
-  - haskell-formatter
-  - haskell-ftp
-  - haskell-generate
-  - haskell-go-checkers
-  - haskell-google-trends
-  - haskell-in-space
-  - haskell-kubernetes
-  - haskell-lsp-client
-  - haskell-ml
-  - haskell-mpfr
-  - haskell-names
-  - haskell-neo4j-client
-  - haskell-openflow
-  - haskell-overridez
-  - haskell-packages
-  - haskell-pdf-presenter
-  - haskell-platform-test
-  - haskell-player
-  - haskell-plot
-  - haskell-postal
-  - haskell-read-editor
-  - haskell-reflect
-  - haskell-rules
-  - haskell-spacegoo
-  - haskell-src-exts-observe
-  - haskell-src-exts-prisms
-  - haskell-src-exts-qq
-  - haskell-src-exts-sc
-  - haskell-src-match
-  - haskell-src-meta-mwotton
-  - haskell-stack-trace-plugin
-  - haskell-token-utils
-  - haskell-tools-ast
-  - haskell-tools-ast-fromghc
-  - haskell-tools-ast-gen
-  - haskell-tools-ast-trf
-  - haskell-tools-backend-ghc
-  - haskell-tools-builtin-refactorings
-  - haskell-tools-cli
-  - haskell-tools-daemon
-  - haskell-tools-debug
-  - haskell-tools-demo
-  - haskell-tools-experimental-refactorings
-  - haskell-tools-prettyprint
-  - haskell-tools-refactor
-  - haskell-tools-rewrite
-  - haskell-tor
-  - haskell-type-exts
-  - haskell-typescript
-  - haskell-tyrant
-  - haskell-xmpp
-  - haskell2010
-  - haskell2020
-  - haskell98
-  - haskell98libraries
-  - HaskellAnalysisProgram
-  - haskelldb
-  - haskelldb-connect-hdbc
-  - haskelldb-connect-hdbc-catchio-mtl
-  - haskelldb-connect-hdbc-catchio-tf
-  - haskelldb-connect-hdbc-catchio-transformers
-  - haskelldb-connect-hdbc-lifted
-  - haskelldb-dynamic
-  - haskelldb-flat
-  - haskelldb-hdbc
-  - haskelldb-hdbc-mysql
-  - haskelldb-hdbc-odbc
-  - haskelldb-hdbc-postgresql
-  - haskelldb-hdbc-sqlite3
-  - haskelldb-hsql
-  - haskelldb-hsql-mysql
-  - haskelldb-hsql-odbc
-  - haskelldb-hsql-postgresql
-  - haskelldb-hsql-sqlite3
-  - haskelldb-th
-  - haskelldb-wx
-  - haskellish
-  - HaskellLM
-  - HaskellNet
-  - HaskellNet-SSL
-  - HaskellNN
-  - Haskelloids
-  - haskellscrabble
-  - haskellscript
-  - HaskellTorrent
-  - HaskellTutorials
-  - haskelzinc
-  - haskeme
-  - haskey
-  - haskey-mtl
-  - haskgame
-  - haskheap
-  - haskhol-core
-  - haskmon
-  - haskoin
-  - haskoin-bitcoind
-  - haskoin-crypto
-  - haskoin-node
-  - haskoin-protocol
-  - haskoin-script
-  - haskoin-store
-  - haskoin-store-data
-  - haskoin-util
-  - haskoin-wallet
-  - haskoon
-  - haskoon-httpspec
-  - haskoon-salvia
-  - haskore
-  - haskore-realtime
-  - haskore-supercollider
-  - haskore-synthesizer
-  - HaskRel
-  - haskseg
-  - hasktorch
-  - hasktorch-codegen
-  - hasktorch-ffi-th
-  - hasktorch-ffi-thc
-  - hasktorch-indef
-  - hasktorch-signatures
-  - hasktorch-signatures-partial
-  - hasktorch-signatures-support
-  - hasktorch-zoo
-  - haskus-binary
-  - haskus-system-build
-  - haskus-utils
-  - haskus-utils-compat
-  - haskus-web
-  - haskyapi
-  - haslo
-  - hasloGUI
-  - hasparql-client
-  - hasql-backend
-  - hasql-class
-  - hasql-cursor-query
-  - hasql-cursor-transaction
-  - hasql-dynamic-statements
-  - hasql-generic
-  - hasql-implicits
-  - hasql-optparse-applicative
-  - hasql-postgres
-  - hasql-postgres-options
-  - hasql-queue
-  - hasql-simple
-  - hasql-th
-  - hasqly-mysql
-  - hastache
-  - hastache-aeson
-  - haste
-  - haste-app
-  - haste-lib
-  - haste-markup
-  - haste-prim
-  - Hate
-  - hatex-guide
-  - HaTeX-meta
-  - HaTeX-qq
-  - hats
-  - hatt
-  - haven
-  - haverer
-  - HaVSA
-  - hawitter
-  - Hawk
-  - hax
-  - haxl
-  - haxl-amazonka
-  - haxl-facebook
-  - haxparse
-  - haxr-th
-  - haxy
-  - hayland
-  - Hayoo
-  - hayoo-cli
-  - hback
-  - hbayes
-  - hbb
-  - hbcd
-  - hBDD-CMUBDD
-  - hBDD-CUDD
-  - hbeanstalk
-  - hbeat
-  - hbf
-  - hblas
-  - hblock
-  - hburg
-  - hcad
-  - HCard
-  - hcc
-  - hcg-minus
-  - hcg-minus-cairo
-  - hcheat
-  - hcheckers
-  - hchesslib
-  - HCL
-  - hcltest
-  - hcoap
-  - hcom
-  - hcron
-  - hCsound
-  - hcube
-  - hdaemonize-buildfix
-  - hdbc-aeson
-  - HDBC-mysql
-  - HDBC-postgresql-hstore
-  - hdbc-postgresql-hstore
-  - hdbi
-  - hdbi-conduit
-  - hdbi-postgresql
-  - hdbi-sqlite
-  - hdbi-tests
-  - hdevtools
-  - hdf
-  - hDFA
-  - hdiff
-  - hdigest
-  - hdirect
-  - hdis86
-  - hdiscount
-  - hdm
-  - hdo
-  - hdocs
-  - hdph
-  - hdph-closure
-  - hdr-histogram
-  - HDRUtils
-  - headed-megaparsec
-  - headergen
-  - heapsort
-  - heart-app
-  - heart-core
-  - heatitup
-  - heatitup-complete
-  - heavy-log-shortcuts
-  - heavy-logger
-  - heavy-logger-amazon
-  - heavy-logger-instances
-  - hebrew-time
-  - hecc
-  - heckle
-  - hedgehog-checkers
-  - hedgehog-checkers-lens
-  - hedgehog-classes
-  - hedgehog-gen
-  - hedgehog-gen-json
-  - hedgehog-generic
-  - hedgehog-golden
-  - Hedi
-  - hedis-config
-  - hedis-pile
-  - hedis-simple
-  - hedis-tags
-  - hedn-functor
-  - hedra
-  - heidi
-  - hein
-  - heist-aeson
-  - heist-async
-  - helics
-  - helics-wai
-  - helisp
-  - helium
-  - helix
-  - hell
-  - hellage
-  - hellnet
-  - help-esb
-  - hemkay
-  - hemokit
-  - hen
-  - henet
-  - hepevt
-  - her-lexer
-  - her-lexer-parsec
-  - HERA
-  - herbalizer
-  - HerbiePlugin
-  - heredocs
-  - herf-time
-  - Hermes
-  - hermit
-  - hermit-syb
-  - herms
-  - heroku-persistent
-  - herringbone
-  - herringbone-embed
-  - herringbone-wai
-  - hesh
-  - hesql
-  - hetero-dict
-  - heterogeneous-list-literals
-  - heterolist
-  - hetris
-  - heukarya
-  - hevm
-  - hevolisa
-  - hevolisa-dph
-  - hex
-  - hex-text
-  - HExcel
-  - hexchat
-  - hexif
-  - hexmino
-  - hexml-lens
-  - hexpat-iteratee
-  - hexpat-pickle-generic
-  - hexpr
-  - hexpress
-  - hexquote
-  - hext
-  - hextra
-  - heyefi
-  - heyting-algebras
-  - hF2
-  - hfann
-  - hfd
-  - hfiar
-  - HFitUI
-  - hfmt
-  - hfoil
-  - hfov
-  - hfractal
-  - HFrequencyQueue
-  - hfusion
-  - hg-buildpackage
-  - hgalib
-  - hgdbmi
-  - HGE2D
-  - hgearman
-  - hGelf
-  - hgen
-  - hgeometric
-  - hgeometry-ipe
-  - hgeometry-svg
-  - hgeos
-  - hgettext
-  - hgis
-  - hgithub
-  - hgom
-  - hgopher
-  - HGraphStorage
-  - hgrep
-  - hgrib
-  - hharp
-  - HHDL
-  - hhp
-  - hhwloc
-  - hi3status
-  - hiccup
-  - hichi
-  - hid-examples
-  - hidden-char
-  - hie-core
-  - hieraclus
-  - hierarchical-exceptions
-  - hierarchical-spectral-clustering
-  - hierarchy
-  - hiernotify
-  - Hieroglyph
-  - higgledy
-  - HiggsSet
-  - higherorder
-  - highjson
-  - highjson-swagger
-  - highjson-th
-  - highlight-versions
-  - highWaterMark
-  - hills
-  - himg
-  - himpy
-  - hindent
-  - hindley-milner
-  - hinduce-classifier
-  - hinduce-classifier-decisiontree
-  - hinduce-examples
-  - hinquire
-  - hinstaller
-  - hint-server
-  - hinter
-  - hinterface
-  - hinvaders
-  - hinze-streams
-  - hipbot
-  - hipchat-hs
-  - hipe
-  - Hipmunk-Utils
-  - hircules
-  - hirt
-  - Hish
-  - hissmetrics
-  - hist-pl
-  - hist-pl-dawg
-  - hist-pl-fusion
-  - hist-pl-lexicon
-  - hist-pl-lmf
-  - hist-pl-types
-  - historian
-  - hit
-  - hit-graph
-  - hit-on
-  - HJavaScript
-  - hjcase
-  - hjs
-  - HJScript
-  - hjson-query
-  - hjsonpointer
-  - hjsonschema
-  - hjugement-cli
-  - HJVM
-  - hkd-delta
-  - hkd-lens
-  - hkt
-  - hlatex
-  - hlbfgsb
-  - hlcm
-  - HLearn-algebra
-  - HLearn-approximation
-  - HLearn-classification
-  - HLearn-datastructures
-  - HLearn-distributions
-  - hledger-api
-  - hledger-chart
-  - hledger-irr
-  - hledger-vty
-  - hlibBladeRF
-  - hlibev
-  - hlibfam
-  - HList
-  - HListPP
-  - hlivy
-  - HLogger
-  - hlogger
-  - hlongurl
-  - hlrdb
-  - hls
-  - hlwm
-  - hly
-  - hmark
-  - hmarkup
-  - hmatrix-banded
-  - hmatrix-mmap
-  - hmatrix-morpheus
-  - hmatrix-nipals
-  - hmatrix-sparse
-  - hmatrix-static
-  - hmatrix-sundials
-  - hmatrix-svdlibc
-  - hmatrix-syntax
-  - hmatrix-tests
-  - hmeap
-  - hmeap-utils
-  - hmenu
-  - hmep
-  - hmk
-  - HMM
-  - hmm
-  - hmm-hmatrix
-  - hmm-lapack
-  - hMollom
-  - hmp3
-  - Hmpf
-  - hmt
-  - hmt-diagrams
-  - hmumps
-  - hnetcdf
-  - hnix-store-remote
-  - HNM
-  - hnormalise
-  - ho-rewriting
-  - hoauth
-  - hob
-  - hobbes
-  - hobbits
-  - hocilib
-  - hodatime
-  - HODE
-  - hoe
-  - Hoed
-  - hOff-display
-  - hog
-  - hogg
-  - hoggl
-  - hogre
-  - hogre-examples
-  - hois
-  - hol
-  - hold-em
-  - hole
-  - holmes
-  - Holumbus-Searchengine
-  - holy-project
-  - homeomorphic
-  - hommage
-  - homoiconic
-  - homplexity
-  - HongoDB
-  - honi
-  - hoobuddy
-  - hood
-  - hood-off
-  - hood2
-  - hoodie
-  - hoodle
-  - hoodle-builder
-  - hoodle-core
-  - hoodle-extra
-  - hoodle-parser
-  - hoodle-publish
-  - hoodle-render
-  - hoodle-types
-  - hoogle-index
-  - hooks-dir
-  - hoop
-  - hoopl
-  - hoovie
-  - hopencc
-  - hopencl
-  - HOpenCV
-  - hOpenPGP
-  - hopenpgp-tools
-  - hopfield
-  - hops
-  - hoq
-  - horizon
-  - horname
-  - hosc-json
-  - hosts-server
-  - hothasktags
-  - hotswap
-  - hourglass-fuzzy-parsing
-  - houseman
-  - hp2any-core
-  - hp2any-graph
-  - hp2any-manager
-  - hpack-convert
-  - hpaco
-  - hpaco-lib
-  - hpage
-  - hpapi
-  - hpaste
-  - hpasteit
-  - HPath
-  - hpc-coveralls
-  - hpc-tracer
-  - hPDB
-  - hPDB-examples
-  - HPDF
-  - hpdft
-  - hpg
-  - HPi
-  - hpio
-  - hplaylist
-  - HPlot
-  - hpodder
-  - HPong
-  - hpqtypes
-  - hpqtypes-extras
-  - hprotoc
-  - hprotoc-fork
-  - hps
-  - hps-cairo
-  - hps-kmeans
-  - hPushover
-  - hpygments
-  - hpylos
-  - hpyrg
-  - hpython
-  - hquantlib
-  - hquantlib-time
-  - hR
-  - hranker
-  - HRay
-  - hreq-client
-  - hreq-conduit
-  - Hricket
-  - hricket
-  - hriemann
-  - HROOT
-  - HROOT-core
-  - HROOT-graf
-  - HROOT-hist
-  - HROOT-io
-  - HROOT-math
-  - HROOT-tree
-  - hs-blake2
-  - hs-brotli
-  - hs-carbon-examples
-  - hs-cdb
-  - hs-conllu
-  - hs-di
-  - hs-dotnet
-  - hs-excelx
-  - hs-ffmpeg
-  - hs-fltk
-  - hs-gchart
-  - hs-gen-iface
-  - hs-gizapp
-  - hs-java
-  - hs-json-rpc
-  - hs-logo
-  - hs-mesos
-  - hs-nombre-generator
-  - hs-pattrans
-  - hs-pgms
-  - hs-pkg-config
-  - hs-pkpass
-  - hs-re
-  - hs-rs-notify
-  - hs-scrape
-  - hs-snowtify
-  - hs-speedscope
-  - hs-twitter
-  - hs-twitterarchiver
-  - hs-vcard
-  - hs-watchman
-  - hs2bf
-  - Hs2lib
-  - hs2ps
-  - hsaml2
-  - hsay
-  - hsbackup
-  - hsbc
-  - hsbencher
-  - hsbencher-codespeed
-  - hsbencher-fusion
-  - hsc3
-  - hsc3-auditor
-  - hsc3-cairo
-  - hsc3-data
-  - hsc3-db
-  - hsc3-dot
-  - hsc3-forth
-  - hsc3-graphs
-  - hsc3-lang
-  - hsc3-lisp
-  - hsc3-plot
-  - hsc3-process
-  - hsc3-rec
-  - hsc3-rw
-  - hsc3-server
-  - hsc3-sf
-  - hsc3-sf-hsndfile
-  - hsc3-unsafe
-  - hsc3-utils
-  - hscaffold
-  - hscamwire
-  - hscassandra
-  - hscd
-  - hsclock
-  - hscope
-  - hScraper
-  - hscuid
-  - hsdev
-  - hsdif
-  - hsdip
-  - hsdns-cache
-  - Hsed
-  - hsenv
-  - HSet
-  - hsfacter
-  - hsfcsh
-  - HSFFIG
-  - hsfilt
-  - hsforce
-  - HSGEP
-  - hsgnutls
-  - hsgnutls-yj
-  - hsgsom
-  - HsHaruPDF
-  - HSHHelpers
-  - HsHTSLib
-  - HsHyperEstraier
-  - hsI2C
-  - hsignal
-  - hSimpleDB
-  - hsinspect-lsp
-  - HsJudy
-  - hskeleton
-  - hslackbuilder
-  - hslibsvm
-  - hslinks
-  - hslogger-reader
-  - hslogger-template
-  - hslogstash
-  - hsluv-haskell
-  - hsmagick
-  - HSmarty
-  - hsmodetweaks
-  - Hsmtlib
-  - hsmtpclient
-  - hsnock
-  - hsns
-  - hsnsq
-  - hsntp
-  - HSoM
-  - hsoptions
-  - HSoundFile
-  - hsoz
-  - hsp-cgi
-  - hsparql
-  - HsParrot
-  - hspear
-  - hspec-expectations-match
-  - hspec-expectations-pretty
-  - hspec-experimental
-  - hspec-hashable
-  - hspec-jenkins
-  - hspec-monad-control
-  - hspec-pg-transact
-  - hspec-setup
-  - hspec-shouldbe
-  - hspec-structured-formatter
-  - hspec-test-sandbox
-  - hspec-webdriver
-  - hspec2
-  - hspecVariant
-  - HsPerl5
-  - hspkcs11
-  - hspread
-  - hspresent
-  - hsprocess
-  - hsql
-  - hsql-mysql
-  - hsql-odbc
-  - hsql-postgresql
-  - hsql-sqlite3
-  - hsqml
-  - hsqml-datamodel
-  - hsqml-datamodel-vinyl
-  - hsqml-demo-manic
-  - hsqml-demo-morris
-  - hsqml-demo-notes
-  - hsqml-demo-samples
-  - hsqml-morris
-  - hsreadability
-  - hsrelp
-  - hsseccomp
-  - hsSqlite3
-  - hssqlppp
-  - hssqlppp-th
-  - HsSVN
-  - hstar
-  - hstatistics
-  - hstats
-  - hstatsd
-  - hstest
-  - hstidy
-  - hstorchat
-  - hstox
-  - hstradeking
-  - HStringTemplateHelpers
-  - hstyle
-  - hstzaar
-  - hsubconvert
-  - hsudoku
-  - HsWebots
-  - hswip
-  - hsx
-  - hsx-jmacro
-  - hsx-xhtml
-  - hsXenCtrl
-  - hsyscall
-  - hsyslog-tcp
-  - hszephyr
-  - HTab
-  - hTalos
-  - htar
-  - htdp-image
-  - hTensor
-  - htestu
-  - HTF
-  - HTicTacToe
-  - htiled
-  - htlset
-  - html-charset
-  - html-kure
-  - html-parse
-  - html-rules
-  - html-tokenizer
-  - hts
-  - htsn
-  - htsn-import
-  - htssets
-  - http-attoparsec
-  - http-client-auth
-  - http-client-lens
-  - http-client-request-modifiers
-  - http-client-session
-  - http-client-streams
-  - http-client-websockets
-  - http-conduit-browser
-  - http-conduit-downloader
-  - http-directory
-  - http-dispatch
-  - http-enumerator
-  - http-grammar
-  - http-io-streams
-  - http-kinder
-  - http-listen
-  - http-monad
-  - http-pony
-  - http-pony-serve-wai
-  - http-proxy
-  - http-querystring
-  - http-response-decoder
-  - http-server
-  - http-shed
-  - http-wget
-  - http2-client
-  - http2-client-exe
-  - http2-client-grpc
-  - http2-grpc-proto-lens
-  - http2-grpc-proto3-wire
-  - https-everywhere-rules
-  - https-everywhere-rules-raw
-  - httpspec
-  - htune
-  - htvm
-  - htzaar
-  - huck
-  - HueAPI
-  - huff
-  - huffman
-  - hugs2yc
-  - hulk
-  - HulkImport
-  - human-parse
-  - human-text
-  - hums
-  - HUnit-Diff
-  - hunit-gui
-  - hunit-rematch
-  - hunp
-  - hunspell-hs
-  - hunt-searchengine
-  - hunt-server
-  - hup
-  - hurdle
-  - hurl
-  - hurriyet
-  - husk-scheme
-  - husk-scheme-libs
-  - husky
-  - hutton
-  - huttons-razor
-  - huzzy
-  - hvega-theme
-  - hVOIDP
-  - hw-all
-  - hw-balancedparens
-  - hw-ci-assist
-  - hw-dsv
-  - hw-eliasfano
-  - hw-json
-  - hw-json-lens
-  - hw-json-simd
-  - hw-json-simple-cursor
-  - hw-json-standard-cursor
-  - hw-kafka-avro
-  - hw-prim-bits
-  - hw-rankselect
-  - hw-simd
-  - hw-succinct
-  - hw-xml
-  - hwall-auth-iitk
-  - hweblib
-  - hwhile
-  - hworker
-  - hworker-ses
-  - hwormhole
-  - hws
-  - hwsl2
-  - hwsl2-bytevector
-  - hwsl2-reducers
-  - hx
-  - HXMPP
-  - hxmppc
-  - hxournal
-  - HXQ
-  - hxt-pickle-utils
-  - hxthelper
-  - hxweb
-  - hyahtzee
-  - hyakko
-  - hybrid
-  - hydra-hs
-  - hydra-print
-  - Hydrogen
-  - hydrogen
-  - hydrogen-cli
-  - hydrogen-cli-args
-  - hydrogen-data
-  - hydrogen-multimap
-  - hydrogen-parsing
-  - hydrogen-prelude
-  - hydrogen-prelude-parsec
-  - hydrogen-syntax
-  - hydrogen-util
-  - hyena
-  - hylide
-  - hylolib
-  - hylotab
-  - hyloutils
-  - hyper
-  - hyper-extra
-  - hyper-haskell-server
-  - hyperdrive
-  - hyperfunctions
-  - hyperion
-  - hyperloglogplus
-  - hyperpublic
-  - hypher
-  - hzulip
-  - i18n
-  - I1M
-  - i3blocks-hs-contrib
-  - i3ipc
-  - iap-verifier
-  - ib-api
-  - iban
-  - ical
-  - iCalendar
-  - IcoGrid
-  - iconv-typed
-  - ide-backend
-  - ide-backend-common
-  - ide-backend-server
-  - ideas
-  - ideas-math
-  - ideas-math-types
-  - ideas-statistics
-  - idempotent
-  - identicon-style-squares
-  - identifiers
-  - idiii
-  - idna2008
-  - IDynamic
-  - ieee-utils
-  - iexcloud
-  - ifcxt
-  - IFS
-  - ig
-  - ige
-  - ige-mac-integration
-  - ignore
-  - igraph
-  - igrf
-  - ihaskell
-  - ihaskell-aeson
-  - ihaskell-basic
-  - ihaskell-blaze
-  - ihaskell-charts
-  - ihaskell-diagrams
-  - ihaskell-display
-  - ihaskell-gnuplot
-  - ihaskell-graphviz
-  - ihaskell-hatex
-  - ihaskell-hvega
-  - ihaskell-inline-r
-  - ihaskell-juicypixels
-  - ihaskell-magic
-  - ihaskell-parsec
-  - ihaskell-plot
-  - ihaskell-rlangqq
-  - ihaskell-widgets
-  - ihttp
-  - illuminate
-  - imagepaste
-  - imap
-  - imapget
-  - imbib
-  - imgur
-  - imgurder
-  - imj-animation
-  - imj-base
-  - imj-game-hamazed
-  - imj-measure-stdout
-  - imj-prelude
-  - imm
-  - imparse
-  - imperative-edsl
-  - imperative-edsl-vhdl
-  - ImperativeHaskell
-  - impl
-  - implicit-logging
-  - implicit-params
-  - importify
-  - imports
-  - impossible
-  - imprint
-  - improve
-  - INblobs
-  - inch
-  - inchworm
-  - incremental-computing
-  - incremental-maps
-  - increments
-  - indentation
-  - indentation-core
-  - indentation-parsec
-  - indentation-trifecta
-  - index-core
-  - indexation
-  - IndexedList
-  - indextype
-  - indices
-  - indieweb-algorithms
-  - indigo
-  - inf-interval
-  - infer-upstream
-  - infernal
-  - infernu
-  - infinity
-  - infix
-  - InfixApplicative
-  - inflist
-  - informative
-  - ini-qq
-  - inilist
-  - initialize
-  - inject-function
-  - inline-asm
-  - inline-java
-  - inserts
-  - inspector-wrecker
-  - instana-haskell-trace-sdk
-  - instance-map
-  - instant-aeson
-  - instant-bytes
-  - instant-deepseq
-  - instant-generics
-  - instant-hashable
-  - instant-zipper
-  - instapaper-sender
-  - instinct
-  - int-multimap
-  - intcode
-  - integer-pure
-  - integreat
-  - intel-aes
-  - intensional-datatys
-  - interlude-l
-  - InternedData
-  - internetmarke
-  - intero
-  - interp
-  - interpol
-  - interpolatedstring-qq
-  - interpolatedstring-qq-mwotton
-  - interpolatedstring-qq2
-  - interruptible
-  - interval
-  - IntFormats
-  - intro-prelude
-  - introduction
-  - introduction-test
-  - intset
-  - invertible-hlist
-  - invertible-syntax
-  - io-capture
-  - io-choice
-  - io-reactive
-  - ioctl
-  - ion
-  - IOR
-  - IORefCAS
-  - iostring
-  - iothread
-  - iotransaction
-  - ip
-  - ip2location
-  - ip2proxy
-  - ipatch
-  - ipc
-  - ipfs
-  - ipld-cid
-  - ipopt-hs
-  - ipprint
-  - iptables-helpers
-  - iptadmin
-  - IPv6DB
-  - Irc
-  - irc-dcc
-  - irc-fun-bot
-  - irc-fun-client
-  - irc-fun-color
-  - irc-fun-messages
-  - irc-fun-types
-  - ircbot
-  - iri
-  - iridium
-  - iron-mq
-  - ironforge
-  - irt
-  - isdicom
-  - isevaluated
-  - ismtp
-  - IsNull
-  - iso8601-duration
-  - isobmff
-  - isobmff-builder
-  - isohunt
-  - isotope
-  - itcli
-  - itemfield
-  - iter-stats
-  - iteratee
-  - iteratee-compress
-  - iteratee-mtl
-  - iteratee-parsec
-  - iteratee-stm
-  - iterIO
-  - iterio-server
-  - iterm-show-diagrams
-  - iterm-show-JuicyPixels
-  - ivor
-  - ivory
-  - ivory-backend-c
-  - ivory-bitdata
-  - ivory-eval
-  - ivory-examples
-  - ivory-hw
-  - ivory-opts
-  - ivory-quickcheck
-  - ivory-serialize
-  - ivory-stdlib
-  - ivy-web
-  - ixdopp
-  - ixmonad
-  - ixshader
-  - iyql
-  - j
-  - j2hs
-  - jack-bindings
-  - JackMiniMix
-  - jackminimix
-  - jacobi-roots
-  - jaeger-flamegraph
-  - jail
-  - jalaali
-  - jalla
-  - jarfind
-  - jarify
-  - jason
-  - java-bridge
-  - java-bridge-extras
-  - java-character
-  - java-reflect
-  - javascript-bridge
-  - Javasf
-  - javasf
-  - Javav
-  - javav
-  - jbi
-  - jcdecaux-vls
-  - Jdh
-  - jdi
-  - jenga
-  - jenkinsPlugins2nix
-  - jespresso
-  - jinquantities
-  - jmacro
-  - jmacro-rpc
-  - jmacro-rpc-happstack
-  - jmacro-rpc-snap
-  - jml-web-service
-  - jmonkey
-  - jni
-  - jobqueue
-  - jobs-ui
-  - join
-  - join-api
-  - joinlist
-  - jonathanscard
-  - jot
-  - jpeg
-  - js-good-parts
-  - jsaddle-hello
-  - jsaddle-wkwebview
-  - JsContracts
-  - jsmw
-  - json-assertions
-  - json-ast-json-encoder
-  - json-ast-quickcheck
-  - json-b
-  - json-builder
-  - json-bytes-builder
-  - JSON-Combinator
-  - JSON-Combinator-Examples
-  - json-directory
-  - json-encoder
-  - json-enumerator
-  - json-extra
-  - json-fu
-  - json-incremental-decoder
-  - json-litobj
-  - json-pointer-hasql
-  - json-python
-  - json-rpc-client
-  - json-schema
-  - json-sop
-  - json-syntax
-  - json-togo
-  - json-tokens
-  - json-tracer
-  - json2
-  - json2-hdbc
-  - json5hs
-  - JSONb
-  - jsonextfilter
-  - JsonGrammar
-  - jsonifier
-  - jsonresume
-  - jsonrpc-conduit
-  - jsons-to-schema
-  - jsonsql
-  - jsontsv
-  - jsonxlsx
-  - jsop
-  - jspath
-  - juandelacosa
-  - judge
-  - judy
-  - juicy-gcode
-  - JuicyPixels-blp
-  - JuicyPixels-canvas
-  - JunkDB
-  - JunkDB-driver-gdbm
-  - JunkDB-driver-hashtables
-  - jupyter
-  - JuPyTer-notebook
-  - JustParse
-  - jvm
-  - jvm-batching
-  - jvm-binary
-  - jvm-parser
-  - jvm-streaming
-  - JYU-Utils
-  - kademlia
-  - kafka-client
-  - kafka-client-sync
-  - kafka-device
-  - kafka-device-glut
-  - kafka-device-joystick
-  - kafka-device-leap
-  - kafka-device-spacenav
-  - kafka-device-vrpn
-  - kaleidoscope
-  - Kalman
-  - kalman
-  - kangaroo
-  - kansas-lava
-  - kansas-lava-cores
-  - kansas-lava-papilio
-  - kansas-lava-shake
-  - karakuri
-  - karps
-  - katip-datadog
-  - katip-elasticsearch
-  - katip-kafka
-  - katip-rollbar
-  - katip-scalyr-scribe
-  - katip-syslog
-  - katt
-  - katydid
-  - kawaii
-  - kawhi
-  - kazura-queue
-  - kd-tree
-  - kdesrc-build-extra
-  - keccak
-  - keera-hails-i18n
-  - keera-hails-mvc-environment-gtk
-  - keera-hails-mvc-model-lightmodel
-  - keera-hails-mvc-model-protectedmodel
-  - keera-hails-mvc-solutions-gtk
-  - keera-hails-reactive-cbmvar
-  - keera-hails-reactive-fs
-  - keera-hails-reactive-gtk
-  - keera-hails-reactive-htmldom
-  - keera-hails-reactive-network
-  - keera-hails-reactive-polling
-  - keera-hails-reactive-wx
-  - keera-hails-reactive-yampa
-  - keera-hails-reactivelenses
-  - keera-hails-reactivevalues
-  - kerry
-  - Ketchup
-  - keter
-  - kevin
-  - keyed
-  - keyring
-  - keysafe
-  - keystore
-  - keyvaluehash
-  - keyword-args
-  - khph
-  - kicad-data
-  - kickass-torrents-dump-parser
-  - kickchan
-  - kif-parser
-  - kit
-  - kmeans-par
-  - kmeans-vector
-  - kmonad
-  - kmp-dfa
-  - knead
-  - knead-arithmetic
-  - knit-haskell
-  - knots
-  - koellner-phonetic
-  - kontra-config
-  - korfu
-  - kqueue
-  - kraken
-  - krank
-  - krapsh
-  - Kriens
-  - krpc
-  - ks-test
-  - KSP
-  - ktx
-  - ktx-codec
-  - kubernetes-client
-  - kubernetes-client-core
-  - kuifje
-  - kure
-  - kure-your-boilerplate
-  - kurita
-  - KyotoCabinet
-  - l-bfgs-b
-  - L-seed
-  - labeled-graph
-  - laborantin-hs
-  - labsat
-  - labyrinth
-  - labyrinth-server
-  - lagrangian
-  - laika
-  - lambda-bridge
-  - lambda-calculator
-  - lambda-canvas
-  - lambda-devs
-  - lambda-options
-  - lambda-toolbox
-  - lambda2js
-  - lambdaBase
-  - lambdabot
-  - lambdabot-core
-  - lambdabot-haskell-plugins
-  - lambdabot-irc-plugins
-  - lambdabot-misc-plugins
-  - lambdabot-novelty-plugins
-  - lambdabot-reference-plugins
-  - lambdabot-social-plugins
-  - lambdabot-trusted
-  - lambdabot-utils
-  - lambdabot-zulip
-  - lambdacms-core
-  - lambdacms-media
-  - lambdacube
-  - lambdacube-bullet
-  - lambdacube-compiler
-  - lambdacube-core
-  - lambdacube-edsl
-  - lambdacube-engine
-  - lambdacube-examples
-  - lambdacube-gl
-  - lambdacube-ir
-  - lambdacube-samples
-  - LambdaDesigner
-  - lambdaFeed
-  - LambdaHack
-  - LambdaINet
-  - Lambdajudge
-  - lambdaLit
-  - LambdaNet
-  - LambdaPrettyQuote
-  - LambdaShell
-  - lambdatex
-  - lambdatwit
-  - Lambdaya
-  - lambdaya-bus
-  - lambdiff
-  - lame
-  - lame-tester
-  - lang
-  - language-bash
-  - language-boogie
-  - language-c-comments
-  - language-c-inline
-  - language-conf
-  - language-csharp
-  - language-css
-  - language-dart
-  - language-dickinson
-  - language-dockerfile
-  - language-ecmascript-analysis
-  - language-eiffel
-  - language-elm
-  - language-gcl
-  - language-go
-  - language-guess
-  - language-hcl
-  - language-java-classfile
-  - language-kort
-  - language-lua
-  - language-lua-qq
-  - language-lua2
-  - language-mixal
-  - language-Modula2
-  - language-ninja
-  - language-oberon
-  - language-objc
-  - language-ocaml
-  - language-openscad
-  - language-pig
-  - language-python
-  - language-python-colour
-  - language-python-test
-  - language-qux
-  - language-rust
-  - language-sh
-  - language-spelling
-  - language-sqlite
-  - language-sygus
-  - language-thrift
-  - language-typescript
-  - language-vhdl
-  - language-webidl
-  - lapack
-  - lapack-carray
-  - lapack-comfort-array
-  - lapack-ffi
-  - large-hashable
-  - Lastik
-  - lat
-  - latest-npm-version
-  - latex-formulae-hakyll
-  - latex-formulae-pandoc
-  - latex-svg-hakyll
-  - latex-svg-pandoc
-  - LATS
-  - launchdarkly-server-sdk
-  - launchpad-control
-  - lawless-concurrent-machines
-  - layered-state
-  - layers
-  - layers-game
-  - layout
-  - layout-bootstrap
-  - layouting
-  - lazy-hash
-  - lazy-hash-cache
-  - lazy-io-streams
-  - lazy-priority-queue
-  - lazyarray
-  - lazyboy
-  - lazyset
-  - LazyVault
-  - ld-intervals
-  - lda
-  - ldap-client
-  - ldapply
-  - LDAPv3
-  - ldif
-  - leaf
-  - leaky
-  - lean
-  - leanpub-wreq
-  - leapseconds
-  - learn
-  - learn-physics-examples
-  - Learning
-  - learning-hmm
-  - leetify
-  - legion
-  - legion-discovery
-  - legion-discovery-client
-  - legion-extra
-  - leksah-server
-  - lendingclub
-  - lens-accelerate
-  - lens-core
-  - lens-filesystem
-  - lens-labels
-  - lens-prelude
-  - lens-simple
-  - lens-text-encoding
-  - lens-time
-  - lens-toml-parser
-  - lens-tutorial
-  - lens-typelevel
-  - lens-utils
-  - lensref
-  - lentil
-  - level-monad
-  - Level0
-  - levmar
-  - levmar-chart
-  - lex-applicative
-  - lfst
-  - lgtk
-  - lha
-  - lhae
-  - lhc
-  - lhe
-  - lhs2TeX-hl
-  - lhslatex
-  - libarchive
-  - LibClang
-  - libconfig
-  - libcspm
-  - libexpect
-  - libfuse3
-  - libGenI
-  - libhbb
-  - libinfluxdb
-  - libjenkins
-  - libjwt-typed
-  - liblastfm
-  - liblawless
-  - liblinear-enumerator
-  - libltdl
-  - libmodbus
-  - libmolude
-  - liboath-hs
-  - liboleg
-  - libpafe
-  - libpq
-  - libraft
-  - librandomorg
-  - librato
-  - libssh2
-  - libssh2-conduit
-  - libsystemd-daemon
-  - libsystemd-journal
-  - libtagc
-  - libxls
-  - libxml-enumerator
-  - libxslt
-  - licensor
-  - lie
-  - life-sync
-  - lifted-base-tf
-  - lifted-protolude
-  - lifted-stm
-  - lifter
-  - ligature
-  - lightning-haskell
-  - lightstep-haskell
-  - lighttpd-conf
-  - lighttpd-conf-qq
-  - lilypond
-  - Limit
-  - limp-cbc
-  - linda
-  - linden
-  - line-bot-sdk
-  - linear-accelerate
-  - linear-algebra-cblas
-  - linear-circuit
-  - linear-code
-  - linear-maps
-  - linear-opengl
-  - linear-vect
-  - linearEqSolver
-  - linearmap-category
-  - linearscan
-  - linearscan-hoopl
-  - LinearSplit
-  - lines-of-action
-  - LinkChecker
-  - linkchk
-  - linkcore
-  - linked-list-with-iterator
-  - linkedhashmap
-  - linode
-  - linode-v4
-  - linux-blkid
-  - linux-cgroup
-  - linux-inotify
-  - linux-kmod
-  - linux-perf
-  - linux-ptrace
-  - linx-gateway
-  - lio
-  - lio-eci11
-  - lio-fs
-  - lio-simple
-  - lipsum-gen
-  - liquidhaskell-cabal
-  - Liquorice
-  - list-fusion-probe
-  - list-mux
-  - list-prompt
-  - list-remote-forwards
-  - list-t-attoparsec
-  - list-t-html-parser
-  - list-t-http-client
-  - list-t-libcurl
-  - list-t-text
-  - list-tries
-  - list-tuple
-  - list-zip-def
-  - list-zipper
-  - listenbrainz-client
-  - listlike-instances
-  - ListT
-  - liszt
-  - lit
-  - literals
-  - LiterateMarkdown
-  - little-logger
-  - live-sequencer
-  - ll-picosat
-  - llsd
-  - llvm
-  - llvm-analysis
-  - llvm-base
-  - llvm-base-types
-  - llvm-base-util
-  - llvm-data-interop
-  - llvm-dsl
-  - llvm-extension
-  - llvm-extra
-  - llvm-ffi
-  - llvm-ffi-tools
-  - llvm-general
-  - llvm-general-pure
-  - llvm-general-quote
-  - llvm-ht
-  - llvm-pkg-config
-  - llvm-pretty
-  - llvm-pretty-bc-parser
-  - llvm-tf
-  - llvm-tools
-  - lmonad
-  - lmonad-yesod
-  - load-balancing
-  - load-font
-  - local-address
-  - local-search
-  - localize
-  - located
-  - located-monad-logger
-  - loch
-  - locked-poll
-  - log
-  - log-elasticsearch
-  - log-postgres
-  - log-utils
-  - log2json
-  - log4hs
-  - logentries
-  - logger
-  - logging-effect
-  - logging-effect-extra
-  - logging-effect-extra-file
-  - logging-effect-extra-handler
-  - logging-facade-journald
-  - Logic
-  - logic-classes
-  - LogicGrowsOnTrees
-  - LogicGrowsOnTrees-MPI
-  - LogicGrowsOnTrees-network
-  - LogicGrowsOnTrees-processes
-  - logicst
-  - logict-state
-  - logplex-parse
-  - lojban
-  - lojbanParser
-  - lojbanXiragan
-  - lojysamban
-  - lol
-  - lol-apps
-  - lol-benches
-  - lol-calculus
-  - lol-cpp
-  - lol-repa
-  - lol-tests
-  - lol-typing
-  - loli
-  - longboi
-  - longshot
-  - lookup-tables
-  - loop-effin
-  - loop-while
-  - looper
-  - loops
-  - loopy
-  - lord
-  - lorem
-  - lorentz
-  - loris
-  - loshadka
-  - lostcities
-  - loup
-  - lowgl
-  - lp-diagrams
-  - lp-diagrams-svg
-  - LRU
-  - lrucaching-haxl
-  - ls-usb
-  - lscabal
-  - LslPlus
-  - lsp
-  - lsystem
-  - ltext
-  - lti13
-  - ltk
-  - LTS
-  - lua-bc
-  - luachunk
-  - luautils
-  - lucid-colonnade
-  - lucienne
-  - Lucu
-  - luhn
-  - lui
-  - luis-client
-  - luka
-  - luminance
-  - luminance-samples
-  - lushtags
-  - luthor
-  - lvish
-  - lvmlib
-  - lxc
-  - lxd-client
-  - lye
-  - Lykah
-  - lz4-bytes
-  - lz4-conduit
-  - lz4-frame-conduit
-  - lzma-enumerator
-  - lzma-streams
-  - lzo
-  - maam
-  - mac
-  - macaroon-shop
-  - macbeth-lib
-  - machinecell
-  - machines-amazonka
-  - machines-binary
-  - machines-bytestring
-  - machines-directory
-  - machines-encoding
-  - machines-io
-  - machines-process
-  - machines-zlib
-  - macho
-  - maclight
-  - macos-corelibs
-  - macosx-make-standalone
-  - macrm
-  - madlang
-  - mage
-  - magic-tyfams
-  - magic-wormhole
-  - magicbane
-  - MagicHaskeller
-  - magico
-  - magma
-  - mahoro
-  - maid
-  - mail-pool
-  - mailchimp
-  - mailchimp-subscribe
-  - MailchimpSimple
-  - mailgun
-  - majordomo
-  - majority
-  - make-hard-links
-  - make-monofoldable-foldable
-  - make-package
-  - makedo
-  - makefile
-  - mallard
-  - manatee
-  - manatee-anything
-  - manatee-core
-  - manatee-curl
-  - manatee-editor
-  - manatee-filemanager
-  - manatee-imageviewer
-  - manatee-ircclient
-  - manatee-mplayer
-  - manatee-pdfviewer
-  - manatee-processmanager
-  - manatee-template
-  - manatee-terminal
-  - manatee-welcome
-  - mandulia
-  - mangopay
-  - manifold-random
-  - manifolds
-  - Map
-  - map-exts
-  - mapalgebra
-  - Mapping
-  - mappy
-  - marionetta
-  - markdown-kate
-  - markdown-pap
-  - markdown2svg
-  - marked-pretty
-  - markov-processes
-  - markov-realization
-  - markup
-  - marmalade-upload
-  - marquise
-  - mars
-  - marvin
-  - marvin-interpolate
-  - marxup
-  - masakazu-bot
-  - MASMGen
-  - massiv
-  - massiv-io
-  - massiv-test
-  - master-plan
-  - matchable
-  - matchable-th
-  - matchers
-  - math-grads
-  - math-interpolate
-  - math-metric
-  - math-programming-glpk
-  - math-programming-tests
-  - mathblog
-  - mathflow
-  - mathlink
-  - matrix-as-xyz
-  - matrix-lens
-  - matrix-market
-  - matrix-sized
-  - matsuri
-  - maude
-  - maxent
-  - maxent-learner-hw
-  - maxent-learner-hw-gui
-  - maxsharing
-  - maybench
-  - MaybeT
-  - MaybeT-monads-tf
-  - MaybeT-transformers
-  - MazesOfMonad
-  - MBot
-  - mbox-tools
-  - mbug
-  - MC-Fold-DP
-  - mcl
-  - mcm
-  - mcmaster-gloss-examples
-  - mcmc
-  - mcmc-samplers
-  - mcmc-synthesis
-  - mcpi
-  - mdapi
-  - mdcat
-  - mDNSResponder-client
-  - mdp
-  - mealstrom
-  - mealy
-  - MeanShift
-  - Measure
-  - mecab
-  - mech
-  - Mecha
-  - Mechs
-  - mechs
-  - mediabus
-  - mediabus-fdk-aac
-  - mediabus-rtp
-  - mediawiki
-  - medium-sdk-haskell
-  - mega-sdist
-  - mellon-core
-  - mellon-gpio
-  - mellon-web
-  - melody
-  - memcache
-  - memcache-conduit
-  - memcache-haskell
-  - memcached-binary
-  - memis
-  - memo-ptr
-  - memoization-utils
-  - memorypool
-  - menoh
-  - menshen
-  - merkle-patricia-db
-  - messagepack-rpc
-  - messente
-  - meta-misc
-  - meta-par
-  - meta-par-accelerate
-  - metadata
-  - MetaHDBC
-  - metaheuristics
-  - MetaObject
-  - metaplug
-  - metar
-  - metar-http
-  - metric
-  - Metrics
-  - metricsd-client
-  - metronome
-  - mezzo
-  - mezzolens
-  - MFlow
-  - mgeneric
-  - Mhailist
-  - MHask
-  - mi
-  - Michelangelo
-  - miconix-test
-  - micro-recursion-schemes
-  - microbase
-  - microformats2-parser
-  - microformats2-types
-  - microgroove
-  - microlens-each
-  - micrologger
-  - microsoft-translator
-  - MicrosoftTranslator
-  - mida
-  - midi-music-box
-  - midi-utils
-  - midimory
-  - midisurface
-  - mighttpd
-  - mighty-metropolis
-  - mikmod
-  - mikrokosmos
-  - miku
-  - milena
-  - mime-directory
-  - minecraft-data
-  - minesweeper
-  - miniforth
-  - minilens
-  - minilight
-  - minilight-lua
-  - minimung
-  - minions
-  - minioperational
-  - miniplex
-  - minirotate
-  - ministg
-  - minst-idx
-  - mios
-  - MIP
-  - mirror-tweet
-  - misfortune
-  - miso-action-logger
-  - miso-examples
-  - miss
-  - miss-porcelain
-  - missing-py2
-  - MissingPy
-  - mix-arrows
-  - mixed-strategies
-  - mixpanel-client
-  - mkbndl
-  - mkcabal
-  - ml-w
-  - mlist
-  - mltool
-  - mm2
-  - mmsyn4
-  - mmsyn7h
-  - mmtf
-  - mmtl
-  - mmtl-base
-  - moan
-  - Mobile-Legends-Hack-Cheats
-  - modelicaparser
-  - modify-fasta
-  - modsplit
-  - modular-prelude
-  - modular-prelude-classy
-  - modularity
-  - module-management
-  - modulespection
-  - modulo
-  - Moe
-  - moe
-  - MoeDict
-  - moesocks
-  - mohws
-  - mole
-  - mollie-api-haskell
-  - monad-abort-fd
-  - monad-atom
-  - monad-atom-simple
-  - monad-branch
-  - monad-classes-logging
-  - monad-exception
-  - monad-finally
-  - monad-fork
-  - monad-http
-  - monad-interleave
-  - monad-levels
-  - monad-lgbt
-  - monad-log
-  - monad-logger-syslog
-  - monad-lrs
-  - monad-mersenne-random
-  - monad-metrics-extensible
-  - monad-mock
-  - monad-open
-  - monad-parallel-progressbar
-  - monad-param
-  - monad-persist
-  - monad-ran
-  - monad-recorder
-  - monad-state
-  - monad-statevar
-  - monad-ste
-  - monad-stlike-io
-  - monad-stlike-stm
-  - monad-supply
-  - monad-task
-  - monad-timing
-  - monad-tx
-  - monad-unify
-  - monad-var
-  - monad-wrap
-  - monadacme
-  - MonadCatchIO-mtl
-  - MonadCatchIO-mtl-foreign
-  - MonadCatchIO-transformers
-  - MonadCatchIO-transformers-foreign
-  - MonadCompose
-  - monadic-recursion-schemes
-  - monadiccp
-  - monadiccp-gecode
-  - Monadius
-  - MonadLab
-  - monadLib-compose
-  - monadloc-pp
-  - monadlog
-  - Monadoro
-  - monadplus
-  - monads-fd
-  - MonadStack
-  - monarch
-  - Monaris
-  - Monatron
-  - Monatron-IO
-  - mondo
-  - monetdb-mapi
-  - money
-  - mongoDB
-  - mongodb-queue
-  - mongrel2-handler
-  - monitor
-  - monky
-  - mono-foldable
-  - Monocle
-  - monoid
-  - monoid-absorbing
-  - monoid-owns
-  - monoidplus
-  - monoids
-  - monopati
-  - monte-carlo
-  - monus
-  - monzo
-  - moo
-  - morfette
-  - morfeusz
-  - morley
-  - morloc
-  - morpheus-graphql-cli
-  - morpheus-graphql-client
-  - morpheus-graphql-subscriptions
-  - morphisms-functors
-  - morphisms-functors-inventory
-  - morphisms-objects
-  - morte
-  - mosaico-lib
-  - moto
-  - moto-postgresql
-  - motor-diagrams
-  - motor-reflection
-  - mount
-  - movie-monad
-  - mp
-  - mpdmate
-  - mpi-hs
-  - mpi-hs-binary
-  - mpi-hs-cereal
-  - mpi-hs-store
-  - mpppc
-  - mprelude
-  - mpretty
-  - mpris
-  - mprover
-  - mps
-  - mptcp-pm
-  - mpvguihs
-  - mqtt
-  - mqtt-hs
-  - mrifk
-  - mrm
-  - ms
-  - msgpack
-  - msgpack-aeson
-  - msgpack-binary
-  - msgpack-idl
-  - msgpack-rpc
-  - msgpack-rpc-conduit
-  - msh
-  - msi-kb-backlit
-  - MSQueue
-  - MTGBuilder
-  - mtgoxapi
-  - mtl-c
-  - mtl-evil-instances
-  - mtl-extras
-  - mtl-tf
-  - mtlx
-  - mtp
-  - mu-avro
-  - mu-grpc-client
-  - mu-grpc-common
-  - mu-grpc-server
-  - mu-kafka
-  - mu-protobuf
-  - mu-servant-server
-  - MuCheck
-  - MuCheck-Hspec
-  - MuCheck-HUnit
-  - MuCheck-QuickCheck
-  - MuCheck-SmallCheck
-  - mud
-  - muesli
-  - mulang
-  - multext-east-msd
-  - multi-cabal
-  - multi-instance
-  - multi-trie
-  - multiaddr
-  - multiarg
-  - multibase
-  - multifocal
-  - multihash
-  - multihash-cryptonite
-  - multihash-serialise
-  - multilinear
-  - multilinear-io
-  - multipass
-  - multipath
-  - multiplate-simplified
-  - multiplicity
-  - multipool-persistent-postgresql
-  - multirec
-  - multirec-alt-deriver
-  - multirec-binary
-  - multisetrewrite
-  - multivariant
-  - Munkres-simple
-  - muon
-  - murder
-  - murmur
-  - murmurhash3
-  - mushu
-  - music-graphics
-  - music-parts
-  - music-pitch
-  - music-preludes
-  - music-score
-  - music-sibelius
-  - music-suite
-  - music-util
-  - musicbrainz-email
-  - musicScroll
-  - musicxml
-  - musicxml2
-  - mustache-haskell
-  - mutable
-  - mutable-iter
-  - MutationOrder
-  - mute-unmute
-  - mvar-lock
-  - mvc
-  - mvc-updates
-  - mvclient
-  - mwc-probability-transition
-  - mwc-random-accelerate
-  - mxnet
-  - mxnet-dataiter
-  - mxnet-examples
-  - mxnet-nn
-  - mxnet-nnvm
-  - my-package-testing
-  - my-test-docs
-  - myanimelist-export
-  - myo
-  - MyPrimes
-  - mysnapsession
-  - mysnapsession-example
-  - mysql-effect
-  - mysql-haskell
-  - mysql-haskell-nem
-  - mysql-haskell-openssl
-  - mysql-simple-quasi
-  - mysql-simple-typed
-  - mystem
-  - myTestlll
-  - mywatch
-  - myxine-client
-  - mzv
-  - n-tuple
-  - n2o-protocols
-  - n2o-web
-  - NaCl
-  - nagios-plugin-ekg
-  - nakadi-client
-  - named-lock
-  - named-servant
-  - named-servant-client
-  - named-servant-server
-  - namelist
-  - nano-hmac
-  - nano-md5
-  - nanocurses
-  - nanomsg
-  - nanomsg-haskell
-  - nanoparsec
-  - NanoProlog
-  - nanovg
-  - nanovg-simple
-  - nanq
-  - naperian
-  - NaperianNetCDF
-  - naqsha
-  - narc
-  - nat-sized-numbers
-  - nationstates
-  - nats-client
-  - nats-queue
-  - natural
-  - natural-number
-  - NaturalLanguageAlphabets
-  - naver-translate
-  - nbt
-  - NearContextAlgebra
-  - neat
-  - needle
-  - neet
-  - nehe-tuts
-  - neither
-  - neko-lib
-  - Neks
-  - nemesis-titan
-  - nerf
-  - nero
-  - nero-wai
-  - nero-warp
-  - nest
-  - nested-routes
-  - nested-sequence
-  - NestedFunctor
-  - nestedmap
-  - net-spider
-  - net-spider-cli
-  - net-spider-pangraph
-  - net-spider-rpl
-  - net-spider-rpl-cli
-  - netclock
-  - netcore
-  - netease-fm
-  - netlines
-  - netrium
-  - NetSNMP
-  - netspec
-  - netstring-enumerator
-  - nettle
-  - nettle-frp
-  - nettle-netkit
-  - nettle-openflow
-  - netwire-input-javascript
-  - netwire-vinylglfw-examples
-  - network-address
-  - network-anonymous-i2p
-  - network-anonymous-tor
-  - network-api-support
-  - network-arbitrary
-  - network-attoparsec
-  - network-bitcoin
-  - network-builder
-  - network-bytestring
-  - network-carbon
-  - network-connection
-  - network-dns
-  - network-enumerator
-  - network-hans
-  - network-house
-  - network-interfacerequest
-  - network-messagepack-rpc-websocket
-  - network-minihttp
-  - network-msgpack-rpc
-  - network-netpacket
-  - network-protocol-xmpp
-  - network-rpca
-  - network-server
-  - network-service
-  - network-simple-sockaddr
-  - network-simple-wss
-  - network-socket-options
-  - network-stream
-  - network-topic-models
-  - network-transport-amqp
-  - network-transport-inmemory
-  - network-transport-tcp
-  - network-uri-json
-  - network-uri-static
-  - network-voicetext
-  - network-wai-router
-  - network-websocket
-  - networked-game
-  - neural
-  - neural-network-blashs
-  - neural-network-hmatrix
-  - newhope
-  - newports
-  - newsletter
-  - newsletter-mailgun
-  - newt
-  - newtype-deriving
-  - newtype-th
-  - newtype-zoo
-  - next-ref
-  - nextstep-plist
-  - nfc
-  - NGrams
-  - ngrams-loader
-  - ngx-export-tools-extra
-  - niagra
-  - nibblestring
-  - nice-html
-  - nicovideo-translator
-  - nikepub
-  - Ninjas
-  - nirum
-  - nitro
-  - nix-delegate
-  - nix-deploy
-  - nix-eval
-  - nix-freeze-tree
-  - nix-thunk
-  - nix-tools
-  - nixfromnpm
-  - nixpkgs-update
-  - nkjp
-  - nlp-scores
-  - nlp-scores-scripts
-  - nm
-  - NMap
-  - nntp
-  - no-role-annots
-  - noether
-  - nofib-analyse
-  - nofib-analyze
-  - noise
-  - nom
-  - Nomyx
-  - Nomyx-Core
-  - Nomyx-Language
-  - Nomyx-Rules
-  - Nomyx-Web
-  - non-empty-zipper
-  - NonEmpty
-  - nonempty-lift
-  - NonEmptyList
-  - normalization-insensitive
-  - NoSlow
-  - not-gloss-examples
-  - notcpp
-  - nothunks
-  - notifications-tray-icon
-  - notmuch
-  - notmuch-haskell
-  - notmuch-web
-  - NoTrace
-  - now-haskell
-  - np-extras
-  - np-linear
-  - nptools
-  - nri-env-parser
-  - nri-prelude
-  - ntp-control
-  - ntrip-client
-  - null-canvas
-  - nullary
-  - nullpipe
-  - NumberSieves
-  - NumberTheory
-  - numerals
-  - numerals-base
-  - numeric-ode
-  - numeric-qq
-  - numeric-ranges
-  - numerical
-  - numhask-array
-  - numhask-free
-  - numhask-hedgehog
-  - numhask-histogram
-  - numhask-prelude
-  - numhask-range
-  - numhask-space
-  - numhask-test
-  - Nussinov78
-  - Nutri
-  - nvim-hs
-  - nvim-hs-contrib
-  - nvim-hs-ghcid
-  - NXT
-  - NXTDSL
-  - nylas
-  - nymphaea
-  - oanda-rest-api
-  - oasis-xrd
-  - oauth2-jwt-bearer
-  - oauthenticated
-  - obd
-  - obdd
-  - oberon0
-  - obj
-  - Object
-  - objectid
-  - ObjectIO
-  - objective
-  - ocaml-export
-  - ochan
-  - octane
-  - octohat
-  - octopus
-  - Octree
-  - oculus
-  - odbc
-  - odd-jobs
-  - OddWord
-  - oden-go-packages
-  - oeis2
-  - off-simple
-  - OGL
-  - ogmarkup
-  - ohloh-hs
-  - oi
-  - oidc-client
-  - ois-input-manager
-  - olwrapper
-  - om-actor
-  - om-elm
-  - om-fail
-  - om-http-logging
-  - omaketex
-  - ombra
-  - Omega
-  - omega
-  - omnifmt
-  - on-a-horse
-  - on-demand-ssh-tunnel
-  - onama
-  - ONC-RPC
-  - oneormore
-  - online
-  - online-csv
-  - onpartitions
-  - OnRmt
-  - onu-course
-  - op
-  - opaleye-classy
-  - opaleye-sqlite
-  - open-adt
-  - open-adt-tutorial
-  - open-haddock
-  - open-pandoc
-  - open-signals
-  - open-typerep
-  - open-witness
-  - OpenAFP
-  - OpenAFP-Utils
-  - openapi-petstore
-  - openapi-typed
-  - opench-meteo
-  - OpenCL
-  - OpenCLRaw
-  - OpenCLWrappers
-  - opencv-raw
-  - opendatatable
-  - OpenGLCheck
-  - opengles
-  - openid-connect
-  - OpenSCAD
-  - opensoundcontrol-ht
-  - openssh-github-keys
-  - openssh-protocol
-  - opentelemetry-extra
-  - opentelemetry-http-client
-  - opentelemetry-lightstep
-  - opentelemetry-wai
-  - opentheory-char
-  - opentok
-  - opentype
-  - OpenVG
-  - OpenVGRaw
-  - openweathermap
-  - Operads
-  - operate-do
-  - operational-extra
-  - oplang
-  - opml-conduit
-  - opn
-  - optima
-  - optima-for-hasql
-  - optimal-blocks
-  - optimization
-  - optimusprime
-  - optional
-  - options-time
-  - optparse-applicative-simple
-  - optparse-enum
-  - optparse-helper
-  - orc
-  - orchestrate
-  - OrchestrateDB
-  - orchid
-  - orchid-demo
-  - order-maintenance
-  - order-statistics
-  - orders
-  - Ordinary
-  - ordrea
-  - oref
-  - organize-imports
-  - orgmode
-  - origami
-  - orizentic
-  - OrPatterns
-  - orthotope
-  - osc
-  - oscpacking
-  - oset
-  - Oslo-Vectize
-  - OSM
-  - osm-conduit
-  - osm-download
-  - oso2pdf
-  - osx-ar
-  - ot
-  - OTP
-  - otp-authenticator
-  - ottparse-pretty
-  - overload
-  - overloaded
-  - overloaded-records
-  - overture
-  - pack
-  - package-description-remote
-  - package-o-tron
-  - package-vt
-  - packdeps
-  - packed
-  - packed-dawg
-  - packed-multikey-map
-  - packedstring
-  - packer-messagepack
-  - packman
-  - packunused
-  - pacman-memcache
-  - padKONTROL
-  - pads-haskell
-  - pagarme
-  - PageIO
-  - pagure-hook-receiver
-  - Paillier
-  - pam
-  - pan-os-syslog
-  - panda
-  - pandoc-csv2table
-  - pandoc-emphasize-code
-  - pandoc-filter-graphviz
-  - pandoc-include
-  - pandoc-include-code
-  - pandoc-japanese-filters
-  - pandoc-lens
-  - pandoc-markdown-ghci-filter
-  - pandoc-placetable
-  - pandoc-plantuml-diagrams
-  - pandoc-plot
-  - pandoc-pyplot
-  - pandoc-sidenote
-  - pandoc-unlit
-  - pandoc-utils
-  - PandocAgda
-  - pang-a-lambda
-  - pangraph
-  - panpipe
-  - pansite
-  - pantry-tmp
-  - papa
-  - papa-base
-  - papa-base-export
-  - papa-base-implement
-  - papa-export
-  - papa-implement
-  - papa-include
-  - papa-prelude
-  - papa-prelude-core
-  - papa-prelude-lens
-  - papa-prelude-semigroupoids
-  - papa-prelude-semigroups
-  - papa-semigroupoids
-  - papa-semigroupoids-implement
-  - paphragen
-  - pappy
-  - paprika
-  - par-dual
-  - paragon
-  - Paraiso
-  - Parallel-Arrows-Eden
-  - parallel-tasks
-  - parallel-tree-search
-  - parameterized
-  - parameterized-utils
-  - paranoia
-  - parco
-  - parco-attoparsec
-  - parco-parsec
-  - parcom-lib
-  - parconc-examples
-  - pareto
-  - parquet-hs
-  - Parry
-  - parse-help
-  - parseargs
-  - parsec-free
-  - parsec-parsers
-  - parsec-pratt
-  - parsec1
-  - parsec2
-  - parsec3
-  - parseerror-eq
-  - parsek
-  - parsely
-  - parser-combinators-tests
-  - parser-helper
-  - parser241
-  - parsergen
-  - parsestar
-  - parsimony
-  - partage
-  - partial-lens
-  - partial-records
-  - partial-semigroup
-  - partial-semigroup-hedgehog
-  - partial-semigroup-test
-  - partly
-  - passage
-  - passman
-  - PasswordGenerator
-  - passwords
-  - pasta
-  - pastis
-  - pasty
-  - patat
-  - patches-vector
-  - path-text-utf8
-  - Pathfinder
-  - pathfindingcore
-  - PathTree
-  - patronscraper
-  - pattern-trie
-  - patterns
-  - paypal-adaptive-hoops
-  - paypal-api
-  - paypal-rest-client
-  - pb
-  - pb-next
-  - pbc4hs
-  - PBKDF2
-  - pcap-enumerator
-  - pcapng
-  - pcd-loader
-  - pcf
-  - pcf-font
-  - pcf-font-embed
-  - PCLT
-  - PCLT-DB
-  - pcre-light-extra
-  - pdf-slave
-  - pdf-slave-template
-  - pdf-toolbox-content
-  - pdf-toolbox-core
-  - pdf-toolbox-document
-  - pdf-toolbox-viewer
-  - pdfname
-  - pdfsplit
-  - pdftotext
-  - pdynload
-  - peakachu
-  - PeanoWitnesses
-  - pec
-  - pecoff
-  - pedestrian-dag
-  - peg
-  - peggy
-  - pencil
-  - penny
-  - penny-bin
-  - penny-lib
-  - penrose
-  - peparser
-  - perceptron
-  - peregrin
-  - perf
-  - perf-analysis
-  - PerfectHash
-  - perfecthash
-  - perhaps
-  - periodic
-  - periodic-client
-  - periodic-client-exe
-  - periodic-server
-  - perm
-  - permutation
-  - permutations
-  - permute
-  - PermuteEffects
-  - persist2er
-  - Persistence
-  - persistent-audit
-  - persistent-cereal
-  - persistent-database-url
-  - persistent-documentation
-  - persistent-equivalence
-  - persistent-hssqlppp
-  - persistent-iproute
-  - persistent-map
-  - persistent-migration
-  - persistent-mongoDB
-  - persistent-mysql-haskell
-  - persistent-protobuf
-  - persistent-ratelimit
-  - persistent-redis
-  - persistent-relational-record
-  - persistent-template-classy
-  - persistent-vector
-  - persistent-zookeeper
-  - persona
-  - persona-idp
-  - pesca
-  - peyotls
-  - peyotls-codec
-  - pez
-  - pg-harness
-  - pg-recorder
-  - pg-store
-  - pg-transact
-  - pgdl
-  - pgf2
-  - pgsql-simple
-  - pgstream
-  - phasechange
-  - phaser
-  - phoityne
-  - phone-numbers
-  - phone-push
-  - phooey
-  - photoname
-  - phraskell
-  - Phsu
-  - phybin
-  - pi-calculus
-  - pi-forall
-  - pi-hoole
-  - pia-forward
-  - pianola
-  - picedit
-  - pickle
-  - picologic
-  - picoparsec
-  - pictikz
-  - pier
-  - pier-core
-  - piet
-  - pig
-  - pinboard
-  - pinboard-notes-backup
-  - pinch
-  - pinchot
-  - pine
-  - ping
-  - pinpon
-  - Pipe
-  - pipe-enumerator
-  - pipes-async
-  - pipes-attoparsec-streaming
-  - pipes-bgzf
-  - pipes-brotli
-  - pipes-bzip
-  - pipes-cacophony
-  - pipes-cereal
-  - pipes-cereal-plus
-  - pipes-conduit
-  - pipes-core
-  - pipes-courier
-  - pipes-errors
-  - pipes-extra
-  - pipes-files
-  - pipes-illumina
-  - pipes-interleave
-  - pipes-io
-  - pipes-key-value-csv
-  - pipes-lzma
-  - pipes-mongodb
-  - pipes-p2p
-  - pipes-p2p-examples
-  - pipes-protolude
-  - pipes-rt
-  - pipes-s3
-  - pipes-shell
-  - pipes-sqlite-simple
-  - pipes-text
-  - pipes-transduce
-  - pipes-vector
-  - pipes-zeromq4
-  - pisigma
-  - Piso
-  - pit
-  - pitchtrack
-  - pivotal-tracker
-  - pixelated-avatar-generator
-  - pkcs10
-  - pkcs7
-  - pkggraph
-  - pkgtreediff
-  - plailude
-  - plan-applicative
-  - plan-b
-  - planar-graph
-  - planet-mitchell
-  - planet-mitchell-test
-  - plankton
-  - plat
-  - platinum-parsing
-  - PlayingCards
-  - plex
-  - plist
-  - plist-buddy
-  - plocketed
-  - plot
-  - plot-gtk
-  - plot-gtk-ui
-  - plot-gtk3
-  - Plot-ho-matic
-  - plot-lab
-  - plots
-  - PlslTools
-  - plugins
-  - plugins-auto
-  - plugins-multistage
-  - plur
-  - plural
-  - plzwrk
-  - png-file
-  - pngload
-  - pngload-fixed
-  - pocket
-  - pocket-dns
-  - point-octree
-  - pointedalternative
-  - pointful
-  - pointless-haskell
-  - pointless-lenses
-  - pointless-rewrite
-  - poke
-  - pokemon-go-protobuf-types
-  - poker-eval
-  - pokitdok
-  - polar-configfile
-  - polar-shader
-  - polh-lexicon
-  - Pollutocracy
-  - poly-control
-  - polydata
-  - polydata-core
-  - polynomial
-  - polysemy-chronos
-  - polysemy-extra
-  - polysemy-fskvstore
-  - polysemy-http
-  - polysemy-kvstore-jsonfile
-  - polysemy-methodology
-  - polysemy-methodology-composite
-  - polysemy-path
-  - polysemy-RandomFu
-  - polysemy-resume
-  - polysemy-test
-  - polysemy-time
-  - polysemy-vinyl
-  - polysemy-webserver
-  - polyseq
-  - polytypeable
-  - polytypeable-utils
-  - pomodoro
-  - pomohoro
-  - ponder
-  - pong-server
-  - pontarius-xmpp
-  - pool
-  - pool-conduit
-  - pop3-client
-  - popenhs
-  - popkey
-  - poppler
-  - porcupine-core
-  - porcupine-http
-  - porcupine-s3
-  - portager
-  - porte
-  - PortFusion
-  - ports
-  - poseidon
-  - poseidon-postgis
-  - posix-acl
-  - posix-api
-  - posix-realtime
-  - posix-waitpid
-  - posplyu
-  - postcodes
-  - postgres-embedded
-  - postgres-tmp
-  - postgres-websockets
-  - postgresql-lo-stream
-  - postgresql-named
-  - postgresql-pure
-  - postgresql-query
-  - postgresql-simple-bind
-  - postgresql-simple-named
-  - postgresql-simple-opts
-  - postgresql-simple-queue
-  - postgresql-simple-sop
-  - postgresql-simple-typed
-  - postgresql-syntax
-  - postgresql-tx-query
-  - postgresql-tx-squeal
-  - postgresql-typed
-  - postgresql-typed-lifted
-  - postgrest-ws
-  - postie
-  - postmark
-  - postmaster
-  - potato-tool
-  - potoki
-  - potoki-cereal
-  - potoki-conduit
-  - potoki-core
-  - potoki-hasql
-  - potoki-zlib
-  - powermate
-  - powerpc
-  - powerqueue
-  - powerqueue-distributed
-  - powerqueue-levelmem
-  - powerqueue-sqs
-  - PPrinter
-  - pqc
-  - pqueue-mtl
-  - practice-room
-  - praglude
-  - preamble
-  - precursor
-  - pred-set
-  - pred-trie
-  - predicate-class
-  - predicate-typed
-  - prednote
-  - prednote-test
-  - prefork
-  - pregame
-  - preliminaries
-  - prelude-generalize
-  - prelude-plus
-  - preprocess-haskell
-  - preprocessor
-  - preql
-  - presburger
-  - present
-  - press
-  - presto-hdbc
-  - pretty-compact
-  - pretty-diff
-  - pretty-ghci
-  - pretty-ncols
-  - prettyprinter-graphviz
-  - prettyprinter-lucid
-  - prettyprinter-vty
-  - preview
-  - prim
-  - prim-array
-  - prim-ref
-  - primal
-  - primal-memory
-  - primes-type
-  - primitive-atomic
-  - primitive-containers
-  - primitive-extras
-  - primitive-indexed
-  - primitive-maybe
-  - primitive-simd
-  - primitive-sort
-  - primitive-stablename
-  - primitive-unlifted
-  - PrimitiveArray-Pretty
-  - primula-board
-  - primula-bot
-  - pringletons
-  - print-debugger
-  - printcess
-  - Printf-TH
-  - prints
-  - priority-queue
-  - PriorityChansConverger
-  - ProbabilityMonads
-  - probable
-  - proc
-  - process-conduit
-  - process-iterio
-  - process-leksah
-  - process-listlike
-  - process-progress
-  - process-qq
-  - process-streaming
-  - processing
-  - processmemory
-  - procrastinating-variable
-  - procstat
-  - producer
-  - prof-flamegraph
-  - prof2dot
-  - prof2pretty
-  - profunctor-monad
-  - profunctor-optics
-  - progress
-  - progress-meter
-  - progress-reporting
-  - progressbar
-  - progression
-  - progressive
-  - proj4-hs-bindings
-  - project-m36
-  - projectile
-  - prolens
-  - prolog
-  - prolog-graph
-  - prolog-graph-lib
-  - prologue
-  - prolude
-  - prometheus-effect
-  - promise
-  - pronounce
-  - proof-combinators
-  - propane
-  - propellor
-  - Proper
-  - properties
-  - property-list
-  - proplang
-  - prosper
-  - proteome
-  - proto-lens-combinators
-  - proto-lens-descriptors
-  - proto-lens-jsonpb
-  - proto3-suite
-  - protobuf-native
-  - protocol-buffers
-  - protocol-buffers-descriptor
-  - protocol-buffers-descriptor-fork
-  - protocol-buffers-fork
-  - protolude-lifted
-  - proton-haskell
-  - prototype
-  - prove-everywhere-server
-  - provenience
-  - proxy-kindness
-  - proxy-mapping
-  - psc-ide
-  - pseudo-boolean
-  - pseudo-trie
-  - PTQ
-  - ptr
-  - ptr-poker
-  - publicsuffixlistcreate
-  - publish
-  - pubnub
-  - pubsub
-  - puffytools
-  - pugixml
-  - Pugs
-  - pugs-compat
-  - pugs-DrIFT
-  - pugs-hsregex
-  - PUH-Project
-  - punkt
-  - Pup-Events
-  - Pup-Events-Demo
-  - Pup-Events-Server
-  - puppetresources
-  - pure-cdb
-  - pure-io
-  - pure-priority-queue
-  - pure-priority-queue-tests
-  - purebred-email
-  - purescript
-  - purescript-iso
-  - purescript-tsd-gen
-  - pursuit-client
-  - push-notifications
-  - push-notify
-  - push-notify-apn
-  - push-notify-ccs
-  - push-notify-general
-  - pusher-haskell
-  - pusher-ws
-  - pushme
-  - putlenses
-  - puzzle-draw
-  - puzzle-draw-cmdline
-  - pvd
-  - PyF
-  - pyffi
-  - pyfi
-  - python-pickle
-  - q4c12-twofinger
-  - qc-oi-testgenerator
-  - qd
-  - qd-vec
-  - qed
-  - qhs
-  - qhull-simple
-  - qif
-  - QIO
-  - QLearn
-  - qr-imager
-  - qr-repa
-  - qsem
-  - QuadEdge
-  - QuadTree
-  - quantfin
-  - quantum-arrow
-  - quantum-random
-  - quarantimer
-  - qudb
-  - Quelea
-  - quenya-verb
-  - queryparser
-  - queryparser-demo
-  - queryparser-hive
-  - queryparser-presto
-  - queryparser-vertica
-  - questioner
-  - queuelike
-  - quick-schema
-  - QuickAnnotate
-  - quickbench
-  - quickbooks
-  - quickcheck-arbitrary-template
-  - quickcheck-combinators
-  - quickcheck-poly
-  - quickcheck-property-comb
-  - quickcheck-property-monad
-  - quickcheck-regex
-  - quickcheck-relaxng
-  - quickcheck-rematch
-  - quickcheck-report
-  - quickcheck-state-machine
-  - quickcheck-state-machine-distributed
-  - quickcheck-webdriver
-  - QuickCheckVariant
-  - QuickPlot
-  - quickpull
-  - quickset
-  - Quickson
-  - quicktest
-  - quickwebapp
-  - quipper-core
-  - quipper-rendering
-  - quiver
-  - quiver-binary
-  - quiver-bytestring
-  - quiver-cell
-  - quiver-csv
-  - quiver-enumerator
-  - quiver-groups
-  - quiver-http
-  - quiver-instances
-  - quiver-interleave
-  - quiver-sort
-  - quokka
-  - quoridor-hs
-  - qux
-  - R-pandoc
-  - raaz
-  - rad
-  - radian
-  - radium
-  - radium-formula-parser
-  - radix
-  - rados-haskell
-  - raft
-  - rail-compiler-editor
-  - rails-session
-  - rainbow-tests
-  - raketka
-  - rakhana
-  - rakuten
-  - ralist
-  - rallod
-  - raml
-  - rand-vars
-  - randfile
-  - rando
-  - random-access-list
-  - random-derive
-  - random-eff
-  - random-effin
-  - random-extras
-  - random-fu
-  - random-fu-multivariate
-  - random-hypergeometric
-  - random-source
-  - random-stream
-  - RandomDotOrg
-  - Randometer
-  - Range
-  - range-space
-  - rangemin
-  - rank-product
-  - rank1dynamic
-  - Ranka
-  - rapid
-  - rapid-term
-  - rasa
-  - rasa-example-config
-  - rasa-ext-bufs
-  - rasa-ext-cmd
-  - rasa-ext-cursors
-  - rasa-ext-files
-  - rasa-ext-logger
-  - rasa-ext-slate
-  - rasa-ext-status-bar
-  - rasa-ext-style
-  - rasa-ext-views
-  - rasa-ext-vim
-  - rascal
-  - Rasenschach
-  - rational-list
-  - rattle
-  - rattletrap
-  - raven-haskell-scotty
-  - raw-feldspar
-  - rawr
-  - raz
-  - razom-text-util
-  - rbr
-  - rc
-  - rclient
-  - rdioh
-  - react-flux
-  - react-flux-servant
-  - react-haskell
-  - react-tutorial-haskell-server
-  - reaction-logic
-  - reactive-bacon
-  - reactive-balsa
-  - reactive-banana
-  - reactive-banana-automation
-  - reactive-banana-bunch
-  - reactive-banana-gi-gtk
-  - reactive-banana-sdl
-  - reactive-banana-sdl2
-  - reactive-banana-threepenny
-  - reactive-banana-wx
-  - reactive-fieldtrip
-  - reactive-glut
-  - reactive-jack
-  - reactive-midyim
-  - reactive-thread
-  - reactor
-  - read-bounded
-  - read-ctags
-  - read-io
-  - readline
-  - readline-statevar
-  - readme-lhs
-  - readpyc
-  - readshp
-  - really-simple-xml-parser
-  - reanimate
-  - reasonable-lens
-  - record
-  - record-aeson
-  - record-encode
-  - record-gl
-  - record-preprocessor
-  - record-syntax
-  - records
-  - records-th
-  - recursors
-  - reddit
-  - redis
-  - redis-hs
-  - redis-io
-  - redis-simple
-  - rediscaching-haxl
-  - redland
-  - Redmine
-  - reduce-equations
-  - reedsolomon
-  - reenact
-  - Ref
-  - ref
-  - ref-extras
-  - ref-mtl
-  - refcount
-  - Referees
-  - references
-  - refh
-  - refined-http-api-data
-  - reflection-extras
-  - reflex-animation
-  - reflex-backend-socket
-  - reflex-backend-wai
-  - reflex-basic-host
-  - reflex-dom-retractable
-  - reflex-dom-svg
-  - reflex-dynamic-containers
-  - reflex-fsnotify
-  - reflex-gadt-api
-  - reflex-ghci
-  - reflex-gloss
-  - reflex-gloss-scene
-  - reflex-libtelnet
-  - reflex-orphans
-  - reflex-process
-  - reflex-sdl2
-  - reflex-test-host
-  - reflex-transformers
-  - reflex-vty
-  - reformat
-  - refresht
-  - refurb
-  - reg-alloc
-  - reg-alloc-graph-color
-  - regex-deriv
-  - regex-dfa
-  - regex-generator
-  - regex-parsec
-  - regex-pcre-text
-  - regex-pderiv
-  - regex-posix-unittest
-  - regex-tdfa-pipes
-  - regex-tdfa-quasiquoter
-  - regex-tdfa-rc
-  - regex-tdfa-text
-  - regex-tdfa-unittest
-  - regex-tdfa-utf8
-  - regex-tre
-  - regex-type
-  - regex-wrapper
-  - regex-xmlschema
-  - regexp-tries
-  - regexpr-symbolic
-  - regexqq
-  - regional-pointers
-  - regions
-  - regions-monadsfd
-  - regions-monadstf
-  - regions-mtl
-  - register-machine-typelevel
-  - registry
-  - registry-hedgehog
-  - regress
-  - regular
-  - regular-extras
-  - regular-web
-  - regular-xmlpickler
-  - reheat
-  - rehoo
-  - rei
-  - reified-records
-  - reify
-  - relacion
-  - relation
-  - relational-postgresql8
-  - relational-query-postgresql-pure
-  - relative-date
-  - relevant-time
-  - reload
-  - remark
-  - remarks
-  - remote
-  - remote-debugger
-  - remote-json
-  - remote-json-client
-  - remote-json-server
-  - remote-monad
-  - remotion
-  - repa-array
-  - repa-bytestring
-  - repa-convert
-  - repa-devil
-  - repa-eval
-  - repa-flow
-  - repa-linear-algebra
-  - repa-plugin
-  - repa-series
-  - repa-stream
-  - repa-v4l2
-  - repl
-  - RepLib
-  - replica
-  - replicant
-  - ReplicateEffects
-  - repo-based-blog
-  - repr
-  - representable-functors
-  - representable-tries
-  - reprinter
-  - reproject
-  - req-conduit
-  - req-oauth2
-  - req-url-extra
-  - request-monad
-  - require
-  - rescue
-  - reserve
-  - reservoir
-  - resin
-  - resistor-cube
-  - resolve
-  - resolve-trivial-conflicts
-  - resource-effect
-  - resource-embed
-  - resource-pool-catchio
-  - resource-simple
-  - respond
-  - rest-client
-  - rest-core
-  - rest-example
-  - rest-gen
-  - rest-happstack
-  - rest-snap
-  - rest-stringmap
-  - rest-types
-  - rest-wai
-  - restful-snap
-  - restricted-workers
-  - restyle
-  - rethinkdb
-  - rethinkdb-client-driver
-  - rethinkdb-model
-  - rethinkdb-wereHamster
-  - retryer
-  - reverse-geocoding
-  - reversi
-  - ReviewBoard
-  - rewrite
-  - rewrite-inspector
-  - rewriting
-  - rezoom
-  - rfc
-  - rfc-env
-  - rfc-http-client
-  - rfc-prelude
-  - rfc-psql
-  - rfc-redis
-  - rfc-servant
-  - rhythm-game-tutorial
-  - ribbit
-  - RichConditional
-  - ridley
-  - ridley-extras
-  - riemann
-  - riff
-  - ring-buffer
-  - ring-buffers
-  - riot
-  - risc-v
-  - risc386
-  - riscv-isa
-  - Ritt-Wu
-  - rivers
-  - rivet
-  - rivet-migration
-  - rivet-simple-deploy
-  - RJson
-  - rl-satton
-  - Rlang-QQ
-  - rlglue
-  - RLP
-  - rlwe-challenges
-  - rmonad
-  - RMP
-  - RNAdesign
-  - RNAdraw
-  - RNAFold
-  - RNAFoldProgs
-  - RNAlien
-  - RNAwolf
-  - rncryptor
-  - rng-utils
-  - rob
-  - robin
-  - roboservant
-  - robots-txt
-  - roc-cluster
-  - roc-cluster-demo
-  - rock
-  - rocksdb-haskell
-  - rocksdb-query
-  - roku-api
-  - rollbar
-  - rollbar-hs
-  - roller
-  - RollingDirectory
-  - ron
-  - ron-rdt
-  - ron-schema
-  - ron-storage
-  - rope
-  - rose-trees
-  - rose-trie
-  - roshask
-  - rosmsg
-  - rosmsg-bin
-  - rosso
-  - rotating-log
-  - rounding
-  - roundtrip
-  - roundtrip-aeson
-  - roundtrip-string
-  - roundtrip-xml
-  - route-planning
-  - rowrecord
-  - rpc
-  - rpc-framework
-  - rpf
-  - rpm
-  - rrule
-  - rsagl
-  - rsagl-frp
-  - rsagl-math
-  - rspp
-  - rss-conduit
-  - rss2irc
-  - rstream
-  - rtcm
-  - RtMidi
-  - rtnetlink
-  - rtorrent-rpc
-  - rts-loader
-  - ruby-marshal
-  - ruby-qq
-  - ruin
-  - ruler
-  - ruler-core
-  - run-st
-  - rungekutta
-  - runhs
-  - runmany
-  - runtime-arbitrary
-  - rvar
-  - rws
-  - RxHaskell
-  - s-expression
-  - S3
-  - SableCC2Hs
-  - safe-buffer-monad
-  - safe-coerce
-  - safe-failure-cme
-  - safe-freeze
-  - safe-globals
-  - safe-lazy-io
-  - safe-length
-  - safe-plugins
-  - safe-printf
-  - safecopy-migrate
-  - safecopy-store
-  - safeint
-  - safepath
-  - safer-file-handles
-  - safer-file-handles-bytestring
-  - safer-file-handles-text
-  - saferoute
-  - sai-shape-syb
-  - sajson
-  - sak
-  - salak-toml
-  - Salsa
-  - saltine-quickcheck
-  - salvia
-  - salvia-demo
-  - salvia-extras
-  - salvia-protocol
-  - salvia-sessions
-  - salvia-websocket
-  - samtools
-  - samtools-conduit
-  - samtools-enumerator
-  - samtools-iteratee
-  - sandlib
-  - sandman
-  - sarasvati
-  - sarsi
-  - sasl
-  - sat
-  - sat-micro-hs
-  - satchmo
-  - satchmo-backends
-  - satchmo-examples
-  - satchmo-funsat
-  - satchmo-minisat
-  - satchmo-toysat
-  - Saturnin
-  - savage
-  - sax
-  - SBench
-  - sbvPlugin
-  - sc2-lowlevel
-  - sc2-proto
-  - sc2-support
-  - sc3-rdu
-  - scalable-server
-  - scaleimage
-  - SCalendar
-  - scalendar
-  - scalp-webhooks
-  - scalpel-search
-  - scan-vector-machine
-  - scc
-  - scenegraph
-  - scgi
-  - schedevr
-  - schedule-planner
-  - scheduler
-  - schedyield
-  - schema
-  - schemas
-  - schematic
-  - scholdoc
-  - scholdoc-citeproc
-  - scholdoc-texmath
-  - scholdoc-types
-  - sci-ratio
-  - SciBaseTypes
-  - scidb-hquery
-  - scientific-notation
-  - SciFlow
-  - SciFlow-drmaa
-  - scion
-  - scion-browser
-  - scons2dot
-  - scope
-  - scope-cairo
-  - scottish
-  - scotty-binding-play
-  - scotty-blaze
-  - scotty-fay
-  - scotty-form
-  - scotty-format
-  - scotty-hastache
-  - scotty-haxl
-  - scotty-resource
-  - scotty-rest
-  - scotty-session
-  - scotty-view
-  - scp-streams
-  - scrabble-bot
-  - scrapbook
-  - scrape-changes
-  - ScratchFs
-  - script-monad
-  - SCRIPTWriter
-  - scrobble
-  - Scurry
-  - scythe
-  - scyther-proof
-  - sde-solver
-  - sdl2-cairo-image
-  - sdl2-compositor
-  - sdl2-fps
-  - sdr
-  - seakale
-  - seakale-postgresql
-  - seakale-tests
-  - sec
-  - secdh
-  - seclib
-  - second-transfer
-  - secp256k1
-  - secp256k1-legacy
-  - secret-santa
-  - secret-sharing
-  - secrm
-  - secure-sockets
-  - secureUDP
-  - sednaDBXML
-  - seitz-symbol
-  - selectors
-  - SelectSequencesFromMSA
-  - selenium
-  - selenium-server
-  - self-extract
-  - selinux
-  - semantic-source
-  - Semantique
-  - semdoc
-  - semi-iso
-  - semialign-extras
-  - semibounded-lattices
-  - Semigroup
-  - semigroupoids-syntax
-  - semigroups-actions
-  - semiring
-  - semiring-num
-  - sendgrid-haskell
-  - sendgrid-v3
-  - sensei
-  - sensenet
-  - sensu-run
-  - sentence-jp
-  - sentry
-  - seonbi
-  - seqaid
-  - SeqAlign
-  - seqloc
-  - seqloc-datafiles
-  - sequent-core
-  - sequor
-  - serialize-instances
-  - serokell-util
-  - serpentine
-  - serv
-  - serv-wai
-  - servant-aeson-specs
-  - servant-auth-cookie
-  - servant-auth-docs
-  - servant-auth-hmac
-  - servant-auth-token
-  - servant-auth-token-acid
-  - servant-auth-token-api
-  - servant-auth-token-leveldb
-  - servant-auth-token-persistent
-  - servant-auth-token-rocksdb
-  - servant-avro
-  - servant-client-js
-  - servant-client-namedargs
-  - servant-csharp
-  - servant-db
-  - servant-db-postgresql
-  - servant-dhall
-  - servant-ede
-  - servant-errors
-  - servant-examples
-  - servant-exceptions
-  - servant-generate
-  - servant-generic
-  - servant-github
-  - servant-github-webhook
-  - servant-haxl-client
-  - servant-hmac-auth
-  - servant-http-streams
-  - servant-http2-client
-  - servant-iCalendar
-  - servant-jquery
-  - servant-jsonrpc
-  - servant-jsonrpc-client
-  - servant-jsonrpc-server
-  - servant-kotlin
-  - servant-matrix-param
-  - servant-namedargs
-  - servant-nix
-  - servant-openapi3
-  - servant-pandoc
-  - servant-pool
-  - servant-postgresql
-  - servant-proto-lens
-  - servant-pushbullet-client
-  - servant-py
-  - servant-quickcheck
-  - servant-rawm-client
-  - servant-rawm-docs
-  - servant-rawm-server
-  - servant-reason
-  - servant-reflex
-  - servant-router
-  - servant-scotty
-  - servant-server-namedargs
-  - servant-smsc-ru
-  - servant-streaming
-  - servant-streaming-client
-  - servant-streaming-docs
-  - servant-streaming-server
-  - servant-swagger-tags
-  - servant-to-elm
-  - servant-waargonaut
-  - servant-zeppelin
-  - servant-zeppelin-client
-  - servant-zeppelin-server
-  - servant-zeppelin-swagger
-  - server-generic
-  - serversession-backend-acid-state
-  - serversession-backend-persistent
-  - serversession-backend-redis
-  - serversession-frontend-yesod
-  - services
-  - ses-html-snaplet
-  - SessionLogger
-  - sessions
-  - sessiontypes
-  - sessiontypes-distributed
-  - set-of
-  - set-with
-  - setdown
-  - setoid
-  - setters
-  - sexp
-  - sexpr-parser
-  - sext
-  - SFML
-  - SFML-control
-  - sfmt
-  - sfnt2woff
-  - SFont
-  - SG
-  - sgd
-  - SGdemo
-  - sgf
-  - SGplus
-  - sgrep
-  - sh2md
-  - sha-streams
-  - sha1
-  - shade
-  - shadower
-  - shake-bindist
-  - shake-cabal-build
-  - shake-dhall
-  - shake-extras
-  - shake-futhark
-  - shake-minify
-  - shake-pack
-  - shake-path
-  - shake-persist
-  - shake-plus-extended
-  - shakebook
-  - shaker
-  - shakespeare-babel
-  - shakespeare-sass
-  - shannon-fano
-  - shapefile
-  - shapely-data
-  - shared-buffer
-  - shared-fields
-  - she
-  - shelduck
-  - shell-pipe
-  - Shellac
-  - Shellac-compatline
-  - Shellac-editline
-  - Shellac-haskeline
-  - Shellac-readline
-  - shellish
-  - shellmate
-  - shellmate-extras
-  - shimmer
-  - shine-examples
-  - shivers-cfg
-  - shoap
-  - shopify
-  - shortcut-links
-  - shorten-strings
-  - ShortestPathProblems
-  - show-prettyprint
-  - showdown
-  - Shpadoinkle
-  - Shpadoinkle-backend-pardiff
-  - Shpadoinkle-backend-snabbdom
-  - Shpadoinkle-backend-static
-  - Shpadoinkle-examples
-  - Shpadoinkle-html
-  - Shpadoinkle-lens
-  - Shpadoinkle-router
-  - Shpadoinkle-widgets
-  - shpider
-  - shuffle
-  - si-clock
-  - sibe
-  - sifflet
-  - sifflet-lib
-  - sigma-ij
-  - signable
-  - signals
-  - signed-multiset
-  - silkscreen
-  - silvi
-  - simd
-  - simgi
-  - simple
-  - simple-actors
-  - simple-atom
-  - simple-bluetooth
-  - simple-c-value
-  - simple-conduit
-  - simple-config
-  - simple-css
-  - simple-download
-  - simple-effects
-  - simple-eval
-  - simple-firewire
-  - simple-genetic-algorithm
-  - simple-index
-  - simple-log-syslog
-  - simple-logger
-  - simple-logging
-  - simple-money
-  - simple-neural-networks
-  - simple-nix
-  - simple-pascal
-  - simple-pipe
-  - simple-postgresql-orm
-  - simple-rope
-  - simple-server
-  - simple-session
-  - simple-stacked-vm
-  - simple-tabular
-  - simple-tar
-  - simple-ui
-  - simple-units
-  - simple-vec3
-  - simple-zipper
-  - simpleargs
-  - simpleconfig
-  - SimpleGL
-  - simpleirc
-  - simpleirc-lens
-  - SimpleLog
-  - simplenote
-  - simpleprelude
-  - SimpleServer
-  - simplesmtpclient
-  - simseq
-  - singleton-dict
-  - singleton-typelits
-  - singnal
-  - singular-factory
-  - sink
-  - siphon
-  - siren-json
-  - sirkel
-  - sitepipe
-  - sixfiguregroup
-  - sized-grid
-  - sized-types
-  - sized-vector
-  - sizes
-  - sjsp
-  - skeletal-set
-  - skeleton
-  - skeletons
-  - skell
-  - skemmtun
-  - skews
-  - skulk
-  - skylark-client
-  - skylighting-lucid
-  - skype4hs
-  - slack
-  - slack-notify-haskell
-  - slack-web
-  - slave-thread
-  - sliceofpy
-  - slidemews
-  - Slides
-  - slim
-  - slip32
-  - sloane
-  - slot-lambda
-  - sloth
-  - slug
-  - slynx
-  - small-bytearray-builder
-  - smallarray
-  - smallcheck-laws
-  - smallcheck-lens
-  - smallcheck-series
-  - smallpt-hs
-  - smallstring
-  - smap
-  - smartcheck
-  - smartconstructor
-  - smartGroup
-  - smartword
-  - smash-optics
-  - smcdel
-  - sme
-  - smerdyakov
-  - smiles
-  - smith
-  - smith-cli
-  - smith-client
-  - Smooth
-  - smsaero
-  - smt-lib
-  - SmtLib
-  - smtlib2
-  - smtlib2-debug
-  - smtlib2-pipe
-  - smtlib2-quickcheck
-  - smtlib2-timing
-  - smtp-mail-ng
-  - SMTPClient
-  - smtps-gmail
-  - smuggler
-  - smuggler2
-  - snake
-  - snake-game
-  - snap-accept
-  - snap-auth-cli
-  - snap-blaze-clay
-  - snap-configuration-utilities
-  - snap-error-collector
-  - snap-extras
-  - snap-loader-dynamic
-  - snap-loader-static
-  - snap-routes
-  - snap-stream
-  - snap-testing
-  - snap-utils
-  - snap-web-routes
-  - snaplet-acid-state
-  - snaplet-actionlog
-  - snaplet-amqp
-  - snaplet-auth-acid
-  - snaplet-coffee
-  - snaplet-css-min
-  - snaplet-customauth
-  - snaplet-environments
-  - snaplet-fay
-  - snaplet-hasql
-  - snaplet-haxl
-  - snaplet-hdbc
-  - snaplet-hslogger
-  - snaplet-i18n
-  - snaplet-influxdb
-  - snaplet-mandrill
-  - snaplet-mongoDB
-  - snaplet-mongodb-minimalistic
-  - snaplet-mysql-simple
-  - snaplet-oauth
-  - snaplet-persistent
-  - snaplet-postgresql-simple
-  - snaplet-postmark
-  - snaplet-purescript
-  - snaplet-recaptcha
-  - snaplet-redis
-  - snaplet-redson
-  - snaplet-rest
-  - snaplet-riak
-  - snaplet-sass
-  - snaplet-scoped-session
-  - snaplet-sedna
-  - snaplet-ses-html
-  - snaplet-sqlite-simple
-  - snaplet-sqlite-simple-jwt-auth
-  - snaplet-stripe
-  - snaplet-tasks
-  - snaplet-typed-sessions
-  - snaplet-wordpress
-  - snappy-conduit
-  - snappy-iteratee
-  - sndfile-enumerators
-  - sneakyterm
-  - SNet
-  - snipcheck
-  - snm
-  - snmp
-  - snorkels
-  - snow-white
-  - snowflake-core
-  - snowflake-server
-  - snowtify
-  - Snusmumrik
-  - SoccerFun
-  - SoccerFunGL
-  - socket-activation
-  - socket-io
-  - socket-sctp
-  - socket-unix
-  - socketed
-  - socketio
-  - sockets
-  - socketson
-  - sodium
-  - soegtk
-  - softfloat-hs
-  - solga
-  - solga-swagger
-  - solr
-  - sonic-visualiser
-  - Sonnex
-  - SoOSiM
-  - sorted
-  - sorting
-  - sorty
-  - souffle-haskell
-  - sound-collage
-  - sounddelay
-  - soundgen
-  - source-code-server
-  - SourceGraph
-  - sousit
-  - soyuz
-  - SpaceInvaders
-  - spacepart
-  - SpacePrivateers
-  - spake2
-  - spanout
-  - sparkle
-  - sparrow
-  - spars
-  - sparse
-  - sparse-lin-alg
-  - sparsebit
-  - sparsecheck
-  - sparser
-  - spata
-  - special-functors
-  - special-keys
-  - specialize-th
-  - species
-  - spectral-clustering
-  - speculation
-  - speculation-transformers
-  - speechmatics
-  - speedy-slice
-  - spelling-suggest
-  - sphero
-  - sphinx
-  - sphinx-cli
-  - sphinxesc
-  - spice
-  - SpinCounter
-  - spir-v
-  - spiros
-  - splay
-  - splaytree
-  - splines
-  - split-morphism
-  - splitter
-  - Spock
-  - Spock-api-ghcjs
-  - Spock-api-server
-  - Spock-auth
-  - Spock-digestive
-  - Spock-lucid
-  - Spock-worker
-  - spoonutil
-  - spoty
-  - Sprig
-  - sprinkles
-  - spritz
-  - sproxy
-  - sproxy-web
-  - sproxy2
-  - spsa
-  - spy
-  - sql-simple
-  - sql-simple-mysql
-  - sql-simple-pool
-  - sql-simple-postgresql
-  - sql-simple-sqlite
-  - sqlcipher
-  - sqlite
-  - sqlite-simple-errors
-  - sqlite-simple-typed
-  - sqlvalue-list
-  - sqsd-local
-  - squeal-postgresql
-  - squeeze
-  - sr-extra
-  - srcinst
-  - sscan
-  - sscgi
-  - ssh
-  - ssh-tunnel
-  - sshd-lint
-  - sssp
-  - sstable
-  - SSTG
-  - st2
-  - stable-heap
-  - stable-maps
-  - stable-marriage
-  - stable-memo
-  - stable-tree
-  - stack-bump
-  - stack-fix
-  - stack-hpc-coveralls
-  - stack-lib
-  - stack-network
-  - stack-prism
-  - stack-run
-  - stack-run-auto
-  - stack-type
-  - stack-wrapper
-  - stack2cabal
-  - stack2nix
-  - stackage
-  - stackage-build-plan
-  - stackage-cabal
-  - stackage-cli
-  - stackage-curator
-  - stackage-metadata
-  - stackage-query
-  - stackage-sandbox
-  - stackage-setup
-  - stackage-to-hackage
-  - stackage-types
-  - stackage-upload
-  - stackage2nix
-  - standalone-derive-topdown
-  - standalone-haddock
-  - starling
-  - stash
-  - Stasis
-  - state
-  - state-bag
-  - state-plus
-  - state-record
-  - stateful-mtl
-  - stateWriter
-  - static
-  - static-canvas
-  - static-closure
-  - static-tensor
-  - static-text
-  - statistics-dirichlet
-  - statistics-fusion
-  - statistics-hypergeometric-genvar
-  - stats
-  - statsd
-  - statsd-client
-  - statsdi
-  - statvfs
-  - stb-image-redux
-  - stc-lang
-  - stdata
-  - stdf
-  - stdio
-  - steambrowser
-  - stego-uuid
-  - stemmer
-  - stemmer-german
-  - stepwise
-  - stern-brocot
-  - stgi
-  - STL
-  - STLinkUSB
-  - stm-actor
-  - stm-chunked-queues
-  - stm-containers
-  - stm-firehose
-  - stm-hamt
-  - stm-promise
-  - stm-stats
-  - stm-supply
-  - STM32-Zombie
-  - stmcontrol
-  - stochastic
-  - StockholmAlignment
-  - Stomp
-  - storable
-  - storable-static-array
-  - storablevector-streamfusion
-  - store-streaming
-  - stp
-  - str
-  - Strafunski-ATermLib
-  - Strafunski-Sdf2Haskell
-  - StrappedTemplates
-  - stratum-tool
-  - stratux
-  - stratux-demo
-  - stratux-websockets
-  - stream
-  - stream-fusion
-  - stream-monad
-  - streamdeck
-  - streamed
-  - streaming-brotli
-  - streaming-cassava
-  - streaming-conduit
-  - streaming-fft
-  - streaming-lzma
-  - streaming-png
-  - streaming-process
-  - streaming-sort
-  - streamly-archive
-  - streamly-lmdb
-  - streamproc
-  - strelka
-  - strict-data
-  - strict-lens
-  - strict-optics
-  - strict-tuple-lens
-  - StrictBench
-  - StrictCheck
-  - strictly
-  - string-isos
-  - string-quote
-  - string-typelits
-  - stringlike
-  - stringtable-atom
-  - stripe
-  - stripe-core
-  - stripe-haskell
-  - stripe-http-client
-  - stripe-http-streams
-  - stripe-scotty
-  - stripe-signature
-  - stripe-tests
-  - strongswan-sql
-  - structural-induction
-  - structural-traversal
-  - structured-mongoDB
-  - structures
-  - stt
-  - stunclient
-  - stunts
-  - stutter
-  - stylish-cabal
-  - stylist
-  - stylized
-  - sub-state
-  - subhask
-  - subleq-toolchain
-  - submark
-  - subsample
-  - substring-parser
-  - subwordgraph
-  - successors
-  - suffix-array
-  - suffixarray
-  - SuffixStructures
-  - sugarhaskell
-  - suitable
-  - sump
-  - sunlight
-  - sunroof-compiler
-  - sunroof-examples
-  - sunroof-server
-  - super-user-spark
-  - superbubbles
-  - supercollider-ht
-  - supercollider-midi
-  - superconstraints
-  - superevent
-  - supermonad
-  - supernova
-  - supero
-  - supervisor
-  - supervisors
-  - supplemented
-  - surjective
-  - sv
-  - sv-svfactor
-  - SVD2HS
-  - svfactor
-  - svg-builder-fork
-  - SVG2Q
-  - svg2q
-  - svgcairo
-  - svgutils
-  - svm-light-utils
-  - svm-simple
-  - svndump
-  - swagger-petstore
-  - swagger-test
-  - swapper
-  - swearjure
-  - swf
-  - swift-lda
-  - swiss-ephemeris
-  - sws
-  - syb-extras
-  - syb-with-class-instances-text
-  - SybWidget
-  - syfco
-  - sylvia
-  - sym
-  - sym-plot
-  - symantic
-  - symantic-atom
-  - symantic-http-test
-  - symantic-lib
-  - symantic-xml
-  - symbiote
-  - symbolic-link
-  - symengine
-  - symengine-hs
-  - symmetry-operations-symbols
-  - sync
-  - sync-mht
-  - syncthing-hs
-  - syntactic
-  - syntax
-  - syntax-attoparsec
-  - syntax-example
-  - syntax-example-json
-  - syntax-pretty
-  - syntax-printer
-  - syntax-trees
-  - syntax-trees-fork-bairyn
-  - SyntaxMacros
-  - syntaxnet-haskell
-  - synthesizer
-  - synthesizer-llvm
-  - sys-process
-  - Sysmon
-  - system-canonicalpath
-  - system-command
-  - system-extra
-  - system-inotify
-  - system-lifted
-  - system-linux-proc
-  - system-locale
-  - system-random-effect
-  - systemstats
-  - t-regex
-  - t3-client
-  - t3-server
-  - ta
-  - table
-  - table-layout
-  - table-tennis
-  - tableaux
-  - Tables
-  - tables
-  - tablestorage
-  - Tablify
-  - tabloid
-  - tabs
-  - taffybar
-  - tag-bits
-  - tag-stream
-  - tagged-exception-core
-  - tagged-list
-  - tagged-th
-  - tagged-timers
-  - taglib-api
-  - tagsoup-ht
-  - tagsoup-megaparsec
-  - tagsoup-navigate
-  - tagsoup-parsec
-  - tagsoup-selection
-  - tagstew
-  - tagstream-conduit
-  - tai64
-  - takahashi
-  - Takusen
-  - takusen-oracle
-  - tal
-  - tamarin-prover
-  - tamarin-prover-term
-  - tamarin-prover-theory
-  - tamarin-prover-utils
-  - Tape
-  - tapioca
-  - tar-bytestring
-  - target
-  - tart
-  - task
-  - task-distribution
-  - taskell
-  - TaskMonad
-  - tasty-auto
-  - tasty-bdd
-  - tasty-fail-fast
-  - tasty-groundhog-converters
-  - tasty-hedgehog-coverage
-  - tasty-integrate
-  - tasty-jenkins-xml
-  - tasty-laws
-  - tasty-lens
-  - tasty-mgolden
-  - tasty-quickcheck-laws
-  - tasty-stats
-  - tateti-tateti
-  - Taxonomy
-  - TaxonomyTools
-  - TBC
-  - TBit
-  - tbox
-  - tcache-AWS
-  - tccli
-  - tcod-haskell
-  - tcp
-  - tcp-streams-openssl
-  - tdd-util
-  - tds
-  - TeaHS
-  - teams
-  - teeth
-  - telegram
-  - telegram-api
-  - telegram-bot
-  - telegram-bot-simple
-  - telegram-raw-api
-  - telegram-types
-  - teleport
-  - teleshell
-  - tellbot
-  - tempi
-  - template-default
-  - template-haskell-optics
-  - template-haskell-util
-  - template-hsml
-  - template-yj
-  - templateify
-  - templatepg
-  - tempodb
-  - temporal-csound
-  - tempus
-  - tensor
-  - tensor-safe
-  - tensorflow
-  - tensorflow-core-ops
-  - tensorflow-logging
-  - tensorflow-opgen
-  - tensorflow-ops
-  - termbox
-  - termbox-banana
-  - termbox-bindings
-  - terminal-text
-  - termination-combinators
-  - termplot
-  - terntup
-  - terrahs
-  - tersmu
-  - test-fixture
-  - test-framework-doctest
-  - test-framework-quickcheck
-  - test-framework-sandbox
-  - test-framework-skip
-  - test-framework-testing-feat
-  - test-pkg
-  - test-sandbox
-  - test-sandbox-compose
-  - test-sandbox-hunit
-  - test-sandbox-quickcheck
-  - test-shouldbe
-  - test-simple
-  - testbench
-  - testCom
-  - testcontainers
-  - TestExplode
-  - testloop
-  - testpack
-  - testpattern
-  - testrunner
-  - TeX-my-math
-  - tex2txt
-  - texbuilder
-  - text-all
-  - text-and-plots
-  - text-ansi
-  - text-containers
-  - text-format-heavy
-  - text-generic-pretty
-  - text-icu-normalized
-  - text-lens
-  - text-lips
-  - text-locale-encoding
-  - text-markup
-  - text-normal
-  - text-offset
-  - text-plus
-  - text-position
-  - text-register-machine
-  - text-time
-  - text-trie
-  - text-utf8
-  - text-utils
-  - text-xml-qq
-  - text-zipper-monad
-  - text1
-  - textmatetags
-  - textocat-api
-  - textual
-  - tfp-th
-  - tftp
-  - tga
-  - th-alpha
-  - th-build
-  - th-context
-  - th-dict-discovery
-  - th-fold
-  - th-format
-  - th-instances
-  - th-kinds
-  - th-kinds-fork
-  - th-lego
-  - th-pprint
-  - th-sccs
-  - th-tc
-  - th-to-exp
-  - th-traced
-  - th-typegraph
-  - thank-you-stars
-  - theatre
-  - thentos-cookie-session
-  - Theora
-  - theoremquest
-  - theoremquest-client
-  - thih
-  - thimk
-  - Thingie
-  - thorn
-  - threadmanager
-  - threepenny-editors
-  - threepenny-gui-contextmenu
-  - threepenny-gui-flexbox
-  - thrift
-  - throttled-io-loop
-  - through-text
-  - thumbnail-plus
-  - thumbnail-polish
-  - tic-tac-toe
-  - tickle
-  - TicTacToe
-  - tictactoe3d
-  - tidal-midi
-  - tidal-serial
-  - tidal-vis
-  - tie-knot
-  - tiempo
-  - tiger
-  - tightrope
-  - tighttp
-  - timberc
-  - time-extras
-  - time-exts
-  - time-http
-  - time-io-access
-  - time-machine
-  - time-qq
-  - time-quote
-  - time-recurrence
-  - time-series
-  - time-series-lib
-  - time-w3c
-  - time-warp
-  - timecalc
-  - timemap
-  - timeout
-  - timeout-with-results
-  - timeparsers
-  - TimePiece
-  - timeplot
-  - timeprint
-  - timer-wheel
-  - timeseries
-  - timespan
-  - timeutils
-  - timezone-detect
-  - timezone-olson-th
-  - timezone-unix
-  - tini
-  - tintin
-  - tiny-scheduler
-  - TinyLaunchbury
-  - tinyMesh
-  - tinytemplate
-  - TinyURL
-  - tinyXml
-  - tip-haskell-frontend
-  - tip-lib
-  - titan
-  - titan-debug-yampa
-  - titan-record-yampa
-  - Titim
-  - tkhs
-  - tkyprof
-  - tldr
-  - tls-extra
-  - tlynx
-  - tmp-postgres
-  - tn
-  - to-haskell
-  - to-string-class
-  - to-string-instances
-  - toboggan
-  - todo
-  - todos
-  - tofromxml
-  - toilet
-  - token-search
-  - tokenify
-  - tokenizer-streaming
-  - tokstyle
-  - toktok
-  - tokyocabinet-haskell
-  - tokyotyrant-haskell
-  - tomato-rubato-openal
-  - toml
-  - tonatona-google-server-api
-  - tonatona-persistent-postgresql
-  - too-many-cells
-  - toodles
-  - Top
-  - top
-  - topkata
-  - torch
-  - TORCS
-  - total-map
-  - TotalMap
-  - touched
-  - Tournament
-  - toxcore
-  - toxcore-c
-  - toxiproxy-haskell
-  - toysolver
-  - tpar
-  - tpb
-  - tptp
-  - trace
-  - trace-call
-  - trace-function-call
-  - traced
-  - tracetree
-  - tracing
-  - tracked-files
-  - tracker
-  - trackit
-  - traction
-  - tracy
-  - trade-journal
-  - traildb
-  - trajectory
-  - transactional-events
-  - transf
-  - transfer-db
-  - transformations
-  - TransformeR
-  - transformers-abort
-  - transformers-compose
-  - transformers-convert
-  - transformers-lift
-  - transformers-runnable
-  - TransformersStepByStep
-  - transient
-  - transient-universe
-  - transient-universe-tls
-  - translatable-intset
-  - translate
-  - translate-cli
-  - trasa
-  - trasa-client
-  - trasa-extra
-  - trasa-form
-  - trasa-server
-  - trasa-th
-  - travis
-  - travis-meta-yaml
-  - trawl
-  - traypoweroff
-  - treap
-  - tree-monad
-  - tree-render-text
-  - tree-traversals
-  - TreeCounter
-  - treemap-html
-  - treemap-html-tools
-  - TreeStructures
-  - Treiber
-  - trek-app
-  - trek-db
-  - tremulous-query
-  - TrendGraph
-  - trhsx
-  - triangulation
-  - TrieMap
-  - tries
-  - trigger
-  - trim
-  - trimpolya
-  - tripLL
-  - trivia
-  - tropical
-  - tropical-geometry
-  - true-name
-  - truelevel
-  - trurl
-  - tsession
-  - tsession-happstack
-  - tsp-viz
-  - tsparse
-  - tsuntsun
-  - tsvsql
-  - tsweb
-  - ttask
-  - ttn-client
-  - tttool
-  - tubes
-  - tuntap
-  - tuntap-simple
-  - tup-functor
-  - tuple-gen
-  - tuple-lenses
-  - tuple-morph
-  - tuple-ops
-  - tupleinstances
-  - turing-machines
-  - turing-music
-  - turingMachine
-  - turtle-options
-  - tweak
-  - twee
-  - tweet-hs
-  - twentefp-eventloop-graphics
-  - twentefp-eventloop-trees
-  - twentefp-graphs
-  - twentefp-rosetree
-  - twentefp-trees
-  - twentefp-websockets
-  - twentyseven
-  - twfy-api-client
-  - twhs
-  - twidge
-  - twilight-stm
-  - twilio
-  - twill
-  - twine
-  - twirp
-  - twitter
-  - twitter-conduit
-  - twitter-enumerator
-  - twitter-feed
-  - twitter-types
-  - twitter-types-lens
-  - tx
-  - txt
-  - txtblk
-  - TYB
-  - tyfam-witnesses
-  - typalyze
-  - type-assertions
-  - type-cache
-  - type-cereal
-  - type-combinators
-  - type-combinators-quote
-  - type-combinators-singletons
-  - type-digits
-  - type-eq
-  - type-indexed-queues
-  - type-int
-  - type-interpreter
-  - type-level-bst
-  - type-level-natural-number-induction
-  - type-level-natural-number-operations
-  - type-list
-  - type-ord
-  - type-ord-spine-cereal
-  - type-prelude
-  - type-sets
-  - type-settheory
-  - type-spine
-  - type-structure
-  - type-sub-th
-  - type-tree
-  - typeable-th
-  - TypeClass
-  - typed-encoding
-  - typed-encoding-encoding
-  - typed-streams
-  - typed-wire
-  - typedflow
-  - typedquery
-  - typehash
-  - TypeIlluminator
-  - typelevel
-  - typelevel-tensor
-  - TypeNat
-  - typeparams
-  - types-compat
-  - typesafe-precure
-  - typescript-docs
-  - typograffiti
-  - tyro
-  - tz
-  - u2f
-  - uber
-  - uberlast
-  - ucam-webauth
-  - ucam-webauth-types
-  - uconv
-  - udp-conduit
-  - udp-streaming
-  - uhc-light
-  - uhc-util
-  - uhexdump
-  - uhttpc
-  - ui-command
-  - ulid
-  - UMM
-  - unagi-bloomfilter
-  - unamb-custom
-  - unbeliever
-  - unbound
-  - unbound-generics
-  - unbound-kind-generics
-  - unbounded-delays-units
-  - unboxed-containers
-  - unbreak
-  - unfix-binders
-  - unfoldable
-  - unfoldable-restricted
-  - uni-events
-  - uni-graphs
-  - uni-htk
-  - uni-posixutil
-  - uni-reactor
-  - uni-uDrawGraph
-  - uni-util
-  - unicode-normalization
-  - unicode-prelude
-  - unicode-show
-  - unicode-symbols
-  - uniform-io
-  - union
-  - union-map
-  - uniqueid
-  - uniquely-represented-sets
-  - units-attoparsec
-  - unittyped
-  - unitym-yesod
-  - universal-binary
-  - universe-th
-  - unix-fcntl
-  - unix-handle
-  - unix-process-conduit
-  - unjson
-  - unlifted-list
-  - unm-hip
-  - unordered-containers-rematch
-  - unordered-graphs
-  - unordered-intmap
-  - unpack-funcs
-  - unpacked-either
-  - unpacked-maybe
-  - unpacked-maybe-numeric
-  - unpacked-these
-  - unpacked-validation
-  - unparse-attoparsec
-  - unroll-ghc-plugin
-  - unsafely
-  - unscramble
-  - unsequential
-  - unused
-  - uom-plugin
-  - up
-  - Updater
-  - uploadcare
-  - upskirt
-  - urbit-airlock
-  - ureader
-  - urembed
-  - uri
-  - uri-conduit
-  - uri-encoder
-  - uri-enumerator
-  - uri-enumerator-file
-  - uri-parse
-  - uri-template
-  - uri-templater
-  - url-bytes
-  - url-decoders
-  - url-generic
-  - URLb
-  - urlcheck
-  - urldecode
-  - UrlDisp
-  - urldisp-happstack
-  - urlencoded
-  - urlpath
-  - URLT
-  - urn
-  - urn-random
-  - urxml
-  - usb
-  - usb-enumerator
-  - usb-hid
-  - usb-id-database
-  - usb-iteratee
-  - usb-safe
-  - useragents
-  - users-mysql-haskell
-  - users-persistent
-  - utf8-prelude
-  - utf8-validator
-  - UTFTConverter
-  - util-exception
-  - util-plus
-  - util-primitive
-  - util-primitive-control
-  - util-universe
-  - uu-cco
-  - uu-cco-examples
-  - uu-cco-hut-parsing
-  - uu-cco-uu-parsinglib
-  - uuagc
-  - uuagc-bootstrap
-  - uuagc-cabal
-  - uuagc-diagrams
-  - uuid-aeson
-  - uuid-bytes
-  - uuid-crypto
-  - uusi
-  - uvector
-  - uvector-algorithms
-  - uxadt
-  - v4l2
-  - v4l2-examples
-  - vabal
-  - vabal-lib
-  - vacuum
-  - vacuum-cairo
-  - vacuum-graphviz
-  - vacuum-opengl
-  - vacuum-ubigraph
-  - valid-names
-  - validate-input
-  - validated-types
-  - Validation
-  - validations
-  - validationt
-  - value-supply
-  - vampire
-  - var
-  - varan
-  - variable-precision
-  - variables
-  - variation
-  - vault-tool-server
-  - vault-trans
-  - vaultaire-common
-  - vcache
-  - vcache-trie
-  - vcard
-  - vcatt
-  - vcf
-  - vcsgui
-  - vcswrapper
-  - Vec-Boolean
-  - Vec-OpenGLRaw
-  - Vec-Transform
-  - vect-floating
-  - vect-floating-accelerate
-  - vect-opengl
-  - vector-bytestring
-  - vector-circular
-  - vector-clock
-  - vector-conduit
-  - vector-endian
-  - vector-fftw
-  - vector-functorlazy
-  - vector-heterogenous
-  - vector-instances-collections
-  - vector-random
-  - vector-read-instances
-  - vector-space-map
-  - vector-space-opengl
-  - vector-space-points
-  - vector-static
-  - vector-text
-  - vectortiles
-  - venzone
-  - Verba
-  - verbalexpressions
-  - verdict
-  - verdict-json
-  - verifiable-expressions
-  - verify
-  - verilog
-  - verismith
-  - versioning
-  - versioning-servant
-  - vflow-types
-  - vfr-waypoints
-  - vgrep
-  - vhd
-  - vhdl
-  - vicinity
-  - ViennaRNA-extras
-  - viewprof
-  - views
-  - vigilance
-  - Villefort
-  - vimeta
-  - vimus
-  - vintage-basic
-  - vinyl-gl
-  - vinyl-json
-  - vinyl-named-sugar
-  - vinyl-operational
-  - vinyl-plus
-  - vinyl-utils
-  - vinyl-vectors
-  - virthualenv
-  - visibility
-  - vision
-  - visual-graphrewrite
-  - visual-prof
-  - visualize-cbn
-  - vitrea
-  - vivid
-  - vivid-osc
-  - vivid-supercollider
-  - vk-aws-route53
-  - VKHS
-  - voicebase
-  - vorbiscomment
-  - vowpal-utils
-  - voyeur
-  - vpq
-  - VRML
-  - vte
-  - vtegtk3
-  - vty-examples
-  - vty-menu
-  - vty-ui
-  - vty-ui-extras
-  - waargonaut
-  - wacom-daemon
-  - waddle
-  - wahsp
-  - wai-cli
-  - wai-devel
-  - wai-git-http
-  - wai-graceful
-  - wai-handler-devel
-  - wai-handler-scgi
-  - wai-handler-snap
-  - wai-handler-webkit
-  - wai-hmac-auth
-  - wai-lens
-  - wai-lite
-  - wai-logger-buffered
-  - wai-logger-prefork
-  - wai-make-assets
-  - wai-middleware-auth
-  - wai-middleware-cache
-  - wai-middleware-cache-redis
-  - wai-middleware-catch
-  - wai-middleware-consul
-  - wai-middleware-content-type
-  - wai-middleware-crowd
-  - wai-middleware-delegate
-  - wai-middleware-etag
-  - wai-middleware-headers
-  - wai-middleware-hmac-client
-  - wai-middleware-preprocessor
-  - wai-middleware-rollbar
-  - wai-middleware-route
-  - wai-middleware-static-caching
-  - wai-middleware-travisci
-  - wai-request-spec
-  - wai-responsible
-  - wai-route
-  - wai-router
-  - wai-routes
-  - wai-routing
-  - wai-secure-cookies
-  - wai-session-alt
-  - wai-session-mysql
-  - wai-session-postgresql
-  - wai-static-cache
-  - wai-thrift
-  - wai-throttler
-  - waitfree
-  - waitra
-  - waldo
-  - wallpaper
-  - warc
-  - warp-dynamic
-  - warp-static
-  - warp-systemd
-  - warped
-  - WashNGo
-  - wasm
-  - watchdog
-  - watcher
-  - watchit
-  - WAVE
-  - WaveFront
-  - wavefront-obj
-  - wavesurfer
-  - wavy
-  - weak-bag
-  - weather-api
-  - web-css
-  - web-encodings
-  - web-inv-route
-  - web-mongrel2
-  - web-output
-  - web-page
-  - web-push
-  - web-rep
-  - web-routes-quasi
-  - web-routes-regular
-  - web-routes-transformers
-  - web-routing
-  - web3
-  - webapi
-  - webapp
-  - webauthn
-  - WebBits
-  - WebBits-Html
-  - WebBits-multiplate
-  - webby
-  - webcloud
-  - WebCont
-  - webcrank
-  - webcrank-dispatch
-  - webcrank-wai
-  - webdriver-angular
-  - webdriver-snoy
-  - webdriver-w3c
-  - WeberLogic
-  - webfinger-client
-  - webkit-javascriptcore
-  - Webrexp
-  - webserver
-  - webshow
-  - websockets-rpc
-  - webwire
-  - weekdaze
-  - weighted
-  - weighted-regexp
-  - welshy
-  - werewolf
-  - werewolf-slack
-  - what4
-  - Wheb
-  - wheb-mongo
-  - wheb-redis
-  - wheb-strapped
-  - while-lang-parser
-  - whim
-  - whiskers
-  - whitespace
-  - whois
-  - wholepixels
-  - why3
-  - WikimediaParser
-  - wikipedia4epub
-  - wild-bind-indicator
-  - wild-bind-task-x11
-  - windns
-  - windowslive
-  - winerror
-  - winery
-  - winio
-  - Wired
-  - wires
-  - wiring
-  - witty
-  - wkt
-  - wkt-geom
-  - wl-pprint-ansiterm
-  - wl-pprint-extras
-  - wl-pprint-terminfo
-  - WL500gPControl
-  - WL500gPLib
-  - wlc-hs
-  - WMSigner
-  - wobsurv
-  - woe
-  - woffex
-  - wol
-  - wolf
-  - word2vec-model
-  - WordAlignment
-  - wordify
-  - wordn
-  - WordNet
-  - WordNet-ghc74
-  - wordpass
-  - wordsearch
-  - work-time
-  - workdays
-  - Workflow
-  - workflow-extra
-  - workflow-osx
-  - workflow-pure
-  - workflow-types
-  - workflow-windows
-  - wp-archivebot
-  - wraxml
-  - wrecker
-  - wrecker-ui
-  - wreq-patchable
-  - wreq-sb
-  - wright
-  - writer-cps-full
-  - writer-cps-lens
-  - writer-cps-monads-tf
-  - writer-cps-morph
-  - ws
-  - wsdl
-  - wsedit
-  - wshterm
-  - wss-client
-  - wstunnel
-  - wtk
-  - wtk-gtk
-  - wu-wei
-  - wumpus-basic
-  - wumpus-core
-  - wumpus-drawing
-  - wumpus-microprint
-  - wumpus-tree
-  - WURFL
-  - wxAsteroids
-  - WXDiffCtrl
-  - wxdirect
-  - wxFruit
-  - WxGeneric
-  - wxhnotepad
-  - wxSimpleCanvas
-  - wxturtle
-  - wyvern
-  - x-dsp
-  - X11-extras
-  - X11-rm
-  - X11-xdamage
-  - X11-xfixes
-  - x86-64bit
-  - xchat-plugin
-  - xcp
-  - xdcc
-  - xdot
-  - Xec
-  - xenstore
-  - xfconf
-  - xformat
-  - xhaskell-library
-  - xhb
-  - xhb-atom-cache
-  - xhb-ewmh
-  - xilinx-lava
-  - xine
-  - xing-api
-  - xkbcommon
-  - xkcd
-  - xleb
-  - xls
-  - xlsior
-  - xlsx
-  - xlsx-tabular
-  - xlsx-templater
-  - xml-catalog
-  - xml-conduit-decode
-  - xml-conduit-stylist
-  - xml-enumerator
-  - xml-enumerator-combinators
-  - xml-extractors
-  - xml-html-conduit-lens
-  - xml-monad
-  - xml-parsec
-  - xml-pipe
-  - xml-prettify
-  - xml-push
-  - xml-query
-  - xml-query-xml-conduit
-  - xml-query-xml-types
-  - xml-tydom-conduit
-  - xml-tydom-core
-  - xml2json
-  - xml2x
-  - XmlHtmlWriter
-  - xmltv
-  - XMMS
-  - xmms2-client
-  - xmms2-client-glib
-  - xmonad-bluetilebranch
-  - xmonad-contrib-bluetilebranch
-  - xmonad-contrib-gpl
-  - xmonad-dbus
-  - xmonad-eval
-  - xmonad-vanessa
-  - xmonad-windownames
-  - xmpipe
-  - XMPP
-  - xor
-  - xorshift-plus
-  - Xorshift128Plus
-  - xournal-builder
-  - xournal-convert
-  - xournal-parser
-  - xournal-render
-  - xournal-types
-  - xsact
-  - XSaiga
-  - xsd
-  - xslt
-  - xtc
-  - xxhash
-  - y0l0bot
-  - yabi-muno
-  - Yablog
-  - yackage
-  - YACPong
-  - yahoo-finance-api
-  - yahoo-finance-conduit
-  - yahoo-web-search
-  - yajl
-  - yajl-enumerator
-  - yall
-  - yam
-  - yam-config
-  - yam-datasource
-  - yam-logger
-  - yam-redis
-  - yam-servant
-  - yam-transaction
-  - yam-transaction-odbc
-  - yam-transaction-postgresql
-  - yam-web
-  - yaml-pretty-extras
-  - yaml-rpc
-  - yaml-rpc-scotty
-  - yaml-rpc-snap
-  - yaml-unscrambler
-  - YamlReference
-  - Yampa
-  - yampa-canvas
-  - yampa-glfw
-  - yampa-gloss
-  - yampa-glut
-  - yampa-sdl2
-  - yampa-test
-  - yampa2048
-  - YampaSynth
-  - yandex-translate
-  - yaop
-  - yap
-  - yarr
-  - yarr-image-io
-  - yavie
-  - yaya-test
-  - yaya-unsafe-test
-  - ycextra
-  - yeamer
-  - yeller
-  - yeshql
-  - yeshql-core
-  - yeshql-hdbc
-  - yeshql-postgresql-simple
-  - yesod-angular
-  - yesod-angular-ui
-  - yesod-articles
-  - yesod-auth-account
-  - yesod-auth-account-fork
-  - yesod-auth-basic
-  - yesod-auth-bcrypt
-  - yesod-auth-bcryptdb
-  - yesod-auth-deskcom
-  - yesod-auth-fb
-  - yesod-auth-hmac-keccak
-  - yesod-auth-kerberos
-  - yesod-auth-ldap
-  - yesod-auth-ldap-mediocre
-  - yesod-auth-ldap-native
-  - yesod-auth-lti13
-  - yesod-auth-nopassword
-  - yesod-auth-oauth2
-  - yesod-auth-pam
-  - yesod-auth-smbclient
-  - yesod-auth-zendesk
-  - yesod-bootstrap
-  - yesod-colonnade
-  - yesod-comments
-  - yesod-content-pdf
-  - yesod-continuations
-  - yesod-crud
-  - yesod-crud-persist
-  - yesod-datatables
-  - yesod-dsl
-  - yesod-examples
-  - yesod-fast-devel
-  - yesod-fay
-  - yesod-fb
-  - yesod-form-richtext
-  - yesod-gitrev
-  - yesod-goodies
-  - yesod-ip
-  - yesod-job-queue
-  - yesod-links
-  - yesod-lucid
-  - yesod-mangopay
-  - yesod-markdown
-  - yesod-paginate
-  - yesod-pagination
-  - yesod-paypal-rest
-  - yesod-platform
-  - yesod-pnotify
-  - yesod-pure
-  - yesod-purescript
-  - yesod-raml
-  - yesod-raml-bin
-  - yesod-raml-docs
-  - yesod-raml-mock
-  - yesod-recaptcha
-  - yesod-routes
-  - yesod-routes-flow
-  - yesod-routes-typescript
-  - yesod-rst
-  - yesod-s3
-  - yesod-sass
-  - yesod-session-redis
-  - yesod-static-angular
-  - yesod-static-remote
-  - yesod-test-json
-  - yesod-tls
-  - yesod-vend
-  - yesod-worker
-  - yet-another-logger
-  - YFrob
-  - yggdrasil
-  - yhccore
-  - yi
-  - yi-contrib
-  - yi-core
-  - yi-dynamic-configuration
-  - yi-emacs-colours
-  - yi-frontend-pango
-  - yi-frontend-vty
-  - yi-fuzzy-open
-  - yi-ireader
-  - yi-keymap-cua
-  - yi-keymap-emacs
-  - yi-keymap-vim
-  - yi-language
-  - yi-misc-modes
-  - yi-mode-haskell
-  - yi-mode-javascript
-  - yi-monokai
-  - yi-snippet
-  - yi-solarized
-  - yi-spolsky
-  - yices
-  - yjftp
-  - yjftp-libs
-  - yoda
-  - Yogurt
-  - Yogurt-Standalone
-  - yoko
-  - york-lava
-  - yql
-  - yst
-  - yu-auth
-  - yu-core
-  - yu-launch
-  - yu-tool
-  - yu-utils
-  - yuuko
-  - yxdb-utils
-  - Z-Data
-  - Z-IO
-  - z3-encoding
-  - z85
-  - zabt
-  - zampolit
-  - zbar
-  - ZEBEDDE
-  - zendesk-api
-  - zenhack-prelude
-  - zeno
-  - zephyr
-  - zerobin
-  - zeromq-haskell
-  - zeromq3-conduit
-  - zeromq3-haskell
-  - zeromq4-clone-pattern
-  - zeromq4-conduit
-  - zeromq4-patterns
-  - zeroth
-  - zettelkast
-  - ZFS
-  - zifter
-  - zifter-cabal
-  - zifter-git
-  - zifter-google-java-format
-  - zifter-hindent
-  - zifter-hlint
-  - zifter-stack
-  - zigbee-znet25
-  - zip-conduit
-  - zipedit
-  - zipkin
-  - zipper
-  - zippo
-  - ziptastic-client
-  - ziptastic-core
-  - zlib-enum
-  - zm
-  - ZMachine
-  - zmcat
-  - zmidi-score
-  - zoneinfo
-  - zoom
-  - zoom-cache
-  - zoom-cache-pcm
-  - zoom-cache-sndfile
-  - zoom-refs
-  - zsh-battery
-  - zsyntax
-  - ztail
-  - ztar
-  - zuramaru
-  - Zwaluw
-  - zxcvbn-dvorak
-  - zxcvbn-h

From b39cad34df159df1ca41a0c52ab11146a7cc0cc8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Nov 2020 22:28:47 +0100
Subject: [PATCH 3084/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-28-gd194902 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/23790970b30e822b77684040bd0e9a09e67b5473.
---
 .../haskell-modules/hackage-packages.nix      | 17357 +---------------
 1 file changed, 23 insertions(+), 17334 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3f513f1ea0bf..927335918979 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -28,8 +28,6 @@ self: {
        ];
        description = "3D model parsers";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "4Blocks" = callPackage
@@ -45,8 +43,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "AAI" = callPackage
@@ -58,8 +54,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Abstract Application Interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ABList" = callPackage
@@ -110,8 +104,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Detect which OS you're running on";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-Colour" = callPackage
@@ -134,8 +126,6 @@ self: {
        libraryHaskellDepends = [ array base gtk ];
        description = "GTK+ pixel plotting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-HalfInteger" = callPackage
@@ -149,8 +139,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient half-integer type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-MiniTest" = callPackage
@@ -164,8 +152,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A simple test framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-PPM" = callPackage
@@ -201,8 +187,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Trivial wrapper over ansi-terminal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-VanillaArray" = callPackage
@@ -214,8 +198,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Immutable arrays with plain integer indicies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-Vector" = callPackage
@@ -229,8 +211,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient geometric vectors and transformations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-Vector-Fancy" = callPackage
@@ -242,8 +222,6 @@ self: {
        libraryHaskellDepends = [ AC-Angle AC-Vector base ];
        description = "Fancy type-system stuff for AC-Vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ACME" = callPackage
@@ -259,8 +237,6 @@ self: {
        ];
        description = "Essential features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ADPfusion" = callPackage
@@ -314,8 +290,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ForestStructures ];
        description = "Dynamic programming on tree and forest structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ADPfusionSet" = callPackage
@@ -340,8 +314,6 @@ self: {
        ];
        description = "Dynamic programming for Set data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-Basics" = callPackage
@@ -361,8 +333,6 @@ self: {
        executableHaskellDepends = [ base containers directory ];
        description = "foundational type classes for approximating exact real numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-Net" = callPackage
@@ -378,8 +348,6 @@ self: {
        ];
        description = "Compositional lazy dataflow networks for exact real number computation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-Real" = callPackage
@@ -396,8 +364,6 @@ self: {
        ];
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-Real-Double" = callPackage
@@ -421,8 +387,6 @@ self: {
        ];
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-Real-Interval" = callPackage
@@ -439,8 +403,6 @@ self: {
        ];
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-RnToRm" = callPackage
@@ -457,8 +419,6 @@ self: {
        ];
        description = "polynomial function enclosures (PFEs) approximating exact real functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-RnToRm-Plot" = callPackage
@@ -476,8 +436,6 @@ self: {
        ];
        description = "GL plotting of polynomial function enclosures (PFEs)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AES" = callPackage
@@ -519,8 +477,6 @@ self: {
        ];
        description = "A library for writing AGI scripts for Asterisk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ALUT" = callPackage
@@ -550,8 +506,6 @@ self: {
        ];
        description = "Low-level bindings for Asterisk Manager Interface (AMI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ANum" = callPackage
@@ -613,8 +567,6 @@ self: {
        libraryHaskellDepends = [ AbortT-transformers base monads-tf ];
        description = "Monads-tf instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AbortT-mtl" = callPackage
@@ -626,8 +578,6 @@ self: {
        libraryHaskellDepends = [ AbortT-transformers base mtl ];
        description = "mtl instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AbortT-transformers" = callPackage
@@ -645,8 +595,6 @@ self: {
        ];
        description = "A monad and monadic transformer providing \"abort\" functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ActionKid" = callPackage
@@ -670,8 +618,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An easy-to-use video game framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Adaptive" = callPackage
@@ -687,8 +633,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Adaptive-Blaisorblade" = callPackage
@@ -703,8 +647,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Advgame" = callPackage
@@ -718,8 +660,6 @@ self: {
        executableHaskellDepends = [ base haskell98 mtl ];
        description = "Lisperati's adventure game in Lisp translated to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Advise-me" = callPackage
@@ -749,8 +689,6 @@ self: {
        ];
        description = "Assessment services for the Advise-Me project";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AesonBson" = callPackage
@@ -787,8 +725,6 @@ self: {
        ];
        description = "Generator-generator for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Agda_2_6_1" = callPackage
@@ -885,8 +821,6 @@ self: {
        ];
        description = "Aho-Corasick string matching algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AlanDeniseEricLauren" = callPackage
@@ -908,8 +842,6 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion ];
        description = "Find the minimal subset/submap satisfying some property";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AlgoRhythm" = callPackage
@@ -938,8 +870,6 @@ self: {
        ];
        description = "Algorithmic music composition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AlgorithmW" = callPackage
@@ -953,8 +883,6 @@ self: {
        executableHaskellDepends = [ base containers mtl pretty ];
        description = "Example implementation of Algorithm W for Hindley-Milner type inference";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AlignmentAlgorithms" = callPackage
@@ -971,8 +899,6 @@ self: {
        ];
        description = "Collection of alignment algorithms";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Allure" = callPackage
@@ -1000,8 +926,6 @@ self: {
        ];
        description = "Near-future Sci-Fi roguelike and tactical squad combat game";
        license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AndroidViewHierarchyImporter" = callPackage
@@ -1021,8 +945,6 @@ self: {
        ];
        description = "Android view hierarchy importer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Animas" = callPackage
@@ -1034,8 +956,6 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "Updated version of Yampa: a library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Annotations" = callPackage
@@ -1048,8 +968,6 @@ self: {
        testHaskellDepends = [ base mtl multirec parsec ];
        description = "Constructing, analyzing and destructing annotated trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Ansi2Html" = callPackage
@@ -1095,8 +1013,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for Apple Push Notification Service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AppleScript" = callPackage
@@ -1108,8 +1024,6 @@ self: {
        doHaddock = false;
        description = "Call AppleScript from Haskell, and then call back into Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ApproxFun-hs" = callPackage
@@ -1121,8 +1035,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Function approximation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ArrayRef" = callPackage
@@ -1134,8 +1046,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unboxed references, dynamic arrays and more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ArrowVHDL" = callPackage
@@ -1147,8 +1057,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "A library to generate Netlist code from Arrow descriptions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AspectAG" = callPackage
@@ -1164,8 +1072,6 @@ self: {
        ];
        description = "Strongly typed Attribute Grammars implemented using type-level programming";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AttoBencode" = callPackage
@@ -1186,8 +1092,6 @@ self: {
        ];
        description = "Fast Bencode encoding and parsing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AttoJson" = callPackage
@@ -1204,8 +1108,6 @@ self: {
        ];
        description = "Simple lightweight JSON parser, generator & manipulator based on ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Attrac" = callPackage
@@ -1221,8 +1123,6 @@ self: {
        ];
        description = "Visualisation of Strange Attractors in 3-Dimensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Aurochs" = callPackage
@@ -1236,8 +1136,6 @@ self: {
        executableHaskellDepends = [ base containers parsec pretty ];
        description = "Yet another parser generator for C/C++";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AutoForms" = callPackage
@@ -1253,8 +1151,6 @@ self: {
        ];
        description = "GUI library based upon generic programming (SYB3)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AvlTree" = callPackage
@@ -1266,8 +1162,6 @@ self: {
        libraryHaskellDepends = [ base COrdering ];
        description = "Balanced binary trees using the AVL algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BASIC" = callPackage
@@ -1279,8 +1173,6 @@ self: {
        libraryHaskellDepends = [ base containers llvm random timeit ];
        description = "Embedded BASIC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BCMtools" = callPackage
@@ -1307,8 +1199,6 @@ self: {
        ];
        description = "Big Contact Map Tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BNFC" = callPackage
@@ -1365,8 +1255,6 @@ self: {
        libraryHaskellDepends = [ base cairo containers mtl ];
        description = "Tools for self-assembly";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Bang" = callPackage
@@ -1382,8 +1270,6 @@ self: {
        ];
        description = "A Drum Machine DSL for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Barracuda" = callPackage
@@ -1412,8 +1298,6 @@ self: {
        ];
        description = "An ad-hoc P2P chat program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Befunge93" = callPackage
@@ -1427,8 +1311,6 @@ self: {
        executableHaskellDepends = [ array base mtl random ];
        description = "An interpreter for the Befunge-93 Programming Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BenchmarkHistory" = callPackage
@@ -1446,8 +1328,6 @@ self: {
        ];
        description = "Benchmark functions with history";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BerkeleyDB" = callPackage
@@ -1474,8 +1354,6 @@ self: {
        librarySystemDepends = [ db dbxml xercesc xqilla ];
        description = "Berkeley DB XML binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) db; inherit (pkgs) dbxml; 
          inherit (pkgs) xercesc; inherit (pkgs) xqilla;};
 
@@ -1488,8 +1366,6 @@ self: {
        libraryHaskellDepends = [ base besout ];
        description = "Factorization of polynomials over finite field";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiGUL" = callPackage
@@ -1504,8 +1380,6 @@ self: {
        ];
        description = "The Bidirectional Generic Update Language";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BigPixel" = callPackage
@@ -1537,8 +1411,6 @@ self: {
        ];
        description = "Source-to-source plugin for enhancing EDSLs with static annotations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Binpack" = callPackage
@@ -1567,8 +1439,6 @@ self: {
        ];
        description = "Libary for Hidden Markov Models in HMMER3 format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Biobase" = callPackage
@@ -1590,8 +1460,6 @@ self: {
        ];
        description = "Base library for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseBlast" = callPackage
@@ -1618,8 +1486,6 @@ self: {
        ];
        description = "BLAST-related tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseDotP" = callPackage
@@ -1631,8 +1497,6 @@ self: {
        libraryHaskellDepends = [ base bytestring iteratee ];
        description = "Vienna / DotBracket / ExtSS parsers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseENA" = callPackage
@@ -1655,8 +1519,6 @@ self: {
        ];
        description = "European Nucleotide Archive data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseEnsembl" = callPackage
@@ -1674,8 +1536,6 @@ self: {
        ];
        description = "Ensembl related datastructures and functions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseFR3D" = callPackage
@@ -1691,8 +1551,6 @@ self: {
        ];
        description = "Importer for FR3D resources";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseFasta" = callPackage
@@ -1717,8 +1575,6 @@ self: {
        ];
        description = "streaming FASTA parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseHTTP" = callPackage
@@ -1736,8 +1592,6 @@ self: {
        ];
        description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseHTTPTools" = callPackage
@@ -1758,8 +1612,6 @@ self: {
        ];
        description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseInfernal" = callPackage
@@ -1798,8 +1650,6 @@ self: {
        ];
        description = "Infernal data structures and tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseMAF" = callPackage
@@ -1811,8 +1661,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers iteratee ];
        description = "Multiple Alignment Format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseNewick" = callPackage
@@ -1840,8 +1688,6 @@ self: {
        ];
        description = "Newick file format parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseTrainingData" = callPackage
@@ -1861,8 +1707,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "RNA folding training data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseTurner" = callPackage
@@ -1880,8 +1724,6 @@ self: {
        ];
        description = "Import Turner RNA parameters";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseTypes" = callPackage
@@ -1914,8 +1756,6 @@ self: {
        ];
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseVienna" = callPackage
@@ -1931,8 +1771,6 @@ self: {
        ];
        description = "Import Vienna energy parameters";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseXNA" = callPackage
@@ -1974,8 +1812,6 @@ self: {
        ];
        description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BirdPP" = callPackage
@@ -1989,8 +1825,6 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BitStringRandomMonad" = callPackage
@@ -2010,8 +1844,6 @@ self: {
          transformers vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BitSyntax" = callPackage
@@ -2036,8 +1868,6 @@ self: {
        libraryHaskellDepends = [ base HTTP json2 ];
        description = "A library to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BlastHTTP" = callPackage
@@ -2055,8 +1885,6 @@ self: {
        ];
        description = "Libary to interface with the NCBI blast REST interface";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Blobs" = callPackage
@@ -2078,8 +1906,6 @@ self: {
        ];
        description = "Diagram editor";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BlogLiterately" = callPackage
@@ -2104,8 +1930,6 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "A tool for posting Haskelly articles to blogs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BlogLiterately-diagrams" = callPackage
@@ -2127,8 +1951,6 @@ self: {
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Blogdown" = callPackage
@@ -2157,8 +1979,6 @@ self: {
        ];
        description = "A markdown-like markup language designed for blog posts";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BluePrintCSS" = callPackage
@@ -2181,8 +2001,6 @@ self: {
        doHaddock = false;
        description = "Preview of a new build system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Bookshelf" = callPackage
@@ -2203,8 +2021,6 @@ self: {
        testHaskellDepends = [ base process ];
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Boolean" = callPackage
@@ -2243,8 +2059,6 @@ self: {
        ];
        description = "Static text template generation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BufferedSocket" = callPackage
@@ -2256,8 +2070,6 @@ self: {
        libraryHaskellDepends = [ base bytestring network text ];
        description = "A socker wrapper that makes the IO of sockets much cleaner";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Buster" = callPackage
@@ -2282,8 +2094,6 @@ self: {
        ];
        description = "Hits a set of urls periodically to bust caches";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "C-structs" = callPackage
@@ -2322,8 +2132,6 @@ self: {
        ];
        description = "Encode/Decode values to/from CBOR";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CC-delcont" = callPackage
@@ -2353,8 +2161,6 @@ self: {
        doHaddock = false;
        description = "Three new monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CC-delcont-cxe" = callPackage
@@ -2366,8 +2172,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CC-delcont-exc" = callPackage
@@ -2379,8 +2183,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CC-delcont-ref" = callPackage
@@ -2392,8 +2194,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CC-delcont-ref-tf" = callPackage
@@ -2405,8 +2205,6 @@ self: {
        libraryHaskellDepends = [ base ref-tf transformers ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CCA" = callPackage
@@ -2424,8 +2222,6 @@ self: {
        executableToolDepends = [ happy ];
        description = "preprocessor and library for Causal Commutative Arrows (CCA)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CHXHtml" = callPackage
@@ -2455,8 +2251,6 @@ self: {
        ];
        description = "Cursor Library for A Structured Editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CLI" = callPackage
@@ -2469,8 +2263,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "CLI tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CMCompare" = callPackage
@@ -2489,8 +2281,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "Infernal covariance model comparison";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CMQ" = callPackage
@@ -2507,8 +2297,6 @@ self: {
        ];
        description = "cwmwl udp message queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "COrdering" = callPackage
@@ -2520,8 +2308,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An algebraic data type similar to Prelude Ordering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CPBrainfuck" = callPackage
@@ -2536,8 +2322,6 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "A simple Brainfuck interpretter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CPL" = callPackage
@@ -2553,8 +2337,6 @@ self: {
        ];
        description = "An interpreter of Hagino's Categorical Programming Language (CPL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CSPM-CoreLanguage" = callPackage
@@ -2582,8 +2364,6 @@ self: {
        ];
        description = "Firing rules semantic of CSPM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CSPM-Frontend" = callPackage
@@ -2601,8 +2381,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "A CSP-M parser compatible with FDR-2.91";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CSPM-Interpreter" = callPackage
@@ -2619,8 +2397,6 @@ self: {
        ];
        description = "An interpreter for CSPM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CSPM-ToProlog" = callPackage
@@ -2634,8 +2410,6 @@ self: {
        ];
        description = "some modules specific for the ProB tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CSPM-cspm" = callPackage
@@ -2661,8 +2435,6 @@ self: {
        ];
        description = "cspm command line tool for analyzing CSPM specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CTRex" = callPackage
@@ -2707,8 +2479,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "OpenCV based machine vision library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {opencv_calib3d = null; opencv_contrib = null; 
          opencv_core = null; opencv_features2d = null; opencv_flann = null; 
          opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; 
@@ -2828,8 +2598,6 @@ self: {
        ];
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CabalSearch" = callPackage
@@ -2847,8 +2615,6 @@ self: {
        ];
        description = "Search cabal packages by name";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Capabilities" = callPackage
@@ -2860,8 +2626,6 @@ self: {
        libraryHaskellDepends = [ base compdata directory free unix ];
        description = "Separate and contain effects of IO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Cardinality" = callPackage
@@ -2884,8 +2648,6 @@ self: {
        libraryHaskellDepends = [ base containers fgl parsec ];
        description = "An implementation and DSL for the Carneades argumentation model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CarneadesIntoDung" = callPackage
@@ -2902,8 +2664,6 @@ self: {
        ];
        description = "A translation from the Carneades argumentation model into Dung's AFs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Cartesian" = callPackage
@@ -2915,8 +2675,6 @@ self: {
        libraryHaskellDepends = [ base lens linear template-haskell ];
        description = "Coordinate systems";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Cascade" = callPackage
@@ -2928,8 +2686,6 @@ self: {
        libraryHaskellDepends = [ base comonad ghc-prim mtl void ];
        description = "Playing with reified categorical composition";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Cassava" = callPackage
@@ -2956,8 +2712,6 @@ self: {
        ];
        description = "A CSV parsing and encoding library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Catana" = callPackage
@@ -2969,8 +2723,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad for complex manipulation of a stream";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ChannelT" = callPackage
@@ -3059,8 +2811,6 @@ self: {
        ];
        description = "A backend for the Chart library for FLTKHS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Chart-gtk" = callPackage
@@ -3109,8 +2859,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "Chart-tests" = callPackage
@@ -3180,8 +2928,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Inbuilt checking for ultra reliable computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Chitra" = callPackage
@@ -3195,8 +2941,6 @@ self: {
        executableHaskellDepends = [ base binary bytestring mtl network ];
        description = "A platform independent mechanism to render graphics using vnc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ChristmasTree" = callPackage
@@ -3212,8 +2956,6 @@ self: {
        ];
        description = "Alternative approach of 'read' that composes grammars instead of parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CirruParser" = callPackage
@@ -3247,8 +2989,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ClassLaws" = callPackage
@@ -3260,8 +3000,6 @@ self: {
        libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ];
        description = "Stating and checking laws for type class methods";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ClassyPrelude" = callPackage
@@ -3273,8 +3011,6 @@ self: {
        libraryHaskellDepends = [ base strict ];
        description = "Prelude replacement using classes instead of concrete types where reasonable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Clean" = callPackage
@@ -3286,8 +3022,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A light, clean and powerful utility library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Clipboard" = callPackage
@@ -3319,8 +3053,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Libary for parsing Clustal tools output";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Coadjute" = callPackage
@@ -3338,8 +3070,6 @@ self: {
        ];
        description = "A generic build tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Codec-Compression-LZF" = callPackage
@@ -3382,8 +3112,6 @@ self: {
        benchmarkHaskellDepends = [ base colour criterion deepseq random ];
        description = "Color spaces and conversions between them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Combinatorrent" = callPackage
@@ -3409,8 +3137,6 @@ self: {
        ];
        description = "A concurrent bittorrent client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Command" = callPackage
@@ -3422,8 +3148,6 @@ self: {
        libraryHaskellDepends = [ base directory process ];
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Commando" = callPackage
@@ -3446,8 +3170,6 @@ self: {
        ];
        description = "Watch some files; Rerun a command";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ComonadSheet" = callPackage
@@ -3465,8 +3187,6 @@ self: {
        ];
        description = "A library for expressing spreadsheet-like computations as the fixed-points of comonads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Compactable" = callPackage
@@ -3478,8 +3198,6 @@ self: {
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A generalization for containers that can be stripped of Nothing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Concurrent-Cache" = callPackage
@@ -3491,8 +3209,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Cached variable for IO functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Concurrential" = callPackage
@@ -3504,8 +3220,6 @@ self: {
        libraryHaskellDepends = [ async base ];
        description = "Mix concurrent and sequential computation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Condor" = callPackage
@@ -3527,8 +3241,6 @@ self: {
        ];
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ConfigFile" = callPackage
@@ -3555,8 +3267,6 @@ self: {
        ];
        description = "Template haskell for reading ConfigFiles";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Configger" = callPackage
@@ -3568,8 +3278,6 @@ self: {
        libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ];
        description = "Parse config files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Configurable" = callPackage
@@ -3581,8 +3289,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Declare types as Configurable then specialize them all in one place";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ConsStream" = callPackage
@@ -3607,8 +3313,6 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Restart a command on STDIN activity";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ConstraintKinds" = callPackage
@@ -3620,8 +3324,6 @@ self: {
        libraryHaskellDepends = [ base dlist ghc-prim vector ];
        description = "Repackages standard type classes with the ConstraintKinds extension";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Consumer" = callPackage
@@ -3633,8 +3335,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad and monad transformer for consuming streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ContArrow" = callPackage
@@ -3646,8 +3346,6 @@ self: {
        libraryHaskellDepends = [ arrows base ];
        description = "Control.Arrow.Transformer.Cont";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ContextAlgebra" = callPackage
@@ -3665,8 +3363,6 @@ self: {
        ];
        description = "Implementation of the context algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Contract" = callPackage
@@ -3678,8 +3374,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Practical typed lazy contracts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Control-Engine" = callPackage
@@ -3711,8 +3405,6 @@ self: {
        ];
        description = "A Library for Writing Multi-Pass Algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Control-Monad-ST2" = callPackage
@@ -3730,8 +3422,6 @@ self: {
        ];
        description = "A variation on the ST monad with two type parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CoreDump" = callPackage
@@ -3743,8 +3433,6 @@ self: {
        libraryHaskellDepends = [ base ghc pretty pretty-show ];
        description = "A GHC plugin for printing GHC's internal Core data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CoreErlang" = callPackage
@@ -3756,8 +3444,6 @@ self: {
        libraryHaskellDepends = [ base parsec pretty ];
        description = "Manipulating Core Erlang source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CoreFoundation" = callPackage
@@ -3776,8 +3462,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to Mac OSX's CoreFoundation framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Coroutine" = callPackage
@@ -3789,8 +3473,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-safe coroutines using lightweight session types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CouchDB" = callPackage
@@ -3811,8 +3493,6 @@ self: {
        ];
        description = "CouchDB interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Craft3e" = callPackage
@@ -3829,8 +3509,6 @@ self: {
        doHaddock = false;
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Crypto" = callPackage
@@ -3885,8 +3563,6 @@ self: {
        ];
        description = "CurryDB: In-memory Key/Value Database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DAG-Tournament" = callPackage
@@ -3904,8 +3580,6 @@ self: {
        ];
        description = "Real-Time Game Tournament Evaluator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DAV" = callPackage
@@ -3962,8 +3636,6 @@ self: {
        ];
        description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DBlimited" = callPackage
@@ -3977,8 +3649,6 @@ self: {
        executableHaskellDepends = [ base containers parsec ];
        description = "A command-line SQL interface for flat files (tdf,csv,etc.)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DBus" = callPackage
@@ -3990,8 +3660,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "D-Bus bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DCFL" = callPackage
@@ -4016,8 +3684,6 @@ self: {
        executableHaskellDepends = [ base MuCheck ];
        description = "Distributed Mutation Analysis framework for MuCheck";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DOH" = callPackage
@@ -4054,8 +3720,6 @@ self: {
        libraryHaskellDepends = [ base mtl WebBits ];
        description = "DOM Level 2 bindings for the WebBits package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DP" = callPackage
@@ -4071,8 +3735,6 @@ self: {
        ];
        description = "Pragmatic framework for dynamic programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DPM" = callPackage
@@ -4096,8 +3758,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Darcs Patch Manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DPutils" = callPackage
@@ -4182,8 +3842,6 @@ self: {
        ];
        description = "Implementation of DSA, based on the description of FIPS 186-4";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DSH" = callPackage
@@ -4212,8 +3870,6 @@ self: {
        ];
        description = "Database Supported Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DSTM" = callPackage
@@ -4235,8 +3891,6 @@ self: {
        ];
        description = "A framework for using STM within distributed systems";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DTC" = callPackage
@@ -4248,8 +3902,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Data To Class transformation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dangerous" = callPackage
@@ -4261,8 +3913,6 @@ self: {
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Monads for operations that can exit early and produce warnings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dao" = callPackage
@@ -4293,8 +3943,6 @@ self: {
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DarcsHelpers" = callPackage
@@ -4306,8 +3954,6 @@ self: {
        libraryHaskellDepends = [ base HaXml mtl parsec safe xml-parsec ];
        description = "Code used by Patch-Shack that seemed sensible to open for reusability";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Data-Angle" = callPackage
@@ -4345,8 +3991,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DataIndex" = callPackage
@@ -4380,8 +4024,6 @@ self: {
        ];
        description = "A GTK widget for displaying arbitrary Data.Data.Data instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DataVersion" = callPackage
@@ -4395,8 +4037,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Type safe data migrations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Deadpan-DDP" = callPackage
@@ -4425,8 +4065,6 @@ self: {
        testHaskellDepends = [ base doctest filemanip QuickCheck ];
        description = "Write clients for Meteor's DDP Protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DebugTraceHelpers" = callPackage
@@ -4466,8 +4104,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DeepArrow" = callPackage
@@ -4515,8 +4151,6 @@ self: {
        ];
        description = "A simple RTS game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Delta-Lambda" = callPackage
@@ -4539,8 +4173,6 @@ self: {
        ];
        description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DescriptiveKeys" = callPackage
@@ -4569,8 +4201,6 @@ self: {
        ];
        description = "Processing Real-time event streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Diff_0_3_4" = callPackage
@@ -4619,8 +4249,6 @@ self: {
        ];
        description = "A theory solver for conjunctions of literals in difference logic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DifferentialEvolution" = callPackage
@@ -4636,8 +4264,6 @@ self: {
        ];
        description = "Global optimization using Differential Evolution";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Digit" = callPackage
@@ -4672,8 +4298,6 @@ self: {
        testHaskellDepends = [ base hspec lens mtl text ];
        description = "A client library for the DigitalOcean API";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DimensionalHash" = callPackage
@@ -4685,8 +4309,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An n-dimensional hash using Morton numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DirectSound" = callPackage
@@ -4720,8 +4342,6 @@ self: {
        ];
        description = "Distributed Bug Tracking System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DiscussionSupportSystem" = callPackage
@@ -4738,8 +4358,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Discussion support system";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dish" = callPackage
@@ -4754,8 +4372,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Hash modules (currently Murmur3)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dist" = callPackage
@@ -4768,8 +4384,6 @@ self: {
        testHaskellDepends = [ base containers MonadRandom ];
        description = "A Haskell library for probability distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DistanceTransform" = callPackage
@@ -4823,8 +4437,6 @@ self: {
        ];
        description = "Frameshift-aware alignment of protein sequences with DNA sequences";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DocTest" = callPackage
@@ -4842,8 +4454,6 @@ self: {
        ];
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Docs" = callPackage
@@ -4873,8 +4483,6 @@ self: {
        executableHaskellDepends = [ array base containers pretty ];
        description = "A tool for deriving hylomorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DrIFT" = callPackage
@@ -4892,8 +4500,6 @@ self: {
        ];
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DrIFT-cabalized" = callPackage
@@ -4908,8 +4514,6 @@ self: {
        executableHaskellDepends = [ base old-time process random ];
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dung" = callPackage
@@ -4923,8 +4527,6 @@ self: {
        libraryHaskellDepends = [ base cmdargs containers parsec ];
        description = "An implementation of the Dung argumentation frameworks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dust" = callPackage
@@ -4950,8 +4552,6 @@ self: {
        ];
        description = "Polymorphic protocol engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dust-crypto" = callPackage
@@ -4978,8 +4578,6 @@ self: {
        ];
        description = "Cryptographic operations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "Dust-tools" = callPackage
@@ -5004,8 +4602,6 @@ self: {
        ];
        description = "Network filtering exploration tools";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dust-tools-pcap" = callPackage
@@ -5027,8 +4623,6 @@ self: {
        ];
        description = "Network filtering exploration tools that rely on pcap";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DynamicTimeWarp" = callPackage
@@ -5046,8 +4640,6 @@ self: {
        ];
        description = "Dynamic time warping of sequences";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DysFRP" = callPackage
@@ -5061,8 +4653,6 @@ self: {
        ];
        description = "dysFunctional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DysFRP-Cairo" = callPackage
@@ -5074,8 +4664,6 @@ self: {
        libraryHaskellDepends = [ base cairo DysFRP gtk mtl ];
        description = "dysFunctional Reactive Programming on Cairo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DysFRP-Craftwerk" = callPackage
@@ -5092,8 +4680,6 @@ self: {
        ];
        description = "dysFunctional Reactive Programming on Craftwerk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EEConfig" = callPackage
@@ -5207,8 +4793,6 @@ self: {
        ];
        description = "Query language and report generator for edit logs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Eight-Ball-Pool-Hack-Cheats" = callPackage
@@ -5231,8 +4815,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EitherT" = callPackage
@@ -5250,8 +4832,6 @@ self: {
        ];
        description = "EitherT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Elm" = callPackage
@@ -5307,8 +4887,6 @@ self: {
        ];
        description = "derives heuristic rules from nominal data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Empty" = callPackage
@@ -5320,8 +4898,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A type class for empty containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Encode" = callPackage
@@ -5352,8 +4928,6 @@ self: {
        ];
        description = "Libary to interface with the NCBI Entrez REST service";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Enum" = callPackage
@@ -5377,8 +4951,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Simple Enum-class-based int containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EnumMap" = callPackage
@@ -5390,8 +4962,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "More general IntMap replacement";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Eq" = callPackage
@@ -5410,8 +4980,6 @@ self: {
        ];
        description = "Render math formula in ASCII, and perform some simplifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EqualitySolver" = callPackage
@@ -5425,8 +4993,6 @@ self: {
        ];
        description = "A theory solver for conjunctions of literals in the theory of uninterpreted functions with equality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EsounD" = callPackage
@@ -5446,8 +5012,6 @@ self: {
        ];
        description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EstProgress" = callPackage
@@ -5459,8 +5023,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base mtl ];
        description = "Methods for estimating the progress of functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EtaMOO" = callPackage
@@ -5485,8 +5047,6 @@ self: {
        executablePkgconfigDepends = [ pcre ];
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) pcre;};
 
   "Etage" = callPackage
@@ -5502,8 +5062,6 @@ self: {
        ];
        description = "A general data-flow framework";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Etage-Graph" = callPackage
@@ -5522,8 +5080,6 @@ self: {
        ];
        description = "Data-flow based graph algorithms";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Eternal10Seconds" = callPackage
@@ -5538,8 +5094,6 @@ self: {
        executableHaskellDepends = [ base haskell98 SDL SDL-mixer ];
        description = "A 2-D shooting game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Etherbunny" = callPackage
@@ -5561,8 +5115,6 @@ self: {
        executableSystemDepends = [ libpcap ];
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libpcap;};
 
   "EuroIT" = callPackage
@@ -5605,8 +5157,6 @@ self: {
        ];
        description = "Interfaces with FreeSwitch Event Socket";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Extra" = callPackage
@@ -5626,8 +5176,6 @@ self: {
        ];
        description = "A grab bag of modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FAI" = callPackage
@@ -5665,8 +5213,6 @@ self: {
        ];
        description = "Compose music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FM-SBLEX" = callPackage
@@ -5680,8 +5226,6 @@ self: {
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "A set of computational morphology tools for Swedish diachronic lexicons";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FModExRaw" = callPackage
@@ -5694,8 +5238,6 @@ self: {
        librarySystemDepends = [ fmodex64 ];
        description = "The Haskell FModEx raw API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {fmodex64 = null;};
 
   "FPretty" = callPackage
@@ -5709,8 +5251,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Efficient simple pretty printing combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FSM" = callPackage
@@ -5751,8 +5291,6 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ftgl;};
 
   "FTPLine" = callPackage
@@ -5771,8 +5309,6 @@ self: {
        ];
        description = "A command-line FTP client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Facebook-Password-Hacker-Online-Latest-Version" = callPackage
@@ -5797,8 +5333,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Facts" = callPackage
@@ -5814,8 +5348,6 @@ self: {
        ];
        description = "A collection of facts about the real world";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FailureT" = callPackage
@@ -5827,8 +5359,6 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols mmtl ];
        description = "Failure Monad Transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FastPush" = callPackage
@@ -5840,8 +5370,6 @@ self: {
        libraryHaskellDepends = [ base STMonadTrans vector ];
        description = "A monad and monad transformer for pushing things onto a stack very fast";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FastxPipe" = callPackage
@@ -5858,8 +5386,6 @@ self: {
        ];
        description = "Fasta and Fastq streaming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FenwickTree" = callPackage
@@ -5892,8 +5418,6 @@ self: {
        ];
        description = "Annotate ps and pdf documents";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FerryCore" = callPackage
@@ -5910,8 +5434,6 @@ self: {
        ];
        description = "Ferry Core Components";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Feval" = callPackage
@@ -5925,8 +5447,6 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Evaluation using F-Algebras";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FieldTrip" = callPackage
@@ -5943,8 +5463,6 @@ self: {
        ];
        description = "Functional 3D";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FileManip" = callPackage
@@ -5960,8 +5478,6 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FileManipCompat" = callPackage
@@ -5977,8 +5493,6 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FilePather" = callPackage
@@ -5995,8 +5509,6 @@ self: {
        ];
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FileSystem" = callPackage
@@ -6012,8 +5524,6 @@ self: {
        ];
        description = "File system data structure and monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Files" = callPackage
@@ -6030,8 +5540,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "File content extraction/rearrangement";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Fin" = callPackage
@@ -6064,8 +5572,6 @@ self: {
        ];
        description = "Obtain quote data from finance.yahoo.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Finance-Treasury" = callPackage
@@ -6082,8 +5588,6 @@ self: {
        ];
        description = "Obtain Treasury yield curve data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FindBin" = callPackage
@@ -6106,8 +5610,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
        license = stdenv.lib.licenses.bsdOriginal;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FirstOrderTheory" = callPackage
@@ -6119,8 +5621,6 @@ self: {
        libraryHaskellDepends = [ base containers Proper ];
        description = "Grammar and typeclass for first order theories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FixedPoint-simple" = callPackage
@@ -6150,8 +5650,6 @@ self: {
        ];
        description = "Wiki";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FloatingHex" = callPackage
@@ -6225,8 +5723,6 @@ self: {
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ForestStructures" = callPackage
@@ -6274,8 +5770,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Comparison of trees and forests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ForkableT" = callPackage
@@ -6287,8 +5781,6 @@ self: {
        libraryHaskellDepends = [ base monad-control mtl resourcet ];
        description = "Forkable monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FormalGrammars" = callPackage
@@ -6313,8 +5805,6 @@ self: {
        ];
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Fortnite-Hack-Cheats-Free-V-Bucks-Generator" = callPackage
@@ -6337,8 +5827,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Foster" = callPackage
@@ -6359,8 +5847,6 @@ self: {
        ];
        description = "Utilities to generate and solve puzzles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FpMLv53" = callPackage
@@ -6407,8 +5893,6 @@ self: {
          base FTGL GLFW-b OpenGLRaw parallel random time
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Frames" = callPackage
@@ -6463,8 +5947,6 @@ self: {
        ];
        description = "A library for accessing Postgres tables as in-memory data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Frames-dsv" = callPackage
@@ -6482,8 +5964,6 @@ self: {
        testHaskellDepends = [ base Frames hspec pipes ];
        description = "Alternative CSV parser for the Frames package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Frames-map-reduce" = callPackage
@@ -6504,8 +5984,6 @@ self: {
        ];
        description = "Frames wrapper for map-reduce-folds and some extra folds helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Frames-streamly" = callPackage
@@ -6536,8 +6014,6 @@ self: {
        executableHaskellDepends = [ base mtl newtype she void ];
        description = "An experimental programming language with typed algebraic effects";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FreeTypeGL" = callPackage
@@ -6552,8 +6028,6 @@ self: {
        libraryHaskellDepends = [ base freetype2 OpenGL ];
        description = "Loadable texture fonts for OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FunGEn" = callPackage
@@ -6571,8 +6045,6 @@ self: {
        executableHaskellDepends = [ base GLUT OpenGL random ];
        description = "A lightweight, cross-platform, OpenGL-based game engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Fungi" = callPackage
@@ -6592,8 +6064,6 @@ self: {
        ];
        description = "Funge-98 interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GA" = callPackage
@@ -6618,8 +6088,6 @@ self: {
        executableHaskellDepends = [ base bimap ];
        description = "GGg cipher";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GHood" = callPackage
@@ -6644,8 +6112,6 @@ self: {
        librarySystemDepends = [ libGL libX11 libXext libXfixes ];
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;};
 
@@ -6660,8 +6126,6 @@ self: {
        librarySystemDepends = [ libX11 libXrandr ];
        description = "A binding for GLFW (OGL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
   "GLFW-b" = callPackage
@@ -6696,8 +6160,6 @@ self: {
        ];
        description = "GLFW-b demo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GLFW-task" = callPackage
@@ -6711,8 +6173,6 @@ self: {
        ];
        description = "GLFW utility functions to use together with monad-task";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GLHUI" = callPackage
@@ -6764,8 +6224,6 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw ];
        description = "Utilities for working with OpenGL matrices";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GLURaw" = callPackage
@@ -6815,8 +6273,6 @@ self: {
        libraryToolDepends = [ hpp ];
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GPX" = callPackage
@@ -6833,8 +6289,6 @@ self: {
        ];
        description = "Parse GPX files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GPipe" = callPackage
@@ -6852,8 +6306,6 @@ self: {
        ];
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GPipe-Collada" = callPackage
@@ -6867,8 +6319,6 @@ self: {
        ];
        description = "Load GPipe meshes from Collada files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GPipe-Examples" = callPackage
@@ -6886,8 +6336,6 @@ self: {
        ];
        description = "Examples for the GPipes package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GPipe-GLFW" = callPackage
@@ -6900,8 +6348,6 @@ self: {
        libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
        description = "GLFW OpenGL context creation for GPipe";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GPipe-TextureLoad" = callPackage
@@ -6913,8 +6359,6 @@ self: {
        libraryHaskellDepends = [ base bitmap GPipe stb-image ];
        description = "Load GPipe textures from filesystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GTALib" = callPackage
@@ -6933,8 +6377,6 @@ self: {
        ];
        description = "A library for GTA programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Gamgine" = callPackage
@@ -6956,8 +6398,6 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Some kind of game library or set of utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Ganymede" = callPackage
@@ -6975,8 +6415,6 @@ self: {
        ];
        description = "An Io interpreter in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GaussQuadIntegration" = callPackage
@@ -7004,8 +6442,6 @@ self: {
        ];
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GenI" = callPackage
@@ -7039,8 +6475,6 @@ self: {
        ];
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GenSmsPdu" = callPackage
@@ -7054,8 +6488,6 @@ self: {
        executableHaskellDepends = [ base haskell98 QuickCheck random ];
        description = "Automatic SMS message generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Genbank" = callPackage
@@ -7074,8 +6506,6 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "Libary for processing the NCBI genbank format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Gene-CluEDO" = callPackage
@@ -7101,8 +6531,6 @@ self: {
        ];
        description = "Hox gene clustering";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GeneralTicTacToe" = callPackage
@@ -7116,8 +6544,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A general TicTacToe game implementation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GenericPretty" = callPackage
@@ -7156,8 +6582,6 @@ self: {
        ];
        description = "MCFGs for Genus-1 RNA Pseudoknots";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GeoIp" = callPackage
@@ -7182,8 +6606,6 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring HTTP text ];
        description = "Geocoder and Reverse Geocoding Service Wrapper";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Geodetic" = callPackage
@@ -7217,8 +6639,6 @@ self: {
        libraryHaskellDepends = [ base GeomPredicates ];
        description = "Geometric predicates (Intel SSE)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Get" = callPackage
@@ -7231,8 +6651,6 @@ self: {
        testHaskellDepends = [ base constraints singletons ];
        description = "get stuff out of stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GiST" = callPackage
@@ -7244,8 +6662,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A Haskell implementation of a Generalized Search Tree (GiST)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Gifcurry" = callPackage
@@ -7271,8 +6687,6 @@ self: {
        ];
        description = "GIF creation utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GiveYouAHead" = callPackage
@@ -7295,8 +6709,6 @@ self: {
        libraryHaskellDepends = [ base mtl split threepenny-gui ];
        description = "HTML Canvas graphics, animations and simulations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Glob" = callPackage
@@ -7330,8 +6742,6 @@ self: {
        libraryHaskellDepends = [ array base GlomeVec ];
        description = "Ray Tracing Library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GlomeVec" = callPackage
@@ -7361,8 +6771,6 @@ self: {
        ];
        description = "SDL Frontend for Glome ray tracer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GoogleChart" = callPackage
@@ -7389,8 +6797,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "GoogleDirections" = callPackage
@@ -7406,8 +6812,6 @@ self: {
        ];
        description = "Haskell Interface to Google Directions API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GoogleSB" = callPackage
@@ -7423,8 +6827,6 @@ self: {
        ];
        description = "Interface to Google Safe Browsing API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GoogleSuggest" = callPackage
@@ -7452,8 +6854,6 @@ self: {
        ];
        description = "Interface to Google Translate API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GotoT-transformers" = callPackage
@@ -7465,8 +6865,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A monad and monadic transformer providing \"goto\" functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Grafos" = callPackage
@@ -7478,8 +6876,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Grafos Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GrammarProducts" = callPackage
@@ -7502,8 +6898,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Grammar products and higher-dimensional grammars";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Graph500" = callPackage
@@ -7522,8 +6916,6 @@ self: {
        executableHaskellDepends = [ array base mtl ];
        description = "Graph500 benchmark-related definitions and data set generator";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GraphHammer" = callPackage
@@ -7538,8 +6930,6 @@ self: {
        ];
        description = "GraphHammer Haskell graph analyses framework inspired by STINGER";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GraphHammer-examples" = callPackage
@@ -7557,8 +6947,6 @@ self: {
        ];
        description = "Test harness for TriangleCount analysis";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GraphSCC" = callPackage
@@ -7602,8 +6990,6 @@ self: {
        ];
        description = "Embedded grammar DSL and LALR parser generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GroteTrap" = callPackage
@@ -7621,8 +7007,6 @@ self: {
        ];
        description = "Parser and selection library for expression languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Grow" = callPackage
@@ -7665,8 +7049,6 @@ self: {
        ];
        description = "Notification utility for Growl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Gtk2hsGenerics" = callPackage
@@ -7682,8 +7064,6 @@ self: {
        ];
        description = "Convenience functions to extend Gtk2hs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GtkGLTV" = callPackage
@@ -7699,8 +7079,6 @@ self: {
        ];
        description = "OpenGL support for Gtk-based GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GtkTV" = callPackage
@@ -7732,8 +7110,6 @@ self: {
        ];
        description = "A graphical REPL and development environment for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GuiTV" = callPackage
@@ -7745,8 +7121,6 @@ self: {
        libraryHaskellDepends = [ base DeepArrow phooey TV TypeCompose ];
        description = "GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "H" = callPackage
@@ -7767,8 +7141,6 @@ self: {
        ];
        description = "The Haskell/R mixed programming environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HABQT" = callPackage
@@ -7793,8 +7165,6 @@ self: {
        ];
        description = "Hierarchical adaptive Bayesian quantum tomography for quantum bits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HARM" = callPackage
@@ -7826,8 +7196,6 @@ self: {
        ];
        description = "HAppS data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HAppS-IxSet" = callPackage
@@ -7843,8 +7211,6 @@ self: {
          syb-with-class template-haskell
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HAppS-Server" = callPackage
@@ -7865,8 +7231,6 @@ self: {
        ];
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HAppS-State" = callPackage
@@ -7886,8 +7250,6 @@ self: {
        ];
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HAppS-Util" = callPackage
@@ -7904,8 +7266,6 @@ self: {
        ];
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HAppSHelpers" = callPackage
@@ -7940,8 +7300,6 @@ self: {
        ];
        description = "High-level library for building command line interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HCard" = callPackage
@@ -7955,8 +7313,6 @@ self: {
        ];
        description = "A library for implementing a Deck of Cards";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HCodecs" = callPackage
@@ -8008,8 +7364,6 @@ self: {
        librarySystemDepends = [ mysqlclient openssl zlib ];
        description = "MySQL driver for HDBC";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mysqlclient = null; inherit (pkgs) openssl; 
          inherit (pkgs) zlib;};
 
@@ -8060,8 +7414,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HDBC-session" = callPackage
@@ -8102,8 +7454,6 @@ self: {
        librarySystemDepends = [ pfstools ];
        description = "Utilities for reading, manipulating, and writing HDR images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) pfstools;};
 
   "HERA" = callPackage
@@ -8115,8 +7465,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ mpfr ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mpfr;};
 
   "HExcel" = callPackage
@@ -8133,8 +7481,6 @@ self: {
        librarySystemDepends = [ xlsxwriter zlib ];
        description = "Create Excel files with Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {xlsxwriter = null; inherit (pkgs) zlib;};
 
   "HFitUI" = callPackage
@@ -8156,8 +7502,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "The library for generating a graphical interface on the web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HFrequencyQueue" = callPackage
@@ -8169,8 +7513,6 @@ self: {
        libraryHaskellDepends = [ base c-storable-deriving ];
        description = "A Queue with a random (weighted) pick function";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HFuse" = callPackage
@@ -8205,8 +7547,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "2D game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HGL" = callPackage
@@ -8565,8 +7905,6 @@ self: {
        ];
        description = "Graph database stored on disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HHDL" = callPackage
@@ -8578,8 +7916,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Hardware Description Language embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HJScript" = callPackage
@@ -8591,8 +7927,6 @@ self: {
        libraryHaskellDepends = [ base HJavaScript hsp mtl text ];
        description = "HJScript is a Haskell EDSL for writing JavaScript programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HJVM" = callPackage
@@ -8615,8 +7949,6 @@ self: {
        ];
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) jdk;};
 
   "HJavaScript" = callPackage
@@ -8630,8 +7962,6 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "HJavaScript is an abstract syntax for a typed subset of JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HLearn-algebra" = callPackage
@@ -8651,8 +7981,6 @@ self: {
        ];
        description = "Algebraic foundation for homomorphic learning";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HLearn-approximation" = callPackage
@@ -8671,8 +7999,6 @@ self: {
          HLearn-datastructures HLearn-distributions list-extras vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HLearn-classification" = callPackage
@@ -8695,8 +8021,6 @@ self: {
          QuickCheck statistics vector vector-th-unbox
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HLearn-datastructures" = callPackage
@@ -8712,8 +8036,6 @@ self: {
          MonadRandom QuickCheck vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HLearn-distributions" = callPackage
@@ -8737,8 +8059,6 @@ self: {
        ];
        description = "Distributions for use with the HLearn library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HList" = callPackage
@@ -8764,8 +8084,6 @@ self: {
        ];
        description = "Heterogeneous lists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HListPP" = callPackage
@@ -8779,8 +8097,6 @@ self: {
        executableHaskellDepends = [ base regex-applicative ];
        description = "A preprocessor for HList labelable labels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HLogger" = callPackage
@@ -8795,8 +8111,6 @@ self: {
        executableHaskellDepends = [ base old-locale time ];
        description = "Simple, concurrent and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HMM" = callPackage
@@ -8807,8 +8121,6 @@ self: {
        sha256 = "01y8l76c56gysynbilp32yq0wfc129hl24siw8s9fmpn98qa71s6";
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HMap" = callPackage
@@ -8864,8 +8176,6 @@ self: {
        ];
        description = "Happy Network Manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HNumeric" = callPackage
@@ -8896,8 +8206,6 @@ self: {
        librarySystemDepends = [ ode ];
        description = "Binding to libODE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ode;};
 
   "HOpenCV" = callPackage
@@ -8914,8 +8222,6 @@ self: {
        executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) opencv;};
 
   "HPDF" = callPackage
@@ -8940,8 +8246,6 @@ self: {
        testHaskellDepends = [ base HTF ];
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HPath" = callPackage
@@ -8964,8 +8268,6 @@ self: {
        ];
        description = "Extract Haskell declarations by name";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HPhone" = callPackage
@@ -8995,8 +8297,6 @@ self: {
        librarySystemDepends = [ bcm2835 ];
        description = "GPIO, I2C and SPI functions for the Raspberry Pi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {bcm2835 = null;};
 
   "HPlot" = callPackage
@@ -9014,8 +8314,6 @@ self: {
        executablePkgconfigDepends = [ plplotd-gnome2 ];
        description = "A minimal monadic PLplot interface for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {plplotd-gnome2 = null;};
 
   "HPong" = callPackage
@@ -9034,8 +8332,6 @@ self: {
        ];
        description = "A simple OpenGL Pong game based on GLFW";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT" = callPackage
@@ -9053,8 +8349,6 @@ self: {
        ];
        description = "Haskell binding to the ROOT data analysis framework";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT-core" = callPackage
@@ -9068,8 +8362,6 @@ self: {
        ];
        description = "Haskell binding to ROOT Core modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT-graf" = callPackage
@@ -9085,8 +8377,6 @@ self: {
        ];
        description = "Haskell binding to ROOT Graf modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT-hist" = callPackage
@@ -9102,8 +8392,6 @@ self: {
        ];
        description = "Haskell binding to ROOT Hist modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT-io" = callPackage
@@ -9119,8 +8407,6 @@ self: {
        ];
        description = "Haskell binding to ROOT IO modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT-math" = callPackage
@@ -9136,8 +8422,6 @@ self: {
        ];
        description = "Haskell binding to ROOT Math modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT-tree" = callPackage
@@ -9153,8 +8437,6 @@ self: {
        ];
        description = "Haskell binding to ROOT Tree modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HRay" = callPackage
@@ -9169,8 +8451,6 @@ self: {
        executableHaskellDepends = [ array base directory haskell98 ];
        description = "Haskell raytracer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSFFIG" = callPackage
@@ -9191,8 +8471,6 @@ self: {
        ];
        description = "Generate FFI import declarations from C include files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSGEP" = callPackage
@@ -9211,8 +8489,6 @@ self: {
        executableHaskellDepends = [ csv ];
        description = "Gene Expression Programming evolutionary algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSH" = callPackage
@@ -9249,8 +8525,6 @@ self: {
        ];
        description = "Convenience functions that use HSH, instances for HSH";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSet" = callPackage
@@ -9262,8 +8536,6 @@ self: {
        libraryHaskellDepends = [ base containers hashable hashtables ];
        description = "Faux heterogeneous sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSlippyMap" = callPackage
@@ -9293,8 +8565,6 @@ self: {
        testHaskellDepends = [ aeson attoparsec base HTF text ];
        description = "Small template engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSoM" = callPackage
@@ -9311,8 +8581,6 @@ self: {
        ];
        description = "Library for computer music education";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSoundFile" = callPackage
@@ -9328,8 +8596,6 @@ self: {
        ];
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HStringTemplate" = callPackage
@@ -9366,8 +8632,6 @@ self: {
        ];
        description = "Convenience functions and instances for HStringTemplate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSvm" = callPackage
@@ -9414,8 +8678,6 @@ self: {
        ];
        description = "The Haskell Test Framework";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HTTP" = callPackage
@@ -9468,8 +8730,6 @@ self: {
        ];
        description = "Tableau based theorem prover for hybrid logics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HTicTacToe" = callPackage
@@ -9487,8 +8747,6 @@ self: {
        ];
        description = "An SDL tic-tac-toe game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HUnit" = callPackage
@@ -9512,8 +8770,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ];
        description = "Assertions for HUnit with difference reporting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HUnit-Plus" = callPackage
@@ -9573,8 +8829,6 @@ self: {
        ];
        description = "A (prototyped) easy to use XMPP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HXQ" = callPackage
@@ -9592,8 +8846,6 @@ self: {
        ];
        description = "A Compiler from XQuery to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaLeX" = callPackage
@@ -9608,8 +8860,6 @@ self: {
        libraryHaskellDepends = [ base HUnit mtl QuickCheck ];
        description = "HaLeX enables modelling, manipulation and visualization of regular languages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaMinitel" = callPackage
@@ -9621,8 +8871,6 @@ self: {
        libraryHaskellDepends = [ base bytestring serialport stm ];
        description = "An Haskell library to drive the french Minitel through a serial port";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaPy" = callPackage
@@ -9634,8 +8882,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell th-lift ];
        description = "Haskell bindings for Python";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaRe" = callPackage
@@ -9670,8 +8916,6 @@ self: {
        ];
        description = "the Haskell Refactorer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaTeX" = callPackage
@@ -9710,8 +8954,6 @@ self: {
        ];
        description = "This package is deprecated. From version 3, HaTeX does not need this anymore.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaTeX-qq" = callPackage
@@ -9727,8 +8969,6 @@ self: {
        ];
        description = "Quasiquoters for HaTeX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaVSA" = callPackage
@@ -9748,8 +8988,6 @@ self: {
        ];
        description = "An implementation of the Version Space Algebra learning framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaXml" = callPackage
@@ -9786,8 +9024,6 @@ self: {
        executableHaskellDepends = [ text time vty vty-ui ];
        description = "Simple chat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HackMail" = callPackage
@@ -9808,8 +9044,6 @@ self: {
        ];
        description = "A Procmail Replacement as Haskell EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Haggressive" = callPackage
@@ -9827,8 +9061,6 @@ self: {
        testHaskellDepends = [ base Cabal containers HUnit tuple vector ];
        description = "Aggression analysis for Tweets on Twitter";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HandlerSocketClient" = callPackage
@@ -9840,8 +9072,6 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Haskell implementation of a HandlerSocket client (API)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HandsomeSoup" = callPackage
@@ -9876,8 +9106,6 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "The classic game of Hangman";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HappyTree" = callPackage
@@ -9895,8 +9123,6 @@ self: {
        ];
        description = "Type Safe and End to End Decision Tree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HarmTrace" = callPackage
@@ -9920,8 +9146,6 @@ self: {
        ];
        description = "Harmony Analysis and Retrieval of Music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HarmTrace-Base" = callPackage
@@ -9971,8 +9195,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Haskell bindings for CacBDD";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {CacBDD = null;};
 
   "HasGP" = callPackage
@@ -9989,8 +9211,6 @@ self: {
        ];
        description = "A Haskell library for inference using Gaussian processes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Haschoo" = callPackage
@@ -10009,8 +9229,6 @@ self: {
        ];
        description = "Minimalist R5RS Scheme interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hashell" = callPackage
@@ -10029,8 +9247,6 @@ self: {
        ];
        description = "Simple shell written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskRel" = callPackage
@@ -10047,8 +9263,6 @@ self: {
        ];
        description = "HaskRel, Haskell as a DBMS with support for the relational algebra";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellAnalysisProgram" = callPackage
@@ -10072,8 +9286,6 @@ self: {
        ];
        description = "Haskell source code analysis program";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellForMaths" = callPackage
@@ -10096,8 +9308,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellNN" = callPackage
@@ -10109,8 +9319,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix random ];
        description = "High Performance Neural Network in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellNet" = callPackage
@@ -10129,8 +9337,6 @@ self: {
        ];
        description = "Client support for POP3, SMTP, and IMAP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellNet-SSL" = callPackage
@@ -10147,8 +9353,6 @@ self: {
        ];
        description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellTorrent" = callPackage
@@ -10172,8 +9376,6 @@ self: {
        ];
        description = "A concurrent bittorrent client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellTutorials" = callPackage
@@ -10187,8 +9389,6 @@ self: {
        executableHaskellDepends = [ base cmdargs text ];
        description = "Haskell Tutorials by Evgeny Ukhanov";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Haskelloids" = callPackage
@@ -10206,8 +9406,6 @@ self: {
        ];
        description = "A reproduction of the Atari 1979 classic \"Asteroids\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hastodon" = callPackage
@@ -10249,8 +9447,6 @@ self: {
        ];
        description = "A small 2D game framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hawk" = callPackage
@@ -10272,8 +9468,6 @@ self: {
        ];
        description = "Haskell Web Application Kit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hayoo" = callPackage
@@ -10300,8 +9494,6 @@ self: {
        ];
        description = "The Hayoo! search engine for Haskell API search on hackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hclip" = callPackage
@@ -10334,8 +9526,6 @@ self: {
        ];
        description = "Line oriented editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HerbiePlugin" = callPackage
@@ -10354,8 +9544,6 @@ self: {
        testHaskellDepends = [ base linear subhask ];
        description = "automatically improve your code's numeric stability";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hermes" = callPackage
@@ -10374,8 +9562,6 @@ self: {
        ];
        description = "Message-based middleware layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hieroglyph" = callPackage
@@ -10393,8 +9579,6 @@ self: {
        ];
        description = "Purely functional 2D graphics for visualization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HiggsSet" = callPackage
@@ -10411,8 +9595,6 @@ self: {
        ];
        description = "A multi-index set with advanced query capabilites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hipmunk" = callPackage
@@ -10439,8 +9621,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Useful functions for Hipmunk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HipmunkPlayground" = callPackage
@@ -10478,8 +9658,6 @@ self: {
          base directory MissingH process regex-tdfa time
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Histogram" = callPackage
@@ -10507,8 +9685,6 @@ self: {
        ];
        description = "An MPD client designed for a Home Theatre PC";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hoed" = callPackage
@@ -10533,8 +9709,6 @@ self: {
        testHaskellDepends = [ base process QuickCheck ];
        description = "Lightweight algorithmic debugging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HoleyMonoid" = callPackage
@@ -10608,8 +9782,6 @@ self: {
        ];
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Holumbus-Storage" = callPackage
@@ -10660,8 +9832,6 @@ self: {
        testHaskellDepends = [ base process random ];
        description = "A Simple Key Value Store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HostAndPort" = callPackage
@@ -10688,8 +9858,6 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "A Cricket scoring application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hs2lib" = callPackage
@@ -10717,8 +9885,6 @@ self: {
        testHaskellDepends = [ base directory filepath process ];
        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;
-       broken = true;
      }) {};
 
   "HsASA" = callPackage
@@ -10750,8 +9916,6 @@ self: {
        ];
        description = "Bindings to htslib";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "HsHaruPDF" = callPackage
@@ -10763,8 +9927,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell binding to libharu (http://libharu.sourceforge.net/)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HsHyperEstraier" = callPackage
@@ -10781,8 +9943,6 @@ self: {
        libraryPkgconfigDepends = [ hyperestraier qdbm ];
        description = "HyperEstraier binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {hyperestraier = null; qdbm = null;};
 
   "HsJudy" = callPackage
@@ -10796,8 +9956,6 @@ self: {
        librarySystemDepends = [ Judy ];
        description = "Judy bindings, and some nice APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
@@ -10837,8 +9995,6 @@ self: {
        ];
        description = "Haskell integration with Parrot virtual machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HsPerl5" = callPackage
@@ -10850,8 +10006,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to embedded Perl 5 interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HsSVN" = callPackage
@@ -10863,8 +10017,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl stm ];
        description = "Partial Subversion (SVN) binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HsSyck" = callPackage
@@ -10913,8 +10065,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Webots bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {Controller = null; driver = null;};
 
   "HsYAML" = callPackage
@@ -10979,8 +10129,6 @@ self: {
        ];
        description = "Stream Editor in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hsmtlib" = callPackage
@@ -10998,8 +10146,6 @@ self: {
        ];
        description = "Haskell library for easy interaction with SMT-LIB 2 compliant solvers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HueAPI" = callPackage
@@ -11015,8 +10161,6 @@ self: {
        ];
        description = "API for controlling Philips Hue lights";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HulkImport" = callPackage
@@ -11034,8 +10178,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Easily bulk import CSV data to SQL Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hungarian-Munkres" = callPackage
@@ -11073,8 +10215,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "The library for generating a WebGL scene for the web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "I1M" = callPackage
@@ -11089,8 +10229,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Code for the Haskell course taught at the University of Seville";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IDynamic" = callPackage
@@ -11102,8 +10240,6 @@ self: {
        libraryHaskellDepends = [ base containers directory ];
        description = "Indexable, serializable form of Data.Dynamic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IFS" = callPackage
@@ -11119,8 +10255,6 @@ self: {
        ];
        description = "Iterated Function System generation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "INblobs" = callPackage
@@ -11140,8 +10274,6 @@ self: {
        ];
        description = "Editor and interpreter for Interaction Nets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IOR" = callPackage
@@ -11154,8 +10286,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IORefCAS" = callPackage
@@ -11174,8 +10304,6 @@ self: {
        ];
        description = "Atomic compare and swap for IORefs and STRefs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IOSpec" = callPackage
@@ -11233,8 +10361,6 @@ self: {
        ];
        description = "A RESTful microService for IPv6-related data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IcoGrid" = callPackage
@@ -11246,8 +10372,6 @@ self: {
        libraryHaskellDepends = [ array base GlomeVec ];
        description = "Library for generating grids of hexagons and pentagons mapped to a sphere";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IfElse" = callPackage
@@ -11281,8 +10405,6 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "A library for writing Imperative style haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IndentParser" = callPackage
@@ -11305,8 +10427,6 @@ self: {
        libraryHaskellDepends = [ base PeanoWitnesses ];
        description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "InfixApplicative" = callPackage
@@ -11318,8 +10438,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "liftA2 for infix operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IntFormats" = callPackage
@@ -11332,8 +10450,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Convert integers in various bases to and from strings";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IntGraph" = callPackage
@@ -11372,8 +10488,6 @@ self: {
        ];
        description = "Data interning (with compact regions where possible)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Interpolation" = callPackage
@@ -11434,8 +10548,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "DSL for IRC bots";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IrrHaskell" = callPackage
@@ -11467,8 +10579,6 @@ self: {
        ];
        description = "A typeclass to determine if a given value is null";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JSON-Combinator" = callPackage
@@ -11486,8 +10596,6 @@ self: {
        ];
        description = "A combinator library on top of a generalised JSON type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JSON-Combinator-Examples" = callPackage
@@ -11501,8 +10609,6 @@ self: {
        ];
        description = "Example uses of the JSON-Combinator library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JSONParser" = callPackage
@@ -11534,8 +10640,6 @@ self: {
        ];
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JYU-Utils" = callPackage
@@ -11555,8 +10659,6 @@ self: {
        ];
        description = "Some utility functions for JYU projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JackMiniMix" = callPackage
@@ -11568,8 +10670,6 @@ self: {
        libraryHaskellDepends = [ base hosc ];
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Javasf" = callPackage
@@ -11586,8 +10686,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "Javav" = callPackage
@@ -11601,8 +10699,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Jazzkell" = callPackage
@@ -11626,8 +10722,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JsContracts" = callPackage
@@ -11650,8 +10744,6 @@ self: {
        ];
        description = "Design-by-contract for JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JsonGrammar" = callPackage
@@ -11673,8 +10765,6 @@ self: {
        ];
        description = "Combinators for bidirectional JSON parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JuPyTer-notebook" = callPackage
@@ -11691,8 +10781,6 @@ self: {
        ];
        description = "JuPyTer notebook parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JuicyPixels" = callPackage
@@ -11732,8 +10820,6 @@ self: {
        ];
        description = "BLP format decoder/encoder over JuicyPixels library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JuicyPixels-blurhash" = callPackage
@@ -11774,8 +10860,6 @@ self: {
        libraryHaskellDepends = [ base containers JuicyPixels ];
        description = "Functions for drawing lines, squares and so on pixel by pixel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JuicyPixels-extra" = callPackage
@@ -11867,8 +10951,6 @@ self: {
          filepath mtl network resourcet
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JunkDB-driver-gdbm" = callPackage
@@ -11883,8 +10965,6 @@ self: {
          base bytestring conduit directory filepath JunkDB mtl resourcet
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JunkDB-driver-hashtables" = callPackage
@@ -11899,8 +10979,6 @@ self: {
          base bytestring conduit hashable hashtables JunkDB mtl resourcet
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JustParse" = callPackage
@@ -11912,8 +10990,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple and comprehensive Haskell parsing library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "KMP" = callPackage
@@ -11937,8 +11013,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library with the kerbal space program universe and demo code";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Kalman" = callPackage
@@ -11950,8 +11024,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "A slightly extended Kalman filter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "KdTree" = callPackage
@@ -11979,8 +11051,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "KiCS" = callPackage
@@ -12079,8 +11149,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Category for Continuation Passing Style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Kulitta" = callPackage
@@ -12111,8 +11179,6 @@ self: {
        librarySystemDepends = [ kyotocabinet ];
        description = "Kyoto Cabinet DB bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) kyotocabinet;};
 
   "L-seed" = callPackage
@@ -12130,8 +11196,6 @@ self: {
        ];
        description = "Plant growing programming game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LATS" = callPackage
@@ -12148,8 +11212,6 @@ self: {
        librarySystemDepends = [ openblasCompat ];
        description = "Linear Algebra on Typed Spaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openblasCompat;};
 
   "LC3" = callPackage
@@ -12204,8 +11266,6 @@ self: {
        ];
        description = "Lightweight Directory Access Protocol (LDAP) version 3";
        license = stdenv.lib.licenses.gpl2Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LParse" = callPackage
@@ -12229,8 +11289,6 @@ self: {
        libraryHaskellDepends = [ base containers QuickCheck ];
        description = "Implements an LRU data structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LTS" = callPackage
@@ -12251,8 +11309,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion time ];
        description = "LTS: Labelled Transition System";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LTree" = callPackage
@@ -12313,8 +11369,6 @@ self: {
        ];
        description = "A type-safe EDSL for TouchDesigner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LambdaHack" = callPackage
@@ -12347,8 +11401,6 @@ self: {
        testHaskellDepends = [ async base filepath optparse-applicative ];
        description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LambdaINet" = callPackage
@@ -12368,8 +11420,6 @@ self: {
        ];
        description = "Graphical Interaction Net Evaluator for Optimal Evaluation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LambdaNet" = callPackage
@@ -12385,8 +11435,6 @@ self: {
        ];
        description = "A configurable and extensible neural network library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LambdaPrettyQuote" = callPackage
@@ -12411,8 +11459,6 @@ self: {
        ];
        description = "Quasiquoter, and Arbitrary helpers for the lambda calculus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LambdaShell" = callPackage
@@ -12430,8 +11476,6 @@ self: {
        ];
        description = "Simple shell for evaluating lambda expressions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Lambdajudge" = callPackage
@@ -12444,8 +11488,6 @@ self: {
        testHaskellDepends = [ base filepath hspec mtl process text ];
        description = "A library to easily host Haskell based programming competitions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Lambdaya" = callPackage
@@ -12462,8 +11504,6 @@ self: {
        ];
        description = "Library for RedPitaya";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LargeCardinalHierarchy" = callPackage
@@ -12492,8 +11532,6 @@ self: {
        ];
        description = "A library for compiling programs in a variety of languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Lattices" = callPackage
@@ -12543,8 +11581,6 @@ self: {
        executableHaskellDepends = [ base directory filepath unix ];
        description = "A simple sandboxing tool for Haskell packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Learning" = callPackage
@@ -12560,8 +11596,6 @@ self: {
        testHaskellDepends = [ base containers hmatrix vector ];
        description = "The most frequently used machine learning tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Level0" = callPackage
@@ -12575,8 +11609,6 @@ self: {
        executableHaskellDepends = [ base directory random SDL SDL-ttf ];
        description = "A Snake II clone written using SDL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LibClang" = callPackage
@@ -12597,8 +11629,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for libclang (a C++ parsing library)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (self.llvmPackages) clang; inherit (pkgs) ncurses;};
 
   "LibZip" = callPackage
@@ -12629,8 +11659,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Wrapper for data that can be unbounded";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LinearSplit" = callPackage
@@ -12645,8 +11673,6 @@ self: {
        ];
        description = "Partition the sequence of items to the subsequences in the order given";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LinguisticsTypes" = callPackage
@@ -12691,8 +11717,6 @@ self: {
        ];
        description = "Check a bunch of local html files for broken links";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Liquorice" = callPackage
@@ -12705,8 +11729,6 @@ self: {
        testHaskellDepends = [ base binary bytestring HTF mtl ];
        description = "Algorithmic Doom map generation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "List" = callPackage
@@ -12759,8 +11781,6 @@ self: {
        ];
        description = "List transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ListTree" = callPackage
@@ -12813,8 +11833,6 @@ self: {
        doHaddock = false;
        description = "Converter to convert from .lhs to .md and vice versa.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Logic" = callPackage
@@ -12826,8 +11844,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Logic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LogicGrowsOnTrees" = callPackage
@@ -12864,8 +11880,6 @@ self: {
        benchmarkHaskellDepends = [ base cereal criterion deepseq ];
        description = "a parallel implementation of logic programming using distributed tree exploration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LogicGrowsOnTrees-MPI" = callPackage
@@ -12887,8 +11901,6 @@ self: {
        librarySystemDepends = [ openmpi ];
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openmpi;};
 
   "LogicGrowsOnTrees-network" = callPackage
@@ -12914,8 +11926,6 @@ self: {
        ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LogicGrowsOnTrees-processes" = callPackage
@@ -12942,8 +11952,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion LogicGrowsOnTrees ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LslPlus" = callPackage
@@ -12964,8 +11972,6 @@ self: {
        ];
        description = "An execution and testing framework for the Linden Scripting Language (LSL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Lucu" = callPackage
@@ -12986,8 +11992,6 @@ self: {
        ];
        description = "HTTP Daemonic Library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Lykah" = callPackage
@@ -13016,8 +12020,6 @@ self: {
        ];
        description = "A static website and blog generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MASMGen" = callPackage
@@ -13030,8 +12032,6 @@ self: {
        testHaskellDepends = [ base containers mtl ];
        description = "Generate MASM code from haskell";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MBot" = callPackage
@@ -13043,8 +12043,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MC-Fold-DP" = callPackage
@@ -13063,8 +12061,6 @@ self: {
        executableHaskellDepends = [ cmdargs split ];
        description = "Folding algorithm based on nucleotide cyclic motifs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MFlow" = callPackage
@@ -13090,8 +12086,6 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "stateful, RESTful web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MHask" = callPackage
@@ -13103,8 +12097,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The category of monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MIP" = callPackage
@@ -13132,8 +12124,6 @@ self: {
        ];
        description = "Library for using Mixed Integer Programming (MIP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MSQueue" = callPackage
@@ -13145,8 +12135,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        description = "Michael-Scott queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MTGBuilder" = callPackage
@@ -13160,8 +12148,6 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Builds decks out of a meta";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MagicHaskeller" = callPackage
@@ -13191,8 +12177,6 @@ self: {
        ];
        description = "Automatic inductive functional programmer by systematic search";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MailchimpSimple" = callPackage
@@ -13211,8 +12195,6 @@ self: {
        ];
        description = "Haskell library to interact with Mailchimp JSON API Version 3.0";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Map" = callPackage
@@ -13229,8 +12211,6 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Class of key-value maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MapWith" = callPackage
@@ -13255,8 +12235,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mapping";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MaybeT" = callPackage
@@ -13270,8 +12248,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "MaybeT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MaybeT-monads-tf" = callPackage
@@ -13283,8 +12259,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf transformers ];
        description = "MaybeT monad transformer compatible with monads-tf (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MaybeT-transformers" = callPackage
@@ -13296,8 +12270,6 @@ self: {
        libraryHaskellDepends = [ base monads-fd transformers ];
        description = "MaybeT monad transformer using transformers instead of mtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MazesOfMonad" = callPackage
@@ -13317,8 +12289,6 @@ self: {
        ];
        description = "Console-based Role Playing Game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MeanShift" = callPackage
@@ -13330,8 +12300,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Mean shift algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Measure" = callPackage
@@ -13343,8 +12311,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for units of measurement";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Mecha" = callPackage
@@ -13356,8 +12322,6 @@ self: {
        libraryHaskellDepends = [ base machines ];
        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;
-       broken = true;
      }) {};
 
   "Mechs" = callPackage
@@ -13369,8 +12333,6 @@ self: {
        libraryHaskellDepends = [ base machines ];
        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;
-       broken = true;
      }) {};
 
   "MemoTrie" = callPackage
@@ -13399,8 +12361,6 @@ self: {
        ];
        description = "Statically checked database access";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MetaObject" = callPackage
@@ -13412,8 +12372,6 @@ self: {
        libraryHaskellDepends = [ base containers stringtable-atom ];
        description = "A meta-object system for Haskell based on Perl 6";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Metrics" = callPackage
@@ -13425,8 +12383,6 @@ self: {
        libraryHaskellDepends = [ base hstats ];
        description = "Evaluation metrics commonly used in supervised machine learning";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Mhailist" = callPackage
@@ -13445,8 +12401,6 @@ self: {
        ];
        description = "Haskell mailing list manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Michelangelo" = callPackage
@@ -13463,8 +12417,6 @@ self: {
        ];
        description = "OpenGL for dummies";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MicrosoftTranslator" = callPackage
@@ -13481,8 +12433,6 @@ self: {
        ];
        description = "Interface for Microsoft Translator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MiniAgda" = callPackage
@@ -13565,8 +12515,6 @@ self: {
        libraryHaskellDepends = [ anydbm base MissingH ];
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Mobile-Legends-Hack-Cheats" = callPackage
@@ -13589,8 +12537,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Modulo" = callPackage
@@ -13616,8 +12562,6 @@ self: {
        executableHaskellDepends = [ base GLUT random ];
        description = "A FRP library based on signal functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MoeDict" = callPackage
@@ -13633,8 +12577,6 @@ self: {
        ];
        description = "Utilities working with MoeDict.tw JSON dataset";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadCatchIO-mtl" = callPackage
@@ -13650,8 +12592,6 @@ self: {
        ];
        description = "Monad-transformer version of the Control.Exception module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadCatchIO-mtl-foreign" = callPackage
@@ -13663,8 +12603,6 @@ self: {
        libraryHaskellDepends = [ base MonadCatchIO-mtl mtl primitive ];
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadCatchIO-transformers" = callPackage
@@ -13680,8 +12618,6 @@ self: {
        ];
        description = "Monad-transformer compatible version of the Control.Exception module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadCatchIO-transformers-foreign" = callPackage
@@ -13697,8 +12633,6 @@ self: {
        ];
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadCompose" = callPackage
@@ -13710,8 +12644,6 @@ self: {
        libraryHaskellDepends = [ base free mmorph mtl transformers ];
        description = "Methods for composing monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadLab" = callPackage
@@ -13728,8 +12660,6 @@ self: {
        executableHaskellDepends = [ base haskell98 process ];
        description = "Automatically generate layered monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadPrompt" = callPackage
@@ -13778,8 +12708,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalizing lift to monad stacks";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Monadius" = callPackage
@@ -13794,8 +12722,6 @@ self: {
        executableHaskellDepends = [ array base directory GLUT OpenGL ];
        description = "2-D arcade scroller";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Monadoro" = callPackage
@@ -13811,8 +12737,6 @@ self: {
        testHaskellDepends = [ ansi-terminal base doctest process time ];
        description = "A minimalistic CLI Pomodoro timer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Monaris" = callPackage
@@ -13831,8 +12755,6 @@ self: {
        ];
        description = "A simple tetris clone";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Monatron" = callPackage
@@ -13844,8 +12766,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monad transformer library with uniform liftings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Monatron-IO" = callPackage
@@ -13857,8 +12777,6 @@ self: {
        libraryHaskellDepends = [ base Monatron transformers ];
        description = "MonadIO instances for the Monatron transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Monocle" = callPackage
@@ -13870,8 +12788,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "Symbolic computations in strict monoidal categories with LaTeX output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MorseCode" = callPackage
@@ -13903,8 +12819,6 @@ self: {
        ];
        description = "Automated Mutation Testing";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MuCheck-HUnit" = callPackage
@@ -13919,8 +12833,6 @@ self: {
        executableHaskellDepends = [ base HUnit MuCheck ];
        description = "Automated Mutation Testing for HUnit tests";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MuCheck-Hspec" = callPackage
@@ -13935,8 +12847,6 @@ self: {
        executableHaskellDepends = [ base hspec hspec-core MuCheck ];
        description = "Automated Mutation Testing for Hspec tests";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MuCheck-QuickCheck" = callPackage
@@ -13951,8 +12861,6 @@ self: {
        executableHaskellDepends = [ base MuCheck QuickCheck ];
        description = "Automated Mutation Testing for QuickCheck tests";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MuCheck-SmallCheck" = callPackage
@@ -13967,8 +12875,6 @@ self: {
        executableHaskellDepends = [ base MuCheck smallcheck ];
        description = "Automated Mutation Testing for SmallCheck tests";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Munkres" = callPackage
@@ -13991,8 +12897,6 @@ self: {
        libraryHaskellDepends = [ array base bimap containers Munkres ];
        description = "Simple and typesafe layer over the Munkres package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MusicBrainz" = callPackage
@@ -14059,8 +12963,6 @@ self: {
        ];
        description = "Most likely order of mutation events in RNA";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MyPrimes" = callPackage
@@ -14076,8 +12978,6 @@ self: {
        benchmarkHaskellDepends = [ base time ];
        description = "Generate all primes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NGrams" = callPackage
@@ -14091,8 +12991,6 @@ self: {
        executableHaskellDepends = [ base HCL HTTP network regex-compat ];
        description = "Simple application for calculating n-grams using Google";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NMap" = callPackage
@@ -14104,8 +13002,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A transparent nested Map structure";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NTRU" = callPackage
@@ -14146,8 +13042,6 @@ self: {
        ];
        description = "A Haskell interface to Lego Mindstorms NXT";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {bluetooth = null;};
 
   "NXTDSL" = callPackage
@@ -14166,8 +13060,6 @@ self: {
        ];
        description = "Generate NXC Code from DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NaCl" = callPackage
@@ -14189,8 +13081,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Easy-and-safe-to-use high-level Haskell bindings to NaCl";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NameGenerator" = callPackage
@@ -14218,8 +13108,6 @@ self: {
        executableHaskellDepends = [ base uu-parsinglib ];
        description = "Very small interpreter for a Prolog-like language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Naperian" = callPackage
@@ -14246,8 +13134,6 @@ self: {
        executableHaskellDepends = [ base hnetcdf Naperian split ];
        description = "Instances of NcStore for hypercuboids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NaturalLanguageAlphabets" = callPackage
@@ -14277,8 +13163,6 @@ self: {
        ];
        description = "Simple scoring schemes for word alignments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NaturalSort" = callPackage
@@ -14309,8 +13193,6 @@ self: {
        ];
        description = "Context Algebra of near";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Neks" = callPackage
@@ -14333,8 +13215,6 @@ self: {
        ];
        description = "Simple networked key/value store";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NestedFunctor" = callPackage
@@ -14346,8 +13226,6 @@ self: {
        libraryHaskellDepends = [ base comonad distributive ];
        description = "Nested composition of functors with a type index tracking nesting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NestedSampling" = callPackage
@@ -14372,8 +13250,6 @@ self: {
        testHaskellDepends = [ base bytestring HUnit process ];
        description = "Bindings for net-snmp's C API for clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {net_snmp = null;};
 
   "Network-NineP" = callPackage
@@ -14437,8 +13313,6 @@ self: {
        ];
        description = "Ninja game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NoHoed" = callPackage
@@ -14469,8 +13343,6 @@ self: {
        ];
        description = "Microbenchmarks for various array libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NoTrace" = callPackage
@@ -14483,8 +13355,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Remove all the functions come from Debug.Trace after debugging";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Noise" = callPackage
@@ -14515,8 +13385,6 @@ self: {
        ];
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Nomyx-Core" = callPackage
@@ -14543,8 +13411,6 @@ self: {
        ];
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Nomyx-Language" = callPackage
@@ -14564,8 +13430,6 @@ self: {
        ];
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Nomyx-Rules" = callPackage
@@ -14583,8 +13447,6 @@ self: {
        ];
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Nomyx-Web" = callPackage
@@ -14609,8 +13471,6 @@ self: {
        ];
        description = "Web gui for Nomyx";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NonEmpty" = callPackage
@@ -14622,8 +13482,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library providing a non-empty list datatype, and total functions operating on it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NonEmptyList" = callPackage
@@ -14640,8 +13498,6 @@ self: {
        ];
        description = "A list with a length of at least one";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NumInstances" = callPackage
@@ -14675,8 +13531,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NumberTheory" = callPackage
@@ -14689,8 +13543,6 @@ self: {
        testHaskellDepends = [ base containers HUnit primes ];
        description = "A library for number theoretic computations, written in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Numbers" = callPackage
@@ -14719,8 +13571,6 @@ self: {
        ];
        description = "Nussinov78 using the ADPfusion library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Nutri" = callPackage
@@ -14732,8 +13582,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A little library to calculate nutrition values of food items";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OGL" = callPackage
@@ -14745,8 +13593,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A context aware binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ONC-RPC" = callPackage
@@ -14771,8 +13617,6 @@ self: {
        executableHaskellDepends = [ base filepath ];
        description = "ONC RPC (aka Sun RPC) and XDR library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OSM" = callPackage
@@ -14788,8 +13632,6 @@ self: {
        ];
        description = "Parse OpenStreetMap files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OTP" = callPackage
@@ -14809,8 +13651,6 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit time ];
        description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Object" = callPackage
@@ -14822,8 +13662,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc template-haskell ];
        description = "Object oriented programming for haskell using multiparameter typeclasses";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ObjectIO" = callPackage
@@ -14839,8 +13677,6 @@ self: {
          winspool
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {comctl32 = null; comdlg32 = null; gdi32 = null; 
          kernel32 = null; ole32 = null; shell32 = null; user32 = null; 
          winmm = null; winspool = null;};
@@ -14889,8 +13725,6 @@ self: {
        ];
        description = "Simple unbalanced Octree for storing data about 3D points";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OddWord" = callPackage
@@ -14904,8 +13738,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Provides a wrapper for deriving word types with fewer bits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Omega" = callPackage
@@ -14918,8 +13750,6 @@ self: {
        testHaskellDepends = [ base containers HUnit ];
        description = "Integer sets and relations using Presburger arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OnRmt" = callPackage
@@ -14956,8 +13786,6 @@ self: {
        ];
        description = "Text UI library for performing parallel remote SSH operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OneTuple" = callPackage
@@ -14998,8 +13826,6 @@ self: {
        ];
        description = "IBM AFP document format parser and generator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenAFP-Utils" = callPackage
@@ -15020,8 +13846,6 @@ self: {
        ];
        description = "Assorted utilities to work with AFP data streams";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenAL" = callPackage
@@ -15054,8 +13878,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell high-level wrapper for OpenCL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OpenCL = null;};
 
   "OpenCLRaw" = callPackage
@@ -15067,8 +13889,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenCLWrappers" = callPackage
@@ -15080,8 +13900,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenGL" = callPackage
@@ -15113,8 +13931,6 @@ self: {
        ];
        description = "Quickcheck instances for various data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenGLRaw" = callPackage
@@ -15162,8 +13978,6 @@ self: {
        ];
        description = "ADT wrapper and renderer for OpenSCAD models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenVG" = callPackage
@@ -15175,8 +13989,6 @@ self: {
        libraryHaskellDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ];
        description = "OpenVG (ShivaVG-0.2.1) binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenVGRaw" = callPackage
@@ -15188,8 +14000,6 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw ];
        description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation).";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Operads" = callPackage
@@ -15201,8 +14011,6 @@ self: {
        libraryHaskellDepends = [ array base containers mtl ];
        description = "Groebner basis computation for Operads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OptDir" = callPackage
@@ -15230,8 +14038,6 @@ self: {
        ];
        description = "A quasiquoter for or-patterns";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OrchestrateDB" = callPackage
@@ -15251,8 +14057,6 @@ self: {
        ];
        description = "Unofficial Haskell Client Library for the Orchestrate.io API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OrderedBits" = callPackage
@@ -15298,8 +14102,6 @@ self: {
        testHaskellDepends = [ base safe threepenny-gui ];
        description = "A Programming Language in Construction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Oslo-Vectize" = callPackage
@@ -15315,8 +14117,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PArrows" = callPackage
@@ -15341,8 +14141,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring Crypto random ];
        description = "Make password-based security schemes more secure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PCLT" = callPackage
@@ -15356,8 +14154,6 @@ self: {
        ];
        description = "Extension to Show: templating, catalogizing, languages, parameters, etc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PCLT-DB" = callPackage
@@ -15374,8 +14170,6 @@ self: {
        ];
        description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PDBtools" = callPackage
@@ -15400,8 +14194,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A generic derivable Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PSQueue" = callPackage
@@ -15432,8 +14224,6 @@ self: {
        ];
        description = "An implementation of Montague's PTQ";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PUH-Project" = callPackage
@@ -15453,8 +14243,6 @@ self: {
        ];
        description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PageIO" = callPackage
@@ -15481,8 +14269,6 @@ self: {
        ];
        description = "Page-oriented extraction and composition library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Paillier" = callPackage
@@ -15501,8 +14287,6 @@ self: {
        ];
        description = "a simple Paillier cryptosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PandocAgda" = callPackage
@@ -15523,8 +14307,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pandoc support for literate Agda";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Paraiso" = callPackage
@@ -15549,8 +14331,6 @@ self: {
        ];
        description = "a code generator for partial differential equations solvers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Parallel-Arrows-BaseSpec" = callPackage
@@ -15600,8 +14380,6 @@ self: {
        ];
        description = "Eden based backend for @Parallel-Arrows-Definition@";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Parallel-Arrows-Multicore" = callPackage
@@ -15657,8 +14435,6 @@ self: {
        ];
        description = "A proven synchronization server for high performance computing";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ParsecTools" = callPackage
@@ -15703,8 +14479,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Simple library for generating passwords";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PastePipe" = callPackage
@@ -15735,8 +14509,6 @@ self: {
        ];
        description = "A tree used to merge and maintain paths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Pathfinder" = callPackage
@@ -15749,8 +14521,6 @@ self: {
        librarySystemDepends = [ libxml2 ];
        description = "Relational optimiser and code generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libxml2;};
 
   "Peano" = callPackage
@@ -15773,8 +14543,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "GADT type witnesses for Peano-style natural numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PerfectHash" = callPackage
@@ -15791,8 +14559,6 @@ self: {
        librarySystemDepends = [ cmph ];
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cmph = null;};
 
   "PermuteEffects" = callPackage
@@ -15804,8 +14570,6 @@ self: {
        libraryHaskellDepends = [ base ReplicateEffects ];
        description = "Permutations of effectful computations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Persistence" = callPackage
@@ -15824,8 +14588,6 @@ self: {
        ];
        description = "A versatile library for topological data analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Phsu" = callPackage
@@ -15850,8 +14612,6 @@ self: {
        ];
        description = "Personal Happstack Server Utils";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Pipe" = callPackage
@@ -15863,8 +14623,6 @@ self: {
        libraryHaskellDepends = [ base filepath process unix ];
        description = "Process piping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Piso" = callPackage
@@ -15876,8 +14634,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Partial isomorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PlayHangmanGame" = callPackage
@@ -15911,8 +14667,6 @@ self: {
        ];
        description = "Playing cards api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Plot-ho-matic" = callPackage
@@ -15934,8 +14688,6 @@ self: {
        ];
        description = "Real-time line plotter for generic data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PlslTools" = callPackage
@@ -15955,8 +14707,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "Plural" = callPackage
@@ -15981,8 +14731,6 @@ self: {
        executableHaskellDepends = [ array base clock GLUT random ];
        description = "An imaginary world";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PortFusion" = callPackage
@@ -15996,8 +14744,6 @@ self: {
        executableHaskellDepends = [ base bytestring network splice ];
        description = "high-performance distributed reverse / forward proxy & tunneling for TCP";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PortMidi" = callPackage
@@ -16093,8 +14839,6 @@ self: {
        ];
        description = "Pretty-printing for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Printf-TH" = callPackage
@@ -16105,8 +14849,6 @@ self: {
        sha256 = "0n1gva510p69vy25zvjkzwqqz2gilbns1wnrzz2p22rjkkbrinvx";
        libraryHaskellDepends = [ base haskell98 pretty template-haskell ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PriorityChansConverger" = callPackage
@@ -16118,8 +14860,6 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        description = "Read single output from an array of inputs - channels with priorities";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ProbabilityMonads" = callPackage
@@ -16131,8 +14871,6 @@ self: {
        libraryHaskellDepends = [ base MaybeT MonadRandom mtl ];
        description = "Probability distribution monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PropLogic" = callPackage
@@ -16161,8 +14899,6 @@ self: {
        executableHaskellDepends = [ base containers HUnit parsec syb ];
        description = "An implementation of propositional logic in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ProxN" = callPackage
@@ -16198,8 +14934,6 @@ self: {
        ];
        description = "A Perl 6 Implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Pup-Events" = callPackage
@@ -16219,8 +14953,6 @@ self: {
        doHaddock = false;
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Pup-Events-Client" = callPackage
@@ -16254,8 +14986,6 @@ self: {
        ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Pup-Events-PQueue" = callPackage
@@ -16282,8 +15012,6 @@ self: {
        ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PyF" = callPackage
@@ -16306,8 +15034,6 @@ self: {
        ];
        description = "Quasiquotations for a python like interpolated string formater";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QIO" = callPackage
@@ -16319,8 +15045,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl old-time random ];
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QLearn" = callPackage
@@ -16332,8 +15056,6 @@ self: {
        libraryHaskellDepends = [ base random vector ];
        description = "A library for fast, easy-to-use Q-learning";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QuadEdge" = callPackage
@@ -16345,8 +15067,6 @@ self: {
        libraryHaskellDepends = [ base random vector ];
        description = "QuadEdge structure for representing triangulations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QuadTree" = callPackage
@@ -16359,8 +15079,6 @@ self: {
        testHaskellDepends = [ base composition lens QuickCheck ];
        description = "QuadTree library for Haskell, with lens support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QuasiText" = callPackage
@@ -16396,8 +15114,6 @@ self: {
        ];
        description = "Programming with Eventual Consistency over Cassandra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QuickAnnotate" = callPackage
@@ -16412,8 +15128,6 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts ];
        description = "Annotation Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QuickCheck_1_2_0_1" = callPackage
@@ -16501,8 +15215,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Generator of \"valid\" and \"invalid\" data in a type class";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QuickPlot" = callPackage
@@ -16526,8 +15238,6 @@ self: {
        ];
        description = "Quick and easy data visualization with Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Quickson" = callPackage
@@ -16542,8 +15252,6 @@ self: {
        ];
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "R-pandoc" = callPackage
@@ -16561,8 +15269,6 @@ self: {
        ];
        executableHaskellDepends = [ base pandoc-types ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RANSAC" = callPackage
@@ -16638,8 +15344,6 @@ self: {
        ];
        description = "A reflective JSON serializer/parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RLP" = callPackage
@@ -16652,8 +15356,6 @@ self: {
        testHaskellDepends = [ base binary bytestring hspec ];
        description = "RLP serialization as defined in Ethereum Yellow Paper";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RMP" = callPackage
@@ -16674,8 +15376,6 @@ self: {
        executableSystemDepends = [ canlib ftd2xx ];
        description = "Binding to code that controls a Segway RMP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {canlib = null; ftd2xx = null;};
 
   "RNAFold" = callPackage
@@ -16698,8 +15398,6 @@ self: {
        ];
        description = "RNA secondary structure prediction";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RNAFoldProgs" = callPackage
@@ -16719,8 +15417,6 @@ self: {
        ];
        description = "RNA secondary structure folding";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RNAdesign" = callPackage
@@ -16746,8 +15442,6 @@ self: {
        executableHaskellDepends = [ bytestring cmdargs file-embed ];
        description = "Multi-target RNA sequence design";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RNAdraw" = callPackage
@@ -16767,8 +15461,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "Draw RNA secondary structures";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RNAlien" = callPackage
@@ -16801,8 +15493,6 @@ self: {
        ];
        description = "Unsupervized construction of RNA family models";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RNAwolf" = callPackage
@@ -16823,8 +15513,6 @@ self: {
        executableHaskellDepends = [ cmdargs split ];
        description = "RNA folding with non-canonical basepairs and base-triplets";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RSA" = callPackage
@@ -16929,8 +15617,6 @@ self: {
        libraryHaskellDepends = [ base HTTP-Simple network ];
        description = "Interface to random.org";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Randometer" = callPackage
@@ -16944,8 +15630,6 @@ self: {
        executableHaskellDepends = [ base random-fu ];
        description = "Randomness intuition trainer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Range" = callPackage
@@ -16957,8 +15641,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data structure for managing ranges";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Ranged-sets" = callPackage
@@ -16989,8 +15671,6 @@ self: {
        ];
        description = "HTTP to XMPP omegle chats gate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Rasenschach" = callPackage
@@ -17011,8 +15691,6 @@ self: {
        ];
        description = "Soccer simulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Rasterific" = callPackage
@@ -17084,8 +15762,6 @@ self: {
        ];
        description = "Library to access Redmine's REST services";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Ref" = callPackage
@@ -17097,8 +15773,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RefSerialize" = callPackage
@@ -17134,8 +15808,6 @@ self: {
        ];
        description = "A utility for computing distributions of material to review among reviewers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RepLib" = callPackage
@@ -17151,8 +15823,6 @@ self: {
        ];
        description = "Generic programming library with representation types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ReplicateEffects" = callPackage
@@ -17164,8 +15834,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Composable replication schemes of applicative functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ReviewBoard" = callPackage
@@ -17184,8 +15852,6 @@ self: {
        ];
        description = "Haskell bindings to ReviewBoard";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RichConditional" = callPackage
@@ -17197,8 +15863,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Tiny library to replace classic if/else";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Ritt-Wu" = callPackage
@@ -17227,8 +15891,6 @@ self: {
        ];
        description = "Parallel implementation of Ritt-Wu's algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Rlang-QQ" = callPackage
@@ -17252,8 +15914,6 @@ self: {
        testHaskellDepends = [ base directory doctest hspec lens vector ];
        description = "quasiquoter for inline-R code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RollingDirectory" = callPackage
@@ -17278,8 +15938,6 @@ self: {
        ];
        description = "Limits the size of a directory's contents";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RoyalMonad" = callPackage
@@ -17309,8 +15967,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit vector ];
        description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) alsaLib;};
 
   "RxHaskell" = callPackage
@@ -17322,8 +15978,6 @@ self: {
        libraryHaskellDepends = [ base containers stm transformers ];
        description = "Reactive Extensions for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "S3" = callPackage
@@ -17344,8 +15998,6 @@ self: {
        ];
        description = "Library for accessing S3 compatible storage services";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SBench" = callPackage
@@ -17363,8 +16015,6 @@ self: {
        ];
        description = "A benchmark suite for runtime and heap measurements over a series of inputs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SCRIPTWriter" = callPackage
@@ -17384,8 +16034,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "ESCRIPT: a human friendly language for programming Bitcoin scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SCalendar" = callPackage
@@ -17402,8 +16050,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "SDL" = callPackage
@@ -17519,8 +16165,6 @@ self: {
        ];
        description = "SFML bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {csfml-audio = null; csfml-graphics = null; 
          csfml-network = null; csfml-system = null; csfml-window = null; 
          sfml-audio = null; sfml-graphics = null; sfml-network = null; 
@@ -17535,8 +16179,6 @@ self: {
        libraryHaskellDepends = [ base mtl SFML template-haskell ];
        description = "Higher level library on top of SFML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SFont" = callPackage
@@ -17548,8 +16190,6 @@ self: {
        libraryHaskellDepends = [ array base SDL Sprig ];
        description = "SFont SDL Bitmap Fonts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SG" = callPackage
@@ -17561,8 +16201,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SGdemo" = callPackage
@@ -17576,8 +16214,6 @@ self: {
        executableHaskellDepends = [ base GLUT OpenGL SG ];
        description = "An example of using the SG and OpenGL libraries";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SGplus" = callPackage
@@ -17589,8 +16225,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "(updated) Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SHA" = callPackage
@@ -17639,8 +16273,6 @@ self: {
        ];
        description = "A simple SMTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SNet" = callPackage
@@ -17657,8 +16289,6 @@ self: {
        libraryToolDepends = [ c2hsc ];
        description = "Declarative coördination language for streaming networks";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SQLDeps" = callPackage
@@ -17689,8 +16319,6 @@ self: {
        testHaskellDepends = [ base containers ];
        description = "STG Symbolic Execution";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "STL" = callPackage
@@ -17702,8 +16330,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
        description = "STL 3D geometry format parsing and pretty-printing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "STLinkUSB" = callPackage
@@ -17719,8 +16345,6 @@ self: {
        ];
        description = "STLink USB interface in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "STM32-Zombie" = callPackage
@@ -17737,8 +16361,6 @@ self: {
        ];
        description = "control a STM32F103 microcontroller";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "STM32F103xx-SVD" = callPackage
@@ -17781,8 +16403,6 @@ self: {
        ];
        description = "translate a SVD of a Microcontroller to Haskell tables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SVG2Q" = callPackage
@@ -17800,8 +16420,6 @@ self: {
        ];
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SVGFonts" = callPackage
@@ -17868,8 +16486,6 @@ self: {
        ];
        description = "Generate a parser (in Haskell) with the SableCC parser generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Safe" = callPackage
@@ -17907,8 +16523,6 @@ self: {
        librarySystemDepends = [ glib mono ];
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "Saturnin" = callPackage
@@ -17932,8 +16546,6 @@ self: {
        testHaskellDepends = [ base data-default either hlint hspec mtl ];
        description = "Saturnin CI / Job System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SciBaseTypes" = callPackage
@@ -17962,8 +16574,6 @@ self: {
        ];
        description = "Base types and classes for statistics, sciences and humanities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SciFlow" = callPackage
@@ -17988,8 +16598,6 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SciFlow-drmaa" = callPackage
@@ -18006,8 +16614,6 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ScratchFs" = callPackage
@@ -18026,8 +16632,6 @@ self: {
        ];
        description = "Size limited temp filesystem based on fuse";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Scurry" = callPackage
@@ -18046,8 +16650,6 @@ self: {
        ];
        description = "A cross platform P2P VPN application built using Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SecureHash-SHA3" = callPackage
@@ -18098,8 +16700,6 @@ self: {
        ];
        description = "Selects a representative subset of sequences from multiple sequence alignment";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Semantique" = callPackage
@@ -18118,8 +16718,6 @@ self: {
        ];
        description = "Command-line tool for maintaining the Semantique database";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Semigroup" = callPackage
@@ -18131,8 +16729,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers mtl ];
        description = "A semigroup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SeqAlign" = callPackage
@@ -18144,8 +16740,6 @@ self: {
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SessionLogger" = callPackage
@@ -18161,8 +16755,6 @@ self: {
        ];
        description = "Easy Loggingframework";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Set" = callPackage
@@ -18216,8 +16808,6 @@ self: {
        libraryHaskellDepends = [ base directory mtl unix ];
        description = "A framework for creating shell envinronments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shellac-compatline" = callPackage
@@ -18231,8 +16821,6 @@ self: {
        libraryHaskellDepends = [ base Shellac Shellac-readline ];
        description = "\"compatline\" backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shellac-editline" = callPackage
@@ -18246,8 +16834,6 @@ self: {
        libraryHaskellDepends = [ base editline Shellac ];
        description = "Editline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shellac-haskeline" = callPackage
@@ -18259,8 +16845,6 @@ self: {
        libraryHaskellDepends = [ base haskeline mtl Shellac ];
        description = "Haskeline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shellac-readline" = callPackage
@@ -18274,8 +16858,6 @@ self: {
        libraryHaskellDepends = [ base readline Shellac ];
        description = "Readline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ShortestPathProblems" = callPackage
@@ -18296,8 +16878,6 @@ self: {
        ];
        description = "grammars for TSP and SHP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ShowF" = callPackage
@@ -18325,8 +16905,6 @@ self: {
        ];
        description = "A programming model for declarative, high performance user interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shpadoinkle-backend-pardiff" = callPackage
@@ -18346,8 +16924,6 @@ self: {
        ];
        description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shpadoinkle-backend-snabbdom" = callPackage
@@ -18363,8 +16939,6 @@ self: {
        ];
        description = "Use the high-performance Snabbdom virtual dom library written in JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shpadoinkle-backend-static" = callPackage
@@ -18376,8 +16950,6 @@ self: {
        libraryHaskellDepends = [ base compactable Shpadoinkle text ];
        description = "A backend for rendering Shpadoinkle as Text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shpadoinkle-console" = callPackage
@@ -18429,8 +17001,6 @@ self: {
        ];
        description = "Example usages of Shpadoinkle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shpadoinkle-html" = callPackage
@@ -18448,8 +17018,6 @@ self: {
        ];
        description = "A typed, template generated Html DSL, and helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shpadoinkle-lens" = callPackage
@@ -18461,8 +17029,6 @@ self: {
        libraryHaskellDepends = [ base lens Shpadoinkle text ];
        description = "Lens combinators for Shpadoinkle applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shpadoinkle-router" = callPackage
@@ -18484,8 +17050,6 @@ self: {
        ];
        description = "A single page application rounter for Shpadoinkle based on Servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shpadoinkle-widgets" = callPackage
@@ -18506,8 +17070,6 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A collection of common reusable types and components";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shrub" = callPackage
@@ -18570,8 +17132,6 @@ self: {
        ];
        description = "A Simple Graphics Library from the SimpleH framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SimpleH" = callPackage
@@ -18608,8 +17168,6 @@ self: {
        ];
        description = "Simple, configurable logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SimpleServer" = callPackage
@@ -18630,8 +17188,6 @@ self: {
        ];
        description = "A simple static file server, for when apache is overkill";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SimpleTableGenerator" = callPackage
@@ -18693,8 +17249,6 @@ self: {
        testHaskellDepends = [ base file-embed ];
        description = "Generate slides from Haskell code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Smooth" = callPackage
@@ -18710,8 +17264,6 @@ self: {
        ];
        description = "A tiny, lazy SMT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SmtLib" = callPackage
@@ -18723,8 +17275,6 @@ self: {
        libraryHaskellDepends = [ base parsec transformers ];
        description = "Library for parsing SMTLIB2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Snusmumrik" = callPackage
@@ -18747,8 +17297,6 @@ self: {
        executableToolDepends = [ cpphs ];
        description = "E-library directory based on FUSE virtual file system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zip;};
 
   "SoOSiM" = callPackage
@@ -18765,8 +17313,6 @@ self: {
        ];
        description = "Abstract full system simulator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SoccerFun" = callPackage
@@ -18786,8 +17332,6 @@ self: {
        ];
        description = "Football simulation framework for teaching functional programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SoccerFunGL" = callPackage
@@ -18807,8 +17351,6 @@ self: {
        ];
        description = "OpenGL UI for the SoccerFun framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Sonnex" = callPackage
@@ -18821,8 +17363,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Sonnex is an alternative to Soundex for french language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SourceGraph" = callPackage
@@ -18841,8 +17381,6 @@ self: {
        ];
        description = "Static code analysis using graph-theoretic techniques";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Southpaw" = callPackage
@@ -18875,8 +17413,6 @@ self: {
        executableHaskellDepends = [ array base HGL random Yampa ];
        description = "Video game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SpacePrivateers" = callPackage
@@ -18898,8 +17434,6 @@ self: {
        ];
        description = "Simple space pirate roguelike";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SpinCounter" = callPackage
@@ -18911,8 +17445,6 @@ self: {
        libraryHaskellDepends = [ base monad-loops ref-mtl stm ];
        description = "Lock free Spin Counter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spintax" = callPackage
@@ -18953,8 +17485,6 @@ self: {
        ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-api" = callPackage
@@ -18981,8 +17511,6 @@ self: {
        ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-api-server" = callPackage
@@ -18994,8 +17522,6 @@ self: {
        libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-auth" = callPackage
@@ -19007,8 +17533,6 @@ self: {
        libraryHaskellDepends = [ base http-types Spock text time ];
        description = "Provides authentification helpers for Spock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-core" = callPackage
@@ -19053,8 +17577,6 @@ self: {
        ];
        description = "Digestive functors support for Spock";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-lucid" = callPackage
@@ -19066,8 +17588,6 @@ self: {
        libraryHaskellDepends = [ base lucid Spock transformers ];
        description = "Lucid support for Spock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-worker" = callPackage
@@ -19085,8 +17605,6 @@ self: {
        testHaskellDepends = [ base containers HTF stm vector ];
        description = "Background workers for Spock";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SpreadsheetML" = callPackage
@@ -19109,8 +17627,6 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to Sprig";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Stack" = callPackage
@@ -19138,8 +17654,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A simple MVCC like library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "StateVar" = callPackage
@@ -19189,8 +17703,6 @@ self: {
        ];
        description = "Libary for Stockholm aligmnent format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Stomp" = callPackage
@@ -19206,8 +17718,6 @@ self: {
        ];
        description = "Client library for Stomp brokers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Strafunski-ATermLib" = callPackage
@@ -19219,8 +17729,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "An abstract data type designed for the exchange of tree-like data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Strafunski-Sdf2Haskell" = callPackage
@@ -19240,8 +17748,6 @@ self: {
        ];
        description = "Converts SDF to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Strafunski-StrategyLib" = callPackage
@@ -19272,8 +17778,6 @@ self: {
        testHaskellDepends = [ base blaze-builder bytestring hspec text ];
        description = "General purpose templates in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "StrategyLib" = callPackage
@@ -19308,8 +17812,6 @@ self: {
        libraryHaskellDepends = [ base benchpress parallel ];
        description = "Benchmarking code through strict evaluation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "StrictCheck" = callPackage
@@ -19328,8 +17830,6 @@ self: {
        ];
        description = "StrictCheck: Keep Your Laziness In Check";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "StringUtils" = callPackage
@@ -19367,8 +17867,6 @@ self: {
        ];
        description = "Suffix array construction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SybWidget" = callPackage
@@ -19384,8 +17882,6 @@ self: {
        ];
        description = "Library which aids constructing generic (SYB3-based) widgets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SyntaxMacros" = callPackage
@@ -19402,8 +17898,6 @@ self: {
        ];
        description = "Syntax Macros in the form of an EDSL";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Sysmon" = callPackage
@@ -19424,8 +17918,6 @@ self: {
        ];
        description = "Sybase 15 sysmon reports processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TBC" = callPackage
@@ -19446,8 +17938,6 @@ self: {
        ];
        description = "Testing By Convention";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TBit" = callPackage
@@ -19464,8 +17954,6 @@ self: {
        ];
        description = "Utilities for condensed matter physics tight binding calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TCache" = callPackage
@@ -19514,8 +18002,6 @@ self: {
        executableHaskellDepends = [ base bytestring Yampa ];
        description = "Bindings to the TORCS vehicle simulator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TTTAS" = callPackage
@@ -19553,8 +18039,6 @@ self: {
        ];
        description = "Template Your Boilerplate - a Template Haskell version of SYB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TableAlgebra" = callPackage
@@ -19583,8 +18067,6 @@ self: {
        executableHaskellDepends = [ base cookbook ];
        description = "A client for Quill databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Tablify" = callPackage
@@ -19598,8 +18080,6 @@ self: {
        executableHaskellDepends = [ base parsec xhtml ];
        description = "Tool to render CSV into tables of various formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Tahin" = callPackage
@@ -19643,8 +18123,6 @@ self: {
        libraryHaskellDepends = [ base mtl old-time time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Tape" = callPackage
@@ -19656,8 +18134,6 @@ self: {
        libraryHaskellDepends = [ base comonad distributive Stream ];
        description = "Bidirectionally infinite streams, akin to the tape of a Turing machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TaskMonad" = callPackage
@@ -19676,8 +18152,6 @@ self: {
        ];
        description = "A collection of tools which can be used to access taskwarrior from xmonad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Taxonomy" = callPackage
@@ -19693,8 +18167,6 @@ self: {
        ];
        description = "Libary for parsing, processing and vizualization of taxonomy data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TaxonomyTools" = callPackage
@@ -19714,8 +18186,6 @@ self: {
        ];
        description = "Tool for parsing, processing, comparing and visualizing taxonomy data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TeX-my-math" = callPackage
@@ -19742,8 +18212,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "TeaHS" = callPackage
@@ -19759,8 +18227,6 @@ self: {
        ];
        description = "TeaHS Game Creation Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Tensor" = callPackage
@@ -19804,8 +18270,6 @@ self: {
        ];
        description = "Generates testcases from program-snippets";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Theora" = callPackage
@@ -19817,8 +18281,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ogg theora ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ogg = null; theora = null;};
 
   "Thingie" = callPackage
@@ -19830,8 +18292,6 @@ self: {
        libraryHaskellDepends = [ base cairo gtk mtl ];
        description = "Purely functional 2D drawing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ThreadObjects" = callPackage
@@ -19889,8 +18349,6 @@ self: {
        ];
        description = "A sub-project (exercise) for a functional programming course";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TigerHash" = callPackage
@@ -19925,8 +18383,6 @@ self: {
        ];
        description = "A simple tile-based digital clock screen saver";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TinyLaunchbury" = callPackage
@@ -19938,8 +18394,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Simple implementation of call-by-need using Launchbury's semantics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TinyURL" = callPackage
@@ -19951,8 +18405,6 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Use TinyURL to compress URLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Titim" = callPackage
@@ -19966,8 +18418,6 @@ self: {
        executableHaskellDepends = [ base containers matrix random ];
        description = "Game for Lounge Marmelade";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Top" = callPackage
@@ -19982,8 +18432,6 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Constraint solving framework employed by the Helium Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TotalMap" = callPackage
@@ -20003,8 +18451,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A total map datatype";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Tournament" = callPackage
@@ -20022,8 +18468,6 @@ self: {
        ];
        description = "Tournament related algorithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TraceUtils" = callPackage
@@ -20052,8 +18496,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "eDSL in R for Safe Variable Transformarion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TransformersStepByStep" = callPackage
@@ -20067,8 +18509,6 @@ self: {
        executableHaskellDepends = [ base containers mtl ];
        description = "Tutorial on monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Transhare" = callPackage
@@ -20091,8 +18531,6 @@ self: {
        libraryHaskellDepends = [ base ref-mtl stm ];
        description = "Wait-free Tree Counter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TreeStructures" = callPackage
@@ -20104,8 +18542,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of heaps and search trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TreeT" = callPackage
@@ -20128,8 +18564,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        description = "Lock free Treiber stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TrendGraph" = callPackage
@@ -20146,8 +18580,6 @@ self: {
        ];
        description = "A simple trend Graph script";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TrieMap" = callPackage
@@ -20165,8 +18597,6 @@ self: {
        ];
        description = "Automatic type inference of generalized tries with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Twofish" = callPackage
@@ -20205,8 +18635,6 @@ self: {
        ];
        description = "Typing speed game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TypeCompose" = callPackage
@@ -20233,8 +18661,6 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "TypeIlluminator is a prototype tool exploring debugging of type errors/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TypeNat" = callPackage
@@ -20246,8 +18672,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some Nat-indexed types for GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TypingTester" = callPackage
@@ -20293,8 +18717,6 @@ self: {
        ];
        description = "A small command-line accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "URLT" = callPackage
@@ -20312,8 +18734,6 @@ self: {
        ];
        description = "Library for maintaining correctness of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "URLb" = callPackage
@@ -20325,8 +18745,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "DEPRECATED A simple, liberal URL parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "UTFTConverter" = callPackage
@@ -20350,8 +18768,6 @@ self: {
        ];
        description = "Processing popular picture formats into .c or .raw format in RGB565";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Unique" = callPackage
@@ -20411,8 +18827,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monadic FRP library based on stm";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "UrlDisp" = callPackage
@@ -20424,8 +18838,6 @@ self: {
        libraryHaskellDepends = [ base cgi MaybeT mtl ];
        description = "Url dispatcher. Helps to retain friendly URLs in web applications.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Useful" = callPackage
@@ -20478,8 +18890,6 @@ self: {
        ];
        description = "Provides access to Vkontakte social network via public API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "VRML" = callPackage
@@ -20503,8 +18913,6 @@ self: {
        ];
        description = "VRML parser and generator for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Validation" = callPackage
@@ -20518,8 +18926,6 @@ self: {
        ];
        description = "A data-type like Either but with an accumulating Applicative";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Vec" = callPackage
@@ -20542,8 +18948,6 @@ self: {
        libraryHaskellDepends = [ base Boolean Vec ];
        description = "Provides Boolean instances for the Vec package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Vec-OpenGLRaw" = callPackage
@@ -20555,8 +18959,6 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw Vec ];
        description = "Instances and functions to interoperate Vec and OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Vec-Transform" = callPackage
@@ -20568,8 +18970,6 @@ self: {
        doHaddock = false;
        description = "This package is obsolete";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "VecN" = callPackage
@@ -20595,8 +18995,6 @@ self: {
        executableHaskellDepends = [ base containers matrix ];
        description = "A solver for the WordBrain game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ViennaRNA-bindings" = callPackage
@@ -20640,8 +19038,6 @@ self: {
        ];
        description = "ViennaRNA v2 extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ViennaRNAParser" = callPackage
@@ -20688,8 +19084,6 @@ self: {
        ];
        description = "Villefort is a task manager and time tracker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Vulkan" = callPackage
@@ -20731,8 +19125,6 @@ self: {
        ];
        description = "WAVE audio file IO library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WEditor" = callPackage
@@ -20788,8 +19180,6 @@ self: {
        ];
        description = "A simple command line tools to control the Asus WL500gP router";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WL500gPLib" = callPackage
@@ -20804,8 +19194,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A simple library to access to the WL 500gP router from the Haskell code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WMSigner" = callPackage
@@ -20825,8 +19213,6 @@ self: {
        ];
        description = "WebMoney authentication module";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WURFL" = callPackage
@@ -20838,8 +19224,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "Convert the WURFL file into a Parsec parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WXDiffCtrl" = callPackage
@@ -20852,8 +19236,6 @@ self: {
        libraryHaskellDepends = [ base containers wx wxcore ];
        description = "WXDiffCtrl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WashNGo" = callPackage
@@ -20872,8 +19254,6 @@ self: {
        executableHaskellDepends = [ directory ghc-paths process ];
        description = "WASH is a family of EDSLs for programming Web applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WaveFront" = callPackage
@@ -20890,8 +19270,6 @@ self: {
        ];
        description = "Parsers and utilities for the OBJ WaveFront 3D model format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Weather" = callPackage
@@ -20918,8 +19296,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec pretty syb ];
        description = "JavaScript analysis tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WebBits-Html" = callPackage
@@ -20935,8 +19311,6 @@ self: {
        ];
        description = "JavaScript analysis tools";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WebBits-multiplate" = callPackage
@@ -20953,8 +19327,6 @@ self: {
        ];
        description = "A Multiplate instance for JavaScript";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WebCont" = callPackage
@@ -20973,8 +19345,6 @@ self: {
        ];
        description = "Continuation based web programming for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WeberLogic" = callPackage
@@ -20989,8 +19359,6 @@ self: {
        executableHaskellDepends = [ base parsec ];
        description = "Logic interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Webrexp" = callPackage
@@ -21017,8 +19385,6 @@ self: {
        ];
        description = "Regexp-like engine to scrap web data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Wheb" = callPackage
@@ -21043,8 +19409,6 @@ self: {
        ];
        description = "The frictionless WAI Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WikimediaParser" = callPackage
@@ -21056,8 +19420,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "A parser for wikimedia style article markup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Win32" = callPackage
@@ -21236,8 +19598,6 @@ self: {
        ];
        description = "Wire-aware hardware description";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WordAlignment" = callPackage
@@ -21277,8 +19637,6 @@ self: {
        ];
        description = "Bigram word pair alignments";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WordNet" = callPackage
@@ -21292,8 +19650,6 @@ self: {
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WordNet-ghc74" = callPackage
@@ -21307,8 +19663,6 @@ self: {
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Wordlint" = callPackage
@@ -21343,8 +19697,6 @@ self: {
        ];
        description = "Workflow patterns over a monad for thread state logging & recovery";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WxGeneric" = callPackage
@@ -21359,8 +19711,6 @@ self: {
        ];
        description = "Generic (SYB3) construction of wxHaskell widgets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "X" = callPackage
@@ -21408,8 +19758,6 @@ self: {
        librarySystemDepends = [ libX11 ];
        description = "Missing bindings to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.xorg) libX11;};
 
   "X11-rm" = callPackage
@@ -21421,8 +19769,6 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        description = "A binding to the resource management functions missing from X11";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "X11-xdamage" = callPackage
@@ -21435,8 +19781,6 @@ self: {
        librarySystemDepends = [ Xdamage ];
        description = "A binding to the Xdamage X11 extension library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {Xdamage = null;};
 
   "X11-xfixes" = callPackage
@@ -21449,8 +19793,6 @@ self: {
        librarySystemDepends = [ Xfixes ];
        description = "A binding to the Xfixes X11 extension library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {Xfixes = null;};
 
   "X11-xft" = callPackage
@@ -21542,8 +19884,6 @@ self: {
        librarySystemDepends = [ xmmsclient xmmsclient-glib ];
        description = "XMMS2 client library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {xmmsclient = null; xmmsclient-glib = null;};
 
   "XMPP" = callPackage
@@ -21560,8 +19900,6 @@ self: {
        ];
        description = "XMPP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "XSaiga" = callPackage
@@ -21588,8 +19926,6 @@ self: {
        ];
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Xauth" = callPackage
@@ -21620,8 +19956,6 @@ self: {
        ];
        description = "Gtk command launcher with identicon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "XmlHtmlWriter" = callPackage
@@ -21633,8 +19967,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A library for writing XML and HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Xorshift128Plus" = callPackage
@@ -21646,8 +19978,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Pure haskell implementation of xorshift128plus random number generator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "YACPong" = callPackage
@@ -21668,8 +19998,6 @@ self: {
        ];
        description = "Yet Another Pong Clone using SDL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "YFrob" = callPackage
@@ -21681,8 +20009,6 @@ self: {
        libraryHaskellDepends = [ array base HGL Yampa ];
        description = "Yampa-based library for programming robots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Yablog" = callPackage
@@ -21717,8 +20043,6 @@ self: {
        ];
        description = "A simple blog engine powered by Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "YamlReference" = callPackage
@@ -21746,8 +20070,6 @@ self: {
        ];
        description = "YAML reference implementation";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Yampa" = callPackage
@@ -21764,8 +20086,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Elegant Functional Reactive Programming Language for Hybrid Systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Yampa-core" = callPackage
@@ -21797,8 +20117,6 @@ self: {
        ];
        description = "Software synthesizer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Yocto" = callPackage
@@ -21826,8 +20144,6 @@ self: {
        ];
        description = "A MUD client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Yogurt-Standalone" = callPackage
@@ -21847,8 +20163,6 @@ self: {
        executableSystemDepends = [ readline ];
        description = "A functional MUD client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) readline;};
 
   "Z-Data" = callPackage
@@ -21873,8 +20187,6 @@ self: {
        ];
        description = "Array, vector and text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Z-IO" = callPackage
@@ -21897,8 +20209,6 @@ self: {
        ];
        description = "Simple and high performance IO toolkit for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ZEBEDDE" = callPackage
@@ -21912,8 +20222,6 @@ self: {
        libraryHaskellDepends = [ base vect ];
        description = "Polymer growth simulation method";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ZFS" = callPackage
@@ -21929,8 +20237,6 @@ self: {
        ];
        description = "Oleg's Zipper FS";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ZMachine" = callPackage
@@ -21945,8 +20251,6 @@ self: {
        executableHaskellDepends = [ array base gtk mtl random ];
        description = "A Z-machine interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ZipFold" = callPackage
@@ -21997,8 +20301,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinators for bidirectional URL routing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "a50" = callPackage
@@ -22017,8 +20319,6 @@ self: {
        ];
        description = "Compare genome assemblies";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "abacate" = callPackage
@@ -22072,8 +20372,6 @@ self: {
        ];
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {abc = null;};
 
   "abcnotation" = callPackage
@@ -22087,8 +20385,6 @@ self: {
        ];
        description = "Haskell representation and parser for ABC notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "abeson" = callPackage
@@ -22108,8 +20404,6 @@ self: {
        ];
        description = "interconversion between aeson and bson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "abides" = callPackage
@@ -22122,8 +20416,6 @@ self: {
        testHaskellDepends = [ base comonad tasty tasty-quickcheck ];
        description = "Simple boolean tests to see if a value abides by certain properties";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "abnf" = callPackage
@@ -22143,8 +20435,6 @@ self: {
        ];
        description = "Parse ABNF and generate parsers for the specified document";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "abstract-deque" = callPackage
@@ -22200,8 +20490,6 @@ self: {
        ];
        description = "Provides the class ParAccelerate, nothing more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "abt" = callPackage
@@ -22217,8 +20505,6 @@ self: {
        ];
        description = "Abstract binding trees for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ac-machine" = callPackage
@@ -22232,8 +20518,6 @@ self: {
        ];
        description = "Aho-Corasick string matching algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ac-machine-conduit" = callPackage
@@ -22245,8 +20529,6 @@ self: {
        libraryHaskellDepends = [ ac-machine base conduit text ];
        description = "Drive Aho-Corasick machines in Conduit pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acc" = callPackage
@@ -22266,8 +20548,6 @@ self: {
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Sequence optimized for monoidal construction and folding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate" = callPackage
@@ -22295,8 +20575,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "An embedded language for accelerated array processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-arithmetic" = callPackage
@@ -22315,8 +20593,6 @@ self: {
        ];
        description = "Linear algebra and interpolation using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-bignum" = callPackage
@@ -22528,8 +20804,6 @@ self: {
        ];
        description = "Accelerate frontend to the FFTW library (Fourier transform)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-fourier" = callPackage
@@ -22555,8 +20829,6 @@ self: {
        ];
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-fourier-benchmark" = callPackage
@@ -22587,8 +20859,6 @@ self: {
        libraryHaskellDepends = [ accelerate base ];
        description = "Convert between Accelerate arrays and raw pointers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-io-JuicyPixels" = callPackage
@@ -22718,8 +20988,6 @@ self: {
        doHaddock = false;
        description = "Kullback-Liebler divergence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-llvm" = callPackage
@@ -22740,8 +21008,6 @@ self: {
        ];
        description = "Accelerate backend component generating LLVM IR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-llvm-native" = callPackage
@@ -22764,8 +21030,6 @@ self: {
        testHaskellDepends = [ accelerate base ];
        description = "Accelerate backend for multicore CPUs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-llvm-ptx" = callPackage
@@ -22799,8 +21063,6 @@ self: {
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-typelits" = callPackage
@@ -22823,8 +21085,6 @@ self: {
        ];
        description = "a typesafe way encode accelerate matrices and vectors";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-utility" = callPackage
@@ -22836,8 +21096,6 @@ self: {
        libraryHaskellDepends = [ accelerate base utility-ht ];
        description = "Utility functions for the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accentuateus" = callPackage
@@ -22849,8 +21107,6 @@ self: {
        libraryHaskellDepends = [ base bytestring HTTP json network text ];
        description = "A Haskell implementation of the Accentuate.us API.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "access-time" = callPackage
@@ -22862,8 +21118,6 @@ self: {
        libraryHaskellDepends = [ base filepath old-time time unix ];
        description = "Cross-platform support for retrieving file access times";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "access-token-provider" = callPackage
@@ -22890,8 +21144,6 @@ self: {
        ];
        description = "Provides Access Token for Services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accuerr" = callPackage
@@ -22944,8 +21196,6 @@ self: {
        ];
        description = "A library for building static site generators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acid-state" = callPackage
@@ -23002,8 +21252,6 @@ self: {
        ];
        description = "A replication backend for acid-state";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acid-state-tls" = callPackage
@@ -23019,8 +21267,6 @@ self: {
        ];
        description = "Add TLS support for Data.Acid.Remote";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acl2" = callPackage
@@ -23043,8 +21289,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A monad which is powerful enough to interpret any action";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-box" = callPackage
@@ -23122,8 +21366,6 @@ self: {
        libraryHaskellDepends = [ base comonad ];
        description = "A more efficient dualization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-cuteboy" = callPackage
@@ -23186,8 +21428,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Stop execution with rage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-functors" = callPackage
@@ -23221,8 +21461,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An embedded DSL for the HQ9+ programming language";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-http" = callPackage
@@ -23240,8 +21478,6 @@ self: {
        ];
        description = "fastest Haskell PONG server in the world";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-inator" = callPackage
@@ -23256,8 +21492,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Evil inventions in the Tri-State area";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-io" = callPackage
@@ -23292,8 +21526,6 @@ self: {
        libraryHaskellDepends = [ base ];
        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;
-       broken = true;
      }) {};
 
   "acme-left-pad" = callPackage
@@ -23305,8 +21537,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "free your haskell from the tyranny of npm!";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-lolcat" = callPackage
@@ -23362,8 +21592,6 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "Miscellaneous newtypes for orderings of discutable use";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-missiles" = callPackage
@@ -23389,8 +21617,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A mutable package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-now" = callPackage
@@ -23402,8 +21628,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "An interface to the philosophical and metaphysical \"now\"";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-numbersystem" = callPackage
@@ -23415,8 +21639,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Define the less than and add and subtract for nats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-omitted" = callPackage
@@ -23451,8 +21673,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Operators of base, all in one place!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-php" = callPackage
@@ -23464,8 +21684,6 @@ self: {
        libraryHaskellDepends = [ acme-left-pad base ];
        description = "The flexibility of Haskell and the safety of PHP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-pointful-numbers" = callPackage
@@ -23517,8 +21735,6 @@ self: {
        ];
        description = "Proper names for curry and uncurry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-smuggler" = callPackage
@@ -23542,8 +21758,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A binding to the glibc strfry function";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-stringly-typed" = callPackage
@@ -23557,8 +21771,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Stringly Typed Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-strtok" = callPackage
@@ -23583,8 +21795,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "import This";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-timemachine" = callPackage
@@ -23633,8 +21843,6 @@ self: {
        doHaddock = false;
        description = "The absorbing element of package dependencies";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acousticbrainz-client" = callPackage
@@ -23728,8 +21936,6 @@ self: {
        ];
        description = "Haskell code presentation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "activehs-base" = callPackage
@@ -23743,8 +21949,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Basic definitions for activehs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "activitypub" = callPackage
@@ -23756,8 +21960,6 @@ self: {
        libraryHaskellDepends = [ aeson base network-uri text time ];
        description = "ActivityPub Haskell Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "activitystreams-aeson" = callPackage
@@ -23771,8 +21973,6 @@ self: {
        ];
        description = "An interface to the ActivityStreams specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "actor" = callPackage
@@ -23785,8 +21985,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 stm time ];
        description = "Actors with multi-headed receive clauses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acts" = callPackage
@@ -23802,8 +22000,6 @@ self: {
        doHaddock = false;
        description = "Semigroup actions and torsors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ad" = callPackage
@@ -23835,8 +22031,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Self optimizing container types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adaptive-tuple" = callPackage
@@ -23848,8 +22042,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell type-level ];
        description = "Self-optimizing tuple types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adb" = callPackage
@@ -23864,8 +22056,6 @@ self: {
        ];
        description = "Android Debug Bridge (ADB) protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adblock2privoxy" = callPackage
@@ -23921,8 +22111,6 @@ self: {
        ];
        description = "A full-featured library for parsing, validating, and rendering email addresses";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adhoc-network" = callPackage
@@ -23940,8 +22128,6 @@ self: {
        ];
        description = "Ad-hoc P2P network protocol";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adict" = callPackage
@@ -23963,8 +22149,6 @@ self: {
        ];
        description = "Approximate dictionary searching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adjunction" = callPackage
@@ -24036,8 +22220,6 @@ self: {
        ];
        description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adp-multi" = callPackage
@@ -24058,8 +22240,6 @@ self: {
        ];
        description = "ADP for multiple context-free languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adp-multi-monadiccp" = callPackage
@@ -24079,8 +22259,6 @@ self: {
        ];
        description = "Subword construction in adp-multi using monadiccp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adtrees" = callPackage
@@ -24092,8 +22270,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modelling, rendering and quantitative analysis on attack defense trees";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "advent-of-code-api" = callPackage
@@ -24134,8 +22310,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Multi-precision ball (interval) arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aern2-real" = callPackage
@@ -24159,8 +22333,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exact real numbers via Cauchy sequences and MPFR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson_0_7_0_6" = callPackage
@@ -24265,8 +22437,6 @@ self: {
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        description = "make To/From JSOn instances from an applicative description";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-attoparsec" = callPackage
@@ -24376,8 +22546,6 @@ self: {
        ];
        description = "Parse Aeson data with commitment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-compat" = callPackage
@@ -24424,8 +22592,6 @@ self: {
        ];
        description = "Easy functions for converting from Aeson.Value";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-default" = callPackage
@@ -24502,8 +22668,6 @@ self: {
        ];
        description = "Apply a json-patch to any haskell datatype";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-extra" = callPackage
@@ -24550,8 +22714,6 @@ self: {
        ];
        description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-flat" = callPackage
@@ -24601,8 +22763,6 @@ self: {
        ];
        description = "Create Flow type definitions from Haskell data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-gadt-th" = callPackage
@@ -24674,8 +22834,6 @@ self: {
        ];
        description = "Injecting fields into aeson values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-iproute" = callPackage
@@ -24692,8 +22850,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Aeson instances for iproute types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-json-ast" = callPackage
@@ -24761,8 +22917,6 @@ self: {
        ];
        description = "Fast JSON parsing and encoding (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-optics" = callPackage
@@ -24838,8 +22992,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec mtl text ];
        description = "Hiearchical prefixing for aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-pretty_0_7_2" = callPackage
@@ -24963,8 +23115,6 @@ self: {
        ];
        description = "Haskell JSON schema validator and parser generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-schemas" = callPackage
@@ -25022,8 +23172,6 @@ self: {
        ];
        description = "Smart derivation of Aeson instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-streams" = callPackage
@@ -25039,8 +23187,6 @@ self: {
        ];
        description = "An HTTP client library for JSON-based APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-t" = callPackage
@@ -25060,8 +23206,6 @@ self: {
        ];
        description = "Transform JSON";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-tiled" = callPackage
@@ -25081,8 +23225,6 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "Aeson instances for the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-toolkit" = callPackage
@@ -25117,8 +23259,6 @@ self: {
        ];
        description = "Generate TypeScript definition files from your ADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-utils" = callPackage
@@ -25236,8 +23376,6 @@ self: {
        ];
        description = "A simple Game Engine using SDL";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "affine" = callPackage
@@ -25266,8 +23404,6 @@ self: {
        ];
        description = "General-purpose sampling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "affinely-extended" = callPackage
@@ -25317,8 +23453,6 @@ self: {
        ];
        description = "Infinite state model checking of iterative C programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ag-pictgen" = callPackage
@@ -25332,8 +23466,6 @@ self: {
        executableHaskellDepends = [ base containers uuagc uulib ];
        description = "Attribute Grammar picture generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "agda-server" = callPackage
@@ -25354,8 +23486,6 @@ self: {
        ];
        description = "Http server for Agda (prototype)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "agda-snippets" = callPackage
@@ -25376,8 +23506,6 @@ self: {
        executableHaskellDepends = [ Agda base network-uri transformers ];
        description = "Render just the Agda snippets of a literate Agda file to HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "agda-snippets-hakyll" = callPackage
@@ -25394,8 +23522,6 @@ self: {
        ];
        description = "Literate Agda support using agda-snippets, for Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "agda-unused" = callPackage
@@ -25454,8 +23580,6 @@ self: {
        ];
        description = "AgentX protocol for write SNMP subagents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "agum" = callPackage
@@ -25488,8 +23612,6 @@ self: {
        ];
        description = "And-inverter graphs in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aip" = callPackage
@@ -25518,8 +23640,6 @@ self: {
        ];
        description = "Aeronautical Information Package (AIP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "air" = callPackage
@@ -25574,8 +23694,6 @@ self: {
        libraryHaskellDepends = [ air base template-haskell ];
        description = "air";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "airbrake" = callPackage
@@ -25595,8 +23713,6 @@ self: {
        ];
        description = "An Airbrake notifier for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "airship" = callPackage
@@ -25626,8 +23742,6 @@ self: {
        ];
        description = "A Webmachine-inspired HTTP library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "airtable-api" = callPackage
@@ -25645,8 +23759,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Requesting and introspecting Tables within an Airtable project";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aivika" = callPackage
@@ -25695,8 +23807,6 @@ self: {
        ];
        description = "Parallel distributed discrete event simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aivika-experiment" = callPackage
@@ -25853,8 +23963,6 @@ self: {
        ];
        description = "Haskell compiler that produce binary through C language";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "al" = callPackage
@@ -25920,8 +24028,6 @@ self: {
        ];
        description = "Bindings to the alerta REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alerts" = callPackage
@@ -25977,8 +24083,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Collection of useful functions for writing console applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alex-tools" = callPackage
@@ -26013,8 +24117,6 @@ self: {
        ];
        description = "utility library for Alfred version 2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alfred-margaret" = callPackage
@@ -26036,8 +24138,6 @@ self: {
        ];
        description = "Fast Aho-Corasick string searching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alg" = callPackage
@@ -26083,8 +24183,6 @@ self: {
        ];
        description = "Algorithmic automation for various DAWs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algebra" = callPackage
@@ -26135,8 +24233,6 @@ self: {
        ];
        description = "Infrastructure for DAG-shaped relational algebra plans";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algebra-driven-design" = callPackage
@@ -26181,8 +24277,6 @@ self: {
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algebraic" = callPackage
@@ -26194,8 +24288,6 @@ self: {
        libraryHaskellDepends = [ accelerate base ];
        description = "General linear algebra structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algebraic-classes" = callPackage
@@ -26243,8 +24335,6 @@ self: {
        ];
        description = "Algebraically structured Prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algo-s" = callPackage
@@ -26270,8 +24360,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "An implementation of Knuth's algorithm S";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algolia" = callPackage
@@ -26297,8 +24385,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A client implementing the Algolia search API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "align" = callPackage
@@ -26323,8 +24409,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A simple unix filter to align text on specified substrings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aligned-foreignptr" = callPackage
@@ -26433,8 +24517,6 @@ self: {
        ];
        description = "a practical affine language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alpha" = callPackage
@@ -26455,8 +24537,6 @@ self: {
        ];
        description = "A compiler for the Alpha language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alphachar" = callPackage
@@ -26477,8 +24557,6 @@ self: {
        ];
        description = "A character between a-z";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alpino-tools" = callPackage
@@ -26518,8 +24596,6 @@ self: {
        librarySystemDepends = [ alsaLib ];
        description = "Binding to the ALSA Library API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-core" = callPackage
@@ -26550,8 +24626,6 @@ self: {
        ];
        description = "Some simple interactive programs for sending MIDI control messages via ALSA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alsa-midi" = callPackage
@@ -26572,8 +24646,6 @@ self: {
        executableSystemDepends = [ alsaLib ];
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-mixer" = callPackage
@@ -26621,8 +24693,6 @@ self: {
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA audio signal library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alsa-seq" = callPackage
@@ -26657,8 +24727,6 @@ self: {
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA sequencer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "altcomposition" = callPackage
@@ -26670,8 +24738,6 @@ self: {
        libraryHaskellDepends = [ base composition ];
        description = "Alternative combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alternative-extra" = callPackage
@@ -26683,8 +24749,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Extra utilities for alternatives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alternative-io" = callPackage
@@ -26702,8 +24766,6 @@ self: {
        ];
        description = "IO as Alternative instance (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alternative-vector" = callPackage
@@ -26766,8 +24828,6 @@ self: {
        executableHaskellDepends = [ base warp ];
        description = "Implement a menu experience fit for web users";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "altsvc" = callPackage
@@ -26796,8 +24856,6 @@ self: {
        librarySystemDepends = [ alure ];
        description = "A Haskell binding for ALURE";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) alure;};
 
   "amazon-emailer" = callPackage
@@ -26817,8 +24875,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "amazon-emailer-client-snap" = callPackage
@@ -26833,8 +24889,6 @@ self: {
        ];
        description = "Client library for amazon-emailer daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazon-products" = callPackage
@@ -26860,8 +24914,6 @@ self: {
        ];
        description = "Connector for Amazon Products API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka" = callPackage
@@ -29316,8 +27368,6 @@ self: {
        benchmarkHaskellDepends = [ base statistics ];
        description = "Statistical data visualization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ampersand" = callPackage
@@ -29348,8 +27398,6 @@ self: {
        ];
        description = "Toolsuite for automated design of business processes";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amqp" = callPackage
@@ -29397,8 +27445,6 @@ self: {
        ];
        description = "Conduit bindings for AMQP (see amqp package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amqp-streamly" = callPackage
@@ -29415,8 +27461,6 @@ self: {
        ];
        description = "A simple streamly wrapper for amqp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amqp-utils" = callPackage
@@ -29500,8 +27544,6 @@ self: {
        ];
        description = "making data science easy and safe with data frames";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "analyze-client" = callPackage
@@ -29518,8 +27560,6 @@ self: {
        ];
        description = "Client for analyze service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "anansi" = callPackage
@@ -29572,8 +27612,6 @@ self: {
        ];
        description = "Looms which use Pandoc to parse and produce a variety of formats";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "anatomy" = callPackage
@@ -29600,8 +27638,6 @@ self: {
        ];
        description = "Anatomy: Atomo documentation system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "android" = callPackage
@@ -29613,8 +27649,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "Android methods exposed to Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "android-activity" = callPackage
@@ -29626,8 +27660,6 @@ self: {
        libraryHaskellDepends = [ base data-default ];
        description = "Turn regular Haskell programs into Android Activities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "android-lint-summary" = callPackage
@@ -29654,8 +27686,6 @@ self: {
        ];
        description = "A pretty printer for Android Lint errors";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "angel" = callPackage
@@ -29683,8 +27713,6 @@ self: {
        ];
        description = "Process management and supervision daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "angle" = callPackage
@@ -29713,8 +27741,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A small, general-purpose programming language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "animalcase" = callPackage
@@ -29747,8 +27773,6 @@ self: {
        testHaskellDepends = [ ansi-terminal-game base hspec parsec ];
        description = "text-file based ASCII animator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "animate" = callPackage
@@ -29765,8 +27789,6 @@ self: {
        testHaskellDepends = [ aeson base containers hspec vector ];
        description = "Animation for sprites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "animate-example" = callPackage
@@ -29785,8 +27807,6 @@ self: {
        ];
        description = "Animation for sprites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "animate-frames" = callPackage
@@ -29808,8 +27828,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Convert sprite frames to animate files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "animate-preview" = callPackage
@@ -29835,8 +27853,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Preview tool for sprite animation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "animate-sdl2" = callPackage
@@ -29848,8 +27864,6 @@ self: {
        libraryHaskellDepends = [ aeson animate base sdl2 sdl2-image ];
        description = "sdl2 + animate auxiliary library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "anki-tools" = callPackage
@@ -29893,8 +27907,6 @@ self: {
        ];
        description = "Medium-level language that desugars to Morte";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "annihilator" = callPackage
@@ -29941,8 +27953,6 @@ self: {
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Anonymous sum types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "anonymous-sums-tests" = callPackage
@@ -29954,8 +27964,6 @@ self: {
        libraryHaskellDepends = [ anonymous-sums base QuickCheck ];
        description = "QuickCheck functions to accompany the anonymous-sums package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ansi-escape-codes" = callPackage
@@ -30069,8 +28077,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Terminal-based graphing via ANSI and Unicode";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antagonist" = callPackage
@@ -30096,8 +28102,6 @@ self: {
        ];
        description = "A web interface to Antisplice dungeons";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antfarm" = callPackage
@@ -30120,8 +28124,6 @@ self: {
        ];
        description = "Referring expressions for definitions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "anticiv" = callPackage
@@ -30147,8 +28149,6 @@ self: {
        ];
        description = "This is an IRC bot for Mafia and Resistance";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antigate" = callPackage
@@ -30166,8 +28166,6 @@ self: {
        ];
        description = "Interface for antigate.com captcha recognition API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antimirov" = callPackage
@@ -30182,8 +28180,6 @@ self: {
        executableHaskellDepends = [ base containers QuickCheck ];
        description = "Define the language containment (=subtyping) relation on regulare expressions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-athena" = callPackage
@@ -30266,8 +28262,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-es" = callPackage
@@ -30492,8 +28486,6 @@ self: {
        ];
        description = "An engine for text-based dungeons";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antlr-haskell" = callPackage
@@ -30518,8 +28510,6 @@ self: {
        ];
        description = "A Haskell implementation of the ANTLR top-down parser generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antlrc" = callPackage
@@ -30540,8 +28530,6 @@ self: {
        ];
        description = "Haskell binding to the ANTLR parser generator C runtime library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {antlr3c = null;};
 
   "anydbm" = callPackage
@@ -30557,8 +28545,6 @@ self: {
        libraryHaskellDepends = [ base containers MissingH mtl ];
        description = "Interface for DBM-like database systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aop-prelude" = callPackage
@@ -30571,8 +28557,6 @@ self: {
        testHaskellDepends = [ base ghc-prim ];
        description = "prelude for Algebra of Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aos-signature" = callPackage
@@ -30613,8 +28597,6 @@ self: {
        ];
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libaosd;};
 
   "ap-normalize" = callPackage
@@ -30687,8 +28669,6 @@ self: {
        ];
        description = "Get all your structure and rip it apart";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apecs" = callPackage
@@ -30721,8 +28701,6 @@ self: {
        ];
        description = "Simple gloss renderer for apecs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apecs-physics" = callPackage
@@ -30739,8 +28717,6 @@ self: {
        ];
        description = "2D physics for apecs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apecs-physics-gloss" = callPackage
@@ -30752,8 +28728,6 @@ self: {
        libraryHaskellDepends = [ apecs apecs-physics base gloss ];
        description = "Gloss rendering for apecs-physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apecs-stm" = callPackage
@@ -30770,8 +28744,6 @@ self: {
        ];
        description = "STM stores for apecs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apelsin" = callPackage
@@ -30793,8 +28765,6 @@ self: {
        ];
        description = "Server and community browser for the game Tremulous";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "api-builder" = callPackage
@@ -30816,8 +28786,6 @@ self: {
        ];
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "api-field-json-th" = callPackage
@@ -30898,8 +28866,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "RPC API client for Factom";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "api-rpc-pegnet" = callPackage
@@ -30923,8 +28889,6 @@ self: {
        ];
        description = "simple json-rpc client for PegNet";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "api-tools" = callPackage
@@ -30959,8 +28923,6 @@ self: {
        ];
        description = "DSL for generating API boilerplate and docs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "api-yoti" = callPackage
@@ -30981,8 +28943,6 @@ self: {
        testHaskellDepends = [ base bytestring text ];
        description = "Api bindings for Yoti services";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary" = callPackage
@@ -31015,8 +28975,6 @@ self: {
        ];
        description = "Simple and type safe web framework that generate web API documentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-authenticate" = callPackage
@@ -31036,8 +28994,6 @@ self: {
        ];
        description = "authenticate support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-clientsession" = callPackage
@@ -31055,8 +29011,6 @@ self: {
        ];
        description = "clientsession support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-cookie" = callPackage
@@ -31072,8 +29026,6 @@ self: {
        ];
        description = "Cookie support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-eventsource" = callPackage
@@ -31085,8 +29037,6 @@ self: {
        libraryHaskellDepends = [ apiary base blaze-builder wai-extra ];
        description = "eventsource support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-helics" = callPackage
@@ -31106,8 +29056,6 @@ self: {
        ];
        description = "helics support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-http-client" = callPackage
@@ -31124,8 +29072,6 @@ self: {
        ];
        description = "A http client for Apiary";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-logger" = callPackage
@@ -31143,8 +29089,6 @@ self: {
        ];
        description = "fast-logger support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-memcached" = callPackage
@@ -31163,8 +29107,6 @@ self: {
        ];
        description = "memcached client for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-mongoDB" = callPackage
@@ -31182,8 +29124,6 @@ self: {
        ];
        description = "mongoDB support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-persistent" = callPackage
@@ -31201,8 +29141,6 @@ self: {
        ];
        description = "persistent support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-purescript" = callPackage
@@ -31222,8 +29160,6 @@ self: {
        ];
        description = "purescript compiler for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-redis" = callPackage
@@ -31235,8 +29171,6 @@ self: {
        libraryHaskellDepends = [ apiary base hedis transformers ];
        description = "redis support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-session" = callPackage
@@ -31248,8 +29182,6 @@ self: {
        libraryHaskellDepends = [ apiary base wai ];
        description = "session support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-websockets" = callPackage
@@ -31261,8 +29193,6 @@ self: {
        libraryHaskellDepends = [ apiary base wai-websockets websockets ];
        description = "websockets support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apioiaf-client" = callPackage
@@ -31295,8 +29225,6 @@ self: {
        ];
        description = "A Template Haskell library for generating type safe API calls";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apns-http2" = callPackage
@@ -31354,8 +29282,6 @@ self: {
        ];
        description = "a faster debian repository";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "app-lens" = callPackage
@@ -31370,8 +29296,6 @@ self: {
        ];
        description = "applicative (functional) bidirectional programming beyond composition chains";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "app-settings" = callPackage
@@ -31426,8 +29350,6 @@ self: {
        ];
        description = "app container types and tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "appendmap" = callPackage
@@ -31469,8 +29391,6 @@ self: {
        ];
        description = "Applicative functor and monad which collects all your fails";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "applicative-numbers" = callPackage
@@ -31498,8 +29418,6 @@ self: {
        ];
        description = "An applicative parser combinator library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "applicative-quoters" = callPackage
@@ -31513,8 +29431,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        description = "Quasiquoters for idiom brackets and an applicative do-notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "applicative-splice" = callPackage
@@ -31530,8 +29446,6 @@ self: {
        ];
        description = "Write applicative programs in direct style (generalizes idiom brackets)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apply-refact" = callPackage
@@ -31600,8 +29514,6 @@ self: {
        ];
        description = "ApproveAPI Haskell Client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "approx" = callPackage
@@ -31729,8 +29641,6 @@ self: {
        ];
        description = "Pure Haskell arbitrary length FFT library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arbb-vm" = callPackage
@@ -31747,8 +29657,6 @@ self: {
        librarySystemDepends = [ arbb_dev ];
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {arbb_dev = null;};
 
   "arbor-datadog" = callPackage
@@ -31773,8 +29681,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Datadog client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arbor-lru-cache" = callPackage
@@ -31813,8 +29719,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Counter library for submitting metrics to a backend such as datadog";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arbor-monad-logger" = callPackage
@@ -31861,8 +29765,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Core metric library for publishing metrics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arbor-monad-metric-datadog" = callPackage
@@ -31888,8 +29790,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Metric library backend for datadog";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arbor-postgres" = callPackage
@@ -31908,8 +29808,6 @@ self: {
        ];
        description = "Convenience types and functions for postgresql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arbtt" = callPackage
@@ -31941,8 +29839,6 @@ self: {
        ];
        description = "Automatic Rule-Based Time Tracker";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arcgrid" = callPackage
@@ -32003,8 +29899,6 @@ self: {
        ];
        description = "Distribute hackage packages to archlinux";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "archive" = callPackage
@@ -32044,8 +29938,6 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Common interface using libarchive";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "archive-sig" = callPackage
@@ -32092,8 +29984,6 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Common interface using the tar-bytestring package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "archiver" = callPackage
@@ -32112,8 +30002,6 @@ self: {
        ];
        description = "Archive supplied URLs in WebCite & Internet Archive";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "archlinux" = callPackage
@@ -32129,8 +30017,6 @@ self: {
        ];
        description = "Support for working with Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "archlinux-web" = callPackage
@@ -32156,8 +30042,6 @@ self: {
        ];
        description = "Website maintenance for Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "archnews" = callPackage
@@ -32173,8 +30057,6 @@ self: {
        ];
        description = "Convert Arch Linux package updates in RSS to pretty markdown";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arduino-copilot" = callPackage
@@ -32193,8 +30075,6 @@ self: {
        testHaskellDepends = [ base directory process temporary ];
        description = "Arduino programming in haskell using the Copilot stream DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arena" = callPackage
@@ -32220,8 +30100,6 @@ self: {
        ];
        description = "A journaled data store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arff" = callPackage
@@ -32238,8 +30116,6 @@ self: {
        ];
        description = "Generate Attribute-Relation File Format (ARFF) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arghwxhaskell" = callPackage
@@ -32253,8 +30129,6 @@ self: {
        executableHaskellDepends = [ base directory wx ];
        description = "An interpreter for the Argh! programming language in wxHaskell";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "argon" = callPackage
@@ -32281,8 +30155,6 @@ self: {
        ];
        description = "Measure your code's complexity";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "argon2" = callPackage
@@ -32301,8 +30173,6 @@ self: {
        ];
        description = "Memory-hard password hash and proof-of-work function";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "argparser" = callPackage
@@ -32315,8 +30185,6 @@ self: {
        testHaskellDepends = [ base containers HTF HUnit ];
        description = "Command line parsing framework for console applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arguedit" = callPackage
@@ -32334,8 +30202,6 @@ self: {
        ];
        description = "A computer assisted argumentation transcription and editing software";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ariadne" = callPackage
@@ -32363,8 +30229,6 @@ self: {
        ];
        description = "Go-to-definition for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arion" = callPackage
@@ -32388,8 +30252,6 @@ self: {
        ];
        description = "Watcher and runner for Hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arion-compose" = callPackage
@@ -32511,8 +30373,6 @@ self: {
        ];
        description = "Arithmetic circuits for zkSNARKs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arithmoi" = callPackage
@@ -32570,8 +30430,6 @@ self: {
        executableHaskellDepends = [ base GLUT mtl OpenGL stm ];
        description = "Space-based real time strategy game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "armor" = callPackage
@@ -32592,8 +30450,6 @@ self: {
        ];
        description = "Prevent serialization backwards compatibility problems using golden tests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arpa" = callPackage
@@ -32608,8 +30464,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for reading ARPA n-gram models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arpack" = callPackage
@@ -32633,8 +30487,6 @@ self: {
        ];
        description = "Solve large scale eigenvalue problems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) arpack;};
 
   "array_0_5_4_0" = callPackage
@@ -32661,8 +30513,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Builders for arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "array-chunks" = callPackage
@@ -32680,8 +30530,6 @@ self: {
        ];
        description = "Lists of chunks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "array-forth" = callPackage
@@ -32707,8 +30555,6 @@ self: {
        ];
        description = "A simple interpreter for arrayForth, the language used on GreenArrays chips";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "array-list" = callPackage
@@ -32723,8 +30569,6 @@ self: {
        ];
        description = "IsList instances of Array for OverloadedLists extension";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "array-memoize" = callPackage
@@ -32753,8 +30597,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ghc-prim ];
        description = "Extra foreign primops for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "array-utils" = callPackage
@@ -32790,8 +30632,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings to the ArrayFire general-purpose GPU library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {af = null;};
 
   "arraylist" = callPackage
@@ -32809,8 +30649,6 @@ self: {
        ];
        description = "Memory-efficient ArrayList implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arrow-extras" = callPackage
@@ -32836,8 +30674,6 @@ self: {
        ];
        description = "Improved arrows";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arrow-list" = callPackage
@@ -32849,8 +30685,6 @@ self: {
        libraryHaskellDepends = [ base containers fail mtl ];
        description = "List arrows for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arrowapply-utils" = callPackage
@@ -32862,8 +30696,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities for working with ArrowApply instances more naturally";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arrowp" = callPackage
@@ -32877,8 +30709,6 @@ self: {
        executableHaskellDepends = [ array base containers haskell-src ];
        description = "preprocessor translating arrow notation into Haskell 98";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arrowp-qq" = callPackage
@@ -32899,8 +30729,6 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts NoHoed ];
        description = "A preprocessor and quasiquoter for translating arrow notation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arrows" = callPackage
@@ -32925,8 +30753,6 @@ self: {
        ];
        description = "A simple, arrow-based reactive programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "artifact" = callPackage
@@ -32940,8 +30766,6 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "Basic types and instances for Valve's Artifact Card-set API";
        license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arx" = callPackage
@@ -32994,8 +30818,6 @@ self: {
        testHaskellDepends = [ base hedgehog jwt mtl text time ];
        description = "Atlassian Service Authentication Protocol";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ascetic" = callPackage
@@ -33024,8 +30846,6 @@ self: {
        ];
        description = "The ASCII character set and encoding";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ascii-art-to-unicode" = callPackage
@@ -33074,8 +30894,6 @@ self: {
        libraryHaskellDepends = [ base random-extras random-fu text ];
        description = "A collection of ASCII cows. Moo.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ascii-flatten" = callPackage
@@ -33090,8 +30908,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Flattens European non-ASCII characaters into ASCII";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ascii-group" = callPackage
@@ -33171,8 +30987,6 @@ self: {
        ];
        description = "Compact representation of ASCII strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ascii-superset" = callPackage
@@ -33202,8 +31016,6 @@ self: {
        ];
        description = "ASCII table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ascii-th" = callPackage
@@ -33240,8 +31052,6 @@ self: {
        ];
        description = "Process Ascii Vectors for Advantest 93k";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ascii85-conduit" = callPackage
@@ -33254,8 +31064,6 @@ self: {
        testHaskellDepends = [ base bytestring conduit hspec ];
        description = "Conduit for encoding ByteString into Ascii85";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asciichart" = callPackage
@@ -33306,8 +31114,6 @@ self: {
        executableHaskellDepends = [ asil base bytestring utf8-string ];
        description = "Action Script Instrumentation Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asif" = callPackage
@@ -33368,8 +31174,6 @@ self: {
        ];
        description = "Action Script Instrumentation Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asn" = callPackage
@@ -33384,8 +31188,6 @@ self: {
        ];
        description = "asn type and encoding/decoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asn1-codec" = callPackage
@@ -33410,8 +31212,6 @@ self: {
        ];
        description = "Encode and decode ASN.1";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asn1-data" = callPackage
@@ -33428,8 +31228,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asn1-encoding" = callPackage
@@ -33532,8 +31330,6 @@ self: {
        ];
        description = "Helpers for Control.Exception.assert";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "assert-failure" = callPackage
@@ -33561,8 +31357,6 @@ self: {
        testHaskellDepends = [ base interpolate process ];
        description = "A simple testing framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asset-bundle" = callPackage
@@ -33591,8 +31385,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Asset map support for the JavaScript broccoli-asset-rev library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "assimp" = callPackage
@@ -33606,8 +31398,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "The Assimp asset import library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) assimp;};
 
   "assoc" = callPackage
@@ -33665,8 +31455,6 @@ self: {
        ];
        description = "An SMTP client library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "assumpta-core" = callPackage
@@ -33699,8 +31487,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A library for constructing AST by using do-notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ast-monad-json" = callPackage
@@ -33715,8 +31501,6 @@ self: {
        testHaskellDepends = [ ast-monad base hspec text ];
        description = "A library for writing JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ast-path" = callPackage
@@ -33772,8 +31556,6 @@ self: {
        ];
        description = "an incomplete 2d space game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "astro" = callPackage
@@ -33811,8 +31593,6 @@ self: {
        ];
        description = "A GTK-based abstract syntax tree viewer for custom languages and parsers";
        license = stdenv.lib.licenses.bsdOriginal;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "astview-utils" = callPackage
@@ -33876,8 +31656,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Async combinators";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "async-dejafu" = callPackage
@@ -33894,8 +31672,6 @@ self: {
        ];
        description = "Run MonadConc operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "async-extra" = callPackage
@@ -33948,8 +31724,6 @@ self: {
        executableHaskellDepends = [ async base stm unordered-containers ];
        description = "A thread manager for async";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "async-pool" = callPackage
@@ -34032,8 +31806,6 @@ self: {
        ];
        description = "Provides API for timer based execution of IO actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asynchronous-exceptions" = callPackage
@@ -34045,8 +31817,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Distinguish between synchronous and asynchronous exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aterm" = callPackage
@@ -34060,8 +31830,6 @@ self: {
        libraryHaskellDepends = [ array base containers ghc-prim ];
        description = "serialisation for Haskell values with sharing support";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aterm-utils" = callPackage
@@ -34076,8 +31844,6 @@ self: {
        executableHaskellDepends = [ aterm base transformers wl-pprint ];
        description = "Utility functions for working with aterms as generated by Minitermite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atl" = callPackage
@@ -34116,8 +31882,6 @@ self: {
        libraryPkgconfigDepends = [ zlib ];
        description = "Atlassian Connect snaplet for the Snap Framework and helper code";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "atlassian-connect-descriptor" = callPackage
@@ -34139,8 +31903,6 @@ self: {
        ];
        description = "Code that helps you create a valid Atlassian Connect Descriptor";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atmos" = callPackage
@@ -34179,8 +31941,6 @@ self: {
        libraryHaskellDepends = [ atmos base dimensional-tf ];
        description = "dimensional-tf wrapper on atmos package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atndapi" = callPackage
@@ -34205,8 +31965,6 @@ self: {
        ];
        description = "An interface of ATND API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atom" = callPackage
@@ -34260,8 +32018,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
        license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atom-msp430" = callPackage
@@ -34273,8 +32029,6 @@ self: {
        libraryHaskellDepends = [ atom base mtl ];
        description = "Convenience functions for using Atom with the MSP430 microcontroller family";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atomic-file-ops" = callPackage
@@ -34301,8 +32055,6 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A typeclass for mutable references that have an atomic modify operation";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atomic-primops" = callPackage
@@ -34332,8 +32084,6 @@ self: {
        ];
        description = "An atomic counter implemented using the FFI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atomic-primops-vector" = callPackage
@@ -34346,8 +32096,6 @@ self: {
        testHaskellDepends = [ base vector ];
        description = "Atomic operations on Data.Vector types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atomic-write" = callPackage
@@ -34391,8 +32139,6 @@ self: {
        ];
        description = "A highly dynamic, extremely simple, very fun programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atp-haskell" = callPackage
@@ -34410,8 +32156,6 @@ self: {
        testHaskellDepends = [ base containers HUnit time ];
        description = "Translation from Ocaml to Haskell of John Harrison's ATP code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atrans" = callPackage
@@ -34477,8 +32221,6 @@ self: {
        doHaddock = false;
        description = "A build tool for ATS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ats-setup" = callPackage
@@ -34497,8 +32239,6 @@ self: {
        ];
        description = "ATS scripts for Cabal builds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ats-storable" = callPackage
@@ -34516,8 +32256,6 @@ self: {
        testSystemDepends = [ storable ];
        description = "Marshal ATS types into Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {storable = null;};
 
   "attempt" = callPackage
@@ -34529,8 +32267,6 @@ self: {
        libraryHaskellDepends = [ base failure ];
        description = "Concrete data type for handling extensible exceptions as failures. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attic-schedule" = callPackage
@@ -34550,8 +32286,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A script I use to run \"attic\" for my backups";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atto-lisp" = callPackage
@@ -34575,8 +32309,6 @@ self: {
        ];
        description = "Efficient parsing and serialisation of S-Expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attomail" = callPackage
@@ -34599,8 +32331,6 @@ self: {
        testHaskellDepends = [ base doctest Glob QuickCheck ];
        description = "Minimal mail delivery agent (MDA) for local mail with maildir support";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec" = callPackage
@@ -34717,8 +32447,6 @@ self: {
        ];
        description = "Pass input from an enumerator to an Attoparsec parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-expr" = callPackage
@@ -34746,8 +32474,6 @@ self: {
        ];
        description = "Parse IP data types with attoparsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-iso8601" = callPackage
@@ -34776,8 +32502,6 @@ self: {
        ];
        description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-parsec" = callPackage
@@ -34822,8 +32546,6 @@ self: {
        libraryHaskellDepends = [ array attoparsec base containers text ];
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-text-enumerator" = callPackage
@@ -34835,8 +32557,6 @@ self: {
        libraryHaskellDepends = [ attoparsec-text base enumerator text ];
        description = "(deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-time" = callPackage
@@ -34863,8 +32583,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base transformers ];
        description = "Interleaved effects for attoparsec parsers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-uri" = callPackage
@@ -34886,8 +32604,6 @@ self: {
        ];
        description = "URI parser / printer using attoparsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-varword" = callPackage
@@ -34916,8 +32632,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Split a lazy bytestring at boundaries defined by an attoparsec parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atuin" = callPackage
@@ -34934,8 +32648,6 @@ self: {
        ];
        description = "Embedded Turtle language compiler in Haskell, with Epic output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "audacity" = callPackage
@@ -34977,8 +32689,6 @@ self: {
        ];
        description = "A battery-included audiovisual framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "augeas" = callPackage
@@ -34998,8 +32708,6 @@ self: {
        executablePkgconfigDepends = [ augeas ];
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) augeas;};
 
   "augur" = callPackage
@@ -35018,8 +32726,6 @@ self: {
        ];
        description = "Renaming media collections in a breeze";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aur" = callPackage
@@ -35038,8 +32744,6 @@ self: {
        ];
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aur-api" = callPackage
@@ -35056,8 +32760,6 @@ self: {
        ];
        description = "ArchLinux AUR json v5 API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aura" = callPackage
@@ -35094,8 +32796,6 @@ self: {
        ];
        description = "A secure package manager for Arch Linux and the AUR";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "authenticate" = callPackage
@@ -35137,8 +32837,6 @@ self: {
        libraryHaskellDepends = [ base LDAP text transformers ];
        description = "LDAP authentication for Haskell web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "authenticate-oauth" = callPackage
@@ -35170,8 +32868,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base network text ];
        description = "Password querying for .authinfo";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "authoring" = callPackage
@@ -35190,8 +32886,6 @@ self: {
        ];
        description = "A library for writing papers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "auto" = callPackage
@@ -35268,8 +32962,6 @@ self: {
        ];
        description = "Generates and displays patterns from next nearest neighbors cellular automata";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "automata" = callPackage
@@ -35294,8 +32986,6 @@ self: {
        ];
        description = "automata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "automitive-cse" = callPackage
@@ -35354,8 +33044,6 @@ self: {
        ];
        description = "Library for Nix expression dependency generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "autonix-deps-kf5" = callPackage
@@ -35379,8 +33067,6 @@ self: {
        ];
        description = "Generate dependencies for KDE 5 Nix expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "autopack" = callPackage
@@ -35433,8 +33119,6 @@ self: {
        executableHaskellDepends = [ base JuicyPixels random ];
        description = "A simple random avatar icon generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "average" = callPackage
@@ -35481,8 +33165,6 @@ self: {
        ];
        description = "Server-side implementation of the Avers storage model";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "avers-api" = callPackage
@@ -35499,8 +33181,6 @@ self: {
        ];
        description = "Types describing the core and extended Avers APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "avers-api-docs" = callPackage
@@ -35519,8 +33199,6 @@ self: {
        ];
        description = "Swagger documentation for the Avers API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "avers-server" = callPackage
@@ -35541,8 +33219,6 @@ self: {
        ];
        description = "Server implementation of the Avers API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aviation-cessna172-diagrams" = callPackage
@@ -35586,8 +33262,6 @@ self: {
        ];
        description = "A compile-time balanced AVL tree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "avr-shake" = callPackage
@@ -35599,8 +33273,6 @@ self: {
        libraryHaskellDepends = [ base dependent-sum mtl process shake ];
        description = "AVR Crosspack actions for shake build systems";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "avro" = callPackage
@@ -35672,8 +33344,6 @@ self: {
        ];
        description = "Tool for decoding avro";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "avwx" = callPackage
@@ -35693,8 +33363,6 @@ self: {
        testHaskellDepends = [ attoparsec base lens pretty-show text ];
        description = "Parse aviation weather reports";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "awesome-prelude" = callPackage
@@ -35706,8 +33374,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A prelude which I can be happy with. Based on base-prelude.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "awesomium" = callPackage
@@ -35723,8 +33389,6 @@ self: {
        ];
        description = "High-level Awesomium bindings";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "awesomium-glut" = callPackage
@@ -35736,8 +33400,6 @@ self: {
        libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ];
        description = "Utilities for using Awesomium with GLUT";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "awesomium-raw" = callPackage
@@ -35751,8 +33413,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Low-level Awesomium bindings";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {awesomium = null;};
 
   "aws" = callPackage
@@ -35848,8 +33508,6 @@ self: {
        ];
        description = "Configuration types, parsers & renderers for AWS services";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-dynamodb-conduit" = callPackage
@@ -35867,8 +33525,6 @@ self: {
        ];
        description = "Conduit-based interface for AWS DynamoDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-dynamodb-streams" = callPackage
@@ -35891,8 +33547,6 @@ self: {
        ];
        description = "Haskell bindings for Amazon DynamoDB Streams";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-easy" = callPackage
@@ -35916,8 +33570,6 @@ self: {
        ];
        description = "Helper function and types for working with amazonka";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-ec2" = callPackage
@@ -35947,8 +33599,6 @@ self: {
        ];
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-ec2-knownhosts" = callPackage
@@ -35971,8 +33621,6 @@ self: {
        ];
        description = "Capture and manage AWS EC2 known_host pubkeys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-elastic-transcoder" = callPackage
@@ -35995,8 +33643,6 @@ self: {
        ];
        description = "Haskell suite for the Elastic Transcoder service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-general" = callPackage
@@ -36022,8 +33668,6 @@ self: {
        ];
        description = "Bindings for Amazon Web Services (AWS) General Reference";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-kinesis" = callPackage
@@ -36049,8 +33693,6 @@ self: {
        ];
        description = "Bindings for Amazon Kinesis";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-kinesis-client" = callPackage
@@ -36085,8 +33727,6 @@ self: {
        ];
        description = "A producer & consumer client library for AWS Kinesis";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-kinesis-reshard" = callPackage
@@ -36115,8 +33755,6 @@ self: {
        ];
        description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-lambda" = callPackage
@@ -36136,8 +33774,6 @@ self: {
        ];
        description = "Haskell bindings for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-lambda-haskell-runtime" = callPackage
@@ -36180,8 +33816,6 @@ self: {
        ];
        description = "Run wai applications on AWS Lambda";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-lambda-runtime" = callPackage
@@ -36225,8 +33859,6 @@ self: {
        ];
        description = "Keep your AWS credentials file up to date with MFA-carrying credentials";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-performance-tests" = callPackage
@@ -36252,8 +33884,6 @@ self: {
        ];
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-route53" = callPackage
@@ -36271,8 +33901,6 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-sdk" = callPackage
@@ -36301,8 +33929,6 @@ self: {
        ];
        description = "AWS SDK for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-sdk-text-converter" = callPackage
@@ -36324,8 +33950,6 @@ self: {
        ];
        description = "The text converter for aws-sdk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-sdk-xml-unordered" = callPackage
@@ -36346,8 +33970,6 @@ self: {
        ];
        description = "The xml parser for aws-sdk package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-ses-easy" = callPackage
@@ -36390,8 +34012,6 @@ self: {
        ];
        description = "Amazon Web Services (AWS) Signature v4 HTTP request signer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-simple" = callPackage
@@ -36409,8 +34029,6 @@ self: {
        ];
        description = "Dead simple bindings to commonly used AWS Services";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-sns" = callPackage
@@ -36434,8 +34052,6 @@ self: {
        ];
        description = "Bindings for AWS SNS Version 2013-03-31";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "axel" = callPackage
@@ -36487,8 +34103,6 @@ self: {
        testToolDepends = [ hpack tasty-discover ];
        description = "The Axel programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "axiom" = callPackage
@@ -36505,8 +34119,6 @@ self: {
        ];
        description = "Web EDSL for running in browsers and server nodes using transient";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "axiomatic-classes" = callPackage
@@ -36546,8 +34158,6 @@ self: {
        testHaskellDepends = [ base hspec shelly text urbit-hob ];
        description = "Interact with Azimuth from Haskell";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "azubi" = callPackage
@@ -36566,8 +34176,6 @@ self: {
        ];
        description = "A simple DevOps tool which will never \"reach\" enterprice level";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "azure-acs" = callPackage
@@ -36585,8 +34193,6 @@ self: {
        ];
        description = "Windows Azure ACS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "azure-email" = callPackage
@@ -36605,8 +34211,6 @@ self: {
        ];
        description = "send email with microsoft azure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "azure-functions-worker" = callPackage
@@ -36634,8 +34238,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Azure Functions Worker";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "azure-service-api" = callPackage
@@ -36654,8 +34256,6 @@ self: {
        ];
        description = "Haskell bindings for the Microsoft Azure Service Management API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "azure-servicebus" = callPackage
@@ -36673,8 +34273,6 @@ self: {
        ];
        description = "Haskell wrapper over Microsoft Azure ServiceBus REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "azurify" = callPackage
@@ -36704,8 +34302,6 @@ self: {
        ];
        description = "A simple library for accessing Azure blob storage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "b-tree" = callPackage
@@ -36731,8 +34327,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion pipes ];
        description = "Immutable disk-based B* trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "b9" = callPackage
@@ -36774,8 +34368,6 @@ self: {
        ];
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "babl" = callPackage
@@ -36805,8 +34397,6 @@ self: {
        ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "backblaze-b2-hs" = callPackage
@@ -36839,8 +34429,6 @@ self: {
        ];
        description = "A client library to access Backblaze B2 cloud storage in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "backdropper" = callPackage
@@ -36858,8 +34446,6 @@ self: {
        ];
        description = "Rotates backdrops for X11 displays using Imagemagic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "backprop" = callPackage
@@ -36904,8 +34490,6 @@ self: {
        ];
        description = "Backstop a target directory by source directories";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "backtracking" = callPackage
@@ -36937,8 +34521,6 @@ self: {
        ];
        description = "A monad transformer for backtracking exceptions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "backward-state" = callPackage
@@ -36950,8 +34532,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A state monad that runs the state in reverse through the computation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bacteria" = callPackage
@@ -36977,8 +34557,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple stable bag";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bake" = callPackage
@@ -37012,8 +34590,6 @@ self: {
        ];
        description = "Continuous integration system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ballast" = callPackage
@@ -37037,8 +34613,6 @@ self: {
        ];
        description = "Shipwire API client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamboo" = callPackage
@@ -37059,8 +34633,6 @@ self: {
        ];
        description = "A blog engine on Hack";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamboo-launcher" = callPackage
@@ -37081,8 +34653,6 @@ self: {
        ];
        description = "bamboo-launcher";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamboo-plugin-highlight" = callPackage
@@ -37100,8 +34670,6 @@ self: {
        ];
        description = "A highlight middleware";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamboo-plugin-photo" = callPackage
@@ -37120,8 +34688,6 @@ self: {
        ];
        description = "A photo album middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamboo-theme-blueprint" = callPackage
@@ -37140,8 +34706,6 @@ self: {
        ];
        description = "bamboo blueprint theme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamboo-theme-mini-html5" = callPackage
@@ -37164,8 +34728,6 @@ self: {
        ];
        description = "bamboo mini html5 theme";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamse" = callPackage
@@ -37183,8 +34745,6 @@ self: {
        ];
        description = "A Windows Installer (MSI) generator framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamstats" = callPackage
@@ -37198,8 +34758,6 @@ self: {
        executableHaskellDepends = [ base cmdargs samtools ];
        description = "A program to extract various information from BAM alignmnet files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ban-instance" = callPackage
@@ -37226,8 +34784,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck time ];
        description = "A library for determining US bank holidays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bank-holidays-england" = callPackage
@@ -37259,8 +34815,6 @@ self: {
        ];
        description = "Generalized word blacklister";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barbies" = callPackage
@@ -37289,8 +34843,6 @@ self: {
        testHaskellDepends = [ barbies base ];
        description = "Create strippable HKD via TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barbly" = callPackage
@@ -37324,8 +34876,6 @@ self: {
        executableHaskellDepends = [ base cmdargs csv diagrams filepath ];
        description = "Creating Bar Charts in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barcodes-code128" = callPackage
@@ -37337,8 +34887,6 @@ self: {
        libraryHaskellDepends = [ base bytestring HPDF ];
        description = "Generate Code 128 barcodes as PDFs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barecheck" = callPackage
@@ -37350,8 +34898,6 @@ self: {
        libraryHaskellDepends = [ base containers QuickCheck text time ];
        description = "QuickCheck implementations for common types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barley" = callPackage
@@ -37384,8 +34930,6 @@ self: {
        libraryHaskellDepends = [ base containers filepath glib gtk ];
        description = "Declarative Gtk GUI library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barrier" = callPackage
@@ -37410,8 +34954,6 @@ self: {
        ];
        description = "Shields.io style badge generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barrier-monad" = callPackage
@@ -37423,8 +34965,6 @@ self: {
        libraryHaskellDepends = [ base comonad mtl transformers ];
        description = "Implementation of barrier monad, can use custom front/back type";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base_4_14_0_0" = callPackage
@@ -37492,8 +35032,6 @@ self: {
        doHaddock = false;
        description = "Helps migrating projects to base-compat(-batteries)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base-encoding" = callPackage
@@ -37509,8 +35047,6 @@ self: {
        ];
        description = "Binary-to-text encodings (e.g. base64)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base-feature-macros" = callPackage
@@ -37523,8 +35059,6 @@ self: {
        doHaddock = false;
        description = "Semantic CPP feature macros for base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base-generics" = callPackage
@@ -37536,8 +35070,6 @@ self: {
        libraryHaskellDepends = [ base ];
        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;
-       broken = true;
      }) {};
 
   "base-io-access" = callPackage
@@ -37549,8 +35081,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The IO functions included in base delimited into small, composable classes";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base-noprelude" = callPackage
@@ -37716,8 +35246,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast base32 and base32hex codec for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base32-lens" = callPackage
@@ -37844,8 +35372,6 @@ self: {
        ];
        description = "Base62 encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base64" = callPackage
@@ -37896,8 +35422,6 @@ self: {
        ];
        description = "Base64 encoding of byte sequences";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base64-bytestring" = callPackage
@@ -37983,8 +35507,6 @@ self: {
        ];
        description = "Base64-encode and decode streams of bytes. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base64-lens" = callPackage
@@ -38102,8 +35624,6 @@ self: {
        ];
        description = "Baserock Definitions Schema";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "basex-client" = callPackage
@@ -38115,8 +35635,6 @@ self: {
        libraryHaskellDepends = [ base network pureMD5 utf8-string ];
        description = "A BaseX client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bash" = callPackage
@@ -38148,8 +35666,6 @@ self: {
        ];
        description = "Lifting values from base types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "basic-cpuid" = callPackage
@@ -38217,8 +35733,6 @@ self: {
        ];
        description = "An interpreter for a small functional language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "batch" = callPackage
@@ -38236,8 +35750,6 @@ self: {
        testHaskellDepends = [ base hspec stm timespan ];
        description = "Simplify queuing up data and processing it in batch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "batch-rename" = callPackage
@@ -38282,8 +35794,6 @@ self: {
        ];
        description = "Batch processing toolset for Linux / Unix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "battlenet" = callPackage
@@ -38297,8 +35807,6 @@ self: {
        ];
        description = "API client for Battle.Net";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "battlenet-yesod" = callPackage
@@ -38312,8 +35820,6 @@ self: {
        ];
        description = "Yesod integration for the battlenet package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "battleplace" = callPackage
@@ -38331,8 +35837,6 @@ self: {
        ];
        description = "Core definitions for BattlePlace.io service";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "battleplace-api" = callPackage
@@ -38346,8 +35850,6 @@ self: {
        ];
        description = "Public API definitions of BattlePlace.io service";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "battleship-combinatorics" = callPackage
@@ -38371,8 +35873,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Compute number of possible arrangements in the battleship game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "battleships" = callPackage
@@ -38405,8 +35905,6 @@ self: {
        ];
        description = "A web-based implementation of battleships including an AI opponent";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bayes-stack" = callPackage
@@ -38426,8 +35924,6 @@ self: {
        ];
        description = "Framework for inferring generative probabilistic models with Gibbs sampling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bazel-coverage-report-renderer" = callPackage
@@ -38445,8 +35941,6 @@ self: {
        ];
        description = "HTML Coverage Reports for Rules_Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bazel-runfiles" = callPackage
@@ -38493,8 +35987,6 @@ self: {
        ];
        description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bcp47" = callPackage
@@ -38514,8 +36006,6 @@ self: {
        ];
        description = "Language tags as specified by BCP 47";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bcrypt" = callPackage
@@ -38574,8 +36064,6 @@ self: {
        ];
        description = "Tools for managing a content store of software packages";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ostree;};
 
   "bdcs-api" = callPackage
@@ -38612,8 +36100,6 @@ self: {
        ];
        description = "BDCS API Server";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libgit2-glib;};
 
   "bdd" = callPackage
@@ -38631,8 +36117,6 @@ self: {
        ];
        description = "Behavior-Driven Development DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bdelta" = callPackage
@@ -38659,8 +36143,6 @@ self: {
        executableHaskellDepends = [ aeson base network text url ];
        description = "Update CSS in the browser without reloading the page";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam" = callPackage
@@ -38680,8 +36162,6 @@ self: {
        ];
        description = "A type-safe SQL mapper for Haskell that doesn't use Template Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam-automigrate" = callPackage
@@ -38719,8 +36199,6 @@ self: {
        ];
        description = "DB migration library for beam, targeting Postgres";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam-core" = callPackage
@@ -38742,8 +36220,6 @@ self: {
        ];
        description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam-migrate" = callPackage
@@ -38764,8 +36240,6 @@ self: {
        ];
        description = "SQL DDL support and migrations support library for Beam";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam-mysql" = callPackage
@@ -38783,8 +36257,6 @@ self: {
        ];
        description = "Connection layer between beam and MySQL/MariaDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam-newtype-field" = callPackage
@@ -38800,8 +36272,6 @@ self: {
        ];
        description = "A newtype for wrapping newtypes into beam schemas";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam-postgres" = callPackage
@@ -38828,8 +36298,6 @@ self: {
        ];
        description = "Connection layer between beam and postgres";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam-sqlite" = callPackage
@@ -38852,8 +36320,6 @@ self: {
        ];
        description = "Beam driver for SQLite";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam-th" = callPackage
@@ -38875,8 +36341,6 @@ self: {
        ];
        description = "Template Haskell utilities for beam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beamable" = callPackage
@@ -38901,8 +36365,6 @@ self: {
        ];
        description = "Generic serializer/deserializer with compact representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bearriver" = callPackage
@@ -38918,8 +36380,6 @@ self: {
        ];
        description = "FRP Yampa replacement implemented with Monadic Stream Functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beautifHOL" = callPackage
@@ -38933,8 +36393,6 @@ self: {
        executableHaskellDepends = [ array base haskell98 mtl ];
        description = "A pretty-printer for higher-order logic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bech32" = callPackage
@@ -38995,8 +36453,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Efficient Matrix and Vector operations in 100% Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beeminder-api" = callPackage
@@ -39020,8 +36476,6 @@ self: {
        ];
        description = "Bindings to the beeminder.com JSON API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bein" = callPackage
@@ -39045,8 +36499,6 @@ self: {
        ];
        description = "Bein is a provenance and workflow management system for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "belka" = callPackage
@@ -39075,8 +36527,6 @@ self: {
        ];
        description = "HTTP client DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bench" = callPackage
@@ -39163,8 +36613,6 @@ self: {
        executableHaskellDepends = [ base bytestring time ];
        description = "Micro-benchmarking with detailed statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bencode" = callPackage
@@ -39207,8 +36655,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bencodex reader/writer for Haskell";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bencoding" = callPackage
@@ -39255,8 +36701,6 @@ self: {
        librarySystemDepends = [ db ];
        description = "Pretty BerkeleyDB v4 binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) db;};
 
   "berp" = callPackage
@@ -39282,8 +36726,6 @@ self: {
        ];
        description = "An implementation of Python 3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bert" = callPackage
@@ -39306,8 +36748,6 @@ self: {
        ];
        description = "BERT implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "besout" = callPackage
@@ -39319,8 +36759,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Extended GCD of polynomials over F_p[x]";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bet" = callPackage
@@ -39347,8 +36785,6 @@ self: {
        ];
        description = "Betfair API bindings. Bet on sports on betting exchanges.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "betacode" = callPackage
@@ -39365,8 +36801,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code).";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "betris" = callPackage
@@ -39389,8 +36823,6 @@ self: {
        ];
        description = "A horizontal version of tetris for braille users";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "between" = callPackage
@@ -39430,8 +36862,6 @@ self: {
        ];
        description = "Bidirectionalization for Free! (POPL'09)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bff-mono" = callPackage
@@ -39474,8 +36904,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring time ];
        description = "Parse BgMax-files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bgzf" = callPackage
@@ -39491,8 +36919,6 @@ self: {
        ];
        description = "Blocked GZip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bhoogle" = callPackage
@@ -39514,8 +36940,6 @@ self: {
        ];
        description = "Simple terminal GUI for local hoogle";
        license = "(BSD-3-Clause OR Apache-2.0)";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bibdb" = callPackage
@@ -39538,8 +36962,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A database based bibliography manager for BibTeX";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bibtex" = callPackage
@@ -39584,8 +37006,6 @@ self: {
        ];
        description = "Prototype Implementation of Combining Syntactic and Semantic Bidirectionalization (ICFP'10)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bidispec" = callPackage
@@ -39597,8 +37017,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Specification of generators and parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bidispec-extras" = callPackage
@@ -39610,8 +37028,6 @@ self: {
        libraryHaskellDepends = [ base bytestring dataenc mtl ];
        description = "Extra helper functions for bidirectional specifications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bifunctor" = callPackage
@@ -39680,8 +37096,6 @@ self: {
        ];
        description = "A parser for the Billboard chord dataset";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "billeksah-forms" = callPackage
@@ -39699,8 +37113,6 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "billeksah-main" = callPackage
@@ -39719,8 +37131,6 @@ self: {
        ];
        description = "Leksah plugin base";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "billeksah-main-static" = callPackage
@@ -39761,8 +37171,6 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "billeksah-services" = callPackage
@@ -39778,8 +37186,6 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bimap" = callPackage
@@ -39926,8 +37332,6 @@ self: {
        ];
        description = "Bit parsing/writing on top of binary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-communicator" = callPackage
@@ -39939,8 +37343,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mtl ];
        description = "Flexible way to ease transmission of binary data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-conduit" = callPackage
@@ -39971,8 +37373,6 @@ self: {
        libraryHaskellDepends = [ base binary ghc-prim ];
        description = "Automatic deriving of Binary using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-enum" = callPackage
@@ -40009,8 +37409,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "binary-file" = callPackage
@@ -40026,8 +37424,6 @@ self: {
        ];
        description = "read/write binary file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-generic" = callPackage
@@ -40065,8 +37461,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-instances" = callPackage
@@ -40245,8 +37639,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mtl ];
        description = "Monad to ease implementing a binary network protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-protocol-zmq" = callPackage
@@ -40262,8 +37654,6 @@ self: {
        ];
        description = "Monad to ease implementing a binary network protocol over ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-search" = callPackage
@@ -40280,8 +37670,6 @@ self: {
        ];
        description = "Binary and exponential searches";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-serialise-cbor" = callPackage
@@ -40354,8 +37742,6 @@ self: {
        ];
        description = "data serialization/deserialization io-streams library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-strict" = callPackage
@@ -40398,8 +37784,6 @@ self: {
        ];
        description = "Tagged binary serialisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-tree" = callPackage
@@ -40439,8 +37823,6 @@ self: {
        ];
        description = "Type-safe binary serialization";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-varint" = callPackage
@@ -40493,8 +37875,6 @@ self: {
        ];
        description = "Data marshaling library that uses type level equations to optimize buffering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binding-core" = callPackage
@@ -40509,8 +37889,6 @@ self: {
        testHaskellDepends = [ base HTF HUnit QuickCheck random ];
        description = "Data Binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binding-gtk" = callPackage
@@ -40525,8 +37903,6 @@ self: {
        testHaskellDepends = [ base binding-core directory gtk ];
        description = "Data Binding in Gtk2Hs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binding-wx" = callPackage
@@ -40541,8 +37917,6 @@ self: {
        testHaskellDepends = [ base binding-core directory wx ];
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bindings" = callPackage
@@ -40577,8 +37951,6 @@ self: {
        libraryPkgconfigDepends = [ esound ];
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {esound = null;};
 
   "bindings-GLFW" = callPackage
@@ -40617,8 +37989,6 @@ self: {
        librarySystemDepends = [ K8055D ];
        description = "Bindings to Velleman K8055 dll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {K8055D = null;};
 
   "bindings-apr" = callPackage
@@ -40631,8 +38001,6 @@ self: {
        libraryPkgconfigDepends = [ apr ];
        description = "Low level bindings to Apache Portable Runtime (APR)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) apr;};
 
   "bindings-apr-util" = callPackage
@@ -40645,8 +38013,6 @@ self: {
        libraryPkgconfigDepends = [ apr-util ];
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {apr-util = null;};
 
   "bindings-audiofile" = callPackage
@@ -40674,8 +38040,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Bindings for libbfd, a library of the GNU `binutils'";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {bfd = null; opcodes = null;};
 
   "bindings-cctools" = callPackage
@@ -40688,8 +38052,6 @@ self: {
        librarySystemDepends = [ dttools ];
        description = "Bindings to the CCTools WorkQueue C library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {dttools = null;};
 
   "bindings-codec2" = callPackage
@@ -40720,8 +38082,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "This package is obsolete. Look for bindings-DSL instead.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bindings-dc1394" = callPackage
@@ -40735,8 +38095,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Library for using firewire (iidc-1394) cameras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {dc1394 = null;};
 
   "bindings-directfb" = callPackage
@@ -40763,8 +38121,6 @@ self: {
        libraryPkgconfigDepends = [ eskit ];
        description = "Bindings to ESKit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {eskit = null;};
 
   "bindings-fann" = callPackage
@@ -40777,8 +38133,6 @@ self: {
        libraryPkgconfigDepends = [ fann ];
        description = "Low level bindings to FANN neural network library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {fann = null;};
 
   "bindings-fluidsynth" = callPackage
@@ -40791,8 +38145,6 @@ self: {
        libraryPkgconfigDepends = [ fluidsynth ];
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fluidsynth;};
 
   "bindings-friso" = callPackage
@@ -40805,8 +38157,6 @@ self: {
        librarySystemDepends = [ friso ];
        description = "Low level bindings for friso";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {friso = null;};
 
   "bindings-glib" = callPackage
@@ -40855,8 +38205,6 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gsl;};
 
   "bindings-gts" = callPackage
@@ -40886,8 +38234,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) hamlib;};
 
   "bindings-hdf5" = callPackage
@@ -40899,8 +38245,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to HDF5 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bindings-levmar" = callPackage
@@ -40950,8 +38294,6 @@ self: {
        libraryPkgconfigDepends = [ libftdi libusb ];
        description = "Low level bindings to libftdi";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libftdi; libusb = null;};
 
   "bindings-libg15" = callPackage
@@ -40964,8 +38306,6 @@ self: {
        librarySystemDepends = [ g15 ];
        description = "Bindings to libg15";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {g15 = null;};
 
   "bindings-librrd" = callPackage
@@ -40978,8 +38318,6 @@ self: {
        libraryPkgconfigDepends = [ librrd ];
        description = "Low level bindings to RRDtool";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {librrd = null;};
 
   "bindings-libstemmer" = callPackage
@@ -40996,8 +38334,6 @@ self: {
        librarySystemDepends = [ stemmer ];
        description = "Binding for libstemmer with low level binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {stemmer = null;};
 
   "bindings-libusb" = callPackage
@@ -41010,8 +38346,6 @@ self: {
        libraryPkgconfigDepends = [ libusb ];
        description = "Low level bindings to libusb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libusb = null;};
 
   "bindings-libv4l2" = callPackage
@@ -41024,8 +38358,6 @@ self: {
        librarySystemDepends = [ v4l2 ];
        description = "bindings to libv4l2 for Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {v4l2 = null;};
 
   "bindings-libzip" = callPackage
@@ -41049,8 +38381,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "bindings to Video For Linux Two (v4l2) kernel interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bindings-lxc" = callPackage
@@ -41087,8 +38417,6 @@ self: {
        libraryPkgconfigDepends = [ monetdb-mapi ];
        description = "Low-level bindings for the MonetDB API (mapi)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {monetdb-mapi = null;};
 
   "bindings-mpdecimal" = callPackage
@@ -41100,8 +38428,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "bindings to mpdecimal library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bindings-nettle" = callPackage
@@ -41176,8 +38502,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "PPDev bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bindings-saga-cmd" = callPackage
@@ -41223,8 +38547,6 @@ self: {
        librarySystemDepends = [ scsynth ];
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {scsynth = null;};
 
   "bindings-sipc" = callPackage
@@ -41240,8 +38562,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Low level bindings to SIPC";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {sipc = null;};
 
   "bindings-sophia" = callPackage
@@ -41300,8 +38620,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bindings against the wlc library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {wlc = null;};
 
   "bindings-yices" = callPackage
@@ -41328,8 +38646,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binembed" = callPackage
@@ -41348,8 +38664,6 @@ self: {
        ];
        description = "Embed data into object files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binembed-example" = callPackage
@@ -41366,8 +38680,6 @@ self: {
        ];
        description = "Example project using binembed to embed data in object files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bini" = callPackage
@@ -41437,8 +38749,6 @@ self: {
        executableHaskellDepends = [ base bytestring random ];
        description = "A bioinformatics library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bio-sequence" = callPackage
@@ -41455,8 +38765,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bioace" = callPackage
@@ -41470,8 +38778,6 @@ self: {
        ];
        description = "Library for reading ace assembly files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bioalign" = callPackage
@@ -41483,8 +38789,6 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Data structures and helper functions for calculating alignments";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biocore" = callPackage
@@ -41498,8 +38802,6 @@ self: {
        libraryHaskellDepends = [ base bytestring stringable ];
        description = "A bioinformatics library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biofasta" = callPackage
@@ -41511,8 +38813,6 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Library for reading fasta sequence files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biofastq" = callPackage
@@ -41524,8 +38824,6 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "A library for reading FASTQ files";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biohazard" = callPackage
@@ -41548,8 +38846,6 @@ self: {
        ];
        description = "bioinformatics support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bioinformatics-toolkit" = callPackage
@@ -41586,8 +38882,6 @@ self: {
        ];
        description = "A collection of bioinformatics tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biophd" = callPackage
@@ -41603,8 +38897,6 @@ self: {
        ];
        description = "Library for reading phd sequence files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biopsl" = callPackage
@@ -41621,8 +38913,6 @@ self: {
        executableHaskellDepends = [ cmdargs unordered-containers ];
        description = "Library and executables for working with PSL files";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biosff" = callPackage
@@ -41639,8 +38929,6 @@ self: {
        executableHaskellDepends = [ array base cmdargs mtl ];
        description = "Library and executables for working with SFF files";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biostockholm" = callPackage
@@ -41663,8 +38951,6 @@ self: {
        ];
        description = "Parsing and rendering of Stockholm files (used by Pfam, Rfam and Infernal)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bip32" = callPackage
@@ -41719,8 +39005,6 @@ self: {
        ];
        description = "Plot a colorful tree";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bird" = callPackage
@@ -41741,8 +39025,6 @@ self: {
        ];
        description = "A simple, sinatra-inspired web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "birds-of-paradise" = callPackage
@@ -41755,8 +39037,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Birds of Paradise";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bisc" = callPackage
@@ -41794,8 +39074,6 @@ self: {
        ];
        description = "Determine relevant parts of binary data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bishbosh" = callPackage
@@ -41826,8 +39104,6 @@ self: {
        ];
        description = "Plays chess";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bit-array" = callPackage
@@ -41840,8 +39116,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bit-protocol" = callPackage
@@ -41881,8 +39155,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Lazy, infinite, compact stream of Bool with O(1) indexing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bit-vector" = callPackage
@@ -41933,8 +39205,6 @@ self: {
        ];
        description = "Bitcoin address generation and rendering. Parsing coming soon.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoin-api" = callPackage
@@ -41959,8 +39229,6 @@ self: {
        ];
        description = "Provides access to the RPC API of Bitcoin Core";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoin-api-extra" = callPackage
@@ -41983,8 +39251,6 @@ self: {
        ];
        description = "Higher level constructs on top of the bitcoin-api package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoin-block" = callPackage
@@ -42005,8 +39271,6 @@ self: {
        ];
        description = "Utility functions for manipulating bitcoin blocks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoin-compact-filters" = callPackage
@@ -42029,8 +39293,6 @@ self: {
        ];
        description = "BIP 158 compact block filters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoin-hash" = callPackage
@@ -42068,8 +39330,6 @@ self: {
        ];
        description = "Partial implementation of the Bitcoin protocol (as of 2013)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoin-keys" = callPackage
@@ -42152,8 +39412,6 @@ self: {
        ];
        description = "Library to communicate with the Satoshi Bitcoin daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoin-script" = callPackage
@@ -42171,8 +39429,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Compilation, manipulation and decompilation of Bitcoin scripts";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoin-scripting" = callPackage
@@ -42194,8 +39450,6 @@ self: {
        ];
        description = "Resources for working with miniscript, and script descriptors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoin-tx" = callPackage
@@ -42216,8 +39470,6 @@ self: {
        ];
        description = "Utility functions for manipulating bitcoin transactions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoin-types" = callPackage
@@ -42264,8 +39516,6 @@ self: {
        ];
        description = "A library for working with bitcoin-core regtest networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoind-rpc" = callPackage
@@ -42285,8 +39535,6 @@ self: {
        ];
        description = "A streamlined interface to bitcoin core using Haskoin types and Servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitly-cli" = callPackage
@@ -42302,8 +39550,6 @@ self: {
        ];
        description = "A command line tool to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitmap" = callPackage
@@ -42342,8 +39588,6 @@ self: {
        ];
        description = "Bitmap library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bits" = callPackage
@@ -42374,8 +39618,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Atomic bit operations on memory locations for low-level synchronization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bits-bytestring" = callPackage
@@ -42425,8 +39667,6 @@ self: {
        ];
        description = "Bitstream support for Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bits-extra" = callPackage
@@ -42461,8 +39701,6 @@ self: {
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gcc_s = null;};
 
   "bitset" = callPackage
@@ -42485,8 +39723,6 @@ self: {
        benchmarkSystemDepends = [ gmp ];
        description = "A space-efficient set data structure";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gmp;};
 
   "bitset-word8" = callPackage
@@ -42529,8 +39765,6 @@ self: {
        executablePkgconfigDepends = [ gtk2 pango ];
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk2; inherit (pkgs) pango;};
 
   "bitstream" = callPackage
@@ -42549,8 +39783,6 @@ self: {
        ];
        description = "Fast, packed, strict and lazy bit streams with stream fusion";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitstring" = callPackage
@@ -42594,8 +39826,6 @@ self: {
        ];
        description = "Bittorrent protocol implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bittrex" = callPackage
@@ -42701,8 +39931,6 @@ self: {
        ];
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bizzlelude" = callPackage
@@ -42718,8 +39946,6 @@ self: {
        ];
        description = "A lousy Prelude replacement by a lousy dude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bizzlelude-js" = callPackage
@@ -42731,8 +39957,6 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        description = "A lousy Prelude replacement by a lousy dude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bk-tree" = callPackage
@@ -42767,8 +39991,6 @@ self: {
        ];
        description = "Backup utility for backing up to cloud storage services (S3 only right now)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bktrees" = callPackage
@@ -42794,8 +40016,6 @@ self: {
        executableHaskellDepends = [ base haskell98 unix ];
        description = "a stupid cron";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "black-jewel" = callPackage
@@ -42878,8 +40098,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text vector ];
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blakesum-demo" = callPackage
@@ -42897,8 +40115,6 @@ self: {
        ];
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blank-canvas" = callPackage
@@ -42953,8 +40169,6 @@ self: {
        libraryHaskellDepends = [ base ieee QuickCheck storable-complex ];
        description = "Bindings to the BLAS library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blas-carray" = callPackage
@@ -43014,8 +40228,6 @@ self: {
        testHaskellDepends = [ base vector ];
        description = "Low-level Haskell bindings to Blas";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas;};
 
   "blastxml" = callPackage
@@ -43029,8 +40241,6 @@ self: {
        ];
        description = "Library for reading Blast XML output";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blatex" = callPackage
@@ -43048,8 +40258,6 @@ self: {
        ];
        description = "Blog in LaTeX";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze" = callPackage
@@ -43122,8 +40330,6 @@ self: {
        ];
        description = "Enumeratees for the incremental conversion of builders to bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze-colonnade" = callPackage
@@ -43140,8 +40346,6 @@ self: {
        testHaskellDepends = [ base colonnade doctest ];
        description = "blaze-html backend for colonnade";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze-from-html" = callPackage
@@ -43193,8 +40397,6 @@ self: {
        ];
        description = "Some contributions to add handy things to blaze html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze-html-hexpat" = callPackage
@@ -43206,8 +40408,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html bytestring hexpat text ];
        description = "A hexpat backend for blaze-html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze-html-truncate" = callPackage
@@ -43223,8 +40423,6 @@ self: {
        ];
        description = "A truncator for blaze-html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze-json" = callPackage
@@ -43246,8 +40444,6 @@ self: {
        ];
        description = "tiny library for encoding json";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze-markup" = callPackage
@@ -43326,8 +40522,6 @@ self: {
        ];
        description = "Fast rendering of common datatypes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blazeMarker" = callPackage
@@ -43356,8 +40550,6 @@ self: {
        ];
        description = "A true monad (transformer) version of the blaze-markup and blaze-html libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ble" = callPackage
@@ -43389,8 +40581,6 @@ self: {
        ];
        description = "Bluetooth Low Energy (BLE) peripherals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blink1" = callPackage
@@ -43409,8 +40599,6 @@ self: {
        ];
        description = "Control library for blink(1) LED from ThingM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blip" = callPackage
@@ -43429,8 +40617,6 @@ self: {
        ];
        description = "Python to bytecode compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bliplib" = callPackage
@@ -43446,8 +40632,6 @@ self: {
        ];
        description = "Support code for Blip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blockchain" = callPackage
@@ -43471,8 +40655,6 @@ self: {
        ];
        description = "Generic blockchain implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blockhash" = callPackage
@@ -43494,8 +40676,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Blockhash perceptual image hash algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blocking-transactions" = callPackage
@@ -43528,8 +40708,6 @@ self: {
        executableHaskellDepends = [ base ConfigFile haskell98 old-time ];
        description = "Very simple static blog software";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bloodhound" = callPackage
@@ -43558,8 +40736,6 @@ self: {
        ];
        description = "Elasticsearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bloodhound-amazonka-auth" = callPackage
@@ -43582,8 +40758,6 @@ self: {
        ];
        description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bloomfilter" = callPackage
@@ -43622,8 +40796,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Distributed bloom filters on Redis (using the Hedis client)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blosum" = callPackage
@@ -43645,8 +40817,6 @@ self: {
        ];
        description = "BLOSUM generator";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bloxorz" = callPackage
@@ -43661,8 +40831,6 @@ self: {
        executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blubber" = callPackage
@@ -43680,8 +40848,6 @@ self: {
        ];
        description = "The blubber client; connects to the blubber server";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blubber-server" = callPackage
@@ -43703,8 +40869,6 @@ self: {
        ];
        description = "The blubber server, serves blubber clients";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blucontrol" = callPackage
@@ -43794,8 +40958,6 @@ self: {
        executablePkgconfigDepends = [ gtk2 ];
        description = "full-featured tiling for the GNOME desktop environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk2;};
 
   "bluetileutils" = callPackage
@@ -43809,8 +40971,6 @@ self: {
        executableHaskellDepends = [ base gtk ];
        description = "Utilities for Bluetile";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blunk-hask-tests" = callPackage
@@ -43826,8 +40986,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blunt" = callPackage
@@ -43849,8 +41007,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convert between pointfree and pointful expressions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bmp" = callPackage
@@ -43875,8 +41031,6 @@ self: {
        ];
        description = "Library for communication with the Bosch BNO055 orientation sensor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "board-games" = callPackage
@@ -43945,8 +41099,6 @@ self: {
        ];
        executableHaskellDepends = [ base hogre hois random ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boilerplate" = callPackage
@@ -43975,8 +41127,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Generate Haskell boilerplate";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bolt" = callPackage
@@ -44000,8 +41150,6 @@ self: {
        ];
        description = "Bolt driver for Neo4j";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boltzmann-brain" = callPackage
@@ -44027,8 +41175,6 @@ self: {
        ];
        description = "Analytic sampler compiler for combinatorial systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boltzmann-samplers" = callPackage
@@ -44079,8 +41225,6 @@ self: {
        ];
        description = "Bond schema compiler and code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bond-haskell" = callPackage
@@ -44109,8 +41253,6 @@ self: {
        ];
        description = "Runtime support for BOND serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bond-haskell-compiler" = callPackage
@@ -44132,8 +41274,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bond code generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bookkeeper" = callPackage
@@ -44161,8 +41301,6 @@ self: {
        ];
        description = "Anonymous records and overloaded labels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bookkeeper-permissions" = callPackage
@@ -44174,8 +41312,6 @@ self: {
        libraryHaskellDepends = [ base bookkeeper type-level-sets ];
        description = "Permissions for bookkeeper records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bookkeeping" = callPackage
@@ -44303,8 +41439,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Boolean expressions with various representations and search queries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bools" = callPackage
@@ -44362,8 +41496,6 @@ self: {
        ];
        description = "Chronokinetic stream sources and incremental consumers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boomerang" = callPackage
@@ -44396,8 +41528,6 @@ self: {
        ];
        description = "Boomshine clone";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boop" = callPackage
@@ -44433,8 +41563,6 @@ self: {
        ];
        description = "Mathematically sound sound synthesis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boots" = callPackage
@@ -44471,8 +41599,6 @@ self: {
        executableHaskellDepends = [ base time ];
        description = "Factory for quickly building an application";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boots-cloud" = callPackage
@@ -44490,8 +41616,6 @@ self: {
        ];
        description = "Factory for quickly building a microservice";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boots-web" = callPackage
@@ -44511,8 +41635,6 @@ self: {
        ];
        description = "Factory for quickly building a web application";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bootstrap-types" = callPackage
@@ -44567,8 +41689,6 @@ self: {
        ];
        description = "Metering System for OpenStack metrics provided by Vaultaire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boring" = callPackage
@@ -44618,8 +41738,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A boring window switcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bot" = callPackage
@@ -44631,8 +41749,6 @@ self: {
        libraryHaskellDepends = [ arrows base Stream ];
        description = "bots for functional reactive programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "both" = callPackage
@@ -44657,8 +41773,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Build tool for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bound" = callPackage
@@ -44728,8 +41842,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Arrays with a value for every index";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bounded-queue" = callPackage
@@ -44799,8 +41911,6 @@ self: {
        ];
        description = "audio-visual pseudo-physical simulation of colliding circles";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "box" = callPackage
@@ -44826,8 +41936,6 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "boxes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "box-csv" = callPackage
@@ -44844,8 +41952,6 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "box-socket" = callPackage
@@ -44868,8 +41974,6 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "box-tuples" = callPackage
@@ -44926,8 +42030,6 @@ self: {
        ];
        description = "Types and functions to work with braids and Khovanov homology";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brain-bleep" = callPackage
@@ -44941,8 +42043,6 @@ self: {
        executableHaskellDepends = [ array base containers parsec ];
        description = "primitive imperative language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brainfuck" = callPackage
@@ -45025,8 +42125,6 @@ self: {
        executableHaskellDepends = [ base haskgame mtl SDL ];
        description = "A simple Breakout game implementation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "breve" = callPackage
@@ -45063,8 +42161,6 @@ self: {
        executableHaskellDepends = [ array base parallel random SDL ];
        description = "A Haskell implementation of the Brian's Brain cellular automaton";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brick" = callPackage
@@ -45109,8 +42205,6 @@ self: {
        ];
        description = "A drop-down menu widget for brick";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brick-filetree" = callPackage
@@ -45170,8 +42264,6 @@ self: {
        ];
        description = "Bricks is a lazy functional language based on Nix";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bricks-internal" = callPackage
@@ -45190,8 +42282,6 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bricks-internal-test" = callPackage
@@ -45207,8 +42297,6 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bricks-parsec" = callPackage
@@ -45229,8 +42317,6 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bricks-rendering" = callPackage
@@ -45251,8 +42337,6 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bricks-syntax" = callPackage
@@ -45273,8 +42357,6 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brillig" = callPackage
@@ -45295,8 +42377,6 @@ self: {
        ];
        description = "Simple part of speech tagger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brittany" = callPackage
@@ -45428,8 +42508,6 @@ self: {
        libraryHaskellDepends = [ base containers stm time ];
        description = "Small library for interactive functional programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brok" = callPackage
@@ -45457,8 +42535,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Finds broken links in text files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "broker-haskell" = callPackage
@@ -45472,8 +42548,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Haskell bindings to Broker, Bro's messaging library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {broker = null;};
 
   "bronyradiogermany-common" = callPackage
@@ -45491,8 +42565,6 @@ self: {
        ];
        description = "Common types and URIs for the BronyRadioGermany API bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bronyradiogermany-streaming" = callPackage
@@ -45513,8 +42585,6 @@ self: {
        ];
        description = "Streaming interface for the BronyRadioGermany API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brotli" = callPackage
@@ -45535,8 +42605,6 @@ self: {
        ];
        description = "Brotli (RFC7932) compression and decompression";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libbrotlidec = null; libbrotlienc = null;};
 
   "brotli-conduit" = callPackage
@@ -45557,8 +42625,6 @@ self: {
        ];
        description = "Conduit interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brotli-streams" = callPackage
@@ -45579,8 +42645,6 @@ self: {
        ];
        description = "IO-Streams interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "browscap" = callPackage
@@ -45597,8 +42661,6 @@ self: {
        ];
        description = "A reader and interface for the Browser Capabilities Project data files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bsb-http-chunked" = callPackage
@@ -45633,8 +42695,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Access to the BSD sysctl(3) interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bson" = callPackage
@@ -45656,8 +42716,6 @@ self: {
        ];
        description = "BSON documents are JSON-like objects with a standard binary encoding";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bson-generic" = callPackage
@@ -45669,8 +42727,6 @@ self: {
        libraryHaskellDepends = [ base bson ghc-prim text ];
        description = "Generic functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bson-generics" = callPackage
@@ -45682,8 +42738,6 @@ self: {
        libraryHaskellDepends = [ base bson ghc-prim ];
        description = "Generics functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bson-lens" = callPackage
@@ -45695,8 +42749,6 @@ self: {
        libraryHaskellDepends = [ base bson lens text ];
        description = "BSON lenses";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bson-mapping" = callPackage
@@ -45743,8 +42795,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A simple unassuming parser for bytestring";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "btree" = callPackage
@@ -45764,8 +42814,6 @@ self: {
        benchmarkHaskellDepends = [ base clock ghc-prim hashable ];
        description = "B-Tree on Unmanaged Heap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "btree-concurrent" = callPackage
@@ -45788,8 +42836,6 @@ self: {
        ];
        description = "A backend agnostic, concurrent BTree";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "btrfs" = callPackage
@@ -45841,8 +42887,6 @@ self: {
        ];
        description = "Automates most of your plain text accounting data entry in ledger format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buffer" = callPackage
@@ -45864,8 +42908,6 @@ self: {
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "Simple mutable low-level buffer for IO";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buffer-builder" = callPackage
@@ -45890,8 +42932,6 @@ self: {
        ];
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buffer-builder-aeson" = callPackage
@@ -45920,8 +42960,6 @@ self: {
        ];
        description = "Serialize Aeson values with Data.BufferBuilder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buffer-pipe" = callPackage
@@ -45964,8 +43002,6 @@ self: {
        doHaddock = false;
        description = "Assembles many Dockerfiles in one";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buffon" = callPackage
@@ -45982,8 +43018,6 @@ self: {
        ];
        description = "An implementation of Buffon machines";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buffon-machines" = callPackage
@@ -46033,8 +43067,6 @@ self: {
        ];
        description = "Bugsnag error reporter for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bugsnag-hs" = callPackage
@@ -46072,8 +43104,6 @@ self: {
        ];
        description = "A Haskell interface to the Bugzilla native REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bugzilla-redhat" = callPackage
@@ -46113,8 +43143,6 @@ self: {
        testHaskellDepends = [ base containers extra mtl transformers ];
        description = "Build systems a la carte";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buildable" = callPackage
@@ -46126,8 +43154,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers dlist text ];
        description = "Typeclass for builders of linear data structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buildbox" = callPackage
@@ -46144,8 +43170,6 @@ self: {
        ];
        description = "Rehackable components for writing buildbots and test harnesses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buildbox-tools" = callPackage
@@ -46159,8 +43183,6 @@ self: {
        executableHaskellDepends = [ base buildbox parseargs ];
        description = "Tools for working with buildbox benchmark result files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "builder" = callPackage
@@ -46212,8 +43234,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "bullet" = callPackage
@@ -46227,8 +43247,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A wrapper for the Bullet physics engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) bullet;};
 
   "bulletproofs" = callPackage
@@ -46290,8 +43308,6 @@ self: {
        ];
        description = "Reflex infused with bulma (css)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bumper" = callPackage
@@ -46311,8 +43327,6 @@ self: {
        ];
        description = "Automatically bump package versions, also transitively";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bunz" = callPackage
@@ -46328,8 +43342,6 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        description = "CLI tool to beautify JSON string";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "burnt-explorer" = callPackage
@@ -46347,8 +43359,6 @@ self: {
        ];
        description = "List OP_RETURN cryptocurrency transaction outputs";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "burrito" = callPackage
@@ -46397,8 +43407,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Burst detection algorithms";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bus-pirate" = callPackage
@@ -46415,8 +43423,6 @@ self: {
        ];
        description = "Haskell interface to the Bus Pirate binary interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buster" = callPackage
@@ -46433,8 +43439,6 @@ self: {
        ];
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buster-gtk" = callPackage
@@ -46451,8 +43455,6 @@ self: {
        ];
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buster-network" = callPackage
@@ -46469,8 +43471,6 @@ self: {
        ];
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bustle" = callPackage
@@ -46546,8 +43546,6 @@ self: {
        ];
        description = "Monad Transformer for Asyncronous Message Passing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "butterflies" = callPackage
@@ -46569,8 +43567,6 @@ self: {
        ];
        description = "butterfly tilings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bv" = callPackage
@@ -46640,8 +43636,6 @@ self: {
        ];
        description = "a bitvector datatype that is parameterized by the vector width";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "byline" = callPackage
@@ -46665,8 +43659,6 @@ self: {
        ];
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytable" = callPackage
@@ -46678,8 +43670,6 @@ self: {
        libraryHaskellDepends = [ base bytestring word24 ];
        description = "data from/to ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "byte-count-reader" = callPackage
@@ -46730,8 +43720,6 @@ self: {
        libraryHaskellDepends = [ base bytestring primitive text ];
        description = "Parsing of bytearray-based data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytebuild" = callPackage
@@ -46762,8 +43750,6 @@ self: {
        ];
        description = "Serialize to a small byte arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytedump" = callPackage
@@ -46804,8 +43790,6 @@ self: {
        ];
        description = "Universal hashing of bytes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytelog" = callPackage
@@ -46821,8 +43805,6 @@ self: {
        ];
        description = "Fast logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "byteorder" = callPackage
@@ -46892,8 +43874,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge primitive ];
        description = "Slicing managed and unmanaged memory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytesmith" = callPackage
@@ -46918,8 +43898,6 @@ self: {
        ];
        description = "Nonresumable byte parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring_0_11_0_0" = callPackage
@@ -46951,8 +43929,6 @@ self: {
        ];
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-builder" = callPackage
@@ -46981,8 +43957,6 @@ self: {
        ];
        description = "Variable-length integer encoding";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-class" = callPackage
@@ -46996,8 +43970,6 @@ self: {
        libraryHaskellDepends = [ base bytestring utf8-string ];
        description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-conversion" = callPackage
@@ -47033,8 +44005,6 @@ self: {
        libraryHaskellDepends = [ array base bytestring dlist ];
        description = "Parse CSV formatted data efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-delta" = callPackage
@@ -47115,8 +44085,6 @@ self: {
        ];
        description = "ByteString-backed Handles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-lexing" = callPackage
@@ -47169,8 +44137,6 @@ self: {
        ];
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-progress" = callPackage
@@ -47210,8 +44176,6 @@ self: {
        ];
        description = "fast ByteString to number converting library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-rematch" = callPackage
@@ -47225,8 +44189,6 @@ self: {
        doHaddock = false;
        description = "Rematch support for ByteString";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-short" = callPackage
@@ -47256,8 +44218,6 @@ self: {
        ];
        description = "Efficient conversion of values into readable byte strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-strict-builder" = callPackage
@@ -47292,8 +44252,6 @@ self: {
        libraryHaskellDepends = [ base bytestring pipes primitive ];
        description = "break bytestrings up into substrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-time" = callPackage
@@ -47310,8 +44268,6 @@ self: {
        ];
        description = "Library for Time parsing from ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-to-vector" = callPackage
@@ -47378,8 +44334,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion QuickCheck ];
        description = "Bytestrings with typenat lengths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestringparser" = callPackage
@@ -47391,8 +44345,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestringparser-temporary" = callPackage
@@ -47404,8 +44356,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestringreadp" = callPackage
@@ -47417,8 +44367,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A ReadP style parser library for ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "byteunits" = callPackage
@@ -47480,8 +44428,6 @@ self: {
        librarySystemDepends = [ bzip2 ];
        description = "Compression and decompression in the bzip2 format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) bzip2;};
 
   "bzlib-conduit" = callPackage
@@ -47519,8 +44465,6 @@ self: {
        libraryHaskellDepends = [ base language-c ];
        description = "A higher level DSL on top of language-c";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "c-io" = callPackage
@@ -47532,8 +44476,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "C IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "c-mosquitto" = callPackage
@@ -47554,8 +44496,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simpe mosquito MQTT binding able to work with the Amazons IoT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mosquitto;};
 
   "c-storable" = callPackage
@@ -47592,8 +44532,6 @@ self: {
        executableHaskellDepends = [ base c0parser ];
        description = "Simple C0 Syntax Check";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "c0parser" = callPackage
@@ -47605,8 +44543,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Simple C0 Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "c10k" = callPackage
@@ -47618,8 +44554,6 @@ self: {
        libraryHaskellDepends = [ base network unix ];
        description = "C10k server library using prefork";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "c14n" = callPackage
@@ -47655,8 +44589,6 @@ self: {
        ];
        description = "Translate C code into ATS";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "c2hs" = callPackage
@@ -47810,8 +44742,6 @@ self: {
        ];
        description = "Check how up-to-date your .cabal dependencies are.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-auto-expose" = callPackage
@@ -47823,8 +44753,6 @@ self: {
        libraryHaskellDepends = [ base Cabal directory extra filepath ];
        description = "Build time library that autodetects exposed modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-bounds" = callPackage
@@ -47876,8 +44804,6 @@ self: {
        ];
        description = "Bundling C/C++ projects in Cabal package made easy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-cache" = callPackage
@@ -47913,8 +44839,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "CI Assistant for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-cargs" = callPackage
@@ -47937,8 +44861,6 @@ self: {
        testHaskellDepends = [ base filepath tasty tasty-golden ];
        description = "A command line program for extracting compiler arguments from a cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-constraints" = callPackage
@@ -47952,8 +44874,6 @@ self: {
        executableHaskellDepends = [ base Cabal optparse-applicative ];
        description = "Repeatable builds for cabalized Haskell projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-db" = callPackage
@@ -47973,8 +44893,6 @@ self: {
        ];
        description = "query tools for the local cabal database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-debian" = callPackage
@@ -48014,8 +44932,6 @@ self: {
        ];
        description = "Compose a list of a project's transitive dependencies with their licenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-dev" = callPackage
@@ -48038,8 +44954,6 @@ self: {
        executableToolDepends = [ cabal-install ];
        description = "Manage sandboxed Haskell build environments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-dir" = callPackage
@@ -48053,8 +44967,6 @@ self: {
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "show dist dir of 'cabal copy/install'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-doctest" = callPackage
@@ -48214,8 +45126,6 @@ self: {
        libraryHaskellDepends = [ base Cabal ghc transformers ];
        description = "Conveniently configure GHC's dynamic flags for use with Cabal projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-ghci" = callPackage
@@ -48232,8 +45142,6 @@ self: {
        ];
        description = "Set up ghci with options taken from a .cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-graphdeps" = callPackage
@@ -48251,8 +45159,6 @@ self: {
        ];
        description = "Generate graphs of install-time Cabal dependencies";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-helper" = callPackage
@@ -48303,8 +45209,6 @@ self: {
        ];
        description = "Read information from cabal files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-install" = callPackage
@@ -48356,8 +45260,6 @@ self: {
        executableSystemDepends = [ zlib ];
        description = "The (bundled) command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "cabal-install-ghc72" = callPackage
@@ -48377,8 +45279,6 @@ self: {
        ];
        description = "Temporary version of cabal-install for ghc-7.2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-install-ghc74" = callPackage
@@ -48398,8 +45298,6 @@ self: {
        ];
        description = "Temporary version of cabal-install for ghc-7.4";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-install-parsers" = callPackage
@@ -48428,8 +45326,6 @@ self: {
        ];
        description = "Utilities to work with cabal-install files";
        license = "GPL-2.0-or-later AND BSD-3-Clause";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-lenses" = callPackage
@@ -48493,8 +45389,6 @@ self: {
        ];
        description = "build multiple packages at once";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-mon" = callPackage
@@ -48512,8 +45406,6 @@ self: {
        ];
        description = "A monitor for cabal builds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-nirvana" = callPackage
@@ -48531,8 +45423,6 @@ self: {
        ];
        description = "Avoid Cabal dependency hell by constraining to known good versions. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-plan" = callPackage
@@ -48573,8 +45463,6 @@ self: {
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "Show dependencies of program being built in current directory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-query" = callPackage
@@ -48591,8 +45479,6 @@ self: {
        ];
        description = "Helpers for quering .cabal files or hackageDB's 00-index.tar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-rpm" = callPackage
@@ -48640,8 +45526,6 @@ self: {
        executableHaskellDepends = [ base Cabal ];
        description = "The user interface for building and installing Cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-sign" = callPackage
@@ -48678,8 +45562,6 @@ self: {
        ];
        description = "Topologically sort cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-src" = callPackage
@@ -48701,8 +45583,6 @@ self: {
        ];
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-test" = callPackage
@@ -48718,8 +45598,6 @@ self: {
        ];
        description = "Automated test tool for cabal projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-test-bin" = callPackage
@@ -48802,8 +45680,6 @@ self: {
        executableHaskellDepends = [ base filepath HTTP network ];
        description = "Command-line tool for uploading packages to Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal2arch" = callPackage
@@ -48823,8 +45699,6 @@ self: {
        ];
        description = "Create Arch Linux packages from Cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal2doap" = callPackage
@@ -48840,8 +45714,6 @@ self: {
        ];
        description = "Cabal to Description-of-a-Project (DOAP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal2ebuild" = callPackage
@@ -48856,8 +45728,6 @@ self: {
        executableHaskellDepends = [ base curl directory ];
        description = "make gentoo's .ebuild file from .cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal2ghci" = callPackage
@@ -48876,8 +45746,6 @@ self: {
        ];
        description = "A tool to generate .ghci file from .cabal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal2nix" = callPackage
@@ -48955,8 +45823,6 @@ self: {
        ];
        description = "A simple tool to query cabal files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabalg" = callPackage
@@ -48991,8 +45857,6 @@ self: {
        ];
        description = "Generate pretty graphs of module trees from cabal files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabalish" = callPackage
@@ -49011,8 +45875,6 @@ self: {
        ];
        description = "Provides access to the cabal file data for shell scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabalmdvrpm" = callPackage
@@ -49027,8 +45889,6 @@ self: {
        executableHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
        description = "Create mandriva rpm from cabal package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabalrpmdeps" = callPackage
@@ -49043,8 +45903,6 @@ self: {
        executableHaskellDepends = [ base Cabal filepath haskell98 ];
        description = "Autogenerate rpm dependencies from cabal files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabalvchk" = callPackage
@@ -49058,8 +45916,6 @@ self: {
        executableHaskellDepends = [ base Cabal ];
        description = "Verify installed package version against user-specified constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabin" = callPackage
@@ -49078,8 +45934,6 @@ self: {
        ];
        description = "Cabal binary sandboxes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabocha" = callPackage
@@ -49092,8 +45946,6 @@ self: {
        librarySystemDepends = [ cabocha ];
        testHaskellDepends = [ base text-format ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cabocha = null;};
 
   "cache" = callPackage
@@ -49145,8 +45997,6 @@ self: {
        ];
        description = "Cache values to disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cached-io" = callPackage
@@ -49194,8 +46044,6 @@ self: {
        ];
        description = "Cache combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cachix" = callPackage
@@ -49295,8 +46143,6 @@ self: {
        ];
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "caerbannog" = callPackage
@@ -49335,8 +46181,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Prelude subsets—take only what you want!";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "caffegraph" = callPackage
@@ -49355,8 +46199,6 @@ self: {
          protocol-buffers-descriptor template-haskell temporary text
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cairo" = callPackage
@@ -49422,8 +46264,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Cairo Haskell binding (partial)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) cairo;};
 
   "cake" = callPackage
@@ -49446,8 +46286,6 @@ self: {
        ];
        description = "A build-system library and driver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cake3" = callPackage
@@ -49477,8 +46315,6 @@ self: {
        ];
        description = "Third cake the Makefile EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cakyrespa" = callPackage
@@ -49496,8 +46332,6 @@ self: {
        ];
        description = "run turtle like LOGO with lojban";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cal-layout" = callPackage
@@ -49512,8 +46346,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Calendar Layout Algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cal3d" = callPackage
@@ -49526,8 +46358,6 @@ self: {
        librarySystemDepends = [ cal3d ];
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cal3d = null;};
 
   "cal3d-examples" = callPackage
@@ -49542,8 +46372,6 @@ self: {
        executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
        description = "Examples for the Cal3d animation library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cal3d-opengl" = callPackage
@@ -49555,8 +46383,6 @@ self: {
        libraryHaskellDepends = [ base cal3d OpenGL ];
        description = "OpenGL rendering for the Cal3D animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "calamity" = callPackage
@@ -49586,8 +46412,6 @@ self: {
        ];
        description = "A library for writing discord bots in haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "calc" = callPackage
@@ -49601,8 +46425,6 @@ self: {
        executableHaskellDepends = [ array base harpy haskell98 mtl ];
        description = "A small compiler for arithmetic expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "calculator" = callPackage
@@ -49624,8 +46446,6 @@ self: {
        ];
        description = "A calculator repl, with variables, functions & Mathematica like dynamic plots";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "caldims" = callPackage
@@ -49646,8 +46466,6 @@ self: {
        ];
        description = "Calculation tool and library supporting units";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "caledon" = callPackage
@@ -49665,8 +46483,6 @@ self: {
        ];
        description = "a logic programming language based on the calculus of constructions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "calendar-recycling" = callPackage
@@ -49722,8 +46538,6 @@ self: {
        ];
        description = "The call game engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "call-alloy" = callPackage
@@ -49745,8 +46559,6 @@ self: {
        ];
        description = "A simple library to call Alloy given a specification";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "call-haskell-from-anything" = callPackage
@@ -49765,8 +46577,6 @@ self: {
        executableHaskellDepends = [ base bytestring data-msgpack mtl ];
        description = "Call Haskell functions from other languages via serialization and dynamic libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "call-stack" = callPackage
@@ -49816,8 +46626,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) flint;};
 
   "camh" = callPackage
@@ -49850,8 +46658,6 @@ self: {
        ];
        description = "Haskell implementation of the Campfire API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "can-i-haz" = callPackage
@@ -49875,8 +46681,6 @@ self: {
        libraryHaskellDepends = [ arithmoi array base containers random ];
        description = "Arithmetic for Psychedelically Large Numbers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canonical-filepath" = callPackage
@@ -49888,8 +46692,6 @@ self: {
        libraryHaskellDepends = [ base deepseq directory filepath ];
        description = "Abstract data type for canonical file paths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canonical-json" = callPackage
@@ -49913,8 +46715,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring containers criterion ];
        description = "Canonical JSON for signing and hashing JSON values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canteven-config" = callPackage
@@ -49945,8 +46745,6 @@ self: {
        ];
        description = "Utilities for HTTP programming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canteven-listen-http" = callPackage
@@ -49958,8 +46756,6 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        description = "data types to describe HTTP services";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canteven-log" = callPackage
@@ -49977,8 +46773,6 @@ self: {
        ];
        description = "A canteven way of setting up logging for your program";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canteven-parsedate" = callPackage
@@ -49994,8 +46788,6 @@ self: {
        ];
        description = "Date / time parsing utilities that try to guess the date / time format";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canteven-template" = callPackage
@@ -50034,8 +46826,6 @@ self: {
        ];
        description = "Application for analysis of java source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cantor-pairing" = callPackage
@@ -50074,8 +46864,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "CAO Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cap" = callPackage
@@ -50090,8 +46878,6 @@ self: {
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "Interprets and debug the cap language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "capability" = callPackage
@@ -50115,8 +46901,6 @@ self: {
        ];
        description = "Extensional capabilities and deriving combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "capataz" = callPackage
@@ -50138,8 +46922,6 @@ self: {
        ];
        description = "OTP-like supervision trees in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "capnp" = callPackage
@@ -50179,8 +46961,6 @@ self: {
        ];
        description = "Cap'n Proto for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "capped-list" = callPackage
@@ -50192,8 +46972,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy sequences, with a user-defined termination value";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "capri" = callPackage
@@ -50209,8 +46987,6 @@ self: {
        ];
        description = "A simple wrapper over cabal-install to operate in project-private mode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "car-pool" = callPackage
@@ -50233,8 +47009,6 @@ self: {
        ];
        description = "Simple web-server for organizing car-pooling for an event";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "caramia" = callPackage
@@ -50259,8 +47033,6 @@ self: {
        ];
        description = "High-level OpenGL bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "carbonara" = callPackage
@@ -50275,8 +47047,6 @@ self: {
        ];
        description = "some spaghetti code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "carboncopy" = callPackage
@@ -50294,8 +47064,6 @@ self: {
        ];
        description = "Drop emails from threads being watched into special CC folder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cardano-coin-selection" = callPackage
@@ -50373,8 +47141,6 @@ self: {
        ];
        description = "A presentation tool written with Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "carray" = callPackage
@@ -50410,8 +47176,6 @@ self: {
        ];
        description = "Carte: A commandline pastebin server";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cartel" = callPackage
@@ -50440,8 +47204,6 @@ self: {
        ];
        description = "Specify Cabal files in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cas-hashable" = callPackage
@@ -50523,8 +47285,6 @@ self: {
        ];
        description = "CASA Abbreviations and Acronyms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "casa-client" = callPackage
@@ -50605,8 +47365,6 @@ self: {
        ];
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {casadi = null;};
 
   "casadi-bindings-control" = callPackage
@@ -50623,8 +47381,6 @@ self: {
        libraryPkgconfigDepends = [ casadi_control ];
        description = "low level bindings to casadi-control";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {casadi_control = null;};
 
   "casadi-bindings-core" = callPackage
@@ -50641,8 +47397,6 @@ self: {
        librarySystemDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {casadi = null;};
 
   "casadi-bindings-internal" = callPackage
@@ -50655,8 +47409,6 @@ self: {
        librarySystemDepends = [ casadi ];
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {casadi = null;};
 
   "casadi-bindings-ipopt-interface" = callPackage
@@ -50673,8 +47425,6 @@ self: {
        libraryPkgconfigDepends = [ casadi_ipopt_interface ];
        description = "low level bindings to casadi-ipopt_interface";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {casadi_ipopt_interface = null;};
 
   "casadi-bindings-snopt-interface" = callPackage
@@ -50691,8 +47441,6 @@ self: {
        libraryPkgconfigDepends = [ casadi_snopt_interface ];
        description = "low level bindings to casadi-snopt_interface";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {casadi_snopt_interface = null;};
 
   "cascading" = callPackage
@@ -50709,8 +47457,6 @@ self: {
        ];
        description = "DSL for HTML CSS (Cascading Style Sheets)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "case-conversion" = callPackage
@@ -50805,8 +47551,6 @@ self: {
        benchmarkHaskellDepends = [ criterion mwc-random rerebase ];
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cash" = callPackage
@@ -50823,8 +47567,6 @@ self: {
        ];
        description = "the Computer Algebra SHell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "casing" = callPackage
@@ -51031,8 +47773,6 @@ self: {
        ];
        description = "Haskell client for Cassandra's CQL protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cassandra-thrift" = callPackage
@@ -51092,8 +47832,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cassava-embed" = callPackage
@@ -51168,8 +47906,6 @@ self: {
        ];
        description = "Auto-generation of records data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cassava-streams" = callPackage
@@ -51202,8 +47938,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A combinator library for simultaneously defining parsers and pretty printers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cassy" = callPackage
@@ -51231,8 +47965,6 @@ self: {
        ];
        description = "A high level driver for the Cassandra datastore";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cast" = callPackage
@@ -51304,8 +48036,6 @@ self: {
        ];
        description = "A tool to manage shared cabal-install sandboxes";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "casui" = callPackage
@@ -51320,8 +48050,6 @@ self: {
        executableHaskellDepends = [ base gtk haskell98 mtl parsec ];
        description = "Equation Manipulator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "catamorphism" = callPackage
@@ -51334,8 +48062,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exposes a Template Haskell function for generating catamorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "catch-fd" = callPackage
@@ -51347,8 +48073,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "MonadThrow and MonadCatch, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "categorical-algebra" = callPackage
@@ -51360,8 +48084,6 @@ self: {
        libraryHaskellDepends = [ base newtype pointless-haskell void ];
        description = "Categorical Monoids and Semirings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "categories" = callPackage
@@ -51411,8 +48133,6 @@ self: {
        doHaddock = false;
        description = "A meta-package documenting various packages inspired by category theory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "category-printf" = callPackage
@@ -51437,8 +48157,6 @@ self: {
        libraryHaskellDepends = [ base categories ];
        description = "Traced monoidal categories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "catnplus" = callPackage
@@ -51458,8 +48176,6 @@ self: {
        ];
        description = "Simple tool to display text files with line numbers and paging";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cautious" = callPackage
@@ -51489,8 +48205,6 @@ self: {
        ];
        description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cautious-gen" = callPackage
@@ -51507,8 +48221,6 @@ self: {
          hspec QuickCheck
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cayene-lpp" = callPackage
@@ -51545,8 +48257,6 @@ self: {
        testHaskellDepends = [ aeson base hspec unordered-containers ];
        description = "A Haskell client for the Cayley graph database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cayley-dickson" = callPackage
@@ -51683,8 +48393,6 @@ self: {
        ];
        description = "Bindings for the CCI networking library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cci = null;};
 
   "ccnx" = callPackage
@@ -51696,8 +48404,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A Haskell implementation of the CCNx network protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cctools-workqueue" = callPackage
@@ -51714,8 +48420,6 @@ self: {
        librarySystemDepends = [ dttools ];
        description = "High-level interface to CCTools' WorkQueue library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {dttools = null;};
 
   "cdeps" = callPackage
@@ -51754,8 +48458,6 @@ self: {
        ];
        description = "Convenient Chinese phrase & character lookup";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cef" = callPackage
@@ -51770,8 +48472,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "CEF log format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cef3-raw" = callPackage
@@ -51785,8 +48485,6 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        description = "Raw CEF3 bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cef = null; inherit (pkgs) gtk2;};
 
   "cef3-simple" = callPackage
@@ -51798,8 +48496,6 @@ self: {
        libraryHaskellDepends = [ base cef3-raw ];
        description = "Simple wrapper around cef3-raw";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ceilometer-common" = callPackage
@@ -51823,8 +48519,6 @@ self: {
        ];
        description = "Common Haskell types and encoding for OpenStack Ceilometer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cellrenderer-cairo" = callPackage
@@ -51838,8 +48532,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Cairo-based CellRenderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk2;};
 
   "celtchar" = callPackage
@@ -51864,8 +48556,6 @@ self: {
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "A tool to build a novel";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cerberus" = callPackage
@@ -51893,8 +48583,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Protect and control API access with cerberus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal" = callPackage
@@ -51956,8 +48644,6 @@ self: {
        libraryHaskellDepends = [ base cereal ghc-prim ];
        description = "Automatic deriving of Serialize using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-enumerator" = callPackage
@@ -51969,8 +48655,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal enumerator ];
        description = "Deserialize things with cereal and enumerator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-ieee754" = callPackage
@@ -51982,8 +48666,6 @@ self: {
        libraryHaskellDepends = [ array base cereal ];
        description = "Floating point support for the 'cereal' serialization library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-io-streams" = callPackage
@@ -52006,8 +48688,6 @@ self: {
        ];
        description = "io-streams support for the cereal binary serialization library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-plus" = callPackage
@@ -52031,8 +48711,6 @@ self: {
        ];
        description = "An extended serialization library on top of \"cereal\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-streams" = callPackage
@@ -52055,8 +48733,6 @@ self: {
        ];
        description = "Use cereal to encode/decode io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-text" = callPackage
@@ -52080,8 +48756,6 @@ self: {
        testHaskellDepends = [ base cereal hspec QuickCheck time ];
        description = "Serialize instances for types from `time` package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-unordered-containers" = callPackage
@@ -52139,8 +48813,6 @@ self: {
        ];
        description = "Certificates and Key Reader/Writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cf" = callPackage
@@ -52158,8 +48830,6 @@ self: {
        ];
        description = "Exact real arithmetic using continued fractions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cfenv" = callPackage
@@ -52176,8 +48846,6 @@ self: {
        ];
        description = "A library getting the environment when running on Cloud Foundry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cfipu" = callPackage
@@ -52195,8 +48863,6 @@ self: {
        ];
        description = "cfipu processor for toy brainfuck-like language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cflp" = callPackage
@@ -52215,8 +48881,6 @@ self: {
        ];
        description = "Constraint Functional-Logic Programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cfopu" = callPackage
@@ -52234,8 +48898,6 @@ self: {
        ];
        description = "cfopu processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cg" = callPackage
@@ -52256,8 +48918,6 @@ self: {
        ];
        description = "Parser for categorial grammars";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cgen" = callPackage
@@ -52277,8 +48937,6 @@ self: {
        doHaddock = false;
        description = "generates Haskell bindings and C wrappers for C++ libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cgi" = callPackage
@@ -52321,8 +48979,6 @@ self: {
        libraryHaskellDepends = [ base cgi containers mtl random ];
        description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cgrep" = callPackage
@@ -52348,8 +49004,6 @@ self: {
        ];
        description = "Command line tool";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chain-codes" = callPackage
@@ -52388,8 +49042,6 @@ self: {
        ];
        description = "Mining Client for Kadena Chainweb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chalk" = callPackage
@@ -52419,8 +49071,6 @@ self: {
        ];
        description = "Combinators for building and processing 2D images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chalkboard-viewer" = callPackage
@@ -52432,8 +49082,6 @@ self: {
        libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ];
        description = "OpenGL based viewer for chalkboard rendered images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chalmers-lava2000" = callPackage
@@ -52579,8 +49227,6 @@ self: {
        ];
        description = "Rapid prototyping websites with Snap and Heist";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "charset" = callPackage
@@ -52639,8 +49285,6 @@ self: {
        ];
        description = "Command-line utility to draw charts from input data easily";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chart-histogram" = callPackage
@@ -52652,8 +49296,6 @@ self: {
        libraryHaskellDepends = [ base Chart ];
        description = "Easily render histograms with Chart";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chart-svg" = callPackage
@@ -52679,8 +49321,6 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "Charts in SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chart-svg-various" = callPackage
@@ -52704,8 +49344,6 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chart-unit" = callPackage
@@ -52730,8 +49368,6 @@ self: {
        ];
        description = "Native haskell charts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chaselev-deque" = callPackage
@@ -52788,8 +49424,6 @@ self: {
        ];
        description = "A library of simple NLP algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chatty" = callPackage
@@ -52822,8 +49456,6 @@ self: {
        libraryHaskellDepends = [ base chatty transformers ];
        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;
-       broken = true;
      }) {};
 
   "chatty-utils" = callPackage
@@ -52865,8 +49497,6 @@ self: {
        ];
        description = "The ChatWork API in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cheapskate" = callPackage
@@ -52944,8 +49574,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "check-email" = callPackage
@@ -52977,8 +49605,6 @@ self: {
        ];
        description = "Check whether module and package imports conform to the PVP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "checked" = callPackage
@@ -52992,8 +49618,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bounds-checking integer types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "checkers" = callPackage
@@ -53037,8 +49661,6 @@ self: {
        ];
        description = "Generate checklists relevant to a given patch";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "checksum" = callPackage
@@ -53090,8 +49712,6 @@ self: {
        libraryHaskellDepends = [ base chell QuickCheck random ];
        description = "QuickCheck support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chessIO" = callPackage
@@ -53126,8 +49746,6 @@ self: {
        ];
        description = "Basic chess library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chesshs" = callPackage
@@ -53158,8 +49776,6 @@ self: {
        ];
        description = "Query interface for Chevalier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chiasma" = callPackage
@@ -53184,8 +49800,6 @@ self: {
        ];
        description = "tmux api";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chimera" = callPackage
@@ -53223,8 +49837,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for Chipmunk2D physics engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chitauri" = callPackage
@@ -53244,8 +49856,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Helper for the Major System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "choice" = callPackage
@@ -53268,8 +49878,6 @@ self: {
        libraryHaskellDepends = [ base MonadRandom ];
        description = "Choose random elements from a stream";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "choose-exe" = callPackage
@@ -53286,8 +49894,6 @@ self: {
        ];
        description = "Command-line program to choose random element from a stream";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chorale" = callPackage
@@ -53305,8 +49911,6 @@ self: {
        ];
        description = "A module containing basic functions that the prelude does not offer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chorale-geo" = callPackage
@@ -53324,8 +49928,6 @@ self: {
        ];
        description = "A module containing basic geo functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chp" = callPackage
@@ -53341,8 +49943,6 @@ self: {
        ];
        description = "An implementation of concurrency ideas from Communicating Sequential Processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chp-mtl" = callPackage
@@ -53354,8 +49954,6 @@ self: {
        libraryHaskellDepends = [ base chp chp-plus mtl ];
        description = "MTL class instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chp-plus" = callPackage
@@ -53372,8 +49970,6 @@ self: {
        ];
        description = "A set of high-level concurrency utilities built on Communicating Haskell Processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chp-spec" = callPackage
@@ -53389,8 +49985,6 @@ self: {
        ];
        description = "A mirror implementation of chp that generates a specification of the program";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chp-transformers" = callPackage
@@ -53402,8 +49996,6 @@ self: {
        libraryHaskellDepends = [ base chp chp-plus transformers ];
        description = "Transformers instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chr-core" = callPackage
@@ -53420,8 +50012,6 @@ self: {
        ];
        description = "Constraint Handling Rules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chr-data" = callPackage
@@ -53459,8 +50049,6 @@ self: {
        executableHaskellDepends = [ base chr-data ];
        description = "AST + surface language around chr";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chr-parse" = callPackage
@@ -53474,8 +50062,6 @@ self: {
        libraryHaskellDepends = [ base containers uulib ];
        description = "Parsing for chr library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chr-pretty" = callPackage
@@ -53524,8 +50110,6 @@ self: {
        ];
        description = "neovim package manager";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chronograph" = callPackage
@@ -53539,8 +50123,6 @@ self: {
        ];
        description = "measure timings of data evaluation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chronologique" = callPackage
@@ -53652,8 +50234,6 @@ self: {
        ];
        description = "FFI for Chu2 Agda Web Server Interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chuchu" = callPackage
@@ -53698,8 +50278,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec template-haskell ];
        description = "Simple template library with static safety";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chunky" = callPackage
@@ -53715,8 +50293,6 @@ self: {
        testHaskellDepends = [ base binary bytestring HUnit text ];
        description = "Human-readable storage of text/binary objects";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "church" = callPackage
@@ -53728,8 +50304,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "church-list" = callPackage
@@ -53753,8 +50327,6 @@ self: {
        libraryHaskellDepends = [ base deepseq semigroupoids semigroups ];
        description = "Church encoded Maybe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "church-pair" = callPackage
@@ -53808,8 +50380,6 @@ self: {
        ];
        description = "Cielo API v3 Bindings for Haskell";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cil" = callPackage
@@ -53821,8 +50391,6 @@ self: {
        libraryHaskellDepends = [ base bytestring language-c ];
        description = "An interface to CIL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cimple" = callPackage
@@ -53843,8 +50411,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Simple C-like programming language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cinvoke" = callPackage
@@ -53857,8 +50423,6 @@ self: {
        librarySystemDepends = [ cinvoke ];
        description = "A binding to cinvoke";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cinvoke = null;};
 
   "cio" = callPackage
@@ -53870,8 +50434,6 @@ self: {
        libraryHaskellDepends = [ base monad-stm mtl parallel-io stm ];
        description = "A monad for concurrent IO on a thread pool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cipher-aes" = callPackage
@@ -53945,8 +50507,6 @@ self: {
        ];
        description = "Blowfish cipher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cipher-camellia" = callPackage
@@ -54047,8 +50607,6 @@ self: {
        executableHaskellDepends = [ array base bytestring parseargs ];
        description = "Implementation of CipherSaber2 RC4 cryptography";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "circ" = callPackage
@@ -54090,8 +50648,6 @@ self: {
        ];
        description = "The CircleCI REST API for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "circuit-breaker" = callPackage
@@ -54201,8 +50757,6 @@ self: {
        ];
        description = "convert document IDs such as DOI, ISBN, arXiv ID to bibliographic reference";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "citeproc" = callPackage
@@ -54248,8 +50802,6 @@ self: {
        ];
        description = "A Citation Style Language implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "citeproc-hs-pandoc-filter" = callPackage
@@ -54269,8 +50821,6 @@ self: {
        ];
        description = "A Pandoc filter for processing bibliographic references with citeproc-hs";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cityhash" = callPackage
@@ -54310,8 +50860,6 @@ self: {
        ];
        description = "A new Haskeleton package";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cjk" = callPackage
@@ -54329,8 +50877,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Data about Chinese, Japanese and Korean characters and languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cl3" = callPackage
@@ -54384,8 +50930,6 @@ self: {
        ];
        description = "Simple CLI RPN calculator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clafer" = callPackage
@@ -54420,8 +50964,6 @@ self: {
        ];
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "claferIG" = callPackage
@@ -54454,8 +50996,6 @@ self: {
        ];
        description = "claferIG is an interactive tool that generates instances of Clafer models";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "claferwiki" = callPackage
@@ -54475,8 +51015,6 @@ self: {
        ];
        description = "A wiki-based IDE for literate modeling with Clafer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clang-compilation-database" = callPackage
@@ -54489,8 +51027,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring ];
        description = "JSON Compilation Database Format encoding and decoding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clang-pure" = callPackage
@@ -54513,8 +51049,6 @@ self: {
        testHaskellDepends = [ base bytestring lens ];
        description = "Pure C++ code analysis with libclang";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (self.llvmPackages) clang;};
 
   "clanki" = callPackage
@@ -54530,8 +51064,6 @@ self: {
        ];
        description = "Command-line spaced-repetition software";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clarifai" = callPackage
@@ -54549,8 +51081,6 @@ self: {
        ];
        description = "API Client for the Clarifai API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clash" = callPackage
@@ -54570,8 +51100,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware (CLaSH)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clash-ghc" = callPackage
@@ -54652,8 +51180,6 @@ self: {
          base clash-prelude deepseq ghc-typelits-knownnat QuickCheck
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clash-prelude" = callPackage
@@ -54722,8 +51248,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clash-verilog" = callPackage
@@ -54741,8 +51265,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - Verilog backend";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clash-vhdl" = callPackage
@@ -54760,8 +51282,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - VHDL backend";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "classify" = callPackage
@@ -54804,8 +51324,6 @@ self: {
        ];
        description = "Classify sounds produced by Xenopus laevis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "classy-influxdb-simple" = callPackage
@@ -54822,8 +51340,6 @@ self: {
        ];
        description = "Super simple InfluxDB package in Classy-MTL style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "classy-miso" = callPackage
@@ -54844,8 +51360,6 @@ self: {
        testHaskellDepends = [ base miso rfc ];
        description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "classy-parallel" = callPackage
@@ -54861,8 +51375,6 @@ self: {
        ];
        description = "Fork of the monad-parallel package using monad-control";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "classy-prelude" = callPackage
@@ -54940,8 +51452,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion parallel uniplate ];
        description = "Fuseable type-class based generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clay" = callPackage
@@ -54989,8 +51499,6 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "clckwrks-cli" = callPackage
@@ -55013,8 +51521,6 @@ self: {
        ];
        description = "a command-line interface for adminstrating some aspects of clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-dot-com" = callPackage
@@ -55036,8 +51542,6 @@ self: {
        executableToolDepends = [ hsx2hs ];
        description = "clckwrks.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-plugin-bugs" = callPackage
@@ -55063,8 +51567,6 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "bug tracking plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-plugin-ircbot" = callPackage
@@ -55088,8 +51590,6 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-plugin-mailinglist" = callPackage
@@ -55114,8 +51614,6 @@ self: {
        ];
        description = "mailing list plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-plugin-media" = callPackage
@@ -55138,8 +51636,6 @@ self: {
        ];
        description = "media plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-plugin-page" = callPackage
@@ -55165,8 +51661,6 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-plugin-redirect" = callPackage
@@ -55191,8 +51685,6 @@ self: {
        ];
        description = "support redirects for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-theme-bootstrap" = callPackage
@@ -55210,8 +51702,6 @@ self: {
        ];
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-theme-clckwrks" = callPackage
@@ -55229,8 +51719,6 @@ self: {
        ];
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-theme-geo-bootstrap" = callPackage
@@ -55243,8 +51731,6 @@ self: {
        libraryHaskellDepends = [ base clckwrks hsp text ];
        description = "geo bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cld2" = callPackage
@@ -55284,8 +51770,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Open unions without need for Typeable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cless" = callPackage
@@ -55304,8 +51788,6 @@ self: {
        ];
        description = "Colorized LESS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clevercss" = callPackage
@@ -55320,8 +51802,6 @@ self: {
        executableHaskellDepends = [ parsec ];
        description = "A CSS preprocessor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clexer" = callPackage
@@ -55333,8 +51813,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec ];
        description = "Lexes C++ code into simple tokens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cli" = callPackage
@@ -55367,8 +51845,6 @@ self: {
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cli-extras" = callPackage
@@ -55387,8 +51863,6 @@ self: {
        ];
        description = "Miscellaneous utilities for building and working with command line interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cli-git" = callPackage
@@ -55405,8 +51879,6 @@ self: {
        ];
        description = "Bindings to the git command-line interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cli-nix" = callPackage
@@ -55423,8 +51895,6 @@ self: {
        ];
        description = "Bindings to the nix command-line interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cli-setup" = callPackage
@@ -55497,8 +51967,6 @@ self: {
        benchmarkHaskellDepends = [ base time ];
        description = "A Clifford algebra number type for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clifford" = callPackage
@@ -55531,8 +51999,6 @@ self: {
        ];
        description = "A Clifford algebra library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clifm" = callPackage
@@ -55552,8 +52018,6 @@ self: {
        ];
        description = "Command Line Interface File Manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "climb" = callPackage
@@ -55595,8 +52059,6 @@ self: {
        librarySystemDepends = [ clingo ];
        description = "Haskell bindings to the Clingo ASP solver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) clingo;};
 
   "clippard" = callPackage
@@ -55608,8 +52070,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        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;
-       broken = true;
      }) {};
 
   "clipper" = callPackage
@@ -55621,8 +52081,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clippings" = callPackage
@@ -55648,8 +52106,6 @@ self: {
        ];
        description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clisparkline" = callPackage
@@ -55662,8 +52118,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Tiny library to pretty print sparklines onto the CLI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clist" = callPackage
@@ -55698,8 +52152,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Post tweets from stdin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cloben" = callPackage
@@ -55758,8 +52210,6 @@ self: {
        libraryPkgconfigDepends = [ QtCore ];
        description = "timer functionality to clock IO commands";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {QtCore = null;};
 
   "clogparse" = callPackage
@@ -55776,8 +52226,6 @@ self: {
        ];
        description = "Parse IRC logs such as the #haskell logs on tunes.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clone-all" = callPackage
@@ -55797,8 +52245,6 @@ self: {
        ];
        description = "Clone all github repositories from a given user";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "closed" = callPackage
@@ -55829,8 +52275,6 @@ self: {
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "Depth- and breadth-first set closures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cloud-haskell" = callPackage
@@ -55854,8 +52298,6 @@ self: {
        doHaddock = false;
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cloud-seeder" = callPackage
@@ -55884,8 +52326,6 @@ self: {
        ];
        description = "A tool for interacting with AWS CloudFormation";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cloudfront-signer" = callPackage
@@ -55902,8 +52342,6 @@ self: {
        ];
        description = "CloudFront URL signer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cloudi" = callPackage
@@ -56004,8 +52442,6 @@ self: {
        ];
        description = "Quasiquoters for inline C# and F#";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clr-marshal" = callPackage
@@ -56074,8 +52510,6 @@ self: {
        ];
        description = "C to Lua data wrapper generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clumpiness" = callPackage
@@ -56098,8 +52532,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "simple alternative to type classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clustering" = callPackage
@@ -56125,8 +52557,6 @@ self: {
        ];
        description = "High performance clustering algorithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clustertools" = callPackage
@@ -56145,8 +52575,6 @@ self: {
        ];
        description = "Tools for manipulating sequence clusters";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clutterhs" = callPackage
@@ -56164,8 +52592,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) clutter; inherit (pkgs) pango;};
 
   "cmaes" = callPackage
@@ -56251,8 +52677,6 @@ self: {
        ];
        description = "Code highlighting for cmark";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmark-lucid" = callPackage
@@ -56277,8 +52701,6 @@ self: {
        libraryHaskellDepends = [ base cmark ];
        description = "Pattern synonyms for cmark";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmark-sections" = callPackage
@@ -56297,8 +52719,6 @@ self: {
        ];
        description = "Represent cmark-parsed Markdown as a tree of sections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmath" = callPackage
@@ -56310,8 +52730,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A binding to the standard C math library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmathml3" = callPackage
@@ -56331,8 +52749,6 @@ self: {
        executableHaskellDepends = [ base Cabal filepath ];
        description = "Data model, parser, serialiser and transformations for Content MathML 3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmd-item" = callPackage
@@ -56349,8 +52765,6 @@ self: {
        ];
        description = "Library to compose and reuse command line fragments";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmdargs" = callPackage
@@ -56388,8 +52802,6 @@ self: {
        ];
        description = "Helper to enter cmdargs command lines using a web browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmdlib" = callPackage
@@ -56403,8 +52815,6 @@ self: {
        libraryHaskellDepends = [ base mtl split syb transformers ];
        description = "a library for command line parsing & online help";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmdtheline" = callPackage
@@ -56426,8 +52836,6 @@ self: {
        ];
        description = "Declarative command-line option parsing and documentation library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmf" = callPackage
@@ -56462,8 +52870,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "A library for C-like programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmph" = callPackage
@@ -56482,8 +52888,6 @@ self: {
        testSystemDepends = [ cmph ];
        description = "low level interface to CMPH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cmph = null;};
 
   "cmptype" = callPackage
@@ -56498,8 +52902,6 @@ self: {
        ];
        description = "Compare types of any kinds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmt" = callPackage
@@ -56526,8 +52928,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Write consistent git commit messages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmu" = callPackage
@@ -56570,8 +52970,6 @@ self: {
        ];
        description = "Detailed visualization of CMs, HMMs and their comparisions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cnc-spec-compiler" = callPackage
@@ -56593,8 +52991,6 @@ self: {
        ];
        description = "Compiler/Translator for CnC Specification Files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cndict" = callPackage
@@ -56709,8 +53105,6 @@ self: {
        ];
        description = "A Polysemy logging effect for high quality (unstructured) logs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "co-log-sys" = callPackage
@@ -56731,8 +53125,6 @@ self: {
        ];
        description = "Syslog implementation on top of 'co-log-core'";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coalpit" = callPackage
@@ -56751,8 +53143,6 @@ self: {
        ];
        description = "Command-line options and DSV parsing and printing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cobot" = callPackage
@@ -56801,8 +53191,6 @@ self: {
        ];
        description = "Biological data file formats and IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cobot-tools" = callPackage
@@ -56826,8 +53214,6 @@ self: {
        ];
        description = "Biological data file formats and IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {RNA = null;};
 
   "code-builder" = callPackage
@@ -56839,8 +53225,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple system for generating code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "code-page" = callPackage
@@ -56875,8 +53259,6 @@ self: {
        ];
        description = "Simple bidirectional serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codec-beam" = callPackage
@@ -56891,8 +53273,6 @@ self: {
        testHaskellDepends = [ base bytestring filepath process text ];
        description = "Erlang VM byte code assembler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codec-libevent" = callPackage
@@ -56915,8 +53295,6 @@ self: {
        ];
        description = "Cross-platform structure serialisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codec-mbox" = callPackage
@@ -56951,8 +53329,6 @@ self: {
        ];
        description = "A library for manipulating RPM files";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codecov-haskell" = callPackage
@@ -56976,8 +53352,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Codecov.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codemonitor" = callPackage
@@ -56996,8 +53370,6 @@ self: {
        ];
        description = "Tool that automatically runs arbitrary commands when files change on disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codepad" = callPackage
@@ -57011,8 +53383,6 @@ self: {
        libraryHaskellDepends = [ base curl mtl network tagsoup ];
        description = "Submit and retrieve paste output from CodePad.org.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codeworld-api" = callPackage
@@ -57040,8 +53410,6 @@ self: {
        ];
        description = "Graphics library for CodeWorld";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codex" = callPackage
@@ -57067,8 +53435,6 @@ self: {
        ];
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codo-notation" = callPackage
@@ -57084,8 +53450,6 @@ self: {
        ];
        description = "A notation for comonads, analogous to the do-notation for monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coerce-role" = callPackage
@@ -57246,8 +53610,6 @@ self: {
        ];
        description = "Simple account manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coinbase-exchange" = callPackage
@@ -57286,8 +53648,6 @@ self: {
        ];
        description = "Connector library for the coinbase exchange";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coinbase-pro" = callPackage
@@ -57320,8 +53680,6 @@ self: {
        ];
        description = "Client for Coinbase Pro";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coincident-root-loci" = callPackage
@@ -57340,8 +53698,6 @@ self: {
        ];
        description = "Equivariant CSM classes of coincident root loci";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colada" = callPackage
@@ -57365,8 +53721,6 @@ self: {
        ];
        description = "Colada implements incremental word class class induction using online LDA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colchis" = callPackage
@@ -57384,8 +53738,6 @@ self: {
        ];
        description = "Rudimentary JSON-RPC 2.0 client over raw TCP.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cold-widow" = callPackage
@@ -57418,8 +53770,6 @@ self: {
        ];
        description = "Generate animated 3d objects in COLLADA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collada-types" = callPackage
@@ -57453,8 +53803,6 @@ self: {
        ];
        description = "Collapse the duplication output into clones and return their frequencies";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collapse-util" = callPackage
@@ -57468,8 +53816,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "utility for collapsing adjacent writes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collection-json" = callPackage
@@ -57492,8 +53838,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Collection+JSON—Hypermedia Type Tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collections" = callPackage
@@ -57507,8 +53851,6 @@ self: {
        ];
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collections-api" = callPackage
@@ -57522,8 +53864,6 @@ self: {
        libraryHaskellDepends = [ array base QuickCheck ];
        description = "API for collection data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collections-base-instances" = callPackage
@@ -57539,8 +53879,6 @@ self: {
        ];
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colock" = callPackage
@@ -57573,8 +53911,6 @@ self: {
        ];
        description = "Generic types and functions for columnar encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "color-counter" = callPackage
@@ -57599,8 +53935,6 @@ self: {
        ];
        description = "Count colors in images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colorful-monoids" = callPackage
@@ -57649,8 +53983,6 @@ self: {
        ];
        description = "Colorless | The Programmatic IDL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colorless-http-client" = callPackage
@@ -57667,8 +53999,6 @@ self: {
        ];
        description = "Http Client addon for Colorless";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colorless-scotty" = callPackage
@@ -57682,8 +54012,6 @@ self: {
        ];
        description = "Scotty server add-on for Colorless";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colors" = callPackage
@@ -57740,8 +54068,6 @@ self: {
        libraryHaskellDepends = [ accelerate base ];
        description = "Working with colours in Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colour-space" = callPackage
@@ -57759,8 +54085,6 @@ self: {
        ];
        description = "Instances of the manifold-classes for colour types";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colourista" = callPackage
@@ -57788,8 +54112,6 @@ self: {
        ];
        description = "A jazzy, minimal web framework for Haskell, inspired by Sinatra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "columbia" = callPackage
@@ -57810,8 +54132,6 @@ self: {
        doHaddock = false;
        description = "Enhanced serialization using seeking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "columnar" = callPackage
@@ -57829,8 +54149,6 @@ self: {
        ];
        description = "A CSV toolkit based on cassava and enum-text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "com" = callPackage
@@ -57842,8 +54160,6 @@ self: {
        doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "comark" = callPackage
@@ -57922,8 +54238,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Definitions of AST that represents a Commonmark (markdown) document";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "combinat" = callPackage
@@ -57947,8 +54261,6 @@ self: {
        ];
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "combinat-compat" = callPackage
@@ -57984,8 +54296,6 @@ self: {
        ];
        description = "Graphical representations for various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "combinator-interactive" = callPackage
@@ -58007,8 +54317,6 @@ self: {
        ];
        description = "SKI Combinator interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "combinatorial" = callPackage
@@ -58042,8 +54350,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "combinatorics" = callPackage
@@ -58070,8 +54376,6 @@ self: {
        ];
        description = "Various buffer implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "comfort-array" = callPackage
@@ -58128,8 +54432,6 @@ self: {
        ];
        description = "A format for describing comics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "comma" = callPackage
@@ -58185,8 +54487,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "pattern matching against string based commands";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "commander-cli" = callPackage
@@ -58238,8 +54538,6 @@ self: {
        ];
        description = "Library for working with commoditized amounts and price histories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "commonmark" = callPackage
@@ -58336,8 +54634,6 @@ self: {
        ];
        description = "Provide communications security using symmetric ephemeral keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "commsec-keyexchange" = callPackage
@@ -58356,8 +54652,6 @@ self: {
        ];
        description = "Key agreement for commsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "commutative" = callPackage
@@ -58485,8 +54779,6 @@ self: {
        ];
        description = "Compact Data.Map implementation using Data.Binary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compact-mutable" = callPackage
@@ -58506,8 +54798,6 @@ self: {
        ];
        description = "Mutable arrays living on the compact heap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compact-mutable-vector" = callPackage
@@ -58521,8 +54811,6 @@ self: {
        testHaskellDepends = [ base compact hspec ];
        description = "Mutable vector with different GC characteristics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compact-sequences" = callPackage
@@ -58553,8 +54841,6 @@ self: {
        ];
        description = "Socket functions for compact normal form";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compact-string" = callPackage
@@ -58568,8 +54854,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compact-string-fix" = callPackage
@@ -58583,8 +54867,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compact-word-vectors" = callPackage
@@ -58612,8 +54894,6 @@ self: {
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A typeclass for structures which can be catMaybed, filtered, and partitioned";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compactmap" = callPackage
@@ -58664,8 +54944,6 @@ self: {
        ];
        description = "Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compdata-automata" = callPackage
@@ -58681,8 +54959,6 @@ self: {
        ];
        description = "Tree automata on Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compdata-dags" = callPackage
@@ -58704,8 +54980,6 @@ self: {
        ];
        description = "Compositional Data Types on DAGs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compdata-fixplate" = callPackage
@@ -58741,8 +55015,6 @@ self: {
        ];
        description = "Parametric Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compdoc" = callPackage
@@ -58760,8 +55032,6 @@ self: {
        ];
        description = "Parse a Pandoc to a composite value";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compdoc-dhall-decoder" = callPackage
@@ -58780,8 +55050,6 @@ self: {
        ];
        description = "Allows you to write FromDhall instances for Compdoc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compendium-client" = callPackage
@@ -58832,8 +55100,6 @@ self: {
        libraryHaskellDepends = [ base filepath parsec ];
        description = "Helpers and runners for code competitions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compilation" = callPackage
@@ -58845,8 +55111,6 @@ self: {
        libraryHaskellDepends = [ base MissingH ];
        description = "Haskell functionality for quickly assembling simple compilers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compiler-warnings" = callPackage
@@ -58903,8 +55167,6 @@ self: {
        ];
        description = "Empirical algorithmic complexity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "componentm" = callPackage
@@ -58992,8 +55254,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Composable monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-aeson" = callPackage
@@ -59021,8 +55281,6 @@ self: {
        ];
        description = "JSON for Vinyl records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-aeson-cofree-list" = callPackage
@@ -59038,8 +55296,6 @@ self: {
        ];
        description = "Print a Cofree [] as a JSON value";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-aeson-path" = callPackage
@@ -59051,8 +55307,6 @@ self: {
        libraryHaskellDepends = [ base composite-aeson path ];
        description = "Formatting data for the path library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-aeson-refined" = callPackage
@@ -59068,8 +55322,6 @@ self: {
        ];
        description = "composite-aeson support for Refined from the refined package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-aeson-throw" = callPackage
@@ -59085,8 +55337,6 @@ self: {
        ];
        description = "MonadThrow behaviour for composite-aeson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-aeson-writeonly" = callPackage
@@ -59101,8 +55351,6 @@ self: {
        ];
        description = "WriteOnly indicators for composite-aeson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-base" = callPackage
@@ -59137,8 +55385,6 @@ self: {
        libraryHaskellDepends = [ base binary composite-base ];
        description = "Orphan binary instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-ekg" = callPackage
@@ -59153,8 +55399,6 @@ self: {
        ];
        description = "EKG Metrics for Vinyl records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-hashable" = callPackage
@@ -59188,8 +55432,6 @@ self: {
        ];
        description = "Opaleye SQL for Vinyl records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-swagger" = callPackage
@@ -59211,8 +55453,6 @@ self: {
        ];
        description = "Swagger for Vinyl records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-tuple" = callPackage
@@ -59279,8 +55519,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Composition trees for arbitrary monoids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compositional-data" = callPackage
@@ -59314,8 +55552,6 @@ self: {
        benchmarkHaskellDepends = [ base-prelude ];
        description = "Sum and Product types and such";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "comprehensions-ghc" = callPackage
@@ -59330,8 +55566,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Plugin to generalize comprehensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compressed" = callPackage
@@ -59351,8 +55585,6 @@ self: {
        ];
        description = "Compressed containers and reducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compression" = callPackage
@@ -59380,8 +55612,6 @@ self: {
        ];
        description = "Strategy combinators for compositional data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "comptrans" = callPackage
@@ -59399,8 +55629,6 @@ self: {
        ];
        description = "Automatically converting ASTs into compositional data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "computational-algebra" = callPackage
@@ -59452,8 +55680,6 @@ self: {
        ];
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "computational-geometry" = callPackage
@@ -59470,8 +55696,6 @@ self: {
        ];
        description = "Collection of algorithms in Computational Geometry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "computations" = callPackage
@@ -59483,8 +55707,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Advanced notions of computation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concatenative" = callPackage
@@ -59562,8 +55784,6 @@ self: {
        ];
        description = "Morphological disambiguation based on constrained CRFs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concraft-hr" = callPackage
@@ -59585,8 +55805,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "Part-of-speech tagger for Croatian";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concraft-pl" = callPackage
@@ -59615,8 +55833,6 @@ self: {
        ];
        description = "Morphological tagger for Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concrete-haskell" = callPackage
@@ -59660,8 +55876,6 @@ self: {
        ];
        description = "Library for the Concrete data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concrete-haskell-autogen" = callPackage
@@ -59678,8 +55892,6 @@ self: {
        ];
        description = "Automatically generated Thrift definitions for the Concrete data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concrete-relaxng-parser" = callPackage
@@ -59699,8 +55911,6 @@ self: {
        ];
        description = "A parser driven by a standard RELAX NG schema with concrete syntax extensions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concrete-typerep" = callPackage
@@ -59720,8 +55930,6 @@ self: {
        ];
        description = "Binary and Hashable instances for TypeRep";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concur-core" = callPackage
@@ -59816,8 +56024,6 @@ self: {
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "Concurrent expanding buffer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concurrent-dns-cache" = callPackage
@@ -59906,8 +56112,6 @@ self: {
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concurrent-output" = callPackage
@@ -59993,8 +56197,6 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl stm transformers ];
        description = "MTL-like library using TVars";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concurrent-supply" = callPackage
@@ -60022,8 +56224,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "More utilities and broad-used datastructures for concurrency";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concurrentoutput" = callPackage
@@ -60067,8 +56267,6 @@ self: {
        ];
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "condorcet" = callPackage
@@ -60080,8 +56278,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Library for Condorcet voting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conductive-base" = callPackage
@@ -60093,8 +56289,6 @@ self: {
        libraryHaskellDepends = [ array base containers random stm time ];
        description = "a library for live coding and real-time musical applications";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conductive-clock" = callPackage
@@ -60122,8 +56316,6 @@ self: {
        ];
        description = "a library with examples of using Conductive with hsc3";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conductive-song" = callPackage
@@ -60135,8 +56327,6 @@ self: {
        libraryHaskellDepends = [ base conductive-base random ];
        description = "a library of functions which are useful for composing music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduino" = callPackage
@@ -60275,8 +56465,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "conduit-audio interface to the LAME MP3 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mp3lame = null;};
 
   "conduit-audio-samplerate" = callPackage
@@ -60296,8 +56484,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {samplerate = null;};
 
   "conduit-audio-sndfile" = callPackage
@@ -60457,8 +56643,6 @@ self: {
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-iconv" = callPackage
@@ -60479,8 +56663,6 @@ self: {
        ];
        description = "Conduit for character encoding conversion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-merge" = callPackage
@@ -60507,8 +56689,6 @@ self: {
        ];
        description = "A base layer for network protocols using Conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-parse" = callPackage
@@ -60547,8 +56727,6 @@ self: {
        ];
        description = "Allows conduit to resume sinks to feed multiple sources into it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-throttle" = callPackage
@@ -60572,8 +56750,6 @@ self: {
        ];
        description = "Throttle Conduit Producers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-tokenize-attoparsec" = callPackage
@@ -60593,8 +56769,6 @@ self: {
        testHaskellDepends = [ attoparsec base conduit hspec resourcet ];
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-vfs" = callPackage
@@ -60619,8 +56793,6 @@ self: {
        ];
        description = "Virtual file system for Conduit; disk, pure, and in-memory impls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-vfs-zip" = callPackage
@@ -60647,8 +56819,6 @@ self: {
        ];
        description = "Zip archive interface for the Conduit Virtual File System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-zstd" = callPackage
@@ -60683,8 +56853,6 @@ self: {
        ];
        description = "Parser for Haskell-based configuration files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conf-json" = callPackage
@@ -60736,8 +56904,6 @@ self: {
          text transformers
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conferer" = callPackage
@@ -60768,8 +56934,6 @@ self: {
        testHaskellDepends = [ base conferer hedis hspec text ];
        description = "conferer's FromConfig instances for hedis settings";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conferer-hspec" = callPackage
@@ -60802,8 +56966,6 @@ self: {
        ];
        description = "Configuration for reading dhall files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conferer-provider-json" = callPackage
@@ -60824,8 +56986,6 @@ self: {
        ];
        description = "conferer's provider for reading json files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conferer-provider-yaml" = callPackage
@@ -60844,8 +57004,6 @@ self: {
        ];
        description = "Configuration for reading yaml files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conferer-snap" = callPackage
@@ -60864,8 +57022,6 @@ self: {
        ];
        description = "conferer's FromConfig instances for snap Config";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conferer-source-dhall" = callPackage
@@ -60976,8 +57132,6 @@ self: {
        ];
        description = "A .conf file formatter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "confide" = callPackage
@@ -60992,8 +57146,6 @@ self: {
        testHaskellDepends = [ base deiko-config tasty tasty-hunit text ];
        description = "derive typeclass instances for decoding types from HOCON conf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "config-ini" = callPackage
@@ -61047,8 +57199,6 @@ self: {
        testHaskellDepends = [ base extra hspec lens parsec text ];
        description = "Parse config files using parsec and generate parse errors on unhandled keys";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "config-schema" = callPackage
@@ -61081,8 +57231,6 @@ self: {
        ];
        description = "A small program for swapping out dot files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "config-value" = callPackage
@@ -61110,8 +57258,6 @@ self: {
        libraryHaskellDepends = [ base config-value text ];
        description = "Interface between config-value and System.GetOpt";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "configifier" = callPackage
@@ -61140,8 +57286,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "parser for config files, shell variables, command line args";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "configuration" = callPackage
@@ -61153,8 +57297,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple data type for application configuration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "configuration-tools" = callPackage
@@ -61186,8 +57328,6 @@ self: {
        ];
        description = "Tools for specifying and parsing configurations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "configurator" = callPackage
@@ -61250,8 +57390,6 @@ self: {
        ];
        description = "The next generation of configuration management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "configurator-pg" = callPackage
@@ -61290,8 +57428,6 @@ self: {
        ];
        description = "A command line tool for resolving conflicts of file synchronizers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "congruence-relation" = callPackage
@@ -61303,8 +57439,6 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "Decidable congruence relations for Haskell: up to you whether this is a joke";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conjugateGradient" = callPackage
@@ -61336,8 +57470,6 @@ self: {
        ];
        description = "A BitTorrent client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conkin" = callPackage
@@ -61355,8 +57487,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Tools for functors from Hask^k to Hask";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conlogger" = callPackage
@@ -61371,8 +57501,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A logger for a concurrent program";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "connection" = callPackage
@@ -61425,8 +57553,6 @@ self: {
        testHaskellDepends = [ base doctest text ];
        description = "A library for parsing connection strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "connections" = callPackage
@@ -61443,8 +57569,6 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        description = "Orders, Galois connections, and lattices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "consistent" = callPackage
@@ -61462,8 +57586,6 @@ self: {
        testHaskellDepends = [ base lifted-async transformers ];
        description = "Eventually consistent STM transactions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "console-program" = callPackage
@@ -61481,8 +57603,6 @@ self: {
        ];
        description = "Interpret the command line and a config file as commands and options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "console-prompt" = callPackage
@@ -61517,8 +57637,6 @@ self: {
        testHaskellDepends = [ base directory process ];
        description = "Compiler plugin for constant math elimination";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constaparser" = callPackage
@@ -61541,8 +57659,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Equality by only Constructor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constrained" = callPackage
@@ -61571,8 +57687,6 @@ self: {
        ];
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constrained-category" = callPackage
@@ -61592,8 +57706,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constrained Categories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constrained-dynamic" = callPackage
@@ -61606,8 +57718,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dynamic typing with retained constraints";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constrained-monads" = callPackage
@@ -61631,8 +57741,6 @@ self: {
        ];
        description = "Typeclasses and instances for monads with constraints";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constrained-normal" = callPackage
@@ -61694,8 +57802,6 @@ self: {
        libraryHaskellDepends = [ base indextype ];
        description = "Some conviencience type functions for manipulating constraints";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constraint-reflection" = callPackage
@@ -61774,8 +57880,6 @@ self: {
        testHaskellDepends = [ base constraints hspec transformers ];
        description = "Defer instance lookups until runtime";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constraints-extras" = callPackage
@@ -61829,8 +57933,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Haskell version of the Construct library for easy specification of file formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constructible" = callPackage
@@ -61846,8 +57948,6 @@ self: {
        ];
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constructive-algebra" = callPackage
@@ -61859,8 +57959,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck type-level ];
        description = "A library of constructive algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "consul-haskell" = callPackage
@@ -61885,8 +57983,6 @@ self: {
        ];
        description = "A consul client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "consumers" = callPackage
@@ -61913,8 +58009,6 @@ self: {
        ];
        description = "Concurrent PostgreSQL data consumers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "container" = callPackage
@@ -61928,8 +58022,6 @@ self: {
        ];
        description = "Containers abstraction and utilities";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "container-builder" = callPackage
@@ -62014,8 +58106,6 @@ self: {
        ];
        description = "Extensive benchmark suite for containers package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "containers-deepseq" = callPackage
@@ -62038,8 +58128,6 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols containers ];
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "containers-verified" = callPackage
@@ -62051,8 +58139,6 @@ self: {
        libraryHaskellDepends = [ containers ];
        description = "Formally verified drop-in replacement of containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "content-store" = callPackage
@@ -62077,8 +58163,6 @@ self: {
        ];
        description = "Store and retrieve data from an on-disk store";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "context" = callPackage
@@ -62140,8 +58224,6 @@ self: {
        ];
        description = "Basic algorithms on context-free grammars";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "context-http-client" = callPackage
@@ -62186,8 +58268,6 @@ self: {
        ];
        description = "An abstraction of a stack and stack-based monadic context";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "context-wai-middleware" = callPackage
@@ -62229,8 +58309,6 @@ self: {
        ];
        description = "Unified interface for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "contiguous-checked" = callPackage
@@ -62242,8 +58320,6 @@ self: {
        libraryHaskellDepends = [ base contiguous primitive ];
        description = "contiguous with bounds checks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "contiguous-fft" = callPackage
@@ -62255,8 +58331,6 @@ self: {
        libraryHaskellDepends = [ base contiguous primitive semirings ];
        description = "dft of contiguous memory structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "continue" = callPackage
@@ -62273,8 +58347,6 @@ self: {
        ];
        description = "Monads with suspension and arbitrary-spot reentry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "continued-fraction" = callPackage
@@ -62321,8 +58393,6 @@ self: {
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "continuum-client" = callPackage
@@ -62337,8 +58407,6 @@ self: {
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "contracheck-applicative" = callPackage
@@ -62396,8 +58464,6 @@ self: {
        ];
        description = "Class of monad transformers which control operations can be lifted thru";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-bool" = callPackage
@@ -62465,8 +58531,6 @@ self: {
        ];
        description = "A typeclass for type isomorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-attempt" = callPackage
@@ -62478,8 +58542,6 @@ self: {
        libraryHaskellDepends = [ attempt base transformers ];
        description = "Monad transformer for attempt. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-exception" = callPackage
@@ -62496,8 +58558,6 @@ self: {
        ];
        description = "Explicitly typed, checked exceptions with stack traces";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-exception-monadsfd" = callPackage
@@ -62513,8 +58573,6 @@ self: {
        ];
        description = "Monads-fd instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-exception-monadstf" = callPackage
@@ -62530,8 +58588,6 @@ self: {
        ];
        description = "Monads-tf instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-exception-mtl" = callPackage
@@ -62544,8 +58600,6 @@ self: {
        doHaddock = false;
        description = "MTL instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-failure" = callPackage
@@ -62557,8 +58611,6 @@ self: {
        libraryHaskellDepends = [ base failure transformers ];
        description = "A class for monads which can fail with an error. (deprecated)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-failure-mtl" = callPackage
@@ -62570,8 +58622,6 @@ self: {
        libraryHaskellDepends = [ base failure mtl ];
        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;
-       broken = true;
      }) {};
 
   "control-monad-free_0_5_3" = callPackage
@@ -62661,8 +58711,6 @@ self: {
        libraryHaskellDepends = [ base contstuff monads-tf ];
        description = "ContStuff instances for monads-tf transformers (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "contstuff-transformers" = callPackage
@@ -62674,8 +58722,6 @@ self: {
        libraryHaskellDepends = [ base contstuff transformers ];
        description = "Deprecated interface between contstuff 0.7.0 and the transformers package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "converge" = callPackage
@@ -62758,8 +58804,6 @@ self: {
        ];
        description = "Injective explicit total and partial conversions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "convert" = callPackage
@@ -62777,8 +58821,6 @@ self: {
        ];
        description = "Safe and unsafe data conversion utilities with strong type-level operation. checking.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "convert-annotation" = callPackage
@@ -62802,8 +58844,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "convertible" = callPackage
@@ -62837,8 +58877,6 @@ self: {
        ];
        description = "convertible instances for ascii";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "convertible-text" = callPackage
@@ -62859,8 +58897,6 @@ self: {
        ];
        description = "Typeclasses and instances for converting between types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cookbook" = callPackage
@@ -62917,8 +58953,6 @@ self: {
        testHaskellDepends = [ base HUnit lens ];
        description = "A representation of latitude and longitude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot" = callPackage
@@ -62939,8 +58973,6 @@ self: {
        executableHaskellDepends = [ base copilot-c99 copilot-libraries ];
        description = "A stream DSL for writing embedded C programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-c99" = callPackage
@@ -62974,8 +59006,6 @@ self: {
        ];
        description = "Copilot interface to a C model-checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-core" = callPackage
@@ -63003,8 +59033,6 @@ self: {
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-libraries" = callPackage
@@ -63020,8 +59048,6 @@ self: {
        ];
        description = "Libraries for the Copilot language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-sbv" = callPackage
@@ -63037,8 +59063,6 @@ self: {
        ];
        description = "A compiler for CoPilot targeting SBV";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-theorem" = callPackage
@@ -63056,8 +59080,6 @@ self: {
        ];
        description = "k-induction for Copilot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copr" = callPackage
@@ -63077,8 +59099,6 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Haskell interface to the Fedora Copr system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "core" = callPackage
@@ -63090,8 +59110,6 @@ self: {
        libraryHaskellDepends = [ base bytestring parsec pretty ];
        description = "External core parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "core-compiler" = callPackage
@@ -63143,8 +59161,6 @@ self: {
        ];
        description = "A subset of Haskell using in UCC for teaching purpose";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "core-program" = callPackage
@@ -63209,8 +59225,6 @@ self: {
        ];
        description = "A bliki written using yesod. Uses pandoc to process files stored in git.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "corecursive-main" = callPackage
@@ -63248,8 +59262,6 @@ self: {
        librarySystemDepends = [ rocksdb ];
        description = "Launches CoreNLP and parses the JSON output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) rocksdb;};
 
   "cornea" = callPackage
@@ -63283,8 +59295,6 @@ self: {
        libraryHaskellDepends = [ base enumerator monad-coroutine ];
        description = "Bridge between the monad-coroutine and enumerator packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coroutine-iteratee" = callPackage
@@ -63296,8 +59306,6 @@ self: {
        libraryHaskellDepends = [ base iteratee monad-coroutine ];
        description = "Bridge between the monad-coroutine and iteratee packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coroutine-object" = callPackage
@@ -63309,8 +59317,6 @@ self: {
        libraryHaskellDepends = [ base either free mtl transformers ];
        description = "Object-oriented programming realization using coroutine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "couch-hs" = callPackage
@@ -63329,8 +59335,6 @@ self: {
        ];
        description = "A CouchDB view server for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "couch-simple" = callPackage
@@ -63357,8 +59361,6 @@ self: {
        testToolDepends = [ couchdb ];
        description = "A modern, lightweight, complete client for CouchDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) couchdb;};
 
   "couchdb-conduit" = callPackage
@@ -63388,8 +59390,6 @@ self: {
        ];
        description = "Couch DB client library using http-conduit and aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "couchdb-enumerator" = callPackage
@@ -63417,8 +59417,6 @@ self: {
        ];
        description = "Couch DB client library using http-enumerator and aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "count" = callPackage
@@ -63462,8 +59460,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck text ];
        description = "Countable Text Inflections";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "counter" = callPackage
@@ -63475,8 +59471,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "An object frequency counter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "country" = callPackage
@@ -63513,8 +59507,6 @@ self: {
        testHaskellDepends = [ aeson base HTF HUnit ];
        description = "ISO 3166 country codes and i18n names";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "courier" = callPackage
@@ -63539,8 +59531,6 @@ self: {
        ];
        description = "A message-passing library for simplifying network applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "court" = callPackage
@@ -63560,8 +59550,6 @@ self: {
        ];
        description = "Simple and flexible CI system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coverage" = callPackage
@@ -63574,8 +59562,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Exhaustivity Checking Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coya" = callPackage
@@ -63589,8 +59575,6 @@ self: {
        ];
        description = "Coya monoids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cparsing" = callPackage
@@ -63607,8 +59591,6 @@ self: {
        ];
        description = "A simple C++ parser with preprocessor features. C++ refactorings included.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cpio-conduit" = callPackage
@@ -63628,8 +59610,6 @@ self: {
        ];
        description = "Conduit-based CPIO";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cpkg" = callPackage
@@ -63660,8 +59640,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ];
        description = "Build tool for C";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cplex-hs" = callPackage
@@ -63696,8 +59674,6 @@ self: {
        testHaskellDepends = [ base process QuickCheck ];
        description = "C++ Foreign Import Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cppfilt" = callPackage
@@ -63762,8 +59738,6 @@ self: {
        ];
        description = "Run random effect using cprng-aes, a crypto pseudo number generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cpsa" = callPackage
@@ -63829,8 +59803,6 @@ self: {
        executableHaskellDepends = [ base mtl process ];
        description = "Modify the cpu frequency on OpenBSD systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cpython" = callPackage
@@ -63844,8 +59816,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {python34 = null;};
 
   "cql" = callPackage
@@ -63895,8 +59865,6 @@ self: {
        doHaddock = false;
        description = "Cassandra CQL client";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cql-io-tinylog" = callPackage
@@ -63908,8 +59876,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cql-io tinylog ];
        description = "Tinylog integration for cql-io";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs" = callPackage
@@ -63938,8 +59904,6 @@ self: {
        ];
        description = "Command-Query Responsibility Segregation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-example" = callPackage
@@ -63961,8 +59925,6 @@ self: {
        ];
        description = "Example for cqrs package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-memory" = callPackage
@@ -63979,8 +59941,6 @@ self: {
        testHaskellDepends = [ base cqrs-core cqrs-testkit hspec random ];
        description = "Memory backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-postgresql" = callPackage
@@ -64004,8 +59964,6 @@ self: {
        ];
        description = "PostgreSQL backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-sqlite3" = callPackage
@@ -64026,8 +59984,6 @@ self: {
        ];
        description = "SQLite3 backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-test" = callPackage
@@ -64044,8 +60000,6 @@ self: {
        ];
        description = "Command-Query Responsibility Segregation Test Support";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-testkit" = callPackage
@@ -64063,8 +60017,6 @@ self: {
        ];
        description = "Command-Query Responsibility Segregation Test Support";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-types" = callPackage
@@ -64095,8 +60047,6 @@ self: {
        ];
        description = "Code review tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crack" = callPackage
@@ -64109,8 +60059,6 @@ self: {
        librarySystemDepends = [ crack ];
        description = "A haskell binding to cracklib";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {crack = null;};
 
   "crackNum" = callPackage
@@ -64156,8 +60104,6 @@ self: {
        ];
        description = "A UNIX configuration management library in Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "craftwerk" = callPackage
@@ -64171,8 +60117,6 @@ self: {
        libraryHaskellDepends = [ base colour mtl vector-space ];
        description = "2D graphics library with integrated TikZ output";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "craftwerk-cairo" = callPackage
@@ -64184,8 +60128,6 @@ self: {
        libraryHaskellDepends = [ base cairo craftwerk mtl ];
        description = "Cairo backend for Craftwerk";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "craftwerk-gtk" = callPackage
@@ -64203,8 +60145,6 @@ self: {
        ];
        description = "Gtk UI for Craftwerk";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crawlchain" = callPackage
@@ -64225,8 +60165,6 @@ self: {
        ];
        description = "Simulation user crawl paths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "craze" = callPackage
@@ -64259,8 +60197,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "HTTP Racing Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crc" = callPackage
@@ -64278,8 +60214,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Implements various Cyclic Redundancy Checks (CRC)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crc16" = callPackage
@@ -64291,8 +60225,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Calculate the crc16-ccitt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crc16-table" = callPackage
@@ -64337,8 +60269,6 @@ self: {
        ];
        description = "Conflict-free replicated data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crdt-event-fold" = callPackage
@@ -64380,8 +60310,6 @@ self: {
        ];
        description = "Framework for artificial life experiments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "credential-store" = callPackage
@@ -64401,8 +60329,6 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        description = "Library to access secure credential storage providers";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "credentials" = callPackage
@@ -64466,8 +60392,6 @@ self: {
        ];
        description = "First-order, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crf-chain1-constrained" = callPackage
@@ -64487,8 +60411,6 @@ self: {
        ];
        description = "First-order, constrained, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crf-chain2-generic" = callPackage
@@ -64506,8 +60428,6 @@ self: {
        ];
        description = "Second-order, generic, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crf-chain2-tiers" = callPackage
@@ -64526,8 +60446,6 @@ self: {
        ];
        description = "Second-order, tiered, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "critbit" = callPackage
@@ -64556,8 +60474,6 @@ self: {
        ];
        description = "Crit-bit maps and sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "criterion" = callPackage
@@ -64616,8 +60532,6 @@ self: {
        ];
        description = "A simple tool for visualising differences in Criterion benchmark results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "criterion-measurement" = callPackage
@@ -64660,8 +60574,6 @@ self: {
        ];
        description = "Enhancement of the \"criterion\" benchmarking library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "criterion-to-html" = callPackage
@@ -64680,8 +60592,6 @@ self: {
        ];
        description = "Convert criterion output to HTML reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "criu-rpc" = callPackage
@@ -64698,8 +60608,6 @@ self: {
        ];
        description = "CRIU RPC client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "criu-rpc-types" = callPackage
@@ -64713,8 +60621,6 @@ self: {
        libraryPkgconfigDepends = [ protobuf ];
        description = "Criu RPC protocol buffer types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) protobuf;};
 
   "crjdt-haskell" = callPackage
@@ -64730,8 +60636,6 @@ self: {
        testHaskellDepends = [ base containers hedgehog hspec mtl ];
        description = "A Conflict-Free Replicated JSON Datatype for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crockford" = callPackage
@@ -64743,8 +60647,6 @@ self: {
        libraryHaskellDepends = [ base digits QuickCheck safe ];
        description = "An implementation of Douglas Crockford's base32 encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crocodile" = callPackage
@@ -64763,8 +60665,6 @@ self: {
        ];
        description = "An offline renderer supporting ray tracing and photon mapping";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cron" = callPackage
@@ -64808,8 +60708,6 @@ self: {
        ];
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cronus" = callPackage
@@ -64839,8 +60737,6 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Request and Response types for Eval.so's API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crunghc" = callPackage
@@ -64859,8 +60755,6 @@ self: {
        ];
        description = "A runghc replacement with transparent caching";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypt-sha512" = callPackage
@@ -64934,8 +60828,6 @@ self: {
        ];
        description = "Generic cryptography cipher benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-cipher-tests" = callPackage
@@ -65008,8 +60900,6 @@ self: {
        ];
        description = "Conduit interface for cryptographic operations (from crypto-api)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-enigma" = callPackage
@@ -65064,8 +60954,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Multihash library on top of cryptonite crypto library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-numbers" = callPackage
@@ -65138,8 +61026,6 @@ self: {
        ];
        description = "OpenSSH keys decoder/encoder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-pubkey-types" = callPackage
@@ -65193,8 +61079,6 @@ self: {
        ];
        description = "A random effect using crypto-random";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-rng" = callPackage
@@ -65211,8 +61095,6 @@ self: {
        ];
        description = "Cryptographic random number generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-simple" = callPackage
@@ -65227,8 +61109,6 @@ self: {
        ];
        description = "A simple high level encryption interface based on cryptonite";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-sodium" = callPackage
@@ -65250,8 +61130,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Easy-and-safe-to-use high-level cryptography based on Sodium";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-token" = callPackage
@@ -65294,8 +61172,6 @@ self: {
        ];
        description = "Symmetrical block and stream ciphers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cryptocompare" = callPackage
@@ -65314,8 +61190,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-expectations MissingH ];
        description = "Haskell wrapper for the cryptocompare API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cryptoconditions" = callPackage
@@ -65339,8 +61213,6 @@ self: {
        ];
        description = "Interledger Crypto-Conditions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cryptohash" = callPackage
@@ -65495,8 +61367,6 @@ self: {
        ];
        description = "Reversable and secure encoding of object ids as a bytestring";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cryptoids-class" = callPackage
@@ -65562,8 +61432,6 @@ self: {
        ];
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cryptonite" = callPackage
@@ -65669,8 +61537,6 @@ self: {
        ];
        description = "Bindings for Cryptsy cryptocurrency exchange API";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crystalfontz" = callPackage
@@ -65682,8 +61548,6 @@ self: {
        libraryHaskellDepends = [ base crc16-table MaybeT serialport ];
        description = "Control Crystalfontz LCD displays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csa" = callPackage
@@ -65711,8 +61575,6 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Compiler plugin for common subexpression elimination";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csg" = callPackage
@@ -65744,8 +61606,6 @@ self: {
        ];
        description = "Analytical CSG (Constructive Solid Geometry) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csound-catalog" = callPackage
@@ -65761,8 +61621,6 @@ self: {
        ];
        description = "a gallery of Csound instruments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csound-expression" = callPackage
@@ -65782,8 +61640,6 @@ self: {
        ];
        description = "library to make electronic music";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csound-expression-dynamic" = callPackage
@@ -65801,8 +61657,6 @@ self: {
        ];
        description = "dynamic core for csound-expression library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csound-expression-opcodes" = callPackage
@@ -65818,8 +61672,6 @@ self: {
        ];
        description = "opcodes for the library csound-expression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csound-expression-typed" = callPackage
@@ -65840,8 +61692,6 @@ self: {
        ];
        description = "typed core for the library csound-expression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csound-sampler" = callPackage
@@ -65853,8 +61703,6 @@ self: {
        libraryHaskellDepends = [ base csound-expression transformers ];
        description = "A musical sampler based on Csound";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csp" = callPackage
@@ -65885,8 +61733,6 @@ self: {
        ];
        description = "A command line type checker for CSPM files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cspretty" = callPackage
@@ -65898,8 +61744,6 @@ self: {
        libraryHaskellDepends = [ base containers pretty ];
        description = "AST and pretty printer for CSPm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "css" = callPackage
@@ -65911,8 +61755,6 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        description = "Minimal monadic CSS DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "css-easings" = callPackage
@@ -65951,8 +61793,6 @@ self: {
        ];
        description = "Parsing, rendering and manipulating css selectors in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "css-syntax" = callPackage
@@ -65974,8 +61814,6 @@ self: {
        ];
        description = "High-performance CSS tokenizer and serializer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "css-text" = callPackage
@@ -66042,8 +61880,6 @@ self: {
        ];
        description = "A flexible, fast, enumerator-based CSV parser library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csv-nptools" = callPackage
@@ -66061,8 +61897,6 @@ self: {
        ];
        description = "A collection of CSV tools";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csv-table" = callPackage
@@ -66107,8 +61941,6 @@ self: {
        librarySystemDepends = [ ctemplate ];
        description = "Binding to the Google ctemplate library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ctemplate = null;};
 
   "ctkl" = callPackage
@@ -66120,8 +61952,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "packaging of Manuel Chakravarty's CTK Light for Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ctpl" = callPackage
@@ -66138,8 +61968,6 @@ self: {
        executableHaskellDepends = [ array base chatty-text chatty-utils ];
        description = "A programming language for text modification";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ctrie" = callPackage
@@ -66180,8 +62008,6 @@ self: {
        ];
        description = "Cubic DSL for 3D printing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cubical" = callPackage
@@ -66260,8 +62086,6 @@ self: {
        executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cuckoo" = callPackage
@@ -66284,8 +62108,6 @@ self: {
        doHaddock = false;
        description = "Haskell Implementation of Cuckoo Filters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cuckoo-filter" = callPackage
@@ -66346,8 +62168,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the CUDD binary decision diagrams library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) cudd;};
 
   "cue-sheet" = callPackage
@@ -66463,8 +62283,6 @@ self: {
        ];
        description = "A framework for declaratively writing curl based API tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "curlhs" = callPackage
@@ -66523,8 +62341,6 @@ self: {
        testHaskellDepends = [ aeson base bson hspec QuickCheck ];
        description = "ISO-4217 Currency Codes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "currency-convert" = callPackage
@@ -66540,8 +62356,6 @@ self: {
        ];
        description = "Typesafe currency conversion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "current-locale" = callPackage
@@ -66610,8 +62424,6 @@ self: {
        testHaskellDepends = [ base Cabal curry-base filepath ];
        description = "Compile the functional logic language Curry to several intermediate formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "curryer" = callPackage
@@ -66662,8 +62474,6 @@ self: {
        ];
        description = "Terminal tool for viewing tabular data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cursor" = callPackage
@@ -66731,8 +62541,6 @@ self: {
          base criterion cursor-fuzzy-time genvalidity-criterion QuickCheck
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cursor-gen" = callPackage
@@ -66776,8 +62584,6 @@ self: {
        ];
        description = "Fast implementations of the curve25519 elliptic curve primitives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "curves" = callPackage
@@ -66794,8 +62600,6 @@ self: {
        ];
        description = "Library for drawing curve based images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cusolver" = callPackage
@@ -66841,8 +62645,6 @@ self: {
        libraryHaskellDepends = [ base basic-prelude monad-loops ];
        description = "An enhanced prelude, serving as a foundation for my projects";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cut-the-crap" = callPackage
@@ -66916,8 +62718,6 @@ self: {
        ];
        description = "Functional Combinators for Computer Vision";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cve" = callPackage
@@ -66966,8 +62766,6 @@ self: {
        ];
        description = "Haskell bindings for the neo4j \"cypher\" query language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "czipwith" = callPackage
@@ -67010,8 +62808,6 @@ self: {
        ];
        description = "Permissively licensed D-Bus client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "d10" = callPackage
@@ -67024,8 +62820,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Digits 0-9";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "d3d11binding" = callPackage
@@ -67058,8 +62852,6 @@ self: {
        libraryHaskellDepends = [ base mtl random text ];
        description = "Declarative visualization on a web browser with DSL approach";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "daemonize-doublefork" = callPackage
@@ -67116,8 +62908,6 @@ self: {
        ];
        description = "Compile-time, type-safe directed acyclic graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "damnpacket" = callPackage
@@ -67136,8 +62926,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
        description = "Parsing dAmn messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "danibot" = callPackage
@@ -67160,8 +62948,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Basic Slack bot framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dao" = callPackage
@@ -67192,8 +62978,6 @@ self: {
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dapi" = callPackage
@@ -67212,8 +62996,6 @@ self: {
        ];
        description = "Prints a series of dates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcs" = callPackage
@@ -67285,8 +63067,6 @@ self: {
        ];
        description = "Comparative benchmark suite for darcs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcs-beta" = callPackage
@@ -67318,8 +63098,6 @@ self: {
        executableSystemDepends = [ curl ];
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) curl;};
 
   "darcs-buildpackage" = callPackage
@@ -67338,8 +63116,6 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Darcs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcs-cabalized" = callPackage
@@ -67361,8 +63137,6 @@ self: {
        executableSystemDepends = [ curl ncurses zlib ];
        description = "David's Advanced Version Control System";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) curl; inherit (pkgs) ncurses; 
          inherit (pkgs) zlib;};
 
@@ -67383,8 +63157,6 @@ self: {
        ];
        description = "Import/export git fast-import streams to/from darcs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcs-graph" = callPackage
@@ -67403,8 +63175,6 @@ self: {
        ];
        description = "Generate graphs of darcs repository activity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcs-monitor" = callPackage
@@ -67422,8 +63192,6 @@ self: {
        ];
        description = "Darcs repository monitor (sends email)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcs-scripts" = callPackage
@@ -67454,8 +63222,6 @@ self: {
        ];
        description = "Outputs dependencies of darcs patches in dot format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcsden" = callPackage
@@ -67483,8 +63249,6 @@ self: {
        ];
        description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch).";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcswatch" = callPackage
@@ -67507,8 +63271,6 @@ self: {
        ];
        description = "Track application of Darcs patches";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darkplaces-demo" = callPackage
@@ -67536,8 +63298,6 @@ self: {
        ];
        description = "Utility and parser for DarkPlaces demo files";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darkplaces-rcon" = callPackage
@@ -67554,8 +63314,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec hspec-core ];
        description = "Darkplaces rcon client library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darkplaces-rcon-util" = callPackage
@@ -67585,8 +63343,6 @@ self: {
        ];
        description = "Darplaces rcon utility";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darkplaces-text" = callPackage
@@ -67604,8 +63360,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Parser for darkplaces colorful text";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dash-haskell" = callPackage
@@ -67626,8 +63380,6 @@ self: {
        ];
        description = "Convert package Haddock to Dash docsets (IDE docs)";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-accessor" = callPackage
@@ -67664,8 +63416,6 @@ self: {
        ];
        description = "Use Accessor to access state in monads-fd State monad class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-accessor-monads-tf" = callPackage
@@ -67679,8 +63429,6 @@ self: {
        ];
        description = "Use Accessor to access state in monads-tf State monad type family";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-accessor-mtl" = callPackage
@@ -67746,8 +63494,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator birds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-base" = callPackage
@@ -67759,8 +63505,6 @@ self: {
        libraryHaskellDepends = [ 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;
-       broken = true;
      }) {};
 
   "data-basic" = callPackage
@@ -67784,8 +63528,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "data-binary-ieee754" = callPackage
@@ -67832,8 +63574,6 @@ self: {
        sha256 = "1mb72r17982w2sslmvi5nzpf7i702iikc7j4h68gzlfnm426jk9q";
        description = "Category theory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-cell" = callPackage
@@ -67857,8 +63597,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Library for checking and normalization of data (e.g. from web forms)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-checked" = callPackage
@@ -67894,8 +63632,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generate a special combinator from any data type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-compat" = callPackage
@@ -67918,8 +63654,6 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A Library for directional queues";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-construction" = callPackage
@@ -67931,8 +63665,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-constructors" = callPackage
@@ -67962,8 +63694,6 @@ self: {
        ];
        description = "a cyclic doubly linked list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-default" = callPackage
@@ -68182,8 +63912,6 @@ self: {
        ];
        description = "Space-efficient and privacy-preserving data dispersal algorithms";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-diverse" = callPackage
@@ -68217,8 +63945,6 @@ self: {
        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;
-       broken = true;
      }) {};
 
   "data-dword" = callPackage
@@ -68253,8 +63979,6 @@ self: {
        ];
        description = "Consistent set of utility functions for Maybe, Either, List and Monoids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-elf" = callPackage
@@ -68268,8 +63992,6 @@ self: {
        ];
        description = "Executable and Linkable Format (ELF) data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-embed" = callPackage
@@ -68294,8 +64016,6 @@ self: {
        ];
        description = "Embed files and other binary blobs inside executables without Template Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-emoticons" = callPackage
@@ -68307,8 +64027,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator emoticons: data-aviary in the flavor of emoticons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-endian" = callPackage
@@ -68360,8 +64078,6 @@ self: {
        ];
        description = "A type safe file path data structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-files-gen" = callPackage
@@ -68408,8 +64124,6 @@ self: {
        ];
        description = "Finite totally ordered sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-fin-simple" = callPackage
@@ -68422,8 +64136,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Simple integral finite set";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-fix" = callPackage
@@ -68446,8 +64158,6 @@ self: {
        libraryHaskellDepends = [ base containers data-fix transformers ];
        description = "Common subexpression elimination for the fixploint types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-flags" = callPackage
@@ -68470,8 +64180,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An efficient data type for sets of flags";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-foldapp" = callPackage
@@ -68495,8 +64203,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A simple multi-way tree data structure";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-fresh" = callPackage
@@ -68612,8 +64318,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Write-once variables with concurrency support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-json-token" = callPackage
@@ -68644,8 +64348,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "data-layer" = callPackage
@@ -68657,8 +64359,6 @@ self: {
        libraryHaskellDepends = [ base convert data-construction lens ];
        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;
-       broken = true;
      }) {};
 
   "data-layout" = callPackage
@@ -68685,8 +64385,6 @@ self: {
        ];
        description = "Used to be Haskell 98 Lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-lens-fd" = callPackage
@@ -68700,8 +64398,6 @@ self: {
        ];
        description = "Lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-lens-ixset" = callPackage
@@ -68714,8 +64410,6 @@ self: {
        testHaskellDepends = [ QuickCheck ];
        description = "A Lens for IxSet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-lens-light" = callPackage
@@ -68738,8 +64432,6 @@ self: {
        libraryHaskellDepends = [ base data-lens template-haskell ];
        description = "Utilities for Data.Lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-list-sequences" = callPackage
@@ -68773,8 +64465,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Data.Map with multiple, unique keys";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-memocombinators" = callPackage
@@ -68851,8 +64541,6 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "data Nat = Zero | Succ Nat";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-object" = callPackage
@@ -68864,8 +64552,6 @@ self: {
        libraryHaskellDepends = [ base bytestring failure text time ];
        description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-object-json" = callPackage
@@ -68882,8 +64568,6 @@ self: {
        ];
        description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-object-yaml" = callPackage
@@ -68902,8 +64586,6 @@ self: {
        ];
        description = "Serialize data to and from Yaml files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-or" = callPackage
@@ -68950,8 +64632,6 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel pretty time ];
        description = "Prettyprint and compare Data values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-quotientref" = callPackage
@@ -68963,8 +64643,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Reference cells that need two independent indices to be accessed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-r-tree" = callPackage
@@ -69024,8 +64702,6 @@ self: {
        libraryHaskellDepends = [ base containers data-reify ];
        description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-repr" = callPackage
@@ -69037,8 +64713,6 @@ self: {
        libraryHaskellDepends = [ base generic-deriving lens ];
        description = "Alternative to Show data printing utility";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-result" = callPackage
@@ -69050,8 +64724,6 @@ self: {
        libraryHaskellDepends = [ base poly-control prologue ];
        description = "Data types for returning results distinguishable by types";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-rev" = callPackage
@@ -69063,8 +64735,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers text vector ];
        description = "A typeclass for reversing order of contents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-rope" = callPackage
@@ -69076,8 +64746,6 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-mmap unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-rtuple" = callPackage
@@ -69089,8 +64757,6 @@ self: {
        libraryHaskellDepends = [ base lens typelevel ];
        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;
-       broken = true;
      }) {};
 
   "data-serializer" = callPackage
@@ -69122,8 +64788,6 @@ self: {
        ];
        description = "Profiling of data structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-spacepart" = callPackage
@@ -69135,8 +64799,6 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        description = "Deprecated. Now called \"spacepart\". Space partitioning data structures.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-standards" = callPackage
@@ -69148,8 +64810,6 @@ self: {
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "A collection of standards representable by simple data types";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-stm32" = callPackage
@@ -69203,8 +64863,6 @@ self: {
        ];
        description = "Type safe, in-memory dictionary with multidimensional keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-stringmap" = callPackage
@@ -69223,8 +64881,6 @@ self: {
        ];
        description = "An efficient implementation of maps from strings to arbitrary values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-structure-inferrer" = callPackage
@@ -69245,8 +64901,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Program that infers the fastest data structure available for your program";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-sword" = callPackage
@@ -69263,8 +64917,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Shorter binary words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-tensor" = callPackage
@@ -69322,8 +64974,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functions to transform data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-tree-print" = callPackage
@@ -69359,8 +65009,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Basic type wrangling types and classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-util" = callPackage
@@ -69372,8 +65020,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "utilities for handle data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-validation" = callPackage
@@ -69391,8 +65037,6 @@ self: {
        doHaddock = false;
        description = "A library for creating type safe validations";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-variant" = callPackage
@@ -69404,8 +65048,6 @@ self: {
        libraryHaskellDepends = [ base safe ];
        description = "A variant data type, useful for modeling dynamically-typed programming languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "database-id-class" = callPackage
@@ -69432,8 +65074,6 @@ self: {
        ];
        description = "HasId/Groundhog interop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "database-migrate" = callPackage
@@ -69462,8 +65102,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Demonstrate how a database can be implemented the functional way";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "datadog" = callPackage
@@ -69491,8 +65129,6 @@ self: {
        ];
        description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "datadog-tracing" = callPackage
@@ -69528,8 +65164,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Datadog tracing client and mock agent";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dataenc" = callPackage
@@ -69575,8 +65209,6 @@ self: {
        ];
        description = "Fixing data-flow problems";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dataflow" = callPackage
@@ -69600,8 +65232,6 @@ self: {
        ];
        description = "Generate Graphviz documents from a Haskell representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dataflower" = callPackage
@@ -69646,8 +65276,6 @@ self: {
        ];
        description = "An implementation of datalog in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "datapacker" = callPackage
@@ -69665,8 +65293,6 @@ self: {
        ];
        description = "Tool to help pack files into the minimum number of CDs/DVDs/etc";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "datarobot" = callPackage
@@ -69718,8 +65344,6 @@ self: {
        ];
        description = "Classical data sets for statistics and machine learning";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dataurl" = callPackage
@@ -69738,8 +65362,6 @@ self: {
        ];
        description = "Handle data-urls";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "date-cache" = callPackage
@@ -69763,8 +65385,6 @@ self: {
        testHaskellDepends = [ base dates hspec QuickCheck time ];
        description = "Date conversions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dates" = callPackage
@@ -69781,8 +65401,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Small library for parsing different dates formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "datetime" = callPackage
@@ -69801,8 +65419,6 @@ self: {
        ];
        description = "Utilities to make Data.Time.* easier to use";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "datetime-sb" = callPackage
@@ -69821,8 +65437,6 @@ self: {
        ];
        description = "Utilities to make Data.Time.* easier to use.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dawdle" = callPackage
@@ -69837,8 +65451,6 @@ self: {
        executableHaskellDepends = [ base filepath parsec pretty text ];
        description = "Generates DDL suggestions based on a CSV file";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dawg" = callPackage
@@ -69854,8 +65466,6 @@ self: {
        ];
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dawg-ord" = callPackage
@@ -69876,8 +65486,6 @@ self: {
        ];
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbcleaner" = callPackage
@@ -69890,8 +65498,6 @@ self: {
        testHaskellDepends = [ base hspec postgresql-simple text ];
        description = "Clean database tables automatically around hspec tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbf" = callPackage
@@ -69905,8 +65511,6 @@ self: {
        ];
        description = "Read and write XBase \".dbf\" files";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbjava" = callPackage
@@ -69927,8 +65531,6 @@ self: {
        ];
        description = "Decompiler Bytecode Java";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbm" = callPackage
@@ -69947,8 +65549,6 @@ self: {
        ];
        description = "A *simple* database migration tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbmigrations" = callPackage
@@ -69996,8 +65596,6 @@ self: {
        ];
        description = "The dbmigrations tool built for MySQL databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbmigrations-postgresql" = callPackage
@@ -70016,8 +65614,6 @@ self: {
        ];
        description = "The dbmigrations tool built for PostgreSQL databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbmigrations-sqlite" = callPackage
@@ -70032,8 +65628,6 @@ self: {
        testHaskellDepends = [ base dbmigrations HDBC HDBC-sqlite3 HUnit ];
        description = "The dbmigrations tool built for SQLite databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbus_0_10_15" = callPackage
@@ -70105,8 +65699,6 @@ self: {
        ];
        description = "Monadic and object-oriented interfaces to DBus";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbus-core" = callPackage
@@ -70124,8 +65716,6 @@ self: {
        ];
        description = "Low-level D-Bus protocol implementation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbus-hslogger" = callPackage
@@ -70158,8 +65748,6 @@ self: {
        testHaskellDepends = [ base containers dbus QuickCheck ];
        description = "Quasi-quoter for DBus functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbus-th" = callPackage
@@ -70217,8 +65805,6 @@ self: {
        ];
        description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dclabel-eci11" = callPackage
@@ -70230,8 +65816,6 @@ self: {
        libraryHaskellDepends = [ base pretty QuickCheck ];
        description = "The Disjunction Category Label Format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dcpu16" = callPackage
@@ -70251,8 +65835,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "DCPU-16 Emulator & Assembler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddate" = callPackage
@@ -70264,8 +65846,6 @@ self: {
        libraryHaskellDepends = [ base dates time ];
        description = "Discordian Date Types for Haskell";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-base" = callPackage
@@ -70281,8 +65861,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler common utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-build" = callPackage
@@ -70302,8 +65880,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler build framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-code" = callPackage
@@ -70316,8 +65892,6 @@ self: {
        libraryHaskellDepends = [ base filepath ];
        description = "Disciplined Disciple Compiler base libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core" = callPackage
@@ -70334,8 +65908,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler core language and type checker";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-babel" = callPackage
@@ -70349,8 +65921,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler PHP code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-eval" = callPackage
@@ -70366,8 +65936,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler semantic evaluator for the core language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-flow" = callPackage
@@ -70385,8 +65953,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler data flow compiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-llvm" = callPackage
@@ -70403,8 +65969,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler LLVM code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-salt" = callPackage
@@ -70420,8 +65984,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler C code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-simpl" = callPackage
@@ -70437,8 +65999,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler code transformations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-tetra" = callPackage
@@ -70455,8 +66015,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler intermediate language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-driver" = callPackage
@@ -70476,8 +66034,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler top-level driver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-interface" = callPackage
@@ -70489,8 +66045,6 @@ self: {
        libraryHaskellDepends = [ base containers ddc-base directory ];
        description = "Disciplined Disciple Compiler user interface support";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-source-tetra" = callPackage
@@ -70507,8 +66061,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler source language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-tools" = callPackage
@@ -70531,8 +66083,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler command line tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-war" = callPackage
@@ -70550,8 +66100,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler test driver and buildbot";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddci-core" = callPackage
@@ -70570,8 +66118,6 @@ self: {
        ];
        description = "Disciple Core language interactive interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dde" = callPackage
@@ -70623,8 +66169,6 @@ self: {
        ];
        description = "detect dead code in haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dead-simple-json" = callPackage
@@ -70640,8 +66184,6 @@ self: {
        ];
        description = "Dead simple JSON parser, with some Template Haskell sugar";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "debian" = callPackage
@@ -70731,8 +66273,6 @@ self: {
        ];
        description = "Simple trace-based debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "debug-diff" = callPackage
@@ -70783,8 +66323,6 @@ self: {
        ];
        description = "secure remote debugging";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "debug-pp" = callPackage
@@ -70826,8 +66364,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell unicode-show ];
        description = "You do not have to write variable names twice in Debug.Trace";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "debug-tracy" = callPackage
@@ -70842,8 +66378,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "More useful trace functions for investigating bugs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deburr" = callPackage
@@ -70880,8 +66414,6 @@ self: {
        libraryHaskellDepends = [ base comonad-transformers ];
        description = "The categorical dual of transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "decidable" = callPackage
@@ -70911,8 +66443,6 @@ self: {
        testHaskellDepends = [ base binary doctest hspec QuickCheck ];
        description = "An implementation of the General Decimal Arithmetic Specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "decimal-literals" = callPackage
@@ -70946,8 +66476,6 @@ self: {
        testHaskellDepends = [ base mwc-probability ];
        description = "DIY Markov Chains";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "decode-utf8" = callPackage
@@ -70975,8 +66503,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring conduit ];
        description = "Conduit for decoding ByteStrings using Data.Binary.Get";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dedukti" = callPackage
@@ -70999,8 +66525,6 @@ self: {
        ];
        description = "A type-checker for the λΠ-modulo calculus";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deep-transformations" = callPackage
@@ -71035,8 +66559,6 @@ self: {
        ];
        description = "A library that provides deep-level programming style and(or) notation on Applicative and Monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deeplearning-hs" = callPackage
@@ -71064,8 +66586,6 @@ self: {
        ];
        description = "Deep Learning in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deepseq_1_3_0_1" = callPackage
@@ -71120,8 +66640,6 @@ self: {
        ];
        description = "Bounded deepseq, including support for generic deriving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deepseq-generics" = callPackage
@@ -71162,8 +66680,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Deep evaluation of data structures without NFData";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deepseq-th" = callPackage
@@ -71176,8 +66692,6 @@ self: {
        testHaskellDepends = [ base deepseq template-haskell ];
        description = "Template Haskell based deriver for optimised NFData instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deepzoom" = callPackage
@@ -71189,8 +66703,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsmagick ];
        description = "A DeepZoom image slicer. Only known to work on 32bit Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "defargs" = callPackage
@@ -71202,8 +66714,6 @@ self: {
        libraryHaskellDepends = [ base cluss ];
        description = "default arguments in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deferred-folds" = callPackage
@@ -71387,8 +66897,6 @@ self: {
        librarySystemDepends = [ mpdec ];
        description = "Decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mpdec = null;};
 
   "deka-tests" = callPackage
@@ -71409,8 +66917,6 @@ self: {
        testHaskellDepends = [ base bytestring deka QuickCheck quickpull ];
        description = "Tests for deka, decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delaunay" = callPackage
@@ -71427,8 +66933,6 @@ self: {
        testHaskellDepends = [ AC-Vector base HUnit QuickCheck ];
        description = "Build a Delaunay triangulation of a set of points";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delay" = callPackage
@@ -71459,8 +66963,6 @@ self: {
        ];
        description = "Accessing the del.icio.us APIs from Haskell (v2)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delimited-text" = callPackage
@@ -71476,8 +66978,6 @@ self: {
        ];
        description = "Parse character delimited textual data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delimiter-separated" = callPackage
@@ -71490,8 +66990,6 @@ self: {
        libraryHaskellDepends = [ base uhc-util uulib ];
        description = "Library for dealing with tab and/or comma (or other) separated files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delta" = callPackage
@@ -71515,8 +67013,6 @@ self: {
        testHaskellDepends = [ base directory filepath hspec ];
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delta-h" = callPackage
@@ -71538,8 +67034,6 @@ self: {
        ];
        description = "Online entropy-based model of lexical category acquisition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delude" = callPackage
@@ -71551,8 +67045,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generalized the Prelude more functionally";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "demarcate" = callPackage
@@ -71565,8 +67057,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Demarcating transformed monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "denominate" = callPackage
@@ -71581,8 +67071,6 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "Functions supporting bulk file and directory name normalization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dense" = callPackage
@@ -71607,8 +67095,6 @@ self: {
        ];
        description = "Mutable and immutable dense multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dense-int-set" = callPackage
@@ -71630,8 +67116,6 @@ self: {
        ];
        description = "Dense int-set";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dense-linear-algebra" = callPackage
@@ -71686,8 +67170,6 @@ self: {
        ];
        description = "Dependent hash maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dependent-map_0_2_4_0" = callPackage
@@ -71734,8 +67216,6 @@ self: {
        ];
        description = "Dependent map that uses semigroup mappend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dependent-state" = callPackage
@@ -71747,8 +67227,6 @@ self: {
        libraryHaskellDepends = [ base lens mtl prologue ];
        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;
-       broken = true;
      }) {};
 
   "dependent-sum_0_4" = callPackage
@@ -71825,8 +67303,6 @@ self: {
        ];
        description = "A simple configuration management tool for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dephd" = callPackage
@@ -71845,8 +67321,6 @@ self: {
        ];
        description = "Analyze quality of nucleotide sequences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "depq" = callPackage
@@ -71874,8 +67348,6 @@ self: {
        libraryHaskellDepends = [ base containers dlist mtl parsec ];
        description = "DepTrack Core types and model";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deptrack-devops" = callPackage
@@ -71894,8 +67366,6 @@ self: {
        ];
        description = "DepTrack applied to DevOps";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deptrack-dot" = callPackage
@@ -71908,8 +67378,6 @@ self: {
        testHaskellDepends = [ base containers deptrack-core dotgen ];
        description = "Facilitate Graphviz representations of DepTrack dependencies";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deque" = callPackage
@@ -71953,8 +67421,6 @@ self: {
        libraryHaskellDepends = [ base fgl ];
        description = "Find derangements of lists";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derivation-trees" = callPackage
@@ -71968,8 +67434,6 @@ self: {
        ];
        description = "Typeset Derivation Trees via MetaPost";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive" = callPackage
@@ -71990,8 +67454,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A program and library to derive instances for data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive-IG" = callPackage
@@ -72003,8 +67465,6 @@ self: {
        libraryHaskellDepends = [ base instant-generics template-haskell ];
        description = "Macro to derive instances for Instant-Generics using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive-enumerable" = callPackage
@@ -72016,8 +67476,6 @@ self: {
        libraryHaskellDepends = [ base data-default ];
        description = "Generic instances for enumerating complex data types";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive-gadt" = callPackage
@@ -72039,8 +67497,6 @@ self: {
        ];
        description = "Instance deriving for (a subset of) GADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive-lifted-instances" = callPackage
@@ -72069,8 +67525,6 @@ self: {
        testHaskellDepends = [ base semigroups ];
        description = "derive Semigroup/Monoid/IsList";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive-storable" = callPackage
@@ -72120,8 +67574,6 @@ self: {
        ];
        description = "Help Haskellers derive class instances for composited data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive-trie" = callPackage
@@ -72133,8 +67585,6 @@ self: {
        libraryHaskellDepends = [ array base containers template-haskell ];
        description = "Automatic derivation of Trie implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deriveJsonNoPrefix" = callPackage
@@ -72220,8 +67670,6 @@ self: {
        libraryHaskellDepends = [ base derp ];
        description = "combinators based on parsing with derivatives (derp) package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derulo" = callPackage
@@ -72258,8 +67706,6 @@ self: {
        ];
        description = "Combinators for describing binary data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "descrilo" = callPackage
@@ -72305,8 +67751,6 @@ self: {
        ];
        description = "Library, interpreter, and CLI for Descript programming language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "descriptive" = callPackage
@@ -72369,8 +67813,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Simple deterministic game engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "detour-via-sci" = callPackage
@@ -72414,8 +67856,6 @@ self: {
        ];
        description = "JSON and CSV encoding for quantities";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "detrospector" = callPackage
@@ -72447,8 +67887,6 @@ self: {
        executableHaskellDepends = [ base bytestring utf8-string ];
        description = "Get rid of unicode (utf-8) symbols in Haskell sources";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "devil" = callPackage
@@ -72467,8 +67905,6 @@ self: {
        ];
        description = "A small tool to make it easier to update program managed by Angel";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "devtools" = callPackage
@@ -72496,8 +67932,6 @@ self: {
        ];
        description = "Haskell development tool agregate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dewdrop" = callPackage
@@ -72511,8 +67945,6 @@ self: {
        ];
        description = "Find gadgets for return-oriented programming on x86";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "df1" = callPackage
@@ -72587,8 +68019,6 @@ self: {
        ];
        description = "A generic data integrity layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) leveldb;};
 
   "dfrac" = callPackage
@@ -72619,8 +68049,6 @@ self: {
        ];
        description = "Build Debian From Scratch CD/DVD images";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dgim" = callPackage
@@ -72633,8 +68061,6 @@ self: {
        testHaskellDepends = [ base Cabal QuickCheck ];
        description = "Implementation of DGIM algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dgs" = callPackage
@@ -72646,8 +68072,6 @@ self: {
        libraryHaskellDepends = [ base HTTP mtl network split ];
        description = "Haskell front-end for DGS' bot interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall_1_29_0" = callPackage
@@ -72792,8 +68216,6 @@ self: {
        ];
        description = "Check all dhall files in a project";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-docs" = callPackage
@@ -72823,8 +68245,6 @@ self: {
        ];
        description = "Generate HTML docs from a dhall package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-fly" = callPackage
@@ -72857,8 +68277,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Translate concourse config from Dhall to YAML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-json" = callPackage
@@ -72957,8 +68375,6 @@ self: {
        ];
        description = "Dhall to Nix compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-nixpkgs" = callPackage
@@ -72980,8 +68396,6 @@ self: {
        ];
        description = "Convert Dhall projects to Nix packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-text" = callPackage
@@ -72999,8 +68413,6 @@ self: {
        ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-to-cabal" = callPackage
@@ -73029,8 +68441,6 @@ self: {
        ];
        description = "Compile Dhall expressions to Cabal files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-yaml" = callPackage
@@ -73059,8 +68469,6 @@ self: {
        ];
        description = "Convert between Dhall and YAML";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -73079,8 +68487,6 @@ self: {
        ];
        description = "Parse a DHCP lease file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhrun" = callPackage
@@ -73114,8 +68520,6 @@ self: {
        doHaddock = false;
        description = "Dhall/YAML configurable concurrent integration test executor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "di" = callPackage
@@ -73210,8 +68614,6 @@ self: {
        ];
        description = "DI logger wrapped for Polysemy";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dia-base" = callPackage
@@ -73225,8 +68627,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "An EDSL for teaching Haskell with diagrams - data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dia-functions" = callPackage
@@ -73244,8 +68644,6 @@ self: {
        ];
        description = "An EDSL for teaching Haskell with diagrams - functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams" = callPackage
@@ -73275,8 +68673,6 @@ self: {
        libraryHaskellDepends = [ base cubicbezier diagrams-lib ];
        description = "deprecated, part of diagrams-contrib since 1.4";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-braille" = callPackage
@@ -73330,8 +68726,6 @@ self: {
        ];
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -73372,8 +68766,6 @@ self: {
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-contrib" = callPackage
@@ -73481,8 +68873,6 @@ self: {
        ];
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-hsqml" = callPackage
@@ -73499,8 +68889,6 @@ self: {
        ];
        description = "HsQML (Qt5) backend for Diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-html5" = callPackage
@@ -73519,8 +68907,6 @@ self: {
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-lib" = callPackage
@@ -73579,8 +68965,6 @@ self: {
        ];
        description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-pdf" = callPackage
@@ -73598,8 +68982,6 @@ self: {
        ];
        description = "PDF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-pgf" = callPackage
@@ -73653,8 +69035,6 @@ self: {
        ];
        description = "Draw QR codes to SVG, PNG, PDF or PS files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-rasterific" = callPackage
@@ -73760,8 +69140,6 @@ self: {
        ];
        description = "TikZ backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-wx" = callPackage
@@ -73779,8 +69157,6 @@ self: {
        ];
        description = "Backend for rendering diagrams in wxWidgets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dialog" = callPackage
@@ -73819,8 +69195,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A Dialogflow Fulfillment library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dib" = callPackage
@@ -73844,8 +69218,6 @@ self: {
        ];
        description = "A simple, forward build system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dice" = callPackage
@@ -73859,8 +69231,6 @@ self: {
        libraryHaskellDepends = [ base parsec random-fu transformers ];
        description = "Simplistic D&D style dice-rolling system";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dice-entropy-conduit" = callPackage
@@ -73880,8 +69250,6 @@ self: {
        ];
        description = "Cryptographically secure n-sided dice via rejection sampling";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dice2tex" = callPackage
@@ -73895,8 +69263,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convert a Diceware wordlist into a printer-ready LaTeX file";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dicom" = callPackage
@@ -73910,8 +69276,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "dictionaries" = callPackage
@@ -73940,8 +69304,6 @@ self: {
        ];
        description = "Tools to handle StarDict dictionaries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dictionary-sharing" = callPackage
@@ -73970,8 +69332,6 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Parsec parsers for the DICT format produced by dictfmt -t";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diet" = callPackage
@@ -73989,8 +69349,6 @@ self: {
        ];
        description = "Discrete Interval Encoding Trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diff" = callPackage
@@ -74002,8 +69360,6 @@ self: {
        libraryHaskellDepends = [ base Enum util ];
        description = "Diff and patch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diff-gestalt" = callPackage
@@ -74076,8 +69432,6 @@ self: {
        ];
        description = "Diff two .cabal files syntactically";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diffdump" = callPackage
@@ -74116,8 +69470,6 @@ self: {
          groups hedgehog hedgehog-checkers QuickCheck semigroupoids
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "differential" = callPackage
@@ -74143,8 +69495,6 @@ self: {
        ];
        description = "Finds out whether an entity comes from different distributions (statuses)";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diffmap" = callPackage
@@ -74158,8 +69508,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "diff on maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "difftodo" = callPackage
@@ -74185,8 +69533,6 @@ self: {
        ];
        description = "Generate todo lists from source code";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digamma" = callPackage
@@ -74253,8 +69599,6 @@ self: {
        ];
        description = "Speed up form designing using digestive functors and bootstrap";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digestive-foundation-lucid" = callPackage
@@ -74271,8 +69615,6 @@ self: {
        ];
        description = "Speed up form designing using digestive functors and foundation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digestive-functors" = callPackage
@@ -74315,8 +69657,6 @@ self: {
        ];
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digestive-functors-blaze" = callPackage
@@ -74347,8 +69687,6 @@ self: {
        ];
        description = "Happstack backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digestive-functors-heist" = callPackage
@@ -74377,8 +69715,6 @@ self: {
        libraryToolDepends = [ trhsx ];
        description = "HSP support for digestive-functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digestive-functors-lucid" = callPackage
@@ -74462,8 +69798,6 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        description = "digitalocean api for haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digits" = callPackage
@@ -74476,8 +69810,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Converts integers to lists of digits and back";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digraph" = callPackage
@@ -74496,8 +69828,6 @@ self: {
        testHaskellDepends = [ base fgl hashable massiv QuickCheck ];
        description = "Directed Graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dihaa" = callPackage
@@ -74561,8 +69891,6 @@ self: {
        libraryHaskellDepends = [ base dimensional numtype-dk ];
        description = "CODATA Recommended Physical Constants with Dimensional Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dimensional-tf" = callPackage
@@ -74574,8 +69902,6 @@ self: {
        libraryHaskellDepends = [ base numtype-tf time ];
        description = "Statically checked physical dimensions, implemented using type families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dimensions" = callPackage
@@ -74614,8 +69940,6 @@ self: {
        ];
        description = "Dingo is a Rich Internet Application platform based on the Warp web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dingo-example" = callPackage
@@ -74635,8 +69959,6 @@ self: {
        ];
        description = "Dingo Example";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dingo-widgets" = callPackage
@@ -74655,8 +69977,6 @@ self: {
        ];
        description = "Dingo Widgets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dino" = callPackage
@@ -74702,8 +70022,6 @@ self: {
        ];
        description = "Gemini client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diophantine" = callPackage
@@ -74716,8 +70034,6 @@ self: {
        libraryToolDepends = [ happy ];
        description = "A quadratic diophantine equation solving library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diplomacy" = callPackage
@@ -74733,8 +70049,6 @@ self: {
        ];
        description = "Diplomacy board game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diplomacy-server" = callPackage
@@ -74758,8 +70072,6 @@ self: {
        ];
        description = "Play Diplomacy over HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dir-traverse" = callPackage
@@ -74787,8 +70099,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Serialization and deserialization monads for streams and ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "direct-daemonize" = callPackage
@@ -74815,8 +70125,6 @@ self: {
        ];
        description = "Native implementation of the FastCGI protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "direct-http" = callPackage
@@ -74835,8 +70143,6 @@ self: {
        ];
        description = "Native webserver that acts as a library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "direct-murmur-hash" = callPackage
@@ -74859,8 +70165,6 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-paths ];
        description = "Lightweight replacement for Plugins, specific to GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "direct-rocksdb" = callPackage
@@ -74880,8 +70184,6 @@ self: {
        ];
        description = "Bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "direct-sqlite" = callPackage
@@ -74914,8 +70216,6 @@ self: {
        ];
        description = "Finite directed cubical complexes and associated algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "directory_1_3_6_1" = callPackage
@@ -74992,8 +70292,6 @@ self: {
        executableHaskellDepends = [ base directory ];
        description = "Deletes a directory and retains its contents in the parent directory";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dirfiles" = callPackage
@@ -75009,8 +70307,6 @@ self: {
          unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dirichlet" = callPackage
@@ -75030,8 +70326,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Multivariate dirichlet distribution";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dirstream" = callPackage
@@ -75071,8 +70365,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A small library for working with directories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "disassembler" = callPackage
@@ -75107,8 +70399,6 @@ self: {
        ];
        description = "Client for Discogs REST API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discokitty" = callPackage
@@ -75137,8 +70427,6 @@ self: {
        ];
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discord-haskell" = callPackage
@@ -75162,8 +70450,6 @@ self: {
        executableHaskellDepends = [ base text unliftio ];
        description = "Write bots for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discord-hs" = callPackage
@@ -75180,8 +70466,6 @@ self: {
        ];
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discord-register" = callPackage
@@ -75213,8 +70497,6 @@ self: {
        ];
        description = "Discord verification bot";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discord-rest" = callPackage
@@ -75234,8 +70516,6 @@ self: {
        ];
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discord-types" = callPackage
@@ -75254,8 +70534,6 @@ self: {
        ];
        description = "Type information for discord-hs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discordian-calendar" = callPackage
@@ -75267,8 +70545,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "library for handling Discordian calendar dates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discount" = callPackage
@@ -75294,8 +70570,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "replacement for enum";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discrete-intervals" = callPackage
@@ -75366,8 +70640,6 @@ self: {
        ];
        description = "Disjoint containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "disjoint-set" = callPackage
@@ -75384,8 +70656,6 @@ self: {
        ];
        description = "Persistent disjoint-sets, a.k.a union-find.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "disjoint-set-stateful" = callPackage
@@ -75398,8 +70668,6 @@ self: {
        testHaskellDepends = [ base hspec primitive ref-tf vector ];
        description = "Monadic disjoint set";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "disjoint-sets-st" = callPackage
@@ -75489,8 +70757,6 @@ self: {
        doHaddock = false;
        description = "Generate/Upload cabal package to Hackage";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distance" = callPackage
@@ -75504,8 +70770,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Useful distance datatype and functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distance-of-time" = callPackage
@@ -75581,8 +70845,6 @@ self: {
        ];
        description = "AWS Lambda backend for distributed-fork";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process" = callPackage
@@ -75607,8 +70869,6 @@ self: {
        ];
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-async" = callPackage
@@ -75636,8 +70896,6 @@ self: {
        ];
        description = "Cloud Haskell Async API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-azure" = callPackage
@@ -75660,8 +70918,6 @@ self: {
        ];
        description = "Microsoft Azure backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-client-server" = callPackage
@@ -75691,8 +70947,6 @@ self: {
        ];
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-ekg" = callPackage
@@ -75708,8 +70962,6 @@ self: {
        ];
        description = "Collect node stats for EKG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-execution" = callPackage
@@ -75745,8 +70997,6 @@ self: {
        ];
        description = "Execution Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-extras" = callPackage
@@ -75777,8 +71027,6 @@ self: {
        ];
        description = "Cloud Haskell Extras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-fsm" = callPackage
@@ -75811,8 +71059,6 @@ self: {
        ];
        description = "The Cloud Haskell implementation of Erlang/OTP gen_statem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-lifted" = callPackage
@@ -75838,8 +71084,6 @@ self: {
        ];
        description = "monad-control style typeclass and transformer instances for Process monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-monad-control" = callPackage
@@ -75856,8 +71100,6 @@ self: {
        ];
        description = "Orphan instances for MonadBase and MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-p2p" = callPackage
@@ -75878,8 +71120,6 @@ self: {
        executableHaskellDepends = [ base distributed-process mtl ];
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-platform" = callPackage
@@ -75910,8 +71150,6 @@ self: {
        ];
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-registry" = callPackage
@@ -75944,8 +71182,6 @@ self: {
        ];
        description = "Cloud Haskell Extended Process Registry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-simplelocalnet" = callPackage
@@ -75968,8 +71204,6 @@ self: {
        ];
        description = "Simple zero-configuration backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-supervisor" = callPackage
@@ -76001,8 +71235,6 @@ self: {
        ];
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-systest" = callPackage
@@ -76022,8 +71254,6 @@ self: {
        ];
        description = "Cloud Haskell Test Support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-task" = callPackage
@@ -76060,8 +71290,6 @@ self: {
        ];
        description = "Task Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-tests" = callPackage
@@ -76085,8 +71313,6 @@ self: {
        ];
        description = "Tests and test support tools for distributed-process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-zookeeper" = callPackage
@@ -76115,8 +71341,6 @@ self: {
        ];
        description = "A Zookeeper back-end for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-static" = callPackage
@@ -76132,8 +71356,6 @@ self: {
        ];
        description = "Compositional, type-safe, polymorphic static values and closures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distribution" = callPackage
@@ -76147,8 +71369,6 @@ self: {
        ];
        description = "Finite discrete probability distributions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distribution-nixpkgs" = callPackage
@@ -76204,8 +71424,6 @@ self: {
        ];
        description = "Easily plot distributions from the distribution package..";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributive" = callPackage
@@ -76270,8 +71488,6 @@ self: {
        ];
        description = "Quantify the diversity of a population";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dixi" = callPackage
@@ -76309,8 +71525,6 @@ self: {
        ];
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "djembe" = callPackage
@@ -76326,8 +71540,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Hit drums with haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "djinn" = callPackage
@@ -76384,8 +71596,6 @@ self: {
        ];
        description = "Generate executable Haskell code from a type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dl-fedora" = callPackage
@@ -76406,8 +71616,6 @@ self: {
        ];
        description = "Fedora image download tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dlist" = callPackage
@@ -76523,8 +71731,6 @@ self: {
        ];
        description = "Complete bindings to the dmenu and dmenu2 command line tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dmenu-pkill" = callPackage
@@ -76542,8 +71748,6 @@ self: {
        ];
        description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dmenu-pmount" = callPackage
@@ -76561,8 +71765,6 @@ self: {
        ];
        description = "Mounting and unmounting linux devices as user with dmenu and pmount";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dmenu-search" = callPackage
@@ -76580,8 +71782,6 @@ self: {
        ];
        description = "dmenu script for searching the web with customizable search engines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dns" = callPackage
@@ -76624,8 +71824,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Caching DNS resolver library and mass DNS resolver utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dnsrbl" = callPackage
@@ -76638,8 +71836,6 @@ self: {
        libraryHaskellDepends = [ base containers hsdns HUnit network ];
        description = "Asynchronous DNS RBL lookup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dnssd" = callPackage
@@ -76652,8 +71848,6 @@ self: {
        librarySystemDepends = [ dns_sd ];
        description = "DNS service discovery bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {dns_sd = null;};
 
   "do-list" = callPackage
@@ -76868,8 +72062,6 @@ self: {
        ];
        description = "Document review Web application, like http://book.realworldhaskell.org/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "doccheck" = callPackage
@@ -76888,8 +72080,6 @@ self: {
        ];
        description = "Checks Haddock comments for pitfalls and version changes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "docidx" = callPackage
@@ -76908,8 +72098,6 @@ self: {
        ];
        description = "Generate an HTML index of installed Haskell packages and their documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "docker" = callPackage
@@ -76965,8 +72153,6 @@ self: {
        ];
        description = "Builds a docker image and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dockercook" = callPackage
@@ -77000,8 +72186,6 @@ self: {
        testHaskellDepends = [ base HTF text vector ];
        description = "A build tool for multiple docker image layers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dockerfile" = callPackage
@@ -77073,8 +72257,6 @@ self: {
        ];
        description = "A command-line interface parser that will make you smile";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "docrecords" = callPackage
@@ -77266,8 +72448,6 @@ self: {
        doHaddock = false;
        description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "doctest-driver-gen" = callPackage
@@ -77283,8 +72463,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Generate driver file for doctest's cabal integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "doctest-exitcode-stdio" = callPackage
@@ -77323,8 +72501,6 @@ self: {
        testHaskellDepends = [ base doctest HUnit QuickCheck ];
        description = "Allow QuickCheck-style property testing within doctest";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "docusign-base" = callPackage
@@ -77394,8 +72570,6 @@ self: {
        ];
        description = "DocuSign examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "docvim" = callPackage
@@ -77422,8 +72596,6 @@ self: {
        ];
        description = "Documentation generator for Vim plug-ins";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "doi" = callPackage
@@ -77452,8 +72624,6 @@ self: {
        ];
        description = "Automatic Bibtex and fulltext of scientific articles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "doldol" = callPackage
@@ -77511,8 +72681,6 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
        description = "The Lengauer-Tarjan graph dominators algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dom-parser" = callPackage
@@ -77578,8 +72746,6 @@ self: {
        ];
        description = "Codegen helping you define domain models";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "domain-auth" = callPackage
@@ -77614,8 +72780,6 @@ self: {
        ];
        description = "Low-level API of \"domain\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "domain-optics" = callPackage
@@ -77634,8 +72798,6 @@ self: {
        testHaskellDepends = [ domain optics rerebase ];
        description = "Integration of domain with optics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dominion" = callPackage
@@ -77667,8 +72829,6 @@ self: {
        ];
        description = "A simple templating library using HTML5 as its template language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dot" = callPackage
@@ -77708,8 +72868,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dot2graphml" = callPackage
@@ -77782,8 +72940,6 @@ self: {
        doHaddock = false;
        description = "Filesystem to manage and parse dotfiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dotgen" = callPackage
@@ -77863,8 +73019,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Doublify API toolkit for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dove" = callPackage
@@ -77921,8 +73075,6 @@ self: {
        ];
        description = "Dungeons of Wor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "download" = callPackage
@@ -77965,8 +73117,6 @@ self: {
        ];
        description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "downloader" = callPackage
@@ -77983,8 +73133,6 @@ self: {
        ];
        description = "A small, low-dependency library that provides turn-key file download over HTTP and HTTPS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dozenal" = callPackage
@@ -77996,8 +73144,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dozens" = callPackage
@@ -78017,8 +73163,6 @@ self: {
        ];
        description = "dozens api library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-base" = callPackage
@@ -78032,8 +73176,6 @@ self: {
        ];
        description = "Data Parallel Haskell common config and debugging functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-examples" = callPackage
@@ -78052,8 +73194,6 @@ self: {
        ];
        description = "Data Parallel Haskell example programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-lifted-base" = callPackage
@@ -78070,8 +73210,6 @@ self: {
        ];
        description = "Data Parallel Haskell common definitions used by other dph-lifted packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-lifted-copy" = callPackage
@@ -78087,8 +73225,6 @@ self: {
        ];
        description = "Data Parallel Haskell lifted array combinators. (deprecated version)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-lifted-vseg" = callPackage
@@ -78105,8 +73241,6 @@ self: {
        ];
        description = "Data Parallel Haskell lifted array combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-par" = callPackage
@@ -78129,8 +73263,6 @@ self: {
        libraryHaskellDepends = [ base dph-base random vector ];
        description = "Data Parallel Haskell segmented arrays. (abstract interface)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-prim-par" = callPackage
@@ -78147,8 +73279,6 @@ self: {
        ];
        description = "Data Parallel Haskell segmented arrays. (production version)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-prim-seq" = callPackage
@@ -78164,8 +73294,6 @@ self: {
        ];
        description = "Data Parallel Haskell segmented arrays. (sequential implementation)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-seq" = callPackage
@@ -78197,8 +73325,6 @@ self: {
        testPkgconfigDepends = [ libdpkg ];
        description = "libdpkg bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) dpkg; libdpkg = null;};
 
   "dpor" = callPackage
@@ -78212,8 +73338,6 @@ self: {
        ];
        description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dprox" = callPackage
@@ -78248,8 +73372,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Monadic FRP";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dragen" = callPackage
@@ -78270,8 +73392,6 @@ self: {
        ];
        description = "Automatic derivation of optimized QuickCheck random generators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "draw-poker" = callPackage
@@ -78303,8 +73423,6 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A port of asciimoo's drawille to haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dresdner-verkehrsbetriebe" = callPackage
@@ -78327,8 +73445,6 @@ self: {
        ];
        description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "drifter" = callPackage
@@ -78345,8 +73461,6 @@ self: {
        ];
        description = "Simple schema management for arbitrary databases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "drifter-postgresql" = callPackage
@@ -78367,8 +73481,6 @@ self: {
        ];
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "drifter-sqlite" = callPackage
@@ -78388,8 +73500,6 @@ self: {
        ];
        description = "SQLite support for the drifter schema migraiton tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "drinkery" = callPackage
@@ -78414,8 +73524,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A Haskell bindings to the DRMAA C library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {drmaa = null;};
 
   "drone" = callPackage
@@ -78434,8 +73542,6 @@ self: {
          microlens req servant-server text warp
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dropbox" = callPackage
@@ -78485,8 +73591,6 @@ self: {
        ];
        description = "A library to access the Dropbox HTTP API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dropsolve" = callPackage
@@ -78505,8 +73609,6 @@ self: {
        ];
        description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "drunken-bishop" = callPackage
@@ -78536,8 +73638,6 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A subset of the miniKanren language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dsc" = callPackage
@@ -78584,8 +73684,6 @@ self: {
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dsmc" = callPackage
@@ -78603,8 +73701,6 @@ self: {
        ];
        description = "DSMC library for rarefied gas dynamics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dsmc-tools" = callPackage
@@ -78624,8 +73720,6 @@ self: {
        ];
        description = "DSMC toolkit for rarefied gas dynamics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dson" = callPackage
@@ -78637,8 +73731,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Haskell Doge Serialized Object Notation Parser";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dson-parsec" = callPackage
@@ -78650,8 +73742,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "DSON parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dsp" = callPackage
@@ -78677,8 +73767,6 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols dlist ];
        description = "Difference strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dsv" = callPackage
@@ -78740,8 +73828,6 @@ self: {
        ];
        description = "Parse and render DTD files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dtd-text" = callPackage
@@ -78757,8 +73843,6 @@ self: {
        ];
        description = "Parse and render XML DTDs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dtd-types" = callPackage
@@ -78800,8 +73884,6 @@ self: {
        ];
        description = "(Fast) Dynamic Time Warping";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dual" = callPackage
@@ -78834,8 +73916,6 @@ self: {
        ];
        description = "Network multiplayer 2D shooting game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dual-tree" = callPackage
@@ -78870,8 +73950,6 @@ self: {
        ];
        description = "Automatically generate dual constructions";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dublincore-xml-conduit" = callPackage
@@ -78955,8 +74033,6 @@ self: {
        ];
        description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers to teach Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dumb-cas" = callPackage
@@ -78976,8 +74052,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A computer “algebra” system that knows nothing about algebra, at the core";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dump" = callPackage
@@ -79015,8 +74089,6 @@ self: {
        ];
        description = "A plug-in for rendering GHC core";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dunai" = callPackage
@@ -79047,8 +74119,6 @@ self: {
        ];
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dunai-test" = callPackage
@@ -79062,8 +74132,6 @@ self: {
        ];
        description = "Testing library for Dunai";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "duplo" = callPackage
@@ -79100,8 +74168,6 @@ self: {
        ];
        description = "Frontend development build tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dura" = callPackage
@@ -79115,8 +74181,6 @@ self: {
        libraryHaskellDepends = [ base bytestring directory filepath ];
        description = "durable/atomic file system writes (from rio package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "duration" = callPackage
@@ -79173,8 +74237,6 @@ self: {
        ];
        description = "Dead simple password manager";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dvda" = callPackage
@@ -79197,8 +74259,6 @@ self: {
        ];
        description = "Efficient automatic differentiation and code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dvdread" = callPackage
@@ -79212,8 +74272,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A monadic interface to libdvdread";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {dvdread = null;};
 
   "dvi-processing" = callPackage
@@ -79225,8 +74283,6 @@ self: {
        libraryHaskellDepends = [ base bytestring filepath transformers ];
        description = "Read/write DVI and TFM file";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dvorak" = callPackage
@@ -79251,8 +74307,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for DWARF debug format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dwarf-el" = callPackage
@@ -79287,8 +74341,6 @@ self: {
        executableHaskellDepends = [ base containers dwarf-el ];
        description = "High-level wrapper around the dwarf library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dwergaz" = callPackage
@@ -79301,8 +74353,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A minimal testing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dx9base" = callPackage
@@ -79357,8 +74407,6 @@ self: {
        testHaskellDepends = [ ansi-terminal base hspec text ];
        description = "A library for working with binary Dyck words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dyepack" = callPackage
@@ -79372,8 +74420,6 @@ self: {
        libraryHaskellDepends = [ base generics-sop ];
        description = "Programatically identify space leaks in your program";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynamic" = callPackage
@@ -79411,8 +74457,6 @@ self: {
        ];
        description = "Access the functions from the Cabal library without depending on it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynamic-graph" = callPackage
@@ -79429,8 +74473,6 @@ self: {
        ];
        description = "Draw and update graphs in real time with OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynamic-graphs" = callPackage
@@ -79458,8 +74500,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion primitive ];
        description = "Dynamic graph algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynamic-linker-template" = callPackage
@@ -79498,8 +74538,6 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "A wrapper around MVector that enables pushing, popping and extending";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynamic-object" = callPackage
@@ -79518,8 +74556,6 @@ self: {
        ];
        description = "Object-oriented programming with duck typing and singleton classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynamic-plot" = callPackage
@@ -79546,8 +74582,6 @@ self: {
        ];
        description = "Interactive diagram windows";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynamic-pp" = callPackage
@@ -79568,8 +74602,6 @@ self: {
        ];
        description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynamic-state" = callPackage
@@ -79612,8 +74644,6 @@ self: {
        ];
        description = "Typesafe library for working with DynamoDB database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynloader" = callPackage
@@ -79626,8 +74656,6 @@ self: {
        testHaskellDepends = [ base ghc ghc-paths hspec ];
        description = "Dynamically runtime loading packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynobud" = callPackage
@@ -79659,8 +74687,6 @@ self: {
        ];
        description = "your dynamic optimization buddy";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dyre" = callPackage
@@ -79688,8 +74714,6 @@ self: {
        libraryHaskellDepends = [ base bytestring transformers ];
        description = "Bindings to the dywapitchtrack pitch tracking library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dzen-dhall" = callPackage
@@ -79725,8 +74749,6 @@ self: {
        ];
        description = "Configure dzen2 bars in Dhall language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dzen-utils" = callPackage
@@ -79738,8 +74760,6 @@ self: {
        libraryHaskellDepends = [ base colour process ];
        description = "Utilities for creating inputs for dzen";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "each" = callPackage
@@ -79799,8 +74819,6 @@ self: {
        testHaskellDepends = [ base filepath hspec ];
        description = "Ear Clipping Triangulation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "earcut" = callPackage
@@ -79823,8 +74841,6 @@ self: {
        libraryHaskellDepends = [ base data-default ];
        description = "Robert Penner's easing equations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "easy-api" = callPackage
@@ -79840,8 +74856,6 @@ self: {
        ];
        description = "Utility code for building HTTP API bindings more quickly";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "easy-bitcoin" = callPackage
@@ -79859,8 +74873,6 @@ self: {
        ];
        description = "types and functions for bitcoin applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "easy-file" = callPackage
@@ -79887,8 +74899,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "easyplot" = callPackage
@@ -79900,8 +74910,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "A tiny plotting library, utilizes gnuplot for plotting";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "easyrender" = callPackage
@@ -79964,8 +74972,6 @@ self: {
        ];
        description = "Simple, expressive testing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ebeats" = callPackage
@@ -79977,8 +74983,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Time in ebeats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ebnf-bff" = callPackage
@@ -79997,8 +75001,6 @@ self: {
        ];
        description = "Parser combinators & EBNF, BFFs!";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ec2-signature" = callPackage
@@ -80066,8 +75068,6 @@ self: {
        libraryHaskellDepends = [ base bytestring eccrypto ];
        description = "provides \"ed25519\" API using \"eccrypto\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ecdsa" = callPackage
@@ -80117,8 +75117,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A ECMA-262 interpreter library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ecstasy" = callPackage
@@ -80152,8 +75150,6 @@ self: {
        executableSystemDepends = [ canlib ];
        description = "Tools for automotive ECU development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {canlib = null;};
 
   "ed25519" = callPackage
@@ -80201,8 +75197,6 @@ self: {
        ];
        description = "Command line file filtering with haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ede" = callPackage
@@ -80240,8 +75234,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq parallel ];
        description = "Semi-explicit parallel programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edenskel" = callPackage
@@ -80253,8 +75245,6 @@ self: {
        libraryHaskellDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edentv" = callPackage
@@ -80275,8 +75265,6 @@ self: {
        ];
        description = "A Tool to Visualize Parallel Functional Program Executions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edf" = callPackage
@@ -80306,8 +75294,6 @@ self: {
        ];
        description = "Top view space combat arcade game";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edges" = callPackage
@@ -80335,8 +75321,6 @@ self: {
        ];
        description = "Tools for efficient immutable graphs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edis" = callPackage
@@ -80368,8 +75352,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A monad for rewriting things";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edit-distance" = callPackage
@@ -80441,8 +75423,6 @@ self: {
        ];
        description = "Symmetric, stateful edit lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edit-lenses-demo" = callPackage
@@ -80467,8 +75447,6 @@ self: {
        libraryHaskellDepends = [ base text vty vty-ui ];
        description = "Interactive editors for Generics";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "editline" = callPackage
@@ -80480,8 +75458,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bindings to the editline library (libedit)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "editor-open" = callPackage
@@ -80539,8 +75515,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        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;
-       broken = true;
      }) {};
 
   "effect-monad" = callPackage
@@ -80552,8 +75526,6 @@ self: {
        libraryHaskellDepends = [ base type-level-sets ];
        description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "effect-stack" = callPackage
@@ -80565,8 +75537,6 @@ self: {
        libraryHaskellDepends = [ base constraints mtl transformers ];
        description = "Reducing the pain of transformer stacks with duplicated effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "effective-aspects" = callPackage
@@ -80662,8 +75632,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A Typeable-free implementation of extensible effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "egison" = callPackage
@@ -80774,8 +75742,6 @@ self: {
        ];
        description = "A quasi quotes for using Egison expression in Haskell code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "egison-tutorial" = callPackage
@@ -80794,8 +75760,6 @@ self: {
        ];
        description = "A tutorial program for the Egison programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "egyptian-fractions" = callPackage
@@ -80825,8 +75789,6 @@ self: {
        ];
        description = "like eruby, ehaskell is embedded haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ehs" = callPackage
@@ -80847,8 +75809,6 @@ self: {
        ];
        description = "Embedded haskell template using quasiquotes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eibd-client-simple" = callPackage
@@ -80867,8 +75827,6 @@ self: {
        librarySystemDepends = [ eibclient ];
        description = "EIBd Client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {eibclient = null;};
 
   "eigen" = callPackage
@@ -80888,8 +75846,6 @@ self: {
        ];
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "either" = callPackage
@@ -80960,8 +75916,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Functions for probing and unwrapping values inside of Either";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eithers" = callPackage
@@ -80993,8 +75947,6 @@ self: {
        ];
        description = "Binding to EJDB2 C library, an embedded JSON noSQL database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ejdb2 = null; libejdb2 = null;};
 
   "ekg" = callPackage
@@ -81032,8 +75984,6 @@ self: {
        ];
        description = "Send ekg metrics to a Bosun instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-carbon" = callPackage
@@ -81050,8 +76000,6 @@ self: {
        ];
        description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-cloudwatch" = callPackage
@@ -81103,8 +76051,6 @@ self: {
        ];
        description = "Push metrics to elastic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-elasticsearch" = callPackage
@@ -81122,8 +76068,6 @@ self: {
        ];
        description = "Push metrics to elasticsearch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-influxdb" = callPackage
@@ -81172,8 +76116,6 @@ self: {
        ];
        description = "Push metrics to a log file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-prometheus-adapter" = callPackage
@@ -81210,8 +76152,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "ekg-rrd" = callPackage
@@ -81232,8 +76172,6 @@ self: {
        ];
        description = "Passes ekg statistics to rrdtool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-statsd" = callPackage
@@ -81269,8 +76207,6 @@ self: {
        ];
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elbow" = callPackage
@@ -81333,8 +76269,6 @@ self: {
        executableHaskellDepends = [ base elerea GLFW OpenGL ];
        description = "Example applications for Elerea";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elerea-sdl" = callPackage
@@ -81358,8 +76292,6 @@ self: {
        libraryHaskellDepends = [ base extensible transformers ];
        description = "Immediately lifts to a desired level";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elf" = callPackage
@@ -81406,8 +76338,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Arrows with holes";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elliptic-curve" = callPackage
@@ -81756,8 +76686,6 @@ self: {
        doHaddock = false;
        description = "Crossing the road between Haskell and Elm";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elm-syntax" = callPackage
@@ -81807,8 +76735,6 @@ self: {
        ];
        description = "Generate ELM code from a Wai websocket application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elm-yesod" = callPackage
@@ -81940,8 +76866,6 @@ self: {
        ];
        description = "Validate and (optionally) redo ELynx analyses";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elynx-markov" = callPackage
@@ -81964,8 +76888,6 @@ self: {
        ];
        description = "Simulate molecular sequences along trees";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elynx-nexus" = callPackage
@@ -81978,8 +76900,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Import and export Nexus files";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elynx-seq" = callPackage
@@ -82000,8 +76920,6 @@ self: {
        ];
        description = "Handle molecular sequences";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elynx-tools" = callPackage
@@ -82024,8 +76942,6 @@ self: {
        ];
        description = "Tools for ELynx";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elynx-tree" = callPackage
@@ -82052,8 +76968,6 @@ self: {
        ];
        description = "Handle phylogenetic trees";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "emacs-keys" = callPackage
@@ -82072,8 +76986,6 @@ self: {
        ];
        description = "library to parse emacs style keybinding into the modifiers and the chars";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "emacs-module" = callPackage
@@ -82109,8 +77021,6 @@ self: {
        ];
        description = "Sending eMail in Haskell made easy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "email-header" = callPackage
@@ -82132,8 +77042,6 @@ self: {
        ];
        description = "Parsing and rendering of email and MIME headers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "email-postmark" = callPackage
@@ -82149,8 +77057,6 @@ self: {
        ];
        description = "A simple wrapper to send emails via the api of the service postmark (http://postmarkapp.com/)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "email-validate" = callPackage
@@ -82245,8 +77151,6 @@ self: {
        ];
        description = "An email parser that will parse everything";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "embeddock" = callPackage
@@ -82263,8 +77167,6 @@ self: {
        ];
        description = "Embed the values in scope in the haddock documentation of the module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "embeddock-example" = callPackage
@@ -82276,8 +77178,6 @@ self: {
        libraryHaskellDepends = [ base embeddock time ];
        description = "Example of using embeddock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "embla" = callPackage
@@ -82289,8 +77189,6 @@ self: {
        libraryHaskellDepends = [ base chronos ];
        description = "execute actions periodically while avoiding drift";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "embroidery" = callPackage
@@ -82309,8 +77207,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "support for embroidery formats in haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "emd" = callPackage
@@ -82353,8 +77249,6 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck syb ];
        description = "Extensible and Modular Generics for the Masses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "emoji" = callPackage
@@ -82407,8 +77301,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A container that always has no values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enchant" = callPackage
@@ -82425,8 +77317,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Binding to the Enchant library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) enchant;};
 
   "enclosed-exceptions" = callPackage
@@ -82484,8 +77374,6 @@ self: {
        testHaskellDepends = [ base bytestring HUnit QuickCheck ];
        description = "A library for various character encodings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "encoding-io" = callPackage
@@ -82499,8 +77387,6 @@ self: {
        ];
        description = "Encoding-aware file I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "encryptable" = callPackage
@@ -82524,8 +77410,6 @@ self: {
        ];
        description = "Typed encryption with persistent support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "endo" = callPackage
@@ -82582,8 +77466,6 @@ self: {
        ];
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "engine-io-growler" = callPackage
@@ -82602,8 +77484,6 @@ self: {
          unordered-containers wai wai-websockets websockets
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "engine-io-snap" = callPackage
@@ -82620,8 +77500,6 @@ self: {
          snap-core unordered-containers websockets websockets-snap
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "engine-io-wai" = callPackage
@@ -82640,8 +77518,6 @@ self: {
        ];
        description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "engine-io-yesod" = callPackage
@@ -82658,8 +77534,6 @@ self: {
          unordered-containers wai wai-websockets websockets yesod-core
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "engineering-units" = callPackage
@@ -82687,8 +77561,6 @@ self: {
        executableHaskellDepends = [ base matrix quipper-core ];
        description = "An application (and library) to convert quipper circuits into Qpmc models";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "entropy" = callPackage
@@ -82732,8 +77604,6 @@ self: {
        ];
        description = "entwine - Concurrency tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enum-subset-generate" = callPackage
@@ -82766,8 +77636,6 @@ self: {
        ];
        description = "A text rendering and parsing toolkit for enumerated types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enum-text-rio" = callPackage
@@ -82784,8 +77652,6 @@ self: {
        ];
        description = "Making fmt available with rio";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enum-types" = callPackage
@@ -82813,8 +77679,6 @@ self: {
        ];
        description = "An experimental Utf8 parsing toolkit for enumerated types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumerable" = callPackage
@@ -82845,8 +77709,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "enumerate all the values in a finite type (automatically)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumerate-function" = callPackage
@@ -82867,8 +77729,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        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;
-       broken = true;
      }) {};
 
   "enumeration" = callPackage
@@ -82901,8 +77761,6 @@ self: {
        ];
        description = "Reliable, high-performance processing with left-fold enumerators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumerator-fd" = callPackage
@@ -82914,8 +77772,6 @@ self: {
        libraryHaskellDepends = [ base enumerator mtl ];
        description = "Enumerator instances for monads-fd classes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumerator-tf" = callPackage
@@ -82927,8 +77783,6 @@ self: {
        libraryHaskellDepends = [ base enumerator monads-tf ];
        description = "Enumerator instances for monads-tf classes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumfun" = callPackage
@@ -82940,8 +77794,6 @@ self: {
        libraryHaskellDepends = [ base enummapset-th ];
        description = "Finitely represented /total/ EnumMaps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enummapmap" = callPackage
@@ -82966,8 +77818,6 @@ self: {
        ];
        description = "Map of maps using Enum types as keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enummaps" = callPackage
@@ -83010,8 +77860,6 @@ self: {
        ];
        description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumset" = callPackage
@@ -83044,8 +77892,6 @@ self: {
        ];
        description = "Safe helpers for accessing and modifying environment variables";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "env-locale" = callPackage
@@ -83075,8 +77921,6 @@ self: {
        ];
        description = "Pull configuration information from the ENV";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "envelope" = callPackage
@@ -83124,8 +77968,6 @@ self: {
        ];
        description = "Display efficiently the state of the local environment";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "envy" = callPackage
@@ -83173,8 +78015,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell binding for EPANET";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "epass" = callPackage
@@ -83186,8 +78026,6 @@ self: {
        libraryHaskellDepends = [ base stm time ];
        description = "Baisc, Erlang-like message passing supporting sockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "epi-sim" = callPackage
@@ -83225,8 +78063,6 @@ self: {
        ];
        description = "Compiler for a simple functional language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "epoll" = callPackage
@@ -83240,8 +78076,6 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "epoll bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eprocess" = callPackage
@@ -83254,8 +78088,6 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl ];
        description = "Basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "epub" = callPackage
@@ -83333,8 +78165,6 @@ self: {
        ];
        description = "Rename epub ebook files based on meta information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eq" = callPackage
@@ -83478,8 +78308,6 @@ self: {
        libraryHaskellDepends = [ base polynomial ];
        description = "Native Haskell implementation of the interface from the erf package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "erlang" = callPackage
@@ -83495,8 +78323,6 @@ self: {
        ];
        description = "FFI interface to Erlang";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eros" = callPackage
@@ -83509,8 +78335,6 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "A text censorship library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eros-client" = callPackage
@@ -83529,8 +78353,6 @@ self: {
        ];
        description = "DEPRECATED in favor of eros-http";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eros-http" = callPackage
@@ -83550,8 +78372,6 @@ self: {
        ];
        description = "JSON HTTP interface to Eros";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "errata" = callPackage
@@ -83601,8 +78421,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Error code functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "error-context" = callPackage
@@ -83625,8 +78443,6 @@ self: {
        ];
        description = "Provides API for enriching errors with contexts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "error-continuations" = callPackage
@@ -83638,8 +78454,6 @@ self: {
        libraryHaskellDepends = [ base either mtl transformers ];
        description = "Error Continuations";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "error-list" = callPackage
@@ -83651,8 +78465,6 @@ self: {
        libraryHaskellDepends = [ base mtl text text-render ];
        description = "A useful type for collecting error messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "error-loc" = callPackage
@@ -83664,8 +78476,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "An error replacement with call-site metadata";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "error-location" = callPackage
@@ -83692,8 +78502,6 @@ self: {
        ];
        description = "Composable error messages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "error-or" = callPackage
@@ -83716,8 +78524,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Set of utils and operators for error handling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "errorcall-eq-instance" = callPackage
@@ -83764,8 +78570,6 @@ self: {
        ];
        description = "`bracket`-like functions for `ExceptT` over `IO` monad";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ersaconcat" = callPackage
@@ -83789,8 +78593,6 @@ self: {
        ];
        description = "A script to concatenate AIP ERSA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ersatz" = callPackage
@@ -83817,8 +78619,6 @@ self: {
        testHaskellDepends = [ array base directory doctest filepath ];
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ersatz-toysat" = callPackage
@@ -83836,8 +78636,6 @@ self: {
        ];
        description = "toysat driver as backend for ersatz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ert" = callPackage
@@ -83860,8 +78658,6 @@ self: {
        ];
        description = "Easy Runtime Templates";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "escape-artist" = callPackage
@@ -83925,8 +78721,6 @@ self: {
        doHaddock = false;
        description = "Terminal fuzzy selector";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "esotericbot" = callPackage
@@ -83950,8 +78744,6 @@ self: {
        doHaddock = false;
        description = "Esotericbot is a sophisticated, lightweight IRC bot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "espial" = callPackage
@@ -84016,8 +78808,6 @@ self: {
        ];
        description = "Espial is an open-source, web-based bookmarking server";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "esqueleto" = callPackage
@@ -84057,8 +78847,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The type-level S combinator in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "essence-of-live-coding" = callPackage
@@ -84115,8 +78903,6 @@ self: {
        ];
        description = "General purpose live coding framework - Gloss example";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "essence-of-live-coding-pulse" = callPackage
@@ -84150,8 +78936,6 @@ self: {
        ];
        description = "General purpose live coding framework - pulse backend example";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "essence-of-live-coding-quickcheck" = callPackage
@@ -84184,8 +78968,6 @@ self: {
        testHaskellDepends = [ base essence-of-live-coding http-client ];
        description = "General purpose live coding framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "estimator" = callPackage
@@ -84216,8 +78998,6 @@ self: {
        ];
        description = "Tool for managing probability estimation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "estreps" = callPackage
@@ -84234,8 +79014,6 @@ self: {
        ];
        description = "Repeats from ESTs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "etc" = callPackage
@@ -84288,8 +79066,6 @@ self: {
        ];
        description = "everything breaking the Fairbairn threshold";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eternity" = callPackage
@@ -84310,8 +79086,6 @@ self: {
        ];
        description = "Native event-sourcing database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eternity-timestamped" = callPackage
@@ -84329,8 +79103,6 @@ self: {
        ];
        description = "Automatic timestamping for Eternity";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ether" = callPackage
@@ -84359,8 +79131,6 @@ self: {
        ];
        description = "Monad transformers and classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ethereum-analyzer" = callPackage
@@ -84384,8 +79154,6 @@ self: {
        ];
        description = "A Ethereum contract analyzer";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ethereum-analyzer-cli" = callPackage
@@ -84413,8 +79181,6 @@ self: {
        ];
        description = "A CLI frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ethereum-analyzer-deps" = callPackage
@@ -84460,8 +79226,6 @@ self: {
        ];
        description = "A web frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ethereum-client-haskell" = callPackage
@@ -84490,8 +79254,6 @@ self: {
        ];
        description = "A Haskell version of an Ethereum client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ethereum-merkle-patricia-db" = callPackage
@@ -84516,8 +79278,6 @@ self: {
        ];
        description = "A modified Merkle Patricia DB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ethereum-rlp" = callPackage
@@ -84552,8 +79312,6 @@ self: {
        ];
        description = "Ethereum Recursive Length Prefix Encoding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ety" = callPackage
@@ -84610,8 +79368,6 @@ self: {
        ];
        description = "Euler tour trees";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "euphoria" = callPackage
@@ -84636,8 +79392,6 @@ self: {
        ];
        description = "Dynamic network FRP with events and continuous values";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eurofxref" = callPackage
@@ -84655,8 +79409,6 @@ self: {
        ];
        description = "Free foreign exchange/currency feed from the European Central Bank";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "evdev" = callPackage
@@ -84708,8 +79460,6 @@ self: {
        ];
        description = "An extensible event framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eve-cli" = callPackage
@@ -84726,8 +79476,6 @@ self: {
        ];
        testHaskellDepends = [ base bytestring eve lens mtl text vty ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eveff" = callPackage
@@ -84752,8 +79500,6 @@ self: {
        ];
        description = "Monoidal, monadic and first-class events";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "event-driven" = callPackage
@@ -84765,8 +79511,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf yjtools ];
        description = "library for event driven programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "event-handlers" = callPackage
@@ -84813,8 +79557,6 @@ self: {
        ];
        description = "Event-graph simulation monad transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "event-transformer" = callPackage
@@ -84875,8 +79617,6 @@ self: {
        ];
        description = "Library for eventful DynamoDB event stores";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventful-memory" = callPackage
@@ -84918,8 +79658,6 @@ self: {
        ];
        description = "Postgres implementations for eventful";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventful-sql-common" = callPackage
@@ -84938,8 +79676,6 @@ self: {
        ];
        description = "Common library for SQL event stores";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventful-sqlite" = callPackage
@@ -84962,8 +79698,6 @@ self: {
        ];
        description = "SQLite implementations for eventful";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventful-test-helpers" = callPackage
@@ -85001,8 +79735,6 @@ self: {
        executableHaskellDepends = [ aeson base filepath text ];
        description = "Visualise an eventlog";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventloop" = callPackage
@@ -85021,8 +79753,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "eventsource-api" = callPackage
@@ -85066,8 +79796,6 @@ self: {
        ];
        description = "GetEventStore store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventsource-store-specs" = callPackage
@@ -85198,8 +79926,6 @@ self: {
        description = "EventStore TCP Client";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "every" = callPackage
@@ -85222,8 +79948,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "A functional pearl on encoding and decoding using question-and-answer strategies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ewe" = callPackage
@@ -85243,8 +79967,6 @@ self: {
        executableToolDepends = [ alex happy uuagc ];
        description = "An interpreter for EWE programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ex-pool" = callPackage
@@ -85285,8 +80007,6 @@ self: {
        testHaskellDepends = [ base containers tasty tasty-hunit ];
        description = "Efficient exact cover solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exact-pi" = callPackage
@@ -85336,8 +80056,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Framework for Exact Real Arithmetic in the Positional Number System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "example-haskell-project" = callPackage
@@ -85365,8 +80083,6 @@ self: {
        libraryHaskellDepends = [ base exceptions transformers ];
        description = "Safely deal with exceptions in ExceptT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exception-hierarchy" = callPackage
@@ -85404,8 +80120,6 @@ self: {
        ];
        description = "Exception monad transformer instances for monads-fd classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exception-monads-tf" = callPackage
@@ -85473,8 +80187,6 @@ self: {
        libraryHaskellDepends = [ base exceptions ];
        description = "Essentially the Maybe type with error messages";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exceptionfree-readfile" = callPackage
@@ -85490,8 +80202,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "An exception-free readFile for use with '+RTS -xc -RTS' projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exceptions_0_10_4" = callPackage
@@ -85543,8 +80253,6 @@ self: {
        ];
        description = "A Haskell client for https://exchangeratesapi.io/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "execs" = callPackage
@@ -85559,8 +80267,6 @@ self: {
        executableHaskellDepends = [ base directory process text ];
        description = "Tool to run stack exec prj-exe more easy";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "executable-hash" = callPackage
@@ -85608,8 +80314,6 @@ self: {
        testHaskellDepends = [ async base doctest hspec process ];
        description = "Shell helpers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exference" = callPackage
@@ -85640,8 +80344,6 @@ self: {
        ];
        description = "Tool to search/generate (haskell) expressions with a given type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exhaustive" = callPackage
@@ -85680,8 +80382,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Exheres generator for cabal packages";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exif" = callPackage
@@ -85694,8 +80394,6 @@ self: {
        librarySystemDepends = [ exif ];
        description = "A Haskell binding to a subset of libexif";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) exif;};
 
   "exiftool" = callPackage
@@ -85715,8 +80413,6 @@ self: {
        ];
        description = "Haskell bindings to ExifTool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exigo-schema" = callPackage
@@ -85763,8 +80459,6 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exinst-aeson" = callPackage
@@ -85783,8 +80477,6 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exinst-bytes" = callPackage
@@ -85805,8 +80497,6 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exinst-cereal" = callPackage
@@ -85826,8 +80516,6 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exinst-deepseq" = callPackage
@@ -85839,8 +80527,6 @@ self: {
        libraryHaskellDepends = [ base constraints deepseq exinst ];
        description = "Derive instances for the `deepseq` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exinst-hashable" = callPackage
@@ -85854,8 +80540,6 @@ self: {
        ];
        description = "Derive instances for the `hashable` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exinst-serialise" = callPackage
@@ -85874,8 +80558,6 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exist" = callPackage
@@ -85935,8 +80617,6 @@ self: {
        libraryHaskellDepends = [ base contravariant ];
        description = "Existential datatypes holding evidence of constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exit-codes" = callPackage
@@ -85968,8 +80648,6 @@ self: {
        ];
        description = "Monad transformer for exit codes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exomizer" = callPackage
@@ -86069,8 +80747,6 @@ self: {
        ];
        description = "Extensible Pandoc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "expat-enumerator" = callPackage
@@ -86086,8 +80762,6 @@ self: {
        ];
        description = "Enumerator-based API for Expat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "expiring-cache-map" = callPackage
@@ -86129,8 +80803,6 @@ self: {
        ];
        description = "Expiring containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "expiring-mvar" = callPackage
@@ -86157,8 +80829,6 @@ self: {
        ];
        description = "Show how expressions are parsed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explicit-constraint-lens" = callPackage
@@ -86173,8 +80843,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Fully-flexible polymorphic lenses, without any bizarre profunctors";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explicit-determinant" = callPackage
@@ -86186,8 +80854,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "explicit computation of determinant of small matrices";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explicit-exception" = callPackage
@@ -86212,8 +80878,6 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols tagged ];
        description = "File handles with explicit IOModes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explicit-iomodes-bytestring" = callPackage
@@ -86225,8 +80889,6 @@ self: {
        libraryHaskellDepends = [ base bytestring explicit-iomodes ];
        description = "Extends explicit-iomodes with ByteString operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explicit-iomodes-text" = callPackage
@@ -86238,8 +80900,6 @@ self: {
        libraryHaskellDepends = [ base explicit-iomodes text ];
        description = "Extends explicit-iomodes with Text operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explicit-sharing" = callPackage
@@ -86253,8 +80913,6 @@ self: {
        ];
        description = "Explicit Sharing of Monadic Effects";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explore" = callPackage
@@ -86268,8 +80926,6 @@ self: {
        executableHaskellDepends = [ array base directory pngload ];
        description = "Experimental Plot data Reconstructor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exposed-containers" = callPackage
@@ -86290,8 +80946,6 @@ self: {
        ];
        description = "A distribution of the 'containers' package, with all modules exposed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "express" = callPackage
@@ -86316,8 +80970,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generalization of parsec's expression parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "expressions" = callPackage
@@ -86335,8 +80987,6 @@ self: {
        testHaskellDepends = [ base singletons text ];
        description = "Expressions and Formulae a la carte";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "expressions-z3" = callPackage
@@ -86355,8 +81005,6 @@ self: {
        ];
        description = "Encode and Decode expressions from Z3 ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "expresso" = callPackage
@@ -86385,8 +81033,6 @@ self: {
        ];
        description = "A simple expressions language based on row types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extcore" = callPackage
@@ -86404,8 +81050,6 @@ self: {
        ];
        description = "Libraries for processing GHC Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extemp" = callPackage
@@ -86428,8 +81072,6 @@ self: {
        ];
        description = "automated printing for extemp speakers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extend-record-data-th" = callPackage
@@ -86453,8 +81095,6 @@ self: {
        libraryHaskellDepends = [ base constraints ghc-prim tagged ];
        description = "Extended Categories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extended-containers" = callPackage
@@ -86532,8 +81172,6 @@ self: {
        ];
        description = "Sums/products/lists/trees which can be extended in other modules";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extensible-effects" = callPackage
@@ -86591,8 +81229,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Message passing concurrency as extensible-effect";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extensible-exceptions" = callPackage
@@ -86622,8 +81258,6 @@ self: {
        testHaskellDepends = [ base extensible ];
        description = "Operational-based extensible effect library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extensible-sp" = callPackage
@@ -86675,8 +81309,6 @@ self: {
        ];
        description = "Sort large arrays on your hard drive. Kind of like the unix util sort.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extra" = callPackage
@@ -86715,8 +81347,6 @@ self: {
        ];
        description = "Given a hackage package outputs the list of its dependencies";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extractable-singleton" = callPackage
@@ -86746,8 +81376,6 @@ self: {
        ];
        description = "Extract an ELF's metadata and sections into files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extralife" = callPackage
@@ -86763,8 +81391,6 @@ self: {
        ];
        description = "API Client for ExtraLife team and user data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extrapolate" = callPackage
@@ -86804,8 +81430,6 @@ self: {
        ];
        description = "A high level static library for working with CouchDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ez3" = callPackage
@@ -86819,8 +81443,6 @@ self: {
        libraryHaskellDepends = [ base transformers z3 ];
        description = "Z3 bonds with pure interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "f-algebra-gen" = callPackage
@@ -86832,8 +81454,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generate a special f-algebra combinator from any data type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "f-ree-hack-cheats-free-v-bucks-generator" = callPackage
@@ -86849,8 +81469,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "faceted" = callPackage
@@ -86862,8 +81480,6 @@ self: {
        libraryHaskellDepends = [ base free ];
        description = "Faceted computation for dynamic information flow security";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "factor" = callPackage
@@ -86904,8 +81520,6 @@ self: {
        ];
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "facts" = callPackage
@@ -86919,8 +81533,6 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl template-haskell ];
        description = "Refined types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "factual-api" = callPackage
@@ -86938,8 +81550,6 @@ self: {
        ];
        description = "A driver for the Factual API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fad" = callPackage
@@ -86973,8 +81583,6 @@ self: {
        ];
        description = "Minimal library for music generation and notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fadno-braids" = callPackage
@@ -86991,8 +81599,6 @@ self: {
        ];
        description = "Braid representations in Haskell";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fadno-xml" = callPackage
@@ -87007,8 +81613,6 @@ self: {
        ];
        description = "XML/XSD combinators/schemas/codegen";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fail" = callPackage
@@ -87042,8 +81646,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy streams, which might terminate with an error";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "failure" = callPackage
@@ -87071,8 +81673,6 @@ self: {
        ];
        description = "Failure Detectors implimented in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fair" = callPackage
@@ -87130,8 +81730,6 @@ self: {
        librarySystemDepends = [ libXtst ];
        description = "A crossplatform library to simulate keyboard input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.xorg) libXtst;};
 
   "fakedata" = callPackage
@@ -87253,8 +81851,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Faktory Worker for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fallible" = callPackage
@@ -87285,8 +81881,6 @@ self: {
        ];
        description = "Falling sand game/cellular automata simulation using regular parallel arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fallingblocks" = callPackage
@@ -87305,8 +81899,6 @@ self: {
        ];
        description = "A fun falling blocks game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "familiar-reflection" = callPackage
@@ -87334,8 +81926,6 @@ self: {
        ];
        description = "A family tree library for the Haskell programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "farmhash" = callPackage
@@ -87365,8 +81955,6 @@ self: {
        doHaddock = false;
        description = "Fast functions on integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fast-builder" = callPackage
@@ -87404,8 +81992,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Fast combinatorics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fast-digits" = callPackage
@@ -87425,8 +82011,6 @@ self: {
        doHaddock = false;
        description = "Integer-to-digits conversion";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fast-downward" = callPackage
@@ -87494,8 +82078,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Natural Numbers with no overhead";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fast-tags" = callPackage
@@ -87565,8 +82147,6 @@ self: {
        ];
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fastbayes" = callPackage
@@ -87578,8 +82158,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix vector ];
        description = "Bayesian modeling algorithms accelerated for particular model structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fastcgi" = callPackage
@@ -87613,8 +82191,6 @@ self: {
        ];
        description = "find nearest neighbours by edit-distance";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fastirc" = callPackage
@@ -87631,8 +82207,6 @@ self: {
        ];
        description = "Fast Internet Relay Chat (IRC) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fastly" = callPackage
@@ -87652,8 +82226,6 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "A highly experimental Fastly API client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fastparser" = callPackage
@@ -87672,8 +82244,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A fast, but bare bones, bytestring parser combinators library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fastpbkdf2" = callPackage
@@ -87727,8 +82297,6 @@ self: {
        ];
        description = "Utilities for working with DuckDuckHack's FatHead Instant Answers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fault-tree" = callPackage
@@ -87740,8 +82308,6 @@ self: {
        libraryHaskellDepends = [ base yices ];
        description = "A fault tree analysis library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay" = callPackage
@@ -87772,8 +82338,6 @@ self: {
        executableHaskellDepends = [ base mtl optparse-applicative split ];
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-base" = callPackage
@@ -87786,8 +82350,6 @@ self: {
        libraryHaskellDepends = [ base fay ];
        description = "The base package for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-builder" = callPackage
@@ -87805,8 +82367,6 @@ self: {
        ];
        description = "Compile Fay code on cabal install, and ad-hoc recompile during development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-dom" = callPackage
@@ -87821,8 +82381,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "DOM FFI wrapper library for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-geoposition" = callPackage
@@ -87835,8 +82393,6 @@ self: {
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "W3C compliant implementation of GeoPosition API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-hsx" = callPackage
@@ -87849,8 +82405,6 @@ self: {
        libraryHaskellDepends = [ fay-base fay-jquery ];
        description = "Clientside HTML generation for fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-jquery" = callPackage
@@ -87863,8 +82417,6 @@ self: {
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "jQuery bindings for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-ref" = callPackage
@@ -87877,8 +82429,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Like IORef but for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-simplejson" = callPackage
@@ -87891,8 +82441,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "SimpleJSON library for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-text" = callPackage
@@ -87907,8 +82455,6 @@ self: {
        libraryHaskellDepends = [ fay fay-base text ];
        description = "Fay Text type represented as JavaScript strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-uri" = callPackage
@@ -87921,8 +82467,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Persistent FFI bindings for using jsUri in Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-websockets" = callPackage
@@ -87935,8 +82479,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Websockets FFI library for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fb" = callPackage
@@ -87974,8 +82516,6 @@ self: {
        libraryHaskellDepends = [ base cereal fb persistent text time ];
        description = "Provides Persistent instances to Facebook types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fbmessenger-api" = callPackage
@@ -88004,8 +82544,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring filepath hspec text ];
        description = "High-level bindings to Facebook Messenger Platform API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fca" = callPackage
@@ -88022,8 +82560,6 @@ self: {
        ];
        description = "Algo for Formal Concept Analysis";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fcache" = callPackage
@@ -88040,8 +82576,6 @@ self: {
        testHaskellDepends = [ base hspec mtl ];
        description = "Cache a function (a -> b)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fcd" = callPackage
@@ -88061,8 +82595,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A faster way to navigate directories using the command line";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fcf-containers" = callPackage
@@ -88078,8 +82610,6 @@ self: {
        testHaskellDepends = [ base doctest first-class-families Glob ];
        description = "Data structures and algorithms for first-class-families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fcg" = callPackage
@@ -88092,8 +82622,6 @@ self: {
        isExecutable = true;
        description = "TBA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fckeditor" = callPackage
@@ -88105,8 +82633,6 @@ self: {
        libraryHaskellDepends = [ base cgi HaXml xhtml ];
        description = "Server-Side Integration for FCKeditor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fclabels" = callPackage
@@ -88137,8 +82663,6 @@ self: {
        libraryHaskellDepends = [ base fclabels monadLib ];
        description = "MonadLib monadic interface for the \"fclabels\" package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fcm-client" = callPackage
@@ -88170,8 +82694,6 @@ self: {
        ];
        description = "Admin API for Firebase Cloud Messaging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fdo-notify" = callPackage
@@ -88203,8 +82725,6 @@ self: {
        ];
        description = "Utilities related to freedesktop Trash standard";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feather" = callPackage
@@ -88245,8 +82765,6 @@ self: {
        ];
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feature-flipper-postgres" = callPackage
@@ -88268,8 +82786,6 @@ self: {
        ];
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fec" = callPackage
@@ -88331,8 +82847,6 @@ self: {
        ];
        description = "Fedora image download tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fedora-packages" = callPackage
@@ -88355,8 +82869,6 @@ self: {
        ];
        description = "Haskell interface to the Fedora Packages webapp API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fee-estimate" = callPackage
@@ -88416,8 +82928,6 @@ self: {
        ];
        description = "A simple command line interface for creating and updating feeds like RSS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feed-collect" = callPackage
@@ -88435,8 +82945,6 @@ self: {
        ];
        description = "Watch RSS/Atom feeds (and do with them whatever you like)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feed-crawl" = callPackage
@@ -88453,8 +82961,6 @@ self: {
        ];
        description = "Utility for fetching feeds with redirect info and HTML link detection";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feed-gipeda" = callPackage
@@ -88493,8 +82999,6 @@ self: {
        ];
        description = "CI service around gipeda";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feed-translator" = callPackage
@@ -88516,8 +83020,6 @@ self: {
        ];
        description = "Translate syndication feeds";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feed2lj" = callPackage
@@ -88536,8 +83038,6 @@ self: {
        ];
        description = "(unsupported)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feed2twitter" = callPackage
@@ -88554,8 +83054,6 @@ self: {
        ];
        description = "Send posts from a feed to Twitter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fei-base" = callPackage
@@ -88581,8 +83079,6 @@ self: {
        executableSystemDepends = [ mxnet ];
        description = "FFI to MXNet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "fei-cocoapi" = callPackage
@@ -88611,8 +83107,6 @@ self: {
        ];
        description = "Cocodataset with cocoapi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fei-dataiter" = callPackage
@@ -88639,8 +83133,6 @@ self: {
        testHaskellDepends = [ base fei-base hspec streaming ];
        description = "mxnet dataiters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "fei-examples" = callPackage
@@ -88662,8 +83154,6 @@ self: {
        ];
        description = "fei examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fei-nn" = callPackage
@@ -88689,8 +83179,6 @@ self: {
        ];
        description = "Train a neural network with MXNet in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feldspar-compiler" = callPackage
@@ -88719,8 +83207,6 @@ self: {
        ];
        description = "Compiler for the Feldspar language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gcc_s = null;};
 
   "feldspar-language" = callPackage
@@ -88744,8 +83230,6 @@ self: {
        ];
        description = "A functional embedded language for DSP and parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feldspar-signal" = callPackage
@@ -88818,8 +83302,6 @@ self: {
        executableSystemDepends = [ raptor ];
        description = "Graph-based notetaking system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {raptor = null;};
 
   "fernet" = callPackage
@@ -88845,8 +83327,6 @@ self: {
        ];
        description = "Generate and verify HMAC-based authentication tokens";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "festung" = callPackage
@@ -88877,8 +83357,6 @@ self: {
        ];
        description = "Remote multi-db SQLCipher server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fez-conf" = callPackage
@@ -88890,8 +83368,6 @@ self: {
        libraryHaskellDepends = [ base containers regex-compat ];
        description = "Simple functions for loading config files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ffeed" = callPackage
@@ -88906,8 +83382,6 @@ self: {
        executableHaskellDepends = [ base pretty ];
        description = "Haskell binding to the FriendFeed API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fficxx" = callPackage
@@ -88929,8 +83403,6 @@ self: {
        ];
        description = "automatic C++ binding generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fficxx-runtime" = callPackage
@@ -88964,8 +83436,6 @@ self: {
        ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; 
          libavformat = null; libswscale = null;};
 
@@ -88983,8 +83453,6 @@ self: {
        ];
        description = "Tutorials on ffmpeg usage to play video/audio";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fft" = callPackage
@@ -89033,8 +83501,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "FFunctor typeclass";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fgl" = callPackage
@@ -89075,8 +83541,6 @@ self: {
        libraryHaskellDepends = [ base containers fgl ];
        description = "Graph decomposition algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fgl-visualize" = callPackage
@@ -89099,8 +83563,6 @@ self: {
        libraryHaskellDepends = [ base-noprelude integer-gmp semirings ];
        description = "fibonacci algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fibon" = callPackage
@@ -89122,8 +83584,6 @@ self: {
        ];
        description = "Tools for running and analyzing Haskell benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fibonacci" = callPackage
@@ -89155,8 +83615,6 @@ self: {
        ];
        description = "update statically hosted file in a push stule through socketed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fields" = callPackage
@@ -89172,8 +83630,6 @@ self: {
        ];
        description = "First-class record field combinators with infix record field syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fields-json" = callPackage
@@ -89201,8 +83657,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fig" = callPackage
@@ -89214,8 +83668,6 @@ self: {
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "Manipulation of FIG files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "file-collection" = callPackage
@@ -89229,8 +83681,6 @@ self: {
        ];
        description = "Provide a uniform interface over file archives and directories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "file-command-qq" = callPackage
@@ -89246,8 +83696,6 @@ self: {
        ];
        description = "Quasiquoter for system commands involving filepaths";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "file-embed" = callPackage
@@ -89318,8 +83766,6 @@ self: {
        testHaskellDepends = [ base lifted-base process ];
        description = "common functions that show file location information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "file-modules" = callPackage
@@ -89417,8 +83863,6 @@ self: {
        ];
        description = "Diffing and patching module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filelock" = callPackage
@@ -89457,8 +83901,6 @@ self: {
        libraryHaskellDepends = [ base hinotify stm ];
        description = "Block thread until a file stops being modified";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filepath_1_4_2_1" = callPackage
@@ -89505,8 +83947,6 @@ self: {
        ];
        description = "Reversable and secure encoding of object ids as filepaths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filepath-io-access" = callPackage
@@ -89518,8 +83958,6 @@ self: {
        libraryHaskellDepends = [ base base-io-access filepath ];
        description = "IO Access for filepath";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filepather" = callPackage
@@ -89536,8 +83974,6 @@ self: {
        ];
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filepattern" = callPackage
@@ -89566,8 +84002,6 @@ self: {
        ];
        description = "Library to process and search large files or a collection of files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filestore" = callPackage
@@ -89605,8 +84039,6 @@ self: {
        ];
        description = "A shared set of abstractions and types for representing filessytem data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filesystem-conduit" = callPackage
@@ -89628,8 +84060,6 @@ self: {
        ];
        description = "Use system-filepath data types with conduits. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filesystem-enumerator" = callPackage
@@ -89645,8 +84075,6 @@ self: {
        ];
        description = "Enumerator-based API for manipulating the filesystem";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filesystem-trees" = callPackage
@@ -89663,8 +84091,6 @@ self: {
        ];
        description = "Recursively manipulate and traverse filesystems as lazy rose trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fillit" = callPackage
@@ -89681,8 +84107,6 @@ self: {
        testHaskellDepends = [ base doctest hspec unordered-containers ];
        description = "Flexible string substitution";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filter-logger" = callPackage
@@ -89772,8 +84196,6 @@ self: {
        ];
        description = "Extensible pretty printing with semantic annotations and proportional fonts";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "find-clumpiness" = callPackage
@@ -89799,8 +84221,6 @@ self: {
        ];
        description = "Find the clumpiness of labels in a tree";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "find-conduit" = callPackage
@@ -89835,8 +84255,6 @@ self: {
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "find-source-files" = callPackage
@@ -89848,8 +84266,6 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath mtl ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "findhttp" = callPackage
@@ -89868,8 +84284,6 @@ self: {
        ];
        description = "List http/html files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fingertree" = callPackage
@@ -89898,8 +84312,6 @@ self: {
        libraryHaskellDepends = [ base fingertree ];
        description = "Implementation of priority search queues as finger trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fingertree-tf" = callPackage
@@ -89911,8 +84323,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic finger-tree structure using type families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "finitary" = callPackage
@@ -89960,8 +84370,6 @@ self: {
        ];
        description = "Flexible and easy deriving of type classes for finitary types";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "finitary-optics" = callPackage
@@ -89980,8 +84388,6 @@ self: {
        ];
        description = "Prisms and Isos between finitary types";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "finite-field" = callPackage
@@ -90094,8 +84500,6 @@ self: {
        ];
        description = "A simple example using Firefly";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "first-and-last" = callPackage
@@ -90108,8 +84512,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "First and Last generalized to return up to n values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "first-class-families" = callPackage
@@ -90141,8 +84543,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "First class typeclass instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "first-class-patterns" = callPackage
@@ -90171,8 +84571,6 @@ self: {
        ];
        description = "Defunctionalisation for Yhc Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fishfood" = callPackage
@@ -90196,8 +84594,6 @@ self: {
        ];
        description = "Calculates file-size frequency-distribution";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fit" = callPackage
@@ -90217,8 +84613,6 @@ self: {
        ];
        description = "FIT file decoder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fits-parse" = callPackage
@@ -90242,8 +84636,6 @@ self: {
        ];
        description = "Parse FITS files";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fitsio" = callPackage
@@ -90256,8 +84648,6 @@ self: {
        librarySystemDepends = [ cfitsio ];
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) cfitsio;};
 
   "fitspec" = callPackage
@@ -90310,8 +84700,6 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "Simple fix-expression parser";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fix-symbols-gitit" = callPackage
@@ -90323,8 +84711,6 @@ self: {
        libraryHaskellDepends = [ base containers gitit ];
        description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed" = callPackage
@@ -90372,8 +84758,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Binary fixed-point arithmetic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-point-vector" = callPackage
@@ -90385,8 +84769,6 @@ self: {
        libraryHaskellDepends = [ base fixed-point vector ];
        description = "Unbox instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-point-vector-space" = callPackage
@@ -90398,8 +84780,6 @@ self: {
        libraryHaskellDepends = [ base fixed-point vector-space ];
        description = "vector-space instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-precision" = callPackage
@@ -90415,8 +84795,6 @@ self: {
        ];
        description = "Fixed Precision Arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-storable-array" = callPackage
@@ -90428,8 +84806,6 @@ self: {
        libraryHaskellDepends = [ array base tagged ];
        description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-timestep" = callPackage
@@ -90441,8 +84817,6 @@ self: {
        libraryHaskellDepends = [ async base clock time ];
        description = "Pure Haskell library to repeat an action at a specific frequency";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-vector" = callPackage
@@ -90471,8 +84845,6 @@ self: {
        ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-vector-cborg" = callPackage
@@ -90489,8 +84861,6 @@ self: {
        ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-vector-cereal" = callPackage
@@ -90507,8 +84877,6 @@ self: {
        ];
        description = "Cereal instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-vector-hetero" = callPackage
@@ -90537,8 +84905,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Fixed width subsets of an Int64/Word64";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixedprec" = callPackage
@@ -90594,8 +84960,6 @@ self: {
        ];
        description = "A Haskell client for http://fixer.io/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixfile" = callPackage
@@ -90617,8 +84981,6 @@ self: {
        ];
        description = "File-backed recursive data structures";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixhs" = callPackage
@@ -90643,8 +85005,6 @@ self: {
        ];
        description = "FIX (co)parser";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixie" = callPackage
@@ -90666,8 +85026,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Opininated testing framework for mtl style (spies, stubs, and mocks)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixplate" = callPackage
@@ -90728,8 +85086,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "test";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fizzbuzz-as-a-service" = callPackage
@@ -90747,8 +85103,6 @@ self: {
        ];
        description = "FizzBuzz as a service";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flac" = callPackage
@@ -90775,8 +85129,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Complete high-level binding to libFLAC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {FLAC = null;};
 
   "flac-picture" = callPackage
@@ -90795,8 +85147,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Support for writing picture to FLAC metadata blocks with JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flaccuraterip" = callPackage
@@ -90814,8 +85164,6 @@ self: {
        ];
        description = "Verify FLAC files ripped form CD using AccurateRip™";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flags-applicative" = callPackage
@@ -90843,8 +85191,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell text ];
        description = "A template engine for HTML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flamingra" = callPackage
@@ -90861,8 +85207,6 @@ self: {
        ];
        description = "FlameGraphs of profiling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flashblast" = callPackage
@@ -90895,8 +85239,6 @@ self: {
        ];
        description = "Generate language learning flashcards from video";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flat" = callPackage
@@ -90934,8 +85276,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Strict Maybe without space and indirection overhead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flat-mcmc" = callPackage
@@ -91002,8 +85342,6 @@ self: {
        ];
        description = "Haskell implementation of the FlatBuffers protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flay" = callPackage
@@ -91018,8 +85356,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck transformers ];
        description = "Work generically on your datatype without knowing its shape nor its contents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flexible-defaults" = callPackage
@@ -91046,8 +85382,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix-time ];
        description = "simple extension of Data.UnixTime.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flexible-unlit" = callPackage
@@ -91073,8 +85407,6 @@ self: {
        libraryHaskellDepends = [ base data-type mtl QuickCheck ];
        description = "Flexible wrappers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flexiwrap-smallcheck" = callPackage
@@ -91088,8 +85420,6 @@ self: {
        ];
        description = "SmallCheck (Serial) instances for flexiwrap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flick-duration" = callPackage
@@ -91120,8 +85450,6 @@ self: {
        executableHaskellDepends = [ xhtml ];
        description = "Haskell binding to the Flickr API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flight-igc" = callPackage
@@ -91177,8 +85505,6 @@ self: {
        libraryToolDepends = [ proto-lens-protoc ];
        description = "Flink stateful functions SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flip-cmd" = callPackage
@@ -91221,8 +85547,6 @@ self: {
        ];
        description = "f-lite compiler, interpreter and libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flo" = callPackage
@@ -91259,8 +85583,6 @@ self: {
        ];
        description = "C99 printf \"%a\" style formatting and parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "float128" = callPackage
@@ -91285,8 +85607,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conversions between floating and integral values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "floatshow" = callPackage
@@ -91375,8 +85695,6 @@ self: {
        testHaskellDepends = [ base doctest flow QuickCheck ];
        description = "More directional operators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flow2dot" = callPackage
@@ -91395,8 +85713,6 @@ self: {
        ];
        description = "Library and binary to generate sequence/flow diagrams from plain text source";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flowdock" = callPackage
@@ -91416,8 +85732,6 @@ self: {
        ];
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flowdock-api" = callPackage
@@ -91454,8 +85768,6 @@ self: {
        ];
        description = "API integration with Flowdock";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flowdock-rest" = callPackage
@@ -91483,8 +85795,6 @@ self: {
        ];
        description = "Flowdock REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flower" = callPackage
@@ -91502,8 +85812,6 @@ self: {
        ];
        description = "Analyze 454 flowgrams (.SFF files)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flowlocks-framework" = callPackage
@@ -91516,8 +85824,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Generalized Flow Locks Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flowsim" = callPackage
@@ -91536,8 +85842,6 @@ self: {
        ];
        description = "Simulate 454 pyrosequencing";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flp" = callPackage
@@ -91570,8 +85874,6 @@ self: {
        testToolDepends = [ alex happy ];
        description = "A layout spec language for memory managers implemented in Rust";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fltkhs" = callPackage
@@ -91641,8 +85943,6 @@ self: {
        executableHaskellDepends = [ base bytestring fltkhs ];
        description = "Fltkhs Fluid Examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fltkhs-hello-world" = callPackage
@@ -91700,8 +86000,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A structured logger for Fluentd (Haskell)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fluent-logger-conduit" = callPackage
@@ -91753,8 +86051,6 @@ self: {
        ];
        description = "The parser for fluffy to parsec the question bank in .docx type";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fluid-idl" = callPackage
@@ -91820,8 +86116,6 @@ self: {
        librarySystemDepends = [ fluidsynth ];
        description = "Haskell bindings to FluidSynth";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fluidsynth;};
 
   "flush-queue" = callPackage
@@ -91848,8 +86142,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A monoid for tracking changes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fmark" = callPackage
@@ -91867,8 +86159,6 @@ self: {
        ];
        description = "A Friendly Markup language without syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fmlist" = callPackage
@@ -91918,8 +86208,6 @@ self: {
        libraryHaskellDepends = [ base enum-text-rio ];
        description = "Adaptor for getting fmt to work with rio";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fmt-terminal-colors" = callPackage
@@ -91972,8 +86260,6 @@ self: {
        ];
        description = "Extras for Fn, a functional web framework";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "focus" = callPackage
@@ -92117,8 +86403,6 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion foldl ];
        description = "incremental folds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foldl-statistics" = callPackage
@@ -92143,8 +86427,6 @@ self: {
        ];
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foldl-transduce" = callPackage
@@ -92171,8 +86453,6 @@ self: {
        ];
        description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foldl-transduce-attoparsec" = callPackage
@@ -92194,8 +86474,6 @@ self: {
        ];
        description = "Attoparsec and foldl-transduce integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "folds" = callPackage
@@ -92234,8 +86512,6 @@ self: {
        testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        description = "A playground of common folds for folds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "folgerhs" = callPackage
@@ -92282,8 +86558,6 @@ self: {
        ];
        description = "Haskell library to follow content published on any subject";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "follow-file" = callPackage
@@ -92326,8 +86600,6 @@ self: {
        ];
        description = "Follow Tweets anonymously";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foma" = callPackage
@@ -92340,8 +86612,6 @@ self: {
        librarySystemDepends = [ foma ];
        description = "Simple Haskell bindings for Foma";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {foma = null;};
 
   "font-awesome-type" = callPackage
@@ -92367,8 +86637,6 @@ self: {
        executableHaskellDepends = [ base GLFW-b OpenGL ];
        description = "Basic4x6 font for OpenGL";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foo" = callPackage
@@ -92384,8 +86652,6 @@ self: {
        ];
        description = "Paper soccer, an OpenGL game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foobar" = callPackage
@@ -92417,8 +86683,6 @@ self: {
        ];
        description = "Functor, Monad, MonadPlus, etc for free";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forbidden-fruit" = callPackage
@@ -92439,8 +86703,6 @@ self: {
        ];
        description = "A library accelerates imperative style programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "force-layout" = callPackage
@@ -92470,8 +86732,6 @@ self: {
        executableHaskellDepends = [ base process transformers ];
        description = "Run a command on files with magic substituion support (sequencing and regexp)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forecast-io" = callPackage
@@ -92483,8 +86743,6 @@ self: {
        libraryHaskellDepends = [ aeson base text ];
        description = "A Haskell library for working with forecast.io data.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foreign-storable-asymmetric" = callPackage
@@ -92520,8 +86778,6 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "Encapsulating mutatable state in external libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forest" = callPackage
@@ -92537,8 +86793,6 @@ self: {
        ];
        description = "Tree and Forest types";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forest-fire" = callPackage
@@ -92560,8 +86814,6 @@ self: {
        ];
        description = "Recursively delete CloudFormation stacks and their dependants";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forger" = callPackage
@@ -92576,8 +86828,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for generating fake placeholder data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forkable-monad" = callPackage
@@ -92629,8 +86879,6 @@ self: {
        ];
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "format" = callPackage
@@ -92643,8 +86891,6 @@ self: {
        testHaskellDepends = [ haskell2010 parsec QuickCheck ];
        description = "Rendering from and scanning to format strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "format-numbers" = callPackage
@@ -92674,8 +86920,6 @@ self: {
        ];
        description = "A utility for writing the date to dzen2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "formattable" = callPackage
@@ -92696,8 +86940,6 @@ self: {
        ];
        description = "Business-quality formatting of numbers, dates, and other things";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "formatting" = callPackage
@@ -92761,8 +87003,6 @@ self: {
        ];
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "formlets" = callPackage
@@ -92779,8 +87019,6 @@ self: {
        ];
        description = "Formlets implemented in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "formlets-hsp" = callPackage
@@ -92797,8 +87035,6 @@ self: {
        libraryToolDepends = [ trhsx ];
        description = "HSP support for Formlets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "formura" = callPackage
@@ -92820,8 +87056,6 @@ self: {
        ];
        description = "Formura is a simple language to describe stencil computation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forsyde-deep" = callPackage
@@ -92849,8 +87083,6 @@ self: {
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forsyde-shallow" = callPackage
@@ -92878,8 +87110,6 @@ self: {
        libraryHaskellDepends = [ array-forth base free mtl ];
        description = "A simple eDSL for generating arrayForth code";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fortran-src" = callPackage
@@ -92908,8 +87138,6 @@ self: {
        ];
        description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fortytwo" = callPackage
@@ -92924,8 +87152,6 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        description = "Interactive terminal prompt";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forward-chan" = callPackage
@@ -92956,8 +87182,6 @@ self: {
        ];
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foscam-filename" = callPackage
@@ -92977,8 +87201,6 @@ self: {
        ];
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foscam-sort" = callPackage
@@ -93005,8 +87227,6 @@ self: {
        ];
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foundation" = callPackage
@@ -93137,8 +87357,6 @@ self: {
        ];
        description = "Simple interface to the FP Complete IDE API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fpe" = callPackage
@@ -93184,8 +87402,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell bindings to <https://fplll.github.io/fplll/ fplll>";
        license = stdenv.lib.licenses.lgpl21Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fplll;};
 
   "fpnla" = callPackage
@@ -93221,8 +87437,6 @@ self: {
        ];
        description = "Example implementations for FPNLA library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fptest" = callPackage
@@ -93248,8 +87462,6 @@ self: {
        ];
        description = "IEEE754r floating point conformance tests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fquery" = callPackage
@@ -93293,8 +87505,6 @@ self: {
        testHaskellDepends = [ base integer-gmp QuickCheck ];
        description = "A collection of useful fractal curve encoders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fraction" = callPackage
@@ -93306,8 +87516,6 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "Fractions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frag" = callPackage
@@ -93322,8 +87530,6 @@ self: {
        executableHaskellDepends = [ array base GLUT OpenGL random ];
        description = "A 3-D First Person Shooter Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frame" = callPackage
@@ -93371,8 +87577,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A package for configuring and building Haskell software";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "franz" = callPackage
@@ -93418,8 +87622,6 @@ self: {
        benchmarkHaskellDepends = [ base time ];
        description = "Cached and parallel data fetching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freddy" = callPackage
@@ -93439,8 +87641,6 @@ self: {
        ];
        description = "RabbitMQ Messaging API supporting request-response";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free" = callPackage
@@ -93518,8 +87718,6 @@ self: {
        libraryHaskellDepends = [ base type-aligned ];
        description = "Free monads suitable for concurrent computation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-er" = callPackage
@@ -93551,8 +87749,6 @@ self: {
        ];
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-game" = callPackage
@@ -93574,8 +87770,6 @@ self: {
        ];
        description = "Create games for free";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-http" = callPackage
@@ -93592,8 +87786,6 @@ self: {
        ];
        description = "An HTTP Client based on Free Monads";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-operational" = callPackage
@@ -93609,8 +87801,6 @@ self: {
        ];
        description = "Operational Applicative, Alternative, Monad and MonadPlus from free types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-theorems" = callPackage
@@ -93626,8 +87816,6 @@ self: {
        ];
        description = "Automatic generation of free theorems";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-theorems-counterexamples" = callPackage
@@ -93646,8 +87834,6 @@ self: {
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Automatically Generating Counterexamples to Naive Free Theorems";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-theorems-seq" = callPackage
@@ -93665,8 +87851,6 @@ self: {
        ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-theorems-seq-webui" = callPackage
@@ -93685,8 +87869,6 @@ self: {
        ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-theorems-webui" = callPackage
@@ -93706,8 +87888,6 @@ self: {
        ];
        description = "CGI-based web interface for the free-theorems package";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-v-bucks-generator-no-survey" = callPackage
@@ -93723,8 +87903,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-v-bucks-generator-ps4-no-survey" = callPackage
@@ -93740,8 +87918,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-vector-spaces" = callPackage
@@ -93797,8 +87973,6 @@ self: {
        ];
        description = "A soccer game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freelude" = callPackage
@@ -93818,8 +87992,6 @@ self: {
        ];
        description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freenect" = callPackage
@@ -93872,8 +88044,6 @@ self: {
        ];
        description = "Handle effects conversely using monadic conversation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freer-effects" = callPackage
@@ -93894,8 +88064,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion free mtl ];
        description = "Implementation of effect system for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freer-indexed" = callPackage
@@ -93946,8 +88114,6 @@ self: {
        testHaskellDepends = [ base freer-simple hspec ];
        description = "Checked runtime exceptions with freer-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freer-simple-http" = callPackage
@@ -93968,8 +88134,6 @@ self: {
        ];
        description = "Make HTTP requests with freer-simple!";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freer-simple-profiling" = callPackage
@@ -93982,8 +88146,6 @@ self: {
        testHaskellDepends = [ base containers freer-simple hspec time ];
        description = "Automatic profling of freer-simple programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freer-simple-random" = callPackage
@@ -93996,8 +88158,6 @@ self: {
        testHaskellDepends = [ base containers freer-simple hspec random ];
        description = "Random number generators using freer-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freer-simple-time" = callPackage
@@ -94010,8 +88170,6 @@ self: {
        testHaskellDepends = [ base freer-simple hspec time ];
        description = "freer-simple interface to IO based time functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freesect" = callPackage
@@ -94029,8 +88187,6 @@ self: {
        ];
        description = "A Haskell syntax extension for generalised sections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freesound" = callPackage
@@ -94052,8 +88208,6 @@ self: {
        ];
        description = "Access the Freesound Project database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freetype-simple" = callPackage
@@ -94068,8 +88222,6 @@ self: {
        ];
        description = "Single line text rendering for OpenGL ES";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freetype2" = callPackage
@@ -94113,8 +88265,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring containers gauge ];
        description = "Are you ready to get freaky?";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fresco-binding" = callPackage
@@ -94142,8 +88292,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell-src-exts syb ];
        description = "Introduce fresh variables into Haskell source code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "friday" = callPackage
@@ -94182,8 +88330,6 @@ self: {
        librarySystemDepends = [ libdevil ];
        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;
-       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "friday-juicypixels" = callPackage
@@ -94215,8 +88361,6 @@ self: {
        ];
        description = "Scale Friday images with DCT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "friendly" = callPackage
@@ -94232,8 +88376,6 @@ self: {
        ];
        description = "Attempt to pretty-print any input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "friendly-time" = callPackage
@@ -94306,8 +88448,6 @@ self: {
        ];
        description = "A reactive frontend web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frontmatter" = callPackage
@@ -94351,8 +88491,6 @@ self: {
        executableHaskellDepends = [ base directory ];
        description = "LALR(k) parser generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frp-arduino" = callPackage
@@ -94364,8 +88502,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Arduino programming without the hassle of C";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frpnow" = callPackage
@@ -94380,8 +88516,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Principled practical FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frpnow-gloss" = callPackage
@@ -94397,8 +88531,6 @@ self: {
        ];
        description = "Program awesome stuff with Gloss and frpnow!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frpnow-gtk" = callPackage
@@ -94415,8 +88547,6 @@ self: {
        ];
        description = "Program GUIs with GTK and frpnow!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frpnow-gtk3" = callPackage
@@ -94430,8 +88560,6 @@ self: {
        ];
        description = "Program GUIs with GTK3 and frpnow!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frpnow-vty" = callPackage
@@ -94446,8 +88574,6 @@ self: {
        executableHaskellDepends = [ base containers frpnow vty ];
        description = "Program terminal applications with vty and frpnow!";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frquotes" = callPackage
@@ -94473,8 +88599,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A haskell binding to the FSEvents API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fsh-csv" = callPackage
@@ -94486,8 +88610,6 @@ self: {
        libraryHaskellDepends = [ base hint ];
        description = "csv parser for fsh";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fsharp" = callPackage
@@ -94514,8 +88636,6 @@ self: {
        ];
        description = "Finite state machines and FSM actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fsnotify" = callPackage
@@ -94577,8 +88697,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Finite state transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fsutils" = callPackage
@@ -94590,8 +88708,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath ];
        description = "File system utilities for Haskell that are missing from built in libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fswait" = callPackage
@@ -94611,8 +88727,6 @@ self: {
        ];
        description = "Wait and observe events on the filesystem for a path, with a timeout";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fswatch" = callPackage
@@ -94633,8 +88747,6 @@ self: {
        ];
        description = "File System watching tool with cli and slave functionalities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fswatcher" = callPackage
@@ -94666,8 +88778,6 @@ self: {
        executableHaskellDepends = [ base mtl parsec ];
        description = "implementation accompanying a WFLP'19 paper";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ftdi" = callPackage
@@ -94685,8 +88795,6 @@ self: {
        ];
        description = "A thin layer over USB to communicate with FTDI chips";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ftp-client" = callPackage
@@ -94704,8 +88812,6 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hspec ];
        description = "Transfer files with FTP and FTPS";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ftp-client-conduit" = callPackage
@@ -94722,8 +88828,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Transfer file with FTP and FTPS with Conduit";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ftp-conduit" = callPackage
@@ -94740,8 +88844,6 @@ self: {
        ];
        description = "FTP client package with conduit interface based off http-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ftphs" = callPackage
@@ -94759,8 +88861,6 @@ self: {
        ];
        description = "FTP Client and Server Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ftree" = callPackage
@@ -94790,8 +88890,6 @@ self: {
        ];
        description = "Shell interface to the FreeTheorems library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fugue" = callPackage
@@ -94814,8 +88912,6 @@ self: {
        libraryHaskellDepends = [ base ghc network ];
        description = "a monad for protocol-typed network programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "full-text-search" = callPackage
@@ -94855,8 +88951,6 @@ self: {
        ];
        description = "Simple sentence segmenter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funbot" = callPackage
@@ -94885,8 +88979,6 @@ self: {
        ];
        description = "IRC bot for fun, learning, creativity and collaboration";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funbot-client" = callPackage
@@ -94905,8 +88997,6 @@ self: {
        ];
        description = "Report events to FunBot over a JSON/HTTP API";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funbot-ext-events" = callPackage
@@ -94937,8 +89027,6 @@ self: {
        ];
        description = "Git hook which sends events to FunBot";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funcmp" = callPackage
@@ -94990,8 +89078,6 @@ self: {
        ];
        description = "call-by-value lambda-calculus with meta-programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funcons-simple" = callPackage
@@ -95007,8 +89093,6 @@ self: {
        executableHaskellDepends = [ base funcons-tools funcons-values ];
        description = "A modular interpreter for executing SIMPLE funcons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funcons-tools" = callPackage
@@ -95034,8 +89118,6 @@ self: {
        ];
        description = "A modular interpreter for executing funcons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funcons-values" = callPackage
@@ -95051,8 +89133,6 @@ self: {
        ];
        description = "Library providing values and operations on values in a fixed universe";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "function-builder" = callPackage
@@ -95076,8 +89156,6 @@ self: {
        libraryHaskellDepends = [ base data-type ];
        description = "Combining functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "function-instances-algebra" = callPackage
@@ -95089,8 +89167,6 @@ self: {
        libraryHaskellDepends = [ base numeric-prelude ];
        description = "Instances of the Algebra.* classes for functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "functional-arrow" = callPackage
@@ -95102,8 +89178,6 @@ self: {
        libraryHaskellDepends = [ base HList ];
        description = "Combinators that allow for a more functional/monadic style of Arrow programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "functional-kmp" = callPackage
@@ -95128,8 +89202,6 @@ self: {
        libraryHaskellDepends = [ base category ];
        description = "Functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "functor-apply" = callPackage
@@ -95225,8 +89297,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "functor-monadic" = callPackage
@@ -95260,8 +89330,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim lens ];
        description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "functorm" = callPackage
@@ -95273,8 +89341,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data.FunctorM (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "functors" = callPackage
@@ -95325,8 +89391,6 @@ self: {
        ];
        description = "Workflows with arrows";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funflow-nix" = callPackage
@@ -95348,8 +89412,6 @@ self: {
        ];
        description = "Utility functions for using funflow with nix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fungll-combinators" = callPackage
@@ -95383,8 +89445,6 @@ self: {
        ];
        description = "A unioning file-system using HFuse";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funnyprint" = callPackage
@@ -95400,8 +89460,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion hscolour ipprint ];
        description = "funnyPrint function to colorize GHCi output";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funpat" = callPackage
@@ -95413,8 +89471,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A generalization of pattern matching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funsat" = callPackage
@@ -95436,8 +89492,6 @@ self: {
        ];
        description = "A modern DPLL-style SAT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funspection" = callPackage
@@ -95449,8 +89503,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-level function utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fused-effects" = callPackage
@@ -95488,8 +89540,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Handle exceptions thrown in IO with fused-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fused-effects-lens" = callPackage
@@ -95520,8 +89570,6 @@ self: {
        benchmarkHaskellDepends = [ base fused-effects-random gauge ];
        description = "High-quality random number generation as an effect";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fused-effects-optics" = callPackage
@@ -95533,8 +89581,6 @@ self: {
        libraryHaskellDepends = [ base fused-effects optics-core ];
        description = "Bridge between the optics and fused-effects ecosystems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fused-effects-random" = callPackage
@@ -95546,8 +89592,6 @@ self: {
        libraryHaskellDepends = [ base fused-effects random transformers ];
        description = "Random number generation for fused-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fused-effects-readline" = callPackage
@@ -95567,8 +89611,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A readline-like effect and carrier for fused-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fused-effects-resumable" = callPackage
@@ -95598,8 +89640,6 @@ self: {
        ];
        description = "A fused-effects adapter for squeal-postgresql";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fused-effects-th" = callPackage
@@ -95616,8 +89656,6 @@ self: {
        ];
        description = "Template Haskell helpers for fused-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fusion" = callPackage
@@ -95632,8 +89670,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Effectful streaming library based on shortcut fusion techniques";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fusion-plugin" = callPackage
@@ -95650,8 +89686,6 @@ self: {
        ];
        description = "GHC plugin to make stream fusion more predictable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fusion-plugin-types" = callPackage
@@ -95701,8 +89735,6 @@ self: {
        ];
        description = "An optimising compiler for a functional, array-oriented language";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "futhask" = callPackage
@@ -95730,8 +89762,6 @@ self: {
        executableHaskellDepends = [ base bytestring network unix ];
        description = "Simple IP-over-UDP tunnel using TUNTAP";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "future" = callPackage
@@ -95743,8 +89773,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Supposed to mimics and enhance proposed C++ \"future\" features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "future-resource" = callPackage
@@ -95866,8 +89894,6 @@ self: {
          base criterion fuzzy-time genvalidity-criterion
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fuzzy-timings" = callPackage
@@ -95888,8 +89914,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "fuzzyset" = callPackage
@@ -95956,8 +89980,6 @@ self: {
        ];
        description = "Game engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fwgl-glfw" = callPackage
@@ -95974,8 +89996,6 @@ self: {
        ];
        description = "FWGL GLFW backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fwgl-javascript" = callPackage
@@ -95991,8 +90011,6 @@ self: {
        ];
        description = "FWGL GHCJS backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fx" = callPackage
@@ -96017,8 +90035,6 @@ self: {
        executableHaskellDepends = [ base HTTP json ];
        description = "Generate Gentoo ebuilds from NodeJS/npm packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "g2" = callPackage
@@ -96051,8 +90067,6 @@ self: {
        ];
        description = "Haskell symbolic execution engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "g2q" = callPackage
@@ -96064,8 +90078,6 @@ self: {
        libraryHaskellDepends = [ base g2 ];
        description = "G2Q allows constraint programming, via writing Haskell predicates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "g4ip" = callPackage
@@ -96078,8 +90090,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A theorem prover for propositional logic that uses G4ip";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "g4ip-prover" = callPackage
@@ -96114,8 +90124,6 @@ self: {
        ];
        description = "General Alignment Clustering Tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "galois-fft" = callPackage
@@ -96192,8 +90200,6 @@ self: {
        libraryHaskellDepends = [ base containers probability random ];
        description = "Simple probability library for dice rolls, card games and similar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "game-tree" = callPackage
@@ -96218,8 +90224,6 @@ self: {
        executableHaskellDepends = [ base cairo containers glib gtk time ];
        description = "Game clock that shows two analog clock faces";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gamgee" = callPackage
@@ -96250,8 +90254,6 @@ self: {
        ];
        description = "Tool for generating TOTP MFA tokens";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gamma" = callPackage
@@ -96272,8 +90274,6 @@ self: {
        ];
        description = "Gamma function and related functions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gang-of-threads" = callPackage
@@ -96299,8 +90299,6 @@ self: {
        executableHaskellDepends = [ base haskeline transformers ];
        description = "reverse prefix notation calculator and calculation library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "garfield" = callPackage
@@ -96327,8 +90325,6 @@ self: {
        ];
        description = "Automatically spin up and spin down local daemons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gargoyle-postgresql" = callPackage
@@ -96350,8 +90346,6 @@ self: {
        ];
        description = "Manage PostgreSQL servers with gargoyle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gargoyle-postgresql-connect" = callPackage
@@ -96371,8 +90365,6 @@ self: {
        ];
        description = "Connect to gargoyle-managed postgresql instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gargoyle-postgresql-nix" = callPackage
@@ -96393,8 +90385,6 @@ self: {
        ];
        description = "Manage PostgreSQL servers with gargoyle and nix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "garlic-bread" = callPackage
@@ -96429,8 +90419,6 @@ self: {
        libraryHaskellDepends = [ base free transformers ];
        description = "Limit how many steps a program may take";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gasp" = callPackage
@@ -96487,8 +90475,6 @@ self: {
        ];
        description = "planar graph embedding into a plane";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gc" = callPackage
@@ -96516,8 +90502,6 @@ self: {
        ];
        description = "a wai application to show GHC.GCStats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gcodehs" = callPackage
@@ -96564,8 +90548,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.gnome2) GConf;};
 
   "gd" = callPackage
@@ -96619,8 +90601,6 @@ self: {
        ];
        description = "API Wrapping for Coinbase's GDAX exchange";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gdelt" = callPackage
@@ -96661,8 +90641,6 @@ self: {
        ];
        description = "Generic diff for the instant-generics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gdiff-th" = callPackage
@@ -96681,8 +90659,6 @@ self: {
        ];
        description = "Generate gdiff GADTs and Instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gdo" = callPackage
@@ -96745,8 +90721,6 @@ self: {
        testHaskellDepends = [ base hspec megaparsec text-all ];
        description = "Parser for the GEDCOM genealogy file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geek" = callPackage
@@ -96767,8 +90741,6 @@ self: {
        ];
        description = "Geek blog engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geek-server" = callPackage
@@ -96792,8 +90764,6 @@ self: {
        ];
        description = "Geek blog engine server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gegl" = callPackage
@@ -96814,8 +90784,6 @@ self: {
        libraryPkgconfigDepends = [ gegl ];
        description = "Haskell bindings to GEGL library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gegl;};
 
   "gelatin" = callPackage
@@ -96834,8 +90802,6 @@ self: {
        executableHaskellDepends = [ base linear mtl vector ];
        description = "A graphics description language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gelatin-freetype2" = callPackage
@@ -96853,8 +90819,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "FreeType2 based text rendering for the gelatin realtime rendering system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gelatin-fruity" = callPackage
@@ -96866,8 +90830,6 @@ self: {
        libraryHaskellDepends = [ base FontyFruity gelatin linear vector ];
        description = "Gelatin's support for rendering TTF outlines, using FontyFruity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gelatin-gl" = callPackage
@@ -96889,8 +90851,6 @@ self: {
        executableHaskellDepends = [ base gelatin lens linear mtl vector ];
        description = "OpenGL rendering routines for the gelatin-picture graphics EDSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gelatin-sdl2" = callPackage
@@ -96908,8 +90868,6 @@ self: {
        executableHaskellDepends = [ base either filepath sdl2 ];
        description = "An SDL2 backend for the gelatin renderer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gelatin-shaders" = callPackage
@@ -96922,8 +90880,6 @@ self: {
        libraryHaskellDepends = [ base bytestring filepath gelatin ];
        description = "Gelatin's OpenGL shaders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gemini-router" = callPackage
@@ -96995,8 +90951,6 @@ self: {
        ];
        description = "A simple library of helpers for SDL+GL games";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gen-imports" = callPackage
@@ -97012,8 +90966,6 @@ self: {
        ];
        description = "Code to generate instances for the package \"ghc-instances\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gen-passwd" = callPackage
@@ -97031,8 +90983,6 @@ self: {
        ];
        description = "Create wordlist-based passwords easily";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gencheck" = callPackage
@@ -97049,8 +90999,6 @@ self: {
        ];
        description = "A testing framework inspired by QuickCheck and SmallCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gender" = callPackage
@@ -97066,8 +91014,6 @@ self: {
        executableHaskellDepends = [ attoparsec base text ];
        description = "Identify a persons gender by their first name";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genders" = callPackage
@@ -97083,8 +91029,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec network vector ];
        description = "Bindings to libgenders";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {genders = null;};
 
   "gendocs" = callPackage
@@ -97130,8 +91074,6 @@ self: {
        ];
        description = "Prelude replacement using generalized type classes where possible";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generator" = callPackage
@@ -97143,8 +91085,6 @@ self: {
        libraryHaskellDepends = [ base List transformers ];
        description = "Python-generators notation for creation of monadic lists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generators" = callPackage
@@ -97156,8 +91096,6 @@ self: {
        libraryHaskellDepends = [ base mtl random ];
        description = "Actually useful monadic random value generators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-accessors" = callPackage
@@ -97177,8 +91115,6 @@ self: {
        ];
        description = "stringly-named getters for generic data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-aeson" = callPackage
@@ -97195,8 +91131,6 @@ self: {
        ];
        description = "Derivation of Aeson instances using GHC generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-arbitrary" = callPackage
@@ -97219,8 +91153,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ghc-prim ];
        description = "Generic Data.Binary derivation using GHC generics.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-church" = callPackage
@@ -97236,8 +91168,6 @@ self: {
        ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-constraints" = callPackage
@@ -97368,8 +91298,6 @@ self: {
        testHaskellDepends = [ array base bytestring hspec ];
        description = "An Enum class that fixes some deficiences with Prelude's Enum";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-env" = callPackage
@@ -97433,8 +91361,6 @@ self: {
        libraryHaskellDepends = [ base generic-lens ];
        description = "GHC.OverloadedLabels.IsLabel instance for lenses from ghc-generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-lens-lite" = callPackage
@@ -97460,8 +91386,6 @@ self: {
        libraryHaskellDepends = [ base lucid text ];
        description = "General-purpose web page scaffold for Lucid";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-match" = callPackage
@@ -97494,8 +91418,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "A generic version of Data.Maybe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-monoid" = callPackage
@@ -97580,8 +91502,6 @@ self: {
        ];
        description = "Pretty printing for Generic value";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-random" = callPackage
@@ -97618,8 +91538,6 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Simple generic TCP/IP server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-storable" = callPackage
@@ -97632,8 +91550,6 @@ self: {
        testHaskellDepends = [ base ghc-prim hspec QuickCheck ];
        description = "Generic implementation of Storable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-tree" = callPackage
@@ -97645,8 +91561,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic Tree data type";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-trie" = callPackage
@@ -97660,8 +91574,6 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        description = "A map, where the keys may be complex structured data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-xml" = callPackage
@@ -97676,8 +91588,6 @@ self: {
        ];
        description = "Marshalling Haskell values to/from XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-xmlpickler" = callPackage
@@ -97724,8 +91634,6 @@ self: {
        ];
        description = "Generic Programming with Mutually Recursive Sums of Products";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generics-mrsop-gdiff" = callPackage
@@ -97737,8 +91645,6 @@ self: {
        libraryHaskellDepends = [ base generics-mrsop ];
        description = "Reimplementation of the gdiff algorithm for generics-mrsop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generics-sop" = callPackage
@@ -97783,8 +91689,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genesis" = callPackage
@@ -97812,8 +91716,6 @@ self: {
        ];
        description = "Opinionated bootstrapping for Haskell web services";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genesis-test" = callPackage
@@ -97837,8 +91739,6 @@ self: {
        ];
        description = "Opinionated bootstrapping for Haskell web services";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genetics" = callPackage
@@ -97852,8 +91752,6 @@ self: {
        executableHaskellDepends = [ base random-fu ];
        description = "A Genetic Algorithm library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geni-gui" = callPackage
@@ -97877,8 +91775,6 @@ self: {
        executableHaskellDepends = [ base GenI ];
        description = "GenI graphical user interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geni-util" = callPackage
@@ -97902,8 +91798,6 @@ self: {
        ];
        description = "Companion tools for use with the GenI surface realiser";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geniconvert" = callPackage
@@ -97923,8 +91817,6 @@ self: {
        ];
        description = "Conversion utility for the GenI generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genifunctors" = callPackage
@@ -97948,8 +91840,6 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geniplate-mirror" = callPackage
@@ -97982,8 +91872,6 @@ self: {
        ];
        description = "Simple HTTP server for GenI results";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genprog" = callPackage
@@ -97995,8 +91883,6 @@ self: {
        libraryHaskellDepends = [ base MonadRandom syb syz ];
        description = "Genetic programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gentlemark" = callPackage
@@ -98009,8 +91895,6 @@ self: {
        testHaskellDepends = [ base HUnit parsec transformers ];
        description = "Gentle markup language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genvalidity" = callPackage
@@ -98278,8 +92162,6 @@ self: {
          base criterion genvalidity-criterion mergeful
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genvalidity-mergeless" = callPackage
@@ -98510,8 +92392,6 @@ self: {
        ];
        description = "Performs geo location lookups and parses the results";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geo-uk" = callPackage
@@ -98528,8 +92408,6 @@ self: {
        ];
        description = "High precision conversion between GPS and UK Grid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geocalc" = callPackage
@@ -98572,8 +92450,6 @@ self: {
        ];
        description = "Geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geodetic-types" = callPackage
@@ -98585,8 +92461,6 @@ self: {
        libraryHaskellDepends = [ base dimensional lens semigroups ];
        description = "Types for geodetic operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geodetics" = callPackage
@@ -98665,8 +92539,6 @@ self: {
        libraryHaskellDepends = [ aeson base bson bytestring lens text ];
        description = "GeoJSON data types including JSON/BSON conversion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geolite-csv" = callPackage
@@ -98685,8 +92557,6 @@ self: {
        ];
        description = "Geolite CSV Parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geom2d" = callPackage
@@ -98699,8 +92569,6 @@ self: {
        testHaskellDepends = [ base ieee754 linear QuickCheck ];
        description = "package for geometry in euklidean 2d space";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geos" = callPackage
@@ -98721,8 +92589,6 @@ self: {
        testSystemDepends = [ geos_c ];
        description = "Bindings for GEOS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {geos_c = null;};
 
   "getemx" = callPackage
@@ -98741,8 +92607,6 @@ self: {
        ];
        description = "Fetch from emusic using .emx files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "getflag" = callPackage
@@ -98754,8 +92618,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Command-line parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "getopt-generics" = callPackage
@@ -98835,8 +92697,6 @@ self: {
        executableHaskellDepends = [ base containers parsec ];
        description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gh-labeler" = callPackage
@@ -98854,8 +92714,6 @@ self: {
        ];
        description = "Github Standard Labeler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gh-pocket-knife" = callPackage
@@ -99074,8 +92932,6 @@ self: {
        testHaskellDepends = [ base ghc ghc-paths ];
        description = "A small-step semantics for Core";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-datasize" = callPackage
@@ -99087,8 +92943,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ghc-heap ghc-prim ];
        description = "Determine the size of data structures in GHC's memory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-dump-core" = callPackage
@@ -99104,8 +92958,6 @@ self: {
        ];
        description = "An AST and compiler plugin for dumping GHC's Core representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-dump-tree" = callPackage
@@ -99130,8 +92982,6 @@ self: {
        ];
        description = "Dump GHC's parsed, renamed, and type checked ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-dump-util" = callPackage
@@ -99155,8 +93005,6 @@ self: {
        ];
        description = "Handy tools for working with @ghc-dump@ dumps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-dup" = callPackage
@@ -99168,8 +93016,6 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Explicitly prevent sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-events" = callPackage
@@ -99212,8 +93058,6 @@ self: {
        ];
        description = "Analyze and visualize event logs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-events-parallel" = callPackage
@@ -99237,8 +93081,6 @@ self: {
        ];
        description = "Library and tool for parsing .eventlog files from parallel GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-exactprint" = callPackage
@@ -99310,8 +93152,6 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Derived instances of GHC.Generic of the GHC AST";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-heap-view" = callPackage
@@ -99379,8 +93219,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-instances" = callPackage
@@ -99402,8 +93240,6 @@ self: {
        ];
        description = "Easily import all instances contained in GHC distributed libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-justdoit" = callPackage
@@ -99502,8 +93338,6 @@ self: {
        executableHaskellDepends = [ base parsec process ];
        description = "Generate a bash completion from the GHC manpage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-mod" = callPackage
@@ -99550,8 +93384,6 @@ self: {
        ];
        description = "Happy Haskell Hacking";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-mtl" = callPackage
@@ -99615,8 +93447,6 @@ self: {
        ];
        description = "A parallel wrapper for 'ghc --make'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-parser" = callPackage
@@ -99660,8 +93490,6 @@ self: {
        ];
        description = "Simple utility to fix BROKEN package dependencies for cabal-install";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-pkg-lib" = callPackage
@@ -99676,8 +93504,6 @@ self: {
        ];
        description = "Provide library support for ghc-pkg information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-plugs-out" = callPackage
@@ -99693,8 +93519,6 @@ self: {
        doHaddock = false;
        description = "Type checker plugins without the type checking";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-prim_0_6_1" = callPackage
@@ -99786,8 +93610,6 @@ self: {
        testHaskellDepends = [ base transformers ];
        description = "GHC plugin to prove program equations by simplification";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-server" = callPackage
@@ -99818,8 +93640,6 @@ self: {
        executableHaskellDepends = [ base transformers ];
        description = "Simplified GHC API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-simple" = callPackage
@@ -99835,8 +93655,6 @@ self: {
        ];
        description = "Simplified interface to the GHC API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-source-gen" = callPackage
@@ -99864,8 +93682,6 @@ self: {
        libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-syb" = callPackage
@@ -99877,8 +93693,6 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Data and Typeable instances for the GHC API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-syb-utils" = callPackage
@@ -99890,8 +93704,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ghc syb ];
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-syntax-highlighter" = callPackage
@@ -99936,8 +93748,6 @@ self: {
        ];
        description = "a library to work with tags created from Haskell parsed tree";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-tags-plugin" = callPackage
@@ -99959,8 +93769,6 @@ self: {
        ];
        description = "A compiler plugin which generates tags file from GHC parsed syntax tree";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-tcplugins-extra_0_3_2" = callPackage
@@ -100003,8 +93811,6 @@ self: {
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-timers" = callPackage
@@ -100121,8 +93927,6 @@ self: {
        executableHaskellDepends = [ base ghc-paths unix ];
        description = "Print minimal export lists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-vis" = callPackage
@@ -100141,8 +93945,6 @@ self: {
        ];
        description = "Live visualization of data structures in GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcflags" = callPackage
@@ -100208,8 +94010,6 @@ self: {
        libraryHaskellDepends = [ base cairo colour diagrams gtk ];
        description = "Display simple diagrams from ghci";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghci-haskeline" = callPackage
@@ -100228,8 +94028,6 @@ self: {
        ];
        description = "An implementation of ghci using the Haskeline line-input library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghci-hexcalc" = callPackage
@@ -100254,8 +94052,6 @@ self: {
        testHaskellDepends = [ base doctest hspec parsec ];
        description = "parse output of ghci \":history\" command";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghci-lib" = callPackage
@@ -100267,8 +94063,6 @@ self: {
        libraryHaskellDepends = [ base ghc MissingH ];
        description = "A library for interactively evaluating Haskell code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghci-ng" = callPackage
@@ -100290,8 +94084,6 @@ self: {
        ];
        description = "Next generation GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghci-pretty" = callPackage
@@ -100303,8 +94095,6 @@ self: {
        libraryHaskellDepends = [ base hscolour ipprint ];
        description = "colored pretty-printing within ghci";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghci-websockets" = callPackage
@@ -100531,8 +94321,6 @@ self: {
        sha256 = "02m0qszdl3kxyhjrzj1ph9gwbr9jkzak2v1b47v6ywsm7hmjgn7w";
        description = "DOM library using JSFFI and GHCJS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcjs-dom-webkit" = callPackage
@@ -100565,8 +94353,6 @@ self: {
        ];
        description = "GHCJS bindings for the JavaScript Fetch API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcjs-hplay" = callPackage
@@ -100583,8 +94369,6 @@ self: {
        ];
        description = "Client-side web EDSL for transient nodes running in the web browser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcjs-perch" = callPackage
@@ -100607,8 +94391,6 @@ self: {
        libraryHaskellDepends = [ base ghcjs-base protolude ];
        description = "Bidirectional bidings to javascript's promise";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcjs-vdom" = callPackage
@@ -100657,8 +94439,6 @@ self: {
        libraryHaskellDepends = [ base ghcjs-base text ];
        description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghclive" = callPackage
@@ -100685,8 +94465,6 @@ self: {
        ];
        description = "Interactive Haskell interpreter in a browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcprofview" = callPackage
@@ -100705,8 +94483,6 @@ self: {
        ];
        description = "GHC .prof files viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghczdecode" = callPackage
@@ -100755,8 +94531,6 @@ self: {
        ];
        description = "Trivial routines for inspecting git repositories";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gi-atk" = callPackage
@@ -100814,8 +94588,6 @@ self: {
        ];
        description = "Bridge between packages gi-* and cairo-core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gi-cairo-connector" = callPackage
@@ -100831,8 +94603,6 @@ self: {
        ];
        description = "GI friendly Binding to the Cairo library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gi-cairo-render" = callPackage
@@ -100850,8 +94620,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "GI friendly Binding to the Cairo library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) cairo;};
 
   "gi-dbusmenu" = callPackage
@@ -100871,8 +94639,6 @@ self: {
        libraryPkgconfigDepends = [ libdbusmenu ];
        description = "Dbusmenu bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libdbusmenu;};
 
   "gi-dbusmenugtk3" = callPackage
@@ -100897,8 +94663,6 @@ self: {
        libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ];
        description = "DbusmenuGtk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
 
   "gi-gdk" = callPackage
@@ -100991,8 +94755,6 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "GdkX11 bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "gi-gdkx11_4_0_2" = callPackage
@@ -101016,7 +94778,6 @@ self: {
        description = "GdkX11 bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gtk4-x11 = null;};
 
   "gi-ggit" = callPackage
@@ -101133,8 +94894,6 @@ self: {
        libraryPkgconfigDepends = [ graphene-gobject ];
        description = "Graphene bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {graphene-gobject = null;};
 
   "gi-gsk" = callPackage
@@ -101159,8 +94918,6 @@ self: {
        libraryPkgconfigDepends = [ gtk4 ];
        description = "Gsk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gtk4 = null;};
 
   "gi-gst" = callPackage
@@ -101246,8 +95003,6 @@ self: {
        libraryPkgconfigDepends = [ gstreamer-pbutils ];
        description = "GStreamer Plugins Base Utils bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gstreamer-pbutils = null;};
 
   "gi-gsttag" = callPackage
@@ -101269,8 +95024,6 @@ self: {
        libraryPkgconfigDepends = [ gstreamer-tag ];
        description = "GStreamer Tag bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gstreamer-tag = null;};
 
   "gi-gstvideo" = callPackage
@@ -101390,8 +95143,6 @@ self: {
        ];
        description = "Declarative GTK+ programming in Haskell";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gi-gtk-declarative-app-simple" = callPackage
@@ -101410,8 +95161,6 @@ self: {
        ];
        description = "Declarative GTK+ programming in Haskell in the style of Pux";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gi-gtk-hs" = callPackage
@@ -101429,8 +95178,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "gi-gtkosxapplication" = callPackage
@@ -101452,8 +95199,6 @@ self: {
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        description = "GtkosxApplication bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gtk-mac-integration-gtk3 = null;};
 
   "gi-gtksheet" = callPackage
@@ -101478,8 +95223,6 @@ self: {
        libraryPkgconfigDepends = [ gtksheet ];
        description = "GtkSheet bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gtksheet = null;};
 
   "gi-gtksource" = callPackage
@@ -101528,8 +95271,6 @@ self: {
        libraryPkgconfigDepends = [ libhandy ];
        description = "libhandy bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libhandy;};
 
   "gi-harfbuzz" = callPackage
@@ -101705,8 +95446,6 @@ self: {
        libraryPkgconfigDepends = [ poppler ];
        description = "Poppler bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) poppler;};
 
   "gi-secret" = callPackage
@@ -101869,8 +95608,6 @@ self: {
        libraryPkgconfigDepends = [ libwnck ];
        description = "Wnck bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libwnck;};
 
   "gi-xlib" = callPackage
@@ -101890,8 +95627,6 @@ self: {
        libraryPkgconfigDepends = [ xlibsWrapper ];
        description = "xlib bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) xlibsWrapper;};
 
   "giak" = callPackage
@@ -101911,8 +95646,6 @@ self: {
        ];
        description = "Fuzzy finder for cabal executables";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gimlh" = callPackage
@@ -102000,8 +95733,6 @@ self: {
        executableSystemDepends = [ openssl ];
        description = "Ginsu Gale Client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "gio" = callPackage
@@ -102042,8 +95773,6 @@ self: {
        ];
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "giphy-api" = callPackage
@@ -102086,8 +95815,6 @@ self: {
        ];
        description = "A reliable command-line client for gist.github.com";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git" = callPackage
@@ -102112,8 +95839,6 @@ self: {
        doCheck = false;
        description = "Git operations in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-all" = callPackage
@@ -102132,8 +95857,6 @@ self: {
        ];
        description = "Determine which Git repositories need actions to be taken";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-annex" = callPackage
@@ -102247,8 +95970,6 @@ self: {
        ];
        description = "Maintain per-branch checklists in Git";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-config" = callPackage
@@ -102270,8 +95991,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A simple parser for Git configuration files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-cuk" = callPackage
@@ -102291,8 +96010,6 @@ self: {
        executableHaskellDepends = [ base relude ];
        description = "Haskell Git Helper Tool";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-date" = callPackage
@@ -102313,8 +96030,6 @@ self: {
        ];
        description = "Bindings to the date parsing from Git";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-embed" = callPackage
@@ -102352,8 +96067,6 @@ self: {
        ];
        description = "Custom git command for formatting code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-freq" = callPackage
@@ -102396,8 +96109,6 @@ self: {
        ];
        description = "More intelligent push-to-GitHub utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-jump" = callPackage
@@ -102411,8 +96122,6 @@ self: {
        executableHaskellDepends = [ base base-compat process ];
        description = "Move a git branch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-lfs" = callPackage
@@ -102470,8 +96179,6 @@ self: {
        ];
        description = "Passively snapshots working tree changes efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-object" = callPackage
@@ -102488,8 +96195,6 @@ self: {
        ];
        description = "Git object and its parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-remote-ipfs" = callPackage
@@ -102521,8 +96226,6 @@ self: {
        ];
        description = "Git remote helper to store git objects on IPFS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-repair" = callPackage
@@ -102551,8 +96254,6 @@ self: {
        ];
        description = "repairs a damaged git repository";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-sanity" = callPackage
@@ -102572,8 +96273,6 @@ self: {
        executableHaskellDepends = [ base Cabal ];
        description = "A sanity checker for your git history";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-vogue" = callPackage
@@ -102603,8 +96302,6 @@ self: {
        testToolDepends = [ git ];
        description = "A framework for pre-commit checks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitHUD" = callPackage
@@ -102660,8 +96357,6 @@ self: {
        ];
        description = "Create Github issues out of TODO comments in code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "githash" = callPackage
@@ -102738,8 +96433,6 @@ self: {
        executableToolDepends = [ git ];
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) git;};
 
   "github-data" = callPackage
@@ -102765,8 +96458,6 @@ self: {
        ];
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-post-receive" = callPackage
@@ -102803,8 +96494,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-release_1_3_5" = callPackage
@@ -102826,7 +96515,6 @@ self: {
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-rest" = callPackage
@@ -102869,8 +96557,6 @@ self: {
        ];
        description = "Various Github helper utilities";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-types" = callPackage
@@ -102901,8 +96587,6 @@ self: {
        libraryHaskellDepends = [ base basic-prelude github text ];
        description = "Useful functions that use the GitHub API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-webhook-handler" = callPackage
@@ -102921,8 +96605,6 @@ self: {
        ];
        description = "GitHub WebHook Handler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-webhook-handler-snap" = callPackage
@@ -102941,8 +96623,6 @@ self: {
        ];
        description = "GitHub WebHook Handler implementation for Snap";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-webhooks" = callPackage
@@ -102961,8 +96641,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec text vector ];
        description = "Aeson instances for GitHub Webhook payloads";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "githud" = callPackage
@@ -102988,8 +96666,6 @@ self: {
        ];
        description = "Heads up, and you see your GIT context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitignore" = callPackage
@@ -103008,8 +96684,6 @@ self: {
        ];
        description = "Apply GitHub .gitignore templates to already existing repositories.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitit" = callPackage
@@ -103046,8 +96720,6 @@ self: {
        ];
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlab-api" = callPackage
@@ -103064,8 +96736,6 @@ self: {
        testHaskellDepends = [ base hspec rio ];
        description = "Gitlab Web API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlab-haskell" = callPackage
@@ -103107,8 +96777,6 @@ self: {
        ];
        description = "API library for working with Git repositories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlib-cmdline" = callPackage
@@ -103136,8 +96804,6 @@ self: {
        ];
        description = "Gitlib repository backend that uses the git command-line tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlib-cross" = callPackage
@@ -103155,8 +96821,6 @@ self: {
        ];
        description = "Run tests between repositories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlib-libgit2" = callPackage
@@ -103183,8 +96847,6 @@ self: {
        ];
        description = "Libgit2 backend for gitlib";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlib-s3" = callPackage
@@ -103214,8 +96876,6 @@ self: {
        ];
        description = "Gitlib repository backend for storing Git objects in Amazon S3";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlib-sample" = callPackage
@@ -103229,8 +96889,6 @@ self: {
        ];
        description = "Sample backend for gitlib showing the basic structure for any backend";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlib-test" = callPackage
@@ -103249,8 +96907,6 @@ self: {
        ];
        description = "Test library for confirming gitlib backend compliance";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlib-utils" = callPackage
@@ -103269,8 +96925,6 @@ self: {
        ];
        description = "Generic utility functions for working with Git repositories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitrev" = callPackage
@@ -103311,8 +96965,6 @@ self: {
        ];
        description = "A document store library for Git + JSON";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitter" = callPackage
@@ -103328,8 +96980,6 @@ self: {
        ];
        description = "Gitter.im API client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "givegif" = callPackage
@@ -103444,8 +97094,6 @@ self: {
        libraryPkgconfigDepends = [ libglade ];
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.gnome2) libglade;};
 
   "gladexml-accessor" = callPackage
@@ -103457,8 +97105,6 @@ self: {
        libraryHaskellDepends = [ base glade HaXml template-haskell ];
        description = "Automagically declares getters for widget handles in specified interface file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glambda" = callPackage
@@ -103499,8 +97145,6 @@ self: {
        ];
        description = "An OpenGL micro framework";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glasso" = callPackage
@@ -103546,8 +97190,6 @@ self: {
        ];
        description = "Extensible effects using ContT, State and variants";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glazier-pipes" = callPackage
@@ -103563,8 +97205,6 @@ self: {
        ];
        description = "A threaded rendering framework using glaizer and pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glazier-react" = callPackage
@@ -103584,8 +97224,6 @@ self: {
        ];
        description = "ReactJS binding using Glazier.Command.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glazier-react-examples" = callPackage
@@ -103610,8 +97248,6 @@ self: {
        ];
        description = "Examples of using glazier-react";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glazier-react-widget" = callPackage
@@ -103631,8 +97267,6 @@ self: {
        ];
        description = "Generic widget library using glazier-react";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gli" = callPackage
@@ -103657,8 +97291,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Tiny cli to fetch PR info from gitlab";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glib" = callPackage
@@ -103692,8 +97324,6 @@ self: {
        testHaskellDepends = [ base data-default hspec lens QuickCheck ];
        description = "Glicko-2 implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glider-nlp" = callPackage
@@ -103706,8 +97336,6 @@ self: {
        testHaskellDepends = [ base Cabal containers hspec text ];
        description = "Natural Language Processing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glintcollider" = callPackage
@@ -103785,8 +97413,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion Glob MissingH ];
        description = "Haskell bindings for POSIX glob library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "global" = callPackage
@@ -103804,8 +97430,6 @@ self: {
        ];
        description = "Library enabling unique top-level declarations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "global-config" = callPackage
@@ -103826,8 +97450,6 @@ self: {
        ];
        description = "Global mutable configuration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "global-lock" = callPackage
@@ -103850,8 +97472,6 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        description = "Namespaced, global, and top-level mutable variables without unsafePerformIO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glome-hs" = callPackage
@@ -103875,8 +97495,6 @@ self: {
        doHaddock = false;
        description = "ray tracer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss_1_9_2_1" = callPackage
@@ -103923,8 +97541,6 @@ self: {
        ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-algorithms" = callPackage
@@ -103936,8 +97552,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-banana" = callPackage
@@ -103951,8 +97565,6 @@ self: {
        libraryHaskellDepends = [ base gloss reactive-banana ];
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-devil" = callPackage
@@ -103964,8 +97576,6 @@ self: {
        libraryHaskellDepends = [ base bytestring gloss repa repa-devil ];
        description = "Display images in Gloss using libdevil for decoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-examples" = callPackage
@@ -103985,8 +97595,6 @@ self: {
        ];
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-export" = callPackage
@@ -104006,8 +97614,6 @@ self: {
        testHaskellDepends = [ base directory filepath gloss JuicyPixels ];
        description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-game" = callPackage
@@ -104019,8 +97625,6 @@ self: {
        libraryHaskellDepends = [ base gloss gloss-juicy ];
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-juicy" = callPackage
@@ -104057,8 +97661,6 @@ self: {
        ];
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-raster-accelerate" = callPackage
@@ -104101,8 +97703,6 @@ self: {
        libraryHaskellDepends = [ base gloss sodium ];
        description = "A Sodium interface to the Gloss drawing package";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glpk-headers" = callPackage
@@ -104121,8 +97721,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Low-level Haskell bindings to GLPK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) glpk;};
 
   "glpk-hs" = callPackage
@@ -104141,8 +97739,6 @@ self: {
        ];
        description = "Comprehensive GLPK linear programming bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) glpk;};
 
   "gltf-codec" = callPackage
@@ -104161,8 +97757,6 @@ self: {
        testHaskellDepends = [ base bytestring directory filepath shower ];
        description = "glTF scene loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glue" = callPackage
@@ -104192,8 +97786,6 @@ self: {
        ];
        description = "Make better services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glue-common" = callPackage
@@ -104314,8 +97906,6 @@ self: {
        ];
        description = "Composable maps and generic tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gmndl" = callPackage
@@ -104334,8 +97924,6 @@ self: {
        ];
        description = "Mandelbrot Set explorer using GTK";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gmpint" = callPackage
@@ -104363,8 +97951,6 @@ self: {
        ];
        description = "Randomly set a picture as the GNOME desktop background";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gnome-keyring" = callPackage
@@ -104399,8 +97985,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME Virtual File System library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gnome-vfs = null; gnome-vfs_module = null;};
 
   "gnss-converters" = callPackage
@@ -104428,8 +98012,6 @@ self: {
        ];
        description = "GNSS Converters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gnuidn" = callPackage
@@ -104452,8 +98034,6 @@ self: {
        testToolDepends = [ c2hs ];
        description = "Bindings for GNU IDN";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libidn;};
 
   "gnuplot" = callPackage
@@ -104503,8 +98083,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        description = "GHCi bindings to lambdabot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goal-core" = callPackage
@@ -104524,8 +98102,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Core imports for Geometric Optimization Libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goal-geometry" = callPackage
@@ -104540,8 +98116,6 @@ self: {
        executableHaskellDepends = [ base goal-core ];
        description = "Scientific computing on geometric objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goal-probability" = callPackage
@@ -104561,8 +98135,6 @@ self: {
        executableHaskellDepends = [ base goal-core goal-geometry vector ];
        description = "Manifolds of probability distributions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goal-simulation" = callPackage
@@ -104586,8 +98158,6 @@ self: {
        ];
        description = "Mealy based simulation tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goat" = callPackage
@@ -104622,8 +98192,6 @@ self: {
        testHaskellDepends = [ base containers HUnit mtl parsec ];
        description = "A monadic take on a 2,500-year-old board game - library";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goatee-gtk" = callPackage
@@ -104644,8 +98212,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "A monadic take on a 2,500-year-old board game - GTK+ UI";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gochan" = callPackage
@@ -104667,8 +98233,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-core ];
        description = "Go-style channels";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "godot-haskell" = callPackage
@@ -104691,8 +98255,6 @@ self: {
        doHaddock = false;
        description = "Haskell bindings for the Godot game engine API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gofer-prelude" = callPackage
@@ -104704,8 +98266,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "The Gofer 2.30 standard prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goggles" = callPackage
@@ -106994,8 +100554,6 @@ self: {
        libraryHaskellDepends = [ base renderable transformers varying ];
        description = "Graphical user interfaces that are renderable, change over time and eventually produce a value";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-cloud" = callPackage
@@ -107015,8 +100573,6 @@ self: {
        ];
        description = "Client for the Google Cloud APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-dictionary" = callPackage
@@ -107051,8 +100607,6 @@ self: {
        ];
        description = "Google Drive API access";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-html5-slide" = callPackage
@@ -107071,8 +100625,6 @@ self: {
        ];
        description = "Google HTML5 Slide generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-isbn" = callPackage
@@ -107103,8 +100655,6 @@ self: {
        testHaskellDepends = [ base google-search text time xml-conduit ];
        description = "Write GMail filters and output to importable XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-maps-geocoding" = callPackage
@@ -107121,8 +100671,6 @@ self: {
        ];
        description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-oauth2" = callPackage
@@ -107143,8 +100691,6 @@ self: {
        ];
        description = "Google OAuth2 token negotiation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-oauth2-easy" = callPackage
@@ -107164,8 +100710,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Opininated use of Google Authentication for ease";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-oauth2-for-cli" = callPackage
@@ -107209,8 +100753,6 @@ self: {
        libraryHaskellDepends = [ base free nats text time ];
        description = "EDSL for Google and GMail search expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-server-api" = callPackage
@@ -107234,8 +100776,6 @@ self: {
        ];
        description = "Google APIs for server to server applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-static-maps" = callPackage
@@ -107255,8 +100795,6 @@ self: {
        ];
        description = "Bindings to the Google Maps Static API (formerly Static Maps API)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-translate" = callPackage
@@ -107273,8 +100811,6 @@ self: {
        ];
        description = "Google Translate API bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "googleplus" = callPackage
@@ -107292,8 +100828,6 @@ self: {
        ];
        description = "Haskell implementation of the Google+ API v1";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "googlepolyline" = callPackage
@@ -107312,8 +100846,6 @@ self: {
        ];
        description = "Google Polyline Encoder/Decoder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gopher-proxy" = callPackage
@@ -107351,8 +100883,6 @@ self: {
        ];
        description = "Spidering robot to download files from Gopherspace";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gopro-plus" = callPackage
@@ -107381,8 +100911,6 @@ self: {
        ];
        description = "GoPro Plus Client API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash" = callPackage
@@ -107401,8 +100929,6 @@ self: {
        ];
        description = "Core of FRP game engine called Gore&Ash";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-actor" = callPackage
@@ -107420,8 +100946,6 @@ self: {
        ];
        description = "Gore&Ash engine extension that implements actor style of programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-async" = callPackage
@@ -107444,8 +100968,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "gore-and-ash-demo" = callPackage
@@ -107471,8 +100993,6 @@ self: {
        ];
        description = "Demonstration game for Gore&Ash game engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-glfw" = callPackage
@@ -107489,8 +101009,6 @@ self: {
        ];
        description = "Core module for Gore&Ash engine for GLFW input events";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-lambdacube" = callPackage
@@ -107510,8 +101028,6 @@ self: {
        ];
        description = "Core module for Gore&Ash engine that do something";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-logging" = callPackage
@@ -107530,8 +101046,6 @@ self: {
        ];
        description = "Core module for gore-and-ash with logging utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-network" = callPackage
@@ -107553,8 +101067,6 @@ self: {
        ];
        description = "Core module for Gore&Ash engine with low level network API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-sdl" = callPackage
@@ -107573,8 +101085,6 @@ self: {
        ];
        description = "Gore&Ash core module for integration with SDL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-sync" = callPackage
@@ -107594,8 +101104,6 @@ self: {
        ];
        description = "Gore&Ash module for high level network synchronization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gothic" = callPackage
@@ -107633,8 +101141,6 @@ self: {
        ];
        description = "A command line utility for practicing typing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gpah" = callPackage
@@ -107655,8 +101161,6 @@ self: {
        ];
        description = "Generic Programming Use in Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gpcsets" = callPackage
@@ -107721,8 +101225,6 @@ self: {
        ];
        description = "For manipulating GPS coordinates and trails";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gps2htmlReport" = callPackage
@@ -107743,8 +101245,6 @@ self: {
        ];
        description = "GPS to HTML Summary Report";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gpx-conduit" = callPackage
@@ -107761,8 +101261,6 @@ self: {
        ];
        description = "Read GPX files using conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grab" = callPackage
@@ -107804,8 +101302,6 @@ self: {
        ];
        description = "Library to write graceful shutdown / upgrade service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grafana" = callPackage
@@ -107824,8 +101320,6 @@ self: {
        ];
        description = "API for creating grafana dashboards represented as json";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graflog" = callPackage
@@ -107844,8 +101338,6 @@ self: {
        ];
        description = "Monadic correlated log events";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grakn" = callPackage
@@ -107869,8 +101361,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A Haskell client for Grakn";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grammar-combinators" = callPackage
@@ -107888,8 +101378,6 @@ self: {
        ];
        description = "A parsing library of context-free grammar combinators";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grammatical-parsers" = callPackage
@@ -107941,8 +101429,6 @@ self: {
        ];
        description = "Examples using the Grapefruit library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grapefruit-frp" = callPackage
@@ -107960,8 +101446,6 @@ self: {
        ];
        description = "Functional Reactive Programming core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grapefruit-records" = callPackage
@@ -107973,8 +101457,6 @@ self: {
        libraryHaskellDepends = [ arrows base grapefruit-frp ];
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grapefruit-ui" = callPackage
@@ -107993,8 +101475,6 @@ self: {
        ];
        description = "Declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grapefruit-ui-gtk" = callPackage
@@ -108014,8 +101494,6 @@ self: {
        ];
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph" = callPackage
@@ -108050,8 +101528,6 @@ self: {
        ];
        description = "Fast, memory efficient and persistent graph implementation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-generators" = callPackage
@@ -108087,8 +101563,6 @@ self: {
        libraryHaskellDepends = [ base containers fgl ];
        description = "An implementation of algorithms for matchings in graphs";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting" = callPackage
@@ -108102,8 +101576,6 @@ self: {
        ];
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-cl" = callPackage
@@ -108123,8 +101595,6 @@ self: {
        ];
        description = "Interactive graph rewriting system implementing various well-known combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-gl" = callPackage
@@ -108141,8 +101611,6 @@ self: {
        ];
        description = "OpenGL interface for interactive port graph rewriting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-lambdascope" = callPackage
@@ -108164,8 +101632,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "graph-rewriting-layout" = callPackage
@@ -108181,8 +101647,6 @@ self: {
        ];
        description = "Force-directed node placement intended for incremental graph drawing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-ski" = callPackage
@@ -108202,8 +101666,6 @@ self: {
        ];
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-strategies" = callPackage
@@ -108219,8 +101681,6 @@ self: {
        ];
        description = "Evaluation strategies for port-graph rewriting systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-trs" = callPackage
@@ -108242,8 +101702,6 @@ self: {
        ];
        description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-ww" = callPackage
@@ -108264,8 +101722,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "graph-serialize" = callPackage
@@ -108277,8 +101733,6 @@ self: {
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "Serialization of data structures with references";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-utils" = callPackage
@@ -108294,8 +101748,6 @@ self: {
        ];
        description = "A simple wrapper & quasi quoter for fgl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-visit" = callPackage
@@ -108311,8 +101763,6 @@ self: {
        ];
        description = "Graph walk abstraction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-wrapper" = callPackage
@@ -108346,8 +101796,6 @@ self: {
        ];
        description = "A declarative, monadic graph construction language for small graphs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphene" = callPackage
@@ -108364,8 +101812,6 @@ self: {
        ];
        description = "A minimal Graph Theory library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphics-drawingcombinators" = callPackage
@@ -108383,8 +101829,6 @@ self: {
        ];
        description = "A functional interface to 2D drawing in OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphics-formats-collada" = callPackage
@@ -108400,8 +101844,6 @@ self: {
        ];
        description = "Load 3D geometry in the COLLADA format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphicsFormats" = callPackage
@@ -108413,8 +101855,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ];
        description = "Classes for renderable objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphicstools" = callPackage
@@ -108433,8 +101873,6 @@ self: {
        executableHaskellDepends = [ base CV wx wxcore ];
        description = "Tools for creating graphical UIs, based on wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphite" = callPackage
@@ -108491,8 +101929,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A reimplementation of graphmod as a source plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphql" = callPackage
@@ -108517,8 +101953,6 @@ self: {
        ];
        description = "Haskell GraphQL implementation";
        license = "MPL-2.0 AND BSD-3-Clause";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphql-api" = callPackage
@@ -108578,8 +102012,6 @@ self: {
        ];
        description = "A client for Haskell programs to query a GraphQL API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphql-utils" = callPackage
@@ -108595,8 +102027,6 @@ self: {
        ];
        description = "GraphQL Utils";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphql-w-persistent" = callPackage
@@ -108608,8 +102038,6 @@ self: {
        libraryHaskellDepends = [ base containers json text ];
        description = "GraphQL interface middleware for SQL databases";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphs" = callPackage
@@ -108638,8 +102066,6 @@ self: {
        libraryHaskellDepends = [ base indexed ];
        description = "Graph indexed monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphtype" = callPackage
@@ -108657,8 +102083,6 @@ self: {
        ];
        description = "A simple tool to illustrate dependencies between Haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphviz" = callPackage
@@ -108702,8 +102126,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Execute Graql queries on a Grakn graph";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grasp" = callPackage
@@ -108728,8 +102150,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "GRASP implementation for the AMMM project";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gravatar" = callPackage
@@ -108758,8 +102178,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Gray code encoder/decoder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gray-extended" = callPackage
@@ -108812,8 +102230,6 @@ self: {
        executableHaskellDepends = [ array base containers pretty ];
        description = "GreenCard, a foreign function pre-processor for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "greencard-lib" = callPackage
@@ -108826,8 +102242,6 @@ self: {
        libraryHaskellDepends = [ array base containers greencard pretty ];
        description = "A foreign function interface pre-processor library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "greenclip" = callPackage
@@ -108864,8 +102278,6 @@ self: {
        ];
        description = "A scalable distributed logger with a high-precision global time axis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gremlin-haskell" = callPackage
@@ -108889,8 +102301,6 @@ self: {
        testHaskellDepends = [ aeson-qq base hspec lens lens-aeson mtl ];
        description = "Graph database client for TinkerPop3 Gremlin Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grenade" = callPackage
@@ -108914,8 +102324,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion hmatrix ];
        description = "Practical Deep Learning in Haskell";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "greplicate" = callPackage
@@ -109035,8 +102443,6 @@ self: {
        ];
        description = "Grid-based prototyping framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gridbounds" = callPackage
@@ -109049,8 +102455,6 @@ self: {
        testHaskellDepends = [ base earclipper gjk gridbox hspec ];
        description = "Collision detection for GridBox";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gridbox" = callPackage
@@ -109099,8 +102503,6 @@ self: {
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grids" = callPackage
@@ -109144,8 +102546,6 @@ self: {
        executableToolDepends = [ happy ];
        description = "grm grammar converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "groom" = callPackage
@@ -109209,8 +102609,6 @@ self: {
        ];
        description = "Command line utility to manage AWS ECS resources";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gross" = callPackage
@@ -109225,8 +102623,6 @@ self: {
        executableHaskellDepends = [ base lens mtl ncurses ];
        description = "A spoof on gloss for terminal animation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "groundhog" = callPackage
@@ -109264,8 +102660,6 @@ self: {
        ];
        description = "Extended Converter Library for groundhog embedded types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "groundhog-inspector" = callPackage
@@ -109391,8 +102785,6 @@ self: {
        ];
        description = "Classify objects by key-generating function, like SQL GROUP BY";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "groupBy" = callPackage
@@ -109425,8 +102817,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "groupoid" = callPackage
@@ -109472,8 +102862,6 @@ self: {
        libraryHaskellDepends = [ base generic-data groups ];
        description = "Generically derive Group instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "growler" = callPackage
@@ -109495,8 +102883,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "grpc-api-etcd" = callPackage
@@ -109508,8 +102894,6 @@ self: {
        libraryHaskellDepends = [ base proto-lens proto-lens-runtime ];
        description = "Generated messages and instances for etcd gRPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grpc-etcd-client" = callPackage
@@ -109526,8 +102910,6 @@ self: {
        ];
        description = "gRPC client for etcd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grpc-haskell" = callPackage
@@ -109556,8 +102938,6 @@ self: {
        ];
        description = "Haskell implementation of gRPC layered on shared C library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grpc-haskell-core" = callPackage
@@ -109583,8 +102963,6 @@ self: {
        ];
        description = "Haskell implementation of gRPC layered on shared C library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gpr = null; inherit (pkgs) grpc;};
 
   "gruff" = callPackage
@@ -109606,8 +102984,6 @@ self: {
        ];
        description = "fractal explorer GUI using the ruff library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gruff-examples" = callPackage
@@ -109626,8 +103002,6 @@ self: {
        ];
        description = "Mandelbrot Set examples using ruff and gruff";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gsasl" = callPackage
@@ -109673,8 +103047,6 @@ self: {
        ];
        description = "scrapes google scholar, provides RSS feed";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gsl-random" = callPackage
@@ -109687,8 +103059,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Bindings the the GSL random number generation facilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gsl-random-fu" = callPackage
@@ -109700,8 +103070,6 @@ self: {
        libraryHaskellDepends = [ base gsl-random random-fu ];
        description = "Instances for using gsl-random with random-fu";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gsmenu" = callPackage
@@ -109766,8 +103134,6 @@ self: {
        ];
        description = "Generic implementation of Storable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gstreamer" = callPackage
@@ -109787,8 +103153,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gst-plugins-base = null; gstreamer = null;};
 
   "gt-tools" = callPackage
@@ -109822,8 +103186,6 @@ self: {
        ];
        description = "The General Transit Feed Specification format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtfs-realtime" = callPackage
@@ -109839,8 +103201,6 @@ self: {
        ];
        description = "GTFS RealTime protobafs library (autogenerated from .proto file)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtk" = callPackage
@@ -109935,8 +103295,6 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        description = "GTK+ Serialized event";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk2;};
 
   "gtk-simple-list-view" = callPackage
@@ -109978,8 +103336,6 @@ self: {
        ];
        description = "A standalone StatusNotifierItem/AppIndicator tray";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "gtk-strut" = callPackage
@@ -109991,8 +103347,6 @@ self: {
        libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ];
        description = "Libary for creating strut windows with gi-gtk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtk-toggle-button-list" = callPackage
@@ -110015,8 +103369,6 @@ self: {
        libraryHaskellDepends = [ base containers gtk ];
        description = "Convenient Gtk canvas with mouse and keyboard input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtk-traymanager" = callPackage
@@ -110168,8 +103520,6 @@ self: {
        executableHaskellDepends = [ base glib gtk3 transformers ];
        description = "Gtk2Hs Hello World, an example package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtk2hs-rpn" = callPackage
@@ -110181,8 +103531,6 @@ self: {
        libraryHaskellDepends = [ base cairo glib gtk mtl ];
        description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtk3" = callPackage
@@ -110234,8 +103582,6 @@ self: {
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gtk-mac-integration-gtk3 = null;};
 
   "gtkglext" = callPackage
@@ -110254,8 +103600,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; 
          inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; 
          inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu; 
@@ -110277,8 +103621,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkImageView library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtkimageview;};
 
   "gtkrsync" = callPackage
@@ -110297,8 +103639,6 @@ self: {
        ];
        description = "Gnome rsync progress display";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtksourceview2" = callPackage
@@ -110318,8 +103658,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtksourceview;};
 
   "gtksourceview3" = callPackage
@@ -110339,8 +103677,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtksourceview3;};
 
   "guarded-allocation" = callPackage
@@ -110363,8 +103699,6 @@ self: {
        libraryHaskellDepends = [ base instant-generics ];
        description = "Datatype-generic rewriting with preconditions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "guess-combinator" = callPackage
@@ -110376,8 +103710,6 @@ self: {
        libraryHaskellDepends = [ base HList ];
        description = "Generate simple combinators given their type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "guid" = callPackage
@@ -110404,8 +103736,6 @@ self: {
        executableHaskellDepends = [ base cairo containers filepath gtk ];
        description = "graphical untyped lambda calculus interactive interpreter";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gutenberg-fibonaccis" = callPackage
@@ -110430,8 +103760,6 @@ self: {
        executableHaskellDepends = [ base unix ];
        description = "ghcWithPackages cmdline util";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gyah-bin" = callPackage
@@ -110445,8 +103773,6 @@ self: {
        executableHaskellDepends = [ base extra GiveYouAHead ];
        description = "A binary version of GiveYouAHead";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gym-http-api" = callPackage
@@ -110491,8 +103817,6 @@ self: {
        ];
        description = "Haskell library for retrieving data from various booru image sites";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "h-gpgme" = callPackage
@@ -110516,8 +103840,6 @@ self: {
        ];
        description = "High Level Binding for GnuPG Made Easy (gpgme)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "h-reversi" = callPackage
@@ -110541,8 +103863,6 @@ self: {
        ];
        description = "Reversi game in haskell/blank-canvas";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "h2048" = callPackage
@@ -110569,8 +103889,6 @@ self: {
        ];
        description = "An Implementation of Game 2048";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "h2c" = callPackage
@@ -110582,8 +103900,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl resourcet ];
        description = "Bindings to Linux I2C with support for repeated-start transactions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hArduino" = callPackage
@@ -110599,8 +103915,6 @@ self: {
        ];
        description = "Control your Arduino board from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hBDD" = callPackage
@@ -110627,8 +103941,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to CMU/Long's BDD library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {bdd = null; mem = null;};
 
   "hBDD-CUDD" = callPackage
@@ -110644,8 +103956,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to the CUDD library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) cudd; epd = null; inherit (pkgs) mtr; 
          inherit (pkgs) st; util = null;};
 
@@ -110677,8 +103987,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "interface to CSound API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {csound64 = null; inherit (pkgs) libsndfile;};
 
   "hDFA" = callPackage
@@ -110690,8 +103998,6 @@ self: {
        libraryHaskellDepends = [ base containers directory process ];
        description = "A simple library for representing and minimising DFAs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hF2" = callPackage
@@ -110704,8 +104010,6 @@ self: {
        libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hGelf" = callPackage
@@ -110722,8 +104026,6 @@ self: {
        ];
        description = "Haskell GELF library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hLLVM" = callPackage
@@ -110766,8 +104068,6 @@ self: {
        ];
        description = "Library to interact with the @Mollom anti-spam service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hOff-display" = callPackage
@@ -110782,8 +104082,6 @@ self: {
        executableHaskellDepends = [ base GLFW hOff-parser OpenGL parsec ];
        description = "The tool to transform the OFF to other image format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hOff-parser" = callPackage
@@ -110842,8 +104140,6 @@ self: {
        ];
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hPDB" = callPackage
@@ -110863,8 +104159,6 @@ self: {
        ];
        description = "Protein Databank file format library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hPDB-examples" = callPackage
@@ -110891,8 +104185,6 @@ self: {
        ];
        description = "Examples for hPDB library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hPushover" = callPackage
@@ -110908,8 +104200,6 @@ self: {
        ];
        description = "Pushover.net API functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hR" = callPackage
@@ -110921,8 +104211,6 @@ self: {
        libraryHaskellDepends = [ array base containers unix ];
        description = "R bindings and interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hRESP" = callPackage
@@ -110969,8 +104257,6 @@ self: {
        ];
        description = "A Haskell library to scrape and crawl web-pages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hSimpleDB" = callPackage
@@ -110987,8 +104273,6 @@ self: {
        ];
        description = "Interface to Amazon's SimpleDB service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hTalos" = callPackage
@@ -111002,8 +104286,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Parser, print and manipulate structures in PDB file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hTensor" = callPackage
@@ -111015,8 +104297,6 @@ self: {
        libraryHaskellDepends = [ base containers hmatrix random ];
        description = "Multidimensional arrays and simple tensor computations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hVOIDP" = callPackage
@@ -111032,8 +104312,6 @@ self: {
        executableSystemDepends = [ blas liblapack ];
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas; liblapack = null;};
 
   "hXmixer" = callPackage
@@ -111067,8 +104345,6 @@ self: {
        ];
        description = "Haar wavelet transforms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "habit" = callPackage
@@ -111093,8 +104369,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Haskell message bot framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hable" = callPackage
@@ -111126,8 +104400,6 @@ self: {
        ];
        description = "A minimalist static blog generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hablog" = callPackage
@@ -111150,8 +104422,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A blog system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hacanon-light" = callPackage
@@ -111194,8 +104464,6 @@ self: {
        ];
        description = "Hack contrib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-contrib-press" = callPackage
@@ -111212,8 +104480,6 @@ self: {
        ];
        description = "Hack helper that renders Press templates";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-frontend-happstack" = callPackage
@@ -111231,8 +104497,6 @@ self: {
        ];
        description = "hack-frontend-happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-frontend-monadcgi" = callPackage
@@ -111255,8 +104519,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hack ];
        description = "Hack handler using CGI protocol. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-handler-epoll" = callPackage
@@ -111275,8 +104537,6 @@ self: {
        ];
        description = "hack handler implementation using epoll";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-handler-evhttp" = callPackage
@@ -111295,8 +104555,6 @@ self: {
        librarySystemDepends = [ event ];
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {event = null;};
 
   "hack-handler-fastcgi" = callPackage
@@ -111309,8 +104567,6 @@ self: {
        librarySystemDepends = [ fcgi ];
        description = "Hack handler direct to fastcgi (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fcgi;};
 
   "hack-handler-happstack" = callPackage
@@ -111328,8 +104584,6 @@ self: {
        ];
        description = "Hack Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-handler-hyena" = callPackage
@@ -111346,8 +104600,6 @@ self: {
        ];
        description = "Hyena hack handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-handler-kibro" = callPackage
@@ -111362,8 +104614,6 @@ self: {
        ];
        description = "Hack Kibro handler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-handler-simpleserver" = callPackage
@@ -111379,8 +104629,6 @@ self: {
        ];
        description = "A simplistic HTTP server handler for Hack. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-middleware-cleanpath" = callPackage
@@ -111394,8 +104642,6 @@ self: {
        ];
        description = "Applies some basic redirect rules to get cleaner paths. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-middleware-clientsession" = callPackage
@@ -111411,8 +104657,6 @@ self: {
        ];
        description = "Middleware for easily keeping session data in client cookies. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-middleware-gzip" = callPackage
@@ -111439,8 +104683,6 @@ self: {
        ];
        description = "Automatic wrapping of JSON responses to convert into JSONP. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack2" = callPackage
@@ -111503,8 +104745,6 @@ self: {
        ];
        description = "Hack2 Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack2-handler-mongrel2-http" = callPackage
@@ -111525,8 +104765,6 @@ self: {
        ];
        description = "Hack2 Mongrel2 HTTP handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack2-handler-snap-server" = callPackage
@@ -111545,8 +104783,6 @@ self: {
        ];
        description = "Hack2 Snap server handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack2-handler-warp" = callPackage
@@ -111563,8 +104799,6 @@ self: {
        ];
        description = "Hack2 warp handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack2-interface-wai" = callPackage
@@ -111621,8 +104855,6 @@ self: {
        ];
        description = "Compare the public API of different versions of a Hackage library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-mirror" = callPackage
@@ -111652,8 +104884,6 @@ self: {
        ];
        description = "Simple mirroring utility for Hackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-plot" = callPackage
@@ -111685,8 +104915,6 @@ self: {
        executableHaskellDepends = [ base Cabal containers hackage-db ];
        description = "Process 00-index.tar.gz from Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-proxy" = callPackage
@@ -111710,8 +104938,6 @@ self: {
        ];
        description = "Provide a proxy for Hackage which modifies responses in some way. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-repo-tool" = callPackage
@@ -111734,8 +104960,6 @@ self: {
        ];
        description = "Manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-security" = callPackage
@@ -111780,8 +105004,6 @@ self: {
        ];
        description = "Hackage security bindings against the HTTP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-server" = callPackage
@@ -111820,8 +105042,6 @@ self: {
        ];
        description = "The Hackage web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-sparks" = callPackage
@@ -111858,8 +105078,6 @@ self: {
        ];
        description = "Check for differences between working directory and hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage2hwn" = callPackage
@@ -111873,8 +105091,6 @@ self: {
        executableHaskellDepends = [ base download feed tagsoup ];
        description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage2twitter" = callPackage
@@ -111888,8 +105104,6 @@ self: {
        executableHaskellDepends = [ base feed feed2twitter ];
        description = "Send new Hackage releases to Twitter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackager" = callPackage
@@ -111907,8 +105121,6 @@ self: {
        ];
        description = "Hackage testing tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackernews" = callPackage
@@ -111933,8 +105145,6 @@ self: {
        ];
        description = "API for Hacker News";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackertyper" = callPackage
@@ -111971,8 +105181,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Generate useful files for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackport" = callPackage
@@ -112006,8 +105214,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Hackage and Portage integration tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hactor" = callPackage
@@ -112024,8 +105230,6 @@ self: {
        ];
        description = "Lightweight Erlang-style actors for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hactors" = callPackage
@@ -112037,8 +105241,6 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "Practical actors for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddock_2_22_0" = callPackage
@@ -112149,8 +105351,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A documentation-only package exemplifying haddock markup features";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddock-leksah" = callPackage
@@ -112169,8 +105369,6 @@ self: {
        ];
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddock-library_1_7_0" = callPackage
@@ -112229,8 +105427,6 @@ self: {
        ];
        description = "Test utilities for Haddock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddocset" = callPackage
@@ -112252,8 +105448,6 @@ self: {
        ];
        description = "Generate docset of Dash by Haddock haskell documentation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hadolint" = callPackage
@@ -112299,8 +105493,6 @@ self: {
        testHaskellDepends = [ base bytestring filepath text vector ];
        description = "Read/write file formats commonly used by Hadoop";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) snappy;};
 
   "hadoop-rpc" = callPackage
@@ -112321,8 +105513,6 @@ self: {
        testHaskellDepends = [ base protobuf tasty tasty-hunit vector ];
        description = "Use the Hadoop RPC interface from Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hadoop-streaming" = callPackage
@@ -112364,8 +105554,6 @@ self: {
        ];
        description = "Fast command line tools for working with Hadoop";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haeredes" = callPackage
@@ -112396,8 +105584,6 @@ self: {
        testHaskellDepends = [ base intervals mtl QuickCheck ];
        description = "Affine arithmetic library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haggis" = callPackage
@@ -112424,8 +105610,6 @@ self: {
        ];
        description = "A static site generator with blogging/comments support";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haggle" = callPackage
@@ -112478,8 +105662,6 @@ self: {
        executableHaskellDepends = [ base time ];
        description = "Analytic Hierarchy Process";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haiji" = callPackage
@@ -112502,8 +105684,6 @@ self: {
        ];
        description = "A typed template engine, subset of jinja2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hail" = callPackage
@@ -112557,8 +105737,6 @@ self: {
        ];
        description = "A program to send emails throught the Mailgun api";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hailgun-simple" = callPackage
@@ -112663,8 +105841,6 @@ self: {
        ];
        description = "A JSON REST API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakaru" = callPackage
@@ -112694,8 +105870,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim ];
        description = "A probabilistic programming embedded DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hake" = callPackage
@@ -112723,8 +105897,6 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Akismet spam protection library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakka" = callPackage
@@ -112739,8 +105911,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Minimal akka-inspired actor library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hako" = callPackage
@@ -112757,8 +105927,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "A mako-like quasi-quoter template library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll" = callPackage
@@ -112796,8 +105964,6 @@ self: {
        testToolDepends = [ utillinux ];
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
@@ -112812,8 +105978,6 @@ self: {
        ];
        description = "A package allowing to write Hakyll blog posts in Rmd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-agda" = callPackage
@@ -112830,8 +105994,6 @@ self: {
        ];
        description = "Wrapper to integrate literate Agda files with Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-alectryon" = callPackage
@@ -112848,8 +106010,6 @@ self: {
        ];
        description = "Hakyll extension for rendering Coq code using Alectryon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-blaze-templates" = callPackage
@@ -112861,8 +106021,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ];
        description = "Blaze templates for Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-contrib" = callPackage
@@ -112878,8 +106036,6 @@ self: {
        executableHaskellDepends = [ base directory filepath hakyll ];
        description = "Extra modules for the hakyll website compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-contrib-csv" = callPackage
@@ -112896,8 +106052,6 @@ self: {
        testHaskellDepends = [ base blaze-html bytestring cassava hspec ];
        description = "Generate Html tables from Csv files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-contrib-elm" = callPackage
@@ -112916,8 +106070,6 @@ self: {
        executableHaskellDepends = [ base hakyll ];
        description = "Compile Elm code for inclusion in Hakyll static site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-contrib-hyphenation" = callPackage
@@ -112929,8 +106081,6 @@ self: {
        libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ];
        description = "automatic hyphenation for Hakyll";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-contrib-links" = callPackage
@@ -112950,8 +106100,6 @@ self: {
        ];
        description = "A hakyll library that helps maintain a separate links database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-convert" = callPackage
@@ -112973,8 +106121,6 @@ self: {
        ];
        description = "Convert from other blog engines to Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-dhall" = callPackage
@@ -112995,8 +106141,6 @@ self: {
        executableHaskellDepends = [ base dhall hakyll ];
        description = "Dhall compiler for Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-dir-list" = callPackage
@@ -113011,8 +106155,6 @@ self: {
        ];
        description = "Allow Hakyll to create hierarchical menues from directories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-elm" = callPackage
@@ -113041,8 +106183,6 @@ self: {
        executableHaskellDepends = [ base hakyll ];
        testHaskellDepends = [ base ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-filestore" = callPackage
@@ -113057,8 +106197,6 @@ self: {
        ];
        description = "FileStore utilities for Hakyll";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-images" = callPackage
@@ -113080,8 +106218,6 @@ self: {
        ];
        description = "Hakyll utilities to work with images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-ogmarkup" = callPackage
@@ -113093,8 +106229,6 @@ self: {
        libraryHaskellDepends = [ base hakyll ogmarkup ];
        description = "Integrate ogmarkup document with Hakyll";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-process" = callPackage
@@ -113106,8 +106240,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hakyll typed-process ];
        description = "Hakyll compiler for arbitrary external processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-sass" = callPackage
@@ -113123,8 +106255,6 @@ self: {
        ];
        description = "Hakyll SASS compiler over hsass";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-series" = callPackage
@@ -113136,8 +106266,6 @@ self: {
        libraryHaskellDepends = [ base containers hakyll ];
        description = "Adds series functionality to hakyll";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-shakespeare" = callPackage
@@ -113155,8 +106283,6 @@ self: {
        ];
        description = "Hakyll Hamlet compiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-shortcode" = callPackage
@@ -113178,8 +106304,6 @@ self: {
        ];
        description = "A shortcode extension module for Hakyll";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-shortcut-links" = callPackage
@@ -113196,8 +106320,6 @@ self: {
        testHaskellDepends = [ base hspec mtl pandoc text ];
        description = "Use shortcut-links in markdown file for Hakyll";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-typescript" = callPackage
@@ -113214,8 +106336,6 @@ self: {
        testHaskellDepends = [ base directory hakyll tasty tasty-hunit ];
        description = "Typescript and javascript hakyll compilers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hal" = callPackage
@@ -113233,8 +106353,6 @@ self: {
        ];
        description = "A runtime environment for Haskell applications running on AWS Lambda";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "halberd" = callPackage
@@ -113263,8 +106381,6 @@ self: {
        ];
        description = "A tool to generate missing import statements for Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "half" = callPackage
@@ -113301,8 +106417,6 @@ self: {
        ];
        description = "The HAskelL File System (\"halfs\" -- intended for use on the HaLVM)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "halipeto" = callPackage
@@ -113316,8 +106430,6 @@ self: {
        libraryHaskellDepends = [ base directory HaXml pandoc ];
        description = "Haskell Static Web Page Generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "halive" = callPackage
@@ -113347,8 +106459,6 @@ self: {
        ];
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hall-symbols" = callPackage
@@ -113365,8 +106475,6 @@ self: {
        ];
        description = "Symmetry operations generater of Hall Symbols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "halma" = callPackage
@@ -113405,8 +106513,6 @@ self: {
        ];
        description = "GTK application for playing Halma";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "halma-telegram-bot" = callPackage
@@ -113431,8 +106537,6 @@ self: {
        ];
        description = "Telegram bot for playing Halma";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haltavista" = callPackage
@@ -113458,8 +106562,6 @@ self: {
        testHaskellDepends = [ base hedgehog lens ];
        description = "Split or combine data structures to and from halves, quarters, eighths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "halvm-web" = callPackage
@@ -113506,8 +106608,6 @@ self: {
        ];
        testHaskellDepends = [ base bytestring ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hamid" = callPackage
@@ -113574,8 +106674,6 @@ self: {
        ];
        description = "Haskell macro preprocessor";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hamsql" = callPackage
@@ -113599,8 +106697,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Interpreter for SQL-structure definitions in YAML (YamSql)";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hamtmap" = callPackage
@@ -113614,8 +106710,6 @@ self: {
        libraryHaskellDepends = [ array base deepseq hashable ];
        description = "A purely functional and persistent hash map";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hamtsolo" = callPackage
@@ -113656,8 +106750,6 @@ self: {
        executableHaskellDepends = [ filepath ];
        description = "Library to handle abstract music";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "han2zen" = callPackage
@@ -113683,8 +106775,6 @@ self: {
        libraryHaskellDepends = [ base containers random ];
        description = "Hanabi card game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "handa-data" = callPackage
@@ -113725,8 +106815,6 @@ self: {
        ];
        description = "Library and command-line utility for accessing Google services and APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "handa-geodata" = callPackage
@@ -113773,8 +106861,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "HandleLike class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "handsy" = callPackage
@@ -113795,8 +106881,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "handwriting" = callPackage
@@ -113855,8 +106939,6 @@ self: {
        ];
        description = "Simple Continuous Integration/Deployment System";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hans" = callPackage
@@ -113880,8 +106962,6 @@ self: {
        ];
        description = "Network Stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hans-pcap" = callPackage
@@ -113893,8 +106973,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hans pcap ];
        description = "Driver for real ethernet devices for HaNS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hans-pfq" = callPackage
@@ -113939,8 +107017,6 @@ self: {
        ];
        description = "Korean spell checker";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haphviz" = callPackage
@@ -113959,8 +107035,6 @@ self: {
        ];
        description = "Graphviz code generation with Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hapistrano" = callPackage
@@ -113991,8 +107065,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happindicator" = callPackage
@@ -114011,8 +107083,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libappindicator-gtk2;};
 
   "happindicator3" = callPackage
@@ -114027,8 +107097,6 @@ self: {
        libraryPkgconfigDepends = [ libappindicator-gtk3 ];
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libappindicator-gtk3;};
 
   "happlets" = callPackage
@@ -114046,8 +107114,6 @@ self: {
        ];
        description = "\"Haskell Applets\" provides an event handler and a canvas for building simple GUI apps";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happlets-lib-gtk" = callPackage
@@ -114069,8 +107135,6 @@ self: {
        ];
        description = "The \"Haskell Applets\" Gtk+ ver. 2 back-end for \"happlets\".";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happraise" = callPackage
@@ -114084,8 +107148,6 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "A small program for counting the comments in haskell source";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happs-hsp" = callPackage
@@ -114099,8 +107161,6 @@ self: {
          base bytestring HAppS-Server hsp mtl plugins
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happs-hsp-template" = callPackage
@@ -114117,8 +107177,6 @@ self: {
        ];
        description = "Utilities for using HSP templates in HAppS applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happs-tutorial" = callPackage
@@ -114143,8 +107201,6 @@ self: {
        ];
        description = "A Happstack Tutorial that is its own web 2.0-type demo.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack" = callPackage
@@ -114159,8 +107215,6 @@ self: {
        doHaddock = false;
        description = "The haskell application server stack + code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-auth" = callPackage
@@ -114179,8 +107233,6 @@ self: {
        ];
        description = "A Happstack Authentication Suite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-authenticate" = callPackage
@@ -114210,8 +107262,6 @@ self: {
        ];
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -114228,8 +107278,6 @@ self: {
        ];
        description = "client-side session data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-contrib" = callPackage
@@ -114250,8 +107298,6 @@ self: {
        ];
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-data" = callPackage
@@ -114273,8 +107319,6 @@ self: {
        ];
        description = "Happstack data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-dlg" = callPackage
@@ -114292,8 +107336,6 @@ self: {
        ];
        description = "Cross-request user interactions for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-facebook" = callPackage
@@ -114319,8 +107361,6 @@ self: {
        ];
        description = "A package for building Facebook applications using Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-fastcgi" = callPackage
@@ -114352,8 +107392,6 @@ self: {
        ];
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-fay-ajax" = callPackage
@@ -114366,8 +107404,6 @@ self: {
        libraryHaskellDepends = [ fay-base fay-jquery ];
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-foundation" = callPackage
@@ -114388,8 +107424,6 @@ self: {
        ];
        description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-hamlet" = callPackage
@@ -114401,8 +107435,6 @@ self: {
        libraryHaskellDepends = [ base happstack-server shakespeare text ];
        description = "Support for Hamlet HTML templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-heist" = callPackage
@@ -114419,8 +107451,6 @@ self: {
        ];
        description = "Support for using Heist templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-helpers" = callPackage
@@ -114444,8 +107474,6 @@ self: {
        ];
        description = "Convenience functions for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-hsp" = callPackage
@@ -114477,8 +107505,6 @@ self: {
        ];
        description = "Support for using HStringTemplate in Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-ixset" = callPackage
@@ -114497,8 +107523,6 @@ self: {
        ];
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-jmacro" = callPackage
@@ -114516,8 +107540,6 @@ self: {
        ];
        description = "Support for using JMacro with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-lite" = callPackage
@@ -114531,8 +107553,6 @@ self: {
        ];
        description = "Happstack minus the useless stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-monad-peel" = callPackage
@@ -114548,8 +107568,6 @@ self: {
        ];
        description = "monad-peel instances for Happstack types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-plugins" = callPackage
@@ -114565,8 +107583,6 @@ self: {
        ];
        description = "The haskell application server stack + reload";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-server" = callPackage
@@ -114630,8 +107646,6 @@ self: {
        ];
        description = "Extend happstack-server with native HTTPS support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-state" = callPackage
@@ -114652,8 +107666,6 @@ self: {
        ];
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-static-routing" = callPackage
@@ -114669,8 +107681,6 @@ self: {
        ];
        description = "Support for static URL routing with overlap detection for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-util" = callPackage
@@ -114694,8 +107704,6 @@ self: {
        ];
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-yui" = callPackage
@@ -114717,8 +107725,6 @@ self: {
        ];
        description = "Utilities for using YUI3 with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happy_1_19_5" = callPackage
@@ -114803,8 +107809,6 @@ self: {
        libraryHaskellDepends = [ base Chart Chart-diagrams ];
        description = "Generate simple okay-looking bar plots without much effort";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happy-meta" = callPackage
@@ -114837,8 +107841,6 @@ self: {
        ];
        description = "Acceptance test framework for web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happybara-webkit" = callPackage
@@ -114858,8 +107860,6 @@ self: {
        ];
        description = "WebKit Happybara driver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happybara-webkit-server" = callPackage
@@ -114871,8 +107871,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        description = "WebKit Server binary for Happybara (taken from capybara-webkit)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hapstone" = callPackage
@@ -114891,8 +107889,6 @@ self: {
        ];
        description = "Capstone bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) capstone;};
 
   "haquery" = callPackage
@@ -114908,8 +107904,6 @@ self: {
        ];
        description = "jQuery for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haquil" = callPackage
@@ -114931,8 +107925,6 @@ self: {
        ];
        description = "A Haskell implementation of the Quil instruction set for quantum computing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "har" = callPackage
@@ -114965,8 +107957,6 @@ self: {
        executableSystemDepends = [ openssl sqlite ];
        description = "Networked content addressed backup and restore software";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;};
 
   "hardware-edsl" = callPackage
@@ -114984,8 +107974,6 @@ self: {
        ];
        description = "Deep embedding of hardware descriptions with code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "harg" = callPackage
@@ -115006,8 +107994,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Haskell program configuration using higher kinded data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hark" = callPackage
@@ -115026,8 +108012,6 @@ self: {
        ];
        description = "A Gentoo package query tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "harmony" = callPackage
@@ -115053,8 +108037,6 @@ self: {
        ];
        description = "A web service specification compiler that generates implementation and tests";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haroonga" = callPackage
@@ -115071,8 +108053,6 @@ self: {
        libraryPkgconfigDepends = [ groonga ];
        description = "Low level bindings for Groonga";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) groonga;};
 
   "haroonga-httpd" = callPackage
@@ -115091,8 +108071,6 @@ self: {
        ];
        description = "Yet another Groonga http server";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "harp" = callPackage
@@ -115120,8 +108098,6 @@ self: {
        ];
        description = "Runtime code generation for x86 machine code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "harvest-api" = callPackage
@@ -115142,8 +108118,6 @@ self: {
        ];
        description = "Bindings for Harvest API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "has" = callPackage
@@ -115157,8 +108131,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Entity based records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "has-th" = callPackage
@@ -115170,8 +108142,6 @@ self: {
        libraryHaskellDepends = [ base has template-haskell ];
        description = "Template Haskell function for Has records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasbolt" = callPackage
@@ -115258,8 +108228,6 @@ self: {
        ];
        description = "Decompress SAPCAR archives";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hascard" = callPackage
@@ -115295,8 +108263,6 @@ self: {
        ];
        description = "A TUI for reviewing notes using 'flashcards' written with markdown-like syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hascas" = callPackage
@@ -115318,8 +108284,6 @@ self: {
        ];
        description = "Cassandra driver for haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hascat" = callPackage
@@ -115414,8 +108378,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Hashing tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hash-store" = callPackage
@@ -115508,8 +108470,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Higher-rank Hashable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hashable-generics" = callPackage
@@ -115528,8 +108488,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ghc-prim hashable ];
        description = "Automatically generates Hashable instances with GHC.Generics.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hashable-orphans" = callPackage
@@ -115543,8 +108501,6 @@ self: {
        libraryHaskellDepends = [ base hashable sorted-list time ];
        description = "Provides instances missing from Hashable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hashable-time" = callPackage
@@ -115576,8 +108532,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "hashed-storage" = callPackage
@@ -115596,8 +108550,6 @@ self: {
        ];
        description = "Hashed file storage support code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hashflare" = callPackage
@@ -115611,8 +108563,6 @@ self: {
        libraryHaskellDepends = [ base containers simple-money ];
        description = "A library for working with HashFlare.io contracts and hashrates";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hashids" = callPackage
@@ -115702,8 +108652,6 @@ self: {
        ];
        description = "Efficient consistent hashing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hashtable-benchmark" = callPackage
@@ -115764,8 +108712,6 @@ self: {
        ];
        description = "Extensions for a \"hashtables\" library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasim" = callPackage
@@ -115777,8 +108723,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Process-Based Discrete Event Simulation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hask" = callPackage
@@ -115796,8 +108740,6 @@ self: {
        ];
        description = "Categories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hask-home" = callPackage
@@ -115816,8 +108758,6 @@ self: {
        ];
        description = "Generate homepages for cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskades" = callPackage
@@ -115897,8 +108837,6 @@ self: {
        ];
        description = "A dialect of haskell with order of execution based on dependency resolution";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskbot-core" = callPackage
@@ -115919,8 +108857,6 @@ self: {
        ];
        description = "Easily-extensible chatbot for Slack messaging service";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskdeep" = callPackage
@@ -115945,8 +108881,6 @@ self: {
        ];
        description = "Computes and audits file hashes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskdogs" = callPackage
@@ -115983,8 +108917,6 @@ self: {
        ];
        description = "A small scheme interpreter";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskeline_0_8_1_0" = callPackage
@@ -116021,8 +108953,6 @@ self: {
        libraryHaskellDepends = [ base haskeline mtl ];
        description = "Class interface for working with Haskeline";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskeline-repl" = callPackage
@@ -116046,8 +108976,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl protolude text ];
        description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-abci" = callPackage
@@ -116073,8 +109001,6 @@ self: {
        ];
        description = "Haskell Application BlockChain Interface (ABCI) Server Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-aliyun" = callPackage
@@ -116097,8 +109023,6 @@ self: {
        ];
        description = "haskell client of aliyun service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-awk" = callPackage
@@ -116131,8 +109055,6 @@ self: {
        ];
        description = "Transform text from the command-line using Haskell expressions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-bcrypt" = callPackage
@@ -116171,8 +109093,6 @@ self: {
        ];
        description = "Complete BitMEX Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-bitmex-rest" = callPackage
@@ -116200,8 +109120,6 @@ self: {
        ];
        description = "Auto-generated bitmex API Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-brainfuck" = callPackage
@@ -116221,8 +109139,6 @@ self: {
        ];
        description = "BrainFuck interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-ci" = callPackage
@@ -116253,8 +109169,6 @@ self: {
        doHaddock = false;
        description = "Cabal package script generator for Travis-CI";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-cnc" = callPackage
@@ -116275,8 +109189,6 @@ self: {
        executableHaskellDepends = [ base directory process ];
        description = "Library for parallel programming in the Intel Concurrent Collections paradigm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-coffee" = callPackage
@@ -116288,8 +109200,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "Simple CoffeeScript API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-compression" = callPackage
@@ -116309,8 +109219,6 @@ self: {
        ];
        description = "compress files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-conll" = callPackage
@@ -116337,8 +109245,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-dap" = callPackage
@@ -116388,8 +109294,6 @@ self: {
        ];
        description = "Haskell Debug Adapter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-disque" = callPackage
@@ -116406,8 +109310,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Client library for the Disque datastore";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-docs" = callPackage
@@ -116430,8 +109332,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A program to find and display the docs and type of a name";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-eigen-util" = callPackage
@@ -116444,8 +109344,6 @@ self: {
        testHaskellDepends = [ base eigen vector ];
        description = "Some utility functions for haskell-eigen library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-exp-parser" = callPackage
@@ -116458,8 +109356,6 @@ self: {
        testHaskellDepends = [ base syb template-haskell ];
        description = "Simple parser parser from Haskell to TemplateHaskell expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-fake-user-agent" = callPackage
@@ -116473,8 +109369,6 @@ self: {
        libraryHaskellDepends = [ base bytestring lens tagsoup wreq ];
        description = "Simple library for retrieving current user agent strings";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-formatter" = callPackage
@@ -116502,8 +109396,6 @@ self: {
        ];
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-ftp" = callPackage
@@ -116530,8 +109422,6 @@ self: {
        ];
        description = "A Haskell ftp server with configurable backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-generate" = callPackage
@@ -116548,8 +109438,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Typesafe generation of haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-gettext" = callPackage
@@ -116641,8 +109529,6 @@ self: {
        executableHaskellDepends = [ base containers gloss ];
        description = "Go and Checkers game in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-google-trends" = callPackage
@@ -116661,8 +109547,6 @@ self: {
        ];
        description = "Simple library for accessing Google Trends";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-holes-th" = callPackage
@@ -116728,8 +109612,6 @@ self: {
        executableHaskellDepends = [ base HGL random ];
        description = "'Asteroids' arcade games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-kubernetes" = callPackage
@@ -116749,8 +109631,6 @@ self: {
        ];
        description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-lexer" = callPackage
@@ -116841,8 +109721,6 @@ self: {
        ];
        description = "A haskell package to build your own Language Server client";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-lsp-types" = callPackage
@@ -116908,8 +109786,6 @@ self: {
        testHaskellDepends = [ base MonadRandom ];
        description = "Machine learning in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-modbus" = callPackage
@@ -116933,8 +109809,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-mpi" = callPackage
@@ -116977,8 +109851,6 @@ self: {
        ];
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-neo4j-client" = callPackage
@@ -117010,8 +109882,6 @@ self: {
        ];
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-openflow" = callPackage
@@ -117026,8 +109896,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "OpenFlow protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-overridez" = callPackage
@@ -117049,8 +109917,6 @@ self: {
        ];
        description = "Manage nix overrides for haskell packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-packages" = callPackage
@@ -117069,8 +109935,6 @@ self: {
        ];
        description = "Haskell suite library for package management and integration with Cabal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-pdf-presenter" = callPackage
@@ -117090,8 +109954,6 @@ self: {
        ];
        description = "Tool for presenting PDF-based presentations";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-platform-test" = callPackage
@@ -117120,8 +109982,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A test system for the Haskell Platform environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-player" = callPackage
@@ -117143,8 +110003,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A terminal music player based on afplay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-plot" = callPackage
@@ -117161,8 +110019,6 @@ self: {
        ];
        description = "A library for generating 2D plots painlessly";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-postal" = callPackage
@@ -117178,8 +110034,6 @@ self: {
        testPkgconfigDepends = [ libpostal ];
        description = "Haskell binding for the libpostal library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libpostal = null;};
 
   "haskell-postgis" = callPackage
@@ -117245,8 +110099,6 @@ self: {
        testHaskellDepends = [ base directory hspec process ];
        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;
-       broken = true;
      }) {};
 
   "haskell-reflect" = callPackage
@@ -117263,8 +110115,6 @@ self: {
        ];
        description = "Reflect Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-rules" = callPackage
@@ -117276,8 +110126,6 @@ self: {
        libraryHaskellDepends = [ base syb ];
        description = "A DSL for expressing natural deduction rules in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-say" = callPackage
@@ -117328,8 +110176,6 @@ self: {
        ];
        description = "Client API for Rocket Scissor Spacegoo";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-src" = callPackage
@@ -117400,8 +110246,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts Hoed ];
        description = "Observable orphan instances for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-src-exts-prisms" = callPackage
@@ -117415,8 +110259,6 @@ self: {
        ];
        description = "Prisms with newtype wrappers for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-src-exts-qq" = callPackage
@@ -117433,8 +110275,6 @@ self: {
        testHaskellDepends = [ base haskell-src-exts hspec ];
        description = "A quasiquoter for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-src-exts-sc" = callPackage
@@ -117448,8 +110288,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Pretty print haskell code with comments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-src-exts-simple" = callPackage
@@ -117497,8 +110335,6 @@ self: {
        ];
        description = "Testing code generators piece by piece";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-src-meta" = callPackage
@@ -117536,8 +110372,6 @@ self: {
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-stack-trace-plugin" = callPackage
@@ -117556,8 +110390,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "haskell-stack-trace-plugin";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-time-range" = callPackage
@@ -117615,8 +110447,6 @@ self: {
        ];
        description = "Utilities to tie up tokens to an AST";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-ast" = callPackage
@@ -117633,8 +110463,6 @@ self: {
        ];
        description = "Haskell AST for efficient tooling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-ast-fromghc" = callPackage
@@ -117652,8 +110480,6 @@ self: {
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-ast-gen" = callPackage
@@ -117670,8 +110496,6 @@ self: {
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-ast-trf" = callPackage
@@ -117687,8 +110511,6 @@ self: {
        ];
        description = "Conversions on Haskell-Tools AST to prepare for refactorings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-backend-ghc" = callPackage
@@ -117706,8 +110528,6 @@ self: {
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-builtin-refactorings" = callPackage
@@ -117739,8 +110559,6 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-cli" = callPackage
@@ -117776,8 +110594,6 @@ self: {
        ];
        description = "Command-line frontend for Haskell-tools Refact";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-daemon" = callPackage
@@ -117811,8 +110627,6 @@ self: {
        ];
        description = "Background process for Haskell-tools that editors can connect to";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-debug" = callPackage
@@ -117837,8 +110651,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Debugging Tools for Haskell-tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-demo" = callPackage
@@ -117869,8 +110681,6 @@ self: {
        ];
        description = "A web-based demo for Haskell-tools Refactor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-experimental-refactorings" = callPackage
@@ -117901,8 +110711,6 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-prettyprint" = callPackage
@@ -117919,8 +110727,6 @@ self: {
        ];
        description = "Pretty printing of Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-refactor" = callPackage
@@ -117950,8 +110756,6 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-rewrite" = callPackage
@@ -117973,8 +110777,6 @@ self: {
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tor" = callPackage
@@ -118008,8 +110810,6 @@ self: {
        ];
        description = "A Haskell Tor Node";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-type-exts" = callPackage
@@ -118023,8 +110823,6 @@ self: {
        ];
        description = "A type checker for Haskell/haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-typescript" = callPackage
@@ -118036,8 +110834,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "Simple TypeScript API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tyrant" = callPackage
@@ -118049,8 +110845,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring network ];
        description = "Haskell implementation of the Tokyo Tyrant binary protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-updater" = callPackage
@@ -118086,8 +110880,6 @@ self: {
        ];
        description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell2010" = callPackage
@@ -118099,8 +110891,6 @@ self: {
        libraryHaskellDepends = [ array base ghc-prim ];
        description = "Compatibility with Haskell 2010";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell2020" = callPackage
@@ -118112,8 +110902,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Haskell 2020[draft] Standard Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell98" = callPackage
@@ -118129,8 +110917,6 @@ self: {
        ];
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell98libraries" = callPackage
@@ -118146,8 +110932,6 @@ self: {
        ];
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb" = callPackage
@@ -118163,8 +110947,6 @@ self: {
        ];
        description = "A library of combinators for generating and executing SQL statements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc" = callPackage
@@ -118176,8 +110958,6 @@ self: {
        libraryHaskellDepends = [ base containers haskelldb HDBC ];
        description = "Bracketed HDBC session for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-mtl" = callPackage
@@ -118193,8 +110973,6 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-tf" = callPackage
@@ -118211,8 +110989,6 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-transformers" = callPackage
@@ -118229,8 +111005,6 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-lifted" = callPackage
@@ -118247,8 +111021,6 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using lifted-base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-dynamic" = callPackage
@@ -118263,8 +111035,6 @@ self: {
        executableHaskellDepends = [ haskelldb ];
        description = "HaskellDB support for the dynamically loaded drivers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-flat" = callPackage
@@ -118282,8 +111052,6 @@ self: {
        ];
        description = "An experimental HaskellDB back-end in pure Haskell (no SQL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hdbc" = callPackage
@@ -118299,8 +111067,6 @@ self: {
        ];
        description = "HaskellDB support for HDBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hdbc-mysql" = callPackage
@@ -118318,8 +111084,6 @@ self: {
        ];
        description = "HaskellDB support for the HDBC MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hdbc-odbc" = callPackage
@@ -118337,8 +111101,6 @@ self: {
        ];
        description = "HaskellDB support for the HDBC ODBC driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hdbc-postgresql" = callPackage
@@ -118357,8 +111119,6 @@ self: {
        executableSystemDepends = [ postgresql ];
        description = "HaskellDB support for the HDBC PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "haskelldb-hdbc-sqlite3" = callPackage
@@ -118376,8 +111136,6 @@ self: {
        ];
        description = "HaskellDB support for the HDBC SQLite driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hsql" = callPackage
@@ -118389,8 +111147,6 @@ self: {
        libraryHaskellDepends = [ base haskelldb hsql mtl old-time ];
        description = "HaskellDB support for HSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hsql-mysql" = callPackage
@@ -118408,8 +111164,6 @@ self: {
        ];
        description = "HaskellDB support for the HSQL MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hsql-odbc" = callPackage
@@ -118427,8 +111181,6 @@ self: {
        ];
        description = "HaskellDB support for the HSQL ODBC driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hsql-oracle" = callPackage
@@ -118465,8 +111217,6 @@ self: {
        ];
        description = "HaskellDB support for the HSQL PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hsql-sqlite" = callPackage
@@ -118503,8 +111253,6 @@ self: {
        ];
        description = "HaskellDB support for the HSQL SQLite3 driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-th" = callPackage
@@ -118516,8 +111264,6 @@ self: {
        libraryHaskellDepends = [ base haskelldb mtl template-haskell ];
        description = "Template Haskell utilities for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-wx" = callPackage
@@ -118528,8 +111274,6 @@ self: {
        sha256 = "01652m0bym80400navqlpdv5n0gfgnfzd1d0857f3kd13ksqk2hy";
        description = "HaskellDB support for WXHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskellish" = callPackage
@@ -118545,8 +111289,6 @@ self: {
        ];
        description = "For parsing Haskell-ish languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskellscrabble" = callPackage
@@ -118570,8 +111312,6 @@ self: {
        ];
        description = "A scrabble library capturing the core game logic of scrabble";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskellscript" = callPackage
@@ -118589,8 +111329,6 @@ self: {
        ];
        description = "Command line tool for running Haskell scripts with a hashbang";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelm" = callPackage
@@ -118639,8 +111377,6 @@ self: {
        ];
        description = "CP in Haskell through MiniZinc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskeme" = callPackage
@@ -118655,8 +111391,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Compiler from I- to S-Expressions for the Scheme Programming Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskey" = callPackage
@@ -118684,8 +111418,6 @@ self: {
        ];
        description = "A transactional, ACID compliant, embeddable key-value store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskey-btree" = callPackage
@@ -118729,8 +111461,6 @@ self: {
        ];
        description = "A monad transformer supporting Haskey transactions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskgame" = callPackage
@@ -118742,8 +111472,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 SDL SDL-ttf ];
        description = "Haskell game library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskheap" = callPackage
@@ -118760,8 +111488,6 @@ self: {
        ];
        description = "Haskell bindings to refheap";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskhol-core" = callPackage
@@ -118781,8 +111507,6 @@ self: {
        ];
        description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskintex" = callPackage
@@ -118819,8 +111543,6 @@ self: {
        ];
        description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin" = callPackage
@@ -118844,8 +111566,6 @@ self: {
        ];
        description = "Implementation of the Bitcoin protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-bitcoind" = callPackage
@@ -118863,8 +111583,6 @@ self: {
        ];
        description = "An adapter for haskoin to network-bitcoin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-core" = callPackage
@@ -118918,8 +111636,6 @@ self: {
        ];
        description = "Implementation of Bitcoin cryptographic primitives";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-node" = callPackage
@@ -118951,8 +111667,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "P2P library for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-protocol" = callPackage
@@ -118973,8 +111687,6 @@ self: {
        ];
        description = "Implementation of the Bitcoin network protocol messages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-script" = callPackage
@@ -118997,8 +111709,6 @@ self: {
        ];
        description = "Implementation of Bitcoin script parsing and evaluation";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-store" = callPackage
@@ -119043,8 +111753,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-store-data" = callPackage
@@ -119070,8 +111778,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Data for Haskoin Store";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-util" = callPackage
@@ -119092,8 +111798,6 @@ self: {
        ];
        description = "Utility functions for the Network.Haskoin project";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-wallet" = callPackage
@@ -119136,8 +111840,6 @@ self: {
        ];
        description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoon" = callPackage
@@ -119155,8 +111857,6 @@ self: {
        ];
        description = "Web Application Abstraction";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoon-httpspec" = callPackage
@@ -119172,8 +111872,6 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoon-salvia" = callPackage
@@ -119191,8 +111889,6 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskore" = callPackage
@@ -119217,8 +111913,6 @@ self: {
        ];
        description = "The Haskore Computer Music System";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskore-realtime" = callPackage
@@ -119236,8 +111930,6 @@ self: {
        ];
        description = "Routines for realtime playback of Haskore songs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskore-supercollider" = callPackage
@@ -119259,8 +111951,6 @@ self: {
        ];
        description = "Haskore back-end for SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskore-synthesizer" = callPackage
@@ -119280,8 +111970,6 @@ self: {
        ];
        description = "Music rendering coded in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskore-vintage" = callPackage
@@ -119318,8 +112006,6 @@ self: {
        ];
        description = "Simple unsupervised segmentation model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasktags" = callPackage
@@ -119377,8 +112063,6 @@ self: {
        doHaddock = false;
        description = "Torch for tensors and neural networks in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasktorch-codegen" = callPackage
@@ -119408,8 +112092,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Code generation tools for Hasktorch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasktorch-ffi-tests" = callPackage
@@ -119444,8 +112126,6 @@ self: {
        ];
        description = "Bindings to Torch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ATen = null;};
 
   "hasktorch-ffi-thc" = callPackage
@@ -119468,8 +112148,6 @@ self: {
        ];
        description = "Bindings to Cutorch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ATen = null;};
 
   "hasktorch-indef" = callPackage
@@ -119498,8 +112176,6 @@ self: {
        doHaddock = false;
        description = "Core Hasktorch abstractions wrapping FFI bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasktorch-signatures" = callPackage
@@ -119525,8 +112201,6 @@ self: {
        doHaddock = false;
        description = "Backpack signatures for Tensor operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasktorch-signatures-partial" = callPackage
@@ -119542,8 +112216,6 @@ self: {
        ];
        description = "Functions to partially satisfy tensor signatures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasktorch-signatures-support" = callPackage
@@ -119560,8 +112232,6 @@ self: {
        doHaddock = false;
        description = "Signatures for support tensors in hasktorch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasktorch-signatures-types" = callPackage
@@ -119622,8 +112292,6 @@ self: {
        ];
        description = "Neural architectures in hasktorch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskus-binary" = callPackage
@@ -119648,8 +112316,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Haskus binary format manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskus-system-build" = callPackage
@@ -119669,8 +112335,6 @@ self: {
        ];
        description = "Haskus system build tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskus-utils" = callPackage
@@ -119693,8 +112357,6 @@ self: {
        ];
        description = "Haskus utility modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskus-utils-compat" = callPackage
@@ -119711,8 +112373,6 @@ self: {
        ];
        description = "Compatibility modules with other external packages (ByteString, etc.)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskus-utils-data" = callPackage
@@ -119782,8 +112442,6 @@ self: {
        ];
        description = "Haskus web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskyapi" = callPackage
@@ -119815,8 +112473,6 @@ self: {
        ];
        description = "HTTP server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haslo" = callPackage
@@ -119831,8 +112487,6 @@ self: {
        executableHaskellDepends = [ mtl old-time QuickCheck time wtk ];
        description = "Loan calculator engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasloGUI" = callPackage
@@ -119851,8 +112505,6 @@ self: {
        ];
        description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasmin" = callPackage
@@ -119894,8 +112546,6 @@ self: {
        libraryHaskellDepends = [ base HTTP monads-fd network xml ];
        description = "This package enables to write SPARQL queries to remote endpoints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haspell" = callPackage
@@ -119952,8 +112602,6 @@ self: {
        ];
        description = "API for backends of \"hasql\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-class" = callPackage
@@ -119976,8 +112624,6 @@ self: {
        ];
        description = "Encodable and Decodable classes for hasql";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-cursor-query" = callPackage
@@ -120000,8 +112646,6 @@ self: {
        ];
        description = "A declarative abstraction over PostgreSQL Cursor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-cursor-transaction" = callPackage
@@ -120019,8 +112663,6 @@ self: {
        ];
        description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-dynamic-statements" = callPackage
@@ -120041,8 +112683,6 @@ self: {
        ];
        description = "Toolkit for constructing Hasql statements dynamically";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-generic" = callPackage
@@ -120061,8 +112701,6 @@ self: {
        ];
        description = "Generic encoder and decoder deriving for Hasql";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-implicits" = callPackage
@@ -120079,8 +112717,6 @@ self: {
        ];
        description = "Implicit definitions for Hasql, such as default codecs for standard types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-migration" = callPackage
@@ -120138,8 +112774,6 @@ self: {
        ];
        description = "\"optparse-applicative\" parsers for \"hasql\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-pipes" = callPackage
@@ -120202,8 +112836,6 @@ self: {
        ];
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-postgres-options" = callPackage
@@ -120218,8 +112850,6 @@ self: {
        ];
        description = "An \"optparse-applicative\" parser for \"hasql-postgres\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-queue" = callPackage
@@ -120254,8 +112884,6 @@ self: {
        ];
        description = "A PostgreSQL backed queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-simple" = callPackage
@@ -120272,8 +112900,6 @@ self: {
        ];
        description = "A somewhat opinionated \"simpler\" API to hasql";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-th" = callPackage
@@ -120292,8 +112918,6 @@ self: {
        ];
        description = "Template Haskell utilities for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-transaction" = callPackage
@@ -120327,8 +112951,6 @@ self: {
        ];
        description = "composable SQL generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hastache" = callPackage
@@ -120357,8 +112979,6 @@ self: {
        ];
        description = "Haskell implementation of Mustache templates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hastache-aeson" = callPackage
@@ -120375,8 +112995,6 @@ self: {
        ];
        description = "render hastache templates using aeson values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haste" = callPackage
@@ -120390,8 +113008,6 @@ self: {
        executableHaskellDepends = [ base curl filepath mtl ];
        description = "A universal pastebin tool, written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haste-app" = callPackage
@@ -120411,8 +113027,6 @@ self: {
        ];
        description = "Framework for type-safe, distributed web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haste-compiler" = callPackage
@@ -120475,8 +113089,6 @@ self: {
        ];
        description = "Base libraries for haste-compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haste-markup" = callPackage
@@ -120491,8 +113103,6 @@ self: {
        ];
        description = "A port of blaze-markup and blaze-html to Haste";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haste-perch" = callPackage
@@ -120516,8 +113126,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Low level primitives for the Haste compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hastily" = callPackage
@@ -120600,8 +113208,6 @@ self: {
        ];
        description = "HaTeX User's Guide";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hatexmpp3" = callPackage
@@ -120675,8 +113281,6 @@ self: {
        ];
        description = "Haskell client for the NATS messaging system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hatt" = callPackage
@@ -120699,8 +113303,6 @@ self: {
        ];
        description = "A truth table generator for classical propositional logic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haven" = callPackage
@@ -120720,8 +113322,6 @@ self: {
        ];
        description = "Recursively retrieve maven dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haverer" = callPackage
@@ -120746,8 +113346,6 @@ self: {
        ];
        description = "Implementation of the rules of Love Letter";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hawitter" = callPackage
@@ -120769,8 +113367,6 @@ self: {
        ];
        description = "A twitter client for GTK+. Beta version.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hax" = callPackage
@@ -120796,8 +113392,6 @@ self: {
        ];
        description = "Haskell cash-flow and tax simulation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haxl" = callPackage
@@ -120824,8 +113418,6 @@ self: {
        ];
        description = "A Haskell library for efficient, concurrent, and concise data access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haxl-amazonka" = callPackage
@@ -120842,8 +113434,6 @@ self: {
        ];
        description = "Haxl data source for accessing AWS services through amazonka";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haxl-facebook" = callPackage
@@ -120866,8 +113456,6 @@ self: {
        ];
        description = "An example Haxl data source for accessing the Facebook Graph API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haxparse" = callPackage
@@ -120892,8 +113480,6 @@ self: {
        ];
        description = "Readable HaxBall replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haxr" = callPackage
@@ -120925,8 +113511,6 @@ self: {
        libraryHaskellDepends = [ base haxr template-haskell ];
        description = "Automatic deriving of XML-RPC structs for Haskell records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haxy" = callPackage
@@ -120943,8 +113527,6 @@ self: {
        ];
        description = "A simple HTTP proxy server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hayland" = callPackage
@@ -120965,8 +113547,6 @@ self: {
        testHaskellDepends = [ base process xml ];
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs) wayland;};
 
   "hayoo-cli" = callPackage
@@ -120985,8 +113565,6 @@ self: {
        ];
        description = "Hayoo CLI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hback" = callPackage
@@ -121005,8 +113583,6 @@ self: {
        ];
        description = "N-back memory game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hbayes" = callPackage
@@ -121036,8 +113612,6 @@ self: {
        ];
        description = "Bayesian Networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hbb" = callPackage
@@ -121054,8 +113628,6 @@ self: {
        ];
        description = "Haskell Busy Bee, a backend for text editors";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hbcd" = callPackage
@@ -121067,8 +113639,6 @@ self: {
        libraryHaskellDepends = [ base bytestring Decimal digits split ];
        description = "Packed binary-coded decimal (BCD) serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hbeanstalk" = callPackage
@@ -121084,8 +113654,6 @@ self: {
        ];
        description = "Client for the beanstalkd workqueue service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hbeat" = callPackage
@@ -121104,8 +113672,6 @@ self: {
        executableSystemDepends = [ SDL_mixer ];
        description = "A simple step sequencer GUI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) SDL_mixer;};
 
   "hbf" = callPackage
@@ -121142,8 +113708,6 @@ self: {
        ];
        description = "An optimizing Brainfuck compiler and evaluator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hblas" = callPackage
@@ -121161,8 +113725,6 @@ self: {
        testHaskellDepends = [ base hspec primitive vector ];
        description = "Human friendly BLAS and Lapack bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas; liblapack = null;};
 
   "hblock" = callPackage
@@ -121182,8 +113744,6 @@ self: {
        ];
        description = "A mutable vector that provides indexation on the datatype fields it stores";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hbro" = callPackage
@@ -121271,8 +113831,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Haskell Bottom Up Rewrite Generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcad" = callPackage
@@ -121284,8 +113842,6 @@ self: {
        libraryHaskellDepends = [ base containers gasp mtl ];
        description = "Haskell CAD library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcc" = callPackage
@@ -121299,8 +113855,6 @@ self: {
        executableHaskellDepends = [ base bytestring language-c ];
        description = "A toy C compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcg-minus" = callPackage
@@ -121313,8 +113867,6 @@ self: {
        libraryHaskellDepends = [ base colour random ];
        description = "haskell cg (minus)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcg-minus-cairo" = callPackage
@@ -121330,8 +113882,6 @@ self: {
        ];
        description = "haskell cg (minus) (cairo rendering)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcheat" = callPackage
@@ -121344,8 +113894,6 @@ self: {
        libraryHaskellDepends = [ base mps ];
        description = "A collection of code cheatsheet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcheckers" = callPackage
@@ -121378,8 +113926,6 @@ self: {
        ];
        description = "Implementation of checkers (\"draughts\") board game - server application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hchesslib" = callPackage
@@ -121396,8 +113942,6 @@ self: {
        ];
        description = "Chess library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcltest" = callPackage
@@ -121418,8 +113962,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "A testing library for command line applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcoap" = callPackage
@@ -121442,8 +113984,6 @@ self: {
        ];
        description = "CoAP implementation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcobs" = callPackage
@@ -121478,8 +114018,6 @@ self: {
        doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcoord" = callPackage
@@ -121513,8 +114051,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "hcube" = callPackage
@@ -121535,8 +114071,6 @@ self: {
        ];
        description = "Virtual Rubik's cube of arbitrary size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcwiid" = callPackage
@@ -121580,8 +114114,6 @@ self: {
        ];
        description = "Library to handle the details of writing daemons for UNIX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbc-aeson" = callPackage
@@ -121598,8 +114130,6 @@ self: {
        ];
        description = "Deserialize from HDBC rows to FromJSON instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbc-postgresql-hstore" = callPackage
@@ -121611,8 +114141,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbc-tuple" = callPackage
@@ -121651,8 +114179,6 @@ self: {
        ];
        description = "Haskell Database Independent interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbi-conduit" = callPackage
@@ -121673,8 +114199,6 @@ self: {
        ];
        description = "Conduit glue for HDBI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbi-postgresql" = callPackage
@@ -121702,8 +114226,6 @@ self: {
        ];
        description = "PostgreSQL driver for hdbi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbi-sqlite" = callPackage
@@ -121723,8 +114245,6 @@ self: {
        ];
        description = "SQlite driver for HDBI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbi-tests" = callPackage
@@ -121744,8 +114264,6 @@ self: {
        ];
        description = "test suite for testing HDBI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdevtools" = callPackage
@@ -121765,8 +114283,6 @@ self: {
        ];
        description = "Persistent GHC powered background server for FAST haskell development tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdf" = callPackage
@@ -121784,8 +114300,6 @@ self: {
        ];
        description = "HDF: Uniform Rate Audio Signal Processing in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdf5-lite" = callPackage
@@ -121838,8 +114352,6 @@ self: {
        ];
        description = "Pattern-Expression-based differencing of arbitrary types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdigest" = callPackage
@@ -121854,8 +114366,6 @@ self: {
        ];
        description = "Server-side HTTP Digest (RFC2617) in the CGI monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdirect" = callPackage
@@ -121874,8 +114384,6 @@ self: {
        executableToolDepends = [ happy ];
        description = "An IDL compiler for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdis86" = callPackage
@@ -121887,8 +114395,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers QuickCheck ];
        description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdiscount" = callPackage
@@ -121901,8 +114407,6 @@ self: {
        librarySystemDepends = [ markdown ];
        description = "Haskell bindings to the Discount markdown library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {markdown = null;};
 
   "hdm" = callPackage
@@ -121916,8 +114420,6 @@ self: {
        executableHaskellDepends = [ base directory process unix vty ];
        description = "a small display manager";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdo" = callPackage
@@ -121945,8 +114447,6 @@ self: {
        ];
        description = "A Digital Ocean client in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdocs" = callPackage
@@ -121971,8 +114471,6 @@ self: {
        testHaskellDepends = [ base containers mtl ];
        description = "Haskell docs tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdph" = callPackage
@@ -121999,8 +114497,6 @@ self: {
        ];
        description = "Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdph-closure" = callPackage
@@ -122016,8 +114512,6 @@ self: {
        ];
        description = "Explicit closures in Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdr-histogram" = callPackage
@@ -122037,8 +114531,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq primitive ];
        description = "Haskell implementation of High Dynamic Range (HDR) Histograms";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "headed-megaparsec" = callPackage
@@ -122054,8 +114546,6 @@ self: {
        ];
        description = "More informative parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "headergen" = callPackage
@@ -122075,8 +114565,6 @@ self: {
        ];
        description = "Creates a header for a haskell source file";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "headroom" = callPackage
@@ -122155,8 +114643,6 @@ self: {
        executableHaskellDepends = [ array base ];
        description = "Heapsort of MArrays as a demo of imperative programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heart-app" = callPackage
@@ -122172,8 +114658,6 @@ self: {
        ];
        description = "An opinionated app prelude and framework in the UnliftIO style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heart-core" = callPackage
@@ -122193,8 +114677,6 @@ self: {
        ];
        description = "An opinionated library prelude in the UnliftIO style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heartbeat-streams" = callPackage
@@ -122235,8 +114717,6 @@ self: {
        ];
        description = "Find and annotate ITDs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heatitup-complete" = callPackage
@@ -122260,8 +114740,6 @@ self: {
        ];
        description = "Find and annotate ITDs with assembly or read pair joining";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heatshrink" = callPackage
@@ -122295,8 +114773,6 @@ self: {
        ];
        description = "Simle api for heavy logger";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heavy-logger" = callPackage
@@ -122318,8 +114794,6 @@ self: {
        ];
        description = "Full-weight logging based on fast-logger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heavy-logger-amazon" = callPackage
@@ -122335,8 +114809,6 @@ self: {
        ];
        description = "heavy-logger compatibility with amazonka-core logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heavy-logger-instances" = callPackage
@@ -122357,8 +114829,6 @@ self: {
        ];
        description = "Orphan instances for data types in heavy-logger package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hebrew-time" = callPackage
@@ -122371,8 +114841,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck time ];
        description = "Hebrew dates and prayer times";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hecc" = callPackage
@@ -122385,8 +114853,6 @@ self: {
        libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heckin" = callPackage
@@ -122418,8 +114884,6 @@ self: {
        executableHaskellDepends = [ base directory process split ];
        description = "Jekyll in Haskell (feat. LaTeX)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog" = callPackage
@@ -122461,8 +114925,6 @@ self: {
        ];
        testHaskellDepends = [ base either hedgehog ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-checkers-lens" = callPackage
@@ -122474,8 +114936,6 @@ self: {
        libraryHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
        testHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-classes" = callPackage
@@ -122496,8 +114956,6 @@ self: {
        ];
        description = "Hedgehog will eat your typeclass bugs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-corpus" = callPackage
@@ -122549,8 +115007,6 @@ self: {
        ];
        description = "Customizable Gen for ADT using Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-gen-json" = callPackage
@@ -122575,8 +115031,6 @@ self: {
        ];
        description = "JSON generators for Hedgehog";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-generic" = callPackage
@@ -122588,8 +115042,6 @@ self: {
        libraryHaskellDepends = [ base hedgehog ];
        description = "GHC Generics automatically derived hedgehog generators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-golden" = callPackage
@@ -122607,8 +115059,6 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        description = "Golden testing capabilities for hedgehog using Aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-quickcheck" = callPackage
@@ -122683,8 +115133,6 @@ self: {
        ];
        description = "Easy trivial configuration for Redis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedis-envy" = callPackage
@@ -122747,8 +115195,6 @@ self: {
        ];
        description = "Caching mandatory data with Redis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedis-simple" = callPackage
@@ -122760,8 +115206,6 @@ self: {
        libraryHaskellDepends = [ base bytestring either hedis mtl ];
        description = "A simplified API for hedis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedis-tags" = callPackage
@@ -122779,8 +115223,6 @@ self: {
        ];
        description = "Tags for hedis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedn" = callPackage
@@ -122819,8 +115261,6 @@ self: {
        ];
        description = "Base functor for EDN AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedra" = callPackage
@@ -122836,8 +115276,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A small library and executable for generating dice rolls";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heidi" = callPackage
@@ -122863,8 +115301,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion weigh ];
        description = "Tidy data in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hein" = callPackage
@@ -122883,8 +115319,6 @@ self: {
        ];
        description = "An extensible build helper for haskell, in the vein of leiningen";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heist" = callPackage
@@ -122943,8 +115377,6 @@ self: {
        ];
        description = "Use JSON directly from Heist templates";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heist-async" = callPackage
@@ -122958,8 +115390,6 @@ self: {
        ];
        description = "Adding support for asynchronous updates (\"AJAX\") with heist";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "helf" = callPackage
@@ -123005,8 +115435,6 @@ self: {
        ];
        description = "New Relic® agent SDK wrapper for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {newrelic-collector-client = null; newrelic-common = null; 
          newrelic-transaction = null;};
 
@@ -123025,8 +115453,6 @@ self: {
        ];
        description = "New Relic® agent SDK wrapper for wai";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "helisp" = callPackage
@@ -123040,8 +115466,6 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec process ];
        description = "An incomplete Elisp compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "helium" = callPackage
@@ -123065,8 +115489,6 @@ self: {
        ];
        description = "The Helium Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "helium-overture" = callPackage
@@ -123106,8 +115528,6 @@ self: {
        ];
        description = "Web development micro framework for haskell with typesafe URLs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hell" = callPackage
@@ -123132,8 +115552,6 @@ self: {
        executableHaskellDepends = [ base transformers utf8-string ];
        description = "A Haskell shell based on shell-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hellage" = callPackage
@@ -123153,8 +115571,6 @@ self: {
        ];
        description = "Distributed hackage mirror";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hellnet" = callPackage
@@ -123179,8 +115595,6 @@ self: {
        ];
        description = "Simple, distributed, anonymous data sharing network";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hello" = callPackage
@@ -123232,8 +115646,6 @@ self: {
        ];
        description = "A Haskell client for the Help.com team's ESB.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hemkay" = callPackage
@@ -123251,8 +115663,6 @@ self: {
        ];
        description = "A module music mixer and player";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hemkay-core" = callPackage
@@ -123293,8 +115703,6 @@ self: {
        benchmarkHaskellDepends = [ base conduit criterion mtl ];
        description = "Haskell port of the Emokit EEG project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hen" = callPackage
@@ -123315,8 +115723,6 @@ self: {
        ];
        description = "Haskell bindings to Xen hypervisor interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {xenctrl = null;};
 
   "henet" = callPackage
@@ -123331,8 +115737,6 @@ self: {
        ];
        description = "Bindings and high level interface for to ENet v1.3.9";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hepevt" = callPackage
@@ -123344,8 +115748,6 @@ self: {
        libraryHaskellDepends = [ bytestring haskell2010 lha ];
        description = "HEPEVT parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "her-lexer" = callPackage
@@ -123357,8 +115759,6 @@ self: {
        libraryHaskellDepends = [ base mtl split ];
        description = "A lexer for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "her-lexer-parsec" = callPackage
@@ -123370,8 +115770,6 @@ self: {
        libraryHaskellDepends = [ base her-lexer parsec transformers ];
        description = "Parsec frontend to \"her-lexer\" for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "herbalizer" = callPackage
@@ -123389,8 +115787,6 @@ self: {
        ];
        description = "HAML to ERB translator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hercules-ci-agent" = callPackage
@@ -123546,8 +115942,6 @@ self: {
        testHaskellDepends = [ base bytestring doctest text ];
        description = "Heredocument on Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "herf-time" = callPackage
@@ -123560,8 +115954,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "haskell time manipulation in a 'kerf like' style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hermit" = callPackage
@@ -123591,8 +115983,6 @@ self: {
        ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hermit-syb" = callPackage
@@ -123608,8 +115998,6 @@ self: {
        ];
        description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "herms" = callPackage
@@ -123630,8 +116018,6 @@ self: {
        ];
        description = "A command-line manager for delicious kitchen recipes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hero-club-five-tenets" = callPackage
@@ -123674,8 +116060,6 @@ self: {
        testHaskellDepends = [ base hspec persistent-postgresql ];
        description = "Parse DATABASE_URL into configuration types for Persistent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "herringbone" = callPackage
@@ -123695,8 +116079,6 @@ self: {
        ];
        description = "A library for compiling and serving static web assets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "herringbone-embed" = callPackage
@@ -123713,8 +116095,6 @@ self: {
        ];
        description = "Embed preprocessed web assets in your executable with Template Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "herringbone-wai" = callPackage
@@ -123731,8 +116111,6 @@ self: {
        ];
        description = "Wai adapter for the Herringbone web asset preprocessor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hesh" = callPackage
@@ -123759,8 +116137,6 @@ self: {
        ];
        description = "the Haskell Extensible Shell: Haskell for Bash-style scripts";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hesql" = callPackage
@@ -123778,8 +116154,6 @@ self: {
        ];
        description = "Haskell's embedded SQL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hetero-dict" = callPackage
@@ -123800,8 +116174,6 @@ self: {
        ];
        description = "Fast heterogeneous data structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hetero-map" = callPackage
@@ -123843,8 +116215,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Allows the use of tuples as literals for Heterogeneous collections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heterolist" = callPackage
@@ -123862,8 +116232,6 @@ self: {
        ];
        description = "A heterogeneous list type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hetris" = callPackage
@@ -123880,8 +116248,6 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Text Tetris";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "heukarya" = callPackage
@@ -123896,8 +116262,6 @@ self: {
        ];
        description = "A genetic programming based on tree structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hevm" = callPackage
@@ -123945,8 +116309,6 @@ self: {
        testSystemDepends = [ secp256k1 ];
        description = "Ethereum virtual machine evaluator";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ff = null; inherit (pkgs) secp256k1;};
 
   "hevolisa" = callPackage
@@ -123963,8 +116325,6 @@ self: {
        ];
        description = "Genetic Mona Lisa problem in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hevolisa-dph" = callPackage
@@ -123983,8 +116343,6 @@ self: {
        ];
        description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hex" = callPackage
@@ -123996,8 +116354,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Convert strings into hexadecimal and back";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hex-text" = callPackage
@@ -124011,8 +116367,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "ByteString-Text hexidecimal conversions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexchat" = callPackage
@@ -124024,8 +116378,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Haskell scripting interface for HexChat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexdump" = callPackage
@@ -124049,8 +116401,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring filepath ];
        description = "Reading Exif data form a JPEG file with Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexmino" = callPackage
@@ -124069,8 +116419,6 @@ self: {
        ];
        description = "A small game based on domino-like hexagonal tiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexml" = callPackage
@@ -124103,8 +116451,6 @@ self: {
        ];
        description = "Lenses for the hexml package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexpat" = callPackage
@@ -124139,8 +116485,6 @@ self: {
        ];
        description = "Chunked XML parsing using iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexpat-lens" = callPackage
@@ -124189,8 +116533,6 @@ self: {
        ];
        description = "Picklers for de/serialising Generic data types to and from XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexpat-tagsoup" = callPackage
@@ -124216,8 +116558,6 @@ self: {
        ];
        description = "A framework for symbolic, homoiconic languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexpress" = callPackage
@@ -124235,8 +116575,6 @@ self: {
        ];
        description = "An express-like http framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexquote" = callPackage
@@ -124252,8 +116590,6 @@ self: {
        ];
        description = "Hexadecimal ByteString literals, with placeholders that bind variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexstring" = callPackage
@@ -124287,8 +116623,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "a text classification library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hextra" = callPackage
@@ -124300,8 +116634,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic and niche utility functions and more for Haskell";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hextream" = callPackage
@@ -124356,8 +116688,6 @@ self: {
        ];
        description = "A server for Eye-Fi SD cards";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heyting-algebras" = callPackage
@@ -124379,8 +116709,6 @@ self: {
        ];
        description = "Heyting and Boolean algebras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hfann" = callPackage
@@ -124396,8 +116724,6 @@ self: {
        libraryPkgconfigDepends = [ fann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {doublefann = null; fann = null;};
 
   "hfd" = callPackage
@@ -124416,8 +116742,6 @@ self: {
        ];
        description = "Flash debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hfiar" = callPackage
@@ -124433,8 +116757,6 @@ self: {
        executableHaskellDepends = [ wx wxcore ];
        description = "Four in a Row in Haskell!!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hflags" = callPackage
@@ -124475,8 +116797,6 @@ self: {
        ];
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hfoil" = callPackage
@@ -124496,8 +116816,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Hess-Smith panel code for inviscid 2-d airfoil analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hformat" = callPackage
@@ -124525,8 +116843,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Field-of-view calculation for low-resolution 2D raster grids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hfractal" = callPackage
@@ -124545,8 +116861,6 @@ self: {
        ];
        description = "OpenGL fractal renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hfsevents" = callPackage
@@ -124577,8 +116891,6 @@ self: {
        ];
        description = "A library for fusing a subset of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hg-buildpackage" = callPackage
@@ -124597,8 +116909,6 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Mercurial";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgal" = callPackage
@@ -124621,8 +116931,6 @@ self: {
        libraryHaskellDepends = [ array base haskell98 mtl ];
        description = "Haskell Genetic Algorithm Library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgdbmi" = callPackage
@@ -124641,8 +116949,6 @@ self: {
        ];
        description = "GDB Machine Interface: program-driven control of GDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgearman" = callPackage
@@ -124660,8 +116966,6 @@ self: {
        ];
        description = "A Gearman client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgen" = callPackage
@@ -124677,8 +116981,6 @@ self: {
        ];
        description = "Random generation of modal and hybrid logic formulas";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgeometric" = callPackage
@@ -124690,8 +116992,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A geometric library with bindings to GPC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgeometry" = callPackage
@@ -124781,8 +117081,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Reading and Writing ipe7 files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgeometry-svg" = callPackage
@@ -124803,8 +117101,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Writing geometric primitives from HGeometry as SVG Files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgeos" = callPackage
@@ -124819,8 +117115,6 @@ self: {
        testHaskellDepends = [ base MissingH ];
        description = "Simple Haskell bindings to GEOS C API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {geos_c = null;};
 
   "hgettext" = callPackage
@@ -124843,8 +117137,6 @@ self: {
        ];
        description = "Bindings to libintl.h (gettext, bindtextdomain)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgis" = callPackage
@@ -124868,8 +117160,6 @@ self: {
        doHaddock = false;
        description = "Library and for GIS with Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgithub" = callPackage
@@ -124890,8 +117180,6 @@ self: {
        executableHaskellDepends = [ base cmdargs directory ];
        description = "Haskell bindings to the GitHub API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgl-example" = callPackage
@@ -124941,8 +117229,6 @@ self: {
        ];
        description = "An haskell port of the java version of gom";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgopher" = callPackage
@@ -124954,8 +117240,6 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Gopher server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgrep" = callPackage
@@ -124978,8 +117262,6 @@ self: {
        ];
        description = "Search Haskell source code from the command line";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgrev" = callPackage
@@ -125013,8 +117295,6 @@ self: {
        testHaskellDepends = [ base directory hspec ];
        description = "Unofficial bindings for GRIB API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {grib_api = null;};
 
   "hharp" = callPackage
@@ -125027,8 +117307,6 @@ self: {
        librarySystemDepends = [ harp ];
        description = "Binding to libharp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {harp = null;};
 
   "hhp" = callPackage
@@ -125055,8 +117333,6 @@ self: {
        ];
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hhwloc" = callPackage
@@ -125070,8 +117346,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bindings to https://www.open-mpi.org/projects/hwloc";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hi" = callPackage
@@ -125136,8 +117410,6 @@ self: {
        executableHaskellDepends = [ base dbus process ];
        description = "Status line for i3bar";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hiccup" = callPackage
@@ -125157,8 +117429,6 @@ self: {
        ];
        description = "Relatively efficient Tcl interpreter with support for basic operations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hichi" = callPackage
@@ -125172,8 +117442,6 @@ self: {
        executableHaskellDepends = [ array base bytestring mtl network ];
        description = "haskell robot for IChat protocol";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hid" = callPackage
@@ -125221,8 +117489,6 @@ self: {
        doHaddock = false;
        description = "Examples to accompany the book \"Haskell in Depth\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hidapi" = callPackage
@@ -125253,8 +117519,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Provides cross-platform getHiddenChar function";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hie-bios" = callPackage
@@ -125339,8 +117603,6 @@ self: {
        ];
        description = "The core of an IDE";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hieraclus" = callPackage
@@ -125352,8 +117614,6 @@ self: {
        libraryHaskellDepends = [ base containers HUnit mtl multiset ];
        description = "Automated clustering of arbitrary elements in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hierarchical-clustering" = callPackage
@@ -125397,8 +117657,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell functions to easily create exception hierarchies";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hierarchical-spectral-clustering" = callPackage
@@ -125429,8 +117687,6 @@ self: {
        ];
        description = "Hierarchical spectral clustering of a graph";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hierarchy" = callPackage
@@ -125453,8 +117709,6 @@ self: {
        ];
        description = "Predicated traversal of generated trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hiernotify" = callPackage
@@ -125470,8 +117724,6 @@ self: {
        ];
        description = "Notification library for a filesystem hierarchy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hifi" = callPackage
@@ -125511,8 +117763,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Partial types as a type constructor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highWaterMark" = callPackage
@@ -125527,8 +117777,6 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Memory usage statistics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "higher-leveldb" = callPackage
@@ -125565,8 +117813,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some higher order functions for Bool and []";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highjson" = callPackage
@@ -125584,8 +117830,6 @@ self: {
        ];
        description = "Spec based JSON parsing/serialisation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highjson-swagger" = callPackage
@@ -125604,8 +117848,6 @@ self: {
        ];
        description = "Derive swagger instances from highjson specs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highjson-th" = callPackage
@@ -125626,8 +117868,6 @@ self: {
        ];
        description = "Template Haskell helpers for highjson specs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highlight" = callPackage
@@ -125675,8 +117915,6 @@ self: {
        ];
        description = "Highlight package versions which differ from the latest version on Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highlighter" = callPackage
@@ -125752,8 +117990,6 @@ self: {
        ];
        description = "Generate STL models from SRTM elevation data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "himerge" = callPackage
@@ -125794,8 +118030,6 @@ self: {
        ];
        description = "Simple gtk2hs image viewer. Point it at an image and fire away.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "himpy" = callPackage
@@ -125817,8 +118051,6 @@ self: {
        ];
        description = "multithreaded snmp poller for riemann";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hindent" = callPackage
@@ -125853,8 +118085,6 @@ self: {
        ];
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hindley-milner" = callPackage
@@ -125871,8 +118101,6 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "Template for Hindley-Milner based languages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinduce-associations-apriori" = callPackage
@@ -125899,8 +118127,6 @@ self: {
        libraryHaskellDepends = [ base hinduce-missingh layout ];
        description = "Interface and utilities for classifiers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinduce-classifier-decisiontree" = callPackage
@@ -125918,8 +118144,6 @@ self: {
        ];
        description = "Decision Tree Classifiers for hInduce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinduce-examples" = callPackage
@@ -125939,8 +118163,6 @@ self: {
        ];
        description = "Example data for hInduce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinduce-missingh" = callPackage
@@ -126038,8 +118260,6 @@ self: {
        ];
        description = "Generate armet style query strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinstaller" = callPackage
@@ -126055,8 +118275,6 @@ self: {
        ];
        description = "Installer wrapper for Haskell applications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hint" = callPackage
@@ -126092,8 +118310,6 @@ self: {
        ];
        description = "A server process that runs hint";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinter" = callPackage
@@ -126115,8 +118331,6 @@ self: {
        ];
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinterface" = callPackage
@@ -126142,8 +118356,6 @@ self: {
        ];
        description = "Haskell / Erlang interoperability library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinvaders" = callPackage
@@ -126158,8 +118370,6 @@ self: {
        executableHaskellDepends = [ base haskell98 random ];
        description = "Space Invaders";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinze-streams" = callPackage
@@ -126171,8 +118381,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 Stream ];
        description = "Streams and Unique Fixed Points";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hip" = callPackage
@@ -126221,8 +118429,6 @@ self: {
        ];
        description = "A library for building HipChat Bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hipchat-hs" = callPackage
@@ -126241,8 +118447,6 @@ self: {
        ];
        description = "Hipchat API bindings in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hipe" = callPackage
@@ -126258,8 +118462,6 @@ self: {
        ];
        description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hips" = callPackage
@@ -126293,8 +118495,6 @@ self: {
        ];
        description = "IRC client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hirt" = callPackage
@@ -126315,8 +118515,6 @@ self: {
        ];
        description = "Calculates IRT 2PL and 3PL models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hissmetrics" = callPackage
@@ -126332,8 +118530,6 @@ self: {
        ];
        description = "Unofficial API bindings to KISSmetrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hist-pl" = callPackage
@@ -126357,8 +118553,6 @@ self: {
        ];
        description = "Umbrella package for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hist-pl-dawg" = callPackage
@@ -126373,8 +118567,6 @@ self: {
        ];
        description = "A generic, DAWG-based dictionary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hist-pl-fusion" = callPackage
@@ -126391,8 +118583,6 @@ self: {
        ];
        description = "Merging historical dictionary with PoliMorf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hist-pl-lexicon" = callPackage
@@ -126409,8 +118599,6 @@ self: {
        ];
        description = "A binary representation of the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hist-pl-lmf" = callPackage
@@ -126422,8 +118610,6 @@ self: {
        libraryHaskellDepends = [ base hist-pl-types polysoup text ];
        description = "LMF parsing for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hist-pl-transliter" = callPackage
@@ -126446,8 +118632,6 @@ self: {
        libraryHaskellDepends = [ base binary text text-binary ];
        description = "Types in the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "histogram-fill" = callPackage
@@ -126501,8 +118685,6 @@ self: {
        ];
        description = "Extract the interesting bits from shell history";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hit" = callPackage
@@ -126521,8 +118703,6 @@ self: {
        ];
        description = "Git like program in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hit-graph" = callPackage
@@ -126538,8 +118718,6 @@ self: {
        ];
        description = "Use graph algorithms to access and manipulate Git repos";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hit-on" = callPackage
@@ -126561,8 +118739,6 @@ self: {
        testHaskellDepends = [ base github hspec text ];
        description = "Haskell Git Helper Tool";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjcase" = callPackage
@@ -126579,8 +118755,6 @@ self: {
        ];
        description = "Jcase library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjpath" = callPackage
@@ -126610,8 +118784,6 @@ self: {
        ];
        description = "JavaScript Parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjsmin" = callPackage
@@ -126657,8 +118829,6 @@ self: {
        libraryHaskellDepends = [ base containers hjson ];
        description = "library for querying from JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjsonpointer" = callPackage
@@ -126680,8 +118850,6 @@ self: {
        ];
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjsonschema" = callPackage
@@ -126712,8 +118880,6 @@ self: {
        ];
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjugement" = callPackage
@@ -126763,8 +118929,6 @@ self: {
        ];
        description = "Majority Judgment and Helios-C command line tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjugement-protocol" = callPackage
@@ -126829,8 +118993,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Definition of \"Delta structures\" for higher kinded data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hkd-lens" = callPackage
@@ -126842,8 +119004,6 @@ self: {
        libraryHaskellDepends = [ base profunctors ];
        description = "Generic lens/prism/traversal-kinded data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hkdf" = callPackage
@@ -126890,8 +119050,6 @@ self: {
        ];
        description = "A library for higher kinded types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hlatex" = callPackage
@@ -126911,8 +119069,6 @@ self: {
        ];
        description = "A library to build valid LaTeX files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hlbfgsb" = callPackage
@@ -126931,8 +119087,6 @@ self: {
        ];
        description = "Haskell binding to L-BFGS-B version 3.0";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gfortran;};
 
   "hlcm" = callPackage
@@ -126954,8 +119108,6 @@ self: {
        ];
        description = "Fast algorithm for mining closed frequent itemsets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hleap" = callPackage
@@ -127047,8 +119199,6 @@ self: {
        ];
        description = "Web API server for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hledger-chart" = callPackage
@@ -127067,8 +119217,6 @@ self: {
        ];
        description = "A pie chart image generator for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hledger-diff" = callPackage
@@ -127175,8 +119323,6 @@ self: {
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hledger-lib" = callPackage
@@ -127299,8 +119445,6 @@ self: {
        ];
        description = "A curses-style console interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hledger-web" = callPackage
@@ -127348,8 +119492,6 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Haskell binding to libBladeRF SDR library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libbladeRF;};
 
   "hlibcpuid" = callPackage
@@ -127377,8 +119519,6 @@ self: {
        librarySystemDepends = [ ev ];
        description = "FFI interface to libev";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ev = null;};
 
   "hlibfam" = callPackage
@@ -127391,8 +119531,6 @@ self: {
        librarySystemDepends = [ fam ];
        description = "FFI interface to libFAM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fam;};
 
   "hlibgit2" = callPackage
@@ -127492,8 +119630,6 @@ self: {
        ];
        description = "Client library for the Apache Livy REST API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hlogger" = callPackage
@@ -127505,8 +119641,6 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        description = "Simple, concurrent, extendable and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hlongurl" = callPackage
@@ -127525,8 +119659,6 @@ self: {
        ];
        description = "Library and utility interfacing to longurl.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hlrdb" = callPackage
@@ -127546,8 +119678,6 @@ self: {
        ];
        description = "High-level Redis Database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hlrdb-core" = callPackage
@@ -127578,8 +119708,6 @@ self: {
        libraryHaskellDepends = [ base containers hcg-minus hps ];
        description = "Haskell Lindenmayer Systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hls-plugin-api" = callPackage
@@ -127613,8 +119741,6 @@ self: {
        libraryHaskellDepends = [ base stm transformers unix X11 ];
        description = "Bindings to the herbstluftwm window manager";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hly" = callPackage
@@ -127629,8 +119755,6 @@ self: {
        ];
        description = "Haskell LilyPond";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmark" = callPackage
@@ -127649,8 +119773,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A tool and library for Markov chains based text generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmarkup" = callPackage
@@ -127664,8 +119786,6 @@ self: {
        ];
        description = "Simple wikitext-like markup format implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix" = callPackage
@@ -127721,8 +119841,6 @@ self: {
        librarySystemDepends = [ liblapack ];
        description = "HMatrix interface to LAPACK functions for banded matrices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {liblapack = null;};
 
   "hmatrix-csv" = callPackage
@@ -127788,8 +119906,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix mmap ];
        description = "Memory map Vector from disk into memory efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-morpheus" = callPackage
@@ -127810,8 +119926,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion hmatrix ];
        description = "Low-level machine learning auxiliary functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas; liblapack = null;};
 
   "hmatrix-nipals" = callPackage
@@ -127825,8 +119939,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "NIPALS method for Principal Components Analysis on large data-sets";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-nlopt" = callPackage
@@ -127875,8 +119987,6 @@ self: {
        librarySystemDepends = [ mkl_core mkl_intel mkl_sequential ];
        description = "Sparse linear solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;};
 
   "hmatrix-special" = callPackage
@@ -127903,8 +120013,6 @@ self: {
        ];
        description = "hmatrix with vector and matrix sizes encoded in types";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-sundials" = callPackage
@@ -127932,8 +120040,6 @@ self: {
        ];
        description = "hmatrix interface to sundials";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {sundials_arkode = null; sundials_cvode = null;};
 
   "hmatrix-svdlibc" = callPackage
@@ -127949,8 +120055,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion hmatrix vector ];
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-syntax" = callPackage
@@ -127966,8 +120070,6 @@ self: {
        ];
        description = "MATLAB-like syntax for hmatrix vectors and matrices";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-tests" = callPackage
@@ -127985,8 +120087,6 @@ self: {
        benchmarkHaskellDepends = [ base HUnit QuickCheck random ];
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-vector-sized" = callPackage
@@ -128018,8 +120118,6 @@ self: {
        ];
        description = "Haskell Meapsoft Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmeap-utils" = callPackage
@@ -128039,8 +120137,6 @@ self: {
        ];
        description = "Haskell Meapsoft Parser Utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmemdb" = callPackage
@@ -128069,8 +120165,6 @@ self: {
        executableHaskellDepends = [ base MissingH process ];
        description = "CLI fuzzy finder and launcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmep" = callPackage
@@ -128090,8 +120184,6 @@ self: {
        testHaskellDepends = [ base HUnit vector ];
        description = "HMEP Multi Expression Programming – a genetic programming variant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmidi" = callPackage
@@ -128122,8 +120214,6 @@ self: {
        ];
        description = "A make alternative based on Plan9's mk";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmm" = callPackage
@@ -128139,8 +120229,6 @@ self: {
        ];
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmm-hmatrix" = callPackage
@@ -128159,8 +120247,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using HMatrix primitives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmm-lapack" = callPackage
@@ -128181,8 +120267,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using LAPACK primitives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmp3" = callPackage
@@ -128203,8 +120287,6 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "hmp3-ng" = callPackage
@@ -128258,8 +120340,6 @@ self: {
        ];
        description = "Haskell Music Theory";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmt-diagrams" = callPackage
@@ -128277,8 +120357,6 @@ self: {
        ];
        description = "Haskell Music Theory Diagrams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmumps" = callPackage
@@ -128297,8 +120375,6 @@ self: {
        ];
        description = "Interpreter for the MUMPS langugae";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hnetcdf" = callPackage
@@ -128328,8 +120404,6 @@ self: {
        testSystemDepends = [ netcdf ];
        description = "Haskell NetCDF library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
@@ -128436,8 +120510,6 @@ self: {
        ];
        description = "Remote hnix store";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hnn" = callPackage
@@ -128523,8 +120595,6 @@ self: {
        ];
        description = "Log message normalisation tool producing structured JSON messages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ho-rewriting" = callPackage
@@ -128540,8 +120610,6 @@ self: {
        testHaskellDepends = [ base compdata patch-combinators ];
        description = "Generic rewrite rules with safe treatment of variables and binders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoauth" = callPackage
@@ -128559,8 +120627,6 @@ self: {
        ];
        description = "A Haskell implementation of OAuth 1.0a protocol.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoauth2" = callPackage
@@ -128608,8 +120674,6 @@ self: {
        ];
        description = "A source code editor aiming for the convenience of use";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hobbes" = callPackage
@@ -128627,8 +120691,6 @@ self: {
        ];
        description = "A small file watcher for OSX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hobbits" = callPackage
@@ -128646,8 +120708,6 @@ self: {
        ];
        description = "A library for canonically representing terms with binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hocilib" = callPackage
@@ -128667,8 +120727,6 @@ self: {
        testSystemDepends = [ ocilib ];
        description = "FFI binding to OCILIB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ocilib = null;};
 
   "hocker" = callPackage
@@ -128734,8 +120792,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "A fully featured date/time library based on Nodatime";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoe" = callPackage
@@ -128754,8 +120810,6 @@ self: {
        ];
        description = "hoe: Haskell One-liner Evaluator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hofix-mtl" = callPackage
@@ -128785,8 +120839,6 @@ self: {
        ];
        description = "Simple IRC logger bot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hogg" = callPackage
@@ -128804,8 +120856,6 @@ self: {
        ];
        description = "Library and tools to manipulate the Ogg container format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoggl" = callPackage
@@ -128831,8 +120881,6 @@ self: {
        ];
        description = "Bindings to the Toggl.com REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hogre" = callPackage
@@ -128848,8 +120896,6 @@ self: {
        doHaddock = false;
        description = "Haskell binding to a subset of OGRE";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;};
 
   "hogre-examples" = callPackage
@@ -128865,8 +120911,6 @@ self: {
        executableSystemDepends = [ OgreMain ];
        description = "Examples for using Hogre";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OgreMain = null;};
 
   "hois" = callPackage
@@ -128882,8 +120926,6 @@ self: {
        executableHaskellDepends = [ base X11 ];
        description = "OIS bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OIS = null;};
 
   "hoist-error" = callPackage
@@ -128927,8 +120969,6 @@ self: {
        ];
        description = "Higher order logic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hold-em" = callPackage
@@ -128940,8 +120980,6 @@ self: {
        libraryHaskellDepends = [ base random safe ];
        description = "An engine for Texas hold'em Poker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hole" = callPackage
@@ -128953,8 +120991,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Higher kinded type removal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "holey-format" = callPackage
@@ -128990,8 +121026,6 @@ self: {
        testToolDepends = [ markdown-unlit tasty-discover ];
        description = "Tools and combinators for solving constraint problems";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "holy-project" = callPackage
@@ -129026,8 +121060,6 @@ self: {
        doCheck = false;
        description = "Start your Haskell project with cabal, git and tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "homeomorphic" = callPackage
@@ -129039,8 +121071,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl QuickCheck ];
        description = "Homeomorphic Embedding Test";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hommage" = callPackage
@@ -129054,8 +121084,6 @@ self: {
        ];
        description = "Haskell Offline Music Manipulation And Generation EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hommage-ds" = callPackage
@@ -129082,8 +121110,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constructs FAlgebras from typeclasses, making Haskell functions homoiconic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "homotuple" = callPackage
@@ -129125,8 +121151,6 @@ self: {
        ];
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "homura-stopwatch" = callPackage
@@ -129156,8 +121180,6 @@ self: {
        testSystemDepends = [ freenect OpenNI2 ];
        description = "OpenNI 2 binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OpenNI2 = null; inherit (pkgs) freenect;};
 
   "honk" = callPackage
@@ -129187,8 +121209,6 @@ self: {
        ];
        description = "Simple tool for fetching and merging hoogle data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hood" = callPackage
@@ -129201,8 +121221,6 @@ self: {
        testHaskellDepends = [ base ghc-prim ];
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hood-off" = callPackage
@@ -129214,8 +121232,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dummy package to disable Hood without having to remove all the calls to observe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hood2" = callPackage
@@ -129227,8 +121243,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodie" = callPackage
@@ -129246,8 +121260,6 @@ self: {
        ];
        description = "A small, toy roguelike";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle" = callPackage
@@ -129268,8 +121280,6 @@ self: {
        executableHaskellDepends = [ base cmdargs hoodle-core ];
        description = "Executable for hoodle";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle-builder" = callPackage
@@ -129286,8 +121296,6 @@ self: {
        ];
        description = "text builder for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle-core" = callPackage
@@ -129320,8 +121328,6 @@ self: {
        librarySystemDepends = [ libX11 libXi ];
        description = "Core library for hoodle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;};
 
   "hoodle-extra" = callPackage
@@ -129347,8 +121353,6 @@ self: {
        ];
        description = "extra hoodle tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle-parser" = callPackage
@@ -129366,8 +121370,6 @@ self: {
        ];
        description = "Hoodle file parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle-publish" = callPackage
@@ -129394,8 +121396,6 @@ self: {
        ];
        description = "publish hoodle files as a static web site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle-render" = callPackage
@@ -129416,8 +121416,6 @@ self: {
        ];
        description = "Hoodle file renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle-types" = callPackage
@@ -129434,8 +121432,6 @@ self: {
        ];
        description = "Data types for programs for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoogle_5_0_14" = callPackage
@@ -129521,8 +121517,6 @@ self: {
        ];
        description = "Easily generate Hoogle indices for installed packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hooks-dir" = callPackage
@@ -129534,8 +121528,6 @@ self: {
        libraryHaskellDepends = [ base directory process text ];
        description = "run executables in a directory as hooks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hookup" = callPackage
@@ -129573,8 +121565,6 @@ self: {
        ];
        description = "Object-Oriented Programming in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoopl" = callPackage
@@ -129594,8 +121584,6 @@ self: {
        ];
        description = "A library to support dataflow analysis and optimization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoovie" = callPackage
@@ -129619,8 +121607,6 @@ self: {
        ];
        description = "Haskell Media Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hopencc" = callPackage
@@ -129637,8 +121623,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell binding to libopencc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) opencc;};
 
   "hopencl" = callPackage
@@ -129658,8 +121642,6 @@ self: {
        ];
        description = "Haskell bindings for OpenCL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OpenCL = null;};
 
   "hopenpgp-tools" = callPackage
@@ -129691,8 +121673,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "hOpenPGP-based command-line tools";
        license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hopenssl" = callPackage
@@ -129740,8 +121720,6 @@ self: {
        ];
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {MagickCore = null; inherit (pkgs) imagemagick;};
 
   "hopfield-networks" = callPackage
@@ -129867,8 +121845,6 @@ self: {
        ];
        description = "Handy Operations on Power Series";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoq" = callPackage
@@ -129888,8 +121864,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A language based on homotopy type theory with an interval type";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hora" = callPackage
@@ -129918,8 +121892,6 @@ self: {
        libraryHaskellDepends = [ AC-Angle base time ];
        description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "horname" = callPackage
@@ -129938,8 +121910,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Rename function definitions returned by SMT solvers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hosc" = callPackage
@@ -129975,8 +121945,6 @@ self: {
        ];
        description = "Haskell Open Sound Control JSON Serialisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hosc-utils" = callPackage
@@ -130056,8 +122024,6 @@ self: {
        ];
        description = "An dns server which is extremely easy to config";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hothasktags" = callPackage
@@ -130076,8 +122042,6 @@ self: {
        ];
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hotswap" = callPackage
@@ -130089,8 +122053,6 @@ self: {
        libraryHaskellDepends = [ base plugins ];
        description = "Simple code hotswapping";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hourglass" = callPackage
@@ -130121,8 +122083,6 @@ self: {
        libraryHaskellDepends = [ base hourglass parsec ];
        description = "A small library for parsing more human friendly date/time formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hourglass-orphans" = callPackage
@@ -130168,8 +122128,6 @@ self: {
        ];
        description = "A Haskell implementation of Foreman";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hout" = callPackage
@@ -130198,8 +122156,6 @@ self: {
        ];
        description = "Heap profiling helper library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hp2any-graph" = callPackage
@@ -130221,8 +122177,6 @@ self: {
        executableSystemDepends = [ freeglut libGL libGLU ];
        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;
-       broken = true;
      }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU;};
 
@@ -130244,8 +122198,6 @@ self: {
        ];
        description = "A utility to visualise and compare heap profiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hp2html" = callPackage
@@ -130347,8 +122299,6 @@ self: {
        ];
        description = "Convert Cabal manifests into hpack's package.yamls";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpack-dhall" = callPackage
@@ -130396,8 +122346,6 @@ self: {
        ];
        description = "Modular template compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpaco-lib" = callPackage
@@ -130415,8 +122363,6 @@ self: {
        ];
        description = "Modular template compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpage" = callPackage
@@ -130438,8 +122384,6 @@ self: {
        ];
        description = "A scrapbook for Haskell developers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpapi" = callPackage
@@ -130452,8 +122396,6 @@ self: {
        librarySystemDepends = [ papi ];
        description = "Binding for the PAPI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) papi;};
 
   "hpaste" = callPackage
@@ -130481,8 +122423,6 @@ self: {
        ];
        description = "Haskell paste web site";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpasteit" = callPackage
@@ -130502,8 +122442,6 @@ self: {
        ];
        description = "A command-line client for hpaste.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpath" = callPackage
@@ -130644,8 +122582,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpc-lcov" = callPackage
@@ -130718,8 +122654,6 @@ self: {
        ];
        description = "Tracer with AJAX interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpdft" = callPackage
@@ -130743,8 +122677,6 @@ self: {
        ];
        description = "A tool for looking through PDF file using Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpg" = callPackage
@@ -130758,8 +122690,6 @@ self: {
        executableHaskellDepends = [ base random ];
        description = "a simple password generator";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpio" = callPackage
@@ -130789,8 +122719,6 @@ self: {
        ];
        description = "Monads for GPIO in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hplayground" = callPackage
@@ -130822,8 +122750,6 @@ self: {
        executableHaskellDepends = [ base directory filepath process ];
        description = "Application for managing playlist files on a music player";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpodder" = callPackage
@@ -130843,8 +122769,6 @@ self: {
        ];
        description = "Podcast Aggregator (downloader)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpp" = callPackage
@@ -130894,8 +122818,6 @@ self: {
        ];
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "hpqtypes-extras" = callPackage
@@ -130921,8 +122843,6 @@ self: {
        ];
        description = "Extra utilities for hpqtypes library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hprotoc" = callPackage
@@ -130952,8 +122872,6 @@ self: {
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -130982,8 +122900,6 @@ self: {
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hprox" = callPackage
@@ -131018,8 +122934,6 @@ self: {
        libraryHaskellDepends = [ base filepath hcg-minus process ];
        description = "Haskell Postscript";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hps-cairo" = callPackage
@@ -131035,8 +122949,6 @@ self: {
        executableHaskellDepends = [ base cairo gtk hps random ];
        description = "Cairo rendering for the haskell postscript library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hps-kmeans" = callPackage
@@ -131048,8 +122960,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "A nice implementation of the k-Means algorithm";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpuz" = callPackage
@@ -131078,8 +122988,6 @@ self: {
        ];
        description = "Highlight source code using Pygments";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpylos" = callPackage
@@ -131095,8 +123003,6 @@ self: {
        ];
        description = "AI of Pylos game with GLUT interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpyrg" = callPackage
@@ -131112,8 +123018,6 @@ self: {
        ];
        description = "pyrg utility done right";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpython" = callPackage
@@ -131143,8 +123047,6 @@ self: {
        ];
        description = "Python language tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hquantlib" = callPackage
@@ -131174,8 +123076,6 @@ self: {
        ];
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hquantlib-time" = callPackage
@@ -131187,8 +123087,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "HQuantLib Time is a business calendar functions extracted from HQuantLib";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hquery" = callPackage
@@ -131219,8 +123117,6 @@ self: {
        executableHaskellDepends = [ base HCL NonEmpty ];
        description = "Basic utility for ranking a list of items";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hreader" = callPackage
@@ -131283,8 +123179,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A Type dependent Highlevel HTTP client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hreq-conduit" = callPackage
@@ -131309,8 +123203,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Conduit streaming support for Hreq";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hreq-core" = callPackage
@@ -131356,8 +123248,6 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "A Cricket scoring application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hriemann" = callPackage
@@ -131383,8 +123273,6 @@ self: {
        ];
        description = "A Riemann Client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hruby" = callPackage
@@ -131451,8 +123339,6 @@ self: {
        benchmarkSystemDepends = [ libb2 ];
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libb2;};
 
   "hs-brotli" = callPackage
@@ -131473,8 +123359,6 @@ self: {
        ];
        description = "Compression and decompression in the brotli format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {brotlidec = null; brotlienc = null; libbrotlidec = null; 
          libbrotlienc = null;};
 
@@ -131516,8 +123400,6 @@ self: {
        ];
        description = "Example Monte Carlo simulations implemented with Carbon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-cdb" = callPackage
@@ -131533,8 +123415,6 @@ self: {
        ];
        description = "A library for reading CDB (Constant Database) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-conllu" = callPackage
@@ -131555,8 +123435,6 @@ self: {
        ];
        description = "Conllu validating parser and utils";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-di" = callPackage
@@ -131586,8 +123464,6 @@ self: {
        ];
        description = "Dependency Injection library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-dotnet" = callPackage
@@ -131600,8 +123476,6 @@ self: {
        librarySystemDepends = [ ole32 oleaut32 ];
        description = "Pragmatic .NET interop for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ole32 = null; oleaut32 = null;};
 
   "hs-duktape" = callPackage
@@ -131639,8 +123513,6 @@ self: {
        ];
        description = "HS-Excelx provides basic read-only access to Excel 2007 and 2010 documents in XLSX format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-ffmpeg" = callPackage
@@ -131652,8 +123524,6 @@ self: {
        libraryHaskellDepends = [ base bytestring haskell98 ];
        description = "Bindings to FFMPEG library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-fltk" = callPackage
@@ -131667,8 +123537,6 @@ self: {
        librarySystemDepends = [ fltk fltk_images ];
        description = "Binding to GUI library FLTK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fltk; fltk_images = null;};
 
   "hs-functors" = callPackage
@@ -131692,8 +123560,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Haskell wrapper for the Google Chart API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-gen-iface" = callPackage
@@ -131712,8 +123578,6 @@ self: {
        ];
        description = "Utility to generate haskell-names interface files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-gizapp" = callPackage
@@ -131729,8 +123593,6 @@ self: {
        ];
        description = "Haskell wrapper around the GIZA++ toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-inspector" = callPackage
@@ -131773,8 +123635,6 @@ self: {
        ];
        description = "Java .class files assembler/disassembler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-json-rpc" = callPackage
@@ -131788,8 +123648,6 @@ self: {
        ];
        description = "JSON-RPC client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-logo" = callPackage
@@ -131816,8 +123674,6 @@ self: {
        ];
        description = "Logo interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-mesos" = callPackage
@@ -131842,8 +123698,6 @@ self: {
          tasty-quickcheck
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mesos = null; inherit (pkgs) protobuf;};
 
   "hs-multiaddr" = callPackage
@@ -131877,8 +123731,6 @@ self: {
        executableHaskellDepends = [ base HandsomeSoup hxt random ];
        description = "Name generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-pattrans" = callPackage
@@ -131904,8 +123756,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "DSL for musical patterns and transformation, based on contravariant functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-pgms" = callPackage
@@ -131925,8 +123775,6 @@ self: {
        ];
        description = "Programmer's Mine Sweeper in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-php-session" = callPackage
@@ -131951,8 +123799,6 @@ self: {
        libraryHaskellDepends = [ base data-default-class text ];
        description = "Create pkg-config configuration files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-pkpass" = callPackage
@@ -131973,8 +123819,6 @@ self: {
        ];
        description = "A library for Passbook pass creation & signing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-popen" = callPackage
@@ -132011,8 +123855,6 @@ self: {
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        description = "Easy to use Regex";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-rqlite" = callPackage
@@ -132049,8 +123891,6 @@ self: {
        testHaskellDepends = [ base protolude ];
        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;
-       broken = true;
      }) {notifier = null;};
 
   "hs-scrape" = callPackage
@@ -132071,8 +123911,6 @@ self: {
        ];
        description = "Simple and easy web scraping and automation in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-server-starter" = callPackage
@@ -132104,8 +123942,6 @@ self: {
        ];
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-speedscope" = callPackage
@@ -132124,8 +123960,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convert an eventlog into the speedscope json format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-twitter" = callPackage
@@ -132143,8 +123977,6 @@ self: {
        ];
        description = "Haskell binding to the Twitter API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-twitterarchiver" = callPackage
@@ -132159,8 +123991,6 @@ self: {
        executableHaskellDepends = [ base HTTP json mtl network pretty ];
        description = "Commandline Twitter feed archiver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-vcard" = callPackage
@@ -132172,8 +124002,6 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        description = "Implements the RFC 2426 vCard 3.0 spec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-watchman" = callPackage
@@ -132193,8 +124021,6 @@ self: {
        ];
        description = "Client library for Facebook's Watchman tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-zstd" = callPackage
@@ -132281,8 +124107,6 @@ self: {
        ];
        description = "Haskell to Brainfuck compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs2dot" = callPackage
@@ -132313,8 +124137,6 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Translate Haskell types to PureScript";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsConfigure" = callPackage
@@ -132339,8 +124161,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "I2C access for Haskell and Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsPID" = callPackage
@@ -132369,8 +124189,6 @@ self: {
        ];
        description = "Sqlite3 bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsXenCtrl" = callPackage
@@ -132383,8 +124201,6 @@ self: {
        librarySystemDepends = [ xenctrl ];
        description = "FFI bindings to the Xen Control library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {xenctrl = null;};
 
   "hsakamai" = callPackage
@@ -132444,8 +124260,6 @@ self: {
        ];
        description = "OASIS Security Assertion Markup Language (SAML) V2.0";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libxml2;};
 
   "hsass" = callPackage
@@ -132484,8 +124298,6 @@ self: {
        executableHaskellDepends = [ base Hclip HTTP process unix ];
        description = "(ab)Use Google Translate as a speech synthesiser";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsb2hs" = callPackage
@@ -132521,8 +124333,6 @@ self: {
        ];
        description = "simple utility for rolling filesystem backups";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsbc" = callPackage
@@ -132536,8 +124346,6 @@ self: {
        executableHaskellDepends = [ attoparsec base text vector ];
        description = "A command line calculator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsbencher" = callPackage
@@ -132560,8 +124368,6 @@ self: {
        ];
        description = "Launch and gather data from Haskell and non-Haskell benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsbencher-codespeed" = callPackage
@@ -132580,8 +124386,6 @@ self: {
        ];
        description = "Backend for uploading benchmark data to CodeSpeed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsbencher-fusion" = callPackage
@@ -132605,8 +124409,6 @@ self: {
        ];
        description = "Backend for uploading benchmark data to Google Fusion Tables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc2hs" = callPackage
@@ -132645,8 +124447,6 @@ self: {
        ];
        description = "Haskell SuperCollider";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-auditor" = callPackage
@@ -132662,8 +124462,6 @@ self: {
        ];
        description = "Haskell SuperCollider Auditor";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-cairo" = callPackage
@@ -132676,8 +124474,6 @@ self: {
        libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ];
        description = "haskell supercollider cairo drawing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-data" = callPackage
@@ -132695,8 +124491,6 @@ self: {
        ];
        description = "haskell supercollider data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-db" = callPackage
@@ -132709,8 +124503,6 @@ self: {
        libraryHaskellDepends = [ base hsc3 safe ];
        description = "Haskell SuperCollider Unit Generator Database";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-dot" = callPackage
@@ -132723,8 +124515,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsc3 process ];
        description = "haskell supercollider graph drawing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-forth" = callPackage
@@ -132744,8 +124534,6 @@ self: {
        ];
        description = "FORTH SUPERCOLLIDER";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-graphs" = callPackage
@@ -132770,8 +124558,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Haskell SuperCollider Graphs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-lang" = callPackage
@@ -132792,8 +124578,6 @@ self: {
        ];
        description = "Haskell SuperCollider Language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-lisp" = callPackage
@@ -132813,8 +124597,6 @@ self: {
        ];
        description = "LISP SUPERCOLLIDER";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-plot" = callPackage
@@ -132832,8 +124614,6 @@ self: {
        ];
        description = "Haskell SuperCollider Plotting";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-process" = callPackage
@@ -132853,8 +124633,6 @@ self: {
        ];
        description = "Create and control scsynth processes";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-rec" = callPackage
@@ -132867,8 +124645,6 @@ self: {
        libraryHaskellDepends = [ base hsc3 ];
        description = "Haskell SuperCollider Record Variants";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-rw" = callPackage
@@ -132886,8 +124662,6 @@ self: {
        ];
        description = "hsc3 re-writing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-server" = callPackage
@@ -132914,8 +124688,6 @@ self: {
        ];
        description = "SuperCollider server resource management and synchronization";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-sf" = callPackage
@@ -132928,8 +124700,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc ];
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-sf-hsndfile" = callPackage
@@ -132946,8 +124716,6 @@ self: {
        ];
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-unsafe" = callPackage
@@ -132960,8 +124728,6 @@ self: {
        libraryHaskellDepends = [ base hsc3 ];
        description = "Unsafe Haskell SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-utils" = callPackage
@@ -132983,8 +124749,6 @@ self: {
        ];
        description = "Haskell SuperCollider Utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscaffold" = callPackage
@@ -133011,8 +124775,6 @@ self: {
        ];
        description = "Very simple file/directory structure scaffolding writer monad EDSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscamwire" = callPackage
@@ -133027,8 +124789,6 @@ self: {
        librarySystemDepends = [ camwire_1394 dc1394_control raw1394 ];
        description = "Haskell bindings to IIDC1394 cameras, via Camwire";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;};
 
   "hscassandra" = callPackage
@@ -133045,8 +124805,6 @@ self: {
        ];
        description = "cassandra database interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscd" = callPackage
@@ -133061,8 +124819,6 @@ self: {
        executableHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
        description = "Command line client and library for SoundCloud.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscharm" = callPackage
@@ -133171,8 +124927,6 @@ self: {
        executableHaskellDepends = [ base cairo glib gtk old-time ];
        description = "An elegant analog clock using Haskell, GTK and Cairo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscolour" = callPackage
@@ -133210,8 +124964,6 @@ self: {
        ];
        description = "cscope like browser for Haskell code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscrtmpl" = callPackage
@@ -133246,8 +124998,6 @@ self: {
        testHaskellDepends = [ base containers text ];
        description = "Collision-resistant IDs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscurses" = callPackage
@@ -133321,8 +125071,6 @@ self: {
        ];
        description = "Haskell development library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsdif" = callPackage
@@ -133335,8 +125083,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc ];
        description = "Haskell SDIF";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsdip" = callPackage
@@ -133351,8 +125097,6 @@ self: {
        libraryHaskellDepends = [ base cairo containers HUnit parsec ];
        description = "hsdip - a Diplomacy parser/renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsdns" = callPackage
@@ -133385,8 +125129,6 @@ self: {
        ];
        description = "Caching asynchronous DNS resolver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hse-cpp" = callPackage
@@ -133478,8 +125220,6 @@ self: {
        ];
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hserv" = callPackage
@@ -133534,8 +125274,6 @@ self: {
        libraryHaskellDepends = [ base containers language-puppet text ];
        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;
-       broken = true;
      }) {};
 
   "hsfcsh" = callPackage
@@ -133551,8 +125289,6 @@ self: {
        ];
        description = "Incremental builder for flash";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsfilt" = callPackage
@@ -133566,8 +125302,6 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Z-decoder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsforce" = callPackage
@@ -133591,8 +125325,6 @@ self: {
        ];
        description = "Salesforce API Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsgnutls" = callPackage
@@ -133605,8 +125337,6 @@ self: {
        librarySystemDepends = [ gcrypt gnutls ];
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgnutls-yj" = callPackage
@@ -133619,8 +125349,6 @@ self: {
        librarySystemDepends = [ gcrypt gnutls ];
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgsom" = callPackage
@@ -133633,8 +125361,6 @@ self: {
        libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsgtd" = callPackage
@@ -133682,8 +125408,6 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas; inherit (pkgs) gsl; liblapack = null;};
 
   "hsilop" = callPackage
@@ -133798,8 +125522,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "LSP interface over the hsinspect binary";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsinstall" = callPackage
@@ -133831,8 +125553,6 @@ self: {
        libraryHaskellDepends = [ base Cabal ];
        description = "Skeleton for new Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslackbuilder" = callPackage
@@ -133848,8 +125568,6 @@ self: {
        ];
        description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslibsvm" = callPackage
@@ -133863,8 +125581,6 @@ self: {
        librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {svm = null;};
 
   "hslinks" = callPackage
@@ -133881,8 +125597,6 @@ self: {
        ];
        description = "Resolves links to Haskell identifiers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslogger" = callPackage
@@ -133920,8 +125634,6 @@ self: {
        ];
        description = "Parsing hslogger-produced logs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslogger-template" = callPackage
@@ -133933,8 +125645,6 @@ self: {
        libraryHaskellDepends = [ base hslogger mtl template-haskell ];
        description = "Automatic generation of hslogger functions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslogger4j" = callPackage
@@ -133973,8 +125683,6 @@ self: {
        ];
        description = "A library to work with, or as, a logstash server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslua_1_1_2" = callPackage
@@ -134126,8 +125834,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring colour containers ];
        description = "HSLuv conversion utility";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsmagick" = callPackage
@@ -134151,8 +125857,6 @@ self: {
        ];
        description = "FFI bindings for the GraphicsMagick library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; 
          jasper = null; inherit (pkgs) lcms; inherit (pkgs) libjpeg; 
          inherit (pkgs) libpng; inherit (pkgs) libxml2; tiff = null; 
@@ -134189,8 +125893,6 @@ self: {
        ];
        description = "Tool for generating .dir-locals.el for intero";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsmtpclient" = callPackage
@@ -134202,8 +125904,6 @@ self: {
        libraryHaskellDepends = [ array base directory network old-time ];
        description = "Simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsndfile" = callPackage
@@ -134260,8 +125960,6 @@ self: {
        ];
        description = "Nock 5K interpreter";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsnoise" = callPackage
@@ -134286,8 +125984,6 @@ self: {
        executableHaskellDepends = [ base network pcap ];
        description = "a miniature network sniffer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsnsq" = callPackage
@@ -134306,8 +126002,6 @@ self: {
        ];
        description = "Haskell NSQ client";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsntp" = callPackage
@@ -134324,8 +126018,6 @@ self: {
        executableHaskellDepends = [ unix ];
        description = "Libraries to use SNTP protocol and small client/server implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsoptions" = callPackage
@@ -134350,8 +126042,6 @@ self: {
        ];
        description = "Haskell library that supports command-line flag processing";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsoz" = callPackage
@@ -134390,8 +126080,6 @@ self: {
        ];
        description = "Iron, Hawk, Oz: Web auth protocols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsp" = callPackage
@@ -134414,8 +126102,6 @@ self: {
        libraryHaskellDepends = [ base containers harp hsp network ];
        description = "Facilitates running Haskell Server Pages web pages as CGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsparklines" = callPackage
@@ -134448,8 +126134,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "hspear" = callPackage
@@ -134465,8 +126149,6 @@ self: {
        ];
        description = "Haskell Spear Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec" = callPackage
@@ -134673,8 +126355,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An hspec expectation that asserts a value matches a pattern";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-expectations-pretty" = callPackage
@@ -134690,8 +126370,6 @@ self: {
        ];
        description = "hspec-expectations with pretty printing on failure";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-expectations-pretty-diff" = callPackage
@@ -134720,8 +126398,6 @@ self: {
        testHaskellDepends = [ base hspec-meta ];
        description = "An experimental DSL for testing on top of Hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-golden" = callPackage
@@ -134776,8 +126452,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-hedgehog" = callPackage
@@ -134807,8 +126481,6 @@ self: {
        libraryHaskellDepends = [ base blaze-markup hspec ];
        description = "Jenkins-friendly XML formatter for Hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-laws" = callPackage
@@ -134893,8 +126565,6 @@ self: {
        ];
        description = "Orphan instances of MonadBase and MonadBaseControl for SpecM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-multicheck" = callPackage
@@ -134955,8 +126625,6 @@ self: {
        ];
        description = "Helpers for creating database tests with hspec and pg-transact";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-server" = callPackage
@@ -135004,8 +126672,6 @@ self: {
        ];
        description = "Add an hspec test-suite in one command";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-shouldbe" = callPackage
@@ -135017,8 +126683,6 @@ self: {
        libraryHaskellDepends = [ hspec test-shouldbe ];
        description = "Convenience wrapper and utilities for hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-slow" = callPackage
@@ -135094,8 +126758,6 @@ self: {
        sha256 = "008gm0qvhvp6z6a9sq5vpljqb90258apd83rkzy47k3bczy1sgmj";
        libraryHaskellDepends = [ base hspec ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-tables" = callPackage
@@ -135153,8 +126815,6 @@ self: {
        testHaskellDepends = [ base hspec test-sandbox ];
        description = "Hspec convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-wai" = callPackage
@@ -135254,8 +126914,6 @@ self: {
        ];
        description = "Write end2end web application tests using webdriver and hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec2" = callPackage
@@ -135269,8 +126927,6 @@ self: {
        libraryHaskellDepends = [ base hspec hspec-discover ];
        description = "Alpha version of Hspec 2.0";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspecVariant" = callPackage
@@ -135282,8 +126938,6 @@ self: {
        libraryHaskellDepends = [ base hspec QuickCheckVariant ];
        description = "Spec for testing properties for variant types";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspkcs11" = callPackage
@@ -135302,8 +126956,6 @@ self: {
        ];
        description = "Wrapper for PKCS #11 interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspr-sh" = callPackage
@@ -135330,8 +126982,6 @@ self: {
        ];
        description = "A client library for the spread toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspresent" = callPackage
@@ -135346,8 +126996,6 @@ self: {
        doHaddock = false;
        description = "A terminal presentation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsprocess" = callPackage
@@ -135373,8 +127021,6 @@ self: {
        ];
        description = "The Haskell Stream Processor command line utility";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsql" = callPackage
@@ -135386,8 +127032,6 @@ self: {
        libraryHaskellDepends = [ base old-time ];
        description = "Database access from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsql-mysql" = callPackage
@@ -135402,8 +127046,6 @@ self: {
        librarySystemDepends = [ mysqlclient ];
        description = "MySQL driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mysqlclient = null;};
 
   "hsql-odbc" = callPackage
@@ -135416,8 +127058,6 @@ self: {
        librarySystemDepends = [ unixODBC ];
        description = "A Haskell Interface to ODBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) unixODBC;};
 
   "hsql-postgresql" = callPackage
@@ -135430,8 +127070,6 @@ self: {
        librarySystemDepends = [ postgresql ];
        description = "A Haskell Interface to PostgreSQL via the PQ library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "hsql-sqlite3" = callPackage
@@ -135444,8 +127082,6 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "SQLite3 driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "hsqml" = callPackage
@@ -135467,8 +127103,6 @@ self: {
        ];
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
@@ -135481,8 +127115,6 @@ self: {
        libraryPkgconfigDepends = [ qt5 ];
        description = "HsQML (Qt5) data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
@@ -135498,8 +127130,6 @@ self: {
        ];
        description = "HsQML DataModel instances for Vinyl Rec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsqml-demo-manic" = callPackage
@@ -135516,8 +127146,6 @@ self: {
        ];
        description = "HsQML-based clone of Pipe Mania";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsqml-demo-morris" = callPackage
@@ -135536,8 +127164,6 @@ self: {
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsqml-demo-notes" = callPackage
@@ -135556,8 +127182,6 @@ self: {
        ];
        description = "Sticky notes example program implemented in HsQML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsqml-demo-samples" = callPackage
@@ -135572,8 +127196,6 @@ self: {
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
        description = "HsQML sample programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsqml-morris" = callPackage
@@ -135592,8 +127214,6 @@ self: {
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsreadability" = callPackage
@@ -135617,8 +127237,6 @@ self: {
        ];
        description = "Access to the Readability API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsrelp" = callPackage
@@ -135633,8 +127251,6 @@ self: {
        ];
        description = "RELP (Reliable Event Logging Protocol) server implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsseccomp" = callPackage
@@ -135648,8 +127264,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Haskell bindings to libseccomp";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {seccomp = null;};
 
   "hssh" = callPackage
@@ -135721,8 +127335,6 @@ self: {
        ];
        description = "SQL parser and type checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hssqlppp-th" = callPackage
@@ -135741,8 +127353,6 @@ self: {
        ];
        description = "hssqlppp extras which need template-haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstar" = callPackage
@@ -135765,8 +127375,6 @@ self: {
        executableToolDepends = [ cpphs ];
        description = "Haskell version of tar CLI utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstatistics" = callPackage
@@ -135782,8 +127390,6 @@ self: {
        ];
        description = "Statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstats" = callPackage
@@ -135795,8 +127401,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstatsd" = callPackage
@@ -135808,8 +127412,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl network text ];
        description = "Quick and dirty statsd interface";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstest" = callPackage
@@ -135827,8 +127429,6 @@ self: {
        ];
        description = "Runs tests via QuickCheck1 and HUnit; like quickCheck-script but uses GHC api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstidy" = callPackage
@@ -135842,8 +127442,6 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts ];
        description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstorchat" = callPackage
@@ -135872,8 +127470,6 @@ self: {
        ];
        description = "Distributed instant messaging over Tor";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstox" = callPackage
@@ -135901,8 +127497,6 @@ self: {
        testHaskellDepends = [ async base ];
        description = "A Tox protocol implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstradeking" = callPackage
@@ -135927,8 +127521,6 @@ self: {
        ];
        description = "Tradeking API bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstyle" = callPackage
@@ -135946,8 +127538,6 @@ self: {
        ];
        description = "Checks Haskell source code for style compliance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstzaar" = callPackage
@@ -135968,8 +127558,6 @@ self: {
        ];
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsubconvert" = callPackage
@@ -135991,8 +127579,6 @@ self: {
        ];
        description = "One-time, faithful conversion of Subversion repositories to Git";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsudoku" = callPackage
@@ -136021,8 +127607,6 @@ self: {
        ];
        description = "Sudoku game with a GTK3 interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsverilog" = callPackage
@@ -136054,8 +127638,6 @@ self: {
        librarySystemDepends = [ ncurses readline swipl ];
        description = "embedding prolog in haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline; 
          swipl = null;};
 
@@ -136072,8 +127654,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ];
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsx-jmacro" = callPackage
@@ -136087,8 +127667,6 @@ self: {
        ];
        description = "hsp+jmacro support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsx-xhtml" = callPackage
@@ -136100,8 +127678,6 @@ self: {
        libraryHaskellDepends = [ base hsx mtl ];
        description = "XHTML utilities to use together with HSX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsx2hs" = callPackage
@@ -136135,8 +127711,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "FFI to syscalls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsyslog" = callPackage
@@ -136168,8 +127742,6 @@ self: {
        ];
        description = "syslog over TCP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsyslog-udp" = callPackage
@@ -136198,8 +127770,6 @@ self: {
        librarySystemDepends = [ com_err zephyr ];
        description = "Simple libzephyr bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {com_err = null; zephyr = null;};
 
   "htaglib" = callPackage
@@ -136249,8 +127819,6 @@ self: {
        ];
        description = "Command-line tar archive utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htaut" = callPackage
@@ -136278,8 +127846,6 @@ self: {
        ];
        description = "Beginner friendly graphics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htestu" = callPackage
@@ -136295,8 +127861,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A library for testing correctness of pseudo random number generators in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gcc;};
 
   "htiled" = callPackage
@@ -136313,8 +127877,6 @@ self: {
        ];
        description = "Import from the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htime" = callPackage
@@ -136355,8 +127917,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Heterogenous Set";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "html" = callPackage
@@ -136392,8 +127952,6 @@ self: {
        ];
        description = "Determine character encoding of HTML documents/fragments";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "html-conduit_1_2_1_2" = callPackage
@@ -136514,8 +128072,6 @@ self: {
        libraryHaskellDepends = [ base hxt kure ];
        description = "HTML rewrite engine, using KURE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "html-minimalist" = callPackage
@@ -136554,8 +128110,6 @@ self: {
        ];
        description = "A high-performance HTML tokenizer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "html-rules" = callPackage
@@ -136567,8 +128121,6 @@ self: {
        libraryHaskellDepends = [ base lens mtl tagsoup transformers ];
        description = "Perform traversals of HTML structures using sets of rules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "html-tokenizer" = callPackage
@@ -136591,8 +128143,6 @@ self: {
        ];
        description = "An \"attoparsec\"-based HTML tokenizer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "html-truncate" = callPackage
@@ -136763,8 +128313,6 @@ self: {
        libraryHaskellDepends = [ base hmt xml ];
        description = "Haskell Music Typesetting";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htsn" = callPackage
@@ -136788,8 +128336,6 @@ self: {
        ];
        description = "Parse XML files from The Sports Network feed";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htsn-common" = callPackage
@@ -136832,8 +128378,6 @@ self: {
        ];
        description = "Import XML files from The Sports Network into an RDBMS";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htssets" = callPackage
@@ -136845,8 +128389,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Heterogenous Sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-accept" = callPackage
@@ -136923,8 +128465,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring http-types ];
        description = "Attoparsec parsers for http-types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client" = callPackage
@@ -136998,8 +128538,6 @@ self: {
        ];
        description = "HTTP authorization (both basic and digest) done right";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client-conduit" = callPackage
@@ -137046,8 +128584,6 @@ self: {
        ];
        description = "Optics for http-client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client-multipart" = callPackage
@@ -137117,8 +128653,6 @@ self: {
        ];
        description = "Convenient monadic HTTP request modifiers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client-restricted" = callPackage
@@ -137150,8 +128684,6 @@ self: {
        ];
        description = "A simple abstraction over the \"http-client\" connection manager";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client-streams" = callPackage
@@ -137168,8 +128700,6 @@ self: {
        ];
        description = "http-client for io-streams supporting openssl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client-tls" = callPackage
@@ -137215,8 +128745,6 @@ self: {
        ];
        description = "Glue code for http-client and websockets";
        license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-common" = callPackage
@@ -137320,8 +128848,6 @@ self: {
        ];
        description = "Browser interface to the http-conduit package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-conduit-downloader" = callPackage
@@ -137338,8 +128864,6 @@ self: {
        ];
        description = "HTTP downloader tailored for web-crawler needs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-date" = callPackage
@@ -137374,8 +128898,6 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "http directory listing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-dispatch" = callPackage
@@ -137393,8 +128915,6 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "High level HTTP client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-download" = callPackage
@@ -137462,8 +128982,6 @@ self: {
        ];
        description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-grammar" = callPackage
@@ -137475,8 +128993,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-io-streams" = callPackage
@@ -137498,8 +129014,6 @@ self: {
        ];
        description = "HTTP and WebSocket client based on io-streams";
        license = "BSD-3-Clause AND GPL-2.0-or-later";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-kinder" = callPackage
@@ -137522,8 +129036,6 @@ self: {
        ];
        description = "Generic kinds and types for working with HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-kit" = callPackage
@@ -137608,8 +129120,6 @@ self: {
        ];
        description = "Listen to HTTP requests and handle them in arbitrary ways";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-media" = callPackage
@@ -137667,8 +129177,6 @@ self: {
        ];
        description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-pony" = callPackage
@@ -137685,8 +129193,6 @@ self: {
        ];
        description = "A type unsafe http library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-pony-serve-wai" = callPackage
@@ -137706,8 +129212,6 @@ self: {
        ];
        description = "Serve a WAI application with http-pony";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-pony-transformer-case-insensitive" = callPackage
@@ -137774,8 +129278,6 @@ self: {
        ];
        description = "A library for writing HTTP and HTTPS proxies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-query" = callPackage
@@ -137807,8 +129309,6 @@ self: {
        ];
        description = "The HTTP query builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-response-decoder" = callPackage
@@ -137828,8 +129328,6 @@ self: {
        ];
        description = "Declarative DSL for parsing an HTTP response";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-reverse-proxy" = callPackage
@@ -137889,8 +129387,6 @@ self: {
        ];
        description = "A library for writing Haskell web servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-shed" = callPackage
@@ -137904,8 +129400,6 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-streams" = callPackage
@@ -138004,8 +129498,6 @@ self: {
        libraryHaskellDepends = [ base failure process transformers ];
        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;
-       broken = true;
      }) {};
 
   "http2" = callPackage
@@ -138055,8 +129547,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A native HTTP2 client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http2-client-exe" = callPackage
@@ -138076,8 +129566,6 @@ self: {
        ];
        description = "A command-line http2 client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http2-client-grpc" = callPackage
@@ -138097,8 +129585,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Implement gRPC-over-HTTP2 clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http2-grpc-proto-lens" = callPackage
@@ -138115,8 +129601,6 @@ self: {
        ];
        description = "Encoders based on `proto-lens` for gRPC over HTTP2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http2-grpc-proto3-wire" = callPackage
@@ -138133,8 +129617,6 @@ self: {
        ];
        description = "Encoders based on `proto3-wire` for gRPC over HTTP2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http2-grpc-types" = callPackage
@@ -138185,8 +129667,6 @@ self: {
        ];
        description = "High-level access to HTTPS Everywhere rulesets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "https-everywhere-rules-raw" = callPackage
@@ -138201,8 +129681,6 @@ self: {
        ];
        description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "httpspec" = callPackage
@@ -138220,8 +129698,6 @@ self: {
        ];
        description = "Specification of HTTP request/response generators and parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htune" = callPackage
@@ -138235,8 +129711,6 @@ self: {
        executableHaskellDepends = [ alsa-pcm base carray fft gloss ];
        description = "harmonic analyser and tuner for musical instruments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htvm" = callPackage
@@ -138264,8 +129738,6 @@ self: {
        testSystemDepends = [ tvm_runtime ];
        description = "Bindings for TVM machine learning framework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {tvm_runtime = null;};
 
   "htzaar" = callPackage
@@ -138279,8 +129751,6 @@ self: {
        executableHaskellDepends = [ base OpenGL random SDL ];
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hub" = callPackage
@@ -138356,8 +129826,6 @@ self: {
        ];
        description = "huck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "huckleberry" = callPackage
@@ -138389,8 +129857,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A fast-foward-based planner";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "huffman" = callPackage
@@ -138402,8 +129868,6 @@ self: {
        libraryHaskellDepends = [ base containers fingertree ];
        description = "Pure Haskell implementation of the Huffman encoding algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hugs2yc" = callPackage
@@ -138420,8 +129884,6 @@ self: {
        ];
        description = "Hugs Front-end to Yhc Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hulk" = callPackage
@@ -138448,8 +129910,6 @@ self: {
        ];
        description = "IRC server written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "human-parse" = callPackage
@@ -138461,8 +129921,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for parsing text entered by humans";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "human-readable-duration" = callPackage
@@ -138487,8 +129945,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for converting values to human-friendly text";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "humble-prelude" = callPackage
@@ -138524,8 +129980,6 @@ self: {
        ];
        description = "Haskell UPnP Media Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hunch" = callPackage
@@ -138574,8 +130028,6 @@ self: {
        executableHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        description = "A GUI testrunner for HUnit";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hunit-parsec" = callPackage
@@ -138599,8 +130051,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit rematch ];
        description = "HUnit support for rematch";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hunp" = callPackage
@@ -138619,8 +130069,6 @@ self: {
        ];
        description = "Unpacker tool with DWIM";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hunspell-hs" = callPackage
@@ -138637,8 +130085,6 @@ self: {
        benchmarkPkgconfigDepends = [ hunspell ];
        description = "Hunspell thread-safe FFI bindings for spell checking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) hunspell;};
 
   "hunt-searchengine" = callPackage
@@ -138670,8 +130116,6 @@ self: {
        ];
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hunt-server" = callPackage
@@ -138695,8 +130139,6 @@ self: {
        ];
        description = "A search and indexing engine server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hunt-server-cli" = callPackage
@@ -138750,8 +130192,6 @@ self: {
        ];
        description = "Upload packages or documentation to a hackage server";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hurdle" = callPackage
@@ -138767,8 +130207,6 @@ self: {
        ];
        description = "Extract function names from Windows DLLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hurl" = callPackage
@@ -138793,8 +130231,6 @@ self: {
        executableHaskellDepends = [ base directory network-uri ];
        description = "Haskell URL resolver";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hurriyet" = callPackage
@@ -138813,8 +130249,6 @@ self: {
        ];
        description = "Haskell bindings for Hurriyet API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "husk-scheme" = callPackage
@@ -138839,8 +130273,6 @@ self: {
        ];
        description = "R5RS Scheme interpreter, compiler, and library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "husk-scheme-libs" = callPackage
@@ -138856,8 +130288,6 @@ self: {
        ];
        description = "Extra libraries for the husk Scheme platform";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "husky" = callPackage
@@ -138875,8 +130305,6 @@ self: {
        ];
        description = "A simple command line calculator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hutton" = callPackage
@@ -138897,8 +130325,6 @@ self: {
        ];
        description = "A program for the button on Reddit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "huttons-razor" = callPackage
@@ -138912,8 +130338,6 @@ self: {
        executableHaskellDepends = [ base parsec parsec-numbers ];
        description = "Quick implemention of Hutton's Razor";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "huzzy" = callPackage
@@ -138925,8 +130349,6 @@ self: {
        libraryHaskellDepends = [ base easyplot ];
        description = "Fuzzy logic library with support for T1, IT2, GT2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hvect" = callPackage
@@ -138969,8 +130391,6 @@ self: {
        libraryHaskellDepends = [ base hvega text ];
        description = "Theme for hvega";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-aeson" = callPackage
@@ -139017,8 +130437,6 @@ self: {
        ];
        description = "Demo library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-balancedparens" = callPackage
@@ -139055,8 +130473,6 @@ self: {
        doHaddock = false;
        description = "Balanced parentheses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-bits" = callPackage
@@ -139101,8 +130517,6 @@ self: {
        doHaddock = false;
        description = "CI Assistant for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-conduit" = callPackage
@@ -139199,8 +130613,6 @@ self: {
        ];
        description = "Unbelievably fast streaming DSV file parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-dump" = callPackage
@@ -139273,8 +130685,6 @@ self: {
        ];
        description = "Elias-Fano";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-excess" = callPackage
@@ -139464,8 +130874,6 @@ self: {
        doHaddock = false;
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-json-lens" = callPackage
@@ -139495,8 +130903,6 @@ self: {
        ];
        description = "Lens for hw-json";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-json-simd" = callPackage
@@ -139523,8 +130929,6 @@ self: {
        testToolDepends = [ doctest-discover ];
        description = "SIMD-based JSON semi-indexer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-json-simple-cursor" = callPackage
@@ -139562,8 +130966,6 @@ self: {
        ];
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-json-standard-cursor" = callPackage
@@ -139603,8 +131005,6 @@ self: {
        ];
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-kafka-avro" = callPackage
@@ -139631,8 +131031,6 @@ self: {
        ];
        description = "Avro support for Kafka infrastructure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-kafka-client" = callPackage
@@ -139804,8 +131202,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Primitive support for bit manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-rankselect" = callPackage
@@ -139845,8 +131241,6 @@ self: {
        doHaddock = false;
        description = "Rank-select";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-rankselect-base" = callPackage
@@ -139905,8 +131299,6 @@ self: {
        ];
        description = "SIMD library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-streams" = callPackage
@@ -139965,8 +131357,6 @@ self: {
        ];
        description = "Succint datastructures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-uri" = callPackage
@@ -140059,8 +131449,6 @@ self: {
        ];
        description = "XML parser based on succinct data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwall-auth-iitk" = callPackage
@@ -140079,8 +131467,6 @@ self: {
        ];
        description = "Initial version of firewall Authentication for IITK network";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hweblib" = callPackage
@@ -140103,8 +131489,6 @@ self: {
        ];
        description = "Haskell Web Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwhile" = callPackage
@@ -140125,8 +131509,6 @@ self: {
        testHaskellDepends = [ array base Cabal containers mtl ];
        description = "An implementation of Neil D. Jones' While language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwk" = callPackage
@@ -140166,8 +131548,6 @@ self: {
        ];
        description = "A reliable at-least-once job queue built on top of redis";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hworker-ses" = callPackage
@@ -140184,8 +131564,6 @@ self: {
        ];
        description = "Library for sending email with Amazon's SES and hworker";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwormhole" = callPackage
@@ -140218,8 +131596,6 @@ self: {
        ];
        description = "magic-wormhole client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hws" = callPackage
@@ -140238,8 +131614,6 @@ self: {
        ];
        description = "Simple Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwsl2" = callPackage
@@ -140259,8 +131633,6 @@ self: {
        ];
        description = "Hashing with SL2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwsl2-bytevector" = callPackage
@@ -140272,8 +131644,6 @@ self: {
        libraryHaskellDepends = [ base bytestring fingertree hwsl2 ];
        description = "A hashed byte-vector based on algebraic hashes and finger trees";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwsl2-reducers" = callPackage
@@ -140287,8 +131657,6 @@ self: {
        ];
        description = "Semigroup and Reducer instances for Data.Hash.SL2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hx" = callPackage
@@ -140300,8 +131668,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell extras (missing utility functions)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hxmppc" = callPackage
@@ -140320,8 +131686,6 @@ self: {
        ];
        description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hxournal" = callPackage
@@ -140348,8 +131712,6 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "A pen notetaking program written in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hxt" = callPackage
@@ -140505,8 +131867,6 @@ self: {
        libraryHaskellDepends = [ base hxt mtl ];
        description = "Utility functions for using HXT picklers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hxt-regex-xmlschema" = callPackage
@@ -140613,8 +131973,6 @@ self: {
        libraryHaskellDepends = [ base bytestring encoding hxt mtl ];
        description = "Helper functions for HXT";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hxweb" = callPackage
@@ -140626,8 +131984,6 @@ self: {
        libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ];
        description = "Minimal webframework using fastcgi, libxml2 and libxslt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyahtzee" = callPackage
@@ -140641,8 +131997,6 @@ self: {
        executableHaskellDepends = [ base containers HUnit random ];
        description = "A Yahtzee game implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyakko" = callPackage
@@ -140664,8 +132018,6 @@ self: {
        ];
        description = "Literate-style Documentation Generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hybrid" = callPackage
@@ -140682,8 +132034,6 @@ self: {
        ];
        description = "A implementation of a type-checker for Lambda-H";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hybrid-vectors" = callPackage
@@ -140712,8 +132062,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {sixense_x64 = null;};
 
   "hydra-print" = callPackage
@@ -140745,8 +132093,6 @@ self: {
        ];
        description = "NCurses interface to view multiple ByteString streams in parallel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen" = callPackage
@@ -140763,8 +132109,6 @@ self: {
        testHaskellDepends = [ base Cabal containers mtl QuickCheck ];
        description = "An alternate Prelude";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-cli" = callPackage
@@ -140785,8 +132129,6 @@ self: {
        ];
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-cli-args" = callPackage
@@ -140802,8 +132144,6 @@ self: {
        ];
        description = "Hydrogen Command Line Arguments Parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-data" = callPackage
@@ -140815,8 +132155,6 @@ self: {
        libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ];
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-multimap" = callPackage
@@ -140828,8 +132166,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim ];
        description = "Hydrogen Multimap";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-parsing" = callPackage
@@ -140843,8 +132179,6 @@ self: {
        ];
        description = "Hydrogen Parsing Utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-prelude" = callPackage
@@ -140864,8 +132198,6 @@ self: {
        ];
        description = "Hydrogen Prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-prelude-parsec" = callPackage
@@ -140877,8 +132209,6 @@ self: {
        libraryHaskellDepends = [ base hydrogen-prelude parsec ];
        description = "Hydrogen Prelude /w Parsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-syntax" = callPackage
@@ -140895,8 +132225,6 @@ self: {
        ];
        description = "Hydrogen Syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-util" = callPackage
@@ -140911,8 +132239,6 @@ self: {
        ];
        description = "Hydrogen Tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-version" = callPackage
@@ -140941,8 +132267,6 @@ self: {
        ];
        description = "Simple web application server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hylide" = callPackage
@@ -140964,8 +132288,6 @@ self: {
        ];
        description = "WebGL live-coding environment for writing shaders with Hylogen";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hylogen" = callPackage
@@ -140992,8 +132314,6 @@ self: {
        ];
        description = "Tools for hybrid logics related programs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hylotab" = callPackage
@@ -141008,8 +132328,6 @@ self: {
        executableHaskellDepends = [ base hylolib mtl ];
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyloutils" = callPackage
@@ -141025,8 +132343,6 @@ self: {
        ];
        description = "Very small programs for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyper" = callPackage
@@ -141040,45 +132356,52 @@ self: {
        libraryHaskellDepends = [ base blaze-html deepseq text ];
        description = "Display class for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hyper_0_2_1_0" = callPackage
+    ({ mkDerivation, base, blaze-html, deepseq, text }:
+     mkDerivation {
+       pname = "hyper";
+       version = "0.2.1.0";
+       sha256 = "14vl52v4qshdyp45qrg8ii8xzpi6n05qdgz3ri59wis8hdw1v06z";
+       libraryHaskellDepends = [ base blaze-html deepseq text ];
+       description = "Display class for the HyperHaskell graphical Haskell interpreter";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyper-extra" = callPackage
     ({ mkDerivation, base, diagrams-lib, diagrams-svg, hyper
-     , svg-builder, text
+     , QuickCheck, svg-builder, text
      }:
      mkDerivation {
        pname = "hyper-extra";
-       version = "0.1.0.3";
-       sha256 = "0wscbw5k5gry6p1k6v44fhknhx7wq70bh8kb3k2q0mmxif75j8fa";
+       version = "0.2.0.0";
+       sha256 = "1zcbs9cpr6rfzhsqrv867j79gb3521pyrl32qbp5jwqiy1iyddm5";
        libraryHaskellDepends = [
-         base diagrams-lib diagrams-svg hyper svg-builder text
+         base diagrams-lib diagrams-svg hyper QuickCheck svg-builder text
        ];
        description = "Display instances for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyper-haskell-server" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
-     , haskell-src-exts, hint, hyper, scotty, text, transformers
+     , filepath, haskell-src-exts, hint, hyper, scotty, text
+     , transformers
      }:
      mkDerivation {
        pname = "hyper-haskell-server";
-       version = "0.2.1.0";
-       sha256 = "0pjyyf0hqdy62nhsllfindl0w5nfz7bj1i7n4l421bsf2hk2cz72";
+       version = "0.2.3.0";
+       sha256 = "1kb7cfniws4qd10swy7vspgbr93xxnzlbcq5jarmdas2kpn3nyhd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson base bytestring deepseq exceptions haskell-src-exts hint
-         hyper scotty text transformers
+         aeson base bytestring deepseq exceptions filepath haskell-src-exts
+         hint hyper scotty text transformers
        ];
        description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyperdrive" = callPackage
@@ -141097,8 +132420,6 @@ self: {
        ];
        description = "a fast, trustworthy HTTP(s) server built";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyperfunctions" = callPackage
@@ -141114,8 +132435,6 @@ self: {
        ];
        description = "Hyperfunctions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyperion" = callPackage
@@ -141143,8 +132462,6 @@ self: {
        ];
        description = "Reliable performance measurement with robust data export";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyperloglog" = callPackage
@@ -141186,8 +132503,6 @@ self: {
        testHaskellDepends = [ base HUnit semigroups tasty tasty-hunit ];
        description = "Approximate cardinality estimation using constant space";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyperpublic" = callPackage
@@ -141203,8 +132518,6 @@ self: {
        ];
        description = "A thin wrapper for the Hyperpublic API";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyphenate" = callPackage
@@ -141267,8 +132580,6 @@ self: {
        ];
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyraxAbif" = callPackage
@@ -141399,8 +132710,6 @@ self: {
        ];
        description = "A haskell wrapper for the Zulip API";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "i18n" = callPackage
@@ -141421,8 +132730,6 @@ self: {
        ];
        description = "Internationalization for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "i3blocks-hs-contrib" = callPackage
@@ -141442,8 +132749,6 @@ self: {
        ];
        description = "Base i3blocks written in haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "i3ipc" = callPackage
@@ -141461,8 +132766,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "A type-safe wrapper around i3's IPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iCalendar" = callPackage
@@ -141481,8 +132784,6 @@ self: {
        ];
        description = "iCalendar data types, parser, and printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iException" = callPackage
@@ -141511,8 +132812,6 @@ self: {
        ];
        description = "A simple wrapper of In-App-Purchase receipt validate APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ib-api" = callPackage
@@ -141529,8 +132828,6 @@ self: {
        ];
        description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iban" = callPackage
@@ -141549,8 +132846,6 @@ self: {
        testHaskellDepends = [ base HUnit tasty tasty-hunit text ];
        description = "Validate and generate IBANs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ibus-hs" = callPackage
@@ -141583,8 +132878,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "iCalendar format parser and org-mode converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "icepeak" = callPackage
@@ -141680,8 +132973,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Type safe iconv wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ide-backend" = callPackage
@@ -141728,8 +133019,6 @@ self: {
        ];
        description = "An IDE backend library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ide-backend-common" = callPackage
@@ -141754,8 +133043,6 @@ self: {
        ];
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ide-backend-rts" = callPackage
@@ -141790,8 +133077,6 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ideas" = callPackage
@@ -141811,8 +133096,6 @@ self: {
        ];
        description = "Feedback services for intelligent tutoring systems";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ideas-math" = callPackage
@@ -141830,8 +133113,6 @@ self: {
        ];
        description = "Interactive domain reasoner for logic and mathematics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ideas-math-types" = callPackage
@@ -141845,8 +133126,6 @@ self: {
        ];
        description = "Common types for mathematical domain reasoners";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ideas-statistics" = callPackage
@@ -141862,8 +133141,6 @@ self: {
        ];
        description = "Interactive domain reasoner for statistics";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "idempotent" = callPackage
@@ -141876,8 +133153,6 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Idempotent monoids";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "identicon" = callPackage
@@ -141920,8 +133195,6 @@ self: {
        ];
        description = "Squares style for the identicon package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "identifiers" = callPackage
@@ -141946,8 +133219,6 @@ self: {
        ];
        description = "Numeric identifiers for values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "idiii" = callPackage
@@ -141973,8 +133244,6 @@ self: {
        ];
        description = "ID3v2 (tagging standard for MP3 files) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "idna" = callPackage
@@ -141997,8 +133266,6 @@ self: {
        libraryHaskellDepends = [ base punycode split ];
        description = "Converts Unicode hostnames into ASCII";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "idringen" = callPackage
@@ -142085,8 +133352,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "ieee-utils";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ieee-utils-tempfix" = callPackage
@@ -142136,8 +133401,6 @@ self: {
        testHaskellDepends = [ base bytestring HUnit stocks ];
        description = "Library for the IEX Trading API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "if" = callPackage
@@ -142163,8 +133426,6 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "put if statements within type constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iff" = callPackage
@@ -142213,8 +133474,6 @@ self: {
        ];
        description = "Bindings to Instagram's API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ige" = callPackage
@@ -142237,8 +133496,6 @@ self: {
        ];
        description = "An keyboard-driven interactive graph editor";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ige-mac-integration" = callPackage
@@ -142257,8 +133514,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ige-mac-integration = null;};
 
   "ignore" = callPackage
@@ -142278,8 +133533,6 @@ self: {
        testHaskellDepends = [ base HTF text ];
        description = "Handle ignore files of different VCSes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "igraph" = callPackage
@@ -142297,8 +133550,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the igraph C library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) igraph;};
 
   "igrf" = callPackage
@@ -142312,8 +133563,6 @@ self: {
        ];
        description = "International Geomagnetic Reference Field";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell" = callPackage
@@ -142349,8 +133598,6 @@ self: {
        ];
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-aeson" = callPackage
@@ -142366,8 +133613,6 @@ self: {
        ];
        description = "IHaskell display instances for Aeson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-basic" = callPackage
@@ -142379,8 +133624,6 @@ self: {
        libraryHaskellDepends = [ base ihaskell ];
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-blaze" = callPackage
@@ -142392,8 +133635,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
        description = "IHaskell display instances for blaze-html types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-charts" = callPackage
@@ -142410,8 +133651,6 @@ self: {
        ];
        description = "IHaskell display instances for charts types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-diagrams" = callPackage
@@ -142428,8 +133667,6 @@ self: {
        ];
        description = "IHaskell display instances for diagram types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-display" = callPackage
@@ -142441,8 +133678,6 @@ self: {
        libraryHaskellDepends = [ base classy-prelude ihaskell ];
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-gnuplot" = callPackage
@@ -142454,8 +133689,6 @@ self: {
        libraryHaskellDepends = [ base bytestring gnuplot ihaskell ];
        description = "IHaskell display instance for Gnuplot (from gnuplot package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-graphviz" = callPackage
@@ -142467,8 +133700,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ihaskell process ];
        description = "IHaskell display instance for GraphViz (external binary)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-hatex" = callPackage
@@ -142480,8 +133711,6 @@ self: {
        libraryHaskellDepends = [ base HaTeX ihaskell text ];
        description = "IHaskell display instances for hatex";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-hvega" = callPackage
@@ -142493,8 +133722,6 @@ self: {
        libraryHaskellDepends = [ aeson base hvega ihaskell text ];
        description = "IHaskell display instance for hvega types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-inline-r" = callPackage
@@ -142512,8 +133739,6 @@ self: {
        ];
        description = "Embed R quasiquotes and plots in IHaskell notebooks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-juicypixels" = callPackage
@@ -142528,8 +133753,6 @@ self: {
        ];
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-magic" = callPackage
@@ -142546,8 +133769,6 @@ self: {
        ];
        description = "IHaskell display instances for bytestrings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-parsec" = callPackage
@@ -142563,8 +133784,6 @@ self: {
        ];
        description = "IHaskell display instances for Parsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-plot" = callPackage
@@ -142576,8 +133795,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ];
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-rlangqq" = callPackage
@@ -142595,8 +133812,6 @@ self: {
        ];
        description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-widgets" = callPackage
@@ -142614,8 +133829,6 @@ self: {
        ];
        description = "IPython standard widgets for IHaskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihs" = callPackage
@@ -142647,8 +133860,6 @@ self: {
        executableHaskellDepends = [ base network ];
        description = "Incremental HTTP iteratee";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ilist" = callPackage
@@ -142686,8 +133897,6 @@ self: {
        executableToolDepends = [ alex ];
        description = "A fast syntax highlighting library built with alex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "image-type" = callPackage
@@ -142756,8 +133965,6 @@ self: {
        ];
        description = "Command-line image paste utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imagesize-conduit" = callPackage
@@ -142804,8 +134011,6 @@ self: {
        ];
        description = "An efficient IMAP client library, with SSL and streaming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imapget" = callPackage
@@ -142823,8 +134028,6 @@ self: {
        ];
        description = "Downloads email from imap SSL servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imbib" = callPackage
@@ -142846,8 +134049,6 @@ self: {
        ];
        description = "Minimalistic reference manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imgur" = callPackage
@@ -142863,8 +134064,6 @@ self: {
        ];
        description = "A function to post an image to imgur";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imgurder" = callPackage
@@ -142885,8 +134084,6 @@ self: {
        ];
        description = "Uploader for Imgur";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imj-animation" = callPackage
@@ -142899,8 +134096,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Animation Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imj-base" = callPackage
@@ -142925,8 +134120,6 @@ self: {
        ];
        description = "Game engine with geometry, easing, animated text, delta rendering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imj-game-hamazed" = callPackage
@@ -142947,8 +134140,6 @@ self: {
        testHaskellDepends = [ base imj-base mtl text ];
        description = "A game with flying numbers and 8-bit color animations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imj-measure-stdout" = callPackage
@@ -142964,8 +134155,6 @@ self: {
        ];
        description = "An application to determine the maximum capacity of stdout buffer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imj-prelude" = callPackage
@@ -142977,8 +134166,6 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        description = "Prelude library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imm" = callPackage
@@ -143018,8 +134205,6 @@ self: {
        ];
        description = "Execute arbitrary actions for each item from RSS/Atom feeds";
        license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "immortal_0_2_2_1" = callPackage
@@ -143104,8 +134289,6 @@ self: {
        ];
        description = "Multi-platform parser analyzer and generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imperative-edsl" = callPackage
@@ -143131,8 +134314,6 @@ self: {
        ];
        description = "Deep embedding of imperative programs with code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imperative-edsl-vhdl" = callPackage
@@ -143149,8 +134330,6 @@ self: {
        ];
        description = "Deep embedding of VHDL programs with code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "impl" = callPackage
@@ -143163,8 +134342,6 @@ self: {
        doHaddock = false;
        description = "Framework for defaulting superclasses";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "implicit" = callPackage
@@ -143254,8 +134431,6 @@ self: {
        libraryHaskellDepends = [ base mtl time transformers ];
        description = "A logging framework built around implicit parameters";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "implicit-params" = callPackage
@@ -143267,8 +134442,6 @@ self: {
        libraryHaskellDepends = [ base data-default-class ];
        description = "Named and unnamed implicit parameters with defaults";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "importify" = callPackage
@@ -143301,8 +134474,6 @@ self: {
        ];
        description = "Tool for haskell imports refactoring";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imports" = callPackage
@@ -143315,8 +134486,6 @@ self: {
        testHaskellDepends = [ base directory filepath mtl ];
        description = "Generate code for importing directories automatically";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "impossible" = callPackage
@@ -143328,8 +134497,6 @@ self: {
        libraryHaskellDepends = [ base lens ];
        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;
-       broken = true;
      }) {};
 
   "imprevu" = callPackage
@@ -143387,8 +134554,6 @@ self: {
        testHaskellDepends = [ base binary constraints hspec ];
        description = "Serialization of arbitrary Haskell expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "improve" = callPackage
@@ -143400,8 +134565,6 @@ self: {
        libraryHaskellDepends = [ base mtl yices ];
        description = "An imperative, verifiable programming language for high assurance applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "impure-containers" = callPackage
@@ -143478,8 +134641,6 @@ self: {
        ];
        description = "A type-checker for Haskell with integer constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inchworm" = callPackage
@@ -143491,8 +134652,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Simple parser combinators for lexical analysis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "include-file" = callPackage
@@ -143547,8 +134706,6 @@ self: {
        benchmarkHaskellDepends = [ base containers deepseq QuickCheck ];
        description = "Incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "incremental-maps" = callPackage
@@ -143572,8 +134729,6 @@ self: {
        ];
        description = "Package for doing incremental computations on maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "incremental-parser" = callPackage
@@ -143627,8 +134782,6 @@ self: {
        ];
        description = "type classes for incremental updates to data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indent" = callPackage
@@ -143659,8 +134812,6 @@ self: {
        ];
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indentation-core" = callPackage
@@ -143672,8 +134823,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Indentation sensitive parsing combinators core library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indentation-parsec" = callPackage
@@ -143688,8 +134837,6 @@ self: {
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Indentation sensitive parsing combinators for Parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indentation-trifecta" = callPackage
@@ -143706,8 +134853,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit trifecta ];
        description = "Indentation sensitive parsing combinators for Trifecta";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indentparser" = callPackage
@@ -143744,8 +134889,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Indexed Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indexation" = callPackage
@@ -143767,8 +134910,6 @@ self: {
        ];
        description = "Tools for entity indexation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indexed" = callPackage
@@ -143866,8 +135007,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A series of type families and constraints for \"indexable\" types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indian-language-font-converter" = callPackage
@@ -143894,8 +135033,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Multi-dimensional statically bounded indices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indieweb-algorithms" = callPackage
@@ -143921,8 +135058,6 @@ self: {
        ];
        description = "A collection of implementations of IndieWeb algorithms";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indigo" = callPackage
@@ -143970,8 +135105,6 @@ self: {
        testHaskellDepends = [ array base deepseq QuickCheck text vector ];
        description = "Non-contiguous interval data types with potentially infinite ranges";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "infer-license" = callPackage
@@ -144007,8 +135140,6 @@ self: {
        ];
        description = "Find the repository from where a given repo was forked";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "infernal" = callPackage
@@ -144029,8 +135160,6 @@ self: {
        ];
        description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "infernu" = callPackage
@@ -144051,8 +135180,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative parsec ];
        description = "Type inference and checker for JavaScript (experimental)";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "infinite-search" = callPackage
@@ -144079,8 +135206,6 @@ self: {
          base binary Cabal filepath ghc irc plugins
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "infix" = callPackage
@@ -144092,8 +135217,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell-src ];
        description = "Infix expression re-parsing (for HsParser library)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inflections" = callPackage
@@ -144125,8 +135248,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "An infinite list type and operations thereon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "influxdb" = callPackage
@@ -144182,8 +135303,6 @@ self: {
        ];
        description = "A yesod subsite serving a wiki";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ini" = callPackage
@@ -144214,8 +135333,6 @@ self: {
        testHaskellDepends = [ base HUnit ini raw-strings-qq text ];
        description = "Quasiquoter for INI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inilist" = callPackage
@@ -144235,8 +135352,6 @@ self: {
        ];
        description = "Processing for .ini files with duplicate sections and options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "initialize" = callPackage
@@ -144248,8 +135363,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Initialization and Deinitialization of 'Storable' values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inj" = callPackage
@@ -144301,8 +135414,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monadic functions with injected parameters";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inline-asm" = callPackage
@@ -144331,8 +135442,6 @@ self: {
        ];
        description = "Inline some Assembly in ur Haskell!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inline-c_0_5_6_1" = callPackage
@@ -144454,8 +135563,6 @@ self: {
        ];
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inline-r" = callPackage
@@ -144576,8 +135683,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring dlist ];
        description = "Stupid simple bytestring templates";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inspection-proxy" = callPackage
@@ -144633,8 +135738,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Create benchmarks from the HAR files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instana-haskell-trace-sdk" = callPackage
@@ -144669,8 +135772,6 @@ self: {
        ];
        description = "SDK for adding custom Instana tracing support to Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instance-control" = callPackage
@@ -144698,8 +135799,6 @@ self: {
        ];
        description = "Template haskell utilities for helping with deserialization etc. of existential types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instant-aeson" = callPackage
@@ -144716,8 +135815,6 @@ self: {
        ];
        description = "Generic Aeson instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instant-bytes" = callPackage
@@ -144734,8 +135831,6 @@ self: {
        ];
        description = "Generic Serial instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instant-deepseq" = callPackage
@@ -144747,8 +135842,6 @@ self: {
        libraryHaskellDepends = [ base deepseq instant-generics ];
        description = "Generic NFData instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instant-generics" = callPackage
@@ -144762,8 +135855,6 @@ self: {
        libraryHaskellDepends = [ base containers syb template-haskell ];
        description = "Generic programming library with a sum of products view";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instant-hashable" = callPackage
@@ -144775,8 +135866,6 @@ self: {
        libraryHaskellDepends = [ base hashable instant-generics ];
        description = "Generic Hashable instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instant-zipper" = callPackage
@@ -144790,8 +135879,6 @@ self: {
        libraryHaskellDepends = [ base instant-generics mtl ];
        description = "Heterogenous Zipper in Instant Generics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instapaper-sender" = callPackage
@@ -144811,8 +135898,6 @@ self: {
        ];
        description = "Basic HTTP gateway to save articles to Instapaper";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instinct" = callPackage
@@ -144824,8 +135909,6 @@ self: {
        libraryHaskellDepends = [ base containers mersenne-random vector ];
        description = "Fast artifical neural networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instrument-chord" = callPackage
@@ -144876,8 +135959,6 @@ self: {
        ];
        description = "A data structure that associates each Int key with a set of values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "intcode" = callPackage
@@ -144892,8 +135973,6 @@ self: {
        testHaskellDepends = [ base containers doctest primitive ];
        description = "Advent of Code 2019 intcode interpreter";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "integer-gmp_1_0_3_0" = callPackage
@@ -144934,8 +136013,6 @@ self: {
        sha256 = "0lrhf6mw90bfph3hbyxv3n7g2n2xnjfq4qnhyhw4ml76k4yybmxa";
        description = "A pure-Haskell implementation of arbitrary-precision Integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "integer-roots" = callPackage
@@ -145000,8 +136077,6 @@ self: {
        ];
        description = "Integrate different assays";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "intel-aes" = callPackage
@@ -145020,8 +136095,6 @@ self: {
        librarySystemDepends = [ intel_aes ];
        description = "Hardware accelerated AES encryption and Random Number Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {intel_aes = null;};
 
   "intensional-datatys" = callPackage
@@ -145042,8 +136115,6 @@ self: {
        doHaddock = false;
        description = "A GHC Core plugin for intensional datatype refinement checking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interact" = callPackage
@@ -145156,8 +136227,6 @@ self: {
        ];
        description = "Prelude replacement based on protolude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "intern" = callPackage
@@ -145191,8 +136260,6 @@ self: {
        ];
        description = "Shell command for constructing custom stamps for German Post";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "intero" = callPackage
@@ -145219,8 +136286,6 @@ self: {
        ];
        description = "Complete interactive development program for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interp" = callPackage
@@ -145252,8 +136317,6 @@ self: {
        ];
        description = "Tracery-like randomized text interpolation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interpol" = callPackage
@@ -145277,8 +136340,6 @@ self: {
        ];
        description = "GHC preprocessor and library to enable variable interpolation in strings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interpolate" = callPackage
@@ -145328,8 +136389,6 @@ self: {
        ];
        description = "QuasiQuoter for Ruby-style multi-line interpolated strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interpolatedstring-qq-mwotton" = callPackage
@@ -145345,8 +136404,6 @@ self: {
        ];
        description = "DO NOT USE THIS. interpolatedstring-qq works now.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interpolatedstring-qq2" = callPackage
@@ -145365,8 +136422,6 @@ self: {
        ];
        description = "QuasiQuoter for multi-line interpolated strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interpolation" = callPackage
@@ -145436,8 +136491,6 @@ self: {
        testHaskellDepends = [ base Cabal either transformers ];
        description = "Monad transformers that can be run and resumed later, conserving their context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interspersed" = callPackage
@@ -145463,8 +136516,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Intervals with adherences";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interval-algebra" = callPackage
@@ -145595,8 +136646,6 @@ self: {
        doHaddock = false;
        description = "Intro reexported as Prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "introduction" = callPackage
@@ -145617,8 +136666,6 @@ self: {
        ];
        description = "A prelude for safe new projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "introduction-test" = callPackage
@@ -145638,8 +136685,6 @@ self: {
        ];
        description = "A prelude for the tests of safe new projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "intset" = callPackage
@@ -145651,8 +136696,6 @@ self: {
        libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
        description = "Pure, mergeable, succinct Int sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "intset-imperative" = callPackage
@@ -145742,8 +136785,6 @@ self: {
        libraryHaskellDepends = [ base HList invertible ];
        description = "invertible functions and instances for HList";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "invertible-hxt" = callPackage
@@ -145768,8 +136809,6 @@ self: {
        libraryHaskellDepends = [ base partial-isomorphisms ];
        description = "Invertible syntax descriptions for both parsing and pretty printing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "involutive-semigroups" = callPackage
@@ -145799,8 +136838,6 @@ self: {
        ];
        description = "Capture IO actions' stdout and stderr";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "io-choice" = callPackage
@@ -145820,8 +136857,6 @@ self: {
        ];
        description = "Choice for IO and lifted IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "io-machine" = callPackage
@@ -145873,8 +136908,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "An API for generating TIMBER style reactive objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "io-region" = callPackage
@@ -146001,8 +137034,6 @@ self: {
        libraryHaskellDepends = [ base network unix ];
        description = "Type-safe I/O control package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ion" = callPackage
@@ -146023,8 +137054,6 @@ self: {
        ];
        description = "EDSL for concurrent, realtime, embedded programming on top of Ivory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ioref-stable" = callPackage
@@ -146047,8 +137076,6 @@ self: {
        libraryHaskellDepends = [ base bytestring path text ];
        description = "A class of strings that can be involved in IO";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iothread" = callPackage
@@ -146060,8 +137087,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "run IOs in a single thread";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iotransaction" = callPackage
@@ -146073,8 +137098,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ip" = callPackage
@@ -146105,8 +137128,6 @@ self: {
        ];
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ip-quoter" = callPackage
@@ -146132,8 +137153,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Location Haskell package for IP geolocation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ip2proxy" = callPackage
@@ -146145,8 +137164,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Proxy Haskell package for proxy detection";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ip6addr" = callPackage
@@ -146178,8 +137195,6 @@ self: {
        ];
        description = "interactive patch editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ipc" = callPackage
@@ -146195,8 +137210,6 @@ self: {
        ];
        description = "High level inter-process communication library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ipcvar" = callPackage
@@ -146238,8 +137251,6 @@ self: {
        ];
        description = "Access IPFS locally and remotely";
        license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ipfs-api" = callPackage
@@ -146276,8 +137287,6 @@ self: {
        ];
        description = "IPLD Content-IDentifiers <https://github.com/ipld/cid>";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ipopt-hs" = callPackage
@@ -146299,8 +137308,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ipopt; inherit (pkgs) nlopt;};
 
   "ipprint" = callPackage
@@ -146312,8 +137319,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src sr-extra ];
        description = "Tiny helper for pretty-printing values in ghci console";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iproute" = callPackage
@@ -146353,8 +137358,6 @@ self: {
        executableHaskellDepends = [ base QuickCheck syb ];
        description = "iptables rules parser/printer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iptadmin" = callPackage
@@ -146379,8 +137382,6 @@ self: {
        ];
        description = "web-interface for iptables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ipynb" = callPackage
@@ -146555,8 +137556,6 @@ self: {
        ];
        description = "A DCC message parsing and helper library for IRC clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "irc-fun-bot" = callPackage
@@ -146577,8 +137576,6 @@ self: {
        ];
        description = "Library for writing fun IRC bots";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "irc-fun-client" = callPackage
@@ -146597,8 +137594,6 @@ self: {
        ];
        description = "Another library for writing IRC clients";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "irc-fun-color" = callPackage
@@ -146615,8 +137610,6 @@ self: {
        testHaskellDepends = [ base text ];
        description = "Add color and style decorations to IRC messages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "irc-fun-messages" = callPackage
@@ -146630,8 +137623,6 @@ self: {
        ];
        description = "Types and functions for working with the IRC protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "irc-fun-types" = callPackage
@@ -146643,8 +137634,6 @@ self: {
        libraryHaskellDepends = [ base hashable text ];
        description = "Common types for IRC related packages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ircbot" = callPackage
@@ -146667,8 +137656,6 @@ self: {
        ];
        description = "A library for writing IRC bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ircbouncer" = callPackage
@@ -146717,8 +137704,6 @@ self: {
        ];
        description = "RFC-based resource identifier library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iridium" = callPackage
@@ -146746,8 +137731,6 @@ self: {
        ];
        description = "Automated Local Cabal Package Testing and Uploading";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iron-mq" = callPackage
@@ -146759,8 +137742,6 @@ self: {
        libraryHaskellDepends = [ aeson base http-client lens text wreq ];
        description = "Iron.IO message queueing client library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ironforge" = callPackage
@@ -146783,8 +137764,6 @@ self: {
        ];
        description = "A technical demo for Antisplice";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "irt" = callPackage
@@ -146796,8 +137775,6 @@ self: {
        libraryHaskellDepends = [ ad base data-default-class statistics ];
        description = "Item Response Theory functions for use in computerized adaptive testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "is" = callPackage
@@ -146841,8 +137818,6 @@ self: {
        ];
        description = "An executable and library to determine if a file is a DICOM file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "isevaluated" = callPackage
@@ -146854,8 +137829,6 @@ self: {
        libraryHaskellDepends = [ base vacuum ];
        description = "Check whether a value has been evaluated";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "isiz" = callPackage
@@ -146896,8 +137869,6 @@ self: {
        ];
        description = "Advanced ESMTP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iso-deriving" = callPackage
@@ -146969,8 +137940,6 @@ self: {
        ];
        description = "Types and parser for ISO8601 durations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iso8601-time" = callPackage
@@ -147008,8 +137977,6 @@ self: {
        ];
        description = "A parser and generator for the ISO-14496-12/14 base media file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "isobmff-builder" = callPackage
@@ -147034,8 +138001,6 @@ self: {
        ];
        description = "A (bytestring-) builder for the ISO-14496-12 base media file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "isohunt" = callPackage
@@ -147052,8 +138017,6 @@ self: {
        ];
        description = "Bindings to the isoHunt torrent search API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "isotope" = callPackage
@@ -147072,8 +138035,6 @@ self: {
        ];
        description = "Isotopic masses and relative abundances";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ispositive" = callPackage
@@ -147134,8 +138095,6 @@ self: {
        ];
        description = "Issue Tracker for the CLI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "itemfield" = callPackage
@@ -147163,8 +138122,6 @@ self: {
        ];
        description = "A brick Widget for selectable summary of many elements on a terminal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iter-stats" = callPackage
@@ -147183,8 +138140,6 @@ self: {
        ];
        description = "iteratees for statistical processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iterIO" = callPackage
@@ -147203,8 +138158,6 @@ self: {
        librarySystemDepends = [ zlib ];
        description = "Iteratee-based IO with pipe operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "iterable" = callPackage
@@ -147248,8 +138201,6 @@ self: {
        ];
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iteratee-compress" = callPackage
@@ -147262,8 +138213,6 @@ self: {
        librarySystemDepends = [ bzip2 zlib ];
        description = "Enumeratees for compressing and decompressing streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;};
 
   "iteratee-mtl" = callPackage
@@ -147281,8 +138230,6 @@ self: {
        ];
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iteratee-parsec" = callPackage
@@ -147298,8 +138245,6 @@ self: {
        ];
        description = "Package allowing parsec parser initeratee";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iteratee-stm" = callPackage
@@ -147313,8 +138258,6 @@ self: {
        ];
        description = "Concurrent iteratees using STM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iterio-server" = callPackage
@@ -147331,8 +138274,6 @@ self: {
        ];
        description = "Library for building servers with IterIO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iterm-show" = callPackage
@@ -147360,8 +138301,6 @@ self: {
        libraryHaskellDepends = [ base iterm-show JuicyPixels ];
        description = "Orphan Show instances for JuciyPixels image types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iterm-show-diagrams" = callPackage
@@ -147377,8 +138316,6 @@ self: {
        ];
        description = "Orphan Show instances for diagrams package that render inline in some terminals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ival" = callPackage
@@ -147424,8 +138361,6 @@ self: {
        ];
        description = "Theorem proving library based on dependent type theory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory" = callPackage
@@ -147444,8 +138379,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-artifact" = callPackage
@@ -147481,8 +138414,6 @@ self: {
        ];
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-bitdata" = callPackage
@@ -147501,8 +138432,6 @@ self: {
        executableHaskellDepends = [ base ivory ivory-backend-c ];
        description = "Ivory bit-data support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-eval" = callPackage
@@ -147521,8 +138450,6 @@ self: {
        ];
        description = "Simple concrete evaluator for Ivory programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-examples" = callPackage
@@ -147545,8 +138472,6 @@ self: {
        ];
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-hw" = callPackage
@@ -147559,8 +138484,6 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-opts" = callPackage
@@ -147577,8 +138500,6 @@ self: {
        ];
        description = "Ivory compiler optimizations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-quickcheck" = callPackage
@@ -147600,8 +138521,6 @@ self: {
        ];
        description = "QuickCheck driver for Ivory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-serialize" = callPackage
@@ -147618,8 +138537,6 @@ self: {
        ];
        description = "Serialization library for Ivory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-stdlib" = callPackage
@@ -147632,8 +138549,6 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivy-web" = callPackage
@@ -147649,8 +138564,6 @@ self: {
        ];
        description = "A lightweight web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iwlib" = callPackage
@@ -147706,8 +138619,6 @@ self: {
        executableHaskellDepends = [ base preprocessor-tools syb ];
        description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ixmonad" = callPackage
@@ -147721,8 +138632,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ixset" = callPackage
@@ -147814,8 +138723,6 @@ self: {
        ];
        description = "A shallow embedding of the OpenGL Shading Language in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iyql" = callPackage
@@ -147835,8 +138742,6 @@ self: {
        ];
        description = "CLI (command line interface) to YQL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "j" = callPackage
@@ -147850,8 +138755,6 @@ self: {
        testHaskellDepends = [ base bytestring repa tasty tasty-hunit ];
        description = "J in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "j2hs" = callPackage
@@ -147872,8 +138775,6 @@ self: {
        ];
        description = "j2hs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ja-base-extra" = callPackage
@@ -147918,8 +138819,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libjack2;};
 
   "jackminimix" = callPackage
@@ -147931,8 +138830,6 @@ self: {
        libraryHaskellDepends = [ base hosc ];
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jacobi-roots" = callPackage
@@ -147945,8 +138842,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jaeger-flamegraph" = callPackage
@@ -147972,8 +138867,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Generate flamegraphs from Jaeger .json dumps.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jail" = callPackage
@@ -147989,8 +138882,6 @@ self: {
        ];
        description = "Jailed IO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jailbreak-cabal" = callPackage
@@ -148018,8 +138909,6 @@ self: {
        benchmarkHaskellDepends = [ base deepseq time ];
        description = "Convert Jalaali and Gregorian calendar systems to each other";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jalla" = callPackage
@@ -148042,8 +138931,6 @@ self: {
        ];
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas; cblas = null; lapacke = null;};
 
   "jammittools" = callPackage
@@ -148109,8 +138996,6 @@ self: {
        ];
        description = "Tool for searching java classes, members and fields in classfiles and JAR archives";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jarify" = callPackage
@@ -148132,8 +139017,6 @@ self: {
        doHaddock = false;
        description = "Jarification of Haskell sources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jason" = callPackage
@@ -148153,8 +139036,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring text ];
        description = "A fast JASONETTE-iOS JSON combinator library for haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "java-adt" = callPackage
@@ -148194,8 +139075,6 @@ self: {
        ];
        description = "Bindings to the JNI and a high level interface generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "java-bridge-extras" = callPackage
@@ -148207,8 +139086,6 @@ self: {
        libraryHaskellDepends = [ base java-bridge transformers ];
        description = "Utilities for working with the java-bridge package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "java-character" = callPackage
@@ -148220,8 +139097,6 @@ self: {
        libraryHaskellDepends = [ base diet ];
        description = "Functions to simulate Java's Character class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "java-poker" = callPackage
@@ -148247,8 +139122,6 @@ self: {
        libraryHaskellDepends = [ base containers hx java-bridge ];
        description = "Tools for reflecting on Java classes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "javaclass" = callPackage
@@ -148291,8 +139164,6 @@ self: {
        testHaskellDepends = [ aeson base scotty stm text time wai-extra ];
        description = "Remote Monad for JavaScript on the browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "javascript-extras" = callPackage
@@ -148333,8 +139204,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "javav" = callPackage
@@ -148351,8 +139220,6 @@ self: {
        ];
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jbi" = callPackage
@@ -148374,8 +139241,6 @@ self: {
        ];
        description = "Just Build It - a \"do what I mean\" abstraction for Haskell build tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jcdecaux-vls" = callPackage
@@ -148391,8 +139256,6 @@ self: {
        ];
        description = "JCDecaux self-service bicycles API client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jdi" = callPackage
@@ -148411,8 +139274,6 @@ self: {
        executableHaskellDepends = [ base mtl network ];
        description = "Implementation of Java Debug Interface";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jenga" = callPackage
@@ -148434,8 +139295,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Generate a cabal freeze file from a stack.yaml";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jenkinsPlugins2nix" = callPackage
@@ -148459,8 +139318,6 @@ self: {
        testHaskellDepends = [ base containers tasty-hspec text ];
        description = "Generate nix for Jenkins plugins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jespresso" = callPackage
@@ -148490,8 +139347,6 @@ self: {
        ];
        description = "Extract all JavaScript from an HTML page and consolidate it in one script";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jinquantities" = callPackage
@@ -148514,8 +139369,6 @@ self: {
        ];
        description = "Unit conversion and manipulation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jira-wiki-markup" = callPackage
@@ -148557,8 +139410,6 @@ self: {
        ];
        description = "QuasiQuotation library for programmatic generation of Javascript code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jmacro-rpc" = callPackage
@@ -148577,8 +139428,6 @@ self: {
        ];
        description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jmacro-rpc-happstack" = callPackage
@@ -148595,8 +139444,6 @@ self: {
        ];
        description = "Happstack backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jmacro-rpc-snap" = callPackage
@@ -148612,8 +139459,6 @@ self: {
        ];
        description = "Snap backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jml-web-service" = callPackage
@@ -148634,8 +139479,6 @@ self: {
        testHaskellDepends = [ base protolude tasty ];
        description = "Common utilities for running a web service";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jmonkey" = callPackage
@@ -148648,8 +139491,6 @@ self: {
        testHaskellDepends = [ base casing free jmacro ];
        description = "Jmonkey is very restricted but handy EDSL for JavaScript";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jni" = callPackage
@@ -148669,8 +139510,6 @@ self: {
        testHaskellDepends = [ base hspec singletons ];
        description = "Complete JNI raw bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) jdk;};
 
   "jobqueue" = callPackage
@@ -148696,8 +139535,6 @@ self: {
        ];
        description = "A job queue library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jobs-ui" = callPackage
@@ -148718,8 +139555,6 @@ self: {
        ];
        description = "A library for creating a jobs management website running custom jobs";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "join" = callPackage
@@ -148732,8 +139567,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 multisetrewrite stm ];
        description = "Parallel Join Patterns with Guards and Propagation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "join-api" = callPackage
@@ -148747,8 +139580,6 @@ self: {
        ];
        description = "Bindings for Join push notifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "joinlist" = callPackage
@@ -148760,8 +139591,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Join list - symmetric list type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "joint" = callPackage
@@ -148792,8 +139621,6 @@ self: {
        ];
        description = "An implementation of the Jonathan's Card API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jord" = callPackage
@@ -148898,8 +139725,6 @@ self: {
        ];
        description = "Tiny markdown notebook";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jpeg" = callPackage
@@ -148911,8 +139736,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A library for decoding JPEG files written in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jps" = callPackage
@@ -148974,8 +139797,6 @@ self: {
        libraryHaskellDepends = [ base wl-pprint ];
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "js-jquery" = callPackage
@@ -149055,8 +139876,6 @@ self: {
        executableHaskellDepends = [ base jsaddle lens text ];
        description = "JSaddle Hello World, an example package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsaddle-warp" = callPackage
@@ -149138,8 +139957,6 @@ self: {
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsc" = callPackage
@@ -149168,8 +139985,6 @@ self: {
        libraryHaskellDepends = [ base DOM mtl WebBits ];
        description = "Javascript Monadic Writer base package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json" = callPackage
@@ -149258,8 +140073,6 @@ self: {
        ];
        description = "Test that your (Aeson) JSON encoding matches your expectations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-ast" = callPackage
@@ -149292,8 +140105,6 @@ self: {
        ];
        description = "Encoders of JSON AST";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-ast-quickcheck" = callPackage
@@ -149308,8 +140119,6 @@ self: {
        ];
        description = "Compatibility layer for \"json-ast\" and \"QuickCheck\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-autotype" = callPackage
@@ -149366,8 +140175,6 @@ self: {
        ];
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-builder" = callPackage
@@ -149386,8 +140193,6 @@ self: {
        ];
        description = "Data structure agnostic JSON serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-bytes-builder" = callPackage
@@ -149403,8 +140208,6 @@ self: {
        benchmarkHaskellDepends = [ aeson criterion rebase ];
        description = "Direct-to-bytes JSON Builder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-directory" = callPackage
@@ -149425,8 +140228,6 @@ self: {
        ];
        description = "Load JSON from files in a directory structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-encoder" = callPackage
@@ -149444,8 +140245,6 @@ self: {
        ];
        description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-enumerator" = callPackage
@@ -149463,8 +140262,6 @@ self: {
        ];
        description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-extra" = callPackage
@@ -149481,8 +140278,6 @@ self: {
        ];
        description = "Utility functions to extend Aeson";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-feed" = callPackage
@@ -149520,8 +140315,6 @@ self: {
        ];
        description = "Generic JSON serialization / deserialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-incremental-decoder" = callPackage
@@ -149546,8 +140339,6 @@ self: {
        ];
        description = "Incremental JSON parser with early termination and a declarative DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-litobj" = callPackage
@@ -149560,8 +140351,6 @@ self: {
        testHaskellDepends = [ base hspec json QuickCheck ];
        description = "Extends Text.JSON to handle literal JS objects.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-pointer" = callPackage
@@ -149606,8 +140395,6 @@ self: {
        ];
        description = "JSON Pointer extensions for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-pointy" = callPackage
@@ -149648,8 +140435,6 @@ self: {
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) python;};
 
   "json-qq" = callPackage
@@ -149725,8 +140510,6 @@ self: {
        ];
        description = "JSON-RPC 2.0 on the client side.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-rpc-generic" = callPackage
@@ -149796,8 +140579,6 @@ self: {
        ];
        description = "Types and type classes for defining JSON schemas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-sop" = callPackage
@@ -149814,8 +140595,6 @@ self: {
        ];
        description = "Generics JSON (de)serialization using generics-sop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-state" = callPackage
@@ -149879,8 +140658,6 @@ self: {
        ];
        description = "High-performance JSON parser and encoder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-to-haskell" = callPackage
@@ -149929,8 +140706,6 @@ self: {
        ];
        description = "Effectful parsing of JSON documents";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-tokens" = callPackage
@@ -149958,8 +140733,6 @@ self: {
        ];
        description = "Tokenize JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-tools" = callPackage
@@ -150002,8 +140775,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A polymorphic, type-safe, json-structured tracing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-types" = callPackage
@@ -150031,8 +140802,6 @@ self: {
        ];
        description = "Library provides support for JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json2-hdbc" = callPackage
@@ -150048,8 +140817,6 @@ self: {
        ];
        description = "Support JSON for SQL Database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json2-types" = callPackage
@@ -150089,8 +140856,6 @@ self: {
        ];
        description = "Serialising to and from JSON5";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsonextfilter" = callPackage
@@ -150111,8 +140876,6 @@ self: {
        ];
        description = "Filter select values in JSON objects to unix programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsonifier" = callPackage
@@ -150133,8 +140896,6 @@ self: {
        ];
        description = "Fast and simple JSON encoding toolkit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsonpath" = callPackage
@@ -150171,8 +140932,6 @@ self: {
        ];
        description = "Parser and datatypes for the JSON Resume format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsonrpc-conduit" = callPackage
@@ -150193,8 +140952,6 @@ self: {
        ];
        description = "JSON-RPC 2.0 server over a Conduit.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsons-to-schema" = callPackage
@@ -150226,8 +140983,6 @@ self: {
        ];
        description = "JSON to JSON Schema";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsonschema-gen" = callPackage
@@ -150269,8 +141024,6 @@ self: {
        ];
        description = "Interpolate JSON object values into SQL strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsontsv" = callPackage
@@ -150291,8 +141044,6 @@ self: {
        ];
        description = "JSON to TSV transformer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsonxlsx" = callPackage
@@ -150313,8 +141064,6 @@ self: {
        ];
        description = "json to xlsx converter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsop" = callPackage
@@ -150339,8 +141088,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Cherry picking in JSON objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jspath" = callPackage
@@ -150356,8 +141103,6 @@ self: {
        ];
        description = "Extract substructures from JSON by following a path";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "juandelacosa" = callPackage
@@ -150382,8 +141127,6 @@ self: {
        ];
        description = "Manage users in MariaDB >= 10.1.1";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "judge" = callPackage
@@ -150410,8 +141153,6 @@ self: {
        ];
        description = "Tableau-based theorem prover for justification logic";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "judy" = callPackage
@@ -150427,8 +141168,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {Judy = null;};
 
   "juicy-draw" = callPackage
@@ -150463,8 +141202,6 @@ self: {
        ];
        description = "SVG to G-Code converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jukebox" = callPackage
@@ -150552,8 +141289,6 @@ self: {
        ];
        description = "A library for creating and using Jupyter kernels";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "justified-containers" = callPackage
@@ -150591,8 +141326,6 @@ self: {
        ];
        description = "Call JVM methods from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jvm-batching" = callPackage
@@ -150617,8 +141350,6 @@ self: {
        ];
        description = "Provides batched marshalling of values between Java and Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jvm-binary" = callPackage
@@ -150651,8 +141382,6 @@ self: {
        ];
        description = "A library for reading Java class-files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jvm-parser" = callPackage
@@ -150669,8 +141398,6 @@ self: {
        ];
        description = "A parser for JVM bytecode files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jvm-streaming" = callPackage
@@ -150693,8 +141420,6 @@ self: {
        ];
        description = "Expose Java iterators as streams from the streaming package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jwt" = callPackage
@@ -150744,8 +141469,6 @@ self: {
        ];
        description = "An implementation of the Kademlia DHT Protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kafka" = callPackage
@@ -150776,8 +141499,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kafka-client-sync" = callPackage
@@ -150792,8 +141513,6 @@ self: {
        testHaskellDepends = [ base hw-kafka-client monad-parallel text ];
        description = "Synchronous Kafka Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kafka-device" = callPackage
@@ -150814,8 +141533,6 @@ self: {
        ];
        description = "UI device events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kafka-device-glut" = callPackage
@@ -150830,8 +141547,6 @@ self: {
        executableHaskellDepends = [ base GLUT kafka-device OpenGL ];
        description = "GLUT events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kafka-device-joystick" = callPackage
@@ -150852,8 +141567,6 @@ self: {
        ];
        description = "Linux joystick events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kafka-device-leap" = callPackage
@@ -150872,8 +141585,6 @@ self: {
        ];
        description = "Leap Motion events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kafka-device-spacenav" = callPackage
@@ -150894,8 +141605,6 @@ self: {
        ];
        description = "Linux SpaceNavigator events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kafka-device-vrpn" = callPackage
@@ -150910,8 +141619,6 @@ self: {
        executableHaskellDepends = [ base kafka-device vrpn ];
        description = "VRPN events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kaleidoscope" = callPackage
@@ -150934,8 +141641,6 @@ self: {
        doHaddock = false;
        description = "Haskell Kaleidoscope tutorial";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kalman" = callPackage
@@ -150955,8 +141660,6 @@ self: {
        ];
        description = "Kalman and particle filters and smoothers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kan-extensions" = callPackage
@@ -150986,8 +141689,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Binary parsing with random access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kanji" = callPackage
@@ -151055,8 +141756,6 @@ self: {
        ];
        description = "Kansas Lava is a hardware simulator and VHDL generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kansas-lava-cores" = callPackage
@@ -151076,8 +141775,6 @@ self: {
        ];
        description = "FPGA Cores Written in Kansas Lava";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kansas-lava-papilio" = callPackage
@@ -151096,8 +141793,6 @@ self: {
        ];
        description = "Kansas Lava support files for the Papilio FPGA board";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kansas-lava-shake" = callPackage
@@ -151114,8 +141809,6 @@ self: {
        ];
        description = "Shake rules for building Kansas Lava projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "karakuri" = callPackage
@@ -151131,8 +141824,6 @@ self: {
        ];
        description = "Good stateful automata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "karps" = callPackage
@@ -151160,8 +141851,6 @@ self: {
        ];
        description = "Haskell bindings for Spark Dataframes and Datasets";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "karver" = callPackage
@@ -151237,8 +141926,6 @@ self: {
        ];
        description = "Datadog scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katip-elasticsearch" = callPackage
@@ -151270,8 +141957,6 @@ self: {
        ];
        description = "ElasticSearch scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katip-kafka" = callPackage
@@ -151285,8 +141970,6 @@ self: {
        ];
        description = "Katip scribe to send logs to Kafka";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katip-logzio" = callPackage
@@ -151329,8 +142012,6 @@ self: {
        ];
        description = "Katip scribe that logs to Rollbar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katip-scalyr-scribe" = callPackage
@@ -151349,8 +142030,6 @@ self: {
        ];
        description = "A katip scribe for logging to json";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katip-syslog" = callPackage
@@ -151367,8 +142046,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Syslog Katip Scribe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katt" = callPackage
@@ -151390,8 +142067,6 @@ self: {
        testHaskellDepends = [ base bytestring directory mtl ];
        description = "Client for the Kattis judge system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katydid" = callPackage
@@ -151425,8 +142100,6 @@ self: {
        ];
        description = "A haskell implementation of Katydid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kawa" = callPackage
@@ -151473,8 +142146,6 @@ self: {
        ];
        description = "Utilities for serving static sites and blogs with Wai/Warp";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kawhi" = callPackage
@@ -151497,8 +142168,6 @@ self: {
        ];
        description = "stats.NBA.com library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kazura-queue" = callPackage
@@ -151521,8 +142190,6 @@ self: {
        ];
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kbq-gu" = callPackage
@@ -151570,8 +142237,6 @@ self: {
        ];
        description = "A simple k-d tree implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kdesrc-build-extra" = callPackage
@@ -151590,8 +142255,6 @@ self: {
        ];
        description = "Build profiles for kdesrc-build";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kdesrc-build-profiles" = callPackage
@@ -151654,8 +142317,6 @@ self: {
        ];
        description = "cryptographic functions based on the sponge construction";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keenser" = callPackage
@@ -151722,8 +142383,6 @@ self: {
        ];
        description = "Rapid Gtk Application Development - I18N";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-mvc-controller" = callPackage
@@ -151751,8 +142410,6 @@ self: {
        ];
        description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-mvc-model-lightmodel" = callPackage
@@ -151769,8 +142426,6 @@ self: {
        ];
        description = "Rapid Gtk Application Development - Reactive Protected Light Models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-mvc-model-protectedmodel" = callPackage
@@ -151787,8 +142442,6 @@ self: {
        ];
        description = "Rapid Gtk Application Development - Protected Reactive Models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-mvc-solutions-config" = callPackage
@@ -151821,8 +142474,6 @@ self: {
        ];
        description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-mvc-view" = callPackage
@@ -151865,8 +142516,6 @@ self: {
        ];
        description = "Reactive Haskell on Rails - CBMVars as reactive values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactive-fs" = callPackage
@@ -151882,8 +142531,6 @@ self: {
        ];
        description = "Haskell on Rails - Files as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactive-gtk" = callPackage
@@ -151900,8 +142547,6 @@ self: {
        ];
        description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactive-htmldom" = callPackage
@@ -151919,8 +142564,6 @@ self: {
        ];
        description = "Keera Hails Reactive bindings for HTML DOM via GHCJS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactive-network" = callPackage
@@ -151936,8 +142579,6 @@ self: {
        ];
        description = "Haskell on Rails - Sockets as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactive-polling" = callPackage
@@ -151952,8 +142593,6 @@ self: {
        ];
        description = "Haskell on Rails - Polling based Readable RVs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactive-wx" = callPackage
@@ -151967,8 +142606,6 @@ self: {
        ];
        description = "Haskell on Rails - Reactive Fields for WX widgets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactive-yampa" = callPackage
@@ -151984,8 +142621,6 @@ self: {
        ];
        description = "Haskell on Rails - FRP Yampa Signal Functions as RVs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactivelenses" = callPackage
@@ -151997,8 +142632,6 @@ self: {
        libraryHaskellDepends = [ base keera-hails-reactivevalues lens ];
        description = "Reactive Haskell on Rails - Lenses applied to Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactivevalues" = callPackage
@@ -152018,8 +142651,6 @@ self: {
        testToolDepends = [ cabal-install ];
        description = "Haskell on Rails - Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-posture" = callPackage
@@ -152099,8 +142730,6 @@ self: {
        ];
        description = "Manage and abstract your packer configurations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keter" = callPackage
@@ -152134,8 +142763,6 @@ self: {
        ];
        description = "Web application deployment manager, focusing on Haskell web frameworks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kevin" = callPackage
@@ -152156,8 +142783,6 @@ self: {
        ];
        description = "a dAmn ↔ IRC proxy";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "key" = callPackage
@@ -152244,8 +142869,6 @@ self: {
        libraryHaskellDepends = [ base containers vector ];
        description = "Generic indexing for many data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keyring" = callPackage
@@ -152259,8 +142882,6 @@ self: {
        libraryHaskellDepends = [ base udbus ];
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keys" = callPackage
@@ -152308,8 +142929,6 @@ self: {
        ];
        description = "back up a secret key securely to the cloud";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keystore" = callPackage
@@ -152341,8 +142960,6 @@ self: {
        ];
        description = "Managing stores of secret things";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keyvaluehash" = callPackage
@@ -152359,8 +142976,6 @@ self: {
        ];
        description = "Pure Haskell key/value store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keyword-args" = callPackage
@@ -152382,8 +142997,6 @@ self: {
        ];
        description = "Extract data from a keyword-args config file format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "khph" = callPackage
@@ -152403,8 +143016,6 @@ self: {
        ];
        description = "Command-line file tagging and organization tool";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ki" = callPackage
@@ -152451,8 +143062,6 @@ self: {
        ];
        description = "Parser and writer for KiCad files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kickass-torrents-dump-parser" = callPackage
@@ -152470,8 +143079,6 @@ self: {
        ];
        description = "Parses kat.ph torrent dumps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kickchan" = callPackage
@@ -152490,8 +143097,6 @@ self: {
        ];
        description = "Kick Channels: bounded channels with non-blocking writes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kif-parser" = callPackage
@@ -152510,8 +143115,6 @@ self: {
        ];
        description = "Process KIF iOS test logs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kind-apply" = callPackage
@@ -152581,8 +143184,6 @@ self: {
        ];
        description = "A dependency manager for Xcode (Objective-C) projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kleene" = callPackage
@@ -152653,8 +143254,6 @@ self: {
        ];
        description = "Sequential and parallel implementations of Lloyd's algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kmeans-vector" = callPackage
@@ -152671,8 +143270,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion QuickCheck vector ];
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kmonad" = callPackage
@@ -152692,8 +143289,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Advanced keyboard remapping utility";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kmp-dfa" = callPackage
@@ -152706,8 +143301,6 @@ self: {
        testHaskellDepends = [ array base QuickCheck ];
        description = "KMP algorithm implementation, based on Deterministic Finite State Automata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "knead" = callPackage
@@ -152729,8 +143322,6 @@ self: {
        ];
        description = "Repa-like array processing using LLVM JIT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "knead-arithmetic" = callPackage
@@ -152744,8 +143335,6 @@ self: {
        ];
        description = "Linear algebra and interpolation using LLVM JIT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "knit" = callPackage
@@ -152797,8 +143386,6 @@ self: {
        ];
        description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "knob" = callPackage
@@ -152828,8 +143415,6 @@ self: {
        executableHaskellDepends = [ base containers parallel ];
        description = "Khovanov homology computations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "koellner-phonetic" = callPackage
@@ -152843,8 +143428,6 @@ self: {
        doHaddock = false;
        description = "\"map German words to code representing pronunciation\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kontra-config" = callPackage
@@ -152861,8 +143444,6 @@ self: {
        ];
        description = "JSON config file parsing based on unjson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kontrakcja-templates" = callPackage
@@ -152932,8 +143513,6 @@ self: {
        ];
        description = "The Korfu ORF Utility";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kqueue" = callPackage
@@ -152949,8 +143528,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A binding to the kqueue event library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kraken" = callPackage
@@ -152968,8 +143545,6 @@ self: {
        ];
        description = "Kraken.io API client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "krank" = callPackage
@@ -153000,8 +143575,6 @@ self: {
        ];
        description = "Krank checks your code source comments for important markers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "krapsh" = callPackage
@@ -153027,8 +143600,6 @@ self: {
        ];
        description = "Haskell bindings for Spark Dataframes and Datasets";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "krpc" = callPackage
@@ -153054,8 +143625,6 @@ self: {
        ];
        description = "KRPC protocol implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ks-test" = callPackage
@@ -153067,8 +143636,6 @@ self: {
        libraryHaskellDepends = [ base gamma random-fu roots vector ];
        description = "Kolmogorov distribution and Kolmogorov-Smirnov test";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ksystools" = callPackage
@@ -153092,8 +143659,6 @@ self: {
        libraryPkgconfigDepends = [ egl glew ];
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {egl = null; inherit (pkgs) glew;};
 
   "ktx-codec" = callPackage
@@ -153113,8 +143678,6 @@ self: {
        ];
        description = "Khronos texture format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kubernetes-client" = callPackage
@@ -153150,8 +143713,6 @@ self: {
        ];
        description = "Client library for Kubernetes";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kubernetes-client-core" = callPackage
@@ -153179,8 +143740,6 @@ self: {
        ];
        description = "Auto-generated kubernetes-client-core API Client";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kubernetes-webhook-haskell" = callPackage
@@ -153208,8 +143767,6 @@ self: {
        libraryHaskellDepends = [ base boxes containers lens ];
        description = "A Quantitative Information Flow aware programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kure" = callPackage
@@ -153223,8 +143780,6 @@ self: {
        libraryHaskellDepends = [ base dlist transformers ];
        description = "Combinators for Strategic Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kure-your-boilerplate" = callPackage
@@ -153236,8 +143791,6 @@ self: {
        libraryHaskellDepends = [ base kure template-haskell ];
        description = "Generator for Boilerplate KURE Combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kurita" = callPackage
@@ -153270,8 +143823,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Find the alpha emoji";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kyotocabinet" = callPackage
@@ -153296,8 +143847,6 @@ self: {
        librarySystemDepends = [ lbfgsb ];
        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;
-       broken = true;
      }) {lbfgsb = null;};
 
   "l10n" = callPackage
@@ -153320,8 +143869,6 @@ self: {
        libraryHaskellDepends = [ base labeled-tree ];
        description = "Labeled graph structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "labeled-tree" = callPackage
@@ -153367,8 +143914,6 @@ self: {
        ];
        description = "an experiment management framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "labsat" = callPackage
@@ -153392,8 +143937,6 @@ self: {
        ];
        description = "LabSat TCP Interface Wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "labyrinth" = callPackage
@@ -153415,8 +143958,6 @@ self: {
        ];
        description = "A complicated turn-based game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "labyrinth-server" = callPackage
@@ -153450,8 +143991,6 @@ self: {
        ];
        description = "A complicated turn-based game - Web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lackey" = callPackage
@@ -153495,8 +144034,6 @@ self: {
        ];
        description = "Solve Lagrange multiplier problems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "laika" = callPackage
@@ -153516,8 +144053,6 @@ self: {
        ];
        description = "Minimalistic type-checked compile-time template engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-ast" = callPackage
@@ -153543,8 +144078,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-calculator" = callPackage
@@ -153564,8 +144097,6 @@ self: {
        testHaskellDepends = [ base containers hlint hspec HUnit ];
        description = "A lambda calculus interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-calculus-interpreter" = callPackage
@@ -153592,8 +144123,6 @@ self: {
        libraryHaskellDepends = [ base GLUT mtl OpenGL time ];
        description = "Educational drawing canvas for FP explorers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-devs" = callPackage
@@ -153620,8 +144149,6 @@ self: {
        ];
        description = "a Paralell-DEVS implementaion based on distributed-process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-options" = callPackage
@@ -153636,8 +144163,6 @@ self: {
        ];
        description = "Declarative command-line parser with type-driven pattern matching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-placeholders" = callPackage
@@ -153678,8 +144203,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "An application to work with the lambda calculus (for learning)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda2js" = callPackage
@@ -153693,8 +144216,6 @@ self: {
        executableHaskellDepends = [ base parsec ];
        description = "Untyped Lambda calculus to JavaScript compiler";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdaBase" = callPackage
@@ -153706,8 +144227,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdaFeed" = callPackage
@@ -153721,8 +144240,6 @@ self: {
        executableHaskellDepends = [ base haskell98 html ];
        description = "RSS 2.0 feed generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdaLit" = callPackage
@@ -153740,8 +144257,6 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot" = callPackage
@@ -153764,8 +144279,6 @@ self: {
        ];
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -153791,8 +144304,6 @@ self: {
        ];
        description = "Lambdabot core functionality";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-haskell-plugins" = callPackage
@@ -153818,8 +144329,6 @@ self: {
        ];
        description = "Lambdabot Haskell plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -153837,8 +144346,6 @@ self: {
        ];
        description = "IRC plugins for lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-misc-plugins" = callPackage
@@ -153860,8 +144367,6 @@ self: {
        ];
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-novelty-plugins" = callPackage
@@ -153879,8 +144384,6 @@ self: {
        ];
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-reference-plugins" = callPackage
@@ -153898,8 +144401,6 @@ self: {
        ];
        description = "Lambdabot reference plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-social-plugins" = callPackage
@@ -153915,8 +144416,6 @@ self: {
        ];
        description = "Social plugins for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-trusted" = callPackage
@@ -153928,8 +144427,6 @@ self: {
        libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ];
        description = "Lambdabot trusted code";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-utils" = callPackage
@@ -153950,8 +144447,6 @@ self: {
        ];
        description = "Utility libraries for the advanced IRC bot, Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-xmpp" = callPackage
@@ -153998,8 +144493,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit text ];
        description = "Lambdabot for Zulip Chat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacat" = callPackage
@@ -154043,8 +144536,6 @@ self: {
        ];
        description = "LambdaCms 'core' subsite for Yesod apps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacms-media" = callPackage
@@ -154061,8 +144552,6 @@ self: {
        ];
        description = "LambdaCms \"media\" extension";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube" = callPackage
@@ -154076,8 +144565,6 @@ self: {
        executableHaskellDepends = [ base editline mtl pretty ];
        description = "A simple lambda cube type checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-bullet" = callPackage
@@ -154091,8 +144578,6 @@ self: {
        ];
        description = "Example for combining LambdaCube and Bullet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-compiler" = callPackage
@@ -154117,8 +144602,6 @@ self: {
        ];
        description = "LambdaCube 3D is a DSL to program GPUs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-core" = callPackage
@@ -154134,8 +144617,6 @@ self: {
        ];
        description = "LambdaCube 3D IR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-edsl" = callPackage
@@ -154152,8 +144633,6 @@ self: {
        ];
        description = "LambdaCube 3D EDSL definition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-engine" = callPackage
@@ -154173,8 +144652,6 @@ self: {
        ];
        description = "3D rendering engine written entirely in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-examples" = callPackage
@@ -154191,8 +144668,6 @@ self: {
        ];
        description = "Examples for LambdaCube";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-gl" = callPackage
@@ -154211,8 +144686,6 @@ self: {
        ];
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-ir" = callPackage
@@ -154224,8 +144697,6 @@ self: {
        libraryHaskellDepends = [ aeson base containers mtl text vector ];
        description = "LambdaCube 3D intermediate representation of 3D graphics pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-samples" = callPackage
@@ -154247,8 +144718,6 @@ self: {
        ];
        description = "Samples for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdatex" = callPackage
@@ -154269,8 +144738,6 @@ self: {
        ];
        description = "Type-Safe LaTeX EDSL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdatwit" = callPackage
@@ -154296,8 +144763,6 @@ self: {
        ];
        description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdaya-bus" = callPackage
@@ -154311,8 +144776,6 @@ self: {
        ];
        description = "Fpga bus core and serialization for RedPitaya";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdiff" = callPackage
@@ -154330,8 +144793,6 @@ self: {
        ];
        description = "Diff Viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lame" = callPackage
@@ -154355,8 +144816,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Fairly complete high-level binding to LAME encoder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mp3lame = null;};
 
   "lame-tester" = callPackage
@@ -154373,8 +144832,6 @@ self: {
        testHaskellDepends = [ bizzlelude containers tasty tasty-hunit ];
        description = "A strange and unnecessary selective test-running library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lang" = callPackage
@@ -154386,8 +144843,6 @@ self: {
        libraryHaskellDepends = [ base bytestring http-streams Mapping ];
        description = "A Lisp";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-Modula2" = callPackage
@@ -154420,8 +144875,6 @@ self: {
        ];
        description = "Parser, pretty-printer, and more for the Modula-2 programming language";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-asn" = callPackage
@@ -154519,8 +144972,6 @@ self: {
        ];
        description = "Parsing and pretty-printing Bash shell scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-boogie" = callPackage
@@ -154543,8 +144994,6 @@ self: {
        ];
        description = "Interpreter and language infrastructure for Boogie";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-c" = callPackage
@@ -154595,8 +145044,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Extracting comments from C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-c-inline" = callPackage
@@ -154613,8 +145060,6 @@ self: {
        ];
        description = "Inline C & Objective-C code in Haskell for language interoperability";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-c-quote" = callPackage
@@ -154708,8 +145153,6 @@ self: {
        ];
        description = "Conf parsers and pretty-printers for the Haskell programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-csharp" = callPackage
@@ -154724,8 +145167,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "C# source code manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-css" = callPackage
@@ -154737,8 +145178,6 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "CSS 2.1 syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-dart" = callPackage
@@ -154751,8 +145190,6 @@ self: {
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "Manipulating Dart source: abstract syntax and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-dickinson" = callPackage
@@ -154792,8 +145229,6 @@ self: {
        doHaddock = false;
        description = "A language for generative literature";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-docker" = callPackage
@@ -154843,8 +145278,6 @@ self: {
        ];
        description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-dot" = callPackage
@@ -154900,8 +145333,6 @@ self: {
        ];
        description = "JavaScript static analysis library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-eiffel" = callPackage
@@ -154920,8 +145351,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Parser and pretty printer for the Eiffel language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-elm" = callPackage
@@ -154939,8 +145368,6 @@ self: {
        testToolDepends = [ doctest ];
        description = "Generate elm code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-fortran" = callPackage
@@ -154965,8 +145392,6 @@ self: {
        libraryHaskellDepends = [ base bifunctors parsers ];
        description = "Something similar to Dijkstra's guarded command language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-gemini" = callPackage
@@ -155012,8 +145437,6 @@ self: {
        libraryHaskellDepends = [ array base parsec utf8-string ];
        description = "A library for analysis and synthesis of Go code";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-guess" = callPackage
@@ -155026,8 +145449,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal containers ];
        description = "Guess at which language a text is written in using trigrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-haskell-extract" = callPackage
@@ -155065,8 +145486,6 @@ self: {
        ];
        description = "HCL parsers and pretty-printers for the Haskell programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-java" = callPackage
@@ -155103,8 +145522,6 @@ self: {
        ];
        description = "Parser for Java .class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-javascript" = callPackage
@@ -155161,8 +145578,6 @@ self: {
        ];
        description = "Parser and serializer for the Kort information language";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-lua" = callPackage
@@ -155187,8 +145602,6 @@ self: {
        ];
        description = "Lua parser and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-lua-qq" = callPackage
@@ -155205,8 +145618,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-lua2" = callPackage
@@ -155232,8 +145643,6 @@ self: {
        ];
        description = "Lua parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-mixal" = callPackage
@@ -155248,8 +145657,6 @@ self: {
        executableHaskellDepends = [ base pretty ];
        description = "Parser, pretty-printer, and AST types for the MIXAL assembly language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-ninja" = callPackage
@@ -155288,8 +145695,6 @@ self: {
        ];
        description = "A library for dealing with the Ninja build language";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-nix" = callPackage
@@ -155337,8 +145742,6 @@ self: {
        ];
        description = "Parser, pretty-printer, and more for the Oberon programming language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-objc" = callPackage
@@ -155356,8 +145759,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Analysis and generation of Objective C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-ocaml" = callPackage
@@ -155383,8 +145784,6 @@ self: {
        ];
        description = "Language tools for manipulating OCaml programs in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "language-openscad" = callPackage
@@ -155401,8 +145800,6 @@ self: {
        executableHaskellDepends = [ attoparsec base bytestring ];
        description = "A simple parser for OpenSCAD";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-pig" = callPackage
@@ -155423,8 +145820,6 @@ self: {
        ];
        description = "Pig parser in haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-protobuf" = callPackage
@@ -155494,8 +145889,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-python-colour" = callPackage
@@ -155511,8 +145904,6 @@ self: {
        ];
        description = "Generate coloured XHTML for Python code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-python-test" = callPackage
@@ -155526,8 +145917,6 @@ self: {
        executableHaskellDepends = [ base language-python ];
        description = "testing code for the language-python library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-qux" = callPackage
@@ -155544,8 +145933,6 @@ self: {
        ];
        description = "Utilities for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-rust" = callPackage
@@ -155575,8 +145962,6 @@ self: {
        ];
        description = "Parsing and pretty printing of Rust code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-sally" = callPackage
@@ -155605,8 +145990,6 @@ self: {
        ];
        description = "A package for parsing shell scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-slice" = callPackage
@@ -155645,8 +146028,6 @@ self: {
        ];
        description = "Various tools to detect/correct mistakes in words";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-sqlite" = callPackage
@@ -155662,8 +146043,6 @@ self: {
        ];
        description = "Full parser and generator for SQL as implemented by SQLite3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-sygus" = callPackage
@@ -155678,8 +146057,6 @@ self: {
        testHaskellDepends = [ base deepseq tasty tasty-hunit text ];
        description = "A parser and printer for the SyGuS 2.0 language.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-thrift" = callPackage
@@ -155702,8 +146079,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Parser and pretty printer for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-tl" = callPackage
@@ -155737,8 +146112,6 @@ self: {
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "A library for working with TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-vhdl" = callPackage
@@ -155750,8 +146123,6 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "VHDL AST and pretty printer in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-webidl" = callPackage
@@ -155764,8 +146135,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Parser and Pretty Printer for WebIDL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "laop" = callPackage
@@ -155808,8 +146177,6 @@ self: {
        ];
        description = "Numerical Linear Algebra using LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lapack-carray" = callPackage
@@ -155826,8 +146193,6 @@ self: {
        ];
        description = "Auto-generated interface to Fortran LAPACK via CArrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lapack-comfort-array" = callPackage
@@ -155844,8 +146209,6 @@ self: {
        ];
        description = "Auto-generated interface to Fortran LAPACK via comfort-array";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lapack-ffi" = callPackage
@@ -155858,8 +146221,6 @@ self: {
        libraryPkgconfigDepends = [ liblapack ];
        description = "Auto-generated interface to Fortran LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {liblapack = null;};
 
   "lapack-ffi-tools" = callPackage
@@ -155912,8 +146273,6 @@ self: {
        ];
        description = "Efficiently hash (large) Haskell values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "largeword" = callPackage
@@ -155950,8 +146309,6 @@ self: {
        ];
        description = "Tool to track security alerts on LWN";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "latest-npm-version" = callPackage
@@ -155982,8 +146339,6 @@ self: {
        ];
        description = "Find the latest version of a package on npm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "latex" = callPackage
@@ -156013,8 +146368,6 @@ self: {
        ];
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "latex-formulae-image" = callPackage
@@ -156054,8 +146407,6 @@ self: {
        ];
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "latex-function-tables" = callPackage
@@ -156108,8 +146459,6 @@ self: {
        ];
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "latex-svg-image" = callPackage
@@ -156146,8 +146495,6 @@ self: {
        executableHaskellDepends = [ base latex-svg-image pandoc-types ];
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lattices" = callPackage
@@ -156206,8 +146553,6 @@ self: {
        ];
        description = "Server-side SDK for integrating with LaunchDarkly";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "launchpad-control" = callPackage
@@ -156225,8 +146570,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "High and low-level interface to the Novation Launchpad midi controller";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lawful" = callPackage
@@ -156259,8 +146602,6 @@ self: {
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lawz" = callPackage
@@ -156305,8 +146646,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "layers" = callPackage
@@ -156318,8 +146657,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Modular type class machinery for monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "layers-game" = callPackage
@@ -156339,8 +146676,6 @@ self: {
        ];
        description = "A prototypical 2d platform game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "layout" = callPackage
@@ -156352,8 +146687,6 @@ self: {
        libraryHaskellDepends = [ base convertible hinduce-missingh ];
        description = "Turn values into pretty text or markup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "layout-bootstrap" = callPackage
@@ -156365,8 +146698,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html containers text ];
        description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "layout-rules" = callPackage
@@ -156393,8 +146724,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "lazy" = callPackage
@@ -156438,8 +146767,6 @@ self: {
        ];
        description = "Identifiers for not-yet-computed values";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazy-hash-cache" = callPackage
@@ -156460,8 +146787,6 @@ self: {
        ];
        description = "Storing computed values for re-use when the same program runs again";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazy-io" = callPackage
@@ -156486,8 +146811,6 @@ self: {
        libraryHaskellDepends = [ base bytestring io-streams ];
        description = "Get lazy with your io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazy-priority-queue" = callPackage
@@ -156504,8 +146827,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Lazy-Spined Monadic Priority Queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazy-search" = callPackage
@@ -156528,8 +146849,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazyboy" = callPackage
@@ -156549,8 +146868,6 @@ self: {
        ];
        description = "An EDSL for programming the Game Boy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazyio" = callPackage
@@ -156581,8 +146898,6 @@ self: {
        ];
        description = "Set and Map from lazy/infinite lists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazysmallcheck" = callPackage
@@ -156653,8 +146968,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data structures for representing arbitrary intervals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lda" = callPackage
@@ -156670,8 +146983,6 @@ self: {
        ];
        description = "Online Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ldap-client" = callPackage
@@ -156690,8 +147001,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec process semigroups ];
        description = "Pure Haskell LDAP Client Library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ldapply" = callPackage
@@ -156710,8 +147019,6 @@ self: {
        ];
        description = "LDIF idempotent apply tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ldif" = callPackage
@@ -156734,8 +147041,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "The LDAP Data Interchange Format (LDIF) tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leaf" = callPackage
@@ -156754,8 +147059,6 @@ self: {
        ];
        description = "A simple portfolio generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leaky" = callPackage
@@ -156774,8 +147077,6 @@ self: {
        ];
        description = "Robust space leak, and its strictification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lean" = callPackage
@@ -156791,8 +147092,6 @@ self: {
        ];
        description = "Bonds to Lean theorem prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lean-peano" = callPackage
@@ -156893,8 +147192,6 @@ self: {
        ];
        description = "Use the Leanpub API via Wreq";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leapseconds" = callPackage
@@ -156908,8 +147205,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base tasty tasty-hunit time ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leapseconds-announced" = callPackage
@@ -156933,8 +147228,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Learning Algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "learn-physics" = callPackage
@@ -156972,8 +147265,6 @@ self: {
        ];
        description = "examples for learn-physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "learning-hmm" = callPackage
@@ -156989,8 +147280,6 @@ self: {
        ];
        description = "Yet another library for hidden Markov models";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leb128" = callPackage
@@ -157040,8 +147329,6 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "Leetify text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "left4deadrl" = callPackage
@@ -157076,8 +147363,6 @@ self: {
        ];
        description = "Distributed, stateful, homogeneous microservice framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "legion-discovery" = callPackage
@@ -157103,8 +147388,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A discovery service based on Legion";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "legion-discovery-client" = callPackage
@@ -157124,8 +147407,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Client library for communicating with legion-discovery";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "legion-extra" = callPackage
@@ -157147,8 +147428,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Extra non-essential utilities for building legion applications";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leksah" = callPackage
@@ -157224,8 +147503,6 @@ self: {
        ];
        description = "Metadata collection for leksah";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lendingclub" = callPackage
@@ -157242,8 +147519,6 @@ self: {
        ];
        description = "Bindings for the LendingClub marketplace API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens" = callPackage
@@ -157296,8 +147571,6 @@ self: {
        libraryHaskellDepends = [ accelerate base lens ];
        description = "Instances to mix lens with Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-action" = callPackage
@@ -157351,8 +147624,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A placeholder for a future lens core package";
        license = "(BSD-2-Clause OR Apache-2.0)";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-csv" = callPackage
@@ -157471,8 +147742,6 @@ self: {
        ];
        description = "Lens interface for your filesystem; still a bit experimental";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-labels_0_1_0_2" = callPackage
@@ -157485,7 +147754,6 @@ self: {
        description = "Integration of lenses with OverloadedLabels";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-labels" = callPackage
@@ -157497,8 +147765,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
        description = "Integration of lenses with OverloadedLabels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-misc" = callPackage
@@ -157538,8 +147804,6 @@ self: {
        ];
        description = "Alternate prelude that exports lens combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-process" = callPackage
@@ -157631,8 +147895,6 @@ self: {
        ];
        description = "simplified import of elementary lens-family combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-sop" = callPackage
@@ -157657,8 +147919,6 @@ self: {
        libraryHaskellDepends = [ base bytestring lens text ];
        description = "Isomorphisms and prisms for text <=> bytestring conversions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-th-rewrite" = callPackage
@@ -157684,8 +147944,6 @@ self: {
        libraryHaskellDepends = [ base lens time ];
        description = "lens for Data.Time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-toml-parser" = callPackage
@@ -157702,8 +147960,6 @@ self: {
        ];
        description = "Lenses for toml-parser";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-tutorial" = callPackage
@@ -157716,8 +147972,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tutorial for the lens library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-typelevel" = callPackage
@@ -157729,8 +147983,6 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Type-level lenses using singletons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-utils" = callPackage
@@ -157747,8 +147999,6 @@ self: {
        ];
        description = "Collection of missing lens utilities";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-xml" = callPackage
@@ -157786,8 +148036,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "References which can be joined and on which lenses can be applied";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lentil" = callPackage
@@ -157814,8 +148062,6 @@ self: {
        ];
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lenz" = callPackage
@@ -157908,8 +148154,6 @@ self: {
        libraryHaskellDepends = [ base fmlist ];
        description = "Non-Determinism Monad for Level-Wise Search";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leveldb-haskell" = callPackage
@@ -157968,8 +148212,6 @@ self: {
        libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
        description = "An implementation of the Levenberg-Marquardt algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "levmar-chart" = callPackage
@@ -157983,8 +148225,6 @@ self: {
        libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lex-applicative" = callPackage
@@ -158004,8 +148244,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge util ];
        description = "See README for more info";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lexer-applicative" = callPackage
@@ -158034,8 +148272,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "L-Fuzzy Set Theory implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lgtk" = callPackage
@@ -158063,8 +148299,6 @@ self: {
        ];
        description = "Lens GUI Toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lha" = callPackage
@@ -158076,8 +148310,6 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "Data structures for the Les Houches Accord";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lhae" = callPackage
@@ -158097,8 +148329,6 @@ self: {
        ];
        description = "Simple spreadsheet program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lhc" = callPackage
@@ -158112,8 +148342,6 @@ self: {
        enableSeparateDataOutput = true;
        description = "LHC Haskell Compiler";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lhe" = callPackage
@@ -158125,8 +148353,6 @@ self: {
        libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ];
        description = "Parser and writer for Les-Houches event files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lhs2TeX-hl" = callPackage
@@ -158145,8 +148371,6 @@ self: {
        ];
        description = "Literate highlighter preprocessor for lhs2tex";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lhs2html" = callPackage
@@ -158196,8 +148420,6 @@ self: {
        ];
        description = "Tool for using pdflatex with .lhs files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libBF" = callPackage
@@ -158229,8 +148451,6 @@ self: {
        ];
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libarchive" = callPackage
@@ -158261,8 +148481,6 @@ self: {
        ];
        description = "Haskell interface to libarchive";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libarchive;};
 
   "libarchive-conduit" = callPackage
@@ -158299,8 +148517,6 @@ self: {
        testHaskellDepends = [ base doctest doctest-prop lens ];
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libconfig;};
 
   "libcspm" = callPackage
@@ -158321,8 +148537,6 @@ self: {
        ];
        description = "A library providing a parser, type checker and evaluator for CSPM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libexpect" = callPackage
@@ -158335,8 +148549,6 @@ self: {
        librarySystemDepends = [ expect tcl ];
        description = "Library for interacting with console applications via pseudoterminals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) expect; inherit (pkgs) tcl;};
 
   "libffi" = callPackage
@@ -158384,8 +148596,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion unix ];
        description = "A Haskell binding for libfuse-3.x";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fuse3;};
 
   "libgit" = callPackage
@@ -158437,8 +148647,6 @@ self: {
        ];
        description = "Backend for text editors to provide better Haskell editing support";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libinfluxdb" = callPackage
@@ -158457,8 +148665,6 @@ self: {
        ];
        description = "libinfluxdb";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libjenkins" = callPackage
@@ -158487,8 +148693,6 @@ self: {
        ];
        description = "Jenkins API interface";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libjwt-typed" = callPackage
@@ -158519,8 +148723,6 @@ self: {
        ];
        description = "A Haskell implementation of JSON Web Token (JWT)";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "liblastfm" = callPackage
@@ -158547,8 +148749,6 @@ self: {
        ];
        description = "Lastfm API interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "liblawless" = callPackage
@@ -158584,8 +148784,6 @@ self: {
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "liblinear-enumerator" = callPackage
@@ -158599,8 +148797,6 @@ self: {
        ];
        description = "liblinear iteratee";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libltdl" = callPackage
@@ -158614,8 +148810,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "FFI interface to libltdl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libmodbus" = callPackage
@@ -158628,8 +148822,6 @@ self: {
        librarySystemDepends = [ modbus ];
        description = "Haskell bindings to the C modbus library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {modbus = null;};
 
   "libmolude" = callPackage
@@ -158662,8 +148854,6 @@ self: {
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libmpd" = callPackage
@@ -158756,8 +148946,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bindings to liboath";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {liboath = null; oath = null;};
 
   "liboleg" = callPackage
@@ -158773,8 +148961,6 @@ self: {
        ];
        description = "An evolving collection of Oleg Kiselyov's Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libpafe" = callPackage
@@ -158788,8 +148974,6 @@ self: {
        testHaskellDepends = [ base bytestring iconv transformers ];
        description = "Wrapper for libpafe";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {pafe = null;};
 
   "libpq" = callPackage
@@ -158802,8 +148986,6 @@ self: {
        librarySystemDepends = [ postgresql ];
        description = "libpq binding for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "libraft" = callPackage
@@ -158855,8 +149037,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Raft consensus algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "librandomorg" = callPackage
@@ -158868,8 +149048,6 @@ self: {
        libraryHaskellDepends = [ base bytestring curl ];
        description = "Wrapper to Random.org API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "librato" = callPackage
@@ -158890,8 +149068,6 @@ self: {
        ];
        description = "Bindings to the Librato API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libravatar" = callPackage
@@ -158988,8 +149164,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libssh2;};
 
   "libssh2-conduit" = callPackage
@@ -159007,8 +149181,6 @@ self: {
        ];
        description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libstackexchange" = callPackage
@@ -159046,8 +149218,6 @@ self: {
        ];
        description = "Haskell bindings for libsystemd-daemon";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libsystemd-daemon = null; systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
@@ -159067,8 +149237,6 @@ self: {
        libraryPkgconfigDepends = [ systemd ];
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
@@ -159083,8 +149251,6 @@ self: {
        libraryPkgconfigDepends = [ taglib ];
        description = "Binding to TagLib C library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) taglib;};
 
   "libtelnet" = callPackage
@@ -159134,8 +149300,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Bindings to libxls";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libxml" = callPackage
@@ -159166,8 +149330,6 @@ self: {
        ];
        description = "Enumerator-based API for libXML's SAX interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libxml-sax" = callPackage
@@ -159193,8 +149355,6 @@ self: {
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {xslt = null;};
 
   "libyaml" = callPackage
@@ -159244,8 +149404,6 @@ self: {
        ];
        description = "A license compatibility helper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lie" = callPackage
@@ -159260,8 +149418,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Lie Algebras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "life" = callPackage
@@ -159302,8 +149458,6 @@ self: {
        ];
        description = "Synchronize personal configs across multiple machines";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lift-generics" = callPackage
@@ -159402,8 +149556,6 @@ self: {
        ];
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lifted-protolude" = callPackage
@@ -159421,8 +149573,6 @@ self: {
        ];
        description = "A sensible set of defaults for writing lifted custom Preludes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lifted-stm" = callPackage
@@ -159439,8 +149589,6 @@ self: {
        ];
        description = "STM operations lifted through monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lifted-threads" = callPackage
@@ -159474,8 +149622,6 @@ self: {
        ];
        description = "A boulderdash-like game and solution validator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ligature" = callPackage
@@ -159487,8 +149633,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Expand ligatures in unicode text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ligd" = callPackage
@@ -159535,8 +149679,6 @@ self: {
        ];
        description = "Haskell client for lightning-viz REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lightstep-haskell" = callPackage
@@ -159568,8 +149710,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "LightStep OpenTracing client library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lighttpd-conf" = callPackage
@@ -159586,8 +149726,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Lighttpd configuration file tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lighttpd-conf-qq" = callPackage
@@ -159604,8 +149742,6 @@ self: {
        ];
        description = "A QuasiQuoter for lighttpd configuration files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lilypond" = callPackage
@@ -159622,8 +149758,6 @@ self: {
        ];
        description = "Bindings to Lilypond";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "limp" = callPackage
@@ -159657,8 +149791,6 @@ self: {
        ];
        description = "bindings for integer linear programming solver Coin/CBC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lin-alg" = callPackage
@@ -159681,8 +149813,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix HUnit ];
        description = "LINear Discriminant Analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linden" = callPackage
@@ -159712,8 +149842,6 @@ self: {
        ];
        description = "Zen gardening, based on l-systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lindenmayer" = callPackage
@@ -159782,8 +149910,6 @@ self: {
        ];
        description = "Haskell SDK for LINE Messaging API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "line-break" = callPackage
@@ -159881,8 +150007,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Lifting linear vector spaces into Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-algebra-cblas" = callPackage
@@ -159903,8 +150027,6 @@ self: {
        ];
        description = "A linear algebra library with bindings to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-circuit" = callPackage
@@ -159926,8 +150048,6 @@ self: {
        ];
        description = "Compute resistance of linear electrical circuits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-code" = callPackage
@@ -159953,8 +150073,6 @@ self: {
        ];
        description = "A simple library for linear codes (coding theory, error correction)";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-grammar" = callPackage
@@ -159981,8 +150099,6 @@ self: {
        libraryHaskellDepends = [ base containers HUnit ];
        description = "Finite maps for linear use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-opengl" = callPackage
@@ -159998,8 +150114,6 @@ self: {
        ];
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-socket" = callPackage
@@ -160038,8 +150152,6 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, operating on the Num typeclass";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linearEqSolver" = callPackage
@@ -160051,8 +150163,6 @@ self: {
        libraryHaskellDepends = [ base sbv ];
        description = "Use SMT solvers to solve linear systems over integers and rationals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linearmap-category" = callPackage
@@ -160072,8 +150182,6 @@ self: {
        ];
        description = "Native, complete, matrix-free linear algebra";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linearscan" = callPackage
@@ -160087,8 +150195,6 @@ self: {
        ];
        description = "Linear scan register allocator, formally verified in Coq";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linearscan-hoopl" = callPackage
@@ -160109,8 +150215,6 @@ self: {
        ];
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linebreak" = callPackage
@@ -160153,8 +150257,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Lines of Action, 2-player strategy board game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lingo" = callPackage
@@ -160220,8 +150322,6 @@ self: {
        ];
        description = "linkchk is a network interface link ping monitor";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linkcore" = callPackage
@@ -160238,8 +150338,6 @@ self: {
        ];
        description = "Combines multiple GHC Core modules into a single module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linked-list-with-iterator" = callPackage
@@ -160252,8 +150350,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A pure linked list which is mutable through iterators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linkedhashmap" = callPackage
@@ -160276,8 +150372,6 @@ self: {
        ];
        description = "Persistent LinkedHashMap data structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linklater" = callPackage
@@ -160384,8 +150478,6 @@ self: {
        ];
        description = "Bindings to the Linode API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linode-v4" = callPackage
@@ -160402,8 +150494,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Haskell wrapper for the Linode v4 API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linux-blkid" = callPackage
@@ -160420,8 +150510,6 @@ self: {
        libraryPkgconfigDepends = [ blkid ];
        description = "Linux libblkid";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {blkid = null;};
 
   "linux-cgroup" = callPackage
@@ -160433,8 +150521,6 @@ self: {
        libraryHaskellDepends = [ base filepath ];
        description = "Very basic interface to the Linux CGroup Virtual Filesystem";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linux-evdev" = callPackage
@@ -160484,8 +150570,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hashable unix ];
        description = "Thinner binding to the Linux Kernel's inotify interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linux-kmod" = callPackage
@@ -160498,8 +150582,6 @@ self: {
        libraryPkgconfigDepends = [ libkmod ];
        description = "Linux kernel modules support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libkmod = null;};
 
   "linux-mount" = callPackage
@@ -160544,8 +150626,6 @@ self: {
        ];
        description = "Read files generated by perf on Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linux-ptrace" = callPackage
@@ -160563,8 +150643,6 @@ self: {
        ];
        description = "Wrapping of Linux' ptrace(2)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linux-xattr" = callPackage
@@ -160596,8 +150674,6 @@ self: {
        ];
        description = "Implementation of the Enea LINX gateway protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lio" = callPackage
@@ -160609,8 +150685,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers hashable ];
        description = "Labeled IO Information Flow Control Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lio-eci11" = callPackage
@@ -160627,8 +150701,6 @@ self: {
        ];
        description = "Labeled IO library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lio-fs" = callPackage
@@ -160645,8 +150717,6 @@ self: {
        description = "Labeled File System interface for LIO";
        license = "GPL";
        platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lio-simple" = callPackage
@@ -160671,8 +150741,6 @@ self: {
        ];
        description = "LIO support for the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lipsum-gen" = callPackage
@@ -160684,8 +150752,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generators for random sequences of English-like nonsense text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "liquid" = callPackage
@@ -160915,8 +150981,6 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "Liquid Haskell integration for Cabal and Stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "liquidhaskell-cabal-demo" = callPackage
@@ -160991,8 +151055,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "testing list fusion for success";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-grouping" = callPackage
@@ -161015,8 +151077,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "List Multiplexing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-predicate" = callPackage
@@ -161049,8 +151109,6 @@ self: {
        ];
        description = "A simple list prompt UI for the terminal";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-remote-forwards" = callPackage
@@ -161077,8 +151135,6 @@ self: {
        ];
        description = "List all remote forwards for mail accounts stored in a SQL database";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-singleton" = callPackage
@@ -161124,8 +151180,6 @@ self: {
        ];
        description = "An \"attoparsec\" adapter for \"list-t\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-t-html-parser" = callPackage
@@ -161149,8 +151203,6 @@ self: {
        ];
        description = "Streaming HTML parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-t-http-client" = callPackage
@@ -161166,8 +151218,6 @@ self: {
        ];
        description = "A streaming HTTP client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-t-libcurl" = callPackage
@@ -161184,8 +151234,6 @@ self: {
        ];
        description = "A \"libcurl\"-based streaming HTTP client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-t-text" = callPackage
@@ -161205,8 +151253,6 @@ self: {
        ];
        description = "A streaming text codec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-transformer" = callPackage
@@ -161237,8 +151283,6 @@ self: {
        ];
        description = "Tries and Patricia tries: finite sets and maps for list keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-tuple" = callPackage
@@ -161258,8 +151302,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "List-like operations for tuples";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-witnesses" = callPackage
@@ -161287,8 +151329,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Provides zips with default values";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-zipper" = callPackage
@@ -161311,8 +151351,6 @@ self: {
        ];
        description = "A list zipper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "listenbrainz-client" = callPackage
@@ -161330,8 +151368,6 @@ self: {
        ];
        description = "A client library to the ListenBrainz project";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "listlike-instances" = callPackage
@@ -161343,8 +151379,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ListLike text vector ];
        description = "Extra instances of the ListLike class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lists" = callPackage
@@ -161413,8 +151447,6 @@ self: {
        ];
        description = "Append only key-list database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lit" = callPackage
@@ -161434,8 +151466,6 @@ self: {
        ];
        description = "A simple tool for literate programming";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "literals" = callPackage
@@ -161447,8 +151477,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Non-overloaded functions for concrete literals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "little-logger" = callPackage
@@ -161468,8 +151496,6 @@ self: {
        ];
        description = "Basic logging based on co-log";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "little-rio" = callPackage
@@ -161513,8 +151539,6 @@ self: {
        ];
        description = "Live coding of MIDI music";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "liveplot" = callPackage
@@ -161550,8 +151574,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ picosat ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) picosat;};
 
   "llrbtree" = callPackage
@@ -161583,8 +151605,6 @@ self: {
        ];
        description = "An implementation of the LLSD data system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm" = callPackage
@@ -161601,8 +151621,6 @@ self: {
        ];
        description = "Bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-analysis" = callPackage
@@ -161630,8 +151648,6 @@ self: {
        ];
        description = "A Haskell library for analyzing LLVM bitcode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-base" = callPackage
@@ -161643,8 +151659,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-base-types" = callPackage
@@ -161665,8 +151679,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "The base types for a mostly pure Haskell LLVM analysis library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-base-util" = callPackage
@@ -161678,8 +151690,6 @@ self: {
        libraryHaskellDepends = [ base llvm-base ];
        description = "Utilities for bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-data-interop" = callPackage
@@ -161700,8 +151710,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A low-level data interoperability binding for LLVM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-dsl" = callPackage
@@ -161719,8 +151727,6 @@ self: {
        ];
        description = "Support for writing an EDSL with LLVM-JIT as target";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-extension" = callPackage
@@ -161739,8 +151745,6 @@ self: {
        ];
        description = "Processor specific intrinsics for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-extra" = callPackage
@@ -161766,8 +151770,6 @@ self: {
        doHaddock = false;
        description = "Utility functions for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-ffi" = callPackage
@@ -161782,8 +151784,6 @@ self: {
        librarySystemDepends = [ LLVM ];
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {LLVM = null;};
 
   "llvm-ffi-tools" = callPackage
@@ -161801,8 +151801,6 @@ self: {
        ];
        description = "Tools for maintaining the llvm-ffi package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-general" = callPackage
@@ -161829,8 +151827,6 @@ self: {
        ];
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {llvm-config = null;};
 
   "llvm-general-pure" = callPackage
@@ -161851,8 +151847,6 @@ self: {
        ];
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-general-quote" = callPackage
@@ -161876,8 +151870,6 @@ self: {
        ];
        description = "QuasiQuoting llvm code for llvm-general";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-hs" = callPackage
@@ -161959,8 +151951,6 @@ self: {
        ];
        description = "Bindings to the LLVM compiler toolkit with some custom extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-pkg-config" = callPackage
@@ -161979,8 +151969,6 @@ self: {
        ];
        description = "Generate Pkg-Config configuration file for LLVM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-pretty" = callPackage
@@ -161997,8 +151985,6 @@ self: {
        ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-pretty-bc-parser" = callPackage
@@ -162025,8 +152011,6 @@ self: {
        ];
        description = "LLVM bitcode parsing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-tf" = callPackage
@@ -162048,8 +152032,6 @@ self: {
        doHaddock = false;
        description = "Bindings to the LLVM compiler toolkit using type families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-tools" = callPackage
@@ -162077,8 +152059,6 @@ self: {
        ];
        description = "Useful tools built on llvm-analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lmdb" = callPackage
@@ -162148,8 +152128,6 @@ self: {
        ];
        description = "LMonad is an Information Flow Control (IFC) framework for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lmonad-yesod" = callPackage
@@ -162170,8 +152148,6 @@ self: {
        ];
        description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "load-balancing" = callPackage
@@ -162183,8 +152159,6 @@ self: {
        libraryHaskellDepends = [ base containers hslogger PSQueue stm ];
        description = "Client-side load balancing utilities";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "load-env" = callPackage
@@ -162217,8 +152191,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A cross platform library for loading bundled fonts into your application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loadavg" = callPackage
@@ -162264,8 +152236,6 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "Functions to get local interface address";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "local-search" = callPackage
@@ -162282,8 +152252,6 @@ self: {
        ];
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "localization" = callPackage
@@ -162313,8 +152281,6 @@ self: {
        ];
        description = "GNU Gettext-based messages localization library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "located" = callPackage
@@ -162326,8 +152292,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Source location helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "located-base" = callPackage
@@ -162352,8 +152316,6 @@ self: {
        libraryHaskellDepends = [ base monad-logger text ];
        description = "Location-aware logging without Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "locators" = callPackage
@@ -162386,8 +152348,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Support for precise error locations in source files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loch-th" = callPackage
@@ -162440,8 +152400,6 @@ self: {
        ];
        description = "Very simple poll lock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lockfree-queue" = callPackage
@@ -162499,8 +152457,6 @@ self: {
        ];
        description = "Structured logging solution with multiple backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "log-base" = callPackage
@@ -162601,8 +152557,6 @@ self: {
        ];
        description = "Structured logging solution (Elasticsearch back end)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "log-postgres" = callPackage
@@ -162624,8 +152578,6 @@ self: {
        ];
        description = "Structured logging solution (PostgreSQL back end)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "log-utils" = callPackage
@@ -162648,8 +152600,6 @@ self: {
        ];
        description = "Utils for working with logs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "log-warper" = callPackage
@@ -162698,8 +152648,6 @@ self: {
        executableHaskellDepends = [ base containers json parsec ];
        description = "Turn log file records into JSON";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "log4hs" = callPackage
@@ -162730,8 +152678,6 @@ self: {
        ];
        description = "A python logging style log library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logentries" = callPackage
@@ -162751,8 +152697,6 @@ self: {
        ];
        description = "Request logger middleware for Logentries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logfloat" = callPackage
@@ -162781,8 +152725,6 @@ self: {
        ];
        description = "Fast & extensible logging framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logger-thread" = callPackage
@@ -162842,8 +152784,6 @@ self: {
        ];
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logging-effect-extra" = callPackage
@@ -162863,8 +152803,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Supplemental packages for `logging-effect`";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logging-effect-extra-file" = callPackage
@@ -162883,8 +152821,6 @@ self: {
        executableHaskellDepends = [ base logging-effect prettyprinter ];
        description = "TH splices to augment log messages with file info";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logging-effect-extra-handler" = callPackage
@@ -162903,8 +152839,6 @@ self: {
        executableHaskellDepends = [ base logging-effect prettyprinter ];
        description = "Handy logging handler combinators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logging-facade" = callPackage
@@ -162936,8 +152870,6 @@ self: {
        ];
        description = "Journald back-end for logging-facade";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logging-facade-syslog" = callPackage
@@ -162995,8 +152927,6 @@ self: {
        ];
        description = "Framework for propositional and first order logic, theorem proving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logicst" = callPackage
@@ -163008,8 +152938,6 @@ self: {
        libraryHaskellDepends = [ base logict transformers ];
        description = "Backtracking mutable references in the ST and IO monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logict" = callPackage
@@ -163033,8 +152961,6 @@ self: {
        libraryHaskellDepends = [ base logict mtl transformers ];
        description = "Library for logic programming based on haskell package logict";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loglevel" = callPackage
@@ -163059,8 +152985,6 @@ self: {
        testHaskellDepends = [ base hspec time ];
        description = "Parse Heroku application/logplex documents";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logsink" = callPackage
@@ -163095,8 +153019,6 @@ self: {
        executableHaskellDepends = [ haskell98 ];
        description = "Useful utilities for the Lojban language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lojbanParser" = callPackage
@@ -163111,8 +153033,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "lojban parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lojbanXiragan" = callPackage
@@ -163127,8 +153047,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "lojban to xiragan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lojysamban" = callPackage
@@ -163142,8 +153060,6 @@ self: {
        executableHaskellDepends = [ base lojbanParser yjtools ];
        description = "Prolog with lojban";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol" = callPackage
@@ -163172,8 +153088,6 @@ self: {
        testHaskellDepends = [ base test-framework ];
        description = "A library for lattice cryptography";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol-apps" = callPackage
@@ -163194,8 +153108,6 @@ self: {
        ];
        description = "Lattice-based cryptographic applications using <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol-benches" = callPackage
@@ -163212,8 +153124,6 @@ self: {
        ];
        description = "A library for benchmarking <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol-calculus" = callPackage
@@ -163235,8 +153145,6 @@ self: {
        ];
        description = "Calculus for LOL (λω language)";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol-cpp" = callPackage
@@ -163256,8 +153164,6 @@ self: {
        benchmarkHaskellDepends = [ base DRBG lol lol-apps MonadRandom ];
        description = "A fast C++ backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol-repa" = callPackage
@@ -163277,8 +153183,6 @@ self: {
        benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
        description = "A repa backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol-tests" = callPackage
@@ -163298,8 +153202,6 @@ self: {
        testHaskellDepends = [ base lol test-framework ];
        description = "A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol-typing" = callPackage
@@ -163324,8 +153226,6 @@ self: {
        ];
        description = "Type inferencer for LOL (λω language)";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loli" = callPackage
@@ -163343,8 +153243,6 @@ self: {
        ];
        description = "A minimum web dev DSL in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "long-double" = callPackage
@@ -163367,8 +153265,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dependently-typed linked list implementation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "longshot" = callPackage
@@ -163400,8 +153296,6 @@ self: {
        ];
        description = "Fast Brute-force search using parallelism";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lookup-tables" = callPackage
@@ -163416,8 +153310,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Statically generate lookup tables using Template Haskell";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loop" = callPackage
@@ -163445,8 +153337,6 @@ self: {
        libraryHaskellDepends = [ base effin ];
        description = "control-monad-loop port for effin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loop-while" = callPackage
@@ -163458,8 +153348,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformer supporting various styles of while loop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loopbreaker" = callPackage
@@ -163494,8 +153382,6 @@ self: {
          aeson base hspec optparse-applicative text time unliftio
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loops" = callPackage
@@ -163513,8 +153399,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Fast imperative-style loops";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loopy" = callPackage
@@ -163533,8 +153417,6 @@ self: {
        ];
        description = "Find all biological feedback loops within an ecosystem graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lord" = callPackage
@@ -163575,8 +153457,6 @@ self: {
        ];
        description = "A command line interface to online radios";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lorem" = callPackage
@@ -163591,8 +153471,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for generating filler text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lorentz" = callPackage
@@ -163615,8 +153493,6 @@ self: {
        ];
        description = "EDSL for the Michelson Language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loris" = callPackage
@@ -163630,8 +153506,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "interface to Loris API";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {loris = null;};
 
   "loshadka" = callPackage
@@ -163650,8 +153524,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "lostcities" = callPackage
@@ -163669,8 +153541,6 @@ self: {
        ];
        description = "An implementation of an adictive two-player card game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "louis" = callPackage
@@ -163704,8 +153574,6 @@ self: {
        executableHaskellDepends = [ base optparse-generic shakers ];
        description = "Amazon Simple Workflow Service Wrapper for Work Pools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lowgl" = callPackage
@@ -163717,8 +153585,6 @@ self: {
        libraryHaskellDepends = [ base gl linear vector ];
        description = "Basic gl wrapper and reference";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lowlin" = callPackage
@@ -163749,8 +153615,6 @@ self: {
        ];
        description = "An EDSL for diagrams based based on linear constraints";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lp-diagrams-svg" = callPackage
@@ -163770,8 +153634,6 @@ self: {
        ];
        description = "SVG Backend for lp-diagrams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lrucache" = callPackage
@@ -163814,8 +153676,6 @@ self: {
        libraryHaskellDepends = [ base hashable haxl lrucaching psqueues ];
        description = "Combine lrucaching and haxl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ls-usb" = callPackage
@@ -163834,8 +153694,6 @@ self: {
        ];
        description = "List USB devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lscabal" = callPackage
@@ -163853,8 +153711,6 @@ self: {
        ];
        description = "List exported modules from a set of .cabal files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lsp" = callPackage
@@ -163887,8 +153743,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell library for the Microsoft Language Server Protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lsp-test" = callPackage
@@ -164002,8 +153856,6 @@ self: {
        ];
        description = "Paint an L-System Grammar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ltext" = callPackage
@@ -164035,8 +153887,6 @@ self: {
        ];
        description = "Parameterized file evaluator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lti13" = callPackage
@@ -164053,8 +153903,6 @@ self: {
        ];
        description = "Core functionality for LTI 1.3.";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ltiv1p1" = callPackage
@@ -164094,8 +153942,6 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Leksah tool kit";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "ltl" = callPackage
@@ -164125,8 +153971,6 @@ self: {
        ];
        description = "Lua bytecode parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lua-bytecode" = callPackage
@@ -164159,8 +154003,6 @@ self: {
        ];
        description = "Library functions for reading and writing Lua chunks";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "luautils" = callPackage
@@ -164182,8 +154024,6 @@ self: {
        ];
        description = "Helpers for Haskell integration with Lua";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lub" = callPackage
@@ -164242,8 +154082,6 @@ self: {
        libraryHaskellDepends = [ base colonnade lucid text ];
        description = "Helper functions for using lucid with colonnade";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lucid-extras" = callPackage
@@ -164310,8 +154148,6 @@ self: {
        ];
        description = "Server side feed aggregator/reader";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "luhn" = callPackage
@@ -164323,8 +154159,6 @@ self: {
        libraryHaskellDepends = [ base digits QuickCheck ];
        description = "An implementation of Luhn's check digit algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lui" = callPackage
@@ -164340,8 +154174,6 @@ self: {
        ];
        description = "Purely FunctionaL User Interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "luis-client" = callPackage
@@ -164356,8 +154188,6 @@ self: {
        ];
        description = "An unofficial client for the LUIS NLP service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "luka" = callPackage
@@ -164371,8 +154201,6 @@ self: {
        librarySystemDepends = [ objc ];
        description = "Simple ObjectiveC runtime binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {objc = null;};
 
   "lukko" = callPackage
@@ -164427,8 +154255,6 @@ self: {
        ];
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "luminance-samples" = callPackage
@@ -164447,8 +154273,6 @@ self: {
        ];
        description = "Luminance samples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lushtags" = callPackage
@@ -164462,8 +154286,6 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts text vector ];
        description = "Create ctags compatible tags files for Haskell programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "luthor" = callPackage
@@ -164476,8 +154298,6 @@ self: {
        testHaskellDepends = [ base mtl parsec ];
        description = "Tools for lexing and utilizing lexemes that integrate with Parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lvish" = callPackage
@@ -164505,8 +154325,6 @@ self: {
        ];
        description = "Parallel scheduler, LVar data structures, and infrastructure to build more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lvmlib" = callPackage
@@ -164529,8 +154347,6 @@ self: {
        ];
        description = "The Lazy Virtual Machine (LVM)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lvmrun" = callPackage
@@ -164554,8 +154370,6 @@ self: {
        libraryHaskellDepends = [ base bindings-lxc mtl transformers ];
        description = "High level Haskell bindings to LXC (Linux containers)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lxd-client" = callPackage
@@ -164585,8 +154399,6 @@ self: {
        ];
        description = "LXD client written in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lxd-client-config" = callPackage
@@ -164624,8 +154436,6 @@ self: {
        ];
        description = "A Lilypond-compiling music box";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lz4" = callPackage
@@ -164659,8 +154469,6 @@ self: {
        ];
        description = "Bindings to LZ4";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lz4-conduit" = callPackage
@@ -164684,8 +154492,6 @@ self: {
        ];
        description = "LZ4 compression for conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lz4-frame-conduit" = callPackage
@@ -164714,8 +154520,6 @@ self: {
        ];
        description = "Conduit implementing the official LZ4 frame streaming format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lz4-hs" = callPackage
@@ -164837,8 +154641,6 @@ self: {
        ];
        description = "Enumerator interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) lzma;};
 
   "lzma-streams" = callPackage
@@ -164859,8 +154661,6 @@ self: {
        ];
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lzo" = callPackage
@@ -164876,8 +154676,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "minilzo bundled for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mDNSResponder-client" = callPackage
@@ -164894,8 +154692,6 @@ self: {
        testHaskellDepends = [ base bytestring Cabal ];
        description = "Library for talking to the mDNSResponder daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maam" = callPackage
@@ -164912,8 +154708,6 @@ self: {
        ];
        description = "Monadic Abstracting Abstract Machines (MAAM) built on Galois Transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mac" = callPackage
@@ -164925,8 +154719,6 @@ self: {
        libraryHaskellDepends = [ base network transformers ];
        description = "Static Mandatory Access Control in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "macaroon-shop" = callPackage
@@ -164947,8 +154739,6 @@ self: {
        ];
        description = "A toolkit for working with macaroons";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "macbeth-lib" = callPackage
@@ -164974,8 +154764,6 @@ self: {
        testHaskellDepends = [ attoparsec base bytestring hspec ];
        description = "Macbeth - A beautiful and minimalistic FICS client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maccatcher" = callPackage
@@ -165019,8 +154807,6 @@ self: {
        ];
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "machines" = callPackage
@@ -165066,8 +154852,6 @@ self: {
        ];
        description = "Machine transducers for Amazonka calls";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "machines-attoparsec" = callPackage
@@ -165099,8 +154883,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring machines ];
        description = "Binary utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "machines-bytestring" = callPackage
@@ -165112,8 +154894,6 @@ self: {
        libraryHaskellDepends = [ base bytestring machines ];
        description = "ByteString support for machines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "machines-directory" = callPackage
@@ -165129,8 +154909,6 @@ self: {
        ];
        description = "Directory (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "machines-encoding" = callPackage
@@ -165142,8 +154920,6 @@ self: {
        libraryHaskellDepends = [ base bytestring machines text ];
        description = "Transcode encodings with machines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "machines-io" = callPackage
@@ -165159,8 +154935,6 @@ self: {
        ];
        description = "IO utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "machines-process" = callPackage
@@ -165175,8 +154949,6 @@ self: {
        ];
        description = "Process (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "machines-zlib" = callPackage
@@ -165191,8 +154963,6 @@ self: {
        ];
        description = "Decompression support for machines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "macho" = callPackage
@@ -165205,8 +154975,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for Mach-O object format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mackerel-client" = callPackage
@@ -165254,8 +155022,6 @@ self: {
        ];
        description = "Control screen and keyboard backlights on MACs under Linux";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "macos-corelibs" = callPackage
@@ -165271,8 +155037,6 @@ self: {
        ];
        description = "Haskell bindings to C-based Mac OS SDK frameworks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "macosx-make-standalone" = callPackage
@@ -165292,8 +155056,6 @@ self: {
        ];
        description = "Make a macosx app standalone deployable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "macrm" = callPackage
@@ -165318,8 +155080,6 @@ self: {
        ];
        description = "Alternative rm command for macOS that remove files/dirs to the system trash";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mad-props" = callPackage
@@ -165372,8 +155132,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion megaparsec text ];
        description = "Randomized templating language DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mage" = callPackage
@@ -165389,8 +155147,6 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Rogue-like";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "magic" = callPackage
@@ -165414,8 +155170,6 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-tcplugins-extra syb ];
        description = "Write plugins for magic type families with ease";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "magic-wormhole" = callPackage
@@ -165446,8 +155200,6 @@ self: {
        ];
        description = "Interact with Magic Wormhole";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "magicbane" = callPackage
@@ -165478,8 +155230,6 @@ self: {
        ];
        description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "magico" = callPackage
@@ -165497,8 +155247,6 @@ self: {
        ];
        description = "Compute solutions for Magico puzzle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "magma" = callPackage
@@ -165512,8 +155260,6 @@ self: {
        testHaskellDepends = [ base ghc-prim ];
        description = "magma is an algebraic structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "magmas" = callPackage
@@ -165545,8 +155291,6 @@ self: {
        ];
        description = "ImageBoards to XMPP gate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maid" = callPackage
@@ -165568,8 +155312,6 @@ self: {
        ];
        description = "A simple static web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mail-pool" = callPackage
@@ -165592,8 +155334,6 @@ self: {
        ];
        description = "Preconfigured email connection pool on top of smtp";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mailbox-count" = callPackage
@@ -165636,8 +155376,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Bindings for the MailChimp API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mailchimp-subscribe" = callPackage
@@ -165656,8 +155394,6 @@ self: {
        ];
        description = "MailChimp subscription request handler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mailgun" = callPackage
@@ -165677,8 +155413,6 @@ self: {
        ];
        description = "API binding for Mailgun";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "main-tester" = callPackage
@@ -165728,8 +155462,6 @@ self: {
        ];
        description = "Majordomo protocol for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "majority" = callPackage
@@ -165741,8 +155473,6 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "Boyer-Moore Majority Vote Algorithm";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "make-hard-links" = callPackage
@@ -165760,8 +155490,6 @@ self: {
        ];
        description = "Change duplicated files into hard-links";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "make-monofoldable-foldable" = callPackage
@@ -165773,8 +155501,6 @@ self: {
        libraryHaskellDepends = [ base mono-traversable ];
        description = "Make a MonoFoldable type into an ordinary Foldable type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "make-package" = callPackage
@@ -165795,8 +155521,6 @@ self: {
        ];
        description = "Make a cabalized package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "makedo" = callPackage
@@ -165808,8 +155532,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath HSH process ];
        description = "Helper for writing redo scripts in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "makefile" = callPackage
@@ -165827,8 +155549,6 @@ self: {
        ];
        description = "Simple Makefile parser and generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mallard" = callPackage
@@ -165856,8 +155576,6 @@ self: {
        ];
        description = "Database migration and testing as a library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mameya" = callPackage
@@ -165904,8 +155622,6 @@ self: {
        ];
        description = "The Haskell/Gtk+ Integrated Live Environment";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-all" = callPackage
@@ -165952,8 +155668,6 @@ self: {
        ];
        description = "Multithread interactive input/search framework for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-browser" = callPackage
@@ -165997,8 +155711,6 @@ self: {
        ];
        description = "The core of Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-curl" = callPackage
@@ -166021,8 +155733,6 @@ self: {
        ];
        description = "Download Manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-editor" = callPackage
@@ -166043,8 +155753,6 @@ self: {
        ];
        description = "Editor extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-filemanager" = callPackage
@@ -166065,8 +155773,6 @@ self: {
        ];
        description = "File manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-imageviewer" = callPackage
@@ -166087,8 +155793,6 @@ self: {
        ];
        description = "Image viewer extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-ircclient" = callPackage
@@ -166113,8 +155817,6 @@ self: {
        ];
        description = "IRC client extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-mplayer" = callPackage
@@ -166136,8 +155838,6 @@ self: {
        ];
        description = "Mplayer client extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-pdfviewer" = callPackage
@@ -166158,8 +155858,6 @@ self: {
        ];
        description = "PDF viewer extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-processmanager" = callPackage
@@ -166179,8 +155877,6 @@ self: {
        ];
        description = "Process manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-reader" = callPackage
@@ -166221,8 +155917,6 @@ self: {
        ];
        description = "Template code to create Manatee application";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-terminal" = callPackage
@@ -166242,8 +155936,6 @@ self: {
        ];
        description = "Terminal Emulator extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-welcome" = callPackage
@@ -166263,8 +155955,6 @@ self: {
        ];
        description = "Welcome module to help user play Manatee quickly";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mancala" = callPackage
@@ -166320,8 +156010,6 @@ self: {
        ];
        description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mangopay" = callPackage
@@ -166360,8 +156048,6 @@ self: {
        ];
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manifold-random" = callPackage
@@ -166378,8 +156064,6 @@ self: {
        ];
        description = "Sampling random points on general manifolds";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manifolds" = callPackage
@@ -166409,8 +156093,6 @@ self: {
        ];
        description = "Coordinate-free hypersurfaces";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manifolds-core" = callPackage
@@ -166452,8 +156134,6 @@ self: {
        executableHaskellDepends = [ base bytestring cassava containers ];
        description = "Extensions to Data.Map";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "map-reduce-folds" = callPackage
@@ -166519,8 +156199,6 @@ self: {
        ];
        description = "Efficient, polymorphic Map Algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mappy" = callPackage
@@ -166543,8 +156221,6 @@ self: {
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
        description = "A functional programming language focused around maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mapquest-api" = callPackage
@@ -166604,8 +156280,6 @@ self: {
        ];
        description = "A study of marionetta movements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markdown" = callPackage
@@ -166651,8 +156325,6 @@ self: {
        ];
        description = "Convert Markdown to HTML, with XSS protection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markdown-pap" = callPackage
@@ -166664,8 +156336,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markdown-unlit" = callPackage
@@ -166704,8 +156374,6 @@ self: {
        ];
        description = "markdown to svg converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "marked-pretty" = callPackage
@@ -166718,8 +156386,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Pretty-printing library, with scoping, based on pretty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markov" = callPackage
@@ -166775,8 +156441,6 @@ self: {
        testHaskellDepends = [ assertions base bifunctors memoize random ];
        description = "Hidden Markov processes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markov-realization" = callPackage
@@ -166789,8 +156453,6 @@ self: {
        testHaskellDepends = [ base HTF MonadRandom ];
        description = "Realizations of Markov chains";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markup" = callPackage
@@ -166809,8 +156471,6 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markup-preview" = callPackage
@@ -166859,8 +156519,6 @@ self: {
        ];
        description = "Upload packages to Marmalade";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "marquise" = callPackage
@@ -166895,8 +156553,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Client library for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mars" = callPackage
@@ -166912,8 +156568,6 @@ self: {
        ];
        description = "Generates mountainous terrain using a random walk algorithm";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "marshal-contt" = callPackage
@@ -166963,8 +156617,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A framework for modular, portable chat bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "marvin-interpolate" = callPackage
@@ -166981,8 +156633,6 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "Compile time string interpolation a la Scala and CoffeeScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "marxup" = callPackage
@@ -167006,8 +156656,6 @@ self: {
        ];
        description = "Markup language preprocessor for Haskell";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "masakazu-bot" = callPackage
@@ -167030,8 +156678,6 @@ self: {
        ];
        description = "@minamiyama1994_bot on haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mason" = callPackage
@@ -167069,8 +156715,6 @@ self: {
        ];
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "massiv-io" = callPackage
@@ -167093,8 +156737,6 @@ self: {
        ];
        description = "Import/export of Image files into massiv Arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "massiv-scheduler" = callPackage
@@ -167137,8 +156779,6 @@ self: {
        ];
        description = "Library that contains generators, properties and tests for Massiv Array Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "master-plan" = callPackage
@@ -167163,8 +156803,6 @@ self: {
        ];
        description = "The project management tool for hackers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mastermind" = callPackage
@@ -167196,8 +156834,6 @@ self: {
        testHaskellDepends = [ base containers doctest hspec ];
        description = "A type class for Matchable Functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "matchable-th" = callPackage
@@ -167214,8 +156850,6 @@ self: {
        testHaskellDepends = [ base containers matchable ];
        description = "Generates Matchable instances using TemplateHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "matcher" = callPackage
@@ -167243,8 +156877,6 @@ self: {
        librarySystemDepends = [ pcre ];
        description = "Text matchers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) pcre;};
 
   "math-extras" = callPackage
@@ -167297,8 +156929,6 @@ self: {
        testHaskellDepends = [ array base containers hspec random ];
        description = "Library containing graph data structures and graph algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "math-interpolate" = callPackage
@@ -167310,8 +156940,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Class for interpolation of values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "math-metric" = callPackage
@@ -167323,8 +156951,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Typeclass for metric spaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "math-programming" = callPackage
@@ -167365,8 +156991,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A GLPK backend to the math-programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) glpk;};
 
   "math-programming-tests" = callPackage
@@ -167382,8 +157006,6 @@ self: {
        ];
        description = "Utility functions for testing implementations of the math-programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mathblog" = callPackage
@@ -167410,8 +157032,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "mathexpr" = callPackage
@@ -167442,8 +157062,6 @@ self: {
        ];
        description = "Dependently typed tensorflow modeler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mathgenealogy" = callPackage
@@ -167502,8 +157120,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Write Mathematica packages in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "matlab" = callPackage
@@ -167602,8 +157218,6 @@ self: {
        ];
        description = "Read and Display Jones-Faithful notation for spacegroup and planegroup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "matrix-lens" = callPackage
@@ -167622,8 +157236,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Optics for the \"matrix\" package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "matrix-market" = callPackage
@@ -167635,8 +157247,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Read and write NIST Matrix Market files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "matrix-market-attoparsec" = callPackage
@@ -167688,8 +157298,6 @@ self: {
        ];
        description = "Haskell matrix library with interface to C++ linear algebra libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "matrix-static" = callPackage
@@ -167728,8 +157336,6 @@ self: {
        ];
        description = "ncurses XMPP client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "matterhorn" = callPackage
@@ -167830,8 +157436,6 @@ self: {
        ];
        description = "An interface to the Maude rewriting system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maxent" = callPackage
@@ -167853,8 +157457,6 @@ self: {
        ];
        description = "Compute Maximum Entropy Distributions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maxent-learner-hw" = callPackage
@@ -167878,8 +157480,6 @@ self: {
        ];
        description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maxent-learner-hw-gui" = callPackage
@@ -167901,8 +157501,6 @@ self: {
        ];
        description = "GUI for maxent-learner-hw";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maximal-cliques" = callPackage
@@ -167935,8 +157533,6 @@ self: {
        ];
        description = "Maximal sharing of terms in the lambda calculus with letrec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maybe-justify" = callPackage
@@ -167967,8 +157563,6 @@ self: {
        ];
        description = "Automated benchmarking tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mbox" = callPackage
@@ -168000,8 +157594,6 @@ self: {
        ];
        description = "A collection of tools to process mbox files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mbox-utility" = callPackage
@@ -168063,8 +157655,6 @@ self: {
        ];
        description = "download bugs mailboxes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mcl" = callPackage
@@ -168091,8 +157681,6 @@ self: {
        ];
        description = "Bindings to mcl, a generic and fast pairing-based cryptography library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gmpxx; mcl = null; inherit (pkgs) openssl;};
 
   "mcm" = callPackage
@@ -168112,8 +157700,6 @@ self: {
        ];
        description = "Machine Configuration Manager";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mcmaster-gloss-examples" = callPackage
@@ -168126,8 +157712,6 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base gloss ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mcmc" = callPackage
@@ -168156,8 +157740,6 @@ self: {
        ];
        description = "Sample from a posterior using Markov chain Monte Carlo";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mcmc-samplers" = callPackage
@@ -168173,8 +157755,6 @@ self: {
        ];
        description = "Combinators for MCMC sampling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mcmc-synthesis" = callPackage
@@ -168186,8 +157766,6 @@ self: {
        libraryHaskellDepends = [ base MonadRandom ];
        description = "MCMC applied to probabilistic program synthesis";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mcmc-types" = callPackage
@@ -168215,8 +157793,6 @@ self: {
        executableHaskellDepends = [ base transformers ];
        description = "Connect to MineCraft running on a Raspberry PI";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mdapi" = callPackage
@@ -168235,8 +157811,6 @@ self: {
        ];
        description = "Haskell interface to Fedora's mdapi";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mdcat" = callPackage
@@ -168256,8 +157830,6 @@ self: {
        ];
        description = "Markdown viewer in your terminal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mdo" = callPackage
@@ -168287,8 +157859,6 @@ self: {
        testHaskellDepends = [ base HTF HUnit QuickCheck vector ];
        description = "Tools for solving Markov Decision Processes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mealstrom" = callPackage
@@ -168310,8 +157880,6 @@ self: {
        ];
        description = "Manipulate FSMs and store them in PostgreSQL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mealy" = callPackage
@@ -168332,8 +157900,6 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "means" = callPackage
@@ -168357,8 +157923,6 @@ self: {
        librarySystemDepends = [ mecab ];
        description = "A Haskell binding to MeCab";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mecab;};
 
   "mech" = callPackage
@@ -168370,8 +157934,6 @@ self: {
        libraryHaskellDepends = [ base machines ];
        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;
-       broken = true;
      }) {};
 
   "mecha" = callPackage
@@ -168396,8 +157958,6 @@ self: {
        libraryHaskellDepends = [ base machines ];
        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;
-       broken = true;
      }) {};
 
   "med-module" = callPackage
@@ -168472,8 +158032,6 @@ self: {
        ];
        description = "Multimedia streaming on top of Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mediabus-fdk-aac" = callPackage
@@ -168501,8 +158059,6 @@ self: {
        ];
        description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {fdk-aac = null;};
 
   "mediabus-rtp" = callPackage
@@ -168540,8 +158096,6 @@ self: {
        ];
        description = "Receive and Send RTP Packets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "median-stream" = callPackage
@@ -168572,8 +158126,6 @@ self: {
        ];
        description = "Interfacing with the MediaWiki API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mediawiki2latex" = callPackage
@@ -168617,8 +158169,6 @@ self: {
        ];
        description = "Haskell SDK for communicating with the Medium API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "meep" = callPackage
@@ -168657,8 +158207,6 @@ self: {
        ];
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "megalisp" = callPackage
@@ -168768,8 +158316,6 @@ self: {
        ];
        description = "Control physical access devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mellon-gpio" = callPackage
@@ -168781,8 +158327,6 @@ self: {
        libraryHaskellDepends = [ base hpio mellon-core protolude ];
        description = "GPIO support for mellon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mellon-web" = callPackage
@@ -168824,8 +158368,6 @@ self: {
        ];
        description = "A REST web service for Mellon controllers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "melody" = callPackage
@@ -168847,8 +158389,6 @@ self: {
        ];
        description = "A functional scripting language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "membership" = callPackage
@@ -168902,8 +158442,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A memcached client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memcache-conduit" = callPackage
@@ -168923,8 +158461,6 @@ self: {
        ];
        description = "Conduit library for memcache procotol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memcache-haskell" = callPackage
@@ -168947,8 +158483,6 @@ self: {
        ];
        description = "Memcache procotol library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memcached" = callPackage
@@ -168983,8 +158517,6 @@ self: {
        ];
        description = "memcached client using binary protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memdb" = callPackage
@@ -169050,8 +158582,6 @@ self: {
        ];
        description = "Memis Efficient Manual Image Sorting";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memo-ptr" = callPackage
@@ -169063,8 +158593,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Pointer equality memoization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memo-sqlite" = callPackage
@@ -169092,8 +158620,6 @@ self: {
        testHaskellDepends = [ base hspec time time-units ];
        description = "Utilities for memoizing functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memoize" = callPackage
@@ -169167,8 +158693,6 @@ self: {
        ];
        description = "basic memory pool outside of haskell heap/GC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memscript" = callPackage
@@ -169210,8 +158734,6 @@ self: {
        ];
        description = "Haskell binding for Menoh DNN inference library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {menoh = null;};
 
   "menshen" = callPackage
@@ -169230,8 +158752,6 @@ self: {
        ];
        description = "Data Validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mercury-api" = callPackage
@@ -169409,8 +158929,6 @@ self: {
        ];
        description = "A modified Merkle Patricia DB";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "merkle-tree" = callPackage
@@ -169493,8 +159011,6 @@ self: {
        ];
        description = "Message Pack RPC over TCP";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "messente" = callPackage
@@ -169508,8 +159024,6 @@ self: {
        ];
        description = "Messente SMS Gateway";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "meta-misc" = callPackage
@@ -169521,8 +159035,6 @@ self: {
        libraryHaskellDepends = [ base loch-th template-haskell ];
        description = "Utility library providing miscellaneous meta-programming utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "meta-par" = callPackage
@@ -169539,8 +159051,6 @@ self: {
        ];
        description = "Provides the monad-par interface, but based on modular scheduler \"mix-ins\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "meta-par-accelerate" = callPackage
@@ -169558,8 +159068,6 @@ self: {
        ];
        description = "Support for integrated Accelerate computations within Meta-par";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metadata" = callPackage
@@ -169571,8 +159079,6 @@ self: {
        libraryHaskellDepends = [ base text time ];
        description = "metadata library for semantic web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metaheuristics" = callPackage
@@ -169584,8 +159090,6 @@ self: {
        libraryHaskellDepends = [ arrows base random Stream ];
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metamorphic" = callPackage
@@ -169609,8 +159113,6 @@ self: {
        libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ];
        description = "a tiny ghc api wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metar" = callPackage
@@ -169636,8 +159138,6 @@ self: {
        ];
        description = "Australian METAR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metar-http" = callPackage
@@ -169662,8 +159162,6 @@ self: {
        ];
        description = "HTTP for METAR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metric" = callPackage
@@ -169682,8 +159180,6 @@ self: {
        ];
        description = "Metric spaces";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metrics" = callPackage
@@ -169717,8 +159213,6 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "Client for the metrics aggregator Metricsd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metro" = callPackage
@@ -169820,8 +159314,6 @@ self: {
        ];
        description = "Time Synchronized execution";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mezzo" = callPackage
@@ -169842,8 +159334,6 @@ self: {
        ];
        description = "Typesafe music composition";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mezzolens" = callPackage
@@ -169855,8 +159345,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Pure Profunctor Functional Lenses";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mfsolve" = callPackage
@@ -169886,8 +159374,6 @@ self: {
        ];
        description = "Generics with multiple parameters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mi" = callPackage
@@ -169903,8 +159389,6 @@ self: {
        ];
        description = "Multiple Instance for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miconix-test" = callPackage
@@ -169920,8 +159404,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "micro-gateway" = callPackage
@@ -169967,8 +159449,6 @@ self: {
        testHaskellDepends = [ base HUnit template-haskell ];
        description = "Simple recursion schemes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microaeson" = callPackage
@@ -170004,8 +159484,6 @@ self: {
        doHaddock = false;
        description = "A minimal base to work around GHC bugs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microbench" = callPackage
@@ -170068,8 +159546,6 @@ self: {
        ];
        description = "A Microformats 2 parser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microformats2-types" = callPackage
@@ -170085,8 +159561,6 @@ self: {
        ];
        description = "Microformats 2 types (with Aeson instances)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microgroove" = callPackage
@@ -170098,8 +159572,6 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "Array-backed extensible records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microlens" = callPackage
@@ -170154,8 +159626,6 @@ self: {
        libraryHaskellDepends = [ base microlens ];
        description = "'each' for microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microlens-ghc" = callPackage
@@ -170253,8 +159723,6 @@ self: {
        testHaskellDepends = [ aeson base hspec text ];
        description = "A super simple logging module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microsoft-translator" = callPackage
@@ -170272,8 +159740,6 @@ self: {
        ];
        description = "Bindings to the Microsoft Translator API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microspec" = callPackage
@@ -170349,8 +159815,6 @@ self: {
        ];
        description = "Language for algorithmic generation of MIDI files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "midair" = callPackage
@@ -170417,8 +159881,6 @@ self: {
        ];
        description = "Convert MIDI file to music box punch tape";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "midi-simple" = callPackage
@@ -170470,8 +159932,6 @@ self: {
        ];
        description = "Utilities for working with MIDI data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "midimory" = callPackage
@@ -170491,8 +159951,6 @@ self: {
        ];
        description = "A Memory-like (Concentration, Pairs, ...) game for tones";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "midisurface" = callPackage
@@ -170510,8 +159968,6 @@ self: {
        ];
        description = "A control midi surface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mighttpd" = callPackage
@@ -170532,8 +159988,6 @@ self: {
        ];
        description = "Simple Web Server in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mighttpd2" = callPackage
@@ -170586,8 +160040,6 @@ self: {
        ];
        description = "The Metropolis algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mikmod" = callPackage
@@ -170601,8 +160053,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "MikMod bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mikrokosmos" = callPackage
@@ -170628,8 +160078,6 @@ self: {
        ];
        description = "Lambda calculus interpreter";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miku" = callPackage
@@ -170646,8 +160094,6 @@ self: {
        ];
        description = "A minimum web dev DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "milena" = callPackage
@@ -170671,8 +160117,6 @@ self: {
        ];
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mime" = callPackage
@@ -170701,8 +160145,6 @@ self: {
        ];
        description = "A library for parsing/printing the text/directory mime type";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mime-mail" = callPackage
@@ -170823,8 +160265,6 @@ self: {
        ];
        description = "a DSL for generating minecraft commands and levels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mines" = callPackage
@@ -170859,8 +160299,6 @@ self: {
        ];
        description = "Minesweeper game which is always solvable without guessing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mini-egison" = callPackage
@@ -170914,8 +160352,6 @@ self: {
        ];
        description = "Miniature FORTH-like interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minilens" = callPackage
@@ -170931,8 +160367,6 @@ self: {
        ];
        description = "A minimalistic lens library, providing only the simplest, most basic lens functionality";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minilight" = callPackage
@@ -170964,8 +160398,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A SDL2-based graphics library, batteries-included";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minilight-lua" = callPackage
@@ -170986,8 +160418,6 @@ self: {
        executableHaskellDepends = [ base lens minilight mtl ];
        description = "A binding library of minilight for Lua langauge";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minimal-configuration" = callPackage
@@ -171029,8 +160459,6 @@ self: {
        executableHaskellDepends = [ base GLUT haskell98 unix ];
        description = "Shows how to run grabber on Mac OS X";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minio-hs" = callPackage
@@ -171083,8 +160511,6 @@ self: {
        ];
        description = "A fast parallel ssh tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minioperational" = callPackage
@@ -171101,8 +160527,6 @@ self: {
        ];
        description = "fast and simple operational monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miniplex" = callPackage
@@ -171119,8 +160543,6 @@ self: {
        ];
        description = "simple 1-to-N interprocess communication";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minirotate" = callPackage
@@ -171140,8 +160562,6 @@ self: {
        ];
        description = "Minimalistic file rotation utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minisat" = callPackage
@@ -171183,8 +160603,6 @@ self: {
        ];
        description = "an interpreter for an operational semantics for the STG machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minitypeset-opengl" = callPackage
@@ -171263,8 +160681,6 @@ self: {
        testHaskellDepends = [ base binary directory hspec vector ];
        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;
-       broken = true;
      }) {};
 
   "mintty" = callPackage
@@ -171299,8 +160715,6 @@ self: {
        ];
        description = "A Minisat-based CDCL SAT solver in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mirror-tweet" = callPackage
@@ -171319,8 +160733,6 @@ self: {
        ];
        description = "Tweet mirror";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "misfortune" = callPackage
@@ -171342,8 +160754,6 @@ self: {
        executableHaskellDepends = [ monad-loops regex-base regex-pcre ];
        description = "fortune-mod clone";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mismi-core" = callPackage
@@ -171479,8 +160889,6 @@ self: {
        libraryHaskellDepends = [ aeson base ghcjs-base miso ];
        description = "Miso state transition logger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miso-examples" = callPackage
@@ -171493,8 +160901,6 @@ self: {
        isExecutable = true;
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miso-from-html" = callPackage
@@ -171542,8 +160948,6 @@ self: {
        ];
        description = "A Haskell git implimentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miss-porcelain" = callPackage
@@ -171562,8 +160966,6 @@ self: {
        ];
        description = "Useability extras built on top of miss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "missing-foreign" = callPackage
@@ -171589,8 +160991,6 @@ self: {
        ];
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miv" = callPackage
@@ -171627,8 +161027,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mixing effects of one arrow into another one";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mixed-strategies" = callPackage
@@ -171645,8 +161043,6 @@ self: {
        ];
        description = "Find optimal mixed strategies for two-player games";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mixed-types-num" = callPackage
@@ -171687,8 +161083,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Mixpanel client";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mkbndl" = callPackage
@@ -171703,8 +161097,6 @@ self: {
        executableHaskellDepends = [ base directory filepath haskell98 ];
        description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mkcabal" = callPackage
@@ -171723,8 +161115,6 @@ self: {
        ];
        description = "Generate cabal files for a Haskell project";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ml-w" = callPackage
@@ -171739,8 +161129,6 @@ self: {
        executableHaskellDepends = [ base mtl parsec pretty ];
        description = "Minimal ML language to to demonstrate the W type infererence algorithm";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mlist" = callPackage
@@ -171752,8 +161140,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "Monadic List alternative to lazy I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mltool" = callPackage
@@ -171777,8 +161163,6 @@ self: {
        ];
        description = "Machine Learning Toolbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mm2" = callPackage
@@ -171790,8 +161174,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmap" = callPackage
@@ -171933,8 +161315,6 @@ self: {
        ];
        description = "The \"glue\" between electronic tables and GraphViz";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmsyn5" = callPackage
@@ -171991,8 +161371,6 @@ self: {
        ];
        description = "Produces a sound recording specified by the Ukrainian text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmsyn7l" = callPackage
@@ -172068,8 +161446,6 @@ self: {
        ];
        description = "Macromolecular Transmission Format implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmtl" = callPackage
@@ -172081,8 +161457,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modular Monad transformer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmtl-base" = callPackage
@@ -172096,8 +161470,6 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "MonadBase type-class for mmtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mnist-idx" = callPackage
@@ -172127,8 +161499,6 @@ self: {
        ];
        description = "Language-agnostic analyzer for positional morphosyntactic tags";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mock-httpd" = callPackage
@@ -172254,8 +161624,6 @@ self: {
        ];
        description = "A parser for the modelica language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modern-uri" = callPackage
@@ -172305,8 +161673,6 @@ self: {
        ];
        description = "Modify fasta (and CLIP) files in several optional ways";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modsplit" = callPackage
@@ -172327,8 +161693,6 @@ self: {
        ];
        description = "Haskell source splitter driven by special comments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modular" = callPackage
@@ -172369,8 +161733,6 @@ self: {
        ];
        description = "A new Prelude featuring first class modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modular-prelude-classy" = callPackage
@@ -172382,8 +161744,6 @@ self: {
        libraryHaskellDepends = [ base classy-prelude modular-prelude ];
        description = "Reifying ClassyPrelude a la ModularPrelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modularity" = callPackage
@@ -172399,8 +161759,6 @@ self: {
        ];
        description = "Find the modularity of a network";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "module-management" = callPackage
@@ -172431,8 +161789,6 @@ self: {
        ];
        description = "Clean up module imports, split and merge modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modulespection" = callPackage
@@ -172449,8 +161805,6 @@ self: {
        ];
        description = "Template Haskell for introspecting a module's declarations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modulo" = callPackage
@@ -172470,8 +161824,6 @@ self: {
        ];
        description = "Modular C code generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moe" = callPackage
@@ -172487,8 +161839,6 @@ self: {
        ];
        description = "html with style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moesocks" = callPackage
@@ -172511,8 +161861,6 @@ self: {
        ];
        description = "A functional firewall killer";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mohws" = callPackage
@@ -172535,8 +161883,6 @@ self: {
        ];
        description = "Modular Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mole" = callPackage
@@ -172567,8 +161913,6 @@ self: {
        ];
        description = "A glorified string replacement tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mollie-api-haskell" = callPackage
@@ -172594,8 +161938,6 @@ self: {
        ];
        description = "Mollie API client for Haskell http://www.mollie.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-abort-fd" = callPackage
@@ -172612,8 +161954,6 @@ self: {
        ];
        description = "A better error monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-atom" = callPackage
@@ -172625,8 +161965,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically convert object to unique integers and back";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-atom-simple" = callPackage
@@ -172638,8 +161976,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically map objects to unique ints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-batcher" = callPackage
@@ -172706,8 +162042,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Monadic abstraction for computations that can be branched and run independently";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-choice" = callPackage
@@ -172778,8 +162112,6 @@ self: {
        ];
        description = "monad-classes based typeclass for Ollie's logging-effect LoggingT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-codec" = callPackage
@@ -172900,8 +162232,6 @@ self: {
        ];
        description = "Exstensible monadic exceptions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-extras" = callPackage
@@ -172933,8 +162263,6 @@ self: {
        ];
        description = "Guard monadic computations with cleanup actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-fork" = callPackage
@@ -172946,8 +162274,6 @@ self: {
        libraryHaskellDepends = [ base monad-control ];
        description = "Type class for monads which support a fork operation";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-gen" = callPackage
@@ -172996,8 +162322,6 @@ self: {
        ];
        description = "A class of monads which can do http requests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-interleave" = callPackage
@@ -173009,8 +162333,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monads with an unsaveInterleaveIO-like operation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-introspect" = callPackage
@@ -173072,8 +162394,6 @@ self: {
        ];
        description = "Specific levels of monad transformers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-lgbt" = callPackage
@@ -173092,8 +162412,6 @@ self: {
        ];
        description = "Monad transformers for combining local and global state";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-log" = callPackage
@@ -173113,8 +162431,6 @@ self: {
        ];
        description = "A simple and fast logging monad";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-logger" = callPackage
@@ -173186,8 +162502,6 @@ self: {
        ];
        description = "syslog output for monad-logger";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-loops" = callPackage
@@ -173230,8 +162544,6 @@ self: {
        ];
        description = "a monad to calculate linear recursive sequence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-markov" = callPackage
@@ -173283,8 +162595,6 @@ self: {
        libraryHaskellDepends = [ base mersenne-random-pure64 ];
        description = "An efficient random generator monad, based on the Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-metrics" = callPackage
@@ -173322,8 +162632,6 @@ self: {
        ];
        description = "An extensible and type-safe wrapper around EKG metrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-mock" = callPackage
@@ -173342,8 +162650,6 @@ self: {
        testHaskellDepends = [ base hspec mtl ];
        description = "A monad transformer for mocking mtl-style typeclasses";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-open" = callPackage
@@ -173355,8 +162661,6 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl transformers ];
        description = "Open recursion for when you need it";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-ox" = callPackage
@@ -173438,8 +162742,6 @@ self: {
        ];
        description = "Parallel execution of monadic computations with a progress bar";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-param" = callPackage
@@ -173451,8 +162753,6 @@ self: {
        libraryHaskellDepends = [ base mtl stm ];
        description = "Parameterized monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-peel" = callPackage
@@ -173493,8 +162793,6 @@ self: {
        ];
        description = "An mtl-style typeclass and transformer for persistent";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-primitive" = callPackage
@@ -173528,8 +162826,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim mtl ];
        description = "Fast monads and monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-recorder" = callPackage
@@ -173546,8 +162842,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Record and replay the results of monadic actions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-resumption" = callPackage
@@ -173596,8 +162890,6 @@ self: {
        ];
        description = "Utility library for monads, particularly those involving state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-statevar" = callPackage
@@ -173610,8 +162902,6 @@ self: {
        testHaskellDepends = [ base stm ];
        description = "Concise, overloaded accessors for IORef, STRef, TVar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-ste" = callPackage
@@ -173628,8 +162918,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        description = "ST monad with efficient explicit errors";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-stlike-io" = callPackage
@@ -173644,8 +162932,6 @@ self: {
        ];
        description = "ST-like monad capturing variables to regions and supporting IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-stlike-stm" = callPackage
@@ -173657,8 +162943,6 @@ self: {
        libraryHaskellDepends = [ base monad-stlike-io stm ];
        description = "ST-like monad capturing variables to regions and supporting STM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-stm" = callPackage
@@ -173682,7 +162966,6 @@ self: {
        description = "Stateful supply monad";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-task" = callPackage
@@ -173694,8 +162977,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A monad transformer that turns event processing into co-routine programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-time" = callPackage
@@ -173725,8 +163006,6 @@ self: {
        testHaskellDepends = [ base containers hlint hspec transformers ];
        description = "Monad transformer for recording timing events";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-tx" = callPackage
@@ -173738,8 +163017,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A transactional state monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-unify" = callPackage
@@ -173753,8 +163030,6 @@ self: {
        libraryHaskellDepends = [ base mtl unordered-containers ];
        description = "Generic first-order unification";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-unlift" = callPackage
@@ -173818,8 +163093,6 @@ self: {
        libraryHaskellDepends = [ base base-compat stm ];
        description = "Generic operations over variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-wrap" = callPackage
@@ -173831,8 +163104,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Wrap functions such as catch around different monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadIO" = callPackage
@@ -173868,8 +163139,6 @@ self: {
        libraryHaskellDepends = [ base monadLib ];
        description = "Arrow-like monad composition for monadLib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadacme" = callPackage
@@ -173881,8 +163150,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The Acme and AcmeT monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadbi" = callPackage
@@ -173952,8 +163219,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Recursion Schemes for Monadic version";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadiccp" = callPackage
@@ -173971,8 +163236,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadiccp-gecode" = callPackage
@@ -173991,8 +163254,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gecodeint = null; gecodekernel = null; gecodesearch = null; 
          gecodeset = null; gecodesupport = null;};
 
@@ -174044,8 +163305,6 @@ self: {
        ];
        description = "A preprocessor for generating monadic call traces";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadlog" = callPackage
@@ -174065,8 +163324,6 @@ self: {
        ];
        description = "A simple and fast logging monad";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadoid" = callPackage
@@ -174093,8 +163350,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell98 partial maps and filters over MonadPlus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monads-fd" = callPackage
@@ -174106,8 +163361,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monads-tf" = callPackage
@@ -174148,8 +163401,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Monadic interface for TokyoTyrant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mondo" = callPackage
@@ -174173,8 +163424,6 @@ self: {
        ];
        description = "Haskell bindings for the Mondo API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monetdb-mapi" = callPackage
@@ -174186,8 +163435,6 @@ self: {
        libraryHaskellDepends = [ base bindings-monetdb-mapi ];
        description = "Mid-level bindings for the MonetDB API (mapi)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "money" = callPackage
@@ -174200,8 +163447,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Money";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mongoDB" = callPackage
@@ -174234,8 +163479,6 @@ self: {
        ];
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mongodb-queue" = callPackage
@@ -174256,8 +163499,6 @@ self: {
        ];
        description = "message queue using MongoDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mongrel2-handler" = callPackage
@@ -174275,8 +163516,6 @@ self: {
        ];
        description = "Mongrel2 Handler Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monitor" = callPackage
@@ -174290,8 +163529,6 @@ self: {
        executableHaskellDepends = [ base filepath hinotify process ];
        description = "Do things when files change";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monky" = callPackage
@@ -174316,8 +163553,6 @@ self: {
        ];
        description = "A system state collecting library and application";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mono-foldable" = callPackage
@@ -174329,8 +163564,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text vector ];
        description = "Folds for monomorphic containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mono-traversable" = callPackage
@@ -174411,8 +163644,6 @@ self: {
        libraryHaskellDepends = [ base containers lens mtl ];
        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;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monoid-absorbing" = callPackage
@@ -174424,8 +163655,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A library for (left, right) zero monoids and backtracking with cut";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monoid-extras" = callPackage
@@ -174453,8 +163682,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        description = "a practical monoid implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monoid-record" = callPackage
@@ -174547,8 +163774,6 @@ self: {
        ];
        description = "Extra classes/functions about monoids";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monoids" = callPackage
@@ -174564,8 +163789,6 @@ self: {
        ];
        description = "Deprecated: Use 'reducers'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monomorphic" = callPackage
@@ -174593,8 +163816,6 @@ self: {
        ];
        description = "Well-typed paths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "montage" = callPackage
@@ -174660,8 +163881,6 @@ self: {
        ];
        description = "A monad and transformer for Monte Carlo calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "months" = callPackage
@@ -174698,8 +163917,6 @@ self: {
        ];
        description = "a 'Monus' is a commutative monoid that allows a notion of substraction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monzo" = callPackage
@@ -174723,8 +163940,6 @@ self: {
        ];
        description = "Haskell bindings for the Monzo API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moo" = callPackage
@@ -174746,8 +163961,6 @@ self: {
        ];
        description = "Genetic algorithm library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moonshine" = callPackage
@@ -174807,8 +164020,6 @@ self: {
        ];
        description = "A tool for supervised learning of morphology";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morfeusz" = callPackage
@@ -174826,8 +164037,6 @@ self: {
        librarySystemDepends = [ morfeusz ];
        description = "Bindings to the morphological analyser Morfeusz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {morfeusz = null;};
 
   "morley" = callPackage
@@ -174864,8 +164073,6 @@ self: {
        ];
        description = "Developer tools for the Michelson Language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morley-prelude" = callPackage
@@ -174915,8 +164122,6 @@ self: {
        ];
        description = "A multi-lingual, typed, workflow language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morph" = callPackage
@@ -174980,8 +164185,6 @@ self: {
        ];
        description = "Morpheus GraphQL CLI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morpheus-graphql-client" = callPackage
@@ -175005,8 +164208,6 @@ self: {
        ];
        description = "Morpheus GraphQL Client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morpheus-graphql-core" = callPackage
@@ -175055,8 +164256,6 @@ self: {
        ];
        description = "Morpheus GraphQL Subscriptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morphisms" = callPackage
@@ -175078,8 +164277,6 @@ self: {
        libraryHaskellDepends = [ morphisms ];
        description = "Functors, theirs compositions and transformations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morphisms-functors-inventory" = callPackage
@@ -175091,8 +164288,6 @@ self: {
        libraryHaskellDepends = [ morphisms morphisms-functors ];
        description = "Inventory is state and store";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morphisms-objects" = callPackage
@@ -175104,8 +164299,6 @@ self: {
        libraryHaskellDepends = [ morphisms ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morte" = callPackage
@@ -175139,8 +164332,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;
-       broken = true;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -175159,8 +164350,6 @@ self: {
        ];
        description = "Generación interactiva de mosaicos";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mosquitto-hs" = callPackage
@@ -175213,8 +164402,6 @@ self: {
        ];
        description = "General purpose migrations library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moto-postgresql" = callPackage
@@ -175231,8 +164418,6 @@ self: {
        ];
        description = "PostgreSQL-based migrations registry for moto";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "motor" = callPackage
@@ -175273,8 +164458,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate state diagrams from Motor FSM typeclasses";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "motor-reflection" = callPackage
@@ -175292,8 +164475,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Reflect on Motor FSM typeclasses to obtain runtime representations";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mount" = callPackage
@@ -175305,8 +164486,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Mounts and umounts filesystems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mountpoints" = callPackage
@@ -175341,8 +164520,6 @@ self: {
        ];
        description = "Plays videos using GStreamer and GTK+";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moving-averages" = callPackage
@@ -175379,8 +164556,6 @@ self: {
        ];
        description = "Music player for linux";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mp3decoder" = callPackage
@@ -175412,8 +164587,6 @@ self: {
        ];
        description = "MPD/PowerMate executable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mpg123-bindings" = callPackage
@@ -175445,8 +164618,6 @@ self: {
        testSystemDepends = [ mpich ];
        description = "MPI bindings for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mpich;};
 
   "mpi-hs-binary" = callPackage
@@ -175464,8 +164635,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mpi-hs-cereal" = callPackage
@@ -175483,8 +164652,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mpi-hs-store" = callPackage
@@ -175502,8 +164669,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mplayer-spot" = callPackage
@@ -175537,8 +164702,6 @@ self: {
        ];
        description = "Multi-dimensional parametric pretty-printer with color";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mprelude" = callPackage
@@ -175557,8 +164720,6 @@ self: {
        ];
        description = "A minimalish prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mpretty" = callPackage
@@ -175575,8 +164736,6 @@ self: {
        ];
        description = "a monadic, extensible pretty printing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mpris" = callPackage
@@ -175588,8 +164747,6 @@ self: {
        libraryHaskellDepends = [ base containers dbus mtl ];
        description = "Interface for MPRIS";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mprover" = callPackage
@@ -175607,8 +164764,6 @@ self: {
        ];
        description = "Simple equational reasoning for a Haskell-ish language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mps" = callPackage
@@ -175628,8 +164783,6 @@ self: {
        ];
        description = "simply oo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mptcp-pm" = callPackage
@@ -175654,8 +164807,6 @@ self: {
        executableToolDepends = [ c2hs ];
        description = "A work in progress Multipath TCP path manager";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mpvguihs" = callPackage
@@ -175674,8 +164825,6 @@ self: {
        ];
        description = "A minimalist mpv GUI written in I/O heavy Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mqtt" = callPackage
@@ -175704,8 +164853,6 @@ self: {
        ];
        description = "An MQTT protocol implementation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mqtt-hs" = callPackage
@@ -175722,8 +164869,6 @@ self: {
        ];
        description = "A MQTT client library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mr-env" = callPackage
@@ -175749,8 +164894,6 @@ self: {
        executableHaskellDepends = [ array base containers mtl ];
        description = "Decompiles Glulx files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mrm" = callPackage
@@ -175762,8 +164905,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modular Refiable Matching, first-class matches";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ms" = callPackage
@@ -175784,8 +164925,6 @@ self: {
        ];
        description = "metric spaces";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ms-tds" = callPackage
@@ -175831,8 +164970,6 @@ self: {
        ];
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msgpack-aeson" = callPackage
@@ -175851,8 +164988,6 @@ self: {
        testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ];
        description = "Aeson adapter for MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msgpack-binary" = callPackage
@@ -175879,8 +165014,6 @@ self: {
        ];
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msgpack-idl" = callPackage
@@ -175902,8 +165035,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An IDL Compiler for MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msgpack-rpc" = callPackage
@@ -175924,8 +165055,6 @@ self: {
        testHaskellDepends = [ async base mtl network tasty tasty-hunit ];
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msgpack-rpc-conduit" = callPackage
@@ -175947,8 +165076,6 @@ self: {
        testHaskellDepends = [ async base bytestring hspec mtl network ];
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msgpack-types" = callPackage
@@ -175986,8 +165113,6 @@ self: {
        ];
        description = "Object-Oriented Programming in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msi-kb-backlit" = callPackage
@@ -176001,8 +165126,6 @@ self: {
        executableHaskellDepends = [ base bytestring hid split ];
        description = "A command line tool to change backlit colors of your MSI keyboards";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mssql-simple" = callPackage
@@ -176077,8 +165200,6 @@ self: {
        ];
        description = "Library to communicate with Mt.Gox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mtl_2_1_3_1" = callPackage
@@ -176114,8 +165235,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Very strict CPS'd transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mtl-compat" = callPackage
@@ -176143,8 +165262,6 @@ self: {
        ];
        description = "Instances for the mtl classes for all monad transformers";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mtl-extras" = callPackage
@@ -176156,8 +165273,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Higher order versions of MTL classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mtl-prelude_1_0_3" = callPackage
@@ -176192,8 +165307,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Monad Transformer Library with Type Families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mtl-unleashed" = callPackage
@@ -176247,8 +165360,6 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Monad transformer library with type indexes, providing 'free' copies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mtp" = callPackage
@@ -176261,8 +165372,6 @@ self: {
        librarySystemDepends = [ mtp ];
        description = "Bindings to libmtp";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mtp = null;};
 
   "mtree" = callPackage
@@ -176308,8 +165417,6 @@ self: {
        executableHaskellDepends = [ avro base bytestring mu-schema ];
        description = "Avro serialization support for Mu microservices";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mu-graphql" = callPackage
@@ -176362,8 +165469,6 @@ self: {
        ];
        description = "gRPC clients from Mu definitions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mu-grpc-common" = callPackage
@@ -176381,8 +165486,6 @@ self: {
        ];
        description = "gRPC for Mu, common modules for client and server";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mu-grpc-server" = callPackage
@@ -176409,8 +165512,6 @@ self: {
        ];
        description = "gRPC servers for Mu definitions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mu-kafka" = callPackage
@@ -176427,8 +165528,6 @@ self: {
        ];
        description = "Utilities for interoperation between Mu and Kafka";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mu-lens" = callPackage
@@ -176514,8 +165613,6 @@ self: {
        ];
        description = "Protocol Buffers serialization and gRPC schema import for Mu microservices";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mu-rpc" = callPackage
@@ -176573,8 +165670,6 @@ self: {
        ];
        description = "Servant servers for Mu definitions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mu-tracing" = callPackage
@@ -176623,8 +165718,6 @@ self: {
        ];
        description = "Multi-version deployer for web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mudbath" = callPackage
@@ -176662,8 +165755,6 @@ self: {
        ];
        description = "A simple document-oriented database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mueval" = callPackage
@@ -176717,8 +165808,6 @@ self: {
        testToolDepends = [ alex happy ];
        description = "An intermediate language designed to perform advanced code analysis";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multext-east-msd" = callPackage
@@ -176730,8 +165819,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "MULTEXT-East morphosyntactic descriptors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multi-cabal" = callPackage
@@ -176753,8 +165840,6 @@ self: {
        ];
        description = "A tool supporting multi cabal project builds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multi-containers" = callPackage
@@ -176780,8 +165865,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Typeclasses augmented with a phantom type parameter";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multi-trie" = callPackage
@@ -176794,8 +165877,6 @@ self: {
        testHaskellDepends = [ base containers HTF ];
        description = "Trie of sets, as a model for compound names having multiple values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multiaddr" = callPackage
@@ -176816,8 +165897,6 @@ self: {
        ];
        description = "A network address format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multiarg" = callPackage
@@ -176836,8 +165915,6 @@ self: {
        ];
        description = "Command lines for options that take multiple arguments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multibase" = callPackage
@@ -176860,8 +165937,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Self-identifying base encodings, implementation of <https://github.com/multiformats/multihash>";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multifile" = callPackage
@@ -176905,8 +165980,6 @@ self: {
        ];
        description = "Bidirectional Two-level Transformation of XML Schemas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multihash" = callPackage
@@ -176930,8 +166003,6 @@ self: {
        ];
        description = "Multihash library and CLI executable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multihash-cryptonite" = callPackage
@@ -176951,8 +166022,6 @@ self: {
        testHaskellDepends = [ base cryptonite doctest hedgehog ];
        description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multihash-serialise" = callPackage
@@ -176970,8 +166039,6 @@ self: {
        testHaskellDepends = [ base cryptonite hedgehog serialise ];
        description = "CBOR encoding of multihashes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multihashmap" = callPackage
@@ -177004,8 +166071,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq weigh ];
        description = "Comprehensive and efficient (multi)linear algebra implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multilinear-io" = callPackage
@@ -177029,8 +166094,6 @@ self: {
        ];
        description = "Conduit-based input/output capability for multilinear package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multimap" = callPackage
@@ -177085,8 +166148,6 @@ self: {
        ];
        description = "Folding data with multiple named passes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multipath" = callPackage
@@ -177098,8 +166159,6 @@ self: {
        libraryHaskellDepends = [ base parsec utf8-string ];
        description = "Parser and builder for unix-path-like objects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multiplate" = callPackage
@@ -177126,8 +166185,6 @@ self: {
        libraryHaskellDepends = [ base multiplate transformers ];
        description = "Shorter, more generic functions for Multiplate";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multiplicity" = callPackage
@@ -177144,8 +166201,6 @@ self: {
        ];
        description = "Wrapper program for duplicity, adding config files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multipool" = callPackage
@@ -177210,8 +166265,6 @@ self: {
        ];
        description = "Read and write appropriately from both master and replicated postgresql instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multipool-postgresql-simple" = callPackage
@@ -177255,8 +166308,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Generic programming for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multirec-alt-deriver" = callPackage
@@ -177272,8 +166323,6 @@ self: {
        ];
        description = "Alternative multirec instances deriver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multirec-binary" = callPackage
@@ -177285,8 +166334,6 @@ self: {
        libraryHaskellDepends = [ base binary multirec ];
        description = "Generic Data.Binary instances using MultiRec.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multiset" = callPackage
@@ -177328,8 +166375,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 stm ];
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multistate" = callPackage
@@ -177378,8 +166423,6 @@ self: {
        ];
        description = "Multivariant assignments generation language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multivector" = callPackage
@@ -177420,8 +166463,6 @@ self: {
        ];
        description = "Static blog generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "murder" = callPackage
@@ -177438,8 +166479,6 @@ self: {
        ];
        description = "MUtually Recursive Definitions Explicitly Represented";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "murmur" = callPackage
@@ -177465,8 +166504,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simple CUI Twitter Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "murmur-hash" = callPackage
@@ -177509,8 +166546,6 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "32-bit non-cryptographic hashing";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mushu" = callPackage
@@ -177537,8 +166572,6 @@ self: {
        testHaskellDepends = [ base classy-prelude ];
        description = "Minimalist MPD client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-articulation" = callPackage
@@ -177603,8 +166636,6 @@ self: {
        ];
        description = "Diagrams-based visualization of musical data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-parts" = callPackage
@@ -177627,8 +166658,6 @@ self: {
        ];
        description = "Musical instruments, parts and playing techniques";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-pitch" = callPackage
@@ -177646,8 +166675,6 @@ self: {
        ];
        description = "Musical pitch representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-pitch-literal" = callPackage
@@ -177688,8 +166715,6 @@ self: {
        testHaskellDepends = [ base process tasty tasty-golden ];
        description = "Some useful preludes for the Music Suite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-score" = callPackage
@@ -177713,8 +166738,6 @@ self: {
        ];
        description = "Musical score and part representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-sibelius" = callPackage
@@ -177734,8 +166757,6 @@ self: {
        ];
        description = "Interaction with Sibelius";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-suite" = callPackage
@@ -177755,8 +166776,6 @@ self: {
        doHaddock = false;
        description = "A set of libraries for composition, analysis and manipulation of music";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-util" = callPackage
@@ -177774,8 +166793,6 @@ self: {
        ];
        description = "Utility for developing the Music Suite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "musicScroll" = callPackage
@@ -177800,8 +166817,6 @@ self: {
        executablePkgconfigDepends = [ gtk3 ];
        description = "Supply your tunes info without leaving your music player";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "musicbrainz-email" = callPackage
@@ -177835,8 +166850,6 @@ self: {
        ];
        description = "Send an email to all MusicBrainz editors";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "musicw" = callPackage
@@ -177872,8 +166885,6 @@ self: {
        ];
        description = "MusicXML format encoded as Haskell type and functions of reading and writting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "musicxml2" = callPackage
@@ -177891,8 +166902,6 @@ self: {
        ];
        description = "A representation of the MusicXML format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mustache" = callPackage
@@ -177946,8 +166955,6 @@ self: {
        ];
        description = "Straight implementation of mustache templates";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mustache2hs" = callPackage
@@ -177988,8 +166995,6 @@ self: {
        ];
        description = "Automatic piecewise-mutable references for your types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mutable-containers" = callPackage
@@ -178024,8 +167029,6 @@ self: {
        ];
        description = "iteratees based upon mutable buffers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mutable-lens" = callPackage
@@ -178061,8 +167064,6 @@ self: {
        ];
        description = "Watches your screensaver and (un)mutes music when you (un)lock the screen";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mvar-lock" = callPackage
@@ -178074,8 +167075,6 @@ self: {
        libraryHaskellDepends = [ base safe-exceptions ];
        description = "A trivial lock based on MVar";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mvc" = callPackage
@@ -178092,8 +167091,6 @@ self: {
        ];
        description = "Model-view-controller";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mvc-updates" = callPackage
@@ -178105,8 +167102,6 @@ self: {
        libraryHaskellDepends = [ async base foldl mvc ];
        description = "Concurrent and combinable updates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mvclient" = callPackage
@@ -178125,8 +167120,6 @@ self: {
        ];
        description = "Client library for metaverse systems like Second Life";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mwc-probability" = callPackage
@@ -178161,8 +167154,6 @@ self: {
        ];
        description = "A Markov stochastic transition operator with logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mwc-random" = callPackage
@@ -178213,8 +167204,6 @@ self: {
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mwc-random-monad" = callPackage
@@ -178262,8 +167251,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit vector ];
        description = "MXNet interface in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "mxnet-dataiter" = callPackage
@@ -178281,8 +167268,6 @@ self: {
        testHaskellDepends = [ base hspec mxnet streaming ];
        description = "mxnet dataiters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mxnet-examples" = callPackage
@@ -178296,8 +167281,6 @@ self: {
        executableHaskellDepends = [ base mxnet ];
        description = "Examples for MXNet in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mxnet-nn" = callPackage
@@ -178323,8 +167306,6 @@ self: {
        ];
        description = "Train a neural network with MXNet in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mxnet-nnvm" = callPackage
@@ -178338,8 +167319,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "NNVM interface in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "my-package-testing" = callPackage
@@ -178364,8 +167343,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "my-test-docs" = callPackage
@@ -178390,8 +167367,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "myTestlll" = callPackage
@@ -178416,8 +167391,6 @@ self: {
        ];
        description = "None";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "myanimelist-export" = callPackage
@@ -178441,8 +167414,6 @@ self: {
        ];
        description = "Export from MyAnimeList";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mybitcoin-sci" = callPackage
@@ -178479,8 +167450,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Haskell binding to the Myo armband";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysnapsession" = callPackage
@@ -178497,8 +167466,6 @@ self: {
        ];
        description = "Sessions and continuations for Snap web apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysnapsession-example" = callPackage
@@ -178518,8 +167485,6 @@ self: {
        ];
        description = "Example projects using mysnapsession";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysql" = callPackage
@@ -178552,8 +167517,6 @@ self: {
        ];
        description = "An extensible mysql effect using extensible-effects and mysql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysql-haskell" = callPackage
@@ -178577,8 +167540,6 @@ self: {
        ];
        description = "pure haskell MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysql-haskell-nem" = callPackage
@@ -178594,8 +167555,6 @@ self: {
        ];
        description = "Adds a interface like mysql-simple to mysql-haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysql-haskell-openssl" = callPackage
@@ -178612,8 +167571,6 @@ self: {
        ];
        description = "TLS support for mysql-haskell package using openssl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysql-simple" = callPackage
@@ -178647,8 +167604,6 @@ self: {
        ];
        description = "Quasi-quoter for use with mysql-simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysql-simple-typed" = callPackage
@@ -178664,8 +167619,6 @@ self: {
        ];
        description = "Typed extension to mysql simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mystem" = callPackage
@@ -178684,8 +167637,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Bindings for Mystem morphological analyzer executabe";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mywatch" = callPackage
@@ -178710,8 +167661,6 @@ self: {
        ];
        description = "Web application to view and kill MySQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "myxine-client" = callPackage
@@ -178734,8 +167683,6 @@ self: {
        testHaskellDepends = [ bytestring text ];
        description = "A Haskell client for the Myxine GUI server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mzv" = callPackage
@@ -178747,8 +167694,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "n-ary-functor" = callPackage
@@ -178792,8 +167737,6 @@ self: {
        libraryHaskellDepends = [ base singletons vector ];
        description = "Homogeneous tuples of arbitrary length";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "n2o" = callPackage
@@ -178838,8 +167781,6 @@ self: {
        ];
        description = "N2O Protocols Starter Pack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "n2o-web" = callPackage
@@ -178858,8 +167799,6 @@ self: {
        ];
        description = "N2O adapter for WebSockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nagios-check" = callPackage
@@ -178929,8 +167868,6 @@ self: {
        ];
        description = "Monitor ekg metrics via Nagios";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nakadi-client" = callPackage
@@ -178969,8 +167906,6 @@ self: {
        ];
        description = "Client library for the Nakadi Event Broker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "namecoin-update" = callPackage
@@ -179025,8 +167960,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A named lock that is created on demand";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "named-records" = callPackage
@@ -179048,8 +167981,6 @@ self: {
        sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53";
        libraryHaskellDepends = [ base named servant ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "named-servant-client" = callPackage
@@ -179065,8 +167996,6 @@ self: {
        ];
        description = "client support for named-servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "named-servant-server" = callPackage
@@ -179082,8 +168011,6 @@ self: {
        ];
        description = "server support for named-servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "named-sop" = callPackage
@@ -179114,8 +168041,6 @@ self: {
        ];
        description = "fortran90 namelist parser/pretty printer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "names" = callPackage
@@ -179190,8 +168115,6 @@ self: {
        librarySystemDepends = [ openssl ];
        description = "Bindings to OpenSSL HMAC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "nano-md5" = callPackage
@@ -179206,8 +168129,6 @@ self: {
        librarySystemDepends = [ openssl ];
        description = "Efficient, ByteString bindings to OpenSSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "nanoAgda" = callPackage
@@ -179238,8 +168159,6 @@ self: {
        librarySystemDepends = [ ncurses ];
        description = "Simple Curses binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "nanomsg" = callPackage
@@ -179252,8 +168171,6 @@ self: {
        librarySystemDepends = [ nanomsg ];
        description = "nanomsg - scalability protocols library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) nanomsg;};
 
   "nanomsg-haskell" = callPackage
@@ -179278,8 +168195,6 @@ self: {
        ];
        description = "Bindings to the nanomsg library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) nanomsg;};
 
   "nanoparsec" = callPackage
@@ -179291,8 +168206,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ListLike ];
        description = "An implementation of attoparsec-like parser around list-like";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nanospec" = callPackage
@@ -179326,8 +168239,6 @@ self: {
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
        description = "Haskell bindings for nanovg";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU;};
 
@@ -179346,8 +168257,6 @@ self: {
        ];
        description = "Simple interface to rendering with NanoVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nanq" = callPackage
@@ -179367,8 +168276,6 @@ self: {
        ];
        description = "Performs 漢字検定 (Japan Kanji Aptitude Test) level analysis on given Kanji";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "naperian" = callPackage
@@ -179386,8 +168293,6 @@ self: {
        ];
        description = "Efficient representable functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "naqsha" = callPackage
@@ -179406,8 +168311,6 @@ self: {
        doHaddock = false;
        description = "A library for working with anything map related";
        license = "(Apache-2.0 OR BSD-3-Clause)";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "narc" = callPackage
@@ -179419,8 +168322,6 @@ self: {
        libraryHaskellDepends = [ base HDBC HUnit mtl QuickCheck random ];
        description = "Query SQL databases using Nested Relational Calculus embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nat" = callPackage
@@ -179444,8 +168345,6 @@ self: {
        testHaskellDepends = [ base doctest hedgehog QuickCheck ];
        description = "Variable-sized numbers from type-level nats";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nationstates" = callPackage
@@ -179462,8 +168361,6 @@ self: {
        ];
        description = "NationStates API client";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "native" = callPackage
@@ -179523,8 +168420,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion time ];
        description = "Another Haskell client for NATS (https://nats.io)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nats-queue" = callPackage
@@ -179545,8 +168440,6 @@ self: {
        ];
        description = "Haskell API for NATS messaging system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "natural" = callPackage
@@ -179565,8 +168458,6 @@ self: {
        ];
        description = "Natural number";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "natural-arithmetic" = callPackage
@@ -179607,8 +168498,6 @@ self: {
        ];
        description = "Natural numbers tagged with a type-level representation of the number";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "natural-numbers" = callPackage
@@ -179686,8 +168575,6 @@ self: {
        ];
        description = "Interface to Naver Translate";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nbt" = callPackage
@@ -179707,8 +168594,6 @@ self: {
        ];
        description = "A parser/serializer for Minecraft's Named Binary Tag (NBT) data format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nc-indicators" = callPackage
@@ -179771,8 +168656,6 @@ self: {
        executableHaskellDepends = [ base filepath parsec ];
        description = "A Fast Retargetable Template Engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neat-interpolation" = callPackage
@@ -179807,8 +168690,6 @@ self: {
        ];
        description = "ASCII-fied arrow notation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neet" = callPackage
@@ -179825,8 +168706,6 @@ self: {
        ];
        description = "A NEAT library for Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nehe-tuts" = callPackage
@@ -179846,8 +168725,6 @@ self: {
        ];
        description = "Port of the NeHe OpenGL tutorials to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neil" = callPackage
@@ -179877,8 +168754,6 @@ self: {
        libraryHaskellDepends = [ base failure transformers ];
        description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neko-lib" = callPackage
@@ -179899,8 +168774,6 @@ self: {
        ];
        description = "Neko VM code generation and disassembly library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neko-obfs" = callPackage
@@ -179954,8 +168827,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "nerf" = callPackage
@@ -179982,8 +168853,6 @@ self: {
        ];
        description = "Nerf, a named entity recognition tool based on linear-chain CRFs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nero" = callPackage
@@ -180002,8 +168871,6 @@ self: {
        ];
        description = "Lens-based HTTP toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nero-wai" = callPackage
@@ -180019,8 +168886,6 @@ self: {
        ];
        description = "WAI adapter for Nero server applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nero-warp" = callPackage
@@ -180032,8 +168897,6 @@ self: {
        libraryHaskellDepends = [ base nero nero-wai warp ];
        description = "Run Nero server applications with Warp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nest" = callPackage
@@ -180049,8 +168912,6 @@ self: {
        ];
        testHaskellDepends = [ base bytestring containers hedgehog text ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nested-routes" = callPackage
@@ -180080,8 +168941,6 @@ self: {
        ];
        description = "Declarative, compositional Wai responses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nested-sequence" = callPackage
@@ -180098,8 +168957,6 @@ self: {
        ];
        description = "List-like data structures with O(log(n)) random access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nested-sets" = callPackage
@@ -180128,8 +168985,6 @@ self: {
        ];
        description = "A library for nested maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-concurrent" = callPackage
@@ -180241,8 +169096,6 @@ self: {
        ];
        description = "A graph database middleware to maintain a time-varying graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-spider-cli" = callPackage
@@ -180263,8 +169116,6 @@ self: {
        ];
        description = "CLI option parsers for NetSpider objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-spider-pangraph" = callPackage
@@ -180283,8 +169134,6 @@ self: {
        ];
        description = "Conversion between net-spider and pangraph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-spider-rpl" = callPackage
@@ -180306,8 +169155,6 @@ self: {
        ];
        description = "NetSpider data model and utility for RPL networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-spider-rpl-cli" = callPackage
@@ -180334,8 +169181,6 @@ self: {
        ];
        description = "CLI executable of NetSpider.RPL.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netclock" = callPackage
@@ -180349,8 +169194,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc network ];
        description = "Netclock protocol";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netcode-io" = callPackage
@@ -180396,8 +169239,6 @@ self: {
        ];
        description = "The NetCore compiler and runtime system for OpenFlow networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netease-fm" = callPackage
@@ -180426,8 +169267,6 @@ self: {
        ];
        description = "NetEase Cloud Music FM client in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netlib-carray" = callPackage
@@ -180487,8 +169326,6 @@ self: {
        executableHaskellDepends = [ base HTF random ];
        description = "Enumerator tools for text-based network protocols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netlink" = callPackage
@@ -180585,8 +169422,6 @@ self: {
        ];
        description = "Contract normaliser and simulator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netspec" = callPackage
@@ -180603,8 +169438,6 @@ self: {
        ];
        description = "Simplify static Networking tasks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netstring-enumerator" = callPackage
@@ -180618,8 +169451,6 @@ self: {
        ];
        description = "Enumerator-based netstring parsing";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nettle" = callPackage
@@ -180645,8 +169476,6 @@ self: {
        ];
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) nettle;};
 
   "nettle-frp" = callPackage
@@ -180663,8 +169492,6 @@ self: {
        ];
        description = "FRP for controlling networks of OpenFlow switches";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nettle-netkit" = callPackage
@@ -180680,8 +169507,6 @@ self: {
        ];
        description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nettle-openflow" = callPackage
@@ -180698,8 +169523,6 @@ self: {
        ];
        description = "OpenFlow protocol messages, binary formats, and servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netwire" = callPackage
@@ -180759,8 +169582,6 @@ self: {
        ];
        description = "JavaScript instance of netwire-input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netwire-vinylglfw-examples" = callPackage
@@ -180783,8 +169604,6 @@ self: {
        ];
        description = "Netwire/GLFW/VinylGL input handling demo";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network_2_6_3_1" = callPackage
@@ -180871,8 +169690,6 @@ self: {
        ];
        description = "IP data structures and textual representation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-anonymous-i2p" = callPackage
@@ -180895,8 +169712,6 @@ self: {
        ];
        description = "Haskell API for I2P anonymous networking";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-anonymous-tor" = callPackage
@@ -180926,8 +169741,6 @@ self: {
        ];
        description = "Haskell API for Tor anonymous networking";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-api-support" = callPackage
@@ -180945,8 +169758,6 @@ self: {
        ];
        description = "Toolkit for building http client libraries over Network.Http.Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-arbitrary" = callPackage
@@ -180968,8 +169779,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Arbitrary Instances for Network Types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-attoparsec" = callPackage
@@ -180993,8 +169802,6 @@ self: {
        doCheck = false;
        description = "Utility functions for running a parser against a socket";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-bitcoin" = callPackage
@@ -181017,8 +169824,6 @@ self: {
        ];
        description = "An interface to bitcoind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-bsd" = callPackage
@@ -181053,8 +169858,6 @@ self: {
        ];
        description = "Linux NetworkNameSpace Builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-byte-order" = callPackage
@@ -181080,8 +169883,6 @@ self: {
        libraryHaskellDepends = [ base bytestring network unix ];
        description = "Fast, memory-efficient, low-level networking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-carbon" = callPackage
@@ -181095,8 +169896,6 @@ self: {
        ];
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-conduit" = callPackage
@@ -181144,8 +169943,6 @@ self: {
        ];
        description = "A wrapper around a generic stream-like connection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-data" = callPackage
@@ -181196,8 +169993,6 @@ self: {
        ];
        description = "Domain Name System data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-enumerator" = callPackage
@@ -181213,8 +170008,6 @@ self: {
        ];
        description = "Enumerators for network sockets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-fancy" = callPackage
@@ -181237,8 +170030,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hans parsec ];
        description = "HaNS to Network shims for easier HaNS integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-house" = callPackage
@@ -181250,8 +170041,6 @@ self: {
        libraryHaskellDepends = [ array base containers mtl ];
        description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-info" = callPackage
@@ -181276,8 +170065,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ioctl network ];
        description = "Haskell bindings for the ifreq structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-ip" = callPackage
@@ -181359,8 +170146,6 @@ self: {
        ];
        description = "WebSocket backend for MessagePack RPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-metrics" = callPackage
@@ -181396,8 +170181,6 @@ self: {
        ];
        description = "A ByteString based library for writing HTTP(S) servers and clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-msg" = callPackage
@@ -181432,8 +170215,6 @@ self: {
        testHaskellDepends = [ async base bytestring hspec mtl network ];
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-multicast" = callPackage
@@ -181461,8 +170242,6 @@ self: {
        ];
        description = "Haskell bindings for low-level packet sockets (AF_PACKET)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-pgi" = callPackage
@@ -181495,8 +170274,6 @@ self: {
        ];
        description = "Client library for the XMPP protocol";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-rpca" = callPackage
@@ -181514,8 +170291,6 @@ self: {
        ];
        description = "A cross-platform RPC library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-run" = callPackage
@@ -181541,8 +170316,6 @@ self: {
        executableHaskellDepends = [ base network unix ];
        description = "A light abstraction over sockets & co. for servers";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-service" = callPackage
@@ -181558,8 +170331,6 @@ self: {
        ];
        description = "Provide a service at the data type level";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-simple" = callPackage
@@ -181591,8 +170362,6 @@ self: {
        ];
        description = "network-simple for resolved addresses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-simple-tls" = callPackage
@@ -181643,8 +170412,6 @@ self: {
        ];
        description = "Simple interface to TLS secured WebSockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-socket-options" = callPackage
@@ -181656,8 +170423,6 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "Type-safe, portable alternative to getSocketOption/setSocketOption";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-stream" = callPackage
@@ -181674,8 +170439,6 @@ self: {
        ];
        description = "ByteString and Text streams for networking";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-topic-models" = callPackage
@@ -181697,8 +170460,6 @@ self: {
        ];
        description = "A few network topic model implementations for bayes-stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-transport" = callPackage
@@ -181739,8 +170500,6 @@ self: {
        ];
        description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-transport-composed" = callPackage
@@ -181772,8 +170531,6 @@ self: {
        ];
        description = "In-memory instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-transport-tcp" = callPackage
@@ -181793,8 +170550,6 @@ self: {
        ];
        description = "TCP instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-transport-tests" = callPackage
@@ -181900,8 +170655,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "FromJSON and ToJSON Instances for Network.URI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-uri-lenses" = callPackage
@@ -181925,8 +170678,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A small utility to declare type-safe static URIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-voicetext" = callPackage
@@ -181943,8 +170694,6 @@ self: {
        ];
        description = "VoiceText Web API wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-wai-router" = callPackage
@@ -181956,8 +170705,6 @@ self: {
        libraryHaskellDepends = [ base wai ];
        description = "A routing library for wai";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-websocket" = callPackage
@@ -181971,8 +170718,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 network webserver ];
        description = "WebSocket library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "networked-game" = callPackage
@@ -181990,8 +170735,6 @@ self: {
        ];
        description = "Networked-game support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neural" = callPackage
@@ -182024,8 +170767,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Neural Networks in native Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neural-network-base" = callPackage
@@ -182056,8 +170797,6 @@ self: {
        ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neural-network-hmatrix" = callPackage
@@ -182075,8 +170814,6 @@ self: {
        librarySystemDepends = [ blas ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas;};
 
   "neuron" = callPackage
@@ -182166,8 +170903,6 @@ self: {
        ];
        description = "Library implementing the NewHope cryptographic key-exchange protocol";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newports" = callPackage
@@ -182181,8 +170916,6 @@ self: {
        executableHaskellDepends = [ base directory old-time ];
        description = "List ports newer than N days on a FreeBSD system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newsletter" = callPackage
@@ -182211,8 +170944,6 @@ self: {
        ];
        description = "A basic newsletter implimentation, using various backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newsletter-mailgun" = callPackage
@@ -182228,8 +170959,6 @@ self: {
        ];
        description = "A mailgun backend for the newsletter package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newsynth" = callPackage
@@ -182267,8 +170996,6 @@ self: {
        executableHaskellDepends = [ base cmdargs containers mtl ];
        description = "A trivially simple app to create things from simple templates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newtype" = callPackage
@@ -182298,8 +171025,6 @@ self: {
        ];
        description = "Instance derivers for newtype wrappers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newtype-generics" = callPackage
@@ -182334,8 +171059,6 @@ self: {
        ];
        description = "A template haskell deriver to create Control.Newtype instances.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newtype-zoo" = callPackage
@@ -182352,8 +171075,6 @@ self: {
        ];
        description = "Newtype Wrapper Zoo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newtyper" = callPackage
@@ -182377,8 +171098,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A concurrency primitive for a slow consumer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nextstep-plist" = callPackage
@@ -182390,8 +171109,6 @@ self: {
        libraryHaskellDepends = [ base parsec pretty QuickCheck ];
        description = "NextStep style plist parser and printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nf" = callPackage
@@ -182418,8 +171135,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "libnfc bindings";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {nfc = null;};
 
   "ngram" = callPackage
@@ -182459,8 +171174,6 @@ self: {
        executableHaskellDepends = [ base parseargs ];
        description = "Ngrams loader based on http://www.ngrams.info format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ngx-export" = callPackage
@@ -182513,8 +171226,6 @@ self: {
        ];
        description = "More extra tools for Nginx haskell module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "niagra" = callPackage
@@ -182531,8 +171242,6 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck ];
        description = "High performance CSS EDSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nibblestring" = callPackage
@@ -182553,8 +171262,6 @@ self: {
        ];
        description = "Packed, strict nibble arrays with a list interface (ByteString for nibbles)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nice-html" = callPackage
@@ -182578,8 +171285,6 @@ self: {
        ];
        description = "A fast and nice HTML templating library with distinct compilation/rendering phases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nicify" = callPackage
@@ -182626,8 +171331,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nikepub" = callPackage
@@ -182648,8 +171351,6 @@ self: {
        ];
        description = "Command line utility publishes Nike+ runs on blogs and Twitter";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nimber" = callPackage
@@ -182699,8 +171400,6 @@ self: {
        ];
        description = "IDL compiler and RPC/distributed object framework for microservices";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nist-beacon" = callPackage
@@ -182725,8 +171424,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Haskell bindings for Nitro";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "niv" = callPackage
@@ -182782,8 +171479,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convenient utility for distributed Nix builds";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nix-deploy" = callPackage
@@ -182802,8 +171497,6 @@ self: {
        ];
        description = "Deploy Nix-built software to a NixOS machine";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nix-derivation" = callPackage
@@ -182861,8 +171554,6 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Evaluate Haskell expressions using Nix to get packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nix-freeze-tree" = callPackage
@@ -182890,8 +171581,6 @@ self: {
        doHaddock = false;
        description = "Convert a tree of files into fixed-output derivations";
        license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nix-narinfo" = callPackage
@@ -182951,8 +171640,6 @@ self: {
        ];
        description = "Lightweight dependency management with Nix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nix-tools" = callPackage
@@ -182983,8 +171670,6 @@ self: {
        ];
        description = "cabal/stack to nix translation tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nix-tree" = callPackage
@@ -183074,8 +171759,6 @@ self: {
        ];
        description = "Generate nix expressions from npm packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nixos-types" = callPackage
@@ -183111,8 +171794,6 @@ self: {
        ];
        description = "Tool for semi-automatic updating of nixpkgs repository";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nkjp" = callPackage
@@ -183131,8 +171812,6 @@ self: {
        ];
        description = "Manipulating the National Corpus of Polish (NKJP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nlopt-haskell" = callPackage
@@ -183157,8 +171836,6 @@ self: {
        libraryHaskellDepends = [ base containers strict ];
        description = "Scoring functions commonly used for evaluation in NLP and IR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nlp-scores-scripts" = callPackage
@@ -183174,8 +171851,6 @@ self: {
        ];
        description = "NLP scoring command-line programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nm" = callPackage
@@ -183192,8 +171867,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Network Manager, binding to libnm-glib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {g = null; inherit (pkgs) glib; libnm-glib = null; 
          nm-glib = null;};
 
@@ -183250,8 +171923,6 @@ self: {
        ];
        description = "Library to connect to an NNTP Server";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "no-buffering-workaround" = callPackage
@@ -183275,8 +171946,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Role annotations without -XRoleAnnotations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "no-value" = callPackage
@@ -183310,8 +171979,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Math in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nofib-analyse" = callPackage
@@ -183325,8 +171992,6 @@ self: {
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nofib-analyze" = callPackage
@@ -183340,8 +172005,6 @@ self: {
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "noise" = callPackage
@@ -183365,8 +172028,6 @@ self: {
        ];
        description = "A friendly language for graphic design";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "noli" = callPackage
@@ -183407,8 +172068,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Name-binding & alpha-equivalence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nominal" = callPackage
@@ -183618,8 +172277,6 @@ self: {
        testHaskellDepends = [ base checkers QuickCheck ];
        description = "The Zipper for NonEmpty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "non-negative" = callPackage
@@ -183708,8 +172365,6 @@ self: {
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "nonempty structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nonempty-vector" = callPackage
@@ -183844,8 +172499,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Normalization insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "normalize" = callPackage
@@ -183914,8 +172567,6 @@ self: {
        ];
        description = "examples for not-gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "not-in-base" = callPackage
@@ -183940,8 +172591,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Avoiding the C preprocessor via cunning use of Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nothunks" = callPackage
@@ -183960,8 +172609,6 @@ self: {
        ];
        description = "Examine values for unexpected thunks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "notifications-tray-icon" = callPackage
@@ -183987,8 +172634,6 @@ self: {
          transformers tuple
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "notmuch" = callPackage
@@ -184008,8 +172653,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding to Notmuch, the mail indexer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) notmuch; inherit (pkgs) talloc;};
 
   "notmuch-haskell" = callPackage
@@ -184028,8 +172671,6 @@ self: {
        executableSystemDepends = [ notmuch ];
        description = "Binding for notmuch MUA library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) notmuch;};
 
   "notmuch-web" = callPackage
@@ -184067,8 +172708,6 @@ self: {
        ];
        description = "A web interface to the notmuch email indexer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "notzero" = callPackage
@@ -184122,8 +172761,6 @@ self: {
        ];
        description = "Zeit Now haskell-side integration and introspection tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nowdoc" = callPackage
@@ -184151,8 +172788,6 @@ self: {
        libraryHaskellDepends = [ base containers numeric-prelude primes ];
        description = "NumericPrelude extras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "np-linear" = callPackage
@@ -184168,8 +172803,6 @@ self: {
        ];
        description = "Linear algebra for the numeric-prelude framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nptools" = callPackage
@@ -184188,8 +172821,6 @@ self: {
        ];
        description = "A collection of random tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nqe" = callPackage
@@ -184224,8 +172855,6 @@ self: {
        ];
        description = "Read environment variables as settings to build 12-factor apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nri-prelude" = callPackage
@@ -184253,8 +172882,6 @@ self: {
        ];
        description = "A Prelude inspired by the Elm programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nsis" = callPackage
@@ -184337,8 +172964,6 @@ self: {
        ];
        description = "Client library for NTP control messaging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ntrip-client" = callPackage
@@ -184363,8 +172988,6 @@ self: {
        ];
        description = "NTRIP client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ntype" = callPackage
@@ -184405,8 +173028,6 @@ self: {
        ];
        description = "HTML5 Canvas Graphics Library - forked Blank Canvas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nullary" = callPackage
@@ -184418,8 +173039,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A package for working with nullary type classes";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nullpipe" = callPackage
@@ -184432,8 +173051,6 @@ self: {
        testHaskellDepends = [ base hspec pipes ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "num-non-negative" = callPackage
@@ -184549,8 +173166,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numerals-base" = callPackage
@@ -184572,8 +173187,6 @@ self: {
        ];
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numeric-domains" = callPackage
@@ -184635,8 +173248,6 @@ self: {
        ];
        description = "Ode solvers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numeric-prelude" = callPackage
@@ -184673,8 +173284,6 @@ self: {
        doCheck = false;
        description = "Quasi-quoters for numbers of different bases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numeric-quest" = callPackage
@@ -184701,8 +173310,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "A framework for numeric ranges";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numeric-tools" = callPackage
@@ -184736,8 +173343,6 @@ self: {
        ];
        description = "core package for Numerical Haskell project";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numericpeano" = callPackage
@@ -184780,8 +173385,6 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "n-dimensional arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-free" = callPackage
@@ -184798,8 +173401,6 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-hedgehog" = callPackage
@@ -184816,8 +173417,6 @@ self: {
        testHaskellDepends = [ base hedgehog numhask numhask-prelude ];
        description = "Laws and tests for numhask";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-histogram" = callPackage
@@ -184834,8 +173433,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-prelude" = callPackage
@@ -184848,8 +173445,6 @@ self: {
        testHaskellDepends = [ doctest ];
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-range" = callPackage
@@ -184870,8 +173465,6 @@ self: {
        ];
        description = "Numbers that are range representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-space" = callPackage
@@ -184889,8 +173482,6 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "numerical spaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-test" = callPackage
@@ -184907,8 +173498,6 @@ self: {
        testHaskellDepends = [ base numhask-prelude QuickCheck tasty ];
        description = "Laws and tests for numhask";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nums" = callPackage
@@ -185033,8 +173622,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nvim-hs-contrib" = callPackage
@@ -185058,8 +173645,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nvim-hs-ghcid" = callPackage
@@ -185080,8 +173665,6 @@ self: {
        executableHaskellDepends = [ base nvim-hs ];
        description = "Neovim plugin that runs ghcid to update the quickfix list";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nvvm" = callPackage
@@ -185132,8 +173715,6 @@ self: {
        ];
        description = "Client for the Nylas API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nymphaea" = callPackage
@@ -185152,8 +173733,6 @@ self: {
        ];
        description = "An interactive GUI for manipulating L-systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nyx-game" = callPackage
@@ -185225,8 +173804,6 @@ self: {
        ];
        description = "Client to the OANDA REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oasis-xrd" = callPackage
@@ -185249,8 +173826,6 @@ self: {
        ];
        description = "Extensible Resource Descriptor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oauth10a" = callPackage
@@ -185295,8 +173870,6 @@ self: {
        ];
        description = "OAuth2 jwt-bearer client flow as per rfc7523";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oauthenticated" = callPackage
@@ -185322,8 +173895,6 @@ self: {
        ];
        description = "Simple OAuth for http-client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "obd" = callPackage
@@ -185348,8 +173919,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Communicate to OBD interfaces over ELM327";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "obdd" = callPackage
@@ -185366,8 +173935,6 @@ self: {
        testHaskellDepends = [ array base containers text ];
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oberon0" = callPackage
@@ -185387,8 +173954,6 @@ self: {
        doHaddock = false;
        description = "Oberon0 Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "obj" = callPackage
@@ -185408,8 +173973,6 @@ self: {
        ];
        description = "Reads and writes obj models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "objectid" = callPackage
@@ -185430,8 +173993,6 @@ self: {
        ];
        description = "Rather unique identifier for things that need to be stored";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "objective" = callPackage
@@ -185450,8 +174011,6 @@ self: {
        ];
        description = "Composable objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oblivious-transfer" = callPackage
@@ -185524,8 +174083,6 @@ self: {
        ];
        description = "Convert Haskell types in OCaml types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ocap-io" = callPackage
@@ -185556,8 +174113,6 @@ self: {
        ];
        description = "Owned channels in the Ownership Monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ochintin-daicho" = callPackage
@@ -185598,8 +174153,6 @@ self: {
        ];
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "octohat" = callPackage
@@ -185630,8 +174183,6 @@ self: {
        ];
        description = "A tested, minimal wrapper around GitHub's API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "octopus" = callPackage
@@ -185652,8 +174203,6 @@ self: {
        ];
        description = "Lisp with more dynamism, more power, more simplicity";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oculus" = callPackage
@@ -185670,8 +174219,6 @@ self: {
        librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ];
        description = "Oculus Rift ffi providing head tracking data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXinerama; ovr = null; 
          inherit (pkgs) systemd;};
@@ -185702,8 +174249,6 @@ self: {
        benchmarkHaskellDepends = [ async base text weigh ];
        description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) unixODBC;};
 
   "odd-jobs" = callPackage
@@ -185755,8 +174300,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A full-featured PostgreSQL-backed job queue (with an admin UI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oden-go-packages" = callPackage
@@ -185772,8 +174315,6 @@ self: {
        ];
        description = "Provides Go package metadata";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "odpic-raw" = callPackage
@@ -185830,8 +174371,6 @@ self: {
        ];
        description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "off-simple" = callPackage
@@ -185843,8 +174382,6 @@ self: {
        libraryHaskellDepends = [ base parsec3 vector ];
        description = "A parser for simplified-syntax OFF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ofx" = callPackage
@@ -185875,8 +174412,6 @@ self: {
        ];
        description = "A lightweight markup language for story writers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ohloh-hs" = callPackage
@@ -185900,8 +174435,6 @@ self: {
        ];
        description = "Interface to the Ohloh API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oi" = callPackage
@@ -185918,8 +174451,6 @@ self: {
        executableHaskellDepends = [ base directory filepath parallel ];
        description = "Library for purely functional lazy interactions with the outer world";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oidc-client" = callPackage
@@ -185945,8 +174476,6 @@ self: {
        ];
        description = "OpenID Connect 1.0 library for RP";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ois-input-manager" = callPackage
@@ -185959,8 +174488,6 @@ self: {
        librarySystemDepends = [ OIS ];
        description = "wrapper for OIS input manager for use with hogre";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OIS = null;};
 
   "old-locale" = callPackage
@@ -186024,8 +174551,6 @@ self: {
        ];
        description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "om-actor" = callPackage
@@ -186037,8 +174562,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Actor pattern utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "om-elm" = callPackage
@@ -186056,8 +174579,6 @@ self: {
        ];
        description = "Haskell utilities for building embedded Elm programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "om-fail" = callPackage
@@ -186072,8 +174593,6 @@ self: {
        ];
        description = "Monad transformer providing MonadFail";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "om-http-logging" = callPackage
@@ -186089,8 +174608,6 @@ self: {
        ];
        description = "om-http-logging";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "omaketex" = callPackage
@@ -186108,8 +174625,6 @@ self: {
        ];
        description = "A simple tool to generate OMakefile for latex files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ombra" = callPackage
@@ -186129,8 +174644,6 @@ self: {
        ];
        description = "Render engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "omega" = callPackage
@@ -186149,8 +174662,6 @@ self: {
        ];
        description = "A purely functional programming language and a proof system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "omnicodec" = callPackage
@@ -186196,8 +174707,6 @@ self: {
        ];
        description = "A pretty-printer wrapper to faciliate ease of formatting during development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "on-a-horse" = callPackage
@@ -186216,8 +174725,6 @@ self: {
        ];
        description = "\"Haskell on a Horse\" - A combinatorial web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "on-demand-ssh-tunnel" = callPackage
@@ -186238,8 +174745,6 @@ self: {
        ];
        description = "Program that sends traffic through SSH tunnels on-demand";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "onama" = callPackage
@@ -186251,8 +174756,6 @@ self: {
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "HTML-parsing primitives for Parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "once" = callPackage
@@ -186356,8 +174859,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A never-empty list type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "online" = callPackage
@@ -186378,8 +174879,6 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "online-csv" = callPackage
@@ -186398,8 +174897,6 @@ self: {
        testHaskellDepends = [ base doctest numhask-prelude ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "only" = callPackage
@@ -186424,8 +174921,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "partition lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "onu-course" = callPackage
@@ -186437,8 +174932,6 @@ self: {
        libraryHaskellDepends = [ base smallcheck ];
        description = "Code for the Haskell course taught at the Odessa National University in 2012";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oo-prototypes" = callPackage
@@ -186462,8 +174955,6 @@ self: {
        testHaskellDepends = [ base containers doctest ];
        description = "Common operators encouraging large-scale easy reading";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opaleye" = callPackage
@@ -186512,8 +175003,6 @@ self: {
        ];
        description = "Opaleye wrapped up in classy MTL attire";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opaleye-sqlite" = callPackage
@@ -186538,8 +175027,6 @@ self: {
        ];
        description = "An SQL-generating DSL targeting SQLite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opaleye-trans" = callPackage
@@ -186576,8 +175063,6 @@ self: {
        ];
        description = "Open algebraic data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "open-adt-tutorial" = callPackage
@@ -186597,8 +175082,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Open algebraic data type examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "open-browser" = callPackage
@@ -186626,8 +175109,6 @@ self: {
        executableHaskellDepends = [ base basic-prelude text turtle ];
        description = "Open haddock HTML documentation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "open-pandoc" = callPackage
@@ -186650,8 +175131,6 @@ self: {
        ];
        description = "Conversion between markup formats";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "open-signals" = callPackage
@@ -186664,8 +175143,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A mechanism similar to checked exceptions that integrates with MTL and transformer stacks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "open-symbology" = callPackage
@@ -186693,8 +175170,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "open-union" = callPackage
@@ -186726,8 +175201,6 @@ self: {
        testHaskellDepends = [ base mtl tasty tasty-hunit witness ];
        description = "open witnesses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "openapi-petstore" = callPackage
@@ -186755,8 +175228,6 @@ self: {
        ];
        description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "openapi-typed" = callPackage
@@ -186776,8 +175247,6 @@ self: {
        ];
        description = "Types for OpenAPI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "openapi3" = callPackage
@@ -186860,8 +175329,6 @@ self: {
        libraryHaskellDepends = [ aeson base data-default text time ];
        description = "A Haskell implementation of the Swiss Meteo Net data API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opencog-atomspace" = callPackage
@@ -186942,8 +175409,6 @@ self: {
        libraryPkgconfigDepends = [ opencv ];
        description = "Raw Haskell bindings to OpenCV >= 2.0";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) opencv;};
 
   "opendatatable" = callPackage
@@ -186955,8 +175420,6 @@ self: {
        libraryHaskellDepends = [ base hxt template-haskell th-lift ];
        description = "A library for working with Open Data Tables";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "openexchangerates" = callPackage
@@ -187063,8 +175526,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Functional interface for OpenGL 4.1+ and OpenGL ES 2.0+";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {EGL = null; GLESv2 = null;};
 
   "openid" = callPackage
@@ -187108,8 +175569,6 @@ self: {
        ];
        description = "An OpenID Connect library that does all the heavy lifting for you";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "openpgp" = callPackage
@@ -187217,8 +175676,6 @@ self: {
        ];
        description = "Haskell OpenSoundControl utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opensource" = callPackage
@@ -187260,8 +175717,6 @@ self: {
        ];
        description = "Fetch OpenSSH keys from a GitHub team";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "openssh-protocol" = callPackage
@@ -187278,8 +175733,6 @@ self: {
        testHaskellDepends = [ base cereal hedgehog time ];
        description = "Haskell implementation of openssh protocol primitives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "openssl-createkey" = callPackage
@@ -187360,8 +175813,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [ base gauge opentelemetry ];
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opentelemetry-http-client" = callPackage
@@ -187375,8 +175826,6 @@ self: {
          base http-client http-types opentelemetry text
        ];
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opentelemetry-lightstep" = callPackage
@@ -187403,8 +175852,6 @@ self: {
          splitmix text typed-process unordered-containers
        ];
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opentelemetry-wai" = callPackage
@@ -187419,8 +175866,6 @@ self: {
          base bytestring http-types opentelemetry text wai
        ];
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opentheory" = callPackage
@@ -187487,8 +175932,6 @@ self: {
        ];
        description = "Unicode characters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opentheory-divides" = callPackage
@@ -187654,8 +176097,6 @@ self: {
        ];
        description = "An OpenTok SDK for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opentype" = callPackage
@@ -187673,8 +176114,6 @@ self: {
        ];
        description = "Opentype loading and writing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "openweathermap" = callPackage
@@ -187697,8 +176136,6 @@ self: {
        ];
        description = "Access data at OpenWeatherMap";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "operate-do" = callPackage
@@ -187715,8 +176152,6 @@ self: {
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "operational" = callPackage
@@ -187769,8 +176204,6 @@ self: {
        ];
        description = "Interpretation functions and simple instruction sets for operational";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oplang" = callPackage
@@ -187789,8 +176222,6 @@ self: {
        ];
        description = "Compiler for OpLang, an esoteric programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opml" = callPackage
@@ -187830,8 +176261,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opn" = callPackage
@@ -187850,8 +176279,6 @@ self: {
        ];
        description = "Open files or URLs using associated programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optics" = callPackage
@@ -187963,8 +176390,6 @@ self: {
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optima-for-hasql" = callPackage
@@ -187980,8 +176405,6 @@ self: {
        ];
        description = "Command-line arguments parsing for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optimal-blocks" = callPackage
@@ -188006,8 +176429,6 @@ self: {
        ];
        description = "Optimal Block boundary determination for rsync-like behaviours";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optimization" = callPackage
@@ -188023,8 +176444,6 @@ self: {
        ];
        description = "Numerical optimization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optimusprime" = callPackage
@@ -188043,8 +176462,6 @@ self: {
        ];
        description = "A supercompiler for f-lite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "option" = callPackage
@@ -188070,8 +176487,6 @@ self: {
        ];
        description = "Using type-classes for optional function arguments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optional-args" = callPackage
@@ -188113,8 +176528,6 @@ self: {
        testHaskellDepends = [ base chell options time ];
        description = "Command-line option types for dates and times";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optparse-applicative" = callPackage
@@ -188166,8 +176579,6 @@ self: {
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optparse-declarative" = callPackage
@@ -188193,8 +176604,6 @@ self: {
        ];
        description = "An enum-text based toolkit for optparse-applicative";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optparse-generic" = callPackage
@@ -188241,8 +176650,6 @@ self: {
        libraryHaskellDepends = [ base optparse-applicative ];
        description = "Helper functions for optparse-applicative";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optparse-simple" = callPackage
@@ -188321,8 +176728,6 @@ self: {
        ];
        description = "Orchestration-style co-ordination EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orchestrate" = callPackage
@@ -188346,8 +176751,6 @@ self: {
        ];
        description = "An API client for http://orchestrate.io/.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orchid" = callPackage
@@ -188368,8 +176771,6 @@ self: {
        ];
        description = "Haskell Wiki Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orchid-demo" = callPackage
@@ -188389,8 +176790,6 @@ self: {
        ];
        description = "Haskell Wiki Demo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ord-adhoc" = callPackage
@@ -188418,8 +176817,6 @@ self: {
        ];
        description = "Algorithms for the order maintenance problem with a safe interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "order-statistic-tree" = callPackage
@@ -188452,8 +176849,6 @@ self: {
        ];
        description = "L-Estimators for robust statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ordered" = callPackage
@@ -188501,8 +176896,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "basic orders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ordinal" = callPackage
@@ -188534,8 +176927,6 @@ self: {
        testHaskellDepends = [ base directory process split ];
        description = "Push-pull implementation of discrete-time FRP";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oref" = callPackage
@@ -188550,8 +176941,6 @@ self: {
        testHaskellDepends = [ base containers either mtl transformers ];
        description = "Owned references in the Ownership Monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "org-mode" = callPackage
@@ -188609,8 +176998,6 @@ self: {
        executableHaskellDepends = [ attoparsec base text ];
        description = "Organize scala imports";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orgmode" = callPackage
@@ -188630,8 +177017,6 @@ self: {
        ];
        description = "Org Mode library for haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orgmode-parse" = callPackage
@@ -188705,8 +177090,6 @@ self: {
        ];
        description = "An un-SYB framework for transforming heterogenous data through folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orion-hs" = callPackage
@@ -188747,8 +177130,6 @@ self: {
        testHaskellDepends = [ base hspec jwt mtl time ];
        description = "Token-based authentication and authorization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ormolu" = callPackage
@@ -188796,8 +177177,6 @@ self: {
        ];
        description = "Multidimensional arrays inspired by APL";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "os-release" = callPackage
@@ -188833,8 +177212,6 @@ self: {
        ];
        description = "A library to handle messages in the OSC protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oscpacking" = callPackage
@@ -188846,8 +177223,6 @@ self: {
        libraryHaskellDepends = [ base colour gloss random ];
        description = "Implements an osculatory packing (kissing circles) algorithm and display";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "osdkeys" = callPackage
@@ -188883,8 +177258,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "An insertion-order-preserving set";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "osm-conduit" = callPackage
@@ -188904,8 +177277,6 @@ self: {
        ];
        description = "Parse and operate on OSM data in efficient way";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "osm-download" = callPackage
@@ -188927,8 +177298,6 @@ self: {
        ];
        description = "Download Open Street Map tiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oso2pdf" = callPackage
@@ -188947,8 +177316,6 @@ self: {
        ];
        description = "Better conversion of Oxford Scholarship Online material to PDF";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "osx-ar" = callPackage
@@ -188961,8 +177328,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for OS X static archive format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ot" = callPackage
@@ -188983,8 +177348,6 @@ self: {
        ];
        description = "Real-time collaborative editing with Operational Transformation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "otp-authenticator" = callPackage
@@ -189010,8 +177373,6 @@ self: {
        ];
        description = "OTP Authenticator (a la google) command line client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ottparse-pretty" = callPackage
@@ -189029,8 +177390,6 @@ self: {
        ];
        description = "Pretty-printer for Ott parse trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "outsort" = callPackage
@@ -189081,8 +177440,6 @@ self: {
        ];
        description = "Finite overloading";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "overloaded" = callPackage
@@ -189109,8 +177466,6 @@ self: {
        doHaddock = false;
        description = "Overloaded pragmas as a plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "overloaded-records" = callPackage
@@ -189132,8 +177487,6 @@ self: {
        ];
        description = "Overloaded Records based on current GHC proposal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "overture" = callPackage
@@ -189147,8 +177500,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "An alternative to some of the Prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pack" = callPackage
@@ -189164,8 +177515,6 @@ self: {
        ];
        description = "Bidirectional fast ByteString packer/unpacker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "package-description-remote" = callPackage
@@ -189180,8 +177529,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Fetches a 'GenericPackageDescription' from Hackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "package-o-tron" = callPackage
@@ -189200,8 +177547,6 @@ self: {
        ];
        description = "Utilities for working with cabal packages and your package database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "package-vt" = callPackage
@@ -189217,8 +177562,6 @@ self: {
        ];
        description = "Haskell Package Versioning Tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packcheck" = callPackage
@@ -189256,8 +177599,6 @@ self: {
        ];
        description = "Check your cabal packages for lagging dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packed" = callPackage
@@ -189274,8 +177615,6 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packed-dawg" = callPackage
@@ -189303,8 +177642,6 @@ self: {
        ];
        description = "Generation and traversal of highly compressed directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packed-multikey-map" = callPackage
@@ -189323,8 +177660,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Efficient “spreadsheet table” like maps with multiple marginals";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packedstring" = callPackage
@@ -189338,8 +177673,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "(Deprecated) Packed Strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packer" = callPackage
@@ -189374,8 +177707,6 @@ self: {
        ];
        description = "MessagePack Serialization an Deserialization for Packer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packman" = callPackage
@@ -189395,8 +177726,6 @@ self: {
        ];
        description = "Serialization library for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packunused" = callPackage
@@ -189417,8 +177746,6 @@ self: {
        ];
        description = "Tool for detecting redundant Cabal package dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pacman-memcache" = callPackage
@@ -189432,8 +177759,6 @@ self: {
        executableHaskellDepends = [ base deepseq directory-tree ];
        description = "Read whole Pacman database which pushes it into the memory cache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "padKONTROL" = callPackage
@@ -189449,8 +177774,6 @@ self: {
        ];
        description = "Controlling padKONTROL native mode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pads-haskell" = callPackage
@@ -189478,8 +177801,6 @@ self: {
        ];
        description = "PADS data description language for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pagarme" = callPackage
@@ -189498,8 +177819,6 @@ self: {
        executableHaskellDepends = [ base text wreq ];
        description = "Pagarme API wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pager" = callPackage
@@ -189592,8 +177911,6 @@ self: {
        ];
        description = "Receive hooks from pagure and do things with them";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paint" = callPackage
@@ -189679,8 +177996,6 @@ self: {
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {pam = null;};
 
   "pan-os-syslog" = callPackage
@@ -189698,8 +178013,6 @@ self: {
        benchmarkHaskellDepends = [ base byteslice gauge primitive ];
        description = "Parse syslog traffic from PAN-OS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "panda" = callPackage
@@ -189720,8 +178033,6 @@ self: {
        ];
        description = "A simple static blog engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc" = callPackage
@@ -189882,8 +178193,6 @@ self: {
        executableHaskellDepends = [ base csv pandoc pandoc-types ];
        description = "Convert CSV to Pandoc Table Markdown";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-dhall-decoder" = callPackage
@@ -189920,8 +178229,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A Pandoc filter for emphasizing code in fenced blocks";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-filter-graphviz" = callPackage
@@ -189941,8 +178248,6 @@ self: {
        ];
        description = "A Pandoc filter to use graphviz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-highlighting-extensions" = callPackage
@@ -189979,8 +178284,6 @@ self: {
        doHaddock = false;
        description = "Include other Markdown files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-include-code" = callPackage
@@ -190005,8 +178308,6 @@ self: {
        ];
        description = "A Pandoc filter for including code from source files";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-japanese-filters" = callPackage
@@ -190026,8 +178327,6 @@ self: {
        ];
        description = "Japanese-specific markup filters for pandoc";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-lens" = callPackage
@@ -190039,8 +178338,6 @@ self: {
        libraryHaskellDepends = [ base containers lens pandoc-types text ];
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-markdown-ghci-filter" = callPackage
@@ -190066,8 +178363,6 @@ self: {
        ];
        description = "Pandoc-filter to evaluate `code` section in markdown and auto-embed output";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-placetable" = callPackage
@@ -190089,8 +178384,6 @@ self: {
        ];
        description = "Pandoc filter to include CSV files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-plantuml-diagrams" = callPackage
@@ -190114,8 +178407,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Render and insert PlantUML diagrams with Pandoc";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-plot" = callPackage
@@ -190150,8 +178441,6 @@ self: {
        ];
        description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
        license = stdenv.lib.licenses.gpl2Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-pyplot" = callPackage
@@ -190182,8 +178471,6 @@ self: {
        ];
        description = "A Pandoc filter to include figures generated from Python code blocks";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-sidenote" = callPackage
@@ -190198,8 +178485,6 @@ self: {
        executableHaskellDepends = [ base pandoc-types ];
        description = "Convert Pandoc Markdown-style footnotes into sidenotes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-stylefrommeta" = callPackage
@@ -190264,8 +178549,6 @@ self: {
        executableHaskellDepends = [ base pandoc ];
        description = "Literate Haskell support for GitHub's Markdown flavor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-utils" = callPackage
@@ -190283,8 +178566,6 @@ self: {
        ];
        description = "Utility functions to work with Pandoc in Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-vimhl" = callPackage
@@ -190332,8 +178613,6 @@ self: {
        ];
        description = "A super-pang clone";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pango" = callPackage
@@ -190370,8 +178649,6 @@ self: {
        testHaskellDepends = [ base bytestring containers HUnit ];
        description = "A set of parsers for graph languages and conversions to graph libaries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "panhandle" = callPackage
@@ -190427,8 +178704,6 @@ self: {
        ];
        description = "Pandoc filter to execute code blocks";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pansite" = callPackage
@@ -190457,8 +178732,6 @@ self: {
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
        description = "Pansite: a simple web site management tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pantry_0_2_0_0" = callPackage
@@ -190649,8 +178922,6 @@ self: {
        ];
        description = "Content addressable Haskell package management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa" = callPackage
@@ -190674,8 +178945,6 @@ self: {
        ];
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-base" = callPackage
@@ -190689,8 +178958,6 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-base-export" = callPackage
@@ -190702,8 +178969,6 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-base-implement" = callPackage
@@ -190715,8 +178980,6 @@ self: {
        libraryHaskellDepends = [ base papa-base-export semigroups ];
        description = "Useful base functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-bifunctors" = callPackage
@@ -190776,8 +179039,6 @@ self: {
        ];
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-implement" = callPackage
@@ -190799,8 +179060,6 @@ self: {
        ];
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-include" = callPackage
@@ -190817,8 +179076,6 @@ self: {
        ];
        description = "Third party libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-lens" = callPackage
@@ -190870,8 +179127,6 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-prelude-core" = callPackage
@@ -190888,8 +179143,6 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-prelude-lens" = callPackage
@@ -190906,8 +179159,6 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-prelude-semigroupoids" = callPackage
@@ -190924,8 +179175,6 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-prelude-semigroups" = callPackage
@@ -190942,8 +179191,6 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-semigroupoids" = callPackage
@@ -190959,8 +179206,6 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-semigroupoids-export" = callPackage
@@ -190983,8 +179228,6 @@ self: {
        libraryHaskellDepends = [ base semigroupoids semigroups ];
        description = "useful `semigroupoids` functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-x" = callPackage
@@ -191031,8 +179274,6 @@ self: {
        executableHaskellDepends = [ base bytestring containers ];
        description = "A passphrase generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papillon" = callPackage
@@ -191066,8 +179307,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Packrat parsing; linear-time parsers for grammars in TDPL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paprika" = callPackage
@@ -191090,8 +179329,6 @@ self: {
        ];
        description = "The Haskell library and examples for the kids programming robot paprika";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "par-dual" = callPackage
@@ -191108,8 +179345,6 @@ self: {
        ];
        description = "ParDual class for Parallel <-> Sequential";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "par-traverse" = callPackage
@@ -191159,8 +179394,6 @@ self: {
        executableToolDepends = [ alex ];
        description = "Paragon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parallel_3_2_0_3" = callPackage
@@ -191218,8 +179451,6 @@ self: {
          transformers vector vector-algorithms
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parallel-tree-search" = callPackage
@@ -191231,8 +179462,6 @@ self: {
        libraryHaskellDepends = [ base parallel tree-monad ];
        description = "Parallel Tree Search";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parameterized" = callPackage
@@ -191245,8 +179474,6 @@ self: {
        testHaskellDepends = [ base data-diverse hspec transformers ];
        description = "Parameterized/indexed monoids and monads using only a single parameter type variable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parameterized-data" = callPackage
@@ -191280,8 +179507,6 @@ self: {
        ];
        description = "Classes and data structures for working with data-kind indexed types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paramtree" = callPackage
@@ -191325,8 +179550,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "http proxy server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parco" = callPackage
@@ -191338,8 +179561,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised parser combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parco-attoparsec" = callPackage
@@ -191351,8 +179572,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base mtl parco ];
        description = "Generalised parser combinators - Attoparsec interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parco-parsec" = callPackage
@@ -191364,8 +179583,6 @@ self: {
        libraryHaskellDepends = [ base mtl parco parsec ];
        description = "Generalised parser combinators - Parsec interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parcom-lib" = callPackage
@@ -191381,8 +179598,6 @@ self: {
        ];
        description = "A simple parser-combinator library, a bit like Parsec but without the frills";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parconc-examples" = callPackage
@@ -191411,8 +179626,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pareto" = callPackage
@@ -191424,8 +179637,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for cause-effect relationships";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paripari" = callPackage
@@ -191485,8 +179696,6 @@ self: {
        ];
        description = "Streaming Parquet reader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parse-dimacs" = callPackage
@@ -191534,8 +179743,6 @@ self: {
        testHaskellDepends = [ cmdargs ];
        description = "generate command line arguments from a --help output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parseargs" = callPackage
@@ -191551,8 +179758,6 @@ self: {
        testHaskellDepends = [ base process ];
        description = "Parse command-line arguments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsec_3_1_14_0" = callPackage
@@ -191609,8 +179814,6 @@ self: {
        ];
        description = "Parsec API encoded as a deeply-embedded DSL, for debugging and analysis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsec-numbers" = callPackage
@@ -191654,8 +179857,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Parsing instances for Parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsec-permutation" = callPackage
@@ -191682,8 +179883,6 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec pretty ];
        description = "Pratt Parser combinator for Parsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsec-tagsoup" = callPackage
@@ -191728,8 +179927,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Portable monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsec2" = callPackage
@@ -191741,8 +179938,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsec3" = callPackage
@@ -191754,8 +179949,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl text ];
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsec3-numbers" = callPackage
@@ -191790,8 +179983,6 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Adds and Eq instance for Parsec's ParseError if needed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsek" = callPackage
@@ -191803,8 +179994,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Parallel Parsing Processes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsely" = callPackage
@@ -191815,8 +180004,6 @@ self: {
        sha256 = "16sg32qs1kq184wk6d83z20b9firh1kjmysqwd2aqaiyq37zjyyb";
        libraryHaskellDepends = [ base mtl parsec ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parser-combinators" = callPackage
@@ -191850,8 +180037,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Test suite of parser-combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parser-helper" = callPackage
@@ -191867,8 +180052,6 @@ self: {
        ];
        description = "Prints Haskell parse trees in JSON";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parser241" = callPackage
@@ -191883,8 +180066,6 @@ self: {
        testHaskellDepends = [ base containers hspec mtl ];
        description = "An interface to create production rules using augmented grammars";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsergen" = callPackage
@@ -191906,8 +180087,6 @@ self: {
        ];
        description = "TH parser generator for splitting bytestring into fixed-width fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsers" = callPackage
@@ -191969,8 +180148,6 @@ self: {
        ];
        description = "NMR-STAR file format parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsimony" = callPackage
@@ -191982,8 +180159,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        description = "Monadic parser combinators derived from Parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsix" = callPackage
@@ -192022,8 +180197,6 @@ self: {
        testHaskellDepends = [ base containers HUnit tasty tasty-hunit ];
        description = "Parsing factorized";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "partial" = callPackage
@@ -192072,8 +180245,6 @@ self: {
        ];
        description = "Haskell 98 Partial Lenses";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "partial-order" = callPackage
@@ -192102,8 +180273,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell transformers ];
        description = "Template haskell utilities for constructing records with default values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "partial-semigroup" = callPackage
@@ -192116,8 +180285,6 @@ self: {
        testHaskellDepends = [ base doctest hedgehog ];
        description = "A partial binary associative operator";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "partial-semigroup-hedgehog" = callPackage
@@ -192129,8 +180296,6 @@ self: {
        libraryHaskellDepends = [ base hedgehog partial-semigroup ];
        description = "Property testing for partial semigroups using Hedgehog";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "partial-semigroup-test" = callPackage
@@ -192143,8 +180308,6 @@ self: {
        doHaddock = false;
        description = "Testing utilities for the partial-semigroup package";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "partial-uri" = callPackage
@@ -192179,8 +180342,6 @@ self: {
        ];
        description = "Inspect, create, and alter MBRs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "passage" = callPackage
@@ -192199,8 +180360,6 @@ self: {
        ];
        description = "Parallel code generation for hierarchical Bayesian modeling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "passman" = callPackage
@@ -192227,8 +180386,6 @@ self: {
        ];
        description = "a simple password manager";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "passman-cli" = callPackage
@@ -192335,8 +180492,6 @@ self: {
        libraryHaskellDepends = [ base containers MonadRandom random ];
        description = "Password generation/validation library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pasta" = callPackage
@@ -192353,8 +180508,6 @@ self: {
        testHaskellDepends = [ base hspec microlens protolude ];
        description = "PostgreSQL Abstract Syntax Tree Assember";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pastis" = callPackage
@@ -192366,8 +180519,6 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Interface to the past.is URL shortening service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pasty" = callPackage
@@ -192381,8 +180532,6 @@ self: {
        executableHaskellDepends = [ base bytestring mtl ];
        description = "A simple command line pasting utility";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "patat" = callPackage
@@ -192411,8 +180560,6 @@ self: {
        ];
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "patch" = callPackage
@@ -192489,8 +180636,6 @@ self: {
        ];
        description = "Patches (diffs) on vectors: composable, mergeable, and invertible";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "path" = callPackage
@@ -192647,8 +180792,6 @@ self: {
        ];
        description = "Read and write UTF-8 text files";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "path-utils" = callPackage
@@ -192689,8 +180832,6 @@ self: {
        ];
        description = "A toy pathfinding library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pathological-bytestrings" = callPackage
@@ -192789,8 +180930,6 @@ self: {
        executableHaskellDepends = [ base HandsomeSoup hxt ];
        description = "A webpage scraper for Patreon which dumps a list of patrons to a text file";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pattern-arrows" = callPackage
@@ -192838,8 +180977,6 @@ self: {
        ];
        description = "Pattern tries";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "patterns" = callPackage
@@ -192856,8 +180993,6 @@ self: {
        ];
        description = "Common patterns in message-oriented applications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pava" = callPackage
@@ -192910,8 +181045,6 @@ self: {
        ];
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paypal-api" = callPackage
@@ -192928,8 +181061,6 @@ self: {
        ];
        description = "PayPal API, currently supporting \"ButtonManager\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paypal-rest-client" = callPackage
@@ -192946,8 +181077,6 @@ self: {
        ];
        description = "A client to connect to PayPal's REST API (v1)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pb" = callPackage
@@ -192963,8 +181092,6 @@ self: {
        ];
        description = "pastebin command line application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pb-next" = callPackage
@@ -192984,8 +181111,6 @@ self: {
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Utility CLI for working with protobuf files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pbc4hs" = callPackage
@@ -192997,8 +181122,6 @@ self: {
        libraryHaskellDepends = [ base hslua string-qq ];
        description = "pbc for HsLua";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pbkdf" = callPackage
@@ -193055,8 +181178,6 @@ self: {
        ];
        description = "Convert a pcap into an enumerator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pcapng" = callPackage
@@ -193086,8 +181207,6 @@ self: {
          text unliftio-core validity
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pcd-loader" = callPackage
@@ -193112,8 +181231,6 @@ self: {
        ];
        description = "PCD file loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pcf" = callPackage
@@ -193131,8 +181248,6 @@ self: {
        ];
        description = "A one file compiler for PCF";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pcf-font" = callPackage
@@ -193147,8 +181262,6 @@ self: {
        ];
        description = "PCF font parsing and rendering library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pcf-font-embed" = callPackage
@@ -193164,8 +181277,6 @@ self: {
        ];
        description = "Template Haskell for embedding text rendered using PCF fonts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pcg-random" = callPackage
@@ -193252,8 +181363,6 @@ self: {
        libraryHaskellDepends = [ base bytestring pcre-light ];
        description = "pcre-light extra functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pcre-utils" = callPackage
@@ -193295,8 +181404,6 @@ self: {
        ];
        description = "Tool to generate PDF from haskintex templates and YAML input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdf-slave-server" = callPackage
@@ -193347,8 +181454,6 @@ self: {
        ];
        description = "Template format definition for pdf-slave tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdf-toolbox-content" = callPackage
@@ -193365,8 +181470,6 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdf-toolbox-core" = callPackage
@@ -193383,8 +181486,6 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdf-toolbox-document" = callPackage
@@ -193403,8 +181504,6 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdf-toolbox-viewer" = callPackage
@@ -193425,8 +181524,6 @@ self: {
        ];
        description = "Simple pdf viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdf2line" = callPackage
@@ -193476,8 +181573,6 @@ self: {
        ];
        description = "Name a PDF file using information from the pdfinfo command";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdfsplit" = callPackage
@@ -193493,8 +181588,6 @@ self: {
        ];
        description = "split two-column PDFs, so there is one column per page";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdftotext" = callPackage
@@ -193516,8 +181609,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Extracts text from PDF using poppler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {poppler-cpp = null;};
 
   "pdynload" = callPackage
@@ -193534,8 +181625,6 @@ self: {
        ];
        description = "pdynload is polymorphic dynamic linking library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peakachu" = callPackage
@@ -193551,8 +181640,6 @@ self: {
        ];
        description = "Experiemental library for composable interactive programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peano" = callPackage
@@ -193602,8 +181689,6 @@ self: {
        ];
        description = "pec embedded compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pecoff" = callPackage
@@ -193616,8 +181701,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for PE/COFF format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pedersen-commitment" = callPackage
@@ -193651,8 +181734,6 @@ self: {
        libraryHaskellDepends = [ array base binary containers ];
        description = "A pedestrian implementation of directed acyclic graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peg" = callPackage
@@ -193670,8 +181751,6 @@ self: {
        ];
        description = "a lazy non-deterministic concatenative programming language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peggy" = callPackage
@@ -193690,8 +181769,6 @@ self: {
        ];
        description = "The Parser Generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pell" = callPackage
@@ -193750,8 +181827,6 @@ self: {
        ];
        description = "Static site generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "penn-treebank" = callPackage
@@ -193811,8 +181886,6 @@ self: {
        ];
        description = "Extensible double-entry accounting system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "penny-bin" = callPackage
@@ -193831,8 +181904,6 @@ self: {
        ];
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "penny-lib" = callPackage
@@ -193854,8 +181925,6 @@ self: {
        ];
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "penrose" = callPackage
@@ -193891,8 +181960,6 @@ self: {
        ];
        description = "Create beautiful diagrams just by typing mathematical notation in plain text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peparser" = callPackage
@@ -193904,8 +181971,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring haskell98 ];
        description = "A parser for PE object files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "percent-encoder" = callPackage
@@ -193948,8 +182013,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The perceptron learning algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perceptual-hash" = callPackage
@@ -194023,8 +182086,6 @@ self: {
        ];
        description = "Database migration support for use in other libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perf" = callPackage
@@ -194041,8 +182102,6 @@ self: {
        testHaskellDepends = [ base deepseq doctest rdtsc ];
        description = "Low-level run time measurement";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perf-analysis" = callPackage
@@ -194065,8 +182124,6 @@ self: {
        ];
        description = "analysis example using perf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perfect-hash-generator" = callPackage
@@ -194145,8 +182202,6 @@ self: {
        ];
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perhaps" = callPackage
@@ -194164,8 +182219,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Perhaps, a monad";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "period" = callPackage
@@ -194202,8 +182255,6 @@ self: {
        testHaskellDepends = [ base cereal hedis hspec text time ];
        description = "A reliable at-least-once periodic job scheduler backed by redis";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "periodic-client" = callPackage
@@ -194221,8 +182272,6 @@ self: {
        ];
        description = "Periodic task system haskell client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "periodic-client-exe" = callPackage
@@ -194247,8 +182296,6 @@ self: {
        ];
        description = "Periodic task system haskell client executables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "periodic-common" = callPackage
@@ -194305,8 +182352,6 @@ self: {
        ];
        description = "Periodic task system haskell server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perm" = callPackage
@@ -194323,8 +182368,6 @@ self: {
        ];
        description = "permutation Applicative and Monad with many mtl instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "permutation" = callPackage
@@ -194339,8 +182382,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim QuickCheck ];
        description = "A library for permutations and combinations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "permutations" = callPackage
@@ -194364,8 +182405,6 @@ self: {
        ];
        description = "Permutations of finite sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "permute" = callPackage
@@ -194377,8 +182416,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised permutation parser combinator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persist" = callPackage
@@ -194430,8 +182467,6 @@ self: {
        ];
        description = "Transforms persist's quasi-quoted syntax into ER format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistable-record" = callPackage
@@ -194594,8 +182629,6 @@ self: {
        ];
        description = "Parses a Persist Model file and produces Audit Models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-cereal" = callPackage
@@ -194607,8 +182640,6 @@ self: {
        libraryHaskellDepends = [ base cereal persistent text ];
        description = "Helper functions for writing Persistent instances";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-database-url" = callPackage
@@ -194628,8 +182659,6 @@ self: {
        ];
        description = "Parse DATABASE_URL into configuration types for Persistent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-documentation" = callPackage
@@ -194650,8 +182679,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Documentation DSL for persistent entities";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-equivalence" = callPackage
@@ -194663,8 +182690,6 @@ self: {
        libraryHaskellDepends = [ array base diffarray ];
        description = "Persistent equivalence relations (aka union-find)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-generic" = callPackage
@@ -194692,8 +182717,6 @@ self: {
        ];
        description = "Declare Persistent entities using SQL SELECT query syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-instances-iproute" = callPackage
@@ -194721,8 +182744,6 @@ self: {
        ];
        description = "Persistent instances for types in iproute";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-map" = callPackage
@@ -194739,8 +182760,6 @@ self: {
        ];
        description = "A thread-safe (STM) persistency interface for finite map types";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-migration" = callPackage
@@ -194765,8 +182784,6 @@ self: {
        ];
        description = "Manual migrations for the persistent library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-mongoDB" = callPackage
@@ -194794,8 +182811,6 @@ self: {
        ];
        description = "Backend for the persistent library using mongoDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-mysql" = callPackage
@@ -194881,8 +182896,6 @@ self: {
        ];
        description = "A pure haskell backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-odbc" = callPackage
@@ -195013,8 +183026,6 @@ self: {
        ];
        description = "Template-Haskell helpers for integrating protobufs with persistent";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-qq" = callPackage
@@ -195048,8 +183059,6 @@ self: {
        libraryHaskellDepends = [ base time yesod ];
        description = "A library for rate limiting activities with a persistent backend";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-redis" = callPackage
@@ -195073,8 +183082,6 @@ self: {
        ];
        description = "Backend for persistent library using Redis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-refs" = callPackage
@@ -195111,8 +183118,6 @@ self: {
        ];
        description = "relational-record on persisten backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-spatial" = callPackage
@@ -195310,8 +183315,6 @@ self: {
        ];
        description = "Generate classy lens field accessors for persistent models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-test" = callPackage
@@ -195376,8 +183379,6 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
        description = "A persistent sequence based on array mapped tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-zookeeper" = callPackage
@@ -195407,8 +183408,6 @@ self: {
        ];
        description = "Backend for persistent library using Zookeeper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persona" = callPackage
@@ -195425,8 +183424,6 @@ self: {
        ];
        description = "Persona (BrowserID) library";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persona-idp" = callPackage
@@ -195448,8 +183445,6 @@ self: {
        ];
        description = "Persona (BrowserID) Identity Provider";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pesca" = callPackage
@@ -195464,8 +183459,6 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Proof Editor for Sequent Calculus";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peyotls" = callPackage
@@ -195492,8 +183485,6 @@ self: {
        ];
        description = "Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peyotls-codec" = callPackage
@@ -195511,8 +183502,6 @@ self: {
        ];
        description = "Codec parts of Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pez" = callPackage
@@ -195529,8 +183518,6 @@ self: {
        ];
        description = "A Pretty Extraordinary Zipper library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pg-harness" = callPackage
@@ -195550,8 +183537,6 @@ self: {
        ];
        description = "REST service and library for creating/consuming temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pg-harness-client" = callPackage
@@ -195607,8 +183592,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pg-store" = callPackage
@@ -195632,8 +183615,6 @@ self: {
        ];
        description = "Simple storage interface to PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pg-transact" = callPackage
@@ -195655,8 +183636,6 @@ self: {
        ];
        description = "A postgresql-simple transaction monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pgdl" = callPackage
@@ -195682,8 +183661,6 @@ self: {
        ];
        description = "browse directory listing webpages and download files from them";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pgf2" = callPackage
@@ -195696,8 +183673,6 @@ self: {
        librarySystemDepends = [ gu pgf ];
        description = "Bindings to the C version of the PGF runtime";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gu = null; inherit (pkgs) pgf;};
 
   "pgm" = callPackage
@@ -195745,8 +183720,6 @@ self: {
        ];
        description = "A mid-level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pgstream" = callPackage
@@ -195771,8 +183744,6 @@ self: {
        ];
        description = "Streaming Postgres bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phantom-state" = callPackage
@@ -195799,8 +183770,6 @@ self: {
        ];
        description = "Freezing, thawing, and copy elision";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phaser" = callPackage
@@ -195815,8 +183784,6 @@ self: {
        ];
        description = "Incremental multiple pass parser library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phash" = callPackage
@@ -195874,8 +183841,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Deprecated - ghci debug viewer with simple editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phoityne-vscode" = callPackage
@@ -195926,8 +183891,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "Haskell bindings to the libphonenumber library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {phonenumber = null; inherit (pkgs) protobuf;};
 
   "phone-push" = callPackage
@@ -195945,8 +183908,6 @@ self: {
        ];
        description = "Push notifications for Android and iOS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phonetic-code" = callPackage
@@ -196124,8 +184085,6 @@ self: {
        ];
        description = "Functional user interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "photoname" = callPackage
@@ -196147,8 +184106,6 @@ self: {
        ];
        description = "Rename photo image files based on EXIF shoot date";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phraskell" = callPackage
@@ -196162,8 +184119,6 @@ self: {
        executableHaskellDepends = [ base mtl SDL transformers ];
        description = "A fractal viewer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phybin" = callPackage
@@ -196196,8 +184151,6 @@ self: {
        ];
        description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "physics" = callPackage
@@ -196229,8 +184182,6 @@ self: {
        ];
        description = "Applied pi-calculus interpreter";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pi-forall" = callPackage
@@ -196254,8 +184205,6 @@ self: {
        ];
        description = "Demo implementation of typechecker for dependently-typed language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pi-hoole" = callPackage
@@ -196281,8 +184230,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Lightweight access control solution for the pijul vcs";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pi-lcd" = callPackage
@@ -196324,8 +184271,6 @@ self: {
        ];
        description = "Set up port forwarding with the Private Internet Access VPN service";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pianola" = callPackage
@@ -196348,8 +184293,6 @@ self: {
        ];
        description = "Remotely controlling Java Swing applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "picedit" = callPackage
@@ -196364,8 +184307,6 @@ self: {
        executableHaskellDepends = [ base cli hmatrix ];
        description = "simple image manipulation functions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pickle" = callPackage
@@ -196377,8 +184318,6 @@ self: {
        libraryHaskellDepends = [ base containers network stm text ];
        description = "Instant StatsD in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "picologic" = callPackage
@@ -196401,8 +184340,6 @@ self: {
        ];
        description = "Utilities for symbolic predicate logic expressions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "picoparsec" = callPackage
@@ -196435,8 +184372,6 @@ self: {
        ];
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "picosat" = callPackage
@@ -196462,8 +184397,6 @@ self: {
        executableHaskellDepends = [ base matrix transformers xml ];
        description = "Converts a svg image to tikz code";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pid1" = callPackage
@@ -196511,8 +184444,6 @@ self: {
        ];
        description = "Yet another Haskell build system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pier-core" = callPackage
@@ -196532,8 +184463,6 @@ self: {
        ];
        description = "A library for writing forwards-declared build systems in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "piet" = callPackage
@@ -196547,8 +184476,6 @@ self: {
        libraryHaskellDepends = [ array base containers Imlib mtl ];
        description = "A Piet interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pig" = callPackage
@@ -196565,8 +184492,6 @@ self: {
        ];
        description = "dice game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "piki" = callPackage
@@ -196605,8 +184530,6 @@ self: {
        ];
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pinboard-notes-backup" = callPackage
@@ -196627,8 +184550,6 @@ self: {
        ];
        description = "Back up the notes you've saved to Pinboard";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pinch" = callPackage
@@ -196654,8 +184575,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pinchot" = callPackage
@@ -196674,8 +184593,6 @@ self: {
        ];
        description = "Write grammars, not parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pine" = callPackage
@@ -196699,8 +184616,6 @@ self: {
        ];
        description = "Functional 2D Game Framework";
        license = stdenv.lib.licenses.zlib;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ping" = callPackage
@@ -196719,8 +184634,6 @@ self: {
        ];
        description = "icmp echo requests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ping-parser-attoparsec" = callPackage
@@ -196799,8 +184712,6 @@ self: {
        testHaskellDepends = [ base doctest protolude ];
        description = "A gateway for various cloud notification services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipe-enumerator" = callPackage
@@ -196812,8 +184723,6 @@ self: {
        libraryHaskellDepends = [ base enumerator pipes transformers ];
        description = "A bidirectional bridge between pipes and iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipeclip" = callPackage
@@ -196921,8 +184830,6 @@ self: {
        ];
        description = "A higher-level interface to using concurrency with pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-attoparsec" = callPackage
@@ -196962,8 +184869,6 @@ self: {
        ];
        description = "Streaming parsing in the pipes-core framework with Attoparsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-bgzf" = callPackage
@@ -196979,8 +184884,6 @@ self: {
        ];
        description = "Blocked GZip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-binary" = callPackage
@@ -197034,8 +184937,6 @@ self: {
        ];
        description = "Brotli (RFC7932) compressors and decompressors for the Pipes package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-bytestring" = callPackage
@@ -197075,8 +184976,6 @@ self: {
        benchmarkHaskellDepends = [ base ];
        description = "Streaming compression/decompression via pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) bzip2;};
 
   "pipes-cacophony" = callPackage
@@ -197093,8 +184992,6 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Pipes for Noise-secured network connections";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-category" = callPackage
@@ -197170,8 +185067,6 @@ self: {
        ];
        description = "Encode and decode binary streams using the pipes and cereal libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-cereal-plus" = callPackage
@@ -197187,8 +185082,6 @@ self: {
        ];
        description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-cliff" = callPackage
@@ -197235,8 +185128,6 @@ self: {
        libraryHaskellDepends = [ base conduit mtl pipes-core ];
        description = "Conduit adapters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-core" = callPackage
@@ -197252,8 +185143,6 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-courier" = callPackage
@@ -197265,8 +185154,6 @@ self: {
        libraryHaskellDepends = [ base courier pipes ];
        description = "Pipes utilities for interfacing with the courier message-passing framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-csv" = callPackage
@@ -197299,8 +185186,6 @@ self: {
        libraryHaskellDepends = [ base errors pipes ];
        description = "Integration between pipes and errors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-extra" = callPackage
@@ -197328,8 +185213,6 @@ self: {
        ];
        description = "Various basic utilities for Pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-extras" = callPackage
@@ -197390,8 +185273,6 @@ self: {
        ];
        description = "Fast traversal of directory trees using pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-fluid" = callPackage
@@ -197464,8 +185345,6 @@ self: {
        ];
        description = "Illumina NGS data processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-interleave" = callPackage
@@ -197479,8 +185358,6 @@ self: {
        libraryHaskellDepends = [ base containers heaps pipes ];
        description = "Interleave and merge streams of elements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-io" = callPackage
@@ -197495,8 +185372,6 @@ self: {
        testHaskellDepends = [ base hspec pipes ];
        description = "Stateful IO streams based on pipes";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-kafka" = callPackage
@@ -197537,8 +185412,6 @@ self: {
        ];
        description = "Streaming processing of CSV files preceded by key-value pairs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-lines" = callPackage
@@ -197574,8 +185447,6 @@ self: {
        ];
        description = "LZMA compressors and decompressors for the Pipes package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-misc" = callPackage
@@ -197608,8 +185479,6 @@ self: {
        testHaskellDepends = [ base monad-control mongoDB pipes text ];
        description = "Stream results from MongoDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-network" = callPackage
@@ -197685,8 +185554,6 @@ self: {
        ];
        description = "P2P network nodes with pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-p2p-examples" = callPackage
@@ -197705,8 +185572,6 @@ self: {
        ];
        description = "Examples using pipes-p2p";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-parse" = callPackage
@@ -197757,8 +185622,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Alternate Prelude for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-random" = callPackage
@@ -197784,8 +185647,6 @@ self: {
        executableHaskellDepends = [ base pipes time ];
        description = "A few pipes to control the timing of yields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-s3" = callPackage
@@ -197808,8 +185669,6 @@ self: {
        ];
        description = "A simple interface for streaming data to and from Amazon S3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-safe" = callPackage
@@ -197846,8 +185705,6 @@ self: {
        ];
        description = "Create proper Pipes from System.Process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-sqlite-simple" = callPackage
@@ -197861,8 +185718,6 @@ self: {
        ];
        description = "Functions that smash Pipes and sqlite-simple together";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-text" = callPackage
@@ -197880,8 +185735,6 @@ self: {
        ];
        description = "properly streaming text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-transduce" = callPackage
@@ -197905,8 +185758,6 @@ self: {
        ];
        description = "Interfacing pipes with foldl folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-vector" = callPackage
@@ -197922,8 +185773,6 @@ self: {
        ];
        description = "Various proxies for streaming data into vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-wai" = callPackage
@@ -197974,8 +185823,6 @@ self: {
        ];
        description = "Pipes integration for ZeroMQ messaging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-zlib" = callPackage
@@ -198015,8 +185862,6 @@ self: {
        ];
        description = "A dependently typed core language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pit" = callPackage
@@ -198039,8 +185884,6 @@ self: {
        ];
        description = "Account management tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pitchtrack" = callPackage
@@ -198061,8 +185904,6 @@ self: {
        ];
        description = "Pitch tracking library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pivotal-tracker" = callPackage
@@ -198086,8 +185927,6 @@ self: {
        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;
-       broken = true;
      }) {};
 
   "pixela" = callPackage
@@ -198132,8 +185971,6 @@ self: {
        ];
        description = "A library and application for generating pixelated avatars";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "piyo" = callPackage
@@ -198190,8 +186027,6 @@ self: {
        ];
        description = "PKCS#10 library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pkcs7" = callPackage
@@ -198204,8 +186039,6 @@ self: {
        testHaskellDepends = [ base bytestring Cabal HUnit QuickCheck ];
        description = "PKCS #7 padding in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pkggraph" = callPackage
@@ -198219,8 +186052,6 @@ self: {
        executableHaskellDepends = [ base Cabal split ];
        description = "Package dependency graph for installed packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pkgtreediff" = callPackage
@@ -198240,8 +186071,6 @@ self: {
        ];
        description = "Package tree diff tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pktree" = callPackage
@@ -198307,8 +186136,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl time unix ];
        description = "plaimi's prelude";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plan-applicative" = callPackage
@@ -198329,8 +186156,6 @@ self: {
        ];
        description = "Applicative/Arrow for resource estimation and progress tracking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plan-b" = callPackage
@@ -198349,8 +186174,6 @@ self: {
        testHaskellDepends = [ base hspec path path-io ];
        description = "Failure-tolerant file and directory editing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "planar-graph" = callPackage
@@ -198367,8 +186190,6 @@ self: {
        ];
        description = "A representation of planar graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "planb-token-introspection" = callPackage
@@ -198446,8 +186267,6 @@ self: {
        ];
        description = "Planet Mitchell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "planet-mitchell-test" = callPackage
@@ -198464,8 +186283,6 @@ self: {
        ];
        description = "Planet Mitchell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plankton" = callPackage
@@ -198477,8 +186294,6 @@ self: {
        libraryHaskellDepends = [ adjunctions base protolude ];
        description = "The core of a numeric prelude, taken from numhask";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plat" = callPackage
@@ -198492,8 +186307,6 @@ self: {
        ];
        description = "Simple templating library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "platinum-parsing" = callPackage
@@ -198517,8 +186330,6 @@ self: {
        testHaskellDepends = [ base containers fgl hspec vector ];
        description = "General Framework for compiler development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "playlists" = callPackage
@@ -198578,8 +186389,6 @@ self: {
        ];
        description = "run a subprocess, combining stdout and stderr";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plist" = callPackage
@@ -198592,8 +186401,6 @@ self: {
        libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
        description = "Generate and parse Mac OS X property list format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plist-buddy" = callPackage
@@ -198617,8 +186424,6 @@ self: {
        ];
        description = "Remote monad for editing plists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plivo" = callPackage
@@ -198652,8 +186457,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative socketed ];
        description = "plot data from stdin through socketed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plot" = callPackage
@@ -198669,8 +186472,6 @@ self: {
        ];
        description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plot-gtk" = callPackage
@@ -198682,8 +186483,6 @@ self: {
        libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ];
        description = "GTK plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plot-gtk-ui" = callPackage
@@ -198700,8 +186499,6 @@ self: {
        ];
        description = "A quick way to use Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plot-gtk3" = callPackage
@@ -198715,8 +186512,6 @@ self: {
        ];
        description = "GTK3 plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plot-lab" = callPackage
@@ -198733,8 +186528,6 @@ self: {
        ];
        description = "A plotting tool with Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plot-light" = callPackage
@@ -198845,8 +186638,6 @@ self: {
        ];
        description = "Diagrams based plotting library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plotserver-api" = callPackage
@@ -198887,8 +186678,6 @@ self: {
        ];
        description = "Dynamic linking for Haskell and C objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plugins-auto" = callPackage
@@ -198905,8 +186694,6 @@ self: {
        testHaskellDepends = [ base directory process ];
        description = "Automatic recompilation and reloading of haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plugins-multistage" = callPackage
@@ -198925,8 +186712,6 @@ self: {
        ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plumbers" = callPackage
@@ -198950,8 +186735,6 @@ self: {
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "Plurality monad: Zero, one, or at least two";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plural" = callPackage
@@ -198964,8 +186747,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Pluralize";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ply-loader" = callPackage
@@ -199004,8 +186785,6 @@ self: {
        testHaskellDepends = [ base hspec mtl text unordered-containers ];
        description = "A front-end framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "png-file" = callPackage
@@ -199021,8 +186800,6 @@ self: {
        ];
        description = "read/write png file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pngload" = callPackage
@@ -199039,8 +186816,6 @@ self: {
        ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pngload-fixed" = callPackage
@@ -199053,8 +186828,6 @@ self: {
        libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pnm" = callPackage
@@ -199081,8 +186854,6 @@ self: {
        ];
        description = "Bindings for the Pocket API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pocket-dns" = callPackage
@@ -199117,8 +186888,6 @@ self: {
        ];
        description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "point-octree" = callPackage
@@ -199137,8 +186906,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Point octree, with bounding boxes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pointed" = callPackage
@@ -199168,8 +186935,6 @@ self: {
        libraryHaskellDepends = [ base mtl semigroups transformers ];
        description = "Alternative done right";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pointedlist" = callPackage
@@ -199246,8 +187011,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pointful refactoring tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pointless-fun" = callPackage
@@ -199270,8 +187033,6 @@ self: {
        libraryHaskellDepends = [ base GHood process syb ];
        description = "Pointless Haskell library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pointless-lenses" = callPackage
@@ -199287,8 +187048,6 @@ self: {
        ];
        description = "Pointless Lenses library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pointless-rewrite" = callPackage
@@ -199304,8 +187063,6 @@ self: {
        ];
        description = "Pointless Rewrite library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "poke" = callPackage
@@ -199337,8 +187094,6 @@ self: {
        ];
        description = "Discord verification bot";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pokemon-go-protobuf-types" = callPackage
@@ -199355,8 +187110,6 @@ self: {
        ];
        description = "Haskell types for the Pokemon Go protobuf protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "poker-eval" = callPackage
@@ -199369,8 +187122,6 @@ self: {
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {poker-eval = null;};
 
   "pokitdok" = callPackage
@@ -199388,8 +187139,6 @@ self: {
        ];
        description = "PokitDok Platform API Client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polar" = callPackage
@@ -199413,8 +187162,6 @@ self: {
        testHaskellDepends = [ base containers HUnit MissingH mtl parsec ];
        description = "Fork of ConfigFile for Polar Game Engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polar-shader" = callPackage
@@ -199427,8 +187174,6 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "High-level shader compiler framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polh-lexicon" = callPackage
@@ -199447,8 +187192,6 @@ self: {
        ];
        description = "A library for manipulating the historical dictionary of Polish (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "policeman" = callPackage
@@ -199553,8 +187296,6 @@ self: {
        libraryHaskellDepends = [ base lens ];
        description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "poly-rec" = callPackage
@@ -199595,8 +187336,6 @@ self: {
        ];
        description = "Wrap together data and it's constraints";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polydata-core" = callPackage
@@ -199608,8 +187347,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Core data definitions for the \"polydata\" package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polymap" = callPackage
@@ -199667,8 +187404,6 @@ self: {
        ];
        description = "Polynomials";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polynomials-bernstein" = callPackage
@@ -199747,8 +187482,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Experimental, RandomFu effect and interpreters for polysemy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-chronos" = callPackage
@@ -199770,8 +187503,6 @@ self: {
        ];
        description = "Polysemy effect for chronos";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-extra" = callPackage
@@ -199783,8 +187514,6 @@ self: {
        libraryHaskellDepends = [ base containers polysemy polysemy-zoo ];
        description = "Extra Input and Output functions for polysemy..";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-fs" = callPackage
@@ -199815,8 +187544,6 @@ self: {
        ];
        description = "Run a KVStore as a filesystem in polysemy";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-http" = callPackage
@@ -199849,8 +187576,6 @@ self: {
        ];
        description = "Polysemy effect for http-client";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-kvstore-jsonfile" = callPackage
@@ -199867,8 +187592,6 @@ self: {
        ];
        description = "Run a KVStore as a single json file in polysemy";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-methodology" = callPackage
@@ -199884,8 +187607,6 @@ self: {
        ];
        description = "Domain modelling algebra for polysemy";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-methodology-composite" = callPackage
@@ -199902,8 +187623,6 @@ self: {
        ];
        description = "Functions for using polysemy-methodology with composite";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-optics" = callPackage
@@ -199930,8 +187649,6 @@ self: {
        ];
        description = "Polysemy versions of Path functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-plugin" = callPackage
@@ -199974,8 +187691,6 @@ self: {
        ];
        description = "Polysemy error tracking";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-test" = callPackage
@@ -199999,8 +187714,6 @@ self: {
        ];
        description = "Polysemy effects for testing";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-time" = callPackage
@@ -200024,8 +187737,6 @@ self: {
        ];
        description = "Polysemy effect for time";
        license = "BSD-2-Clause-Patent";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-video" = callPackage
@@ -200051,8 +187762,6 @@ self: {
        libraryHaskellDepends = [ base polysemy polysemy-extra vinyl ];
        description = "Functions for mapping vinyl records in polysemy";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-webserver" = callPackage
@@ -200074,8 +187783,6 @@ self: {
        ];
        description = "Start web servers from within a Polysemy effect stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-zoo" = callPackage
@@ -200120,8 +187827,6 @@ self: {
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysoup" = callPackage
@@ -200146,8 +187851,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Typeable for polymorphic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polytypeable-utils" = callPackage
@@ -200159,8 +187862,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 polytypeable ];
        description = "Utilities for polytypeable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polyvariadic" = callPackage
@@ -200218,8 +187919,6 @@ self: {
        ];
        description = "pomodoro timer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pomohoro" = callPackage
@@ -200243,8 +187942,6 @@ self: {
        testHaskellDepends = [ base hspec protolude ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ponder" = callPackage
@@ -200256,8 +187953,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "PEG parser combinator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pong-server" = callPackage
@@ -200275,8 +187970,6 @@ self: {
        testHaskellDepends = [ base hspec network QuickCheck ];
        description = "A simple embedded pingable server that runs in the background";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pontarius-mediaserver" = callPackage
@@ -200334,8 +188027,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "An XMPP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pontarius-xmpp-extras" = callPackage
@@ -200394,8 +188085,6 @@ self: {
        libraryHaskellDepends = [ base monad-control transformers ];
        description = "Thread-safe resource pools. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pool-conduit" = callPackage
@@ -200413,8 +188102,6 @@ self: {
        ];
        description = "Resource pool allocations via ResourceT. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pooled-io" = callPackage
@@ -200445,8 +188132,6 @@ self: {
        libraryHaskellDepends = [ base mtl network ];
        description = "POP3 Client Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "popenhs" = callPackage
@@ -200459,8 +188144,6 @@ self: {
        libraryHaskellDepends = [ base directory haskell98 unix ];
        description = "popenhs is a popen-like library for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "popkey" = callPackage
@@ -200482,8 +188165,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Static key-value storage backed by poppy";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "poppler" = callPackage
@@ -200504,8 +188185,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; 
          inherit (pkgs) pango; inherit (pkgs) poppler;};
 
@@ -200560,8 +188239,6 @@ self: {
        ];
        description = "Express portable, composable and reusable data tasks and pipelines";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "porcupine-http" = callPackage
@@ -200590,8 +188267,6 @@ self: {
        ];
        description = "A location accessor for porcupine to connect to HTTP sources/sinks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "porcupine-s3" = callPackage
@@ -200622,8 +188297,6 @@ self: {
        ];
        description = "A location accessor for porcupine to connect to AWS S3 sources/sinks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "porpoise" = callPackage
@@ -200695,8 +188368,6 @@ self: {
        testHaskellDepends = [ base containers hspec mtl QuickCheck text ];
        description = "DSL for configuring Gentoo portage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "portaudio" = callPackage
@@ -200727,8 +188398,6 @@ self: {
        ];
        description = "FreeBSD ports index search and analysis tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "porter" = callPackage
@@ -200751,8 +188420,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 unix ];
        description = "The Haskell Ports Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ports-tools" = callPackage
@@ -200787,8 +188454,6 @@ self: {
        ];
        description = "Simple extensible library to run SQL file against PostgreSQL database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "poseidon-postgis" = callPackage
@@ -200809,8 +188474,6 @@ self: {
        ];
        description = "Extension of Poseidon library for Postgis (Spatial and Geographic objects for PostgreSQL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "positive" = callPackage
@@ -200856,8 +188519,6 @@ self: {
        librarySystemDepends = [ acl ];
        description = "Support for Posix ACL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) acl;};
 
   "posix-api" = callPackage
@@ -200878,8 +188539,6 @@ self: {
        ];
        description = "posix bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) systemd;};
 
   "posix-error-codes" = callPackage
@@ -200957,8 +188616,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "POSIX Realtime functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "posix-socket" = callPackage
@@ -200999,8 +188656,6 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "Low-level wrapping of POSIX waitpid(2)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "posplyu" = callPackage
@@ -201018,8 +188673,6 @@ self: {
        ];
        description = "Sleep tracker for X11, using XScreenSaver extension and manual input";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "possible" = callPackage
@@ -201064,8 +188717,6 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring HTTP ];
        description = "A library that gets postcode information from the uk-postcodes.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgres-embedded" = callPackage
@@ -201084,8 +188735,6 @@ self: {
        ];
        description = "Library for easily running embedded PostgreSQL server for tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgres-options" = callPackage
@@ -201113,8 +188762,6 @@ self: {
        libraryHaskellDepends = [ base bytestring postgresql-simple text ];
        description = "Create a temporary database that is deleted after performing some operation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgres-websockets" = callPackage
@@ -201147,8 +188794,6 @@ self: {
        ];
        description = "Middleware to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-binary" = callPackage
@@ -201325,8 +188970,6 @@ self: {
        ];
        description = "Utilities for streaming PostgreSQL LargeObjects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-named" = callPackage
@@ -201344,8 +188987,6 @@ self: {
        testHaskellDepends = [ base generics-sop hspec postgresql-simple ];
        description = "Generic deserialization of PostgreSQL rows based on column names";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-orm" = callPackage
@@ -201439,8 +189080,6 @@ self: {
        ];
        description = "pure Haskell PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-query" = callPackage
@@ -201472,8 +189111,6 @@ self: {
        ];
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-schema" = callPackage
@@ -201545,8 +189182,6 @@ self: {
        ];
        description = "FFI-like bindings for PostgreSQL stored functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-simple-interpolate" = callPackage
@@ -201604,8 +189239,6 @@ self: {
        ];
        description = "Implementation of named parameters for `postgresql-simple` library";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-simple-opts" = callPackage
@@ -201629,8 +189262,6 @@ self: {
        ];
        description = "An optparse-applicative and envy parser for postgres options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-simple-queue" = callPackage
@@ -201656,8 +189287,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL backed queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-simple-sop" = callPackage
@@ -201669,8 +189298,6 @@ self: {
        libraryHaskellDepends = [ base generics-sop postgresql-simple ];
        description = "Generic functions for postgresql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-simple-typed" = callPackage
@@ -201687,8 +189314,6 @@ self: {
        ];
        description = "Typed extension for PostgreSQL simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-simple-url" = callPackage
@@ -201733,8 +189358,6 @@ self: {
        ];
        description = "PostgreSQL AST parsing and rendering";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-transactional" = callPackage
@@ -201787,8 +189410,6 @@ self: {
        ];
        description = "postgresql-tx interfacing for use with postgresql-query";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-tx-simple" = callPackage
@@ -201820,8 +189441,6 @@ self: {
        ];
        description = "postgresql-tx interfacing for use with squeal-postgresql";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-typed" = callPackage
@@ -201850,8 +189469,6 @@ self: {
        ];
        description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-typed-lifted" = callPackage
@@ -201868,8 +189485,6 @@ self: {
        ];
        description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgrest" = callPackage
@@ -201953,8 +189568,6 @@ self: {
        ];
        description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postie" = callPackage
@@ -201973,8 +189586,6 @@ self: {
        ];
        description = "SMTP server library to receive emails from within Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postmark" = callPackage
@@ -201993,8 +189604,6 @@ self: {
        ];
        description = "Library for postmarkapp.com HTTP Api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postmark-streams" = callPackage
@@ -202031,8 +189640,6 @@ self: {
        ];
        description = "Postmaster ESMTP Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potato-tool" = callPackage
@@ -202046,8 +189653,6 @@ self: {
        executableHaskellDepends = [ base binary bytestring split ];
        description = "Command line Dreamcast VMU filesystem toolset";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potoki" = callPackage
@@ -202059,8 +189664,6 @@ self: {
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potoki-cereal" = callPackage
@@ -202083,8 +189686,6 @@ self: {
        ];
        description = "Streaming serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potoki-conduit" = callPackage
@@ -202107,8 +189708,6 @@ self: {
        ];
        description = "Integration of \"potoki\" and \"conduit\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potoki-core" = callPackage
@@ -202136,8 +189735,6 @@ self: {
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Low-level components of \"potoki\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potoki-hasql" = callPackage
@@ -202153,8 +189750,6 @@ self: {
        ];
        description = "Integration of \"potoki\" and \"hasql\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potoki-zlib" = callPackage
@@ -202168,8 +189763,6 @@ self: {
        ];
        description = "Streaming ZLib decompression";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potrace" = callPackage
@@ -202213,8 +189806,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "bindings for Griffin PowerMate USB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "powerpc" = callPackage
@@ -202226,8 +189817,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Tools for PowerPC programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "powerqueue" = callPackage
@@ -202241,8 +189830,6 @@ self: {
        testHaskellDepends = [ async base hspec stm ];
        description = "A flexible job queue with exchangeable backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "powerqueue-distributed" = callPackage
@@ -202261,8 +189848,6 @@ self: {
        testHaskellDepends = [ async base hspec powerqueue stm timespan ];
        description = "A distributed worker backend for powerqueu";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "powerqueue-levelmem" = callPackage
@@ -202289,8 +189874,6 @@ self: {
        benchmarkSystemDepends = [ leveldb snappy ];
        description = "A high performance in memory and LevelDB backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;};
 
   "powerqueue-sqs" = callPackage
@@ -202304,8 +189887,6 @@ self: {
        ];
        description = "A Amazon SQS backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ppm" = callPackage
@@ -202362,8 +189943,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck random stm ];
        description = "Parallel batch driver for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pqueue" = callPackage
@@ -202391,8 +189970,6 @@ self: {
        ];
        description = "Fully encapsulated monad transformers with queuelike functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "practice-room" = callPackage
@@ -202411,8 +189988,6 @@ self: {
        ];
        description = "Practice Room";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "praglude" = callPackage
@@ -202433,8 +190008,6 @@ self: {
        ];
        description = "A pragmatic Prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pragmatic-show" = callPackage
@@ -202490,8 +190063,6 @@ self: {
        ];
        description = "Yet another prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "precis" = callPackage
@@ -202527,8 +190098,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Prelude replacement";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pred-set" = callPackage
@@ -202540,8 +190109,6 @@ self: {
        libraryHaskellDepends = [ base hashable hashtables HSet ];
        description = "Simple cached predicates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pred-trie" = callPackage
@@ -202570,8 +190137,6 @@ self: {
        ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "predicate-class" = callPackage
@@ -202583,8 +190148,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Helper class for passing context along a predicate value";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "predicate-transformers" = callPackage
@@ -202627,8 +190190,6 @@ self: {
        ];
        description = "Predicates, Refinement types and Dsl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "predicates" = callPackage
@@ -202672,8 +190233,6 @@ self: {
        ];
        description = "Evaluate and display trees of predicates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prednote-test" = callPackage
@@ -202696,8 +190255,6 @@ self: {
        ];
        description = "Tests and QuickCheck generators to accompany prednote";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prefetch" = callPackage
@@ -202761,8 +190318,6 @@ self: {
        ];
        description = "A library for building a prefork-style server quickly";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pregame" = callPackage
@@ -202782,8 +190337,6 @@ self: {
        ];
        description = "Prelude for applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "preliminaries" = callPackage
@@ -202805,8 +190358,6 @@ self: {
        ];
        description = "A larger alternative to the Prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prelude-compat" = callPackage
@@ -202851,8 +190402,6 @@ self: {
        libraryHaskellDepends = [ base comonad logict transformers ];
        description = "Another kind of alternate Prelude file";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prelude-plus" = callPackage
@@ -202866,8 +190415,6 @@ self: {
        libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prelude-prime" = callPackage
@@ -202931,8 +190478,6 @@ self: {
        ];
        description = "Preprocess Haskell Repositories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "preprocessor" = callPackage
@@ -202953,8 +190498,6 @@ self: {
        ];
        description = "Remove cpp annotations to get the source ready for static analysis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "preprocessor-tools" = callPackage
@@ -202995,8 +190538,6 @@ self: {
        testToolDepends = [ alex happy ];
        description = "safe PostgreSQL queries using Quasiquoters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "presburger" = callPackage
@@ -203011,8 +190552,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "A decision procedure for quantifier-free linear arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "present" = callPackage
@@ -203024,8 +190563,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Make presentations for data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "press" = callPackage
@@ -203037,8 +190574,6 @@ self: {
        libraryHaskellDepends = [ base containers json mtl parsec ];
        description = "Text template library targeted at the web / HTML generation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "presto-hdbc" = callPackage
@@ -203058,8 +190593,6 @@ self: {
        ];
        description = "An HDBC connector for Presto";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prettify" = callPackage
@@ -203115,8 +190648,6 @@ self: {
        ];
        description = "Pretty-printing library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pretty-diff" = callPackage
@@ -203133,8 +190664,6 @@ self: {
        ];
        description = "Pretty printing a diff of two values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pretty-display" = callPackage
@@ -203187,8 +190716,6 @@ self: {
        ];
        description = "Functionality for beautifying GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pretty-hex" = callPackage
@@ -203222,8 +190749,6 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "A implementation of multi-column layout w/ Text.PrettyPrint";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pretty-relative-time" = callPackage
@@ -203569,8 +191094,6 @@ self: {
        libraryHaskellDepends = [ base graphviz prettyprinter text ];
        description = "A prettyprinter backend for graphviz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prettyprinter-lucid" = callPackage
@@ -203582,8 +191105,6 @@ self: {
        libraryHaskellDepends = [ base lucid prettyprinter text ];
        description = "A prettyprinter backend for lucid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prettyprinter-vty" = callPackage
@@ -203597,8 +191118,6 @@ self: {
        libraryHaskellDepends = [ base prettyprinter vty ];
        description = "prettyprinter backend for vty";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "preview" = callPackage
@@ -203614,8 +191133,6 @@ self: {
        ];
        description = "The method of previewing data (instead of wholly show-ing it)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prim" = callPackage
@@ -203627,8 +191144,6 @@ self: {
        libraryHaskellDepends = [ ghc-prim ];
        description = "An ergonomic but conservative interface to ghc-prim";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prim-array" = callPackage
@@ -203642,8 +191157,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prim-instances" = callPackage
@@ -203667,8 +191180,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prim-spoon" = callPackage
@@ -203709,8 +191220,6 @@ self: {
        testHaskellDepends = [ base doctest template-haskell ];
        description = "Primeval world of Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primal-memory" = callPackage
@@ -203730,8 +191239,6 @@ self: {
        ];
        description = "Unified interface for memory managemenet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primes" = callPackage
@@ -203756,8 +191263,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion primes ];
        description = "Type-safe prime numbers";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primesieve" = callPackage
@@ -203829,8 +191334,6 @@ self: {
        testHaskellDepends = [ base primitive primitive-unlifted ];
        description = "Wrappers for primops around atomic operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-checked" = callPackage
@@ -203867,8 +191370,6 @@ self: {
        ];
        description = "containers backed by arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-convenience" = callPackage
@@ -203902,8 +191403,6 @@ self: {
        ];
        description = "Extras for the \"primitive\" library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-foreign" = callPackage
@@ -203927,8 +191426,6 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base doctest QuickCheck ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-maybe" = callPackage
@@ -203946,8 +191443,6 @@ self: {
        ];
        description = "Arrays of Maybes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-offset" = callPackage
@@ -203973,8 +191468,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq random vector ];
        description = "SIMD data types and functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-sort" = callPackage
@@ -203996,8 +191489,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ];
        description = "Sort primitive arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-stablename" = callPackage
@@ -204009,8 +191500,6 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "primitive operations on StableNames";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-unaligned" = callPackage
@@ -204042,8 +191531,6 @@ self: {
        ];
        description = "Primitive GHC types with unlifted types inside";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primula-board" = callPackage
@@ -204066,8 +191553,6 @@ self: {
        ];
        description = "ImageBoard on Happstack and HSP";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primula-bot" = callPackage
@@ -204086,8 +191571,6 @@ self: {
        ];
        description = "Jabber-bot for primula-board ImageBoard";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pringletons" = callPackage
@@ -204104,8 +191587,6 @@ self: {
        ];
        description = "Classes and data structures complementing the singletons library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "print-console-colors" = callPackage
@@ -204131,8 +191612,6 @@ self: {
        libraryHaskellDepends = [ base split ];
        description = "Debug print formatting library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "print-info" = callPackage
@@ -204160,8 +191639,6 @@ self: {
        ];
        description = "Pretty printing with indentation, mixfix operators, and automatic line breaks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "printf-mauke" = callPackage
@@ -204203,8 +191680,6 @@ self: {
        ];
        description = "The Artist Formerly Known as Prints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "printxosd" = callPackage
@@ -204229,8 +191704,6 @@ self: {
        libraryHaskellDepends = [ base containers queue reord stateref ];
        description = "Simple implementation of a priority queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "priority-sync" = callPackage
@@ -204333,8 +191806,6 @@ self: {
        ];
        description = "Easy and reasonably efficient probabilistic programming and random generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proc" = callPackage
@@ -204353,8 +191824,6 @@ self: {
        ];
        description = "Parse process information for Linux";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proc-net" = callPackage
@@ -204405,8 +191874,6 @@ self: {
        ];
        description = "Conduits for processes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "process-extras" = callPackage
@@ -204442,8 +191909,6 @@ self: {
        ];
        description = "IterIO Process Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "process-leksah" = callPackage
@@ -204455,8 +191920,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath unix ];
        description = "Process libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "process-listlike" = callPackage
@@ -204473,8 +191936,6 @@ self: {
        ];
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "process-progress" = callPackage
@@ -204491,8 +191952,6 @@ self: {
        ];
        description = "Run a process and do reportsing on its progress";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "process-qq" = callPackage
@@ -204509,8 +191968,6 @@ self: {
        ];
        description = "Quasi-Quoters for exec process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "process-streaming" = callPackage
@@ -204542,8 +191999,6 @@ self: {
        ];
        description = "Streaming interface to system processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "processing" = callPackage
@@ -204562,8 +192017,6 @@ self: {
        ];
        description = "Web graphic applications with processing.js.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "processing-for-haskell" = callPackage
@@ -204591,8 +192044,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring process ];
        description = "C bindings for the gnu-extension functions process_vm_readv and process_vm_writev";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "processor-creative-kit" = callPackage
@@ -204631,8 +192082,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell values that cannot be evaluated immediately";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "procstat" = callPackage
@@ -204644,8 +192093,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "get information on processes in Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proctest" = callPackage
@@ -204681,8 +192128,6 @@ self: {
        ];
        description = "Simple streaming datatype";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "product" = callPackage
@@ -204740,8 +192185,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Generate flamegraphs from ghc RTS .prof files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prof2dot" = callPackage
@@ -204757,8 +192200,6 @@ self: {
        ];
        description = "Convert GHC profiles into GraphViz's dot format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prof2pretty" = callPackage
@@ -204777,8 +192218,6 @@ self: {
        ];
        description = "generate pretty source from time/allocation profiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "profiterole" = callPackage
@@ -204867,8 +192306,6 @@ self: {
        ];
        description = "Monadic bidirectional programming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "profunctor-optics" = callPackage
@@ -204938,8 +192375,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Simple progress tracking & projection library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "progress-meter" = callPackage
@@ -204951,8 +192386,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal async base stm ];
        description = "Live diagnostics for concurrent activity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "progress-reporting" = callPackage
@@ -204966,8 +192399,6 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl time ];
        description = "Functionality for reporting function progress";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "progressbar" = callPackage
@@ -204981,8 +192412,6 @@ self: {
        libraryHaskellDepends = [ base io-reactive ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "progression" = callPackage
@@ -204999,8 +192428,6 @@ self: {
        ];
        description = "Automates the recording and graphing of criterion benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "progressive" = callPackage
@@ -205019,8 +192446,6 @@ self: {
        ];
        description = "Multilabel classification model which learns sequentially (online)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proj4-hs-bindings" = callPackage
@@ -205033,8 +192458,6 @@ self: {
        librarySystemDepends = [ proj ];
        description = "Haskell bindings for the Proj4 C dynamic library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) proj;};
 
   "project-m36" = callPackage
@@ -205106,8 +192529,6 @@ self: {
        ];
        description = "Relational Algebra Engine";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "project-template" = callPackage
@@ -205148,8 +192569,6 @@ self: {
        ];
        description = "Go to README.md";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "projection" = callPackage
@@ -205191,8 +192610,6 @@ self: {
        ];
        description = "Profunctor-based lightweight implementation of optics";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prolog" = callPackage
@@ -205209,8 +192626,6 @@ self: {
        ];
        description = "A Prolog interpreter written in Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prolog-graph" = callPackage
@@ -205228,8 +192643,6 @@ self: {
        ];
        description = "A command line tool to visualize query resolution in Prolog";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prolog-graph-lib" = callPackage
@@ -205241,8 +192654,6 @@ self: {
        libraryHaskellDepends = [ base fgl graphviz mtl prolog text ];
        description = "Generating images of resolution trees for Prolog queries";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prologue" = callPackage
@@ -205268,8 +192679,6 @@ self: {
        ];
        description = "Better, more general Prelude exporting common utilities";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prolude" = callPackage
@@ -205286,8 +192695,6 @@ self: {
        ];
        description = "ITProTV's custom prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prometheus" = callPackage
@@ -205358,8 +192765,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Instrument applications with metrics and publish/push to Prometheus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prometheus-metrics-ghc" = callPackage
@@ -205423,8 +192828,6 @@ self: {
        libraryHaskellDepends = [ async base ];
        description = "A monadic interface for async";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "promises" = callPackage
@@ -205467,8 +192870,6 @@ self: {
        ];
        description = "A library for interfacing with the CMU Pronouncing Dictionary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proof-combinators" = callPackage
@@ -205480,8 +192881,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Proof Combinators used in Liquid Haskell for Theorem Proving";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "propane" = callPackage
@@ -205497,8 +192896,6 @@ self: {
        ];
        description = "Functional synthesis of images and animations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "propeller" = callPackage
@@ -205532,8 +192929,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "property-based host configuration management in haskell";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "properties" = callPackage
@@ -205545,8 +192940,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "check quickCheck properties in real time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "property" = callPackage
@@ -205577,8 +192970,6 @@ self: {
        ];
        description = "Apple property list parser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proplang" = callPackage
@@ -205590,8 +192981,6 @@ self: {
        libraryHaskellDepends = [ base glade glib gtk ];
        description = "A library for functional GUI development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "props" = callPackage
@@ -205682,8 +193071,6 @@ self: {
        ];
        description = "Bindings to the Prosper marketplace API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proteaaudio" = callPackage
@@ -205738,8 +193125,6 @@ self: {
        ];
        description = "neovim project manager";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proto-lens" = callPackage
@@ -205797,8 +193182,6 @@ self: {
        ];
        description = "Utilities functions to proto-lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proto-lens-descriptors" = callPackage
@@ -205815,8 +193198,6 @@ self: {
        ];
        description = "Protocol buffers for describing the definitions of messages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proto-lens-jsonpb" = callPackage
@@ -205833,8 +193214,6 @@ self: {
        ];
        description = "JSON protobuf encoding for proto-lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proto-lens-optparse" = callPackage
@@ -205959,8 +193338,6 @@ self: {
        ];
        description = "A low level library for writing out data in the Protocol Buffers wire format";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proto3-wire" = callPackage
@@ -206052,8 +193429,6 @@ self: {
        ];
        description = "Protocol Buffers via C++";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "protobuf-simple" = callPackage
@@ -206107,8 +193482,6 @@ self: {
        ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
@@ -206125,8 +193498,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;
-       broken = true;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -206143,8 +193514,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;
-       broken = true;
      }) {};
 
   "protocol-buffers-fork" = callPackage
@@ -206161,8 +193530,6 @@ self: {
        ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "protocol-radius" = callPackage
@@ -206229,8 +193596,6 @@ self: {
        ];
        description = "Protolude with lifted-base and lifted-async";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proton-haskell" = callPackage
@@ -206249,8 +193614,6 @@ self: {
        ];
        description = "Simple XML templating library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prototype" = callPackage
@@ -206262,8 +193625,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf ];
        description = "prototype-based programming on Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prove-everywhere-server" = callPackage
@@ -206284,8 +193645,6 @@ self: {
        ];
        description = "The server for ProveEverywhere";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "provenience" = callPackage
@@ -206304,8 +193663,6 @@ self: {
        ];
        description = "Computations that automatically track data dependencies";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proxied" = callPackage
@@ -206339,8 +193696,6 @@ self: {
        libraryHaskellDepends = [ base tagged ];
        description = "A library for kind-polymorphic manipulation and inspection of Proxy values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proxy-mapping" = callPackage
@@ -206352,8 +193707,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mapping of Proxy Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "psc-ide" = callPackage
@@ -206383,8 +193736,6 @@ self: {
        ];
        description = "Language support for the PureScript programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pseudo-boolean" = callPackage
@@ -206409,8 +193760,6 @@ self: {
        ];
        description = "Reading/Writing OPB/WBO files used in pseudo boolean competition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pseudo-trie" = callPackage
@@ -206424,8 +193773,6 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "A tagged rose-tree with short circuited unique leaves";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pseudomacros" = callPackage
@@ -206548,8 +193895,6 @@ self: {
        ];
        description = "Abstractions for operations on pointers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ptr-poker" = callPackage
@@ -206565,8 +193910,6 @@ self: {
        benchmarkHaskellDepends = [ gauge rerebase ];
        description = "Pointer poking action construction and composition toolkit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pub" = callPackage
@@ -206636,8 +193979,6 @@ self: {
        testHaskellDepends = [ base cereal HUnit publicsuffixlist ];
        description = "Create the publicsuffixlist package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "publish" = callPackage
@@ -206665,8 +194006,6 @@ self: {
        ];
        description = "Publishing tools for papers, books, and presentations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pubnub" = callPackage
@@ -206699,8 +194038,6 @@ self: {
        ];
        description = "PubNub Haskell SDK";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pubsub" = callPackage
@@ -206719,8 +194056,6 @@ self: {
        executableHaskellDepends = [ fastcgi ];
        description = "A library for Google/SixApart pubsub hub interaction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "puffytools" = callPackage
@@ -206750,8 +194085,6 @@ self: {
        ];
        description = "A CLI assistant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pugixml" = callPackage
@@ -206768,8 +194101,6 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        description = "pugixml binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pugs-DrIFT" = callPackage
@@ -206793,8 +194124,6 @@ self: {
        ];
        description = "DrIFT with pugs-specific rules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pugs-HsSyck" = callPackage
@@ -206827,8 +194156,6 @@ self: {
        ];
        description = "Portable Haskell/POSIX layer for Pugs";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pugs-hsregex" = callPackage
@@ -206840,8 +194167,6 @@ self: {
        libraryHaskellDepends = [ array base haskell98 ];
        description = "Haskell PCRE binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pulse" = callPackage
@@ -206897,8 +194222,6 @@ self: {
        ];
        description = "Multilingual unsupervised sentence tokenization with Punkt";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "punycode" = callPackage
@@ -206933,8 +194256,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "pure-cdb" = callPackage
@@ -206953,8 +194274,6 @@ self: {
        ];
        description = "Another pure-haskell CDB (Constant Database) implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pure-fft" = callPackage
@@ -206979,8 +194298,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Pure IO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pure-priority-queue" = callPackage
@@ -206992,8 +194309,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A pure priority queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pure-priority-queue-tests" = callPackage
@@ -207012,8 +194327,6 @@ self: {
        ];
        description = "Tests for the pure-priority-queue package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pure-shuffle" = callPackage
@@ -207101,8 +194414,6 @@ self: {
        ];
        description = "types and parser for email messages (including MIME)";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "purescheme-wai-routing-core" = callPackage
@@ -207197,8 +194508,6 @@ self: {
        doCheck = false;
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -207265,8 +194574,6 @@ self: {
        ];
        description = "Isomorphic trivial data type definitions over JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "purescript-tsd-gen" = callPackage
@@ -207289,8 +194596,6 @@ self: {
        ];
        description = "TypeScript Declaration File (.d.ts) generator for PureScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pursuit-client" = callPackage
@@ -207307,8 +194612,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A cli client for pursuit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "push-notifications" = callPackage
@@ -207328,8 +194631,6 @@ self: {
        ];
        description = "Push notifications for Android and iOS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "push-notify" = callPackage
@@ -207353,8 +194654,6 @@ self: {
        ];
        description = "A server-side library for sending push notifications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "push-notify-apn" = callPackage
@@ -207380,8 +194679,6 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "Send push notifications to mobile iOS devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "push-notify-ccs" = callPackage
@@ -207401,8 +194698,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "push-notify-general" = callPackage
@@ -207421,8 +194716,6 @@ self: {
        ];
        description = "A general library for sending/receiving push notif. through dif. services.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pushbullet" = callPackage
@@ -207471,8 +194764,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A Pusher.com client written in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pusher-http-haskell" = callPackage
@@ -207513,8 +194804,6 @@ self: {
        ];
        description = "Implementation of the Pusher WebSocket protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pushme" = callPackage
@@ -207540,8 +194829,6 @@ self: {
        ];
        description = "Tool to synchronize directories with rsync, zfs or git-annex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pushover" = callPackage
@@ -207578,8 +194865,6 @@ self: {
        ];
        description = "Put-based lens library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "puzzle-draw" = callPackage
@@ -207611,8 +194896,6 @@ self: {
        ];
        description = "Creating graphics for pencil puzzles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "puzzle-draw-cmdline" = callPackage
@@ -207631,8 +194914,6 @@ self: {
        ];
        description = "Creating graphics for pencil puzzles, command line tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pvar" = callPackage
@@ -207670,8 +194951,6 @@ self: {
        executableSystemDepends = [ libdevil ];
        description = "A photo viewer daemon application with remote controlling abilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "pvss" = callPackage
@@ -207776,8 +195055,6 @@ self: {
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) python;};
 
   "pyfi" = callPackage
@@ -207794,8 +195071,6 @@ self: {
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) python;};
 
   "python-pickle" = callPackage
@@ -207819,8 +195094,6 @@ self: {
        ];
        description = "Serialization/deserialization using Python Pickle format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "q4c12-twofinger" = callPackage
@@ -207839,8 +195112,6 @@ self: {
        ];
        description = "Efficient alternating finger trees";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qc-oi-testgenerator" = callPackage
@@ -207854,8 +195125,6 @@ self: {
        ];
        description = "Compile time generation of operation invariance tests for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qchas" = callPackage
@@ -207884,8 +195153,6 @@ self: {
        librarySystemDepends = [ qd ];
        description = "double-double and quad-double number type via libqd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {qd = null;};
 
   "qd-vec" = callPackage
@@ -207897,8 +195164,6 @@ self: {
        libraryHaskellDepends = [ base qd Vec ];
        description = "'Vec' instances for 'qd' types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qed" = callPackage
@@ -207917,8 +195182,6 @@ self: {
        testHaskellDepends = [ base transformers ];
        description = "Simple prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qhs" = callPackage
@@ -207942,8 +195205,6 @@ self: {
        ];
        description = "Command line tool qhs, SQL queries on CSV and TSV files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qhull-simple" = callPackage
@@ -207956,8 +195217,6 @@ self: {
        librarySystemDepends = [ qhull ];
        description = "Simple bindings to Qhull, a library for computing convex hulls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) qhull;};
 
   "qif" = callPackage
@@ -207977,8 +195236,6 @@ self: {
        ];
        description = "A simple QIF file format parser / printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qlinear" = callPackage
@@ -208079,8 +195336,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Library to generate images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) qrencode;};
 
   "qr-repa" = callPackage
@@ -208100,8 +195355,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Library to generate QR codes from bytestrings and objects and scale image files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qrcode" = callPackage
@@ -208157,8 +195410,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "quantity semaphores";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qt" = callPackage
@@ -208319,8 +195570,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Quant finance library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quantification" = callPackage
@@ -208368,8 +195617,6 @@ self: {
        libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ];
        description = "An embedding of quantum computation as a Haskell arrow";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quantum-random" = callPackage
@@ -208392,8 +195639,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Retrieve, store and manage real quantum random data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quarantimer" = callPackage
@@ -208415,8 +195660,6 @@ self: {
        ];
        description = "Coronavirus quarantine timer web app for your things";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qudb" = callPackage
@@ -208435,8 +195678,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Quite Useless DB";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quenya-verb" = callPackage
@@ -208459,8 +195700,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Quenya verb conjugator";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "queryparser" = callPackage
@@ -208480,8 +195719,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Analysis and parsing library for SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "queryparser-demo" = callPackage
@@ -208498,8 +195735,6 @@ self: {
        ];
        description = "Demo package containing queryparser examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "queryparser-hive" = callPackage
@@ -208519,8 +195754,6 @@ self: {
        ];
        description = "Parsing for Hive SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "queryparser-presto" = callPackage
@@ -208540,8 +195773,6 @@ self: {
        ];
        description = "Parsing for Presto SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "queryparser-vertica" = callPackage
@@ -208561,8 +195792,6 @@ self: {
        ];
        description = "Parsing for Vertica SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "querystring-pickle" = callPackage
@@ -208596,8 +195825,6 @@ self: {
        ];
        description = "A package for prompting values from the command-line";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "queue" = callPackage
@@ -208620,8 +195847,6 @@ self: {
        libraryHaskellDepends = [ array base containers mtl stateful-mtl ];
        description = "A library of queuelike data structures, both functional and stateful";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quick-generator" = callPackage
@@ -208652,8 +195877,6 @@ self: {
        ];
        description = "Slimmed down json schema language and validator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickbench" = callPackage
@@ -208674,8 +195897,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "quick & easy benchmarking of command-line programs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickbooks" = callPackage
@@ -208694,8 +195915,6 @@ self: {
        ];
        description = "QuickBooks API binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-arbitrary-adt" = callPackage
@@ -208729,8 +195948,6 @@ self: {
        ];
        description = "Generate QuickCheck Gen for Sum Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-assertions" = callPackage
@@ -208792,8 +196009,6 @@ self: {
        sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd";
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-enum-instances" = callPackage
@@ -208901,8 +196116,6 @@ self: {
        ];
        description = "Automating QuickCheck for polymorphic and overlaoded properties";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-properties" = callPackage
@@ -208925,8 +196138,6 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Combinators for Quickcheck Property construction and diagnostics";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-property-monad" = callPackage
@@ -208938,8 +196149,6 @@ self: {
        libraryHaskellDepends = [ base either QuickCheck transformers ];
        description = "A monad for generating QuickCheck properties without Arbitrary instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-regex" = callPackage
@@ -208955,8 +196164,6 @@ self: {
        ];
        description = "Generate regex-constrained strings for QuickCheck";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-relaxng" = callPackage
@@ -208972,8 +196179,6 @@ self: {
        ];
        description = "Generate RelaxNG-constrained XML documents for QuickCheck";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-rematch" = callPackage
@@ -208986,8 +196191,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck rematch ];
        description = "QuickCheck support for rematch";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-report" = callPackage
@@ -209003,8 +196206,6 @@ self: {
        ];
        description = "Customizable reports for quickcheck properties";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-script" = callPackage
@@ -209079,8 +196280,6 @@ self: {
        ];
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-state-machine-distributed" = callPackage
@@ -209104,8 +196303,6 @@ self: {
        ];
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-string-random" = callPackage
@@ -209167,8 +196364,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck transformers webdriver ];
        description = "Utilities for using WebDriver with QuickCheck";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-with-counterexamples" = callPackage
@@ -209235,8 +196430,6 @@ self: {
        testHaskellDepends = [ base directory filepath QuickCheck ];
        description = "Generate Main module with QuickCheck tests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickselect" = callPackage
@@ -209262,8 +196455,6 @@ self: {
        libraryHaskellDepends = [ base vector vector-algorithms ];
        description = "Very fast and memory-compact query-only set and map structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickson" = callPackage
@@ -209326,8 +196517,6 @@ self: {
        ];
        description = "A reflective batch tester for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickwebapp" = callPackage
@@ -209346,8 +196535,6 @@ self: {
        ];
        description = "A quick webapp generator for any file processing tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiet" = callPackage
@@ -209440,8 +196627,6 @@ self: {
        ];
        description = "An embedded, scalable functional programming language for quantum computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quipper-demos" = callPackage
@@ -209520,8 +196705,6 @@ self: {
        ];
        description = "An embedded, scalable functional programming language for quantum computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quipper-tools" = callPackage
@@ -209570,8 +196753,6 @@ self: {
        libraryHaskellDepends = [ base mmorph transformers ];
        description = "Quiver finite stream processing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-binary" = callPackage
@@ -209588,8 +196769,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver transformers ];
        description = "Binary serialisation support for Quivers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-bytestring" = callPackage
@@ -209601,8 +196780,6 @@ self: {
        libraryHaskellDepends = [ base bytestring quiver ];
        description = "Quiver combinators for bytestring streaming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-cell" = callPackage
@@ -209614,8 +196791,6 @@ self: {
        libraryHaskellDepends = [ base data-cell quiver ];
        description = "Quiver combinators for cellular data processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-csv" = callPackage
@@ -209631,8 +196806,6 @@ self: {
        ];
        description = "Quiver combinators for cellular CSV data processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-enumerator" = callPackage
@@ -209644,8 +196817,6 @@ self: {
        libraryHaskellDepends = [ base enumerator quiver ];
        description = "Bridge between Quiver and Iteratee paradigms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-groups" = callPackage
@@ -209658,8 +196829,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Group and chunk values within a Quiver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-http" = callPackage
@@ -209677,8 +196846,6 @@ self: {
        ];
        description = "Adapter to stream over HTTP(s) with quiver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-instances" = callPackage
@@ -209694,8 +196861,6 @@ self: {
        ];
        description = "Extra instances for Quiver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-interleave" = callPackage
@@ -209708,8 +196873,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Interleave values from multiple Quivers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-sort" = callPackage
@@ -209733,8 +196896,6 @@ self: {
        ];
        description = "Sort the values in a quiver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quokka" = callPackage
@@ -209753,8 +196914,6 @@ self: {
        ];
        description = "Test helpers which help generate data for projects that use postgresql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quoridor-hs" = callPackage
@@ -209779,8 +196938,6 @@ self: {
        testHaskellDepends = [ base HUnit mtl ];
        description = "A Quoridor implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qux" = callPackage
@@ -209799,8 +196956,6 @@ self: {
        ];
        description = "Command line binary for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "r-glpk-phonetic-languages-ukrainian-durations" = callPackage
@@ -209872,8 +197027,6 @@ self: {
        ];
        description = "The raaz cryptographic library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rabocsv2qif" = callPackage
@@ -209903,8 +197056,6 @@ self: {
        libraryHaskellDepends = [ array base containers data-reify ];
        description = "Reverse Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "radian" = callPackage
@@ -209919,8 +197070,6 @@ self: {
        testHaskellDepends = [ base HUnit lens ];
        description = "Isomorphisms for measurements that use radians";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "radium" = callPackage
@@ -209937,8 +197086,6 @@ self: {
        ];
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "radium-formula-parser" = callPackage
@@ -209954,8 +197101,6 @@ self: {
        ];
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "radius" = callPackage
@@ -209984,8 +197129,6 @@ self: {
        executableHaskellDepends = [ base filepath ];
        description = "Command-line tool for emitting numbers in various bases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "radix-tree" = callPackage
@@ -210054,8 +197197,6 @@ self: {
        ];
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {rados = null;};
 
   "raft" = callPackage
@@ -210074,8 +197215,6 @@ self: {
        ];
        description = "Miscellaneous Haskell utilities for data structures and data manipulation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rail-compiler-editor" = callPackage
@@ -210098,8 +197237,6 @@ self: {
        testHaskellDepends = [ base containers HUnit process ];
        description = "Compiler and editor for the esolang rail";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rails-session" = callPackage
@@ -210123,8 +197260,6 @@ self: {
        ];
        description = "Decrypt Ruby on Rails sessions in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rainbow" = callPackage
@@ -210155,8 +197290,6 @@ self: {
        ];
        description = "Tests and QuickCheck generators to accompany rainbow";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rainbox" = callPackage
@@ -210217,8 +197350,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "distributed-process node";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rakhana" = callPackage
@@ -210235,8 +197366,6 @@ self: {
        ];
        description = "Stream based PDF library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rakuten" = callPackage
@@ -210261,8 +197390,6 @@ self: {
        ];
        description = "The Rakuten API in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ral" = callPackage
@@ -210323,8 +197450,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rallod" = callPackage
@@ -210337,8 +197462,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "'$' in reverse";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "raml" = callPackage
@@ -210354,8 +197477,6 @@ self: {
        ];
        description = "RESTful API Modeling Language (RAML) library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rampart" = callPackage
@@ -210394,8 +197515,6 @@ self: {
        libraryHaskellDepends = [ array base IntervalMap mtl random ];
        description = "Random variable library, with Functor, Applicative and Monad instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "randfile" = callPackage
@@ -210414,8 +197533,6 @@ self: {
        ];
        description = "Program for picking a random file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rando" = callPackage
@@ -210430,8 +197547,6 @@ self: {
        ];
        description = "Easy-to-use randomness for livecoding";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random" = callPackage
@@ -210505,8 +197620,6 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "Random-access lists in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-bytestring" = callPackage
@@ -210548,8 +197661,6 @@ self: {
        libraryHaskellDepends = [ base random template-haskell ];
        description = "A Template Haskell helper for deriving Random instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-eff" = callPackage
@@ -210561,8 +197672,6 @@ self: {
        libraryHaskellDepends = [ base extensible-effects random ];
        description = "A simple random generator library for extensible-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-effin" = callPackage
@@ -210574,8 +197683,6 @@ self: {
        libraryHaskellDepends = [ base effin random ];
        description = "A simple random generator library for effin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-extras" = callPackage
@@ -210590,8 +197697,6 @@ self: {
        ];
        description = "Additional functions for random values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-fu" = callPackage
@@ -210609,8 +197714,6 @@ self: {
        ];
        description = "Random number generation";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-fu_0_2_7_7" = callPackage
@@ -210629,7 +197732,6 @@ self: {
        description = "Random number generation";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-fu-multivariate" = callPackage
@@ -210642,8 +197744,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Multivariate distributions for random-fu";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-hypergeometric" = callPackage
@@ -210661,8 +197761,6 @@ self: {
        ];
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-names" = callPackage
@@ -210702,8 +197800,6 @@ self: {
        ];
        description = "Generic basis for random number generators";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-source_0_3_0_11" = callPackage
@@ -210722,7 +197818,6 @@ self: {
        description = "Generic basis for random number generators";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-stream" = callPackage
@@ -210734,8 +197829,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring random ];
        description = "An infinite stream of random data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-string" = callPackage
@@ -210900,8 +197993,6 @@ self: {
        ];
        description = "A Range type with vector-space instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rangemin" = callPackage
@@ -210913,8 +198004,6 @@ self: {
        libraryHaskellDepends = [ base containers primitive vector ];
        description = "Linear range-min algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ranges" = callPackage
@@ -210944,8 +198033,6 @@ self: {
        ];
        description = "Find the rank product of a data set";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rank1dynamic" = callPackage
@@ -210962,8 +198049,6 @@ self: {
        ];
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rank2classes" = callPackage
@@ -211022,8 +198107,6 @@ self: {
        ];
        description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rapid-term" = callPackage
@@ -211039,8 +198122,6 @@ self: {
        ];
        description = "External terminal support for rapid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa" = callPackage
@@ -211065,8 +198146,6 @@ self: {
        ];
        description = "A modular text editor";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-example-config" = callPackage
@@ -211086,8 +198165,6 @@ self: {
        ];
        description = "Example user config for Rasa";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-bufs" = callPackage
@@ -211102,8 +198179,6 @@ self: {
        ];
        description = "Rasa Ext for useful buffer utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-cmd" = callPackage
@@ -211118,8 +198193,6 @@ self: {
        ];
        description = "Rasa Ext for running commands";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-cursors" = callPackage
@@ -211135,8 +198208,6 @@ self: {
        ];
        description = "Rasa Ext adding cursor(s)";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-files" = callPackage
@@ -211153,8 +198224,6 @@ self: {
        ];
        description = "Rasa Ext for filesystem actions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-logger" = callPackage
@@ -211166,8 +198235,6 @@ self: {
        libraryHaskellDepends = [ base lens mtl rasa ];
        description = "Rasa Ext for logging state/actions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-slate" = callPackage
@@ -211184,8 +198251,6 @@ self: {
        ];
        description = "Rasa extension for rendering to terminal with vty";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-status-bar" = callPackage
@@ -211197,8 +198262,6 @@ self: {
        libraryHaskellDepends = [ base data-default lens rasa yi-rope ];
        description = "Rasa Ext for populating status-bar";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-style" = callPackage
@@ -211210,8 +198273,6 @@ self: {
        libraryHaskellDepends = [ base data-default lens rasa ];
        description = "Rasa Ext managing rendering styles";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-views" = callPackage
@@ -211228,8 +198289,6 @@ self: {
        ];
        description = "Rasa Ext managing rendering views";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-vim" = callPackage
@@ -211248,8 +198307,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Rasa Ext for vim bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rascal" = callPackage
@@ -211278,8 +198335,6 @@ self: {
        ];
        description = "A command-line client for Reddit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasterific-svg" = callPackage
@@ -211417,8 +198472,6 @@ self: {
        ];
        description = "finite or repeating lists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rattle" = callPackage
@@ -211452,8 +198505,6 @@ self: {
        ];
        description = "Forward build system, with caching and speculation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rattletrap" = callPackage
@@ -211485,8 +198536,6 @@ self: {
        ];
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "raven-haskell" = callPackage
@@ -211522,8 +198571,6 @@ self: {
        ];
        description = "Sentry http interface for Scotty web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "raw-feldspar" = callPackage
@@ -211547,8 +198594,6 @@ self: {
        ];
        description = "Resource-Aware Feldspar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "raw-strings-qq" = callPackage
@@ -211590,8 +198635,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Anonymous extensible records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rawstring-qm" = callPackage
@@ -211620,8 +198663,6 @@ self: {
        ];
        description = "Random Access Zippers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "razom-text-util" = callPackage
@@ -211640,8 +198681,6 @@ self: {
        testHaskellDepends = [ base QuickCheck regex-applicative smaoin ];
        description = "Common text/parsing tools for Razom language packages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rbpcp-api" = callPackage
@@ -211677,8 +198716,6 @@ self: {
        executableHaskellDepends = [ base bio bytestring containers ];
        description = "Mask nucleotide (EST) sequences in Fasta format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rbst" = callPackage
@@ -211724,8 +198761,6 @@ self: {
        ];
        description = "Reservoir Computing, fast RNNs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rclient" = callPackage
@@ -211741,8 +198776,6 @@ self: {
        ];
        description = "Haskell client for Rserve";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rcu" = callPackage
@@ -211841,8 +198874,6 @@ self: {
        ];
        description = "A Haskell wrapper for Rdio's API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rdtsc" = callPackage
@@ -211896,8 +198927,6 @@ self: {
        ];
        description = "A binding to React based on the Flux application architecture for GHCJS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "react-flux-servant" = callPackage
@@ -211909,8 +198938,6 @@ self: {
        libraryHaskellDepends = [ aeson base react-flux servant text ];
        description = "Allow react-flux stores to send requests to a servant server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "react-haskell" = callPackage
@@ -211928,8 +198955,6 @@ self: {
        ];
        description = "Haskell React bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "react-tutorial-haskell-server" = callPackage
@@ -211947,8 +198972,6 @@ self: {
        ];
        description = "react-tutorial web server";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reaction-logic" = callPackage
@@ -211963,8 +198986,6 @@ self: {
        executableHaskellDepends = [ base mtl QuickCheck ];
        description = "pluggable pure logic serializable reactor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive" = callPackage
@@ -211994,8 +199015,6 @@ self: {
        testHaskellDepends = [ base containers HUnit old-time stm ];
        description = "FRP (functional reactive programming) framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-balsa" = callPackage
@@ -212017,8 +199036,6 @@ self: {
        ];
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana" = callPackage
@@ -212041,8 +199058,6 @@ self: {
        ];
        description = "Library for functional reactive programming (FRP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-automation" = callPackage
@@ -212059,8 +199074,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "home (etc) automation using reactive-banana";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-bunch" = callPackage
@@ -212076,8 +199089,6 @@ self: {
        ];
        description = "Extend reactive-banana to multiple events per time point";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-gi-gtk" = callPackage
@@ -212094,8 +199105,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simple reactive programming with GTK GObject Introspection";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-sdl" = callPackage
@@ -212112,8 +199121,6 @@ self: {
        ];
        description = "Reactive Banana bindings for SDL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-sdl2" = callPackage
@@ -212126,8 +199133,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Reactive Banana integration with SDL2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-threepenny" = callPackage
@@ -212142,8 +199147,6 @@ self: {
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        description = "Examples for the reactive-banana library, using threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-wx" = callPackage
@@ -212161,8 +199164,6 @@ self: {
        ];
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-fieldtrip" = callPackage
@@ -212179,8 +199180,6 @@ self: {
        ];
        description = "Connect Reactive and FieldTrip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-glut" = callPackage
@@ -212196,8 +199195,6 @@ self: {
        ];
        description = "Connects Reactive and GLUT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-haskell" = callPackage
@@ -212240,8 +199237,6 @@ self: {
        ];
        description = "Process MIDI events via reactive-banana and JACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-midyim" = callPackage
@@ -212261,8 +199256,6 @@ self: {
        ];
        description = "Process MIDI events via reactive-banana";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-thread" = callPackage
@@ -212279,8 +199272,6 @@ self: {
        ];
        description = "Reactive programming via imperative threads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactivity" = callPackage
@@ -212315,8 +199306,6 @@ self: {
        ];
        description = "Reactor - task parallel reactive programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "read-bounded" = callPackage
@@ -212328,8 +199317,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Class for reading bounded values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "read-ctags" = callPackage
@@ -212352,8 +199339,6 @@ self: {
          base bytestring containers directory hspec text
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "read-editor" = callPackage
@@ -212391,8 +199376,6 @@ self: {
        testHaskellDepends = [ base containers directory filepath hspec ];
        description = "Read IO library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "readability" = callPackage
@@ -212466,8 +199449,6 @@ self: {
        librarySystemDepends = [ ncurses readline ];
        description = "An interface to the GNU readline library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline;};
 
   "readline-statevar" = callPackage
@@ -212479,8 +199460,6 @@ self: {
        libraryHaskellDepends = [ base readline StateVar ];
        description = "Readline with variables (setX/getY) wrapped in state vars";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "readme-lhs" = callPackage
@@ -212502,8 +199481,6 @@ self: {
        testHaskellDepends = [ base containers doctest ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "readpyc" = callPackage
@@ -212517,8 +199494,6 @@ self: {
        executableHaskellDepends = [ base bliplib parseargs ];
        description = "Read and pretty print Python bytecode (.pyc) files.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "readshp" = callPackage
@@ -212536,8 +199511,6 @@ self: {
        ];
        description = "Code for reading ESRI Shapefiles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "real-day-end" = callPackage
@@ -212565,8 +199538,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "A really simple XML parser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reanimate" = callPackage
@@ -212604,8 +199575,6 @@ self: {
        ];
        description = "Animation library based on SVGs";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reanimate-svg" = callPackage
@@ -212663,8 +199632,6 @@ self: {
        libraryHaskellDepends = [ base mtl split template-haskell ];
        description = "Lens implementation. It is more small but adequately.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reasonable-operational" = callPackage
@@ -212773,8 +199740,6 @@ self: {
        ];
        description = "Anonymous records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "record-aeson" = callPackage
@@ -212791,8 +199756,6 @@ self: {
        testHaskellDepends = [ aeson base-prelude hspec record ];
        description = "Instances of \"aeson\" classes for the \"record\" types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "record-dot-preprocessor" = callPackage
@@ -212826,8 +199789,6 @@ self: {
        ];
        description = "Generic encoding of records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "record-gl" = callPackage
@@ -212851,8 +199812,6 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "record-hasfield" = callPackage
@@ -212884,8 +199843,6 @@ self: {
        doHaddock = false;
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "record-syntax" = callPackage
@@ -212909,8 +199866,6 @@ self: {
        ];
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "record-wrangler" = callPackage
@@ -212936,8 +199891,6 @@ self: {
        libraryHaskellDepends = [ base kinds type-functions ];
        description = "A flexible record system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "records-sop" = callPackage
@@ -212972,8 +199925,6 @@ self: {
        ];
        description = "Template Haskell declarations for the records package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "recursion" = callPackage
@@ -213066,8 +200017,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck template-haskell ];
        description = "Auto-generate final encodings and their isomorphisms using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "red-black-record" = callPackage
@@ -213139,8 +200088,6 @@ self: {
        ];
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "redis" = callPackage
@@ -213157,8 +200104,6 @@ self: {
        ];
        description = "A driver for Redis key-value database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "redis-hs" = callPackage
@@ -213170,8 +200115,6 @@ self: {
        libraryHaskellDepends = [ base bytestring network utf8-string ];
        description = "A simple Redis library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "redis-io" = callPackage
@@ -213200,8 +200143,6 @@ self: {
        ];
        description = "Yet another redis client";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "redis-job-queue" = callPackage
@@ -213241,8 +200182,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring redis ];
        description = "Simple redis bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rediscaching-haxl" = callPackage
@@ -213258,8 +200197,6 @@ self: {
        ];
        description = "Combine redis caching and haxl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "redland" = callPackage
@@ -213272,8 +200209,6 @@ self: {
        libraryPkgconfigDepends = [ raptor2 redland ];
        description = "Redland RDF library bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {raptor2 = null; redland = null;};
 
   "redo" = callPackage
@@ -213316,8 +200251,6 @@ self: {
        ];
        description = "Simplify a set of equations by removing redundancies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reducers" = callPackage
@@ -213364,8 +200297,6 @@ self: {
        ];
        description = "Reed-Solomon Erasure Coding in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reenact" = callPackage
@@ -213379,8 +200310,6 @@ self: {
        ];
        description = "A reimplementation of the Reactive library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reexport-crypto-random" = callPackage
@@ -213402,8 +200331,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ref-extras" = callPackage
@@ -213420,8 +200347,6 @@ self: {
        ];
        description = "Extra stuff for mutable references";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ref-fd" = callPackage
@@ -213444,8 +200369,6 @@ self: {
        libraryHaskellDepends = [ base mtl stm transformers ];
        description = "A type class for monads with references compatible with the mtl2 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ref-tf" = callPackage
@@ -213489,8 +200412,6 @@ self: {
        ];
        description = "Container with element counts";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reference" = callPackage
@@ -213524,8 +200445,6 @@ self: {
        ];
        description = "Selectors for reading and updating data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "refh" = callPackage
@@ -213543,8 +200462,6 @@ self: {
        ];
        description = "A command-line tool for pasting to https://www.refheap.com";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "refined" = callPackage
@@ -213573,8 +200490,6 @@ self: {
        libraryHaskellDepends = [ base http-api-data refined text ];
        description = "http-api-data instances for refined types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "refinery" = callPackage
@@ -213637,8 +200552,6 @@ self: {
        ];
        description = "Utilities for the reflection package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflection-without-remorse" = callPackage
@@ -213705,8 +200618,6 @@ self: {
        ];
        description = "Continuous animations support for reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-backend-socket" = callPackage
@@ -213732,8 +200643,6 @@ self: {
        ];
        description = "Reflex bindings for TCP sockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-backend-wai" = callPackage
@@ -213754,8 +200663,6 @@ self: {
        executableHaskellDepends = [ base http-types reflex wai ];
        description = "Reflex interface to `wai`";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-basic-host" = callPackage
@@ -213776,8 +200683,6 @@ self: {
        executableHaskellDepends = [ base lens reflex witherable ];
        description = "A basic Reflex host for backend work";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-dom" = callPackage
@@ -213943,8 +200848,6 @@ self: {
        ];
        description = "Routing and retractable back button for reflex-dom";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-dom-svg" = callPackage
@@ -213960,8 +200863,6 @@ self: {
        ];
        description = "Reflex functions for SVG elements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-dynamic-containers" = callPackage
@@ -213984,8 +200885,6 @@ self: {
        ];
        description = "various dynamic containers for Reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-fsnotify" = callPackage
@@ -214001,8 +200900,6 @@ self: {
        ];
        description = "Reflex FRP interface for watching files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-gadt-api" = callPackage
@@ -214027,8 +200924,6 @@ self: {
        ];
        description = "Interact with a GADT API in your reflex-dom application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-ghci" = callPackage
@@ -214056,8 +200951,6 @@ self: {
        ];
        description = "A GHCi widget library for use in reflex applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-gloss" = callPackage
@@ -214073,8 +200966,6 @@ self: {
        ];
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-gloss-scene" = callPackage
@@ -214102,8 +200993,6 @@ self: {
        ];
        description = "A simple scene-graph using reflex and gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-jsx" = callPackage
@@ -214137,8 +201026,6 @@ self: {
        ];
        description = "Reflex bindings for libtelnet";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-orphans" = callPackage
@@ -214155,8 +201042,6 @@ self: {
        ];
        description = "Useful missing instances for Reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-process" = callPackage
@@ -214182,8 +201067,6 @@ self: {
        ];
        description = "Reflex FRP interface for running system processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-sdl2" = callPackage
@@ -214203,8 +201086,6 @@ self: {
        executableHaskellDepends = [ base mtl reflex ];
        description = "SDL2 and reflex FRP";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-test-host" = callPackage
@@ -214225,8 +201106,6 @@ self: {
        ];
        description = "reflex host methods for testing without external events";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-transformers" = callPackage
@@ -214242,8 +201121,6 @@ self: {
        ];
        description = "Collections and switchable Monad transformers for Reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-vty" = callPackage
@@ -214270,8 +201147,6 @@ self: {
        ];
        description = "Reflex FRP host and widgets for VTY applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reform" = callPackage
@@ -214357,8 +201232,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "The parser and render to parsec and render the string";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "refractor" = callPackage
@@ -214397,8 +201270,6 @@ self: {
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
        description = "Environment Monad with automatic resource refreshment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "refty" = callPackage
@@ -214441,8 +201312,6 @@ self: {
        ];
        description = "Tools for maintaining a database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reg-alloc" = callPackage
@@ -214456,8 +201325,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Register allocation API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reg-alloc-graph-color" = callPackage
@@ -214481,8 +201348,6 @@ self: {
        doHaddock = false;
        description = "Register allocation by graph colorization";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reg-alloc-types" = callPackage
@@ -214605,8 +201470,6 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Brzozowski's Deriviatives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-dfa" = callPackage
@@ -214620,8 +201483,6 @@ self: {
        libraryHaskellDepends = [ base mtl parsec regex-base ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-do" = callPackage
@@ -214710,8 +201571,6 @@ self: {
        ];
        description = "Generate a random string from a PCRE";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-genex" = callPackage
@@ -214744,8 +201603,6 @@ self: {
        libraryHaskellDepends = [ base parsec regex-base ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-pcre" = callPackage
@@ -214795,8 +201652,6 @@ self: {
        ];
        description = "Text-based PCRE API for regex-base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-pderiv" = callPackage
@@ -214813,8 +201668,6 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-posix" = callPackage
@@ -214859,8 +201712,6 @@ self: {
        ];
        description = "Unit tests for the plaform's Posix regex library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-tdfa" = callPackage
@@ -214897,8 +201748,6 @@ self: {
        ];
        description = "Parse with regular expressions on Producers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-tdfa-quasiquoter" = callPackage
@@ -214910,8 +201759,6 @@ self: {
        libraryHaskellDepends = [ base regex-tdfa template-haskell ];
        description = "Quasi-quoter for TDFA (extended POSIX) regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-tdfa-rc" = callPackage
@@ -214927,8 +201774,6 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-tdfa-text" = callPackage
@@ -214942,8 +201787,6 @@ self: {
        libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
        description = "Text interface for regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-tdfa-unittest" = callPackage
@@ -214962,8 +201805,6 @@ self: {
        ];
        description = "Unit tests for the regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-tdfa-utf8" = callPackage
@@ -214981,8 +201822,6 @@ self: {
        ];
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-tre" = callPackage
@@ -214997,8 +201836,6 @@ self: {
        librarySystemDepends = [ tre ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) tre;};
 
   "regex-type" = callPackage
@@ -215010,8 +201847,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-level regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-with-pcre" = callPackage
@@ -215046,8 +201881,6 @@ self: {
        ];
        description = "Types that can only be constructed if they match a regular expression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-xmlschema" = callPackage
@@ -215059,8 +201892,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "A regular expression library for W3C XML Schema regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regexchar" = callPackage
@@ -215116,8 +201947,6 @@ self: {
        ];
        description = "Regular Expressions on Tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regexpr" = callPackage
@@ -215141,8 +201970,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Regular expressions via symbolic manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regexqq" = callPackage
@@ -215156,8 +201983,6 @@ self: {
        ];
        description = "A quasiquoter for PCRE regexes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regional-pointers" = callPackage
@@ -215172,8 +201997,6 @@ self: {
        ];
        description = "Regional memory pointers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regions" = callPackage
@@ -215189,8 +202012,6 @@ self: {
        ];
        description = "Provides the region monad for safely opening and working with scarce resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regions-monadsfd" = callPackage
@@ -215206,8 +202027,6 @@ self: {
        ];
        description = "Monads-fd instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regions-monadstf" = callPackage
@@ -215223,8 +202042,6 @@ self: {
        ];
        description = "Monads-tf instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regions-mtl" = callPackage
@@ -215236,8 +202053,6 @@ self: {
        libraryHaskellDepends = [ base-unicode-symbols mtl regions ];
        description = "mtl instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "register-machine-typelevel" = callPackage
@@ -215249,8 +202064,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A computationally universal register machine implementation at the type-level";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "registry" = callPackage
@@ -215278,8 +202091,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "data structure for assembling components";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "registry-hedgehog" = callPackage
@@ -215305,8 +202116,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "utilities to work with Hedgehog generators and `registry`";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regress" = callPackage
@@ -215318,8 +202127,6 @@ self: {
        libraryHaskellDepends = [ ad base vector ];
        description = "Linear and logistic regression through automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regression-simple" = callPackage
@@ -215344,8 +202151,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generic programming library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regular-extras" = callPackage
@@ -215357,8 +202162,6 @@ self: {
        libraryHaskellDepends = [ base binary deepseq QuickCheck regular ];
        description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regular-web" = callPackage
@@ -215374,8 +202177,6 @@ self: {
        ];
        description = "Generic programming for the web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regular-xmlpickler" = callPackage
@@ -215387,8 +202188,6 @@ self: {
        libraryHaskellDepends = [ base hxt regular text ];
        description = "Generic generation of HXT XmlPickler instances using Regular";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reheat" = callPackage
@@ -215403,8 +202202,6 @@ self: {
        testHaskellDepends = [ base directory QuickCheck text vty vty-ui ];
        description = "to make notes and reduce impact on idle time on writing other programms";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rehoo" = callPackage
@@ -215422,8 +202219,6 @@ self: {
        ];
        description = "Rebuild default.hoo from many .hoo files in the current directory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rei" = callPackage
@@ -215441,8 +202236,6 @@ self: {
        ];
        description = "Process lists easily";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reified-records" = callPackage
@@ -215454,8 +202247,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Reify records to Maps and back again";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reify" = callPackage
@@ -215471,8 +202262,6 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Serialize data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reinterpret-cast" = callPackage
@@ -215499,8 +202288,6 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "A relation data structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "relapse" = callPackage
@@ -215537,8 +202324,6 @@ self: {
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "A data structure representing Relations on Sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "relational-postgresql8" = callPackage
@@ -215556,8 +202341,6 @@ self: {
        ];
        description = "PostgreSQL v8.x driver for haskell-relational-record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "relational-query" = callPackage
@@ -215632,8 +202415,6 @@ self: {
        ];
        description = "The connector of relational-record and postgresql-pure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "relational-record" = callPackage
@@ -215704,8 +202485,6 @@ self: {
        ];
        description = "Durations and generalized time parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "releaser" = callPackage
@@ -215736,8 +202515,6 @@ self: {
        libraryHaskellDepends = [ aeson base chronos text torsor ];
        description = "humanised relevant time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reliable-io" = callPackage
@@ -215797,8 +202574,6 @@ self: {
        ];
        description = "A web based Haskell IDE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "relude" = callPackage
@@ -215839,8 +202614,6 @@ self: {
        ];
        description = "A DSL for marking student work";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remarks" = callPackage
@@ -215862,8 +202635,6 @@ self: {
        ];
        description = "A DSL for marking student work";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rematch" = callPackage
@@ -215905,8 +202676,6 @@ self: {
        ];
        description = "Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remote-debugger" = callPackage
@@ -215922,8 +202691,6 @@ self: {
        ];
        description = "Interface to ghci debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remote-json" = callPackage
@@ -215948,8 +202715,6 @@ self: {
        ];
        description = "Remote Monad implementation of the JSON RPC protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remote-json-client" = callPackage
@@ -215967,8 +202732,6 @@ self: {
        ];
        description = "Web client wrapper for remote-json";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remote-json-server" = callPackage
@@ -215986,8 +202749,6 @@ self: {
        ];
        description = "Web server wrapper for remote-json";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remote-monad" = callPackage
@@ -216010,8 +202771,6 @@ self: {
        ];
        description = "An parametrizable Remote Monad, and parametrizable Applicative Functor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remotion" = callPackage
@@ -216044,8 +202803,6 @@ self: {
        ];
        description = "A library for client-server applications based on custom protocols";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "render-utf8" = callPackage
@@ -216146,8 +202903,6 @@ self: {
        ];
        description = "Bulk array representations and operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-bytestring" = callPackage
@@ -216160,8 +202915,6 @@ self: {
        doHaddock = false;
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-convert" = callPackage
@@ -216177,8 +202930,6 @@ self: {
        ];
        description = "Packing and unpacking flat tables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-devil" = callPackage
@@ -216191,8 +202942,6 @@ self: {
        librarySystemDepends = [ libdevil ];
        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;
-       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "repa-eval" = callPackage
@@ -216204,8 +202953,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Low-level parallel operators on bulk random-accessble arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-examples" = callPackage
@@ -216264,8 +203011,6 @@ self: {
        ];
        description = "Data-parallel data flows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-io" = callPackage
@@ -216294,8 +203039,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix repa vector ];
        description = "HMatrix operations for Repa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-plugin" = callPackage
@@ -216312,8 +203055,6 @@ self: {
        ];
        description = "Data Flow Fusion GHC Plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-scalar" = callPackage
@@ -216342,8 +203083,6 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-prim vector ];
        description = "Series Expressionss API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-sndfile" = callPackage
@@ -216373,8 +203112,6 @@ self: {
        libraryHaskellDepends = [ base mtl primitive repa-scalar vector ];
        description = "Stream functions not present in the vector library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-v4l2" = callPackage
@@ -216394,8 +203131,6 @@ self: {
        executableHaskellDepends = [ base gloss repa ];
        description = "Provides high-level access to webcams";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repl" = callPackage
@@ -216409,8 +203144,6 @@ self: {
        ];
        description = "IRC friendly REPL library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repl-toolkit" = callPackage
@@ -216481,8 +203214,6 @@ self: {
          wai-websockets websockets
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "replicant" = callPackage
@@ -216509,8 +203240,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repline_0_3_0_0" = callPackage
@@ -216572,8 +203301,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Blogging module using blaze html for markup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repr" = callPackage
@@ -216589,8 +203316,6 @@ self: {
        ];
        description = "Render overloaded expressions to their textual representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repr-tree-syb" = callPackage
@@ -216620,8 +203345,6 @@ self: {
        ];
        description = "Representable functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "representable-profunctors" = callPackage
@@ -216652,8 +203375,6 @@ self: {
        ];
        description = "Tries from representations of polynomial functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reprinter" = callPackage
@@ -216668,8 +203389,6 @@ self: {
        ];
        description = "Scrap Your Reprinter";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reproject" = callPackage
@@ -216682,8 +203401,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Define and combine \"materialized\" projections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "req" = callPackage
@@ -216739,8 +203456,6 @@ self: {
        ];
        description = "Conduit helpers for the req HTTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "req-oauth2" = callPackage
@@ -216763,8 +203478,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Provides OAuth2 authentication for use with Req";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "req-url-extra" = callPackage
@@ -216780,8 +203493,6 @@ self: {
        testHaskellDepends = [ base hspec modern-uri req ];
        description = "Provides URI/URL helper functions for use with Req";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reqcatcher" = callPackage
@@ -216809,8 +203520,6 @@ self: {
        libraryHaskellDepends = [ base free mtl transformers ];
        description = "A transformer for generic requests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "require" = callPackage
@@ -216842,8 +203551,6 @@ self: {
        ];
        description = "Scrap your qualified import clutter";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "requirements" = callPackage
@@ -216961,8 +203668,6 @@ self: {
        ];
        description = "More understandable exceptions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reserve" = callPackage
@@ -216986,8 +203691,6 @@ self: {
        ];
        description = "Reserve reloads web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reservoir" = callPackage
@@ -216999,8 +203702,6 @@ self: {
        libraryHaskellDepends = [ base containers random ];
        description = "Unweighted reservoir sampling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resin" = callPackage
@@ -217012,8 +203713,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ];
        description = "High performance variable binders";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resistor-cube" = callPackage
@@ -217027,8 +203726,6 @@ self: {
        executableHaskellDepends = [ base comfort-array lapack ];
        description = "Compute total resistance of a cube of resistors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resolv_0_1_1_2" = callPackage
@@ -217083,8 +203780,6 @@ self: {
        ];
        description = "A name resolusion library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resolve-trivial-conflicts" = callPackage
@@ -217103,8 +203798,6 @@ self: {
        ];
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resource-effect" = callPackage
@@ -217123,8 +203816,6 @@ self: {
        ];
        description = "A port of the package 'resourcet' for extensible effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resource-embed" = callPackage
@@ -217138,8 +203829,6 @@ self: {
        executableHaskellDepends = [ base bytestring directory ];
        description = "Embed data files via C and FFI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resource-pool" = callPackage
@@ -217172,8 +203861,6 @@ self: {
        ];
        description = "Fork of resource-pool, with a MonadCatchIO constraint";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resource-pool-monad" = callPackage
@@ -217205,8 +203892,6 @@ self: {
        ];
        description = "Allocate resources which are guaranteed to be released";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resourcet_1_1_11" = callPackage
@@ -217272,8 +203957,6 @@ self: {
        ];
        description = "process and route HTTP requests and generate responses on top of WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-client" = callPackage
@@ -217295,8 +203978,6 @@ self: {
        ];
        description = "Utility library for use in generated API client libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-core" = callPackage
@@ -217324,8 +204005,6 @@ self: {
        ];
        description = "Rest API library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-example" = callPackage
@@ -217348,8 +204027,6 @@ self: {
        executableHaskellDepends = [ base base-compat rest-gen ];
        description = "Example project for rest";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-gen" = callPackage
@@ -217377,8 +204054,6 @@ self: {
        ];
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-happstack" = callPackage
@@ -217396,8 +204071,6 @@ self: {
        ];
        description = "Rest driver for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-snap" = callPackage
@@ -217415,8 +204088,6 @@ self: {
        ];
        description = "Rest driver for Snap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-stringmap" = callPackage
@@ -217433,8 +204104,6 @@ self: {
        ];
        description = "Maps with stringy keys that can be transcoded to JSON and XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-types" = callPackage
@@ -217454,8 +204123,6 @@ self: {
        ];
        description = "Silk Rest Framework Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-wai" = callPackage
@@ -217475,8 +204142,6 @@ self: {
        ];
        description = "Rest driver for WAI applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "restartable" = callPackage
@@ -217507,8 +204172,6 @@ self: {
          time-locale-compat xmlhtml
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "restless-git" = callPackage
@@ -217545,8 +204208,6 @@ self: {
        ];
        description = "Running worker processes under system resource restrictions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "restyle" = callPackage
@@ -217561,8 +204222,6 @@ self: {
        executableHaskellDepends = [ base directory filepath utf8-string ];
        description = "Convert between camel case and separated words style";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "result" = callPackage
@@ -217610,8 +204269,6 @@ self: {
        benchmarkHaskellDepends = [ aeson async base criterion text ];
        description = "A driver for RethinkDB 2.2";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rethinkdb-client-driver" = callPackage
@@ -217640,8 +204297,6 @@ self: {
        ];
        description = "Client driver for RethinkDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rethinkdb-model" = callPackage
@@ -217657,8 +204312,6 @@ self: {
        ];
        description = "Useful tools for modeling data with rethinkdb";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rethinkdb-wereHamster" = callPackage
@@ -217678,8 +204331,6 @@ self: {
        ];
        description = "RethinkDB driver for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "retrie" = callPackage
@@ -217741,8 +204392,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative process ];
        description = "Retry failed commands";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rev-state" = callPackage
@@ -217807,8 +204456,6 @@ self: {
        ];
        description = "Simple reverse geocoding using OpenStreeMap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reversi" = callPackage
@@ -217822,8 +204469,6 @@ self: {
        executableHaskellDepends = [ array base process ];
        description = "Text-only reversi (aka othelo) game";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rewrite" = callPackage
@@ -217839,8 +204484,6 @@ self: {
        ];
        description = "open file and rewrite it with new contents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rewrite-inspector" = callPackage
@@ -217860,8 +204503,6 @@ self: {
        executableHaskellDepends = [ base prettyprinter ];
        description = "Inspection of rewriting steps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rewriting" = callPackage
@@ -217873,8 +204514,6 @@ self: {
        libraryHaskellDepends = [ base containers regular ];
        description = "Generic rewriting library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rex" = callPackage
@@ -217910,8 +204549,6 @@ self: {
        ];
        description = "Github resume generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc" = callPackage
@@ -217945,8 +204582,6 @@ self: {
        ];
        description = "Robert Fischer's Common library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc-env" = callPackage
@@ -217958,8 +204593,6 @@ self: {
        libraryHaskellDepends = [ base envy network rfc-prelude time ];
        description = "Environment variable support from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc-http-client" = callPackage
@@ -217977,8 +204610,6 @@ self: {
        ];
        description = "The HTTP client extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc-prelude" = callPackage
@@ -218002,8 +204633,6 @@ self: {
        ];
        description = "The Prelude from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc-psql" = callPackage
@@ -218020,8 +204649,6 @@ self: {
        ];
        description = "The PostgreSQL extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc-redis" = callPackage
@@ -218033,8 +204660,6 @@ self: {
        libraryHaskellDepends = [ base hedis rfc-env rfc-prelude time ];
        description = "The Redis extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc-servant" = callPackage
@@ -218056,8 +204681,6 @@ self: {
        ];
        description = "The Servant extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc1413-server" = callPackage
@@ -218201,8 +204824,6 @@ self: {
        ];
        description = "Haskell rhythm game tutorial";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "riak" = callPackage
@@ -218336,8 +204957,6 @@ self: {
        libraryHaskellDepends = [ base Only postgresql-simple text time ];
        description = "Type-level Relational DB combinators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ribosome" = callPackage
@@ -218465,8 +205084,6 @@ self: {
        ];
        description = "Quick metrics to grow your app strong";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ridley-extras" = callPackage
@@ -218484,8 +205101,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Handy metrics that don't belong to ridley";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "riemann" = callPackage
@@ -218515,8 +205130,6 @@ self: {
        ];
        description = "A Riemann client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "riff" = callPackage
@@ -218535,8 +205148,6 @@ self: {
        executableHaskellDepends = [ base bytestring filepath ];
        description = "RIFF parser for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rigel-viz" = callPackage
@@ -218567,8 +205178,6 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck vector ];
        description = "A concurrent, mutable ring-buffer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ring-buffers" = callPackage
@@ -218585,8 +205194,6 @@ self: {
        testHaskellDepends = [ base HUnit primitive QuickCheck ];
        description = "mutable ring buffers with atomic updates in GHC Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rings" = callPackage
@@ -218684,8 +205291,6 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "ripple" = callPackage
@@ -218743,8 +205348,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "RISC-V";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "risc386" = callPackage
@@ -218760,8 +205363,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Reduced instruction set i386 simulator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "riscv-isa" = callPackage
@@ -218776,8 +205377,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Haskell representation of the RISC-V instruction set architecture";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rison" = callPackage
@@ -218809,8 +205408,6 @@ self: {
        libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ];
        description = "Rivers are like Streams, but different";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rivet" = callPackage
@@ -218824,8 +205421,6 @@ self: {
        executableHaskellDepends = [ base rivet-core rivet-simple-deploy ];
        description = "A project management tool for Haskell applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rivet-adaptor-postgresql" = callPackage
@@ -218873,8 +205468,6 @@ self: {
        libraryHaskellDepends = [ base postgresql-simple text ];
        description = "Postgresql migration support for project management tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rivet-simple-deploy" = callPackage
@@ -218886,8 +205479,6 @@ self: {
        libraryHaskellDepends = [ base configurator mtl rivet-core text ];
        description = "Basic deployment support for project management tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rl-satton" = callPackage
@@ -218913,8 +205504,6 @@ self: {
        ];
        description = "Collection of Reinforcement Learning algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rlglue" = callPackage
@@ -218937,8 +205526,6 @@ self: {
        ];
        description = "A Haskell codec for RL-Glue";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rlist" = callPackage
@@ -218974,8 +205561,6 @@ self: {
        executableHaskellDepends = [ ansi-terminal base options time ];
        description = "Ring-LWE/LWR challenges using Lol";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rmonad" = callPackage
@@ -218992,8 +205577,6 @@ self: {
        ];
        description = "Restricted monad library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rncryptor" = callPackage
@@ -219022,8 +205605,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Haskell implementation of the RNCryptor file format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rng-utils" = callPackage
@@ -219041,8 +205622,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "RNG within an IORef for convenient concurrent use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rob" = callPackage
@@ -219064,8 +205643,6 @@ self: {
        testHaskellDepends = [ base directory ];
        description = "Simple projects generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "robin" = callPackage
@@ -219085,8 +205662,6 @@ self: {
        ];
        description = "A build daemon for Haskell development";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roboservant" = callPackage
@@ -219108,8 +205683,6 @@ self: {
        ];
        description = "Automatic session-aware servant testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "robot" = callPackage
@@ -219143,8 +205716,6 @@ self: {
        ];
        description = "Parser for robots.txt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roc-cluster" = callPackage
@@ -219159,8 +205730,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        description = "ROC online clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roc-cluster-demo" = callPackage
@@ -219178,8 +205747,6 @@ self: {
        ];
        description = "Gloss interactive demo for roc-cluster package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roc-id" = callPackage
@@ -219224,8 +205791,6 @@ self: {
        ];
        description = "A build system for incremental, parallel, and demand-driven computations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rocksdb-haskell" = callPackage
@@ -219248,8 +205813,6 @@ self: {
        ];
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) rocksdb;};
 
   "rocksdb-haskell-jprupp" = callPackage
@@ -219289,8 +205852,6 @@ self: {
        ];
        description = "RocksDB database querying library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roguestar" = callPackage
@@ -219377,8 +205938,6 @@ self: {
        ];
        description = "Bindings to Roku's External Control API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roles" = callPackage
@@ -219406,8 +205965,6 @@ self: {
        ];
        description = "error tracking through rollbar.com";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rollbar-hs" = callPackage
@@ -219430,8 +205987,6 @@ self: {
        ];
        description = "Core Rollbar data types and APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roller" = callPackage
@@ -219452,8 +206007,6 @@ self: {
        ];
        description = "Playing with applicatives and dice!";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rolling-queue" = callPackage
@@ -219514,8 +206067,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq integer-gmp ];
        description = "RON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ron-rdt" = callPackage
@@ -219532,8 +206083,6 @@ self: {
        ];
        description = "Replicated Data Types (RON-RDT)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ron-schema" = callPackage
@@ -219551,8 +206100,6 @@ self: {
        ];
        description = "RON-Schema";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ron-storage" = callPackage
@@ -219570,8 +206117,6 @@ self: {
        ];
        description = "RON Storage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roots" = callPackage
@@ -219596,8 +206141,6 @@ self: {
        ];
        description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rope-utf16-splay" = callPackage
@@ -219662,8 +206205,6 @@ self: {
        ];
        description = "Various trie implementations in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rose-trie" = callPackage
@@ -219679,8 +206220,6 @@ self: {
        ];
        description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rosezipper" = callPackage
@@ -219724,8 +206263,6 @@ self: {
        ];
        description = "Haskell support for the ROS robotics framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rosmsg" = callPackage
@@ -219743,8 +206280,6 @@ self: {
        ];
        description = "ROS message parser, render, TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rosmsg-bin" = callPackage
@@ -219762,8 +206297,6 @@ self: {
        ];
        description = "ROS message management tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rospkg" = callPackage
@@ -219795,8 +206328,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "General purpose utility library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rot13" = callPackage
@@ -219828,8 +206359,6 @@ self: {
        ];
        description = "Size-limited, concurrent, automatically-rotating log writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roundRobin" = callPackage
@@ -219900,8 +206429,6 @@ self: {
        libraryHaskellDepends = [ array base numeric-extras ];
        description = "Explicit floating point rounding mode wrappers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roundtrip" = callPackage
@@ -219917,8 +206444,6 @@ self: {
        ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roundtrip-aeson" = callPackage
@@ -219939,8 +206464,6 @@ self: {
        ];
        description = "Un-/parse JSON with roundtrip invertible syntax definitions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roundtrip-string" = callPackage
@@ -219952,8 +206475,6 @@ self: {
        libraryHaskellDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roundtrip-xml" = callPackage
@@ -219975,8 +206496,6 @@ self: {
        ];
        description = "Bidirectional (de-)serialization for XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "route-generator" = callPackage
@@ -220011,8 +206530,6 @@ self: {
        ];
        description = "A library and utilities for creating a route";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "row" = callPackage
@@ -220082,8 +206599,6 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Build records from lists of strings, as from CSV files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rpc" = callPackage
@@ -220100,8 +206615,6 @@ self: {
        ];
        description = "type safe rpcs provided as basic IO actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rpc-framework" = callPackage
@@ -220120,8 +206633,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "a remote procedure call framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rpf" = callPackage
@@ -220141,8 +206652,6 @@ self: {
        ];
        description = "Receiver Policy Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rpm" = callPackage
@@ -220156,8 +206665,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rpmbuild-order" = callPackage
@@ -220198,8 +206705,6 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "Recurrence rule parser and formatter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rsagl" = callPackage
@@ -220219,8 +206724,6 @@ self: {
        ];
        description = "The RogueStar Animation and Graphics Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rsagl-frp" = callPackage
@@ -220236,8 +206739,6 @@ self: {
        ];
        description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rsagl-math" = callPackage
@@ -220254,8 +206755,6 @@ self: {
        ];
        description = "The RogueStar Animation and Graphics Library: Mathematics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rset" = callPackage
@@ -220280,8 +206779,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Rational Street Performer Protocol solver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rss" = callPackage
@@ -220327,8 +206824,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the RSS standard";
        license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rss2irc" = callPackage
@@ -220352,8 +206847,6 @@ self: {
        ];
        description = "watches an RSS/Atom feed and writes it to an IRC channel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rstream" = callPackage
@@ -220365,8 +206858,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "stream-fusion framework from vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rtcm" = callPackage
@@ -220395,8 +206886,6 @@ self: {
        ];
        description = "Haskell bindings for RTCM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rtld" = callPackage
@@ -220445,8 +206934,6 @@ self: {
        ];
        description = "Manipulate network devices, addresses, and routes on Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rtorrent-rpc" = callPackage
@@ -220463,8 +206950,6 @@ self: {
        ];
        description = "A library for communicating with RTorrent over its XML-RPC interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rtorrent-state" = callPackage
@@ -220504,8 +206989,6 @@ self: {
        executableHaskellDepends = [ base Cabal process ];
        description = "Dynamically load Haskell libraries";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rubberband" = callPackage
@@ -220542,8 +207025,6 @@ self: {
        ];
        description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ruby-qq" = callPackage
@@ -220560,8 +207041,6 @@ self: {
        ];
        description = "rubyish quasiquoters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ruff" = callPackage
@@ -220594,8 +207073,6 @@ self: {
        ];
        description = "Pliable records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ruler" = callPackage
@@ -220614,8 +207091,6 @@ self: {
        ];
        description = "Ruler tool for UHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ruler-core" = callPackage
@@ -220633,8 +207108,6 @@ self: {
          uulib
        ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "run-haskell-module" = callPackage
@@ -220657,8 +207130,6 @@ self: {
        libraryHaskellDepends = [ base primitive primitive-unlifted ];
        description = "runST without boxing penalty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rungekutta" = callPackage
@@ -220670,8 +207141,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of explicit Runge-Kutta methods of various orders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "runghc" = callPackage
@@ -220708,8 +207177,6 @@ self: {
        testHaskellDepends = [ base directory hspec process ];
        description = "Stack wrapper for single-file Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "runmany" = callPackage
@@ -220727,8 +207194,6 @@ self: {
        ];
        description = "Run multiple commands, interleaving output and errors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "runmemo" = callPackage
@@ -220751,8 +207216,6 @@ self: {
        libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ];
        description = "Runtime generation of Arbitrary values";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rv" = callPackage
@@ -220785,8 +207248,6 @@ self: {
        ];
        description = "Random Variables";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rwlock" = callPackage
@@ -220818,8 +207279,6 @@ self: {
        ];
        description = "Packet Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "s-cargot" = callPackage
@@ -220861,8 +207320,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "simple general-purpose s-expressions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "s3-signer" = callPackage
@@ -220922,8 +207379,6 @@ self: {
        ];
        description = "A monadic buffer resilient to exceptions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-coerce" = callPackage
@@ -220935,8 +207390,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A friendly shorthand for an old friend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-decimal" = callPackage
@@ -221012,8 +207465,6 @@ self: {
        ];
        description = "control-monad-exception Instances for safe-failure";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-foldable" = callPackage
@@ -221036,8 +207487,6 @@ self: {
        libraryHaskellDepends = [ base indexed mtl vector ];
        description = "Support for safely freezing multiple arrays in the ST monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-globals" = callPackage
@@ -221049,8 +207498,6 @@ self: {
        libraryHaskellDepends = [ base stm template-haskell ];
        description = "Safe top-level mutable variables which scope like ordinary values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-json" = callPackage
@@ -221089,8 +207536,6 @@ self: {
        ];
        description = "A library providing safe lazy IO features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-length" = callPackage
@@ -221108,8 +207553,6 @@ self: {
        ];
        description = "Tired of accidentally calling length on tuples? Relief at last!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-money" = callPackage
@@ -221231,8 +207674,6 @@ self: {
        ];
        description = "A small wrapper over hs-plugins to allow loading safe plugins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-printf" = callPackage
@@ -221252,8 +207693,6 @@ self: {
        ];
        description = "Well-typed, flexible and variadic printf for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-tensor" = callPackage
@@ -221309,8 +207748,6 @@ self: {
        ];
        description = "Making SafeCopy migrations easier";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safecopy-store" = callPackage
@@ -221334,8 +207771,6 @@ self: {
        ];
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safeint" = callPackage
@@ -221353,8 +207788,6 @@ self: {
        ];
        description = "overflow-checked Int type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safeio" = callPackage
@@ -221389,8 +207822,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Safe Paths in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safer-file-handles" = callPackage
@@ -221407,8 +207838,6 @@ self: {
        ];
        description = "Type-safe file handling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safer-file-handles-bytestring" = callPackage
@@ -221425,8 +207854,6 @@ self: {
        ];
        description = "Extends safer-file-handles with ByteString operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safer-file-handles-text" = callPackage
@@ -221442,8 +207869,6 @@ self: {
        ];
        description = "Extends safer-file-handles with Text operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "saferoute" = callPackage
@@ -221455,8 +207880,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html containers text ];
        description = "A simple type-safe routing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sai-shape-syb" = callPackage
@@ -221472,8 +207895,6 @@ self: {
        ];
        description = "Obtain homogeneous values from arbitrary values, transforming or culling data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sajson" = callPackage
@@ -221496,8 +207917,6 @@ self: {
        ];
        description = "Fast JSON parsing powered by Chad Austin's sajson library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sak" = callPackage
@@ -221519,8 +207938,6 @@ self: {
        executableToolDepends = [ cpphs ];
        description = "Compression command-line tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sakuraio-platform" = callPackage
@@ -221592,8 +208009,6 @@ self: {
        ];
        description = "Configuration Loader for toml";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salak-yaml" = callPackage
@@ -221653,8 +208068,6 @@ self: {
        ];
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libsodium;};
 
   "salve" = callPackage
@@ -221687,8 +208100,6 @@ self: {
        ];
        description = "Modular web application framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salvia-demo" = callPackage
@@ -221711,8 +208122,6 @@ self: {
        doHaddock = false;
        description = "Demo Salvia servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salvia-extras" = callPackage
@@ -221733,8 +208142,6 @@ self: {
        ];
        description = "Collection of non-fundamental handlers for the Salvia web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salvia-protocol" = callPackage
@@ -221751,8 +208158,6 @@ self: {
        ];
        description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salvia-sessions" = callPackage
@@ -221770,8 +208175,6 @@ self: {
        ];
        description = "Session support for the Salvia webserver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salvia-websocket" = callPackage
@@ -221788,8 +208191,6 @@ self: {
        ];
        description = "Websocket implementation for the Salvia Webserver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sample-frame" = callPackage
@@ -221846,8 +208247,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "samtools-conduit" = callPackage
@@ -221868,8 +208267,6 @@ self: {
        ];
        description = "Conduit interface to SAM/BAM format files through samtools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "samtools-enumerator" = callPackage
@@ -221885,8 +208282,6 @@ self: {
        ];
        description = "Enumerator interface to SamTools library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "samtools-iteratee" = callPackage
@@ -221903,8 +208298,6 @@ self: {
        ];
        description = "Iteratee interface to SamTools library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sandi" = callPackage
@@ -221935,8 +208328,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "SAND data serialization and manipulation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sandman" = callPackage
@@ -221955,8 +208346,6 @@ self: {
        ];
        description = "Manages Cabal sandboxes to avoid rebuilding packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sarasvati" = callPackage
@@ -221968,8 +208357,6 @@ self: {
        libraryHaskellDepends = [ base deepseq portaudio ];
        description = "audio library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sarsi" = callPackage
@@ -221997,8 +208384,6 @@ self: {
        ];
        description = "A universal quickfix toolkit and his protocol";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sasl" = callPackage
@@ -222015,8 +208400,6 @@ self: {
        ];
        description = "SASL implementation using simple-pipe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sat" = callPackage
@@ -222030,8 +208413,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "CNF SATisfier";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sat-micro-hs" = callPackage
@@ -222049,8 +208430,6 @@ self: {
        ];
        description = "A minimal SAT solver";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "satchmo" = callPackage
@@ -222069,8 +208448,6 @@ self: {
        testHaskellDepends = [ array base ];
        description = "SAT encoding monad";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "satchmo-backends" = callPackage
@@ -222086,8 +208463,6 @@ self: {
        ];
        description = "driver for external satchmo backends";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "satchmo-examples" = callPackage
@@ -222105,8 +208480,6 @@ self: {
        ];
        description = "examples that show how to use satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "satchmo-funsat" = callPackage
@@ -222122,8 +208495,6 @@ self: {
        ];
        description = "funsat driver as backend for satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "satchmo-minisat" = callPackage
@@ -222135,8 +208506,6 @@ self: {
        libraryHaskellDepends = [ base containers process satchmo ];
        description = "minisat driver as backend for satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "satchmo-toysat" = callPackage
@@ -222152,8 +208521,6 @@ self: {
        ];
        description = "toysat driver as backend for satchmo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "savage" = callPackage
@@ -222172,8 +208539,6 @@ self: {
        ];
        description = "re-export of the random generators from Hedgehog";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sax" = callPackage
@@ -222192,8 +208557,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Monadic streaming XML parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "say" = callPackage
@@ -222310,8 +208673,6 @@ self: {
        ];
        description = "Formally prove properties of Haskell programs using SBV/SMT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sc2-lowlevel" = callPackage
@@ -222331,8 +208692,6 @@ self: {
        ];
        description = "Low-level Starcraft II API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sc2-proto" = callPackage
@@ -222352,8 +208711,6 @@ self: {
        libraryToolDepends = [ proto-lens-protoc protoc ];
        description = "A protocol buffer model for the Starcraft II bot API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {protoc = null;};
 
   "sc2-support" = callPackage
@@ -222370,8 +208727,6 @@ self: {
        ];
        description = "Support and utility library for sc2hs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sc2hs" = callPackage
@@ -222412,8 +208767,6 @@ self: {
        libraryHaskellDepends = [ base hsc3 hsc3-db ];
        description = "Haskell bindings to sc3-rdu (sc3 rd ugens)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scalable-server" = callPackage
@@ -222431,8 +208784,6 @@ self: {
        ];
        description = "Library for writing fast/scalable TCP-based services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scaleimage" = callPackage
@@ -222446,8 +208797,6 @@ self: {
        executableHaskellDepends = [ base filepath gd ];
        description = "Scale an image to a new geometry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scalendar" = callPackage
@@ -222464,8 +208813,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "scalp-webhooks" = callPackage
@@ -222492,8 +208839,6 @@ self: {
        ];
        description = "Test webhooks locally";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scalpel" = callPackage
@@ -222545,8 +208890,6 @@ self: {
        ];
        description = "scalpel scrapers for search engines";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scan" = callPackage
@@ -222591,8 +208934,6 @@ self: {
        testHaskellDepends = [ array base HUnit ];
        description = "An implementation of the Scan Vector Machine instruction set in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scanf" = callPackage
@@ -222689,8 +209030,6 @@ self: {
        ];
        description = "Streaming component combinators";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scenegraph" = callPackage
@@ -222707,8 +209046,6 @@ self: {
        ];
        description = "Scene Graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scgi" = callPackage
@@ -222724,8 +209061,6 @@ self: {
        ];
        description = "A Haskell library for writing SCGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schedevr" = callPackage
@@ -222743,8 +209078,6 @@ self: {
        ];
        description = "Marge schedules and show EVR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schedule" = callPackage
@@ -222785,8 +209118,6 @@ self: {
        ];
        description = "Find the ideal lesson layout";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scheduler" = callPackage
@@ -222807,8 +209138,6 @@ self: {
        ];
        description = "Work stealing scheduler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schedyield" = callPackage
@@ -222820,8 +209149,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Exposes standard POSIX function sched_yield";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schema" = callPackage
@@ -222836,8 +209163,6 @@ self: {
        ];
        description = "Encoding-independent schemas for Haskell data types";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schemas" = callPackage
@@ -222862,8 +209187,6 @@ self: {
        ];
        description = "schema guided serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schematic" = callPackage
@@ -222892,8 +209215,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "JSON-biased spec and validation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scholdoc" = callPackage
@@ -222938,8 +209259,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scholdoc-citeproc" = callPackage
@@ -222973,8 +209292,6 @@ self: {
        ];
        description = "Scholdoc fork of pandoc-citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scholdoc-texmath" = callPackage
@@ -222997,8 +209314,6 @@ self: {
        ];
        description = "Scholdoc fork of texmath";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scholdoc-types" = callPackage
@@ -223014,8 +209329,6 @@ self: {
        ];
        description = "Scholdoc fork of pandoc-types";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schonfinkeling" = callPackage
@@ -223039,8 +209352,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Rational numbers in scientific notation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scidb-hquery" = callPackage
@@ -223074,8 +209385,6 @@ self: {
        ];
        description = "Haskell query for SciDB via shim";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "science-constants" = callPackage
@@ -223149,8 +209458,6 @@ self: {
        ];
        description = "Scientific notation intended for tokenization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scion" = callPackage
@@ -223176,8 +209483,6 @@ self: {
        ];
        description = "Haskell IDE library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scion-browser" = callPackage
@@ -223212,8 +209517,6 @@ self: {
        ];
        description = "Command-line interface for browsing and searching packages documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scons2dot" = callPackage
@@ -223227,8 +209530,6 @@ self: {
        executableHaskellDepends = [ base bytestring containers process ];
        description = "Generates graphviz file of scons dependency information";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scope" = callPackage
@@ -223246,8 +209547,6 @@ self: {
        ];
        description = "An interactive renderer for plotting time-series data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scope-cairo" = callPackage
@@ -223271,8 +209570,6 @@ self: {
        ];
        description = "An interactive renderer for plotting time-series data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scottish" = callPackage
@@ -223290,8 +209587,6 @@ self: {
        ];
        description = "scotty with batteries included";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty" = callPackage
@@ -223343,8 +209638,6 @@ self: {
        ];
        description = "The Play Framework style data binding in Scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-blaze" = callPackage
@@ -223359,8 +209652,6 @@ self: {
        ];
        description = "blaze-html integration for Scotty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-cookie" = callPackage
@@ -223401,8 +209692,6 @@ self: {
        ];
        description = "Fay integration for Scotty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-form" = callPackage
@@ -223416,8 +209705,6 @@ self: {
        ];
        description = "Html form validation using `ditto`";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-format" = callPackage
@@ -223434,8 +209721,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Response format helper for the Scotty web framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-hastache" = callPackage
@@ -223452,8 +209737,6 @@ self: {
        ];
        description = "Easy Mustache templating support for Scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-haxl" = callPackage
@@ -223465,8 +209748,6 @@ self: {
        libraryHaskellDepends = [ base haxl scotty text ];
        description = "Combine scotty and haxl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-params-parser" = callPackage
@@ -223510,8 +209791,6 @@ self: {
        ];
        description = "A Better way of modeling web resources";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-rest" = callPackage
@@ -223537,8 +209816,6 @@ self: {
        ];
        description = "Webmachine-style REST library for scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-session" = callPackage
@@ -223557,8 +209834,6 @@ self: {
        ];
        description = "Adding session functionality to scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-tls" = callPackage
@@ -223603,8 +209878,6 @@ self: {
        libraryHaskellDepends = [ base scotty text transformers ];
        executableHaskellDepends = [ base scotty text transformers ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scp-streams" = callPackage
@@ -223626,8 +209899,6 @@ self: {
        testHaskellDepends = [ base bytestring io-streams ];
        description = "An SCP protocol implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scrabble-bot" = callPackage
@@ -223647,8 +209918,6 @@ self: {
        ];
        description = "Scrabble play generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scrapbook" = callPackage
@@ -223676,8 +209945,6 @@ self: {
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scrape-changes" = callPackage
@@ -223704,8 +209971,6 @@ self: {
        ];
        description = "Scrape websites for changes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "script-monad" = callPackage
@@ -223732,8 +209997,6 @@ self: {
        ];
        description = "Stack of error, reader, writer, state, and prompt monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scrobble" = callPackage
@@ -223756,8 +210019,6 @@ self: {
        ];
        description = "Scrobbling server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scroll" = callPackage
@@ -223854,8 +210115,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Fast CSV lexing on ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scyther-proof" = callPackage
@@ -223877,8 +210136,6 @@ self: {
        executableToolDepends = [ alex ];
        description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sde-solver" = callPackage
@@ -223897,8 +210154,6 @@ self: {
        ];
        description = "Distributed SDE solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sdf2p1-parser" = callPackage
@@ -223976,8 +210231,6 @@ self: {
        ];
        description = "An image loading and rendering library for sdl2 / sdl2-cairo";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sdl2-compositor" = callPackage
@@ -224001,8 +210254,6 @@ self: {
        ];
        description = "image compositing with sdl2 - declarative style";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sdl2-fps" = callPackage
@@ -224016,8 +210267,6 @@ self: {
        libraryHaskellDepends = [ base sdl2 ];
        description = "Run of the mill, frames per second timer implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sdl2-gfx" = callPackage
@@ -224167,8 +210416,6 @@ self: {
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seacat" = callPackage
@@ -224204,8 +210451,6 @@ self: {
        libraryHaskellDepends = [ base bytestring free mtl text ];
        description = "Pure SQL layer on top of other libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seakale-postgresql" = callPackage
@@ -224221,8 +210466,6 @@ self: {
        ];
        description = "PostgreSQL backend for Seakale";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seakale-tests" = callPackage
@@ -224238,8 +210481,6 @@ self: {
        ];
        description = "Helpers to test code using Seakale";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seal-module" = callPackage
@@ -224292,8 +210533,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Semantic Editor Combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secd" = callPackage
@@ -224324,8 +210563,6 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "SECDH Machine Simulator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seclib" = callPackage
@@ -224337,8 +210574,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple library for static information-flow security in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "second-transfer" = callPackage
@@ -224366,8 +210601,6 @@ self: {
        testToolDepends = [ cpphs ];
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secp256k1" = callPackage
@@ -224391,8 +210624,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) secp256k1;};
 
   "secp256k1-haskell" = callPackage
@@ -224443,8 +210674,6 @@ self: {
        ];
        description = "fork of secp256k1";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secret-santa" = callPackage
@@ -224462,8 +210691,6 @@ self: {
        ];
        description = "Secret Santa game assigner using QR-Codes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secret-sharing" = callPackage
@@ -224484,8 +210711,6 @@ self: {
        ];
        description = "Information-theoretic secure secret sharing";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secrm" = callPackage
@@ -224499,8 +210724,6 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "Example of writing \"secure\" file removal in Haskell rather than C";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secure-sockets" = callPackage
@@ -224516,8 +210739,6 @@ self: {
        ];
        description = "Secure point-to-point connectivity library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secureUDP" = callPackage
@@ -224529,8 +210750,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers network ];
        description = "Setups secure (unsorted) UDP packet transfer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "securemem" = callPackage
@@ -224560,8 +210779,6 @@ self: {
        librarySystemDepends = [ sedna ];
        description = "Sedna C API XML Binding";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {sedna = null;};
 
   "seitz-symbol" = callPackage
@@ -224581,8 +210798,6 @@ self: {
        ];
        description = "Read and Display Seitz Symbol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "selda" = callPackage
@@ -224705,8 +210920,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "CSS Selectors for DOM traversal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "selenium" = callPackage
@@ -224718,8 +210931,6 @@ self: {
        libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ];
        description = "Test web applications through a browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "selenium-server" = callPackage
@@ -224739,8 +210950,6 @@ self: {
        testHaskellDepends = [ base hspec text webdriver ];
        description = "Run the selenium standalone server for usage with webdriver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "self-extract" = callPackage
@@ -224760,8 +210969,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A Haskell library to make self-extracting executables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "selfrestart" = callPackage
@@ -224785,8 +210992,6 @@ self: {
        librarySystemDepends = [ selinux ];
        description = "SELinux bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {selinux = null;};
 
   "semantic" = callPackage
@@ -224818,8 +211023,6 @@ self: {
        ];
        description = "Types and functionality for working with source code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semaphore-plus" = callPackage
@@ -224851,8 +211054,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Evaluate code snippets in Literate Haskell";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semi-iso" = callPackage
@@ -224868,8 +211069,6 @@ self: {
        ];
        description = "Weakened partial isomorphisms, reversible computations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semialign" = callPackage
@@ -224904,8 +211103,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Extra functions for working with Semialigns";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semialign-indexed" = callPackage
@@ -224954,8 +211151,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A Haskell implementation of semibounded lattices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semigroupoid-extras" = callPackage
@@ -225010,8 +211205,6 @@ self: {
        ];
        description = "RebindableSyntax using the semigroupoids package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semigroups" = callPackage
@@ -225034,8 +211227,6 @@ self: {
        libraryHaskellDepends = [ base containers semigroups ];
        description = "Semigroups actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semilattices" = callPackage
@@ -225067,8 +211258,6 @@ self: {
        libraryHaskellDepends = [ base Boolean containers monoids ];
        description = "Semirings, ring-like structures used for dynamic programming applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semiring-num" = callPackage
@@ -225094,8 +211283,6 @@ self: {
        ];
        description = "Basic semiring class and instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semiring-simple" = callPackage
@@ -225186,8 +211373,6 @@ self: {
        ];
        description = "Sengrid API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sendgrid-v3" = callPackage
@@ -225202,8 +211387,6 @@ self: {
        testHaskellDepends = [ base semigroups tasty tasty-hunit text ];
        description = "Sendgrid v3 API library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sensei" = callPackage
@@ -225231,8 +211414,6 @@ self: {
        ];
        description = "Automatically run Hspec tests on file modifications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sensenet" = callPackage
@@ -225250,8 +211431,6 @@ self: {
        ];
        description = "Distributed sensor network for the raspberry pi";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sensu-run" = callPackage
@@ -225273,8 +211452,6 @@ self: {
        ];
        description = "A tool to send command execution results to Sensu";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sentence-jp" = callPackage
@@ -225288,8 +211465,6 @@ self: {
        ];
        description = "Easily generating message of japanese natural language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sentiwordnet-parser" = callPackage
@@ -225326,8 +211501,6 @@ self: {
        executableHaskellDepends = [ base directory filepath unix ];
        description = "Process monitoring tool written and configured in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "senza" = callPackage
@@ -225375,8 +211548,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "SmartyPants for Korean language";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "separated" = callPackage
@@ -225423,8 +211594,6 @@ self: {
        ];
        description = "Dynamic strictness control, including space leak repair";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seqalign" = callPackage
@@ -225502,8 +211671,6 @@ self: {
        ];
        description = "Handle sequence locations for bioinformatics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seqloc-datafiles" = callPackage
@@ -225537,8 +211704,6 @@ self: {
        ];
        description = "Read and write BED and GTF format genome annotations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sequence" = callPackage
@@ -225617,8 +211782,6 @@ self: {
        ];
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sequential-index" = callPackage
@@ -225653,8 +211816,6 @@ self: {
        ];
        description = "A sequence labeler based on Collins's sequence perceptron";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serf" = callPackage
@@ -225769,8 +211930,6 @@ self: {
        ];
        description = "Instances for Serialize of cereal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serialport" = callPackage
@@ -225813,8 +211972,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "General-purpose functions by Serokell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serpentine" = callPackage
@@ -225833,8 +211990,6 @@ self: {
        executableHaskellDepends = [ base singletons text ];
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serv" = callPackage
@@ -225848,8 +212003,6 @@ self: {
        ];
        description = "Dependently typed API framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serv-wai" = callPackage
@@ -225874,8 +212027,6 @@ self: {
        ];
        description = "Dependently typed API servers with Serv";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant" = callPackage
@@ -225947,8 +212098,6 @@ self: {
        ];
        description = "generic tests for aeson serialization in servant";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth" = callPackage
@@ -226018,8 +212167,6 @@ self: {
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-docs" = callPackage
@@ -226044,8 +212191,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-docs/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-hmac" = callPackage
@@ -226081,8 +212226,6 @@ self: {
        ];
        description = "Authentication via HMAC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-server" = callPackage
@@ -226150,8 +212293,6 @@ self: {
        ];
        description = "Servant based API and server for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-acid" = callPackage
@@ -226173,8 +212314,6 @@ self: {
        ];
        description = "Acid-state backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-api" = callPackage
@@ -226191,8 +212330,6 @@ self: {
        ];
        description = "Servant based API for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-leveldb" = callPackage
@@ -226214,8 +212351,6 @@ self: {
        ];
        description = "Leveldb backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-persistent" = callPackage
@@ -226235,8 +212370,6 @@ self: {
        ];
        description = "Persistent backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-rocksdb" = callPackage
@@ -226259,8 +212392,6 @@ self: {
        ];
        description = "RocksDB backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-wordpress" = callPackage
@@ -226293,8 +212424,6 @@ self: {
        ];
        description = "Avro content type for Servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-blaze" = callPackage
@@ -226476,8 +212605,6 @@ self: {
        ];
        description = "A servant client for frontend JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-client-namedargs" = callPackage
@@ -226499,8 +212626,6 @@ self: {
        ];
        description = "Automatically derive API client functions with named and optional parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-conduit" = callPackage
@@ -226540,8 +212665,6 @@ self: {
        ];
        description = "Generate servant client library for C#";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-db" = callPackage
@@ -226553,8 +212676,6 @@ self: {
        libraryHaskellDepends = [ base servant ];
        description = "Servant types for defining API with relational DBs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-db-postgresql" = callPackage
@@ -226580,8 +212701,6 @@ self: {
        ];
        description = "Derive a postgres client to database API specified by servant-db";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-dhall" = callPackage
@@ -226603,8 +212722,6 @@ self: {
        ];
        description = "Servant Dhall content-type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-docs" = callPackage
@@ -226678,8 +212795,6 @@ self: {
        ];
        description = "Combinators for rendering EDE templates in servant web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-ekg" = callPackage
@@ -226751,8 +212866,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Servant Errors wai-middlware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-examples" = callPackage
@@ -226775,8 +212888,6 @@ self: {
        ];
        description = "Example programs for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-exceptions" = callPackage
@@ -226797,8 +212908,6 @@ self: {
          aeson base exceptions http-types servant-server text warp
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-fiat-content" = callPackage
@@ -226853,8 +212962,6 @@ self: {
        libraryHaskellDepends = [ base servant servant-server ];
        description = "Utilities for generating mock server implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-generic" = callPackage
@@ -226871,8 +212978,6 @@ self: {
        ];
        description = "Specify Servant APIs with records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-github" = callPackage
@@ -226896,8 +213001,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings to GitHub API using servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-github-webhook" = callPackage
@@ -226920,8 +213023,6 @@ self: {
        ];
        description = "Servant combinators to facilitate writing GitHub webhooks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-haxl-client" = callPackage
@@ -226949,8 +213050,6 @@ self: {
        ];
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-hmac-auth" = callPackage
@@ -226977,8 +213076,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Servant authentication with HMAC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-http-streams" = callPackage
@@ -227014,8 +213111,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-http2-client" = callPackage
@@ -227040,8 +213135,6 @@ self: {
        ];
        description = "Generate HTTP2 clients from Servant API descriptions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-iCalendar" = callPackage
@@ -227058,8 +213151,6 @@ self: {
        ];
        description = "Servant support for iCalendar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-jquery" = callPackage
@@ -227078,8 +213169,6 @@ self: {
        ];
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-js" = callPackage
@@ -227114,8 +213203,6 @@ self: {
        libraryHaskellDepends = [ aeson base servant ];
        description = "JSON-RPC messages and endpoints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-jsonrpc-client" = callPackage
@@ -227131,8 +213218,6 @@ self: {
        ];
        description = "Generate JSON-RPC servant clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-jsonrpc-server" = callPackage
@@ -227148,8 +213233,6 @@ self: {
        ];
        description = "JSON-RPC servant servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-kotlin" = callPackage
@@ -227175,8 +213258,6 @@ self: {
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-lucid" = callPackage
@@ -227245,8 +213326,6 @@ self: {
        ];
        description = "Matrix parameter combinator for servant";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-mock" = callPackage
@@ -227337,8 +213416,6 @@ self: {
        testHaskellDepends = [ base hspec named QuickCheck servant ];
        description = "Combinators for servant providing named parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-nix" = callPackage
@@ -227360,8 +213437,6 @@ self: {
        ];
        description = "Servant Nix content-type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-openapi3" = callPackage
@@ -227390,8 +213465,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-options" = callPackage
@@ -227442,8 +213515,6 @@ self: {
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-pipes" = callPackage
@@ -227478,8 +213549,6 @@ self: {
        libraryHaskellDepends = [ base resource-pool servant time ];
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-postgresql" = callPackage
@@ -227496,8 +213565,6 @@ self: {
        ];
        description = "Useful functions and instances for using servant with a PostgreSQL context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-proto-lens" = callPackage
@@ -227520,8 +213587,6 @@ self: {
        ];
        description = "Servant Content-Type for proto-lens protobuf modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-purescript" = callPackage
@@ -227564,8 +213629,6 @@ self: {
        ];
        description = "Bindings to the Pushbullet API using servant-client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-py" = callPackage
@@ -227587,8 +213650,6 @@ self: {
        ];
        description = "Automatically derive python functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-quickcheck" = callPackage
@@ -227617,8 +213678,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-rawm" = callPackage
@@ -227641,8 +213700,6 @@ self: {
        libraryHaskellDepends = [ base servant-client-core servant-rawm ];
        description = "The client implementation of servant-rawm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-rawm-docs" = callPackage
@@ -227658,8 +213715,6 @@ self: {
        ];
        description = "Documentation generator for 'RawM' endpoints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-rawm-server" = callPackage
@@ -227676,8 +213731,6 @@ self: {
        ];
        description = "The server implementation of servant-rawm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-reason" = callPackage
@@ -227698,8 +213751,6 @@ self: {
        ];
        description = "Derive Reason types to interact with a Haskell backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-reflex" = callPackage
@@ -227722,8 +213773,6 @@ self: {
        ];
        description = "servant API generator for reflex apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-response" = callPackage
@@ -227756,8 +213805,6 @@ self: {
        ];
        description = "Servant router for non-server applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-ruby" = callPackage
@@ -227790,8 +213837,6 @@ self: {
        ];
        description = "Generate a web service for servant 'Resource's using scotty and JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-seo" = callPackage
@@ -227887,8 +213932,6 @@ self: {
        ];
        description = "Automatically derive API server functions with named and optional parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-smsc-ru" = callPackage
@@ -227911,8 +213954,6 @@ self: {
        ];
        description = "Servant client for smsc.ru service for sending SMS to cell phones";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-snap" = callPackage
@@ -228012,8 +214053,6 @@ self: {
        testHaskellDepends = [ base hspec http-types QuickCheck servant ];
        description = "Servant combinators for the 'streaming' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-streaming-client" = callPackage
@@ -228039,8 +214078,6 @@ self: {
        ];
        description = "Client instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-streaming-docs" = callPackage
@@ -228058,8 +214095,6 @@ self: {
        ];
        description = "Client instances for the 'servant-docs' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-streaming-server" = callPackage
@@ -228086,8 +214121,6 @@ self: {
        ];
        description = "Server instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-subscriber" = callPackage
@@ -228158,8 +214191,6 @@ self: {
        ];
        description = "Swagger Tags for Servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-swagger-ui" = callPackage
@@ -228254,8 +214285,6 @@ self: {
        ];
        description = "Automatically generate Elm clients for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-tracing" = callPackage
@@ -228310,8 +214339,6 @@ self: {
        ];
        description = "Servant Integration for Waargonaut JSON Package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-wasm" = callPackage
@@ -228399,8 +214426,6 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Types and definitions of servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-zeppelin-client" = callPackage
@@ -228424,8 +214449,6 @@ self: {
        ];
        description = "Client library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-zeppelin-server" = callPackage
@@ -228449,8 +214472,6 @@ self: {
        ];
        description = "Server library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-zeppelin-swagger" = callPackage
@@ -228472,8 +214493,6 @@ self: {
        ];
        description = "Swagger instances for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "server-generic" = callPackage
@@ -228489,8 +214508,6 @@ self: {
        ];
        description = "Auto-generate a server for your datatype";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serverless-haskell" = callPackage
@@ -228562,8 +214579,6 @@ self: {
        ];
        description = "Storage backend for serversession using acid-state";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serversession-backend-persistent" = callPackage
@@ -228590,8 +214605,6 @@ self: {
        ];
        description = "Storage backend for serversession using persistent and an RDBMS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serversession-backend-redis" = callPackage
@@ -228613,8 +214626,6 @@ self: {
        ];
        description = "Storage backend for serversession using Redis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serversession-frontend-snap" = callPackage
@@ -228667,8 +214678,6 @@ self: {
        ];
        description = "Yesod bindings for serversession";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "services" = callPackage
@@ -228686,8 +214695,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Tools for building services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serviette" = callPackage
@@ -228753,8 +214760,6 @@ self: {
        ];
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sessions" = callPackage
@@ -228769,8 +214774,6 @@ self: {
        ];
        description = "Session Types for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sessiontypes" = callPackage
@@ -228792,8 +214795,6 @@ self: {
        testHaskellDepends = [ base directory exceptions hspec ];
        description = "Session types library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sessiontypes-distributed" = callPackage
@@ -228816,8 +214817,6 @@ self: {
        ];
        description = "Session types distributed";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "set-cover" = callPackage
@@ -228879,8 +214878,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Sets of fixed size, with typelits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "set-with" = callPackage
@@ -228898,8 +214895,6 @@ self: {
        ];
        description = "Set of elements sorted by a different data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "setdown" = callPackage
@@ -228919,8 +214914,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Treating files as sets to perform rapid set manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "setenv" = callPackage
@@ -228981,8 +214974,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A Haskell implementation of setoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "setop" = callPackage
@@ -229060,8 +215051,6 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Small (TH) library to declare setters for typical `record' data type fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "settings" = callPackage
@@ -229097,8 +215086,6 @@ self: {
        ];
        description = "S-Expression parsing/printing made fun and easy";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sexp-grammar" = callPackage
@@ -229175,8 +215162,6 @@ self: {
        testHaskellDepends = [ base data-default hspec megaparsec ];
        description = "Simple s-expression parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sexpresso" = callPackage
@@ -229216,8 +215201,6 @@ self: {
        ];
        description = "Lists, Texts, ByteStrings and Vectors with type-encoded length";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sfml-audio" = callPackage
@@ -229242,8 +215225,6 @@ self: {
        libraryHaskellDepends = [ base bytestring entropy primitive ];
        description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sfnt2woff" = callPackage
@@ -229264,8 +215245,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A command line tool to convert TrueType/OpenType fonts to WOFF format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "sgd" = callPackage
@@ -229290,8 +215269,6 @@ self: {
        ];
        description = "Stochastic gradient descent library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sgf" = callPackage
@@ -229308,8 +215285,6 @@ self: {
        ];
        description = "SGF (Smart Game Format) parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sgrep" = callPackage
@@ -229323,8 +215298,6 @@ self: {
        executableHaskellDepends = [ base bio regex-compat ];
        description = "Sgrep - grep Fasta files for sequences matching a regular expression";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sh2md" = callPackage
@@ -229351,8 +215324,6 @@ self: {
        ];
        description = "Record your shell session and print in the markdown format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sha-streams" = callPackage
@@ -229367,8 +215338,6 @@ self: {
        executableHaskellDepends = [ base io-streams SHA ];
        description = "SHA hashes for io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sha1" = callPackage
@@ -229385,8 +215354,6 @@ self: {
        ];
        description = "SHA-1 Hash";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shade" = callPackage
@@ -229400,8 +215367,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A control structure used to combine heterogenous types with delayed effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shadower" = callPackage
@@ -229424,8 +215389,6 @@ self: {
        ];
        description = "An automated way to run doctests in files that are changing";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shadowsocks" = callPackage
@@ -229558,8 +215521,6 @@ self: {
        ];
        description = "Rules for binary distributions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-c" = callPackage
@@ -229602,8 +215563,6 @@ self: {
        ];
        description = "Utility for building Shake build systems using Cabal sandboxes";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-ccjs" = callPackage
@@ -229631,8 +215590,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dhall dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-elm" = callPackage
@@ -229670,8 +215627,6 @@ self: {
        ];
        description = "Extra utilities for shake build systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-futhark" = callPackage
@@ -229687,8 +215642,6 @@ self: {
        ];
        description = "Dependency tracking for Futhark";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-google-closure-compiler" = callPackage
@@ -229742,8 +215695,6 @@ self: {
        ];
        description = "Shake Minify Rules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-minify-css" = callPackage
@@ -229768,8 +215719,6 @@ self: {
        libraryHaskellDepends = [ base bytestring bzlib shake tar ];
        description = "Shake File Pack Rule";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-path" = callPackage
@@ -229781,8 +215730,6 @@ self: {
        libraryHaskellDepends = [ base path path-io shake ];
        description = "path alternatives to shake functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-persist" = callPackage
@@ -229800,8 +215747,6 @@ self: {
        executableHaskellDepends = [ base shake ];
        description = "Shake build system on-disk caching";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-plus" = callPackage
@@ -229832,8 +215777,6 @@ self: {
        ];
        description = "Experimental extensions to shake-plus";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shakebook" = callPackage
@@ -229879,8 +215822,6 @@ self: {
        ];
        description = "Shake-based technical documentation generator; HTML & PDF";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shaker" = callPackage
@@ -229909,8 +215850,6 @@ self: {
        ];
        description = "simple and interactive command-line build tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shakers" = callPackage
@@ -229966,8 +215905,6 @@ self: {
        ];
        description = "compile es2015";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shakespeare-css" = callPackage
@@ -230019,8 +215956,6 @@ self: {
        ];
        description = "SASS support for Shakespeare and Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shakespeare-text" = callPackage
@@ -230062,8 +215997,6 @@ self: {
        ];
        description = "Shannon-fano compression algorithm in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shapefile" = callPackage
@@ -230079,8 +216012,6 @@ self: {
        ];
        description = "Parser and related tools for ESRI shapefile format";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shapely-data" = callPackage
@@ -230099,8 +216030,6 @@ self: {
        ];
        description = "Generics using @(,)@ and @Either@, with algebraic operations and typed conversions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shapes" = callPackage
@@ -230198,8 +216127,6 @@ self: {
        ];
        description = "A circular buffer built on shared memory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shared-fields" = callPackage
@@ -230213,8 +216140,6 @@ self: {
        testHaskellDepends = [ base Cabal hspec lens text ];
        description = "a tiny library for using shared lens fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shared-memory" = callPackage
@@ -230254,8 +216179,6 @@ self: {
        executableHaskellDepends = [ base filepath mtl ];
        description = "A Haskell preprocessor adding miscellaneous features";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shelduck" = callPackage
@@ -230286,8 +216209,6 @@ self: {
        ];
        description = "Test webhooks locally";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shell-conduit" = callPackage
@@ -230350,8 +216271,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pipe streams through external shell commands";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shell-utility" = callPackage
@@ -230379,8 +216298,6 @@ self: {
        ];
        description = "shell-/perl- like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shellmate" = callPackage
@@ -230397,8 +216314,6 @@ self: {
        ];
        description = "Simple interface for shell scripting in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shellmate-extras" = callPackage
@@ -230415,8 +216330,6 @@ self: {
        ];
        description = "Extra functionality for shellmate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shellmet" = callPackage
@@ -230678,8 +216591,6 @@ self: {
        ];
        description = "The Reflective Lambda Machine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shine" = callPackage
@@ -230709,8 +216620,6 @@ self: {
        isExecutable = true;
        description = "Examples for the shine package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shine-varying" = callPackage
@@ -230741,8 +216650,6 @@ self: {
        ];
        description = "Implementation of Shivers' Control-Flow Analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shoap" = callPackage
@@ -230754,8 +216661,6 @@ self: {
        libraryHaskellDepends = [ base curl ];
        description = "A very basic SOAP package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shopify" = callPackage
@@ -230776,8 +216681,6 @@ self: {
        ];
        description = "A haskell API binding for shopify.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shortcircuit" = callPackage
@@ -230813,8 +216716,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Link shortcuts for use in text markup";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shorten-strings" = callPackage
@@ -230826,8 +216727,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Shorten a variety of string-like types adding ellipsis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "should-not-typecheck" = callPackage
@@ -230902,8 +216801,6 @@ self: {
        ];
        description = "Robust prettyprinter for output of auto-generated Show instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "show-type" = callPackage
@@ -230929,8 +216826,6 @@ self: {
        executableHaskellDepends = [ base glade gtk random ];
        description = "A simple gtk based Russian Roulette game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shower" = callPackage
@@ -230970,8 +216865,6 @@ self: {
        ];
        description = "Web automation library in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shplit" = callPackage
@@ -231021,8 +216914,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Shuffle tool for UHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shunya-library" = callPackage
@@ -231076,8 +216967,6 @@ self: {
        ];
        description = "An interface to the Silicon Labs Si5351 clock chip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sibe" = callPackage
@@ -231103,8 +216992,6 @@ self: {
        ];
        description = "Machine Learning algorithms";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sieve" = callPackage
@@ -231139,8 +217026,6 @@ self: {
        ];
        description = "Simple, visual, functional language for learning about recursion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sifflet-lib" = callPackage
@@ -231159,8 +217044,6 @@ self: {
        librarySystemDepends = [ gdk_x11 gtk_x11 ];
        description = "Library of modules shared by sifflet and its tests and its exporters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gdk_x11 = null; gtk_x11 = null;};
 
   "siggy-chardust" = callPackage
@@ -231201,8 +217084,6 @@ self: {
        ];
        description = "Thom polynomials of second order Thom-Boardman singularities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sign" = callPackage
@@ -231253,8 +217134,6 @@ self: {
        ];
        description = "Deterministic serialisation and signatures with proto-lens support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "signable-haskell-protoc" = callPackage
@@ -231304,8 +217183,6 @@ self: {
        ];
        description = "Synchronous signal processing for DSLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "signature" = callPackage
@@ -231334,8 +217211,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Multisets with negative membership";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "silently" = callPackage
@@ -231359,8 +217234,6 @@ self: {
        libraryHaskellDepends = [ base prettyprinter ];
        description = "Prettyprinting transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "silvi" = callPackage
@@ -231378,8 +217251,6 @@ self: {
        testHaskellDepends = [ base quantification savage text ];
        description = "A generator for different kinds of data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simd" = callPackage
@@ -231391,8 +217262,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive vector ];
        description = "simple interface to GHC's SIMD instructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simgi" = callPackage
@@ -231410,8 +217279,6 @@ self: {
        ];
        description = "stochastic simulation engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple" = callPackage
@@ -231446,8 +217313,6 @@ self: {
        ];
        description = "A minimalist web framework for the WAI server interface";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-actors" = callPackage
@@ -231462,8 +217327,6 @@ self: {
        ];
        description = "A library for more structured concurrent programming, based on the Actor Model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-affine-space" = callPackage
@@ -231491,8 +217354,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Atom (or symbol) datatype for fast comparision and sorting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-bluetooth" = callPackage
@@ -231505,8 +217366,6 @@ self: {
        librarySystemDepends = [ bluetooth ];
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {bluetooth = null;};
 
   "simple-c-value" = callPackage
@@ -231529,8 +217388,6 @@ self: {
        ];
        description = "A simple C value type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-cabal" = callPackage
@@ -231599,8 +217456,6 @@ self: {
        ];
        description = "A simple streaming I/O library based on monadic folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-config" = callPackage
@@ -231618,8 +217473,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Simple config file parser generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-css" = callPackage
@@ -231635,8 +217488,6 @@ self: {
        ];
        description = "simple binding of css and html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-download" = callPackage
@@ -231652,8 +217503,6 @@ self: {
        ];
        description = "A simple wrapper of http-conduit for file download";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-effects" = callPackage
@@ -231675,8 +217524,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion mtl transformers ];
        description = "A simple effect system that integrates with MTL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-enumeration" = callPackage
@@ -231703,8 +217550,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-firewire" = callPackage
@@ -231716,8 +217561,6 @@ self: {
        libraryHaskellDepends = [ base bindings-dc1394 CV ];
        description = "Simplified interface for firewire cameras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-form" = callPackage
@@ -231749,8 +217592,6 @@ self: {
        executableHaskellDepends = [ base deepseq parallel random ];
        description = "Simple parallel genetic algorithm implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-genetic-algorithm-mr" = callPackage
@@ -231797,8 +217638,6 @@ self: {
        ];
        description = "Allows simple indexation on any data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-log" = callPackage
@@ -231830,8 +217669,6 @@ self: {
        libraryHaskellDepends = [ base hsyslog simple-log text ];
        description = "Syslog backend for simple-log";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-logger" = callPackage
@@ -231843,8 +217680,6 @@ self: {
        libraryHaskellDepends = [ base fast-logger mtl text ];
        description = "A very simple but efficient logging framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-logging" = callPackage
@@ -231867,8 +217702,6 @@ self: {
        ];
        description = "Logging effect to plug into the simple-effects framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-ltl" = callPackage
@@ -231893,8 +217726,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple library to handle and interexchange money";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-neural-networks" = callPackage
@@ -231914,8 +217745,6 @@ self: {
        ];
        description = "Simple parallel neural networks implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-nix" = callPackage
@@ -231937,8 +217766,6 @@ self: {
        ];
        description = "Simple parsing/pretty printing for Nix expressions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-observer" = callPackage
@@ -231967,8 +217794,6 @@ self: {
        ];
        description = "Simplified Pascal language to SSVM compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-pipe" = callPackage
@@ -231987,8 +217812,6 @@ self: {
        ];
        description = "simple pipeline library like conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-postgresql-orm" = callPackage
@@ -232006,8 +217829,6 @@ self: {
        ];
        description = "Connector package for integrating postgresql-orm with the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-reflect" = callPackage
@@ -232030,8 +217851,6 @@ self: {
        libraryHaskellDepends = [ base bytestring QuickCheck ];
        description = "Memory-efficient strings with concatenation and splitting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-sendfile" = callPackage
@@ -232065,8 +217884,6 @@ self: {
        ];
        description = "Simple Server interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-session" = callPackage
@@ -232084,8 +217901,6 @@ self: {
        ];
        description = "Cookie-based session management for the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-sessions" = callPackage
@@ -232154,8 +217969,6 @@ self: {
        ];
        description = "Simple stacked virtual machine: assembler, disassembler, bytecode interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-tabular" = callPackage
@@ -232167,8 +217980,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Simple tabular-text formatter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-tar" = callPackage
@@ -232184,8 +217995,6 @@ self: {
        ];
        description = "Simple, pure, file-system-free reading of tar files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-templates" = callPackage
@@ -232237,8 +218046,6 @@ self: {
        ];
        description = "UI library for terminal";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-units" = callPackage
@@ -232250,8 +218057,6 @@ self: {
        libraryHaskellDepends = [ base first-class-families ];
        description = "Simple arithmetic with SI units using type-checked dimensional analysis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-vec3" = callPackage
@@ -232269,8 +218074,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Three-dimensional vectors of doubles with basic operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-zipper" = callPackage
@@ -232283,8 +218086,6 @@ self: {
        testHaskellDepends = [ base hspec lens ];
        description = "Zippers made slightly easier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simpleargs" = callPackage
@@ -232297,8 +218098,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Provides a more flexible getArgs function with better error reporting";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simpleconfig" = callPackage
@@ -232315,8 +218114,6 @@ self: {
        ];
        description = "Short description of your package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simpleirc" = callPackage
@@ -232333,8 +218130,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit knob ];
        description = "Simple IRC Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simpleirc-lens" = callPackage
@@ -232346,8 +218141,6 @@ self: {
        libraryHaskellDepends = [ base bytestring simpleirc ];
        description = "Lenses for simpleirc types";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simplelru" = callPackage
@@ -232389,8 +218182,6 @@ self: {
        ];
        description = "Haskell interface for the simplenote API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simpleprelude" = callPackage
@@ -232409,8 +218200,6 @@ self: {
        ];
        description = "A simplified Haskell prelude for teaching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simplesmtpclient" = callPackage
@@ -232424,8 +218213,6 @@ self: {
        libraryHaskellDepends = [ array base directory network old-time ];
        description = "Very simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simplessh" = callPackage
@@ -232521,8 +218308,6 @@ self: {
        executableHaskellDepends = [ base bio bytestring random ];
        description = "Simulate sequencing with different models for priming and errors";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simtreelo" = callPackage
@@ -232621,8 +218406,6 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Typelevel balanced search trees via a singletonized Data.Map";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "singleton-nats" = callPackage
@@ -232645,8 +218428,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Singletons and induction over GHC TypeLits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "singletons" = callPackage
@@ -232700,8 +218481,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Singnal";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "singular-factory" = callPackage
@@ -232722,8 +218501,6 @@ self: {
        ];
        description = "Multivariate polynomial factorization via bindings to Singular-factory";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {singular-factory = null;};
 
   "sink" = callPackage
@@ -232735,8 +218512,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An alternative to lazy I/O that doesn't conflate execution with evaluation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "siphash" = callPackage
@@ -232783,8 +218558,6 @@ self: {
        ];
        description = "Encode and decode CSV files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "siren-json" = callPackage
@@ -232809,8 +218582,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Siren Tools for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sirkel" = callPackage
@@ -232827,8 +218598,6 @@ self: {
        ];
        description = "Sirkel, a Chord DHT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sitemap" = callPackage
@@ -232876,8 +218645,6 @@ self: {
        ];
        description = "A simple to understand static site generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sixel" = callPackage
@@ -232913,8 +218680,6 @@ self: {
        ];
        description = "A six figure group of time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sixty-five-oh-two" = callPackage
@@ -232992,8 +218757,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Multidimensional grids with sized specified at compile time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sized-types" = callPackage
@@ -233012,8 +218775,6 @@ self: {
        ];
        description = "Sized types in Haskell using the GHC Nat kind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sized-vector" = callPackage
@@ -233030,8 +218791,6 @@ self: {
        ];
        description = "Size-parameterized vector types and functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sizes" = callPackage
@@ -233051,8 +218810,6 @@ self: {
        ];
        description = "Recursively show space (size and i-nodes) used in subdirectories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sjsp" = callPackage
@@ -233074,8 +218831,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Simple JavaScript Profiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skein" = callPackage
@@ -233112,8 +218867,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Skeletal set - a set with equivalence relation different from equality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skeleton" = callPackage
@@ -233132,8 +218885,6 @@ self: {
        ];
        description = "a tool to access the OSX keychain";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skeletons" = callPackage
@@ -233152,8 +218903,6 @@ self: {
        ];
        description = "Manage project skeletons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skell" = callPackage
@@ -233169,8 +218918,6 @@ self: {
        ];
        description = "An overly complex Haskell web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skemmtun" = callPackage
@@ -233189,8 +218936,6 @@ self: {
        ];
        description = "A MyAnimeList.net client.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skews" = callPackage
@@ -233207,8 +218952,6 @@ self: {
        ];
        description = "A very quick-and-dirty WebSocket server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skip-list" = callPackage
@@ -233247,8 +218990,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Eclectic collection of utility functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skylark-client" = callPackage
@@ -233271,8 +219012,6 @@ self: {
        ];
        description = "Skylark client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skylighting" = callPackage
@@ -233354,8 +219093,6 @@ self: {
        ];
        description = "Lucid support for Skylighting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skylighting-modding" = callPackage
@@ -233384,8 +219121,6 @@ self: {
        ];
        description = "Skype Desktop API binding for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skypelogexport" = callPackage
@@ -233423,8 +219158,6 @@ self: {
        ];
        description = "Haskell API for interacting with Slack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slack-api" = callPackage
@@ -233467,8 +219200,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Slack notifier for Haskell project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slack-progressbar" = callPackage
@@ -233535,8 +219266,6 @@ self: {
        ];
        description = "Bindings for the Slack web API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slate" = callPackage
@@ -233584,8 +219313,6 @@ self: {
        ];
        description = "A fundamental solution to ghost threads and silent exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sleep" = callPackage
@@ -233642,8 +219369,6 @@ self: {
        ];
        description = "Python-ish slicing traversals for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slick" = callPackage
@@ -233678,8 +219403,6 @@ self: {
        ];
        description = "ws convert markdown to reveal-js";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slim" = callPackage
@@ -233695,8 +219418,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Functional reactive user interface programming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slip32" = callPackage
@@ -233717,8 +219438,6 @@ self: {
        ];
        description = "SLIP-0032: Extended serialization format for BIP-32 wallets";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slist" = callPackage
@@ -233752,8 +219471,6 @@ self: {
        ];
        description = "A command line interface to Sloane's OEIS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slope-field" = callPackage
@@ -233788,8 +219505,6 @@ self: {
        ];
        description = "Write lambdas without naming the parameters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sloth" = callPackage
@@ -233801,8 +219516,6 @@ self: {
        libraryHaskellDepends = [ base mtl process ];
        description = "Testing for minimal strictness";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slotmap" = callPackage
@@ -233836,8 +219549,6 @@ self: {
        ];
        description = "Type-safe slugs for Yesod ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slynx" = callPackage
@@ -233860,8 +219571,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Handle molecular sequences";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "small-bytearray-builder" = callPackage
@@ -233874,8 +219583,6 @@ self: {
        doHaddock = false;
        description = "Serialize to bytes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smallarray" = callPackage
@@ -233887,8 +219594,6 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq hashable ];
        description = "low-level unboxed arrays, with minimal features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smallcaps" = callPackage
@@ -233950,8 +219655,6 @@ self: {
        libraryHaskellDepends = [ base smallcheck smallcheck-series ];
        description = "SmallCheck properties for common laws";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smallcheck-lens" = callPackage
@@ -233967,8 +219670,6 @@ self: {
        ];
        description = "SmallCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smallcheck-series" = callPackage
@@ -233988,8 +219689,6 @@ self: {
        ];
        description = "Extra SmallCheck series and utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smallpt-hs" = callPackage
@@ -234003,8 +219702,6 @@ self: {
        executableHaskellDepends = [ base vector ];
        description = "A Haskell port of the smallpt path tracer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smallstring" = callPackage
@@ -234020,8 +219717,6 @@ self: {
        ];
        description = "A Unicode text type, optimized for low memory overhead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smaoin" = callPackage
@@ -234068,8 +219763,6 @@ self: {
        ];
        description = "A command line tool for working with sets and maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smartGroup" = callPackage
@@ -234083,8 +219776,6 @@ self: {
        ];
        description = "group strings or bytestrings by words in common";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smartcheck" = callPackage
@@ -234105,8 +219796,6 @@ self: {
        ];
        description = "A smarter QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smartconstructor" = callPackage
@@ -234118,8 +219807,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "A package exposing a helper function for generating smart constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smarties" = callPackage
@@ -234161,8 +219848,6 @@ self: {
        ];
        description = "Web based flash card for Word Smart I and II vocabularies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smash" = callPackage
@@ -234227,8 +219912,6 @@ self: {
        libraryHaskellDepends = [ base optics-core smash ];
        description = "Optics for the `smash` library using `optics-core`";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smcdel" = callPackage
@@ -234255,8 +219938,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion time ];
        description = "Symbolic Model Checking for Dynamic Epistemic Logic";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sme" = callPackage
@@ -234268,8 +219949,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for Secure Multi-Execution in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smerdyakov" = callPackage
@@ -234288,8 +219967,6 @@ self: {
          transformers yaml
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smiles" = callPackage
@@ -234301,8 +219978,6 @@ self: {
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base hspec megaparsec QuickCheck text ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smith" = callPackage
@@ -234314,8 +219989,6 @@ self: {
        libraryHaskellDepends = [ base bytesmith primitive ];
        description = "Parse arrays of tokens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smith-cli" = callPackage
@@ -234339,8 +220012,6 @@ self: {
        ];
        description = "Command line tool for <https://smith.st/ Smith>.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smith-client" = callPackage
@@ -234364,8 +220035,6 @@ self: {
        ];
        description = "API client for <https://smith.st/ Smith>.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smoothie" = callPackage
@@ -234394,8 +220063,6 @@ self: {
        ];
        description = "SMSAero API and HTTP client based on servant library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smt" = callPackage
@@ -234422,8 +220089,6 @@ self: {
        libraryHaskellDepends = [ array base directory polyparse ];
        description = "Parsing and printing SMT-LIB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smtLib" = callPackage
@@ -234451,8 +220116,6 @@ self: {
        ];
        description = "A type-safe interface to communicate with an SMT solver";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smtlib2-debug" = callPackage
@@ -234469,8 +220132,6 @@ self: {
        ];
        description = "Dump the communication with an SMT solver for debugging purposes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smtlib2-pipe" = callPackage
@@ -234492,8 +220153,6 @@ self: {
        ];
        description = "A type-safe interface to communicate with an SMT solver";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smtlib2-quickcheck" = callPackage
@@ -234509,8 +220168,6 @@ self: {
        ];
        description = "Helper functions to create SMTLib expressions in QuickCheck";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smtlib2-timing" = callPackage
@@ -234522,8 +220179,6 @@ self: {
        libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ];
        description = "Get timing informations for SMT queries";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smtp-mail" = callPackage
@@ -234562,8 +220217,6 @@ self: {
        ];
        description = "An SMTP client EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smtp2mta" = callPackage
@@ -234596,8 +220249,6 @@ self: {
        ];
        description = "Gmail SMTP Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smuggler" = callPackage
@@ -234620,8 +220271,6 @@ self: {
        testHaskellDepends = [ base directory filepath ];
        description = "GHC Source Plugin that helps to manage imports";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smuggler2" = callPackage
@@ -234643,8 +220292,6 @@ self: {
        ];
        description = "GHC Source Plugin that helps to minimise imports and generate explicit exports";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snake" = callPackage
@@ -234658,8 +220305,6 @@ self: {
        executableHaskellDepends = [ base random split terminal-size ];
        description = "A basic console snake game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snake-game" = callPackage
@@ -234671,8 +220316,6 @@ self: {
        libraryHaskellDepends = [ base GLUT OpenGL random ];
        description = "Snake Game Using OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap" = callPackage
@@ -234723,8 +220366,6 @@ self: {
        ];
        description = "Accept header branching for the Snap web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-app" = callPackage
@@ -234756,8 +220397,6 @@ self: {
        ];
        description = "Command-line tool to manage Snap AuthManager database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-blaze" = callPackage
@@ -234780,8 +220419,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html clay snap-core ];
        description = "blaze-html-clay integration for Snap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-configuration-utilities" = callPackage
@@ -234795,8 +220432,6 @@ self: {
        ];
        description = "Methods to manipulate Configurator objects for Snap & Snaplets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-core" = callPackage
@@ -234875,8 +220510,6 @@ self: {
        ];
        description = "Collect errors in batches and dispatch them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-extras" = callPackage
@@ -234908,8 +220541,6 @@ self: {
        ];
        description = "A collection of useful helpers and utilities for Snap web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-language" = callPackage
@@ -234941,8 +220572,6 @@ self: {
        ];
        description = "Snap dynamic loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-loader-static" = callPackage
@@ -234954,8 +220583,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Snap static loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-predicates" = callPackage
@@ -234999,8 +220626,6 @@ self: {
        ];
        description = "Typesafe URLs for Snap applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-server" = callPackage
@@ -235058,8 +220683,6 @@ self: {
        ];
        description = "Streaming Snap handlers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-templates" = callPackage
@@ -235104,8 +220727,6 @@ self: {
        ];
        description = "A library for BDD-style testing with the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-utils" = callPackage
@@ -235123,8 +220744,6 @@ self: {
        ];
        description = "Snap Framework utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-web-routes" = callPackage
@@ -235140,8 +220759,6 @@ self: {
        ];
        description = "Type safe URLs for Snap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-acid-state" = callPackage
@@ -235155,8 +220772,6 @@ self: {
        ];
        description = "acid-state snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-actionlog" = callPackage
@@ -235181,8 +220796,6 @@ self: {
        ];
        description = "Generic action log snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-amqp" = callPackage
@@ -235200,8 +220813,6 @@ self: {
        ];
        description = "Snap framework snaplet for the AMQP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-auth-acid" = callPackage
@@ -235222,8 +220833,6 @@ self: {
        ];
        description = "Provides an Acid-State backend for the Auth Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-coffee" = callPackage
@@ -235241,8 +220850,6 @@ self: {
        ];
        description = "CoffeeScript for Snap, auto-compilation and pre-compilation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-css-min" = callPackage
@@ -235259,8 +220866,6 @@ self: {
        ];
        description = "A Snaplet for CSS minification";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-customauth" = callPackage
@@ -235284,8 +220889,6 @@ self: {
        ];
        description = "Alternate authentication snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-environments" = callPackage
@@ -235302,8 +220905,6 @@ self: {
        ];
        description = "DEPRECATED! You should use standard Snap >= 0.9 \"environments\" functionality. It provided ability to easly read configuration based on given app environment given at command line, envs are defined in app configuration file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-fay" = callPackage
@@ -235323,8 +220924,6 @@ self: {
        ];
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-ghcjs" = callPackage
@@ -235358,8 +220957,6 @@ self: {
        ];
        description = "A Hasql snaplet";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-haxl" = callPackage
@@ -235375,8 +220972,6 @@ self: {
        ];
        description = "Snaplet for Facebook's Haxl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-hdbc" = callPackage
@@ -235397,8 +220992,6 @@ self: {
        ];
        description = "HDBC snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-hslogger" = callPackage
@@ -235415,8 +221008,6 @@ self: {
        ];
        description = "Snap framework snaplet for the Logger API library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-i18n" = callPackage
@@ -235440,8 +221031,6 @@ self: {
        ];
        description = "snaplet-i18n";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-influxdb" = callPackage
@@ -235460,8 +221049,6 @@ self: {
        ];
        description = "Snap framework snaplet for the InfluxDB library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-lss" = callPackage
@@ -235494,8 +221081,6 @@ self: {
        ];
        description = "Snap framework snaplet for the Mandrill API library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-mongoDB" = callPackage
@@ -235515,8 +221100,6 @@ self: {
        ];
        description = "Snap Framework MongoDB support as Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-mongodb-minimalistic" = callPackage
@@ -235531,8 +221114,6 @@ self: {
        ];
        description = "Minimalistic MongoDB Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-mysql-simple" = callPackage
@@ -235553,8 +221134,6 @@ self: {
        ];
        description = "mysql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-oauth" = callPackage
@@ -235580,8 +221159,6 @@ self: {
        ];
        description = "snaplet-oauth";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-persistent" = callPackage
@@ -235604,8 +221181,6 @@ self: {
        ];
        description = "persistent snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-postgresql-simple" = callPackage
@@ -235630,8 +221205,6 @@ self: {
        ];
        description = "postgresql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-postmark" = callPackage
@@ -235648,8 +221221,6 @@ self: {
        ];
        description = "Postmark snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-purescript" = callPackage
@@ -235666,8 +221237,6 @@ self: {
        ];
        description = "Automatic (re)compilation of purescript projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-recaptcha" = callPackage
@@ -235685,8 +221254,6 @@ self: {
        ];
        description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-redis" = callPackage
@@ -235706,8 +221273,6 @@ self: {
        ];
        description = "Redis support for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-redson" = callPackage
@@ -235727,8 +221292,6 @@ self: {
        ];
        description = "CRUD for JSON data with Redis storage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-rest" = callPackage
@@ -235746,8 +221309,6 @@ self: {
        ];
        description = "REST resources for the Snap web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-riak" = callPackage
@@ -235765,8 +221326,6 @@ self: {
        ];
        description = "A Snaplet for the Riak database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-sass" = callPackage
@@ -235784,8 +221343,6 @@ self: {
        ];
        description = "Sass integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-scoped-session" = callPackage
@@ -235802,8 +221359,6 @@ self: {
        ];
        description = "Modularised session state for Snaplets, in a Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-sedna" = callPackage
@@ -235820,8 +221375,6 @@ self: {
        ];
        description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-ses-html" = callPackage
@@ -235838,8 +221391,6 @@ self: {
        ];
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-sqlite-simple" = callPackage
@@ -235870,8 +221421,6 @@ self: {
        ];
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-sqlite-simple-jwt-auth" = callPackage
@@ -235891,8 +221440,6 @@ self: {
        ];
        description = "Snaplet for JWT authentication with snaplet-sqlite-simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-stripe" = callPackage
@@ -235911,8 +221458,6 @@ self: {
        ];
        description = "Stripe snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-tasks" = callPackage
@@ -235929,8 +221474,6 @@ self: {
        ];
        description = "Snaplet for Snap Framework enabling developers to administrative tasks akin to Rake tasks from Ruby On Rails framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-typed-sessions" = callPackage
@@ -235948,8 +221491,6 @@ self: {
        ];
        description = "Typed session snaplets and continuation-based programming for the Snap web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-wordpress" = callPackage
@@ -235976,8 +221517,6 @@ self: {
        ];
        description = "A snaplet that communicates with wordpress over its api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snappy" = callPackage
@@ -236007,8 +221546,6 @@ self: {
        libraryHaskellDepends = [ base bytestring conduit snappy ];
        description = "Conduit bindings for Snappy (see snappy package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snappy-framing" = callPackage
@@ -236031,8 +221568,6 @@ self: {
        libraryHaskellDepends = [ base bytestring iteratee snappy ];
        description = "An enumeratee that uses Google's snappy compression library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snappy-lazy" = callPackage
@@ -236065,8 +221600,6 @@ self: {
        ];
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sneakyterm" = callPackage
@@ -236082,8 +221615,6 @@ self: {
        ];
        description = "Tiny, declarative wrapper around ncurses";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sneathlane-haste" = callPackage
@@ -236107,8 +221638,6 @@ self: {
        libraryHaskellDepends = [ base containers pandoc process text ];
        description = "Markdown tester";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snippet-extractor" = callPackage
@@ -236143,8 +221672,6 @@ self: {
        ];
        description = "The Simple Nice-Looking Manual Generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snmp" = callPackage
@@ -236163,8 +221690,6 @@ self: {
        ];
        description = "SNMP protocol library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snorkels" = callPackage
@@ -236187,8 +221712,6 @@ self: {
        ];
        description = "Strategic board game of medium complexity";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snow-white" = callPackage
@@ -236201,8 +221724,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mps ];
        description = "encode any binary instance to white space";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snowball" = callPackage
@@ -236250,8 +221771,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "twitter's snowflake";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snowflake-server" = callPackage
@@ -236270,8 +221789,6 @@ self: {
        ];
        description = "snowflake http server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snowglobe" = callPackage
@@ -236305,8 +221822,6 @@ self: {
        ];
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "soap" = callPackage
@@ -236425,8 +221940,6 @@ self: {
        libraryHaskellDepends = [ base network transformers unix ];
        description = "systemd socket activation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "socket-icmp" = callPackage
@@ -236453,8 +221966,6 @@ self: {
          transformers unordered-containers vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "socket-sctp" = callPackage
@@ -236468,8 +221979,6 @@ self: {
        testHaskellDepends = [ base bytestring socket ];
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) lksctp-tools;};
 
   "socket-unix" = callPackage
@@ -236486,8 +221995,6 @@ self: {
        ];
        description = "Unix domain sockets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "socketed" = callPackage
@@ -236514,8 +222021,6 @@ self: {
        ];
        description = "simpe tool to serve piped data over http and websocket";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "socketio" = callPackage
@@ -236544,8 +222049,6 @@ self: {
        ];
        description = "Socket.IO server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sockets" = callPackage
@@ -236576,8 +222079,6 @@ self: {
        doHaddock = false;
        description = "High-level network sockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "socketson" = callPackage
@@ -236603,8 +222104,6 @@ self: {
        ];
        description = "A small websocket backend provider";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "socks" = callPackage
@@ -236629,8 +222128,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Sodium Reactive Programming (FRP) System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "soegtk" = callPackage
@@ -236643,8 +222140,6 @@ self: {
        libraryHaskellDepends = [ base cairo gtk old-time stm ];
        description = "GUI functions as used in the book \"The Haskell School of Expression\"";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "softfloat-hs" = callPackage
@@ -236657,8 +222152,6 @@ self: {
        librarySystemDepends = [ softfloat ];
        description = "Haskell bindings for SoftFloat";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {softfloat = null;};
 
   "solar" = callPackage
@@ -236695,8 +222188,6 @@ self: {
        ];
        description = "Simple typesafe web routing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "solga-swagger" = callPackage
@@ -236714,8 +222205,6 @@ self: {
        ];
        description = "Swagger generation for Solga";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "solr" = callPackage
@@ -236740,8 +222229,6 @@ self: {
        ];
        description = "A minimal Solr client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "solve" = callPackage
@@ -236791,8 +222278,6 @@ self: {
        ];
        description = "Sonic Visualiser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sop-core" = callPackage
@@ -236863,8 +222348,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient, type-safe sorted sequences";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sorted-list" = callPackage
@@ -236900,8 +222383,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utils for sorting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sorty" = callPackage
@@ -236915,8 +222396,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Sort lines per file size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "souffle-haskell" = callPackage
@@ -236947,8 +222426,6 @@ self: {
        ];
        description = "Souffle Datalog bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sound-collage" = callPackage
@@ -236971,8 +222448,6 @@ self: {
        ];
        description = "Approximate a song from other pieces of sound";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sounddelay" = callPackage
@@ -236986,8 +222461,6 @@ self: {
        executableHaskellDepends = [ base containers parseargs WAVE ];
        description = "Audio delay line";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "soundgen" = callPackage
@@ -237001,8 +222474,6 @@ self: {
        executableHaskellDepends = [ base split WAVE ];
        description = "sound generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "source-code-server" = callPackage
@@ -237026,8 +222497,6 @@ self: {
        ];
        description = "The server backend for the source code iPhone app";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "source-constraints" = callPackage
@@ -237088,8 +222557,6 @@ self: {
        ];
        description = "Source/Sink/Transform: An alternative to lazy IO and iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sox" = callPackage
@@ -237145,8 +222612,6 @@ self: {
        ];
        description = "DCPU-16 architecture utilities for Notch's 0x10c game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "space" = callPackage
@@ -237212,8 +222677,6 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        description = "Space partition data structures. Currently only a QuadTree.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spaceprobe" = callPackage
@@ -237258,8 +222721,6 @@ self: {
        ];
        description = "Implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spanout" = callPackage
@@ -237277,8 +222738,6 @@ self: {
        ];
        description = "A breakout clone written in netwire and gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparkle" = callPackage
@@ -237304,8 +222763,6 @@ self: {
        ];
        description = "Distributed Apache Spark applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparql-protocol" = callPackage
@@ -237351,8 +222808,6 @@ self: {
        ];
        description = "Unified streaming data-dependency framework for web apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spars" = callPackage
@@ -237364,8 +222819,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A sparse set-based parsing library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparse" = callPackage
@@ -237393,8 +222846,6 @@ self: {
        benchmarkHaskellDepends = [ array base criterion deepseq vector ];
        description = "A playground of sparse linear algebra primitives using Morton ordering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparse-lin-alg" = callPackage
@@ -237412,8 +222863,6 @@ self: {
        ];
        description = "Effective linear algebra on sparse matrices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparse-linear-algebra" = callPackage
@@ -237469,8 +222918,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "Sparse bitmaps for pattern match coverage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparsecheck" = callPackage
@@ -237482,8 +222929,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A Logic Programming Library for Test-Data Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparser" = callPackage
@@ -237499,8 +222944,6 @@ self: {
        ];
        description = "Lightweight parsing library based on partial functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spata" = callPackage
@@ -237513,8 +222956,6 @@ self: {
        libraryHaskellDepends = [ base dlist mps mtl ];
        description = "brainless form validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spatial-math" = callPackage
@@ -237609,8 +223050,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "special-keys" = callPackage
@@ -237628,8 +223067,6 @@ self: {
        ];
        description = "Simple data types that help me here and there";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "special-values" = callPackage
@@ -237669,8 +223106,6 @@ self: {
        ];
        description = "Create specialized types from polymorphic ones using TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "species" = callPackage
@@ -237689,8 +223124,6 @@ self: {
        ];
        description = "Computational combinatorial species";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spectral-clustering" = callPackage
@@ -237708,8 +223141,6 @@ self: {
        ];
        description = "Library for spectral clustering";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "speculate" = callPackage
@@ -237736,8 +223167,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim stm transformers ];
        description = "A framework for safe, programmable, speculative parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "speculation-transformers" = callPackage
@@ -237750,8 +223179,6 @@ self: {
        doHaddock = false;
        description = "Merged into 'speculation'. Use that instead.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "speechmatics" = callPackage
@@ -237782,8 +223209,6 @@ self: {
        ];
        description = "Speechmatics api client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "speedy-slice" = callPackage
@@ -237801,8 +223226,6 @@ self: {
        testHaskellDepends = [ base containers ];
        description = "Speedy slice sampling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spelling-suggest" = callPackage
@@ -237824,8 +223247,6 @@ self: {
        ];
        description = "Spelling suggestion tool with library and command-line interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spherical" = callPackage
@@ -237852,8 +223273,6 @@ self: {
        ];
        description = "Orbotix Sphero client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sphinx" = callPackage
@@ -237870,8 +223289,6 @@ self: {
        ];
        description = "Haskell bindings to the Sphinx full-text searching daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sphinx-cli" = callPackage
@@ -237885,8 +223302,6 @@ self: {
        executableHaskellDepends = [ base sphinx ];
        description = "Sphinx CLI and demo of Haskell Sphinx library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sphinxesc" = callPackage
@@ -237905,8 +223320,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Transform queries for sphinx input";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spice" = callPackage
@@ -237923,8 +223336,6 @@ self: {
        ];
        description = "An FRP-based game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spike" = callPackage
@@ -237968,8 +223379,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some utilities for reading and writing SPIR-V files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spiros" = callPackage
@@ -237996,8 +223405,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Spiros Boosalis's Custom Prelude";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "splay" = callPackage
@@ -238009,8 +223416,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic splay-based sequence representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "splaytree" = callPackage
@@ -238028,8 +223433,6 @@ self: {
        ];
        description = "Provides an annotated splay tree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "splice" = callPackage
@@ -238085,8 +223488,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion polynomial vector ];
        description = "B-Splines, other splines, and NURBS";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "splint" = callPackage
@@ -238145,8 +223546,6 @@ self: {
        testHaskellDepends = [ base invariant lens QuickCheck ];
        description = "Split Epimorphisms and Monomorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "split-record" = callPackage
@@ -238238,8 +223637,6 @@ self: {
        ];
        description = "Use numerical ranges to split out certain lines from a file";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "splot" = callPackage
@@ -238300,8 +223697,6 @@ self: {
        ];
        description = "Spoon's utilities. Simple testing and nice looking error reporting.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spork" = callPackage
@@ -238329,8 +223724,6 @@ self: {
        ];
        description = "Spotify web API wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spreadsheet" = callPackage
@@ -238390,8 +223783,6 @@ self: {
        ];
        description = "JSON API to HTML website wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spritz" = callPackage
@@ -238403,8 +223794,6 @@ self: {
        libraryHaskellDepends = [ base lens mtl vector ];
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sproxy" = callPackage
@@ -238429,8 +223818,6 @@ self: {
        ];
        description = "HTTP proxy for authenticating users via OAuth2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sproxy-web" = callPackage
@@ -238456,8 +223843,6 @@ self: {
        ];
        description = "Web interface to sproxy database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sproxy2" = callPackage
@@ -238483,8 +223868,6 @@ self: {
        ];
        description = "Secure HTTP proxy for authenticating users via OAuth2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spsa" = callPackage
@@ -238504,8 +223887,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion hmatrix random ];
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spy" = callPackage
@@ -238531,8 +223912,6 @@ self: {
        ];
        description = "A compact file system watcher for Mac OS X, Linux and Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sql-simple" = callPackage
@@ -238549,8 +223928,6 @@ self: {
        ];
        description = "common middle-level sql client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sql-simple-mysql" = callPackage
@@ -238566,8 +223943,6 @@ self: {
        ];
        description = "mysql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sql-simple-pool" = callPackage
@@ -238584,8 +223959,6 @@ self: {
        ];
        description = "conection pool for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sql-simple-postgresql" = callPackage
@@ -238601,8 +223974,6 @@ self: {
        ];
        description = "postgresql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sql-simple-sqlite" = callPackage
@@ -238614,8 +223985,6 @@ self: {
        libraryHaskellDepends = [ base sql-simple sqlite-simple ];
        description = "sqlite backend for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sql-words" = callPackage
@@ -238646,8 +224015,6 @@ self: {
        testHaskellDepends = [ base filepath hspec temporary ];
        description = "Haskell binding to sqlcipher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "sqlcli" = callPackage
@@ -238688,8 +224055,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell binding to sqlite3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "sqlite-simple" = callPackage
@@ -238723,8 +224088,6 @@ self: {
        testHaskellDepends = [ base mtl sqlite-simple text ];
        description = "Wrapper around errors from sqlite-simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sqlite-simple-typed" = callPackage
@@ -238741,8 +224104,6 @@ self: {
        ];
        description = "Typed extension to sqlite simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sqlvalue-list" = callPackage
@@ -238754,8 +224115,6 @@ self: {
        libraryHaskellDepends = [ base convertible HDBC template-haskell ];
        description = "Class and instances for conversion to list of SqlValue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sqsd-local" = callPackage
@@ -238777,8 +224136,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "squares" = callPackage
@@ -238834,8 +224191,6 @@ self: {
        ];
        description = "Squeal PostgreSQL Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "squeather" = callPackage
@@ -238870,8 +224225,6 @@ self: {
        ];
        description = "A file-packing application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sr-extra" = callPackage
@@ -238899,8 +224252,6 @@ self: {
        ];
        description = "Module limbo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "srcinst" = callPackage
@@ -238919,8 +224270,6 @@ self: {
        ];
        description = "Build and install Debian packages completely from source";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "srcloc" = callPackage
@@ -238961,8 +224310,6 @@ self: {
        ];
        description = "text UI for scanning with SANE";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sscgi" = callPackage
@@ -238980,8 +224327,6 @@ self: {
        ];
        description = "Simple SCGI Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sscript" = callPackage
@@ -239025,8 +224370,6 @@ self: {
        doCheck = false;
        description = "A pure-Haskell SSH server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ssh-known-hosts" = callPackage
@@ -239064,8 +224407,6 @@ self: {
        ];
        description = "Proxy http-client via ssh tunnel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sshd-lint" = callPackage
@@ -239086,8 +224427,6 @@ self: {
        ];
        description = "Check sshd configuration for adherence to best practices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sshtun" = callPackage
@@ -239135,8 +224474,6 @@ self: {
        ];
        description = "HTTP proxy for S3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sstable" = callPackage
@@ -239155,8 +224492,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "SSTables in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ssv" = callPackage
@@ -239182,8 +224517,6 @@ self: {
        libraryHaskellDepends = [ base gdp ghc-prim primitive ];
        description = "shared heap regions between local mutable state threads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stable-heap" = callPackage
@@ -239200,8 +224533,6 @@ self: {
        ];
        description = "Purely functional stable heaps (fair priority queues)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stable-maps" = callPackage
@@ -239213,8 +224544,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim ];
        description = "Heterogeneous maps keyed by StableNames";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stable-marriage" = callPackage
@@ -239227,8 +224556,6 @@ self: {
        testHaskellDepends = [ base ghc-prim ];
        description = "algorithms around stable marriage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stable-memo" = callPackage
@@ -239242,8 +224569,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim hashtables ];
        description = "Memoization based on argument identity";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stable-tree" = callPackage
@@ -239268,8 +224593,6 @@ self: {
        ];
        description = "Trees whose branches are resistant to change";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stache" = callPackage
@@ -239443,8 +224766,6 @@ self: {
        ];
        description = "Dead simple version bumping for hpack packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-clean-old" = callPackage
@@ -239475,8 +224796,6 @@ self: {
        executableHaskellDepends = [ base options text turtle ];
        description = "Console program used to fix Stack build errors automatically";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-hpc-coveralls" = callPackage
@@ -239503,8 +224822,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-lib" = callPackage
@@ -239520,8 +224837,6 @@ self: {
        ];
        description = "Wrapper to use stack as a library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-network" = callPackage
@@ -239563,8 +224878,6 @@ self: {
        ];
        description = "A program for extending Stack to add distributed capabilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-prism" = callPackage
@@ -239583,8 +224896,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-run" = callPackage
@@ -239604,8 +224915,6 @@ self: {
        ];
        description = "An equivalent to cabal run for stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-run-auto" = callPackage
@@ -239633,8 +224942,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-tag" = callPackage
@@ -239680,8 +224987,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The basic stack type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-wrapper" = callPackage
@@ -239698,8 +225003,6 @@ self: {
        executableHaskellDepends = [ base filepath process ];
        description = "Call ghc within stack by calling ghc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-yaml" = callPackage
@@ -239742,8 +225045,6 @@ self: {
        ];
        description = "Convert stack projects to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack2nix" = callPackage
@@ -239770,8 +225071,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Convert stack.yaml files into Nix build instructions.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage" = callPackage
@@ -239790,8 +225089,6 @@ self: {
        ];
        description = "Dummy package forcing installation of other Stackage packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-build-plan" = callPackage
@@ -239816,8 +225113,6 @@ self: {
        ];
        description = "Calculate and print (in different formats) Stackage build plans";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-cabal" = callPackage
@@ -239838,8 +225133,6 @@ self: {
        ];
        description = "A CLI executable for cabal-based stackage commands";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-cli" = callPackage
@@ -239861,8 +225154,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A CLI library for stackage commands";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-curator" = callPackage
@@ -239907,8 +225198,6 @@ self: {
        ];
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-install" = callPackage
@@ -239957,8 +225246,6 @@ self: {
        ];
        description = "DEPRECATED Grab current metadata for all packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-query" = callPackage
@@ -239982,8 +225269,6 @@ self: {
        ];
        description = "Tool for querying Stackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-sandbox" = callPackage
@@ -240004,8 +225289,6 @@ self: {
        ];
        description = "Work with shared stackage sandboxes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-setup" = callPackage
@@ -240029,8 +225312,6 @@ self: {
        ];
        description = "An executable for downloading a Haskell setup";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-to-hackage" = callPackage
@@ -240056,8 +225337,6 @@ self: {
        ];
        description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-types" = callPackage
@@ -240077,8 +225356,6 @@ self: {
        ];
        description = "Shared data types between various Stackage packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-update" = callPackage
@@ -240115,8 +225392,6 @@ self: {
        ];
        description = "A more secure version of cabal upload which uses HTTPS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage2nix" = callPackage
@@ -240147,8 +225422,6 @@ self: {
        ];
        description = "Convert Stack files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackcollapse-ghc" = callPackage
@@ -240268,8 +225541,6 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "This package will derive class instance along the data type declaration tree. (Deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "standalone-haddock" = callPackage
@@ -240287,8 +225558,6 @@ self: {
        ];
        description = "Generate standalone haddock documentation for a set of packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "star" = callPackage
@@ -240337,8 +225606,6 @@ self: {
        ];
        description = "A memcached client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "starrover2" = callPackage
@@ -240385,8 +225652,6 @@ self: {
        ];
        description = "To be written";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "state" = callPackage
@@ -240398,8 +225663,6 @@ self: {
        libraryHaskellDepends = [ arrows base mtl ];
        description = "Data.State";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "state-bag" = callPackage
@@ -240416,8 +225679,6 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "Monad transformers for holding bags of state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "state-codes" = callPackage
@@ -240443,8 +225704,6 @@ self: {
        testHaskellDepends = [ base checkers mtl QuickCheck ];
        description = "MonadPlus for StateT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "state-record" = callPackage
@@ -240456,8 +225715,6 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Better records for State monad states";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stateWriter" = callPackage
@@ -240476,8 +225733,6 @@ self: {
        ];
        description = "A faster variant of the RWS monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statechart" = callPackage
@@ -240502,8 +225757,6 @@ self: {
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stateref" = callPackage
@@ -240578,8 +225831,6 @@ self: {
        ];
        description = "Type-safe and interoperable static values and closures";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "static-canvas" = callPackage
@@ -240593,8 +225844,6 @@ self: {
        libraryHaskellDepends = [ base double-conversion free mtl text ];
        description = "DSL to generate HTML5 Canvas javascript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "static-closure" = callPackage
@@ -240611,8 +225860,6 @@ self: {
        ];
        description = "Serialisable static pointers to functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "static-hash" = callPackage
@@ -240668,8 +225915,6 @@ self: {
        ];
        description = "Tensors of statically known size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "static-text" = callPackage
@@ -240691,8 +225936,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Lists, Texts, ByteStrings and Vectors of statically known length";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "staticanalysis" = callPackage
@@ -240745,8 +225988,6 @@ self: {
        ];
        description = "Functions for working with Dirichlet densities and mixtures on vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statistics-fusion" = callPackage
@@ -240758,8 +225999,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "An implementation of high performance, minimal statistics functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statistics-hypergeometric-genvar" = callPackage
@@ -240775,8 +226014,6 @@ self: {
        ];
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statistics-linreg" = callPackage
@@ -240805,8 +226042,6 @@ self: {
        executableHaskellDepends = [ base statistics text vector ];
        description = "command line statistics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statsd" = callPackage
@@ -240822,8 +226057,6 @@ self: {
        ];
        description = "StatsD API";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statsd-client" = callPackage
@@ -240841,8 +226074,6 @@ self: {
        ];
        description = "Statsd UDP client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statsd-datadog" = callPackage
@@ -240881,8 +226112,6 @@ self: {
        ];
        description = "A lovely [Dog]StatsD implementation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "status-notifier-item" = callPackage
@@ -240917,8 +226146,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Get unix filesystem statistics with statfs, statvfs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "staversion" = callPackage
@@ -240972,7 +226199,6 @@ self: {
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stb-image-redux" = callPackage
@@ -240985,8 +226211,6 @@ self: {
        testHaskellDepends = [ base hspec vector ];
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stb-truetype" = callPackage
@@ -241031,8 +226255,6 @@ self: {
        ];
        description = "A library for implicit, monadic dataflow parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "std" = callPackage
@@ -241055,8 +226277,6 @@ self: {
        libraryHaskellDepends = [ base parsec syb template-haskell ];
        description = "Structure Data Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stdf" = callPackage
@@ -241079,8 +226299,6 @@ self: {
        ];
        description = "Parse Structured Test Data Format (STDF)";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stdio" = callPackage
@@ -241106,8 +226324,6 @@ self: {
        ];
        description = "A simple and high performance IO toolkit for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libuv;};
 
   "steambrowser" = callPackage
@@ -241121,8 +226337,6 @@ self: {
        executableHaskellDepends = [ base directory parsec transformers ];
        description = "List and launch steam games from the cli";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "steeloverseer" = callPackage
@@ -241166,8 +226380,6 @@ self: {
        testHaskellDepends = [ base random uuid ];
        description = "Generator and verifier for steganographic numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stemmer" = callPackage
@@ -241179,8 +226391,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell bindings to the Snowball stemming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stemmer-german" = callPackage
@@ -241194,8 +226404,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Extract the stem of a German inflected word form";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "step-function" = callPackage
@@ -241224,8 +226432,6 @@ self: {
        sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf";
        libraryHaskellDepends = [ base containers mtl ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stern-brocot" = callPackage
@@ -241243,8 +226449,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Positive rational numbers represented as paths in the Stern-Brocot tree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stgi" = callPackage
@@ -241273,8 +226477,6 @@ self: {
        ];
        description = "Educational implementation of the STG (Spineless Tagless G-machine)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stickyKeysHotKey" = callPackage
@@ -241333,8 +226535,6 @@ self: {
        testHaskellDepends = [ base hspec mtl stm stm-queue ];
        description = "A simplistic actor model based on STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-channelize" = callPackage
@@ -241372,8 +226572,6 @@ self: {
        testHaskellDepends = [ async base HUnit stm tasty tasty-hunit ];
        description = "Chunked Communication Queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-conduit" = callPackage
@@ -241419,8 +226617,6 @@ self: {
        ];
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-delay" = callPackage
@@ -241462,8 +226658,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit stm ];
        description = "Conduits and STM operations for fire hoses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-hamt" = callPackage
@@ -241490,8 +226684,6 @@ self: {
        ];
        description = "STM-specialised Hash Array Mapped Trie";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-incremental" = callPackage
@@ -241560,8 +226752,6 @@ self: {
        testHaskellDepends = [ base QuickCheck stm ];
        description = "Simple STM Promises for IO computations and external processes";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-queue" = callPackage
@@ -241624,8 +226814,6 @@ self: {
        ];
        description = "retry statistics for STM transactions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-supply" = callPackage
@@ -241640,8 +226828,6 @@ self: {
        testHaskellDepends = [ async base QuickCheck random Unique ];
        description = "STM wrapper around Control.Concurrent.Supply.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-tlist" = callPackage
@@ -241665,8 +226851,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 mtl stm ];
        description = "Control communication among retrying transactions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stochastic" = callPackage
@@ -241682,8 +226866,6 @@ self: {
        ];
        description = "Monadic composition of probabilistic functions and sampling";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stocks" = callPackage
@@ -241786,8 +226968,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Storable type class for variable-sized data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "storable-complex" = callPackage
@@ -241849,8 +227029,6 @@ self: {
        libraryHaskellDepends = [ array base tagged vector ];
        description = "Statically-sized array wrappers with Storable instances for FFI marshaling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "storable-tuple" = callPackage
@@ -241913,8 +227091,6 @@ self: {
        ];
        description = "Conversion between storablevector and stream-fusion lists with fusion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "store" = callPackage
@@ -242000,8 +227176,6 @@ self: {
        ];
        description = "Streaming interfaces for `store`";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stp" = callPackage
@@ -242016,8 +227190,6 @@ self: {
        executableHaskellDepends = [ base regex-compat ];
        description = "Simple Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "str" = callPackage
@@ -242034,8 +227206,6 @@ self: {
        ];
        description = "A type class to abstract between many different string types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stratosphere" = callPackage
@@ -242080,8 +227250,6 @@ self: {
        ];
        description = "Client for Stratum protocol";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stratux" = callPackage
@@ -242097,8 +227265,6 @@ self: {
        ];
        description = "A library for stratux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stratux-demo" = callPackage
@@ -242121,8 +227287,6 @@ self: {
        ];
        description = "A demonstration of the stratux library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stratux-http" = callPackage
@@ -242169,8 +227333,6 @@ self: {
        ];
        description = "A library for using websockets with stratux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stream" = callPackage
@@ -242190,8 +227352,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stream-fusion" = callPackage
@@ -242205,8 +227365,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Faster Haskell lists using stream fusion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stream-monad" = callPackage
@@ -242220,8 +227378,6 @@ self: {
        libraryHaskellDepends = [ base logict ];
        description = "Simple, Fair and Terminating Backtracking Monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streamdeck" = callPackage
@@ -242233,8 +227389,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl split ];
        description = "Control library for the Elgato Stream Deck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streamed" = callPackage
@@ -242253,8 +227407,6 @@ self: {
        ];
        description = "Programmatically edit MIDI event streams via ALSA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming" = callPackage
@@ -242390,8 +227542,6 @@ self: {
        ];
        description = "Streaming interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-bytestring" = callPackage
@@ -242434,8 +227584,6 @@ self: {
        ];
        description = "Cassava support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-commons" = callPackage
@@ -242498,8 +227646,6 @@ self: {
        testHaskellDepends = [ base conduit hspec streaming ];
        description = "Bidirectional support between the streaming and conduit libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-events" = callPackage
@@ -242551,8 +227697,6 @@ self: {
        ];
        description = "online streaming fft";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-histogram" = callPackage
@@ -242589,8 +227733,6 @@ self: {
        ];
        description = "Streaming interface for LZMA/XZ compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-osm" = callPackage
@@ -242654,8 +227796,6 @@ self: {
        ];
        description = "Perfectly streaming PNG image decoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-postgresql-simple" = callPackage
@@ -242697,8 +227837,6 @@ self: {
        ];
        description = "Streaming support for running system process";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-sort" = callPackage
@@ -242720,8 +227858,6 @@ self: {
        ];
        description = "Sorting streams";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-utils" = callPackage
@@ -242824,8 +227960,6 @@ self: {
        testSystemDepends = [ archive ];
        description = "Stream data from archives using the streamly library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {archive = null;};
 
   "streamly-binary" = callPackage
@@ -242924,8 +228058,6 @@ self: {
        testSystemDepends = [ lmdb ];
        description = "Stream data to or from LMDB databases using the streamly library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) lmdb;};
 
   "streamly-posix" = callPackage
@@ -242960,8 +228092,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Stream Processer Arrow";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streams" = callPackage
@@ -242998,8 +228128,6 @@ self: {
        ];
        description = "A simple, flexible and composable web-router";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "strelka-core" = callPackage
@@ -243111,8 +228239,6 @@ self: {
        ];
        description = "A collection of commonly used strict data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "strict-ghc-plugin" = callPackage
@@ -243159,8 +228285,6 @@ self: {
        libraryHaskellDepends = [ base lens strict ];
        description = "Lenses for types in strict package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "strict-list" = callPackage
@@ -243189,8 +228313,6 @@ self: {
        libraryHaskellDepends = [ base optics-core strict ];
        description = "Optics for types in strict package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "strict-tuple" = callPackage
@@ -243231,8 +228353,6 @@ self: {
        libraryHaskellDepends = [ base lens strict-tuple ];
        description = "Optics for the `strict-tuple` library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "strict-types" = callPackage
@@ -243287,8 +228407,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "Combinators for strictifying functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "string" = callPackage
@@ -243422,8 +228540,6 @@ self: {
        ];
        description = "Tools for working with isomorphisms of strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "string-like" = callPackage
@@ -243459,8 +228575,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "string-random" = callPackage
@@ -243530,8 +228644,6 @@ self: {
        ];
        description = "Type-level Chars and Strings, with decidable equality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stringable" = callPackage
@@ -243572,8 +228684,6 @@ self: {
        ];
        description = "Transformations to several string-like types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stringprep" = callPackage
@@ -243626,8 +228736,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers syb ];
        description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "strio" = callPackage
@@ -243673,8 +228781,6 @@ self: {
        ];
        description = "A Haskell implementation of the Stripe API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-concepts" = callPackage
@@ -243702,8 +228808,6 @@ self: {
        ];
        description = "Stripe API for Haskell - Pure Core";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-haskell" = callPackage
@@ -243715,8 +228819,6 @@ self: {
        libraryHaskellDepends = [ base stripe-core stripe-http-client ];
        description = "Stripe API for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-http-client" = callPackage
@@ -243736,8 +228838,6 @@ self: {
        ];
        description = "Stripe API for Haskell - http-client backend";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-http-streams" = callPackage
@@ -243758,8 +228858,6 @@ self: {
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-scotty" = callPackage
@@ -243776,8 +228874,6 @@ self: {
        ];
        description = "Listen for Stripe webhook events with Scotty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-signature" = callPackage
@@ -243795,8 +228891,6 @@ self: {
        testHaskellDepends = [ base bytestring text ];
        description = "Verification of Stripe webhook signatures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-tests" = callPackage
@@ -243814,8 +228908,6 @@ self: {
        ];
        description = "Tests for Stripe API bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-wreq" = callPackage
@@ -243913,8 +229005,6 @@ self: {
        ];
        description = "Interface library for strongSwan SQL backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "strptime" = callPackage
@@ -243968,8 +229058,6 @@ self: {
        ];
        description = "Instantiate structural induction schemas for algebraic data types";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "structural-traversal" = callPackage
@@ -243982,8 +229070,6 @@ self: {
        testHaskellDepends = [ base HUnit mtl ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "structured" = callPackage
@@ -244064,8 +229150,6 @@ self: {
        ];
        description = "Structured MongoDB interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "structures" = callPackage
@@ -244096,8 +229180,6 @@ self: {
        ];
        description = "\"Advanced\" Data Structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stt" = callPackage
@@ -244114,8 +229196,6 @@ self: {
        ];
        description = "A monad transformer version of the ST monad";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stunclient" = callPackage
@@ -244139,8 +229219,6 @@ self: {
        ];
        description = "RFC 5389: Session Traversal Utilities for NAT (STUN) client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stunts" = callPackage
@@ -244161,8 +229239,6 @@ self: {
        ];
        description = "A revival of the classic game Stunts (LambdaCube tech demo)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stutter" = callPackage
@@ -244190,8 +229266,6 @@ self: {
        ];
        description = "(Stutter Text|String)-Utterer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stylish-cabal" = callPackage
@@ -244218,8 +229292,6 @@ self: {
        doHaddock = false;
        description = "Format Cabal files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stylish-haskell" = callPackage
@@ -244270,8 +229342,6 @@ self: {
        ];
        description = "Apply CSS styles to a document tree";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stylized" = callPackage
@@ -244283,8 +229353,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Ways to output stylized text on ANSI consoles";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "styx" = callPackage
@@ -244341,8 +229409,6 @@ self: {
        ];
        description = "Get the total, put a single element";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "subG" = callPackage
@@ -244409,8 +229475,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion MonadRandom ];
        description = "Type safe interface for programming in subcategories of Hask";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "subleq-toolchain" = callPackage
@@ -244432,8 +229496,6 @@ self: {
        ];
        description = "Toolchain of subleq computer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "submark" = callPackage
@@ -244455,8 +229517,6 @@ self: {
        ];
        description = "Extract a part from CommonMark/Markdown docs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "subnet" = callPackage
@@ -244486,8 +229546,6 @@ self: {
        ];
        description = "Subsample data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "substring-parser" = callPackage
@@ -244506,8 +229564,6 @@ self: {
        ];
        description = "Match / replace substrings with a parser combinators";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "subtitleParser" = callPackage
@@ -244544,8 +229600,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Subword graph implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "subzero" = callPackage
@@ -244584,8 +229638,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An applicative functor to manage successors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "suffix-array" = callPackage
@@ -244606,8 +229658,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Simple and moderately efficient suffix array implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "suffixarray" = callPackage
@@ -244622,8 +229672,6 @@ self: {
        executableHaskellDepends = [ base HUnit ];
        description = "n log n implementation of suffix array";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "suffixtree" = callPackage
@@ -244648,8 +229696,6 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Library-based syntactic extensibility for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "suitable" = callPackage
@@ -244661,8 +229707,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Abstract over the constraints on the parameters to type constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sum-type-boilerplate" = callPackage
@@ -244750,8 +229794,6 @@ self: {
        ];
        description = "A Haskell interface to SUMP-compatible logic analyzers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sundown" = callPackage
@@ -244779,8 +229821,6 @@ self: {
        ];
        description = "Test Cabalized package against multiple dependency versions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sunroof-compiler" = callPackage
@@ -244798,8 +229838,6 @@ self: {
        ];
        description = "Monadic Javascript Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sunroof-examples" = callPackage
@@ -244821,8 +229859,6 @@ self: {
        ];
        description = "Tests for Sunroof";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sunroof-server" = callPackage
@@ -244844,8 +229880,6 @@ self: {
        ];
        description = "Monadic Javascript Compiler - Server Utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "super-user-spark" = callPackage
@@ -244875,8 +229909,6 @@ self: {
        ];
        description = "Configure your dotfile deployment with a DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "superbubbles" = callPackage
@@ -244891,8 +229923,6 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "superbuffer" = callPackage
@@ -244927,8 +229957,6 @@ self: {
        ];
        description = "Haskell SuperCollider utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "supercollider-midi" = callPackage
@@ -244951,8 +229979,6 @@ self: {
        ];
        description = "Demonstrate how to control SuperCollider via ALSA-MIDI";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "superconstraints" = callPackage
@@ -244969,8 +229995,6 @@ self: {
        ];
        description = "Access an instance's constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "superdoc" = callPackage
@@ -245010,8 +230034,6 @@ self: {
        ];
        description = "A simple opinionated event store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "supermonad" = callPackage
@@ -245028,8 +230050,6 @@ self: {
        testHaskellDepends = [ base containers ghc QuickCheck ];
        description = "Plugin and base library to support supermonads in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "supernova" = callPackage
@@ -245050,8 +230070,6 @@ self: {
        testHaskellDepends = [ aeson async base bytestring streamly text ];
        description = "Apache Pulsar client for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "supero" = callPackage
@@ -245070,8 +230088,6 @@ self: {
        ];
        description = "A Supercompiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "superrecord" = callPackage
@@ -245104,8 +230120,6 @@ self: {
        ];
        description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "supervisors" = callPackage
@@ -245124,8 +230138,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Monitor groups of threads with non-hierarchical lifetimes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "supplemented" = callPackage
@@ -245144,8 +230156,6 @@ self: {
        ];
        description = "Early termination for monads";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "surjective" = callPackage
@@ -245157,8 +230167,6 @@ self: {
        libraryHaskellDepends = [ base lens mtl template-haskell ];
        description = "An output coverage checker";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "suspend" = callPackage
@@ -245198,8 +230206,6 @@ self: {
        ];
        description = "Encode and decode separated values (CSV, PSV, ...)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sv-cassava" = callPackage
@@ -245265,8 +230271,6 @@ self: {
        ];
        description = "sv-core + svfactor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svfactor" = callPackage
@@ -245292,8 +230296,6 @@ self: {
        ];
        description = "Syntax-preserving CSV manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svg-builder" = callPackage
@@ -245326,8 +230328,6 @@ self: {
        ];
        description = "DSL for building SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svg-tree" = callPackage
@@ -245362,8 +230362,6 @@ self: {
        ];
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svgcairo" = callPackage
@@ -245380,8 +230378,6 @@ self: {
        libraryPkgconfigDepends = [ librsvg ];
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) librsvg;};
 
   "svgutils" = callPackage
@@ -245396,8 +230392,6 @@ self: {
        executableHaskellDepends = [ base filepath xml ];
        description = "Helper functions for dealing with SVG files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svm" = callPackage
@@ -245422,8 +230416,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Parsers and formatters for the SVMlight input file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svm-simple" = callPackage
@@ -245440,8 +230432,6 @@ self: {
        ];
        description = "Medium level, simplified, bindings to libsvm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svndump" = callPackage
@@ -245460,8 +230450,6 @@ self: {
        ];
        description = "Library for reading Subversion dump files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "swagger" = callPackage
@@ -245506,8 +230494,6 @@ self: {
        ];
        description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "swagger-test" = callPackage
@@ -245537,8 +230523,6 @@ self: {
        ];
        description = "Testing of Swagger APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "swagger2" = callPackage
@@ -245590,8 +230574,6 @@ self: {
        librarySystemDepends = [ tokyocabinet ];
        description = "Transparently swapping data from in-memory structures to disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) tokyocabinet;};
 
   "swearjure" = callPackage
@@ -245611,8 +230593,6 @@ self: {
        ];
        description = "Clojure without alphanumerics";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sweet-egison" = callPackage
@@ -245646,8 +230626,6 @@ self: {
        libraryHaskellDepends = [ base mtl pretty ];
        description = "A library for creating Shockwave Flash (SWF) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "swift-lda" = callPackage
@@ -245663,8 +230641,6 @@ self: {
        ];
        description = "Online sampler for Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "swish" = callPackage
@@ -245704,8 +230680,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings for the Swiss Ephemeris C library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sws" = callPackage
@@ -245729,8 +230703,6 @@ self: {
        ];
        description = "A simple web server for serving directories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sxml" = callPackage
@@ -245769,8 +230741,6 @@ self: {
        libraryHaskellDepends = [ base eq prelude-extras ];
        description = "Higher order versions of the Scrap Your Boilerplate classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syb-with-class" = callPackage
@@ -245798,8 +230768,6 @@ self: {
        libraryHaskellDepends = [ base syb-with-class text ];
        description = "Scrap Your Boilerplate With Class Text instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syfco" = callPackage
@@ -245820,8 +230788,6 @@ self: {
        ];
        description = "Synthesis Format Conversion Tool / Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sylvia" = callPackage
@@ -245847,8 +230813,6 @@ self: {
        ];
        description = "Lambda calculus visualization";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sym" = callPackage
@@ -245861,8 +230825,6 @@ self: {
        testHaskellDepends = [ base hashable QuickCheck ];
        description = "Permutations, patterns, and statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sym-plot" = callPackage
@@ -245874,8 +230836,6 @@ self: {
        libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ];
        description = "Plot permutations; an addition to the sym package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symantic" = callPackage
@@ -245892,8 +230852,6 @@ self: {
        ];
        description = "Library for Typed Tagless-Final Higher-Order Composable DSL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symantic-atom" = callPackage
@@ -245915,8 +230873,6 @@ self: {
        ];
        description = "Library for reading and writing Atom";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symantic-base" = callPackage
@@ -246102,8 +231058,6 @@ self: {
        ];
        description = "Test symantic-http and its companion libraries";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symantic-lib" = callPackage
@@ -246126,8 +231080,6 @@ self: {
        ];
        description = "Symantics for common types";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symantic-xml" = callPackage
@@ -246151,8 +231103,6 @@ self: {
        ];
        description = "Library for reading, validating and writing XML";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symbiote" = callPackage
@@ -246184,8 +231134,6 @@ self: {
        ];
        description = "Data serialization, communication, and operation verification implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symbol" = callPackage
@@ -246211,8 +231159,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Symlink functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symbols" = callPackage
@@ -246239,8 +231185,6 @@ self: {
        testSystemDepends = [ gmp gmpxx symengine ];
        description = "SymEngine symbolic mathematics engine for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; 
          inherit (pkgs) symengine;};
 
@@ -246259,8 +231203,6 @@ self: {
        testSystemDepends = [ gmp gmpxx symengine ];
        description = "SymEngine symbolic mathematics engine for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; 
          inherit (pkgs) symengine;};
 
@@ -246290,8 +231232,6 @@ self: {
        ];
        description = "Derivation of symbols and coordinate triplets Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symon" = callPackage
@@ -246318,8 +231258,6 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A fast implementation of synchronous channels with a CML-like API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sync-mht" = callPackage
@@ -246357,8 +231295,6 @@ self: {
        ];
        description = "Fast incremental file transfer using Merkle-Hash-Trees";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "synchronous-channels" = callPackage
@@ -246397,8 +231333,6 @@ self: {
        ];
        description = "Haskell bindings for the Syncthing REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "synt" = callPackage
@@ -246447,8 +231381,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntactical" = callPackage
@@ -246477,8 +231409,6 @@ self: {
        ];
        description = "Reversible parsing and pretty-printing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-attoparsec" = callPackage
@@ -246494,8 +231424,6 @@ self: {
        ];
        description = "Syntax instances for Attoparsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-example" = callPackage
@@ -246514,8 +231442,6 @@ self: {
        ];
        description = "Example application using syntax, a library for abstract syntax descriptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-example-json" = callPackage
@@ -246534,8 +231460,6 @@ self: {
        ];
        description = "Example JSON parser/pretty-printer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-pretty" = callPackage
@@ -246550,8 +231474,6 @@ self: {
        ];
        description = "Syntax instance for pretty, the pretty printing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-printer" = callPackage
@@ -246568,8 +231490,6 @@ self: {
        ];
        description = "Text and ByteString printers for 'syntax'";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-trees" = callPackage
@@ -246585,8 +231505,6 @@ self: {
        ];
        description = "Convert between different Haskell syntax trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-trees-fork-bairyn" = callPackage
@@ -246602,8 +231520,6 @@ self: {
        ];
        description = "Convert between different Haskell syntax trees. Bairyn's fork.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntaxnet-haskell" = callPackage
@@ -246622,8 +231538,6 @@ self: {
        testHaskellDepends = [ aeson base cassava haskell-conll hspec ];
        description = "Working with Google's SyntaxNet output files - CoNLL, Tree";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "synthesizer" = callPackage
@@ -246645,8 +231559,6 @@ self: {
        ];
        description = "Audio signal processing coded in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "synthesizer-alsa" = callPackage
@@ -246785,8 +231697,6 @@ self: {
        doHaddock = false;
        description = "Efficient signal processing using runtime compilation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "synthesizer-midi" = callPackage
@@ -246846,8 +231756,6 @@ self: {
        ];
        description = "A replacement for System.Exit and System.Process.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sysinfo" = callPackage
@@ -246887,8 +231795,6 @@ self: {
        testHaskellDepends = [ base basic-prelude chell system-filepath ];
        description = "Abstract data type for canonical paths with some utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-command" = callPackage
@@ -246907,8 +231813,6 @@ self: {
        ];
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-error" = callPackage
@@ -246934,8 +231838,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A bunch of system utilities used by other projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-fileio" = callPackage
@@ -247007,8 +231909,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to Linux's inotify interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-lifted" = callPackage
@@ -247031,8 +231931,6 @@ self: {
        ];
        description = "Lifted versions of System functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-linux-proc" = callPackage
@@ -247049,8 +231947,6 @@ self: {
        testHaskellDepends = [ base directory hedgehog pretty-show ];
        description = "A library for accessing the /proc filesystem in Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-locale" = callPackage
@@ -247067,8 +231963,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Get system locales";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-posix-redirect" = callPackage
@@ -247106,8 +232000,6 @@ self: {
        ];
        description = "Random number generation for extensible effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-test" = callPackage
@@ -247212,8 +232104,6 @@ self: {
        ];
        description = "An application that regularly logs system stats for later analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syz" = callPackage
@@ -247242,8 +232132,6 @@ self: {
        ];
        description = "Matchers and grammars using tree regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "t3-client" = callPackage
@@ -247255,8 +232143,6 @@ self: {
        libraryHaskellDepends = [ base t3-game t3-server ];
        description = "tic-tac-toe Rexports for client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "t3-game" = callPackage
@@ -247292,8 +232178,6 @@ self: {
        ];
        description = "tic-tac-toe server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ta" = callPackage
@@ -247309,8 +232193,6 @@ self: {
        ];
        description = "Transito Abierto: convenience library when using Takusen and Oracle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tabl" = callPackage
@@ -247340,8 +232222,6 @@ self: {
        ];
        description = "Simple tool to generate tables from DSV input";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "table-layout" = callPackage
@@ -247366,8 +232246,6 @@ self: {
        ];
        description = "Format tabular data as grid or table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "table-tennis" = callPackage
@@ -247379,8 +232257,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A table tennis game tracking engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tableaux" = callPackage
@@ -247398,8 +232274,6 @@ self: {
        ];
        description = "An interactive theorem prover based on semantic tableaux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tables" = callPackage
@@ -247423,8 +232297,6 @@ self: {
        ];
        description = "In-memory storage with multiple keys using lenses and traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tablestorage" = callPackage
@@ -247445,8 +232317,6 @@ self: {
        ];
        description = "Azure Table Storage REST API Wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tablize" = callPackage
@@ -247483,8 +232353,6 @@ self: {
        ];
        description = "View the output of shell commands in a table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tabs" = callPackage
@@ -247499,8 +232367,6 @@ self: {
        executableHaskellDepends = [ base filepath monadlist mtl tagged ];
        description = "Indents source files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tabular" = callPackage
@@ -247558,8 +232424,6 @@ self: {
        executablePkgconfigDepends = [ gtk3 ];
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "tag-bits" = callPackage
@@ -247571,8 +232435,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Provides access to the dynamic pointer tagging bits used by GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tag-stream" = callPackage
@@ -247588,8 +232450,6 @@ self: {
        ];
        description = "streamlined html tag parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagchup" = callPackage
@@ -247656,8 +232516,6 @@ self: {
        ];
        description = "Reflect exceptions using phantom types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagged-identity" = callPackage
@@ -247688,8 +232546,6 @@ self: {
        ];
        description = "Lists tagged with a type-level natural number representing their length";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagged-th" = callPackage
@@ -247703,8 +232559,6 @@ self: {
        ];
        description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagged-timers" = callPackage
@@ -247718,8 +232572,6 @@ self: {
        ];
        description = "Simple wrappers for timing IO actions (single-threaded)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagged-transformer" = callPackage
@@ -247822,8 +232674,6 @@ self: {
        libraryPkgconfigDepends = [ taglib ];
        description = "An FFI layer over TagLib's C bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) taglib;};
 
   "tagset-positional" = callPackage
@@ -247889,8 +232739,6 @@ self: {
        ];
        description = "alternative parser for the tagsoup package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagsoup-megaparsec" = callPackage
@@ -247907,8 +232755,6 @@ self: {
        ];
        description = "A Tag token parser and Tag specific parsing combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagsoup-navigate" = callPackage
@@ -247926,8 +232772,6 @@ self: {
        ];
        description = "Tagsoup Navigate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagsoup-parsec" = callPackage
@@ -247939,8 +232783,6 @@ self: {
        libraryHaskellDepends = [ base parsec tagsoup ];
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagsoup-selection" = callPackage
@@ -247952,8 +232794,6 @@ self: {
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "Selecting subtrees from TagSoup's TagTrees using CSS selectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagstew" = callPackage
@@ -247974,8 +232814,6 @@ self: {
        ];
        description = "Black magic tagsoup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagstream-conduit" = callPackage
@@ -247996,8 +232834,6 @@ self: {
        ];
        description = "streamlined html tag parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tai" = callPackage
@@ -248033,8 +232869,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tai64 Labels for Haskell";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tailfile-hinotify" = callPackage
@@ -248107,8 +232941,6 @@ self: {
        libraryHaskellDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "takusen-oracle" = callPackage
@@ -248123,8 +232955,6 @@ self: {
        librarySystemDepends = [ clntsh ];
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {clntsh = null;};
 
   "tal" = callPackage
@@ -248140,8 +232970,6 @@ self: {
        ];
        description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tamarin-prover" = callPackage
@@ -248171,8 +232999,6 @@ self: {
        ];
        description = "The Tamarin prover for security protocol analysis";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tamarin-prover-term" = callPackage
@@ -248191,8 +233017,6 @@ self: {
        ];
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tamarin-prover-theory" = callPackage
@@ -248214,8 +233038,6 @@ self: {
        ];
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tamarin-prover-utils" = callPackage
@@ -248233,8 +233055,6 @@ self: {
        ];
        description = "Utility library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tamper" = callPackage
@@ -248296,8 +233116,6 @@ self: {
        testHaskellDepends = [ base hspec vector ];
        description = "A tasty enhancement to cassava for easy csv exporting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tar_0_4_1_0" = callPackage
@@ -248369,8 +233187,6 @@ self: {
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tar-conduit" = callPackage
@@ -248447,8 +233263,6 @@ self: {
        ];
        description = "Generate test-suites from refinement types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) z3;};
 
   "tart" = callPackage
@@ -248471,8 +233285,6 @@ self: {
        ];
        description = "Terminal Art";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "task" = callPackage
@@ -248492,8 +233304,6 @@ self: {
        ];
        description = "A command line tool for keeping track of tasks you worked on";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "task-distribution" = callPackage
@@ -248530,8 +233340,6 @@ self: {
        ];
        description = "Distributed processing of changing tasks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "taskell" = callPackage
@@ -248561,8 +233369,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A command-line kanban board/task manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "taskpool" = callPackage
@@ -248592,8 +233398,8 @@ self: {
        pname = "taskwarrior";
        version = "0.3.0.0";
        sha256 = "1h24d799q1s6b36hd40bxa4c9m1izkgh6j7p2jv1p6cxngz28ni0";
-       revision = "2";
-       editedCabalFile = "16ikncs4aail9ymd2nx9n67b5d64cwk7m6kcbwvji0iggbikmsiv";
+       revision = "3";
+       editedCabalFile = "1dma42d3fkiqphya8ksqy55nbyqk45hm65rrnj2y5sn2my5vncq9";
        libraryHaskellDepends = [
          aeson base bytestring containers process random text time
          unordered-containers uuid
@@ -248678,8 +233484,6 @@ self: {
        ];
        description = "Auto discovery for Tasty with support for ingredients and test tree generation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-bdd" = callPackage
@@ -248705,8 +233509,6 @@ self: {
        ];
        description = "BDD tests language and tasty provider";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-dejafu" = callPackage
@@ -248790,8 +233592,6 @@ self: {
        ];
        description = "Adds the ability to fail a tasty test suite on first test failure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-golden" = callPackage
@@ -248856,8 +233656,6 @@ self: {
        ];
        description = "Tasty Tests for groundhog converters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-hedgehog" = callPackage
@@ -248898,8 +233696,6 @@ self: {
        ];
        description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-hspec" = callPackage
@@ -249016,8 +233812,6 @@ self: {
        ];
        description = "automated integration of QuickCheck properties into tasty suites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-jenkins-xml" = callPackage
@@ -249037,8 +233831,6 @@ self: {
        ];
        description = "Render tasty output to both console and XML for Jenkins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-json" = callPackage
@@ -249087,8 +233879,6 @@ self: {
        testHaskellDepends = [ base smallcheck smallcheck-laws tasty ];
        description = "Test common laws";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-leancheck" = callPackage
@@ -249117,8 +233907,6 @@ self: {
        testHaskellDepends = [ base lens tasty ];
        description = "Tasty TestTrees for Lens validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-lua" = callPackage
@@ -249162,8 +233950,6 @@ self: {
        ];
        description = "Golden testing provider for tasty with muti-line diff output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-program" = callPackage
@@ -249209,8 +233995,6 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty ];
        description = "Pre-built tasty trees for checking lawful class properties using QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-rerun" = callPackage
@@ -249276,8 +234060,6 @@ self: {
        ];
        description = "Collect statistics of your Tasty testsuite";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-tap" = callPackage
@@ -249402,8 +234184,6 @@ self: {
        ];
        description = "Meta tic-tac-toe ncurses game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tau" = callPackage
@@ -249445,8 +234225,6 @@ self: {
        ];
        description = "Transactional variables and data structures with IO hooks";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tcache-AWS" = callPackage
@@ -249462,8 +234240,6 @@ self: {
        ];
        description = "tcache using Amazon Web Services as default persistence mechanism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tccli" = callPackage
@@ -249481,8 +234257,6 @@ self: {
        ];
        description = "TokyoCabinet CLI interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tce-conf" = callPackage
@@ -249516,8 +234290,6 @@ self: {
        libraryPkgconfigDepends = [ libtcod ];
        description = "Bindings to libtcod roguelike engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libtcod;};
 
   "tconfig" = callPackage
@@ -249540,8 +234312,6 @@ self: {
        libraryHaskellDepends = [ base containers old-time ];
        description = "A purely functional TCP implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tcp-streams" = callPackage
@@ -249585,8 +234355,6 @@ self: {
        ];
        description = "Tcp streams using openssl for tls support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tdd-util" = callPackage
@@ -249614,8 +234382,6 @@ self: {
        ];
        description = "Test framework wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tdigest" = callPackage
@@ -249772,8 +234538,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pure Haskell TDS protocol implementation. Mainly for beam-mssql and beam-sybase";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "teams" = callPackage
@@ -249785,8 +234549,6 @@ self: {
        libraryHaskellDepends = [ base containers fgl graphviz ];
        description = "Graphical modeling tools for sequential teams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "teardown" = callPackage
@@ -249850,8 +234612,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dental data types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tehepero" = callPackage
@@ -249882,8 +234642,6 @@ self: {
        ];
        description = "Telegram API client";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "telegram-api" = callPackage
@@ -249911,8 +234669,6 @@ self: {
        ];
        description = "Telegram Bot API bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "telegram-bot" = callPackage
@@ -249933,8 +234689,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Telegram Bot microframework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "telegram-bot-simple" = callPackage
@@ -249966,8 +234720,6 @@ self: {
        ];
        description = "Easy to use library for building Telegram bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "telegram-raw-api" = callPackage
@@ -249992,8 +234744,6 @@ self: {
        ];
        description = "Servant bindings to the Telegram bot API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "telegram-types" = callPackage
@@ -250015,8 +234765,6 @@ self: {
        ];
        description = "Types used in Telegram bot API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "teleport" = callPackage
@@ -250037,8 +234785,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A tool to quickly switch between directories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "teleshell" = callPackage
@@ -250061,8 +234807,6 @@ self: {
        ];
        description = "Telnet client and other things";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tellbot" = callPackage
@@ -250082,8 +234826,6 @@ self: {
        ];
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tempered" = callPackage
@@ -250116,8 +234858,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "For representing musical tempi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "template" = callPackage
@@ -250140,8 +234880,6 @@ self: {
        libraryHaskellDepends = [ base data-default template-haskell ];
        description = "declaring Default instances just got even easier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "template-haskell_2_16_0_0" = callPackage
@@ -250178,8 +234916,6 @@ self: {
        ];
        description = "Optics for template-haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "template-haskell-util" = callPackage
@@ -250193,8 +234929,6 @@ self: {
        ];
        description = "Some utilities for template Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "template-hsml" = callPackage
@@ -250215,8 +234949,6 @@ self: {
        ];
        description = "Haskell's Simple Markup Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "template-toolkit" = callPackage
@@ -250247,8 +234979,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        description = "Process template file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "templateify" = callPackage
@@ -250262,8 +234992,6 @@ self: {
        executableHaskellDepends = [ base mtl tagsoup uniplate ];
        description = "Make template from website";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "templatepg" = callPackage
@@ -250281,8 +235009,6 @@ self: {
        ];
        description = "A PostgreSQL access library with compile-time SQL type inference";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "templater" = callPackage
@@ -250337,8 +235063,6 @@ self: {
        ];
        description = "A small Haskell wrapper around the TempoDB api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "temporal-csound" = callPackage
@@ -250356,8 +235080,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "temporal-media" = callPackage
@@ -250479,8 +235201,6 @@ self: {
        executableToolDepends = [ happy ];
        description = "Interpreter for the FRP language Tempus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tempus-fugit" = callPackage
@@ -250508,8 +235228,6 @@ self: {
        testHaskellDepends = [ base QuickCheck random ];
        description = "A completely type-safe library for linear algebra";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tensor-safe" = callPackage
@@ -250533,8 +235251,6 @@ self: {
        ];
        description = "Create valid deep neural network architectures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tensorflow" = callPackage
@@ -250563,8 +235279,6 @@ self: {
        ];
        description = "TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libtensorflow = null;};
 
   "tensorflow-core-ops" = callPackage
@@ -250585,8 +235299,6 @@ self: {
        ];
        description = "Haskell wrappers for Core Tensorflow Ops";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tensorflow-logging" = callPackage
@@ -250615,8 +235327,6 @@ self: {
        ];
        description = "TensorBoard related functionality";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tensorflow-mnist" = callPackage
@@ -250669,8 +235379,6 @@ self: {
        ];
        description = "Code generation for TensorFlow operations";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tensorflow-ops" = callPackage
@@ -250700,8 +235408,6 @@ self: {
        ];
        description = "Friendly layer around TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tensorflow-proto" = callPackage
@@ -250811,8 +235517,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "termbox bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "termbox-banana" = callPackage
@@ -250826,8 +235530,6 @@ self: {
        libraryHaskellDepends = [ base reactive-banana termbox ];
        description = "reactive-banana + termbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "termbox-bindings" = callPackage
@@ -250843,8 +235545,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Bindings to the Termbox library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "termcolor" = callPackage
@@ -250940,8 +235640,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "termination-combinators" = callPackage
@@ -250953,8 +235651,6 @@ self: {
        libraryHaskellDepends = [ base containers contravariant ];
        description = "Termination combinators for forcing non-terminating algorithms to terminate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "terminfo_0_4_1_4" = callPackage
@@ -251038,8 +235734,6 @@ self: {
        ];
        description = "Plot time series in your terminal using commands stdout";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "terntup" = callPackage
@@ -251057,8 +235751,6 @@ self: {
        ];
        description = "a ternary library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "terrahs" = callPackage
@@ -251071,8 +235763,6 @@ self: {
        librarySystemDepends = [ terralib4c translib ];
        description = "A Haskell GIS Programming Environment";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {terralib4c = null; translib = null;};
 
   "tersmu" = callPackage
@@ -251093,8 +235783,6 @@ self: {
        ];
        description = "A semantic parser for lojban";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tesla" = callPackage
@@ -251141,8 +235829,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Test monadic side-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-framework" = callPackage
@@ -251183,8 +235869,6 @@ self: {
        testHaskellDepends = [ base test-framework ];
        description = "Test.Framework wrapper for DocTest";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-framework-golden" = callPackage
@@ -251254,8 +235938,6 @@ self: {
        ];
        description = "QuickCheck support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-framework-quickcheck2" = callPackage
@@ -251293,8 +235975,6 @@ self: {
        ];
        description = "test-sandbox support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-framework-skip" = callPackage
@@ -251314,8 +235994,6 @@ self: {
        ];
        description = "Functions for conveniently marking some of the tests in a suite as being skipped";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-framework-smallcheck" = callPackage
@@ -251341,8 +236019,6 @@ self: {
        testHaskellDepends = [ base test-framework testing-feat ];
        description = "A test framework provider for testing-feat";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-framework-th" = callPackage
@@ -251475,8 +236151,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Just tests Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-sandbox" = callPackage
@@ -251504,8 +236178,6 @@ self: {
        ];
        description = "Sandbox for system tests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-sandbox-compose" = callPackage
@@ -251537,8 +236209,6 @@ self: {
        ];
        description = "Lightweight development enviroments using test-sandbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-sandbox-hunit" = callPackage
@@ -251550,8 +236220,6 @@ self: {
        libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ];
        description = "HUnit convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-sandbox-quickcheck" = callPackage
@@ -251567,8 +236235,6 @@ self: {
        ];
        description = "QuickCheck convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-shouldbe" = callPackage
@@ -251582,8 +236248,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-simple" = callPackage
@@ -251602,8 +236266,6 @@ self: {
        ];
        description = "Simple Perl inspired testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testCom" = callPackage
@@ -251621,8 +236283,6 @@ self: {
        ];
        description = "Write your tests in comments";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testPkg" = callPackage
@@ -251658,8 +236318,6 @@ self: {
        ];
        description = "Create tests and benchmarks together";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testcontainers" = callPackage
@@ -251682,8 +236340,6 @@ self: {
        testToolDepends = [ hspec-discover tasty-discover ];
        description = "Docker containers for your integration tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testing-feat" = callPackage
@@ -251728,8 +236384,6 @@ self: {
        ];
        description = "Quick feedback loop for test suites";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testpack" = callPackage
@@ -251746,8 +236400,6 @@ self: {
        ];
        description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testpattern" = callPackage
@@ -251762,8 +236414,6 @@ self: {
        executableHaskellDepends = [ base filepath gtk ];
        description = "Display a monitor test pattern";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testrunner" = callPackage
@@ -251778,8 +236428,6 @@ self: {
        ];
        description = "Easy unit test driver framework";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tetris" = callPackage
@@ -251828,8 +236476,6 @@ self: {
        executableHaskellDepends = [ base containers deepseq parsec ];
        description = "LaTeX to plain-text conversion";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "texbuilder" = callPackage
@@ -251850,8 +236496,6 @@ self: {
        ];
        description = "View your latex output while editing";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "texmath" = callPackage
@@ -251935,8 +236579,6 @@ self: {
        ];
        description = "Everything Data.Text related in one package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-and-plots" = callPackage
@@ -251953,8 +236595,6 @@ self: {
        ];
        description = "EDSL to create HTML documents with plots based on the C3.js library.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-ansi" = callPackage
@@ -251966,8 +236606,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Text styling for ANSI terminals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-binary" = callPackage
@@ -252022,8 +236660,6 @@ self: {
        ];
        description = "Memory-efficient string-indexed container types";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-conversions" = callPackage
@@ -252093,8 +236729,6 @@ self: {
        testHaskellDepends = [ base hspec time ];
        description = "Full-weight string formatting library, analog of Python's string.format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-format-simple" = callPackage
@@ -252130,8 +236764,6 @@ self: {
        ];
        description = "A generic, derivable, haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-icu" = callPackage
@@ -252175,8 +236807,6 @@ self: {
        ];
        description = "Dealing with Strict Text in NFC normalization";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-icu-translit" = callPackage
@@ -252260,8 +236890,6 @@ self: {
        testHaskellDepends = [ base hspec lens ];
        description = "Lenses for operating over text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-lips" = callPackage
@@ -252277,8 +236905,6 @@ self: {
        ];
        description = "Monadic parsing combinator library with attention to locations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-loc" = callPackage
@@ -252301,8 +236927,6 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-handle text ];
        description = "Encode and decode Text to/from ByteString using TextEncoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-manipulate" = callPackage
@@ -252334,8 +236958,6 @@ self: {
        ];
        description = "A data structure for mapping metadata to text subsequences";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-metrics" = callPackage
@@ -252369,8 +236991,6 @@ self: {
        ];
        description = "Unicode-normalized text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-offset" = callPackage
@@ -252389,8 +237009,6 @@ self: {
        ];
        description = "Library for converting between line/column and byte offset";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-plus" = callPackage
@@ -252407,8 +237025,6 @@ self: {
        testHaskellDepends = [ base doctest HTF text ];
        description = "Utils for text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-position" = callPackage
@@ -252423,8 +237039,6 @@ self: {
        testHaskellDepends = [ base QuickCheck regex-applicative ];
        description = "Handling positions in text and position-tagging it";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-postgresql" = callPackage
@@ -252504,8 +237118,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl vector ];
        description = "A Haskell implementation of the 1# Text Register Machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-render" = callPackage
@@ -252684,8 +237296,6 @@ self: {
        ];
        description = "Library for Time parsing from Text into UTCTime";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-trie" = callPackage
@@ -252703,8 +237313,6 @@ self: {
        ];
        description = "An efficient finite map from Text to values, based on bytestring-trie";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-utf7" = callPackage
@@ -252746,8 +237354,6 @@ self: {
        ];
        description = "An efficient packed UTF-8 backed Unicode text type";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-utils" = callPackage
@@ -252760,8 +237366,6 @@ self: {
        testHaskellDepends = [ base HTF text ];
        description = "Various text utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-xml-generic" = callPackage
@@ -252790,8 +237394,6 @@ self: {
        libraryHaskellDepends = [ base parsec template-haskell xml ];
        description = "Quasiquoter for xml. XML DSL in Haskell.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-zipper" = callPackage
@@ -252817,8 +237419,6 @@ self: {
        testHaskellDepends = [ base hspec text-zipper ];
        description = "Monadic interface to the text-zipper package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text1" = callPackage
@@ -252835,8 +237435,6 @@ self: {
        ];
        description = "Non-empty values of `Data.Text`.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "textPlot" = callPackage
@@ -252877,8 +237475,6 @@ self: {
        executableHaskellDepends = [ base haskell98 process ];
        description = "A simple Haskell program to provide tags for Haskell code completion in TextMate";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "textocat-api" = callPackage
@@ -252899,8 +237495,6 @@ self: {
        ];
        description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "texts" = callPackage
@@ -252923,8 +237517,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text utf8-string ];
        description = "Textual type class for data that represent text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tf-random" = callPackage
@@ -252959,8 +237551,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell tfp ];
        description = "Template-Haskell code for tfp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tftp" = callPackage
@@ -252985,8 +237575,6 @@ self: {
        ];
        description = "A library for building tftp servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tga" = callPackage
@@ -252998,8 +237586,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Reading and writing of tga image files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-abstraction" = callPackage
@@ -253033,8 +237619,6 @@ self: {
        ];
        description = "Alpha equivalence for TH Exp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-bang-compat" = callPackage
@@ -253057,8 +237641,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "More convenient construction of TH ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-cas" = callPackage
@@ -253122,8 +237704,6 @@ self: {
        ];
        description = "Test instance context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-data-compat" = callPackage
@@ -253168,8 +237748,6 @@ self: {
        libraryHaskellDepends = [ base constraints template-haskell ];
        description = "Automatically discover available dictionaries at compile time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-env" = callPackage
@@ -253217,8 +237795,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "TH fold generator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-format" = callPackage
@@ -253235,8 +237811,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit text ];
        description = "Template Haskell based support for format strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-inline-io-action" = callPackage
@@ -253291,8 +237865,6 @@ self: {
        ];
        description = "A place to collect orphan instances for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-kinds" = callPackage
@@ -253308,8 +237880,6 @@ self: {
        ];
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-kinds-fork" = callPackage
@@ -253325,8 +237895,6 @@ self: {
        ];
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-lego" = callPackage
@@ -253347,8 +237915,6 @@ self: {
        ];
        description = "Template Haskell construction utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-lift" = callPackage
@@ -253428,8 +237994,6 @@ self: {
        libraryHaskellDepends = [ base lens pretty template-haskell ];
        description = "Simplify and render Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-printf" = callPackage
@@ -253488,8 +238052,6 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Binding group analysis in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-strict-compat" = callPackage
@@ -253516,8 +238078,6 @@ self: {
        ];
        description = "Typechecking in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-test-utils" = callPackage
@@ -253551,8 +238111,6 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Provides a way to persist data from compile-time to runtime";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-traced" = callPackage
@@ -253564,8 +238122,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Tracing Q monad computation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-typegraph" = callPackage
@@ -253593,8 +238149,6 @@ self: {
        ];
        description = "Graph of the subtype relation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-utilities" = callPackage
@@ -253637,8 +238191,6 @@ self: {
        ];
        description = "Give your dependencies stars on GitHub!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "theatre" = callPackage
@@ -253654,8 +238206,6 @@ self: {
        ];
        description = "Minimalistic actor library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "themoviedb" = callPackage
@@ -253728,8 +238278,6 @@ self: {
        ];
        description = "All-in-one session handling for servant-based frontends";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "theoremquest" = callPackage
@@ -253741,8 +238289,6 @@ self: {
        libraryHaskellDepends = [ base HTTP json utf8-string ];
        description = "A common library for TheoremQuest, a theorem proving game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "theoremquest-client" = callPackage
@@ -253756,8 +238302,6 @@ self: {
        executableHaskellDepends = [ base HTTP network theoremquest ];
        description = "A simple client for the TheoremQuest theorem proving game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "these" = callPackage
@@ -253840,8 +238384,6 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "Typing Haskell In Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thimk" = callPackage
@@ -253860,8 +238402,6 @@ self: {
        ];
        description = "Command-line spelling word suggestion tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thorn" = callPackage
@@ -253880,8 +238420,6 @@ self: {
        ];
        description = "Datatype Manipulation with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thread-hierarchy" = callPackage
@@ -253971,8 +238509,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "(deprecated in favor of 'threads') Simple thread management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "threads" = callPackage
@@ -254091,8 +238627,6 @@ self: {
        ];
        description = "Composable algebraic editors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "threepenny-gui" = callPackage
@@ -254133,8 +238667,6 @@ self: {
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Write simple nested context menus for threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "threepenny-gui-flexbox" = callPackage
@@ -254149,8 +238681,6 @@ self: {
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Flexbox layouts for Threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thrift" = callPackage
@@ -254173,8 +238703,6 @@ self: {
        ];
        description = "Haskell bindings for the Apache Thrift RPC system";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thrist" = callPackage
@@ -254237,8 +238765,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Loop over an action but throttle it to a certain rate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "through-text" = callPackage
@@ -254252,8 +238778,6 @@ self: {
        libraryHaskellDepends = [ base bytestring case-insensitive text ];
        description = "Convert textual types through Text without needing O(n^2) instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "throwable-exceptions" = callPackage
@@ -254306,8 +238830,6 @@ self: {
        ];
        description = "Generate thumbnails easily and safely";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thumbnail-polish" = callPackage
@@ -254324,8 +238846,6 @@ self: {
        ];
        description = "Image thumbnail creation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thyme" = callPackage
@@ -254426,8 +238946,6 @@ self: {
        executableHaskellDepends = [ base glade gtk haskell98 ];
        description = "Useful if reading \"Why FP matters\" by John Hughes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ticker" = callPackage
@@ -254464,8 +238982,6 @@ self: {
        ];
        description = "A port of @Data.Binary@";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tictactoe3d" = callPackage
@@ -254477,8 +238993,6 @@ self: {
        libraryHaskellDepends = [ base tuples-homogenous-h98 vector ];
        description = "3D Tic-Tac-Toe game";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tidal" = callPackage
@@ -254516,8 +239030,6 @@ self: {
        ];
        description = "MIDI support for tidal";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tidal-serial" = callPackage
@@ -254531,8 +239043,6 @@ self: {
        ];
        description = "Serial support for tidal";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tidal-vis" = callPackage
@@ -254553,8 +239063,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Visual rendering for Tidal patterns and osc messages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tie-knot" = callPackage
@@ -254566,8 +239074,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl recursion-schemes ];
        description = "\"Ties the knot\" on a given set of structures that reference each other by keys";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tiempo" = callPackage
@@ -254579,8 +239085,6 @@ self: {
        libraryHaskellDepends = [ base deepseq time ];
        description = "Specify time intervals in different units (secs, mins, hours, etc.)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tiger" = callPackage
@@ -254597,8 +239101,6 @@ self: {
        ];
        description = "Tiger Compiler of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tight-apply" = callPackage
@@ -254626,8 +239128,6 @@ self: {
        ];
        description = "Nice API for a Slackbot";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tighttp" = callPackage
@@ -254646,8 +239146,6 @@ self: {
        ];
        description = "Tiny and Incrementally-Growing HTTP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tile" = callPackage
@@ -254690,8 +239188,6 @@ self: {
        executableToolDepends = [ happy ];
        description = "The Timber Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time_1_11" = callPackage
@@ -254754,8 +239250,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Data instances for the time package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-exts" = callPackage
@@ -254777,8 +239271,6 @@ self: {
        ];
        description = "Yet another time library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-http" = callPackage
@@ -254802,8 +239294,6 @@ self: {
        ];
        description = "Parse and format HTTP/1.1 Date and Time strings";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-interval" = callPackage
@@ -254826,8 +239316,6 @@ self: {
        libraryHaskellDepends = [ base base-io-access time ];
        description = "IO Access for time";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-lens" = callPackage
@@ -254873,8 +239361,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit mtl time tz ];
        description = "A library to mock the current time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-manager" = callPackage
@@ -254949,8 +239435,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Quasi-quoter for UTCTime times";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-quote" = callPackage
@@ -254967,8 +239451,6 @@ self: {
        ];
        description = "Quasi-quoters for dates and times";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-recurrence" = callPackage
@@ -254986,8 +239468,6 @@ self: {
        ];
        description = "Generate recurring dates";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-series" = callPackage
@@ -255002,8 +239482,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Time series analysis";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-series-lib" = callPackage
@@ -255017,8 +239495,6 @@ self: {
        doHaddock = false;
        description = "Library for Time Series processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-units" = callPackage
@@ -255043,8 +239519,6 @@ self: {
        libraryHaskellDepends = [ base convertible parsec time ];
        description = "Parse, format and convert W3C Date and Time";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-warp" = callPackage
@@ -255082,8 +239556,6 @@ self: {
        ];
        description = "Distributed systems execution emulation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timecalc" = callPackage
@@ -255096,8 +239568,6 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskeline uu-parsinglib ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timeconsole" = callPackage
@@ -255220,8 +239690,6 @@ self: {
          time unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timeout" = callPackage
@@ -255238,8 +239706,6 @@ self: {
        ];
        description = "Generalized sleep and timeout functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timeout-control" = callPackage
@@ -255266,8 +239732,6 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel ];
        description = "Runs a time-limited computation alowing it to return intermediate results";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timeparsers" = callPackage
@@ -255283,8 +239747,6 @@ self: {
        ];
        description = "Attoparsec parsers for various Date/Time formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timeplot" = callPackage
@@ -255305,8 +239767,6 @@ self: {
        ];
        description = "A tool for visualizing time series from log files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timeprint" = callPackage
@@ -255318,8 +239778,6 @@ self: {
        libraryHaskellDepends = [ base datetime ];
        description = "Prints timestamps after each line evaluated";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timer-wheel" = callPackage
@@ -255332,8 +239790,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A timer wheel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timerep" = callPackage
@@ -255409,8 +239865,6 @@ self: {
        ];
        description = "Library for Time Series processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timespan" = callPackage
@@ -255422,8 +239876,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Useful timespan datatype and functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timestamp" = callPackage
@@ -255484,8 +239936,6 @@ self: {
        testHaskellDepends = [ base hspec microlens time ];
        description = "Time utilities";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timezone-detect" = callPackage
@@ -255505,8 +239955,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings for the zone-detect C library; plus tz-aware utils";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timezone-olson" = callPackage
@@ -255537,8 +239985,6 @@ self: {
        ];
        description = "Load TimeZoneSeries from an Olson file at compile time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timezone-series" = callPackage
@@ -255570,8 +240016,6 @@ self: {
          timezone-series
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timing-convenience" = callPackage
@@ -255595,8 +240039,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Tiny INI file and configuration library with a minimal dependency footprint";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tintin" = callPackage
@@ -255622,8 +240064,6 @@ self: {
        testHaskellDepends = [ base require ];
        description = "A softer alternative to Haddock";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tiny-scheduler" = callPackage
@@ -255635,8 +240075,6 @@ self: {
        libraryHaskellDepends = [ async base time ];
        description = "tiny no-brainer job scheduler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tinyMesh" = callPackage
@@ -255652,8 +240090,6 @@ self: {
        ];
        description = "TinyMesh - communicating with auto-meshing sensor network";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tinyXml" = callPackage
@@ -255678,8 +240114,6 @@ self: {
        ];
        description = "A fast DOM parser for a subset of XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tinyfiledialogs" = callPackage
@@ -255721,8 +240155,6 @@ self: {
        testHaskellDepends = [ base QuickCheck text ];
        description = "A tiny text templating library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tip-haskell-frontend" = callPackage
@@ -255747,8 +240179,6 @@ self: {
        ];
        description = "Convert from Haskell to Tip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tip-lib" = callPackage
@@ -255772,8 +240202,6 @@ self: {
        ];
        description = "tons of inductive problems - support library and tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tiphys" = callPackage
@@ -255818,8 +240246,6 @@ self: {
        ];
        description = "Testing Infrastructure for Temporal AbstractioNs - GUI to debug temporal programs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "titan-debug-yampa" = callPackage
@@ -255837,8 +240263,6 @@ self: {
        ];
        description = "Testing Infrastructure for Temporal AbstractioNs - Interactive Yampa debugging layer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "titan-record-yampa" = callPackage
@@ -255850,8 +240274,6 @@ self: {
        libraryHaskellDepends = [ base Yampa ];
        description = "Testing Infrastructure for Temporal AbstractioNs - Yampa record-and-replay layer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "titlecase" = callPackage
@@ -255886,8 +240308,6 @@ self: {
        testHaskellDepends = [ HUnit test-framework test-framework-hunit ];
        description = "Simple Presentation Utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tkyprof" = callPackage
@@ -255914,8 +240334,6 @@ self: {
        ];
        description = "A web-based visualizer for GHC Profiling Reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tld" = callPackage
@@ -255949,8 +240367,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Haskell tldr client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tls" = callPackage
@@ -256016,8 +240432,6 @@ self: {
        ];
        description = "TLS extra default values and helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tls-session-manager" = callPackage
@@ -256055,8 +240469,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Handle phylogenetic trees";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tmapchan" = callPackage
@@ -256127,8 +240539,6 @@ self: {
        ];
        description = "Start and stop a temporary postgres";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tmpl" = callPackage
@@ -256166,8 +240576,6 @@ self: {
        ];
        description = "A simple daily journal program";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tnet" = callPackage
@@ -256213,8 +240621,6 @@ self: {
        ];
        description = "A type class and some utilities for generating Haskell code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "to-string-class" = callPackage
@@ -256228,8 +240634,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Converting string-like types to Strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "to-string-instances" = callPackage
@@ -256241,8 +240645,6 @@ self: {
        libraryHaskellDepends = [ bytestring pretty text to-string-class ];
        description = "Instances for the ToString class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toboggan" = callPackage
@@ -256261,8 +240663,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Twitter bot generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "todo" = callPackage
@@ -256274,8 +240674,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A todo bottom";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "todos" = callPackage
@@ -256301,8 +240699,6 @@ self: {
        ];
        description = "Easy-to-use TODOs manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tofromxml" = callPackage
@@ -256321,8 +240717,6 @@ self: {
        ];
        description = "Reading and writing Haskell data from and to XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toilet" = callPackage
@@ -256340,8 +240734,6 @@ self: {
        ];
        description = "Manage the toilet queue at the IMO";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "token-bucket" = callPackage
@@ -256402,8 +240794,6 @@ self: {
          text unordered-containers
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tokenify" = callPackage
@@ -256415,8 +240805,6 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        description = "A regex lexer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tokenize" = callPackage
@@ -256460,8 +240848,6 @@ self: {
        ];
        description = "A variant of tokenizer-monad that supports streaming";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tokstyle" = callPackage
@@ -256486,8 +240872,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "TokTok C code style checker";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toktok" = callPackage
@@ -256502,8 +240886,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 ];
        executableHaskellDepends = [ base bytestring gf iconv ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tokyocabinet-haskell" = callPackage
@@ -256520,8 +240902,6 @@ self: {
        testSystemDepends = [ tokyocabinet ];
        description = "Haskell binding of Tokyo Cabinet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) tokyocabinet;};
 
   "tokyotyrant-haskell" = callPackage
@@ -256536,8 +240916,6 @@ self: {
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
   "tomato-rubato-openal" = callPackage
@@ -256549,8 +240927,6 @@ self: {
        libraryHaskellDepends = [ base OpenAL stm vector ];
        description = "Easy to use library for audio programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toml" = callPackage
@@ -256567,8 +240943,6 @@ self: {
          attoparsec base bytestring containers old-locale time
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toml-parser" = callPackage
@@ -256691,8 +241065,6 @@ self: {
        ];
        description = "tonatona plugin for google-server-api";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tonatona-logger" = callPackage
@@ -256725,8 +241097,6 @@ self: {
        ];
        description = "tonatona plugin for accessing PostgreSQL database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tonatona-persistent-sqlite" = callPackage
@@ -256814,8 +241184,6 @@ self: {
        ];
        description = "Cluster single cells and analyze cell clade relationships";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toodles" = callPackage
@@ -256851,8 +241219,6 @@ self: {
        ];
        description = "Manage the TODO entries in your code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toolshed" = callPackage
@@ -256894,8 +241260,6 @@ self: {
        ];
        description = "Top (typed oriented protocol) API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "topkata" = callPackage
@@ -256914,8 +241278,6 @@ self: {
        ];
        description = "OpenGL Arcade Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "topograph" = callPackage
@@ -256942,8 +241304,6 @@ self: {
        libraryHaskellDepends = [ base mtl parallel QuickCheck ];
        description = "Simple unit test library (or framework)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "torrent" = callPackage
@@ -257014,8 +241374,6 @@ self: {
        libraryHaskellDepends = [ base containers semiring-num ];
        description = "Finitely represented total maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "total-maps" = callPackage
@@ -257046,8 +241404,6 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "Library (and cli) to execute a procedure on file change";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tower" = callPackage
@@ -257094,8 +241450,6 @@ self: {
        ];
        description = "A Tox protocol implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toxcore-c" = callPackage
@@ -257121,8 +241475,6 @@ self: {
        ];
        description = "Haskell bindings to the C reference implementation of Tox";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {toxcore = null;};
 
   "toxiproxy-haskell" = callPackage
@@ -257142,8 +241494,6 @@ self: {
        ];
        description = "Client library for Toxiproxy: a TCP failure testing proxy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toysolver" = callPackage
@@ -257200,8 +241550,6 @@ self: {
        ];
        description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tpar" = callPackage
@@ -257238,8 +241586,6 @@ self: {
        ];
        description = "simple, parallel job scheduling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tpb" = callPackage
@@ -257265,8 +241611,6 @@ self: {
        ];
        description = "Applications for interacting with the Pushbullet API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tpdb" = callPackage
@@ -257308,8 +241652,6 @@ self: {
        ];
        description = "Parser and pretty printer for the TPTP language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trace" = callPackage
@@ -257326,8 +241668,6 @@ self: {
        ];
        description = "A monad transformer for tracing provenience of errors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trace-call" = callPackage
@@ -257339,8 +241679,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "functions for logging the arguments and results of function calls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trace-function-call" = callPackage
@@ -257352,8 +241690,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Easy lightweight tracing of function arguments and results for ad hoc debugging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "traced" = callPackage
@@ -257365,8 +241701,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl pretty ];
        description = "Simple evaluation trace";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tracer" = callPackage
@@ -257396,8 +241730,6 @@ self: {
        ];
        description = "Visualize Haskell data structures as edge-labeled trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tracing" = callPackage
@@ -257418,8 +241750,6 @@ self: {
        ];
        description = "Distributed tracing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tracing_0_0_5_2" = callPackage
@@ -257441,7 +241771,6 @@ self: {
        description = "Distributed tracing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tracing-control" = callPackage
@@ -257480,8 +241809,6 @@ self: {
        testHaskellDepends = [ base directory hspec process ];
        description = "Package to list all tracked and untracked existing files via Git";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tracker" = callPackage
@@ -257493,8 +241820,6 @@ self: {
        libraryHaskellDepends = [ base containers glib ];
        description = "Client library for Tracker metadata database, indexer and search tool";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trackit" = callPackage
@@ -257513,8 +241838,6 @@ self: {
        ];
        description = "A command-line tool for live monitoring";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "traction" = callPackage
@@ -257536,8 +241859,6 @@ self: {
        ];
        description = "Tools for postgresql-simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tracy" = callPackage
@@ -257549,8 +241870,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Convenience wrappers for non-intrusive debug tracing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trade-journal" = callPackage
@@ -257583,8 +241902,6 @@ self: {
          time transformers unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
 
   "traildb" = callPackage
@@ -257608,8 +241925,6 @@ self: {
        ];
        description = "TrailDB bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {Judy = null; traildb = null;};
 
   "trajectory" = callPackage
@@ -257632,8 +241947,6 @@ self: {
        ];
        description = "Tools and a library for working with Trajectory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trans-fx-core" = callPackage
@@ -257697,8 +242010,6 @@ self: {
        libraryHaskellDepends = [ base ListZipper MonadPrompt stm ];
        description = "Transactional events, based on Concurrent ML semantics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transf" = callPackage
@@ -257717,8 +242028,6 @@ self: {
        ];
        description = "Text transformer and interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transfer-db" = callPackage
@@ -257747,8 +242056,6 @@ self: {
        ];
        description = "ODBC database transfer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformations" = callPackage
@@ -257769,8 +242076,6 @@ self: {
        ];
        description = "Generic representation of tree transformations";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformers_0_4_3_0" = callPackage
@@ -257813,8 +242118,6 @@ self: {
        ];
        description = "Error and short-circuit monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformers-base" = callPackage
@@ -257865,8 +242168,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Arrow-like / category-like composition for transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformers-continue" = callPackage
@@ -257896,8 +242197,6 @@ self: {
        ];
        description = "Sensible conversions between some of the monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformers-eff" = callPackage
@@ -257979,8 +242278,6 @@ self: {
        ];
        description = "Ad-hoc type classes for lifting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformers-runnable" = callPackage
@@ -257992,8 +242289,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A unified interface for the run operation of monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformers-supply" = callPackage
@@ -258025,8 +242320,6 @@ self: {
        ];
        description = "composing programs with multithreading, events and distributed computing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transient-universe" = callPackage
@@ -258062,8 +242355,6 @@ self: {
        ];
        description = "fully composable remote execution for the creation of distributed systems";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transient-universe-tls" = callPackage
@@ -258080,8 +242371,6 @@ self: {
        ];
        description = "transient with secure communications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "translatable-intset" = callPackage
@@ -258095,8 +242384,6 @@ self: {
        libraryHaskellDepends = [ base fingertree ];
        description = "Integer sets with a constant time translate operation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "translate" = callPackage
@@ -258109,8 +242396,6 @@ self: {
        libraryHaskellDepends = [ base curl json network utf8-string ];
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "translate-cli" = callPackage
@@ -258128,8 +242413,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Translation cli tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa" = callPackage
@@ -258148,8 +242431,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Type Safe Web Routing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-client" = callPackage
@@ -258166,8 +242447,6 @@ self: {
        ];
        description = "Type safe http requests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-extra" = callPackage
@@ -258185,8 +242464,6 @@ self: {
        ];
        description = "Extra functions for trasa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-form" = callPackage
@@ -258205,8 +242482,6 @@ self: {
        ];
        description = "generate forms using lucid, ditto and trasa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-reflex" = callPackage
@@ -258240,8 +242515,6 @@ self: {
        ];
        description = "Type safe web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-th" = callPackage
@@ -258258,8 +242531,6 @@ self: {
        testHaskellDepends = [ base trasa ];
        description = "Template Haskell to generate trasa routes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "traversal-template" = callPackage
@@ -258306,8 +242577,6 @@ self: {
        ];
        description = "A simple client implementation using Travis CI API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "travis-meta-yaml" = callPackage
@@ -258337,8 +242606,6 @@ self: {
        ];
        description = ".travis.yml preprocessor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "travis-pogodi" = callPackage
@@ -258371,8 +242638,6 @@ self: {
        ];
        description = "A tool for finding haddocks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "traypoweroff" = callPackage
@@ -258387,8 +242652,6 @@ self: {
        executableHaskellDepends = [ base gtk process ];
        description = "Tray Icon application to PowerOff / Reboot computer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "treap" = callPackage
@@ -258403,8 +242666,6 @@ self: {
        testHaskellDepends = [ base doctest Glob hspec hspec-core ];
        description = "Efficient implementation of the implicit treap data structure";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tree-diff" = callPackage
@@ -258454,8 +242715,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Non-Determinism Monad for Tree Search";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tree-render-text" = callPackage
@@ -258467,8 +242726,6 @@ self: {
        libraryHaskellDepends = [ base boxes containers mtl ];
        description = "Configurable text rendering of trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tree-sitter" = callPackage
@@ -258631,8 +242888,6 @@ self: {
        testHaskellDepends = [ base containers doctest mtl ];
        description = "Functions and newtype wrappers for traversing Trees";
        license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tree-view" = callPackage
@@ -258696,8 +242951,6 @@ self: {
        ];
        description = "Generates HTML for Data.Tree as TreeMap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "treemap-html-tools" = callPackage
@@ -258717,8 +242970,6 @@ self: {
        doHaddock = false;
        description = "Treemap related commands for producing foldable TreeMap HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "treersec" = callPackage
@@ -258799,8 +243050,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL Database Migrator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trek-db" = callPackage
@@ -258824,8 +243073,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL Database Migrator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trek-lens" = callPackage
@@ -258852,8 +243099,6 @@ self: {
        ];
        description = "Library for polling Tremulous servers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trhsx" = callPackage
@@ -258864,8 +243109,6 @@ self: {
        sha256 = "11jx2jf6vi7368ys39mz0ziy6xknbi0z87926n2y16am6k2h25k3";
        description = "Deprecated";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trial" = callPackage
@@ -258919,8 +243162,6 @@ self: {
        ];
        description = "triangulation of polygons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trie-simple" = callPackage
@@ -258969,8 +243210,6 @@ self: {
        ];
        description = "Various trie implementations in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trifecta" = callPackage
@@ -259019,8 +243258,6 @@ self: {
        testHaskellDepends = [ base hspec protolude ];
        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;
-       broken = true;
      }) {};
 
   "trim" = callPackage
@@ -259036,8 +243273,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A command-line tool for trimming whitespace";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trimpolya" = callPackage
@@ -259051,8 +243286,6 @@ self: {
        executableHaskellDepends = [ base bio bytestring simpleargs ];
        description = "Search for, annotate and trim poly-A tail";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tripLL" = callPackage
@@ -259068,8 +243301,6 @@ self: {
        ];
        description = "A very simple triple store";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "triplesec" = callPackage
@@ -259100,8 +243331,6 @@ self: {
        libraryHaskellDepends = [ base comonad distributive ];
        description = "The trivial monad and comonad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trivial-constraint" = callPackage
@@ -259124,8 +243353,6 @@ self: {
        libraryHaskellDepends = [ base semiring-simple ];
        description = "A library for tropical mathematics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tropical-geometry" = callPackage
@@ -259150,8 +243377,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A Tropical Geometry package for Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "true-name" = callPackage
@@ -259166,8 +243391,6 @@ self: {
        testHaskellDepends = [ base containers template-haskell time ];
        description = "Template Haskell hack to violate module abstractions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "truelevel" = callPackage
@@ -259181,8 +243404,6 @@ self: {
        executableHaskellDepends = [ base containers parseargs WAVE ];
        description = "Audio file compressor-limiter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trurl" = callPackage
@@ -259205,8 +243426,6 @@ self: {
        testHaskellDepends = [ base hastache tasty tasty-hunit ];
        description = "Haskell template code generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "truthful" = callPackage
@@ -259231,8 +243450,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl time transformers ];
        description = "A Transaction Framework for Web Applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tsession-happstack" = callPackage
@@ -259246,8 +243463,6 @@ self: {
        ];
        description = "A Transaction Framework for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tsetchan" = callPackage
@@ -259338,8 +243553,6 @@ self: {
        executableHaskellDepends = [ base gloss stm vector ];
        description = "Real time TSP tour visualization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tsparse" = callPackage
@@ -259357,8 +243570,6 @@ self: {
        ];
        description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tst" = callPackage
@@ -259390,8 +243601,6 @@ self: {
        ];
        description = "Interacts with tesseract to ease reading of RAW Japanese manga";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tsv2csv" = callPackage
@@ -259424,8 +243633,6 @@ self: {
        ];
        description = "Template tsv into SQL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tsweb" = callPackage
@@ -259454,8 +243661,6 @@ self: {
        ];
        description = "An API binding Web.Spock to Database.Beam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ttask" = callPackage
@@ -259478,8 +243683,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "This is task management tool for yourself, that inspired by scrum";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ttc" = callPackage
@@ -259557,8 +243760,6 @@ self: {
        executableHaskellDepends = [ base text time ttn ];
        description = "TheThingsNetwork client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ttrie" = callPackage
@@ -259611,8 +243812,6 @@ self: {
        ];
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tubes" = callPackage
@@ -259629,8 +243828,6 @@ self: {
        ];
        description = "Write stream processing computations with side effects in a series of tubes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuntap" = callPackage
@@ -259642,8 +243839,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Interface to TUN/TAP drivers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuntap-simple" = callPackage
@@ -259657,8 +243852,6 @@ self: {
        libraryHaskellDepends = [ base ioctl ];
        description = "A simple tun/tap library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tup-functor" = callPackage
@@ -259673,8 +243866,6 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts parsec2 ];
        description = "Homogeneous tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuple" = callPackage
@@ -259697,8 +243888,6 @@ self: {
        libraryHaskellDepends = [ base combinat ];
        description = "Enum instances for tuples where the digits increase with the same speed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuple-generic" = callPackage
@@ -259733,8 +243922,6 @@ self: {
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Stock FieldN combos and generators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuple-morph" = callPackage
@@ -259748,8 +243935,6 @@ self: {
        libraryHaskellDepends = [ base HList template-haskell ];
        description = "Morph between tuples, or convert them from and to HLists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuple-ops" = callPackage
@@ -259761,8 +243946,6 @@ self: {
        libraryHaskellDepends = [ base type-combinators ];
        description = "various operations on n-ary tuples via GHC.Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuple-sop" = callPackage
@@ -259797,8 +243980,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Functor, Applicative and Monad for n-ary tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuples" = callPackage
@@ -259849,8 +244030,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple simulator for Turing machines";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "turing-music" = callPackage
@@ -259864,8 +244043,6 @@ self: {
        executableHaskellDepends = [ ALUT base ];
        description = "Plays music generated by Turing machines with 5 states and 2 symbols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "turingMachine" = callPackage
@@ -259882,8 +244059,6 @@ self: {
        ];
        description = "An implementation of Turing Machine and Automaton";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "turkish-deasciifier" = callPackage
@@ -259986,8 +244161,6 @@ self: {
        testHaskellDepends = [ base HUnit parsec ];
        description = "Collection of command line options and parsers for these options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tw" = callPackage
@@ -260012,8 +244185,6 @@ self: {
        libraryHaskellDepends = [ base containers lens stm transformers ];
        description = "A library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twee" = callPackage
@@ -260030,8 +244201,6 @@ self: {
        ];
        description = "An equational theorem prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twee-lib" = callPackage
@@ -260076,8 +244245,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
        description = "Command-line tool for twitter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentefp" = callPackage
@@ -260106,8 +244273,6 @@ self: {
        ];
        description = "Used as Lab Assignments Environment at the University of Twente";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentefp-eventloop-trees" = callPackage
@@ -260119,8 +244284,6 @@ self: {
        libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentefp-graphs" = callPackage
@@ -260132,8 +244295,6 @@ self: {
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentefp-number" = callPackage
@@ -260159,8 +244320,6 @@ self: {
        ];
        description = "RoseTree type and show functions for lab assignment of University of Twente";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentefp-trees" = callPackage
@@ -260172,8 +244331,6 @@ self: {
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentefp-websockets" = callPackage
@@ -260192,8 +244349,6 @@ self: {
        ];
        description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentyseven" = callPackage
@@ -260223,8 +244378,6 @@ self: {
        ];
        description = "Rubik's cube solver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twfy-api-client" = callPackage
@@ -260250,8 +244403,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "They Work For You API Client Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twhs" = callPackage
@@ -260282,8 +244433,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "CLI twitter client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twidge" = callPackage
@@ -260304,8 +244453,6 @@ self: {
        ];
        description = "Unix Command-Line Twitter and Identica Client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twilight-stm" = callPackage
@@ -260317,8 +244464,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "STM library with safe irrevocable I/O and inconsistency repair";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twilio" = callPackage
@@ -260345,8 +244490,6 @@ self: {
        doCheck = false;
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twill" = callPackage
@@ -260365,8 +244508,6 @@ self: {
        ];
        description = "Twilio API interaction";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twiml" = callPackage
@@ -260399,8 +244540,6 @@ self: {
        ];
        description = "very simple template language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twirp" = callPackage
@@ -260422,8 +244561,6 @@ self: {
        ];
        description = "Haskell twirp foundations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twisty" = callPackage
@@ -260477,8 +244614,6 @@ self: {
        ];
        description = "A Haskell-based CLI Twitter client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twitter-conduit" = callPackage
@@ -260509,8 +244644,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -260529,8 +244662,6 @@ self: {
        ];
        description = "Twitter API package with enumerator interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twitter-feed" = callPackage
@@ -260552,8 +244683,6 @@ self: {
        ];
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twitter-types" = callPackage
@@ -260575,8 +244704,6 @@ self: {
        ];
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -260592,8 +244719,6 @@ self: {
        ];
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tx" = callPackage
@@ -260609,8 +244734,6 @@ self: {
        ];
        description = "Persistent transactions on top of STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "txt" = callPackage
@@ -260629,8 +244752,6 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "txt-sushi" = callPackage
@@ -260672,8 +244793,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Deprecated in favor of eros";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ty" = callPackage
@@ -260698,8 +244817,6 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Provide proof witnesses for closed type family evaluation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typalyze" = callPackage
@@ -260718,8 +244835,6 @@ self: {
        ];
        description = "Analyzes Haskell source files for easy reference";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-aligned" = callPackage
@@ -260744,8 +244859,6 @@ self: {
        testHaskellDepends = [ base hspec test-fixture ];
        description = "Runtime type assertions for testing";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-booleans" = callPackage
@@ -260772,8 +244885,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "type-cereal" = callPackage
@@ -260790,8 +244901,6 @@ self: {
        ];
        description = "Type-level serialization of type constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-combinators" = callPackage
@@ -260805,8 +244914,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of data types for type-level programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-combinators-quote" = callPackage
@@ -260822,8 +244929,6 @@ self: {
        ];
        description = "Quasiquoters for the 'type-combinators' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-combinators-singletons" = callPackage
@@ -260835,8 +244940,6 @@ self: {
        libraryHaskellDepends = [ base singletons type-combinators ];
        description = "Interop between /type-combinators/ and /singletons/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-digits" = callPackage
@@ -260848,8 +244951,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell type-spine ];
        description = "Arbitrary-base type-level digits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-eq" = callPackage
@@ -260864,8 +244965,6 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Type equality evidence you can carry around";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-equality" = callPackage
@@ -260981,8 +245080,6 @@ self: {
        ];
        description = "Queues with verified and unverified versions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-int" = callPackage
@@ -260994,8 +245091,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Type Level 2s- and 16s- Complement Integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-interpreter" = callPackage
@@ -261008,8 +245103,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-iso" = callPackage
@@ -261048,8 +245141,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "type-level binary search trees in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-level-integers" = callPackage
@@ -261098,8 +245189,6 @@ self: {
        ];
        description = "High-level combinators for performing inductive operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-level-natural-number-operations" = callPackage
@@ -261111,8 +245200,6 @@ self: {
        libraryHaskellDepends = [ base type-level-natural-number ];
        description = "Basic operations on type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-level-numbers" = callPackage
@@ -261160,8 +245247,6 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-map" = callPackage
@@ -261253,8 +245338,6 @@ self: {
        ];
        description = "Type-level comparison operator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-ord-spine-cereal" = callPackage
@@ -261270,8 +245353,6 @@ self: {
        ];
        description = "Generic type-level comparison of types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-prelude" = callPackage
@@ -261283,8 +245364,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-sets" = callPackage
@@ -261297,8 +245376,6 @@ self: {
        testHaskellDepends = [ base cmptype ];
        description = "Type-level sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-settheory" = callPackage
@@ -261314,8 +245391,6 @@ self: {
        ];
        description = "Sets and functions-as-relations in the type system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-spec" = callPackage
@@ -261339,8 +245414,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "A spine-view on types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-structure" = callPackage
@@ -261367,8 +245440,6 @@ self: {
        ];
        description = "Type structure analysis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-sub-th" = callPackage
@@ -261393,8 +245464,6 @@ self: {
        ];
        description = "Substitute types for other types with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-tree" = callPackage
@@ -261412,8 +245481,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tree representations of datatypes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-unary" = callPackage
@@ -261445,8 +245512,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Automatic deriving of TypeableN instances with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typed-admin" = callPackage
@@ -261526,8 +245591,6 @@ self: {
        ];
        description = "Type safe string transformations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typed-encoding-encoding" = callPackage
@@ -261547,8 +245610,6 @@ self: {
        ];
        description = "Bridge between encoding and typed-encoding packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typed-process" = callPackage
@@ -261608,8 +245669,6 @@ self: {
        ];
        description = "A stream based replacement for lists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typed-uuid" = callPackage
@@ -261668,8 +245727,6 @@ self: {
        ];
        description = "Language-independent type-safe communication";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typed-wire-utils" = callPackage
@@ -261699,8 +245756,6 @@ self: {
        ];
        description = "Typed frontend to TensorFlow and higher-order deep learning";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typedquery" = callPackage
@@ -261717,8 +245772,6 @@ self: {
        ];
        description = "Parser for SQL augmented with types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typehash" = callPackage
@@ -261730,8 +245783,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mtl pureMD5 syb ];
        description = "Create a unique hash value for a type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typelevel" = callPackage
@@ -261748,8 +245799,6 @@ self: {
        ];
        description = "Useful type level operations (type families and related operators)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typelevel-rewrite-rules" = callPackage
@@ -261785,8 +245834,6 @@ self: {
        ];
        description = "Tensors whose ranks and dimensions type-inferred and type-checked";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typelits-printf" = callPackage
@@ -261850,8 +245897,6 @@ self: {
        ];
        description = "Lens-like interface for type level parameters; allows unboxed unboxed vectors and supercompilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typerep-map" = callPackage
@@ -261889,8 +245934,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typesafe-endian" = callPackage
@@ -261921,8 +245964,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typescript-docs" = callPackage
@@ -261942,8 +245983,6 @@ self: {
        ];
        description = "A documentation generator for TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typical" = callPackage
@@ -261981,8 +246020,6 @@ self: {
        ];
        description = "Just let me draw nice text already";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typography-geometry" = callPackage
@@ -262018,8 +246055,6 @@ self: {
        ];
        description = "Type derived JSON parsing using Aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tz" = callPackage
@@ -262047,8 +246082,6 @@ self: {
        preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tzdata" = callPackage
@@ -262088,8 +246121,6 @@ self: {
        testHaskellDepends = [ base bytestring either-unwrap hspec text ];
        description = "Haskell Universal Two Factor helper toolbox library thing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uAgda" = callPackage
@@ -262167,8 +246198,6 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "Uber client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uberlast" = callPackage
@@ -262180,8 +246209,6 @@ self: {
        libraryHaskellDepends = [ base lens tagged template-haskell ];
        description = "Generate overloaded lenses from plain data declaration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ucam-webauth" = callPackage
@@ -262211,8 +246238,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "The Ucam-Webauth protocol, used by Raven";
        license = "(BSD-3-Clause OR Apache-2.0)";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ucam-webauth-types" = callPackage
@@ -262234,8 +246259,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Types for the Ucam-Webauth protocol, as used by Raven";
        license = "(BSD-3-Clause OR Apache-2.0)";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ucd" = callPackage
@@ -262266,8 +246289,6 @@ self: {
        librarySystemDepends = [ icu ];
        description = "String encoding conversion with ICU";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) icu;};
 
   "udbus" = callPackage
@@ -262343,8 +246364,6 @@ self: {
        ];
        description = "Simple fire-and-forget conduit UDP wrappers";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "udp-streaming" = callPackage
@@ -262358,8 +246377,6 @@ self: {
        ];
        description = "Streaming to and from UDP socket";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uglymemo" = callPackage
@@ -262398,8 +246415,6 @@ self: {
        ];
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uhc-util" = callPackage
@@ -262419,8 +246434,6 @@ self: {
        ];
        description = "UHC utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uhexdump" = callPackage
@@ -262434,8 +246447,6 @@ self: {
        executableHaskellDepends = [ base bytestring split ];
        description = "hex dumper for UTF-8 text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uhttpc" = callPackage
@@ -262460,8 +246471,6 @@ self: {
        ];
        description = "Minimal HTTP client library optimized for benchmarking";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ui-command" = callPackage
@@ -262475,8 +246484,6 @@ self: {
        libraryHaskellDepends = [ base data-default mtl old-locale time ];
        description = "A framework for friendly commandline programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uid" = callPackage
@@ -262527,8 +246534,6 @@ self: {
        ];
        description = "Implementation of ULID - Universally Unique Lexicographically Sortable Identifier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "una" = callPackage
@@ -262563,8 +246568,6 @@ self: {
        ];
        description = "A fast, cache-efficient, concurrent bloom filter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unagi-chan" = callPackage
@@ -262619,8 +246622,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functional concurrency with unamb using a custom scheduler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unbeliever" = callPackage
@@ -262644,8 +246645,6 @@ self: {
        doHaddock = false;
        description = "Opinionated Haskell Interoperability";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unbound" = callPackage
@@ -262665,8 +246664,6 @@ self: {
        ];
        description = "Generic support for programming with names and binders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unbound-generics" = callPackage
@@ -262689,8 +246686,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unbound-kind-generics" = callPackage
@@ -262706,8 +246701,6 @@ self: {
        ];
        description = "Support for programming with names and binders using kind-generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unbounded-delays" = callPackage
@@ -262730,8 +246723,6 @@ self: {
        libraryHaskellDepends = [ base unbounded-delays units units-defs ];
        description = "Thread delays and timeouts using proper time units";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unboxed" = callPackage
@@ -262756,8 +246747,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Self-optimizing unboxed sets using view patterns and data families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unboxed-ref" = callPackage
@@ -262826,8 +246815,6 @@ self: {
        executableHaskellDepends = [ base bytestring cmdargs ];
        description = "Secure and resilient remote file storage utility";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uncaught-exception" = callPackage
@@ -262924,8 +246911,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unfixing and recursion schemes for data types with binders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unfoldable" = callPackage
@@ -262943,8 +246928,6 @@ self: {
        ];
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unfoldable-restricted" = callPackage
@@ -262961,8 +246944,6 @@ self: {
        ];
        description = "An alternative to the Unfoldable typeclass";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ungadtagger" = callPackage
@@ -262985,8 +246966,6 @@ self: {
        libraryHaskellDepends = [ base containers uni-util ];
        description = "Event handling for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uni-graphs" = callPackage
@@ -263002,8 +246981,6 @@ self: {
        ];
        description = "Graphs";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uni-htk" = callPackage
@@ -263020,8 +246997,6 @@ self: {
        ];
        description = "Graphical User Interface for Haskell Programs";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uni-posixutil" = callPackage
@@ -263037,8 +247012,6 @@ self: {
        ];
        description = "Posix utilities for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uni-reactor" = callPackage
@@ -263053,8 +247026,6 @@ self: {
        ];
        description = "Reactors for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uni-uDrawGraph" = callPackage
@@ -263071,8 +247042,6 @@ self: {
        ];
        description = "Graphs binding";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uni-util" = callPackage
@@ -263089,8 +247058,6 @@ self: {
        ];
        description = "Utilities for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unicode" = callPackage
@@ -263130,8 +247097,6 @@ self: {
        librarySystemDepends = [ icu ];
        description = "Unicode normalization using the ICU library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) icu;};
 
   "unicode-prelude" = callPackage
@@ -263143,8 +247108,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unicode notation for some definitions in Prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unicode-properties" = callPackage
@@ -263168,8 +247131,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "print and show in unicode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unicode-symbols" = callPackage
@@ -263181,8 +247142,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unicode-transforms" = callPackage
@@ -263284,8 +247243,6 @@ self: {
        testHaskellDepends = [ attoparsec base bytestring Cabal ];
        description = "Uniform IO over files, network, anything";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "uniform-pair" = callPackage
@@ -263320,8 +247277,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "union-find" = callPackage
@@ -263357,8 +247312,6 @@ self: {
        libraryHaskellDepends = [ base containers extensible ];
        description = "Heterogeneous map by open unions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unipatterns" = callPackage
@@ -263478,8 +247431,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Splittable Unique Identifier Supply";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uniquely-represented-sets" = callPackage
@@ -263496,8 +247447,6 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uniqueness-periods" = callPackage
@@ -263689,8 +247638,6 @@ self: {
        ];
        description = "Attoparsec parsers for the units package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "units-defs" = callPackage
@@ -263731,8 +247678,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "An extendable library for type-safe computations including units";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unity-testresult-parser" = callPackage
@@ -263792,8 +247737,6 @@ self: {
        libraryHaskellDepends = [ base unitym yesod ];
        description = "Implementation of the unity monad for the Yesod framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "universal" = callPackage
@@ -263825,8 +247768,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for OS X Universal Binary format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "universe" = callPackage
@@ -263970,8 +247911,6 @@ self: {
        ];
        description = "Construct a Dec's ancestor list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "universum" = callPackage
@@ -264048,8 +247987,6 @@ self: {
        libraryHaskellDepends = [ base foreign-var ];
        description = "Comprehensive bindings to fcntl(2)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unix-handle" = callPackage
@@ -264061,8 +247998,6 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "POSIX operations on Handles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unix-io-extra" = callPackage
@@ -264112,8 +248047,6 @@ self: {
        ];
        description = "Run processes on Unix systems, with a conduit interface (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unix-pty-light" = callPackage
@@ -264167,8 +248100,6 @@ self: {
        ];
        description = "Bidirectional JSON parsing and generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unlambda" = callPackage
@@ -264194,8 +248125,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim semigroups ];
        description = "GHC Haskell lists of non-thunks (things of kind TYPE 'UnliftedRep)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unliftio" = callPackage
@@ -264303,8 +248232,6 @@ self: {
        ];
        description = "A Library for the manipulation of images";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unmed2" = callPackage
@@ -264358,8 +248285,6 @@ self: {
        ];
        description = "Rematch support for unordered containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unordered-graphs" = callPackage
@@ -264375,8 +248300,6 @@ self: {
        ];
        description = "Graph library using unordered-containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unordered-intmap" = callPackage
@@ -264393,8 +248316,6 @@ self: {
        ];
        description = "A specialization of `HashMap Int v`";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unpack-funcs" = callPackage
@@ -264410,8 +248331,6 @@ self: {
        ];
        description = "Monad transformers that mirror worker-wrapper transformations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unpacked-containers" = callPackage
@@ -264441,8 +248360,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked either data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unpacked-maybe" = callPackage
@@ -264455,8 +248372,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked maybe data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unpacked-maybe-numeric" = callPackage
@@ -264471,8 +248386,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "maybes of numeric values with fewer indirections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unpacked-maybe-text" = callPackage
@@ -264500,8 +248413,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked these data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unpacked-validation" = callPackage
@@ -264518,8 +248429,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked validation data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unparse-attoparsec" = callPackage
@@ -264540,8 +248449,6 @@ self: {
        ];
        description = "An attoparsec roundtrip";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unroll-ghc-plugin" = callPackage
@@ -264553,8 +248460,6 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Compiler plugin for loop unrolling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unsafe" = callPackage
@@ -264591,8 +248496,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Flexible access control for unsafe operations and instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unsafeperformst" = callPackage
@@ -264623,8 +248526,6 @@ self: {
        ];
        description = "Solve Boggle-like word games";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unsequential" = callPackage
@@ -264643,8 +248544,6 @@ self: {
        ];
        description = "An extension removing the sequentiality from monads";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unusable-pkg" = callPackage
@@ -264686,8 +248585,6 @@ self: {
        testHaskellDepends = [ base containers hspec text ];
        description = "A command line tool to identify unused code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unwrapped-functors" = callPackage
@@ -264717,8 +248614,6 @@ self: {
        testHaskellDepends = [ base hlint tasty tasty-hunit ];
        description = "Units of measure as a GHC typechecker plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "up" = callPackage
@@ -264736,8 +248631,6 @@ self: {
        ];
        description = "Command-line tool to generate paths for moving upward in a file system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "up-grade" = callPackage
@@ -264831,8 +248724,6 @@ self: {
        ];
        description = "Haskell client for Uploadcare";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uploadtest" = callPackage
@@ -264855,8 +248746,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to upskirt";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urbit-airlock" = callPackage
@@ -264873,8 +248762,6 @@ self: {
        ];
        description = "Talk to Urbit from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urbit-hob" = callPackage
@@ -264913,8 +248800,6 @@ self: {
        ];
        description = "Minimalistic CLI RSS reader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urembed" = callPackage
@@ -264935,8 +248820,6 @@ self: {
        ];
        description = "Ur/Web static content generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri" = callPackage
@@ -264948,8 +248831,6 @@ self: {
        libraryHaskellDepends = [ base parsec safe utf8-string ];
        description = "Library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-bytestring" = callPackage
@@ -265008,8 +248889,6 @@ self: {
        ];
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-encode" = callPackage
@@ -265045,8 +248924,6 @@ self: {
        ];
        description = "A uri encoder to make your strings less readable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-enumerator" = callPackage
@@ -265063,8 +248940,6 @@ self: {
        ];
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-enumerator-file" = callPackage
@@ -265083,8 +248958,6 @@ self: {
        ];
        description = "uri-enumerator backend for the file scheme (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-parse" = callPackage
@@ -265101,8 +248974,6 @@ self: {
        testHaskellDepends = [ base data-default hspec lens ];
        description = "A simple library for parsing and generating URIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-template" = callPackage
@@ -265117,8 +248988,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "URI template library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-templater" = callPackage
@@ -265142,8 +249011,6 @@ self: {
        ];
        description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "url" = callPackage
@@ -265178,8 +249045,6 @@ self: {
        ];
        description = "Memory efficient url type and parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "url-decoders" = callPackage
@@ -265202,8 +249067,6 @@ self: {
        benchmarkHaskellDepends = [ criterion http-types rerebase ];
        description = "Decoders for URL-encoding (aka Percent-encoding)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "url-generic" = callPackage
@@ -265217,8 +249080,6 @@ self: {
        libraryHaskellDepends = [ base mtl syb ];
        description = "Parse/format generic key/value URLs from record data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urlcheck" = callPackage
@@ -265236,8 +249097,6 @@ self: {
        ];
        description = "Parallel link checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urldecode" = callPackage
@@ -265251,8 +249110,6 @@ self: {
        executableHaskellDepends = [ base network ];
        description = "Decode percent-encoded strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urldisp-happstack" = callPackage
@@ -265264,8 +249121,6 @@ self: {
        libraryHaskellDepends = [ base bytestring happstack-server mtl ];
        description = "Simple, declarative, expressive URL routing -- on happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urlencoded" = callPackage
@@ -265281,8 +249136,6 @@ 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;
-       broken = true;
      }) {};
 
   "urlpath" = callPackage
@@ -265302,8 +249155,6 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urn" = callPackage
@@ -265316,8 +249167,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Universal Resource Names";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urn-random" = callPackage
@@ -265334,8 +249183,6 @@ self: {
        ];
        description = "A package for updatable discrete distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urxml" = callPackage
@@ -265353,8 +249200,6 @@ self: {
        ];
        description = "XML parser-printer supporting Ur/Web syntax extensions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "usa-holidays" = callPackage
@@ -265381,8 +249226,6 @@ self: {
        ];
        description = "Communicate with USB devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "usb-enumerator" = callPackage
@@ -265399,8 +249242,6 @@ self: {
        ];
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "usb-hid" = callPackage
@@ -265414,8 +249255,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring usb ];
        description = "Parser and request Library for USB HIDs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "usb-id-database" = callPackage
@@ -265435,8 +249274,6 @@ self: {
        ];
        description = "A database of USB identifiers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "usb-iteratee" = callPackage
@@ -265453,8 +249290,6 @@ self: {
        ];
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "usb-safe" = callPackage
@@ -265471,8 +249306,6 @@ self: {
        ];
        description = "Type-safe communication with USB devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "useragents" = callPackage
@@ -265487,8 +249320,6 @@ self: {
        executableHaskellDepends = [ base random-fu text ];
        description = "A collection of user agents";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "userid" = callPackage
@@ -265538,8 +249369,6 @@ self: {
        ];
        description = "A mysql-haskell backend for the users library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "users-persistent" = callPackage
@@ -265560,8 +249389,6 @@ self: {
        ];
        description = "A persistent backend for the users package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "users-postgresql-simple" = callPackage
@@ -265676,8 +249503,6 @@ self: {
        libraryHaskellDepends = [ base utf8-string ];
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "utf8-string" = callPackage
@@ -265708,8 +249533,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constant-space UTF8 validator for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "util" = callPackage
@@ -265736,8 +249559,6 @@ self: {
        libraryHaskellDepends = [ base basic control lifted-base-tf util ];
        description = "Exceptional utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "util-logict" = callPackage
@@ -265767,8 +249588,6 @@ self: {
        testHaskellDepends = [ base containers HTF QuickCheck ];
        description = "A collection of commonly used utils";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "util-primitive" = callPackage
@@ -265782,8 +249601,6 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "Primitive memory-related utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "util-primitive-control" = callPackage
@@ -265800,8 +249617,6 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Utilities for stateful primitive types and types based on them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "util-universe" = callPackage
@@ -265820,8 +249635,6 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Utilities for universal types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "utility-ht" = callPackage
@@ -265845,8 +249658,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Utilities for compiler construction: core functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uu-cco-examples" = callPackage
@@ -265860,8 +249671,6 @@ self: {
        executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ];
        description = "Utilities for compiler construction: example programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uu-cco-hut-parsing" = callPackage
@@ -265873,8 +249682,6 @@ self: {
        libraryHaskellDepends = [ base uu-cco uulib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uulib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uu-cco-uu-parsinglib" = callPackage
@@ -265886,8 +249693,6 @@ self: {
        libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uu-interleaved" = callPackage
@@ -265963,8 +249768,6 @@ self: {
        executableHaskellDepends = [ base uuagc-cabal ];
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uuagc-bootstrap" = callPackage
@@ -265987,8 +249790,6 @@ self: {
        ];
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uuagc-cabal" = callPackage
@@ -266004,8 +249805,6 @@ self: {
        ];
        description = "Cabal plugin for UUAGC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uuagc-diagrams" = callPackage
@@ -266017,8 +249816,6 @@ self: {
        libraryHaskellDepends = [ base diagrams-lib SVGFonts ];
        description = "Utility for drawing attribute grammar pictures with the diagrams package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uuagd" = callPackage
@@ -266075,8 +249872,6 @@ self: {
        libraryHaskellDepends = [ aeson base text uuid ];
        description = "Aeson types for UUID instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uuid-bytes" = callPackage
@@ -266097,8 +249892,6 @@ self: {
        ];
        description = "UUID parsing using byteverse packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uuid-crypto" = callPackage
@@ -266117,8 +249910,6 @@ self: {
        ];
        description = "Reversable and secure encoding of object ids as uuids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uuid-le" = callPackage
@@ -266204,8 +249995,6 @@ self: {
        executableHaskellDepends = [ base Cabal text ];
        description = "Remove all version constraints of dependencies in .cabal file";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uvector" = callPackage
@@ -266219,8 +250008,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Fast unboxed arrays with a flexible interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uvector-algorithms" = callPackage
@@ -266232,8 +250019,6 @@ self: {
        libraryHaskellDepends = [ base uvector ];
        description = "Efficient algorithms for uvector unboxed arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uxadt" = callPackage
@@ -266245,8 +250030,6 @@ self: {
        libraryHaskellDepends = [ base json MissingH mtl ];
        description = "Cross-language extensible representation for algebraic data type instances";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uzbl-with-source" = callPackage
@@ -266274,8 +250057,6 @@ self: {
        ];
        description = "interface to Video For Linux Two (V4L2)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "v4l2-examples" = callPackage
@@ -266289,8 +250070,6 @@ self: {
        executableHaskellDepends = [ base GLUT v4l2 ];
        description = "video for linux two examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vabal" = callPackage
@@ -266312,8 +250091,6 @@ self: {
        testHaskellDepends = [ base process ];
        description = "the cabal companion";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vabal-lib" = callPackage
@@ -266331,8 +250108,6 @@ self: {
        testHaskellDepends = [ base Cabal containers ];
        description = "Core algorithms and datatypes used by vabal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vacuum" = callPackage
@@ -266344,8 +250119,6 @@ self: {
        libraryHaskellDepends = [ array base containers ghc-prim ];
        description = "Graph representation of the GHC heap";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vacuum-cairo" = callPackage
@@ -266362,8 +250135,6 @@ self: {
        ];
        description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vacuum-graphviz" = callPackage
@@ -266375,8 +250146,6 @@ self: {
        libraryHaskellDepends = [ base filepath graphviz vacuum ];
        description = "A library for transforming vacuum graphs into GraphViz output";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vacuum-opengl" = callPackage
@@ -266396,8 +250165,6 @@ self: {
        ];
        description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vacuum-ubigraph" = callPackage
@@ -266409,8 +250176,6 @@ self: {
        libraryHaskellDepends = [ base containers hubigraph vacuum ];
        description = "Visualize Haskell data structures using vacuum and Ubigraph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vado" = callPackage
@@ -266456,8 +250221,6 @@ self: {
        libraryHaskellDepends = [ base containers MonadRandom ];
        description = "Valid operator/module characters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "validate" = callPackage
@@ -266488,8 +250251,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Input validation combinator library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "validated-literals" = callPackage
@@ -266521,8 +250282,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Type-level constraints on strings and other input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "validation" = callPackage
@@ -266580,8 +250339,6 @@ self: {
        ];
        description = "A nice way to define field validations in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "validationt" = callPackage
@@ -266600,8 +250357,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Straightforward validation monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "validators" = callPackage
@@ -266783,8 +250538,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for generating values without having to thread state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vampire" = callPackage
@@ -266807,8 +250560,6 @@ self: {
        ];
        description = "Analyze and visualize expression trees";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "var" = callPackage
@@ -266826,8 +250577,6 @@ self: {
        benchmarkHaskellDepends = [ array base criterion deepseq ];
        description = "Mutable variables and tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "var-monad" = callPackage
@@ -266857,8 +250606,6 @@ self: {
        ];
        description = "Process mpileup output to identify significant differences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "variable-precision" = callPackage
@@ -266875,8 +250622,6 @@ self: {
        ];
        description = "variable-precision floating point";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "variables" = callPackage
@@ -266889,8 +250634,6 @@ self: {
        testHaskellDepends = [ base hspec mtl QuickCheck stm ];
        description = "Monads with variables, without deep magic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "variation" = callPackage
@@ -266905,8 +250648,6 @@ self: {
        ];
        description = "nominal value with possible variations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "varying" = callPackage
@@ -266981,8 +250722,6 @@ self: {
        ];
        description = "Utility library for spawning a HashiCorp Vault process";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vault-trans" = callPackage
@@ -266999,8 +250738,6 @@ self: {
        ];
        description = "A monad transformer for vault-tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vaultaire-common" = callPackage
@@ -267024,8 +250761,6 @@ self: {
        ];
        description = "Common types and instances for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vcache" = callPackage
@@ -267042,8 +250777,6 @@ self: {
        ];
        description = "semi-transparent persistence for Haskell using LMDB, STM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vcache-trie" = callPackage
@@ -267059,8 +250792,6 @@ self: {
        ];
        description = "patricia tries modeled above VCache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vcard" = callPackage
@@ -267074,8 +250805,6 @@ self: {
        ];
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vcatt" = callPackage
@@ -267090,8 +250819,6 @@ self: {
        executableHaskellDepends = [ base shelly text ];
        description = "Recursively check that a directory is under version control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vcd" = callPackage
@@ -267119,8 +250846,6 @@ self: {
        ];
        description = "A package to parse VCF files inspired in similar python libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vcs-revision" = callPackage
@@ -267166,8 +250891,6 @@ self: {
        ];
        description = "GUI library for source code management systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vcswrapper" = callPackage
@@ -267191,8 +250914,6 @@ self: {
        ];
        description = "Wrapper for source code management systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vec" = callPackage
@@ -267264,8 +250985,6 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, operating on the Floating typeclass";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vect-floating-accelerate" = callPackage
@@ -267279,8 +250998,6 @@ self: {
        libraryHaskellDepends = [ accelerate base vect-floating ];
        description = "Accelerate instances for vect-floating types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vect-opengl" = callPackage
@@ -267292,8 +251009,6 @@ self: {
        libraryHaskellDepends = [ base OpenGL vect ];
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector_0_10_9_3" = callPackage
@@ -267430,8 +251145,6 @@ self: {
        testHaskellDepends = [ base directory QuickCheck random ];
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-circular" = callPackage
@@ -267449,8 +251162,6 @@ self: {
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "circular vectors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-clock" = callPackage
@@ -267470,8 +251181,6 @@ self: {
        ];
        description = "Vector clocks for versioning message flows";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-conduit" = callPackage
@@ -267490,8 +251199,6 @@ self: {
        ];
        description = "Conduit utilities for vectors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-doublezip" = callPackage
@@ -267517,8 +251224,6 @@ self: {
        doHaddock = false;
        description = "Storable vectors with cpu-independent representation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-extras" = callPackage
@@ -267553,8 +251258,6 @@ self: {
        ];
        description = "A binding to the fftw library for one-dimensional vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fftw;};
 
   "vector-functorlazy" = callPackage
@@ -267569,8 +251272,6 @@ self: {
        ];
        description = "vectors that perform the fmap operation in constant time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-heterogenous" = callPackage
@@ -267582,8 +251283,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        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;
-       broken = true;
      }) {};
 
   "vector-instances" = callPackage
@@ -267612,8 +251311,6 @@ self: {
        ];
        description = "Instances of the Data.Collections classes for Data.Vector.*";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-mmap" = callPackage
@@ -267641,8 +251338,6 @@ self: {
        libraryHaskellDepends = [ base mersenne-random-pure64 vector ];
        description = "Generate vectors filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-read-instances" = callPackage
@@ -267654,8 +251349,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "(deprecated) Read instances for 'Data.Vector'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-rotcev" = callPackage
@@ -267719,8 +251412,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "vector-space operations for finite maps using Data.Map";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-space-opengl" = callPackage
@@ -267738,8 +251429,6 @@ self: {
        ];
        description = "Instances of vector-space classes for OpenGL types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-space-points" = callPackage
@@ -267753,8 +251442,6 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-split" = callPackage
@@ -267782,8 +251469,6 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "Statically checked sizes on Data.Vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-strategies" = callPackage
@@ -267810,8 +251495,6 @@ self: {
        ];
        description = "Text implementation based on unboxed char vector";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-th-unbox" = callPackage
@@ -267853,8 +251536,6 @@ self: {
        ];
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vega-view" = callPackage
@@ -267900,8 +251581,6 @@ self: {
        ];
        description = "ASCII platform-adventure game";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -267913,8 +251592,6 @@ self: {
        libraryHaskellDepends = [ base regex-pcre ];
        description = "Regular expressions made easy";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verbosity" = callPackage
@@ -267947,8 +251624,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Validation framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verdict-json" = callPackage
@@ -267969,8 +251644,6 @@ self: {
        ];
        description = "JSON instances and JSON Schema for verdict";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verifiable-expressions" = callPackage
@@ -267986,8 +251659,6 @@ self: {
        ];
        description = "An intermediate language for Hoare logic style verification";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verify" = callPackage
@@ -268010,8 +251681,6 @@ self: {
        ];
        description = "A new Haskeleton package";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verilog" = callPackage
@@ -268024,8 +251693,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Verilog preprocessor, parser, and AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verismith" = callPackage
@@ -268062,8 +251729,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion lens ];
        description = "Random verilog generation and simulator testing";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "versioning" = callPackage
@@ -268076,8 +251741,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "Type-safe data versioning";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "versioning-servant" = callPackage
@@ -268098,8 +251761,6 @@ self: {
        ];
        description = "Servant combinators for the versioning library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "versions" = callPackage
@@ -268140,8 +251801,6 @@ self: {
        ];
        description = "types for ingesting vflow data with aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vformat" = callPackage
@@ -268219,8 +251878,6 @@ self: {
        ];
        description = "VFR waypoints, as published in the AIP (ERSA)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vgrep" = callPackage
@@ -268250,8 +251907,6 @@ self: {
        ];
        description = "A pager for grep";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vhd" = callPackage
@@ -268277,8 +251932,6 @@ self: {
        ];
        description = "Provides functions to inspect and manipulate virtual hard disk (VHD) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vhdl" = callPackage
@@ -268290,8 +251943,6 @@ self: {
        libraryHaskellDepends = [ base mtl pretty regex-posix ];
        description = "VHDL AST and pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vicinity" = callPackage
@@ -268307,8 +251958,6 @@ self: {
          base containers doctest QuickCheck quickcheck-classes
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "viewprof" = callPackage
@@ -268327,8 +251976,6 @@ self: {
        ];
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "views" = callPackage
@@ -268340,8 +251987,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Views allow you to run a State monad on part of a state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vigilance" = callPackage
@@ -268382,8 +252027,6 @@ self: {
        ];
        description = "An extensible dead-man's switch system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vimeta" = callPackage
@@ -268410,8 +252053,6 @@ self: {
        ];
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vimus" = callPackage
@@ -268441,8 +252082,6 @@ self: {
        ];
        description = "An MPD client with vim-like key bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "vintage-basic" = callPackage
@@ -268463,8 +252102,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Interpreter for microcomputer-era BASIC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl" = callPackage
@@ -268525,8 +252162,6 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and vinyl records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-json" = callPackage
@@ -268543,8 +252178,6 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Provide json instances automagically to vinyl types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-named-sugar" = callPackage
@@ -268556,8 +252189,6 @@ self: {
        libraryHaskellDepends = [ base vinyl ];
        description = "Syntax sugar for vinyl records using overloaded labels";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-operational" = callPackage
@@ -268572,8 +252203,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-plus" = callPackage
@@ -268593,8 +252222,6 @@ self: {
        testHaskellDepends = [ base doctest vinyl ];
        description = "Vinyl records utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-utils" = callPackage
@@ -268606,8 +252233,6 @@ self: {
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-vectors" = callPackage
@@ -268626,8 +252251,6 @@ self: {
        ];
        description = "Vectors for vinyl vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "virthualenv" = callPackage
@@ -268647,8 +252270,6 @@ self: {
        ];
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "visibility" = callPackage
@@ -268660,8 +252281,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple computation of visibility polygons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vision" = callPackage
@@ -268683,8 +252302,6 @@ self: {
        ];
        description = "An XMMS2 client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "visual-graphrewrite" = callPackage
@@ -268712,8 +252329,6 @@ self: {
        ];
        description = "Visualize the graph-rewrite steps of a Haskell program";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "visual-prof" = callPackage
@@ -268732,8 +252347,6 @@ self: {
        ];
        description = "Create a visual profile of a program's source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "visualize-cbn" = callPackage
@@ -268753,8 +252366,6 @@ self: {
        ];
        description = "Visualize CBN reduction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vitrea" = callPackage
@@ -268766,8 +252377,6 @@ self: {
        libraryHaskellDepends = [ base mtl profunctors ];
        description = "Profunctor optics via the profunctor representation theorem";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vivid" = callPackage
@@ -268787,8 +252396,6 @@ self: {
        ];
        description = "Sound synthesis with SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vivid-osc" = callPackage
@@ -268801,8 +252408,6 @@ self: {
        testHaskellDepends = [ base bytestring cereal microspec time ];
        description = "Open Sound Control encode/decode";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vivid-supercollider" = callPackage
@@ -268822,8 +252427,6 @@ self: {
        ];
        description = "Implementation of SuperCollider server specifications";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vk-aws-route53" = callPackage
@@ -268841,8 +252444,6 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vk-posix-pty" = callPackage
@@ -268894,8 +252495,6 @@ self: {
        testHaskellDepends = [ aeson base hspec roundtrip-aeson ];
        description = "Upload audio files to voicebase to get a transcription";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "void" = callPackage
@@ -268921,8 +252520,6 @@ self: {
        ];
        description = "Reading of Vorbis comments from Ogg Vorbis files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vowpal-utils" = callPackage
@@ -268934,8 +252531,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Vowpal Wabbit utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "voyeur" = callPackage
@@ -268947,8 +252542,6 @@ self: {
        libraryHaskellDepends = [ base bytestring process utf8-string ];
        description = "Haskell bindings for libvoyeur";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vpq" = callPackage
@@ -268965,8 +252558,6 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Priority queue based on vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vrpn" = callPackage
@@ -269024,8 +252615,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) vte;};
 
   "vtegtk3" = callPackage
@@ -269043,8 +252632,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) vte;};
 
   "vty" = callPackage
@@ -269100,8 +252687,6 @@ self: {
        ];
        description = "Examples programs using the vty library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vty-menu" = callPackage
@@ -269115,8 +252700,6 @@ self: {
        libraryHaskellDepends = [ base vty ];
        description = "A lib for displaying a menu and getting a selection using VTY";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vty-ui" = callPackage
@@ -269138,8 +252721,6 @@ self: {
        executableHaskellDepends = [ base QuickCheck random text vty ];
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vty-ui-extras" = callPackage
@@ -269151,8 +252732,6 @@ self: {
        libraryHaskellDepends = [ base regex-base regex-pcre vty vty-ui ];
        description = "Extra vty-ui functionality not included in the core library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vulkan" = callPackage
@@ -269234,8 +252813,6 @@ self: {
        ];
        description = "JSON wrangling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wacom-daemon" = callPackage
@@ -269259,8 +252836,6 @@ self: {
        ];
        description = "Manage Wacom tablet settings profiles, including Intuos Pro ring modes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "waddle" = callPackage
@@ -269283,8 +252858,6 @@ self: {
        ];
        description = "DOOM WAD file utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wahsp" = callPackage
@@ -269305,8 +252878,6 @@ self: {
        ];
        description = "A haskell binding of the Web Audio API ala blank-canvas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai" = callPackage
@@ -269426,8 +252997,6 @@ self: {
        ];
        description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-conduit" = callPackage
@@ -269511,8 +253080,6 @@ self: {
        testHaskellDepends = [ base hspec stm ];
        description = "A web server for the development of WAI compliant web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-digestive-functors" = callPackage
@@ -269662,8 +253229,6 @@ self: {
        ];
        description = "Git http-backend CGI App of WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-graceful" = callPackage
@@ -269675,8 +253240,6 @@ self: {
        libraryHaskellDepends = [ base http-types mtl resourcet unix wai ];
        description = "Graceful shutdown for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-handler-devel" = callPackage
@@ -269697,8 +253260,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "WAI server that automatically reloads code after modification. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-handler-fastcgi" = callPackage
@@ -269738,8 +253299,6 @@ self: {
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        description = "Wai handler to SCGI (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-handler-snap" = callPackage
@@ -269756,8 +253315,6 @@ self: {
        ];
        description = "Web Application Interface handler using snap-server. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-handler-webkit" = callPackage
@@ -269770,8 +253327,6 @@ self: {
        libraryPkgconfigDepends = [ QtWebKit ];
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {QtWebKit = null;};
 
   "wai-hastache" = callPackage
@@ -269810,8 +253365,6 @@ self: {
        ];
        description = "hmac authentication tools for WAI apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-http2-extra" = callPackage
@@ -269868,8 +253421,6 @@ self: {
        ];
        description = "Lenses for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-lite" = callPackage
@@ -269885,8 +253436,6 @@ self: {
        ];
        description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-log" = callPackage
@@ -269943,8 +253492,6 @@ self: {
        ];
        description = "Buffer requets before logging them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-logger-prefork" = callPackage
@@ -269961,8 +253508,6 @@ self: {
        ];
        description = "A logging system for preforked WAI apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-make-assets" = callPackage
@@ -269992,8 +253537,6 @@ self: {
        ];
        description = "Compiling and serving assets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-auth" = callPackage
@@ -270030,8 +253573,6 @@ self: {
        ];
        description = "Authentication middleware that secures WAI application";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-brotli" = callPackage
@@ -270080,8 +253621,6 @@ self: {
        ];
        description = "Caching middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-cache-redis" = callPackage
@@ -270100,8 +253639,6 @@ self: {
        ];
        description = "Redis backend for wai-middleware-cache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-caching" = callPackage
@@ -270164,8 +253701,6 @@ self: {
        ];
        description = "Wai error catching middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-clacks" = callPackage
@@ -270207,8 +253742,6 @@ self: {
        ];
        description = "Wai Middleware for Consul";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-content-type" = callPackage
@@ -270241,8 +253774,6 @@ self: {
        ];
        description = "Route to different middlewares based on the incoming Accept header";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-crowd" = callPackage
@@ -270274,8 +253805,6 @@ self: {
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-delegate" = callPackage
@@ -270302,8 +253831,6 @@ self: {
        ];
        description = "WAI middleware that delegates handling of requests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-etag" = callPackage
@@ -270321,8 +253848,6 @@ self: {
        ];
        description = "WAI ETag middleware for static files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-gunzip" = callPackage
@@ -270349,8 +253874,6 @@ self: {
        libraryHaskellDepends = [ base bytestring http-types wai ];
        description = "cors and addHeaders for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-hmac" = callPackage
@@ -270393,8 +253916,6 @@ self: {
        ];
        description = "WAI HMAC Authentication Middleware Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-json-errors" = callPackage
@@ -270453,8 +253974,6 @@ self: {
        ];
        description = "WAI middleware for preprocessing static files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-prometheus" = callPackage
@@ -270488,8 +254007,6 @@ self: {
        ];
        description = "Middleware that communicates to Rollbar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-route" = callPackage
@@ -270510,8 +254027,6 @@ self: {
        ];
        description = "Wai dispatch middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-slack-verify" = callPackage
@@ -270576,8 +254091,6 @@ self: {
        ];
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-static-embedded" = callPackage
@@ -270637,8 +254150,6 @@ self: {
        ];
        description = "WAI middleware for authenticating webhook payloads from Travis CI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-verbs" = callPackage
@@ -270727,8 +254238,6 @@ self: {
        ];
        description = "Declarative request parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-responsible" = callPackage
@@ -270740,8 +254249,6 @@ self: {
        libraryHaskellDepends = [ base bytestring http-types wai ];
        description = "Response interface for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-route" = callPackage
@@ -270764,8 +254271,6 @@ self: {
        ];
        description = "WAI middleware for path-based request routing with captures";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-router" = callPackage
@@ -270777,8 +254282,6 @@ self: {
        libraryHaskellDepends = [ base text wai ];
        description = "Provides basic routing on URL paths for WAI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-routes" = callPackage
@@ -270803,8 +254306,6 @@ self: {
        ];
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-routing" = callPackage
@@ -270831,8 +254332,6 @@ self: {
        ];
        description = "Declarative routing for WAI";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-saml2" = callPackage
@@ -270874,8 +254373,6 @@ self: {
          wai-extra
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-session" = callPackage
@@ -270910,8 +254407,6 @@ self: {
        ];
        description = "An alternative session middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-session-clientsession" = callPackage
@@ -270949,8 +254444,6 @@ self: {
        ];
        description = "MySQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-session-postgresql" = callPackage
@@ -270973,8 +254466,6 @@ self: {
        ];
        description = "PostgreSQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-session-tokyocabinet" = callPackage
@@ -271023,8 +254514,6 @@ self: {
        ];
        description = "A simple cache for serving static files in a WAI middleware";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-static-pages" = callPackage
@@ -271068,8 +254557,6 @@ self: {
        ];
        description = "Thrift transport layer for Wai";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-throttler" = callPackage
@@ -271085,8 +254572,6 @@ self: {
        ];
        description = "Wai middleware for request throttling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-transformers" = callPackage
@@ -271166,8 +254651,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A wrapping library for waitfree computation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "waitra" = callPackage
@@ -271192,8 +254675,6 @@ self: {
        ];
        description = "A very simple Wai router";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wakame" = callPackage
@@ -271244,8 +254725,6 @@ self: {
        ];
        description = "A generator of comics based on some ascertainable data about the requester";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wallpaper" = callPackage
@@ -271267,8 +254746,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A library and executable for creating wallpaper, frieze, and rosette patterns";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "warc" = callPackage
@@ -271297,8 +254774,6 @@ self: {
        ];
        description = "A parser for the Web Archive (WARC) format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "warp" = callPackage
@@ -271348,8 +254823,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Dynamic configurable warp HTTP server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "warp-grpc" = callPackage
@@ -271387,8 +254860,6 @@ self: {
        ];
        description = "Static file server based on Warp and wai-app-static (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "warp-systemd" = callPackage
@@ -271400,8 +254871,6 @@ self: {
        libraryHaskellDepends = [ base network systemd unix wai warp ];
        description = "Socket activation and other systemd integration for the Warp web server (WAI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "warp-tls" = callPackage
@@ -271455,8 +254924,6 @@ self: {
        ];
        description = "Warp and Wai Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wasm" = callPackage
@@ -271485,8 +254952,6 @@ self: {
        testToolDepends = [ alex happy ];
        description = "WebAssembly Language Toolkit and Interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "watchdog" = callPackage
@@ -271500,8 +254965,6 @@ self: {
        libraryHaskellDepends = [ base mtl time ];
        description = "Simple control structure to re-try an action with exponential backoff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "watcher" = callPackage
@@ -271518,8 +254981,6 @@ self: {
        ];
        description = "Opinionated filesystem watcher";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "watchit" = callPackage
@@ -271548,8 +255009,6 @@ self: {
        ];
        description = "File change watching utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wavconvert" = callPackage
@@ -271616,8 +255075,6 @@ self: {
        testHaskellDepends = [ base hspec linear ];
        description = "Wavefront .obj file loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wavesurfer" = callPackage
@@ -271634,8 +255091,6 @@ self: {
        ];
        description = "Parse WaveSurfer files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wavy" = callPackage
@@ -271656,8 +255111,6 @@ self: {
        ];
        description = "Process WAVE files in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wcwidth" = callPackage
@@ -271682,8 +255135,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Mutable bag backed by weak pointers to each item";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "weather-api" = callPackage
@@ -271700,8 +255151,6 @@ self: {
        ];
        description = "Weather API implemented in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-browser-in-haskell" = callPackage
@@ -271725,8 +255174,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Simple functions for CSS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-encodings" = callPackage
@@ -271744,8 +255191,6 @@ self: {
        ];
        description = "Encapsulate multiple web encoding in a single package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-fpco" = callPackage
@@ -271781,8 +255226,6 @@ self: {
        testHaskellDepends = [ base bytestring HUnit network-uri text ];
        description = "Composable, reversible, efficient web routing using invertible invariants and bijections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-mongrel2" = callPackage
@@ -271801,8 +255244,6 @@ self: {
        ];
        description = "Bindings for the Mongrel2 web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-output" = callPackage
@@ -271821,8 +255262,6 @@ self: {
        ];
        description = "Library to present content to an user via their browser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-page" = callPackage
@@ -271842,8 +255281,6 @@ self: {
        ];
        description = "Monoidally construct web pages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-plugins" = callPackage
@@ -271880,8 +255317,6 @@ self: {
        ];
        description = "Send messages using Web Push protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-rep" = callPackage
@@ -271910,8 +255345,6 @@ self: {
        ];
        description = "representations of a web page";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-routes" = callPackage
@@ -272004,8 +255437,6 @@ self: {
        libraryHaskellDepends = [ base path-pieces template-haskell text ];
        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;
-       broken = true;
      }) {};
 
   "web-routes-regular" = callPackage
@@ -272017,8 +255448,6 @@ self: {
        libraryHaskellDepends = [ base parsec regular text web-routes ];
        description = "portable, type-safe URL routing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-routes-th" = callPackage
@@ -272046,8 +255475,6 @@ self: {
        libraryHaskellDepends = [ base transformers web-routes ];
        description = "Extends web-routes with some transformers instances for RouteT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-routes-wai" = callPackage
@@ -272082,8 +255509,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "simple routing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web3" = callPackage
@@ -272123,8 +255548,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Web3 API for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webapi" = callPackage
@@ -272151,8 +255574,6 @@ self: {
        ];
        description = "WAI based library for web api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webapp" = callPackage
@@ -272175,8 +255596,6 @@ self: {
        ];
        description = "Haskell web app framework based on WAI & Warp";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webauthn" = callPackage
@@ -272196,8 +255615,6 @@ self: {
        ];
        description = "Web Authentication API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webby" = callPackage
@@ -272222,8 +255639,6 @@ self: {
        ];
        description = "A super-simple web server framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webcloud" = callPackage
@@ -272240,8 +255655,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Turn an optparse-applicative program into a CGI program!";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webcrank" = callPackage
@@ -272269,8 +255682,6 @@ self: {
        ];
        description = "Webmachine inspired toolkit for building http applications and services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webcrank-dispatch" = callPackage
@@ -272286,8 +255697,6 @@ self: {
        ];
        description = "A simple request dispatcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webcrank-wai" = callPackage
@@ -272305,8 +255714,6 @@ self: {
        ];
        description = "Build a WAI Application from Webcrank Resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webdriver" = callPackage
@@ -272351,8 +255758,6 @@ self: {
        ];
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webdriver-snoy" = callPackage
@@ -272379,8 +255784,6 @@ self: {
        testHaskellDepends = [ base parallel text ];
        description = "a Haskell client for the Selenium WebDriver protocol (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webdriver-w3c" = callPackage
@@ -272416,8 +255819,6 @@ self: {
        ];
        description = "Bindings to the WebDriver API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webex-teams-api" = callPackage
@@ -272517,8 +255918,6 @@ self: {
        ];
        description = "WebFinger client library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webgear-server" = callPackage
@@ -272619,8 +256018,6 @@ self: {
        libraryPkgconfigDepends = [ webkit ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {webkit = null;};
 
   "webkit2gtk3-javascriptcore" = callPackage
@@ -272711,8 +256108,6 @@ self: {
        ];
        description = "HTTP server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webshow" = callPackage
@@ -272732,8 +256127,6 @@ self: {
        ];
        description = "Show programming language printed values in a web UI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "websnap" = callPackage
@@ -272809,8 +256202,6 @@ self: {
        ];
        description = "Simple streaming RPC mechanism using WebSockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "websockets-simple" = callPackage
@@ -272881,8 +256272,6 @@ self: {
        ];
        description = "Functional reactive web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wedding-announcement" = callPackage
@@ -272968,8 +256357,6 @@ self: {
        ];
        description = "A school-timetable problem-solver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "weigh" = callPackage
@@ -272996,8 +256383,6 @@ self: {
        libraryHaskellDepends = [ base mtl semiring-num transformers ];
        description = "Writer monad which uses semiring constraint";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "weighted-regexp" = callPackage
@@ -273012,8 +256397,6 @@ self: {
        libraryToolDepends = [ happy ];
        description = "Weighted Regular Expression Matcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "weighted-search" = callPackage
@@ -273044,8 +256427,6 @@ self: {
        ];
        description = "Haskell web framework (because Scotty had trouble yodeling)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wembley" = callPackage
@@ -273087,8 +256468,6 @@ self: {
        ];
        description = "A game engine for playing werewolf within an arbitrary chat client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "werewolf-slack" = callPackage
@@ -273108,8 +256487,6 @@ self: {
        ];
        description = "A chat interface for playing werewolf in Slack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "what4" = callPackage
@@ -273146,8 +256523,6 @@ self: {
        ];
        description = "Solver-agnostic symbolic values support for issuing queries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wheb-mongo" = callPackage
@@ -273159,8 +256534,6 @@ self: {
        libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ];
        description = "MongoDB plugin for Wheb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wheb-redis" = callPackage
@@ -273172,8 +256545,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ];
        description = "Redis connection for Wheb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wheb-strapped" = callPackage
@@ -273185,8 +256556,6 @@ self: {
        libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ];
        description = "Strapped templates for Wheb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "which" = callPackage
@@ -273209,8 +256578,6 @@ self: {
        libraryHaskellDepends = [ base indents parsec ];
        description = "Parser for the While language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "whim" = callPackage
@@ -273229,8 +256596,6 @@ self: {
        ];
        description = "A Haskell window manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "whiskers" = callPackage
@@ -273242,8 +256607,6 @@ self: {
        libraryHaskellDepends = [ base parsec template-haskell ];
        description = "Mustache templates with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "whitespace" = callPackage
@@ -273258,8 +256621,6 @@ self: {
        executableHaskellDepends = [ haskell98 random ];
        description = "Whitespace, an esoteric programming language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "whois" = callPackage
@@ -273273,8 +256634,6 @@ self: {
        libraryHaskellDepends = [ base network network-uri split ];
        description = "WHOIS client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wholepixels" = callPackage
@@ -273291,8 +256650,6 @@ self: {
          random-fu random-shuffle random-source relude temporary time
        ];
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "why3" = callPackage
@@ -273311,8 +256668,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Haskell support for the Why3 input format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wide-word" = callPackage
@@ -273398,8 +256753,6 @@ self: {
        ];
        description = "Wikipedia EPUB E-Book construction from Firefox history";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wild-bind" = callPackage
@@ -273434,8 +256787,6 @@ self: {
        ];
        description = "Graphical indicator for WildBind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wild-bind-task-x11" = callPackage
@@ -273452,8 +256803,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Task to install and export everything you need to use WildBind in X11";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wild-bind-x11" = callPackage
@@ -273512,8 +256861,6 @@ self: {
        librarySystemDepends = [ dnsapi ];
        description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {dnsapi = null;};
 
   "windowslive" = callPackage
@@ -273531,8 +256878,6 @@ self: {
        ];
        description = "Implements Windows Live Web Authentication and Delegated Authentication";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "winerror" = callPackage
@@ -273544,8 +256889,6 @@ self: {
        doHaddock = false;
        description = "Error handling for foreign calls to the Windows API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "winery" = callPackage
@@ -273583,8 +256926,6 @@ self: {
        ];
        description = "A compact, well-typed seralisation format for Haskell values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "winio" = callPackage
@@ -273601,8 +256942,6 @@ self: {
        librarySystemDepends = [ kernel32 ws2_32 ];
        description = "I/O library for Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {kernel32 = null; ws2_32 = null;};
 
   "wire-streams" = callPackage
@@ -273645,8 +256984,6 @@ self: {
        ];
        description = "Functional reactive programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wiring" = callPackage
@@ -273663,8 +257000,6 @@ self: {
        ];
        description = "Wiring, promotion and demotion of types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wiringPi" = callPackage
@@ -273839,8 +257174,6 @@ self: {
        executableHaskellDepends = [ base bytestring network unix ];
        description = "A network server to show bottlenecks of GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wizard" = callPackage
@@ -273887,8 +257220,6 @@ self: {
        ];
        description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wkt-geom" = callPackage
@@ -273912,8 +257243,6 @@ self: {
        ];
        description = "A parser of WKT, WKB and eWKB";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wl-pprint" = callPackage
@@ -273957,8 +257286,6 @@ self: {
        ];
        description = "ANSI Terminal support with wl-pprint-extras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wl-pprint-console" = callPackage
@@ -273993,8 +257320,6 @@ self: {
        ];
        description = "A free monad based on the Wadler/Leijen pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wl-pprint-terminfo" = callPackage
@@ -274012,8 +257337,6 @@ self: {
        ];
        description = "A color pretty printer with terminfo support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wl-pprint-text" = callPackage
@@ -274043,8 +257366,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {wlc = null;};
 
   "wobsurv" = callPackage
@@ -274080,8 +257401,6 @@ self: {
        ];
        description = "A simple and highly performant HTTP file server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "woe" = callPackage
@@ -274093,8 +257412,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Convenient typeclass for defining arbitrary-index enums";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "woffex" = callPackage
@@ -274110,8 +257427,6 @@ self: {
        ];
        description = "Web Open Font Format (WOFF) unpacker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wol" = callPackage
@@ -274126,8 +257441,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Send a Wake on LAN Magic Packet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wolf" = callPackage
@@ -274150,8 +257463,6 @@ self: {
        executableHaskellDepends = [ base optparse-generic ];
        description = "Amazon Simple Workflow Service Wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "woot" = callPackage
@@ -274266,8 +257577,6 @@ self: {
        ];
        description = "Reading word2vec binary models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "word8" = callPackage
@@ -274359,8 +257668,6 @@ self: {
          unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wordlist" = callPackage
@@ -274399,8 +257706,6 @@ self: {
        doHaddock = false;
        description = "arbitrary bit size Words";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wordpass" = callPackage
@@ -274423,8 +257728,6 @@ self: {
        ];
        description = "Dictionary-based password generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wordpress-auth" = callPackage
@@ -274469,8 +257772,6 @@ self: {
        executableHaskellDepends = [ base containers fclabels ];
        description = "A word search solver library and executable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wordsetdiff" = callPackage
@@ -274503,8 +257804,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A library for parsing a chat-based work hour reporting scheme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "workdays" = callPackage
@@ -274517,8 +257816,6 @@ self: {
        testHaskellDepends = [ base containers doctest hspec ];
        description = "Workday calculations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "workflow-extra" = callPackage
@@ -274541,8 +257838,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "workflow-osx" = callPackage
@@ -274562,8 +257857,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "a \"Desktop Workflow\" monad with Objective-C bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "workflow-pure" = callPackage
@@ -274586,8 +257879,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "manipulate `workflow-types:Workflow`'s";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "workflow-types" = callPackage
@@ -274606,8 +257897,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Automate keyboard\\/mouse\\/clipboard\\/application interaction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "workflow-windows" = callPackage
@@ -274622,8 +257911,6 @@ self: {
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        description = "Automate keyboard/mouse/clipboard/application interaction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "world-peace" = callPackage
@@ -274666,8 +257953,6 @@ self: {
        ];
        description = "Subscribe to a wiki's RSS feed and archive external links";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wrap" = callPackage
@@ -274710,8 +257995,6 @@ self: {
        ];
        description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wrecker" = callPackage
@@ -274750,8 +258033,6 @@ self: {
        ];
        description = "An HTTP Performance Benchmarker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wrecker-ui" = callPackage
@@ -274784,8 +258065,6 @@ self: {
        ];
        description = "A web interface for Wrecker, the HTTP Performance Benchmarker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wreq" = callPackage
@@ -274879,8 +258158,6 @@ self: {
        ];
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wreq-sb" = callPackage
@@ -274918,8 +258195,6 @@ self: {
        ];
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wreq-stringless" = callPackage
@@ -274948,8 +258223,6 @@ self: {
        ];
        description = "Colour space transformations and metrics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "write-buffer-core" = callPackage
@@ -275010,8 +258283,6 @@ self: {
        ];
        description = "WriteT and RWST monad transformers (Reexport with all dependencies)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "writer-cps-lens" = callPackage
@@ -275028,8 +258299,6 @@ self: {
        ];
        description = "Lens instances for the stricter CPS WriterT and RWST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "writer-cps-monads-tf" = callPackage
@@ -275045,8 +258314,6 @@ self: {
        ];
        description = "MonadWriter orphan instances for writer-cps-transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "writer-cps-morph" = callPackage
@@ -275060,8 +258327,6 @@ self: {
        libraryHaskellDepends = [ base mmorph writer-cps-transformers ];
        description = "MFunctor instance for CPS style WriterT and RWST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "writer-cps-mtl" = callPackage
@@ -275124,8 +258389,6 @@ self: {
        ];
        description = "A simple CLI utility for interacting with a websocket";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ws-chans" = callPackage
@@ -275167,8 +258430,6 @@ self: {
        ];
        description = "WSDL parsing in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wsedit" = callPackage
@@ -275186,8 +258447,6 @@ self: {
        ];
        description = "A small tool to list, add and remove webseeds from a torrent file";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wshterm" = callPackage
@@ -275207,8 +258466,6 @@ self: {
        ];
        description = "Terminal emulator over websockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wsjtx-udp" = callPackage
@@ -275245,8 +258502,6 @@ self: {
        testHaskellDepends = [ base bytestring envy hspec skews text ];
        description = "A-little-higher-level WebSocket client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wstunnel" = callPackage
@@ -275275,8 +258530,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wtk" = callPackage
@@ -275288,8 +258541,6 @@ self: {
        libraryHaskellDepends = [ base old-locale time transformers ];
        description = "Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wtk-gtk" = callPackage
@@ -275305,8 +258556,6 @@ self: {
        ];
        description = "GTK tools within Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wu-wei" = callPackage
@@ -275322,8 +258571,6 @@ self: {
        ];
        description = "Unimportant Unix adminstration tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wumpus-basic" = callPackage
@@ -275339,8 +258586,6 @@ self: {
        ];
        description = "Basic objects and system code built on Wumpus-Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wumpus-core" = callPackage
@@ -275354,8 +258599,6 @@ self: {
        libraryHaskellDepends = [ base containers time vector-space ];
        description = "Pure Haskell PostScript and SVG generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wumpus-drawing" = callPackage
@@ -275371,8 +258614,6 @@ self: {
        ];
        description = "High-level drawing objects built on Wumpus-Basic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wumpus-microprint" = callPackage
@@ -275388,8 +258629,6 @@ self: {
        ];
        description = "Microprints - \"greek-text\" pictures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wumpus-tree" = callPackage
@@ -275406,8 +258645,6 @@ self: {
        ];
        description = "Drawing trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wuss" = callPackage
@@ -275449,8 +258686,6 @@ self: {
        executableHaskellDepends = [ base directory random wx wxcore ];
        description = "Try to avoid the asteroids with your space ship";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wxFruit" = callPackage
@@ -275465,8 +258700,6 @@ self: {
        executableHaskellDepends = [ base wx wxcore Yampa ];
        description = "An implementation of Fruit using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wxSimpleCanvas" = callPackage
@@ -275478,8 +258711,6 @@ self: {
        libraryHaskellDepends = [ base cubicbezier wx wxcore ];
        description = "Simple zoomable canvas for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wxc" = callPackage
@@ -275542,8 +258773,6 @@ self: {
        ];
        description = "helper tool for building wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wxhnotepad" = callPackage
@@ -275558,8 +258787,6 @@ self: {
        executableHaskellDepends = [ base wx wxcore ];
        description = "An example of how to implement a basic notepad with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wxturtle" = callPackage
@@ -275575,8 +258802,6 @@ self: {
        ];
        description = "turtle like LOGO with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wybor" = callPackage
@@ -275616,8 +258841,6 @@ self: {
        ];
        description = "An autoresponder for Dragon Go Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "x-dsp" = callPackage
@@ -275634,8 +258857,6 @@ self: {
        ];
        description = "A embedded DSL for manipulating DSP languages in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "x11-xim" = callPackage
@@ -275778,8 +258999,6 @@ self: {
        ];
        description = "Runtime code generation for x86 64 bit machine code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xattr" = callPackage
@@ -275870,8 +259089,6 @@ self: {
        ];
        description = "XChat";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xcp" = callPackage
@@ -275887,8 +259104,6 @@ self: {
        ];
        description = "Partial implementation of the XCP protocol with ethernet as transport layer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xdcc" = callPackage
@@ -275914,8 +259129,6 @@ self: {
        ];
        description = "A wget-like utility for retrieving files from XDCC bots on IRC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xdg-basedir" = callPackage
@@ -275977,8 +259190,6 @@ self: {
        ];
        description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xeno" = callPackage
@@ -276014,8 +259225,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal mtl network ];
        description = "Xenstore client access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xfconf" = callPackage
@@ -276036,8 +259245,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libxfconf = null;};
 
   "xformat" = callPackage
@@ -276050,8 +259257,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Extensible, type-safe formatting with scanf- and printf-like functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xgboost-haskell" = callPackage
@@ -276082,8 +259287,6 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xhb" = callPackage
@@ -276100,8 +259303,6 @@ self: {
        ];
        description = "X Haskell Bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xhb-atom-cache" = callPackage
@@ -276117,8 +259318,6 @@ self: {
        ];
        description = "Atom cache for XHB";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xhb-ewmh" = callPackage
@@ -276135,8 +259334,6 @@ self: {
        ];
        description = "EWMH utilities for XHB";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xhtml_3000_2_2_1" = callPackage
@@ -276179,8 +259376,6 @@ self: {
        executableHaskellDepends = [ base directory process ];
        description = "The Lava system for Xilinx FPGA design with layout combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xine" = callPackage
@@ -276195,8 +259390,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to xine-lib";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libxine = null; xine = null;};
 
   "xing-api" = callPackage
@@ -276220,8 +259413,6 @@ self: {
        ];
        description = "Wrapper for the XING API, v1";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xinput-conduit" = callPackage
@@ -276261,8 +259452,6 @@ self: {
        benchmarkHaskellDepends = [ base random time vector ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
@@ -276282,8 +259471,6 @@ self: {
        ];
        description = "Downloads the most recent xkcd comic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xleb" = callPackage
@@ -276299,8 +259486,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl xml ];
        description = "A simple monadic language for parsing XML structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xls" = callPackage
@@ -276322,8 +259507,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xlsior" = callPackage
@@ -276347,8 +259530,6 @@ self: {
        ];
        description = "Streaming Excel file generation and parsing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xlsx" = callPackage
@@ -276377,8 +259558,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xlsx-tabular" = callPackage
@@ -276395,8 +259574,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Xlsx table cell value extraction utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xlsx-templater" = callPackage
@@ -276415,8 +259592,6 @@ self: {
        ];
        description = "Simple and incomplete Excel file templater";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml" = callPackage
@@ -276462,8 +259637,6 @@ self: {
        ];
        description = "Parse XML catalog files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-conduit_1_7_1_2" = callPackage
@@ -276554,8 +259727,6 @@ self: {
        ];
        description = "Historical cursors & decoding on top of xml-conduit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-conduit-parse" = callPackage
@@ -276598,8 +259769,6 @@ self: {
        ];
        description = "Bridge between xml-conduit/html-conduit and stylist";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-conduit-writer" = callPackage
@@ -276639,8 +259808,6 @@ self: {
        ];
        description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-enumerator-combinators" = callPackage
@@ -276658,8 +259825,6 @@ self: {
        ];
        description = "Parser combinators for xml-enumerator and compatible XML parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-extractors" = callPackage
@@ -276671,8 +259836,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers xml ];
        description = "Extension to the xml package to extract data from parsed xml";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-hamlet" = callPackage
@@ -276722,8 +259885,6 @@ self: {
        ];
        description = "Optics for xml-conduit and html-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-html-qq" = callPackage
@@ -276819,8 +259980,6 @@ self: {
        ];
        description = "Monadic extensions to the xml package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-parsec" = callPackage
@@ -276832,8 +259991,6 @@ self: {
        libraryHaskellDepends = [ base HaXml parsec ];
        description = "Parsing XML with Parsec";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-picklers" = callPackage
@@ -276862,8 +260019,6 @@ self: {
        libraryHaskellDepends = [ base bytestring papillon simple-pipe ];
        description = "XML parser which uses simple-pipe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-prettify" = callPackage
@@ -276878,8 +260033,6 @@ self: {
        executableHaskellDepends = [ base cmdargs unix ];
        description = "Pretty print XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-push" = callPackage
@@ -276900,8 +260053,6 @@ self: {
        ];
        description = "Push XML from/to client to/from server over XMPP or HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-query" = callPackage
@@ -276913,8 +260064,6 @@ self: {
        libraryHaskellDepends = [ base-prelude free text ];
        description = "A parser-agnostic declarative API for querying XML-documents";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-query-xml-conduit" = callPackage
@@ -276931,8 +260080,6 @@ self: {
        ];
        description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-query-xml-types" = callPackage
@@ -276956,8 +260103,6 @@ self: {
        ];
        description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-to-json" = callPackage
@@ -277014,8 +260159,6 @@ self: {
        ];
        description = "Typed XML encoding for an xml-conduit backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-tydom-core" = callPackage
@@ -277027,8 +260170,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl QuickCheck text ];
        description = "Typed XML encoding (core library)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-types" = callPackage
@@ -277080,8 +260221,6 @@ self: {
        ];
        description = "translate xml to json";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml2x" = callPackage
@@ -277100,8 +260239,6 @@ self: {
        ];
        description = "Convert BLAST output in XML format to CSV or HTML";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmlbf" = callPackage
@@ -277233,8 +260370,6 @@ self: {
        ];
        description = "Show tv channels in the terminal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmms2-client" = callPackage
@@ -277251,8 +260386,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmms2-client-glib" = callPackage
@@ -277265,8 +260398,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library — GLib integration";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmobar" = callPackage
@@ -277360,8 +260491,6 @@ self: {
        ];
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmonad-contrib" = callPackage
@@ -277400,8 +260529,6 @@ self: {
        ];
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmonad-contrib-gpl" = callPackage
@@ -277413,8 +260540,6 @@ self: {
        libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ];
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmonad-dbus" = callPackage
@@ -277429,8 +260554,6 @@ self: {
        executableHaskellDepends = [ base dbus utf8-string ];
        testHaskellDepends = [ base dbus utf8-string ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmonad-entryhelper" = callPackage
@@ -277463,8 +260586,6 @@ self: {
        ];
        description = "Module for evaluation Haskell expressions in the running xmonad instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmonad-extras" = callPackage
@@ -277542,8 +260663,6 @@ self: {
        testHaskellDepends = [ base hspec xmonad ];
        description = "Custom xmonad, which builds with stack or cabal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmonad-volume" = callPackage
@@ -277589,8 +260708,6 @@ self: {
        ];
        description = "A library to automatically put named windows into the DynamicLog";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmpipe" = callPackage
@@ -277607,8 +260724,6 @@ self: {
        ];
        description = "XMPP implementation using simple-PIPE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xor" = callPackage
@@ -277629,8 +260744,6 @@ self: {
        ];
        description = "Efficient XOR masking";
        license = stdenv.lib.licenses.gpl2Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xorshift" = callPackage
@@ -277660,8 +260773,6 @@ self: {
        ];
        description = "Simple implementation of xorshift+ PRNG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xosd" = callPackage
@@ -277691,8 +260802,6 @@ self: {
        ];
        description = "text builder for xournal file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xournal-convert" = callPackage
@@ -277714,8 +260823,6 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "convert utility for xoj files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xournal-parser" = callPackage
@@ -277735,8 +260842,6 @@ self: {
        ];
        description = "Xournal file parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xournal-render" = callPackage
@@ -277754,8 +260859,6 @@ self: {
        ];
        description = "Xournal file renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xournal-types" = callPackage
@@ -277773,8 +260876,6 @@ self: {
        ];
        description = "Data types for programs for xournal file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xpathdsv" = callPackage
@@ -277851,8 +260952,6 @@ self: {
        ];
        description = "Cluster EST sequences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xsd" = callPackage
@@ -277869,8 +260968,6 @@ self: {
        ];
        description = "XML Schema data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xsha1" = callPackage
@@ -277894,8 +260991,6 @@ self: {
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {xslt = null;};
 
   "xss-sanitize" = callPackage
@@ -277928,8 +261023,6 @@ self: {
        libraryHaskellDepends = [ base wx wxcore ];
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xtest" = callPackage
@@ -277974,8 +261067,6 @@ self: {
        ];
        description = "A Haskell implementation of the xxHash algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xxhash-ffi" = callPackage
@@ -278012,8 +261103,6 @@ self: {
        ];
        description = "#plaimi's all-encompassing bot";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yabi" = callPackage
@@ -278047,8 +261136,6 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Yet Another Brainfuck Interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yackage" = callPackage
@@ -278072,8 +261159,6 @@ self: {
        ];
        description = "Personal Hackage replacement for testing new packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yahoo-finance-api" = callPackage
@@ -278095,8 +261180,6 @@ self: {
        ];
        description = "Read quotes from Yahoo Finance API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yahoo-finance-conduit" = callPackage
@@ -278112,8 +261195,6 @@ self: {
        ];
        description = "Streaming aproach to the yahoo finance api";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yahoo-web-search" = callPackage
@@ -278125,8 +261206,6 @@ self: {
        libraryHaskellDepends = [ base HTTP network xml ];
        description = "Yahoo Web Search Services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yajl" = callPackage
@@ -278140,8 +261219,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) yajl;};
 
   "yajl-enumerator" = callPackage
@@ -278157,8 +261234,6 @@ self: {
        ];
        description = "Enumerator-based interface to YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yak" = callPackage
@@ -278186,8 +261261,6 @@ self: {
        libraryHaskellDepends = [ base categories transformers ];
        description = "Lenses with a southern twang";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam" = callPackage
@@ -278221,8 +261294,6 @@ self: {
        ];
        description = "A wrapper of servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-app" = callPackage
@@ -278262,8 +261333,6 @@ self: {
        ];
        description = "Yam Configuation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-datasource" = callPackage
@@ -278281,8 +261350,6 @@ self: {
        ];
        description = "Yam DataSource Middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-job" = callPackage
@@ -278308,8 +261375,6 @@ self: {
        ];
        description = "Yam Logger";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-redis" = callPackage
@@ -278326,8 +261391,6 @@ self: {
        ];
        description = "Yam Redis Middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-servant" = callPackage
@@ -278344,8 +261407,6 @@ self: {
          servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-transaction" = callPackage
@@ -278366,8 +261427,6 @@ self: {
        ];
        description = "Yam transaction";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-transaction-odbc" = callPackage
@@ -278380,8 +261439,6 @@ self: {
          base containers persistent-odbc yam-app
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-transaction-postgresql" = callPackage
@@ -278396,8 +261453,6 @@ self: {
          base containers persistent-postgresql unliftio-core yam-app
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-web" = callPackage
@@ -278427,8 +261482,6 @@ self: {
        ];
        description = "Yam Web";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yamemo" = callPackage
@@ -278548,8 +261601,6 @@ self: {
        testHaskellDepends = [ base hspec microlens-platform rio ];
        description = "Extra functionality for pretty printing Yaml documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaml-rpc" = callPackage
@@ -278568,8 +261619,6 @@ self: {
        ];
        description = "Simple library for network (HTTP REST-like) YAML RPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaml-rpc-scotty" = callPackage
@@ -278586,8 +261635,6 @@ self: {
        ];
        description = "Scotty server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaml-rpc-snap" = callPackage
@@ -278604,8 +261651,6 @@ self: {
        ];
        description = "Snap server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaml-union" = callPackage
@@ -278659,8 +261704,6 @@ self: {
        ];
        description = "Flexible declarative YAML parsing toolkit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaml2owl" = callPackage
@@ -278739,8 +261782,6 @@ self: {
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
        description = "blank-canvas frontend for Yampa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yampa-glfw" = callPackage
@@ -278758,8 +261799,6 @@ self: {
        ];
        description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yampa-gloss" = callPackage
@@ -278773,8 +261812,6 @@ self: {
        libraryHaskellDepends = [ base gloss Yampa ];
        description = "A GLOSS backend for Yampa";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yampa-glut" = callPackage
@@ -278792,8 +261829,6 @@ self: {
        ];
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yampa-sdl2" = callPackage
@@ -278812,8 +261847,6 @@ self: {
        ];
        description = "Yampa and SDL2 made easy";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yampa-test" = callPackage
@@ -278832,8 +261865,6 @@ self: {
        ];
        description = "Testing library for Yampa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yampa2048" = callPackage
@@ -278847,8 +261878,6 @@ self: {
        executableHaskellDepends = [ base gloss random Yampa ];
        description = "2048 game clone using Yampa/Gloss";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yandex-translate" = callPackage
@@ -278866,8 +261895,6 @@ self: {
        ];
        description = "Bindings to Yandex translate API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaop" = callPackage
@@ -278881,8 +261908,6 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Yet another option parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yap" = callPackage
@@ -278894,8 +261919,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "yet another prelude - a simplistic refactoring with algebraic classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yapb" = callPackage
@@ -278989,8 +262012,6 @@ self: {
        ];
        description = "Yet another array library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yarr-image-io" = callPackage
@@ -279003,8 +262024,6 @@ self: {
        librarySystemDepends = [ libdevil ];
        description = "Image IO for Yarr library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "yate" = callPackage
@@ -279043,8 +262062,6 @@ self: {
        executableHaskellDepends = [ base Cabal directory process ];
        description = "yet another visual editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaya" = callPackage
@@ -279091,8 +262108,6 @@ self: {
        ];
        description = "Test suites for `yaya`";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaya-unsafe" = callPackage
@@ -279124,8 +262139,6 @@ self: {
        ];
        description = "Test suites for `yaya-unsafe`";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ycextra" = callPackage
@@ -279140,8 +262153,6 @@ self: {
        ];
        description = "Additional utilities to work with Yhc Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yeamer" = callPackage
@@ -279179,8 +262190,6 @@ self: {
        ];
        description = "Yesod-based server for interactive presentation slides";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yeganesh" = callPackage
@@ -279224,8 +262233,6 @@ self: {
        ];
        description = "A Yeller Client For Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yes-precure5-command" = callPackage
@@ -279258,8 +262265,6 @@ self: {
        libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ];
        description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yeshql-core" = callPackage
@@ -279279,8 +262284,6 @@ self: {
        ];
        description = "YesQL-style SQL database abstraction (core)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yeshql-hdbc" = callPackage
@@ -279301,8 +262304,6 @@ self: {
        ];
        description = "YesQL-style SQL database abstraction (HDBC backend)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yeshql-postgresql-simple" = callPackage
@@ -279324,8 +262325,6 @@ self: {
        ];
        description = "YesQL-style SQL database abstraction (postgresql-simple backend)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod_1_4_5" = callPackage
@@ -279402,8 +262401,6 @@ self: {
        ];
        description = "Angular JS integratoin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-angular-ui" = callPackage
@@ -279423,8 +262420,6 @@ self: {
        ];
        description = "Angular Helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-articles" = callPackage
@@ -279447,8 +262442,6 @@ self: {
        ];
        description = "Automatically generate article previews for a yesod site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth" = callPackage
@@ -279499,8 +262492,6 @@ self: {
        ];
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-account-fork" = callPackage
@@ -279525,8 +262516,6 @@ self: {
        ];
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-basic" = callPackage
@@ -279544,8 +262533,6 @@ self: {
        testHaskellDepends = [ base hspec text yesod yesod-test ];
        description = "Yesod Middleware for HTTP Basic Authentication";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-bcrypt" = callPackage
@@ -279562,8 +262549,6 @@ self: {
        ];
        description = "BCrypt salted and hashed passwords in a database as auth for yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-bcryptdb" = callPackage
@@ -279580,8 +262565,6 @@ self: {
        ];
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-deskcom" = callPackage
@@ -279603,8 +262586,6 @@ self: {
        ];
        description = "Desk.com remote authentication support for Yesod apps.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-fb" = callPackage
@@ -279622,8 +262603,6 @@ self: {
        ];
        description = "Authentication backend for Yesod using Facebook";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-hashdb" = callPackage
@@ -279667,8 +262646,6 @@ self: {
        ];
        description = "An account authentication plugin for yesod with encrypted token transfer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-kerberos" = callPackage
@@ -279686,8 +262663,6 @@ self: {
        ];
        description = "Kerberos Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-ldap" = callPackage
@@ -279704,8 +262679,6 @@ self: {
        ];
        description = "LDAP Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-ldap-mediocre" = callPackage
@@ -279721,8 +262694,6 @@ self: {
        ];
        description = "Very simlple LDAP auth for yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-ldap-native" = callPackage
@@ -279740,8 +262711,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Yesod LDAP authentication plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-lti13" = callPackage
@@ -279764,8 +262733,6 @@ self: {
        ];
        description = "A yesod-auth plugin for LTI 1.3";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-nopassword" = callPackage
@@ -279782,8 +262749,6 @@ self: {
        ];
        description = "A plugin for Yesod to provide email-only authentication";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-oauth" = callPackage
@@ -279822,8 +262787,6 @@ self: {
        testHaskellDepends = [ base hspec uri-bytestring ];
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-pam" = callPackage
@@ -279839,8 +262802,6 @@ self: {
        ];
        description = "Provides PAM authentication module";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-smbclient" = callPackage
@@ -279857,8 +262818,6 @@ self: {
        ];
        description = "Authentication plugin for Yesod using smbclient";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-zendesk" = callPackage
@@ -279877,8 +262836,6 @@ self: {
        ];
        description = "Zendesk remote authentication support for Yesod apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-bin" = callPackage
@@ -279922,8 +262879,6 @@ self: {
        ];
        description = "Bootstrap widgets for yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-colonnade" = callPackage
@@ -279942,8 +262897,6 @@ self: {
        ];
        description = "Helper functions for using yesod with colonnade";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-comments" = callPackage
@@ -279962,8 +262915,6 @@ self: {
        ];
        description = "A generic comments interface for a Yesod application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-content-pdf" = callPackage
@@ -279985,8 +262936,6 @@ self: {
        ];
        description = "PDF Content Type for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-continuations" = callPackage
@@ -280005,8 +262954,6 @@ self: {
        ];
        description = "Continuations for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-core_1_4_37_3" = callPackage
@@ -280106,8 +263053,6 @@ self: {
        ];
        description = "Generic administrative CRUD operations as a Yesod subsite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-crud-persist" = callPackage
@@ -280126,8 +263071,6 @@ self: {
        ];
        description = "Flexible CRUD subsite usable with Yesod and Persistent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-csp" = callPackage
@@ -280175,8 +263118,6 @@ self: {
        ];
        description = "Yesod plugin for DataTables (jQuery grid plugin)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-default" = callPackage
@@ -280214,8 +263155,6 @@ self: {
        ];
        description = "DSL for generating Yesod subsite to manage an RDBMS;";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-elements" = callPackage
@@ -280267,8 +263206,6 @@ self: {
        executableSystemDepends = [ sqlite ];
        description = "Example programs using the Yesod Web Framework. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "yesod-fast-devel" = callPackage
@@ -280290,8 +263227,6 @@ self: {
        ];
        description = "Fast live-reloading for yesod applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-fay" = callPackage
@@ -280311,8 +263246,6 @@ self: {
        ];
        description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-fb" = callPackage
@@ -280329,8 +263262,6 @@ self: {
        ];
        description = "Useful glue functions between the fb library and Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-filter" = callPackage
@@ -280484,8 +263415,6 @@ self: {
        ];
        description = "Various rich-text WYSIWYG editors for Yesod forms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-gitrepo" = callPackage
@@ -280517,8 +263446,6 @@ self: {
        testHaskellDepends = [ base yesod-core ];
        description = "A subsite for displaying git information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-goodies" = callPackage
@@ -280535,8 +263462,6 @@ self: {
        ];
        description = "A collection of various small helpers useful in any yesod application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-ip" = callPackage
@@ -280555,8 +263480,6 @@ self: {
        ];
        description = "Code for using the ip package with yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-job-queue" = callPackage
@@ -280578,8 +263501,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Background jobs library for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-json" = callPackage
@@ -280602,8 +263523,6 @@ self: {
        libraryHaskellDepends = [ base text yesod-core ];
        description = "A typeclass which simplifies creating link widgets throughout your site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-lucid" = callPackage
@@ -280615,8 +263534,6 @@ self: {
        libraryHaskellDepends = [ base lucid monads-tf text yesod-core ];
        description = "Lucid support for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-mangopay" = callPackage
@@ -280636,8 +263553,6 @@ self: {
        ];
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-markdown" = callPackage
@@ -280656,8 +263571,6 @@ self: {
        testHaskellDepends = [ base blaze-html hspec text ];
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-media-simple" = callPackage
@@ -280725,8 +263638,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell yesod ];
        description = "Pagination for Yesod sites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-pagination" = callPackage
@@ -280745,8 +263656,6 @@ self: {
        ];
        description = "Pagination in Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-paginator" = callPackage
@@ -280783,8 +263692,6 @@ self: {
        ];
        description = "Yesod plugin to use PayPal with the paypal-rest-client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-persistent_1_4_3" = callPackage
@@ -280897,8 +263804,6 @@ self: {
        ];
        description = "Meta package for Yesod (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-pnotify" = callPackage
@@ -280919,8 +263824,6 @@ self: {
        ];
        description = "Yet another getMessage/setMessage using pnotify jquery plugins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-pure" = callPackage
@@ -280932,8 +263835,6 @@ self: {
        libraryHaskellDepends = [ base fast-logger text yesod yesod-core ];
        description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-purescript" = callPackage
@@ -280953,8 +263854,6 @@ self: {
        ];
        description = "PureScript integration for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-raml" = callPackage
@@ -280978,8 +263877,6 @@ self: {
        ];
        description = "RAML style route definitions for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-raml-bin" = callPackage
@@ -281002,8 +263899,6 @@ self: {
        ];
        description = "The raml helper executable";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-raml-docs" = callPackage
@@ -281020,8 +263915,6 @@ self: {
        ];
        description = "A html documentation generator library for RAML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-raml-mock" = callPackage
@@ -281045,8 +263938,6 @@ self: {
        ];
        description = "A mock-handler generator library from RAML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-recaptcha" = callPackage
@@ -281065,8 +263956,6 @@ self: {
        ];
        description = "Dead simple support for reCAPTCHA on Yesod applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-recaptcha2" = callPackage
@@ -281103,8 +263992,6 @@ self: {
        ];
        description = "Efficient routing for Yesod. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-routes-flow" = callPackage
@@ -281121,8 +264008,6 @@ self: {
        ];
        description = "Generate Flow routes for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-routes-typescript" = callPackage
@@ -281139,8 +264024,6 @@ self: {
        ];
        description = "generate TypeScript routes for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-rst" = callPackage
@@ -281157,8 +264040,6 @@ self: {
        ];
        description = "Tools for using reStructuredText (RST) in a yesod application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-s3" = callPackage
@@ -281175,8 +264056,6 @@ self: {
        ];
        description = "Simple Helper Library for using Amazon's Simple Storage Service (S3) with Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-sass" = callPackage
@@ -281193,8 +264072,6 @@ self: {
        ];
        description = "A simple quasiquoter to include sass code in yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-session-redis" = callPackage
@@ -281212,8 +264089,6 @@ self: {
        ];
        description = "Redis-Powered Sessions for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-sitemap" = callPackage
@@ -281323,8 +264198,6 @@ self: {
        ];
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-static-remote" = callPackage
@@ -281341,8 +264214,6 @@ self: {
        ];
        testHaskellDepends = [ base yesod-static ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-table" = callPackage
@@ -281442,8 +264313,6 @@ self: {
        ];
        description = "Utility functions for testing JSON web services written in Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-text-markdown" = callPackage
@@ -281476,8 +264345,6 @@ self: {
        ];
        description = "Provides main functions using warp-tls for yesod projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-transloadit" = callPackage
@@ -281522,8 +264389,6 @@ self: {
        ];
        description = "Simple CRUD classes for easy view creation for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-websockets" = callPackage
@@ -281571,8 +264436,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yet-another-logger" = callPackage
@@ -281603,8 +264466,6 @@ self: {
        ];
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yggdrasil" = callPackage
@@ -281621,8 +264482,6 @@ self: {
        testHaskellDepends = [ base cryptonite hspec QuickCheck ];
        description = "Executable specifications of composable cryptographic protocols";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yhccore" = callPackage
@@ -281634,8 +264493,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl pretty uniplate ];
        description = "Yhc's Internal Core language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yhseq" = callPackage
@@ -281676,8 +264533,6 @@ self: {
        ];
        description = "Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-contrib" = callPackage
@@ -281696,8 +264551,6 @@ self: {
        ];
        description = "Add-ons to Yi, the Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-core" = callPackage
@@ -281728,8 +264581,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq yi-rope ];
        description = "Yi editor core library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-dynamic-configuration" = callPackage
@@ -281746,8 +264597,6 @@ self: {
        ];
        description = "Dynamic configuration support for Yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-emacs-colours" = callPackage
@@ -281759,8 +264608,6 @@ self: {
        libraryHaskellDepends = [ base containers split yi-language ];
        description = "Simple mapping from colour names used in emacs to Color";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-frontend-pango" = callPackage
@@ -281780,8 +264627,6 @@ self: {
        ];
        description = "Pango frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-frontend-vty" = callPackage
@@ -281799,8 +264644,6 @@ self: {
        ];
        description = "Vty frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-fuzzy-open" = callPackage
@@ -281819,8 +264662,6 @@ self: {
        ];
        description = "Fuzzy open plugin for yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-gtk" = callPackage
@@ -281848,8 +264689,6 @@ self: {
        ];
        description = "Yi editor incremental reader";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-keymap-cua" = callPackage
@@ -281865,8 +264704,6 @@ self: {
        ];
        description = "Cua keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-keymap-emacs" = callPackage
@@ -281884,8 +264721,6 @@ self: {
        ];
        description = "Emacs keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-keymap-vim" = callPackage
@@ -281912,8 +264747,6 @@ self: {
        ];
        description = "Vim keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-language" = callPackage
@@ -281941,8 +264774,6 @@ self: {
        ];
        description = "Collection of language-related Yi libraries";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-misc-modes" = callPackage
@@ -281960,8 +264791,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor miscellaneous modes";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-mode-haskell" = callPackage
@@ -281979,8 +264808,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor haskell mode";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-mode-javascript" = callPackage
@@ -281999,8 +264826,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor javascript mode";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-monokai" = callPackage
@@ -282012,8 +264837,6 @@ self: {
        libraryHaskellDepends = [ base yi ];
        description = "Monokai colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-rope" = callPackage
@@ -282053,8 +264876,6 @@ self: {
        ];
        description = "Snippet support for yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-solarized" = callPackage
@@ -282066,8 +264887,6 @@ self: {
        libraryHaskellDepends = [ base yi ];
        description = "Solarized colour theme for the Yi text editor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-spolsky" = callPackage
@@ -282079,8 +264898,6 @@ self: {
        libraryHaskellDepends = [ base yi ];
        description = "Spolsky colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-vty" = callPackage
@@ -282104,8 +264921,6 @@ self: {
        libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yices-easy" = callPackage
@@ -282178,8 +264993,6 @@ self: {
        executableHaskellDepends = [ hsConfigure ];
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yjftp-libs" = callPackage
@@ -282193,8 +265006,6 @@ self: {
        libraryHaskellDepends = [ base directory ftphs mtl process unix ];
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yjsvg" = callPackage
@@ -282257,8 +265068,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Parser combinators for young padawans";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yoga" = callPackage
@@ -282291,8 +265100,6 @@ self: {
        ];
        description = "Generic Programming with Disbanded Data Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "york-lava" = callPackage
@@ -282304,8 +265111,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 ];
        description = "A library for digital circuit description";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "youtube" = callPackage
@@ -282346,8 +265151,6 @@ self: {
        ];
        description = "A YQL engine to execute Open Data Tables";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yst" = callPackage
@@ -282370,8 +265173,6 @@ self: {
        ];
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yu-auth" = callPackage
@@ -282386,8 +265187,6 @@ self: {
        testHaskellDepends = [ base MonadRandom random yu-utils ];
        description = "Auth module for Yu";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yu-core" = callPackage
@@ -282400,8 +265199,6 @@ self: {
        testHaskellDepends = [ base blaze-markup hspec yu-utils ];
        description = "The core of Yu";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yu-launch" = callPackage
@@ -282417,8 +265214,6 @@ self: {
        ];
        description = "The launcher for Yu";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yu-tool" = callPackage
@@ -282436,8 +265231,6 @@ self: {
        ];
        description = "Tool for Yu";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yu-utils" = callPackage
@@ -282461,8 +265254,6 @@ self: {
        ];
        description = "Utils for Yu";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yuiGrid" = callPackage
@@ -282498,8 +265289,6 @@ self: {
        ];
        description = "A transcendental HTML parser gently wrapping the HXT library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yx" = callPackage
@@ -282550,8 +265339,6 @@ self: {
        ];
        description = "Utilities for reading and writing Alteryx .yxdb files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "z3" = callPackage
@@ -282581,8 +265368,6 @@ self: {
        testHaskellDepends = [ base containers hspec z3 ];
        description = "High-level assertion encoding to Z3 solver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "z85" = callPackage
@@ -282606,8 +265391,6 @@ self: {
        ];
        description = "Implementation of the z85 binary codec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zabt" = callPackage
@@ -282620,8 +265403,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Simple-minded abstract binding trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zalgo" = callPackage
@@ -282651,8 +265432,6 @@ self: {
        ];
        description = "A tool for checking how much work is done on group projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zasni-gerna" = callPackage
@@ -282677,8 +265456,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "zbar bindings in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zbar;};
 
   "zcache" = callPackage
@@ -282773,8 +265550,6 @@ self: {
        ];
        description = "Zendesk API for Haskell programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zenhack-prelude" = callPackage
@@ -282788,8 +265563,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "@zenhack's personal custom prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeno" = callPackage
@@ -282809,8 +265582,6 @@ self: {
        ];
        description = "An automated proof system for Haskell programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeolite-lang" = callPackage
@@ -282867,8 +265638,6 @@ self: {
        testToolDepends = [ purescript ];
        description = "Zephyr, tree-shaking for the PureScript language";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zero" = callPackage
@@ -282901,8 +265670,6 @@ self: {
        ];
        description = "Post to 0bin services";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeromq-haskell" = callPackage
@@ -282921,8 +265688,6 @@ self: {
        ];
        description = "Bindings to ZeroMQ 2.1.x";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq3-conduit" = callPackage
@@ -282939,8 +265704,6 @@ self: {
        ];
        description = "Conduit bindings for zeromq3-haskell";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeromq3-haskell" = callPackage
@@ -282963,8 +265726,6 @@ self: {
        ];
        description = "Bindings to ZeroMQ 3.x";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq4-clone-pattern" = callPackage
@@ -282991,8 +265752,6 @@ self: {
        ];
        description = "Haskell implementation of the ZeroMQ clone pattern";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeromq4-conduit" = callPackage
@@ -283011,8 +265770,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Conduit wrapper around zeromq4-haskell";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeromq4-haskell" = callPackage
@@ -283057,8 +265814,6 @@ self: {
        ];
        description = "Haskell implementation of several ZeroMQ patterns";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeromq4-simple" = callPackage
@@ -283097,8 +265852,6 @@ self: {
        ];
        description = "ZeroTH - remove unnecessary TH dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zettelkast" = callPackage
@@ -283123,8 +265876,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Command-line utility for working with zettelkast files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter" = callPackage
@@ -283148,8 +265899,6 @@ self: {
        ];
        description = "zifter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter-cabal" = callPackage
@@ -283165,8 +265914,6 @@ self: {
        ];
        description = "zifter-cabal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter-git" = callPackage
@@ -283178,8 +265925,6 @@ self: {
        libraryHaskellDepends = [ base path process zifter ];
        description = "zifter-git";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter-google-java-format" = callPackage
@@ -283195,8 +265940,6 @@ self: {
        ];
        description = "zifter-google-java-format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter-hindent" = callPackage
@@ -283212,8 +265955,6 @@ self: {
        ];
        description = "zifter-hindent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter-hlint" = callPackage
@@ -283228,8 +265969,6 @@ self: {
        ];
        description = "zifter-hlint";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter-stack" = callPackage
@@ -283249,8 +265988,6 @@ self: {
        ];
        description = "zifter-stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zigbee-znet25" = callPackage
@@ -283267,8 +266004,6 @@ self: {
        testHaskellDepends = [ base bytestring mtl QuickCheck random ];
        description = "XBee ZNet 2.5 (ZigBee) wireless modem communications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zim-parser" = callPackage
@@ -283411,8 +266146,6 @@ self: {
        ];
        description = "Working with zip archives via conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zip-stream" = callPackage
@@ -283449,8 +266182,6 @@ self: {
        libraryHaskellDepends = [ base directory mtl process ];
        description = "Create simple list editor interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zipkin" = callPackage
@@ -283466,8 +266197,6 @@ self: {
        ];
        description = "Zipkin-style request tracing monad";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zipper" = callPackage
@@ -283479,8 +266208,6 @@ self: {
        libraryHaskellDepends = [ base multirec ];
        description = "Generic zipper for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zipper-extra" = callPackage
@@ -283526,8 +266253,6 @@ self: {
        libraryHaskellDepends = [ base mtl yall ];
        description = "A simple lens-based, generic, heterogenous, type-checked zipper library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ziptastic-client" = callPackage
@@ -283549,8 +266274,6 @@ self: {
        ];
        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;
-       broken = true;
      }) {};
 
   "ziptastic-core" = callPackage
@@ -283570,8 +266293,6 @@ self: {
        ];
        description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zlib" = callPackage
@@ -283632,8 +266353,6 @@ self: {
        ];
        description = "Enumerator interface for zlib compression";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zlib-lens" = callPackage
@@ -283667,8 +266386,6 @@ self: {
        ];
        description = "Language independent, reproducible, absolute types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zmcat" = callPackage
@@ -283683,8 +266400,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Command-line tool for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zmidi-core" = callPackage
@@ -283713,8 +266428,6 @@ self: {
        ];
        description = "Representing MIDI a simple score";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zmqat" = callPackage
@@ -283744,8 +266457,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "ZoneInfo library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zoom" = callPackage
@@ -283764,8 +266475,6 @@ self: {
        ];
        description = "A rake/thor-like task runner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zoom-cache" = callPackage
@@ -283797,8 +266506,6 @@ self: {
        ];
        description = "A streamable, seekable, zoomable cache file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zoom-cache-pcm" = callPackage
@@ -283815,8 +266522,6 @@ self: {
        ];
        description = "Library for zoom-cache PCM audio codecs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zoom-cache-sndfile" = callPackage
@@ -283836,8 +266541,6 @@ self: {
        ];
        description = "Tools for generating zoom-cache-pcm files";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zoom-refs" = callPackage
@@ -283849,8 +266552,6 @@ self: {
        libraryHaskellDepends = [ base lens stm ];
        description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zot" = callPackage
@@ -283929,8 +266630,6 @@ self: {
        executableHaskellDepends = [ base directory filepath mtl ];
        description = "Ascii bars representing battery status";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zstd" = callPackage
@@ -283965,8 +266664,6 @@ self: {
        testHaskellDepends = [ base containers mtl multiset ];
        description = "Automated theorem prover for the Zsyntax biochemical calculus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ztail" = callPackage
@@ -283987,8 +266684,6 @@ self: {
        ];
        description = "Multi-file, colored, filtered log tailer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ztar" = callPackage
@@ -284010,8 +266705,6 @@ self: {
        ];
        description = "Creating and extracting arbitrary archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zuramaru" = callPackage
@@ -284050,8 +266743,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A lisp processor, An inline-lisp, in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zxcvbn-c" = callPackage
@@ -284081,8 +266772,6 @@ self: {
        ];
        description = "Password strength estimation based on zxcvbn";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zxcvbn-hs" = callPackage

From 35b28deeb8a4f4a1386779d2143bc8b1a5110ab7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Nov 2020 02:30:25 +0100
Subject: [PATCH 3085/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-27-g11a103b from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/6bc2827ce8c1b5790eb264bcacf123b8418e4ad8.
---
 .../haskell-modules/hackage-packages.nix      | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 927335918979..90f1e3f27fe4 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -49370,6 +49370,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "charter" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , http-types, MonadRandom, mtl, one-liner, process, random
+     , scientific, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "charter";
+       version = "0.1.1.1";
+       sha256 = "04yspisrm08364j5i5q2xi0p8lhhhn3dk7l85z4fb9jl4d1ypk2q";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring containers http-types mtl one-liner
+         process scientific text wai warp
+       ];
+       executableHaskellDepends = [
+         aeson async base bytestring containers http-types MonadRandom mtl
+         one-liner process random scientific text wai warp
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring containers http-types mtl one-liner
+         process scientific text wai warp
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "chaselev-deque" = callPackage
     ({ mkDerivation, abstract-deque, abstract-deque-tests, array
      , atomic-primops, base, containers, ghc-prim, HUnit, test-framework
@@ -187509,8 +187536,8 @@ self: {
     ({ mkDerivation, base, containers, polysemy, polysemy-zoo }:
      mkDerivation {
        pname = "polysemy-extra";
-       version = "0.1.4.0";
-       sha256 = "1lv5zw3wwgyxnsa3c1cfgpqaqj1w4ybph5r8hqr2h7xxaa6wajsx";
+       version = "0.1.6.1";
+       sha256 = "1x588nsfnfjwzgcpngj5cm4pb27x5shpvy7yzgkvzihcy1nw0vz5";
        libraryHaskellDepends = [ base containers polysemy polysemy-zoo ];
        description = "Extra Input and Output functions for polysemy..";
        license = stdenv.lib.licenses.mit;
@@ -187600,8 +187627,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-methodology";
-       version = "0.1.6.0";
-       sha256 = "0wsl39hznf6wpq4yd4n0sz9d5yw36xclyg9mrhifzc04mzn3dbi3";
+       version = "0.1.7.0";
+       sha256 = "1qb2rj2fc7vaf9i0lm9gqzkfy5a8zmsq9ibvhmc4457yd3k7cfcg";
        libraryHaskellDepends = [
          base co-log-polysemy polysemy polysemy-plugin polysemy-zoo
        ];
@@ -187615,8 +187642,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-methodology-composite";
-       version = "0.1.2.0";
-       sha256 = "1gp3jwhhkrbxdmwvcd08x7vphqd99y2zyj81s3ni3249yb3mjcpm";
+       version = "0.1.3.0";
+       sha256 = "034hiwm8qj0i0rhdmybyya4cqnrqk7k0a6ga9c4alyyrdydks60x";
        libraryHaskellDepends = [
          base composite-base polysemy polysemy-extra polysemy-methodology
          polysemy-vinyl vinyl
@@ -187757,8 +187784,8 @@ self: {
     ({ mkDerivation, base, polysemy, polysemy-extra, vinyl }:
      mkDerivation {
        pname = "polysemy-vinyl";
-       version = "0.1.2.0";
-       sha256 = "0cg170avw16cdssirjz5di466z2i5fh3y7whq5cpwc7dqqffxdak";
+       version = "0.1.4.0";
+       sha256 = "1545a125bfgi5314dxhak5dnx9h5kwanzgbp1f88f96hlxik1rjh";
        libraryHaskellDepends = [ base polysemy polysemy-extra vinyl ];
        description = "Functions for mapping vinyl records in polysemy";
        license = stdenv.lib.licenses.mit;

From 8ef164247e32981c5ce29313d79b8cfaad2ef5a4 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 15 Nov 2020 00:48:42 +0100
Subject: [PATCH 3086/3942] haskellPackages: Remove a lot of overrides to fix
 eval errors

---
 .../haskell-modules/configuration-common.nix  | 79 +++++--------------
 .../configuration-ghc-8.10.x.nix              | 12 ---
 2 files changed, 21 insertions(+), 70 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b30875774e77..53f602d140ec 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -232,7 +232,6 @@ self: super: {
   hnix = dontCheck (super.hnix.override {
     # 2020-09-18: Those packages are all needed by hnix at versions newer than on stackage
     neat-interpolation = self.neat-interpolation_0_5_1_2; # at least 0.5.1
-    data-fix = self.data-fix_0_3_0; # at least 0.3
     prettyprinter = self.prettyprinter_1_7_0; # at least 1.7
 
   });
@@ -946,12 +945,7 @@ self: super: {
   # Generate cli completions for dhall.
   dhall = generateOptparseApplicativeCompletion "dhall" super.dhall;
   dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json;
-  dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (
-    super.dhall-nix.overrideScope (self: super: {
-      dhall = super.dhall_1_36_0;
-      repline = self.repline_0_4_0_0;
-      haskeline = self.haskeline_0_8_1_0;
-    }));
+  dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix;
 
   # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
   netrc = doJailbreak super.netrc;
@@ -1292,19 +1286,7 @@ self: super: {
   # https://github.com/kowainik/policeman/issues/57
   policeman = doJailbreak super.policeman;
 
-  # 2020-08-14: gi-pango from stackage is to old for the C libs it links against in nixpkgs.
-  # That's why we need to bump a ton of dependency versions to unbreak them.
-  gi-pango = assert super.gi-pango.version == "1.0.22"; self.gi-pango_1_0_23;
-  haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_4) [ pkgs.gobject-introspection ];
-  haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_5;
-  gi-cairo = assert super.gi-cairo.version == "1.0.23"; self.gi-cairo_1_0_24;
-  gi-glib = assert super.gi-glib.version == "2.0.23"; self.gi-glib_2_0_24;
-  gi-gobject = assert super.gi-gobject.version == "2.0.22"; self.gi-gobject_2_0_24;
-  gi-atk = assert super.gi-atk.version == "2.0.21"; self.gi-atk_2_0_22;
-  gi-gio = assert super.gi-gio.version == "2.0.26"; self.gi-gio_2_0_27;
-  gi-gdk = assert super.gi-gdk.version == "3.0.22"; self.gi-gdk_3_0_23;
-  gi-gtk = assert super.gi-gtk.version == "3.0.33"; self.gi-gtk_3_0_35;
-  gi-gdkpixbuf = assert super.gi-gdkpixbuf.version == "2.0.23"; self.gi-gdkpixbuf_2_0_24;
+  haskell-gi-base = addBuildDepends super.haskell-gi-base [ pkgs.gobject-introspection ];
 
   # 2020-08-14: Needs some manual patching to be compatible with haskell-gi-base 0.24
   # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
@@ -1398,19 +1380,14 @@ self: super: {
   # We want the latest version of Pandoc.
   hslua = doDistribute self.hslua_1_1_2;
   # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
-  pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2);
+  pandoc-citeproc = doJailbreak super.pandoc-citeproc;
 
   # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
   domain-auth = dontCheck super.domain-auth;
 
-  # stack-2.5.1 needs a more current version of pantry to compile
-  pantry = self.pantry_0_5_1_4;
-
   # Too tight version bounds, see https://github.com/haskell-hvr/microaeson/pull/4
   microaeson = doJailbreak super.microaeson;
 
-  autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; };
-
   # - Deps are required during the build for testing and also during execution,
   #   so add them to build input and also wrap the resulting binary so they're in
   #   PATH.
@@ -1436,36 +1413,22 @@ self: super: {
   # quickcheck-instances is only used in the tests of binary-instances.
   binary-instances = dontCheck super.binary-instances;
 
-  # INSERT NEW OVERRIDES ABOVE THIS LINE
-} // (let
-  # fourmolu can‘t compile with an older aeson
-  localOverride = name: value: doDistribute (value.overrideScope (self: super: {
-    aeson = dontCheck super.aeson_1_5_2_0;
+  # tons of overrides for bleeding edge versions for ghcide and hls
+  # overriding aeson on all of them to prevent double compilations
+  # this shouldn‘t break anything because nearly all their reverse deps are
+  # in this list or marked as broken anyways
+  haskell-language-server = dontCheck super.haskell-language-server;
+  fourmolu = dontCheck super.fourmolu;
+  ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch {
+    # 2020-11-13: Bumping bounds via an already upstream merged change
+    # https://github.com/haskell/ghcide/pull/905
+    url = https://github.com/haskell/ghcide/commit/9b8aaf9b06846571cc0b5d46680e686e4f9153a3.patch;
+    sha256 = "0j8980dmvwjcs72ahq2zc14hwkyd5ybgzyy1az3zq5flp383fai6";
+    includes = [ "ghcide.cabal" ];
   }));
-  in pkgs.lib.mapAttrs localOverride {
-    # tons of overrides for bleeding edge versions for ghcide and hls
-    # overriding aeson on all of them to prevent double compilations
-    # this shouldn‘t break anything because nearly all their reverse deps are
-    # in this list or marked as broken anyways
-    haskell-language-server = dontCheck super.haskell-language-server;
-    fourmolu = dontCheck super.fourmolu;
-    ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch {
-      # 2020-11-13: Bumping bounds via an already upstream merged change
-      # https://github.com/haskell/ghcide/pull/905
-      url = https://github.com/haskell/ghcide/commit/9b8aaf9b06846571cc0b5d46680e686e4f9153a3.patch;
-      sha256 = "0j8980dmvwjcs72ahq2zc14hwkyd5ybgzyy1az3zq5flp383fai6";
-      includes = [ "ghcide.cabal" ];
-    }));
-    refinery = super.refinery_0_3_0_0;
-    data-tree-print = doJailbreak super.data-tree-print;
-    ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_3;
-    lsp-test = dontCheck super.lsp-test_0_11_0_7;
-    hls-plugin-api = super.hls-plugin-api;
-    hls-hlint-plugin = super.hls-hlint-plugin;
-    implicit-hie-cradle = super.implicit-hie-cradle;
-    # the hls brittany is objectively better, because there hasn‘t been a
-    # brittany release in a while and this version works with 8.10.
-    # And we need to build it anyways.
-    brittany = dontCheck super.hls-brittany;
-  }
-)  // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
+  data-tree-print = doJailbreak super.data-tree-print;
+  # the hls brittany is objectively better, because there hasn‘t been a
+  # brittany release in a while and this version works with 8.10.
+  # And we need to build it anyways.
+  brittany = dontCheck super.hls-brittany;
+} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index a205c468e6e3..c796b76ab1c8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -62,18 +62,6 @@ self: super: {
   system-fileio = doJailbreak super.system-fileio;
   unliftio-core = doJailbreak super.unliftio-core;
 
-  # Use the latest version to fix the build.
-  optics = self.optics_0_3;
-  optics-extra = self.optics-extra_0_3;
-  optics-th = self.optics-th_0_3_0_2;
-
-  insert-ordered-containers = super.insert-ordered-containers.override {
-    optics-core = self.optics-core_0_3_0_1;
-    optics-extra = self.optics-extra_0_3.override {
-      optics-core = self.optics-core_0_3_0_1;
-    };
-  };
-
   # Jailbreaking because monoidal-containers hasn‘t bumped it's base dependency for 8.10.
   monoidal-containers = doJailbreak super.monoidal-containers;
 

From d444c89dd4f230d5c6ec699635b0e9776b90b39d Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 15 Nov 2020 01:09:30 +0100
Subject: [PATCH 3087/3942] haskellPackages: Remove obsolete packages

All those packages are not needed anymore in nixpkgs
---
 .../haskell-modules/configuration-common.nix  |   15 -
 .../configuration-hackage2nix.yaml            |   64 +-
 .../haskell-modules/configuration-nix.nix     |    1 -
 .../haskell-modules/hackage-packages.nix      | 1243 -----------------
 4 files changed, 1 insertion(+), 1322 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 53f602d140ec..5c016f633f6f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -352,7 +352,6 @@ self: super: {
   nats-queue = dontCheck super.nats-queue;
   netpbm = dontCheck super.netpbm;
   network = dontCheck super.network;
-  network_2_6_3_1 = dontCheck super.network_2_6_3_1;
   network-dbus = dontCheck super.network-dbus;
   notcpp = dontCheck super.notcpp;
   ntp-control = dontCheck super.ntp-control;
@@ -1334,7 +1333,6 @@ self: super: {
      immortal = self.immortal_0_2_2_1;
      dependent-map = self.dependent-map_0_2_4_0;
      dependent-sum = self.dependent-sum_0_4;
-     witherable = self.witherable_0_3_2;
   }) (drv: {
      # version in cabal file is invalid
      version = "1.3.1-beta1";
@@ -1342,17 +1340,6 @@ self: super: {
      preBuild = "export VERSION=1.3.1-beta1";
   }));
 
-  graphql-parser = super.graphql-parser.override {
-     protolude = self.protolude_0_3_0;
-  };
-
-  # Requires repline 0.4 which is the default only for ghc8101, override for the rest
-  zre = super.zre.override {
-    repline = self.repline_0_4_0_0.override {
-      haskeline = self.haskeline_0_8_1_0;
-    };
-  };
-
   # https://github.com/bos/statistics/issues/170
   statistics = dontCheck super.statistics;
 
@@ -1377,8 +1364,6 @@ self: super: {
   liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; };
   Diff_0_3_4 = dontCheck super.Diff_0_3_4;
 
-  # We want the latest version of Pandoc.
-  hslua = doDistribute self.hslua_1_1_2;
   # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
   pandoc-citeproc = doJailbreak super.pandoc-citeproc;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d18388ffb835..719f11a9cf30 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2616,83 +2616,21 @@ default-package-overrides:
   - ztail ==1.2.0.2
 
 extra-packages:
-  - aeson < 0.8                         # newer versions don't work with GHC 7.6.x or earlier
-  - aeson == 1.5.2.0                    # needed for fourmolu 0.1.0.0, but 1.5.3 is to new for our purpose
-  - aeson-pretty < 0.8                  # required by elm compiler
-  - Agda == 2.6.1                       # allows the agdaPackage set to be fixed to this version so that it won't break when another agda version is released.
-  - ansi-terminal == 0.10.3             # required by cabal-plan, and policeman in ghc-8.8.x
-  - 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
   - Cabal == 2.2.*                      # required for jailbreak-cabal etc.
   - Cabal == 2.4.*                      # required for cabal-install etc.
-  - colour < 2.3.4                      # newer versions don't support GHC 7.10.x
-  - conduit >=1.1 && <1.3               # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - conduit-extra >=1.1 && <1.3         # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - containers < 0.5                    # required to build alex with GHC 6.12.3
-  - control-monad-free < 0.6            # newer versions don't compile with anything but GHC 7.8.x
-  - dbus <1                             # for xmonad-0.26
-  - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
   - dhall == 1.29.0                     # required for spago 0.14.0.
   - Diff < 0.4                          # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
-  - doctemplates == 0.8                 # required by pandoc-2.9.x
-  - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
   - ghc-tcplugins-extra ==0.3.2         # required for polysemy-plugin 0.2.5.0
-  - gi-gdk == 3.0.23                    # required for gi-pango 1.0.23
-  - gi-gtk == 3.0.35                    # required for gi-pango 1.0.23
-  - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
-  - haddock == 2.22.*                   # required on GHC 8.0.x
   - haddock == 2.23.*                   # required on GHC < 8.10.x
   - haddock-api == 2.23.*               # required on GHC < 8.10.x
   - haddock-library ==1.7.*             # required by stylish-cabal-0.5.0.0
-  - happy <1.19.6                       # newer versions break Agda
   - happy == 1.19.9                     # for purescript
-  - 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
   - hinotify == 0.3.9                   # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
-  - hoogle == 5.0.14                    # required by hie-hoogle
-  - hslua == 1.1.2                      # required for pandoc 2.10
-  - html-conduit ^>= 1.2                # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - http-conduit ^>= 2.2                # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - inline-c < 0.6                      # required on GHC 8.0.x
-  - inline-c-cpp < 0.2                  # required on GHC 8.0.x
-  - lens-labels == 0.1.*                # required for proto-lens-descriptors
-  - megaparsec >= 7.0.4 && < 8          # required for idris: https://github.com/idris-lang/Idris-dev/issues/4826
-  - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
-  - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
-  - network == 2.6.3.1                  # newer versions don't compile with GHC 7.4.x and below
-  - network == 3.0.*                    # required by network-bsd, HTTP, and many others (2019-04-30)
-  - pantry == 0.2.0.0                   # required by stack-2.1.3.1
-  - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
-  - patience ^>= 0.1                    # required by chell-0.4.x
-  - persistent >=2.5 && <2.8            # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - persistent-sqlite < 2.7             # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - prettyprinter == 1.6.1              # required by ghc 8.8.x, and dhall-1.29.0
-  - primitive == 0.5.1.*                # required to build alex with GHC 6.12.3
-  - QuickCheck < 2                      # required by test-framework-quickcheck and its users
-  - repline == 0.3.*                    # required by dhall-0.32.x
   - resolv == 0.1.1.2                   # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
-  - resourcet ==1.1.*                   # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
-  - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
-  - shelly ==1.8.1                      # ghcjs depends on shelly < 1.9
-  - split < 0.2                         # newer versions don't work with GHC 6.12.3
-  - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
-  - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
-  - vector < 0.10.10                    # newer versions don't work with GHC 6.12.3
-  - xml-conduit ^>= 1.7                 # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - yesod ^>= 1.4                       # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - yesod-core < 1.5                    # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - yesod-form < 1.5                    # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - yesod-persistent < 1.5              # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - yesod-static ^>= 1.5                # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - yesod-test ^>= 1.5                  # pre-lts-11.x versions neeed by git-annex 6.20180227
   - immortal == 0.2.2.1                 # required by Hasura 1.3.1, 2020-08-20
   - dependent-map == 0.2.4.0            # required by Hasura 1.3.1, 2020-08-20
   - dependent-sum == 0.4                # required by Hasura 1.3.1, 2020-08-20
-  - witherable == 0.3.2                 # required by Hasura 1.3.1, 2020-08-20
-  - protolude == 0.3.0                  # required by Hasura 1.3.1, 2020-08-20
-  - optics-core == 0.3.0.1              # required by Hasura 1.3.1, 2020-08-20
-  - base-compat == 0.11.1              # required by Hasura 1.3.1, 2020-08-20
+  - network == 2.6.3.1                  # required by pkgs/games/hedgewars/default.nix, 2020-11-15
 
 package-maintainers:
   peti:
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index f8c7689c57a0..d1e7da50f5e1 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -654,7 +654,6 @@ self: super: builtins.intersectAttrs super {
   # Tests require internet
   http-download = dontCheck super.http-download;
   pantry = dontCheck super.pantry;
-  pantry_0_5_1_4 = dontCheck super.pantry_0_5_1_4;
 
   # gtk2hs-buildtools is listed in setupHaskellDepends, but we
   # need it during the build itself, too.
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 90f1e3f27fe4..29e6bc5b8df2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -727,40 +727,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "Agda_2_6_1" = callPackage
-    ({ mkDerivation, aeson, alex, array, async, base, binary
-     , blaze-html, boxes, bytestring, Cabal, containers, data-hash
-     , deepseq, directory, edit-distance, emacs, equivalence, exceptions
-     , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable
-     , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process
-     , regex-tdfa, split, stm, strict, template-haskell, text, time
-     , unordered-containers, uri-encode, zlib
-     }:
-     mkDerivation {
-       pname = "Agda";
-       version = "2.6.1";
-       sha256 = "0af1nyyscdc4gr4l0k3ayq3rn8qxqkx1b7rh4mw023gkz1m433v7";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal directory filepath process ];
-       libraryHaskellDepends = [
-         aeson array async base binary blaze-html boxes bytestring
-         containers data-hash deepseq directory edit-distance equivalence
-         exceptions filepath geniplate-mirror ghc-compact gitrev hashable
-         hashtables haskeline ieee754 mtl murmur-hash pretty process
-         regex-tdfa split stm strict template-haskell text time
-         unordered-containers uri-encode zlib
-       ];
-       libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [ base directory filepath process ];
-       executableToolDepends = [ emacs ];
-       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" = callPackage
     ({ mkDerivation, aeson, alex, array, async, base, binary
      , blaze-html, boxes, bytestring, Cabal, containers, data-hash
@@ -15130,20 +15096,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "QuickCheck_1_2_0_1" = callPackage
-    ({ mkDerivation, base, random }:
-     mkDerivation {
-       pname = "QuickCheck";
-       version = "1.2.0.1";
-       sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld";
-       revision = "2";
-       editedCabalFile = "1nahg4xzlx3hnw60ybzljka3lag3n0iysgnyppahrsblmryg01lg";
-       libraryHaskellDepends = [ base random ];
-       description = "Automatic testing of Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "QuickCheck" = callPackage
     ({ mkDerivation, base, containers, deepseq, process, random
      , splitmix, template-haskell, transformers
@@ -22335,67 +22287,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_0_7_0_6" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
-     , dlist, ghc-prim, hashable, HUnit, mtl, old-locale, QuickCheck
-     , scientific, syb, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, time
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "aeson";
-       version = "0.7.0.6";
-       sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
-       revision = "1";
-       editedCabalFile = "00fhxw6x58aq2k4frj4nvky4jnagq4p0ylwfwjc3vnfq7lsa31wb";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers deepseq dlist ghc-prim
-         hashable mtl old-locale scientific syb template-haskell text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring containers ghc-prim HUnit QuickCheck
-         template-haskell test-framework test-framework-hunit
-         test-framework-quickcheck2 text time unordered-containers vector
-       ];
-       description = "Fast JSON parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "aeson_1_5_2_0" = callPackage
-    ({ mkDerivation, attoparsec, base, base-compat
-     , base-compat-batteries, base-orphans, base16-bytestring
-     , bytestring, containers, deepseq, Diff, directory, dlist, filepath
-     , generic-deriving, ghc-prim, hashable, hashable-time
-     , integer-logarithms, primitive, QuickCheck, quickcheck-instances
-     , scientific, tagged, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, th-abstraction, these
-     , time, time-compat, unordered-containers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "aeson";
-       version = "1.5.2.0";
-       sha256 = "0awk3dss79mmcxpy147mijnd9icvlnm77bq248ibbbzx9y99hdfd";
-       libraryHaskellDepends = [
-         attoparsec base base-compat-batteries bytestring containers deepseq
-         dlist ghc-prim hashable primitive scientific tagged
-         template-haskell text th-abstraction these time time-compat
-         unordered-containers uuid-types vector
-       ];
-       testHaskellDepends = [
-         attoparsec base base-compat base-orphans base16-bytestring
-         bytestring containers Diff directory dlist filepath
-         generic-deriving ghc-prim hashable hashable-time integer-logarithms
-         QuickCheck quickcheck-instances scientific tagged tasty
-         tasty-golden tasty-hunit tasty-quickcheck template-haskell text
-         these time time-compat unordered-containers uuid-types vector
-       ];
-       description = "Fast JSON parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "aeson" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat
      , base-compat-batteries, base-orphans, base16-bytestring
@@ -22994,27 +22885,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson-pretty_0_7_2" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, cmdargs, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "aeson-pretty";
-       version = "0.7.2";
-       sha256 = "03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring text unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson attoparsec base bytestring cmdargs
-       ];
-       description = "JSON pretty-printing library and command-line tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "aeson-pretty" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , cmdargs, scientific, text, unordered-containers, vector
@@ -34982,18 +34852,6 @@ self: {
        broken = true;
      }) {invalid-cabal-flag-settings = null;};
 
-  "base-compat_0_11_1" = callPackage
-    ({ mkDerivation, base, unix }:
-     mkDerivation {
-       pname = "base-compat";
-       version = "0.11.1";
-       sha256 = "0dkdmyxg8hfjn1zyrp4mahkr90g4y672mlvkj0m1krwkxi11avrm";
-       libraryHaskellDepends = [ base unix ];
-       description = "A compatibility layer for base";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "base-compat" = callPackage
     ({ mkDerivation, base, unix }:
      mkDerivation {
@@ -37263,31 +37121,6 @@ self: {
        license = stdenv.lib.licenses.gpl2Plus;
      }) {};
 
-  "binary_0_7_6_1" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal
-     , containers, criterion, deepseq, directory, filepath, HUnit, mtl
-     , QuickCheck, random, test-framework, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "binary";
-       version = "0.7.6.1";
-       sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg";
-       revision = "3";
-       editedCabalFile = "0j9wsnqs0hymwwnp4n5qsqnz7lwcvblj3xa1b0yg0h8zwfsrfkci";
-       libraryHaskellDepends = [ array base bytestring containers ];
-       testHaskellDepends = [
-         array base bytestring Cabal containers directory filepath HUnit
-         QuickCheck random test-framework test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [
-         array attoparsec base bytestring cereal containers criterion
-         deepseq mtl
-       ];
-       description = "Binary serialisation for Haskell values using lazy ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "binary_0_8_8_0" = callPackage
     ({ mkDerivation, array, attoparsec, base, base-orphans, bytestring
      , Cabal, cereal, containers, criterion, deepseq, directory
@@ -54054,21 +53887,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "colour_2_3_3" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "colour";
-       version = "2.3.3";
-       sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
-       revision = "1";
-       editedCabalFile = "0r0pgrsbk4a3fp9pig7q1d8wrc6cd411gb58qiq3wd5dqw0lbmjk";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base ];
-       description = "A model for human colour/color perception";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "colour" = callPackage
     ({ mkDerivation, base, QuickCheck, random, test-framework
      , test-framework-quickcheck2
@@ -56372,33 +56190,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "conduit_1_2_13_1" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, exceptions
-     , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
-     , mwc-random, primitive, QuickCheck, resourcet, safe, split
-     , transformers, transformers-base, transformers-compat, vector
-     }:
-     mkDerivation {
-       pname = "conduit";
-       version = "1.2.13.1";
-       sha256 = "185kdjmbghpvhsvqxh9c9qsh8y987m1kgdagsbwy6c93nlqvbdkp";
-       libraryHaskellDepends = [
-         base exceptions lifted-base mmorph monad-control mtl primitive
-         resourcet transformers transformers-base transformers-compat
-       ];
-       testHaskellDepends = [
-         base containers exceptions hspec mtl QuickCheck resourcet safe
-         split transformers
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq hspec kan-extensions mwc-random
-         transformers vector
-       ];
-       description = "Streaming data processing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "conduit" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hspec, kan-extensions
@@ -56577,39 +56368,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "conduit-extra_1_2_3_2" = callPackage
-    ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
-     , bytestring-builder, conduit, criterion, directory, exceptions
-     , filepath, hspec, monad-control, network, primitive, process
-     , QuickCheck, resourcet, stm, streaming-commons, text, transformers
-     , transformers-base, typed-process, unliftio-core
-     }:
-     mkDerivation {
-       pname = "conduit-extra";
-       version = "1.2.3.2";
-       sha256 = "1xihl8zrd6jyfnlmsrqshwwqc8176whs5im4jvxvk9038wl6cnqx";
-       revision = "3";
-       editedCabalFile = "0m68hvcmg4wwn12wcczqx1i60i8g2nv95c05abnl8ymq0377c7wi";
-       libraryHaskellDepends = [
-         async attoparsec base blaze-builder bytestring conduit directory
-         exceptions filepath monad-control network primitive process
-         resourcet stm streaming-commons text transformers transformers-base
-         typed-process unliftio-core
-       ];
-       testHaskellDepends = [
-         async attoparsec base blaze-builder bytestring bytestring-builder
-         conduit directory exceptions hspec process QuickCheck resourcet stm
-         streaming-commons text transformers transformers-base
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-builder bytestring bytestring-builder conduit criterion
-         transformers
-       ];
-       description = "Batteries included conduit: adapters for common libraries";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "conduit-extra" = callPackage
     ({ mkDerivation, async, attoparsec, base, bytestring
      , bytestring-builder, conduit, directory, exceptions, filepath
@@ -58073,20 +57831,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "containers_0_4_2_1" = callPackage
-    ({ mkDerivation, array, base, deepseq }:
-     mkDerivation {
-       pname = "containers";
-       version = "0.4.2.1";
-       sha256 = "10xjyxlx6raz5jx17wyw7zqif3bp3xsbzb1756l263g91gd20rsm";
-       revision = "2";
-       editedCabalFile = "1j3hr5gqq14bj0yxaz2nyv106zgqf1s12m90y0sgw7xmw1xpipsc";
-       libraryHaskellDepends = [ array base deepseq ];
-       description = "Assorted concrete container types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "containers_0_6_4_1" = callPackage
     ({ mkDerivation, array, base, deepseq }:
      mkDerivation {
@@ -58651,18 +58395,6 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "control-monad-free_0_5_3" = callPackage
-    ({ mkDerivation, base, deepseq, transformers }:
-     mkDerivation {
-       pname = "control-monad-free";
-       version = "0.5.3";
-       sha256 = "1igwawcdpg8irayjax1xdrlpa9587k1v4y28ib3xfb7yk0xv7vk1";
-       libraryHaskellDepends = [ base deepseq transformers ];
-       description = "Free monads and monad transformers";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "control-monad-free" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -65657,35 +65389,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dbus_0_10_15" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, criterion
-     , deepseq, directory, extra, filepath, libxml-sax, network, parsec
-     , process, QuickCheck, random, resourcet, tasty, tasty-hunit
-     , tasty-quickcheck, text, transformers, unix, vector, xml-types
-     }:
-     mkDerivation {
-       pname = "dbus";
-       version = "0.10.15";
-       sha256 = "1a5sjavq8mfzz4zxpkd9b6jxsvy0kl1rjq2hhy40gcz2qjfnamb4";
-       revision = "2";
-       editedCabalFile = "0v9k4yrpzpkk3k33gp3z8qmv0q6kf0d6xps3ar4d3xs9ybrwvg0c";
-       libraryHaskellDepends = [
-         base bytestring cereal containers deepseq libxml-sax network parsec
-         random text transformers unix vector xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring cereal containers directory extra filepath
-         libxml-sax network parsec process QuickCheck random resourcet tasty
-         tasty-hunit tasty-quickcheck text transformers unix vector
-         xml-types
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       doCheck = false;
-       description = "A client library for the D-Bus IPC system";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "dbus" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, containers
      , criterion, deepseq, directory, exceptions, extra, filepath, lens
@@ -66615,18 +66318,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "deepseq_1_3_0_1" = callPackage
-    ({ mkDerivation, array, base }:
-     mkDerivation {
-       pname = "deepseq";
-       version = "1.3.0.1";
-       sha256 = "068zka6rwprbzpx7yisi1ajsxdly23zaf2vjklx1wp66yypx54lp";
-       libraryHaskellDepends = [ array base ];
-       description = "Deep evaluation of data structures";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "deepseq_1_4_4_0" = callPackage
     ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework
      , test-framework-hunit
@@ -72319,33 +72010,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "doctemplates_0_8" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific
-     , tasty, tasty-golden, tasty-hunit, temporary, text
-     , text-conversions, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "doctemplates";
-       version = "0.8";
-       sha256 = "0zhnhdpbh0cyh6nr655yfik135gssa1qhfhzsvaph2n1qwq1l6nn";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base containers doclayout filepath HsYAML mtl parsec safe
-         scientific text text-conversions unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers doclayout filepath Glob tasty
-         tasty-golden tasty-hunit temporary text
-       ];
-       benchmarkHaskellDepends = [
-         aeson base containers criterion doclayout filepath mtl text
-       ];
-       description = "Pandoc-style document templates";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "doctemplates" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific
@@ -91264,20 +90928,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "generic-deriving_1_10_5" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "generic-deriving";
-       version = "1.10.5";
-       sha256 = "03aghpvgrx38h2q8imv1xhvmjdlfdsxzfvkxdi4xyb5jjsdaz8pn";
-       libraryHaskellDepends = [
-         base containers ghc-prim template-haskell
-       ];
-       description = "Generic programming library for generalised deriving";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "generic-deriving" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
      , template-haskell, th-abstraction
@@ -95074,31 +94724,6 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
-  "gi-gtk_3_0_35" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
-     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
-     , gi-pango, gtk3, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gtk";
-       version = "3.0.35";
-       sha256 = "08z6kc9m7xb24d9z08yy3g66l8i7nircnaiy5i82yfl2l4slvz2w";
-       setupHaskellDepends = [
-         base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib
-         gi-gobject gi-pango haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ gtk3 ];
-       description = "Gtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gtk3;};
-
   "gi-gtk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
@@ -97524,22 +97149,6 @@ self: {
        license = "GPL";
      }) {};
 
-  "gloss_1_9_2_1" = callPackage
-    ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
-     , gloss-rendering, GLUT, OpenGL
-     }:
-     mkDerivation {
-       pname = "gloss";
-       version = "1.9.2.1";
-       sha256 = "1fk7472lw4621gv64fv4mna8z1av15f7d0didpc9r22rdlkpa80l";
-       libraryHaskellDepends = [
-         base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
-       ];
-       description = "Painless 2D vector graphics, animations and simulations";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "gloss" = callPackage
     ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
      , gloss-rendering, GLUT, OpenGL
@@ -105270,23 +104879,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haddock_2_22_0" = callPackage
-    ({ mkDerivation, base, filepath, haddock-api }:
-     mkDerivation {
-       pname = "haddock";
-       version = "2.22.0";
-       sha256 = "1k42z2zh550rl93c8pa9cg2xsanp6wvb031xvan6cmngnplmdib6";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base haddock-api ];
-       testHaskellDepends = [ base filepath ];
-       doCheck = false;
-       preCheck = "unset GHC_PACKAGE_PATH";
-       description = "A documentation-generation tool for Haskell libraries";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "haddock_2_23_1" = callPackage
     ({ mkDerivation, base, filepath, haddock-api }:
      mkDerivation {
@@ -107754,26 +107346,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "happy_1_19_5" = callPackage
-    ({ mkDerivation, array, base, Cabal, containers, directory
-     , filepath, mtl, process
-     }:
-     mkDerivation {
-       pname = "happy";
-       version = "1.19.5";
-       sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32";
-       revision = "2";
-       editedCabalFile = "1dvhv94lzmya938i5crshg9qbx7dxvkyxkhfbqimxkydxn7l2w7w";
-       isLibrary = false;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ array base containers mtl ];
-       testHaskellDepends = [ base process ];
-       description = "Happy is a parser generator for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "happy_1_19_9" = callPackage
     ({ mkDerivation, array, base, Cabal, containers, directory
      , filepath, mtl, process
@@ -109522,18 +109094,6 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "haskell-gi-overloading_0_0" = callPackage
-    ({ mkDerivation }:
-     mkDerivation {
-       pname = "haskell-gi-overloading";
-       version = "0.0";
-       sha256 = "1smz5fr5saw1l129h21qcywyp47mrbf7355kmwkspjh75yl2gix5";
-       doHaddock = false;
-       description = "Overloading support for haskell-gi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "haskell-gi-overloading" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -110219,29 +109779,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-src-exts_1_19_1" = callPackage
-    ({ mkDerivation, array, base, containers, cpphs, directory
-     , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
-     , tasty, tasty-golden, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "haskell-src-exts";
-       version = "1.19.1";
-       sha256 = "0wd93cqzdk1wq8csha8c8sphksi2jb3gr9g8rk3m9mkkfs3b5xgh";
-       revision = "1";
-       editedCabalFile = "120jvvksnzj3dfgxx1774asalw4wn2i507n3lyhfp95k9z1ny5rh";
-       libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
-       libraryToolDepends = [ happy ];
-       testHaskellDepends = [
-         base containers directory filepath mtl pretty-show smallcheck tasty
-         tasty-golden tasty-smallcheck
-       ];
-       doCheck = false;
-       description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "haskell-src-exts" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath
      , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty
@@ -121461,40 +120998,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hoogle_5_0_14" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit
-     , conduit-extra, connection, containers, deepseq, directory, extra
-     , filepath, haskell-src-exts, http-conduit, http-types, js-flot
-     , js-jquery, mmap, network, network-uri, old-locale, process
-     , process-extras, QuickCheck, resourcet, storable-tuple, tar
-     , template-haskell, text, time, transformers, uniplate, utf8-string
-     , vector, wai, wai-logger, warp, warp-tls, zlib
-     }:
-     mkDerivation {
-       pname = "hoogle";
-       version = "5.0.14";
-       sha256 = "1y5vjwp60s35h13bnhjh4ga731m3vz004dbg8w5s7mwnfk5akkz7";
-       revision = "3";
-       editedCabalFile = "14973295rif9gsyaxfrw7y5p59sxnz4znki3jm3bk73y0b3j1l5d";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base binary bytestring cmdargs conduit conduit-extra
-         connection containers deepseq directory extra filepath
-         haskell-src-exts http-conduit http-types js-flot js-jquery mmap
-         network network-uri old-locale process process-extras QuickCheck
-         resourcet storable-tuple tar template-haskell text time
-         transformers uniplate utf8-string vector wai wai-logger warp
-         warp-tls zlib
-       ];
-       executableHaskellDepends = [ base ];
-       testTarget = "--test-option=--no-net";
-       description = "Haskell API Search";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hoogle" = callPackage
     ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup
      , bytestring, cmdargs, conduit, conduit-extra, connection
@@ -125712,29 +125215,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hslua_1_1_2" = callPackage
-    ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3
-     , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit
-     , tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "hslua";
-       version = "1.1.2";
-       sha256 = "1cv4lwr91ckscwm2jksrg29ka1z32974xgkcgmna4ibpyjwkslbl";
-       configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
-       libraryHaskellDepends = [
-         base bytestring containers exceptions mtl text
-       ];
-       librarySystemDepends = [ lua5_3 ];
-       testHaskellDepends = [
-         base bytestring containers exceptions mtl QuickCheck
-         quickcheck-instances tasty tasty-hunit tasty-quickcheck text
-       ];
-       description = "Bindings to Lua, an embeddable scripting language";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) lua5_3;};
-
   "hslua" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3
      , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit
@@ -127981,27 +127461,6 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {};
 
-  "html-conduit_1_2_1_2" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , containers, hspec, HUnit, resourcet, tagstream-conduit, text
-     , transformers, xml-conduit, xml-types
-     }:
-     mkDerivation {
-       pname = "html-conduit";
-       version = "1.2.1.2";
-       sha256 = "172ip4rkn2y3mpzjrj2h3nrmxrf90gcl8ax6dgdhrdjsyg4h8vjk";
-       libraryHaskellDepends = [
-         base bytestring conduit conduit-extra containers resourcet
-         tagstream-conduit text transformers xml-conduit xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec HUnit xml-conduit
-       ];
-       description = "Parse HTML documents using xml-conduit datatypes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "html-conduit" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit
      , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text
@@ -128791,36 +128250,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "http-conduit_2_2_4" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring
-     , case-insensitive, conduit, conduit-extra, connection, cookie
-     , data-default-class, exceptions, hspec, http-client
-     , http-client-tls, http-types, HUnit, lifted-base, monad-control
-     , mtl, network, resourcet, streaming-commons, temporary, text, time
-     , transformers, utf8-string, wai, wai-conduit, warp, warp-tls
-     }:
-     mkDerivation {
-       pname = "http-conduit";
-       version = "2.2.4";
-       sha256 = "1wcl3lpg4v1ylq9j77j9fmf6l9qbmp8dmj3a9829q19q6bbgza7l";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit conduit-extra exceptions http-client
-         http-client-tls http-types lifted-base monad-control mtl resourcet
-         transformers
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive conduit
-         conduit-extra connection cookie data-default-class hspec
-         http-client http-types HUnit lifted-base network resourcet
-         streaming-commons temporary text time transformers utf8-string wai
-         wai-conduit warp warp-tls
-       ];
-       doCheck = false;
-       description = "HTTP client package with conduit interface and HTTPS support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "http-conduit" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, connection, cookie
@@ -135471,35 +134900,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "inline-c_0_5_6_1" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
-     , containers, cryptohash, directory, filepath, hashable, hspec, mtl
-     , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
-     , template-haskell, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "inline-c";
-       version = "0.5.6.1";
-       sha256 = "0kpbwrri9idllwd7gfamghrdrz16zqjphmb3cp5nq160dxz73brd";
-       revision = "1";
-       editedCabalFile = "0q8wxvsi2gycyv98hw910p87633l9azchnn9783vsknbycsi1c64";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base binary bytestring containers cryptohash
-         directory filepath hashable mtl parsec parsers QuickCheck
-         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" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
      , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
@@ -135525,19 +134925,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "inline-c-cpp_0_1_0_0" = callPackage
-    ({ mkDerivation, base, inline-c, template-haskell }:
-     mkDerivation {
-       pname = "inline-c-cpp";
-       version = "0.1.0.0";
-       sha256 = "0iba77p2ncxbg5sb4ks8f3lgp6zdnjhzvrr2ap3yg49is5b9f5rf";
-       libraryHaskellDepends = [ base inline-c template-haskell ];
-       testHaskellDepends = [ base ];
-       description = "Lets you embed C++ code into Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "inline-c-cpp" = callPackage
     ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions
      , template-haskell
@@ -147771,18 +147158,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lens-labels_0_1_0_2" = callPackage
-    ({ mkDerivation, base, ghc-prim }:
-     mkDerivation {
-       pname = "lens-labels";
-       version = "0.1.0.2";
-       sha256 = "11pwdqnjd0gybjrfz79fbd9vdwcimkzqqr91zy6hswlylp42dvq1";
-       libraryHaskellDepends = [ base ghc-prim ];
-       description = "Integration of lenses with OverloadedLabels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "lens-labels" = callPackage
     ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
      mkDerivation {
@@ -158247,27 +157622,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "megaparsec_7_0_5" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , criterion, deepseq, mtl, parser-combinators, scientific, text
-     , transformers, weigh
-     }:
-     mkDerivation {
-       pname = "megaparsec";
-       version = "7.0.5";
-       sha256 = "0bqx1icbmk8s7wmbcdzsgnlh607c7kzg8l80cp02dxr5valjxp7j";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers deepseq mtl
-         parser-combinators scientific text transformers
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq text weigh
-       ];
-       description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, mtl, parser-combinators, scientific, text
@@ -165229,18 +164583,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mtl_2_1_3_1" = callPackage
-    ({ mkDerivation, base, transformers }:
-     mkDerivation {
-       pname = "mtl";
-       version = "2.1.3.1";
-       sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp";
-       libraryHaskellDepends = [ base transformers ];
-       description = "Monad classes, using functional dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "mtl_2_2_2" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -165302,18 +164644,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mtl-prelude_1_0_3" = callPackage
-    ({ mkDerivation, base, mtl, transformers }:
-     mkDerivation {
-       pname = "mtl-prelude";
-       version = "1.0.3";
-       sha256 = "1qr0bwcg9rlj53gbnji969s86qh8laaiibkfy2msziqnp011108x";
-       libraryHaskellDepends = [ base mtl transformers ];
-       description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "mtl-prelude" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -169650,22 +168980,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "network_3_0_1_1" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, directory, hspec
-     , hspec-discover, HUnit
-     }:
-     mkDerivation {
-       pname = "network";
-       version = "3.0.1.1";
-       sha256 = "1xacvl5wf47cz61igb94zf961b9ks0yhr02myxgjf53clm70dg6j";
-       libraryHaskellDepends = [ base bytestring deepseq ];
-       testHaskellDepends = [ base bytestring directory hspec HUnit ];
-       testToolDepends = [ hspec-discover ];
-       description = "Low-level networking interface";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "network" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, hspec
      , hspec-discover, HUnit
@@ -178761,59 +178075,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pantry_0_2_0_0" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
-     , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
-     , containers, contravariant, cryptonite, cryptonite-conduit
-     , deepseq, digest, directory, exceptions, filelock, filepath
-     , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog
-     , hpack, hspec, http-client, http-client-tls, http-conduit
-     , http-download, http-types, integer-gmp, memory, mono-traversable
-     , mtl, network, network-uri, path, path-io, persistent
-     , persistent-sqlite, persistent-template, primitive, QuickCheck
-     , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint
-     , safe, syb, tar-conduit, template-haskell, text, text-metrics
-     , th-lift, th-lift-instances, th-orphans, th-reify-many
-     , th-utilities, time, transformers, unix-compat, unliftio
-     , unordered-containers, vector, yaml, zip-archive
-     }:
-     mkDerivation {
-       pname = "pantry";
-       version = "0.2.0.0";
-       sha256 = "1qp236maks70ah72wmv36fh3xc3di9c6sc2jd1k3f7ha5hcv9n4c";
-       libraryHaskellDepends = [
-         aeson ansi-terminal array base base-orphans base64-bytestring
-         bytestring Cabal conduit conduit-extra containers contravariant
-         cryptonite cryptonite-conduit deepseq digest directory filelock
-         filepath generic-deriving ghc-prim hackage-security hashable hpack
-         http-client http-client-tls http-conduit http-download http-types
-         integer-gmp memory mono-traversable mtl network network-uri path
-         path-io persistent persistent-sqlite persistent-template primitive
-         resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit
-         template-haskell text text-metrics th-lift th-lift-instances
-         th-orphans th-reify-many th-utilities time transformers unix-compat
-         unliftio unordered-containers vector yaml zip-archive
-       ];
-       testHaskellDepends = [
-         aeson ansi-terminal array base base-orphans base64-bytestring
-         bytestring Cabal conduit conduit-extra containers contravariant
-         cryptonite cryptonite-conduit deepseq digest directory exceptions
-         filelock filepath generic-deriving ghc-prim hackage-security
-         hashable hedgehog hpack hspec http-client http-client-tls
-         http-conduit http-download http-types integer-gmp memory
-         mono-traversable mtl network network-uri path path-io persistent
-         persistent-sqlite persistent-template primitive QuickCheck
-         raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb
-         tar-conduit template-haskell text text-metrics th-lift
-         th-lift-instances th-orphans th-reify-many th-utilities time
-         transformers unix-compat unliftio unordered-containers vector yaml
-         zip-archive
-       ];
-       description = "Content addressable Haskell package management";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "pantry" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
      , casa-client, casa-types, conduit, conduit-extra, containers
@@ -179423,18 +178684,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "parallel_3_2_0_3" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq }:
-     mkDerivation {
-       pname = "parallel";
-       version = "3.2.0.3";
-       sha256 = "1kbdzdz9s8jq0xysqgvxx1zvzqlxgj1sk476mciwcn327kpl0fhn";
-       libraryHaskellDepends = [ array base containers deepseq ];
-       description = "Parallel programming library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "parallel" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, ghc-prim }:
      mkDerivation {
@@ -180921,20 +180170,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "patience_0_1_1" = callPackage
-    ({ mkDerivation, base, containers }:
-     mkDerivation {
-       pname = "patience";
-       version = "0.1.1";
-       sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
-       revision = "1";
-       editedCabalFile = "0xj4hypjnhsn5jhs66l9wwhpkn5pbd8xmx7pgcy2ib08cz1087y7";
-       libraryHaskellDepends = [ base containers ];
-       description = "Patience diff and longest increasing subsequence";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "patience" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -182536,42 +181771,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "persistent_2_7_3_1" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , blaze-html, blaze-markup, bytestring, conduit, containers
-     , exceptions, fast-logger, haskell-src-meta, hspec, http-api-data
-     , lifted-base, monad-control, monad-logger, mtl, old-locale
-     , path-pieces, resource-pool, resourcet, scientific, silently
-     , tagged, template-haskell, text, time, transformers
-     , transformers-base, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "persistent";
-       version = "2.7.3.1";
-       sha256 = "1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p";
-       revision = "2";
-       editedCabalFile = "0yccajc9j8vih4slpm28dfz2ib1phalbvg7qci78d6vsz1jjilhp";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-html blaze-markup
-         bytestring conduit containers exceptions fast-logger
-         haskell-src-meta http-api-data lifted-base monad-control
-         monad-logger mtl old-locale path-pieces resource-pool resourcet
-         scientific silently tagged template-haskell text time transformers
-         transformers-base unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-html bytestring
-         conduit containers fast-logger hspec http-api-data lifted-base
-         monad-control monad-logger mtl old-locale path-pieces resource-pool
-         resourcet scientific tagged template-haskell text time transformers
-         unordered-containers vector
-       ];
-       description = "Type-safe, multi-backend data serialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
   "persistent" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, bytestring, conduit, containers, fast-logger, hspec
@@ -183167,37 +182366,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "persistent-sqlite_2_6_4" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , hspec, microlens-th, monad-control, monad-logger, old-locale
-     , persistent, persistent-template, resource-pool, resourcet, sqlite
-     , temporary, text, time, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-sqlite";
-       version = "2.6.4";
-       sha256 = "16mc2ra0hbyyc8ckjlxxc11bpskdymbr8c3g6ih6wzik639xprbm";
-       revision = "1";
-       editedCabalFile = "0ddqbj5j2m99a5xrvb31mcav4nh48y0jcazm1jj3z577gqv4lbdq";
-       configureFlags = [ "-fsystemlib" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring conduit containers microlens-th monad-control
-         monad-logger old-locale persistent resource-pool resourcet text
-         time transformers unordered-containers
-       ];
-       librarySystemDepends = [ sqlite ];
-       testHaskellDepends = [
-         base hspec persistent persistent-template temporary text time
-         transformers
-       ];
-       description = "Backend for the persistent library using sqlite3";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {inherit (pkgs) sqlite;};
-
   "persistent-sqlite" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger
@@ -190957,32 +190125,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "prettyprinter_1_6_1" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring
-     , containers, deepseq, doctest, gauge, mtl, pgp-wordlist
-     , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit
-     , tasty-quickcheck, text, transformers
-     }:
-     mkDerivation {
-       pname = "prettyprinter";
-       version = "1.6.1";
-       sha256 = "10fphxh8lvdaw7i8jyllwmj87w02db92mf99zfw5vddp9mv6b5rz";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [
-         base bytestring doctest pgp-wordlist QuickCheck
-         quickcheck-instances tasty tasty-hunit tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [
-         ansi-wl-pprint base base-compat containers deepseq gauge mtl
-         QuickCheck random text transformers
-       ];
-       description = "A modern, easy to use, well-documented, extensible pretty-printer";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "prettyprinter" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring
      , containers, deepseq, doctest, gauge, mtl, pgp-wordlist
@@ -191307,20 +190449,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) primesieve;};
 
-  "primitive_0_5_1_0" = callPackage
-    ({ mkDerivation, base, ghc-prim }:
-     mkDerivation {
-       pname = "primitive";
-       version = "0.5.1.0";
-       sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8";
-       revision = "1";
-       editedCabalFile = "1v4q1mz08fzagp4xpbw5ifmymlrsw380yccdvhcgqfrl2lrgb2zf";
-       libraryHaskellDepends = [ base ghc-prim ];
-       description = "Primitive memory-related operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "primitive" = callPackage
     ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, QuickCheck
      , quickcheck-classes-base, semigroups, tagged, tasty
@@ -203269,23 +202397,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "repline_0_3_0_0" = callPackage
-    ({ mkDerivation, base, containers, exceptions, haskeline, mtl
-     , process
-     }:
-     mkDerivation {
-       pname = "repline";
-       version = "0.3.0.0";
-       sha256 = "0niihfyggg2qisadg7w49cr5k5qyyynia93iip0ng2bbmzwi88g8";
-       libraryHaskellDepends = [
-         base containers exceptions haskeline mtl process
-       ];
-       testHaskellDepends = [ base containers mtl process ];
-       description = "Haskeline wrapper for GHCi-like REPL interfaces";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "repline" = callPackage
     ({ mkDerivation, base, containers, exceptions, haskeline, mtl
      , process
@@ -203921,27 +203032,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "resourcet_1_1_11" = callPackage
-    ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
-     , mmorph, monad-control, mtl, transformers, transformers-base
-     , transformers-compat, unliftio-core
-     }:
-     mkDerivation {
-       pname = "resourcet";
-       version = "1.1.11";
-       sha256 = "1n94m2c7rxk2bgm8wywrkp9pmqlnv2dl35yaylninzm8xk1xavil";
-       revision = "2";
-       editedCabalFile = "08v09k5i8nr09f1kscq044hzibq6hsykd3v1xr480dp4hljcw5kc";
-       libraryHaskellDepends = [
-         base containers exceptions lifted-base mmorph monad-control mtl
-         transformers transformers-base transformers-compat unliftio-core
-       ];
-       testHaskellDepends = [ base hspec lifted-base transformers ];
-       description = "Deterministic allocation and freeing of scarce resources";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "resourcet" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, mtl
      , primitive, transformers, unliftio-core
@@ -211634,18 +210724,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "seqid_0_1_0" = callPackage
-    ({ mkDerivation, base, transformers }:
-     mkDerivation {
-       pname = "seqid";
-       version = "0.1.0";
-       sha256 = "0q5vs8kravhiq906rrzi5iw5837bb8s6fibycgdracyfwrzvxly0";
-       libraryHaskellDepends = [ base transformers ];
-       description = "Sequence ID production and consumption";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "seqid" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -211657,18 +210735,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "seqid-streams_0_1_0" = callPackage
-    ({ mkDerivation, base, io-streams, seqid }:
-     mkDerivation {
-       pname = "seqid-streams";
-       version = "0.1.0";
-       sha256 = "13g0c76lyl3b4qdznpyr2a3szjb1dch2bsvgyv68br94045fk6d2";
-       libraryHaskellDepends = [ base io-streams seqid ];
-       description = "Sequence ID IO-Streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "seqid-streams" = callPackage
     ({ mkDerivation, base, io-streams, seqid }:
      mkDerivation {
@@ -216422,38 +215488,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "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, unix-compat
-     }:
-     mkDerivation {
-       pname = "shelly";
-       version = "1.8.1";
-       sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y";
-       revision = "1";
-       editedCabalFile = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";
-       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 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 unix-compat
-       ];
-       description = "shell-like (systems) programming in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "shelly" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
@@ -223528,18 +222562,6 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
-  "split_0_1_4_3" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "split";
-       version = "0.1.4.3";
-       sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby";
-       libraryHaskellDepends = [ base ];
-       description = "Combinator library for splitting lists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "split" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -233145,22 +232167,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "tar_0_4_1_0" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, old-time }:
-     mkDerivation {
-       pname = "tar";
-       version = "0.4.1.0";
-       sha256 = "05875pc5ns1fsbl9qgr8sqh29xl4mhvj0pwsa9z4afxv6h6328bm";
-       revision = "1";
-       editedCabalFile = "14ljxvasrda7qafz95gz3m0lpdsh4vvd6j8b3qkr2a2sp7cc0sis";
-       libraryHaskellDepends = [
-         base bytestring directory filepath old-time
-       ];
-       description = "Reading, writing and manipulating \".tar\" archive files.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "tar" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-handle
      , containers, criterion, deepseq, directory, filepath, QuickCheck
@@ -242105,20 +241111,6 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "transformers_0_4_3_0" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "transformers";
-       version = "0.4.3.0";
-       sha256 = "179sbhvc9dghyw58hz80109pbrzgh7vh437227a51jhmx2bsgl5k";
-       revision = "1";
-       editedCabalFile = "1a8708l5frplfs6535kmhwcn93jw69dc6vs2c0vnzzn4x3zzrnk0";
-       libraryHaskellDepends = [ base ];
-       description = "Concrete functor and monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "transformers_0_5_6_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -251038,18 +250030,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector_0_10_9_3" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, primitive }:
-     mkDerivation {
-       pname = "vector";
-       version = "0.10.9.3";
-       sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx";
-       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
-       description = "Efficient Arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "vector" = callPackage
     ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit
      , primitive, QuickCheck, random, semigroups, tasty, tasty-hunit
@@ -257106,26 +256086,6 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "witherable_0_3_2" = callPackage
-    ({ mkDerivation, base, base-orphans, containers, hashable
-     , monoidal-containers, transformers, transformers-compat
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "witherable";
-       version = "0.3.2";
-       sha256 = "1iqf3kc9h599lbiym8rf9b4fhj31lqwm1cxqz6x02q9dxyrcprmi";
-       revision = "1";
-       editedCabalFile = "01mprffm41km3pm5nlpsp2ig2izgl6ll9ylrym3dg01f9609aa0z";
-       libraryHaskellDepends = [
-         base base-orphans containers hashable monoidal-containers
-         transformers transformers-compat unordered-containers vector
-       ];
-       description = "filterable traversable";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "witherable" = callPackage
     ({ mkDerivation, base, base-orphans, containers, hashable, lens
      , monoidal-containers, transformers, transformers-compat
@@ -259666,30 +258626,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "xml-conduit_1_7_1_2" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, conduit, conduit-extra, containers
-     , data-default-class, deepseq, hspec, HUnit, monad-control
-     , resourcet, text, transformers, xml-types
-     }:
-     mkDerivation {
-       pname = "xml-conduit";
-       version = "1.7.1.2";
-       sha256 = "0n4k0rq9j5cc9kdvj9xbx8gmiqlyk5x6pw8yxzw5wfsw7qkych2s";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         conduit conduit-extra containers data-default-class deepseq
-         monad-control resourcet text transformers xml-types
-       ];
-       testHaskellDepends = [
-         base blaze-markup bytestring conduit containers hspec HUnit
-         resourcet text transformers xml-types
-       ];
-       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "xml-conduit_1_8_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
      , bytestring, conduit, conduit-extra, containers
@@ -262354,30 +261290,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "yesod_1_4_5" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , conduit, conduit-extra, data-default-class, directory
-     , fast-logger, monad-control, monad-logger, resourcet, semigroups
-     , shakespeare, streaming-commons, template-haskell, text
-     , transformers, unix, unordered-containers, wai, wai-extra
-     , wai-logger, warp, yaml, yesod-core, yesod-form, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod";
-       version = "1.4.5";
-       sha256 = "1sg66nq8yaas2m5nqsdrxricvcizd1ik02zqk60sxh3wna08fz16";
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring conduit conduit-extra
-         data-default-class directory fast-logger monad-control monad-logger
-         resourcet semigroups shakespeare streaming-commons template-haskell
-         text transformers unix unordered-containers wai wai-extra
-         wai-logger warp yaml yesod-core yesod-form yesod-persistent
-       ];
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "yesod" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit
      , data-default-class, directory, fast-logger, file-embed
@@ -262983,51 +261895,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "yesod-core_1_4_37_3" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
-     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
-     , cereal, clientsession, conduit, conduit-extra, containers, cookie
-     , criterion, data-default, deepseq, deepseq-generics, directory
-     , exceptions, fast-logger, hspec, hspec-expectations, http-types
-     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
-     , network, old-locale, parsec, path-pieces, primitive, QuickCheck
-     , random, resourcet, safe, semigroups, shakespeare
-     , streaming-commons, template-haskell, text, time, transformers
-     , transformers-base, unix-compat, unordered-containers, vector, wai
-     , wai-extra, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       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
-         conduit-extra containers cookie data-default deepseq
-         deepseq-generics directory exceptions fast-logger http-types
-         lifted-base monad-control monad-logger mtl mwc-random old-locale
-         parsec path-pieces primitive random resourcet safe semigroups
-         shakespeare template-haskell text time transformers
-         transformers-base unix-compat unordered-containers vector wai
-         wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base blaze-builder bytestring clientsession conduit
-         conduit-extra containers cookie hspec hspec-expectations http-types
-         HUnit lifted-base mwc-random network path-pieces QuickCheck random
-         resourcet shakespeare streaming-commons template-haskell text
-         transformers wai wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring criterion shakespeare text transformers
-       ];
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "yesod-core" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, bytestring, case-insensitive, cereal, clientsession
@@ -263312,30 +262179,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "yesod-form_1_4_16" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, containers, data-default
-     , email-validate, hspec, network-uri, persistent, resourcet
-     , semigroups, shakespeare, template-haskell, text, time
-     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-form";
-       version = "1.4.16";
-       sha256 = "0lij3m5vn8nvh6y88r1dhk03xmmjwmjzazm307nc2wvc5fmx9p2j";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html blaze-markup
-         byteable bytestring containers data-default email-validate
-         network-uri persistent resourcet semigroups shakespeare
-         template-haskell text time transformers wai xss-sanitize yesod-core
-         yesod-persistent
-       ];
-       testHaskellDepends = [ base hspec text time ];
-       description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "yesod-form" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
@@ -263721,28 +262564,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "yesod-persistent_1_4_3" = callPackage
-    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
-     , persistent-sqlite, persistent-template, resource-pool, resourcet
-     , text, transformers, wai-extra, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-persistent";
-       version = "1.4.3";
-       sha256 = "0kiksw46c8ww9yiwl28pkrppx8d6fhsasr0hvmsliqbrp16likj8";
-       libraryHaskellDepends = [
-         base blaze-builder conduit persistent persistent-template
-         resource-pool resourcet transformers yesod-core
-       ];
-       testHaskellDepends = [
-         base blaze-builder conduit hspec persistent persistent-sqlite text
-         wai-extra yesod-core
-       ];
-       description = "Some helpers for using Persistent from Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "yesod-persistent" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet
@@ -264134,41 +262955,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "yesod-static_1_5_3_1" = callPackage
-    ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , blaze-builder, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptonite, cryptonite-conduit, css-text
-     , data-default, directory, exceptions, file-embed, filepath
-     , hashable, hjsmin, hspec, http-types, HUnit, memory, mime-types
-     , old-time, process, resourcet, template-haskell, text
-     , transformers, unix-compat, unordered-containers, wai
-     , wai-app-static, wai-extra, yesod-core, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-static";
-       version = "1.5.3.1";
-       sha256 = "0drrzg59k0jmbxdf2d7mlk0nr0nvdd8h164638nizjy8713ghjsl";
-       libraryHaskellDepends = [
-         async attoparsec base base64-bytestring blaze-builder byteable
-         bytestring conduit conduit-extra containers cryptonite
-         cryptonite-conduit css-text data-default directory exceptions
-         file-embed filepath hashable hjsmin http-types memory mime-types
-         old-time process resourcet template-haskell text transformers
-         unix-compat unordered-containers wai wai-app-static yesod-core
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring byteable bytestring conduit
-         conduit-extra containers cryptonite cryptonite-conduit data-default
-         directory exceptions file-embed filepath hjsmin hspec http-types
-         HUnit memory mime-types old-time process resourcet template-haskell
-         text transformers unix-compat unordered-containers wai
-         wai-app-static wai-extra yesod-core yesod-test
-       ];
-       description = "Static file serving subsite for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "yesod-static" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, conduit, containers, cryptonite
@@ -264269,35 +263055,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "yesod-test_1_5_9_1" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, containers, cookie
-     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
-     , monad-control, network, persistent, pretty-show, text, time
-     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
-     , yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.5.9.1";
-       sha256 = "05l5n28azbh6r1vsi7xvz1h19if5zrwn1b3jsr2913axfs3d9r3y";
-       revision = "1";
-       editedCabalFile = "1s3rfrk122ag4j0jzmym8nj6iql5jxv6ilsf0671f63824x3kgas";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive containers cookie hspec-core html-conduit
-         http-types HUnit monad-control network persistent pretty-show text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit
-         lifted-base text wai xml-conduit yesod-core yesod-form
-       ];
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "yesod-test" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , bytestring, case-insensitive, conduit, containers, cookie, hspec

From c35a3fb3f72941b3c64420cda2270da4607a5a37 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 15 Nov 2020 02:04:30 +0100
Subject: [PATCH 3088/3942] haskellPackages.aeson: Fix 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 5c016f633f6f..99cd74c5bab9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1416,4 +1416,7 @@ self: super: {
   # brittany release in a while and this version works with 8.10.
   # And we need to build it anyways.
   brittany = dontCheck super.hls-brittany;
+
+  # 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing
+  aeson = dontCheck super.aeson;
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 464b6435bd25851b550d1c14b0430c80a17bb267 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Nov 2020 02:30:30 +0100
Subject: [PATCH 3089/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-27-g11a103b from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/7a6de11f7776bdec63788d1a4ae40e08fb5c50e1.
---
 .../haskell-modules/hackage-packages.nix      | 257 ++++++++++++++----
 1 file changed, 206 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 29e6bc5b8df2..04636ba6693d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -15115,14 +15115,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "QuickCheck_2_14_1" = callPackage
+  "QuickCheck_2_14_2" = callPackage
     ({ mkDerivation, base, containers, deepseq, process, random
      , splitmix, template-haskell, transformers
      }:
      mkDerivation {
        pname = "QuickCheck";
-       version = "2.14.1";
-       sha256 = "0ms71pphgihmqsvh4v88xd99n8xg3nlz1wxxxcf2vgns32mcbz63";
+       version = "2.14.2";
+       sha256 = "1wrnrm9sq4s0bly0q58y80g4153q45iglqa34xsi2q3bd62nqyyq";
        libraryHaskellDepends = [
          base containers deepseq random splitmix template-haskell
          transformers
@@ -31163,8 +31163,8 @@ self: {
     ({ mkDerivation, async, base, process, text }:
      mkDerivation {
        pname = "aspell-pipe";
-       version = "0.4";
-       sha256 = "0vwav0xdrsb9kww7p1z63wifxd5bfd247vdqscf2amkdgm5k716m";
+       version = "0.5";
+       sha256 = "19qgw7nwbbkw1p40ljmjgbb00i44nmqy41m2bcs74w076izz51mf";
        libraryHaskellDepends = [ async base process text ];
        description = "Pipe-based interface to the Aspell program";
        license = stdenv.lib.licenses.bsd3;
@@ -42022,6 +42022,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "brick_0_57_1" = callPackage
+    ({ mkDerivation, base, bytestring, config-ini, containers
+     , contravariant, data-clist, deepseq, directory, dlist, exceptions
+     , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
+     , template-haskell, text, text-zipper, transformers, unix, vector
+     , vty, word-wrap
+     }:
+     mkDerivation {
+       pname = "brick";
+       version = "0.57.1";
+       sha256 = "0amqh0xjgylndz0wp23r5m7w8m7j280dyf1j1mybmmb93s8yz269";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring config-ini containers contravariant data-clist
+         deepseq directory dlist exceptions filepath microlens microlens-mtl
+         microlens-th stm template-haskell text text-zipper transformers
+         unix vector vty word-wrap
+       ];
+       testHaskellDepends = [
+         base containers microlens QuickCheck vector
+       ];
+       description = "A declarative terminal user interface library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "brick-dropdownmenu" = callPackage
     ({ mkDerivation, base, brick, containers, microlens, microlens-ghc
      , microlens-th, pointedlist, vector, vty
@@ -43510,8 +43537,8 @@ self: {
      }:
      mkDerivation {
        pname = "byte-count-reader";
-       version = "0.10.1.1";
-       sha256 = "0amzhcy60rmiyfp7cgdg7g1xcf7z5zz43kg18i1bwwj565ipb6p8";
+       version = "0.10.1.2";
+       sha256 = "11mzz8ahjlqq910s27wggk0vz9bjqxkyqs7lk8kr20cpx0by26s1";
        libraryHaskellDepends = [ base extra parsec parsec-numbers text ];
        testHaskellDepends = [
          base extra hspec parsec parsec-numbers text
@@ -60032,14 +60059,15 @@ self: {
 
   "crdt-event-fold" = callPackage
     ({ mkDerivation, base, binary, containers, data-default-class
-     , data-dword, hspec
+     , data-dword, hspec, mtl, transformers
      }:
      mkDerivation {
        pname = "crdt-event-fold";
-       version = "1.2.0.0";
-       sha256 = "0ald9rjynck8a0x2vicq4kq6hji2jyh0n78ghf49gh70swik5hsc";
+       version = "1.2.1.1";
+       sha256 = "0qwc72j2v3kdvh3iq6vn0anwicpqpx59in6q9yvc5jbk4f24zpl2";
        libraryHaskellDepends = [
-         base binary containers data-default-class data-dword
+         base binary containers data-default-class data-dword mtl
+         transformers
        ];
        testHaskellDepends = [ base hspec ];
        description = "Garbage collected event folding CRDT";
@@ -60272,6 +60300,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "criterion_1_5_8_0" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
+     , base-compat-batteries, binary, binary-orphans, bytestring
+     , cassava, code-page, containers, criterion-measurement, deepseq
+     , directory, exceptions, filepath, Glob, HUnit, js-chart
+     , microstache, mtl, mwc-random, optparse-applicative, parsec
+     , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck
+     , text, time, transformers, transformers-compat, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "criterion";
+       version = "1.5.8.0";
+       sha256 = "1qy9b1frdl5c8n9c6ayp5a93ynzmp85ffqznvdbgrq2f5aqj26vl";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint base base-compat-batteries binary
+         binary-orphans bytestring cassava code-page containers
+         criterion-measurement deepseq directory exceptions filepath Glob
+         js-chart microstache mtl mwc-random optparse-applicative parsec
+         statistics text time transformers transformers-compat vector
+         vector-algorithms
+       ];
+       executableHaskellDepends = [
+         base base-compat-batteries optparse-applicative
+       ];
+       testHaskellDepends = [
+         aeson base base-compat base-compat-batteries bytestring deepseq
+         directory HUnit QuickCheck statistics tasty tasty-hunit
+         tasty-quickcheck vector
+       ];
+       description = "Robust, reliable performance measurement and analysis";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "criterion-compare" = callPackage
     ({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams
      , clay, colour, containers, data-default, filepath, lens, lucid
@@ -85005,14 +85071,14 @@ self: {
      , containers, criterion, directory, filepath, hedgehog, hspec
      , hspec-core, hspec-expectations-pretty-diff, hspec-megaparsec
      , http-client, http-types, HUnit, hw-hspec-hedgehog, megaparsec
-     , mono-traversable, mtl, parser-combinators, process
+     , mono-traversable, mtl, parser-combinators, pretty-simple, process
      , raw-strings-qq, scientific, template-haskell, text
      , text-manipulate, th-pprint, utf8-string, vector
      }:
      mkDerivation {
        pname = "flatbuffers";
-       version = "0.2.0.0";
-       sha256 = "02d270qkrlwn2x0aiasrf614jdirngswxcs30dawpc1zap56bf7r";
+       version = "0.3.0.0";
+       sha256 = "1mryx9xivy8bqv43dz3m92cq5ivk445g49cszk143arg4wqgw8kn";
        libraryHaskellDepends = [
          base binary bytestring containers directory filepath megaparsec
          mono-traversable mtl parser-combinators scientific template-haskell
@@ -85022,9 +85088,9 @@ self: {
          aeson aeson-pretty base binary bytestring containers directory
          filepath hedgehog hspec hspec-core hspec-expectations-pretty-diff
          hspec-megaparsec http-client http-types HUnit hw-hspec-hedgehog
-         megaparsec mono-traversable mtl parser-combinators process
-         raw-strings-qq scientific template-haskell text text-manipulate
-         th-pprint utf8-string
+         megaparsec mono-traversable mtl parser-combinators pretty-simple
+         process raw-strings-qq scientific template-haskell text
+         text-manipulate th-pprint utf8-string
        ];
        benchmarkHaskellDepends = [
          aeson base binary bytestring containers criterion directory
@@ -105722,21 +105788,28 @@ self: {
      }) {};
 
   "hakyll-convert" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cmdargs, containers
-     , data-default, directory, feed, filepath, hakyll, text, time, xml
+    ({ mkDerivation, base, bytestring, cmdargs, containers
+     , data-default, directory, feed, filepath, tasty
+     , tasty-expected-failure, tasty-golden, tasty-hunit
+     , tasty-quickcheck, temporary, text, time, xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "hakyll-convert";
-       version = "0.2.0.0";
-       sha256 = "0p4qxpspmm6b5cdq0jjx56yidwi82mrzq3zv7diryvbcbb6smzi7";
+       version = "0.3.0.2";
+       sha256 = "19jihf6hkn11bn1s44kjmi4szjw68f1brmh1n7py5s7f01235djv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary bytestring containers data-default feed filepath hakyll
-         text time xml
+         base bytestring containers data-default directory feed filepath
+         text time xml-conduit xml-types
        ];
        executableHaskellDepends = [
-         base bytestring cmdargs directory feed filepath text time xml
+         base cmdargs filepath text xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring data-default directory feed filepath tasty
+         tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
+         temporary text time xml-types
        ];
        description = "Convert from other blog engines to Hakyll";
        license = stdenv.lib.licenses.bsd3;
@@ -105809,8 +105882,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-filestore";
-       version = "0.1.7";
-       sha256 = "1xwx58dpwzvl4nk92k357bwxl88wvngkicj4d266gmxmq6j4pg52";
+       version = "0.1.8";
+       sha256 = "02lza2nkq2y2m9zb03ipmgd0cnfjv38cyym7jbakg7v8arkymcrc";
        libraryHaskellDepends = [
          base filestore hakyll time time-locale-compat
        ];
@@ -107838,8 +107911,8 @@ self: {
      }:
      mkDerivation {
        pname = "hascard";
-       version = "0.4.0.0";
-       sha256 = "1rkcnpv22bfiyzmfdk82531yv6mh6g7imjch9qy8sxda2d73fdm7";
+       version = "0.5.0.0";
+       sha256 = "1lic3s5z3rq2m3hpf9626k8k3a8vrx267afavzvzcngkfdl3bfap";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116099,6 +116172,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hexpat-streamparser" = callPackage
+    ({ mkDerivation, base, bytestring, hexpat, List, mtl
+     , parser-combinators, text, transformers
+     }:
+     mkDerivation {
+       pname = "hexpat-streamparser";
+       version = "0.0.1";
+       sha256 = "09klv9if55rlhjrh7cw68kk9z3mrwm1p2agb7a23j8a68iga5gvi";
+       libraryHaskellDepends = [
+         base bytestring hexpat List mtl parser-combinators text
+         transformers
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hexpat-tagsoup" = callPackage
     ({ mkDerivation, base, hexpat, tagsoup }:
      mkDerivation {
@@ -137215,6 +137303,19 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "isbn_1_1_0_2" = callPackage
+    ({ mkDerivation, base, hspec, text }:
+     mkDerivation {
+       pname = "isbn";
+       version = "1.1.0.2";
+       sha256 = "0gvygq19skhjx946nyahyvkm4j60s9fj1jcdzi9435apmjpra32j";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base hspec text ];
+       description = "ISBN Validation and Manipulation";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "isdicom" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
      , template-haskell
@@ -138313,15 +138414,15 @@ self: {
      }) {};
 
   "jalaali" = callPackage
-    ({ mkDerivation, base, deepseq, time }:
+    ({ mkDerivation, base, deepseq, hspec, time }:
      mkDerivation {
        pname = "jalaali";
-       version = "0.2.0";
-       sha256 = "025ryrz87bii3401nq0bhyigzrs6lkippds6r4h0qzpq4pg8l7m0";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
+       version = "1.0.0.0";
+       sha256 = "0hf0vgvjcklf8iq7gcrncmw4pm2c6aawx3cp34fji2bl14dgv4zr";
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base hspec time ];
        benchmarkHaskellDepends = [ base deepseq time ];
-       description = "Convert Jalaali and Gregorian calendar systems to each other";
+       description = "Jalaali calendar systems";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -176500,6 +176601,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ormolu_0_1_4_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, containers, Diff
+     , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec
+     , hspec-discover, mtl, optparse-applicative, path, path-io, syb
+     , text
+     }:
+     mkDerivation {
+       pname = "ormolu";
+       version = "0.1.4.0";
+       sha256 = "0v4yzhn38jzlcdc7p807nv6ndf3nmmmqvmw6j817iirvkck9n0fk";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring containers Diff dlist exceptions
+         ghc-lib-parser mtl syb text
+       ];
+       executableHaskellDepends = [
+         base ghc-lib-parser gitrev optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base containers filepath hspec path path-io text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A formatter for Haskell source code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "orthotope" = callPackage
     ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -186810,8 +186940,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-methodology-composite";
-       version = "0.1.3.0";
-       sha256 = "034hiwm8qj0i0rhdmybyya4cqnrqk7k0a6ga9c4alyyrdydks60x";
+       version = "0.1.4.0";
+       sha256 = "014kfaxxi24n99gvrvf9c6c8cx8csbb9a8fbfb2md5g2d2q4v08g";
        libraryHaskellDepends = [
          base composite-base polysemy polysemy-extra polysemy-methodology
          polysemy-vinyl vinyl
@@ -223818,17 +223948,17 @@ self: {
      }) {};
 
   "stack-clean-old" = callPackage
-    ({ mkDerivation, base, directory, extra, filepath, simple-cmd
-     , simple-cmd-args
+    ({ mkDerivation, base, directory, extra, filemanip, filepath
+     , simple-cmd, simple-cmd-args
      }:
      mkDerivation {
        pname = "stack-clean-old";
-       version = "0.2";
-       sha256 = "1mk92hgh1prnw0piwccxb1nf1383yap7csx03abnwp8anl8xw5dc";
+       version = "0.2.1";
+       sha256 = "0wal5jhm78di54gwwmbmbpp76n7fkna82kg2p3ldzi0r2q53m44h";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base directory extra filepath simple-cmd simple-cmd-args
+         base directory extra filemanip filepath simple-cmd simple-cmd-args
        ];
        description = "Clean away old stack build artefacts";
        license = stdenv.lib.licenses.bsd3;
@@ -227096,8 +227226,8 @@ self: {
      }:
      mkDerivation {
        pname = "streamly-lmdb";
-       version = "0.1.0";
-       sha256 = "0yccaszb6fbasmlwq3iqci7gin8kf7hgmlcjfsq0pdqw32lnmcbn";
+       version = "0.2.0";
+       sha256 = "1mkcnn7y4rwc8m0qvcqyw20jd7ax3nm455228fwp3yaslgw4mcvy";
        libraryHaskellDepends = [ async base bytestring streamly ];
        librarySystemDepends = [ lmdb ];
        testHaskellDepends = [
@@ -247685,8 +247815,8 @@ self: {
      }:
      mkDerivation {
        pname = "update-nix-fetchgit";
-       version = "0.2.4";
-       sha256 = "0ginchdkd4ihcji8m0350fam4js5z5pnbmammvnv4abgvqq05mqy";
+       version = "0.2.5";
+       sha256 = "0lga69cnzysayvsflbcf43i7ncnib9mq62azi30kpm860s0h5lfb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -249004,15 +249134,24 @@ self: {
      }) {};
 
   "uusi" = callPackage
-    ({ mkDerivation, base, Cabal, text }:
+    ({ mkDerivation, base, Cabal, HUnit, microlens, microlens-th, text
+     }:
      mkDerivation {
        pname = "uusi";
-       version = "0.1.0.0";
-       sha256 = "1b56rasvypkp8scyxmc090jxk431lbjn72kj4md06cl9z0dg3w2r";
-       isLibrary = false;
+       version = "0.2.0.0";
+       sha256 = "0ycl5nml9v9dxksi2bcl5bff0nirn9g5cs8p0f09lxg81kis2zjl";
+       revision = "1";
+       editedCabalFile = "13w8xn1mqjjjb3ismi0l78xm7bkhrvyph0wgyfvf6pyn1866qzmn";
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [ base Cabal text ];
-       description = "Remove all version constraints of dependencies in .cabal file";
+       libraryHaskellDepends = [ base Cabal microlens microlens-th text ];
+       executableHaskellDepends = [
+         base Cabal microlens microlens-th text
+       ];
+       testHaskellDepends = [
+         base Cabal HUnit microlens microlens-th text
+       ];
+       description = "Tweak dependencies in .cabal files";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -256023,6 +256162,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "witch" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hspec, QuickCheck
+     , text
+     }:
+     mkDerivation {
+       pname = "witch";
+       version = "0.0.0.2";
+       sha256 = "0d120f3cicwqcq0h6sdyl9pzwgslx7i6jawmmrcq1gi1yxgzd8sk";
+       libraryHaskellDepends = [ base bytestring containers text ];
+       testHaskellDepends = [
+         base bytestring containers hspec QuickCheck text
+       ];
+       description = "Convert values from one type into another";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "with-index" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {

From 996775e9cb0d85ff9979b9317bd8a176ec222173 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 15 Nov 2020 02:39:19 +0100
Subject: [PATCH 3090/3942] haskellPackages.nettle: Fix build

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 99cd74c5bab9..032deca5e5a3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1419,4 +1419,8 @@ self: super: {
 
   # 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing
   aeson = dontCheck super.aeson;
+
+  # 2020-11-15: nettle tests are pre MonadFail change
+  # https://github.com/stbuehler/haskell-nettle/issues/10
+  nettle = dontCheck super.nettle;
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 63e5e85ba7af1a692a2dcddfbf25ea1931d3a2af Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 15 Nov 2020 03:11:59 +0100
Subject: [PATCH 3091/3942] haskellPackages: Fix more eval errors

---
 .../haskell-modules/configuration-common.nix  |  7 -----
 .../configuration-ghc-9.0.x.nix               |  1 -
 .../configuration-hackage2nix.yaml            | 26 ++++++++++++++++---
 .../haskell-modules/hackage-packages.nix      | 21 +++++++++++++++
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 032deca5e5a3..9434799c10f1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -231,7 +231,6 @@ self: super: {
   # ghc 8.10.
   hnix = dontCheck (super.hnix.override {
     # 2020-09-18: Those packages are all needed by hnix at versions newer than on stackage
-    neat-interpolation = self.neat-interpolation_0_5_1_2; # at least 0.5.1
     prettyprinter = self.prettyprinter_1_7_0; # at least 1.7
 
   });
@@ -336,12 +335,6 @@ self: super: {
     else super.math-functions;
   matplotlib = dontCheck super.matplotlib;
 
-  # Needs the latest version of vty and brick.
-  matterhorn = super.matterhorn.overrideScope (self: super: {
-    brick = self.brick_0_57;
-    vty = self.vty_5_32;
-  });
-
   memcache = dontCheck super.memcache;
   metrics = dontCheck super.metrics;
   milena = dontCheck super.milena;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index 88f935c3b6d3..f76bf2fe6978 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -66,7 +66,6 @@ self: super: {
   integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; });
   lukko = doJailbreak super.lukko;
   parallel = doJailbreak super.parallel;
-  primitive = doJailbreak super.primitive_0_7_1_0;
   regex-posix = doJailbreak super.regex-posix;
   resolv = doJailbreak super.resolv;
   singleton-bool = doJailbreak super.singleton-bool;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 719f11a9cf30..57dcc6f5c90a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2781,6 +2781,7 @@ dont-distribute-packages:
   - accelerate-io-JuicyPixels
   - accelerate-io-repa
   - accelerate-io-vector
+  - accelerate-kullback-liebler
   - accelerate-llvm-ptx
   - bindings-yices
   - boolector
@@ -2807,7 +2808,10 @@ dont-distribute-packages:
   - yices-painless
 
   # these packages don't evaluate because they have broken (system) dependencies
+  - XML
   - comark
+  - couch-simple
+  - diagrams-hsqml
   - diagrams-reflex
   - dialog
   - fltkhs-demos
@@ -2817,14 +2821,27 @@ dont-distribute-packages:
   - ghcjs-dom-hello
   - ghcjs-dom-webkit
   - gi-javascriptcore
+  - gi-webkit
   - gi-webkit2
   - gi-webkit2webextension
-  - gi-webkit
   - gsmenu
   - haste-gapi
   - haste-perch
   - hbro
   - hplayground
+  - hs-mesos
+  - hsqml
+  - hsqml-datamodel
+  - hsqml-datamodel-vinyl
+  - hsqml-datemodel-vinyl
+  - hsqml-demo-manic
+  - hsqml-demo-morris
+  - hsqml-demo-notes
+  - hsqml-demo-notes
+  - hsqml-demo-samples
+  - hsqml-morris
+  - hsqml-morris
+  - hstorchat
   - imprevu-happstack
   - jsaddle-webkit2gtk
   - jsaddle-webkitgtk
@@ -2855,10 +2872,13 @@ dont-distribute-packages:
   - wai-middleware-brotli
   - web-browser-in-haskell
   - webkit
-  - webkitgtk3-javascriptcore
   - webkitgtk3
+  - webkitgtk3-javascriptcore
   - websnap
-  - XML
 
 broken-packages:
   # These packages don't compile or depend on packages that don't compile.
+  - git-remote-ipfs
+  - ipld-cid
+  - multibase
+  - multihash-serialise
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 04636ba6693d..dd2ce05365ca 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -20940,6 +20940,7 @@ self: {
        doHaddock = false;
        description = "Kullback-Liebler divergence";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm" = callPackage
@@ -59147,6 +59148,7 @@ self: {
        testToolDepends = [ couchdb ];
        description = "A modern, lightweight, complete client for CouchDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) couchdb;};
 
   "couchdb-conduit" = callPackage
@@ -68673,6 +68675,7 @@ self: {
        ];
        description = "HsQML (Qt5) backend for Diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-html5" = callPackage
@@ -95944,6 +95947,8 @@ self: {
        ];
        description = "Git remote helper to store git objects on IPFS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-repair" = callPackage
@@ -123316,6 +123321,7 @@ self: {
          tasty-quickcheck
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mesos = null; inherit (pkgs) protobuf;};
 
   "hs-multiaddr" = callPackage
@@ -126698,6 +126704,7 @@ self: {
        ];
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
@@ -126710,6 +126717,7 @@ self: {
        libraryPkgconfigDepends = [ qt5 ];
        description = "HsQML (Qt5) data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
@@ -126725,6 +126733,7 @@ self: {
        ];
        description = "HsQML DataModel instances for Vinyl Rec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-manic" = callPackage
@@ -126741,6 +126750,7 @@ self: {
        ];
        description = "HsQML-based clone of Pipe Mania";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-morris" = callPackage
@@ -126759,6 +126769,7 @@ self: {
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-notes" = callPackage
@@ -126777,6 +126788,7 @@ self: {
        ];
        description = "Sticky notes example program implemented in HsQML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-samples" = callPackage
@@ -126791,6 +126803,7 @@ self: {
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
        description = "HsQML sample programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-morris" = callPackage
@@ -126809,6 +126822,7 @@ self: {
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsreadability" = callPackage
@@ -127065,6 +127079,7 @@ self: {
        ];
        description = "Distributed instant messaging over Tor";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstox" = callPackage
@@ -136789,6 +136804,8 @@ self: {
        ];
        description = "IPLD Content-IDentifiers <https://github.com/ipld/cid>";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ipopt-hs" = callPackage
@@ -165395,6 +165412,8 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Self-identifying base encodings, implementation of <https://github.com/multiformats/multihash>";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multifile" = callPackage
@@ -165497,6 +165516,8 @@ self: {
        testHaskellDepends = [ base cryptonite hedgehog serialise ];
        description = "CBOR encoding of multihashes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multihashmap" = callPackage

From e2b6d74494cba429e1784212709dad6a1d73eca8 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 15 Nov 2020 03:12:18 +0100
Subject: [PATCH 3092/3942] haskellPackages.haskell-language-server: Fix build

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9434799c10f1..eaf30705ba56 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1404,11 +1404,13 @@ self: super: {
     sha256 = "0j8980dmvwjcs72ahq2zc14hwkyd5ybgzyy1az3zq5flp383fai6";
     includes = [ "ghcide.cabal" ];
   }));
+  refinery = doDistribute super.refinery_0_3_0_0;
   data-tree-print = doJailbreak super.data-tree-print;
   # the hls brittany is objectively better, because there hasn‘t been a
   # brittany release in a while and this version works with 8.10.
   # And we need to build it anyways.
-  brittany = dontCheck super.hls-brittany;
+  # 2020-11-15: jailbreaking because we have strict 0.4 which is to new
+  brittany = dontCheck (doJailbreak super.hls-brittany);
 
   # 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing
   aeson = dontCheck super.aeson;

From b568d074ba12fe5f701cf92a1154fe4e4aae9d32 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 15 Nov 2020 03:37:32 +0100
Subject: [PATCH 3093/3942] haskell.packages.{ghc865,ghc884}.exceptions: Create
 attribute

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 0a64c20ea7a5..2a0a7810f72a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -91,4 +91,7 @@ self: super: {
 
   # ghc versions prior to 8.8.x needs additional dependency to compile successfully.
   ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser;
+
+  # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore.
+  exceptions = super.exceptions_0_10_4;
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 718186c9f38f..e83b25659f2c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -122,4 +122,6 @@ self: super: {
   liquid-vector = markBroken super.liquid-vector;
   liquidhaskell = markBroken super.liquidhaskell;
 
+  # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore.
+  exceptions = super.exceptions_0_10_4;
 }

From 9436e2ff4330e974aee0e95cdc93c7af6c17c33b Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 15 Nov 2020 23:13:26 +0100
Subject: [PATCH 3094/3942] haskell.packages.ghc901.QuickCheck: Bump version to
 fix build

---
 pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index f76bf2fe6978..dad4fdd8b920 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -94,10 +94,7 @@ self: super: {
     url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
     sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
   });
-  QuickCheck = appendPatch super.QuickCheck_2_14_1 (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/QuickCheck-2.14.1.patch";
-    sha256 = "0n89nx95w353h4dzala57gb0y7hx4wbkv5igs89dza50p7ybq9an";
-  });
+  QuickCheck = super.QuickCheck_2_14_2;
   regex-base = appendPatch (doJailbreak super.regex-base) (pkgs.fetchpatch {
     url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch";
     sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d";

From 878beaf507f3bb0db3b64955e9c33a57b1e028e5 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 16 Nov 2020 02:04:09 +0100
Subject: [PATCH 3095/3942] haskell.packages.ghc901.th-abstraction: Fix eval
 error

---
 pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index dad4fdd8b920..0471ca1b7601 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -72,7 +72,6 @@ self: super: {
   split = doJailbreak super.split;
   splitmix = self.splitmix_0_1_0_3;
   tar = doJailbreak super.tar;
-  th-abstraction = self.th-abstraction_0_4_0_0;
   time-compat = doJailbreak super.time-compat;
   vector = doJailbreak (dontCheck super.vector);
   zlib = doJailbreak super.zlib;

From 045f6ba1b358c0a3e6618064ac502c1e9769d2d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Nov 2020 02:30:24 +0100
Subject: [PATCH 3096/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-27-g11a103b from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/aadf840b5e2e9e1fc9d422b6555685fe66ce135d.
---
 .../haskell-modules/hackage-packages.nix      | 152 ++++++++++--------
 1 file changed, 86 insertions(+), 66 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index dd2ce05365ca..757fcb20292f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -35304,23 +35304,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "base64-bytestring_1_2_0_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
-     , HUnit, QuickCheck, split, test-framework, test-framework-hunit
+  "base64-bytestring_1_2_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit
+     , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "base64-bytestring";
-       version = "1.2.0.0";
-       sha256 = "1vz4dbbsymjrw5dmb62yw41v126narlb3dpa037hgldlw1fw2iip";
+       version = "1.2.0.1";
+       sha256 = "0f66mzsyik3zrn72cygg8w3375qpvn3422z3j4fkkc9f0xyv22dg";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
-         base bytestring containers HUnit QuickCheck split test-framework
+         base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion deepseq
-       ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Fast base64 encoding and decoding for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42008,6 +42006,8 @@ self: {
        pname = "brick";
        version = "0.57";
        sha256 = "15481cmm208gxcs96rcvg6qgx87b2fk7ws82675viasw64mhvmg1";
+       revision = "1";
+       editedCabalFile = "0vi6a3m6i4x6pndmcc39x37pyd9ar7m6z7b0lahnw6ayssxiq3pq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42034,6 +42034,8 @@ self: {
        pname = "brick";
        version = "0.57.1";
        sha256 = "0amqh0xjgylndz0wp23r5m7w8m7j280dyf1j1mybmmb93s8yz269";
+       revision = "1";
+       editedCabalFile = "00jg403q7aaah9hr37n8wa11lljf2909hpmxz7qf4c9ck79pcaj0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42244,38 +42246,29 @@ self: {
     ({ 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
-     , random, safe, semigroups, strict, syb, text, transformers
-     , uniplate, unsafe, yaml
+     , monad-memo, mtl, multistate, parsec, pretty, random, safe
+     , semigroups, strict, syb, text, transformers, uniplate, unsafe
+     , yaml
      }:
      mkDerivation {
        pname = "brittany";
-       version = "0.12.1.1";
-       sha256 = "0nw7ymdb7xam634w42l1xjgyvpla8grcg02aj19fscw2fn9gfh7z";
-       revision = "2";
-       editedCabalFile = "0pfrm5vvh7x94f8gy8ka6rmq6yk6xxxgba68rd91bk8lbjxsmkxl";
+       version = "0.12.2.0";
+       sha256 = "03v7lhy6i7fk3sskimzb3hs9qi1g9b9w7zfvmc9m4606673ysdzl";
        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 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 monad-memo mtl multistate
-         neat-interpolation pretty safe semigroups strict syb text
-         transformers uniplate unsafe yaml
+         ghc-exactprint ghc-paths monad-memo mtl multistate pretty random
+         safe semigroups strict syb text transformers uniplate unsafe yaml
        ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          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
+         ghc-exactprint ghc-paths hspec monad-memo mtl multistate parsec
+         pretty safe semigroups strict syb text transformers uniplate unsafe
+         yaml
        ];
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.agpl3;
@@ -46259,8 +46252,8 @@ self: {
      }:
      mkDerivation {
        pname = "calamity";
-       version = "0.1.21.0";
-       sha256 = "0hh3kfcs2wjmkz8ggzshb1535rz13nl1d9yaa73rm2arn73jfsi1";
+       version = "0.1.22.0";
+       sha256 = "0cmv24r5ay34v50rfdp7rakhzrs0fx079nncfq4xi5j4mm484dna";
        libraryHaskellDepends = [
          aeson async base bytestring colour concurrent-extra containers
          data-default-class data-flags deepseq deque df1 di-core di-polysemy
@@ -57486,17 +57479,15 @@ self: {
      }) {};
 
   "constrained-categories" = callPackage
-    ({ mkDerivation, base, contravariant, semigroups, tagged
+    ({ mkDerivation, base, contravariant, fail, semigroups, tagged
      , trivial-constraint, void
      }:
      mkDerivation {
        pname = "constrained-categories";
-       version = "0.4.0.0";
-       sha256 = "1wq4ivkgxbwxxrfk5lwn2psbbiaq87dr8zf1z9b9yhw2hi75lsgw";
-       revision = "1";
-       editedCabalFile = "0f96xmq5j03f9ks9cjlgbc5wq0azdbrbj2lh3kr3ybz658dli3j7";
+       version = "0.4.1.0";
+       sha256 = "0n9xi24jc590hmhz8b8g6rhfkbapq62h74mjkhs4mcsj58inx90p";
        libraryHaskellDepends = [
-         base contravariant semigroups tagged trivial-constraint void
+         base contravariant fail semigroups tagged trivial-constraint void
        ];
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
@@ -105800,8 +105791,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-convert";
-       version = "0.3.0.2";
-       sha256 = "19jihf6hkn11bn1s44kjmi4szjw68f1brmh1n7py5s7f01235djv";
+       version = "0.3.0.3";
+       sha256 = "0i5g4xs0az8znisl8vm60r3m2y3s9dhh8cdb0bl8c5ikqcrlscjf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119228,8 +119219,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "3.2.1";
-       sha256 = "16r2s65238yaqkiqhc31zwgv5r9743d5qrdwkahn9zpwj0x0sp5f";
+       version = "3.2.2";
+       sha256 = "1jb4yr9piyq2l4d6xxn6vywa1ghvws97qkzymnmldzxpyqiixnl8";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -145694,6 +145685,8 @@ self: {
        pname = "lapack";
        version = "0.3.2";
        sha256 = "12h9k8hx3qpfa3ma24glngpk1x9m8h17qzv86sfq54br19ikz5y0";
+       revision = "1";
+       editedCabalFile = "1ji3cj8ggj6prxcn9z0678x1i5j25cwxj3bxnv4s9nn8qayyflpn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173923,8 +173916,8 @@ self: {
      }:
      mkDerivation {
        pname = "oidc-client";
-       version = "0.5.1.0";
-       sha256 = "1qp69bdfam86y90vrm3z1nlk4kh03pnyzc5k06w9xvaq6i0965z6";
+       version = "0.6.0.0";
+       sha256 = "0r359hwx4zh5mjh2p4abfkgnkkhzbhdn6fn5dlja8pvyvi18a3kk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -176622,7 +176615,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ormolu_0_1_4_0" = callPackage
+  "ormolu_0_1_4_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers, Diff
      , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec
      , hspec-discover, mtl, optparse-applicative, path, path-io, syb
@@ -176630,8 +176623,8 @@ self: {
      }:
      mkDerivation {
        pname = "ormolu";
-       version = "0.1.4.0";
-       sha256 = "0v4yzhn38jzlcdc7p807nv6ndf3nmmmqvmw6j817iirvkck9n0fk";
+       version = "0.1.4.1";
+       sha256 = "1aamgzimjn9h7kwby9ajfgbj5dx08nmxyalwvpg9rs4xd8pbpd9s";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -176640,7 +176633,7 @@ self: {
          ghc-lib-parser mtl syb text
        ];
        executableHaskellDepends = [
-         base ghc-lib-parser gitrev optparse-applicative text
+         base filepath ghc-lib-parser gitrev optparse-applicative text
        ];
        testHaskellDepends = [
          base containers filepath hspec path path-io text
@@ -188510,6 +188503,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "postgresql-simple_0_6_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , cryptohash-md5, filepath, hashable, HUnit, inspection-testing
+     , Only, postgresql-libpq, scientific, tasty, tasty-golden
+     , tasty-hunit, template-haskell, text, time, transformers
+     , uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-simple";
+       version = "0.6.3";
+       sha256 = "193rh38gzgpy41y6826hs4zdp01xw2fpjncwm281cm1ibrmh68pq";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring bytestring-builder
+         case-insensitive containers hashable Only postgresql-libpq
+         scientific template-haskell text time transformers uuid-types
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base base16-bytestring bytestring case-insensitive containers
+         cryptohash-md5 filepath HUnit inspection-testing postgresql-libpq
+         tasty tasty-golden tasty-hunit text time vector
+       ];
+       benchmarkHaskellDepends = [ base 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
@@ -195355,8 +195377,8 @@ self: {
        pname = "quickcheck-instances";
        version = "0.3.23";
        sha256 = "1gig5dwgsahpgdz0cm06wf9lbjnh0qmr5qrlk9bc3v72pa8knc0i";
-       revision = "1";
-       editedCabalFile = "1lir5ryv2b1hn5n5fbgs9syram71zv4p4chb9xzkxvbszl5inw8k";
+       revision = "2";
+       editedCabalFile = "195l3a41gw34kviqbsa4pg8h92y3gmhvq4x7znrm1h7zlqw2jbb0";
        libraryHaskellDepends = [
          array base base-compat bytestring case-insensitive containers
          hashable old-time QuickCheck scientific splitmix tagged text these
@@ -195371,7 +195393,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-instances_0_3_25" = callPackage
+  "quickcheck-instances_0_3_25_1" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive
      , containers, data-fix, hashable, integer-logarithms, old-time
      , QuickCheck, scientific, splitmix, strict, tagged, text, these
@@ -195380,8 +195402,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-instances";
-       version = "0.3.25";
-       sha256 = "08lp5fwmhj1ld9zmhxv6aiqc7668nlkz0ckykgp57bv0i6sh4n7q";
+       version = "0.3.25.1";
+       sha256 = "06gg3y56ws1bc9yz00fmm0i5vrmqd2mqlxnbxp676yksfyr80qxd";
        libraryHaskellDepends = [
          array base bytestring case-insensitive containers data-fix hashable
          integer-logarithms old-time QuickCheck scientific splitmix strict
@@ -214702,15 +214724,14 @@ self: {
 
   "shake" = callPackage
     ({ mkDerivation, base, binary, bytestring, deepseq, directory
-     , extra, file-embed, filepath, filepattern, hashable, heaps
-     , js-dgtable, js-flot, js-jquery, primitive, process, QuickCheck
-     , random, template-haskell, time, transformers, unix
-     , unordered-containers, utf8-string
+     , extra, filepath, filepattern, hashable, heaps, js-dgtable
+     , js-flot, js-jquery, primitive, process, QuickCheck, random, time
+     , transformers, unix, unordered-containers, utf8-string
      }:
      mkDerivation {
        pname = "shake";
-       version = "0.19.1";
-       sha256 = "14znwscqdhac421igz26r0p1im9p0zawxzmi3hh1lhmxc5fprk2n";
+       version = "0.19.2";
+       sha256 = "0s34c40zvr0ny5n0p2g85rzkx3789r20627gykkpsn5cvnc7pj5s";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -214720,10 +214741,9 @@ self: {
          random time transformers unix unordered-containers utf8-string
        ];
        executableHaskellDepends = [
-         base binary bytestring deepseq directory extra file-embed filepath
-         filepattern hashable heaps js-dgtable js-flot js-jquery primitive
-         process random template-haskell time transformers unix
-         unordered-containers utf8-string
+         base binary bytestring deepseq directory extra filepath filepattern
+         hashable heaps js-dgtable js-flot js-jquery primitive process
+         random time transformers unix unordered-containers utf8-string
        ];
        testHaskellDepends = [
          base binary bytestring deepseq directory extra filepath filepattern
@@ -228530,8 +228550,8 @@ self: {
      }:
      mkDerivation {
        pname = "stylist";
-       version = "2.2.0.0";
-       sha256 = "0pmyjxdg7m0fh9m0nrimi02q4lqk47kfbws65mb22rj7ckm7gw68";
+       version = "2.3.0.0";
+       sha256 = "04nxhsv4v6qlr19fw29jf925b7qhp5777mn0q55sm0jhn7r4v6lv";
        libraryHaskellDepends = [
          async base css-syntax hashable network-uri text
          unordered-containers
@@ -229873,8 +229893,8 @@ self: {
      }:
      mkDerivation {
        pname = "swiss-ephemeris";
-       version = "1.2.0.0";
-       sha256 = "1inzvwm7z562q07r5h8prxpn4g1ywza88a7rv95yx8634fcy1bsl";
+       version = "1.2.1.0";
+       sha256 = "0mbq3mzplxnnpr1zqbgg6k1ggh0fw4xlzvyg74rid863dxcldjpm";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base directory hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];

From 93e8e7eb627577a9bb1b8dd73fb2a54a83f4d66e Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Tue, 17 Nov 2020 00:56:13 +0100
Subject: [PATCH 3097/3942] haskellPackages.hackage-security: Disable test to
 fix build

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index eaf30705ba56..b4f240e7595b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1418,4 +1418,9 @@ self: super: {
   # 2020-11-15: nettle tests are pre MonadFail change
   # https://github.com/stbuehler/haskell-nettle/issues/10
   nettle = dontCheck super.nettle;
+
+  # 2020-11-17: Disable tests for hackage-security because of this issue:
+  # https://github.com/haskell/hackage-security/issues/247
+  hackage-security = dontCheck super.hackage-security;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 8a559a2a08d2ff9f9944c7de240ecd21950765dd Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Tue, 17 Nov 2020 01:20:11 +0100
Subject: [PATCH 3098/3942] haskell.packages.ghc884.ghc-lib-parser-ex: Fix
 build for hls

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index e83b25659f2c..546f3a053adc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -124,4 +124,8 @@ self: super: {
 
   # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore.
   exceptions = super.exceptions_0_10_4;
+
+  # ghc versions which don‘t match the ghc-lib-parser-ex version need the
+  # additional dependency to compile successfully.
+  ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser;
 }

From dd75aa6b9ba76ec0b8c9ac161b891b518f70d3da Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Tue, 17 Nov 2020 01:22:06 +0100
Subject: [PATCH 3099/3942] haskellPackages.stack: Fix build of dependencies

* persistent-sqlite
* pantry
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 ++
 .../haskell-modules/configuration-ghc-8.10.x.nix          | 8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b4f240e7595b..b0aba7df518e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1423,4 +1423,6 @@ self: super: {
   # https://github.com/haskell/hackage-security/issues/247
   hackage-security = dontCheck super.hackage-security;
 
+  # 2020-11-17: persistent-test is ahead of the persistent version in stack
+  persistent-sqlite = dontCheck super.persistent-sqlite;
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index c796b76ab1c8..5080472666b4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -83,14 +83,6 @@ self: super: {
     sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
   });
 
-  # https://github.com/commercialhaskell/pantry/issues/21
-  pantry = appendPatch super.pantry (pkgs.fetchpatch {
-    name = "add-cabal-3.2.x-support.patch";
-    url = "https://patch-diff.githubusercontent.com/raw/commercialhaskell/pantry/pull/22.patch";
-    sha256 = "198hsfjsy83s7rp71llf05cwa3vkm74g73djg5p4sk4awm9s6vf2";
-    excludes = ["package.yaml"];
-  });
-
   # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now.
   hnix = generateOptparseApplicativeCompletion "hnix"
     (overrideCabal super.hnix (drv: {

From ea001ce8145f593f67dc11f0c3720f94ea5ff61a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Nov 2020 02:30:27 +0100
Subject: [PATCH 3100/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-27-g11a103b from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/0ae957506a72ffd1bf2d4d9865a87f12f6eea25d.
---
 .../haskell-modules/hackage-packages.nix      | 128 +++++++++++-------
 1 file changed, 80 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 757fcb20292f..38bdde2b0168 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -19053,8 +19053,8 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "VulkanMemoryAllocator";
-       version = "0.3.8";
-       sha256 = "1fm2y3v9dcd2yaca212vk2awj90nzamgbsxf39d3s8h3yhjf95ll";
+       version = "0.3.9";
+       sha256 = "1y4mchf317bkhwivnppnsk9r567c0cjymg3mc1n6h0cn799rx7bk";
        libraryHaskellDepends = [
          base bytestring transformers vector vulkan
        ];
@@ -20125,8 +20125,8 @@ self: {
      }:
      mkDerivation {
        pname = "Z-Data";
-       version = "0.1.8.0";
-       sha256 = "1yzavy7y8rdpazxmxfa0b9nw7ijrvafcwi5yv74kkj5m626hcizl";
+       version = "0.1.9.1";
+       sha256 = "0fwbgcsfay83lp24m9afdvn43xlzxi3y74fsxxw2xbfaz6zmxivi";
        libraryHaskellDepends = [
          base case-insensitive deepseq ghc-prim hashable integer-gmp
          primitive QuickCheck scientific tagged template-haskell
@@ -84962,31 +84962,43 @@ self: {
 
   "flashblast" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, co-log-polysemy
-     , co-log-polysemy-formatting, composite-base, dhall, formatting
-     , http-conduit, lucid, megaparsec, path, path-dhall-instance
-     , path-utils, polysemy, polysemy-plugin, polysemy-video
-     , polysemy-zoo, replace-megaparsec, rio, semialign, subtitleParser
-     , temporary, these, turtle, unliftio-path, vinyl
+     , co-log-polysemy-formatting, comonad, composite-base, dhall
+     , first-class-families, formatting, generic-monoid
+     , ghc-clippy-plugin, http-conduit, lucid, megaparsec, optics
+     , optics-extra, path, path-dhall-instance, path-utils, polysemy
+     , polysemy-extra, polysemy-fs, polysemy-fskvstore, polysemy-http
+     , polysemy-methodology, polysemy-methodology-composite
+     , polysemy-plugin, polysemy-video, polysemy-vinyl, polysemy-zoo
+     , relude, replace-megaparsec, rio, semialign, subtitleParser
+     , temporary, text, these, turtle, unliftio-path, vinyl
      }:
      mkDerivation {
        pname = "flashblast";
-       version = "0.0.4.0";
-       sha256 = "13n90wkmj69lkyvsw34dhr173m8qfdclkygnh7v5xwdrk5fgpb5s";
+       version = "0.0.8.0";
+       sha256 = "0y3pqknpzycwdja9gpkpbmmfapwwkpzsxh6ng461i0x5qknc1mbs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base co-log-polysemy co-log-polysemy-formatting
-         composite-base dhall formatting http-conduit lucid megaparsec path
-         path-dhall-instance path-utils polysemy polysemy-plugin
-         polysemy-video polysemy-zoo replace-megaparsec rio semialign
-         subtitleParser temporary these turtle unliftio-path vinyl
+         comonad composite-base dhall first-class-families formatting
+         generic-monoid ghc-clippy-plugin http-conduit lucid megaparsec
+         optics optics-extra path path-dhall-instance path-utils polysemy
+         polysemy-extra polysemy-fs polysemy-fskvstore polysemy-http
+         polysemy-methodology polysemy-methodology-composite polysemy-plugin
+         polysemy-video polysemy-vinyl polysemy-zoo relude
+         replace-megaparsec rio semialign subtitleParser temporary text
+         these turtle unliftio-path vinyl
        ];
        executableHaskellDepends = [
          aeson attoparsec base co-log-polysemy co-log-polysemy-formatting
-         composite-base dhall formatting http-conduit lucid megaparsec path
-         path-dhall-instance path-utils polysemy polysemy-plugin
-         polysemy-video polysemy-zoo replace-megaparsec rio semialign
-         subtitleParser temporary these turtle unliftio-path vinyl
+         comonad composite-base dhall first-class-families formatting
+         generic-monoid ghc-clippy-plugin http-conduit lucid megaparsec
+         optics optics-extra path path-dhall-instance path-utils polysemy
+         polysemy-extra polysemy-fs polysemy-fskvstore polysemy-http
+         polysemy-methodology polysemy-methodology-composite polysemy-plugin
+         polysemy-video polysemy-vinyl polysemy-zoo relude
+         replace-megaparsec rio semialign subtitleParser temporary text
+         these turtle unliftio-path vinyl
        ];
        description = "Generate language learning flashcards from video";
        license = stdenv.lib.licenses.mit;
@@ -95595,8 +95607,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "8.20201103";
-       sha256 = "1z9ikpsz3by48yfw87qav5dy7j4k9ky4a7nqnasl15kdm3lav9pl";
+       version = "8.20201116";
+       sha256 = "0xv7n9f6l90l4k964675v0lgs22gcy97ic86mbfb40rl0fk0jalr";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -122442,10 +122454,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpqtypes-extras";
-       version = "1.10.2.1";
-       sha256 = "06vx7llfyidldp5ar80a3dkw14xv19v1s8kc7kf6vs1gb3vx8r5n";
-       revision = "1";
-       editedCabalFile = "0vn0396jhxnrnp8724kpl7yjy4aywa2nm1vb7znz0fmzr0vp54yi";
+       version = "1.10.3.0";
+       sha256 = "1ifr6z89ki541b9x3kpyf10vbn3anhfcq8ppqwyp5zvmkx0q3wqs";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash exceptions
          fields-json hpqtypes lifted-base log-base monad-control mtl safe
@@ -136852,6 +136862,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "iproute_1_7_10" = callPackage
+    ({ mkDerivation, appar, base, byteorder, bytestring, containers
+     , doctest, hspec, network, QuickCheck, safe
+     }:
+     mkDerivation {
+       pname = "iproute";
+       version = "1.7.10";
+       sha256 = "0libq5v22cm6bj1lga1rrkgww50bhnpns7rz7da90yycqv2k7d5m";
+       libraryHaskellDepends = [
+         appar base byteorder bytestring containers network
+       ];
+       testHaskellDepends = [
+         appar base byteorder bytestring containers doctest hspec network
+         QuickCheck safe
+       ];
+       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
@@ -140064,8 +140094,8 @@ self: {
        pname = "json-rpc-server";
        version = "0.2.6.0";
        sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn";
-       revision = "7";
-       editedCabalFile = "1fjkl0p5glkk01jny6ar62356pmp2a2vf9v1jq67ly3y14dcvywq";
+       revision = "8";
+       editedCabalFile = "0cg2b7jggjpk6cryc1v7cx06nvkffsh6xz76gp0pz0wfn1m96pxy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -154041,8 +154071,8 @@ self: {
      }:
      mkDerivation {
        pname = "lz4-hs";
-       version = "0.1.5.0";
-       sha256 = "0qqv6n7hjcjkc1pzhwkdr9l1kfb8rqndx2lfm6j4bhmvrwwrn8lw";
+       version = "0.1.5.1";
+       sha256 = "1kl8zxladsby7y5fk2gdkipjn6kb8kkzdpf8xccnvhmgzn8qj4cn";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
@@ -171135,8 +171165,8 @@ self: {
      }:
      mkDerivation {
        pname = "nix-tree";
-       version = "0.1.1.0";
-       sha256 = "1dciwsw7cv1f73awrqr3gw3zj3mizaw53q3ibkawq9gbfsfg8yiz";
+       version = "0.1.2.0";
+       sha256 = "0indbvsjsl0m325f0vhzhllrhkq27agnbrmhzz7k0klprssf1hsn";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -183304,8 +183334,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-examples";
-       version = "0.5.0.0";
-       sha256 = "1ypv9x2jsz20dmky8mzmni0pmwq8vslyhi2s0s2ji99qsg7y5rwi";
+       version = "0.6.0.0";
+       sha256 = "15y17zg9vx9f0hdpdkx56xsr5dqfpx2qsdmndlpy2yp35cq9yqhq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -192011,15 +192041,16 @@ self: {
 
   "prolude" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, containers
-     , mongoDB, safe-exceptions, scientific, text, time, vector
+     , mongoDB, persistent, persistent-mongoDB, safe-exceptions
+     , scientific, text, time, vector
      }:
      mkDerivation {
        pname = "prolude";
-       version = "0.0.0.7";
-       sha256 = "0wcjb7svvp5q3lzsddkxp2c0jvr765pva9hwnmmc5ak91yj6lgpw";
+       version = "0.0.0.8";
+       sha256 = "1fcsph2f4k303zbx23ry1cnx3zkvamsd3b9d2jwr9kpvck63nn92";
        libraryHaskellDepends = [
-         aeson base bytestring cassava containers mongoDB safe-exceptions
-         scientific text time vector
+         aeson base bytestring cassava containers mongoDB persistent
+         persistent-mongoDB safe-exceptions scientific text time vector
        ];
        description = "ITProTV's custom prelude";
        license = stdenv.lib.licenses.mit;
@@ -247134,8 +247165,8 @@ self: {
        pname = "unix";
        version = "2.7.2.2";
        sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq";
-       revision = "4";
-       editedCabalFile = "092d2qzfk4wm7xaa5wjyxgb97knilsh86vhk420j8rd0qlygk4wy";
+       revision = "5";
+       editedCabalFile = "1hfpipkxmkr0fgjz1i4mm0ah1s7bgb28yb8sjn32rafj4lzszn2m";
        libraryHaskellDepends = [ base bytestring time ];
        description = "POSIX functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -251925,8 +251956,8 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "vulkan";
-       version = "3.6.13";
-       sha256 = "1js5wgjr5mcqmhaqvhyln2xq4008rk8kdhjiwh8lwsc3qjqxyibp";
+       version = "3.6.15";
+       sha256 = "1jg6d8k06dz2nnbddxis83hlrwjhdf735q8zr4gv7sx6wnl60f3n";
        libraryHaskellDepends = [ base bytestring transformers vector ];
        librarySystemDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
@@ -251947,17 +251978,18 @@ self: {
 
   "vulkan-utils" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest
-     , extra, file-embed, filepath, template-haskell, temporary
-     , typed-process, vulkan
+     , extra, file-embed, filepath, resourcet, template-haskell
+     , temporary, text, transformers, typed-process, vector, vulkan
      }:
      mkDerivation {
        pname = "vulkan-utils";
-       version = "0.1.3";
-       sha256 = "0f7bpck2g9bv1jgfj1paz305yfrhcsad3g70ybazddzh138qhgny";
+       version = "0.2";
+       sha256 = "0xzh76lmyhd43myghnw9w7cil38jiryrbz19myp5krr9r1g6rwyb";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         base bytestring extra file-embed filepath template-haskell
-         temporary typed-process vulkan
+         base bytestring extra file-embed filepath resourcet
+         template-haskell temporary text transformers typed-process vector
+         vulkan
        ];
        testHaskellDepends = [ base doctest ];
        description = "Utils for the vulkan package";

From 7525d3eb07af66f976336e72f0d4478e14db9856 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Nov 2020 02:30:30 +0100
Subject: [PATCH 3101/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-27-g11a103b from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/d366f003dd1f1543011289711445eb8f04b2705b.
---
 .../haskell-modules/hackage-packages.nix      | 248 ++++++++++++++----
 1 file changed, 192 insertions(+), 56 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 38bdde2b0168..d74824462648 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5958,8 +5958,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames-streamly";
-       version = "0.1.0.0";
-       sha256 = "0gzg52icabky5fzglxms8h9n1ncp1gvg2f8bsywmyw1maqdy36fq";
+       version = "0.1.0.1";
+       sha256 = "1fxbbg2dqyzq593qzn35flf9yj1zlbzr0izmcxvsrxq2h6kcr2hh";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base exceptions Frames primitive streamly text vinyl
@@ -30666,10 +30666,8 @@ self: {
     ({ mkDerivation, base, parsec, split, tagsoup }:
      mkDerivation {
        pname = "arxiv";
-       version = "0.0.1";
-       sha256 = "1has8v40h8w4v393pgd4qk4fzgdw02y12zk2hspkic1q5bx33dxh";
-       revision = "1";
-       editedCabalFile = "19xdrsrcg29c7ncy0gnxbk4zbnyb53j1kk9sys6j8h1l03k12qvl";
+       version = "0.0.2";
+       sha256 = "0lzmw35fry16zv8fbnqw3k5wv4d6vh9f0fz2yv9kph7zgs5sqgwh";
        libraryHaskellDepends = [ base parsec split tagsoup ];
        description = "A client for the Arxiv API";
        license = "LGPL";
@@ -60293,7 +60291,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "criterion_1_5_8_0" = callPackage
+  "criterion_1_5_9_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
      , base-compat-batteries, binary, binary-orphans, bytestring
      , cassava, code-page, containers, criterion-measurement, deepseq
@@ -60305,8 +60303,8 @@ self: {
      }:
      mkDerivation {
        pname = "criterion";
-       version = "1.5.8.0";
-       sha256 = "1qy9b1frdl5c8n9c6ayp5a93ynzmp85ffqznvdbgrq2f5aqj26vl";
+       version = "1.5.9.0";
+       sha256 = "0qhlylhra1d3vzk6miqv0gdrn10gw03bdwv8b4bfmdzgpf0zgqr1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -74609,6 +74607,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "easy-args" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "easy-args";
+       version = "0.1.0";
+       sha256 = "17ddcbnlyw6x6q5ryc6i1cwq5qwlxdrf406i5sr5j3q7ydwkf86n";
+       libraryHaskellDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec ];
+       description = "Parses command line arguments";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "easy-bitcoin" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, binary, byteable
      , bytestring, cryptohash, deepseq, lens, postgresql-simple, safe
@@ -92786,6 +92796,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-events_0_14_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "ghc-events";
+       version = "0.14.0";
+       sha256 = "1k7ky564x8s596axh0x006y4avr4dcb1h6nsvh8pbzj1ffi68sk1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers text vector
+       ];
+       executableHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base ];
+       description = "Library and tool for parsing .eventlog files from GHC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-events-analyze" = callPackage
     ({ mkDerivation, base, blaze-svg, bytestring, containers
      , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens
@@ -105906,8 +105936,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-images";
-       version = "0.4.4";
-       sha256 = "0d837i2nsg6drwfsrxfnpzmzmzxqxvabjlrlml38z99pyp7m3h9b";
+       version = "1.0.0";
+       sha256 = "0433jha6rnw4c80igx6hka9a943b9qimscyda93mgn7v7pakw6l2";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring hakyll JuicyPixels JuicyPixels-extra
@@ -111240,8 +111270,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-core";
-       version = "0.17.1";
-       sha256 = "07w2ddgrq3s4xhhhh616a65zm3xnlmcfk7wzdj6dr26h0frpz6zi";
+       version = "0.17.3";
+       sha256 = "070z3qf4jgczl42dbmrfl0pcva9ddv59ygknw2yzlbablkhb160j";
        libraryHaskellDepends = [
          aeson array base base16-bytestring bytestring cereal conduit
          containers cryptonite deepseq entropy hashable hspec memory mtl
@@ -111293,8 +111323,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.17.0";
-       sha256 = "0lgphbjam3ml9j1q39ddv2cwz35vfvmbnxsf570s91ja86lyfbhy";
+       version = "0.17.1";
+       sha256 = "07p58jf2vn7hyk260ijimg2lyg3jcsqnza8v6kjcn6rjlsvcakvp";
        libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra containers
          data-default hashable haskoin-core monad-logger mtl network nqe
@@ -111368,8 +111398,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.38.0";
-       sha256 = "0hw14mxlz6pbf9694vknypq6q60n8qglixx6sp1h43nqpmc52q8q";
+       version = "0.38.2";
+       sha256 = "1gs1nw6qvgmfzh79hbb8i437gcdypd1cn74j6fx0d3ximgc2nah4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111383,9 +111413,10 @@ self: {
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring cereal conduit containers
          data-default deepseq filepath hashable haskoin-core haskoin-node
-         haskoin-store-data monad-logger mtl nqe optparse-applicative random
-         string-conversions text time transformers unliftio
-         unordered-containers
+         haskoin-store-data hedis http-types monad-logger mtl network nqe
+         optparse-applicative random rocksdb-haskell-jprupp rocksdb-query
+         scotty string-conversions text time transformers unliftio
+         unordered-containers wai warp
        ];
        testHaskellDepends = [
          aeson aeson-pretty base base64 bytestring cereal conduit containers
@@ -111408,8 +111439,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store-data";
-       version = "0.38.0";
-       sha256 = "05218mbwdzz61c0d4fwj9pyr69zb4jc9fir2mp7bjfyrnymb08f5";
+       version = "0.38.1";
+       sha256 = "0x3p0fylfc8llv94nmjaz9537qp2jwm5zlbs8mw7b4lh9z69f3ba";
        libraryHaskellDepends = [
          aeson base bytestring cereal containers data-default deepseq
          hashable haskoin-core http-client http-types lens mtl network
@@ -114877,10 +114908,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedn";
-       version = "0.3.0.1";
-       sha256 = "02pwwxdgw3kkqwckap9mf015bbd27mgblfz7k4y63v0gppw6fqm7";
-       revision = "1";
-       editedCabalFile = "0nbkc1hj0b5q2c3mcz6v2drq8mrh06aryq7gy8cnhhiqzwflk1fh";
+       version = "0.3.0.2";
+       sha256 = "1w9p9h06rgz80153b2q59bblpn124nicn1sscyyjc1cfwda2h0b4";
        libraryHaskellDepends = [
          base containers deepseq deriving-compat megaparsec
          parser-combinators prettyprinter scientific template-haskell text
@@ -119467,6 +119496,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openblasCompat;};
 
+  "hmatrix_0_20_1" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq
+     , openblasCompat, primitive, random, semigroups, split
+     , storable-complex, vector
+     }:
+     mkDerivation {
+       pname = "hmatrix";
+       version = "0.20.1";
+       sha256 = "0v690zml7yqj6ndjszwqpfsad2vma3m6rdkjs6bnb9k2v35l905i";
+       configureFlags = [ "-fdisable-default-paths" "-fopenblas" ];
+       libraryHaskellDepends = [
+         array base binary bytestring deepseq primitive random semigroups
+         split storable-complex vector
+       ];
+       librarySystemDepends = [ openblasCompat ];
+       description = "Numeric Linear Algebra";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openblasCompat;};
+
   "hmatrix-backprop" = callPackage
     ({ mkDerivation, backprop, base, finite-typelits
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
@@ -128084,7 +128133,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "http-client_0_7_2_1" = callPackage
+  "http-client_0_7_3" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , case-insensitive, containers, cookie, deepseq, directory
      , exceptions, filepath, ghc-prim, hspec, http-types, memory
@@ -128093,8 +128142,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.7.2.1";
-       sha256 = "0b699f07yqa525xqqcs4cn32fryjc2212sv8v83yfqlqwdwzr7jg";
+       version = "0.7.3";
+       sha256 = "0jpy5rlv4iwq79h5p37g0nnh5ff2qi4swxx8xmr98v0znvz6wc8i";
        libraryHaskellDepends = [
          array base blaze-builder bytestring case-insensitive containers
          cookie deepseq exceptions filepath ghc-prim http-types memory
@@ -128207,6 +128256,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client-openssl_0_3_3" = callPackage
+    ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system
+     , hspec, http-client, http-types, network
+     }:
+     mkDerivation {
+       pname = "http-client-openssl";
+       version = "0.3.3";
+       sha256 = "03rr1wz1907v3gx5qsqdkd850hy47glb574s69265pv6yspaivdx";
+       libraryHaskellDepends = [
+         base bytestring HsOpenSSL HsOpenSSL-x509-system http-client network
+       ];
+       testHaskellDepends = [
+         base HsOpenSSL hspec http-client http-types
+       ];
+       doCheck = false;
+       description = "http-client backend using the OpenSSL library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-client-overrides" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, network-uri, tasty, tasty-hunit
@@ -138302,8 +138371,8 @@ self: {
      }:
      mkDerivation {
        pname = "j";
-       version = "0.2.0.0";
-       sha256 = "0ggs57f07na6m3r6m65cdxh48qxwhl3hfvarhsbhv16l92x1rpap";
+       version = "0.2.1.0";
+       sha256 = "1r2lldy35sfzqrd82v2fj113l10mhvllf4yxbkrfy0y7wv0c5v8n";
        libraryHaskellDepends = [ base bytestring repa unix ];
        testHaskellDepends = [ base bytestring repa tasty tasty-hunit ];
        description = "J in Haskell";
@@ -148127,6 +148196,8 @@ self: {
        pname = "libfuse3";
        version = "0.1.2.0";
        sha256 = "0a59b4xag5vzisrnvf4v1zkdsdzky96h8w2mdj6cip3vgr196frb";
+       revision = "1";
+       editedCabalFile = "0gnq6aav00xx7dc8am87q2n6xw7cf7jm29g5bq5n1b72gqs91rzf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -159107,6 +159178,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens_0_4_12_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "microlens";
+       version = "0.4.12.0";
+       sha256 = "10q7gl9yavcln58sxdxzih7ff0ixxq5hpd87icvxw97yqf1p6hmm";
+       libraryHaskellDepends = [ base ];
+       description = "A tiny lens library with no dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-aeson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
      , hashable, microlens, scientific, tasty, tasty-hunit, text
@@ -159165,6 +159248,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-ghc_0_4_13" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, microlens
+     , transformers
+     }:
+     mkDerivation {
+       pname = "microlens-ghc";
+       version = "0.4.13";
+       sha256 = "1r6x788br3f9rksj0dmk1nyh5mfvd9zzasclf1mi3rxhb7c0j926";
+       libraryHaskellDepends = [
+         array base bytestring containers microlens transformers
+       ];
+       description = "microlens + array, bytestring, containers, transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-mtl" = callPackage
     ({ mkDerivation, base, microlens, mtl, transformers
      , transformers-compat
@@ -159196,6 +159295,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-platform_0_4_2" = callPackage
+    ({ mkDerivation, base, hashable, microlens, microlens-ghc
+     , microlens-mtl, microlens-th, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-platform";
+       version = "0.4.2";
+       sha256 = "0yf0z0glq2d6mpclzswc64h9w2cck4fd8l8ffm89pyb0a5n8m4c7";
+       libraryHaskellDepends = [
+         base hashable microlens microlens-ghc microlens-mtl microlens-th
+         text unordered-containers vector
+       ];
+       description = "microlens + all batteries included (best for apps)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-process" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath
      , microlens, process
@@ -159204,8 +159320,8 @@ self: {
        pname = "microlens-process";
        version = "0.2.0.2";
        sha256 = "0dvhvrk1v0kjb45xnpjbr8b97vc6dx4cq34jfzkazqdp5jk5nlxp";
-       revision = "1";
-       editedCabalFile = "0l0c6s655ramncmww146had034n58p4bgxsv3wqggjcjnb26j2d0";
+       revision = "2";
+       editedCabalFile = "04j2yap3ha45wq0slvxkd3gm7gkx2dks9abxfd6mg3asmdp743gk";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base filepath microlens process ];
        testHaskellDepends = [ base doctest microlens process ];
@@ -159230,6 +159346,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-th_0_4_3_8" = callPackage
+    ({ mkDerivation, base, containers, microlens, template-haskell
+     , th-abstraction, transformers
+     }:
+     mkDerivation {
+       pname = "microlens-th";
+       version = "0.4.3.8";
+       sha256 = "0dy3vrqcw7ahlcwcqfw8jhisy4yj58f91pk4djqqvj8lnx74cm9f";
+       libraryHaskellDepends = [
+         base containers microlens template-haskell th-abstraction
+         transformers
+       ];
+       testHaskellDepends = [ base microlens ];
+       description = "Automatic generation of record lenses for microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "micrologger" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens
      , text, text-format, time, transformers
@@ -170702,8 +170836,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools-extra";
-       version = "0.5.7.0";
-       sha256 = "0dhw68vkrwfgv9q4skml8kq6zgrg7awjq4vxqp541szvamwvgh6y";
+       version = "0.5.8.0";
+       sha256 = "15jqvrbsabwcix1pkvqc1q9gwfskyil9v995109rzfasw9aihaqk";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base base64 binary bytestring
          case-insensitive containers ede enclosed-exceptions http-client
@@ -189563,28 +189697,28 @@ self: {
 
   "predicate-typed" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
-     , comonad, constraints, containers, deepseq, directory, doctest
-     , hashable, lens, lens-action, pcre-heavy, pcre-light
-     , pretty-terminal, QuickCheck, safe, stm, string-conversions, tasty
-     , tasty-hunit, tasty-quickcheck, template-haskell, text, th-lift
+     , comonad, containers, deepseq, directory, doctest, hashable, lens
+     , lens-action, pcre-heavy, pcre-light, pretty-terminal, QuickCheck
+     , safe, stm, string-conversions, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, th-lift
      , th-lift-instances, these, time
      }:
      mkDerivation {
        pname = "predicate-typed";
-       version = "0.7.4.3";
-       sha256 = "122v0c8zkpv3fdk8wqk4b6q2hicdj7hn1kaavcsf0z266w089ryg";
+       version = "0.7.4.4";
+       sha256 = "0ynlwwh8x5zmr8i3vijdava61ixyv7c0cqb2i9y89pbc4nn72pcm";
        libraryHaskellDepends = [
-         aeson aeson-pretty base binary bytestring comonad constraints
-         containers deepseq directory hashable lens lens-action pcre-heavy
-         pcre-light pretty-terminal QuickCheck safe string-conversions
-         template-haskell text th-lift th-lift-instances these time
+         aeson aeson-pretty base binary bytestring comonad containers
+         deepseq directory hashable lens pcre-heavy pcre-light
+         pretty-terminal QuickCheck safe string-conversions template-haskell
+         text th-lift th-lift-instances these time
        ];
        testHaskellDepends = [
-         aeson aeson-pretty base binary bytestring comonad constraints
-         containers deepseq directory doctest hashable lens lens-action
-         pcre-heavy pcre-light pretty-terminal QuickCheck safe stm
-         string-conversions tasty tasty-hunit tasty-quickcheck
-         template-haskell text th-lift th-lift-instances these time
+         aeson aeson-pretty base binary bytestring comonad containers
+         deepseq directory doctest hashable lens lens-action pcre-heavy
+         pcre-light pretty-terminal QuickCheck safe stm string-conversions
+         tasty tasty-hunit tasty-quickcheck template-haskell text th-lift
+         th-lift-instances these time
        ];
        description = "Predicates, Refinement types and Dsl";
        license = stdenv.lib.licenses.bsd3;
@@ -202871,8 +203005,8 @@ self: {
      }:
      mkDerivation {
        pname = "require";
-       version = "0.4.9";
-       sha256 = "0f04cpgcgl5d0zj8j5d2wfg8m1g2zw5lw39qj8797y3shxh8jdih";
+       version = "0.4.10";
+       sha256 = "0ha9301ncb5li3sxjlbbq5hgjijr40vl5jy33fsi0wn13zp99x94";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -219160,6 +219294,8 @@ self: {
        pname = "smash-microlens";
        version = "0.1.0.0";
        sha256 = "164vmvrgfsq777408skndzybhg4cp0d97vrijk6b66nnv9k4ril0";
+       revision = "1";
+       editedCabalFile = "020r04bxhml84lgl1bvf2s6gjahswdxpzcrla43rqhx0paz0n0cs";
        libraryHaskellDepends = [ base microlens smash ];
        testHaskellDepends = [ base ];
        description = "Optics for the `smash` library";
@@ -228666,8 +228802,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "subG";
-       version = "0.1.1.1";
-       sha256 = "0726w12aqjmbdvqp8lpv68dh4h98bzv13ng41831ljdr76c3lrsy";
+       version = "0.2.0.0";
+       sha256 = "0ss65f4k51hwhp1amg0nih766nf8chhdjhic854h7bxg5ywzjwlc";
        libraryHaskellDepends = [ base ];
        description = "Some extension to the Foldable and Monoid classes";
        license = stdenv.lib.licenses.mit;
@@ -233935,8 +234071,8 @@ self: {
      }:
      mkDerivation {
        pname = "telegram-bot-simple";
-       version = "0.3.4";
-       sha256 = "1a007ldp20lcmv55zjca5hc0pszvp2n5yprl4lri9dn49xa8mf6k";
+       version = "0.3.5";
+       sha256 = "08b650z513lbmmb46xinwgdb3csgpx9rjk5vn345xb9b0ki94chq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From 0ef0f83fbf20f0cd45a6210b42e43c8bac42067a Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Wed, 18 Nov 2020 20:33:04 +0900
Subject: [PATCH 3102/3942] haskellPackages.semver-range: disable tests to get
 building

---
 pkgs/development/haskell-modules/configuration-common.nix   | 6 ++++++
 .../development/haskell-modules/configuration-ghc-8.8.x.nix | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b0aba7df518e..4571ac3dcc65 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1425,4 +1425,10 @@ self: super: {
 
   # 2020-11-17: persistent-test is ahead of the persistent version in stack
   persistent-sqlite = dontCheck super.persistent-sqlite;
+
+  # The tests for semver-range need to be updated for the MonadFail change in
+  # ghc-8.8:
+  # https://github.com/adnelson/semver-range/issues/15
+  semver-range = dontCheck super.semver-range;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 546f3a053adc..497e201fb1a9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -95,11 +95,6 @@ self: super: {
   # https://github.com/kowainik/relude/issues/241
   relude = dontCheck super.relude;
 
-  # The tests for semver-range need to be updated for the MonadFail change in
-  # ghc-8.8:
-  # https://github.com/adnelson/semver-range/issues/15
-  semver-range = dontCheck super.semver-range;
-
   # The current version 2.14.2 does not compile with ghc-8.8.x or newer because
   # of issues with Cabal 3.x.
   darcs = dontDistribute super.darcs;

From 12d12e5b1f71ea6f9b0b68bc23ac0c54334e711a Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Wed, 18 Nov 2020 22:23:46 +0900
Subject: [PATCH 3103/3942] spago: get building again with ghc8102

---
 .../haskell-modules/configuration-nix.nix     | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index d1e7da50f5e1..b9fd1a6fcdf9 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -664,9 +664,26 @@ self: super: builtins.intersectAttrs super {
     let
       # Spago needs a small patch to work with the latest versions of rio.
       # https://github.com/purescript/spago/pull/647
-      spagoWithPatches = appendPatch super.spago (pkgs.fetchpatch {
-        url = "https://github.com/purescript/spago/pull/647/commits/917ee541a966db74f0f5d11f2f86df0030c35dd7.patch";
-        sha256 = "1nspqgcjk6z90cl9zhard0rn2q979kplcqz72x8xv5mh57zabk0w";
+      spagoWithPatches = overrideCabal (appendPatch super.spago (
+        # Spago-0.17 needs a small patch to work with the latest version of dhall.
+        # This can probably be removed with Spago-0.18.
+        # https://github.com/purescript/spago/pull/695
+        pkgs.fetchpatch {
+          url = "https://github.com/purescript/spago/commit/6258ac601480e776c215c989cc5faae46d5ca9f7.patch";
+          sha256 = "02zy4jf24qlqz9fkcs2rqg64ijd8smncmra8s5yp2mln4dmmii1k";
+        }
+      )) (old: {
+        # The above patch contains a completely new spago.cabal file, but our
+        # source tree from Hackage already contains a cabal file.  Delete the
+        # local cabal file and just take the one from the patch.
+        #
+        # WARNING: The empty line above the `rm` needs to be kept.
+        prePatch = old.prePatch or "" + ''
+
+          rm spago.cabal
+        '';
+        # The above patch also adds a dependency on the stringsearch package.
+        libraryHaskellDepends = old.libraryHaskellDepends or [] ++ [ self.stringsearch ];
       });
 
       # spago requires an older version of megaparsec, but it appears to work

From 33d504be0e72682d32d67a9aedb5b053e2dad892 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Thu, 19 Nov 2020 00:17:36 +0100
Subject: [PATCH 3104/3942] haskellPackages.neuron: Fix dependencies

Sadly neuron itself remains broken. Fix for it is yet to come.
---
 .../haskell-modules/configuration-common.nix  | 50 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4571ac3dcc65..4c61356c88c6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1239,7 +1239,22 @@ self: super: {
   patch = doJailbreak super.patch;
 
   # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
-  reflex-dom-core = doDistribute (unmarkBroken (dontCheck super.reflex-dom-core));
+  reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatch super.reflex-dom-core (pkgs.fetchpatch {
+    url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch;
+    sha256 = "1g7lgwj7rpziilif2gian412iy05gqbzwx9w0m6ajq3clxs5zs7l";
+    stripLen = 2;
+    extraPrefix = "";
+    includes = ["reflex-dom-core.cabal" ];
+  }))));
+
+  # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
+  reflex-dom = appendPatch super.reflex-dom (pkgs.fetchpatch {
+    url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch;
+    sha256 = "1g7lgwj2rpziilif2gian412iy05gqbzwx9w0m6ajq3clxs5zs7l";
+    stripLen = 2;
+    extraPrefix = "";
+    includes = ["reflex-dom.cabal" ];
+  });
 
   # add unreleased commit fixing version constraint as a patch
   # Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved
@@ -1431,4 +1446,37 @@ self: super: {
   # https://github.com/adnelson/semver-range/issues/15
   semver-range = dontCheck super.semver-range;
 
+  dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch {
+    # 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9
+    # Bump version bounds for ghc 8.10
+    url = https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/e1f5898116222a1bc557d41f3395066f83736093.patch;
+    sha256 = "01fj29xdblxpz4drasaygf9875fipylpj8w164lb0cszd1vmqwnb";
+  });
+
+  # 2020-11-18: https://github.com/srid/rib/issues/169
+  # aeson bound out of sync
+  rib-core = doJailbreak super.rib-core;
+
+  # 2020-11-18: https://github.com/obsidiansystems/aeson-gadt-th/issues/25
+  # Testsuite is broken
+  aeson-gadt-th = dontCheck super.aeson-gadt-th;
+
+  # 2020-11-18: https://github.com/srid/neuron/issues/474
+  # base upper bound is incompatible with ghc 8.10
+  neuron = doJailbreak super.neuron;
+
+  reflex = appendPatches super.reflex [
+    # https://github.com/reflex-frp/reflex/pull/444
+    # Fixes for ghc 8.10
+    (pkgs.fetchpatch {
+      url = https://github.com/reflex-frp/reflex/commit/d230632427fc1b7031163567c97f20050610c122.patch;
+      sha256 = "0gafqqi6q16m5y4mrc2f7lhahmazvcbiadn2v84y9p3zvx2v26xy";
+    })
+    # https://github.com/reflex-frp/reflex/pull/444
+    # Bound bumps for ghc 8.10
+    (pkgs.fetchpatch {
+      url = https://patch-diff.githubusercontent.com/raw/reflex-frp/reflex/pull/448.patch;
+      sha256 = "0a8gcq9g8dyyafkvs54mi3fnisff20r0x0qzmhxcp9md61nkf7gq";
+    })
+  ];
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From b24ba952ece354e3c1259f4c332d0c6c2325aba0 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Thu, 19 Nov 2020 01:52:51 +0100
Subject: [PATCH 3105/3942] haskellPackages.stan: Fix build

---
 pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4c61356c88c6..233857525942 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1479,4 +1479,11 @@ self: super: {
       sha256 = "0a8gcq9g8dyyafkvs54mi3fnisff20r0x0qzmhxcp9md61nkf7gq";
     })
   ];
+
+  # 2020-11-19: jailbreaking because of pretty-simple bound out of date
+  # https://github.com/kowainik/stan/issues/408
+  # Tests disabled because of: https://github.com/kowainik/stan/issues/409
+  stan = doJailbreak (dontCheck super.stan);
+  # 2020-11-19: Disabling tests with this issue: https://github.com/cchalmers/pcg-random/issues/10
+  pcg-random = dontCheck super.pcg-random;
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From fb25b2808dc27db6c3e02c91cc3b444fde0b94a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Nov 2020 02:30:29 +0100
Subject: [PATCH 3106/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-27-g11a103b from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/e037d20ad42cae802cf147d69b75629c5011469d.
---
 .../haskell-modules/hackage-packages.nix      | 244 ++++++++++++++----
 1 file changed, 198 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d74824462648..7b571996f358 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5958,8 +5958,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames-streamly";
-       version = "0.1.0.1";
-       sha256 = "1fxbbg2dqyzq593qzn35flf9yj1zlbzr0izmcxvsrxq2h6kcr2hh";
+       version = "0.1.0.2";
+       sha256 = "0i007clm5q2rjmj7qfyig4sajk2bi1fc57w132j4vrvgp3p9p4rr";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base exceptions Frames primitive streamly text vinyl
@@ -30378,8 +30378,8 @@ self: {
      }:
      mkDerivation {
        pname = "array-builder";
-       version = "0.1.0.0";
-       sha256 = "0wh1x3hywb0jaqxa7kdh3x3w0mqa4dwq2wdc70fvgmlijm6pyqw9";
+       version = "0.1.1.0";
+       sha256 = "0g9mpplq813b33yfgfa095k2vnrxnj8lhxvw60qc6jky6l9q0inq";
        libraryHaskellDepends = [ array-chunks base primitive run-st ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Builders for arrays";
@@ -30392,8 +30392,8 @@ self: {
      }:
      mkDerivation {
        pname = "array-chunks";
-       version = "0.1.1.0";
-       sha256 = "0lx33cyqv5b5iyxy4v18dxs1zb0j72kxnlckhcckjvncg8lyf413";
+       version = "0.1.2.0";
+       sha256 = "0x2hkc587ki4ncpsdrhby04dr4gxvf0v5qj5kda7kfl2814srixi";
        libraryHaskellDepends = [ base primitive run-st ];
        testHaskellDepends = [
          base primitive QuickCheck quickcheck-classes tasty tasty-hunit
@@ -34667,6 +34667,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bank-holidays-england_0_2_0_6" = callPackage
+    ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
+     mkDerivation {
+       pname = "bank-holidays-england";
+       version = "0.2.0.6";
+       sha256 = "1g8x61byxikanfdpnmfc354gp1kyd5c4jlym9w65sh7l1jpbm4ss";
+       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
@@ -84973,7 +84986,7 @@ self: {
   "flashblast" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, co-log-polysemy
      , co-log-polysemy-formatting, comonad, composite-base, dhall
-     , first-class-families, formatting, generic-monoid
+     , either, extra, first-class-families, formatting, generic-monoid
      , ghc-clippy-plugin, http-conduit, lucid, megaparsec, optics
      , optics-extra, path, path-dhall-instance, path-utils, polysemy
      , polysemy-extra, polysemy-fs, polysemy-fskvstore, polysemy-http
@@ -84984,29 +84997,29 @@ self: {
      }:
      mkDerivation {
        pname = "flashblast";
-       version = "0.0.8.0";
-       sha256 = "0y3pqknpzycwdja9gpkpbmmfapwwkpzsxh6ng461i0x5qknc1mbs";
+       version = "0.0.9.0";
+       sha256 = "14fbdn72x0kb267j5a4inii0y43s03r1mnsnvzmx4wd5kkp0k3d2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base co-log-polysemy co-log-polysemy-formatting
-         comonad composite-base dhall first-class-families formatting
-         generic-monoid ghc-clippy-plugin http-conduit lucid megaparsec
-         optics optics-extra path path-dhall-instance path-utils polysemy
-         polysemy-extra polysemy-fs polysemy-fskvstore polysemy-http
-         polysemy-methodology polysemy-methodology-composite polysemy-plugin
-         polysemy-video polysemy-vinyl polysemy-zoo relude
+         comonad composite-base dhall either extra first-class-families
+         formatting generic-monoid ghc-clippy-plugin http-conduit lucid
+         megaparsec optics optics-extra path path-dhall-instance path-utils
+         polysemy polysemy-extra polysemy-fs polysemy-fskvstore
+         polysemy-http polysemy-methodology polysemy-methodology-composite
+         polysemy-plugin polysemy-video polysemy-vinyl polysemy-zoo relude
          replace-megaparsec rio semialign subtitleParser temporary text
          these turtle unliftio-path vinyl
        ];
        executableHaskellDepends = [
          aeson attoparsec base co-log-polysemy co-log-polysemy-formatting
-         comonad composite-base dhall first-class-families formatting
-         generic-monoid ghc-clippy-plugin http-conduit lucid megaparsec
-         optics optics-extra path path-dhall-instance path-utils polysemy
-         polysemy-extra polysemy-fs polysemy-fskvstore polysemy-http
-         polysemy-methodology polysemy-methodology-composite polysemy-plugin
-         polysemy-video polysemy-vinyl polysemy-zoo relude
+         comonad composite-base dhall either extra first-class-families
+         formatting generic-monoid ghc-clippy-plugin http-conduit lucid
+         megaparsec optics optics-extra path path-dhall-instance path-utils
+         polysemy polysemy-extra polysemy-fs polysemy-fskvstore
+         polysemy-http polysemy-methodology polysemy-methodology-composite
+         polysemy-plugin polysemy-video polysemy-vinyl polysemy-zoo relude
          replace-megaparsec rio semialign subtitleParser temporary text
          these turtle unliftio-path vinyl
        ];
@@ -101825,6 +101838,60 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graphula" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , generics-eot, hspec, http-api-data, HUnit, markdown-unlit
+     , monad-logger, mtl, path-pieces, persistent, persistent-sqlite
+     , persistent-template, QuickCheck, random, resourcet, semigroups
+     , temporary, text, transformers, unliftio, unliftio-core, uuid
+     }:
+     mkDerivation {
+       pname = "graphula";
+       version = "2.0.0.1";
+       sha256 = "1sd89mkbqflyzvsszmiddcssnkjn27dgh5dpp082xqla4b7grhml";
+       libraryHaskellDepends = [
+         base containers directory generics-eot HUnit mtl persistent
+         QuickCheck random semigroups temporary text transformers unliftio
+         unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec http-api-data markdown-unlit
+         monad-logger path-pieces persistent persistent-sqlite
+         persistent-template QuickCheck resourcet semigroups text
+         transformers unliftio-core uuid
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "A declarative library for describing dependencies between data";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "graphula-core" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , generics-eot, hspec, http-api-data, HUnit, markdown-unlit
+     , monad-logger, mtl, path-pieces, persistent, persistent-sqlite
+     , persistent-template, QuickCheck, random, resourcet, semigroups
+     , temporary, text, transformers, unliftio, unliftio-core, uuid
+     }:
+     mkDerivation {
+       pname = "graphula-core";
+       version = "2.0.0.1";
+       sha256 = "0yl1x5dw70rds9fk7ijsyrksharjm2fhvbihybjbjpj89s1n1zir";
+       libraryHaskellDepends = [
+         base containers directory generics-eot HUnit mtl persistent
+         QuickCheck random semigroups temporary text transformers unliftio
+         unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec http-api-data markdown-unlit
+         monad-logger path-pieces persistent persistent-sqlite
+         persistent-template QuickCheck resourcet semigroups text
+         transformers unliftio-core uuid
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "A declarative library for describing dependencies between data";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "graphviz" = callPackage
     ({ mkDerivation, base, bytestring, colour, containers, criterion
      , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath, graphviz
@@ -111398,8 +111465,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.38.2";
-       sha256 = "1gs1nw6qvgmfzh79hbb8i437gcdypd1cn74j6fx0d3ximgc2nah4";
+       version = "0.38.3";
+       sha256 = "1131smwdfbyw6y3mk3nsnsgkky0sd4zxjmlzzdp5g3b8s9859vwh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112981,6 +113048,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haveibeenpwned" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, data-default
+     , http-client, http-client-tls, http-types, monad-logger, mtl, safe
+     , text
+     }:
+     mkDerivation {
+       pname = "haveibeenpwned";
+       version = "0.2.0.1";
+       sha256 = "0zbxqhn76cknqmilzv7s11hwbq09if6pyc5p111vnxpd7xas6hwl";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cryptonite data-default http-client http-types
+         monad-logger mtl safe text
+       ];
+       executableHaskellDepends = [
+         base http-client http-client-tls monad-logger text
+       ];
+       description = "Library for checking for weak/compromised passwords";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haven" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , http-conduit, http-types, mtl, process, SHA, temporary
@@ -128481,15 +128570,16 @@ self: {
 
   "http-conduit-downloader" = callPackage
     ({ mkDerivation, base, bytestring, data-default, HsOpenSSL
-     , http-client, http-types, network, network-uri, text, time, zlib
+     , http-client, http-client-openssl, http-types, network
+     , network-uri, text, time, zlib
      }:
      mkDerivation {
        pname = "http-conduit-downloader";
-       version = "1.1.2";
-       sha256 = "188rhadf1dya2iyvcvfp1xvnhjmhkf06i606mrkrlmzbds2kb8hh";
+       version = "1.1.3";
+       sha256 = "12fv42jnh2glnav082a1d67za9ya9v0zpnxsphxhcy90b4s4rr6x";
        libraryHaskellDepends = [
-         base bytestring data-default HsOpenSSL http-client http-types
-         network network-uri text time zlib
+         base bytestring data-default HsOpenSSL http-client
+         http-client-openssl http-types network network-uri text time zlib
        ];
        description = "HTTP downloader tailored for web-crawler needs";
        license = stdenv.lib.licenses.bsd3;
@@ -132217,10 +132307,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyraxAbif";
-       version = "0.2.3.21";
-       sha256 = "0ghhfv8gzs9sg13nj3mhqd24zbrkjj1dgsjz3sql6276kpa1p2kc";
-       revision = "3";
-       editedCabalFile = "12ka2k7z7yg3jbx6ya409flyqpl6i29hcf445dicbp1jpra2d70f";
+       version = "0.2.3.27";
+       sha256 = "1ww4lgf280sjj9bhj8s6pxadqwk91jkx6lngb2cqcf81gr38drhm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140263,8 +140351,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-syntax";
-       version = "0.1.1.0";
-       sha256 = "08an68dh7ci5a84p25qzyfijhqbqsmsps0cyv8j5s3jfisaggbp5";
+       version = "0.1.2.0";
+       sha256 = "0i0b54ykfd530wl8gmqw13wjwj5m6wdfgc1nyxxdz1abydxy5bpn";
        libraryHaskellDepends = [
          array-builder array-chunks base bytebuild byteslice bytesmith
          bytestring primitive scientific-notation text-short
@@ -140275,8 +140363,8 @@ self: {
          tasty-hunit text text-short unordered-containers vector
        ];
        benchmarkHaskellDepends = [
-         aeson base byteslice bytestring gauge neat-interpolation primitive
-         scientific-notation text
+         aeson base bytebuild byteslice bytestring gauge neat-interpolation
+         primitive scientific-notation text
        ];
        description = "High-performance JSON parser and encoder";
        license = stdenv.lib.licenses.bsd3;
@@ -183468,8 +183556,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-examples";
-       version = "0.6.0.0";
-       sha256 = "15y17zg9vx9f0hdpdkx56xsr5dqfpx2qsdmndlpy2yp35cq9yqhq";
+       version = "0.6.2.0";
+       sha256 = "1gjlbzd7hy280sy7qpzdrljpr59rmln8g0s7rsmkhzqbvfbyfgfj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183496,8 +183584,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-general";
-       version = "0.2.0.0";
-       sha256 = "1sfaqg3v31188zk70c290ww5k80ph30h2kcgpc8pxj8v3baj5p8x";
+       version = "0.3.0.0";
+       sha256 = "0ay0814py6kxq4r64jlzpr1nkjdpkh5vdiw0kxn6ifzrh382681h";
        libraryHaskellDepends = [
          base phonetic-languages-common phonetic-languages-plus print-info
          subG vector
@@ -205677,6 +205765,21 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "rosebud" = callPackage
+    ({ mkDerivation, base, containers, hspec, hspec-discover
+     , QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "rosebud";
+       version = "0.1.0.0";
+       sha256 = "0w5p6d44wddg7sm0rna1yxhi57b1fr8in0mg34z1f6fakdm900lv";
+       libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
+       description = "Common rose tree/forest functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rosezipper" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -208033,6 +208136,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "say-my-name" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "say-my-name";
+       version = "0.1.0.0";
+       sha256 = "1fc9jgyapdc0rlni6l60b8ya272vg8km8p97pb52f4gj5z48zk3j";
+       libraryHaskellDepends = [ base ];
+       description = "Require explicit type application for some type variables";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sbp" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base
      , base64-bytestring, basic-prelude, binary, binary-conduit
@@ -222103,8 +222217,8 @@ self: {
      }:
      mkDerivation {
        pname = "spake2";
-       version = "0.4.2";
-       sha256 = "02zvlh7pva2d2k56n3070wdp4chv6avhwzn7mg2zax1mzswd21r4";
+       version = "0.4.3";
+       sha256 = "1vr19nia8876c19l4fj1v2bfxkfm8bbg65gmqn7as9rn8jg7wx64";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -228802,8 +228916,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "subG";
-       version = "0.2.0.0";
-       sha256 = "0ss65f4k51hwhp1amg0nih766nf8chhdjhic854h7bxg5ywzjwlc";
+       version = "0.4.0.0";
+       sha256 = "1iihy4sd01bnc85gy1ipgk2jxvcrqm31b8xjflj1rly7sr69bsky";
        libraryHaskellDepends = [ base ];
        description = "Some extension to the Foldable and Monoid classes";
        license = stdenv.lib.licenses.mit;
@@ -237322,6 +237436,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-lift-instances_0_1_18" = callPackage
+    ({ mkDerivation, base, bytestring, containers, QuickCheck
+     , template-haskell, text, th-lift, transformers, vector
+     }:
+     mkDerivation {
+       pname = "th-lift-instances";
+       version = "0.1.18";
+       sha256 = "09nv1zsffvv6zfz1fjzcqrla3lc350qr4i4xf7wgvzp049sprrdy";
+       libraryHaskellDepends = [
+         base bytestring containers template-haskell text th-lift
+         transformers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers QuickCheck template-haskell text vector
+       ];
+       description = "Lift instances for template-haskell for common data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-nowq" = callPackage
     ({ mkDerivation, base, markdown-unlit, template-haskell, time }:
      mkDerivation {
@@ -256377,8 +256511,8 @@ self: {
      }:
      mkDerivation {
        pname = "witch";
-       version = "0.0.0.2";
-       sha256 = "0d120f3cicwqcq0h6sdyl9pzwgslx7i6jawmmrcq1gi1yxgzd8sk";
+       version = "0.0.0.3";
+       sha256 = "0ghajh4f4xfhn79bmyhamxjgl63lwg37kp39nn1q6qxggzzmzkyx";
        libraryHaskellDepends = [ base bytestring containers text ];
        testHaskellDepends = [
          base bytestring containers hspec QuickCheck text
@@ -265958,4 +266092,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "zydiskell" = callPackage
+    ({ mkDerivation, base, bytestring, fixed-vector, storable-record
+     , vector
+     }:
+     mkDerivation {
+       pname = "zydiskell";
+       version = "0.1.0.1";
+       sha256 = "1qrgdwmmxlf3zspxdc84cfnwj6fpwpfyx7qry91k7f46ij0aizbi";
+       libraryHaskellDepends = [
+         base bytestring fixed-vector storable-record vector
+       ];
+       testHaskellDepends = [
+         base bytestring fixed-vector storable-record vector
+       ];
+       description = "Haskell language binding for the Zydis library, a x86/x86-64 disassembler";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
 }

From 498f9f63dab8985896dfb71fe01e11e4a6a3bdcf Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Thu, 19 Nov 2020 09:54:45 +0800
Subject: [PATCH 3107/3942] haskellPackages.streamly: fix build

The build was broken because our `primitive` version was too high.

Using the patch from https://github.com/composewell/streamly/pull/565
---
 pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 233857525942..5a72eae58ed8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1486,4 +1486,12 @@ self: super: {
   stan = doJailbreak (dontCheck super.stan);
   # 2020-11-19: Disabling tests with this issue: https://github.com/cchalmers/pcg-random/issues/10
   pcg-random = dontCheck super.pcg-random;
+
+  # Use an already merged upstream patch fixing the build with primitive >= 0.7.2
+  # The version bounds were correctly specified before, so we need to jailbreak as well
+  streamly = appendPatch (doJailbreak super.streamly) (pkgs.fetchpatch {
+    url = "https://github.com/composewell/streamly/commit/2c88cb631fdcb5c0d3a8bc936e1e63835800be9b.patch";
+    sha256 = "0g2m0y46zr3xs9fswkm4h9adhsg6gzl5zwgidshsjh3k3rq4h7b1";
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 899f9ffc3625623daee408c43a8f5c0398e82722 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 18 Nov 2020 23:32:53 +0100
Subject: [PATCH 3108/3942] haskellPackages.haskell-language-server: Try to fix
 tests

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++-
 pkgs/development/haskell-modules/configuration-nix.nix    | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5a72eae58ed8..2691631ee220 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1410,7 +1410,13 @@ self: super: {
   # overriding aeson on all of them to prevent double compilations
   # this shouldn‘t break anything because nearly all their reverse deps are
   # in this list or marked as broken anyways
-  haskell-language-server = dontCheck super.haskell-language-server;
+  # 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests:
+  # https://github.com/haskell/haskell-language-server/issues/610
+  # https://github.com/haskell/haskell-language-server/issues/611
+  haskell-language-server = dontCheck (super.haskell-language-server.override {
+    lsp-test = dontCheck self.lsp-test_0_11_0_7;
+  });
+
   fourmolu = dontCheck super.fourmolu;
   ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch {
     # 2020-11-13: Bumping bounds via an already upstream merged change
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index b9fd1a6fcdf9..0a08fb89cbfa 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -823,5 +823,11 @@ self: super: builtins.intersectAttrs super {
         ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_version}
         ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_major_version}
        '';
+    testToolDepends = [ self.cabal-install pkgs.git ];
+    testTarget = "func-test"; # wrapper test accesses internet
+    preCheck = ''
+      export PATH=$PATH:$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper
+      export HOME=$TMPDIR
+    '';
   });
 }

From 4e5914ee258330f93c3461bb2c5d229ef30b205b Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Thu, 19 Nov 2020 12:43:47 +0100
Subject: [PATCH 3109/3942] haskellPackages.neuron: Fix build

This bumps aeson-gadt-th, which will be pulled in by the hackage update
this night anyways.
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ----
 pkgs/development/haskell-modules/hackage-packages.nix     | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2691631ee220..d2fcb4adc09b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1463,10 +1463,6 @@ self: super: {
   # aeson bound out of sync
   rib-core = doJailbreak super.rib-core;
 
-  # 2020-11-18: https://github.com/obsidiansystems/aeson-gadt-th/issues/25
-  # Testsuite is broken
-  aeson-gadt-th = dontCheck super.aeson-gadt-th;
-
   # 2020-11-18: https://github.com/srid/neuron/issues/474
   # base upper bound is incompatible with ghc 8.10
   neuron = doJailbreak super.neuron;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7b571996f358..3fbd2a43f985 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -22664,8 +22664,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-gadt-th";
-       version = "0.2.4";
-       sha256 = "0nl9p7q7bfggm7nk8jmqb53qzdr5qwgscpnxy4r7hjvmd4cx6nrm";
+       version = "0.2.5.0";
+       sha256 = "17csf7w0r6v8abmj9wx3fa830fmxif0mr3pgwxd63xhlrpv1hq72";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From bea4d0dc4964074a47afbf4833d9eb1b168bc7d7 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Thu, 19 Nov 2020 13:01:36 +0100
Subject: [PATCH 3110/3942] haskellPackages.snap: Fix build

---
 .../haskell-modules/configuration-common.nix  | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d2fcb4adc09b..4ee539607886 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1111,21 +1111,6 @@ self: super: {
   # https://github.com/kazu-yamamoto/dns/issues/150
   dns = dontCheck super.dns;
 
-  # apply patches from https://github.com/snapframework/snap-server/pull/126
-  # manually until they are accepted upstream
-  snap-server = overrideCabal super.snap-server (drv: {
-    patches = [(pkgs.fetchpatch {
-      # allow compilation with network >= 3
-      url = "https://github.com/snapframework/snap-server/pull/126/commits/4338fe15d68e11e3c7fd0f9862f818864adc1d45.patch";
-      sha256 = "1nlw9lckm3flzkmhkzwc7zxhdh9ns33w8p8ds8nf574nqr5cr8bv";
-    })
-    (pkgs.fetchpatch {
-      # prefer fdSocket over unsafeFdSocket
-      url = "https://github.com/snapframework/snap-server/pull/126/commits/410de2df123b1d56b3093720e9c6a1ad79fe9de6.patch";
-      sha256 = "08psvw0xny64q4bw1nwg01pkzh01ak542lw6k1ps7cdcwaxk0n94";
-    })];
-  });
-
   # https://github.com/haskell-servant/servant-blaze/issues/17
   servant-blaze = doJailbreak super.servant-blaze;
 
@@ -1496,4 +1481,10 @@ self: super: {
     sha256 = "0g2m0y46zr3xs9fswkm4h9adhsg6gzl5zwgidshsjh3k3rq4h7b1";
   });
 
+  # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
+  heist = doJailbreak super.heist;
+
+  # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
+  snap = doJailbreak super.snap;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From fb82f19d712fa047bac8e77c4392006b1f03867c Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Thu, 19 Nov 2020 15:22:56 +0100
Subject: [PATCH 3111/3942] haskellPackages.git-annex: Fix build

---
 .../haskell-modules/configuration-common.nix       | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4ee539607886..c59abb628828 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -69,7 +69,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "1g5ba1lv0v4zjk5ghdp78wxgszspfda1lrl734fi7hyavqrfjxkz";
+      sha256 = "13s6czv4p6n6s16kr5r255vldrn9038qjd5yl5xrh91xk6z410cd";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -252,7 +252,13 @@ self: super: {
   angel = dontCheck super.angel;
   apache-md5 = dontCheck super.apache-md5;              # http://hydra.cryp.to/build/498709/nixlog/1/raw
   app-settings = dontCheck super.app-settings;          # http://hydra.cryp.to/build/497327/log/raw
-  aws = dontCheck super.aws;                            # needs aws credentials
+  aws = appendPatch (dontCheck super.aws)               # needs aws credentials
+        (pkgs.fetchpatch {
+          # https://github.com/aristidb/aws/pull/271
+          # bump a version bound
+          url = https://github.com/aristidb/aws/commit/3639262ccd6761dea76f052692ac3aefbd254723.patch;
+          sha256 = "0nxaspldgayqjnidda8w7wps5gdpr2wz6vynl7vkaw8kzxks9bci";
+        });
   aws-kinesis = dontCheck super.aws-kinesis;            # needs aws credentials for testing
   binary-protocol = dontCheck super.binary-protocol;    # http://hydra.cryp.to/build/499749/log/raw
   binary-search = dontCheck super.binary-search;
@@ -1432,6 +1438,10 @@ self: super: {
   # 2020-11-17: persistent-test is ahead of the persistent version in stack
   persistent-sqlite = dontCheck super.persistent-sqlite;
 
+  # 2020-11-19: hasn‘t bumped aeson bound
+  # https://git-annex.branchable.com/bugs/aeson_bound_can_be_bumped_to___60___1.6
+  git-lfs = doJailbreak super.git-lfs;
+
   # The tests for semver-range need to be updated for the MonadFail change in
   # ghc-8.8:
   # https://github.com/adnelson/semver-range/issues/15

From 1f1d171337308e5fbe8900d536a4e97541e9fd6b Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 20 Nov 2020 00:47:28 +0100
Subject: [PATCH 3112/3942] haskellPackages.reflex-dom: Fix patch hash

---
 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 c59abb628828..2c48fe8cc78b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1241,7 +1241,7 @@ self: super: {
   # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
   reflex-dom = appendPatch super.reflex-dom (pkgs.fetchpatch {
     url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch;
-    sha256 = "1g7lgwj2rpziilif2gian412iy05gqbzwx9w0m6ajq3clxs5zs7l";
+    sha256 = "1ndqw5r85axynmx55ld6qr8ik1i1mkh6wrnkzpxbwyil2ms8mxn0";
     stripLen = 2;
     extraPrefix = "";
     includes = ["reflex-dom.cabal" ];

From f9aa2a6614adb914aaddbe822a5b9b53cc31588d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Nov 2020 02:30:26 +0100
Subject: [PATCH 3113/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-27-g11a103b from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/fa720610b0b276e61317ffaf5eb0ca431d9ef128.
---
 .../haskell-modules/hackage-packages.nix      | 266 +++++++++++++-----
 1 file changed, 196 insertions(+), 70 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3fbd2a43f985..76e6e074e0df 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -18214,8 +18214,8 @@ self: {
        pname = "TestExplode";
        version = "0.1.0.0";
        sha256 = "0r4nwzwdila9p05g5y99rp06dbh1k2yl5jsc6yn6dwvxkvvdjcs1";
-       revision = "6";
-       editedCabalFile = "11855w0z8l8hs387rrnp9qgh3krlx6d7pd2bdrb72jcgkyvdhgjg";
+       revision = "7";
+       editedCabalFile = "0m66y84bcnwmws9lvgasi7vrsp5qdd68saxizx5kkqn3c6qnd06b";
        libraryHaskellDepends = [
          base containers directory fgl graphviz interpolatedstring-perl6 mtl
          process text
@@ -50660,8 +50660,8 @@ self: {
      }:
      mkDerivation {
        pname = "citeproc";
-       version = "0.1.1.1";
-       sha256 = "1w6ivzkwjpgaqd8nnb73krp2xwnkli5ggd0nmw3llxfzcvpg0mxz";
+       version = "0.2";
+       sha256 = "1jibg9yzcdafijy5c8khgavirbxq44plsw81gkxya24yc9ag5bi6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53286,8 +53286,8 @@ self: {
      }:
      mkDerivation {
        pname = "codeworld-api";
-       version = "0.6.0";
-       sha256 = "1m1kqr8gniqcxc3s8yvk4rb2v0cg7wl0m3dam3g4ida2i8r5p22a";
+       version = "0.7.0";
+       sha256 = "1l1w4mrw4b2njz4kmfvd94mlwn776vryy1y9x9cb3r69fw5qy2f3";
        libraryHaskellDepends = [
          aeson base base64-bytestring blank-canvas bytestring cereal
          cereal-text containers deepseq dependent-sum ghc-prim hashable
@@ -54935,8 +54935,8 @@ self: {
      }:
      mkDerivation {
        pname = "compendium-client";
-       version = "0.2.0.0";
-       sha256 = "1jsl2li88wvw61r38gcwdn7y6gf7q6br50i4mfnh40mzq1qqgkm0";
+       version = "0.2.1.1";
+       sha256 = "0iqk3lyfayy7xwa97jzzch2mhg8zam3ip2i524ki5qnw2ih3mizv";
        libraryHaskellDepends = [
          aeson base http-client language-protobuf megaparsec servant
          servant-client text
@@ -61232,24 +61232,25 @@ self: {
     ({ mkDerivation, alex, ansi-terminal, array, async, base
      , base-compat, blaze-html, bv-sized, bytestring, containers
      , criterion, cryptohash-sha1, deepseq, directory, exceptions
-     , filepath, gitrev, GraphSCC, happy, haskeline, heredoc, libBF
-     , monad-control, monadLib, mtl, panic, parameterized-utils, pretty
-     , process, random, sbv, simple-smt, strict, text, tf-random, time
-     , transformers, transformers-base, what4
+     , filepath, ghc-prim, gitrev, GraphSCC, happy, haskeline, heredoc
+     , integer-gmp, libBF, MemoTrie, monad-control, monadLib, mtl, panic
+     , parameterized-utils, pretty, process, random, sbv, simple-smt
+     , stm, strict, text, tf-random, time, transformers
+     , transformers-base, what4
      }:
      mkDerivation {
        pname = "cryptol";
-       version = "2.9.1";
-       sha256 = "0c484pla89igj77x5n2n50a1la8j4jaqpc0pc58c1pcijffxac5l";
+       version = "2.10.0";
+       sha256 = "0qzgfd0nn070rca8mdm2gi7ah9aghn1kpr3fl4dx56kbfva23yhb";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base base-compat bv-sized bytestring containers
-         cryptohash-sha1 deepseq directory exceptions filepath gitrev
-         GraphSCC heredoc libBF monad-control monadLib mtl panic
-         parameterized-utils pretty process random sbv simple-smt strict
-         text tf-random time transformers-base what4
+         cryptohash-sha1 deepseq directory exceptions filepath ghc-prim
+         gitrev GraphSCC heredoc integer-gmp libBF MemoTrie monad-control
+         monadLib mtl panic parameterized-utils pretty process random sbv
+         simple-smt stm strict text tf-random time transformers-base what4
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [
@@ -74624,8 +74625,8 @@ self: {
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "easy-args";
-       version = "0.1.0";
-       sha256 = "17ddcbnlyw6x6q5ryc6i1cwq5qwlxdrf406i5sr5j3q7ydwkf86n";
+       version = "0.1.0.1";
+       sha256 = "07gafpn0nmkbk8hwrqgv3kyrdxhqh8ljrky6hzq2q9yylilvfr3n";
        libraryHaskellDepends = [ base hspec ];
        testHaskellDepends = [ base hspec ];
        description = "Parses command line arguments";
@@ -95897,8 +95898,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-lfs";
-       version = "1.1.0";
-       sha256 = "1llg50517xw4nccjik63gsg0nwkb4lhp0fs0lbi3q38xv9a3imyz";
+       version = "1.1.1";
+       sha256 = "1jjr73knvc8b7mlabb3yyyc5blfxiwgbdk6lylshfp2fqsmkvhnx";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive containers http-client
          http-types network-uri text
@@ -105248,8 +105249,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.18.2";
-       sha256 = "0ifcnpbc667x7cl44fkdj4j968zpyz57jh8b5givqdnmvw9x8wf5";
+       version = "1.19.0";
+       sha256 = "0idvjk0nz9m28qcbkzcs2mjrbx543jj0gh8hj0s0lnj3nlpk0b46";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129330,6 +129331,8 @@ self: {
        pname = "http2-grpc-proto3-wire";
        version = "0.1.0.0";
        sha256 = "00k7sm7z0q8k1zr3lcsyaciylk03c18cpdciqq33rfj6p7jwyphv";
+       revision = "1";
+       editedCabalFile = "0454bzkjf63avp8rckl5pp3l30nc41d3ixzbh9diaml70hkhsv2g";
        libraryHaskellDepends = [
          base binary bytestring case-insensitive http2-grpc-types
          proto3-wire zlib
@@ -138106,6 +138109,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ivory-avr-atmega328p-registers" = callPackage
+    ({ mkDerivation, base, base-compat, ivory, ivory-hw, monadLib }:
+     mkDerivation {
+       pname = "ivory-avr-atmega328p-registers";
+       version = "0.1.0.0";
+       sha256 = "07janz4d196p0q3578gs77d2vbnmaz67wdb6swpdkxbhl8s7zpcg";
+       libraryHaskellDepends = [
+         base base-compat ivory ivory-hw monadLib
+       ];
+       description = "Ivory register bindings for the Atmega328p";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ivory-backend-c" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers
      , directory, filepath, ivory, ivory-artifact, ivory-opts
@@ -140595,8 +140611,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsonifier";
-       version = "0.1.0.4";
-       sha256 = "1fkjib6v9kk5vbw0sh5cb0wr0m3mxf878lcbj3jc0xyalpvz07ni";
+       version = "0.1.0.5";
+       sha256 = "0qx296dnhb7gdf1zybs20pa0fgi2zz6wbb4x9kcr31p7z51hd07v";
        libraryHaskellDepends = [
          base bytestring ptr-poker scientific text
        ];
@@ -165124,8 +165140,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-avro";
-       version = "0.4.0.1";
-       sha256 = "1nbslmb30yys61a5sn8nv7lczcagi4jidrfyw2wfqagkgj3afsyq";
+       version = "0.4.0.2";
+       sha256 = "1g8cww3lz5dlgri34m0fjpc8sbs64f4fcxx8h1mamgzn5f3f2z7h";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -165140,24 +165156,24 @@ self: {
      }) {};
 
   "mu-graphql" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bytestring
-     , conduit, foldl, graphql-parser, http-types, list-t, mtl, mu-rpc
-     , mu-schema, parsers, regex-tdfa, scientific, sop-core, stm
-     , stm-chans, stm-conduit, stm-containers, template-haskell, text
+    ({ mkDerivation, aeson, async, base, bytestring, conduit, foldl
+     , graphql, http-types, list-t, megaparsec, mtl, mu-rpc, mu-schema
+     , parsers, regex-tdfa, scientific, sop-core, stm, stm-chans
+     , stm-conduit, stm-containers, template-haskell, text
      , unordered-containers, uuid, wai, wai-extra, wai-websockets, warp
      , warp-tls, websockets
      }:
      mkDerivation {
        pname = "mu-graphql";
-       version = "0.4.0.0";
-       sha256 = "0vww6kv76sfi4931265gmbmyd67qlijxwiyl2z0lbcj1gs95j6x2";
+       version = "0.4.1.0";
+       sha256 = "0qi6sc0vwzdayjhfr0rqvrfp1ydcy9fwhyzkmc488gfafi0xc1gj";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson async attoparsec base bytestring conduit foldl graphql-parser
-         http-types list-t mtl mu-rpc mu-schema parsers scientific sop-core
-         stm stm-chans stm-conduit stm-containers template-haskell text
+         aeson async base bytestring conduit foldl graphql http-types list-t
+         megaparsec mtl mu-rpc mu-schema parsers scientific sop-core stm
+         stm-chans stm-conduit stm-containers template-haskell text
          unordered-containers uuid wai wai-websockets warp warp-tls
          websockets
        ];
@@ -165166,9 +165182,7 @@ self: {
        ];
        description = "GraphQL support for Mu";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {graphql-parser = null;};
+     }) {};
 
   "mu-grpc-client" = callPackage
     ({ mkDerivation, async, avro, base, bytestring, conduit, http2
@@ -165179,8 +165193,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-grpc-client";
-       version = "0.4.0.0";
-       sha256 = "0j1dn2c95rzm8h6yzw5h5r3yhk5p1i51kx4px668hb3m9wss5qdr";
+       version = "0.4.0.1";
+       sha256 = "030b8ajbplb1w5llzm8vn8jpwa7v4kw0y8zli8xagc50k19wp75v";
        libraryHaskellDepends = [
          async avro base bytestring conduit http2 http2-client
          http2-client-grpc http2-grpc-types mu-grpc-common mu-optics
@@ -165270,8 +165284,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-optics";
-       version = "0.3.0.0";
-       sha256 = "0263nd5xwyn2jb99d6vn7fk8lzmkgarfx9n6lrc4dpa5immfypnq";
+       version = "0.3.0.1";
+       sha256 = "0sshv28n569zgcw464xjv8czs5ya17csl927a176d43mkss6w6jw";
        libraryHaskellDepends = [
          base containers mu-schema optics-core sop-core
        ];
@@ -165281,14 +165295,15 @@ self: {
 
   "mu-persistent" = callPackage
     ({ mkDerivation, base, monad-logger, mu-schema, persistent
-     , resourcet, transformers
+     , resource-pool, resourcet, transformers
      }:
      mkDerivation {
        pname = "mu-persistent";
-       version = "0.3.0.0";
-       sha256 = "1jd0h2cqr4nbwk2vyaq3wamrgwi1dkzmyhqg6b7002wdvm1h822j";
+       version = "0.3.1.0";
+       sha256 = "0xhqp2ljgh9vjga1crqvb2gk3al3v0mw26aivd1pyi6rq9ncwcca";
        libraryHaskellDepends = [
-         base monad-logger mu-schema persistent resourcet transformers
+         base monad-logger mu-schema persistent resource-pool resourcet
+         transformers
        ];
        description = "Utilities for interoperation between Mu and Persistent";
        license = stdenv.lib.licenses.asl20;
@@ -165318,8 +165333,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-protobuf";
-       version = "0.4.0.1";
-       sha256 = "1dr2vgxkzxpkz0iiwzwbficm65flwfmcs5xbxx5mg5gwf7x0qz3l";
+       version = "0.4.0.2";
+       sha256 = "0d33d7nw5rfmyyrahv0sc0mdwzp5ywm040hfm9c1wm9h1miahx4n";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -165341,8 +165356,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-rpc";
-       version = "0.4.0.0";
-       sha256 = "06aly31vqf4i96p62i7pjp9xr9rwvnrmg31qpvirjzgn6jq5dyk3";
+       version = "0.4.0.1";
+       sha256 = "0s1q12nl6q3smnmmk2f1qhs0bk3sarmjcabvnj06vw6ciivnx16z";
        libraryHaskellDepends = [
          aeson base conduit http-types mtl mu-schema sop-core
          template-haskell text wai
@@ -172090,6 +172105,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nonempty-vector_0_2_1_0" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest
+     , primitive, vector
+     }:
+     mkDerivation {
+       pname = "nonempty-vector";
+       version = "0.2.1.0";
+       sha256 = "0w6fn8dinf8lcbhr5797i5kyixpasylpwn97ljmkjc6n3ad1b21y";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base deepseq primitive vector ];
+       testHaskellDepends = [ base doctest ];
+       description = "Non-empty vectors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "nonemptymap" = callPackage
     ({ mkDerivation, base, containers, semigroupoids }:
      mkDerivation {
@@ -177791,8 +177822,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.11.1.1";
-       sha256 = "0i16klsffqqbiann3p3rqcpbiwmbffg8ycmm35yrc9g705hi2r38";
+       version = "2.11.2";
+       sha256 = "10p2vmdjwgbzrbzrpsplbs67pycwz91aww4iz1rclw382xag42nb";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -180954,6 +180985,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pcg-random_0_1_3_7" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest
+     , entropy, primitive, random
+     }:
+     mkDerivation {
+       pname = "pcg-random";
+       version = "0.1.3.7";
+       sha256 = "1l6jq5nvmg1ygk7i7g50s47p6qkh74p9avl1wbcxdl5m85lc5j76";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base bytestring entropy primitive random
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "Haskell bindings to the PCG random number generator";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pcgen" = callPackage
     ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck
      , random
@@ -183594,6 +183643,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "phonetic-languages-permutations" = callPackage
+    ({ mkDerivation, base, subG, subG-instances, vector }:
+     mkDerivation {
+       pname = "phonetic-languages-permutations";
+       version = "0.1.1.0";
+       sha256 = "0vjpffazb4rbbf1pgv1phsm77g7rhwaw2np54b3hrrv2nsgakfxx";
+       libraryHaskellDepends = [ base subG subG-instances vector ];
+       description = "Commonly used versions of the phonetic-languages-common package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "phonetic-languages-plus" = callPackage
     ({ mkDerivation, base, bytestring, lists-flines, parallel
      , uniqueness-periods-vector-stats
@@ -183641,6 +183701,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "phonetic-languages-simplified-common" = callPackage
+    ({ mkDerivation, base, phonetic-languages-permutations, subG
+     , subG-instances, vector
+     }:
+     mkDerivation {
+       pname = "phonetic-languages-simplified-common";
+       version = "0.1.0.0";
+       sha256 = "09nbg9v02mg8pl6hj48m1630z64fhmnr248j00akn8hn9npkas5l";
+       libraryHaskellDepends = [
+         base phonetic-languages-permutations subG subG-instances vector
+       ];
+       description = "A simplified version of the phonetic-languages-functionality";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "phonetic-languages-ukrainian" = callPackage
     ({ mkDerivation, base, mmsyn2, mmsyn5, vector }:
      mkDerivation {
@@ -192263,16 +192338,18 @@ self: {
 
   "prolude" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, containers
-     , mongoDB, persistent, persistent-mongoDB, safe-exceptions
-     , scientific, text, time, vector
+     , generic-random, mongoDB, persistent, persistent-mongoDB
+     , QuickCheck, quickcheck-instances, safe-exceptions, scientific
+     , text, time, vector
      }:
      mkDerivation {
        pname = "prolude";
-       version = "0.0.0.8";
-       sha256 = "1fcsph2f4k303zbx23ry1cnx3zkvamsd3b9d2jwr9kpvck63nn92";
+       version = "0.0.0.9";
+       sha256 = "0fnahs81xv2nx6cv6avp8bkhbprhy9vyhq5y3d0mna8iw06s0xfs";
        libraryHaskellDepends = [
-         aeson base bytestring cassava containers mongoDB persistent
-         persistent-mongoDB safe-exceptions scientific text time vector
+         aeson base bytestring cassava containers generic-random mongoDB
+         persistent persistent-mongoDB QuickCheck quickcheck-instances
+         safe-exceptions scientific text time vector
        ];
        description = "ITProTV's custom prelude";
        license = stdenv.lib.licenses.mit;
@@ -205771,8 +205848,8 @@ self: {
      }:
      mkDerivation {
        pname = "rosebud";
-       version = "0.1.0.0";
-       sha256 = "0w5p6d44wddg7sm0rna1yxhi57b1fr8in0mg34z1f6fakdm900lv";
+       version = "0.2.0.0";
+       sha256 = "0g21b57qiijd5dmvnzky89kfs4zi2gbgabsj5bgzx2hnban08rm4";
        libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
@@ -228916,13 +228993,24 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "subG";
-       version = "0.4.0.0";
-       sha256 = "1iihy4sd01bnc85gy1ipgk2jxvcrqm31b8xjflj1rly7sr69bsky";
+       version = "0.4.2.0";
+       sha256 = "17fzdwlmh8ykwqn9h9a60wpnvqbgbz0wk6cgcrglbj0i41jy28jv";
        libraryHaskellDepends = [ base ];
        description = "Some extension to the Foldable and Monoid classes";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "subG-instances" = callPackage
+    ({ mkDerivation, base, subG, vector }:
+     mkDerivation {
+       pname = "subG-instances";
+       version = "0.1.0.0";
+       sha256 = "0nyhd0l0cd1q62ch9jbjyv33f9sdidpgkjbkb0hj4dagqyxpv0jy";
+       libraryHaskellDepends = [ base subG vector ];
+       description = "Additional instances for the InsertLeft class from subG package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "subcategories" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default, foldl
      , hashable, inspection-testing, mono-traversable, pointed
@@ -262430,6 +262518,44 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_6_18_7" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
+     , blaze-markup, bytestring, case-insensitive, cereal, clientsession
+     , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
+     , gauge, hspec, hspec-expectations, http-types, HUnit, memory
+     , monad-logger, mtl, network, parsec, path-pieces, primitive
+     , random, resourcet, 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.18.7";
+       sha256 = "0rf30h5akdjyja0xld2cg0zldvbzcqcrmg2kp4gajh1qjzzcf69g";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-html blaze-markup bytestring
+         case-insensitive cereal clientsession conduit conduit-extra
+         containers cookie deepseq fast-logger http-types memory
+         monad-logger mtl parsec path-pieces primitive random resourcet
+         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 random resourcet shakespeare streaming-commons
+         template-haskell text transformers unliftio wai wai-extra warp
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring gauge shakespeare text
+       ];
+       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
@@ -263847,8 +263973,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-core";
-       version = "0.18.0";
-       sha256 = "1rgi1zzdm6kpji1v4kfm7d7qwhwdqsps13h2l1k5r4v4ky7pgppw";
+       version = "0.19.2";
+       sha256 = "1ipmycwf2fqk701x0d32bv03aviv7z57m0knpc3np5cvss9mjzvr";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-default
          directory dlist dynamic-state exceptions filepath hashable ListLike
@@ -264040,8 +264166,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-language";
-       version = "0.18.0";
-       sha256 = "0w647h1v1mjhqxnq9a7zwh42ry8dfd8franr9p8k8662q3lalvp8";
+       version = "0.19.0";
+       sha256 = "18r875casrk66ck8q9p1r0c4cfjjgyd5l3gxldr95rqdjci3c09z";
        libraryHaskellDepends = [
          array base binary containers data-default hashable
          microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
@@ -266098,8 +266224,8 @@ self: {
      }:
      mkDerivation {
        pname = "zydiskell";
-       version = "0.1.0.1";
-       sha256 = "1qrgdwmmxlf3zspxdc84cfnwj6fpwpfyx7qry91k7f46ij0aizbi";
+       version = "0.1.1.0";
+       sha256 = "16fc3k0m0aln0ssy6nl2fjgl6l8svpyddyr0hrvzm0h5lbnk3h0w";
        libraryHaskellDepends = [
          base bytestring fixed-vector storable-record vector
        ];

From 691b181fc072c14320e56511d01e0159dd4ff6e0 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 20 Nov 2020 02:58:19 +0100
Subject: [PATCH 3114/3942] haskellPackages.git-fls: Remove obsolete jailbreak

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2c48fe8cc78b..985487f40afb 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1438,10 +1438,6 @@ self: super: {
   # 2020-11-17: persistent-test is ahead of the persistent version in stack
   persistent-sqlite = dontCheck super.persistent-sqlite;
 
-  # 2020-11-19: hasn‘t bumped aeson bound
-  # https://git-annex.branchable.com/bugs/aeson_bound_can_be_bumped_to___60___1.6
-  git-lfs = doJailbreak super.git-lfs;
-
   # The tests for semver-range need to be updated for the MonadFail change in
   # ghc-8.8:
   # https://github.com/adnelson/semver-range/issues/15

From 4972b6fa31962fc4e6db7f7a84e39bdb1ef5f023 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 20 Nov 2020 02:58:42 +0100
Subject: [PATCH 3115/3942] haskellPackages.pcg-random: Document when to
 reenable tests

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 985487f40afb..e512649ee45f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1477,8 +1477,10 @@ self: super: {
   # https://github.com/kowainik/stan/issues/408
   # Tests disabled because of: https://github.com/kowainik/stan/issues/409
   stan = doJailbreak (dontCheck super.stan);
+
   # 2020-11-19: Disabling tests with this issue: https://github.com/cchalmers/pcg-random/issues/10
-  pcg-random = dontCheck super.pcg-random;
+  # Issue has been fixed in 0.1.3.7, we can enable tests again, once stackage bumps the version
+  pcg-random = assert super.pcg-random.version == "0.1.3.6"; dontCheck super.pcg-random;
 
   # Use an already merged upstream patch fixing the build with primitive >= 0.7.2
   # The version bounds were correctly specified before, so we need to jailbreak as well

From 347a6dbbccb1abaa5d5f4aa9d97ee0e1b9f4b9a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Nov 2020 20:07:33 +0100
Subject: [PATCH 3116/3942] hackage2nix: disable broken builds

---
 .../configuration-hackage2nix.yaml            | 8649 +++++++++++++++++
 1 file changed, 8649 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 57dcc6f5c90a..e39afc0394df 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2878,7 +2878,8656 @@ dont-distribute-packages:
 
 broken-packages:
   # These packages don't compile or depend on packages that don't compile.
+  - 3dmodels
+  - 4Blocks
+  - a50
+  - AAI
+  - abcBridge
+  - abcnotation
+  - abeson
+  - abides
+  - abnf
+  - AbortT-monadstf
+  - AbortT-mtl
+  - AbortT-transformers
+  - abstract-par-accelerate
+  - abt
+  - AC-BuildPlatform
+  - AC-EasyRaster-GTK
+  - AC-HalfInteger
+  - ac-machine
+  - ac-machine-conduit
+  - AC-MiniTest
+  - AC-Terminal
+  - AC-VanillaArray
+  - AC-Vector
+  - AC-Vector-Fancy
+  - acc
+  - accelerate-arithmetic
+  - accelerate-fftw
+  - accelerate-fourier
+  - accelerate-llvm-native
+  - accelerate-random
+  - accelerate-typelits
+  - accelerate-utility
+  - accentuateus
+  - access-time
+  - access-token-provider
+  - achille
+  - acid-state-dist
+  - acid-state-tls
+  - ACME
+  - acme-all-monad
+  - acme-comonad
+  - acme-flipping-tables
+  - acme-hq9plus
+  - acme-http
+  - acme-inator
+  - acme-kitchen-sink
+  - acme-left-pad
+  - acme-miscorder
+  - acme-mutable-package
+  - acme-now
+  - acme-numbersystem
+  - acme-operators
+  - acme-php
+  - acme-schoenfinkel
+  - acme-strfry
+  - acme-stringly-typed
+  - acme-this
+  - acme-zero
+  - acousticbrainz-client
+  - ActionKid
+  - active
+  - activehs
+  - activehs-base
+  - activitypub
+  - activitystreams-aeson
+  - actor
+  - acts
+  - Adaptive
+  - Adaptive-Blaisorblade
+  - adaptive-containers
+  - adaptive-tuple
+  - adb
+  - addy
+  - adhoc-network
+  - adict
+  - adjunction
+  - adobe-swatch-exchange
+  - adp-multi
+  - adp-multi-monadiccp
+  - ADPfusion
+  - ADPfusionForest
+  - ADPfusionSet
+  - adtrees
+  - advent-of-code-api
+  - Advgame
+  - Advise-me
+  - AERN-Basics
+  - AERN-Net
+  - AERN-Real
+  - AERN-Real-Double
+  - AERN-Real-Interval
+  - AERN-RnToRm
+  - AERN-RnToRm-Plot
+  - aern2-mp
+  - aern2-real
+  - aeson-applicative
+  - aeson-decode
+  - aeson-diff-generic
+  - aeson-filthy
+  - aeson-flowtyped
+  - aeson-injector
+  - aeson-match-qq
+  - aeson-native
+  - aeson-options
+  - aeson-prefix
+  - aeson-schema
+  - aeson-schemas
+  - aeson-smart
+  - aeson-streams
+  - aeson-t
+  - aeson-tiled
+  - aeson-typescript
+  - aeson-utils
+  - affection
+  - affine-invariant-ensemble-mcmc
+  - afv
+  - ag-pictgen
+  - Agata
+  - agda-server
+  - agda-snippets
+  - agda-snippets-hakyll
+  - agda-unused
+  - agentx
+  - AGI
+  - AhoCorasick
+  - aig
+  - aip
+  - air-th
+  - airbrake
+  - airship
+  - airtable-api
+  - aivika-distributed
+  - aivika-experiment-diagrams
+  - ajhc
+  - AlanDeniseEricLauren
+  - alerta
+  - alex-prelude
+  - alex-tools
+  - alfred
+  - alga
+  - algebra-checkers
+  - algebra-dag
+  - algebra-sql
+  - algebraic
+  - algebraic-prelude
+  - algo-s
+  - algolia
+  - AlgoRhythm
+  - AlgorithmW
+  - align-text
+  - AlignmentAlgorithms
+  - Allure
+  - ally-invest
+  - alms
+  - alpha
+  - alphachar
+  - alsa
+  - alsa-gui
+  - alsa-midi
+  - alsa-pcm-tests
+  - alsa-seq-tests
+  - altcomposition
+  - alternative-extra
+  - alternative-io
+  - alto
+  - alure
+  - amazon-emailer
+  - amazon-emailer-client-snap
+  - amazon-products
+  - amazonka
+  - amazonka-s3-streaming
+  - amby
+  - AMI
+  - ampersand
+  - amqp-conduit
+  - amqp-streamly
+  - analyze
+  - analyze-client
+  - anansi-pandoc
+  - anatomy
+  - android
+  - android-activity
+  - android-lint-summary
+  - AndroidViewHierarchyImporter
+  - angel
+  - angle
+  - Animas
+  - animascii
+  - animate
+  - animate-example
+  - animate-frames
+  - animate-preview
+  - animate-sdl2
+  - annah
+  - annotated-fix
+  - Annotations
+  - anonymous-sums
+  - anonymous-sums-tests
+  - ansigraph
+  - antagonist
+  - antfarm
+  - anticiv
+  - antigate
+  - antimirov
+  - antiope-athena
+  - antiope-contract
+  - antiope-core
+  - antiope-dynamodb
+  - antiope-es
+  - antiope-messages
+  - antiope-optparse-applicative
+  - antiope-s3
+  - antiope-shell
+  - antiope-sns
+  - antiope-sqs
+  - antiquoter
+  - antisplice
+  - antlr-haskell
+  - antlrc
+  - anydbm
+  - aop-prelude
+  - aos-signature
+  - aosd
+  - apart
+  - apecs-gloss
+  - apecs-physics
+  - apecs-physics-gloss
+  - apecs-stm
+  - apelsin
+  - api-builder
+  - api-rpc-factom
+  - api-rpc-pegnet
+  - api-tools
+  - api-yoti
+  - apiary
+  - apiary-authenticate
+  - apiary-clientsession
+  - apiary-cookie
+  - apiary-eventsource
+  - apiary-helics
+  - apiary-http-client
+  - apiary-logger
+  - apiary-memcached
+  - apiary-mongoDB
+  - apiary-persistent
+  - apiary-purescript
+  - apiary-redis
+  - apiary-session
+  - apiary-websockets
+  - apis
+  - apotiki
+  - app-lens
+  - appc
+  - ApplePush
+  - AppleScript
+  - applicative-fail
+  - applicative-parsec
+  - applicative-quoters
+  - applicative-splice
+  - approveapi
+  - ApproxFun-hs
+  - arb-fft
+  - arbb-vm
+  - arbor-datadog
+  - arbor-monad-counter
+  - arbor-monad-metric
+  - arbor-monad-metric-datadog
+  - arbtt
+  - arch-hs
+  - archiver
+  - archlinux
+  - archlinux-web
+  - archnews
+  - arduino-copilot
+  - arena
+  - arff
+  - arghwxhaskell
+  - argon
+  - argon2
+  - argparser
+  - arguedit
+  - ariadne
+  - arion
+  - arith-encode
+  - arithmetic-circuits
+  - arithmoi
+  - armada
+  - armor
+  - arpa
+  - arpack
+  - array-builder
+  - array-chunks
+  - array-forth
+  - array-list
+  - array-primops
+  - arrayfire
+  - arraylist
+  - ArrayRef
+  - arrow-improve
+  - arrow-list
+  - arrowapply-utils
+  - arrowp
+  - arrowp-qq
+  - ArrowVHDL
+  - artery
+  - artifact
+  - asap
+  - ascii-flatten
+  - ascii-string
+  - ascii-table
+  - ascii-vector-avc
+  - ascii85-conduit
+  - asic
+  - asil
+  - asn
+  - asn1-codec
+  - asn1-data
+  - assert
+  - assertions
+  - asset-map
+  - assimp
+  - assumpta
+  - ast-monad
+  - ast-monad-json
+  - astrds
+  - astview
+  - async-combinators
+  - async-dejafu
+  - async-manager
+  - async-timer
+  - asynchronous-exceptions
+  - aterm-utils
+  - atlassian-connect-core
+  - atlassian-connect-descriptor
+  - atmos-dimensional-tf
+  - atndapi
+  - atom-msp430
+  - atomic-modify
+  - atomic-primops-foreign
+  - atomic-primops-vector
+  - atomo
+  - atp-haskell
+  - ats-pkg
+  - ats-setup
+  - ats-storable
+  - attempt
+  - attic-schedule
+  - atto-lisp
+  - AttoBencode
+  - AttoJson
+  - attomail
+  - attoparsec-enumerator
+  - attoparsec-ip
+  - attoparsec-iteratee
+  - attoparsec-text
+  - attoparsec-text-enumerator
+  - attoparsec-trans
+  - attoparsec-uri
+  - attosplit
+  - Attrac
+  - atuin
+  - audiovisual
+  - augeas
+  - augur
+  - aur
+  - aur-api
+  - aura
+  - Aurochs
+  - authenticate-ldap
+  - authinfo-hs
+  - authoring
+  - AutoForms
+  - autom
+  - automata
+  - autonix-deps
+  - autonix-deps-kf5
+  - autopack
+  - avatar-generator
+  - avers
+  - avers-api
+  - avers-api-docs
+  - avers-server
+  - avl-static
+  - AvlTree
+  - avr-shake
+  - avro-piper
+  - awesome-prelude
+  - awesomium
+  - awesomium-glut
+  - awesomium-raw
+  - aws-cloudfront-signer
+  - aws-configuration-tools
+  - aws-dynamodb-conduit
+  - aws-dynamodb-streams
+  - aws-easy
+  - aws-ec2
+  - aws-ec2-knownhosts
+  - aws-elastic-transcoder
+  - aws-general
+  - aws-kinesis
+  - aws-kinesis-client
+  - aws-kinesis-reshard
+  - aws-lambda
+  - aws-lambda-haskell-runtime-wai
+  - aws-lambda-runtime
+  - aws-mfa-credentials
+  - aws-performance-tests
+  - aws-route53
+  - aws-sdk
+  - aws-sdk-text-converter
+  - aws-sdk-xml-unordered
+  - aws-ses-easy
+  - aws-sign4
+  - aws-simple
+  - aws-sns
+  - axel
+  - axiom
+  - azimuth-hs
+  - azubi
+  - azure-acs
+  - azure-email
+  - azure-functions-worker
+  - azure-service-api
+  - azure-servicebus
+  - azurify
+  - b9
+  - babylon
+  - backblaze-b2-hs
+  - backdropper
+  - backstop
+  - backtracking-exceptions
+  - backward-state
+  - bag
+  - Baggins
+  - bake
+  - ballast
+  - bamboo
+  - bamboo-launcher
+  - bamboo-plugin-highlight
+  - bamboo-plugin-photo
+  - bamboo-theme-blueprint
+  - bamboo-theme-mini-html5
+  - bamse
+  - bamstats
+  - ban-instance
+  - Bang
+  - bank-holiday-usa
+  - banwords
+  - barchart
+  - barcodes-code128
+  - barecheck
+  - Barracuda
+  - barrie
+  - barrier
+  - barrier-monad
+  - base-compat-migrate
+  - base-feature-macros
+  - base-generics
+  - base-io-access
+  - base32-bytestring
+  - base62
+  - base64-bytes
+  - base64-conduit
+  - baserock-schema
+  - basex-client
+  - basic
+  - BASIC
+  - baskell
+  - batchd
+  - battlenet
+  - battlenet-yesod
+  - battleplace
+  - battleplace-api
+  - battleship-combinatorics
+  - battleships
+  - bayes-stack
+  - bazel-coverage-report-renderer
+  - bbi
+  - BCMtools
+  - bcp47
+  - bdcs
+  - bdcs-api
+  - bdd
+  - bdo
+  - beam
+  - beam-automigrate
+  - beam-core
+  - beam-migrate
+  - beam-mysql
+  - beam-newtype-field
+  - beam-postgres
+  - beam-sqlite
+  - beam-th
+  - beamable
+  - beautifHOL
+  - bech32
+  - bech32-th
+  - bed-and-breakfast
+  - beeminder-api
+  - Befunge93
+  - bein
+  - belka
+  - bench-graph
+  - bench-show
+  - BenchmarkHistory
+  - bencodex
+  - berkeleydb
+  - BerkeleyDBXML
+  - BerlekampAlgorithm
+  - berp
+  - bert
+  - besout
+  - bet
+  - betacode
+  - betris
+  - bff
+  - bgmax
+  - bgzf
+  - bhoogle
+  - bibdb
+  - bidirectional
+  - bidirectionalization-combined
+  - bidispec
+  - bidispec-extras
+  - BiGUL
+  - billboard-parser
+  - billeksah-forms
+  - billeksah-main
+  - billeksah-pane
+  - billeksah-services
+  - binary-bits
+  - binary-communicator
+  - binary-derive
+  - binary-ext
+  - binary-file
+  - binary-indexed-tree
+  - binary-protocol
+  - binary-protocol-zmq
+  - binary-search
+  - binary-streams
+  - binary-tagged
+  - binary-typed
+  - bind-marshal
+  - BinderAnn
+  - binding-core
+  - binding-gtk
+  - binding-wx
+  - bindings-apr
+  - bindings-apr-util
+  - bindings-bfd
+  - bindings-cctools
+  - bindings-dc1394
+  - bindings-eskit
+  - bindings-EsounD
+  - bindings-fann
+  - bindings-fluidsynth
+  - bindings-friso
+  - bindings-gsl
+  - bindings-hamlib
+  - bindings-hdf5
+  - bindings-K8055
+  - bindings-libftdi
+  - bindings-libg15
+  - bindings-librrd
+  - bindings-libstemmer
+  - bindings-libusb
+  - bindings-libv4l2
+  - bindings-linux-videodev2
+  - bindings-monetdb-mapi
+  - bindings-mpdecimal
+  - bindings-ppdev
+  - bindings-sc3
+  - bindings-sipc
+  - bindings-wlc
+  - bindynamic
+  - binembed
+  - binembed-example
+  - bio
+  - bio-sequence
+  - bioace
+  - bioalign
+  - Biobase
+  - BiobaseBlast
+  - BiobaseDotP
+  - BiobaseENA
+  - BiobaseEnsembl
+  - BiobaseFasta
+  - BiobaseFR3D
+  - BiobaseHTTP
+  - BiobaseHTTPTools
+  - BiobaseInfernal
+  - BiobaseMAF
+  - BiobaseNewick
+  - BiobaseTrainingData
+  - BiobaseTurner
+  - BiobaseTypes
+  - BiobaseVienna
+  - BiobaseXNA
+  - biocore
+  - biofasta
+  - biofastq
+  - biohazard
+  - BioHMM
+  - bioinformatics-toolkit
+  - biophd
+  - biopsl
+  - biosff
+  - biostockholm
+  - birch-beer
+  - bird
+  - BirdPP
+  - birds-of-paradise
+  - bisect-binary
+  - bit-array
+  - bit-stream
+  - bitcoin-address
+  - bitcoin-api
+  - bitcoin-api-extra
+  - bitcoin-block
+  - bitcoin-compact-filters
+  - bitcoin-hs
+  - bitcoin-rpc
+  - bitcoin-script
+  - bitcoin-scripting
+  - bitcoin-tx
+  - bitcoind-regtest
+  - bitcoind-rpc
+  - Bitly
+  - bitly-cli
+  - bitmaps
+  - bits-atomic
+  - bits-conduit
+  - bits-extras
+  - bitset
+  - bitspeak
+  - BitStringRandomMonad
+  - BitSyntax
+  - bittorrent
+  - bitwise-enum
+  - bitx-bitcoin
+  - bizzlelude
+  - bizzlelude-js
+  - bkr
+  - bla
+  - blakesum
+  - blakesum-demo
+  - blas
+  - blas-hs
+  - BlastHTTP
+  - blastxml
+  - blatex
+  - blaze-builder-enumerator
+  - blaze-colonnade
+  - blaze-html-contrib
+  - blaze-html-hexpat
+  - blaze-html-truncate
+  - blaze-json
+  - blaze-textual-native
+  - blazeT
+  - ble
+  - blink1
+  - blip
+  - bliplib
+  - Blobs
+  - blockchain
+  - blockhash
+  - Blogdown
+  - blogination
+  - BlogLiterately
+  - BlogLiterately-diagrams
+  - bloodhound
+  - bloodhound-amazonka-auth
+  - bloomfilter-redis
+  - blosum
+  - bloxorz
+  - blubber
+  - blubber-server
+  - Blueprint
+  - bluetile
+  - bluetileutils
+  - blunk-hask-tests
+  - blunt
+  - bno055-haskell
+  - bogre-banana
+  - boilerplate
+  - bolt
+  - boltzmann-brain
+  - bond
+  - bond-haskell
+  - bond-haskell-compiler
+  - bookkeeper
+  - bookkeeper-permissions
+  - Bookshelf
+  - boolean-normal-forms
+  - boolexpr
+  - boombox
+  - boomslang
+  - boopadoop
+  - boots-app
+  - boots-cloud
+  - boots-web
+  - borel
+  - boring-window-switcher
+  - bot
+  - botpp
+  - bounded-array
+  - bowntz
+  - box
+  - box-csv
+  - box-socket
+  - braid
+  - brain-bleep
+  - Bravo
+  - breakout
+  - breve
+  - brians-brain
+  - brick-dropdownmenu
+  - bricks
+  - bricks-internal
+  - bricks-internal-test
+  - bricks-parsec
+  - bricks-rendering
+  - bricks-syntax
+  - brillig
+  - broccoli
+  - brok
+  - broker-haskell
+  - bronyradiogermany-common
+  - bronyradiogermany-streaming
+  - brotli
+  - brotli-conduit
+  - brotli-streams
+  - browscap
+  - bsd-sysctl
+  - bson
+  - bson-generic
+  - bson-generics
+  - bson-lens
+  - bsparse
+  - btree
+  - btree-concurrent
+  - buchhaltung
+  - buffer
+  - buffer-builder
+  - buffer-builder-aeson
+  - BufferedSocket
+  - buffet
+  - buffon
+  - bugsnag-haskell
+  - bugzilla
+  - build
+  - buildable
+  - buildbox
+  - buildbox-tools
+  - builder
+  - buildwrapper
+  - bullet
+  - bulletproofs
+  - bulmex
+  - bumper
+  - bunz
+  - burnt-explorer
+  - burst-detection
+  - bus-pirate
+  - Buster
+  - buster
+  - buster-gtk
+  - buster-network
+  - butter
+  - butterflies
+  - bv-sized
+  - byline
+  - bytable
+  - bytearray-parsing
+  - bytebuild
+  - bytehash
+  - bytelog
+  - byteslice
+  - bytesmith
+  - bytestring-arbitrary
+  - bytestring-builder-varword
+  - bytestring-class
+  - bytestring-csv
+  - bytestring-plain
+  - bytestring-read
+  - bytestring-rematch
+  - bytestring-show
+  - bytestring-substring
+  - bytestring-time
+  - bytestring-trie
+  - bytestring-typenats
+  - bytestringparser
+  - bytestringparser-temporary
+  - bytestringreadp
+  - c-dsl
+  - c-io
+  - c-mosquitto
+  - c0check
+  - c0parser
+  - c10k
+  - c2ats
+  - cab
+  - cabal-appimage
+  - cabal-audit
+  - cabal-bounds
+  - cabal-bundle-clib
+  - cabal-cache
+  - cabal-cargs
+  - cabal-constraints
+  - cabal-db
+  - cabal-dependency-licenses
+  - cabal-dev
+  - cabal-dir
+  - cabal-file-th
+  - cabal-ghc-dynflags
+  - cabal-ghci
+  - cabal-graphdeps
+  - Cabal-ide-backend
+  - cabal-info
+  - cabal-install-bundle
+  - cabal-install-ghc72
+  - cabal-install-ghc74
+  - cabal-install-parsers
+  - cabal-lenses
+  - cabal-meta
+  - cabal-mon
+  - cabal-nirvana
+  - cabal-progdeps
+  - cabal-query
+  - cabal-setup
+  - cabal-sort
+  - cabal-src
+  - cabal-test
+  - cabal-test-quickcheck
+  - cabal-upload
+  - cabal2arch
+  - cabal2doap
+  - cabal2ebuild
+  - cabal2ghci
+  - cabalgraph
+  - cabalish
+  - cabalmdvrpm
+  - cabalQuery
+  - cabalrpmdeps
+  - CabalSearch
+  - cabalvchk
+  - cabin
+  - cabocha
+  - cache-polysemy
+  - cached
+  - caching
+  - cachix
+  - cachix-api
+  - cacophony
+  - cafeteria-prelude
+  - caffegraph
+  - cairo-core
+  - cake
+  - cake3
+  - cakyrespa
+  - cal-layout
+  - cal3d
+  - cal3d-examples
+  - cal3d-opengl
+  - calamity
+  - calc
+  - calculator
+  - caldims
+  - caledon
+  - calenderweek
+  - call
+  - call-alloy
+  - call-haskell-from-anything
+  - camfort
+  - campfire
+  - canon
+  - canonical-filepath
+  - canonical-json
+  - canteven-http
+  - canteven-listen-http
+  - canteven-log
+  - canteven-parsedate
+  - cantor
+  - cantor-pairing
+  - cao
+  - cap
+  - Capabilities
+  - capability
+  - capnp
+  - capped-list
+  - capri
+  - car-pool
+  - caramia
+  - carbonara
+  - carboncopy
+  - cardano-coin-selection
+  - carettah
+  - CarneadesDSL
+  - CarneadesIntoDung
+  - carte
+  - cartel
+  - Cartesian
+  - casa-abbreviations-and-acronyms
+  - casadi-bindings
+  - casadi-bindings-control
+  - casadi-bindings-core
+  - casadi-bindings-internal
+  - casadi-bindings-ipopt-interface
+  - casadi-bindings-snopt-interface
+  - Cascade
+  - cascading
+  - caseof
+  - cases
+  - cash
+  - cassandra-cql
+  - Cassava
+  - cassava-conduit
+  - cassava-records
+  - cassette
+  - cassy
+  - castle
+  - casui
+  - catamorphism
+  - Catana
+  - catch-fd
+  - categorical-algebra
+  - category-extras
+  - category-traced
+  - catnplus
+  - cautious-file
+  - cautious-gen
+  - cayley-client
+  - CBOR
+  - CC-delcont-alt
+  - CC-delcont-cxe
+  - CC-delcont-exc
+  - CC-delcont-ref
+  - CC-delcont-ref-tf
+  - CCA
+  - cci
+  - ccnx
+  - cctools-workqueue
+  - cedict
+  - cef
+  - cef3-raw
+  - cef3-simple
+  - ceilometer-common
+  - cellrenderer-cairo
+  - celtchar
+  - cerberus
+  - cereal-derive
+  - cereal-enumerator
+  - cereal-ieee754
+  - cereal-io-streams
+  - cereal-plus
+  - cereal-streams
+  - cereal-time
+  - certificate
+  - cf
+  - cfenv
+  - cfipu
+  - cflp
+  - cfopu
+  - cg
+  - cgen
+  - cgi-utils
+  - cgrep
+  - chainweb-mining-client
+  - chalkboard
+  - chalkboard-viewer
+  - character-cases
+  - charade
+  - chart-cli
+  - Chart-diagrams
+  - Chart-fltkhs
+  - chart-histogram
+  - Chart-simple
+  - chart-svg
+  - chart-svg-various
+  - Chart-tests
+  - chart-unit
+  - charter
+  - chatter
+  - chatty-text
+  - chatwork
+  - cheapskate-terminal
+  - check-pvp
+  - checked
+  - Checked
+  - checkmate
+  - chell-quickcheck
+  - chessIO
+  - chevalier-common
+  - chiasma
+  - chiphunk
+  - chitauri
+  - Chitra
+  - choose
+  - choose-exe
+  - chorale
+  - chorale-geo
+  - chp
+  - chp-mtl
+  - chp-plus
+  - chp-spec
+  - chp-transformers
+  - chr-core
+  - chr-lang
+  - chr-parse
+  - ChristmasTree
+  - chromatin
+  - chronograph
+  - chronos
+  - chronos-bench
+  - chu2
+  - chunks
+  - chunky
+  - church
+  - church-maybe
+  - cielo
+  - cil
+  - cinvoke
+  - cio
+  - cipher-blowfish
+  - ciphersaber2
+  - circlehs
+  - citation-resolve
+  - citeproc-hs
+  - citeproc-hs-pandoc-filter
+  - cj-token
+  - cjk
+  - clac
+  - clafer
+  - claferIG
+  - claferwiki
+  - clang-compilation-database
+  - clang-pure
+  - clanki
+  - clarifai
+  - CLASE
+  - clash
+  - clash-ghc
+  - clash-lib
+  - clash-multisignal
+  - clash-prelude
+  - Clash-Royale-Hack-Cheats
+  - clash-systemverilog
+  - clash-verilog
+  - clash-vhdl
+  - classify-frog
+  - ClassLaws
+  - classy-influxdb-simple
+  - classy-miso
+  - classy-parallel
+  - classyplate
+  - ClassyPrelude
+  - clckwrks
+  - clckwrks-cli
+  - clckwrks-dot-com
+  - clckwrks-plugin-bugs
+  - clckwrks-plugin-ircbot
+  - clckwrks-plugin-mailinglist
+  - clckwrks-plugin-media
+  - clckwrks-plugin-page
+  - clckwrks-plugin-redirect
+  - clckwrks-theme-bootstrap
+  - clckwrks-theme-clckwrks
+  - clckwrks-theme-geo-bootstrap
+  - cld2
+  - Clean
+  - clean-unions
+  - cless
+  - clevercss
+  - clexer
+  - CLI
+  - cli-builder
+  - cli-extras
+  - cli-git
+  - cli-nix
+  - clif
+  - clifford
+  - clifm
+  - clingo
+  - clippard
+  - clipper
+  - clippings
+  - clisparkline
+  - clit
+  - clocked
+  - clogparse
+  - clone-all
+  - closure
+  - cloud-haskell
+  - cloud-seeder
+  - cloudfront-signer
+  - clr-inline
+  - clua
+  - cluss
+  - ClustalParser
+  - clustering
+  - clustertools
+  - clutterhs
+  - cmark-highlight
+  - cmark-patterns
+  - cmark-sections
+  - cmath
+  - cmathml3
+  - CMCompare
+  - cmd-item
+  - cmdlib
+  - cmdtheline
+  - cmf
+  - cmonad
+  - cmph
+  - cmptype
+  - CMQ
+  - cmt
+  - cmv
+  - cnc-spec-compiler
+  - co-log
+  - co-log-polysemy
+  - co-log-polysemy-formatting
+  - co-log-sys
+  - Coadjute
+  - coalpit
+  - cobot-io
+  - cobot-tools
+  - code-builder
+  - codec
+  - codec-beam
+  - codec-libevent
+  - codec-rpm
+  - codecov-haskell
+  - codemonitor
+  - codepad
+  - codeworld-api
+  - codex
+  - codo-notation
+  - coercible-utils
+  - coin
+  - coinbase-exchange
+  - coinbase-pro
+  - coincident-root-loci
+  - colada
+  - colchis
+  - collada-output
+  - collapse-duplication
+  - collapse-util
+  - collection-json
+  - collections
+  - collections-api
+  - collections-base-instances
+  - colonnade
+  - color-counter
+  - colorless
+  - colorless-http-client
+  - colorless-scotty
+  - colour-space
+  - coltrane
+  - columbia
+  - columnar
+  - com
+  - comark-syntax
+  - combinat
+  - combinat-diagrams
+  - combinator-interactive
+  - combinatorial-problems
+  - Combinatorrent
+  - combobuffer
+  - comic
+  - Command
+  - commander
+  - Commando
+  - commodities
+  - commsec
+  - commsec-keyexchange
+  - ComonadSheet
+  - compact-list
+  - compact-map
+  - compact-mutable
+  - compact-mutable-vector
+  - compact-socket
+  - compact-string
+  - compact-string-fix
+  - compact-word-vectors
+  - Compactable
+  - compactable
+  - compdata
+  - compdata-automata
+  - compdata-dags
+  - compdata-param
+  - compendium-client
+  - competition
+  - compilation
+  - complex-generic
+  - complexity
+  - compose-trans
+  - composite-opaleye
+  - composite-swagger
+  - composition-tree
+  - comprehensions-ghc
+  - compressed
+  - compstrat
+  - comptrans
+  - computational-algebra
+  - computational-geometry
+  - computations
+  - concraft
+  - concraft-hr
+  - concraft-pl
+  - concrete-haskell
+  - concrete-haskell-autogen
+  - concrete-relaxng-parser
+  - concrete-typerep
+  - concurrency-benchmarks
+  - concurrent-buffer
+  - Concurrent-Cache
+  - concurrent-machines
+  - concurrent-state
+  - Concurrential
+  - Condor
+  - condor
+  - condorcet
+  - conductive-base
+  - conductive-hsc3
+  - conductive-song
+  - conduit-audio-lame
+  - conduit-audio-samplerate
+  - conduit-find
+  - conduit-iconv
+  - conduit-network-stream
+  - conduit-resumablesink
+  - conduit-throttle
+  - conduit-tokenize-attoparsec
+  - conduit-vfs
+  - conduit-vfs-zip
+  - conf
+  - confcrypt
+  - conferer-provider-dhall
+  - conferer-provider-json
+  - conferer-provider-yaml
+  - conffmt
+  - confide
+  - config-parser
+  - config-schema
+  - config-select
+  - config-value
+  - config-value-getopt
+  - ConfigFileTH
+  - Configger
+  - configifier
+  - Configurable
+  - configuration
+  - configurator-ng
+  - confsolve
+  - congruence-relation
+  - conjure
+  - conkin
+  - conlogger
+  - connection-string
+  - Conscript
+  - consistent
+  - console-program
+  - const-math-ghc-plugin
+  - constr-eq
+  - constrained-categories
+  - constrained-category
+  - constrained-dynamic
+  - constrained-monads
+  - constraint-manip
+  - ConstraintKinds
+  - constraints-emerge
+  - constructible
+  - constructive-algebra
+  - consul-haskell
+  - Consumer
+  - consumers
+  - container
+  - containers-benchmark
+  - containers-verified
+  - ContArrow
+  - content-store
+  - context-free-grammar
+  - context-stack
+  - ContextAlgebra
+  - contiguous
+  - contiguous-checked
+  - contiguous-fft
+  - continue
+  - continuum
+  - continuum-client
+  - Contract
+  - control
+  - control-iso
+  - control-monad-attempt
+  - control-monad-exception-monadsfd
+  - control-monad-failure
+  - control-monad-failure-mtl
+  - Control-Monad-MultiPass
+  - Control-Monad-ST2
+  - contstuff-monads-tf
+  - contstuff-transformers
+  - conversions
+  - convert
+  - convert-annotation
+  - convertible-ascii
+  - convertible-text
+  - cookies
+  - coordinate
+  - copilot
+  - copilot-cbmc
+  - copilot-language
+  - copilot-libraries
+  - copilot-sbv
+  - copilot-theorem
+  - copr
+  - COrdering
+  - core
+  - core-haskell
+  - corebot-bliki
+  - CoreDump
+  - CoreErlang
+  - CoreFoundation
+  - Coroutine
+  - coroutine-enumerator
+  - coroutine-iteratee
+  - coroutine-object
+  - couch-hs
+  - CouchDB
+  - couchdb-conduit
+  - couchdb-enumerator
+  - countable-inflections
+  - counter
+  - country-codes
+  - courier
+  - court
+  - coverage
+  - cparsing
+  - CPBrainfuck
+  - cpio-conduit
+  - CPL
+  - cplusplus-th
+  - cprng-aes-effect
+  - cpuperf
+  - cpython
+  - cql-io
+  - cql-io-tinylog
+  - cqrs-core
+  - cqrs-example
+  - cqrs-memory
+  - cqrs-postgresql
+  - cqrs-sqlite3
+  - cqrs-test
+  - cqrs-testkit
+  - cr
+  - crack
+  - craft
+  - Craft3e
+  - craftwerk
+  - craftwerk-cairo
+  - craftwerk-gtk
+  - crawlchain
+  - craze
+  - crc
+  - crc16
+  - crdt
+  - crdt-event-fold
+  - creatur
+  - credential-store
+  - crf-chain1
+  - crf-chain1-constrained
+  - crf-chain2-generic
+  - crf-chain2-tiers
+  - critbit
+  - criterion-compare
+  - criterion-plus
+  - criterion-to-html
+  - criu-rpc
+  - criu-rpc-types
+  - crjdt-haskell
+  - crockford
+  - crocodile
+  - cron-compat
+  - cruncher-types
+  - crunghc
+  - crypt-sha512
+  - crypto-cipher-benchmarks
+  - crypto-classical
+  - crypto-conduit
+  - crypto-keys-ssh
+  - crypto-multihash
+  - crypto-pubkey-openssh
+  - crypto-random-effect
+  - crypto-simple
+  - cryptocipher
+  - cryptocompare
+  - cryptoconditions
+  - cryptohash-sha512
+  - cryptoids
+  - cryptoids-class
+  - cryptoids-types
+  - cryptol
+  - cryptsy-api
+  - crystalfontz
+  - cse-ghc-plugin
+  - csg
+  - CSPM-cspm
+  - CSPM-FiringRules
+  - CSPM-Frontend
+  - CSPM-Interpreter
+  - CSPM-ToProlog
+  - cspmchecker
+  - cspretty
+  - css
+  - css-selectors
+  - csv-enumerator
+  - csv-nptools
+  - ctemplate
+  - ctkl
+  - ctpl
+  - cube
+  - cuboid
+  - cuckoo
+  - curl-runnings
+  - currency-codes
+  - currency-convert
+  - curry-frontend
+  - CurryDB
+  - cursedcsv
+  - curves
+  - custom-prelude
+  - CV
+  - cv-combinators
+  - cyclotomic
+  - cypher
+  - d-bus
+  - d3js
+  - dag
+  - DAG-Tournament
+  - damnpacket
+  - Dangerous
+  - danibot
+  - dao
+  - Dao
+  - dapi
+  - darcs-benchmark
+  - darcs-beta
+  - darcs-buildpackage
+  - darcs-cabalized
+  - darcs-fastconvert
+  - darcs-graph
+  - darcs-monitor
+  - darcs2dot
+  - darcsden
+  - DarcsHelpers
+  - darcswatch
+  - darkplaces-demo
+  - darkplaces-rcon
+  - darkplaces-rcon-util
+  - darkplaces-text
+  - dash-haskell
+  - data-accessor-monads-fd
+  - data-accessor-monads-tf
+  - data-aviary
+  - data-base
+  - data-basic
+  - data-check
+  - data-combinator-gen
+  - data-concurrent-queue
+  - data-construction
+  - data-cycle
+  - data-dispersal
+  - data-diverse-lens
+  - data-easy
+  - data-elf
+  - data-embed
+  - data-emoticons
+  - data-filepath
+  - data-fin
+  - data-fin-simple
+  - data-flagset
+  - data-ivar
+  - data-kiln
+  - data-layer
+  - data-lens
+  - data-lens-fd
+  - data-lens-ixset
+  - data-lens-template
+  - data-map-multikey
+  - data-nat
+  - data-object
+  - data-object-json
+  - data-object-yaml
+  - data-pprint
+  - data-quotientref
+  - data-reify-cse
+  - data-repr
+  - data-result
+  - data-rev
+  - Data-Rope
+  - data-rope
+  - data-rtuple
+  - data-size
+  - data-spacepart
+  - data-standards
+  - data-store
+  - data-stringmap
+  - data-structure-inferrer
+  - data-sword
+  - data-type
+  - data-util
+  - data-validation
+  - data-variant
+  - database-id-class
+  - database-id-groundhog
+  - database-study
+  - datadog
+  - datadog-tracing
+  - datafix
+  - dataflow
+  - datalog
+  - datapacker
+  - datasets
+  - DataTreeView
+  - dataurl
+  - DataVersion
+  - date-conversions
+  - dates
+  - datetime
+  - datetime-sb
+  - dawdle
+  - dawg
+  - dbcleaner
+  - dbf
+  - DBFunctor
+  - dbjava
+  - DBlimited
+  - dbm
+  - dbmigrations-mysql
+  - dbmigrations-postgresql
+  - dbmigrations-sqlite
+  - DBus
+  - dbus-client
+  - dbus-core
+  - dbus-qq
+  - dclabel
+  - dclabel-eci11
+  - dcpu16
+  - ddate
+  - ddc-base
+  - ddc-build
+  - ddc-code
+  - ddc-core
+  - ddc-core-babel
+  - ddc-core-eval
+  - ddc-core-flow
+  - ddc-core-llvm
+  - ddc-core-salt
+  - ddc-core-simpl
+  - ddc-core-tetra
+  - ddc-driver
+  - ddc-interface
+  - ddc-source-tetra
+  - ddc-tools
+  - ddc-war
+  - ddci-core
+  - dead-code-detection
+  - dead-simple-json
+  - Deadpan-DDP
+  - debug
+  - debug-me
+  - debug-trace-var
+  - debug-tracy
+  - decepticons
+  - decidable
+  - decimal-arithmetic
+  - decimal-literals
+  - DecisionTree
+  - decoder-conduit
+  - dedukti
+  - deep-transformations
+  - DeepArrow
+  - deepcontrol
+  - DeepDarkFantasy
+  - deeplearning-hs
+  - deepseq-bounded
+  - deepseq-magic
+  - deepseq-th
+  - deepzoom
+  - defargs
+  - DefendTheKing
+  - deka
+  - deka-tests
+  - delaunay
+  - delicious
+  - delimited-text
+  - delimiter-separated
+  - delta
+  - delta-h
+  - Delta-Lambda
+  - delude
+  - demarcate
+  - denominate
+  - dense
+  - dense-int-set
+  - dependent-hashmap
+  - dependent-monoidal-map
+  - dependent-state
+  - depends
+  - dephd
+  - deptrack-core
+  - deptrack-devops
+  - deptrack-dot
+  - dequeue
+  - derangement
+  - derivation-trees
+  - derive
+  - derive-enumerable
+  - derive-gadt
+  - derive-IG
+  - derive-monoid
+  - derive-trie
+  - derp-lib
+  - describe
+  - descript-lang
+  - deterministic-game-engine
+  - detour-via-uom
+  - deunicode
+  - devil
+  - devtools
+  - dewdrop
+  - dfinity-radix-tree
+  - Dflow
+  - dfsbuild
+  - dgim
+  - dgs
+  - dhall-check
+  - dhall-fly
+  - dhall-nix
+  - dhall-nixpkgs
+  - dhall-text
+  - dhall-to-cabal
+  - dhcp-lease-parser
+  - dhrun
+  - dia-base
+  - dia-functions
+  - diagrams
+  - diagrams-boolean
+  - diagrams-braille
+  - diagrams-builder
+  - diagrams-cairo
+  - diagrams-canvas
+  - diagrams-contrib
+  - diagrams-core
+  - diagrams-graphviz
+  - diagrams-gtk
+  - diagrams-haddock
+  - diagrams-html5
+  - diagrams-lib
+  - diagrams-pandoc
+  - diagrams-pdf
+  - diagrams-pgf
+  - diagrams-postscript
+  - diagrams-qrcode
+  - diagrams-rasterific
+  - diagrams-rubiks-cube
+  - diagrams-svg
+  - diagrams-tikz
+  - diagrams-wx
+  - dib
+  - dice2tex
+  - dicom
+  - dictionaries
+  - dictparser
+  - diet
+  - diff
+  - diffcabal
+  - difference-monoid
+  - DifferenceLogic
+  - differential
+  - DifferentialEvolution
+  - diffmap
+  - difftodo
+  - digestive-bootstrap
+  - digestive-foundation-lucid
+  - digestive-functors-aeson
+  - digestive-functors-happstack
+  - digestive-functors-hsp
+  - DigitalOcean
+  - digitalocean-kzs
+  - digits
+  - dimensional-codata
+  - dimensional-tf
+  - DimensionalHash
+  - dingo-core
+  - dingo-example
+  - dingo-widgets
+  - diophantine
+  - diplomacy
+  - diplomacy-server
+  - direct-binary-files
+  - direct-fastcgi
+  - direct-http
+  - direct-plugins
+  - direct-rocksdb
+  - directed-cubical
+  - direm
+  - dirfiles
+  - discogs-haskell
+  - discord-gateway
+  - discord-hs
+  - discord-register
+  - discord-rest
+  - discord-types
+  - discordian-calendar
+  - discrete
+  - DiscussionSupportSystem
+  - Dish
+  - disjoint-containers
+  - disjoint-set
+  - disjoint-set-stateful
+  - Dist
+  - dist-upload
+  - distance
+  - DisTract
+  - distributed-fork-aws-lambda
+  - distributed-process
+  - distributed-process-async
+  - distributed-process-azure
+  - distributed-process-client-server
+  - distributed-process-ekg
+  - distributed-process-execution
+  - distributed-process-extras
+  - distributed-process-fsm
+  - distributed-process-lifted
+  - distributed-process-monad-control
+  - distributed-process-p2p
+  - distributed-process-platform
+  - distributed-process-registry
+  - distributed-process-simplelocalnet
+  - distributed-process-supervisor
+  - distributed-process-systest
+  - distributed-process-task
+  - distributed-process-tests
+  - distributed-process-zookeeper
+  - distribution
+  - distribution-plot
+  - diversity
+  - dixi
+  - djembe
+  - djinn-th
+  - dl-fedora
+  - dmcc
+  - dmenu
+  - dmenu-pkill
+  - dmenu-pmount
+  - dmenu-search
+  - DMuCheck
+  - DnaProteinAlignment
+  - dnscache
+  - dnsrbl
+  - dnssd
+  - dobutok
+  - doc-review
+  - doccheck
+  - docidx
+  - docker
+  - docker-build-cacher
+  - dockercook
+  - docopt
+  - DocTest
+  - doctest-discover-configurator
+  - doctest-driver-gen
+  - doctest-prop
+  - docusign-base
+  - docusign-base-minimal
+  - docusign-client
+  - docusign-example
+  - docvim
+  - doi
+  - DOM
+  - domain
+  - domain-core
+  - domain-optics
+  - domplate
+  - dot-linker
+  - dotfs
+  - doublify-toolkit
+  - dow
+  - download-media-content
+  - downloader
+  - dozenal
+  - dozens
+  - DP
+  - dph-base
+  - dph-examples
+  - dph-lifted-base
+  - dph-lifted-copy
+  - dph-lifted-vseg
+  - dph-prim-interface
+  - dph-prim-par
+  - dph-prim-seq
+  - dpkg
+  - DPM
+  - dpor
+  - dragen
+  - drawille
+  - drClickOn
+  - dresdner-verkehrsbetriebe
+  - DrHylo
+  - DrIFT
+  - DrIFT-cabalized
+  - drifter
+  - drifter-postgresql
+  - drifter-sqlite
+  - drmaa
+  - drone
+  - dropbox
+  - dropbox-sdk
+  - dropsolve
+  - ds-kanren
+  - DSA
+  - dsc
+  - DSH
+  - dsh-sql
+  - dsmc
+  - dsmc-tools
+  - dson
+  - dson-parsec
+  - DSTM
+  - dstring
+  - DTC
+  - dtd
+  - dtd-text
+  - dtw
+  - dual-tree
+  - dualizer
+  - duet
+  - dumb-cas
+  - dump-core
+  - dunai-core
+  - Dung
+  - duplo
+  - dura
+  - Dust
+  - Dust-crypto
+  - Dust-tools
+  - Dust-tools-pcap
+  - dvault
+  - dvda
+  - dvdread
+  - dvi-processing
+  - dwarf
+  - dwarfadt
+  - dyckword
+  - dyepack
+  - dynamic-cabal
+  - dynamic-graphs
+  - dynamic-mvector
+  - dynamic-object
+  - dynamic-plot
+  - dynamic-pp
+  - DynamicTimeWarp
+  - dynamodb-simple
+  - dynloader
+  - dynobud
+  - DysFRP
+  - DysFRP-Cairo
+  - DysFRP-Craftwerk
+  - dywapitchtrack
+  - dzen-dhall
+  - dzen-utils
+  - each
+  - earclipper
+  - easy-api
+  - easy-bitcoin
+  - easyjson
+  - easyplot
+  - easytensor
+  - easytensor-vulkan
+  - easytest
+  - ebeats
+  - ebnf-bff
+  - ec2-unikernel
+  - eccrypto
+  - eccrypto-ed25519-bindings
+  - ecma262
+  - ecu
+  - eddie
+  - edenmodules
+  - edenskel
+  - edentv
+  - edge
+  - edges
+  - edit
+  - edit-lenses
+  - editable
+  - editline
+  - EditTimeReport
+  - effect-handlers
+  - effect-monad
+  - effect-stack
+  - effin
+  - egison
+  - egison-pattern-src
+  - egison-pattern-src-haskell-mode
+  - egison-pattern-src-th-mode
+  - egison-quote
+  - egison-tutorial
+  - ehaskell
+  - ehs
+  - eibd-client-simple
+  - eigen
+  - Eight-Ball-Pool-Hack-Cheats
+  - either-list-functions
+  - either-unwrap
+  - EitherT
+  - ejdb2-binding
+  - ekg-bosun
+  - ekg-carbon
+  - ekg-cloudwatch
+  - ekg-elastic
+  - ekg-elasticsearch
+  - ekg-log
+  - ekg-push
+  - ekg-rrd
+  - ekg-wai
+  - elerea-examples
+  - elevator
+  - elision
+  - elliptic-curve
+  - elm-street
+  - elm-websocket
+  - elsa
+  - emacs-keys
+  - emacs-module
+  - email
+  - email-header
+  - email-postmark
+  - emailaddress
+  - emailparse
+  - embeddock
+  - embeddock-example
+  - embla
+  - embroidery
+  - emgm
+  - Emping
+  - Empty
+  - empty-monad
+  - enchant
+  - encoding
+  - encoding-io
+  - encryptable
+  - engine-io
+  - engine-io-growler
+  - engine-io-snap
+  - engine-io-wai
+  - engine-io-yesod
+  - entangle
+  - EntrezHTTP
+  - entwine
+  - enum-text
+  - enum-text-rio
+  - enum-utf8
+  - EnumContainers
+  - enumerate
+  - enumerate-function
+  - enumeration
+  - enumerator
+  - enumerator-fd
+  - enumerator-tf
+  - enumfun
+  - EnumMap
+  - enummapmap
+  - env-parser
+  - envstatus
+  - epanet-haskell
+  - epass
+  - epi-sim
+  - epic
+  - epoll
+  - eprocess
+  - epubname
+  - Eq
+  - EqualitySolver
+  - equational-reasoning-induction
+  - equeue
+  - erf-native
+  - erlang
+  - eros
+  - eros-client
+  - eros-http
+  - error-codes
+  - error-context
+  - error-continuations
+  - error-list
+  - error-loc
+  - error-message
+  - error-util
+  - errors-ext
+  - ersaconcat
+  - ersatz
+  - ersatz-toysat
+  - ert
+  - escoger
+  - esotericbot
+  - EsounD
+  - espial
+  - ess
+  - essence-of-live-coding-warp
+  - estimators
+  - EstProgress
+  - estreps
+  - Etage
+  - Etage-Graph
+  - EtaMOO
+  - eternal
+  - Eternal10Seconds
+  - eternity
+  - eternity-timestamped
+  - ether
+  - Etherbunny
+  - ethereum-analyzer
+  - ethereum-analyzer-cli
+  - ethereum-analyzer-webui
+  - ethereum-client-haskell
+  - ethereum-merkle-patricia-db
+  - euphoria
+  - eurofxref
+  - eve-cli
+  - event
+  - event-driven
+  - event-monad
+  - eventful-dynamodb
+  - eventful-postgresql
+  - eventful-sql-common
+  - eventful-sqlite
+  - eventlog2html
+  - eventloop
+  - EventSocket
+  - eventsource-geteventstore-store
+  - eventstore
+  - every-bit-counts
+  - ewe
+  - exact-cover
+  - exact-real-positional
+  - except-exceptions
+  - exception-monads-fd
+  - exceptional
+  - exceptionfree-readfile
+  - exchangerates
+  - execs
+  - executor
+  - exference
+  - exherbo-cabal
+  - exif
+  - exinst-deepseq
+  - exinst-hashable
+  - exists
+  - exitcode
+  - exp-extended
+  - expand
+  - expat-enumerator
+  - expiring-containers
+  - explain
+  - explicit-constraint-lens
+  - explicit-determinant
+  - explicit-iomodes
+  - explicit-iomodes-bytestring
+  - explicit-iomodes-text
+  - explicit-sharing
+  - explore
+  - exposed-containers
+  - expression-parser
+  - expressions
+  - expressions-z3
+  - expresso
+  - extcore
+  - extemp
+  - extended-categories
+  - extensible-data
+  - extensible-effects-concurrent
+  - extensible-skeleton
+  - external-sort
+  - Extra
+  - extract-dependencies
+  - extractelf
+  - extralife
+  - ez-couch
+  - ez3
+  - f-algebra-gen
+  - f-ree-hack-cheats-free-v-bucks-generator
+  - Facebook-Password-Hacker-Online-Latest-Version
+  - faceted
+  - facts
+  - Facts
+  - factual-api
+  - fadno
+  - fadno-braids
+  - fadno-xml
+  - failable-list
+  - failure-detector
+  - FailureT
+  - fake
+  - fake-type
+  - faktory
+  - falling-turnip
+  - fallingblocks
+  - family-tree
+  - fast-arithmetic
+  - fast-combinatorics
+  - fast-digits
+  - fast-nats
+  - fasta
+  - fastbayes
+  - fastedit
+  - fastirc
+  - fastly
+  - FastPush
+  - FastxPipe
+  - fathead-util
+  - fault-tree
+  - fay
+  - fay-base
+  - fay-builder
+  - fay-dom
+  - fay-geoposition
+  - fay-hsx
+  - fay-jquery
+  - fay-ref
+  - fay-simplejson
+  - fay-text
+  - fay-uri
+  - fay-websockets
+  - fb-persistent
+  - fbmessenger-api
+  - fca
+  - fcache
+  - fcd
+  - fcf-containers
+  - fcg
+  - fckeditor
+  - fclabels-monadlib
+  - fcm-client
+  - FComp
+  - fdo-trash
+  - feature-flipper
+  - feature-flipper-postgres
+  - fedora-img-dl
+  - fedora-packages
+  - feed-cli
+  - feed-collect
+  - feed-crawl
+  - feed-gipeda
+  - feed-translator
+  - feed2lj
+  - feed2twitter
+  - fei-base
+  - fei-cocoapi
+  - fei-dataiter
+  - fei-examples
+  - fei-nn
+  - feldspar-compiler
+  - feldspar-language
+  - fenfire
+  - FermatsLastMargin
+  - fernet
+  - FerryCore
+  - festung
+  - Feval
+  - fez-conf
+  - ffeed
+  - fficxx
+  - ffmpeg-tutorials
+  - ffunctor
+  - fgl-extras-decompositions
+  - fibon
+  - ficketed
+  - fields
+  - FieldTrip
+  - fieldwise
+  - fig
+  - file-collection
+  - file-command-qq
+  - file-embed-poly
+  - file-location
+  - filecache
+  - filediff
+  - FileManip
+  - FileManipCompat
+  - fileneglect
+  - filepath-crypto
+  - filepath-io-access
+  - FilePather
+  - filepather
+  - fileplow
+  - Files
+  - FileSystem
+  - filesystem-abstractions
+  - filesystem-conduit
+  - filesystem-enumerator
+  - filesystem-trees
+  - fillit
+  - final-pretty-printer
+  - Finance-Quote-Yahoo
+  - Finance-Treasury
+  - find-clumpiness
+  - find-conduit
+  - find-source-files
+  - findhttp
+  - fingertree-psqueue
+  - fingertree-tf
+  - finitary-derive
+  - FiniteMap
+  - firefly-example
+  - first-and-last
+  - first-class-instances
+  - firstify
+  - FirstOrderTheory
+  - fit
+  - fits-parse
+  - fitsio
+  - fix-imports
+  - fix-parser-simple
+  - fix-symbols-gitit
+  - fixed-point
+  - fixed-point-vector
+  - fixed-point-vector-space
+  - fixed-precision
+  - fixed-storable-array
+  - fixed-timestep
+  - fixed-vector-binary
+  - fixed-vector-cborg
+  - fixed-vector-cereal
+  - fixed-width
+  - fixer
+  - fixfile
+  - fixhs
+  - fixie
+  - fizzbuzz
+  - fizzbuzz-as-a-service
+  - flac
+  - flac-picture
+  - flamethrower
+  - flamingra
+  - flashblast
+  - flat-maybe
+  - flatbuffers
+  - flay
+  - flexible-time
+  - flexiwrap
+  - flexiwrap-smallcheck
+  - flickr
+  - flink-statefulfun
+  - Flippi
+  - flite
+  - float-binstring
+  - floating-bits
+  - flow-er
+  - flowdock
+  - flowdock-api
+  - flowdock-rest
+  - flower
+  - flowlocks-framework
+  - flowsim
+  - flp
+  - fltkhs
+  - fltkhs-fluid-examples
+  - fluent-logger
+  - fluffy-parser
+  - fluidsynth
+  - flux-monoid
+  - FM-SBLEX
+  - fmark
+  - FModExRaw
+  - fmt
+  - fmt-for-rio
+  - fmt-terminal-colors
+  - fn-extra
+  - foldl-incremental
+  - foldl-statistics
+  - foldl-transduce
+  - foldl-transduce-attoparsec
+  - folds-common
+  - follow
+  - follower
+  - foma
+  - font-opengl-basic4x6
+  - foo
+  - for-free
+  - forbidden-fruit
+  - force-layout
+  - fordo
+  - forecast-io
+  - foreign-var
+  - forest
+  - forest-fire
+  - Forestry
+  - forger
+  - ForkableT
+  - formal
+  - FormalGrammars
+  - format
+  - format-status
+  - formattable
+  - forml
+  - formlets
+  - formlets-hsp
+  - formura
+  - ForSyDe
+  - forsyde-deep
+  - forth-hll
+  - Fortnite-Hack-Cheats-Free-V-Bucks-Generator
+  - fortran-src
+  - fortytwo
+  - foscam-directory
+  - foscam-filename
+  - foscam-sort
+  - Foster
+  - fpco-api
+  - fplll
+  - fpnla-examples
+  - FPretty
+  - fptest
+  - Fractaler
+  - fractals
+  - fraction
+  - frag
+  - Frames-beam
+  - Frames-dsv
+  - Frames-map-reduce
+  - franchise
+  - Frank
+  - fraxl
+  - freddy
+  - free-algebras
+  - free-category
+  - free-concurrent
+  - free-game
+  - free-http
+  - free-operational
+  - free-theorems
+  - free-theorems-counterexamples
+  - free-theorems-seq
+  - free-theorems-seq-webui
+  - free-theorems-webui
+  - free-v-bucks-generator-no-survey
+  - free-v-bucks-generator-ps4-no-survey
+  - freekick2
+  - freelude
+  - freer-converse
+  - freer-effects
+  - freer-simple-catching
+  - freer-simple-http
+  - freer-simple-profiling
+  - freer-simple-random
+  - freer-simple-time
+  - freesect
+  - freesound
+  - freetype-simple
+  - FreeTypeGL
+  - freq
+  - fresh
+  - friday-devil
+  - friday-scale-dct
+  - friendly
+  - front
+  - frown
+  - frp-arduino
+  - frpnow
+  - frpnow-gloss
+  - frpnow-gtk
+  - frpnow-gtk3
+  - frpnow-vty
+  - fs-events
+  - fsh-csv
+  - fsmActions
+  - fst
+  - fsutils
+  - fswait
+  - fswatch
+  - ft-generator
+  - ftdi
+  - FTGL-bytestring
+  - ftp-conduit
+  - ftphs
+  - FTPLine
+  - ftshell
+  - full-sessions
+  - fullstop
+  - funbot
+  - funbot-client
+  - funbot-git-hook
+  - funcons-lambda-cbv-mp
+  - funcons-simple
+  - funcons-tools
+  - funcons-values
+  - function-combine
+  - function-instances-algebra
+  - functional-arrow
+  - functor
+  - functor-combinators
+  - functor-friends
+  - functor-infix
+  - functor-products
+  - functor-utils
+  - functorm
+  - funflow
+  - funflow-nix
+  - Fungi
+  - funion
+  - funnyprint
+  - funpat
+  - funsat
+  - funspection
+  - fused-effects-resumable
+  - fused-effects-squeal
+  - fused-effects-th
+  - fusion
+  - futun
+  - future
+  - fuzzy-timings
+  - fwgl
+  - fwgl-glfw
+  - fwgl-javascript
+  - g-npm
+  - g2
+  - g2q
+  - g4ip
+  - gact
+  - galois-fft
+  - galois-field
+  - game-probability
+  - gameclock
+  - gamgee
+  - Gamgine
+  - gamma
+  - Ganymede
+  - garepinoh
+  - gargoyle-postgresql-connect
+  - gargoyle-postgresql-nix
+  - gas
+  - gather
+  - gbu
+  - gc-monitoring-wai
+  - gconf
+  - gdax
+  - gdiff-ig
+  - gdiff-th
+  - GeBoP
+  - gedcom
+  - geek
+  - geek-server
+  - gegl
+  - gelatin
+  - gelatin-freetype2
+  - gelatin-fruity
+  - gelatin-gl
+  - gelatin-sdl2
+  - gelatin-shaders
+  - gemstone
+  - gen-imports
+  - gen-passwd
+  - Genbank
+  - gencheck
+  - gender
+  - genders
+  - Gene-CluEDO
+  - general-prelude
+  - GeneralTicTacToe
+  - generator
+  - generators
+  - generic-accessors
+  - generic-binary
+  - generic-church
+  - generic-enum
+  - generic-lens-labels
+  - generic-lucid-scaffold
+  - generic-maybe
+  - generic-override-aeson
+  - generic-pretty
+  - generic-server
+  - generic-storable
+  - generic-tree
+  - generic-trie
+  - generic-xml
+  - generic-xmlpickler
+  - generics-mrsop
+  - generics-mrsop-gdiff
+  - genericserialize
+  - genesis
+  - genesis-test
+  - genetics
+  - GenI
+  - geni-gui
+  - geni-util
+  - geniconvert
+  - geniplate
+  - geniserver
+  - genprog
+  - GenSmsPdu
+  - gentlemark
+  - GenussFold
+  - geo-resolver
+  - GeocoderOpenCage
+  - geodetic
+  - geodetic-types
+  - geojson-types
+  - geolite-csv
+  - geom2d
+  - GeomPredicates-SSE
+  - geos
+  - Get
+  - getemx
+  - getflag
+  - GGg
+  - ggtsTC
+  - gh-labeler
+  - ghc-clippy-plugin
+  - ghc-core-smallstep
+  - ghc-datasize
+  - ghc-dump-core
+  - ghc-dump-tree
+  - ghc-dump-util
+  - ghc-dup
+  - ghc-events-analyze
+  - ghc-events-parallel
+  - ghc-generic-instances
+  - ghc-imported-from
+  - ghc-instances
+  - ghc-justdoit
+  - ghc-man-completion
+  - ghc-mod
+  - ghc-parmake
+  - ghc-pkg-autofix
+  - ghc-pkg-lib
+  - ghc-plugs-out
+  - ghc-proofs
+  - ghc-session
+  - ghc-simple
+  - ghc-srcspan-plugin
+  - ghc-syb
+  - ghc-syb-utils
+  - ghc-tags-core
+  - ghc-tags-plugin
+  - ghc-time-alloc-prof
+  - ghc-usage
+  - ghc-vis
+  - ghci-dap
+  - ghci-diagrams
+  - ghci-haskeline
+  - ghci-history-parser
+  - ghci-lib
+  - ghci-ng
+  - ghci-pretty
+  - ghcjs-dom-jsffi
+  - ghcjs-fetch
+  - ghcjs-hplay
+  - ghcjs-promise
+  - ghcjs-xhr
+  - ghclive
+  - ghcprofview
+  - ght
+  - gi-cairo-again
+  - gi-graphene
+  - gi-gsk
+  - gi-gstaudio
+  - gi-gstpbutils
+  - gi-gsttag
+  - gi-gtk-declarative
+  - gi-gtk-declarative-app-simple
+  - gi-gtkosxapplication
+  - gi-gtksheet
+  - gi-handy
+  - gi-poppler
+  - gi-wnck
+  - giak
+  - Gifcurry
+  - ginsu
+  - gipeda
+  - giphy-api
+  - GiST
+  - gist
+  - git
+  - git-all
+  - git-checklist
+  - git-config
+  - git-cuk
+  - git-date
+  - git-fmt
+  - git-gpush
+  - git-jump
+  - git-monitor
+  - git-object
   - git-remote-ipfs
+  - git-repair
+  - git-sanity
+  - git-vogue
+  - gitdo
+  - github-backup
+  - github-data
+  - github-tools
+  - github-utils
+  - github-webhook-handler
+  - github-webhook-handler-snap
+  - githud
+  - gitignore
+  - gitit
+  - gitlab-api
+  - gitlib
+  - gitlib-cmdline
+  - gitlib-cross
+  - gitlib-libgit2
+  - gitlib-s3
+  - gitlib-sample
+  - gitlib-test
+  - gitlib-utils
+  - gitson
+  - gitter
+  - givegif
+  - glade
+  - gladexml-accessor
+  - glapp
+  - glazier
+  - glazier-pipes
+  - glazier-react
+  - glazier-react-examples
+  - glazier-react-widget
+  - Gleam
+  - GLFW
+  - GLFW-b-demo
+  - GLFW-OGL
+  - GLFW-task
+  - gli
+  - glicko
+  - glider-nlp
+  - GLMatrix
+  - glob-posix
+  - global
+  - global-config
+  - global-variables
+  - glome-hs
+  - GlomeTrace
+  - GlomeView
+  - gloss-banana
+  - gloss-devil
+  - gloss-examples
+  - gloss-export
+  - gloss-game
+  - gloss-sodium
+  - glpk-hs
+  - gltf-codec
+  - glue
+  - gmap
+  - gmndl
+  - gnome-desktop
+  - gnomevfs
+  - gnss-converters
+  - gnuidn
+  - goa
+  - goal-core
+  - goal-geometry
+  - goal-probability
+  - goal-simulation
+  - goatee
+  - goatee-gtk
+  - gochan
+  - godot-haskell
+  - gofer-prelude
+  - goldplate
+  - gooey
+  - google-cloud
+  - google-drive
+  - google-html5-slide
+  - google-mail-filters
+  - google-maps-geocoding
+  - google-oauth2
+  - google-oauth2-easy
+  - google-oauth2-jwt
+  - google-search
+  - google-server-api
+  - google-static-maps
+  - google-translate
+  - GoogleCodeJam
+  - GoogleDirections
+  - googleplus
+  - googlepolyline
+  - GoogleSB
+  - GoogleTranslate
+  - gopherbot
+  - gopro-plus
+  - gore-and-ash
+  - gore-and-ash-actor
+  - gore-and-ash-async
+  - gore-and-ash-demo
+  - gore-and-ash-glfw
+  - gore-and-ash-lambdacube
+  - gore-and-ash-logging
+  - gore-and-ash-network
+  - gore-and-ash-sdl
+  - gore-and-ash-sync
+  - GotoT-transformers
+  - gpah
+  - GPipe
+  - GPipe-Collada
+  - GPipe-Examples
+  - GPipe-GLFW
+  - GPipe-TextureLoad
+  - gps
+  - gps2htmlReport
+  - GPX
+  - gpx-conduit
+  - grab
+  - grab-form
+  - graceful
+  - grafana
+  - graflog
+  - Grafos
+  - grakn
+  - grammar-combinators
+  - GrammarProducts
+  - grammatical-parsers
+  - grapefruit-examples
+  - grapefruit-frp
+  - grapefruit-records
+  - grapefruit-ui
+  - grapefruit-ui-gtk
+  - graph-core
+  - graph-matchings
+  - graph-rewriting
+  - graph-rewriting-cl
+  - graph-rewriting-gl
+  - graph-rewriting-lambdascope
+  - graph-rewriting-layout
+  - graph-rewriting-ski
+  - graph-rewriting-strategies
+  - graph-rewriting-trs
+  - graph-rewriting-ww
+  - graph-serialize
+  - graph-utils
+  - graph-visit
+  - Graph500
+  - graphbuilder
+  - graphene
+  - GraphHammer
+  - GraphHammer-examples
+  - graphics-drawingcombinators
+  - graphics-formats-collada
+  - graphicsFormats
+  - graphicstools
+  - graphmod-plugin
+  - graphql
+  - graphql-api
+  - graphql-client
+  - graphql-utils
+  - graphql-w-persistent
+  - graphted
+  - graphtype
+  - graphula
+  - graphula-core
+  - graql
+  - grasp
+  - gray-code
+  - greencard
+  - greencard-lib
+  - greenclip
+  - greg-client
+  - gremlin-haskell
+  - Grempa
+  - grenade
+  - grid-proto
+  - gridbounds
+  - gridland
+  - grm
+  - groot
+  - gross
+  - GroteTrap
+  - groundhog-converters
+  - group-with
+  - grouped-list
+  - groups-generic
+  - growler
+  - GrowlNotify
+  - grpc-api-etcd
+  - grpc-etcd-client
+  - grpc-haskell
+  - grpc-haskell-core
+  - gruff
+  - gruff-examples
+  - gscholar-rss
+  - gsl-random
+  - gsl-random-fu
+  - gstorable
+  - gstreamer
+  - GTALib
+  - gtfs
+  - gtfs-realtime
+  - gtk-serialized-event
+  - gtk-toy
+  - gtk2hs-hello
+  - gtk2hs-rpn
+  - Gtk2hsGenerics
+  - gtk3-mac-integration
+  - gtkglext
+  - GtkGLTV
+  - gtkimageview
+  - gtkrsync
+  - gtksourceview2
+  - gtksourceview3
+  - GtkTV
+  - guarded-rewriting
+  - guess-combinator
+  - GuiHaskell
+  - GuiTV
+  - gulcii
+  - gw
+  - gyah-bin
+  - gym-http-api
+  - H
+  - h-booru
+  - h-gpgme
+  - h-reversi
+  - h2048
+  - h2c
+  - haar
+  - habit
+  - hablo
+  - hablog
+  - HABQT
+  - Hach
+  - hack-contrib
+  - hack-contrib-press
+  - hack-frontend-happstack
+  - hack-handler-cgi
+  - hack-handler-epoll
+  - hack-handler-evhttp
+  - hack-handler-fastcgi
+  - hack-handler-happstack
+  - hack-handler-hyena
+  - hack-handler-kibro
+  - hack-handler-simpleserver
+  - hack-middleware-cleanpath
+  - hack-middleware-clientsession
+  - hack-middleware-jsonp
+  - hack2-handler-happstack-server
+  - hack2-handler-mongrel2-http
+  - hack2-handler-snap-server
+  - hack2-handler-warp
+  - hackage-diff
+  - hackage-mirror
+  - hackage-processing
+  - hackage-proxy
+  - hackage-repo-tool
+  - hackage-server
+  - hackage-whatsnew
+  - hackage2hwn
+  - hackage2twitter
+  - hackager
+  - hackernews
+  - HackMail
+  - hackmanager
+  - hactor
+  - hactors
+  - haddock
+  - haddock-api
+  - haddock-cheatsheet
+  - haddock-leksah
+  - haddock-test
+  - haddocset
+  - hadoop-formats
+  - hadoop-rpc
+  - hadoop-tools
+  - hafar
+  - haggis
+  - Haggressive
+  - hahp
+  - haiji
+  - hailgun-send
+  - hairy
+  - hakaru
+  - hakismet
+  - hakka
+  - hako
+  - hakyll
+  - hakyll-agda
+  - hakyll-alectryon
+  - hakyll-blaze-templates
+  - hakyll-contrib
+  - hakyll-contrib-csv
+  - hakyll-contrib-elm
+  - hakyll-contrib-hyphenation
+  - hakyll-contrib-links
+  - hakyll-dhall
+  - hakyll-dir-list
+  - hakyll-favicon
+  - hakyll-filestore
+  - hakyll-images
+  - hakyll-ogmarkup
+  - hakyll-process
+  - hakyll-R
+  - hakyll-sass
+  - hakyll-series
+  - hakyll-shakespeare
+  - hakyll-shortcode
+  - hakyll-shortcut-links
+  - hakyll-typescript
+  - hal
+  - halberd
+  - HaLeX
+  - halfs
+  - halipeto
+  - halive
+  - hall-symbols
+  - halma
+  - halma-gui
+  - halma-telegram-bot
+  - halves
+  - ham
+  - HaMinitel
+  - hampp
+  - hamsql
+  - hamtmap
+  - hamusic
+  - hanabi-dealer
+  - handa-gdata
+  - handle-like
+  - HandlerSocketClient
+  - handsy
+  - Hangman
+  - hannahci
+  - hans
+  - hans-pcap
+  - hanspell
+  - haphviz
+  - happindicator
+  - happindicator3
+  - happlets
+  - happlets-lib-gtk
+  - happraise
+  - HAppS-Data
+  - happs-hsp
+  - happs-hsp-template
+  - HAppS-IxSet
+  - HAppS-Server
+  - HAppS-State
+  - happs-tutorial
+  - HAppS-Util
+  - happstack
+  - happstack-auth
+  - happstack-authenticate
+  - happstack-contrib
+  - happstack-data
+  - happstack-dlg
+  - happstack-facebook
+  - happstack-fay
+  - happstack-fay-ajax
+  - happstack-foundation
+  - happstack-hamlet
+  - happstack-heist
+  - happstack-helpers
+  - happstack-hstringtemplate
+  - happstack-ixset
+  - happstack-jmacro
+  - happstack-lite
+  - happstack-monad-peel
+  - happstack-plugins
+  - happstack-server-tls-cryptonite
+  - happstack-state
+  - happstack-util
+  - happstack-yui
+  - happy-hour
+  - happybara
+  - happybara-webkit
+  - happybara-webkit-server
+  - HappyTree
+  - hapstone
+  - HaPy
+  - haquery
+  - haquil
+  - harchive
+  - hArduino
+  - hardware-edsl
+  - HaRe
+  - harg
+  - hark
+  - harmony
+  - HarmTrace
+  - haroonga
+  - haroonga-httpd
+  - harpy
+  - harvest-api
+  - has
+  - has-th
+  - hasbolt
+  - hasbolt-extras
+  - HasCacBDD
+  - hascard
+  - hascas
+  - Haschoo
+  - HasGP
+  - hash
+  - hashable-extras
+  - hashable-generics
+  - hashable-orphans
+  - hashabler
+  - hashed-storage
+  - Hashell
+  - hashflare
+  - hashring
+  - hashtables-plus
+  - hasim
+  - hask
+  - hask-home
+  - haskarrow
+  - haskbot-core
+  - haskdeep
+  - haskeem
+  - haskeline-class
+  - haskelisp
+  - haskell-abci
+  - haskell-aliyun
+  - haskell-awk
+  - haskell-bitmex-client
+  - haskell-bitmex-rest
+  - haskell-brainfuck
+  - haskell-ci
+  - haskell-cnc
+  - haskell-coffee
+  - haskell-compression
+  - haskell-conll
+  - haskell-course-preludes
+  - haskell-debug-adapter
+  - haskell-disque
+  - haskell-docs
+  - haskell-eigen-util
+  - haskell-formatter
+  - haskell-ftp
+  - haskell-generate
+  - haskell-go-checkers
+  - haskell-holes-th
+  - haskell-igraph
+  - haskell-in-space
+  - haskell-kubernetes
+  - haskell-lsp-client
+  - haskell-ml
+  - haskell-mpfr
+  - haskell-neo4j-client
+  - haskell-openflow
+  - haskell-overridez
+  - haskell-packages
+  - haskell-pdf-presenter
+  - haskell-platform-test
+  - haskell-player
+  - haskell-plot
+  - haskell-postal
+  - haskell-read-editor
+  - haskell-reflect
+  - haskell-rules
+  - haskell-spacegoo
+  - haskell-src
+  - haskell-src-exts-observe
+  - haskell-src-exts-prisms
+  - haskell-src-exts-qq
+  - haskell-src-exts-sc
+  - haskell-src-match
+  - haskell-src-meta-mwotton
+  - haskell-stack-trace-plugin
+  - haskell-token-utils
+  - haskell-tools-ast
+  - haskell-tools-ast-fromghc
+  - haskell-tools-ast-gen
+  - haskell-tools-ast-trf
+  - haskell-tools-backend-ghc
+  - haskell-tools-builtin-refactorings
+  - haskell-tools-cli
+  - haskell-tools-daemon
+  - haskell-tools-debug
+  - haskell-tools-demo
+  - haskell-tools-experimental-refactorings
+  - haskell-tools-prettyprint
+  - haskell-tools-refactor
+  - haskell-tools-rewrite
+  - haskell-tor
+  - haskell-type-exts
+  - haskell-typescript
+  - haskell-tyrant
+  - haskell-xmpp
+  - haskell2010
+  - haskell2020
+  - haskell98
+  - haskell98libraries
+  - HaskellAnalysisProgram
+  - haskelldb
+  - haskelldb-connect-hdbc
+  - haskelldb-connect-hdbc-catchio-mtl
+  - haskelldb-connect-hdbc-catchio-tf
+  - haskelldb-connect-hdbc-catchio-transformers
+  - haskelldb-connect-hdbc-lifted
+  - haskelldb-dynamic
+  - haskelldb-flat
+  - haskelldb-hdbc
+  - haskelldb-hdbc-mysql
+  - haskelldb-hdbc-odbc
+  - haskelldb-hdbc-postgresql
+  - haskelldb-hdbc-sqlite3
+  - haskelldb-hsql
+  - haskelldb-hsql-mysql
+  - haskelldb-hsql-odbc
+  - haskelldb-hsql-postgresql
+  - haskelldb-hsql-sqlite3
+  - haskelldb-th
+  - haskelldb-wx
+  - haskellish
+  - HaskellLM
+  - HaskellNet
+  - HaskellNet-SSL
+  - HaskellNN
+  - Haskelloids
+  - haskellscrabble
+  - haskellscript
+  - HaskellTorrent
+  - HaskellTutorials
+  - haskelzinc
+  - haskeme
+  - haskey
+  - haskey-mtl
+  - haskgame
+  - haskheap
+  - haskhol-core
+  - haskmon
+  - haskoin
+  - haskoin-bitcoind
+  - haskoin-core
+  - haskoin-crypto
+  - haskoin-node
+  - haskoin-protocol
+  - haskoin-script
+  - haskoin-store
+  - haskoin-store-data
+  - haskoin-util
+  - haskoin-wallet
+  - haskoon
+  - haskoon-httpspec
+  - haskoon-salvia
+  - haskore
+  - haskore-realtime
+  - haskore-supercollider
+  - haskore-synthesizer
+  - HaskRel
+  - hasktorch
+  - hasktorch-codegen
+  - hasktorch-ffi-th
+  - hasktorch-ffi-thc
+  - hasktorch-indef
+  - hasktorch-signatures
+  - hasktorch-signatures-partial
+  - hasktorch-signatures-support
+  - hasktorch-zoo
+  - haskus-binary
+  - haskus-system-build
+  - haskus-utils
+  - haskus-utils-compat
+  - haskus-utils-data
+  - haskus-utils-types
+  - haskus-utils-variant
+  - haskus-web
+  - haskyapi
+  - haslo
+  - hasloGUI
+  - hasparql-client
+  - hasql-backend
+  - hasql-class
+  - hasql-cursor-query
+  - hasql-cursor-transaction
+  - hasql-dynamic-statements
+  - hasql-generic
+  - hasql-postgres
+  - hasql-postgres-options
+  - hasql-queue
+  - hasql-simple
+  - hastache
+  - hastache-aeson
+  - haste
+  - haste-app
+  - haste-lib
+  - haste-markup
+  - haste-prim
+  - Hate
+  - hatex-guide
+  - HaTeX-meta
+  - HaTeX-qq
+  - hats
+  - hatt
+  - haven
+  - haverer
+  - HaVSA
+  - hawitter
+  - Hawk
+  - hax
+  - haxl-amazonka
+  - haxl-facebook
+  - haxparse
+  - haxr-th
+  - haxy
+  - hayland
+  - Hayoo
+  - hayoo-cli
+  - hback
+  - hbayes
+  - hbb
+  - hbcd
+  - hBDD-CMUBDD
+  - hBDD-CUDD
+  - hbeanstalk
+  - hbeat
+  - hbf
+  - hblas
+  - hblock
+  - hburg
+  - hcad
+  - HCard
+  - hcc
+  - hcg-minus
+  - hcg-minus-cairo
+  - hcheat
+  - hcheckers
+  - hchesslib
+  - HCL
+  - hcltest
+  - hCM
+  - hcoap
+  - hcom
+  - hcron
+  - hCsound
+  - hcube
+  - hdaemonize-buildfix
+  - hdbc-aeson
+  - HDBC-mysql
+  - hdbc-postgresql-hstore
+  - HDBC-postgresql-hstore
+  - hdbi
+  - hdbi-conduit
+  - hdbi-postgresql
+  - hdbi-sqlite
+  - hdbi-tests
+  - hdevtools
+  - hdf
+  - hDFA
+  - hdiff
+  - hdigest
+  - hdirect
+  - hdis86
+  - hdiscount
+  - hdm
+  - hdo
+  - hdocs
+  - hdph
+  - hdph-closure
+  - hdr-histogram
+  - HDRUtils
+  - headergen
+  - heapsort
+  - heart-app
+  - heart-core
+  - heartbeat-streams
+  - heatitup
+  - heatitup-complete
+  - heavy-log-shortcuts
+  - heavy-logger
+  - heavy-logger-amazon
+  - heavy-logger-instances
+  - hebrew-time
+  - hecc
+  - heckle
+  - hedgehog-checkers
+  - hedgehog-checkers-lens
+  - hedgehog-gen-json
+  - hedgehog-generic
+  - hedgehog-golden
+  - hedgehog-servant
+  - Hedi
+  - hedis-config
+  - hedis-pile
+  - hedis-simple
+  - hedis-tags
+  - hedn-functor
+  - hedra
+  - heidi
+  - hein
+  - heist-aeson
+  - heist-async
+  - helics
+  - helics-wai
+  - helisp
+  - helium
+  - helix
+  - hell
+  - hellage
+  - hellnet
+  - help-esb
+  - hemkay
+  - hemokit
+  - hen
+  - henet
+  - hepevt
+  - her-lexer
+  - her-lexer-parsec
+  - HERA
+  - herbalizer
+  - HerbiePlugin
+  - heredocs
+  - Hermes
+  - hermit
+  - hermit-syb
+  - herms
+  - herringbone
+  - herringbone-embed
+  - herringbone-wai
+  - hesh
+  - hesql
+  - hetero-dict
+  - heterogeneous-list-literals
+  - heterolist
+  - hetris
+  - heukarya
+  - hevm
+  - hevolisa
+  - hevolisa-dph
+  - hex-text
+  - HExcel
+  - hexchat
+  - hexif
+  - hexmino
+  - hexml-lens
+  - hexpat-iteratee
+  - hexpat-pickle-generic
+  - hexpr
+  - hexpress
+  - hexquote
+  - hext
+  - heyefi
+  - heyting-algebras
+  - hF2
+  - hfann
+  - hfd
+  - hfiar
+  - HFitUI
+  - hfmt
+  - hfoil
+  - hfov
+  - hfractal
+  - HFrequencyQueue
+  - hfusion
+  - hg-buildpackage
+  - hgalib
+  - hgdbmi
+  - HGE2D
+  - hgearman
+  - hGelf
+  - hgen
+  - hgeometric
+  - hgeometry-ipe
+  - hgeometry-svg
+  - hgeos
+  - hgettext
+  - hgis
+  - hgithub
+  - hgmp
+  - hgom
+  - hgopher
+  - HGraphStorage
+  - hgrep
+  - hgrib
+  - hharp
+  - HHDL
+  - hhp
+  - hhwloc
+  - hi3status
+  - hiccup
+  - hichi
+  - hid-examples
+  - hidden-char
+  - hie-core
+  - hieraclus
+  - hierarchical-clustering-diagrams
+  - hierarchical-exceptions
+  - hierarchical-spectral-clustering
+  - hierarchy
+  - hiernotify
+  - Hieroglyph
+  - higgledy
+  - HiggsSet
+  - higherorder
+  - highjson
+  - highjson-swagger
+  - highjson-th
+  - highlight-versions
+  - highWaterMark
+  - himg
+  - himpy
+  - hindent
+  - hindley-milner
+  - hinduce-classifier
+  - hinduce-classifier-decisiontree
+  - hinduce-examples
+  - hinquire
+  - hinstaller
+  - hint-server
+  - hinter
+  - hinterface
+  - hinvaders
+  - hinze-streams
+  - hip
+  - hipbot
+  - hipchat-hs
+  - hipe
+  - Hipmunk-Utils
+  - hircules
+  - hirt
+  - Hish
+  - hissmetrics
+  - hist-pl
+  - hist-pl-dawg
+  - hist-pl-fusion
+  - hist-pl-lexicon
+  - hist-pl-lmf
+  - hist-pl-types
+  - historian
+  - hit
+  - hit-graph
+  - hit-on
+  - HJavaScript
+  - hjcase
+  - hjs
+  - HJScript
+  - hjson-query
+  - hjsonpointer
+  - hjsonschema
+  - hjugement-cli
+  - HJVM
+  - hkd-delta
+  - hkd-lens
+  - hkt
+  - hlbfgsb
+  - hlcm
+  - HLearn-algebra
+  - HLearn-approximation
+  - HLearn-classification
+  - HLearn-datastructures
+  - HLearn-distributions
+  - hledger-api
+  - hledger-chart
+  - hledger-irr
+  - hledger-vty
+  - hlibBladeRF
+  - hlibev
+  - hlibfam
+  - HList
+  - hlivy
+  - hlogger
+  - HLogger
+  - hlongurl
+  - hls
+  - hls-brittany
+  - hlwm
+  - hly
+  - hmark
+  - hmarkup
+  - hmatrix-banded
+  - hmatrix-mmap
+  - hmatrix-nipals
+  - hmatrix-sparse
+  - hmatrix-static
+  - hmatrix-sundials
+  - hmatrix-svdlibc
+  - hmatrix-syntax
+  - hmatrix-tests
+  - hmeap
+  - hmeap-utils
+  - hmenu
+  - hmep
+  - hmk
+  - HMM
+  - hmm
+  - hmm-hmatrix
+  - hmm-lapack
+  - hMollom
+  - hmp3
+  - Hmpf
+  - hmt
+  - hmt-diagrams
+  - hmumps
+  - hnetcdf
+  - hnix-store-remote
+  - HNM
+  - hnormalise
+  - ho-rewriting
+  - hoauth
+  - hob
+  - hobbes
+  - hobbits
+  - hocilib
+  - hodatime
+  - HODE
+  - hoe
+  - Hoed
+  - hOff-display
+  - hog
+  - hogg
+  - hoggl
+  - hogre
+  - hogre-examples
+  - hois
+  - hoist-error
+  - hol
+  - hold-em
+  - hole
+  - holmes
+  - Holumbus-Searchengine
+  - holy-project
+  - homeomorphic
+  - hommage
+  - homoiconic
+  - homplexity
+  - HongoDB
+  - honi
+  - hoobuddy
+  - hood
+  - hood-off
+  - hood2
+  - hoodie
+  - hoodle
+  - hoodle-builder
+  - hoodle-core
+  - hoodle-extra
+  - hoodle-parser
+  - hoodle-publish
+  - hoodle-render
+  - hoodle-types
+  - hoogle-index
+  - hooks-dir
+  - hoop
+  - hoopl
+  - hoovie
+  - hopencc
+  - hopencl
+  - HOpenCV
+  - hopfield
+  - hoppy-docs
+  - hoppy-generator
+  - hoppy-runtime
+  - hoppy-std
+  - hops
+  - hoq
+  - horizon
+  - horname
+  - hosc-json
+  - hosts-server
+  - hothasktags
+  - hotswap
+  - hourglass-fuzzy-parsing
+  - houseman
+  - hp2any-core
+  - hp2any-graph
+  - hp2any-manager
+  - hpack-convert
+  - hpaco
+  - hpaco-lib
+  - hpage
+  - hpapi
+  - hpaste
+  - hpasteit
+  - HPath
+  - hpc-coveralls
+  - hpc-tracer
+  - hPDB
+  - hPDB-examples
+  - HPDF
+  - hpg
+  - HPi
+  - hpio
+  - hplaylist
+  - HPlot
+  - hpodder
+  - HPong
+  - hpqtypes
+  - hpqtypes-extras
+  - hprotoc
+  - hprotoc-fork
+  - hps
+  - hps-cairo
+  - hps-kmeans
+  - hPushover
+  - hpygments
+  - hpylos
+  - hpyrg
+  - hpython
+  - hquantlib
+  - hquantlib-time
+  - hR
+  - hranker
+  - HRay
+  - hreader
+  - hreader-lens
+  - hreq-client
+  - hreq-conduit
+  - hreq-core
+  - Hricket
+  - hricket
+  - hriemann
+  - HROOT
+  - HROOT-core
+  - HROOT-graf
+  - HROOT-hist
+  - HROOT-io
+  - HROOT-math
+  - HROOT-tree
+  - hs-blake2
+  - hs-brotli
+  - hs-carbon-examples
+  - hs-cdb
+  - hs-conllu
+  - hs-di
+  - hs-dotnet
+  - hs-excelx
+  - hs-ffmpeg
+  - hs-fltk
+  - hs-gen-iface
+  - hs-gizapp
+  - hs-inspector
+  - hs-java
+  - hs-json-rpc
+  - hs-logo
+  - hs-nombre-generator
+  - hs-pattrans
+  - hs-pgms
+  - hs-pkg-config
+  - hs-pkpass
+  - hs-re
+  - hs-rqlite
+  - hs-rs-notify
+  - hs-scrape
+  - hs-snowtify
+  - hs-speedscope
+  - hs-twitter
+  - hs-twitterarchiver
+  - hs-vcard
+  - hs-watchman
+  - hs2bf
+  - Hs2lib
+  - hs2ps
+  - hsaml2
+  - hsay
+  - hsbackup
+  - hsbc
+  - hsbencher
+  - hsbencher-codespeed
+  - hsbencher-fusion
+  - hsc3
+  - hsc3-auditor
+  - hsc3-cairo
+  - hsc3-data
+  - hsc3-db
+  - hsc3-dot
+  - hsc3-forth
+  - hsc3-graphs
+  - hsc3-lang
+  - hsc3-lisp
+  - hsc3-plot
+  - hsc3-process
+  - hsc3-rec
+  - hsc3-rw
+  - hsc3-server
+  - hsc3-sf
+  - hsc3-sf-hsndfile
+  - hsc3-unsafe
+  - hsc3-utils
+  - hscaffold
+  - hscamwire
+  - hscassandra
+  - hscd
+  - hsclock
+  - hscope
+  - hScraper
+  - hscuid
+  - hsdev
+  - hsdif
+  - hsdip
+  - hsdns-cache
+  - Hsed
+  - hsenv
+  - HSet
+  - hset
+  - hsfacter
+  - hsfcsh
+  - HSFFIG
+  - hsfilt
+  - hsforce
+  - HSGEP
+  - hsgnutls
+  - hsgnutls-yj
+  - hsgsom
+  - HsHaruPDF
+  - HSHHelpers
+  - HsHTSLib
+  - HsHyperEstraier
+  - hsI2C
+  - hSimpleDB
+  - hsinspect
+  - hsinspect-lsp
+  - HsJudy
+  - hskeleton
+  - hslackbuilder
+  - hslibsvm
+  - hslinks
+  - hslogger-reader
+  - hslogger-template
+  - hslogstash
+  - hsluv-haskell
+  - hsmagick
+  - HSmarty
+  - hsmodetweaks
+  - Hsmtlib
+  - hsmtpclient
+  - hsnock
+  - hsns
+  - hsnsq
+  - hsntp
+  - hsoptions
+  - HSoundFile
+  - hsoz
+  - hsp-cgi
+  - hsparql
+  - HsParrot
+  - hspear
+  - hspec-expectations-json
+  - hspec-expectations-match
+  - hspec-expectations-pretty
+  - hspec-experimental
+  - hspec-hashable
+  - hspec-jenkins
+  - hspec-monad-control
+  - hspec-pg-transact
+  - hspec-setup
+  - hspec-shouldbe
+  - hspec-snap
+  - hspec-structured-formatter
+  - hspec-test-sandbox
+  - hspec-webdriver
+  - hspec2
+  - hspecVariant
+  - HsPerl5
+  - hspkcs11
+  - hspread
+  - hspresent
+  - hsprocess
+  - hsql
+  - hsql-mysql
+  - hsql-odbc
+  - hsql-postgresql
+  - hsql-sqlite3
+  - hsreadability
+  - hsrelp
+  - hsseccomp
+  - hsSqlite3
+  - hssqlppp
+  - hssqlppp-th
+  - HsSVN
+  - hstar
+  - hstats
+  - hstatsd
+  - hstest
+  - hstidy
+  - hstox
+  - hstradeking
+  - HStringTemplateHelpers
+  - hstyle
+  - hstzaar
+  - hsubconvert
+  - hsudoku
+  - HsWebots
+  - hswip
+  - hsx
+  - hsx-jmacro
+  - hsx-xhtml
+  - hsXenCtrl
+  - hsyscall
+  - hsyslog-tcp
+  - hszephyr
+  - HTab
+  - htags
+  - hTalos
+  - htar
+  - htdp-image
+  - hTensor
+  - htestu
+  - HTF
+  - HTicTacToe
+  - htiled
+  - htlset
+  - html-charset
+  - html-kure
+  - html-rules
+  - html-tokenizer
+  - hts
+  - htsn
+  - htsn-import
+  - htssets
+  - http-attoparsec
+  - http-client-auth
+  - http-client-lens
+  - http-client-request-modifiers
+  - http-client-session
+  - http-client-streams
+  - http-client-websockets
+  - http-conduit-browser
+  - http-conduit-downloader
+  - http-directory
+  - http-dispatch
+  - http-enumerator
+  - http-grammar
+  - http-io-streams
+  - http-kinder
+  - http-listen
+  - http-media
+  - http-monad
+  - http-pony
+  - http-pony-serve-wai
+  - http-proxy
+  - http-querystring
+  - http-response-decoder
+  - http-rfc7807
+  - http-server
+  - http-shed
+  - http-wget
+  - http2-client-grpc
+  - http2-grpc-proto-lens
+  - https-everywhere-rules
+  - https-everywhere-rules-raw
+  - httpspec
+  - htune
+  - htvm
+  - htzaar
+  - huck
+  - HueAPI
+  - huff
+  - huffman
+  - hugs2yc
+  - hulk
+  - HulkImport
+  - human-parse
+  - human-text
+  - humble-prelude
+  - hums
+  - HUnit-Diff
+  - hunit-gui
+  - hunit-rematch
+  - hunp
+  - hunspell-hs
+  - hunt-searchengine
+  - hunt-server
+  - hup
+  - hurdle
+  - hurriyet
+  - husk-scheme
+  - husk-scheme-libs
+  - husky
+  - hutton
+  - huttons-razor
+  - huzzy
+  - hVOIDP
+  - hw-all
+  - hw-ci-assist
+  - hw-dsv
+  - hw-json
+  - hw-json-lens
+  - hw-json-simd
+  - hw-json-simple-cursor
+  - hw-json-standard-cursor
+  - hw-simd
+  - hw-uri
+  - hwall-auth-iitk
+  - hweblib
+  - hwhile
+  - hworker
+  - hworker-ses
+  - hwormhole
+  - hws
+  - hwsl2
+  - hwsl2-bytevector
+  - hwsl2-reducers
+  - hx
+  - HXMPP
+  - hxmppc
+  - hxournal
+  - HXQ
+  - hxt-pickle-utils
+  - hxthelper
+  - hxweb
+  - hyahtzee
+  - hyakko
+  - hybrid
+  - hydra-hs
+  - hydra-print
+  - Hydrogen
+  - hydrogen
+  - hydrogen-cli
+  - hydrogen-cli-args
+  - hydrogen-data
+  - hydrogen-multimap
+  - hydrogen-parsing
+  - hydrogen-prelude
+  - hydrogen-prelude-parsec
+  - hydrogen-syntax
+  - hydrogen-util
+  - hyena
+  - hylide
+  - hylolib
+  - hylotab
+  - hyloutils
+  - hyper-extra
+  - hyper-haskell-server
+  - hyperdrive
+  - hyperfunctions
+  - hyperion
+  - hyperloglogplus
+  - hyperpublic
+  - hypher
+  - hzulip
+  - i18n
+  - I1M
+  - i3ipc
+  - iap-verifier
+  - ib-api
+  - iban
+  - ical
+  - iCalendar
+  - IcoGrid
+  - iconv-typed
+  - ide-backend
+  - ide-backend-common
+  - ide-backend-server
+  - ideas
+  - ideas-math
+  - ideas-math-types
+  - ideas-statistics
+  - idempotent
+  - identifiers
+  - idiii
+  - idna2008
+  - idris
+  - IDynamic
+  - ieee-utils
+  - iexcloud
+  - ifcxt
+  - IFS
+  - ig
+  - ige
+  - ige-mac-integration
+  - ignore
+  - igraph
+  - ihaskell
+  - ihaskell-aeson
+  - ihaskell-basic
+  - ihaskell-blaze
+  - ihaskell-charts
+  - ihaskell-diagrams
+  - ihaskell-display
+  - ihaskell-gnuplot
+  - ihaskell-graphviz
+  - ihaskell-hatex
+  - ihaskell-hvega
+  - ihaskell-inline-r
+  - ihaskell-juicypixels
+  - ihaskell-magic
+  - ihaskell-parsec
+  - ihaskell-plot
+  - ihaskell-rlangqq
+  - ihaskell-widgets
+  - ihttp
+  - illuminate
+  - imagepaste
+  - imap
+  - imapget
+  - imbib
+  - imgur
+  - imgurder
+  - imj-animation
+  - imj-base
+  - imj-game-hamazed
+  - imj-measure-stdout
+  - imj-prelude
+  - imm
+  - immortal-worker
+  - imparse
+  - imperative-edsl
+  - imperative-edsl-vhdl
+  - ImperativeHaskell
+  - impl
+  - implicit-logging
+  - implicit-params
+  - importify
+  - imports
+  - impossible
+  - imprint
+  - improve
+  - INblobs
+  - inch
+  - inchworm
+  - incremental-computing
+  - incremental-maps
+  - increments
+  - indentation
+  - indentation-core
+  - indentation-parsec
+  - indentation-trifecta
+  - index-core
+  - indexation
+  - IndexedList
+  - indextype
+  - indices
+  - indieweb-algorithms
+  - inf-interval
+  - infer-upstream
+  - infernal
+  - infernu
+  - infinity
+  - infix
+  - InfixApplicative
+  - inflist
+  - informative
+  - ini-qq
+  - inilist
+  - initialize
+  - inject-function
+  - inline-asm
+  - inline-java
+  - inline-r
+  - inserts
+  - inspector-wrecker
+  - instana-haskell-trace-sdk
+  - instance-map
+  - instant-aeson
+  - instant-bytes
+  - instant-deepseq
+  - instant-generics
+  - instant-hashable
+  - instant-zipper
+  - instapaper-sender
+  - instinct
+  - int-multimap
+  - intcode
+  - integer-pure
+  - integer-roots
+  - integreat
+  - intel-aes
+  - intensional-datatys
+  - interlude-l
+  - internetmarke
+  - intero
+  - interpol
+  - interpolatedstring-qq
+  - interpolatedstring-qq-mwotton
+  - interpolatedstring-qq2
+  - interruptible
+  - interval
+  - IntFormats
+  - intro-prelude
+  - introduction
+  - introduction-test
+  - intset
+  - invertible-hlist
+  - invertible-syntax
+  - io-capture
+  - io-choice
+  - io-reactive
+  - ioctl
+  - ion
+  - IOR
+  - IORefCAS
+  - iostring
+  - iothread
+  - iotransaction
+  - ip
+  - ip-quoter
+  - ip2location
+  - ip2proxy
+  - ipatch
+  - ipc
+  - ipfs
+  - ipfs-api
   - ipld-cid
+  - ipopt-hs
+  - ipprint
+  - iptables-helpers
+  - iptadmin
+  - IPv6DB
+  - Irc
+  - irc-core
+  - irc-dcc
+  - irc-fun-bot
+  - irc-fun-client
+  - irc-fun-color
+  - irc-fun-messages
+  - irc-fun-types
+  - iri
+  - iridium
+  - iron-mq
+  - ironforge
+  - irt
+  - isdicom
+  - isevaluated
+  - ismtp
+  - IsNull
+  - iso8601-duration
+  - isobmff
+  - isobmff-builder
+  - isohunt
+  - isotope
+  - itcli
+  - itemfield
+  - iter-stats
+  - iteratee
+  - iteratee-compress
+  - iteratee-mtl
+  - iteratee-parsec
+  - iteratee-stm
+  - iterIO
+  - iterio-server
+  - iterm-show
+  - iterm-show-diagrams
+  - iterm-show-JuicyPixels
+  - ivor
+  - ivory
+  - ivory-avr-atmega328p-registers
+  - ivory-backend-c
+  - ivory-bitdata
+  - ivory-eval
+  - ivory-examples
+  - ivory-hw
+  - ivory-opts
+  - ivory-quickcheck
+  - ivory-serialize
+  - ivory-stdlib
+  - ivy-web
+  - ixdopp
+  - ixmonad
+  - ixshader
+  - iyql
+  - j
+  - j2hs
+  - jack-bindings
+  - JackMiniMix
+  - jackminimix
+  - jacobi-roots
+  - jaeger-flamegraph
+  - jail
+  - jalla
+  - jarfind
+  - jarify
+  - jason
+  - java-bridge
+  - java-bridge-extras
+  - java-character
+  - java-reflect
+  - javascript-bridge
+  - Javasf
+  - javasf
+  - Javav
+  - javav
+  - jbi
+  - jcdecaux-vls
+  - Jdh
+  - jdi
+  - jenga
+  - jenkinsPlugins2nix
+  - jespresso
+  - jinquantities
+  - jmacro
+  - jmacro-rpc
+  - jmacro-rpc-happstack
+  - jmacro-rpc-snap
+  - jml-web-service
+  - jmonkey
+  - jni
+  - jobqueue
+  - jobs-ui
+  - join
+  - join-api
+  - joinlist
+  - jonathanscard
+  - jot
+  - jpeg
+  - js-good-parts
+  - jsaddle-hello
+  - jsaddle-wkwebview
+  - JsContracts
+  - jsmw
+  - json-alt
+  - json-assertions
+  - json-ast-json-encoder
+  - json-ast-quickcheck
+  - json-autotype
+  - json-b
+  - json-builder
+  - JSON-Combinator
+  - JSON-Combinator-Examples
+  - json-directory
+  - json-encoder
+  - json-enumerator
+  - json-extra
+  - json-fu
+  - json-incremental-decoder
+  - json-litobj
+  - json-pointer-hasql
+  - json-python
+  - json-rpc-client
+  - json-schema
+  - json-sop
+  - json-syntax
+  - json-togo
+  - json-tokens
+  - json-tools
+  - json-tracer
+  - json2
+  - json2-hdbc
+  - JSONb
+  - jsonextfilter
+  - JsonGrammar
+  - jsonifier
+  - jsonresume
+  - jsonrpc-conduit
+  - jsons-to-schema
+  - jsonschema-gen
+  - jsonsql
+  - jsontsv
+  - jsonxlsx
+  - jspath
+  - juandelacosa
+  - judge
+  - judy
+  - JuicyPixels-blp
+  - JuicyPixels-canvas
+  - JunkDB
+  - JunkDB-driver-gdbm
+  - JunkDB-driver-hashtables
+  - jupyter
+  - JuPyTer-notebook
+  - JustParse
+  - jvm
+  - jvm-batching
+  - jvm-binary
+  - jvm-parser
+  - jvm-streaming
+  - JYU-Utils
+  - kademlia
+  - kafka-client
+  - kafka-client-sync
+  - kafka-device
+  - kafka-device-glut
+  - kafka-device-joystick
+  - kafka-device-leap
+  - kafka-device-spacenav
+  - kafka-device-vrpn
+  - kaleidoscope
+  - Kalman
+  - kalman
+  - kangaroo
+  - kansas-lava
+  - kansas-lava-cores
+  - kansas-lava-papilio
+  - kansas-lava-shake
+  - karakuri
+  - karps
+  - katip-elasticsearch
+  - katip-kafka
+  - katip-rollbar
+  - katip-scalyr-scribe
+  - katip-syslog
+  - katt
+  - katydid
+  - kawaii
+  - kawhi
+  - kd-tree
+  - kdesrc-build-extra
+  - keccak
+  - keera-hails-i18n
+  - keera-hails-mvc-environment-gtk
+  - keera-hails-mvc-model-lightmodel
+  - keera-hails-mvc-model-protectedmodel
+  - keera-hails-mvc-solutions-gtk
+  - keera-hails-reactive-cbmvar
+  - keera-hails-reactive-fs
+  - keera-hails-reactive-gtk
+  - keera-hails-reactive-htmldom
+  - keera-hails-reactive-network
+  - keera-hails-reactive-polling
+  - keera-hails-reactive-wx
+  - keera-hails-reactive-yampa
+  - keera-hails-reactivelenses
+  - keera-hails-reactivevalues
+  - kerry
+  - Ketchup
+  - keter
+  - kevin
+  - keyed
+  - keyring
+  - keysafe
+  - keystore
+  - keyvaluehash
+  - keyword-args
+  - khph
+  - ki
+  - kicad-data
+  - kickass-torrents-dump-parser
+  - kickchan
+  - kif-parser
+  - kit
+  - kmeans-par
+  - kmeans-vector
+  - kmonad
+  - kmp-dfa
+  - knead
+  - knead-arithmetic
+  - knit-haskell
+  - knots
+  - koellner-phonetic
+  - kontra-config
+  - korfu
+  - kqueue
+  - kraken
+  - krank
+  - krapsh
+  - Kriens
+  - krpc
+  - ks-test
+  - KSP
+  - ktx
+  - ktx-codec
+  - kubernetes-client
+  - kubernetes-client-core
+  - kuifje
+  - kure
+  - kure-your-boilerplate
+  - kurita
+  - KyotoCabinet
+  - l-bfgs-b
+  - L-seed
+  - labeled-graph
+  - laborantin-hs
+  - labsat
+  - labyrinth
+  - labyrinth-server
+  - lackey
+  - lagrangian
+  - laika
+  - lambda-bridge
+  - lambda-calculator
+  - lambda-canvas
+  - lambda-devs
+  - lambda-options
+  - lambda-toolbox
+  - lambda2js
+  - lambdaBase
+  - lambdabot-utils
+  - lambdabot-zulip
+  - lambdacms-core
+  - lambdacms-media
+  - lambdacube
+  - lambdacube-bullet
+  - lambdacube-compiler
+  - lambdacube-core
+  - lambdacube-edsl
+  - lambdacube-engine
+  - lambdacube-examples
+  - lambdacube-gl
+  - lambdacube-ir
+  - lambdacube-samples
+  - LambdaDesigner
+  - lambdaFeed
+  - LambdaHack
+  - LambdaINet
+  - Lambdajudge
+  - lambdaLit
+  - LambdaNet
+  - LambdaPrettyQuote
+  - LambdaShell
+  - lambdatex
+  - lambdatwit
+  - Lambdaya
+  - lambdaya-bus
+  - lambdiff
+  - lame
+  - lame-tester
+  - lang
+  - language-asn
+  - language-boogie
+  - language-c-comments
+  - language-c-inline
+  - language-conf
+  - language-csharp
+  - language-dart
+  - language-dickinson
+  - language-dockerfile
+  - language-ecmascript
+  - language-ecmascript-analysis
+  - language-eiffel
+  - language-elm
+  - language-fortran
+  - language-gcl
+  - language-go
+  - language-guess
+  - language-hcl
+  - language-java-classfile
+  - language-kort
+  - language-lua
+  - language-lua-qq
+  - language-lua2
+  - language-mixal
+  - language-Modula2
+  - language-ninja
+  - language-oberon
+  - language-objc
+  - language-ocaml
+  - language-openscad
+  - language-pig
+  - language-puppet
+  - language-python-colour
+  - language-qux
+  - language-rust
+  - language-sh
+  - language-spelling
+  - language-sqlite
+  - language-sygus
+  - language-thrift
+  - language-tl
+  - language-typescript
+  - language-vhdl
+  - language-webidl
+  - lapack
+  - lapack-carray
+  - lapack-comfort-array
+  - lapack-ffi
+  - large-hashable
+  - Lastik
+  - lat
+  - latest-npm-version
+  - latex-formulae-hakyll
+  - latex-formulae-image
+  - latex-formulae-pandoc
+  - latex-svg-hakyll
+  - latex-svg-image
+  - latex-svg-pandoc
+  - LATS
+  - launchdarkly-server-sdk
+  - launchpad-control
+  - lawless-concurrent-machines
+  - layered-state
+  - layers
+  - layers-game
+  - layout
+  - layout-bootstrap
+  - layout-rules
+  - layouting
+  - lazy-hash
+  - lazy-hash-cache
+  - lazy-io-streams
+  - lazy-priority-queue
+  - lazy-search
+  - lazyarray
+  - lazyboy
+  - lazyset
+  - LazyVault
+  - ld-intervals
+  - lda
+  - ldapply
+  - LDAPv3
+  - ldif
+  - leaf
+  - leaky
+  - lean
+  - leanpub-wreq
+  - leapseconds
+  - learn
+  - learn-physics-examples
+  - Learning
+  - leetify
+  - legion
+  - legion-discovery
+  - legion-discovery-client
+  - legion-extra
+  - leksah-server
+  - lendingclub
+  - lens-filesystem
+  - lens-labels
+  - lens-prelude
+  - lens-simple
+  - lens-text-encoding
+  - lens-th-rewrite
+  - lens-time
+  - lens-toml-parser
+  - lens-tutorial
+  - lens-typelevel
+  - lens-utils
+  - lensref
+  - lentil
+  - level-monad
+  - Level0
+  - levmar
+  - levmar-chart
+  - lex-applicative
+  - lfst
+  - lgtk
+  - lha
+  - lhae
+  - lhc
+  - lhe
+  - lhs2TeX-hl
+  - lhslatex
+  - LibClang
+  - libconfig
+  - libcspm
+  - libexpect
+  - libfuse3
+  - libGenI
+  - libhbb
+  - libinfluxdb
+  - libjenkins
+  - libjwt-typed
+  - liblastfm
+  - liblawless
+  - liblinear-enumerator
+  - libltdl
+  - libmodbus
+  - libmolude
+  - libnix
+  - liboath-hs
+  - liboleg
+  - libpafe
+  - libpq
+  - libraft
+  - librandomorg
+  - librato
+  - libssh2
+  - libssh2-conduit
+  - libsystemd-daemon
+  - libtagc
+  - libxls
+  - libxml-enumerator
+  - libxslt
+  - lie
+  - lifted-base-tf
+  - lifted-protolude
+  - lifter
+  - ligature
+  - lightning-haskell
+  - lightstep-haskell
+  - lighttpd-conf
+  - lighttpd-conf-qq
+  - lilypond
+  - Limit
+  - limp-cbc
+  - linda
+  - linden
+  - line-bot-sdk
+  - linear-algebra-cblas
+  - linear-circuit
+  - linear-code
+  - linear-maps
+  - linear-opengl
+  - linear-vect
+  - linearmap-category
+  - linearscan
+  - linearscan-hoopl
+  - LinearSplit
+  - lines-of-action
+  - LinkChecker
+  - linkchk
+  - linkcore
+  - linked-list-with-iterator
+  - linkedhashmap
+  - linklater
+  - linnet
+  - linnet-aeson
+  - linnet-conduit
+  - linode
+  - linode-v4
+  - linux-blkid
+  - linux-cgroup
+  - linux-kmod
+  - linux-perf
+  - linux-ptrace
+  - linx-gateway
+  - lio-eci11
+  - lio-simple
+  - lipsum-gen
+  - liquid
+  - liquid-base
+  - liquid-bytestring
+  - liquid-containers
+  - liquid-ghc-prim
+  - liquid-parallel
+  - liquid-platform
+  - liquid-prelude
+  - liquid-vector
+  - liquidhaskell-cabal
+  - Liquorice
+  - list-fusion-probe
+  - list-mux
+  - list-prompt
+  - list-remote-forwards
+  - list-t-attoparsec
+  - list-t-html-parser
+  - list-t-http-client
+  - list-t-text
+  - list-witnesses
+  - list-zip-def
+  - list-zipper
+  - listenbrainz-client
+  - listlike-instances
+  - ListT
+  - liszt
+  - lit
+  - literals
+  - LiterateMarkdown
+  - little-logger
+  - live-sequencer
+  - ll-picosat
+  - llsd
+  - llvm
+  - llvm-analysis
+  - llvm-base
+  - llvm-base-types
+  - llvm-base-util
+  - llvm-data-interop
+  - llvm-dsl
+  - llvm-extension
+  - llvm-extra
+  - llvm-ffi
+  - llvm-ffi-tools
+  - llvm-general
+  - llvm-general-pure
+  - llvm-general-quote
+  - llvm-ht
+  - llvm-pkg-config
+  - llvm-pretty
+  - llvm-pretty-bc-parser
+  - llvm-tf
+  - llvm-tools
+  - lmonad
+  - lmonad-yesod
+  - load-balancing
+  - load-font
+  - local-address
+  - local-search
+  - localize
+  - located
+  - located-monad-logger
+  - loch
+  - locked-poll
+  - log
+  - log-postgres
+  - log-utils
+  - log-warper
+  - log2json
+  - log4hs
+  - logentries
+  - logger
+  - logging-effect-extra
+  - logging-effect-extra-file
+  - logging-effect-extra-handler
+  - Logic
+  - logic-classes
+  - LogicGrowsOnTrees
+  - LogicGrowsOnTrees-MPI
+  - LogicGrowsOnTrees-network
+  - LogicGrowsOnTrees-processes
+  - logicst
+  - logict-state
+  - logplex-parse
+  - lojban
+  - lojbanParser
+  - lojbanXiragan
+  - lojysamban
+  - lol
+  - lol-apps
+  - lol-benches
+  - lol-calculus
+  - lol-cpp
+  - lol-repa
+  - lol-tests
+  - lol-typing
+  - loli
+  - longboi
+  - longshot
+  - lookup-tables
+  - loop-effin
+  - loop-while
+  - loopbreaker
+  - looper
+  - loops
+  - loopy
+  - lord
+  - lorem
+  - lorentz
+  - loris
+  - loshadka
+  - lostcities
+  - loup
+  - lowgl
+  - lp-diagrams-svg
+  - LRU
+  - ls-usb
+  - lscabal
+  - LslPlus
+  - lsystem
+  - lti13
+  - ltk
+  - LTS
+  - lua-bc
+  - luachunk
+  - luautils
+  - lucid-colonnade
+  - lucienne
+  - Lucu
+  - luhn
+  - lui
+  - luis-client
+  - luka
+  - luminance
+  - luminance-samples
+  - lushtags
+  - luthor
+  - lvish
+  - lvmlib
+  - lxc
+  - lxd-client
+  - lye
+  - Lykah
+  - lz4-bytes
+  - lz4-conduit
+  - lz4-frame-conduit
+  - lzip
+  - lzma-enumerator
+  - lzma-streams
+  - lzo
+  - maam
+  - mac
+  - macaroon-shop
+  - macbeth-lib
+  - machinecell
+  - machines-amazonka
+  - machines-attoparsec
+  - machines-binary
+  - machines-bytestring
+  - machines-directory
+  - machines-encoding
+  - machines-io
+  - machines-process
+  - machines-zlib
+  - macho
+  - maclight
+  - macos-corelibs
+  - macosx-make-standalone
+  - macrm
+  - madlang
+  - mage
+  - magic-tyfams
+  - magic-wormhole
+  - magicbane
+  - MagicHaskeller
+  - magico
+  - magma
+  - mahoro
+  - maid
+  - mail-pool
+  - mailchimp
+  - mailchimp-subscribe
+  - MailchimpSimple
+  - mailgun
+  - majordomo
+  - majority
+  - make-hard-links
+  - make-monofoldable-foldable
+  - make-package
+  - makedo
+  - makefile
+  - mallard
+  - manatee
+  - manatee-anything
+  - manatee-core
+  - manatee-curl
+  - manatee-editor
+  - manatee-filemanager
+  - manatee-imageviewer
+  - manatee-ircclient
+  - manatee-mplayer
+  - manatee-pdfviewer
+  - manatee-processmanager
+  - manatee-template
+  - manatee-terminal
+  - manatee-welcome
+  - mandrill
+  - mandulia
+  - mangopay
+  - manifold-random
+  - manifolds
+  - Map
+  - map-exts
+  - mapalgebra
+  - Mapping
+  - mappy
+  - marionetta
+  - markdown-kate
+  - markdown-pap
+  - markdown2svg
+  - marked-pretty
+  - markov-processes
+  - markov-realization
+  - markup
+  - marmalade-upload
+  - marquise
+  - mars
+  - marvin
+  - marvin-interpolate
+  - masakazu-bot
+  - MASMGen
+  - master-plan
+  - matchers
+  - math-grads
+  - math-interpolate
+  - math-metric
+  - math-programming-glpk
+  - math-programming-tests
+  - mathblog
+  - mathflow
+  - mathlink
+  - matrix-as-xyz
+  - matrix-market
+  - matrix-sized
+  - matsuri
+  - maude
+  - maxent
+  - maxent-learner-hw
+  - maxent-learner-hw-gui
+  - maxsharing
+  - maybench
+  - MaybeT
+  - MaybeT-monads-tf
+  - MaybeT-transformers
+  - MazesOfMonad
+  - MBot
+  - mbox-tools
+  - mbug
+  - MC-Fold-DP
+  - mcl
+  - mcm
+  - mcmaster-gloss-examples
+  - mcmc-samplers
+  - mcmc-synthesis
+  - mcpi
+  - mdapi
+  - mdcat
+  - mDNSResponder-client
+  - mdp
+  - mealstrom
+  - mealy
+  - MeanShift
+  - Measure
+  - mecab
+  - mech
+  - Mecha
+  - mechs
+  - Mechs
+  - mediabus
+  - mediabus-fdk-aac
+  - mediabus-rtp
+  - mediawiki
+  - medium-sdk-haskell
+  - mega-sdist
+  - megalisp
+  - mellon-core
+  - mellon-gpio
+  - mellon-web
+  - melody
+  - memcache
+  - memcache-conduit
+  - memcache-haskell
+  - memcached-binary
+  - memis
+  - memo-ptr
+  - memoization-utils
+  - memorypool
+  - menoh
+  - menshen
+  - merkle-patricia-db
+  - merkle-tree
+  - messagepack-rpc
+  - messente
+  - meta-misc
+  - meta-par
+  - meta-par-accelerate
+  - metadata
+  - MetaHDBC
+  - metaheuristics
+  - MetaObject
+  - metaplug
+  - metar
+  - metar-http
+  - metric
+  - Metrics
+  - metricsd-client
+  - metronome
+  - mezzo
+  - mezzolens
+  - MFlow
+  - mgeneric
+  - Mhailist
+  - MHask
+  - mi
+  - Michelangelo
+  - miconix-test
+  - micro-recursion-schemes
+  - microformats2-parser
+  - microformats2-types
+  - microgroove
+  - microlens-each
+  - micrologger
+  - microsoft-translator
+  - MicrosoftTranslator
+  - mida
+  - midi-music-box
+  - midi-utils
+  - midimory
+  - midisurface
+  - mighttpd
+  - mikmod
+  - mikrokosmos
+  - miku
+  - milena
+  - mime-directory
+  - minecraft-data
+  - minesweeper
+  - mini-egison
+  - miniforth
+  - minilens
+  - minilight
+  - minilight-lua
+  - minimung
+  - minions
+  - minioperational
+  - miniplex
+  - minirotate
+  - ministg
+  - minizinc-process
+  - minst-idx
+  - mios
+  - MIP
+  - mirror-tweet
+  - miso
+  - miso-action-logger
+  - miso-examples
+  - miss
+  - miss-porcelain
+  - missing-py2
+  - MissingPy
+  - mix-arrows
+  - mixed-strategies
+  - mixpanel-client
+  - mkbndl
+  - mkcabal
+  - ml-w
+  - mlist
+  - mm2
+  - mmsyn7h
+  - mmtf
+  - mmtl
+  - mmtl-base
+  - moan
+  - Mobile-Legends-Hack-Cheats
+  - modelicaparser
+  - modify-fasta
+  - modsplit
+  - modular-prelude
+  - modular-prelude-classy
+  - modularity
+  - module-management
+  - modulespection
+  - modulo
+  - Moe
+  - moe
+  - MoeDict
+  - moesocks
+  - mohws
+  - mole
+  - mollie-api-haskell
+  - monad-atom
+  - monad-atom-simple
+  - monad-bayes
+  - monad-branch
+  - monad-exception
+  - monad-fork
+  - monad-http
+  - monad-interleave
+  - monad-levels
+  - monad-lgbt
+  - monad-log
+  - monad-lrs
+  - monad-mersenne-random
+  - monad-mock
+  - monad-open
+  - monad-parallel-progressbar
+  - monad-param
+  - monad-persist
+  - monad-ran
+  - monad-recorder
+  - monad-state
+  - monad-statevar
+  - monad-ste
+  - monad-stlike-io
+  - monad-stlike-stm
+  - monad-task
+  - monad-timing
+  - monad-tx
+  - monad-unify
+  - monad-var
+  - monad-wrap
+  - monadacme
+  - MonadCatchIO-mtl
+  - MonadCatchIO-mtl-foreign
+  - MonadCatchIO-transformers
+  - MonadCatchIO-transformers-foreign
+  - MonadCompose
+  - monadic-recursion-schemes
+  - monadiccp
+  - monadiccp-gecode
+  - Monadius
+  - MonadLab
+  - monadLib-compose
+  - monadloc-pp
+  - monadlog
+  - Monadoro
+  - monadplus
+  - monads-fd
+  - MonadStack
+  - monarch
+  - Monaris
+  - Monatron
+  - Monatron-IO
+  - mondo
+  - monetdb-mapi
+  - money
+  - mongoDB
+  - mongodb-queue
+  - mongrel2-handler
+  - monitor
+  - monky
+  - mono-foldable
+  - Monocle
+  - monoid
+  - monoid-absorbing
+  - monoid-extras
+  - monoid-owns
+  - monoidplus
+  - monoids
+  - monopati
+  - monte-carlo
+  - months
+  - monus
+  - monzo
+  - moo
+  - morfette
+  - morfeusz
+  - morley
+  - morloc
+  - morpheus-graphql-cli
+  - morphisms-functors
+  - morphisms-functors-inventory
+  - morphisms-objects
+  - morte
+  - mosaico-lib
+  - moto-postgresql
+  - motor-diagrams
+  - motor-reflection
+  - mount
+  - movie-monad
+  - mp
+  - mpdmate
+  - mpppc
+  - mprelude
+  - mpretty
+  - mpris
+  - mprover
+  - mps
+  - mptcp-pm
+  - mpvguihs
+  - mqtt
+  - mqtt-hs
+  - mrifk
+  - mrm
+  - ms
+  - msgpack
+  - msgpack-aeson
+  - msgpack-binary
+  - msgpack-idl
+  - msgpack-rpc
+  - msgpack-rpc-conduit
+  - msh
+  - msi-kb-backlit
+  - MSQueue
+  - MTGBuilder
+  - mtgoxapi
+  - mtl-c
+  - mtl-evil-instances
+  - mtl-extras
+  - mtl-tf
+  - mtlx
+  - mtp
+  - mu-avro
+  - mu-graphql
+  - mu-grpc-client
+  - mu-grpc-common
+  - mu-grpc-server
+  - mu-kafka
+  - mu-lens
+  - mu-optics
+  - mu-persistent
+  - mu-prometheus
+  - mu-protobuf
+  - mu-rpc
+  - mu-schema
+  - mu-servant-server
+  - mu-tracing
+  - MuCheck
+  - MuCheck-Hspec
+  - MuCheck-HUnit
+  - MuCheck-QuickCheck
+  - MuCheck-SmallCheck
+  - mud
+  - muesli
+  - mulang
+  - multext-east-msd
+  - multi-cabal
+  - multi-instance
+  - multi-trie
+  - multiaddr
+  - multiarg
   - multibase
+  - multifocal
+  - multihash
   - multihash-serialise
+  - multilinear
+  - multilinear-io
+  - multipass
+  - multipath
+  - multiplate-simplified
+  - multiplicity
+  - multipool-persistent-postgresql
+  - multirec
+  - multirec-alt-deriver
+  - multirec-binary
+  - multisetrewrite
+  - multivariant
+  - Munkres-simple
+  - muon
+  - murder
+  - murmur
+  - murmurhash3
+  - mushu
+  - music-graphics
+  - music-parts
+  - music-pitch
+  - music-preludes
+  - music-score
+  - music-sibelius
+  - music-suite
+  - music-util
+  - musicbrainz-email
+  - musicScroll
+  - musicxml
+  - mustache-haskell
+  - mutable-iter
+  - MutationOrder
+  - mute-unmute
+  - mvar-lock
+  - mvc
+  - mvc-updates
+  - mvclient
+  - mxnet
+  - mxnet-dataiter
+  - mxnet-examples
+  - mxnet-nn
+  - mxnet-nnvm
+  - my-package-testing
+  - my-test-docs
+  - myanimelist-export
+  - myo
+  - MyPrimes
+  - mysnapsession
+  - mysnapsession-example
+  - mysql-effect
+  - mysql-haskell-openssl
+  - mysql-simple-quasi
+  - mysql-simple-typed
+  - mystem
+  - myTestlll
+  - mywatch
+  - myxine-client
+  - mzv
+  - n-tuple
+  - n2o-protocols
+  - n2o-web
+  - nagios-plugin-ekg
+  - nakadi-client
+  - named-lock
+  - named-servant
+  - named-servant-client
+  - named-servant-server
+  - named-sop
+  - namelist
+  - namespace
+  - nano-hmac
+  - nano-md5
+  - nanocurses
+  - nanomsg
+  - nanomsg-haskell
+  - nanoparsec
+  - NanoProlog
+  - nanovg
+  - nanovg-simple
+  - nanq
+  - naperian
+  - NaperianNetCDF
+  - naqsha
+  - narc
+  - nat-sized-numbers
+  - nationstates
+  - nats-client
+  - nats-queue
+  - natural-number
+  - NaturalLanguageAlphabets
+  - NaturalSort
+  - naver-translate
+  - nbt
+  - NearContextAlgebra
+  - neat
+  - needle
+  - neet
+  - nehe-tuts
+  - neither
+  - neko-lib
+  - Neks
+  - nemesis-titan
+  - nerf
+  - nero
+  - nero-wai
+  - nero-warp
+  - nest
+  - nested-routes
+  - nested-sequence
+  - NestedFunctor
+  - nestedmap
+  - net-spider-pangraph
+  - net-spider-rpl
+  - net-spider-rpl-cli
+  - netclock
+  - netcore
+  - netease-fm
+  - netlines
+  - netrium
+  - NetSNMP
+  - netspec
+  - netstring-enumerator
+  - nettle-frp
+  - nettle-netkit
+  - nettle-openflow
+  - netwire-input-javascript
+  - netwire-vinylglfw-examples
+  - network-address
+  - network-anonymous-i2p
+  - network-anonymous-tor
+  - network-api-support
+  - network-arbitrary
+  - network-attoparsec
+  - network-bitcoin
+  - network-builder
+  - network-bytestring
+  - network-carbon
+  - network-connection
+  - network-dns
+  - network-enumerator
+  - network-hans
+  - network-house
+  - network-interfacerequest
+  - network-minihttp
+  - network-msgpack-rpc
+  - network-netpacket
+  - network-protocol-xmpp
+  - network-rpca
+  - network-server
+  - network-service
+  - network-simple-sockaddr
+  - network-simple-wss
+  - network-socket-options
+  - network-stream
+  - network-topic-models
+  - network-transport-amqp
+  - network-transport-inmemory
+  - network-uri-json
+  - network-voicetext
+  - network-wai-router
+  - network-websocket
+  - networked-game
+  - neural
+  - neural-network-blashs
+  - neural-network-hmatrix
+  - newhope
+  - newports
+  - newsletter
+  - newsletter-mailgun
+  - newt
+  - newtype-deriving
+  - newtype-th
+  - newtype-zoo
+  - next-ref
+  - nextstep-plist
+  - nfc
+  - NGrams
+  - ngrams-loader
+  - ngx-export-tools-extra
+  - niagra
+  - nibblestring
+  - nice-html
+  - nicovideo-translator
+  - nikepub
+  - Ninjas
+  - nirum
+  - nitro
+  - nix-delegate
+  - nix-deploy
+  - nix-eval
+  - nix-freeze-tree
+  - nix-thunk
+  - nix-tools
+  - nixfromnpm
+  - nixpkgs-update
+  - nkjp
+  - nlp-scores
+  - nlp-scores-scripts
+  - nm
+  - NMap
+  - nntp
+  - no-role-annots
+  - noether
+  - nofib-analyse
+  - nofib-analyze
+  - noise
+  - noli
+  - nom
+  - Nomyx
+  - Nomyx-Core
+  - Nomyx-Language
+  - Nomyx-Rules
+  - Nomyx-Web
+  - non-empty-zipper
+  - NonEmpty
+  - nonempty-lift
+  - NonEmptyList
+  - normalization-insensitive
+  - NoSlow
+  - not-gloss-examples
+  - notcpp
+  - nothunks
+  - notifications-tray-icon
+  - notmuch-haskell
+  - notmuch-web
+  - NoTrace
+  - now-haskell
+  - np-extras
+  - np-linear
+  - nptools
+  - ntp-control
+  - ntrip-client
+  - nuha
+  - null-canvas
+  - nullary
+  - nullpipe
+  - numbered-semigroups
+  - NumberSieves
+  - NumberTheory
+  - numerals
+  - numerals-base
+  - numeric-ode
+  - numeric-qq
+  - numeric-ranges
+  - numerical
+  - numhask-array
+  - numhask-hedgehog
+  - numhask-histogram
+  - numhask-prelude
+  - numhask-range
+  - numhask-space
+  - numhask-test
+  - Nussinov78
+  - Nutri
+  - NXT
+  - NXTDSL
+  - nylas
+  - nymphaea
+  - oanda-rest-api
+  - oasis-xrd
+  - oauth2-jwt-bearer
+  - oauthenticated
+  - obd
+  - obdd
+  - oberon0
+  - obj
+  - Object
+  - objectid
+  - ObjectIO
+  - objective
+  - oblivious-transfer
+  - ocaml-export
+  - ochan
+  - octane
+  - octohat
+  - octopus
+  - Octree
+  - oculus
+  - odbc
+  - odd-jobs
+  - OddWord
+  - oden-go-packages
+  - oeis2
+  - off-simple
+  - OGL
+  - ogmarkup
+  - ohloh-hs
+  - oi
+  - oidc-client
+  - ois-input-manager
+  - olwrapper
+  - om-actor
+  - om-elm
+  - om-fail
+  - om-http-logging
+  - omaketex
+  - ombra
+  - Omega
+  - omega
+  - omnifmt
+  - on-a-horse
+  - on-demand-ssh-tunnel
+  - onama
+  - ONC-RPC
+  - oneormore
+  - online
+  - online-csv
+  - onpartitions
+  - OnRmt
+  - onu-course
+  - op
+  - opaleye-classy
+  - opaleye-sqlite
+  - opaleye-trans
+  - open-adt
+  - open-adt-tutorial
+  - open-haddock
+  - open-pandoc
+  - open-signals
+  - open-typerep
+  - open-union
+  - OpenAFP
+  - OpenAFP-Utils
+  - openapi-petstore
+  - openapi-typed
+  - openapi3
+  - openapi3-code-generator
+  - opench-meteo
+  - OpenCL
+  - OpenCLRaw
+  - OpenCLWrappers
+  - opencv-raw
+  - opendatatable
+  - OpenGLCheck
+  - opengles
+  - openid-connect
+  - OpenSCAD
+  - opensoundcontrol-ht
+  - openssh-github-keys
+  - openssh-protocol
+  - opentelemetry-http-client
+  - opentheory-char
+  - opentok
+  - opentype
+  - OpenVG
+  - OpenVGRaw
+  - openweathermap
+  - Operads
+  - operate-do
+  - operational-extra
+  - oplang
+  - opn
+  - optima
+  - optima-for-hasql
+  - optimal-blocks
+  - optimization
+  - optimusprime
+  - optional
+  - options-time
+  - optparse-applicative-simple
+  - optparse-enum
+  - optparse-helper
+  - orc
+  - orchestrate
+  - OrchestrateDB
+  - orchid
+  - orchid-demo
+  - order-maintenance
+  - order-statistics
+  - Ordinary
+  - ordrea
+  - oref
+  - org-mode
+  - org-mode-lucid
+  - organize-imports
+  - orgmode
+  - orgstat
+  - origami
+  - orizentic
+  - OrPatterns
+  - osc
+  - oscpacking
+  - oset
+  - Oslo-Vectize
+  - OSM
+  - osm-conduit
+  - osm-download
+  - oso2pdf
+  - osx-ar
+  - ot
+  - OTP
+  - otp-authenticator
+  - ottparse-pretty
+  - overloaded
+  - overloaded-records
+  - overture
+  - pack
+  - package-description-remote
+  - package-o-tron
+  - package-vt
+  - packed
+  - packed-dawg
+  - packed-multikey-map
+  - packedstring
+  - packer-messagepack
+  - packman
+  - packunused
+  - pacman-memcache
+  - padKONTROL
+  - pads-haskell
+  - pagarme
+  - PageIO
+  - pagure-hook-receiver
+  - Paillier
+  - pairing
+  - palette
+  - pam
+  - pan-os-syslog
+  - panda
+  - pandoc-crossref
+  - pandoc-csv2table
+  - pandoc-filter-graphviz
+  - pandoc-include
+  - pandoc-include-code
+  - pandoc-japanese-filters
+  - pandoc-lens
+  - pandoc-markdown-ghci-filter
+  - pandoc-placetable
+  - pandoc-plantuml-diagrams
+  - pandoc-pyplot
+  - pandoc-sidenote
+  - pandoc-unlit
+  - pandoc-utils
+  - PandocAgda
+  - pang-a-lambda
+  - pangraph
+  - panpipe
+  - pansite
+  - pantry-tmp
+  - papa
+  - papa-base
+  - papa-base-export
+  - papa-base-implement
+  - papa-export
+  - papa-implement
+  - papa-include
+  - papa-prelude
+  - papa-prelude-core
+  - papa-prelude-lens
+  - papa-prelude-semigroupoids
+  - papa-prelude-semigroups
+  - papa-semigroupoids
+  - papa-semigroupoids-implement
+  - paphragen
+  - papillon
+  - pappy
+  - paprika
+  - par-dual
+  - paragon
+  - Paraiso
+  - Parallel-Arrows-Eden
+  - parallel-tasks
+  - parameterized
+  - parameterized-utils
+  - paranoia
+  - parco
+  - parco-attoparsec
+  - parco-parsec
+  - parcom-lib
+  - parconc-examples
+  - pareto
+  - parquet-hs
+  - Parry
+  - parse-help
+  - parseargs
+  - parsec-free
+  - parsec-parsers
+  - parsec-pratt
+  - parsec2
+  - parsec3
+  - parseerror-eq
+  - parsely
+  - parser-combinators-tests
+  - parser-helper
+  - parser241
+  - parsergen
+  - parsers-megaparsec
+  - parsestar
+  - parsimony
+  - partage
+  - partial-lens
+  - partial-records
+  - partly
+  - passage
+  - passman
+  - PasswordGenerator
+  - passwords
+  - pasta
+  - pastis
+  - pasty
+  - patat
+  - patches-vector
+  - Pathfinder
+  - pathfindingcore
+  - PathTree
+  - patronscraper
+  - patterns
+  - paypal-adaptive-hoops
+  - paypal-api
+  - paypal-rest-client
+  - pb
+  - pb-next
+  - pbc4hs
+  - PBKDF2
+  - pcap-enumerator
+  - pcapng
+  - pcd-loader
+  - pcf
+  - pcf-font
+  - pcf-font-embed
+  - PCLT
+  - PCLT-DB
+  - pcre-light-extra
+  - pdf-slave
+  - pdf-slave-template
+  - pdf-toolbox-content
+  - pdf-toolbox-core
+  - pdf-toolbox-document
+  - pdf-toolbox-viewer
+  - pdfname
+  - pdfsplit
+  - pdftotext
+  - pdynload
+  - peakachu
+  - PeanoWitnesses
+  - pec
+  - pecoff
+  - pedersen-commitment
+  - pedestrian-dag
+  - peg
+  - peggy
+  - pell
+  - pencil
+  - penntreebank-megaparsec
+  - penny
+  - penny-bin
+  - penny-lib
+  - penrose
+  - peparser
+  - percent-encoder
+  - perceptron
+  - perceptual-hash
+  - peregrin
+  - perf
+  - perf-analysis
+  - PerfectHash
+  - perfecthash
+  - perhaps
+  - periodic
+  - periodic-server
+  - perm
+  - permutation
+  - permutations
+  - permute
+  - PermuteEffects
+  - persist2er
+  - Persistence
+  - persistent-audit
+  - persistent-cereal
+  - persistent-database-url
+  - persistent-equivalence
+  - persistent-hssqlppp
+  - persistent-map
+  - persistent-migration
+  - persistent-mongoDB
+  - persistent-mysql-haskell
+  - persistent-protobuf
+  - persistent-ratelimit
+  - persistent-relational-record
+  - persistent-template-classy
+  - persistent-test
+  - persistent-vector
+  - persistent-zookeeper
+  - persona
+  - persona-idp
+  - pesca
+  - peyotls
+  - peyotls-codec
+  - pez
+  - pg-harness
+  - pg-harness-server
+  - pg-recorder
+  - pg-store
+  - pg-transact
+  - pgdl
+  - pgf2
+  - pgsql-simple
+  - pgstream
+  - phasechange
+  - phaser
+  - phoityne
+  - phone-numbers
+  - phone-push
+  - phooey
+  - photoname
+  - phraskell
+  - Phsu
+  - phybin
+  - pi-calculus
+  - pi-forall
+  - pi-hoole
+  - pia-forward
+  - pianola
+  - picedit
+  - pickle
+  - picologic
+  - picoparsec
+  - pictikz
+  - pier
+  - pier-core
+  - piet
+  - pig
+  - pinboard
+  - pinboard-notes-backup
+  - pinch
+  - pinchot
+  - ping
+  - pinpon
+  - Pipe
+  - pipe-enumerator
+  - pipes-async
+  - pipes-attoparsec-streaming
+  - pipes-bgzf
+  - pipes-brotli
+  - pipes-cacophony
+  - pipes-cereal
+  - pipes-cereal-plus
+  - pipes-conduit
+  - pipes-core
+  - pipes-courier
+  - pipes-errors
+  - pipes-extra
+  - pipes-files
+  - pipes-illumina
+  - pipes-io
+  - pipes-key-value-csv
+  - pipes-mongodb
+  - pipes-p2p
+  - pipes-p2p-examples
+  - pipes-protolude
+  - pipes-rt
+  - pipes-s3
+  - pipes-shell
+  - pipes-sqlite-simple
+  - pipes-text
+  - pipes-transduce
+  - pipes-vector
+  - pipes-zeromq4
+  - pisigma
+  - Piso
+  - pit
+  - pitchtrack
+  - pivotal-tracker
+  - pixelated-avatar-generator
+  - pkcs10
+  - pkcs7
+  - pkggraph
+  - pkgtreediff
+  - plailude
+  - plan-applicative
+  - plan-b
+  - planar-graph
+  - planb-token-introspection
+  - planet-mitchell
+  - planet-mitchell-test
+  - plankton
+  - plat
+  - platinum-parsing
+  - PlayingCards
+  - plist
+  - plist-buddy
+  - plocketed
+  - plot-gtk
+  - plot-gtk-ui
+  - plot-gtk3
+  - Plot-ho-matic
+  - plot-lab
+  - plots
+  - PlslTools
+  - plugins
+  - plugins-auto
+  - plugins-multistage
+  - plumbers
+  - plur
+  - plural
+  - plzwrk
+  - png-file
+  - pngload
+  - pngload-fixed
+  - pocket
+  - pocket-dns
+  - point-octree
+  - pointedalternative
+  - pointful
+  - pointless-haskell
+  - pointless-lenses
+  - pointless-rewrite
+  - poke
+  - pokemon-go-protobuf-types
+  - poker-eval
+  - pokitdok
+  - polar-configfile
+  - polar-shader
+  - polh-lexicon
+  - Pollutocracy
+  - poly-cont
+  - poly-control
+  - polydata
+  - polydata-core
+  - polynomial
+  - polysemy-chronos
+  - polysemy-http
+  - polysemy-methodology
+  - polysemy-methodology-composite
+  - polysemy-optics
+  - polysemy-RandomFu
+  - polysemy-resume
+  - polysemy-test
+  - polysemy-time
+  - polyseq
+  - polytypeable
+  - polytypeable-utils
+  - pomodoro
+  - pomohoro
+  - ponder
+  - pong-server
+  - pontarius-xmpp
+  - pool
+  - pool-conduit
+  - pop3-client
+  - popenhs
+  - poppler
+  - porcupine-core
+  - porcupine-http
+  - porcupine-s3
+  - portager
+  - porte
+  - PortFusion
+  - ports
+  - poseidon
+  - poseidon-postgis
+  - positron
+  - posix-acl
+  - posix-api
+  - posix-realtime
+  - posix-waitpid
+  - postcodes
+  - postgres-embedded
+  - postgres-tmp
+  - postgres-websockets
+  - postgresql-lo-stream
+  - postgresql-named
+  - postgresql-query
+  - postgresql-simple-bind
+  - postgresql-simple-migration
+  - postgresql-simple-named
+  - postgresql-simple-queue
+  - postgresql-simple-sop
+  - postgresql-simple-typed
+  - postgresql-tx-query
+  - postgresql-tx-squeal
+  - postgresql-typed-lifted
+  - postgrest
+  - postgrest-ws
+  - postie
+  - postmark
+  - postmark-streams
+  - postmaster
+  - potato-tool
+  - potoki
+  - potoki-cereal
+  - potoki-conduit
+  - potoki-core
+  - potoki-hasql
+  - potoki-zlib
+  - potrace-diagrams
+  - powermate
+  - powerpc
+  - powerqueue-levelmem
+  - powerqueue-sqs
+  - pprecord
+  - PPrinter
+  - pqc
+  - pqueue-mtl
+  - practice-room
+  - praglude
+  - preamble
+  - precursor
+  - pred-set
+  - pred-trie
+  - predicate-class
+  - predicate-transformers
+  - predicate-typed
+  - prednote
+  - prednote-test
+  - prefork
+  - pregame
+  - preliminaries
+  - Prelude
+  - prelude-generalize
+  - prelude-plus
+  - preprocess-haskell
+  - preprocessor
+  - preql
+  - presburger
+  - present
+  - press
+  - presto-hdbc
+  - pretty-ghci
+  - pretty-ncols
+  - pretty-types
+  - prettyprinter-lucid
+  - prettyprinter-vty
+  - preview
+  - prim-array
+  - prim-instances
+  - prim-ref
+  - primal
+  - primal-memory
+  - primes-type
+  - primitive-atomic
+  - primitive-checked
+  - primitive-containers
+  - primitive-convenience
+  - primitive-extras
+  - primitive-foreign
+  - primitive-indexed
+  - primitive-maybe
+  - primitive-simd
+  - primitive-sort
+  - primitive-stablename
+  - PrimitiveArray-Pretty
+  - primula-board
+  - primula-bot
+  - pringletons
+  - print-debugger
+  - printcess
+  - Printf-TH
+  - prints
+  - priority-queue
+  - PriorityChansConverger
+  - ProbabilityMonads
+  - probable
+  - proc
+  - process-conduit
+  - process-iterio
+  - process-leksah
+  - process-listlike
+  - process-progress
+  - process-qq
+  - process-streaming
+  - processing
+  - processmemory
+  - procrastinating-variable
+  - procstat
+  - producer
+  - prof-flamegraph
+  - prof2dot
+  - prof2pretty
+  - profiteur
+  - profunctor-monad
+  - progress
+  - progress-meter
+  - progress-reporting
+  - progressbar
+  - progression
+  - progressive
+  - proj4-hs-bindings
+  - project-m36
+  - projectile
+  - prolens
+  - prolog-graph
+  - prologue
+  - prolude
+  - prometheus-effect
+  - promise
+  - pronounce
+  - proof-combinators
+  - propane
+  - Proper
+  - properties
+  - property-list
+  - proplang
+  - prosidy
+  - prosidyc
+  - prosper
+  - proteome
+  - proto-lens-combinators
+  - proto-lens-descriptors
+  - proto3-suite
+  - protobuf-native
+  - protocol
+  - protocol-buffers-descriptor-fork
+  - protocol-buffers-fork
+  - protolude-lifted
+  - proton-haskell
+  - prototype
+  - prove-everywhere-server
+  - provenience
+  - proxy-kindness
+  - proxy-mapping
+  - psc-ide
+  - pseudo-boolean
+  - pseudo-trie
+  - PTQ
+  - ptr-poker
+  - publicsuffixlistcreate
+  - publish
+  - pubnub
+  - pubsub
+  - puffytools
+  - pugixml
+  - Pugs
+  - pugs-compat
+  - pugs-DrIFT
+  - pugs-hsregex
+  - PUH-Project
+  - punkt
+  - Pup-Events
+  - Pup-Events-Demo
+  - Pup-Events-Server
+  - puppetresources
+  - pure-cdb
+  - pure-io
+  - pure-priority-queue
+  - pure-priority-queue-tests
+  - purescheme-wai-routing-core
+  - purescript
+  - purescript-iso
+  - purescript-tsd-gen
+  - push-notifications
+  - push-notify
+  - push-notify-apn
+  - push-notify-ccs
+  - push-notify-general
+  - pusher-haskell
+  - pusher-ws
+  - pushme
+  - putlenses
+  - puzzle-draw
+  - puzzle-draw-cmdline
+  - pvd
+  - PyF
+  - pyffi
+  - pyfi
+  - python-pickle
+  - q4c12-twofinger
+  - qc-oi-testgenerator
+  - qd
+  - qd-vec
+  - qed
+  - qhs
+  - qhull-simple
+  - qif
+  - QIO
+  - QLearn
+  - qlinear
+  - qr-imager
+  - qr-repa
+  - qsem
+  - qtah-cpp-qt5
+  - qtah-examples
+  - qtah-generator
+  - qtah-qt5
+  - QuadEdge
+  - quadratic-irrational
+  - QuadTree
+  - quantfin
+  - quantification
+  - quantum-arrow
+  - quantum-random
+  - quarantimer
+  - qudb
+  - Quelea
+  - quenya-verb
+  - queryparser
+  - queryparser-demo
+  - queryparser-hive
+  - queryparser-presto
+  - queryparser-vertica
+  - questioner
+  - queuelike
+  - quick-schema
+  - QuickAnnotate
+  - quickbench
+  - quickbooks
+  - quickcheck-arbitrary-template
+  - quickcheck-poly
+  - quickcheck-property-comb
+  - quickcheck-property-monad
+  - quickcheck-regex
+  - quickcheck-relaxng
+  - quickcheck-rematch
+  - quickcheck-report
+  - quickcheck-state-machine
+  - quickcheck-state-machine-distributed
+  - quickcheck-webdriver
+  - QuickCheckVariant
+  - QuickPlot
+  - quickpull
+  - quickset
+  - Quickson
+  - quicktest
+  - quickwebapp
+  - quipper
+  - quipper-algorithms
+  - quipper-all
+  - quipper-cabal
+  - quipper-core
+  - quipper-demos
+  - quipper-language
+  - quipper-libraries
+  - quipper-rendering
+  - quipper-tools
+  - quipper-utils
+  - quiver
+  - quiver-binary
+  - quiver-bytestring
+  - quiver-cell
+  - quiver-csv
+  - quiver-enumerator
+  - quiver-groups
+  - quiver-http
+  - quiver-instances
+  - quiver-interleave
+  - quiver-sort
+  - quokka
+  - quoridor-hs
+  - qux
+  - R-pandoc
+  - raaz
+  - RabbitMQ
+  - rad
+  - radian
+  - radium
+  - radium-formula-parser
+  - radix
+  - rados-haskell
+  - raft
+  - rail-compiler-editor
+  - rails-session
+  - rainbow-tests
+  - raketka
+  - rakhana
+  - rakuten
+  - ralist
+  - rallod
+  - raml
+  - rand-vars
+  - randfile
+  - rando
+  - random-access-list
+  - random-derive
+  - random-eff
+  - random-effin
+  - random-hypergeometric
+  - random-stream
+  - RandomDotOrg
+  - Range
+  - range-space
+  - rangemin
+  - Ranka
+  - rapid
+  - rapid-term
+  - rasa
+  - rasa-example-config
+  - rasa-ext-bufs
+  - rasa-ext-cmd
+  - rasa-ext-cursors
+  - rasa-ext-files
+  - rasa-ext-logger
+  - rasa-ext-slate
+  - rasa-ext-status-bar
+  - rasa-ext-style
+  - rasa-ext-views
+  - rasa-ext-vim
+  - rascal
+  - Rasenschach
+  - rating-chgk-info
+  - rational-list
+  - rattle
+  - rattletrap
+  - raven-haskell-scotty
+  - raw-feldspar
+  - rawr
+  - raz
+  - razom-text-util
+  - rbr
+  - rc
+  - rclient
+  - rdioh
+  - react-flux
+  - react-flux-servant
+  - react-haskell
+  - react-tutorial-haskell-server
+  - reaction-logic
+  - reactive-bacon
+  - reactive-balsa
+  - reactive-banana
+  - reactive-banana-automation
+  - reactive-banana-bunch
+  - reactive-banana-gi-gtk
+  - reactive-banana-sdl
+  - reactive-banana-sdl2
+  - reactive-banana-threepenny
+  - reactive-banana-wx
+  - reactive-fieldtrip
+  - reactive-glut
+  - reactive-jack
+  - reactive-midyim
+  - reactive-thread
+  - reactor
+  - read-bounded
+  - read-ctags
+  - read-io
+  - readline
+  - readline-statevar
+  - readme-lhs
+  - readpyc
+  - readshp
+  - really-simple-xml-parser
+  - reanimate
+  - reanimate-svg
+  - reasonable-lens
+  - record
+  - record-aeson
+  - record-encode
+  - record-gl
+  - record-preprocessor
+  - record-syntax
+  - records
+  - records-th
+  - recursors
+  - red-black-record
+  - reddit
+  - redis-hs
+  - redis-simple
+  - redland
+  - Redmine
+  - reduce-equations
+  - reedsolomon
+  - reenact
+  - Ref
+  - ref
+  - ref-mtl
+  - refcount
+  - Referees
+  - references
+  - refh
+  - refined-http-api-data
+  - reflection-extras
+  - reflex-animation
+  - reflex-backend-socket
+  - reflex-backend-wai
+  - reflex-basic-host
+  - reflex-dom-retractable
+  - reflex-dom-svg
+  - reflex-dynamic-containers
+  - reflex-fsnotify
+  - reflex-gadt-api
+  - reflex-ghci
+  - reflex-gloss
+  - reflex-gloss-scene
+  - reflex-libtelnet
+  - reflex-orphans
+  - reflex-process
+  - reflex-sdl2
+  - reflex-transformers
+  - reflex-vty
+  - reformat
+  - refractor
+  - refresht
+  - refurb
+  - reg-alloc
+  - reg-alloc-graph-color
+  - regex-deriv
+  - regex-dfa
+  - regex-generator
+  - regex-parsec
+  - regex-pcre-text
+  - regex-pderiv
+  - regex-posix-unittest
+  - regex-tdfa-pipes
+  - regex-tdfa-quasiquoter
+  - regex-tdfa-rc
+  - regex-tdfa-text
+  - regex-tdfa-unittest
+  - regex-tdfa-utf8
+  - regex-tre
+  - regex-type
+  - regex-wrapper
+  - regex-xmlschema
+  - regexp-tries
+  - regexpr-symbolic
+  - regexqq
+  - regional-pointers
+  - regions
+  - regions-monadsfd
+  - regions-monadstf
+  - regions-mtl
+  - register-machine-typelevel
+  - registry-hedgehog
+  - regress
+  - regression-simple
+  - regular
+  - regular-extras
+  - regular-web
+  - regular-xmlpickler
+  - reheat
+  - rehoo
+  - rei
+  - reified-records
+  - reify
+  - relacion
+  - relational-postgresql8
+  - relational-query-postgresql-pure
+  - relative-date
+  - relevant-time
+  - reload
+  - remark
+  - remarks
+  - remote
+  - remote-debugger
+  - remote-json
+  - remote-json-client
+  - remote-json-server
+  - remote-monad
+  - remotion
+  - render-utf8
+  - repa-algorithms
+  - repa-array
+  - repa-bytestring
+  - repa-convert
+  - repa-devil
+  - repa-eval
+  - repa-examples
+  - repa-flow
+  - repa-linear-algebra
+  - repa-plugin
+  - repa-scalar
+  - repa-series
+  - repa-stream
+  - repa-v4l2
+  - repl
+  - RepLib
+  - replica
+  - replicant
+  - ReplicateEffects
+  - repo-based-blog
+  - repr
+  - representable-functors
+  - representable-tries
+  - reprinter
+  - reproject
+  - req-conduit
+  - req-oauth2
+  - req-url-extra
+  - reqcatcher
+  - request-monad
+  - rescue
+  - reserve
+  - reservoir
+  - resin
+  - resistor-cube
+  - resolve
+  - resolve-trivial-conflicts
+  - resource-effect
+  - resource-embed
+  - resource-pool-catchio
+  - resource-simple
+  - respond
+  - rest-client
+  - rest-core
+  - rest-example
+  - rest-gen
+  - rest-happstack
+  - rest-snap
+  - rest-stringmap
+  - rest-types
+  - rest-wai
+  - restartable
+  - restful-snap
+  - restricted-workers
+  - restyle
+  - rethinkdb
+  - rethinkdb-client-driver
+  - rethinkdb-model
+  - rethinkdb-wereHamster
+  - retryer
+  - reverse-geocoding
+  - reversi
+  - ReviewBoard
+  - rewrite
+  - rewrite-inspector
+  - rewriting
+  - rezoom
+  - rfc
+  - rfc-env
+  - rfc-http-client
+  - rfc-prelude
+  - rfc-psql
+  - rfc-redis
+  - rfc-servant
+  - rg
+  - rhythm-game-tutorial
+  - rib
+  - ribbit
+  - RichConditional
+  - ridley
+  - ridley-extras
+  - riemann
+  - riff
+  - ring-buffer
+  - ring-buffers
+  - riot
+  - risc-v
+  - risc386
+  - riscv-isa
+  - Ritt-Wu
+  - rivers
+  - rivet
+  - rivet-migration
+  - rivet-simple-deploy
+  - RJson
+  - rl-satton
+  - Rlang-QQ
+  - rlglue
+  - RLP
+  - rlwe-challenges
+  - rmonad
+  - RMP
+  - RNAdesign
+  - RNAdraw
+  - RNAFold
+  - RNAFoldProgs
+  - RNAlien
+  - RNAwolf
+  - rncryptor
+  - rob
+  - robin
+  - roboservant
+  - robots-txt
+  - roc-cluster
+  - roc-cluster-demo
+  - rock
+  - roku-api
+  - rollbar
+  - rollbar-hs
+  - roller
+  - RollingDirectory
+  - ron-rdt
+  - ron-schema
+  - ron-storage
+  - rope
+  - rose-trees
+  - rose-trie
+  - roshask
+  - rosmsg
+  - rosmsg-bin
+  - rosso
+  - rotating-log
+  - rounded
+  - rounding
+  - roundtrip-aeson
+  - roundtrip-xml
+  - route-planning
+  - rowrecord
+  - rpc
+  - rpc-framework
+  - rpf
+  - rpm
+  - rpmbuild-order
+  - rrule
+  - rsagl
+  - rsagl-frp
+  - rsagl-math
+  - rspp
+  - rss
+  - rss-conduit
+  - rss2irc
+  - rstream
+  - rtcm
+  - RtMidi
+  - rtnetlink
+  - rtorrent-rpc
+  - rts-loader
+  - ruby-marshal
+  - ruby-qq
+  - ruff
+  - ruin
+  - ruler
+  - ruler-core
+  - run-st
+  - rungekutta
+  - runhs
+  - runmany
+  - runtime-arbitrary
+  - rws
+  - RxHaskell
+  - s-expression
+  - S3
+  - SableCC2Hs
+  - safe-buffer-monad
+  - safe-coerce
+  - safe-freeze
+  - safe-globals
+  - safe-lazy-io
+  - safe-length
+  - safe-plugins
+  - safe-printf
+  - safecopy-migrate
+  - safecopy-store
+  - safeint
+  - safepath
+  - safer-file-handles
+  - safer-file-handles-bytestring
+  - safer-file-handles-text
+  - saferoute
+  - sai-shape-syb
+  - sajson
+  - sak
+  - salak-toml
+  - Salsa
+  - saltine-quickcheck
+  - salvia
+  - salvia-demo
+  - salvia-extras
+  - salvia-protocol
+  - salvia-sessions
+  - salvia-websocket
+  - samtools
+  - samtools-conduit
+  - samtools-enumerator
+  - samtools-iteratee
+  - sandlib
+  - sandman
+  - sarasvati
+  - sarsi
+  - sasl
+  - sat
+  - sat-micro-hs
+  - satchmo
+  - satchmo-backends
+  - satchmo-examples
+  - satchmo-funsat
+  - satchmo-minisat
+  - satchmo-toysat
+  - Saturnin
+  - savage
+  - sax
+  - SBench
+  - sbvPlugin
+  - sc2-lowlevel
+  - sc2-proto
+  - sc2-support
+  - sc3-rdu
+  - scalable-server
+  - scaleimage
+  - SCalendar
+  - scalendar
+  - scalp-webhooks
+  - scalpel-search
+  - scan-metadata
+  - scan-vector-machine
+  - scc
+  - scenegraph
+  - scgi
+  - schedevr
+  - schedule-planner
+  - schedyield
+  - schema
+  - schemas
+  - schematic
+  - scholdoc
+  - scholdoc-citeproc
+  - scholdoc-texmath
+  - scholdoc-types
+  - sci-ratio
+  - SciBaseTypes
+  - scidb-hquery
+  - scientific-notation
+  - SciFlow
+  - SciFlow-drmaa
+  - scion
+  - scion-browser
+  - scons2dot
+  - scope
+  - scope-cairo
+  - scottish
+  - scotty-binding-play
+  - scotty-blaze
+  - scotty-fay
+  - scotty-form
+  - scotty-format
+  - scotty-hastache
+  - scotty-params-parser
+  - scotty-resource
+  - scotty-rest
+  - scotty-session
+  - scotty-tls
+  - scotty-view
+  - scp-streams
+  - scrabble-bot
+  - scrapbook
+  - scrape-changes
+  - ScratchFs
+  - script-monad
+  - SCRIPTWriter
+  - scrobble
+  - Scurry
+  - scythe
+  - scyther-proof
+  - sde-solver
+  - sdl2-cairo-image
+  - sdl2-compositor
+  - sdl2-fps
+  - seakale
+  - seakale-postgresql
+  - seakale-tests
+  - sec
+  - secdh
+  - seclib
+  - second-transfer
+  - secp256k1
+  - secp256k1-legacy
+  - secret-santa
+  - secrm
+  - secure-sockets
+  - SecureHash-SHA3
+  - secureUDP
+  - sednaDBXML
+  - seitz-symbol
+  - selectors
+  - SelectSequencesFromMSA
+  - selenium
+  - selenium-server
+  - self-extract
+  - selinux
+  - semantic-source
+  - Semantique
+  - semdoc
+  - semi-iso
+  - semialign-extras
+  - semibounded-lattices
+  - Semigroup
+  - semigroupoids-syntax
+  - semigroups-actions
+  - semiring
+  - semiring-num
+  - sendgrid-haskell
+  - sendgrid-v3
+  - sensei
+  - sensenet
+  - sensu-run
+  - sentence-jp
+  - sentry
+  - seonbi
+  - seqaid
+  - SeqAlign
+  - seqloc
+  - seqloc-datafiles
+  - sequent-core
+  - sequor
+  - serialize-instances
+  - serokell-util
+  - serpentine
+  - serv
+  - serv-wai
+  - servant
+  - servant-aeson-specs
+  - servant-auth
+  - servant-auth-client
+  - servant-auth-cookie
+  - servant-auth-docs
+  - servant-auth-hmac
+  - servant-auth-server
+  - servant-auth-swagger
+  - servant-auth-token
+  - servant-auth-token-acid
+  - servant-auth-token-api
+  - servant-auth-token-leveldb
+  - servant-auth-token-persistent
+  - servant-auth-token-rocksdb
+  - servant-auth-wordpress
+  - servant-avro
+  - servant-blaze
+  - servant-cassava
+  - servant-checked-exceptions
+  - servant-checked-exceptions-core
+  - servant-cli
+  - servant-client
+  - servant-client-core
+  - servant-client-js
+  - servant-client-namedargs
+  - servant-conduit
+  - servant-csharp
+  - servant-db
+  - servant-db-postgresql
+  - servant-dhall
+  - servant-docs
+  - servant-docs-simple
+  - servant-ede
+  - servant-ekg
+  - servant-elm
+  - servant-errors
+  - servant-examples
+  - servant-exceptions
+  - servant-fiat-content
+  - servant-flatten
+  - servant-foreign
+  - servant-generate
+  - servant-generic
+  - servant-github
+  - servant-github-webhook
+  - servant-haxl-client
+  - servant-hmac-auth
+  - servant-http-streams
+  - servant-http2-client
+  - servant-iCalendar
+  - servant-jquery
+  - servant-js
+  - servant-jsonrpc
+  - servant-jsonrpc-client
+  - servant-jsonrpc-server
+  - servant-JuicyPixels
+  - servant-kotlin
+  - servant-lucid
+  - servant-machines
+  - servant-match
+  - servant-matrix-param
+  - servant-mock
+  - servant-multipart
+  - servant-named
+  - servant-namedargs
+  - servant-nix
+  - servant-openapi3
+  - servant-options
+  - servant-pagination
+  - servant-pandoc
+  - servant-pipes
+  - servant-pool
+  - servant-postgresql
+  - servant-proto-lens
+  - servant-purescript
+  - servant-pushbullet-client
+  - servant-py
+  - servant-quickcheck
+  - servant-rawm
+  - servant-rawm-client
+  - servant-rawm-docs
+  - servant-rawm-server
+  - servant-reason
+  - servant-reflex
+  - servant-router
+  - servant-ruby
+  - servant-scotty
+  - servant-seo
+  - servant-serf
+  - servant-server
+  - servant-server-namedargs
+  - servant-smsc-ru
+  - servant-snap
+  - servant-stache
+  - servant-static-th
+  - servant-streaming
+  - servant-streaming-client
+  - servant-streaming-docs
+  - servant-streaming-server
+  - servant-subscriber
+  - servant-swagger
+  - servant-swagger-tags
+  - servant-swagger-ui
+  - servant-swagger-ui-core
+  - servant-swagger-ui-jensoleg
+  - servant-swagger-ui-redoc
+  - servant-to-elm
+  - servant-tracing
+  - servant-waargonaut
+  - servant-wasm
+  - servant-websockets
+  - servant-xml
+  - servant-yaml
+  - servant-zeppelin
+  - servant-zeppelin-client
+  - servant-zeppelin-server
+  - servant-zeppelin-swagger
+  - server-generic
+  - serversession-backend-acid-state
+  - serversession-backend-persistent
+  - serversession-backend-redis
+  - serversession-frontend-yesod
+  - services
+  - ses-html-snaplet
+  - SessionLogger
+  - sessions
+  - sessiontypes
+  - sessiontypes-distributed
+  - Set
+  - set-of
+  - set-with
+  - setgame
+  - setoid
+  - setters
+  - sexp
+  - sexpr-parser
+  - sext
+  - SFML
+  - SFML-control
+  - sfmt
+  - sfnt2woff
+  - SFont
+  - SG
+  - sgd
+  - SGdemo
+  - sgf
+  - SGplus
+  - sgrep
+  - sh2md
+  - sha-streams
+  - sha1
+  - shade
+  - shadower
+  - shake-bindist
+  - shake-cabal-build
+  - shake-dhall
+  - shake-extras
+  - shake-minify
+  - shake-pack
+  - shake-path
+  - shake-persist
+  - shakebook
+  - shaker
+  - shakespeare-babel
+  - shakespeare-sass
+  - shapefile
+  - shapely-data
+  - shared-buffer
+  - shared-fields
+  - she
+  - shelduck
+  - shell-pipe
+  - Shellac
+  - Shellac-compatline
+  - Shellac-editline
+  - Shellac-haskeline
+  - Shellac-readline
+  - shellish
+  - shellmate
+  - shellmate-extras
+  - shimmer
+  - shine-examples
+  - shivers-cfg
+  - shoap
+  - shopify
+  - shortcut-links
+  - shorten-strings
+  - ShortestPathProblems
+  - show-prettyprint
+  - showdown
+  - Shpadoinkle-backend-pardiff
+  - Shpadoinkle-backend-static
+  - Shpadoinkle-examples
+  - Shpadoinkle-html
+  - Shpadoinkle-router
+  - Shpadoinkle-widgets
+  - shpider
+  - shuffle
+  - shwifty
+  - si-clock
+  - sibe
+  - sifflet
+  - sifflet-lib
+  - sigma-ij
+  - signable
+  - signals
+  - signed-multiset
+  - silkscreen
+  - silvi
+  - simd
+  - simgi
+  - simple-actors
+  - simple-atom
+  - simple-bluetooth
+  - simple-c-value
+  - simple-conduit
+  - simple-config
+  - simple-css
+  - simple-download
+  - simple-eval
+  - simple-firewire
+  - simple-genetic-algorithm
+  - simple-index
+  - simple-log-syslog
+  - simple-logging
+  - simple-money
+  - simple-neural-networks
+  - simple-nix
+  - simple-pascal
+  - simple-pipe
+  - simple-rope
+  - simple-server
+  - simple-stacked-vm
+  - simple-tabular
+  - simple-tar
+  - simple-ui
+  - simple-units
+  - simple-vec3
+  - simple-zipper
+  - simpleargs
+  - simpleconfig
+  - SimpleGL
+  - simpleirc
+  - simpleirc-lens
+  - SimpleLog
+  - simplenote
+  - simpleprelude
+  - SimpleServer
+  - simplesmtpclient
+  - simplest-sqlite
+  - simseq
+  - singleton-dict
+  - singleton-typelits
+  - singnal
+  - singular-factory
+  - sink
+  - siphon
+  - siren-json
+  - sirkel
+  - sitepipe
+  - sixfiguregroup
+  - size-based
+  - sized-grid
+  - sized-types
+  - sized-vector
+  - sizes
+  - sjsp
+  - skeletal-set
+  - skeleton
+  - skeletons
+  - skell
+  - skemmtun
+  - skulk
+  - skylark-client
+  - skylighting-lucid
+  - skype4hs
+  - slack
+  - slack-notify-haskell
+  - slack-web
+  - slave-thread
+  - sliceofpy
+  - slidemews
+  - Slides
+  - slim
+  - slip32
+  - sloane
+  - slot-lambda
+  - sloth
+  - slug
+  - small-bytearray-builder
+  - smallarray
+  - smallcheck-kind-generics
+  - smallcheck-laws
+  - smallcheck-lens
+  - smallpt-hs
+  - smallstring
+  - smap
+  - smartcheck
+  - smartconstructor
+  - smartGroup
+  - smartword
+  - smcdel
+  - sme
+  - smerdyakov
+  - smiles
+  - smith
+  - smith-cli
+  - smith-client
+  - Smooth
+  - smsaero
+  - smt-lib
+  - SmtLib
+  - smtlib2
+  - smtlib2-debug
+  - smtlib2-pipe
+  - smtlib2-quickcheck
+  - smtlib2-timing
+  - smtp-mail-ng
+  - SMTPClient
+  - smtps-gmail
+  - smuggler
+  - smuggler2
+  - snake
+  - snake-game
+  - snap-accept
+  - snap-auth-cli
+  - snap-blaze-clay
+  - snap-configuration-utilities
+  - snap-error-collector
+  - snap-extras
+  - snap-routes
+  - snap-stream
+  - snap-testing
+  - snap-utils
+  - snap-web-routes
+  - snaplet-acid-state
+  - snaplet-actionlog
+  - snaplet-amqp
+  - snaplet-auth-acid
+  - snaplet-coffee
+  - snaplet-css-min
+  - snaplet-customauth
+  - snaplet-environments
+  - snaplet-fay
+  - snaplet-hasql
+  - snaplet-haxl
+  - snaplet-hdbc
+  - snaplet-hslogger
+  - snaplet-influxdb
+  - snaplet-mandrill
+  - snaplet-mongoDB
+  - snaplet-mongodb-minimalistic
+  - snaplet-mysql-simple
+  - snaplet-oauth
+  - snaplet-postgresql-simple
+  - snaplet-postmark
+  - snaplet-purescript
+  - snaplet-recaptcha
+  - snaplet-redis
+  - snaplet-redson
+  - snaplet-rest
+  - snaplet-riak
+  - snaplet-sass
+  - snaplet-scoped-session
+  - snaplet-sedna
+  - snaplet-ses-html
+  - snaplet-sqlite-simple
+  - snaplet-sqlite-simple-jwt-auth
+  - snaplet-stripe
+  - snaplet-tasks
+  - snaplet-typed-sessions
+  - snaplet-wordpress
+  - snappy-conduit
+  - snappy-iteratee
+  - sndfile-enumerators
+  - sneakyterm
+  - SNet
+  - snipcheck
+  - snm
+  - snmp
+  - snorkels
+  - snow-white
+  - snowflake-core
+  - snowflake-server
+  - snowtify
+  - Snusmumrik
+  - SoccerFun
+  - SoccerFunGL
+  - socket-activation
+  - socket-io
+  - socket-sctp
+  - socket-unix
+  - socketed
+  - socketio
+  - sockets
+  - socketson
+  - sodium
+  - soegtk
+  - softfloat-hs
+  - solga
+  - solga-swagger
+  - solr
+  - sonic-visualiser
+  - Sonnex
+  - SoOSiM
+  - sorted
+  - sorting
+  - sorty
+  - souffle-haskell
+  - sound-collage
+  - sounddelay
+  - soundgen
+  - source-code-server
+  - SourceGraph
+  - sousit
+  - soyuz
+  - SpaceInvaders
+  - spacepart
+  - SpacePrivateers
+  - spake2
+  - spanout
+  - sparkle
+  - sparrow
+  - spars
+  - sparse
+  - sparse-lin-alg
+  - sparsebit
+  - sparsecheck
+  - sparser
+  - spata
+  - special-functors
+  - special-keys
+  - specialize-th
+  - species
+  - spectral-clustering
+  - speculation
+  - speculation-transformers
+  - speechmatics
+  - spelling-suggest
+  - sphero
+  - sphinx
+  - sphinx-cli
+  - sphinxesc
+  - spice
+  - SpinCounter
+  - spir-v
+  - spiros
+  - splay
+  - splaytree
+  - spline3
+  - splines
+  - split-morphism
+  - splitter
+  - Spock
+  - Spock-api-ghcjs
+  - Spock-auth
+  - Spock-lucid
+  - Spock-worker
+  - spoonutil
+  - spoty
+  - Sprig
+  - sprinkles
+  - spritz
+  - sproxy
+  - sproxy-web
+  - sproxy2
+  - spsa
+  - spy
+  - sql-simple
+  - sql-simple-mysql
+  - sql-simple-pool
+  - sql-simple-postgresql
+  - sql-simple-sqlite
+  - sqlcipher
+  - sqlite
+  - sqlite-simple-typed
+  - sqlvalue-list
+  - sqsd-local
+  - squeal-postgresql
+  - sr-extra
+  - srcinst
+  - sscan
+  - sscgi
+  - ssh
+  - ssh-tunnel
+  - sshd-lint
+  - sssp
+  - sstable
+  - SSTG
+  - st2
+  - stable-heap
+  - stable-maps
+  - stable-marriage
+  - stable-memo
+  - stable-tree
+  - stack-bump
+  - stack-fix
+  - stack-hpc-coveralls
+  - stack-lib
+  - stack-network
+  - stack-prism
+  - stack-run
+  - stack-run-auto
+  - stack-type
+  - stack-wrapper
+  - stack2nix
+  - stackage
+  - stackage-build-plan
+  - stackage-cabal
+  - stackage-cli
+  - stackage-curator
+  - stackage-metadata
+  - stackage-query
+  - stackage-sandbox
+  - stackage-setup
+  - stackage-to-hackage
+  - stackage-types
+  - stackage-upload
+  - stackage2nix
+  - standalone-derive-topdown
+  - standalone-haddock
+  - starling
+  - stash
+  - Stasis
+  - state
+  - state-bag
+  - state-plus
+  - state-record
+  - stateful-mtl
+  - statestack
+  - static-canvas
+  - static-closure
+  - static-tensor
+  - static-text
+  - statistics-dirichlet
+  - statistics-fusion
+  - statistics-hypergeometric-genvar
+  - stats
+  - statsd
+  - statsd-client
+  - statsdi
+  - statvfs
+  - stb-image-redux
+  - stc-lang
+  - stdata
+  - stdf
+  - stdio
+  - steambrowser
+  - stego-uuid
+  - stemmer
+  - stemmer-german
+  - stepwise
+  - stern-brocot
+  - stgi
+  - STL
+  - STLinkUSB
+  - stm-chunked-queues
+  - stm-containers
+  - stm-firehose
+  - stm-hamt
+  - stm-promise
+  - stm-stats
+  - STM32-Zombie
+  - stmcontrol
+  - stochastic
+  - StockholmAlignment
+  - Stomp
+  - storable
+  - storable-static-array
+  - storablevector-streamfusion
+  - stp
+  - str
+  - Strafunski-ATermLib
+  - Strafunski-Sdf2Haskell
+  - Strafunski-StrategyLib
+  - StrappedTemplates
+  - stratum-tool
+  - stratux
+  - stratux-demo
+  - stratux-http
+  - stratux-types
+  - stratux-websockets
+  - stream
+  - stream-fusion
+  - stream-monad
+  - streamdeck
+  - streamed
+  - streaming-base64
+  - streaming-benchmarks
+  - streaming-brotli
+  - streaming-cassava
+  - streaming-concurrency
+  - streaming-conduit
+  - streaming-events
+  - streaming-fft
+  - streaming-lzma
+  - streaming-osm
+  - streaming-pcap
+  - streaming-png
+  - streaming-process
+  - streaming-sort
+  - streaming-utils
+  - streaming-with
+  - streamly-archive
+  - streamproc
+  - strelka
+  - strict-base-types
+  - strict-data
+  - strict-ghc-plugin
+  - strict-tuple-lens
+  - StrictBench
+  - StrictCheck
+  - strictly
+  - string-isos
+  - string-quote
+  - string-typelits
+  - stringlike
+  - stringtable-atom
+  - stripe
+  - stripe-http-streams
+  - stripe-scotty
+  - stripe-wreq
+  - strongswan-sql
+  - structural-induction
+  - structural-traversal
+  - structured-mongoDB
+  - structures
+  - stt
+  - stunclient
+  - stunts
+  - stutter
+  - stylish-cabal
+  - stylist
+  - stylized
+  - suavemente
+  - sub-state
+  - subhask
+  - subleq-toolchain
+  - submark
+  - subsample
+  - substring-parser
+  - subwordgraph
+  - successors
+  - suffix-array
+  - suffixarray
+  - SuffixStructures
+  - sugarhaskell
+  - suitable
+  - summoner
+  - summoner-tui
+  - sump
+  - sunlight
+  - sunroof-compiler
+  - sunroof-examples
+  - sunroof-server
+  - super-user-spark
+  - superbubbles
+  - supercollider-ht
+  - supercollider-midi
+  - superconstraints
+  - superevent
+  - supermonad
+  - supernova
+  - supero
+  - supervisor
+  - supplemented
+  - surjective
+  - sv
+  - sv-svfactor
+  - SVD2HS
+  - svfactor
+  - svg-builder
+  - svg-builder-fork
+  - SVG2Q
+  - svg2q
+  - svgcairo
+  - SVGFonts
+  - svgutils
+  - svm-light-utils
+  - svm-simple
+  - svndump
+  - swagger-petstore
+  - swagger-test
+  - swagger2
+  - swapper
+  - swearjure
+  - sweet-egison
+  - swf
+  - swift-lda
+  - swiss-ephemeris
+  - sws
+  - syb-extras
+  - syb-with-class-instances-text
+  - SybWidget
+  - syfco
+  - sylvia
+  - sym
+  - sym-plot
+  - symantic
+  - symantic-atom
+  - symantic-cli
+  - symantic-http
+  - symantic-http-client
+  - symantic-http-demo
+  - symantic-http-pipes
+  - symantic-http-server
+  - symantic-http-test
+  - symantic-lib
+  - symantic-xml
+  - symbiote
+  - symbolic-link
+  - symengine
+  - symengine-hs
+  - symmetry-operations-symbols
+  - sync
+  - sync-mht
+  - syncthing-hs
+  - syntactic
+  - syntax
+  - syntax-attoparsec
+  - syntax-example
+  - syntax-example-json
+  - syntax-pretty
+  - syntax-printer
+  - syntax-trees
+  - syntax-trees-fork-bairyn
+  - SyntaxMacros
+  - syntaxnet-haskell
+  - synthesizer
+  - synthesizer-llvm
+  - sys-process
+  - Sysmon
+  - system-canonicalpath
+  - system-command
+  - system-extra
+  - system-inotify
+  - system-lifted
+  - system-linux-proc
+  - system-locale
+  - system-random-effect
+  - systemstats
+  - t-regex
+  - t3-client
+  - t3-server
+  - ta
+  - table
+  - table-tennis
+  - tableaux
+  - tables
+  - Tables
+  - tablestorage
+  - Tablify
+  - tabloid
+  - tabs
+  - taffybar
+  - tag-bits
+  - tag-stream
+  - tagged-exception-core
+  - tagged-list
+  - tagged-th
+  - tagged-timers
+  - taglib-api
+  - tagsoup-ht
+  - tagsoup-megaparsec
+  - tagsoup-navigate
+  - tagsoup-parsec
+  - tagsoup-selection
+  - tagstew
+  - tai
+  - tai64
+  - takahashi
+  - Takusen
+  - takusen-oracle
+  - tal
+  - tamarin-prover
+  - tamarin-prover-term
+  - tamarin-prover-theory
+  - tamarin-prover-utils
+  - Tape
+  - tapioca
+  - target
+  - tart
+  - task
+  - task-distribution
+  - taskell
+  - TaskMonad
+  - tasty-auto
+  - tasty-bdd
+  - tasty-fail-fast
+  - tasty-groundhog-converters
+  - tasty-hedgehog-coverage
+  - tasty-integrate
+  - tasty-jenkins-xml
+  - tasty-laws
+  - tasty-lens
+  - tasty-mgolden
+  - tasty-stats
+  - tateti-tateti
+  - Taxonomy
+  - TaxonomyTools
+  - TBC
+  - TBit
+  - tbox
+  - tcache-AWS
+  - tccli
+  - tcod-haskell
+  - tcp
+  - tcp-streams-openssl
+  - tdd-util
+  - tdigest-Chart
+  - tdlib
+  - tdlib-gen
+  - tdlib-types
+  - tds
+  - TeaHS
+  - teams
+  - teeth
+  - telegram
+  - telegram-api
+  - telegram-bot
+  - telegram-bot-simple
+  - telegram-raw-api
+  - telegram-types
+  - teleport
+  - teleshell
+  - tellbot
+  - tempi
+  - template-default
+  - template-haskell-util
+  - template-hsml
+  - template-yj
+  - templateify
+  - templatepg
+  - tempodb
+  - temporal-csound
+  - tempus
+  - tensor
+  - tensor-safe
+  - tensorflow
+  - tensorflow-core-ops
+  - tensorflow-logging
+  - tensorflow-opgen
+  - tensorflow-ops
+  - termbox-banana
+  - termbox-bindings
+  - terminal-text
+  - termination-combinators
+  - termplot
+  - terntup
+  - terrahs
+  - tersmu
+  - tesla
+  - test-fixture
+  - test-framework-doctest
+  - test-framework-quickcheck
+  - test-framework-sandbox
+  - test-framework-skip
+  - test-framework-testing-feat
+  - test-framework-th-prime
+  - test-karya
+  - test-pkg
+  - test-sandbox
+  - test-sandbox-compose
+  - test-sandbox-hunit
+  - test-sandbox-quickcheck
+  - test-shouldbe
+  - test-simple
+  - testbench
+  - testCom
+  - testcontainers
+  - testing-feat
+  - testloop
+  - testpack
+  - testpattern
+  - testrunner
+  - TeX-my-math
+  - tex2txt
+  - texbuilder
+  - texrunner
+  - text-all
+  - text-and-plots
+  - text-containers
+  - text-format-heavy
+  - text-generic-pretty
+  - text-icu-normalized
+  - text-lens
+  - text-lips
+  - text-markup
+  - text-normal
+  - text-offset
+  - text-plus
+  - text-position
+  - text-register-machine
+  - text-replace
+  - text-trie
+  - text-utf8
+  - text-utils
+  - text-xml-qq
+  - text-zipper-monad
+  - text1
+  - textmatetags
+  - textocat-api
+  - textual
+  - tfp-th
+  - tftp
+  - tga
+  - th-alpha
+  - th-build
+  - th-context
+  - th-dict-discovery
+  - th-fold
+  - th-format
+  - th-instance-reification
+  - th-instances
+  - th-kinds
+  - th-kinds-fork
+  - th-lego
+  - th-pprint
+  - th-sccs
+  - th-tc
+  - th-to-exp
+  - th-traced
+  - th-typegraph
+  - thank-you-stars
+  - theatre
+  - thentos-cookie-session
+  - Theora
+  - theoremquest
+  - theoremquest-client
+  - thih
+  - thimk
+  - Thingie
+  - thorn
+  - threadmanager
+  - threadscope
+  - threepenny-editors
+  - threepenny-gui-contextmenu
+  - threepenny-gui-flexbox
+  - thrift
+  - throttled-io-loop
+  - thumbnail-plus
+  - thumbnail-polish
+  - tic-tac-toe
+  - tickle
+  - TicTacToe
+  - tictactoe3d
+  - tidal-midi
+  - tidal-serial
+  - tidal-vis
+  - tie-knot
+  - tiempo
+  - tiger
+  - tightrope
+  - tighttp
+  - timberc
+  - time-extras
+  - time-exts
+  - time-http
+  - time-io-access
+  - time-machine
+  - time-qq
+  - time-quote
+  - time-recurrence
+  - time-series
+  - time-series-lib
+  - time-w3c
+  - time-warp
+  - timecalc
+  - timemap
+  - timeout
+  - timeout-with-results
+  - timeparsers
+  - TimePiece
+  - timeprint
+  - timeseries
+  - timeutils
+  - timezone-detect
+  - timezone-olson-th
+  - timezone-unix
+  - tini
+  - tintin
+  - tiny-scheduler
+  - TinyLaunchbury
+  - tinyMesh
+  - tinytemplate
+  - TinyURL
+  - tinyXml
+  - tip-haskell-frontend
+  - tip-lib
+  - titan
+  - titan-debug-yampa
+  - titan-record-yampa
+  - Titim
+  - tkhs
+  - tkyprof
+  - tls-extra
+  - tmp-postgres
+  - tn
+  - to-haskell
+  - to-string-class
+  - to-string-instances
+  - toboggan
+  - todo
+  - todos
+  - tofromxml
+  - toilet
+  - token-limiter
+  - token-search
+  - tokenify
+  - tokenizer-streaming
+  - tokstyle
+  - toktok
+  - tokyocabinet-haskell
+  - tokyotyrant-haskell
+  - tomato-rubato-openal
+  - toml
+  - tonatona-google-server-api
+  - tonatona-servant
+  - too-many-cells
+  - toodles
+  - top
+  - Top
+  - topkata
+  - torch
+  - TORCS
+  - total-map
+  - TotalMap
+  - touched
+  - Tournament
+  - toxcore
+  - toxcore-c
+  - toxiproxy-haskell
+  - toysolver
+  - tpar
+  - tpb
+  - tptp
+  - trace
+  - trace-call
+  - trace-function-call
+  - traced
+  - tracetree
+  - tracked-files
+  - tracker
+  - trackit
+  - traction
+  - tracy
+  - traildb
+  - trajectory
+  - transactional-events
+  - transf
+  - transfer-db
+  - transformations
+  - TransformeR
+  - transformers-compose
+  - transformers-convert
+  - transformers-lift
+  - transformers-runnable
+  - TransformersStepByStep
+  - transient-universe
+  - transient-universe-tls
+  - translatable-intset
+  - translate
+  - translate-cli
+  - trasa
+  - trasa-client
+  - trasa-extra
+  - trasa-form
+  - trasa-server
+  - trasa-th
+  - traversal-template
+  - travis
+  - travis-meta-yaml
+  - trawl
+  - traypoweroff
+  - treap
+  - tree-render-text
+  - tree-traversals
+  - TreeCounter
+  - treemap
+  - treemap-html
+  - treemap-html-tools
+  - TreeStructures
+  - Treiber
+  - trek-app
+  - trek-db
+  - tremulous-query
+  - TrendGraph
+  - trhsx
+  - triangulation
+  - TrieMap
+  - tries
+  - trigger
+  - trim
+  - trimpolya
+  - tripLL
+  - trivia
+  - trivial-constraint
+  - tropical
+  - tropical-geometry
+  - true-name
+  - truelevel
+  - trurl
+  - tsession
+  - tsession-happstack
+  - tsp-viz
+  - tsparse
+  - tsuntsun
+  - tsvsql
+  - tsweb
+  - ttask
+  - tttool
+  - tubes
+  - tuntap
+  - tuntap-simple
+  - tup-functor
+  - tuple-gen
+  - tuple-lenses
+  - tuple-morph
+  - tuple-ops
+  - tupleinstances
+  - turing-machines
+  - turing-music
+  - turingMachine
+  - turtle-options
+  - TV
+  - tweak
+  - twee
+  - tweet-hs
+  - twentefp-eventloop-graphics
+  - twentefp-eventloop-trees
+  - twentefp-graphs
+  - twentefp-rosetree
+  - twentefp-trees
+  - twentefp-websockets
+  - twentyseven
+  - twfy-api-client
+  - twhs
+  - twidge
+  - twilight-stm
+  - twilio
+  - twill
+  - twine
+  - twirp
+  - twitter
+  - twitter-conduit
+  - twitter-enumerator
+  - twitter-feed
+  - tx
+  - txt
+  - txtblk
+  - TYB
+  - tyfam-witnesses
+  - typalyze
+  - type-assertions
+  - type-cache
+  - type-cereal
+  - type-combinators
+  - type-combinators-quote
+  - type-combinators-singletons
+  - type-digits
+  - type-eq
+  - type-fun
+  - type-indexed-queues
+  - type-int
+  - type-interpreter
+  - type-level-bst
+  - type-level-natural-number-induction
+  - type-level-natural-number-operations
+  - type-list
+  - type-of-html-static
+  - type-ord
+  - type-ord-spine-cereal
+  - type-prelude
+  - type-sets
+  - type-settheory
+  - type-spine
+  - type-structure
+  - type-sub-th
+  - type-tree
+  - typeable-th
+  - TypeClass
+  - typed-encoding
+  - typed-encoding-encoding
+  - typed-spreadsheet
+  - typed-streams
+  - typed-wire
+  - typedflow
+  - typedquery
+  - typehash
+  - TypeIlluminator
+  - typelevel
+  - typelevel-rewrite-rules
+  - typelevel-tensor
+  - TypeNat
+  - typenums
+  - typeparams
+  - types-compat
+  - typesafe-precure
+  - typescript-docs
+  - typograffiti
+  - tyro
+  - u2f
+  - uber
+  - uberlast
+  - ucam-webauth
+  - ucam-webauth-types
+  - ucd
+  - uconv
+  - udp-conduit
+  - udp-streaming
+  - uhc-light
+  - uhc-util
+  - uhexdump
+  - ui-command
+  - UMM
+  - unagi-bloomfilter
+  - unamb-custom
+  - unbound
+  - unbounded-delays-units
+  - unboxed-containers
+  - unboxed-references
+  - unbreak
+  - unescaping-print
+  - unfix-binders
+  - uni-events
+  - uni-graphs
+  - uni-htk
+  - uni-posixutil
+  - uni-reactor
+  - uni-uDrawGraph
+  - uni-util
+  - unicode-normalization
+  - unicode-prelude
+  - unicode-show
+  - unicode-symbols
+  - uniform-io
+  - union
+  - union-map
+  - uniqueid
+  - uniquely-represented-sets
+  - units-attoparsec
+  - unittyped
+  - unitym-servant
+  - unitym-yesod
+  - universal-binary
+  - universe-th
+  - unix-fcntl
+  - unix-handle
+  - unix-process-conduit
+  - unlifted-list
+  - unliftio-streams
+  - unm-hip
+  - unordered-containers-rematch
+  - unordered-graphs
+  - unordered-intmap
+  - unpack-funcs
+  - unpacked-either
+  - unpacked-maybe
+  - unpacked-maybe-numeric
+  - unpacked-these
+  - unpacked-validation
+  - unparse-attoparsec
+  - unroll-ghc-plugin
+  - unsafely
+  - unscramble
+  - unsequential
+  - unused
+  - uom-plugin
+  - up
+  - Updater
+  - uploadcare
+  - upskirt
+  - urbit-airlock
+  - ureader
+  - urembed
+  - uri
+  - uri-conduit
+  - uri-encoder
+  - uri-enumerator
+  - uri-enumerator-file
+  - uri-parse
+  - uri-template
+  - uri-templater
+  - url-bytes
+  - url-decoders
+  - url-generic
+  - URLb
+  - urlcheck
+  - urldecode
+  - UrlDisp
+  - urldisp-happstack
+  - urlencoded
+  - urlpath
+  - URLT
+  - urn
+  - urn-random
+  - urxml
+  - usb
+  - usb-enumerator
+  - usb-hid
+  - usb-id-database
+  - usb-iteratee
+  - usb-safe
+  - userid
+  - users-mysql-haskell
+  - users-persistent
+  - utf
+  - utf8-prelude
+  - utf8-validator
+  - UTFTConverter
+  - util-exception
+  - util-logict
+  - util-plus
+  - util-primitive
+  - util-primitive-control
+  - util-universe
+  - uu-cco
+  - uu-cco-examples
+  - uu-cco-hut-parsing
+  - uu-cco-uu-parsinglib
+  - uuagc-bootstrap
+  - uuagc-diagrams
+  - uuid-aeson
+  - uuid-bytes
+  - uuid-crypto
+  - uvector
+  - uvector-algorithms
+  - uxadt
+  - v4l2
+  - v4l2-examples
+  - vabal
+  - vabal-lib
+  - vacuum
+  - vacuum-cairo
+  - vacuum-graphviz
+  - vacuum-opengl
+  - vacuum-ubigraph
+  - valid-names
+  - validate-input
+  - validated-types
+  - Validation
+  - validations
+  - value-supply
+  - vampire
+  - var
+  - varan
+  - variable-precision
+  - variables
+  - variation
+  - vault-tool-server
+  - vault-trans
+  - vaultaire-common
+  - vcache
+  - vcache-trie
+  - vcard
+  - vcatt
+  - vcf
+  - vcsgui
+  - vcswrapper
+  - Vec-Boolean
+  - Vec-OpenGLRaw
+  - Vec-Transform
+  - vect-floating
+  - vect-floating-accelerate
+  - vect-opengl
+  - vector-bytestring
+  - vector-clock
+  - vector-conduit
+  - vector-endian
+  - vector-functorlazy
+  - vector-heterogenous
+  - vector-instances-collections
+  - vector-random
+  - vector-read-instances
+  - vector-space-map
+  - vector-space-opengl
+  - vector-space-points
+  - vector-static
+  - vector-text
+  - vega-view
+  - venzone
+  - Verba
+  - verbalexpressions
+  - verdict
+  - verdict-json
+  - verifiable-expressions
+  - verify
+  - verilog
+  - verismith
+  - versioning
+  - versioning-servant
+  - vflow-types
+  - vfr-waypoints
+  - vgrep
+  - vhd
+  - vhdl
+  - vicinity
+  - ViennaRNA-extras
+  - viewprof
+  - views
+  - vigilance
+  - Villefort
+  - vimeta
+  - vimus
+  - vintage-basic
+  - vinyl-json
+  - vinyl-named-sugar
+  - vinyl-operational
+  - vinyl-plus
+  - vinyl-utils
+  - vinyl-vectors
+  - virthualenv
+  - visibility
+  - vision
+  - visual-graphrewrite
+  - visual-prof
+  - visualize-cbn
+  - vitrea
+  - vivid
+  - vivid-osc
+  - vivid-supercollider
+  - vk-aws-route53
+  - VKHS
+  - voicebase
+  - vowpal-utils
+  - voyeur
+  - vpq
+  - VRML
+  - vte
+  - vtegtk3
+  - vty-examples
+  - vty-menu
+  - vty-ui
+  - vty-ui-extras
+  - vulkan-api
+  - waargonaut
+  - wacom-daemon
+  - waddle
+  - wahsp
+  - wai-cli
+  - wai-devel
+  - wai-git-http
+  - wai-graceful
+  - wai-handler-devel
+  - wai-handler-fastcgi
+  - wai-handler-scgi
+  - wai-handler-snap
+  - wai-handler-webkit
+  - wai-hmac-auth
+  - wai-lens
+  - wai-lite
+  - wai-logger-buffered
+  - wai-logger-prefork
+  - wai-make-assets
+  - wai-middleware-cache
+  - wai-middleware-cache-redis
+  - wai-middleware-catch
+  - wai-middleware-consul
+  - wai-middleware-content-type
+  - wai-middleware-crowd
+  - wai-middleware-delegate
+  - wai-middleware-etag
+  - wai-middleware-headers
+  - wai-middleware-hmac-client
+  - wai-middleware-preprocessor
+  - wai-middleware-rollbar
+  - wai-middleware-route
+  - wai-middleware-static-caching
+  - wai-middleware-travisci
+  - wai-rate-limit-redis
+  - wai-request-spec
+  - wai-responsible
+  - wai-router
+  - wai-routes
+  - wai-routing
+  - wai-secure-cookies
+  - wai-session-alt
+  - wai-session-mysql
+  - wai-session-postgresql
+  - wai-static-cache
+  - wai-thrift
+  - wai-throttler
+  - waitfree
+  - waitra
+  - waldo
+  - wallpaper
+  - warp-dynamic
+  - warp-static
+  - warp-systemd
+  - warped
+  - WashNGo
+  - wasm
+  - watchdog
+  - watcher
+  - watchit
+  - WAVE
+  - WaveFront
+  - wavefront
+  - wavefront-obj
+  - wavesurfer
+  - wavy
+  - weak-bag
+  - weather-api
+  - web-css
+  - web-encodings
+  - web-mongrel2
+  - web-output
+  - web-page
+  - web-push
+  - web-rep
+  - web-routes-quasi
+  - web-routes-regular
+  - web-routes-transformers
+  - web-routing
+  - web3
+  - webapi
+  - webapp
+  - webauthn
+  - WebBits
+  - WebBits-Html
+  - WebBits-multiplate
+  - webcloud
+  - WebCont
+  - webcrank
+  - webcrank-dispatch
+  - webcrank-wai
+  - webdriver-angular
+  - webdriver-snoy
+  - webdriver-w3c
+  - WeberLogic
+  - webfinger-client
+  - webkit-javascriptcore
+  - Webrexp
+  - webserver
+  - webshow
+  - websockets-rpc
+  - webwire
+  - WEditor
+  - WEditorBrick
+  - WEditorHyphen
+  - weighted
+  - weighted-regexp
+  - welshy
+  - werewolf
+  - werewolf-slack
+  - what4
+  - Wheb
+  - wheb-mongo
+  - wheb-redis
+  - wheb-strapped
+  - while-lang-parser
+  - whim
+  - whiskers
+  - whitespace
+  - whois
+  - why3
+  - WikimediaParser
+  - wikipedia4epub
+  - wild-bind-indicator
+  - wild-bind-task-x11
+  - windns
+  - windowslive
+  - winerror
+  - winery
+  - winio
+  - Wired
+  - wires
+  - wiring
+  - witty
+  - wkt
+  - wkt-geom
+  - wl-pprint-ansiterm
+  - wl-pprint-extras
+  - wl-pprint-terminfo
+  - WL500gPControl
+  - WL500gPLib
+  - wlc-hs
+  - WMSigner
+  - wobsurv
+  - woe
+  - woffex
+  - wol
+  - wolf
+  - word2vec-model
+  - WordAlignment
+  - wordchoice
+  - wordify
+  - wordlist
+  - WordNet
+  - WordNet-ghc74
+  - wordpass
+  - wordsearch
+  - work-time
+  - workdays
+  - Workflow
+  - workflow-extra
+  - workflow-osx
+  - workflow-pure
+  - workflow-types
+  - workflow-windows
+  - wp-archivebot
+  - wraxml
+  - wrecker
+  - wrecker-ui
+  - wreq-patchable
+  - wreq-sb
+  - wright
+  - writer-cps-full
+  - writer-cps-lens
+  - writer-cps-monads-tf
+  - writer-cps-morph
+  - ws
+  - wsdl
+  - wsedit
+  - wshterm
+  - wsjtx-udp
+  - wstunnel
+  - wtk
+  - wtk-gtk
+  - wu-wei
+  - wumpus-basic
+  - wumpus-core
+  - wumpus-drawing
+  - wumpus-microprint
+  - wumpus-tree
+  - WURFL
+  - wxAsteroids
+  - WXDiffCtrl
+  - wxdirect
+  - wxFruit
+  - WxGeneric
+  - wxhnotepad
+  - wxSimpleCanvas
+  - wxturtle
+  - wyvern
+  - x-dsp
+  - X11-extras
+  - X11-rm
+  - X11-xdamage
+  - X11-xfixes
+  - xchat-plugin
+  - xcp
+  - xdcc
+  - xdot
+  - Xec
+  - xenstore
+  - xfconf
+  - xformat
+  - xhaskell-library
+  - xhb
+  - xhb-atom-cache
+  - xhb-ewmh
+  - xilinx-lava
+  - xine
+  - xing-api
+  - xkbcommon
+  - xkcd
+  - xleb
+  - xls
+  - xlsior
+  - xlsx
+  - xlsx-tabular
+  - xlsx-templater
+  - xml-catalog
+  - xml-conduit-decode
+  - xml-conduit-stylist
+  - xml-enumerator
+  - xml-enumerator-combinators
+  - xml-extractors
+  - xml-html-conduit-lens
+  - xml-monad
+  - xml-parsec
+  - xml-pipe
+  - xml-prettify
+  - xml-push
+  - xml-query
+  - xml-query-xml-conduit
+  - xml-query-xml-types
+  - xml-tydom-conduit
+  - xml-tydom-core
+  - xml2json
+  - xml2x
+  - XmlHtmlWriter
+  - xmltv
+  - XMMS
+  - xmms2-client
+  - xmms2-client-glib
+  - xmonad-bluetilebranch
+  - xmonad-contrib-bluetilebranch
+  - xmonad-contrib-gpl
+  - xmonad-dbus
+  - xmonad-eval
+  - xmonad-vanessa
+  - xmonad-windownames
+  - xmpipe
+  - XMPP
+  - xor
+  - xorshift-plus
+  - Xorshift128Plus
+  - xournal-builder
+  - xournal-convert
+  - xournal-parser
+  - xournal-render
+  - xournal-types
+  - xrefcheck
+  - xsact
+  - XSaiga
+  - xsd
+  - xslt
+  - xtc
+  - xxhash
+  - y0l0bot
+  - yabi-muno
+  - Yablog
+  - yackage
+  - YACPong
+  - yahoo-finance-api
+  - yahoo-finance-conduit
+  - yahoo-web-search
+  - yajl
+  - yajl-enumerator
+  - yall
+  - yam
+  - yam-config
+  - yam-datasource
+  - yam-logger
+  - yam-redis
+  - yam-servant
+  - yam-transaction
+  - yam-transaction-odbc
+  - yam-web
+  - yaml-pretty-extras
+  - yaml-rpc
+  - yaml-rpc-scotty
+  - yaml-rpc-snap
+  - yaml-unscrambler
+  - YamlReference
+  - yampa-glfw
+  - yampa-gloss
+  - yampa-glut
+  - yampa-sdl2
+  - yampa-test
+  - yampa2048
+  - YampaSynth
+  - yandex-translate
+  - yaop
+  - yap
+  - yarn-lock
+  - yarr
+  - yarr-image-io
+  - yavie
+  - yaya-test
+  - yaya-unsafe-test
+  - ycextra
+  - yeamer
+  - yeller
+  - yeshql
+  - yeshql-hdbc
+  - yeshql-postgresql-simple
+  - yesod-angular
+  - yesod-angular-ui
+  - yesod-articles
+  - yesod-auth-account
+  - yesod-auth-account-fork
+  - yesod-auth-bcrypt
+  - yesod-auth-bcryptdb
+  - yesod-auth-deskcom
+  - yesod-auth-hmac-keccak
+  - yesod-auth-kerberos
+  - yesod-auth-ldap
+  - yesod-auth-ldap-mediocre
+  - yesod-auth-ldap-native
+  - yesod-auth-lti13
+  - yesod-auth-nopassword
+  - yesod-auth-oauth2
+  - yesod-auth-pam
+  - yesod-auth-smbclient
+  - yesod-auth-zendesk
+  - yesod-bootstrap
+  - yesod-colonnade
+  - yesod-comments
+  - yesod-content-pdf
+  - yesod-continuations
+  - yesod-crud
+  - yesod-crud-persist
+  - yesod-datatables
+  - yesod-dsl
+  - yesod-examples
+  - yesod-fast-devel
+  - yesod-fay
+  - yesod-filter
+  - yesod-form-richtext
+  - yesod-gitrev
+  - yesod-goodies
+  - yesod-ip
+  - yesod-job-queue
+  - yesod-links
+  - yesod-lucid
+  - yesod-mangopay
+  - yesod-markdown
+  - yesod-media-simple
+  - yesod-paginate
+  - yesod-pagination
+  - yesod-paypal-rest
+  - yesod-platform
+  - yesod-pnotify
+  - yesod-pure
+  - yesod-purescript
+  - yesod-raml
+  - yesod-raml-bin
+  - yesod-raml-docs
+  - yesod-raml-mock
+  - yesod-recaptcha
+  - yesod-routes
+  - yesod-routes-flow
+  - yesod-routes-typescript
+  - yesod-rst
+  - yesod-s3
+  - yesod-sass
+  - yesod-session-redis
+  - yesod-static-angular
+  - yesod-static-remote
+  - yesod-test-json
+  - yesod-tls
+  - yesod-vend
+  - yesod-worker
+  - YFrob
+  - yggdrasil
+  - yhccore
+  - yhseq
+  - yi
+  - yi-contrib
+  - yi-core
+  - yi-dynamic-configuration
+  - yi-emacs-colours
+  - yi-frontend-pango
+  - yi-frontend-vty
+  - yi-fuzzy-open
+  - yi-ireader
+  - yi-keymap-cua
+  - yi-keymap-emacs
+  - yi-keymap-vim
+  - yi-language
+  - yi-misc-modes
+  - yi-mode-haskell
+  - yi-mode-javascript
+  - yi-monokai
+  - yi-snippet
+  - yi-solarized
+  - yi-spolsky
+  - yices
+  - yjftp
+  - yjftp-libs
+  - yoctoparsec
+  - yoda
+  - Yogurt
+  - Yogurt-Standalone
+  - yoko
+  - york-lava
+  - yql
+  - yst
+  - yu-auth
+  - yu-core
+  - yu-launch
+  - yu-tool
+  - yu-utils
+  - yuuko
+  - yxdb-utils
+  - Z-Data
+  - Z-IO
+  - z3-encoding
+  - z85
+  - zabt
+  - zampolit
+  - zasni-gerna
+  - zbar
+  - ZEBEDDE
+  - zendesk-api
+  - zenhack-prelude
+  - zeno
+  - zephyr
+  - zerobin
+  - zeromq-haskell
+  - zeromq3-conduit
+  - zeromq3-haskell
+  - zeromq4-clone-pattern
+  - zeromq4-conduit
+  - zeroth
+  - zettelkast
+  - ZFS
+  - zifter
+  - zifter-cabal
+  - zifter-git
+  - zifter-google-java-format
+  - zifter-hindent
+  - zifter-hlint
+  - zifter-stack
+  - zigbee-znet25
+  - zip-conduit
+  - zipedit
+  - zipkin
+  - zipper
+  - zippo
+  - ziptastic-client
+  - ziptastic-core
+  - zlib-enum
+  - zm
+  - ZMachine
+  - zmcat
+  - zmidi-score
+  - zoneinfo
+  - zoom
+  - zoom-cache
+  - zoom-cache-pcm
+  - zoom-cache-sndfile
+  - zoom-refs
+  - zsdd
+  - zsh-battery
+  - zsyntax
+  - ztar
+  - zuramaru
+  - Zwaluw
+  - zxcvbn-dvorak

From 877be1a763d40aadc8971afaf002d5387444dc7f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Nov 2020 20:23:01 +0100
Subject: [PATCH 3117/3942] haskell: hls-brittany and brittany are the same
 package in our environment

---
 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 e512649ee45f..afe26660d084 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1422,7 +1422,8 @@ self: super: {
   # brittany release in a while and this version works with 8.10.
   # And we need to build it anyways.
   # 2020-11-15: jailbreaking because we have strict 0.4 which is to new
-  brittany = dontCheck (doJailbreak super.hls-brittany);
+  brittany = self.hls-brittany;
+  hls-brittany = dontCheck (doJailbreak super.hls-brittany);
 
   # 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing
   aeson = dontCheck super.aeson;

From bb89940afda55db100de53378baaaf6e5532a7e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Nov 2020 20:47:36 +0100
Subject: [PATCH 3118/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-28-gd194902 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/8c0e05f98737e7dadf3698a937e0707d43bd10e4.
---
 .../haskell-modules/hackage-packages.nix      | 17396 +++++++++++++++-
 1 file changed, 17345 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 76e6e074e0df..98eb748c57f5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -28,6 +28,8 @@ self: {
        ];
        description = "3D model parsers";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "4Blocks" = callPackage
@@ -43,6 +45,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "AAI" = callPackage
@@ -54,6 +58,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Abstract Application Interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ABList" = callPackage
@@ -104,6 +110,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Detect which OS you're running on";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-Colour" = callPackage
@@ -126,6 +134,8 @@ self: {
        libraryHaskellDepends = [ array base gtk ];
        description = "GTK+ pixel plotting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-HalfInteger" = callPackage
@@ -139,6 +149,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient half-integer type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-MiniTest" = callPackage
@@ -152,6 +164,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A simple test framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-PPM" = callPackage
@@ -187,6 +201,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Trivial wrapper over ansi-terminal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-VanillaArray" = callPackage
@@ -198,6 +214,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Immutable arrays with plain integer indicies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-Vector" = callPackage
@@ -211,6 +229,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient geometric vectors and transformations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-Vector-Fancy" = callPackage
@@ -222,6 +242,8 @@ self: {
        libraryHaskellDepends = [ AC-Angle AC-Vector base ];
        description = "Fancy type-system stuff for AC-Vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ACME" = callPackage
@@ -237,6 +259,8 @@ self: {
        ];
        description = "Essential features";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ADPfusion" = callPackage
@@ -264,6 +288,8 @@ self: {
        ];
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ADPfusionForest" = callPackage
@@ -290,6 +316,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ForestStructures ];
        description = "Dynamic programming on tree and forest structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ADPfusionSet" = callPackage
@@ -314,6 +342,8 @@ self: {
        ];
        description = "Dynamic programming for Set data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-Basics" = callPackage
@@ -333,6 +363,8 @@ self: {
        executableHaskellDepends = [ base containers directory ];
        description = "foundational type classes for approximating exact real numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-Net" = callPackage
@@ -348,6 +380,8 @@ self: {
        ];
        description = "Compositional lazy dataflow networks for exact real number computation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-Real" = callPackage
@@ -364,6 +398,8 @@ self: {
        ];
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-Real-Double" = callPackage
@@ -387,6 +423,8 @@ self: {
        ];
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-Real-Interval" = callPackage
@@ -403,6 +441,8 @@ self: {
        ];
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-RnToRm" = callPackage
@@ -419,6 +459,8 @@ self: {
        ];
        description = "polynomial function enclosures (PFEs) approximating exact real functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-RnToRm-Plot" = callPackage
@@ -436,6 +478,8 @@ self: {
        ];
        description = "GL plotting of polynomial function enclosures (PFEs)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AES" = callPackage
@@ -477,6 +521,8 @@ self: {
        ];
        description = "A library for writing AGI scripts for Asterisk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ALUT" = callPackage
@@ -506,6 +552,8 @@ self: {
        ];
        description = "Low-level bindings for Asterisk Manager Interface (AMI)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ANum" = callPackage
@@ -567,6 +615,8 @@ self: {
        libraryHaskellDepends = [ AbortT-transformers base monads-tf ];
        description = "Monads-tf instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AbortT-mtl" = callPackage
@@ -578,6 +628,8 @@ self: {
        libraryHaskellDepends = [ AbortT-transformers base mtl ];
        description = "mtl instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AbortT-transformers" = callPackage
@@ -595,6 +647,8 @@ self: {
        ];
        description = "A monad and monadic transformer providing \"abort\" functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ActionKid" = callPackage
@@ -618,6 +672,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An easy-to-use video game framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Adaptive" = callPackage
@@ -633,6 +689,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Adaptive-Blaisorblade" = callPackage
@@ -647,6 +705,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Advgame" = callPackage
@@ -660,6 +720,8 @@ self: {
        executableHaskellDepends = [ base haskell98 mtl ];
        description = "Lisperati's adventure game in Lisp translated to Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Advise-me" = callPackage
@@ -689,6 +751,8 @@ self: {
        ];
        description = "Assessment services for the Advise-Me project";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AesonBson" = callPackage
@@ -725,6 +789,8 @@ self: {
        ];
        description = "Generator-generator for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Agda" = callPackage
@@ -787,6 +853,8 @@ self: {
        ];
        description = "Aho-Corasick string matching algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AlanDeniseEricLauren" = callPackage
@@ -808,6 +876,8 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion ];
        description = "Find the minimal subset/submap satisfying some property";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AlgoRhythm" = callPackage
@@ -836,6 +906,8 @@ self: {
        ];
        description = "Algorithmic music composition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AlgorithmW" = callPackage
@@ -849,6 +921,8 @@ self: {
        executableHaskellDepends = [ base containers mtl pretty ];
        description = "Example implementation of Algorithm W for Hindley-Milner type inference";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AlignmentAlgorithms" = callPackage
@@ -865,6 +939,8 @@ self: {
        ];
        description = "Collection of alignment algorithms";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Allure" = callPackage
@@ -892,6 +968,8 @@ self: {
        ];
        description = "Near-future Sci-Fi roguelike and tactical squad combat game";
        license = stdenv.lib.licenses.agpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AndroidViewHierarchyImporter" = callPackage
@@ -911,6 +989,8 @@ self: {
        ];
        description = "Android view hierarchy importer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Animas" = callPackage
@@ -922,6 +1002,8 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "Updated version of Yampa: a library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Annotations" = callPackage
@@ -934,6 +1016,8 @@ self: {
        testHaskellDepends = [ base mtl multirec parsec ];
        description = "Constructing, analyzing and destructing annotated trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Ansi2Html" = callPackage
@@ -979,6 +1063,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for Apple Push Notification Service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AppleScript" = callPackage
@@ -990,6 +1076,8 @@ self: {
        doHaddock = false;
        description = "Call AppleScript from Haskell, and then call back into Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ApproxFun-hs" = callPackage
@@ -1001,6 +1089,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Function approximation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ArrayRef" = callPackage
@@ -1012,6 +1102,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unboxed references, dynamic arrays and more";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ArrowVHDL" = callPackage
@@ -1023,6 +1115,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "A library to generate Netlist code from Arrow descriptions";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AspectAG" = callPackage
@@ -1058,6 +1152,8 @@ self: {
        ];
        description = "Fast Bencode encoding and parsing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AttoJson" = callPackage
@@ -1074,6 +1170,8 @@ self: {
        ];
        description = "Simple lightweight JSON parser, generator & manipulator based on ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Attrac" = callPackage
@@ -1089,6 +1187,8 @@ self: {
        ];
        description = "Visualisation of Strange Attractors in 3-Dimensions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Aurochs" = callPackage
@@ -1102,6 +1202,8 @@ self: {
        executableHaskellDepends = [ base containers parsec pretty ];
        description = "Yet another parser generator for C/C++";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AutoForms" = callPackage
@@ -1117,6 +1219,8 @@ self: {
        ];
        description = "GUI library based upon generic programming (SYB3)";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AvlTree" = callPackage
@@ -1128,6 +1232,8 @@ self: {
        libraryHaskellDepends = [ base COrdering ];
        description = "Balanced binary trees using the AVL algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BASIC" = callPackage
@@ -1139,6 +1245,8 @@ self: {
        libraryHaskellDepends = [ base containers llvm random timeit ];
        description = "Embedded BASIC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BCMtools" = callPackage
@@ -1165,6 +1273,8 @@ self: {
        ];
        description = "Big Contact Map Tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BNFC" = callPackage
@@ -1221,6 +1331,8 @@ self: {
        libraryHaskellDepends = [ base cairo containers mtl ];
        description = "Tools for self-assembly";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Bang" = callPackage
@@ -1236,6 +1348,8 @@ self: {
        ];
        description = "A Drum Machine DSL for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Barracuda" = callPackage
@@ -1264,6 +1378,8 @@ self: {
        ];
        description = "An ad-hoc P2P chat program";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Befunge93" = callPackage
@@ -1277,6 +1393,8 @@ self: {
        executableHaskellDepends = [ array base mtl random ];
        description = "An interpreter for the Befunge-93 Programming Language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BenchmarkHistory" = callPackage
@@ -1294,6 +1412,8 @@ self: {
        ];
        description = "Benchmark functions with history";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BerkeleyDB" = callPackage
@@ -1320,6 +1440,8 @@ self: {
        librarySystemDepends = [ db dbxml xercesc xqilla ];
        description = "Berkeley DB XML binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) db; inherit (pkgs) dbxml; 
          inherit (pkgs) xercesc; inherit (pkgs) xqilla;};
 
@@ -1332,6 +1454,8 @@ self: {
        libraryHaskellDepends = [ base besout ];
        description = "Factorization of polynomials over finite field";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiGUL" = callPackage
@@ -1346,6 +1470,8 @@ self: {
        ];
        description = "The Bidirectional Generic Update Language";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BigPixel" = callPackage
@@ -1377,6 +1503,8 @@ self: {
        ];
        description = "Source-to-source plugin for enhancing EDSLs with static annotations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Binpack" = callPackage
@@ -1405,6 +1533,8 @@ self: {
        ];
        description = "Libary for Hidden Markov Models in HMMER3 format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Biobase" = callPackage
@@ -1426,6 +1556,8 @@ self: {
        ];
        description = "Base library for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseBlast" = callPackage
@@ -1452,6 +1584,8 @@ self: {
        ];
        description = "BLAST-related tools";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseDotP" = callPackage
@@ -1463,6 +1597,8 @@ self: {
        libraryHaskellDepends = [ base bytestring iteratee ];
        description = "Vienna / DotBracket / ExtSS parsers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseENA" = callPackage
@@ -1485,6 +1621,8 @@ self: {
        ];
        description = "European Nucleotide Archive data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseEnsembl" = callPackage
@@ -1502,6 +1640,8 @@ self: {
        ];
        description = "Ensembl related datastructures and functions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseFR3D" = callPackage
@@ -1517,6 +1657,8 @@ self: {
        ];
        description = "Importer for FR3D resources";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseFasta" = callPackage
@@ -1541,6 +1683,8 @@ self: {
        ];
        description = "streaming FASTA parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseHTTP" = callPackage
@@ -1558,6 +1702,8 @@ self: {
        ];
        description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseHTTPTools" = callPackage
@@ -1578,6 +1724,8 @@ self: {
        ];
        description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseInfernal" = callPackage
@@ -1616,6 +1764,8 @@ self: {
        ];
        description = "Infernal data structures and tools";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseMAF" = callPackage
@@ -1627,6 +1777,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers iteratee ];
        description = "Multiple Alignment Format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseNewick" = callPackage
@@ -1654,6 +1806,8 @@ self: {
        ];
        description = "Newick file format parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseTrainingData" = callPackage
@@ -1673,6 +1827,8 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "RNA folding training data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseTurner" = callPackage
@@ -1690,6 +1846,8 @@ self: {
        ];
        description = "Import Turner RNA parameters";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseTypes" = callPackage
@@ -1722,6 +1880,8 @@ self: {
        ];
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseVienna" = callPackage
@@ -1737,6 +1897,8 @@ self: {
        ];
        description = "Import Vienna energy parameters";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseXNA" = callPackage
@@ -1778,6 +1940,8 @@ self: {
        ];
        description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BirdPP" = callPackage
@@ -1791,6 +1955,8 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BitStringRandomMonad" = callPackage
@@ -1810,6 +1976,8 @@ self: {
          transformers vector
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BitSyntax" = callPackage
@@ -1823,6 +1991,8 @@ self: {
        ];
        description = "A module to aid in the (de)serialisation of binary data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Bitly" = callPackage
@@ -1834,6 +2004,8 @@ self: {
        libraryHaskellDepends = [ base HTTP json2 ];
        description = "A library to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BlastHTTP" = callPackage
@@ -1851,6 +2023,8 @@ self: {
        ];
        description = "Libary to interface with the NCBI blast REST interface";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Blobs" = callPackage
@@ -1872,6 +2046,8 @@ self: {
        ];
        description = "Diagram editor";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BlogLiterately" = callPackage
@@ -1896,6 +2072,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "A tool for posting Haskelly articles to blogs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BlogLiterately-diagrams" = callPackage
@@ -1917,6 +2095,8 @@ self: {
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Blogdown" = callPackage
@@ -1945,6 +2125,8 @@ self: {
        ];
        description = "A markdown-like markup language designed for blog posts";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BluePrintCSS" = callPackage
@@ -1967,6 +2149,8 @@ self: {
        doHaddock = false;
        description = "Preview of a new build system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Bookshelf" = callPackage
@@ -1987,6 +2171,8 @@ self: {
        testHaskellDepends = [ base process ];
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Boolean" = callPackage
@@ -2025,6 +2211,8 @@ self: {
        ];
        description = "Static text template generation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BufferedSocket" = callPackage
@@ -2036,6 +2224,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network text ];
        description = "A socker wrapper that makes the IO of sockets much cleaner";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Buster" = callPackage
@@ -2060,6 +2250,8 @@ self: {
        ];
        description = "Hits a set of urls periodically to bust caches";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "C-structs" = callPackage
@@ -2098,6 +2290,8 @@ self: {
        ];
        description = "Encode/Decode values to/from CBOR";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CC-delcont" = callPackage
@@ -2127,6 +2321,8 @@ self: {
        doHaddock = false;
        description = "Three new monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CC-delcont-cxe" = callPackage
@@ -2138,6 +2334,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CC-delcont-exc" = callPackage
@@ -2149,6 +2347,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CC-delcont-ref" = callPackage
@@ -2160,6 +2360,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CC-delcont-ref-tf" = callPackage
@@ -2171,6 +2373,8 @@ self: {
        libraryHaskellDepends = [ base ref-tf transformers ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CCA" = callPackage
@@ -2188,6 +2392,8 @@ self: {
        executableToolDepends = [ happy ];
        description = "preprocessor and library for Causal Commutative Arrows (CCA)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CHXHtml" = callPackage
@@ -2217,6 +2423,8 @@ self: {
        ];
        description = "Cursor Library for A Structured Editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CLI" = callPackage
@@ -2229,6 +2437,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "CLI tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CMCompare" = callPackage
@@ -2247,6 +2457,8 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "Infernal covariance model comparison";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CMQ" = callPackage
@@ -2263,6 +2475,8 @@ self: {
        ];
        description = "cwmwl udp message queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "COrdering" = callPackage
@@ -2274,6 +2488,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An algebraic data type similar to Prelude Ordering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CPBrainfuck" = callPackage
@@ -2288,6 +2504,8 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "A simple Brainfuck interpretter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CPL" = callPackage
@@ -2303,6 +2521,8 @@ self: {
        ];
        description = "An interpreter of Hagino's Categorical Programming Language (CPL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CSPM-CoreLanguage" = callPackage
@@ -2330,6 +2550,8 @@ self: {
        ];
        description = "Firing rules semantic of CSPM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CSPM-Frontend" = callPackage
@@ -2347,6 +2569,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "A CSP-M parser compatible with FDR-2.91";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CSPM-Interpreter" = callPackage
@@ -2363,6 +2587,8 @@ self: {
        ];
        description = "An interpreter for CSPM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CSPM-ToProlog" = callPackage
@@ -2376,6 +2602,8 @@ self: {
        ];
        description = "some modules specific for the ProB tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CSPM-cspm" = callPackage
@@ -2401,6 +2629,8 @@ self: {
        ];
        description = "cspm command line tool for analyzing CSPM specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CTRex" = callPackage
@@ -2445,6 +2675,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "OpenCV based machine vision library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {opencv_calib3d = null; opencv_contrib = null; 
          opencv_core = null; opencv_features2d = null; opencv_flann = null; 
          opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; 
@@ -2564,6 +2796,8 @@ self: {
        ];
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CabalSearch" = callPackage
@@ -2581,6 +2815,8 @@ self: {
        ];
        description = "Search cabal packages by name";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Capabilities" = callPackage
@@ -2592,6 +2828,8 @@ self: {
        libraryHaskellDepends = [ base compdata directory free unix ];
        description = "Separate and contain effects of IO monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Cardinality" = callPackage
@@ -2614,6 +2852,8 @@ self: {
        libraryHaskellDepends = [ base containers fgl parsec ];
        description = "An implementation and DSL for the Carneades argumentation model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CarneadesIntoDung" = callPackage
@@ -2630,6 +2870,8 @@ self: {
        ];
        description = "A translation from the Carneades argumentation model into Dung's AFs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Cartesian" = callPackage
@@ -2641,6 +2883,8 @@ self: {
        libraryHaskellDepends = [ base lens linear template-haskell ];
        description = "Coordinate systems";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Cascade" = callPackage
@@ -2652,6 +2896,8 @@ self: {
        libraryHaskellDepends = [ base comonad ghc-prim mtl void ];
        description = "Playing with reified categorical composition";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Cassava" = callPackage
@@ -2678,6 +2924,8 @@ self: {
        ];
        description = "A CSV parsing and encoding library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Catana" = callPackage
@@ -2689,6 +2937,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad for complex manipulation of a stream";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ChannelT" = callPackage
@@ -2759,6 +3009,8 @@ self: {
        ];
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Chart-fltkhs" = callPackage
@@ -2777,6 +3029,8 @@ self: {
        ];
        description = "A backend for the Chart library for FLTKHS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Chart-gtk" = callPackage
@@ -2825,6 +3079,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "Chart-tests" = callPackage
@@ -2851,6 +3107,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tests of the Charts library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ChasingBottoms" = callPackage
@@ -2894,6 +3152,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Inbuilt checking for ultra reliable computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Chitra" = callPackage
@@ -2907,6 +3167,8 @@ self: {
        executableHaskellDepends = [ base binary bytestring mtl network ];
        description = "A platform independent mechanism to render graphics using vnc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ChristmasTree" = callPackage
@@ -2922,6 +3184,8 @@ self: {
        ];
        description = "Alternative approach of 'read' that composes grammars instead of parsers";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CirruParser" = callPackage
@@ -2955,6 +3219,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ClassLaws" = callPackage
@@ -2966,6 +3232,8 @@ self: {
        libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ];
        description = "Stating and checking laws for type class methods";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ClassyPrelude" = callPackage
@@ -2977,6 +3245,8 @@ self: {
        libraryHaskellDepends = [ base strict ];
        description = "Prelude replacement using classes instead of concrete types where reasonable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Clean" = callPackage
@@ -2988,6 +3258,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A light, clean and powerful utility library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Clipboard" = callPackage
@@ -3019,6 +3291,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Libary for parsing Clustal tools output";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Coadjute" = callPackage
@@ -3036,6 +3310,8 @@ self: {
        ];
        description = "A generic build tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Codec-Compression-LZF" = callPackage
@@ -3103,6 +3379,8 @@ self: {
        ];
        description = "A concurrent bittorrent client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Command" = callPackage
@@ -3114,6 +3392,8 @@ self: {
        libraryHaskellDepends = [ base directory process ];
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Commando" = callPackage
@@ -3136,6 +3416,8 @@ self: {
        ];
        description = "Watch some files; Rerun a command";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ComonadSheet" = callPackage
@@ -3153,6 +3435,8 @@ self: {
        ];
        description = "A library for expressing spreadsheet-like computations as the fixed-points of comonads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Compactable" = callPackage
@@ -3164,6 +3448,8 @@ self: {
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A generalization for containers that can be stripped of Nothing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Concurrent-Cache" = callPackage
@@ -3175,6 +3461,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Cached variable for IO functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Concurrential" = callPackage
@@ -3186,6 +3474,8 @@ self: {
        libraryHaskellDepends = [ async base ];
        description = "Mix concurrent and sequential computation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Condor" = callPackage
@@ -3207,6 +3497,8 @@ self: {
        ];
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ConfigFile" = callPackage
@@ -3233,6 +3525,8 @@ self: {
        ];
        description = "Template haskell for reading ConfigFiles";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Configger" = callPackage
@@ -3244,6 +3538,8 @@ self: {
        libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ];
        description = "Parse config files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Configurable" = callPackage
@@ -3255,6 +3551,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Declare types as Configurable then specialize them all in one place";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ConsStream" = callPackage
@@ -3279,6 +3577,8 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Restart a command on STDIN activity";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ConstraintKinds" = callPackage
@@ -3290,6 +3590,8 @@ self: {
        libraryHaskellDepends = [ base dlist ghc-prim vector ];
        description = "Repackages standard type classes with the ConstraintKinds extension";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Consumer" = callPackage
@@ -3301,6 +3603,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad and monad transformer for consuming streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ContArrow" = callPackage
@@ -3312,6 +3616,8 @@ self: {
        libraryHaskellDepends = [ arrows base ];
        description = "Control.Arrow.Transformer.Cont";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ContextAlgebra" = callPackage
@@ -3329,6 +3635,8 @@ self: {
        ];
        description = "Implementation of the context algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Contract" = callPackage
@@ -3340,6 +3648,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Practical typed lazy contracts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Control-Engine" = callPackage
@@ -3371,6 +3681,8 @@ self: {
        ];
        description = "A Library for Writing Multi-Pass Algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Control-Monad-ST2" = callPackage
@@ -3388,6 +3700,8 @@ self: {
        ];
        description = "A variation on the ST monad with two type parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CoreDump" = callPackage
@@ -3399,6 +3713,8 @@ self: {
        libraryHaskellDepends = [ base ghc pretty pretty-show ];
        description = "A GHC plugin for printing GHC's internal Core data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CoreErlang" = callPackage
@@ -3410,6 +3726,8 @@ self: {
        libraryHaskellDepends = [ base parsec pretty ];
        description = "Manipulating Core Erlang source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CoreFoundation" = callPackage
@@ -3428,6 +3746,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to Mac OSX's CoreFoundation framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Coroutine" = callPackage
@@ -3439,6 +3759,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-safe coroutines using lightweight session types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CouchDB" = callPackage
@@ -3459,6 +3781,8 @@ self: {
        ];
        description = "CouchDB interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Craft3e" = callPackage
@@ -3475,6 +3799,8 @@ self: {
        doHaddock = false;
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Crypto" = callPackage
@@ -3529,6 +3855,8 @@ self: {
        ];
        description = "CurryDB: In-memory Key/Value Database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DAG-Tournament" = callPackage
@@ -3546,6 +3874,8 @@ self: {
        ];
        description = "Real-Time Game Tournament Evaluator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DAV" = callPackage
@@ -3602,6 +3932,8 @@ self: {
        ];
        description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DBlimited" = callPackage
@@ -3615,6 +3947,8 @@ self: {
        executableHaskellDepends = [ base containers parsec ];
        description = "A command-line SQL interface for flat files (tdf,csv,etc.)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DBus" = callPackage
@@ -3626,6 +3960,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "D-Bus bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DCFL" = callPackage
@@ -3650,6 +3986,8 @@ self: {
        executableHaskellDepends = [ base MuCheck ];
        description = "Distributed Mutation Analysis framework for MuCheck";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DOH" = callPackage
@@ -3686,6 +4024,8 @@ self: {
        libraryHaskellDepends = [ base mtl WebBits ];
        description = "DOM Level 2 bindings for the WebBits package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DP" = callPackage
@@ -3701,6 +4041,8 @@ self: {
        ];
        description = "Pragmatic framework for dynamic programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DPM" = callPackage
@@ -3724,6 +4066,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Darcs Patch Manager";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DPutils" = callPackage
@@ -3808,6 +4152,8 @@ self: {
        ];
        description = "Implementation of DSA, based on the description of FIPS 186-4";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DSH" = callPackage
@@ -3836,6 +4182,8 @@ self: {
        ];
        description = "Database Supported Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DSTM" = callPackage
@@ -3857,6 +4205,8 @@ self: {
        ];
        description = "A framework for using STM within distributed systems";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DTC" = callPackage
@@ -3868,6 +4218,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Data To Class transformation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dangerous" = callPackage
@@ -3879,6 +4231,8 @@ self: {
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Monads for operations that can exit early and produce warnings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dao" = callPackage
@@ -3909,6 +4263,8 @@ self: {
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DarcsHelpers" = callPackage
@@ -3920,6 +4276,8 @@ self: {
        libraryHaskellDepends = [ base HaXml mtl parsec safe xml-parsec ];
        description = "Code used by Patch-Shack that seemed sensible to open for reusability";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Data-Angle" = callPackage
@@ -3957,6 +4315,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DataIndex" = callPackage
@@ -3990,6 +4350,8 @@ self: {
        ];
        description = "A GTK widget for displaying arbitrary Data.Data.Data instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DataVersion" = callPackage
@@ -4003,6 +4365,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Type safe data migrations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Deadpan-DDP" = callPackage
@@ -4031,6 +4395,8 @@ self: {
        testHaskellDepends = [ base doctest filemanip QuickCheck ];
        description = "Write clients for Meteor's DDP Protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DebugTraceHelpers" = callPackage
@@ -4070,6 +4436,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DeepArrow" = callPackage
@@ -4081,6 +4449,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src mtl TypeCompose ];
        description = "Arrows for \"deep application\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DeepDarkFantasy" = callPackage
@@ -4098,6 +4468,8 @@ self: {
        testHaskellDepends = [ base constraints mtl QuickCheck random ];
        description = "A DSL for creating neural network";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DefendTheKing" = callPackage
@@ -4117,6 +4489,8 @@ self: {
        ];
        description = "A simple RTS game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Delta-Lambda" = callPackage
@@ -4139,6 +4513,8 @@ self: {
        ];
        description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DescriptiveKeys" = callPackage
@@ -4167,6 +4543,8 @@ self: {
        ];
        description = "Processing Real-time event streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Diff_0_3_4" = callPackage
@@ -4215,6 +4593,8 @@ self: {
        ];
        description = "A theory solver for conjunctions of literals in difference logic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DifferentialEvolution" = callPackage
@@ -4230,6 +4610,8 @@ self: {
        ];
        description = "Global optimization using Differential Evolution";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Digit" = callPackage
@@ -4264,6 +4646,8 @@ self: {
        testHaskellDepends = [ base hspec lens mtl text ];
        description = "A client library for the DigitalOcean API";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DimensionalHash" = callPackage
@@ -4275,6 +4659,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An n-dimensional hash using Morton numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DirectSound" = callPackage
@@ -4308,6 +4694,8 @@ self: {
        ];
        description = "Distributed Bug Tracking System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DiscussionSupportSystem" = callPackage
@@ -4324,6 +4712,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Discussion support system";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dish" = callPackage
@@ -4338,6 +4728,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Hash modules (currently Murmur3)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dist" = callPackage
@@ -4350,6 +4742,8 @@ self: {
        testHaskellDepends = [ base containers MonadRandom ];
        description = "A Haskell library for probability distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DistanceTransform" = callPackage
@@ -4403,6 +4797,8 @@ self: {
        ];
        description = "Frameshift-aware alignment of protein sequences with DNA sequences";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DocTest" = callPackage
@@ -4420,6 +4816,8 @@ self: {
        ];
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Docs" = callPackage
@@ -4449,6 +4847,8 @@ self: {
        executableHaskellDepends = [ array base containers pretty ];
        description = "A tool for deriving hylomorphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DrIFT" = callPackage
@@ -4466,6 +4866,8 @@ self: {
        ];
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DrIFT-cabalized" = callPackage
@@ -4480,6 +4882,8 @@ self: {
        executableHaskellDepends = [ base old-time process random ];
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dung" = callPackage
@@ -4493,6 +4897,8 @@ self: {
        libraryHaskellDepends = [ base cmdargs containers parsec ];
        description = "An implementation of the Dung argumentation frameworks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dust" = callPackage
@@ -4518,6 +4924,8 @@ self: {
        ];
        description = "Polymorphic protocol engine";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dust-crypto" = callPackage
@@ -4544,6 +4952,8 @@ self: {
        ];
        description = "Cryptographic operations";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "Dust-tools" = callPackage
@@ -4568,6 +4978,8 @@ self: {
        ];
        description = "Network filtering exploration tools";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dust-tools-pcap" = callPackage
@@ -4589,6 +5001,8 @@ self: {
        ];
        description = "Network filtering exploration tools that rely on pcap";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DynamicTimeWarp" = callPackage
@@ -4606,6 +5020,8 @@ self: {
        ];
        description = "Dynamic time warping of sequences";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DysFRP" = callPackage
@@ -4619,6 +5035,8 @@ self: {
        ];
        description = "dysFunctional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DysFRP-Cairo" = callPackage
@@ -4630,6 +5048,8 @@ self: {
        libraryHaskellDepends = [ base cairo DysFRP gtk mtl ];
        description = "dysFunctional Reactive Programming on Cairo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DysFRP-Craftwerk" = callPackage
@@ -4646,6 +5066,8 @@ self: {
        ];
        description = "dysFunctional Reactive Programming on Craftwerk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EEConfig" = callPackage
@@ -4759,6 +5181,8 @@ self: {
        ];
        description = "Query language and report generator for edit logs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Eight-Ball-Pool-Hack-Cheats" = callPackage
@@ -4781,6 +5205,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EitherT" = callPackage
@@ -4798,6 +5224,8 @@ self: {
        ];
        description = "EitherT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Elm" = callPackage
@@ -4853,6 +5281,8 @@ self: {
        ];
        description = "derives heuristic rules from nominal data";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Empty" = callPackage
@@ -4864,6 +5294,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A type class for empty containers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Encode" = callPackage
@@ -4894,6 +5326,8 @@ self: {
        ];
        description = "Libary to interface with the NCBI Entrez REST service";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Enum" = callPackage
@@ -4917,6 +5351,8 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Simple Enum-class-based int containers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EnumMap" = callPackage
@@ -4928,6 +5364,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "More general IntMap replacement";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Eq" = callPackage
@@ -4946,6 +5384,8 @@ self: {
        ];
        description = "Render math formula in ASCII, and perform some simplifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EqualitySolver" = callPackage
@@ -4959,6 +5399,8 @@ self: {
        ];
        description = "A theory solver for conjunctions of literals in the theory of uninterpreted functions with equality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EsounD" = callPackage
@@ -4978,6 +5420,8 @@ self: {
        ];
        description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EstProgress" = callPackage
@@ -4989,6 +5433,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base mtl ];
        description = "Methods for estimating the progress of functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EtaMOO" = callPackage
@@ -5013,6 +5459,8 @@ self: {
        executablePkgconfigDepends = [ pcre ];
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) pcre;};
 
   "Etage" = callPackage
@@ -5028,6 +5476,8 @@ self: {
        ];
        description = "A general data-flow framework";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Etage-Graph" = callPackage
@@ -5046,6 +5496,8 @@ self: {
        ];
        description = "Data-flow based graph algorithms";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Eternal10Seconds" = callPackage
@@ -5060,6 +5512,8 @@ self: {
        executableHaskellDepends = [ base haskell98 SDL SDL-mixer ];
        description = "A 2-D shooting game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Etherbunny" = callPackage
@@ -5081,6 +5535,8 @@ self: {
        executableSystemDepends = [ libpcap ];
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libpcap;};
 
   "EuroIT" = callPackage
@@ -5123,6 +5579,8 @@ self: {
        ];
        description = "Interfaces with FreeSwitch Event Socket";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Extra" = callPackage
@@ -5142,6 +5600,8 @@ self: {
        ];
        description = "A grab bag of modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FAI" = callPackage
@@ -5179,6 +5639,8 @@ self: {
        ];
        description = "Compose music";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FM-SBLEX" = callPackage
@@ -5192,6 +5654,8 @@ self: {
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "A set of computational morphology tools for Swedish diachronic lexicons";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FModExRaw" = callPackage
@@ -5204,6 +5668,8 @@ self: {
        librarySystemDepends = [ fmodex64 ];
        description = "The Haskell FModEx raw API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {fmodex64 = null;};
 
   "FPretty" = callPackage
@@ -5217,6 +5683,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Efficient simple pretty printing combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FSM" = callPackage
@@ -5257,6 +5725,8 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ftgl;};
 
   "FTPLine" = callPackage
@@ -5275,6 +5745,8 @@ self: {
        ];
        description = "A command-line FTP client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Facebook-Password-Hacker-Online-Latest-Version" = callPackage
@@ -5299,6 +5771,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Facts" = callPackage
@@ -5314,6 +5788,8 @@ self: {
        ];
        description = "A collection of facts about the real world";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FailureT" = callPackage
@@ -5325,6 +5801,8 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols mmtl ];
        description = "Failure Monad Transformer";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FastPush" = callPackage
@@ -5336,6 +5814,8 @@ self: {
        libraryHaskellDepends = [ base STMonadTrans vector ];
        description = "A monad and monad transformer for pushing things onto a stack very fast";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FastxPipe" = callPackage
@@ -5352,6 +5832,8 @@ self: {
        ];
        description = "Fasta and Fastq streaming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FenwickTree" = callPackage
@@ -5384,6 +5866,8 @@ self: {
        ];
        description = "Annotate ps and pdf documents";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FerryCore" = callPackage
@@ -5400,6 +5884,8 @@ self: {
        ];
        description = "Ferry Core Components";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Feval" = callPackage
@@ -5413,6 +5899,8 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Evaluation using F-Algebras";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FieldTrip" = callPackage
@@ -5429,6 +5917,8 @@ self: {
        ];
        description = "Functional 3D";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FileManip" = callPackage
@@ -5444,6 +5934,8 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FileManipCompat" = callPackage
@@ -5459,6 +5951,8 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FilePather" = callPackage
@@ -5475,6 +5969,8 @@ self: {
        ];
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FileSystem" = callPackage
@@ -5490,6 +5986,8 @@ self: {
        ];
        description = "File system data structure and monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Files" = callPackage
@@ -5506,6 +6004,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "File content extraction/rearrangement";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Fin" = callPackage
@@ -5538,6 +6038,8 @@ self: {
        ];
        description = "Obtain quote data from finance.yahoo.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Finance-Treasury" = callPackage
@@ -5554,6 +6056,8 @@ self: {
        ];
        description = "Obtain Treasury yield curve data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FindBin" = callPackage
@@ -5576,6 +6080,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
        license = stdenv.lib.licenses.bsdOriginal;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FirstOrderTheory" = callPackage
@@ -5587,6 +6093,8 @@ self: {
        libraryHaskellDepends = [ base containers Proper ];
        description = "Grammar and typeclass for first order theories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FixedPoint-simple" = callPackage
@@ -5616,6 +6124,8 @@ self: {
        ];
        description = "Wiki";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FloatingHex" = callPackage
@@ -5689,6 +6199,8 @@ self: {
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ForestStructures" = callPackage
@@ -5736,6 +6248,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Comparison of trees and forests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ForkableT" = callPackage
@@ -5747,6 +6261,8 @@ self: {
        libraryHaskellDepends = [ base monad-control mtl resourcet ];
        description = "Forkable monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FormalGrammars" = callPackage
@@ -5771,6 +6287,8 @@ self: {
        ];
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Fortnite-Hack-Cheats-Free-V-Bucks-Generator" = callPackage
@@ -5793,6 +6311,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Foster" = callPackage
@@ -5813,6 +6333,8 @@ self: {
        ];
        description = "Utilities to generate and solve puzzles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FpMLv53" = callPackage
@@ -5859,6 +6381,8 @@ self: {
          base FTGL GLFW-b OpenGLRaw parallel random time
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Frames" = callPackage
@@ -5913,6 +6437,8 @@ self: {
        ];
        description = "A library for accessing Postgres tables as in-memory data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Frames-dsv" = callPackage
@@ -5930,6 +6456,8 @@ self: {
        testHaskellDepends = [ base Frames hspec pipes ];
        description = "Alternative CSV parser for the Frames package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Frames-map-reduce" = callPackage
@@ -5950,6 +6478,8 @@ self: {
        ];
        description = "Frames wrapper for map-reduce-folds and some extra folds helpers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Frames-streamly" = callPackage
@@ -5980,6 +6510,8 @@ self: {
        executableHaskellDepends = [ base mtl newtype she void ];
        description = "An experimental programming language with typed algebraic effects";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FreeTypeGL" = callPackage
@@ -5994,6 +6526,8 @@ self: {
        libraryHaskellDepends = [ base freetype2 OpenGL ];
        description = "Loadable texture fonts for OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FunGEn" = callPackage
@@ -6030,6 +6564,8 @@ self: {
        ];
        description = "Funge-98 interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GA" = callPackage
@@ -6054,6 +6590,8 @@ self: {
        executableHaskellDepends = [ base bimap ];
        description = "GGg cipher";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GHood" = callPackage
@@ -6078,6 +6616,8 @@ self: {
        librarySystemDepends = [ libGL libX11 libXext libXfixes ];
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;};
 
@@ -6092,6 +6632,8 @@ self: {
        librarySystemDepends = [ libX11 libXrandr ];
        description = "A binding for GLFW (OGL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
   "GLFW-b" = callPackage
@@ -6126,6 +6668,8 @@ self: {
        ];
        description = "GLFW-b demo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GLFW-task" = callPackage
@@ -6139,6 +6683,8 @@ self: {
        ];
        description = "GLFW utility functions to use together with monad-task";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GLHUI" = callPackage
@@ -6190,6 +6736,8 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw ];
        description = "Utilities for working with OpenGL matrices";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GLURaw" = callPackage
@@ -6255,6 +6803,8 @@ self: {
        ];
        description = "Parse GPX files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GPipe" = callPackage
@@ -6272,6 +6822,8 @@ self: {
        ];
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GPipe-Collada" = callPackage
@@ -6285,6 +6837,8 @@ self: {
        ];
        description = "Load GPipe meshes from Collada files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GPipe-Examples" = callPackage
@@ -6302,6 +6856,8 @@ self: {
        ];
        description = "Examples for the GPipes package";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GPipe-GLFW" = callPackage
@@ -6314,6 +6870,8 @@ self: {
        libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
        description = "GLFW OpenGL context creation for GPipe";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GPipe-TextureLoad" = callPackage
@@ -6325,6 +6883,8 @@ self: {
        libraryHaskellDepends = [ base bitmap GPipe stb-image ];
        description = "Load GPipe textures from filesystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GTALib" = callPackage
@@ -6343,6 +6903,8 @@ self: {
        ];
        description = "A library for GTA programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Gamgine" = callPackage
@@ -6364,6 +6926,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Some kind of game library or set of utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Ganymede" = callPackage
@@ -6381,6 +6945,8 @@ self: {
        ];
        description = "An Io interpreter in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GaussQuadIntegration" = callPackage
@@ -6408,6 +6974,8 @@ self: {
        ];
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GenI" = callPackage
@@ -6441,6 +7009,8 @@ self: {
        ];
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GenSmsPdu" = callPackage
@@ -6454,6 +7024,8 @@ self: {
        executableHaskellDepends = [ base haskell98 QuickCheck random ];
        description = "Automatic SMS message generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Genbank" = callPackage
@@ -6472,6 +7044,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "Libary for processing the NCBI genbank format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Gene-CluEDO" = callPackage
@@ -6497,6 +7071,8 @@ self: {
        ];
        description = "Hox gene clustering";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GeneralTicTacToe" = callPackage
@@ -6510,6 +7086,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A general TicTacToe game implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GenericPretty" = callPackage
@@ -6548,6 +7126,8 @@ self: {
        ];
        description = "MCFGs for Genus-1 RNA Pseudoknots";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GeoIp" = callPackage
@@ -6572,6 +7152,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring HTTP text ];
        description = "Geocoder and Reverse Geocoding Service Wrapper";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Geodetic" = callPackage
@@ -6605,6 +7187,8 @@ self: {
        libraryHaskellDepends = [ base GeomPredicates ];
        description = "Geometric predicates (Intel SSE)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Get" = callPackage
@@ -6617,6 +7201,8 @@ self: {
        testHaskellDepends = [ base constraints singletons ];
        description = "get stuff out of stuff";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GiST" = callPackage
@@ -6628,6 +7214,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A Haskell implementation of a Generalized Search Tree (GiST)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Gifcurry" = callPackage
@@ -6653,6 +7241,8 @@ self: {
        ];
        description = "GIF creation utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GiveYouAHead" = callPackage
@@ -6675,6 +7265,8 @@ self: {
        libraryHaskellDepends = [ base mtl split threepenny-gui ];
        description = "HTML Canvas graphics, animations and simulations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Glob" = callPackage
@@ -6708,6 +7300,8 @@ self: {
        libraryHaskellDepends = [ array base GlomeVec ];
        description = "Ray Tracing Library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GlomeVec" = callPackage
@@ -6737,6 +7331,8 @@ self: {
        ];
        description = "SDL Frontend for Glome ray tracer";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GoogleChart" = callPackage
@@ -6763,6 +7359,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "GoogleDirections" = callPackage
@@ -6778,6 +7376,8 @@ self: {
        ];
        description = "Haskell Interface to Google Directions API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GoogleSB" = callPackage
@@ -6793,6 +7393,8 @@ self: {
        ];
        description = "Interface to Google Safe Browsing API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GoogleSuggest" = callPackage
@@ -6820,6 +7422,8 @@ self: {
        ];
        description = "Interface to Google Translate API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GotoT-transformers" = callPackage
@@ -6831,6 +7435,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A monad and monadic transformer providing \"goto\" functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Grafos" = callPackage
@@ -6842,6 +7448,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Grafos Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GrammarProducts" = callPackage
@@ -6864,6 +7472,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Grammar products and higher-dimensional grammars";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Graph500" = callPackage
@@ -6882,6 +7492,8 @@ self: {
        executableHaskellDepends = [ array base mtl ];
        description = "Graph500 benchmark-related definitions and data set generator";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GraphHammer" = callPackage
@@ -6896,6 +7508,8 @@ self: {
        ];
        description = "GraphHammer Haskell graph analyses framework inspired by STINGER";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GraphHammer-examples" = callPackage
@@ -6913,6 +7527,8 @@ self: {
        ];
        description = "Test harness for TriangleCount analysis";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GraphSCC" = callPackage
@@ -6956,6 +7572,8 @@ self: {
        ];
        description = "Embedded grammar DSL and LALR parser generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GroteTrap" = callPackage
@@ -6973,6 +7591,8 @@ self: {
        ];
        description = "Parser and selection library for expression languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Grow" = callPackage
@@ -7015,6 +7635,8 @@ self: {
        ];
        description = "Notification utility for Growl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Gtk2hsGenerics" = callPackage
@@ -7030,6 +7652,8 @@ self: {
        ];
        description = "Convenience functions to extend Gtk2hs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GtkGLTV" = callPackage
@@ -7045,6 +7669,8 @@ self: {
        ];
        description = "OpenGL support for Gtk-based GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GtkTV" = callPackage
@@ -7058,6 +7684,8 @@ self: {
        ];
        description = "Gtk-based GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GuiHaskell" = callPackage
@@ -7076,6 +7704,8 @@ self: {
        ];
        description = "A graphical REPL and development environment for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GuiTV" = callPackage
@@ -7087,6 +7717,8 @@ self: {
        libraryHaskellDepends = [ base DeepArrow phooey TV TypeCompose ];
        description = "GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "H" = callPackage
@@ -7107,6 +7739,8 @@ self: {
        ];
        description = "The Haskell/R mixed programming environment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HABQT" = callPackage
@@ -7131,6 +7765,8 @@ self: {
        ];
        description = "Hierarchical adaptive Bayesian quantum tomography for quantum bits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HARM" = callPackage
@@ -7162,6 +7798,8 @@ self: {
        ];
        description = "HAppS data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HAppS-IxSet" = callPackage
@@ -7177,6 +7815,8 @@ self: {
          syb-with-class template-haskell
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HAppS-Server" = callPackage
@@ -7197,6 +7837,8 @@ self: {
        ];
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HAppS-State" = callPackage
@@ -7216,6 +7858,8 @@ self: {
        ];
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HAppS-Util" = callPackage
@@ -7232,6 +7876,8 @@ self: {
        ];
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HAppSHelpers" = callPackage
@@ -7266,6 +7912,8 @@ self: {
        ];
        description = "High-level library for building command line interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HCard" = callPackage
@@ -7279,6 +7927,8 @@ self: {
        ];
        description = "A library for implementing a Deck of Cards";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HCodecs" = callPackage
@@ -7330,6 +7980,8 @@ self: {
        librarySystemDepends = [ mysqlclient openssl zlib ];
        description = "MySQL driver for HDBC";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mysqlclient = null; inherit (pkgs) openssl; 
          inherit (pkgs) zlib;};
 
@@ -7380,6 +8032,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HDBC-session" = callPackage
@@ -7420,6 +8074,8 @@ self: {
        librarySystemDepends = [ pfstools ];
        description = "Utilities for reading, manipulating, and writing HDR images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) pfstools;};
 
   "HERA" = callPackage
@@ -7431,6 +8087,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ mpfr ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mpfr;};
 
   "HExcel" = callPackage
@@ -7447,6 +8105,8 @@ self: {
        librarySystemDepends = [ xlsxwriter zlib ];
        description = "Create Excel files with Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {xlsxwriter = null; inherit (pkgs) zlib;};
 
   "HFitUI" = callPackage
@@ -7468,6 +8128,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "The library for generating a graphical interface on the web";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HFrequencyQueue" = callPackage
@@ -7479,6 +8141,8 @@ self: {
        libraryHaskellDepends = [ base c-storable-deriving ];
        description = "A Queue with a random (weighted) pick function";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HFuse" = callPackage
@@ -7513,6 +8177,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "2D game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HGL" = callPackage
@@ -7871,6 +8537,8 @@ self: {
        ];
        description = "Graph database stored on disk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HHDL" = callPackage
@@ -7882,6 +8550,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Hardware Description Language embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HJScript" = callPackage
@@ -7893,6 +8563,8 @@ self: {
        libraryHaskellDepends = [ base HJavaScript hsp mtl text ];
        description = "HJScript is a Haskell EDSL for writing JavaScript programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HJVM" = callPackage
@@ -7915,6 +8587,8 @@ self: {
        ];
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) jdk;};
 
   "HJavaScript" = callPackage
@@ -7928,6 +8602,8 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "HJavaScript is an abstract syntax for a typed subset of JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HLearn-algebra" = callPackage
@@ -7947,6 +8623,8 @@ self: {
        ];
        description = "Algebraic foundation for homomorphic learning";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HLearn-approximation" = callPackage
@@ -7965,6 +8643,8 @@ self: {
          HLearn-datastructures HLearn-distributions list-extras vector
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HLearn-classification" = callPackage
@@ -7987,6 +8667,8 @@ self: {
          QuickCheck statistics vector vector-th-unbox
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HLearn-datastructures" = callPackage
@@ -8002,6 +8684,8 @@ self: {
          MonadRandom QuickCheck vector
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HLearn-distributions" = callPackage
@@ -8025,6 +8709,8 @@ self: {
        ];
        description = "Distributions for use with the HLearn library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HList" = callPackage
@@ -8050,6 +8736,8 @@ self: {
        ];
        description = "Heterogeneous lists";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HListPP" = callPackage
@@ -8077,6 +8765,8 @@ self: {
        executableHaskellDepends = [ base old-locale time ];
        description = "Simple, concurrent and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HMM" = callPackage
@@ -8087,6 +8777,8 @@ self: {
        sha256 = "01y8l76c56gysynbilp32yq0wfc129hl24siw8s9fmpn98qa71s6";
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HMap" = callPackage
@@ -8142,6 +8834,8 @@ self: {
        ];
        description = "Happy Network Manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HNumeric" = callPackage
@@ -8172,6 +8866,8 @@ self: {
        librarySystemDepends = [ ode ];
        description = "Binding to libODE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ode;};
 
   "HOpenCV" = callPackage
@@ -8188,6 +8884,8 @@ self: {
        executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) opencv;};
 
   "HPDF" = callPackage
@@ -8212,6 +8910,8 @@ self: {
        testHaskellDepends = [ base HTF ];
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HPath" = callPackage
@@ -8234,6 +8934,8 @@ self: {
        ];
        description = "Extract Haskell declarations by name";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HPhone" = callPackage
@@ -8263,6 +8965,8 @@ self: {
        librarySystemDepends = [ bcm2835 ];
        description = "GPIO, I2C and SPI functions for the Raspberry Pi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {bcm2835 = null;};
 
   "HPlot" = callPackage
@@ -8280,6 +8984,8 @@ self: {
        executablePkgconfigDepends = [ plplotd-gnome2 ];
        description = "A minimal monadic PLplot interface for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {plplotd-gnome2 = null;};
 
   "HPong" = callPackage
@@ -8298,6 +9004,8 @@ self: {
        ];
        description = "A simple OpenGL Pong game based on GLFW";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT" = callPackage
@@ -8315,6 +9023,8 @@ self: {
        ];
        description = "Haskell binding to the ROOT data analysis framework";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT-core" = callPackage
@@ -8328,6 +9038,8 @@ self: {
        ];
        description = "Haskell binding to ROOT Core modules";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT-graf" = callPackage
@@ -8343,6 +9055,8 @@ self: {
        ];
        description = "Haskell binding to ROOT Graf modules";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT-hist" = callPackage
@@ -8358,6 +9072,8 @@ self: {
        ];
        description = "Haskell binding to ROOT Hist modules";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT-io" = callPackage
@@ -8373,6 +9089,8 @@ self: {
        ];
        description = "Haskell binding to ROOT IO modules";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT-math" = callPackage
@@ -8388,6 +9106,8 @@ self: {
        ];
        description = "Haskell binding to ROOT Math modules";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT-tree" = callPackage
@@ -8403,6 +9123,8 @@ self: {
        ];
        description = "Haskell binding to ROOT Tree modules";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HRay" = callPackage
@@ -8417,6 +9139,8 @@ self: {
        executableHaskellDepends = [ array base directory haskell98 ];
        description = "Haskell raytracer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSFFIG" = callPackage
@@ -8437,6 +9161,8 @@ self: {
        ];
        description = "Generate FFI import declarations from C include files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSGEP" = callPackage
@@ -8455,6 +9181,8 @@ self: {
        executableHaskellDepends = [ csv ];
        description = "Gene Expression Programming evolutionary algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSH" = callPackage
@@ -8491,6 +9219,8 @@ self: {
        ];
        description = "Convenience functions that use HSH, instances for HSH";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSet" = callPackage
@@ -8502,6 +9232,8 @@ self: {
        libraryHaskellDepends = [ base containers hashable hashtables ];
        description = "Faux heterogeneous sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSlippyMap" = callPackage
@@ -8531,6 +9263,8 @@ self: {
        testHaskellDepends = [ aeson attoparsec base HTF text ];
        description = "Small template engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSoM" = callPackage
@@ -8562,6 +9296,8 @@ self: {
        ];
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HStringTemplate" = callPackage
@@ -8598,6 +9334,8 @@ self: {
        ];
        description = "Convenience functions and instances for HStringTemplate";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSvm" = callPackage
@@ -8644,6 +9382,8 @@ self: {
        ];
        description = "The Haskell Test Framework";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HTTP" = callPackage
@@ -8696,6 +9436,8 @@ self: {
        ];
        description = "Tableau based theorem prover for hybrid logics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HTicTacToe" = callPackage
@@ -8713,6 +9455,8 @@ self: {
        ];
        description = "An SDL tic-tac-toe game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HUnit" = callPackage
@@ -8736,6 +9480,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ];
        description = "Assertions for HUnit with difference reporting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HUnit-Plus" = callPackage
@@ -8795,6 +9541,8 @@ self: {
        ];
        description = "A (prototyped) easy to use XMPP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HXQ" = callPackage
@@ -8812,6 +9560,8 @@ self: {
        ];
        description = "A Compiler from XQuery to Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaLeX" = callPackage
@@ -8826,6 +9576,8 @@ self: {
        libraryHaskellDepends = [ base HUnit mtl QuickCheck ];
        description = "HaLeX enables modelling, manipulation and visualization of regular languages";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaMinitel" = callPackage
@@ -8837,6 +9589,8 @@ self: {
        libraryHaskellDepends = [ base bytestring serialport stm ];
        description = "An Haskell library to drive the french Minitel through a serial port";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaPy" = callPackage
@@ -8848,6 +9602,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell th-lift ];
        description = "Haskell bindings for Python";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaRe" = callPackage
@@ -8882,6 +9638,8 @@ self: {
        ];
        description = "the Haskell Refactorer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaTeX" = callPackage
@@ -8920,6 +9678,8 @@ self: {
        ];
        description = "This package is deprecated. From version 3, HaTeX does not need this anymore.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaTeX-qq" = callPackage
@@ -8935,6 +9695,8 @@ self: {
        ];
        description = "Quasiquoters for HaTeX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaVSA" = callPackage
@@ -8954,6 +9716,8 @@ self: {
        ];
        description = "An implementation of the Version Space Algebra learning framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaXml" = callPackage
@@ -8990,6 +9754,8 @@ self: {
        executableHaskellDepends = [ text time vty vty-ui ];
        description = "Simple chat";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HackMail" = callPackage
@@ -9010,6 +9776,8 @@ self: {
        ];
        description = "A Procmail Replacement as Haskell EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Haggressive" = callPackage
@@ -9027,6 +9795,8 @@ self: {
        testHaskellDepends = [ base Cabal containers HUnit tuple vector ];
        description = "Aggression analysis for Tweets on Twitter";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HandlerSocketClient" = callPackage
@@ -9038,6 +9808,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Haskell implementation of a HandlerSocket client (API)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HandsomeSoup" = callPackage
@@ -9072,6 +9844,8 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "The classic game of Hangman";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HappyTree" = callPackage
@@ -9089,6 +9863,8 @@ self: {
        ];
        description = "Type Safe and End to End Decision Tree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HarmTrace" = callPackage
@@ -9112,6 +9888,8 @@ self: {
        ];
        description = "Harmony Analysis and Retrieval of Music";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HarmTrace-Base" = callPackage
@@ -9161,6 +9939,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Haskell bindings for CacBDD";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {CacBDD = null;};
 
   "HasGP" = callPackage
@@ -9177,6 +9957,8 @@ self: {
        ];
        description = "A Haskell library for inference using Gaussian processes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Haschoo" = callPackage
@@ -9195,6 +9977,8 @@ self: {
        ];
        description = "Minimalist R5RS Scheme interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hashell" = callPackage
@@ -9213,6 +9997,8 @@ self: {
        ];
        description = "Simple shell written in Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskRel" = callPackage
@@ -9229,6 +10015,8 @@ self: {
        ];
        description = "HaskRel, Haskell as a DBMS with support for the relational algebra";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellAnalysisProgram" = callPackage
@@ -9252,6 +10040,8 @@ self: {
        ];
        description = "Haskell source code analysis program";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellForMaths" = callPackage
@@ -9274,6 +10064,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellNN" = callPackage
@@ -9285,6 +10077,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix random ];
        description = "High Performance Neural Network in Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellNet" = callPackage
@@ -9303,6 +10097,8 @@ self: {
        ];
        description = "Client support for POP3, SMTP, and IMAP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellNet-SSL" = callPackage
@@ -9319,6 +10115,8 @@ self: {
        ];
        description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellTorrent" = callPackage
@@ -9342,6 +10140,8 @@ self: {
        ];
        description = "A concurrent bittorrent client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellTutorials" = callPackage
@@ -9355,6 +10155,8 @@ self: {
        executableHaskellDepends = [ base cmdargs text ];
        description = "Haskell Tutorials by Evgeny Ukhanov";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Haskelloids" = callPackage
@@ -9372,6 +10174,8 @@ self: {
        ];
        description = "A reproduction of the Atari 1979 classic \"Asteroids\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hastodon" = callPackage
@@ -9413,6 +10217,8 @@ self: {
        ];
        description = "A small 2D game framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hawk" = callPackage
@@ -9434,6 +10240,8 @@ self: {
        ];
        description = "Haskell Web Application Kit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hayoo" = callPackage
@@ -9460,6 +10268,8 @@ self: {
        ];
        description = "The Hayoo! search engine for Haskell API search on hackage";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hclip" = callPackage
@@ -9492,6 +10302,8 @@ self: {
        ];
        description = "Line oriented editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HerbiePlugin" = callPackage
@@ -9510,6 +10322,8 @@ self: {
        testHaskellDepends = [ base linear subhask ];
        description = "automatically improve your code's numeric stability";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hermes" = callPackage
@@ -9528,6 +10342,8 @@ self: {
        ];
        description = "Message-based middleware layer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hieroglyph" = callPackage
@@ -9545,6 +10361,8 @@ self: {
        ];
        description = "Purely functional 2D graphics for visualization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HiggsSet" = callPackage
@@ -9561,6 +10379,8 @@ self: {
        ];
        description = "A multi-index set with advanced query capabilites";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hipmunk" = callPackage
@@ -9587,6 +10407,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Useful functions for Hipmunk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HipmunkPlayground" = callPackage
@@ -9624,6 +10446,8 @@ self: {
          base directory MissingH process regex-tdfa time
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Histogram" = callPackage
@@ -9651,6 +10475,8 @@ self: {
        ];
        description = "An MPD client designed for a Home Theatre PC";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hoed" = callPackage
@@ -9675,6 +10501,8 @@ self: {
        testHaskellDepends = [ base process QuickCheck ];
        description = "Lightweight algorithmic debugging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HoleyMonoid" = callPackage
@@ -9748,6 +10576,8 @@ self: {
        ];
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Holumbus-Storage" = callPackage
@@ -9798,6 +10628,8 @@ self: {
        testHaskellDepends = [ base process random ];
        description = "A Simple Key Value Store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HostAndPort" = callPackage
@@ -9824,6 +10656,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "A Cricket scoring application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hs2lib" = callPackage
@@ -9851,6 +10685,8 @@ self: {
        testHaskellDepends = [ base directory filepath process ];
        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;
+       broken = true;
      }) {};
 
   "HsASA" = callPackage
@@ -9882,6 +10718,8 @@ self: {
        ];
        description = "Bindings to htslib";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "HsHaruPDF" = callPackage
@@ -9893,6 +10731,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell binding to libharu (http://libharu.sourceforge.net/)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HsHyperEstraier" = callPackage
@@ -9909,6 +10749,8 @@ self: {
        libraryPkgconfigDepends = [ hyperestraier qdbm ];
        description = "HyperEstraier binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {hyperestraier = null; qdbm = null;};
 
   "HsJudy" = callPackage
@@ -9922,6 +10764,8 @@ self: {
        librarySystemDepends = [ Judy ];
        description = "Judy bindings, and some nice APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
@@ -9961,6 +10805,8 @@ self: {
        ];
        description = "Haskell integration with Parrot virtual machine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HsPerl5" = callPackage
@@ -9972,6 +10818,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to embedded Perl 5 interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HsSVN" = callPackage
@@ -9983,6 +10831,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl stm ];
        description = "Partial Subversion (SVN) binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HsSyck" = callPackage
@@ -10031,6 +10881,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Webots bindings for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {Controller = null; driver = null;};
 
   "HsYAML" = callPackage
@@ -10095,6 +10947,8 @@ self: {
        ];
        description = "Stream Editor in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hsmtlib" = callPackage
@@ -10112,6 +10966,8 @@ self: {
        ];
        description = "Haskell library for easy interaction with SMT-LIB 2 compliant solvers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HueAPI" = callPackage
@@ -10127,6 +10983,8 @@ self: {
        ];
        description = "API for controlling Philips Hue lights";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HulkImport" = callPackage
@@ -10144,6 +11002,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Easily bulk import CSV data to SQL Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hungarian-Munkres" = callPackage
@@ -10181,6 +11041,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "The library for generating a WebGL scene for the web";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "I1M" = callPackage
@@ -10195,6 +11057,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Code for the Haskell course taught at the University of Seville";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IDynamic" = callPackage
@@ -10206,6 +11070,8 @@ self: {
        libraryHaskellDepends = [ base containers directory ];
        description = "Indexable, serializable form of Data.Dynamic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IFS" = callPackage
@@ -10221,6 +11087,8 @@ self: {
        ];
        description = "Iterated Function System generation for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "INblobs" = callPackage
@@ -10240,6 +11108,8 @@ self: {
        ];
        description = "Editor and interpreter for Interaction Nets";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IOR" = callPackage
@@ -10252,6 +11122,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IORefCAS" = callPackage
@@ -10270,6 +11142,8 @@ self: {
        ];
        description = "Atomic compare and swap for IORefs and STRefs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IOSpec" = callPackage
@@ -10327,6 +11201,8 @@ self: {
        ];
        description = "A RESTful microService for IPv6-related data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IcoGrid" = callPackage
@@ -10338,6 +11214,8 @@ self: {
        libraryHaskellDepends = [ array base GlomeVec ];
        description = "Library for generating grids of hexagons and pentagons mapped to a sphere";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IfElse" = callPackage
@@ -10371,6 +11249,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "A library for writing Imperative style haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IndentParser" = callPackage
@@ -10393,6 +11273,8 @@ self: {
        libraryHaskellDepends = [ base PeanoWitnesses ];
        description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "InfixApplicative" = callPackage
@@ -10404,6 +11286,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "liftA2 for infix operators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IntFormats" = callPackage
@@ -10416,6 +11300,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Convert integers in various bases to and from strings";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IntGraph" = callPackage
@@ -10514,6 +11400,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "DSL for IRC bots";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IrrHaskell" = callPackage
@@ -10545,6 +11433,8 @@ self: {
        ];
        description = "A typeclass to determine if a given value is null";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JSON-Combinator" = callPackage
@@ -10562,6 +11452,8 @@ self: {
        ];
        description = "A combinator library on top of a generalised JSON type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JSON-Combinator-Examples" = callPackage
@@ -10575,6 +11467,8 @@ self: {
        ];
        description = "Example uses of the JSON-Combinator library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JSONParser" = callPackage
@@ -10606,6 +11500,8 @@ self: {
        ];
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JYU-Utils" = callPackage
@@ -10625,6 +11521,8 @@ self: {
        ];
        description = "Some utility functions for JYU projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JackMiniMix" = callPackage
@@ -10636,6 +11534,8 @@ self: {
        libraryHaskellDepends = [ base hosc ];
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Javasf" = callPackage
@@ -10652,6 +11552,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "Javav" = callPackage
@@ -10665,6 +11567,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Jazzkell" = callPackage
@@ -10688,6 +11592,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JsContracts" = callPackage
@@ -10710,6 +11616,8 @@ self: {
        ];
        description = "Design-by-contract for JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JsonGrammar" = callPackage
@@ -10731,6 +11639,8 @@ self: {
        ];
        description = "Combinators for bidirectional JSON parsing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JuPyTer-notebook" = callPackage
@@ -10747,6 +11657,8 @@ self: {
        ];
        description = "JuPyTer notebook parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JuicyPixels" = callPackage
@@ -10786,6 +11698,8 @@ self: {
        ];
        description = "BLP format decoder/encoder over JuicyPixels library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JuicyPixels-blurhash" = callPackage
@@ -10826,6 +11740,8 @@ self: {
        libraryHaskellDepends = [ base containers JuicyPixels ];
        description = "Functions for drawing lines, squares and so on pixel by pixel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JuicyPixels-extra" = callPackage
@@ -10917,6 +11833,8 @@ self: {
          filepath mtl network resourcet
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JunkDB-driver-gdbm" = callPackage
@@ -10931,6 +11849,8 @@ self: {
          base bytestring conduit directory filepath JunkDB mtl resourcet
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JunkDB-driver-hashtables" = callPackage
@@ -10945,6 +11865,8 @@ self: {
          base bytestring conduit hashable hashtables JunkDB mtl resourcet
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JustParse" = callPackage
@@ -10956,6 +11878,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple and comprehensive Haskell parsing library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "KMP" = callPackage
@@ -10979,6 +11903,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library with the kerbal space program universe and demo code";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Kalman" = callPackage
@@ -10990,6 +11916,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "A slightly extended Kalman filter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "KdTree" = callPackage
@@ -11017,6 +11945,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "KiCS" = callPackage
@@ -11115,6 +12045,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Category for Continuation Passing Style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Kulitta" = callPackage
@@ -11145,6 +12077,8 @@ self: {
        librarySystemDepends = [ kyotocabinet ];
        description = "Kyoto Cabinet DB bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) kyotocabinet;};
 
   "L-seed" = callPackage
@@ -11162,6 +12096,8 @@ self: {
        ];
        description = "Plant growing programming game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LATS" = callPackage
@@ -11178,6 +12114,8 @@ self: {
        librarySystemDepends = [ openblasCompat ];
        description = "Linear Algebra on Typed Spaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openblasCompat;};
 
   "LC3" = callPackage
@@ -11232,6 +12170,8 @@ self: {
        ];
        description = "Lightweight Directory Access Protocol (LDAP) version 3";
        license = stdenv.lib.licenses.gpl2Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LParse" = callPackage
@@ -11255,6 +12195,8 @@ self: {
        libraryHaskellDepends = [ base containers QuickCheck ];
        description = "Implements an LRU data structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LTS" = callPackage
@@ -11275,6 +12217,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion time ];
        description = "LTS: Labelled Transition System";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LTree" = callPackage
@@ -11335,6 +12279,8 @@ self: {
        ];
        description = "A type-safe EDSL for TouchDesigner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LambdaHack" = callPackage
@@ -11367,6 +12313,8 @@ self: {
        testHaskellDepends = [ async base filepath optparse-applicative ];
        description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LambdaINet" = callPackage
@@ -11386,6 +12334,8 @@ self: {
        ];
        description = "Graphical Interaction Net Evaluator for Optimal Evaluation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LambdaNet" = callPackage
@@ -11401,6 +12351,8 @@ self: {
        ];
        description = "A configurable and extensible neural network library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LambdaPrettyQuote" = callPackage
@@ -11425,6 +12377,8 @@ self: {
        ];
        description = "Quasiquoter, and Arbitrary helpers for the lambda calculus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LambdaShell" = callPackage
@@ -11442,6 +12396,8 @@ self: {
        ];
        description = "Simple shell for evaluating lambda expressions";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Lambdajudge" = callPackage
@@ -11454,6 +12410,8 @@ self: {
        testHaskellDepends = [ base filepath hspec mtl process text ];
        description = "A library to easily host Haskell based programming competitions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Lambdaya" = callPackage
@@ -11470,6 +12428,8 @@ self: {
        ];
        description = "Library for RedPitaya";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LargeCardinalHierarchy" = callPackage
@@ -11498,6 +12458,8 @@ self: {
        ];
        description = "A library for compiling programs in a variety of languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Lattices" = callPackage
@@ -11547,6 +12509,8 @@ self: {
        executableHaskellDepends = [ base directory filepath unix ];
        description = "A simple sandboxing tool for Haskell packages";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Learning" = callPackage
@@ -11562,6 +12526,8 @@ self: {
        testHaskellDepends = [ base containers hmatrix vector ];
        description = "The most frequently used machine learning tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Level0" = callPackage
@@ -11575,6 +12541,8 @@ self: {
        executableHaskellDepends = [ base directory random SDL SDL-ttf ];
        description = "A Snake II clone written using SDL";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LibClang" = callPackage
@@ -11595,6 +12563,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for libclang (a C++ parsing library)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (self.llvmPackages) clang; inherit (pkgs) ncurses;};
 
   "LibZip" = callPackage
@@ -11625,6 +12595,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Wrapper for data that can be unbounded";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LinearSplit" = callPackage
@@ -11639,6 +12611,8 @@ self: {
        ];
        description = "Partition the sequence of items to the subsequences in the order given";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LinguisticsTypes" = callPackage
@@ -11683,6 +12657,8 @@ self: {
        ];
        description = "Check a bunch of local html files for broken links";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Liquorice" = callPackage
@@ -11695,6 +12671,8 @@ self: {
        testHaskellDepends = [ base binary bytestring HTF mtl ];
        description = "Algorithmic Doom map generation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "List" = callPackage
@@ -11747,6 +12725,8 @@ self: {
        ];
        description = "List transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ListTree" = callPackage
@@ -11799,6 +12779,8 @@ self: {
        doHaddock = false;
        description = "Converter to convert from .lhs to .md and vice versa.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Logic" = callPackage
@@ -11810,6 +12792,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Logic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LogicGrowsOnTrees" = callPackage
@@ -11846,6 +12830,8 @@ self: {
        benchmarkHaskellDepends = [ base cereal criterion deepseq ];
        description = "a parallel implementation of logic programming using distributed tree exploration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LogicGrowsOnTrees-MPI" = callPackage
@@ -11867,6 +12853,8 @@ self: {
        librarySystemDepends = [ openmpi ];
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openmpi;};
 
   "LogicGrowsOnTrees-network" = callPackage
@@ -11892,6 +12880,8 @@ self: {
        ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LogicGrowsOnTrees-processes" = callPackage
@@ -11918,6 +12908,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion LogicGrowsOnTrees ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LslPlus" = callPackage
@@ -11938,6 +12930,8 @@ self: {
        ];
        description = "An execution and testing framework for the Linden Scripting Language (LSL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Lucu" = callPackage
@@ -11958,6 +12952,8 @@ self: {
        ];
        description = "HTTP Daemonic Library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Lykah" = callPackage
@@ -11986,6 +12982,8 @@ self: {
        ];
        description = "A static website and blog generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MASMGen" = callPackage
@@ -11998,6 +12996,8 @@ self: {
        testHaskellDepends = [ base containers mtl ];
        description = "Generate MASM code from haskell";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MBot" = callPackage
@@ -12009,6 +13009,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MC-Fold-DP" = callPackage
@@ -12027,6 +13029,8 @@ self: {
        executableHaskellDepends = [ cmdargs split ];
        description = "Folding algorithm based on nucleotide cyclic motifs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MFlow" = callPackage
@@ -12052,6 +13056,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "stateful, RESTful web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MHask" = callPackage
@@ -12063,6 +13069,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The category of monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MIP" = callPackage
@@ -12090,6 +13098,8 @@ self: {
        ];
        description = "Library for using Mixed Integer Programming (MIP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MSQueue" = callPackage
@@ -12101,6 +13111,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        description = "Michael-Scott queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MTGBuilder" = callPackage
@@ -12114,6 +13126,8 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Builds decks out of a meta";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MagicHaskeller" = callPackage
@@ -12143,6 +13157,8 @@ self: {
        ];
        description = "Automatic inductive functional programmer by systematic search";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MailchimpSimple" = callPackage
@@ -12161,6 +13177,8 @@ self: {
        ];
        description = "Haskell library to interact with Mailchimp JSON API Version 3.0";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Map" = callPackage
@@ -12177,6 +13195,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Class of key-value maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MapWith" = callPackage
@@ -12201,6 +13221,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mapping";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MaybeT" = callPackage
@@ -12214,6 +13236,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "MaybeT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MaybeT-monads-tf" = callPackage
@@ -12225,6 +13249,8 @@ self: {
        libraryHaskellDepends = [ base monads-tf transformers ];
        description = "MaybeT monad transformer compatible with monads-tf (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MaybeT-transformers" = callPackage
@@ -12236,6 +13262,8 @@ self: {
        libraryHaskellDepends = [ base monads-fd transformers ];
        description = "MaybeT monad transformer using transformers instead of mtl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MazesOfMonad" = callPackage
@@ -12255,6 +13283,8 @@ self: {
        ];
        description = "Console-based Role Playing Game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MeanShift" = callPackage
@@ -12266,6 +13296,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Mean shift algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Measure" = callPackage
@@ -12277,6 +13309,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for units of measurement";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Mecha" = callPackage
@@ -12288,6 +13322,8 @@ self: {
        libraryHaskellDepends = [ base machines ];
        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;
+       broken = true;
      }) {};
 
   "Mechs" = callPackage
@@ -12299,6 +13335,8 @@ self: {
        libraryHaskellDepends = [ base machines ];
        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;
+       broken = true;
      }) {};
 
   "MemoTrie" = callPackage
@@ -12327,6 +13365,8 @@ self: {
        ];
        description = "Statically checked database access";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MetaObject" = callPackage
@@ -12338,6 +13378,8 @@ self: {
        libraryHaskellDepends = [ base containers stringtable-atom ];
        description = "A meta-object system for Haskell based on Perl 6";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Metrics" = callPackage
@@ -12349,6 +13391,8 @@ self: {
        libraryHaskellDepends = [ base hstats ];
        description = "Evaluation metrics commonly used in supervised machine learning";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Mhailist" = callPackage
@@ -12367,6 +13411,8 @@ self: {
        ];
        description = "Haskell mailing list manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Michelangelo" = callPackage
@@ -12383,6 +13429,8 @@ self: {
        ];
        description = "OpenGL for dummies";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MicrosoftTranslator" = callPackage
@@ -12399,6 +13447,8 @@ self: {
        ];
        description = "Interface for Microsoft Translator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MiniAgda" = callPackage
@@ -12481,6 +13531,8 @@ self: {
        libraryHaskellDepends = [ anydbm base MissingH ];
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Mobile-Legends-Hack-Cheats" = callPackage
@@ -12503,6 +13555,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Modulo" = callPackage
@@ -12528,6 +13582,8 @@ self: {
        executableHaskellDepends = [ base GLUT random ];
        description = "A FRP library based on signal functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MoeDict" = callPackage
@@ -12543,6 +13599,8 @@ self: {
        ];
        description = "Utilities working with MoeDict.tw JSON dataset";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadCatchIO-mtl" = callPackage
@@ -12558,6 +13616,8 @@ self: {
        ];
        description = "Monad-transformer version of the Control.Exception module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadCatchIO-mtl-foreign" = callPackage
@@ -12569,6 +13629,8 @@ self: {
        libraryHaskellDepends = [ base MonadCatchIO-mtl mtl primitive ];
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadCatchIO-transformers" = callPackage
@@ -12584,6 +13646,8 @@ self: {
        ];
        description = "Monad-transformer compatible version of the Control.Exception module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadCatchIO-transformers-foreign" = callPackage
@@ -12599,6 +13663,8 @@ self: {
        ];
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadCompose" = callPackage
@@ -12610,6 +13676,8 @@ self: {
        libraryHaskellDepends = [ base free mmorph mtl transformers ];
        description = "Methods for composing monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadLab" = callPackage
@@ -12626,6 +13694,8 @@ self: {
        executableHaskellDepends = [ base haskell98 process ];
        description = "Automatically generate layered monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadPrompt" = callPackage
@@ -12674,6 +13744,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalizing lift to monad stacks";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Monadius" = callPackage
@@ -12688,6 +13760,8 @@ self: {
        executableHaskellDepends = [ array base directory GLUT OpenGL ];
        description = "2-D arcade scroller";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Monadoro" = callPackage
@@ -12703,6 +13777,8 @@ self: {
        testHaskellDepends = [ ansi-terminal base doctest process time ];
        description = "A minimalistic CLI Pomodoro timer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Monaris" = callPackage
@@ -12721,6 +13797,8 @@ self: {
        ];
        description = "A simple tetris clone";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Monatron" = callPackage
@@ -12732,6 +13810,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monad transformer library with uniform liftings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Monatron-IO" = callPackage
@@ -12743,6 +13823,8 @@ self: {
        libraryHaskellDepends = [ base Monatron transformers ];
        description = "MonadIO instances for the Monatron transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Monocle" = callPackage
@@ -12754,6 +13836,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "Symbolic computations in strict monoidal categories with LaTeX output";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MorseCode" = callPackage
@@ -12785,6 +13869,8 @@ self: {
        ];
        description = "Automated Mutation Testing";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MuCheck-HUnit" = callPackage
@@ -12799,6 +13885,8 @@ self: {
        executableHaskellDepends = [ base HUnit MuCheck ];
        description = "Automated Mutation Testing for HUnit tests";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MuCheck-Hspec" = callPackage
@@ -12813,6 +13901,8 @@ self: {
        executableHaskellDepends = [ base hspec hspec-core MuCheck ];
        description = "Automated Mutation Testing for Hspec tests";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MuCheck-QuickCheck" = callPackage
@@ -12827,6 +13917,8 @@ self: {
        executableHaskellDepends = [ base MuCheck QuickCheck ];
        description = "Automated Mutation Testing for QuickCheck tests";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MuCheck-SmallCheck" = callPackage
@@ -12841,6 +13933,8 @@ self: {
        executableHaskellDepends = [ base MuCheck smallcheck ];
        description = "Automated Mutation Testing for SmallCheck tests";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Munkres" = callPackage
@@ -12863,6 +13957,8 @@ self: {
        libraryHaskellDepends = [ array base bimap containers Munkres ];
        description = "Simple and typesafe layer over the Munkres package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MusicBrainz" = callPackage
@@ -12929,6 +14025,8 @@ self: {
        ];
        description = "Most likely order of mutation events in RNA";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MyPrimes" = callPackage
@@ -12944,6 +14042,8 @@ self: {
        benchmarkHaskellDepends = [ base time ];
        description = "Generate all primes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NGrams" = callPackage
@@ -12957,6 +14057,8 @@ self: {
        executableHaskellDepends = [ base HCL HTTP network regex-compat ];
        description = "Simple application for calculating n-grams using Google";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NMap" = callPackage
@@ -12968,6 +14070,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A transparent nested Map structure";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NTRU" = callPackage
@@ -13008,6 +14112,8 @@ self: {
        ];
        description = "A Haskell interface to Lego Mindstorms NXT";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {bluetooth = null;};
 
   "NXTDSL" = callPackage
@@ -13026,6 +14132,8 @@ self: {
        ];
        description = "Generate NXC Code from DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NaCl" = callPackage
@@ -13074,6 +14182,8 @@ self: {
        executableHaskellDepends = [ base uu-parsinglib ];
        description = "Very small interpreter for a Prolog-like language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Naperian" = callPackage
@@ -13100,6 +14210,8 @@ self: {
        executableHaskellDepends = [ base hnetcdf Naperian split ];
        description = "Instances of NcStore for hypercuboids";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NaturalLanguageAlphabets" = callPackage
@@ -13129,6 +14241,8 @@ self: {
        ];
        description = "Simple scoring schemes for word alignments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NaturalSort" = callPackage
@@ -13142,6 +14256,8 @@ self: {
        libraryHaskellDepends = [ base bytestring strict ];
        description = "Natural sorting for strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NearContextAlgebra" = callPackage
@@ -13159,6 +14275,8 @@ self: {
        ];
        description = "Context Algebra of near";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Neks" = callPackage
@@ -13181,6 +14299,8 @@ self: {
        ];
        description = "Simple networked key/value store";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NestedFunctor" = callPackage
@@ -13192,6 +14312,8 @@ self: {
        libraryHaskellDepends = [ base comonad distributive ];
        description = "Nested composition of functors with a type index tracking nesting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NestedSampling" = callPackage
@@ -13216,6 +14338,8 @@ self: {
        testHaskellDepends = [ base bytestring HUnit process ];
        description = "Bindings for net-snmp's C API for clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {net_snmp = null;};
 
   "Network-NineP" = callPackage
@@ -13279,6 +14403,8 @@ self: {
        ];
        description = "Ninja game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NoHoed" = callPackage
@@ -13309,6 +14435,8 @@ self: {
        ];
        description = "Microbenchmarks for various array libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NoTrace" = callPackage
@@ -13321,6 +14449,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Remove all the functions come from Debug.Trace after debugging";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Noise" = callPackage
@@ -13351,6 +14481,8 @@ self: {
        ];
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Nomyx-Core" = callPackage
@@ -13377,6 +14509,8 @@ self: {
        ];
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Nomyx-Language" = callPackage
@@ -13396,6 +14530,8 @@ self: {
        ];
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Nomyx-Rules" = callPackage
@@ -13413,6 +14549,8 @@ self: {
        ];
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Nomyx-Web" = callPackage
@@ -13437,6 +14575,8 @@ self: {
        ];
        description = "Web gui for Nomyx";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NonEmpty" = callPackage
@@ -13448,6 +14588,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library providing a non-empty list datatype, and total functions operating on it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NonEmptyList" = callPackage
@@ -13464,6 +14606,8 @@ self: {
        ];
        description = "A list with a length of at least one";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NumInstances" = callPackage
@@ -13497,6 +14641,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NumberTheory" = callPackage
@@ -13509,6 +14655,8 @@ self: {
        testHaskellDepends = [ base containers HUnit primes ];
        description = "A library for number theoretic computations, written in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Numbers" = callPackage
@@ -13537,6 +14685,8 @@ self: {
        ];
        description = "Nussinov78 using the ADPfusion library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Nutri" = callPackage
@@ -13548,6 +14698,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A little library to calculate nutrition values of food items";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OGL" = callPackage
@@ -13559,6 +14711,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A context aware binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ONC-RPC" = callPackage
@@ -13583,6 +14737,8 @@ self: {
        executableHaskellDepends = [ base filepath ];
        description = "ONC RPC (aka Sun RPC) and XDR library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OSM" = callPackage
@@ -13598,6 +14754,8 @@ self: {
        ];
        description = "Parse OpenStreetMap files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OTP" = callPackage
@@ -13617,6 +14775,8 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit time ];
        description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Object" = callPackage
@@ -13628,6 +14788,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc template-haskell ];
        description = "Object oriented programming for haskell using multiparameter typeclasses";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ObjectIO" = callPackage
@@ -13643,6 +14805,8 @@ self: {
          winspool
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {comctl32 = null; comdlg32 = null; gdi32 = null; 
          kernel32 = null; ole32 = null; shell32 = null; user32 = null; 
          winmm = null; winspool = null;};
@@ -13691,6 +14855,8 @@ self: {
        ];
        description = "Simple unbalanced Octree for storing data about 3D points";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OddWord" = callPackage
@@ -13704,6 +14870,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Provides a wrapper for deriving word types with fewer bits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Omega" = callPackage
@@ -13716,6 +14884,8 @@ self: {
        testHaskellDepends = [ base containers HUnit ];
        description = "Integer sets and relations using Presburger arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OnRmt" = callPackage
@@ -13752,6 +14922,8 @@ self: {
        ];
        description = "Text UI library for performing parallel remote SSH operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OneTuple" = callPackage
@@ -13792,6 +14964,8 @@ self: {
        ];
        description = "IBM AFP document format parser and generator";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenAFP-Utils" = callPackage
@@ -13812,6 +14986,8 @@ self: {
        ];
        description = "Assorted utilities to work with AFP data streams";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenAL" = callPackage
@@ -13844,6 +15020,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell high-level wrapper for OpenCL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OpenCL = null;};
 
   "OpenCLRaw" = callPackage
@@ -13855,6 +15033,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenCLWrappers" = callPackage
@@ -13866,6 +15046,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenGL" = callPackage
@@ -13897,6 +15079,8 @@ self: {
        ];
        description = "Quickcheck instances for various data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenGLRaw" = callPackage
@@ -13944,6 +15128,8 @@ self: {
        ];
        description = "ADT wrapper and renderer for OpenSCAD models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenVG" = callPackage
@@ -13955,6 +15141,8 @@ self: {
        libraryHaskellDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ];
        description = "OpenVG (ShivaVG-0.2.1) binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenVGRaw" = callPackage
@@ -13966,6 +15154,8 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw ];
        description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation).";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Operads" = callPackage
@@ -13977,6 +15167,8 @@ self: {
        libraryHaskellDepends = [ array base containers mtl ];
        description = "Groebner basis computation for Operads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OptDir" = callPackage
@@ -14004,6 +15196,8 @@ self: {
        ];
        description = "A quasiquoter for or-patterns";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OrchestrateDB" = callPackage
@@ -14023,6 +15217,8 @@ self: {
        ];
        description = "Unofficial Haskell Client Library for the Orchestrate.io API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OrderedBits" = callPackage
@@ -14068,6 +15264,8 @@ self: {
        testHaskellDepends = [ base safe threepenny-gui ];
        description = "A Programming Language in Construction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Oslo-Vectize" = callPackage
@@ -14083,6 +15281,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PArrows" = callPackage
@@ -14107,6 +15307,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring Crypto random ];
        description = "Make password-based security schemes more secure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PCLT" = callPackage
@@ -14120,6 +15322,8 @@ self: {
        ];
        description = "Extension to Show: templating, catalogizing, languages, parameters, etc";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PCLT-DB" = callPackage
@@ -14136,6 +15340,8 @@ self: {
        ];
        description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PDBtools" = callPackage
@@ -14160,6 +15366,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A generic derivable Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PSQueue" = callPackage
@@ -14190,6 +15398,8 @@ self: {
        ];
        description = "An implementation of Montague's PTQ";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PUH-Project" = callPackage
@@ -14209,6 +15419,8 @@ self: {
        ];
        description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PageIO" = callPackage
@@ -14235,6 +15447,8 @@ self: {
        ];
        description = "Page-oriented extraction and composition library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Paillier" = callPackage
@@ -14253,6 +15467,8 @@ self: {
        ];
        description = "a simple Paillier cryptosystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PandocAgda" = callPackage
@@ -14273,6 +15489,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pandoc support for literate Agda";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Paraiso" = callPackage
@@ -14297,6 +15515,8 @@ self: {
        ];
        description = "a code generator for partial differential equations solvers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Parallel-Arrows-BaseSpec" = callPackage
@@ -14346,6 +15566,8 @@ self: {
        ];
        description = "Eden based backend for @Parallel-Arrows-Definition@";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Parallel-Arrows-Multicore" = callPackage
@@ -14401,6 +15623,8 @@ self: {
        ];
        description = "A proven synchronization server for high performance computing";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ParsecTools" = callPackage
@@ -14445,6 +15669,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Simple library for generating passwords";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PastePipe" = callPackage
@@ -14475,6 +15701,8 @@ self: {
        ];
        description = "A tree used to merge and maintain paths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Pathfinder" = callPackage
@@ -14487,6 +15715,8 @@ self: {
        librarySystemDepends = [ libxml2 ];
        description = "Relational optimiser and code generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libxml2;};
 
   "Peano" = callPackage
@@ -14509,6 +15739,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "GADT type witnesses for Peano-style natural numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PerfectHash" = callPackage
@@ -14525,6 +15757,8 @@ self: {
        librarySystemDepends = [ cmph ];
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cmph = null;};
 
   "PermuteEffects" = callPackage
@@ -14536,6 +15770,8 @@ self: {
        libraryHaskellDepends = [ base ReplicateEffects ];
        description = "Permutations of effectful computations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Persistence" = callPackage
@@ -14554,6 +15790,8 @@ self: {
        ];
        description = "A versatile library for topological data analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Phsu" = callPackage
@@ -14578,6 +15816,8 @@ self: {
        ];
        description = "Personal Happstack Server Utils";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Pipe" = callPackage
@@ -14589,6 +15829,8 @@ self: {
        libraryHaskellDepends = [ base filepath process unix ];
        description = "Process piping library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Piso" = callPackage
@@ -14600,6 +15842,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Partial isomorphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PlayHangmanGame" = callPackage
@@ -14633,6 +15877,8 @@ self: {
        ];
        description = "Playing cards api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Plot-ho-matic" = callPackage
@@ -14654,6 +15900,8 @@ self: {
        ];
        description = "Real-time line plotter for generic data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PlslTools" = callPackage
@@ -14673,6 +15921,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "Plural" = callPackage
@@ -14697,6 +15947,8 @@ self: {
        executableHaskellDepends = [ array base clock GLUT random ];
        description = "An imaginary world";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PortFusion" = callPackage
@@ -14710,6 +15962,8 @@ self: {
        executableHaskellDepends = [ base bytestring network splice ];
        description = "high-performance distributed reverse / forward proxy & tunneling for TCP";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PortMidi" = callPackage
@@ -14750,6 +16004,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Prelude module replacement";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PrimitiveArray" = callPackage
@@ -14805,6 +16061,8 @@ self: {
        ];
        description = "Pretty-printing for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Printf-TH" = callPackage
@@ -14815,6 +16073,8 @@ self: {
        sha256 = "0n1gva510p69vy25zvjkzwqqz2gilbns1wnrzz2p22rjkkbrinvx";
        libraryHaskellDepends = [ base haskell98 pretty template-haskell ];
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PriorityChansConverger" = callPackage
@@ -14826,6 +16086,8 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        description = "Read single output from an array of inputs - channels with priorities";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ProbabilityMonads" = callPackage
@@ -14837,6 +16099,8 @@ self: {
        libraryHaskellDepends = [ base MaybeT MonadRandom mtl ];
        description = "Probability distribution monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PropLogic" = callPackage
@@ -14865,6 +16129,8 @@ self: {
        executableHaskellDepends = [ base containers HUnit parsec syb ];
        description = "An implementation of propositional logic in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ProxN" = callPackage
@@ -14900,6 +16166,8 @@ self: {
        ];
        description = "A Perl 6 Implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Pup-Events" = callPackage
@@ -14919,6 +16187,8 @@ self: {
        doHaddock = false;
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Pup-Events-Client" = callPackage
@@ -14952,6 +16222,8 @@ self: {
        ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Pup-Events-PQueue" = callPackage
@@ -14978,6 +16250,8 @@ self: {
        ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PyF" = callPackage
@@ -15000,6 +16274,8 @@ self: {
        ];
        description = "Quasiquotations for a python like interpolated string formater";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QIO" = callPackage
@@ -15011,6 +16287,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl old-time random ];
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QLearn" = callPackage
@@ -15022,6 +16300,8 @@ self: {
        libraryHaskellDepends = [ base random vector ];
        description = "A library for fast, easy-to-use Q-learning";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QuadEdge" = callPackage
@@ -15033,6 +16313,8 @@ self: {
        libraryHaskellDepends = [ base random vector ];
        description = "QuadEdge structure for representing triangulations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QuadTree" = callPackage
@@ -15045,6 +16327,8 @@ self: {
        testHaskellDepends = [ base composition lens QuickCheck ];
        description = "QuadTree library for Haskell, with lens support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QuasiText" = callPackage
@@ -15080,6 +16364,8 @@ self: {
        ];
        description = "Programming with Eventual Consistency over Cassandra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QuickAnnotate" = callPackage
@@ -15094,6 +16380,8 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts ];
        description = "Annotation Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QuickCheck" = callPackage
@@ -15167,6 +16455,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Generator of \"valid\" and \"invalid\" data in a type class";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QuickPlot" = callPackage
@@ -15190,6 +16480,8 @@ self: {
        ];
        description = "Quick and easy data visualization with Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Quickson" = callPackage
@@ -15204,6 +16496,8 @@ self: {
        ];
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "R-pandoc" = callPackage
@@ -15221,6 +16515,8 @@ self: {
        ];
        executableHaskellDepends = [ base pandoc-types ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RANSAC" = callPackage
@@ -15296,6 +16592,8 @@ self: {
        ];
        description = "A reflective JSON serializer/parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RLP" = callPackage
@@ -15308,6 +16606,8 @@ self: {
        testHaskellDepends = [ base binary bytestring hspec ];
        description = "RLP serialization as defined in Ethereum Yellow Paper";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RMP" = callPackage
@@ -15328,6 +16628,8 @@ self: {
        executableSystemDepends = [ canlib ftd2xx ];
        description = "Binding to code that controls a Segway RMP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {canlib = null; ftd2xx = null;};
 
   "RNAFold" = callPackage
@@ -15350,6 +16652,8 @@ self: {
        ];
        description = "RNA secondary structure prediction";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RNAFoldProgs" = callPackage
@@ -15369,6 +16673,8 @@ self: {
        ];
        description = "RNA secondary structure folding";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RNAdesign" = callPackage
@@ -15394,6 +16700,8 @@ self: {
        executableHaskellDepends = [ bytestring cmdargs file-embed ];
        description = "Multi-target RNA sequence design";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RNAdraw" = callPackage
@@ -15413,6 +16721,8 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "Draw RNA secondary structures";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RNAlien" = callPackage
@@ -15445,6 +16755,8 @@ self: {
        ];
        description = "Unsupervized construction of RNA family models";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RNAwolf" = callPackage
@@ -15465,6 +16777,8 @@ self: {
        executableHaskellDepends = [ cmdargs split ];
        description = "RNA folding with non-canonical basepairs and base-triplets";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RSA" = callPackage
@@ -15519,6 +16833,8 @@ self: {
        ];
        description = "AMQP 0-9-1 client library for RabbitMQ servers";
        license = "BSD-3-Clause AND GPL-3.0-or-later";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Raincat" = callPackage
@@ -15569,6 +16885,8 @@ self: {
        libraryHaskellDepends = [ base HTTP-Simple network ];
        description = "Interface to random.org";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Randometer" = callPackage
@@ -15593,6 +16911,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data structure for managing ranges";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Ranged-sets" = callPackage
@@ -15623,6 +16943,8 @@ self: {
        ];
        description = "HTTP to XMPP omegle chats gate";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Rasenschach" = callPackage
@@ -15643,6 +16965,8 @@ self: {
        ];
        description = "Soccer simulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Rasterific" = callPackage
@@ -15714,6 +17038,8 @@ self: {
        ];
        description = "Library to access Redmine's REST services";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Ref" = callPackage
@@ -15725,6 +17051,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RefSerialize" = callPackage
@@ -15760,6 +17088,8 @@ self: {
        ];
        description = "A utility for computing distributions of material to review among reviewers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RepLib" = callPackage
@@ -15775,6 +17105,8 @@ self: {
        ];
        description = "Generic programming library with representation types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ReplicateEffects" = callPackage
@@ -15786,6 +17118,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Composable replication schemes of applicative functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ReviewBoard" = callPackage
@@ -15804,6 +17138,8 @@ self: {
        ];
        description = "Haskell bindings to ReviewBoard";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RichConditional" = callPackage
@@ -15815,6 +17151,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Tiny library to replace classic if/else";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Ritt-Wu" = callPackage
@@ -15843,6 +17181,8 @@ self: {
        ];
        description = "Parallel implementation of Ritt-Wu's algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Rlang-QQ" = callPackage
@@ -15866,6 +17206,8 @@ self: {
        testHaskellDepends = [ base directory doctest hspec lens vector ];
        description = "quasiquoter for inline-R code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RollingDirectory" = callPackage
@@ -15890,6 +17232,8 @@ self: {
        ];
        description = "Limits the size of a directory's contents";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RoyalMonad" = callPackage
@@ -15919,6 +17263,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit vector ];
        description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) alsaLib;};
 
   "RxHaskell" = callPackage
@@ -15930,6 +17276,8 @@ self: {
        libraryHaskellDepends = [ base containers stm transformers ];
        description = "Reactive Extensions for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "S3" = callPackage
@@ -15950,6 +17298,8 @@ self: {
        ];
        description = "Library for accessing S3 compatible storage services";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SBench" = callPackage
@@ -15967,6 +17317,8 @@ self: {
        ];
        description = "A benchmark suite for runtime and heap measurements over a series of inputs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SCRIPTWriter" = callPackage
@@ -15986,6 +17338,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "ESCRIPT: a human friendly language for programming Bitcoin scripts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SCalendar" = callPackage
@@ -16002,6 +17356,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "SDL" = callPackage
@@ -16117,6 +17473,8 @@ self: {
        ];
        description = "SFML bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {csfml-audio = null; csfml-graphics = null; 
          csfml-network = null; csfml-system = null; csfml-window = null; 
          sfml-audio = null; sfml-graphics = null; sfml-network = null; 
@@ -16131,6 +17489,8 @@ self: {
        libraryHaskellDepends = [ base mtl SFML template-haskell ];
        description = "Higher level library on top of SFML";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SFont" = callPackage
@@ -16142,6 +17502,8 @@ self: {
        libraryHaskellDepends = [ array base SDL Sprig ];
        description = "SFont SDL Bitmap Fonts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SG" = callPackage
@@ -16153,6 +17515,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SGdemo" = callPackage
@@ -16166,6 +17530,8 @@ self: {
        executableHaskellDepends = [ base GLUT OpenGL SG ];
        description = "An example of using the SG and OpenGL libraries";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SGplus" = callPackage
@@ -16177,6 +17543,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "(updated) Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SHA" = callPackage
@@ -16225,6 +17593,8 @@ self: {
        ];
        description = "A simple SMTP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SNet" = callPackage
@@ -16241,6 +17611,8 @@ self: {
        libraryToolDepends = [ c2hsc ];
        description = "Declarative coördination language for streaming networks";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SQLDeps" = callPackage
@@ -16271,6 +17643,8 @@ self: {
        testHaskellDepends = [ base containers ];
        description = "STG Symbolic Execution";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "STL" = callPackage
@@ -16282,6 +17656,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
        description = "STL 3D geometry format parsing and pretty-printing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "STLinkUSB" = callPackage
@@ -16297,6 +17673,8 @@ self: {
        ];
        description = "STLink USB interface in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "STM32-Zombie" = callPackage
@@ -16313,6 +17691,8 @@ self: {
        ];
        description = "control a STM32F103 microcontroller";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "STM32F103xx-SVD" = callPackage
@@ -16355,6 +17735,8 @@ self: {
        ];
        description = "translate a SVD of a Microcontroller to Haskell tables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SVG2Q" = callPackage
@@ -16372,6 +17754,8 @@ self: {
        ];
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SVGFonts" = callPackage
@@ -16392,6 +17776,8 @@ self: {
        ];
        description = "Fonts from the SVG-Font format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SVGPath" = callPackage
@@ -16438,6 +17824,8 @@ self: {
        ];
        description = "Generate a parser (in Haskell) with the SableCC parser generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Safe" = callPackage
@@ -16475,6 +17863,8 @@ self: {
        librarySystemDepends = [ glib mono ];
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "Saturnin" = callPackage
@@ -16498,6 +17888,8 @@ self: {
        testHaskellDepends = [ base data-default either hlint hspec mtl ];
        description = "Saturnin CI / Job System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SciBaseTypes" = callPackage
@@ -16526,6 +17918,8 @@ self: {
        ];
        description = "Base types and classes for statistics, sciences and humanities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SciFlow" = callPackage
@@ -16550,6 +17944,8 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SciFlow-drmaa" = callPackage
@@ -16566,6 +17962,8 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ScratchFs" = callPackage
@@ -16584,6 +17982,8 @@ self: {
        ];
        description = "Size limited temp filesystem based on fuse";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Scurry" = callPackage
@@ -16602,6 +18002,8 @@ self: {
        ];
        description = "A cross platform P2P VPN application built using Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SecureHash-SHA3" = callPackage
@@ -16615,6 +18017,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "simple static linked SHA3 using private symbols and the ref impl";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SegmentTree" = callPackage
@@ -16652,6 +18056,8 @@ self: {
        ];
        description = "Selects a representative subset of sequences from multiple sequence alignment";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Semantique" = callPackage
@@ -16670,6 +18076,8 @@ self: {
        ];
        description = "Command-line tool for maintaining the Semantique database";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Semigroup" = callPackage
@@ -16681,6 +18089,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers mtl ];
        description = "A semigroup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SeqAlign" = callPackage
@@ -16692,6 +18102,8 @@ self: {
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SessionLogger" = callPackage
@@ -16707,6 +18119,8 @@ self: {
        ];
        description = "Easy Loggingframework";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Set" = callPackage
@@ -16720,6 +18134,8 @@ self: {
        benchmarkHaskellDepends = [ base containers gauge util ];
        description = "See README for more info";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ShellCheck" = callPackage
@@ -16760,6 +18176,8 @@ self: {
        libraryHaskellDepends = [ base directory mtl unix ];
        description = "A framework for creating shell envinronments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shellac-compatline" = callPackage
@@ -16773,6 +18191,8 @@ self: {
        libraryHaskellDepends = [ base Shellac Shellac-readline ];
        description = "\"compatline\" backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shellac-editline" = callPackage
@@ -16786,6 +18206,8 @@ self: {
        libraryHaskellDepends = [ base editline Shellac ];
        description = "Editline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shellac-haskeline" = callPackage
@@ -16797,6 +18219,8 @@ self: {
        libraryHaskellDepends = [ base haskeline mtl Shellac ];
        description = "Haskeline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shellac-readline" = callPackage
@@ -16810,6 +18234,8 @@ self: {
        libraryHaskellDepends = [ base readline Shellac ];
        description = "Readline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ShortestPathProblems" = callPackage
@@ -16830,6 +18256,8 @@ self: {
        ];
        description = "grammars for TSP and SHP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ShowF" = callPackage
@@ -16876,6 +18304,8 @@ self: {
        ];
        description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shpadoinkle-backend-snabbdom" = callPackage
@@ -16902,6 +18332,8 @@ self: {
        libraryHaskellDepends = [ base compactable Shpadoinkle text ];
        description = "A backend for rendering Shpadoinkle as Text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shpadoinkle-console" = callPackage
@@ -16953,6 +18385,8 @@ self: {
        ];
        description = "Example usages of Shpadoinkle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shpadoinkle-html" = callPackage
@@ -16970,6 +18404,8 @@ self: {
        ];
        description = "A typed, template generated Html DSL, and helpers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shpadoinkle-lens" = callPackage
@@ -17002,6 +18438,8 @@ self: {
        ];
        description = "A single page application rounter for Shpadoinkle based on Servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shpadoinkle-widgets" = callPackage
@@ -17022,6 +18460,8 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A collection of common reusable types and components";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shrub" = callPackage
@@ -17084,6 +18524,8 @@ self: {
        ];
        description = "A Simple Graphics Library from the SimpleH framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SimpleH" = callPackage
@@ -17120,6 +18562,8 @@ self: {
        ];
        description = "Simple, configurable logging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SimpleServer" = callPackage
@@ -17140,6 +18584,8 @@ self: {
        ];
        description = "A simple static file server, for when apache is overkill";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SimpleTableGenerator" = callPackage
@@ -17201,6 +18647,8 @@ self: {
        testHaskellDepends = [ base file-embed ];
        description = "Generate slides from Haskell code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Smooth" = callPackage
@@ -17216,6 +18664,8 @@ self: {
        ];
        description = "A tiny, lazy SMT solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SmtLib" = callPackage
@@ -17227,6 +18677,8 @@ self: {
        libraryHaskellDepends = [ base parsec transformers ];
        description = "Library for parsing SMTLIB2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Snusmumrik" = callPackage
@@ -17249,6 +18701,8 @@ self: {
        executableToolDepends = [ cpphs ];
        description = "E-library directory based on FUSE virtual file system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zip;};
 
   "SoOSiM" = callPackage
@@ -17265,6 +18719,8 @@ self: {
        ];
        description = "Abstract full system simulator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SoccerFun" = callPackage
@@ -17284,6 +18740,8 @@ self: {
        ];
        description = "Football simulation framework for teaching functional programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SoccerFunGL" = callPackage
@@ -17303,6 +18761,8 @@ self: {
        ];
        description = "OpenGL UI for the SoccerFun framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Sonnex" = callPackage
@@ -17315,6 +18775,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Sonnex is an alternative to Soundex for french language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SourceGraph" = callPackage
@@ -17333,6 +18795,8 @@ self: {
        ];
        description = "Static code analysis using graph-theoretic techniques";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Southpaw" = callPackage
@@ -17365,6 +18829,8 @@ self: {
        executableHaskellDepends = [ array base HGL random Yampa ];
        description = "Video game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SpacePrivateers" = callPackage
@@ -17386,6 +18852,8 @@ self: {
        ];
        description = "Simple space pirate roguelike";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SpinCounter" = callPackage
@@ -17397,6 +18865,8 @@ self: {
        libraryHaskellDepends = [ base monad-loops ref-mtl stm ];
        description = "Lock free Spin Counter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spintax" = callPackage
@@ -17437,6 +18907,8 @@ self: {
        ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spock-api" = callPackage
@@ -17463,6 +18935,8 @@ self: {
        ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spock-api-server" = callPackage
@@ -17485,6 +18959,8 @@ self: {
        libraryHaskellDepends = [ base http-types Spock text time ];
        description = "Provides authentification helpers for Spock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spock-core" = callPackage
@@ -17540,6 +19016,8 @@ self: {
        libraryHaskellDepends = [ base lucid Spock transformers ];
        description = "Lucid support for Spock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spock-worker" = callPackage
@@ -17557,6 +19035,8 @@ self: {
        testHaskellDepends = [ base containers HTF stm vector ];
        description = "Background workers for Spock";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SpreadsheetML" = callPackage
@@ -17579,6 +19059,8 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to Sprig";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Stack" = callPackage
@@ -17606,6 +19088,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A simple MVCC like library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "StateVar" = callPackage
@@ -17655,6 +19139,8 @@ self: {
        ];
        description = "Libary for Stockholm aligmnent format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Stomp" = callPackage
@@ -17670,6 +19156,8 @@ self: {
        ];
        description = "Client library for Stomp brokers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Strafunski-ATermLib" = callPackage
@@ -17681,6 +19169,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "An abstract data type designed for the exchange of tree-like data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Strafunski-Sdf2Haskell" = callPackage
@@ -17700,6 +19190,8 @@ self: {
        ];
        description = "Converts SDF to Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Strafunski-StrategyLib" = callPackage
@@ -17713,6 +19205,8 @@ self: {
        libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "StrappedTemplates" = callPackage
@@ -17730,6 +19224,8 @@ self: {
        testHaskellDepends = [ base blaze-builder bytestring hspec text ];
        description = "General purpose templates in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "StrategyLib" = callPackage
@@ -17764,6 +19260,8 @@ self: {
        libraryHaskellDepends = [ base benchpress parallel ];
        description = "Benchmarking code through strict evaluation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "StrictCheck" = callPackage
@@ -17782,6 +19280,8 @@ self: {
        ];
        description = "StrictCheck: Keep Your Laziness In Check";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "StringUtils" = callPackage
@@ -17819,6 +19319,8 @@ self: {
        ];
        description = "Suffix array construction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SybWidget" = callPackage
@@ -17834,6 +19336,8 @@ self: {
        ];
        description = "Library which aids constructing generic (SYB3-based) widgets";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SyntaxMacros" = callPackage
@@ -17850,6 +19354,8 @@ self: {
        ];
        description = "Syntax Macros in the form of an EDSL";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Sysmon" = callPackage
@@ -17870,6 +19376,8 @@ self: {
        ];
        description = "Sybase 15 sysmon reports processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TBC" = callPackage
@@ -17890,6 +19398,8 @@ self: {
        ];
        description = "Testing By Convention";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TBit" = callPackage
@@ -17906,6 +19416,8 @@ self: {
        ];
        description = "Utilities for condensed matter physics tight binding calculations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TCache" = callPackage
@@ -17954,6 +19466,8 @@ self: {
        executableHaskellDepends = [ base bytestring Yampa ];
        description = "Bindings to the TORCS vehicle simulator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TTTAS" = callPackage
@@ -17976,6 +19490,8 @@ self: {
        libraryHaskellDepends = [ base DeepArrow TypeCompose ];
        description = "Tangible Values -- composable interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TYB" = callPackage
@@ -17991,6 +19507,8 @@ self: {
        ];
        description = "Template Your Boilerplate - a Template Haskell version of SYB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TableAlgebra" = callPackage
@@ -18019,6 +19537,8 @@ self: {
        executableHaskellDepends = [ base cookbook ];
        description = "A client for Quill databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Tablify" = callPackage
@@ -18032,6 +19552,8 @@ self: {
        executableHaskellDepends = [ base parsec xhtml ];
        description = "Tool to render CSV into tables of various formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Tahin" = callPackage
@@ -18075,6 +19597,8 @@ self: {
        libraryHaskellDepends = [ base mtl old-time time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Tape" = callPackage
@@ -18086,6 +19610,8 @@ self: {
        libraryHaskellDepends = [ base comonad distributive Stream ];
        description = "Bidirectionally infinite streams, akin to the tape of a Turing machine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TaskMonad" = callPackage
@@ -18104,6 +19630,8 @@ self: {
        ];
        description = "A collection of tools which can be used to access taskwarrior from xmonad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Taxonomy" = callPackage
@@ -18119,6 +19647,8 @@ self: {
        ];
        description = "Libary for parsing, processing and vizualization of taxonomy data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TaxonomyTools" = callPackage
@@ -18138,6 +19668,8 @@ self: {
        ];
        description = "Tool for parsing, processing, comparing and visualizing taxonomy data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TeX-my-math" = callPackage
@@ -18164,6 +19696,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "TeaHS" = callPackage
@@ -18179,6 +19713,8 @@ self: {
        ];
        description = "TeaHS Game Creation Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Tensor" = callPackage
@@ -18233,6 +19769,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ogg theora ];
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ogg = null; theora = null;};
 
   "Thingie" = callPackage
@@ -18244,6 +19782,8 @@ self: {
        libraryHaskellDepends = [ base cairo gtk mtl ];
        description = "Purely functional 2D drawing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ThreadObjects" = callPackage
@@ -18301,6 +19841,8 @@ self: {
        ];
        description = "A sub-project (exercise) for a functional programming course";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TigerHash" = callPackage
@@ -18335,6 +19877,8 @@ self: {
        ];
        description = "A simple tile-based digital clock screen saver";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TinyLaunchbury" = callPackage
@@ -18346,6 +19890,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Simple implementation of call-by-need using Launchbury's semantics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TinyURL" = callPackage
@@ -18357,6 +19903,8 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Use TinyURL to compress URLs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Titim" = callPackage
@@ -18370,6 +19918,8 @@ self: {
        executableHaskellDepends = [ base containers matrix random ];
        description = "Game for Lounge Marmelade";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Top" = callPackage
@@ -18384,6 +19934,8 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Constraint solving framework employed by the Helium Compiler";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TotalMap" = callPackage
@@ -18403,6 +19955,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A total map datatype";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Tournament" = callPackage
@@ -18420,6 +19974,8 @@ self: {
        ];
        description = "Tournament related algorithms";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TraceUtils" = callPackage
@@ -18448,6 +20004,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "eDSL in R for Safe Variable Transformarion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TransformersStepByStep" = callPackage
@@ -18461,6 +20019,8 @@ self: {
        executableHaskellDepends = [ base containers mtl ];
        description = "Tutorial on monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Transhare" = callPackage
@@ -18483,6 +20043,8 @@ self: {
        libraryHaskellDepends = [ base ref-mtl stm ];
        description = "Wait-free Tree Counter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TreeStructures" = callPackage
@@ -18494,6 +20056,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of heaps and search trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TreeT" = callPackage
@@ -18516,6 +20080,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        description = "Lock free Treiber stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TrendGraph" = callPackage
@@ -18532,6 +20098,8 @@ self: {
        ];
        description = "A simple trend Graph script";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TrieMap" = callPackage
@@ -18549,6 +20117,8 @@ self: {
        ];
        description = "Automatic type inference of generalized tries with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Twofish" = callPackage
@@ -18587,6 +20157,8 @@ self: {
        ];
        description = "Typing speed game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TypeCompose" = callPackage
@@ -18613,6 +20185,8 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "TypeIlluminator is a prototype tool exploring debugging of type errors/";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TypeNat" = callPackage
@@ -18624,6 +20198,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some Nat-indexed types for GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TypingTester" = callPackage
@@ -18669,6 +20245,8 @@ self: {
        ];
        description = "A small command-line accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "URLT" = callPackage
@@ -18686,6 +20264,8 @@ self: {
        ];
        description = "Library for maintaining correctness of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "URLb" = callPackage
@@ -18697,6 +20277,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "DEPRECATED A simple, liberal URL parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "UTFTConverter" = callPackage
@@ -18720,6 +20302,8 @@ self: {
        ];
        description = "Processing popular picture formats into .c or .raw format in RGB565";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Unique" = callPackage
@@ -18779,6 +20363,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monadic FRP library based on stm";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "UrlDisp" = callPackage
@@ -18790,6 +20376,8 @@ self: {
        libraryHaskellDepends = [ base cgi MaybeT mtl ];
        description = "Url dispatcher. Helps to retain friendly URLs in web applications.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Useful" = callPackage
@@ -18842,6 +20430,8 @@ self: {
        ];
        description = "Provides access to Vkontakte social network via public API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "VRML" = callPackage
@@ -18865,6 +20455,8 @@ self: {
        ];
        description = "VRML parser and generator for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Validation" = callPackage
@@ -18878,6 +20470,8 @@ self: {
        ];
        description = "A data-type like Either but with an accumulating Applicative";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Vec" = callPackage
@@ -18900,6 +20494,8 @@ self: {
        libraryHaskellDepends = [ base Boolean Vec ];
        description = "Provides Boolean instances for the Vec package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Vec-OpenGLRaw" = callPackage
@@ -18911,6 +20507,8 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw Vec ];
        description = "Instances and functions to interoperate Vec and OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Vec-Transform" = callPackage
@@ -18922,6 +20520,8 @@ self: {
        doHaddock = false;
        description = "This package is obsolete";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "VecN" = callPackage
@@ -18947,6 +20547,8 @@ self: {
        executableHaskellDepends = [ base containers matrix ];
        description = "A solver for the WordBrain game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ViennaRNA-bindings" = callPackage
@@ -18990,6 +20592,8 @@ self: {
        ];
        description = "ViennaRNA v2 extensions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ViennaRNAParser" = callPackage
@@ -19036,6 +20640,8 @@ self: {
        ];
        description = "Villefort is a task manager and time tracker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Vulkan" = callPackage
@@ -19077,6 +20683,8 @@ self: {
        ];
        description = "WAVE audio file IO library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WEditor" = callPackage
@@ -19090,6 +20698,8 @@ self: {
        doHaddock = false;
        description = "Generic text-editor logic for use with fixed-width fonts";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WEditorBrick" = callPackage
@@ -19104,6 +20714,8 @@ self: {
        executableHaskellDepends = [ base brick vty WEditor ];
        description = "Text-editor widget with dynamic line-wrapping for use with Brick";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WEditorHyphen" = callPackage
@@ -19116,6 +20728,8 @@ self: {
        testHaskellDepends = [ base directory hyphenation WEditor ];
        description = "Language-specific hyphenation policies for WEditor";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WL500gPControl" = callPackage
@@ -19132,6 +20746,8 @@ self: {
        ];
        description = "A simple command line tools to control the Asus WL500gP router";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WL500gPLib" = callPackage
@@ -19146,6 +20762,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A simple library to access to the WL 500gP router from the Haskell code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WMSigner" = callPackage
@@ -19165,6 +20783,8 @@ self: {
        ];
        description = "WebMoney authentication module";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WURFL" = callPackage
@@ -19176,6 +20796,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "Convert the WURFL file into a Parsec parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WXDiffCtrl" = callPackage
@@ -19188,6 +20810,8 @@ self: {
        libraryHaskellDepends = [ base containers wx wxcore ];
        description = "WXDiffCtrl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WashNGo" = callPackage
@@ -19206,6 +20830,8 @@ self: {
        executableHaskellDepends = [ directory ghc-paths process ];
        description = "WASH is a family of EDSLs for programming Web applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WaveFront" = callPackage
@@ -19222,6 +20848,8 @@ self: {
        ];
        description = "Parsers and utilities for the OBJ WaveFront 3D model format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Weather" = callPackage
@@ -19248,6 +20876,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec pretty syb ];
        description = "JavaScript analysis tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WebBits-Html" = callPackage
@@ -19263,6 +20893,8 @@ self: {
        ];
        description = "JavaScript analysis tools";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WebBits-multiplate" = callPackage
@@ -19279,6 +20911,8 @@ self: {
        ];
        description = "A Multiplate instance for JavaScript";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WebCont" = callPackage
@@ -19297,6 +20931,8 @@ self: {
        ];
        description = "Continuation based web programming for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WeberLogic" = callPackage
@@ -19311,6 +20947,8 @@ self: {
        executableHaskellDepends = [ base parsec ];
        description = "Logic interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Webrexp" = callPackage
@@ -19337,6 +20975,8 @@ self: {
        ];
        description = "Regexp-like engine to scrap web data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Wheb" = callPackage
@@ -19361,6 +21001,8 @@ self: {
        ];
        description = "The frictionless WAI Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WikimediaParser" = callPackage
@@ -19372,6 +21014,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "A parser for wikimedia style article markup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Win32" = callPackage
@@ -19550,6 +21194,8 @@ self: {
        ];
        description = "Wire-aware hardware description";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WordAlignment" = callPackage
@@ -19589,6 +21235,8 @@ self: {
        ];
        description = "Bigram word pair alignments";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WordNet" = callPackage
@@ -19602,6 +21250,8 @@ self: {
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WordNet-ghc74" = callPackage
@@ -19615,6 +21265,8 @@ self: {
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Wordlint" = callPackage
@@ -19649,6 +21301,8 @@ self: {
        ];
        description = "Workflow patterns over a monad for thread state logging & recovery";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WxGeneric" = callPackage
@@ -19663,6 +21317,8 @@ self: {
        ];
        description = "Generic (SYB3) construction of wxHaskell widgets";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "X" = callPackage
@@ -19710,6 +21366,8 @@ self: {
        librarySystemDepends = [ libX11 ];
        description = "Missing bindings to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.xorg) libX11;};
 
   "X11-rm" = callPackage
@@ -19721,6 +21379,8 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        description = "A binding to the resource management functions missing from X11";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "X11-xdamage" = callPackage
@@ -19733,6 +21393,8 @@ self: {
        librarySystemDepends = [ Xdamage ];
        description = "A binding to the Xdamage X11 extension library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {Xdamage = null;};
 
   "X11-xfixes" = callPackage
@@ -19745,6 +21407,8 @@ self: {
        librarySystemDepends = [ Xfixes ];
        description = "A binding to the Xfixes X11 extension library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {Xfixes = null;};
 
   "X11-xft" = callPackage
@@ -19836,6 +21500,8 @@ self: {
        librarySystemDepends = [ xmmsclient xmmsclient-glib ];
        description = "XMMS2 client library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {xmmsclient = null; xmmsclient-glib = null;};
 
   "XMPP" = callPackage
@@ -19852,6 +21518,8 @@ self: {
        ];
        description = "XMPP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "XSaiga" = callPackage
@@ -19878,6 +21546,8 @@ self: {
        ];
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Xauth" = callPackage
@@ -19908,6 +21578,8 @@ self: {
        ];
        description = "Gtk command launcher with identicon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "XmlHtmlWriter" = callPackage
@@ -19919,6 +21591,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A library for writing XML and HTML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Xorshift128Plus" = callPackage
@@ -19930,6 +21604,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Pure haskell implementation of xorshift128plus random number generator";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "YACPong" = callPackage
@@ -19950,6 +21626,8 @@ self: {
        ];
        description = "Yet Another Pong Clone using SDL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "YFrob" = callPackage
@@ -19961,6 +21639,8 @@ self: {
        libraryHaskellDepends = [ array base HGL Yampa ];
        description = "Yampa-based library for programming robots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Yablog" = callPackage
@@ -19995,6 +21675,8 @@ self: {
        ];
        description = "A simple blog engine powered by Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "YamlReference" = callPackage
@@ -20022,6 +21704,8 @@ self: {
        ];
        description = "YAML reference implementation";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Yampa" = callPackage
@@ -20069,6 +21753,8 @@ self: {
        ];
        description = "Software synthesizer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Yocto" = callPackage
@@ -20096,6 +21782,8 @@ self: {
        ];
        description = "A MUD client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Yogurt-Standalone" = callPackage
@@ -20115,6 +21803,8 @@ self: {
        executableSystemDepends = [ readline ];
        description = "A functional MUD client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) readline;};
 
   "Z-Data" = callPackage
@@ -20139,20 +21829,23 @@ self: {
        ];
        description = "Array, vector and text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Z-IO" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, hashable, hspec
      , hspec-discover, HUnit, primitive, QuickCheck
-     , quickcheck-instances, scientific, stm, time, unix-time, word8
-     , Z-Data, zlib
+     , quickcheck-instances, scientific, stm, time, unix-time
+     , unordered-containers, word8, Z-Data, zlib
      }:
      mkDerivation {
        pname = "Z-IO";
-       version = "0.1.7.0";
-       sha256 = "0xvl0xgqcwqvsvqhdysgh3i2lhp1vi7sglgzzmzxz3142a67xpgd";
+       version = "0.1.8.0";
+       sha256 = "14xh727r7zasm92ah0a6wccn1zksg0pmrvh8xdaldh4qkj706ga7";
        libraryHaskellDepends = [
-         base exceptions primitive stm time unix-time Z-Data
+         base exceptions primitive stm time unix-time unordered-containers
+         Z-Data
        ];
        libraryToolDepends = [ hspec-discover ];
        testHaskellDepends = [
@@ -20161,6 +21854,8 @@ self: {
        ];
        description = "Simple and high performance IO toolkit for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ZEBEDDE" = callPackage
@@ -20174,6 +21869,8 @@ self: {
        libraryHaskellDepends = [ base vect ];
        description = "Polymer growth simulation method";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ZFS" = callPackage
@@ -20189,6 +21886,8 @@ self: {
        ];
        description = "Oleg's Zipper FS";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ZMachine" = callPackage
@@ -20203,6 +21902,8 @@ self: {
        executableHaskellDepends = [ array base gtk mtl random ];
        description = "A Z-machine interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ZipFold" = callPackage
@@ -20253,6 +21954,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinators for bidirectional URL routing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "a50" = callPackage
@@ -20271,6 +21974,8 @@ self: {
        ];
        description = "Compare genome assemblies";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "abacate" = callPackage
@@ -20324,6 +22029,8 @@ self: {
        ];
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {abc = null;};
 
   "abcnotation" = callPackage
@@ -20337,6 +22044,8 @@ self: {
        ];
        description = "Haskell representation and parser for ABC notation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "abeson" = callPackage
@@ -20356,6 +22065,8 @@ self: {
        ];
        description = "interconversion between aeson and bson";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "abides" = callPackage
@@ -20368,6 +22079,8 @@ self: {
        testHaskellDepends = [ base comonad tasty tasty-quickcheck ];
        description = "Simple boolean tests to see if a value abides by certain properties";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "abnf" = callPackage
@@ -20387,6 +22100,8 @@ self: {
        ];
        description = "Parse ABNF and generate parsers for the specified document";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "abstract-deque" = callPackage
@@ -20442,6 +22157,8 @@ self: {
        ];
        description = "Provides the class ParAccelerate, nothing more";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "abt" = callPackage
@@ -20457,6 +22174,8 @@ self: {
        ];
        description = "Abstract binding trees for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ac-machine" = callPackage
@@ -20470,6 +22189,8 @@ self: {
        ];
        description = "Aho-Corasick string matching algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ac-machine-conduit" = callPackage
@@ -20481,6 +22202,8 @@ self: {
        libraryHaskellDepends = [ ac-machine base conduit text ];
        description = "Drive Aho-Corasick machines in Conduit pipelines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acc" = callPackage
@@ -20500,6 +22223,8 @@ self: {
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Sequence optimized for monoidal construction and folding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate" = callPackage
@@ -20545,6 +22270,8 @@ self: {
        ];
        description = "Linear algebra and interpolation using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-bignum" = callPackage
@@ -20756,6 +22483,8 @@ self: {
        ];
        description = "Accelerate frontend to the FFTW library (Fourier transform)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-fourier" = callPackage
@@ -20781,6 +22510,8 @@ self: {
        ];
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-fourier-benchmark" = callPackage
@@ -20983,6 +22714,8 @@ self: {
        testHaskellDepends = [ accelerate base ];
        description = "Accelerate backend for multicore CPUs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-llvm-ptx" = callPackage
@@ -21016,6 +22749,8 @@ self: {
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-typelits" = callPackage
@@ -21038,6 +22773,8 @@ self: {
        ];
        description = "a typesafe way encode accelerate matrices and vectors";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-utility" = callPackage
@@ -21049,6 +22786,8 @@ self: {
        libraryHaskellDepends = [ accelerate base utility-ht ];
        description = "Utility functions for the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accentuateus" = callPackage
@@ -21060,6 +22799,8 @@ self: {
        libraryHaskellDepends = [ base bytestring HTTP json network text ];
        description = "A Haskell implementation of the Accentuate.us API.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "access-time" = callPackage
@@ -21071,6 +22812,8 @@ self: {
        libraryHaskellDepends = [ base filepath old-time time unix ];
        description = "Cross-platform support for retrieving file access times";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "access-token-provider" = callPackage
@@ -21097,6 +22840,8 @@ self: {
        ];
        description = "Provides Access Token for Services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accuerr" = callPackage
@@ -21149,6 +22894,8 @@ self: {
        ];
        description = "A library for building static site generators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acid-state" = callPackage
@@ -21205,6 +22952,8 @@ self: {
        ];
        description = "A replication backend for acid-state";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acid-state-tls" = callPackage
@@ -21220,6 +22969,8 @@ self: {
        ];
        description = "Add TLS support for Data.Acid.Remote";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acl2" = callPackage
@@ -21242,6 +22993,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A monad which is powerful enough to interpret any action";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-box" = callPackage
@@ -21319,6 +23072,8 @@ self: {
        libraryHaskellDepends = [ base comonad ];
        description = "A more efficient dualization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-cuteboy" = callPackage
@@ -21381,6 +23136,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Stop execution with rage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-functors" = callPackage
@@ -21414,6 +23171,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An embedded DSL for the HQ9+ programming language";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-http" = callPackage
@@ -21431,6 +23190,8 @@ self: {
        ];
        description = "fastest Haskell PONG server in the world";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-inator" = callPackage
@@ -21445,6 +23206,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Evil inventions in the Tri-State area";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-io" = callPackage
@@ -21479,6 +23242,8 @@ self: {
        libraryHaskellDepends = [ base ];
        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;
+       broken = true;
      }) {};
 
   "acme-left-pad" = callPackage
@@ -21490,6 +23255,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "free your haskell from the tyranny of npm!";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-lolcat" = callPackage
@@ -21545,6 +23312,8 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "Miscellaneous newtypes for orderings of discutable use";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-missiles" = callPackage
@@ -21570,6 +23339,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A mutable package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-now" = callPackage
@@ -21581,6 +23352,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "An interface to the philosophical and metaphysical \"now\"";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-numbersystem" = callPackage
@@ -21592,6 +23365,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Define the less than and add and subtract for nats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-omitted" = callPackage
@@ -21626,6 +23401,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Operators of base, all in one place!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-php" = callPackage
@@ -21637,6 +23414,8 @@ self: {
        libraryHaskellDepends = [ acme-left-pad base ];
        description = "The flexibility of Haskell and the safety of PHP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-pointful-numbers" = callPackage
@@ -21688,6 +23467,8 @@ self: {
        ];
        description = "Proper names for curry and uncurry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-smuggler" = callPackage
@@ -21711,6 +23492,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A binding to the glibc strfry function";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-stringly-typed" = callPackage
@@ -21724,6 +23507,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Stringly Typed Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-strtok" = callPackage
@@ -21748,6 +23533,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "import This";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-timemachine" = callPackage
@@ -21796,6 +23583,8 @@ self: {
        doHaddock = false;
        description = "The absorbing element of package dependencies";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acousticbrainz-client" = callPackage
@@ -21819,6 +23608,8 @@ self: {
        ];
        description = "AcousticBrainz API client";
        license = stdenv.lib.licenses.cc0;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acquire" = callPackage
@@ -21861,6 +23652,8 @@ self: {
        ];
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "activehs" = callPackage
@@ -21889,6 +23682,8 @@ self: {
        ];
        description = "Haskell code presentation tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "activehs-base" = callPackage
@@ -21902,6 +23697,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Basic definitions for activehs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "activitypub" = callPackage
@@ -21913,6 +23710,8 @@ self: {
        libraryHaskellDepends = [ aeson base network-uri text time ];
        description = "ActivityPub Haskell Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "activitystreams-aeson" = callPackage
@@ -21926,6 +23725,8 @@ self: {
        ];
        description = "An interface to the ActivityStreams specification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "actor" = callPackage
@@ -21938,6 +23739,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 stm time ];
        description = "Actors with multi-headed receive clauses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acts" = callPackage
@@ -21953,6 +23756,8 @@ self: {
        doHaddock = false;
        description = "Semigroup actions and torsors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ad" = callPackage
@@ -21984,6 +23789,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Self optimizing container types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adaptive-tuple" = callPackage
@@ -21995,6 +23802,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell type-level ];
        description = "Self-optimizing tuple types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adb" = callPackage
@@ -22009,6 +23818,8 @@ self: {
        ];
        description = "Android Debug Bridge (ADB) protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adblock2privoxy" = callPackage
@@ -22064,6 +23875,8 @@ self: {
        ];
        description = "A full-featured library for parsing, validating, and rendering email addresses";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adhoc-network" = callPackage
@@ -22081,6 +23894,8 @@ self: {
        ];
        description = "Ad-hoc P2P network protocol";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adict" = callPackage
@@ -22102,6 +23917,8 @@ self: {
        ];
        description = "Approximate dictionary searching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adjunction" = callPackage
@@ -22117,6 +23934,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge hs-functors ];
        description = "See README for more info";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adjunctions" = callPackage
@@ -22173,6 +23992,8 @@ self: {
        ];
        description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adp-multi" = callPackage
@@ -22193,6 +24014,8 @@ self: {
        ];
        description = "ADP for multiple context-free languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adp-multi-monadiccp" = callPackage
@@ -22212,6 +24035,8 @@ self: {
        ];
        description = "Subword construction in adp-multi using monadiccp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adtrees" = callPackage
@@ -22223,6 +24048,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modelling, rendering and quantitative analysis on attack defense trees";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "advent-of-code-api" = callPackage
@@ -22245,6 +24072,8 @@ self: {
        testHaskellDepends = [ base directory filepath HUnit text ];
        description = "Advent of Code REST API bindings and servant API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aern2-mp" = callPackage
@@ -22263,6 +24092,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Multi-precision ball (interval) arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aern2-real" = callPackage
@@ -22286,6 +24117,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exact real numbers via Cauchy sequences and MPFR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson" = callPackage
@@ -22329,6 +24162,8 @@ self: {
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        description = "make To/From JSOn instances from an applicative description";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-attoparsec" = callPackage
@@ -22484,6 +24319,8 @@ self: {
        ];
        description = "Easy functions for converting from Aeson.Value";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-default" = callPackage
@@ -22560,6 +24397,8 @@ self: {
        ];
        description = "Apply a json-patch to any haskell datatype";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-extra" = callPackage
@@ -22606,6 +24445,8 @@ self: {
        ];
        description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-flat" = callPackage
@@ -22655,6 +24496,8 @@ self: {
        ];
        description = "Create Flow type definitions from Haskell data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-gadt-th" = callPackage
@@ -22726,6 +24569,8 @@ self: {
        ];
        description = "Injecting fields into aeson values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-iproute" = callPackage
@@ -22789,6 +24634,8 @@ self: {
        ];
        description = "Declarative JSON matchers";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-native" = callPackage
@@ -22809,6 +24656,8 @@ self: {
        ];
        description = "Fast JSON parsing and encoding (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-optics" = callPackage
@@ -22841,6 +24690,8 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        description = "Options to derive FromJSON/ToJSON instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-parsec-picky" = callPackage
@@ -22884,6 +24735,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec mtl text ];
        description = "Hiearchical prefixing for aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-pretty" = callPackage
@@ -22986,6 +24839,8 @@ self: {
        ];
        description = "Haskell JSON schema validator and parser generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-schemas" = callPackage
@@ -23015,6 +24870,8 @@ self: {
        ];
        description = "Easily consume JSON data on-demand with type-safety";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-serialize" = callPackage
@@ -23043,6 +24900,8 @@ self: {
        ];
        description = "Smart derivation of Aeson instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-streams" = callPackage
@@ -23058,6 +24917,8 @@ self: {
        ];
        description = "An HTTP client library for JSON-based APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-t" = callPackage
@@ -23077,6 +24938,8 @@ self: {
        ];
        description = "Transform JSON";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-tiled" = callPackage
@@ -23096,6 +24959,8 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "Aeson instances for the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-toolkit" = callPackage
@@ -23130,6 +24995,8 @@ self: {
        ];
        description = "Generate TypeScript definition files from your ADTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-utils" = callPackage
@@ -23147,6 +25014,8 @@ self: {
        ];
        description = "Utilities for working with Aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-value-parser" = callPackage
@@ -23247,6 +25116,8 @@ self: {
        ];
        description = "A simple Game Engine using SDL";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "affine" = callPackage
@@ -23275,6 +25146,8 @@ self: {
        ];
        description = "General-purpose sampling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "affinely-extended" = callPackage
@@ -23324,6 +25197,8 @@ self: {
        ];
        description = "Infinite state model checking of iterative C programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ag-pictgen" = callPackage
@@ -23337,6 +25212,8 @@ self: {
        executableHaskellDepends = [ base containers uuagc uulib ];
        description = "Attribute Grammar picture generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "agda-server" = callPackage
@@ -23357,6 +25234,8 @@ self: {
        ];
        description = "Http server for Agda (prototype)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "agda-snippets" = callPackage
@@ -23377,6 +25256,8 @@ self: {
        executableHaskellDepends = [ Agda base network-uri transformers ];
        description = "Render just the Agda snippets of a literate Agda file to HTML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "agda-snippets-hakyll" = callPackage
@@ -23393,6 +25274,8 @@ self: {
        ];
        description = "Literate Agda support using agda-snippets, for Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "agda-unused" = callPackage
@@ -23415,6 +25298,8 @@ self: {
        testHaskellDepends = [ base containers filepath hspec text ];
        description = "Check for unused code in an Agda project";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "agda2lagda" = callPackage
@@ -23451,6 +25336,8 @@ self: {
        ];
        description = "AgentX protocol for write SNMP subagents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "agum" = callPackage
@@ -23483,6 +25370,8 @@ self: {
        ];
        description = "And-inverter graphs in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aip" = callPackage
@@ -23511,6 +25400,8 @@ self: {
        ];
        description = "Aeronautical Information Package (AIP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "air" = callPackage
@@ -23565,6 +25456,8 @@ self: {
        libraryHaskellDepends = [ air base template-haskell ];
        description = "air";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "airbrake" = callPackage
@@ -23584,6 +25477,8 @@ self: {
        ];
        description = "An Airbrake notifier for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "airship" = callPackage
@@ -23613,6 +25508,8 @@ self: {
        ];
        description = "A Webmachine-inspired HTTP library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "airtable-api" = callPackage
@@ -23630,6 +25527,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Requesting and introspecting Tables within an Airtable project";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aivika" = callPackage
@@ -23678,6 +25577,8 @@ self: {
        ];
        description = "Parallel distributed discrete event simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aivika-experiment" = callPackage
@@ -23743,6 +25644,8 @@ self: {
        ];
        description = "Diagrams-based charting backend for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aivika-gpss" = callPackage
@@ -23834,6 +25737,8 @@ self: {
        ];
        description = "Haskell compiler that produce binary through C language";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "al" = callPackage
@@ -23899,6 +25804,8 @@ self: {
        ];
        description = "Bindings to the alerta REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alerts" = callPackage
@@ -23954,6 +25861,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Collection of useful functions for writing console applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alex-tools" = callPackage
@@ -23970,6 +25879,8 @@ self: {
        ];
        description = "A set of functions for a common use case of Alex";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alfred" = callPackage
@@ -23988,6 +25899,8 @@ self: {
        ];
        description = "utility library for Alfred version 2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alfred-margaret" = callPackage
@@ -24054,6 +25967,8 @@ self: {
        ];
        description = "Algorithmic automation for various DAWs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebra" = callPackage
@@ -24089,6 +26004,8 @@ self: {
        ];
        description = "Model and test API surfaces algebraically";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebra-dag" = callPackage
@@ -24104,6 +26021,8 @@ self: {
        ];
        description = "Infrastructure for DAG-shaped relational algebra plans";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebra-driven-design" = callPackage
@@ -24148,6 +26067,8 @@ self: {
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebraic" = callPackage
@@ -24159,6 +26080,8 @@ self: {
        libraryHaskellDepends = [ accelerate base ];
        description = "General linear algebra structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebraic-classes" = callPackage
@@ -24206,6 +26129,8 @@ self: {
        ];
        description = "Algebraically structured Prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algo-s" = callPackage
@@ -24231,6 +26156,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "An implementation of Knuth's algorithm S";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algolia" = callPackage
@@ -24256,6 +26183,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A client implementing the Algolia search API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "align" = callPackage
@@ -24280,6 +26209,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A simple unix filter to align text on specified substrings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aligned-foreignptr" = callPackage
@@ -24355,6 +26286,8 @@ self: {
        ];
        description = "Ally Invest integration library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "almost-fix" = callPackage
@@ -24388,6 +26321,8 @@ self: {
        ];
        description = "a practical affine language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alpha" = callPackage
@@ -24408,6 +26343,8 @@ self: {
        ];
        description = "A compiler for the Alpha language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alphachar" = callPackage
@@ -24428,6 +26365,8 @@ self: {
        ];
        description = "A character between a-z";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alpino-tools" = callPackage
@@ -24467,6 +26406,8 @@ self: {
        librarySystemDepends = [ alsaLib ];
        description = "Binding to the ALSA Library API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-core" = callPackage
@@ -24497,6 +26438,8 @@ self: {
        ];
        description = "Some simple interactive programs for sending MIDI control messages via ALSA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alsa-midi" = callPackage
@@ -24517,6 +26460,8 @@ self: {
        executableSystemDepends = [ alsaLib ];
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-mixer" = callPackage
@@ -24564,6 +26509,8 @@ self: {
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA audio signal library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alsa-seq" = callPackage
@@ -24598,6 +26545,8 @@ self: {
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA sequencer library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "altcomposition" = callPackage
@@ -24609,6 +26558,8 @@ self: {
        libraryHaskellDepends = [ base composition ];
        description = "Alternative combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alternative-extra" = callPackage
@@ -24620,6 +26571,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Extra utilities for alternatives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alternative-io" = callPackage
@@ -24637,6 +26590,8 @@ self: {
        ];
        description = "IO as Alternative instance (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alternative-vector" = callPackage
@@ -24699,6 +26654,8 @@ self: {
        executableHaskellDepends = [ base warp ];
        description = "Implement a menu experience fit for web users";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "altsvc" = callPackage
@@ -24727,6 +26684,8 @@ self: {
        librarySystemDepends = [ alure ];
        description = "A Haskell binding for ALURE";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) alure;};
 
   "amazon-emailer" = callPackage
@@ -24746,6 +26705,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "amazon-emailer-client-snap" = callPackage
@@ -24760,6 +26721,8 @@ self: {
        ];
        description = "Client library for amazon-emailer daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amazon-products" = callPackage
@@ -24785,6 +26748,8 @@ self: {
        ];
        description = "Connector for Amazon Products API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amazonka" = callPackage
@@ -24809,6 +26774,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Comprehensive Amazon Web Services SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amazonka-alexa-business" = callPackage
@@ -26751,6 +28718,8 @@ self: {
        ];
        description = "Provides conduits to upload data to S3 using the Multipart API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amazonka-sagemaker" = callPackage
@@ -27239,6 +29208,8 @@ self: {
        benchmarkHaskellDepends = [ base statistics ];
        description = "Statistical data visualization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ampersand" = callPackage
@@ -27269,6 +29240,8 @@ self: {
        ];
        description = "Toolsuite for automated design of business processes";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amqp" = callPackage
@@ -27316,6 +29289,8 @@ self: {
        ];
        description = "Conduit bindings for AMQP (see amqp package)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amqp-streamly" = callPackage
@@ -27332,6 +29307,8 @@ self: {
        ];
        description = "A simple streamly wrapper for amqp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amqp-utils" = callPackage
@@ -27415,6 +29392,8 @@ self: {
        ];
        description = "making data science easy and safe with data frames";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "analyze-client" = callPackage
@@ -27431,6 +29410,8 @@ self: {
        ];
        description = "Client for analyze service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "anansi" = callPackage
@@ -27483,6 +29464,8 @@ self: {
        ];
        description = "Looms which use Pandoc to parse and produce a variety of formats";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "anatomy" = callPackage
@@ -27509,6 +29492,8 @@ self: {
        ];
        description = "Anatomy: Atomo documentation system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "android" = callPackage
@@ -27520,6 +29505,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "Android methods exposed to Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "android-activity" = callPackage
@@ -27531,6 +29518,8 @@ self: {
        libraryHaskellDepends = [ base data-default ];
        description = "Turn regular Haskell programs into Android Activities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "android-lint-summary" = callPackage
@@ -27557,6 +29546,8 @@ self: {
        ];
        description = "A pretty printer for Android Lint errors";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "angel" = callPackage
@@ -27584,6 +29575,8 @@ self: {
        ];
        description = "Process management and supervision daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "angle" = callPackage
@@ -27612,6 +29605,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A small, general-purpose programming language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "animalcase" = callPackage
@@ -27644,6 +29639,8 @@ self: {
        testHaskellDepends = [ ansi-terminal-game base hspec parsec ];
        description = "text-file based ASCII animator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "animate" = callPackage
@@ -27660,6 +29657,8 @@ self: {
        testHaskellDepends = [ aeson base containers hspec vector ];
        description = "Animation for sprites";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "animate-example" = callPackage
@@ -27678,6 +29677,8 @@ self: {
        ];
        description = "Animation for sprites";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "animate-frames" = callPackage
@@ -27699,6 +29700,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Convert sprite frames to animate files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "animate-preview" = callPackage
@@ -27724,6 +29727,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Preview tool for sprite animation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "animate-sdl2" = callPackage
@@ -27735,6 +29740,8 @@ self: {
        libraryHaskellDepends = [ aeson animate base sdl2 sdl2-image ];
        description = "sdl2 + animate auxiliary library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "anki-tools" = callPackage
@@ -27778,6 +29785,8 @@ self: {
        ];
        description = "Medium-level language that desugars to Morte";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "annihilator" = callPackage
@@ -27800,6 +29809,8 @@ self: {
        libraryHaskellDepends = [ base recursion-schemes ];
        description = "A fixpoint of a functor that can be annotated";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "annotated-wl-pprint" = callPackage
@@ -27824,6 +29835,8 @@ self: {
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Anonymous sum types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "anonymous-sums-tests" = callPackage
@@ -27835,6 +29848,8 @@ self: {
        libraryHaskellDepends = [ anonymous-sums base QuickCheck ];
        description = "QuickCheck functions to accompany the anonymous-sums package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ansi-escape-codes" = callPackage
@@ -27948,6 +29963,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Terminal-based graphing via ANSI and Unicode";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antagonist" = callPackage
@@ -27973,6 +29990,8 @@ self: {
        ];
        description = "A web interface to Antisplice dungeons";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antfarm" = callPackage
@@ -27995,6 +30014,8 @@ self: {
        ];
        description = "Referring expressions for definitions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "anticiv" = callPackage
@@ -28020,6 +30041,8 @@ self: {
        ];
        description = "This is an IRC bot for Mafia and Resistance";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antigate" = callPackage
@@ -28037,6 +30060,8 @@ self: {
        ];
        description = "Interface for antigate.com captcha recognition API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antimirov" = callPackage
@@ -28051,6 +30076,8 @@ self: {
        executableHaskellDepends = [ base containers QuickCheck ];
        description = "Define the language containment (=subtyping) relation on regulare expressions";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-athena" = callPackage
@@ -28072,6 +30099,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-contract" = callPackage
@@ -28085,6 +30114,8 @@ self: {
        ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-core" = callPackage
@@ -28111,6 +30142,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-dynamodb" = callPackage
@@ -28133,6 +30166,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-es" = callPackage
@@ -28152,6 +30187,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-messages" = callPackage
@@ -28176,6 +30213,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-optparse-applicative" = callPackage
@@ -28197,6 +30236,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-s3" = callPackage
@@ -28225,6 +30266,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-shell" = callPackage
@@ -28254,6 +30297,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-sns" = callPackage
@@ -28277,6 +30322,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-sqs" = callPackage
@@ -28303,6 +30350,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-swf" = callPackage
@@ -28341,6 +30390,8 @@ self: {
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Combinator library for quasi- and anti-quoting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antisplice" = callPackage
@@ -28357,6 +30408,8 @@ self: {
        ];
        description = "An engine for text-based dungeons";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antlr-haskell" = callPackage
@@ -28381,6 +30434,8 @@ self: {
        ];
        description = "A Haskell implementation of the ANTLR top-down parser generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antlrc" = callPackage
@@ -28401,6 +30456,8 @@ self: {
        ];
        description = "Haskell binding to the ANTLR parser generator C runtime library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {antlr3c = null;};
 
   "anydbm" = callPackage
@@ -28416,6 +30473,8 @@ self: {
        libraryHaskellDepends = [ base containers MissingH mtl ];
        description = "Interface for DBM-like database systems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aop-prelude" = callPackage
@@ -28428,6 +30487,8 @@ self: {
        testHaskellDepends = [ base ghc-prim ];
        description = "prelude for Algebra of Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aos-signature" = callPackage
@@ -28448,6 +30509,8 @@ self: {
        ];
        description = "An implementation of the AOS signatures";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aosd" = callPackage
@@ -28468,6 +30531,8 @@ self: {
        ];
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libaosd;};
 
   "ap-normalize" = callPackage
@@ -28540,6 +30605,8 @@ self: {
        ];
        description = "Get all your structure and rip it apart";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apecs" = callPackage
@@ -28572,6 +30639,8 @@ self: {
        ];
        description = "Simple gloss renderer for apecs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apecs-physics" = callPackage
@@ -28588,6 +30657,8 @@ self: {
        ];
        description = "2D physics for apecs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apecs-physics-gloss" = callPackage
@@ -28599,6 +30670,8 @@ self: {
        libraryHaskellDepends = [ apecs apecs-physics base gloss ];
        description = "Gloss rendering for apecs-physics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apecs-stm" = callPackage
@@ -28615,6 +30688,8 @@ self: {
        ];
        description = "STM stores for apecs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apelsin" = callPackage
@@ -28636,6 +30711,8 @@ self: {
        ];
        description = "Server and community browser for the game Tremulous";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "api-builder" = callPackage
@@ -28657,6 +30734,8 @@ self: {
        ];
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "api-field-json-th" = callPackage
@@ -28737,6 +30816,8 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "RPC API client for Factom";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "api-rpc-pegnet" = callPackage
@@ -28760,6 +30841,8 @@ self: {
        ];
        description = "simple json-rpc client for PegNet";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "api-tools" = callPackage
@@ -28794,6 +30877,8 @@ self: {
        ];
        description = "DSL for generating API boilerplate and docs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "api-yoti" = callPackage
@@ -28814,6 +30899,8 @@ self: {
        testHaskellDepends = [ base bytestring text ];
        description = "Api bindings for Yoti services";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary" = callPackage
@@ -28846,6 +30933,8 @@ self: {
        ];
        description = "Simple and type safe web framework that generate web API documentation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-authenticate" = callPackage
@@ -28865,6 +30954,8 @@ self: {
        ];
        description = "authenticate support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-clientsession" = callPackage
@@ -28882,6 +30973,8 @@ self: {
        ];
        description = "clientsession support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-cookie" = callPackage
@@ -28897,6 +30990,8 @@ self: {
        ];
        description = "Cookie support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-eventsource" = callPackage
@@ -28908,6 +31003,8 @@ self: {
        libraryHaskellDepends = [ apiary base blaze-builder wai-extra ];
        description = "eventsource support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-helics" = callPackage
@@ -28927,6 +31024,8 @@ self: {
        ];
        description = "helics support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-http-client" = callPackage
@@ -28943,6 +31042,8 @@ self: {
        ];
        description = "A http client for Apiary";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-logger" = callPackage
@@ -28960,6 +31061,8 @@ self: {
        ];
        description = "fast-logger support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-memcached" = callPackage
@@ -28978,6 +31081,8 @@ self: {
        ];
        description = "memcached client for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-mongoDB" = callPackage
@@ -28995,6 +31100,8 @@ self: {
        ];
        description = "mongoDB support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-persistent" = callPackage
@@ -29012,6 +31119,8 @@ self: {
        ];
        description = "persistent support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-purescript" = callPackage
@@ -29031,6 +31140,8 @@ self: {
        ];
        description = "purescript compiler for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-redis" = callPackage
@@ -29042,6 +31153,8 @@ self: {
        libraryHaskellDepends = [ apiary base hedis transformers ];
        description = "redis support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-session" = callPackage
@@ -29053,6 +31166,8 @@ self: {
        libraryHaskellDepends = [ apiary base wai ];
        description = "session support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-websockets" = callPackage
@@ -29064,6 +31179,8 @@ self: {
        libraryHaskellDepends = [ apiary base wai-websockets websockets ];
        description = "websockets support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apioiaf-client" = callPackage
@@ -29096,6 +31213,8 @@ self: {
        ];
        description = "A Template Haskell library for generating type safe API calls";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apns-http2" = callPackage
@@ -29153,6 +31272,8 @@ self: {
        ];
        description = "a faster debian repository";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "app-lens" = callPackage
@@ -29167,6 +31288,8 @@ self: {
        ];
        description = "applicative (functional) bidirectional programming beyond composition chains";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "app-settings" = callPackage
@@ -29221,6 +31344,8 @@ self: {
        ];
        description = "app container types and tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "appendmap" = callPackage
@@ -29262,6 +31387,8 @@ self: {
        ];
        description = "Applicative functor and monad which collects all your fails";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "applicative-numbers" = callPackage
@@ -29289,6 +31416,8 @@ self: {
        ];
        description = "An applicative parser combinator library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "applicative-quoters" = callPackage
@@ -29302,6 +31431,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        description = "Quasiquoters for idiom brackets and an applicative do-notation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "applicative-splice" = callPackage
@@ -29317,6 +31448,8 @@ self: {
        ];
        description = "Write applicative programs in direct style (generalizes idiom brackets)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apply-refact" = callPackage
@@ -29385,6 +31518,8 @@ self: {
        ];
        description = "ApproveAPI Haskell Client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "approx" = callPackage
@@ -29512,6 +31647,8 @@ self: {
        ];
        description = "Pure Haskell arbitrary length FFT library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arbb-vm" = callPackage
@@ -29528,6 +31665,8 @@ self: {
        librarySystemDepends = [ arbb_dev ];
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {arbb_dev = null;};
 
   "arbor-datadog" = callPackage
@@ -29552,6 +31691,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Datadog client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arbor-lru-cache" = callPackage
@@ -29590,6 +31731,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Counter library for submitting metrics to a backend such as datadog";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arbor-monad-logger" = callPackage
@@ -29636,6 +31779,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Core metric library for publishing metrics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arbor-monad-metric-datadog" = callPackage
@@ -29661,6 +31806,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Metric library backend for datadog";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arbor-postgres" = callPackage
@@ -29710,6 +31857,8 @@ self: {
        ];
        description = "Automatic Rule-Based Time Tracker";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arcgrid" = callPackage
@@ -29770,6 +31919,8 @@ self: {
        ];
        description = "Distribute hackage packages to archlinux";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "archive" = callPackage
@@ -29873,6 +32024,8 @@ self: {
        ];
        description = "Archive supplied URLs in WebCite & Internet Archive";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "archlinux" = callPackage
@@ -29888,6 +32041,8 @@ self: {
        ];
        description = "Support for working with Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "archlinux-web" = callPackage
@@ -29913,6 +32068,8 @@ self: {
        ];
        description = "Website maintenance for Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "archnews" = callPackage
@@ -29928,6 +32085,8 @@ self: {
        ];
        description = "Convert Arch Linux package updates in RSS to pretty markdown";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arduino-copilot" = callPackage
@@ -29946,6 +32105,8 @@ self: {
        testHaskellDepends = [ base directory process temporary ];
        description = "Arduino programming in haskell using the Copilot stream DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arena" = callPackage
@@ -29971,6 +32132,8 @@ self: {
        ];
        description = "A journaled data store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arff" = callPackage
@@ -29987,6 +32150,8 @@ self: {
        ];
        description = "Generate Attribute-Relation File Format (ARFF) files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arghwxhaskell" = callPackage
@@ -30000,6 +32165,8 @@ self: {
        executableHaskellDepends = [ base directory wx ];
        description = "An interpreter for the Argh! programming language in wxHaskell";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "argon" = callPackage
@@ -30026,6 +32193,8 @@ self: {
        ];
        description = "Measure your code's complexity";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "argon2" = callPackage
@@ -30044,6 +32213,8 @@ self: {
        ];
        description = "Memory-hard password hash and proof-of-work function";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "argparser" = callPackage
@@ -30056,6 +32227,8 @@ self: {
        testHaskellDepends = [ base containers HTF HUnit ];
        description = "Command line parsing framework for console applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arguedit" = callPackage
@@ -30073,6 +32246,8 @@ self: {
        ];
        description = "A computer assisted argumentation transcription and editing software";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ariadne" = callPackage
@@ -30100,6 +32275,8 @@ self: {
        ];
        description = "Go-to-definition for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arion" = callPackage
@@ -30123,6 +32300,8 @@ self: {
        ];
        description = "Watcher and runner for Hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arion-compose" = callPackage
@@ -30172,6 +32351,8 @@ self: {
        ];
        description = "A practical arithmetic encoding (aka Godel numbering) library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arithmatic" = callPackage
@@ -30244,6 +32425,8 @@ self: {
        ];
        description = "Arithmetic circuits for zkSNARKs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arithmoi" = callPackage
@@ -30274,6 +32457,8 @@ self: {
        ];
        description = "Efficient basic number-theoretic functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arity-generic-liftA" = callPackage
@@ -30301,6 +32486,8 @@ self: {
        executableHaskellDepends = [ base GLUT mtl OpenGL stm ];
        description = "Space-based real time strategy game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "armor" = callPackage
@@ -30321,6 +32508,8 @@ self: {
        ];
        description = "Prevent serialization backwards compatibility problems using golden tests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arpa" = callPackage
@@ -30335,6 +32524,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for reading ARPA n-gram models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arpack" = callPackage
@@ -30358,6 +32549,8 @@ self: {
        ];
        description = "Solve large scale eigenvalue problems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) arpack;};
 
   "array_0_5_4_0" = callPackage
@@ -30384,6 +32577,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Builders for arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "array-chunks" = callPackage
@@ -30401,6 +32596,8 @@ self: {
        ];
        description = "Lists of chunks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "array-forth" = callPackage
@@ -30426,6 +32623,8 @@ self: {
        ];
        description = "A simple interpreter for arrayForth, the language used on GreenArrays chips";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "array-list" = callPackage
@@ -30440,6 +32639,8 @@ self: {
        ];
        description = "IsList instances of Array for OverloadedLists extension";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "array-memoize" = callPackage
@@ -30468,6 +32669,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ghc-prim ];
        description = "Extra foreign primops for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "array-utils" = callPackage
@@ -30503,6 +32706,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings to the ArrayFire general-purpose GPU library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {af = null;};
 
   "arraylist" = callPackage
@@ -30520,6 +32725,8 @@ self: {
        ];
        description = "Memory-efficient ArrayList implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arrow-extras" = callPackage
@@ -30545,6 +32752,8 @@ self: {
        ];
        description = "Improved arrows";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arrow-list" = callPackage
@@ -30556,6 +32765,8 @@ self: {
        libraryHaskellDepends = [ base containers fail mtl ];
        description = "List arrows for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arrowapply-utils" = callPackage
@@ -30567,6 +32778,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities for working with ArrowApply instances more naturally";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arrowp" = callPackage
@@ -30580,6 +32793,8 @@ self: {
        executableHaskellDepends = [ array base containers haskell-src ];
        description = "preprocessor translating arrow notation into Haskell 98";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arrowp-qq" = callPackage
@@ -30600,6 +32815,8 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts NoHoed ];
        description = "A preprocessor and quasiquoter for translating arrow notation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arrows" = callPackage
@@ -30624,6 +32841,8 @@ self: {
        ];
        description = "A simple, arrow-based reactive programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "artifact" = callPackage
@@ -30637,6 +32856,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "Basic types and instances for Valve's Artifact Card-set API";
        license = stdenv.lib.licenses.agpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arx" = callPackage
@@ -30687,6 +32908,8 @@ self: {
        testHaskellDepends = [ base hedgehog jwt mtl text time ];
        description = "Atlassian Service Authentication Protocol";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascetic" = callPackage
@@ -30777,6 +33000,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Flattens European non-ASCII characaters into ASCII";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascii-group" = callPackage
@@ -30856,6 +33081,8 @@ self: {
        ];
        description = "Compact representation of ASCII strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascii-superset" = callPackage
@@ -30885,6 +33112,8 @@ self: {
        ];
        description = "ASCII table";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascii-th" = callPackage
@@ -30921,6 +33150,8 @@ self: {
        ];
        description = "Process Ascii Vectors for Advantest 93k";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascii85-conduit" = callPackage
@@ -30933,6 +33164,8 @@ self: {
        testHaskellDepends = [ base bytestring conduit hspec ];
        description = "Conduit for encoding ByteString into Ascii85";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asciichart" = callPackage
@@ -30983,6 +33216,8 @@ self: {
        executableHaskellDepends = [ asil base bytestring utf8-string ];
        description = "Action Script Instrumentation Compiler";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asif" = callPackage
@@ -31043,6 +33278,8 @@ self: {
        ];
        description = "Action Script Instrumentation Library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asn" = callPackage
@@ -31057,6 +33294,8 @@ self: {
        ];
        description = "asn type and encoding/decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asn1-codec" = callPackage
@@ -31081,6 +33320,8 @@ self: {
        ];
        description = "Encode and decode ASN.1";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asn1-data" = callPackage
@@ -31097,6 +33338,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asn1-encoding" = callPackage
@@ -31199,6 +33442,8 @@ self: {
        ];
        description = "Helpers for Control.Exception.assert";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "assert-failure" = callPackage
@@ -31226,6 +33471,8 @@ self: {
        testHaskellDepends = [ base interpolate process ];
        description = "A simple testing framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asset-bundle" = callPackage
@@ -31254,6 +33501,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Asset map support for the JavaScript broccoli-asset-rev library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "assimp" = callPackage
@@ -31267,6 +33516,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "The Assimp asset import library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) assimp;};
 
   "assoc" = callPackage
@@ -31324,6 +33575,8 @@ self: {
        ];
        description = "An SMTP client library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "assumpta-core" = callPackage
@@ -31356,6 +33609,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A library for constructing AST by using do-notation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ast-monad-json" = callPackage
@@ -31370,6 +33625,8 @@ self: {
        testHaskellDepends = [ ast-monad base hspec text ];
        description = "A library for writing JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ast-path" = callPackage
@@ -31425,6 +33682,8 @@ self: {
        ];
        description = "an incomplete 2d space game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "astro" = callPackage
@@ -31462,6 +33721,8 @@ self: {
        ];
        description = "A GTK-based abstract syntax tree viewer for custom languages and parsers";
        license = stdenv.lib.licenses.bsdOriginal;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "astview-utils" = callPackage
@@ -31525,6 +33786,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Async combinators";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "async-dejafu" = callPackage
@@ -31541,6 +33804,8 @@ self: {
        ];
        description = "Run MonadConc operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "async-extra" = callPackage
@@ -31593,6 +33858,8 @@ self: {
        executableHaskellDepends = [ async base stm unordered-containers ];
        description = "A thread manager for async";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "async-pool" = callPackage
@@ -31675,6 +33942,8 @@ self: {
        ];
        description = "Provides API for timer based execution of IO actions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asynchronous-exceptions" = callPackage
@@ -31686,6 +33955,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Distinguish between synchronous and asynchronous exceptions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aterm" = callPackage
@@ -31713,6 +33984,8 @@ self: {
        executableHaskellDepends = [ aterm base transformers wl-pprint ];
        description = "Utility functions for working with aterms as generated by Minitermite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atl" = callPackage
@@ -31751,6 +34024,8 @@ self: {
        libraryPkgconfigDepends = [ zlib ];
        description = "Atlassian Connect snaplet for the Snap Framework and helper code";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "atlassian-connect-descriptor" = callPackage
@@ -31772,6 +34047,8 @@ self: {
        ];
        description = "Code that helps you create a valid Atlassian Connect Descriptor";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atmos" = callPackage
@@ -31810,6 +34087,8 @@ self: {
        libraryHaskellDepends = [ atmos base dimensional-tf ];
        description = "dimensional-tf wrapper on atmos package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atndapi" = callPackage
@@ -31834,6 +34113,8 @@ self: {
        ];
        description = "An interface of ATND API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atom" = callPackage
@@ -31898,6 +34179,8 @@ self: {
        libraryHaskellDepends = [ atom base mtl ];
        description = "Convenience functions for using Atom with the MSP430 microcontroller family";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atomic-file-ops" = callPackage
@@ -31924,6 +34207,8 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A typeclass for mutable references that have an atomic modify operation";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atomic-primops" = callPackage
@@ -31953,6 +34238,8 @@ self: {
        ];
        description = "An atomic counter implemented using the FFI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atomic-primops-vector" = callPackage
@@ -31965,6 +34252,8 @@ self: {
        testHaskellDepends = [ base vector ];
        description = "Atomic operations on Data.Vector types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atomic-write" = callPackage
@@ -32008,6 +34297,8 @@ self: {
        ];
        description = "A highly dynamic, extremely simple, very fun programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atp-haskell" = callPackage
@@ -32025,6 +34316,8 @@ self: {
        testHaskellDepends = [ base containers HUnit time ];
        description = "Translation from Ocaml to Haskell of John Harrison's ATP code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atrans" = callPackage
@@ -32090,6 +34383,8 @@ self: {
        doHaddock = false;
        description = "A build tool for ATS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ats-setup" = callPackage
@@ -32108,6 +34403,8 @@ self: {
        ];
        description = "ATS scripts for Cabal builds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ats-storable" = callPackage
@@ -32125,6 +34422,8 @@ self: {
        testSystemDepends = [ storable ];
        description = "Marshal ATS types into Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {storable = null;};
 
   "attempt" = callPackage
@@ -32136,6 +34435,8 @@ self: {
        libraryHaskellDepends = [ base failure ];
        description = "Concrete data type for handling extensible exceptions as failures. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attic-schedule" = callPackage
@@ -32155,6 +34456,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A script I use to run \"attic\" for my backups";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atto-lisp" = callPackage
@@ -32178,6 +34481,8 @@ self: {
        ];
        description = "Efficient parsing and serialisation of S-Expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attomail" = callPackage
@@ -32200,6 +34505,8 @@ self: {
        testHaskellDepends = [ base doctest Glob QuickCheck ];
        description = "Minimal mail delivery agent (MDA) for local mail with maildir support";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec" = callPackage
@@ -32316,6 +34623,8 @@ self: {
        ];
        description = "Pass input from an enumerator to an Attoparsec parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-expr" = callPackage
@@ -32343,6 +34652,8 @@ self: {
        ];
        description = "Parse IP data types with attoparsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-iso8601" = callPackage
@@ -32371,6 +34682,8 @@ self: {
        ];
        description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-parsec" = callPackage
@@ -32415,6 +34728,8 @@ self: {
        libraryHaskellDepends = [ array attoparsec base containers text ];
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-text-enumerator" = callPackage
@@ -32426,6 +34741,8 @@ self: {
        libraryHaskellDepends = [ attoparsec-text base enumerator text ];
        description = "(deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-time" = callPackage
@@ -32452,6 +34769,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base transformers ];
        description = "Interleaved effects for attoparsec parsers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-uri" = callPackage
@@ -32473,6 +34792,8 @@ self: {
        ];
        description = "URI parser / printer using attoparsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-varword" = callPackage
@@ -32501,6 +34822,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Split a lazy bytestring at boundaries defined by an attoparsec parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atuin" = callPackage
@@ -32517,6 +34840,8 @@ self: {
        ];
        description = "Embedded Turtle language compiler in Haskell, with Epic output";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "audacity" = callPackage
@@ -32558,6 +34883,8 @@ self: {
        ];
        description = "A battery-included audiovisual framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "augeas" = callPackage
@@ -32577,6 +34904,8 @@ self: {
        executablePkgconfigDepends = [ augeas ];
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) augeas;};
 
   "augur" = callPackage
@@ -32595,6 +34924,8 @@ self: {
        ];
        description = "Renaming media collections in a breeze";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aur" = callPackage
@@ -32613,6 +34944,8 @@ self: {
        ];
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aur-api" = callPackage
@@ -32629,6 +34962,8 @@ self: {
        ];
        description = "ArchLinux AUR json v5 API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aura" = callPackage
@@ -32665,6 +35000,8 @@ self: {
        ];
        description = "A secure package manager for Arch Linux and the AUR";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "authenticate" = callPackage
@@ -32706,6 +35043,8 @@ self: {
        libraryHaskellDepends = [ base LDAP text transformers ];
        description = "LDAP authentication for Haskell web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "authenticate-oauth" = callPackage
@@ -32737,6 +35076,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base network text ];
        description = "Password querying for .authinfo";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "authoring" = callPackage
@@ -32755,6 +35096,8 @@ self: {
        ];
        description = "A library for writing papers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "auto" = callPackage
@@ -32831,6 +35174,8 @@ self: {
        ];
        description = "Generates and displays patterns from next nearest neighbors cellular automata";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "automata" = callPackage
@@ -32855,6 +35200,8 @@ self: {
        ];
        description = "automata";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "automitive-cse" = callPackage
@@ -32913,6 +35260,8 @@ self: {
        ];
        description = "Library for Nix expression dependency generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "autonix-deps-kf5" = callPackage
@@ -32936,6 +35285,8 @@ self: {
        ];
        description = "Generate dependencies for KDE 5 Nix expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "autopack" = callPackage
@@ -32947,6 +35298,8 @@ self: {
        libraryHaskellDepends = [ base Cabal dir-traverse filepath ];
        description = "Custom Setup to automate package modules discovery";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "autoproc" = callPackage
@@ -32988,6 +35341,8 @@ self: {
        executableHaskellDepends = [ base JuicyPixels random ];
        description = "A simple random avatar icon generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "average" = callPackage
@@ -33034,6 +35389,8 @@ self: {
        ];
        description = "Server-side implementation of the Avers storage model";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "avers-api" = callPackage
@@ -33050,6 +35407,8 @@ self: {
        ];
        description = "Types describing the core and extended Avers APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "avers-api-docs" = callPackage
@@ -33068,6 +35427,8 @@ self: {
        ];
        description = "Swagger documentation for the Avers API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "avers-server" = callPackage
@@ -33088,6 +35449,8 @@ self: {
        ];
        description = "Server implementation of the Avers API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aviation-cessna172-diagrams" = callPackage
@@ -33131,6 +35494,8 @@ self: {
        ];
        description = "A compile-time balanced AVL tree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "avr-shake" = callPackage
@@ -33142,6 +35507,8 @@ self: {
        libraryHaskellDepends = [ base dependent-sum mtl process shake ];
        description = "AVR Crosspack actions for shake build systems";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "avro" = callPackage
@@ -33213,6 +35580,8 @@ self: {
        ];
        description = "Tool for decoding avro";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "avwx" = callPackage
@@ -33243,6 +35612,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A prelude which I can be happy with. Based on base-prelude.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "awesomium" = callPackage
@@ -33258,6 +35629,8 @@ self: {
        ];
        description = "High-level Awesomium bindings";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "awesomium-glut" = callPackage
@@ -33269,6 +35642,8 @@ self: {
        libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ];
        description = "Utilities for using Awesomium with GLUT";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "awesomium-raw" = callPackage
@@ -33282,6 +35657,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Low-level Awesomium bindings";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {awesomium = null;};
 
   "aws" = callPackage
@@ -33358,6 +35735,8 @@ self: {
        ];
        description = "For signing AWS CloudFront HTTP URL requests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-configuration-tools" = callPackage
@@ -33377,6 +35756,8 @@ self: {
        ];
        description = "Configuration types, parsers & renderers for AWS services";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-dynamodb-conduit" = callPackage
@@ -33394,6 +35775,8 @@ self: {
        ];
        description = "Conduit-based interface for AWS DynamoDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-dynamodb-streams" = callPackage
@@ -33416,6 +35799,8 @@ self: {
        ];
        description = "Haskell bindings for Amazon DynamoDB Streams";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-easy" = callPackage
@@ -33439,6 +35824,8 @@ self: {
        ];
        description = "Helper function and types for working with amazonka";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-ec2" = callPackage
@@ -33468,6 +35855,8 @@ self: {
        ];
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-ec2-knownhosts" = callPackage
@@ -33490,6 +35879,8 @@ self: {
        ];
        description = "Capture and manage AWS EC2 known_host pubkeys";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-elastic-transcoder" = callPackage
@@ -33512,6 +35903,8 @@ self: {
        ];
        description = "Haskell suite for the Elastic Transcoder service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-general" = callPackage
@@ -33537,6 +35930,8 @@ self: {
        ];
        description = "Bindings for Amazon Web Services (AWS) General Reference";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-kinesis" = callPackage
@@ -33562,6 +35957,8 @@ self: {
        ];
        description = "Bindings for Amazon Kinesis";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-kinesis-client" = callPackage
@@ -33596,6 +35993,8 @@ self: {
        ];
        description = "A producer & consumer client library for AWS Kinesis";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-kinesis-reshard" = callPackage
@@ -33624,6 +36023,8 @@ self: {
        ];
        description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-lambda" = callPackage
@@ -33643,6 +36044,8 @@ self: {
        ];
        description = "Haskell bindings for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-lambda-haskell-runtime" = callPackage
@@ -33685,6 +36088,8 @@ self: {
        ];
        description = "Run wai applications on AWS Lambda";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-lambda-runtime" = callPackage
@@ -33707,6 +36112,8 @@ self: {
        executableHaskellDepends = [ aeson base lens lens-aeson text ];
        description = "Haskell on AWS Lambda Runtime API";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-mfa-credentials" = callPackage
@@ -33728,6 +36135,8 @@ self: {
        ];
        description = "Keep your AWS credentials file up to date with MFA-carrying credentials";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-performance-tests" = callPackage
@@ -33753,6 +36162,8 @@ self: {
        ];
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-route53" = callPackage
@@ -33770,6 +36181,8 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-sdk" = callPackage
@@ -33798,6 +36211,8 @@ self: {
        ];
        description = "AWS SDK for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-sdk-text-converter" = callPackage
@@ -33819,6 +36234,8 @@ self: {
        ];
        description = "The text converter for aws-sdk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-sdk-xml-unordered" = callPackage
@@ -33839,6 +36256,8 @@ self: {
        ];
        description = "The xml parser for aws-sdk package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-ses-easy" = callPackage
@@ -33858,6 +36277,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Wrapper over Amazonka's SES";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-sign4" = callPackage
@@ -33881,6 +36302,8 @@ self: {
        ];
        description = "Amazon Web Services (AWS) Signature v4 HTTP request signer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-simple" = callPackage
@@ -33898,6 +36321,8 @@ self: {
        ];
        description = "Dead simple bindings to commonly used AWS Services";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-sns" = callPackage
@@ -33921,6 +36346,8 @@ self: {
        ];
        description = "Bindings for AWS SNS Version 2013-03-31";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "axel" = callPackage
@@ -33972,6 +36399,8 @@ self: {
        testToolDepends = [ hpack tasty-discover ];
        description = "The Axel programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "axiom" = callPackage
@@ -33988,6 +36417,8 @@ self: {
        ];
        description = "Web EDSL for running in browsers and server nodes using transient";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "axiomatic-classes" = callPackage
@@ -34027,6 +36458,8 @@ self: {
        testHaskellDepends = [ base hspec shelly text urbit-hob ];
        description = "Interact with Azimuth from Haskell";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "azubi" = callPackage
@@ -34045,6 +36478,8 @@ self: {
        ];
        description = "A simple DevOps tool which will never \"reach\" enterprice level";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "azure-acs" = callPackage
@@ -34062,6 +36497,8 @@ self: {
        ];
        description = "Windows Azure ACS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "azure-email" = callPackage
@@ -34080,6 +36517,8 @@ self: {
        ];
        description = "send email with microsoft azure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "azure-functions-worker" = callPackage
@@ -34107,6 +36546,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Azure Functions Worker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "azure-service-api" = callPackage
@@ -34125,6 +36566,8 @@ self: {
        ];
        description = "Haskell bindings for the Microsoft Azure Service Management API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "azure-servicebus" = callPackage
@@ -34142,6 +36585,8 @@ self: {
        ];
        description = "Haskell wrapper over Microsoft Azure ServiceBus REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "azurify" = callPackage
@@ -34171,6 +36616,8 @@ self: {
        ];
        description = "A simple library for accessing Azure blob storage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "b-tree" = callPackage
@@ -34237,6 +36684,8 @@ self: {
        ];
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "babl" = callPackage
@@ -34266,6 +36715,8 @@ self: {
        ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "backblaze-b2-hs" = callPackage
@@ -34298,6 +36749,8 @@ self: {
        ];
        description = "A client library to access Backblaze B2 cloud storage in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "backdropper" = callPackage
@@ -34315,6 +36768,8 @@ self: {
        ];
        description = "Rotates backdrops for X11 displays using Imagemagic";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "backprop" = callPackage
@@ -34359,6 +36814,8 @@ self: {
        ];
        description = "Backstop a target directory by source directories";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "backtracking" = callPackage
@@ -34390,6 +36847,8 @@ self: {
        ];
        description = "A monad transformer for backtracking exceptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "backward-state" = callPackage
@@ -34401,6 +36860,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A state monad that runs the state in reverse through the computation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bacteria" = callPackage
@@ -34426,6 +36887,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple stable bag";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bake" = callPackage
@@ -34459,6 +36922,8 @@ self: {
        ];
        description = "Continuous integration system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ballast" = callPackage
@@ -34482,6 +36947,8 @@ self: {
        ];
        description = "Shipwire API client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamboo" = callPackage
@@ -34502,6 +36969,8 @@ self: {
        ];
        description = "A blog engine on Hack";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamboo-launcher" = callPackage
@@ -34522,6 +36991,8 @@ self: {
        ];
        description = "bamboo-launcher";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamboo-plugin-highlight" = callPackage
@@ -34539,6 +37010,8 @@ self: {
        ];
        description = "A highlight middleware";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamboo-plugin-photo" = callPackage
@@ -34557,6 +37030,8 @@ self: {
        ];
        description = "A photo album middleware";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamboo-theme-blueprint" = callPackage
@@ -34575,6 +37050,8 @@ self: {
        ];
        description = "bamboo blueprint theme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamboo-theme-mini-html5" = callPackage
@@ -34597,6 +37074,8 @@ self: {
        ];
        description = "bamboo mini html5 theme";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamse" = callPackage
@@ -34614,6 +37093,8 @@ self: {
        ];
        description = "A Windows Installer (MSI) generator framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamstats" = callPackage
@@ -34627,6 +37108,8 @@ self: {
        executableHaskellDepends = [ base cmdargs samtools ];
        description = "A program to extract various information from BAM alignmnet files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ban-instance" = callPackage
@@ -34641,6 +37124,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "For when a type should never be an instance of a class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bank-holiday-usa" = callPackage
@@ -34653,6 +37138,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck time ];
        description = "A library for determining US bank holidays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bank-holidays-england" = callPackage
@@ -34697,6 +37184,8 @@ self: {
        ];
        description = "Generalized word blacklister";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "barbies" = callPackage
@@ -34758,6 +37247,8 @@ self: {
        executableHaskellDepends = [ base cmdargs csv diagrams filepath ];
        description = "Creating Bar Charts in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "barcodes-code128" = callPackage
@@ -34769,6 +37260,8 @@ self: {
        libraryHaskellDepends = [ base bytestring HPDF ];
        description = "Generate Code 128 barcodes as PDFs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "barecheck" = callPackage
@@ -34780,6 +37273,8 @@ self: {
        libraryHaskellDepends = [ base containers QuickCheck text time ];
        description = "QuickCheck implementations for common types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "barley" = callPackage
@@ -34812,6 +37307,8 @@ self: {
        libraryHaskellDepends = [ base containers filepath glib gtk ];
        description = "Declarative Gtk GUI library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "barrier" = callPackage
@@ -34836,6 +37333,8 @@ self: {
        ];
        description = "Shields.io style badge generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "barrier-monad" = callPackage
@@ -34847,6 +37346,8 @@ self: {
        libraryHaskellDepends = [ base comonad mtl transformers ];
        description = "Implementation of barrier monad, can use custom front/back type";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base_4_14_0_0" = callPackage
@@ -34902,6 +37403,8 @@ self: {
        doHaddock = false;
        description = "Helps migrating projects to base-compat(-batteries)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base-encoding" = callPackage
@@ -34929,6 +37432,8 @@ self: {
        doHaddock = false;
        description = "Semantic CPP feature macros for base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base-generics" = callPackage
@@ -34940,6 +37445,8 @@ self: {
        libraryHaskellDepends = [ base ];
        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;
+       broken = true;
      }) {};
 
   "base-io-access" = callPackage
@@ -34951,6 +37458,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The IO functions included in base delimited into small, composable classes";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base-noprelude" = callPackage
@@ -35116,6 +37625,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast base32 and base32hex codec for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base32-lens" = callPackage
@@ -35242,6 +37753,8 @@ self: {
        ];
        description = "Base62 encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base64" = callPackage
@@ -35292,6 +37805,8 @@ self: {
        ];
        description = "Base64 encoding of byte sequences";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base64-bytestring" = callPackage
@@ -35375,6 +37890,8 @@ self: {
        ];
        description = "Base64-encode and decode streams of bytes. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base64-lens" = callPackage
@@ -35492,6 +38009,8 @@ self: {
        ];
        description = "Baserock Definitions Schema";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "basex-client" = callPackage
@@ -35503,6 +38022,8 @@ self: {
        libraryHaskellDepends = [ base network pureMD5 utf8-string ];
        description = "A BaseX client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bash" = callPackage
@@ -35534,6 +38055,8 @@ self: {
        ];
        description = "Lifting values from base types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "basic-cpuid" = callPackage
@@ -35601,6 +38124,8 @@ self: {
        ];
        description = "An interpreter for a small functional language";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "batch" = callPackage
@@ -35662,6 +38187,8 @@ self: {
        ];
        description = "Batch processing toolset for Linux / Unix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "battlenet" = callPackage
@@ -35675,6 +38202,8 @@ self: {
        ];
        description = "API client for Battle.Net";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "battlenet-yesod" = callPackage
@@ -35688,6 +38217,8 @@ self: {
        ];
        description = "Yesod integration for the battlenet package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "battleplace" = callPackage
@@ -35705,6 +38236,8 @@ self: {
        ];
        description = "Core definitions for BattlePlace.io service";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "battleplace-api" = callPackage
@@ -35718,6 +38251,8 @@ self: {
        ];
        description = "Public API definitions of BattlePlace.io service";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "battleship-combinatorics" = callPackage
@@ -35741,6 +38276,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Compute number of possible arrangements in the battleship game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "battleships" = callPackage
@@ -35773,6 +38310,8 @@ self: {
        ];
        description = "A web-based implementation of battleships including an AI opponent";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bayes-stack" = callPackage
@@ -35792,6 +38331,8 @@ self: {
        ];
        description = "Framework for inferring generative probabilistic models with Gibbs sampling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bazel-coverage-report-renderer" = callPackage
@@ -35809,6 +38350,8 @@ self: {
        ];
        description = "HTML Coverage Reports for Rules_Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bazel-runfiles" = callPackage
@@ -35855,6 +38398,8 @@ self: {
        ];
        description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bcp47" = callPackage
@@ -35874,6 +38419,8 @@ self: {
        ];
        description = "Language tags as specified by BCP 47";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bcrypt" = callPackage
@@ -35932,6 +38479,8 @@ self: {
        ];
        description = "Tools for managing a content store of software packages";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ostree;};
 
   "bdcs-api" = callPackage
@@ -35968,6 +38517,8 @@ self: {
        ];
        description = "BDCS API Server";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libgit2-glib;};
 
   "bdd" = callPackage
@@ -35985,6 +38536,8 @@ self: {
        ];
        description = "Behavior-Driven Development DSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bdelta" = callPackage
@@ -36011,6 +38564,8 @@ self: {
        executableHaskellDepends = [ aeson base network text url ];
        description = "Update CSS in the browser without reloading the page";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam" = callPackage
@@ -36030,6 +38585,8 @@ self: {
        ];
        description = "A type-safe SQL mapper for Haskell that doesn't use Template Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-automigrate" = callPackage
@@ -36067,6 +38624,8 @@ self: {
        ];
        description = "DB migration library for beam, targeting Postgres";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-core" = callPackage
@@ -36088,6 +38647,8 @@ self: {
        ];
        description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-migrate" = callPackage
@@ -36108,6 +38669,8 @@ self: {
        ];
        description = "SQL DDL support and migrations support library for Beam";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-mysql" = callPackage
@@ -36125,6 +38688,8 @@ self: {
        ];
        description = "Connection layer between beam and MySQL/MariaDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-newtype-field" = callPackage
@@ -36140,6 +38705,8 @@ self: {
        ];
        description = "A newtype for wrapping newtypes into beam schemas";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-postgres" = callPackage
@@ -36166,6 +38733,8 @@ self: {
        ];
        description = "Connection layer between beam and postgres";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-sqlite" = callPackage
@@ -36188,6 +38757,8 @@ self: {
        ];
        description = "Beam driver for SQLite";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-th" = callPackage
@@ -36209,6 +38780,8 @@ self: {
        ];
        description = "Template Haskell utilities for beam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beamable" = callPackage
@@ -36233,6 +38806,8 @@ self: {
        ];
        description = "Generic serializer/deserializer with compact representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bearriver" = callPackage
@@ -36261,6 +38836,8 @@ self: {
        executableHaskellDepends = [ array base haskell98 mtl ];
        description = "A pretty-printer for higher-order logic";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bech32" = callPackage
@@ -36288,6 +38865,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bech32-th" = callPackage
@@ -36305,6 +38884,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Template Haskell extensions to the Bech32 library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bed-and-breakfast" = callPackage
@@ -36321,6 +38902,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Efficient Matrix and Vector operations in 100% Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beeminder-api" = callPackage
@@ -36344,6 +38927,8 @@ self: {
        ];
        description = "Bindings to the beeminder.com JSON API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bein" = callPackage
@@ -36367,6 +38952,8 @@ self: {
        ];
        description = "Bein is a provenance and workflow management system for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "belka" = callPackage
@@ -36395,6 +38982,8 @@ self: {
        ];
        description = "HTTP client DSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bench" = callPackage
@@ -36430,6 +39019,8 @@ self: {
        testHaskellDepends = [ base split text ];
        description = "Plot and compare benchmarks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bench-show" = callPackage
@@ -36456,6 +39047,8 @@ self: {
        testHaskellDepends = [ base split text ];
        description = "Show, plot and compare benchmark results";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "benchmark-function" = callPackage
@@ -36523,6 +39116,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bencodex reader/writer for Haskell";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bencoding" = callPackage
@@ -36569,6 +39164,8 @@ self: {
        librarySystemDepends = [ db ];
        description = "Pretty BerkeleyDB v4 binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) db;};
 
   "berp" = callPackage
@@ -36594,6 +39191,8 @@ self: {
        ];
        description = "An implementation of Python 3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bert" = callPackage
@@ -36616,6 +39215,8 @@ self: {
        ];
        description = "BERT implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "besout" = callPackage
@@ -36627,6 +39228,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Extended GCD of polynomials over F_p[x]";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bet" = callPackage
@@ -36653,6 +39256,8 @@ self: {
        ];
        description = "Betfair API bindings. Bet on sports on betting exchanges.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "betacode" = callPackage
@@ -36669,6 +39274,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code).";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "betris" = callPackage
@@ -36691,6 +39298,8 @@ self: {
        ];
        description = "A horizontal version of tetris for braille users";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "between" = callPackage
@@ -36730,6 +39339,8 @@ self: {
        ];
        description = "Bidirectionalization for Free! (POPL'09)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bff-mono" = callPackage
@@ -36772,6 +39383,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring time ];
        description = "Parse BgMax-files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bgzf" = callPackage
@@ -36787,6 +39400,8 @@ self: {
        ];
        description = "Blocked GZip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bhoogle" = callPackage
@@ -36808,6 +39423,8 @@ self: {
        ];
        description = "Simple terminal GUI for local hoogle";
        license = "(BSD-3-Clause OR Apache-2.0)";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bibdb" = callPackage
@@ -36830,6 +39447,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A database based bibliography manager for BibTeX";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bibtex" = callPackage
@@ -36855,6 +39474,8 @@ self: {
        testHaskellDepends = [ base hedgehog mtl ];
        description = "Simple bidirectional serialization and deserialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bidirectionalization-combined" = callPackage
@@ -36874,6 +39495,8 @@ self: {
        ];
        description = "Prototype Implementation of Combining Syntactic and Semantic Bidirectionalization (ICFP'10)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bidispec" = callPackage
@@ -36885,6 +39508,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Specification of generators and parsers";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bidispec-extras" = callPackage
@@ -36896,6 +39521,8 @@ self: {
        libraryHaskellDepends = [ base bytestring dataenc mtl ];
        description = "Extra helper functions for bidirectional specifications";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bifunctor" = callPackage
@@ -36964,6 +39591,8 @@ self: {
        ];
        description = "A parser for the Billboard chord dataset";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "billeksah-forms" = callPackage
@@ -36981,6 +39610,8 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "billeksah-main" = callPackage
@@ -36999,6 +39630,8 @@ self: {
        ];
        description = "Leksah plugin base";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "billeksah-main-static" = callPackage
@@ -37039,6 +39672,8 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "billeksah-services" = callPackage
@@ -37054,6 +39689,8 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bimap" = callPackage
@@ -37175,6 +39812,8 @@ self: {
        ];
        description = "Bit parsing/writing on top of binary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-communicator" = callPackage
@@ -37186,6 +39825,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mtl ];
        description = "Flexible way to ease transmission of binary data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-conduit" = callPackage
@@ -37216,6 +39857,8 @@ self: {
        libraryHaskellDepends = [ base binary ghc-prim ];
        description = "Automatic deriving of Binary using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-enum" = callPackage
@@ -37252,6 +39895,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "binary-file" = callPackage
@@ -37267,6 +39912,8 @@ self: {
        ];
        description = "read/write binary file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-generic" = callPackage
@@ -37304,6 +39951,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-instances" = callPackage
@@ -37482,6 +40131,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mtl ];
        description = "Monad to ease implementing a binary network protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-protocol-zmq" = callPackage
@@ -37497,6 +40148,8 @@ self: {
        ];
        description = "Monad to ease implementing a binary network protocol over ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-search" = callPackage
@@ -37513,6 +40166,8 @@ self: {
        ];
        description = "Binary and exponential searches";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-serialise-cbor" = callPackage
@@ -37585,6 +40240,8 @@ self: {
        ];
        description = "data serialization/deserialization io-streams library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-strict" = callPackage
@@ -37627,6 +40284,8 @@ self: {
        ];
        description = "Tagged binary serialisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-tree" = callPackage
@@ -37666,6 +40325,8 @@ self: {
        ];
        description = "Type-safe binary serialization";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-varint" = callPackage
@@ -37718,6 +40379,8 @@ self: {
        ];
        description = "Data marshaling library that uses type level equations to optimize buffering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binding-core" = callPackage
@@ -37732,6 +40395,8 @@ self: {
        testHaskellDepends = [ base HTF HUnit QuickCheck random ];
        description = "Data Binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binding-gtk" = callPackage
@@ -37746,6 +40411,8 @@ self: {
        testHaskellDepends = [ base binding-core directory gtk ];
        description = "Data Binding in Gtk2Hs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binding-wx" = callPackage
@@ -37760,6 +40427,8 @@ self: {
        testHaskellDepends = [ base binding-core directory wx ];
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings" = callPackage
@@ -37794,6 +40463,8 @@ self: {
        libraryPkgconfigDepends = [ esound ];
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {esound = null;};
 
   "bindings-GLFW" = callPackage
@@ -37832,6 +40503,8 @@ self: {
        librarySystemDepends = [ K8055D ];
        description = "Bindings to Velleman K8055 dll";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {K8055D = null;};
 
   "bindings-apr" = callPackage
@@ -37844,6 +40517,8 @@ self: {
        libraryPkgconfigDepends = [ apr ];
        description = "Low level bindings to Apache Portable Runtime (APR)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) apr;};
 
   "bindings-apr-util" = callPackage
@@ -37856,6 +40531,8 @@ self: {
        libraryPkgconfigDepends = [ apr-util ];
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {apr-util = null;};
 
   "bindings-audiofile" = callPackage
@@ -37883,6 +40560,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Bindings for libbfd, a library of the GNU `binutils'";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {bfd = null; opcodes = null;};
 
   "bindings-cctools" = callPackage
@@ -37895,6 +40574,8 @@ self: {
        librarySystemDepends = [ dttools ];
        description = "Bindings to the CCTools WorkQueue C library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {dttools = null;};
 
   "bindings-codec2" = callPackage
@@ -37938,6 +40619,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Library for using firewire (iidc-1394) cameras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {dc1394 = null;};
 
   "bindings-directfb" = callPackage
@@ -37964,6 +40647,8 @@ self: {
        libraryPkgconfigDepends = [ eskit ];
        description = "Bindings to ESKit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {eskit = null;};
 
   "bindings-fann" = callPackage
@@ -37976,6 +40661,8 @@ self: {
        libraryPkgconfigDepends = [ fann ];
        description = "Low level bindings to FANN neural network library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {fann = null;};
 
   "bindings-fluidsynth" = callPackage
@@ -37988,6 +40675,8 @@ self: {
        libraryPkgconfigDepends = [ fluidsynth ];
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fluidsynth;};
 
   "bindings-friso" = callPackage
@@ -38000,6 +40689,8 @@ self: {
        librarySystemDepends = [ friso ];
        description = "Low level bindings for friso";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {friso = null;};
 
   "bindings-glib" = callPackage
@@ -38048,6 +40739,8 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gsl;};
 
   "bindings-gts" = callPackage
@@ -38077,6 +40770,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) hamlib;};
 
   "bindings-hdf5" = callPackage
@@ -38088,6 +40783,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to HDF5 library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings-levmar" = callPackage
@@ -38137,6 +40834,8 @@ self: {
        libraryPkgconfigDepends = [ libftdi libusb ];
        description = "Low level bindings to libftdi";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libftdi; libusb = null;};
 
   "bindings-libg15" = callPackage
@@ -38149,6 +40848,8 @@ self: {
        librarySystemDepends = [ g15 ];
        description = "Bindings to libg15";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {g15 = null;};
 
   "bindings-librrd" = callPackage
@@ -38161,6 +40862,8 @@ self: {
        libraryPkgconfigDepends = [ librrd ];
        description = "Low level bindings to RRDtool";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {librrd = null;};
 
   "bindings-libstemmer" = callPackage
@@ -38177,6 +40880,8 @@ self: {
        librarySystemDepends = [ stemmer ];
        description = "Binding for libstemmer with low level binding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {stemmer = null;};
 
   "bindings-libusb" = callPackage
@@ -38189,6 +40894,8 @@ self: {
        libraryPkgconfigDepends = [ libusb ];
        description = "Low level bindings to libusb";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libusb = null;};
 
   "bindings-libv4l2" = callPackage
@@ -38201,6 +40908,8 @@ self: {
        librarySystemDepends = [ v4l2 ];
        description = "bindings to libv4l2 for Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {v4l2 = null;};
 
   "bindings-libzip" = callPackage
@@ -38224,6 +40933,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "bindings to Video For Linux Two (v4l2) kernel interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings-lxc" = callPackage
@@ -38260,6 +40971,8 @@ self: {
        libraryPkgconfigDepends = [ monetdb-mapi ];
        description = "Low-level bindings for the MonetDB API (mapi)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {monetdb-mapi = null;};
 
   "bindings-mpdecimal" = callPackage
@@ -38271,6 +40984,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "bindings to mpdecimal library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings-nettle" = callPackage
@@ -38345,6 +41060,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "PPDev bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings-saga-cmd" = callPackage
@@ -38390,6 +41107,8 @@ self: {
        librarySystemDepends = [ scsynth ];
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {scsynth = null;};
 
   "bindings-sipc" = callPackage
@@ -38405,6 +41124,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Low level bindings to SIPC";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {sipc = null;};
 
   "bindings-sophia" = callPackage
@@ -38463,6 +41184,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bindings against the wlc library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {wlc = null;};
 
   "bindings-yices" = callPackage
@@ -38489,6 +41212,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binembed" = callPackage
@@ -38507,6 +41232,8 @@ self: {
        ];
        description = "Embed data into object files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binembed-example" = callPackage
@@ -38523,6 +41250,8 @@ self: {
        ];
        description = "Example project using binembed to embed data in object files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bini" = callPackage
@@ -38592,6 +41321,8 @@ self: {
        executableHaskellDepends = [ base bytestring random ];
        description = "A bioinformatics library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bio-sequence" = callPackage
@@ -38608,6 +41339,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bioace" = callPackage
@@ -38621,6 +41354,8 @@ self: {
        ];
        description = "Library for reading ace assembly files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bioalign" = callPackage
@@ -38632,6 +41367,8 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Data structures and helper functions for calculating alignments";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biocore" = callPackage
@@ -38645,6 +41382,8 @@ self: {
        libraryHaskellDepends = [ base bytestring stringable ];
        description = "A bioinformatics library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biofasta" = callPackage
@@ -38656,6 +41395,8 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Library for reading fasta sequence files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biofastq" = callPackage
@@ -38667,6 +41408,8 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "A library for reading FASTQ files";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biohazard" = callPackage
@@ -38689,6 +41432,8 @@ self: {
        ];
        description = "bioinformatics support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bioinformatics-toolkit" = callPackage
@@ -38725,6 +41470,8 @@ self: {
        ];
        description = "A collection of bioinformatics tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biophd" = callPackage
@@ -38740,6 +41487,8 @@ self: {
        ];
        description = "Library for reading phd sequence files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biopsl" = callPackage
@@ -38756,6 +41505,8 @@ self: {
        executableHaskellDepends = [ cmdargs unordered-containers ];
        description = "Library and executables for working with PSL files";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biosff" = callPackage
@@ -38772,6 +41523,8 @@ self: {
        executableHaskellDepends = [ array base cmdargs mtl ];
        description = "Library and executables for working with SFF files";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biostockholm" = callPackage
@@ -38794,6 +41547,8 @@ self: {
        ];
        description = "Parsing and rendering of Stockholm files (used by Pfam, Rfam and Infernal)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bip32" = callPackage
@@ -38848,6 +41603,8 @@ self: {
        ];
        description = "Plot a colorful tree";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bird" = callPackage
@@ -38868,6 +41625,8 @@ self: {
        ];
        description = "A simple, sinatra-inspired web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "birds-of-paradise" = callPackage
@@ -38880,6 +41639,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Birds of Paradise";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bisc" = callPackage
@@ -38917,6 +41678,8 @@ self: {
        ];
        description = "Determine relevant parts of binary data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bishbosh" = callPackage
@@ -38959,6 +41722,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bit-protocol" = callPackage
@@ -38998,6 +41763,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Lazy, infinite, compact stream of Bool with O(1) indexing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bit-vector" = callPackage
@@ -39048,6 +41815,8 @@ self: {
        ];
        description = "Bitcoin address generation and rendering. Parsing coming soon.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-api" = callPackage
@@ -39072,6 +41841,8 @@ self: {
        ];
        description = "Provides access to the RPC API of Bitcoin Core";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-api-extra" = callPackage
@@ -39094,6 +41865,8 @@ self: {
        ];
        description = "Higher level constructs on top of the bitcoin-api package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-block" = callPackage
@@ -39114,6 +41887,8 @@ self: {
        ];
        description = "Utility functions for manipulating bitcoin blocks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-compact-filters" = callPackage
@@ -39136,6 +41911,8 @@ self: {
        ];
        description = "BIP 158 compact block filters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-hash" = callPackage
@@ -39173,6 +41950,8 @@ self: {
        ];
        description = "Partial implementation of the Bitcoin protocol (as of 2013)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-keys" = callPackage
@@ -39255,6 +42034,8 @@ self: {
        ];
        description = "Library to communicate with the Satoshi Bitcoin daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-script" = callPackage
@@ -39272,6 +42053,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Compilation, manipulation and decompilation of Bitcoin scripts";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-scripting" = callPackage
@@ -39293,6 +42076,8 @@ self: {
        ];
        description = "Resources for working with miniscript, and script descriptors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-tx" = callPackage
@@ -39313,6 +42098,8 @@ self: {
        ];
        description = "Utility functions for manipulating bitcoin transactions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-types" = callPackage
@@ -39359,6 +42146,8 @@ self: {
        ];
        description = "A library for working with bitcoin-core regtest networks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoind-rpc" = callPackage
@@ -39378,6 +42167,8 @@ self: {
        ];
        description = "A streamlined interface to bitcoin core using Haskoin types and Servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitly-cli" = callPackage
@@ -39393,6 +42184,8 @@ self: {
        ];
        description = "A command line tool to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitmap" = callPackage
@@ -39431,6 +42224,8 @@ self: {
        ];
        description = "Bitmap library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bits" = callPackage
@@ -39461,6 +42256,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Atomic bit operations on memory locations for low-level synchronization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bits-bytestring" = callPackage
@@ -39510,6 +42307,8 @@ self: {
        ];
        description = "Bitstream support for Conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bits-extra" = callPackage
@@ -39544,6 +42343,8 @@ self: {
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gcc_s = null;};
 
   "bitset" = callPackage
@@ -39566,6 +42367,8 @@ self: {
        benchmarkSystemDepends = [ gmp ];
        description = "A space-efficient set data structure";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gmp;};
 
   "bitset-word8" = callPackage
@@ -39608,6 +42411,8 @@ self: {
        executablePkgconfigDepends = [ gtk2 pango ];
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk2; inherit (pkgs) pango;};
 
   "bitstream" = callPackage
@@ -39669,6 +42474,8 @@ self: {
        ];
        description = "Bittorrent protocol implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bittrex" = callPackage
@@ -39751,6 +42558,8 @@ self: {
        ];
        description = "Bitwise operations on bounded enumerations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitx-bitcoin" = callPackage
@@ -39774,6 +42583,8 @@ self: {
        ];
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bizzlelude" = callPackage
@@ -39789,6 +42600,8 @@ self: {
        ];
        description = "A lousy Prelude replacement by a lousy dude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bizzlelude-js" = callPackage
@@ -39800,6 +42613,8 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        description = "A lousy Prelude replacement by a lousy dude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bk-tree" = callPackage
@@ -39834,6 +42649,8 @@ self: {
        ];
        description = "Backup utility for backing up to cloud storage services (S3 only right now)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bktrees" = callPackage
@@ -39859,6 +42676,8 @@ self: {
        executableHaskellDepends = [ base haskell98 unix ];
        description = "a stupid cron";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "black-jewel" = callPackage
@@ -39941,6 +42760,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text vector ];
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blakesum-demo" = callPackage
@@ -39958,6 +42779,8 @@ self: {
        ];
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blank-canvas" = callPackage
@@ -40012,6 +42835,8 @@ self: {
        libraryHaskellDepends = [ base ieee QuickCheck storable-complex ];
        description = "Bindings to the BLAS library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blas-carray" = callPackage
@@ -40071,6 +42896,8 @@ self: {
        testHaskellDepends = [ base vector ];
        description = "Low-level Haskell bindings to Blas";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) blas;};
 
   "blastxml" = callPackage
@@ -40084,6 +42911,8 @@ self: {
        ];
        description = "Library for reading Blast XML output";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blatex" = callPackage
@@ -40101,6 +42930,8 @@ self: {
        ];
        description = "Blog in LaTeX";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze" = callPackage
@@ -40173,6 +43004,8 @@ self: {
        ];
        description = "Enumeratees for the incremental conversion of builders to bytestrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze-colonnade" = callPackage
@@ -40189,6 +43022,8 @@ self: {
        testHaskellDepends = [ base colonnade doctest ];
        description = "blaze-html backend for colonnade";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze-from-html" = callPackage
@@ -40240,6 +43075,8 @@ self: {
        ];
        description = "Some contributions to add handy things to blaze html";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze-html-hexpat" = callPackage
@@ -40251,6 +43088,8 @@ self: {
        libraryHaskellDepends = [ base blaze-html bytestring hexpat text ];
        description = "A hexpat backend for blaze-html";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze-html-truncate" = callPackage
@@ -40266,6 +43105,8 @@ self: {
        ];
        description = "A truncator for blaze-html";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze-json" = callPackage
@@ -40287,6 +43128,8 @@ self: {
        ];
        description = "tiny library for encoding json";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze-markup" = callPackage
@@ -40365,6 +43208,8 @@ self: {
        ];
        description = "Fast rendering of common datatypes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blazeMarker" = callPackage
@@ -40393,6 +43238,8 @@ self: {
        ];
        description = "A true monad (transformer) version of the blaze-markup and blaze-html libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ble" = callPackage
@@ -40424,6 +43271,8 @@ self: {
        ];
        description = "Bluetooth Low Energy (BLE) peripherals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blink1" = callPackage
@@ -40442,6 +43291,8 @@ self: {
        ];
        description = "Control library for blink(1) LED from ThingM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blip" = callPackage
@@ -40460,6 +43311,8 @@ self: {
        ];
        description = "Python to bytecode compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bliplib" = callPackage
@@ -40475,6 +43328,8 @@ self: {
        ];
        description = "Support code for Blip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blockchain" = callPackage
@@ -40498,6 +43353,8 @@ self: {
        ];
        description = "Generic blockchain implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blockhash" = callPackage
@@ -40519,6 +43376,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Blockhash perceptual image hash algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blocking-transactions" = callPackage
@@ -40551,6 +43410,8 @@ self: {
        executableHaskellDepends = [ base ConfigFile haskell98 old-time ];
        description = "Very simple static blog software";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bloodhound" = callPackage
@@ -40579,6 +43440,8 @@ self: {
        ];
        description = "Elasticsearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bloodhound-amazonka-auth" = callPackage
@@ -40601,6 +43464,8 @@ self: {
        ];
        description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bloomfilter" = callPackage
@@ -40639,6 +43504,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Distributed bloom filters on Redis (using the Hedis client)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blosum" = callPackage
@@ -40660,6 +43527,8 @@ self: {
        ];
        description = "BLOSUM generator";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bloxorz" = callPackage
@@ -40674,6 +43543,8 @@ self: {
        executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blubber" = callPackage
@@ -40691,6 +43562,8 @@ self: {
        ];
        description = "The blubber client; connects to the blubber server";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blubber-server" = callPackage
@@ -40712,6 +43585,8 @@ self: {
        ];
        description = "The blubber server, serves blubber clients";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blucontrol" = callPackage
@@ -40801,6 +43676,8 @@ self: {
        executablePkgconfigDepends = [ gtk2 ];
        description = "full-featured tiling for the GNOME desktop environment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk2;};
 
   "bluetileutils" = callPackage
@@ -40814,6 +43691,8 @@ self: {
        executableHaskellDepends = [ base gtk ];
        description = "Utilities for Bluetile";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blunk-hask-tests" = callPackage
@@ -40829,6 +43708,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blunt" = callPackage
@@ -40850,6 +43731,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convert between pointfree and pointful expressions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bmp" = callPackage
@@ -40874,6 +43757,8 @@ self: {
        ];
        description = "Library for communication with the Bosch BNO055 orientation sensor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "board-games" = callPackage
@@ -40942,6 +43827,8 @@ self: {
        ];
        executableHaskellDepends = [ base hogre hois random ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boilerplate" = callPackage
@@ -40970,6 +43857,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Generate Haskell boilerplate";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bolt" = callPackage
@@ -40993,6 +43882,8 @@ self: {
        ];
        description = "Bolt driver for Neo4j";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boltzmann-brain" = callPackage
@@ -41018,6 +43909,8 @@ self: {
        ];
        description = "Analytic sampler compiler for combinatorial systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boltzmann-samplers" = callPackage
@@ -41068,6 +43961,8 @@ self: {
        ];
        description = "Bond schema compiler and code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bond-haskell" = callPackage
@@ -41096,6 +43991,8 @@ self: {
        ];
        description = "Runtime support for BOND serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bond-haskell-compiler" = callPackage
@@ -41117,6 +44014,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bond code generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bookkeeper" = callPackage
@@ -41144,6 +44043,8 @@ self: {
        ];
        description = "Anonymous records and overloaded labels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bookkeeper-permissions" = callPackage
@@ -41155,6 +44056,8 @@ self: {
        libraryHaskellDepends = [ base bookkeeper type-level-sets ];
        description = "Permissions for bookkeeper records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bookkeeping" = callPackage
@@ -41251,6 +44154,8 @@ self: {
        ];
        description = "Boolean normal form: NNF, DNF & CNF";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boolector" = callPackage
@@ -41282,6 +44187,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Boolean expressions with various representations and search queries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bools" = callPackage
@@ -41339,6 +44246,8 @@ self: {
        ];
        description = "Chronokinetic stream sources and incremental consumers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boomerang" = callPackage
@@ -41371,6 +44280,8 @@ self: {
        ];
        description = "Boomshine clone";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boop" = callPackage
@@ -41406,6 +44317,8 @@ self: {
        ];
        description = "Mathematically sound sound synthesis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boots" = callPackage
@@ -41442,6 +44355,8 @@ self: {
        executableHaskellDepends = [ base time ];
        description = "Factory for quickly building an application";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boots-cloud" = callPackage
@@ -41459,6 +44374,8 @@ self: {
        ];
        description = "Factory for quickly building a microservice";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boots-web" = callPackage
@@ -41478,6 +44395,8 @@ self: {
        ];
        description = "Factory for quickly building a web application";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bootstrap-types" = callPackage
@@ -41532,6 +44451,8 @@ self: {
        ];
        description = "Metering System for OpenStack metrics provided by Vaultaire";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boring" = callPackage
@@ -41581,6 +44502,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A boring window switcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bot" = callPackage
@@ -41592,6 +44515,8 @@ self: {
        libraryHaskellDepends = [ arrows base Stream ];
        description = "bots for functional reactive programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "both" = callPackage
@@ -41616,6 +44541,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Build tool for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bound" = callPackage
@@ -41685,6 +44612,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Arrays with a value for every index";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bounded-queue" = callPackage
@@ -41754,6 +44683,8 @@ self: {
        ];
        description = "audio-visual pseudo-physical simulation of colliding circles";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "box" = callPackage
@@ -41779,6 +44710,8 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "boxes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "box-csv" = callPackage
@@ -41795,6 +44728,8 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "box-socket" = callPackage
@@ -41817,6 +44752,8 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "box-tuples" = callPackage
@@ -41873,6 +44810,8 @@ self: {
        ];
        description = "Types and functions to work with braids and Khovanov homology";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brain-bleep" = callPackage
@@ -41886,6 +44825,8 @@ self: {
        executableHaskellDepends = [ array base containers parsec ];
        description = "primitive imperative language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brainfuck" = callPackage
@@ -41968,6 +44909,8 @@ self: {
        executableHaskellDepends = [ base haskgame mtl SDL ];
        description = "A simple Breakout game implementation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "breve" = callPackage
@@ -41991,6 +44934,8 @@ self: {
        ];
        description = "a url shortener";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brians-brain" = callPackage
@@ -42004,6 +44949,8 @@ self: {
        executableHaskellDepends = [ array base parallel random SDL ];
        description = "A Haskell implementation of the Brian's Brain cellular automaton";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brick" = callPackage
@@ -42079,6 +45026,8 @@ self: {
        ];
        description = "A drop-down menu widget for brick";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brick-filetree" = callPackage
@@ -42138,6 +45087,8 @@ self: {
        ];
        description = "Bricks is a lazy functional language based on Nix";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bricks-internal" = callPackage
@@ -42156,6 +45107,8 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bricks-internal-test" = callPackage
@@ -42171,6 +45124,8 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bricks-parsec" = callPackage
@@ -42191,6 +45146,8 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bricks-rendering" = callPackage
@@ -42211,6 +45168,8 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bricks-syntax" = callPackage
@@ -42231,6 +45190,8 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brillig" = callPackage
@@ -42251,6 +45212,8 @@ self: {
        ];
        description = "Simple part of speech tagger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brittany" = callPackage
@@ -42373,6 +45336,8 @@ self: {
        libraryHaskellDepends = [ base containers stm time ];
        description = "Small library for interactive functional programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brok" = callPackage
@@ -42400,6 +45365,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Finds broken links in text files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "broker-haskell" = callPackage
@@ -42413,6 +45380,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Haskell bindings to Broker, Bro's messaging library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {broker = null;};
 
   "bronyradiogermany-common" = callPackage
@@ -42430,6 +45399,8 @@ self: {
        ];
        description = "Common types and URIs for the BronyRadioGermany API bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bronyradiogermany-streaming" = callPackage
@@ -42450,6 +45421,8 @@ self: {
        ];
        description = "Streaming interface for the BronyRadioGermany API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brotli" = callPackage
@@ -42470,6 +45443,8 @@ self: {
        ];
        description = "Brotli (RFC7932) compression and decompression";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libbrotlidec = null; libbrotlienc = null;};
 
   "brotli-conduit" = callPackage
@@ -42490,6 +45465,8 @@ self: {
        ];
        description = "Conduit interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brotli-streams" = callPackage
@@ -42510,6 +45487,8 @@ self: {
        ];
        description = "IO-Streams interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "browscap" = callPackage
@@ -42526,6 +45505,8 @@ self: {
        ];
        description = "A reader and interface for the Browser Capabilities Project data files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bsb-http-chunked" = callPackage
@@ -42560,6 +45541,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Access to the BSD sysctl(3) interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bson" = callPackage
@@ -42581,6 +45564,8 @@ self: {
        ];
        description = "BSON documents are JSON-like objects with a standard binary encoding";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bson-generic" = callPackage
@@ -42592,6 +45577,8 @@ self: {
        libraryHaskellDepends = [ base bson ghc-prim text ];
        description = "Generic functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bson-generics" = callPackage
@@ -42603,6 +45590,8 @@ self: {
        libraryHaskellDepends = [ base bson ghc-prim ];
        description = "Generics functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bson-lens" = callPackage
@@ -42614,6 +45603,8 @@ self: {
        libraryHaskellDepends = [ base bson lens text ];
        description = "BSON lenses";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bson-mapping" = callPackage
@@ -42660,6 +45651,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A simple unassuming parser for bytestring";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "btree" = callPackage
@@ -42679,6 +45672,8 @@ self: {
        benchmarkHaskellDepends = [ base clock ghc-prim hashable ];
        description = "B-Tree on Unmanaged Heap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "btree-concurrent" = callPackage
@@ -42701,6 +45696,8 @@ self: {
        ];
        description = "A backend agnostic, concurrent BTree";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "btrfs" = callPackage
@@ -42752,6 +45749,8 @@ self: {
        ];
        description = "Automates most of your plain text accounting data entry in ledger format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buffer" = callPackage
@@ -42773,6 +45772,8 @@ self: {
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "Simple mutable low-level buffer for IO";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buffer-builder" = callPackage
@@ -42797,6 +45798,8 @@ self: {
        ];
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buffer-builder-aeson" = callPackage
@@ -42825,6 +45828,8 @@ self: {
        ];
        description = "Serialize Aeson values with Data.BufferBuilder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buffer-pipe" = callPackage
@@ -42867,6 +45872,8 @@ self: {
        doHaddock = false;
        description = "Assembles many Dockerfiles in one";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buffon" = callPackage
@@ -42883,6 +45890,8 @@ self: {
        ];
        description = "An implementation of Buffon machines";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buffon-machines" = callPackage
@@ -42932,6 +45941,8 @@ self: {
        ];
        description = "Bugsnag error reporter for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bugsnag-hs" = callPackage
@@ -42969,6 +45980,8 @@ self: {
        ];
        description = "A Haskell interface to the Bugzilla native REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bugzilla-redhat" = callPackage
@@ -43008,6 +46021,8 @@ self: {
        testHaskellDepends = [ base containers extra mtl transformers ];
        description = "Build systems a la carte";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buildable" = callPackage
@@ -43019,6 +46034,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers dlist text ];
        description = "Typeclass for builders of linear data structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buildbox" = callPackage
@@ -43035,6 +46052,8 @@ self: {
        ];
        description = "Rehackable components for writing buildbots and test harnesses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buildbox-tools" = callPackage
@@ -43048,6 +46067,8 @@ self: {
        executableHaskellDepends = [ base buildbox parseargs ];
        description = "Tools for working with buildbox benchmark result files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "builder" = callPackage
@@ -43062,6 +46083,8 @@ self: {
        ];
        description = "bounded ByteArray builder type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buildwrapper" = callPackage
@@ -43099,6 +46122,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "bullet" = callPackage
@@ -43112,6 +46137,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A wrapper for the Bullet physics engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) bullet;};
 
   "bulletproofs" = callPackage
@@ -43149,6 +46176,8 @@ self: {
        ];
        description = "Bulletproofs are short zero-knowledge proofs without a trusted setup";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bulmex" = callPackage
@@ -43173,6 +46202,8 @@ self: {
        ];
        description = "Reflex infused with bulma (css)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bumper" = callPackage
@@ -43192,6 +46223,8 @@ self: {
        ];
        description = "Automatically bump package versions, also transitively";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bunz" = callPackage
@@ -43207,6 +46240,8 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        description = "CLI tool to beautify JSON string";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "burnt-explorer" = callPackage
@@ -43224,6 +46259,8 @@ self: {
        ];
        description = "List OP_RETURN cryptocurrency transaction outputs";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "burrito" = callPackage
@@ -43272,6 +46309,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Burst detection algorithms";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bus-pirate" = callPackage
@@ -43288,6 +46327,8 @@ self: {
        ];
        description = "Haskell interface to the Bus Pirate binary interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buster" = callPackage
@@ -43304,6 +46345,8 @@ self: {
        ];
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buster-gtk" = callPackage
@@ -43320,6 +46363,8 @@ self: {
        ];
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buster-network" = callPackage
@@ -43336,6 +46381,8 @@ self: {
        ];
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bustle" = callPackage
@@ -43411,6 +46458,8 @@ self: {
        ];
        description = "Monad Transformer for Asyncronous Message Passing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "butterflies" = callPackage
@@ -43432,6 +46481,8 @@ self: {
        ];
        description = "butterfly tilings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bv" = callPackage
@@ -43501,6 +46552,8 @@ self: {
        ];
        description = "a bitvector datatype that is parameterized by the vector width";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "byline" = callPackage
@@ -43524,6 +46577,8 @@ self: {
        ];
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytable" = callPackage
@@ -43535,6 +46590,8 @@ self: {
        libraryHaskellDepends = [ base bytestring word24 ];
        description = "data from/to ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "byte-count-reader" = callPackage
@@ -43585,6 +46642,8 @@ self: {
        libraryHaskellDepends = [ base bytestring primitive text ];
        description = "Parsing of bytearray-based data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytebuild" = callPackage
@@ -43615,6 +46674,8 @@ self: {
        ];
        description = "Serialize to a small byte arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytedump" = callPackage
@@ -43655,6 +46716,8 @@ self: {
        ];
        description = "Universal hashing of bytes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytelog" = callPackage
@@ -43670,6 +46733,8 @@ self: {
        ];
        description = "Fast logging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "byteorder" = callPackage
@@ -43739,6 +46804,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge primitive ];
        description = "Slicing managed and unmanaged memory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytesmith" = callPackage
@@ -43763,6 +46830,8 @@ self: {
        ];
        description = "Nonresumable byte parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring_0_11_0_0" = callPackage
@@ -43794,6 +46863,8 @@ self: {
        ];
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-builder" = callPackage
@@ -43822,6 +46893,8 @@ self: {
        ];
        description = "Variable-length integer encoding";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-class" = callPackage
@@ -43835,6 +46908,8 @@ self: {
        libraryHaskellDepends = [ base bytestring utf8-string ];
        description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-conversion" = callPackage
@@ -43870,6 +46945,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring dlist ];
        description = "Parse CSV formatted data efficiently";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-delta" = callPackage
@@ -44002,6 +47079,8 @@ self: {
        ];
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-progress" = callPackage
@@ -44041,6 +47120,8 @@ self: {
        ];
        description = "fast ByteString to number converting library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-rematch" = callPackage
@@ -44054,6 +47135,8 @@ self: {
        doHaddock = false;
        description = "Rematch support for ByteString";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-short" = callPackage
@@ -44083,6 +47166,8 @@ self: {
        ];
        description = "Efficient conversion of values into readable byte strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-strict-builder" = callPackage
@@ -44117,6 +47202,8 @@ self: {
        libraryHaskellDepends = [ base bytestring pipes primitive ];
        description = "break bytestrings up into substrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-time" = callPackage
@@ -44133,6 +47220,8 @@ self: {
        ];
        description = "Library for Time parsing from ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-to-vector" = callPackage
@@ -44181,6 +47270,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        description = "An efficient finite map from (byte)strings to values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-typenats" = callPackage
@@ -44199,6 +47290,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion QuickCheck ];
        description = "Bytestrings with typenat lengths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestringparser" = callPackage
@@ -44210,6 +47303,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestringparser-temporary" = callPackage
@@ -44221,6 +47316,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestringreadp" = callPackage
@@ -44232,6 +47329,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A ReadP style parser library for ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "byteunits" = callPackage
@@ -44330,6 +47429,8 @@ self: {
        libraryHaskellDepends = [ base language-c ];
        description = "A higher level DSL on top of language-c";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "c-io" = callPackage
@@ -44341,6 +47442,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "C IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "c-mosquitto" = callPackage
@@ -44361,6 +47464,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simpe mosquito MQTT binding able to work with the Amazons IoT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mosquitto;};
 
   "c-storable" = callPackage
@@ -44397,6 +47502,8 @@ self: {
        executableHaskellDepends = [ base c0parser ];
        description = "Simple C0 Syntax Check";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "c0parser" = callPackage
@@ -44408,6 +47515,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Simple C0 Parser";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "c10k" = callPackage
@@ -44419,6 +47528,8 @@ self: {
        libraryHaskellDepends = [ base network unix ];
        description = "C10k server library using prefork";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "c14n" = callPackage
@@ -44454,6 +47565,8 @@ self: {
        ];
        description = "Translate C code into ATS";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "c2hs" = callPackage
@@ -44563,6 +47676,8 @@ self: {
        ];
        description = "A maintenance command of Haskell cabal packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal" = callPackage
@@ -44590,6 +47705,8 @@ self: {
        libraryHaskellDepends = [ base Cabal filepath ];
        description = "Cabal support for creating AppImage applications";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-audit" = callPackage
@@ -44607,6 +47724,8 @@ self: {
        ];
        description = "Check how up-to-date your .cabal dependencies are.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-auto-expose" = callPackage
@@ -44642,6 +47761,8 @@ self: {
        ];
        description = "A command line program for managing the dependency versions in a cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-build-programs" = callPackage
@@ -44669,6 +47790,8 @@ self: {
        ];
        description = "Bundling C/C++ projects in Cabal package made easy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-cache" = callPackage
@@ -44704,6 +47827,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "CI Assistant for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-cargs" = callPackage
@@ -44726,6 +47851,8 @@ self: {
        testHaskellDepends = [ base filepath tasty tasty-golden ];
        description = "A command line program for extracting compiler arguments from a cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-constraints" = callPackage
@@ -44739,6 +47866,8 @@ self: {
        executableHaskellDepends = [ base Cabal optparse-applicative ];
        description = "Repeatable builds for cabalized Haskell projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-db" = callPackage
@@ -44758,6 +47887,8 @@ self: {
        ];
        description = "query tools for the local cabal database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-debian" = callPackage
@@ -44797,6 +47928,8 @@ self: {
        ];
        description = "Compose a list of a project's transitive dependencies with their licenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-dev" = callPackage
@@ -44819,6 +47952,8 @@ self: {
        executableToolDepends = [ cabal-install ];
        description = "Manage sandboxed Haskell build environments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-dir" = callPackage
@@ -44832,6 +47967,8 @@ self: {
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "show dist dir of 'cabal copy/install'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-doctest" = callPackage
@@ -44928,6 +48065,8 @@ self: {
        testHaskellDepends = [ base Cabal ];
        description = "Template Haskell expressions for reading fields from a project's cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-flatpak" = callPackage
@@ -44991,6 +48130,8 @@ self: {
        libraryHaskellDepends = [ base Cabal ghc transformers ];
        description = "Conveniently configure GHC's dynamic flags for use with Cabal projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-ghci" = callPackage
@@ -45007,6 +48148,8 @@ self: {
        ];
        description = "Set up ghci with options taken from a .cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-graphdeps" = callPackage
@@ -45024,6 +48167,8 @@ self: {
        ];
        description = "Generate graphs of install-time Cabal dependencies";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-helper" = callPackage
@@ -45074,6 +48219,8 @@ self: {
        ];
        description = "Read information from cabal files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-install" = callPackage
@@ -45125,6 +48272,8 @@ self: {
        executableSystemDepends = [ zlib ];
        description = "The (bundled) command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "cabal-install-ghc72" = callPackage
@@ -45144,6 +48293,8 @@ self: {
        ];
        description = "Temporary version of cabal-install for ghc-7.2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-install-ghc74" = callPackage
@@ -45163,6 +48314,8 @@ self: {
        ];
        description = "Temporary version of cabal-install for ghc-7.4";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-install-parsers" = callPackage
@@ -45191,6 +48344,8 @@ self: {
        ];
        description = "Utilities to work with cabal-install files";
        license = "GPL-2.0-or-later AND BSD-3-Clause";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-lenses" = callPackage
@@ -45207,6 +48362,8 @@ self: {
        ];
        description = "Lenses and traversals for the Cabal library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-macosx" = callPackage
@@ -45254,6 +48411,8 @@ self: {
        ];
        description = "build multiple packages at once";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-mon" = callPackage
@@ -45271,6 +48430,8 @@ self: {
        ];
        description = "A monitor for cabal builds";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-nirvana" = callPackage
@@ -45288,6 +48449,8 @@ self: {
        ];
        description = "Avoid Cabal dependency hell by constraining to known good versions. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-plan" = callPackage
@@ -45328,6 +48491,8 @@ self: {
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "Show dependencies of program being built in current directory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-query" = callPackage
@@ -45344,6 +48509,8 @@ self: {
        ];
        description = "Helpers for quering .cabal files or hackageDB's 00-index.tar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-rpm" = callPackage
@@ -45391,6 +48558,8 @@ self: {
        executableHaskellDepends = [ base Cabal ];
        description = "The user interface for building and installing Cabal packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-sign" = callPackage
@@ -45427,6 +48596,8 @@ self: {
        ];
        description = "Topologically sort cabal packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-src" = callPackage
@@ -45448,6 +48619,8 @@ self: {
        ];
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-test" = callPackage
@@ -45463,6 +48636,8 @@ self: {
        ];
        description = "Automated test tool for cabal projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-test-bin" = callPackage
@@ -45504,6 +48679,8 @@ self: {
        libraryHaskellDepends = [ base Cabal QuickCheck ];
        description = "QuickCheck for Cabal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-toolkit" = callPackage
@@ -45545,6 +48722,8 @@ self: {
        executableHaskellDepends = [ base filepath HTTP network ];
        description = "Command-line tool for uploading packages to Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal2arch" = callPackage
@@ -45564,6 +48743,8 @@ self: {
        ];
        description = "Create Arch Linux packages from Cabal packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal2doap" = callPackage
@@ -45579,6 +48760,8 @@ self: {
        ];
        description = "Cabal to Description-of-a-Project (DOAP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal2ebuild" = callPackage
@@ -45593,6 +48776,8 @@ self: {
        executableHaskellDepends = [ base curl directory ];
        description = "make gentoo's .ebuild file from .cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal2ghci" = callPackage
@@ -45611,6 +48796,8 @@ self: {
        ];
        description = "A tool to generate .ghci file from .cabal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal2nix" = callPackage
@@ -45688,6 +48875,8 @@ self: {
        ];
        description = "A simple tool to query cabal files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabalg" = callPackage
@@ -45722,6 +48911,8 @@ self: {
        ];
        description = "Generate pretty graphs of module trees from cabal files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabalish" = callPackage
@@ -45740,6 +48931,8 @@ self: {
        ];
        description = "Provides access to the cabal file data for shell scripts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabalmdvrpm" = callPackage
@@ -45754,6 +48947,8 @@ self: {
        executableHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
        description = "Create mandriva rpm from cabal package";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabalrpmdeps" = callPackage
@@ -45768,6 +48963,8 @@ self: {
        executableHaskellDepends = [ base Cabal filepath haskell98 ];
        description = "Autogenerate rpm dependencies from cabal files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabalvchk" = callPackage
@@ -45781,6 +48978,8 @@ self: {
        executableHaskellDepends = [ base Cabal ];
        description = "Verify installed package version against user-specified constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabin" = callPackage
@@ -45799,6 +48998,8 @@ self: {
        ];
        description = "Cabal binary sandboxes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabocha" = callPackage
@@ -45811,6 +49012,8 @@ self: {
        librarySystemDepends = [ cabocha ];
        testHaskellDepends = [ base text-format ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cabocha = null;};
 
   "cache" = callPackage
@@ -45845,6 +49048,8 @@ self: {
        ];
        description = "cached hashmaps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cached" = callPackage
@@ -45862,6 +49067,8 @@ self: {
        ];
        description = "Cache values to disk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cached-io" = callPackage
@@ -45909,6 +49116,8 @@ self: {
        ];
        description = "Cache combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cachix" = callPackage
@@ -45949,6 +49158,8 @@ self: {
        ];
        description = "Command line client for Nix binary cache hosting https://cachix.org";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) boost; inherit (pkgs) nix;};
 
   "cachix-api" = callPackage
@@ -45981,6 +49192,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Servant HTTP API specification for https://cachix.org";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cacophony" = callPackage
@@ -46008,6 +49221,8 @@ self: {
        ];
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "caerbannog" = callPackage
@@ -46046,6 +49261,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Prelude subsets—take only what you want!";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "caffegraph" = callPackage
@@ -46064,6 +49281,8 @@ self: {
          protocol-buffers-descriptor template-haskell temporary text
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cairo" = callPackage
@@ -46129,6 +49348,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Cairo Haskell binding (partial)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) cairo;};
 
   "cake" = callPackage
@@ -46151,6 +49372,8 @@ self: {
        ];
        description = "A build-system library and driver";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cake3" = callPackage
@@ -46180,6 +49403,8 @@ self: {
        ];
        description = "Third cake the Makefile EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cakyrespa" = callPackage
@@ -46197,6 +49422,8 @@ self: {
        ];
        description = "run turtle like LOGO with lojban";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cal-layout" = callPackage
@@ -46211,6 +49438,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Calendar Layout Algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cal3d" = callPackage
@@ -46223,6 +49452,8 @@ self: {
        librarySystemDepends = [ cal3d ];
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cal3d = null;};
 
   "cal3d-examples" = callPackage
@@ -46237,6 +49468,8 @@ self: {
        executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
        description = "Examples for the Cal3d animation library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cal3d-opengl" = callPackage
@@ -46248,6 +49481,8 @@ self: {
        libraryHaskellDepends = [ base cal3d OpenGL ];
        description = "OpenGL rendering for the Cal3D animation library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "calamity" = callPackage
@@ -46277,6 +49512,8 @@ self: {
        ];
        description = "A library for writing discord bots in haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "calc" = callPackage
@@ -46290,6 +49527,8 @@ self: {
        executableHaskellDepends = [ array base harpy haskell98 mtl ];
        description = "A small compiler for arithmetic expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "calculator" = callPackage
@@ -46311,6 +49550,8 @@ self: {
        ];
        description = "A calculator repl, with variables, functions & Mathematica like dynamic plots";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "caldims" = callPackage
@@ -46331,6 +49572,8 @@ self: {
        ];
        description = "Calculation tool and library supporting units";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "caledon" = callPackage
@@ -46348,6 +49591,8 @@ self: {
        ];
        description = "a logic programming language based on the calculus of constructions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "calendar-recycling" = callPackage
@@ -46378,6 +49623,8 @@ self: {
        ];
        description = "Commandline tool to get week of the year";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "call" = callPackage
@@ -46403,6 +49650,8 @@ self: {
        ];
        description = "The call game engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "call-alloy" = callPackage
@@ -46424,6 +49673,8 @@ self: {
        ];
        description = "A simple library to call Alloy given a specification";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "call-haskell-from-anything" = callPackage
@@ -46442,6 +49693,8 @@ self: {
        executableHaskellDepends = [ base bytestring data-msgpack mtl ];
        description = "Call Haskell functions from other languages via serialization and dynamic libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "call-stack" = callPackage
@@ -46491,6 +49744,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) flint;};
 
   "camh" = callPackage
@@ -46523,6 +49778,8 @@ self: {
        ];
        description = "Haskell implementation of the Campfire API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "can-i-haz" = callPackage
@@ -46546,6 +49803,8 @@ self: {
        libraryHaskellDepends = [ arithmoi array base containers random ];
        description = "Arithmetic for Psychedelically Large Numbers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canonical-filepath" = callPackage
@@ -46557,6 +49816,8 @@ self: {
        libraryHaskellDepends = [ base deepseq directory filepath ];
        description = "Abstract data type for canonical file paths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canonical-json" = callPackage
@@ -46580,6 +49841,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring containers criterion ];
        description = "Canonical JSON for signing and hashing JSON values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canteven-config" = callPackage
@@ -46610,6 +49873,8 @@ self: {
        ];
        description = "Utilities for HTTP programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canteven-listen-http" = callPackage
@@ -46621,6 +49886,8 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        description = "data types to describe HTTP services";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canteven-log" = callPackage
@@ -46638,6 +49905,8 @@ self: {
        ];
        description = "A canteven way of setting up logging for your program";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canteven-parsedate" = callPackage
@@ -46653,6 +49922,8 @@ self: {
        ];
        description = "Date / time parsing utilities that try to guess the date / time format";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canteven-template" = callPackage
@@ -46691,6 +49962,8 @@ self: {
        ];
        description = "Application for analysis of java source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cantor-pairing" = callPackage
@@ -46708,6 +49981,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Convert data to and from a natural number representation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cao" = callPackage
@@ -46729,6 +50004,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "CAO Compiler";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cap" = callPackage
@@ -46743,6 +50020,8 @@ self: {
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "Interprets and debug the cap language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "capability" = callPackage
@@ -46766,6 +50045,8 @@ self: {
        ];
        description = "Extensional capabilities and deriving combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "capataz" = callPackage
@@ -46826,6 +50107,8 @@ self: {
        ];
        description = "Cap'n Proto for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "capped-list" = callPackage
@@ -46837,6 +50120,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy sequences, with a user-defined termination value";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "capri" = callPackage
@@ -46852,6 +50137,8 @@ self: {
        ];
        description = "A simple wrapper over cabal-install to operate in project-private mode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "car-pool" = callPackage
@@ -46874,6 +50161,8 @@ self: {
        ];
        description = "Simple web-server for organizing car-pooling for an event";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "caramia" = callPackage
@@ -46898,6 +50187,8 @@ self: {
        ];
        description = "High-level OpenGL bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "carbonara" = callPackage
@@ -46912,6 +50203,8 @@ self: {
        ];
        description = "some spaghetti code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "carboncopy" = callPackage
@@ -46929,6 +50222,8 @@ self: {
        ];
        description = "Drop emails from threads being watched into special CC folder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cardano-coin-selection" = callPackage
@@ -46950,6 +50245,8 @@ self: {
        ];
        description = "Algorithms for coin selection and fee balancing";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cardano-transactions" = callPackage
@@ -47006,6 +50303,8 @@ self: {
        ];
        description = "A presentation tool written with Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "carray" = callPackage
@@ -47041,6 +50340,8 @@ self: {
        ];
        description = "Carte: A commandline pastebin server";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cartel" = callPackage
@@ -47069,6 +50370,8 @@ self: {
        ];
        description = "Specify Cabal files in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cas-hashable" = callPackage
@@ -47150,6 +50453,8 @@ self: {
        ];
        description = "CASA Abbreviations and Acronyms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "casa-client" = callPackage
@@ -47230,6 +50535,8 @@ self: {
        ];
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {casadi = null;};
 
   "casadi-bindings-control" = callPackage
@@ -47246,6 +50553,8 @@ self: {
        libraryPkgconfigDepends = [ casadi_control ];
        description = "low level bindings to casadi-control";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {casadi_control = null;};
 
   "casadi-bindings-core" = callPackage
@@ -47262,6 +50571,8 @@ self: {
        librarySystemDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {casadi = null;};
 
   "casadi-bindings-internal" = callPackage
@@ -47274,6 +50585,8 @@ self: {
        librarySystemDepends = [ casadi ];
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {casadi = null;};
 
   "casadi-bindings-ipopt-interface" = callPackage
@@ -47290,6 +50603,8 @@ self: {
        libraryPkgconfigDepends = [ casadi_ipopt_interface ];
        description = "low level bindings to casadi-ipopt_interface";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {casadi_ipopt_interface = null;};
 
   "casadi-bindings-snopt-interface" = callPackage
@@ -47306,6 +50621,8 @@ self: {
        libraryPkgconfigDepends = [ casadi_snopt_interface ];
        description = "low level bindings to casadi-snopt_interface";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {casadi_snopt_interface = null;};
 
   "cascading" = callPackage
@@ -47322,6 +50639,8 @@ self: {
        ];
        description = "DSL for HTML CSS (Cascading Style Sheets)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "case-conversion" = callPackage
@@ -47398,6 +50717,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Combinators for casing on constructors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cases" = callPackage
@@ -47416,6 +50737,8 @@ self: {
        benchmarkHaskellDepends = [ criterion mwc-random rerebase ];
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cash" = callPackage
@@ -47432,6 +50755,8 @@ self: {
        ];
        description = "the Computer Algebra SHell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "casing" = callPackage
@@ -47638,6 +50963,8 @@ self: {
        ];
        description = "Haskell client for Cassandra's CQL protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cassandra-thrift" = callPackage
@@ -47697,6 +51024,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cassava-embed" = callPackage
@@ -47771,6 +51100,8 @@ self: {
        ];
        description = "Auto-generation of records data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cassava-streams" = callPackage
@@ -47803,6 +51134,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A combinator library for simultaneously defining parsers and pretty printers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cassy" = callPackage
@@ -47830,6 +51163,8 @@ self: {
        ];
        description = "A high level driver for the Cassandra datastore";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cast" = callPackage
@@ -47901,6 +51236,8 @@ self: {
        ];
        description = "A tool to manage shared cabal-install sandboxes";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "casui" = callPackage
@@ -47915,6 +51252,8 @@ self: {
        executableHaskellDepends = [ base gtk haskell98 mtl parsec ];
        description = "Equation Manipulator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "catamorphism" = callPackage
@@ -47927,6 +51266,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exposes a Template Haskell function for generating catamorphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "catch-fd" = callPackage
@@ -47938,6 +51279,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "MonadThrow and MonadCatch, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "categorical-algebra" = callPackage
@@ -47949,6 +51292,8 @@ self: {
        libraryHaskellDepends = [ base newtype pointless-haskell void ];
        description = "Categorical Monoids and Semirings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "categories" = callPackage
@@ -47998,6 +51343,8 @@ self: {
        doHaddock = false;
        description = "A meta-package documenting various packages inspired by category theory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "category-printf" = callPackage
@@ -48022,6 +51369,8 @@ self: {
        libraryHaskellDepends = [ base categories ];
        description = "Traced monoidal categories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "catnplus" = callPackage
@@ -48041,6 +51390,8 @@ self: {
        ];
        description = "Simple tool to display text files with line numbers and paging";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cautious" = callPackage
@@ -48070,6 +51421,8 @@ self: {
        ];
        description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cautious-gen" = callPackage
@@ -48086,6 +51439,8 @@ self: {
          hspec QuickCheck
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cayene-lpp" = callPackage
@@ -48122,6 +51477,8 @@ self: {
        testHaskellDepends = [ aeson base hspec unordered-containers ];
        description = "A Haskell client for the Cayley graph database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cayley-dickson" = callPackage
@@ -48258,6 +51615,8 @@ self: {
        ];
        description = "Bindings for the CCI networking library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cci = null;};
 
   "ccnx" = callPackage
@@ -48269,6 +51628,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A Haskell implementation of the CCNx network protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cctools-workqueue" = callPackage
@@ -48285,6 +51646,8 @@ self: {
        librarySystemDepends = [ dttools ];
        description = "High-level interface to CCTools' WorkQueue library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {dttools = null;};
 
   "cdeps" = callPackage
@@ -48323,6 +51686,8 @@ self: {
        ];
        description = "Convenient Chinese phrase & character lookup";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cef" = callPackage
@@ -48337,6 +51702,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "CEF log format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cef3-raw" = callPackage
@@ -48350,6 +51717,8 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        description = "Raw CEF3 bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cef = null; inherit (pkgs) gtk2;};
 
   "cef3-simple" = callPackage
@@ -48361,6 +51730,8 @@ self: {
        libraryHaskellDepends = [ base cef3-raw ];
        description = "Simple wrapper around cef3-raw";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ceilometer-common" = callPackage
@@ -48384,6 +51755,8 @@ self: {
        ];
        description = "Common Haskell types and encoding for OpenStack Ceilometer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cellrenderer-cairo" = callPackage
@@ -48397,6 +51770,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Cairo-based CellRenderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk2;};
 
   "celtchar" = callPackage
@@ -48421,6 +51796,8 @@ self: {
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "A tool to build a novel";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cerberus" = callPackage
@@ -48448,6 +51825,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Protect and control API access with cerberus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal" = callPackage
@@ -48509,6 +51888,8 @@ self: {
        libraryHaskellDepends = [ base cereal ghc-prim ];
        description = "Automatic deriving of Serialize using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-enumerator" = callPackage
@@ -48520,6 +51901,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal enumerator ];
        description = "Deserialize things with cereal and enumerator";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-ieee754" = callPackage
@@ -48531,6 +51914,8 @@ self: {
        libraryHaskellDepends = [ array base cereal ];
        description = "Floating point support for the 'cereal' serialization library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-io-streams" = callPackage
@@ -48553,6 +51938,8 @@ self: {
        ];
        description = "io-streams support for the cereal binary serialization library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-plus" = callPackage
@@ -48576,6 +51963,8 @@ self: {
        ];
        description = "An extended serialization library on top of \"cereal\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-streams" = callPackage
@@ -48598,6 +51987,8 @@ self: {
        ];
        description = "Use cereal to encode/decode io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-text" = callPackage
@@ -48621,6 +52012,8 @@ self: {
        testHaskellDepends = [ base cereal hspec QuickCheck time ];
        description = "Serialize instances for types from `time` package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-unordered-containers" = callPackage
@@ -48678,6 +52071,8 @@ self: {
        ];
        description = "Certificates and Key Reader/Writer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cf" = callPackage
@@ -48695,6 +52090,8 @@ self: {
        ];
        description = "Exact real arithmetic using continued fractions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cfenv" = callPackage
@@ -48711,6 +52108,8 @@ self: {
        ];
        description = "A library getting the environment when running on Cloud Foundry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cfipu" = callPackage
@@ -48728,6 +52127,8 @@ self: {
        ];
        description = "cfipu processor for toy brainfuck-like language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cflp" = callPackage
@@ -48746,6 +52147,8 @@ self: {
        ];
        description = "Constraint Functional-Logic Programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cfopu" = callPackage
@@ -48763,6 +52166,8 @@ self: {
        ];
        description = "cfopu processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cg" = callPackage
@@ -48783,6 +52188,8 @@ self: {
        ];
        description = "Parser for categorial grammars";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cgen" = callPackage
@@ -48802,6 +52209,8 @@ self: {
        doHaddock = false;
        description = "generates Haskell bindings and C wrappers for C++ libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cgi" = callPackage
@@ -48844,6 +52253,8 @@ self: {
        libraryHaskellDepends = [ base cgi containers mtl random ];
        description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cgrep" = callPackage
@@ -48869,6 +52280,8 @@ self: {
        ];
        description = "Command line tool";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chain-codes" = callPackage
@@ -48907,6 +52320,8 @@ self: {
        ];
        description = "Mining Client for Kadena Chainweb";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chalk" = callPackage
@@ -48936,6 +52351,8 @@ self: {
        ];
        description = "Combinators for building and processing 2D images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chalkboard-viewer" = callPackage
@@ -48947,6 +52364,8 @@ self: {
        libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ];
        description = "OpenGL based viewer for chalkboard rendered images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chalmers-lava2000" = callPackage
@@ -49069,6 +52488,8 @@ self: {
        ];
        description = "Exposes subspecies types of Char. And naming cases.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "charade" = callPackage
@@ -49092,6 +52513,8 @@ self: {
        ];
        description = "Rapid prototyping websites with Snap and Heist";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "charset" = callPackage
@@ -49150,6 +52573,8 @@ self: {
        ];
        description = "Command-line utility to draw charts from input data easily";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chart-histogram" = callPackage
@@ -49161,6 +52586,8 @@ self: {
        libraryHaskellDepends = [ base Chart ];
        description = "Easily render histograms with Chart";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chart-svg" = callPackage
@@ -49186,6 +52613,8 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "Charts in SVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chart-svg-various" = callPackage
@@ -49209,6 +52638,8 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chart-unit" = callPackage
@@ -49233,6 +52664,8 @@ self: {
        ];
        description = "Native haskell charts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "charter" = callPackage
@@ -49260,6 +52693,8 @@ self: {
          process scientific text wai warp
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chaselev-deque" = callPackage
@@ -49316,6 +52751,8 @@ self: {
        ];
        description = "A library of simple NLP algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chatty" = callPackage
@@ -49348,6 +52785,8 @@ self: {
        libraryHaskellDepends = [ base chatty transformers ];
        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;
+       broken = true;
      }) {};
 
   "chatty-utils" = callPackage
@@ -49389,6 +52828,8 @@ self: {
        ];
        description = "The ChatWork API in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cheapskate" = callPackage
@@ -49466,6 +52907,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "check-email" = callPackage
@@ -49497,6 +52940,8 @@ self: {
        ];
        description = "Check whether module and package imports conform to the PVP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "checked" = callPackage
@@ -49510,6 +52955,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bounds-checking integer types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "checkers" = callPackage
@@ -49553,6 +53000,8 @@ self: {
        ];
        description = "Generate checklists relevant to a given patch";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "checksum" = callPackage
@@ -49604,6 +53053,8 @@ self: {
        libraryHaskellDepends = [ base chell QuickCheck random ];
        description = "QuickCheck support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chessIO" = callPackage
@@ -49638,6 +53089,8 @@ self: {
        ];
        description = "Basic chess library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chesshs" = callPackage
@@ -49668,6 +53121,8 @@ self: {
        ];
        description = "Query interface for Chevalier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chiasma" = callPackage
@@ -49692,6 +53147,8 @@ self: {
        ];
        description = "tmux api";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chimera" = callPackage
@@ -49729,6 +53186,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for Chipmunk2D physics engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chitauri" = callPackage
@@ -49748,6 +53207,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Helper for the Major System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "choice" = callPackage
@@ -49770,6 +53231,8 @@ self: {
        libraryHaskellDepends = [ base MonadRandom ];
        description = "Choose random elements from a stream";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "choose-exe" = callPackage
@@ -49786,6 +53249,8 @@ self: {
        ];
        description = "Command-line program to choose random element from a stream";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chorale" = callPackage
@@ -49803,6 +53268,8 @@ self: {
        ];
        description = "A module containing basic functions that the prelude does not offer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chorale-geo" = callPackage
@@ -49820,6 +53287,8 @@ self: {
        ];
        description = "A module containing basic geo functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chp" = callPackage
@@ -49835,6 +53304,8 @@ self: {
        ];
        description = "An implementation of concurrency ideas from Communicating Sequential Processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chp-mtl" = callPackage
@@ -49846,6 +53317,8 @@ self: {
        libraryHaskellDepends = [ base chp chp-plus mtl ];
        description = "MTL class instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chp-plus" = callPackage
@@ -49862,6 +53335,8 @@ self: {
        ];
        description = "A set of high-level concurrency utilities built on Communicating Haskell Processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chp-spec" = callPackage
@@ -49877,6 +53352,8 @@ self: {
        ];
        description = "A mirror implementation of chp that generates a specification of the program";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chp-transformers" = callPackage
@@ -49888,6 +53365,8 @@ self: {
        libraryHaskellDepends = [ base chp chp-plus transformers ];
        description = "Transformers instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chr-core" = callPackage
@@ -49904,6 +53383,8 @@ self: {
        ];
        description = "Constraint Handling Rules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chr-data" = callPackage
@@ -49941,6 +53422,8 @@ self: {
        executableHaskellDepends = [ base chr-data ];
        description = "AST + surface language around chr";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chr-parse" = callPackage
@@ -49954,6 +53437,8 @@ self: {
        libraryHaskellDepends = [ base containers uulib ];
        description = "Parsing for chr library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chr-pretty" = callPackage
@@ -50002,6 +53487,8 @@ self: {
        ];
        description = "neovim package manager";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chronograph" = callPackage
@@ -50015,6 +53502,8 @@ self: {
        ];
        description = "measure timings of data evaluation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chronologique" = callPackage
@@ -50059,6 +53548,8 @@ self: {
        ];
        description = "A performant time library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chronos-bench" = callPackage
@@ -50079,6 +53570,8 @@ self: {
        benchmarkHaskellDepends = [ base ];
        description = "Benchmarking tool with focus on comparing results";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chs-cabal" = callPackage
@@ -50126,6 +53619,8 @@ self: {
        ];
        description = "FFI for Chu2 Agda Web Server Interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chuchu" = callPackage
@@ -50170,6 +53665,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec template-haskell ];
        description = "Simple template library with static safety";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chunky" = callPackage
@@ -50185,6 +53682,8 @@ self: {
        testHaskellDepends = [ base binary bytestring HUnit text ];
        description = "Human-readable storage of text/binary objects";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "church" = callPackage
@@ -50196,6 +53695,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "church-list" = callPackage
@@ -50219,6 +53720,8 @@ self: {
        libraryHaskellDepends = [ base deepseq semigroupoids semigroups ];
        description = "Church encoded Maybe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "church-pair" = callPackage
@@ -50272,6 +53775,8 @@ self: {
        ];
        description = "Cielo API v3 Bindings for Haskell";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cil" = callPackage
@@ -50283,6 +53788,8 @@ self: {
        libraryHaskellDepends = [ base bytestring language-c ];
        description = "An interface to CIL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cimple" = callPackage
@@ -50315,6 +53822,8 @@ self: {
        librarySystemDepends = [ cinvoke ];
        description = "A binding to cinvoke";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cinvoke = null;};
 
   "cio" = callPackage
@@ -50326,6 +53835,8 @@ self: {
        libraryHaskellDepends = [ base monad-stm mtl parallel-io stm ];
        description = "A monad for concurrent IO on a thread pool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cipher-aes" = callPackage
@@ -50399,6 +53910,8 @@ self: {
        ];
        description = "Blowfish cipher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cipher-camellia" = callPackage
@@ -50499,6 +54012,8 @@ self: {
        executableHaskellDepends = [ array base bytestring parseargs ];
        description = "Implementation of CipherSaber2 RC4 cryptography";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "circ" = callPackage
@@ -50540,6 +54055,8 @@ self: {
        ];
        description = "The CircleCI REST API for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "circuit-breaker" = callPackage
@@ -50649,6 +54166,8 @@ self: {
        ];
        description = "convert document IDs such as DOI, ISBN, arXiv ID to bibliographic reference";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "citeproc" = callPackage
@@ -50694,6 +54213,8 @@ self: {
        ];
        description = "A Citation Style Language implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "citeproc-hs-pandoc-filter" = callPackage
@@ -50713,6 +54234,8 @@ self: {
        ];
        description = "A Pandoc filter for processing bibliographic references with citeproc-hs";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cityhash" = callPackage
@@ -50752,6 +54275,8 @@ self: {
        ];
        description = "A new Haskeleton package";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cjk" = callPackage
@@ -50769,6 +54294,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Data about Chinese, Japanese and Korean characters and languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cl3" = callPackage
@@ -50822,6 +54349,8 @@ self: {
        ];
        description = "Simple CLI RPN calculator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clafer" = callPackage
@@ -50856,6 +54385,8 @@ self: {
        ];
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "claferIG" = callPackage
@@ -50888,6 +54419,8 @@ self: {
        ];
        description = "claferIG is an interactive tool that generates instances of Clafer models";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "claferwiki" = callPackage
@@ -50907,6 +54440,8 @@ self: {
        ];
        description = "A wiki-based IDE for literate modeling with Clafer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clang-compilation-database" = callPackage
@@ -50919,6 +54454,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring ];
        description = "JSON Compilation Database Format encoding and decoding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clang-pure" = callPackage
@@ -50941,6 +54478,8 @@ self: {
        testHaskellDepends = [ base bytestring lens ];
        description = "Pure C++ code analysis with libclang";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (self.llvmPackages) clang;};
 
   "clanki" = callPackage
@@ -50956,6 +54495,8 @@ self: {
        ];
        description = "Command-line spaced-repetition software";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clarifai" = callPackage
@@ -50973,6 +54514,8 @@ self: {
        ];
        description = "API Client for the Clarifai API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash" = callPackage
@@ -50992,6 +54535,8 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware (CLaSH)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-ghc" = callPackage
@@ -51021,6 +54566,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-lib" = callPackage
@@ -51058,6 +54605,8 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-multisignal" = callPackage
@@ -51072,6 +54621,8 @@ self: {
          base clash-prelude deepseq ghc-typelits-knownnat QuickCheck
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-prelude" = callPackage
@@ -51110,6 +54661,8 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - Prelude library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-prelude-quickcheck" = callPackage
@@ -51140,6 +54693,8 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-verilog" = callPackage
@@ -51157,6 +54712,8 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - Verilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-vhdl" = callPackage
@@ -51174,6 +54731,8 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - VHDL backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "classify" = callPackage
@@ -51216,6 +54775,8 @@ self: {
        ];
        description = "Classify sounds produced by Xenopus laevis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "classy-influxdb-simple" = callPackage
@@ -51232,6 +54793,8 @@ self: {
        ];
        description = "Super simple InfluxDB package in Classy-MTL style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "classy-miso" = callPackage
@@ -51252,6 +54815,8 @@ self: {
        testHaskellDepends = [ base miso rfc ];
        description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "classy-parallel" = callPackage
@@ -51267,6 +54832,8 @@ self: {
        ];
        description = "Fork of the monad-parallel package using monad-control";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "classy-prelude" = callPackage
@@ -51344,6 +54911,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion parallel uniplate ];
        description = "Fuseable type-class based generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clay" = callPackage
@@ -51391,6 +54960,8 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "clckwrks-cli" = callPackage
@@ -51413,6 +54984,8 @@ self: {
        ];
        description = "a command-line interface for adminstrating some aspects of clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-dot-com" = callPackage
@@ -51434,6 +55007,8 @@ self: {
        executableToolDepends = [ hsx2hs ];
        description = "clckwrks.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-plugin-bugs" = callPackage
@@ -51459,6 +55034,8 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "bug tracking plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-plugin-ircbot" = callPackage
@@ -51482,6 +55059,8 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-plugin-mailinglist" = callPackage
@@ -51506,6 +55085,8 @@ self: {
        ];
        description = "mailing list plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-plugin-media" = callPackage
@@ -51528,6 +55109,8 @@ self: {
        ];
        description = "media plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-plugin-page" = callPackage
@@ -51553,6 +55136,8 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-plugin-redirect" = callPackage
@@ -51577,6 +55162,8 @@ self: {
        ];
        description = "support redirects for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-theme-bootstrap" = callPackage
@@ -51594,6 +55181,8 @@ self: {
        ];
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-theme-clckwrks" = callPackage
@@ -51611,6 +55200,8 @@ self: {
        ];
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-theme-geo-bootstrap" = callPackage
@@ -51623,6 +55214,8 @@ self: {
        libraryHaskellDepends = [ base clckwrks hsp text ];
        description = "geo bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cld2" = callPackage
@@ -51634,6 +55227,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hashable text ];
        description = "Haskell bindings to Google's Compact Language Detector 2";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clean-home" = callPackage
@@ -51662,6 +55257,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Open unions without need for Typeable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cless" = callPackage
@@ -51680,6 +55277,8 @@ self: {
        ];
        description = "Colorized LESS";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clevercss" = callPackage
@@ -51694,6 +55293,8 @@ self: {
        executableHaskellDepends = [ parsec ];
        description = "A CSS preprocessor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clexer" = callPackage
@@ -51705,6 +55306,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec ];
        description = "Lexes C++ code into simple tokens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cli" = callPackage
@@ -51737,6 +55340,8 @@ self: {
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cli-extras" = callPackage
@@ -51755,6 +55360,8 @@ self: {
        ];
        description = "Miscellaneous utilities for building and working with command line interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cli-git" = callPackage
@@ -51771,6 +55378,8 @@ self: {
        ];
        description = "Bindings to the git command-line interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cli-nix" = callPackage
@@ -51787,6 +55396,8 @@ self: {
        ];
        description = "Bindings to the nix command-line interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cli-setup" = callPackage
@@ -51859,6 +55470,8 @@ self: {
        benchmarkHaskellDepends = [ base time ];
        description = "A Clifford algebra number type for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clifford" = callPackage
@@ -51891,6 +55504,8 @@ self: {
        ];
        description = "A Clifford algebra library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clifm" = callPackage
@@ -51910,6 +55525,8 @@ self: {
        ];
        description = "Command Line Interface File Manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "climb" = callPackage
@@ -51951,6 +55568,8 @@ self: {
        librarySystemDepends = [ clingo ];
        description = "Haskell bindings to the Clingo ASP solver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) clingo;};
 
   "clippard" = callPackage
@@ -51962,6 +55581,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        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;
+       broken = true;
      }) {};
 
   "clipper" = callPackage
@@ -51973,6 +55594,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clippings" = callPackage
@@ -51998,6 +55621,8 @@ self: {
        ];
        description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clisparkline" = callPackage
@@ -52010,6 +55635,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Tiny library to pretty print sparklines onto the CLI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clist" = callPackage
@@ -52044,6 +55671,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Post tweets from stdin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cloben" = callPackage
@@ -52102,6 +55731,8 @@ self: {
        libraryPkgconfigDepends = [ QtCore ];
        description = "timer functionality to clock IO commands";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {QtCore = null;};
 
   "clogparse" = callPackage
@@ -52118,6 +55749,8 @@ self: {
        ];
        description = "Parse IRC logs such as the #haskell logs on tunes.org";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clone-all" = callPackage
@@ -52137,6 +55770,8 @@ self: {
        ];
        description = "Clone all github repositories from a given user";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "closed" = callPackage
@@ -52167,6 +55802,8 @@ self: {
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "Depth- and breadth-first set closures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cloud-haskell" = callPackage
@@ -52190,6 +55827,8 @@ self: {
        doHaddock = false;
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cloud-seeder" = callPackage
@@ -52218,6 +55857,8 @@ self: {
        ];
        description = "A tool for interacting with AWS CloudFormation";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cloudfront-signer" = callPackage
@@ -52234,6 +55875,8 @@ self: {
        ];
        description = "CloudFront URL signer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cloudi" = callPackage
@@ -52334,6 +55977,8 @@ self: {
        ];
        description = "Quasiquoters for inline C# and F#";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clr-marshal" = callPackage
@@ -52402,6 +56047,8 @@ self: {
        ];
        description = "C to Lua data wrapper generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clumpiness" = callPackage
@@ -52424,6 +56071,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "simple alternative to type classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clustering" = callPackage
@@ -52449,6 +56098,8 @@ self: {
        ];
        description = "High performance clustering algorithms";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clustertools" = callPackage
@@ -52467,6 +56118,8 @@ self: {
        ];
        description = "Tools for manipulating sequence clusters";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clutterhs" = callPackage
@@ -52484,6 +56137,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) clutter; inherit (pkgs) pango;};
 
   "cmaes" = callPackage
@@ -52569,6 +56224,8 @@ self: {
        ];
        description = "Code highlighting for cmark";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmark-lucid" = callPackage
@@ -52593,6 +56250,8 @@ self: {
        libraryHaskellDepends = [ base cmark ];
        description = "Pattern synonyms for cmark";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmark-sections" = callPackage
@@ -52611,6 +56270,8 @@ self: {
        ];
        description = "Represent cmark-parsed Markdown as a tree of sections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmath" = callPackage
@@ -52622,6 +56283,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A binding to the standard C math library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmathml3" = callPackage
@@ -52641,6 +56304,8 @@ self: {
        executableHaskellDepends = [ base Cabal filepath ];
        description = "Data model, parser, serialiser and transformations for Content MathML 3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmd-item" = callPackage
@@ -52657,6 +56322,8 @@ self: {
        ];
        description = "Library to compose and reuse command line fragments";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmdargs" = callPackage
@@ -52707,6 +56374,8 @@ self: {
        libraryHaskellDepends = [ base mtl split syb transformers ];
        description = "a library for command line parsing & online help";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmdtheline" = callPackage
@@ -52728,6 +56397,8 @@ self: {
        ];
        description = "Declarative command-line option parsing and documentation library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmf" = callPackage
@@ -52740,6 +56411,8 @@ self: {
        testHaskellDepends = [ base containers hedgehog ];
        description = "(C)oncurrent (M)onoidal (F)olds";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cml" = callPackage
@@ -52762,6 +56435,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "A library for C-like programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmph" = callPackage
@@ -52780,6 +56455,8 @@ self: {
        testSystemDepends = [ cmph ];
        description = "low level interface to CMPH";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cmph = null;};
 
   "cmptype" = callPackage
@@ -52794,6 +56471,8 @@ self: {
        ];
        description = "Compare types of any kinds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmt" = callPackage
@@ -52820,6 +56499,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Write consistent git commit messages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmu" = callPackage
@@ -52862,6 +56543,8 @@ self: {
        ];
        description = "Detailed visualization of CMs, HMMs and their comparisions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cnc-spec-compiler" = callPackage
@@ -52883,6 +56566,8 @@ self: {
        ];
        description = "Compiler/Translator for CnC Specification Files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cndict" = callPackage
@@ -52920,6 +56605,8 @@ self: {
        testHaskellDepends = [ base co-log-core hedgehog ];
        description = "Composable Contravariant Comonadic Logging Library";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "co-log-concurrent" = callPackage
@@ -52974,6 +56661,8 @@ self: {
        executableHaskellDepends = [ base co-log-core polysemy ];
        description = "Composable Contravariant Comonadic Logging Library";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "co-log-polysemy-formatting" = callPackage
@@ -52997,6 +56686,8 @@ self: {
        ];
        description = "A Polysemy logging effect for high quality (unstructured) logs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "co-log-sys" = callPackage
@@ -53017,6 +56708,8 @@ self: {
        ];
        description = "Syslog implementation on top of 'co-log-core'";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coalpit" = callPackage
@@ -53035,6 +56728,8 @@ self: {
        ];
        description = "Command-line options and DSV parsing and printing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cobot" = callPackage
@@ -53083,6 +56778,8 @@ self: {
        ];
        description = "Biological data file formats and IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cobot-tools" = callPackage
@@ -53106,6 +56803,8 @@ self: {
        ];
        description = "Biological data file formats and IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {RNA = null;};
 
   "code-builder" = callPackage
@@ -53117,6 +56816,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple system for generating code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "code-page" = callPackage
@@ -53151,6 +56852,8 @@ self: {
        ];
        description = "Simple bidirectional serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codec-beam" = callPackage
@@ -53165,6 +56868,8 @@ self: {
        testHaskellDepends = [ base bytestring filepath process text ];
        description = "Erlang VM byte code assembler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codec-libevent" = callPackage
@@ -53187,6 +56892,8 @@ self: {
        ];
        description = "Cross-platform structure serialisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codec-mbox" = callPackage
@@ -53221,6 +56928,8 @@ self: {
        ];
        description = "A library for manipulating RPM files";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codecov-haskell" = callPackage
@@ -53244,6 +56953,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Codecov.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codemonitor" = callPackage
@@ -53262,6 +56973,8 @@ self: {
        ];
        description = "Tool that automatically runs arbitrary commands when files change on disk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codepad" = callPackage
@@ -53275,6 +56988,8 @@ self: {
        libraryHaskellDepends = [ base curl mtl network tagsoup ];
        description = "Submit and retrieve paste output from CodePad.org.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codeworld-api" = callPackage
@@ -53302,6 +57017,8 @@ self: {
        ];
        description = "Graphics library for CodeWorld";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codex" = callPackage
@@ -53327,6 +57044,8 @@ self: {
        ];
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codo-notation" = callPackage
@@ -53342,6 +57061,8 @@ self: {
        ];
        description = "A notation for comonads, analogous to the do-notation for monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coerce-role" = callPackage
@@ -53391,6 +57112,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge ];
        description = "Utility functions for Coercible types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coercion-extras" = callPackage
@@ -53502,6 +57225,8 @@ self: {
        ];
        description = "Simple account manager";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coinbase-exchange" = callPackage
@@ -53540,6 +57265,8 @@ self: {
        ];
        description = "Connector library for the coinbase exchange";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coinbase-pro" = callPackage
@@ -53572,6 +57299,8 @@ self: {
        ];
        description = "Client for Coinbase Pro";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coincident-root-loci" = callPackage
@@ -53590,6 +57319,8 @@ self: {
        ];
        description = "Equivariant CSM classes of coincident root loci";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colada" = callPackage
@@ -53613,6 +57344,8 @@ self: {
        ];
        description = "Colada implements incremental word class class induction using online LDA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colchis" = callPackage
@@ -53630,6 +57363,8 @@ self: {
        ];
        description = "Rudimentary JSON-RPC 2.0 client over raw TCP.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cold-widow" = callPackage
@@ -53662,6 +57397,8 @@ self: {
        ];
        description = "Generate animated 3d objects in COLLADA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "collada-types" = callPackage
@@ -53695,6 +57432,8 @@ self: {
        ];
        description = "Collapse the duplication output into clones and return their frequencies";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "collapse-util" = callPackage
@@ -53708,6 +57447,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "utility for collapsing adjacent writes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "collection-json" = callPackage
@@ -53730,6 +57471,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Collection+JSON—Hypermedia Type Tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "collections" = callPackage
@@ -53743,6 +57486,8 @@ self: {
        ];
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "collections-api" = callPackage
@@ -53756,6 +57501,8 @@ self: {
        libraryHaskellDepends = [ array base QuickCheck ];
        description = "API for collection data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "collections-base-instances" = callPackage
@@ -53771,6 +57518,8 @@ self: {
        ];
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colock" = callPackage
@@ -53803,6 +57552,8 @@ self: {
        ];
        description = "Generic types and functions for columnar encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "color-counter" = callPackage
@@ -53827,6 +57578,8 @@ self: {
        ];
        description = "Count colors in images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colorful-monoids" = callPackage
@@ -53875,6 +57628,8 @@ self: {
        ];
        description = "Colorless | The Programmatic IDL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colorless-http-client" = callPackage
@@ -53891,6 +57646,8 @@ self: {
        ];
        description = "Http Client addon for Colorless";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colorless-scotty" = callPackage
@@ -53904,6 +57661,8 @@ self: {
        ];
        description = "Scotty server add-on for Colorless";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colors" = callPackage
@@ -53962,6 +57721,8 @@ self: {
        ];
        description = "Instances of the manifold-classes for colour types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colourista" = callPackage
@@ -53989,6 +57750,8 @@ self: {
        ];
        description = "A jazzy, minimal web framework for Haskell, inspired by Sinatra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "columbia" = callPackage
@@ -54009,6 +57772,8 @@ self: {
        doHaddock = false;
        description = "Enhanced serialization using seeking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "columnar" = callPackage
@@ -54026,6 +57791,8 @@ self: {
        ];
        description = "A CSV toolkit based on cassava and enum-text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "com" = callPackage
@@ -54037,6 +57804,8 @@ self: {
        doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "comark" = callPackage
@@ -54115,6 +57884,8 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Definitions of AST that represents a Commonmark (markdown) document";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "combinat" = callPackage
@@ -54138,6 +57909,8 @@ self: {
        ];
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "combinat-compat" = callPackage
@@ -54173,6 +57946,8 @@ self: {
        ];
        description = "Graphical representations for various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "combinator-interactive" = callPackage
@@ -54194,6 +57969,8 @@ self: {
        ];
        description = "SKI Combinator interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "combinatorial" = callPackage
@@ -54227,6 +58004,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "combinatorics" = callPackage
@@ -54253,6 +58032,8 @@ self: {
        ];
        description = "Various buffer implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "comfort-array" = callPackage
@@ -54309,6 +58090,8 @@ self: {
        ];
        description = "A format for describing comics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "comma" = callPackage
@@ -54364,6 +58147,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "pattern matching against string based commands";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "commander-cli" = callPackage
@@ -54415,6 +58200,8 @@ self: {
        ];
        description = "Library for working with commoditized amounts and price histories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "commonmark" = callPackage
@@ -54511,6 +58298,8 @@ self: {
        ];
        description = "Provide communications security using symmetric ephemeral keys";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "commsec-keyexchange" = callPackage
@@ -54529,6 +58318,8 @@ self: {
        ];
        description = "Key agreement for commsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "commutative" = callPackage
@@ -54643,6 +58434,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "An append only list in a compact region";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-map" = callPackage
@@ -54656,6 +58449,8 @@ self: {
        ];
        description = "Compact Data.Map implementation using Data.Binary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-mutable" = callPackage
@@ -54675,6 +58470,8 @@ self: {
        ];
        description = "Mutable arrays living on the compact heap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-mutable-vector" = callPackage
@@ -54688,6 +58485,8 @@ self: {
        testHaskellDepends = [ base compact hspec ];
        description = "Mutable vector with different GC characteristics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-sequences" = callPackage
@@ -54718,6 +58517,8 @@ self: {
        ];
        description = "Socket functions for compact normal form";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-string" = callPackage
@@ -54731,6 +58532,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-string-fix" = callPackage
@@ -54744,6 +58547,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-word-vectors" = callPackage
@@ -54760,6 +58565,8 @@ self: {
        ];
        description = "Small vectors of small integers stored very compactly";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compactable" = callPackage
@@ -54771,6 +58578,8 @@ self: {
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A typeclass for structures which can be catMaybed, filtered, and partitioned";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compactmap" = callPackage
@@ -54821,6 +58630,8 @@ self: {
        ];
        description = "Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compdata-automata" = callPackage
@@ -54836,6 +58647,8 @@ self: {
        ];
        description = "Tree automata on Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compdata-dags" = callPackage
@@ -54857,6 +58670,8 @@ self: {
        ];
        description = "Compositional Data Types on DAGs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compdata-fixplate" = callPackage
@@ -54892,6 +58707,8 @@ self: {
        ];
        description = "Parametric Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compdoc" = callPackage
@@ -54943,6 +58760,8 @@ self: {
        ];
        description = "Client for the Compendium schema server";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compensated" = callPackage
@@ -54977,6 +58796,8 @@ self: {
        libraryHaskellDepends = [ base filepath parsec ];
        description = "Helpers and runners for code competitions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compilation" = callPackage
@@ -54988,6 +58809,8 @@ self: {
        libraryHaskellDepends = [ base MissingH ];
        description = "Haskell functionality for quickly assembling simple compilers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compiler-warnings" = callPackage
@@ -55017,6 +58840,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "complex numbers with non-mandatory RealFloat";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "complex-integrate" = callPackage
@@ -55044,6 +58869,8 @@ self: {
        ];
        description = "Empirical algorithmic complexity";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "componentm" = callPackage
@@ -55131,6 +58958,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Composable monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "composite-aeson" = callPackage
@@ -55309,6 +59138,8 @@ self: {
        ];
        description = "Opaleye SQL for Vinyl records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "composite-swagger" = callPackage
@@ -55330,6 +59161,8 @@ self: {
        ];
        description = "Swagger for Vinyl records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "composite-tuple" = callPackage
@@ -55396,6 +59229,8 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Composition trees for arbitrary monoids";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compositional-data" = callPackage
@@ -55443,6 +59278,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Plugin to generalize comprehensions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compressed" = callPackage
@@ -55462,6 +59299,8 @@ self: {
        ];
        description = "Compressed containers and reducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compression" = callPackage
@@ -55489,6 +59328,8 @@ self: {
        ];
        description = "Strategy combinators for compositional data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "comptrans" = callPackage
@@ -55506,6 +59347,8 @@ self: {
        ];
        description = "Automatically converting ASTs into compositional data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "computational-algebra" = callPackage
@@ -55557,6 +59400,8 @@ self: {
        ];
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "computational-geometry" = callPackage
@@ -55573,6 +59418,8 @@ self: {
        ];
        description = "Collection of algorithms in Computational Geometry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "computations" = callPackage
@@ -55584,6 +59431,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Advanced notions of computation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concatenative" = callPackage
@@ -55661,6 +59510,8 @@ self: {
        ];
        description = "Morphological disambiguation based on constrained CRFs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concraft-hr" = callPackage
@@ -55682,6 +59533,8 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "Part-of-speech tagger for Croatian";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concraft-pl" = callPackage
@@ -55710,6 +59563,8 @@ self: {
        ];
        description = "Morphological tagger for Polish";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concrete-haskell" = callPackage
@@ -55753,6 +59608,8 @@ self: {
        ];
        description = "Library for the Concrete data format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concrete-haskell-autogen" = callPackage
@@ -55769,6 +59626,8 @@ self: {
        ];
        description = "Automatically generated Thrift definitions for the Concrete data format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concrete-relaxng-parser" = callPackage
@@ -55788,6 +59647,8 @@ self: {
        ];
        description = "A parser driven by a standard RELAX NG schema with concrete syntax extensions";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concrete-typerep" = callPackage
@@ -55807,6 +59668,8 @@ self: {
        ];
        description = "Binary and Hashable instances for TypeRep";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concur-core" = callPackage
@@ -55860,6 +59723,8 @@ self: {
        ];
        description = "Benchmarks to compare concurrency APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concurrent-barrier" = callPackage
@@ -55901,6 +59766,8 @@ self: {
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "Concurrent expanding buffer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concurrent-dns-cache" = callPackage
@@ -55989,6 +59856,8 @@ self: {
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concurrent-output" = callPackage
@@ -56074,6 +59943,8 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl stm transformers ];
        description = "MTL-like library using TVars";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concurrent-supply" = callPackage
@@ -56144,6 +60015,8 @@ self: {
        ];
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "condorcet" = callPackage
@@ -56155,6 +60028,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Library for Condorcet voting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conductive-base" = callPackage
@@ -56166,6 +60041,8 @@ self: {
        libraryHaskellDepends = [ array base containers random stm time ];
        description = "a library for live coding and real-time musical applications";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conductive-clock" = callPackage
@@ -56193,6 +60070,8 @@ self: {
        ];
        description = "a library with examples of using Conductive with hsc3";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conductive-song" = callPackage
@@ -56204,6 +60083,8 @@ self: {
        libraryHaskellDepends = [ base conductive-base random ];
        description = "a library of functions which are useful for composing music";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduino" = callPackage
@@ -56315,6 +60196,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "conduit-audio interface to the LAME MP3 library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mp3lame = null;};
 
   "conduit-audio-samplerate" = callPackage
@@ -56334,6 +60217,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {samplerate = null;};
 
   "conduit-audio-sndfile" = callPackage
@@ -56460,6 +60345,8 @@ self: {
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-iconv" = callPackage
@@ -56480,6 +60367,8 @@ self: {
        ];
        description = "Conduit for character encoding conversion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-merge" = callPackage
@@ -56506,6 +60395,8 @@ self: {
        ];
        description = "A base layer for network protocols using Conduits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-parse" = callPackage
@@ -56544,6 +60435,8 @@ self: {
        ];
        description = "Allows conduit to resume sinks to feed multiple sources into it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-throttle" = callPackage
@@ -56567,6 +60460,8 @@ self: {
        ];
        description = "Throttle Conduit Producers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-tokenize-attoparsec" = callPackage
@@ -56586,6 +60481,8 @@ self: {
        testHaskellDepends = [ attoparsec base conduit hspec resourcet ];
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-vfs" = callPackage
@@ -56610,6 +60507,8 @@ self: {
        ];
        description = "Virtual file system for Conduit; disk, pure, and in-memory impls";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-vfs-zip" = callPackage
@@ -56636,6 +60535,8 @@ self: {
        ];
        description = "Zip archive interface for the Conduit Virtual File System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-zstd" = callPackage
@@ -56670,6 +60571,8 @@ self: {
        ];
        description = "Parser for Haskell-based configuration files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conf-json" = callPackage
@@ -56721,6 +60624,8 @@ self: {
          text transformers
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer" = callPackage
@@ -56783,6 +60688,8 @@ self: {
        ];
        description = "Configuration for reading dhall files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer-provider-json" = callPackage
@@ -56803,6 +60710,8 @@ self: {
        ];
        description = "conferer's provider for reading json files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer-provider-yaml" = callPackage
@@ -56821,6 +60730,8 @@ self: {
        ];
        description = "Configuration for reading yaml files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer-snap" = callPackage
@@ -56949,6 +60860,8 @@ self: {
        ];
        description = "A .conf file formatter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "confide" = callPackage
@@ -56963,6 +60876,8 @@ self: {
        testHaskellDepends = [ base deiko-config tasty tasty-hunit text ];
        description = "derive typeclass instances for decoding types from HOCON conf";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "config-ini" = callPackage
@@ -57016,6 +60931,8 @@ self: {
        testHaskellDepends = [ base extra hspec lens parsec text ];
        description = "Parse config files using parsec and generate parse errors on unhandled keys";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "config-schema" = callPackage
@@ -57033,6 +60950,8 @@ self: {
        testHaskellDepends = [ base config-value text ];
        description = "Schema definitions for the config-value package";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "config-select" = callPackage
@@ -57048,6 +60967,8 @@ self: {
        ];
        description = "A small program for swapping out dot files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "config-value" = callPackage
@@ -57062,6 +60983,8 @@ self: {
        testHaskellDepends = [ base text ];
        description = "Simple, layout-based value language similar to YAML or JSON";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "config-value-getopt" = callPackage
@@ -57075,6 +60998,8 @@ self: {
        libraryHaskellDepends = [ base config-value text ];
        description = "Interface between config-value and System.GetOpt";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "configifier" = callPackage
@@ -57103,6 +61028,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "parser for config files, shell variables, command line args";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "configuration" = callPackage
@@ -57114,6 +61041,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple data type for application configuration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "configuration-tools" = callPackage
@@ -57207,6 +61136,8 @@ self: {
        ];
        description = "The next generation of configuration management";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "configurator-pg" = callPackage
@@ -57245,6 +61176,8 @@ self: {
        ];
        description = "A command line tool for resolving conflicts of file synchronizers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "congruence-relation" = callPackage
@@ -57256,6 +61189,8 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "Decidable congruence relations for Haskell: up to you whether this is a joke";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conjugateGradient" = callPackage
@@ -57287,6 +61222,8 @@ self: {
        ];
        description = "A BitTorrent client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conkin" = callPackage
@@ -57304,6 +61241,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Tools for functors from Hask^k to Hask";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conlogger" = callPackage
@@ -57318,6 +61257,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A logger for a concurrent program";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "connection" = callPackage
@@ -57370,6 +61311,8 @@ self: {
        testHaskellDepends = [ base doctest text ];
        description = "A library for parsing connection strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "connections" = callPackage
@@ -57403,6 +61346,8 @@ self: {
        testHaskellDepends = [ base lifted-async transformers ];
        description = "Eventually consistent STM transactions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "console-program" = callPackage
@@ -57420,6 +61365,8 @@ self: {
        ];
        description = "Interpret the command line and a config file as commands and options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "console-prompt" = callPackage
@@ -57454,6 +61401,8 @@ self: {
        testHaskellDepends = [ base directory process ];
        description = "Compiler plugin for constant math elimination";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constaparser" = callPackage
@@ -57476,6 +61425,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Equality by only Constructor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constrained" = callPackage
@@ -57502,6 +61453,8 @@ self: {
        ];
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constrained-category" = callPackage
@@ -57521,6 +61474,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constrained Categories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constrained-dynamic" = callPackage
@@ -57533,6 +61488,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dynamic typing with retained constraints";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constrained-monads" = callPackage
@@ -57556,6 +61513,8 @@ self: {
        ];
        description = "Typeclasses and instances for monads with constraints";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constrained-normal" = callPackage
@@ -57617,6 +61576,8 @@ self: {
        libraryHaskellDepends = [ base indextype ];
        description = "Some conviencience type functions for manipulating constraints";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constraint-reflection" = callPackage
@@ -57695,6 +61656,8 @@ self: {
        testHaskellDepends = [ base constraints hspec transformers ];
        description = "Defer instance lookups until runtime";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constraints-extras" = callPackage
@@ -57763,6 +61726,8 @@ self: {
        ];
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constructive-algebra" = callPackage
@@ -57774,6 +61739,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck type-level ];
        description = "A library of constructive algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "consul-haskell" = callPackage
@@ -57798,6 +61765,8 @@ self: {
        ];
        description = "A consul client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "consumers" = callPackage
@@ -57824,6 +61793,8 @@ self: {
        ];
        description = "Concurrent PostgreSQL data consumers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "container" = callPackage
@@ -57837,6 +61808,8 @@ self: {
        ];
        description = "Containers abstraction and utilities";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "container-builder" = callPackage
@@ -57907,6 +61880,8 @@ self: {
        ];
        description = "Extensive benchmark suite for containers package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "containers-deepseq" = callPackage
@@ -57940,6 +61915,8 @@ self: {
        libraryHaskellDepends = [ containers ];
        description = "Formally verified drop-in replacement of containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "content-store" = callPackage
@@ -57964,6 +61941,8 @@ self: {
        ];
        description = "Store and retrieve data from an on-disk store";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "context" = callPackage
@@ -58025,6 +62004,8 @@ self: {
        ];
        description = "Basic algorithms on context-free grammars";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "context-http-client" = callPackage
@@ -58069,6 +62050,8 @@ self: {
        ];
        description = "An abstraction of a stack and stack-based monadic context";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "context-wai-middleware" = callPackage
@@ -58110,6 +62093,8 @@ self: {
        ];
        description = "Unified interface for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "contiguous-checked" = callPackage
@@ -58121,6 +62106,8 @@ self: {
        libraryHaskellDepends = [ base contiguous primitive ];
        description = "contiguous with bounds checks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "contiguous-fft" = callPackage
@@ -58132,6 +62119,8 @@ self: {
        libraryHaskellDepends = [ base contiguous primitive semirings ];
        description = "dft of contiguous memory structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "continue" = callPackage
@@ -58148,6 +62137,8 @@ self: {
        ];
        description = "Monads with suspension and arbitrary-spot reentry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "continued-fraction" = callPackage
@@ -58194,6 +62185,8 @@ self: {
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "continuum-client" = callPackage
@@ -58208,6 +62201,8 @@ self: {
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "contracheck-applicative" = callPackage
@@ -58265,6 +62260,8 @@ self: {
        ];
        description = "Class of monad transformers which control operations can be lifted thru";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-bool" = callPackage
@@ -58332,6 +62329,8 @@ self: {
        ];
        description = "A typeclass for type isomorphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-monad-attempt" = callPackage
@@ -58343,6 +62342,8 @@ self: {
        libraryHaskellDepends = [ attempt base transformers ];
        description = "Monad transformer for attempt. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-monad-exception" = callPackage
@@ -58374,6 +62375,8 @@ self: {
        ];
        description = "Monads-fd instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-monad-exception-monadstf" = callPackage
@@ -58412,6 +62415,8 @@ self: {
        libraryHaskellDepends = [ base failure transformers ];
        description = "A class for monads which can fail with an error. (deprecated)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-monad-failure-mtl" = callPackage
@@ -58423,6 +62428,8 @@ self: {
        libraryHaskellDepends = [ base failure mtl ];
        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;
+       broken = true;
      }) {};
 
   "control-monad-free" = callPackage
@@ -58500,6 +62507,8 @@ self: {
        libraryHaskellDepends = [ base contstuff monads-tf ];
        description = "ContStuff instances for monads-tf transformers (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "contstuff-transformers" = callPackage
@@ -58511,6 +62520,8 @@ self: {
        libraryHaskellDepends = [ base contstuff transformers ];
        description = "Deprecated interface between contstuff 0.7.0 and the transformers package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "converge" = callPackage
@@ -58581,11 +62592,11 @@ self: {
      }:
      mkDerivation {
        pname = "conversions";
-       version = "0.0.3";
-       sha256 = "1fn7ras17maswl7fw5hdbw02b8wjlzs2gcfwdxrw9xipjbw81hir";
+       version = "0.0.4";
+       sha256 = "1r5k2fqhcyfhrji4ivylx91idhckg0yhkhcrv0pwgqila0xr38p8";
        libraryHaskellDepends = [
-         base bytestring control-bool devtools exceptions mtl
-         source-constraints template-haskell text unliftio-core
+         base bytestring control-bool exceptions mtl source-constraints
+         template-haskell text unliftio-core
        ];
        testHaskellDepends = [
          base bytestring control-bool devtools exceptions mtl
@@ -58593,6 +62604,8 @@ self: {
        ];
        description = "Injective explicit total and partial conversions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "convert" = callPackage
@@ -58610,6 +62623,8 @@ self: {
        ];
        description = "Safe and unsafe data conversion utilities with strong type-level operation. checking.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "convert-annotation" = callPackage
@@ -58633,6 +62648,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "convertible" = callPackage
@@ -58666,6 +62683,8 @@ self: {
        ];
        description = "convertible instances for ascii";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "convertible-text" = callPackage
@@ -58686,6 +62705,8 @@ self: {
        ];
        description = "Typeclasses and instances for converting between types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cookbook" = callPackage
@@ -58730,6 +62751,8 @@ self: {
        ];
        description = "web cookies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coordinate" = callPackage
@@ -58742,6 +62765,8 @@ self: {
        testHaskellDepends = [ base HUnit lens ];
        description = "A representation of latitude and longitude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copilot" = callPackage
@@ -58762,6 +62787,8 @@ self: {
        executableHaskellDepends = [ base copilot-c99 copilot-libraries ];
        description = "A stream DSL for writing embedded C programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copilot-c99" = callPackage
@@ -58795,6 +62822,8 @@ self: {
        ];
        description = "Copilot interface to a C model-checker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copilot-core" = callPackage
@@ -58822,6 +62851,8 @@ self: {
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copilot-libraries" = callPackage
@@ -58837,6 +62868,8 @@ self: {
        ];
        description = "Libraries for the Copilot language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copilot-sbv" = callPackage
@@ -58852,6 +62885,8 @@ self: {
        ];
        description = "A compiler for CoPilot targeting SBV";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copilot-theorem" = callPackage
@@ -58869,6 +62904,8 @@ self: {
        ];
        description = "k-induction for Copilot";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copr" = callPackage
@@ -58888,6 +62925,8 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Haskell interface to the Fedora Copr system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "core" = callPackage
@@ -58899,6 +62938,8 @@ self: {
        libraryHaskellDepends = [ base bytestring parsec pretty ];
        description = "External core parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "core-compiler" = callPackage
@@ -58950,6 +62991,8 @@ self: {
        ];
        description = "A subset of Haskell using in UCC for teaching purpose";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "core-program" = callPackage
@@ -59014,6 +63057,8 @@ self: {
        ];
        description = "A bliki written using yesod. Uses pandoc to process files stored in git.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "corecursive-main" = callPackage
@@ -59084,6 +63129,8 @@ self: {
        libraryHaskellDepends = [ base enumerator monad-coroutine ];
        description = "Bridge between the monad-coroutine and enumerator packages";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coroutine-iteratee" = callPackage
@@ -59095,6 +63142,8 @@ self: {
        libraryHaskellDepends = [ base iteratee monad-coroutine ];
        description = "Bridge between the monad-coroutine and iteratee packages";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coroutine-object" = callPackage
@@ -59106,6 +63155,8 @@ self: {
        libraryHaskellDepends = [ base either free mtl transformers ];
        description = "Object-oriented programming realization using coroutine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "couch-hs" = callPackage
@@ -59124,6 +63175,8 @@ self: {
        ];
        description = "A CouchDB view server for Haskell";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "couch-simple" = callPackage
@@ -59180,6 +63233,8 @@ self: {
        ];
        description = "Couch DB client library using http-conduit and aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "couchdb-enumerator" = callPackage
@@ -59207,6 +63262,8 @@ self: {
        ];
        description = "Couch DB client library using http-enumerator and aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "count" = callPackage
@@ -59250,6 +63307,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck text ];
        description = "Countable Text Inflections";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "counter" = callPackage
@@ -59261,6 +63320,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "An object frequency counter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "country" = callPackage
@@ -59297,6 +63358,8 @@ self: {
        testHaskellDepends = [ aeson base HTF HUnit ];
        description = "ISO 3166 country codes and i18n names";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "courier" = callPackage
@@ -59321,6 +63384,8 @@ self: {
        ];
        description = "A message-passing library for simplifying network applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "court" = callPackage
@@ -59340,6 +63405,8 @@ self: {
        ];
        description = "Simple and flexible CI system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coverage" = callPackage
@@ -59352,6 +63419,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Exhaustivity Checking Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coya" = callPackage
@@ -59381,6 +63450,8 @@ self: {
        ];
        description = "A simple C++ parser with preprocessor features. C++ refactorings included.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cpio-conduit" = callPackage
@@ -59400,6 +63471,8 @@ self: {
        ];
        description = "Conduit-based CPIO";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cpkg" = callPackage
@@ -59464,6 +63537,8 @@ self: {
        testHaskellDepends = [ base process QuickCheck ];
        description = "C++ Foreign Import Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cppfilt" = callPackage
@@ -59528,6 +63603,8 @@ self: {
        ];
        description = "Run random effect using cprng-aes, a crypto pseudo number generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cpsa" = callPackage
@@ -59593,6 +63670,8 @@ self: {
        executableHaskellDepends = [ base mtl process ];
        description = "Modify the cpu frequency on OpenBSD systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cpython" = callPackage
@@ -59606,6 +63685,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {python34 = null;};
 
   "cql" = callPackage
@@ -59655,6 +63736,8 @@ self: {
        doHaddock = false;
        description = "Cassandra CQL client";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cql-io-tinylog" = callPackage
@@ -59666,6 +63749,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cql-io tinylog ];
        description = "Tinylog integration for cql-io";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs" = callPackage
@@ -59694,6 +63779,8 @@ self: {
        ];
        description = "Command-Query Responsibility Segregation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-example" = callPackage
@@ -59715,6 +63802,8 @@ self: {
        ];
        description = "Example for cqrs package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-memory" = callPackage
@@ -59731,6 +63820,8 @@ self: {
        testHaskellDepends = [ base cqrs-core cqrs-testkit hspec random ];
        description = "Memory backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-postgresql" = callPackage
@@ -59754,6 +63845,8 @@ self: {
        ];
        description = "PostgreSQL backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-sqlite3" = callPackage
@@ -59774,6 +63867,8 @@ self: {
        ];
        description = "SQLite3 backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-test" = callPackage
@@ -59790,6 +63885,8 @@ self: {
        ];
        description = "Command-Query Responsibility Segregation Test Support";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-testkit" = callPackage
@@ -59807,6 +63904,8 @@ self: {
        ];
        description = "Command-Query Responsibility Segregation Test Support";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-types" = callPackage
@@ -59837,6 +63936,8 @@ self: {
        ];
        description = "Code review tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crack" = callPackage
@@ -59849,6 +63950,8 @@ self: {
        librarySystemDepends = [ crack ];
        description = "A haskell binding to cracklib";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {crack = null;};
 
   "crackNum" = callPackage
@@ -59894,6 +63997,8 @@ self: {
        ];
        description = "A UNIX configuration management library in Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "craftwerk" = callPackage
@@ -59907,6 +64012,8 @@ self: {
        libraryHaskellDepends = [ base colour mtl vector-space ];
        description = "2D graphics library with integrated TikZ output";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "craftwerk-cairo" = callPackage
@@ -59918,6 +64025,8 @@ self: {
        libraryHaskellDepends = [ base cairo craftwerk mtl ];
        description = "Cairo backend for Craftwerk";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "craftwerk-gtk" = callPackage
@@ -59935,6 +64044,8 @@ self: {
        ];
        description = "Gtk UI for Craftwerk";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crawlchain" = callPackage
@@ -59955,6 +64066,8 @@ self: {
        ];
        description = "Simulation user crawl paths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "craze" = callPackage
@@ -59987,6 +64100,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "HTTP Racing Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crc" = callPackage
@@ -60004,6 +64119,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Implements various Cyclic Redundancy Checks (CRC)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crc16" = callPackage
@@ -60015,6 +64132,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Calculate the crc16-ccitt";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crc16-table" = callPackage
@@ -60059,6 +64178,8 @@ self: {
        ];
        description = "Conflict-free replicated data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crdt-event-fold" = callPackage
@@ -60076,6 +64197,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Garbage collected event folding CRDT";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "creatur" = callPackage
@@ -60101,6 +64224,8 @@ self: {
        ];
        description = "Framework for artificial life experiments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "credential-store" = callPackage
@@ -60120,6 +64245,8 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        description = "Library to access secure credential storage providers";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "credentials" = callPackage
@@ -60183,6 +64310,8 @@ self: {
        ];
        description = "First-order, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crf-chain1-constrained" = callPackage
@@ -60202,6 +64331,8 @@ self: {
        ];
        description = "First-order, constrained, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crf-chain2-generic" = callPackage
@@ -60219,6 +64350,8 @@ self: {
        ];
        description = "Second-order, generic, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crf-chain2-tiers" = callPackage
@@ -60237,6 +64370,8 @@ self: {
        ];
        description = "Second-order, tiered, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "critbit" = callPackage
@@ -60265,6 +64400,8 @@ self: {
        ];
        description = "Crit-bit maps and sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "criterion" = callPackage
@@ -60361,6 +64498,8 @@ self: {
        ];
        description = "A simple tool for visualising differences in Criterion benchmark results";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "criterion-measurement" = callPackage
@@ -60403,6 +64542,8 @@ self: {
        ];
        description = "Enhancement of the \"criterion\" benchmarking library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "criterion-to-html" = callPackage
@@ -60421,6 +64562,8 @@ self: {
        ];
        description = "Convert criterion output to HTML reports";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "criu-rpc" = callPackage
@@ -60437,6 +64580,8 @@ self: {
        ];
        description = "CRIU RPC client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "criu-rpc-types" = callPackage
@@ -60450,6 +64595,8 @@ self: {
        libraryPkgconfigDepends = [ protobuf ];
        description = "Criu RPC protocol buffer types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) protobuf;};
 
   "crjdt-haskell" = callPackage
@@ -60465,6 +64612,8 @@ self: {
        testHaskellDepends = [ base containers hedgehog hspec mtl ];
        description = "A Conflict-Free Replicated JSON Datatype for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crockford" = callPackage
@@ -60476,6 +64625,8 @@ self: {
        libraryHaskellDepends = [ base digits QuickCheck safe ];
        description = "An implementation of Douglas Crockford's base32 encoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crocodile" = callPackage
@@ -60494,6 +64645,8 @@ self: {
        ];
        description = "An offline renderer supporting ray tracing and photon mapping";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cron" = callPackage
@@ -60537,6 +64690,8 @@ self: {
        ];
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cronus" = callPackage
@@ -60566,6 +64721,8 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Request and Response types for Eval.so's API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crunghc" = callPackage
@@ -60584,6 +64741,8 @@ self: {
        ];
        description = "A runghc replacement with transparent caching";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypt-sha512" = callPackage
@@ -60605,6 +64764,8 @@ self: {
        ];
        description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-api" = callPackage
@@ -60657,6 +64818,8 @@ self: {
        ];
        description = "Generic cryptography cipher benchmarks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-cipher-tests" = callPackage
@@ -60708,6 +64871,8 @@ self: {
        testHaskellDepends = [ base bytestring QuickCheck ];
        description = "An educational tool for studying classical cryptography schemes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-conduit" = callPackage
@@ -60729,6 +64894,8 @@ self: {
        ];
        description = "Conduit interface for cryptographic operations (from crypto-api)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-enigma" = callPackage
@@ -60763,6 +64930,8 @@ self: {
        ];
        description = "Like crypto-pubkey-openssh but not dependent on any specific crypto library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-multihash" = callPackage
@@ -60783,6 +64952,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Multihash library on top of cryptonite crypto library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-numbers" = callPackage
@@ -60855,6 +65026,8 @@ self: {
        ];
        description = "OpenSSH keys decoder/encoder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-pubkey-types" = callPackage
@@ -60908,6 +65081,8 @@ self: {
        ];
        description = "A random effect using crypto-random";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-rng" = callPackage
@@ -60938,6 +65113,8 @@ self: {
        ];
        description = "A simple high level encryption interface based on cryptonite";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-sodium" = callPackage
@@ -61001,6 +65178,8 @@ self: {
        ];
        description = "Symmetrical block and stream ciphers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cryptocompare" = callPackage
@@ -61019,6 +65198,8 @@ self: {
        testHaskellDepends = [ base hspec hspec-expectations MissingH ];
        description = "Haskell wrapper for the cryptocompare API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cryptoconditions" = callPackage
@@ -61042,6 +65223,8 @@ self: {
        ];
        description = "Interledger Crypto-Conditions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cryptohash" = callPackage
@@ -61177,6 +65360,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast, pure and practical SHA-512 implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cryptoids" = callPackage
@@ -61196,6 +65381,8 @@ self: {
        ];
        description = "Reversable and secure encoding of object ids as a bytestring";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cryptoids-class" = callPackage
@@ -61209,6 +65396,8 @@ self: {
        libraryHaskellDepends = [ base cryptoids-types exceptions ];
        description = "Typeclass-based interface to cryptoids";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cryptoids-types" = callPackage
@@ -61226,6 +65415,8 @@ self: {
        ];
        description = "Shared types for encrypting internal object identifiers before exposure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cryptol" = callPackage
@@ -61262,6 +65453,8 @@ self: {
        ];
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cryptonite" = callPackage
@@ -61367,6 +65560,8 @@ self: {
        ];
        description = "Bindings for Cryptsy cryptocurrency exchange API";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crystalfontz" = callPackage
@@ -61378,6 +65573,8 @@ self: {
        libraryHaskellDepends = [ base crc16-table MaybeT serialport ];
        description = "Control Crystalfontz LCD displays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "csa" = callPackage
@@ -61405,6 +65602,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Compiler plugin for common subexpression elimination";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "csg" = callPackage
@@ -61436,6 +65635,8 @@ self: {
        ];
        description = "Analytical CSG (Constructive Solid Geometry) library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "csound-catalog" = callPackage
@@ -61563,6 +65764,8 @@ self: {
        ];
        description = "A command line type checker for CSPM files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cspretty" = callPackage
@@ -61574,6 +65777,8 @@ self: {
        libraryHaskellDepends = [ base containers pretty ];
        description = "AST and pretty printer for CSPm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "css" = callPackage
@@ -61585,6 +65790,8 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        description = "Minimal monadic CSS DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "css-easings" = callPackage
@@ -61623,6 +65830,8 @@ self: {
        ];
        description = "Parsing, rendering and manipulating css selectors in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "css-syntax" = callPackage
@@ -61710,6 +65919,8 @@ self: {
        ];
        description = "A flexible, fast, enumerator-based CSV parser library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "csv-nptools" = callPackage
@@ -61727,6 +65938,8 @@ self: {
        ];
        description = "A collection of CSV tools";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "csv-table" = callPackage
@@ -61771,6 +65984,8 @@ self: {
        librarySystemDepends = [ ctemplate ];
        description = "Binding to the Google ctemplate library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ctemplate = null;};
 
   "ctkl" = callPackage
@@ -61782,6 +65997,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "packaging of Manuel Chakravarty's CTK Light for Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ctpl" = callPackage
@@ -61798,6 +66015,8 @@ self: {
        executableHaskellDepends = [ array base chatty-text chatty-utils ];
        description = "A programming language for text modification";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ctrie" = callPackage
@@ -61838,6 +66057,8 @@ self: {
        ];
        description = "Cubic DSL for 3D printing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cubical" = callPackage
@@ -61916,6 +66137,8 @@ self: {
        executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cuckoo" = callPackage
@@ -61938,6 +66161,8 @@ self: {
        doHaddock = false;
        description = "Haskell Implementation of Cuckoo Filters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cuckoo-filter" = callPackage
@@ -62113,6 +66338,8 @@ self: {
        ];
        description = "A framework for declaratively writing curl based API tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "curlhs" = callPackage
@@ -62171,6 +66398,8 @@ self: {
        testHaskellDepends = [ aeson base bson hspec QuickCheck ];
        description = "ISO-4217 Currency Codes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "currency-convert" = callPackage
@@ -62186,6 +66415,8 @@ self: {
        ];
        description = "Typesafe currency conversion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "current-locale" = callPackage
@@ -62254,6 +66485,8 @@ self: {
        testHaskellDepends = [ base Cabal curry-base filepath ];
        description = "Compile the functional logic language Curry to several intermediate formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "curryer" = callPackage
@@ -62304,6 +66537,8 @@ self: {
        ];
        description = "Terminal tool for viewing tabular data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cursor" = callPackage
@@ -62430,6 +66665,8 @@ self: {
        ];
        description = "Library for drawing curve based images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cusolver" = callPackage
@@ -62475,6 +66712,8 @@ self: {
        libraryHaskellDepends = [ base basic-prelude monad-loops ];
        description = "An enhanced prelude, serving as a foundation for my projects";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cut-the-crap" = callPackage
@@ -62548,6 +66787,8 @@ self: {
        ];
        description = "Functional Combinators for Computer Vision";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cve" = callPackage
@@ -62577,6 +66818,8 @@ self: {
        ];
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cypher" = callPackage
@@ -62596,6 +66839,8 @@ self: {
        ];
        description = "Haskell bindings for the neo4j \"cypher\" query language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "czipwith" = callPackage
@@ -62638,6 +66883,8 @@ self: {
        ];
        description = "Permissively licensed D-Bus client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "d10" = callPackage
@@ -62682,6 +66929,8 @@ self: {
        libraryHaskellDepends = [ base mtl random text ];
        description = "Declarative visualization on a web browser with DSL approach";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "daemonize-doublefork" = callPackage
@@ -62738,6 +66987,8 @@ self: {
        ];
        description = "Compile-time, type-safe directed acyclic graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "damnpacket" = callPackage
@@ -62756,6 +67007,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
        description = "Parsing dAmn messages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "danibot" = callPackage
@@ -62778,6 +67031,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Basic Slack bot framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dao" = callPackage
@@ -62808,6 +67063,8 @@ self: {
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dapi" = callPackage
@@ -62826,6 +67083,8 @@ self: {
        ];
        description = "Prints a series of dates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcs" = callPackage
@@ -62897,6 +67156,8 @@ self: {
        ];
        description = "Comparative benchmark suite for darcs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcs-beta" = callPackage
@@ -62928,6 +67189,8 @@ self: {
        executableSystemDepends = [ curl ];
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) curl;};
 
   "darcs-buildpackage" = callPackage
@@ -62946,6 +67209,8 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Darcs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcs-cabalized" = callPackage
@@ -62967,6 +67232,8 @@ self: {
        executableSystemDepends = [ curl ncurses zlib ];
        description = "David's Advanced Version Control System";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) curl; inherit (pkgs) ncurses; 
          inherit (pkgs) zlib;};
 
@@ -62987,6 +67254,8 @@ self: {
        ];
        description = "Import/export git fast-import streams to/from darcs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcs-graph" = callPackage
@@ -63005,6 +67274,8 @@ self: {
        ];
        description = "Generate graphs of darcs repository activity";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcs-monitor" = callPackage
@@ -63022,6 +67293,8 @@ self: {
        ];
        description = "Darcs repository monitor (sends email)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcs-scripts" = callPackage
@@ -63052,6 +67325,8 @@ self: {
        ];
        description = "Outputs dependencies of darcs patches in dot format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcsden" = callPackage
@@ -63079,6 +67354,8 @@ self: {
        ];
        description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch).";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcswatch" = callPackage
@@ -63101,6 +67378,8 @@ self: {
        ];
        description = "Track application of Darcs patches";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darkplaces-demo" = callPackage
@@ -63128,6 +67407,8 @@ self: {
        ];
        description = "Utility and parser for DarkPlaces demo files";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darkplaces-rcon" = callPackage
@@ -63144,6 +67425,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec hspec-core ];
        description = "Darkplaces rcon client library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darkplaces-rcon-util" = callPackage
@@ -63173,6 +67456,8 @@ self: {
        ];
        description = "Darplaces rcon utility";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darkplaces-text" = callPackage
@@ -63190,6 +67475,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Parser for darkplaces colorful text";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dash-haskell" = callPackage
@@ -63210,6 +67497,8 @@ self: {
        ];
        description = "Convert package Haddock to Dash docsets (IDE docs)";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-accessor" = callPackage
@@ -63246,6 +67535,8 @@ self: {
        ];
        description = "Use Accessor to access state in monads-fd State monad class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-accessor-monads-tf" = callPackage
@@ -63259,6 +67550,8 @@ self: {
        ];
        description = "Use Accessor to access state in monads-tf State monad type family";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-accessor-mtl" = callPackage
@@ -63324,6 +67617,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator birds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-base" = callPackage
@@ -63335,6 +67630,8 @@ self: {
        libraryHaskellDepends = [ 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;
+       broken = true;
      }) {};
 
   "data-basic" = callPackage
@@ -63358,6 +67655,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "data-binary-ieee754" = callPackage
@@ -63427,6 +67726,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Library for checking and normalization of data (e.g. from web forms)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-checked" = callPackage
@@ -63462,6 +67763,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generate a special combinator from any data type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-compat" = callPackage
@@ -63484,6 +67787,8 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A Library for directional queues";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-construction" = callPackage
@@ -63495,6 +67800,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-constructors" = callPackage
@@ -63524,6 +67831,8 @@ self: {
        ];
        description = "a cyclic doubly linked list";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-default" = callPackage
@@ -63742,6 +68051,8 @@ self: {
        ];
        description = "Space-efficient and privacy-preserving data dispersal algorithms";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-diverse" = callPackage
@@ -63775,6 +68086,8 @@ self: {
        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;
+       broken = true;
      }) {};
 
   "data-dword" = callPackage
@@ -63809,6 +68122,8 @@ self: {
        ];
        description = "Consistent set of utility functions for Maybe, Either, List and Monoids";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-elf" = callPackage
@@ -63822,6 +68137,8 @@ self: {
        ];
        description = "Executable and Linkable Format (ELF) data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-embed" = callPackage
@@ -63846,6 +68163,8 @@ self: {
        ];
        description = "Embed files and other binary blobs inside executables without Template Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-emoticons" = callPackage
@@ -63857,6 +68176,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator emoticons: data-aviary in the flavor of emoticons";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-endian" = callPackage
@@ -63908,6 +68229,8 @@ self: {
        ];
        description = "A type safe file path data structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-files-gen" = callPackage
@@ -63954,6 +68277,8 @@ self: {
        ];
        description = "Finite totally ordered sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-fin-simple" = callPackage
@@ -63966,6 +68291,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Simple integral finite set";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-fix" = callPackage
@@ -64010,6 +68337,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An efficient data type for sets of flags";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-foldapp" = callPackage
@@ -64148,6 +68477,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Write-once variables with concurrency support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-json-token" = callPackage
@@ -64178,6 +68509,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "data-layer" = callPackage
@@ -64189,6 +68522,8 @@ self: {
        libraryHaskellDepends = [ base convert data-construction lens ];
        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;
+       broken = true;
      }) {};
 
   "data-layout" = callPackage
@@ -64215,6 +68550,8 @@ self: {
        ];
        description = "Used to be Haskell 98 Lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-lens-fd" = callPackage
@@ -64228,6 +68565,8 @@ self: {
        ];
        description = "Lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-lens-ixset" = callPackage
@@ -64240,6 +68579,8 @@ self: {
        testHaskellDepends = [ QuickCheck ];
        description = "A Lens for IxSet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-lens-light" = callPackage
@@ -64262,6 +68603,8 @@ self: {
        libraryHaskellDepends = [ base data-lens template-haskell ];
        description = "Utilities for Data.Lens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-list-sequences" = callPackage
@@ -64295,6 +68638,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Data.Map with multiple, unique keys";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-memocombinators" = callPackage
@@ -64371,6 +68716,8 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "data Nat = Zero | Succ Nat";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-object" = callPackage
@@ -64382,6 +68729,8 @@ self: {
        libraryHaskellDepends = [ base bytestring failure text time ];
        description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-object-json" = callPackage
@@ -64398,6 +68747,8 @@ self: {
        ];
        description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-object-yaml" = callPackage
@@ -64416,6 +68767,8 @@ self: {
        ];
        description = "Serialize data to and from Yaml files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-or" = callPackage
@@ -64462,6 +68815,8 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel pretty time ];
        description = "Prettyprint and compare Data values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-quotientref" = callPackage
@@ -64473,6 +68828,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Reference cells that need two independent indices to be accessed";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-r-tree" = callPackage
@@ -64532,6 +68889,8 @@ self: {
        libraryHaskellDepends = [ base containers data-reify ];
        description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-repr" = callPackage
@@ -64543,6 +68902,8 @@ self: {
        libraryHaskellDepends = [ base generic-deriving lens ];
        description = "Alternative to Show data printing utility";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-result" = callPackage
@@ -64554,6 +68915,8 @@ self: {
        libraryHaskellDepends = [ base poly-control prologue ];
        description = "Data types for returning results distinguishable by types";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-rev" = callPackage
@@ -64565,6 +68928,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers text vector ];
        description = "A typeclass for reversing order of contents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-rope" = callPackage
@@ -64576,6 +68941,8 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-mmap unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-rtuple" = callPackage
@@ -64587,6 +68954,8 @@ self: {
        libraryHaskellDepends = [ base lens typelevel ];
        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;
+       broken = true;
      }) {};
 
   "data-serializer" = callPackage
@@ -64618,6 +68987,8 @@ self: {
        ];
        description = "Profiling of data structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-spacepart" = callPackage
@@ -64629,6 +69000,8 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        description = "Deprecated. Now called \"spacepart\". Space partitioning data structures.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-standards" = callPackage
@@ -64640,6 +69013,8 @@ self: {
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "A collection of standards representable by simple data types";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-stm32" = callPackage
@@ -64693,6 +69068,8 @@ self: {
        ];
        description = "Type safe, in-memory dictionary with multidimensional keys";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-stringmap" = callPackage
@@ -64711,6 +69088,8 @@ self: {
        ];
        description = "An efficient implementation of maps from strings to arbitrary values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-structure-inferrer" = callPackage
@@ -64731,6 +69110,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Program that infers the fastest data structure available for your program";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-sword" = callPackage
@@ -64747,6 +69128,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Shorter binary words";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-tensor" = callPackage
@@ -64839,6 +69222,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Basic type wrangling types and classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-util" = callPackage
@@ -64850,6 +69235,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "utilities for handle data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-validation" = callPackage
@@ -64867,6 +69254,8 @@ self: {
        doHaddock = false;
        description = "A library for creating type safe validations";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-variant" = callPackage
@@ -64878,6 +69267,8 @@ self: {
        libraryHaskellDepends = [ base safe ];
        description = "A variant data type, useful for modeling dynamically-typed programming languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "database-id-class" = callPackage
@@ -64889,6 +69280,8 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        description = "Class for types with a database id";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "database-id-groundhog" = callPackage
@@ -64904,6 +69297,8 @@ self: {
        ];
        description = "HasId/Groundhog interop";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "database-migrate" = callPackage
@@ -64932,6 +69327,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Demonstrate how a database can be implemented the functional way";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datadog" = callPackage
@@ -64959,6 +69356,8 @@ self: {
        ];
        description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datadog-tracing" = callPackage
@@ -64994,6 +69393,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Datadog tracing client and mock agent";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dataenc" = callPackage
@@ -65039,6 +69440,8 @@ self: {
        ];
        description = "Fixing data-flow problems";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dataflow" = callPackage
@@ -65062,6 +69465,8 @@ self: {
        ];
        description = "Generate Graphviz documents from a Haskell representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dataflower" = callPackage
@@ -65106,6 +69511,8 @@ self: {
        ];
        description = "An implementation of datalog in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datapacker" = callPackage
@@ -65123,6 +69530,8 @@ self: {
        ];
        description = "Tool to help pack files into the minimum number of CDs/DVDs/etc";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datarobot" = callPackage
@@ -65174,6 +69583,8 @@ self: {
        ];
        description = "Classical data sets for statistics and machine learning";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dataurl" = callPackage
@@ -65192,6 +69603,8 @@ self: {
        ];
        description = "Handle data-urls";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "date-cache" = callPackage
@@ -65215,6 +69628,8 @@ self: {
        testHaskellDepends = [ base dates hspec QuickCheck time ];
        description = "Date conversions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dates" = callPackage
@@ -65231,6 +69646,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Small library for parsing different dates formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datetime" = callPackage
@@ -65249,6 +69666,8 @@ self: {
        ];
        description = "Utilities to make Data.Time.* easier to use";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datetime-sb" = callPackage
@@ -65267,6 +69686,8 @@ self: {
        ];
        description = "Utilities to make Data.Time.* easier to use.";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dawdle" = callPackage
@@ -65281,6 +69702,8 @@ self: {
        executableHaskellDepends = [ base filepath parsec pretty text ];
        description = "Generates DDL suggestions based on a CSV file";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dawg" = callPackage
@@ -65296,6 +69719,8 @@ self: {
        ];
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dawg-ord" = callPackage
@@ -65328,6 +69753,8 @@ self: {
        testHaskellDepends = [ base hspec postgresql-simple text ];
        description = "Clean database tables automatically around hspec tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbf" = callPackage
@@ -65341,6 +69768,8 @@ self: {
        ];
        description = "Read and write XBase \".dbf\" files";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbjava" = callPackage
@@ -65361,6 +69790,8 @@ self: {
        ];
        description = "Decompiler Bytecode Java";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbm" = callPackage
@@ -65379,6 +69810,8 @@ self: {
        ];
        description = "A *simple* database migration tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbmigrations" = callPackage
@@ -65426,6 +69859,8 @@ self: {
        ];
        description = "The dbmigrations tool built for MySQL databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbmigrations-postgresql" = callPackage
@@ -65444,6 +69879,8 @@ self: {
        ];
        description = "The dbmigrations tool built for PostgreSQL databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbmigrations-sqlite" = callPackage
@@ -65458,6 +69895,8 @@ self: {
        testHaskellDepends = [ base dbmigrations HDBC HDBC-sqlite3 HUnit ];
        description = "The dbmigrations tool built for SQLite databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbus" = callPackage
@@ -65500,6 +69939,8 @@ self: {
        ];
        description = "Monadic and object-oriented interfaces to DBus";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbus-core" = callPackage
@@ -65517,6 +69958,8 @@ self: {
        ];
        description = "Low-level D-Bus protocol implementation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbus-hslogger" = callPackage
@@ -65549,6 +69992,8 @@ self: {
        testHaskellDepends = [ base containers dbus QuickCheck ];
        description = "Quasi-quoter for DBus functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbus-th" = callPackage
@@ -65606,6 +70051,8 @@ self: {
        ];
        description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dclabel-eci11" = callPackage
@@ -65617,6 +70064,8 @@ self: {
        libraryHaskellDepends = [ base pretty QuickCheck ];
        description = "The Disjunction Category Label Format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dcpu16" = callPackage
@@ -65636,6 +70085,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "DCPU-16 Emulator & Assembler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddate" = callPackage
@@ -65647,6 +70098,8 @@ self: {
        libraryHaskellDepends = [ base dates time ];
        description = "Discordian Date Types for Haskell";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-base" = callPackage
@@ -65662,6 +70115,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler common utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-build" = callPackage
@@ -65681,6 +70136,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler build framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-code" = callPackage
@@ -65693,6 +70150,8 @@ self: {
        libraryHaskellDepends = [ base filepath ];
        description = "Disciplined Disciple Compiler base libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core" = callPackage
@@ -65709,6 +70168,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler core language and type checker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-babel" = callPackage
@@ -65722,6 +70183,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler PHP code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-eval" = callPackage
@@ -65737,6 +70200,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler semantic evaluator for the core language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-flow" = callPackage
@@ -65754,6 +70219,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler data flow compiler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-llvm" = callPackage
@@ -65770,6 +70237,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler LLVM code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-salt" = callPackage
@@ -65785,6 +70254,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler C code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-simpl" = callPackage
@@ -65800,6 +70271,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler code transformations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-tetra" = callPackage
@@ -65816,6 +70289,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler intermediate language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-driver" = callPackage
@@ -65835,6 +70310,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler top-level driver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-interface" = callPackage
@@ -65846,6 +70323,8 @@ self: {
        libraryHaskellDepends = [ base containers ddc-base directory ];
        description = "Disciplined Disciple Compiler user interface support";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-source-tetra" = callPackage
@@ -65862,6 +70341,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler source language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-tools" = callPackage
@@ -65884,6 +70365,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler command line tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-war" = callPackage
@@ -65901,6 +70384,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler test driver and buildbot";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddci-core" = callPackage
@@ -65919,6 +70404,8 @@ self: {
        ];
        description = "Disciple Core language interactive interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dde" = callPackage
@@ -65970,6 +70457,8 @@ self: {
        ];
        description = "detect dead code in haskell projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dead-simple-json" = callPackage
@@ -65985,6 +70474,8 @@ self: {
        ];
        description = "Dead simple JSON parser, with some Template Haskell sugar";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "debian" = callPackage
@@ -66074,6 +70565,8 @@ self: {
        ];
        description = "Simple trace-based debugger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "debug-diff" = callPackage
@@ -66124,6 +70617,8 @@ self: {
        ];
        description = "secure remote debugging";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "debug-pp" = callPackage
@@ -66165,6 +70660,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell unicode-show ];
        description = "You do not have to write variable names twice in Debug.Trace";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "debug-tracy" = callPackage
@@ -66179,6 +70676,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "More useful trace functions for investigating bugs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deburr" = callPackage
@@ -66215,6 +70714,8 @@ self: {
        libraryHaskellDepends = [ base comonad-transformers ];
        description = "The categorical dual of transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "decidable" = callPackage
@@ -66230,6 +70731,8 @@ self: {
        ];
        description = "Combinators for manipulating dependently-typed predicates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "decimal-arithmetic" = callPackage
@@ -66244,6 +70747,8 @@ self: {
        testHaskellDepends = [ base binary doctest hspec QuickCheck ];
        description = "An implementation of the General Decimal Arithmetic Specification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "decimal-literals" = callPackage
@@ -66258,6 +70763,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "declarative" = callPackage
@@ -66304,6 +70811,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring conduit ];
        description = "Conduit for decoding ByteStrings using Data.Binary.Get";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dedukti" = callPackage
@@ -66326,6 +70835,8 @@ self: {
        ];
        description = "A type-checker for the λΠ-modulo calculus";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deep-transformations" = callPackage
@@ -66344,6 +70855,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Deep natural and unnatural tree transformations, including attribute grammars";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deepcontrol" = callPackage
@@ -66360,6 +70873,8 @@ self: {
        ];
        description = "A library that provides deep-level programming style and(or) notation on Applicative and Monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deeplearning-hs" = callPackage
@@ -66387,6 +70902,8 @@ self: {
        ];
        description = "Deep Learning in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deepseq_1_4_4_0" = callPackage
@@ -66429,6 +70946,8 @@ self: {
        ];
        description = "Bounded deepseq, including support for generic deriving";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deepseq-generics" = callPackage
@@ -66469,6 +70988,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Deep evaluation of data structures without NFData";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deepseq-th" = callPackage
@@ -66481,6 +71002,8 @@ self: {
        testHaskellDepends = [ base deepseq template-haskell ];
        description = "Template Haskell based deriver for optimised NFData instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deepzoom" = callPackage
@@ -66492,6 +71015,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsmagick ];
        description = "A DeepZoom image slicer. Only known to work on 32bit Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "defargs" = callPackage
@@ -66503,6 +71028,8 @@ self: {
        libraryHaskellDepends = [ base cluss ];
        description = "default arguments in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deferred-folds" = callPackage
@@ -66686,6 +71213,8 @@ self: {
        librarySystemDepends = [ mpdec ];
        description = "Decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mpdec = null;};
 
   "deka-tests" = callPackage
@@ -66706,6 +71235,8 @@ self: {
        testHaskellDepends = [ base bytestring deka QuickCheck quickpull ];
        description = "Tests for deka, decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delaunay" = callPackage
@@ -66722,6 +71253,8 @@ self: {
        testHaskellDepends = [ AC-Vector base HUnit QuickCheck ];
        description = "Build a Delaunay triangulation of a set of points";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delay" = callPackage
@@ -66752,6 +71285,8 @@ self: {
        ];
        description = "Accessing the del.icio.us APIs from Haskell (v2)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delimited-text" = callPackage
@@ -66767,6 +71302,8 @@ self: {
        ];
        description = "Parse character delimited textual data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delimiter-separated" = callPackage
@@ -66779,6 +71316,8 @@ self: {
        libraryHaskellDepends = [ base uhc-util uulib ];
        description = "Library for dealing with tab and/or comma (or other) separated files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delta" = callPackage
@@ -66802,6 +71341,8 @@ self: {
        testHaskellDepends = [ base directory filepath hspec ];
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delta-h" = callPackage
@@ -66823,6 +71364,8 @@ self: {
        ];
        description = "Online entropy-based model of lexical category acquisition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delude" = callPackage
@@ -66834,6 +71377,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generalized the Prelude more functionally";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "demarcate" = callPackage
@@ -66846,6 +71391,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Demarcating transformed monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "denominate" = callPackage
@@ -66860,6 +71407,8 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "Functions supporting bulk file and directory name normalization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dense" = callPackage
@@ -66884,6 +71433,8 @@ self: {
        ];
        description = "Mutable and immutable dense multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dense-int-set" = callPackage
@@ -66905,6 +71456,8 @@ self: {
        ];
        description = "Dense int-set";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dense-linear-algebra" = callPackage
@@ -66959,6 +71512,8 @@ self: {
        ];
        description = "Dependent hash maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dependent-map_0_2_4_0" = callPackage
@@ -67005,6 +71560,8 @@ self: {
        ];
        description = "Dependent map that uses semigroup mappend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dependent-state" = callPackage
@@ -67016,6 +71573,8 @@ self: {
        libraryHaskellDepends = [ base lens mtl prologue ];
        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;
+       broken = true;
      }) {};
 
   "dependent-sum_0_4" = callPackage
@@ -67092,6 +71651,8 @@ self: {
        ];
        description = "A simple configuration management tool for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dephd" = callPackage
@@ -67110,6 +71671,8 @@ self: {
        ];
        description = "Analyze quality of nucleotide sequences";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "depq" = callPackage
@@ -67137,6 +71700,8 @@ self: {
        libraryHaskellDepends = [ base containers dlist mtl parsec ];
        description = "DepTrack Core types and model";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deptrack-devops" = callPackage
@@ -67155,6 +71720,8 @@ self: {
        ];
        description = "DepTrack applied to DevOps";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deptrack-dot" = callPackage
@@ -67167,6 +71734,8 @@ self: {
        testHaskellDepends = [ base containers deptrack-core dotgen ];
        description = "Facilitate Graphviz representations of DepTrack dependencies";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deque" = callPackage
@@ -67199,6 +71768,8 @@ self: {
        testHaskellDepends = [ base Cabal cabal-test-quickcheck ];
        description = "A typeclass and an implementation for double-ended queues";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derangement" = callPackage
@@ -67210,6 +71781,8 @@ self: {
        libraryHaskellDepends = [ base fgl ];
        description = "Find derangements of lists";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derivation-trees" = callPackage
@@ -67223,6 +71796,8 @@ self: {
        ];
        description = "Typeset Derivation Trees via MetaPost";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive" = callPackage
@@ -67243,6 +71818,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A program and library to derive instances for data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-IG" = callPackage
@@ -67254,6 +71831,8 @@ self: {
        libraryHaskellDepends = [ base instant-generics template-haskell ];
        description = "Macro to derive instances for Instant-Generics using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-enumerable" = callPackage
@@ -67265,6 +71844,8 @@ self: {
        libraryHaskellDepends = [ base data-default ];
        description = "Generic instances for enumerating complex data types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-gadt" = callPackage
@@ -67286,6 +71867,8 @@ self: {
        ];
        description = "Instance deriving for (a subset of) GADTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-lifted-instances" = callPackage
@@ -67314,6 +71897,8 @@ self: {
        testHaskellDepends = [ base semigroups ];
        description = "derive Semigroup/Monoid/IsList";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-storable" = callPackage
@@ -67374,6 +71959,8 @@ self: {
        libraryHaskellDepends = [ array base containers template-haskell ];
        description = "Automatic derivation of Trie implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deriveJsonNoPrefix" = callPackage
@@ -67459,6 +72046,8 @@ self: {
        libraryHaskellDepends = [ base derp ];
        description = "combinators based on parsing with derivatives (derp) package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derulo" = callPackage
@@ -67495,6 +72084,8 @@ self: {
        ];
        description = "Combinators for describing binary data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "descrilo" = callPackage
@@ -67540,6 +72131,8 @@ self: {
        ];
        description = "Library, interpreter, and CLI for Descript programming language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "descriptive" = callPackage
@@ -67602,6 +72195,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Simple deterministic game engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "detour-via-sci" = callPackage
@@ -67645,6 +72240,8 @@ self: {
        ];
        description = "JSON and CSV encoding for quantities";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "detrospector" = callPackage
@@ -67676,6 +72273,8 @@ self: {
        executableHaskellDepends = [ base bytestring utf8-string ];
        description = "Get rid of unicode (utf-8) symbols in Haskell sources";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "devil" = callPackage
@@ -67694,6 +72293,8 @@ self: {
        ];
        description = "A small tool to make it easier to update program managed by Angel";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "devtools" = callPackage
@@ -67703,24 +72304,20 @@ self: {
      }:
      mkDerivation {
        pname = "devtools";
-       version = "0.0.3";
-       sha256 = "09lwvi4mbwkhazzmngpblxh2bvvxz1j4ndzsh3bp3nwwwa0xiihm";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.0";
+       sha256 = "09md1na64p3881d2j9l64m730gvmkl47az8hajm6yh578q14v50j";
        libraryHaskellDepends = [
          base bytestring cmdargs Diff filepath hlint mprelude
          source-constraints tasty tasty-mgolden text typed-process
        ];
-       executableHaskellDepends = [
-         base bytestring cmdargs Diff filepath hlint mprelude
-         source-constraints tasty tasty-mgolden text typed-process
-       ];
        testHaskellDepends = [
          base bytestring cmdargs Diff filepath hlint mprelude
          source-constraints tasty tasty-mgolden text typed-process
        ];
        description = "Haskell development tool agregate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dewdrop" = callPackage
@@ -67734,6 +72331,8 @@ self: {
        ];
        description = "Find gadgets for return-oriented programming on x86";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "df1" = callPackage
@@ -67808,6 +72407,8 @@ self: {
        ];
        description = "A generic data integrity layer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) leveldb;};
 
   "dfrac" = callPackage
@@ -67838,6 +72439,8 @@ self: {
        ];
        description = "Build Debian From Scratch CD/DVD images";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dgim" = callPackage
@@ -67850,6 +72453,8 @@ self: {
        testHaskellDepends = [ base Cabal QuickCheck ];
        description = "Implementation of DGIM algorithm";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dgs" = callPackage
@@ -67861,6 +72466,8 @@ self: {
        libraryHaskellDepends = [ base HTTP mtl network split ];
        description = "Haskell front-end for DGS' bot interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall_1_29_0" = callPackage
@@ -68005,6 +72612,8 @@ self: {
        ];
        description = "Check all dhall files in a project";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-docs" = callPackage
@@ -68066,6 +72675,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Translate concourse config from Dhall to YAML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-json" = callPackage
@@ -68164,6 +72775,8 @@ self: {
        ];
        description = "Dhall to Nix compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-nixpkgs" = callPackage
@@ -68185,6 +72798,8 @@ self: {
        ];
        description = "Convert Dhall projects to Nix packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-text" = callPackage
@@ -68202,6 +72817,8 @@ self: {
        ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-to-cabal" = callPackage
@@ -68230,6 +72847,8 @@ self: {
        ];
        description = "Compile Dhall expressions to Cabal files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-yaml" = callPackage
@@ -68276,6 +72895,8 @@ self: {
        ];
        description = "Parse a DHCP lease file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhrun" = callPackage
@@ -68309,6 +72930,8 @@ self: {
        doHaddock = false;
        description = "Dhall/YAML configurable concurrent integration test executor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "di" = callPackage
@@ -68416,6 +73039,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "An EDSL for teaching Haskell with diagrams - data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dia-functions" = callPackage
@@ -68433,6 +73058,8 @@ self: {
        ];
        description = "An EDSL for teaching Haskell with diagrams - functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams" = callPackage
@@ -68449,6 +73076,8 @@ self: {
        doHaddock = false;
        description = "Embedded domain-specific language for declarative vector graphics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-boolean" = callPackage
@@ -68462,6 +73091,8 @@ self: {
        libraryHaskellDepends = [ base cubicbezier diagrams-lib ];
        description = "deprecated, part of diagrams-contrib since 1.4";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-braille" = callPackage
@@ -68487,6 +73118,8 @@ self: {
        ];
        description = "Braille diagrams with plain text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-builder" = callPackage
@@ -68515,6 +73148,8 @@ self: {
        ];
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -68537,6 +73172,8 @@ self: {
        ];
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-canvas" = callPackage
@@ -68555,6 +73192,8 @@ self: {
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-contrib" = callPackage
@@ -68583,6 +73222,8 @@ self: {
        ];
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-core" = callPackage
@@ -68602,6 +73243,8 @@ self: {
        ];
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-graphviz" = callPackage
@@ -68617,6 +73260,8 @@ self: {
        ];
        description = "Graph layout and drawing with GraphViz and diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-gtk" = callPackage
@@ -68632,6 +73277,8 @@ self: {
        ];
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-haddock" = callPackage
@@ -68662,6 +73309,8 @@ self: {
        ];
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-hsqml" = callPackage
@@ -68697,6 +73346,8 @@ self: {
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-lib" = callPackage
@@ -68730,6 +73381,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion diagrams-core ];
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-pandoc" = callPackage
@@ -68755,6 +73408,8 @@ self: {
        ];
        description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-pdf" = callPackage
@@ -68772,6 +73427,8 @@ self: {
        ];
        description = "PDF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-pgf" = callPackage
@@ -68791,6 +73448,8 @@ self: {
        ];
        description = "PGF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-postscript" = callPackage
@@ -68811,6 +73470,8 @@ self: {
        ];
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -68825,6 +73486,8 @@ self: {
        ];
        description = "Draw QR codes to SVG, PNG, PDF or PS files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-rasterific" = callPackage
@@ -68847,6 +73510,8 @@ self: {
        testHaskellDepends = [ base diagrams-core diagrams-lib ];
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-reflex" = callPackage
@@ -68880,6 +73545,8 @@ self: {
        ];
        description = "Library for drawing the Rubik's Cube";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-solve" = callPackage
@@ -68917,6 +73584,8 @@ self: {
        ];
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-tikz" = callPackage
@@ -68930,6 +73599,8 @@ self: {
        ];
        description = "TikZ backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-wx" = callPackage
@@ -68947,6 +73618,8 @@ self: {
        ];
        description = "Backend for rendering diagrams in wxWidgets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dialog" = callPackage
@@ -69008,6 +73681,8 @@ self: {
        ];
        description = "A simple, forward build system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dice" = callPackage
@@ -69053,6 +73728,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convert a Diceware wordlist into a printer-ready LaTeX file";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dicom" = callPackage
@@ -69066,6 +73743,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "dictionaries" = callPackage
@@ -69094,6 +73773,8 @@ self: {
        ];
        description = "Tools to handle StarDict dictionaries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dictionary-sharing" = callPackage
@@ -69122,6 +73803,8 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Parsec parsers for the DICT format produced by dictfmt -t";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diet" = callPackage
@@ -69139,6 +73822,8 @@ self: {
        ];
        description = "Discrete Interval Encoding Trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diff" = callPackage
@@ -69150,6 +73835,8 @@ self: {
        libraryHaskellDepends = [ base Enum util ];
        description = "Diff and patch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diff-gestalt" = callPackage
@@ -69222,6 +73909,8 @@ self: {
        ];
        description = "Diff two .cabal files syntactically";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diffdump" = callPackage
@@ -69260,6 +73949,8 @@ self: {
          groups hedgehog hedgehog-checkers QuickCheck semigroupoids
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "differential" = callPackage
@@ -69285,6 +73976,8 @@ self: {
        ];
        description = "Finds out whether an entity comes from different distributions (statuses)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diffmap" = callPackage
@@ -69298,6 +73991,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "diff on maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "difftodo" = callPackage
@@ -69323,6 +74018,8 @@ self: {
        ];
        description = "Generate todo lists from source code";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digamma" = callPackage
@@ -69389,6 +74086,8 @@ self: {
        ];
        description = "Speed up form designing using digestive functors and bootstrap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digestive-foundation-lucid" = callPackage
@@ -69405,6 +74104,8 @@ self: {
        ];
        description = "Speed up form designing using digestive functors and foundation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digestive-functors" = callPackage
@@ -69447,6 +74148,8 @@ self: {
        ];
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digestive-functors-blaze" = callPackage
@@ -69477,6 +74180,8 @@ self: {
        ];
        description = "Happstack backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digestive-functors-heist" = callPackage
@@ -69505,6 +74210,8 @@ self: {
        libraryToolDepends = [ trhsx ];
        description = "HSP support for digestive-functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digestive-functors-lucid" = callPackage
@@ -69588,6 +74295,8 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        description = "digitalocean api for haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digits" = callPackage
@@ -69600,6 +74309,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Converts integers to lists of digits and back";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digraph" = callPackage
@@ -69681,6 +74392,8 @@ self: {
        libraryHaskellDepends = [ base dimensional numtype-dk ];
        description = "CODATA Recommended Physical Constants with Dimensional Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dimensional-tf" = callPackage
@@ -69692,6 +74405,8 @@ self: {
        libraryHaskellDepends = [ base numtype-tf time ];
        description = "Statically checked physical dimensions, implemented using type families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dimensions" = callPackage
@@ -69730,6 +74445,8 @@ self: {
        ];
        description = "Dingo is a Rich Internet Application platform based on the Warp web server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dingo-example" = callPackage
@@ -69749,6 +74466,8 @@ self: {
        ];
        description = "Dingo Example";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dingo-widgets" = callPackage
@@ -69767,6 +74486,8 @@ self: {
        ];
        description = "Dingo Widgets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dino" = callPackage
@@ -69824,6 +74545,8 @@ self: {
        libraryToolDepends = [ happy ];
        description = "A quadratic diophantine equation solving library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diplomacy" = callPackage
@@ -69839,6 +74562,8 @@ self: {
        ];
        description = "Diplomacy board game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diplomacy-server" = callPackage
@@ -69862,6 +74587,8 @@ self: {
        ];
        description = "Play Diplomacy over HTTP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dir-traverse" = callPackage
@@ -69889,6 +74616,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Serialization and deserialization monads for streams and ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "direct-daemonize" = callPackage
@@ -69915,6 +74644,8 @@ self: {
        ];
        description = "Native implementation of the FastCGI protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "direct-http" = callPackage
@@ -69933,6 +74664,8 @@ self: {
        ];
        description = "Native webserver that acts as a library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "direct-murmur-hash" = callPackage
@@ -69955,6 +74688,8 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-paths ];
        description = "Lightweight replacement for Plugins, specific to GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "direct-rocksdb" = callPackage
@@ -69974,6 +74709,8 @@ self: {
        ];
        description = "Bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "direct-sqlite" = callPackage
@@ -70006,6 +74743,8 @@ self: {
        ];
        description = "Finite directed cubical complexes and associated algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "directory_1_3_6_1" = callPackage
@@ -70082,6 +74821,8 @@ self: {
        executableHaskellDepends = [ base directory ];
        description = "Deletes a directory and retains its contents in the parent directory";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dirfiles" = callPackage
@@ -70097,6 +74838,8 @@ self: {
          unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dirichlet" = callPackage
@@ -70189,6 +74932,8 @@ self: {
        ];
        description = "Client for Discogs REST API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discokitty" = callPackage
@@ -70217,6 +74962,8 @@ self: {
        ];
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discord-haskell" = callPackage
@@ -70256,6 +75003,8 @@ self: {
        ];
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discord-register" = callPackage
@@ -70287,6 +75036,8 @@ self: {
        ];
        description = "Discord verification bot";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discord-rest" = callPackage
@@ -70306,6 +75057,8 @@ self: {
        ];
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discord-types" = callPackage
@@ -70324,6 +75077,8 @@ self: {
        ];
        description = "Type information for discord-hs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discordian-calendar" = callPackage
@@ -70335,6 +75090,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "library for handling Discordian calendar dates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discount" = callPackage
@@ -70360,6 +75117,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "replacement for enum";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discrete-intervals" = callPackage
@@ -70430,6 +75189,8 @@ self: {
        ];
        description = "Disjoint containers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "disjoint-set" = callPackage
@@ -70446,6 +75207,8 @@ self: {
        ];
        description = "Persistent disjoint-sets, a.k.a union-find.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "disjoint-set-stateful" = callPackage
@@ -70458,6 +75221,8 @@ self: {
        testHaskellDepends = [ base hspec primitive ref-tf vector ];
        description = "Monadic disjoint set";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "disjoint-sets-st" = callPackage
@@ -70547,6 +75312,8 @@ self: {
        doHaddock = false;
        description = "Generate/Upload cabal package to Hackage";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distance" = callPackage
@@ -70560,6 +75327,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Useful distance datatype and functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distance-of-time" = callPackage
@@ -70635,6 +75404,8 @@ self: {
        ];
        description = "AWS Lambda backend for distributed-fork";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process" = callPackage
@@ -70659,6 +75430,8 @@ self: {
        ];
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-async" = callPackage
@@ -70686,6 +75459,8 @@ self: {
        ];
        description = "Cloud Haskell Async API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-azure" = callPackage
@@ -70708,6 +75483,8 @@ self: {
        ];
        description = "Microsoft Azure backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-client-server" = callPackage
@@ -70737,6 +75514,8 @@ self: {
        ];
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-ekg" = callPackage
@@ -70752,6 +75531,8 @@ self: {
        ];
        description = "Collect node stats for EKG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-execution" = callPackage
@@ -70787,6 +75568,8 @@ self: {
        ];
        description = "Execution Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-extras" = callPackage
@@ -70817,6 +75600,8 @@ self: {
        ];
        description = "Cloud Haskell Extras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-fsm" = callPackage
@@ -70849,6 +75634,8 @@ self: {
        ];
        description = "The Cloud Haskell implementation of Erlang/OTP gen_statem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-lifted" = callPackage
@@ -70874,6 +75661,8 @@ self: {
        ];
        description = "monad-control style typeclass and transformer instances for Process monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-monad-control" = callPackage
@@ -70890,6 +75679,8 @@ self: {
        ];
        description = "Orphan instances for MonadBase and MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-p2p" = callPackage
@@ -70910,6 +75701,8 @@ self: {
        executableHaskellDepends = [ base distributed-process mtl ];
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-platform" = callPackage
@@ -70940,6 +75733,8 @@ self: {
        ];
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-registry" = callPackage
@@ -70972,6 +75767,8 @@ self: {
        ];
        description = "Cloud Haskell Extended Process Registry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-simplelocalnet" = callPackage
@@ -70994,6 +75791,8 @@ self: {
        ];
        description = "Simple zero-configuration backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-supervisor" = callPackage
@@ -71025,6 +75824,8 @@ self: {
        ];
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-systest" = callPackage
@@ -71044,6 +75845,8 @@ self: {
        ];
        description = "Cloud Haskell Test Support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-task" = callPackage
@@ -71080,6 +75883,8 @@ self: {
        ];
        description = "Task Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-tests" = callPackage
@@ -71103,6 +75908,8 @@ self: {
        ];
        description = "Tests and test support tools for distributed-process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-zookeeper" = callPackage
@@ -71131,6 +75938,8 @@ self: {
        ];
        description = "A Zookeeper back-end for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-static" = callPackage
@@ -71159,6 +75968,8 @@ self: {
        ];
        description = "Finite discrete probability distributions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distribution-nixpkgs" = callPackage
@@ -71214,6 +76025,8 @@ self: {
        ];
        description = "Easily plot distributions from the distribution package..";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributive" = callPackage
@@ -71278,6 +76091,8 @@ self: {
        ];
        description = "Quantify the diversity of a population";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dixi" = callPackage
@@ -71315,6 +76130,8 @@ self: {
        ];
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "djembe" = callPackage
@@ -71330,6 +76147,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Hit drums with haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "djinn" = callPackage
@@ -71386,6 +76205,8 @@ self: {
        ];
        description = "Generate executable Haskell code from a type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dl-fedora" = callPackage
@@ -71406,6 +76227,8 @@ self: {
        ];
        description = "Fedora image download tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dlist" = callPackage
@@ -71506,6 +76329,8 @@ self: {
        ];
        description = "AVAYA DMCC API bindings and WebSockets server for AVAYA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dmenu" = callPackage
@@ -71521,6 +76346,8 @@ self: {
        ];
        description = "Complete bindings to the dmenu and dmenu2 command line tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dmenu-pkill" = callPackage
@@ -71538,6 +76365,8 @@ self: {
        ];
        description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dmenu-pmount" = callPackage
@@ -71555,6 +76384,8 @@ self: {
        ];
        description = "Mounting and unmounting linux devices as user with dmenu and pmount";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dmenu-search" = callPackage
@@ -71572,6 +76403,8 @@ self: {
        ];
        description = "dmenu script for searching the web with customizable search engines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dns" = callPackage
@@ -71614,6 +76447,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Caching DNS resolver library and mass DNS resolver utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dnsrbl" = callPackage
@@ -71626,6 +76461,8 @@ self: {
        libraryHaskellDepends = [ base containers hsdns HUnit network ];
        description = "Asynchronous DNS RBL lookup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dnssd" = callPackage
@@ -71638,6 +76475,8 @@ self: {
        librarySystemDepends = [ dns_sd ];
        description = "DNS service discovery bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {dns_sd = null;};
 
   "do-list" = callPackage
@@ -71690,6 +76529,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Creates the time intervals for CLI changing messages on the screen";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dobutokO" = callPackage
@@ -71852,6 +76693,8 @@ self: {
        ];
        description = "Document review Web application, like http://book.realworldhaskell.org/";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "doccheck" = callPackage
@@ -71870,6 +76713,8 @@ self: {
        ];
        description = "Checks Haddock comments for pitfalls and version changes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docidx" = callPackage
@@ -71888,6 +76733,8 @@ self: {
        ];
        description = "Generate an HTML index of installed Haskell packages and their documentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docker" = callPackage
@@ -71921,6 +76768,8 @@ self: {
        ];
        description = "An API client for docker written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docker-build-cacher" = callPackage
@@ -71943,6 +76792,8 @@ self: {
        ];
        description = "Builds a docker image and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dockercook" = callPackage
@@ -71976,6 +76827,8 @@ self: {
        testHaskellDepends = [ base HTF text vector ];
        description = "A build tool for multiple docker image layers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dockerfile" = callPackage
@@ -72047,6 +76900,8 @@ self: {
        ];
        description = "A command-line interface parser that will make you smile";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docrecords" = callPackage
@@ -72211,6 +77066,8 @@ self: {
        doHaddock = false;
        description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "doctest-driver-gen" = callPackage
@@ -72226,6 +77083,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Generate driver file for doctest's cabal integration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "doctest-exitcode-stdio" = callPackage
@@ -72264,6 +77123,8 @@ self: {
        testHaskellDepends = [ base doctest HUnit QuickCheck ];
        description = "Allow QuickCheck-style property testing within doctest";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docusign-base" = callPackage
@@ -72280,6 +77141,8 @@ self: {
        ];
        description = "Low-level bindings to the DocuSign API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docusign-base-minimal" = callPackage
@@ -72296,6 +77159,8 @@ self: {
        ];
        description = "Low-level bindings to the DocuSign API (only what is necessary for docusign-client)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docusign-client" = callPackage
@@ -72315,6 +77180,8 @@ self: {
        ];
        description = "Client bindings for the DocuSign API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docusign-example" = callPackage
@@ -72333,6 +77200,8 @@ self: {
        ];
        description = "DocuSign examples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docvim" = callPackage
@@ -72359,6 +77228,8 @@ self: {
        ];
        description = "Documentation generator for Vim plug-ins";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "doi" = callPackage
@@ -72387,6 +77258,8 @@ self: {
        ];
        description = "Automatic Bibtex and fulltext of scientific articles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "doldol" = callPackage
@@ -72509,6 +77382,8 @@ self: {
        ];
        description = "Codegen helping you define domain models";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "domain-auth" = callPackage
@@ -72543,6 +77418,8 @@ self: {
        ];
        description = "Low-level API of \"domain\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "domain-optics" = callPackage
@@ -72561,6 +77438,8 @@ self: {
        testHaskellDepends = [ domain optics rerebase ];
        description = "Integration of domain with optics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dominion" = callPackage
@@ -72592,6 +77471,8 @@ self: {
        ];
        description = "A simple templating library using HTML5 as its template language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dot" = callPackage
@@ -72631,6 +77512,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dot2graphml" = callPackage
@@ -72703,6 +77586,8 @@ self: {
        doHaddock = false;
        description = "Filesystem to manage and parse dotfiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dotgen" = callPackage
@@ -72782,6 +77667,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Doublify API toolkit for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dove" = callPackage
@@ -72838,6 +77725,8 @@ self: {
        ];
        description = "Dungeons of Wor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "download" = callPackage
@@ -72880,6 +77769,8 @@ self: {
        ];
        description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "downloader" = callPackage
@@ -72896,6 +77787,8 @@ self: {
        ];
        description = "A small, low-dependency library that provides turn-key file download over HTTP and HTTPS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dozenal" = callPackage
@@ -72907,6 +77800,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dozens" = callPackage
@@ -72926,6 +77821,8 @@ self: {
        ];
        description = "dozens api library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-base" = callPackage
@@ -72939,6 +77836,8 @@ self: {
        ];
        description = "Data Parallel Haskell common config and debugging functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-examples" = callPackage
@@ -72957,6 +77856,8 @@ self: {
        ];
        description = "Data Parallel Haskell example programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-lifted-base" = callPackage
@@ -72973,6 +77874,8 @@ self: {
        ];
        description = "Data Parallel Haskell common definitions used by other dph-lifted packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-lifted-copy" = callPackage
@@ -72988,6 +77891,8 @@ self: {
        ];
        description = "Data Parallel Haskell lifted array combinators. (deprecated version)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-lifted-vseg" = callPackage
@@ -73004,6 +77909,8 @@ self: {
        ];
        description = "Data Parallel Haskell lifted array combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-par" = callPackage
@@ -73026,6 +77933,8 @@ self: {
        libraryHaskellDepends = [ base dph-base random vector ];
        description = "Data Parallel Haskell segmented arrays. (abstract interface)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-prim-par" = callPackage
@@ -73042,6 +77951,8 @@ self: {
        ];
        description = "Data Parallel Haskell segmented arrays. (production version)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-prim-seq" = callPackage
@@ -73057,6 +77968,8 @@ self: {
        ];
        description = "Data Parallel Haskell segmented arrays. (sequential implementation)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-seq" = callPackage
@@ -73088,6 +78001,8 @@ self: {
        testPkgconfigDepends = [ libdpkg ];
        description = "libdpkg bindings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) dpkg; libdpkg = null;};
 
   "dpor" = callPackage
@@ -73101,6 +78016,8 @@ self: {
        ];
        description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dprox" = callPackage
@@ -73135,6 +78052,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Monadic FRP";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dragen" = callPackage
@@ -73155,6 +78074,8 @@ self: {
        ];
        description = "Automatic derivation of optimized QuickCheck random generators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "draw-poker" = callPackage
@@ -73186,6 +78107,8 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A port of asciimoo's drawille to haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dresdner-verkehrsbetriebe" = callPackage
@@ -73208,6 +78131,8 @@ self: {
        ];
        description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "drifter" = callPackage
@@ -73224,6 +78149,8 @@ self: {
        ];
        description = "Simple schema management for arbitrary databases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "drifter-postgresql" = callPackage
@@ -73244,6 +78171,8 @@ self: {
        ];
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "drifter-sqlite" = callPackage
@@ -73263,6 +78192,8 @@ self: {
        ];
        description = "SQLite support for the drifter schema migraiton tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "drinkery" = callPackage
@@ -73287,6 +78218,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A Haskell bindings to the DRMAA C library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {drmaa = null;};
 
   "drone" = callPackage
@@ -73305,6 +78238,8 @@ self: {
          microlens req servant-server text warp
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dropbox" = callPackage
@@ -73333,6 +78268,8 @@ self: {
        ];
        description = "Dropbox API client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dropbox-sdk" = callPackage
@@ -73354,6 +78291,8 @@ self: {
        ];
        description = "A library to access the Dropbox HTTP API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dropsolve" = callPackage
@@ -73372,6 +78311,8 @@ self: {
        ];
        description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "drunken-bishop" = callPackage
@@ -73401,6 +78342,8 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A subset of the miniKanren language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dsc" = callPackage
@@ -73420,6 +78363,8 @@ self: {
        ];
        description = "Helper functions for setting up Double Submit Cookie defense for forms";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dsh-sql" = callPackage
@@ -73447,6 +78392,8 @@ self: {
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dsmc" = callPackage
@@ -73464,6 +78411,8 @@ self: {
        ];
        description = "DSMC library for rarefied gas dynamics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dsmc-tools" = callPackage
@@ -73483,6 +78432,8 @@ self: {
        ];
        description = "DSMC toolkit for rarefied gas dynamics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dson" = callPackage
@@ -73494,6 +78445,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Haskell Doge Serialized Object Notation Parser";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dson-parsec" = callPackage
@@ -73505,6 +78458,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "DSON parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dsp" = callPackage
@@ -73530,6 +78485,8 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols dlist ];
        description = "Difference strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dsv" = callPackage
@@ -73591,6 +78548,8 @@ self: {
        ];
        description = "Parse and render DTD files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dtd-text" = callPackage
@@ -73606,6 +78565,8 @@ self: {
        ];
        description = "Parse and render XML DTDs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dtd-types" = callPackage
@@ -73647,6 +78608,8 @@ self: {
        ];
        description = "(Fast) Dynamic Time Warping";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dual" = callPackage
@@ -73697,6 +78660,8 @@ self: {
        ];
        description = "Rose trees with cached and accumulating monoidal annotations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dualizer" = callPackage
@@ -73713,6 +78678,8 @@ self: {
        ];
        description = "Automatically generate dual constructions";
        license = "AGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dublincore-xml-conduit" = callPackage
@@ -73796,6 +78763,8 @@ self: {
        ];
        description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers to teach Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dumb-cas" = callPackage
@@ -73815,6 +78784,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A computer “algebra” system that knows nothing about algebra, at the core";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dump" = callPackage
@@ -73852,6 +78823,8 @@ self: {
        ];
        description = "A plug-in for rendering GHC core";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dunai" = callPackage
@@ -73882,6 +78855,8 @@ self: {
        ];
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dunai-test" = callPackage
@@ -73931,6 +78906,8 @@ self: {
        ];
        description = "Frontend development build tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dura" = callPackage
@@ -73944,6 +78921,8 @@ self: {
        libraryHaskellDepends = [ base bytestring directory filepath ];
        description = "durable/atomic file system writes (from rio package)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "duration" = callPackage
@@ -74000,6 +78979,8 @@ self: {
        ];
        description = "Dead simple password manager";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dvda" = callPackage
@@ -74022,6 +79003,8 @@ self: {
        ];
        description = "Efficient automatic differentiation and code generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dvdread" = callPackage
@@ -74035,6 +79018,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A monadic interface to libdvdread";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {dvdread = null;};
 
   "dvi-processing" = callPackage
@@ -74046,6 +79031,8 @@ self: {
        libraryHaskellDepends = [ base bytestring filepath transformers ];
        description = "Read/write DVI and TFM file";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dvorak" = callPackage
@@ -74070,6 +79057,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for DWARF debug format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dwarf-el" = callPackage
@@ -74104,6 +79093,8 @@ self: {
        executableHaskellDepends = [ base containers dwarf-el ];
        description = "High-level wrapper around the dwarf library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dwergaz" = callPackage
@@ -74170,6 +79161,8 @@ self: {
        testHaskellDepends = [ ansi-terminal base hspec text ];
        description = "A library for working with binary Dyck words";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dyepack" = callPackage
@@ -74183,6 +79176,8 @@ self: {
        libraryHaskellDepends = [ base generics-sop ];
        description = "Programatically identify space leaks in your program";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic" = callPackage
@@ -74220,6 +79215,8 @@ self: {
        ];
        description = "Access the functions from the Cabal library without depending on it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-graph" = callPackage
@@ -74263,6 +79260,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion primitive ];
        description = "Dynamic graph algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-linker-template" = callPackage
@@ -74301,6 +79300,8 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "A wrapper around MVector that enables pushing, popping and extending";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-object" = callPackage
@@ -74319,6 +79320,8 @@ self: {
        ];
        description = "Object-oriented programming with duck typing and singleton classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-plot" = callPackage
@@ -74345,6 +79348,8 @@ self: {
        ];
        description = "Interactive diagram windows";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-pp" = callPackage
@@ -74365,6 +79370,8 @@ self: {
        ];
        description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-state" = callPackage
@@ -74407,6 +79414,8 @@ self: {
        ];
        description = "Typesafe library for working with DynamoDB database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynloader" = callPackage
@@ -74419,6 +79428,8 @@ self: {
        testHaskellDepends = [ base ghc ghc-paths hspec ];
        description = "Dynamically runtime loading packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynobud" = callPackage
@@ -74450,6 +79461,8 @@ self: {
        ];
        description = "your dynamic optimization buddy";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dyre" = callPackage
@@ -74477,6 +79490,8 @@ self: {
        libraryHaskellDepends = [ base bytestring transformers ];
        description = "Bindings to the dywapitchtrack pitch tracking library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dzen-dhall" = callPackage
@@ -74512,6 +79527,8 @@ self: {
        ];
        description = "Configure dzen2 bars in Dhall language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dzen-utils" = callPackage
@@ -74523,6 +79540,8 @@ self: {
        libraryHaskellDepends = [ base colour process ];
        description = "Utilities for creating inputs for dzen";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "each" = callPackage
@@ -74536,6 +79555,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Template Haskell library for writing monadic expressions more easily";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eager-sockets" = callPackage
@@ -74582,6 +79603,8 @@ self: {
        testHaskellDepends = [ base filepath hspec ];
        description = "Ear Clipping Triangulation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "earcut" = callPackage
@@ -74619,6 +79642,8 @@ self: {
        ];
        description = "Utility code for building HTTP API bindings more quickly";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "easy-args" = callPackage
@@ -74648,6 +79673,8 @@ self: {
        ];
        description = "types and functions for bitcoin applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "easy-file" = callPackage
@@ -74674,6 +79701,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "easyplot" = callPackage
@@ -74685,6 +79714,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "A tiny plotting library, utilizes gnuplot for plotting";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "easyrender" = callPackage
@@ -74717,6 +79748,8 @@ self: {
        ];
        description = "Pure, type-indexed haskell vector, matrix, and tensor library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "easytensor-vulkan" = callPackage
@@ -74728,6 +79761,8 @@ self: {
        libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
        description = "Use easytensor with vulkan-api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "easytest" = callPackage
@@ -74747,6 +79782,8 @@ self: {
        ];
        description = "Simple, expressive testing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ebeats" = callPackage
@@ -74758,6 +79795,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Time in ebeats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ebnf-bff" = callPackage
@@ -74776,6 +79815,8 @@ self: {
        ];
        description = "Parser combinators & EBNF, BFFs!";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ec2-signature" = callPackage
@@ -74814,6 +79855,8 @@ self: {
        ];
        description = "A handy tool for uploading unikernels to Amazon's EC2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eccrypto" = callPackage
@@ -74832,6 +79875,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion random ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eccrypto-ed25519-bindings" = callPackage
@@ -74843,6 +79888,8 @@ self: {
        libraryHaskellDepends = [ base bytestring eccrypto ];
        description = "provides \"ed25519\" API using \"eccrypto\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ecdsa" = callPackage
@@ -74892,6 +79939,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A ECMA-262 interpreter library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ecstasy" = callPackage
@@ -74925,6 +79974,8 @@ self: {
        executableSystemDepends = [ canlib ];
        description = "Tools for automotive ECU development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {canlib = null;};
 
   "ed25519" = callPackage
@@ -74972,6 +80023,8 @@ self: {
        ];
        description = "Command line file filtering with haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ede" = callPackage
@@ -75009,6 +80062,8 @@ self: {
        libraryHaskellDepends = [ base containers deepseq parallel ];
        description = "Semi-explicit parallel programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edenskel" = callPackage
@@ -75020,6 +80075,8 @@ self: {
        libraryHaskellDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edentv" = callPackage
@@ -75040,6 +80097,8 @@ self: {
        ];
        description = "A Tool to Visualize Parallel Functional Program Executions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edf" = callPackage
@@ -75069,6 +80128,8 @@ self: {
        ];
        description = "Top view space combat arcade game";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edges" = callPackage
@@ -75096,6 +80157,8 @@ self: {
        ];
        description = "Tools for efficient immutable graphs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edis" = callPackage
@@ -75127,6 +80190,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A monad for rewriting things";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edit-distance" = callPackage
@@ -75198,6 +80263,8 @@ self: {
        ];
        description = "Symmetric, stateful edit lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edit-lenses-demo" = callPackage
@@ -75222,6 +80289,8 @@ self: {
        libraryHaskellDepends = [ base text vty vty-ui ];
        description = "Interactive editors for Generics";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "editline" = callPackage
@@ -75233,6 +80302,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bindings to the editline library (libedit)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "editor-open" = callPackage
@@ -75290,6 +80361,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        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;
+       broken = true;
      }) {};
 
   "effect-monad" = callPackage
@@ -75301,6 +80374,8 @@ self: {
        libraryHaskellDepends = [ base type-level-sets ];
        description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "effect-stack" = callPackage
@@ -75312,6 +80387,8 @@ self: {
        libraryHaskellDepends = [ base constraints mtl transformers ];
        description = "Reducing the pain of transformer stacks with duplicated effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "effective-aspects" = callPackage
@@ -75407,6 +80484,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A Typeable-free implementation of extensible effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "egison" = callPackage
@@ -75442,6 +80521,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion transformers ];
        description = "Programming language with non-linear pattern-matching against non-free data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "egison-pattern-src" = callPackage
@@ -75463,6 +80544,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Manipulating Egison patterns: abstract syntax, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "egison-pattern-src-haskell-mode" = callPackage
@@ -75482,6 +80565,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Parser and pretty printer for Egison pattern expressions in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "egison-pattern-src-th-mode" = callPackage
@@ -75504,6 +80589,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Parser and pretty printer for Egison pattern expressions to use with TH";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "egison-quote" = callPackage
@@ -75517,6 +80604,8 @@ self: {
        ];
        description = "A quasi quotes for using Egison expression in Haskell code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "egison-tutorial" = callPackage
@@ -75535,6 +80624,8 @@ self: {
        ];
        description = "A tutorial program for the Egison programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "egyptian-fractions" = callPackage
@@ -75564,6 +80655,8 @@ self: {
        ];
        description = "like eruby, ehaskell is embedded haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ehs" = callPackage
@@ -75584,6 +80677,8 @@ self: {
        ];
        description = "Embedded haskell template using quasiquotes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eibd-client-simple" = callPackage
@@ -75602,6 +80697,8 @@ self: {
        librarySystemDepends = [ eibclient ];
        description = "EIBd Client";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {eibclient = null;};
 
   "eigen" = callPackage
@@ -75621,6 +80718,8 @@ self: {
        ];
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "either" = callPackage
@@ -75665,6 +80764,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Functions involving lists of Either";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "either-result" = callPackage
@@ -75691,6 +80792,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Functions for probing and unwrapping values inside of Either";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eithers" = callPackage
@@ -75722,6 +80825,8 @@ self: {
        ];
        description = "Binding to EJDB2 C library, an embedded JSON noSQL database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ejdb2 = null; libejdb2 = null;};
 
   "ekg" = callPackage
@@ -75759,6 +80864,8 @@ self: {
        ];
        description = "Send ekg metrics to a Bosun instance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-carbon" = callPackage
@@ -75775,6 +80882,8 @@ self: {
        ];
        description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-cloudwatch" = callPackage
@@ -75792,6 +80901,8 @@ self: {
        ];
        description = "An ekg backend for Amazon Cloudwatch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-core" = callPackage
@@ -75826,6 +80937,8 @@ self: {
        ];
        description = "Push metrics to elastic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-elasticsearch" = callPackage
@@ -75843,6 +80956,8 @@ self: {
        ];
        description = "Push metrics to elasticsearch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-influxdb" = callPackage
@@ -75891,6 +81006,8 @@ self: {
        ];
        description = "Push metrics to a log file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-prometheus-adapter" = callPackage
@@ -75927,6 +81044,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "ekg-rrd" = callPackage
@@ -75947,6 +81066,8 @@ self: {
        ];
        description = "Passes ekg statistics to rrdtool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-statsd" = callPackage
@@ -75982,6 +81103,8 @@ self: {
        ];
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elbow" = callPackage
@@ -76044,6 +81167,8 @@ self: {
        executableHaskellDepends = [ base elerea GLFW OpenGL ];
        description = "Example applications for Elerea";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elerea-sdl" = callPackage
@@ -76067,6 +81192,8 @@ self: {
        libraryHaskellDepends = [ base extensible transformers ];
        description = "Immediately lifts to a desired level";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elf" = callPackage
@@ -76113,6 +81240,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Arrows with holes";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elliptic-curve" = callPackage
@@ -76138,6 +81267,8 @@ self: {
        ];
        description = "Elliptic curve library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elm-bridge" = callPackage
@@ -76461,6 +81592,8 @@ self: {
        doHaddock = false;
        description = "Crossing the road between Haskell and Elm";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elm-syntax" = callPackage
@@ -76510,6 +81643,8 @@ self: {
        ];
        description = "Generate ELM code from a Wai websocket application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elm-yesod" = callPackage
@@ -76624,6 +81759,8 @@ self: {
        testHaskellDepends = [ base directory filepath tasty tasty-hunit ];
        description = "A tiny language for understanding the lambda-calculus";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elynx" = callPackage
@@ -76761,6 +81898,8 @@ self: {
        ];
        description = "library to parse emacs style keybinding into the modifiers and the chars";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "emacs-module" = callPackage
@@ -76780,6 +81919,8 @@ self: {
        ];
        description = "Utilities to write Emacs dynamic modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "email" = callPackage
@@ -76796,6 +81937,8 @@ self: {
        ];
        description = "Sending eMail in Haskell made easy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "email-header" = callPackage
@@ -76817,6 +81960,8 @@ self: {
        ];
        description = "Parsing and rendering of email and MIME headers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "email-postmark" = callPackage
@@ -76832,6 +81977,8 @@ self: {
        ];
        description = "A simple wrapper to send emails via the api of the service postmark (http://postmarkapp.com/)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "email-validate" = callPackage
@@ -76904,6 +82051,8 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "Wrapper around email-validate library adding instances for common type classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "emailparse" = callPackage
@@ -76926,6 +82075,8 @@ self: {
        ];
        description = "An email parser that will parse everything";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "embeddock" = callPackage
@@ -76942,6 +82093,8 @@ self: {
        ];
        description = "Embed the values in scope in the haddock documentation of the module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "embeddock-example" = callPackage
@@ -76953,6 +82106,8 @@ self: {
        libraryHaskellDepends = [ base embeddock time ];
        description = "Example of using embeddock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "embla" = callPackage
@@ -76964,6 +82119,8 @@ self: {
        libraryHaskellDepends = [ base chronos ];
        description = "execute actions periodically while avoiding drift";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "embroidery" = callPackage
@@ -76982,6 +82139,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "support for embroidery formats in haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "emd" = callPackage
@@ -77024,6 +82183,8 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck syb ];
        description = "Extensible and Modular Generics for the Masses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "emoji" = callPackage
@@ -77076,6 +82237,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A container that always has no values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enchant" = callPackage
@@ -77092,6 +82255,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Binding to the Enchant library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) enchant;};
 
   "enclosed-exceptions" = callPackage
@@ -77149,6 +82314,8 @@ self: {
        testHaskellDepends = [ base bytestring HUnit QuickCheck ];
        description = "A library for various character encodings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "encoding-io" = callPackage
@@ -77162,6 +82329,8 @@ self: {
        ];
        description = "Encoding-aware file I/O";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "encryptable" = callPackage
@@ -77185,6 +82354,8 @@ self: {
        ];
        description = "Typed encryption with persistent support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "endo" = callPackage
@@ -77241,6 +82412,8 @@ self: {
        ];
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "engine-io-growler" = callPackage
@@ -77259,6 +82432,8 @@ self: {
          unordered-containers wai wai-websockets websockets
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "engine-io-snap" = callPackage
@@ -77275,6 +82450,8 @@ self: {
          snap-core unordered-containers websockets websockets-snap
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "engine-io-wai" = callPackage
@@ -77293,6 +82470,8 @@ self: {
        ];
        description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "engine-io-yesod" = callPackage
@@ -77309,6 +82488,8 @@ self: {
          unordered-containers wai wai-websockets websockets yesod-core
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "engineering-units" = callPackage
@@ -77336,6 +82517,8 @@ self: {
        executableHaskellDepends = [ base matrix quipper-core ];
        description = "An application (and library) to convert quipper circuits into Qpmc models";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "entropy" = callPackage
@@ -77379,6 +82562,8 @@ self: {
        ];
        description = "entwine - Concurrency tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enum-subset-generate" = callPackage
@@ -77411,6 +82596,8 @@ self: {
        ];
        description = "A text rendering and parsing toolkit for enumerated types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enum-text-rio" = callPackage
@@ -77427,6 +82614,8 @@ self: {
        ];
        description = "Making fmt available with rio";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enum-types" = callPackage
@@ -77454,6 +82643,8 @@ self: {
        ];
        description = "An experimental Utf8 parsing toolkit for enumerated types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumerable" = callPackage
@@ -77484,6 +82675,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "enumerate all the values in a finite type (automatically)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumerate-function" = callPackage
@@ -77504,6 +82697,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        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;
+       broken = true;
      }) {};
 
   "enumeration" = callPackage
@@ -77520,6 +82715,8 @@ self: {
        testHaskellDepends = [ arith-encode base binary HUnit-Plus ];
        description = "A practical API for building recursive enumeration procedures and enumerating datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumerator" = callPackage
@@ -77536,6 +82733,8 @@ self: {
        ];
        description = "Reliable, high-performance processing with left-fold enumerators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumerator-fd" = callPackage
@@ -77547,6 +82746,8 @@ self: {
        libraryHaskellDepends = [ base enumerator mtl ];
        description = "Enumerator instances for monads-fd classes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumerator-tf" = callPackage
@@ -77558,6 +82759,8 @@ self: {
        libraryHaskellDepends = [ base enumerator monads-tf ];
        description = "Enumerator instances for monads-tf classes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumfun" = callPackage
@@ -77569,6 +82772,8 @@ self: {
        libraryHaskellDepends = [ base enummapset-th ];
        description = "Finitely represented /total/ EnumMaps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enummapmap" = callPackage
@@ -77593,6 +82798,8 @@ self: {
        ];
        description = "Map of maps using Enum types as keys";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enummaps" = callPackage
@@ -77696,6 +82903,8 @@ self: {
        ];
        description = "Pull configuration information from the ENV";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "envelope" = callPackage
@@ -77743,6 +82952,8 @@ self: {
        ];
        description = "Display efficiently the state of the local environment";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "envy" = callPackage
@@ -77790,6 +83001,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell binding for EPANET";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "epass" = callPackage
@@ -77801,6 +83014,8 @@ self: {
        libraryHaskellDepends = [ base stm time ];
        description = "Baisc, Erlang-like message passing supporting sockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "epi-sim" = callPackage
@@ -77821,6 +83036,8 @@ self: {
        ];
        description = "A library for simulating epidemics as birth-death processes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "epic" = callPackage
@@ -77838,6 +83055,8 @@ self: {
        ];
        description = "Compiler for a simple functional language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "epoll" = callPackage
@@ -77851,6 +83070,8 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "epoll bindings";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eprocess" = callPackage
@@ -77863,6 +83084,8 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl ];
        description = "Basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "epub" = callPackage
@@ -77940,6 +83163,8 @@ self: {
        ];
        description = "Rename epub ebook files based on meta information";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eq" = callPackage
@@ -77997,6 +83222,8 @@ self: {
        ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "equeue" = callPackage
@@ -78018,6 +83245,8 @@ self: {
        ];
        description = "Application level triggered, and edge triggered event multiqueues";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "equivalence" = callPackage
@@ -78083,6 +83312,8 @@ self: {
        libraryHaskellDepends = [ base polynomial ];
        description = "Native Haskell implementation of the interface from the erf package";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "erlang" = callPackage
@@ -78098,6 +83329,8 @@ self: {
        ];
        description = "FFI interface to Erlang";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eros" = callPackage
@@ -78110,6 +83343,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "A text censorship library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eros-client" = callPackage
@@ -78128,6 +83363,8 @@ self: {
        ];
        description = "DEPRECATED in favor of eros-http";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eros-http" = callPackage
@@ -78147,6 +83384,8 @@ self: {
        ];
        description = "JSON HTTP interface to Eros";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "errata" = callPackage
@@ -78196,6 +83435,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Error code functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "error-context" = callPackage
@@ -78218,6 +83459,8 @@ self: {
        ];
        description = "Provides API for enriching errors with contexts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "error-continuations" = callPackage
@@ -78229,6 +83472,8 @@ self: {
        libraryHaskellDepends = [ base either mtl transformers ];
        description = "Error Continuations";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "error-list" = callPackage
@@ -78240,6 +83485,8 @@ self: {
        libraryHaskellDepends = [ base mtl text text-render ];
        description = "A useful type for collecting error messages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "error-loc" = callPackage
@@ -78251,6 +83498,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "An error replacement with call-site metadata";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "error-location" = callPackage
@@ -78277,6 +83526,8 @@ self: {
        ];
        description = "Composable error messages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "error-or" = callPackage
@@ -78299,6 +83550,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Set of utils and operators for error handling";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "errorcall-eq-instance" = callPackage
@@ -78345,6 +83598,8 @@ self: {
        ];
        description = "`bracket`-like functions for `ExceptT` over `IO` monad";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ersaconcat" = callPackage
@@ -78368,6 +83623,8 @@ self: {
        ];
        description = "A script to concatenate AIP ERSA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ersatz" = callPackage
@@ -78394,6 +83651,8 @@ self: {
        testHaskellDepends = [ array base directory doctest filepath ];
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ersatz-toysat" = callPackage
@@ -78411,6 +83670,8 @@ self: {
        ];
        description = "toysat driver as backend for ersatz";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ert" = callPackage
@@ -78433,6 +83694,8 @@ self: {
        ];
        description = "Easy Runtime Templates";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "escape-artist" = callPackage
@@ -78496,6 +83759,8 @@ self: {
        doHaddock = false;
        description = "Terminal fuzzy selector";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "esotericbot" = callPackage
@@ -78519,6 +83784,8 @@ self: {
        doHaddock = false;
        description = "Esotericbot is a sophisticated, lightweight IRC bot";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "espial" = callPackage
@@ -78583,6 +83850,8 @@ self: {
        ];
        description = "Espial is an open-source, web-based bookmarking server";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "esqueleto" = callPackage
@@ -78622,6 +83891,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The type-level S combinator in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "essence-of-live-coding" = callPackage
@@ -78743,6 +84014,8 @@ self: {
        testHaskellDepends = [ base essence-of-live-coding http-client ];
        description = "General purpose live coding framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "estimator" = callPackage
@@ -78773,6 +84046,8 @@ self: {
        ];
        description = "Tool for managing probability estimation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "estreps" = callPackage
@@ -78789,6 +84064,8 @@ self: {
        ];
        description = "Repeats from ESTs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "etc" = callPackage
@@ -78841,6 +84118,8 @@ self: {
        ];
        description = "everything breaking the Fairbairn threshold";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eternity" = callPackage
@@ -78861,6 +84140,8 @@ self: {
        ];
        description = "Native event-sourcing database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eternity-timestamped" = callPackage
@@ -78878,6 +84159,8 @@ self: {
        ];
        description = "Automatic timestamping for Eternity";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ether" = callPackage
@@ -78906,6 +84189,8 @@ self: {
        ];
        description = "Monad transformers and classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ethereum-analyzer" = callPackage
@@ -78929,6 +84214,8 @@ self: {
        ];
        description = "A Ethereum contract analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ethereum-analyzer-cli" = callPackage
@@ -78956,6 +84243,8 @@ self: {
        ];
        description = "A CLI frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ethereum-analyzer-deps" = callPackage
@@ -79001,6 +84290,8 @@ self: {
        ];
        description = "A web frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ethereum-client-haskell" = callPackage
@@ -79029,6 +84320,8 @@ self: {
        ];
        description = "A Haskell version of an Ethereum client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ethereum-merkle-patricia-db" = callPackage
@@ -79053,6 +84346,8 @@ self: {
        ];
        description = "A modified Merkle Patricia DB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ethereum-rlp" = callPackage
@@ -79167,6 +84462,8 @@ self: {
        ];
        description = "Dynamic network FRP with events and continuous values";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eurofxref" = callPackage
@@ -79184,6 +84481,8 @@ self: {
        ];
        description = "Free foreign exchange/currency feed from the European Central Bank";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "evdev" = callPackage
@@ -79251,6 +84550,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring eve lens mtl text vty ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eveff" = callPackage
@@ -79275,6 +84576,8 @@ self: {
        ];
        description = "Monoidal, monadic and first-class events";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "event-driven" = callPackage
@@ -79286,6 +84589,8 @@ self: {
        libraryHaskellDepends = [ base monads-tf yjtools ];
        description = "library for event driven programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "event-handlers" = callPackage
@@ -79332,6 +84637,8 @@ self: {
        ];
        description = "Event-graph simulation monad transformer";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "event-transformer" = callPackage
@@ -79392,6 +84699,8 @@ self: {
        ];
        description = "Library for eventful DynamoDB event stores";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventful-memory" = callPackage
@@ -79433,6 +84742,8 @@ self: {
        ];
        description = "Postgres implementations for eventful";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventful-sql-common" = callPackage
@@ -79451,6 +84762,8 @@ self: {
        ];
        description = "Common library for SQL event stores";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventful-sqlite" = callPackage
@@ -79473,6 +84786,8 @@ self: {
        ];
        description = "SQLite implementations for eventful";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventful-test-helpers" = callPackage
@@ -79510,6 +84825,8 @@ self: {
        executableHaskellDepends = [ aeson base filepath text ];
        description = "Visualise an eventlog";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventloop" = callPackage
@@ -79528,6 +84845,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "eventsource-api" = callPackage
@@ -79571,6 +84890,8 @@ self: {
        ];
        description = "GetEventStore store implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventsource-store-specs" = callPackage
@@ -79701,6 +85022,8 @@ self: {
        description = "EventStore TCP Client";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "every" = callPackage
@@ -79723,6 +85046,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "A functional pearl on encoding and decoding using question-and-answer strategies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ewe" = callPackage
@@ -79742,6 +85067,8 @@ self: {
        executableToolDepends = [ alex happy uuagc ];
        description = "An interpreter for EWE programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ex-pool" = callPackage
@@ -79782,6 +85109,8 @@ self: {
        testHaskellDepends = [ base containers tasty tasty-hunit ];
        description = "Efficient exact cover solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exact-pi" = callPackage
@@ -79831,6 +85160,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Framework for Exact Real Arithmetic in the Positional Number System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "example-haskell-project" = callPackage
@@ -79858,6 +85189,8 @@ self: {
        libraryHaskellDepends = [ base exceptions transformers ];
        description = "Safely deal with exceptions in ExceptT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exception-hierarchy" = callPackage
@@ -79895,6 +85228,8 @@ self: {
        ];
        description = "Exception monad transformer instances for monads-fd classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exception-monads-tf" = callPackage
@@ -79962,6 +85297,8 @@ self: {
        libraryHaskellDepends = [ base exceptions ];
        description = "Essentially the Maybe type with error messages";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exceptionfree-readfile" = callPackage
@@ -79977,6 +85314,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "An exception-free readFile for use with '+RTS -xc -RTS' projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exceptions_0_10_4" = callPackage
@@ -80028,6 +85367,8 @@ self: {
        ];
        description = "A Haskell client for https://exchangeratesapi.io/";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "execs" = callPackage
@@ -80042,6 +85383,8 @@ self: {
        executableHaskellDepends = [ base directory process text ];
        description = "Tool to run stack exec prj-exe more easy";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "executable-hash" = callPackage
@@ -80089,6 +85432,8 @@ self: {
        testHaskellDepends = [ async base doctest hspec process ];
        description = "Shell helpers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exference" = callPackage
@@ -80119,6 +85464,8 @@ self: {
        ];
        description = "Tool to search/generate (haskell) expressions with a given type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exhaustive" = callPackage
@@ -80157,6 +85504,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Exheres generator for cabal packages";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exif" = callPackage
@@ -80169,6 +85518,8 @@ self: {
        librarySystemDepends = [ exif ];
        description = "A Haskell binding to a subset of libexif";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) exif;};
 
   "exiftool" = callPackage
@@ -80302,6 +85653,8 @@ self: {
        libraryHaskellDepends = [ base constraints deepseq exinst ];
        description = "Derive instances for the `deepseq` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exinst-hashable" = callPackage
@@ -80315,6 +85668,8 @@ self: {
        ];
        description = "Derive instances for the `hashable` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exinst-serialise" = callPackage
@@ -80392,6 +85747,8 @@ self: {
        libraryHaskellDepends = [ base contravariant ];
        description = "Existential datatypes holding evidence of constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exit-codes" = callPackage
@@ -80423,6 +85780,8 @@ self: {
        ];
        description = "Monad transformer for exit codes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exomizer" = callPackage
@@ -80485,6 +85844,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "floating point with extended exponent range";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exp-pairs" = callPackage
@@ -80522,6 +85883,8 @@ self: {
        ];
        description = "Extensible Pandoc";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "expat-enumerator" = callPackage
@@ -80537,6 +85900,8 @@ self: {
        ];
        description = "Enumerator-based API for Expat";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "expiring-cache-map" = callPackage
@@ -80578,6 +85943,8 @@ self: {
        ];
        description = "Expiring containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "expiring-mvar" = callPackage
@@ -80604,6 +85971,8 @@ self: {
        ];
        description = "Show how expressions are parsed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explicit-constraint-lens" = callPackage
@@ -80618,6 +85987,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Fully-flexible polymorphic lenses, without any bizarre profunctors";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explicit-determinant" = callPackage
@@ -80629,6 +86000,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "explicit computation of determinant of small matrices";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explicit-exception" = callPackage
@@ -80653,6 +86026,8 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols tagged ];
        description = "File handles with explicit IOModes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explicit-iomodes-bytestring" = callPackage
@@ -80664,6 +86039,8 @@ self: {
        libraryHaskellDepends = [ base bytestring explicit-iomodes ];
        description = "Extends explicit-iomodes with ByteString operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explicit-iomodes-text" = callPackage
@@ -80675,6 +86052,8 @@ self: {
        libraryHaskellDepends = [ base explicit-iomodes text ];
        description = "Extends explicit-iomodes with Text operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explicit-sharing" = callPackage
@@ -80688,6 +86067,8 @@ self: {
        ];
        description = "Explicit Sharing of Monadic Effects";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explore" = callPackage
@@ -80701,6 +86082,8 @@ self: {
        executableHaskellDepends = [ array base directory pngload ];
        description = "Experimental Plot data Reconstructor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exposed-containers" = callPackage
@@ -80721,6 +86104,8 @@ self: {
        ];
        description = "A distribution of the 'containers' package, with all modules exposed";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "express" = callPackage
@@ -80745,6 +86130,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generalization of parsec's expression parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "expressions" = callPackage
@@ -80762,6 +86149,8 @@ self: {
        testHaskellDepends = [ base singletons text ];
        description = "Expressions and Formulae a la carte";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "expressions-z3" = callPackage
@@ -80780,6 +86169,8 @@ self: {
        ];
        description = "Encode and Decode expressions from Z3 ASTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "expresso" = callPackage
@@ -80808,6 +86199,8 @@ self: {
        ];
        description = "A simple expressions language based on row types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extcore" = callPackage
@@ -80825,6 +86218,8 @@ self: {
        ];
        description = "Libraries for processing GHC Core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extemp" = callPackage
@@ -80847,6 +86242,8 @@ self: {
        ];
        description = "automated printing for extemp speakers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extend-record-data-th" = callPackage
@@ -80870,6 +86267,8 @@ self: {
        libraryHaskellDepends = [ base constraints ghc-prim tagged ];
        description = "Extended Categories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extended-containers" = callPackage
@@ -80947,6 +86346,8 @@ self: {
        ];
        description = "Sums/products/lists/trees which can be extended in other modules";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extensible-effects" = callPackage
@@ -81004,6 +86405,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Message passing concurrency as extensible-effect";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extensible-exceptions" = callPackage
@@ -81033,6 +86436,8 @@ self: {
        testHaskellDepends = [ base extensible ];
        description = "Operational-based extensible effect library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extensible-sp" = callPackage
@@ -81084,6 +86489,8 @@ self: {
        ];
        description = "Sort large arrays on your hard drive. Kind of like the unix util sort.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extra" = callPackage
@@ -81122,6 +86529,8 @@ self: {
        ];
        description = "Given a hackage package outputs the list of its dependencies";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extractable-singleton" = callPackage
@@ -81151,6 +86560,8 @@ self: {
        ];
        description = "Extract an ELF's metadata and sections into files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extralife" = callPackage
@@ -81166,6 +86577,8 @@ self: {
        ];
        description = "API Client for ExtraLife team and user data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extrapolate" = callPackage
@@ -81205,6 +86618,8 @@ self: {
        ];
        description = "A high level static library for working with CouchDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ez3" = callPackage
@@ -81218,6 +86633,8 @@ self: {
        libraryHaskellDepends = [ base transformers z3 ];
        description = "Z3 bonds with pure interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "f-algebra-gen" = callPackage
@@ -81229,6 +86646,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generate a special f-algebra combinator from any data type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "f-ree-hack-cheats-free-v-bucks-generator" = callPackage
@@ -81244,6 +86663,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "faceted" = callPackage
@@ -81255,6 +86676,8 @@ self: {
        libraryHaskellDepends = [ base free ];
        description = "Faceted computation for dynamic information flow security";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "factor" = callPackage
@@ -81308,6 +86731,8 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl template-haskell ];
        description = "Refined types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "factual-api" = callPackage
@@ -81325,6 +86750,8 @@ self: {
        ];
        description = "A driver for the Factual API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fad" = callPackage
@@ -81358,6 +86785,8 @@ self: {
        ];
        description = "Minimal library for music generation and notation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fadno-braids" = callPackage
@@ -81374,6 +86803,8 @@ self: {
        ];
        description = "Braid representations in Haskell";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fadno-xml" = callPackage
@@ -81388,6 +86819,8 @@ self: {
        ];
        description = "XML/XSD combinators/schemas/codegen";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fail" = callPackage
@@ -81421,6 +86854,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy streams, which might terminate with an error";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "failure" = callPackage
@@ -81448,6 +86883,8 @@ self: {
        ];
        description = "Failure Detectors implimented in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fair" = callPackage
@@ -81493,6 +86930,8 @@ self: {
        testHaskellDepends = [ base hspec random text time ];
        description = "Randomly generated fake data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fake-type" = callPackage
@@ -81505,6 +86944,8 @@ self: {
        librarySystemDepends = [ libXtst ];
        description = "A crossplatform library to simulate keyboard input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.xorg) libXtst;};
 
   "fakedata" = callPackage
@@ -81626,6 +87067,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Faktory Worker for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fallible" = callPackage
@@ -81656,6 +87099,8 @@ self: {
        ];
        description = "Falling sand game/cellular automata simulation using regular parallel arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fallingblocks" = callPackage
@@ -81674,6 +87119,8 @@ self: {
        ];
        description = "A fun falling blocks game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "familiar-reflection" = callPackage
@@ -81701,6 +87148,8 @@ self: {
        ];
        description = "A family tree library for the Haskell programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "farmhash" = callPackage
@@ -81730,6 +87179,8 @@ self: {
        doHaddock = false;
        description = "Fast functions on integers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fast-builder" = callPackage
@@ -81767,6 +87218,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Fast combinatorics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fast-digits" = callPackage
@@ -81786,6 +87239,8 @@ self: {
        doHaddock = false;
        description = "Integer-to-digits conversion";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fast-downward" = callPackage
@@ -81853,6 +87308,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Natural Numbers with no overhead";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fast-tags" = callPackage
@@ -81922,6 +87379,8 @@ self: {
        ];
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fastbayes" = callPackage
@@ -81933,6 +87392,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix vector ];
        description = "Bayesian modeling algorithms accelerated for particular model structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fastcgi" = callPackage
@@ -81966,6 +87427,8 @@ self: {
        ];
        description = "find nearest neighbours by edit-distance";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fastirc" = callPackage
@@ -81982,6 +87445,8 @@ self: {
        ];
        description = "Fast Internet Relay Chat (IRC) library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fastly" = callPackage
@@ -82001,6 +87466,8 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "A highly experimental Fastly API client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fastparser" = callPackage
@@ -82072,6 +87539,8 @@ self: {
        ];
        description = "Utilities for working with DuckDuckHack's FatHead Instant Answers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fault-tree" = callPackage
@@ -82083,6 +87552,8 @@ self: {
        libraryHaskellDepends = [ base yices ];
        description = "A fault tree analysis library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay" = callPackage
@@ -82113,6 +87584,8 @@ self: {
        executableHaskellDepends = [ base mtl optparse-applicative split ];
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-base" = callPackage
@@ -82125,6 +87598,8 @@ self: {
        libraryHaskellDepends = [ base fay ];
        description = "The base package for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-builder" = callPackage
@@ -82142,6 +87617,8 @@ self: {
        ];
        description = "Compile Fay code on cabal install, and ad-hoc recompile during development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-dom" = callPackage
@@ -82156,6 +87633,8 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "DOM FFI wrapper library for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-geoposition" = callPackage
@@ -82168,6 +87647,8 @@ self: {
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "W3C compliant implementation of GeoPosition API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-hsx" = callPackage
@@ -82180,6 +87661,8 @@ self: {
        libraryHaskellDepends = [ fay-base fay-jquery ];
        description = "Clientside HTML generation for fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-jquery" = callPackage
@@ -82192,6 +87675,8 @@ self: {
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "jQuery bindings for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-ref" = callPackage
@@ -82204,6 +87689,8 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Like IORef but for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-simplejson" = callPackage
@@ -82216,6 +87703,8 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "SimpleJSON library for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-text" = callPackage
@@ -82230,6 +87719,8 @@ self: {
        libraryHaskellDepends = [ fay fay-base text ];
        description = "Fay Text type represented as JavaScript strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-uri" = callPackage
@@ -82242,6 +87733,8 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Persistent FFI bindings for using jsUri in Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-websockets" = callPackage
@@ -82254,6 +87747,8 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Websockets FFI library for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fb" = callPackage
@@ -82291,6 +87786,8 @@ self: {
        libraryHaskellDepends = [ base cereal fb persistent text time ];
        description = "Provides Persistent instances to Facebook types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fbmessenger-api" = callPackage
@@ -82319,6 +87816,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring filepath hspec text ];
        description = "High-level bindings to Facebook Messenger Platform API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fca" = callPackage
@@ -82335,6 +87834,8 @@ self: {
        ];
        description = "Algo for Formal Concept Analysis";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fcache" = callPackage
@@ -82351,6 +87852,8 @@ self: {
        testHaskellDepends = [ base hspec mtl ];
        description = "Cache a function (a -> b)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fcd" = callPackage
@@ -82370,6 +87873,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A faster way to navigate directories using the command line";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fcf-containers" = callPackage
@@ -82385,6 +87890,8 @@ self: {
        testHaskellDepends = [ base doctest first-class-families Glob ];
        description = "Data structures and algorithms for first-class-families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fcg" = callPackage
@@ -82397,6 +87904,8 @@ self: {
        isExecutable = true;
        description = "TBA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fckeditor" = callPackage
@@ -82408,6 +87917,8 @@ self: {
        libraryHaskellDepends = [ base cgi HaXml xhtml ];
        description = "Server-Side Integration for FCKeditor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fclabels" = callPackage
@@ -82438,6 +87949,8 @@ self: {
        libraryHaskellDepends = [ base fclabels monadLib ];
        description = "MonadLib monadic interface for the \"fclabels\" package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fcm-client" = callPackage
@@ -82469,6 +87982,8 @@ self: {
        ];
        description = "Admin API for Firebase Cloud Messaging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fdo-notify" = callPackage
@@ -82500,6 +88015,8 @@ self: {
        ];
        description = "Utilities related to freedesktop Trash standard";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feather" = callPackage
@@ -82540,6 +88057,8 @@ self: {
        ];
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feature-flipper-postgres" = callPackage
@@ -82561,6 +88080,8 @@ self: {
        ];
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fec" = callPackage
@@ -82622,6 +88143,8 @@ self: {
        ];
        description = "Fedora image download tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fedora-packages" = callPackage
@@ -82644,6 +88167,8 @@ self: {
        ];
        description = "Haskell interface to the Fedora Packages webapp API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fee-estimate" = callPackage
@@ -82703,6 +88228,8 @@ self: {
        ];
        description = "A simple command line interface for creating and updating feeds like RSS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feed-collect" = callPackage
@@ -82720,6 +88247,8 @@ self: {
        ];
        description = "Watch RSS/Atom feeds (and do with them whatever you like)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feed-crawl" = callPackage
@@ -82736,6 +88265,8 @@ self: {
        ];
        description = "Utility for fetching feeds with redirect info and HTML link detection";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feed-gipeda" = callPackage
@@ -82774,6 +88305,8 @@ self: {
        ];
        description = "CI service around gipeda";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feed-translator" = callPackage
@@ -82795,6 +88328,8 @@ self: {
        ];
        description = "Translate syndication feeds";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feed2lj" = callPackage
@@ -82813,6 +88348,8 @@ self: {
        ];
        description = "(unsupported)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feed2twitter" = callPackage
@@ -82829,6 +88366,8 @@ self: {
        ];
        description = "Send posts from a feed to Twitter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fei-base" = callPackage
@@ -82854,6 +88393,8 @@ self: {
        executableSystemDepends = [ mxnet ];
        description = "FFI to MXNet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "fei-cocoapi" = callPackage
@@ -82882,6 +88423,8 @@ self: {
        ];
        description = "Cocodataset with cocoapi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fei-dataiter" = callPackage
@@ -82908,6 +88451,8 @@ self: {
        testHaskellDepends = [ base fei-base hspec streaming ];
        description = "mxnet dataiters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "fei-examples" = callPackage
@@ -82929,6 +88474,8 @@ self: {
        ];
        description = "fei examples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fei-nn" = callPackage
@@ -82954,6 +88501,8 @@ self: {
        ];
        description = "Train a neural network with MXNet in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feldspar-compiler" = callPackage
@@ -82982,6 +88531,8 @@ self: {
        ];
        description = "Compiler for the Feldspar language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gcc_s = null;};
 
   "feldspar-language" = callPackage
@@ -83005,6 +88556,8 @@ self: {
        ];
        description = "A functional embedded language for DSP and parallelism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feldspar-signal" = callPackage
@@ -83077,6 +88630,8 @@ self: {
        executableSystemDepends = [ raptor ];
        description = "Graph-based notetaking system";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {raptor = null;};
 
   "fernet" = callPackage
@@ -83102,6 +88657,8 @@ self: {
        ];
        description = "Generate and verify HMAC-based authentication tokens";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "festung" = callPackage
@@ -83132,6 +88689,8 @@ self: {
        ];
        description = "Remote multi-db SQLCipher server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fez-conf" = callPackage
@@ -83143,6 +88702,8 @@ self: {
        libraryHaskellDepends = [ base containers regex-compat ];
        description = "Simple functions for loading config files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ffeed" = callPackage
@@ -83157,6 +88718,8 @@ self: {
        executableHaskellDepends = [ base pretty ];
        description = "Haskell binding to the FriendFeed API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fficxx" = callPackage
@@ -83178,6 +88741,8 @@ self: {
        ];
        description = "automatic C++ binding generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fficxx-runtime" = callPackage
@@ -83228,6 +88793,8 @@ self: {
        ];
        description = "Tutorials on ffmpeg usage to play video/audio";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fft" = callPackage
@@ -83276,6 +88843,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "FFunctor typeclass";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fgl" = callPackage
@@ -83316,6 +88885,8 @@ self: {
        libraryHaskellDepends = [ base containers fgl ];
        description = "Graph decomposition algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fgl-visualize" = callPackage
@@ -83359,6 +88930,8 @@ self: {
        ];
        description = "Tools for running and analyzing Haskell benchmarks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fibonacci" = callPackage
@@ -83390,6 +88963,8 @@ self: {
        ];
        description = "update statically hosted file in a push stule through socketed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fields" = callPackage
@@ -83405,6 +88980,8 @@ self: {
        ];
        description = "First-class record field combinators with infix record field syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fields-json" = callPackage
@@ -83432,6 +89009,8 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fig" = callPackage
@@ -83443,6 +89022,8 @@ self: {
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "Manipulation of FIG files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "file-collection" = callPackage
@@ -83456,6 +89037,8 @@ self: {
        ];
        description = "Provide a uniform interface over file archives and directories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "file-command-qq" = callPackage
@@ -83471,6 +89054,8 @@ self: {
        ];
        description = "Quasiquoter for system commands involving filepaths";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "file-embed" = callPackage
@@ -83524,6 +89109,8 @@ self: {
        ];
        description = "Use Template Haskell to embed file contents directly";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "file-location" = callPackage
@@ -83541,6 +89128,8 @@ self: {
        testHaskellDepends = [ base lifted-base process ];
        description = "common functions that show file location information";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "file-modules" = callPackage
@@ -83617,6 +89206,8 @@ self: {
        ];
        description = "A cache system associating values to files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filediff" = callPackage
@@ -83638,6 +89229,8 @@ self: {
        ];
        description = "Diffing and patching module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filelock" = callPackage
@@ -83676,6 +89269,8 @@ self: {
        libraryHaskellDepends = [ base hinotify stm ];
        description = "Block thread until a file stops being modified";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filepath_1_4_2_1" = callPackage
@@ -83722,6 +89317,8 @@ self: {
        ];
        description = "Reversable and secure encoding of object ids as filepaths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filepath-io-access" = callPackage
@@ -83733,6 +89330,8 @@ self: {
        libraryHaskellDepends = [ base base-io-access filepath ];
        description = "IO Access for filepath";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filepather" = callPackage
@@ -83749,6 +89348,8 @@ self: {
        ];
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filepattern" = callPackage
@@ -83777,6 +89378,8 @@ self: {
        ];
        description = "Library to process and search large files or a collection of files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filestore" = callPackage
@@ -83814,6 +89417,8 @@ self: {
        ];
        description = "A shared set of abstractions and types for representing filessytem data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filesystem-conduit" = callPackage
@@ -83835,6 +89440,8 @@ self: {
        ];
        description = "Use system-filepath data types with conduits. (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filesystem-enumerator" = callPackage
@@ -83850,6 +89457,8 @@ self: {
        ];
        description = "Enumerator-based API for manipulating the filesystem";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filesystem-trees" = callPackage
@@ -83866,6 +89475,8 @@ self: {
        ];
        description = "Recursively manipulate and traverse filesystems as lazy rose trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fillit" = callPackage
@@ -83882,6 +89493,8 @@ self: {
        testHaskellDepends = [ base doctest hspec unordered-containers ];
        description = "Flexible string substitution";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filter-logger" = callPackage
@@ -83971,6 +89584,8 @@ self: {
        ];
        description = "Extensible pretty printing with semantic annotations and proportional fonts";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "find-clumpiness" = callPackage
@@ -83996,6 +89611,8 @@ self: {
        ];
        description = "Find the clumpiness of labels in a tree";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "find-conduit" = callPackage
@@ -84030,6 +89647,8 @@ self: {
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "find-source-files" = callPackage
@@ -84041,6 +89660,8 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath mtl ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "findhttp" = callPackage
@@ -84059,6 +89680,8 @@ self: {
        ];
        description = "List http/html files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fingertree" = callPackage
@@ -84087,6 +89710,8 @@ self: {
        libraryHaskellDepends = [ base fingertree ];
        description = "Implementation of priority search queues as finger trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fingertree-tf" = callPackage
@@ -84098,6 +89723,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic finger-tree structure using type families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "finitary" = callPackage
@@ -84145,6 +89772,8 @@ self: {
        ];
        description = "Flexible and easy deriving of type classes for finitary types";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "finitary-optics" = callPackage
@@ -84275,6 +89904,8 @@ self: {
        ];
        description = "A simple example using Firefly";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "first-and-last" = callPackage
@@ -84287,6 +89918,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "First and Last generalized to return up to n values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "first-class-families" = callPackage
@@ -84318,6 +89951,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "First class typeclass instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "first-class-patterns" = callPackage
@@ -84346,6 +89981,8 @@ self: {
        ];
        description = "Defunctionalisation for Yhc Core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fishfood" = callPackage
@@ -84388,6 +90025,8 @@ self: {
        ];
        description = "FIT file decoder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fits-parse" = callPackage
@@ -84411,6 +90050,8 @@ self: {
        ];
        description = "Parse FITS files";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fitsio" = callPackage
@@ -84423,6 +90064,8 @@ self: {
        librarySystemDepends = [ cfitsio ];
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) cfitsio;};
 
   "fitspec" = callPackage
@@ -84462,6 +90105,8 @@ self: {
        ];
        description = "Program to manage the imports of a haskell module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fix-parser-simple" = callPackage
@@ -84475,6 +90120,8 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "Simple fix-expression parser";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fix-symbols-gitit" = callPackage
@@ -84486,6 +90133,8 @@ self: {
        libraryHaskellDepends = [ base containers gitit ];
        description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed" = callPackage
@@ -84533,6 +90182,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Binary fixed-point arithmetic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-point-vector" = callPackage
@@ -84544,6 +90195,8 @@ self: {
        libraryHaskellDepends = [ base fixed-point vector ];
        description = "Unbox instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-point-vector-space" = callPackage
@@ -84555,6 +90208,8 @@ self: {
        libraryHaskellDepends = [ base fixed-point vector-space ];
        description = "vector-space instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-precision" = callPackage
@@ -84570,6 +90225,8 @@ self: {
        ];
        description = "Fixed Precision Arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-storable-array" = callPackage
@@ -84581,6 +90238,8 @@ self: {
        libraryHaskellDepends = [ array base tagged ];
        description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-timestep" = callPackage
@@ -84592,6 +90251,8 @@ self: {
        libraryHaskellDepends = [ async base clock time ];
        description = "Pure Haskell library to repeat an action at a specific frequency";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-vector" = callPackage
@@ -84620,6 +90281,8 @@ self: {
        ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-vector-cborg" = callPackage
@@ -84636,6 +90299,8 @@ self: {
        ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-vector-cereal" = callPackage
@@ -84652,6 +90317,8 @@ self: {
        ];
        description = "Cereal instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-vector-hetero" = callPackage
@@ -84680,6 +90347,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Fixed width subsets of an Int64/Word64";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixedprec" = callPackage
@@ -84735,6 +90404,8 @@ self: {
        ];
        description = "A Haskell client for http://fixer.io/";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixfile" = callPackage
@@ -84756,6 +90427,8 @@ self: {
        ];
        description = "File-backed recursive data structures";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixhs" = callPackage
@@ -84780,6 +90453,8 @@ self: {
        ];
        description = "FIX (co)parser";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixie" = callPackage
@@ -84801,6 +90476,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Opininated testing framework for mtl style (spies, stubs, and mocks)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixplate" = callPackage
@@ -84861,6 +90538,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "test";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fizzbuzz-as-a-service" = callPackage
@@ -84878,6 +90557,8 @@ self: {
        ];
        description = "FizzBuzz as a service";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flac" = callPackage
@@ -84904,6 +90585,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Complete high-level binding to libFLAC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {FLAC = null;};
 
   "flac-picture" = callPackage
@@ -84922,6 +90605,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Support for writing picture to FLAC metadata blocks with JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flaccuraterip" = callPackage
@@ -84966,6 +90651,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell text ];
        description = "A template engine for HTML";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flamingra" = callPackage
@@ -84982,6 +90669,8 @@ self: {
        ];
        description = "FlameGraphs of profiling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flashblast" = callPackage
@@ -85026,6 +90715,8 @@ self: {
        ];
        description = "Generate language learning flashcards from video";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flat" = callPackage
@@ -85063,6 +90754,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Strict Maybe without space and indirection overhead";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flat-mcmc" = callPackage
@@ -85129,6 +90822,8 @@ self: {
        ];
        description = "Haskell implementation of the FlatBuffers protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flay" = callPackage
@@ -85143,6 +90838,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck transformers ];
        description = "Work generically on your datatype without knowing its shape nor its contents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flexible-defaults" = callPackage
@@ -85169,6 +90866,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix-time ];
        description = "simple extension of Data.UnixTime.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flexible-unlit" = callPackage
@@ -85194,6 +90893,8 @@ self: {
        libraryHaskellDepends = [ base data-type mtl QuickCheck ];
        description = "Flexible wrappers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flexiwrap-smallcheck" = callPackage
@@ -85207,6 +90908,8 @@ self: {
        ];
        description = "SmallCheck (Serial) instances for flexiwrap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flick-duration" = callPackage
@@ -85237,6 +90940,8 @@ self: {
        executableHaskellDepends = [ xhtml ];
        description = "Haskell binding to the Flickr API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flight-igc" = callPackage
@@ -85292,6 +90997,8 @@ self: {
        libraryToolDepends = [ proto-lens-protoc ];
        description = "Flink stateful functions SDK";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flip-cmd" = callPackage
@@ -85334,6 +91041,8 @@ self: {
        ];
        description = "f-lite compiler, interpreter and libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flo" = callPackage
@@ -85370,6 +91079,8 @@ self: {
        ];
        description = "C99 printf \"%a\" style formatting and parsing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "float128" = callPackage
@@ -85394,6 +91105,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conversions between floating and integral values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "floatshow" = callPackage
@@ -85482,6 +91195,8 @@ self: {
        testHaskellDepends = [ base doctest flow QuickCheck ];
        description = "More directional operators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flow2dot" = callPackage
@@ -85519,6 +91234,8 @@ self: {
        ];
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flowdock-api" = callPackage
@@ -85555,6 +91272,8 @@ self: {
        ];
        description = "API integration with Flowdock";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flowdock-rest" = callPackage
@@ -85582,6 +91301,8 @@ self: {
        ];
        description = "Flowdock REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flower" = callPackage
@@ -85599,6 +91320,8 @@ self: {
        ];
        description = "Analyze 454 flowgrams (.SFF files)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flowlocks-framework" = callPackage
@@ -85611,6 +91334,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Generalized Flow Locks Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flowsim" = callPackage
@@ -85629,6 +91354,8 @@ self: {
        ];
        description = "Simulate 454 pyrosequencing";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flp" = callPackage
@@ -85661,6 +91388,8 @@ self: {
        testToolDepends = [ alex happy ];
        description = "A layout spec language for memory managers implemented in Rust";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fltkhs" = callPackage
@@ -85685,6 +91414,8 @@ self: {
        ];
        description = "FLTK bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fltk14; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU; inherit (pkgs) pkg-config;};
 
@@ -85730,6 +91461,8 @@ self: {
        executableHaskellDepends = [ base bytestring fltkhs ];
        description = "Fltkhs Fluid Examples";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fltkhs-hello-world" = callPackage
@@ -85787,6 +91520,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A structured logger for Fluentd (Haskell)";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fluent-logger-conduit" = callPackage
@@ -85838,6 +91573,8 @@ self: {
        ];
        description = "The parser for fluffy to parsec the question bank in .docx type";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fluid-idl" = callPackage
@@ -85903,6 +91640,8 @@ self: {
        librarySystemDepends = [ fluidsynth ];
        description = "Haskell bindings to FluidSynth";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fluidsynth;};
 
   "flush-queue" = callPackage
@@ -85929,6 +91668,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A monoid for tracking changes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fmark" = callPackage
@@ -85946,6 +91687,8 @@ self: {
        ];
        description = "A Friendly Markup language without syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fmlist" = callPackage
@@ -85984,6 +91727,8 @@ self: {
        ];
        description = "A new formatting library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fmt-for-rio" = callPackage
@@ -85995,6 +91740,8 @@ self: {
        libraryHaskellDepends = [ base enum-text-rio ];
        description = "Adaptor for getting fmt to work with rio";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fmt-terminal-colors" = callPackage
@@ -86007,6 +91754,8 @@ self: {
        testHaskellDepends = [ ansi-terminal base fmt ];
        description = "ANSI terminal colors formatters for fmt library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fn" = callPackage
@@ -86047,6 +91796,8 @@ self: {
        ];
        description = "Extras for Fn, a functional web framework";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "focus" = callPackage
@@ -86190,6 +91941,8 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion foldl ];
        description = "incremental folds";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foldl-statistics" = callPackage
@@ -86214,6 +91967,8 @@ self: {
        ];
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foldl-transduce" = callPackage
@@ -86240,6 +91995,8 @@ self: {
        ];
        description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foldl-transduce-attoparsec" = callPackage
@@ -86261,6 +92018,8 @@ self: {
        ];
        description = "Attoparsec and foldl-transduce integration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "folds" = callPackage
@@ -86299,6 +92058,8 @@ self: {
        testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        description = "A playground of common folds for folds";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "folgerhs" = callPackage
@@ -86345,6 +92106,8 @@ self: {
        ];
        description = "Haskell library to follow content published on any subject";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "follow-file" = callPackage
@@ -86387,6 +92150,8 @@ self: {
        ];
        description = "Follow Tweets anonymously";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foma" = callPackage
@@ -86399,6 +92164,8 @@ self: {
        librarySystemDepends = [ foma ];
        description = "Simple Haskell bindings for Foma";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {foma = null;};
 
   "font-awesome-type" = callPackage
@@ -86424,6 +92191,8 @@ self: {
        executableHaskellDepends = [ base GLFW-b OpenGL ];
        description = "Basic4x6 font for OpenGL";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foo" = callPackage
@@ -86439,6 +92208,8 @@ self: {
        ];
        description = "Paper soccer, an OpenGL game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foobar" = callPackage
@@ -86470,6 +92241,8 @@ self: {
        ];
        description = "Functor, Monad, MonadPlus, etc for free";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forbidden-fruit" = callPackage
@@ -86490,6 +92263,8 @@ self: {
        ];
        description = "A library accelerates imperative style programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "force-layout" = callPackage
@@ -86506,6 +92281,8 @@ self: {
        ];
        description = "Simple force-directed layout";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fordo" = callPackage
@@ -86519,6 +92296,8 @@ self: {
        executableHaskellDepends = [ base process transformers ];
        description = "Run a command on files with magic substituion support (sequencing and regexp)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forecast-io" = callPackage
@@ -86530,6 +92309,8 @@ self: {
        libraryHaskellDepends = [ aeson base text ];
        description = "A Haskell library for working with forecast.io data.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foreign-storable-asymmetric" = callPackage
@@ -86565,6 +92346,8 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "Encapsulating mutatable state in external libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forest" = callPackage
@@ -86580,6 +92363,8 @@ self: {
        ];
        description = "Tree and Forest types";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forest-fire" = callPackage
@@ -86601,6 +92386,8 @@ self: {
        ];
        description = "Recursively delete CloudFormation stacks and their dependants";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forger" = callPackage
@@ -86615,6 +92402,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for generating fake placeholder data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forkable-monad" = callPackage
@@ -86666,6 +92455,8 @@ self: {
        ];
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "format" = callPackage
@@ -86678,6 +92469,8 @@ self: {
        testHaskellDepends = [ haskell2010 parsec QuickCheck ];
        description = "Rendering from and scanning to format strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "format-numbers" = callPackage
@@ -86707,6 +92500,8 @@ self: {
        ];
        description = "A utility for writing the date to dzen2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "formattable" = callPackage
@@ -86727,6 +92522,8 @@ self: {
        ];
        description = "Business-quality formatting of numbers, dates, and other things";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "formatting" = callPackage
@@ -86790,6 +92587,8 @@ self: {
        ];
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "formlets" = callPackage
@@ -86806,6 +92605,8 @@ self: {
        ];
        description = "Formlets implemented in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "formlets-hsp" = callPackage
@@ -86822,6 +92623,8 @@ self: {
        libraryToolDepends = [ trhsx ];
        description = "HSP support for Formlets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "formura" = callPackage
@@ -86843,6 +92646,8 @@ self: {
        ];
        description = "Formura is a simple language to describe stencil computation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forsyde-deep" = callPackage
@@ -86870,6 +92675,8 @@ self: {
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forsyde-shallow" = callPackage
@@ -86897,6 +92704,8 @@ self: {
        libraryHaskellDepends = [ array-forth base free mtl ];
        description = "A simple eDSL for generating arrayForth code";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fortran-src" = callPackage
@@ -86925,6 +92734,8 @@ self: {
        ];
        description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fortytwo" = callPackage
@@ -86939,6 +92750,8 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        description = "Interactive terminal prompt";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forward-chan" = callPackage
@@ -86969,6 +92782,8 @@ self: {
        ];
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foscam-filename" = callPackage
@@ -86988,6 +92803,8 @@ self: {
        ];
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foscam-sort" = callPackage
@@ -87014,6 +92831,8 @@ self: {
        ];
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foundation" = callPackage
@@ -87144,6 +92963,8 @@ self: {
        ];
        description = "Simple interface to the FP Complete IDE API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fpe" = callPackage
@@ -87189,6 +93010,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell bindings to <https://fplll.github.io/fplll/ fplll>";
        license = stdenv.lib.licenses.lgpl21Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fplll;};
 
   "fpnla" = callPackage
@@ -87224,6 +93047,8 @@ self: {
        ];
        description = "Example implementations for FPNLA library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fptest" = callPackage
@@ -87249,6 +93074,8 @@ self: {
        ];
        description = "IEEE754r floating point conformance tests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fquery" = callPackage
@@ -87292,6 +93119,8 @@ self: {
        testHaskellDepends = [ base integer-gmp QuickCheck ];
        description = "A collection of useful fractal curve encoders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fraction" = callPackage
@@ -87303,6 +93132,8 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "Fractions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frag" = callPackage
@@ -87317,6 +93148,8 @@ self: {
        executableHaskellDepends = [ array base GLUT OpenGL random ];
        description = "A 3-D First Person Shooter Game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frame" = callPackage
@@ -87364,6 +93197,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A package for configuring and building Haskell software";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "franz" = callPackage
@@ -87409,6 +93244,8 @@ self: {
        benchmarkHaskellDepends = [ base time ];
        description = "Cached and parallel data fetching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freddy" = callPackage
@@ -87428,6 +93265,8 @@ self: {
        ];
        description = "RabbitMQ Messaging API supporting request-response";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free" = callPackage
@@ -87466,6 +93305,8 @@ self: {
        ];
        description = "Free algebras";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-categories" = callPackage
@@ -87494,6 +93335,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "efficient data types for free categories and arrows";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-concurrent" = callPackage
@@ -87505,6 +93348,8 @@ self: {
        libraryHaskellDepends = [ base type-aligned ];
        description = "Free monads suitable for concurrent computation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-er" = callPackage
@@ -87557,6 +93402,8 @@ self: {
        ];
        description = "Create games for free";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-http" = callPackage
@@ -87573,6 +93420,8 @@ self: {
        ];
        description = "An HTTP Client based on Free Monads";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-operational" = callPackage
@@ -87588,6 +93437,8 @@ self: {
        ];
        description = "Operational Applicative, Alternative, Monad and MonadPlus from free types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-theorems" = callPackage
@@ -87603,6 +93454,8 @@ self: {
        ];
        description = "Automatic generation of free theorems";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-theorems-counterexamples" = callPackage
@@ -87621,6 +93474,8 @@ self: {
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Automatically Generating Counterexamples to Naive Free Theorems";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-theorems-seq" = callPackage
@@ -87638,6 +93493,8 @@ self: {
        ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-theorems-seq-webui" = callPackage
@@ -87656,6 +93513,8 @@ self: {
        ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-theorems-webui" = callPackage
@@ -87675,6 +93534,8 @@ self: {
        ];
        description = "CGI-based web interface for the free-theorems package";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-v-bucks-generator-no-survey" = callPackage
@@ -87690,6 +93551,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-v-bucks-generator-ps4-no-survey" = callPackage
@@ -87705,6 +93568,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-vector-spaces" = callPackage
@@ -87760,6 +93625,8 @@ self: {
        ];
        description = "A soccer game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freelude" = callPackage
@@ -87779,6 +93646,8 @@ self: {
        ];
        description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freenect" = callPackage
@@ -87831,6 +93700,8 @@ self: {
        ];
        description = "Handle effects conversely using monadic conversation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freer-effects" = callPackage
@@ -87851,6 +93722,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion free mtl ];
        description = "Implementation of effect system for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freer-indexed" = callPackage
@@ -87901,6 +93774,8 @@ self: {
        testHaskellDepends = [ base freer-simple hspec ];
        description = "Checked runtime exceptions with freer-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freer-simple-http" = callPackage
@@ -87921,6 +93796,8 @@ self: {
        ];
        description = "Make HTTP requests with freer-simple!";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freer-simple-profiling" = callPackage
@@ -87933,6 +93810,8 @@ self: {
        testHaskellDepends = [ base containers freer-simple hspec time ];
        description = "Automatic profling of freer-simple programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freer-simple-random" = callPackage
@@ -87945,6 +93824,8 @@ self: {
        testHaskellDepends = [ base containers freer-simple hspec random ];
        description = "Random number generators using freer-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freer-simple-time" = callPackage
@@ -87957,6 +93838,8 @@ self: {
        testHaskellDepends = [ base freer-simple hspec time ];
        description = "freer-simple interface to IO based time functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freesect" = callPackage
@@ -87974,6 +93857,8 @@ self: {
        ];
        description = "A Haskell syntax extension for generalised sections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freesound" = callPackage
@@ -87995,6 +93880,8 @@ self: {
        ];
        description = "Access the Freesound Project database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freetype-simple" = callPackage
@@ -88009,6 +93896,8 @@ self: {
        ];
        description = "Single line text rendering for OpenGL ES";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freetype2" = callPackage
@@ -88052,6 +93941,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring containers gauge ];
        description = "Are you ready to get freaky?";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fresco-binding" = callPackage
@@ -88079,6 +93970,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell-src-exts syb ];
        description = "Introduce fresh variables into Haskell source code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "friday" = callPackage
@@ -88117,6 +94010,8 @@ self: {
        librarySystemDepends = [ libdevil ];
        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;
+       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "friday-juicypixels" = callPackage
@@ -88148,6 +94043,8 @@ self: {
        ];
        description = "Scale Friday images with DCT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "friendly" = callPackage
@@ -88163,6 +94060,8 @@ self: {
        ];
        description = "Attempt to pretty-print any input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "friendly-time" = callPackage
@@ -88235,6 +94134,8 @@ self: {
        ];
        description = "A reactive frontend web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frontmatter" = callPackage
@@ -88278,6 +94179,8 @@ self: {
        executableHaskellDepends = [ base directory ];
        description = "LALR(k) parser generator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frp-arduino" = callPackage
@@ -88289,6 +94192,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Arduino programming without the hassle of C";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frpnow" = callPackage
@@ -88303,6 +94208,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Principled practical FRP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frpnow-gloss" = callPackage
@@ -88318,6 +94225,8 @@ self: {
        ];
        description = "Program awesome stuff with Gloss and frpnow!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frpnow-gtk" = callPackage
@@ -88334,6 +94243,8 @@ self: {
        ];
        description = "Program GUIs with GTK and frpnow!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frpnow-gtk3" = callPackage
@@ -88347,6 +94258,8 @@ self: {
        ];
        description = "Program GUIs with GTK3 and frpnow!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frpnow-vty" = callPackage
@@ -88361,6 +94274,8 @@ self: {
        executableHaskellDepends = [ base containers frpnow vty ];
        description = "Program terminal applications with vty and frpnow!";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frquotes" = callPackage
@@ -88386,6 +94301,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A haskell binding to the FSEvents API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fsh-csv" = callPackage
@@ -88397,6 +94314,8 @@ self: {
        libraryHaskellDepends = [ base hint ];
        description = "csv parser for fsh";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fsharp" = callPackage
@@ -88423,6 +94342,8 @@ self: {
        ];
        description = "Finite state machines and FSM actions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fsnotify" = callPackage
@@ -88484,6 +94405,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Finite state transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fsutils" = callPackage
@@ -88495,6 +94418,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath ];
        description = "File system utilities for Haskell that are missing from built in libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fswait" = callPackage
@@ -88514,6 +94439,8 @@ self: {
        ];
        description = "Wait and observe events on the filesystem for a path, with a timeout";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fswatch" = callPackage
@@ -88534,6 +94461,8 @@ self: {
        ];
        description = "File System watching tool with cli and slave functionalities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fswatcher" = callPackage
@@ -88565,6 +94494,8 @@ self: {
        executableHaskellDepends = [ base mtl parsec ];
        description = "implementation accompanying a WFLP'19 paper";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ftdi" = callPackage
@@ -88582,6 +94513,8 @@ self: {
        ];
        description = "A thin layer over USB to communicate with FTDI chips";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ftp-client" = callPackage
@@ -88631,6 +94564,8 @@ self: {
        ];
        description = "FTP client package with conduit interface based off http-conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ftphs" = callPackage
@@ -88648,6 +94583,8 @@ self: {
        ];
        description = "FTP Client and Server Library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ftree" = callPackage
@@ -88677,6 +94614,8 @@ self: {
        ];
        description = "Shell interface to the FreeTheorems library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fugue" = callPackage
@@ -88699,6 +94638,8 @@ self: {
        libraryHaskellDepends = [ base ghc network ];
        description = "a monad for protocol-typed network programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "full-text-search" = callPackage
@@ -88738,6 +94679,8 @@ self: {
        ];
        description = "Simple sentence segmenter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funbot" = callPackage
@@ -88766,6 +94709,8 @@ self: {
        ];
        description = "IRC bot for fun, learning, creativity and collaboration";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funbot-client" = callPackage
@@ -88784,6 +94729,8 @@ self: {
        ];
        description = "Report events to FunBot over a JSON/HTTP API";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funbot-ext-events" = callPackage
@@ -88814,6 +94761,8 @@ self: {
        ];
        description = "Git hook which sends events to FunBot";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funcmp" = callPackage
@@ -88865,6 +94814,8 @@ self: {
        ];
        description = "call-by-value lambda-calculus with meta-programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funcons-simple" = callPackage
@@ -88880,6 +94831,8 @@ self: {
        executableHaskellDepends = [ base funcons-tools funcons-values ];
        description = "A modular interpreter for executing SIMPLE funcons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funcons-tools" = callPackage
@@ -88905,6 +94858,8 @@ self: {
        ];
        description = "A modular interpreter for executing funcons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funcons-values" = callPackage
@@ -88920,6 +94875,8 @@ self: {
        ];
        description = "Library providing values and operations on values in a fixed universe";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "function-builder" = callPackage
@@ -88943,6 +94900,8 @@ self: {
        libraryHaskellDepends = [ base data-type ];
        description = "Combining functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "function-instances-algebra" = callPackage
@@ -88954,6 +94913,8 @@ self: {
        libraryHaskellDepends = [ base numeric-prelude ];
        description = "Instances of the Algebra.* classes for functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functional-arrow" = callPackage
@@ -88965,6 +94926,8 @@ self: {
        libraryHaskellDepends = [ base HList ];
        description = "Combinators that allow for a more functional/monadic style of Arrow programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functional-kmp" = callPackage
@@ -88989,6 +94952,8 @@ self: {
        libraryHaskellDepends = [ base category ];
        description = "Functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functor-apply" = callPackage
@@ -89044,6 +95009,8 @@ self: {
        ];
        description = "Tools for functor combinator-based program design";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functor-combo" = callPackage
@@ -89071,6 +95038,8 @@ self: {
        libraryHaskellDepends = [ base recursion-schemes ];
        description = "Friendly helpers for your recursion schemes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functor-infix" = callPackage
@@ -89084,6 +95053,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functor-monadic" = callPackage
@@ -89106,6 +95077,8 @@ self: {
        libraryHaskellDepends = [ base microlens singletons text vinyl ];
        description = "General functor products for various Foldable instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functor-utils" = callPackage
@@ -89117,6 +95090,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim lens ];
        description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functorm" = callPackage
@@ -89128,6 +95103,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data.FunctorM (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functors" = callPackage
@@ -89178,6 +95155,8 @@ self: {
        ];
        description = "Workflows with arrows";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funflow-nix" = callPackage
@@ -89199,6 +95178,8 @@ self: {
        ];
        description = "Utility functions for using funflow with nix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fungll-combinators" = callPackage
@@ -89232,6 +95213,8 @@ self: {
        ];
        description = "A unioning file-system using HFuse";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funnyprint" = callPackage
@@ -89247,6 +95230,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion hscolour ipprint ];
        description = "funnyPrint function to colorize GHCi output";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funpat" = callPackage
@@ -89258,6 +95243,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A generalization of pattern matching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funsat" = callPackage
@@ -89279,6 +95266,8 @@ self: {
        ];
        description = "A modern DPLL-style SAT solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funspection" = callPackage
@@ -89290,6 +95279,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-level function utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fused-effects" = callPackage
@@ -89411,6 +95402,8 @@ self: {
        ];
        description = "Resumable exceptions for the fused-effects ecosystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fused-effects-squeal" = callPackage
@@ -89427,6 +95420,8 @@ self: {
        ];
        description = "A fused-effects adapter for squeal-postgresql";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fused-effects-th" = callPackage
@@ -89443,6 +95438,8 @@ self: {
        ];
        description = "Template Haskell helpers for fused-effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fusion" = callPackage
@@ -89457,6 +95454,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Effectful streaming library based on shortcut fusion techniques";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fusion-plugin" = callPackage
@@ -89549,6 +95548,8 @@ self: {
        executableHaskellDepends = [ base bytestring network unix ];
        description = "Simple IP-over-UDP tunnel using TUNTAP";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "future" = callPackage
@@ -89560,6 +95561,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Supposed to mimics and enhance proposed C++ \"future\" features";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "future-resource" = callPackage
@@ -89701,6 +95704,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "fuzzyset" = callPackage
@@ -89767,6 +95772,8 @@ self: {
        ];
        description = "Game engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fwgl-glfw" = callPackage
@@ -89783,6 +95790,8 @@ self: {
        ];
        description = "FWGL GLFW backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fwgl-javascript" = callPackage
@@ -89798,6 +95807,8 @@ self: {
        ];
        description = "FWGL GHCJS backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fx" = callPackage
@@ -89822,6 +95833,8 @@ self: {
        executableHaskellDepends = [ base HTTP json ];
        description = "Generate Gentoo ebuilds from NodeJS/npm packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "g2" = callPackage
@@ -89854,6 +95867,8 @@ self: {
        ];
        description = "Haskell symbolic execution engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "g2q" = callPackage
@@ -89865,6 +95880,8 @@ self: {
        libraryHaskellDepends = [ base g2 ];
        description = "G2Q allows constraint programming, via writing Haskell predicates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "g4ip" = callPackage
@@ -89877,6 +95894,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A theorem prover for propositional logic that uses G4ip";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "g4ip-prover" = callPackage
@@ -89911,6 +95930,8 @@ self: {
        ];
        description = "General Alignment Clustering Tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "galois-fft" = callPackage
@@ -89937,6 +95958,8 @@ self: {
        ];
        description = "FFTs over finite fields";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "galois-field" = callPackage
@@ -89962,6 +95985,8 @@ self: {
        ];
        description = "Galois field library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "game-of-life" = callPackage
@@ -89987,6 +96012,8 @@ self: {
        libraryHaskellDepends = [ base containers probability random ];
        description = "Simple probability library for dice rolls, card games and similar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "game-tree" = callPackage
@@ -90011,6 +96038,8 @@ self: {
        executableHaskellDepends = [ base cairo containers glib gtk time ];
        description = "Game clock that shows two analog clock faces";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gamgee" = callPackage
@@ -90041,6 +96070,8 @@ self: {
        ];
        description = "Tool for generating TOTP MFA tokens";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gamma" = callPackage
@@ -90061,6 +96092,8 @@ self: {
        ];
        description = "Gamma function and related functions";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gang-of-threads" = callPackage
@@ -90086,6 +96119,8 @@ self: {
        executableHaskellDepends = [ base haskeline transformers ];
        description = "reverse prefix notation calculator and calculation library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "garfield" = callPackage
@@ -90152,6 +96187,8 @@ self: {
        ];
        description = "Connect to gargoyle-managed postgresql instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gargoyle-postgresql-nix" = callPackage
@@ -90172,6 +96209,8 @@ self: {
        ];
        description = "Manage PostgreSQL servers with gargoyle and nix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "garlic-bread" = callPackage
@@ -90206,6 +96245,8 @@ self: {
        libraryHaskellDepends = [ base free transformers ];
        description = "Limit how many steps a program may take";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gasp" = callPackage
@@ -90228,6 +96269,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An applicative for parsing unordered things, heterogenous sorting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gauge" = callPackage
@@ -90262,6 +96305,8 @@ self: {
        ];
        description = "planar graph embedding into a plane";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gc" = callPackage
@@ -90289,6 +96334,8 @@ self: {
        ];
        description = "a wai application to show GHC.GCStats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gcodehs" = callPackage
@@ -90335,6 +96382,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gnome2) GConf;};
 
   "gd" = callPackage
@@ -90388,6 +96437,8 @@ self: {
        ];
        description = "API Wrapping for Coinbase's GDAX exchange";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gdelt" = callPackage
@@ -90428,6 +96479,8 @@ self: {
        ];
        description = "Generic diff for the instant-generics library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gdiff-th" = callPackage
@@ -90446,6 +96499,8 @@ self: {
        ];
        description = "Generate gdiff GADTs and Instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gdo" = callPackage
@@ -90508,6 +96563,8 @@ self: {
        testHaskellDepends = [ base hspec megaparsec text-all ];
        description = "Parser for the GEDCOM genealogy file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geek" = callPackage
@@ -90528,6 +96585,8 @@ self: {
        ];
        description = "Geek blog engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geek-server" = callPackage
@@ -90551,6 +96610,8 @@ self: {
        ];
        description = "Geek blog engine server";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gegl" = callPackage
@@ -90571,6 +96632,8 @@ self: {
        libraryPkgconfigDepends = [ gegl ];
        description = "Haskell bindings to GEGL library";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gegl;};
 
   "gelatin" = callPackage
@@ -90589,6 +96652,8 @@ self: {
        executableHaskellDepends = [ base linear mtl vector ];
        description = "A graphics description language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gelatin-freetype2" = callPackage
@@ -90606,6 +96671,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "FreeType2 based text rendering for the gelatin realtime rendering system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gelatin-fruity" = callPackage
@@ -90617,6 +96684,8 @@ self: {
        libraryHaskellDepends = [ base FontyFruity gelatin linear vector ];
        description = "Gelatin's support for rendering TTF outlines, using FontyFruity";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gelatin-gl" = callPackage
@@ -90638,6 +96707,8 @@ self: {
        executableHaskellDepends = [ base gelatin lens linear mtl vector ];
        description = "OpenGL rendering routines for the gelatin-picture graphics EDSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gelatin-sdl2" = callPackage
@@ -90655,6 +96726,8 @@ self: {
        executableHaskellDepends = [ base either filepath sdl2 ];
        description = "An SDL2 backend for the gelatin renderer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gelatin-shaders" = callPackage
@@ -90667,6 +96740,8 @@ self: {
        libraryHaskellDepends = [ base bytestring filepath gelatin ];
        description = "Gelatin's OpenGL shaders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gemini-router" = callPackage
@@ -90738,6 +96813,8 @@ self: {
        ];
        description = "A simple library of helpers for SDL+GL games";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gen-imports" = callPackage
@@ -90753,6 +96830,8 @@ self: {
        ];
        description = "Code to generate instances for the package \"ghc-instances\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gen-passwd" = callPackage
@@ -90770,6 +96849,8 @@ self: {
        ];
        description = "Create wordlist-based passwords easily";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gencheck" = callPackage
@@ -90786,6 +96867,8 @@ self: {
        ];
        description = "A testing framework inspired by QuickCheck and SmallCheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gender" = callPackage
@@ -90801,6 +96884,8 @@ self: {
        executableHaskellDepends = [ attoparsec base text ];
        description = "Identify a persons gender by their first name";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genders" = callPackage
@@ -90816,6 +96901,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec network vector ];
        description = "Bindings to libgenders";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {genders = null;};
 
   "gendocs" = callPackage
@@ -90861,6 +96948,8 @@ self: {
        ];
        description = "Prelude replacement using generalized type classes where possible";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generator" = callPackage
@@ -90872,6 +96961,8 @@ self: {
        libraryHaskellDepends = [ base List transformers ];
        description = "Python-generators notation for creation of monadic lists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generators" = callPackage
@@ -90883,6 +96974,8 @@ self: {
        libraryHaskellDepends = [ base mtl random ];
        description = "Actually useful monadic random value generators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-accessors" = callPackage
@@ -90902,6 +96995,8 @@ self: {
        ];
        description = "stringly-named getters for generic data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-aeson" = callPackage
@@ -90940,6 +97035,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ghc-prim ];
        description = "Generic Data.Binary derivation using GHC generics.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-church" = callPackage
@@ -90955,6 +97052,8 @@ self: {
        ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-constraints" = callPackage
@@ -91071,6 +97170,8 @@ self: {
        testHaskellDepends = [ array base bytestring hspec ];
        description = "An Enum class that fixes some deficiences with Prelude's Enum";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-env" = callPackage
@@ -91134,6 +97235,8 @@ self: {
        libraryHaskellDepends = [ base generic-lens ];
        description = "GHC.OverloadedLabels.IsLabel instance for lenses from ghc-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-lens-lite" = callPackage
@@ -91159,6 +97262,8 @@ self: {
        libraryHaskellDepends = [ base lucid text ];
        description = "General-purpose web page scaffold for Lucid";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-match" = callPackage
@@ -91191,6 +97296,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "A generic version of Data.Maybe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-monoid" = callPackage
@@ -91257,6 +97364,8 @@ self: {
        testHaskellDepends = [ aeson base generic-override hspec text ];
        description = "Provides orphan instances necessary for integrating generic-override and aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-pretty" = callPackage
@@ -91275,6 +97384,8 @@ self: {
        ];
        description = "Pretty printing for Generic value";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-random" = callPackage
@@ -91311,6 +97422,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Simple generic TCP/IP server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-storable" = callPackage
@@ -91323,6 +97436,8 @@ self: {
        testHaskellDepends = [ base ghc-prim hspec QuickCheck ];
        description = "Generic implementation of Storable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-tree" = callPackage
@@ -91334,6 +97449,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic Tree data type";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-trie" = callPackage
@@ -91347,6 +97464,8 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        description = "A map, where the keys may be complex structured data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-xml" = callPackage
@@ -91361,6 +97480,8 @@ self: {
        ];
        description = "Marshalling Haskell values to/from XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-xmlpickler" = callPackage
@@ -91375,6 +97496,8 @@ self: {
        testHaskellDepends = [ base hxt tasty tasty-hunit tasty-th ];
        description = "Generic generation of HXT XmlPickler instances using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generics-eot" = callPackage
@@ -91407,6 +97530,8 @@ self: {
        ];
        description = "Generic Programming with Mutually Recursive Sums of Products";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generics-mrsop-gdiff" = callPackage
@@ -91418,6 +97543,8 @@ self: {
        libraryHaskellDepends = [ base generics-mrsop ];
        description = "Reimplementation of the gdiff algorithm for generics-mrsop";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generics-sop" = callPackage
@@ -91462,6 +97589,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genesis" = callPackage
@@ -91489,6 +97618,8 @@ self: {
        ];
        description = "Opinionated bootstrapping for Haskell web services";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genesis-test" = callPackage
@@ -91512,6 +97643,8 @@ self: {
        ];
        description = "Opinionated bootstrapping for Haskell web services";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genetics" = callPackage
@@ -91525,6 +97658,8 @@ self: {
        executableHaskellDepends = [ base random-fu ];
        description = "A Genetic Algorithm library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geni-gui" = callPackage
@@ -91548,6 +97683,8 @@ self: {
        executableHaskellDepends = [ base GenI ];
        description = "GenI graphical user interface";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geni-util" = callPackage
@@ -91571,6 +97708,8 @@ self: {
        ];
        description = "Companion tools for use with the GenI surface realiser";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geniconvert" = callPackage
@@ -91590,6 +97729,8 @@ self: {
        ];
        description = "Conversion utility for the GenI generator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genifunctors" = callPackage
@@ -91613,6 +97754,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geniplate-mirror" = callPackage
@@ -91645,6 +97788,8 @@ self: {
        ];
        description = "Simple HTTP server for GenI results";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genprog" = callPackage
@@ -91656,6 +97801,8 @@ self: {
        libraryHaskellDepends = [ base MonadRandom syb syz ];
        description = "Genetic programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gentlemark" = callPackage
@@ -91668,6 +97815,8 @@ self: {
        testHaskellDepends = [ base HUnit parsec transformers ];
        description = "Gentle markup language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genvalidity" = callPackage
@@ -92165,6 +98314,8 @@ self: {
        ];
        description = "Performs geo location lookups and parses the results";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geo-uk" = callPackage
@@ -92223,6 +98374,8 @@ self: {
        ];
        description = "Geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geodetic-types" = callPackage
@@ -92234,6 +98387,8 @@ self: {
        libraryHaskellDepends = [ base dimensional lens semigroups ];
        description = "Types for geodetic operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geodetics" = callPackage
@@ -92312,6 +98467,8 @@ self: {
        libraryHaskellDepends = [ aeson base bson bytestring lens text ];
        description = "GeoJSON data types including JSON/BSON conversion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geolite-csv" = callPackage
@@ -92330,6 +98487,8 @@ self: {
        ];
        description = "Geolite CSV Parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geom2d" = callPackage
@@ -92342,6 +98501,8 @@ self: {
        testHaskellDepends = [ base ieee754 linear QuickCheck ];
        description = "package for geometry in euklidean 2d space";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geos" = callPackage
@@ -92362,6 +98523,8 @@ self: {
        testSystemDepends = [ geos_c ];
        description = "Bindings for GEOS";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {geos_c = null;};
 
   "getemx" = callPackage
@@ -92380,6 +98543,8 @@ self: {
        ];
        description = "Fetch from emusic using .emx files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "getflag" = callPackage
@@ -92391,6 +98556,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Command-line parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "getopt-generics" = callPackage
@@ -92470,6 +98637,8 @@ self: {
        executableHaskellDepends = [ base containers parsec ];
        description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gh-labeler" = callPackage
@@ -92487,6 +98656,8 @@ self: {
        ];
        description = "Github Standard Labeler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gh-pocket-knife" = callPackage
@@ -92644,6 +98815,8 @@ self: {
        ];
        description = "Override GHC error messages to the user's liking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-compact_0_1_0_0" = callPackage
@@ -92705,6 +98878,8 @@ self: {
        testHaskellDepends = [ base ghc ghc-paths ];
        description = "A small-step semantics for Core";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-datasize" = callPackage
@@ -92716,6 +98891,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ghc-heap ghc-prim ];
        description = "Determine the size of data structures in GHC's memory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-dump-core" = callPackage
@@ -92731,6 +98908,8 @@ self: {
        ];
        description = "An AST and compiler plugin for dumping GHC's Core representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-dump-tree" = callPackage
@@ -92755,6 +98934,8 @@ self: {
        ];
        description = "Dump GHC's parsed, renamed, and type checked ASTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-dump-util" = callPackage
@@ -92778,6 +98959,8 @@ self: {
        ];
        description = "Handy tools for working with @ghc-dump@ dumps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-dup" = callPackage
@@ -92789,6 +98972,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Explicitly prevent sharing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-events" = callPackage
@@ -92851,6 +99036,8 @@ self: {
        ];
        description = "Analyze and visualize event logs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-events-parallel" = callPackage
@@ -92874,6 +99061,8 @@ self: {
        ];
        description = "Library and tool for parsing .eventlog files from parallel GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-exactprint" = callPackage
@@ -92945,6 +99134,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Derived instances of GHC.Generic of the GHC AST";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-heap-view" = callPackage
@@ -93012,6 +99203,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-instances" = callPackage
@@ -93033,6 +99226,8 @@ self: {
        ];
        description = "Easily import all instances contained in GHC distributed libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-justdoit" = callPackage
@@ -93045,6 +99240,8 @@ self: {
        testHaskellDepends = [ base inspection-testing ];
        description = "A magic typeclass that just does it";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-lib" = callPackage
@@ -93131,6 +99328,8 @@ self: {
        executableHaskellDepends = [ base parsec process ];
        description = "Generate a bash completion from the GHC manpage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-mod" = callPackage
@@ -93177,6 +99376,8 @@ self: {
        ];
        description = "Happy Haskell Hacking";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-mtl" = callPackage
@@ -93240,6 +99441,8 @@ self: {
        ];
        description = "A parallel wrapper for 'ghc --make'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-parser" = callPackage
@@ -93283,6 +99486,8 @@ self: {
        ];
        description = "Simple utility to fix BROKEN package dependencies for cabal-install";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-pkg-lib" = callPackage
@@ -93297,6 +99502,8 @@ self: {
        ];
        description = "Provide library support for ghc-pkg information";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-plugs-out" = callPackage
@@ -93312,6 +99519,8 @@ self: {
        doHaddock = false;
        description = "Type checker plugins without the type checking";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-prim_0_6_1" = callPackage
@@ -93403,6 +99612,8 @@ self: {
        testHaskellDepends = [ base transformers ];
        description = "GHC plugin to prove program equations by simplification";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-server" = callPackage
@@ -93433,6 +99644,8 @@ self: {
        executableHaskellDepends = [ base transformers ];
        description = "Simplified GHC API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-simple" = callPackage
@@ -93448,6 +99661,8 @@ self: {
        ];
        description = "Simplified interface to the GHC API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-source-gen" = callPackage
@@ -93475,6 +99690,8 @@ self: {
        libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-syb" = callPackage
@@ -93486,6 +99703,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Data and Typeable instances for the GHC API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-syb-utils" = callPackage
@@ -93497,6 +99716,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ghc syb ];
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-syntax-highlighter" = callPackage
@@ -93541,6 +99762,8 @@ self: {
        ];
        description = "a library to work with tags created from Haskell parsed tree";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-tags-plugin" = callPackage
@@ -93562,6 +99785,8 @@ self: {
        ];
        description = "A compiler plugin which generates tags file from GHC parsed syntax tree";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-tcplugins-extra_0_3_2" = callPackage
@@ -93604,6 +99829,8 @@ self: {
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-timers" = callPackage
@@ -93720,6 +99947,8 @@ self: {
        executableHaskellDepends = [ base ghc-paths unix ];
        description = "Print minimal export lists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-vis" = callPackage
@@ -93738,6 +99967,8 @@ self: {
        ];
        description = "Live visualization of data structures in GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcflags" = callPackage
@@ -93792,6 +100023,8 @@ self: {
        ];
        description = "ghci-dap is a GHCi having DAP interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-diagrams" = callPackage
@@ -93803,6 +100036,8 @@ self: {
        libraryHaskellDepends = [ base cairo colour diagrams gtk ];
        description = "Display simple diagrams from ghci";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-haskeline" = callPackage
@@ -93821,6 +100056,8 @@ self: {
        ];
        description = "An implementation of ghci using the Haskeline line-input library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-hexcalc" = callPackage
@@ -93845,6 +100082,8 @@ self: {
        testHaskellDepends = [ base doctest hspec parsec ];
        description = "parse output of ghci \":history\" command";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-lib" = callPackage
@@ -93856,6 +100095,8 @@ self: {
        libraryHaskellDepends = [ base ghc MissingH ];
        description = "A library for interactively evaluating Haskell code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-ng" = callPackage
@@ -93877,6 +100118,8 @@ self: {
        ];
        description = "Next generation GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-pretty" = callPackage
@@ -93888,6 +100131,8 @@ self: {
        libraryHaskellDepends = [ base hscolour ipprint ];
        description = "colored pretty-printing within ghci";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-websockets" = callPackage
@@ -94114,6 +100359,8 @@ self: {
        sha256 = "02m0qszdl3kxyhjrzj1ph9gwbr9jkzak2v1b47v6ywsm7hmjgn7w";
        description = "DOM library using JSFFI and GHCJS";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcjs-dom-webkit" = callPackage
@@ -94146,6 +100393,8 @@ self: {
        ];
        description = "GHCJS bindings for the JavaScript Fetch API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcjs-hplay" = callPackage
@@ -94162,6 +100411,8 @@ self: {
        ];
        description = "Client-side web EDSL for transient nodes running in the web browser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcjs-perch" = callPackage
@@ -94184,6 +100435,8 @@ self: {
        libraryHaskellDepends = [ base ghcjs-base protolude ];
        description = "Bidirectional bidings to javascript's promise";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcjs-vdom" = callPackage
@@ -94232,6 +100485,8 @@ self: {
        libraryHaskellDepends = [ base ghcjs-base text ];
        description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghclive" = callPackage
@@ -94258,6 +100513,8 @@ self: {
        ];
        description = "Interactive Haskell interpreter in a browser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcprofview" = callPackage
@@ -94276,6 +100533,8 @@ self: {
        ];
        description = "GHC .prof files viewer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghczdecode" = callPackage
@@ -94324,6 +100583,8 @@ self: {
        ];
        description = "Trivial routines for inspecting git repositories";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gi-atk" = callPackage
@@ -94381,6 +100642,8 @@ self: {
        ];
        description = "Bridge between packages gi-* and cairo-core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gi-cairo-connector" = callPackage
@@ -94687,6 +100950,8 @@ self: {
        libraryPkgconfigDepends = [ graphene-gobject ];
        description = "Graphene bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {graphene-gobject = null;};
 
   "gi-gsk" = callPackage
@@ -94711,6 +100976,8 @@ self: {
        libraryPkgconfigDepends = [ gtk4 ];
        description = "Gsk bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gtk4 = null;};
 
   "gi-gst" = callPackage
@@ -94751,6 +101018,8 @@ self: {
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerAudio bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstbase" = callPackage
@@ -94796,6 +101065,8 @@ self: {
        libraryPkgconfigDepends = [ gstreamer-pbutils ];
        description = "GStreamer Plugins Base Utils bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gstreamer-pbutils = null;};
 
   "gi-gsttag" = callPackage
@@ -94817,6 +101088,8 @@ self: {
        libraryPkgconfigDepends = [ gstreamer-tag ];
        description = "GStreamer Tag bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gstreamer-tag = null;};
 
   "gi-gstvideo" = callPackage
@@ -94911,6 +101184,8 @@ self: {
        ];
        description = "Declarative GTK+ programming in Haskell";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gi-gtk-declarative-app-simple" = callPackage
@@ -94929,6 +101204,8 @@ self: {
        ];
        description = "Declarative GTK+ programming in Haskell in the style of Pux";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gi-gtk-hs" = callPackage
@@ -94967,6 +101244,8 @@ self: {
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        description = "GtkosxApplication bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gtk-mac-integration-gtk3 = null;};
 
   "gi-gtksheet" = callPackage
@@ -94991,6 +101270,8 @@ self: {
        libraryPkgconfigDepends = [ gtksheet ];
        description = "GtkSheet bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gtksheet = null;};
 
   "gi-gtksource" = callPackage
@@ -95039,6 +101320,8 @@ self: {
        libraryPkgconfigDepends = [ libhandy ];
        description = "libhandy bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libhandy;};
 
   "gi-harfbuzz" = callPackage
@@ -95214,6 +101497,8 @@ self: {
        libraryPkgconfigDepends = [ poppler ];
        description = "Poppler bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) poppler;};
 
   "gi-secret" = callPackage
@@ -95376,6 +101661,8 @@ self: {
        libraryPkgconfigDepends = [ libwnck ];
        description = "Wnck bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libwnck;};
 
   "gi-xlib" = callPackage
@@ -95414,6 +101701,8 @@ self: {
        ];
        description = "Fuzzy finder for cabal executables";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gimlh" = callPackage
@@ -95501,6 +101790,8 @@ self: {
        executableSystemDepends = [ openssl ];
        description = "Ginsu Gale Client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "gio" = callPackage
@@ -95541,6 +101832,8 @@ self: {
        ];
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "giphy-api" = callPackage
@@ -95566,6 +101859,8 @@ self: {
        ];
        description = "Giphy HTTP API wrapper and CLI search tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gist" = callPackage
@@ -95583,6 +101878,8 @@ self: {
        ];
        description = "A reliable command-line client for gist.github.com";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git" = callPackage
@@ -95607,6 +101904,8 @@ self: {
        doCheck = false;
        description = "Git operations in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-all" = callPackage
@@ -95625,6 +101924,8 @@ self: {
        ];
        description = "Determine which Git repositories need actions to be taken";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-annex" = callPackage
@@ -95738,6 +102039,8 @@ self: {
        ];
        description = "Maintain per-branch checklists in Git";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-config" = callPackage
@@ -95759,6 +102062,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A simple parser for Git configuration files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-cuk" = callPackage
@@ -95778,6 +102083,8 @@ self: {
        executableHaskellDepends = [ base relude ];
        description = "Haskell Git Helper Tool";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-date" = callPackage
@@ -95798,6 +102105,8 @@ self: {
        ];
        description = "Bindings to the date parsing from Git";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-embed" = callPackage
@@ -95835,6 +102144,8 @@ self: {
        ];
        description = "Custom git command for formatting code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-freq" = callPackage
@@ -95877,6 +102188,8 @@ self: {
        ];
        description = "More intelligent push-to-GitHub utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-jump" = callPackage
@@ -95890,6 +102203,8 @@ self: {
        executableHaskellDepends = [ base base-compat process ];
        description = "Move a git branch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-lfs" = callPackage
@@ -95947,6 +102262,8 @@ self: {
        ];
        description = "Passively snapshots working tree changes efficiently";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-object" = callPackage
@@ -95963,6 +102280,8 @@ self: {
        ];
        description = "Git object and its parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-remote-ipfs" = callPackage
@@ -96024,6 +102343,8 @@ self: {
        ];
        description = "repairs a damaged git repository";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-sanity" = callPackage
@@ -96043,6 +102364,8 @@ self: {
        executableHaskellDepends = [ base Cabal ];
        description = "A sanity checker for your git history";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-vogue" = callPackage
@@ -96072,6 +102395,8 @@ self: {
        testToolDepends = [ git ];
        description = "A framework for pre-commit checks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitHUD" = callPackage
@@ -96127,6 +102452,8 @@ self: {
        ];
        description = "Create Github issues out of TODO comments in code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "githash" = callPackage
@@ -96203,6 +102530,8 @@ self: {
        executableToolDepends = [ git ];
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) git;};
 
   "github-data" = callPackage
@@ -96228,6 +102557,8 @@ self: {
        ];
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "github-post-receive" = callPackage
@@ -96327,6 +102658,8 @@ self: {
        ];
        description = "Various Github helper utilities";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "github-types" = callPackage
@@ -96357,6 +102690,8 @@ self: {
        libraryHaskellDepends = [ base basic-prelude github text ];
        description = "Useful functions that use the GitHub API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "github-webhook-handler" = callPackage
@@ -96375,6 +102710,8 @@ self: {
        ];
        description = "GitHub WebHook Handler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "github-webhook-handler-snap" = callPackage
@@ -96393,6 +102730,8 @@ self: {
        ];
        description = "GitHub WebHook Handler implementation for Snap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "github-webhooks" = callPackage
@@ -96436,6 +102775,8 @@ self: {
        ];
        description = "Heads up, and you see your GIT context";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitignore" = callPackage
@@ -96454,6 +102795,8 @@ self: {
        ];
        description = "Apply GitHub .gitignore templates to already existing repositories.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitit" = callPackage
@@ -96490,6 +102833,8 @@ self: {
        ];
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlab-api" = callPackage
@@ -96506,6 +102851,8 @@ self: {
        testHaskellDepends = [ base hspec rio ];
        description = "Gitlab Web API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlab-haskell" = callPackage
@@ -96547,6 +102894,8 @@ self: {
        ];
        description = "API library for working with Git repositories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-cmdline" = callPackage
@@ -96574,6 +102923,8 @@ self: {
        ];
        description = "Gitlib repository backend that uses the git command-line tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-cross" = callPackage
@@ -96591,6 +102942,8 @@ self: {
        ];
        description = "Run tests between repositories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-libgit2" = callPackage
@@ -96617,6 +102970,8 @@ self: {
        ];
        description = "Libgit2 backend for gitlib";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-s3" = callPackage
@@ -96646,6 +103001,8 @@ self: {
        ];
        description = "Gitlib repository backend for storing Git objects in Amazon S3";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-sample" = callPackage
@@ -96659,6 +103016,8 @@ self: {
        ];
        description = "Sample backend for gitlib showing the basic structure for any backend";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-test" = callPackage
@@ -96677,6 +103036,8 @@ self: {
        ];
        description = "Test library for confirming gitlib backend compliance";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-utils" = callPackage
@@ -96695,6 +103056,8 @@ self: {
        ];
        description = "Generic utility functions for working with Git repositories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitrev" = callPackage
@@ -96735,6 +103098,8 @@ self: {
        ];
        description = "A document store library for Git + JSON";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitter" = callPackage
@@ -96750,6 +103115,8 @@ self: {
        ];
        description = "Gitter.im API client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "givegif" = callPackage
@@ -96777,6 +103144,8 @@ self: {
        ];
        description = "CLI Giphy search tool with previews in iTerm 2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gjk" = callPackage
@@ -96864,6 +103233,8 @@ self: {
        libraryPkgconfigDepends = [ libglade ];
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gnome2) libglade;};
 
   "gladexml-accessor" = callPackage
@@ -96875,6 +103246,8 @@ self: {
        libraryHaskellDepends = [ base glade HaXml template-haskell ];
        description = "Automagically declares getters for widget handles in specified interface file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glambda" = callPackage
@@ -96915,6 +103288,8 @@ self: {
        ];
        description = "An OpenGL micro framework";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glasso" = callPackage
@@ -96960,6 +103335,8 @@ self: {
        ];
        description = "Extensible effects using ContT, State and variants";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glazier-pipes" = callPackage
@@ -96975,6 +103352,8 @@ self: {
        ];
        description = "A threaded rendering framework using glaizer and pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glazier-react" = callPackage
@@ -96994,6 +103373,8 @@ self: {
        ];
        description = "ReactJS binding using Glazier.Command.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glazier-react-examples" = callPackage
@@ -97018,6 +103399,8 @@ self: {
        ];
        description = "Examples of using glazier-react";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glazier-react-widget" = callPackage
@@ -97037,6 +103420,8 @@ self: {
        ];
        description = "Generic widget library using glazier-react";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gli" = callPackage
@@ -97061,6 +103446,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Tiny cli to fetch PR info from gitlab";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glib" = callPackage
@@ -97094,6 +103481,8 @@ self: {
        testHaskellDepends = [ base data-default hspec lens QuickCheck ];
        description = "Glicko-2 implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glider-nlp" = callPackage
@@ -97106,6 +103495,8 @@ self: {
        testHaskellDepends = [ base Cabal containers hspec text ];
        description = "Natural Language Processing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glintcollider" = callPackage
@@ -97183,6 +103574,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion Glob MissingH ];
        description = "Haskell bindings for POSIX glob library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "global" = callPackage
@@ -97200,6 +103593,8 @@ self: {
        ];
        description = "Library enabling unique top-level declarations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "global-config" = callPackage
@@ -97220,6 +103615,8 @@ self: {
        ];
        description = "Global mutable configuration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "global-lock" = callPackage
@@ -97242,6 +103639,8 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        description = "Namespaced, global, and top-level mutable variables without unsafePerformIO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glome-hs" = callPackage
@@ -97265,6 +103664,8 @@ self: {
        doHaddock = false;
        description = "ray tracer";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss" = callPackage
@@ -97319,6 +103720,8 @@ self: {
        libraryHaskellDepends = [ base gloss reactive-banana ];
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-devil" = callPackage
@@ -97330,6 +103733,8 @@ self: {
        libraryHaskellDepends = [ base bytestring gloss repa repa-devil ];
        description = "Display images in Gloss using libdevil for decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-examples" = callPackage
@@ -97349,6 +103754,8 @@ self: {
        ];
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-export" = callPackage
@@ -97368,6 +103775,8 @@ self: {
        testHaskellDepends = [ base directory filepath gloss JuicyPixels ];
        description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-game" = callPackage
@@ -97379,6 +103788,8 @@ self: {
        libraryHaskellDepends = [ base gloss gloss-juicy ];
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-juicy" = callPackage
@@ -97457,6 +103868,8 @@ self: {
        libraryHaskellDepends = [ base gloss sodium ];
        description = "A Sodium interface to the Gloss drawing package";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glpk-headers" = callPackage
@@ -97493,6 +103906,8 @@ self: {
        ];
        description = "Comprehensive GLPK linear programming bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) glpk;};
 
   "gltf-codec" = callPackage
@@ -97511,6 +103926,8 @@ self: {
        testHaskellDepends = [ base bytestring directory filepath shower ];
        description = "glTF scene loader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glue" = callPackage
@@ -97540,6 +103957,8 @@ self: {
        ];
        description = "Make better services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glue-common" = callPackage
@@ -97660,6 +104079,8 @@ self: {
        ];
        description = "Composable maps and generic tries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gmndl" = callPackage
@@ -97678,6 +104099,8 @@ self: {
        ];
        description = "Mandelbrot Set explorer using GTK";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gmpint" = callPackage
@@ -97705,6 +104128,8 @@ self: {
        ];
        description = "Randomly set a picture as the GNOME desktop background";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gnome-keyring" = callPackage
@@ -97739,6 +104164,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME Virtual File System library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gnome-vfs = null; gnome-vfs_module = null;};
 
   "gnss-converters" = callPackage
@@ -97766,6 +104193,8 @@ self: {
        ];
        description = "GNSS Converters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gnuidn" = callPackage
@@ -97788,6 +104217,8 @@ self: {
        testToolDepends = [ c2hs ];
        description = "Bindings for GNU IDN";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libidn;};
 
   "gnuplot" = callPackage
@@ -97837,6 +104268,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        description = "GHCi bindings to lambdabot";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goal-core" = callPackage
@@ -97856,6 +104289,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Core imports for Geometric Optimization Libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goal-geometry" = callPackage
@@ -97870,6 +104305,8 @@ self: {
        executableHaskellDepends = [ base goal-core ];
        description = "Scientific computing on geometric objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goal-probability" = callPackage
@@ -97889,6 +104326,8 @@ self: {
        executableHaskellDepends = [ base goal-core goal-geometry vector ];
        description = "Manifolds of probability distributions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goal-simulation" = callPackage
@@ -97912,6 +104351,8 @@ self: {
        ];
        description = "Mealy based simulation tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goat" = callPackage
@@ -97946,6 +104387,8 @@ self: {
        testHaskellDepends = [ base containers HUnit mtl parsec ];
        description = "A monadic take on a 2,500-year-old board game - library";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goatee-gtk" = callPackage
@@ -97966,6 +104409,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "A monadic take on a 2,500-year-old board game - GTK+ UI";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gochan" = callPackage
@@ -97987,6 +104432,8 @@ self: {
        testHaskellDepends = [ base hspec hspec-core ];
        description = "Go-style channels";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "godot-haskell" = callPackage
@@ -98009,6 +104456,8 @@ self: {
        doHaddock = false;
        description = "Haskell bindings for the Godot game engine API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gofer-prelude" = callPackage
@@ -98020,6 +104469,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "The Gofer 2.30 standard prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goggles" = callPackage
@@ -100297,6 +106748,8 @@ self: {
        ];
        description = "A lightweight golden test runner";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gooey" = callPackage
@@ -100308,6 +106761,8 @@ self: {
        libraryHaskellDepends = [ base renderable transformers varying ];
        description = "Graphical user interfaces that are renderable, change over time and eventually produce a value";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-cloud" = callPackage
@@ -100327,6 +106782,8 @@ self: {
        ];
        description = "Client for the Google Cloud APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-dictionary" = callPackage
@@ -100361,6 +106818,8 @@ self: {
        ];
        description = "Google Drive API access";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-html5-slide" = callPackage
@@ -100379,6 +106838,8 @@ self: {
        ];
        description = "Google HTML5 Slide generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-isbn" = callPackage
@@ -100409,6 +106870,8 @@ self: {
        testHaskellDepends = [ base google-search text time xml-conduit ];
        description = "Write GMail filters and output to importable XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-maps-geocoding" = callPackage
@@ -100425,6 +106888,8 @@ self: {
        ];
        description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-oauth2" = callPackage
@@ -100445,6 +106910,8 @@ self: {
        ];
        description = "Google OAuth2 token negotiation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-oauth2-easy" = callPackage
@@ -100464,6 +106931,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Opininated use of Google Authentication for ease";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-oauth2-for-cli" = callPackage
@@ -100496,6 +106965,8 @@ self: {
        ];
        description = "Get a signed JWT for Google Service Accounts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-search" = callPackage
@@ -100507,6 +106978,8 @@ self: {
        libraryHaskellDepends = [ base free nats text time ];
        description = "EDSL for Google and GMail search expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-server-api" = callPackage
@@ -100530,6 +107003,8 @@ self: {
        ];
        description = "Google APIs for server to server applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-static-maps" = callPackage
@@ -100549,6 +107024,8 @@ self: {
        ];
        description = "Bindings to the Google Maps Static API (formerly Static Maps API)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-translate" = callPackage
@@ -100565,6 +107042,8 @@ self: {
        ];
        description = "Google Translate API bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "googleplus" = callPackage
@@ -100582,6 +107061,8 @@ self: {
        ];
        description = "Haskell implementation of the Google+ API v1";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "googlepolyline" = callPackage
@@ -100600,6 +107081,8 @@ self: {
        ];
        description = "Google Polyline Encoder/Decoder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gopher-proxy" = callPackage
@@ -100637,6 +107120,8 @@ self: {
        ];
        description = "Spidering robot to download files from Gopherspace";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gopro-plus" = callPackage
@@ -100665,6 +107150,8 @@ self: {
        ];
        description = "GoPro Plus Client API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash" = callPackage
@@ -100683,6 +107170,8 @@ self: {
        ];
        description = "Core of FRP game engine called Gore&Ash";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-actor" = callPackage
@@ -100700,6 +107189,8 @@ self: {
        ];
        description = "Gore&Ash engine extension that implements actor style of programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-async" = callPackage
@@ -100722,6 +107213,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "gore-and-ash-demo" = callPackage
@@ -100747,6 +107240,8 @@ self: {
        ];
        description = "Demonstration game for Gore&Ash game engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-glfw" = callPackage
@@ -100763,6 +107258,8 @@ self: {
        ];
        description = "Core module for Gore&Ash engine for GLFW input events";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-lambdacube" = callPackage
@@ -100782,6 +107279,8 @@ self: {
        ];
        description = "Core module for Gore&Ash engine that do something";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-logging" = callPackage
@@ -100800,6 +107299,8 @@ self: {
        ];
        description = "Core module for gore-and-ash with logging utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-network" = callPackage
@@ -100821,6 +107322,8 @@ self: {
        ];
        description = "Core module for Gore&Ash engine with low level network API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-sdl" = callPackage
@@ -100839,6 +107342,8 @@ self: {
        ];
        description = "Gore&Ash core module for integration with SDL library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-sync" = callPackage
@@ -100858,6 +107363,8 @@ self: {
        ];
        description = "Gore&Ash module for high level network synchronization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gothic" = callPackage
@@ -100915,6 +107422,8 @@ self: {
        ];
        description = "Generic Programming Use in Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gpcsets" = callPackage
@@ -100979,6 +107488,8 @@ self: {
        ];
        description = "For manipulating GPS coordinates and trails";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gps2htmlReport" = callPackage
@@ -100999,6 +107510,8 @@ self: {
        ];
        description = "GPS to HTML Summary Report";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gpx-conduit" = callPackage
@@ -101015,6 +107528,8 @@ self: {
        ];
        description = "Read GPX files using conduits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grab" = callPackage
@@ -101028,6 +107543,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Applicative non-linear consumption";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grab-form" = callPackage
@@ -101040,6 +107557,8 @@ self: {
        testHaskellDepends = [ base containers hedgehog text ];
        description = "Applicative parsers for form parameter lists";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graceful" = callPackage
@@ -101056,6 +107575,8 @@ self: {
        ];
        description = "Library to write graceful shutdown / upgrade service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grafana" = callPackage
@@ -101074,6 +107595,8 @@ self: {
        ];
        description = "API for creating grafana dashboards represented as json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graflog" = callPackage
@@ -101092,6 +107615,8 @@ self: {
        ];
        description = "Monadic correlated log events";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grakn" = callPackage
@@ -101115,6 +107640,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A Haskell client for Grakn";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grammar-combinators" = callPackage
@@ -101132,6 +107659,8 @@ self: {
        ];
        description = "A parsing library of context-free grammar combinators";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grammatical-parsers" = callPackage
@@ -101167,6 +107696,8 @@ self: {
        ];
        description = "parsers that combine into grammars";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grapefruit-examples" = callPackage
@@ -101183,6 +107714,8 @@ self: {
        ];
        description = "Examples using the Grapefruit library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grapefruit-frp" = callPackage
@@ -101200,6 +107733,8 @@ self: {
        ];
        description = "Functional Reactive Programming core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grapefruit-records" = callPackage
@@ -101211,6 +107746,8 @@ self: {
        libraryHaskellDepends = [ arrows base grapefruit-frp ];
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grapefruit-ui" = callPackage
@@ -101229,6 +107766,8 @@ self: {
        ];
        description = "Declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grapefruit-ui-gtk" = callPackage
@@ -101248,6 +107787,8 @@ self: {
        ];
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph" = callPackage
@@ -101282,6 +107823,8 @@ self: {
        ];
        description = "Fast, memory efficient and persistent graph implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-generators" = callPackage
@@ -101317,6 +107860,8 @@ self: {
        libraryHaskellDepends = [ base containers fgl ];
        description = "An implementation of algorithms for matchings in graphs";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting" = callPackage
@@ -101330,6 +107875,8 @@ self: {
        ];
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-cl" = callPackage
@@ -101349,6 +107896,8 @@ self: {
        ];
        description = "Interactive graph rewriting system implementing various well-known combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-gl" = callPackage
@@ -101365,6 +107914,8 @@ self: {
        ];
        description = "OpenGL interface for interactive port graph rewriting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-lambdascope" = callPackage
@@ -101386,6 +107937,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "graph-rewriting-layout" = callPackage
@@ -101401,6 +107954,8 @@ self: {
        ];
        description = "Force-directed node placement intended for incremental graph drawing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-ski" = callPackage
@@ -101420,6 +107975,8 @@ self: {
        ];
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-strategies" = callPackage
@@ -101435,6 +107992,8 @@ self: {
        ];
        description = "Evaluation strategies for port-graph rewriting systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-trs" = callPackage
@@ -101456,6 +108015,8 @@ self: {
        ];
        description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-ww" = callPackage
@@ -101476,6 +108037,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "graph-serialize" = callPackage
@@ -101487,6 +108050,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "Serialization of data structures with references";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-utils" = callPackage
@@ -101502,6 +108067,8 @@ self: {
        ];
        description = "A simple wrapper & quasi quoter for fgl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-visit" = callPackage
@@ -101517,6 +108084,8 @@ self: {
        ];
        description = "Graph walk abstraction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-wrapper" = callPackage
@@ -101550,6 +108119,8 @@ self: {
        ];
        description = "A declarative, monadic graph construction language for small graphs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphene" = callPackage
@@ -101566,6 +108137,8 @@ self: {
        ];
        description = "A minimal Graph Theory library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphics-drawingcombinators" = callPackage
@@ -101583,6 +108156,8 @@ self: {
        ];
        description = "A functional interface to 2D drawing in OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphics-formats-collada" = callPackage
@@ -101598,6 +108173,8 @@ self: {
        ];
        description = "Load 3D geometry in the COLLADA format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphicsFormats" = callPackage
@@ -101609,6 +108186,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ];
        description = "Classes for renderable objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphicstools" = callPackage
@@ -101627,6 +108206,8 @@ self: {
        executableHaskellDepends = [ base CV wx wxcore ];
        description = "Tools for creating graphical UIs, based on wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphite" = callPackage
@@ -101683,6 +108264,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A reimplementation of graphmod as a source plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphql" = callPackage
@@ -101707,6 +108290,8 @@ self: {
        ];
        description = "Haskell GraphQL implementation";
        license = "MPL-2.0 AND BSD-3-Clause";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphql-api" = callPackage
@@ -101736,6 +108321,8 @@ self: {
        ];
        description = "GraphQL API";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphql-client" = callPackage
@@ -101766,6 +108353,8 @@ self: {
        ];
        description = "A client for Haskell programs to query a GraphQL API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphql-utils" = callPackage
@@ -101781,6 +108370,8 @@ self: {
        ];
        description = "GraphQL Utils";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphql-w-persistent" = callPackage
@@ -101792,6 +108383,8 @@ self: {
        libraryHaskellDepends = [ base containers json text ];
        description = "GraphQL interface middleware for SQL databases";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphs" = callPackage
@@ -101820,6 +108413,8 @@ self: {
        libraryHaskellDepends = [ base indexed ];
        description = "Graph indexed monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphtype" = callPackage
@@ -101837,6 +108432,8 @@ self: {
        ];
        description = "A simple tool to illustrate dependencies between Haskell types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphula" = callPackage
@@ -101864,6 +108461,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A declarative library for describing dependencies between data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphula-core" = callPackage
@@ -101891,6 +108490,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A declarative library for describing dependencies between data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphviz" = callPackage
@@ -101934,6 +108535,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Execute Graql queries on a Grakn graph";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grasp" = callPackage
@@ -101958,6 +108561,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "GRASP implementation for the AMMM project";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gravatar" = callPackage
@@ -101986,6 +108591,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Gray code encoder/decoder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gray-extended" = callPackage
@@ -102038,6 +108645,8 @@ self: {
        executableHaskellDepends = [ array base containers pretty ];
        description = "GreenCard, a foreign function pre-processor for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "greencard-lib" = callPackage
@@ -102050,6 +108659,8 @@ self: {
        libraryHaskellDepends = [ array base containers greencard pretty ];
        description = "A foreign function interface pre-processor library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "greenclip" = callPackage
@@ -102070,6 +108681,8 @@ self: {
        executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ];
        description = "Simple clipboard manager to be integrated with rofi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; 
          inherit (pkgs) xlibsWrapper;};
 
@@ -102086,6 +108699,8 @@ self: {
        ];
        description = "A scalable distributed logger with a high-precision global time axis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gremlin-haskell" = callPackage
@@ -102109,6 +108724,8 @@ self: {
        testHaskellDepends = [ aeson-qq base hspec lens lens-aeson mtl ];
        description = "Graph database client for TinkerPop3 Gremlin Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grenade" = callPackage
@@ -102132,6 +108749,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion hmatrix ];
        description = "Practical Deep Learning in Haskell";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "greplicate" = callPackage
@@ -102251,6 +108870,8 @@ self: {
        ];
        description = "Grid-based prototyping framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gridbounds" = callPackage
@@ -102263,6 +108884,8 @@ self: {
        testHaskellDepends = [ base earclipper gjk gridbox hspec ];
        description = "Collision detection for GridBox";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gridbox" = callPackage
@@ -102311,6 +108934,8 @@ self: {
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grids" = callPackage
@@ -102354,6 +108979,8 @@ self: {
        executableToolDepends = [ happy ];
        description = "grm grammar converter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "groom" = callPackage
@@ -102417,6 +109044,8 @@ self: {
        ];
        description = "Command line utility to manage AWS ECS resources";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gross" = callPackage
@@ -102431,6 +109060,8 @@ self: {
        executableHaskellDepends = [ base lens mtl ncurses ];
        description = "A spoof on gloss for terminal animation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "groundhog" = callPackage
@@ -102468,6 +109099,8 @@ self: {
        ];
        description = "Extended Converter Library for groundhog embedded types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "groundhog-inspector" = callPackage
@@ -102593,6 +109226,8 @@ self: {
        ];
        description = "Classify objects by key-generating function, like SQL GROUP BY";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "groupBy" = callPackage
@@ -102625,6 +109260,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "groupoid" = callPackage
@@ -102670,6 +109307,8 @@ self: {
        libraryHaskellDepends = [ base generic-data groups ];
        description = "Generically derive Group instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "growler" = callPackage
@@ -102691,6 +109330,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "grpc-api-etcd" = callPackage
@@ -102702,6 +109343,8 @@ self: {
        libraryHaskellDepends = [ base proto-lens proto-lens-runtime ];
        description = "Generated messages and instances for etcd gRPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grpc-etcd-client" = callPackage
@@ -102718,6 +109361,8 @@ self: {
        ];
        description = "gRPC client for etcd";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grpc-haskell" = callPackage
@@ -102746,6 +109391,8 @@ self: {
        ];
        description = "Haskell implementation of gRPC layered on shared C library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grpc-haskell-core" = callPackage
@@ -102771,6 +109418,8 @@ self: {
        ];
        description = "Haskell implementation of gRPC layered on shared C library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gpr = null; inherit (pkgs) grpc;};
 
   "gruff" = callPackage
@@ -102792,6 +109441,8 @@ self: {
        ];
        description = "fractal explorer GUI using the ruff library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gruff-examples" = callPackage
@@ -102810,6 +109461,8 @@ self: {
        ];
        description = "Mandelbrot Set examples using ruff and gruff";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gsasl" = callPackage
@@ -102855,6 +109508,8 @@ self: {
        ];
        description = "scrapes google scholar, provides RSS feed";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gsl-random" = callPackage
@@ -102867,6 +109522,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Bindings the the GSL random number generation facilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gsl-random-fu" = callPackage
@@ -102878,6 +109535,8 @@ self: {
        libraryHaskellDepends = [ base gsl-random random-fu ];
        description = "Instances for using gsl-random with random-fu";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gsmenu" = callPackage
@@ -102942,6 +109601,8 @@ self: {
        ];
        description = "Generic implementation of Storable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gstreamer" = callPackage
@@ -102961,6 +109622,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gst-plugins-base = null; gstreamer = null;};
 
   "gt-tools" = callPackage
@@ -102994,6 +109657,8 @@ self: {
        ];
        description = "The General Transit Feed Specification format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtfs-realtime" = callPackage
@@ -103009,6 +109674,8 @@ self: {
        ];
        description = "GTFS RealTime protobafs library (autogenerated from .proto file)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtk" = callPackage
@@ -103103,6 +109770,8 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        description = "GTK+ Serialized event";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk2;};
 
   "gtk-simple-list-view" = callPackage
@@ -103177,6 +109846,8 @@ self: {
        libraryHaskellDepends = [ base containers gtk ];
        description = "Convenient Gtk canvas with mouse and keyboard input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtk-traymanager" = callPackage
@@ -103328,6 +109999,8 @@ self: {
        executableHaskellDepends = [ base glib gtk3 transformers ];
        description = "Gtk2Hs Hello World, an example package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtk2hs-rpn" = callPackage
@@ -103339,6 +110012,8 @@ self: {
        libraryHaskellDepends = [ base cairo glib gtk mtl ];
        description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtk3" = callPackage
@@ -103390,6 +110065,8 @@ self: {
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gtk-mac-integration-gtk3 = null;};
 
   "gtkglext" = callPackage
@@ -103408,6 +110085,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; 
          inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; 
          inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu; 
@@ -103429,6 +110108,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkImageView library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtkimageview;};
 
   "gtkrsync" = callPackage
@@ -103447,6 +110128,8 @@ self: {
        ];
        description = "Gnome rsync progress display";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtksourceview2" = callPackage
@@ -103466,6 +110149,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtksourceview;};
 
   "gtksourceview3" = callPackage
@@ -103485,6 +110170,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtksourceview3;};
 
   "guarded-allocation" = callPackage
@@ -103507,6 +110194,8 @@ self: {
        libraryHaskellDepends = [ base instant-generics ];
        description = "Datatype-generic rewriting with preconditions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "guess-combinator" = callPackage
@@ -103518,6 +110207,8 @@ self: {
        libraryHaskellDepends = [ base HList ];
        description = "Generate simple combinators given their type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "guid" = callPackage
@@ -103544,6 +110235,8 @@ self: {
        executableHaskellDepends = [ base cairo containers filepath gtk ];
        description = "graphical untyped lambda calculus interactive interpreter";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gutenberg-fibonaccis" = callPackage
@@ -103568,6 +110261,8 @@ self: {
        executableHaskellDepends = [ base unix ];
        description = "ghcWithPackages cmdline util";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gyah-bin" = callPackage
@@ -103581,6 +110276,8 @@ self: {
        executableHaskellDepends = [ base extra GiveYouAHead ];
        description = "A binary version of GiveYouAHead";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gym-http-api" = callPackage
@@ -103602,6 +110299,8 @@ self: {
        ];
        description = "REST client to the gym-http-api project";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "h-booru" = callPackage
@@ -103625,6 +110324,8 @@ self: {
        ];
        description = "Haskell library for retrieving data from various booru image sites";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "h-gpgme" = callPackage
@@ -103648,6 +110349,8 @@ self: {
        ];
        description = "High Level Binding for GnuPG Made Easy (gpgme)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "h-reversi" = callPackage
@@ -103671,6 +110374,8 @@ self: {
        ];
        description = "Reversi game in haskell/blank-canvas";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "h2048" = callPackage
@@ -103697,6 +110402,8 @@ self: {
        ];
        description = "An Implementation of Game 2048";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "h2c" = callPackage
@@ -103708,6 +110415,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl resourcet ];
        description = "Bindings to Linux I2C with support for repeated-start transactions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hArduino" = callPackage
@@ -103723,6 +110432,8 @@ self: {
        ];
        description = "Control your Arduino board from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hBDD" = callPackage
@@ -103749,6 +110460,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to CMU/Long's BDD library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {bdd = null; mem = null;};
 
   "hBDD-CUDD" = callPackage
@@ -103764,6 +110477,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to the CUDD library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) cudd; epd = null; inherit (pkgs) mtr; 
          inherit (pkgs) st; util = null;};
 
@@ -103780,6 +110495,8 @@ self: {
        testHaskellDepends = [ base hashable ];
        description = "Conceptual modelling support for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hCsound" = callPackage
@@ -103795,6 +110512,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "interface to CSound API";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {csound64 = null; inherit (pkgs) libsndfile;};
 
   "hDFA" = callPackage
@@ -103806,6 +110525,8 @@ self: {
        libraryHaskellDepends = [ base containers directory process ];
        description = "A simple library for representing and minimising DFAs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hF2" = callPackage
@@ -103818,6 +110539,8 @@ self: {
        libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hGelf" = callPackage
@@ -103834,6 +110557,8 @@ self: {
        ];
        description = "Haskell GELF library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hLLVM" = callPackage
@@ -103876,6 +110601,8 @@ self: {
        ];
        description = "Library to interact with the @Mollom anti-spam service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hOff-display" = callPackage
@@ -103890,6 +110617,8 @@ self: {
        executableHaskellDepends = [ base GLFW hOff-parser OpenGL parsec ];
        description = "The tool to transform the OFF to other image format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hOff-parser" = callPackage
@@ -103967,6 +110696,8 @@ self: {
        ];
        description = "Protein Databank file format library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hPDB-examples" = callPackage
@@ -103993,6 +110724,8 @@ self: {
        ];
        description = "Examples for hPDB library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hPushover" = callPackage
@@ -104008,6 +110741,8 @@ self: {
        ];
        description = "Pushover.net API functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hR" = callPackage
@@ -104019,6 +110754,8 @@ self: {
        libraryHaskellDepends = [ array base containers unix ];
        description = "R bindings and interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hRESP" = callPackage
@@ -104065,6 +110802,8 @@ self: {
        ];
        description = "A Haskell library to scrape and crawl web-pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hSimpleDB" = callPackage
@@ -104081,6 +110820,8 @@ self: {
        ];
        description = "Interface to Amazon's SimpleDB service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hTalos" = callPackage
@@ -104094,6 +110835,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Parser, print and manipulate structures in PDB file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hTensor" = callPackage
@@ -104105,6 +110848,8 @@ self: {
        libraryHaskellDepends = [ base containers hmatrix random ];
        description = "Multidimensional arrays and simple tensor computations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hVOIDP" = callPackage
@@ -104120,6 +110865,8 @@ self: {
        executableSystemDepends = [ blas liblapack ];
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) blas; liblapack = null;};
 
   "hXmixer" = callPackage
@@ -104153,6 +110900,8 @@ self: {
        ];
        description = "Haar wavelet transforms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "habit" = callPackage
@@ -104177,6 +110926,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Haskell message bot framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hable" = callPackage
@@ -104208,6 +110959,8 @@ self: {
        ];
        description = "A minimalist static blog generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hablog" = callPackage
@@ -104230,6 +110983,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A blog system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hacanon-light" = callPackage
@@ -104272,6 +111027,8 @@ self: {
        ];
        description = "Hack contrib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-contrib-press" = callPackage
@@ -104288,6 +111045,8 @@ self: {
        ];
        description = "Hack helper that renders Press templates";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-frontend-happstack" = callPackage
@@ -104305,6 +111064,8 @@ self: {
        ];
        description = "hack-frontend-happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-frontend-monadcgi" = callPackage
@@ -104327,6 +111088,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hack ];
        description = "Hack handler using CGI protocol. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-handler-epoll" = callPackage
@@ -104345,6 +111108,8 @@ self: {
        ];
        description = "hack handler implementation using epoll";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-handler-evhttp" = callPackage
@@ -104363,6 +111128,8 @@ self: {
        librarySystemDepends = [ event ];
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {event = null;};
 
   "hack-handler-fastcgi" = callPackage
@@ -104375,6 +111142,8 @@ self: {
        librarySystemDepends = [ fcgi ];
        description = "Hack handler direct to fastcgi (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fcgi;};
 
   "hack-handler-happstack" = callPackage
@@ -104392,6 +111161,8 @@ self: {
        ];
        description = "Hack Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-handler-hyena" = callPackage
@@ -104408,6 +111179,8 @@ self: {
        ];
        description = "Hyena hack handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-handler-kibro" = callPackage
@@ -104422,6 +111195,8 @@ self: {
        ];
        description = "Hack Kibro handler";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-handler-simpleserver" = callPackage
@@ -104437,6 +111212,8 @@ self: {
        ];
        description = "A simplistic HTTP server handler for Hack. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-middleware-cleanpath" = callPackage
@@ -104450,6 +111227,8 @@ self: {
        ];
        description = "Applies some basic redirect rules to get cleaner paths. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-middleware-clientsession" = callPackage
@@ -104465,6 +111244,8 @@ self: {
        ];
        description = "Middleware for easily keeping session data in client cookies. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-middleware-gzip" = callPackage
@@ -104491,6 +111272,8 @@ self: {
        ];
        description = "Automatic wrapping of JSON responses to convert into JSONP. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack2" = callPackage
@@ -104553,6 +111336,8 @@ self: {
        ];
        description = "Hack2 Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack2-handler-mongrel2-http" = callPackage
@@ -104573,6 +111358,8 @@ self: {
        ];
        description = "Hack2 Mongrel2 HTTP handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack2-handler-snap-server" = callPackage
@@ -104591,6 +111378,8 @@ self: {
        ];
        description = "Hack2 Snap server handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack2-handler-warp" = callPackage
@@ -104607,6 +111396,8 @@ self: {
        ];
        description = "Hack2 warp handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack2-interface-wai" = callPackage
@@ -104663,6 +111454,8 @@ self: {
        ];
        description = "Compare the public API of different versions of a Hackage library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-mirror" = callPackage
@@ -104692,6 +111485,8 @@ self: {
        ];
        description = "Simple mirroring utility for Hackage";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-plot" = callPackage
@@ -104723,6 +111518,8 @@ self: {
        executableHaskellDepends = [ base Cabal containers hackage-db ];
        description = "Process 00-index.tar.gz from Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-proxy" = callPackage
@@ -104746,6 +111543,8 @@ self: {
        ];
        description = "Provide a proxy for Hackage which modifies responses in some way. (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-repo-tool" = callPackage
@@ -104768,6 +111567,8 @@ self: {
        ];
        description = "Manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-security" = callPackage
@@ -104850,6 +111651,8 @@ self: {
        ];
        description = "The Hackage web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-sparks" = callPackage
@@ -104886,6 +111689,8 @@ self: {
        ];
        description = "Check for differences between working directory and hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage2hwn" = callPackage
@@ -104899,6 +111704,8 @@ self: {
        executableHaskellDepends = [ base download feed tagsoup ];
        description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage2twitter" = callPackage
@@ -104912,6 +111719,8 @@ self: {
        executableHaskellDepends = [ base feed feed2twitter ];
        description = "Send new Hackage releases to Twitter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackager" = callPackage
@@ -104929,6 +111738,8 @@ self: {
        ];
        description = "Hackage testing tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackernews" = callPackage
@@ -104953,6 +111764,8 @@ self: {
        ];
        description = "API for Hacker News";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackertyper" = callPackage
@@ -104989,6 +111802,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Generate useful files for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackport" = callPackage
@@ -105038,6 +111853,8 @@ self: {
        ];
        description = "Lightweight Erlang-style actors for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hactors" = callPackage
@@ -105049,6 +111866,8 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "Practical actors for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haddock_2_23_1" = callPackage
@@ -105066,6 +111885,7 @@ self: {
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haddock" = callPackage
@@ -105082,6 +111902,8 @@ self: {
        preCheck = "unset GHC_PACKAGE_PATH";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haddock-api_2_23_1" = callPackage
@@ -105107,6 +111929,7 @@ self: {
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haddock-api" = callPackage
@@ -105131,6 +111954,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haddock-cheatsheet" = callPackage
@@ -105142,6 +111967,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A documentation-only package exemplifying haddock markup features";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haddock-leksah" = callPackage
@@ -105160,6 +111987,8 @@ self: {
        ];
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haddock-library_1_7_0" = callPackage
@@ -105218,6 +112047,8 @@ self: {
        ];
        description = "Test utilities for Haddock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haddocset" = callPackage
@@ -105239,6 +112070,8 @@ self: {
        ];
        description = "Generate docset of Dash by Haddock haskell documentation tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hadolint" = callPackage
@@ -105284,6 +112117,8 @@ self: {
        testHaskellDepends = [ base bytestring filepath text vector ];
        description = "Read/write file formats commonly used by Hadoop";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) snappy;};
 
   "hadoop-rpc" = callPackage
@@ -105304,6 +112139,8 @@ self: {
        testHaskellDepends = [ base protobuf tasty tasty-hunit vector ];
        description = "Use the Hadoop RPC interface from Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hadoop-streaming" = callPackage
@@ -105345,6 +112182,8 @@ self: {
        ];
        description = "Fast command line tools for working with Hadoop";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haeredes" = callPackage
@@ -105375,6 +112214,8 @@ self: {
        testHaskellDepends = [ base intervals mtl QuickCheck ];
        description = "Affine arithmetic library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haggis" = callPackage
@@ -105401,6 +112242,8 @@ self: {
        ];
        description = "A static site generator with blogging/comments support";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haggle" = callPackage
@@ -105453,6 +112296,8 @@ self: {
        executableHaskellDepends = [ base time ];
        description = "Analytic Hierarchy Process";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haiji" = callPackage
@@ -105475,6 +112320,8 @@ self: {
        ];
        description = "A typed template engine, subset of jinja2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hail" = callPackage
@@ -105528,6 +112375,8 @@ self: {
        ];
        description = "A program to send emails throught the Mailgun api";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hailgun-simple" = callPackage
@@ -105632,6 +112481,8 @@ self: {
        ];
        description = "A JSON REST API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakaru" = callPackage
@@ -105661,6 +112512,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim ];
        description = "A probabilistic programming embedded DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hake" = callPackage
@@ -105688,6 +112541,8 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Akismet spam protection library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakka" = callPackage
@@ -105702,6 +112557,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Minimal akka-inspired actor library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hako" = callPackage
@@ -105718,6 +112575,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "A mako-like quasi-quoter template library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll" = callPackage
@@ -105755,6 +112614,8 @@ self: {
        testToolDepends = [ utillinux ];
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
@@ -105769,6 +112630,8 @@ self: {
        ];
        description = "A package allowing to write Hakyll blog posts in Rmd";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-agda" = callPackage
@@ -105785,6 +112648,8 @@ self: {
        ];
        description = "Wrapper to integrate literate Agda files with Hakyll";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-alectryon" = callPackage
@@ -105801,6 +112666,8 @@ self: {
        ];
        description = "Hakyll extension for rendering Coq code using Alectryon";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-blaze-templates" = callPackage
@@ -105812,6 +112679,8 @@ self: {
        libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ];
        description = "Blaze templates for Hakyll";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib" = callPackage
@@ -105827,6 +112696,8 @@ self: {
        executableHaskellDepends = [ base directory filepath hakyll ];
        description = "Extra modules for the hakyll website compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib-csv" = callPackage
@@ -105843,6 +112714,8 @@ self: {
        testHaskellDepends = [ base blaze-html bytestring cassava hspec ];
        description = "Generate Html tables from Csv files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib-elm" = callPackage
@@ -105861,6 +112734,8 @@ self: {
        executableHaskellDepends = [ base hakyll ];
        description = "Compile Elm code for inclusion in Hakyll static site";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib-hyphenation" = callPackage
@@ -105872,6 +112747,8 @@ self: {
        libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ];
        description = "automatic hyphenation for Hakyll";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib-links" = callPackage
@@ -105891,6 +112768,8 @@ self: {
        ];
        description = "A hakyll library that helps maintain a separate links database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-convert" = callPackage
@@ -105939,6 +112818,8 @@ self: {
        executableHaskellDepends = [ base dhall hakyll ];
        description = "Dhall compiler for Hakyll";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-dir-list" = callPackage
@@ -105953,6 +112834,8 @@ self: {
        ];
        description = "Allow Hakyll to create hierarchical menues from directories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-elm" = callPackage
@@ -105981,6 +112864,8 @@ self: {
        executableHaskellDepends = [ base hakyll ];
        testHaskellDepends = [ base ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-filestore" = callPackage
@@ -105995,6 +112880,8 @@ self: {
        ];
        description = "FileStore utilities for Hakyll";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-images" = callPackage
@@ -106016,6 +112903,8 @@ self: {
        ];
        description = "Hakyll utilities to work with images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-ogmarkup" = callPackage
@@ -106027,6 +112916,8 @@ self: {
        libraryHaskellDepends = [ base hakyll ogmarkup ];
        description = "Integrate ogmarkup document with Hakyll";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-process" = callPackage
@@ -106038,6 +112929,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hakyll typed-process ];
        description = "Hakyll compiler for arbitrary external processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-sass" = callPackage
@@ -106053,6 +112946,8 @@ self: {
        ];
        description = "Hakyll SASS compiler over hsass";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-series" = callPackage
@@ -106064,6 +112959,8 @@ self: {
        libraryHaskellDepends = [ base containers hakyll ];
        description = "Adds series functionality to hakyll";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-shakespeare" = callPackage
@@ -106081,6 +112978,8 @@ self: {
        ];
        description = "Hakyll Hamlet compiler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-shortcode" = callPackage
@@ -106102,6 +113001,8 @@ self: {
        ];
        description = "A shortcode extension module for Hakyll";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-shortcut-links" = callPackage
@@ -106118,6 +113019,8 @@ self: {
        testHaskellDepends = [ base hspec mtl pandoc text ];
        description = "Use shortcut-links in markdown file for Hakyll";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-typescript" = callPackage
@@ -106134,6 +113037,8 @@ self: {
        testHaskellDepends = [ base directory hakyll tasty tasty-hunit ];
        description = "Typescript and javascript hakyll compilers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hal" = callPackage
@@ -106151,6 +113056,8 @@ self: {
        ];
        description = "A runtime environment for Haskell applications running on AWS Lambda";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halberd" = callPackage
@@ -106179,6 +113086,8 @@ self: {
        ];
        description = "A tool to generate missing import statements for Haskell modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "half" = callPackage
@@ -106215,6 +113124,8 @@ self: {
        ];
        description = "The HAskelL File System (\"halfs\" -- intended for use on the HaLVM)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halipeto" = callPackage
@@ -106228,6 +113139,8 @@ self: {
        libraryHaskellDepends = [ base directory HaXml pandoc ];
        description = "Haskell Static Web Page Generator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halive" = callPackage
@@ -106257,6 +113170,8 @@ self: {
        ];
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hall-symbols" = callPackage
@@ -106273,6 +113188,8 @@ self: {
        ];
        description = "Symmetry operations generater of Hall Symbols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halma" = callPackage
@@ -106293,6 +113210,8 @@ self: {
        ];
        description = "Library implementing Halma rules";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halma-gui" = callPackage
@@ -106311,6 +113230,8 @@ self: {
        ];
        description = "GTK application for playing Halma";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halma-telegram-bot" = callPackage
@@ -106335,6 +113256,8 @@ self: {
        ];
        description = "Telegram bot for playing Halma";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haltavista" = callPackage
@@ -106360,6 +113283,8 @@ self: {
        testHaskellDepends = [ base hedgehog lens ];
        description = "Split or combine data structures to and from halves, quarters, eighths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halvm-web" = callPackage
@@ -106406,6 +113331,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring ];
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hamid" = callPackage
@@ -106472,6 +113399,8 @@ self: {
        ];
        description = "Haskell macro preprocessor";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hamsql" = callPackage
@@ -106495,6 +113424,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Interpreter for SQL-structure definitions in YAML (YamSql)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hamtmap" = callPackage
@@ -106508,6 +113439,8 @@ self: {
        libraryHaskellDepends = [ array base deepseq hashable ];
        description = "A purely functional and persistent hash map";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hamtsolo" = callPackage
@@ -106548,6 +113481,8 @@ self: {
        executableHaskellDepends = [ filepath ];
        description = "Library to handle abstract music";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "han2zen" = callPackage
@@ -106573,6 +113508,8 @@ self: {
        libraryHaskellDepends = [ base containers random ];
        description = "Hanabi card game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "handa-data" = callPackage
@@ -106613,6 +113550,8 @@ self: {
        ];
        description = "Library and command-line utility for accessing Google services and APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "handa-geodata" = callPackage
@@ -106659,6 +113598,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "HandleLike class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "handsy" = callPackage
@@ -106679,6 +113620,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "handwriting" = callPackage
@@ -106737,6 +113680,8 @@ self: {
        ];
        description = "Simple Continuous Integration/Deployment System";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hans" = callPackage
@@ -106760,6 +113705,8 @@ self: {
        ];
        description = "Network Stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hans-pcap" = callPackage
@@ -106771,6 +113718,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hans pcap ];
        description = "Driver for real ethernet devices for HaNS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hans-pfq" = callPackage
@@ -106815,6 +113764,8 @@ self: {
        ];
        description = "Korean spell checker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haphviz" = callPackage
@@ -106833,6 +113784,8 @@ self: {
        ];
        description = "Graphviz code generation with Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hapistrano" = callPackage
@@ -106881,6 +113834,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libappindicator-gtk2;};
 
   "happindicator3" = callPackage
@@ -106895,6 +113850,8 @@ self: {
        libraryPkgconfigDepends = [ libappindicator-gtk3 ];
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libappindicator-gtk3;};
 
   "happlets" = callPackage
@@ -106912,6 +113869,8 @@ self: {
        ];
        description = "\"Haskell Applets\" provides an event handler and a canvas for building simple GUI apps";
        license = "AGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happlets-lib-gtk" = callPackage
@@ -106933,6 +113892,8 @@ self: {
        ];
        description = "The \"Haskell Applets\" Gtk+ ver. 2 back-end for \"happlets\".";
        license = "AGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happraise" = callPackage
@@ -106946,6 +113907,8 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "A small program for counting the comments in haskell source";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happs-hsp" = callPackage
@@ -106959,6 +113922,8 @@ self: {
          base bytestring HAppS-Server hsp mtl plugins
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happs-hsp-template" = callPackage
@@ -106975,6 +113940,8 @@ self: {
        ];
        description = "Utilities for using HSP templates in HAppS applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happs-tutorial" = callPackage
@@ -106999,6 +113966,8 @@ self: {
        ];
        description = "A Happstack Tutorial that is its own web 2.0-type demo.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack" = callPackage
@@ -107013,6 +113982,8 @@ self: {
        doHaddock = false;
        description = "The haskell application server stack + code generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-auth" = callPackage
@@ -107031,6 +114002,8 @@ self: {
        ];
        description = "A Happstack Authentication Suite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-authenticate" = callPackage
@@ -107060,6 +114033,8 @@ self: {
        ];
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -107096,6 +114071,8 @@ self: {
        ];
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-data" = callPackage
@@ -107117,6 +114094,8 @@ self: {
        ];
        description = "Happstack data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-dlg" = callPackage
@@ -107134,6 +114113,8 @@ self: {
        ];
        description = "Cross-request user interactions for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-facebook" = callPackage
@@ -107159,6 +114140,8 @@ self: {
        ];
        description = "A package for building Facebook applications using Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-fastcgi" = callPackage
@@ -107190,6 +114173,8 @@ self: {
        ];
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-fay-ajax" = callPackage
@@ -107202,6 +114187,8 @@ self: {
        libraryHaskellDepends = [ fay-base fay-jquery ];
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-foundation" = callPackage
@@ -107222,6 +114209,8 @@ self: {
        ];
        description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-hamlet" = callPackage
@@ -107233,6 +114222,8 @@ self: {
        libraryHaskellDepends = [ base happstack-server shakespeare text ];
        description = "Support for Hamlet HTML templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-heist" = callPackage
@@ -107249,6 +114240,8 @@ self: {
        ];
        description = "Support for using Heist templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-helpers" = callPackage
@@ -107272,6 +114265,8 @@ self: {
        ];
        description = "Convenience functions for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-hsp" = callPackage
@@ -107303,6 +114298,8 @@ self: {
        ];
        description = "Support for using HStringTemplate in Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-ixset" = callPackage
@@ -107321,6 +114318,8 @@ self: {
        ];
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-jmacro" = callPackage
@@ -107338,6 +114337,8 @@ self: {
        ];
        description = "Support for using JMacro with Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-lite" = callPackage
@@ -107351,6 +114352,8 @@ self: {
        ];
        description = "Happstack minus the useless stuff";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-monad-peel" = callPackage
@@ -107366,6 +114369,8 @@ self: {
        ];
        description = "monad-peel instances for Happstack types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-plugins" = callPackage
@@ -107381,6 +114386,8 @@ self: {
        ];
        description = "The haskell application server stack + reload";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-server" = callPackage
@@ -107444,6 +114451,8 @@ self: {
        ];
        description = "Extend happstack-server with native HTTPS support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-state" = callPackage
@@ -107464,6 +114473,8 @@ self: {
        ];
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-static-routing" = callPackage
@@ -107502,6 +114513,8 @@ self: {
        ];
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-yui" = callPackage
@@ -107523,6 +114536,8 @@ self: {
        ];
        description = "Utilities for using YUI3 with Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happy_1_19_9" = callPackage
@@ -107587,6 +114602,8 @@ self: {
        libraryHaskellDepends = [ base Chart Chart-diagrams ];
        description = "Generate simple okay-looking bar plots without much effort";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happy-meta" = callPackage
@@ -107619,6 +114636,8 @@ self: {
        ];
        description = "Acceptance test framework for web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happybara-webkit" = callPackage
@@ -107638,6 +114657,8 @@ self: {
        ];
        description = "WebKit Happybara driver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happybara-webkit-server" = callPackage
@@ -107649,6 +114670,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        description = "WebKit Server binary for Happybara (taken from capybara-webkit)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hapstone" = callPackage
@@ -107667,6 +114690,8 @@ self: {
        ];
        description = "Capstone bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) capstone;};
 
   "haquery" = callPackage
@@ -107682,6 +114707,8 @@ self: {
        ];
        description = "jQuery for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haquil" = callPackage
@@ -107703,6 +114730,8 @@ self: {
        ];
        description = "A Haskell implementation of the Quil instruction set for quantum computing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "har" = callPackage
@@ -107735,6 +114764,8 @@ self: {
        executableSystemDepends = [ openssl sqlite ];
        description = "Networked content addressed backup and restore software";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;};
 
   "hardware-edsl" = callPackage
@@ -107752,6 +114783,8 @@ self: {
        ];
        description = "Deep embedding of hardware descriptions with code generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "harg" = callPackage
@@ -107772,6 +114805,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Haskell program configuration using higher kinded data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hark" = callPackage
@@ -107790,6 +114825,8 @@ self: {
        ];
        description = "A Gentoo package query tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "harmony" = callPackage
@@ -107815,6 +114852,8 @@ self: {
        ];
        description = "A web service specification compiler that generates implementation and tests";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haroonga" = callPackage
@@ -107831,6 +114870,8 @@ self: {
        libraryPkgconfigDepends = [ groonga ];
        description = "Low level bindings for Groonga";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) groonga;};
 
   "haroonga-httpd" = callPackage
@@ -107849,6 +114890,8 @@ self: {
        ];
        description = "Yet another Groonga http server";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "harp" = callPackage
@@ -107876,6 +114919,8 @@ self: {
        ];
        description = "Runtime code generation for x86 machine code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "harvest-api" = callPackage
@@ -107896,6 +114941,8 @@ self: {
        ];
        description = "Bindings for Harvest API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "has" = callPackage
@@ -107909,6 +114956,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Entity based records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "has-th" = callPackage
@@ -107920,6 +114969,8 @@ self: {
        libraryHaskellDepends = [ base has template-haskell ];
        description = "Template Haskell function for Has records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasbolt" = callPackage
@@ -107940,6 +114991,8 @@ self: {
        ];
        description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasbolt-extras" = callPackage
@@ -107965,6 +115018,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Extras for hasbolt library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hascal" = callPackage
@@ -108041,6 +115096,8 @@ self: {
        ];
        description = "A TUI for reviewing notes using 'flashcards' written with markdown-like syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hascas" = callPackage
@@ -108062,6 +115119,8 @@ self: {
        ];
        description = "Cassandra driver for haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hascat" = callPackage
@@ -108156,6 +115215,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Hashing tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hash-store" = callPackage
@@ -108248,6 +115309,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Higher-rank Hashable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashable-generics" = callPackage
@@ -108266,6 +115329,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ghc-prim hashable ];
        description = "Automatically generates Hashable instances with GHC.Generics.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashable-orphans" = callPackage
@@ -108279,6 +115344,8 @@ self: {
        libraryHaskellDepends = [ base hashable sorted-list time ];
        description = "Provides instances missing from Hashable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashable-time" = callPackage
@@ -108310,6 +115377,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "hashed-storage" = callPackage
@@ -108328,6 +115397,8 @@ self: {
        ];
        description = "Hashed file storage support code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashflare" = callPackage
@@ -108341,6 +115412,8 @@ self: {
        libraryHaskellDepends = [ base containers simple-money ];
        description = "A library for working with HashFlare.io contracts and hashrates";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashids" = callPackage
@@ -108430,6 +115503,8 @@ self: {
        ];
        description = "Efficient consistent hashing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashtable-benchmark" = callPackage
@@ -108490,6 +115565,8 @@ self: {
        ];
        description = "Extensions for a \"hashtables\" library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasim" = callPackage
@@ -108501,6 +115578,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Process-Based Discrete Event Simulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hask" = callPackage
@@ -108518,6 +115597,8 @@ self: {
        ];
        description = "Categories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hask-home" = callPackage
@@ -108536,6 +115617,8 @@ self: {
        ];
        description = "Generate homepages for cabal packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskades" = callPackage
@@ -108615,6 +115698,8 @@ self: {
        ];
        description = "A dialect of haskell with order of execution based on dependency resolution";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskbot-core" = callPackage
@@ -108635,6 +115720,8 @@ self: {
        ];
        description = "Easily-extensible chatbot for Slack messaging service";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskdeep" = callPackage
@@ -108659,6 +115746,8 @@ self: {
        ];
        description = "Computes and audits file hashes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskdogs" = callPackage
@@ -108695,6 +115784,8 @@ self: {
        ];
        description = "A small scheme interpreter";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskeline_0_8_1_0" = callPackage
@@ -108731,6 +115822,8 @@ self: {
        libraryHaskellDepends = [ base haskeline mtl ];
        description = "Class interface for working with Haskeline";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskeline-repl" = callPackage
@@ -108754,6 +115847,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl protolude text ];
        description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-abci" = callPackage
@@ -108779,6 +115874,8 @@ self: {
        ];
        description = "Haskell Application BlockChain Interface (ABCI) Server Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-aliyun" = callPackage
@@ -108801,6 +115898,8 @@ self: {
        ];
        description = "haskell client of aliyun service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-awk" = callPackage
@@ -108833,6 +115932,8 @@ self: {
        ];
        description = "Transform text from the command-line using Haskell expressions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-bcrypt" = callPackage
@@ -108871,6 +115972,8 @@ self: {
        ];
        description = "Complete BitMEX Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-bitmex-rest" = callPackage
@@ -108898,6 +116001,8 @@ self: {
        ];
        description = "Auto-generated bitmex API Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-brainfuck" = callPackage
@@ -108917,6 +116022,8 @@ self: {
        ];
        description = "BrainFuck interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-ci" = callPackage
@@ -108947,6 +116054,8 @@ self: {
        doHaddock = false;
        description = "Cabal package script generator for Travis-CI";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-cnc" = callPackage
@@ -108967,6 +116076,8 @@ self: {
        executableHaskellDepends = [ base directory process ];
        description = "Library for parallel programming in the Intel Concurrent Collections paradigm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-coffee" = callPackage
@@ -108978,6 +116089,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "Simple CoffeeScript API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-compression" = callPackage
@@ -108997,6 +116110,8 @@ self: {
        ];
        description = "compress files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-conll" = callPackage
@@ -109012,6 +116127,8 @@ self: {
        ];
        description = "Core Types for NLP";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-course-preludes" = callPackage
@@ -109023,6 +116140,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-dap" = callPackage
@@ -109072,6 +116191,8 @@ self: {
        ];
        description = "Haskell Debug Adapter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-disque" = callPackage
@@ -109088,6 +116209,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Client library for the Disque datastore";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-docs" = callPackage
@@ -109110,6 +116233,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A program to find and display the docs and type of a name";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-eigen-util" = callPackage
@@ -109122,6 +116247,8 @@ self: {
        testHaskellDepends = [ base eigen vector ];
        description = "Some utility functions for haskell-eigen library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-exp-parser" = callPackage
@@ -109174,6 +116301,8 @@ self: {
        ];
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-ftp" = callPackage
@@ -109200,6 +116329,8 @@ self: {
        ];
        description = "A Haskell ftp server with configurable backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-generate" = callPackage
@@ -109216,6 +116347,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Typesafe generation of haskell source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-gettext" = callPackage
@@ -109295,6 +116428,8 @@ self: {
        executableHaskellDepends = [ base containers gloss ];
        description = "Go and Checkers game in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-google-trends" = callPackage
@@ -109325,6 +116460,8 @@ self: {
        testHaskellDepends = [ base template-haskell transformers ];
        description = "Infer haskell code by given type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-igraph" = callPackage
@@ -109347,6 +116484,8 @@ self: {
        ];
        description = "Bindings to the igraph C library (v0.8.0).";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-import-graph" = callPackage
@@ -109378,6 +116517,8 @@ self: {
        executableHaskellDepends = [ base HGL random ];
        description = "'Asteroids' arcade games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-kubernetes" = callPackage
@@ -109397,6 +116538,8 @@ self: {
        ];
        description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-lexer" = callPackage
@@ -109487,6 +116630,8 @@ self: {
        ];
        description = "A haskell package to build your own Language Server client";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-lsp-types" = callPackage
@@ -109552,6 +116697,8 @@ self: {
        testHaskellDepends = [ base MonadRandom ];
        description = "Machine learning in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-modbus" = callPackage
@@ -109575,6 +116722,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-mpi" = callPackage
@@ -109648,6 +116797,8 @@ self: {
        ];
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-openflow" = callPackage
@@ -109662,6 +116813,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "OpenFlow protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-overridez" = callPackage
@@ -109683,6 +116836,8 @@ self: {
        ];
        description = "Manage nix overrides for haskell packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-packages" = callPackage
@@ -109701,6 +116856,8 @@ self: {
        ];
        description = "Haskell suite library for package management and integration with Cabal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-pdf-presenter" = callPackage
@@ -109720,6 +116877,8 @@ self: {
        ];
        description = "Tool for presenting PDF-based presentations";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-platform-test" = callPackage
@@ -109748,6 +116907,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A test system for the Haskell Platform environment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-player" = callPackage
@@ -109769,6 +116930,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A terminal music player based on afplay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-plot" = callPackage
@@ -109785,6 +116948,8 @@ self: {
        ];
        description = "A library for generating 2D plots painlessly";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-postal" = callPackage
@@ -109800,6 +116965,8 @@ self: {
        testPkgconfigDepends = [ libpostal ];
        description = "Haskell binding for the libpostal library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libpostal = null;};
 
   "haskell-postgis" = callPackage
@@ -109865,6 +117032,8 @@ self: {
        testHaskellDepends = [ base directory hspec process ];
        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;
+       broken = true;
      }) {};
 
   "haskell-reflect" = callPackage
@@ -109881,6 +117050,8 @@ self: {
        ];
        description = "Reflect Haskell types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-rules" = callPackage
@@ -109892,6 +117063,8 @@ self: {
        libraryHaskellDepends = [ base syb ];
        description = "A DSL for expressing natural deduction rules in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-say" = callPackage
@@ -109942,6 +117115,8 @@ self: {
        ];
        description = "Client API for Rocket Scissor Spacegoo";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src" = callPackage
@@ -109956,6 +117131,8 @@ self: {
        libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-exts" = callPackage
@@ -109989,6 +117166,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts Hoed ];
        description = "Observable orphan instances for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-exts-prisms" = callPackage
@@ -110002,6 +117181,8 @@ self: {
        ];
        description = "Prisms with newtype wrappers for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-exts-qq" = callPackage
@@ -110018,6 +117199,8 @@ self: {
        testHaskellDepends = [ base haskell-src-exts hspec ];
        description = "A quasiquoter for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-exts-sc" = callPackage
@@ -110031,6 +117214,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Pretty print haskell code with comments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-exts-simple" = callPackage
@@ -110078,6 +117263,8 @@ self: {
        ];
        description = "Testing code generators piece by piece";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-meta" = callPackage
@@ -110115,6 +117302,8 @@ self: {
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-stack-trace-plugin" = callPackage
@@ -110133,6 +117322,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "haskell-stack-trace-plugin";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-time-range" = callPackage
@@ -110190,6 +117381,8 @@ self: {
        ];
        description = "Utilities to tie up tokens to an AST";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-ast" = callPackage
@@ -110206,6 +117399,8 @@ self: {
        ];
        description = "Haskell AST for efficient tooling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-ast-fromghc" = callPackage
@@ -110223,6 +117418,8 @@ self: {
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-ast-gen" = callPackage
@@ -110239,6 +117436,8 @@ self: {
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-ast-trf" = callPackage
@@ -110254,6 +117453,8 @@ self: {
        ];
        description = "Conversions on Haskell-Tools AST to prepare for refactorings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-backend-ghc" = callPackage
@@ -110271,6 +117472,8 @@ self: {
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-builtin-refactorings" = callPackage
@@ -110302,6 +117505,8 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-cli" = callPackage
@@ -110337,6 +117542,8 @@ self: {
        ];
        description = "Command-line frontend for Haskell-tools Refact";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-daemon" = callPackage
@@ -110370,6 +117577,8 @@ self: {
        ];
        description = "Background process for Haskell-tools that editors can connect to";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-debug" = callPackage
@@ -110394,6 +117603,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Debugging Tools for Haskell-tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-demo" = callPackage
@@ -110424,6 +117635,8 @@ self: {
        ];
        description = "A web-based demo for Haskell-tools Refactor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-experimental-refactorings" = callPackage
@@ -110454,6 +117667,8 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-prettyprint" = callPackage
@@ -110470,6 +117685,8 @@ self: {
        ];
        description = "Pretty printing of Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-refactor" = callPackage
@@ -110499,6 +117716,8 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-rewrite" = callPackage
@@ -110520,6 +117739,8 @@ self: {
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tor" = callPackage
@@ -110553,6 +117774,8 @@ self: {
        ];
        description = "A Haskell Tor Node";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-type-exts" = callPackage
@@ -110566,6 +117789,8 @@ self: {
        ];
        description = "A type checker for Haskell/haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-typescript" = callPackage
@@ -110577,6 +117802,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "Simple TypeScript API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tyrant" = callPackage
@@ -110588,6 +117815,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring network ];
        description = "Haskell implementation of the Tokyo Tyrant binary protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-updater" = callPackage
@@ -110623,6 +117852,8 @@ self: {
        ];
        description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell2010" = callPackage
@@ -110634,6 +117865,8 @@ self: {
        libraryHaskellDepends = [ array base ghc-prim ];
        description = "Compatibility with Haskell 2010";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell2020" = callPackage
@@ -110645,6 +117878,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Haskell 2020[draft] Standard Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell98" = callPackage
@@ -110660,6 +117895,8 @@ self: {
        ];
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell98libraries" = callPackage
@@ -110675,6 +117912,8 @@ self: {
        ];
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb" = callPackage
@@ -110690,6 +117929,8 @@ self: {
        ];
        description = "A library of combinators for generating and executing SQL statements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc" = callPackage
@@ -110701,6 +117942,8 @@ self: {
        libraryHaskellDepends = [ base containers haskelldb HDBC ];
        description = "Bracketed HDBC session for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-mtl" = callPackage
@@ -110716,6 +117959,8 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-tf" = callPackage
@@ -110732,6 +117977,8 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-transformers" = callPackage
@@ -110748,6 +117995,8 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-lifted" = callPackage
@@ -110764,6 +118013,8 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using lifted-base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-dynamic" = callPackage
@@ -110778,6 +118029,8 @@ self: {
        executableHaskellDepends = [ haskelldb ];
        description = "HaskellDB support for the dynamically loaded drivers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-flat" = callPackage
@@ -110795,6 +118048,8 @@ self: {
        ];
        description = "An experimental HaskellDB back-end in pure Haskell (no SQL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hdbc" = callPackage
@@ -110810,6 +118065,8 @@ self: {
        ];
        description = "HaskellDB support for HDBC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hdbc-mysql" = callPackage
@@ -110827,6 +118084,8 @@ self: {
        ];
        description = "HaskellDB support for the HDBC MySQL driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hdbc-odbc" = callPackage
@@ -110844,6 +118103,8 @@ self: {
        ];
        description = "HaskellDB support for the HDBC ODBC driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hdbc-postgresql" = callPackage
@@ -110862,6 +118123,8 @@ self: {
        executableSystemDepends = [ postgresql ];
        description = "HaskellDB support for the HDBC PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "haskelldb-hdbc-sqlite3" = callPackage
@@ -110879,6 +118142,8 @@ self: {
        ];
        description = "HaskellDB support for the HDBC SQLite driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hsql" = callPackage
@@ -110890,6 +118155,8 @@ self: {
        libraryHaskellDepends = [ base haskelldb hsql mtl old-time ];
        description = "HaskellDB support for HSQL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hsql-mysql" = callPackage
@@ -110907,6 +118174,8 @@ self: {
        ];
        description = "HaskellDB support for the HSQL MySQL driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hsql-odbc" = callPackage
@@ -110924,6 +118193,8 @@ self: {
        ];
        description = "HaskellDB support for the HSQL ODBC driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hsql-oracle" = callPackage
@@ -110960,6 +118231,8 @@ self: {
        ];
        description = "HaskellDB support for the HSQL PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hsql-sqlite" = callPackage
@@ -110996,6 +118269,8 @@ self: {
        ];
        description = "HaskellDB support for the HSQL SQLite3 driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-th" = callPackage
@@ -111007,6 +118282,8 @@ self: {
        libraryHaskellDepends = [ base haskelldb mtl template-haskell ];
        description = "Template Haskell utilities for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-wx" = callPackage
@@ -111017,6 +118294,8 @@ self: {
        sha256 = "01652m0bym80400navqlpdv5n0gfgnfzd1d0857f3kd13ksqk2hy";
        description = "HaskellDB support for WXHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskellish" = callPackage
@@ -111032,6 +118311,8 @@ self: {
        ];
        description = "For parsing Haskell-ish languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskellscrabble" = callPackage
@@ -111055,6 +118336,8 @@ self: {
        ];
        description = "A scrabble library capturing the core game logic of scrabble";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskellscript" = callPackage
@@ -111072,6 +118355,8 @@ self: {
        ];
        description = "Command line tool for running Haskell scripts with a hashbang";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelm" = callPackage
@@ -111120,6 +118405,8 @@ self: {
        ];
        description = "CP in Haskell through MiniZinc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskeme" = callPackage
@@ -111134,6 +118421,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Compiler from I- to S-Expressions for the Scheme Programming Language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskey" = callPackage
@@ -111161,6 +118450,8 @@ self: {
        ];
        description = "A transactional, ACID compliant, embeddable key-value store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskey-btree" = callPackage
@@ -111204,6 +118495,8 @@ self: {
        ];
        description = "A monad transformer supporting Haskey transactions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskgame" = callPackage
@@ -111215,6 +118508,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 SDL SDL-ttf ];
        description = "Haskell game library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskheap" = callPackage
@@ -111231,6 +118526,8 @@ self: {
        ];
        description = "Haskell bindings to refheap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskhol-core" = callPackage
@@ -111250,6 +118547,8 @@ self: {
        ];
        description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskintex" = callPackage
@@ -111286,6 +118585,8 @@ self: {
        ];
        description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin" = callPackage
@@ -111309,6 +118610,8 @@ self: {
        ];
        description = "Implementation of the Bitcoin protocol";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-bitcoind" = callPackage
@@ -111326,6 +118629,8 @@ self: {
        ];
        description = "An adapter for haskoin to network-bitcoin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-core" = callPackage
@@ -111357,6 +118662,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bitcoin & Bitcoin Cash library for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-crypto" = callPackage
@@ -111379,6 +118686,8 @@ self: {
        ];
        description = "Implementation of Bitcoin cryptographic primitives";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-node" = callPackage
@@ -111410,6 +118719,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "P2P library for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-protocol" = callPackage
@@ -111430,6 +118741,8 @@ self: {
        ];
        description = "Implementation of the Bitcoin network protocol messages";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-script" = callPackage
@@ -111452,6 +118765,8 @@ self: {
        ];
        description = "Implementation of Bitcoin script parsing and evaluation";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-store" = callPackage
@@ -111497,6 +118812,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-store-data" = callPackage
@@ -111522,6 +118839,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Data for Haskoin Store";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-util" = callPackage
@@ -111542,6 +118861,8 @@ self: {
        ];
        description = "Utility functions for the Network.Haskoin project";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-wallet" = callPackage
@@ -111584,6 +118905,8 @@ self: {
        ];
        description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoon" = callPackage
@@ -111601,6 +118924,8 @@ self: {
        ];
        description = "Web Application Abstraction";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoon-httpspec" = callPackage
@@ -111616,6 +118941,8 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoon-salvia" = callPackage
@@ -111633,6 +118960,8 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskore" = callPackage
@@ -111657,6 +118986,8 @@ self: {
        ];
        description = "The Haskore Computer Music System";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskore-realtime" = callPackage
@@ -111674,6 +119005,8 @@ self: {
        ];
        description = "Routines for realtime playback of Haskore songs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskore-supercollider" = callPackage
@@ -111695,6 +119028,8 @@ self: {
        ];
        description = "Haskore back-end for SuperCollider";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskore-synthesizer" = callPackage
@@ -111714,6 +119049,8 @@ self: {
        ];
        description = "Music rendering coded in Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskore-vintage" = callPackage
@@ -111807,6 +119144,8 @@ self: {
        doHaddock = false;
        description = "Torch for tensors and neural networks in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasktorch-codegen" = callPackage
@@ -111836,6 +119175,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Code generation tools for Hasktorch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasktorch-ffi-tests" = callPackage
@@ -111870,6 +119211,8 @@ self: {
        ];
        description = "Bindings to Torch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ATen = null;};
 
   "hasktorch-ffi-thc" = callPackage
@@ -111892,6 +119235,8 @@ self: {
        ];
        description = "Bindings to Cutorch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ATen = null;};
 
   "hasktorch-indef" = callPackage
@@ -111920,6 +119265,8 @@ self: {
        doHaddock = false;
        description = "Core Hasktorch abstractions wrapping FFI bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasktorch-signatures" = callPackage
@@ -111945,6 +119292,8 @@ self: {
        doHaddock = false;
        description = "Backpack signatures for Tensor operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasktorch-signatures-partial" = callPackage
@@ -111960,6 +119309,8 @@ self: {
        ];
        description = "Functions to partially satisfy tensor signatures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasktorch-signatures-support" = callPackage
@@ -111976,6 +119327,8 @@ self: {
        doHaddock = false;
        description = "Signatures for support tensors in hasktorch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasktorch-signatures-types" = callPackage
@@ -112036,6 +119389,8 @@ self: {
        ];
        description = "Neural architectures in hasktorch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-binary" = callPackage
@@ -112060,6 +119415,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Haskus binary format manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-system-build" = callPackage
@@ -112079,6 +119436,8 @@ self: {
        ];
        description = "Haskus system build tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-utils" = callPackage
@@ -112101,6 +119460,8 @@ self: {
        ];
        description = "Haskus utility modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-utils-compat" = callPackage
@@ -112117,6 +119478,8 @@ self: {
        ];
        description = "Compatibility modules with other external packages (ByteString, etc.)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-utils-data" = callPackage
@@ -112134,6 +119497,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Haskus data utility modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-utils-types" = callPackage
@@ -112148,6 +119513,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Haskus types utility modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-utils-variant" = callPackage
@@ -112170,6 +119537,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ];
        description = "Variant and EADT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-web" = callPackage
@@ -112186,6 +119555,8 @@ self: {
        ];
        description = "Haskus web";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskyapi" = callPackage
@@ -112217,6 +119588,8 @@ self: {
        ];
        description = "HTTP server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haslo" = callPackage
@@ -112231,6 +119604,8 @@ self: {
        executableHaskellDepends = [ mtl old-time QuickCheck time wtk ];
        description = "Loan calculator engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasloGUI" = callPackage
@@ -112249,6 +119624,8 @@ self: {
        ];
        description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasmin" = callPackage
@@ -112290,6 +119667,8 @@ self: {
        libraryHaskellDepends = [ base HTTP monads-fd network xml ];
        description = "This package enables to write SPARQL queries to remote endpoints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haspell" = callPackage
@@ -112346,6 +119725,8 @@ self: {
        ];
        description = "API for backends of \"hasql\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-class" = callPackage
@@ -112368,6 +119749,8 @@ self: {
        ];
        description = "Encodable and Decodable classes for hasql";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-cursor-query" = callPackage
@@ -112390,6 +119773,8 @@ self: {
        ];
        description = "A declarative abstraction over PostgreSQL Cursor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-cursor-transaction" = callPackage
@@ -112407,6 +119792,8 @@ self: {
        ];
        description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-dynamic-statements" = callPackage
@@ -112427,6 +119814,8 @@ self: {
        ];
        description = "Toolkit for constructing Hasql statements dynamically";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-generic" = callPackage
@@ -112445,6 +119834,8 @@ self: {
        ];
        description = "Generic encoder and decoder deriving for Hasql";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-implicits" = callPackage
@@ -112580,6 +119971,8 @@ self: {
        ];
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-postgres-options" = callPackage
@@ -112594,6 +119987,8 @@ self: {
        ];
        description = "An \"optparse-applicative\" parser for \"hasql-postgres\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-queue" = callPackage
@@ -112628,6 +120023,8 @@ self: {
        ];
        description = "A PostgreSQL backed queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-simple" = callPackage
@@ -112644,6 +120041,8 @@ self: {
        ];
        description = "A somewhat opinionated \"simpler\" API to hasql";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-th" = callPackage
@@ -112723,6 +120122,8 @@ self: {
        ];
        description = "Haskell implementation of Mustache templates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hastache-aeson" = callPackage
@@ -112739,6 +120140,8 @@ self: {
        ];
        description = "render hastache templates using aeson values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haste" = callPackage
@@ -112752,6 +120155,8 @@ self: {
        executableHaskellDepends = [ base curl filepath mtl ];
        description = "A universal pastebin tool, written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haste-app" = callPackage
@@ -112771,6 +120176,8 @@ self: {
        ];
        description = "Framework for type-safe, distributed web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haste-compiler" = callPackage
@@ -112833,6 +120240,8 @@ self: {
        ];
        description = "Base libraries for haste-compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haste-markup" = callPackage
@@ -112847,6 +120256,8 @@ self: {
        ];
        description = "A port of blaze-markup and blaze-html to Haste";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haste-perch" = callPackage
@@ -112870,6 +120281,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Low level primitives for the Haste compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hastily" = callPackage
@@ -112952,6 +120365,8 @@ self: {
        ];
        description = "HaTeX User's Guide";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hatexmpp3" = callPackage
@@ -113025,6 +120440,8 @@ self: {
        ];
        description = "Haskell client for the NATS messaging system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hatt" = callPackage
@@ -113047,6 +120464,8 @@ self: {
        ];
        description = "A truth table generator for classical propositional logic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haveibeenpwned" = callPackage
@@ -113088,6 +120507,8 @@ self: {
        ];
        description = "Recursively retrieve maven dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haverer" = callPackage
@@ -113112,6 +120533,8 @@ self: {
        ];
        description = "Implementation of the rules of Love Letter";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hawitter" = callPackage
@@ -113133,6 +120556,8 @@ self: {
        ];
        description = "A twitter client for GTK+. Beta version.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hax" = callPackage
@@ -113158,6 +120583,8 @@ self: {
        ];
        description = "Haskell cash-flow and tax simulation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxl" = callPackage
@@ -113200,6 +120627,8 @@ self: {
        ];
        description = "Haxl data source for accessing AWS services through amazonka";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxl-facebook" = callPackage
@@ -113222,6 +120651,8 @@ self: {
        ];
        description = "An example Haxl data source for accessing the Facebook Graph API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxparse" = callPackage
@@ -113246,6 +120677,8 @@ self: {
        ];
        description = "Readable HaxBall replays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxr" = callPackage
@@ -113277,6 +120710,8 @@ self: {
        libraryHaskellDepends = [ base haxr template-haskell ];
        description = "Automatic deriving of XML-RPC structs for Haskell records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxy" = callPackage
@@ -113293,6 +120728,8 @@ self: {
        ];
        description = "A simple HTTP proxy server library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hayland" = callPackage
@@ -113313,6 +120750,8 @@ self: {
        testHaskellDepends = [ base process xml ];
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs) wayland;};
 
   "hayoo-cli" = callPackage
@@ -113331,6 +120770,8 @@ self: {
        ];
        description = "Hayoo CLI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hback" = callPackage
@@ -113349,6 +120790,8 @@ self: {
        ];
        description = "N-back memory game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hbayes" = callPackage
@@ -113378,6 +120821,8 @@ self: {
        ];
        description = "Bayesian Networks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hbb" = callPackage
@@ -113394,6 +120839,8 @@ self: {
        ];
        description = "Haskell Busy Bee, a backend for text editors";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hbcd" = callPackage
@@ -113405,6 +120852,8 @@ self: {
        libraryHaskellDepends = [ base bytestring Decimal digits split ];
        description = "Packed binary-coded decimal (BCD) serialization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hbeanstalk" = callPackage
@@ -113420,6 +120869,8 @@ self: {
        ];
        description = "Client for the beanstalkd workqueue service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hbeat" = callPackage
@@ -113438,6 +120889,8 @@ self: {
        executableSystemDepends = [ SDL_mixer ];
        description = "A simple step sequencer GUI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) SDL_mixer;};
 
   "hbf" = callPackage
@@ -113474,6 +120927,8 @@ self: {
        ];
        description = "An optimizing Brainfuck compiler and evaluator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hblas" = callPackage
@@ -113491,6 +120946,8 @@ self: {
        testHaskellDepends = [ base hspec primitive vector ];
        description = "Human friendly BLAS and Lapack bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) blas; liblapack = null;};
 
   "hblock" = callPackage
@@ -113510,6 +120967,8 @@ self: {
        ];
        description = "A mutable vector that provides indexation on the datatype fields it stores";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hbro" = callPackage
@@ -113597,6 +121056,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Haskell Bottom Up Rewrite Generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcad" = callPackage
@@ -113608,6 +121069,8 @@ self: {
        libraryHaskellDepends = [ base containers gasp mtl ];
        description = "Haskell CAD library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcc" = callPackage
@@ -113621,6 +121084,8 @@ self: {
        executableHaskellDepends = [ base bytestring language-c ];
        description = "A toy C compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcg-minus" = callPackage
@@ -113633,6 +121098,8 @@ self: {
        libraryHaskellDepends = [ base colour random ];
        description = "haskell cg (minus)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcg-minus-cairo" = callPackage
@@ -113648,6 +121115,8 @@ self: {
        ];
        description = "haskell cg (minus) (cairo rendering)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcheat" = callPackage
@@ -113660,6 +121129,8 @@ self: {
        libraryHaskellDepends = [ base mps ];
        description = "A collection of code cheatsheet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcheckers" = callPackage
@@ -113692,6 +121163,8 @@ self: {
        ];
        description = "Implementation of checkers (\"draughts\") board game - server application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hchesslib" = callPackage
@@ -113708,6 +121181,8 @@ self: {
        ];
        description = "Chess library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcltest" = callPackage
@@ -113728,6 +121203,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "A testing library for command line applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcoap" = callPackage
@@ -113750,6 +121227,8 @@ self: {
        ];
        description = "CoAP implementation for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcobs" = callPackage
@@ -113784,6 +121263,8 @@ self: {
        doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcoord" = callPackage
@@ -113817,6 +121298,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "hcube" = callPackage
@@ -113837,6 +121320,8 @@ self: {
        ];
        description = "Virtual Rubik's cube of arbitrary size";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcwiid" = callPackage
@@ -113880,6 +121365,8 @@ self: {
        ];
        description = "Library to handle the details of writing daemons for UNIX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbc-aeson" = callPackage
@@ -113896,6 +121383,8 @@ self: {
        ];
        description = "Deserialize from HDBC rows to FromJSON instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbc-postgresql-hstore" = callPackage
@@ -113907,6 +121396,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbc-tuple" = callPackage
@@ -113945,6 +121436,8 @@ self: {
        ];
        description = "Haskell Database Independent interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbi-conduit" = callPackage
@@ -113965,6 +121458,8 @@ self: {
        ];
        description = "Conduit glue for HDBI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbi-postgresql" = callPackage
@@ -113992,6 +121487,8 @@ self: {
        ];
        description = "PostgreSQL driver for hdbi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbi-sqlite" = callPackage
@@ -114011,6 +121508,8 @@ self: {
        ];
        description = "SQlite driver for HDBI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbi-tests" = callPackage
@@ -114030,6 +121529,8 @@ self: {
        ];
        description = "test suite for testing HDBI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdevtools" = callPackage
@@ -114049,6 +121550,8 @@ self: {
        ];
        description = "Persistent GHC powered background server for FAST haskell development tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdf" = callPackage
@@ -114066,6 +121569,8 @@ self: {
        ];
        description = "HDF: Uniform Rate Audio Signal Processing in Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdf5-lite" = callPackage
@@ -114118,6 +121623,8 @@ self: {
        ];
        description = "Pattern-Expression-based differencing of arbitrary types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdigest" = callPackage
@@ -114132,6 +121639,8 @@ self: {
        ];
        description = "Server-side HTTP Digest (RFC2617) in the CGI monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdirect" = callPackage
@@ -114150,6 +121659,8 @@ self: {
        executableToolDepends = [ happy ];
        description = "An IDL compiler for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdis86" = callPackage
@@ -114161,6 +121672,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers QuickCheck ];
        description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdiscount" = callPackage
@@ -114173,6 +121686,8 @@ self: {
        librarySystemDepends = [ markdown ];
        description = "Haskell bindings to the Discount markdown library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {markdown = null;};
 
   "hdm" = callPackage
@@ -114186,6 +121701,8 @@ self: {
        executableHaskellDepends = [ base directory process unix vty ];
        description = "a small display manager";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdo" = callPackage
@@ -114213,6 +121730,8 @@ self: {
        ];
        description = "A Digital Ocean client in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdocs" = callPackage
@@ -114237,6 +121756,8 @@ self: {
        testHaskellDepends = [ base containers mtl ];
        description = "Haskell docs tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdph" = callPackage
@@ -114263,6 +121784,8 @@ self: {
        ];
        description = "Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdph-closure" = callPackage
@@ -114278,6 +121801,8 @@ self: {
        ];
        description = "Explicit closures in Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdr-histogram" = callPackage
@@ -114297,6 +121822,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq primitive ];
        description = "Haskell implementation of High Dynamic Range (HDR) Histograms";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "headed-megaparsec" = callPackage
@@ -114331,6 +121858,8 @@ self: {
        ];
        description = "Creates a header for a haskell source file";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "headroom" = callPackage
@@ -114409,6 +121938,8 @@ self: {
        executableHaskellDepends = [ array base ];
        description = "Heapsort of MArrays as a demo of imperative programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heart-app" = callPackage
@@ -114424,6 +121955,8 @@ self: {
        ];
        description = "An opinionated app prelude and framework in the UnliftIO style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heart-core" = callPackage
@@ -114443,6 +121976,8 @@ self: {
        ];
        description = "An opinionated library prelude in the UnliftIO style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heartbeat-streams" = callPackage
@@ -114454,6 +121989,8 @@ self: {
        libraryHaskellDepends = [ async base io-streams time ];
        description = "Heartbeats for io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heatitup" = callPackage
@@ -114483,6 +122020,8 @@ self: {
        ];
        description = "Find and annotate ITDs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heatitup-complete" = callPackage
@@ -114506,6 +122045,8 @@ self: {
        ];
        description = "Find and annotate ITDs with assembly or read pair joining";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heatshrink" = callPackage
@@ -114539,6 +122080,8 @@ self: {
        ];
        description = "Simle api for heavy logger";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heavy-logger" = callPackage
@@ -114560,6 +122103,8 @@ self: {
        ];
        description = "Full-weight logging based on fast-logger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heavy-logger-amazon" = callPackage
@@ -114575,6 +122120,8 @@ self: {
        ];
        description = "heavy-logger compatibility with amazonka-core logging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heavy-logger-instances" = callPackage
@@ -114595,6 +122142,8 @@ self: {
        ];
        description = "Orphan instances for data types in heavy-logger package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hebrew-time" = callPackage
@@ -114607,6 +122156,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck time ];
        description = "Hebrew dates and prayer times";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hecc" = callPackage
@@ -114619,6 +122170,8 @@ self: {
        libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heckin" = callPackage
@@ -114650,6 +122203,8 @@ self: {
        executableHaskellDepends = [ base directory process split ];
        description = "Jekyll in Haskell (feat. LaTeX)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog" = callPackage
@@ -114691,6 +122246,8 @@ self: {
        ];
        testHaskellDepends = [ base either hedgehog ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-checkers-lens" = callPackage
@@ -114702,6 +122259,8 @@ self: {
        libraryHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
        testHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-classes" = callPackage
@@ -114797,6 +122356,8 @@ self: {
        ];
        description = "JSON generators for Hedgehog";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-generic" = callPackage
@@ -114808,6 +122369,8 @@ self: {
        libraryHaskellDepends = [ base hedgehog ];
        description = "GHC Generics automatically derived hedgehog generators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-golden" = callPackage
@@ -114825,6 +122388,8 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        description = "Golden testing capabilities for hedgehog using Aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-quickcheck" = callPackage
@@ -114859,6 +122424,8 @@ self: {
        ];
        description = "Hedgehog property testing for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedis" = callPackage
@@ -114899,6 +122466,8 @@ self: {
        ];
        description = "Easy trivial configuration for Redis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedis-envy" = callPackage
@@ -114961,6 +122530,8 @@ self: {
        ];
        description = "Caching mandatory data with Redis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedis-simple" = callPackage
@@ -114972,6 +122543,8 @@ self: {
        libraryHaskellDepends = [ base bytestring either hedis mtl ];
        description = "A simplified API for hedis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedis-tags" = callPackage
@@ -114989,6 +122562,8 @@ self: {
        ];
        description = "Tags for hedis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedn" = callPackage
@@ -115025,6 +122600,8 @@ self: {
        ];
        description = "Base functor for EDN AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedra" = callPackage
@@ -115040,6 +122617,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A small library and executable for generating dice rolls";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heidi" = callPackage
@@ -115065,6 +122644,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion weigh ];
        description = "Tidy data in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hein" = callPackage
@@ -115083,6 +122664,8 @@ self: {
        ];
        description = "An extensible build helper for haskell, in the vein of leiningen";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heist" = callPackage
@@ -115141,6 +122724,8 @@ self: {
        ];
        description = "Use JSON directly from Heist templates";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heist-async" = callPackage
@@ -115154,6 +122739,8 @@ self: {
        ];
        description = "Adding support for asynchronous updates (\"AJAX\") with heist";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "helf" = callPackage
@@ -115199,6 +122786,8 @@ self: {
        ];
        description = "New Relic® agent SDK wrapper for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {newrelic-collector-client = null; newrelic-common = null; 
          newrelic-transaction = null;};
 
@@ -115217,6 +122806,8 @@ self: {
        ];
        description = "New Relic® agent SDK wrapper for wai";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "helisp" = callPackage
@@ -115230,6 +122821,8 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec process ];
        description = "An incomplete Elisp compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "helium" = callPackage
@@ -115253,6 +122846,8 @@ self: {
        ];
        description = "The Helium Compiler";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "helium-overture" = callPackage
@@ -115292,6 +122887,8 @@ self: {
        ];
        description = "Web development micro framework for haskell with typesafe URLs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hell" = callPackage
@@ -115316,6 +122913,8 @@ self: {
        executableHaskellDepends = [ base transformers utf8-string ];
        description = "A Haskell shell based on shell-conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hellage" = callPackage
@@ -115335,6 +122934,8 @@ self: {
        ];
        description = "Distributed hackage mirror";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hellnet" = callPackage
@@ -115359,6 +122960,8 @@ self: {
        ];
        description = "Simple, distributed, anonymous data sharing network";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hello" = callPackage
@@ -115410,6 +123013,8 @@ self: {
        ];
        description = "A Haskell client for the Help.com team's ESB.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hemkay" = callPackage
@@ -115427,6 +123032,8 @@ self: {
        ];
        description = "A module music mixer and player";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hemkay-core" = callPackage
@@ -115467,6 +123074,8 @@ self: {
        benchmarkHaskellDepends = [ base conduit criterion mtl ];
        description = "Haskell port of the Emokit EEG project";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hen" = callPackage
@@ -115487,6 +123096,8 @@ self: {
        ];
        description = "Haskell bindings to Xen hypervisor interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {xenctrl = null;};
 
   "henet" = callPackage
@@ -115501,6 +123112,8 @@ self: {
        ];
        description = "Bindings and high level interface for to ENet v1.3.9";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hepevt" = callPackage
@@ -115512,6 +123125,8 @@ self: {
        libraryHaskellDepends = [ bytestring haskell2010 lha ];
        description = "HEPEVT parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "her-lexer" = callPackage
@@ -115523,6 +123138,8 @@ self: {
        libraryHaskellDepends = [ base mtl split ];
        description = "A lexer for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "her-lexer-parsec" = callPackage
@@ -115534,6 +123151,8 @@ self: {
        libraryHaskellDepends = [ base her-lexer parsec transformers ];
        description = "Parsec frontend to \"her-lexer\" for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "herbalizer" = callPackage
@@ -115551,6 +123170,8 @@ self: {
        ];
        description = "HAML to ERB translator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hercules-ci-agent" = callPackage
@@ -115706,6 +123327,8 @@ self: {
        testHaskellDepends = [ base bytestring doctest text ];
        description = "Heredocument on Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "herf-time" = callPackage
@@ -115747,6 +123370,8 @@ self: {
        ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hermit-syb" = callPackage
@@ -115762,6 +123387,8 @@ self: {
        ];
        description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "herms" = callPackage
@@ -115782,6 +123409,8 @@ self: {
        ];
        description = "A command-line manager for delicious kitchen recipes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hero-club-five-tenets" = callPackage
@@ -115843,6 +123472,8 @@ self: {
        ];
        description = "A library for compiling and serving static web assets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "herringbone-embed" = callPackage
@@ -115859,6 +123490,8 @@ self: {
        ];
        description = "Embed preprocessed web assets in your executable with Template Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "herringbone-wai" = callPackage
@@ -115875,6 +123508,8 @@ self: {
        ];
        description = "Wai adapter for the Herringbone web asset preprocessor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hesh" = callPackage
@@ -115901,6 +123536,8 @@ self: {
        ];
        description = "the Haskell Extensible Shell: Haskell for Bash-style scripts";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hesql" = callPackage
@@ -115918,6 +123555,8 @@ self: {
        ];
        description = "Haskell's embedded SQL";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hetero-dict" = callPackage
@@ -115938,6 +123577,8 @@ self: {
        ];
        description = "Fast heterogeneous data structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hetero-map" = callPackage
@@ -115979,6 +123620,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Allows the use of tuples as literals for Heterogeneous collections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heterolist" = callPackage
@@ -115996,6 +123639,8 @@ self: {
        ];
        description = "A heterogeneous list type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hetris" = callPackage
@@ -116012,6 +123657,8 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Text Tetris";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "heukarya" = callPackage
@@ -116026,6 +123673,8 @@ self: {
        ];
        description = "A genetic programming based on tree structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hevm" = callPackage
@@ -116073,6 +123722,8 @@ self: {
        testSystemDepends = [ secp256k1 ];
        description = "Ethereum virtual machine evaluator";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ff = null; inherit (pkgs) secp256k1;};
 
   "hevolisa" = callPackage
@@ -116089,6 +123740,8 @@ self: {
        ];
        description = "Genetic Mona Lisa problem in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hevolisa-dph" = callPackage
@@ -116107,6 +123760,8 @@ self: {
        ];
        description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hex" = callPackage
@@ -116131,6 +123786,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "ByteString-Text hexidecimal conversions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexchat" = callPackage
@@ -116142,6 +123799,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Haskell scripting interface for HexChat";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexdump" = callPackage
@@ -116165,6 +123824,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring filepath ];
        description = "Reading Exif data form a JPEG file with Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexmino" = callPackage
@@ -116183,6 +123844,8 @@ self: {
        ];
        description = "A small game based on domino-like hexagonal tiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexml" = callPackage
@@ -116215,6 +123878,8 @@ self: {
        ];
        description = "Lenses for the hexml package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexpat" = callPackage
@@ -116249,6 +123914,8 @@ self: {
        ];
        description = "Chunked XML parsing using iteratees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexpat-lens" = callPackage
@@ -116297,6 +123964,8 @@ self: {
        ];
        description = "Picklers for de/serialising Generic data types to and from XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexpat-streamparser" = callPackage
@@ -116337,6 +124006,8 @@ self: {
        ];
        description = "A framework for symbolic, homoiconic languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexpress" = callPackage
@@ -116354,6 +124025,8 @@ self: {
        ];
        description = "An express-like http framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexquote" = callPackage
@@ -116369,6 +124042,8 @@ self: {
        ];
        description = "Hexadecimal ByteString literals, with placeholders that bind variables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexstring" = callPackage
@@ -116402,6 +124077,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "a text classification library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hextra" = callPackage
@@ -116467,6 +124144,8 @@ self: {
        ];
        description = "A server for Eye-Fi SD cards";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heyting-algebras" = callPackage
@@ -116488,6 +124167,8 @@ self: {
        ];
        description = "Heyting and Boolean algebras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hfann" = callPackage
@@ -116503,6 +124184,8 @@ self: {
        libraryPkgconfigDepends = [ fann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {doublefann = null; fann = null;};
 
   "hfd" = callPackage
@@ -116521,6 +124204,8 @@ self: {
        ];
        description = "Flash debugger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hfiar" = callPackage
@@ -116536,6 +124221,8 @@ self: {
        executableHaskellDepends = [ wx wxcore ];
        description = "Four in a Row in Haskell!!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hflags" = callPackage
@@ -116576,6 +124263,8 @@ self: {
        ];
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hfoil" = callPackage
@@ -116595,6 +124284,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Hess-Smith panel code for inviscid 2-d airfoil analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hformat" = callPackage
@@ -116622,6 +124313,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Field-of-view calculation for low-resolution 2D raster grids";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hfractal" = callPackage
@@ -116640,6 +124333,8 @@ self: {
        ];
        description = "OpenGL fractal renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hfsevents" = callPackage
@@ -116670,6 +124365,8 @@ self: {
        ];
        description = "A library for fusing a subset of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hg-buildpackage" = callPackage
@@ -116688,6 +124385,8 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Mercurial";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgal" = callPackage
@@ -116710,6 +124409,8 @@ self: {
        libraryHaskellDepends = [ array base haskell98 mtl ];
        description = "Haskell Genetic Algorithm Library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgdbmi" = callPackage
@@ -116728,6 +124429,8 @@ self: {
        ];
        description = "GDB Machine Interface: program-driven control of GDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgearman" = callPackage
@@ -116745,6 +124448,8 @@ self: {
        ];
        description = "A Gearman client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgen" = callPackage
@@ -116760,6 +124465,8 @@ self: {
        ];
        description = "Random generation of modal and hybrid logic formulas";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgeometric" = callPackage
@@ -116771,6 +124478,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A geometric library with bindings to GPC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgeometry" = callPackage
@@ -116860,6 +124569,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Reading and Writing ipe7 files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgeometry-svg" = callPackage
@@ -116880,6 +124591,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Writing geometric primitives from HGeometry as SVG Files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgeos" = callPackage
@@ -116894,6 +124607,8 @@ self: {
        testHaskellDepends = [ base MissingH ];
        description = "Simple Haskell bindings to GEOS C API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {geos_c = null;};
 
   "hgettext" = callPackage
@@ -116916,6 +124631,8 @@ self: {
        ];
        description = "Bindings to libintl.h (gettext, bindtextdomain)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgis" = callPackage
@@ -116939,6 +124656,8 @@ self: {
        doHaddock = false;
        description = "Library and for GIS with Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgithub" = callPackage
@@ -116959,6 +124678,8 @@ self: {
        executableHaskellDepends = [ base cmdargs directory ];
        description = "Haskell bindings to the GitHub API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgl-example" = callPackage
@@ -116990,6 +124711,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell interface to GMP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgom" = callPackage
@@ -117008,6 +124731,8 @@ self: {
        ];
        description = "An haskell port of the java version of gom";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgopher" = callPackage
@@ -117019,6 +124744,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Gopher server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgrep" = callPackage
@@ -117041,6 +124768,8 @@ self: {
        ];
        description = "Search Haskell source code from the command line";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgrev" = callPackage
@@ -117074,6 +124803,8 @@ self: {
        testHaskellDepends = [ base directory hspec ];
        description = "Unofficial bindings for GRIB API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {grib_api = null;};
 
   "hharp" = callPackage
@@ -117086,6 +124817,8 @@ self: {
        librarySystemDepends = [ harp ];
        description = "Binding to libharp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {harp = null;};
 
   "hhp" = callPackage
@@ -117112,6 +124845,8 @@ self: {
        ];
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hhwloc" = callPackage
@@ -117125,6 +124860,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bindings to https://www.open-mpi.org/projects/hwloc";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hi" = callPackage
@@ -117189,6 +124926,8 @@ self: {
        executableHaskellDepends = [ base dbus process ];
        description = "Status line for i3bar";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hiccup" = callPackage
@@ -117208,6 +124947,8 @@ self: {
        ];
        description = "Relatively efficient Tcl interpreter with support for basic operations";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hichi" = callPackage
@@ -117221,6 +124962,8 @@ self: {
        executableHaskellDepends = [ array base bytestring mtl network ];
        description = "haskell robot for IChat protocol";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hid" = callPackage
@@ -117268,6 +125011,8 @@ self: {
        doHaddock = false;
        description = "Examples to accompany the book \"Haskell in Depth\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hidapi" = callPackage
@@ -117298,6 +125043,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Provides cross-platform getHiddenChar function";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hie-bios" = callPackage
@@ -117382,6 +125129,8 @@ self: {
        ];
        description = "The core of an IDE";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hieraclus" = callPackage
@@ -117393,6 +125142,8 @@ self: {
        libraryHaskellDepends = [ base containers HUnit mtl multiset ];
        description = "Automated clustering of arbitrary elements in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hierarchical-clustering" = callPackage
@@ -117425,6 +125176,8 @@ self: {
        ];
        description = "Draw diagrams of dendrograms made by hierarchical-clustering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hierarchical-exceptions" = callPackage
@@ -117436,6 +125189,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell functions to easily create exception hierarchies";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hierarchical-spectral-clustering" = callPackage
@@ -117466,6 +125221,8 @@ self: {
        ];
        description = "Hierarchical spectral clustering of a graph";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hierarchy" = callPackage
@@ -117488,6 +125245,8 @@ self: {
        ];
        description = "Predicated traversal of generated trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hiernotify" = callPackage
@@ -117503,6 +125262,8 @@ self: {
        ];
        description = "Notification library for a filesystem hierarchy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hifi" = callPackage
@@ -117542,6 +125303,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Partial types as a type constructor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "highWaterMark" = callPackage
@@ -117556,6 +125319,8 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Memory usage statistics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "higher-leveldb" = callPackage
@@ -117592,6 +125357,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some higher order functions for Bool and []";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "highjson" = callPackage
@@ -117609,6 +125376,8 @@ self: {
        ];
        description = "Spec based JSON parsing/serialisation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "highjson-swagger" = callPackage
@@ -117627,6 +125396,8 @@ self: {
        ];
        description = "Derive swagger instances from highjson specs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "highjson-th" = callPackage
@@ -117647,6 +125418,8 @@ self: {
        ];
        description = "Template Haskell helpers for highjson specs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "highlight" = callPackage
@@ -117694,6 +125467,8 @@ self: {
        ];
        description = "Highlight package versions which differ from the latest version on Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "highlighter" = callPackage
@@ -117809,6 +125584,8 @@ self: {
        ];
        description = "Simple gtk2hs image viewer. Point it at an image and fire away.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "himpy" = callPackage
@@ -117830,6 +125607,8 @@ self: {
        ];
        description = "multithreaded snmp poller for riemann";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hindent" = callPackage
@@ -117864,6 +125643,8 @@ self: {
        ];
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hindley-milner" = callPackage
@@ -117880,6 +125661,8 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "Template for Hindley-Milner based languages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinduce-associations-apriori" = callPackage
@@ -117906,6 +125689,8 @@ self: {
        libraryHaskellDepends = [ base hinduce-missingh layout ];
        description = "Interface and utilities for classifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinduce-classifier-decisiontree" = callPackage
@@ -117923,6 +125708,8 @@ self: {
        ];
        description = "Decision Tree Classifiers for hInduce";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinduce-examples" = callPackage
@@ -117942,6 +125729,8 @@ self: {
        ];
        description = "Example data for hInduce";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinduce-missingh" = callPackage
@@ -118039,6 +125828,8 @@ self: {
        ];
        description = "Generate armet style query strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinstaller" = callPackage
@@ -118054,6 +125845,8 @@ self: {
        ];
        description = "Installer wrapper for Haskell applications";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hint" = callPackage
@@ -118089,6 +125882,8 @@ self: {
        ];
        description = "A server process that runs hint";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinter" = callPackage
@@ -118110,6 +125905,8 @@ self: {
        ];
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinterface" = callPackage
@@ -118135,6 +125932,8 @@ self: {
        ];
        description = "Haskell / Erlang interoperability library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinvaders" = callPackage
@@ -118149,6 +125948,8 @@ self: {
        executableHaskellDepends = [ base haskell98 random ];
        description = "Space Invaders";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinze-streams" = callPackage
@@ -118160,6 +125961,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 Stream ];
        description = "Streams and Unique Fixed Points";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hip" = callPackage
@@ -118184,6 +125987,8 @@ self: {
        ];
        description = "Haskell Image Processing (HIP) Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hipbot" = callPackage
@@ -118208,6 +126013,8 @@ self: {
        ];
        description = "A library for building HipChat Bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hipchat-hs" = callPackage
@@ -118226,6 +126033,8 @@ self: {
        ];
        description = "Hipchat API bindings in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hipe" = callPackage
@@ -118241,6 +126050,8 @@ self: {
        ];
        description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hips" = callPackage
@@ -118274,6 +126085,8 @@ self: {
        ];
        description = "IRC client";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hirt" = callPackage
@@ -118294,6 +126107,8 @@ self: {
        ];
        description = "Calculates IRT 2PL and 3PL models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hissmetrics" = callPackage
@@ -118309,6 +126124,8 @@ self: {
        ];
        description = "Unofficial API bindings to KISSmetrics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hist-pl" = callPackage
@@ -118332,6 +126149,8 @@ self: {
        ];
        description = "Umbrella package for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hist-pl-dawg" = callPackage
@@ -118346,6 +126165,8 @@ self: {
        ];
        description = "A generic, DAWG-based dictionary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hist-pl-fusion" = callPackage
@@ -118362,6 +126183,8 @@ self: {
        ];
        description = "Merging historical dictionary with PoliMorf";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hist-pl-lexicon" = callPackage
@@ -118378,6 +126201,8 @@ self: {
        ];
        description = "A binary representation of the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hist-pl-lmf" = callPackage
@@ -118389,6 +126214,8 @@ self: {
        libraryHaskellDepends = [ base hist-pl-types polysoup text ];
        description = "LMF parsing for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hist-pl-transliter" = callPackage
@@ -118411,6 +126238,8 @@ self: {
        libraryHaskellDepends = [ base binary text text-binary ];
        description = "Types in the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "histogram-fill" = callPackage
@@ -118464,6 +126293,8 @@ self: {
        ];
        description = "Extract the interesting bits from shell history";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hit" = callPackage
@@ -118482,6 +126313,8 @@ self: {
        ];
        description = "Git like program in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hit-graph" = callPackage
@@ -118497,6 +126330,8 @@ self: {
        ];
        description = "Use graph algorithms to access and manipulate Git repos";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hit-on" = callPackage
@@ -118518,6 +126353,8 @@ self: {
        testHaskellDepends = [ base github hspec text ];
        description = "Haskell Git Helper Tool";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjcase" = callPackage
@@ -118534,6 +126371,8 @@ self: {
        ];
        description = "Jcase library for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjpath" = callPackage
@@ -118563,6 +126402,8 @@ self: {
        ];
        description = "JavaScript Parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjsmin" = callPackage
@@ -118608,6 +126449,8 @@ self: {
        libraryHaskellDepends = [ base containers hjson ];
        description = "library for querying from JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjsonpointer" = callPackage
@@ -118629,6 +126472,8 @@ self: {
        ];
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjsonschema" = callPackage
@@ -118659,6 +126504,8 @@ self: {
        ];
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjugement" = callPackage
@@ -118708,6 +126555,8 @@ self: {
        ];
        description = "Majority Judgment and Helios-C command line tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjugement-protocol" = callPackage
@@ -118772,6 +126621,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Definition of \"Delta structures\" for higher kinded data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hkd-lens" = callPackage
@@ -118783,6 +126634,8 @@ self: {
        libraryHaskellDepends = [ base profunctors ];
        description = "Generic lens/prism/traversal-kinded data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hkdf" = callPackage
@@ -118829,6 +126682,8 @@ self: {
        ];
        description = "A library for higher kinded types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hlatex" = callPackage
@@ -118866,6 +126721,8 @@ self: {
        ];
        description = "Haskell binding to L-BFGS-B version 3.0";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gfortran;};
 
   "hlcm" = callPackage
@@ -118887,6 +126744,8 @@ self: {
        ];
        description = "Fast algorithm for mining closed frequent itemsets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hleap" = callPackage
@@ -118978,6 +126837,8 @@ self: {
        ];
        description = "Web API server for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hledger-chart" = callPackage
@@ -118996,6 +126857,8 @@ self: {
        ];
        description = "A pie chart image generator for the hledger accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hledger-diff" = callPackage
@@ -119102,6 +126965,8 @@ self: {
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hledger-lib" = callPackage
@@ -119224,6 +127089,8 @@ self: {
        ];
        description = "A curses-style console interface for the hledger accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hledger-web" = callPackage
@@ -119271,6 +127138,8 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Haskell binding to libBladeRF SDR library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libbladeRF;};
 
   "hlibcpuid" = callPackage
@@ -119298,6 +127167,8 @@ self: {
        librarySystemDepends = [ ev ];
        description = "FFI interface to libev";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ev = null;};
 
   "hlibfam" = callPackage
@@ -119310,6 +127181,8 @@ self: {
        librarySystemDepends = [ fam ];
        description = "FFI interface to libFAM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fam;};
 
   "hlibgit2" = callPackage
@@ -119409,6 +127282,8 @@ self: {
        ];
        description = "Client library for the Apache Livy REST API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hlogger" = callPackage
@@ -119420,6 +127295,8 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        description = "Simple, concurrent, extendable and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hlongurl" = callPackage
@@ -119438,6 +127315,8 @@ self: {
        ];
        description = "Library and utility interfacing to longurl.org";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hlrdb" = callPackage
@@ -119487,6 +127366,8 @@ self: {
        libraryHaskellDepends = [ base containers hcg-minus hps ];
        description = "Haskell Lindenmayer Systems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hls-plugin-api" = callPackage
@@ -119520,6 +127401,8 @@ self: {
        libraryHaskellDepends = [ base stm transformers unix X11 ];
        description = "Bindings to the herbstluftwm window manager";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hly" = callPackage
@@ -119534,6 +127417,8 @@ self: {
        ];
        description = "Haskell LilyPond";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmark" = callPackage
@@ -119552,6 +127437,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A tool and library for Markov chains based text generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmarkup" = callPackage
@@ -119565,6 +127452,8 @@ self: {
        ];
        description = "Simple wikitext-like markup format implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix" = callPackage
@@ -119640,6 +127529,8 @@ self: {
        librarySystemDepends = [ liblapack ];
        description = "HMatrix interface to LAPACK functions for banded matrices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {liblapack = null;};
 
   "hmatrix-csv" = callPackage
@@ -119705,6 +127596,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix mmap ];
        description = "Memory map Vector from disk into memory efficiently";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix-morpheus" = callPackage
@@ -119738,6 +127631,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "NIPALS method for Principal Components Analysis on large data-sets";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix-nlopt" = callPackage
@@ -119786,6 +127681,8 @@ self: {
        librarySystemDepends = [ mkl_core mkl_intel mkl_sequential ];
        description = "Sparse linear solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;};
 
   "hmatrix-special" = callPackage
@@ -119812,6 +127709,8 @@ self: {
        ];
        description = "hmatrix with vector and matrix sizes encoded in types";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix-sundials" = callPackage
@@ -119839,6 +127738,8 @@ self: {
        ];
        description = "hmatrix interface to sundials";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {sundials_arkode = null; sundials_cvode = null;};
 
   "hmatrix-svdlibc" = callPackage
@@ -119854,6 +127755,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion hmatrix vector ];
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix-syntax" = callPackage
@@ -119869,6 +127772,8 @@ self: {
        ];
        description = "MATLAB-like syntax for hmatrix vectors and matrices";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix-tests" = callPackage
@@ -119886,6 +127791,8 @@ self: {
        benchmarkHaskellDepends = [ base HUnit QuickCheck random ];
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix-vector-sized" = callPackage
@@ -119917,6 +127824,8 @@ self: {
        ];
        description = "Haskell Meapsoft Parser";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmeap-utils" = callPackage
@@ -119936,6 +127845,8 @@ self: {
        ];
        description = "Haskell Meapsoft Parser Utilities";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmemdb" = callPackage
@@ -119964,6 +127875,8 @@ self: {
        executableHaskellDepends = [ base MissingH process ];
        description = "CLI fuzzy finder and launcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmep" = callPackage
@@ -119983,6 +127896,8 @@ self: {
        testHaskellDepends = [ base HUnit vector ];
        description = "HMEP Multi Expression Programming – a genetic programming variant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmidi" = callPackage
@@ -120013,6 +127928,8 @@ self: {
        ];
        description = "A make alternative based on Plan9's mk";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmm" = callPackage
@@ -120028,6 +127945,8 @@ self: {
        ];
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmm-hmatrix" = callPackage
@@ -120046,6 +127965,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using HMatrix primitives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmm-lapack" = callPackage
@@ -120066,6 +127987,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using LAPACK primitives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmp3" = callPackage
@@ -120086,6 +128009,8 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "hmp3-ng" = callPackage
@@ -120139,6 +128064,8 @@ self: {
        ];
        description = "Haskell Music Theory";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmt-diagrams" = callPackage
@@ -120156,6 +128083,8 @@ self: {
        ];
        description = "Haskell Music Theory Diagrams";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmumps" = callPackage
@@ -120174,6 +128103,8 @@ self: {
        ];
        description = "Interpreter for the MUMPS langugae";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hnetcdf" = callPackage
@@ -120203,6 +128134,8 @@ self: {
        testSystemDepends = [ netcdf ];
        description = "Haskell NetCDF library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
@@ -120309,6 +128242,8 @@ self: {
        ];
        description = "Remote hnix store";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hnn" = callPackage
@@ -120394,6 +128329,8 @@ self: {
        ];
        description = "Log message normalisation tool producing structured JSON messages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ho-rewriting" = callPackage
@@ -120409,6 +128346,8 @@ self: {
        testHaskellDepends = [ base compdata patch-combinators ];
        description = "Generic rewrite rules with safe treatment of variables and binders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoauth" = callPackage
@@ -120426,6 +128365,8 @@ self: {
        ];
        description = "A Haskell implementation of OAuth 1.0a protocol.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoauth2" = callPackage
@@ -120473,6 +128414,8 @@ self: {
        ];
        description = "A source code editor aiming for the convenience of use";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hobbes" = callPackage
@@ -120490,6 +128433,8 @@ self: {
        ];
        description = "A small file watcher for OSX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hobbits" = callPackage
@@ -120507,6 +128452,8 @@ self: {
        ];
        description = "A library for canonically representing terms with binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hocilib" = callPackage
@@ -120526,6 +128473,8 @@ self: {
        testSystemDepends = [ ocilib ];
        description = "FFI binding to OCILIB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ocilib = null;};
 
   "hocker" = callPackage
@@ -120591,6 +128540,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "A fully featured date/time library based on Nodatime";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoe" = callPackage
@@ -120609,6 +128560,8 @@ self: {
        ];
        description = "hoe: Haskell One-liner Evaluator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hofix-mtl" = callPackage
@@ -120638,6 +128591,8 @@ self: {
        ];
        description = "Simple IRC logger bot";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hogg" = callPackage
@@ -120655,6 +128610,8 @@ self: {
        ];
        description = "Library and tools to manipulate the Ogg container format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoggl" = callPackage
@@ -120680,6 +128637,8 @@ self: {
        ];
        description = "Bindings to the Toggl.com REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hogre" = callPackage
@@ -120695,6 +128654,8 @@ self: {
        doHaddock = false;
        description = "Haskell binding to a subset of OGRE";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;};
 
   "hogre-examples" = callPackage
@@ -120710,6 +128671,8 @@ self: {
        executableSystemDepends = [ OgreMain ];
        description = "Examples for using Hogre";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OgreMain = null;};
 
   "hois" = callPackage
@@ -120725,6 +128688,8 @@ self: {
        executableHaskellDepends = [ base X11 ];
        description = "OIS bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OIS = null;};
 
   "hoist-error" = callPackage
@@ -120738,6 +128703,8 @@ self: {
        libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hol" = callPackage
@@ -120768,6 +128735,8 @@ self: {
        ];
        description = "Higher order logic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hold-em" = callPackage
@@ -120779,6 +128748,8 @@ self: {
        libraryHaskellDepends = [ base random safe ];
        description = "An engine for Texas hold'em Poker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hole" = callPackage
@@ -120790,6 +128761,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Higher kinded type removal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "holey-format" = callPackage
@@ -120825,6 +128798,8 @@ self: {
        testToolDepends = [ markdown-unlit tasty-discover ];
        description = "Tools and combinators for solving constraint problems";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "holy-project" = callPackage
@@ -120859,6 +128834,8 @@ self: {
        doCheck = false;
        description = "Start your Haskell project with cabal, git and tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "homeomorphic" = callPackage
@@ -120870,6 +128847,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl QuickCheck ];
        description = "Homeomorphic Embedding Test";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hommage" = callPackage
@@ -120883,6 +128862,8 @@ self: {
        ];
        description = "Haskell Offline Music Manipulation And Generation EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hommage-ds" = callPackage
@@ -120909,6 +128890,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constructs FAlgebras from typeclasses, making Haskell functions homoiconic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "homotuple" = callPackage
@@ -120950,6 +128933,8 @@ self: {
        ];
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "homura-stopwatch" = callPackage
@@ -120979,6 +128964,8 @@ self: {
        testSystemDepends = [ freenect OpenNI2 ];
        description = "OpenNI 2 binding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OpenNI2 = null; inherit (pkgs) freenect;};
 
   "honk" = callPackage
@@ -121008,6 +128995,8 @@ self: {
        ];
        description = "Simple tool for fetching and merging hoogle data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hood" = callPackage
@@ -121020,6 +129009,8 @@ self: {
        testHaskellDepends = [ base ghc-prim ];
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hood-off" = callPackage
@@ -121031,6 +129022,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dummy package to disable Hood without having to remove all the calls to observe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hood2" = callPackage
@@ -121042,6 +129035,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodie" = callPackage
@@ -121059,6 +129054,8 @@ self: {
        ];
        description = "A small, toy roguelike";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle" = callPackage
@@ -121079,6 +129076,8 @@ self: {
        executableHaskellDepends = [ base cmdargs hoodle-core ];
        description = "Executable for hoodle";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle-builder" = callPackage
@@ -121095,6 +129094,8 @@ self: {
        ];
        description = "text builder for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle-core" = callPackage
@@ -121127,6 +129128,8 @@ self: {
        librarySystemDepends = [ libX11 libXi ];
        description = "Core library for hoodle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;};
 
   "hoodle-extra" = callPackage
@@ -121152,6 +129155,8 @@ self: {
        ];
        description = "extra hoodle tools";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle-parser" = callPackage
@@ -121169,6 +129174,8 @@ self: {
        ];
        description = "Hoodle file parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle-publish" = callPackage
@@ -121195,6 +129202,8 @@ self: {
        ];
        description = "publish hoodle files as a static web site";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle-render" = callPackage
@@ -121215,6 +129224,8 @@ self: {
        ];
        description = "Hoodle file renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle-types" = callPackage
@@ -121231,6 +129242,8 @@ self: {
        ];
        description = "Data types for programs for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoogle" = callPackage
@@ -121282,6 +129295,8 @@ self: {
        ];
        description = "Easily generate Hoogle indices for installed packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hooks-dir" = callPackage
@@ -121293,6 +129308,8 @@ self: {
        libraryHaskellDepends = [ base directory process text ];
        description = "run executables in a directory as hooks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hookup" = callPackage
@@ -121330,6 +129347,8 @@ self: {
        ];
        description = "Object-Oriented Programming in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoopl" = callPackage
@@ -121349,6 +129368,8 @@ self: {
        ];
        description = "A library to support dataflow analysis and optimization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoovie" = callPackage
@@ -121372,6 +129393,8 @@ self: {
        ];
        description = "Haskell Media Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hopencc" = callPackage
@@ -121388,6 +129411,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell binding to libopencc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) opencc;};
 
   "hopencl" = callPackage
@@ -121407,6 +129432,8 @@ self: {
        ];
        description = "Haskell bindings for OpenCL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OpenCL = null;};
 
   "hopenpgp-tools" = callPackage
@@ -121485,6 +129512,8 @@ self: {
        ];
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {MagickCore = null; inherit (pkgs) imagemagick;};
 
   "hopfield-networks" = callPackage
@@ -121535,6 +129564,8 @@ self: {
        ];
        description = "C++ FFI generator - Documentation";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoppy-generator" = callPackage
@@ -121551,6 +129582,8 @@ self: {
        ];
        description = "C++ FFI generator - Code generator";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoppy-runtime" = callPackage
@@ -121564,6 +129597,8 @@ self: {
        ];
        description = "C++ FFI generator - Runtime support";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoppy-std" = callPackage
@@ -121578,6 +129613,8 @@ self: {
        ];
        description = "C++ FFI generator - Standard library bindings";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hops" = callPackage
@@ -121610,6 +129647,8 @@ self: {
        ];
        description = "Handy Operations on Power Series";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoq" = callPackage
@@ -121629,6 +129668,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A language based on homotopy type theory with an interval type";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hora" = callPackage
@@ -121657,6 +129698,8 @@ self: {
        libraryHaskellDepends = [ AC-Angle base time ];
        description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "horname" = callPackage
@@ -121675,6 +129718,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Rename function definitions returned by SMT solvers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hosc" = callPackage
@@ -121710,6 +129755,8 @@ self: {
        ];
        description = "Haskell Open Sound Control JSON Serialisation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hosc-utils" = callPackage
@@ -121789,6 +129836,8 @@ self: {
        ];
        description = "An dns server which is extremely easy to config";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hothasktags" = callPackage
@@ -121807,6 +129856,8 @@ self: {
        ];
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hotswap" = callPackage
@@ -121818,6 +129869,8 @@ self: {
        libraryHaskellDepends = [ base plugins ];
        description = "Simple code hotswapping";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hourglass" = callPackage
@@ -121848,6 +129901,8 @@ self: {
        libraryHaskellDepends = [ base hourglass parsec ];
        description = "A small library for parsing more human friendly date/time formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hourglass-orphans" = callPackage
@@ -121893,6 +129948,8 @@ self: {
        ];
        description = "A Haskell implementation of Foreman";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hout" = callPackage
@@ -121921,6 +129978,8 @@ self: {
        ];
        description = "Heap profiling helper library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hp2any-graph" = callPackage
@@ -121942,6 +130001,8 @@ self: {
        executableSystemDepends = [ freeglut libGL libGLU ];
        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;
+       broken = true;
      }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU;};
 
@@ -121963,6 +130024,8 @@ self: {
        ];
        description = "A utility to visualise and compare heap profiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hp2html" = callPackage
@@ -122064,6 +130127,8 @@ self: {
        ];
        description = "Convert Cabal manifests into hpack's package.yamls";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpack-dhall" = callPackage
@@ -122111,6 +130176,8 @@ self: {
        ];
        description = "Modular template compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpaco-lib" = callPackage
@@ -122128,6 +130195,8 @@ self: {
        ];
        description = "Modular template compiler library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpage" = callPackage
@@ -122149,6 +130218,8 @@ self: {
        ];
        description = "A scrapbook for Haskell developers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpapi" = callPackage
@@ -122161,6 +130232,8 @@ self: {
        librarySystemDepends = [ papi ];
        description = "Binding for the PAPI library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) papi;};
 
   "hpaste" = callPackage
@@ -122188,6 +130261,8 @@ self: {
        ];
        description = "Haskell paste web site";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpasteit" = callPackage
@@ -122207,6 +130282,8 @@ self: {
        ];
        description = "A command-line client for hpaste.org";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpath" = callPackage
@@ -122347,6 +130424,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpc-lcov" = callPackage
@@ -122419,6 +130498,8 @@ self: {
        ];
        description = "Tracer with AJAX interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpdft" = callPackage
@@ -122455,6 +130536,8 @@ self: {
        executableHaskellDepends = [ base random ];
        description = "a simple password generator";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpio" = callPackage
@@ -122484,6 +130567,8 @@ self: {
        ];
        description = "Monads for GPIO in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hplayground" = callPackage
@@ -122515,6 +130600,8 @@ self: {
        executableHaskellDepends = [ base directory filepath process ];
        description = "Application for managing playlist files on a music player";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpodder" = callPackage
@@ -122534,6 +130621,8 @@ self: {
        ];
        description = "Podcast Aggregator (downloader)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpp" = callPackage
@@ -122583,6 +130672,8 @@ self: {
        ];
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "hpqtypes-extras" = callPackage
@@ -122606,6 +130697,8 @@ self: {
        ];
        description = "Extra utilities for hpqtypes library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hprotoc" = callPackage
@@ -122635,6 +130728,8 @@ self: {
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -122663,6 +130758,8 @@ self: {
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hprox" = callPackage
@@ -122697,6 +130794,8 @@ self: {
        libraryHaskellDepends = [ base filepath hcg-minus process ];
        description = "Haskell Postscript";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hps-cairo" = callPackage
@@ -122712,6 +130811,8 @@ self: {
        executableHaskellDepends = [ base cairo gtk hps random ];
        description = "Cairo rendering for the haskell postscript library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hps-kmeans" = callPackage
@@ -122723,6 +130824,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "A nice implementation of the k-Means algorithm";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpuz" = callPackage
@@ -122751,6 +130854,8 @@ self: {
        ];
        description = "Highlight source code using Pygments";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpylos" = callPackage
@@ -122766,6 +130871,8 @@ self: {
        ];
        description = "AI of Pylos game with GLUT interface";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpyrg" = callPackage
@@ -122781,6 +130888,8 @@ self: {
        ];
        description = "pyrg utility done right";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpython" = callPackage
@@ -122810,6 +130919,8 @@ self: {
        ];
        description = "Python language tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hquantlib" = callPackage
@@ -122839,6 +130950,8 @@ self: {
        ];
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hquantlib-time" = callPackage
@@ -122850,6 +130963,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "HQuantLib Time is a business calendar functions extracted from HQuantLib";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hquery" = callPackage
@@ -122880,6 +130995,8 @@ self: {
        executableHaskellDepends = [ base HCL NonEmpty ];
        description = "Basic utility for ranking a list of items";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hreader" = callPackage
@@ -122899,6 +131016,8 @@ self: {
        testHaskellDepends = [ base hset transformers-base ];
        description = "Generalization of MonadReader and ReaderT using hset";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hreader-lens" = callPackage
@@ -122914,6 +131033,8 @@ self: {
        ];
        description = "Optics for hreader package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hreq-client" = callPackage
@@ -122942,6 +131063,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A Type dependent Highlevel HTTP client library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hreq-conduit" = callPackage
@@ -122966,6 +131089,8 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Conduit streaming support for Hreq";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hreq-core" = callPackage
@@ -122986,6 +131111,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Core functionality for Hreq Http client library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hrfsize" = callPackage
@@ -123011,6 +131138,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "A Cricket scoring application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hriemann" = callPackage
@@ -123036,6 +131165,8 @@ self: {
        ];
        description = "A Riemann Client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hruby" = callPackage
@@ -123102,6 +131233,8 @@ self: {
        benchmarkSystemDepends = [ libb2 ];
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libb2;};
 
   "hs-brotli" = callPackage
@@ -123122,6 +131255,8 @@ self: {
        ];
        description = "Compression and decompression in the brotli format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {brotlidec = null; brotlienc = null; libbrotlidec = null; 
          libbrotlienc = null;};
 
@@ -123163,6 +131298,8 @@ self: {
        ];
        description = "Example Monte Carlo simulations implemented with Carbon";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-cdb" = callPackage
@@ -123178,6 +131315,8 @@ self: {
        ];
        description = "A library for reading CDB (Constant Database) files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-conllu" = callPackage
@@ -123198,6 +131337,8 @@ self: {
        ];
        description = "Conllu validating parser and utils";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-di" = callPackage
@@ -123227,6 +131368,8 @@ self: {
        ];
        description = "Dependency Injection library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-dotnet" = callPackage
@@ -123239,6 +131382,8 @@ self: {
        librarySystemDepends = [ ole32 oleaut32 ];
        description = "Pragmatic .NET interop for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ole32 = null; oleaut32 = null;};
 
   "hs-duktape" = callPackage
@@ -123276,6 +131421,8 @@ self: {
        ];
        description = "HS-Excelx provides basic read-only access to Excel 2007 and 2010 documents in XLSX format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-ffmpeg" = callPackage
@@ -123287,6 +131434,8 @@ self: {
        libraryHaskellDepends = [ base bytestring haskell98 ];
        description = "Bindings to FFMPEG library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-fltk" = callPackage
@@ -123300,6 +131449,8 @@ self: {
        librarySystemDepends = [ fltk fltk_images ];
        description = "Binding to GUI library FLTK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fltk; fltk_images = null;};
 
   "hs-functors" = callPackage
@@ -123341,6 +131492,8 @@ self: {
        ];
        description = "Utility to generate haskell-names interface files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-gizapp" = callPackage
@@ -123356,6 +131509,8 @@ self: {
        ];
        description = "Haskell wrapper around the GIZA++ toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-inspector" = callPackage
@@ -123368,6 +131523,8 @@ self: {
        testHaskellDepends = [ base haskell-src hspec ];
        description = "Haskell source code analyzer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-ix" = callPackage
@@ -123398,6 +131555,8 @@ self: {
        ];
        description = "Java .class files assembler/disassembler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-json-rpc" = callPackage
@@ -123411,6 +131570,8 @@ self: {
        ];
        description = "JSON-RPC client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-logo" = callPackage
@@ -123437,6 +131598,8 @@ self: {
        ];
        description = "Logo interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-mesos" = callPackage
@@ -123495,6 +131658,8 @@ self: {
        executableHaskellDepends = [ base HandsomeSoup hxt random ];
        description = "Name generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-pattrans" = callPackage
@@ -123520,6 +131685,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "DSL for musical patterns and transformation, based on contravariant functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-pgms" = callPackage
@@ -123539,6 +131706,8 @@ self: {
        ];
        description = "Programmer's Mine Sweeper in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-php-session" = callPackage
@@ -123563,6 +131732,8 @@ self: {
        libraryHaskellDepends = [ base data-default-class text ];
        description = "Create pkg-config configuration files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-pkpass" = callPackage
@@ -123583,6 +131754,8 @@ self: {
        ];
        description = "A library for Passbook pass creation & signing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-popen" = callPackage
@@ -123619,6 +131792,8 @@ self: {
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        description = "Easy to use Regex";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-rqlite" = callPackage
@@ -123635,6 +131810,8 @@ self: {
        ];
        description = "A Haskell client for RQlite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-rs-notify" = callPackage
@@ -123655,6 +131832,8 @@ self: {
        testHaskellDepends = [ base protolude ];
        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;
+       broken = true;
      }) {notifier = null;};
 
   "hs-scrape" = callPackage
@@ -123675,6 +131854,8 @@ self: {
        ];
        description = "Simple and easy web scraping and automation in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-server-starter" = callPackage
@@ -123706,6 +131887,8 @@ self: {
        ];
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-speedscope" = callPackage
@@ -123724,6 +131907,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convert an eventlog into the speedscope json format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-twitter" = callPackage
@@ -123741,6 +131926,8 @@ self: {
        ];
        description = "Haskell binding to the Twitter API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-twitterarchiver" = callPackage
@@ -123755,6 +131942,8 @@ self: {
        executableHaskellDepends = [ base HTTP json mtl network pretty ];
        description = "Commandline Twitter feed archiver";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-vcard" = callPackage
@@ -123766,6 +131955,8 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        description = "Implements the RFC 2426 vCard 3.0 spec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-watchman" = callPackage
@@ -123785,6 +131976,8 @@ self: {
        ];
        description = "Client library for Facebook's Watchman tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-zstd" = callPackage
@@ -123871,6 +132064,8 @@ self: {
        ];
        description = "Haskell to Brainfuck compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs2dot" = callPackage
@@ -123901,6 +132096,8 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Translate Haskell types to PureScript";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsConfigure" = callPackage
@@ -123925,6 +132122,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "I2C access for Haskell and Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsPID" = callPackage
@@ -123953,6 +132152,8 @@ self: {
        ];
        description = "Sqlite3 bindings";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsXenCtrl" = callPackage
@@ -123965,6 +132166,8 @@ self: {
        librarySystemDepends = [ xenctrl ];
        description = "FFI bindings to the Xen Control library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {xenctrl = null;};
 
   "hsakamai" = callPackage
@@ -124024,6 +132227,8 @@ self: {
        ];
        description = "OASIS Security Assertion Markup Language (SAML) V2.0";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libxml2;};
 
   "hsass" = callPackage
@@ -124062,6 +132267,8 @@ self: {
        executableHaskellDepends = [ base Hclip HTTP process unix ];
        description = "(ab)Use Google Translate as a speech synthesiser";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsb2hs" = callPackage
@@ -124097,6 +132304,8 @@ self: {
        ];
        description = "simple utility for rolling filesystem backups";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsbc" = callPackage
@@ -124110,6 +132319,8 @@ self: {
        executableHaskellDepends = [ attoparsec base text vector ];
        description = "A command line calculator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsbencher" = callPackage
@@ -124132,6 +132343,8 @@ self: {
        ];
        description = "Launch and gather data from Haskell and non-Haskell benchmarks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsbencher-codespeed" = callPackage
@@ -124150,6 +132363,8 @@ self: {
        ];
        description = "Backend for uploading benchmark data to CodeSpeed";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsbencher-fusion" = callPackage
@@ -124173,6 +132388,8 @@ self: {
        ];
        description = "Backend for uploading benchmark data to Google Fusion Tables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc2hs" = callPackage
@@ -124211,6 +132428,8 @@ self: {
        ];
        description = "Haskell SuperCollider";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-auditor" = callPackage
@@ -124226,6 +132445,8 @@ self: {
        ];
        description = "Haskell SuperCollider Auditor";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-cairo" = callPackage
@@ -124238,6 +132459,8 @@ self: {
        libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ];
        description = "haskell supercollider cairo drawing";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-data" = callPackage
@@ -124255,6 +132478,8 @@ self: {
        ];
        description = "haskell supercollider data";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-db" = callPackage
@@ -124267,6 +132492,8 @@ self: {
        libraryHaskellDepends = [ base hsc3 safe ];
        description = "Haskell SuperCollider Unit Generator Database";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-dot" = callPackage
@@ -124279,6 +132506,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsc3 process ];
        description = "haskell supercollider graph drawing";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-forth" = callPackage
@@ -124298,6 +132527,8 @@ self: {
        ];
        description = "FORTH SUPERCOLLIDER";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-graphs" = callPackage
@@ -124322,6 +132553,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Haskell SuperCollider Graphs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-lang" = callPackage
@@ -124342,6 +132575,8 @@ self: {
        ];
        description = "Haskell SuperCollider Language";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-lisp" = callPackage
@@ -124361,6 +132596,8 @@ self: {
        ];
        description = "LISP SUPERCOLLIDER";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-plot" = callPackage
@@ -124378,6 +132615,8 @@ self: {
        ];
        description = "Haskell SuperCollider Plotting";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-process" = callPackage
@@ -124397,6 +132636,8 @@ self: {
        ];
        description = "Create and control scsynth processes";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-rec" = callPackage
@@ -124409,6 +132650,8 @@ self: {
        libraryHaskellDepends = [ base hsc3 ];
        description = "Haskell SuperCollider Record Variants";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-rw" = callPackage
@@ -124426,6 +132669,8 @@ self: {
        ];
        description = "hsc3 re-writing";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-server" = callPackage
@@ -124452,6 +132697,8 @@ self: {
        ];
        description = "SuperCollider server resource management and synchronization";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-sf" = callPackage
@@ -124464,6 +132711,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc ];
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-sf-hsndfile" = callPackage
@@ -124480,6 +132729,8 @@ self: {
        ];
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-unsafe" = callPackage
@@ -124492,6 +132743,8 @@ self: {
        libraryHaskellDepends = [ base hsc3 ];
        description = "Unsafe Haskell SuperCollider";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-utils" = callPackage
@@ -124513,6 +132766,8 @@ self: {
        ];
        description = "Haskell SuperCollider Utilities";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscaffold" = callPackage
@@ -124539,6 +132794,8 @@ self: {
        ];
        description = "Very simple file/directory structure scaffolding writer monad EDSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscamwire" = callPackage
@@ -124553,6 +132810,8 @@ self: {
        librarySystemDepends = [ camwire_1394 dc1394_control raw1394 ];
        description = "Haskell bindings to IIDC1394 cameras, via Camwire";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;};
 
   "hscassandra" = callPackage
@@ -124569,6 +132828,8 @@ self: {
        ];
        description = "cassandra database interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscd" = callPackage
@@ -124583,6 +132844,8 @@ self: {
        executableHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
        description = "Command line client and library for SoundCloud.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscharm" = callPackage
@@ -124691,6 +132954,8 @@ self: {
        executableHaskellDepends = [ base cairo glib gtk old-time ];
        description = "An elegant analog clock using Haskell, GTK and Cairo";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscolour" = callPackage
@@ -124728,6 +132993,8 @@ self: {
        ];
        description = "cscope like browser for Haskell code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscrtmpl" = callPackage
@@ -124762,6 +133029,8 @@ self: {
        testHaskellDepends = [ base containers text ];
        description = "Collision-resistant IDs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscurses" = callPackage
@@ -124835,6 +133104,8 @@ self: {
        ];
        description = "Haskell development library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsdif" = callPackage
@@ -124847,6 +133118,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc ];
        description = "Haskell SDIF";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsdip" = callPackage
@@ -124861,6 +133134,8 @@ self: {
        libraryHaskellDepends = [ base cairo containers HUnit parsec ];
        description = "hsdip - a Diplomacy parser/renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsdns" = callPackage
@@ -124893,6 +133168,8 @@ self: {
        ];
        description = "Caching asynchronous DNS resolver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hse-cpp" = callPackage
@@ -124984,6 +133261,8 @@ self: {
        ];
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hserv" = callPackage
@@ -125009,6 +133288,8 @@ self: {
        testHaskellDepends = [ base HUnit tagged ];
        description = "Primitive list with elements of unique types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsexif" = callPackage
@@ -125038,6 +133319,8 @@ self: {
        libraryHaskellDepends = [ base containers language-puppet text ];
        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;
+       broken = true;
      }) {};
 
   "hsfcsh" = callPackage
@@ -125053,6 +133336,8 @@ self: {
        ];
        description = "Incremental builder for flash";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsfilt" = callPackage
@@ -125066,6 +133351,8 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Z-decoder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsforce" = callPackage
@@ -125089,6 +133376,8 @@ self: {
        ];
        description = "Salesforce API Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsgnutls" = callPackage
@@ -125101,6 +133390,8 @@ self: {
        librarySystemDepends = [ gcrypt gnutls ];
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgnutls-yj" = callPackage
@@ -125113,6 +133404,8 @@ self: {
        librarySystemDepends = [ gcrypt gnutls ];
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgsom" = callPackage
@@ -125125,6 +133418,8 @@ self: {
        libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsgtd" = callPackage
@@ -125256,6 +133551,8 @@ self: {
        ];
        description = "Inspect Haskell source files";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsinspect-lsp" = callPackage
@@ -125286,6 +133583,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "LSP interface over the hsinspect binary";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsinstall" = callPackage
@@ -125317,6 +133616,8 @@ self: {
        libraryHaskellDepends = [ base Cabal ];
        description = "Skeleton for new Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hslackbuilder" = callPackage
@@ -125332,6 +133633,8 @@ self: {
        ];
        description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hslibsvm" = callPackage
@@ -125345,6 +133648,8 @@ self: {
        librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {svm = null;};
 
   "hslinks" = callPackage
@@ -125361,6 +133666,8 @@ self: {
        ];
        description = "Resolves links to Haskell identifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hslogger" = callPackage
@@ -125398,6 +133705,8 @@ self: {
        ];
        description = "Parsing hslogger-produced logs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hslogger-template" = callPackage
@@ -125409,6 +133718,8 @@ self: {
        libraryHaskellDepends = [ base hslogger mtl template-haskell ];
        description = "Automatic generation of hslogger functions";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hslogger4j" = callPackage
@@ -125447,6 +133758,8 @@ self: {
        ];
        description = "A library to work with, or as, a logstash server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hslua" = callPackage
@@ -125575,6 +133888,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring colour containers ];
        description = "HSLuv conversion utility";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsmagick" = callPackage
@@ -125598,6 +133913,8 @@ self: {
        ];
        description = "FFI bindings for the GraphicsMagick library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; 
          jasper = null; inherit (pkgs) lcms; inherit (pkgs) libjpeg; 
          inherit (pkgs) libpng; inherit (pkgs) libxml2; tiff = null; 
@@ -125634,6 +133951,8 @@ self: {
        ];
        description = "Tool for generating .dir-locals.el for intero";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsmtpclient" = callPackage
@@ -125645,6 +133964,8 @@ self: {
        libraryHaskellDepends = [ array base directory network old-time ];
        description = "Simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsndfile" = callPackage
@@ -125701,6 +134022,8 @@ self: {
        ];
        description = "Nock 5K interpreter";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsnoise" = callPackage
@@ -125725,6 +134048,8 @@ self: {
        executableHaskellDepends = [ base network pcap ];
        description = "a miniature network sniffer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsnsq" = callPackage
@@ -125743,6 +134068,8 @@ self: {
        ];
        description = "Haskell NSQ client";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsntp" = callPackage
@@ -125759,6 +134086,8 @@ self: {
        executableHaskellDepends = [ unix ];
        description = "Libraries to use SNTP protocol and small client/server implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsoptions" = callPackage
@@ -125783,6 +134112,8 @@ self: {
        ];
        description = "Haskell library that supports command-line flag processing";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsoz" = callPackage
@@ -125821,6 +134152,8 @@ self: {
        ];
        description = "Iron, Hawk, Oz: Web auth protocols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsp" = callPackage
@@ -125843,6 +134176,8 @@ self: {
        libraryHaskellDepends = [ base containers harp hsp network ];
        description = "Facilitates running Haskell Server Pages web pages as CGI programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsparklines" = callPackage
@@ -125875,6 +134210,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "hspear" = callPackage
@@ -125890,6 +134227,8 @@ self: {
        ];
        description = "Haskell Spear Parser";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec" = callPackage
@@ -126053,6 +134392,8 @@ self: {
        testHaskellDepends = [ aeson-qq base hspec ];
        description = "Hspec expectations for JSON Values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-expectations-lens" = callPackage
@@ -126096,6 +134437,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An hspec expectation that asserts a value matches a pattern";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-expectations-pretty" = callPackage
@@ -126111,6 +134454,8 @@ self: {
        ];
        description = "hspec-expectations with pretty printing on failure";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-expectations-pretty-diff" = callPackage
@@ -126139,6 +134484,8 @@ self: {
        testHaskellDepends = [ base hspec-meta ];
        description = "An experimental DSL for testing on top of Hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-golden" = callPackage
@@ -126193,6 +134540,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-hedgehog" = callPackage
@@ -126222,6 +134571,8 @@ self: {
        libraryHaskellDepends = [ base blaze-markup hspec ];
        description = "Jenkins-friendly XML formatter for Hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-laws" = callPackage
@@ -126306,6 +134657,8 @@ self: {
        ];
        description = "Orphan instances of MonadBase and MonadBaseControl for SpecM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-multicheck" = callPackage
@@ -126366,6 +134719,8 @@ self: {
        ];
        description = "Helpers for creating database tests with hspec and pg-transact";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-server" = callPackage
@@ -126413,6 +134768,8 @@ self: {
        ];
        description = "Add an hspec test-suite in one command";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-shouldbe" = callPackage
@@ -126424,6 +134781,8 @@ self: {
        libraryHaskellDepends = [ hspec test-shouldbe ];
        description = "Convenience wrapper and utilities for hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-slow" = callPackage
@@ -126478,6 +134837,8 @@ self: {
        ];
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-stack-rerun" = callPackage
@@ -126499,6 +134860,8 @@ self: {
        sha256 = "008gm0qvhvp6z6a9sq5vpljqb90258apd83rkzy47k3bczy1sgmj";
        libraryHaskellDepends = [ base hspec ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-tables" = callPackage
@@ -126556,6 +134919,8 @@ self: {
        testHaskellDepends = [ base hspec test-sandbox ];
        description = "Hspec convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-wai" = callPackage
@@ -126655,6 +135020,8 @@ self: {
        ];
        description = "Write end2end web application tests using webdriver and hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec2" = callPackage
@@ -126668,6 +135035,8 @@ self: {
        libraryHaskellDepends = [ base hspec hspec-discover ];
        description = "Alpha version of Hspec 2.0";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspecVariant" = callPackage
@@ -126679,6 +135048,8 @@ self: {
        libraryHaskellDepends = [ base hspec QuickCheckVariant ];
        description = "Spec for testing properties for variant types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspkcs11" = callPackage
@@ -126697,6 +135068,8 @@ self: {
        ];
        description = "Wrapper for PKCS #11 interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspr-sh" = callPackage
@@ -126723,6 +135096,8 @@ self: {
        ];
        description = "A client library for the spread toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspresent" = callPackage
@@ -126737,6 +135112,8 @@ self: {
        doHaddock = false;
        description = "A terminal presentation tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsprocess" = callPackage
@@ -126762,6 +135139,8 @@ self: {
        ];
        description = "The Haskell Stream Processor command line utility";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsql" = callPackage
@@ -126773,6 +135152,8 @@ self: {
        libraryHaskellDepends = [ base old-time ];
        description = "Database access from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsql-mysql" = callPackage
@@ -126787,6 +135168,8 @@ self: {
        librarySystemDepends = [ mysqlclient ];
        description = "MySQL driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mysqlclient = null;};
 
   "hsql-odbc" = callPackage
@@ -126799,6 +135182,8 @@ self: {
        librarySystemDepends = [ unixODBC ];
        description = "A Haskell Interface to ODBC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) unixODBC;};
 
   "hsql-postgresql" = callPackage
@@ -126811,6 +135196,8 @@ self: {
        librarySystemDepends = [ postgresql ];
        description = "A Haskell Interface to PostgreSQL via the PQ library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "hsql-sqlite3" = callPackage
@@ -126823,6 +135210,8 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "SQLite3 driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "hsqml" = callPackage
@@ -126986,6 +135375,8 @@ self: {
        ];
        description = "Access to the Readability API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsrelp" = callPackage
@@ -127000,6 +135391,8 @@ self: {
        ];
        description = "RELP (Reliable Event Logging Protocol) server implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsseccomp" = callPackage
@@ -127013,6 +135406,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Haskell bindings to libseccomp";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {seccomp = null;};
 
   "hssh" = callPackage
@@ -127084,6 +135479,8 @@ self: {
        ];
        description = "SQL parser and type checker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hssqlppp-th" = callPackage
@@ -127102,6 +135499,8 @@ self: {
        ];
        description = "hssqlppp extras which need template-haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstar" = callPackage
@@ -127124,6 +135523,8 @@ self: {
        executableToolDepends = [ cpphs ];
        description = "Haskell version of tar CLI utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstatistics" = callPackage
@@ -127150,6 +135551,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstatsd" = callPackage
@@ -127161,6 +135564,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl network text ];
        description = "Quick and dirty statsd interface";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstest" = callPackage
@@ -127178,6 +135583,8 @@ self: {
        ];
        description = "Runs tests via QuickCheck1 and HUnit; like quickCheck-script but uses GHC api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstidy" = callPackage
@@ -127191,6 +135598,8 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts ];
        description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstorchat" = callPackage
@@ -127247,6 +135656,8 @@ self: {
        testHaskellDepends = [ async base ];
        description = "A Tox protocol implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstradeking" = callPackage
@@ -127271,6 +135682,8 @@ self: {
        ];
        description = "Tradeking API bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstyle" = callPackage
@@ -127288,6 +135701,8 @@ self: {
        ];
        description = "Checks Haskell source code for style compliance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstzaar" = callPackage
@@ -127308,6 +135723,8 @@ self: {
        ];
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsubconvert" = callPackage
@@ -127329,6 +135746,8 @@ self: {
        ];
        description = "One-time, faithful conversion of Subversion repositories to Git";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsudoku" = callPackage
@@ -127357,6 +135776,8 @@ self: {
        ];
        description = "Sudoku game with a GTK3 interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsverilog" = callPackage
@@ -127388,6 +135809,8 @@ self: {
        librarySystemDepends = [ ncurses readline swipl ];
        description = "embedding prolog in haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline; 
          swipl = null;};
 
@@ -127404,6 +135827,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ];
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsx-jmacro" = callPackage
@@ -127417,6 +135842,8 @@ self: {
        ];
        description = "hsp+jmacro support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsx-xhtml" = callPackage
@@ -127428,6 +135855,8 @@ self: {
        libraryHaskellDepends = [ base hsx mtl ];
        description = "XHTML utilities to use together with HSX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsx2hs" = callPackage
@@ -127461,6 +135890,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "FFI to syscalls";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsyslog" = callPackage
@@ -127492,6 +135923,8 @@ self: {
        ];
        description = "syslog over TCP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsyslog-udp" = callPackage
@@ -127520,6 +135953,8 @@ self: {
        librarySystemDepends = [ com_err zephyr ];
        description = "Simple libzephyr bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {com_err = null; zephyr = null;};
 
   "htaglib" = callPackage
@@ -127552,6 +135987,8 @@ self: {
        ];
        description = "A Haskell98 parsing tags program similar to ctags";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htar" = callPackage
@@ -127569,6 +136006,8 @@ self: {
        ];
        description = "Command-line tar archive utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htaut" = callPackage
@@ -127596,6 +136035,8 @@ self: {
        ];
        description = "Beginner friendly graphics library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htestu" = callPackage
@@ -127611,6 +136052,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A library for testing correctness of pseudo random number generators in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gcc;};
 
   "htiled" = callPackage
@@ -127627,6 +136070,8 @@ self: {
        ];
        description = "Import from the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htime" = callPackage
@@ -127667,6 +136112,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Heterogenous Set";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "html" = callPackage
@@ -127702,6 +136149,8 @@ self: {
        ];
        description = "Determine character encoding of HTML documents/fragments";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "html-conduit" = callPackage
@@ -127801,6 +136250,8 @@ self: {
        libraryHaskellDepends = [ base hxt kure ];
        description = "HTML rewrite engine, using KURE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "html-minimalist" = callPackage
@@ -127850,6 +136301,8 @@ self: {
        libraryHaskellDepends = [ base lens mtl tagsoup transformers ];
        description = "Perform traversals of HTML structures using sets of rules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "html-tokenizer" = callPackage
@@ -127872,6 +136325,8 @@ self: {
        ];
        description = "An \"attoparsec\"-based HTML tokenizer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "html-truncate" = callPackage
@@ -128042,6 +136497,8 @@ self: {
        libraryHaskellDepends = [ base hmt xml ];
        description = "Haskell Music Typesetting";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htsn" = callPackage
@@ -128065,6 +136522,8 @@ self: {
        ];
        description = "Parse XML files from The Sports Network feed";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htsn-common" = callPackage
@@ -128107,6 +136566,8 @@ self: {
        ];
        description = "Import XML files from The Sports Network into an RDBMS";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htssets" = callPackage
@@ -128118,6 +136579,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Heterogenous Sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-accept" = callPackage
@@ -128194,6 +136657,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring http-types ];
        description = "Attoparsec parsers for http-types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client" = callPackage
@@ -128267,6 +136732,8 @@ self: {
        ];
        description = "HTTP authorization (both basic and digest) done right";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client-conduit" = callPackage
@@ -128313,6 +136780,8 @@ self: {
        ];
        description = "Optics for http-client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client-multipart" = callPackage
@@ -128402,6 +136871,8 @@ self: {
        ];
        description = "Convenient monadic HTTP request modifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client-restricted" = callPackage
@@ -128433,6 +136904,8 @@ self: {
        ];
        description = "A simple abstraction over the \"http-client\" connection manager";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client-streams" = callPackage
@@ -128449,6 +136922,8 @@ self: {
        ];
        description = "http-client for io-streams supporting openssl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client-tls" = callPackage
@@ -128494,6 +136969,8 @@ self: {
        ];
        description = "Glue code for http-client and websockets";
        license = stdenv.lib.licenses.cc0;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-common" = callPackage
@@ -128567,6 +137044,8 @@ self: {
        ];
        description = "Browser interface to the http-conduit package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-conduit-downloader" = callPackage
@@ -128584,6 +137063,8 @@ self: {
        ];
        description = "HTTP downloader tailored for web-crawler needs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-date" = callPackage
@@ -128618,6 +137099,8 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "http directory listing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-dispatch" = callPackage
@@ -128635,6 +137118,8 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "High level HTTP client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-download" = callPackage
@@ -128702,6 +137187,8 @@ self: {
        ];
        description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-grammar" = callPackage
@@ -128713,6 +137200,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-io-streams" = callPackage
@@ -128734,6 +137223,8 @@ self: {
        ];
        description = "HTTP and WebSocket client based on io-streams";
        license = "BSD-3-Clause AND GPL-2.0-or-later";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-kinder" = callPackage
@@ -128756,6 +137247,8 @@ self: {
        ];
        description = "Generic kinds and types for working with HTTP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-kit" = callPackage
@@ -128840,6 +137333,8 @@ self: {
        ];
        description = "Listen to HTTP requests and handle them in arbitrary ways";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-media" = callPackage
@@ -128862,6 +137357,8 @@ self: {
        ];
        description = "Processing HTTP Content-Type and Accept headers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-mock" = callPackage
@@ -128897,6 +137394,8 @@ self: {
        ];
        description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-pony" = callPackage
@@ -128913,6 +137412,8 @@ self: {
        ];
        description = "A type unsafe http library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-pony-serve-wai" = callPackage
@@ -128932,6 +137433,8 @@ self: {
        ];
        description = "Serve a WAI application with http-pony";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-pony-transformer-case-insensitive" = callPackage
@@ -128998,6 +137501,8 @@ self: {
        ];
        description = "A library for writing HTTP and HTTPS proxies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-query" = callPackage
@@ -129029,6 +137534,8 @@ self: {
        ];
        description = "The HTTP query builder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-response-decoder" = callPackage
@@ -129048,6 +137555,8 @@ self: {
        ];
        description = "Declarative DSL for parsing an HTTP response";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-reverse-proxy" = callPackage
@@ -129092,6 +137601,8 @@ self: {
        ];
        description = "RFC7807 style response messages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-server" = callPackage
@@ -129107,6 +137618,8 @@ self: {
        ];
        description = "A library for writing Haskell web servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-shed" = callPackage
@@ -129120,6 +137633,8 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-streams" = callPackage
@@ -129218,6 +137733,8 @@ self: {
        libraryHaskellDepends = [ base failure process transformers ];
        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;
+       broken = true;
      }) {};
 
   "http2" = callPackage
@@ -129305,6 +137822,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Implement gRPC-over-HTTP2 clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http2-grpc-proto-lens" = callPackage
@@ -129321,6 +137840,8 @@ self: {
        ];
        description = "Encoders based on `proto-lens` for gRPC over HTTP2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http2-grpc-proto3-wire" = callPackage
@@ -129389,6 +137910,8 @@ self: {
        ];
        description = "High-level access to HTTPS Everywhere rulesets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "https-everywhere-rules-raw" = callPackage
@@ -129403,6 +137926,8 @@ self: {
        ];
        description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "httpspec" = callPackage
@@ -129420,6 +137945,8 @@ self: {
        ];
        description = "Specification of HTTP request/response generators and parsers";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htune" = callPackage
@@ -129433,6 +137960,8 @@ self: {
        executableHaskellDepends = [ alsa-pcm base carray fft gloss ];
        description = "harmonic analyser and tuner for musical instruments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htvm" = callPackage
@@ -129460,6 +137989,8 @@ self: {
        testSystemDepends = [ tvm_runtime ];
        description = "Bindings for TVM machine learning framework";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {tvm_runtime = null;};
 
   "htzaar" = callPackage
@@ -129473,6 +138004,8 @@ self: {
        executableHaskellDepends = [ base OpenGL random SDL ];
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hub" = callPackage
@@ -129548,6 +138081,8 @@ self: {
        ];
        description = "huck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "huckleberry" = callPackage
@@ -129579,6 +138114,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A fast-foward-based planner";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "huffman" = callPackage
@@ -129590,6 +138127,8 @@ self: {
        libraryHaskellDepends = [ base containers fingertree ];
        description = "Pure Haskell implementation of the Huffman encoding algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hugs2yc" = callPackage
@@ -129606,6 +138145,8 @@ self: {
        ];
        description = "Hugs Front-end to Yhc Core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hulk" = callPackage
@@ -129632,6 +138173,8 @@ self: {
        ];
        description = "IRC server written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "human-parse" = callPackage
@@ -129643,6 +138186,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for parsing text entered by humans";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "human-readable-duration" = callPackage
@@ -129667,6 +138212,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for converting values to human-friendly text";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "humble-prelude" = callPackage
@@ -129678,6 +138225,8 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq ghc text ];
        description = "Redefinition-free prelude alternative";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hums" = callPackage
@@ -129702,6 +138251,8 @@ self: {
        ];
        description = "Haskell UPnP Media Server";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hunch" = callPackage
@@ -129750,6 +138301,8 @@ self: {
        executableHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        description = "A GUI testrunner for HUnit";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hunit-parsec" = callPackage
@@ -129773,6 +138326,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit rematch ];
        description = "HUnit support for rematch";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hunp" = callPackage
@@ -129791,6 +138346,8 @@ self: {
        ];
        description = "Unpacker tool with DWIM";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hunspell-hs" = callPackage
@@ -129807,6 +138364,8 @@ self: {
        benchmarkPkgconfigDepends = [ hunspell ];
        description = "Hunspell thread-safe FFI bindings for spell checking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) hunspell;};
 
   "hunt-searchengine" = callPackage
@@ -129838,6 +138397,8 @@ self: {
        ];
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hunt-server" = callPackage
@@ -129861,6 +138422,8 @@ self: {
        ];
        description = "A search and indexing engine server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hunt-server-cli" = callPackage
@@ -129914,6 +138477,8 @@ self: {
        ];
        description = "Upload packages or documentation to a hackage server";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hurdle" = callPackage
@@ -129929,6 +138494,8 @@ self: {
        ];
        description = "Extract function names from Windows DLLs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hurl" = callPackage
@@ -129971,6 +138538,8 @@ self: {
        ];
        description = "Haskell bindings for Hurriyet API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "husk-scheme" = callPackage
@@ -129995,6 +138564,8 @@ self: {
        ];
        description = "R5RS Scheme interpreter, compiler, and library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "husk-scheme-libs" = callPackage
@@ -130010,6 +138581,8 @@ self: {
        ];
        description = "Extra libraries for the husk Scheme platform";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "husky" = callPackage
@@ -130027,6 +138600,8 @@ self: {
        ];
        description = "A simple command line calculator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hutton" = callPackage
@@ -130047,6 +138622,8 @@ self: {
        ];
        description = "A program for the button on Reddit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "huttons-razor" = callPackage
@@ -130060,6 +138637,8 @@ self: {
        executableHaskellDepends = [ base parsec parsec-numbers ];
        description = "Quick implemention of Hutton's Razor";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "huzzy" = callPackage
@@ -130071,6 +138650,8 @@ self: {
        libraryHaskellDepends = [ base easyplot ];
        description = "Fuzzy logic library with support for T1, IT2, GT2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hvect" = callPackage
@@ -130159,6 +138740,8 @@ self: {
        ];
        description = "Demo library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-balancedparens" = callPackage
@@ -130239,6 +138822,8 @@ self: {
        doHaddock = false;
        description = "CI Assistant for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-conduit" = callPackage
@@ -130335,6 +138920,8 @@ self: {
        ];
        description = "Unbelievably fast streaming DSV file parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-dump" = callPackage
@@ -130596,6 +139183,8 @@ self: {
        doHaddock = false;
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-json-lens" = callPackage
@@ -130625,6 +139214,8 @@ self: {
        ];
        description = "Lens for hw-json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-json-simd" = callPackage
@@ -130651,6 +139242,8 @@ self: {
        testToolDepends = [ doctest-discover ];
        description = "SIMD-based JSON semi-indexer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-json-simple-cursor" = callPackage
@@ -130688,6 +139281,8 @@ self: {
        ];
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-json-standard-cursor" = callPackage
@@ -130727,6 +139322,8 @@ self: {
        ];
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-kafka-avro" = callPackage
@@ -131021,6 +139618,8 @@ self: {
        ];
        description = "SIMD library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-streams" = callPackage
@@ -131114,6 +139713,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Supports IO on URIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-vector" = callPackage
@@ -131189,6 +139790,8 @@ self: {
        ];
        description = "Initial version of firewall Authentication for IITK network";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hweblib" = callPackage
@@ -131211,6 +139814,8 @@ self: {
        ];
        description = "Haskell Web Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hwhile" = callPackage
@@ -131231,6 +139836,8 @@ self: {
        testHaskellDepends = [ array base Cabal containers mtl ];
        description = "An implementation of Neil D. Jones' While language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hwk" = callPackage
@@ -131270,6 +139877,8 @@ self: {
        ];
        description = "A reliable at-least-once job queue built on top of redis";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hworker-ses" = callPackage
@@ -131286,6 +139895,8 @@ self: {
        ];
        description = "Library for sending email with Amazon's SES and hworker";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hwormhole" = callPackage
@@ -131318,6 +139929,8 @@ self: {
        ];
        description = "magic-wormhole client";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hws" = callPackage
@@ -131336,6 +139949,8 @@ self: {
        ];
        description = "Simple Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hwsl2" = callPackage
@@ -131355,6 +139970,8 @@ self: {
        ];
        description = "Hashing with SL2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hwsl2-bytevector" = callPackage
@@ -131366,6 +139983,8 @@ self: {
        libraryHaskellDepends = [ base bytestring fingertree hwsl2 ];
        description = "A hashed byte-vector based on algebraic hashes and finger trees";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hwsl2-reducers" = callPackage
@@ -131379,6 +139998,8 @@ self: {
        ];
        description = "Semigroup and Reducer instances for Data.Hash.SL2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hx" = callPackage
@@ -131390,6 +140011,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell extras (missing utility functions)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hxmppc" = callPackage
@@ -131408,6 +140031,8 @@ self: {
        ];
        description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hxournal" = callPackage
@@ -131434,6 +140059,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "A pen notetaking program written in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hxt" = callPackage
@@ -131589,6 +140216,8 @@ self: {
        libraryHaskellDepends = [ base hxt mtl ];
        description = "Utility functions for using HXT picklers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hxt-regex-xmlschema" = callPackage
@@ -131695,6 +140324,8 @@ self: {
        libraryHaskellDepends = [ base bytestring encoding hxt mtl ];
        description = "Helper functions for HXT";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hxweb" = callPackage
@@ -131706,6 +140337,8 @@ self: {
        libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ];
        description = "Minimal webframework using fastcgi, libxml2 and libxslt";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyahtzee" = callPackage
@@ -131719,6 +140352,8 @@ self: {
        executableHaskellDepends = [ base containers HUnit random ];
        description = "A Yahtzee game implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyakko" = callPackage
@@ -131740,6 +140375,8 @@ self: {
        ];
        description = "Literate-style Documentation Generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hybrid" = callPackage
@@ -131756,6 +140393,8 @@ self: {
        ];
        description = "A implementation of a type-checker for Lambda-H";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hybrid-vectors" = callPackage
@@ -131784,6 +140423,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {sixense_x64 = null;};
 
   "hydra-print" = callPackage
@@ -131815,6 +140456,8 @@ self: {
        ];
        description = "NCurses interface to view multiple ByteString streams in parallel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen" = callPackage
@@ -131831,6 +140474,8 @@ self: {
        testHaskellDepends = [ base Cabal containers mtl QuickCheck ];
        description = "An alternate Prelude";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-cli" = callPackage
@@ -131851,6 +140496,8 @@ self: {
        ];
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-cli-args" = callPackage
@@ -131866,6 +140513,8 @@ self: {
        ];
        description = "Hydrogen Command Line Arguments Parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-data" = callPackage
@@ -131877,6 +140526,8 @@ self: {
        libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ];
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-multimap" = callPackage
@@ -131888,6 +140539,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim ];
        description = "Hydrogen Multimap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-parsing" = callPackage
@@ -131901,6 +140554,8 @@ self: {
        ];
        description = "Hydrogen Parsing Utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-prelude" = callPackage
@@ -131920,6 +140575,8 @@ self: {
        ];
        description = "Hydrogen Prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-prelude-parsec" = callPackage
@@ -131931,6 +140588,8 @@ self: {
        libraryHaskellDepends = [ base hydrogen-prelude parsec ];
        description = "Hydrogen Prelude /w Parsec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-syntax" = callPackage
@@ -131947,6 +140606,8 @@ self: {
        ];
        description = "Hydrogen Syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-util" = callPackage
@@ -131961,6 +140622,8 @@ self: {
        ];
        description = "Hydrogen Tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-version" = callPackage
@@ -131989,6 +140652,8 @@ self: {
        ];
        description = "Simple web application server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hylide" = callPackage
@@ -132010,6 +140675,8 @@ self: {
        ];
        description = "WebGL live-coding environment for writing shaders with Hylogen";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hylogen" = callPackage
@@ -132036,6 +140703,8 @@ self: {
        ];
        description = "Tools for hybrid logics related programs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hylotab" = callPackage
@@ -132050,6 +140719,8 @@ self: {
        executableHaskellDepends = [ base hylolib mtl ];
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyloutils" = callPackage
@@ -132065,6 +140736,8 @@ self: {
        ];
        description = "Very small programs for hybrid logics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyper" = callPackage
@@ -132105,6 +140778,8 @@ self: {
        ];
        description = "Display instances for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyper-haskell-server" = callPackage
@@ -132124,6 +140799,8 @@ self: {
        ];
        description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyperdrive" = callPackage
@@ -132142,6 +140819,8 @@ self: {
        ];
        description = "a fast, trustworthy HTTP(s) server built";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyperfunctions" = callPackage
@@ -132157,6 +140836,8 @@ self: {
        ];
        description = "Hyperfunctions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyperion" = callPackage
@@ -132184,6 +140865,8 @@ self: {
        ];
        description = "Reliable performance measurement with robust data export";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyperloglog" = callPackage
@@ -132225,6 +140908,8 @@ self: {
        testHaskellDepends = [ base HUnit semigroups tasty tasty-hunit ];
        description = "Approximate cardinality estimation using constant space";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyperpublic" = callPackage
@@ -132240,6 +140925,8 @@ self: {
        ];
        description = "A thin wrapper for the Hyperpublic API";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyphenate" = callPackage
@@ -132302,6 +140989,8 @@ self: {
        ];
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyraxAbif" = callPackage
@@ -132430,6 +141119,8 @@ self: {
        ];
        description = "A haskell wrapper for the Zulip API";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "i18n" = callPackage
@@ -132450,6 +141141,8 @@ self: {
        ];
        description = "Internationalization for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "i3blocks-hs-contrib" = callPackage
@@ -132486,6 +141179,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "A type-safe wrapper around i3's IPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iCalendar" = callPackage
@@ -132504,6 +141199,8 @@ self: {
        ];
        description = "iCalendar data types, parser, and printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iException" = callPackage
@@ -132532,6 +141229,8 @@ self: {
        ];
        description = "A simple wrapper of In-App-Purchase receipt validate APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ib-api" = callPackage
@@ -132548,6 +141247,8 @@ self: {
        ];
        description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iban" = callPackage
@@ -132566,6 +141267,8 @@ self: {
        testHaskellDepends = [ base HUnit tasty tasty-hunit text ];
        description = "Validate and generate IBANs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ibus-hs" = callPackage
@@ -132598,6 +141301,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "iCalendar format parser and org-mode converter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "icepeak" = callPackage
@@ -132693,6 +141398,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Type safe iconv wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ide-backend" = callPackage
@@ -132739,6 +141446,8 @@ self: {
        ];
        description = "An IDE backend library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ide-backend-common" = callPackage
@@ -132763,6 +141472,8 @@ self: {
        ];
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ide-backend-rts" = callPackage
@@ -132797,6 +141508,8 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ideas" = callPackage
@@ -132816,6 +141529,8 @@ self: {
        ];
        description = "Feedback services for intelligent tutoring systems";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ideas-math" = callPackage
@@ -132833,6 +141548,8 @@ self: {
        ];
        description = "Interactive domain reasoner for logic and mathematics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ideas-math-types" = callPackage
@@ -132846,6 +141563,8 @@ self: {
        ];
        description = "Common types for mathematical domain reasoners";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ideas-statistics" = callPackage
@@ -132861,6 +141580,8 @@ self: {
        ];
        description = "Interactive domain reasoner for statistics";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "idempotent" = callPackage
@@ -132873,6 +141594,8 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Idempotent monoids";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "identicon" = callPackage
@@ -132939,6 +141662,8 @@ self: {
        ];
        description = "Numeric identifiers for values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "idiii" = callPackage
@@ -132964,6 +141689,8 @@ self: {
        ];
        description = "ID3v2 (tagging standard for MP3 files) library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "idna" = callPackage
@@ -132986,6 +141713,8 @@ self: {
        libraryHaskellDepends = [ base punycode split ];
        description = "Converts Unicode hostnames into ASCII";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "idringen" = callPackage
@@ -133050,6 +141779,8 @@ self: {
        ];
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gmp;};
 
   "ieee" = callPackage
@@ -133072,6 +141803,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "ieee-utils";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ieee-utils-tempfix" = callPackage
@@ -133121,6 +141854,8 @@ self: {
        testHaskellDepends = [ base bytestring HUnit stocks ];
        description = "Library for the IEX Trading API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "if" = callPackage
@@ -133146,6 +141881,8 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "put if statements within type constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iff" = callPackage
@@ -133194,6 +141931,8 @@ self: {
        ];
        description = "Bindings to Instagram's API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ige" = callPackage
@@ -133216,6 +141955,8 @@ self: {
        ];
        description = "An keyboard-driven interactive graph editor";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ige-mac-integration" = callPackage
@@ -133234,6 +141975,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ige-mac-integration = null;};
 
   "ignore" = callPackage
@@ -133253,6 +141996,8 @@ self: {
        testHaskellDepends = [ base HTF text ];
        description = "Handle ignore files of different VCSes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "igraph" = callPackage
@@ -133270,6 +142015,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the igraph C library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) igraph;};
 
   "igrf" = callPackage
@@ -133318,6 +142065,8 @@ self: {
        ];
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-aeson" = callPackage
@@ -133333,6 +142082,8 @@ self: {
        ];
        description = "IHaskell display instances for Aeson";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-basic" = callPackage
@@ -133344,6 +142095,8 @@ self: {
        libraryHaskellDepends = [ base ihaskell ];
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-blaze" = callPackage
@@ -133355,6 +142108,8 @@ self: {
        libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
        description = "IHaskell display instances for blaze-html types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-charts" = callPackage
@@ -133371,6 +142126,8 @@ self: {
        ];
        description = "IHaskell display instances for charts types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-diagrams" = callPackage
@@ -133387,6 +142144,8 @@ self: {
        ];
        description = "IHaskell display instances for diagram types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-display" = callPackage
@@ -133398,6 +142157,8 @@ self: {
        libraryHaskellDepends = [ base classy-prelude ihaskell ];
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-gnuplot" = callPackage
@@ -133409,6 +142170,8 @@ self: {
        libraryHaskellDepends = [ base bytestring gnuplot ihaskell ];
        description = "IHaskell display instance for Gnuplot (from gnuplot package)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-graphviz" = callPackage
@@ -133420,6 +142183,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ihaskell process ];
        description = "IHaskell display instance for GraphViz (external binary)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-hatex" = callPackage
@@ -133431,6 +142196,8 @@ self: {
        libraryHaskellDepends = [ base HaTeX ihaskell text ];
        description = "IHaskell display instances for hatex";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-hvega" = callPackage
@@ -133442,6 +142209,8 @@ self: {
        libraryHaskellDepends = [ aeson base hvega ihaskell text ];
        description = "IHaskell display instance for hvega types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-inline-r" = callPackage
@@ -133459,6 +142228,8 @@ self: {
        ];
        description = "Embed R quasiquotes and plots in IHaskell notebooks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-juicypixels" = callPackage
@@ -133473,6 +142244,8 @@ self: {
        ];
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-magic" = callPackage
@@ -133489,6 +142262,8 @@ self: {
        ];
        description = "IHaskell display instances for bytestrings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-parsec" = callPackage
@@ -133504,6 +142279,8 @@ self: {
        ];
        description = "IHaskell display instances for Parsec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-plot" = callPackage
@@ -133515,6 +142292,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ];
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-rlangqq" = callPackage
@@ -133532,6 +142311,8 @@ self: {
        ];
        description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-widgets" = callPackage
@@ -133549,6 +142330,8 @@ self: {
        ];
        description = "IPython standard widgets for IHaskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihs" = callPackage
@@ -133580,6 +142363,8 @@ self: {
        executableHaskellDepends = [ base network ];
        description = "Incremental HTTP iteratee";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ilist" = callPackage
@@ -133617,6 +142402,8 @@ self: {
        executableToolDepends = [ alex ];
        description = "A fast syntax highlighting library built with alex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "image-type" = callPackage
@@ -133685,6 +142472,8 @@ self: {
        ];
        description = "Command-line image paste utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imagesize-conduit" = callPackage
@@ -133731,6 +142520,8 @@ self: {
        ];
        description = "An efficient IMAP client library, with SSL and streaming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imapget" = callPackage
@@ -133748,6 +142539,8 @@ self: {
        ];
        description = "Downloads email from imap SSL servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imbib" = callPackage
@@ -133769,6 +142562,8 @@ self: {
        ];
        description = "Minimalistic reference manager";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imgur" = callPackage
@@ -133784,6 +142579,8 @@ self: {
        ];
        description = "A function to post an image to imgur";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imgurder" = callPackage
@@ -133804,6 +142601,8 @@ self: {
        ];
        description = "Uploader for Imgur";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imj-animation" = callPackage
@@ -133816,6 +142615,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Animation Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imj-base" = callPackage
@@ -133840,6 +142641,8 @@ self: {
        ];
        description = "Game engine with geometry, easing, animated text, delta rendering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imj-game-hamazed" = callPackage
@@ -133860,6 +142663,8 @@ self: {
        testHaskellDepends = [ base imj-base mtl text ];
        description = "A game with flying numbers and 8-bit color animations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imj-measure-stdout" = callPackage
@@ -133875,6 +142680,8 @@ self: {
        ];
        description = "An application to determine the maximum capacity of stdout buffer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imj-prelude" = callPackage
@@ -133886,6 +142693,8 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        description = "Prelude library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imm" = callPackage
@@ -133925,6 +142734,8 @@ self: {
        ];
        description = "Execute arbitrary actions for each item from RSS/Atom feeds";
        license = stdenv.lib.licenses.cc0;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "immortal_0_2_2_1" = callPackage
@@ -133986,6 +142797,8 @@ self: {
        ];
        description = "Create worker threads that logs exceptions and restarts";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imparse" = callPackage
@@ -134009,6 +142822,8 @@ self: {
        ];
        description = "Multi-platform parser analyzer and generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imperative-edsl" = callPackage
@@ -134034,6 +142849,8 @@ self: {
        ];
        description = "Deep embedding of imperative programs with code generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imperative-edsl-vhdl" = callPackage
@@ -134050,6 +142867,8 @@ self: {
        ];
        description = "Deep embedding of VHDL programs with code generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "impl" = callPackage
@@ -134062,6 +142881,8 @@ self: {
        doHaddock = false;
        description = "Framework for defaulting superclasses";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "implicit" = callPackage
@@ -134151,6 +142972,8 @@ self: {
        libraryHaskellDepends = [ base mtl time transformers ];
        description = "A logging framework built around implicit parameters";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "implicit-params" = callPackage
@@ -134162,6 +142985,8 @@ self: {
        libraryHaskellDepends = [ base data-default-class ];
        description = "Named and unnamed implicit parameters with defaults";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "importify" = callPackage
@@ -134194,6 +143019,8 @@ self: {
        ];
        description = "Tool for haskell imports refactoring";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imports" = callPackage
@@ -134206,6 +143033,8 @@ self: {
        testHaskellDepends = [ base directory filepath mtl ];
        description = "Generate code for importing directories automatically";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "impossible" = callPackage
@@ -134217,6 +143046,8 @@ self: {
        libraryHaskellDepends = [ base lens ];
        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;
+       broken = true;
      }) {};
 
   "imprevu" = callPackage
@@ -134274,6 +143105,8 @@ self: {
        testHaskellDepends = [ base binary constraints hspec ];
        description = "Serialization of arbitrary Haskell expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "improve" = callPackage
@@ -134285,6 +143118,8 @@ self: {
        libraryHaskellDepends = [ base mtl yices ];
        description = "An imperative, verifiable programming language for high assurance applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "impure-containers" = callPackage
@@ -134361,6 +143196,8 @@ self: {
        ];
        description = "A type-checker for Haskell with integer constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inchworm" = callPackage
@@ -134372,6 +143209,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Simple parser combinators for lexical analysis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "include-file" = callPackage
@@ -134426,6 +143265,8 @@ self: {
        benchmarkHaskellDepends = [ base containers deepseq QuickCheck ];
        description = "Incremental computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "incremental-maps" = callPackage
@@ -134449,6 +143290,8 @@ self: {
        ];
        description = "Package for doing incremental computations on maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "incremental-parser" = callPackage
@@ -134502,6 +143345,8 @@ self: {
        ];
        description = "type classes for incremental updates to data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indent" = callPackage
@@ -134532,6 +143377,8 @@ self: {
        ];
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indentation-core" = callPackage
@@ -134543,6 +143390,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Indentation sensitive parsing combinators core library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indentation-parsec" = callPackage
@@ -134557,6 +143406,8 @@ self: {
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Indentation sensitive parsing combinators for Parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indentation-trifecta" = callPackage
@@ -134573,6 +143424,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit trifecta ];
        description = "Indentation sensitive parsing combinators for Trifecta";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indentparser" = callPackage
@@ -134609,6 +143462,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Indexed Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indexation" = callPackage
@@ -134630,6 +143485,8 @@ self: {
        ];
        description = "Tools for entity indexation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indexed" = callPackage
@@ -134727,6 +143584,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A series of type families and constraints for \"indexable\" types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indian-language-font-converter" = callPackage
@@ -134753,6 +143612,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Multi-dimensional statically bounded indices";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indieweb-algorithms" = callPackage
@@ -134778,6 +143639,8 @@ self: {
        ];
        description = "A collection of implementations of IndieWeb algorithms";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indigo" = callPackage
@@ -134825,6 +143688,8 @@ self: {
        testHaskellDepends = [ array base deepseq QuickCheck text vector ];
        description = "Non-contiguous interval data types with potentially infinite ranges";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "infer-license" = callPackage
@@ -134860,6 +143725,8 @@ self: {
        ];
        description = "Find the repository from where a given repo was forked";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "infernal" = callPackage
@@ -134880,6 +143747,8 @@ self: {
        ];
        description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "infernu" = callPackage
@@ -134900,6 +143769,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative parsec ];
        description = "Type inference and checker for JavaScript (experimental)";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "infinite-search" = callPackage
@@ -134926,6 +143797,8 @@ self: {
          base binary Cabal filepath ghc irc plugins
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "infix" = callPackage
@@ -134937,6 +143810,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell-src ];
        description = "Infix expression re-parsing (for HsParser library)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inflections" = callPackage
@@ -134968,6 +143843,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "An infinite list type and operations thereon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "influxdb" = callPackage
@@ -135023,6 +143900,8 @@ self: {
        ];
        description = "A yesod subsite serving a wiki";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ini" = callPackage
@@ -135053,6 +143932,8 @@ self: {
        testHaskellDepends = [ base HUnit ini raw-strings-qq text ];
        description = "Quasiquoter for INI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inilist" = callPackage
@@ -135072,6 +143953,8 @@ self: {
        ];
        description = "Processing for .ini files with duplicate sections and options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "initialize" = callPackage
@@ -135083,6 +143966,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Initialization and Deinitialization of 'Storable' values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inj" = callPackage
@@ -135134,6 +144019,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monadic functions with injected parameters";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inline-asm" = callPackage
@@ -135162,6 +144049,8 @@ self: {
        ];
        description = "Inline some Assembly in ur Haskell!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inline-c" = callPackage
@@ -135241,6 +144130,8 @@ self: {
        ];
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inline-r" = callPackage
@@ -135275,6 +144166,8 @@ self: {
        ];
        description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) R;};
 
   "inliterate" = callPackage
@@ -135361,6 +144254,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring dlist ];
        description = "Stupid simple bytestring templates";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inspection-proxy" = callPackage
@@ -135416,6 +144311,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Create benchmarks from the HAR files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instana-haskell-trace-sdk" = callPackage
@@ -135450,6 +144347,8 @@ self: {
        ];
        description = "SDK for adding custom Instana tracing support to Haskell applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instance-control" = callPackage
@@ -135477,6 +144376,8 @@ self: {
        ];
        description = "Template haskell utilities for helping with deserialization etc. of existential types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instant-aeson" = callPackage
@@ -135493,6 +144394,8 @@ self: {
        ];
        description = "Generic Aeson instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instant-bytes" = callPackage
@@ -135509,6 +144412,8 @@ self: {
        ];
        description = "Generic Serial instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instant-deepseq" = callPackage
@@ -135520,6 +144425,8 @@ self: {
        libraryHaskellDepends = [ base deepseq instant-generics ];
        description = "Generic NFData instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instant-generics" = callPackage
@@ -135533,6 +144440,8 @@ self: {
        libraryHaskellDepends = [ base containers syb template-haskell ];
        description = "Generic programming library with a sum of products view";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instant-hashable" = callPackage
@@ -135544,6 +144453,8 @@ self: {
        libraryHaskellDepends = [ base hashable instant-generics ];
        description = "Generic Hashable instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instant-zipper" = callPackage
@@ -135557,6 +144468,8 @@ self: {
        libraryHaskellDepends = [ base instant-generics mtl ];
        description = "Heterogenous Zipper in Instant Generics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instapaper-sender" = callPackage
@@ -135576,6 +144489,8 @@ self: {
        ];
        description = "Basic HTTP gateway to save articles to Instapaper";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instinct" = callPackage
@@ -135587,6 +144502,8 @@ self: {
        libraryHaskellDepends = [ base containers mersenne-random vector ];
        description = "Fast artifical neural networks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instrument-chord" = callPackage
@@ -135637,6 +144554,8 @@ self: {
        ];
        description = "A data structure that associates each Int key with a set of values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intcode" = callPackage
@@ -135651,6 +144570,8 @@ self: {
        testHaskellDepends = [ base containers doctest primitive ];
        description = "Advent of Code 2019 intcode interpreter";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "integer-gmp_1_0_3_0" = callPackage
@@ -135691,6 +144612,8 @@ self: {
        sha256 = "0lrhf6mw90bfph3hbyxv3n7g2n2xnjfq4qnhyhw4ml76k4yybmxa";
        description = "A pure-Haskell implementation of arbitrary-precision Integers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "integer-roots" = callPackage
@@ -135707,6 +144630,8 @@ self: {
        ];
        description = "Integer roots and perfect powers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "integer-simple" = callPackage
@@ -135755,6 +144680,8 @@ self: {
        ];
        description = "Integrate different assays";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intel-aes" = callPackage
@@ -135773,6 +144700,8 @@ self: {
        librarySystemDepends = [ intel_aes ];
        description = "Hardware accelerated AES encryption and Random Number Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {intel_aes = null;};
 
   "intensional-datatys" = callPackage
@@ -135793,6 +144722,8 @@ self: {
        doHaddock = false;
        description = "A GHC Core plugin for intensional datatype refinement checking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interact" = callPackage
@@ -135905,6 +144836,8 @@ self: {
        ];
        description = "Prelude replacement based on protolude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intern" = callPackage
@@ -135938,6 +144871,8 @@ self: {
        ];
        description = "Shell command for constructing custom stamps for German Post";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intero" = callPackage
@@ -135964,6 +144899,8 @@ self: {
        ];
        description = "Complete interactive development program for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interp" = callPackage
@@ -136018,6 +144955,8 @@ self: {
        ];
        description = "GHC preprocessor and library to enable variable interpolation in strings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interpolate" = callPackage
@@ -136067,6 +145006,8 @@ self: {
        ];
        description = "QuasiQuoter for Ruby-style multi-line interpolated strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interpolatedstring-qq-mwotton" = callPackage
@@ -136082,6 +145023,8 @@ self: {
        ];
        description = "DO NOT USE THIS. interpolatedstring-qq works now.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interpolatedstring-qq2" = callPackage
@@ -136100,6 +145043,8 @@ self: {
        ];
        description = "QuasiQuoter for multi-line interpolated strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interpolation" = callPackage
@@ -136169,6 +145114,8 @@ self: {
        testHaskellDepends = [ base Cabal either transformers ];
        description = "Monad transformers that can be run and resumed later, conserving their context";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interspersed" = callPackage
@@ -136194,6 +145141,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Intervals with adherences";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interval-algebra" = callPackage
@@ -136324,6 +145273,8 @@ self: {
        doHaddock = false;
        description = "Intro reexported as Prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "introduction" = callPackage
@@ -136344,6 +145295,8 @@ self: {
        ];
        description = "A prelude for safe new projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "introduction-test" = callPackage
@@ -136363,6 +145316,8 @@ self: {
        ];
        description = "A prelude for the tests of safe new projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intset" = callPackage
@@ -136374,6 +145329,8 @@ self: {
        libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
        description = "Pure, mergeable, succinct Int sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intset-imperative" = callPackage
@@ -136463,6 +145420,8 @@ self: {
        libraryHaskellDepends = [ base HList invertible ];
        description = "invertible functions and instances for HList";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "invertible-hxt" = callPackage
@@ -136487,6 +145446,8 @@ self: {
        libraryHaskellDepends = [ base partial-isomorphisms ];
        description = "Invertible syntax descriptions for both parsing and pretty printing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "involutive-semigroups" = callPackage
@@ -136516,6 +145477,8 @@ self: {
        ];
        description = "Capture IO actions' stdout and stderr";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "io-choice" = callPackage
@@ -136535,6 +145498,8 @@ self: {
        ];
        description = "Choice for IO and lifted IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "io-machine" = callPackage
@@ -136586,6 +145551,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "An API for generating TIMBER style reactive objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "io-region" = callPackage
@@ -136712,6 +145679,8 @@ self: {
        libraryHaskellDepends = [ base network unix ];
        description = "Type-safe I/O control package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ion" = callPackage
@@ -136732,6 +145701,8 @@ self: {
        ];
        description = "EDSL for concurrent, realtime, embedded programming on top of Ivory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ioref-stable" = callPackage
@@ -136754,6 +145725,8 @@ self: {
        libraryHaskellDepends = [ base bytestring path text ];
        description = "A class of strings that can be involved in IO";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iothread" = callPackage
@@ -136765,6 +145738,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "run IOs in a single thread";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iotransaction" = callPackage
@@ -136776,6 +145751,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ip" = callPackage
@@ -136806,6 +145783,8 @@ self: {
        ];
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ip-quoter" = callPackage
@@ -136820,6 +145799,8 @@ self: {
        testHaskellDepends = [ base cpu network tasty tasty-hunit ];
        description = "Quasiquoter for IP addresses";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ip2location" = callPackage
@@ -136831,6 +145812,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Location Haskell package for IP geolocation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ip2proxy" = callPackage
@@ -136842,6 +145825,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Proxy Haskell package for proxy detection";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ip6addr" = callPackage
@@ -136873,6 +145858,8 @@ self: {
        ];
        description = "interactive patch editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ipc" = callPackage
@@ -136888,6 +145875,8 @@ self: {
        ];
        description = "High level inter-process communication library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ipcvar" = callPackage
@@ -136929,6 +145918,8 @@ self: {
        ];
        description = "Access IPFS locally and remotely";
        license = stdenv.lib.licenses.agpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ipfs-api" = callPackage
@@ -136944,6 +145935,8 @@ self: {
        ];
        description = "Auto-generated IPFS HTTP API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ipld-cid" = callPackage
@@ -136988,6 +145981,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ipopt; inherit (pkgs) nlopt;};
 
   "ipprint" = callPackage
@@ -136999,6 +145994,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src sr-extra ];
        description = "Tiny helper for pretty-printing values in ghci console";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iproute" = callPackage
@@ -137058,6 +146055,8 @@ self: {
        executableHaskellDepends = [ base QuickCheck syb ];
        description = "iptables rules parser/printer library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iptadmin" = callPackage
@@ -137082,6 +146081,8 @@ self: {
        ];
        description = "web-interface for iptables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ipynb" = callPackage
@@ -137221,6 +146222,8 @@ self: {
        testHaskellDepends = [ base hashable HUnit text ];
        description = "IRC core library for glirc";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irc-ctcp" = callPackage
@@ -137256,6 +146259,8 @@ self: {
        ];
        description = "A DCC message parsing and helper library for IRC clients";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irc-fun-bot" = callPackage
@@ -137276,6 +146281,8 @@ self: {
        ];
        description = "Library for writing fun IRC bots";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irc-fun-client" = callPackage
@@ -137294,6 +146301,8 @@ self: {
        ];
        description = "Another library for writing IRC clients";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irc-fun-color" = callPackage
@@ -137310,6 +146319,8 @@ self: {
        testHaskellDepends = [ base text ];
        description = "Add color and style decorations to IRC messages";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irc-fun-messages" = callPackage
@@ -137323,6 +146334,8 @@ self: {
        ];
        description = "Types and functions for working with the IRC protocol";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irc-fun-types" = callPackage
@@ -137334,6 +146347,8 @@ self: {
        libraryHaskellDepends = [ base hashable text ];
        description = "Common types for IRC related packages";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ircbot" = callPackage
@@ -137404,6 +146419,8 @@ self: {
        ];
        description = "RFC-based resource identifier library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iridium" = callPackage
@@ -137431,6 +146448,8 @@ self: {
        ];
        description = "Automated Local Cabal Package Testing and Uploading";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iron-mq" = callPackage
@@ -137442,6 +146461,8 @@ self: {
        libraryHaskellDepends = [ aeson base http-client lens text wreq ];
        description = "Iron.IO message queueing client library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ironforge" = callPackage
@@ -137464,6 +146485,8 @@ self: {
        ];
        description = "A technical demo for Antisplice";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irt" = callPackage
@@ -137475,6 +146498,8 @@ self: {
        libraryHaskellDepends = [ ad base data-default-class statistics ];
        description = "Item Response Theory functions for use in computerized adaptive testing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "is" = callPackage
@@ -137531,6 +146556,8 @@ self: {
        ];
        description = "An executable and library to determine if a file is a DICOM file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "isevaluated" = callPackage
@@ -137542,6 +146569,8 @@ self: {
        libraryHaskellDepends = [ base vacuum ];
        description = "Check whether a value has been evaluated";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "isiz" = callPackage
@@ -137582,6 +146611,8 @@ self: {
        ];
        description = "Advanced ESMTP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iso-deriving" = callPackage
@@ -137653,6 +146684,8 @@ self: {
        ];
        description = "Types and parser for ISO8601 durations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iso8601-time" = callPackage
@@ -137690,6 +146723,8 @@ self: {
        ];
        description = "A parser and generator for the ISO-14496-12/14 base media file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "isobmff-builder" = callPackage
@@ -137714,6 +146749,8 @@ self: {
        ];
        description = "A (bytestring-) builder for the ISO-14496-12 base media file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "isohunt" = callPackage
@@ -137730,6 +146767,8 @@ self: {
        ];
        description = "Bindings to the isoHunt torrent search API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "isotope" = callPackage
@@ -137748,6 +146787,8 @@ self: {
        ];
        description = "Isotopic masses and relative abundances";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ispositive" = callPackage
@@ -137808,6 +146849,8 @@ self: {
        ];
        description = "Issue Tracker for the CLI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "itemfield" = callPackage
@@ -137835,6 +146878,8 @@ self: {
        ];
        description = "A brick Widget for selectable summary of many elements on a terminal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iter-stats" = callPackage
@@ -137853,6 +146898,8 @@ self: {
        ];
        description = "iteratees for statistical processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iterIO" = callPackage
@@ -137871,6 +146918,8 @@ self: {
        librarySystemDepends = [ zlib ];
        description = "Iteratee-based IO with pipe operators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "iterable" = callPackage
@@ -137914,6 +146963,8 @@ self: {
        ];
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iteratee-compress" = callPackage
@@ -137926,6 +146977,8 @@ self: {
        librarySystemDepends = [ bzip2 zlib ];
        description = "Enumeratees for compressing and decompressing streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;};
 
   "iteratee-mtl" = callPackage
@@ -137943,6 +146996,8 @@ self: {
        ];
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iteratee-parsec" = callPackage
@@ -137958,6 +147013,8 @@ self: {
        ];
        description = "Package allowing parsec parser initeratee";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iteratee-stm" = callPackage
@@ -137971,6 +147028,8 @@ self: {
        ];
        description = "Concurrent iteratees using STM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iterio-server" = callPackage
@@ -137987,6 +147046,8 @@ self: {
        ];
        description = "Library for building servers with IterIO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iterm-show" = callPackage
@@ -138003,6 +147064,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Enable graphical display of images inline on some terminals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iterm-show-JuicyPixels" = callPackage
@@ -138014,6 +147077,8 @@ self: {
        libraryHaskellDepends = [ base iterm-show JuicyPixels ];
        description = "Orphan Show instances for JuciyPixels image types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iterm-show-diagrams" = callPackage
@@ -138029,6 +147094,8 @@ self: {
        ];
        description = "Orphan Show instances for diagrams package that render inline in some terminals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ival" = callPackage
@@ -138074,6 +147141,8 @@ self: {
        ];
        description = "Theorem proving library based on dependent type theory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory" = callPackage
@@ -138092,6 +147161,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-artifact" = callPackage
@@ -138120,6 +147191,8 @@ self: {
        ];
        description = "Ivory register bindings for the Atmega328p";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-backend-c" = callPackage
@@ -138140,6 +147213,8 @@ self: {
        ];
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-bitdata" = callPackage
@@ -138158,6 +147233,8 @@ self: {
        executableHaskellDepends = [ base ivory ivory-backend-c ];
        description = "Ivory bit-data support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-eval" = callPackage
@@ -138176,6 +147253,8 @@ self: {
        ];
        description = "Simple concrete evaluator for Ivory programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-examples" = callPackage
@@ -138198,6 +147277,8 @@ self: {
        ];
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-hw" = callPackage
@@ -138210,6 +147291,8 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-opts" = callPackage
@@ -138226,6 +147309,8 @@ self: {
        ];
        description = "Ivory compiler optimizations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-quickcheck" = callPackage
@@ -138247,6 +147332,8 @@ self: {
        ];
        description = "QuickCheck driver for Ivory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-serialize" = callPackage
@@ -138263,6 +147350,8 @@ self: {
        ];
        description = "Serialization library for Ivory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-stdlib" = callPackage
@@ -138275,6 +147364,8 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivy-web" = callPackage
@@ -138290,6 +147381,8 @@ self: {
        ];
        description = "A lightweight web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iwlib" = callPackage
@@ -138345,6 +147438,8 @@ self: {
        executableHaskellDepends = [ base preprocessor-tools syb ];
        description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ixmonad" = callPackage
@@ -138358,6 +147453,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ixset" = callPackage
@@ -138449,6 +147546,8 @@ self: {
        ];
        description = "A shallow embedding of the OpenGL Shading Language in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iyql" = callPackage
@@ -138468,6 +147567,8 @@ self: {
        ];
        description = "CLI (command line interface) to YQL";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "j" = callPackage
@@ -138481,6 +147582,8 @@ self: {
        testHaskellDepends = [ base bytestring repa tasty tasty-hunit ];
        description = "J in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "j2hs" = callPackage
@@ -138501,6 +147604,8 @@ self: {
        ];
        description = "j2hs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ja-base-extra" = callPackage
@@ -138545,6 +147650,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libjack2;};
 
   "jackminimix" = callPackage
@@ -138556,6 +147663,8 @@ self: {
        libraryHaskellDepends = [ base hosc ];
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jacobi-roots" = callPackage
@@ -138568,6 +147677,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jaeger-flamegraph" = callPackage
@@ -138593,6 +147704,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Generate flamegraphs from Jaeger .json dumps.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jail" = callPackage
@@ -138608,6 +147721,8 @@ self: {
        ];
        description = "Jailed IO monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jailbreak-cabal" = callPackage
@@ -138657,6 +147772,8 @@ self: {
        ];
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) blas; cblas = null; lapacke = null;};
 
   "jammittools" = callPackage
@@ -138722,6 +147839,8 @@ self: {
        ];
        description = "Tool for searching java classes, members and fields in classfiles and JAR archives";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jarify" = callPackage
@@ -138743,6 +147862,8 @@ self: {
        doHaddock = false;
        description = "Jarification of Haskell sources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jason" = callPackage
@@ -138762,6 +147883,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring text ];
        description = "A fast JASONETTE-iOS JSON combinator library for haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "java-adt" = callPackage
@@ -138801,6 +147924,8 @@ self: {
        ];
        description = "Bindings to the JNI and a high level interface generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "java-bridge-extras" = callPackage
@@ -138812,6 +147937,8 @@ self: {
        libraryHaskellDepends = [ base java-bridge transformers ];
        description = "Utilities for working with the java-bridge package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "java-character" = callPackage
@@ -138823,6 +147950,8 @@ self: {
        libraryHaskellDepends = [ base diet ];
        description = "Functions to simulate Java's Character class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "java-poker" = callPackage
@@ -138848,6 +147977,8 @@ self: {
        libraryHaskellDepends = [ base containers hx java-bridge ];
        description = "Tools for reflecting on Java classes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "javaclass" = callPackage
@@ -138890,6 +148021,8 @@ self: {
        testHaskellDepends = [ aeson base scotty stm text time wai-extra ];
        description = "Remote Monad for JavaScript on the browser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "javascript-extras" = callPackage
@@ -138930,6 +148063,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "javav" = callPackage
@@ -138946,6 +148081,8 @@ self: {
        ];
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jbi" = callPackage
@@ -138967,6 +148104,8 @@ self: {
        ];
        description = "Just Build It - a \"do what I mean\" abstraction for Haskell build tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jcdecaux-vls" = callPackage
@@ -138982,6 +148121,8 @@ self: {
        ];
        description = "JCDecaux self-service bicycles API client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jdi" = callPackage
@@ -139000,6 +148141,8 @@ self: {
        executableHaskellDepends = [ base mtl network ];
        description = "Implementation of Java Debug Interface";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jenga" = callPackage
@@ -139021,6 +148164,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Generate a cabal freeze file from a stack.yaml";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jenkinsPlugins2nix" = callPackage
@@ -139044,6 +148189,8 @@ self: {
        testHaskellDepends = [ base containers tasty-hspec text ];
        description = "Generate nix for Jenkins plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jespresso" = callPackage
@@ -139073,6 +148220,8 @@ self: {
        ];
        description = "Extract all JavaScript from an HTML page and consolidate it in one script";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jinquantities" = callPackage
@@ -139095,6 +148244,8 @@ self: {
        ];
        description = "Unit conversion and manipulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jira-wiki-markup" = callPackage
@@ -139136,6 +148287,8 @@ self: {
        ];
        description = "QuasiQuotation library for programmatic generation of Javascript code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jmacro-rpc" = callPackage
@@ -139154,6 +148307,8 @@ self: {
        ];
        description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jmacro-rpc-happstack" = callPackage
@@ -139170,6 +148325,8 @@ self: {
        ];
        description = "Happstack backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jmacro-rpc-snap" = callPackage
@@ -139185,6 +148342,8 @@ self: {
        ];
        description = "Snap backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jml-web-service" = callPackage
@@ -139205,6 +148364,8 @@ self: {
        testHaskellDepends = [ base protolude tasty ];
        description = "Common utilities for running a web service";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jmonkey" = callPackage
@@ -139217,6 +148378,8 @@ self: {
        testHaskellDepends = [ base casing free jmacro ];
        description = "Jmonkey is very restricted but handy EDSL for JavaScript";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jni" = callPackage
@@ -139236,6 +148399,8 @@ self: {
        testHaskellDepends = [ base hspec singletons ];
        description = "Complete JNI raw bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) jdk;};
 
   "jobqueue" = callPackage
@@ -139261,6 +148426,8 @@ self: {
        ];
        description = "A job queue library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jobs-ui" = callPackage
@@ -139281,6 +148448,8 @@ self: {
        ];
        description = "A library for creating a jobs management website running custom jobs";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "join" = callPackage
@@ -139293,6 +148462,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 multisetrewrite stm ];
        description = "Parallel Join Patterns with Guards and Propagation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "join-api" = callPackage
@@ -139306,6 +148477,8 @@ self: {
        ];
        description = "Bindings for Join push notifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "joinlist" = callPackage
@@ -139317,6 +148490,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Join list - symmetric list type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "joint" = callPackage
@@ -139347,6 +148522,8 @@ self: {
        ];
        description = "An implementation of the Jonathan's Card API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jord" = callPackage
@@ -139451,6 +148628,8 @@ self: {
        ];
        description = "Tiny markdown notebook";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jpeg" = callPackage
@@ -139462,6 +148641,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A library for decoding JPEG files written in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jps" = callPackage
@@ -139523,6 +148704,8 @@ self: {
        libraryHaskellDepends = [ base wl-pprint ];
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "js-jquery" = callPackage
@@ -139602,6 +148785,8 @@ self: {
        executableHaskellDepends = [ base jsaddle lens text ];
        description = "JSaddle Hello World, an example package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsaddle-warp" = callPackage
@@ -139683,6 +148868,8 @@ self: {
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsc" = callPackage
@@ -139711,6 +148898,8 @@ self: {
        libraryHaskellDepends = [ base DOM mtl WebBits ];
        description = "Javascript Monadic Writer base package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json" = callPackage
@@ -139739,6 +148928,8 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        description = "Union 'alternative' or Either that has untagged JSON encoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-api" = callPackage
@@ -139799,6 +148990,8 @@ self: {
        ];
        description = "Test that your (Aeson) JSON encoding matches your expectations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-ast" = callPackage
@@ -139831,6 +149024,8 @@ self: {
        ];
        description = "Encoders of JSON AST";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-ast-quickcheck" = callPackage
@@ -139845,6 +149040,8 @@ self: {
        ];
        description = "Compatibility layer for \"json-ast\" and \"QuickCheck\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-autotype" = callPackage
@@ -139879,6 +149076,8 @@ self: {
        ];
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-b" = callPackage
@@ -139901,6 +149100,8 @@ self: {
        ];
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-builder" = callPackage
@@ -139919,6 +149120,8 @@ self: {
        ];
        description = "Data structure agnostic JSON serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-bytes-builder" = callPackage
@@ -139954,6 +149157,8 @@ self: {
        ];
        description = "Load JSON from files in a directory structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-encoder" = callPackage
@@ -139971,6 +149176,8 @@ self: {
        ];
        description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-enumerator" = callPackage
@@ -139988,6 +149195,8 @@ self: {
        ];
        description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-extra" = callPackage
@@ -140004,6 +149213,8 @@ self: {
        ];
        description = "Utility functions to extend Aeson";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-feed" = callPackage
@@ -140041,6 +149252,8 @@ self: {
        ];
        description = "Generic JSON serialization / deserialization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-incremental-decoder" = callPackage
@@ -140065,6 +149278,8 @@ self: {
        ];
        description = "Incremental JSON parser with early termination and a declarative DSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-litobj" = callPackage
@@ -140077,6 +149292,8 @@ self: {
        testHaskellDepends = [ base hspec json QuickCheck ];
        description = "Extends Text.JSON to handle literal JS objects.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-pointer" = callPackage
@@ -140121,6 +149338,8 @@ self: {
        ];
        description = "JSON Pointer extensions for Hasql";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-pointy" = callPackage
@@ -140161,6 +149380,8 @@ self: {
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) python;};
 
   "json-qq" = callPackage
@@ -140236,6 +149457,8 @@ self: {
        ];
        description = "JSON-RPC 2.0 on the client side.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-rpc-generic" = callPackage
@@ -140305,6 +149528,8 @@ self: {
        ];
        description = "Types and type classes for defining JSON schemas";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-sop" = callPackage
@@ -140321,6 +149546,8 @@ self: {
        ];
        description = "Generics JSON (de)serialization using generics-sop";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-state" = callPackage
@@ -140384,6 +149611,8 @@ self: {
        ];
        description = "High-performance JSON parser and encoder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-to-haskell" = callPackage
@@ -140432,6 +149661,8 @@ self: {
        ];
        description = "Effectful parsing of JSON documents";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-tokens" = callPackage
@@ -140459,6 +149690,8 @@ self: {
        ];
        description = "Tokenize JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-tools" = callPackage
@@ -140478,6 +149711,8 @@ self: {
        ];
        description = "A collection of JSON tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-tracer" = callPackage
@@ -140501,6 +149736,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A polymorphic, type-safe, json-structured tracing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-types" = callPackage
@@ -140528,6 +149765,8 @@ self: {
        ];
        description = "Library provides support for JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json2-hdbc" = callPackage
@@ -140543,6 +149782,8 @@ self: {
        ];
        description = "Support JSON for SQL Database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json2-types" = callPackage
@@ -140602,6 +149843,8 @@ self: {
        ];
        description = "Filter select values in JSON objects to unix programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsonifier" = callPackage
@@ -140622,6 +149865,8 @@ self: {
        ];
        description = "Fast and simple JSON encoding toolkit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsonpath" = callPackage
@@ -140658,6 +149903,8 @@ self: {
        ];
        description = "Parser and datatypes for the JSON Resume format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsonrpc-conduit" = callPackage
@@ -140678,6 +149925,8 @@ self: {
        ];
        description = "JSON-RPC 2.0 server over a Conduit.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsons-to-schema" = callPackage
@@ -140709,6 +149958,8 @@ self: {
        ];
        description = "JSON to JSON Schema";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsonschema-gen" = callPackage
@@ -140730,6 +149981,8 @@ self: {
        ];
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsonsql" = callPackage
@@ -140750,6 +150003,8 @@ self: {
        ];
        description = "Interpolate JSON object values into SQL strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsontsv" = callPackage
@@ -140770,6 +150025,8 @@ self: {
        ];
        description = "JSON to TSV transformer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsonxlsx" = callPackage
@@ -140790,6 +150047,8 @@ self: {
        ];
        description = "json to xlsx converter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsop" = callPackage
@@ -140829,6 +150088,8 @@ self: {
        ];
        description = "Extract substructures from JSON by following a path";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "juandelacosa" = callPackage
@@ -140853,6 +150114,8 @@ self: {
        ];
        description = "Manage users in MariaDB >= 10.1.1";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "judge" = callPackage
@@ -140879,6 +150142,8 @@ self: {
        ];
        description = "Tableau-based theorem prover for justification logic";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "judy" = callPackage
@@ -140894,6 +150159,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {Judy = null;};
 
   "juicy-draw" = callPackage
@@ -141015,6 +150282,8 @@ self: {
        ];
        description = "A library for creating and using Jupyter kernels";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "justified-containers" = callPackage
@@ -141052,6 +150321,8 @@ self: {
        ];
        description = "Call JVM methods from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jvm-batching" = callPackage
@@ -141076,6 +150347,8 @@ self: {
        ];
        description = "Provides batched marshalling of values between Java and Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jvm-binary" = callPackage
@@ -141108,6 +150381,8 @@ self: {
        ];
        description = "A library for reading Java class-files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jvm-parser" = callPackage
@@ -141124,6 +150399,8 @@ self: {
        ];
        description = "A parser for JVM bytecode files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jvm-streaming" = callPackage
@@ -141146,6 +150423,8 @@ self: {
        ];
        description = "Expose Java iterators as streams from the streaming package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jwt" = callPackage
@@ -141195,6 +150474,8 @@ self: {
        ];
        description = "An implementation of the Kademlia DHT Protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka" = callPackage
@@ -141225,6 +150506,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-client-sync" = callPackage
@@ -141239,6 +150522,8 @@ self: {
        testHaskellDepends = [ base hw-kafka-client monad-parallel text ];
        description = "Synchronous Kafka Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-device" = callPackage
@@ -141259,6 +150544,8 @@ self: {
        ];
        description = "UI device events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-device-glut" = callPackage
@@ -141273,6 +150560,8 @@ self: {
        executableHaskellDepends = [ base GLUT kafka-device OpenGL ];
        description = "GLUT events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-device-joystick" = callPackage
@@ -141293,6 +150582,8 @@ self: {
        ];
        description = "Linux joystick events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-device-leap" = callPackage
@@ -141311,6 +150602,8 @@ self: {
        ];
        description = "Leap Motion events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-device-spacenav" = callPackage
@@ -141331,6 +150624,8 @@ self: {
        ];
        description = "Linux SpaceNavigator events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-device-vrpn" = callPackage
@@ -141345,6 +150640,8 @@ self: {
        executableHaskellDepends = [ base kafka-device vrpn ];
        description = "VRPN events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kaleidoscope" = callPackage
@@ -141367,6 +150664,8 @@ self: {
        doHaddock = false;
        description = "Haskell Kaleidoscope tutorial";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kalman" = callPackage
@@ -141386,6 +150685,8 @@ self: {
        ];
        description = "Kalman and particle filters and smoothers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kan-extensions" = callPackage
@@ -141415,6 +150716,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Binary parsing with random access";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kanji" = callPackage
@@ -141482,6 +150785,8 @@ self: {
        ];
        description = "Kansas Lava is a hardware simulator and VHDL generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kansas-lava-cores" = callPackage
@@ -141501,6 +150806,8 @@ self: {
        ];
        description = "FPGA Cores Written in Kansas Lava";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kansas-lava-papilio" = callPackage
@@ -141519,6 +150826,8 @@ self: {
        ];
        description = "Kansas Lava support files for the Papilio FPGA board";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kansas-lava-shake" = callPackage
@@ -141535,6 +150844,8 @@ self: {
        ];
        description = "Shake rules for building Kansas Lava projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "karakuri" = callPackage
@@ -141550,6 +150861,8 @@ self: {
        ];
        description = "Good stateful automata";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "karps" = callPackage
@@ -141577,6 +150890,8 @@ self: {
        ];
        description = "Haskell bindings for Spark Dataframes and Datasets";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "karver" = callPackage
@@ -141683,6 +150998,8 @@ self: {
        ];
        description = "ElasticSearch scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katip-kafka" = callPackage
@@ -141696,6 +151013,8 @@ self: {
        ];
        description = "Katip scribe to send logs to Kafka";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katip-logzio" = callPackage
@@ -141738,6 +151057,8 @@ self: {
        ];
        description = "Katip scribe that logs to Rollbar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katip-scalyr-scribe" = callPackage
@@ -141756,6 +151077,8 @@ self: {
        ];
        description = "A katip scribe for logging to json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katip-syslog" = callPackage
@@ -141772,6 +151095,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Syslog Katip Scribe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katt" = callPackage
@@ -141793,6 +151118,8 @@ self: {
        testHaskellDepends = [ base bytestring directory mtl ];
        description = "Client for the Kattis judge system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katydid" = callPackage
@@ -141826,6 +151153,8 @@ self: {
        ];
        description = "A haskell implementation of Katydid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kawa" = callPackage
@@ -141872,6 +151201,8 @@ self: {
        ];
        description = "Utilities for serving static sites and blogs with Wai/Warp";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kawhi" = callPackage
@@ -141894,6 +151225,8 @@ self: {
        ];
        description = "stats.NBA.com library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kazura-queue" = callPackage
@@ -141963,6 +151296,8 @@ self: {
        ];
        description = "A simple k-d tree implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kdesrc-build-extra" = callPackage
@@ -141981,6 +151316,8 @@ self: {
        ];
        description = "Build profiles for kdesrc-build";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kdesrc-build-profiles" = callPackage
@@ -142043,6 +151380,8 @@ self: {
        ];
        description = "cryptographic functions based on the sponge construction";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keenser" = callPackage
@@ -142109,6 +151448,8 @@ self: {
        ];
        description = "Rapid Gtk Application Development - I18N";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-mvc-controller" = callPackage
@@ -142136,6 +151477,8 @@ self: {
        ];
        description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-mvc-model-lightmodel" = callPackage
@@ -142152,6 +151495,8 @@ self: {
        ];
        description = "Rapid Gtk Application Development - Reactive Protected Light Models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-mvc-model-protectedmodel" = callPackage
@@ -142168,6 +151513,8 @@ self: {
        ];
        description = "Rapid Gtk Application Development - Protected Reactive Models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-mvc-solutions-config" = callPackage
@@ -142200,6 +151547,8 @@ self: {
        ];
        description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-mvc-view" = callPackage
@@ -142242,6 +151591,8 @@ self: {
        ];
        description = "Reactive Haskell on Rails - CBMVars as reactive values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactive-fs" = callPackage
@@ -142257,6 +151608,8 @@ self: {
        ];
        description = "Haskell on Rails - Files as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactive-gtk" = callPackage
@@ -142273,6 +151626,8 @@ self: {
        ];
        description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactive-htmldom" = callPackage
@@ -142290,6 +151645,8 @@ self: {
        ];
        description = "Keera Hails Reactive bindings for HTML DOM via GHCJS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactive-network" = callPackage
@@ -142305,6 +151662,8 @@ self: {
        ];
        description = "Haskell on Rails - Sockets as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactive-polling" = callPackage
@@ -142319,6 +151678,8 @@ self: {
        ];
        description = "Haskell on Rails - Polling based Readable RVs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactive-wx" = callPackage
@@ -142332,6 +151693,8 @@ self: {
        ];
        description = "Haskell on Rails - Reactive Fields for WX widgets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactive-yampa" = callPackage
@@ -142347,6 +151710,8 @@ self: {
        ];
        description = "Haskell on Rails - FRP Yampa Signal Functions as RVs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactivelenses" = callPackage
@@ -142358,6 +151723,8 @@ self: {
        libraryHaskellDepends = [ base keera-hails-reactivevalues lens ];
        description = "Reactive Haskell on Rails - Lenses applied to Reactive Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactivevalues" = callPackage
@@ -142377,6 +151744,8 @@ self: {
        testToolDepends = [ cabal-install ];
        description = "Haskell on Rails - Reactive Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-posture" = callPackage
@@ -142456,6 +151825,8 @@ self: {
        ];
        description = "Manage and abstract your packer configurations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keter" = callPackage
@@ -142489,6 +151860,8 @@ self: {
        ];
        description = "Web application deployment manager, focusing on Haskell web frameworks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kevin" = callPackage
@@ -142509,6 +151882,8 @@ self: {
        ];
        description = "a dAmn ↔ IRC proxy";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "key" = callPackage
@@ -142595,6 +151970,8 @@ self: {
        libraryHaskellDepends = [ base containers vector ];
        description = "Generic indexing for many data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keyring" = callPackage
@@ -142608,6 +151985,8 @@ self: {
        libraryHaskellDepends = [ base udbus ];
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keys" = callPackage
@@ -142655,6 +152034,8 @@ self: {
        ];
        description = "back up a secret key securely to the cloud";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keystore" = callPackage
@@ -142686,6 +152067,8 @@ self: {
        ];
        description = "Managing stores of secret things";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keyvaluehash" = callPackage
@@ -142702,6 +152085,8 @@ self: {
        ];
        description = "Pure Haskell key/value store implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keyword-args" = callPackage
@@ -142723,6 +152108,8 @@ self: {
        ];
        description = "Extract data from a keyword-args config file format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "khph" = callPackage
@@ -142742,6 +152129,8 @@ self: {
        ];
        description = "Command-line file tagging and organization tool";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ki" = callPackage
@@ -142756,6 +152145,8 @@ self: {
        testHaskellDepends = [ base concurrency dejafu stm ];
        description = "A lightweight, structured concurrency library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kibro" = callPackage
@@ -142788,6 +152179,8 @@ self: {
        ];
        description = "Parser and writer for KiCad files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kickass-torrents-dump-parser" = callPackage
@@ -142805,6 +152198,8 @@ self: {
        ];
        description = "Parses kat.ph torrent dumps";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kickchan" = callPackage
@@ -142823,6 +152218,8 @@ self: {
        ];
        description = "Kick Channels: bounded channels with non-blocking writes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kif-parser" = callPackage
@@ -142841,6 +152238,8 @@ self: {
        ];
        description = "Process KIF iOS test logs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kind-apply" = callPackage
@@ -142910,6 +152309,8 @@ self: {
        ];
        description = "A dependency manager for Xcode (Objective-C) projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kleene" = callPackage
@@ -142980,6 +152381,8 @@ self: {
        ];
        description = "Sequential and parallel implementations of Lloyd's algorithm";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kmeans-vector" = callPackage
@@ -142996,6 +152399,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion QuickCheck vector ];
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kmonad" = callPackage
@@ -143015,6 +152420,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Advanced keyboard remapping utility";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kmp-dfa" = callPackage
@@ -143027,6 +152434,8 @@ self: {
        testHaskellDepends = [ array base QuickCheck ];
        description = "KMP algorithm implementation, based on Deterministic Finite State Automata";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "knead" = callPackage
@@ -143048,6 +152457,8 @@ self: {
        ];
        description = "Repa-like array processing using LLVM JIT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "knead-arithmetic" = callPackage
@@ -143061,6 +152472,8 @@ self: {
        ];
        description = "Linear algebra and interpolation using LLVM JIT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "knit" = callPackage
@@ -143112,6 +152525,8 @@ self: {
        ];
        description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "knob" = callPackage
@@ -143141,6 +152556,8 @@ self: {
        executableHaskellDepends = [ base containers parallel ];
        description = "Khovanov homology computations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "koellner-phonetic" = callPackage
@@ -143154,6 +152571,8 @@ self: {
        doHaddock = false;
        description = "\"map German words to code representing pronunciation\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kontra-config" = callPackage
@@ -143170,6 +152589,8 @@ self: {
        ];
        description = "JSON config file parsing based on unjson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kontrakcja-templates" = callPackage
@@ -143239,6 +152660,8 @@ self: {
        ];
        description = "The Korfu ORF Utility";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kqueue" = callPackage
@@ -143254,6 +152677,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A binding to the kqueue event library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kraken" = callPackage
@@ -143271,6 +152696,8 @@ self: {
        ];
        description = "Kraken.io API client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "krank" = callPackage
@@ -143301,6 +152728,8 @@ self: {
        ];
        description = "Krank checks your code source comments for important markers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "krapsh" = callPackage
@@ -143326,6 +152755,8 @@ self: {
        ];
        description = "Haskell bindings for Spark Dataframes and Datasets";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "krpc" = callPackage
@@ -143351,6 +152782,8 @@ self: {
        ];
        description = "KRPC protocol implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ks-test" = callPackage
@@ -143362,6 +152795,8 @@ self: {
        libraryHaskellDepends = [ base gamma random-fu roots vector ];
        description = "Kolmogorov distribution and Kolmogorov-Smirnov test";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ksystools" = callPackage
@@ -143385,6 +152820,8 @@ self: {
        libraryPkgconfigDepends = [ egl glew ];
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {egl = null; inherit (pkgs) glew;};
 
   "ktx-codec" = callPackage
@@ -143404,6 +152841,8 @@ self: {
        ];
        description = "Khronos texture format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kubernetes-client" = callPackage
@@ -143439,6 +152878,8 @@ self: {
        ];
        description = "Client library for Kubernetes";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kubernetes-client-core" = callPackage
@@ -143466,6 +152907,8 @@ self: {
        ];
        description = "Auto-generated kubernetes-client-core API Client";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kubernetes-webhook-haskell" = callPackage
@@ -143493,6 +152936,8 @@ self: {
        libraryHaskellDepends = [ base boxes containers lens ];
        description = "A Quantitative Information Flow aware programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kure" = callPackage
@@ -143506,6 +152951,8 @@ self: {
        libraryHaskellDepends = [ base dlist transformers ];
        description = "Combinators for Strategic Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kure-your-boilerplate" = callPackage
@@ -143517,6 +152964,8 @@ self: {
        libraryHaskellDepends = [ base kure template-haskell ];
        description = "Generator for Boilerplate KURE Combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kurita" = callPackage
@@ -143549,6 +152998,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Find the alpha emoji";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kyotocabinet" = callPackage
@@ -143573,6 +153024,8 @@ self: {
        librarySystemDepends = [ lbfgsb ];
        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;
+       broken = true;
      }) {lbfgsb = null;};
 
   "l10n" = callPackage
@@ -143595,6 +153048,8 @@ self: {
        libraryHaskellDepends = [ base labeled-tree ];
        description = "Labeled graph structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "labeled-tree" = callPackage
@@ -143640,6 +153095,8 @@ self: {
        ];
        description = "an experiment management framework";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "labsat" = callPackage
@@ -143663,6 +153120,8 @@ self: {
        ];
        description = "LabSat TCP Interface Wrapper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "labyrinth" = callPackage
@@ -143684,6 +153143,8 @@ self: {
        ];
        description = "A complicated turn-based game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "labyrinth-server" = callPackage
@@ -143717,6 +153178,8 @@ self: {
        ];
        description = "A complicated turn-based game - Web server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lackey" = callPackage
@@ -143729,6 +153192,8 @@ self: {
        testHaskellDepends = [ base hspec servant servant-foreign text ];
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lacroix" = callPackage
@@ -143760,6 +153225,8 @@ self: {
        ];
        description = "Solve Lagrange multiplier problems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "laika" = callPackage
@@ -143779,6 +153246,8 @@ self: {
        ];
        description = "Minimalistic type-checked compile-time template engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-ast" = callPackage
@@ -143804,6 +153273,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-calculator" = callPackage
@@ -143823,6 +153294,8 @@ self: {
        testHaskellDepends = [ base containers hlint hspec HUnit ];
        description = "A lambda calculus interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-calculus-interpreter" = callPackage
@@ -143849,6 +153322,8 @@ self: {
        libraryHaskellDepends = [ base GLUT mtl OpenGL time ];
        description = "Educational drawing canvas for FP explorers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-devs" = callPackage
@@ -143875,6 +153350,8 @@ self: {
        ];
        description = "a Paralell-DEVS implementaion based on distributed-process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-options" = callPackage
@@ -143889,6 +153366,8 @@ self: {
        ];
        description = "Declarative command-line parser with type-driven pattern matching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-placeholders" = callPackage
@@ -143929,6 +153408,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "An application to work with the lambda calculus (for learning)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda2js" = callPackage
@@ -143942,6 +153423,8 @@ self: {
        executableHaskellDepends = [ base parsec ];
        description = "Untyped Lambda calculus to JavaScript compiler";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdaBase" = callPackage
@@ -143953,6 +153436,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdaFeed" = callPackage
@@ -143966,6 +153451,8 @@ self: {
        executableHaskellDepends = [ base haskell98 html ];
        description = "RSS 2.0 feed generator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdaLit" = callPackage
@@ -143983,6 +153470,8 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot" = callPackage
@@ -144173,6 +153662,8 @@ self: {
        ];
        description = "Utility libraries for the advanced IRC bot, Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot-xmpp" = callPackage
@@ -144219,6 +153710,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit text ];
        description = "Lambdabot for Zulip Chat";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacat" = callPackage
@@ -144262,6 +153755,8 @@ self: {
        ];
        description = "LambdaCms 'core' subsite for Yesod apps";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacms-media" = callPackage
@@ -144278,6 +153773,8 @@ self: {
        ];
        description = "LambdaCms \"media\" extension";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube" = callPackage
@@ -144291,6 +153788,8 @@ self: {
        executableHaskellDepends = [ base editline mtl pretty ];
        description = "A simple lambda cube type checker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-bullet" = callPackage
@@ -144304,6 +153803,8 @@ self: {
        ];
        description = "Example for combining LambdaCube and Bullet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-compiler" = callPackage
@@ -144328,6 +153829,8 @@ self: {
        ];
        description = "LambdaCube 3D is a DSL to program GPUs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-core" = callPackage
@@ -144343,6 +153846,8 @@ self: {
        ];
        description = "LambdaCube 3D IR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-edsl" = callPackage
@@ -144359,6 +153864,8 @@ self: {
        ];
        description = "LambdaCube 3D EDSL definition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-engine" = callPackage
@@ -144378,6 +153885,8 @@ self: {
        ];
        description = "3D rendering engine written entirely in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-examples" = callPackage
@@ -144394,6 +153903,8 @@ self: {
        ];
        description = "Examples for LambdaCube";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-gl" = callPackage
@@ -144412,6 +153923,8 @@ self: {
        ];
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-ir" = callPackage
@@ -144423,6 +153936,8 @@ self: {
        libraryHaskellDepends = [ aeson base containers mtl text vector ];
        description = "LambdaCube 3D intermediate representation of 3D graphics pipelines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-samples" = callPackage
@@ -144444,6 +153959,8 @@ self: {
        ];
        description = "Samples for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdatex" = callPackage
@@ -144464,6 +153981,8 @@ self: {
        ];
        description = "Type-Safe LaTeX EDSL";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdatwit" = callPackage
@@ -144489,6 +154008,8 @@ self: {
        ];
        description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdaya-bus" = callPackage
@@ -144502,6 +154023,8 @@ self: {
        ];
        description = "Fpga bus core and serialization for RedPitaya";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdiff" = callPackage
@@ -144519,6 +154042,8 @@ self: {
        ];
        description = "Diff Viewer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lame" = callPackage
@@ -144542,6 +154067,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Fairly complete high-level binding to LAME encoder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mp3lame = null;};
 
   "lame-tester" = callPackage
@@ -144558,6 +154085,8 @@ self: {
        testHaskellDepends = [ bizzlelude containers tasty tasty-hunit ];
        description = "A strange and unnecessary selective test-running library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lang" = callPackage
@@ -144569,6 +154098,8 @@ self: {
        libraryHaskellDepends = [ base bytestring http-streams Mapping ];
        description = "A Lisp";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-Modula2" = callPackage
@@ -144601,6 +154132,8 @@ self: {
        ];
        description = "Parser, pretty-printer, and more for the Modula-2 programming language";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-asn" = callPackage
@@ -144619,6 +154152,8 @@ self: {
        ];
        description = "ASN.1 encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-asn1" = callPackage
@@ -144720,6 +154255,8 @@ self: {
        ];
        description = "Interpreter and language infrastructure for Boogie";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-c" = callPackage
@@ -144770,6 +154307,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Extracting comments from C code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-c-inline" = callPackage
@@ -144786,6 +154325,8 @@ self: {
        ];
        description = "Inline C & Objective-C code in Haskell for language interoperability";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-c-quote" = callPackage
@@ -144879,6 +154420,8 @@ self: {
        ];
        description = "Conf parsers and pretty-printers for the Haskell programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-csharp" = callPackage
@@ -144893,6 +154436,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "C# source code manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-css" = callPackage
@@ -144916,6 +154461,8 @@ self: {
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "Manipulating Dart source: abstract syntax and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-dickinson" = callPackage
@@ -144955,6 +154502,8 @@ self: {
        doHaddock = false;
        description = "A language for generative literature";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-docker" = callPackage
@@ -145004,6 +154553,8 @@ self: {
        ];
        description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-dot" = callPackage
@@ -145044,6 +154595,8 @@ self: {
        ];
        description = "JavaScript parser and pretty-printer library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-ecmascript-analysis" = callPackage
@@ -145059,6 +154612,8 @@ self: {
        ];
        description = "JavaScript static analysis library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-eiffel" = callPackage
@@ -145077,6 +154632,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Parser and pretty printer for the Eiffel language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-elm" = callPackage
@@ -145094,6 +154651,8 @@ self: {
        testToolDepends = [ doctest ];
        description = "Generate elm code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-fortran" = callPackage
@@ -145107,6 +154666,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Fortran lexer and parser, language support, and extensions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-gcl" = callPackage
@@ -145118,6 +154679,8 @@ self: {
        libraryHaskellDepends = [ base bifunctors parsers ];
        description = "Something similar to Dijkstra's guarded command language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-gemini" = callPackage
@@ -145163,6 +154726,8 @@ self: {
        libraryHaskellDepends = [ array base parsec utf8-string ];
        description = "A library for analysis and synthesis of Go code";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-guess" = callPackage
@@ -145175,6 +154740,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal containers ];
        description = "Guess at which language a text is written in using trigrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-haskell-extract" = callPackage
@@ -145212,6 +154779,8 @@ self: {
        ];
        description = "HCL parsers and pretty-printers for the Haskell programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-java" = callPackage
@@ -145248,6 +154817,8 @@ self: {
        ];
        description = "Parser for Java .class files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-javascript" = callPackage
@@ -145304,6 +154875,8 @@ self: {
        ];
        description = "Parser and serializer for the Kort information language";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-lua" = callPackage
@@ -145328,6 +154901,8 @@ self: {
        ];
        description = "Lua parser and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-lua-qq" = callPackage
@@ -145344,6 +154919,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-lua2" = callPackage
@@ -145369,6 +154946,8 @@ self: {
        ];
        description = "Lua parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-mixal" = callPackage
@@ -145383,6 +154962,8 @@ self: {
        executableHaskellDepends = [ base pretty ];
        description = "Parser, pretty-printer, and AST types for the MIXAL assembly language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-ninja" = callPackage
@@ -145421,6 +155002,8 @@ self: {
        ];
        description = "A library for dealing with the Ninja build language";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-nix" = callPackage
@@ -145468,6 +155051,8 @@ self: {
        ];
        description = "Parser, pretty-printer, and more for the Oberon programming language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-objc" = callPackage
@@ -145485,6 +155070,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Analysis and generation of Objective C code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-ocaml" = callPackage
@@ -145510,6 +155097,8 @@ self: {
        ];
        description = "Language tools for manipulating OCaml programs in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "language-openscad" = callPackage
@@ -145526,6 +155115,8 @@ self: {
        executableHaskellDepends = [ attoparsec base bytestring ];
        description = "A simple parser for OpenSCAD";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-pig" = callPackage
@@ -145546,6 +155137,8 @@ self: {
        ];
        description = "Pig parser in haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-protobuf" = callPackage
@@ -145599,6 +155192,8 @@ self: {
        ];
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-python" = callPackage
@@ -145630,6 +155225,8 @@ self: {
        ];
        description = "Generate coloured XHTML for Python code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-python-test" = callPackage
@@ -145659,6 +155256,8 @@ self: {
        ];
        description = "Utilities for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-rust" = callPackage
@@ -145688,6 +155287,8 @@ self: {
        ];
        description = "Parsing and pretty printing of Rust code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-sally" = callPackage
@@ -145716,6 +155317,8 @@ self: {
        ];
        description = "A package for parsing shell scripts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-slice" = callPackage
@@ -145754,6 +155357,8 @@ self: {
        ];
        description = "Various tools to detect/correct mistakes in words";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-sqlite" = callPackage
@@ -145769,6 +155374,8 @@ self: {
        ];
        description = "Full parser and generator for SQL as implemented by SQLite3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-sygus" = callPackage
@@ -145783,6 +155390,8 @@ self: {
        testHaskellDepends = [ base deepseq tasty tasty-hunit text ];
        description = "A parser and printer for the SyGuS 2.0 language.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-thrift" = callPackage
@@ -145805,6 +155414,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Parser and pretty printer for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-tl" = callPackage
@@ -145827,6 +155438,8 @@ self: {
        ];
        description = "A Parser for the Type Language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-typescript" = callPackage
@@ -145838,6 +155451,8 @@ self: {
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "A library for working with TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-vhdl" = callPackage
@@ -145849,6 +155464,8 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "VHDL AST and pretty printer in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-webidl" = callPackage
@@ -145861,6 +155478,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Parser and Pretty Printer for WebIDL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "laop" = callPackage
@@ -145905,6 +155524,8 @@ self: {
        ];
        description = "Numerical Linear Algebra using LAPACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lapack-carray" = callPackage
@@ -145921,6 +155542,8 @@ self: {
        ];
        description = "Auto-generated interface to Fortran LAPACK via CArrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lapack-comfort-array" = callPackage
@@ -145937,6 +155560,8 @@ self: {
        ];
        description = "Auto-generated interface to Fortran LAPACK via comfort-array";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lapack-ffi" = callPackage
@@ -145949,6 +155574,8 @@ self: {
        libraryPkgconfigDepends = [ liblapack ];
        description = "Auto-generated interface to Fortran LAPACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {liblapack = null;};
 
   "lapack-ffi-tools" = callPackage
@@ -146001,6 +155628,8 @@ self: {
        ];
        description = "Efficiently hash (large) Haskell values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "largeword" = callPackage
@@ -146037,6 +155666,8 @@ self: {
        ];
        description = "Tool to track security alerts on LWN";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "latest-npm-version" = callPackage
@@ -146067,6 +155698,8 @@ self: {
        ];
        description = "Find the latest version of a package on npm";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "latex" = callPackage
@@ -146096,6 +155729,8 @@ self: {
        ];
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "latex-formulae-image" = callPackage
@@ -146114,6 +155749,8 @@ self: {
        ];
        description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "latex-formulae-pandoc" = callPackage
@@ -146135,6 +155772,8 @@ self: {
        ];
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "latex-function-tables" = callPackage
@@ -146187,6 +155826,8 @@ self: {
        ];
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "latex-svg-image" = callPackage
@@ -146204,6 +155845,8 @@ self: {
        ];
        description = "A library for rendering LaTeX formulae as SVG using an actual LaTeX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "latex-svg-pandoc" = callPackage
@@ -146223,6 +155866,8 @@ self: {
        executableHaskellDepends = [ base latex-svg-image pandoc-types ];
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lattices" = callPackage
@@ -146281,6 +155926,8 @@ self: {
        ];
        description = "Server-side SDK for integrating with LaunchDarkly";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "launchpad-control" = callPackage
@@ -146298,6 +155945,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "High and low-level interface to the Novation Launchpad midi controller";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lawful" = callPackage
@@ -146330,6 +155979,8 @@ self: {
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lawz" = callPackage
@@ -146374,6 +156025,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "layers" = callPackage
@@ -146385,6 +156038,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Modular type class machinery for monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "layers-game" = callPackage
@@ -146404,6 +156059,8 @@ self: {
        ];
        description = "A prototypical 2d platform game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "layout" = callPackage
@@ -146415,6 +156072,8 @@ self: {
        libraryHaskellDepends = [ base convertible hinduce-missingh ];
        description = "Turn values into pretty text or markup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "layout-bootstrap" = callPackage
@@ -146426,6 +156085,8 @@ self: {
        libraryHaskellDepends = [ base blaze-html containers text ];
        description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "layout-rules" = callPackage
@@ -146437,6 +156098,8 @@ self: {
        libraryHaskellDepends = [ alex-tools base text ];
        description = "A collection of different layout implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "layouting" = callPackage
@@ -146452,6 +156115,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "lazy" = callPackage
@@ -146495,6 +156160,8 @@ self: {
        ];
        description = "Identifiers for not-yet-computed values";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazy-hash-cache" = callPackage
@@ -146515,6 +156182,8 @@ self: {
        ];
        description = "Storing computed values for re-use when the same program runs again";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazy-io" = callPackage
@@ -146539,6 +156208,8 @@ self: {
        libraryHaskellDepends = [ base bytestring io-streams ];
        description = "Get lazy with your io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazy-priority-queue" = callPackage
@@ -146555,6 +156226,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Lazy-Spined Monadic Priority Queues";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazy-search" = callPackage
@@ -146566,6 +156239,8 @@ self: {
        libraryHaskellDepends = [ base size-based ];
        description = "Finds values satisfying a lazy predicate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazyarray" = callPackage
@@ -146577,6 +156252,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazyboy" = callPackage
@@ -146596,6 +156273,8 @@ self: {
        ];
        description = "An EDSL for programming the Game Boy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazyio" = callPackage
@@ -146626,6 +156305,8 @@ self: {
        ];
        description = "Set and Map from lazy/infinite lists";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazysmallcheck" = callPackage
@@ -146696,6 +156377,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data structures for representing arbitrary intervals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lda" = callPackage
@@ -146711,6 +156394,8 @@ self: {
        ];
        description = "Online Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ldap-client" = callPackage
@@ -146747,6 +156432,8 @@ self: {
        ];
        description = "LDIF idempotent apply tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ldif" = callPackage
@@ -146769,6 +156456,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "The LDAP Data Interchange Format (LDIF) tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leaf" = callPackage
@@ -146787,6 +156476,8 @@ self: {
        ];
        description = "A simple portfolio generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leaky" = callPackage
@@ -146805,6 +156496,8 @@ self: {
        ];
        description = "Robust space leak, and its strictification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lean" = callPackage
@@ -146820,6 +156513,8 @@ self: {
        ];
        description = "Bonds to Lean theorem prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lean-peano" = callPackage
@@ -146920,6 +156615,8 @@ self: {
        ];
        description = "Use the Leanpub API via Wreq";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leapseconds" = callPackage
@@ -146933,6 +156630,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base tasty tasty-hunit time ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leapseconds-announced" = callPackage
@@ -146956,6 +156655,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Learning Algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "learn-physics" = callPackage
@@ -146993,6 +156694,8 @@ self: {
        ];
        description = "examples for learn-physics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "learning-hmm" = callPackage
@@ -147035,8 +156738,8 @@ self: {
      }:
      mkDerivation {
        pname = "leb128-cereal";
-       version = "1.1";
-       sha256 = "08jmd5v36p2vwlx3rw22h762jp7arq06fsmdipff72bvs2cn0fld";
+       version = "1.2";
+       sha256 = "0a2zdm0zd7kpid3da5k5pifkyil048j5y4fvknbs96bky74yz95m";
        libraryHaskellDepends = [ base bytestring cereal ];
        testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-quickcheck
@@ -147057,6 +156760,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "Leetify text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "left4deadrl" = callPackage
@@ -147091,6 +156796,8 @@ self: {
        ];
        description = "Distributed, stateful, homogeneous microservice framework";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "legion-discovery" = callPackage
@@ -147116,6 +156823,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A discovery service based on Legion";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "legion-discovery-client" = callPackage
@@ -147135,6 +156844,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Client library for communicating with legion-discovery";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "legion-extra" = callPackage
@@ -147156,6 +156867,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Extra non-essential utilities for building legion applications";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leksah" = callPackage
@@ -147231,6 +156944,8 @@ self: {
        ];
        description = "Metadata collection for leksah";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lendingclub" = callPackage
@@ -147247,6 +156962,8 @@ self: {
        ];
        description = "Bindings for the LendingClub marketplace API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens" = callPackage
@@ -147470,6 +157187,8 @@ self: {
        ];
        description = "Lens interface for your filesystem; still a bit experimental";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-labels" = callPackage
@@ -147481,6 +157200,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
        description = "Integration of lenses with OverloadedLabels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-misc" = callPackage
@@ -147520,6 +157241,8 @@ self: {
        ];
        description = "Alternate prelude that exports lens combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-process" = callPackage
@@ -147611,6 +157334,8 @@ self: {
        ];
        description = "simplified import of elementary lens-family combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-sop" = callPackage
@@ -147635,6 +157360,8 @@ self: {
        libraryHaskellDepends = [ base bytestring lens text ];
        description = "Isomorphisms and prisms for text <=> bytestring conversions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-th-rewrite" = callPackage
@@ -147649,6 +157376,8 @@ self: {
        executableHaskellDepends = [ base ghc ghc-exactprint lens ];
        description = "Rewrites Template Haskell splices using the API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-time" = callPackage
@@ -147660,6 +157389,8 @@ self: {
        libraryHaskellDepends = [ base lens time ];
        description = "lens for Data.Time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-toml-parser" = callPackage
@@ -147676,6 +157407,8 @@ self: {
        ];
        description = "Lenses for toml-parser";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-tutorial" = callPackage
@@ -147688,6 +157421,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tutorial for the lens library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-typelevel" = callPackage
@@ -147699,6 +157434,8 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Type-level lenses using singletons";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-utils" = callPackage
@@ -147715,6 +157452,8 @@ self: {
        ];
        description = "Collection of missing lens utilities";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-xml" = callPackage
@@ -147752,6 +157491,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "References which can be joined and on which lenses can be applied";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lentil" = callPackage
@@ -147778,6 +157519,8 @@ self: {
        ];
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lenz" = callPackage
@@ -147870,6 +157613,8 @@ self: {
        libraryHaskellDepends = [ base fmlist ];
        description = "Non-Determinism Monad for Level-Wise Search";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leveldb-haskell" = callPackage
@@ -147928,6 +157673,8 @@ self: {
        libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
        description = "An implementation of the Levenberg-Marquardt algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "levmar-chart" = callPackage
@@ -147941,6 +157688,8 @@ self: {
        libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lex-applicative" = callPackage
@@ -147960,6 +157709,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge util ];
        description = "See README for more info";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lexer-applicative" = callPackage
@@ -147988,6 +157739,8 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "L-Fuzzy Set Theory implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lgtk" = callPackage
@@ -148015,6 +157768,8 @@ self: {
        ];
        description = "Lens GUI Toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lha" = callPackage
@@ -148026,6 +157781,8 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "Data structures for the Les Houches Accord";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lhae" = callPackage
@@ -148045,6 +157802,8 @@ self: {
        ];
        description = "Simple spreadsheet program";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lhc" = callPackage
@@ -148058,6 +157817,8 @@ self: {
        enableSeparateDataOutput = true;
        description = "LHC Haskell Compiler";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lhe" = callPackage
@@ -148069,6 +157830,8 @@ self: {
        libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ];
        description = "Parser and writer for Les-Houches event files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lhs2TeX-hl" = callPackage
@@ -148087,6 +157850,8 @@ self: {
        ];
        description = "Literate highlighter preprocessor for lhs2tex";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lhs2html" = callPackage
@@ -148136,6 +157901,8 @@ self: {
        ];
        description = "Tool for using pdflatex with .lhs files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libBF" = callPackage
@@ -148167,6 +157934,8 @@ self: {
        ];
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libarchive" = callPackage
@@ -148233,6 +158002,8 @@ self: {
        testHaskellDepends = [ base doctest doctest-prop lens ];
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libconfig;};
 
   "libcspm" = callPackage
@@ -148253,6 +158024,8 @@ self: {
        ];
        description = "A library providing a parser, type checker and evaluator for CSPM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libexpect" = callPackage
@@ -148265,6 +158038,8 @@ self: {
        librarySystemDepends = [ expect tcl ];
        description = "Library for interacting with console applications via pseudoterminals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) expect; inherit (pkgs) tcl;};
 
   "libffi" = callPackage
@@ -148314,6 +158089,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion unix ];
        description = "A Haskell binding for libfuse-3.x";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fuse3;};
 
   "libgit" = callPackage
@@ -148365,6 +158142,8 @@ self: {
        ];
        description = "Backend for text editors to provide better Haskell editing support";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libinfluxdb" = callPackage
@@ -148383,6 +158162,8 @@ self: {
        ];
        description = "libinfluxdb";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libjenkins" = callPackage
@@ -148411,6 +158192,8 @@ self: {
        ];
        description = "Jenkins API interface";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libjwt-typed" = callPackage
@@ -148441,6 +158224,8 @@ self: {
        ];
        description = "A Haskell implementation of JSON Web Token (JWT)";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liblastfm" = callPackage
@@ -148467,6 +158252,8 @@ self: {
        ];
        description = "Lastfm API interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liblawless" = callPackage
@@ -148502,6 +158289,8 @@ self: {
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liblinear-enumerator" = callPackage
@@ -148515,6 +158304,8 @@ self: {
        ];
        description = "liblinear iteratee";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libltdl" = callPackage
@@ -148528,6 +158319,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "FFI interface to libltdl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libmodbus" = callPackage
@@ -148540,6 +158333,8 @@ self: {
        librarySystemDepends = [ modbus ];
        description = "Haskell bindings to the C modbus library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {modbus = null;};
 
   "libmolude" = callPackage
@@ -148572,6 +158367,8 @@ self: {
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libmpd" = callPackage
@@ -148612,6 +158409,8 @@ self: {
        ];
        description = "Bindings to the nix package manager";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libnotify" = callPackage
@@ -148664,6 +158463,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bindings to liboath";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {liboath = null; oath = null;};
 
   "liboleg" = callPackage
@@ -148679,6 +158480,8 @@ self: {
        ];
        description = "An evolving collection of Oleg Kiselyov's Haskell modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libpafe" = callPackage
@@ -148692,6 +158495,8 @@ self: {
        testHaskellDepends = [ base bytestring iconv transformers ];
        description = "Wrapper for libpafe";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {pafe = null;};
 
   "libpq" = callPackage
@@ -148704,6 +158509,8 @@ self: {
        librarySystemDepends = [ postgresql ];
        description = "libpq binding for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "libraft" = callPackage
@@ -148755,6 +158562,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Raft consensus algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "librandomorg" = callPackage
@@ -148766,6 +158575,8 @@ self: {
        libraryHaskellDepends = [ base bytestring curl ];
        description = "Wrapper to Random.org API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "librato" = callPackage
@@ -148786,6 +158597,8 @@ self: {
        ];
        description = "Bindings to the Librato API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libravatar" = callPackage
@@ -148882,6 +158695,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libssh2;};
 
   "libssh2-conduit" = callPackage
@@ -148899,6 +158714,8 @@ self: {
        ];
        description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libstackexchange" = callPackage
@@ -148936,6 +158753,8 @@ self: {
        ];
        description = "Haskell bindings for libsystemd-daemon";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libsystemd-daemon = null; systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
@@ -148969,6 +158788,8 @@ self: {
        libraryPkgconfigDepends = [ taglib ];
        description = "Binding to TagLib C library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) taglib;};
 
   "libtelnet" = callPackage
@@ -149018,6 +158839,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Bindings to libxls";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libxml" = callPackage
@@ -149048,6 +158871,8 @@ self: {
        ];
        description = "Enumerator-based API for libXML's SAX interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libxml-sax" = callPackage
@@ -149073,6 +158898,8 @@ self: {
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {xslt = null;};
 
   "libyaml" = callPackage
@@ -149136,6 +158963,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Lie Algebras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "life" = callPackage
@@ -149274,6 +159103,8 @@ self: {
        ];
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lifted-protolude" = callPackage
@@ -149291,6 +159122,8 @@ self: {
        ];
        description = "A sensible set of defaults for writing lifted custom Preludes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lifted-stm" = callPackage
@@ -149340,6 +159173,8 @@ self: {
        ];
        description = "A boulderdash-like game and solution validator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ligature" = callPackage
@@ -149351,6 +159186,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Expand ligatures in unicode text";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ligd" = callPackage
@@ -149397,6 +159234,8 @@ self: {
        ];
        description = "Haskell client for lightning-viz REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lightstep-haskell" = callPackage
@@ -149428,6 +159267,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "LightStep OpenTracing client library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lighttpd-conf" = callPackage
@@ -149444,6 +159285,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Lighttpd configuration file tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lighttpd-conf-qq" = callPackage
@@ -149460,6 +159303,8 @@ self: {
        ];
        description = "A QuasiQuoter for lighttpd configuration files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lilypond" = callPackage
@@ -149476,6 +159321,8 @@ self: {
        ];
        description = "Bindings to Lilypond";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "limp" = callPackage
@@ -149509,6 +159356,8 @@ self: {
        ];
        description = "bindings for integer linear programming solver Coin/CBC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lin-alg" = callPackage
@@ -149531,6 +159380,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix HUnit ];
        description = "LINear Discriminant Analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linden" = callPackage
@@ -149560,6 +159411,8 @@ self: {
        ];
        description = "Zen gardening, based on l-systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lindenmayer" = callPackage
@@ -149628,6 +159481,8 @@ self: {
        ];
        description = "Haskell SDK for LINE Messaging API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "line-break" = callPackage
@@ -149745,6 +159600,8 @@ self: {
        ];
        description = "A linear algebra library with bindings to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linear-circuit" = callPackage
@@ -149766,6 +159623,8 @@ self: {
        ];
        description = "Compute resistance of linear electrical circuits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linear-code" = callPackage
@@ -149791,6 +159650,8 @@ self: {
        ];
        description = "A simple library for linear codes (coding theory, error correction)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linear-grammar" = callPackage
@@ -149817,6 +159678,8 @@ self: {
        libraryHaskellDepends = [ base containers HUnit ];
        description = "Finite maps for linear use";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linear-opengl" = callPackage
@@ -149832,6 +159695,8 @@ self: {
        ];
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linear-socket" = callPackage
@@ -149870,6 +159735,8 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, operating on the Num typeclass";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linearEqSolver" = callPackage
@@ -149900,6 +159767,8 @@ self: {
        ];
        description = "Native, complete, matrix-free linear algebra";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linearscan" = callPackage
@@ -149913,6 +159782,8 @@ self: {
        ];
        description = "Linear scan register allocator, formally verified in Coq";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linearscan-hoopl" = callPackage
@@ -149933,6 +159804,8 @@ self: {
        ];
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linebreak" = callPackage
@@ -149975,6 +159848,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Lines of Action, 2-player strategy board game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lingo" = callPackage
@@ -150040,6 +159915,8 @@ self: {
        ];
        description = "linkchk is a network interface link ping monitor";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linkcore" = callPackage
@@ -150056,6 +159933,8 @@ self: {
        ];
        description = "Combines multiple GHC Core modules into a single module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linked-list-with-iterator" = callPackage
@@ -150068,6 +159947,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A pure linked list which is mutable through iterators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linkedhashmap" = callPackage
@@ -150090,6 +159971,8 @@ self: {
        ];
        description = "Persistent LinkedHashMap data structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linklater" = callPackage
@@ -150112,6 +159995,8 @@ self: {
        ];
        description = "A Haskell library for the Slack API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linnet" = callPackage
@@ -150138,6 +160023,8 @@ self: {
        ];
        description = "Lightweight library for building HTTP API";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linnet-aeson" = callPackage
@@ -150155,6 +160042,8 @@ self: {
        ];
        description = "Aeson JSON support for Linnet";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linnet-conduit" = callPackage
@@ -150175,6 +160064,8 @@ self: {
        ];
        description = "Conduit-backed support for streaming in Linnet";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linode" = callPackage
@@ -150196,6 +160087,8 @@ self: {
        ];
        description = "Bindings to the Linode API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linode-v4" = callPackage
@@ -150212,6 +160105,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Haskell wrapper for the Linode v4 API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linux-blkid" = callPackage
@@ -150228,6 +160123,8 @@ self: {
        libraryPkgconfigDepends = [ blkid ];
        description = "Linux libblkid";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {blkid = null;};
 
   "linux-cgroup" = callPackage
@@ -150239,6 +160136,8 @@ self: {
        libraryHaskellDepends = [ base filepath ];
        description = "Very basic interface to the Linux CGroup Virtual Filesystem";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linux-evdev" = callPackage
@@ -150300,6 +160199,8 @@ self: {
        libraryPkgconfigDepends = [ libkmod ];
        description = "Linux kernel modules support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libkmod = null;};
 
   "linux-mount" = callPackage
@@ -150344,6 +160245,8 @@ self: {
        ];
        description = "Read files generated by perf on Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linux-ptrace" = callPackage
@@ -150361,6 +160264,8 @@ self: {
        ];
        description = "Wrapping of Linux' ptrace(2)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linux-xattr" = callPackage
@@ -150392,6 +160297,8 @@ self: {
        ];
        description = "Implementation of the Enea LINX gateway protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lio" = callPackage
@@ -150419,6 +160326,8 @@ self: {
        ];
        description = "Labeled IO library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lio-fs" = callPackage
@@ -150459,6 +160368,8 @@ self: {
        ];
        description = "LIO support for the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lipsum-gen" = callPackage
@@ -150470,6 +160381,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generators for random sequences of English-like nonsense text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquid" = callPackage
@@ -150494,6 +160407,8 @@ self: {
        benchmarkHaskellDepends = [ aeson attoparsec base criterion text ];
        description = "Liquid template language library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquid-base" = callPackage
@@ -150507,6 +160422,8 @@ self: {
        libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ];
        description = "Drop-in base replacement for LiquidHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquid-bytestring" = callPackage
@@ -150522,6 +160439,8 @@ self: {
        libraryHaskellDepends = [ bytestring liquid-base liquidhaskell ];
        description = "LiquidHaskell specs for the bytestring package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquid-containers" = callPackage
@@ -150537,6 +160456,8 @@ self: {
        libraryHaskellDepends = [ containers liquid-base liquidhaskell ];
        description = "LiquidHaskell specs for the containers package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquid-fixpoint" = callPackage
@@ -150584,6 +160505,8 @@ self: {
        libraryHaskellDepends = [ ghc-prim liquidhaskell ];
        description = "Drop-in ghc-prim replacement for LiquidHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquid-parallel" = callPackage
@@ -150598,6 +160521,8 @@ self: {
        libraryHaskellDepends = [ liquid-base liquidhaskell parallel ];
        description = "LiquidHaskell specs for the parallel package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquid-platform" = callPackage
@@ -150617,6 +160542,8 @@ self: {
        ];
        description = "A battery-included platform for LiquidHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquid-prelude" = callPackage
@@ -150633,6 +160560,8 @@ self: {
        ];
        description = "General utility modules for LiquidHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquid-vector" = callPackage
@@ -150646,6 +160575,8 @@ self: {
        libraryHaskellDepends = [ liquid-base liquidhaskell vector ];
        description = "LiquidHaskell specs for the vector package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquidhaskell" = callPackage
@@ -150699,6 +160630,8 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "Liquid Haskell integration for Cabal and Stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquidhaskell-cabal-demo" = callPackage
@@ -150773,6 +160706,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "testing list fusion for success";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-grouping" = callPackage
@@ -150795,6 +160730,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "List Multiplexing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-predicate" = callPackage
@@ -150827,6 +160764,8 @@ self: {
        ];
        description = "A simple list prompt UI for the terminal";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-remote-forwards" = callPackage
@@ -150853,6 +160792,8 @@ self: {
        ];
        description = "List all remote forwards for mail accounts stored in a SQL database";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-singleton" = callPackage
@@ -150898,6 +160839,8 @@ self: {
        ];
        description = "An \"attoparsec\" adapter for \"list-t\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-t-html-parser" = callPackage
@@ -150921,6 +160864,8 @@ self: {
        ];
        description = "Streaming HTML parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-t-http-client" = callPackage
@@ -150936,6 +160881,8 @@ self: {
        ];
        description = "A streaming HTTP client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-t-libcurl" = callPackage
@@ -150971,6 +160918,8 @@ self: {
        ];
        description = "A streaming text codec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-transformer" = callPackage
@@ -151036,6 +160985,8 @@ self: {
        ];
        description = "Witnesses for working with type-level lists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-zip-def" = callPackage
@@ -151047,6 +160998,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Provides zips with default values";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-zipper" = callPackage
@@ -151069,6 +161022,8 @@ self: {
        ];
        description = "A list zipper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "listenbrainz-client" = callPackage
@@ -151086,6 +161041,8 @@ self: {
        ];
        description = "A client library to the ListenBrainz project";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "listlike-instances" = callPackage
@@ -151097,6 +161054,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ListLike text vector ];
        description = "Extra instances of the ListLike class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lists" = callPackage
@@ -151165,6 +161124,8 @@ self: {
        ];
        description = "Append only key-list database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lit" = callPackage
@@ -151184,6 +161145,8 @@ self: {
        ];
        description = "A simple tool for literate programming";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "literals" = callPackage
@@ -151195,6 +161158,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Non-overloaded functions for concrete literals";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "little-logger" = callPackage
@@ -151214,6 +161179,8 @@ self: {
        ];
        description = "Basic logging based on co-log";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "little-rio" = callPackage
@@ -151257,6 +161224,8 @@ self: {
        ];
        description = "Live coding of MIDI music";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liveplot" = callPackage
@@ -151292,6 +161261,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ picosat ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) picosat;};
 
   "llrbtree" = callPackage
@@ -151323,6 +161294,8 @@ self: {
        ];
        description = "An implementation of the LLSD data system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm" = callPackage
@@ -151339,6 +161312,8 @@ self: {
        ];
        description = "Bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-analysis" = callPackage
@@ -151366,6 +161341,8 @@ self: {
        ];
        description = "A Haskell library for analyzing LLVM bitcode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-base" = callPackage
@@ -151377,6 +161354,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-base-types" = callPackage
@@ -151397,6 +161376,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "The base types for a mostly pure Haskell LLVM analysis library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-base-util" = callPackage
@@ -151408,6 +161389,8 @@ self: {
        libraryHaskellDepends = [ base llvm-base ];
        description = "Utilities for bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-data-interop" = callPackage
@@ -151428,6 +161411,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A low-level data interoperability binding for LLVM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-dsl" = callPackage
@@ -151445,6 +161430,8 @@ self: {
        ];
        description = "Support for writing an EDSL with LLVM-JIT as target";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-extension" = callPackage
@@ -151463,6 +161450,8 @@ self: {
        ];
        description = "Processor specific intrinsics for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-extra" = callPackage
@@ -151488,6 +161477,8 @@ self: {
        doHaddock = false;
        description = "Utility functions for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-ffi" = callPackage
@@ -151502,6 +161493,8 @@ self: {
        librarySystemDepends = [ LLVM ];
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {LLVM = null;};
 
   "llvm-ffi-tools" = callPackage
@@ -151519,6 +161512,8 @@ self: {
        ];
        description = "Tools for maintaining the llvm-ffi package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-general" = callPackage
@@ -151545,6 +161540,8 @@ self: {
        ];
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {llvm-config = null;};
 
   "llvm-general-pure" = callPackage
@@ -151565,6 +161562,8 @@ self: {
        ];
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-general-quote" = callPackage
@@ -151588,6 +161587,8 @@ self: {
        ];
        description = "QuasiQuoting llvm code for llvm-general";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-hs" = callPackage
@@ -151669,6 +161670,8 @@ self: {
        ];
        description = "Bindings to the LLVM compiler toolkit with some custom extensions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-pkg-config" = callPackage
@@ -151687,6 +161690,8 @@ self: {
        ];
        description = "Generate Pkg-Config configuration file for LLVM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-pretty" = callPackage
@@ -151703,6 +161708,8 @@ self: {
        ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-pretty-bc-parser" = callPackage
@@ -151729,6 +161736,8 @@ self: {
        ];
        description = "LLVM bitcode parsing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-tf" = callPackage
@@ -151750,6 +161759,8 @@ self: {
        doHaddock = false;
        description = "Bindings to the LLVM compiler toolkit using type families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-tools" = callPackage
@@ -151777,6 +161788,8 @@ self: {
        ];
        description = "Useful tools built on llvm-analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lmdb" = callPackage
@@ -151846,6 +161859,8 @@ self: {
        ];
        description = "LMonad is an Information Flow Control (IFC) framework for Haskell applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lmonad-yesod" = callPackage
@@ -151866,6 +161881,8 @@ self: {
        ];
        description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "load-balancing" = callPackage
@@ -151877,6 +161894,8 @@ self: {
        libraryHaskellDepends = [ base containers hslogger PSQueue stm ];
        description = "Client-side load balancing utilities";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "load-env" = callPackage
@@ -151909,6 +161928,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A cross platform library for loading bundled fonts into your application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loadavg" = callPackage
@@ -151954,6 +161975,8 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "Functions to get local interface address";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "local-search" = callPackage
@@ -151970,6 +161993,8 @@ self: {
        ];
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "localization" = callPackage
@@ -151999,6 +162024,8 @@ self: {
        ];
        description = "GNU Gettext-based messages localization library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "located" = callPackage
@@ -152010,6 +162037,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Source location helpers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "located-base" = callPackage
@@ -152034,6 +162063,8 @@ self: {
        libraryHaskellDepends = [ base monad-logger text ];
        description = "Location-aware logging without Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "locators" = callPackage
@@ -152066,6 +162097,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Support for precise error locations in source files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loch-th" = callPackage
@@ -152118,6 +162151,8 @@ self: {
        ];
        description = "Very simple poll lock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lockfree-queue" = callPackage
@@ -152175,6 +162210,8 @@ self: {
        ];
        description = "Structured logging solution with multiple backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "log-base" = callPackage
@@ -152296,6 +162333,8 @@ self: {
        ];
        description = "Structured logging solution (PostgreSQL back end)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "log-utils" = callPackage
@@ -152318,6 +162357,8 @@ self: {
        ];
        description = "Utils for working with logs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "log-warper" = callPackage
@@ -152353,6 +162394,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Flexible, configurable, monadic and pretty logging";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "log2json" = callPackage
@@ -152366,6 +162409,8 @@ self: {
        executableHaskellDepends = [ base containers json parsec ];
        description = "Turn log file records into JSON";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "log4hs" = callPackage
@@ -152396,6 +162441,8 @@ self: {
        ];
        description = "A python logging style log library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logentries" = callPackage
@@ -152415,6 +162462,8 @@ self: {
        ];
        description = "Request logger middleware for Logentries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logfloat" = callPackage
@@ -152443,6 +162492,8 @@ self: {
        ];
        description = "Fast & extensible logging framework";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logger-thread" = callPackage
@@ -152521,6 +162572,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Supplemental packages for `logging-effect`";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logging-effect-extra-file" = callPackage
@@ -152539,6 +162592,8 @@ self: {
        executableHaskellDepends = [ base logging-effect prettyprinter ];
        description = "TH splices to augment log messages with file info";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logging-effect-extra-handler" = callPackage
@@ -152557,6 +162612,8 @@ self: {
        executableHaskellDepends = [ base logging-effect prettyprinter ];
        description = "Handy logging handler combinators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logging-facade" = callPackage
@@ -152645,6 +162702,8 @@ self: {
        ];
        description = "Framework for propositional and first order logic, theorem proving";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logicst" = callPackage
@@ -152656,6 +162715,8 @@ self: {
        libraryHaskellDepends = [ base logict transformers ];
        description = "Backtracking mutable references in the ST and IO monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logict" = callPackage
@@ -152679,6 +162740,8 @@ self: {
        libraryHaskellDepends = [ base logict mtl transformers ];
        description = "Library for logic programming based on haskell package logict";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loglevel" = callPackage
@@ -152703,6 +162766,8 @@ self: {
        testHaskellDepends = [ base hspec time ];
        description = "Parse Heroku application/logplex documents";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logsink" = callPackage
@@ -152737,6 +162802,8 @@ self: {
        executableHaskellDepends = [ haskell98 ];
        description = "Useful utilities for the Lojban language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lojbanParser" = callPackage
@@ -152751,6 +162818,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "lojban parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lojbanXiragan" = callPackage
@@ -152765,6 +162834,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "lojban to xiragan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lojysamban" = callPackage
@@ -152778,6 +162849,8 @@ self: {
        executableHaskellDepends = [ base lojbanParser yjtools ];
        description = "Prolog with lojban";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol" = callPackage
@@ -152806,6 +162879,8 @@ self: {
        testHaskellDepends = [ base test-framework ];
        description = "A library for lattice cryptography";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-apps" = callPackage
@@ -152826,6 +162901,8 @@ self: {
        ];
        description = "Lattice-based cryptographic applications using <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-benches" = callPackage
@@ -152842,6 +162919,8 @@ self: {
        ];
        description = "A library for benchmarking <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-calculus" = callPackage
@@ -152863,6 +162942,8 @@ self: {
        ];
        description = "Calculus for LOL (λω language)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-cpp" = callPackage
@@ -152882,6 +162963,8 @@ self: {
        benchmarkHaskellDepends = [ base DRBG lol lol-apps MonadRandom ];
        description = "A fast C++ backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-repa" = callPackage
@@ -152901,6 +162984,8 @@ self: {
        benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
        description = "A repa backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-tests" = callPackage
@@ -152920,6 +163005,8 @@ self: {
        testHaskellDepends = [ base lol test-framework ];
        description = "A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-typing" = callPackage
@@ -152944,6 +163031,8 @@ self: {
        ];
        description = "Type inferencer for LOL (λω language)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loli" = callPackage
@@ -152961,6 +163050,8 @@ self: {
        ];
        description = "A minimum web dev DSL in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "long-double" = callPackage
@@ -152983,6 +163074,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dependently-typed linked list implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "longshot" = callPackage
@@ -153014,6 +163107,8 @@ self: {
        ];
        description = "Fast Brute-force search using parallelism";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lookup-tables" = callPackage
@@ -153028,6 +163123,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Statically generate lookup tables using Template Haskell";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loop" = callPackage
@@ -153055,6 +163152,8 @@ self: {
        libraryHaskellDepends = [ base effin ];
        description = "control-monad-loop port for effin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loop-while" = callPackage
@@ -153066,6 +163165,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformer supporting various styles of while loop";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loopbreaker" = callPackage
@@ -153083,6 +163184,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "inline self-recursive definitions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "looper" = callPackage
@@ -153100,6 +163203,8 @@ self: {
          aeson base hspec optparse-applicative text time unliftio
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loops" = callPackage
@@ -153117,6 +163222,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Fast imperative-style loops";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loopy" = callPackage
@@ -153135,6 +163242,8 @@ self: {
        ];
        description = "Find all biological feedback loops within an ecosystem graph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lord" = callPackage
@@ -153175,6 +163284,8 @@ self: {
        ];
        description = "A command line interface to online radios";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lorem" = callPackage
@@ -153189,6 +163300,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for generating filler text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lorentz" = callPackage
@@ -153211,6 +163324,8 @@ self: {
        ];
        description = "EDSL for the Michelson Language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loris" = callPackage
@@ -153224,6 +163339,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "interface to Loris API";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {loris = null;};
 
   "loshadka" = callPackage
@@ -153242,6 +163359,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "lostcities" = callPackage
@@ -153259,6 +163378,8 @@ self: {
        ];
        description = "An implementation of an adictive two-player card game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "louis" = callPackage
@@ -153292,6 +163413,8 @@ self: {
        executableHaskellDepends = [ base optparse-generic shakers ];
        description = "Amazon Simple Workflow Service Wrapper for Work Pools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lowgl" = callPackage
@@ -153303,6 +163426,8 @@ self: {
        libraryHaskellDepends = [ base gl linear vector ];
        description = "Basic gl wrapper and reference";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lowlin" = callPackage
@@ -153352,6 +163477,8 @@ self: {
        ];
        description = "SVG Backend for lp-diagrams";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lrucache" = callPackage
@@ -153412,6 +163539,8 @@ self: {
        ];
        description = "List USB devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lscabal" = callPackage
@@ -153429,6 +163558,8 @@ self: {
        ];
        description = "List exported modules from a set of .cabal files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lsp" = callPackage
@@ -153574,6 +163705,8 @@ self: {
        ];
        description = "Paint an L-System Grammar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ltext" = callPackage
@@ -153621,6 +163754,8 @@ self: {
        ];
        description = "Core functionality for LTI 1.3.";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ltiv1p1" = callPackage
@@ -153660,6 +163795,8 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Leksah tool kit";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "ltl" = callPackage
@@ -153689,6 +163826,8 @@ self: {
        ];
        description = "Lua bytecode parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lua-bytecode" = callPackage
@@ -153721,6 +163860,8 @@ self: {
        ];
        description = "Library functions for reading and writing Lua chunks";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "luautils" = callPackage
@@ -153742,6 +163883,8 @@ self: {
        ];
        description = "Helpers for Haskell integration with Lua";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lub" = callPackage
@@ -153800,6 +163943,8 @@ self: {
        libraryHaskellDepends = [ base colonnade lucid text ];
        description = "Helper functions for using lucid with colonnade";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lucid-extras" = callPackage
@@ -153866,6 +164011,8 @@ self: {
        ];
        description = "Server side feed aggregator/reader";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "luhn" = callPackage
@@ -153877,6 +164024,8 @@ self: {
        libraryHaskellDepends = [ base digits QuickCheck ];
        description = "An implementation of Luhn's check digit algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lui" = callPackage
@@ -153892,6 +164041,8 @@ self: {
        ];
        description = "Purely FunctionaL User Interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "luis-client" = callPackage
@@ -153906,6 +164057,8 @@ self: {
        ];
        description = "An unofficial client for the LUIS NLP service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "luka" = callPackage
@@ -153919,6 +164072,8 @@ self: {
        librarySystemDepends = [ objc ];
        description = "Simple ObjectiveC runtime binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {objc = null;};
 
   "lukko" = callPackage
@@ -153973,6 +164128,8 @@ self: {
        ];
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "luminance-samples" = callPackage
@@ -153991,6 +164148,8 @@ self: {
        ];
        description = "Luminance samples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lushtags" = callPackage
@@ -154004,6 +164163,8 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts text vector ];
        description = "Create ctags compatible tags files for Haskell programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "luthor" = callPackage
@@ -154016,6 +164177,8 @@ self: {
        testHaskellDepends = [ base mtl parsec ];
        description = "Tools for lexing and utilizing lexemes that integrate with Parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lvish" = callPackage
@@ -154043,6 +164206,8 @@ self: {
        ];
        description = "Parallel scheduler, LVar data structures, and infrastructure to build more";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lvmlib" = callPackage
@@ -154065,6 +164230,8 @@ self: {
        ];
        description = "The Lazy Virtual Machine (LVM)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lvmrun" = callPackage
@@ -154088,6 +164255,8 @@ self: {
        libraryHaskellDepends = [ base bindings-lxc mtl transformers ];
        description = "High level Haskell bindings to LXC (Linux containers)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lxd-client" = callPackage
@@ -154117,6 +164286,8 @@ self: {
        ];
        description = "LXD client written in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lxd-client-config" = callPackage
@@ -154154,6 +164325,8 @@ self: {
        ];
        description = "A Lilypond-compiling music box";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lz4" = callPackage
@@ -154187,6 +164360,8 @@ self: {
        ];
        description = "Bindings to LZ4";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lz4-conduit" = callPackage
@@ -154210,6 +164385,8 @@ self: {
        ];
        description = "LZ4 compression for conduits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lz4-frame-conduit" = callPackage
@@ -154238,6 +164415,8 @@ self: {
        ];
        description = "Conduit implementing the official LZ4 frame streaming format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lz4-hs" = callPackage
@@ -154267,6 +164446,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Lzip compression / Lzlib bindings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lzlib" = callPackage
@@ -154359,6 +164540,8 @@ self: {
        ];
        description = "Enumerator interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) lzma;};
 
   "lzma-streams" = callPackage
@@ -154379,6 +164562,8 @@ self: {
        ];
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lzo" = callPackage
@@ -154394,6 +164579,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "minilzo bundled for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mDNSResponder-client" = callPackage
@@ -154410,6 +164597,8 @@ self: {
        testHaskellDepends = [ base bytestring Cabal ];
        description = "Library for talking to the mDNSResponder daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maam" = callPackage
@@ -154426,6 +164615,8 @@ self: {
        ];
        description = "Monadic Abstracting Abstract Machines (MAAM) built on Galois Transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mac" = callPackage
@@ -154437,6 +164628,8 @@ self: {
        libraryHaskellDepends = [ base network transformers ];
        description = "Static Mandatory Access Control in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "macaroon-shop" = callPackage
@@ -154457,6 +164650,8 @@ self: {
        ];
        description = "A toolkit for working with macaroons";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "macbeth-lib" = callPackage
@@ -154482,6 +164677,8 @@ self: {
        testHaskellDepends = [ attoparsec base bytestring hspec ];
        description = "Macbeth - A beautiful and minimalistic FICS client";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maccatcher" = callPackage
@@ -154525,6 +164722,8 @@ self: {
        ];
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines" = callPackage
@@ -154570,6 +164769,8 @@ self: {
        ];
        description = "Machine transducers for Amazonka calls";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-attoparsec" = callPackage
@@ -154590,6 +164791,8 @@ self: {
        ];
        description = "Parse machines streams with attoparsec parsers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-binary" = callPackage
@@ -154601,6 +164804,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring machines ];
        description = "Binary utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-bytestring" = callPackage
@@ -154612,6 +164817,8 @@ self: {
        libraryHaskellDepends = [ base bytestring machines ];
        description = "ByteString support for machines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-directory" = callPackage
@@ -154627,6 +164834,8 @@ self: {
        ];
        description = "Directory (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-encoding" = callPackage
@@ -154638,6 +164847,8 @@ self: {
        libraryHaskellDepends = [ base bytestring machines text ];
        description = "Transcode encodings with machines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-io" = callPackage
@@ -154653,6 +164864,8 @@ self: {
        ];
        description = "IO utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-process" = callPackage
@@ -154667,6 +164880,8 @@ self: {
        ];
        description = "Process (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-zlib" = callPackage
@@ -154681,6 +164896,8 @@ self: {
        ];
        description = "Decompression support for machines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "macho" = callPackage
@@ -154693,6 +164910,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for Mach-O object format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mackerel-client" = callPackage
@@ -154740,6 +164959,8 @@ self: {
        ];
        description = "Control screen and keyboard backlights on MACs under Linux";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "macos-corelibs" = callPackage
@@ -154755,6 +164976,8 @@ self: {
        ];
        description = "Haskell bindings to C-based Mac OS SDK frameworks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "macosx-make-standalone" = callPackage
@@ -154774,6 +164997,8 @@ self: {
        ];
        description = "Make a macosx app standalone deployable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "macrm" = callPackage
@@ -154798,6 +165023,8 @@ self: {
        ];
        description = "Alternative rm command for macOS that remove files/dirs to the system trash";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mad-props" = callPackage
@@ -154850,6 +165077,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion megaparsec text ];
        description = "Randomized templating language DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mage" = callPackage
@@ -154865,6 +165094,8 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Rogue-like";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "magic" = callPackage
@@ -154888,6 +165119,8 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-tcplugins-extra syb ];
        description = "Write plugins for magic type families with ease";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "magic-wormhole" = callPackage
@@ -154918,6 +165151,8 @@ self: {
        ];
        description = "Interact with Magic Wormhole";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "magicbane" = callPackage
@@ -154948,6 +165183,8 @@ self: {
        ];
        description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "magico" = callPackage
@@ -154965,6 +165202,8 @@ self: {
        ];
        description = "Compute solutions for Magico puzzle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "magma" = callPackage
@@ -154978,6 +165217,8 @@ self: {
        testHaskellDepends = [ base ghc-prim ];
        description = "magma is an algebraic structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "magmas" = callPackage
@@ -155009,6 +165250,8 @@ self: {
        ];
        description = "ImageBoards to XMPP gate";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maid" = callPackage
@@ -155030,6 +165273,8 @@ self: {
        ];
        description = "A simple static web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mail-pool" = callPackage
@@ -155052,6 +165297,8 @@ self: {
        ];
        description = "Preconfigured email connection pool on top of smtp";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mailbox-count" = callPackage
@@ -155094,6 +165341,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Bindings for the MailChimp API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mailchimp-subscribe" = callPackage
@@ -155112,6 +165361,8 @@ self: {
        ];
        description = "MailChimp subscription request handler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mailgun" = callPackage
@@ -155131,6 +165382,8 @@ self: {
        ];
        description = "API binding for Mailgun";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "main-tester" = callPackage
@@ -155180,6 +165433,8 @@ self: {
        ];
        description = "Majordomo protocol for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "majority" = callPackage
@@ -155191,6 +165446,8 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "Boyer-Moore Majority Vote Algorithm";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "make-hard-links" = callPackage
@@ -155208,6 +165465,8 @@ self: {
        ];
        description = "Change duplicated files into hard-links";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "make-monofoldable-foldable" = callPackage
@@ -155219,6 +165478,8 @@ self: {
        libraryHaskellDepends = [ base mono-traversable ];
        description = "Make a MonoFoldable type into an ordinary Foldable type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "make-package" = callPackage
@@ -155239,6 +165500,8 @@ self: {
        ];
        description = "Make a cabalized package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "makedo" = callPackage
@@ -155250,6 +165513,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath HSH process ];
        description = "Helper for writing redo scripts in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "makefile" = callPackage
@@ -155267,6 +165532,8 @@ self: {
        ];
        description = "Simple Makefile parser and generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mallard" = callPackage
@@ -155294,6 +165561,8 @@ self: {
        ];
        description = "Database migration and testing as a library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mameya" = callPackage
@@ -155340,6 +165609,8 @@ self: {
        ];
        description = "The Haskell/Gtk+ Integrated Live Environment";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-all" = callPackage
@@ -155386,6 +165657,8 @@ self: {
        ];
        description = "Multithread interactive input/search framework for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-browser" = callPackage
@@ -155429,6 +165702,8 @@ self: {
        ];
        description = "The core of Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-curl" = callPackage
@@ -155451,6 +165726,8 @@ self: {
        ];
        description = "Download Manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-editor" = callPackage
@@ -155471,6 +165748,8 @@ self: {
        ];
        description = "Editor extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-filemanager" = callPackage
@@ -155491,6 +165770,8 @@ self: {
        ];
        description = "File manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-imageviewer" = callPackage
@@ -155511,6 +165792,8 @@ self: {
        ];
        description = "Image viewer extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-ircclient" = callPackage
@@ -155535,6 +165818,8 @@ self: {
        ];
        description = "IRC client extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-mplayer" = callPackage
@@ -155556,6 +165841,8 @@ self: {
        ];
        description = "Mplayer client extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-pdfviewer" = callPackage
@@ -155576,6 +165863,8 @@ self: {
        ];
        description = "PDF viewer extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-processmanager" = callPackage
@@ -155595,6 +165884,8 @@ self: {
        ];
        description = "Process manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-reader" = callPackage
@@ -155635,6 +165926,8 @@ self: {
        ];
        description = "Template code to create Manatee application";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-terminal" = callPackage
@@ -155654,6 +165947,8 @@ self: {
        ];
        description = "Terminal Emulator extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-welcome" = callPackage
@@ -155673,6 +165968,8 @@ self: {
        ];
        description = "Welcome module to help user play Manatee quickly";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mancala" = callPackage
@@ -155710,6 +166007,8 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mandulia" = callPackage
@@ -155728,6 +166027,8 @@ self: {
        ];
        description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mangopay" = callPackage
@@ -155766,6 +166067,8 @@ self: {
        ];
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manifold-random" = callPackage
@@ -155782,6 +166085,8 @@ self: {
        ];
        description = "Sampling random points on general manifolds";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manifolds" = callPackage
@@ -155811,6 +166116,8 @@ self: {
        ];
        description = "Coordinate-free hypersurfaces";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manifolds-core" = callPackage
@@ -155852,6 +166159,8 @@ self: {
        executableHaskellDepends = [ base bytestring cassava containers ];
        description = "Extensions to Data.Map";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "map-reduce-folds" = callPackage
@@ -155917,6 +166226,8 @@ self: {
        ];
        description = "Efficient, polymorphic Map Algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mappy" = callPackage
@@ -155939,6 +166250,8 @@ self: {
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
        description = "A functional programming language focused around maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mapquest-api" = callPackage
@@ -155998,6 +166311,8 @@ self: {
        ];
        description = "A study of marionetta movements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markdown" = callPackage
@@ -156043,6 +166358,8 @@ self: {
        ];
        description = "Convert Markdown to HTML, with XSS protection";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markdown-pap" = callPackage
@@ -156054,6 +166371,8 @@ self: {
        libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markdown-unlit" = callPackage
@@ -156092,6 +166411,8 @@ self: {
        ];
        description = "markdown to svg converter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "marked-pretty" = callPackage
@@ -156104,6 +166425,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Pretty-printing library, with scoping, based on pretty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markov" = callPackage
@@ -156159,6 +166482,8 @@ self: {
        testHaskellDepends = [ assertions base bifunctors memoize random ];
        description = "Hidden Markov processes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markov-realization" = callPackage
@@ -156171,6 +166496,8 @@ self: {
        testHaskellDepends = [ base HTF MonadRandom ];
        description = "Realizations of Markov chains";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markup" = callPackage
@@ -156189,6 +166516,8 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markup-preview" = callPackage
@@ -156237,6 +166566,8 @@ self: {
        ];
        description = "Upload packages to Marmalade";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "marquise" = callPackage
@@ -156271,6 +166602,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Client library for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mars" = callPackage
@@ -156286,6 +166619,8 @@ self: {
        ];
        description = "Generates mountainous terrain using a random walk algorithm";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "marshal-contt" = callPackage
@@ -156335,6 +166670,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A framework for modular, portable chat bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "marvin-interpolate" = callPackage
@@ -156351,6 +166688,8 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "Compile time string interpolation a la Scala and CoffeeScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "marxup" = callPackage
@@ -156396,6 +166735,8 @@ self: {
        ];
        description = "@minamiyama1994_bot on haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mason" = callPackage
@@ -156521,6 +166862,8 @@ self: {
        ];
        description = "The project management tool for hackers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mastermind" = callPackage
@@ -156595,6 +166938,8 @@ self: {
        librarySystemDepends = [ pcre ];
        description = "Text matchers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) pcre;};
 
   "math-extras" = callPackage
@@ -156647,6 +166992,8 @@ self: {
        testHaskellDepends = [ array base containers hspec random ];
        description = "Library containing graph data structures and graph algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "math-interpolate" = callPackage
@@ -156658,6 +167005,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Class for interpolation of values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "math-metric" = callPackage
@@ -156669,6 +167018,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Typeclass for metric spaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "math-programming" = callPackage
@@ -156709,6 +167060,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A GLPK backend to the math-programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) glpk;};
 
   "math-programming-tests" = callPackage
@@ -156724,6 +167077,8 @@ self: {
        ];
        description = "Utility functions for testing implementations of the math-programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mathblog" = callPackage
@@ -156750,6 +167105,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "mathexpr" = callPackage
@@ -156780,6 +167137,8 @@ self: {
        ];
        description = "Dependently typed tensorflow modeler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mathgenealogy" = callPackage
@@ -156838,6 +167197,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Write Mathematica packages in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "matlab" = callPackage
@@ -156936,6 +167297,8 @@ self: {
        ];
        description = "Read and Display Jones-Faithful notation for spacegroup and planegroup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "matrix-lens" = callPackage
@@ -156965,6 +167328,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Read and write NIST Matrix Market files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "matrix-market-attoparsec" = callPackage
@@ -157016,6 +167381,8 @@ self: {
        ];
        description = "Haskell matrix library with interface to C++ linear algebra libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "matrix-static" = callPackage
@@ -157054,6 +167421,8 @@ self: {
        ];
        description = "ncurses XMPP client";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "matterhorn" = callPackage
@@ -157154,6 +167523,8 @@ self: {
        ];
        description = "An interface to the Maude rewriting system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maxent" = callPackage
@@ -157175,6 +167546,8 @@ self: {
        ];
        description = "Compute Maximum Entropy Distributions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maxent-learner-hw" = callPackage
@@ -157198,6 +167571,8 @@ self: {
        ];
        description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maxent-learner-hw-gui" = callPackage
@@ -157219,6 +167594,8 @@ self: {
        ];
        description = "GUI for maxent-learner-hw";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maximal-cliques" = callPackage
@@ -157251,6 +167628,8 @@ self: {
        ];
        description = "Maximal sharing of terms in the lambda calculus with letrec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maybe-justify" = callPackage
@@ -157281,6 +167660,8 @@ self: {
        ];
        description = "Automated benchmarking tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mbox" = callPackage
@@ -157312,6 +167693,8 @@ self: {
        ];
        description = "A collection of tools to process mbox files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mbox-utility" = callPackage
@@ -157373,6 +167756,8 @@ self: {
        ];
        description = "download bugs mailboxes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mcl" = callPackage
@@ -157399,6 +167784,8 @@ self: {
        ];
        description = "Bindings to mcl, a generic and fast pairing-based cryptography library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gmpxx; mcl = null; inherit (pkgs) openssl;};
 
   "mcm" = callPackage
@@ -157418,6 +167805,8 @@ self: {
        ];
        description = "Machine Configuration Manager";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mcmaster-gloss-examples" = callPackage
@@ -157430,6 +167819,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base gloss ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mcmc" = callPackage
@@ -157473,6 +167864,8 @@ self: {
        ];
        description = "Combinators for MCMC sampling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mcmc-synthesis" = callPackage
@@ -157484,6 +167877,8 @@ self: {
        libraryHaskellDepends = [ base MonadRandom ];
        description = "MCMC applied to probabilistic program synthesis";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mcmc-types" = callPackage
@@ -157511,6 +167906,8 @@ self: {
        executableHaskellDepends = [ base transformers ];
        description = "Connect to MineCraft running on a Raspberry PI";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mdapi" = callPackage
@@ -157529,6 +167926,8 @@ self: {
        ];
        description = "Haskell interface to Fedora's mdapi";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mdcat" = callPackage
@@ -157548,6 +167947,8 @@ self: {
        ];
        description = "Markdown viewer in your terminal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mdo" = callPackage
@@ -157577,6 +167978,8 @@ self: {
        testHaskellDepends = [ base HTF HUnit QuickCheck vector ];
        description = "Tools for solving Markov Decision Processes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mealstrom" = callPackage
@@ -157598,6 +168001,8 @@ self: {
        ];
        description = "Manipulate FSMs and store them in PostgreSQL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mealy" = callPackage
@@ -157618,6 +168023,8 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "means" = callPackage
@@ -157641,6 +168048,8 @@ self: {
        librarySystemDepends = [ mecab ];
        description = "A Haskell binding to MeCab";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mecab;};
 
   "mech" = callPackage
@@ -157652,6 +168061,8 @@ self: {
        libraryHaskellDepends = [ base machines ];
        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;
+       broken = true;
      }) {};
 
   "mecha" = callPackage
@@ -157676,6 +168087,8 @@ self: {
        libraryHaskellDepends = [ base machines ];
        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;
+       broken = true;
      }) {};
 
   "med-module" = callPackage
@@ -157750,6 +168163,8 @@ self: {
        ];
        description = "Multimedia streaming on top of Conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mediabus-fdk-aac" = callPackage
@@ -157777,6 +168192,8 @@ self: {
        ];
        description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {fdk-aac = null;};
 
   "mediabus-rtp" = callPackage
@@ -157814,6 +168231,8 @@ self: {
        ];
        description = "Receive and Send RTP Packets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "median-stream" = callPackage
@@ -157844,6 +168263,8 @@ self: {
        ];
        description = "Interfacing with the MediaWiki API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mediawiki2latex" = callPackage
@@ -157887,6 +168308,8 @@ self: {
        ];
        description = "Haskell SDK for communicating with the Medium API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "meep" = callPackage
@@ -157925,6 +168348,8 @@ self: {
        ];
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "megalisp" = callPackage
@@ -157936,6 +168361,8 @@ self: {
        libraryHaskellDepends = [ base megaparsec mtl text ];
        description = "lisp parser using mega-parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "megaparsec" = callPackage
@@ -158013,6 +168440,8 @@ self: {
        ];
        description = "Control physical access devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mellon-gpio" = callPackage
@@ -158024,6 +168453,8 @@ self: {
        libraryHaskellDepends = [ base hpio mellon-core protolude ];
        description = "GPIO support for mellon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mellon-web" = callPackage
@@ -158065,6 +168496,8 @@ self: {
        ];
        description = "A REST web service for Mellon controllers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "melody" = callPackage
@@ -158086,6 +168519,8 @@ self: {
        ];
        description = "A functional scripting language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "membership" = callPackage
@@ -158139,6 +168574,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A memcached client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memcache-conduit" = callPackage
@@ -158158,6 +168595,8 @@ self: {
        ];
        description = "Conduit library for memcache procotol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memcache-haskell" = callPackage
@@ -158180,6 +168619,8 @@ self: {
        ];
        description = "Memcache procotol library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memcached" = callPackage
@@ -158214,6 +168655,8 @@ self: {
        ];
        description = "memcached client using binary protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memdb" = callPackage
@@ -158279,6 +168722,8 @@ self: {
        ];
        description = "Memis Efficient Manual Image Sorting";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memo-ptr" = callPackage
@@ -158290,6 +168735,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Pointer equality memoization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memo-sqlite" = callPackage
@@ -158317,6 +168764,8 @@ self: {
        testHaskellDepends = [ base hspec time time-units ];
        description = "Utilities for memoizing functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memoize" = callPackage
@@ -158390,6 +168839,8 @@ self: {
        ];
        description = "basic memory pool outside of haskell heap/GC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memscript" = callPackage
@@ -158431,6 +168882,8 @@ self: {
        ];
        description = "Haskell binding for Menoh DNN inference library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {menoh = null;};
 
   "menshen" = callPackage
@@ -158449,6 +168902,8 @@ self: {
        ];
        description = "Data Validation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mercury-api" = callPackage
@@ -158626,6 +169081,8 @@ self: {
        ];
        description = "A modified Merkle Patricia DB";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "merkle-tree" = callPackage
@@ -158645,6 +169102,8 @@ self: {
        ];
        description = "An implementation of a Merkle tree and merkle tree proofs of inclusion";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mersenne-random" = callPackage
@@ -158708,6 +169167,8 @@ self: {
        ];
        description = "Message Pack RPC over TCP";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "messente" = callPackage
@@ -158721,6 +169182,8 @@ self: {
        ];
        description = "Messente SMS Gateway";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "meta-misc" = callPackage
@@ -158732,6 +169195,8 @@ self: {
        libraryHaskellDepends = [ base loch-th template-haskell ];
        description = "Utility library providing miscellaneous meta-programming utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "meta-par" = callPackage
@@ -158748,6 +169213,8 @@ self: {
        ];
        description = "Provides the monad-par interface, but based on modular scheduler \"mix-ins\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "meta-par-accelerate" = callPackage
@@ -158765,6 +169232,8 @@ self: {
        ];
        description = "Support for integrated Accelerate computations within Meta-par";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metadata" = callPackage
@@ -158776,6 +169245,8 @@ self: {
        libraryHaskellDepends = [ base text time ];
        description = "metadata library for semantic web";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metaheuristics" = callPackage
@@ -158787,6 +169258,8 @@ self: {
        libraryHaskellDepends = [ arrows base random Stream ];
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metamorphic" = callPackage
@@ -158810,6 +169283,8 @@ self: {
        libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ];
        description = "a tiny ghc api wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metar" = callPackage
@@ -158835,6 +169310,8 @@ self: {
        ];
        description = "Australian METAR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metar-http" = callPackage
@@ -158859,6 +169336,8 @@ self: {
        ];
        description = "HTTP for METAR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metric" = callPackage
@@ -158877,6 +169356,8 @@ self: {
        ];
        description = "Metric spaces";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metrics" = callPackage
@@ -158910,6 +169391,8 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "Client for the metrics aggregator Metricsd";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metro" = callPackage
@@ -159011,6 +169494,8 @@ self: {
        ];
        description = "Time Synchronized execution";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mezzo" = callPackage
@@ -159031,6 +169516,8 @@ self: {
        ];
        description = "Typesafe music composition";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mezzolens" = callPackage
@@ -159042,6 +169529,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Pure Profunctor Functional Lenses";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mfsolve" = callPackage
@@ -159071,6 +169560,8 @@ self: {
        ];
        description = "Generics with multiple parameters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mi" = callPackage
@@ -159086,6 +169577,8 @@ self: {
        ];
        description = "Multiple Instance for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miconix-test" = callPackage
@@ -159101,6 +169594,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "micro-gateway" = callPackage
@@ -159146,6 +169641,8 @@ self: {
        testHaskellDepends = [ base HUnit template-haskell ];
        description = "Simple recursion schemes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microaeson" = callPackage
@@ -159243,6 +169740,8 @@ self: {
        ];
        description = "A Microformats 2 parser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microformats2-types" = callPackage
@@ -159258,6 +169757,8 @@ self: {
        ];
        description = "Microformats 2 types (with Aeson instances)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microgroove" = callPackage
@@ -159269,6 +169770,8 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "Array-backed extensible records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microlens" = callPackage
@@ -159335,6 +169838,8 @@ self: {
        libraryHaskellDepends = [ base microlens ];
        description = "'each' for microlens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microlens-ghc" = callPackage
@@ -159483,6 +169988,8 @@ self: {
        testHaskellDepends = [ aeson base hspec text ];
        description = "A super simple logging module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microsoft-translator" = callPackage
@@ -159500,6 +170007,8 @@ self: {
        ];
        description = "Bindings to the Microsoft Translator API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microspec" = callPackage
@@ -159575,6 +170084,8 @@ self: {
        ];
        description = "Language for algorithmic generation of MIDI files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "midair" = callPackage
@@ -159641,6 +170152,8 @@ self: {
        ];
        description = "Convert MIDI file to music box punch tape";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "midi-simple" = callPackage
@@ -159692,6 +170205,8 @@ self: {
        ];
        description = "Utilities for working with MIDI data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "midimory" = callPackage
@@ -159711,6 +170226,8 @@ self: {
        ];
        description = "A Memory-like (Concentration, Pairs, ...) game for tones";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "midisurface" = callPackage
@@ -159728,6 +170245,8 @@ self: {
        ];
        description = "A control midi surface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mighttpd" = callPackage
@@ -159748,6 +170267,8 @@ self: {
        ];
        description = "Simple Web Server in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mighttpd2" = callPackage
@@ -159813,6 +170334,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "MikMod bindings";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mikrokosmos" = callPackage
@@ -159838,6 +170361,8 @@ self: {
        ];
        description = "Lambda calculus interpreter";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miku" = callPackage
@@ -159854,6 +170379,8 @@ self: {
        ];
        description = "A minimum web dev DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "milena" = callPackage
@@ -159877,6 +170404,8 @@ self: {
        ];
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mime" = callPackage
@@ -159905,6 +170434,8 @@ self: {
        ];
        description = "A library for parsing/printing the text/directory mime type";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mime-mail" = callPackage
@@ -160025,6 +170556,8 @@ self: {
        ];
        description = "a DSL for generating minecraft commands and levels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mines" = callPackage
@@ -160059,6 +170592,8 @@ self: {
        ];
        description = "Minesweeper game which is always solvable without guessing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mini-egison" = callPackage
@@ -160080,6 +170615,8 @@ self: {
        testHaskellDepends = [ base hspec primes ];
        description = "Template Haskell Implementation of Egison Pattern Matching";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miniball" = callPackage
@@ -160112,6 +170649,8 @@ self: {
        ];
        description = "Miniature FORTH-like interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minilens" = callPackage
@@ -160127,6 +170666,8 @@ self: {
        ];
        description = "A minimalistic lens library, providing only the simplest, most basic lens functionality";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minilight" = callPackage
@@ -160158,6 +170699,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A SDL2-based graphics library, batteries-included";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minilight-lua" = callPackage
@@ -160178,6 +170721,8 @@ self: {
        executableHaskellDepends = [ base lens minilight mtl ];
        description = "A binding library of minilight for Lua langauge";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minimal-configuration" = callPackage
@@ -160219,6 +170764,8 @@ self: {
        executableHaskellDepends = [ base GLUT haskell98 unix ];
        description = "Shows how to run grabber on Mac OS X";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minio-hs" = callPackage
@@ -160271,6 +170818,8 @@ self: {
        ];
        description = "A fast parallel ssh tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minioperational" = callPackage
@@ -160287,6 +170836,8 @@ self: {
        ];
        description = "fast and simple operational monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miniplex" = callPackage
@@ -160303,6 +170854,8 @@ self: {
        ];
        description = "simple 1-to-N interprocess communication";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minirotate" = callPackage
@@ -160322,6 +170875,8 @@ self: {
        ];
        description = "Minimalistic file rotation utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minisat" = callPackage
@@ -160363,6 +170918,8 @@ self: {
        ];
        description = "an interpreter for an operational semantics for the STG machine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minitypeset-opengl" = callPackage
@@ -160414,6 +170971,8 @@ self: {
        ];
        description = "A set of helpers to call minizinc models";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minlen" = callPackage
@@ -160441,6 +171000,8 @@ self: {
        testHaskellDepends = [ base binary directory hspec vector ];
        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;
+       broken = true;
      }) {};
 
   "mintty" = callPackage
@@ -160475,6 +171036,8 @@ self: {
        ];
        description = "A Minisat-based CDCL SAT solver in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mirror-tweet" = callPackage
@@ -160493,6 +171056,8 @@ self: {
        ];
        description = "Tweet mirror";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "misfortune" = callPackage
@@ -160638,6 +171203,8 @@ self: {
        ];
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miso-action-logger" = callPackage
@@ -160649,6 +171216,8 @@ self: {
        libraryHaskellDepends = [ aeson base ghcjs-base miso ];
        description = "Miso state transition logger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miso-examples" = callPackage
@@ -160661,6 +171230,8 @@ self: {
        isExecutable = true;
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miso-from-html" = callPackage
@@ -160708,6 +171279,8 @@ self: {
        ];
        description = "A Haskell git implimentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miss-porcelain" = callPackage
@@ -160726,6 +171299,8 @@ self: {
        ];
        description = "Useability extras built on top of miss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "missing-foreign" = callPackage
@@ -160751,6 +171326,8 @@ self: {
        ];
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miv" = callPackage
@@ -160787,6 +171364,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mixing effects of one arrow into another one";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mixed-strategies" = callPackage
@@ -160803,6 +171382,8 @@ self: {
        ];
        description = "Find optimal mixed strategies for two-player games";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mixed-types-num" = callPackage
@@ -160843,6 +171424,8 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Mixpanel client";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mkbndl" = callPackage
@@ -160857,6 +171440,8 @@ self: {
        executableHaskellDepends = [ base directory filepath haskell98 ];
        description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mkcabal" = callPackage
@@ -160875,6 +171460,8 @@ self: {
        ];
        description = "Generate cabal files for a Haskell project";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ml-w" = callPackage
@@ -160889,6 +171476,8 @@ self: {
        executableHaskellDepends = [ base mtl parsec pretty ];
        description = "Minimal ML language to to demonstrate the W type infererence algorithm";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mlist" = callPackage
@@ -160900,6 +171489,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "Monadic List alternative to lazy I/O";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mltool" = callPackage
@@ -160934,6 +171525,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mmap" = callPackage
@@ -161131,6 +171724,8 @@ self: {
        ];
        description = "Produces a sound recording specified by the Ukrainian text";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mmsyn7l" = callPackage
@@ -161206,6 +171801,8 @@ self: {
        ];
        description = "Macromolecular Transmission Format implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mmtl" = callPackage
@@ -161217,6 +171814,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modular Monad transformer library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mmtl-base" = callPackage
@@ -161230,6 +171829,8 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "MonadBase type-class for mmtl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mnist-idx" = callPackage
@@ -161259,6 +171860,8 @@ self: {
        ];
        description = "Language-agnostic analyzer for positional morphosyntactic tags";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mock-httpd" = callPackage
@@ -161384,6 +171987,8 @@ self: {
        ];
        description = "A parser for the modelica language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modern-uri" = callPackage
@@ -161433,6 +172038,8 @@ self: {
        ];
        description = "Modify fasta (and CLIP) files in several optional ways";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modsplit" = callPackage
@@ -161453,6 +172060,8 @@ self: {
        ];
        description = "Haskell source splitter driven by special comments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modular" = callPackage
@@ -161493,6 +172102,8 @@ self: {
        ];
        description = "A new Prelude featuring first class modules";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modular-prelude-classy" = callPackage
@@ -161504,6 +172115,8 @@ self: {
        libraryHaskellDepends = [ base classy-prelude modular-prelude ];
        description = "Reifying ClassyPrelude a la ModularPrelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modularity" = callPackage
@@ -161519,6 +172132,8 @@ self: {
        ];
        description = "Find the modularity of a network";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "module-management" = callPackage
@@ -161549,6 +172164,8 @@ self: {
        ];
        description = "Clean up module imports, split and merge modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modulespection" = callPackage
@@ -161565,6 +172182,8 @@ self: {
        ];
        description = "Template Haskell for introspecting a module's declarations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modulo" = callPackage
@@ -161584,6 +172203,8 @@ self: {
        ];
        description = "Modular C code generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "moe" = callPackage
@@ -161599,6 +172220,8 @@ self: {
        ];
        description = "html with style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "moesocks" = callPackage
@@ -161621,6 +172244,8 @@ self: {
        ];
        description = "A functional firewall killer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mohws" = callPackage
@@ -161643,6 +172268,8 @@ self: {
        ];
        description = "Modular Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mole" = callPackage
@@ -161673,6 +172300,8 @@ self: {
        ];
        description = "A glorified string replacement tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mollie-api-haskell" = callPackage
@@ -161698,6 +172327,8 @@ self: {
        ];
        description = "Mollie API client for Haskell http://www.mollie.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-abort-fd" = callPackage
@@ -161725,6 +172356,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically convert object to unique integers and back";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-atom-simple" = callPackage
@@ -161736,6 +172369,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically map objects to unique ints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-batcher" = callPackage
@@ -161779,6 +172414,8 @@ self: {
        ];
        description = "A library for probabilistic programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-bool" = callPackage
@@ -161802,6 +172439,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Monadic abstraction for computations that can be branched and run independently";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-choice" = callPackage
@@ -161992,6 +172631,8 @@ self: {
        ];
        description = "Exstensible monadic exceptions";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-extras" = callPackage
@@ -162034,6 +172675,8 @@ self: {
        libraryHaskellDepends = [ base monad-control ];
        description = "Type class for monads which support a fork operation";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-gen" = callPackage
@@ -162082,6 +172725,8 @@ self: {
        ];
        description = "A class of monads which can do http requests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-interleave" = callPackage
@@ -162093,6 +172738,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monads with an unsaveInterleaveIO-like operation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-introspect" = callPackage
@@ -162154,6 +172801,8 @@ self: {
        ];
        description = "Specific levels of monad transformers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-lgbt" = callPackage
@@ -162172,6 +172821,8 @@ self: {
        ];
        description = "Monad transformers for combining local and global state";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-log" = callPackage
@@ -162191,6 +172842,8 @@ self: {
        ];
        description = "A simple and fast logging monad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-logger" = callPackage
@@ -162304,6 +172957,8 @@ self: {
        ];
        description = "a monad to calculate linear recursive sequence";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-markov" = callPackage
@@ -162355,6 +173010,8 @@ self: {
        libraryHaskellDepends = [ base mersenne-random-pure64 ];
        description = "An efficient random generator monad, based on the Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-metrics" = callPackage
@@ -162410,6 +173067,8 @@ self: {
        testHaskellDepends = [ base hspec mtl ];
        description = "A monad transformer for mocking mtl-style typeclasses";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-open" = callPackage
@@ -162421,6 +173080,8 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl transformers ];
        description = "Open recursion for when you need it";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-ox" = callPackage
@@ -162502,6 +173163,8 @@ self: {
        ];
        description = "Parallel execution of monadic computations with a progress bar";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-param" = callPackage
@@ -162513,6 +173176,8 @@ self: {
        libraryHaskellDepends = [ base mtl stm ];
        description = "Parameterized monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-peel" = callPackage
@@ -162553,6 +173218,8 @@ self: {
        ];
        description = "An mtl-style typeclass and transformer for persistent";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-primitive" = callPackage
@@ -162586,6 +173253,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim mtl ];
        description = "Fast monads and monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-recorder" = callPackage
@@ -162602,6 +173271,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Record and replay the results of monadic actions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-resumption" = callPackage
@@ -162650,6 +173321,8 @@ self: {
        ];
        description = "Utility library for monads, particularly those involving state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-statevar" = callPackage
@@ -162662,6 +173335,8 @@ self: {
        testHaskellDepends = [ base stm ];
        description = "Concise, overloaded accessors for IORef, STRef, TVar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-ste" = callPackage
@@ -162678,6 +173353,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        description = "ST monad with efficient explicit errors";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-stlike-io" = callPackage
@@ -162692,6 +173369,8 @@ self: {
        ];
        description = "ST-like monad capturing variables to regions and supporting IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-stlike-stm" = callPackage
@@ -162703,6 +173382,8 @@ self: {
        libraryHaskellDepends = [ base monad-stlike-io stm ];
        description = "ST-like monad capturing variables to regions and supporting STM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-stm" = callPackage
@@ -162737,6 +173418,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A monad transformer that turns event processing into co-routine programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-time" = callPackage
@@ -162766,6 +173449,8 @@ self: {
        testHaskellDepends = [ base containers hlint hspec transformers ];
        description = "Monad transformer for recording timing events";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-tx" = callPackage
@@ -162777,6 +173462,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A transactional state monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-unify" = callPackage
@@ -162790,6 +173477,8 @@ self: {
        libraryHaskellDepends = [ base mtl unordered-containers ];
        description = "Generic first-order unification";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-unlift" = callPackage
@@ -162853,6 +173542,8 @@ self: {
        libraryHaskellDepends = [ base base-compat stm ];
        description = "Generic operations over variables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-wrap" = callPackage
@@ -162864,6 +173555,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Wrap functions such as catch around different monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadIO" = callPackage
@@ -162899,6 +173592,8 @@ self: {
        libraryHaskellDepends = [ base monadLib ];
        description = "Arrow-like monad composition for monadLib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadacme" = callPackage
@@ -162910,6 +173605,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The Acme and AcmeT monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadbi" = callPackage
@@ -162979,6 +173676,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Recursion Schemes for Monadic version";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadiccp" = callPackage
@@ -162996,6 +173695,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadiccp-gecode" = callPackage
@@ -163014,6 +173715,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gecodeint = null; gecodekernel = null; gecodesearch = null; 
          gecodeset = null; gecodesupport = null;};
 
@@ -163065,6 +173768,8 @@ self: {
        ];
        description = "A preprocessor for generating monadic call traces";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadlog" = callPackage
@@ -163084,6 +173789,8 @@ self: {
        ];
        description = "A simple and fast logging monad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadoid" = callPackage
@@ -163110,6 +173817,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell98 partial maps and filters over MonadPlus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monads-fd" = callPackage
@@ -163121,6 +173830,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monads-tf" = callPackage
@@ -163161,6 +173872,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Monadic interface for TokyoTyrant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mondo" = callPackage
@@ -163184,6 +173897,8 @@ self: {
        ];
        description = "Haskell bindings for the Mondo API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monetdb-mapi" = callPackage
@@ -163195,6 +173910,8 @@ self: {
        libraryHaskellDepends = [ base bindings-monetdb-mapi ];
        description = "Mid-level bindings for the MonetDB API (mapi)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "money" = callPackage
@@ -163207,6 +173924,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Money";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mongoDB" = callPackage
@@ -163239,6 +173958,8 @@ self: {
        ];
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mongodb-queue" = callPackage
@@ -163259,6 +173980,8 @@ self: {
        ];
        description = "message queue using MongoDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mongrel2-handler" = callPackage
@@ -163276,6 +173999,8 @@ self: {
        ];
        description = "Mongrel2 Handler Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monitor" = callPackage
@@ -163289,6 +174014,8 @@ self: {
        executableHaskellDepends = [ base filepath hinotify process ];
        description = "Do things when files change";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monky" = callPackage
@@ -163313,6 +174040,8 @@ self: {
        ];
        description = "A system state collecting library and application";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mono-foldable" = callPackage
@@ -163324,6 +174053,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text vector ];
        description = "Folds for monomorphic containers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mono-traversable" = callPackage
@@ -163404,6 +174135,8 @@ self: {
        libraryHaskellDepends = [ base containers lens mtl ];
        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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monoid-absorbing" = callPackage
@@ -163415,6 +174148,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A library for (left, right) zero monoids and backtracking with cut";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monoid-extras" = callPackage
@@ -163430,6 +174165,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion semigroups ];
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monoid-owns" = callPackage
@@ -163442,6 +174179,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        description = "a practical monoid implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monoid-record" = callPackage
@@ -163534,6 +174273,8 @@ self: {
        ];
        description = "Extra classes/functions about monoids";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monoids" = callPackage
@@ -163549,6 +174290,8 @@ self: {
        ];
        description = "Deprecated: Use 'reducers'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monomorphic" = callPackage
@@ -163576,6 +174319,8 @@ self: {
        ];
        description = "Well-typed paths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "montage" = callPackage
@@ -163641,6 +174386,8 @@ self: {
        ];
        description = "A monad and transformer for Monte Carlo calculations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "months" = callPackage
@@ -163661,6 +174408,8 @@ self: {
        ];
        description = "Month, YearMonth, Quarter, YearQuarter types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monus" = callPackage
@@ -163677,6 +174426,8 @@ self: {
        ];
        description = "a 'Monus' is a commutative monoid that allows a notion of substraction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monzo" = callPackage
@@ -163700,6 +174451,8 @@ self: {
        ];
        description = "Haskell bindings for the Monzo API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "moo" = callPackage
@@ -163721,6 +174474,8 @@ self: {
        ];
        description = "Genetic algorithm library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "moonshine" = callPackage
@@ -163780,6 +174535,8 @@ self: {
        ];
        description = "A tool for supervised learning of morphology";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morfeusz" = callPackage
@@ -163797,6 +174554,8 @@ self: {
        librarySystemDepends = [ morfeusz ];
        description = "Bindings to the morphological analyser Morfeusz";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {morfeusz = null;};
 
   "morley" = callPackage
@@ -163833,6 +174592,8 @@ self: {
        ];
        description = "Developer tools for the Michelson Language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morley-prelude" = callPackage
@@ -163882,6 +174643,8 @@ self: {
        ];
        description = "A multi-lingual, typed, workflow language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morph" = callPackage
@@ -163945,6 +174708,8 @@ self: {
        ];
        description = "Morpheus GraphQL CLI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morpheus-graphql-client" = callPackage
@@ -164037,6 +174802,8 @@ self: {
        libraryHaskellDepends = [ morphisms ];
        description = "Functors, theirs compositions and transformations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morphisms-functors-inventory" = callPackage
@@ -164048,6 +174815,8 @@ self: {
        libraryHaskellDepends = [ morphisms morphisms-functors ];
        description = "Inventory is state and store";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morphisms-objects" = callPackage
@@ -164059,6 +174828,8 @@ self: {
        libraryHaskellDepends = [ morphisms ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morte" = callPackage
@@ -164092,6 +174863,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -164110,6 +174883,8 @@ self: {
        ];
        description = "Generación interactiva de mosaicos";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mosquitto-hs" = callPackage
@@ -164178,6 +174953,8 @@ self: {
        ];
        description = "PostgreSQL-based migrations registry for moto";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "motor" = callPackage
@@ -164218,6 +174995,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate state diagrams from Motor FSM typeclasses";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "motor-reflection" = callPackage
@@ -164235,6 +175014,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Reflect on Motor FSM typeclasses to obtain runtime representations";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mount" = callPackage
@@ -164246,6 +175027,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Mounts and umounts filesystems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mountpoints" = callPackage
@@ -164280,6 +175063,8 @@ self: {
        ];
        description = "Plays videos using GStreamer and GTK+";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "moving-averages" = callPackage
@@ -164316,6 +175101,8 @@ self: {
        ];
        description = "Music player for linux";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mp3decoder" = callPackage
@@ -164347,6 +175134,8 @@ self: {
        ];
        description = "MPD/PowerMate executable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mpg123-bindings" = callPackage
@@ -164462,6 +175251,8 @@ self: {
        ];
        description = "Multi-dimensional parametric pretty-printer with color";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mprelude" = callPackage
@@ -164470,8 +175261,8 @@ self: {
      }:
      mkDerivation {
        pname = "mprelude";
-       version = "0.2.0";
-       sha256 = "0llkcbilz138zlrqmsny74g9ybjf665h7w84g0q0rli9dvjnc4bl";
+       version = "0.2.1";
+       sha256 = "103720ngsryi6x084nbjg6cw0rpsbnmhmxbz54zc09zggh8w1ccv";
        libraryHaskellDepends = [
          base source-constraints text unliftio-core
        ];
@@ -164480,6 +175271,8 @@ self: {
        ];
        description = "A minimalish prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mpretty" = callPackage
@@ -164496,6 +175289,8 @@ self: {
        ];
        description = "a monadic, extensible pretty printing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mpris" = callPackage
@@ -164507,6 +175302,8 @@ self: {
        libraryHaskellDepends = [ base containers dbus mtl ];
        description = "Interface for MPRIS";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mprover" = callPackage
@@ -164524,6 +175321,8 @@ self: {
        ];
        description = "Simple equational reasoning for a Haskell-ish language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mps" = callPackage
@@ -164543,6 +175342,8 @@ self: {
        ];
        description = "simply oo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mptcp-pm" = callPackage
@@ -164567,6 +175368,8 @@ self: {
        executableToolDepends = [ c2hs ];
        description = "A work in progress Multipath TCP path manager";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mpvguihs" = callPackage
@@ -164585,6 +175388,8 @@ self: {
        ];
        description = "A minimalist mpv GUI written in I/O heavy Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mqtt" = callPackage
@@ -164613,6 +175418,8 @@ self: {
        ];
        description = "An MQTT protocol implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mqtt-hs" = callPackage
@@ -164629,6 +175436,8 @@ self: {
        ];
        description = "A MQTT client library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mr-env" = callPackage
@@ -164654,6 +175463,8 @@ self: {
        executableHaskellDepends = [ array base containers mtl ];
        description = "Decompiles Glulx files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mrm" = callPackage
@@ -164665,6 +175476,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modular Refiable Matching, first-class matches";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ms" = callPackage
@@ -164685,6 +175498,8 @@ self: {
        ];
        description = "metric spaces";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ms-tds" = callPackage
@@ -164730,6 +175545,8 @@ self: {
        ];
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "msgpack-aeson" = callPackage
@@ -164748,6 +175565,8 @@ self: {
        testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ];
        description = "Aeson adapter for MessagePack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "msgpack-binary" = callPackage
@@ -164774,6 +175593,8 @@ self: {
        ];
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "msgpack-idl" = callPackage
@@ -164795,6 +175616,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An IDL Compiler for MessagePack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "msgpack-rpc" = callPackage
@@ -164815,6 +175638,8 @@ self: {
        testHaskellDepends = [ async base mtl network tasty tasty-hunit ];
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "msgpack-rpc-conduit" = callPackage
@@ -164836,6 +175661,8 @@ self: {
        testHaskellDepends = [ async base bytestring hspec mtl network ];
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "msgpack-types" = callPackage
@@ -164873,6 +175700,8 @@ self: {
        ];
        description = "Object-Oriented Programming in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "msi-kb-backlit" = callPackage
@@ -164886,6 +175715,8 @@ self: {
        executableHaskellDepends = [ base bytestring hid split ];
        description = "A command line tool to change backlit colors of your MSI keyboards";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mssql-simple" = callPackage
@@ -164960,6 +175791,8 @@ self: {
        ];
        description = "Library to communicate with Mt.Gox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mtl_2_2_2" = callPackage
@@ -164983,6 +175816,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Very strict CPS'd transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mtl-compat" = callPackage
@@ -165010,6 +175845,8 @@ self: {
        ];
        description = "Instances for the mtl classes for all monad transformers";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mtl-extras" = callPackage
@@ -165021,6 +175858,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Higher order versions of MTL classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mtl-prelude" = callPackage
@@ -165043,6 +175882,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Monad Transformer Library with Type Families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mtl-unleashed" = callPackage
@@ -165096,6 +175937,8 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Monad transformer library with type indexes, providing 'free' copies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mtp" = callPackage
@@ -165108,6 +175951,8 @@ self: {
        librarySystemDepends = [ mtp ];
        description = "Bindings to libmtp";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mtp = null;};
 
   "mtree" = callPackage
@@ -165153,6 +175998,8 @@ self: {
        executableHaskellDepends = [ avro base bytestring mu-schema ];
        description = "Avro serialization support for Mu microservices";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-graphql" = callPackage
@@ -165182,6 +176029,8 @@ self: {
        ];
        description = "GraphQL support for Mu";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-grpc-client" = callPackage
@@ -165203,6 +176052,8 @@ self: {
        ];
        description = "gRPC clients from Mu definitions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-grpc-common" = callPackage
@@ -165220,6 +176071,8 @@ self: {
        ];
        description = "gRPC for Mu, common modules for client and server";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-grpc-server" = callPackage
@@ -165246,6 +176099,8 @@ self: {
        ];
        description = "gRPC servers for Mu definitions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-kafka" = callPackage
@@ -165262,6 +176117,8 @@ self: {
        ];
        description = "Utilities for interoperation between Mu and Kafka";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-lens" = callPackage
@@ -165277,6 +176134,8 @@ self: {
        ];
        description = "Lenses for @mu-schema@ terms";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-optics" = callPackage
@@ -165291,6 +176150,8 @@ self: {
        ];
        description = "Optics for @mu-schema@ terms";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-persistent" = callPackage
@@ -165307,6 +176168,8 @@ self: {
        ];
        description = "Utilities for interoperation between Mu and Persistent";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-prometheus" = callPackage
@@ -165323,6 +176186,8 @@ self: {
        ];
        description = "Metrics support for Mu using Prometheus";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-protobuf" = callPackage
@@ -165348,6 +176213,8 @@ self: {
        ];
        description = "Protocol Buffers serialization and gRPC schema import for Mu microservices";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-rpc" = callPackage
@@ -165364,6 +176231,8 @@ self: {
        ];
        description = "Protocol-independent declaration of services and servers";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-schema" = callPackage
@@ -165382,6 +176251,8 @@ self: {
        ];
        description = "Format-independent schemas for serialization";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-servant-server" = callPackage
@@ -165405,6 +176276,8 @@ self: {
        ];
        description = "Servant servers for Mu definitions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-tracing" = callPackage
@@ -165418,6 +176291,8 @@ self: {
        ];
        description = "Tracing support for Mu";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mucipher" = callPackage
@@ -165453,6 +176328,8 @@ self: {
        ];
        description = "Multi-version deployer for web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mudbath" = callPackage
@@ -165490,6 +176367,8 @@ self: {
        ];
        description = "A simple document-oriented database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mueval" = callPackage
@@ -165543,6 +176422,8 @@ self: {
        testToolDepends = [ alex happy ];
        description = "An intermediate language designed to perform advanced code analysis";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multext-east-msd" = callPackage
@@ -165554,6 +176435,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "MULTEXT-East morphosyntactic descriptors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multi-cabal" = callPackage
@@ -165575,6 +176458,8 @@ self: {
        ];
        description = "A tool supporting multi cabal project builds";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multi-containers" = callPackage
@@ -165600,6 +176485,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Typeclasses augmented with a phantom type parameter";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multi-trie" = callPackage
@@ -165612,6 +176499,8 @@ self: {
        testHaskellDepends = [ base containers HTF ];
        description = "Trie of sets, as a model for compound names having multiple values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multiaddr" = callPackage
@@ -165632,6 +176521,8 @@ self: {
        ];
        description = "A network address format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multiarg" = callPackage
@@ -165650,6 +176541,8 @@ self: {
        ];
        description = "Command lines for options that take multiple arguments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multibase" = callPackage
@@ -165717,6 +176610,8 @@ self: {
        ];
        description = "Bidirectional Two-level Transformation of XML Schemas";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multihash" = callPackage
@@ -165740,6 +176635,8 @@ self: {
        ];
        description = "Multihash library and CLI executable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multihash-cryptonite" = callPackage
@@ -165810,6 +176707,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq weigh ];
        description = "Comprehensive and efficient (multi)linear algebra implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multilinear-io" = callPackage
@@ -165833,6 +176732,8 @@ self: {
        ];
        description = "Conduit-based input/output capability for multilinear package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multimap" = callPackage
@@ -165887,6 +176788,8 @@ self: {
        ];
        description = "Folding data with multiple named passes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multipath" = callPackage
@@ -165898,6 +176801,8 @@ self: {
        libraryHaskellDepends = [ base parsec utf8-string ];
        description = "Parser and builder for unix-path-like objects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multiplate" = callPackage
@@ -165924,6 +176829,8 @@ self: {
        libraryHaskellDepends = [ base multiplate transformers ];
        description = "Shorter, more generic functions for Multiplate";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multiplicity" = callPackage
@@ -165940,6 +176847,8 @@ self: {
        ];
        description = "Wrapper program for duplicity, adding config files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multipool" = callPackage
@@ -166004,6 +176913,8 @@ self: {
        ];
        description = "Read and write appropriately from both master and replicated postgresql instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multipool-postgresql-simple" = callPackage
@@ -166047,6 +176958,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Generic programming for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multirec-alt-deriver" = callPackage
@@ -166062,6 +176975,8 @@ self: {
        ];
        description = "Alternative multirec instances deriver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multirec-binary" = callPackage
@@ -166073,6 +176988,8 @@ self: {
        libraryHaskellDepends = [ base binary multirec ];
        description = "Generic Data.Binary instances using MultiRec.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multiset" = callPackage
@@ -166114,6 +177031,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 stm ];
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multistate" = callPackage
@@ -166162,6 +177081,8 @@ self: {
        ];
        description = "Multivariant assignments generation language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multivector" = callPackage
@@ -166202,6 +177123,8 @@ self: {
        ];
        description = "Static blog generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "murder" = callPackage
@@ -166218,6 +177141,8 @@ self: {
        ];
        description = "MUtually Recursive Definitions Explicitly Represented";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "murmur" = callPackage
@@ -166243,6 +177168,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simple CUI Twitter Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "murmur-hash" = callPackage
@@ -166285,6 +177212,8 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "32-bit non-cryptographic hashing";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mushu" = callPackage
@@ -166311,6 +177240,8 @@ self: {
        testHaskellDepends = [ base classy-prelude ];
        description = "Minimalist MPD client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-articulation" = callPackage
@@ -166375,6 +177306,8 @@ self: {
        ];
        description = "Diagrams-based visualization of musical data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-parts" = callPackage
@@ -166397,6 +177330,8 @@ self: {
        ];
        description = "Musical instruments, parts and playing techniques";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-pitch" = callPackage
@@ -166414,6 +177349,8 @@ self: {
        ];
        description = "Musical pitch representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-pitch-literal" = callPackage
@@ -166454,6 +177391,8 @@ self: {
        testHaskellDepends = [ base process tasty tasty-golden ];
        description = "Some useful preludes for the Music Suite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-score" = callPackage
@@ -166477,6 +177416,8 @@ self: {
        ];
        description = "Musical score and part representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-sibelius" = callPackage
@@ -166496,6 +177437,8 @@ self: {
        ];
        description = "Interaction with Sibelius";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-suite" = callPackage
@@ -166515,6 +177458,8 @@ self: {
        doHaddock = false;
        description = "A set of libraries for composition, analysis and manipulation of music";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-util" = callPackage
@@ -166532,6 +177477,8 @@ self: {
        ];
        description = "Utility for developing the Music Suite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "musicScroll" = callPackage
@@ -166556,6 +177503,8 @@ self: {
        executablePkgconfigDepends = [ gtk3 ];
        description = "Supply your tunes info without leaving your music player";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "musicbrainz-email" = callPackage
@@ -166589,6 +177538,8 @@ self: {
        ];
        description = "Send an email to all MusicBrainz editors";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "musicw" = callPackage
@@ -166624,6 +177575,8 @@ self: {
        ];
        description = "MusicXML format encoded as Haskell type and functions of reading and writting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "musicxml2" = callPackage
@@ -166694,6 +177647,8 @@ self: {
        ];
        description = "Straight implementation of mustache templates";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mustache2hs" = callPackage
@@ -166768,6 +177723,8 @@ self: {
        ];
        description = "iteratees based upon mutable buffers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mutable-lens" = callPackage
@@ -166803,6 +177760,8 @@ self: {
        ];
        description = "Watches your screensaver and (un)mutes music when you (un)lock the screen";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mvar-lock" = callPackage
@@ -166814,6 +177773,8 @@ self: {
        libraryHaskellDepends = [ base safe-exceptions ];
        description = "A trivial lock based on MVar";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mvc" = callPackage
@@ -166830,6 +177791,8 @@ self: {
        ];
        description = "Model-view-controller";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mvc-updates" = callPackage
@@ -166841,6 +177804,8 @@ self: {
        libraryHaskellDepends = [ async base foldl mvc ];
        description = "Concurrent and combinable updates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mvclient" = callPackage
@@ -166859,6 +177824,8 @@ self: {
        ];
        description = "Client library for metaverse systems like Second Life";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mwc-probability" = callPackage
@@ -166990,6 +177957,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit vector ];
        description = "MXNet interface in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "mxnet-dataiter" = callPackage
@@ -167007,6 +177976,8 @@ self: {
        testHaskellDepends = [ base hspec mxnet streaming ];
        description = "mxnet dataiters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mxnet-examples" = callPackage
@@ -167020,6 +177991,8 @@ self: {
        executableHaskellDepends = [ base mxnet ];
        description = "Examples for MXNet in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mxnet-nn" = callPackage
@@ -167045,6 +178018,8 @@ self: {
        ];
        description = "Train a neural network with MXNet in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mxnet-nnvm" = callPackage
@@ -167058,6 +178033,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "NNVM interface in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "my-package-testing" = callPackage
@@ -167082,6 +178059,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "my-test-docs" = callPackage
@@ -167106,6 +178085,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "myTestlll" = callPackage
@@ -167130,6 +178111,8 @@ self: {
        ];
        description = "None";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "myanimelist-export" = callPackage
@@ -167153,6 +178136,8 @@ self: {
        ];
        description = "Export from MyAnimeList";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mybitcoin-sci" = callPackage
@@ -167189,6 +178174,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Haskell binding to the Myo armband";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysnapsession" = callPackage
@@ -167205,6 +178192,8 @@ self: {
        ];
        description = "Sessions and continuations for Snap web apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysnapsession-example" = callPackage
@@ -167224,6 +178213,8 @@ self: {
        ];
        description = "Example projects using mysnapsession";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysql" = callPackage
@@ -167256,6 +178247,8 @@ self: {
        ];
        description = "An extensible mysql effect using extensible-effects and mysql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysql-haskell" = callPackage
@@ -167310,6 +178303,8 @@ self: {
        ];
        description = "TLS support for mysql-haskell package using openssl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysql-simple" = callPackage
@@ -167343,6 +178338,8 @@ self: {
        ];
        description = "Quasi-quoter for use with mysql-simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysql-simple-typed" = callPackage
@@ -167358,6 +178355,8 @@ self: {
        ];
        description = "Typed extension to mysql simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mystem" = callPackage
@@ -167376,6 +178375,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Bindings for Mystem morphological analyzer executabe";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mywatch" = callPackage
@@ -167400,6 +178401,8 @@ self: {
        ];
        description = "Web application to view and kill MySQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "myxine-client" = callPackage
@@ -167422,6 +178425,8 @@ self: {
        testHaskellDepends = [ bytestring text ];
        description = "A Haskell client for the Myxine GUI server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mzv" = callPackage
@@ -167433,6 +178438,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "n-ary-functor" = callPackage
@@ -167476,6 +178483,8 @@ self: {
        libraryHaskellDepends = [ base singletons vector ];
        description = "Homogeneous tuples of arbitrary length";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "n2o" = callPackage
@@ -167520,6 +178529,8 @@ self: {
        ];
        description = "N2O Protocols Starter Pack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "n2o-web" = callPackage
@@ -167538,6 +178549,8 @@ self: {
        ];
        description = "N2O adapter for WebSockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nagios-check" = callPackage
@@ -167607,6 +178620,8 @@ self: {
        ];
        description = "Monitor ekg metrics via Nagios";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nakadi-client" = callPackage
@@ -167645,6 +178660,8 @@ self: {
        ];
        description = "Client library for the Nakadi Event Broker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "namecoin-update" = callPackage
@@ -167699,6 +178716,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A named lock that is created on demand";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "named-records" = callPackage
@@ -167720,6 +178739,8 @@ self: {
        sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53";
        libraryHaskellDepends = [ base named servant ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "named-servant-client" = callPackage
@@ -167735,6 +178756,8 @@ self: {
        ];
        description = "client support for named-servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "named-servant-server" = callPackage
@@ -167750,6 +178773,8 @@ self: {
        ];
        description = "server support for named-servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "named-sop" = callPackage
@@ -167762,6 +178787,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dependently-typed sums and products, tagged by field name";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "namelist" = callPackage
@@ -167780,6 +178807,8 @@ self: {
        ];
        description = "fortran90 namelist parser/pretty printer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "names" = callPackage
@@ -167814,6 +178843,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A Generic Haskell library for managing namespaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nano-cryptr" = callPackage
@@ -167854,6 +178885,8 @@ self: {
        librarySystemDepends = [ openssl ];
        description = "Bindings to OpenSSL HMAC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "nano-md5" = callPackage
@@ -167868,6 +178901,8 @@ self: {
        librarySystemDepends = [ openssl ];
        description = "Efficient, ByteString bindings to OpenSSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "nanoAgda" = callPackage
@@ -167898,6 +178933,8 @@ self: {
        librarySystemDepends = [ ncurses ];
        description = "Simple Curses binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "nanomsg" = callPackage
@@ -167910,6 +178947,8 @@ self: {
        librarySystemDepends = [ nanomsg ];
        description = "nanomsg - scalability protocols library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) nanomsg;};
 
   "nanomsg-haskell" = callPackage
@@ -167934,6 +178973,8 @@ self: {
        ];
        description = "Bindings to the nanomsg library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) nanomsg;};
 
   "nanoparsec" = callPackage
@@ -167945,6 +178986,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ListLike ];
        description = "An implementation of attoparsec-like parser around list-like";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nanospec" = callPackage
@@ -167978,6 +179021,8 @@ self: {
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
        description = "Haskell bindings for nanovg";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU;};
 
@@ -167996,6 +179041,8 @@ self: {
        ];
        description = "Simple interface to rendering with NanoVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nanq" = callPackage
@@ -168015,6 +179062,8 @@ self: {
        ];
        description = "Performs 漢字検定 (Japan Kanji Aptitude Test) level analysis on given Kanji";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "naperian" = callPackage
@@ -168032,6 +179081,8 @@ self: {
        ];
        description = "Efficient representable functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "naqsha" = callPackage
@@ -168050,6 +179101,8 @@ self: {
        doHaddock = false;
        description = "A library for working with anything map related";
        license = "(Apache-2.0 OR BSD-3-Clause)";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "narc" = callPackage
@@ -168061,6 +179114,8 @@ self: {
        libraryHaskellDepends = [ base HDBC HUnit mtl QuickCheck random ];
        description = "Query SQL databases using Nested Relational Calculus embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nat" = callPackage
@@ -168084,6 +179139,8 @@ self: {
        testHaskellDepends = [ base doctest hedgehog QuickCheck ];
        description = "Variable-sized numbers from type-level nats";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nationstates" = callPackage
@@ -168100,6 +179157,8 @@ self: {
        ];
        description = "NationStates API client";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "native" = callPackage
@@ -168159,6 +179218,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion time ];
        description = "Another Haskell client for NATS (https://nats.io)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nats-queue" = callPackage
@@ -168179,6 +179240,8 @@ self: {
        ];
        description = "Haskell API for NATS messaging system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "natural" = callPackage
@@ -168237,6 +179300,8 @@ self: {
        ];
        description = "Natural numbers tagged with a type-level representation of the number";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "natural-numbers" = callPackage
@@ -168314,6 +179379,8 @@ self: {
        ];
        description = "Interface to Naver Translate";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nbt" = callPackage
@@ -168333,6 +179400,8 @@ self: {
        ];
        description = "A parser/serializer for Minecraft's Named Binary Tag (NBT) data format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nc-indicators" = callPackage
@@ -168395,6 +179464,8 @@ self: {
        executableHaskellDepends = [ base filepath parsec ];
        description = "A Fast Retargetable Template Engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neat-interpolation" = callPackage
@@ -168429,6 +179500,8 @@ self: {
        ];
        description = "ASCII-fied arrow notation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neet" = callPackage
@@ -168445,6 +179518,8 @@ self: {
        ];
        description = "A NEAT library for Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nehe-tuts" = callPackage
@@ -168464,6 +179539,8 @@ self: {
        ];
        description = "Port of the NeHe OpenGL tutorials to Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neil" = callPackage
@@ -168493,6 +179570,8 @@ self: {
        libraryHaskellDepends = [ base failure transformers ];
        description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neko-lib" = callPackage
@@ -168513,6 +179592,8 @@ self: {
        ];
        description = "Neko VM code generation and disassembly library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neko-obfs" = callPackage
@@ -168566,6 +179647,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "nerf" = callPackage
@@ -168592,6 +179675,8 @@ self: {
        ];
        description = "Nerf, a named entity recognition tool based on linear-chain CRFs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nero" = callPackage
@@ -168610,6 +179695,8 @@ self: {
        ];
        description = "Lens-based HTTP toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nero-wai" = callPackage
@@ -168625,6 +179712,8 @@ self: {
        ];
        description = "WAI adapter for Nero server applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nero-warp" = callPackage
@@ -168636,6 +179725,8 @@ self: {
        libraryHaskellDepends = [ base nero nero-wai warp ];
        description = "Run Nero server applications with Warp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nest" = callPackage
@@ -168651,6 +179742,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring containers hedgehog text ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nested-routes" = callPackage
@@ -168680,6 +179773,8 @@ self: {
        ];
        description = "Declarative, compositional Wai responses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nested-sequence" = callPackage
@@ -168696,6 +179791,8 @@ self: {
        ];
        description = "List-like data structures with O(log(n)) random access";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nested-sets" = callPackage
@@ -168724,6 +179821,8 @@ self: {
        ];
        description = "A library for nested maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-concurrent" = callPackage
@@ -168873,6 +179972,8 @@ self: {
        ];
        description = "Conversion between net-spider and pangraph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-spider-rpl" = callPackage
@@ -168894,6 +179995,8 @@ self: {
        ];
        description = "NetSpider data model and utility for RPL networks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-spider-rpl-cli" = callPackage
@@ -168920,6 +180023,8 @@ self: {
        ];
        description = "CLI executable of NetSpider.RPL.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netclock" = callPackage
@@ -168933,6 +180038,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc network ];
        description = "Netclock protocol";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netcode-io" = callPackage
@@ -168978,6 +180085,8 @@ self: {
        ];
        description = "The NetCore compiler and runtime system for OpenFlow networks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netease-fm" = callPackage
@@ -169006,6 +180115,8 @@ self: {
        ];
        description = "NetEase Cloud Music FM client in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netlib-carray" = callPackage
@@ -169065,6 +180176,8 @@ self: {
        executableHaskellDepends = [ base HTF random ];
        description = "Enumerator tools for text-based network protocols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netlink" = callPackage
@@ -169161,6 +180274,8 @@ self: {
        ];
        description = "Contract normaliser and simulator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netspec" = callPackage
@@ -169177,6 +180292,8 @@ self: {
        ];
        description = "Simplify static Networking tasks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netstring-enumerator" = callPackage
@@ -169190,6 +180307,8 @@ self: {
        ];
        description = "Enumerator-based netstring parsing";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nettle" = callPackage
@@ -169231,6 +180350,8 @@ self: {
        ];
        description = "FRP for controlling networks of OpenFlow switches";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nettle-netkit" = callPackage
@@ -169246,6 +180367,8 @@ self: {
        ];
        description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nettle-openflow" = callPackage
@@ -169262,6 +180385,8 @@ self: {
        ];
        description = "OpenFlow protocol messages, binary formats, and servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netwire" = callPackage
@@ -169321,6 +180446,8 @@ self: {
        ];
        description = "JavaScript instance of netwire-input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netwire-vinylglfw-examples" = callPackage
@@ -169343,6 +180470,8 @@ self: {
        ];
        description = "Netwire/GLFW/VinylGL input handling demo";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network_2_6_3_1" = callPackage
@@ -169413,6 +180542,8 @@ self: {
        ];
        description = "IP data structures and textual representation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-anonymous-i2p" = callPackage
@@ -169435,6 +180566,8 @@ self: {
        ];
        description = "Haskell API for I2P anonymous networking";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-anonymous-tor" = callPackage
@@ -169464,6 +180597,8 @@ self: {
        ];
        description = "Haskell API for Tor anonymous networking";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-api-support" = callPackage
@@ -169481,6 +180616,8 @@ self: {
        ];
        description = "Toolkit for building http client libraries over Network.Http.Conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-arbitrary" = callPackage
@@ -169502,6 +180639,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Arbitrary Instances for Network Types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-attoparsec" = callPackage
@@ -169525,6 +180664,8 @@ self: {
        doCheck = false;
        description = "Utility functions for running a parser against a socket";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-bitcoin" = callPackage
@@ -169547,6 +180688,8 @@ self: {
        ];
        description = "An interface to bitcoind";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-bsd" = callPackage
@@ -169581,6 +180724,8 @@ self: {
        ];
        description = "Linux NetworkNameSpace Builder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-byte-order" = callPackage
@@ -169606,6 +180751,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network unix ];
        description = "Fast, memory-efficient, low-level networking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-carbon" = callPackage
@@ -169619,6 +180766,8 @@ self: {
        ];
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-conduit" = callPackage
@@ -169666,6 +180815,8 @@ self: {
        ];
        description = "A wrapper around a generic stream-like connection";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-data" = callPackage
@@ -169716,6 +180867,8 @@ self: {
        ];
        description = "Domain Name System data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-enumerator" = callPackage
@@ -169731,6 +180884,8 @@ self: {
        ];
        description = "Enumerators for network sockets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-fancy" = callPackage
@@ -169753,6 +180908,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hans parsec ];
        description = "HaNS to Network shims for easier HaNS integration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-house" = callPackage
@@ -169764,6 +180921,8 @@ self: {
        libraryHaskellDepends = [ array base containers mtl ];
        description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-info" = callPackage
@@ -169788,6 +180947,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ioctl network ];
        description = "Haskell bindings for the ifreq structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-ip" = callPackage
@@ -169904,6 +181065,8 @@ self: {
        ];
        description = "A ByteString based library for writing HTTP(S) servers and clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-msg" = callPackage
@@ -169938,6 +181101,8 @@ self: {
        testHaskellDepends = [ async base bytestring hspec mtl network ];
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-multicast" = callPackage
@@ -169965,6 +181130,8 @@ self: {
        ];
        description = "Haskell bindings for low-level packet sockets (AF_PACKET)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-pgi" = callPackage
@@ -169997,6 +181164,8 @@ self: {
        ];
        description = "Client library for the XMPP protocol";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-rpca" = callPackage
@@ -170014,6 +181183,8 @@ self: {
        ];
        description = "A cross-platform RPC library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-run" = callPackage
@@ -170039,6 +181210,8 @@ self: {
        executableHaskellDepends = [ base network unix ];
        description = "A light abstraction over sockets & co. for servers";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-service" = callPackage
@@ -170054,6 +181227,8 @@ self: {
        ];
        description = "Provide a service at the data type level";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-simple" = callPackage
@@ -170085,6 +181260,8 @@ self: {
        ];
        description = "network-simple for resolved addresses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-simple-tls" = callPackage
@@ -170135,6 +181312,8 @@ self: {
        ];
        description = "Simple interface to TLS secured WebSockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-socket-options" = callPackage
@@ -170146,6 +181325,8 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "Type-safe, portable alternative to getSocketOption/setSocketOption";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-stream" = callPackage
@@ -170162,6 +181343,8 @@ self: {
        ];
        description = "ByteString and Text streams for networking";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-topic-models" = callPackage
@@ -170183,6 +181366,8 @@ self: {
        ];
        description = "A few network topic model implementations for bayes-stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-transport" = callPackage
@@ -170223,6 +181408,8 @@ self: {
        ];
        description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-transport-composed" = callPackage
@@ -170254,6 +181441,8 @@ self: {
        ];
        description = "In-memory instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-transport-tcp" = callPackage
@@ -170378,6 +181567,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "FromJSON and ToJSON Instances for Network.URI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-uri-lenses" = callPackage
@@ -170417,6 +181608,8 @@ self: {
        ];
        description = "VoiceText Web API wrapper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-wai-router" = callPackage
@@ -170428,6 +181621,8 @@ self: {
        libraryHaskellDepends = [ base wai ];
        description = "A routing library for wai";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-websocket" = callPackage
@@ -170441,6 +181636,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 network webserver ];
        description = "WebSocket library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "networked-game" = callPackage
@@ -170458,6 +181655,8 @@ self: {
        ];
        description = "Networked-game support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neural" = callPackage
@@ -170490,6 +181689,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Neural Networks in native Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neural-network-base" = callPackage
@@ -170520,6 +181721,8 @@ self: {
        ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neural-network-hmatrix" = callPackage
@@ -170537,6 +181740,8 @@ self: {
        librarySystemDepends = [ blas ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) blas;};
 
   "neuron" = callPackage
@@ -170626,6 +181831,8 @@ self: {
        ];
        description = "Library implementing the NewHope cryptographic key-exchange protocol";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newports" = callPackage
@@ -170639,6 +181846,8 @@ self: {
        executableHaskellDepends = [ base directory old-time ];
        description = "List ports newer than N days on a FreeBSD system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newsletter" = callPackage
@@ -170667,6 +181876,8 @@ self: {
        ];
        description = "A basic newsletter implimentation, using various backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newsletter-mailgun" = callPackage
@@ -170682,6 +181893,8 @@ self: {
        ];
        description = "A mailgun backend for the newsletter package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newsynth" = callPackage
@@ -170719,6 +181932,8 @@ self: {
        executableHaskellDepends = [ base cmdargs containers mtl ];
        description = "A trivially simple app to create things from simple templates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newtype" = callPackage
@@ -170748,6 +181963,8 @@ self: {
        ];
        description = "Instance derivers for newtype wrappers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newtype-generics" = callPackage
@@ -170782,6 +181999,8 @@ self: {
        ];
        description = "A template haskell deriver to create Control.Newtype instances.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newtype-zoo" = callPackage
@@ -170798,6 +182017,8 @@ self: {
        ];
        description = "Newtype Wrapper Zoo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newtyper" = callPackage
@@ -170821,6 +182042,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A concurrency primitive for a slow consumer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nextstep-plist" = callPackage
@@ -170832,6 +182055,8 @@ self: {
        libraryHaskellDepends = [ base parsec pretty QuickCheck ];
        description = "NextStep style plist parser and printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nf" = callPackage
@@ -170858,6 +182083,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "libnfc bindings";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {nfc = null;};
 
   "ngram" = callPackage
@@ -170897,6 +182124,8 @@ self: {
        executableHaskellDepends = [ base parseargs ];
        description = "Ngrams loader based on http://www.ngrams.info format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ngx-export" = callPackage
@@ -170949,6 +182178,8 @@ self: {
        ];
        description = "More extra tools for Nginx haskell module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "niagra" = callPackage
@@ -170965,6 +182196,8 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck ];
        description = "High performance CSS EDSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nibblestring" = callPackage
@@ -170985,6 +182218,8 @@ self: {
        ];
        description = "Packed, strict nibble arrays with a list interface (ByteString for nibbles)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nice-html" = callPackage
@@ -171008,6 +182243,8 @@ self: {
        ];
        description = "A fast and nice HTML templating library with distinct compilation/rendering phases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nicify" = callPackage
@@ -171054,6 +182291,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nikepub" = callPackage
@@ -171074,6 +182313,8 @@ self: {
        ];
        description = "Command line utility publishes Nike+ runs on blogs and Twitter";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nimber" = callPackage
@@ -171123,6 +182364,8 @@ self: {
        ];
        description = "IDL compiler and RPC/distributed object framework for microservices";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nist-beacon" = callPackage
@@ -171147,6 +182390,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Haskell bindings for Nitro";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "niv" = callPackage
@@ -171202,6 +182447,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convenient utility for distributed Nix builds";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nix-deploy" = callPackage
@@ -171220,6 +182467,8 @@ self: {
        ];
        description = "Deploy Nix-built software to a NixOS machine";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nix-derivation" = callPackage
@@ -171277,6 +182526,8 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Evaluate Haskell expressions using Nix to get packages";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nix-freeze-tree" = callPackage
@@ -171304,6 +182555,8 @@ self: {
        doHaddock = false;
        description = "Convert a tree of files into fixed-output derivations";
        license = stdenv.lib.licenses.agpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nix-narinfo" = callPackage
@@ -171363,6 +182616,8 @@ self: {
        ];
        description = "Lightweight dependency management with Nix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nix-tools" = callPackage
@@ -171393,6 +182648,8 @@ self: {
        ];
        description = "cabal/stack to nix translation tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nix-tree" = callPackage
@@ -171482,6 +182739,8 @@ self: {
        ];
        description = "Generate nix expressions from npm packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nixos-types" = callPackage
@@ -171517,6 +182776,8 @@ self: {
        ];
        description = "Tool for semi-automatic updating of nixpkgs repository";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nkjp" = callPackage
@@ -171535,6 +182796,8 @@ self: {
        ];
        description = "Manipulating the National Corpus of Polish (NKJP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nlopt-haskell" = callPackage
@@ -171559,6 +182822,8 @@ self: {
        libraryHaskellDepends = [ base containers strict ];
        description = "Scoring functions commonly used for evaluation in NLP and IR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nlp-scores-scripts" = callPackage
@@ -171574,6 +182839,8 @@ self: {
        ];
        description = "NLP scoring command-line programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nm" = callPackage
@@ -171590,6 +182857,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Network Manager, binding to libnm-glib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {g = null; inherit (pkgs) glib; libnm-glib = null; 
          nm-glib = null;};
 
@@ -171646,6 +182915,8 @@ self: {
        ];
        description = "Library to connect to an NNTP Server";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "no-buffering-workaround" = callPackage
@@ -171669,6 +182940,8 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Role annotations without -XRoleAnnotations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "no-value" = callPackage
@@ -171702,6 +182975,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Math in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nofib-analyse" = callPackage
@@ -171715,6 +182990,8 @@ self: {
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nofib-analyze" = callPackage
@@ -171728,6 +183005,8 @@ self: {
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "noise" = callPackage
@@ -171751,6 +183030,8 @@ self: {
        ];
        description = "A friendly language for graphic design";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "noli" = callPackage
@@ -171767,6 +183048,8 @@ self: {
        ];
        description = "A static site generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nom" = callPackage
@@ -171791,6 +183074,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Name-binding & alpha-equivalence";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nominal" = callPackage
@@ -172000,6 +183285,8 @@ self: {
        testHaskellDepends = [ base checkers QuickCheck ];
        description = "The Zipper for NonEmpty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "non-negative" = callPackage
@@ -172088,6 +183375,8 @@ self: {
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "nonempty structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nonempty-vector" = callPackage
@@ -172238,6 +183527,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Normalization insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "normalize" = callPackage
@@ -172306,6 +183597,8 @@ self: {
        ];
        description = "examples for not-gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "not-in-base" = callPackage
@@ -172330,6 +183623,8 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Avoiding the C preprocessor via cunning use of Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nothunks" = callPackage
@@ -172348,6 +183643,8 @@ self: {
        ];
        description = "Examine values for unexpected thunks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "notifications-tray-icon" = callPackage
@@ -172373,6 +183670,8 @@ self: {
          transformers tuple
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "notmuch" = callPackage
@@ -172410,6 +183709,8 @@ self: {
        executableSystemDepends = [ notmuch ];
        description = "Binding for notmuch MUA library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) notmuch;};
 
   "notmuch-web" = callPackage
@@ -172447,6 +183748,8 @@ self: {
        ];
        description = "A web interface to the notmuch email indexer";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "notzero" = callPackage
@@ -172500,6 +183803,8 @@ self: {
        ];
        description = "Zeit Now haskell-side integration and introspection tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nowdoc" = callPackage
@@ -172527,6 +183832,8 @@ self: {
        libraryHaskellDepends = [ base containers numeric-prelude primes ];
        description = "NumericPrelude extras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "np-linear" = callPackage
@@ -172542,6 +183849,8 @@ self: {
        ];
        description = "Linear algebra for the numeric-prelude framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nptools" = callPackage
@@ -172560,6 +183869,8 @@ self: {
        ];
        description = "A collection of random tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nqe" = callPackage
@@ -172703,6 +184014,8 @@ self: {
        ];
        description = "Client library for NTP control messaging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ntrip-client" = callPackage
@@ -172727,6 +184040,8 @@ self: {
        ];
        description = "NTRIP client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ntype" = callPackage
@@ -172750,6 +184065,8 @@ self: {
        testHaskellDepends = [ base vector ];
        description = "Multidimensional arrays, Linear algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "null-canvas" = callPackage
@@ -172767,6 +184084,8 @@ self: {
        ];
        description = "HTML5 Canvas Graphics Library - forked Blank Canvas";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nullary" = callPackage
@@ -172778,6 +184097,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A package for working with nullary type classes";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nullpipe" = callPackage
@@ -172790,6 +184111,8 @@ self: {
        testHaskellDepends = [ base hspec pipes ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "num-non-negative" = callPackage
@@ -172857,6 +184180,8 @@ self: {
        libraryHaskellDepends = [ base call-stack semigroups ];
        description = "A sequence of semigroups, for composing stuff in multiple spatial directions";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numbering" = callPackage
@@ -172905,6 +184230,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numerals-base" = callPackage
@@ -172926,6 +184253,8 @@ self: {
        ];
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numeric-domains" = callPackage
@@ -172987,6 +184316,8 @@ self: {
        ];
        description = "Ode solvers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numeric-prelude" = callPackage
@@ -173023,6 +184354,8 @@ self: {
        doCheck = false;
        description = "Quasi-quoters for numbers of different bases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numeric-quest" = callPackage
@@ -173049,6 +184382,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "A framework for numeric ranges";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numeric-tools" = callPackage
@@ -173082,6 +184417,8 @@ self: {
        ];
        description = "core package for Numerical Haskell project";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numericpeano" = callPackage
@@ -173124,6 +184461,8 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "n-dimensional arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-free" = callPackage
@@ -173156,6 +184495,8 @@ self: {
        testHaskellDepends = [ base hedgehog numhask numhask-prelude ];
        description = "Laws and tests for numhask";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-histogram" = callPackage
@@ -173172,6 +184513,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-prelude" = callPackage
@@ -173184,6 +184527,8 @@ self: {
        testHaskellDepends = [ doctest ];
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-range" = callPackage
@@ -173204,6 +184549,8 @@ self: {
        ];
        description = "Numbers that are range representations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-space" = callPackage
@@ -173221,6 +184568,8 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "numerical spaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-test" = callPackage
@@ -173237,6 +184586,8 @@ self: {
        testHaskellDepends = [ base numhask-prelude QuickCheck tasty ];
        description = "Laws and tests for numhask";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nums" = callPackage
@@ -173454,6 +184805,8 @@ self: {
        ];
        description = "Client for the Nylas API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nymphaea" = callPackage
@@ -173472,6 +184825,8 @@ self: {
        ];
        description = "An interactive GUI for manipulating L-systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nyx-game" = callPackage
@@ -173543,6 +184898,8 @@ self: {
        ];
        description = "Client to the OANDA REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oasis-xrd" = callPackage
@@ -173565,6 +184922,8 @@ self: {
        ];
        description = "Extensible Resource Descriptor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oauth10a" = callPackage
@@ -173609,6 +184968,8 @@ self: {
        ];
        description = "OAuth2 jwt-bearer client flow as per rfc7523";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oauthenticated" = callPackage
@@ -173634,6 +184995,8 @@ self: {
        ];
        description = "Simple OAuth for http-client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "obd" = callPackage
@@ -173658,6 +185021,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Communicate to OBD interfaces over ELM327";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "obdd" = callPackage
@@ -173674,6 +185039,8 @@ self: {
        testHaskellDepends = [ array base containers text ];
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oberon0" = callPackage
@@ -173693,6 +185060,8 @@ self: {
        doHaddock = false;
        description = "Oberon0 Compiler";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "obj" = callPackage
@@ -173712,6 +185081,8 @@ self: {
        ];
        description = "Reads and writes obj models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "objectid" = callPackage
@@ -173732,6 +185103,8 @@ self: {
        ];
        description = "Rather unique identifier for things that need to be stored";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "objective" = callPackage
@@ -173750,6 +185123,8 @@ self: {
        ];
        description = "Composable objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oblivious-transfer" = callPackage
@@ -173773,6 +185148,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "An implementation of the Oblivious Transfer protocol in Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "observable" = callPackage
@@ -173822,6 +185199,8 @@ self: {
        ];
        description = "Convert Haskell types in OCaml types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ocap-io" = callPackage
@@ -173852,6 +185231,8 @@ self: {
        ];
        description = "Owned channels in the Ownership Monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ochintin-daicho" = callPackage
@@ -173892,6 +185273,8 @@ self: {
        ];
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "octohat" = callPackage
@@ -173922,6 +185305,8 @@ self: {
        ];
        description = "A tested, minimal wrapper around GitHub's API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "octopus" = callPackage
@@ -173942,6 +185327,8 @@ self: {
        ];
        description = "Lisp with more dynamism, more power, more simplicity";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oculus" = callPackage
@@ -173958,6 +185345,8 @@ self: {
        librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ];
        description = "Oculus Rift ffi providing head tracking data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXinerama; ovr = null; 
          inherit (pkgs) systemd;};
@@ -173988,6 +185377,8 @@ self: {
        benchmarkHaskellDepends = [ async base text weigh ];
        description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) unixODBC;};
 
   "odd-jobs" = callPackage
@@ -174039,6 +185430,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A full-featured PostgreSQL-backed job queue (with an admin UI)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oden-go-packages" = callPackage
@@ -174054,6 +185447,8 @@ self: {
        ];
        description = "Provides Go package metadata";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "odpic-raw" = callPackage
@@ -174110,6 +185505,8 @@ self: {
        ];
        description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "off-simple" = callPackage
@@ -174121,6 +185518,8 @@ self: {
        libraryHaskellDepends = [ base parsec3 vector ];
        description = "A parser for simplified-syntax OFF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ofx" = callPackage
@@ -174151,6 +185550,8 @@ self: {
        ];
        description = "A lightweight markup language for story writers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ohloh-hs" = callPackage
@@ -174174,6 +185575,8 @@ self: {
        ];
        description = "Interface to the Ohloh API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oi" = callPackage
@@ -174190,6 +185593,8 @@ self: {
        executableHaskellDepends = [ base directory filepath parallel ];
        description = "Library for purely functional lazy interactions with the outer world";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oidc-client" = callPackage
@@ -174215,6 +185620,8 @@ self: {
        ];
        description = "OpenID Connect 1.0 library for RP";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ois-input-manager" = callPackage
@@ -174227,6 +185634,8 @@ self: {
        librarySystemDepends = [ OIS ];
        description = "wrapper for OIS input manager for use with hogre";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OIS = null;};
 
   "old-locale" = callPackage
@@ -174290,6 +185699,8 @@ self: {
        ];
        description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "om-actor" = callPackage
@@ -174301,6 +185712,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Actor pattern utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "om-elm" = callPackage
@@ -174318,6 +185731,8 @@ self: {
        ];
        description = "Haskell utilities for building embedded Elm programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "om-fail" = callPackage
@@ -174332,6 +185747,8 @@ self: {
        ];
        description = "Monad transformer providing MonadFail";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "om-http-logging" = callPackage
@@ -174347,6 +185764,8 @@ self: {
        ];
        description = "om-http-logging";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "omaketex" = callPackage
@@ -174364,6 +185783,8 @@ self: {
        ];
        description = "A simple tool to generate OMakefile for latex files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ombra" = callPackage
@@ -174383,6 +185804,8 @@ self: {
        ];
        description = "Render engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "omega" = callPackage
@@ -174401,6 +185824,8 @@ self: {
        ];
        description = "A purely functional programming language and a proof system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "omnicodec" = callPackage
@@ -174446,6 +185871,8 @@ self: {
        ];
        description = "A pretty-printer wrapper to faciliate ease of formatting during development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "on-a-horse" = callPackage
@@ -174464,6 +185891,8 @@ self: {
        ];
        description = "\"Haskell on a Horse\" - A combinatorial web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "on-demand-ssh-tunnel" = callPackage
@@ -174484,6 +185913,8 @@ self: {
        ];
        description = "Program that sends traffic through SSH tunnels on-demand";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "onama" = callPackage
@@ -174495,6 +185926,8 @@ self: {
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "HTML-parsing primitives for Parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "once" = callPackage
@@ -174598,6 +186031,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A never-empty list type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "online" = callPackage
@@ -174618,6 +186053,8 @@ self: {
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "online-csv" = callPackage
@@ -174636,6 +186073,8 @@ self: {
        testHaskellDepends = [ base doctest numhask-prelude ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "only" = callPackage
@@ -174660,6 +186099,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "partition lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "onu-course" = callPackage
@@ -174671,6 +186112,8 @@ self: {
        libraryHaskellDepends = [ base smallcheck ];
        description = "Code for the Haskell course taught at the Odessa National University in 2012";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oo-prototypes" = callPackage
@@ -174694,6 +186137,8 @@ self: {
        testHaskellDepends = [ base containers doctest ];
        description = "Common operators encouraging large-scale easy reading";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opaleye" = callPackage
@@ -174742,6 +186187,8 @@ self: {
        ];
        description = "Opaleye wrapped up in classy MTL attire";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opaleye-sqlite" = callPackage
@@ -174766,6 +186213,8 @@ self: {
        ];
        description = "An SQL-generating DSL targeting SQLite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opaleye-trans" = callPackage
@@ -174787,6 +186236,8 @@ self: {
        ];
        description = "A monad transformer for Opaleye";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "open-adt" = callPackage
@@ -174802,6 +186253,8 @@ self: {
        ];
        description = "Open algebraic data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "open-adt-tutorial" = callPackage
@@ -174821,6 +186274,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Open algebraic data type examples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "open-browser" = callPackage
@@ -174848,6 +186303,8 @@ self: {
        executableHaskellDepends = [ base basic-prelude text turtle ];
        description = "Open haddock HTML documentation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "open-pandoc" = callPackage
@@ -174870,6 +186327,8 @@ self: {
        ];
        description = "Conversion between markup formats";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "open-signals" = callPackage
@@ -174882,6 +186341,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A mechanism similar to checked exceptions that integrates with MTL and transformer stacks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "open-symbology" = callPackage
@@ -174909,6 +186370,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "open-union" = callPackage
@@ -174923,6 +186386,8 @@ self: {
        executableHaskellDepends = [ base type-fun ];
        description = "Extensible, type-safe unions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "open-witness" = callPackage
@@ -174967,6 +186432,8 @@ self: {
        ];
        description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openapi-typed" = callPackage
@@ -174986,6 +186453,8 @@ self: {
        ];
        description = "Types for OpenAPI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openapi3" = callPackage
@@ -175021,6 +186490,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "OpenAPI 3.0 data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openapi3-code-generator" = callPackage
@@ -175057,6 +186528,8 @@ self: {
        ];
        description = "OpenAPI3 Haskell Client Code Generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opench-meteo" = callPackage
@@ -175068,6 +186541,8 @@ self: {
        libraryHaskellDepends = [ aeson base data-default text time ];
        description = "A Haskell implementation of the Swiss Meteo Net data API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opencog-atomspace" = callPackage
@@ -175148,6 +186623,8 @@ self: {
        libraryPkgconfigDepends = [ opencv ];
        description = "Raw Haskell bindings to OpenCV >= 2.0";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) opencv;};
 
   "opendatatable" = callPackage
@@ -175159,6 +186636,8 @@ self: {
        libraryHaskellDepends = [ base hxt template-haskell th-lift ];
        description = "A library for working with Open Data Tables";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openexchangerates" = callPackage
@@ -175265,6 +186744,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Functional interface for OpenGL 4.1+ and OpenGL ES 2.0+";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {EGL = null; GLESv2 = null;};
 
   "openid" = callPackage
@@ -175308,6 +186789,8 @@ self: {
        ];
        description = "An OpenID Connect library that does all the heavy lifting for you";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openpgp" = callPackage
@@ -175415,6 +186898,8 @@ self: {
        ];
        description = "Haskell OpenSoundControl utilities";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opensource" = callPackage
@@ -175456,6 +186941,8 @@ self: {
        ];
        description = "Fetch OpenSSH keys from a GitHub team";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openssh-protocol" = callPackage
@@ -175472,6 +186959,8 @@ self: {
        testHaskellDepends = [ base cereal hedgehog time ];
        description = "Haskell implementation of openssh protocol primitives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openssl-createkey" = callPackage
@@ -175565,6 +187054,8 @@ self: {
          base http-client http-types opentelemetry text
        ];
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opentelemetry-lightstep" = callPackage
@@ -175671,6 +187162,8 @@ self: {
        ];
        description = "Unicode characters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opentheory-divides" = callPackage
@@ -175836,6 +187329,8 @@ self: {
        ];
        description = "An OpenTok SDK for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opentype" = callPackage
@@ -175853,6 +187348,8 @@ self: {
        ];
        description = "Opentype loading and writing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openweathermap" = callPackage
@@ -175875,6 +187372,8 @@ self: {
        ];
        description = "Access data at OpenWeatherMap";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "operate-do" = callPackage
@@ -175891,6 +187390,8 @@ self: {
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "operational" = callPackage
@@ -175943,6 +187444,8 @@ self: {
        ];
        description = "Interpretation functions and simple instruction sets for operational";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oplang" = callPackage
@@ -175961,6 +187464,8 @@ self: {
        ];
        description = "Compiler for OpLang, an esoteric programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opml" = callPackage
@@ -176018,6 +187523,8 @@ self: {
        ];
        description = "Open files or URLs using associated programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optics" = callPackage
@@ -176129,6 +187636,8 @@ self: {
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optima-for-hasql" = callPackage
@@ -176144,6 +187653,8 @@ self: {
        ];
        description = "Command-line arguments parsing for Hasql";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optimal-blocks" = callPackage
@@ -176168,6 +187679,8 @@ self: {
        ];
        description = "Optimal Block boundary determination for rsync-like behaviours";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optimization" = callPackage
@@ -176183,6 +187696,8 @@ self: {
        ];
        description = "Numerical optimization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optimusprime" = callPackage
@@ -176201,6 +187716,8 @@ self: {
        ];
        description = "A supercompiler for f-lite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "option" = callPackage
@@ -176226,6 +187743,8 @@ self: {
        ];
        description = "Using type-classes for optional function arguments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optional-args" = callPackage
@@ -176267,6 +187786,8 @@ self: {
        testHaskellDepends = [ base chell options time ];
        description = "Command-line option types for dates and times";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optparse-applicative" = callPackage
@@ -176318,6 +187839,8 @@ self: {
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optparse-declarative" = callPackage
@@ -176343,6 +187866,8 @@ self: {
        ];
        description = "An enum-text based toolkit for optparse-applicative";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optparse-generic" = callPackage
@@ -176389,6 +187914,8 @@ self: {
        libraryHaskellDepends = [ base optparse-applicative ];
        description = "Helper functions for optparse-applicative";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optparse-simple" = callPackage
@@ -176467,6 +187994,8 @@ self: {
        ];
        description = "Orchestration-style co-ordination EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "orchestrate" = callPackage
@@ -176490,6 +188019,8 @@ self: {
        ];
        description = "An API client for http://orchestrate.io/.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "orchid" = callPackage
@@ -176510,6 +188041,8 @@ self: {
        ];
        description = "Haskell Wiki Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "orchid-demo" = callPackage
@@ -176529,6 +188062,8 @@ self: {
        ];
        description = "Haskell Wiki Demo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ord-adhoc" = callPackage
@@ -176556,6 +188091,8 @@ self: {
        ];
        description = "Algorithms for the order maintenance problem with a safe interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "order-statistic-tree" = callPackage
@@ -176588,6 +188125,8 @@ self: {
        ];
        description = "L-Estimators for robust statistics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ordered" = callPackage
@@ -176666,6 +188205,8 @@ self: {
        testHaskellDepends = [ base directory process split ];
        description = "Push-pull implementation of discrete-time FRP";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oref" = callPackage
@@ -176680,6 +188221,8 @@ self: {
        testHaskellDepends = [ base containers either mtl transformers ];
        description = "Owned references in the Ownership Monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "org-mode" = callPackage
@@ -176697,6 +188240,8 @@ self: {
        testHaskellDepends = [ base megaparsec tasty tasty-hunit text ];
        description = "Parser for Emacs org-mode files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "org-mode-lucid" = callPackage
@@ -176711,6 +188256,8 @@ self: {
        ];
        description = "Lucid integration for org-mode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "org2anki" = callPackage
@@ -176737,6 +188284,8 @@ self: {
        executableHaskellDepends = [ attoparsec base text ];
        description = "Organize scala imports";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "orgmode" = callPackage
@@ -176756,6 +188305,8 @@ self: {
        ];
        description = "Org Mode library for haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "orgmode-parse" = callPackage
@@ -176811,6 +188362,8 @@ self: {
        ];
        description = "Statistics visualizer for org-mode";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "origami" = callPackage
@@ -176829,6 +188382,8 @@ self: {
        ];
        description = "An un-SYB framework for transforming heterogenous data through folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "orion-hs" = callPackage
@@ -176869,6 +188424,8 @@ self: {
        testHaskellDepends = [ base hspec jwt mtl time ];
        description = "Token-based authentication and authorization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ormolu" = callPackage
@@ -176980,6 +188537,8 @@ self: {
        ];
        description = "A library to handle messages in the OSC protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oscpacking" = callPackage
@@ -176991,6 +188550,8 @@ self: {
        libraryHaskellDepends = [ base colour gloss random ];
        description = "Implements an osculatory packing (kissing circles) algorithm and display";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "osdkeys" = callPackage
@@ -177026,6 +188587,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "An insertion-order-preserving set";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "osm-conduit" = callPackage
@@ -177045,6 +188608,8 @@ self: {
        ];
        description = "Parse and operate on OSM data in efficient way";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "osm-download" = callPackage
@@ -177066,6 +188631,8 @@ self: {
        ];
        description = "Download Open Street Map tiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oso2pdf" = callPackage
@@ -177084,6 +188651,8 @@ self: {
        ];
        description = "Better conversion of Oxford Scholarship Online material to PDF";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "osx-ar" = callPackage
@@ -177096,6 +188665,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for OS X static archive format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ot" = callPackage
@@ -177116,6 +188687,8 @@ self: {
        ];
        description = "Real-time collaborative editing with Operational Transformation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "otp-authenticator" = callPackage
@@ -177141,6 +188714,8 @@ self: {
        ];
        description = "OTP Authenticator (a la google) command line client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ottparse-pretty" = callPackage
@@ -177158,6 +188733,8 @@ self: {
        ];
        description = "Pretty-printer for Ott parse trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "outsort" = callPackage
@@ -177234,6 +188811,8 @@ self: {
        doHaddock = false;
        description = "Overloaded pragmas as a plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "overloaded-records" = callPackage
@@ -177255,6 +188834,8 @@ self: {
        ];
        description = "Overloaded Records based on current GHC proposal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "overture" = callPackage
@@ -177268,6 +188849,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "An alternative to some of the Prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pack" = callPackage
@@ -177283,6 +188866,8 @@ self: {
        ];
        description = "Bidirectional fast ByteString packer/unpacker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "package-description-remote" = callPackage
@@ -177297,6 +188882,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Fetches a 'GenericPackageDescription' from Hackage";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "package-o-tron" = callPackage
@@ -177315,6 +188902,8 @@ self: {
        ];
        description = "Utilities for working with cabal packages and your package database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "package-vt" = callPackage
@@ -177330,6 +188919,8 @@ self: {
        ];
        description = "Haskell Package Versioning Tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packcheck" = callPackage
@@ -177383,6 +188974,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packed-dawg" = callPackage
@@ -177410,6 +189003,8 @@ self: {
        ];
        description = "Generation and traversal of highly compressed directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packed-multikey-map" = callPackage
@@ -177428,6 +189023,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Efficient “spreadsheet table” like maps with multiple marginals";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packedstring" = callPackage
@@ -177441,6 +189038,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "(Deprecated) Packed Strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packer" = callPackage
@@ -177475,6 +189074,8 @@ self: {
        ];
        description = "MessagePack Serialization an Deserialization for Packer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packman" = callPackage
@@ -177494,6 +189095,8 @@ self: {
        ];
        description = "Serialization library for GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packunused" = callPackage
@@ -177514,6 +189117,8 @@ self: {
        ];
        description = "Tool for detecting redundant Cabal package dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pacman-memcache" = callPackage
@@ -177527,6 +189132,8 @@ self: {
        executableHaskellDepends = [ base deepseq directory-tree ];
        description = "Read whole Pacman database which pushes it into the memory cache";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "padKONTROL" = callPackage
@@ -177542,6 +189149,8 @@ self: {
        ];
        description = "Controlling padKONTROL native mode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pads-haskell" = callPackage
@@ -177569,6 +189178,8 @@ self: {
        ];
        description = "PADS data description language for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pagarme" = callPackage
@@ -177587,6 +189198,8 @@ self: {
        executableHaskellDepends = [ base text wreq ];
        description = "Pagarme API wrapper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pager" = callPackage
@@ -177679,6 +189292,8 @@ self: {
        ];
        description = "Receive hooks from pagure and do things with them";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "paint" = callPackage
@@ -177720,6 +189335,8 @@ self: {
        ];
        description = "Bilinear pairings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "palette" = callPackage
@@ -177735,6 +189352,8 @@ self: {
        ];
        description = "Utilities for choosing and creating color schemes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "palindromes" = callPackage
@@ -177764,6 +189383,8 @@ self: {
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {pam = null;};
 
   "pan-os-syslog" = callPackage
@@ -177781,6 +189402,8 @@ self: {
        benchmarkHaskellDepends = [ base byteslice gauge primitive ];
        description = "Parse syslog traffic from PAN-OS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "panda" = callPackage
@@ -177801,6 +189424,8 @@ self: {
        ];
        description = "A simple static blog engine";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc" = callPackage
@@ -177946,6 +189571,8 @@ self: {
        ];
        description = "Pandoc filter for cross-references";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-csv2table" = callPackage
@@ -177961,6 +189588,8 @@ self: {
        executableHaskellDepends = [ base csv pandoc pandoc-types ];
        description = "Convert CSV to Pandoc Table Markdown";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-dhall-decoder" = callPackage
@@ -178016,6 +189645,8 @@ self: {
        ];
        description = "A Pandoc filter to use graphviz";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-highlighting-extensions" = callPackage
@@ -178052,6 +189683,8 @@ self: {
        doHaddock = false;
        description = "Include other Markdown files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-include-code" = callPackage
@@ -178076,6 +189709,8 @@ self: {
        ];
        description = "A Pandoc filter for including code from source files";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-japanese-filters" = callPackage
@@ -178095,6 +189730,8 @@ self: {
        ];
        description = "Japanese-specific markup filters for pandoc";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-lens" = callPackage
@@ -178106,6 +189743,8 @@ self: {
        libraryHaskellDepends = [ base containers lens pandoc-types text ];
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-markdown-ghci-filter" = callPackage
@@ -178131,6 +189770,8 @@ self: {
        ];
        description = "Pandoc-filter to evaluate `code` section in markdown and auto-embed output";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-placetable" = callPackage
@@ -178152,6 +189793,8 @@ self: {
        ];
        description = "Pandoc filter to include CSV files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-plantuml-diagrams" = callPackage
@@ -178175,6 +189818,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Render and insert PlantUML diagrams with Pandoc";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-plot" = callPackage
@@ -178239,6 +189884,8 @@ self: {
        ];
        description = "A Pandoc filter to include figures generated from Python code blocks";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-sidenote" = callPackage
@@ -178253,6 +189900,8 @@ self: {
        executableHaskellDepends = [ base pandoc-types ];
        description = "Convert Pandoc Markdown-style footnotes into sidenotes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-stylefrommeta" = callPackage
@@ -178317,6 +189966,8 @@ self: {
        executableHaskellDepends = [ base pandoc ];
        description = "Literate Haskell support for GitHub's Markdown flavor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-utils" = callPackage
@@ -178334,6 +189985,8 @@ self: {
        ];
        description = "Utility functions to work with Pandoc in Haskell applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-vimhl" = callPackage
@@ -178381,6 +190034,8 @@ self: {
        ];
        description = "A super-pang clone";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pango" = callPackage
@@ -178417,6 +190072,8 @@ self: {
        testHaskellDepends = [ base bytestring containers HUnit ];
        description = "A set of parsers for graph languages and conversions to graph libaries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "panhandle" = callPackage
@@ -178472,6 +190129,8 @@ self: {
        ];
        description = "Pandoc filter to execute code blocks";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pansite" = callPackage
@@ -178500,6 +190159,8 @@ self: {
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
        description = "Pansite: a simple web site management tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pantry" = callPackage
@@ -178637,6 +190298,8 @@ self: {
        ];
        description = "Content addressable Haskell package management";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa" = callPackage
@@ -178660,6 +190323,8 @@ self: {
        ];
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-base" = callPackage
@@ -178673,6 +190338,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-base-export" = callPackage
@@ -178684,6 +190351,8 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-base-implement" = callPackage
@@ -178695,6 +190364,8 @@ self: {
        libraryHaskellDepends = [ base papa-base-export semigroups ];
        description = "Useful base functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-bifunctors" = callPackage
@@ -178754,6 +190425,8 @@ self: {
        ];
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-implement" = callPackage
@@ -178775,6 +190448,8 @@ self: {
        ];
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-include" = callPackage
@@ -178791,6 +190466,8 @@ self: {
        ];
        description = "Third party libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-lens" = callPackage
@@ -178842,6 +190519,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-prelude-core" = callPackage
@@ -178858,6 +190537,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-prelude-lens" = callPackage
@@ -178874,6 +190555,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-prelude-semigroupoids" = callPackage
@@ -178890,6 +190573,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-prelude-semigroups" = callPackage
@@ -178906,6 +190591,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-semigroupoids" = callPackage
@@ -178921,6 +190608,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-semigroupoids-export" = callPackage
@@ -178943,6 +190632,8 @@ self: {
        libraryHaskellDepends = [ base semigroupoids semigroups ];
        description = "useful `semigroupoids` functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-x" = callPackage
@@ -178989,6 +190680,8 @@ self: {
        executableHaskellDepends = [ base bytestring containers ];
        description = "A passphrase generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papillon" = callPackage
@@ -179009,6 +190702,8 @@ self: {
        ];
        description = "packrat parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pappy" = callPackage
@@ -179022,6 +190717,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Packrat parsing; linear-time parsers for grammars in TDPL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "paprika" = callPackage
@@ -179044,6 +190741,8 @@ self: {
        ];
        description = "The Haskell library and examples for the kids programming robot paprika";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "par-dual" = callPackage
@@ -179060,6 +190759,8 @@ self: {
        ];
        description = "ParDual class for Parallel <-> Sequential";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "par-traverse" = callPackage
@@ -179109,6 +190810,8 @@ self: {
        executableToolDepends = [ alex ];
        description = "Paragon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parallel" = callPackage
@@ -179154,6 +190857,8 @@ self: {
          transformers vector vector-algorithms
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parallel-tree-search" = callPackage
@@ -179177,6 +190882,8 @@ self: {
        testHaskellDepends = [ base data-diverse hspec transformers ];
        description = "Parameterized/indexed monoids and monads using only a single parameter type variable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parameterized-data" = callPackage
@@ -179210,6 +190917,8 @@ self: {
        ];
        description = "Classes and data structures for working with data-kind indexed types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "paramtree" = callPackage
@@ -179253,6 +190962,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "http proxy server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parco" = callPackage
@@ -179264,6 +190975,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised parser combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parco-attoparsec" = callPackage
@@ -179275,6 +190988,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base mtl parco ];
        description = "Generalised parser combinators - Attoparsec interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parco-parsec" = callPackage
@@ -179286,6 +191001,8 @@ self: {
        libraryHaskellDepends = [ base mtl parco parsec ];
        description = "Generalised parser combinators - Parsec interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parcom-lib" = callPackage
@@ -179301,6 +191018,8 @@ self: {
        ];
        description = "A simple parser-combinator library, a bit like Parsec but without the frills";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parconc-examples" = callPackage
@@ -179329,6 +191048,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pareto" = callPackage
@@ -179340,6 +191061,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for cause-effect relationships";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "paripari" = callPackage
@@ -179399,6 +191122,8 @@ self: {
        ];
        description = "Streaming Parquet reader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parse-dimacs" = callPackage
@@ -179446,6 +191171,8 @@ self: {
        testHaskellDepends = [ cmdargs ];
        description = "generate command line arguments from a --help output";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parseargs" = callPackage
@@ -179461,6 +191188,8 @@ self: {
        testHaskellDepends = [ base process ];
        description = "Parse command-line arguments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec_3_1_14_0" = callPackage
@@ -179517,6 +191246,8 @@ self: {
        ];
        description = "Parsec API encoded as a deeply-embedded DSL, for debugging and analysis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec-numbers" = callPackage
@@ -179560,6 +191291,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Parsing instances for Parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec-permutation" = callPackage
@@ -179586,6 +191319,8 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec pretty ];
        description = "Pratt Parser combinator for Parsec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec-tagsoup" = callPackage
@@ -179641,6 +191376,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec3" = callPackage
@@ -179652,6 +191389,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl text ];
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec3-numbers" = callPackage
@@ -179686,6 +191425,8 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Adds and Eq instance for Parsec's ParseError if needed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsek" = callPackage
@@ -179707,6 +191448,8 @@ self: {
        sha256 = "16sg32qs1kq184wk6d83z20b9firh1kjmysqwd2aqaiyq37zjyyb";
        libraryHaskellDepends = [ base mtl parsec ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parser-combinators" = callPackage
@@ -179740,6 +191483,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Test suite of parser-combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parser-helper" = callPackage
@@ -179755,6 +191500,8 @@ self: {
        ];
        description = "Prints Haskell parse trees in JSON";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parser241" = callPackage
@@ -179769,6 +191516,8 @@ self: {
        testHaskellDepends = [ base containers hspec mtl ];
        description = "An interface to create production rules using augmented grammars";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsergen" = callPackage
@@ -179790,6 +191539,8 @@ self: {
        ];
        description = "TH parser generator for splitting bytestring into fixed-width fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsers" = callPackage
@@ -179828,6 +191579,8 @@ self: {
        ];
        description = "`parsers` instances for Megaparsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsestar" = callPackage
@@ -179851,6 +191604,8 @@ self: {
        ];
        description = "NMR-STAR file format parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsimony" = callPackage
@@ -179862,6 +191617,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        description = "Monadic parser combinators derived from Parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsix" = callPackage
@@ -179900,6 +191657,8 @@ self: {
        testHaskellDepends = [ base containers HUnit tasty tasty-hunit ];
        description = "Parsing factorized";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "partial" = callPackage
@@ -179948,6 +191707,8 @@ self: {
        ];
        description = "Haskell 98 Partial Lenses";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "partial-order" = callPackage
@@ -179976,6 +191737,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell transformers ];
        description = "Template haskell utilities for constructing records with default values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "partial-semigroup" = callPackage
@@ -180045,6 +191808,8 @@ self: {
        ];
        description = "Inspect, create, and alter MBRs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "passage" = callPackage
@@ -180063,6 +191828,8 @@ self: {
        ];
        description = "Parallel code generation for hierarchical Bayesian modeling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "passman" = callPackage
@@ -180089,6 +191856,8 @@ self: {
        ];
        description = "a simple password manager";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "passman-cli" = callPackage
@@ -180195,6 +191964,8 @@ self: {
        libraryHaskellDepends = [ base containers MonadRandom random ];
        description = "Password generation/validation library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pasta" = callPackage
@@ -180211,6 +191982,8 @@ self: {
        testHaskellDepends = [ base hspec microlens protolude ];
        description = "PostgreSQL Abstract Syntax Tree Assember";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pastis" = callPackage
@@ -180222,6 +191995,8 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Interface to the past.is URL shortening service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pasty" = callPackage
@@ -180235,6 +192010,8 @@ self: {
        executableHaskellDepends = [ base bytestring mtl ];
        description = "A simple command line pasting utility";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "patat" = callPackage
@@ -180263,6 +192040,8 @@ self: {
        ];
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "patch" = callPackage
@@ -180339,6 +192118,8 @@ self: {
        ];
        description = "Patches (diffs) on vectors: composable, mergeable, and invertible";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "path" = callPackage
@@ -180535,6 +192316,8 @@ self: {
        ];
        description = "A toy pathfinding library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pathological-bytestrings" = callPackage
@@ -180619,6 +192402,8 @@ self: {
        executableHaskellDepends = [ base HandsomeSoup hxt ];
        description = "A webpage scraper for Patreon which dumps a list of patrons to a text file";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pattern-arrows" = callPackage
@@ -180682,6 +192467,8 @@ self: {
        ];
        description = "Common patterns in message-oriented applications";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pava" = callPackage
@@ -180734,6 +192521,8 @@ self: {
        ];
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "paypal-api" = callPackage
@@ -180750,6 +192539,8 @@ self: {
        ];
        description = "PayPal API, currently supporting \"ButtonManager\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "paypal-rest-client" = callPackage
@@ -180766,6 +192557,8 @@ self: {
        ];
        description = "A client to connect to PayPal's REST API (v1)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pb" = callPackage
@@ -180781,6 +192574,8 @@ self: {
        ];
        description = "pastebin command line application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pb-next" = callPackage
@@ -180800,6 +192595,8 @@ self: {
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Utility CLI for working with protobuf files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pbc4hs" = callPackage
@@ -180811,6 +192608,8 @@ self: {
        libraryHaskellDepends = [ base hslua string-qq ];
        description = "pbc for HsLua";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pbkdf" = callPackage
@@ -180867,6 +192666,8 @@ self: {
        ];
        description = "Convert a pcap into an enumerator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcapng" = callPackage
@@ -180896,6 +192697,8 @@ self: {
          text unliftio-core validity
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcd-loader" = callPackage
@@ -180920,6 +192723,8 @@ self: {
        ];
        description = "PCD file loader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcf" = callPackage
@@ -180937,6 +192742,8 @@ self: {
        ];
        description = "A one file compiler for PCF";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcf-font" = callPackage
@@ -180951,6 +192758,8 @@ self: {
        ];
        description = "PCF font parsing and rendering library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcf-font-embed" = callPackage
@@ -180966,6 +192775,8 @@ self: {
        ];
        description = "Template Haskell for embedding text rendered using PCF fonts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcg-random" = callPackage
@@ -181070,6 +192881,8 @@ self: {
        libraryHaskellDepends = [ base bytestring pcre-light ];
        description = "pcre-light extra functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcre-utils" = callPackage
@@ -181111,6 +192924,8 @@ self: {
        ];
        description = "Tool to generate PDF from haskintex templates and YAML input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdf-slave-server" = callPackage
@@ -181161,6 +192976,8 @@ self: {
        ];
        description = "Template format definition for pdf-slave tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdf-toolbox-content" = callPackage
@@ -181177,6 +192994,8 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdf-toolbox-core" = callPackage
@@ -181193,6 +193012,8 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdf-toolbox-document" = callPackage
@@ -181211,6 +193032,8 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdf-toolbox-viewer" = callPackage
@@ -181231,6 +193054,8 @@ self: {
        ];
        description = "Simple pdf viewer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdf2line" = callPackage
@@ -181280,6 +193105,8 @@ self: {
        ];
        description = "Name a PDF file using information from the pdfinfo command";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdfsplit" = callPackage
@@ -181295,6 +193122,8 @@ self: {
        ];
        description = "split two-column PDFs, so there is one column per page";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdftotext" = callPackage
@@ -181316,6 +193145,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Extracts text from PDF using poppler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {poppler-cpp = null;};
 
   "pdynload" = callPackage
@@ -181332,6 +193163,8 @@ self: {
        ];
        description = "pdynload is polymorphic dynamic linking library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peakachu" = callPackage
@@ -181347,6 +193180,8 @@ self: {
        ];
        description = "Experiemental library for composable interactive programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peano" = callPackage
@@ -181396,6 +193231,8 @@ self: {
        ];
        description = "pec embedded compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pecoff" = callPackage
@@ -181408,6 +193245,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for PE/COFF format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pedersen-commitment" = callPackage
@@ -181428,6 +193267,8 @@ self: {
        ];
        description = "An implementation of Pedersen commitment schemes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pedestrian-dag" = callPackage
@@ -181441,6 +193282,8 @@ self: {
        libraryHaskellDepends = [ array base binary containers ];
        description = "A pedestrian implementation of directed acyclic graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peg" = callPackage
@@ -181458,6 +193301,8 @@ self: {
        ];
        description = "a lazy non-deterministic concatenative programming language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peggy" = callPackage
@@ -181476,6 +193321,8 @@ self: {
        ];
        description = "The Parser Generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pell" = callPackage
@@ -181493,6 +193340,8 @@ self: {
        ];
        description = "Package to solve the Generalized Pell Equation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pem" = callPackage
@@ -181534,6 +193383,8 @@ self: {
        ];
        description = "Static site generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "penn-treebank" = callPackage
@@ -181565,6 +193416,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Parser combinators for trees in the Penn Treebank format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "penny" = callPackage
@@ -181593,6 +193446,8 @@ self: {
        ];
        description = "Extensible double-entry accounting system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "penny-bin" = callPackage
@@ -181611,6 +193466,8 @@ self: {
        ];
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "penny-lib" = callPackage
@@ -181632,6 +193489,8 @@ self: {
        ];
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "penrose" = callPackage
@@ -181667,6 +193526,8 @@ self: {
        ];
        description = "Create beautiful diagrams just by typing mathematical notation in plain text";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peparser" = callPackage
@@ -181678,6 +193539,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring haskell98 ];
        description = "A parser for PE object files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "percent-encoder" = callPackage
@@ -181697,6 +193560,8 @@ self: {
        ];
        description = "Percent encode/decode ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "percent-format" = callPackage
@@ -181720,6 +193585,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The perceptron learning algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perceptual-hash" = callPackage
@@ -181747,6 +193614,8 @@ self: {
        benchmarkToolDepends = [ cpphs ];
        description = "Find duplicate images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perdure" = callPackage
@@ -181793,6 +193662,8 @@ self: {
        ];
        description = "Database migration support for use in other libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perf" = callPackage
@@ -181809,6 +193680,8 @@ self: {
        testHaskellDepends = [ base deepseq doctest rdtsc ];
        description = "Low-level run time measurement";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perf-analysis" = callPackage
@@ -181831,6 +193704,8 @@ self: {
        ];
        description = "analysis example using perf";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perfect-hash-generator" = callPackage
@@ -181909,6 +193784,8 @@ self: {
        ];
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perhaps" = callPackage
@@ -181926,6 +193803,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Perhaps, a monad";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "period" = callPackage
@@ -181962,6 +193841,8 @@ self: {
        testHaskellDepends = [ base cereal hedis hspec text time ];
        description = "A reliable at-least-once periodic job scheduler backed by redis";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "periodic-client" = callPackage
@@ -182059,6 +193940,8 @@ self: {
        ];
        description = "Periodic task system haskell server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perm" = callPackage
@@ -182075,6 +193958,8 @@ self: {
        ];
        description = "permutation Applicative and Monad with many mtl instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "permutation" = callPackage
@@ -182089,6 +193974,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim QuickCheck ];
        description = "A library for permutations and combinations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "permutations" = callPackage
@@ -182112,6 +193999,8 @@ self: {
        ];
        description = "Permutations of finite sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "permute" = callPackage
@@ -182123,6 +194012,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised permutation parser combinator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persist" = callPackage
@@ -182174,6 +194065,8 @@ self: {
        ];
        description = "Transforms persist's quasi-quoted syntax into ER format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistable-record" = callPackage
@@ -182300,6 +194193,8 @@ self: {
        ];
        description = "Parses a Persist Model file and produces Audit Models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-cereal" = callPackage
@@ -182311,6 +194206,8 @@ self: {
        libraryHaskellDepends = [ base cereal persistent text ];
        description = "Helper functions for writing Persistent instances";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-database-url" = callPackage
@@ -182330,6 +194227,8 @@ self: {
        ];
        description = "Parse DATABASE_URL into configuration types for Persistent";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-documentation" = callPackage
@@ -182361,6 +194260,8 @@ self: {
        libraryHaskellDepends = [ array base diffarray ];
        description = "Persistent equivalence relations (aka union-find)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-generic" = callPackage
@@ -182388,6 +194289,8 @@ self: {
        ];
        description = "Declare Persistent entities using SQL SELECT query syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-instances-iproute" = callPackage
@@ -182431,6 +194334,8 @@ self: {
        ];
        description = "A thread-safe (STM) persistency interface for finite map types";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-migration" = callPackage
@@ -182455,6 +194360,8 @@ self: {
        ];
        description = "Manual migrations for the persistent library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-mongoDB" = callPackage
@@ -182482,6 +194389,8 @@ self: {
        ];
        description = "Backend for the persistent library using mongoDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-mysql" = callPackage
@@ -182567,6 +194476,8 @@ self: {
        ];
        description = "A pure haskell backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-odbc" = callPackage
@@ -182697,6 +194608,8 @@ self: {
        ];
        description = "Template-Haskell helpers for integrating protobufs with persistent";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-qq" = callPackage
@@ -182730,6 +194643,8 @@ self: {
        libraryHaskellDepends = [ base time yesod ];
        description = "A library for rate limiting activities with a persistent backend";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-redis" = callPackage
@@ -182789,6 +194704,8 @@ self: {
        ];
        description = "relational-record on persisten backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-spatial" = callPackage
@@ -182955,6 +194872,8 @@ self: {
        ];
        description = "Generate classy lens field accessors for persistent models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-test" = callPackage
@@ -182978,6 +194897,8 @@ self: {
        ];
        description = "Tests for Persistent";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-typed-db" = callPackage
@@ -183019,6 +194940,8 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
        description = "A persistent sequence based on array mapped tries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-zookeeper" = callPackage
@@ -183048,6 +194971,8 @@ self: {
        ];
        description = "Backend for persistent library using Zookeeper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persona" = callPackage
@@ -183064,6 +194989,8 @@ self: {
        ];
        description = "Persona (BrowserID) library";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persona-idp" = callPackage
@@ -183085,6 +195012,8 @@ self: {
        ];
        description = "Persona (BrowserID) Identity Provider";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pesca" = callPackage
@@ -183099,6 +195028,8 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Proof Editor for Sequent Calculus";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peyotls" = callPackage
@@ -183125,6 +195056,8 @@ self: {
        ];
        description = "Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peyotls-codec" = callPackage
@@ -183142,6 +195075,8 @@ self: {
        ];
        description = "Codec parts of Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pez" = callPackage
@@ -183158,6 +195093,8 @@ self: {
        ];
        description = "A Pretty Extraordinary Zipper library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pg-harness" = callPackage
@@ -183177,6 +195114,8 @@ self: {
        ];
        description = "REST service and library for creating/consuming temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pg-harness-client" = callPackage
@@ -183207,6 +195146,8 @@ self: {
        ];
        description = "REST service for creating temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pg-recorder" = callPackage
@@ -183232,6 +195173,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pg-store" = callPackage
@@ -183255,6 +195198,8 @@ self: {
        ];
        description = "Simple storage interface to PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pg-transact" = callPackage
@@ -183276,6 +195221,8 @@ self: {
        ];
        description = "A postgresql-simple transaction monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pgdl" = callPackage
@@ -183301,6 +195248,8 @@ self: {
        ];
        description = "browse directory listing webpages and download files from them";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pgf2" = callPackage
@@ -183313,6 +195262,8 @@ self: {
        librarySystemDepends = [ gu pgf ];
        description = "Bindings to the C version of the PGF runtime";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gu = null; inherit (pkgs) pgf;};
 
   "pgm" = callPackage
@@ -183360,6 +195311,8 @@ self: {
        ];
        description = "A mid-level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pgstream" = callPackage
@@ -183384,6 +195337,8 @@ self: {
        ];
        description = "Streaming Postgres bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phantom-state" = callPackage
@@ -183410,6 +195365,8 @@ self: {
        ];
        description = "Freezing, thawing, and copy elision";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phaser" = callPackage
@@ -183424,6 +195381,8 @@ self: {
        ];
        description = "Incremental multiple pass parser library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phash" = callPackage
@@ -183481,6 +195440,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Deprecated - ghci debug viewer with simple editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phoityne-vscode" = callPackage
@@ -183531,6 +195492,8 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "Haskell bindings to the libphonenumber library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {phonenumber = null; inherit (pkgs) protobuf;};
 
   "phone-push" = callPackage
@@ -183548,6 +195511,8 @@ self: {
        ];
        description = "Push notifications for Android and iOS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phonetic-code" = callPackage
@@ -183647,8 +195612,8 @@ self: {
     ({ mkDerivation, base, subG, subG-instances, vector }:
      mkDerivation {
        pname = "phonetic-languages-permutations";
-       version = "0.1.1.0";
-       sha256 = "0vjpffazb4rbbf1pgv1phsm77g7rhwaw2np54b3hrrv2nsgakfxx";
+       version = "0.2.0.0";
+       sha256 = "1y6izwnlphy528y6j4qg97pzi4nkw7j8vnlp63brnil9wd5765wa";
        libraryHaskellDepends = [ base subG subG-instances vector ];
        description = "Commonly used versions of the phonetic-languages-common package";
        license = stdenv.lib.licenses.mit;
@@ -183707,8 +195672,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-common";
-       version = "0.1.0.0";
-       sha256 = "09nbg9v02mg8pl6hj48m1630z64fhmnr248j00akn8hn9npkas5l";
+       version = "0.2.0.0";
+       sha256 = "0yksj6zinpyj1a61gikdkyh6f5xiqjlk66yywip3hgfigg809k8g";
        libraryHaskellDepends = [
          base phonetic-languages-permutations subG subG-instances vector
        ];
@@ -183751,6 +195716,8 @@ self: {
        ];
        description = "Functional user interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "photoname" = callPackage
@@ -183772,6 +195739,8 @@ self: {
        ];
        description = "Rename photo image files based on EXIF shoot date";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phraskell" = callPackage
@@ -183785,6 +195754,8 @@ self: {
        executableHaskellDepends = [ base mtl SDL transformers ];
        description = "A fractal viewer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phybin" = callPackage
@@ -183817,6 +195788,8 @@ self: {
        ];
        description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "physics" = callPackage
@@ -183848,6 +195821,8 @@ self: {
        ];
        description = "Applied pi-calculus interpreter";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pi-forall" = callPackage
@@ -183871,6 +195846,8 @@ self: {
        ];
        description = "Demo implementation of typechecker for dependently-typed language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pi-hoole" = callPackage
@@ -183896,6 +195873,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Lightweight access control solution for the pijul vcs";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pi-lcd" = callPackage
@@ -183937,6 +195916,8 @@ self: {
        ];
        description = "Set up port forwarding with the Private Internet Access VPN service";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pianola" = callPackage
@@ -183959,6 +195940,8 @@ self: {
        ];
        description = "Remotely controlling Java Swing applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "picedit" = callPackage
@@ -183973,6 +195956,8 @@ self: {
        executableHaskellDepends = [ base cli hmatrix ];
        description = "simple image manipulation functions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pickle" = callPackage
@@ -183984,6 +195969,8 @@ self: {
        libraryHaskellDepends = [ base containers network stm text ];
        description = "Instant StatsD in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "picologic" = callPackage
@@ -184006,6 +195993,8 @@ self: {
        ];
        description = "Utilities for symbolic predicate logic expressions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "picoparsec" = callPackage
@@ -184038,6 +196027,8 @@ self: {
        ];
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "picosat" = callPackage
@@ -184063,6 +196054,8 @@ self: {
        executableHaskellDepends = [ base matrix transformers xml ];
        description = "Converts a svg image to tikz code";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pid1" = callPackage
@@ -184110,6 +196103,8 @@ self: {
        ];
        description = "Yet another Haskell build system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pier-core" = callPackage
@@ -184129,6 +196124,8 @@ self: {
        ];
        description = "A library for writing forwards-declared build systems in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "piet" = callPackage
@@ -184142,6 +196139,8 @@ self: {
        libraryHaskellDepends = [ array base containers Imlib mtl ];
        description = "A Piet interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pig" = callPackage
@@ -184158,6 +196157,8 @@ self: {
        ];
        description = "dice game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "piki" = callPackage
@@ -184196,6 +196197,8 @@ self: {
        ];
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pinboard-notes-backup" = callPackage
@@ -184216,6 +196219,8 @@ self: {
        ];
        description = "Back up the notes you've saved to Pinboard";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pinch" = callPackage
@@ -184241,6 +196246,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pinchot" = callPackage
@@ -184259,6 +196266,8 @@ self: {
        ];
        description = "Write grammars, not parsers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pine" = callPackage
@@ -184300,6 +196309,8 @@ self: {
        ];
        description = "icmp echo requests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ping-parser-attoparsec" = callPackage
@@ -184378,6 +196389,8 @@ self: {
        testHaskellDepends = [ base doctest protolude ];
        description = "A gateway for various cloud notification services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipe-enumerator" = callPackage
@@ -184389,6 +196402,8 @@ self: {
        libraryHaskellDepends = [ base enumerator pipes transformers ];
        description = "A bidirectional bridge between pipes and iteratees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipeclip" = callPackage
@@ -184496,6 +196511,8 @@ self: {
        ];
        description = "A higher-level interface to using concurrency with pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-attoparsec" = callPackage
@@ -184535,6 +196552,8 @@ self: {
        ];
        description = "Streaming parsing in the pipes-core framework with Attoparsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-bgzf" = callPackage
@@ -184550,6 +196569,8 @@ self: {
        ];
        description = "Blocked GZip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-binary" = callPackage
@@ -184603,6 +196624,8 @@ self: {
        ];
        description = "Brotli (RFC7932) compressors and decompressors for the Pipes package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-bytestring" = callPackage
@@ -184658,6 +196681,8 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Pipes for Noise-secured network connections";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-category" = callPackage
@@ -184733,6 +196758,8 @@ self: {
        ];
        description = "Encode and decode binary streams using the pipes and cereal libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-cereal-plus" = callPackage
@@ -184748,6 +196775,8 @@ self: {
        ];
        description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-cliff" = callPackage
@@ -184794,6 +196823,8 @@ self: {
        libraryHaskellDepends = [ base conduit mtl pipes-core ];
        description = "Conduit adapters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-core" = callPackage
@@ -184809,6 +196840,8 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-courier" = callPackage
@@ -184820,6 +196853,8 @@ self: {
        libraryHaskellDepends = [ base courier pipes ];
        description = "Pipes utilities for interfacing with the courier message-passing framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-csv" = callPackage
@@ -184852,6 +196887,8 @@ self: {
        libraryHaskellDepends = [ base errors pipes ];
        description = "Integration between pipes and errors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-extra" = callPackage
@@ -184879,6 +196916,8 @@ self: {
        ];
        description = "Various basic utilities for Pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-extras" = callPackage
@@ -184939,6 +196978,8 @@ self: {
        ];
        description = "Fast traversal of directory trees using pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-fluid" = callPackage
@@ -185011,6 +197052,8 @@ self: {
        ];
        description = "Illumina NGS data processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-interleave" = callPackage
@@ -185038,6 +197081,8 @@ self: {
        testHaskellDepends = [ base hspec pipes ];
        description = "Stateful IO streams based on pipes";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-kafka" = callPackage
@@ -185078,6 +197123,8 @@ self: {
        ];
        description = "Streaming processing of CSV files preceded by key-value pairs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-lines" = callPackage
@@ -185145,6 +197192,8 @@ self: {
        testHaskellDepends = [ base monad-control mongoDB pipes text ];
        description = "Stream results from MongoDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-network" = callPackage
@@ -185220,6 +197269,8 @@ self: {
        ];
        description = "P2P network nodes with pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-p2p-examples" = callPackage
@@ -185238,6 +197289,8 @@ self: {
        ];
        description = "Examples using pipes-p2p";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-parse" = callPackage
@@ -185288,6 +197341,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Alternate Prelude for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-random" = callPackage
@@ -185313,6 +197368,8 @@ self: {
        executableHaskellDepends = [ base pipes time ];
        description = "A few pipes to control the timing of yields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-s3" = callPackage
@@ -185335,6 +197392,8 @@ self: {
        ];
        description = "A simple interface for streaming data to and from Amazon S3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-safe" = callPackage
@@ -185371,6 +197430,8 @@ self: {
        ];
        description = "Create proper Pipes from System.Process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-sqlite-simple" = callPackage
@@ -185384,6 +197445,8 @@ self: {
        ];
        description = "Functions that smash Pipes and sqlite-simple together";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-text" = callPackage
@@ -185401,6 +197464,8 @@ self: {
        ];
        description = "properly streaming text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-transduce" = callPackage
@@ -185424,6 +197489,8 @@ self: {
        ];
        description = "Interfacing pipes with foldl folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-vector" = callPackage
@@ -185439,6 +197506,8 @@ self: {
        ];
        description = "Various proxies for streaming data into vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-wai" = callPackage
@@ -185489,6 +197558,8 @@ self: {
        ];
        description = "Pipes integration for ZeroMQ messaging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-zlib" = callPackage
@@ -185528,6 +197599,8 @@ self: {
        ];
        description = "A dependently typed core language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pit" = callPackage
@@ -185550,6 +197623,8 @@ self: {
        ];
        description = "Account management tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pitchtrack" = callPackage
@@ -185570,6 +197645,8 @@ self: {
        ];
        description = "Pitch tracking library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pivotal-tracker" = callPackage
@@ -185593,6 +197670,8 @@ self: {
        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;
+       broken = true;
      }) {};
 
   "pixela" = callPackage
@@ -185637,6 +197716,8 @@ self: {
        ];
        description = "A library and application for generating pixelated avatars";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "piyo" = callPackage
@@ -185693,6 +197774,8 @@ self: {
        ];
        description = "PKCS#10 library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pkcs7" = callPackage
@@ -185705,6 +197788,8 @@ self: {
        testHaskellDepends = [ base bytestring Cabal HUnit QuickCheck ];
        description = "PKCS #7 padding in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pkggraph" = callPackage
@@ -185718,6 +197803,8 @@ self: {
        executableHaskellDepends = [ base Cabal split ];
        description = "Package dependency graph for installed packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pkgtreediff" = callPackage
@@ -185737,6 +197824,8 @@ self: {
        ];
        description = "Package tree diff tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pktree" = callPackage
@@ -185802,6 +197891,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl time unix ];
        description = "plaimi's prelude";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plan-applicative" = callPackage
@@ -185822,6 +197913,8 @@ self: {
        ];
        description = "Applicative/Arrow for resource estimation and progress tracking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plan-b" = callPackage
@@ -185840,6 +197933,8 @@ self: {
        testHaskellDepends = [ base hspec path path-io ];
        description = "Failure-tolerant file and directory editing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "planar-graph" = callPackage
@@ -185856,6 +197951,8 @@ self: {
        ];
        description = "A representation of planar graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "planb-token-introspection" = callPackage
@@ -185879,6 +197976,8 @@ self: {
        ];
        description = "Token Introspection for PlanB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "planet-mitchell" = callPackage
@@ -185933,6 +198032,8 @@ self: {
        ];
        description = "Planet Mitchell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "planet-mitchell-test" = callPackage
@@ -185949,6 +198050,8 @@ self: {
        ];
        description = "Planet Mitchell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plankton" = callPackage
@@ -185960,6 +198063,8 @@ self: {
        libraryHaskellDepends = [ adjunctions base protolude ];
        description = "The core of a numeric prelude, taken from numhask";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plat" = callPackage
@@ -185973,6 +198078,8 @@ self: {
        ];
        description = "Simple templating library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "platinum-parsing" = callPackage
@@ -185996,6 +198103,8 @@ self: {
        testHaskellDepends = [ base containers fgl hspec vector ];
        description = "General Framework for compiler development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "playlists" = callPackage
@@ -186067,6 +198176,8 @@ self: {
        libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
        description = "Generate and parse Mac OS X property list format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plist-buddy" = callPackage
@@ -186090,6 +198201,8 @@ self: {
        ];
        description = "Remote monad for editing plists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plivo" = callPackage
@@ -186123,6 +198236,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative socketed ];
        description = "plot data from stdin through socketed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plot" = callPackage
@@ -186149,6 +198264,8 @@ self: {
        libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ];
        description = "GTK plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plot-gtk-ui" = callPackage
@@ -186165,6 +198282,8 @@ self: {
        ];
        description = "A quick way to use Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plot-gtk3" = callPackage
@@ -186178,6 +198297,8 @@ self: {
        ];
        description = "GTK3 plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plot-lab" = callPackage
@@ -186194,6 +198315,8 @@ self: {
        ];
        description = "A plotting tool with Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plot-light" = callPackage
@@ -186304,6 +198427,8 @@ self: {
        ];
        description = "Diagrams based plotting library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plotserver-api" = callPackage
@@ -186344,6 +198469,8 @@ self: {
        ];
        description = "Dynamic linking for Haskell and C objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plugins-auto" = callPackage
@@ -186360,6 +198487,8 @@ self: {
        testHaskellDepends = [ base directory process ];
        description = "Automatic recompilation and reloading of haskell modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plugins-multistage" = callPackage
@@ -186378,6 +198507,8 @@ self: {
        ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plumbers" = callPackage
@@ -186389,6 +198520,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Pointless plumbing combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plur" = callPackage
@@ -186401,6 +198534,8 @@ self: {
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "Plurality monad: Zero, one, or at least two";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plural" = callPackage
@@ -186413,6 +198548,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Pluralize";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ply-loader" = callPackage
@@ -186451,6 +198588,8 @@ self: {
        testHaskellDepends = [ base hspec mtl text unordered-containers ];
        description = "A front-end framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "png-file" = callPackage
@@ -186466,6 +198605,8 @@ self: {
        ];
        description = "read/write png file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pngload" = callPackage
@@ -186482,6 +198623,8 @@ self: {
        ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pngload-fixed" = callPackage
@@ -186494,6 +198637,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pnm" = callPackage
@@ -186520,6 +198665,8 @@ self: {
        ];
        description = "Bindings for the Pocket API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pocket-dns" = callPackage
@@ -186554,6 +198701,8 @@ self: {
        ];
        description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "point-octree" = callPackage
@@ -186572,6 +198721,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Point octree, with bounding boxes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pointed" = callPackage
@@ -186601,6 +198752,8 @@ self: {
        libraryHaskellDepends = [ base mtl semigroups transformers ];
        description = "Alternative done right";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pointedlist" = callPackage
@@ -186677,6 +198830,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pointful refactoring tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pointless-fun" = callPackage
@@ -186699,6 +198854,8 @@ self: {
        libraryHaskellDepends = [ base GHood process syb ];
        description = "Pointless Haskell library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pointless-lenses" = callPackage
@@ -186714,6 +198871,8 @@ self: {
        ];
        description = "Pointless Lenses library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pointless-rewrite" = callPackage
@@ -186729,6 +198888,8 @@ self: {
        ];
        description = "Pointless Rewrite library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "poke" = callPackage
@@ -186760,6 +198921,8 @@ self: {
        ];
        description = "Discord verification bot";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pokemon-go-protobuf-types" = callPackage
@@ -186776,6 +198939,8 @@ self: {
        ];
        description = "Haskell types for the Pokemon Go protobuf protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "poker-eval" = callPackage
@@ -186788,6 +198953,8 @@ self: {
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {poker-eval = null;};
 
   "pokitdok" = callPackage
@@ -186805,6 +198972,8 @@ self: {
        ];
        description = "PokitDok Platform API Client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polar" = callPackage
@@ -186828,6 +198997,8 @@ self: {
        testHaskellDepends = [ base containers HUnit MissingH mtl parsec ];
        description = "Fork of ConfigFile for Polar Game Engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polar-shader" = callPackage
@@ -186840,6 +199011,8 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "High-level shader compiler framework";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polh-lexicon" = callPackage
@@ -186858,6 +199031,8 @@ self: {
        ];
        description = "A library for manipulating the historical dictionary of Polish (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "policeman" = callPackage
@@ -186951,6 +199126,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Poly-kinded continuations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "poly-control" = callPackage
@@ -186962,6 +199139,8 @@ self: {
        libraryHaskellDepends = [ base lens ];
        description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "poly-rec" = callPackage
@@ -187002,6 +199181,8 @@ self: {
        ];
        description = "Wrap together data and it's constraints";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polydata-core" = callPackage
@@ -187013,6 +199194,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Core data definitions for the \"polydata\" package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polymap" = callPackage
@@ -187070,6 +199253,8 @@ self: {
        ];
        description = "Polynomials";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polynomials-bernstein" = callPackage
@@ -187148,6 +199333,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Experimental, RandomFu effect and interpreters for polysemy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-chronos" = callPackage
@@ -187169,6 +199356,8 @@ self: {
        ];
        description = "Polysemy effect for chronos";
        license = "BSD-2-Clause-Patent";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-extra" = callPackage
@@ -187242,6 +199431,8 @@ self: {
        ];
        description = "Polysemy effect for http-client";
        license = "BSD-2-Clause-Patent";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-kvstore-jsonfile" = callPackage
@@ -187273,6 +199464,8 @@ self: {
        ];
        description = "Domain modelling algebra for polysemy";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-methodology-composite" = callPackage
@@ -187289,6 +199482,8 @@ self: {
        ];
        description = "Functions for using polysemy-methodology with composite";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-optics" = callPackage
@@ -187300,6 +199495,8 @@ self: {
        libraryHaskellDepends = [ base optics polysemy polysemy-zoo ];
        description = "Optics for Polysemy";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-path" = callPackage
@@ -187357,6 +199554,8 @@ self: {
        ];
        description = "Polysemy error tracking";
        license = "BSD-2-Clause-Patent";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-test" = callPackage
@@ -187380,6 +199579,8 @@ self: {
        ];
        description = "Polysemy effects for testing";
        license = "BSD-2-Clause-Patent";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-time" = callPackage
@@ -187403,6 +199604,8 @@ self: {
        ];
        description = "Polysemy effect for time";
        license = "BSD-2-Clause-Patent";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-video" = callPackage
@@ -187493,6 +199696,8 @@ self: {
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysoup" = callPackage
@@ -187517,6 +199722,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Typeable for polymorphic types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polytypeable-utils" = callPackage
@@ -187528,6 +199735,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 polytypeable ];
        description = "Utilities for polytypeable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polyvariadic" = callPackage
@@ -187585,6 +199794,8 @@ self: {
        ];
        description = "pomodoro timer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pomohoro" = callPackage
@@ -187608,6 +199819,8 @@ self: {
        testHaskellDepends = [ base hspec protolude ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ponder" = callPackage
@@ -187619,6 +199832,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "PEG parser combinator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pong-server" = callPackage
@@ -187636,6 +199851,8 @@ self: {
        testHaskellDepends = [ base hspec network QuickCheck ];
        description = "A simple embedded pingable server that runs in the background";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pontarius-mediaserver" = callPackage
@@ -187693,6 +199910,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "An XMPP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pontarius-xmpp-extras" = callPackage
@@ -187751,6 +199970,8 @@ self: {
        libraryHaskellDepends = [ base monad-control transformers ];
        description = "Thread-safe resource pools. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pool-conduit" = callPackage
@@ -187768,6 +199989,8 @@ self: {
        ];
        description = "Resource pool allocations via ResourceT. (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pooled-io" = callPackage
@@ -187798,6 +200021,8 @@ self: {
        libraryHaskellDepends = [ base mtl network ];
        description = "POP3 Client Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "popenhs" = callPackage
@@ -187810,6 +200035,8 @@ self: {
        libraryHaskellDepends = [ base directory haskell98 unix ];
        description = "popenhs is a popen-like library for Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "popkey" = callPackage
@@ -187851,6 +200078,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; 
          inherit (pkgs) pango; inherit (pkgs) poppler;};
 
@@ -187905,6 +200134,8 @@ self: {
        ];
        description = "Express portable, composable and reusable data tasks and pipelines";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "porcupine-http" = callPackage
@@ -187933,6 +200164,8 @@ self: {
        ];
        description = "A location accessor for porcupine to connect to HTTP sources/sinks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "porcupine-s3" = callPackage
@@ -187963,6 +200196,8 @@ self: {
        ];
        description = "A location accessor for porcupine to connect to AWS S3 sources/sinks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "porpoise" = callPackage
@@ -188034,6 +200269,8 @@ self: {
        testHaskellDepends = [ base containers hspec mtl QuickCheck text ];
        description = "DSL for configuring Gentoo portage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "portaudio" = callPackage
@@ -188064,6 +200301,8 @@ self: {
        ];
        description = "FreeBSD ports index search and analysis tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "porter" = callPackage
@@ -188086,6 +200325,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 unix ];
        description = "The Haskell Ports Library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ports-tools" = callPackage
@@ -188120,6 +200361,8 @@ self: {
        ];
        description = "Simple extensible library to run SQL file against PostgreSQL database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "poseidon-postgis" = callPackage
@@ -188140,6 +200383,8 @@ self: {
        ];
        description = "Extension of Poseidon library for Postgis (Spatial and Geographic objects for PostgreSQL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "positive" = callPackage
@@ -188168,6 +200413,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Experiment";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "posix-acl" = callPackage
@@ -188185,6 +200432,8 @@ self: {
        librarySystemDepends = [ acl ];
        description = "Support for Posix ACL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) acl;};
 
   "posix-api" = callPackage
@@ -188205,6 +200454,8 @@ self: {
        ];
        description = "posix bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) systemd;};
 
   "posix-error-codes" = callPackage
@@ -188282,6 +200533,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "POSIX Realtime functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "posix-socket" = callPackage
@@ -188322,6 +200575,8 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "Low-level wrapping of POSIX waitpid(2)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "posplyu" = callPackage
@@ -188383,6 +200638,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring HTTP ];
        description = "A library that gets postcode information from the uk-postcodes.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgres-embedded" = callPackage
@@ -188401,6 +200658,8 @@ self: {
        ];
        description = "Library for easily running embedded PostgreSQL server for tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgres-options" = callPackage
@@ -188428,6 +200687,8 @@ self: {
        libraryHaskellDepends = [ base bytestring postgresql-simple text ];
        description = "Create a temporary database that is deleted after performing some operation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgres-websockets" = callPackage
@@ -188460,6 +200721,8 @@ self: {
        ];
        description = "Middleware to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-binary" = callPackage
@@ -188636,6 +200899,8 @@ self: {
        ];
        description = "Utilities for streaming PostgreSQL LargeObjects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-named" = callPackage
@@ -188653,6 +200918,8 @@ self: {
        testHaskellDepends = [ base generics-sop hspec postgresql-simple ];
        description = "Generic deserialization of PostgreSQL rows based on column names";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-orm" = callPackage
@@ -188777,6 +201044,8 @@ self: {
        ];
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-schema" = callPackage
@@ -188877,6 +201146,8 @@ self: {
        ];
        description = "FFI-like bindings for PostgreSQL stored functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-simple-interpolate" = callPackage
@@ -188915,6 +201186,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec postgresql-simple ];
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-simple-named" = callPackage
@@ -188934,6 +201207,8 @@ self: {
        ];
        description = "Implementation of named parameters for `postgresql-simple` library";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-simple-opts" = callPackage
@@ -188982,6 +201257,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL backed queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-simple-sop" = callPackage
@@ -188993,6 +201270,8 @@ self: {
        libraryHaskellDepends = [ base generics-sop postgresql-simple ];
        description = "Generic functions for postgresql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-simple-typed" = callPackage
@@ -189009,6 +201288,8 @@ self: {
        ];
        description = "Typed extension for PostgreSQL simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-simple-url" = callPackage
@@ -189105,6 +201386,8 @@ self: {
        ];
        description = "postgresql-tx interfacing for use with postgresql-query";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-tx-simple" = callPackage
@@ -189136,6 +201419,8 @@ self: {
        ];
        description = "postgresql-tx interfacing for use with squeal-postgresql";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-typed" = callPackage
@@ -189180,6 +201465,8 @@ self: {
        ];
        description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgrest" = callPackage
@@ -189228,6 +201515,8 @@ self: {
        ];
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgrest-ws" = callPackage
@@ -189263,6 +201552,8 @@ self: {
        ];
        description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postie" = callPackage
@@ -189281,6 +201572,8 @@ self: {
        ];
        description = "SMTP server library to receive emails from within Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postmark" = callPackage
@@ -189299,6 +201592,8 @@ self: {
        ];
        description = "Library for postmarkapp.com HTTP Api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postmark-streams" = callPackage
@@ -189315,6 +201610,8 @@ self: {
        ];
        description = "Send email via Postmark using io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postmaster" = callPackage
@@ -189335,6 +201632,8 @@ self: {
        ];
        description = "Postmaster ESMTP Server";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potato-tool" = callPackage
@@ -189348,6 +201647,8 @@ self: {
        executableHaskellDepends = [ base binary bytestring split ];
        description = "Command line Dreamcast VMU filesystem toolset";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potoki" = callPackage
@@ -189359,6 +201660,8 @@ self: {
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potoki-cereal" = callPackage
@@ -189381,6 +201684,8 @@ self: {
        ];
        description = "Streaming serialization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potoki-conduit" = callPackage
@@ -189403,6 +201708,8 @@ self: {
        ];
        description = "Integration of \"potoki\" and \"conduit\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potoki-core" = callPackage
@@ -189430,6 +201737,8 @@ self: {
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Low-level components of \"potoki\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potoki-hasql" = callPackage
@@ -189445,6 +201754,8 @@ self: {
        ];
        description = "Integration of \"potoki\" and \"hasql\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potoki-zlib" = callPackage
@@ -189458,6 +201769,8 @@ self: {
        ];
        description = "Streaming ZLib decompression";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potrace" = callPackage
@@ -189487,6 +201800,8 @@ self: {
        libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ];
        description = "Potrace bindings for the diagrams library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "powermate" = callPackage
@@ -189501,6 +201816,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "bindings for Griffin PowerMate USB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "powerpc" = callPackage
@@ -189512,6 +201829,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Tools for PowerPC programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "powerqueue" = callPackage
@@ -189569,6 +201888,8 @@ self: {
        benchmarkSystemDepends = [ leveldb snappy ];
        description = "A high performance in memory and LevelDB backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;};
 
   "powerqueue-sqs" = callPackage
@@ -189582,6 +201903,8 @@ self: {
        ];
        description = "A Amazon SQS backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ppm" = callPackage
@@ -189604,6 +201927,8 @@ self: {
        libraryHaskellDepends = [ base boxes ];
        description = "A library for pretty printing Records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pptable" = callPackage
@@ -189638,6 +201963,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck random stm ];
        description = "Parallel batch driver for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pqueue" = callPackage
@@ -189665,6 +201992,8 @@ self: {
        ];
        description = "Fully encapsulated monad transformers with queuelike functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "practice-room" = callPackage
@@ -189683,6 +202012,8 @@ self: {
        ];
        description = "Practice Room";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "praglude" = callPackage
@@ -189703,6 +202034,8 @@ self: {
        ];
        description = "A pragmatic Prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pragmatic-show" = callPackage
@@ -189758,6 +202091,8 @@ self: {
        ];
        description = "Yet another prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "precis" = callPackage
@@ -189793,6 +202128,8 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Prelude replacement";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pred-set" = callPackage
@@ -189804,6 +202141,8 @@ self: {
        libraryHaskellDepends = [ base hashable hashtables HSet ];
        description = "Simple cached predicates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pred-trie" = callPackage
@@ -189832,6 +202171,8 @@ self: {
        ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "predicate-class" = callPackage
@@ -189843,6 +202184,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Helper class for passing context along a predicate value";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "predicate-transformers" = callPackage
@@ -189856,6 +202199,8 @@ self: {
        libraryHaskellDepends = [ adjunctions base deepseq lens mtl ];
        description = "A library for writing predicates and transformations over predicates in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "predicate-typed" = callPackage
@@ -189885,6 +202230,8 @@ self: {
        ];
        description = "Predicates, Refinement types and Dsl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "predicates" = callPackage
@@ -189928,6 +202275,8 @@ self: {
        ];
        description = "Evaluate and display trees of predicates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prednote-test" = callPackage
@@ -189950,6 +202299,8 @@ self: {
        ];
        description = "Tests and QuickCheck generators to accompany prednote";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prefetch" = callPackage
@@ -190013,6 +202364,8 @@ self: {
        ];
        description = "A library for building a prefork-style server quickly";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pregame" = callPackage
@@ -190032,6 +202385,8 @@ self: {
        ];
        description = "Prelude for applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "preliminaries" = callPackage
@@ -190053,6 +202408,8 @@ self: {
        ];
        description = "A larger alternative to the Prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prelude-compat" = callPackage
@@ -190097,6 +202454,8 @@ self: {
        libraryHaskellDepends = [ base comonad logict transformers ];
        description = "Another kind of alternate Prelude file";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prelude-plus" = callPackage
@@ -190110,6 +202469,8 @@ self: {
        libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prelude-prime" = callPackage
@@ -190173,6 +202534,8 @@ self: {
        ];
        description = "Preprocess Haskell Repositories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "preprocessor" = callPackage
@@ -190193,6 +202556,8 @@ self: {
        ];
        description = "Remove cpp annotations to get the source ready for static analysis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "preprocessor-tools" = callPackage
@@ -190233,6 +202598,8 @@ self: {
        testToolDepends = [ alex happy ];
        description = "safe PostgreSQL queries using Quasiquoters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "presburger" = callPackage
@@ -190247,6 +202614,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "A decision procedure for quantifier-free linear arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "present" = callPackage
@@ -190258,6 +202627,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Make presentations for data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "press" = callPackage
@@ -190269,6 +202640,8 @@ self: {
        libraryHaskellDepends = [ base containers json mtl parsec ];
        description = "Text template library targeted at the web / HTML generation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "presto-hdbc" = callPackage
@@ -190288,6 +202661,8 @@ self: {
        ];
        description = "An HDBC connector for Presto";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prettify" = callPackage
@@ -190411,6 +202786,8 @@ self: {
        ];
        description = "Functionality for beautifying GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pretty-hex" = callPackage
@@ -190444,6 +202821,8 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "A implementation of multi-column layout w/ Text.PrettyPrint";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pretty-relative-time" = callPackage
@@ -190601,6 +202980,8 @@ self: {
        testHaskellDepends = [ base hspec tagged ];
        description = "A small pretty printing DSL for complex types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prettyFunctionComposing" = callPackage
@@ -190774,6 +203155,8 @@ self: {
        libraryHaskellDepends = [ base lucid prettyprinter text ];
        description = "A prettyprinter backend for lucid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prettyprinter-vty" = callPackage
@@ -190787,6 +203170,8 @@ self: {
        libraryHaskellDepends = [ base prettyprinter vty ];
        description = "prettyprinter backend for vty";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "preview" = callPackage
@@ -190802,6 +203187,8 @@ self: {
        ];
        description = "The method of previewing data (instead of wholly show-ing it)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prim" = callPackage
@@ -190826,6 +203213,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prim-instances" = callPackage
@@ -190838,6 +203227,8 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "Prim typeclass instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prim-ref" = callPackage
@@ -190849,6 +203240,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prim-spoon" = callPackage
@@ -190889,6 +203282,8 @@ self: {
        testHaskellDepends = [ base doctest template-haskell ];
        description = "Primeval world of Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primal-memory" = callPackage
@@ -190908,6 +203303,8 @@ self: {
        ];
        description = "Unified interface for memory managemenet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primes" = callPackage
@@ -190932,6 +203329,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion primes ];
        description = "Type-safe prime numbers";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primesieve" = callPackage
@@ -190989,6 +203388,8 @@ self: {
        testHaskellDepends = [ base primitive primitive-unlifted ];
        description = "Wrappers for primops around atomic operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-checked" = callPackage
@@ -191000,6 +203401,8 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "primitive functions with bounds-checking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-containers" = callPackage
@@ -191025,6 +203428,8 @@ self: {
        ];
        description = "containers backed by arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-convenience" = callPackage
@@ -191036,6 +203441,8 @@ self: {
        libraryHaskellDepends = [ primitive ];
        description = "convenience class for PrimMonad m/PrimState m";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-extras" = callPackage
@@ -191058,6 +203465,8 @@ self: {
        ];
        description = "Extras for the \"primitive\" library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-foreign" = callPackage
@@ -191070,6 +203479,8 @@ self: {
        testHaskellDepends = [ base primitive QuickCheck ];
        description = "using the `Prim` interface for the FFI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-indexed" = callPackage
@@ -191081,6 +203492,8 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base doctest QuickCheck ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-maybe" = callPackage
@@ -191098,6 +203511,8 @@ self: {
        ];
        description = "Arrays of Maybes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-offset" = callPackage
@@ -191123,6 +203538,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq random vector ];
        description = "SIMD data types and functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-sort" = callPackage
@@ -191144,6 +203561,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ];
        description = "Sort primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-stablename" = callPackage
@@ -191155,6 +203574,8 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "primitive operations on StableNames";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-unaligned" = callPackage
@@ -191208,6 +203629,8 @@ self: {
        ];
        description = "ImageBoard on Happstack and HSP";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primula-bot" = callPackage
@@ -191226,6 +203649,8 @@ self: {
        ];
        description = "Jabber-bot for primula-board ImageBoard";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pringletons" = callPackage
@@ -191242,6 +203667,8 @@ self: {
        ];
        description = "Classes and data structures complementing the singletons library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "print-console-colors" = callPackage
@@ -191267,6 +203694,8 @@ self: {
        libraryHaskellDepends = [ base split ];
        description = "Debug print formatting library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "print-info" = callPackage
@@ -191294,6 +203723,8 @@ self: {
        ];
        description = "Pretty printing with indentation, mixfix operators, and automatic line breaks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "printf-mauke" = callPackage
@@ -191335,6 +203766,8 @@ self: {
        ];
        description = "The Artist Formerly Known as Prints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "printxosd" = callPackage
@@ -191359,6 +203792,8 @@ self: {
        libraryHaskellDepends = [ base containers queue reord stateref ];
        description = "Simple implementation of a priority queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "priority-sync" = callPackage
@@ -191461,6 +203896,8 @@ self: {
        ];
        description = "Easy and reasonably efficient probabilistic programming and random generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proc" = callPackage
@@ -191479,6 +203916,8 @@ self: {
        ];
        description = "Parse process information for Linux";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proc-net" = callPackage
@@ -191529,6 +203968,8 @@ self: {
        ];
        description = "Conduits for processes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "process-extras" = callPackage
@@ -191564,6 +204005,8 @@ self: {
        ];
        description = "IterIO Process Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "process-leksah" = callPackage
@@ -191575,6 +204018,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath unix ];
        description = "Process libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "process-listlike" = callPackage
@@ -191591,6 +204036,8 @@ self: {
        ];
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "process-progress" = callPackage
@@ -191607,6 +204054,8 @@ self: {
        ];
        description = "Run a process and do reportsing on its progress";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "process-qq" = callPackage
@@ -191623,6 +204072,8 @@ self: {
        ];
        description = "Quasi-Quoters for exec process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "process-streaming" = callPackage
@@ -191654,6 +204105,8 @@ self: {
        ];
        description = "Streaming interface to system processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "processing" = callPackage
@@ -191672,6 +204125,8 @@ self: {
        ];
        description = "Web graphic applications with processing.js.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "processing-for-haskell" = callPackage
@@ -191699,6 +204154,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring process ];
        description = "C bindings for the gnu-extension functions process_vm_readv and process_vm_writev";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "processor-creative-kit" = callPackage
@@ -191737,6 +204194,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell values that cannot be evaluated immediately";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "procstat" = callPackage
@@ -191748,6 +204207,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "get information on processes in Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proctest" = callPackage
@@ -191783,6 +204244,8 @@ self: {
        ];
        description = "Simple streaming datatype";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "product" = callPackage
@@ -191840,6 +204303,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Generate flamegraphs from ghc RTS .prof files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prof2dot" = callPackage
@@ -191855,6 +204320,8 @@ self: {
        ];
        description = "Convert GHC profiles into GraphViz's dot format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prof2pretty" = callPackage
@@ -191873,6 +204340,8 @@ self: {
        ];
        description = "generate pretty source from time/allocation profiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "profiterole" = callPackage
@@ -191911,6 +204380,8 @@ self: {
        ];
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "profunctor-arrows" = callPackage
@@ -191961,6 +204432,8 @@ self: {
        ];
        description = "Monadic bidirectional programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "profunctor-optics" = callPackage
@@ -192030,6 +204503,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Simple progress tracking & projection library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "progress-meter" = callPackage
@@ -192041,6 +204516,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal async base stm ];
        description = "Live diagnostics for concurrent activity";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "progress-reporting" = callPackage
@@ -192054,6 +204531,8 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl time ];
        description = "Functionality for reporting function progress";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "progressbar" = callPackage
@@ -192067,6 +204546,8 @@ self: {
        libraryHaskellDepends = [ base io-reactive ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "progression" = callPackage
@@ -192083,6 +204564,8 @@ self: {
        ];
        description = "Automates the recording and graphing of criterion benchmarks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "progressive" = callPackage
@@ -192101,6 +204584,8 @@ self: {
        ];
        description = "Multilabel classification model which learns sequentially (online)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proj4-hs-bindings" = callPackage
@@ -192113,6 +204598,8 @@ self: {
        librarySystemDepends = [ proj ];
        description = "Haskell bindings for the Proj4 C dynamic library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) proj;};
 
   "project-m36" = callPackage
@@ -192184,6 +204671,8 @@ self: {
        ];
        description = "Relational Algebra Engine";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "project-template" = callPackage
@@ -192224,6 +204713,8 @@ self: {
        ];
        description = "Go to README.md";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "projection" = callPackage
@@ -192265,6 +204756,8 @@ self: {
        ];
        description = "Profunctor-based lightweight implementation of optics";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prolog" = callPackage
@@ -192298,6 +204791,8 @@ self: {
        ];
        description = "A command line tool to visualize query resolution in Prolog";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prolog-graph-lib" = callPackage
@@ -192334,6 +204829,8 @@ self: {
        ];
        description = "Better, more general Prelude exporting common utilities";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prolude" = callPackage
@@ -192353,6 +204850,8 @@ self: {
        ];
        description = "ITProTV's custom prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prometheus" = callPackage
@@ -192423,6 +204922,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Instrument applications with metrics and publish/push to Prometheus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prometheus-metrics-ghc" = callPackage
@@ -192486,6 +204987,8 @@ self: {
        libraryHaskellDepends = [ async base ];
        description = "A monadic interface for async";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "promises" = callPackage
@@ -192528,6 +205031,8 @@ self: {
        ];
        description = "A library for interfacing with the CMU Pronouncing Dictionary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proof-combinators" = callPackage
@@ -192539,6 +205044,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Proof Combinators used in Liquid Haskell for Theorem Proving";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "propane" = callPackage
@@ -192554,6 +205061,8 @@ self: {
        ];
        description = "Functional synthesis of images and animations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "propeller" = callPackage
@@ -192598,6 +205107,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "check quickCheck properties in real time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "property" = callPackage
@@ -192628,6 +205139,8 @@ self: {
        ];
        description = "Apple property list parser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proplang" = callPackage
@@ -192639,6 +205152,8 @@ self: {
        libraryHaskellDepends = [ base glade glib gtk ];
        description = "A library for functional GUI development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "props" = callPackage
@@ -192678,6 +205193,8 @@ self: {
        ];
        description = "A simple language for writing documents";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prosidyc" = callPackage
@@ -192694,6 +205211,8 @@ self: {
        ];
        description = "A DSL for processing Prosidy documents";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prospect" = callPackage
@@ -192729,6 +205248,8 @@ self: {
        ];
        description = "Bindings to the Prosper marketplace API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proteaaudio" = callPackage
@@ -192783,6 +205304,8 @@ self: {
        ];
        description = "neovim project manager";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proto-lens" = callPackage
@@ -192840,6 +205363,8 @@ self: {
        ];
        description = "Utilities functions to proto-lens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proto-lens-descriptors" = callPackage
@@ -192856,6 +205381,8 @@ self: {
        ];
        description = "Protocol buffers for describing the definitions of messages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proto-lens-jsonpb" = callPackage
@@ -192996,6 +205523,8 @@ self: {
        ];
        description = "A low level library for writing out data in the Protocol Buffers wire format";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proto3-wire" = callPackage
@@ -193087,6 +205616,8 @@ self: {
        ];
        description = "Protocol Buffers via C++";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "protobuf-simple" = callPackage
@@ -193123,6 +205654,8 @@ self: {
        libraryHaskellDepends = [ base freer-indexed singletons ];
        description = "Model distributed system as type-level multi-party protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "protocol-buffers" = callPackage
@@ -193172,6 +205705,8 @@ self: {
        ];
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "protocol-buffers-fork" = callPackage
@@ -193188,6 +205723,8 @@ self: {
        ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "protocol-radius" = callPackage
@@ -193254,6 +205791,8 @@ self: {
        ];
        description = "Protolude with lifted-base and lifted-async";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proton-haskell" = callPackage
@@ -193272,6 +205811,8 @@ self: {
        ];
        description = "Simple XML templating library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prototype" = callPackage
@@ -193283,6 +205824,8 @@ self: {
        libraryHaskellDepends = [ base monads-tf ];
        description = "prototype-based programming on Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prove-everywhere-server" = callPackage
@@ -193303,6 +205846,8 @@ self: {
        ];
        description = "The server for ProveEverywhere";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "provenience" = callPackage
@@ -193321,6 +205866,8 @@ self: {
        ];
        description = "Computations that automatically track data dependencies";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proxied" = callPackage
@@ -193354,6 +205901,8 @@ self: {
        libraryHaskellDepends = [ base tagged ];
        description = "A library for kind-polymorphic manipulation and inspection of Proxy values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proxy-mapping" = callPackage
@@ -193365,6 +205914,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mapping of Proxy Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "psc-ide" = callPackage
@@ -193394,6 +205945,8 @@ self: {
        ];
        description = "Language support for the PureScript programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pseudo-boolean" = callPackage
@@ -193418,6 +205971,8 @@ self: {
        ];
        description = "Reading/Writing OPB/WBO files used in pseudo boolean competition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pseudo-trie" = callPackage
@@ -193431,6 +205986,8 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "A tagged rose-tree with short circuited unique leaves";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pseudomacros" = callPackage
@@ -193568,6 +206125,8 @@ self: {
        benchmarkHaskellDepends = [ gauge rerebase ];
        description = "Pointer poking action construction and composition toolkit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pub" = callPackage
@@ -193637,6 +206196,8 @@ self: {
        testHaskellDepends = [ base cereal HUnit publicsuffixlist ];
        description = "Create the publicsuffixlist package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "publish" = callPackage
@@ -193664,6 +206225,8 @@ self: {
        ];
        description = "Publishing tools for papers, books, and presentations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pubnub" = callPackage
@@ -193696,6 +206259,8 @@ self: {
        ];
        description = "PubNub Haskell SDK";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pubsub" = callPackage
@@ -193714,6 +206279,8 @@ self: {
        executableHaskellDepends = [ fastcgi ];
        description = "A library for Google/SixApart pubsub hub interaction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "puffytools" = callPackage
@@ -193743,6 +206310,8 @@ self: {
        ];
        description = "A CLI assistant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pugixml" = callPackage
@@ -193759,6 +206328,8 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        description = "pugixml binding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pugs-DrIFT" = callPackage
@@ -193782,6 +206353,8 @@ self: {
        ];
        description = "DrIFT with pugs-specific rules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pugs-HsSyck" = callPackage
@@ -193814,6 +206387,8 @@ self: {
        ];
        description = "Portable Haskell/POSIX layer for Pugs";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pugs-hsregex" = callPackage
@@ -193825,6 +206400,8 @@ self: {
        libraryHaskellDepends = [ array base haskell98 ];
        description = "Haskell PCRE binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pulse" = callPackage
@@ -193880,6 +206457,8 @@ self: {
        ];
        description = "Multilingual unsupervised sentence tokenization with Punkt";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "punycode" = callPackage
@@ -193914,6 +206493,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "pure-cdb" = callPackage
@@ -193932,6 +206513,8 @@ self: {
        ];
        description = "Another pure-haskell CDB (Constant Database) implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pure-fft" = callPackage
@@ -193956,6 +206539,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Pure IO monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pure-priority-queue" = callPackage
@@ -193967,6 +206552,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A pure priority queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pure-priority-queue-tests" = callPackage
@@ -193985,6 +206572,8 @@ self: {
        ];
        description = "Tests for the pure-priority-queue package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pure-shuffle" = callPackage
@@ -194094,6 +206683,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simple Routing functions for Wai Applications";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "purescript" = callPackage
@@ -194166,6 +206757,8 @@ self: {
        doCheck = false;
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -194232,6 +206825,8 @@ self: {
        ];
        description = "Isomorphic trivial data type definitions over JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "purescript-tsd-gen" = callPackage
@@ -194254,6 +206849,8 @@ self: {
        ];
        description = "TypeScript Declaration File (.d.ts) generator for PureScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pursuit-client" = callPackage
@@ -194289,6 +206886,8 @@ self: {
        ];
        description = "Push notifications for Android and iOS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "push-notify" = callPackage
@@ -194312,6 +206911,8 @@ self: {
        ];
        description = "A server-side library for sending push notifications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "push-notify-apn" = callPackage
@@ -194337,6 +206938,8 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "Send push notifications to mobile iOS devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "push-notify-ccs" = callPackage
@@ -194356,6 +206959,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "push-notify-general" = callPackage
@@ -194374,6 +206979,8 @@ self: {
        ];
        description = "A general library for sending/receiving push notif. through dif. services.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pushbullet" = callPackage
@@ -194422,6 +207029,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A Pusher.com client written in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pusher-http-haskell" = callPackage
@@ -194462,6 +207071,8 @@ self: {
        ];
        description = "Implementation of the Pusher WebSocket protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pushme" = callPackage
@@ -194487,6 +207098,8 @@ self: {
        ];
        description = "Tool to synchronize directories with rsync, zfs or git-annex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pushover" = callPackage
@@ -194523,6 +207136,8 @@ self: {
        ];
        description = "Put-based lens library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "puzzle-draw" = callPackage
@@ -194554,6 +207169,8 @@ self: {
        ];
        description = "Creating graphics for pencil puzzles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "puzzle-draw-cmdline" = callPackage
@@ -194572,6 +207189,8 @@ self: {
        ];
        description = "Creating graphics for pencil puzzles, command line tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pvar" = callPackage
@@ -194609,6 +207228,8 @@ self: {
        executableSystemDepends = [ libdevil ];
        description = "A photo viewer daemon application with remote controlling abilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "pvss" = callPackage
@@ -194713,6 +207334,8 @@ self: {
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) python;};
 
   "pyfi" = callPackage
@@ -194729,6 +207352,8 @@ self: {
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) python;};
 
   "python-pickle" = callPackage
@@ -194752,6 +207377,8 @@ self: {
        ];
        description = "Serialization/deserialization using Python Pickle format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "q4c12-twofinger" = callPackage
@@ -194770,6 +207397,8 @@ self: {
        ];
        description = "Efficient alternating finger trees";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qc-oi-testgenerator" = callPackage
@@ -194783,6 +207412,8 @@ self: {
        ];
        description = "Compile time generation of operation invariance tests for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qchas" = callPackage
@@ -194811,6 +207442,8 @@ self: {
        librarySystemDepends = [ qd ];
        description = "double-double and quad-double number type via libqd";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {qd = null;};
 
   "qd-vec" = callPackage
@@ -194822,6 +207455,8 @@ self: {
        libraryHaskellDepends = [ base qd Vec ];
        description = "'Vec' instances for 'qd' types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qed" = callPackage
@@ -194840,6 +207475,8 @@ self: {
        testHaskellDepends = [ base transformers ];
        description = "Simple prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qhs" = callPackage
@@ -194863,6 +207500,8 @@ self: {
        ];
        description = "Command line tool qhs, SQL queries on CSV and TSV files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qhull-simple" = callPackage
@@ -194875,6 +207514,8 @@ self: {
        librarySystemDepends = [ qhull ];
        description = "Simple bindings to Qhull, a library for computing convex hulls";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) qhull;};
 
   "qif" = callPackage
@@ -194894,6 +207535,8 @@ self: {
        ];
        description = "A simple QIF file format parser / printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qlinear" = callPackage
@@ -194914,6 +207557,8 @@ self: {
        ];
        description = "Typesafe library for linear algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qm-interpolated-string" = callPackage
@@ -194994,6 +207639,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Library to generate images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) qrencode;};
 
   "qr-repa" = callPackage
@@ -195013,6 +207660,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Library to generate QR codes from bytestrings and objects and scale image files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qrcode" = callPackage
@@ -195068,6 +207717,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "quantity semaphores";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qt" = callPackage
@@ -195101,6 +207752,8 @@ self: {
        librarySystemDepends = [ qtbase ];
        description = "Qt bindings for Haskell - C++ library";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.qt5) qtbase;};
 
   "qtah-examples" = callPackage
@@ -195118,6 +207771,8 @@ self: {
        ];
        description = "Example programs for Qtah Qt bindings";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qtah-generator" = callPackage
@@ -195140,6 +207795,8 @@ self: {
        doHaddock = false;
        description = "Generator for Qtah Qt bindings";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qtah-qt5" = callPackage
@@ -195159,6 +207816,8 @@ self: {
        testHaskellDepends = [ base hoppy-runtime HUnit ];
        description = "Qt bindings for Haskell";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.qt5) qtbase;};
 
   "quack" = callPackage
@@ -195192,6 +207851,8 @@ self: {
        ];
        description = "An implementation of quadratic irrationals";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quandl-api" = callPackage
@@ -195228,6 +207889,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Quant finance library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quantification" = callPackage
@@ -195244,6 +207907,8 @@ self: {
        ];
        description = "Rage against the quantification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quantities" = callPackage
@@ -195275,6 +207940,8 @@ self: {
        libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ];
        description = "An embedding of quantum computation as a Haskell arrow";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quantum-random" = callPackage
@@ -195297,6 +207964,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Retrieve, store and manage real quantum random data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quarantimer" = callPackage
@@ -195318,6 +207987,8 @@ self: {
        ];
        description = "Coronavirus quarantine timer web app for your things";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qudb" = callPackage
@@ -195336,6 +208007,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Quite Useless DB";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quenya-verb" = callPackage
@@ -195358,6 +208031,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Quenya verb conjugator";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "queryparser" = callPackage
@@ -195377,6 +208052,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Analysis and parsing library for SQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "queryparser-demo" = callPackage
@@ -195393,6 +208070,8 @@ self: {
        ];
        description = "Demo package containing queryparser examples";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "queryparser-hive" = callPackage
@@ -195412,6 +208091,8 @@ self: {
        ];
        description = "Parsing for Hive SQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "queryparser-presto" = callPackage
@@ -195431,6 +208112,8 @@ self: {
        ];
        description = "Parsing for Presto SQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "queryparser-vertica" = callPackage
@@ -195450,6 +208133,8 @@ self: {
        ];
        description = "Parsing for Vertica SQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "querystring-pickle" = callPackage
@@ -195483,6 +208168,8 @@ self: {
        ];
        description = "A package for prompting values from the command-line";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "queue" = callPackage
@@ -195505,6 +208192,8 @@ self: {
        libraryHaskellDepends = [ array base containers mtl stateful-mtl ];
        description = "A library of queuelike data structures, both functional and stateful";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quick-generator" = callPackage
@@ -195535,6 +208224,8 @@ self: {
        ];
        description = "Slimmed down json schema language and validator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickbench" = callPackage
@@ -195555,6 +208246,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "quick & easy benchmarking of command-line programs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickbooks" = callPackage
@@ -195573,6 +208266,8 @@ self: {
        ];
        description = "QuickBooks API binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-arbitrary-adt" = callPackage
@@ -195606,6 +208301,8 @@ self: {
        ];
        description = "Generate QuickCheck Gen for Sum Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-assertions" = callPackage
@@ -195774,6 +208471,8 @@ self: {
        ];
        description = "Automating QuickCheck for polymorphic and overlaoded properties";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-properties" = callPackage
@@ -195796,6 +208495,8 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Combinators for Quickcheck Property construction and diagnostics";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-property-monad" = callPackage
@@ -195807,6 +208508,8 @@ self: {
        libraryHaskellDepends = [ base either QuickCheck transformers ];
        description = "A monad for generating QuickCheck properties without Arbitrary instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-regex" = callPackage
@@ -195822,6 +208525,8 @@ self: {
        ];
        description = "Generate regex-constrained strings for QuickCheck";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-relaxng" = callPackage
@@ -195837,6 +208542,8 @@ self: {
        ];
        description = "Generate RelaxNG-constrained XML documents for QuickCheck";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-rematch" = callPackage
@@ -195849,6 +208556,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck rematch ];
        description = "QuickCheck support for rematch";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-report" = callPackage
@@ -195864,6 +208573,8 @@ self: {
        ];
        description = "Customizable reports for quickcheck properties";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-script" = callPackage
@@ -195938,6 +208649,8 @@ self: {
        ];
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-state-machine-distributed" = callPackage
@@ -195961,6 +208674,8 @@ self: {
        ];
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-string-random" = callPackage
@@ -196022,6 +208737,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck transformers webdriver ];
        description = "Utilities for using WebDriver with QuickCheck";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-with-counterexamples" = callPackage
@@ -196088,6 +208805,8 @@ self: {
        testHaskellDepends = [ base directory filepath QuickCheck ];
        description = "Generate Main module with QuickCheck tests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickselect" = callPackage
@@ -196113,6 +208832,8 @@ self: {
        libraryHaskellDepends = [ base vector vector-algorithms ];
        description = "Very fast and memory-compact query-only set and map structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickson" = callPackage
@@ -196175,6 +208896,8 @@ self: {
        ];
        description = "A reflective batch tester for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickwebapp" = callPackage
@@ -196193,6 +208916,8 @@ self: {
        ];
        description = "A quick webapp generator for any file processing tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiet" = callPackage
@@ -196221,6 +208946,8 @@ self: {
        doHaddock = false;
        description = "Meta-package for Quipper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quipper-algorithms" = callPackage
@@ -196244,6 +208971,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A set of algorithms implemented in Quipper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quipper-all" = callPackage
@@ -196259,6 +208988,8 @@ self: {
        doHaddock = false;
        description = "Meta-package for Quipper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quipper-cabal" = callPackage
@@ -196270,6 +209001,8 @@ self: {
        libraryHaskellDepends = [ base Cabal process quipper-language ];
        description = "Some functions to aid in the creation of Cabal packages for Quipper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quipper-core" = callPackage
@@ -196285,6 +209018,8 @@ self: {
        ];
        description = "An embedded, scalable functional programming language for quantum computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quipper-demos" = callPackage
@@ -196305,6 +209040,8 @@ self: {
        doHaddock = false;
        description = "Miscellaneous code snippets that illustrate various Quipper features";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quipper-language" = callPackage
@@ -196325,6 +209062,8 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Quipper, an embedded functional programming language for quantum computation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quipper-libraries" = callPackage
@@ -196347,6 +209086,8 @@ self: {
        ];
        description = "The standard libraries for Quipper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quipper-rendering" = callPackage
@@ -196363,6 +209104,8 @@ self: {
        ];
        description = "An embedded, scalable functional programming language for quantum computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quipper-tools" = callPackage
@@ -196384,6 +209127,8 @@ self: {
        doHaddock = false;
        description = "Miscellaneous stand-alone tools for Quipper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quipper-utils" = callPackage
@@ -196400,6 +209145,8 @@ self: {
        ];
        description = "Utility libraries for Quipper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver" = callPackage
@@ -196411,6 +209158,8 @@ self: {
        libraryHaskellDepends = [ base mmorph transformers ];
        description = "Quiver finite stream processing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-binary" = callPackage
@@ -196427,6 +209176,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver transformers ];
        description = "Binary serialisation support for Quivers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-bytestring" = callPackage
@@ -196438,6 +209189,8 @@ self: {
        libraryHaskellDepends = [ base bytestring quiver ];
        description = "Quiver combinators for bytestring streaming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-cell" = callPackage
@@ -196449,6 +209202,8 @@ self: {
        libraryHaskellDepends = [ base data-cell quiver ];
        description = "Quiver combinators for cellular data processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-csv" = callPackage
@@ -196464,6 +209219,8 @@ self: {
        ];
        description = "Quiver combinators for cellular CSV data processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-enumerator" = callPackage
@@ -196475,6 +209232,8 @@ self: {
        libraryHaskellDepends = [ base enumerator quiver ];
        description = "Bridge between Quiver and Iteratee paradigms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-groups" = callPackage
@@ -196487,6 +209246,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Group and chunk values within a Quiver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-http" = callPackage
@@ -196504,6 +209265,8 @@ self: {
        ];
        description = "Adapter to stream over HTTP(s) with quiver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-instances" = callPackage
@@ -196519,6 +209282,8 @@ self: {
        ];
        description = "Extra instances for Quiver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-interleave" = callPackage
@@ -196531,6 +209296,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Interleave values from multiple Quivers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-sort" = callPackage
@@ -196554,6 +209321,8 @@ self: {
        ];
        description = "Sort the values in a quiver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quokka" = callPackage
@@ -196572,6 +209341,8 @@ self: {
        ];
        description = "Test helpers which help generate data for projects that use postgresql";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quoridor-hs" = callPackage
@@ -196596,6 +209367,8 @@ self: {
        testHaskellDepends = [ base HUnit mtl ];
        description = "A Quoridor implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qux" = callPackage
@@ -196614,6 +209387,8 @@ self: {
        ];
        description = "Command line binary for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "r-glpk-phonetic-languages-ukrainian-durations" = callPackage
@@ -196685,6 +209460,8 @@ self: {
        ];
        description = "The raaz cryptographic library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rabocsv2qif" = callPackage
@@ -196714,6 +209491,8 @@ self: {
        libraryHaskellDepends = [ array base containers data-reify ];
        description = "Reverse Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "radian" = callPackage
@@ -196728,6 +209507,8 @@ self: {
        testHaskellDepends = [ base HUnit lens ];
        description = "Isomorphisms for measurements that use radians";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "radium" = callPackage
@@ -196744,6 +209525,8 @@ self: {
        ];
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "radium-formula-parser" = callPackage
@@ -196759,6 +209542,8 @@ self: {
        ];
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "radius" = callPackage
@@ -196787,6 +209572,8 @@ self: {
        executableHaskellDepends = [ base filepath ];
        description = "Command-line tool for emitting numbers in various bases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "radix-tree" = callPackage
@@ -196855,6 +209642,8 @@ self: {
        ];
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {rados = null;};
 
   "raft" = callPackage
@@ -196873,6 +209662,8 @@ self: {
        ];
        description = "Miscellaneous Haskell utilities for data structures and data manipulation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rail-compiler-editor" = callPackage
@@ -196895,6 +209686,8 @@ self: {
        testHaskellDepends = [ base containers HUnit process ];
        description = "Compiler and editor for the esolang rail";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rails-session" = callPackage
@@ -196918,6 +209711,8 @@ self: {
        ];
        description = "Decrypt Ruby on Rails sessions in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rainbow" = callPackage
@@ -196948,6 +209743,8 @@ self: {
        ];
        description = "Tests and QuickCheck generators to accompany rainbow";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rainbox" = callPackage
@@ -197008,6 +209805,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "distributed-process node";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rakhana" = callPackage
@@ -197024,6 +209823,8 @@ self: {
        ];
        description = "Stream based PDF library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rakuten" = callPackage
@@ -197048,6 +209849,8 @@ self: {
        ];
        description = "The Rakuten API in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ral" = callPackage
@@ -197108,6 +209911,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rallod" = callPackage
@@ -197120,6 +209925,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "'$' in reverse";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "raml" = callPackage
@@ -197135,6 +209942,8 @@ self: {
        ];
        description = "RESTful API Modeling Language (RAML) library for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rampart" = callPackage
@@ -197173,6 +209982,8 @@ self: {
        libraryHaskellDepends = [ array base IntervalMap mtl random ];
        description = "Random variable library, with Functor, Applicative and Monad instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "randfile" = callPackage
@@ -197191,6 +210002,8 @@ self: {
        ];
        description = "Program for picking a random file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rando" = callPackage
@@ -197205,6 +210018,8 @@ self: {
        ];
        description = "Easy-to-use randomness for livecoding";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random" = callPackage
@@ -197278,6 +210093,8 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "Random-access lists in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-bytestring" = callPackage
@@ -197319,6 +210136,8 @@ self: {
        libraryHaskellDepends = [ base random template-haskell ];
        description = "A Template Haskell helper for deriving Random instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-eff" = callPackage
@@ -197330,6 +210149,8 @@ self: {
        libraryHaskellDepends = [ base extensible-effects random ];
        description = "A simple random generator library for extensible-effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-effin" = callPackage
@@ -197341,6 +210162,8 @@ self: {
        libraryHaskellDepends = [ base effin random ];
        description = "A simple random generator library for effin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-extras" = callPackage
@@ -197419,6 +210242,8 @@ self: {
        ];
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-names" = callPackage
@@ -197487,6 +210312,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring random ];
        description = "An infinite stream of random data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-string" = callPackage
@@ -197651,6 +210478,8 @@ self: {
        ];
        description = "A Range type with vector-space instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rangemin" = callPackage
@@ -197662,6 +210491,8 @@ self: {
        libraryHaskellDepends = [ base containers primitive vector ];
        description = "Linear range-min algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ranges" = callPackage
@@ -197765,6 +210596,8 @@ self: {
        ];
        description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rapid-term" = callPackage
@@ -197780,6 +210613,8 @@ self: {
        ];
        description = "External terminal support for rapid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa" = callPackage
@@ -197804,6 +210639,8 @@ self: {
        ];
        description = "A modular text editor";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-example-config" = callPackage
@@ -197823,6 +210660,8 @@ self: {
        ];
        description = "Example user config for Rasa";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-bufs" = callPackage
@@ -197837,6 +210676,8 @@ self: {
        ];
        description = "Rasa Ext for useful buffer utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-cmd" = callPackage
@@ -197851,6 +210692,8 @@ self: {
        ];
        description = "Rasa Ext for running commands";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-cursors" = callPackage
@@ -197866,6 +210709,8 @@ self: {
        ];
        description = "Rasa Ext adding cursor(s)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-files" = callPackage
@@ -197882,6 +210727,8 @@ self: {
        ];
        description = "Rasa Ext for filesystem actions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-logger" = callPackage
@@ -197893,6 +210740,8 @@ self: {
        libraryHaskellDepends = [ base lens mtl rasa ];
        description = "Rasa Ext for logging state/actions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-slate" = callPackage
@@ -197909,6 +210758,8 @@ self: {
        ];
        description = "Rasa extension for rendering to terminal with vty";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-status-bar" = callPackage
@@ -197920,6 +210771,8 @@ self: {
        libraryHaskellDepends = [ base data-default lens rasa yi-rope ];
        description = "Rasa Ext for populating status-bar";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-style" = callPackage
@@ -197931,6 +210784,8 @@ self: {
        libraryHaskellDepends = [ base data-default lens rasa ];
        description = "Rasa Ext managing rendering styles";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-views" = callPackage
@@ -197947,6 +210802,8 @@ self: {
        ];
        description = "Rasa Ext managing rendering views";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-vim" = callPackage
@@ -197965,6 +210822,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Rasa Ext for vim bindings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rascal" = callPackage
@@ -197993,6 +210852,8 @@ self: {
        ];
        description = "A command-line client for Reddit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasterific-svg" = callPackage
@@ -198092,6 +210953,8 @@ self: {
        benchmarkHaskellDepends = [ base-noprelude gauge relude ];
        description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rating-systems" = callPackage
@@ -198130,6 +210993,8 @@ self: {
        ];
        description = "finite or repeating lists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rattle" = callPackage
@@ -198163,6 +211028,8 @@ self: {
        ];
        description = "Forward build system, with caching and speculation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rattletrap" = callPackage
@@ -198194,6 +211061,8 @@ self: {
        ];
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "raven-haskell" = callPackage
@@ -198229,6 +211098,8 @@ self: {
        ];
        description = "Sentry http interface for Scotty web server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "raw-feldspar" = callPackage
@@ -198252,6 +211123,8 @@ self: {
        ];
        description = "Resource-Aware Feldspar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "raw-strings-qq" = callPackage
@@ -198293,6 +211166,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Anonymous extensible records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rawstring-qm" = callPackage
@@ -198321,6 +211196,8 @@ self: {
        ];
        description = "Random Access Zippers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "razom-text-util" = callPackage
@@ -198339,6 +211216,8 @@ self: {
        testHaskellDepends = [ base QuickCheck regex-applicative smaoin ];
        description = "Common text/parsing tools for Razom language packages";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rbpcp-api" = callPackage
@@ -198374,6 +211253,8 @@ self: {
        executableHaskellDepends = [ base bio bytestring containers ];
        description = "Mask nucleotide (EST) sequences in Fasta format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rbst" = callPackage
@@ -198419,6 +211300,8 @@ self: {
        ];
        description = "Reservoir Computing, fast RNNs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rclient" = callPackage
@@ -198434,6 +211317,8 @@ self: {
        ];
        description = "Haskell client for Rserve";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rcu" = callPackage
@@ -198532,6 +211417,8 @@ self: {
        ];
        description = "A Haskell wrapper for Rdio's API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rdtsc" = callPackage
@@ -198585,6 +211472,8 @@ self: {
        ];
        description = "A binding to React based on the Flux application architecture for GHCJS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "react-flux-servant" = callPackage
@@ -198596,6 +211485,8 @@ self: {
        libraryHaskellDepends = [ aeson base react-flux servant text ];
        description = "Allow react-flux stores to send requests to a servant server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "react-haskell" = callPackage
@@ -198613,6 +211504,8 @@ self: {
        ];
        description = "Haskell React bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "react-tutorial-haskell-server" = callPackage
@@ -198630,6 +211523,8 @@ self: {
        ];
        description = "react-tutorial web server";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reaction-logic" = callPackage
@@ -198644,6 +211539,8 @@ self: {
        executableHaskellDepends = [ base mtl QuickCheck ];
        description = "pluggable pure logic serializable reactor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive" = callPackage
@@ -198673,6 +211570,8 @@ self: {
        testHaskellDepends = [ base containers HUnit old-time stm ];
        description = "FRP (functional reactive programming) framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-balsa" = callPackage
@@ -198694,6 +211593,8 @@ self: {
        ];
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana" = callPackage
@@ -198716,6 +211617,8 @@ self: {
        ];
        description = "Library for functional reactive programming (FRP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-automation" = callPackage
@@ -198732,6 +211635,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "home (etc) automation using reactive-banana";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-bunch" = callPackage
@@ -198747,6 +211652,8 @@ self: {
        ];
        description = "Extend reactive-banana to multiple events per time point";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-gi-gtk" = callPackage
@@ -198763,6 +211670,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simple reactive programming with GTK GObject Introspection";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-sdl" = callPackage
@@ -198779,6 +211688,8 @@ self: {
        ];
        description = "Reactive Banana bindings for SDL";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-sdl2" = callPackage
@@ -198791,6 +211702,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Reactive Banana integration with SDL2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-threepenny" = callPackage
@@ -198805,6 +211718,8 @@ self: {
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        description = "Examples for the reactive-banana library, using threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-wx" = callPackage
@@ -198822,6 +211737,8 @@ self: {
        ];
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-fieldtrip" = callPackage
@@ -198838,6 +211755,8 @@ self: {
        ];
        description = "Connect Reactive and FieldTrip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-glut" = callPackage
@@ -198853,6 +211772,8 @@ self: {
        ];
        description = "Connects Reactive and GLUT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-haskell" = callPackage
@@ -198895,6 +211816,8 @@ self: {
        ];
        description = "Process MIDI events via reactive-banana and JACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-midyim" = callPackage
@@ -198914,6 +211837,8 @@ self: {
        ];
        description = "Process MIDI events via reactive-banana";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-thread" = callPackage
@@ -198930,6 +211855,8 @@ self: {
        ];
        description = "Reactive programming via imperative threads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactivity" = callPackage
@@ -198964,6 +211891,8 @@ self: {
        ];
        description = "Reactor - task parallel reactive programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "read-bounded" = callPackage
@@ -198975,6 +211904,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Class for reading bounded values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "read-ctags" = callPackage
@@ -198997,6 +211928,8 @@ self: {
          base bytestring containers directory hspec text
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "read-editor" = callPackage
@@ -199034,6 +211967,8 @@ self: {
        testHaskellDepends = [ base containers directory filepath hspec ];
        description = "Read IO library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "readability" = callPackage
@@ -199107,6 +212042,8 @@ self: {
        librarySystemDepends = [ ncurses readline ];
        description = "An interface to the GNU readline library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline;};
 
   "readline-statevar" = callPackage
@@ -199118,6 +212055,8 @@ self: {
        libraryHaskellDepends = [ base readline StateVar ];
        description = "Readline with variables (setX/getY) wrapped in state vars";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "readme-lhs" = callPackage
@@ -199139,6 +212078,8 @@ self: {
        testHaskellDepends = [ base containers doctest ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "readpyc" = callPackage
@@ -199152,6 +212093,8 @@ self: {
        executableHaskellDepends = [ base bliplib parseargs ];
        description = "Read and pretty print Python bytecode (.pyc) files.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "readshp" = callPackage
@@ -199169,6 +212112,8 @@ self: {
        ];
        description = "Code for reading ESRI Shapefiles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "real-day-end" = callPackage
@@ -199196,6 +212141,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "A really simple XML parser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reanimate" = callPackage
@@ -199233,6 +212180,8 @@ self: {
        ];
        description = "Animation library based on SVGs";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reanimate-svg" = callPackage
@@ -199258,6 +212207,8 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reason-export" = callPackage
@@ -199290,6 +212241,8 @@ self: {
        libraryHaskellDepends = [ base mtl split template-haskell ];
        description = "Lens implementation. It is more small but adequately.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reasonable-operational" = callPackage
@@ -199398,6 +212351,8 @@ self: {
        ];
        description = "Anonymous records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "record-aeson" = callPackage
@@ -199414,6 +212369,8 @@ self: {
        testHaskellDepends = [ aeson base-prelude hspec record ];
        description = "Instances of \"aeson\" classes for the \"record\" types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "record-dot-preprocessor" = callPackage
@@ -199447,6 +212404,8 @@ self: {
        ];
        description = "Generic encoding of records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "record-gl" = callPackage
@@ -199470,6 +212429,8 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "record-hasfield" = callPackage
@@ -199501,6 +212462,8 @@ self: {
        doHaddock = false;
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "record-syntax" = callPackage
@@ -199524,6 +212487,8 @@ self: {
        ];
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "record-wrangler" = callPackage
@@ -199549,6 +212514,8 @@ self: {
        libraryHaskellDepends = [ base kinds type-functions ];
        description = "A flexible record system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "records-sop" = callPackage
@@ -199583,6 +212550,8 @@ self: {
        ];
        description = "Template Haskell declarations for the records package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "recursion" = callPackage
@@ -199675,6 +212644,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck template-haskell ];
        description = "Auto-generate final encodings and their isomorphisms using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "red-black-record" = callPackage
@@ -199693,6 +212664,8 @@ self: {
        doHaddock = false;
        description = "Extensible records and variants indexed by a type-level Red-Black tree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "red-black-tree" = callPackage
@@ -199746,6 +212719,8 @@ self: {
        ];
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "redis" = callPackage
@@ -199773,6 +212748,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network utf8-string ];
        description = "A simple Redis library for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "redis-io" = callPackage
@@ -199840,6 +212817,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring redis ];
        description = "Simple redis bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rediscaching-haxl" = callPackage
@@ -199867,6 +212846,8 @@ self: {
        libraryPkgconfigDepends = [ raptor2 redland ];
        description = "Redland RDF library bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {raptor2 = null; redland = null;};
 
   "redo" = callPackage
@@ -199909,6 +212890,8 @@ self: {
        ];
        description = "Simplify a set of equations by removing redundancies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reducers" = callPackage
@@ -199955,6 +212938,8 @@ self: {
        ];
        description = "Reed-Solomon Erasure Coding in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reenact" = callPackage
@@ -199968,6 +212953,8 @@ self: {
        ];
        description = "A reimplementation of the Reactive library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reexport-crypto-random" = callPackage
@@ -199989,6 +212976,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ref-extras" = callPackage
@@ -200027,6 +213016,8 @@ self: {
        libraryHaskellDepends = [ base mtl stm transformers ];
        description = "A type class for monads with references compatible with the mtl2 library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ref-tf" = callPackage
@@ -200070,6 +213061,8 @@ self: {
        ];
        description = "Container with element counts";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reference" = callPackage
@@ -200103,6 +213096,8 @@ self: {
        ];
        description = "Selectors for reading and updating data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "refh" = callPackage
@@ -200120,6 +213115,8 @@ self: {
        ];
        description = "A command-line tool for pasting to https://www.refheap.com";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "refined" = callPackage
@@ -200148,6 +213145,8 @@ self: {
        libraryHaskellDepends = [ base http-api-data refined text ];
        description = "http-api-data instances for refined types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "refinery" = callPackage
@@ -200210,6 +213209,8 @@ self: {
        ];
        description = "Utilities for the reflection package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflection-without-remorse" = callPackage
@@ -200276,6 +213277,8 @@ self: {
        ];
        description = "Continuous animations support for reflex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-backend-socket" = callPackage
@@ -200301,6 +213304,8 @@ self: {
        ];
        description = "Reflex bindings for TCP sockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-backend-wai" = callPackage
@@ -200321,6 +213326,8 @@ self: {
        executableHaskellDepends = [ base http-types reflex wai ];
        description = "Reflex interface to `wai`";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-basic-host" = callPackage
@@ -200341,6 +213348,8 @@ self: {
        executableHaskellDepends = [ base lens reflex witherable ];
        description = "A basic Reflex host for backend work";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-dom" = callPackage
@@ -200506,6 +213515,8 @@ self: {
        ];
        description = "Routing and retractable back button for reflex-dom";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-dom-svg" = callPackage
@@ -200521,6 +213532,8 @@ self: {
        ];
        description = "Reflex functions for SVG elements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-dynamic-containers" = callPackage
@@ -200543,6 +213556,8 @@ self: {
        ];
        description = "various dynamic containers for Reflex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-fsnotify" = callPackage
@@ -200558,6 +213573,8 @@ self: {
        ];
        description = "Reflex FRP interface for watching files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-gadt-api" = callPackage
@@ -200582,6 +213599,8 @@ self: {
        ];
        description = "Interact with a GADT API in your reflex-dom application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-ghci" = callPackage
@@ -200609,6 +213628,8 @@ self: {
        ];
        description = "A GHCi widget library for use in reflex applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-gloss" = callPackage
@@ -200624,6 +213645,8 @@ self: {
        ];
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-gloss-scene" = callPackage
@@ -200651,6 +213674,8 @@ self: {
        ];
        description = "A simple scene-graph using reflex and gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-jsx" = callPackage
@@ -200684,6 +213709,8 @@ self: {
        ];
        description = "Reflex bindings for libtelnet";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-orphans" = callPackage
@@ -200700,6 +213727,8 @@ self: {
        ];
        description = "Useful missing instances for Reflex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-process" = callPackage
@@ -200725,6 +213754,8 @@ self: {
        ];
        description = "Reflex FRP interface for running system processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-sdl2" = callPackage
@@ -200744,6 +213775,8 @@ self: {
        executableHaskellDepends = [ base mtl reflex ];
        description = "SDL2 and reflex FRP";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-test-host" = callPackage
@@ -200779,6 +213812,8 @@ self: {
        ];
        description = "Collections and switchable Monad transformers for Reflex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-vty" = callPackage
@@ -200805,6 +213840,8 @@ self: {
        ];
        description = "Reflex FRP host and widgets for VTY applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reform" = callPackage
@@ -200890,6 +213927,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "The parser and render to parsec and render the string";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "refractor" = callPackage
@@ -200913,6 +213952,8 @@ self: {
        ];
        description = "See README for more info";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "refresht" = callPackage
@@ -200928,6 +213969,8 @@ self: {
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
        description = "Environment Monad with automatic resource refreshment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "refty" = callPackage
@@ -200970,6 +214013,8 @@ self: {
        ];
        description = "Tools for maintaining a database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reg-alloc" = callPackage
@@ -200983,6 +214028,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Register allocation API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reg-alloc-graph-color" = callPackage
@@ -201006,6 +214053,8 @@ self: {
        doHaddock = false;
        description = "Register allocation by graph colorization";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reg-alloc-types" = callPackage
@@ -201128,6 +214177,8 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Brzozowski's Deriviatives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-dfa" = callPackage
@@ -201141,6 +214192,8 @@ self: {
        libraryHaskellDepends = [ base mtl parsec regex-base ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-do" = callPackage
@@ -201229,6 +214282,8 @@ self: {
        ];
        description = "Generate a random string from a PCRE";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-genex" = callPackage
@@ -201261,6 +214316,8 @@ self: {
        libraryHaskellDepends = [ base parsec regex-base ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-pcre" = callPackage
@@ -201310,6 +214367,8 @@ self: {
        ];
        description = "Text-based PCRE API for regex-base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-pderiv" = callPackage
@@ -201326,6 +214385,8 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-posix" = callPackage
@@ -201370,6 +214431,8 @@ self: {
        ];
        description = "Unit tests for the plaform's Posix regex library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tdfa" = callPackage
@@ -201406,6 +214469,8 @@ self: {
        ];
        description = "Parse with regular expressions on Producers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tdfa-quasiquoter" = callPackage
@@ -201417,6 +214482,8 @@ self: {
        libraryHaskellDepends = [ base regex-tdfa template-haskell ];
        description = "Quasi-quoter for TDFA (extended POSIX) regular expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tdfa-rc" = callPackage
@@ -201432,6 +214499,8 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tdfa-text" = callPackage
@@ -201445,6 +214514,8 @@ self: {
        libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
        description = "Text interface for regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tdfa-unittest" = callPackage
@@ -201463,6 +214534,8 @@ self: {
        ];
        description = "Unit tests for the regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tdfa-utf8" = callPackage
@@ -201480,6 +214553,8 @@ self: {
        ];
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tre" = callPackage
@@ -201494,6 +214569,8 @@ self: {
        librarySystemDepends = [ tre ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) tre;};
 
   "regex-type" = callPackage
@@ -201505,6 +214582,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-level regular expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-with-pcre" = callPackage
@@ -201539,6 +214618,8 @@ self: {
        ];
        description = "Types that can only be constructed if they match a regular expression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-xmlschema" = callPackage
@@ -201550,6 +214631,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "A regular expression library for W3C XML Schema regular expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regexchar" = callPackage
@@ -201605,6 +214688,8 @@ self: {
        ];
        description = "Regular Expressions on Tries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regexpr" = callPackage
@@ -201628,6 +214713,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Regular expressions via symbolic manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regexqq" = callPackage
@@ -201641,6 +214728,8 @@ self: {
        ];
        description = "A quasiquoter for PCRE regexes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regional-pointers" = callPackage
@@ -201655,6 +214744,8 @@ self: {
        ];
        description = "Regional memory pointers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regions" = callPackage
@@ -201670,6 +214761,8 @@ self: {
        ];
        description = "Provides the region monad for safely opening and working with scarce resources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regions-monadsfd" = callPackage
@@ -201685,6 +214778,8 @@ self: {
        ];
        description = "Monads-fd instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regions-monadstf" = callPackage
@@ -201700,6 +214795,8 @@ self: {
        ];
        description = "Monads-tf instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regions-mtl" = callPackage
@@ -201711,6 +214808,8 @@ self: {
        libraryHaskellDepends = [ base-unicode-symbols mtl regions ];
        description = "mtl instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "register-machine-typelevel" = callPackage
@@ -201722,6 +214821,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A computationally universal register machine implementation at the type-level";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "registry" = callPackage
@@ -201774,6 +214875,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "utilities to work with Hedgehog generators and `registry`";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regress" = callPackage
@@ -201785,6 +214888,8 @@ self: {
        libraryHaskellDepends = [ ad base vector ];
        description = "Linear and logistic regression through automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regression-simple" = callPackage
@@ -201796,6 +214901,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Simple linear and quadratic regression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regular" = callPackage
@@ -201809,6 +214916,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generic programming library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regular-extras" = callPackage
@@ -201820,6 +214929,8 @@ self: {
        libraryHaskellDepends = [ base binary deepseq QuickCheck regular ];
        description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regular-web" = callPackage
@@ -201835,6 +214946,8 @@ self: {
        ];
        description = "Generic programming for the web";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regular-xmlpickler" = callPackage
@@ -201846,6 +214959,8 @@ self: {
        libraryHaskellDepends = [ base hxt regular text ];
        description = "Generic generation of HXT XmlPickler instances using Regular";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reheat" = callPackage
@@ -201860,6 +214975,8 @@ self: {
        testHaskellDepends = [ base directory QuickCheck text vty vty-ui ];
        description = "to make notes and reduce impact on idle time on writing other programms";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rehoo" = callPackage
@@ -201877,6 +214994,8 @@ self: {
        ];
        description = "Rebuild default.hoo from many .hoo files in the current directory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rei" = callPackage
@@ -201894,6 +215013,8 @@ self: {
        ];
        description = "Process lists easily";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reified-records" = callPackage
@@ -201905,6 +215026,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Reify records to Maps and back again";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reify" = callPackage
@@ -201920,6 +215043,8 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Serialize data";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reinterpret-cast" = callPackage
@@ -201946,6 +215071,8 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "A relation data structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "relapse" = callPackage
@@ -201999,6 +215126,8 @@ self: {
        ];
        description = "PostgreSQL v8.x driver for haskell-relational-record";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "relational-query" = callPackage
@@ -202073,6 +215202,8 @@ self: {
        ];
        description = "The connector of relational-record and postgresql-pure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "relational-record" = callPackage
@@ -202143,6 +215274,8 @@ self: {
        ];
        description = "Durations and generalized time parsing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "releaser" = callPackage
@@ -202173,6 +215306,8 @@ self: {
        libraryHaskellDepends = [ aeson base chronos text torsor ];
        description = "humanised relevant time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reliable-io" = callPackage
@@ -202232,6 +215367,8 @@ self: {
        ];
        description = "A web based Haskell IDE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "relude" = callPackage
@@ -202272,6 +215409,8 @@ self: {
        ];
        description = "A DSL for marking student work";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remarks" = callPackage
@@ -202293,6 +215432,8 @@ self: {
        ];
        description = "A DSL for marking student work";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rematch" = callPackage
@@ -202334,6 +215475,8 @@ self: {
        ];
        description = "Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remote-debugger" = callPackage
@@ -202349,6 +215492,8 @@ self: {
        ];
        description = "Interface to ghci debugger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remote-json" = callPackage
@@ -202373,6 +215518,8 @@ self: {
        ];
        description = "Remote Monad implementation of the JSON RPC protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remote-json-client" = callPackage
@@ -202390,6 +215537,8 @@ self: {
        ];
        description = "Web client wrapper for remote-json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remote-json-server" = callPackage
@@ -202407,6 +215556,8 @@ self: {
        ];
        description = "Web server wrapper for remote-json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remote-monad" = callPackage
@@ -202429,6 +215580,8 @@ self: {
        ];
        description = "An parametrizable Remote Monad, and parametrizable Applicative Functor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remotion" = callPackage
@@ -202461,6 +215614,8 @@ self: {
        ];
        description = "A library for client-server applications based on custom protocols";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "render-utf8" = callPackage
@@ -202476,6 +215631,8 @@ self: {
        ];
        description = "Simple Utf8 wrapper for ByteString Builder with conversion classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "renderable" = callPackage
@@ -202544,6 +215701,8 @@ self: {
        libraryHaskellDepends = [ base repa vector ];
        description = "Algorithms using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-array" = callPackage
@@ -202561,6 +215720,8 @@ self: {
        ];
        description = "Bulk array representations and operators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-bytestring" = callPackage
@@ -202573,6 +215734,8 @@ self: {
        doHaddock = false;
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-convert" = callPackage
@@ -202588,6 +215751,8 @@ self: {
        ];
        description = "Packing and unpacking flat tables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-devil" = callPackage
@@ -202600,6 +215765,8 @@ self: {
        librarySystemDepends = [ libdevil ];
        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;
+       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "repa-eval" = callPackage
@@ -202611,6 +215778,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Low-level parallel operators on bulk random-accessble arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-examples" = callPackage
@@ -202631,6 +215800,8 @@ self: {
        ];
        description = "Examples using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-fftw" = callPackage
@@ -202669,6 +215840,8 @@ self: {
        ];
        description = "Data-parallel data flows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-io" = callPackage
@@ -202697,6 +215870,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix repa vector ];
        description = "HMatrix operations for Repa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-plugin" = callPackage
@@ -202713,6 +215888,8 @@ self: {
        ];
        description = "Data Flow Fusion GHC Plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-scalar" = callPackage
@@ -202730,6 +215907,8 @@ self: {
        ];
        description = "Scalar data types and conversions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-series" = callPackage
@@ -202741,6 +215920,8 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-prim vector ];
        description = "Series Expressionss API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-sndfile" = callPackage
@@ -202770,6 +215951,8 @@ self: {
        libraryHaskellDepends = [ base mtl primitive repa-scalar vector ];
        description = "Stream functions not present in the vector library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-v4l2" = callPackage
@@ -202789,6 +215972,8 @@ self: {
        executableHaskellDepends = [ base gloss repa ];
        description = "Provides high-level access to webcams";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repl" = callPackage
@@ -202802,6 +215987,8 @@ self: {
        ];
        description = "IRC friendly REPL library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repl-toolkit" = callPackage
@@ -202872,6 +216059,8 @@ self: {
          wai-websockets websockets
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "replicant" = callPackage
@@ -202898,6 +216087,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repline" = callPackage
@@ -202942,6 +216133,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Blogging module using blaze html for markup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repr" = callPackage
@@ -202957,6 +216150,8 @@ self: {
        ];
        description = "Render overloaded expressions to their textual representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repr-tree-syb" = callPackage
@@ -202986,6 +216181,8 @@ self: {
        ];
        description = "Representable functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "representable-profunctors" = callPackage
@@ -203016,6 +216213,8 @@ self: {
        ];
        description = "Tries from representations of polynomial functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reprinter" = callPackage
@@ -203030,6 +216229,8 @@ self: {
        ];
        description = "Scrap Your Reprinter";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reproject" = callPackage
@@ -203042,6 +216243,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Define and combine \"materialized\" projections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "req" = callPackage
@@ -203097,6 +216300,8 @@ self: {
        ];
        description = "Conduit helpers for the req HTTP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "req-oauth2" = callPackage
@@ -203119,6 +216324,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Provides OAuth2 authentication for use with Req";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "req-url-extra" = callPackage
@@ -203134,6 +216341,8 @@ self: {
        testHaskellDepends = [ base hspec modern-uri req ];
        description = "Provides URI/URL helper functions for use with Req";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reqcatcher" = callPackage
@@ -203150,6 +216359,8 @@ self: {
        ];
        description = "A local http server to catch the HTTP redirect";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "request-monad" = callPackage
@@ -203161,6 +216372,8 @@ self: {
        libraryHaskellDepends = [ base free mtl transformers ];
        description = "A transformer for generic requests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "require" = callPackage
@@ -203309,6 +216522,8 @@ self: {
        ];
        description = "More understandable exceptions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reserve" = callPackage
@@ -203332,6 +216547,8 @@ self: {
        ];
        description = "Reserve reloads web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reservoir" = callPackage
@@ -203343,6 +216560,8 @@ self: {
        libraryHaskellDepends = [ base containers random ];
        description = "Unweighted reservoir sampling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resin" = callPackage
@@ -203354,6 +216573,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ];
        description = "High performance variable binders";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resistor-cube" = callPackage
@@ -203367,6 +216588,8 @@ self: {
        executableHaskellDepends = [ base comfort-array lapack ];
        description = "Compute total resistance of a cube of resistors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resolv_0_1_1_2" = callPackage
@@ -203421,6 +216644,8 @@ self: {
        ];
        description = "A name resolusion library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resolve-trivial-conflicts" = callPackage
@@ -203439,6 +216664,8 @@ self: {
        ];
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resource-effect" = callPackage
@@ -203457,6 +216684,8 @@ self: {
        ];
        description = "A port of the package 'resourcet' for extensible effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resource-embed" = callPackage
@@ -203470,6 +216699,8 @@ self: {
        executableHaskellDepends = [ base bytestring directory ];
        description = "Embed data files via C and FFI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resource-pool" = callPackage
@@ -203502,6 +216733,8 @@ self: {
        ];
        description = "Fork of resource-pool, with a MonadCatchIO constraint";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resource-pool-monad" = callPackage
@@ -203533,6 +216766,8 @@ self: {
        ];
        description = "Allocate resources which are guaranteed to be released";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resourcet" = callPackage
@@ -203577,6 +216812,8 @@ self: {
        ];
        description = "process and route HTTP requests and generate responses on top of WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-client" = callPackage
@@ -203598,6 +216835,8 @@ self: {
        ];
        description = "Utility library for use in generated API client libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-core" = callPackage
@@ -203625,6 +216864,8 @@ self: {
        ];
        description = "Rest API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-example" = callPackage
@@ -203647,6 +216888,8 @@ self: {
        executableHaskellDepends = [ base base-compat rest-gen ];
        description = "Example project for rest";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-gen" = callPackage
@@ -203674,6 +216917,8 @@ self: {
        ];
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-happstack" = callPackage
@@ -203691,6 +216936,8 @@ self: {
        ];
        description = "Rest driver for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-snap" = callPackage
@@ -203708,6 +216955,8 @@ self: {
        ];
        description = "Rest driver for Snap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-stringmap" = callPackage
@@ -203724,6 +216973,8 @@ self: {
        ];
        description = "Maps with stringy keys that can be transcoded to JSON and XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-types" = callPackage
@@ -203743,6 +216994,8 @@ self: {
        ];
        description = "Silk Rest Framework Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-wai" = callPackage
@@ -203762,6 +217015,8 @@ self: {
        ];
        description = "Rest driver for WAI applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "restartable" = callPackage
@@ -203773,6 +217028,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring unix ];
        description = "Minimal live coding library for model-view-event-update applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "restful-snap" = callPackage
@@ -203792,6 +217049,8 @@ self: {
          time-locale-compat xmlhtml
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "restless-git" = callPackage
@@ -203828,6 +217087,8 @@ self: {
        ];
        description = "Running worker processes under system resource restrictions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "restyle" = callPackage
@@ -203842,6 +217103,8 @@ self: {
        executableHaskellDepends = [ base directory filepath utf8-string ];
        description = "Convert between camel case and separated words style";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "result" = callPackage
@@ -203889,6 +217152,8 @@ self: {
        benchmarkHaskellDepends = [ aeson async base criterion text ];
        description = "A driver for RethinkDB 2.2";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rethinkdb-client-driver" = callPackage
@@ -203917,6 +217182,8 @@ self: {
        ];
        description = "Client driver for RethinkDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rethinkdb-model" = callPackage
@@ -203932,6 +217199,8 @@ self: {
        ];
        description = "Useful tools for modeling data with rethinkdb";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rethinkdb-wereHamster" = callPackage
@@ -203951,6 +217220,8 @@ self: {
        ];
        description = "RethinkDB driver for Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "retrie" = callPackage
@@ -204012,6 +217283,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative process ];
        description = "Retry failed commands";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rev-state" = callPackage
@@ -204076,6 +217349,8 @@ self: {
        ];
        description = "Simple reverse geocoding using OpenStreeMap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reversi" = callPackage
@@ -204089,6 +217364,8 @@ self: {
        executableHaskellDepends = [ array base process ];
        description = "Text-only reversi (aka othelo) game";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rewrite" = callPackage
@@ -204104,6 +217381,8 @@ self: {
        ];
        description = "open file and rewrite it with new contents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rewrite-inspector" = callPackage
@@ -204123,6 +217402,8 @@ self: {
        executableHaskellDepends = [ base prettyprinter ];
        description = "Inspection of rewriting steps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rewriting" = callPackage
@@ -204134,6 +217415,8 @@ self: {
        libraryHaskellDepends = [ base containers regular ];
        description = "Generic rewriting library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rex" = callPackage
@@ -204169,6 +217452,8 @@ self: {
        ];
        description = "Github resume generator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc" = callPackage
@@ -204202,6 +217487,8 @@ self: {
        ];
        description = "Robert Fischer's Common library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc-env" = callPackage
@@ -204213,6 +217500,8 @@ self: {
        libraryHaskellDepends = [ base envy network rfc-prelude time ];
        description = "Environment variable support from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc-http-client" = callPackage
@@ -204230,6 +217519,8 @@ self: {
        ];
        description = "The HTTP client extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc-prelude" = callPackage
@@ -204253,6 +217544,8 @@ self: {
        ];
        description = "The Prelude from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc-psql" = callPackage
@@ -204269,6 +217562,8 @@ self: {
        ];
        description = "The PostgreSQL extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc-redis" = callPackage
@@ -204280,6 +217575,8 @@ self: {
        libraryHaskellDepends = [ base hedis rfc-env rfc-prelude time ];
        description = "The Redis extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc-servant" = callPackage
@@ -204301,6 +217598,8 @@ self: {
        ];
        description = "The Servant extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc1413-server" = callPackage
@@ -204384,6 +217683,8 @@ self: {
        ];
        description = "A dynamic/unbounded alternative to Bounded Enum";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rgb-color-model" = callPackage
@@ -204444,6 +217745,8 @@ self: {
        ];
        description = "Haskell rhythm game tutorial";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "riak" = callPackage
@@ -204545,6 +217848,8 @@ self: {
        ];
        description = "Static site generator based on Shake";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rib-core" = callPackage
@@ -204577,6 +217882,8 @@ self: {
        libraryHaskellDepends = [ base Only postgresql-simple text time ];
        description = "Type-level Relational DB combinators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ribosome" = callPackage
@@ -204704,6 +218011,8 @@ self: {
        ];
        description = "Quick metrics to grow your app strong";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ridley-extras" = callPackage
@@ -204721,6 +218030,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Handy metrics that don't belong to ridley";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "riemann" = callPackage
@@ -204750,6 +218061,8 @@ self: {
        ];
        description = "A Riemann client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "riff" = callPackage
@@ -204768,6 +218081,8 @@ self: {
        executableHaskellDepends = [ base bytestring filepath ];
        description = "RIFF parser for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rigel-viz" = callPackage
@@ -204798,6 +218113,8 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck vector ];
        description = "A concurrent, mutable ring-buffer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ring-buffers" = callPackage
@@ -204814,6 +218131,8 @@ self: {
        testHaskellDepends = [ base HUnit primitive QuickCheck ];
        description = "mutable ring buffers with atomic updates in GHC Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rings" = callPackage
@@ -204911,6 +218230,8 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "ripple" = callPackage
@@ -204968,6 +218289,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "RISC-V";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "risc386" = callPackage
@@ -204983,6 +218306,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Reduced instruction set i386 simulator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "riscv-isa" = callPackage
@@ -204997,6 +218322,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Haskell representation of the RISC-V instruction set architecture";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rison" = callPackage
@@ -205028,6 +218355,8 @@ self: {
        libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ];
        description = "Rivers are like Streams, but different";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rivet" = callPackage
@@ -205041,6 +218370,8 @@ self: {
        executableHaskellDepends = [ base rivet-core rivet-simple-deploy ];
        description = "A project management tool for Haskell applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rivet-adaptor-postgresql" = callPackage
@@ -205088,6 +218419,8 @@ self: {
        libraryHaskellDepends = [ base postgresql-simple text ];
        description = "Postgresql migration support for project management tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rivet-simple-deploy" = callPackage
@@ -205099,6 +218432,8 @@ self: {
        libraryHaskellDepends = [ base configurator mtl rivet-core text ];
        description = "Basic deployment support for project management tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rl-satton" = callPackage
@@ -205124,6 +218459,8 @@ self: {
        ];
        description = "Collection of Reinforcement Learning algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rlglue" = callPackage
@@ -205146,6 +218483,8 @@ self: {
        ];
        description = "A Haskell codec for RL-Glue";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rlist" = callPackage
@@ -205181,6 +218520,8 @@ self: {
        executableHaskellDepends = [ ansi-terminal base options time ];
        description = "Ring-LWE/LWR challenges using Lol";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rmonad" = callPackage
@@ -205197,6 +218538,8 @@ self: {
        ];
        description = "Restricted monad library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rncryptor" = callPackage
@@ -205225,6 +218568,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Haskell implementation of the RNCryptor file format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rng-utils" = callPackage
@@ -205263,6 +218608,8 @@ self: {
        testHaskellDepends = [ base directory ];
        description = "Simple projects generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "robin" = callPackage
@@ -205282,6 +218629,8 @@ self: {
        ];
        description = "A build daemon for Haskell development";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roboservant" = callPackage
@@ -205303,6 +218652,8 @@ self: {
        ];
        description = "Automatic session-aware servant testing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "robot" = callPackage
@@ -205336,6 +218687,8 @@ self: {
        ];
        description = "Parser for robots.txt";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roc-cluster" = callPackage
@@ -205350,6 +218703,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        description = "ROC online clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roc-cluster-demo" = callPackage
@@ -205367,6 +218722,8 @@ self: {
        ];
        description = "Gloss interactive demo for roc-cluster package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roc-id" = callPackage
@@ -205411,6 +218768,8 @@ self: {
        ];
        description = "A build system for incremental, parallel, and demand-driven computations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rocksdb-haskell" = callPackage
@@ -205558,6 +218917,8 @@ self: {
        ];
        description = "Bindings to Roku's External Control API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roles" = callPackage
@@ -205585,6 +218946,8 @@ self: {
        ];
        description = "error tracking through rollbar.com";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rollbar-hs" = callPackage
@@ -205607,6 +218970,8 @@ self: {
        ];
        description = "Core Rollbar data types and APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roller" = callPackage
@@ -205627,6 +218992,8 @@ self: {
        ];
        description = "Playing with applicatives and dice!";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rolling-queue" = callPackage
@@ -205703,6 +219070,8 @@ self: {
        ];
        description = "Replicated Data Types (RON-RDT)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ron-schema" = callPackage
@@ -205720,6 +219089,8 @@ self: {
        ];
        description = "RON-Schema";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ron-storage" = callPackage
@@ -205737,6 +219108,8 @@ self: {
        ];
        description = "RON Storage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roots" = callPackage
@@ -205761,6 +219134,8 @@ self: {
        ];
        description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rope-utf16-splay" = callPackage
@@ -205825,6 +219200,8 @@ self: {
        ];
        description = "Various trie implementations in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rose-trie" = callPackage
@@ -205840,6 +219217,8 @@ self: {
        ];
        description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rosebud" = callPackage
@@ -205898,6 +219277,8 @@ self: {
        ];
        description = "Haskell support for the ROS robotics framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rosmsg" = callPackage
@@ -205915,6 +219296,8 @@ self: {
        ];
        description = "ROS message parser, render, TH";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rosmsg-bin" = callPackage
@@ -205932,6 +219315,8 @@ self: {
        ];
        description = "ROS message management tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rospkg" = callPackage
@@ -205963,6 +219348,8 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "General purpose utility library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rot13" = callPackage
@@ -205994,6 +219381,8 @@ self: {
        ];
        description = "Size-limited, concurrent, automatically-rotating log writer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roundRobin" = callPackage
@@ -206028,6 +219417,8 @@ self: {
        testHaskellDepends = [ base long-double ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
 
   "rounded-hw" = callPackage
@@ -206064,6 +219455,8 @@ self: {
        libraryHaskellDepends = [ array base numeric-extras ];
        description = "Explicit floating point rounding mode wrappers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roundtrip" = callPackage
@@ -206099,6 +219492,8 @@ self: {
        ];
        description = "Un-/parse JSON with roundtrip invertible syntax definitions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roundtrip-string" = callPackage
@@ -206131,6 +219526,8 @@ self: {
        ];
        description = "Bidirectional (de-)serialization for XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "route-generator" = callPackage
@@ -206165,6 +219562,8 @@ self: {
        ];
        description = "A library and utilities for creating a route";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "row" = callPackage
@@ -206234,6 +219633,8 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Build records from lists of strings, as from CSV files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rpc" = callPackage
@@ -206250,6 +219651,8 @@ self: {
        ];
        description = "type safe rpcs provided as basic IO actions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rpc-framework" = callPackage
@@ -206268,6 +219671,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "a remote procedure call framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rpf" = callPackage
@@ -206287,6 +219692,8 @@ self: {
        ];
        description = "Receiver Policy Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rpm" = callPackage
@@ -206300,6 +219707,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rpmbuild-order" = callPackage
@@ -206324,6 +219733,8 @@ self: {
        testHaskellDepends = [ base extra hspec simple-cmd unix ];
        description = "Order RPM packages by dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rrule" = callPackage
@@ -206340,6 +219751,8 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "Recurrence rule parser and formatter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rsagl" = callPackage
@@ -206359,6 +219772,8 @@ self: {
        ];
        description = "The RogueStar Animation and Graphics Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rsagl-frp" = callPackage
@@ -206374,6 +219789,8 @@ self: {
        ];
        description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rsagl-math" = callPackage
@@ -206390,6 +219807,8 @@ self: {
        ];
        description = "The RogueStar Animation and Graphics Library: Mathematics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rset" = callPackage
@@ -206414,6 +219833,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Rational Street Performer Protocol solver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rss" = callPackage
@@ -206427,6 +219848,8 @@ self: {
        libraryHaskellDepends = [ base HaXml network network-uri time ];
        description = "A library for generating RSS 2.0 feeds.";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rss-conduit" = callPackage
@@ -206459,6 +219882,8 @@ self: {
        ];
        description = "Streaming parser/renderer for the RSS standard";
        license = stdenv.lib.licenses.cc0;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rss2irc" = callPackage
@@ -206482,6 +219907,8 @@ self: {
        ];
        description = "watches an RSS/Atom feed and writes it to an IRC channel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rstream" = callPackage
@@ -206493,6 +219920,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "stream-fusion framework from vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rtcm" = callPackage
@@ -206521,6 +219950,8 @@ self: {
        ];
        description = "Haskell bindings for RTCM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rtld" = callPackage
@@ -206569,6 +220000,8 @@ self: {
        ];
        description = "Manipulate network devices, addresses, and routes on Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rtorrent-rpc" = callPackage
@@ -206585,6 +220018,8 @@ self: {
        ];
        description = "A library for communicating with RTorrent over its XML-RPC interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rtorrent-state" = callPackage
@@ -206624,6 +220059,8 @@ self: {
        executableHaskellDepends = [ base Cabal process ];
        description = "Dynamically load Haskell libraries";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rubberband" = callPackage
@@ -206660,6 +220097,8 @@ self: {
        ];
        description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ruby-qq" = callPackage
@@ -206676,6 +220115,8 @@ self: {
        ];
        description = "rubyish quasiquoters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ruff" = callPackage
@@ -206687,6 +220128,8 @@ self: {
        libraryHaskellDepends = [ array base mtl parsec safe strict Vec ];
        description = "relatively useful fractal functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ruin" = callPackage
@@ -206708,6 +220151,8 @@ self: {
        ];
        description = "Pliable records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ruler" = callPackage
@@ -206726,6 +220171,8 @@ self: {
        ];
        description = "Ruler tool for UHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ruler-core" = callPackage
@@ -206743,6 +220190,8 @@ self: {
          uulib
        ];
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "run-haskell-module" = callPackage
@@ -206765,6 +220214,8 @@ self: {
        libraryHaskellDepends = [ base primitive primitive-unlifted ];
        description = "runST without boxing penalty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rungekutta" = callPackage
@@ -206776,6 +220227,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of explicit Runge-Kutta methods of various orders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "runghc" = callPackage
@@ -206812,6 +220265,8 @@ self: {
        testHaskellDepends = [ base directory hspec process ];
        description = "Stack wrapper for single-file Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "runmany" = callPackage
@@ -206829,6 +220284,8 @@ self: {
        ];
        description = "Run multiple commands, interleaving output and errors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "runmemo" = callPackage
@@ -206851,6 +220308,8 @@ self: {
        libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ];
        description = "Runtime generation of Arbitrary values";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rv" = callPackage
@@ -206914,6 +220373,8 @@ self: {
        ];
        description = "Packet Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "s-cargot" = callPackage
@@ -206955,6 +220416,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "simple general-purpose s-expressions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "s3-signer" = callPackage
@@ -207014,6 +220477,8 @@ self: {
        ];
        description = "A monadic buffer resilient to exceptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-coerce" = callPackage
@@ -207025,6 +220490,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A friendly shorthand for an old friend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-decimal" = callPackage
@@ -207122,6 +220589,8 @@ self: {
        libraryHaskellDepends = [ base indexed mtl vector ];
        description = "Support for safely freezing multiple arrays in the ST monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-globals" = callPackage
@@ -207133,6 +220602,8 @@ self: {
        libraryHaskellDepends = [ base stm template-haskell ];
        description = "Safe top-level mutable variables which scope like ordinary values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-json" = callPackage
@@ -207171,6 +220642,8 @@ self: {
        ];
        description = "A library providing safe lazy IO features";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-length" = callPackage
@@ -207188,6 +220661,8 @@ self: {
        ];
        description = "Tired of accidentally calling length on tuples? Relief at last!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-money" = callPackage
@@ -207309,6 +220784,8 @@ self: {
        ];
        description = "A small wrapper over hs-plugins to allow loading safe plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-printf" = callPackage
@@ -207328,6 +220805,8 @@ self: {
        ];
        description = "Well-typed, flexible and variadic printf for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-tensor" = callPackage
@@ -207383,6 +220862,8 @@ self: {
        ];
        description = "Making SafeCopy migrations easier";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safecopy-store" = callPackage
@@ -207406,6 +220887,8 @@ self: {
        ];
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safeint" = callPackage
@@ -207423,6 +220906,8 @@ self: {
        ];
        description = "overflow-checked Int type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safeio" = callPackage
@@ -207457,6 +220942,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Safe Paths in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safer-file-handles" = callPackage
@@ -207473,6 +220960,8 @@ self: {
        ];
        description = "Type-safe file handling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safer-file-handles-bytestring" = callPackage
@@ -207489,6 +220978,8 @@ self: {
        ];
        description = "Extends safer-file-handles with ByteString operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safer-file-handles-text" = callPackage
@@ -207504,6 +220995,8 @@ self: {
        ];
        description = "Extends safer-file-handles with Text operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "saferoute" = callPackage
@@ -207515,6 +221008,8 @@ self: {
        libraryHaskellDepends = [ base blaze-html containers text ];
        description = "A simple type-safe routing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sai-shape-syb" = callPackage
@@ -207530,6 +221025,8 @@ self: {
        ];
        description = "Obtain homogeneous values from arbitrary values, transforming or culling data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sajson" = callPackage
@@ -207552,6 +221049,8 @@ self: {
        ];
        description = "Fast JSON parsing powered by Chad Austin's sajson library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sak" = callPackage
@@ -207573,6 +221072,8 @@ self: {
        executableToolDepends = [ cpphs ];
        description = "Compression command-line tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sakuraio-platform" = callPackage
@@ -207644,6 +221145,8 @@ self: {
        ];
        description = "Configuration Loader for toml";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "salak-yaml" = callPackage
@@ -207703,6 +221206,8 @@ self: {
        ];
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libsodium;};
 
   "salve" = callPackage
@@ -207735,6 +221240,8 @@ self: {
        ];
        description = "Modular web application framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "salvia-demo" = callPackage
@@ -207757,6 +221264,8 @@ self: {
        doHaddock = false;
        description = "Demo Salvia servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "salvia-extras" = callPackage
@@ -207777,6 +221286,8 @@ self: {
        ];
        description = "Collection of non-fundamental handlers for the Salvia web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "salvia-protocol" = callPackage
@@ -207793,6 +221304,8 @@ self: {
        ];
        description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "salvia-sessions" = callPackage
@@ -207810,6 +221323,8 @@ self: {
        ];
        description = "Session support for the Salvia webserver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "salvia-websocket" = callPackage
@@ -207826,6 +221341,8 @@ self: {
        ];
        description = "Websocket implementation for the Salvia Webserver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sample-frame" = callPackage
@@ -207882,6 +221399,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "samtools-conduit" = callPackage
@@ -207902,6 +221421,8 @@ self: {
        ];
        description = "Conduit interface to SAM/BAM format files through samtools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "samtools-enumerator" = callPackage
@@ -207917,6 +221438,8 @@ self: {
        ];
        description = "Enumerator interface to SamTools library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "samtools-iteratee" = callPackage
@@ -207933,6 +221456,8 @@ self: {
        ];
        description = "Iteratee interface to SamTools library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sandi" = callPackage
@@ -207963,6 +221488,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "SAND data serialization and manipulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sandman" = callPackage
@@ -207981,6 +221508,8 @@ self: {
        ];
        description = "Manages Cabal sandboxes to avoid rebuilding packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sarasvati" = callPackage
@@ -207992,6 +221521,8 @@ self: {
        libraryHaskellDepends = [ base deepseq portaudio ];
        description = "audio library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sarsi" = callPackage
@@ -208019,6 +221550,8 @@ self: {
        ];
        description = "A universal quickfix toolkit and his protocol";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sasl" = callPackage
@@ -208035,6 +221568,8 @@ self: {
        ];
        description = "SASL implementation using simple-pipe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sat" = callPackage
@@ -208048,6 +221583,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "CNF SATisfier";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sat-micro-hs" = callPackage
@@ -208065,6 +221602,8 @@ self: {
        ];
        description = "A minimal SAT solver";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "satchmo" = callPackage
@@ -208083,6 +221622,8 @@ self: {
        testHaskellDepends = [ array base ];
        description = "SAT encoding monad";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "satchmo-backends" = callPackage
@@ -208098,6 +221639,8 @@ self: {
        ];
        description = "driver for external satchmo backends";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "satchmo-examples" = callPackage
@@ -208115,6 +221658,8 @@ self: {
        ];
        description = "examples that show how to use satchmo";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "satchmo-funsat" = callPackage
@@ -208130,6 +221675,8 @@ self: {
        ];
        description = "funsat driver as backend for satchmo";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "satchmo-minisat" = callPackage
@@ -208141,6 +221688,8 @@ self: {
        libraryHaskellDepends = [ base containers process satchmo ];
        description = "minisat driver as backend for satchmo";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "satchmo-toysat" = callPackage
@@ -208156,6 +221705,8 @@ self: {
        ];
        description = "toysat driver as backend for satchmo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "savage" = callPackage
@@ -208174,6 +221725,8 @@ self: {
        ];
        description = "re-export of the random generators from Hedgehog";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sax" = callPackage
@@ -208192,6 +221745,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Monadic streaming XML parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "say" = callPackage
@@ -208319,6 +221874,8 @@ self: {
        ];
        description = "Formally prove properties of Haskell programs using SBV/SMT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sc2-lowlevel" = callPackage
@@ -208338,6 +221895,8 @@ self: {
        ];
        description = "Low-level Starcraft II API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sc2-proto" = callPackage
@@ -208357,6 +221916,8 @@ self: {
        libraryToolDepends = [ proto-lens-protoc protoc ];
        description = "A protocol buffer model for the Starcraft II bot API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {protoc = null;};
 
   "sc2-support" = callPackage
@@ -208373,6 +221934,8 @@ self: {
        ];
        description = "Support and utility library for sc2hs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sc2hs" = callPackage
@@ -208413,6 +221976,8 @@ self: {
        libraryHaskellDepends = [ base hsc3 hsc3-db ];
        description = "Haskell bindings to sc3-rdu (sc3 rd ugens)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scalable-server" = callPackage
@@ -208430,6 +221995,8 @@ self: {
        ];
        description = "Library for writing fast/scalable TCP-based services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scaleimage" = callPackage
@@ -208443,6 +222010,8 @@ self: {
        executableHaskellDepends = [ base filepath gd ];
        description = "Scale an image to a new geometry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scalendar" = callPackage
@@ -208459,6 +222028,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "scalp-webhooks" = callPackage
@@ -208485,6 +222056,8 @@ self: {
        ];
        description = "Test webhooks locally";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scalpel" = callPackage
@@ -208536,6 +222109,8 @@ self: {
        ];
        description = "scalpel scrapers for search engines";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scan" = callPackage
@@ -208568,6 +222143,8 @@ self: {
        ];
        description = "Metadata types for Albedo Scanners";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scan-vector-machine" = callPackage
@@ -208580,6 +222157,8 @@ self: {
        testHaskellDepends = [ array base HUnit ];
        description = "An implementation of the Scan Vector Machine instruction set in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scanf" = callPackage
@@ -208676,6 +222255,8 @@ self: {
        ];
        description = "Streaming component combinators";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scenegraph" = callPackage
@@ -208692,6 +222273,8 @@ self: {
        ];
        description = "Scene Graph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scgi" = callPackage
@@ -208707,6 +222290,8 @@ self: {
        ];
        description = "A Haskell library for writing SCGI programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "schedevr" = callPackage
@@ -208724,6 +222309,8 @@ self: {
        ];
        description = "Marge schedules and show EVR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "schedule" = callPackage
@@ -208764,6 +222351,8 @@ self: {
        ];
        description = "Find the ideal lesson layout";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scheduler" = callPackage
@@ -208795,6 +222384,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Exposes standard POSIX function sched_yield";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "schema" = callPackage
@@ -208809,6 +222400,8 @@ self: {
        ];
        description = "Encoding-independent schemas for Haskell data types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "schemas" = callPackage
@@ -208833,6 +222426,8 @@ self: {
        ];
        description = "schema guided serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "schematic" = callPackage
@@ -208861,6 +222456,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "JSON-biased spec and validation tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scholdoc" = callPackage
@@ -208905,6 +222502,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scholdoc-citeproc" = callPackage
@@ -208938,6 +222537,8 @@ self: {
        ];
        description = "Scholdoc fork of pandoc-citeproc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scholdoc-texmath" = callPackage
@@ -208960,6 +222561,8 @@ self: {
        ];
        description = "Scholdoc fork of texmath";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scholdoc-types" = callPackage
@@ -208975,6 +222578,8 @@ self: {
        ];
        description = "Scholdoc fork of pandoc-types";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "schonfinkeling" = callPackage
@@ -208998,6 +222603,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Rational numbers in scientific notation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scidb-hquery" = callPackage
@@ -209031,6 +222638,8 @@ self: {
        ];
        description = "Haskell query for SciDB via shim";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "science-constants" = callPackage
@@ -209104,6 +222713,8 @@ self: {
        ];
        description = "Scientific notation intended for tokenization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scion" = callPackage
@@ -209129,6 +222740,8 @@ self: {
        ];
        description = "Haskell IDE library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scion-browser" = callPackage
@@ -209163,6 +222776,8 @@ self: {
        ];
        description = "Command-line interface for browsing and searching packages documentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scons2dot" = callPackage
@@ -209176,6 +222791,8 @@ self: {
        executableHaskellDepends = [ base bytestring containers process ];
        description = "Generates graphviz file of scons dependency information";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scope" = callPackage
@@ -209193,6 +222810,8 @@ self: {
        ];
        description = "An interactive renderer for plotting time-series data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scope-cairo" = callPackage
@@ -209216,6 +222835,8 @@ self: {
        ];
        description = "An interactive renderer for plotting time-series data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scottish" = callPackage
@@ -209233,6 +222854,8 @@ self: {
        ];
        description = "scotty with batteries included";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty" = callPackage
@@ -209284,6 +222907,8 @@ self: {
        ];
        description = "The Play Framework style data binding in Scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-blaze" = callPackage
@@ -209298,6 +222923,8 @@ self: {
        ];
        description = "blaze-html integration for Scotty";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-cookie" = callPackage
@@ -209338,6 +222965,8 @@ self: {
        ];
        description = "Fay integration for Scotty";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-form" = callPackage
@@ -209351,6 +222980,8 @@ self: {
        ];
        description = "Html form validation using `ditto`";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-format" = callPackage
@@ -209367,6 +222998,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Response format helper for the Scotty web framework";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-hastache" = callPackage
@@ -209383,6 +223016,8 @@ self: {
        ];
        description = "Easy Mustache templating support for Scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-haxl" = callPackage
@@ -209410,6 +223045,8 @@ self: {
        ];
        description = "HTTP-request's query parameters parser abstraction for \"scotty\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-path-normalizer" = callPackage
@@ -209437,6 +223074,8 @@ self: {
        ];
        description = "A Better way of modeling web resources";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-rest" = callPackage
@@ -209462,6 +223101,8 @@ self: {
        ];
        description = "Webmachine-style REST library for scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-session" = callPackage
@@ -209480,6 +223121,8 @@ self: {
        ];
        description = "Adding session functionality to scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-tls" = callPackage
@@ -209493,6 +223136,8 @@ self: {
        ];
        description = "TLS for Scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-utils" = callPackage
@@ -209524,6 +223169,8 @@ self: {
        libraryHaskellDepends = [ base scotty text transformers ];
        executableHaskellDepends = [ base scotty text transformers ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scp-streams" = callPackage
@@ -209545,6 +223192,8 @@ self: {
        testHaskellDepends = [ base bytestring io-streams ];
        description = "An SCP protocol implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scrabble-bot" = callPackage
@@ -209564,6 +223213,8 @@ self: {
        ];
        description = "Scrabble play generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scrapbook" = callPackage
@@ -209591,6 +223242,8 @@ self: {
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scrape-changes" = callPackage
@@ -209617,6 +223270,8 @@ self: {
        ];
        description = "Scrape websites for changes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "script-monad" = callPackage
@@ -209643,6 +223298,8 @@ self: {
        ];
        description = "Stack of error, reader, writer, state, and prompt monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scrobble" = callPackage
@@ -209665,6 +223322,8 @@ self: {
        ];
        description = "Scrobbling server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scroll" = callPackage
@@ -209761,6 +223420,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Fast CSV lexing on ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scyther-proof" = callPackage
@@ -209782,6 +223443,8 @@ self: {
        executableToolDepends = [ alex ];
        description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sde-solver" = callPackage
@@ -209800,6 +223463,8 @@ self: {
        ];
        description = "Distributed SDE solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sdf2p1-parser" = callPackage
@@ -209877,6 +223542,8 @@ self: {
        ];
        description = "An image loading and rendering library for sdl2 / sdl2-cairo";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sdl2-compositor" = callPackage
@@ -209900,6 +223567,8 @@ self: {
        ];
        description = "image compositing with sdl2 - declarative style";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sdl2-fps" = callPackage
@@ -209913,6 +223582,8 @@ self: {
        libraryHaskellDepends = [ base sdl2 ];
        description = "Run of the mill, frames per second timer implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sdl2-gfx" = callPackage
@@ -210097,6 +223768,8 @@ self: {
        libraryHaskellDepends = [ base bytestring free mtl text ];
        description = "Pure SQL layer on top of other libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seakale-postgresql" = callPackage
@@ -210112,6 +223785,8 @@ self: {
        ];
        description = "PostgreSQL backend for Seakale";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seakale-tests" = callPackage
@@ -210127,6 +223802,8 @@ self: {
        ];
        description = "Helpers to test code using Seakale";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seal-module" = callPackage
@@ -210179,6 +223856,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Semantic Editor Combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secd" = callPackage
@@ -210209,6 +223888,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "SECDH Machine Simulator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seclib" = callPackage
@@ -210220,6 +223901,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple library for static information-flow security in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "second-transfer" = callPackage
@@ -210247,6 +223930,8 @@ self: {
        testToolDepends = [ cpphs ];
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secp256k1" = callPackage
@@ -210270,6 +223955,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) secp256k1;};
 
   "secp256k1-haskell" = callPackage
@@ -210320,6 +224007,8 @@ self: {
        ];
        description = "fork of secp256k1";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secret-santa" = callPackage
@@ -210337,6 +224026,8 @@ self: {
        ];
        description = "Secret Santa game assigner using QR-Codes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secret-sharing" = callPackage
@@ -210370,6 +224061,8 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "Example of writing \"secure\" file removal in Haskell rather than C";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secure-sockets" = callPackage
@@ -210385,6 +224078,8 @@ self: {
        ];
        description = "Secure point-to-point connectivity library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secureUDP" = callPackage
@@ -210396,6 +224091,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers network ];
        description = "Setups secure (unsorted) UDP packet transfer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "securemem" = callPackage
@@ -210425,6 +224122,8 @@ self: {
        librarySystemDepends = [ sedna ];
        description = "Sedna C API XML Binding";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {sedna = null;};
 
   "seitz-symbol" = callPackage
@@ -210444,6 +224143,8 @@ self: {
        ];
        description = "Read and Display Seitz Symbol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "selda" = callPackage
@@ -210566,6 +224267,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "CSS Selectors for DOM traversal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "selenium" = callPackage
@@ -210577,6 +224280,8 @@ self: {
        libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ];
        description = "Test web applications through a browser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "selenium-server" = callPackage
@@ -210596,6 +224301,8 @@ self: {
        testHaskellDepends = [ base hspec text webdriver ];
        description = "Run the selenium standalone server for usage with webdriver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "self-extract" = callPackage
@@ -210615,6 +224322,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A Haskell library to make self-extracting executables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "selfrestart" = callPackage
@@ -210638,6 +224347,8 @@ self: {
        librarySystemDepends = [ selinux ];
        description = "SELinux bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {selinux = null;};
 
   "semantic" = callPackage
@@ -210669,6 +224380,8 @@ self: {
        ];
        description = "Types and functionality for working with source code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semaphore-plus" = callPackage
@@ -210700,6 +224413,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Evaluate code snippets in Literate Haskell";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semi-iso" = callPackage
@@ -210715,6 +224430,8 @@ self: {
        ];
        description = "Weakened partial isomorphisms, reversible computations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semialign" = callPackage
@@ -210749,6 +224466,8 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Extra functions for working with Semialigns";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semialign-indexed" = callPackage
@@ -210797,6 +224516,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A Haskell implementation of semibounded lattices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semigroupoid-extras" = callPackage
@@ -210851,6 +224572,8 @@ self: {
        ];
        description = "RebindableSyntax using the semigroupoids package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semigroups" = callPackage
@@ -210873,6 +224596,8 @@ self: {
        libraryHaskellDepends = [ base containers semigroups ];
        description = "Semigroups actions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semilattices" = callPackage
@@ -210904,6 +224629,8 @@ self: {
        libraryHaskellDepends = [ base Boolean containers monoids ];
        description = "Semirings, ring-like structures used for dynamic programming applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semiring-num" = callPackage
@@ -210929,6 +224656,8 @@ self: {
        ];
        description = "Basic semiring class and instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semiring-simple" = callPackage
@@ -211019,6 +224748,8 @@ self: {
        ];
        description = "Sengrid API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sendgrid-v3" = callPackage
@@ -211033,6 +224764,8 @@ self: {
        testHaskellDepends = [ base semigroups tasty tasty-hunit text ];
        description = "Sendgrid v3 API library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sensei" = callPackage
@@ -211060,6 +224793,8 @@ self: {
        ];
        description = "Automatically run Hspec tests on file modifications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sensenet" = callPackage
@@ -211077,6 +224812,8 @@ self: {
        ];
        description = "Distributed sensor network for the raspberry pi";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sensu-run" = callPackage
@@ -211098,6 +224835,8 @@ self: {
        ];
        description = "A tool to send command execution results to Sensu";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sentence-jp" = callPackage
@@ -211111,6 +224850,8 @@ self: {
        ];
        description = "Easily generating message of japanese natural language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sentiwordnet-parser" = callPackage
@@ -211147,6 +224888,8 @@ self: {
        executableHaskellDepends = [ base directory filepath unix ];
        description = "Process monitoring tool written and configured in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "senza" = callPackage
@@ -211194,6 +224937,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "SmartyPants for Korean language";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "separated" = callPackage
@@ -211240,6 +224985,8 @@ self: {
        ];
        description = "Dynamic strictness control, including space leak repair";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seqalign" = callPackage
@@ -211293,6 +225040,8 @@ self: {
        ];
        description = "Handle sequence locations for bioinformatics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seqloc-datafiles" = callPackage
@@ -211326,6 +225075,8 @@ self: {
        ];
        description = "Read and write BED and GTF format genome annotations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sequence" = callPackage
@@ -211404,6 +225155,8 @@ self: {
        ];
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sequential-index" = callPackage
@@ -211438,6 +225191,8 @@ self: {
        ];
        description = "A sequence labeler based on Collins's sequence perceptron";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serf" = callPackage
@@ -211552,6 +225307,8 @@ self: {
        ];
        description = "Instances for Serialize of cereal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serialport" = callPackage
@@ -211594,6 +225351,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "General-purpose functions by Serokell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serpentine" = callPackage
@@ -211612,6 +225371,8 @@ self: {
        executableHaskellDepends = [ base singletons text ];
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serv" = callPackage
@@ -211625,6 +225386,8 @@ self: {
        ];
        description = "Dependently typed API framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serv-wai" = callPackage
@@ -211649,6 +225412,8 @@ self: {
        ];
        description = "Dependently typed API servers with Serv";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant" = callPackage
@@ -211675,6 +225440,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-JuicyPixels" = callPackage
@@ -211695,6 +225462,8 @@ self: {
        ];
        description = "Servant support for JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-aeson-specs" = callPackage
@@ -211720,6 +225489,8 @@ self: {
        ];
        description = "generic tests for aeson serialization in servant";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth" = callPackage
@@ -211735,6 +225506,8 @@ self: {
        ];
        description = "Authentication combinators for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-client" = callPackage
@@ -211759,6 +225532,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-client/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-cookie" = callPackage
@@ -211789,6 +225564,8 @@ self: {
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-docs" = callPackage
@@ -211813,6 +225590,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-docs/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-hmac" = callPackage
@@ -211848,6 +225627,8 @@ self: {
        ];
        description = "Authentication via HMAC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-server" = callPackage
@@ -211876,6 +225657,8 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-swagger" = callPackage
@@ -211896,6 +225679,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-swagger/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token" = callPackage
@@ -211915,6 +225700,8 @@ self: {
        ];
        description = "Servant based API and server for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-acid" = callPackage
@@ -211936,6 +225723,8 @@ self: {
        ];
        description = "Acid-state backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-api" = callPackage
@@ -211952,6 +225741,8 @@ self: {
        ];
        description = "Servant based API for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-leveldb" = callPackage
@@ -211973,6 +225764,8 @@ self: {
        ];
        description = "Leveldb backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-persistent" = callPackage
@@ -211992,6 +225785,8 @@ self: {
        ];
        description = "Persistent backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-rocksdb" = callPackage
@@ -212014,6 +225809,8 @@ self: {
        ];
        description = "RocksDB backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-wordpress" = callPackage
@@ -212029,6 +225826,8 @@ self: {
        ];
        description = "Authenticate Routes Using Wordpress Cookies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-avro" = callPackage
@@ -212046,6 +225845,8 @@ self: {
        ];
        description = "Avro content type for Servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-blaze" = callPackage
@@ -212060,6 +225861,8 @@ self: {
        testHaskellDepends = [ base blaze-html servant-server wai warp ];
        description = "Blaze-html support for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-cassava" = callPackage
@@ -212081,6 +225884,8 @@ self: {
        ];
        description = "Servant CSV content-type for cassava";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-checked-exceptions" = callPackage
@@ -212105,6 +225910,8 @@ self: {
        ];
        description = "Checked exceptions for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-checked-exceptions-core" = callPackage
@@ -212126,6 +225933,8 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "Checked exceptions for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-cli" = callPackage
@@ -212153,6 +225962,8 @@ self: {
        ];
        description = "Command line interface for Servant API clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-client" = callPackage
@@ -212185,6 +225996,8 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-client-core" = callPackage
@@ -212208,6 +226021,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Core functionality and class for client function generation for servant APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-client-js" = callPackage
@@ -212227,6 +226042,8 @@ self: {
        ];
        description = "A servant client for frontend JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-client-namedargs" = callPackage
@@ -212248,6 +226065,8 @@ self: {
        ];
        description = "Automatically derive API client functions with named and optional parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-conduit" = callPackage
@@ -212268,6 +226087,8 @@ self: {
        ];
        description = "Servant Stream support for conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-csharp" = callPackage
@@ -212287,6 +226108,8 @@ self: {
        ];
        description = "Generate servant client library for C#";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-db" = callPackage
@@ -212298,6 +226121,8 @@ self: {
        libraryHaskellDepends = [ base servant ];
        description = "Servant types for defining API with relational DBs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-db-postgresql" = callPackage
@@ -212323,6 +226148,8 @@ self: {
        ];
        description = "Derive a postgres client to database API specified by servant-db";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-dhall" = callPackage
@@ -212344,6 +226171,8 @@ self: {
        ];
        description = "Servant Dhall content-type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-docs" = callPackage
@@ -212372,6 +226201,8 @@ self: {
        ];
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-docs-simple" = callPackage
@@ -212394,6 +226225,8 @@ self: {
        ];
        description = "Generate endpoints overview for Servant API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-ede" = callPackage
@@ -212417,6 +226250,8 @@ self: {
        ];
        description = "Combinators for rendering EDE templates in servant web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-ekg" = callPackage
@@ -212443,6 +226278,8 @@ self: {
        ];
        description = "Helpers for using ekg with servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-elm" = callPackage
@@ -212465,6 +226302,8 @@ self: {
        ];
        description = "Automatically derive Elm functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-errors" = callPackage
@@ -212488,6 +226327,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Servant Errors wai-middlware";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-examples" = callPackage
@@ -212510,6 +226351,8 @@ self: {
        ];
        description = "Example programs for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-exceptions" = callPackage
@@ -212530,6 +226373,8 @@ self: {
          aeson base exceptions http-types servant-server text warp
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-fiat-content" = callPackage
@@ -212543,6 +226388,8 @@ self: {
        ];
        description = "Fiat content types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-flatten" = callPackage
@@ -212554,6 +226401,8 @@ self: {
        libraryHaskellDepends = [ base servant ];
        description = "Utilities for flattening servant API types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-foreign" = callPackage
@@ -212571,6 +226420,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Helpers for generating clients for servant APIs in any programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-generate" = callPackage
@@ -212584,6 +226435,8 @@ self: {
        libraryHaskellDepends = [ base servant servant-server ];
        description = "Utilities for generating mock server implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-generic" = callPackage
@@ -212600,6 +226453,8 @@ self: {
        ];
        description = "Specify Servant APIs with records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-github" = callPackage
@@ -212623,6 +226478,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings to GitHub API using servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-github-webhook" = callPackage
@@ -212645,6 +226502,8 @@ self: {
        ];
        description = "Servant combinators to facilitate writing GitHub webhooks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-haxl-client" = callPackage
@@ -212672,6 +226531,8 @@ self: {
        ];
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-hmac-auth" = callPackage
@@ -212698,6 +226559,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Servant authentication with HMAC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-http-streams" = callPackage
@@ -212733,6 +226596,8 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-http2-client" = callPackage
@@ -212757,6 +226622,8 @@ self: {
        ];
        description = "Generate HTTP2 clients from Servant API descriptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-iCalendar" = callPackage
@@ -212773,6 +226640,8 @@ self: {
        ];
        description = "Servant support for iCalendar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-jquery" = callPackage
@@ -212791,6 +226660,8 @@ self: {
        ];
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-js" = callPackage
@@ -212814,6 +226685,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Automatically derive javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-jsonrpc" = callPackage
@@ -212825,6 +226698,8 @@ self: {
        libraryHaskellDepends = [ aeson base servant ];
        description = "JSON-RPC messages and endpoints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-jsonrpc-client" = callPackage
@@ -212840,6 +226715,8 @@ self: {
        ];
        description = "Generate JSON-RPC servant clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-jsonrpc-server" = callPackage
@@ -212855,6 +226732,8 @@ self: {
        ];
        description = "JSON-RPC servant servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-kotlin" = callPackage
@@ -212880,6 +226759,8 @@ self: {
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-lucid" = callPackage
@@ -212894,6 +226775,8 @@ self: {
        testHaskellDepends = [ base lucid servant-server wai warp ];
        description = "Servant support for lucid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-machines" = callPackage
@@ -212912,6 +226795,8 @@ self: {
        ];
        description = "Servant Stream support for machines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-match" = callPackage
@@ -212928,6 +226813,8 @@ self: {
        testHaskellDepends = [ base hspec network-uri servant text ];
        description = "Standalone implementation of servant’s dispatching mechanism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-matrix-param" = callPackage
@@ -212948,6 +226835,8 @@ self: {
        ];
        description = "Matrix parameter combinator for servant";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-mock" = callPackage
@@ -212976,6 +226865,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-multipart" = callPackage
@@ -213008,6 +226899,8 @@ self: {
        ];
        description = "multipart/form-data (e.g file upload) support for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-named" = callPackage
@@ -213026,6 +226919,8 @@ self: {
        ];
        description = "Add named endpoints to servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-namedargs" = callPackage
@@ -213038,6 +226933,8 @@ self: {
        testHaskellDepends = [ base hspec named QuickCheck servant ];
        description = "Combinators for servant providing named parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-nix" = callPackage
@@ -213059,6 +226956,8 @@ self: {
        ];
        description = "Servant Nix content-type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-openapi3" = callPackage
@@ -213087,6 +226986,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-options" = callPackage
@@ -213102,6 +227003,8 @@ self: {
        ];
        description = "Provide responses to OPTIONS requests for Servant applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-pagination" = callPackage
@@ -213120,6 +227023,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck servant-server text ];
        description = "Type-safe pagination for Servant APIs";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-pandoc" = callPackage
@@ -213137,6 +227042,8 @@ self: {
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-pipes" = callPackage
@@ -213158,6 +227065,8 @@ self: {
        ];
        description = "Servant Stream support for pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-pool" = callPackage
@@ -213171,6 +227080,8 @@ self: {
        libraryHaskellDepends = [ base resource-pool servant time ];
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-postgresql" = callPackage
@@ -213187,6 +227098,8 @@ self: {
        ];
        description = "Useful functions and instances for using servant with a PostgreSQL context";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-proto-lens" = callPackage
@@ -213209,6 +227122,8 @@ self: {
        ];
        description = "Servant Content-Type for proto-lens protobuf modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-purescript" = callPackage
@@ -213232,6 +227147,8 @@ self: {
        ];
        description = "Generate PureScript accessor functions for you servant API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-pushbullet-client" = callPackage
@@ -213251,6 +227168,8 @@ self: {
        ];
        description = "Bindings to the Pushbullet API using servant-client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-py" = callPackage
@@ -213272,6 +227191,8 @@ self: {
        ];
        description = "Automatically derive python functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-quickcheck" = callPackage
@@ -213300,6 +227221,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-rawm" = callPackage
@@ -213311,6 +227234,8 @@ self: {
        libraryHaskellDepends = [ base servant ];
        description = "Embed a raw 'Application' in a Servant API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-rawm-client" = callPackage
@@ -213322,6 +227247,8 @@ self: {
        libraryHaskellDepends = [ base servant-client-core servant-rawm ];
        description = "The client implementation of servant-rawm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-rawm-docs" = callPackage
@@ -213337,6 +227264,8 @@ self: {
        ];
        description = "Documentation generator for 'RawM' endpoints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-rawm-server" = callPackage
@@ -213353,6 +227282,8 @@ self: {
        ];
        description = "The server implementation of servant-rawm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-reason" = callPackage
@@ -213373,6 +227304,8 @@ self: {
        ];
        description = "Derive Reason types to interact with a Haskell backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-reflex" = callPackage
@@ -213395,6 +227328,8 @@ self: {
        ];
        description = "servant API generator for reflex apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-response" = callPackage
@@ -213427,6 +227362,8 @@ self: {
        ];
        description = "Servant router for non-server applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-ruby" = callPackage
@@ -213441,6 +227378,8 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Generate a Ruby client from a Servant API with Net::HTTP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-scotty" = callPackage
@@ -213459,6 +227398,8 @@ self: {
        ];
        description = "Generate a web service for servant 'Resource's using scotty and JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-seo" = callPackage
@@ -213481,6 +227422,8 @@ self: {
        ];
        description = "Generate Robots.txt and Sitemap.xml specification for your servant API.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-serf" = callPackage
@@ -213500,6 +227443,8 @@ self: {
        doHaddock = false;
        description = "Generates a servant API module";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-server" = callPackage
@@ -213537,6 +227482,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-server-namedargs" = callPackage
@@ -213554,6 +227501,8 @@ self: {
        ];
        description = "Automatically derive API server functions with named and optional parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-smsc-ru" = callPackage
@@ -213576,6 +227525,8 @@ self: {
        ];
        description = "Servant client for smsc.ru service for sending SMS to cell phones";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-snap" = callPackage
@@ -213613,6 +227564,8 @@ self: {
        ];
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-stache" = callPackage
@@ -213635,6 +227588,8 @@ self: {
        ];
        description = "Content-Types for rendering Mustache in servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-static-th" = callPackage
@@ -213661,6 +227616,8 @@ self: {
        ];
        description = "Embed a directory of static files in your Servant server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-streaming" = callPackage
@@ -213675,6 +227632,8 @@ self: {
        testHaskellDepends = [ base hspec http-types QuickCheck servant ];
        description = "Servant combinators for the 'streaming' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-streaming-client" = callPackage
@@ -213700,6 +227659,8 @@ self: {
        ];
        description = "Client instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-streaming-docs" = callPackage
@@ -213717,6 +227678,8 @@ self: {
        ];
        description = "Client instances for the 'servant-docs' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-streaming-server" = callPackage
@@ -213743,6 +227706,8 @@ self: {
        ];
        description = "Server instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-subscriber" = callPackage
@@ -213769,6 +227734,8 @@ self: {
        executableHaskellDepends = [ base purescript-bridge ];
        description = "When REST is not enough ...";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-swagger" = callPackage
@@ -213797,6 +227764,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-swagger-tags" = callPackage
@@ -213813,6 +227782,8 @@ self: {
        ];
        description = "Swagger Tags for Servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-swagger-ui" = callPackage
@@ -213829,6 +227800,8 @@ self: {
        ];
        description = "Servant swagger ui";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-swagger-ui-core" = callPackage
@@ -213849,6 +227822,8 @@ self: {
        ];
        description = "Servant swagger ui core components";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-swagger-ui-jensoleg" = callPackage
@@ -213867,6 +227842,8 @@ self: {
        ];
        description = "Servant swagger ui: Jens-Ole Graulund theme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-swagger-ui-redoc" = callPackage
@@ -213885,6 +227862,8 @@ self: {
        ];
        description = "Servant swagger ui: ReDoc theme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-to-elm" = callPackage
@@ -213907,6 +227886,8 @@ self: {
        ];
        description = "Automatically generate Elm clients for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-tracing" = callPackage
@@ -213937,6 +227918,8 @@ self: {
          transformers
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-waargonaut" = callPackage
@@ -213961,6 +227944,8 @@ self: {
        ];
        description = "Servant Integration for Waargonaut JSON Package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-wasm" = callPackage
@@ -213979,6 +227964,8 @@ self: {
        ];
        description = "Servant support for delivering WebAssembly";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-websockets" = callPackage
@@ -214001,6 +227988,8 @@ self: {
        ];
        description = "Small library providing WebSocket endpoints for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-xml" = callPackage
@@ -214016,6 +228005,8 @@ self: {
        ];
        description = "Servant support for the XML Content-Type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-yaml" = callPackage
@@ -214037,6 +228028,8 @@ self: {
        ];
        description = "Servant support for yaml";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-zeppelin" = callPackage
@@ -214048,6 +228041,8 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Types and definitions of servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-zeppelin-client" = callPackage
@@ -214071,6 +228066,8 @@ self: {
        ];
        description = "Client library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-zeppelin-server" = callPackage
@@ -214094,6 +228091,8 @@ self: {
        ];
        description = "Server library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-zeppelin-swagger" = callPackage
@@ -214115,6 +228114,8 @@ self: {
        ];
        description = "Swagger instances for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "server-generic" = callPackage
@@ -214130,6 +228131,8 @@ self: {
        ];
        description = "Auto-generate a server for your datatype";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serverless-haskell" = callPackage
@@ -214201,6 +228204,8 @@ self: {
        ];
        description = "Storage backend for serversession using acid-state";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serversession-backend-persistent" = callPackage
@@ -214227,6 +228232,8 @@ self: {
        ];
        description = "Storage backend for serversession using persistent and an RDBMS";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serversession-backend-redis" = callPackage
@@ -214248,6 +228255,8 @@ self: {
        ];
        description = "Storage backend for serversession using Redis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serversession-frontend-snap" = callPackage
@@ -214300,6 +228309,8 @@ self: {
        ];
        description = "Yesod bindings for serversession";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "services" = callPackage
@@ -214317,6 +228328,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Tools for building services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serviette" = callPackage
@@ -214382,6 +228395,8 @@ self: {
        ];
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sessions" = callPackage
@@ -214396,6 +228411,8 @@ self: {
        ];
        description = "Session Types for Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sessiontypes" = callPackage
@@ -214417,6 +228434,8 @@ self: {
        testHaskellDepends = [ base directory exceptions hspec ];
        description = "Session types library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sessiontypes-distributed" = callPackage
@@ -214439,6 +228458,8 @@ self: {
        ];
        description = "Session types distributed";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "set-cover" = callPackage
@@ -214500,6 +228521,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Sets of fixed size, with typelits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "set-with" = callPackage
@@ -214517,6 +228540,8 @@ self: {
        ];
        description = "Set of elements sorted by a different data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "setdown" = callPackage
@@ -214565,6 +228590,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A console interface to the game of Set";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "setlocale" = callPackage
@@ -214596,6 +228623,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A Haskell implementation of setoid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "setop" = callPackage
@@ -214673,6 +228702,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Small (TH) library to declare setters for typical `record' data type fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "settings" = callPackage
@@ -214708,6 +228739,8 @@ self: {
        ];
        description = "S-Expression parsing/printing made fun and easy";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sexp-grammar" = callPackage
@@ -214784,6 +228817,8 @@ self: {
        testHaskellDepends = [ base data-default hspec megaparsec ];
        description = "Simple s-expression parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sexpresso" = callPackage
@@ -214823,6 +228858,8 @@ self: {
        ];
        description = "Lists, Texts, ByteStrings and Vectors with type-encoded length";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sfml-audio" = callPackage
@@ -214847,6 +228884,8 @@ self: {
        libraryHaskellDepends = [ base bytestring entropy primitive ];
        description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sfnt2woff" = callPackage
@@ -214867,6 +228906,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A command line tool to convert TrueType/OpenType fonts to WOFF format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "sgd" = callPackage
@@ -214891,6 +228932,8 @@ self: {
        ];
        description = "Stochastic gradient descent library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sgf" = callPackage
@@ -214907,6 +228950,8 @@ self: {
        ];
        description = "SGF (Smart Game Format) parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sgrep" = callPackage
@@ -214920,6 +228965,8 @@ self: {
        executableHaskellDepends = [ base bio regex-compat ];
        description = "Sgrep - grep Fasta files for sequences matching a regular expression";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sh2md" = callPackage
@@ -214946,6 +228993,8 @@ self: {
        ];
        description = "Record your shell session and print in the markdown format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sha-streams" = callPackage
@@ -214960,6 +229009,8 @@ self: {
        executableHaskellDepends = [ base io-streams SHA ];
        description = "SHA hashes for io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sha1" = callPackage
@@ -214976,6 +229027,8 @@ self: {
        ];
        description = "SHA-1 Hash";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shade" = callPackage
@@ -214989,6 +229042,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A control structure used to combine heterogenous types with delayed effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shadower" = callPackage
@@ -215011,6 +229066,8 @@ self: {
        ];
        description = "An automated way to run doctests in files that are changing";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shadowsocks" = callPackage
@@ -215141,6 +229198,8 @@ self: {
        ];
        description = "Rules for binary distributions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-c" = callPackage
@@ -215183,6 +229242,8 @@ self: {
        ];
        description = "Utility for building Shake build systems using Cabal sandboxes";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-ccjs" = callPackage
@@ -215210,6 +229271,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dhall dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-elm" = callPackage
@@ -215247,6 +229310,8 @@ self: {
        ];
        description = "Extra utilities for shake build systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-futhark" = callPackage
@@ -215315,6 +229380,8 @@ self: {
        ];
        description = "Shake Minify Rules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-minify-css" = callPackage
@@ -215339,6 +229406,8 @@ self: {
        libraryHaskellDepends = [ base bytestring bzlib shake tar ];
        description = "Shake File Pack Rule";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-path" = callPackage
@@ -215350,6 +229419,8 @@ self: {
        libraryHaskellDepends = [ base path path-io shake ];
        description = "path alternatives to shake functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-persist" = callPackage
@@ -215367,6 +229438,8 @@ self: {
        executableHaskellDepends = [ base shake ];
        description = "Shake build system on-disk caching";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-plus" = callPackage
@@ -215442,6 +229515,8 @@ self: {
        ];
        description = "Shake-based technical documentation generator; HTML & PDF";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shaker" = callPackage
@@ -215470,6 +229545,8 @@ self: {
        ];
        description = "simple and interactive command-line build tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shakers" = callPackage
@@ -215525,6 +229602,8 @@ self: {
        ];
        description = "compile es2015";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shakespeare-css" = callPackage
@@ -215576,6 +229655,8 @@ self: {
        ];
        description = "SASS support for Shakespeare and Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shakespeare-text" = callPackage
@@ -215632,6 +229713,8 @@ self: {
        ];
        description = "Parser and related tools for ESRI shapefile format";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shapely-data" = callPackage
@@ -215650,6 +229733,8 @@ self: {
        ];
        description = "Generics using @(,)@ and @Either@, with algebraic operations and typed conversions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shapes" = callPackage
@@ -215747,6 +229832,8 @@ self: {
        ];
        description = "A circular buffer built on shared memory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shared-fields" = callPackage
@@ -215760,6 +229847,8 @@ self: {
        testHaskellDepends = [ base Cabal hspec lens text ];
        description = "a tiny library for using shared lens fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shared-memory" = callPackage
@@ -215799,6 +229888,8 @@ self: {
        executableHaskellDepends = [ base filepath mtl ];
        description = "A Haskell preprocessor adding miscellaneous features";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shelduck" = callPackage
@@ -215829,6 +229920,8 @@ self: {
        ];
        description = "Test webhooks locally";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shell-conduit" = callPackage
@@ -215891,6 +229984,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pipe streams through external shell commands";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shell-utility" = callPackage
@@ -215918,6 +230013,8 @@ self: {
        ];
        description = "shell-/perl- like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shellmate" = callPackage
@@ -215934,6 +230031,8 @@ self: {
        ];
        description = "Simple interface for shell scripting in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shellmate-extras" = callPackage
@@ -215950,6 +230049,8 @@ self: {
        ];
        description = "Extra functionality for shellmate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shellmet" = callPackage
@@ -216179,6 +230280,8 @@ self: {
        ];
        description = "The Reflective Lambda Machine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shine" = callPackage
@@ -216208,6 +230311,8 @@ self: {
        isExecutable = true;
        description = "Examples for the shine package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shine-varying" = callPackage
@@ -216238,6 +230343,8 @@ self: {
        ];
        description = "Implementation of Shivers' Control-Flow Analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shoap" = callPackage
@@ -216249,6 +230356,8 @@ self: {
        libraryHaskellDepends = [ base curl ];
        description = "A very basic SOAP package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shopify" = callPackage
@@ -216269,6 +230378,8 @@ self: {
        ];
        description = "A haskell API binding for shopify.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shortcircuit" = callPackage
@@ -216304,6 +230415,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Link shortcuts for use in text markup";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shorten-strings" = callPackage
@@ -216315,6 +230428,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Shorten a variety of string-like types adding ellipsis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "should-not-typecheck" = callPackage
@@ -216389,6 +230504,8 @@ self: {
        ];
        description = "Robust prettyprinter for output of auto-generated Show instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "show-type" = callPackage
@@ -216414,6 +230531,8 @@ self: {
        executableHaskellDepends = [ base glade gtk random ];
        description = "A simple gtk based Russian Roulette game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shower" = callPackage
@@ -216453,6 +230572,8 @@ self: {
        ];
        description = "Web automation library in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shplit" = callPackage
@@ -216502,6 +230623,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Shuffle tool for UHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shunya-library" = callPackage
@@ -216542,6 +230665,8 @@ self: {
        ];
        description = "Generate swift types from haskell types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "si-clock" = callPackage
@@ -216555,6 +230680,8 @@ self: {
        ];
        description = "An interface to the Silicon Labs Si5351 clock chip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sibe" = callPackage
@@ -216580,6 +230707,8 @@ self: {
        ];
        description = "Machine Learning algorithms";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sieve" = callPackage
@@ -216614,6 +230743,8 @@ self: {
        ];
        description = "Simple, visual, functional language for learning about recursion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sifflet-lib" = callPackage
@@ -216632,6 +230763,8 @@ self: {
        librarySystemDepends = [ gdk_x11 gtk_x11 ];
        description = "Library of modules shared by sifflet and its tests and its exporters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gdk_x11 = null; gtk_x11 = null;};
 
   "siggy-chardust" = callPackage
@@ -216672,6 +230805,8 @@ self: {
        ];
        description = "Thom polynomials of second order Thom-Boardman singularities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sign" = callPackage
@@ -216722,6 +230857,8 @@ self: {
        ];
        description = "Deterministic serialisation and signatures with proto-lens support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "signable-haskell-protoc" = callPackage
@@ -216771,6 +230908,8 @@ self: {
        ];
        description = "Synchronous signal processing for DSLs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "signature" = callPackage
@@ -216799,6 +230938,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Multisets with negative membership";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "silently" = callPackage
@@ -216822,6 +230963,8 @@ self: {
        libraryHaskellDepends = [ base prettyprinter ];
        description = "Prettyprinting transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "silvi" = callPackage
@@ -216839,6 +230982,8 @@ self: {
        testHaskellDepends = [ base quantification savage text ];
        description = "A generator for different kinds of data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simd" = callPackage
@@ -216850,6 +230995,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive vector ];
        description = "simple interface to GHC's SIMD instructions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simgi" = callPackage
@@ -216867,6 +231014,8 @@ self: {
        ];
        description = "stochastic simulation engine";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple" = callPackage
@@ -216915,6 +231064,8 @@ self: {
        ];
        description = "A library for more structured concurrent programming, based on the Actor Model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-affine-space" = callPackage
@@ -216942,6 +231093,8 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Atom (or symbol) datatype for fast comparision and sorting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-bluetooth" = callPackage
@@ -216954,6 +231107,8 @@ self: {
        librarySystemDepends = [ bluetooth ];
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {bluetooth = null;};
 
   "simple-c-value" = callPackage
@@ -216976,6 +231131,8 @@ self: {
        ];
        description = "A simple C value type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-cabal" = callPackage
@@ -217044,6 +231201,8 @@ self: {
        ];
        description = "A simple streaming I/O library based on monadic folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-config" = callPackage
@@ -217061,6 +231220,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Simple config file parser generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-css" = callPackage
@@ -217076,6 +231237,8 @@ self: {
        ];
        description = "simple binding of css and html";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-download" = callPackage
@@ -217091,6 +231254,8 @@ self: {
        ];
        description = "A simple wrapper of http-conduit for file download";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-effects" = callPackage
@@ -217138,6 +231303,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-firewire" = callPackage
@@ -217149,6 +231316,8 @@ self: {
        libraryHaskellDepends = [ base bindings-dc1394 CV ];
        description = "Simplified interface for firewire cameras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-form" = callPackage
@@ -217180,6 +231349,8 @@ self: {
        executableHaskellDepends = [ base deepseq parallel random ];
        description = "Simple parallel genetic algorithm implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-genetic-algorithm-mr" = callPackage
@@ -217226,6 +231397,8 @@ self: {
        ];
        description = "Allows simple indexation on any data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-log" = callPackage
@@ -217257,6 +231430,8 @@ self: {
        libraryHaskellDepends = [ base hsyslog simple-log text ];
        description = "Syslog backend for simple-log";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-logger" = callPackage
@@ -217290,6 +231465,8 @@ self: {
        ];
        description = "Logging effect to plug into the simple-effects framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-ltl" = callPackage
@@ -217314,6 +231491,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple library to handle and interexchange money";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-neural-networks" = callPackage
@@ -217333,6 +231512,8 @@ self: {
        ];
        description = "Simple parallel neural networks implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-nix" = callPackage
@@ -217354,6 +231535,8 @@ self: {
        ];
        description = "Simple parsing/pretty printing for Nix expressions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-observer" = callPackage
@@ -217382,6 +231565,8 @@ self: {
        ];
        description = "Simplified Pascal language to SSVM compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-pipe" = callPackage
@@ -217400,6 +231585,8 @@ self: {
        ];
        description = "simple pipeline library like conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-postgresql-orm" = callPackage
@@ -217439,6 +231626,8 @@ self: {
        libraryHaskellDepends = [ base bytestring QuickCheck ];
        description = "Memory-efficient strings with concatenation and splitting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-sendfile" = callPackage
@@ -217472,6 +231661,8 @@ self: {
        ];
        description = "Simple Server interface";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-session" = callPackage
@@ -217557,6 +231748,8 @@ self: {
        ];
        description = "Simple stacked virtual machine: assembler, disassembler, bytecode interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-tabular" = callPackage
@@ -217568,6 +231761,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Simple tabular-text formatter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-tar" = callPackage
@@ -217583,6 +231778,8 @@ self: {
        ];
        description = "Simple, pure, file-system-free reading of tar files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-templates" = callPackage
@@ -217634,6 +231831,8 @@ self: {
        ];
        description = "UI library for terminal";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-units" = callPackage
@@ -217645,6 +231844,8 @@ self: {
        libraryHaskellDepends = [ base first-class-families ];
        description = "Simple arithmetic with SI units using type-checked dimensional analysis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-vec3" = callPackage
@@ -217662,6 +231863,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Three-dimensional vectors of doubles with basic operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-zipper" = callPackage
@@ -217674,6 +231877,8 @@ self: {
        testHaskellDepends = [ base hspec lens ];
        description = "Zippers made slightly easier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simpleargs" = callPackage
@@ -217686,6 +231891,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Provides a more flexible getArgs function with better error reporting";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simpleconfig" = callPackage
@@ -217702,6 +231909,8 @@ self: {
        ];
        description = "Short description of your package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simpleirc" = callPackage
@@ -217718,6 +231927,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit knob ];
        description = "Simple IRC Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simpleirc-lens" = callPackage
@@ -217729,6 +231940,8 @@ self: {
        libraryHaskellDepends = [ base bytestring simpleirc ];
        description = "Lenses for simpleirc types";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simplelru" = callPackage
@@ -217770,6 +231983,8 @@ self: {
        ];
        description = "Haskell interface for the simplenote API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simpleprelude" = callPackage
@@ -217788,6 +232003,8 @@ self: {
        ];
        description = "A simplified Haskell prelude for teaching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simplesmtpclient" = callPackage
@@ -217801,6 +232018,8 @@ self: {
        libraryHaskellDepends = [ array base directory network old-time ];
        description = "Very simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simplessh" = callPackage
@@ -217829,6 +232048,8 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "Simplest SQLite3 binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "simplex" = callPackage
@@ -217896,6 +232117,8 @@ self: {
        executableHaskellDepends = [ base bio bytestring random ];
        description = "Simulate sequencing with different models for priming and errors";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simtreelo" = callPackage
@@ -217994,6 +232217,8 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Typelevel balanced search trees via a singletonized Data.Map";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "singleton-nats" = callPackage
@@ -218016,6 +232241,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Singletons and induction over GHC TypeLits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "singletons" = callPackage
@@ -218069,6 +232296,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Singnal";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "singular-factory" = callPackage
@@ -218089,6 +232318,8 @@ self: {
        ];
        description = "Multivariate polynomial factorization via bindings to Singular-factory";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {singular-factory = null;};
 
   "sink" = callPackage
@@ -218100,6 +232331,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An alternative to lazy I/O that doesn't conflate execution with evaluation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "siphash" = callPackage
@@ -218146,6 +232379,8 @@ self: {
        ];
        description = "Encode and decode CSV files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "siren-json" = callPackage
@@ -218170,6 +232405,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Siren Tools for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sirkel" = callPackage
@@ -218186,6 +232423,8 @@ self: {
        ];
        description = "Sirkel, a Chord DHT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sitemap" = callPackage
@@ -218233,6 +232472,8 @@ self: {
        ];
        description = "A simple to understand static site generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sixel" = callPackage
@@ -218268,6 +232509,8 @@ self: {
        ];
        description = "A six figure group of time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sixty-five-oh-two" = callPackage
@@ -218297,6 +232540,8 @@ self: {
        ];
        description = "Sized functors, for size-based enumerations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sized" = callPackage
@@ -218345,6 +232590,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Multidimensional grids with sized specified at compile time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sized-types" = callPackage
@@ -218363,6 +232610,8 @@ self: {
        ];
        description = "Sized types in Haskell using the GHC Nat kind";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sized-vector" = callPackage
@@ -218379,6 +232628,8 @@ self: {
        ];
        description = "Size-parameterized vector types and functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sizes" = callPackage
@@ -218398,6 +232649,8 @@ self: {
        ];
        description = "Recursively show space (size and i-nodes) used in subdirectories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sjsp" = callPackage
@@ -218419,6 +232672,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Simple JavaScript Profiler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skein" = callPackage
@@ -218455,6 +232710,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Skeletal set - a set with equivalence relation different from equality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skeleton" = callPackage
@@ -218473,6 +232730,8 @@ self: {
        ];
        description = "a tool to access the OSX keychain";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skeletons" = callPackage
@@ -218491,6 +232750,8 @@ self: {
        ];
        description = "Manage project skeletons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skell" = callPackage
@@ -218506,6 +232767,8 @@ self: {
        ];
        description = "An overly complex Haskell web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skemmtun" = callPackage
@@ -218524,6 +232787,8 @@ self: {
        ];
        description = "A MyAnimeList.net client.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skews" = callPackage
@@ -218578,6 +232843,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Eclectic collection of utility functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skylark-client" = callPackage
@@ -218600,6 +232867,8 @@ self: {
        ];
        description = "Skylark client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skylighting" = callPackage
@@ -218681,6 +232950,8 @@ self: {
        ];
        description = "Lucid support for Skylighting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skylighting-modding" = callPackage
@@ -218709,6 +232980,8 @@ self: {
        ];
        description = "Skype Desktop API binding for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skypelogexport" = callPackage
@@ -218746,6 +233019,8 @@ self: {
        ];
        description = "Haskell API for interacting with Slack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slack-api" = callPackage
@@ -218788,6 +233063,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Slack notifier for Haskell project";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slack-progressbar" = callPackage
@@ -218854,6 +233131,8 @@ self: {
        ];
        description = "Bindings for the Slack web API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slate" = callPackage
@@ -218901,6 +233180,8 @@ self: {
        ];
        description = "A fundamental solution to ghost threads and silent exceptions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sleep" = callPackage
@@ -218957,6 +233238,8 @@ self: {
        ];
        description = "Python-ish slicing traversals for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slick" = callPackage
@@ -218991,6 +233274,8 @@ self: {
        ];
        description = "ws convert markdown to reveal-js";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slim" = callPackage
@@ -219006,6 +233291,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Functional reactive user interface programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slip32" = callPackage
@@ -219026,6 +233313,8 @@ self: {
        ];
        description = "SLIP-0032: Extended serialization format for BIP-32 wallets";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slist" = callPackage
@@ -219059,6 +233348,8 @@ self: {
        ];
        description = "A command line interface to Sloane's OEIS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slope-field" = callPackage
@@ -219093,6 +233384,8 @@ self: {
        ];
        description = "Write lambdas without naming the parameters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sloth" = callPackage
@@ -219104,6 +233397,8 @@ self: {
        libraryHaskellDepends = [ base mtl process ];
        description = "Testing for minimal strictness";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slotmap" = callPackage
@@ -219137,6 +233432,8 @@ self: {
        ];
        description = "Type-safe slugs for Yesod ecosystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slynx" = callPackage
@@ -219171,6 +233468,8 @@ self: {
        doHaddock = false;
        description = "Serialize to bytes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smallarray" = callPackage
@@ -219182,6 +233481,8 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq hashable ];
        description = "low-level unboxed arrays, with minimal features";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smallcaps" = callPackage
@@ -219232,6 +233533,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge ];
        description = "See README for more info";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smallcheck-laws" = callPackage
@@ -219243,6 +233546,8 @@ self: {
        libraryHaskellDepends = [ base smallcheck smallcheck-series ];
        description = "SmallCheck properties for common laws";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smallcheck-lens" = callPackage
@@ -219258,6 +233563,8 @@ self: {
        ];
        description = "SmallCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smallcheck-series" = callPackage
@@ -219290,6 +233597,8 @@ self: {
        executableHaskellDepends = [ base vector ];
        description = "A Haskell port of the smallpt path tracer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smallstring" = callPackage
@@ -219305,6 +233614,8 @@ self: {
        ];
        description = "A Unicode text type, optimized for low memory overhead";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smaoin" = callPackage
@@ -219351,6 +233662,8 @@ self: {
        ];
        description = "A command line tool for working with sets and maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smartGroup" = callPackage
@@ -219364,6 +233677,8 @@ self: {
        ];
        description = "group strings or bytestrings by words in common";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smartcheck" = callPackage
@@ -219384,6 +233699,8 @@ self: {
        ];
        description = "A smarter QuickCheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smartconstructor" = callPackage
@@ -219395,6 +233712,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "A package exposing a helper function for generating smart constructors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smarties" = callPackage
@@ -219436,6 +233755,8 @@ self: {
        ];
        description = "Web based flash card for Word Smart I and II vocabularies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smash" = callPackage
@@ -219528,6 +233849,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion time ];
        description = "Symbolic Model Checking for Dynamic Epistemic Logic";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sme" = callPackage
@@ -219539,6 +233862,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for Secure Multi-Execution in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smerdyakov" = callPackage
@@ -219557,6 +233882,8 @@ self: {
          transformers yaml
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smiles" = callPackage
@@ -219568,6 +233895,8 @@ self: {
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base hspec megaparsec QuickCheck text ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smith" = callPackage
@@ -219579,6 +233908,8 @@ self: {
        libraryHaskellDepends = [ base bytesmith primitive ];
        description = "Parse arrays of tokens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smith-cli" = callPackage
@@ -219602,6 +233933,8 @@ self: {
        ];
        description = "Command line tool for <https://smith.st/ Smith>.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smith-client" = callPackage
@@ -219625,6 +233958,8 @@ self: {
        ];
        description = "API client for <https://smith.st/ Smith>.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smoothie" = callPackage
@@ -219653,6 +233988,8 @@ self: {
        ];
        description = "SMSAero API and HTTP client based on servant library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smt" = callPackage
@@ -219679,6 +234016,8 @@ self: {
        libraryHaskellDepends = [ array base directory polyparse ];
        description = "Parsing and printing SMT-LIB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smtLib" = callPackage
@@ -219706,6 +234045,8 @@ self: {
        ];
        description = "A type-safe interface to communicate with an SMT solver";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smtlib2-debug" = callPackage
@@ -219722,6 +234063,8 @@ self: {
        ];
        description = "Dump the communication with an SMT solver for debugging purposes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smtlib2-pipe" = callPackage
@@ -219743,6 +234086,8 @@ self: {
        ];
        description = "A type-safe interface to communicate with an SMT solver";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smtlib2-quickcheck" = callPackage
@@ -219758,6 +234103,8 @@ self: {
        ];
        description = "Helper functions to create SMTLib expressions in QuickCheck";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smtlib2-timing" = callPackage
@@ -219769,6 +234116,8 @@ self: {
        libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ];
        description = "Get timing informations for SMT queries";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smtp-mail" = callPackage
@@ -219807,6 +234156,8 @@ self: {
        ];
        description = "An SMTP client EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smtp2mta" = callPackage
@@ -219839,6 +234190,8 @@ self: {
        ];
        description = "Gmail SMTP Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smuggler" = callPackage
@@ -219861,6 +234214,8 @@ self: {
        testHaskellDepends = [ base directory filepath ];
        description = "GHC Source Plugin that helps to manage imports";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smuggler2" = callPackage
@@ -219882,6 +234237,8 @@ self: {
        ];
        description = "GHC Source Plugin that helps to minimise imports and generate explicit exports";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snake" = callPackage
@@ -219895,6 +234252,8 @@ self: {
        executableHaskellDepends = [ base random split terminal-size ];
        description = "A basic console snake game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snake-game" = callPackage
@@ -219906,6 +234265,8 @@ self: {
        libraryHaskellDepends = [ base GLUT OpenGL random ];
        description = "Snake Game Using OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap" = callPackage
@@ -219956,6 +234317,8 @@ self: {
        ];
        description = "Accept header branching for the Snap web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-app" = callPackage
@@ -219987,6 +234350,8 @@ self: {
        ];
        description = "Command-line tool to manage Snap AuthManager database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-blaze" = callPackage
@@ -220009,6 +234374,8 @@ self: {
        libraryHaskellDepends = [ base blaze-html clay snap-core ];
        description = "blaze-html-clay integration for Snap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-configuration-utilities" = callPackage
@@ -220022,6 +234389,8 @@ self: {
        ];
        description = "Methods to manipulate Configurator objects for Snap & Snaplets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-core" = callPackage
@@ -220100,6 +234469,8 @@ self: {
        ];
        description = "Collect errors in batches and dispatch them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-extras" = callPackage
@@ -220131,6 +234502,8 @@ self: {
        ];
        description = "A collection of useful helpers and utilities for Snap web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-language" = callPackage
@@ -220216,6 +234589,8 @@ self: {
        ];
        description = "Typesafe URLs for Snap applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-server" = callPackage
@@ -220273,6 +234648,8 @@ self: {
        ];
        description = "Streaming Snap handlers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-templates" = callPackage
@@ -220317,6 +234694,8 @@ self: {
        ];
        description = "A library for BDD-style testing with the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-utils" = callPackage
@@ -220334,6 +234713,8 @@ self: {
        ];
        description = "Snap Framework utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-web-routes" = callPackage
@@ -220349,6 +234730,8 @@ self: {
        ];
        description = "Type safe URLs for Snap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-acid-state" = callPackage
@@ -220362,6 +234745,8 @@ self: {
        ];
        description = "acid-state snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-actionlog" = callPackage
@@ -220386,6 +234771,8 @@ self: {
        ];
        description = "Generic action log snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-amqp" = callPackage
@@ -220403,6 +234790,8 @@ self: {
        ];
        description = "Snap framework snaplet for the AMQP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-auth-acid" = callPackage
@@ -220423,6 +234812,8 @@ self: {
        ];
        description = "Provides an Acid-State backend for the Auth Snaplet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-coffee" = callPackage
@@ -220440,6 +234831,8 @@ self: {
        ];
        description = "CoffeeScript for Snap, auto-compilation and pre-compilation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-css-min" = callPackage
@@ -220456,6 +234849,8 @@ self: {
        ];
        description = "A Snaplet for CSS minification";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-customauth" = callPackage
@@ -220479,6 +234874,8 @@ self: {
        ];
        description = "Alternate authentication snaplet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-environments" = callPackage
@@ -220495,6 +234892,8 @@ self: {
        ];
        description = "DEPRECATED! You should use standard Snap >= 0.9 \"environments\" functionality. It provided ability to easly read configuration based on given app environment given at command line, envs are defined in app configuration file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-fay" = callPackage
@@ -220514,6 +234913,8 @@ self: {
        ];
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-ghcjs" = callPackage
@@ -220547,6 +234948,8 @@ self: {
        ];
        description = "A Hasql snaplet";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-haxl" = callPackage
@@ -220562,6 +234965,8 @@ self: {
        ];
        description = "Snaplet for Facebook's Haxl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-hdbc" = callPackage
@@ -220582,6 +234987,8 @@ self: {
        ];
        description = "HDBC snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-hslogger" = callPackage
@@ -220598,6 +235005,8 @@ self: {
        ];
        description = "Snap framework snaplet for the Logger API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-i18n" = callPackage
@@ -220639,6 +235048,8 @@ self: {
        ];
        description = "Snap framework snaplet for the InfluxDB library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-lss" = callPackage
@@ -220671,6 +235082,8 @@ self: {
        ];
        description = "Snap framework snaplet for the Mandrill API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-mongoDB" = callPackage
@@ -220690,6 +235103,8 @@ self: {
        ];
        description = "Snap Framework MongoDB support as Snaplet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-mongodb-minimalistic" = callPackage
@@ -220704,6 +235119,8 @@ self: {
        ];
        description = "Minimalistic MongoDB Snaplet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-mysql-simple" = callPackage
@@ -220724,6 +235141,8 @@ self: {
        ];
        description = "mysql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-oauth" = callPackage
@@ -220749,6 +235168,8 @@ self: {
        ];
        description = "snaplet-oauth";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-persistent" = callPackage
@@ -220795,6 +235216,8 @@ self: {
        ];
        description = "postgresql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-postmark" = callPackage
@@ -220811,6 +235234,8 @@ self: {
        ];
        description = "Postmark snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-purescript" = callPackage
@@ -220827,6 +235252,8 @@ self: {
        ];
        description = "Automatic (re)compilation of purescript projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-recaptcha" = callPackage
@@ -220844,6 +235271,8 @@ self: {
        ];
        description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-redis" = callPackage
@@ -220863,6 +235292,8 @@ self: {
        ];
        description = "Redis support for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-redson" = callPackage
@@ -220882,6 +235313,8 @@ self: {
        ];
        description = "CRUD for JSON data with Redis storage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-rest" = callPackage
@@ -220899,6 +235332,8 @@ self: {
        ];
        description = "REST resources for the Snap web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-riak" = callPackage
@@ -220916,6 +235351,8 @@ self: {
        ];
        description = "A Snaplet for the Riak database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-sass" = callPackage
@@ -220933,6 +235370,8 @@ self: {
        ];
        description = "Sass integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-scoped-session" = callPackage
@@ -220949,6 +235388,8 @@ self: {
        ];
        description = "Modularised session state for Snaplets, in a Snaplet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-sedna" = callPackage
@@ -220965,6 +235406,8 @@ self: {
        ];
        description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-ses-html" = callPackage
@@ -220981,6 +235424,8 @@ self: {
        ];
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-sqlite-simple" = callPackage
@@ -221011,6 +235456,8 @@ self: {
        ];
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-sqlite-simple-jwt-auth" = callPackage
@@ -221030,6 +235477,8 @@ self: {
        ];
        description = "Snaplet for JWT authentication with snaplet-sqlite-simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-stripe" = callPackage
@@ -221048,6 +235497,8 @@ self: {
        ];
        description = "Stripe snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-tasks" = callPackage
@@ -221064,6 +235515,8 @@ self: {
        ];
        description = "Snaplet for Snap Framework enabling developers to administrative tasks akin to Rake tasks from Ruby On Rails framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-typed-sessions" = callPackage
@@ -221081,6 +235534,8 @@ self: {
        ];
        description = "Typed session snaplets and continuation-based programming for the Snap web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-wordpress" = callPackage
@@ -221107,6 +235562,8 @@ self: {
        ];
        description = "A snaplet that communicates with wordpress over its api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snappy" = callPackage
@@ -221136,6 +235593,8 @@ self: {
        libraryHaskellDepends = [ base bytestring conduit snappy ];
        description = "Conduit bindings for Snappy (see snappy package)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snappy-framing" = callPackage
@@ -221158,6 +235617,8 @@ self: {
        libraryHaskellDepends = [ base bytestring iteratee snappy ];
        description = "An enumeratee that uses Google's snappy compression library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snappy-lazy" = callPackage
@@ -221190,6 +235651,8 @@ self: {
        ];
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sneakyterm" = callPackage
@@ -221205,6 +235668,8 @@ self: {
        ];
        description = "Tiny, declarative wrapper around ncurses";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sneathlane-haste" = callPackage
@@ -221228,6 +235693,8 @@ self: {
        libraryHaskellDepends = [ base containers pandoc process text ];
        description = "Markdown tester";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snippet-extractor" = callPackage
@@ -221262,6 +235729,8 @@ self: {
        ];
        description = "The Simple Nice-Looking Manual Generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snmp" = callPackage
@@ -221280,6 +235749,8 @@ self: {
        ];
        description = "SNMP protocol library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snorkels" = callPackage
@@ -221302,6 +235773,8 @@ self: {
        ];
        description = "Strategic board game of medium complexity";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snow-white" = callPackage
@@ -221314,6 +235787,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mps ];
        description = "encode any binary instance to white space";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snowball" = callPackage
@@ -221361,6 +235836,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "twitter's snowflake";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snowflake-server" = callPackage
@@ -221379,6 +235856,8 @@ self: {
        ];
        description = "snowflake http server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snowglobe" = callPackage
@@ -221412,6 +235891,8 @@ self: {
        ];
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "soap" = callPackage
@@ -221530,6 +236011,8 @@ self: {
        libraryHaskellDepends = [ base network transformers unix ];
        description = "systemd socket activation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "socket-icmp" = callPackage
@@ -221556,6 +236039,8 @@ self: {
          transformers unordered-containers vector
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "socket-sctp" = callPackage
@@ -221569,6 +236054,8 @@ self: {
        testHaskellDepends = [ base bytestring socket ];
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) lksctp-tools;};
 
   "socket-unix" = callPackage
@@ -221585,6 +236072,8 @@ self: {
        ];
        description = "Unix domain sockets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "socketed" = callPackage
@@ -221611,6 +236100,8 @@ self: {
        ];
        description = "simpe tool to serve piped data over http and websocket";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "socketio" = callPackage
@@ -221639,6 +236130,8 @@ self: {
        ];
        description = "Socket.IO server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sockets" = callPackage
@@ -221669,6 +236162,8 @@ self: {
        doHaddock = false;
        description = "High-level network sockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "socketson" = callPackage
@@ -221694,6 +236189,8 @@ self: {
        ];
        description = "A small websocket backend provider";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "socks" = callPackage
@@ -221718,6 +236215,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Sodium Reactive Programming (FRP) System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "soegtk" = callPackage
@@ -221730,6 +236229,8 @@ self: {
        libraryHaskellDepends = [ base cairo gtk old-time stm ];
        description = "GUI functions as used in the book \"The Haskell School of Expression\"";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "softfloat-hs" = callPackage
@@ -221742,6 +236243,8 @@ self: {
        librarySystemDepends = [ softfloat ];
        description = "Haskell bindings for SoftFloat";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {softfloat = null;};
 
   "solar" = callPackage
@@ -221778,6 +236281,8 @@ self: {
        ];
        description = "Simple typesafe web routing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "solga-swagger" = callPackage
@@ -221795,6 +236300,8 @@ self: {
        ];
        description = "Swagger generation for Solga";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "solr" = callPackage
@@ -221819,6 +236326,8 @@ self: {
        ];
        description = "A minimal Solr client library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "solve" = callPackage
@@ -221868,6 +236377,8 @@ self: {
        ];
        description = "Sonic Visualiser";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sop-core" = callPackage
@@ -221938,6 +236449,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient, type-safe sorted sequences";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sorted-list" = callPackage
@@ -221973,6 +236486,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utils for sorting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sorty" = callPackage
@@ -221986,6 +236501,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Sort lines per file size";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "souffle-haskell" = callPackage
@@ -222016,6 +236533,8 @@ self: {
        ];
        description = "Souffle Datalog bindings for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sound-collage" = callPackage
@@ -222038,6 +236557,8 @@ self: {
        ];
        description = "Approximate a song from other pieces of sound";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sounddelay" = callPackage
@@ -222051,6 +236572,8 @@ self: {
        executableHaskellDepends = [ base containers parseargs WAVE ];
        description = "Audio delay line";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "soundgen" = callPackage
@@ -222064,6 +236587,8 @@ self: {
        executableHaskellDepends = [ base split WAVE ];
        description = "sound generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "source-code-server" = callPackage
@@ -222087,6 +236612,8 @@ self: {
        ];
        description = "The server backend for the source code iPhone app";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "source-constraints" = callPackage
@@ -222147,6 +236674,8 @@ self: {
        ];
        description = "Source/Sink/Transform: An alternative to lazy IO and iteratees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sox" = callPackage
@@ -222202,6 +236731,8 @@ self: {
        ];
        description = "DCPU-16 architecture utilities for Notch's 0x10c game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "space" = callPackage
@@ -222267,6 +236798,8 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        description = "Space partition data structures. Currently only a QuadTree.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spaceprobe" = callPackage
@@ -222311,6 +236844,8 @@ self: {
        ];
        description = "Implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spanout" = callPackage
@@ -222328,6 +236863,8 @@ self: {
        ];
        description = "A breakout clone written in netwire and gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparkle" = callPackage
@@ -222353,6 +236890,8 @@ self: {
        ];
        description = "Distributed Apache Spark applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparql-protocol" = callPackage
@@ -222398,6 +236937,8 @@ self: {
        ];
        description = "Unified streaming data-dependency framework for web apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spars" = callPackage
@@ -222409,6 +236950,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A sparse set-based parsing library for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparse" = callPackage
@@ -222436,6 +236979,8 @@ self: {
        benchmarkHaskellDepends = [ array base criterion deepseq vector ];
        description = "A playground of sparse linear algebra primitives using Morton ordering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparse-lin-alg" = callPackage
@@ -222453,6 +236998,8 @@ self: {
        ];
        description = "Effective linear algebra on sparse matrices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparse-linear-algebra" = callPackage
@@ -222508,6 +237055,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "Sparse bitmaps for pattern match coverage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparsecheck" = callPackage
@@ -222519,6 +237068,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A Logic Programming Library for Test-Data Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparser" = callPackage
@@ -222534,6 +237085,8 @@ self: {
        ];
        description = "Lightweight parsing library based on partial functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spata" = callPackage
@@ -222546,6 +237099,8 @@ self: {
        libraryHaskellDepends = [ base dlist mps mtl ];
        description = "brainless form validation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spatial-math" = callPackage
@@ -222640,6 +237195,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "special-keys" = callPackage
@@ -222657,6 +237214,8 @@ self: {
        ];
        description = "Simple data types that help me here and there";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "special-values" = callPackage
@@ -222696,6 +237255,8 @@ self: {
        ];
        description = "Create specialized types from polymorphic ones using TH";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "species" = callPackage
@@ -222714,6 +237275,8 @@ self: {
        ];
        description = "Computational combinatorial species";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spectral-clustering" = callPackage
@@ -222731,6 +237294,8 @@ self: {
        ];
        description = "Library for spectral clustering";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "speculate" = callPackage
@@ -222757,6 +237322,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim stm transformers ];
        description = "A framework for safe, programmable, speculative parallelism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "speculation-transformers" = callPackage
@@ -222769,6 +237336,8 @@ self: {
        doHaddock = false;
        description = "Merged into 'speculation'. Use that instead.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "speechmatics" = callPackage
@@ -222799,6 +237368,8 @@ self: {
        ];
        description = "Speechmatics api client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "speedy-slice" = callPackage
@@ -222837,6 +237408,8 @@ self: {
        ];
        description = "Spelling suggestion tool with library and command-line interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spherical" = callPackage
@@ -222863,6 +237436,8 @@ self: {
        ];
        description = "Orbotix Sphero client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sphinx" = callPackage
@@ -222879,6 +237454,8 @@ self: {
        ];
        description = "Haskell bindings to the Sphinx full-text searching daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sphinx-cli" = callPackage
@@ -222892,6 +237469,8 @@ self: {
        executableHaskellDepends = [ base sphinx ];
        description = "Sphinx CLI and demo of Haskell Sphinx library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sphinxesc" = callPackage
@@ -222910,6 +237489,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Transform queries for sphinx input";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spice" = callPackage
@@ -222926,6 +237507,8 @@ self: {
        ];
        description = "An FRP-based game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spike" = callPackage
@@ -222969,6 +237552,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some utilities for reading and writing SPIR-V files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spiros" = callPackage
@@ -222995,6 +237580,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Spiros Boosalis's Custom Prelude";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "splay" = callPackage
@@ -223006,6 +237593,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic splay-based sequence representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "splaytree" = callPackage
@@ -223023,6 +237612,8 @@ self: {
        ];
        description = "Provides an annotated splay tree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "splice" = callPackage
@@ -223057,6 +237648,8 @@ self: {
        ];
        description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "splines" = callPackage
@@ -223078,6 +237671,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion polynomial vector ];
        description = "B-Splines, other splines, and NURBS";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "splint" = callPackage
@@ -223124,6 +237719,8 @@ self: {
        testHaskellDepends = [ base invariant lens QuickCheck ];
        description = "Split Epimorphisms and Monomorphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "split-record" = callPackage
@@ -223215,6 +237812,8 @@ self: {
        ];
        description = "Use numerical ranges to split out certain lines from a file";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "splot" = callPackage
@@ -223275,6 +237874,8 @@ self: {
        ];
        description = "Spoon's utilities. Simple testing and nice looking error reporting.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spork" = callPackage
@@ -223302,6 +237903,8 @@ self: {
        ];
        description = "Spotify web API wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spreadsheet" = callPackage
@@ -223361,6 +237964,8 @@ self: {
        ];
        description = "JSON API to HTML website wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spritz" = callPackage
@@ -223372,6 +237977,8 @@ self: {
        libraryHaskellDepends = [ base lens mtl vector ];
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sproxy" = callPackage
@@ -223396,6 +238003,8 @@ self: {
        ];
        description = "HTTP proxy for authenticating users via OAuth2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sproxy-web" = callPackage
@@ -223421,6 +238030,8 @@ self: {
        ];
        description = "Web interface to sproxy database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sproxy2" = callPackage
@@ -223446,6 +238057,8 @@ self: {
        ];
        description = "Secure HTTP proxy for authenticating users via OAuth2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spsa" = callPackage
@@ -223465,6 +238078,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion hmatrix random ];
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spy" = callPackage
@@ -223490,6 +238105,8 @@ self: {
        ];
        description = "A compact file system watcher for Mac OS X, Linux and Windows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sql-simple" = callPackage
@@ -223506,6 +238123,8 @@ self: {
        ];
        description = "common middle-level sql client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sql-simple-mysql" = callPackage
@@ -223521,6 +238140,8 @@ self: {
        ];
        description = "mysql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sql-simple-pool" = callPackage
@@ -223537,6 +238158,8 @@ self: {
        ];
        description = "conection pool for sql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sql-simple-postgresql" = callPackage
@@ -223552,6 +238175,8 @@ self: {
        ];
        description = "postgresql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sql-simple-sqlite" = callPackage
@@ -223563,6 +238188,8 @@ self: {
        libraryHaskellDepends = [ base sql-simple sqlite-simple ];
        description = "sqlite backend for sql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sql-words" = callPackage
@@ -223593,6 +238220,8 @@ self: {
        testHaskellDepends = [ base filepath hspec temporary ];
        description = "Haskell binding to sqlcipher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "sqlcli" = callPackage
@@ -223633,6 +238262,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell binding to sqlite3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "sqlite-simple" = callPackage
@@ -223682,6 +238313,8 @@ self: {
        ];
        description = "Typed extension to sqlite simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sqlvalue-list" = callPackage
@@ -223693,6 +238326,8 @@ self: {
        libraryHaskellDepends = [ base convertible HDBC template-haskell ];
        description = "Class and instances for conversion to list of SqlValue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sqsd-local" = callPackage
@@ -223714,6 +238349,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "squares" = callPackage
@@ -223769,6 +238406,8 @@ self: {
        ];
        description = "Squeal PostgreSQL Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "squeather" = callPackage
@@ -223830,6 +238469,8 @@ self: {
        ];
        description = "Module limbo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "srcinst" = callPackage
@@ -223848,6 +238489,8 @@ self: {
        ];
        description = "Build and install Debian packages completely from source";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "srcloc" = callPackage
@@ -223888,6 +238531,8 @@ self: {
        ];
        description = "text UI for scanning with SANE";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sscgi" = callPackage
@@ -223905,6 +238550,8 @@ self: {
        ];
        description = "Simple SCGI Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sscript" = callPackage
@@ -223948,6 +238595,8 @@ self: {
        doCheck = false;
        description = "A pure-Haskell SSH server library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ssh-known-hosts" = callPackage
@@ -223985,6 +238634,8 @@ self: {
        ];
        description = "Proxy http-client via ssh tunnel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sshd-lint" = callPackage
@@ -224005,6 +238656,8 @@ self: {
        ];
        description = "Check sshd configuration for adherence to best practices";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sshtun" = callPackage
@@ -224052,6 +238705,8 @@ self: {
        ];
        description = "HTTP proxy for S3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sstable" = callPackage
@@ -224070,6 +238725,8 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "SSTables in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ssv" = callPackage
@@ -224095,6 +238752,8 @@ self: {
        libraryHaskellDepends = [ base gdp ghc-prim primitive ];
        description = "shared heap regions between local mutable state threads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stable-heap" = callPackage
@@ -224111,6 +238770,8 @@ self: {
        ];
        description = "Purely functional stable heaps (fair priority queues)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stable-maps" = callPackage
@@ -224122,6 +238783,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim ];
        description = "Heterogeneous maps keyed by StableNames";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stable-marriage" = callPackage
@@ -224134,6 +238797,8 @@ self: {
        testHaskellDepends = [ base ghc-prim ];
        description = "algorithms around stable marriage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stable-memo" = callPackage
@@ -224147,6 +238812,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim hashtables ];
        description = "Memoization based on argument identity";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stable-tree" = callPackage
@@ -224171,6 +238838,8 @@ self: {
        ];
        description = "Trees whose branches are resistant to change";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stache" = callPackage
@@ -224344,6 +239013,8 @@ self: {
        ];
        description = "Dead simple version bumping for hpack packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-clean-old" = callPackage
@@ -224374,6 +239045,8 @@ self: {
        executableHaskellDepends = [ base options text turtle ];
        description = "Console program used to fix Stack build errors automatically";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-hpc-coveralls" = callPackage
@@ -224400,6 +239073,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-lib" = callPackage
@@ -224415,6 +239090,8 @@ self: {
        ];
        description = "Wrapper to use stack as a library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-network" = callPackage
@@ -224456,6 +239133,8 @@ self: {
        ];
        description = "A program for extending Stack to add distributed capabilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-prism" = callPackage
@@ -224474,6 +239153,8 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-run" = callPackage
@@ -224493,6 +239174,8 @@ self: {
        ];
        description = "An equivalent to cabal run for stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-run-auto" = callPackage
@@ -224520,6 +239203,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-tag" = callPackage
@@ -224565,6 +239250,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The basic stack type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-wrapper" = callPackage
@@ -224581,6 +239268,8 @@ self: {
        executableHaskellDepends = [ base filepath process ];
        description = "Call ghc within stack by calling ghc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-yaml" = callPackage
@@ -224649,6 +239338,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Convert stack.yaml files into Nix build instructions.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage" = callPackage
@@ -224667,6 +239358,8 @@ self: {
        ];
        description = "Dummy package forcing installation of other Stackage packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-build-plan" = callPackage
@@ -224691,6 +239384,8 @@ self: {
        ];
        description = "Calculate and print (in different formats) Stackage build plans";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-cabal" = callPackage
@@ -224711,6 +239406,8 @@ self: {
        ];
        description = "A CLI executable for cabal-based stackage commands";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-cli" = callPackage
@@ -224732,6 +239429,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A CLI library for stackage commands";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-curator" = callPackage
@@ -224776,6 +239475,8 @@ self: {
        ];
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-install" = callPackage
@@ -224824,6 +239525,8 @@ self: {
        ];
        description = "DEPRECATED Grab current metadata for all packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-query" = callPackage
@@ -224847,6 +239550,8 @@ self: {
        ];
        description = "Tool for querying Stackage";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-sandbox" = callPackage
@@ -224867,6 +239572,8 @@ self: {
        ];
        description = "Work with shared stackage sandboxes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-setup" = callPackage
@@ -224890,6 +239597,8 @@ self: {
        ];
        description = "An executable for downloading a Haskell setup";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-to-hackage" = callPackage
@@ -224915,6 +239624,8 @@ self: {
        ];
        description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-types" = callPackage
@@ -224934,6 +239645,8 @@ self: {
        ];
        description = "Shared data types between various Stackage packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-update" = callPackage
@@ -224970,6 +239683,8 @@ self: {
        ];
        description = "A more secure version of cabal upload which uses HTTPS";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage2nix" = callPackage
@@ -225000,6 +239715,8 @@ self: {
        ];
        description = "Convert Stack files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackcollapse-ghc" = callPackage
@@ -225119,6 +239836,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "This package will derive class instance along the data type declaration tree. (Deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "standalone-haddock" = callPackage
@@ -225136,6 +239855,8 @@ self: {
        ];
        description = "Generate standalone haddock documentation for a set of packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "star" = callPackage
@@ -225184,6 +239905,8 @@ self: {
        ];
        description = "A memcached client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "starrover2" = callPackage
@@ -225230,6 +239953,8 @@ self: {
        ];
        description = "To be written";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "state" = callPackage
@@ -225241,6 +239966,8 @@ self: {
        libraryHaskellDepends = [ arrows base mtl ];
        description = "Data.State";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "state-bag" = callPackage
@@ -225257,6 +239984,8 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "Monad transformers for holding bags of state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "state-codes" = callPackage
@@ -225282,6 +240011,8 @@ self: {
        testHaskellDepends = [ base checkers mtl QuickCheck ];
        description = "MonadPlus for StateT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "state-record" = callPackage
@@ -225293,6 +240024,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Better records for State monad states";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stateWriter" = callPackage
@@ -225335,6 +240068,8 @@ self: {
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stateref" = callPackage
@@ -225359,6 +240094,8 @@ self: {
        ];
        description = "Simple State-like monad transformer with saveable and restorable state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statethread" = callPackage
@@ -225422,6 +240159,8 @@ self: {
        libraryHaskellDepends = [ base double-conversion free mtl text ];
        description = "DSL to generate HTML5 Canvas javascript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "static-closure" = callPackage
@@ -225438,6 +240177,8 @@ self: {
        ];
        description = "Serialisable static pointers to functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "static-hash" = callPackage
@@ -225493,6 +240234,8 @@ self: {
        ];
        description = "Tensors of statically known size";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "static-text" = callPackage
@@ -225514,6 +240257,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Lists, Texts, ByteStrings and Vectors of statically known length";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "staticanalysis" = callPackage
@@ -225566,6 +240311,8 @@ self: {
        ];
        description = "Functions for working with Dirichlet densities and mixtures on vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statistics-fusion" = callPackage
@@ -225577,6 +240324,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "An implementation of high performance, minimal statistics functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statistics-hypergeometric-genvar" = callPackage
@@ -225592,6 +240341,8 @@ self: {
        ];
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statistics-linreg" = callPackage
@@ -225620,6 +240371,8 @@ self: {
        executableHaskellDepends = [ base statistics text vector ];
        description = "command line statistics";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statsd" = callPackage
@@ -225635,6 +240388,8 @@ self: {
        ];
        description = "StatsD API";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statsd-client" = callPackage
@@ -225652,6 +240407,8 @@ self: {
        ];
        description = "Statsd UDP client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statsd-datadog" = callPackage
@@ -225690,6 +240447,8 @@ self: {
        ];
        description = "A lovely [Dog]StatsD implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "status-notifier-item" = callPackage
@@ -225724,6 +240483,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Get unix filesystem statistics with statfs, statvfs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "staversion" = callPackage
@@ -225777,6 +240538,7 @@ self: {
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stb-image-redux" = callPackage
@@ -225789,6 +240551,8 @@ self: {
        testHaskellDepends = [ base hspec vector ];
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stb-truetype" = callPackage
@@ -225833,6 +240597,8 @@ self: {
        ];
        description = "A library for implicit, monadic dataflow parallelism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "std" = callPackage
@@ -225855,6 +240621,8 @@ self: {
        libraryHaskellDepends = [ base parsec syb template-haskell ];
        description = "Structure Data Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stdf" = callPackage
@@ -225877,6 +240645,8 @@ self: {
        ];
        description = "Parse Structured Test Data Format (STDF)";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stdio" = callPackage
@@ -225902,6 +240672,8 @@ self: {
        ];
        description = "A simple and high performance IO toolkit for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libuv;};
 
   "steambrowser" = callPackage
@@ -225915,6 +240687,8 @@ self: {
        executableHaskellDepends = [ base directory parsec transformers ];
        description = "List and launch steam games from the cli";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "steeloverseer" = callPackage
@@ -225958,6 +240732,8 @@ self: {
        testHaskellDepends = [ base random uuid ];
        description = "Generator and verifier for steganographic numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stemmer" = callPackage
@@ -225969,6 +240745,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell bindings to the Snowball stemming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stemmer-german" = callPackage
@@ -225982,6 +240760,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Extract the stem of a German inflected word form";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "step-function" = callPackage
@@ -226010,6 +240790,8 @@ self: {
        sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf";
        libraryHaskellDepends = [ base containers mtl ];
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stern-brocot" = callPackage
@@ -226027,6 +240809,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Positive rational numbers represented as paths in the Stern-Brocot tree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stgi" = callPackage
@@ -226055,6 +240839,8 @@ self: {
        ];
        description = "Educational implementation of the STG (Spineless Tagless G-machine)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stickyKeysHotKey" = callPackage
@@ -226150,6 +240936,8 @@ self: {
        testHaskellDepends = [ async base HUnit stm tasty tasty-hunit ];
        description = "Chunked Communication Queues";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-conduit" = callPackage
@@ -226195,6 +240983,8 @@ self: {
        ];
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-delay" = callPackage
@@ -226236,6 +241026,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit stm ];
        description = "Conduits and STM operations for fire hoses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-hamt" = callPackage
@@ -226262,6 +241054,8 @@ self: {
        ];
        description = "STM-specialised Hash Array Mapped Trie";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-incremental" = callPackage
@@ -226330,6 +241124,8 @@ self: {
        testHaskellDepends = [ base QuickCheck stm ];
        description = "Simple STM Promises for IO computations and external processes";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-queue" = callPackage
@@ -226392,6 +241188,8 @@ self: {
        ];
        description = "retry statistics for STM transactions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-supply" = callPackage
@@ -226429,6 +241227,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 mtl stm ];
        description = "Control communication among retrying transactions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stochastic" = callPackage
@@ -226444,6 +241244,8 @@ self: {
        ];
        description = "Monadic composition of probabilistic functions and sampling";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stocks" = callPackage
@@ -226546,6 +241348,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Storable type class for variable-sized data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "storable-complex" = callPackage
@@ -226607,6 +241411,8 @@ self: {
        libraryHaskellDepends = [ array base tagged vector ];
        description = "Statically-sized array wrappers with Storable instances for FFI marshaling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "storable-tuple" = callPackage
@@ -226669,6 +241475,8 @@ self: {
        ];
        description = "Conversion between storablevector and stream-fusion lists with fusion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "store" = callPackage
@@ -226768,6 +241576,8 @@ self: {
        executableHaskellDepends = [ base regex-compat ];
        description = "Simple Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "str" = callPackage
@@ -226784,6 +241594,8 @@ self: {
        ];
        description = "A type class to abstract between many different string types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stratosphere" = callPackage
@@ -226828,6 +241640,8 @@ self: {
        ];
        description = "Client for Stratum protocol";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stratux" = callPackage
@@ -226843,6 +241657,8 @@ self: {
        ];
        description = "A library for stratux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stratux-demo" = callPackage
@@ -226865,6 +241681,8 @@ self: {
        ];
        description = "A demonstration of the stratux library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stratux-http" = callPackage
@@ -226880,6 +241698,8 @@ self: {
        ];
        description = "A library for using HTTP with stratux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stratux-types" = callPackage
@@ -226895,6 +241715,8 @@ self: {
        ];
        description = "A library for reading JSON output from stratux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stratux-websockets" = callPackage
@@ -226911,6 +241733,8 @@ self: {
        ];
        description = "A library for using websockets with stratux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stream" = callPackage
@@ -226930,6 +241754,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stream-fusion" = callPackage
@@ -226943,6 +241769,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Faster Haskell lists using stream fusion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stream-monad" = callPackage
@@ -226956,6 +241784,8 @@ self: {
        libraryHaskellDepends = [ base logict ];
        description = "Simple, Fair and Terminating Backtracking Monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streamdeck" = callPackage
@@ -226967,6 +241797,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl split ];
        description = "Control library for the Elgato Stream Deck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streamed" = callPackage
@@ -226985,6 +241817,8 @@ self: {
        ];
        description = "Programmatically edit MIDI event streams via ALSA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming" = callPackage
@@ -227040,6 +241874,8 @@ self: {
        ];
        description = "Streaming conversion from/to base64";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-benchmarks" = callPackage
@@ -227065,6 +241901,8 @@ self: {
        ];
        description = "Benchmarks to compare streaming packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-binary" = callPackage
@@ -227120,6 +241958,8 @@ self: {
        ];
        description = "Streaming interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-bytestring" = callPackage
@@ -227162,6 +242002,8 @@ self: {
        ];
        description = "Cassava support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-commons" = callPackage
@@ -227208,6 +242050,8 @@ self: {
        ];
        description = "Concurrency support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-conduit" = callPackage
@@ -227224,6 +242068,8 @@ self: {
        testHaskellDepends = [ base conduit hspec streaming ];
        description = "Bidirectional support between the streaming and conduit libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-events" = callPackage
@@ -227240,6 +242086,8 @@ self: {
        ];
        description = "Client-side consumption of a ServerEvent";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-eversion" = callPackage
@@ -227275,6 +242123,8 @@ self: {
        ];
        description = "online streaming fft";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-histogram" = callPackage
@@ -227311,6 +242161,8 @@ self: {
        ];
        description = "Streaming interface for LZMA/XZ compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-osm" = callPackage
@@ -227333,6 +242185,8 @@ self: {
        ];
        description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-pcap" = callPackage
@@ -227354,6 +242208,8 @@ self: {
        ];
        description = "Stream packets via libpcap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-png" = callPackage
@@ -227374,6 +242230,8 @@ self: {
        ];
        description = "Perfectly streaming PNG image decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-postgresql-simple" = callPackage
@@ -227415,6 +242273,8 @@ self: {
        ];
        description = "Streaming support for running system process";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-sort" = callPackage
@@ -227436,6 +242296,8 @@ self: {
        ];
        description = "Sorting streams";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-utils" = callPackage
@@ -227457,6 +242319,8 @@ self: {
        ];
        description = "http, attoparsec, pipes and other utilities for the streaming libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-wai" = callPackage
@@ -227490,6 +242354,8 @@ self: {
        ];
        description = "with/bracket-style idioms for use with streaming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streamly" = callPackage
@@ -227538,6 +242404,8 @@ self: {
        testSystemDepends = [ archive ];
        description = "Stream data from archives using the streamly library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {archive = null;};
 
   "streamly-binary" = callPackage
@@ -227670,6 +242538,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Stream Processer Arrow";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streams" = callPackage
@@ -227706,6 +242576,8 @@ self: {
        ];
        description = "A simple, flexible and composable web-router";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "strelka-core" = callPackage
@@ -227782,6 +242654,8 @@ self: {
        ];
        description = "Strict variants of the types provided in base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "strict-concurrency" = callPackage
@@ -227817,6 +242691,8 @@ self: {
        ];
        description = "A collection of commonly used strict data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "strict-ghc-plugin" = callPackage
@@ -227828,6 +242704,8 @@ self: {
        libraryHaskellDepends = [ base ghc syb ];
        description = "Compiler plugin for making Haskell strict";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "strict-identity" = callPackage
@@ -227931,6 +242809,8 @@ self: {
        libraryHaskellDepends = [ base lens strict-tuple ];
        description = "Optics for the `strict-tuple` library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "strict-types" = callPackage
@@ -227985,6 +242865,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "Combinators for strictifying functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "string" = callPackage
@@ -228118,6 +243000,8 @@ self: {
        ];
        description = "Tools for working with isomorphisms of strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "string-like" = callPackage
@@ -228153,6 +243037,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "string-random" = callPackage
@@ -228222,6 +243108,8 @@ self: {
        ];
        description = "Type-level Chars and Strings, with decidable equality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stringable" = callPackage
@@ -228262,6 +243150,8 @@ self: {
        ];
        description = "Transformations to several string-like types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stringprep" = callPackage
@@ -228314,6 +243204,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers syb ];
        description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "strio" = callPackage
@@ -228359,6 +243251,8 @@ self: {
        ];
        description = "A Haskell implementation of the Stripe API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripe-concepts" = callPackage
@@ -228436,6 +243330,8 @@ self: {
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripe-scotty" = callPackage
@@ -228452,6 +243348,8 @@ self: {
        ];
        description = "Listen for Stripe webhook events with Scotty";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripe-signature" = callPackage
@@ -228502,6 +243400,8 @@ self: {
        ];
        description = "Use the Stripe API via Wreq";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripeapi" = callPackage
@@ -228583,6 +243483,8 @@ self: {
        ];
        description = "Interface library for strongSwan SQL backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "strptime" = callPackage
@@ -228636,6 +243538,8 @@ self: {
        ];
        description = "Instantiate structural induction schemas for algebraic data types";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "structural-traversal" = callPackage
@@ -228648,6 +243552,8 @@ self: {
        testHaskellDepends = [ base HUnit mtl ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "structured" = callPackage
@@ -228728,6 +243634,8 @@ self: {
        ];
        description = "Structured MongoDB interface";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "structures" = callPackage
@@ -228758,6 +243666,8 @@ self: {
        ];
        description = "\"Advanced\" Data Structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stt" = callPackage
@@ -228774,6 +243684,8 @@ self: {
        ];
        description = "A monad transformer version of the ST monad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stunclient" = callPackage
@@ -228797,6 +243709,8 @@ self: {
        ];
        description = "RFC 5389: Session Traversal Utilities for NAT (STUN) client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stunts" = callPackage
@@ -228817,6 +243731,8 @@ self: {
        ];
        description = "A revival of the classic game Stunts (LambdaCube tech demo)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stutter" = callPackage
@@ -228844,6 +243760,8 @@ self: {
        ];
        description = "(Stutter Text|String)-Utterer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stylish-cabal" = callPackage
@@ -228870,6 +243788,8 @@ self: {
        doHaddock = false;
        description = "Format Cabal files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stylish-haskell" = callPackage
@@ -228920,6 +243840,8 @@ self: {
        ];
        description = "Apply CSS styles to a document tree";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stylized" = callPackage
@@ -228931,6 +243853,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Ways to output stylized text on ANSI consoles";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "styx" = callPackage
@@ -228970,6 +243894,8 @@ self: {
        ];
        description = "An applicative functor that seamlessly talks to HTML inputs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sub-state" = callPackage
@@ -228987,6 +243913,8 @@ self: {
        ];
        description = "Get the total, put a single element";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "subG" = callPackage
@@ -229064,6 +243992,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion MonadRandom ];
        description = "Type safe interface for programming in subcategories of Hask";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "subleq-toolchain" = callPackage
@@ -229085,6 +244015,8 @@ self: {
        ];
        description = "Toolchain of subleq computer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "submark" = callPackage
@@ -229106,6 +244038,8 @@ self: {
        ];
        description = "Extract a part from CommonMark/Markdown docs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "subnet" = callPackage
@@ -229135,6 +244069,8 @@ self: {
        ];
        description = "Subsample data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "substring-parser" = callPackage
@@ -229153,6 +244089,8 @@ self: {
        ];
        description = "Match / replace substrings with a parser combinators";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "subtitleParser" = callPackage
@@ -229189,6 +244127,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Subword graph implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "subzero" = callPackage
@@ -229227,6 +244167,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An applicative functor to manage successors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "suffix-array" = callPackage
@@ -229247,6 +244189,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Simple and moderately efficient suffix array implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "suffixarray" = callPackage
@@ -229261,6 +244205,8 @@ self: {
        executableHaskellDepends = [ base HUnit ];
        description = "n log n implementation of suffix array";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "suffixtree" = callPackage
@@ -229285,6 +244231,8 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Library-based syntactic extensibility for Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "suitable" = callPackage
@@ -229296,6 +244244,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Abstract over the constraints on the parameters to type constructors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sum-type-boilerplate" = callPackage
@@ -229347,6 +244297,8 @@ self: {
        ];
        description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "summoner-tui" = callPackage
@@ -229366,6 +244318,8 @@ self: {
        executableHaskellDepends = [ base relude ];
        description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sump" = callPackage
@@ -229383,6 +244337,8 @@ self: {
        ];
        description = "A Haskell interface to SUMP-compatible logic analyzers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sundown" = callPackage
@@ -229410,6 +244366,8 @@ self: {
        ];
        description = "Test Cabalized package against multiple dependency versions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sunroof-compiler" = callPackage
@@ -229427,6 +244385,8 @@ self: {
        ];
        description = "Monadic Javascript Compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sunroof-examples" = callPackage
@@ -229448,6 +244408,8 @@ self: {
        ];
        description = "Tests for Sunroof";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sunroof-server" = callPackage
@@ -229469,6 +244431,8 @@ self: {
        ];
        description = "Monadic Javascript Compiler - Server Utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "super-user-spark" = callPackage
@@ -229498,6 +244462,8 @@ self: {
        ];
        description = "Configure your dotfile deployment with a DSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "superbubbles" = callPackage
@@ -229512,6 +244478,8 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "superbuffer" = callPackage
@@ -229546,6 +244514,8 @@ self: {
        ];
        description = "Haskell SuperCollider utilities";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "supercollider-midi" = callPackage
@@ -229568,6 +244538,8 @@ self: {
        ];
        description = "Demonstrate how to control SuperCollider via ALSA-MIDI";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "superconstraints" = callPackage
@@ -229584,6 +244556,8 @@ self: {
        ];
        description = "Access an instance's constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "superdoc" = callPackage
@@ -229623,6 +244597,8 @@ self: {
        ];
        description = "A simple opinionated event store implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "supermonad" = callPackage
@@ -229639,6 +244615,8 @@ self: {
        testHaskellDepends = [ base containers ghc QuickCheck ];
        description = "Plugin and base library to support supermonads in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "supernova" = callPackage
@@ -229659,6 +244637,8 @@ self: {
        testHaskellDepends = [ aeson async base bytestring streamly text ];
        description = "Apache Pulsar client for Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "supero" = callPackage
@@ -229677,6 +244657,8 @@ self: {
        ];
        description = "A Supercompiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "superrecord" = callPackage
@@ -229709,6 +244691,8 @@ self: {
        ];
        description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "supervisors" = callPackage
@@ -229745,6 +244729,8 @@ self: {
        ];
        description = "Early termination for monads";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "surjective" = callPackage
@@ -229756,6 +244742,8 @@ self: {
        libraryHaskellDepends = [ base lens mtl template-haskell ];
        description = "An output coverage checker";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "suspend" = callPackage
@@ -229795,6 +244783,8 @@ self: {
        ];
        description = "Encode and decode separated values (CSV, PSV, ...)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sv-cassava" = callPackage
@@ -229860,6 +244850,8 @@ self: {
        ];
        description = "sv-core + svfactor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svfactor" = callPackage
@@ -229885,6 +244877,8 @@ self: {
        ];
        description = "Syntax-preserving CSV manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svg-builder" = callPackage
@@ -229902,6 +244896,8 @@ self: {
        ];
        description = "DSL for building SVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svg-builder-fork" = callPackage
@@ -229917,6 +244913,8 @@ self: {
        ];
        description = "DSL for building SVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svg-tree" = callPackage
@@ -229951,6 +244949,8 @@ self: {
        ];
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svgcairo" = callPackage
@@ -229967,6 +244967,8 @@ self: {
        libraryPkgconfigDepends = [ librsvg ];
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) librsvg;};
 
   "svgutils" = callPackage
@@ -229981,6 +244983,8 @@ self: {
        executableHaskellDepends = [ base filepath xml ];
        description = "Helper functions for dealing with SVG files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svm" = callPackage
@@ -230005,6 +245009,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Parsers and formatters for the SVMlight input file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svm-simple" = callPackage
@@ -230021,6 +245027,8 @@ self: {
        ];
        description = "Medium level, simplified, bindings to libsvm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svndump" = callPackage
@@ -230039,6 +245047,8 @@ self: {
        ];
        description = "Library for reading Subversion dump files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swagger" = callPackage
@@ -230083,6 +245093,8 @@ self: {
        ];
        description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swagger-test" = callPackage
@@ -230112,6 +245124,8 @@ self: {
        ];
        description = "Testing of Swagger APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swagger2" = callPackage
@@ -230146,6 +245160,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swapper" = callPackage
@@ -230163,6 +245179,8 @@ self: {
        librarySystemDepends = [ tokyocabinet ];
        description = "Transparently swapping data from in-memory structures to disk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) tokyocabinet;};
 
   "swearjure" = callPackage
@@ -230182,6 +245200,8 @@ self: {
        ];
        description = "Clojure without alphanumerics";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sweet-egison" = callPackage
@@ -230204,6 +245224,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Shallow embedding implementation of non-linear pattern matching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swf" = callPackage
@@ -230215,6 +245237,8 @@ self: {
        libraryHaskellDepends = [ base mtl pretty ];
        description = "A library for creating Shockwave Flash (SWF) files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swift-lda" = callPackage
@@ -230230,6 +245254,8 @@ self: {
        ];
        description = "Online sampler for Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swish" = callPackage
@@ -230269,6 +245295,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings for the Swiss Ephemeris C library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sws" = callPackage
@@ -230292,6 +245320,8 @@ self: {
        ];
        description = "A simple web server for serving directories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sxml" = callPackage
@@ -230330,6 +245360,8 @@ self: {
        libraryHaskellDepends = [ base eq prelude-extras ];
        description = "Higher order versions of the Scrap Your Boilerplate classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syb-with-class" = callPackage
@@ -230357,6 +245389,8 @@ self: {
        libraryHaskellDepends = [ base syb-with-class text ];
        description = "Scrap Your Boilerplate With Class Text instance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syfco" = callPackage
@@ -230377,6 +245411,8 @@ self: {
        ];
        description = "Synthesis Format Conversion Tool / Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sylvia" = callPackage
@@ -230402,6 +245438,8 @@ self: {
        ];
        description = "Lambda calculus visualization";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sym" = callPackage
@@ -230414,6 +245452,8 @@ self: {
        testHaskellDepends = [ base hashable QuickCheck ];
        description = "Permutations, patterns, and statistics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sym-plot" = callPackage
@@ -230425,6 +245465,8 @@ self: {
        libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ];
        description = "Plot permutations; an addition to the sym package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic" = callPackage
@@ -230441,6 +245483,8 @@ self: {
        ];
        description = "Library for Typed Tagless-Final Higher-Order Composable DSL";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-atom" = callPackage
@@ -230462,6 +245506,8 @@ self: {
        ];
        description = "Library for reading and writing Atom";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-base" = callPackage
@@ -230489,6 +245535,8 @@ self: {
        ];
        description = "Symantics for parsing and documenting a CLI";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-document" = callPackage
@@ -230537,6 +245585,8 @@ self: {
        ];
        description = "Symantic combinators for deriving clients or a server from an HTTP API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-http-client" = callPackage
@@ -230555,6 +245605,8 @@ self: {
        ];
        description = "symantic-http applied to the derivation of HTTP clients";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-http-demo" = callPackage
@@ -230581,6 +245633,8 @@ self: {
        ];
        description = "Demo for symantic-http and its companion libraries";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-http-pipes" = callPackage
@@ -230602,6 +245656,8 @@ self: {
        ];
        description = "Streaming support through pipes for symantic-http";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-http-server" = callPackage
@@ -230620,6 +245676,8 @@ self: {
        ];
        description = "symantic-http applied to the derivation of HTTP servers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-http-test" = callPackage
@@ -230647,6 +245705,8 @@ self: {
        ];
        description = "Test symantic-http and its companion libraries";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-lib" = callPackage
@@ -230669,6 +245729,8 @@ self: {
        ];
        description = "Symantics for common types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-xml" = callPackage
@@ -230692,6 +245754,8 @@ self: {
        ];
        description = "Library for reading, validating and writing XML";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symbiote" = callPackage
@@ -230723,6 +245787,8 @@ self: {
        ];
        description = "Data serialization, communication, and operation verification implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symbol" = callPackage
@@ -230748,6 +245814,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Symlink functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symbols" = callPackage
@@ -230774,6 +245842,8 @@ self: {
        testSystemDepends = [ gmp gmpxx symengine ];
        description = "SymEngine symbolic mathematics engine for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; 
          inherit (pkgs) symengine;};
 
@@ -230792,6 +245862,8 @@ self: {
        testSystemDepends = [ gmp gmpxx symengine ];
        description = "SymEngine symbolic mathematics engine for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; 
          inherit (pkgs) symengine;};
 
@@ -230821,6 +245893,8 @@ self: {
        ];
        description = "Derivation of symbols and coordinate triplets Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symon" = callPackage
@@ -230847,6 +245921,8 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A fast implementation of synchronous channels with a CML-like API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sync-mht" = callPackage
@@ -230884,6 +245960,8 @@ self: {
        ];
        description = "Fast incremental file transfer using Merkle-Hash-Trees";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "synchronous-channels" = callPackage
@@ -230922,6 +246000,8 @@ self: {
        ];
        description = "Haskell bindings for the Syncthing REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "synt" = callPackage
@@ -230970,6 +246050,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntactical" = callPackage
@@ -230998,6 +246080,8 @@ self: {
        ];
        description = "Reversible parsing and pretty-printing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-attoparsec" = callPackage
@@ -231013,6 +246097,8 @@ self: {
        ];
        description = "Syntax instances for Attoparsec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-example" = callPackage
@@ -231031,6 +246117,8 @@ self: {
        ];
        description = "Example application using syntax, a library for abstract syntax descriptions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-example-json" = callPackage
@@ -231049,6 +246137,8 @@ self: {
        ];
        description = "Example JSON parser/pretty-printer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-pretty" = callPackage
@@ -231063,6 +246153,8 @@ self: {
        ];
        description = "Syntax instance for pretty, the pretty printing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-printer" = callPackage
@@ -231079,6 +246171,8 @@ self: {
        ];
        description = "Text and ByteString printers for 'syntax'";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-trees" = callPackage
@@ -231094,6 +246188,8 @@ self: {
        ];
        description = "Convert between different Haskell syntax trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-trees-fork-bairyn" = callPackage
@@ -231109,6 +246205,8 @@ self: {
        ];
        description = "Convert between different Haskell syntax trees. Bairyn's fork.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntaxnet-haskell" = callPackage
@@ -231127,6 +246225,8 @@ self: {
        testHaskellDepends = [ aeson base cassava haskell-conll hspec ];
        description = "Working with Google's SyntaxNet output files - CoNLL, Tree";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "synthesizer" = callPackage
@@ -231148,6 +246248,8 @@ self: {
        ];
        description = "Audio signal processing coded in Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "synthesizer-alsa" = callPackage
@@ -231286,6 +246388,8 @@ self: {
        doHaddock = false;
        description = "Efficient signal processing using runtime compilation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "synthesizer-midi" = callPackage
@@ -231345,6 +246449,8 @@ self: {
        ];
        description = "A replacement for System.Exit and System.Process.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sysinfo" = callPackage
@@ -231384,6 +246490,8 @@ self: {
        testHaskellDepends = [ base basic-prelude chell system-filepath ];
        description = "Abstract data type for canonical paths with some utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-command" = callPackage
@@ -231402,6 +246510,8 @@ self: {
        ];
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-error" = callPackage
@@ -231427,6 +246537,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A bunch of system utilities used by other projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-fileio" = callPackage
@@ -231498,6 +246610,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to Linux's inotify interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-lifted" = callPackage
@@ -231520,6 +246634,8 @@ self: {
        ];
        description = "Lifted versions of System functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-linux-proc" = callPackage
@@ -231536,6 +246652,8 @@ self: {
        testHaskellDepends = [ base directory hedgehog pretty-show ];
        description = "A library for accessing the /proc filesystem in Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-locale" = callPackage
@@ -231552,6 +246670,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Get system locales";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-posix-redirect" = callPackage
@@ -231589,6 +246709,8 @@ self: {
        ];
        description = "Random number generation for extensible effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-test" = callPackage
@@ -231693,6 +246815,8 @@ self: {
        ];
        description = "An application that regularly logs system stats for later analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syz" = callPackage
@@ -231721,6 +246845,8 @@ self: {
        ];
        description = "Matchers and grammars using tree regular expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "t3-client" = callPackage
@@ -231732,6 +246858,8 @@ self: {
        libraryHaskellDepends = [ base t3-game t3-server ];
        description = "tic-tac-toe Rexports for client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "t3-game" = callPackage
@@ -231767,6 +246895,8 @@ self: {
        ];
        description = "tic-tac-toe server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ta" = callPackage
@@ -231782,6 +246912,8 @@ self: {
        ];
        description = "Transito Abierto: convenience library when using Takusen and Oracle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tabl" = callPackage
@@ -231811,6 +246943,8 @@ self: {
        ];
        description = "Simple tool to generate tables from DSV input";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "table-layout" = callPackage
@@ -231846,6 +246980,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A table tennis game tracking engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tableaux" = callPackage
@@ -231863,6 +246999,8 @@ self: {
        ];
        description = "An interactive theorem prover based on semantic tableaux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tables" = callPackage
@@ -231886,6 +247024,8 @@ self: {
        ];
        description = "In-memory storage with multiple keys using lenses and traversals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tablestorage" = callPackage
@@ -231906,6 +247046,8 @@ self: {
        ];
        description = "Azure Table Storage REST API Wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tablize" = callPackage
@@ -231942,6 +247084,8 @@ self: {
        ];
        description = "View the output of shell commands in a table";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tabs" = callPackage
@@ -231956,6 +247100,8 @@ self: {
        executableHaskellDepends = [ base filepath monadlist mtl tagged ];
        description = "Indents source files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tabular" = callPackage
@@ -232013,6 +247159,8 @@ self: {
        executablePkgconfigDepends = [ gtk3 ];
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "tag-bits" = callPackage
@@ -232024,6 +247172,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Provides access to the dynamic pointer tagging bits used by GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tag-stream" = callPackage
@@ -232039,6 +247189,8 @@ self: {
        ];
        description = "streamlined html tag parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagchup" = callPackage
@@ -232105,6 +247257,8 @@ self: {
        ];
        description = "Reflect exceptions using phantom types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagged-identity" = callPackage
@@ -232135,6 +247289,8 @@ self: {
        ];
        description = "Lists tagged with a type-level natural number representing their length";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagged-th" = callPackage
@@ -232148,6 +247304,8 @@ self: {
        ];
        description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagged-timers" = callPackage
@@ -232161,6 +247319,8 @@ self: {
        ];
        description = "Simple wrappers for timing IO actions (single-threaded)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagged-transformer" = callPackage
@@ -232263,6 +247423,8 @@ self: {
        libraryPkgconfigDepends = [ taglib ];
        description = "An FFI layer over TagLib's C bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) taglib;};
 
   "tagset-positional" = callPackage
@@ -232328,6 +247490,8 @@ self: {
        ];
        description = "alternative parser for the tagsoup package";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagsoup-megaparsec" = callPackage
@@ -232344,6 +247508,8 @@ self: {
        ];
        description = "A Tag token parser and Tag specific parsing combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagsoup-navigate" = callPackage
@@ -232361,6 +247527,8 @@ self: {
        ];
        description = "Tagsoup Navigate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagsoup-parsec" = callPackage
@@ -232372,6 +247540,8 @@ self: {
        libraryHaskellDepends = [ base parsec tagsoup ];
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagsoup-selection" = callPackage
@@ -232383,6 +247553,8 @@ self: {
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "Selecting subtrees from TagSoup's TagTrees using CSS selectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagstew" = callPackage
@@ -232403,6 +247575,8 @@ self: {
        ];
        description = "Black magic tagsoup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagstream-conduit" = callPackage
@@ -232440,6 +247614,8 @@ self: {
        ];
        description = "Support library to enable TAI usage on systems with time kept in UTC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tai64" = callPackage
@@ -232458,6 +247634,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tai64 Labels for Haskell";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tailfile-hinotify" = callPackage
@@ -232530,6 +247708,8 @@ self: {
        libraryHaskellDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "takusen-oracle" = callPackage
@@ -232544,6 +247724,8 @@ self: {
        librarySystemDepends = [ clntsh ];
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {clntsh = null;};
 
   "tal" = callPackage
@@ -232559,6 +247741,8 @@ self: {
        ];
        description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tamarin-prover" = callPackage
@@ -232588,6 +247772,8 @@ self: {
        ];
        description = "The Tamarin prover for security protocol analysis";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tamarin-prover-term" = callPackage
@@ -232606,6 +247792,8 @@ self: {
        ];
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tamarin-prover-theory" = callPackage
@@ -232627,6 +247815,8 @@ self: {
        ];
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tamarin-prover-utils" = callPackage
@@ -232644,6 +247834,8 @@ self: {
        ];
        description = "Utility library for the tamarin prover";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tamper" = callPackage
@@ -232705,6 +247897,8 @@ self: {
        testHaskellDepends = [ base hspec vector ];
        description = "A tasty enhancement to cassava for easy csv exporting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tar" = callPackage
@@ -232836,6 +248030,8 @@ self: {
        ];
        description = "Generate test-suites from refinement types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) z3;};
 
   "tart" = callPackage
@@ -232858,6 +248054,8 @@ self: {
        ];
        description = "Terminal Art";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "task" = callPackage
@@ -232877,6 +248075,8 @@ self: {
        ];
        description = "A command line tool for keeping track of tasks you worked on";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "task-distribution" = callPackage
@@ -232913,6 +248113,8 @@ self: {
        ];
        description = "Distributed processing of changing tasks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "taskell" = callPackage
@@ -232942,6 +248144,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A command-line kanban board/task manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "taskpool" = callPackage
@@ -233057,6 +248261,8 @@ self: {
        ];
        description = "Auto discovery for Tasty with support for ingredients and test tree generation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-bdd" = callPackage
@@ -233082,6 +248288,8 @@ self: {
        ];
        description = "BDD tests language and tasty provider";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-dejafu" = callPackage
@@ -233165,6 +248373,8 @@ self: {
        ];
        description = "Adds the ability to fail a tasty test suite on first test failure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-golden" = callPackage
@@ -233229,6 +248439,8 @@ self: {
        ];
        description = "Tasty Tests for groundhog converters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-hedgehog" = callPackage
@@ -233269,6 +248481,8 @@ self: {
        ];
        description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-hspec" = callPackage
@@ -233385,6 +248599,8 @@ self: {
        ];
        description = "automated integration of QuickCheck properties into tasty suites";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-jenkins-xml" = callPackage
@@ -233404,6 +248620,8 @@ self: {
        ];
        description = "Render tasty output to both console and XML for Jenkins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-json" = callPackage
@@ -233452,6 +248670,8 @@ self: {
        testHaskellDepends = [ base smallcheck smallcheck-laws tasty ];
        description = "Test common laws";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-leancheck" = callPackage
@@ -233480,6 +248700,8 @@ self: {
        testHaskellDepends = [ base lens tasty ];
        description = "Tasty TestTrees for Lens validation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-lua" = callPackage
@@ -233523,6 +248745,8 @@ self: {
        ];
        description = "Golden testing provider for tasty with muti-line diff output";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-program" = callPackage
@@ -233633,6 +248857,8 @@ self: {
        ];
        description = "Collect statistics of your Tasty testsuite";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-tap" = callPackage
@@ -233757,6 +248983,8 @@ self: {
        ];
        description = "Meta tic-tac-toe ncurses game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tau" = callPackage
@@ -233798,6 +249026,8 @@ self: {
        ];
        description = "Transactional variables and data structures with IO hooks";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tcache-AWS" = callPackage
@@ -233813,6 +249043,8 @@ self: {
        ];
        description = "tcache using Amazon Web Services as default persistence mechanism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tccli" = callPackage
@@ -233830,6 +249062,8 @@ self: {
        ];
        description = "TokyoCabinet CLI interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tce-conf" = callPackage
@@ -233863,6 +249097,8 @@ self: {
        libraryPkgconfigDepends = [ libtcod ];
        description = "Bindings to libtcod roguelike engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libtcod;};
 
   "tconfig" = callPackage
@@ -233885,6 +249121,8 @@ self: {
        libraryHaskellDepends = [ base containers old-time ];
        description = "A purely functional TCP implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tcp-streams" = callPackage
@@ -233928,6 +249166,8 @@ self: {
        ];
        description = "Tcp streams using openssl for tls support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tdd-util" = callPackage
@@ -233955,6 +249195,8 @@ self: {
        ];
        description = "Test framework wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tdigest" = callPackage
@@ -234000,6 +249242,8 @@ self: {
        ];
        description = "Chart generation from tdigest";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tdlib" = callPackage
@@ -234027,6 +249271,8 @@ self: {
        testSystemDepends = [ tdlib ];
        description = "complete binding to the Telegram Database Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) tdlib;};
 
   "tdlib-gen" = callPackage
@@ -234055,6 +249301,8 @@ self: {
        ];
        description = "Codegen for TDLib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tdlib-types" = callPackage
@@ -234075,6 +249323,8 @@ self: {
        ];
        description = "Types and Functions generated from tdlib api spec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tdoc" = callPackage
@@ -234111,6 +249361,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pure Haskell TDS protocol implementation. Mainly for beam-mssql and beam-sybase";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "teams" = callPackage
@@ -234122,6 +249374,8 @@ self: {
        libraryHaskellDepends = [ base containers fgl graphviz ];
        description = "Graphical modeling tools for sequential teams";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "teardown" = callPackage
@@ -234185,6 +249439,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dental data types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tehepero" = callPackage
@@ -234215,6 +249471,8 @@ self: {
        ];
        description = "Telegram API client";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "telegram-api" = callPackage
@@ -234242,6 +249500,8 @@ self: {
        ];
        description = "Telegram Bot API bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "telegram-bot" = callPackage
@@ -234262,6 +249522,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Telegram Bot microframework for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "telegram-bot-simple" = callPackage
@@ -234293,6 +249555,8 @@ self: {
        ];
        description = "Easy to use library for building Telegram bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "telegram-raw-api" = callPackage
@@ -234317,6 +249581,8 @@ self: {
        ];
        description = "Servant bindings to the Telegram bot API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "telegram-types" = callPackage
@@ -234338,6 +249604,8 @@ self: {
        ];
        description = "Types used in Telegram bot API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "teleport" = callPackage
@@ -234358,6 +249626,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A tool to quickly switch between directories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "teleshell" = callPackage
@@ -234380,6 +249650,8 @@ self: {
        ];
        description = "Telnet client and other things";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tellbot" = callPackage
@@ -234399,6 +249671,8 @@ self: {
        ];
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tempered" = callPackage
@@ -234431,6 +249705,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "For representing musical tempi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "template" = callPackage
@@ -234453,6 +249729,8 @@ self: {
        libraryHaskellDepends = [ base data-default template-haskell ];
        description = "declaring Default instances just got even easier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "template-haskell_2_16_0_0" = callPackage
@@ -234502,6 +249780,8 @@ self: {
        ];
        description = "Some utilities for template Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "template-hsml" = callPackage
@@ -234522,6 +249802,8 @@ self: {
        ];
        description = "Haskell's Simple Markup Language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "template-toolkit" = callPackage
@@ -234552,6 +249834,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        description = "Process template file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "templateify" = callPackage
@@ -234565,6 +249849,8 @@ self: {
        executableHaskellDepends = [ base mtl tagsoup uniplate ];
        description = "Make template from website";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "templatepg" = callPackage
@@ -234582,6 +249868,8 @@ self: {
        ];
        description = "A PostgreSQL access library with compile-time SQL type inference";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "templater" = callPackage
@@ -234636,6 +249924,8 @@ self: {
        ];
        description = "A small Haskell wrapper around the TempoDB api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "temporal-csound" = callPackage
@@ -234653,6 +249943,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "temporal-media" = callPackage
@@ -234774,6 +250066,8 @@ self: {
        executableToolDepends = [ happy ];
        description = "Interpreter for the FRP language Tempus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tempus-fugit" = callPackage
@@ -234801,6 +250095,8 @@ self: {
        testHaskellDepends = [ base QuickCheck random ];
        description = "A completely type-safe library for linear algebra";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tensor-safe" = callPackage
@@ -234824,6 +250120,8 @@ self: {
        ];
        description = "Create valid deep neural network architectures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tensorflow" = callPackage
@@ -234852,6 +250150,8 @@ self: {
        ];
        description = "TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libtensorflow = null;};
 
   "tensorflow-core-ops" = callPackage
@@ -234872,6 +250172,8 @@ self: {
        ];
        description = "Haskell wrappers for Core Tensorflow Ops";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tensorflow-logging" = callPackage
@@ -234900,6 +250202,8 @@ self: {
        ];
        description = "TensorBoard related functionality";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tensorflow-mnist" = callPackage
@@ -234952,6 +250256,8 @@ self: {
        ];
        description = "Code generation for TensorFlow operations";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tensorflow-ops" = callPackage
@@ -234981,6 +250287,8 @@ self: {
        ];
        description = "Friendly layer around TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tensorflow-proto" = callPackage
@@ -235103,6 +250411,8 @@ self: {
        libraryHaskellDepends = [ base reactive-banana termbox ];
        description = "reactive-banana + termbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "termbox-bindings" = callPackage
@@ -235118,6 +250428,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Bindings to the Termbox library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "termcolor" = callPackage
@@ -235213,6 +250525,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "termination-combinators" = callPackage
@@ -235224,6 +250538,8 @@ self: {
        libraryHaskellDepends = [ base containers contravariant ];
        description = "Termination combinators for forcing non-terminating algorithms to terminate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "terminfo_0_4_1_4" = callPackage
@@ -235307,6 +250623,8 @@ self: {
        ];
        description = "Plot time series in your terminal using commands stdout";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "terntup" = callPackage
@@ -235324,6 +250642,8 @@ self: {
        ];
        description = "a ternary library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "terrahs" = callPackage
@@ -235336,6 +250656,8 @@ self: {
        librarySystemDepends = [ terralib4c translib ];
        description = "A Haskell GIS Programming Environment";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {terralib4c = null; translib = null;};
 
   "tersmu" = callPackage
@@ -235356,6 +250678,8 @@ self: {
        ];
        description = "A semantic parser for lojban";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tesla" = callPackage
@@ -235381,6 +250705,8 @@ self: {
        ];
        description = "Tesla API client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-fixture" = callPackage
@@ -235402,6 +250728,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Test monadic side-effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-framework" = callPackage
@@ -235442,6 +250770,8 @@ self: {
        testHaskellDepends = [ base test-framework ];
        description = "Test.Framework wrapper for DocTest";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-framework-golden" = callPackage
@@ -235511,6 +250841,8 @@ self: {
        ];
        description = "QuickCheck support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-framework-quickcheck2" = callPackage
@@ -235548,6 +250880,8 @@ self: {
        ];
        description = "test-sandbox support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-framework-skip" = callPackage
@@ -235567,6 +250901,8 @@ self: {
        ];
        description = "Functions for conveniently marking some of the tests in a suite as being skipped";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-framework-smallcheck" = callPackage
@@ -235592,6 +250928,8 @@ self: {
        testHaskellDepends = [ base test-framework testing-feat ];
        description = "A test framework provider for testing-feat";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-framework-th" = callPackage
@@ -235623,6 +250961,8 @@ self: {
        ];
        description = "Template Haskell for test framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-fun" = callPackage
@@ -235674,6 +251014,8 @@ self: {
        ];
        description = "Testing framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-lib" = callPackage
@@ -235724,6 +251066,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Just tests Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-sandbox" = callPackage
@@ -235751,6 +251095,8 @@ self: {
        ];
        description = "Sandbox for system tests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-sandbox-compose" = callPackage
@@ -235782,6 +251128,8 @@ self: {
        ];
        description = "Lightweight development enviroments using test-sandbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-sandbox-hunit" = callPackage
@@ -235793,6 +251141,8 @@ self: {
        libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ];
        description = "HUnit convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-sandbox-quickcheck" = callPackage
@@ -235808,6 +251158,8 @@ self: {
        ];
        description = "QuickCheck convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-shouldbe" = callPackage
@@ -235821,6 +251173,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-simple" = callPackage
@@ -235839,6 +251193,8 @@ self: {
        ];
        description = "Simple Perl inspired testing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testCom" = callPackage
@@ -235856,6 +251212,8 @@ self: {
        ];
        description = "Write your tests in comments";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testPkg" = callPackage
@@ -235891,6 +251249,8 @@ self: {
        ];
        description = "Create tests and benchmarks together";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testcontainers" = callPackage
@@ -235913,6 +251273,8 @@ self: {
        testToolDepends = [ hspec-discover tasty-discover ];
        description = "Docker containers for your integration tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testing-feat" = callPackage
@@ -235928,6 +251290,8 @@ self: {
        ];
        description = "Functional Enumeration of Algebraic Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testing-type-modifiers" = callPackage
@@ -235957,6 +251321,8 @@ self: {
        ];
        description = "Quick feedback loop for test suites";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testpack" = callPackage
@@ -235973,6 +251339,8 @@ self: {
        ];
        description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testpattern" = callPackage
@@ -235987,6 +251355,8 @@ self: {
        executableHaskellDepends = [ base filepath gtk ];
        description = "Display a monitor test pattern";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testrunner" = callPackage
@@ -236001,6 +251371,8 @@ self: {
        ];
        description = "Easy unit test driver framework";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tetris" = callPackage
@@ -236049,6 +251421,8 @@ self: {
        executableHaskellDepends = [ base containers deepseq parsec ];
        description = "LaTeX to plain-text conversion";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "texbuilder" = callPackage
@@ -236069,6 +251443,8 @@ self: {
        ];
        description = "View your latex output while editing";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "texmath" = callPackage
@@ -236113,6 +251489,8 @@ self: {
        ];
        description = "Functions for running Tex from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text_1_2_4_0" = callPackage
@@ -236152,6 +251530,8 @@ self: {
        ];
        description = "Everything Data.Text related in one package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-and-plots" = callPackage
@@ -236168,6 +251548,8 @@ self: {
        ];
        description = "EDSL to create HTML documents with plots based on the C3.js library.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-ansi" = callPackage
@@ -236233,6 +251615,8 @@ self: {
        ];
        description = "Memory-efficient string-indexed container types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-conversions" = callPackage
@@ -236302,6 +251686,8 @@ self: {
        testHaskellDepends = [ base hspec time ];
        description = "Full-weight string formatting library, analog of Python's string.format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-format-simple" = callPackage
@@ -236337,6 +251723,8 @@ self: {
        ];
        description = "A generic, derivable, haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-icu" = callPackage
@@ -236380,6 +251768,8 @@ self: {
        ];
        description = "Dealing with Strict Text in NFC normalization";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-icu-translit" = callPackage
@@ -236463,6 +251853,8 @@ self: {
        testHaskellDepends = [ base hspec lens ];
        description = "Lenses for operating over text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-lips" = callPackage
@@ -236478,6 +251870,8 @@ self: {
        ];
        description = "Monadic parsing combinator library with attention to locations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-loc" = callPackage
@@ -236531,6 +251925,8 @@ self: {
        ];
        description = "A data structure for mapping metadata to text subsequences";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-metrics" = callPackage
@@ -236564,6 +251960,8 @@ self: {
        ];
        description = "Unicode-normalized text";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-offset" = callPackage
@@ -236582,6 +251980,8 @@ self: {
        ];
        description = "Library for converting between line/column and byte offset";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-plus" = callPackage
@@ -236598,6 +251998,8 @@ self: {
        testHaskellDepends = [ base doctest HTF text ];
        description = "Utils for text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-position" = callPackage
@@ -236612,6 +252014,8 @@ self: {
        testHaskellDepends = [ base QuickCheck regex-applicative ];
        description = "Handling positions in text and position-tagging it";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-postgresql" = callPackage
@@ -236691,6 +252095,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl vector ];
        description = "A Haskell implementation of the 1# Text Register Machine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-render" = callPackage
@@ -236719,6 +252125,8 @@ self: {
        testHaskellDepends = [ base hedgehog neat-interpolation text ];
        description = "Simple text replacements from a list of search/replace pairs";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-short" = callPackage
@@ -236886,6 +252294,8 @@ self: {
        ];
        description = "An efficient finite map from Text to values, based on bytestring-trie";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-utf7" = callPackage
@@ -236927,6 +252337,8 @@ self: {
        ];
        description = "An efficient packed UTF-8 backed Unicode text type";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-utils" = callPackage
@@ -236939,6 +252351,8 @@ self: {
        testHaskellDepends = [ base HTF text ];
        description = "Various text utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-xml-generic" = callPackage
@@ -236967,6 +252381,8 @@ self: {
        libraryHaskellDepends = [ base parsec template-haskell xml ];
        description = "Quasiquoter for xml. XML DSL in Haskell.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-zipper" = callPackage
@@ -236992,6 +252408,8 @@ self: {
        testHaskellDepends = [ base hspec text-zipper ];
        description = "Monadic interface to the text-zipper package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text1" = callPackage
@@ -237008,6 +252426,8 @@ self: {
        ];
        description = "Non-empty values of `Data.Text`.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "textPlot" = callPackage
@@ -237048,6 +252468,8 @@ self: {
        executableHaskellDepends = [ base haskell98 process ];
        description = "A simple Haskell program to provide tags for Haskell code completion in TextMate";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "textocat-api" = callPackage
@@ -237068,6 +252490,8 @@ self: {
        ];
        description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "texts" = callPackage
@@ -237090,6 +252514,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text utf8-string ];
        description = "Textual type class for data that represent text";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tf-random" = callPackage
@@ -237124,6 +252550,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell tfp ];
        description = "Template-Haskell code for tfp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tftp" = callPackage
@@ -237148,6 +252576,8 @@ self: {
        ];
        description = "A library for building tftp servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tga" = callPackage
@@ -237159,6 +252589,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Reading and writing of tga image files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-abstraction" = callPackage
@@ -237192,6 +252624,8 @@ self: {
        ];
        description = "Alpha equivalence for TH Exp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-bang-compat" = callPackage
@@ -237214,6 +252648,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "More convenient construction of TH ASTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-cas" = callPackage
@@ -237277,6 +252713,8 @@ self: {
        ];
        description = "Test instance context";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-data-compat" = callPackage
@@ -237321,6 +252759,8 @@ self: {
        libraryHaskellDepends = [ base constraints template-haskell ];
        description = "Automatically discover available dictionaries at compile time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-env" = callPackage
@@ -237368,6 +252808,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "TH fold generator";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-format" = callPackage
@@ -237384,6 +252826,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit text ];
        description = "Template Haskell based support for format strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-inline-io-action" = callPackage
@@ -237415,6 +252859,8 @@ self: {
        ];
        description = "Fixed versions of instances reification functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-instances" = callPackage
@@ -237438,6 +252884,8 @@ self: {
        ];
        description = "A place to collect orphan instances for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-kinds" = callPackage
@@ -237453,6 +252901,8 @@ self: {
        ];
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-kinds-fork" = callPackage
@@ -237468,6 +252918,8 @@ self: {
        ];
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-lego" = callPackage
@@ -237488,6 +252940,8 @@ self: {
        ];
        description = "Template Haskell construction utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-lift" = callPackage
@@ -237587,6 +253041,8 @@ self: {
        libraryHaskellDepends = [ base lens pretty template-haskell ];
        description = "Simplify and render Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-printf" = callPackage
@@ -237645,6 +253101,8 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Binding group analysis in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-strict-compat" = callPackage
@@ -237671,6 +253129,8 @@ self: {
        ];
        description = "Typechecking in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-test-utils" = callPackage
@@ -237704,6 +253164,8 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Provides a way to persist data from compile-time to runtime";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-traced" = callPackage
@@ -237715,6 +253177,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Tracing Q monad computation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-typegraph" = callPackage
@@ -237742,6 +253206,8 @@ self: {
        ];
        description = "Graph of the subtype relation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-utilities" = callPackage
@@ -237784,6 +253250,8 @@ self: {
        ];
        description = "Give your dependencies stars on GitHub!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "theatre" = callPackage
@@ -237799,6 +253267,8 @@ self: {
        ];
        description = "Minimalistic actor library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "themoviedb" = callPackage
@@ -237871,6 +253341,8 @@ self: {
        ];
        description = "All-in-one session handling for servant-based frontends";
        license = "AGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "theoremquest" = callPackage
@@ -237882,6 +253354,8 @@ self: {
        libraryHaskellDepends = [ base HTTP json utf8-string ];
        description = "A common library for TheoremQuest, a theorem proving game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "theoremquest-client" = callPackage
@@ -237895,6 +253369,8 @@ self: {
        executableHaskellDepends = [ base HTTP network theoremquest ];
        description = "A simple client for the TheoremQuest theorem proving game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "these" = callPackage
@@ -237977,6 +253453,8 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "Typing Haskell In Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thimk" = callPackage
@@ -237995,6 +253473,8 @@ self: {
        ];
        description = "Command-line spelling word suggestion tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thorn" = callPackage
@@ -238013,6 +253493,8 @@ self: {
        ];
        description = "Datatype Manipulation with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thread-hierarchy" = callPackage
@@ -238102,6 +253584,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "(deprecated in favor of 'threads') Simple thread management";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "threads" = callPackage
@@ -238186,6 +253670,8 @@ self: {
        ];
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "threefish" = callPackage
@@ -238220,6 +253706,8 @@ self: {
        ];
        description = "Composable algebraic editors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "threepenny-gui" = callPackage
@@ -238260,6 +253748,8 @@ self: {
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Write simple nested context menus for threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "threepenny-gui-flexbox" = callPackage
@@ -238274,6 +253764,8 @@ self: {
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Flexbox layouts for Threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thrift" = callPackage
@@ -238296,6 +253788,8 @@ self: {
        ];
        description = "Haskell bindings for the Apache Thrift RPC system";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thrist" = callPackage
@@ -238358,6 +253852,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Loop over an action but throttle it to a certain rate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "through-text" = callPackage
@@ -238423,6 +253919,8 @@ self: {
        ];
        description = "Generate thumbnails easily and safely";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thumbnail-polish" = callPackage
@@ -238439,6 +253937,8 @@ self: {
        ];
        description = "Image thumbnail creation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thyme" = callPackage
@@ -238539,6 +254039,8 @@ self: {
        executableHaskellDepends = [ base glade gtk haskell98 ];
        description = "Useful if reading \"Why FP matters\" by John Hughes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ticker" = callPackage
@@ -238575,6 +254077,8 @@ self: {
        ];
        description = "A port of @Data.Binary@";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tictactoe3d" = callPackage
@@ -238586,6 +254090,8 @@ self: {
        libraryHaskellDepends = [ base tuples-homogenous-h98 vector ];
        description = "3D Tic-Tac-Toe game";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tidal" = callPackage
@@ -238623,6 +254129,8 @@ self: {
        ];
        description = "MIDI support for tidal";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tidal-serial" = callPackage
@@ -238636,6 +254144,8 @@ self: {
        ];
        description = "Serial support for tidal";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tidal-vis" = callPackage
@@ -238656,6 +254166,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Visual rendering for Tidal patterns and osc messages";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tie-knot" = callPackage
@@ -238667,6 +254179,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl recursion-schemes ];
        description = "\"Ties the knot\" on a given set of structures that reference each other by keys";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tiempo" = callPackage
@@ -238678,6 +254192,8 @@ self: {
        libraryHaskellDepends = [ base deepseq time ];
        description = "Specify time intervals in different units (secs, mins, hours, etc.)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tiger" = callPackage
@@ -238694,6 +254210,8 @@ self: {
        ];
        description = "Tiger Compiler of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tight-apply" = callPackage
@@ -238721,6 +254239,8 @@ self: {
        ];
        description = "Nice API for a Slackbot";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tighttp" = callPackage
@@ -238739,6 +254259,8 @@ self: {
        ];
        description = "Tiny and Incrementally-Growing HTTP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tile" = callPackage
@@ -238781,6 +254303,8 @@ self: {
        executableToolDepends = [ happy ];
        description = "The Timber Compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time_1_11" = callPackage
@@ -238843,6 +254367,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Data instances for the time package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-exts" = callPackage
@@ -238864,6 +254390,8 @@ self: {
        ];
        description = "Yet another time library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-http" = callPackage
@@ -238887,6 +254415,8 @@ self: {
        ];
        description = "Parse and format HTTP/1.1 Date and Time strings";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-interval" = callPackage
@@ -238909,6 +254439,8 @@ self: {
        libraryHaskellDepends = [ base base-io-access time ];
        description = "IO Access for time";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-lens" = callPackage
@@ -238954,6 +254486,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit mtl time tz ];
        description = "A library to mock the current time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-manager" = callPackage
@@ -239028,6 +254562,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Quasi-quoter for UTCTime times";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-quote" = callPackage
@@ -239044,6 +254580,8 @@ self: {
        ];
        description = "Quasi-quoters for dates and times";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-recurrence" = callPackage
@@ -239061,6 +254599,8 @@ self: {
        ];
        description = "Generate recurring dates";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-series" = callPackage
@@ -239075,6 +254615,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Time series analysis";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-series-lib" = callPackage
@@ -239088,6 +254630,8 @@ self: {
        doHaddock = false;
        description = "Library for Time Series processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-units" = callPackage
@@ -239112,6 +254656,8 @@ self: {
        libraryHaskellDepends = [ base convertible parsec time ];
        description = "Parse, format and convert W3C Date and Time";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-warp" = callPackage
@@ -239149,6 +254695,8 @@ self: {
        ];
        description = "Distributed systems execution emulation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timecalc" = callPackage
@@ -239161,6 +254709,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskeline uu-parsinglib ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timeconsole" = callPackage
@@ -239283,6 +254833,8 @@ self: {
          time unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timeout" = callPackage
@@ -239299,6 +254851,8 @@ self: {
        ];
        description = "Generalized sleep and timeout functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timeout-control" = callPackage
@@ -239325,6 +254879,8 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel ];
        description = "Runs a time-limited computation alowing it to return intermediate results";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timeparsers" = callPackage
@@ -239340,6 +254896,8 @@ self: {
        ];
        description = "Attoparsec parsers for various Date/Time formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timeplot" = callPackage
@@ -239371,6 +254929,8 @@ self: {
        libraryHaskellDepends = [ base datetime ];
        description = "Prints timestamps after each line evaluated";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timer-wheel" = callPackage
@@ -239458,6 +255018,8 @@ self: {
        ];
        description = "Library for Time Series processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timespan" = callPackage
@@ -239529,6 +255091,8 @@ self: {
        testHaskellDepends = [ base hspec microlens time ];
        description = "Time utilities";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timezone-detect" = callPackage
@@ -239548,6 +255112,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings for the zone-detect C library; plus tz-aware utils";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timezone-olson" = callPackage
@@ -239578,6 +255144,8 @@ self: {
        ];
        description = "Load TimeZoneSeries from an Olson file at compile time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timezone-series" = callPackage
@@ -239609,6 +255177,8 @@ self: {
          timezone-series
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timing-convenience" = callPackage
@@ -239632,6 +255202,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Tiny INI file and configuration library with a minimal dependency footprint";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tintin" = callPackage
@@ -239657,6 +255229,8 @@ self: {
        testHaskellDepends = [ base require ];
        description = "A softer alternative to Haddock";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tiny-scheduler" = callPackage
@@ -239668,6 +255242,8 @@ self: {
        libraryHaskellDepends = [ async base time ];
        description = "tiny no-brainer job scheduler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tinyMesh" = callPackage
@@ -239683,6 +255259,8 @@ self: {
        ];
        description = "TinyMesh - communicating with auto-meshing sensor network";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tinyXml" = callPackage
@@ -239707,6 +255285,8 @@ self: {
        ];
        description = "A fast DOM parser for a subset of XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tinyfiledialogs" = callPackage
@@ -239748,6 +255328,8 @@ self: {
        testHaskellDepends = [ base QuickCheck text ];
        description = "A tiny text templating library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tip-haskell-frontend" = callPackage
@@ -239772,6 +255354,8 @@ self: {
        ];
        description = "Convert from Haskell to Tip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tip-lib" = callPackage
@@ -239795,6 +255379,8 @@ self: {
        ];
        description = "tons of inductive problems - support library and tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tiphys" = callPackage
@@ -239839,6 +255425,8 @@ self: {
        ];
        description = "Testing Infrastructure for Temporal AbstractioNs - GUI to debug temporal programs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "titan-debug-yampa" = callPackage
@@ -239856,6 +255444,8 @@ self: {
        ];
        description = "Testing Infrastructure for Temporal AbstractioNs - Interactive Yampa debugging layer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "titan-record-yampa" = callPackage
@@ -239867,6 +255457,8 @@ self: {
        libraryHaskellDepends = [ base Yampa ];
        description = "Testing Infrastructure for Temporal AbstractioNs - Yampa record-and-replay layer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "titlecase" = callPackage
@@ -239901,6 +255493,8 @@ self: {
        testHaskellDepends = [ HUnit test-framework test-framework-hunit ];
        description = "Simple Presentation Utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tkyprof" = callPackage
@@ -239927,6 +255521,8 @@ self: {
        ];
        description = "A web-based visualizer for GHC Profiling Reports";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tld" = callPackage
@@ -240025,6 +255621,8 @@ self: {
        ];
        description = "TLS extra default values and helpers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tls-session-manager" = callPackage
@@ -240132,6 +255730,8 @@ self: {
        ];
        description = "Start and stop a temporary postgres";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tmpl" = callPackage
@@ -240169,6 +255769,8 @@ self: {
        ];
        description = "A simple daily journal program";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tnet" = callPackage
@@ -240214,6 +255816,8 @@ self: {
        ];
        description = "A type class and some utilities for generating Haskell code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "to-string-class" = callPackage
@@ -240227,6 +255831,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Converting string-like types to Strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "to-string-instances" = callPackage
@@ -240238,6 +255844,8 @@ self: {
        libraryHaskellDepends = [ bytestring pretty text to-string-class ];
        description = "Instances for the ToString class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toboggan" = callPackage
@@ -240256,6 +255864,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Twitter bot generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "todo" = callPackage
@@ -240267,6 +255877,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A todo bottom";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "todos" = callPackage
@@ -240292,6 +255904,8 @@ self: {
        ];
        description = "Easy-to-use TODOs manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tofromxml" = callPackage
@@ -240310,6 +255924,8 @@ self: {
        ];
        description = "Reading and writing Haskell data from and to XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toilet" = callPackage
@@ -240327,6 +255943,8 @@ self: {
        ];
        description = "Manage the toilet queue at the IMO";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "token-bucket" = callPackage
@@ -240362,6 +255980,8 @@ self: {
        ];
        description = "Fast rate limiting using the token bucket algorithm (BSD)";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "token-search" = callPackage
@@ -240387,6 +256007,8 @@ self: {
          text unordered-containers
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tokenify" = callPackage
@@ -240398,6 +256020,8 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        description = "A regex lexer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tokenize" = callPackage
@@ -240441,6 +256065,8 @@ self: {
        ];
        description = "A variant of tokenizer-monad that supports streaming";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tokstyle" = callPackage
@@ -240465,6 +256091,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "TokTok C code style checker";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toktok" = callPackage
@@ -240479,6 +256107,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 ];
        executableHaskellDepends = [ base bytestring gf iconv ];
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tokyocabinet-haskell" = callPackage
@@ -240495,6 +256125,8 @@ self: {
        testSystemDepends = [ tokyocabinet ];
        description = "Haskell binding of Tokyo Cabinet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) tokyocabinet;};
 
   "tokyotyrant-haskell" = callPackage
@@ -240509,6 +256141,8 @@ self: {
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
   "tomato-rubato-openal" = callPackage
@@ -240520,6 +256154,8 @@ self: {
        libraryHaskellDepends = [ base OpenAL stm vector ];
        description = "Easy to use library for audio programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toml" = callPackage
@@ -240536,6 +256172,8 @@ self: {
          attoparsec base bytestring containers old-locale time
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toml-parser" = callPackage
@@ -240658,6 +256296,8 @@ self: {
        ];
        description = "tonatona plugin for google-server-api";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tonatona-logger" = callPackage
@@ -240733,6 +256373,8 @@ self: {
        ];
        description = "tonatona plugin for servant";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "too-many-cells" = callPackage
@@ -240777,6 +256419,8 @@ self: {
        ];
        description = "Cluster single cells and analyze cell clade relationships";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toodles" = callPackage
@@ -240812,6 +256456,8 @@ self: {
        ];
        description = "Manage the TODO entries in your code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toolshed" = callPackage
@@ -240853,6 +256499,8 @@ self: {
        ];
        description = "Top (typed oriented protocol) API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "topkata" = callPackage
@@ -240871,6 +256519,8 @@ self: {
        ];
        description = "OpenGL Arcade Game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "topograph" = callPackage
@@ -240897,6 +256547,8 @@ self: {
        libraryHaskellDepends = [ base mtl parallel QuickCheck ];
        description = "Simple unit test library (or framework)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "torrent" = callPackage
@@ -240967,6 +256619,8 @@ self: {
        libraryHaskellDepends = [ base containers semiring-num ];
        description = "Finitely represented total maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "total-maps" = callPackage
@@ -240997,6 +256651,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "Library (and cli) to execute a procedure on file change";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tower" = callPackage
@@ -241043,6 +256699,8 @@ self: {
        ];
        description = "A Tox protocol implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toxcore-c" = callPackage
@@ -241068,6 +256726,8 @@ self: {
        ];
        description = "Haskell bindings to the C reference implementation of Tox";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {toxcore = null;};
 
   "toxiproxy-haskell" = callPackage
@@ -241087,6 +256747,8 @@ self: {
        ];
        description = "Client library for Toxiproxy: a TCP failure testing proxy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toysolver" = callPackage
@@ -241143,6 +256805,8 @@ self: {
        ];
        description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tpar" = callPackage
@@ -241179,6 +256843,8 @@ self: {
        ];
        description = "simple, parallel job scheduling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tpb" = callPackage
@@ -241204,6 +256870,8 @@ self: {
        ];
        description = "Applications for interacting with the Pushbullet API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tpdb" = callPackage
@@ -241245,6 +256913,8 @@ self: {
        ];
        description = "Parser and pretty printer for the TPTP language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trace" = callPackage
@@ -241261,6 +256931,8 @@ self: {
        ];
        description = "A monad transformer for tracing provenience of errors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trace-call" = callPackage
@@ -241272,6 +256944,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "functions for logging the arguments and results of function calls";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trace-function-call" = callPackage
@@ -241283,6 +256957,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Easy lightweight tracing of function arguments and results for ad hoc debugging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "traced" = callPackage
@@ -241294,6 +256970,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl pretty ];
        description = "Simple evaluation trace";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tracer" = callPackage
@@ -241323,6 +257001,8 @@ self: {
        ];
        description = "Visualize Haskell data structures as edge-labeled trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tracing" = callPackage
@@ -241402,6 +257082,8 @@ self: {
        testHaskellDepends = [ base directory hspec process ];
        description = "Package to list all tracked and untracked existing files via Git";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tracker" = callPackage
@@ -241413,6 +257095,8 @@ self: {
        libraryHaskellDepends = [ base containers glib ];
        description = "Client library for Tracker metadata database, indexer and search tool";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trackit" = callPackage
@@ -241431,6 +257115,8 @@ self: {
        ];
        description = "A command-line tool for live monitoring";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "traction" = callPackage
@@ -241452,6 +257138,8 @@ self: {
        ];
        description = "Tools for postgresql-simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tracy" = callPackage
@@ -241463,6 +257151,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Convenience wrappers for non-intrusive debug tracing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trade-journal" = callPackage
@@ -241518,6 +257208,8 @@ self: {
        ];
        description = "TrailDB bindings for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {Judy = null; traildb = null;};
 
   "trajectory" = callPackage
@@ -241540,6 +257232,8 @@ self: {
        ];
        description = "Tools and a library for working with Trajectory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trans-fx-core" = callPackage
@@ -241603,6 +257297,8 @@ self: {
        libraryHaskellDepends = [ base ListZipper MonadPrompt stm ];
        description = "Transactional events, based on Concurrent ML semantics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transf" = callPackage
@@ -241621,6 +257317,8 @@ self: {
        ];
        description = "Text transformer and interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transfer-db" = callPackage
@@ -241649,6 +257347,8 @@ self: {
        ];
        description = "ODBC database transfer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformations" = callPackage
@@ -241669,6 +257369,8 @@ self: {
        ];
        description = "Generic representation of tree transformations";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformers_0_5_6_2" = callPackage
@@ -241747,6 +257449,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Arrow-like / category-like composition for transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformers-continue" = callPackage
@@ -241776,6 +257480,8 @@ self: {
        ];
        description = "Sensible conversions between some of the monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformers-eff" = callPackage
@@ -241857,6 +257563,8 @@ self: {
        ];
        description = "Ad-hoc type classes for lifting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformers-runnable" = callPackage
@@ -241868,6 +257576,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A unified interface for the run operation of monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformers-supply" = callPackage
@@ -241934,6 +257644,8 @@ self: {
        ];
        description = "fully composable remote execution for the creation of distributed systems";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transient-universe-tls" = callPackage
@@ -241950,6 +257662,8 @@ self: {
        ];
        description = "transient with secure communications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "translatable-intset" = callPackage
@@ -241963,6 +257677,8 @@ self: {
        libraryHaskellDepends = [ base fingertree ];
        description = "Integer sets with a constant time translate operation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "translate" = callPackage
@@ -241975,6 +257691,8 @@ self: {
        libraryHaskellDepends = [ base curl json network utf8-string ];
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "translate-cli" = callPackage
@@ -241992,6 +257710,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Translation cli tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trasa" = callPackage
@@ -242010,6 +257730,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Type Safe Web Routing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trasa-client" = callPackage
@@ -242026,6 +257748,8 @@ self: {
        ];
        description = "Type safe http requests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trasa-extra" = callPackage
@@ -242043,6 +257767,8 @@ self: {
        ];
        description = "Extra functions for trasa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trasa-form" = callPackage
@@ -242061,6 +257787,8 @@ self: {
        ];
        description = "generate forms using lucid, ditto and trasa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trasa-reflex" = callPackage
@@ -242094,6 +257822,8 @@ self: {
        ];
        description = "Type safe web server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trasa-th" = callPackage
@@ -242110,6 +257840,8 @@ self: {
        testHaskellDepends = [ base trasa ];
        description = "Template Haskell to generate trasa routes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "traversal-template" = callPackage
@@ -242125,6 +257857,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge template-haskell util ];
        description = "See README for more info";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "traverse-with-class" = callPackage
@@ -242156,6 +257890,8 @@ self: {
        ];
        description = "A simple client implementation using Travis CI API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "travis-meta-yaml" = callPackage
@@ -242185,6 +257921,8 @@ self: {
        ];
        description = ".travis.yml preprocessor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "travis-pogodi" = callPackage
@@ -242217,6 +257955,8 @@ self: {
        ];
        description = "A tool for finding haddocks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "traypoweroff" = callPackage
@@ -242231,6 +257971,8 @@ self: {
        executableHaskellDepends = [ base gtk process ];
        description = "Tray Icon application to PowerOff / Reboot computer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "treap" = callPackage
@@ -242245,6 +257987,8 @@ self: {
        testHaskellDepends = [ base doctest Glob hspec hspec-core ];
        description = "Efficient implementation of the implicit treap data structure";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-diff" = callPackage
@@ -242305,6 +258049,8 @@ self: {
        libraryHaskellDepends = [ base boxes containers mtl ];
        description = "Configurable text rendering of trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-sitter" = callPackage
@@ -242467,6 +258213,8 @@ self: {
        testHaskellDepends = [ base containers doctest mtl ];
        description = "Functions and newtype wrappers for traversing Trees";
        license = stdenv.lib.licenses.cc0;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-view" = callPackage
@@ -242515,6 +258263,8 @@ self: {
        ];
        description = "A tree of Data.Map.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "treemap-html" = callPackage
@@ -242530,6 +258280,8 @@ self: {
        ];
        description = "Generates HTML for Data.Tree as TreeMap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "treemap-html-tools" = callPackage
@@ -242549,6 +258301,8 @@ self: {
        doHaddock = false;
        description = "Treemap related commands for producing foldable TreeMap HTML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "treersec" = callPackage
@@ -242629,6 +258383,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL Database Migrator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trek-db" = callPackage
@@ -242652,6 +258408,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL Database Migrator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trek-lens" = callPackage
@@ -242678,6 +258436,8 @@ self: {
        ];
        description = "Library for polling Tremulous servers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trhsx" = callPackage
@@ -242688,6 +258448,8 @@ self: {
        sha256 = "11jx2jf6vi7368ys39mz0ziy6xknbi0z87926n2y16am6k2h25k3";
        description = "Deprecated";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trial" = callPackage
@@ -242741,6 +258503,8 @@ self: {
        ];
        description = "triangulation of polygons";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trie-simple" = callPackage
@@ -242789,6 +258553,8 @@ self: {
        ];
        description = "Various trie implementations in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trifecta" = callPackage
@@ -242837,6 +258603,8 @@ self: {
        testHaskellDepends = [ base hspec protolude ];
        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;
+       broken = true;
      }) {};
 
   "trim" = callPackage
@@ -242852,6 +258620,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A command-line tool for trimming whitespace";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trimpolya" = callPackage
@@ -242865,6 +258635,8 @@ self: {
        executableHaskellDepends = [ base bio bytestring simpleargs ];
        description = "Search for, annotate and trim poly-A tail";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tripLL" = callPackage
@@ -242880,6 +258652,8 @@ self: {
        ];
        description = "A very simple triple store";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "triplesec" = callPackage
@@ -242910,6 +258684,8 @@ self: {
        libraryHaskellDepends = [ base comonad distributive ];
        description = "The trivial monad and comonad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trivial-constraint" = callPackage
@@ -242921,6 +258697,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Constraints that any type, resp. no type fulfills";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tropical" = callPackage
@@ -242932,6 +258710,8 @@ self: {
        libraryHaskellDepends = [ base semiring-simple ];
        description = "A library for tropical mathematics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tropical-geometry" = callPackage
@@ -242956,6 +258736,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A Tropical Geometry package for Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "true-name" = callPackage
@@ -242970,6 +258752,8 @@ self: {
        testHaskellDepends = [ base containers template-haskell time ];
        description = "Template Haskell hack to violate module abstractions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "truelevel" = callPackage
@@ -242983,6 +258767,8 @@ self: {
        executableHaskellDepends = [ base containers parseargs WAVE ];
        description = "Audio file compressor-limiter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trurl" = callPackage
@@ -243005,6 +258791,8 @@ self: {
        testHaskellDepends = [ base hastache tasty tasty-hunit ];
        description = "Haskell template code generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "truthful" = callPackage
@@ -243029,6 +258817,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl time transformers ];
        description = "A Transaction Framework for Web Applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tsession-happstack" = callPackage
@@ -243042,6 +258832,8 @@ self: {
        ];
        description = "A Transaction Framework for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tsetchan" = callPackage
@@ -243132,6 +258924,8 @@ self: {
        executableHaskellDepends = [ base gloss stm vector ];
        description = "Real time TSP tour visualization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tsparse" = callPackage
@@ -243149,6 +258943,8 @@ self: {
        ];
        description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tst" = callPackage
@@ -243180,6 +258976,8 @@ self: {
        ];
        description = "Interacts with tesseract to ease reading of RAW Japanese manga";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tsv2csv" = callPackage
@@ -243212,6 +259010,8 @@ self: {
        ];
        description = "Template tsv into SQL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tsweb" = callPackage
@@ -243240,6 +259040,8 @@ self: {
        ];
        description = "An API binding Web.Spock to Database.Beam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ttask" = callPackage
@@ -243262,6 +259064,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "This is task management tool for yourself, that inspired by scrum";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ttc" = callPackage
@@ -243391,6 +259195,8 @@ self: {
        ];
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tubes" = callPackage
@@ -243407,6 +259213,8 @@ self: {
        ];
        description = "Write stream processing computations with side effects in a series of tubes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuntap" = callPackage
@@ -243418,6 +259226,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Interface to TUN/TAP drivers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuntap-simple" = callPackage
@@ -243431,6 +259241,8 @@ self: {
        libraryHaskellDepends = [ base ioctl ];
        description = "A simple tun/tap library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tup-functor" = callPackage
@@ -243445,6 +259257,8 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts parsec2 ];
        description = "Homogeneous tuples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuple" = callPackage
@@ -243467,6 +259281,8 @@ self: {
        libraryHaskellDepends = [ base combinat ];
        description = "Enum instances for tuples where the digits increase with the same speed";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuple-generic" = callPackage
@@ -243501,6 +259317,8 @@ self: {
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Stock FieldN combos and generators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuple-morph" = callPackage
@@ -243514,6 +259332,8 @@ self: {
        libraryHaskellDepends = [ base HList template-haskell ];
        description = "Morph between tuples, or convert them from and to HLists";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuple-ops" = callPackage
@@ -243525,6 +259345,8 @@ self: {
        libraryHaskellDepends = [ base type-combinators ];
        description = "various operations on n-ary tuples via GHC.Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuple-sop" = callPackage
@@ -243559,6 +259381,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Functor, Applicative and Monad for n-ary tuples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuples" = callPackage
@@ -243609,6 +259433,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple simulator for Turing machines";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "turing-music" = callPackage
@@ -243622,6 +259448,8 @@ self: {
        executableHaskellDepends = [ ALUT base ];
        description = "Plays music generated by Turing machines with 5 states and 2 symbols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "turingMachine" = callPackage
@@ -243638,6 +259466,8 @@ self: {
        ];
        description = "An implementation of Turing Machine and Automaton";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "turkish-deasciifier" = callPackage
@@ -243740,6 +259570,8 @@ self: {
        testHaskellDepends = [ base HUnit parsec ];
        description = "Collection of command line options and parsers for these options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tw" = callPackage
@@ -243764,6 +259596,8 @@ self: {
        libraryHaskellDepends = [ base containers lens stm transformers ];
        description = "A library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twee" = callPackage
@@ -243780,6 +259614,8 @@ self: {
        ];
        description = "An equational theorem prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twee-lib" = callPackage
@@ -243824,6 +259660,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
        description = "Command-line tool for twitter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentefp" = callPackage
@@ -243852,6 +259690,8 @@ self: {
        ];
        description = "Used as Lab Assignments Environment at the University of Twente";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentefp-eventloop-trees" = callPackage
@@ -243863,6 +259703,8 @@ self: {
        libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentefp-graphs" = callPackage
@@ -243874,6 +259716,8 @@ self: {
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentefp-number" = callPackage
@@ -243899,6 +259743,8 @@ self: {
        ];
        description = "RoseTree type and show functions for lab assignment of University of Twente";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentefp-trees" = callPackage
@@ -243910,6 +259756,8 @@ self: {
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentefp-websockets" = callPackage
@@ -243928,6 +259776,8 @@ self: {
        ];
        description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentyseven" = callPackage
@@ -243957,6 +259807,8 @@ self: {
        ];
        description = "Rubik's cube solver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twfy-api-client" = callPackage
@@ -243982,6 +259834,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "They Work For You API Client Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twhs" = callPackage
@@ -244012,6 +259866,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "CLI twitter client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twidge" = callPackage
@@ -244032,6 +259888,8 @@ self: {
        ];
        description = "Unix Command-Line Twitter and Identica Client";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twilight-stm" = callPackage
@@ -244043,6 +259901,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "STM library with safe irrevocable I/O and inconsistency repair";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twilio" = callPackage
@@ -244069,6 +259929,8 @@ self: {
        doCheck = false;
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twill" = callPackage
@@ -244087,6 +259949,8 @@ self: {
        ];
        description = "Twilio API interaction";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twiml" = callPackage
@@ -244119,6 +259983,8 @@ self: {
        ];
        description = "very simple template language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twirp" = callPackage
@@ -244140,6 +260006,8 @@ self: {
        ];
        description = "Haskell twirp foundations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twisty" = callPackage
@@ -244193,6 +260061,8 @@ self: {
        ];
        description = "A Haskell-based CLI Twitter client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twitter-conduit" = callPackage
@@ -244223,6 +260093,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -244241,6 +260113,8 @@ self: {
        ];
        description = "Twitter API package with enumerator interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twitter-feed" = callPackage
@@ -244262,6 +260136,8 @@ self: {
        ];
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twitter-types" = callPackage
@@ -244313,6 +260189,8 @@ self: {
        ];
        description = "Persistent transactions on top of STM";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "txt" = callPackage
@@ -244331,6 +260209,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "txt-sushi" = callPackage
@@ -244372,6 +260252,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Deprecated in favor of eros";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ty" = callPackage
@@ -244396,6 +260278,8 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Provide proof witnesses for closed type family evaluation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typalyze" = callPackage
@@ -244414,6 +260298,8 @@ self: {
        ];
        description = "Analyzes Haskell source files for easy reference";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-aligned" = callPackage
@@ -244438,6 +260324,8 @@ self: {
        testHaskellDepends = [ base hspec test-fixture ];
        description = "Runtime type assertions for testing";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-booleans" = callPackage
@@ -244464,6 +260352,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "type-cereal" = callPackage
@@ -244480,6 +260370,8 @@ self: {
        ];
        description = "Type-level serialization of type constructors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-combinators" = callPackage
@@ -244493,6 +260385,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of data types for type-level programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-combinators-quote" = callPackage
@@ -244508,6 +260402,8 @@ self: {
        ];
        description = "Quasiquoters for the 'type-combinators' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-combinators-singletons" = callPackage
@@ -244519,6 +260415,8 @@ self: {
        libraryHaskellDepends = [ base singletons type-combinators ];
        description = "Interop between /type-combinators/ and /singletons/";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-digits" = callPackage
@@ -244530,6 +260428,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell type-spine ];
        description = "Arbitrary-base type-level digits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-eq" = callPackage
@@ -244544,6 +260444,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Type equality evidence you can carry around";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-equality" = callPackage
@@ -244615,6 +260517,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Collection of widely reimplemented type families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-functions" = callPackage
@@ -244659,6 +260563,8 @@ self: {
        ];
        description = "Queues with verified and unverified versions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-int" = callPackage
@@ -244670,6 +260576,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Type Level 2s- and 16s- Complement Integers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-interpreter" = callPackage
@@ -244682,6 +260590,8 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-iso" = callPackage
@@ -244720,6 +260630,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "type-level binary search trees in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-level-integers" = callPackage
@@ -244768,6 +260680,8 @@ self: {
        ];
        description = "High-level combinators for performing inductive operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-level-natural-number-operations" = callPackage
@@ -244779,6 +260693,8 @@ self: {
        libraryHaskellDepends = [ base type-level-natural-number ];
        description = "Basic operations on type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-level-numbers" = callPackage
@@ -244826,6 +260742,8 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-map" = callPackage
@@ -244893,6 +260811,8 @@ self: {
        testHaskellDepends = [ base type-of-html ];
        description = "Optimize static parts of type-of-html";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-operators" = callPackage
@@ -244917,6 +260837,8 @@ self: {
        ];
        description = "Type-level comparison operator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-ord-spine-cereal" = callPackage
@@ -244932,6 +260854,8 @@ self: {
        ];
        description = "Generic type-level comparison of types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-prelude" = callPackage
@@ -244943,6 +260867,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-sets" = callPackage
@@ -244955,6 +260881,8 @@ self: {
        testHaskellDepends = [ base cmptype ];
        description = "Type-level sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-settheory" = callPackage
@@ -244970,6 +260898,8 @@ self: {
        ];
        description = "Sets and functions-as-relations in the type system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-spec" = callPackage
@@ -244993,6 +260923,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "A spine-view on types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-structure" = callPackage
@@ -245019,6 +260951,8 @@ self: {
        ];
        description = "Type structure analysis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-sub-th" = callPackage
@@ -245043,6 +260977,8 @@ self: {
        ];
        description = "Substitute types for other types with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-tree" = callPackage
@@ -245060,6 +260996,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tree representations of datatypes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-unary" = callPackage
@@ -245091,6 +261029,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Automatic deriving of TypeableN instances with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typed-admin" = callPackage
@@ -245170,6 +261110,8 @@ self: {
        ];
        description = "Type safe string transformations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typed-encoding-encoding" = callPackage
@@ -245189,6 +261131,8 @@ self: {
        ];
        description = "Bridge between encoding and typed-encoding packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typed-process" = callPackage
@@ -245227,6 +261171,8 @@ self: {
        executableHaskellDepends = [ base diagrams-lib text ];
        description = "Typed and composable spreadsheets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typed-streams" = callPackage
@@ -245248,6 +261194,8 @@ self: {
        ];
        description = "A stream based replacement for lists";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typed-uuid" = callPackage
@@ -245306,6 +261254,8 @@ self: {
        ];
        description = "Language-independent type-safe communication";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typed-wire-utils" = callPackage
@@ -245335,6 +261285,8 @@ self: {
        ];
        description = "Typed frontend to TensorFlow and higher-order deep learning";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typedquery" = callPackage
@@ -245351,6 +261303,8 @@ self: {
        ];
        description = "Parser for SQL augmented with types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typehash" = callPackage
@@ -245362,6 +261316,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mtl pureMD5 syb ];
        description = "Create a unique hash value for a type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typelevel" = callPackage
@@ -245378,6 +261334,8 @@ self: {
        ];
        description = "Useful type level operations (type families and related operators)";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typelevel-rewrite-rules" = callPackage
@@ -245396,6 +261354,8 @@ self: {
        testHaskellDepends = [ base ghc-prim vinyl ];
        description = "Solve type equalities using custom type-level rewrite rules";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typelevel-tensor" = callPackage
@@ -245413,6 +261373,8 @@ self: {
        ];
        description = "Tensors whose ranks and dimensions type-inferred and type-checked";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typelits-printf" = callPackage
@@ -245447,6 +261409,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Type level numbers using existing Nat functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typeof" = callPackage
@@ -245476,6 +261440,8 @@ self: {
        ];
        description = "Lens-like interface for type level parameters; allows unboxed unboxed vectors and supercompilation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typerep-map" = callPackage
@@ -245513,6 +261479,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typesafe-endian" = callPackage
@@ -245543,6 +261511,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typescript-docs" = callPackage
@@ -245562,6 +261532,8 @@ self: {
        ];
        description = "A documentation generator for TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typical" = callPackage
@@ -245599,6 +261571,8 @@ self: {
        ];
        description = "Just let me draw nice text already";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typography-geometry" = callPackage
@@ -245634,6 +261608,8 @@ self: {
        ];
        description = "Type derived JSON parsing using Aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tz" = callPackage
@@ -245700,6 +261676,8 @@ self: {
        testHaskellDepends = [ base bytestring either-unwrap hspec text ];
        description = "Haskell Universal Two Factor helper toolbox library thing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uAgda" = callPackage
@@ -245777,6 +261755,8 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "Uber client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uberlast" = callPackage
@@ -245788,6 +261768,8 @@ self: {
        libraryHaskellDepends = [ base lens tagged template-haskell ];
        description = "Generate overloaded lenses from plain data declaration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ucam-webauth" = callPackage
@@ -245817,6 +261799,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "The Ucam-Webauth protocol, used by Raven";
        license = "(BSD-3-Clause OR Apache-2.0)";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ucam-webauth-types" = callPackage
@@ -245838,6 +261822,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Types for the Ucam-Webauth protocol, as used by Raven";
        license = "(BSD-3-Clause OR Apache-2.0)";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ucd" = callPackage
@@ -245856,6 +261842,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge ];
        description = "Unicode Character Database — Predicates on characters specified by Unicode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uconv" = callPackage
@@ -245868,6 +261856,8 @@ self: {
        librarySystemDepends = [ icu ];
        description = "String encoding conversion with ICU";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) icu;};
 
   "udbus" = callPackage
@@ -245943,6 +261933,8 @@ self: {
        ];
        description = "Simple fire-and-forget conduit UDP wrappers";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "udp-streaming" = callPackage
@@ -245956,6 +261948,8 @@ self: {
        ];
        description = "Streaming to and from UDP socket";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uglymemo" = callPackage
@@ -245994,6 +261988,8 @@ self: {
        ];
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uhc-util" = callPackage
@@ -246013,6 +262009,8 @@ self: {
        ];
        description = "UHC utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uhexdump" = callPackage
@@ -246026,6 +262024,8 @@ self: {
        executableHaskellDepends = [ base bytestring split ];
        description = "hex dumper for UTF-8 text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uhttpc" = callPackage
@@ -246063,6 +262063,8 @@ self: {
        libraryHaskellDepends = [ base data-default mtl old-locale time ];
        description = "A framework for friendly commandline programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uid" = callPackage
@@ -246147,6 +262149,8 @@ self: {
        ];
        description = "A fast, cache-efficient, concurrent bloom filter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unagi-chan" = callPackage
@@ -246201,6 +262205,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functional concurrency with unamb using a custom scheduler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unbeliever" = callPackage
@@ -246243,6 +262249,8 @@ self: {
        ];
        description = "Generic support for programming with names and binders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unbound-generics" = callPackage
@@ -246302,6 +262310,8 @@ self: {
        libraryHaskellDepends = [ base unbounded-delays units units-defs ];
        description = "Thread delays and timeouts using proper time units";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unboxed" = callPackage
@@ -246326,6 +262336,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Self-optimizing unboxed sets using view patterns and data families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unboxed-ref" = callPackage
@@ -246352,6 +262364,8 @@ self: {
        executableHaskellDepends = [ base vector ];
        description = "A library for reference cells backed by unboxed-vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unboxing-vector" = callPackage
@@ -246394,6 +262408,8 @@ self: {
        executableHaskellDepends = [ base bytestring cmdargs ];
        description = "Secure and resilient remote file storage utility";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uncaught-exception" = callPackage
@@ -246449,6 +262465,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Tiny package providing unescaping versions of show and print";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unexceptionalio" = callPackage
@@ -246490,6 +262508,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unfixing and recursion schemes for data types with binders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unfoldable" = callPackage
@@ -246545,6 +262565,8 @@ self: {
        libraryHaskellDepends = [ base containers uni-util ];
        description = "Event handling for the uniform workbench";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uni-graphs" = callPackage
@@ -246560,6 +262582,8 @@ self: {
        ];
        description = "Graphs";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uni-htk" = callPackage
@@ -246576,6 +262600,8 @@ self: {
        ];
        description = "Graphical User Interface for Haskell Programs";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uni-posixutil" = callPackage
@@ -246591,6 +262617,8 @@ self: {
        ];
        description = "Posix utilities for the uniform workbench";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uni-reactor" = callPackage
@@ -246605,6 +262633,8 @@ self: {
        ];
        description = "Reactors for the uniform workbench";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uni-uDrawGraph" = callPackage
@@ -246621,6 +262651,8 @@ self: {
        ];
        description = "Graphs binding";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uni-util" = callPackage
@@ -246637,6 +262669,8 @@ self: {
        ];
        description = "Utilities for the uniform workbench";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unicode" = callPackage
@@ -246676,6 +262710,8 @@ self: {
        librarySystemDepends = [ icu ];
        description = "Unicode normalization using the ICU library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) icu;};
 
   "unicode-prelude" = callPackage
@@ -246687,6 +262723,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unicode notation for some definitions in Prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unicode-properties" = callPackage
@@ -246710,6 +262748,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "print and show in unicode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unicode-symbols" = callPackage
@@ -246721,6 +262761,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unicode-transforms" = callPackage
@@ -246822,6 +262864,8 @@ self: {
        testHaskellDepends = [ attoparsec base bytestring Cabal ];
        description = "Uniform IO over files, network, anything";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "uniform-pair" = callPackage
@@ -246856,6 +262900,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "union-find" = callPackage
@@ -246891,6 +262937,8 @@ self: {
        libraryHaskellDepends = [ base containers extensible ];
        description = "Heterogeneous map by open unions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unipatterns" = callPackage
@@ -247010,6 +263058,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Splittable Unique Identifier Supply";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uniquely-represented-sets" = callPackage
@@ -247026,6 +263076,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uniqueness-periods" = callPackage
@@ -247217,6 +263269,8 @@ self: {
        ];
        description = "Attoparsec parsers for the units package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "units-defs" = callPackage
@@ -247257,6 +263311,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "An extendable library for type-safe computations including units";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unity-testresult-parser" = callPackage
@@ -247305,6 +263361,8 @@ self: {
        ];
        description = "Implementaation of unitym for Servant servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unitym-yesod" = callPackage
@@ -247316,6 +263374,8 @@ self: {
        libraryHaskellDepends = [ base unitym yesod ];
        description = "Implementation of the unity monad for the Yesod framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "universal" = callPackage
@@ -247347,6 +263407,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for OS X Universal Binary format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "universe" = callPackage
@@ -247490,6 +263552,8 @@ self: {
        ];
        description = "Construct a Dec's ancestor list";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "universum" = callPackage
@@ -247566,6 +263630,8 @@ self: {
        libraryHaskellDepends = [ base foreign-var ];
        description = "Comprehensive bindings to fcntl(2)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unix-handle" = callPackage
@@ -247577,6 +263643,8 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "POSIX operations on Handles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unix-io-extra" = callPackage
@@ -247626,6 +263694,8 @@ self: {
        ];
        description = "Run processes on Unix systems, with a conduit interface (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unix-pty-light" = callPackage
@@ -247704,6 +263774,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim semigroups ];
        description = "GHC Haskell lists of non-thunks (things of kind TYPE 'UnliftedRep)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unliftio" = callPackage
@@ -247782,6 +263854,8 @@ self: {
        ];
        description = "Generalization of io-streams to MonadUnliftIO";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unlit" = callPackage
@@ -247811,6 +263885,8 @@ self: {
        ];
        description = "A Library for the manipulation of images";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unmed2" = callPackage
@@ -247864,6 +263940,8 @@ self: {
        ];
        description = "Rematch support for unordered containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unordered-graphs" = callPackage
@@ -247879,6 +263957,8 @@ self: {
        ];
        description = "Graph library using unordered-containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unordered-intmap" = callPackage
@@ -247895,6 +263975,8 @@ self: {
        ];
        description = "A specialization of `HashMap Int v`";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unpack-funcs" = callPackage
@@ -247910,6 +263992,8 @@ self: {
        ];
        description = "Monad transformers that mirror worker-wrapper transformations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unpacked-containers" = callPackage
@@ -247939,6 +264023,8 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked either data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unpacked-maybe" = callPackage
@@ -247951,6 +264037,8 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked maybe data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unpacked-maybe-numeric" = callPackage
@@ -247965,6 +264053,8 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "maybes of numeric values with fewer indirections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unpacked-maybe-text" = callPackage
@@ -247992,6 +264082,8 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked these data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unpacked-validation" = callPackage
@@ -248008,6 +264100,8 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked validation data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unparse-attoparsec" = callPackage
@@ -248028,6 +264122,8 @@ self: {
        ];
        description = "An attoparsec roundtrip";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unroll-ghc-plugin" = callPackage
@@ -248039,6 +264135,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Compiler plugin for loop unrolling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unsafe" = callPackage
@@ -248075,6 +264173,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Flexible access control for unsafe operations and instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unsafeperformst" = callPackage
@@ -248105,6 +264205,8 @@ self: {
        ];
        description = "Solve Boggle-like word games";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unsequential" = callPackage
@@ -248123,6 +264225,8 @@ self: {
        ];
        description = "An extension removing the sequentiality from monads";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unusable-pkg" = callPackage
@@ -248164,6 +264268,8 @@ self: {
        testHaskellDepends = [ base containers hspec text ];
        description = "A command line tool to identify unused code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unwrapped-functors" = callPackage
@@ -248193,6 +264299,8 @@ self: {
        testHaskellDepends = [ base hlint tasty tasty-hunit ];
        description = "Units of measure as a GHC typechecker plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "up" = callPackage
@@ -248210,6 +264318,8 @@ self: {
        ];
        description = "Command-line tool to generate paths for moving upward in a file system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "up-grade" = callPackage
@@ -248303,6 +264413,8 @@ self: {
        ];
        description = "Haskell client for Uploadcare";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uploadtest" = callPackage
@@ -248325,6 +264437,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to upskirt";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urbit-airlock" = callPackage
@@ -248341,6 +264455,8 @@ self: {
        ];
        description = "Talk to Urbit from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urbit-hob" = callPackage
@@ -248379,6 +264495,8 @@ self: {
        ];
        description = "Minimalistic CLI RSS reader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urembed" = callPackage
@@ -248399,6 +264517,8 @@ self: {
        ];
        description = "Ur/Web static content generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri" = callPackage
@@ -248410,6 +264530,8 @@ self: {
        libraryHaskellDepends = [ base parsec safe utf8-string ];
        description = "Library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-bytestring" = callPackage
@@ -248468,6 +264590,8 @@ self: {
        ];
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-encode" = callPackage
@@ -248503,6 +264627,8 @@ self: {
        ];
        description = "A uri encoder to make your strings less readable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-enumerator" = callPackage
@@ -248519,6 +264645,8 @@ self: {
        ];
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-enumerator-file" = callPackage
@@ -248537,6 +264665,8 @@ self: {
        ];
        description = "uri-enumerator backend for the file scheme (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-parse" = callPackage
@@ -248553,6 +264683,8 @@ self: {
        testHaskellDepends = [ base data-default hspec lens ];
        description = "A simple library for parsing and generating URIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-template" = callPackage
@@ -248567,6 +264699,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "URI template library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-templater" = callPackage
@@ -248590,6 +264724,8 @@ self: {
        ];
        description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "url" = callPackage
@@ -248624,6 +264760,8 @@ self: {
        ];
        description = "Memory efficient url type and parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "url-decoders" = callPackage
@@ -248646,6 +264784,8 @@ self: {
        benchmarkHaskellDepends = [ criterion http-types rerebase ];
        description = "Decoders for URL-encoding (aka Percent-encoding)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "url-generic" = callPackage
@@ -248659,6 +264799,8 @@ self: {
        libraryHaskellDepends = [ base mtl syb ];
        description = "Parse/format generic key/value URLs from record data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urlcheck" = callPackage
@@ -248676,6 +264818,8 @@ self: {
        ];
        description = "Parallel link checker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urldecode" = callPackage
@@ -248689,6 +264833,8 @@ self: {
        executableHaskellDepends = [ base network ];
        description = "Decode percent-encoded strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urldisp-happstack" = callPackage
@@ -248700,6 +264846,8 @@ self: {
        libraryHaskellDepends = [ base bytestring happstack-server mtl ];
        description = "Simple, declarative, expressive URL routing -- on happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urlencoded" = callPackage
@@ -248715,6 +264863,8 @@ 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;
+       broken = true;
      }) {};
 
   "urlpath" = callPackage
@@ -248734,6 +264884,8 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urn" = callPackage
@@ -248746,6 +264898,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Universal Resource Names";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urn-random" = callPackage
@@ -248762,6 +264916,8 @@ self: {
        ];
        description = "A package for updatable discrete distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urxml" = callPackage
@@ -248779,6 +264935,8 @@ self: {
        ];
        description = "XML parser-printer supporting Ur/Web syntax extensions";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "usa-holidays" = callPackage
@@ -248805,6 +264963,8 @@ self: {
        ];
        description = "Communicate with USB devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "usb-enumerator" = callPackage
@@ -248821,6 +264981,8 @@ self: {
        ];
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "usb-hid" = callPackage
@@ -248834,6 +264996,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring usb ];
        description = "Parser and request Library for USB HIDs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "usb-id-database" = callPackage
@@ -248853,6 +265017,8 @@ self: {
        ];
        description = "A database of USB identifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "usb-iteratee" = callPackage
@@ -248869,6 +265035,8 @@ self: {
        ];
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "usb-safe" = callPackage
@@ -248885,6 +265053,8 @@ self: {
        ];
        description = "Type-safe communication with USB devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "useragents" = callPackage
@@ -248914,6 +265084,8 @@ self: {
        ];
        description = "The UserId type and useful instances for web development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "users" = callPackage
@@ -248948,6 +265120,8 @@ self: {
        ];
        description = "A mysql-haskell backend for the users library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "users-persistent" = callPackage
@@ -248968,6 +265142,8 @@ self: {
        ];
        description = "A persistent backend for the users package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "users-postgresql-simple" = callPackage
@@ -249028,6 +265204,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge ];
        description = "UTF-8";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "utf8-conversions" = callPackage
@@ -249082,6 +265260,8 @@ self: {
        libraryHaskellDepends = [ base utf8-string ];
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "utf8-string" = callPackage
@@ -249112,6 +265292,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constant-space UTF8 validator for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "util" = callPackage
@@ -249138,6 +265320,8 @@ self: {
        libraryHaskellDepends = [ base basic control lifted-base-tf util ];
        description = "Exceptional utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "util-logict" = callPackage
@@ -249151,6 +265335,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge logict ];
        description = "See README for more info";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "util-plus" = callPackage
@@ -249167,6 +265353,8 @@ self: {
        testHaskellDepends = [ base containers HTF QuickCheck ];
        description = "A collection of commonly used utils";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "util-primitive" = callPackage
@@ -249180,6 +265368,8 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "Primitive memory-related utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "util-primitive-control" = callPackage
@@ -249196,6 +265386,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Utilities for stateful primitive types and types based on them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "util-universe" = callPackage
@@ -249214,6 +265406,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Utilities for universal types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "utility-ht" = callPackage
@@ -249237,6 +265431,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Utilities for compiler construction: core functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uu-cco-examples" = callPackage
@@ -249250,6 +265446,8 @@ self: {
        executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ];
        description = "Utilities for compiler construction: example programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uu-cco-hut-parsing" = callPackage
@@ -249261,6 +265459,8 @@ self: {
        libraryHaskellDepends = [ base uu-cco uulib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uulib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uu-cco-uu-parsinglib" = callPackage
@@ -249272,6 +265472,8 @@ self: {
        libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uu-interleaved" = callPackage
@@ -249369,6 +265571,8 @@ self: {
        ];
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uuagc-cabal" = callPackage
@@ -249395,6 +265599,8 @@ self: {
        libraryHaskellDepends = [ base diagrams-lib SVGFonts ];
        description = "Utility for drawing attribute grammar pictures with the diagrams package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uuagd" = callPackage
@@ -249451,6 +265657,8 @@ self: {
        libraryHaskellDepends = [ aeson base text uuid ];
        description = "Aeson types for UUID instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uuid-bytes" = callPackage
@@ -249471,6 +265679,8 @@ self: {
        ];
        description = "UUID parsing using byteverse packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uuid-crypto" = callPackage
@@ -249489,6 +265699,8 @@ self: {
        ];
        description = "Reversable and secure encoding of object ids as uuids";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uuid-le" = callPackage
@@ -249596,6 +265808,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Fast unboxed arrays with a flexible interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uvector-algorithms" = callPackage
@@ -249607,6 +265821,8 @@ self: {
        libraryHaskellDepends = [ base uvector ];
        description = "Efficient algorithms for uvector unboxed arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uxadt" = callPackage
@@ -249618,6 +265834,8 @@ self: {
        libraryHaskellDepends = [ base json MissingH mtl ];
        description = "Cross-language extensible representation for algebraic data type instances";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uzbl-with-source" = callPackage
@@ -249645,6 +265863,8 @@ self: {
        ];
        description = "interface to Video For Linux Two (V4L2)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "v4l2-examples" = callPackage
@@ -249658,6 +265878,8 @@ self: {
        executableHaskellDepends = [ base GLUT v4l2 ];
        description = "video for linux two examples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vabal" = callPackage
@@ -249679,6 +265901,8 @@ self: {
        testHaskellDepends = [ base process ];
        description = "the cabal companion";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vabal-lib" = callPackage
@@ -249696,6 +265920,8 @@ self: {
        testHaskellDepends = [ base Cabal containers ];
        description = "Core algorithms and datatypes used by vabal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vacuum" = callPackage
@@ -249707,6 +265933,8 @@ self: {
        libraryHaskellDepends = [ array base containers ghc-prim ];
        description = "Graph representation of the GHC heap";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vacuum-cairo" = callPackage
@@ -249723,6 +265951,8 @@ self: {
        ];
        description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vacuum-graphviz" = callPackage
@@ -249734,6 +265964,8 @@ self: {
        libraryHaskellDepends = [ base filepath graphviz vacuum ];
        description = "A library for transforming vacuum graphs into GraphViz output";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vacuum-opengl" = callPackage
@@ -249753,6 +265985,8 @@ self: {
        ];
        description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vacuum-ubigraph" = callPackage
@@ -249764,6 +265998,8 @@ self: {
        libraryHaskellDepends = [ base containers hubigraph vacuum ];
        description = "Visualize Haskell data structures using vacuum and Ubigraph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vado" = callPackage
@@ -249809,6 +266045,8 @@ self: {
        libraryHaskellDepends = [ base containers MonadRandom ];
        description = "Valid operator/module characters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "validate" = callPackage
@@ -249839,6 +266077,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Input validation combinator library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "validated-literals" = callPackage
@@ -249870,6 +266110,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Type-level constraints on strings and other input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "validation" = callPackage
@@ -249927,6 +266169,8 @@ self: {
        ];
        description = "A nice way to define field validations in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "validationt" = callPackage
@@ -250126,6 +266370,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for generating values without having to thread state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vampire" = callPackage
@@ -250148,6 +266394,8 @@ self: {
        ];
        description = "Analyze and visualize expression trees";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "var" = callPackage
@@ -250165,6 +266413,8 @@ self: {
        benchmarkHaskellDepends = [ array base criterion deepseq ];
        description = "Mutable variables and tuples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "var-monad" = callPackage
@@ -250194,6 +266444,8 @@ self: {
        ];
        description = "Process mpileup output to identify significant differences";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "variable-precision" = callPackage
@@ -250210,6 +266462,8 @@ self: {
        ];
        description = "variable-precision floating point";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "variables" = callPackage
@@ -250222,6 +266476,8 @@ self: {
        testHaskellDepends = [ base hspec mtl QuickCheck stm ];
        description = "Monads with variables, without deep magic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "variation" = callPackage
@@ -250236,6 +266492,8 @@ self: {
        ];
        description = "nominal value with possible variations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "varying" = callPackage
@@ -250310,6 +266568,8 @@ self: {
        ];
        description = "Utility library for spawning a HashiCorp Vault process";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vault-trans" = callPackage
@@ -250326,6 +266586,8 @@ self: {
        ];
        description = "A monad transformer for vault-tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vaultaire-common" = callPackage
@@ -250349,6 +266611,8 @@ self: {
        ];
        description = "Common types and instances for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcache" = callPackage
@@ -250365,6 +266629,8 @@ self: {
        ];
        description = "semi-transparent persistence for Haskell using LMDB, STM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcache-trie" = callPackage
@@ -250380,6 +266646,8 @@ self: {
        ];
        description = "patricia tries modeled above VCache";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcard" = callPackage
@@ -250393,6 +266661,8 @@ self: {
        ];
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcatt" = callPackage
@@ -250407,6 +266677,8 @@ self: {
        executableHaskellDepends = [ base shelly text ];
        description = "Recursively check that a directory is under version control";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcd" = callPackage
@@ -250434,6 +266706,8 @@ self: {
        ];
        description = "A package to parse VCF files inspired in similar python libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcs-revision" = callPackage
@@ -250479,6 +266753,8 @@ self: {
        ];
        description = "GUI library for source code management systems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcswrapper" = callPackage
@@ -250502,6 +266778,8 @@ self: {
        ];
        description = "Wrapper for source code management systems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vec" = callPackage
@@ -250573,6 +266851,8 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, operating on the Floating typeclass";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vect-floating-accelerate" = callPackage
@@ -250586,6 +266866,8 @@ self: {
        libraryHaskellDepends = [ accelerate base vect-floating ];
        description = "Accelerate instances for vect-floating types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vect-opengl" = callPackage
@@ -250597,6 +266879,8 @@ self: {
        libraryHaskellDepends = [ base OpenGL vect ];
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector" = callPackage
@@ -250721,6 +267005,8 @@ self: {
        testHaskellDepends = [ base directory QuickCheck random ];
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-circular" = callPackage
@@ -250757,6 +267043,8 @@ self: {
        ];
        description = "Vector clocks for versioning message flows";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-conduit" = callPackage
@@ -250775,6 +267063,8 @@ self: {
        ];
        description = "Conduit utilities for vectors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-doublezip" = callPackage
@@ -250800,6 +267090,8 @@ self: {
        doHaddock = false;
        description = "Storable vectors with cpu-independent representation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-extras" = callPackage
@@ -250848,6 +267140,8 @@ self: {
        ];
        description = "vectors that perform the fmap operation in constant time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-heterogenous" = callPackage
@@ -250859,6 +267153,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        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;
+       broken = true;
      }) {};
 
   "vector-instances" = callPackage
@@ -250887,6 +267183,8 @@ self: {
        ];
        description = "Instances of the Data.Collections classes for Data.Vector.*";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-mmap" = callPackage
@@ -250914,6 +267212,8 @@ self: {
        libraryHaskellDepends = [ base mersenne-random-pure64 vector ];
        description = "Generate vectors filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-read-instances" = callPackage
@@ -250925,6 +267225,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "(deprecated) Read instances for 'Data.Vector'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-rotcev" = callPackage
@@ -250988,6 +267290,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "vector-space operations for finite maps using Data.Map";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-space-opengl" = callPackage
@@ -251005,6 +267309,8 @@ self: {
        ];
        description = "Instances of vector-space classes for OpenGL types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-space-points" = callPackage
@@ -251018,6 +267324,8 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-split" = callPackage
@@ -251045,6 +267353,8 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "Statically checked sizes on Data.Vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-strategies" = callPackage
@@ -251071,6 +267381,8 @@ self: {
        ];
        description = "Text implementation based on unboxed char vector";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-th-unbox" = callPackage
@@ -251131,6 +267443,8 @@ self: {
        ];
        description = "Easily view Vega or Vega-Lite visualizations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "venzone" = callPackage
@@ -251157,6 +267471,8 @@ self: {
        ];
        description = "ASCII platform-adventure game";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -251168,6 +267484,8 @@ self: {
        libraryHaskellDepends = [ base regex-pcre ];
        description = "Regular expressions made easy";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verbosity" = callPackage
@@ -251200,6 +267518,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Validation framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verdict-json" = callPackage
@@ -251220,6 +267540,8 @@ self: {
        ];
        description = "JSON instances and JSON Schema for verdict";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verifiable-expressions" = callPackage
@@ -251235,6 +267557,8 @@ self: {
        ];
        description = "An intermediate language for Hoare logic style verification";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verify" = callPackage
@@ -251257,6 +267581,8 @@ self: {
        ];
        description = "A new Haskeleton package";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verilog" = callPackage
@@ -251269,6 +267595,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Verilog preprocessor, parser, and AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verismith" = callPackage
@@ -251305,6 +267633,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion lens ];
        description = "Random verilog generation and simulator testing";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "versioning" = callPackage
@@ -251317,6 +267647,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "Type-safe data versioning";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "versioning-servant" = callPackage
@@ -251337,6 +267669,8 @@ self: {
        ];
        description = "Servant combinators for the versioning library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "versions" = callPackage
@@ -251377,6 +267711,8 @@ self: {
        ];
        description = "types for ingesting vflow data with aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vformat" = callPackage
@@ -251454,6 +267790,8 @@ self: {
        ];
        description = "VFR waypoints, as published in the AIP (ERSA)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vgrep" = callPackage
@@ -251483,6 +267821,8 @@ self: {
        ];
        description = "A pager for grep";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vhd" = callPackage
@@ -251508,6 +267848,8 @@ self: {
        ];
        description = "Provides functions to inspect and manipulate virtual hard disk (VHD) files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vhdl" = callPackage
@@ -251519,6 +267861,8 @@ self: {
        libraryHaskellDepends = [ base mtl pretty regex-posix ];
        description = "VHDL AST and pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vicinity" = callPackage
@@ -251534,6 +267878,8 @@ self: {
          base containers doctest QuickCheck quickcheck-classes
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "viewprof" = callPackage
@@ -251552,6 +267898,8 @@ self: {
        ];
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "views" = callPackage
@@ -251563,6 +267911,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Views allow you to run a State monad on part of a state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vigilance" = callPackage
@@ -251603,6 +267953,8 @@ self: {
        ];
        description = "An extensible dead-man's switch system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vimeta" = callPackage
@@ -251629,6 +267981,8 @@ self: {
        ];
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vimus" = callPackage
@@ -251658,6 +268012,8 @@ self: {
        ];
        description = "An MPD client with vim-like key bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "vintage-basic" = callPackage
@@ -251678,6 +268034,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Interpreter for microcomputer-era BASIC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl" = callPackage
@@ -251754,6 +268112,8 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Provide json instances automagically to vinyl types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl-named-sugar" = callPackage
@@ -251765,6 +268125,8 @@ self: {
        libraryHaskellDepends = [ base vinyl ];
        description = "Syntax sugar for vinyl records using overloaded labels";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl-operational" = callPackage
@@ -251779,6 +268141,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl-plus" = callPackage
@@ -251798,6 +268162,8 @@ self: {
        testHaskellDepends = [ base doctest vinyl ];
        description = "Vinyl records utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl-utils" = callPackage
@@ -251809,6 +268175,8 @@ self: {
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl-vectors" = callPackage
@@ -251827,6 +268195,8 @@ self: {
        ];
        description = "Vectors for vinyl vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "virthualenv" = callPackage
@@ -251846,6 +268216,8 @@ self: {
        ];
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "visibility" = callPackage
@@ -251857,6 +268229,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple computation of visibility polygons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vision" = callPackage
@@ -251878,6 +268252,8 @@ self: {
        ];
        description = "An XMMS2 client";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "visual-graphrewrite" = callPackage
@@ -251905,6 +268281,8 @@ self: {
        ];
        description = "Visualize the graph-rewrite steps of a Haskell program";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "visual-prof" = callPackage
@@ -251923,6 +268301,8 @@ self: {
        ];
        description = "Create a visual profile of a program's source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "visualize-cbn" = callPackage
@@ -251942,6 +268322,8 @@ self: {
        ];
        description = "Visualize CBN reduction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vitrea" = callPackage
@@ -251953,6 +268335,8 @@ self: {
        libraryHaskellDepends = [ base mtl profunctors ];
        description = "Profunctor optics via the profunctor representation theorem";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vivid" = callPackage
@@ -251972,6 +268356,8 @@ self: {
        ];
        description = "Sound synthesis with SuperCollider";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vivid-osc" = callPackage
@@ -251984,6 +268370,8 @@ self: {
        testHaskellDepends = [ base bytestring cereal microspec time ];
        description = "Open Sound Control encode/decode";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vivid-supercollider" = callPackage
@@ -252003,6 +268391,8 @@ self: {
        ];
        description = "Implementation of SuperCollider server specifications";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vk-aws-route53" = callPackage
@@ -252020,6 +268410,8 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vk-posix-pty" = callPackage
@@ -252071,6 +268463,8 @@ self: {
        testHaskellDepends = [ aeson base hspec roundtrip-aeson ];
        description = "Upload audio files to voicebase to get a transcription";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "void" = callPackage
@@ -252107,6 +268501,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Vowpal Wabbit utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "voyeur" = callPackage
@@ -252118,6 +268514,8 @@ self: {
        libraryHaskellDepends = [ base bytestring process utf8-string ];
        description = "Haskell bindings for libvoyeur";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vpq" = callPackage
@@ -252134,6 +268532,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Priority queue based on vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vrpn" = callPackage
@@ -252191,6 +268591,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) vte;};
 
   "vtegtk3" = callPackage
@@ -252208,6 +268610,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) vte;};
 
   "vty" = callPackage
@@ -252263,6 +268667,8 @@ self: {
        ];
        description = "Examples programs using the vty library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vty-menu" = callPackage
@@ -252276,6 +268682,8 @@ self: {
        libraryHaskellDepends = [ base vty ];
        description = "A lib for displaying a menu and getting a selection using VTY";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vty-ui" = callPackage
@@ -252297,6 +268705,8 @@ self: {
        executableHaskellDepends = [ base QuickCheck random text vty ];
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vty-ui-extras" = callPackage
@@ -252308,6 +268718,8 @@ self: {
        libraryHaskellDepends = [ base regex-base regex-pcre vty vty-ui ];
        description = "Extra vty-ui functionality not included in the core library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vulkan" = callPackage
@@ -252332,6 +268744,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Low-level low-overhead vulkan api bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vulkan-utils" = callPackage
@@ -252390,6 +268804,8 @@ self: {
        ];
        description = "JSON wrangling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wacom-daemon" = callPackage
@@ -252413,6 +268829,8 @@ self: {
        ];
        description = "Manage Wacom tablet settings profiles, including Intuos Pro ring modes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "waddle" = callPackage
@@ -252435,6 +268853,8 @@ self: {
        ];
        description = "DOOM WAD file utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wahsp" = callPackage
@@ -252455,6 +268875,8 @@ self: {
        ];
        description = "A haskell binding of the Web Audio API ala blank-canvas";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai" = callPackage
@@ -252574,6 +268996,8 @@ self: {
        ];
        description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-conduit" = callPackage
@@ -252657,6 +269081,8 @@ self: {
        testHaskellDepends = [ base hspec stm ];
        description = "A web server for the development of WAI compliant web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-digestive-functors" = callPackage
@@ -252806,6 +269232,8 @@ self: {
        ];
        description = "Git http-backend CGI App of WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-graceful" = callPackage
@@ -252817,6 +269245,8 @@ self: {
        libraryHaskellDepends = [ base http-types mtl resourcet unix wai ];
        description = "Graceful shutdown for WAI applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-handler-devel" = callPackage
@@ -252837,6 +269267,8 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "WAI server that automatically reloads code after modification. (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-handler-fastcgi" = callPackage
@@ -252849,6 +269281,8 @@ self: {
        librarySystemDepends = [ fcgi ];
        description = "Wai handler to fastcgi";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fcgi;};
 
   "wai-handler-launch" = callPackage
@@ -252876,6 +269310,8 @@ self: {
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        description = "Wai handler to SCGI (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-handler-snap" = callPackage
@@ -252892,6 +269328,8 @@ self: {
        ];
        description = "Web Application Interface handler using snap-server. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-handler-webkit" = callPackage
@@ -252904,6 +269342,8 @@ self: {
        libraryPkgconfigDepends = [ QtWebKit ];
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {QtWebKit = null;};
 
   "wai-hastache" = callPackage
@@ -252942,6 +269382,8 @@ self: {
        ];
        description = "hmac authentication tools for WAI apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-http2-extra" = callPackage
@@ -252998,6 +269440,8 @@ self: {
        ];
        description = "Lenses for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-lite" = callPackage
@@ -253013,6 +269457,8 @@ self: {
        ];
        description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-log" = callPackage
@@ -253069,6 +269515,8 @@ self: {
        ];
        description = "Buffer requets before logging them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-logger-prefork" = callPackage
@@ -253085,6 +269533,8 @@ self: {
        ];
        description = "A logging system for preforked WAI apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-make-assets" = callPackage
@@ -253114,6 +269564,8 @@ self: {
        ];
        description = "Compiling and serving assets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-auth" = callPackage
@@ -253198,6 +269650,8 @@ self: {
        ];
        description = "Caching middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-cache-redis" = callPackage
@@ -253216,6 +269670,8 @@ self: {
        ];
        description = "Redis backend for wai-middleware-cache";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-caching" = callPackage
@@ -253278,6 +269734,8 @@ self: {
        ];
        description = "Wai error catching middleware";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-clacks" = callPackage
@@ -253319,6 +269777,8 @@ self: {
        ];
        description = "Wai Middleware for Consul";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-content-type" = callPackage
@@ -253351,6 +269811,8 @@ self: {
        ];
        description = "Route to different middlewares based on the incoming Accept header";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-crowd" = callPackage
@@ -253382,6 +269844,8 @@ self: {
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-delegate" = callPackage
@@ -253408,6 +269872,8 @@ self: {
        ];
        description = "WAI middleware that delegates handling of requests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-etag" = callPackage
@@ -253425,6 +269891,8 @@ self: {
        ];
        description = "WAI ETag middleware for static files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-gunzip" = callPackage
@@ -253451,6 +269919,8 @@ self: {
        libraryHaskellDepends = [ base bytestring http-types wai ];
        description = "cors and addHeaders for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-hmac" = callPackage
@@ -253493,6 +269963,8 @@ self: {
        ];
        description = "WAI HMAC Authentication Middleware Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-json-errors" = callPackage
@@ -253551,6 +270023,8 @@ self: {
        ];
        description = "WAI middleware for preprocessing static files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-prometheus" = callPackage
@@ -253584,6 +270058,8 @@ self: {
        ];
        description = "Middleware that communicates to Rollbar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-route" = callPackage
@@ -253604,6 +270080,8 @@ self: {
        ];
        description = "Wai dispatch middleware";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-slack-verify" = callPackage
@@ -253668,6 +270146,8 @@ self: {
        ];
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-static-embedded" = callPackage
@@ -253727,6 +270207,8 @@ self: {
        ];
        description = "WAI middleware for authenticating webhook payloads from Travis CI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-verbs" = callPackage
@@ -253797,6 +270279,8 @@ self: {
        ];
        description = "Redis backend for rate limiting as WAI middleware";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-request-spec" = callPackage
@@ -253815,6 +270299,8 @@ self: {
        ];
        description = "Declarative request parsing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-responsible" = callPackage
@@ -253826,6 +270312,8 @@ self: {
        libraryHaskellDepends = [ base bytestring http-types wai ];
        description = "Response interface for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-route" = callPackage
@@ -253859,6 +270347,8 @@ self: {
        libraryHaskellDepends = [ base text wai ];
        description = "Provides basic routing on URL paths for WAI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-routes" = callPackage
@@ -253883,6 +270373,8 @@ self: {
        ];
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-routing" = callPackage
@@ -253909,6 +270401,8 @@ self: {
        ];
        description = "Declarative routing for WAI";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-saml2" = callPackage
@@ -253950,6 +270444,8 @@ self: {
          wai-extra
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-session" = callPackage
@@ -253984,6 +270480,8 @@ self: {
        ];
        description = "An alternative session middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-session-clientsession" = callPackage
@@ -254021,6 +270519,8 @@ self: {
        ];
        description = "MySQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-session-postgresql" = callPackage
@@ -254043,6 +270543,8 @@ self: {
        ];
        description = "PostgreSQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-session-tokyocabinet" = callPackage
@@ -254091,6 +270593,8 @@ self: {
        ];
        description = "A simple cache for serving static files in a WAI middleware";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-static-pages" = callPackage
@@ -254134,6 +270638,8 @@ self: {
        ];
        description = "Thrift transport layer for Wai";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-throttler" = callPackage
@@ -254149,6 +270655,8 @@ self: {
        ];
        description = "Wai middleware for request throttling";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-transformers" = callPackage
@@ -254228,6 +270736,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A wrapping library for waitfree computation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "waitra" = callPackage
@@ -254252,6 +270762,8 @@ self: {
        ];
        description = "A very simple Wai router";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wakame" = callPackage
@@ -254302,6 +270814,8 @@ self: {
        ];
        description = "A generator of comics based on some ascertainable data about the requester";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wallpaper" = callPackage
@@ -254323,6 +270837,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A library and executable for creating wallpaper, frieze, and rosette patterns";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "warc" = callPackage
@@ -254400,6 +270916,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Dynamic configurable warp HTTP server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "warp-grpc" = callPackage
@@ -254437,6 +270955,8 @@ self: {
        ];
        description = "Static file server based on Warp and wai-app-static (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "warp-systemd" = callPackage
@@ -254448,6 +270968,8 @@ self: {
        libraryHaskellDepends = [ base network systemd unix wai warp ];
        description = "Socket activation and other systemd integration for the Warp web server (WAI)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "warp-tls" = callPackage
@@ -254501,6 +271023,8 @@ self: {
        ];
        description = "Warp and Wai Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wasm" = callPackage
@@ -254529,6 +271053,8 @@ self: {
        testToolDepends = [ alex happy ];
        description = "WebAssembly Language Toolkit and Interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "watchdog" = callPackage
@@ -254542,6 +271068,8 @@ self: {
        libraryHaskellDepends = [ base mtl time ];
        description = "Simple control structure to re-try an action with exponential backoff";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "watcher" = callPackage
@@ -254558,6 +271086,8 @@ self: {
        ];
        description = "Opinionated filesystem watcher";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "watchit" = callPackage
@@ -254586,6 +271116,8 @@ self: {
        ];
        description = "File change watching utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wavconvert" = callPackage
@@ -254634,6 +271166,8 @@ self: {
        ];
        description = "Wavefront OBJ loader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wavefront-obj" = callPackage
@@ -254652,6 +271186,8 @@ self: {
        testHaskellDepends = [ base hspec linear ];
        description = "Wavefront .obj file loader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wavesurfer" = callPackage
@@ -254668,6 +271204,8 @@ self: {
        ];
        description = "Parse WaveSurfer files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wavy" = callPackage
@@ -254688,6 +271226,8 @@ self: {
        ];
        description = "Process WAVE files in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wcwidth" = callPackage
@@ -254712,6 +271252,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Mutable bag backed by weak pointers to each item";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "weather-api" = callPackage
@@ -254728,6 +271270,8 @@ self: {
        ];
        description = "Weather API implemented in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-browser-in-haskell" = callPackage
@@ -254751,6 +271295,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Simple functions for CSS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-encodings" = callPackage
@@ -254768,6 +271314,8 @@ self: {
        ];
        description = "Encapsulate multiple web encoding in a single package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-fpco" = callPackage
@@ -254821,6 +271369,8 @@ self: {
        ];
        description = "Bindings for the Mongrel2 web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-output" = callPackage
@@ -254839,6 +271389,8 @@ self: {
        ];
        description = "Library to present content to an user via their browser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-page" = callPackage
@@ -254858,6 +271410,8 @@ self: {
        ];
        description = "Monoidally construct web pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-plugins" = callPackage
@@ -254894,6 +271448,8 @@ self: {
        ];
        description = "Send messages using Web Push protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-rep" = callPackage
@@ -254922,6 +271478,8 @@ self: {
        ];
        description = "representations of a web page";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-routes" = callPackage
@@ -255014,6 +271572,8 @@ self: {
        libraryHaskellDepends = [ base path-pieces template-haskell text ];
        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;
+       broken = true;
      }) {};
 
   "web-routes-regular" = callPackage
@@ -255025,6 +271585,8 @@ self: {
        libraryHaskellDepends = [ base parsec regular text web-routes ];
        description = "portable, type-safe URL routing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-routes-th" = callPackage
@@ -255052,6 +271614,8 @@ self: {
        libraryHaskellDepends = [ base transformers web-routes ];
        description = "Extends web-routes with some transformers instances for RouteT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-routes-wai" = callPackage
@@ -255086,6 +271650,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "simple routing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web3" = callPackage
@@ -255125,6 +271691,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Web3 API for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webapi" = callPackage
@@ -255151,6 +271719,8 @@ self: {
        ];
        description = "WAI based library for web api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webapp" = callPackage
@@ -255173,6 +271743,8 @@ self: {
        ];
        description = "Haskell web app framework based on WAI & Warp";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webauthn" = callPackage
@@ -255192,6 +271764,8 @@ self: {
        ];
        description = "Web Authentication API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webby" = callPackage
@@ -255232,6 +271806,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Turn an optparse-applicative program into a CGI program!";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webcrank" = callPackage
@@ -255259,6 +271835,8 @@ self: {
        ];
        description = "Webmachine inspired toolkit for building http applications and services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webcrank-dispatch" = callPackage
@@ -255274,6 +271852,8 @@ self: {
        ];
        description = "A simple request dispatcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webcrank-wai" = callPackage
@@ -255291,6 +271871,8 @@ self: {
        ];
        description = "Build a WAI Application from Webcrank Resources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webdriver" = callPackage
@@ -255335,6 +271917,8 @@ self: {
        ];
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webdriver-snoy" = callPackage
@@ -255361,6 +271945,8 @@ self: {
        testHaskellDepends = [ base parallel text ];
        description = "a Haskell client for the Selenium WebDriver protocol (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webdriver-w3c" = callPackage
@@ -255396,6 +271982,8 @@ self: {
        ];
        description = "Bindings to the WebDriver API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webex-teams-api" = callPackage
@@ -255495,6 +272083,8 @@ self: {
        ];
        description = "WebFinger client library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webgear-server" = callPackage
@@ -255595,6 +272185,8 @@ self: {
        libraryPkgconfigDepends = [ webkit ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {webkit = null;};
 
   "webkit2gtk3-javascriptcore" = callPackage
@@ -255685,6 +272277,8 @@ self: {
        ];
        description = "HTTP server library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webshow" = callPackage
@@ -255704,6 +272298,8 @@ self: {
        ];
        description = "Show programming language printed values in a web UI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "websnap" = callPackage
@@ -255779,6 +272375,8 @@ self: {
        ];
        description = "Simple streaming RPC mechanism using WebSockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "websockets-simple" = callPackage
@@ -255849,6 +272447,8 @@ self: {
        ];
        description = "Functional reactive web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wedding-announcement" = callPackage
@@ -255960,6 +272560,8 @@ self: {
        libraryHaskellDepends = [ base mtl semiring-num transformers ];
        description = "Writer monad which uses semiring constraint";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "weighted-regexp" = callPackage
@@ -255974,6 +272576,8 @@ self: {
        libraryToolDepends = [ happy ];
        description = "Weighted Regular Expression Matcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "weighted-search" = callPackage
@@ -256004,6 +272608,8 @@ self: {
        ];
        description = "Haskell web framework (because Scotty had trouble yodeling)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wembley" = callPackage
@@ -256045,6 +272651,8 @@ self: {
        ];
        description = "A game engine for playing werewolf within an arbitrary chat client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "werewolf-slack" = callPackage
@@ -256064,6 +272672,8 @@ self: {
        ];
        description = "A chat interface for playing werewolf in Slack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "what4" = callPackage
@@ -256100,6 +272710,8 @@ self: {
        ];
        description = "Solver-agnostic symbolic values support for issuing queries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wheb-mongo" = callPackage
@@ -256111,6 +272723,8 @@ self: {
        libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ];
        description = "MongoDB plugin for Wheb";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wheb-redis" = callPackage
@@ -256122,6 +272736,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ];
        description = "Redis connection for Wheb";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wheb-strapped" = callPackage
@@ -256133,6 +272749,8 @@ self: {
        libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ];
        description = "Strapped templates for Wheb";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "which" = callPackage
@@ -256155,6 +272773,8 @@ self: {
        libraryHaskellDepends = [ base indents parsec ];
        description = "Parser for the While language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "whim" = callPackage
@@ -256173,6 +272793,8 @@ self: {
        ];
        description = "A Haskell window manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "whiskers" = callPackage
@@ -256184,6 +272806,8 @@ self: {
        libraryHaskellDepends = [ base parsec template-haskell ];
        description = "Mustache templates with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "whitespace" = callPackage
@@ -256198,6 +272822,8 @@ self: {
        executableHaskellDepends = [ haskell98 random ];
        description = "Whitespace, an esoteric programming language";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "whois" = callPackage
@@ -256211,6 +272837,8 @@ self: {
        libraryHaskellDepends = [ base network network-uri split ];
        description = "WHOIS client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wholepixels" = callPackage
@@ -256245,6 +272873,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Haskell support for the Why3 input format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wide-word" = callPackage
@@ -256330,6 +272960,8 @@ self: {
        ];
        description = "Wikipedia EPUB E-Book construction from Firefox history";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wild-bind" = callPackage
@@ -256364,6 +272996,8 @@ self: {
        ];
        description = "Graphical indicator for WildBind";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wild-bind-task-x11" = callPackage
@@ -256380,6 +273014,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Task to install and export everything you need to use WildBind in X11";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wild-bind-x11" = callPackage
@@ -256438,6 +273074,8 @@ self: {
        librarySystemDepends = [ dnsapi ];
        description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {dnsapi = null;};
 
   "windowslive" = callPackage
@@ -256455,6 +273093,8 @@ self: {
        ];
        description = "Implements Windows Live Web Authentication and Delegated Authentication";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "winerror" = callPackage
@@ -256466,6 +273106,8 @@ self: {
        doHaddock = false;
        description = "Error handling for foreign calls to the Windows API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "winery" = callPackage
@@ -256503,6 +273145,8 @@ self: {
        ];
        description = "A compact, well-typed seralisation format for Haskell values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "winio" = callPackage
@@ -256519,6 +273163,8 @@ self: {
        librarySystemDepends = [ kernel32 ws2_32 ];
        description = "I/O library for Windows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {kernel32 = null; ws2_32 = null;};
 
   "wire-streams" = callPackage
@@ -256561,6 +273207,8 @@ self: {
        ];
        description = "Functional reactive programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wiring" = callPackage
@@ -256577,6 +273225,8 @@ self: {
        ];
        description = "Wiring, promotion and demotion of types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wiringPi" = callPackage
@@ -256747,6 +273397,8 @@ self: {
        executableHaskellDepends = [ base bytestring network unix ];
        description = "A network server to show bottlenecks of GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wizard" = callPackage
@@ -256793,6 +273445,8 @@ self: {
        ];
        description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wkt-geom" = callPackage
@@ -256816,6 +273470,8 @@ self: {
        ];
        description = "A parser of WKT, WKB and eWKB";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wl-pprint" = callPackage
@@ -256859,6 +273515,8 @@ self: {
        ];
        description = "ANSI Terminal support with wl-pprint-extras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wl-pprint-console" = callPackage
@@ -256893,6 +273551,8 @@ self: {
        ];
        description = "A free monad based on the Wadler/Leijen pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wl-pprint-terminfo" = callPackage
@@ -256910,6 +273570,8 @@ self: {
        ];
        description = "A color pretty printer with terminfo support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wl-pprint-text" = callPackage
@@ -256939,6 +273601,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {wlc = null;};
 
   "wobsurv" = callPackage
@@ -256974,6 +273638,8 @@ self: {
        ];
        description = "A simple and highly performant HTTP file server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "woe" = callPackage
@@ -256985,6 +273651,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Convenient typeclass for defining arbitrary-index enums";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "woffex" = callPackage
@@ -257000,6 +273668,8 @@ self: {
        ];
        description = "Web Open Font Format (WOFF) unpacker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wol" = callPackage
@@ -257014,6 +273684,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Send a Wake on LAN Magic Packet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wolf" = callPackage
@@ -257036,6 +273708,8 @@ self: {
        executableHaskellDepends = [ base optparse-generic ];
        description = "Amazon Simple Workflow Service Wrapper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "woot" = callPackage
@@ -257150,6 +273824,8 @@ self: {
        ];
        description = "Reading word2vec binary models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "word8" = callPackage
@@ -257189,6 +273865,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion pandoc text ];
        description = "Get word counts and distributions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wordcloud" = callPackage
@@ -257241,6 +273919,8 @@ self: {
          unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wordlist" = callPackage
@@ -257259,6 +273939,8 @@ self: {
        ];
        description = "Command-line tool to get random words";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wordn" = callPackage
@@ -257301,6 +273983,8 @@ self: {
        ];
        description = "Dictionary-based password generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wordpress-auth" = callPackage
@@ -257345,6 +274029,8 @@ self: {
        executableHaskellDepends = [ base containers fclabels ];
        description = "A word search solver library and executable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wordsetdiff" = callPackage
@@ -257377,6 +274063,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A library for parsing a chat-based work hour reporting scheme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "workdays" = callPackage
@@ -257389,6 +274077,8 @@ self: {
        testHaskellDepends = [ base containers doctest hspec ];
        description = "Workday calculations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "workflow-extra" = callPackage
@@ -257411,6 +274101,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "workflow-osx" = callPackage
@@ -257430,6 +274122,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "a \"Desktop Workflow\" monad with Objective-C bindings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "workflow-pure" = callPackage
@@ -257452,6 +274146,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "manipulate `workflow-types:Workflow`'s";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "workflow-types" = callPackage
@@ -257470,6 +274166,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Automate keyboard\\/mouse\\/clipboard\\/application interaction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "workflow-windows" = callPackage
@@ -257484,6 +274182,8 @@ self: {
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        description = "Automate keyboard/mouse/clipboard/application interaction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "world-peace" = callPackage
@@ -257526,6 +274226,8 @@ self: {
        ];
        description = "Subscribe to a wiki's RSS feed and archive external links";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wrap" = callPackage
@@ -257568,6 +274270,8 @@ self: {
        ];
        description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wrecker" = callPackage
@@ -257606,6 +274310,8 @@ self: {
        ];
        description = "An HTTP Performance Benchmarker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wrecker-ui" = callPackage
@@ -257638,6 +274344,8 @@ self: {
        ];
        description = "A web interface for Wrecker, the HTTP Performance Benchmarker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wreq" = callPackage
@@ -257731,6 +274439,8 @@ self: {
        ];
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wreq-sb" = callPackage
@@ -257768,6 +274478,8 @@ self: {
        ];
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wreq-stringless" = callPackage
@@ -257796,6 +274508,8 @@ self: {
        ];
        description = "Colour space transformations and metrics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "write-buffer-core" = callPackage
@@ -257856,6 +274570,8 @@ self: {
        ];
        description = "WriteT and RWST monad transformers (Reexport with all dependencies)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "writer-cps-lens" = callPackage
@@ -257872,6 +274588,8 @@ self: {
        ];
        description = "Lens instances for the stricter CPS WriterT and RWST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "writer-cps-monads-tf" = callPackage
@@ -257887,6 +274605,8 @@ self: {
        ];
        description = "MonadWriter orphan instances for writer-cps-transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "writer-cps-morph" = callPackage
@@ -257900,6 +274620,8 @@ self: {
        libraryHaskellDepends = [ base mmorph writer-cps-transformers ];
        description = "MFunctor instance for CPS style WriterT and RWST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "writer-cps-mtl" = callPackage
@@ -257962,6 +274684,8 @@ self: {
        ];
        description = "A simple CLI utility for interacting with a websocket";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ws-chans" = callPackage
@@ -258003,6 +274727,8 @@ self: {
        ];
        description = "WSDL parsing in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wsedit" = callPackage
@@ -258020,6 +274746,8 @@ self: {
        ];
        description = "A small tool to list, add and remove webseeds from a torrent file";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wshterm" = callPackage
@@ -258039,6 +274767,8 @@ self: {
        ];
        description = "Terminal emulator over websockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wsjtx-udp" = callPackage
@@ -258057,6 +274787,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "WSJT-X UDP protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wss-client" = callPackage
@@ -258103,6 +274835,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wtk" = callPackage
@@ -258114,6 +274848,8 @@ self: {
        libraryHaskellDepends = [ base old-locale time transformers ];
        description = "Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wtk-gtk" = callPackage
@@ -258129,6 +274865,8 @@ self: {
        ];
        description = "GTK tools within Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wu-wei" = callPackage
@@ -258144,6 +274882,8 @@ self: {
        ];
        description = "Unimportant Unix adminstration tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wumpus-basic" = callPackage
@@ -258159,6 +274899,8 @@ self: {
        ];
        description = "Basic objects and system code built on Wumpus-Core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wumpus-core" = callPackage
@@ -258172,6 +274914,8 @@ self: {
        libraryHaskellDepends = [ base containers time vector-space ];
        description = "Pure Haskell PostScript and SVG generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wumpus-drawing" = callPackage
@@ -258187,6 +274931,8 @@ self: {
        ];
        description = "High-level drawing objects built on Wumpus-Basic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wumpus-microprint" = callPackage
@@ -258202,6 +274948,8 @@ self: {
        ];
        description = "Microprints - \"greek-text\" pictures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wumpus-tree" = callPackage
@@ -258218,6 +274966,8 @@ self: {
        ];
        description = "Drawing trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wuss" = callPackage
@@ -258259,6 +275009,8 @@ self: {
        executableHaskellDepends = [ base directory random wx wxcore ];
        description = "Try to avoid the asteroids with your space ship";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wxFruit" = callPackage
@@ -258273,6 +275025,8 @@ self: {
        executableHaskellDepends = [ base wx wxcore Yampa ];
        description = "An implementation of Fruit using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wxSimpleCanvas" = callPackage
@@ -258284,6 +275038,8 @@ self: {
        libraryHaskellDepends = [ base cubicbezier wx wxcore ];
        description = "Simple zoomable canvas for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wxc" = callPackage
@@ -258346,6 +275102,8 @@ self: {
        ];
        description = "helper tool for building wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wxhnotepad" = callPackage
@@ -258360,6 +275118,8 @@ self: {
        executableHaskellDepends = [ base wx wxcore ];
        description = "An example of how to implement a basic notepad with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wxturtle" = callPackage
@@ -258375,6 +275135,8 @@ self: {
        ];
        description = "turtle like LOGO with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wybor" = callPackage
@@ -258414,6 +275176,8 @@ self: {
        ];
        description = "An autoresponder for Dragon Go Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "x-dsp" = callPackage
@@ -258430,6 +275194,8 @@ self: {
        ];
        description = "A embedded DSL for manipulating DSP languages in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "x11-xim" = callPackage
@@ -258662,6 +275428,8 @@ self: {
        ];
        description = "XChat";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xcp" = callPackage
@@ -258677,6 +275445,8 @@ self: {
        ];
        description = "Partial implementation of the XCP protocol with ethernet as transport layer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xdcc" = callPackage
@@ -258702,6 +275472,8 @@ self: {
        ];
        description = "A wget-like utility for retrieving files from XDCC bots on IRC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xdg-basedir" = callPackage
@@ -258763,6 +275535,8 @@ self: {
        ];
        description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xeno" = callPackage
@@ -258798,6 +275572,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal mtl network ];
        description = "Xenstore client access";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xfconf" = callPackage
@@ -258818,6 +275594,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libxfconf = null;};
 
   "xformat" = callPackage
@@ -258830,6 +275608,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Extensible, type-safe formatting with scanf- and printf-like functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xgboost-haskell" = callPackage
@@ -258860,6 +275640,8 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xhb" = callPackage
@@ -258876,6 +275658,8 @@ self: {
        ];
        description = "X Haskell Bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xhb-atom-cache" = callPackage
@@ -258891,6 +275675,8 @@ self: {
        ];
        description = "Atom cache for XHB";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xhb-ewmh" = callPackage
@@ -258907,6 +275693,8 @@ self: {
        ];
        description = "EWMH utilities for XHB";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xhtml_3000_2_2_1" = callPackage
@@ -258949,6 +275737,8 @@ self: {
        executableHaskellDepends = [ base directory process ];
        description = "The Lava system for Xilinx FPGA design with layout combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xine" = callPackage
@@ -258963,6 +275753,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to xine-lib";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libxine = null; xine = null;};
 
   "xing-api" = callPackage
@@ -258986,6 +275778,8 @@ self: {
        ];
        description = "Wrapper for the XING API, v1";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xinput-conduit" = callPackage
@@ -259025,6 +275819,8 @@ self: {
        benchmarkHaskellDepends = [ base random time vector ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
@@ -259044,6 +275840,8 @@ self: {
        ];
        description = "Downloads the most recent xkcd comic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xleb" = callPackage
@@ -259059,6 +275857,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl xml ];
        description = "A simple monadic language for parsing XML structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xls" = callPackage
@@ -259080,6 +275880,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xlsior" = callPackage
@@ -259103,6 +275905,8 @@ self: {
        ];
        description = "Streaming Excel file generation and parsing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xlsx" = callPackage
@@ -259131,6 +275935,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xlsx-tabular" = callPackage
@@ -259147,6 +275953,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Xlsx table cell value extraction utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xlsx-templater" = callPackage
@@ -259165,6 +275973,8 @@ self: {
        ];
        description = "Simple and incomplete Excel file templater";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml" = callPackage
@@ -259210,6 +276020,8 @@ self: {
        ];
        description = "Parse XML catalog files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-conduit_1_8_0_1" = callPackage
@@ -259276,6 +276088,8 @@ self: {
        ];
        description = "Historical cursors & decoding on top of xml-conduit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-conduit-parse" = callPackage
@@ -259318,6 +276132,8 @@ self: {
        ];
        description = "Bridge between xml-conduit/html-conduit and stylist";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-conduit-writer" = callPackage
@@ -259357,6 +276173,8 @@ self: {
        ];
        description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-enumerator-combinators" = callPackage
@@ -259374,6 +276192,8 @@ self: {
        ];
        description = "Parser combinators for xml-enumerator and compatible XML parsers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-extractors" = callPackage
@@ -259385,6 +276205,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers xml ];
        description = "Extension to the xml package to extract data from parsed xml";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-hamlet" = callPackage
@@ -259434,6 +276256,8 @@ self: {
        ];
        description = "Optics for xml-conduit and html-conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-html-qq" = callPackage
@@ -259529,6 +276353,8 @@ self: {
        ];
        description = "Monadic extensions to the xml package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-parsec" = callPackage
@@ -259540,6 +276366,8 @@ self: {
        libraryHaskellDepends = [ base HaXml parsec ];
        description = "Parsing XML with Parsec";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-picklers" = callPackage
@@ -259568,6 +276396,8 @@ self: {
        libraryHaskellDepends = [ base bytestring papillon simple-pipe ];
        description = "XML parser which uses simple-pipe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-prettify" = callPackage
@@ -259582,6 +276412,8 @@ self: {
        executableHaskellDepends = [ base cmdargs unix ];
        description = "Pretty print XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-push" = callPackage
@@ -259602,6 +276434,8 @@ self: {
        ];
        description = "Push XML from/to client to/from server over XMPP or HTTP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-query" = callPackage
@@ -259613,6 +276447,8 @@ self: {
        libraryHaskellDepends = [ base-prelude free text ];
        description = "A parser-agnostic declarative API for querying XML-documents";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-query-xml-conduit" = callPackage
@@ -259629,6 +276465,8 @@ self: {
        ];
        description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-query-xml-types" = callPackage
@@ -259652,6 +276490,8 @@ self: {
        ];
        description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-to-json" = callPackage
@@ -259708,6 +276548,8 @@ self: {
        ];
        description = "Typed XML encoding for an xml-conduit backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-tydom-core" = callPackage
@@ -259719,6 +276561,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl QuickCheck text ];
        description = "Typed XML encoding (core library)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-types" = callPackage
@@ -259770,6 +276614,8 @@ self: {
        ];
        description = "translate xml to json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml2x" = callPackage
@@ -259788,6 +276634,8 @@ self: {
        ];
        description = "Convert BLAST output in XML format to CSV or HTML";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmlbf" = callPackage
@@ -259919,6 +276767,8 @@ self: {
        ];
        description = "Show tv channels in the terminal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmms2-client" = callPackage
@@ -259935,6 +276785,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmms2-client-glib" = callPackage
@@ -259947,6 +276799,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library — GLib integration";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmobar" = callPackage
@@ -260040,6 +276894,8 @@ self: {
        ];
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmonad-contrib" = callPackage
@@ -260078,6 +276934,8 @@ self: {
        ];
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmonad-contrib-gpl" = callPackage
@@ -260089,6 +276947,8 @@ self: {
        libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ];
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmonad-dbus" = callPackage
@@ -260103,6 +276963,8 @@ self: {
        executableHaskellDepends = [ base dbus utf8-string ];
        testHaskellDepends = [ base dbus utf8-string ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmonad-entryhelper" = callPackage
@@ -260135,6 +276997,8 @@ self: {
        ];
        description = "Module for evaluation Haskell expressions in the running xmonad instance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmonad-extras" = callPackage
@@ -260212,6 +277076,8 @@ self: {
        testHaskellDepends = [ base hspec xmonad ];
        description = "Custom xmonad, which builds with stack or cabal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmonad-volume" = callPackage
@@ -260257,6 +277123,8 @@ self: {
        ];
        description = "A library to automatically put named windows into the DynamicLog";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmpipe" = callPackage
@@ -260273,6 +277141,8 @@ self: {
        ];
        description = "XMPP implementation using simple-PIPE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xor" = callPackage
@@ -260293,6 +277163,8 @@ self: {
        ];
        description = "Efficient XOR masking";
        license = stdenv.lib.licenses.gpl2Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xorshift" = callPackage
@@ -260322,6 +277194,8 @@ self: {
        ];
        description = "Simple implementation of xorshift+ PRNG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xosd" = callPackage
@@ -260351,6 +277225,8 @@ self: {
        ];
        description = "text builder for xournal file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xournal-convert" = callPackage
@@ -260372,6 +277248,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "convert utility for xoj files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xournal-parser" = callPackage
@@ -260391,6 +277269,8 @@ self: {
        ];
        description = "Xournal file parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xournal-render" = callPackage
@@ -260408,6 +277288,8 @@ self: {
        ];
        description = "Xournal file renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xournal-types" = callPackage
@@ -260425,6 +277307,8 @@ self: {
        ];
        description = "Data types for programs for xournal file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xpathdsv" = callPackage
@@ -260484,6 +277368,8 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xsact" = callPackage
@@ -260501,6 +277387,8 @@ self: {
        ];
        description = "Cluster EST sequences";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xsd" = callPackage
@@ -260517,6 +277405,8 @@ self: {
        ];
        description = "XML Schema data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xsha1" = callPackage
@@ -260540,6 +277430,8 @@ self: {
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {xslt = null;};
 
   "xss-sanitize" = callPackage
@@ -260572,6 +277464,8 @@ self: {
        libraryHaskellDepends = [ base wx wxcore ];
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xtest" = callPackage
@@ -260616,6 +277510,8 @@ self: {
        ];
        description = "A Haskell implementation of the xxHash algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xxhash-ffi" = callPackage
@@ -260652,6 +277548,8 @@ self: {
        ];
        description = "#plaimi's all-encompassing bot";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yabi" = callPackage
@@ -260685,6 +277583,8 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Yet Another Brainfuck Interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yackage" = callPackage
@@ -260708,6 +277608,8 @@ self: {
        ];
        description = "Personal Hackage replacement for testing new packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yahoo-finance-api" = callPackage
@@ -260729,6 +277631,8 @@ self: {
        ];
        description = "Read quotes from Yahoo Finance API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yahoo-finance-conduit" = callPackage
@@ -260744,6 +277648,8 @@ self: {
        ];
        description = "Streaming aproach to the yahoo finance api";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yahoo-web-search" = callPackage
@@ -260755,6 +277661,8 @@ self: {
        libraryHaskellDepends = [ base HTTP network xml ];
        description = "Yahoo Web Search Services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yajl" = callPackage
@@ -260768,6 +277676,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) yajl;};
 
   "yajl-enumerator" = callPackage
@@ -260783,6 +277693,8 @@ self: {
        ];
        description = "Enumerator-based interface to YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yak" = callPackage
@@ -260810,6 +277722,8 @@ self: {
        libraryHaskellDepends = [ base categories transformers ];
        description = "Lenses with a southern twang";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam" = callPackage
@@ -260843,6 +277757,8 @@ self: {
        ];
        description = "A wrapper of servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-app" = callPackage
@@ -260882,6 +277798,8 @@ self: {
        ];
        description = "Yam Configuation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-datasource" = callPackage
@@ -260899,6 +277817,8 @@ self: {
        ];
        description = "Yam DataSource Middleware";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-job" = callPackage
@@ -260924,6 +277844,8 @@ self: {
        ];
        description = "Yam Logger";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-redis" = callPackage
@@ -260940,6 +277862,8 @@ self: {
        ];
        description = "Yam Redis Middleware";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-servant" = callPackage
@@ -260956,6 +277880,8 @@ self: {
          servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-transaction" = callPackage
@@ -260976,6 +277902,8 @@ self: {
        ];
        description = "Yam transaction";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-transaction-odbc" = callPackage
@@ -260988,6 +277916,8 @@ self: {
          base containers persistent-odbc yam-app
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-transaction-postgresql" = callPackage
@@ -261031,6 +277961,8 @@ self: {
        ];
        description = "Yam Web";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yamemo" = callPackage
@@ -261150,6 +278082,8 @@ self: {
        testHaskellDepends = [ base hspec microlens-platform rio ];
        description = "Extra functionality for pretty printing Yaml documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaml-rpc" = callPackage
@@ -261168,6 +278102,8 @@ self: {
        ];
        description = "Simple library for network (HTTP REST-like) YAML RPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaml-rpc-scotty" = callPackage
@@ -261184,6 +278120,8 @@ self: {
        ];
        description = "Scotty server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaml-rpc-snap" = callPackage
@@ -261200,6 +278138,8 @@ self: {
        ];
        description = "Snap server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaml-union" = callPackage
@@ -261253,6 +278193,8 @@ self: {
        ];
        description = "Flexible declarative YAML parsing toolkit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaml2owl" = callPackage
@@ -261348,6 +278290,8 @@ self: {
        ];
        description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yampa-gloss" = callPackage
@@ -261361,6 +278305,8 @@ self: {
        libraryHaskellDepends = [ base gloss Yampa ];
        description = "A GLOSS backend for Yampa";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yampa-glut" = callPackage
@@ -261378,6 +278324,8 @@ self: {
        ];
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yampa-sdl2" = callPackage
@@ -261396,6 +278344,8 @@ self: {
        ];
        description = "Yampa and SDL2 made easy";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yampa-test" = callPackage
@@ -261414,6 +278364,8 @@ self: {
        ];
        description = "Testing library for Yampa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yampa2048" = callPackage
@@ -261427,6 +278379,8 @@ self: {
        executableHaskellDepends = [ base gloss random Yampa ];
        description = "2048 game clone using Yampa/Gloss";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yandex-translate" = callPackage
@@ -261444,6 +278398,8 @@ self: {
        ];
        description = "Bindings to Yandex translate API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaop" = callPackage
@@ -261457,6 +278413,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Yet another option parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yap" = callPackage
@@ -261468,6 +278426,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "yet another prelude - a simplistic refactoring with algebraic classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yapb" = callPackage
@@ -261508,6 +278468,8 @@ self: {
        ];
        description = "Represent and parse yarn.lock files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yarn2nix" = callPackage
@@ -261561,6 +278523,8 @@ self: {
        ];
        description = "Yet another array library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yarr-image-io" = callPackage
@@ -261573,6 +278537,8 @@ self: {
        librarySystemDepends = [ libdevil ];
        description = "Image IO for Yarr library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "yate" = callPackage
@@ -261611,6 +278577,8 @@ self: {
        executableHaskellDepends = [ base Cabal directory process ];
        description = "yet another visual editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaya" = callPackage
@@ -261657,6 +278625,8 @@ self: {
        ];
        description = "Test suites for `yaya`";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaya-unsafe" = callPackage
@@ -261688,6 +278658,8 @@ self: {
        ];
        description = "Test suites for `yaya-unsafe`";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ycextra" = callPackage
@@ -261702,6 +278674,8 @@ self: {
        ];
        description = "Additional utilities to work with Yhc Core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yeamer" = callPackage
@@ -261739,6 +278713,8 @@ self: {
        ];
        description = "Yesod-based server for interactive presentation slides";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yeganesh" = callPackage
@@ -261782,6 +278758,8 @@ self: {
        ];
        description = "A Yeller Client For Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yes-precure5-command" = callPackage
@@ -261814,6 +278792,8 @@ self: {
        libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ];
        description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yeshql-core" = callPackage
@@ -261853,6 +278833,8 @@ self: {
        ];
        description = "YesQL-style SQL database abstraction (HDBC backend)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yeshql-postgresql-simple" = callPackage
@@ -261874,6 +278856,8 @@ self: {
        ];
        description = "YesQL-style SQL database abstraction (postgresql-simple backend)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod" = callPackage
@@ -261926,6 +278910,8 @@ self: {
        ];
        description = "Angular JS integratoin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-angular-ui" = callPackage
@@ -261945,6 +278931,8 @@ self: {
        ];
        description = "Angular Helpers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-articles" = callPackage
@@ -261967,6 +278955,8 @@ self: {
        ];
        description = "Automatically generate article previews for a yesod site";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth" = callPackage
@@ -262017,6 +279007,8 @@ self: {
        ];
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-account-fork" = callPackage
@@ -262041,6 +279033,8 @@ self: {
        ];
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-basic" = callPackage
@@ -262074,6 +279068,8 @@ self: {
        ];
        description = "BCrypt salted and hashed passwords in a database as auth for yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-bcryptdb" = callPackage
@@ -262090,6 +279086,8 @@ self: {
        ];
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-deskcom" = callPackage
@@ -262111,6 +279109,8 @@ self: {
        ];
        description = "Desk.com remote authentication support for Yesod apps.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-fb" = callPackage
@@ -262171,6 +279171,8 @@ self: {
        ];
        description = "An account authentication plugin for yesod with encrypted token transfer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-kerberos" = callPackage
@@ -262188,6 +279190,8 @@ self: {
        ];
        description = "Kerberos Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-ldap" = callPackage
@@ -262204,6 +279208,8 @@ self: {
        ];
        description = "LDAP Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-ldap-mediocre" = callPackage
@@ -262219,6 +279225,8 @@ self: {
        ];
        description = "Very simlple LDAP auth for yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-ldap-native" = callPackage
@@ -262236,6 +279244,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Yesod LDAP authentication plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-lti13" = callPackage
@@ -262258,6 +279268,8 @@ self: {
        ];
        description = "A yesod-auth plugin for LTI 1.3";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-nopassword" = callPackage
@@ -262274,6 +279286,8 @@ self: {
        ];
        description = "A plugin for Yesod to provide email-only authentication";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-oauth" = callPackage
@@ -262312,6 +279326,8 @@ self: {
        testHaskellDepends = [ base hspec uri-bytestring ];
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-pam" = callPackage
@@ -262327,6 +279343,8 @@ self: {
        ];
        description = "Provides PAM authentication module";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-smbclient" = callPackage
@@ -262343,6 +279361,8 @@ self: {
        ];
        description = "Authentication plugin for Yesod using smbclient";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-zendesk" = callPackage
@@ -262361,6 +279381,8 @@ self: {
        ];
        description = "Zendesk remote authentication support for Yesod apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-bin" = callPackage
@@ -262404,6 +279426,8 @@ self: {
        ];
        description = "Bootstrap widgets for yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-colonnade" = callPackage
@@ -262422,6 +279446,8 @@ self: {
        ];
        description = "Helper functions for using yesod with colonnade";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-comments" = callPackage
@@ -262440,6 +279466,8 @@ self: {
        ];
        description = "A generic comments interface for a Yesod application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-content-pdf" = callPackage
@@ -262461,6 +279489,8 @@ self: {
        ];
        description = "PDF Content Type for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-continuations" = callPackage
@@ -262479,6 +279509,8 @@ self: {
        ];
        description = "Continuations for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-core" = callPackage
@@ -262571,6 +279603,8 @@ self: {
        ];
        description = "Generic administrative CRUD operations as a Yesod subsite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-crud-persist" = callPackage
@@ -262589,6 +279623,8 @@ self: {
        ];
        description = "Flexible CRUD subsite usable with Yesod and Persistent";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-csp" = callPackage
@@ -262636,6 +279672,8 @@ self: {
        ];
        description = "Yesod plugin for DataTables (jQuery grid plugin)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-default" = callPackage
@@ -262673,6 +279711,8 @@ self: {
        ];
        description = "DSL for generating Yesod subsite to manage an RDBMS;";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-elements" = callPackage
@@ -262724,6 +279764,8 @@ self: {
        executableSystemDepends = [ sqlite ];
        description = "Example programs using the Yesod Web Framework. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "yesod-fast-devel" = callPackage
@@ -262745,6 +279787,8 @@ self: {
        ];
        description = "Fast live-reloading for yesod applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-fay" = callPackage
@@ -262764,6 +279808,8 @@ self: {
        ];
        description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-fb" = callPackage
@@ -262801,6 +279847,8 @@ self: {
        ];
        description = "Automatic filter generator for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-form" = callPackage
@@ -262909,6 +279957,8 @@ self: {
        ];
        description = "Various rich-text WYSIWYG editors for Yesod forms";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-gitrepo" = callPackage
@@ -262940,6 +279990,8 @@ self: {
        testHaskellDepends = [ base yesod-core ];
        description = "A subsite for displaying git information";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-goodies" = callPackage
@@ -262956,6 +280008,8 @@ self: {
        ];
        description = "A collection of various small helpers useful in any yesod application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-ip" = callPackage
@@ -262974,6 +280028,8 @@ self: {
        ];
        description = "Code for using the ip package with yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-job-queue" = callPackage
@@ -262995,6 +280051,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Background jobs library for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-json" = callPackage
@@ -263017,6 +280075,8 @@ self: {
        libraryHaskellDepends = [ base text yesod-core ];
        description = "A typeclass which simplifies creating link widgets throughout your site";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-lucid" = callPackage
@@ -263028,6 +280088,8 @@ self: {
        libraryHaskellDepends = [ base lucid monads-tf text yesod-core ];
        description = "Lucid support for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-mangopay" = callPackage
@@ -263047,6 +280109,8 @@ self: {
        ];
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-markdown" = callPackage
@@ -263065,6 +280129,8 @@ self: {
        testHaskellDepends = [ base blaze-html hspec text ];
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-media-simple" = callPackage
@@ -263081,6 +280147,8 @@ self: {
        ];
        description = "Simple display of media types, served by yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-newsfeed" = callPackage
@@ -263132,6 +280200,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell yesod ];
        description = "Pagination for Yesod sites";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-pagination" = callPackage
@@ -263150,6 +280220,8 @@ self: {
        ];
        description = "Pagination in Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-paginator" = callPackage
@@ -263186,6 +280258,8 @@ self: {
        ];
        description = "Yesod plugin to use PayPal with the paypal-rest-client library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-persistent" = callPackage
@@ -263276,6 +280350,8 @@ self: {
        ];
        description = "Meta package for Yesod (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-pnotify" = callPackage
@@ -263296,6 +280372,8 @@ self: {
        ];
        description = "Yet another getMessage/setMessage using pnotify jquery plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-pure" = callPackage
@@ -263307,6 +280385,8 @@ self: {
        libraryHaskellDepends = [ base fast-logger text yesod yesod-core ];
        description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-purescript" = callPackage
@@ -263326,6 +280406,8 @@ self: {
        ];
        description = "PureScript integration for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-raml" = callPackage
@@ -263349,6 +280431,8 @@ self: {
        ];
        description = "RAML style route definitions for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-raml-bin" = callPackage
@@ -263371,6 +280455,8 @@ self: {
        ];
        description = "The raml helper executable";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-raml-docs" = callPackage
@@ -263387,6 +280473,8 @@ self: {
        ];
        description = "A html documentation generator library for RAML";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-raml-mock" = callPackage
@@ -263410,6 +280498,8 @@ self: {
        ];
        description = "A mock-handler generator library from RAML";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-recaptcha" = callPackage
@@ -263428,6 +280518,8 @@ self: {
        ];
        description = "Dead simple support for reCAPTCHA on Yesod applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-recaptcha2" = callPackage
@@ -263464,6 +280556,8 @@ self: {
        ];
        description = "Efficient routing for Yesod. (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-routes-flow" = callPackage
@@ -263480,6 +280574,8 @@ self: {
        ];
        description = "Generate Flow routes for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-routes-typescript" = callPackage
@@ -263496,6 +280592,8 @@ self: {
        ];
        description = "generate TypeScript routes for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-rst" = callPackage
@@ -263512,6 +280610,8 @@ self: {
        ];
        description = "Tools for using reStructuredText (RST) in a yesod application";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-s3" = callPackage
@@ -263528,6 +280628,8 @@ self: {
        ];
        description = "Simple Helper Library for using Amazon's Simple Storage Service (S3) with Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-sass" = callPackage
@@ -263544,6 +280646,8 @@ self: {
        ];
        description = "A simple quasiquoter to include sass code in yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-session-redis" = callPackage
@@ -263561,6 +280665,8 @@ self: {
        ];
        description = "Redis-Powered Sessions for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-sitemap" = callPackage
@@ -263635,6 +280741,8 @@ self: {
        ];
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-static-remote" = callPackage
@@ -263651,6 +280759,8 @@ self: {
        ];
        testHaskellDepends = [ base yesod-static ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-table" = callPackage
@@ -263721,6 +280831,8 @@ self: {
        ];
        description = "Utility functions for testing JSON web services written in Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-text-markdown" = callPackage
@@ -263753,6 +280865,8 @@ self: {
        ];
        description = "Provides main functions using warp-tls for yesod projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-transloadit" = callPackage
@@ -263797,6 +280911,8 @@ self: {
        ];
        description = "Simple CRUD classes for easy view creation for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-websockets" = callPackage
@@ -263844,6 +280960,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yet-another-logger" = callPackage
@@ -263890,6 +281008,8 @@ self: {
        testHaskellDepends = [ base cryptonite hspec QuickCheck ];
        description = "Executable specifications of composable cryptographic protocols";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yhccore" = callPackage
@@ -263901,6 +281021,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl pretty uniplate ];
        description = "Yhc's Internal Core language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yhseq" = callPackage
@@ -263919,6 +281041,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Calculation of YH sequence system";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi" = callPackage
@@ -263929,8 +281053,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.18.0";
-       sha256 = "0phfsirbl22av19622m1zh45khgyypbpvd8mqhcjf2zjwniyqv7y";
+       version = "0.19.0";
+       sha256 = "1m383r5gx3r9l0mh88gcv3rjnr1ig9rivwg2qz963xqjyhr8y2ni";
        configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = false;
        isExecutable = true;
@@ -263941,6 +281065,8 @@ self: {
        ];
        description = "Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-contrib" = callPackage
@@ -263959,6 +281085,8 @@ self: {
        ];
        description = "Add-ons to Yi, the Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-core" = callPackage
@@ -263989,6 +281117,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq yi-rope ];
        description = "Yi editor core library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-dynamic-configuration" = callPackage
@@ -263997,14 +281127,16 @@ self: {
      }:
      mkDerivation {
        pname = "yi-dynamic-configuration";
-       version = "0.18.0";
-       sha256 = "0b38apg4c4vkp1njgai446q1gqx8514fj4lh1pprck99m3xvqlck";
+       version = "0.19.1";
+       sha256 = "17y8wpg128c90274fik7bc4x0vw2p7762fgiaydlr0vpz2sgwcis";
        libraryHaskellDepends = [
          base data-default dyre microlens-platform mtl text
          transformers-base yi-core yi-rope
        ];
        description = "Dynamic configuration support for Yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-emacs-colours" = callPackage
@@ -264016,6 +281148,8 @@ self: {
        libraryHaskellDepends = [ base containers split yi-language ];
        description = "Simple mapping from colour names used in emacs to Color";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-frontend-pango" = callPackage
@@ -264025,8 +281159,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-pango";
-       version = "0.18.0";
-       sha256 = "1qxs8lnsihslgiswy0aw5b98qyc5q8pzs3ib3kfsm8m7b3crjc62";
+       version = "0.19.1";
+       sha256 = "1ijvgxfbwnfpij3qajsci8hllb8n1p3iwd2n1wcp029kwpjhgzk9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers filepath glib gtk microlens-platform mtl
@@ -264035,6 +281169,8 @@ self: {
        ];
        description = "Pango frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-frontend-vty" = callPackage
@@ -264044,14 +281180,16 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-vty";
-       version = "0.18.0";
-       sha256 = "1x762qbygr75rlkyln329agx0ppjcylgcvfsmmybg8avxq3c712q";
+       version = "0.19.0";
+       sha256 = "1vdpfqmvig16jissmra1p9zc42fs4kf2bxspy23bf8mihfr99ays";
        libraryHaskellDepends = [
          base containers data-default dlist microlens-platform pointedlist
          stm text vty yi-core yi-language yi-rope
        ];
        description = "Vty frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-fuzzy-open" = callPackage
@@ -264061,8 +281199,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-fuzzy-open";
-       version = "0.18.0";
-       sha256 = "17g6902dz55iw4kjy6bc5rqv4g6i5q5ffxkwplxmxjc66pyqv2q4";
+       version = "0.19.0";
+       sha256 = "14wfw3l167j7ld21cdjrnm3865h91vlcsgswxin5phd5m93bkzdg";
        libraryHaskellDepends = [
          base binary containers data-default directory filepath mtl
          pointedlist text transformers-base vector yi-core yi-language
@@ -264070,6 +281208,8 @@ self: {
        ];
        description = "Fuzzy open plugin for yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-gtk" = callPackage
@@ -264089,14 +281229,16 @@ self: {
      }:
      mkDerivation {
        pname = "yi-ireader";
-       version = "0.18.0";
-       sha256 = "0vxkg98fk1sr9778946yj6lg96fgn6ww7zqh7fhm7ld1fm3g2zrw";
+       version = "0.19.0";
+       sha256 = "1wax9mnlp8sd032nbpli6zfxz8cbrx01aj1mmm7g178dxsbj8q79";
        libraryHaskellDepends = [
          base binary bytestring containers data-default microlens-platform
          text yi-core yi-language yi-rope
        ];
        description = "Yi editor incremental reader";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-keymap-cua" = callPackage
@@ -264105,13 +281247,15 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-cua";
-       version = "0.18.0";
-       sha256 = "1j9wsjn572gysagf2h6xfir3chbha7vjmsiqljlnbvzhk0dc3n9f";
+       version = "0.19.0";
+       sha256 = "18qimrz5iffh2x6fv09fhg9n0zg1hliyvwlvpa7008msk9c5nc0r";
        libraryHaskellDepends = [
          base microlens-platform text yi-core yi-keymap-emacs yi-rope
        ];
        description = "Cua keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-keymap-emacs" = callPackage
@@ -264121,14 +281265,16 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-emacs";
-       version = "0.18.0";
-       sha256 = "0r8bqbsfzkpc7nlxsk4k20shc0393f3f7czf47i5ilajh8da7cbg";
+       version = "0.19.0";
+       sha256 = "1pkdlkhs6am60whclfasd4axda8hlxzh7q38crmylcb89q90am1l";
        libraryHaskellDepends = [
          base containers filepath Hclip microlens-platform mtl oo-prototypes
          text transformers-base yi-core yi-language yi-misc-modes yi-rope
        ];
        description = "Emacs keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-keymap-vim" = callPackage
@@ -264140,8 +281286,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-vim";
-       version = "0.18.0";
-       sha256 = "1z9wq3yjv6nrf45q2711ywycc6vpmb4zzylz3mrhpsscglws78ig";
+       version = "0.19.0";
+       sha256 = "046552bqfd3wycx73zksffcnbakfl7xnfz1s2q9z5affpzi5iyrv";
        libraryHaskellDepends = [
          attoparsec base binary containers data-default directory filepath
          Hclip microlens-platform mtl oo-prototypes pointedlist safe text
@@ -264155,6 +281301,8 @@ self: {
        ];
        description = "Vim keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-language" = callPackage
@@ -264182,6 +281330,8 @@ self: {
        ];
        description = "Collection of language-related Yi libraries";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-misc-modes" = callPackage
@@ -264190,8 +281340,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-misc-modes";
-       version = "0.18.0";
-       sha256 = "1b7x5595chmyx614z86gplb5pxza2ipifrgzpssgxrwwbf0730cb";
+       version = "0.19.0";
+       sha256 = "1g65mfafrq5dzcrcapisvyvs5frwjmy50zfkxrv0wfsdcfapkn7s";
        libraryHaskellDepends = [
          array base binary data-default filepath microlens-platform text
          yi-core yi-language yi-rope
@@ -264199,6 +281349,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor miscellaneous modes";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-mode-haskell" = callPackage
@@ -264207,8 +281359,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-mode-haskell";
-       version = "0.18.0";
-       sha256 = "1k71vw0chbgjl2iy4jif12mbq4850f7zffsjbi4gvsjvwvyxmxs6";
+       version = "0.19.0";
+       sha256 = "1hnwxqzaqg7zyfr7rd3l0la5hc8f4px4d0y78kq3xpy4pzx3yr8y";
        libraryHaskellDepends = [
          array base binary data-default filepath microlens-platform text
          yi-core yi-language yi-rope
@@ -264216,6 +281368,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor haskell mode";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-mode-javascript" = callPackage
@@ -264225,8 +281379,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-mode-javascript";
-       version = "0.18.0";
-       sha256 = "12r0knyh0kys8xw028niah9dvcjhzfad9hpln4hgmj83483gpykv";
+       version = "0.19.0";
+       sha256 = "1zgx36kagalna8lk60i0djn6mvl6ki55x4kc7mzq2mgzcs292zq1";
        libraryHaskellDepends = [
          array base binary data-default dlist filepath microlens-platform
          mtl text yi-core yi-language yi-rope
@@ -264234,6 +281388,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor javascript mode";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-monokai" = callPackage
@@ -264245,6 +281401,8 @@ self: {
        libraryHaskellDepends = [ base yi ];
        description = "Monokai colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-rope" = callPackage
@@ -264273,8 +281431,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-snippet";
-       version = "0.18.0";
-       sha256 = "1arf5pirl2pbdigsfaac7h473bjivhgkpfqbs8j35kk8p34qjl8s";
+       version = "0.19.0";
+       sha256 = "1yw113vws935124zrnndf8xb1442q3l4pg1yk3sgphdck7cb0q2c";
        libraryHaskellDepends = [
          base binary containers data-default free microlens-platform mtl
          text vector yi-core yi-rope
@@ -264284,6 +281442,8 @@ self: {
        ];
        description = "Snippet support for yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-solarized" = callPackage
@@ -264295,6 +281455,8 @@ self: {
        libraryHaskellDepends = [ base yi ];
        description = "Solarized colour theme for the Yi text editor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-spolsky" = callPackage
@@ -264306,6 +281468,8 @@ self: {
        libraryHaskellDepends = [ base yi ];
        description = "Spolsky colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-vty" = callPackage
@@ -264329,6 +281493,8 @@ self: {
        libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yices-easy" = callPackage
@@ -264401,6 +281567,8 @@ self: {
        executableHaskellDepends = [ hsConfigure ];
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yjftp-libs" = callPackage
@@ -264414,6 +281582,8 @@ self: {
        libraryHaskellDepends = [ base directory ftphs mtl process unix ];
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yjsvg" = callPackage
@@ -264465,6 +281635,8 @@ self: {
        libraryHaskellDepends = [ base free mtl ];
        description = "A truly tiny monadic parsing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yoda" = callPackage
@@ -264476,6 +281648,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Parser combinators for young padawans";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yoga" = callPackage
@@ -264508,6 +281682,8 @@ self: {
        ];
        description = "Generic Programming with Disbanded Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "york-lava" = callPackage
@@ -264519,6 +281695,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 ];
        description = "A library for digital circuit description";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "youtube" = callPackage
@@ -264559,6 +281737,8 @@ self: {
        ];
        description = "A YQL engine to execute Open Data Tables";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yst" = callPackage
@@ -264581,6 +281761,8 @@ self: {
        ];
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yu-auth" = callPackage
@@ -264595,6 +281777,8 @@ self: {
        testHaskellDepends = [ base MonadRandom random yu-utils ];
        description = "Auth module for Yu";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yu-core" = callPackage
@@ -264607,6 +281791,8 @@ self: {
        testHaskellDepends = [ base blaze-markup hspec yu-utils ];
        description = "The core of Yu";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yu-launch" = callPackage
@@ -264622,6 +281808,8 @@ self: {
        ];
        description = "The launcher for Yu";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yu-tool" = callPackage
@@ -264639,6 +281827,8 @@ self: {
        ];
        description = "Tool for Yu";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yu-utils" = callPackage
@@ -264662,6 +281852,8 @@ self: {
        ];
        description = "Utils for Yu";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yuiGrid" = callPackage
@@ -264697,6 +281889,8 @@ self: {
        ];
        description = "A transcendental HTML parser gently wrapping the HXT library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yx" = callPackage
@@ -264747,6 +281941,8 @@ self: {
        ];
        description = "Utilities for reading and writing Alteryx .yxdb files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "z3" = callPackage
@@ -264776,6 +281972,8 @@ self: {
        testHaskellDepends = [ base containers hspec z3 ];
        description = "High-level assertion encoding to Z3 solver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "z85" = callPackage
@@ -264799,6 +281997,8 @@ self: {
        ];
        description = "Implementation of the z85 binary codec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zabt" = callPackage
@@ -264811,6 +282011,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Simple-minded abstract binding trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zalgo" = callPackage
@@ -264840,6 +282042,8 @@ self: {
        ];
        description = "A tool for checking how much work is done on group projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zasni-gerna" = callPackage
@@ -264851,6 +282055,8 @@ self: {
        libraryHaskellDepends = [ base papillon ];
        description = "lojban parser (zasni gerna)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zbar" = callPackage
@@ -264864,6 +282070,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "zbar bindings in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zbar;};
 
   "zcache" = callPackage
@@ -264958,6 +282166,8 @@ self: {
        ];
        description = "Zendesk API for Haskell programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zenhack-prelude" = callPackage
@@ -264971,6 +282181,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "@zenhack's personal custom prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeno" = callPackage
@@ -264990,6 +282202,8 @@ self: {
        ];
        description = "An automated proof system for Haskell programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeolite-lang" = callPackage
@@ -265046,6 +282260,8 @@ self: {
        testToolDepends = [ purescript ];
        description = "Zephyr, tree-shaking for the PureScript language";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zero" = callPackage
@@ -265078,6 +282294,8 @@ self: {
        ];
        description = "Post to 0bin services";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeromq-haskell" = callPackage
@@ -265096,6 +282314,8 @@ self: {
        ];
        description = "Bindings to ZeroMQ 2.1.x";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq3-conduit" = callPackage
@@ -265112,6 +282332,8 @@ self: {
        ];
        description = "Conduit bindings for zeromq3-haskell";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeromq3-haskell" = callPackage
@@ -265134,6 +282356,8 @@ self: {
        ];
        description = "Bindings to ZeroMQ 3.x";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq4-clone-pattern" = callPackage
@@ -265160,6 +282384,8 @@ self: {
        ];
        description = "Haskell implementation of the ZeroMQ clone pattern";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeromq4-conduit" = callPackage
@@ -265178,6 +282404,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Conduit wrapper around zeromq4-haskell";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeromq4-haskell" = callPackage
@@ -265260,6 +282488,8 @@ self: {
        ];
        description = "ZeroTH - remove unnecessary TH dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zettelkast" = callPackage
@@ -265284,6 +282514,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Command-line utility for working with zettelkast files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter" = callPackage
@@ -265307,6 +282539,8 @@ self: {
        ];
        description = "zifter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter-cabal" = callPackage
@@ -265322,6 +282556,8 @@ self: {
        ];
        description = "zifter-cabal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter-git" = callPackage
@@ -265333,6 +282569,8 @@ self: {
        libraryHaskellDepends = [ base path process zifter ];
        description = "zifter-git";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter-google-java-format" = callPackage
@@ -265348,6 +282586,8 @@ self: {
        ];
        description = "zifter-google-java-format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter-hindent" = callPackage
@@ -265363,6 +282603,8 @@ self: {
        ];
        description = "zifter-hindent";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter-hlint" = callPackage
@@ -265377,6 +282619,8 @@ self: {
        ];
        description = "zifter-hlint";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter-stack" = callPackage
@@ -265396,6 +282640,8 @@ self: {
        ];
        description = "zifter-stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zigbee-znet25" = callPackage
@@ -265412,6 +282658,8 @@ self: {
        testHaskellDepends = [ base bytestring mtl QuickCheck random ];
        description = "XBee ZNet 2.5 (ZigBee) wireless modem communications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zim-parser" = callPackage
@@ -265554,6 +282802,8 @@ self: {
        ];
        description = "Working with zip archives via conduits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zip-stream" = callPackage
@@ -265590,6 +282840,8 @@ self: {
        libraryHaskellDepends = [ base directory mtl process ];
        description = "Create simple list editor interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zipkin" = callPackage
@@ -265605,6 +282857,8 @@ self: {
        ];
        description = "Zipkin-style request tracing monad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zipper" = callPackage
@@ -265616,6 +282870,8 @@ self: {
        libraryHaskellDepends = [ base multirec ];
        description = "Generic zipper for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zipper-extra" = callPackage
@@ -265661,6 +282917,8 @@ self: {
        libraryHaskellDepends = [ base mtl yall ];
        description = "A simple lens-based, generic, heterogenous, type-checked zipper library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ziptastic-client" = callPackage
@@ -265682,6 +282940,8 @@ self: {
        ];
        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;
+       broken = true;
      }) {};
 
   "ziptastic-core" = callPackage
@@ -265701,6 +282961,8 @@ self: {
        ];
        description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zlib" = callPackage
@@ -265761,6 +283023,8 @@ self: {
        ];
        description = "Enumerator interface for zlib compression";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zlib-lens" = callPackage
@@ -265794,6 +283058,8 @@ self: {
        ];
        description = "Language independent, reproducible, absolute types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zmcat" = callPackage
@@ -265808,6 +283074,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Command-line tool for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zmidi-core" = callPackage
@@ -265836,6 +283104,8 @@ self: {
        ];
        description = "Representing MIDI a simple score";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zmqat" = callPackage
@@ -265865,6 +283135,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "ZoneInfo library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zoom" = callPackage
@@ -265883,6 +283155,8 @@ self: {
        ];
        description = "A rake/thor-like task runner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zoom-cache" = callPackage
@@ -265914,6 +283188,8 @@ self: {
        ];
        description = "A streamable, seekable, zoomable cache file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zoom-cache-pcm" = callPackage
@@ -265930,6 +283206,8 @@ self: {
        ];
        description = "Library for zoom-cache PCM audio codecs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zoom-cache-sndfile" = callPackage
@@ -265949,6 +283227,8 @@ self: {
        ];
        description = "Tools for generating zoom-cache-pcm files";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zoom-refs" = callPackage
@@ -265960,6 +283240,8 @@ self: {
        libraryHaskellDepends = [ base lens stm ];
        description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zot" = callPackage
@@ -266025,6 +283307,8 @@ self: {
        ];
        description = "Zero-Suppressed and Reduced Decision Diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zsh-battery" = callPackage
@@ -266038,6 +283322,8 @@ self: {
        executableHaskellDepends = [ base directory filepath mtl ];
        description = "Ascii bars representing battery status";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zstd" = callPackage
@@ -266072,6 +283358,8 @@ self: {
        testHaskellDepends = [ base containers mtl multiset ];
        description = "Automated theorem prover for the Zsyntax biochemical calculus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ztail" = callPackage
@@ -266113,6 +283401,8 @@ self: {
        ];
        description = "Creating and extracting arbitrary archives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zuramaru" = callPackage
@@ -266151,6 +283441,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A lisp processor, An inline-lisp, in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zxcvbn-c" = callPackage
@@ -266180,6 +283472,8 @@ self: {
        ];
        description = "Password strength estimation based on zxcvbn";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zxcvbn-hs" = callPackage

From e4955d965764090bf419a30b2e84444ea077f533 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Nov 2020 20:52:48 +0100
Subject: [PATCH 3119/3942] hackage2nix: update the list of broken packages

@kiwi, please check the state of glirc. matterhorn, mattermost-api, and mattermost-api-qc.

@roberth, please check hercules-ci-agent, hercules-ci-api-core, and hercules-ci-api-agent.
---
 .../haskell-modules/configuration-hackage2nix.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e39afc0394df..ca1e6b198b8b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2668,10 +2668,6 @@ package-maintainers:
     - streaming-wai
   kiwi:
     - Unique
-    - glirc
-    - matterhorn
-    - mattermost-api
-    - mattermost-api-qc
   psibi:
     - path-pieces
     - persistent
@@ -2682,9 +2678,6 @@ package-maintainers:
     - Agda
   roberth:
     - arion-compose
-    - hercules-ci-agent
-    - hercules-ci-api-core
-    - hercules-ci-api-agent
   cdepillabout:
     - pretty-simple
     - spago
@@ -5514,6 +5507,7 @@ broken-packages:
   - gli
   - glicko
   - glider-nlp
+  - glirc
   - GLMatrix
   - glob-posix
   - global
@@ -6188,6 +6182,9 @@ broken-packages:
   - HERA
   - herbalizer
   - HerbiePlugin
+  - hercules-ci-agent
+  - hercules-ci-api-agent
+  - hercules-ci-api-core
   - heredocs
   - Hermes
   - hermit
@@ -7719,6 +7716,9 @@ broken-packages:
   - matrix-market
   - matrix-sized
   - matsuri
+  - matterhorn
+  - mattermost-api
+  - mattermost-api-qc
   - maude
   - maxent
   - maxent-learner-hw

From c55cdb4a85e20978dc2a5edfedcbb25108381cb4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Nov 2020 20:54:57 +0100
Subject: [PATCH 3120/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-28-gd194902 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/8c0e05f98737e7dadf3698a937e0707d43bd10e4.
---
 .../haskell-modules/hackage-packages.nix      | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 98eb748c57f5..07f6321760f1 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -103539,7 +103539,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
        license = stdenv.lib.licenses.isc;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gll" = callPackage
@@ -123230,7 +123231,8 @@ self: {
        doHaddock = false;
        description = "Runs Continuous Integration tasks on your machines";
        license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ roberth ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;};
 
   "hercules-ci-api-agent" = callPackage
@@ -123261,7 +123263,8 @@ self: {
        ];
        description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise";
        license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ roberth ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hercules-ci-api-core" = callPackage
@@ -123284,7 +123287,8 @@ self: {
        ];
        description = "Types and convenience modules use across Hercules CI API packages";
        license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ roberth ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "here" = callPackage
@@ -167462,7 +167466,8 @@ self: {
        ];
        description = "Terminal client for the Mattermost chat system";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mattermost-api" = callPackage
@@ -167491,7 +167496,8 @@ self: {
        ];
        description = "Client API for Mattermost chat system";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mattermost-api-qc" = callPackage
@@ -167507,7 +167513,8 @@ self: {
        ];
        description = "QuickCheck instances for the Mattermost client API library";
        license = stdenv.lib.licenses.isc;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maude" = callPackage

From fccb704f87b1faaae56413564f4ca5227734a3bc Mon Sep 17 00:00:00 2001
From: Dmitry Ivankov <divanorama@gmail.com>
Date: Wed, 18 Nov 2020 00:57:01 +0100
Subject: [PATCH 3121/3942] mitmproxy: 5.2 -> 5.3.0

Resolves #103992 where test phase was failing due to
openssl 1.1.1g -> 1.1.1h causing test certificate rejection.
Which was fixed in 5.3.0 release.
---
 .../python-modules/mitmproxy/default.nix      | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix
index cb5b5cc80f5b..d22ce7df128a 100644
--- a/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/pkgs/development/python-modules/mitmproxy/default.nix
@@ -37,32 +37,25 @@
 , parver
 , pytest-asyncio
 , hypothesis
+, asgiref
+, msgpack
 }:
 
 buildPythonPackage rec {
   pname = "mitmproxy";
-  version = "5.2";
+  version = "5.3.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner  = pname;
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0ja0aqnfmkvns5qmd51hmrvbw8dnccaks30gxgzgcjgy30rj4brq";
+    sha256 = "04y7fxxssrs14i7zl7fwlwrpnms39i7a6m18481sg8vlrkbagxjr";
   };
 
-  patches = [
-    # Apply patch from upstream to make mitmproxy v5.2 compatible with urwid >v2.1.0
-    (fetchpatch {
-      name = "urwid-lt-2.1.0.patch";
-      url = "https://github.com/mitmproxy/mitmproxy/commit/ea9177217208fdf642ffc54f6b1f6507a199350c.patch";
-      sha256 = "1z5r8izg5nvay01ywl3xc6in1vjfi9f144j057p3k5rzfliv49gg";
-    })
-  ];
-
   postPatch = ''
     # remove dependency constraints
-    sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py
+    sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py
   '';
 
   doCheck = (!stdenv.isDarwin);
@@ -75,6 +68,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     setuptools
     # setup.py
+    asgiref
     blinker
     brotli
     certifi
@@ -85,6 +79,7 @@ buildPythonPackage rec {
     hyperframe
     kaitaistruct
     ldap3
+    msgpack
     passlib
     protobuf
     publicsuffix2

From 36118d4a9dea4b73c4ff88eac90d0c6b2e019bb7 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 19 Nov 2020 21:58:56 +0100
Subject: [PATCH 3122/3942] i3altlayout: init at 0.3

---
 .../window-managers/i3/altlayout.nix          | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/window-managers/i3/altlayout.nix

diff --git a/pkgs/applications/window-managers/i3/altlayout.nix b/pkgs/applications/window-managers/i3/altlayout.nix
new file mode 100644
index 000000000000..973dee3eeed3
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/altlayout.nix
@@ -0,0 +1,21 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "i3altlayout";
+  version = "0.3";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "1h0phf3s6ljffxw0bs73k041wildaz01h37iv5mxhami41wrh4qf";
+  };
+
+  pythonPath = with python3Packages; [ enum-compat i3ipc docopt ];
+
+  meta = with lib; {
+    maintainers = with maintainers; [ magnetophon ];
+    description = "Helps you handle more efficiently your screen real estate in i3wm by auto-splitting windows on their longest side";
+    homepage = "https://github.com/deadc0de6/i3altlayout";
+    license = licenses.gpl3Only;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3b4ebdcb940..72a2740016b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21223,6 +21223,8 @@ in
 
   i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { };
 
+  i3altlayout = callPackage ../applications/window-managers/i3/altlayout.nix { };
+
   i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { };
 
   i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { };

From 0e9ba93148658c3cd224e2cb678c78834e8ddd44 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 19:21:04 +0000
Subject: [PATCH 3123/3942] python37Packages.trimesh: 3.8.12 -> 3.8.13

---
 pkgs/development/python-modules/trimesh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 3afb2de58c31..f5d6efff5e4a 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "3.8.12";
+  version = "3.8.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "932670e753abdec162d1d9c661920db871236de782890ad88577b2af0d824c7f";
+    sha256 = "b31dfd9d8cba0271a5a447250bc07cdb5c3b1fd21b76b88a63dcd4bcdcb80769";
   };
 
   propagatedBuildInputs = [ numpy ];

From e6811900dddcf6e5c16556e8a41a28abadf25dc2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Nov 2020 21:50:49 +0100
Subject: [PATCH 3124/3942] cachix: drop the build from the release jobset

The cachix build is broken with ghc-8.10.x and recent versions of
its dependencies, particularly servant, swagger2, etc. We cannot
easily fix that with overrides -- it would be best if upstream
released a new version that builds successfully in the Stackage
Nightly environment. A simple way to ensure that would be to add
cachix to Stackage.

Ping @domenkozar.
---
 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 cacc77fea30d..20eaffaf84ac 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -62,7 +62,7 @@ let
               # jobs.stack.x86_64-darwin
               jobs.stdenv.x86_64-darwin
               jobs.vim.x86_64-darwin
-              jobs.cachix.x86_64-darwin
+              # jobs.cachix.x86_64-darwin
 
               # UI apps
               # jobs.firefox-unwrapped.x86_64-darwin
@@ -105,7 +105,7 @@ let
               jobs.nix-info-tested.x86_64-linux
               # Ensure that X11/GTK are in order.
               jobs.thunderbird.x86_64-linux
-              jobs.cachix.x86_64-linux
+              # jobs.cachix.x86_64-linux
 
               /*
               jobs.tests.cc-wrapper.x86_64-linux

From 9a6772968a541713ddf834ae6940b64c35935fce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 12:32:16 +0000
Subject: [PATCH 3125/3942] python27Packages.lightgbm: 3.0.0 -> 3.1.0

---
 pkgs/development/python-modules/lightgbm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix
index 27b2e9487764..e9bcd0ed895e 100644
--- a/pkgs/development/python-modules/lightgbm/default.nix
+++ b/pkgs/development/python-modules/lightgbm/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "lightgbm";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05f5b358469a679dbf27521d926750ca53ff1e61a6c0293d49af30094ebd9d4a";
+    sha256 = "0d0abcb1035a7f50226412a78993d61830621e16fd6fa685bbf178c97b0d6e82";
   };
 
   nativeBuildInputs = [

From 51fa5bbda966acc29b225d90ecaf070d6c7638ff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 07:47:18 +0000
Subject: [PATCH 3126/3942] python37Packages.bx-python: 0.8.6 -> 0.8.9

---
 pkgs/development/python-modules/bx-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix
index 57a3609bad0a..57ace67d3f26 100644
--- a/pkgs/development/python-modules/bx-python/default.nix
+++ b/pkgs/development/python-modules/bx-python/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "bx-python";
-  version = "0.8.6";
+  version = "0.8.9";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "bxlab";
     repo = "bx-python";
     rev = "v${version}";
-    sha256 = "1i40vmn8n83vqcpqj843riv9vp16s753jc4wc90p0cmrnhmzcv13";
+    sha256 = "0bsqnw8rv08586wksvx2a8dawvhyzvz5pzsh9y3217b6wxq98dnq";
   };
 
   nativeBuildInputs = [ cython ];

From 2bfb54582b170b2f4c21ab7c5671b67f55ce48a3 Mon Sep 17 00:00:00 2001
From: Philipp Riegger <philipp@riegger.name>
Date: Sun, 11 Oct 2020 11:33:43 +0200
Subject: [PATCH 3127/3942] bees: 0.6.2 -> 0.6.3

---
 pkgs/tools/filesystems/bees/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index e87cecbf8fd3..889121e5dc4e 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -2,8 +2,8 @@
 
 let
 
-  version = "0.6.2";
-  sha256 = "05niv9rivd3j3cwcx3n3vjr85wr0l5i76giq9n54d2vdwmn8qjib";
+  version = "0.6.3";
+  sha256 = "sha256-brEjr7lhmKDCIDeLq+XP+ZTxv1RvwoUlszMSEYygxv8=";
 
   bees = stdenv.mkDerivation {
     pname = "bees";

From 104322f04d311eaed6ee69c2a022abc4a18a4db1 Mon Sep 17 00:00:00 2001
From: Philipp Riegger <philipp@riegger.name>
Date: Mon, 12 Oct 2020 21:38:09 +0200
Subject: [PATCH 3128/3942] bees: drop version and hash from let

---
 pkgs/tools/filesystems/bees/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index 889121e5dc4e..82a9742c0717 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -2,18 +2,15 @@
 
 let
 
-  version = "0.6.3";
-  sha256 = "sha256-brEjr7lhmKDCIDeLq+XP+ZTxv1RvwoUlszMSEYygxv8=";
-
-  bees = stdenv.mkDerivation {
+  bees = stdenv.mkDerivation rec {
     pname = "bees";
-    inherit version;
+    version = "0.6.3";
 
     src = fetchFromGitHub {
       owner = "Zygo";
       repo = "bees";
       rev = "v${version}";
-      inherit sha256;
+      sha256 = "sha256-brEjr7lhmKDCIDeLq+XP+ZTxv1RvwoUlszMSEYygxv8=";
     };
 
     buildInputs = [
@@ -58,7 +55,7 @@ let
 
 in
 
-runCommand "bees-service-${version}" {
+runCommand "bees-service" {
   inherit bash bees coreutils utillinux;
   btrfsProgs = btrfs-progs; # needs to be a valid shell variable name
 } ''

From 7ad0ca11ce349d47d1008a7da703e7eca2abba06 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 4 Nov 2020 22:47:13 +0100
Subject: [PATCH 3129/3942] digitalbitbox: 2.2.2 -> 3.0.0

---
 .../misc/digitalbitbox/default.nix            | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index 95159d1927ab..0c731aca713f 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ mkDerivation
+, lib
 , autoreconfHook
 , curl
 , fetchFromGitHub
@@ -7,7 +8,7 @@
 , libtool
 , qrencode
 , udev
-, libusb-compat-0_1
+, libusb1
 , makeWrapper
 , pkgconfig
 , qtbase
@@ -46,18 +47,18 @@
 let
   copyUdevRuleToOutput = name: rule:
     "cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
   pname = "digitalbitbox";
-  version = "2.2.2";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "digitalbitbox";
     repo = "dbb-app";
     rev = "v${version}";
-    sha256 = "1r77fvqrlaryzij5dfbnigzhvg1d12g96qb2gp8dy3xph1j0k3s1";
+    sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA=";
   };
 
-  nativeBuildInputs = with stdenv.lib; [
+  nativeBuildInputs = with lib; [
     autoreconfHook
     curl
     git
@@ -70,7 +71,7 @@ in stdenv.mkDerivation rec {
     libevent
     libtool
     udev
-    libusb-compat-0_1
+    libusb1
     qrencode
 
     qtbase
@@ -93,6 +94,8 @@ in stdenv.mkDerivation rec {
     "format"
   ];
 
+  qtWrapperArgs = [ ''--prefix LD_LIBRARY_PATH : $out/lib'' ];
+
   postInstall = ''
     mkdir -p "$out/lib"
     cp src/libbtc/.libs/*.so* $out/lib
@@ -103,9 +106,6 @@ in stdenv.mkDerivation rec {
     # [RPATH][patchelf] Avoid forbidden reference error
     rm -rf $PWD
 
-    wrapProgram "$out/bin/dbb-cli" --prefix LD_LIBRARY_PATH : "$out/lib"
-    wrapProgram "$out/bin/dbb-app" --prefix LD_LIBRARY_PATH : "$out/lib"
-
     # Provide udev rules as documented in https://digitalbitbox.com/start_linux
     mkdir -p "$out/etc/udev/rules.d"
     ${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51}
@@ -114,7 +114,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A QT based application for the Digital Bitbox hardware wallet";
     longDescription = ''
       Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices.
@@ -138,6 +138,5 @@ in stdenv.mkDerivation rec {
       vidbina
     ];
     platforms = platforms.linux;
-    broken = true;
   };
 }

From 768733f552e7d94d5303efd25729c0fd959754ef Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 4 Nov 2020 22:58:36 +0100
Subject: [PATCH 3130/3942] qlcplus: 4.12.2 -> 4.12.3

---
 pkgs/applications/misc/qlcplus/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index b47d8feecf76..452629b6181d 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -5,13 +5,13 @@
 
 mkDerivation rec {
   pname = "qlcplus";
-  version = "4.12.2";
+  version = "4.12.3";
 
   src = fetchFromGitHub {
     owner = "mcallegari";
     repo = "qlcplus";
     rev = "QLC+_${version}";
-    sha256 = "1j0jhgql78p5ghcaz36l1k55447s5qiv396a448qic7xqpym2vl3";
+    sha256 = "PB1Y8N1TrJMcS7A2e1nKjsUlAxOYjdJqBhbyuDCAbGs=";
   };
 
   nativeBuildInputs = [ qmake pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d520ab046d12..dd46cd3012db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6689,7 +6689,7 @@ in
 
   qarte = libsForQt5.callPackage ../applications/video/qarte { };
 
-  qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { };
+  qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
 
   qnial = callPackage ../development/interpreters/qnial { };
 

From 9cbe9b5d04bb684598c0074755871a5fe94c6483 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 4 Nov 2020 23:25:29 +0100
Subject: [PATCH 3131/3942] golden-cheetah: use Qt5.14

---
 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 dd46cd3012db..ca8a3881b363 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28312,7 +28312,7 @@ in
     inherit pkgs;
   };
 
-  golden-cheetah = libsForQt512.callPackage ../applications/misc/golden-cheetah {};
+  golden-cheetah = libsForQt514.callPackage ../applications/misc/golden-cheetah {};
 
   linkchecker = callPackage ../tools/networking/linkchecker { };
 

From ba898ae44c12c8b8f55a117596440fdc68de504e Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 4 Nov 2020 23:26:33 +0100
Subject: [PATCH 3132/3942] sdrangel: 4.11.12 -> 4.21.1

---
 pkgs/applications/radio/sdrangel/default.nix | 29 ++++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix
index 6d0a19334dec..dd8c56610c28 100644
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@@ -13,47 +13,40 @@ libav,
 libiio,
 libopus,
 libpulseaudio,
-libusb-compat-0_1,
+libusb1,
 limesuite,
+libbladeRF,
 mkDerivation,
 ocl-icd,
 opencv3,
 pkgconfig,
 qtbase,
 qtmultimedia,
+qtserialport,
 qtwebsockets,
 rtl-sdr,
-serialdv
+serialdv,
+uhd
 }:
 
-let
-
-  codec2' = codec2.overrideAttrs (old: {
-    src = fetchFromGitHub {
-      owner = "drowe67";
-      repo = "codec2";
-      rev = "567346818c0d4d697773cf66d925fdb031e15668";
-      sha256 = "0ngqlh2cw5grx2lg7xj8baz6p55gfhq4caggxkb4pxlg817pwbpa";
-    };
-  });
-
-in mkDerivation rec {
+mkDerivation rec {
   pname = "sdrangel";
-  version = "4.11.12";
+  version = "4.21.1";
 
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "sdrangel";
     rev = "v${version}";
-    sha256 = "0zbx0gklylk8npb3wnnmqpam0pdxl40f20i3wzwwh4gqrppxywzx";
+    sha256 = "y6BVwnSJXiapgm9pAuby1DLLeU5MSyB4uqEa3oS35/U=";
     fetchSubmodules = false;
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [
-    glew opencv3 libusb-compat-0_1 boost libopus limesuite libav libiio libpulseaudio
+    glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio
     qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf
-    fftwFloat codec2' cm256cc serialdv
+    fftwFloat codec2 cm256cc serialdv qtserialport
+    libbladeRF uhd
   ];
   cmakeFlags = [
     "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"

From fbab63ecd5b931ee7702982a04b3cdb198f7e5b4 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Wed, 4 Nov 2020 23:40:31 +0100
Subject: [PATCH 3133/3942] plex-media-player: 2.55.0.1069 -> 2.58.0.1076

---
 .../video/plex-media-player/default.nix            |  6 +++---
 pkgs/applications/video/plex-media-player/deps.nix | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index d08a4a852428..0530af6f222c 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -11,14 +11,14 @@ let
   depSrcs = import ./deps.nix { inherit fetchurl; };
 in mkDerivation rec {
   pname = "plex-media-player";
-  version = "2.55.0.1069";
-  vsnHash = "2369bed9";
+  version = "2.58.0.1076";
+  vsnHash = "38e019da";
 
   src = fetchFromGitHub {
     owner = "plexinc";
     repo = "plex-media-player";
     rev = "v${version}-${vsnHash}";
-    sha256 = "1jq4592sgaia0xy2h7n3vh5i7c84sdh4l64fdc774r4i0bmg66qi";
+    sha256 = "XFwcSHn9wG30bDMGFITBmhp6/VI1RLmxMxFFxjntTmw=";
   };
 
   nativeBuildInputs = [ pkgconfig cmake python3 ];
diff --git a/pkgs/applications/video/plex-media-player/deps.nix b/pkgs/applications/video/plex-media-player/deps.nix
index 26b57532615a..fddbae9375c7 100644
--- a/pkgs/applications/video/plex-media-player/deps.nix
+++ b/pkgs/applications/video/plex-media-player/deps.nix
@@ -1,28 +1,28 @@
 { fetchurl }:
 
 rec {
-  webClientBuildId = "180-afec74de50e175";
+  webClientBuildId = "183-045db5be50e175";
   webClientDesktopBuildId = "4.29.2-e50e175";
-  webClientTvBuildId = "4.29.3-afec74d";
+  webClientTvBuildId = "4.29.6-045db5b";
 
   webClient = fetchurl {
     url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
-    sha256 = "0rabrg3lk9vgpswk8npa54hzqf2v8ghqqnysxpwn12wrp1pc2rr9";
+    sha256 = "AzHlO7Z8SxQoT6++OphwDDQ47Ombnpaby0mh1YNnSvc=";
   };
   webClientDesktopHash = fetchurl {
     url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
-    sha256 = "02b5yq4yc411qlg2dkw5j9lrr3cn2y4d27sin0skf6qza180473g";
+    sha256 = "7vUcTuN5ypFFIrBygyutEZu4MYl5WPmFureQl6HvVx8=";
   };
   webClientDesktop = fetchurl {
     url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
-    sha256 = "0l3xv48kr2rx878a40zrgwif2ga2ikv6fdcbq9pylycnmm41pxmh";
+    sha256 = "xWwXhN2N4Pvalxtm5PwZprkcFU6RIiE6fA71d2E6lP4=";
   };
   webClientTvHash = fetchurl {
     url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
-    sha256 = "0wq115y2xrgwqrzr43nhkq8ba237z20yfp426ki2kdypsq8fjqka";
+    sha256 = "U8u5SOxPpz8HOJKrYXlIHx0X08Flspl67hlzc57g7v8=";
   };
   webClientTv = fetchurl {
     url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
-    sha256 = "1wax1qslm226l2w53m2fnl849jw349qhg3rjghx7vip5pmb43vw9";
+    sha256 = "4Et9d4BO+4UParvsSJglJvb+cnp0oUP3O4MDNnLeP7g=";
   };
 }

From 62b77c5bbc0e789823eb223050e894066f47bc78 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 00:08:06 +0100
Subject: [PATCH 3134/3942] teamspeak_client: migrate to Qt5.15

---
 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 ca8a3881b363..7dec2b9fc649 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23875,7 +23875,7 @@ in
 
   teams = callPackage ../applications/networking/instant-messengers/teams { };
 
-  teamspeak_client = libsForQt512.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
+  teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
   taskell = haskell.lib.justStaticExecutables haskellPackages.taskell;

From 568befb1fda97ad2d8340e62300f7e9d97afc2f8 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 00:21:09 +0100
Subject: [PATCH 3135/3942] protonmail-bridge: migrate to Qt5.15

---
 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 7dec2b9fc649..a485549e974d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23169,7 +23169,7 @@ in
 
   properties-cpp = callPackage ../development/libraries/properties-cpp { };
 
-  protonmail-bridge = libsForQt512.callPackage ../applications/networking/protonmail-bridge { };
+  protonmail-bridge = libsForQt5.callPackage ../applications/networking/protonmail-bridge { };
 
   protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { };
 

From 8053c25b2f1bc89eda9fff8516dc23ff8400a6d3 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 15:48:37 +0100
Subject: [PATCH 3136/3942] vnote: 2.8.2 2.8.2 -> 2.10

Also migrate to Qt5.15
---
 pkgs/applications/office/vnote/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix
index 80b6ef6243ca..b266ce86e2ac 100644
--- a/pkgs/applications/office/vnote/default.nix
+++ b/pkgs/applications/office/vnote/default.nix
@@ -3,7 +3,7 @@
 let
   description = "A note-taking application that knows programmers and Markdown better";
 in mkDerivation rec {
-  version = "2.8.2";
+  version = "2.10";
   pname = "vnote";
 
   src = fetchFromGitHub {
@@ -11,7 +11,7 @@ in mkDerivation rec {
     repo = "vnote";
     fetchSubmodules = true;
     rev = "v${version}";
-    sha256 = "18qffq5c2plr5rjb5lafhdz1v5kbbb2wiyacgdhh3xni3khni52l";
+    sha256 = "EeeVGnKI0irLO1zJQxlVlIUhqG987JIgxNvKpUgLxUQ=";
   };
 
   nativeBuildInputs = [ qmake ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a485549e974d..640155e3a51a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27997,7 +27997,7 @@ in
 
   ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; };
 
-  vnote = libsForQt514.callPackage ../applications/office/vnote { };
+  vnote = libsForQt5.callPackage ../applications/office/vnote { };
 
   ssh-audit = callPackage ../tools/security/ssh-audit { };
 

From 43dbe816401ed0539bc08d2ff63f2eead78f85a1 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 16:07:07 +0100
Subject: [PATCH 3137/3942] tellico: migrate to Qt5.15

---
 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 640155e3a51a..d5b39f40f575 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27946,7 +27946,7 @@ in
 
   prow = callPackage ../applications/networking/cluster/prow { };
 
-  tellico = libsForQt514.callPackage ../applications/misc/tellico { };
+  tellico = libsForQt5.callPackage ../applications/misc/tellico { };
 
   termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {};
 

From 6683f3bf65de78bc02320d46e255d17b0d28043b Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 16:19:32 +0100
Subject: [PATCH 3138/3942] calaos_installer: 3.1 -> 3.5

Also migrate to Qt 5.15
---
 pkgs/misc/calaos/installer/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix
index 6254c9c24f4b..ee7c089bc8ee 100644
--- a/pkgs/misc/calaos/installer/default.nix
+++ b/pkgs/misc/calaos/installer/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, stdenv, fetchFromGitHub, qmake, qttools, qtbase }:
 
 mkDerivation rec {
-  name = "calaos_installer-3.1";
-  version = "3.1";
+  pname = "calaos_installer";
+  version = "3.5";
 
   src = fetchFromGitHub {
     owner = "calaos";
     repo = "calaos_installer";
     rev = "v${version}";
-    sha256 = "0g8igj5sax5vjqzrpbil7i6329708lqqwvg5mwiqd0zzzha9sawd";
+    sha256 = "hx7XVF2iueKFR67U0EvSK1vYZnJBnuOpUOkSjx7h1XY=";
   };
 
   nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5b39f40f575..7249629a3b21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27147,7 +27147,7 @@ in
 
   cached-nix-shell = callPackage ../tools/nix/cached-nix-shell {};
 
-  calaos_installer = libsForQt514.callPackage ../misc/calaos/installer {};
+  calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {};
 
   ccemux = callPackage ../misc/emulators/ccemux { };
 

From ed7a64c4eeb26477ac6a806d3f1a873569201c50 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 16:35:59 +0100
Subject: [PATCH 3139/3942] qcsxcad: migrate to Qt511 + additional cleanup

 * Split into multiple outputs
 * Rewrite the derivation without stdenv
---
 .../libraries}/science/electronics/qcsxcad/default.nix   | 9 ++++-----
 pkgs/top-level/aliases.nix                               | 1 +
 pkgs/top-level/all-packages.nix                          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/{applications => development/libraries}/science/electronics/qcsxcad/default.nix (86%)

diff --git a/pkgs/applications/science/electronics/qcsxcad/default.nix b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix
similarity index 86%
rename from pkgs/applications/science/electronics/qcsxcad/default.nix
rename to pkgs/development/libraries/science/electronics/qcsxcad/default.nix
index c12678c0047d..7e73354363ea 100644
--- a/pkgs/applications/science/electronics/qcsxcad/default.nix
+++ b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix
@@ -1,11 +1,10 @@
-{ stdenv
+{ lib
 , mkDerivation
 , fetchFromGitHub
 , cmake
 , csxcad
 , tinyxml
 , vtkWithQt5
-, wrapQtAppsHook
 , qtbase
 }:
 
@@ -20,13 +19,13 @@ mkDerivation {
     sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
   ];
 
   cmakeFlags = [
-    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
     "-DCSXCAD_ROOT_DIR=${csxcad}"
     "-DENABLE_RPATH=OFF"
   ];
@@ -40,7 +39,7 @@ mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt library for CSXCAD";
     homepage = "https://github.com/thliebig/QCSXCAD";
     license = licenses.gpl3;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ddd94bc9b9a4..3731cf64f778 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -471,6 +471,7 @@ mapAliases ({
   phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22
   phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22
   qca-qt5 = libsForQt5.qca-qt5;  # added 2015-12-19
+  qcsxcad = libsForQt5.qcsxcad;  # added 2020-11-05
   quake3game = ioquake3; # added 2016-01-14
   qvim = throw "qvim has been removed."; # added 2020-08-31
   qwt6 = libsForQt5.qwt;  # added 2015-12-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7249629a3b21..159d82d6c85f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15446,6 +15446,8 @@ in
 
     qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
 
+    qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { };
+
     qmltermwidget = callPackage ../development/libraries/qmltermwidget {
       inherit (darwin.apple_sdk.libs) utmp;
     };
@@ -26870,8 +26872,6 @@ in
 
   pcb = callPackage ../applications/science/electronics/pcb { };
 
-  qcsxcad = libsForQt514.callPackage ../applications/science/electronics/qcsxcad { };
-
   qucs = callPackage ../applications/science/electronics/qucs { };
 
   xcircuit = callPackage ../applications/science/electronics/xcircuit { };

From f2335a5d9827066aa0e317b95cf08403d400d4ee Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 17:01:38 +0100
Subject: [PATCH 3140/3942] appcsxcad: migrate to Qt5.15

 * remove useless wrapQtAppsHook
---
 pkgs/applications/science/electronics/appcsxcad/default.nix | 1 -
 pkgs/top-level/all-packages.nix                             | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix
index d2b7c0d66a15..c2d7cefec9b8 100644
--- a/pkgs/applications/science/electronics/appcsxcad/default.nix
+++ b/pkgs/applications/science/electronics/appcsxcad/default.nix
@@ -27,7 +27,6 @@ mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 159d82d6c85f..13c8d4367592 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26820,7 +26820,7 @@ in
 
   adms = callPackage ../applications/science/electronics/adms { };
 
-  appcsxcad = libsForQt514.callPackage ../applications/science/electronics/appcsxcad { };
+  appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { };
 
   # Since version 8 Eagle requires an Autodesk account and a subscription
   # in contrast to single payment for the charged editions.

From 1bb18de6e15635150c81b72c82600177faff214e Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 16:41:27 +0100
Subject: [PATCH 3141/3942] eagle: migrate to Qt5.15

---
 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 13c8d4367592..aa30d5d1be3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26829,7 +26829,7 @@ in
     openssl = openssl_1_0_2;
   };
 
-  eagle = libsForQt514.callPackage ../applications/science/electronics/eagle/eagle.nix { };
+  eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };
 
   caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { };
 

From 9950899236f8530633a4d52c0dffb461365ed8a0 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 17:07:41 +0100
Subject: [PATCH 3142/3942] xflr5: migrate to Qt5.15

rewrite without wrapQtAppsHook and stdenv
---
 pkgs/applications/science/physics/xflr5/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix
index b2e5284796f8..5ae56528f964 100644
--- a/pkgs/applications/science/physics/xflr5/default.nix
+++ b/pkgs/applications/science/physics/xflr5/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchurl, wrapQtAppsHook, qmake }:
+{ mkDerivation, lib, fetchurl, qmake }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "xflr5";
   version = "6.47";
 
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ qmake wrapQtAppsHook ];
+  nativeBuildInputs = [ qmake ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An analysis tool for airfoils, wings and planes";
     homepage = https://sourceforge.net/projects/xflr5/;
     license = licenses.gpl3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa30d5d1be3c..aa3845c639f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26591,7 +26591,7 @@ in
 
   xfitter = callPackage ../applications/science/physics/xfitter {};
 
-  xflr5 = libsForQt514.callPackage ../applications/science/physics/xflr5 { };
+  xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { };
 
   ### SCIENCE/PROGRAMMING
 

From 9f930f68c0f7153c00db33e0ba78a8cfa6b3a020 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 17:35:29 +0100
Subject: [PATCH 3143/3942] solarus: move to multiple outputs

motivation: Let solarus-quest-editor require only required bits
---
 pkgs/games/solarus/default.nix | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix
index c0daa99c15a6..c204846ae2fc 100644
--- a/pkgs/games/solarus/default.nix
+++ b/pkgs/games/solarus/default.nix
@@ -1,26 +1,34 @@
-{ lib, mkDerivation, fetchFromGitLab, cmake, luajit,
-  SDL2, SDL2_image, SDL2_ttf, physfs,
-  openal, libmodplug, libvorbis,
-  qtbase, qttools }:
+{ lib, mkDerivation, fetchFromGitLab, cmake, luajit
+,  SDL2, SDL2_image, SDL2_ttf, physfs, glm
+, openal, libmodplug, libvorbis
+, qtbase, qttools }:
 
 mkDerivation rec {
   pname = "solarus";
-  version = "1.6.2";
+  version = "1.6.4";
 
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0d0xfjbmamz84aajxfc0fwrj8862xxbxz6n4xnc05r1m4g7gba77";
+    sha256 = "sbdlf+R9OskDQ5U5rqUX2gF8l/fj0sDJv6BL7H1I1Ng=";
   };
 
-  buildInputs = [ cmake luajit SDL2
+  outputs = [ "out" "lib" "dev" ];
+
+  nativeBuildInputs = [ cmake qttools ];
+  buildInputs = [ luajit SDL2
     SDL2_image SDL2_ttf physfs
     openal libmodplug libvorbis
-    qtbase qttools ];
+    qtbase glm ];
 
   enableParallelBuilding = true;
 
+  preFixup = ''
+    mkdir $lib/
+    mv $out/lib $lib
+  '';
+
   meta = with lib; {
     description = "A Zelda-like ARPG game engine";
     longDescription = ''

From 94f44a689552a4d9fb0a2bd046b939460d7bb01b Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 17:47:20 +0100
Subject: [PATCH 3144/3942] samplv1: 0.9.13 -> 0.9.18, migrate to Qt5.15

Rewrite without stdenv
---
 pkgs/applications/audio/samplv1/default.nix | 17 ++++++++++-------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 86f8f666d80d..17b3f1c3745c 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }:
+{ mkDerivation, lib, fetchurl, pkgconfig, libjack2
+, alsaLib, liblo, libsndfile, lv2, qtbase, qttools
+, rubberband
+}:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "samplv1";
-  version = "0.9.13";
+  version = "0.9.18";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
-    sha256 = "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m";
+    sha256 = "ePhM9OTLJp1Wa2D9Y1Dqq/69WlEhEp3ih9yNUIJU5Y4=";
   };
 
-  buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
+  nativeBuildInputs = [ qttools pkgconfig ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";
     homepage = "http://samplv1.sourceforge.net/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa3845c639f1..8f9f8d719bcc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25690,7 +25690,7 @@ in
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  samplv1 = callPackage ../applications/audio/samplv1 { qt5 = qt514; };
+  samplv1 = libsForQt5.callPackage ../applications/audio/samplv1 { };
 
   sauerbraten = callPackage ../games/sauerbraten {};
 

From 8e375d71f03c0ab1f622d2f38b4ea406be86de89 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 18:12:42 +0100
Subject: [PATCH 3145/3942] saga: 7.7.0 -> 7.8.1

 * Remove obsolete patches (merged into this release)
 * rewrite without stdenv
---
 pkgs/applications/gis/saga/clang_patch.patch | 19 ------------------
 pkgs/applications/gis/saga/default.nix       | 21 +++++++++-----------
 pkgs/applications/gis/saga/finite.patch      | 13 ------------
 pkgs/applications/gis/saga/opencv4.patch     | 14 -------------
 pkgs/top-level/all-packages.nix              |  2 +-
 5 files changed, 10 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/applications/gis/saga/clang_patch.patch
 delete mode 100644 pkgs/applications/gis/saga/finite.patch
 delete mode 100644 pkgs/applications/gis/saga/opencv4.patch

diff --git a/pkgs/applications/gis/saga/clang_patch.patch b/pkgs/applications/gis/saga/clang_patch.patch
deleted file mode 100644
index e6af8d130514..000000000000
--- a/pkgs/applications/gis/saga/clang_patch.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e92b250968e9656084ab5984689747ca615ff6e7
-Author: Volker Wichmann <wichmann@laserdata.at>
-Date:   Sun Mar 5 13:49:53 2017 +0100
-
-    saga_api, CSG_Table::Del_Records(): bug fix, check record count correctly
-
-diff --git a/src/saga_core/saga_api/table.cpp b/src/saga_core/saga_api/table.cpp
-index 76a1d8d..fa1a66f 100644
---- a/src/saga_core/saga_api/table.cpp
-+++ b/src/saga_core/saga_api/table.cpp
-@@ -901,7 +901,7 @@ bool CSG_Table::Del_Record(int iRecord)
- //---------------------------------------------------------
- bool CSG_Table::Del_Records(void)
- {
--	if( m_Records > 0 )
-+	if( m_nRecords > 0 )
- 	{
- 		_Index_Destroy();
-
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index aa418148209e..50df22c186c9 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -1,4 +1,6 @@
 { stdenv
+, mkDerivation
+, lib
 , fetchurl
 # native
 , autoreconfHook
@@ -28,13 +30,13 @@
 , fftw
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "saga";
-  version = "7.7.0";
+  version = "7.8.1";
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${stdenv.lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
-    sha256 = "1nmvrlcpcm2pas9pnav13iydnym9d8yqqnwq47lm0j6b0a2wy9zk";
+    url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
+    sha256 = "qwjuimeoadwf254bwJ7h2vSKaELkcaJdFrGj1WtvnbM=";
   };
 
   nativeBuildInputs = [
@@ -68,7 +70,7 @@ stdenv.mkDerivation rec {
   ]
   # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
   # for why the have additional buildInputs on darwin
-  ++ stdenv.lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.isDarwin [
     Cocoa
     unixODBC
     poppler
@@ -76,16 +78,11 @@ stdenv.mkDerivation rec {
     sqlite
   ];
 
-  patches = [
-    # See https://sourceforge.net/p/saga-gis/bugs/280/
-    ./opencv4.patch
-  ];
-
   enableParallelBuilding = true;
 
-  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
+  CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "System for Automated Geoscientific Analyses";
     homepage = "http://www.saga-gis.org";
     license = licenses.gpl2Plus;
diff --git a/pkgs/applications/gis/saga/finite.patch b/pkgs/applications/gis/saga/finite.patch
deleted file mode 100644
index 7f60743534bd..000000000000
--- a/pkgs/applications/gis/saga/finite.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/saga-gis/src/modules/imagery/imagery_maxent/me.cpp b/saga-gis/src/modules/imagery/imagery_maxent/me.cpp
-index c5da854..d3e9cff 100755
---- a/src/modules/imagery/imagery_maxent/me.cpp
-+++ b/src/modules/imagery/imagery_maxent/me.cpp
-@@ -21,7 +21,7 @@
- #ifdef _SAGA_MSW
- #define isinf(x) (!_finite(x))
- #else
--#define isinf(x) (!finite(x))
-+#define isinf(x) (!isfinite(x))
- #endif
-
- /** The input array contains a set of log probabilities lp1, lp2, lp3
diff --git a/pkgs/applications/gis/saga/opencv4.patch b/pkgs/applications/gis/saga/opencv4.patch
deleted file mode 100644
index 0b26192bf09b..000000000000
--- a/pkgs/applications/gis/saga/opencv4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/tools/imagery/imagery_opencv/Makefile.am
-+++ b/src/tools/imagery/imagery_opencv/Makefile.am
-@@ -7,9 +7,9 @@
- 
- if HAVE_CV
- DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
--CXX_INCS           = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv
-+CXX_INCS           = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags`
- AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
--AM_LDFLAGS         = -fPIC -shared -avoid-version `pkg-config opencv --libs`
-+AM_LDFLAGS         = -fPIC -shared -avoid-version `pkg-config opencv4 --libs`
- pkglib_LTLIBRARIES = libimagery_opencv.la
- libimagery_opencv_la_SOURCES =\
- MLB_Interface.cpp\
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f9f8d719bcc..5c96923f50ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25686,7 +25686,7 @@ in
 
   rrootage = callPackage ../games/rrootage { };
 
-  saga = libsForQt514.callPackage ../applications/gis/saga {
+  saga = libsForQt5.callPackage ../applications/gis/saga {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 

From 92904173001cf23d03e8f9ccd3d338bd2ada963a Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 18:19:38 +0100
Subject: [PATCH 3146/3942] pentobi: 18.1 -> 18.3

 * Rewrite without stdenv and wrapQtAppsHook
 * Fetch source from GithHub
---
 pkgs/games/pentobi/default.nix  | 24 ++++++++++++------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix
index f0f6ccb8a129..b8a4935aa267 100644
--- a/pkgs/games/pentobi/default.nix
+++ b/pkgs/games/pentobi/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, appstream, fetchurl, cmake, gettext, libxslt, librsvg, itstool
-  , qtbase, qtquickcontrols2, qtsvg, qttools, qtwebview, docbook_xsl
-  , wrapQtAppsHook
+{ lib, mkDerivation, appstream, fetchFromGitHub, cmake, gettext, libxslt, librsvg, itstool
+, qtbase, qtquickcontrols2, qtsvg, qttools, qtwebview, docbook_xsl
 }:
 
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  version = "18.1";
+mkDerivation rec {
+  version = "18.3";
   pname = "pentobi";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/pentobi/${pname}-${version}.tar.xz";
-    sha256 = "1vfw61lk9z7dngncmx3fggy5ld7ksdk48dpwnsq2vl5fh3f71qbq";
+  src = fetchFromGitHub {
+    owner = "enz";
+    repo = "pentobi";
+    rev = "v${version}";
+    sha256 = "9AymvAlXi0zkkcakTR0mC4gmyrweZR4EwlhORkmVshw=";
   };
 
-  nativeBuildInputs = [ cmake docbook_xsl wrapQtAppsHook ];
-  buildInputs = [ appstream qtbase qtsvg qtquickcontrols2 qttools qtwebview itstool librsvg ];
+  nativeBuildInputs = [ cmake docbook_xsl qttools ];
+  buildInputs = [ appstream qtbase qtsvg qtquickcontrols2 qtwebview itstool librsvg ];
 
   patchPhase = ''
     substituteInPlace pentobi_thumbnailer/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/"
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     "-DMETAINFO_ITS=${appstream}/share/gettext/its/metainfo.its"
   ];
 
-  meta = {
+  meta = with lib; {
     description = "A computer opponent for the board game Blokus";
     homepage = "https://pentobi.sourceforge.io";
     license = licenses.gpl3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c96923f50ba..4fd0fb97c1c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25601,7 +25601,7 @@ in
 
   papermc = callPackage ../games/papermc { };
 
-  pentobi = libsForQt514.callPackage ../games/pentobi { };
+  pentobi = libsForQt5.callPackage ../games/pentobi { };
 
   performous = callPackage ../games/performous {
     boost = boost166;

From d29feee8b62c80635acb4f7c4d09eec3e3e5314c Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 18:41:27 +0100
Subject: [PATCH 3147/3942] chiaki: migrate to Qt5.15

---
 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 4fd0fb97c1c2..fe29f3fd4109 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25157,7 +25157,7 @@ in
 
   chessx = libsForQt5.callPackage ../games/chessx { };
 
-  chiaki = libsForQt514.callPackage ../games/chiaki { };
+  chiaki = libsForQt5.callPackage ../games/chiaki { };
 
   chocolateDoom = callPackage ../games/chocolate-doom { };
 

From 97b51ad5a9847b7337a3b0a5646b9eb0ce2cb2d4 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 19:20:57 +0100
Subject: [PATCH 3148/3942] psi: 1.4 -> 1.5

remove useless wrapQtAppsHook and stdenv
---
 .../instant-messengers/psi/default.nix        | 19 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 9f841f50dac3..08c3ab96210f 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -1,30 +1,33 @@
-{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
+{ lib, mkDerivation, fetchFromGitHub, cmake
 , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
 , libidn, qca-qt5, libXScrnSaver, hunspell
 }:
-stdenv.mkDerivation rec {
+
+mkDerivation rec {
   pname = "psi";
-  version = "1.4";
+  version = "1.5";
   src = fetchFromGitHub {
     owner = "psi-im";
     repo = pname;
     rev = version;
-    sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4";
+    sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM=";
     fetchSubmodules = true;
   };
   patches = [
     ./fix-cmake-hunspell-1.7.patch
   ];
-  nativeBuildInputs = [ cmake wrapQtAppsHook ];
+  nativeBuildInputs = [ cmake qttools ];
   buildInputs = [
-    qtbase qtmultimedia qtx11extras qttools qtwebengine
+    qtbase qtmultimedia qtx11extras qtwebengine
     libidn qca-qt5 libXScrnSaver hunspell
   ];
   enableParallelBuilding = true;
-  meta = with stdenv.lib; {
+
+  meta = with lib; {
+    homepage = "https://psi-im.org";
     description = "An XMPP (Jabber) client";
     maintainers = [ maintainers.raskin ];
     license = licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe29f3fd4109..2eab7d596c7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23179,7 +23179,7 @@ in
 
   ps2client = callPackage ../applications/networking/ps2client { };
 
-  psi = libsForQt514.callPackage ../applications/networking/instant-messengers/psi { };
+  psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
 
   psi-plus = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { };
 

From 8296881706f519f18e1f8b6f4975cacc4587ed36 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 19:21:24 +0100
Subject: [PATCH 3149/3942] psi-plus: migrate to Qt5.15

remove useless wrapQtAppsHook and stdenv
---
 .../instant-messengers/psi-plus/default.nix           | 11 ++++++-----
 pkgs/top-level/all-packages.nix                       |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index cf7c1008a080..1112a3215c9d 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
+{ mkDerivation, lib, fetchFromGitHub, cmake
 , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
 , libidn, qca-qt5, libsecret, libXScrnSaver, hunspell
 , libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "psi-plus";
   version = "1.4.1473";
 
@@ -19,15 +19,16 @@ stdenv.mkDerivation rec {
     "-DENABLE_PLUGINS=ON"
   ];
 
-  nativeBuildInputs = [ cmake wrapQtAppsHook ];
+  nativeBuildInputs = [ cmake qttools ];
 
   buildInputs = [
-    qtbase qtmultimedia qtx11extras qttools qtwebengine
+    qtbase qtmultimedia qtx11extras qtwebengine
     libidn qca-qt5 libsecret libXScrnSaver hunspell
     libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
+    homepage = "https://sourceforge.net/projects/psiplus/";
     description = "XMPP (Jabber) client";
     maintainers = with maintainers; [ orivej misuzu ];
     license = licenses.gpl2;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2eab7d596c7e..9964ba0d061c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23181,7 +23181,7 @@ in
 
   psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
 
-  psi-plus = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { };
+  psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };
 
   psol = callPackage ../development/libraries/psol { };
 

From 9ea55b4fb55fa541f696488d302a3ac4891902de Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 20:39:02 +0100
Subject: [PATCH 3150/3942] zoom-us: migrate to Qt5.15

---
 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 9964ba0d061c..a06f67c7f1bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24914,7 +24914,7 @@ in
 
   zombietrackergps = libsForQt514.callPackage ../applications/gis/zombietrackergps { };
 
-  zoom-us = libsForQt514.callPackage ../applications/networking/instant-messengers/zoom-us { };
+  zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { };
 
   zotero = callPackage ../applications/office/zotero { };
 

From 032bd0fd13a1e055c90cd8b3860cd2f6011f1396 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 20:50:09 +0100
Subject: [PATCH 3151/3942] webcamoid: migrate to Qt5.15

rewrite without stdenv
---
 pkgs/applications/video/webcamoid/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix
index aa559215fe89..a0d25f2ec1ea 100644
--- a/pkgs/applications/video/webcamoid/default.nix
+++ b/pkgs/applications/video/webcamoid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake
+{ lib, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake
 , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2
 , ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2
 , v4l-utils }:
@@ -29,7 +29,7 @@ mkDerivation rec {
     "INSTALLQMLDIR=${placeholder "out"}/lib/qt/qml"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Webcam Capture Software";
     longDescription = "Webcamoid is a full featured and multiplatform webcam suite.";
     homepage = "https://github.com/webcamoid/webcamoid/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a06f67c7f1bc..712f10edc34a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24376,7 +24376,7 @@ in
 
   wayvnc = callPackage ../applications/networking/remote/wayvnc { };
 
-  webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { };
+  webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { };
 
   webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {};
 

From bacf704e013dae2766a240ae0a02da1b74df5155 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 21:30:33 +0100
Subject: [PATCH 3152/3942] virt-manager-qt: migrate to Qt5.15

---
 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 712f10edc34a..2dd3d15e2af8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24214,7 +24214,7 @@ in
     system-libvirt = libvirt;
   };
 
-  virt-manager-qt = libsForQt514.callPackage ../applications/virtualization/virt-manager/qt.nix {
+  virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix {
     qtermwidget = lxqt.qtermwidget;
   };
 

From d1259ed363c67c8938c0849391e18db171df871c Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 21:34:27 +0100
Subject: [PATCH 3153/3942] kdiff3: migrate to Qt5.15

fix homepage
---
 pkgs/tools/text/kdiff3/default.nix | 2 +-
 pkgs/top-level/all-packages.nix    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index 9921862b798e..862faadea3f1 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ];
 
   meta = with lib; {
-    homepage = "http://kdiff3.sourceforge.net/";
+    homepage = "https://invent.kde.org/sdk/kdiff3";
     license = licenses.gpl2Plus;
     description = "Compares and merges 2 or 3 files or directories";
     maintainers = with maintainers; [ peterhoeg ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2dd3d15e2af8..ac3c9727eb3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5032,7 +5032,7 @@ in
 
   krop = callPackage ../applications/graphics/krop { };
 
-  kdiff3 = libsForQt514.callPackage ../tools/text/kdiff3 { };
+  kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
 
   kube-router = callPackage ../applications/networking/cluster/kube-router { };
 

From a40551cf2919a6a9fc702b0d196680e5535c9907 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 21:46:15 +0100
Subject: [PATCH 3154/3942] krename: migrate to Qt5.15

---
 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 ac3c9727eb3c..138a54302216 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5024,7 +5024,7 @@ in
 
   kpcli = callPackage ../tools/security/kpcli { };
 
-  krename = libsForQt514.callPackage ../applications/misc/krename { };
+  krename = libsForQt5.callPackage ../applications/misc/krename { };
 
   krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { };
 

From d05f546eedd2c2aca962fb19d8b14e7c0a29dc5c Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 21:46:42 +0100
Subject: [PATCH 3155/3942] kronometer: migrate to Qt5.15

---
 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 138a54302216..6f758f413cee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5028,7 +5028,7 @@ in
 
   krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { };
 
-  kronometer = libsForQt514.callPackage ../tools/misc/kronometer { };
+  kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };
 
   krop = callPackage ../applications/graphics/krop { };
 

From 6d2cd35864c1ba8bc618d4788431f59fe5a3ced4 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 21:47:11 +0100
Subject: [PATCH 3156/3942] peruse: migrate to Qt5.15

---
 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 6f758f413cee..3729afe648c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5038,7 +5038,7 @@ in
 
   kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
 
-  peruse = libsForQt514.callPackage ../tools/misc/peruse { };
+  peruse = libsForQt5.callPackage ../tools/misc/peruse { };
 
   ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { };
 

From b6602c1d6827882d4c6458a6003a3a3663f279ca Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 22:52:07 +0100
Subject: [PATCH 3157/3942] minitube: 3.2 -> 3.6

rewrite without useless wrapQtAppsHook and stdenv
---
 pkgs/applications/video/minitube/default.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 690b8355340c..a5bd030e470c 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -1,30 +1,30 @@
-{ stdenv, fetchFromGitHub, wrapQtAppsHook, phonon, phonon-backend-vlc, qtbase, qmake
+{ mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake
 , qtdeclarative, qttools, qtx11extras, mpv
 
 # "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 {
+mkDerivation rec {
   pname = "minitube";
-  version = "3.2";
+  version = "3.6";
 
   src = fetchFromGitHub {
-    sha256 = "0175sgqmszakqd631bni4aqjpx68h6n49zjvg23fb1yyancnkn4c";
+    sha256 = "6IaBPYL/yGWKUHxPe1FnAR1gDHImXYGItYWq7VNjwEU=";
     rev = version;
     repo = "minitube";
     owner = "flaviotordini";
     fetchSubmodules = true;
   };
 
-  buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools qtx11extras mpv ];
-  nativeBuildInputs = [ wrapQtAppsHook qmake ];
+  buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ];
+  nativeBuildInputs = [ qmake qttools ];
 
   qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Stand-alone YouTube video player";
     longDescription = ''
       Watch YouTube videos in a new way: you type a keyword, Minitube gives
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3729afe648c6..2865746bc071 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22354,7 +22354,7 @@ in
 
   minishift = callPackage ../applications/networking/cluster/minishift { };
 
-  minitube = libsForQt514.callPackage ../applications/video/minitube { };
+  minitube = libsForQt5.callPackage ../applications/video/minitube { };
 
   mimic = callPackage ../applications/audio/mimic { };
 

From 0ed2faf655c3a33cc8638380da3a70426f6f7a52 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 23:35:19 +0100
Subject: [PATCH 3158/3942] rsibreak: migrate to Qt5.15

---
 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 2865746bc071..8cbd77e2d673 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6935,7 +6935,7 @@ in
 
   rshijack = callPackage ../tools/networking/rshijack { };
 
-  rsibreak = libsForQt514.callPackage ../applications/misc/rsibreak { };
+  rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { };
 
   rss2email = callPackage ../applications/networking/feedreaders/rss2email {
     pythonPackages = python3Packages;

From 0c1c70653d57620b911daaabcc78f075dd1b6895 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 5 Nov 2020 23:41:14 +0100
Subject: [PATCH 3159/3942] birdtray: migrate to Qt5.15

---
 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 8cbd77e2d673..fd6b72521aae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1481,7 +1481,7 @@ in
 
   bindfs = callPackage ../tools/filesystems/bindfs { };
 
-  birdtray = libsForQt514.callPackage ../applications/misc/birdtray { };
+  birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };
 
   bitbucket-cli = python2Packages.bitbucket-cli;
 

From 84ee3f63605acf744c3089cbc60bb48793176d59 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 6 Nov 2020 00:05:35 +0100
Subject: [PATCH 3160/3942] strawberry: migrate to Qt5.15

---
 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 fd6b72521aae..e10e8f24235a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3520,7 +3520,7 @@ in
 
   sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { };
 
-  strawberry = libsForQt514.callPackage ../applications/audio/strawberry { };
+  strawberry = libsForQt5.callPackage ../applications/audio/strawberry { };
 
   tealdeer = callPackage ../tools/misc/tealdeer {
     inherit (darwin.apple_sdk.frameworks) Security;

From 45e4e72a9ddb2bd3a1cbaffc3122112da1804da8 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 6 Nov 2020 09:32:57 +0100
Subject: [PATCH 3161/3942] flameshot: migrate to Qt5.15, fix homepage

---
 pkgs/tools/misc/flameshot/default.nix | 2 +-
 pkgs/top-level/all-packages.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix
index 3dcf1e962691..988849fbbbf6 100644
--- a/pkgs/tools/misc/flameshot/default.nix
+++ b/pkgs/tools/misc/flameshot/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "Powerful yet simple to use screenshot software";
-    homepage = "https://flameshot.js.org";
+    homepage = "https://github.com/flameshot-org/flameshot";
     maintainers = [ maintainers.scode ];
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e10e8f24235a..fd0e84581642 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21179,7 +21179,7 @@ in
 
   redoflacs = callPackage ../applications/audio/redoflacs { };
 
-  flameshot = libsForQt514.callPackage ../tools/misc/flameshot { };
+  flameshot = libsForQt5.callPackage ../tools/misc/flameshot { };
 
   flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {});
 

From 984114b57a1bc23e786295989556ea0fc2e7cc79 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 6 Nov 2020 09:57:21 +0100
Subject: [PATCH 3162/3942] ktorrent: migrate to Qt5.15

---
 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 fd0e84581642..a488a598dad2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22002,7 +22002,7 @@ in
 
   ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { };
 
-  ktorrent = libsForQt514.callPackage ../applications/networking/p2p/ktorrent { };
+  ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { };
 
   kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
 

From 57a938aad681ddf56fdfa182fee7d963184d4ac1 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 6 Nov 2020 10:01:37 +0100
Subject: [PATCH 3163/3942] clipgrab: migrate to Qt5.15

---
 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 a488a598dad2..c5edc9ed81ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20424,7 +20424,7 @@ in
 
   clightd = callPackage ../applications/misc/clight/clightd.nix { };
 
-  clipgrab = libsForQt514.callPackage ../applications/video/clipgrab { };
+  clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { };
 
   clipcat = callPackage ../applications/misc/clipcat { };
 

From 8a2a835f22e732de2207ffe7c0dc2a084cb9fcef Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:41:26 +0100
Subject: [PATCH 3164/3942] sonic-lineup: migrate to Qt5.15

---
 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 c5edc9ed81ae..afe5dba0519c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23702,7 +23702,7 @@ in
 
   soci = callPackage ../development/libraries/soci { };
 
-  sonic-lineup = libsForQt514.callPackage ../applications/audio/sonic-lineup { };
+  sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { };
 
   sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
 

From b492fd43062b8dbdaf5f60e28fb0dd7fbd8a9860 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 6 Nov 2020 14:51:23 +0100
Subject: [PATCH 3165/3942] skrooge: migrate to Qt5.15, enable tests

---
 pkgs/applications/office/skrooge/default.nix | 1 +
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index e84e84967419..067b06747d77 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -30,6 +30,7 @@ mkDerivation rec {
   cmakeFlags = [
     "-DSKG_DESIGNER=OFF"
     "-DSKG_WEBENGINE=ON"
+    "-DBUILD_TESTS=ON"
   ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afe5dba0519c..df125481556a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23682,7 +23682,7 @@ in
 
   robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
 
-  skrooge = libsForQt514.callPackage ../applications/office/skrooge {};
+  skrooge = libsForQt5.callPackage ../applications/office/skrooge {};
 
   smartgithg = callPackage ../applications/version-management/smartgithg {
     jre = openjdk11;

From be86d67202bc9b02a3639eab7a8f36846f146cba Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 6 Nov 2020 17:02:50 +0100
Subject: [PATCH 3166/3942] skanlite: migrate to Qt5.15

---
 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 df125481556a..388bd2fa8073 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23698,7 +23698,7 @@ in
 
   sipp = callPackage ../development/tools/misc/sipp { };
 
-  skanlite = libsForQt514.callPackage ../applications/office/skanlite { };
+  skanlite = libsForQt5.callPackage ../applications/office/skanlite { };
 
   soci = callPackage ../development/libraries/soci { };
 

From cec5b4d18b61b4f1a78c3f624ff926eda8c4470e Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 7 Nov 2020 12:32:26 +0100
Subject: [PATCH 3167/3942] cutecom: fix build with Qt5.15

Used a dangling commit on upstream master branch as it was not released
and the patch was submitted to opensuse instead of upstream
---
 pkgs/tools/misc/cutecom/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix
index d825b555e195..e109b12f2879 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/tools/misc/cutecom/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "cutecom";
-  version = "0.51.0";
+  version = "0.51.0+patch";
 
   src = fetchFromGitLab {
     owner = "cutecom";
     repo = "cutecom";
-    rev = "v${version}";
-    sha256 = "1zprabjs4z26hsb64fc3k790aiiqiz9d88j666xrzi4983m1bfv8";
+    rev = "70d0c497acf8f298374052b2956bcf142ed5f6ca";
+    sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE=";
   };
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 388bd2fa8073..0af612780d29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20521,7 +20521,7 @@ in
 
   curseradio = callPackage ../applications/audio/curseradio { };
 
-  cutecom = libsForQt514.callPackage ../tools/misc/cutecom { };
+  cutecom = libsForQt5.callPackage ../tools/misc/cutecom { };
 
   cvs = callPackage ../applications/version-management/cvs { };
 

From c99a4f92ac2ebe02590e3849acdb4410066e69c1 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 7 Nov 2020 12:35:30 +0100
Subject: [PATCH 3168/3942] libsForQt5.herqq: fix build with qt5.15

Using a unreleased commit from upstream.

Also moved the derivation to mkLibsForQt5 to let
the application choose its Qt5 version.

Did not put an alias as previous version was broken
since ages.
---
 pkgs/development/libraries/herqq/default.nix | 17 +++++++++--------
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix
index 8dc0df3a9f2f..265289f06f38 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
+{ lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
 
-stdenv.mkDerivation rec {
-  version = "2.1.0";
+mkDerivation rec {
+  version = "unstable-20-06-26";
   pname = "herqq";
 
   nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase unzip qtmultimedia ];
-  preConfigure = "cd herqq";
 
+  outputs = [ "out" "dev" ];
+
+  sourceRoot = "source/herqq";
   src = fetchFromGitHub {
     owner = "ThomArmax";
     repo = "HUPnP";
-    rev = version;
-    sha256 = "1w674rbwbhpirq70gp9rk6p068j36rwn112fx3nz613wgw63x84m";
+    rev = "c8385a8846b52def7058ae3794249d6b566a41fc";
+    sha256 = "FxN/QlLB3sZ6Vn/9VIKNUntX/B4+crQZ7t760pwFqY8=";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://herqq.org";
     description = "A software library for building UPnP devices and control points";
     platforms = platforms.linux;
     maintainers = [ ];
-    broken = true; # 2018-09-21, built with qt510 (which was removed) but neither qt59 nor qt511
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0af612780d29..2e03c6b6d5e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15380,6 +15380,8 @@ in
 
     grantlee = callPackage ../development/libraries/grantlee/5 { };
 
+    herqq = callPackage ../development/libraries/herqq { };
+
     kdb = callPackage ../development/libraries/kdb { };
 
     kdiagram = callPackage ../development/libraries/kdiagram { };

From a62425888cca030ffad643f0df695909f281efab Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 7 Nov 2020 12:38:12 +0100
Subject: [PATCH 3169/3942] p4v: comment why it is broken with Qt5.15

---
 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 2e03c6b6d5e1..12ab5e320296 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22618,6 +22618,7 @@ in
   };
 
   p4 = callPackage ../applications/version-management/p4 { };
+  # Broken with Qt5.15 because qtwebkit is broken with it
   p4v = libsForQt514.callPackage ../applications/version-management/p4v { };
 
   partio = callPackage ../development/libraries/partio {};

From e4aa0e093604d38d8c1dd8f4f8590da024a8ac52 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 7 Nov 2020 12:39:22 +0100
Subject: [PATCH 3170/3942] ostinato: 0.9 -> 1.1

 * Port to Qt5.15 in the process
 * Cleanup the derivation to use new style
---
 .../networking/ostinato/default.nix           | 22 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index aa9d94ad5b6e..3bfb2526232c 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchFromGitHub, fetchurl, qmake4Hook, makeDesktopItem
-, qt4, protobuf, libpcap, wireshark, gzip, diffutils, gawk
+{ lib, mkDerivation, fetchFromGitHub, fetchurl, qmake, makeDesktopItem
+, qtbase, qtscript, protobuf, libpcap, wireshark, gzip, diffutils, gawk
+, libnl
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "ostinato";
-  version = "0.9";
+  version = "1.1";
 
   src = fetchFromGitHub  {
     owner  = "pstavirs";
     repo   = "ostinato";
     rev    = "v${version}";
-    sha256 = "109gxj6djdsk7rp1nxpx39kfi75xfl9p9qgffh1cpcdpbsbvq5bx";
+    sha256 = "0B3jOj5rA3/rD2gXS2praZImeP34zN06fOPy/IswXOg=";
   };
 
   ostinatoIcon = fetchurl {
@@ -18,14 +19,17 @@ stdenv.mkDerivation rec {
     sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
   };
 
-  buildInputs = [ qt4 protobuf libpcap ];
+  buildInputs = [ qtbase protobuf libpcap qtscript libnl ];
 
-  nativeBuildInputs = [ qmake4Hook ];
+  nativeBuildInputs = [ qmake ];
 
   patches = [ ./drone_ini.patch ];
+  prePatch = ''
+    sed -i 's|/usr/include/libnl3|${libnl.dev}/include/libnl3|' server/drone.pro
+  '';
 
   desktopItem = makeDesktopItem {
-    type          = "application";
+    type          = "Application";
     name          = "ostinato";
     desktopName   = "Ostinato";
     genericName   = "Packet/Traffic Generator and Analyzer";
@@ -58,7 +62,7 @@ stdenv.mkDerivation rec {
   # pdmlprotocol.h:23:25: fatal error: protocol.pb.h: No such file or directory
   enableParallelBuilding = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A packet traffic generator and analyzer";
     homepage    = "https://ostinato.org";
     license     = licenses.gpl3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12ab5e320296..2c33df41ef3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22613,9 +22613,7 @@ in
 
   osm2pgsql = callPackage ../tools/misc/osm2pgsql { };
 
-  ostinato = callPackage ../applications/networking/ostinato {
-    wireshark = wireshark.override { qt5 = qt514; };
-  };
+  ostinato = libsForQt5.callPackage ../applications/networking/ostinato { };
 
   p4 = callPackage ../applications/version-management/p4 { };
   # Broken with Qt5.15 because qtwebkit is broken with it

From c173f416e03cbad7fa50583fa6d678683cdc702f Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 7 Nov 2020 12:47:41 +0100
Subject: [PATCH 3171/3942] libsForQt5.kde2-decoration: 1.0 -> 1.1

Fixes build for Qt5.15

Split output to mutilple outputs to reduce user closure size
---
 pkgs/data/themes/kde2/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix
index 547e4f30aa6c..7e33d371ebeb 100644
--- a/pkgs/data/themes/kde2/default.nix
+++ b/pkgs/data/themes/kde2/default.nix
@@ -5,15 +5,16 @@
 
 mkDerivation rec {
   pname = "kde2-decoration";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "repos-holder";
     repo = "kdecoration2-kde2";
     rev = version;
-    sha256 = "1766z9wscybcqvr828xih93b3rab3hb0ghsf818iflhp1xy0js08";
+    sha256 = "y2q1j36EURJc7k1huqhEH1Z82PnVSKlfx20bpQWY28c=";
   };
 
+  outputs = [ "out" "dev" ];
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c33df41ef3b..76c4038ba8ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15384,6 +15384,8 @@ in
 
     kdb = callPackage ../development/libraries/kdb { };
 
+    kde2-decoration = callPackage ../data/themes/kde2 { };
+
     kdiagram = callPackage ../development/libraries/kdiagram { };
 
     kdsoap = callPackage ../development/libraries/kdsoap { };
@@ -19438,8 +19440,6 @@ in
 
   kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {};
 
-  kde2-decoration = libsForQt514.callPackage ../data/themes/kde2 { };
-
   kochi-substitute = callPackage ../data/fonts/kochi-substitute {};
 
   kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};

From ecf4fd16b941aea44e16b9821b36996d3c9e00dd Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 7 Nov 2020 12:49:06 +0100
Subject: [PATCH 3172/3942] retroshare: move to alias and explain why it is
 broken

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3731cf64f778..2682f6c062f3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -487,6 +487,7 @@ mapAliases ({
   rssglx = rss-glx; #added 2015-03-25
   rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # added 2020-08-25
   recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
+  retroshare06 = retroshare;
   gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
   qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
   rfkill = throw "rfkill has been removed, as it's included in utillinux"; # added 2020-08-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76c4038ba8ea..76e258fbf8b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23426,8 +23426,9 @@ in
 
   remotebox = callPackage ../applications/virtualization/remotebox { };
 
-  retroshare = libsForQt514.callPackage ../applications/networking/p2p/retroshare { };
-  retroshare06 = retroshare;
+  # This package is currently broken with libupnp
+  # But when unbroken, it should work with the stable Qt5
+  retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
 
   rgp = libsForQt5.callPackage ../development/tools/rgp { };
 

From bb18d1dcf1a7df66d69b38da5448fdebeec5e02c Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 7 Nov 2020 12:50:11 +0100
Subject: [PATCH 3173/3942] sigil: migrate to Qt5.15 and fix segfault

---
 pkgs/applications/editors/sigil/default.nix | 4 ++++
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index 869c20c1d6c4..eb026f6dca3a 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -24,6 +24,10 @@ mkDerivation rec {
     python3Packages.lxml
   ];
 
+  prePatch = ''
+    sed -i '/^QTLIB_DIR=/ d' src/Resource_Files/bash/sigil-sh_install
+  '';
+
   dontWrapQtApps = true;
 
   preFixup = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76e258fbf8b2..53129559d07f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7159,7 +7159,7 @@ in
 
   sigal = callPackage ../applications/misc/sigal { };
 
-  sigil = libsForQt514.callPackage ../applications/editors/sigil { };
+  sigil = libsForQt5.callPackage ../applications/editors/sigil { };
 
   signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { };
 

From 38b041bdf8ee4ffe9861b44dec181f75f13e8f17 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 7 Nov 2020 13:10:39 +0100
Subject: [PATCH 3174/3942] libsForQt5.qtcurve: fix build with Qt5.15

moved the initial qtcurve package to mkLibsForQt5 function
to decouple from Qt5 version

added an alias qtcurve -> libsForQt5.qtcurve for backward compatibility

add option to disable gtk2 support (still enabled by default)
---
 pkgs/data/themes/qtcurve/default.nix | 33 ++++++++++++++++++----------
 pkgs/top-level/aliases.nix           |  1 +
 pkgs/top-level/all-packages.nix      |  4 ++--
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
index 719b1ce1a487..cd5cb4170b8c 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -1,43 +1,47 @@
-{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation
-, gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies
+{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation
+, gtk2Support ? true, gtk2
+, qtbase, qtsvg, qtx11extras # Toolkit dependencies
 , karchive, kconfig, kconfigwidgets, kio, frameworkintegration
 , kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes
 , libpthreadstubs, pcre, libXdmcp, libX11, libXau # X11 dependencies
 , fetchpatch
 }:
 
-let
-  version = "1.9.1";
-in mkDerivation {
+mkDerivation rec {
   pname = "qtcurve";
-  inherit version;
+  version = "1.9.1";
   src = fetchFromGitHub {
     owner = "KDE";
     repo = "qtcurve";
     rev = version;
-    sha256 = "0sm1fza68mwl9cvid4h2lsyxq5svia86l5v9wqk268lmx16mbzsw";
+    sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo=";
   };
 
+  enableParallelBuilding = true;
+
   patches = [
+    # Remove unnecessary constexpr, this is not allowed in C++14
     (fetchpatch {
       url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch";
       sha256 = "1vz5frsrsps93awn84gk8d7injrqfcyhc1rji6s0gsgsp5z9sl34";
     })
+    # Fix build with Qt5.15
+    (fetchpatch {
+      url = "https://github.com/KDE/qtcurve/commit/44e2a35ebb164dcab0bad1a9158b1219a3ff6504.patch";
+      sha256 = "5I2fTxKRJX0cJcyUvYHWZx369FKk6ti9Se7AfYmB9ek=";
+    })
   ];
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
 
   buildInputs = [
-    gtk2
     qtbase qtsvg qtx11extras
     karchive kconfig kconfigwidgets kio kiconthemes kguiaddons ki18n
     kwindowsystem kdelibs4support frameworkintegration
     libpthreadstubs
     pcre
     libXdmcp libX11 libXau
-  ];
+  ] ++ lib.optional gtk2Support gtk2;
 
   preConfigure = ''
     for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt
@@ -52,7 +56,12 @@ in mkDerivation {
     patchShebangs tools/gen-version.sh
   '';
 
-  meta = with stdenv.lib; {
+  configureFlags = [
+    "-DENABLE_GTK2=${if gtk2Support then "ON" else "OFF"}"
+    "-DENABLE_QT4=OFF"
+  ];
+
+  meta = with lib; {
     homepage = "https://github.com/QtCurve/qtcurve";
     description = "Widget styles for Qt5/Plasma 5 and gtk2";
     platforms = platforms.linux;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2682f6c062f3..078d4bc2eca4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -475,6 +475,7 @@ mapAliases ({
   quake3game = ioquake3; # added 2016-01-14
   qvim = throw "qvim has been removed."; # added 2020-08-31
   qwt6 = libsForQt5.qwt;  # added 2015-12-19
+  qtcurve = libsForQt5.qtcurve;  # added 2020-11-07
   qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26
   quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09
   rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53129559d07f..206e1f8de118 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15380,6 +15380,8 @@ in
 
     grantlee = callPackage ../development/libraries/grantlee/5 { };
 
+    qtcurve = callPackage ../data/themes/qtcurve {};
+
     herqq = callPackage ../development/libraries/herqq { };
 
     kdb = callPackage ../development/libraries/kdb { };
@@ -19692,8 +19694,6 @@ in
 
   qogir-theme = callPackage ../data/themes/qogir { };
 
-  qtcurve = libsForQt514.callPackage ../data/themes/qtcurve {};
-
   redhat-official-fonts = callPackage ../data/fonts/redhat-official { };
 
   route159 = callPackage ../data/fonts/route159 { };

From b203a64cc3e530651f754d9bd0fed0d960e3bb57 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 9 Nov 2020 17:17:37 +0200
Subject: [PATCH 3175/3942] kmymoney: pin to qt5.14

---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 206e1f8de118..7c92e423bbc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21982,7 +21982,8 @@ in
 
   kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
 
-  kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { };
+  # Pinned to qt5.14 due to kdewebkit (depends on qtwebkit) which is currently broken with qt5.15
+  kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { };
 
   kodestudio = callPackage ../applications/editors/kodestudio { };
 

From 3b4598feb46a0103f00b4fd8e3e15728b2b2fa44 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 10 Nov 2020 19:04:13 +0200
Subject: [PATCH 3176/3942] mendeley: comment why it needs qt5.14

---
 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 7c92e423bbc4..3c08f0876b37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22313,6 +22313,7 @@ in
 
   meme = callPackage ../applications/graphics/meme { };
 
+  # Needs qtwebkit which is broken on qt5.15
   mendeley = libsForQt514.callPackage ../applications/office/mendeley {
     gconf = pkgs.gnome2.GConf;
   };

From c240827cbe9c2dc067621faff1f30fb7f30f79fd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 10 Nov 2020 19:07:51 +0200
Subject: [PATCH 3177/3942] merkaator: comment why it needs qt5.14

---
 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 3c08f0876b37..22a15d26d66b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22329,6 +22329,7 @@ in
 
   mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
 
+  # Needs qtwebkit which is broken on qt5.15
   merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { };
 
   meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };

From 28ea56deb992658211fda3514e7954b2b4ce91d7 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 20:30:26 +0100
Subject: [PATCH 3178/3942] amarok: migrate to Qt5.15

---
 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 22a15d26d66b..3f5c6529ceac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20023,7 +20023,7 @@ in
 
   msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { };
 
-  amarok = libsForQt514.callPackage ../applications/audio/amarok { };
+  amarok = libsForQt5.callPackage ../applications/audio/amarok { };
   amarok-kf5 = amarok; # for compatibility
 
   amfora = callPackage ../applications/networking/browsers/amfora { };

From 78e3620fdc727162e4445656d48566f614bd8ec9 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 20:30:50 +0100
Subject: [PATCH 3179/3942] communi: migrate to Qt5.15

---
 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 3f5c6529ceac..6c6f15265bc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20455,7 +20455,7 @@ in
 
   cntr = callPackage ../applications/virtualization/cntr { };
 
-  communi = libsForQt514.callPackage ../applications/networking/irc/communi { };
+  communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
 
   confclerk = callPackage ../applications/misc/confclerk { };
 

From df3065a7efefaa1fdfb8cf2c81d03e52eb5272ed Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 20:31:08 +0100
Subject: [PATCH 3180/3942] csound-qt: migrate to Qt5.15

Did not touch the dependency to python27 but may require another PR
---
 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 6c6f15265bc9..79a91aa0cd63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20478,7 +20478,7 @@ in
     pygments = python27Packages.pygments;
   };
 
-  csound-qt = libsForQt514.callPackage ../applications/audio/csound/csound-qt {
+  csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt {
     python = python27;
   };
 

From d63a3895afd868f3c339518fdca94117368a7b2d Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 20:36:41 +0100
Subject: [PATCH 3181/3942] fritzing: migrate to Qt5.15

---
 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 79a91aa0cd63..ba7f3f4d7142 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20961,7 +20961,7 @@ in
 
   freewheeling = callPackage ../applications/audio/freewheeling { };
 
-  fritzing = libsForQt514.callPackage ../applications/science/electronics/fritzing { };
+  fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { };
 
   fsv = callPackage ../applications/misc/fsv { };
 

From 2bdac39fdaf6df6739243d7e7c4c81a55e0cdfd4 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 20:37:12 +0100
Subject: [PATCH 3182/3942] kgraphviewer: migrate to Qt5.15

---
 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 ba7f3f4d7142..94cb5f46e212 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21959,7 +21959,7 @@ in
 
   keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { };
 
-  kgraphviewer = libsForQt514.callPackage ../applications/graphics/kgraphviewer { };
+  kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { };
 
   khal = callPackage ../applications/misc/khal { };
 

From c604e61cf8610c599017a6faaf06e12760f5ec43 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 20:37:46 +0100
Subject: [PATCH 3183/3942] luminanceHDR: migrate to Qt5.15

---
 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 94cb5f46e212..4ac393e98251 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22192,7 +22192,7 @@ in
 
   lsp-plugins = callPackage ../applications/audio/lsp-plugins { };
 
-  luminanceHDR = libsForQt514.callPackage ../applications/graphics/luminance-hdr { };
+  luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 

From 5c2d391f7366176a0d2dbe46d584c5b71432d3d6 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 20:38:07 +0100
Subject: [PATCH 3184/3942] rssguard: migrate to Qt5.15

---
 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 4ac393e98251..bdbcb00a8608 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22681,7 +22681,7 @@ in
 
   qbec = callPackage ../applications/networking/cluster/qbec { };
 
-  rssguard = libsForQt514.callPackage ../applications/networking/feedreaders/rssguard { };
+  rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
 
   scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
 

From 8b0dee1dc67ebbd16aefdaf0015503b1c8de2e84 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 20:38:52 +0100
Subject: [PATCH 3185/3942] obs-studio,obs-v4l2sink: migrate to Qt5.15

obs-nvi was not touched but should be modified as well,
it requires a custom download that I don't use, so I prefer to
let official maintainer do it.
---
 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 bdbcb00a8608..601b9e2bedf3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22853,13 +22853,13 @@ in
     inherit (gnome2) libglade;
   };
 
-  obs-studio = libsForQt514.callPackage ../applications/video/obs-studio { };
+  obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { };
 
   obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };
 
   obs-move-transition = callPackage ../applications/video/obs-studio/obs-move-transition.nix { };
 
-  obs-v4l2sink = libsForQt514.callPackage ../applications/video/obs-studio/v4l2sink.nix { };
+  obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { };
 
   obs-ndi = libsForQt514.callPackage ../applications/video/obs-studio/obs-ndi.nix { };
 

From dc9f85e69e09594a6c6847385398476f13e52b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 20 Nov 2020 23:13:33 +0100
Subject: [PATCH 3186/3942] cachix: make it build

---
 .../configuration-ghc-8.8.x.nix                | 18 ++++++++++++++++--
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 497e201fb1a9..60a361250332 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -81,11 +81,25 @@ self: super: {
   snap-server = doJailbreak super.snap-server;
   exact-pi = doJailbreak super.exact-pi;
   time-compat = doJailbreak super.time-compat;
-  http-media = doJailbreak super.http-media;
-  servant-server = doJailbreak super.servant-server;
+  http-media = unmarkBroken (doJailbreak super.http-media);
+  servant-server = unmarkBroken (doJailbreak super.servant-server);
   foundation = dontCheck super.foundation;
   vault = dontHaddock super.vault;
 
+  servant = unmarkBroken super.servant;
+  servant-auth = unmarkBroken super.servant-auth;
+  servant-conduit = unmarkBroken super.servant-conduit;
+  servant-auth-client = unmarkBroken super.servant-auth-client;
+  servant-client = unmarkBroken super.servant-client;
+  servant-client-core = unmarkBroken super.servant-client-core;
+  servant-auth-server = unmarkBroken super.servant-auth-server;
+  servant-auth-swagger = unmarkBroken super.servant-auth-swagger;
+  servant-swagger = unmarkBroken super.servant-swagger;
+  servant-blaze = unmarkBroken super.servant-blaze;
+  servant-swagger-ui-core = unmarkBroken super.servant-swagger-ui-core;
+  swagger2 = unmarkBroken super.swagger2;
+  cachix-api = unmarkBroken super.cachix-api;
+
   # https://github.com/snapframework/snap-core/issues/288
   snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail   = Fail.fail' ''"; });
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 694ee99191e5..f2b3d51431f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12298,7 +12298,7 @@ in
   c-blosc = callPackage ../development/libraries/c-blosc { };
 
   # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
-  cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
+  cachix = haskell.lib.justStaticExecutables (haskell.lib.unmarkBroken haskell.packages.ghc883.cachix);
 
   hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };
 

From f75c8753d80959f6bf63237748e799849c74179f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 20 Nov 2020 23:13:40 +0100
Subject: [PATCH 3187/3942] Revert "cachix: drop the build from the release
 jobset"

This reverts commit e6811900dddcf6e5c16556e8a41a28abadf25dc2.
---
 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 20eaffaf84ac..cacc77fea30d 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -62,7 +62,7 @@ let
               # jobs.stack.x86_64-darwin
               jobs.stdenv.x86_64-darwin
               jobs.vim.x86_64-darwin
-              # jobs.cachix.x86_64-darwin
+              jobs.cachix.x86_64-darwin
 
               # UI apps
               # jobs.firefox-unwrapped.x86_64-darwin
@@ -105,7 +105,7 @@ let
               jobs.nix-info-tested.x86_64-linux
               # Ensure that X11/GTK are in order.
               jobs.thunderbird.x86_64-linux
-              # jobs.cachix.x86_64-linux
+              jobs.cachix.x86_64-linux
 
               /*
               jobs.tests.cc-wrapper.x86_64-linux

From c7cb72b0cae397d311236d6773338efb4bd4f2d1 Mon Sep 17 00:00:00 2001
From: Fabian Freihube <fabian@freihube.dev>
Date: Thu, 27 Aug 2020 12:40:10 +0200
Subject: [PATCH 3188/3942] python.pkgs.black: 19.10b0 -> 20.8b1

---
 .../python-modules/black/default.nix          | 63 ++++++++++++++-----
 1 file changed, 46 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
index 997f20e137db..f0a25dfb0b12 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/pkgs/development/python-modules/black/default.nix
@@ -1,42 +1,71 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
-, attrs, click, toml, appdirs, aiohttp, aiohttp-cors
-, glibcLocales, typed-ast, pathspec, regex
-, setuptools_scm, pytest }:
+{ stdenv, lib
+, buildPythonPackage, fetchPypi, pythonOlder, setuptools_scm, pytestCheckHook
+, aiohttp
+, aiohttp-cors
+, appdirs
+, attrs
+, click
+, mypy-extensions
+, pathspec
+, regex
+, toml
+, typed-ast
+, typing-extensions }:
 
 buildPythonPackage rec {
   pname = "black";
-  version = "19.10b0";
+  version = "20.8b1";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f8mr0yzj78q1dx7v6ggbgfir2wv0n5z2shfbbvfdq7910xbgvf2";
+    sha256 = "1spv6sldp3mcxr740dh3ywp25lly9s8qlvs946fin44rl1x5a0hw";
   };
 
   nativeBuildInputs = [ setuptools_scm ];
-  checkInputs =  [ pytest glibcLocales ];
 
   # Necessary for the tests to pass on Darwin with sandbox enabled.
   # Black starts a local server and needs to bind a local address.
   __darwinAllowLocalNetworking = true;
 
-  # Don't know why these tests fails
-  # Disable test_expression_diff, because it fails on darwin
-  checkPhase = ''
-    LC_ALL="en_US.UTF-8" pytest \
-      --deselect tests/test_black.py::BlackTestCase::test_expression_diff \
-      --deselect tests/test_black.py::BlackTestCase::test_cache_multiple_files \
-      --deselect tests/test_black.py::BlackTestCase::test_failed_formatting_does_not_get_cached
+  checkInputs =  [ pytestCheckHook ];
+
+  preCheck = ''
+    export PATH="$PATH:$out/bin"
   '';
 
-  propagatedBuildInputs = [ attrs appdirs click toml aiohttp aiohttp-cors pathspec regex typed-ast ];
+  disabledTests = [
+    # Don't know why these tests fails
+    "test_cache_multiple_files"
+    "test_failed_formatting_does_not_get_cached"
+    # requires network access
+    "test_gen_check_output"
+    "test_process_queue"
+  ] ++ lib.optionals stdenv.isDarwin [
+    # fails on darwin
+    "test_expression_diff"
+  ];
 
-  meta = with stdenv.lib; {
+  propagatedBuildInputs = [
+    aiohttp
+    aiohttp-cors
+    appdirs
+    attrs
+    click
+    mypy-extensions
+    pathspec
+    regex
+    toml
+    typed-ast
+    typing-extensions
+  ];
+
+  meta = with lib; {
     description = "The uncompromising Python code formatter";
     homepage    = "https://github.com/psf/black";
+    changelog   = "https://github.com/psf/black/blob/${version}/CHANGES.md";
     license     = licenses.mit;
     maintainers = with maintainers; [ sveitser ];
   };
-
 }

From 5c9e2ff98990c6e004610c8980f09a9b5d013691 Mon Sep 17 00:00:00 2001
From: Michael Reilly <OmnipotentEntity@gmail.com>
Date: Fri, 20 Nov 2020 13:00:45 -0500
Subject: [PATCH 3189/3942] python3Packages.tensorflow_2: 2.3.0 -> 2.3.1

---
 .../python-modules/tensorflow/2/default.nix        | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix
index 7925cb15f03b..bcf693691785 100644
--- a/pkgs/development/python-modules/tensorflow/2/default.nix
+++ b/pkgs/development/python-modules/tensorflow/2/default.nix
@@ -72,7 +72,7 @@ let
 
   tfFeature = x: if x then "1" else "0";
 
-  version = "2.3.0";
+  version = "2.3.1";
   variant = if cudaSupport then "-gpu" else "";
   pname = "tensorflow${variant}";
 
@@ -103,7 +103,7 @@ let
       owner = "tensorflow";
       repo = "tensorflow";
       rev = "v${version}";
-      sha256 = "1dd5fgyiazyfy7y2iv4v42qnap51fr6dzwb26inrsj7aaas06j71";
+      sha256 = "1lvmrqfnwzh24fl5rdkksiqfv2bn0ld5gvzq1z57rphfkf0zg996";
     };
 
     patches = [
@@ -117,12 +117,6 @@ let
         url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch";
         sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv";
       })
-
-      # see https://github.com/tensorflow/tensorflow/issues/40884
-      (fetchpatch {
-        url = "https://github.com/tensorflow/tensorflow/pull/41867/commits/65341f73d110bf173325768947343e1bb8f699fc.patch";
-        sha256 = "18ykkycaag1pcarz53bz6ydxjlah92j4178qn58gcayx1fy7hvh3";
-      })
     ];
 
     # On update, it can be useful to steal the changes from gentoo
@@ -287,9 +281,9 @@ let
 
       # cudaSupport causes fetch of ncclArchive, resulting in different hashes
       sha256 = if cudaSupport then
-        "0pf8128chkm6fxnhd4956n6gvijlj00mjmvry33gq3xx3bayhs9g"
+        "11blnw3ghp1kdi9hh9pdqa4qni9ysc3nk9iqqk9bg4dlr9zl1yld"
       else
-        "0mkgss2nyk21zlj8hp24cs3dmpdnxk8qi6qq4hyc18lp82p09xwa";
+        "1kkghhwhl8frs68kv28r408lps7mpgq1xvq6hc3k0j35asv1g2kc";
     };
 
     buildAttrs = {

From a7cad45d933370424fd12d3a1d46ac88599dba63 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Thu, 19 Nov 2020 13:27:15 -0500
Subject: [PATCH 3190/3942] eclipses: 2020-06 -> 2020-09

---
 .../editors/eclipse/build-eclipse.nix         |  5 ++++-
 pkgs/applications/editors/eclipse/default.nix | 21 +++++++++++--------
 pkgs/applications/editors/eclipse/plugins.nix | 12 +++++------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
index 218fbe8fc1fc..0282dc95f72e 100644
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -1,6 +1,6 @@
 { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
 , zlib, jdk, glib, gtk, libXtst, gsettings-desktop-schemas, webkitgtk
-, makeWrapper, ... }:
+, makeWrapper, perl, ... }:
 
 { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }:
 
@@ -50,6 +50,9 @@ stdenv.mkDerivation rec {
     cp ${desktopItem}/share/applications/* $out/share/applications
     mkdir -p $out/share/pixmaps
     ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm
+
+    # ensure eclipse.ini does not try to use a justj jvm, as those aren't compatible with nix
+    ${perl}/bin/perl -i -p0e 's|-vm\nplugins/org.eclipse.justj.*/jre/bin\n||' $out/eclipse/eclipse.ini
   ''; # */
 
   meta = {
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 87ac29b58e94..0afbecb84cf3 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -10,13 +10,16 @@ assert stdenv ? glibc;
 
 # https://download.eclipse.org/eclipse/downloads/ is the main place to
 # find the downloads needed for new versions
+#
+# to test:
+# $ for e in cpp modeling platform sdk java committers; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done
 
 let
   platform_major = "4";
-  platform_minor = "16";
+  platform_minor = "17";
   year = "2020";
-  month = "06";
-  timestamp = "${year}${month}040540";
+  month = "09";
+  timestamp = "${year}${month}021800";
   gtk = gtk3;
 in rec {
 
@@ -34,7 +37,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        sha512 = "0vfxzsvfv9zmd0ckrdpziijzskh13g8kgk8ibkwmhmqmj14a3visk6yvn5q2s0knkswl1zy9arinw0mxvqh72dfj63vwc01vhp06lyr";
+        sha512 = "270pk7vvfvanig49xkrail01nf967zlp7xf8rvyh2ya7s0y0akj2bi0y4yms4gwijmingm8y2ir9qynd360mzwl8mnc1c31ykf9l3lh";
       };
   };
 
@@ -46,7 +49,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        sha512 = "29nr1x3fgdw5ygrppfma6yi1iaqvad24jyb58sag735z1nz4ymajcwakg52mlv3s19d4w8cxpskh1r459mwz7j769qplymspqifvlkd";
+        sha512 = "26bb6cbnw94ml585aqrs8wpfksd2883njlqi48klpbn5n1bwpnpwvymx9q46i49piiyp0r1pa8ghdcgiwcakvri5nzldlh522fs7h5y";
       };
   };
 
@@ -58,7 +61,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
-        sha512 = "2pm4xam0jn9x34k1hr5rn67fpvc6snlkpcfn4bzdcf2xjv9f3dr2039mkcrhri5nv2bj6fkbai6aga6fmmrb3na33b7ir7sqlqqn61b";
+        sha512 = "2i3gjxmq1i4p70q2l5749b96z1r4nv15dii17fywbyby3kbggwhfvaydizy7z5p6kn0y91dw13p7gmg3qpr9d46mb8f8h3sxks7fyl9";
       };
   };
 
@@ -83,7 +86,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
-        sha512 = "195c07yabmi2a42qxfmpbv6ychpj15bbpgyp40s1pcdb3p875vcqjinq9dqy2sixzwjhfdrggpvwihav87rkih9arzmk2s4cm31mjqd";
+        sha512 = "1c29r7qwjrjv86q2c4bhlrmmh50690lrq164jzrlisys9vnxb6wii0gwb34p9m1xqr3lgba1zhffb4jx18prrk0x8xbd78mp0lvya3k";
       };
   };
 
@@ -95,7 +98,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        sha512 = "3n8jllgxarrxgz16n7zb4bgaqxk0m9frcxrgdxvy25ar2iw8js4q4ir3cc20y4ri3ii74rf3jy6n4ndhm57miwqh4p2wqzhfjlinirb";
+        sha512 = "3rkpngrk6423i2pcf241wbr9jfzwxm2qwm57ipjpjw6705w1rapcws4bibqjznlf34lqvnynkw2wihy51j1ryw25z9fc2jsvyj67c1q";
       };
   };
 
@@ -107,7 +110,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        sha512 = "1l0gc7srpvn3r0yrbrp1pjv1a3n1y7q5fqww5fmzyw1d6j3hjkqj74c9bff16579cpf7z6d4wmj6kr7z89p0ignrx319gc8p0hivi1y";
+        sha512 = "3gnqamrn3x2gr4dfcgl7ppxpyi1q422l0sm7sh0vmipbs9l1c58plm3p14j9rjsyjlly2xjci6dg7sb9mj6259vc640wafnzcs89ii1";
       };
   };
 
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 4edb7a7ebc4f..cdf36bc3c21e 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -255,12 +255,12 @@ rec {
   cdt = buildEclipseUpdateSite rec {
     name = "cdt-${version}";
     # find current version at https://www.eclipse.org/cdt/downloads.php
-    version = "9.11.1";
+    version = "10.0.1";
 
     src = fetchzip {
       stripRoot = false;
-      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.11/${name}/${name}.zip";
-      sha256 = "00cpaal6jm9xb4nbkljrf381r3lf1rb1p06vrbn4l0lxnbckb9df";
+      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.0/${name}/${name}.zip";
+      sha256 = "1smi1yc4l627bb01zp0pcilm6d0hysxk440hy4n55gz3jxilygx5";
     };
 
     meta = with stdenv.lib; {
@@ -475,12 +475,12 @@ rec {
 
   jdt = buildEclipseUpdateSite rec {
     name = "jdt-${version}";
-    version = "4.16";
+    version = "4.17";
 
     src = fetchzip {
       stripRoot = false;
-      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202006040540/org.eclipse.jdt-${version}.zip";
-      sha256 = "0g349hg2nv1y628daxf84396wpf33z52wxv0gawlgrirbbizaznd";
+      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202009021800/org.eclipse.jdt-${version}.zip";
+      sha256 = "16vb88ywqfh0rix5krp2g39yhisv4i797g9c03aayzy5lynqm3ky";
     };
 
     meta = with stdenv.lib; {

From ca959b6a2dab1173c053f2589ad0f50609e8c382 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 21 Nov 2020 00:23:38 +0100
Subject: [PATCH 3191/3942] partition-manager: migrate to Qt5.15

---
 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 f2b3d51431f5..b104a960ed77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5020,7 +5020,7 @@ in
 
   krakenx = callPackage ../tools/system/krakenx { };
 
-  partition-manager = libsForQt514.callPackage ../tools/misc/partition-manager { };
+  partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { };
 
   kpcli = callPackage ../tools/security/kpcli { };
 

From 97677fa34fee7dd19504c79a7fda68ed5e51b20e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 21 Nov 2020 00:11:54 +0100
Subject: [PATCH 3192/3942] chromiumDev: Unmark the build as broken

The build succeeds again as dirmd is no longer required for building.
---
 .../networking/browsers/chromium/browser.nix         |  1 -
 .../networking/browsers/chromium/upstream-info.json  | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index c44968a41264..d3953da71d28 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -82,6 +82,5 @@ mkChromiumDerivation (base: rec {
     platforms = platforms.linux;
     hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
     timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
-    broken = channel == "dev"; # Blocked on https://bugs.chromium.org/p/chromium/issues/detail?id=1141896
   };
 })
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 1f360191937a..eb51135a2c6d 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -26,15 +26,15 @@
     }
   },
   "dev": {
-    "version": "88.0.4315.5",
-    "sha256": "0k6man2xq8vmnk73dqv3fcc9929agqq8j6s6nvc9z653q4jdphkw",
-    "sha256bin64": "0m139w8lwaawridk8in24ss1g1i6ah5298xky226k3vhk5i4mn3j",
+    "version": "88.0.4324.11",
+    "sha256": "123gqbxrn508wxdj3is0kzccml5zwnf8pfl90xdizvzcm3wy5315",
+    "sha256bin64": "11bswhxpnw7qi6lagfpgxh4yh56w7l0bc3rqwf975cbq2cnzpjby",
     "deps": {
       "gn": {
-        "version": "2020-10-21",
+        "version": "2020-11-05",
         "url": "https://gn.googlesource.com/gn",
-        "rev": "f5f465b52e5df6d4de9fbe67cc79f1914ba4dbfc",
-        "sha256": "1xb31vsvg27ivvcdyiq93h8wj4d90qdrpagfh1dvm6xszkajsca1"
+        "rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
+        "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
       }
     }
   }

From 1cfd48776d16f8a4f4b3ce32ae2613125f009d26 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 23:20:01 +0000
Subject: [PATCH 3193/3942] python37Packages.google_cloud_storage: 1.32.0 ->
 1.33.0

---
 .../python-modules/google_cloud_storage/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix
index bcb8b604e45c..a1b572db11e5 100644
--- a/pkgs/development/python-modules/google_cloud_storage/default.nix
+++ b/pkgs/development/python-modules/google_cloud_storage/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-storage";
-  version = "1.32.0";
+  version = "1.33.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "da12b7bd79bbe978a7945a44b600604fbc10ece2935d31f243e751f99135e34f";
+    sha256 = "900ba027bdee6b97f21cd22d1db3d1a6233ede5de2db4754db860438bdad72d2";
   };
 
   disabled = pythonOlder "3.5";

From c0f6699f5afc13614b57ef34b97dde8c673dfcd2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 00:01:04 +0000
Subject: [PATCH 3194/3942] python37Packages.sshtunnel: 0.2.2 -> 0.3.1

---
 pkgs/development/python-modules/sshtunnel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix
index b8f2ab998266..5254b5c4dcca 100644
--- a/pkgs/development/python-modules/sshtunnel/default.nix
+++ b/pkgs/development/python-modules/sshtunnel/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.2.2";
+  version = "0.3.1";
   pname = "sshtunnel";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1801b144b42b9bdb2f931923e85837f9193b877f3d490cd5776e1d4062c62fb4";
+    sha256 = "e0cac8a6a154c7a9651b42038e3f6cf35bb88c8ee4b94822b28a5b2fe7140f95";
   };
 
   propagatedBuildInputs = [ paramiko ];

From 79ce317395df96fcfe4b665a4780c0299134c698 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 20 Nov 2020 23:54:06 +0100
Subject: [PATCH 3195/3942] massif-visualizer: migrate to Qt5.15

---
 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 f2b3d51431f5..e9225edf94c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11546,7 +11546,7 @@ in
 
   lttv = callPackage ../development/tools/misc/lttv { };
 
-  massif-visualizer = libsForQt514.callPackage ../development/tools/analysis/massif-visualizer { };
+  massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
 
   maven = maven3;
   maven3 = callPackage ../development/tools/build-managers/apache-maven {

From 0f82bd767b16daa7e228464593bcf6b7dd4baae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
Date: Fri, 20 Nov 2020 21:15:42 +0100
Subject: [PATCH 3196/3942] nixos/gitlab: start gitaly after gitlab

---
 nixos/modules/services/misc/gitlab.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 56fd89c61232..c4037b49e7e2 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -756,7 +756,8 @@ in {
     };
 
     systemd.services.gitaly = {
-      after = [ "network.target" ];
+      after = [ "network.target" "gitlab.service" ];
+      requires = [ "gitlab.service" ];
       wantedBy = [ "multi-user.target" ];
       path = with pkgs; [
         openssh
@@ -845,7 +846,7 @@ in {
     };
 
     systemd.services.gitlab = {
-      after = [ "gitlab-workhorse.service" "gitaly.service" "network.target" "gitlab-postgresql.service" "redis.service" ];
+      after = [ "gitlab-workhorse.service" "network.target" "gitlab-postgresql.service" "redis.service" ];
       requires = [ "gitlab-sidekiq.service" ];
       wantedBy = [ "multi-user.target" ];
       environment = gitlabEnv;

From 2429d5a307198b2349dcc2b69dec63359622e222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
Date: Fri, 20 Nov 2020 21:02:55 +0100
Subject: [PATCH 3197/3942] gitlab: 13.5.1 -> 13.6.0

Changed ruby version to 2.7.x to match upstream.
Added a gem config for gitlab-pg_query as it tries to download a source
tarball during the build process.
Also removed a patch for gitaly that has become obsolete by upstream fix
[here](https://gitlab.com/gitlab-org/gitaly/-/commit/de04077c25cc23b001317d2efdf5a9ead0bc86b9).
---
 .../version-management/gitlab/data.json       |  14 +-
 .../version-management/gitlab/gitaly/Gemfile  |  11 +-
 .../gitlab/gitaly/Gemfile.lock                |  38 +--
 .../gitlab/gitaly/default.nix                 |  12 +-
 .../version-management/gitlab/gitaly/deps.nix |  59 ++--
 .../gitlab/gitaly/fix-executable-check.patch  |  13 -
 .../gitlab/gitaly/gemset.nix                  | 120 +-------
 .../gitlab/gitlab-shell/default.nix           |   4 +-
 .../gitlab/gitlab-workhorse/default.nix       |   4 +-
 .../gitlab/gitlab-workhorse/deps.nix          |   8 +-
 .../version-management/gitlab/rubyEnv/Gemfile |  36 ++-
 .../gitlab/rubyEnv/Gemfile.lock               | 146 +++++-----
 .../gitlab/rubyEnv/gemset.nix                 | 222 +++++++++------
 .../version-management/gitlab/update.py       |   6 +-
 .../version-management/gitlab/yarnPkgs.nix    | 256 ++++++++++++------
 .../ruby-modules/gem-config/default.nix       |  10 +
 pkgs/top-level/all-packages.nix               |  17 +-
 17 files changed, 505 insertions(+), 471 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index a235462ce545..40e9fc5234e1 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
 {
-  "version": "13.5.1",
-  "repo_hash": "1mb2kyyf5bczm93qn4nj3fqjgncsq98rr3414wx52lhcf4gl5w00",
+  "version": "13.6.0",
+  "repo_hash": "1flri1cgx8drwf46x4sja366aiiif0ww807xrrcxa05pxj0mx8k5",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v13.5.1-ee",
+  "rev": "v13.6.0-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "13.5.1",
-    "GITLAB_PAGES_VERSION": "1.28.0",
-    "GITLAB_SHELL_VERSION": "13.11.0",
-    "GITLAB_WORKHORSE_VERSION": "8.51.0"
+    "GITALY_SERVER_VERSION": "13.6.0",
+    "GITLAB_PAGES_VERSION": "1.30.0",
+    "GITLAB_SHELL_VERSION": "13.13.0",
+    "GITLAB_WORKHORSE_VERSION": "8.54.0"
   }
 }
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index 9016a64a0873..d8564dca8779 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -1,8 +1,5 @@
 source 'https://rubygems.org'
 
-# Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537
-gem 'bundler', '>= 1.17.3'
-
 gem 'rugged', '~> 0.28'
 gem 'github-linguist', '~> 7.11', require: 'linguist'
 gem 'gitlab-markup', '~> 1.7.1'
@@ -16,7 +13,7 @@ gem 'faraday', '~> 1.0'
 gem 'rbtrace', require: false
 
 # Labkit provides observability functionality
-gem 'gitlab-labkit', '~> 0.12.0'
+gem 'gitlab-labkit', '~> 0.13.2'
 
 # Detects the open source license the repository includes
 # This version needs to be in sync with GitLab CE/EE
@@ -33,10 +30,4 @@ group :development, :test do
   gem 'pry', '~> 0.12.2', require: false
 
   gem 'grpc-tools', '= 1.30.2'
-
-  # gitlab-shell spec gems
-  gem 'listen', '~> 0.5.0'
-  gem 'simplecov', '~> 0.17.1', require: false
-  gem 'vcr', '~> 4.0.0'
-  gem 'webmock', '~> 3.4.0'
 end
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index 451150f0eb3a..a633e067f0d9 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -24,9 +24,7 @@ GEM
     adamantium (0.2.0)
       ice_nine (~> 0.11.0)
       memoizable (~> 0.4.0)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
+    ast (2.4.1)
     binding_ninja (0.2.3)
     builder (3.2.4)
     charlock_holmes (0.7.7)
@@ -35,11 +33,8 @@ GEM
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
     concurrent-ruby (1.1.7)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
     crass (1.0.6)
     diff-lcs (1.3)
-    docile (1.3.2)
     equalizer (0.0.11)
     erubi (1.9.0)
     escape_utils (1.2.1)
@@ -67,11 +62,11 @@ GEM
     gitlab-gollum-rugged_adapter (0.4.4.2)
       mime-types (>= 1.15)
       rugged (~> 0.25)
-    gitlab-labkit (0.12.0)
+    gitlab-labkit (0.13.2)
       actionpack (>= 5.0.0, < 6.1.0)
       activesupport (>= 5.0.0, < 6.1.0)
       grpc (~> 1.19)
-      jaeger-client (~> 0.10)
+      jaeger-client (~> 1.1)
       opentracing (~> 0.4)
       redis (> 3.0.0, < 5.0.0)
     gitlab-markup (1.7.1)
@@ -82,17 +77,15 @@ GEM
       google-protobuf (~> 3.12)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.30.2)
-    hashdiff (0.3.9)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    jaeger-client (0.10.0)
+    jaeger-client (1.1.0)
       opentracing (~> 0.3)
       thrift
     json (2.3.1)
     licensee (8.9.2)
       rugged (~> 0.24)
-    listen (0.5.3)
     loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -114,8 +107,8 @@ GEM
     opentracing (0.5.0)
     optimist (3.0.1)
     parallel (1.19.2)
-    parser (2.7.0.5)
-      ast (~> 2.4.0)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
     proc_to_ast (0.1.0)
       coderay
       parser
@@ -124,7 +117,6 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.3)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -175,18 +167,12 @@ GEM
       parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
     rugged (0.28.4.1)
-    safe_yaml (1.0.5)
     sanitize (4.6.6)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
     sentry-raven (3.0.4)
       faraday (>= 1.0)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
     stringex (2.8.5)
     thread_safe (0.3.6)
     thrift (0.11.0.0)
@@ -202,11 +188,6 @@ GEM
       equalizer (~> 0.0.9)
       parser (>= 2.6.5)
       procto (~> 0.0.2)
-    vcr (4.0.0)
-    webmock (3.4.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
     zeitwerk (2.4.0)
 
 PLATFORMS
@@ -214,19 +195,17 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 6.0.3.3)
-  bundler (>= 1.17.3)
   factory_bot
   faraday (~> 1.0)
   github-linguist (~> 7.11)
   gitlab-gollum-lib (~> 4.2.7.9)
   gitlab-gollum-rugged_adapter (~> 0.4.4.2)
-  gitlab-labkit (~> 0.12.0)
+  gitlab-labkit (~> 0.13.2)
   gitlab-markup (~> 1.7.1)
   google-protobuf (~> 3.12)
   grpc (~> 1.30.2)
   grpc-tools (= 1.30.2)
   licensee (~> 8.9.0)
-  listen (~> 0.5.0)
   pry (~> 0.12.2)
   rbtrace
   rdoc (~> 6.0)
@@ -235,10 +214,7 @@ DEPENDENCIES
   rubocop (~> 0.69)
   rugged (~> 0.28)
   sentry-raven (~> 3.0)
-  simplecov (~> 0.17.1)
   timecop
-  vcr (~> 4.0.0)
-  webmock (~> 3.4.0)
 
 BUNDLED WITH
    2.1.4
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 0b1774e440a7..51818072d396 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -19,22 +19,16 @@ let
       };
   };
 in buildGoPackage rec {
-  version = "13.5.1";
+  version = "13.6.0";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "1vkifmp56lkgj178na7pqd5h9yxffcy78yaz7ykd4rmgi4c8ayk8";
+    sha256 = "1b3vjg5sxrg8cfxn1nh8j26h847kxrfnn2chbb5v3ivhp1kp6zh2";
   };
 
-  # Fix a check which assumes that hook files are writeable by their
-  # owner.
-  patches = [
-    ./fix-executable-check.patch
-  ];
-
   goPackagePath = "gitlab.com/gitlab-org/gitaly";
 
   passthru = {
@@ -48,7 +42,7 @@ in buildGoPackage rec {
 
   postInstall = ''
     mkdir -p $ruby
-    cp -rv $src/ruby/{bin,lib,proto,git-hooks,gitlab-shell} $ruby
+    cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby
   '';
 
   outputs = [ "out" "ruby" ];
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
index 3aec5d10186f..532fc9faa89d 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@@ -428,8 +428,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/getsentry/raven-go";
-      rev = "v0.1.2";
-      sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
+      rev = "v0.2.0";
+      sha256 = "0imfwmsb72168fqandf2lxhzhngf2flxhzaar8hcnnfjv2a291lf";
     };
   }
   {
@@ -437,8 +437,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/getsentry/sentry-go";
-      rev = "v0.5.1";
-      sha256 = "1kfn0gcb4c6amhagv04ydpl6p9cqw7f0lxas688a0rf89iwdzz89";
+      rev = "v0.7.0";
+      sha256 = "13n9r7845wsq9z61rbvlqjjjg4aifplc74v3kv0i1lys2fw8a5k9";
     };
   }
   {
@@ -1395,6 +1395,15 @@
       sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg";
     };
   }
+  {
+    goPackagePath = "github.com/oklog/ulid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/oklog/ulid";
+      rev = "v2.0.2";
+      sha256 = "1apm4r23kxsm0c9hlxsr7xh6xwrk2cjqylbpxd4ffxbl6bwflja0";
+    };
+  }
   {
     goPackagePath = "github.com/olekukonko/tablewriter";
     fetch = {
@@ -1436,8 +1445,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/opentracing/opentracing-go";
-      rev = "v1.0.2";
-      sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
+      rev = "v1.2.0";
+      sha256 = "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h";
     };
   }
   {
@@ -1467,6 +1476,15 @@
       sha256 = "0kfc95jc2hfgwzcpdfa5hrxgj7s6rzx5jc0n1sn863bsngx2q1ca";
     };
   }
+  {
+    goPackagePath = "github.com/pborman/getopt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pborman/getopt";
+      rev = "7148bc3a4c30";
+      sha256 = "0zhvvmv671r1fbdd5hbv3flx8k2rb60giqx115w0553c56qkqfpj";
+    };
+  }
   {
     goPackagePath = "github.com/pelletier/go-toml";
     fetch = {
@@ -1634,8 +1652,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/sirupsen/logrus";
-      rev = "v1.6.0";
-      sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj";
+      rev = "v1.7.0";
+      sha256 = "1a59pw7zimvm8k423iq9l4f4qjj1ia1xc6pkmhwl2mxc46y2n442";
     };
   }
   {
@@ -1733,8 +1751,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "v1.5.1";
-      sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
+      rev = "v1.6.1";
+      sha256 = "1yhiqqzjvi63pf01rgzx68gqkkvjx03fvl5wk30br5l6s81s090l";
     };
   }
   {
@@ -1913,8 +1931,8 @@
     fetch = {
       type = "git";
       url = "https://gitlab.com/gitlab-org/gitlab-shell.git";
-      rev = "1a2bfecd2f0e";
-      sha256 = "197b3yn7lp6dbzcgxrj3ns2a839adcfmcwi3h53i1sr6952ciayx";
+      rev = "3f9890ef73dc";
+      sha256 = "1zx7x3g18xzw7fs7cayd20llxabv5r93m2mp6ixgr99ksvi6zix7";
     };
   }
   {
@@ -1922,8 +1940,8 @@
     fetch = {
       type = "git";
       url = "https://gitlab.com/gitlab-org/labkit.git";
-      rev = "45895e129029";
-      sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48";
+      rev = "40dcf811328c";
+      sha256 = "1x22iz53wjg1qps0bnr4lniik09szmy99ny2kb6smjpv9cr6klw7";
     };
   }
   {
@@ -2030,8 +2048,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "af09f7315aff";
-      sha256 = "0kr94lzr8ngrc6913j5xh6g4r7g087dbdgnpzi6rjcl0bf8nsr22";
+      rev = "e3ed0017c211";
+      sha256 = "0nz91nxgfcbcxirscdrxcq5a97z5pyz0g0k2chjxx228dz59aw1i";
     };
   }
   {
@@ -2250,6 +2268,15 @@
       sha256 = "1md0hlyd9s6myv3663i9l59y74n4xjazifmmyxn43g86fgkc5lzj";
     };
   }
+  {
+    goPackagePath = "gopkg.in/yaml.v3";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v3";
+      rev = "9f266ea9e77c";
+      sha256 = "1bbai3lzb50m0x2vwsdbagrbhvfylj9k1m32hgbqwldqx4p9ay35";
+    };
+  }
   {
     goPackagePath = "honnef.co/go/tools";
     fetch = {
diff --git a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch b/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch
deleted file mode 100644
index 7221377e33cd..000000000000
--- a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go
-index 993e095d..f9bbb943 100644
---- a/internal/gitaly/config/config.go
-+++ b/internal/gitaly/config/config.go
-@@ -217,7 +217,7 @@ func checkExecutable(path string) error {
- 		return err
- 	}
- 
--	if fi.Mode()&0755 < 0755 {
-+	if fi.Mode()&0555 < 0555 {
- 		return fmt.Errorf("not executable: %v", path)
- 	}
- 
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index d09532187203..9cdadec5d4fb 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -49,24 +49,15 @@
     };
     version = "0.2.0";
   };
-  addressable = {
-    dependencies = ["public_suffix"];
+  ast = {
     groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
+      sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a";
       type = "gem";
     };
-    version = "2.6.0";
-  };
-  ast = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
-      type = "gem";
-    };
-    version = "2.4.0";
+    version = "2.4.1";
   };
   binding_ninja = {
     groups = ["default" "development" "test"];
@@ -125,15 +116,6 @@
     };
     version = "1.1.7";
   };
-  crack = {
-    dependencies = ["safe_yaml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
-      type = "gem";
-    };
-    version = "0.4.3";
-  };
   crass = {
     groups = ["default"];
     platforms = [];
@@ -152,16 +134,6 @@
     };
     version = "1.3";
   };
-  docile = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif";
-      type = "gem";
-    };
-    version = "1.3.2";
-  };
   equalizer = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -276,10 +248,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0a63zgjll83b25hiq8m4sk75jci2rj8z46lss0j3bc6zi3pxnzax";
+      sha256 = "0vgd61xdclihifcdivddfs1gipxy1ql0kf9q47k9h0xisscyjhd2";
       type = "gem";
     };
-    version = "0.12.0";
+    version = "0.13.2";
   };
   gitlab-markup = {
     groups = ["default"];
@@ -333,16 +305,6 @@
     };
     version = "1.30.2";
   };
-  hashdiff = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x";
-      type = "gem";
-    };
-    version = "0.3.9";
-  };
   i18n = {
     dependencies = ["concurrent-ruby"];
     groups = ["default" "development" "test"];
@@ -368,10 +330,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
+      sha256 = "1a2qlkc1hkr5hkj2574l1a63sm04bdx98gfhh9m8vvp6psdrnpnb";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "1.1.0";
   };
   json = {
     groups = ["default" "development" "test"];
@@ -392,14 +354,6 @@
     };
     version = "8.9.2";
   };
-  listen = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl";
-      type = "gem";
-    };
-    version = "0.5.3";
-  };
   loofah = {
     dependencies = ["crass" "nokogiri"];
     groups = ["default"];
@@ -553,10 +507,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0iirjc36irgwpfb58jdf9gli382cj893y9caqhxas8anpzzlikgc";
+      sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z";
       type = "gem";
     };
-    version = "2.7.0.5";
+    version = "2.7.2.0";
   };
   proc_to_ast = {
     dependencies = ["coderay" "parser" "unparser"];
@@ -584,14 +538,6 @@
     };
     version = "0.12.2";
   };
-  public_suffix = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
-      type = "gem";
-    };
-    version = "3.0.3";
-  };
   rack = {
     groups = ["default"];
     platforms = [];
@@ -811,16 +757,6 @@
     };
     version = "0.28.4.1";
   };
-  safe_yaml = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
-      type = "gem";
-    };
-    version = "1.0.5";
-  };
   sanitize = {
     dependencies = ["crass" "nokogiri" "nokogumbo"];
     source = {
@@ -841,27 +777,6 @@
     };
     version = "3.0.4";
   };
-  simplecov = {
-    dependencies = ["docile" "json" "simplecov-html"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw";
-      type = "gem";
-    };
-    version = "0.17.1";
-  };
-  simplecov-html = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn";
-      type = "gem";
-    };
-    version = "0.10.2";
-  };
   stringex = {
     groups = ["default"];
     platforms = [];
@@ -930,23 +845,6 @@
     };
     version = "0.4.7";
   };
-  vcr = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr";
-      type = "gem";
-    };
-    version = "4.0.0";
-  };
-  webmock = {
-    dependencies = ["addressable" "crack" "hashdiff"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib";
-      type = "gem";
-    };
-    version = "3.4.2";
-  };
   zeitwerk = {
     groups = ["default" "development" "test"];
     platforms = [];
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index f918bfb1cab6..1e48b569c650 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -2,12 +2,12 @@
 
 buildGoPackage rec {
   pname = "gitlab-shell";
-  version = "13.11.0";
+  version = "13.13.0";
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "1m18v5qax14qz0a0ifpl96i4p5caysls33hg93q1x83x1xryxd54";
+    sha256 = "1zx7x3g18xzw7fs7cayd20llxabv5r93m2mp6ixgr99ksvi6zix7";
   };
 
   buildInputs = [ ruby ];
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index f6d633af2c47..0ec96a8f9eaf 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   pname = "gitlab-workhorse";
 
-  version = "8.51.0";
+  version = "8.54.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "012xbnd4lqfv478bbd2r9jhnb2f162gsa5y77z3by0kqqpsglgl5";
+    sha256 = "0fz00sl9q4d3vbslh7y9nsnhjshgfg0x7mv7b7a9sc3mxmabp7gz";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
index d8433778ae20..987970917d53 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
@@ -347,8 +347,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/certifi/gocertifi";
-      rev = "ee1a9a0726d2";
-      sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4";
+      rev = "2c3bb06c6054";
+      sha256 = "00g5jy613nkm96k6ylbcwdwpdhm84mvw2gqr3gmj5mhwmsc8x97p";
     };
   }
   {
@@ -671,8 +671,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/getsentry/raven-go";
-      rev = "v0.1.2";
-      sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
+      rev = "v0.2.0";
+      sha256 = "0imfwmsb72168fqandf2lxhzhngf2flxhzaar8hcnnfjv2a291lf";
     };
   }
   {
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 51f9d36cef90..d60fefe29dca 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -19,7 +19,7 @@ gem 'default_value_for', '~> 3.3.0'
 gem 'pg', '~> 1.1'
 
 gem 'rugged', '~> 0.28'
-gem 'grape-path-helpers', '~> 1.4'
+gem 'grape-path-helpers', '~> 1.5'
 
 gem 'faraday', '~> 1.0'
 gem 'marginalia', '~> 1.9.0'
@@ -48,7 +48,7 @@ gem 'omniauth-authentiq', '~> 0.3.3'
 gem 'omniauth_openid_connect', '~> 0.3.5'
 gem 'omniauth-salesforce', '~> 1.0.5'
 gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
-gem 'rack-oauth2', '~> 1.9.3'
+gem 'rack-oauth2', '~> 1.16.0'
 gem 'jwt', '~> 2.1.0'
 
 # Kerberos authentication. EE-only
@@ -98,6 +98,7 @@ gem 'graphql', '~> 1.11.4'
 gem 'graphiql-rails', '~> 1.4.10'
 gem 'apollo_upload_server', '~> 2.0.2'
 gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
+gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
 
 gem 'hashie'
 # Disable strong_params so that Mash does not respond to :permitted?
@@ -118,7 +119,7 @@ gem 'fog-aws', '~> 3.5'
 # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
 # Also see config/initializers/fog_core_patch.rb.
 gem 'fog-core', '= 2.1.0'
-gem 'fog-google', '~> 1.10'
+gem 'fog-google', '~> 1.11'
 gem 'fog-local', '~> 0.6'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'
@@ -158,7 +159,7 @@ gem 'wikicloth', '0.8.1'
 gem 'asciidoctor', '~> 2.0.10'
 gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
 gem 'asciidoctor-plantuml', '~> 0.0.12'
-gem 'rouge', '~> 3.24.0'
+gem 'rouge', '~> 3.25.0'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
 gem 'nokogiri', '~> 1.10.9'
@@ -172,7 +173,7 @@ gem 'diffy', '~> 3.3'
 gem 'diff_match_patch', '~> 0.1.0'
 
 # Application server
-gem 'rack', '~> 2.1.4'
+gem 'rack', '~> 2.2.3'
 # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
 gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
 
@@ -271,9 +272,6 @@ gem 'loofah', '~> 2.2'
 # Working with license
 gem 'licensee', '~> 8.9'
 
-# Ace editor
-gem 'ace-rails-ap', '~> 4.1.0'
-
 # Detect and convert string character encoding
 gem 'charlock_holmes', '~> 0.7.7'
 
@@ -307,13 +305,16 @@ gem 'rack-attack', '~> 6.3.0'
 # Sentry integration
 gem 'sentry-raven', '~> 3.0'
 
+# PostgreSQL query parsing
+gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query'
+
 gem 'premailer-rails', '~> 1.10.3'
 
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.12.2'
+gem 'gitlab-labkit', '0.13.1'
 
 # I18n
-gem 'ruby_parser', '~> 3.8', require: false
+gem 'ruby_parser', '~> 3.15', require: false
 gem 'rails-i18n', '~> 6.0'
 gem 'gettext_i18n_rails', '~> 1.8.0'
 gem 'gettext_i18n_rails_js', '~> 1.3'
@@ -366,22 +367,19 @@ group :development, :test do
   # Generate Fake data
   gem 'ffaker', '~> 2.10'
 
-  gem 'spring', '~> 2.0.0'
+  gem 'spring', '~> 2.1.0'
   gem 'spring-commands-rspec', '~> 1.0.4'
 
-  gem 'gitlab-styles', '~> 4.3.0', require: false
-  # Pin these dependencies, otherwise a new rule could break the CI pipelines
-  gem 'rubocop', '~> 0.82.0'
-  gem 'rubocop-performance', '~> 1.5.2'
-  gem 'rubocop-rspec', '~> 1.37.0'
+  gem 'gitlab-styles', '~> 5.1.0', require: false
 
-  gem 'scss_lint', '~> 0.56.0', require: false
-  gem 'haml_lint', '~> 0.34.0', require: false
+  gem 'scss_lint', '~> 0.59.0', require: false
+  gem 'haml_lint', '~> 0.36.0', require: false
   gem 'bundler-audit', '~> 0.6.1', require: false
 
   gem 'benchmark-ips', '~> 2.3.0', require: false
 
   gem 'knapsack', '~> 1.17'
+  gem 'crystalball', '~> 0.7.0', require: false
 
   gem 'simple_po_parser', '~> 1.1.2', require: false
 
@@ -407,7 +405,7 @@ end
 group :test do
   gem 'fuubar', '~> 2.2.0'
   gem 'rspec-retry', '~> 0.6.1'
-  gem 'rspec_profiling', '~> 0.0.5'
+  gem 'rspec_profiling', '~> 0.0.6'
   gem 'rspec-parameterized', require: false
 
   gem 'capybara', '~> 3.33.0'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index 2ad66f6e6c0d..64179847dd8c 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -3,7 +3,6 @@ GEM
   specs:
     RedCloth (4.3.2)
     abstract_type (0.0.7)
-    ace-rails-ap (4.1.2)
     acme-client (2.0.6)
       faraday (>= 0.17, < 2.0.0)
     actioncable (6.0.3.3)
@@ -71,7 +70,7 @@ GEM
       memoizable (~> 0.4.0)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aes_key_wrap (1.0.1)
+    aes_key_wrap (1.1.0)
     akismet (3.0.0)
     android_key_attestation (0.3.0)
     apollo_upload_server (2.0.2)
@@ -87,7 +86,7 @@ GEM
       asciidoctor (>= 1.5.6, < 3.0.0)
     asciidoctor-plantuml (0.0.12)
       asciidoctor (>= 1.5.6, < 3.0.0)
-    ast (2.4.0)
+    ast (2.4.1)
     atlassian-jwt (0.2.0)
       jwt (~> 2.1.0)
     attr_encrypted (3.1.0)
@@ -133,7 +132,7 @@ GEM
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
-    bindata (2.4.3)
+    bindata (2.4.8)
     binding_ninja (0.2.3)
     bootsnap (1.4.6)
       msgpack (~> 1.0)
@@ -199,6 +198,8 @@ GEM
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
     creole (0.5.0)
+    crystalball (0.7.0)
+      git
     css_parser (1.7.0)
       addressable
     daemons (1.2.6)
@@ -368,11 +369,12 @@ GEM
       excon (~> 0.58)
       formatador (~> 0.2)
       mime-types
-    fog-google (1.10.0)
+    fog-google (1.11.0)
       fog-core (<= 2.1.0)
       fog-json (~> 1.2)
       fog-xml (~> 0.1.0)
       google-api-client (>= 0.32, < 0.34)
+      google-cloud-env (~> 1.2)
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
@@ -428,17 +430,18 @@ GEM
       fog-json (~> 1.2.0)
       mime-types
       ms_rest_azure (~> 0.12.0)
-    gitlab-labkit (0.12.2)
+    gitlab-labkit (0.13.1)
       actionpack (>= 5.0.0, < 6.1.0)
       activesupport (>= 5.0.0, < 6.1.0)
       grpc (~> 1.19)
-      jaeger-client (~> 0.10)
+      jaeger-client (~> 1.1)
       opentracing (~> 0.4)
       redis (> 3.0.0, < 5.0.0)
     gitlab-license (1.0.0)
     gitlab-mail_room (0.0.7)
     gitlab-markup (1.7.1)
     gitlab-net-dns (0.9.1)
+    gitlab-pg_query (1.3.0)
     gitlab-puma (4.3.5.gitlab.3)
       nio4r (~> 2.0)
     gitlab-puma_worker_killer (0.1.1.gitlab.1)
@@ -446,12 +449,12 @@ GEM
       gitlab-puma (>= 2.7, < 5)
     gitlab-sidekiq-fetcher (0.5.2)
       sidekiq (~> 5)
-    gitlab-styles (4.3.0)
-      rubocop (~> 0.82.0)
+    gitlab-styles (5.1.0)
+      rubocop (~> 0.89.1)
       rubocop-gitlab-security (~> 0.1.0)
-      rubocop-performance (~> 1.5.2)
-      rubocop-rails (~> 2.5)
-      rubocop-rspec (~> 1.36)
+      rubocop-performance (~> 1.8.1)
+      rubocop-rails (~> 2.8)
+      rubocop-rspec (~> 1.44)
     gitlab_chronic_duration (0.10.6.2)
       numerizer (~> 0.2)
     gitlab_omniauth-ldap (2.1.1)
@@ -473,6 +476,8 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
       signet (~> 0.12)
+    google-cloud-env (1.4.0)
+      faraday (>= 0.17.3, < 2.0)
     google-protobuf (3.12.4)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
@@ -495,17 +500,24 @@ GEM
     grape-entity (0.7.1)
       activesupport (>= 4.0)
       multi_json (>= 1.3.2)
-    grape-path-helpers (1.4.0)
+    grape-path-helpers (1.5.0)
       activesupport
       grape (~> 1.3)
-      rake (~> 12)
+      rake (> 12)
     grape_logging (1.8.3)
       grape
       rack
     graphiql-rails (1.4.10)
       railties
       sprockets-rails
+    graphlient (0.4.0)
+      faraday (>= 1.0)
+      faraday_middleware
+      graphql-client
     graphql (1.11.4)
+    graphql-client (0.16.0)
+      activesupport (>= 3.0)
+      graphql (~> 1.8)
     graphql-docs (1.6.0)
       commonmarker (~> 0.16)
       escape_utils (~> 1.2)
@@ -536,8 +548,9 @@ GEM
     haml (5.1.2)
       temple (>= 0.8.0)
       tilt
-    haml_lint (0.34.0)
-      haml (>= 4.0, < 5.2)
+    haml_lint (0.36.0)
+      haml (>= 4.0, < 5.3)
+      parallel (~> 1.10)
       rainbow
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
@@ -586,10 +599,9 @@ GEM
     invisible_captcha (0.12.1)
       rails (>= 3.2.0)
     ipaddress (0.8.3)
-    jaeger-client (0.10.0)
+    jaeger-client (1.1.0)
       opentracing (~> 0.3)
       thrift
-    jaro_winkler (1.5.4)
     jira-ruby (2.0.0)
       activesupport
       atlassian-jwt
@@ -601,7 +613,7 @@ GEM
       regexp_parser (~> 1.5)
       regexp_property_values (~> 0.3)
     json (2.3.0)
-    json-jwt (1.11.0)
+    json-jwt (1.13.0)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
@@ -821,9 +833,9 @@ GEM
       rubypants (~> 0.2)
     orm_adapter (0.5.0)
     os (1.0.0)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
     parslet (1.8.2)
     peek (1.1.0)
       railties (>= 4.0.0)
@@ -855,19 +867,19 @@ GEM
     public_suffix (4.0.6)
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.1.6)
-    rack (2.1.4)
+    rack (2.2.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.3.0)
       rack (>= 1.0, < 3)
     rack-cors (1.0.6)
       rack (>= 1.6.0)
-    rack-oauth2 (1.9.3)
+    rack-oauth2 (1.16.0)
       activesupport
       attr_required
       httpclient
-      json-jwt (>= 1.9.0)
-      rack
+      json-jwt (>= 1.11.0)
+      rack (>= 2.1.0)
     rack-protection (2.0.5)
       rack
     rack-proxy (0.6.0)
@@ -910,7 +922,7 @@ GEM
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     raindrops (0.19.1)
-    rake (12.3.3)
+    rake (13.0.1)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -945,7 +957,7 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.8.1)
       redis (>= 4, < 5)
-    regexp_parser (1.5.1)
+    regexp_parser (1.8.2)
     regexp_property_values (0.3.5)
     representable (3.0.4)
       declarative (< 0.1.0)
@@ -965,7 +977,7 @@ GEM
     rexml (3.2.4)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (3.24.0)
+    rouge (3.25.0)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -1001,29 +1013,34 @@ GEM
     rspec-support (3.9.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rspec_profiling (0.0.5)
+    rspec_profiling (0.0.6)
       activerecord
       pg
       rails
       sqlite3
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.89.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.8.0)
+      parser (>= 2.7.1.5)
     rubocop-gitlab-security (0.1.1)
       rubocop (>= 0.51)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    rubocop-rails (2.5.2)
-      activesupport
+    rubocop-performance (1.8.1)
+      rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.8.1)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
-    rubocop-rspec (1.37.0)
-      rubocop (>= 0.68.1)
+      rubocop (>= 0.87.0)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
     ruby-enum (0.7.2)
       i18n
     ruby-fogbugz (0.2.1)
@@ -1034,7 +1051,7 @@ GEM
       nokogiri (>= 1.5.10)
     ruby-statistics (2.1.2)
     ruby2_keywords (0.0.2)
-    ruby_parser (3.13.1)
+    ruby_parser (3.15.0)
       sexp_processor (~> 4.9)
     rubyntlm (0.6.2)
     rubypants (0.2.0)
@@ -1064,9 +1081,8 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    scss_lint (0.56.0)
-      rake (>= 0.9, < 13)
-      sass (~> 3.5.3)
+    scss_lint (0.59.0)
+      sass (~> 3.5, >= 3.5.5)
     securecompare (1.0.0)
     seed-fu (2.3.7)
       activerecord (>= 3.1)
@@ -1077,7 +1093,7 @@ GEM
     sentry-raven (3.0.4)
       faraday (>= 1.0)
     settingslogic (2.0.9)
-    sexp_processor (4.12.0)
+    sexp_processor (4.15.1)
     shellany (0.0.1)
     shoulda-matchers (4.0.1)
       activesupport (>= 4.2.0)
@@ -1105,8 +1121,7 @@ GEM
     slack-messenger (2.3.4)
     snowplow-tracker (0.6.1)
       contracts (~> 0.7, <= 0.11)
-    spring (2.0.2)
-      activesupport (>= 4.2)
+    spring (2.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (3.7.2)
@@ -1146,7 +1161,7 @@ GEM
       rack (>= 1, < 3)
     thor (0.20.3)
     thread_safe (0.3.6)
-    thrift (0.11.0.0)
+    thrift (0.13.0)
     tilt (2.0.10)
     timecop (0.9.1)
     timeliness (0.3.10)
@@ -1162,7 +1177,7 @@ GEM
     truncato (0.7.11)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.7.0, <= 2.0)
-    tzinfo (1.2.7)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
     u2f (0.2.1)
     uber (0.1.0)
@@ -1236,14 +1251,13 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yajl-ruby (1.4.1)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   RedCloth (~> 4.3.2)
-  ace-rails-ap (~> 4.1.0)
   acme-client (~> 2.0, >= 2.0.6)
   activerecord-explain-analyze (~> 0.1)
   acts-as-taggable-on (~> 6.0)
@@ -1283,6 +1297,7 @@ DEPENDENCIES
   connection_pool (~> 2.0)
   countries (~> 3.0)
   creole (~> 0.5.0)
+  crystalball (~> 0.7.0)
   danger (~> 8.0.6)
   database_cleaner (~> 1.7.0)
   deckar01-task_list (= 2.3.1)
@@ -1316,7 +1331,7 @@ DEPENDENCIES
   fog-aliyun (~> 0.3)
   fog-aws (~> 3.5)
   fog-core (= 2.1.0)
-  fog-google (~> 1.10)
+  fog-google (~> 1.11)
   fog-local (~> 0.6)
   fog-openstack (~> 1.0)
   fog-rackspace (~> 0.1.1)
@@ -1331,15 +1346,16 @@ DEPENDENCIES
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
   gitlab-fog-azure-rm (~> 1.0)
-  gitlab-labkit (= 0.12.2)
+  gitlab-labkit (= 0.13.1)
   gitlab-license (~> 1.0)
   gitlab-mail_room (~> 0.0.7)
   gitlab-markup (~> 1.7.1)
   gitlab-net-dns (~> 0.9.1)
+  gitlab-pg_query (~> 1.3)
   gitlab-puma (~> 4.3.3.gitlab.2)
   gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
   gitlab-sidekiq-fetcher (= 0.5.2)
-  gitlab-styles (~> 4.3.0)
+  gitlab-styles (~> 5.1.0)
   gitlab_chronic_duration (~> 0.10.6.2)
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.2)
@@ -1348,15 +1364,16 @@ DEPENDENCIES
   gpgme (~> 2.0.19)
   grape (= 1.4.0)
   grape-entity (~> 0.7.1)
-  grape-path-helpers (~> 1.4)
+  grape-path-helpers (~> 1.5)
   grape_logging (~> 1.7)
   graphiql-rails (~> 1.4.10)
+  graphlient (~> 0.4.0)
   graphql (~> 1.11.4)
   graphql-docs (~> 1.6.0)
   grpc (~> 1.30.2)
   gssapi
   guard-rspec
-  haml_lint (~> 0.34.0)
+  haml_lint (~> 0.36.0)
   hamlit (~> 2.11.0)
   hangouts-chat (~> 0.0.5)
   hashie
@@ -1429,10 +1446,10 @@ DEPENDENCIES
   prometheus-client-mmap (~> 0.12.0)
   pry-byebug (~> 3.9.0)
   pry-rails (~> 0.3.9)
-  rack (~> 2.1.4)
+  rack (~> 2.2.3)
   rack-attack (~> 6.3.0)
   rack-cors (~> 1.0.6)
-  rack-oauth2 (~> 1.9.3)
+  rack-oauth2 (~> 1.16.0)
   rack-proxy (~> 0.6.0)
   rack-timeout (~> 0.5.1)
   rails (~> 6.0.3.1)
@@ -1451,25 +1468,22 @@ DEPENDENCIES
   request_store (~> 1.5)
   responders (~> 3.0)
   retriable (~> 3.1.2)
-  rouge (~> 3.24.0)
+  rouge (~> 3.25.0)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
   rspec-rails (~> 4.0.0)
   rspec-retry (~> 0.6.1)
   rspec_junit_formatter
-  rspec_profiling (~> 0.0.5)
-  rubocop (~> 0.82.0)
-  rubocop-performance (~> 1.5.2)
-  rubocop-rspec (~> 1.37.0)
+  rspec_profiling (~> 0.0.6)
   ruby-fogbugz (~> 0.2.1)
   ruby-prof (~> 1.3.0)
   ruby-progressbar
-  ruby_parser (~> 3.8)
+  ruby_parser (~> 3.15)
   rubyzip (~> 2.0.0)
   rugged (~> 0.28)
   sanitize (~> 5.2.1)
   sassc-rails (~> 2.1.0)
-  scss_lint (~> 0.56.0)
+  scss_lint (~> 0.59.0)
   seed-fu (~> 2.3.7)
   selenium-webdriver (~> 3.142)
   sentry-raven (~> 3.0)
@@ -1482,7 +1496,7 @@ DEPENDENCIES
   simplecov-cobertura (~> 1.3.1)
   slack-messenger (~> 2.3.4)
   snowplow-tracker (~> 0.6.1)
-  spring (~> 2.0.0)
+  spring (~> 2.1.0)
   spring-commands-rspec (~> 1.0.4)
   sprockets (~> 3.7.0)
   sshkey (~> 2.0)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index c6425f3389c3..651b418234c4 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -9,16 +9,6 @@
     };
     version = "0.0.7";
   };
-  ace-rails-ap = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "14wj9gsiy7rm0lvs27ffsrh92wndjksj6rlfj3n7jhv1v77w9v2h";
-      type = "gem";
-    };
-    version = "4.1.2";
-  };
   acme-client = {
     dependencies = ["faraday"];
     groups = ["default"];
@@ -200,10 +190,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07";
+      sha256 = "19bn0y70qm6mfj4y1m0j3s8ggh6dvxwrwrj5vfamhdrpddsz8ddr";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.1.0";
   };
   akismet = {
     groups = ["default"];
@@ -284,10 +274,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
+      sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.4.1";
   };
   atlassian-jwt = {
     dependencies = ["jwt"];
@@ -525,10 +515,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr";
+      sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic";
       type = "gem";
     };
-    version = "2.4.3";
+    version = "2.4.8";
   };
   binding_ninja = {
     groups = ["default" "development" "test"];
@@ -882,6 +872,17 @@
     };
     version = "0.5.0";
   };
+  crystalball = {
+    dependencies = ["git"];
+    groups = ["development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1why2py76hv2m7i3a1im3zi5zcjcvz2l1nvshzndlwah58vrywkf";
+      type = "gem";
+    };
+    version = "0.7.0";
+  };
   css_parser = {
     dependencies = ["addressable"];
     groups = ["default"];
@@ -1606,15 +1607,15 @@
     version = "2.1.0";
   };
   fog-google = {
-    dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
+    dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10gwq4lz09386wdl4y9sqkdwy16phs439bfii7vz47s64fvg9gn5";
+      sha256 = "1h9apmm2pyb157pbnrqk37wfs2d9f35navsgzs3kclrxhyl2qm5f";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.11.0";
   };
   fog-json = {
     dependencies = ["fog-core" "multi_json"];
@@ -1839,10 +1840,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0k9f3a82727bhhhk8sjyjndpx4p5lwk3x03m06h4w59bpxa917sw";
+      sha256 = "0cnrpqswicawhpvd4dh4jcma9d4haznc4gyl37ssvj1jkfhc4w40";
       type = "gem";
     };
-    version = "0.12.2";
+    version = "0.13.1";
   };
   gitlab-license = {
     groups = ["default"];
@@ -1884,6 +1885,16 @@
     };
     version = "0.9.1";
   };
+  gitlab-pg_query = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xvzs8gy6vbddzf9kin92lqb99vzwljikfgqvxbxqm7hzl16dilq";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
   gitlab-puma = {
     dependencies = ["nio4r"];
     groups = ["puma"];
@@ -1923,10 +1934,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vw4kbmxiccq7r1ijgccq35cqf34bvy2l5p9chxr2g8hlx5rd4kw";
+      sha256 = "0l24vgcmvval1apqk99c3ifcwlg1fh60vf02ggnc20f65dka81p3";
       type = "gem";
     };
-    version = "4.3.0";
+    version = "5.1.0";
   };
   gitlab_chronic_duration = {
     dependencies = ["numerizer"];
@@ -1983,6 +1994,17 @@
     };
     version = "0.33.2";
   };
+  google-cloud-env = {
+    dependencies = ["faraday"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
   google-protobuf = {
     groups = ["default"];
     platforms = [];
@@ -2054,10 +2076,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "175a07vv77k1kyilrgkhpr1vdswcywymgrmr4mmp434w17w0hlrg";
+      sha256 = "131s6a0xa0fj7w5d6xb2p2z3404w6rxbc33v7fcg50jrjgqphrjz";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.5.0";
   };
   grape_logging = {
     dependencies = ["grape" "rack"];
@@ -2081,6 +2103,17 @@
     };
     version = "1.4.10";
   };
+  graphlient = {
+    dependencies = ["faraday" "faraday_middleware" "graphql-client"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04c32rcn3j4d8sh039lkdfzn8xpifsbpsp7f90vlp2s531wbs16a";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
   graphql = {
     groups = ["default" "development" "test"];
     platforms = [];
@@ -2091,6 +2124,17 @@
     };
     version = "1.11.4";
   };
+  graphql-client = {
+    dependencies = ["activesupport" "graphql"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g971rccyrs3rk8812r6az54p28g66m4ngdcbszg31mvddjaqkr4";
+      type = "gem";
+    };
+    version = "0.16.0";
+  };
   graphql-docs = {
     dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"];
     groups = ["development" "test"];
@@ -2168,15 +2212,15 @@
     version = "5.1.2";
   };
   haml_lint = {
-    dependencies = ["haml" "rainbow" "rubocop" "sysexits"];
+    dependencies = ["haml" "parallel" "rainbow" "rubocop" "sysexits"];
     groups = ["development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1iaaa5as4nlblnbvy6pxj8z9k3jqspbh4f43il519f28lgi0llsn";
+      sha256 = "0imdiwxqyca1i158yrqkdv6fa8sdfk8wwx2kaq6ad9i7k7jj365a";
       type = "gem";
     };
-    version = "0.34.0";
+    version = "0.36.0";
   };
   hamlit = {
     dependencies = ["temple" "thor" "tilt"];
@@ -2446,20 +2490,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
+      sha256 = "1a2qlkc1hkr5hkj2574l1a63sm04bdx98gfhh9m8vvp6psdrnpnb";
       type = "gem";
     };
-    version = "0.10.0";
-  };
-  jaro_winkler = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
-      type = "gem";
-    };
-    version = "1.5.4";
+    version = "1.1.0";
   };
   jira-ruby = {
     dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"];
@@ -2509,10 +2543,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18rf9v20i0dk5dblr7m22di959xpch2h7gsx0cl585cryr7apwp3";
+      sha256 = "0nzbk1mrbf9mnvjpn3bxy8a85rjf94qmfdnvk78mjzk8pa0fvgdr";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.13.0";
   };
   json-schema = {
     dependencies = ["addressable"];
@@ -3538,10 +3572,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";
+      sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
       type = "gem";
     };
-    version = "1.19.1";
+    version = "1.19.2";
   };
   parser = {
     dependencies = ["ast"];
@@ -3549,10 +3583,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xgsl3dvmidvr1y4lp63m5avjxykl2gradgav8xfp5z86rfqhpr0";
+      sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z";
       type = "gem";
     };
-    version = "2.7.1.2";
+    version = "2.7.2.0";
   };
   parslet = {
     groups = ["default" "development" "test"];
@@ -3735,10 +3769,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x72abm2snhk664s9g642pxjyk911y39qck8n9hbnqmb7ba1zbmz";
+      sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
       type = "gem";
     };
-    version = "2.1.4";
+    version = "2.2.3";
   };
   rack-accept = {
     dependencies = ["rack"];
@@ -3779,10 +3813,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii";
+      sha256 = "1b0h0rlfl0p0drymwfc71g87fp66ck3205pl32z89xsgh0lzw25k";
       type = "gem";
     };
-    version = "1.9.3";
+    version = "1.16.0";
   };
   rack-protection = {
     dependencies = ["rack"];
@@ -3918,10 +3952,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp";
+      sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
       type = "gem";
     };
-    version = "12.3.3";
+    version = "13.0.1";
   };
   rb-fsevent = {
     groups = ["default" "development" "test"];
@@ -4112,10 +4146,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dsgjb3kszk6a82s6gl0h6a8vncjrxmcbk0r4mcxcdcad2b7vb2d";
+      sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm";
       type = "gem";
     };
-    version = "1.5.1";
+    version = "1.8.2";
   };
   regexp_property_values = {
     groups = ["default"];
@@ -4216,10 +4250,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1igl00gk0vaq4xxk44m7yflqdzsblgxlzcxj8saz96bmx7mg7392";
+      sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn";
       type = "gem";
     };
-    version = "3.24.0";
+    version = "3.25.0";
   };
   rqrcode = {
     dependencies = ["chunky_png"];
@@ -4343,25 +4377,36 @@
   };
   rspec_profiling = {
     dependencies = ["activerecord" "pg" "rails" "sqlite3"];
-    groups = ["development" "test"];
+    groups = ["test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1g7q7gav26bpiprx4dhlvdh4zdrhwiky9jbmsp14gyfiabqdz4sz";
+      sha256 = "0vkfizrwxgs029s9imz8g3p55ggncls709hf98brmv6wg5znjibs";
       type = "gem";
     };
-    version = "0.0.5";
+    version = "0.0.6";
   };
   rubocop = {
-    dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"];
-    groups = ["development" "test"];
+    dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pyjx2lbai93p6q3w57cxdhlcwhxfvm299xqicgarhdrv73mnv1d";
+      sha256 = "1yh71v5d7aw6jz7505d2sv0n0ldf3wh0ly3lphdanjl0n8b42y9h";
       type = "gem";
     };
-    version = "0.82.0";
+    version = "0.89.1";
+  };
+  rubocop-ast = {
+    dependencies = ["parser"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "165ws2vwnw33nlqgzvzzjjp1zhkc712a92lbpbjx8j83g44dmdy4";
+      type = "gem";
+    };
+    version = "0.8.0";
   };
   rubocop-gitlab-security = {
     dependencies = ["rubocop"];
@@ -4375,15 +4420,15 @@
     version = "0.1.1";
   };
   rubocop-performance = {
-    dependencies = ["rubocop"];
-    groups = ["development" "test"];
+    dependencies = ["rubocop" "rubocop-ast"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fk9nd3b24avgsqp726hy2pl1iyfjrh6jni97wkky6kqy0lq6zq2";
+      sha256 = "13v66wi5l56bvp97nlmyxscq8ipkzfha1g7nlhcrbikvmrm3h5kf";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.8.1";
   };
   rubocop-rails = {
     dependencies = ["activesupport" "rack" "rubocop"];
@@ -4391,21 +4436,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "087fwq48n9k10c6npp7n5vbpx34nmaq3xkhw9n0v75m3l9rn8s34";
+      sha256 = "14g703lv0cbqw504cdjsv0yydrsnm61rwg0n0mql4zl5hw1n7lfh";
       type = "gem";
     };
-    version = "2.5.2";
+    version = "2.8.1";
   };
   rubocop-rspec = {
-    dependencies = ["rubocop"];
-    groups = ["development" "test"];
+    dependencies = ["rubocop" "rubocop-ast"];
+    groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dypzxzrm8lh1gip9pn93p1nwamzkqsljy6mcv2ngw9zqsial233";
+      sha256 = "0albi9zn8zrz1bb105xkcn5xdv6q7i7r34h9m4jsj5ygsvkkh8kv";
       type = "gem";
     };
-    version = "1.37.0";
+    version = "1.44.1";
   };
   ruby-enum = {
     dependencies = ["i18n"];
@@ -4486,10 +4531,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s3hsccsmrirc2hy3r51kl8g9cfmcn7jxaa0asadg1kn78h1sgr7";
+      sha256 = "0b6l5bxbamaplp904i7f088j806v0pqi0kvhb8xx81v4whl40y2k";
       type = "gem";
     };
-    version = "3.13.1";
+    version = "3.15.0";
   };
   rubyntlm = {
     groups = ["default"];
@@ -4619,15 +4664,15 @@
     version = "0.8.2";
   };
   scss_lint = {
-    dependencies = ["rake" "sass"];
+    dependencies = ["sass"];
     groups = ["development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g";
+      sha256 = "1s6dzk4n9pnmqciliggwpiny43vc3cx3n2d5gqa9aqng77ff7yv7";
       type = "gem";
     };
-    version = "0.56.0";
+    version = "0.59.0";
   };
   securecompare = {
     groups = ["default"];
@@ -4687,10 +4732,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w24rgmyjf7yz0xr2qhbr8z48h4m6gvbggr8nc1pldwn9rbi04b7";
+      sha256 = "0p0jj2la8bhb7kgqmqbksaq7idnpgjv6asgfd18d2l3z4kra14cj";
       type = "gem";
     };
-    version = "4.12.0";
+    version = "4.15.1";
   };
   shellany = {
     groups = ["default" "test"];
@@ -4820,15 +4865,14 @@
     version = "0.6.1";
   };
   spring = {
-    dependencies = ["activesupport"];
     groups = ["development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75";
+      sha256 = "1x2wz1y2b0kp7mlk9k8zkl39rddk2l3x34b7dar3bh3axd1cs30d";
       type = "gem";
     };
-    version = "2.0.2";
+    version = "2.1.1";
   };
   spring-commands-rspec = {
     dependencies = ["spring"];
@@ -5045,10 +5089,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
+      sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q";
       type = "gem";
     };
-    version = "0.11.0.0";
+    version = "0.13.0";
   };
   tilt = {
     groups = ["default" "development" "test"];
@@ -5150,10 +5194,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+      sha256 = "0skr6ih9cr3pwp8l84f0z7fy3q9kiq8hw0sg3zqw0hpbbyj05743";
       type = "gem";
     };
-    version = "1.2.7";
+    version = "1.2.8";
   };
   u2f = {
     groups = ["default"];
@@ -5477,9 +5521,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
+      sha256 = "12n0hiawqayzchi0yga5n19hi63b2snd49fv3n23n2i4pp05jzrp";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.4.1";
   };
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index 98d994f00038..0f215370e184 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix
+#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix
 
 import click
 import click_log
@@ -40,9 +40,7 @@ class GitLabRepo:
         return versions
 
     def get_git_hash(self, rev: str):
-        out = subprocess.check_output(['nix-prefetch-git', self.url, rev])
-        j = json.loads(out)
-        return j['sha256']
+        return subprocess.check_output(['nix-universal-prefetch', 'fetchFromGitLab', '--owner', self.owner, '--repo', self.repo, '--rev', rev]).decode('utf-8').strip()
 
     @staticmethod
     def rev2version(tag: str) -> str:
diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
index 899888ee2f1b..ca504fc231e9 100644
--- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
@@ -778,27 +778,27 @@
       };
     }
     {
-      name = "_gitlab_eslint_plugin___eslint_plugin_4.0.0.tgz";
+      name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz";
       path = fetchurl {
-        name = "_gitlab_eslint_plugin___eslint_plugin_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-4.0.0.tgz";
-        sha1 = "7beba53dea74f458d92040a8b2652e4fd60a6cc7";
+        name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-5.0.0.tgz";
+        sha1 = "502eb2bccb55d65d6310ce9ef2da76035b6fc319";
       };
     }
     {
-      name = "_gitlab_svgs___svgs_1.171.0.tgz";
+      name = "_gitlab_svgs___svgs_1.175.0.tgz";
       path = fetchurl {
-        name = "_gitlab_svgs___svgs_1.171.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.171.0.tgz";
-        sha1 = "abc3092bf804f0898301626130e0f3231834924a";
+        name = "_gitlab_svgs___svgs_1.175.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz";
+        sha1 = "734f341784af1cd1d62d160a17bcdfb61ff7b04d";
       };
     }
     {
-      name = "_gitlab_ui___ui_21.33.0.tgz";
+      name = "_gitlab_ui___ui_23.9.0.tgz";
       path = fetchurl {
-        name = "_gitlab_ui___ui_21.33.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.33.0.tgz";
-        sha1 = "83dd7e4d65557f7b82ce1f9d7d6e7a1c54cb3dbc";
+        name = "_gitlab_ui___ui_23.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-23.9.0.tgz";
+        sha1 = "e21966130b41e624dbe4505911a79afb731c2d6b";
       };
     }
     {
@@ -1002,11 +1002,11 @@
       };
     }
     {
-      name = "_sourcegraph_code_host_integration___code_host_integration_0.0.50.tgz";
+      name = "_sourcegraph_code_host_integration___code_host_integration_0.0.52.tgz";
       path = fetchurl {
-        name = "_sourcegraph_code_host_integration___code_host_integration_0.0.50.tgz";
-        url  = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.50.tgz";
-        sha1 = "3f91be4c1b117efbf3d49c73033a6b1880db1c70";
+        name = "_sourcegraph_code_host_integration___code_host_integration_0.0.52.tgz";
+        url  = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.52.tgz";
+        sha1 = "3668364647b9248a0c43d738f7b046c551311338";
       };
     }
     {
@@ -1026,19 +1026,19 @@
       };
     }
     {
-      name = "_toast_ui_editor___editor_2.4.0.tgz";
+      name = "_toast_ui_editor___editor_2.5.0.tgz";
       path = fetchurl {
-        name = "_toast_ui_editor___editor_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.4.0.tgz";
-        sha1 = "0ed082da7e0160162dbc8f69d00ad3ab2adf81bc";
+        name = "_toast_ui_editor___editor_2.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.0.tgz";
+        sha1 = "02779b119eaa6dd7601249d75ca031e0b98400f1";
       };
     }
     {
-      name = "_toast_ui_vue_editor___vue_editor_2.4.0.tgz";
+      name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz";
       path = fetchurl {
-        name = "_toast_ui_vue_editor___vue_editor_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.4.0.tgz";
-        sha1 = "18b6629006f2dac5bfef4a26388499931d5fa869";
+        name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.0.tgz";
+        sha1 = "8094136588b0f726241b5f89d0754a7169f2ffee";
       };
     }
     {
@@ -1577,6 +1577,14 @@
         sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
       };
     }
+    {
+      name = "agent_base___agent_base_4.3.0.tgz";
+      path = fetchurl {
+        name = "agent_base___agent_base_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz";
+        sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee";
+      };
+    }
     {
       name = "aggregate_error___aggregate_error_3.0.1.tgz";
       path = fetchurl {
@@ -3945,6 +3953,14 @@
         sha1 = "5d128515df134ff327e90a4c93f4e077a536341f";
       };
     }
+    {
+      name = "debug___debug_3.1.0.tgz";
+      path = fetchurl {
+        name = "debug___debug_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz";
+        sha1 = "5bb5a0672628b64149566ba16819e61518c67261";
+      };
+    }
     {
       name = "debug___debug_3.2.6.tgz";
       path = fetchurl {
@@ -3961,14 +3977,6 @@
         sha1 = "3b72260255109c6b589cee050f1d516139664791";
       };
     }
-    {
-      name = "debug___debug_3.1.0.tgz";
-      path = fetchurl {
-        name = "debug___debug_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz";
-        sha1 = "5bb5a0672628b64149566ba16819e61518c67261";
-      };
-    }
     {
       name = "decamelize_keys___decamelize_keys_1.1.0.tgz";
       path = fetchurl {
@@ -4386,11 +4394,11 @@
       };
     }
     {
-      name = "dompurify___dompurify_2.1.1.tgz";
+      name = "dompurify___dompurify_2.2.2.tgz";
       path = fetchurl {
-        name = "dompurify___dompurify_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.1.1.tgz";
-        sha1 = "b5aa988676b093a9c836d8b855680a8598af25fe";
+        name = "dompurify___dompurify_2.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.2.tgz";
+        sha1 = "cb8c2b1a2f3c8a0b565127504ae4eedec176a972";
       };
     }
     {
@@ -4681,6 +4689,14 @@
         sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a";
       };
     }
+    {
+      name = "es6_promise___es6_promise_4.2.8.tgz";
+      path = fetchurl {
+        name = "es6_promise___es6_promise_4.2.8.tgz";
+        url  = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz";
+        sha1 = "4eb21594c972bc40553d276e510539143db53e0a";
+      };
+    }
     {
       name = "es6_promise___es6_promise_3.0.2.tgz";
       path = fetchurl {
@@ -4689,6 +4705,14 @@
         sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6";
       };
     }
+    {
+      name = "es6_promisify___es6_promisify_5.0.0.tgz";
+      path = fetchurl {
+        name = "es6_promisify___es6_promisify_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz";
+        sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
+      };
+    }
     {
       name = "escape_goat___escape_goat_2.1.1.tgz";
       path = fetchurl {
@@ -5866,19 +5890,19 @@
       };
     }
     {
-      name = "graphql_tag___graphql_tag_2.10.3.tgz";
+      name = "graphql_tag___graphql_tag_2.11.0.tgz";
       path = fetchurl {
-        name = "graphql_tag___graphql_tag_2.10.3.tgz";
-        url  = "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.3.tgz";
-        sha1 = "ea1baba5eb8fc6339e4c4cf049dabe522b0edf03";
+        name = "graphql_tag___graphql_tag_2.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.11.0.tgz";
+        sha1 = "1deb53a01c46a7eb401d6cb59dec86fa1cccbffd";
       };
     }
     {
-      name = "graphql___graphql_14.7.0.tgz";
+      name = "graphql___graphql_15.4.0.tgz";
       path = fetchurl {
-        name = "graphql___graphql_14.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/graphql/-/graphql-14.7.0.tgz";
-        sha1 = "7fa79a80a69be4a31c27dda824dc04dac2035a72";
+        name = "graphql___graphql_15.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/graphql/-/graphql-15.4.0.tgz";
+        sha1 = "e459dea1150da5a106486ba7276518b5295a4347";
       };
     }
     {
@@ -6201,6 +6225,14 @@
         sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
       };
     }
+    {
+      name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz";
+      path = fetchurl {
+        name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz";
+        sha1 = "e4821beef5b2142a2026bd73926fe537631c5405";
+      };
+    }
     {
       name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz";
       path = fetchurl {
@@ -6233,6 +6265,14 @@
         sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
       };
     }
+    {
+      name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz";
+      path = fetchurl {
+        name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz";
+        sha1 = "4ee7a737abd92678a293d9b34a1af4d0d08c787b";
+      };
+    }
     {
       name = "human_signals___human_signals_1.1.1.tgz";
       path = fetchurl {
@@ -7201,14 +7241,6 @@
         sha1 = "a5231a08ef6dd22b268d0895084cf8d58b5bec53";
       };
     }
-    {
-      name = "iterall___iterall_1.2.2.tgz";
-      path = fetchurl {
-        name = "iterall___iterall_1.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz";
-        sha1 = "92d70deb8028e0c39ff3164fdbf4d8b088130cd7";
-      };
-    }
     {
       name = "jasmine_core___jasmine_core_2.9.0.tgz";
       path = fetchurl {
@@ -7713,6 +7745,14 @@
         sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe";
       };
     }
+    {
+      name = "jsonc_parser___jsonc_parser_2.3.1.tgz";
+      path = fetchurl {
+        name = "jsonc_parser___jsonc_parser_2.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz";
+        sha1 = "59549150b133f2efacca48fe9ce1ec0659af2342";
+      };
+    }
     {
       name = "jsonc_parser___jsonc_parser_2.2.1.tgz";
       path = fetchurl {
@@ -7969,6 +8009,14 @@
         sha1 = "c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db";
       };
     }
+    {
+      name = "linkify_it___linkify_it_3.0.2.tgz";
+      path = fetchurl {
+        name = "linkify_it___linkify_it_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz";
+        sha1 = "f55eeb8bc1d3ae754049e124ab3bb56d97797fb8";
+      };
+    }
     {
       name = "load_json_file___load_json_file_1.1.0.tgz";
       path = fetchurl {
@@ -8474,11 +8522,11 @@
       };
     }
     {
-      name = "markdown_it___markdown_it_10.0.0.tgz";
+      name = "markdown_it___markdown_it_11.0.0.tgz";
       path = fetchurl {
-        name = "markdown_it___markdown_it_10.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz";
-        sha1 = "abfc64f141b1722d663402044e43927f1f50a8dc";
+        name = "markdown_it___markdown_it_11.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.0.tgz";
+        sha1 = "dbfc30363e43d756ebc52c38586b91b90046b876";
       };
     }
     {
@@ -8498,27 +8546,27 @@
       };
     }
     {
-      name = "markdownlint_cli___markdownlint_cli_0.23.2.tgz";
+      name = "markdownlint_cli___markdownlint_cli_0.24.0.tgz";
       path = fetchurl {
-        name = "markdownlint_cli___markdownlint_cli_0.23.2.tgz";
-        url  = "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.23.2.tgz";
-        sha1 = "43f0a96e2699542b74fb5e6188c025e4934357fc";
+        name = "markdownlint_cli___markdownlint_cli_0.24.0.tgz";
+        url  = "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.24.0.tgz";
+        sha1 = "d1c1d43cd53b87aaec93035b3234eef7097139a8";
       };
     }
     {
-      name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.11.0.tgz";
+      name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.12.0.tgz";
       path = fetchurl {
-        name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.11.0.tgz";
-        url  = "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.11.0.tgz";
-        sha1 = "faaaae4337771c7d88ca38ef6265afb4fbe0fb3f";
+        name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.12.0.tgz";
+        sha1 = "c41d9b990c50911572e8eb2fba3e6975a5514b7e";
       };
     }
     {
-      name = "markdownlint___markdownlint_0.20.4.tgz";
+      name = "markdownlint___markdownlint_0.21.1.tgz";
       path = fetchurl {
-        name = "markdownlint___markdownlint_0.20.4.tgz";
-        url  = "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.20.4.tgz";
-        sha1 = "3b34681494cdad174e14a27182b5cdefaa537823";
+        name = "markdownlint___markdownlint_0.21.1.tgz";
+        url  = "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.21.1.tgz";
+        sha1 = "9442afcf12bf65ce9d613212028cf85741677421";
       };
     }
     {
@@ -8922,11 +8970,11 @@
       };
     }
     {
-      name = "monaco_yaml___monaco_yaml_2.4.1.tgz";
+      name = "monaco_yaml___monaco_yaml_2.5.1.tgz";
       path = fetchurl {
-        name = "monaco_yaml___monaco_yaml_2.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/monaco-yaml/-/monaco-yaml-2.4.1.tgz";
-        sha1 = "f0d3384b1f10cc7af2b60e3a30b0adc6683b728a";
+        name = "monaco_yaml___monaco_yaml_2.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-yaml/-/monaco-yaml-2.5.1.tgz";
+        sha1 = "af9303a4aa6e3b94db62b8a8659362f31944590d";
       };
     }
     {
@@ -10210,11 +10258,11 @@
       };
     }
     {
-      name = "prettier___prettier_1.19.1.tgz";
+      name = "prettier___prettier_2.0.5.tgz";
       path = fetchurl {
-        name = "prettier___prettier_1.19.1.tgz";
-        url  = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz";
-        sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb";
+        name = "prettier___prettier_2.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz";
+        sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4";
       };
     }
     {
@@ -10921,6 +10969,14 @@
         sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb";
       };
     }
+    {
+      name = "request_light___request_light_0.2.5.tgz";
+      path = fetchurl {
+        name = "request_light___request_light_0.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/request-light/-/request-light-0.2.5.tgz";
+        sha1 = "38a3da7b2e56f7af8cbba57e8a94930ee2380746";
+      };
+    }
     {
       name = "request_promise_core___request_promise_core_1.1.4.tgz";
       path = fetchurl {
@@ -13274,11 +13330,11 @@
       };
     }
     {
-      name = "vscode_json_languageservice___vscode_json_languageservice_3.7.0.tgz";
+      name = "vscode_json_languageservice___vscode_json_languageservice_3.9.1.tgz";
       path = fetchurl {
-        name = "vscode_json_languageservice___vscode_json_languageservice_3.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.7.0.tgz";
-        sha1 = "0174417f139cf41dd60c84538fd052385bfb46f6";
+        name = "vscode_json_languageservice___vscode_json_languageservice_3.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.9.1.tgz";
+        sha1 = "f72b581f8cd2bd9b47445ccf8b0ddcde6aba7483";
       };
     }
     {
@@ -13313,6 +13369,14 @@
         sha1 = "d3b5952246d30e5241592b6dde8280e03942e743";
       };
     }
+    {
+      name = "vscode_languageserver_types___vscode_languageserver_types_3.16.0_next.2.tgz";
+      path = fetchurl {
+        name = "vscode_languageserver_types___vscode_languageserver_types_3.16.0_next.2.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz";
+        sha1 = "940bd15c992295a65eae8ab6b8568a1e8daa3083";
+      };
+    }
     {
       name = "vscode_languageserver_types___vscode_languageserver_types_3.15.1.tgz";
       path = fetchurl {
@@ -13337,6 +13401,14 @@
         sha1 = "ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167";
       };
     }
+    {
+      name = "vscode_nls___vscode_nls_5.0.0.tgz";
+      path = fetchurl {
+        name = "vscode_nls___vscode_nls_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz";
+        sha1 = "99f0da0bd9ea7cda44e565a74c54b1f2bc257840";
+      };
+    }
     {
       name = "vscode_uri___vscode_uri_1.0.8.tgz";
       path = fetchurl {
@@ -13402,11 +13474,11 @@
       };
     }
     {
-      name = "vue_router___vue_router_3.4.7.tgz";
+      name = "vue_router___vue_router_3.4.5.tgz";
       path = fetchurl {
-        name = "vue_router___vue_router_3.4.7.tgz";
-        url  = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.7.tgz";
-        sha1 = "bf189bafd16f4e4ef783c4a6250a3090f2c1fa1b";
+        name = "vue_router___vue_router_3.4.5.tgz";
+        url  = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz";
+        sha1 = "d396ec037b35931bdd1e9b7edd86f9788dc15175";
       };
     }
     {
@@ -13937,6 +14009,22 @@
         sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72";
       };
     }
+    {
+      name = "yaml_ast_parser_custom_tags___yaml_ast_parser_custom_tags_0.0.43.tgz";
+      path = fetchurl {
+        name = "yaml_ast_parser_custom_tags___yaml_ast_parser_custom_tags_0.0.43.tgz";
+        url  = "https://registry.yarnpkg.com/yaml-ast-parser-custom-tags/-/yaml-ast-parser-custom-tags-0.0.43.tgz";
+        sha1 = "46968145ce4e24cb03c3312057f0f141b93a7d02";
+      };
+    }
+    {
+      name = "yaml_language_server___yaml_language_server_0.11.1.tgz";
+      path = fetchurl {
+        name = "yaml_language_server___yaml_language_server_0.11.1.tgz";
+        url  = "https://registry.yarnpkg.com/yaml-language-server/-/yaml-language-server-0.11.1.tgz";
+        sha1 = "4ddc72eb9a6dd7dc41f31af2a8f5c72cce456cc9";
+      };
+    }
     {
       name = "yargs_parser___yargs_parser_20.2.1.tgz";
       path = fetchurl {
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 9ccc369429df..04370a46b908 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -201,6 +201,16 @@ in
 
   gitlab-markup = attrs: { meta.priority = 1; };
 
+  gitlab-pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") {
+    dontBuild = false;
+    postPatch = ''
+      sed -i 's;"https://gitlab.com.*";"${fetchurl {
+        url = "https://gitlab.com/gitlab-org/libpg_query/-/archive/gitlab-10-1.0.3/libpg_query-gitlab-10-1.0.3.tar.gz";
+        sha256 = "1519x4v6wrk189mjg4hlfah0f7hjy3syg8kk8b6g644gdspzs26j";
+      }}";' ext/pg_query/extconf.rb
+    '';
+  };
+
   glib2 = attrs: {
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ gtk2 pcre ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45bff7bd1890..11bad994a144 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4140,18 +4140,27 @@ in
 
   gitkraken = callPackage ../applications/version-management/gitkraken { };
 
-  gitlab = callPackage ../applications/version-management/gitlab { };
-  gitlab-ee = callPackage ../applications/version-management/gitlab { gitlabEnterprise = true; };
+  gitlab = callPackage ../applications/version-management/gitlab {
+    ruby = ruby_2_7;
+  };
+  gitlab-ee = callPackage ../applications/version-management/gitlab {
+    ruby = ruby_2_7;
+    gitlabEnterprise = true;
+  };
 
   gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };
 
-  gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };
+  gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell {
+    ruby = ruby_2_7;
+  };
 
   gitlab-triage = callPackage ../applications/version-management/gitlab-triage { };
 
   gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { };
 
-  gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
+  gitaly = callPackage ../applications/version-management/gitlab/gitaly {
+    ruby = ruby_2_7;
+  };
 
   gitstats = callPackage ../applications/version-management/gitstats { };
 

From d6e0d38b84a00b2ab05324b69e3253d956bb5be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
Date: Sat, 21 Nov 2020 01:36:53 +0100
Subject: [PATCH 3198/3942] nixos/tests/gitlab: add 32 byte secrets

---
 nixos/tests/gitlab.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index 7e4e8bcef92d..1214cddd0937 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -33,9 +33,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
         initialRootPasswordFile = pkgs.writeText "rootPassword" initialRootPassword;
         smtp.enable = true;
         secrets = {
-          secretFile = pkgs.writeText "secret" "Aig5zaic";
-          otpFile = pkgs.writeText "otpsecret" "Riew9mue";
-          dbFile = pkgs.writeText "dbsecret" "we2quaeZ";
+          secretFile = pkgs.writeText "secret" "r8X9keSKynU7p4aKlh4GO1Bo77g5a7vj";
+          otpFile = pkgs.writeText "otpsecret" "Zu5hGx3YvQx40DvI8WoZJQpX2paSDOlG";
+          dbFile = pkgs.writeText "dbsecret" "lsGltKWTejOf6JxCVa7nLDenzkO9wPLR";
           jwsFile = pkgs.runCommand "oidcKeyBase" {} "${pkgs.openssl}/bin/openssl genrsa 2048 > $out";
         };
       };

From c938830d7a106039a1d994337fe1cb72fe3fa683 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 00:32:00 +0000
Subject: [PATCH 3199/3942] python37Packages.snowflake-connector-python: 2.3.5
 -> 2.3.6

---
 .../python-modules/snowflake-connector-python/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index bc60d7897c1a..c8f874d4c103 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -25,12 +25,12 @@
 
 buildPythonPackage rec {
   pname = "snowflake-connector-python";
-  version = "2.3.5";
+  version = "2.3.6";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b953a53141a88406e9c0e3144582a7c257e5c89fa81e97664d520999991812e7";
+    sha256 = "1a4ebf25989fc13d6f70dc3e2064721c54834e493a7964a1d67be61d40e75f50";
   };
 
   propagatedBuildInputs = [

From c07e9507ef4aa6ed5e53389055db29645327858f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 01:29:55 +0000
Subject: [PATCH 3200/3942] python37Packages.gtts: 2.1.2 -> 2.2.1

---
 pkgs/development/python-modules/gtts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix
index a8b6d7199bcd..0fc9d43dc2ce 100644
--- a/pkgs/development/python-modules/gtts/default.nix
+++ b/pkgs/development/python-modules/gtts/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "gtts";
-  version = "2.1.2";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "pndurette";
     repo = "gTTS";
     rev = "v${version}";
-    sha256 = "1vcsxzqzl61h50lm934hd7q5nl7l10wwymgq1mcynmqxbm1s4rnl";
+    sha256 = "1a984691kfin1n896p5l7y8ggjzx19ynih2cw040smfms0azhp4w";
   };
 
   propagatedBuildInputs = [

From 3189230412469d089757933e2b3d8ca0986123e2 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 21 Nov 2020 02:34:40 +0100
Subject: [PATCH 3201/3942] heaptrack: migrate to Qt5.15

---
 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 f2b3d51431f5..fe117c7a4683 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4585,7 +4585,7 @@ in
 
   hecate = callPackage ../applications/editors/hecate { };
 
-  heaptrack = libsForQt514.callPackage ../development/tools/profiling/heaptrack {};
+  heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {};
 
   heimdall = libsForQt5.callPackage ../tools/misc/heimdall { };
 

From 49c563e8a9f37ff6b64c787aa77c57c2ea5d1fbc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 02:52:45 +0000
Subject: [PATCH 3202/3942] python37Packages.google_api_python_client: 1.12.5
 -> 1.12.8

---
 .../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 b074774f6253..b14276b0a1a2 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "1.12.5";
+  version = "1.12.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a989wynp0m1pj8qpa0mr8v8zxhazasc738nyb15wkhn1m4wv4hq";
+    sha256 = "f3b9684442eec2cfe9f9bb48e796ef919456b82142c7528c5fd527e5224f08bb";
   };
 
   # No tests included in archive

From 91340f2aee4a1fe2dc4444fddc23eac17c6400b9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Nov 2020 04:20:00 +0000
Subject: [PATCH 3203/3942] vault: 1.5.5 -> 1.6.0

---
 pkgs/tools/security/vault/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index b51542a8edde..4b460e74024b 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "vault";
-  version = "1.5.5";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "144v7vmp2amv29y6d50jzc21zrcw0g6qlwks16mvqy2hnbsnzdwa";
+    sha256 = "13fasdiijxy87m33wfyd8gylyz556i0bdd7xp706ip2fcckrmz7a";
   };
 
   goPackagePath = "github.com/hashicorp/vault";
@@ -29,6 +29,7 @@ buildGoPackage rec {
   meta = with stdenv.lib; {
     homepage = "https://www.vaultproject.io/";
     description = "A tool for managing secrets";
+    changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.mpl20;
     maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ];

From 4152fca69e6ea7e7edb6cec58f4e4b1684c2a961 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Nov 2020 04:20:00 +0000
Subject: [PATCH 3204/3942] vault-bin: 1.5.5 -> 1.6.0

---
 pkgs/tools/security/vault/vault-bin.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index 4960fe8fb018..580f6fc7b8ed 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -1,30 +1,26 @@
 { stdenv, fetchurl, unzip, nixosTests }:
 
 let
-  version = "1.5.5";
+  version = "1.6.0";
 
   sources = let
     base = "https://releases.hashicorp.com/vault/${version}";
   in {
     x86_64-linux = fetchurl {
       url = "${base}/vault_${version}_linux_amd64.zip";
-      sha256 = "1vg1c34d2ck2a96p800gblq06jakg29yzrczaa6nsmnnr3k5hs9a";
+      sha256 = "0fay6bw31x9kxmc52sh5qp63nfkwji74fbnlx8pj3smz3qnqw143";
     };
     i686-linux = fetchurl {
       url = "${base}/vault_${version}_linux_386.zip";
-      sha256 = "1hf46mm7shvq9gpi50b6hcp2cydhzbkwigqcnl527y4cvc9iv7in";
+      sha256 = "0bjks9lpgl39cq55c9cyc0glhmyxzs37a2an8ynzza94gv5mgcxa";
     };
     x86_64-darwin = fetchurl {
       url = "${base}/vault_${version}_darwin_amd64.zip";
-      sha256 = "1jna9rmdhqi7j8p67y9dzq716dv8fn4rjsn76mbvlgc5wylky6gz";
-    };
-    i686-darwin = fetchurl {
-      url = "${base}/vault_${version}_darwin_386.zip";
-      sha256 = "1qv02zd5dwaw1i52pnbyshbd8cy0x5nr3f2s9l3p9ci5rzad4rjn";
+      sha256 = "0hl1k35x78y0hi3y5xjnzby1ygisqjyvdak7s61m9f363nsr1shh";
     };
     aarch64-linux = fetchurl {
       url = "${base}/vault_${version}_linux_arm64.zip";
-      sha256 = "1y4i62qq5cx2bv18dnbgys2qa5xx0acn8j3hdh0dbsw0zyms4qv7";
+      sha256 = "018a5i14x6phhx1axvx0bvqn4ggsimfizs48xbmykgiyfmzkrwgz";
     };
   };
 
@@ -49,7 +45,7 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = "https://www.vaultproject.io";
     description = "A tool for managing secrets, this binary includes the UI";
-    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ];
+    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
     license = licenses.mpl20;
     maintainers = with maintainers; [ offline psyanticy mkaito ];
   };

From 45ab7143b04c87ba799bd984d9321263f5d50360 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Nov 2020 04:20:00 +0000
Subject: [PATCH 3205/3942] postgresqlPackages.postgis: 3.0.2 -> 3.0.3

---
 pkgs/servers/sql/postgresql/ext/postgis.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 9feb45d311a0..912d848e1a75 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "postgis";
-  version = "3.0.2";
+  version = "3.0.3";
 
   outputs = [ "out" "doc" ];
 
   src = fetchurl {
     url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
-    sha256 = "1jmji8i2wjabkrzqil683lypnmimigdmn64a10j3kj3kzlfn98d3";
+    sha256 = "05s8cx1rlysiq7dd44kf7cid0la61a4p895j9g95bvfb8v8dpzh7";
   };
 
   buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]

From 535ef433a6e54495c662ecfc7a7e8f79746992db Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Nov 2020 04:20:00 +0000
Subject: [PATCH 3206/3942] rclone: 1.53.2 -> 1.53.3

https://forum.rclone.org/t/rclone-1-53-3-release/20569
---
 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 bf9be1b103d7..2f0a9a044f24 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "rclone";
-  version = "1.53.2";
+  version = "1.53.3";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0ns55b6s4zdw94jlialps3knclghj9xqx84ff8hyrl9ksq02kd3w";
+    sha256 = "10nimrq8nmpmfk2d4fx0yp916wk5q027m283izpshrbwvx7l6xx0";
   };
 
   vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88";

From 9a65981c2d57cc578f3fa23fa6672e311c51afe8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Nov 2020 04:20:00 +0000
Subject: [PATCH 3207/3942] vault-bin: remove passthru.tests

nixosTests.vault uses the `vault` package
---
 pkgs/tools/security/vault/vault-bin.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index 580f6fc7b8ed..805afe89d31a 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, nixosTests }:
+{ stdenv, fetchurl, unzip }:
 
 let
   version = "1.6.0";
@@ -40,8 +40,6 @@ in stdenv.mkDerivation {
     echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
   '';
 
-  passthru.tests.vault = nixosTests.vault;
-
   meta = with stdenv.lib; {
     homepage = "https://www.vaultproject.io";
     description = "A tool for managing secrets, this binary includes the UI";

From 2a23c7cfd54b81132ca506d5c9a79979c2145d2c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Nov 2020 04:20:00 +0000
Subject: [PATCH 3208/3942] postgresqlPackages.postgis: add passthru.tests

---
 pkgs/servers/sql/postgresql/ext/postgis.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 912d848e1a75..0d6176d85971 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -11,6 +11,7 @@
 , file
 , protobufc
 , libiconv
+, nixosTests
 }:
 stdenv.mkDerivation rec {
   pname = "postgis";
@@ -65,6 +66,8 @@ stdenv.mkDerivation rec {
     mv doc/* $doc/share/doc/postgis/
   '';
 
+  passthru.tests.postgis = nixosTests.postgis;
+
   meta = with stdenv.lib; {
     description = "Geographic Objects for PostgreSQL";
     homepage = "https://postgis.net/";

From 0dd8d4d878e157dc331b118f6ae607ae4082169a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Nov 2020 04:20:00 +0000
Subject: [PATCH 3209/3942] postgresqlPackages.pgrouting: 3.1.0 -> 3.1.1

https://github.com/pgRouting/pgrouting/releases/tag/v3.1.1
---
 pkgs/servers/sql/postgresql/ext/pgrouting.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
index 674aa29daec7..9863b2276d11 100644
--- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "pgrouting";
-  version = "3.1.0";
+  version = "3.1.1";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ postgresql boost ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner  = "pgRouting";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0sdyq0a98snmcq6g6mgmadlz6cgvacivv34943azhnzspa3iy409";
+    sha256 = "1wj583c4iipsss75czww176aqa8sncsvcx1i0d6cb41v03iq5acf";
   };
 
   installPhase = ''
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A PostgreSQL/PostGIS extension that provides geospatial routing functionality";
     homepage    = "https://pgrouting.org/";
+    changelog   = "https://github.com/pgRouting/pgrouting/releases/tag/v${version}";
     maintainers = [ maintainers.steve-chavez ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.gpl2;

From 5000221a79ec5dd4336489c13b3b5928f4035b89 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Fri, 20 Nov 2020 23:54:37 -0500
Subject: [PATCH 3210/3942] awscli2: 2.0.54 -> 2.1.3

---
 pkgs/tools/admin/awscli2/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index e89df04e3bd1..13847a950a5d 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -8,12 +8,13 @@ let
   py = python3.override {
     packageOverrides = self: super: {
       botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
-        version = "2.0.0dev58";
+        version = "2.0.0dev71";
         src = fetchFromGitHub {
           owner = "boto";
           repo = "botocore";
-          rev = "2d65a1bdf85d24b40a40bc681b44d167ce1cc8cb";
-          hash = "sha256-HPeNWLhNFjRoD4TZ54ZGgJPp8fsnh8Rt6DMJ8Q0nPkY=";
+          rev = "f8b31e2a01a8797f8331c6af2c93a26ff82b2b4b";
+          hash = "sha256-25WV64RPXpGlq9mZYxUVKUdUjU+e1UnuVTLf9Z9I8Tc=
+";
         };
       });
       prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec {
@@ -29,16 +30,17 @@ let
 in
 with py.pkgs; buildPythonApplication rec {
   pname = "awscli2";
-  version = "2.0.54"; # N.B: if you change this, change botocore to a matching version too
+  version = "2.1.3"; # N.B: if you change this, change botocore to a matching version too
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-cli";
     rev = version;
-    hash = "sha256-RVF9/2s5oy3Re6hdvbhwPf0nXSoizBDwOgtXCc7cwgc=";
+    hash = "sha256-7klM8jLNptaMyOjKkrsldUdw10vABgIc+Fs3Kj/z0V0=";
   };
 
   postPatch = ''
+    substituteInPlace setup.py --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5"
     substituteInPlace setup.py --replace "cryptography>=2.8.0,<=2.9.0" "cryptography>=2.8.0"
     substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10"
     substituteInPlace setup.py --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml>=0.15.0"

From 8019f085a98603290074cfceb9dadf54250b0c22 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 08:05:39 +0000
Subject: [PATCH 3211/3942] python37Packages.aioextensions: 20.11.1517005 ->
 20.11.1621472

---
 pkgs/development/python-modules/aioextensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioextensions/default.nix b/pkgs/development/python-modules/aioextensions/default.nix
index 62a6b90e9f8d..3fee1af2f176 100644
--- a/pkgs/development/python-modules/aioextensions/default.nix
+++ b/pkgs/development/python-modules/aioextensions/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "aioextensions";
-  version = "20.11.1517005";
+  version = "20.11.1621472";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10b8ddhd77ixxi2i8mw86m388smp324f7rr0mdpkwdb0ra99ra8m";
+    sha256 = "abfb2a27590f20b04808192e6c9c5f93298656c013546850c4505b5070a8cc82";
   };
 
   propagatedBuildInputs = [ uvloop ];

From 4f85c0a7643794ec677e5f9197cfec990bc89d35 Mon Sep 17 00:00:00 2001
From: Thomas Marchand <thomas.marchand@tuta.io>
Date: Sat, 21 Nov 2020 09:32:55 +0100
Subject: [PATCH 3212/3942] termius: 6.4.1 -> 7.1.0

---
 pkgs/applications/networking/termius/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix
index 66856264f345..3c1af7dba311 100644
--- a/pkgs/applications/networking/termius/default.nix
+++ b/pkgs/applications/networking/termius/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "termius";
-  version = "6.4.1";
+  version = "7.1.0";
 
   src = fetchurl {
     url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb";
-    sha256 = "0vc4nz5yndg11zhs92xj496jqzlhy9g0vqlfqrmg8zpf9ciygbqz";
+    sha256 = "801579b931ca0ad5340085df8863042336e2b609dd1cd6771260c873f3d2bb73";
   };
 
   desktopItem = makeDesktopItem {
@@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
     cp -R "opt" "$out"
     cp -R "usr/share" "$out/share"
     chmod -R g-w "$out"
-
     # Desktop file
     mkdir -p "$out/share/applications"
     cp "${desktopItem}/share/applications/"* "$out/share/applications"
@@ -63,7 +62,7 @@ stdenv.mkDerivation rec {
     homepage = "https://termius.com/";
     downloadPage = "https://termius.com/linux/";
     license = licenses.unfree;
-    maintainers = with maintainers; [ Br1ght0ne ];
+    maintainers = with maintainers; [ Br1ght0ne th0rgal ];
     platforms = [ "x86_64-linux" ];
   };
-}
+}
\ No newline at end of file

From 6c5c0fc1a85dfed840fff481c03452425de364be Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 21 Nov 2020 10:39:02 +0200
Subject: [PATCH 3213/3942] xmlsec: 1.2.30 -> 1.2.31

---
 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 6b3468e5d57c..a52c85f1899a 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -3,7 +3,7 @@
 
 lib.fix (self:
 let
-  version = "1.2.30";
+  version = "1.2.31";
 in
 stdenv.mkDerivation {
   pname = "xmlsec";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
-    sha256 = "1j5bf7ni45jghyrbf7a14wx2pvfara557zyry7g7h8840c5kd11d";
+    sha256 = "mxC8Uswx5PdhYuOXXlDbJrcatJxXHYELMRymJr5aCyY=";
   };
 
   patches = [

From ea9cada455617c926403be72fb1d645fcd394d0b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 21 Nov 2020 10:39:52 +0200
Subject: [PATCH 3214/3942] xmlsec: use nss_3_53

Otherwise the build fails the tests. Probably a regression since the
update of nss to 3.59.
---
 pkgs/development/libraries/xmlsec/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index a52c85f1899a..18ee99804d3c 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool
-, openssl, nss, lib, runCommandCC, writeText }:
+# nss_3_53 is used instead of the latest due to a number of issues:
+# https://github.com/lsh123/xmlsec/issues?q=is%3Aissue+is%3Aopen+nss
+, openssl, nss_3_53, lib, runCommandCC, writeText }:
 
 lib.fix (self:
 let
@@ -25,11 +27,11 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss ];
+  buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss_3_53 ];
 
   enableParallelBuilding = true;
   doCheck = true;
-  checkInputs = [ nss.tools ];
+  checkInputs = [ nss_3_53.tools ];
 
   # enable deprecated soap headers required by lasso
   # https://dev.entrouvert.org/issues/18771

From f36b838e2ac553d0b6bfa080e31cbb12f4a42286 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 21 Nov 2020 09:50:03 +0100
Subject: [PATCH 3215/3942] nixos test-driver: fix single line docstrings,
 fixes #104467

Single line docstrings should have the """ on a single line according to PEP 8.
It seems support for this landed in the latest version of Black.
---
 nixos/lib/test-driver/test-driver.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 68bd35dd98e9..96b75a49928f 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -634,8 +634,7 @@ class Machine:
                 shutil.copy(intermediate, abs_target)
 
     def dump_tty_contents(self, tty: str) -> None:
-        """Debugging: Dump the contents of the TTY<n>
-        """
+        """Debugging: Dump the contents of the TTY<n>"""
         self.execute("fold -w 80 /dev/vcs{} | systemd-cat".format(tty))
 
     def get_screen_text(self) -> str:
@@ -860,8 +859,7 @@ class Machine:
         self.send_monitor_command("set_link virtio-net-pci.1 off")
 
     def unblock(self) -> None:
-        """Make the machine reachable.
-        """
+        """Make the machine reachable."""
         self.send_monitor_command("set_link virtio-net-pci.1 on")
 
 

From e6c0c51ce8cce525094687ab9d1dfb374055615a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 21 Nov 2020 10:10:45 +0100
Subject: [PATCH 3216/3942] Revert "Revert "cachix: drop the build from the
 release jobset""

Reverting again because of an evaluation error.
https://github.com/NixOS/nixpkgs/issues/104475

This reverts commit f75c8753d80959f6bf63237748e799849c74179f.
---
 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 cacc77fea30d..20eaffaf84ac 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -62,7 +62,7 @@ let
               # jobs.stack.x86_64-darwin
               jobs.stdenv.x86_64-darwin
               jobs.vim.x86_64-darwin
-              jobs.cachix.x86_64-darwin
+              # jobs.cachix.x86_64-darwin
 
               # UI apps
               # jobs.firefox-unwrapped.x86_64-darwin
@@ -105,7 +105,7 @@ let
               jobs.nix-info-tested.x86_64-linux
               # Ensure that X11/GTK are in order.
               jobs.thunderbird.x86_64-linux
-              jobs.cachix.x86_64-linux
+              # jobs.cachix.x86_64-linux
 
               /*
               jobs.tests.cc-wrapper.x86_64-linux

From 2a5e8ce636e80f4cd7a3def1b1f1816a26c4153d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 21 Nov 2020 09:39:46 +0100
Subject: [PATCH 3217/3942] gmic: upgrade opencv

---
 pkgs/tools/graphics/gmic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 435cafe001d1..6787ff2e8f8d 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -3,7 +3,7 @@
 , cmake
 , ninja
 , pkg-config
-, opencv3
+, opencv
 , openexr
 , graphicsmagick
 , fftw
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     libjpeg
     libtiff
     libpng
-    opencv3
+    opencv
     openexr
     graphicsmagick
   ];

From dae00908a862208bbc299bd775e9101397f9cc24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 21 Nov 2020 09:41:50 +0100
Subject: [PATCH 3218/3942] digikam: update opencv

---
 pkgs/applications/graphics/digikam/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 0654a2ed1a8d..1e4b397db231 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -39,7 +39,7 @@
 , marble
 , libGL
 , libGLU
-, opencv3
+, opencv
 , pcre
 , threadweaver
 , x265
@@ -83,7 +83,7 @@ mkDerivation rec {
     libusb1
     libGL
     libGLU
-    opencv3
+    opencv
     pcre
     x265
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7cff959dcfe..ba0fe1ac3bd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25218,9 +25218,7 @@ in
 
   dhewm3 = callPackage ../games/dhewm3 {};
 
-  digikam = libsForQt514.callPackage ../applications/graphics/digikam {
-    opencv3 = opencv3WithoutCuda;
-  };
+  digikam = libsForQt514.callPackage ../applications/graphics/digikam {};
 
   displaycal = callPackage ../applications/graphics/displaycal {};
 

From f5b1a0ae1a9833058ab9ff7afe2baf3e1d9ea156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 21 Nov 2020 08:47:38 +0100
Subject: [PATCH 3219/3942] freeoffice: 978 -> 980

---
 pkgs/applications/office/softmaker/freeoffice.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix
index 2e12e6d3d43d..bdd90fecb8ee 100644
--- a/pkgs/applications/office/softmaker/freeoffice.nix
+++ b/pkgs/applications/office/softmaker/freeoffice.nix
@@ -5,9 +5,9 @@
   # overridable. This is useful when the upstream archive was replaced
   # and nixpkgs is not in sync yet.
 , officeVersion ? {
-  version = "978";
+  version = "980";
   edition = "2018";
-  sha256 = "1c5div1kbyyj48f89wkhc1i1759n70bsbp3w4a42cr0jmllyl60v";
+  sha256 = "19pgil86aagiz6z4kx22gd4cxbbmrx42ix42arkfb6p6hav1plby";
 }
 
 , ... } @ args:

From 8be3b7c1057d3cbc790c674b6f63d8a6019c1052 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 20 Nov 2020 21:00:57 -0600
Subject: [PATCH 3220/3942] picat: enable on aarch64-linux

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/picat/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix
index 8fe3031e6b35..4898f991079c 100644
--- a/pkgs/development/compilers/picat/default.nix
+++ b/pkgs/development/compilers/picat/default.nix
@@ -1,5 +1,12 @@
 { stdenv, fetchurl, zlib }:
 
+let
+  ARCH = {
+    i686-linux    = "linux32";
+    x86_64-linux  = "linux64";
+    aarch64-linux = "linux64";
+  }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+in
 stdenv.mkDerivation {
   pname = "picat";
   version = "3.0p3";
@@ -11,19 +18,13 @@ stdenv.mkDerivation {
 
   buildInputs = [ zlib ];
 
-  ARCH = if stdenv.hostPlatform.system == "i686-linux" then "linux32"
-         else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64"
-         else throw "Unsupported system";
+  inherit ARCH;
 
   hardeningDisable = [ "format" ];
   enableParallelBuilding = true;
 
   buildPhase = "cd emu && make -j $NIX_BUILD_CORES -f Makefile.$ARCH";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp picat $out/bin/picat
-  '';
+  installPhase = "mkdir -p $out/bin && cp picat $out/bin/picat";
 
   meta = with stdenv.lib; {
     description = "Logic-based programming langage";

From ef90af465a341c63fdf0cebe816f182597375ea3 Mon Sep 17 00:00:00 2001
From: kfollesdal <kristoffer.follesdal@bkk.no>
Date: Mon, 16 Nov 2020 14:43:45 +0100
Subject: [PATCH 3221/3942] pythonPackage.python-crontab: init at 2.5.1

---
 .../python-modules/python-crontab/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-crontab/default.nix

diff --git a/pkgs/development/python-modules/python-crontab/default.nix b/pkgs/development/python-modules/python-crontab/default.nix
new file mode 100644
index 000000000000..f5e368de0372
--- /dev/null
+++ b/pkgs/development/python-modules/python-crontab/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, python-dateutil, pytestCheckHook }:
+
+buildPythonPackage rec {
+  pname = "python-crontab";
+  version = "2.5.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "4bbe7e720753a132ca4ca9d4094915f40e9d9dc8a807a4564007651018ce8c31";
+  };
+
+  checkInputs = [ pytestCheckHook ];
+  disabledTests = [ "test_07_non_posix_shell"];
+
+  propagatedBuildInputs = [ python-dateutil ];
+
+  meta = with lib; {
+    description = "Python API for crontab";
+    longDescription = ''
+      Crontab module for reading and writing crontab files
+      and accessing the system cron automatically and simply using a direct API.
+    '';
+    homepage = "https://pypi.org/project/python-crontab/";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ kfollesdal ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f2dcb3e7971b..a96a31b5a699 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5788,6 +5788,8 @@ in {
 
   python-constraint = callPackage ../development/python-modules/python-constraint { };
 
+  python-crontab = callPackage ../development/python-modules/python-crontab { };
+
   python-ctags3 = callPackage ../development/python-modules/python-ctags3 { };
 
   python-daemon = callPackage ../development/python-modules/python-daemon { };

From e705042600a2a3e91caa7c8588b3b68e8273a0cf Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 21 Nov 2020 10:29:55 +0100
Subject: [PATCH 3222/3942] maintainers: add raskin to the sage team

Meant to do that in b7319d2d35e5f50e777723b3b1c448ad05dc9e9a, but didn't
stage the changes in the actual maintainers list.
---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 9f56686e24f2..598393582ab8 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -113,6 +113,7 @@ with lib.maintainers; {
     members = [
       timokau
       omasanori
+      raskin
     ];
     scope = "Maintain SageMath and the dependencies that are likely to break it.";
   };

From 4d8e0f9b770dbe5187ec4b64590531c30cab237d Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 19 Oct 2020 19:54:53 +0200
Subject: [PATCH 3223/3942] common-updater-scripts: add --rev to
 update-source-version

Adds a --rev=<revision> parameter to the script that makes it possible
to explicitly specify a new revision.
Useful to update unstable packages, where the version and revision may
be independent.
---
 .../scripts/update-source-version             | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index ba628fd2a445..181561242fc3 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -10,7 +10,7 @@ die() {
 
 usage() {
     echo "Usage: $scriptName <attr> <version> [<new-source-hash>] [<new-source-url>]"
-    echo "                              [--version-key=<version-key>] [--system=<system>] [--file=<file-to-update>]"
+    echo "                              [--version-key=<version-key>] [--system=<system>] [--file=<file-to-update>] [--rev=<revision>]"
     echo "                              [--ignore-same-hash] [--print-changes]"
 }
 
@@ -30,6 +30,9 @@ for arg in "$@"; do
                 die "Could not find provided file $nixFile"
             fi
         ;;
+        --rev=*)
+            newRevision="${arg#*=}"
+        ;;
         --ignore-same-hash)
             ignoreSameHash="true"
         ;;
@@ -111,6 +114,13 @@ if [[ "$oldVersion" = "$newVersion" ]]; then
     exit 0
 fi
 
+if [[ -n "$newRevision" ]]; then
+    oldRevision=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.rev" | tr -d '"')
+    if [[ -z "$oldRevision" ]]; then
+        die "Couldn't evaluate source revision from '$attr.src'!"
+    fi
+fi
+
 # Escape regex metacharacter that are allowed in store path names
 oldVersionEscaped=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
 oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g')
@@ -174,6 +184,15 @@ if cmp -s "$nixFile" "$nixFile.bak"; then
     die "Failed to replace source hash of '$attr' to a temporary hash!"
 fi
 
+# Replace new revision, if given
+if [[ -n "$newRevision" ]]; then
+    sed -i "$nixFile" -re "s|\"$oldRevision\"|\"$newRevision\"|"
+
+    if cmp -s "$nixFile" "$nixFile.bak"; then
+        die "Failed to replace source revision '$oldRevision' to '$newRevision' in '$attr'!"
+    fi
+fi
+
 # If new hash not given on the command line, recalculate it ourselves.
 if [[ -z "$newHash" ]]; then
     nix-build $systemArg --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true

From 3f20319cd19cfb0583df5c02be9b1dcae3b6e65f Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 19 Oct 2020 19:57:12 +0200
Subject: [PATCH 3224/3942] unstableUpdater: init

---
 pkgs/common-updater/unstable-updater.nix | 44 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/common-updater/unstable-updater.nix

diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix
new file mode 100644
index 000000000000..94cd33b9a26b
--- /dev/null
+++ b/pkgs/common-updater/unstable-updater.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, writeShellScript
+, coreutils
+, git
+, nix
+, common-updater-scripts
+}:
+
+# This is an updater for unstable packages that should always use the latest
+# commit.
+{ url ? null # The git url, if empty it will be set to src.url
+}:
+
+let
+  updateScript = writeShellScript "unstable-update-script.sh" ''
+    set -ex
+
+    url="$1"
+
+    # By default we set url to src.url
+    if [[ -z "$url" ]]; then
+        url="$(${nix}/bin/nix-instantiate $systemArg --eval -E \
+                   "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url" \
+            | tr -d '"')"
+    fi
+
+    # Get info about HEAD from a shallow git clone
+    tmpdir="$(${coreutils}/bin/mktemp -d)"
+    ${git}/bin/git clone --bare --depth=1 "$url" "$tmpdir"
+    pushd "$tmpdir"
+    commit_date="$(${git}/bin/git show -s --pretty='format:%cs')"
+    commit_sha="$(${git}/bin/git show -s --pretty='format:%H')"
+    popd
+    ${coreutils}/bin/rm -rf "$tmpdir"
+
+    # update the nix expression
+    ${common-updater-scripts}/bin/update-source-version \
+        "$UPDATE_NIX_ATTR_PATH" \
+        "unstable-$commit_date" \
+        --rev="$commit_sha"
+  '';
+
+in [ updateScript url ]
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 956e6d30e4c5..40f3ec4b206e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -94,6 +94,8 @@ in
 
   genericUpdater = callPackage ../common-updater/generic-updater.nix { };
 
+  unstableGitUpdater = callPackage ../common-updater/unstable-updater.nix { };
+
   nix-update-script = callPackage ../common-updater/nix-update.nix { };
 
   ### Push NixOS tests inside the fixed point

From 97e5fc3dc61a4273d5679a9bcf37ef7bd3111199 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 19 Oct 2020 19:58:45 +0200
Subject: [PATCH 3225/3942] qbe: use unstableUpdater

---
 pkgs/development/compilers/qbe/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix
index 8926fced482d..871707496561 100644
--- a/pkgs/development/compilers/qbe/default.nix
+++ b/pkgs/development/compilers/qbe/default.nix
@@ -1,6 +1,9 @@
-{ stdenv, fetchgit }:
+{ stdenv
+, fetchgit
+, unstableGitUpdater
+}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "qbe";
   version = "unstable-2019-07-11";
 
@@ -11,6 +14,9 @@ stdenv.mkDerivation {
   };
 
   makeFlags = [ "PREFIX=$(out)" ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = with stdenv.lib; {
     homepage = "https://c9x.me/compile/";
     description = "A small compiler backend written in C";

From 39acab635852079f9a144de0e0f3f6cf9e6a5f1d Mon Sep 17 00:00:00 2001
From: tbenst <lensman@tylerbenster.com>
Date: Tue, 29 Sep 2020 17:02:13 -0700
Subject: [PATCH 3226/3942] opencv: allow other blas/lapack

---
 pkgs/development/libraries/opencv/4.x.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index adeab6b44948..a723ded6bb69 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -34,8 +34,6 @@
 , AVFoundation, Cocoa, VideoDecodeAcceleration, CoreMedia, MediaToolbox, bzip2
 }:
 
-assert blas.implementation == "openblas" && lapack.implementation == "openblas";
-
 let
   version = "4.3.0";
 

From 7798a4e19cc843874e6329e0a980de7515945923 Mon Sep 17 00:00:00 2001
From: Thibault Polge <thibault@thb.lt>
Date: Sat, 14 Nov 2020 10:55:17 +0100
Subject: [PATCH 3227/3942] eduke32: 20190330 -> 20200907

---
 pkgs/games/eduke32/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 53baac79eed6..51d0c713753b 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig, nasm, makeDesktopItem
-, flac, gtk2, libvorbis, libvpx, libGLU, libGL
+, alsaLib, flac, gtk2, libvorbis, libvpx, libGLU, libGL
 , SDL2, SDL2_mixer }:
 
 let
-  version = "20190330";
-  rev = "7470";
+  version = "20200907";
+  rev = "9527";
+  revExtra = "93f62bbad";
 
   desktopItem = makeDesktopItem {
     name = "eduke32";
@@ -22,11 +23,12 @@ in stdenv.mkDerivation {
   inherit version;
 
   src = fetchurl {
-    url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}.tar.xz";
-    sha256 = "09a7l23i6sygicc82w1in9hjw0jvivlf7q0vw8kcx9j98lm23mkn";
+    url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_20200907-9257-93f62bbad.tar.xz"; # Good
+    # url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}-${revExtra}.tar.xz";
+    sha256 = "972630059be61ef9564a241b84ef2ee4f69fc85c19ee36ce46052ff2f1ce3bf9";
   };
 
-  buildInputs = [ flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ];
+  buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ];
 
   nativeBuildInputs = [ makeWrapper pkgconfig ]
     ++ stdenv.lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm;

From 6a907b33af7808093a43e41a1a48e57314ec8995 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 12:10:56 +0000
Subject: [PATCH 3228/3942] python37Packages.oauthenticator: 0.12.0 -> 0.12.1

---
 pkgs/development/python-modules/oauthenticator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix
index 6caaacd963bf..6fc9f24a63a7 100644
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/pkgs/development/python-modules/oauthenticator/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "oauthenticator";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0bc5a4a0ee22689a863090993e0054485030847d0e9884afa1592ca388cccf4a";
+    sha256 = "f4a048e329766a6023768c9fefd77c859a9726bdf2029c62ec78de410ec876cd";
   };
 
   checkPhase = ''

From 8d5a58fcfb06e2c1ae5c53902dfc064d848d9db0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Nov 2020 06:15:54 +0000
Subject: [PATCH 3229/3942] python37Packages.bravia-tv: 1.0.7 -> 1.0.8

---
 pkgs/development/python-modules/bravia-tv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix
index cfb30a926d58..15f292953b67 100644
--- a/pkgs/development/python-modules/bravia-tv/default.nix
+++ b/pkgs/development/python-modules/bravia-tv/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "bravia-tv";
-  version = "1.0.7";
+  version = "1.0.8";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "dcnielsen90";
     repo = "python-bravia-tv";
     rev = "v${version}";
-    sha256 = "0bg33nilybh46s6yz3x7a7x8biwbvy5scqdrl4didhn7vjd4w5fn";
+    sha256 = "0djwy4z1y173q3mnbngp754yrwzmm6h3x0rshvrvd64b78x1bsmp";
   };
 
   propagatedBuildInputs = [ requests ];

From 941b77d6bac9bd9a9681f550f04cc7047b44801c Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Sat, 21 Nov 2020 14:26:53 +0100
Subject: [PATCH 3230/3942] turbo-geth: 2020.11.02 -> 2020.11.03

---
 pkgs/applications/blockchains/turbo-geth.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix
index eae1b812a3d9..59fd1e936d08 100644
--- a/pkgs/applications/blockchains/turbo-geth.nix
+++ b/pkgs/applications/blockchains/turbo-geth.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "turbo-geth";
-  version = "2020.11.02";
+  version = "2020.11.03";
 
   src = fetchFromGitHub {
     owner = "ledgerwatch";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1bfywbg6mm3q4wd0mslcv5sj779277izzlqawqvqy3yxnpb6cwj5";
+    sha256 = "0fhfrk0k8w1mx4kf81kyirdpa91fm4g5pnvhr9cybrvygc4yx1f7";
   };
 
   vendorSha256 = "16vawkky612zf45d8dhipjmhrprmi28z9wdcnjy07x3bxdyfbhfr";

From e3b8dbb1d3a14c3ab77570e1058c56a4e62d4d8f Mon Sep 17 00:00:00 2001
From: Artur Cygan <arczicygan@gmail.com>
Date: Sat, 21 Nov 2020 15:16:06 +0100
Subject: [PATCH 3231/3942] pythonPackages.crytic-compile: fix missing
 dependency

---
 pkgs/development/python-modules/crytic-compile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix
index e6f82c6d8ad8..b9345e78eab0 100644
--- a/pkgs/development/python-modules/crytic-compile/default.nix
+++ b/pkgs/development/python-modules/crytic-compile/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pysha3 }:
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pysha3, setuptools }:
 
 buildPythonPackage rec {
   pname = "crytic-compile";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "01mis7bqsh0l5vjl6jwibzy99djza35fxmywy56q8k4jbxwmdcna";
   };
 
-  propagatedBuildInputs = [ pysha3 ];
+  propagatedBuildInputs = [ pysha3 setuptools ];
 
   doCheck = false;
 

From b2e70a9aeac595c53464e8b5036658e36345979b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 14:50:32 +0000
Subject: [PATCH 3232/3942] abi-dumper: 1.1 -> 1.2

---
 pkgs/development/tools/misc/abi-dumper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix
index 3d11d25560dc..dc2a6d00b5f0 100644
--- a/pkgs/development/tools/misc/abi-dumper/default.nix
+++ b/pkgs/development/tools/misc/abi-dumper/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abi-dumper";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "lvc";
     repo = "abi-dumper";
     rev = version;
-    sha256 = "1byhw132aj7a5a5zh5s3pnjlrhdk4cz6xd5irp1y08jl980qba5j";
+    sha256 = "1i00rfnddrrb9lb1l6ib19g3a76pyasl9lb7rqz2p998gav1gjp2";
   };
 
   patchPhase = ''

From 3d230b7caa23ce7a753e938e7a035f7f285573ef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 02:28:23 +0000
Subject: [PATCH 3233/3942] python37Packages.pyexcel: 0.6.5 -> 0.6.6

---
 pkgs/development/python-modules/pyexcel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix
index d62302c9c234..ca562ca5586b 100644
--- a/pkgs/development/python-modules/pyexcel/default.nix
+++ b/pkgs/development/python-modules/pyexcel/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "pyexcel";
-  version = "0.6.5";
+  version = "0.6.6";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "36588573ccb1c86e1a8869e1e9f6b31975a38c13803f015a197c18efd2e685ad";
+    sha256 = "39b0bb8f033d9b5523b126cf5a5259d1990ea82b8a23c8eab7aa5e23116803df";
   };
 
   propagatedBuildInputs = [

From 1fde3c35619bd445357077d816c72b0e589e0775 Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 2 Aug 2020 23:52:37 +0100
Subject: [PATCH 3234/3942] nixos/openldap: switch to slapd.d configuration

The old slapd.conf is deprecated. Replace with slapd.d, and use this
opportunity to write some structured settings.

Incidentally, this fixes the fact that openldap is reported up before
any checks have completed, by using forking mode.
---
 nixos/modules/misc/ids.nix                    |   4 +-
 nixos/modules/services/databases/openldap.nix | 371 ++++++++++++++----
 nixos/tests/openldap.nix                      | 163 ++++++--
 3 files changed, 431 insertions(+), 107 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index bafa22250400..cf0198d7b93d 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -135,7 +135,7 @@ in
       #keys = 96; # unused
       #haproxy = 97; # dynamically allocated as of 2020-03-11
       mongodb = 98;
-      openldap = 99;
+      #openldap = 99; # dynamically allocated as of PR#94610
       #users = 100; # unused
       cgminer = 101;
       munin = 102;
@@ -451,7 +451,7 @@ in
       keys = 96;
       #haproxy = 97; # dynamically allocated as of 2020-03-11
       #mongodb = 98; # unused
-      openldap = 99;
+      #openldap = 99; # dynamically allocated as of PR#94610
       munin = 102;
       #logcheck = 103; # unused
       #nix-ssh = 104; # unused
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 7472538b887e..afe24597e03f 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -1,20 +1,19 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-
 let
-
   cfg = config.services.openldap;
   openldap = cfg.package;
 
   dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents;
-  configFile = pkgs.writeText "slapd.conf" ((optionalString cfg.defaultSchemas ''
-    include ${openldap.out}/etc/schema/core.schema
-    include ${openldap.out}/etc/schema/cosine.schema
-    include ${openldap.out}/etc/schema/inetorgperson.schema
-    include ${openldap.out}/etc/schema/nis.schema
+  configFile = pkgs.writeText "slapd.conf" ((optionalString (cfg.defaultSchemas != null && cfg.defaultSchemas) ''
+    include ${openldap}/etc/schema/core.schema
+    include ${openldap}/etc/schema/cosine.schema
+    include ${openldap}/etc/schema/inetorgperson.schema
+    include ${openldap}/etc/schema/nis.schema
   '') + ''
-    ${cfg.extraConfig}
+    pidfile /run/slapd/slapd.pid
+    ${if cfg.extraConfig != null then cfg.extraConfig else ""}
     database ${cfg.database}
     suffix ${cfg.suffix}
     rootdn ${cfg.rootdn}
@@ -24,20 +23,79 @@ let
       include ${cfg.rootpwFile}
     ''}
     directory ${cfg.dataDir}
-    ${cfg.extraDatabaseConfig}
+    ${if cfg.extraDatabaseConfig != null then cfg.extraDatabaseConfig else ""}
   '');
-  configOpts = if cfg.configDir == null then "-f ${configFile}"
-               else "-F ${cfg.configDir}";
-in
 
-{
+  configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d";
 
-  ###### interface
+  ldapValueType = let
+    singleLdapValueType = types.either types.str (types.submodule {
+      options = {
+        path = mkOption {
+          type = types.path;
+          description = ''
+            A path containing the LDAP attribute. This is included at run-time, so
+            is recommended for storing secrets.
+          '';
+        };
+      };
+    });
+  in types.either singleLdapValueType (types.listOf singleLdapValueType);
 
+  ldapAttrsType =
+    let
+      options = {
+        attrs = mkOption {
+          type = types.attrsOf ldapValueType;
+          default = {};
+          description = "Attributes of the parent entry.";
+        };
+        children = mkOption {
+          # Hide the child attributes, to avoid infinite recursion in e.g. documentation
+          # Actual Nix evaluation is lazy, so this is not an issue there
+          type = let
+            hiddenOptions = lib.mapAttrs (name: attr: attr // { visible = false; }) options;
+          in types.attrsOf (types.submodule { options = hiddenOptions; });
+          default = {};
+          description = "Child entries of the current entry, with recursively the same structure.";
+          example = lib.literalExample ''
+          {
+            "cn=schema" = {
+              # The attribute used in the DN must be defined
+              attrs = { cn = "schema"; };
+              children = {
+                # This entry's DN is expanded to "cn=foo,cn=schema"
+                "cn=foo" = { ... };
+              };
+              # These includes are inserted after "cn=schema", but before "cn=foo,cn=schema"
+              includes = [ ... ];
+            };
+          }
+        '';
+        };
+        includes = mkOption {
+          type = types.listOf types.path;
+          default = [];
+          description = ''
+          LDIF files to include after the parent's attributes but before its children.
+        '';
+        };
+      };
+    in types.submodule { inherit options; };
+
+  valueToLdif = attr: values: let
+    singleValueToLdif = value: if lib.isAttrs value then "${attr}:< file://${value.path}" else "${attr}: ${value}";
+  in if lib.isList values then map singleValueToLdif values else [ (singleValueToLdif values) ];
+
+  attrsToLdif = dn: { attrs, children, includes, ... }: [''
+    dn: ${dn}
+    ${lib.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList valueToLdif attrs))}
+  ''] ++ (map (path: "include: file://${path}\n") includes) ++ (
+    lib.flatten (lib.mapAttrsToList (name: value: attrsToLdif "${name},${dn}" value) children)
+  );
+in {
   options = {
-
     services.openldap = {
-
       enable = mkOption {
         type = types.bool;
         default = false;
@@ -77,47 +135,91 @@ in
         example = [ "ldaps:///" ];
       };
 
+      settings = mkOption {
+        type = ldapAttrsType;
+        description = "Configuration for OpenLDAP, in OLC format";
+        example = lib.literalExample ''
+          {
+            attrs.olcLogLevel = [ "stats" ];
+            children = {
+              "cn=schema".includes = [
+                 "\${pkgs.openldap}/etc/schema/core.ldif"
+                 "\${pkgs.openldap}/etc/schema/cosine.ldif"
+                 "\${pkgs.openldap}/etc/schema/inetorgperson.ldif"
+              ];
+              "olcDatabase={-1}frontend" = {
+                attrs = {
+                  objectClass = "olcDatabaseConfig";
+                  olcDatabase = "{-1}frontend";
+                  olcAccess = [ "{0}to * by dn.exact=uidNumber=0+gidNumber=0,cn=peercred,cn=external,cn=auth manage stop by * none stop" ];
+                };
+              };
+              "olcDatabase={0}config" = {
+                attrs = {
+                  objectClass = "olcDatabaseConfig";
+                  olcDatabase = "{0}config";
+                  olcAccess = [ "{0}to * by * none break" ];
+                };
+              };
+              "olcDatabase={1}mdb" = {
+                attrs = {
+                  objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ];
+                  olcDatabase = "{1}mdb";
+                  olcDbDirectory = "/var/db/ldap";
+                  olcDbIndex = [
+                    "objectClass eq"
+                    "cn pres,eq"
+                    "uid pres,eq"
+                    "sn pres,eq,subany"
+                  ];
+                  olcSuffix = "dc=example,dc=com";
+                  olcAccess = [ "{0}to * by * read break" ];
+                };
+              };
+            };
+          };
+        '';
+      };
+
+      # These options are translated into settings
       dataDir = mkOption {
-        type = types.path;
+        type = types.nullOr types.path;
         default = "/var/db/openldap";
         description = "The database directory.";
       };
 
       defaultSchemas = mkOption {
-        type = types.bool;
+        type = types.nullOr types.bool;
         default = true;
+
         description = ''
           Include the default schemas core, cosine, inetorgperson and nis.
-          This setting will be ignored if configDir is set.
         '';
       };
 
       database = mkOption {
-        type = types.str;
+        type = types.nullOr types.str;
         default = "mdb";
-        description = ''
-          Database type to use for the LDAP.
-          This setting will be ignored if configDir is set.
-        '';
+        description = "Backend to use for the first database.";
       };
 
       suffix = mkOption {
-        type = types.str;
+        type = types.nullOr types.str;
+        default = null;
         example = "dc=example,dc=org";
         description = ''
-          Specify the DN suffix of queries that will be passed to this backend
-          database.
-          This setting will be ignored if configDir is set.
+          Specify the DN suffix of queries that will be passed to the first
+          database database.
         '';
       };
 
       rootdn = mkOption {
-        type = types.str;
+        type = types.nullOr types.str;
+        default = null;
         example = "cn=admin,dc=example,dc=org";
         description = ''
           Specify the distinguished name that is not subject to access control
           or administrative limit restrictions for operations on this database.
-          This setting will be ignored if configDir is set.
         '';
       };
 
@@ -125,10 +227,9 @@ in
         type = types.nullOr types.str;
         default = null;
         description = ''
-          Password for the root user.
-          This setting will be ignored if configDir is set.
-          Using this option will store the root password in plain text in the
-          world-readable nix store. To avoid this the <literal>rootpwFile</literal> can be used.
+          Password for the root user.Using this option will store the root
+          password in plain text in the world-readable nix store. To avoid this
+          the <literal>rootpwFile</literal> can be used.
         '';
       };
 
@@ -137,25 +238,36 @@ in
         default = null;
         description = ''
           Password file for the root user.
-          The file should contain the string <literal>rootpw</literal> followed by the password.
-          e.g.: <literal>rootpw mysecurepassword</literal>
+
+          If the deprecated <literal>extraConfig</literal> or
+          <literal>extraDatabaseConfig</literal> options are set, this should
+          contain <literal>rootpw</literal> followed by the password
+          (e.g. <literal>rootpw thePasswordHere</literal>).
+
+          Otherwise the file should contain only the password (no trailing
+          newline or leading <literal>rootpw</literal>).
         '';
       };
 
       logLevel = mkOption {
-        type = types.str;
-        default = "0";
-        example = "acl trace";
-        description = "The log level selector of slapd.";
+        type = types.nullOr (types.listOf types.str);
+        default = null;
+        example = literalExample "[ \"acl\" \"trace\" ]";
+        description = "The log level.";
       };
 
+      # This option overrides settings
       configDir = mkOption {
         type = types.nullOr types.path;
         default = null;
-        description = "Use this optional config directory instead of using slapd.conf";
+        description = ''
+          Use this optional config directory instead of generating one from the
+          <literal>settings</literal> option.
+        '';
         example = "/var/db/slapd.d";
       };
 
+      # These options are deprecated
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -164,10 +276,10 @@ in
         ";
         example = literalExample ''
             '''
-            include ${openldap.out}/etc/schema/core.schema
-            include ${openldap.out}/etc/schema/cosine.schema
-            include ${openldap.out}/etc/schema/inetorgperson.schema
-            include ${openldap.out}/etc/schema/nis.schema
+            include ${openldap}/etc/schema/core.schema
+            include ${openldap}/etc/schema/cosine.schema
+            include ${openldap}/etc/schema/inetorgperson.schema
+            include ${openldap}/etc/schema/nis.schema
 
             database bdb
             suffix dc=example,dc=org
@@ -244,57 +356,156 @@ in
   };
 
   meta = {
-    maintainers = [ lib.maintainers.mic92 ];
+    maintainers = with lib.maintainters; [ mic92 kwohlfahrt ];
   };
 
-
-  ###### implementation
-
   config = mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = cfg.configDir != null || cfg.rootpwFile != null || cfg.rootpw != null;
-        message = "services.openldap: Unless configDir is set, either rootpw or rootpwFile must be set";
-      }
-    ];
+    warnings = let
+      deprecations = [
+        { old = "logLevel"; new = "attrs.olcLogLevel"; }
+        { old = "defaultSchemas";
+          new = "children.\"cn=schema\".includes";
+          newValue = "[\n    ${lib.concatStringsSep "\n    " [
+            "\${pkgs.openldap}/etc/schema/core.ldif"
+            "\${pkgs.openldap}/etc/schema/cosine.ldif"
+            "\${pkgs.openldap}/etc/schema/inetorgperson.ldif"
+            "\${pkgs.openldap}/etc/schema/nis.ldif"
+          ]}\n  ]"; }
+        { old = "database"; new = "children.\"cn={1}${cfg.database}\""; newValue = "{ }"; }
+        { old = "suffix"; new = "children.\"cn={1}${cfg.database}\".attrs.olcSuffix"; }
+        { old = "dataDir"; new = "children.\"cn={1}${cfg.database}\".attrs.olcDbDirectory"; }
+        { old = "rootdn"; new = "children.\"cn={1}${cfg.database}\".attrs.olcRootDN"; }
+        { old = "rootpw"; new = "children.\"cn={1}${cfg.database}\".attrs.olcRootPW"; }
+        { old = "rootpwFile";
+          new = "children.\"cn={1}${cfg.database}\".attrs.olcRootPW";
+          newValue = "{ path = \"${cfg.rootpwFile}\"; }";
+          note = "The file should contain only the password (without \"rootpw \" as before)"; }
+      ];
+    in (optional (cfg.extraConfig != "" || cfg.extraDatabaseConfig != "") ''
+      The options `extraConfig` and `extraDatabaseConfig` of `services.openldap`
+      are deprecated. This is due to the deprecation of `slapd.conf`
+      upstream. Please migrate to `services.openldap.settings`.
+
+      After deploying this configuration, you can run:
+        slapcat -F ${configDir} -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))'
+      on the same host to print your current configuration in LDIF format,
+      which should be straightforward to convert into Nix settings.
+    '') ++ (flatten (map (args@{old, new, ...}: lib.optional ((lib.hasAttr old cfg) && (lib.getAttr old cfg) != null) ''
+      The attribute `services.openldap.${old}` is deprecated. Please set it to
+      `null` and use the following option instead:
+
+        services.openldap.settings.${new} = ${args.newValue or (
+          let oldValue = (getAttr old cfg);
+          in if (isList oldValue) then "[ ${concatStringsSep " " oldValue} ]" else oldValue
+        )}
+    '') deprecations)) ++ (optional (cfg.configDir != null && (versionOlder config.system.stateVersion "20.09")) ''
+      The attribute `services.openldap.settings` now exists, and may be more
+      useful than `services.openldap.configDir`. If you continue to use
+      `configDir`, ensure that `olcPidFile` is set to "/run/slapd/slapd.pid".
+
+      Set `system.stateVersion` to "20.09" or greater to silence this message.
+    '');
+
+    assertions = [{
+      assertion = !(cfg.rootpwFile != null && cfg.rootpw != null);
+      message = "services.openldap: at most one of rootpw or rootpwFile must be set";
+    }];
 
     environment.systemPackages = [ openldap ];
 
+    # Literal attributes must always be set (even if other top-level attributres are deprecated)
+    services.openldap.settings = {
+      attrs = {
+        objectClass = "olcGlobal";
+        cn = "config";
+        olcPidFile = "/run/slapd/slapd.pid";
+      } // (lib.optionalAttrs (cfg.logLevel != null) {
+        olcLogLevel = cfg.logLevel;
+      });
+      children = {
+        "cn=schema" = {
+          attrs = {
+            cn = "schema";
+            objectClass = "olcSchemaConfig";
+          };
+          includes = lib.optionals (cfg.defaultSchemas != null && cfg.defaultSchemas) [
+            "${openldap}/etc/schema/core.ldif"
+            "${openldap}/etc/schema/cosine.ldif"
+            "${openldap}/etc/schema/inetorgperson.ldif"
+            "${openldap}/etc/schema/nis.ldif"
+          ];
+        };
+      } // (lib.optionalAttrs (cfg.database != null) {
+        "olcDatabase={1}${cfg.database}".attrs = {
+          # objectClass is case-insensitive, so don't need to capitalize ${database}
+          objectClass = [ "olcdatabaseconfig" "olc${cfg.database}config" ];
+          olcDatabase = "{1}${cfg.database}";
+        } // (lib.optionalAttrs (cfg.suffix != null) {
+          olcSuffix = cfg.suffix;
+        }) // (lib.optionalAttrs (cfg.dataDir != null) {
+          olcDbDirectory = cfg.dataDir;
+        }) // (lib.optionalAttrs (cfg.rootdn != null) {
+          olcRootDN = cfg.rootdn; # TODO: Optional
+        }) // (lib.optionalAttrs (cfg.rootpw != null || cfg.rootpwFile != null) {
+          olcRootPW = (if cfg.rootpwFile != null then { path = cfg.rootpwFile; } else cfg.rootpw); # TODO: Optional
+        });
+      });
+    };
+
     systemd.services.openldap = {
       description = "LDAP server";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      preStart = ''
+      preStart = let
+        dbSettings = lib.filterAttrs (name: value: lib.hasPrefix "olcDatabase=" name) cfg.settings.children;
+        dataDirs = lib.mapAttrsToList (name: value: value.attrs.olcDbDirectory) dbSettings;
+        settingsFile = pkgs.writeText "config.ldif" (lib.concatStringsSep "\n" (attrsToLdif "cn=config" cfg.settings));
+      in ''
         mkdir -p /run/slapd
         chown -R "${cfg.user}:${cfg.group}" /run/slapd
-        ${optionalString (cfg.declarativeContents != null) ''
-          rm -Rf "${cfg.dataDir}"
-        ''}
-        mkdir -p "${cfg.dataDir}"
-        ${optionalString (cfg.declarativeContents != null) ''
-          ${openldap.out}/bin/slapadd ${configOpts} -l ${dataFile}
-        ''}
-        chown -R "${cfg.user}:${cfg.group}" "${cfg.dataDir}"
 
-        ${openldap}/bin/slaptest ${configOpts}
+        mkdir -p '${configDir}' ${lib.escapeShellArgs dataDirs}
+        chown "${cfg.user}:${cfg.group}" '${configDir}' ${lib.escapeShellArgs dataDirs}
+
+        ${lib.optionalString (cfg.configDir == null) (
+          if (cfg.extraConfig != "" || cfg.extraDatabaseConfig != "") then ''
+            rm -Rf '${configDir}'/*
+            # -u disables config generation, so just ignore the return code
+            ${openldap}/bin/slaptest -f ${configFile} -F ${configDir} || true
+          '' else ''
+            rm -Rf '${configDir}'/*
+            ${openldap}/bin/slapadd -F ${configDir} -n0 -l ${settingsFile}
+          ''
+        )}
+        chown -R "${cfg.user}:${cfg.group}" '${configDir}'
+
+        ${optionalString (cfg.declarativeContents != null) ''
+          rm -Rf '${lib.head dataDirs}'/*
+          ${openldap}/bin/slapadd -F ${configDir} -n1 -l ${dataFile}
+          chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArgs dataDirs}
+        ''}
+
+        ${openldap}/bin/slaptest -u -F ${configDir}
       '';
-      serviceConfig.ExecStart =
-        "${openldap.out}/libexec/slapd -d '${cfg.logLevel}' " +
-          "-u '${cfg.user}' -g '${cfg.group}' " +
-          "-h '${concatStringsSep " " cfg.urlList}' " +
-          "${configOpts}";
+      serviceConfig = {
+        ExecStart = lib.concatStringsSep " " [
+          "${openldap}/libexec/slapd"
+          "-u '${cfg.user}'"
+          "-g '${cfg.group}'"
+          "-h '${concatStringsSep " " cfg.urlList}'"
+          "-F ${configDir}"
+        ];
+        Type = "forking";
+        PIDFile = cfg.settings.attrs.olcPidFile;
+      };
     };
 
-    users.users.openldap =
-      { name = cfg.user;
-        group = cfg.group;
-        uid = config.ids.uids.openldap;
-      };
-
-    users.groups.openldap =
-      { name = cfg.group;
-        gid = config.ids.gids.openldap;
-      };
+    users.users = lib.optionalAttrs (cfg.user == "openldap") {
+      openldap = { group = cfg.group; };
+    };
 
+    users.groups = lib.optionalAttrs (cfg.group == "openldap") {
+      openldap = {};
+    };
   };
 }
diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix
index f8321a2c522d..33b7b7f6608a 100644
--- a/nixos/tests/openldap.nix
+++ b/nixos/tests/openldap.nix
@@ -1,33 +1,146 @@
-import ./make-test-python.nix {
-  name = "openldap";
-
-  machine = { pkgs, ... }: {
-    services.openldap = {
-      enable = true;
-      suffix = "dc=example";
-      rootdn = "cn=root,dc=example";
-      rootpw = "notapassword";
-      database = "bdb";
-      extraDatabaseConfig = ''
-        directory /var/db/openldap
-      '';
-      declarativeContents = ''
-        dn: dc=example
-        objectClass: domain
-        dc: example
-
-        dn: ou=users,dc=example
-        objectClass: organizationalUnit
-        ou: users
-      '';
-    };
-  };
+{ pkgs, system ? builtins.currentSystem, ... }: let
+  declarativeContents = ''
+    dn: dc=example
+    objectClass: domain
+    dc: example
 
+    dn: ou=users,dc=example
+    objectClass: organizationalUnit
+    ou: users
+  '';
   testScript = ''
     machine.wait_for_unit("openldap.service")
     machine.succeed(
-        "systemctl status openldap.service",
         'ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"',
     )
   '';
+in {
+  # New-style configuration
+  current = import ./make-test-python.nix {
+    inherit testScript;
+    name = "openldap";
+
+    machine = { pkgs, ... }: {
+      services.openldap = {
+        inherit declarativeContents;
+        enable = true;
+        defaultSchemas = null;
+        dataDir = null;
+        database = null;
+        settings = {
+          children = {
+            "cn=schema" = {
+              includes = [
+                "${pkgs.openldap}/etc/schema/core.ldif"
+                "${pkgs.openldap}/etc/schema/cosine.ldif"
+                "${pkgs.openldap}/etc/schema/inetorgperson.ldif"
+                "${pkgs.openldap}/etc/schema/nis.ldif"
+              ];
+            };
+            "olcDatabase={1}mdb" = {
+              attrs = {
+                objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ];
+                olcDatabase = "{1}mdb";
+                olcDbDirectory = "/var/db/openldap";
+                olcSuffix = "dc=example";
+                olcRootDN = "cn=root,dc=example";
+                olcRootPW = "notapassword";
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+
+  # Old-style configuration
+  shortOptions = import ./make-test-python.nix {
+    inherit testScript;
+    name = "openldap";
+
+    machine = { pkgs, ... }: {
+      services.openldap = {
+        inherit declarativeContents;
+        enable = true;
+        suffix = "dc=example";
+        rootdn = "cn=root,dc=example";
+        rootpw = "notapassword";
+      };
+    };
+  };
+
+  # Manually managed configDir, for example if dynamic config is essential
+  manualConfigDir = import ./make-test-python.nix {
+    name = "openldap";
+
+    machine = { pkgs, ... }: {
+      services.openldap = {
+        enable = true;
+        configDir = "/var/db/slapd.d";
+        # Silence warnings
+        defaultSchemas = null;
+        dataDir = null;
+        database = null;
+      };
+    };
+
+    testScript = let
+      contents = pkgs.writeText "data.ldif" declarativeContents;
+      config = pkgs.writeText "config.ldif" ''
+        dn: cn=config
+        cn: config
+        objectClass: olcGlobal
+        olcLogLevel: stats
+        olcPidFile: /run/slapd/slapd.pid
+
+        dn: cn=schema,cn=config
+        cn: schema
+        objectClass: olcSchemaConfig
+
+        include: file://${pkgs.openldap}/etc/schema/core.ldif
+        include: file://${pkgs.openldap}/etc/schema/cosine.ldif
+        include: file://${pkgs.openldap}/etc/schema/inetorgperson.ldif
+
+        dn: olcDatabase={1}mdb,cn=config
+        objectClass: olcDatabaseConfig
+        objectClass: olcMdbConfig
+        olcDatabase: {1}mdb
+        olcDbDirectory: /var/db/openldap
+        olcDbIndex: objectClass eq
+        olcSuffix: dc=example
+        olcRootDN: cn=root,dc=example
+        olcRootPW: notapassword
+      '';
+    in ''
+      machine.succeed(
+          "mkdir -p /var/db/slapd.d /var/db/openldap",
+          "slapadd -F /var/db/slapd.d -n0 -l ${config}",
+          "slapadd -F /var/db/slapd.d -n1 -l ${contents}",
+          "chown -R openldap:openldap /var/db/slapd.d /var/db/openldap",
+          "systemctl restart openldap",
+      )
+    '' + testScript;
+  };
+
+  # extraConfig forces use of slapd.conf, test this until that option is removed
+  legacyConfig = import ./make-test-python.nix {
+    inherit testScript;
+    name = "openldap";
+
+    machine = { pkgs, ... }: {
+      services.openldap = {
+        inherit declarativeContents;
+        enable = true;
+        suffix = "dc=example";
+        rootdn = "cn=root,dc=example";
+        rootpw = "notapassword";
+        extraConfig = ''
+          # No-op
+        '';
+        extraDatabaseConfig = ''
+          # No-op
+        '';
+      };
+    };
+  };
 }

From 057cb570beb9226b610dffa00cffd98b007a0686 Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 16 Aug 2020 20:17:06 +0100
Subject: [PATCH 3235/3942] nixos/openldap: Add delcarativeConfig by suffix

Adding by index could be an issue if the user wanted the data to be
added to a DB other than the first.
---
 nixos/modules/services/databases/openldap.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index afe24597e03f..d03c8cd7cfd3 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -474,14 +474,14 @@ in {
             ${openldap}/bin/slaptest -f ${configFile} -F ${configDir} || true
           '' else ''
             rm -Rf '${configDir}'/*
-            ${openldap}/bin/slapadd -F ${configDir} -n0 -l ${settingsFile}
+            ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile}
           ''
         )}
         chown -R "${cfg.user}:${cfg.group}" '${configDir}'
 
         ${optionalString (cfg.declarativeContents != null) ''
           rm -Rf '${lib.head dataDirs}'/*
-          ${openldap}/bin/slapadd -F ${configDir} -n1 -l ${dataFile}
+          ${openldap}/bin/slapadd -F ${configDir} -b${cfg.suffix} -l ${dataFile}
           chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArgs dataDirs}
         ''}
 

From 9528faf1829bbf77fa693e8700cf8b27eb0b869e Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Mon, 24 Aug 2020 00:07:24 +0100
Subject: [PATCH 3236/3942] nixos/openldap: Allow declarativeContents for
 multiple databases

---
 nixos/modules/services/databases/openldap.nix | 50 ++++++++++++-------
 nixos/tests/openldap.nix                      | 10 ++--
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index d03c8cd7cfd3..c3a8e03c880b 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -5,7 +5,6 @@ let
   cfg = config.services.openldap;
   openldap = cfg.package;
 
-  dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents;
   configFile = pkgs.writeText "slapd.conf" ((optionalString (cfg.defaultSchemas != null && cfg.defaultSchemas) ''
     include ${openldap}/etc/schema/core.schema
     include ${openldap}/etc/schema/cosine.schema
@@ -26,7 +25,7 @@ let
     ${if cfg.extraDatabaseConfig != null then cfg.extraDatabaseConfig else ""}
   '');
 
-  configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d";
+  configDir = lib.escapeShellArg (if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d");
 
   ldapValueType = let
     singleLdapValueType = types.either types.str (types.submodule {
@@ -209,7 +208,7 @@ in {
         example = "dc=example,dc=org";
         description = ''
           Specify the DN suffix of queries that will be passed to the first
-          database database.
+          backend database.
         '';
       };
 
@@ -292,10 +291,10 @@ in {
       };
 
       declarativeContents = mkOption {
-        type = with types; nullOr lines;
-        default = null;
+        type = with types; either lines (attrsOf lines);
+        default = {};
         description = ''
-          Declarative contents for the LDAP database, in LDIF format.
+          Declarative contents for the first LDAP database, in LDIF format.
 
           Note a few facts when using it. First, the database
           <emphasis>must</emphasis> be stored in the directory defined by
@@ -359,6 +358,10 @@ in {
     maintainers = with lib.maintainters; [ mic92 kwohlfahrt ];
   };
 
+  # TODO: Check that dataDir/declarativeContents/configDir all match
+  # - deprecate declarativeContents = ''...'';
+  # - no declarativeContents = ''...'' if dataDir == null;
+  # - no declarativeContents = { ... } if configDir != null
   config = mkIf cfg.enable {
     warnings = let
       deprecations = [
@@ -458,32 +461,45 @@ in {
       after = [ "network.target" ];
       preStart = let
         dbSettings = lib.filterAttrs (name: value: lib.hasPrefix "olcDatabase=" name) cfg.settings.children;
-        dataDirs = lib.mapAttrsToList (name: value: value.attrs.olcDbDirectory) dbSettings;
+        dataDirs = lib.mapAttrs' (name: value: lib.nameValuePair value.attrs.olcSuffix value.attrs.olcDbDirectory)
+          (lib.filterAttrs (_: value: value.attrs ? olcDbDirectory) dbSettings);
         settingsFile = pkgs.writeText "config.ldif" (lib.concatStringsSep "\n" (attrsToLdif "cn=config" cfg.settings));
       in ''
         mkdir -p /run/slapd
         chown -R "${cfg.user}:${cfg.group}" /run/slapd
 
-        mkdir -p '${configDir}' ${lib.escapeShellArgs dataDirs}
-        chown "${cfg.user}:${cfg.group}" '${configDir}' ${lib.escapeShellArgs dataDirs}
+        mkdir -p ${configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)}
+        chown "${cfg.user}:${cfg.group}" ${configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)}
 
         ${lib.optionalString (cfg.configDir == null) (
           if (cfg.extraConfig != "" || cfg.extraDatabaseConfig != "") then ''
-            rm -Rf '${configDir}'/*
+            rm -Rf ${configDir}/*
             # -u disables config generation, so just ignore the return code
             ${openldap}/bin/slaptest -f ${configFile} -F ${configDir} || true
           '' else ''
-            rm -Rf '${configDir}'/*
+            rm -Rf ${configDir}/*
             ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile}
           ''
         )}
-        chown -R "${cfg.user}:${cfg.group}" '${configDir}'
+        chown -R "${cfg.user}:${cfg.group}" ${configDir}
 
-        ${optionalString (cfg.declarativeContents != null) ''
-          rm -Rf '${lib.head dataDirs}'/*
-          ${openldap}/bin/slapadd -F ${configDir} -b${cfg.suffix} -l ${dataFile}
-          chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArgs dataDirs}
-        ''}
+        ${if types.lines.check cfg.declarativeContents then (let
+          dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents;
+        in ''
+          rm -rf ${lib.escapeShellArg cfg.dataDir}/*
+          ${openldap}/bin/slapadd -F ${configDir} -l ${dataFile}
+          chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg cfg.dataDir}
+        '') else (let
+          dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents;
+        in ''
+          ${lib.concatStrings (lib.mapAttrsToList (dn: file: let
+            dataDir = lib.escapeShellArg (getAttr dn dataDirs);
+          in ''
+            rm -rf ${dataDir}/*
+            ${openldap}/bin/slapadd -F ${configDir} -b ${dn} -l ${file}
+            chown -R "${cfg.user}:${cfg.group}" ${dataDir}
+          '') dataFiles)}
+        '')}
 
         ${openldap}/bin/slaptest -u -F ${configDir}
       '';
diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix
index 33b7b7f6608a..0c40073735eb 100644
--- a/nixos/tests/openldap.nix
+++ b/nixos/tests/openldap.nix
@@ -1,5 +1,5 @@
 { pkgs, system ? builtins.currentSystem, ... }: let
-  declarativeContents = ''
+  dbContents = ''
     dn: dc=example
     objectClass: domain
     dc: example
@@ -22,7 +22,6 @@ in {
 
     machine = { pkgs, ... }: {
       services.openldap = {
-        inherit declarativeContents;
         enable = true;
         defaultSchemas = null;
         dataDir = null;
@@ -49,6 +48,7 @@ in {
             };
           };
         };
+        declarativeContents."dc=example" = dbContents;
       };
     };
   };
@@ -60,11 +60,11 @@ in {
 
     machine = { pkgs, ... }: {
       services.openldap = {
-        inherit declarativeContents;
         enable = true;
         suffix = "dc=example";
         rootdn = "cn=root,dc=example";
         rootpw = "notapassword";
+        declarativeContents = dbContents;
       };
     };
   };
@@ -85,7 +85,7 @@ in {
     };
 
     testScript = let
-      contents = pkgs.writeText "data.ldif" declarativeContents;
+      contents = pkgs.writeText "data.ldif" dbContents;
       config = pkgs.writeText "config.ldif" ''
         dn: cn=config
         cn: config
@@ -129,7 +129,6 @@ in {
 
     machine = { pkgs, ... }: {
       services.openldap = {
-        inherit declarativeContents;
         enable = true;
         suffix = "dc=example";
         rootdn = "cn=root,dc=example";
@@ -140,6 +139,7 @@ in {
         extraDatabaseConfig = ''
           # No-op
         '';
+        declarativeContents = dbContents;
       };
     };
   };

From d05061c5cdd5662157591c75f45113c483443f4a Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Mon, 24 Aug 2020 00:19:35 +0100
Subject: [PATCH 3237/3942] nixos/openldap: Pick some PR nits

---
 nixos/modules/services/databases/openldap.nix | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index c3a8e03c880b..0def1e8c34de 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -25,7 +25,7 @@ let
     ${if cfg.extraDatabaseConfig != null then cfg.extraDatabaseConfig else ""}
   '');
 
-  configDir = lib.escapeShellArg (if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d");
+  configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d";
 
   ldapValueType = let
     singleLdapValueType = types.either types.str (types.submodule {
@@ -249,7 +249,7 @@ in {
       };
 
       logLevel = mkOption {
-        type = types.nullOr (types.listOf types.str);
+        type = types.nullOr (types.coercedTo types.str (lib.splitString " ") (types.listOf types.str));
         default = null;
         example = literalExample "[ \"acl\" \"trace\" ]";
         description = "The log level.";
@@ -468,8 +468,8 @@ in {
         mkdir -p /run/slapd
         chown -R "${cfg.user}:${cfg.group}" /run/slapd
 
-        mkdir -p ${configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)}
-        chown "${cfg.user}:${cfg.group}" ${configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)}
+        mkdir -p ${lib.escapeShellArg configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)}
+        chown "${cfg.user}:${cfg.group}" ${lib.escapeShellArg configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)}
 
         ${lib.optionalString (cfg.configDir == null) (
           if (cfg.extraConfig != "" || cfg.extraDatabaseConfig != "") then ''
@@ -481,13 +481,13 @@ in {
             ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile}
           ''
         )}
-        chown -R "${cfg.user}:${cfg.group}" ${configDir}
+        chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg configDir}
 
         ${if types.lines.check cfg.declarativeContents then (let
           dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents;
         in ''
           rm -rf ${lib.escapeShellArg cfg.dataDir}/*
-          ${openldap}/bin/slapadd -F ${configDir} -l ${dataFile}
+          ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -l ${dataFile}
           chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg cfg.dataDir}
         '') else (let
           dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents;
@@ -496,28 +496,28 @@ in {
             dataDir = lib.escapeShellArg (getAttr dn dataDirs);
           in ''
             rm -rf ${dataDir}/*
-            ${openldap}/bin/slapadd -F ${configDir} -b ${dn} -l ${file}
+            ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -b ${dn} -l ${file}
             chown -R "${cfg.user}:${cfg.group}" ${dataDir}
           '') dataFiles)}
         '')}
 
-        ${openldap}/bin/slaptest -u -F ${configDir}
+        ${openldap}/bin/slaptest -u -F ${lib.escapeShellArg configDir}
       '';
       serviceConfig = {
-        ExecStart = lib.concatStringsSep " " [
-          "${openldap}/libexec/slapd"
-          "-u '${cfg.user}'"
-          "-g '${cfg.group}'"
-          "-h '${concatStringsSep " " cfg.urlList}'"
-          "-F ${configDir}"
-        ];
+        ExecStart = lib.escapeShellArgs ([
+          "${openldap}/libexec/slapd" "-u" cfg.user "-g" cfg.group "-F" configDir
+          "-h" (lib.concatStringsSep " " cfg.urlList)
+        ]);
         Type = "forking";
         PIDFile = cfg.settings.attrs.olcPidFile;
       };
     };
 
     users.users = lib.optionalAttrs (cfg.user == "openldap") {
-      openldap = { group = cfg.group; };
+      openldap = {
+        group = cfg.group;
+        isSystemUser = true;
+      };
     };
 
     users.groups = lib.optionalAttrs (cfg.group == "openldap") {

From adda7e62d0c2a80aa85e0c22ad806874812f9f54 Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 13 Sep 2020 22:42:14 +0100
Subject: [PATCH 3238/3942] nixos/openldap: Add support for base64 values

---
 nixos/modules/services/databases/openldap.nix | 44 ++++++++++++++-----
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 0def1e8c34de..cb51a3cc575c 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -28,17 +28,31 @@ let
   configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d";
 
   ldapValueType = let
-    singleLdapValueType = types.either types.str (types.submodule {
-      options = {
-        path = mkOption {
-          type = types.path;
-          description = ''
-            A path containing the LDAP attribute. This is included at run-time, so
-            is recommended for storing secrets.
-          '';
+    singleLdapValueType = types.oneOf [
+      types.str
+      (types.submodule {
+        options = {
+          path = mkOption {
+            type = types.path;
+            description = ''
+              A path containing the LDAP attribute. This is included at run-time, so
+              is recommended for storing secrets.
+            '';
+          };
         };
-      };
-    });
+      })
+      (types.submodule {
+        options = {
+          base64 = mkOption {
+            type = types.str;
+            description = ''
+              A base64-encoded LDAP attribute. Useful for storing values which
+              contain special characters (e.g. newlines) in LDIF files.
+            '';
+          };
+        };
+      })
+    ];
   in types.either singleLdapValueType (types.listOf singleLdapValueType);
 
   ldapAttrsType =
@@ -83,8 +97,14 @@ let
     in types.submodule { inherit options; };
 
   valueToLdif = attr: values: let
-    singleValueToLdif = value: if lib.isAttrs value then "${attr}:< file://${value.path}" else "${attr}: ${value}";
-  in if lib.isList values then map singleValueToLdif values else [ (singleValueToLdif values) ];
+    listValues = if lib.isList values then values else lib.singleton values;
+  in map (value:
+    if lib.isAttrs value then
+      if lib.hasAttr "path" value
+      then "${attr}:< file://${value.path}"
+      else "${attr}:: ${value.base64}"
+    else "${attr}: ${lib.replaceStrings [ "\n" ] [ "\n " ] value}"
+  ) listValues;
 
   attrsToLdif = dn: { attrs, children, includes, ... }: [''
     dn: ${dn}

From 5fafbee87a3ecce798df55bbaaabcead43fc17b6 Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 13 Sep 2020 22:42:54 +0100
Subject: [PATCH 3239/3942] nixos/openldap: Add release-notes for OLC config

---
 nixos/doc/manual/release-notes/rl-2103.xml    | 8 ++++++++
 nixos/modules/services/databases/openldap.nix | 8 +-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 10d5cda77464..845aa8415040 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -185,6 +185,14 @@
      which is the new stable release.  OpenAFS 1.6 was removed.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      The <literal>openldap</literal> module now has support for OLC-style
+      configuration, users of the <literal>configDir</literal> option may wish
+      to migrate. If you continue to use <literal>configDir</literal>, ensure that
+      <literal>olcPidFile</literal> is set to <literal>/run/slapd/slapd.pid</literal>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index cb51a3cc575c..f9355201602c 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -421,13 +421,7 @@ in {
           let oldValue = (getAttr old cfg);
           in if (isList oldValue) then "[ ${concatStringsSep " " oldValue} ]" else oldValue
         )}
-    '') deprecations)) ++ (optional (cfg.configDir != null && (versionOlder config.system.stateVersion "20.09")) ''
-      The attribute `services.openldap.settings` now exists, and may be more
-      useful than `services.openldap.configDir`. If you continue to use
-      `configDir`, ensure that `olcPidFile` is set to "/run/slapd/slapd.pid".
-
-      Set `system.stateVersion` to "20.09" or greater to silence this message.
-    '');
+    '') deprecations));
 
     assertions = [{
       assertion = !(cfg.rootpwFile != null && cfg.rootpw != null);

From 2050376caee44dd52e7aaa00a9bfac6b644e5bff Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 13 Sep 2020 22:43:11 +0100
Subject: [PATCH 3240/3942] nixos/openldap: Mention schemas in migration hint

---
 nixos/modules/services/databases/openldap.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index f9355201602c..9de4c7fa41be 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -411,8 +411,10 @@ in {
 
       After deploying this configuration, you can run:
         slapcat -F ${configDir} -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))'
-      on the same host to print your current configuration in LDIF format,
-      which should be straightforward to convert into Nix settings.
+      on the same host to print your current configuration in LDIF format, which
+      should be straightforward to convert into Nix settings. This does not show
+      your schema configuration (as this is unnecessarily verbose users of the
+      default schemas), so be sure to migrate that as well.
     '') ++ (flatten (map (args@{old, new, ...}: lib.optional ((lib.hasAttr old cfg) && (lib.getAttr old cfg) != null) ''
       The attribute `services.openldap.${old}` is deprecated. Please set it to
       `null` and use the following option instead:

From 3f892c2174d3e215be2e12d6dacede3cd4db392c Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 13 Sep 2020 23:20:23 +0100
Subject: [PATCH 3241/3942] nixos/openldap: Remove extraConfig options

Instead of deprecating, as per PR feedback
---
 nixos/doc/manual/release-notes/rl-2103.xml    |  18 +++
 nixos/modules/services/databases/openldap.nix | 152 ++++--------------
 nixos/tests/openldap.nix                      |  22 ---
 3 files changed, 51 insertions(+), 141 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 845aa8415040..55c1229a164d 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -192,6 +192,24 @@
       to migrate. If you continue to use <literal>configDir</literal>, ensure that
       <literal>olcPidFile</literal> is set to <literal>/run/slapd/slapd.pid</literal>.
     </para>
+    <para>
+      As a result, <literal>extraConfig</literal> and <literal>extraDatabaseConfig</literal>
+      are removed. To help with migration, you can convert your <literal>slapd.conf</literal>
+      file to OLC configuration with the following script (find the location of this
+      configuration file by running <literal>systemctl status openldap</literal>, it is the
+      <literal>-f</literal> option.
+    </para>
+    <programlisting>
+      TMPDIR=$(mktemp -d)
+      slaptest -f /path/to/slapd.conf $TMPDIR
+      slapcat -F $TMPDIR -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))'
+    </programlisting>
+    <para>
+      This will dump your current configuration in LDIF format, which should be
+      straightforward to convert into Nix settings. This does not show your schema
+      configuration, as this is unnecessarily verbose for users of the default schemas
+      and <literal>slaptest</literal> is buggy with schemas directly in the config file.
+    </para>
    </listitem>
   </itemizedlist>
  </section>
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 9de4c7fa41be..fb043df9d60f 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -4,27 +4,6 @@ with lib;
 let
   cfg = config.services.openldap;
   openldap = cfg.package;
-
-  configFile = pkgs.writeText "slapd.conf" ((optionalString (cfg.defaultSchemas != null && cfg.defaultSchemas) ''
-    include ${openldap}/etc/schema/core.schema
-    include ${openldap}/etc/schema/cosine.schema
-    include ${openldap}/etc/schema/inetorgperson.schema
-    include ${openldap}/etc/schema/nis.schema
-  '') + ''
-    pidfile /run/slapd/slapd.pid
-    ${if cfg.extraConfig != null then cfg.extraConfig else ""}
-    database ${cfg.database}
-    suffix ${cfg.suffix}
-    rootdn ${cfg.rootdn}
-    ${if (cfg.rootpw != null) then ''
-      rootpw ${cfg.rootpw}
-    '' else ''
-      include ${cfg.rootpwFile}
-    ''}
-    directory ${cfg.dataDir}
-    ${if cfg.extraDatabaseConfig != null then cfg.extraDatabaseConfig else ""}
-  '');
-
   configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d";
 
   ldapValueType = let
@@ -113,6 +92,12 @@ let
     lib.flatten (lib.mapAttrsToList (name: value: attrsToLdif "${name},${dn}" value) children)
   );
 in {
+  imports = let
+    deprecationNote = "This option is removed due to the deprecation of `slapd.conf` upstream. Please migrate to `services.openldap.settings`, see the release notes for advice with this process.";
+  in [
+    (lib.mkRemovedOptionModule [ "services" "openldap" "extraConfig" ] deprecationNote)
+    (lib.mkRemovedOptionModule [ "services" "openldap" "extraDatabaseConfig" ] deprecationNote)
+  ];
   options = {
     services.openldap = {
       enable = mkOption {
@@ -280,36 +265,13 @@ in {
         type = types.nullOr types.path;
         default = null;
         description = ''
-          Use this optional config directory instead of generating one from the
-          <literal>settings</literal> option.
+          Use this config directory instead of generating one from the
+          <literal>settings</literal> option. Overrides all NixOS settings. If
+          you use this option,ensure `olcPidFile` is set to `/run/slapd/slapd.conf`.
         '';
         example = "/var/db/slapd.d";
       };
 
-      # These options are deprecated
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = "
-          slapd.conf configuration
-        ";
-        example = literalExample ''
-            '''
-            include ${openldap}/etc/schema/core.schema
-            include ${openldap}/etc/schema/cosine.schema
-            include ${openldap}/etc/schema/inetorgperson.schema
-            include ${openldap}/etc/schema/nis.schema
-
-            database bdb
-            suffix dc=example,dc=org
-            rootdn cn=admin,dc=example,dc=org
-            # NOTE: change after first start
-            rootpw secret
-            directory /var/db/openldap
-            '''
-          '';
-      };
-
       declarativeContents = mkOption {
         type = with types; either lines (attrsOf lines);
         default = {};
@@ -337,41 +299,7 @@ in {
           # ...
         '';
       };
-
-      extraDatabaseConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          slapd.conf configuration after the database option.
-          This setting will be ignored if configDir is set.
-        '';
-        example = ''
-          # Indices to maintain for this directory
-          # unique id so equality match only
-          index uid eq
-          # allows general searching on commonname, givenname and email
-          index cn,gn,mail eq,sub
-          # allows multiple variants on surname searching
-          index sn eq,sub
-          # sub above includes subintial,subany,subfinal
-          # optimise department searches
-          index ou eq
-          # if searches will include objectClass uncomment following
-          # index objectClass eq
-          # shows use of default index parameter
-          index default eq,sub
-          # indices missing - uses default eq,sub
-          index telephonenumber
-
-          # other database parameters
-          # read more in slapd.conf reference section
-          cachesize 10000
-          checkpoint 128 15
-        '';
-      };
-
     };
-
   };
 
   meta = {
@@ -404,18 +332,7 @@ in {
           newValue = "{ path = \"${cfg.rootpwFile}\"; }";
           note = "The file should contain only the password (without \"rootpw \" as before)"; }
       ];
-    in (optional (cfg.extraConfig != "" || cfg.extraDatabaseConfig != "") ''
-      The options `extraConfig` and `extraDatabaseConfig` of `services.openldap`
-      are deprecated. This is due to the deprecation of `slapd.conf`
-      upstream. Please migrate to `services.openldap.settings`.
-
-      After deploying this configuration, you can run:
-        slapcat -F ${configDir} -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))'
-      on the same host to print your current configuration in LDIF format, which
-      should be straightforward to convert into Nix settings. This does not show
-      your schema configuration (as this is unnecessarily verbose users of the
-      default schemas), so be sure to migrate that as well.
-    '') ++ (flatten (map (args@{old, new, ...}: lib.optional ((lib.hasAttr old cfg) && (lib.getAttr old cfg) != null) ''
+    in (flatten (map (args@{old, new, ...}: lib.optional ((lib.hasAttr old cfg) && (lib.getAttr old cfg) != null) ''
       The attribute `services.openldap.${old}` is deprecated. Please set it to
       `null` and use the following option instead:
 
@@ -487,35 +404,32 @@ in {
         mkdir -p ${lib.escapeShellArg configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)}
         chown "${cfg.user}:${cfg.group}" ${lib.escapeShellArg configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)}
 
-        ${lib.optionalString (cfg.configDir == null) (
-          if (cfg.extraConfig != "" || cfg.extraDatabaseConfig != "") then ''
-            rm -Rf ${configDir}/*
-            # -u disables config generation, so just ignore the return code
-            ${openldap}/bin/slaptest -f ${configFile} -F ${configDir} || true
-          '' else ''
-            rm -Rf ${configDir}/*
-            ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile}
-          ''
-        )}
+        ${lib.optionalString (cfg.configDir == null) (''
+          rm -Rf ${configDir}/*
+          ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile}
+        '')}
         chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg configDir}
 
-        ${if types.lines.check cfg.declarativeContents then (let
-          dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents;
-        in ''
-          rm -rf ${lib.escapeShellArg cfg.dataDir}/*
-          ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -l ${dataFile}
-          chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg cfg.dataDir}
-        '') else (let
-          dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents;
-        in ''
-          ${lib.concatStrings (lib.mapAttrsToList (dn: file: let
-            dataDir = lib.escapeShellArg (getAttr dn dataDirs);
+        ${if types.lines.check cfg.declarativeContents
+          then (let
+            dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents;
           in ''
-            rm -rf ${dataDir}/*
-            ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -b ${dn} -l ${file}
-            chown -R "${cfg.user}:${cfg.group}" ${dataDir}
-          '') dataFiles)}
-        '')}
+            rm -rf ${lib.escapeShellArg cfg.dataDir}/*
+            ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -l ${dataFile}
+            chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg cfg.dataDir}
+          '')
+          else (let
+            dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents;
+          in ''
+            ${lib.concatStrings (lib.mapAttrsToList (dn: file: let
+              dataDir = lib.escapeShellArg (getAttr dn dataDirs);
+            in ''
+              rm -rf ${dataDir}/*
+              ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -b ${dn} -l ${file}
+              chown -R "${cfg.user}:${cfg.group}" ${dataDir}
+            '') dataFiles)}
+          '')
+         }
 
         ${openldap}/bin/slaptest -u -F ${lib.escapeShellArg configDir}
       '';
diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix
index 0c40073735eb..b6dd8f573d5d 100644
--- a/nixos/tests/openldap.nix
+++ b/nixos/tests/openldap.nix
@@ -121,26 +121,4 @@ in {
       )
     '' + testScript;
   };
-
-  # extraConfig forces use of slapd.conf, test this until that option is removed
-  legacyConfig = import ./make-test-python.nix {
-    inherit testScript;
-    name = "openldap";
-
-    machine = { pkgs, ... }: {
-      services.openldap = {
-        enable = true;
-        suffix = "dc=example";
-        rootdn = "cn=root,dc=example";
-        rootpw = "notapassword";
-        extraConfig = ''
-          # No-op
-        '';
-        extraDatabaseConfig = ''
-          # No-op
-        '';
-        declarativeContents = dbContents;
-      };
-    };
-  };
 }

From b2ebffe18634e5038fe911b3bd2c74d26e7a7ab9 Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 27 Sep 2020 17:10:13 +0100
Subject: [PATCH 3242/3942] nixos/openldap: Fix indentation

---
 nixos/modules/services/databases/openldap.nix | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index fb043df9d60f..6f1ac3ed7172 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -51,26 +51,26 @@ let
           default = {};
           description = "Child entries of the current entry, with recursively the same structure.";
           example = lib.literalExample ''
-          {
-            "cn=schema" = {
-              # The attribute used in the DN must be defined
-              attrs = { cn = "schema"; };
-              children = {
-                # This entry's DN is expanded to "cn=foo,cn=schema"
-                "cn=foo" = { ... };
-              };
-              # These includes are inserted after "cn=schema", but before "cn=foo,cn=schema"
-              includes = [ ... ];
-            };
-          }
-        '';
+            {
+                "cn=schema" = {
+                # The attribute used in the DN must be defined
+                attrs = { cn = "schema"; };
+                children = {
+                    # This entry's DN is expanded to "cn=foo,cn=schema"
+                    "cn=foo" = { ... };
+                };
+                # These includes are inserted after "cn=schema", but before "cn=foo,cn=schema"
+                includes = [ ... ];
+                };
+            }
+          '';
         };
         includes = mkOption {
           type = types.listOf types.path;
           default = [];
           description = ''
-          LDIF files to include after the parent's attributes but before its children.
-        '';
+            LDIF files to include after the parent's attributes but before its children.
+          '';
         };
       };
     in types.submodule { inherit options; };

From ce1acd97a7162094accfb764cb1d33159dc5165f Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 27 Sep 2020 18:03:40 +0100
Subject: [PATCH 3243/3942] nixos/openldap: fix path + base64 value types

---
 nixos/modules/services/databases/openldap.nix | 33 +++++--------------
 nixos/tests/openldap.nix                      | 11 +++++--
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 6f1ac3ed7172..c333f817d031 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -7,31 +7,14 @@ let
   configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d";
 
   ldapValueType = let
-    singleLdapValueType = types.oneOf [
-      types.str
-      (types.submodule {
-        options = {
-          path = mkOption {
-            type = types.path;
-            description = ''
-              A path containing the LDAP attribute. This is included at run-time, so
-              is recommended for storing secrets.
-            '';
-          };
-        };
-      })
-      (types.submodule {
-        options = {
-          base64 = mkOption {
-            type = types.str;
-            description = ''
-              A base64-encoded LDAP attribute. Useful for storing values which
-              contain special characters (e.g. newlines) in LDIF files.
-            '';
-          };
-        };
-      })
-    ];
+    # Can't do types.either with multiple non-overlapping submodules, so define our own
+    singleLdapValueType = lib.mkOptionType rec {
+      name = "LDAP";
+      description = "LDAP value";
+      check = x: lib.isString x || (lib.isAttrs x && (x ? "path" || x ? "base64"));
+      merge = lib.mergeEqualOption;
+    };
+    # We don't coerce to lists of single values, as some values must be unique
   in types.either singleLdapValueType (types.listOf singleLdapValueType);
 
   ldapAttrsType =
diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix
index b6dd8f573d5d..beaff9164744 100644
--- a/nixos/tests/openldap.nix
+++ b/nixos/tests/openldap.nix
@@ -21,6 +21,7 @@ in {
     name = "openldap";
 
     machine = { pkgs, ... }: {
+      environment.etc."openldap/root_password".text = "notapassword";
       services.openldap = {
         enable = true;
         defaultSchemas = null;
@@ -37,13 +38,19 @@ in {
               ];
             };
             "olcDatabase={1}mdb" = {
+              # This tests string, base64 and path values, as well as lists of string values
               attrs = {
                 objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ];
                 olcDatabase = "{1}mdb";
                 olcDbDirectory = "/var/db/openldap";
                 olcSuffix = "dc=example";
-                olcRootDN = "cn=root,dc=example";
-                olcRootPW = "notapassword";
+                olcRootDN = {
+                  # cn=root,dc=example
+                  base64 = "Y249cm9vdCxkYz1leGFtcGxl";
+                };
+                olcRootPW = {
+                  path = "/etc/openldap/root_password";
+                };
               };
             };
           };

From fefc26f8449aba4d66a70f600932c9306f4db60b Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 27 Sep 2020 21:50:25 +0100
Subject: [PATCH 3244/3942] nixos/openldap: use mkRenamedOptionModule

This offers less helpful warnings, but makes the implementation
considerably more straightforward.
---
 nixos/modules/services/databases/openldap.nix | 247 +++++-------------
 nixos/tests/openldap.nix                      |  15 +-
 2 files changed, 73 insertions(+), 189 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index c333f817d031..aedf3873b049 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -11,7 +11,7 @@ let
     singleLdapValueType = lib.mkOptionType rec {
       name = "LDAP";
       description = "LDAP value";
-      check = x: lib.isString x || (lib.isAttrs x && (x ? "path" || x ? "base64"));
+      check = x: lib.isString x || (lib.isAttrs x && (x ? path || x ? base64));
       merge = lib.mergeEqualOption;
     };
     # We don't coerce to lists of single values, as some values must be unique
@@ -80,6 +80,34 @@ in {
   in [
     (lib.mkRemovedOptionModule [ "services" "openldap" "extraConfig" ] deprecationNote)
     (lib.mkRemovedOptionModule [ "services" "openldap" "extraDatabaseConfig" ] deprecationNote)
+
+    (lib.mkChangedOptionModule [ "services" "openldap" "logLevel" ] [ "services" "openldap" "settings" "attrs" "olcLogLevel" ]
+      (config: lib.splitString " " (lib.getAttrFromPath [ "services" "openldap" "logLevel" ] config)))
+    (lib.mkChangedOptionModule [ "services" "openldap" "defaultSchemas" ] [ "services" "openldap" "settings" "children" "cn=schema" "includes"]
+      (config: lib.optionals (lib.getAttrFromPath [ "services" "openldap" "defaultSchemas" ] config) (
+        map (schema: "${pkgs.openldap}/etc/schema/${schema}.ldif") [ "core" "cosine" "inetorgperson" "nis" ])))
+
+    (lib.mkChangedOptionModule [ "services" "openldap" "database" ] [ "services" "openldap" "settings" "children" ]
+      (config: let
+        database = lib.getAttrFromPath [ "services" "openldap" "database" ] config;
+      in {
+        "olcDatabase={1}${database}".attrs = {
+          # objectClass is case-insensitive, so don't need to capitalize ${database}
+          objectClass = [ "olcdatabaseconfig" "olc${database}config" ];
+          olcDatabase = "{1}${database}";
+          olcDbDirectory = lib.mkDefault "/var/db/openldap";
+        };
+      }))
+    (lib.mkRenamedOptionModule [ "services" "openldap" "rootpwFile" ]
+      [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcRootPW" "path"])
+    (lib.mkRenamedOptionModule [ "services" "openldap" "suffix" ]
+      [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcSuffix"])
+    (lib.mkRenamedOptionModule [ "services" "openldap" "dataDir" ]
+      [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcDbDirectory"])
+    (lib.mkRenamedOptionModule [ "services" "openldap" "rootdn" ]
+      [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcRootDN"])
+    (lib.mkRenamedOptionModule [ "services" "openldap" "rootpw" ]
+      [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcRootPW"])
   ];
   options = {
     services.openldap = {
@@ -168,81 +196,6 @@ in {
         '';
       };
 
-      # These options are translated into settings
-      dataDir = mkOption {
-        type = types.nullOr types.path;
-        default = "/var/db/openldap";
-        description = "The database directory.";
-      };
-
-      defaultSchemas = mkOption {
-        type = types.nullOr types.bool;
-        default = true;
-
-        description = ''
-          Include the default schemas core, cosine, inetorgperson and nis.
-        '';
-      };
-
-      database = mkOption {
-        type = types.nullOr types.str;
-        default = "mdb";
-        description = "Backend to use for the first database.";
-      };
-
-      suffix = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        example = "dc=example,dc=org";
-        description = ''
-          Specify the DN suffix of queries that will be passed to the first
-          backend database.
-        '';
-      };
-
-      rootdn = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        example = "cn=admin,dc=example,dc=org";
-        description = ''
-          Specify the distinguished name that is not subject to access control
-          or administrative limit restrictions for operations on this database.
-        '';
-      };
-
-      rootpw = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = ''
-          Password for the root user.Using this option will store the root
-          password in plain text in the world-readable nix store. To avoid this
-          the <literal>rootpwFile</literal> can be used.
-        '';
-      };
-
-      rootpwFile = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = ''
-          Password file for the root user.
-
-          If the deprecated <literal>extraConfig</literal> or
-          <literal>extraDatabaseConfig</literal> options are set, this should
-          contain <literal>rootpw</literal> followed by the password
-          (e.g. <literal>rootpw thePasswordHere</literal>).
-
-          Otherwise the file should contain only the password (no trailing
-          newline or leading <literal>rootpw</literal>).
-        '';
-      };
-
-      logLevel = mkOption {
-        type = types.nullOr (types.coercedTo types.str (lib.splitString " ") (types.listOf types.str));
-        default = null;
-        example = literalExample "[ \"acl\" \"trace\" ]";
-        description = "The log level.";
-      };
-
       # This option overrides settings
       configDir = mkOption {
         type = types.nullOr types.path;
@@ -256,119 +209,64 @@ in {
       };
 
       declarativeContents = mkOption {
-        type = with types; either lines (attrsOf lines);
+        type = with types; attrsOf lines;
         default = {};
         description = ''
-          Declarative contents for the first LDAP database, in LDIF format.
+          Declarative contents for the LDAP database, in LDIF format by suffix.
 
-          Note a few facts when using it. First, the database
-          <emphasis>must</emphasis> be stored in the directory defined by
-          <code>dataDir</code>. Second, all <code>dataDir</code> will be erased
-          when starting the LDAP server. Third, modifications to the database
-          are not prevented, they are just dropped on the next reboot of the
-          server. Finally, performance-wise the database and indexes are rebuilt
-          on each server startup, so this will slow down server startup,
+          All data will be erased when starting the LDAP server. Modifications
+          to the database are not prevented, they are just dropped on the next
+          reboot of the server. Performance-wise the database and indexes are
+          rebuilt on each server startup, so this will slow down server startup,
           especially with large databases.
         '';
-        example = ''
-          dn: dc=example,dc=org
-          objectClass: domain
-          dc: example
+        example = lib.literalExample ''
+          {
+            "dc=example,dc=org" = '''
+              dn= dn: dc=example,dc=org
+              objectClass: domain
+              dc: example
 
-          dn: ou=users,dc=example,dc=org
-          objectClass = organizationalUnit
-          ou: users
+              dn: ou=users,dc=example,dc=org
+              objectClass = organizationalUnit
+              ou: users
 
-          # ...
+              # ...
+            ''';
+          }
         '';
       };
     };
   };
 
-  meta = {
-    maintainers = with lib.maintainters; [ mic92 kwohlfahrt ];
-  };
+  meta.maintainers = with lib.maintainters; [ mic92 kwohlfahrt ];
 
-  # TODO: Check that dataDir/declarativeContents/configDir all match
-  # - deprecate declarativeContents = ''...'';
-  # - no declarativeContents = ''...'' if dataDir == null;
-  # - no declarativeContents = { ... } if configDir != null
   config = mkIf cfg.enable {
-    warnings = let
-      deprecations = [
-        { old = "logLevel"; new = "attrs.olcLogLevel"; }
-        { old = "defaultSchemas";
-          new = "children.\"cn=schema\".includes";
-          newValue = "[\n    ${lib.concatStringsSep "\n    " [
-            "\${pkgs.openldap}/etc/schema/core.ldif"
-            "\${pkgs.openldap}/etc/schema/cosine.ldif"
-            "\${pkgs.openldap}/etc/schema/inetorgperson.ldif"
-            "\${pkgs.openldap}/etc/schema/nis.ldif"
-          ]}\n  ]"; }
-        { old = "database"; new = "children.\"cn={1}${cfg.database}\""; newValue = "{ }"; }
-        { old = "suffix"; new = "children.\"cn={1}${cfg.database}\".attrs.olcSuffix"; }
-        { old = "dataDir"; new = "children.\"cn={1}${cfg.database}\".attrs.olcDbDirectory"; }
-        { old = "rootdn"; new = "children.\"cn={1}${cfg.database}\".attrs.olcRootDN"; }
-        { old = "rootpw"; new = "children.\"cn={1}${cfg.database}\".attrs.olcRootPW"; }
-        { old = "rootpwFile";
-          new = "children.\"cn={1}${cfg.database}\".attrs.olcRootPW";
-          newValue = "{ path = \"${cfg.rootpwFile}\"; }";
-          note = "The file should contain only the password (without \"rootpw \" as before)"; }
-      ];
-    in (flatten (map (args@{old, new, ...}: lib.optional ((lib.hasAttr old cfg) && (lib.getAttr old cfg) != null) ''
-      The attribute `services.openldap.${old}` is deprecated. Please set it to
-      `null` and use the following option instead:
-
-        services.openldap.settings.${new} = ${args.newValue or (
-          let oldValue = (getAttr old cfg);
-          in if (isList oldValue) then "[ ${concatStringsSep " " oldValue} ]" else oldValue
-        )}
-    '') deprecations));
-
     assertions = [{
-      assertion = !(cfg.rootpwFile != null && cfg.rootpw != null);
-      message = "services.openldap: at most one of rootpw or rootpwFile must be set";
+      assertion = lib.length (lib.attrNames cfg.settings.children) >= 2 || cfg ? database;
+      message = ''
+        No OpenLDAP database is defined. Configure one with `services.openldap.settings`
+        or `services.openldap.database` (legacy).
+      '';
     }];
 
     environment.systemPackages = [ openldap ];
 
-    # Literal attributes must always be set (even if other top-level attributres are deprecated)
+    # Literal attributes must always be set
     services.openldap.settings = {
       attrs = {
         objectClass = "olcGlobal";
         cn = "config";
         olcPidFile = "/run/slapd/slapd.pid";
-      } // (lib.optionalAttrs (cfg.logLevel != null) {
-        olcLogLevel = cfg.logLevel;
-      });
+      };
       children = {
         "cn=schema" = {
           attrs = {
             cn = "schema";
             objectClass = "olcSchemaConfig";
           };
-          includes = lib.optionals (cfg.defaultSchemas != null && cfg.defaultSchemas) [
-            "${openldap}/etc/schema/core.ldif"
-            "${openldap}/etc/schema/cosine.ldif"
-            "${openldap}/etc/schema/inetorgperson.ldif"
-            "${openldap}/etc/schema/nis.ldif"
-          ];
         };
-      } // (lib.optionalAttrs (cfg.database != null) {
-        "olcDatabase={1}${cfg.database}".attrs = {
-          # objectClass is case-insensitive, so don't need to capitalize ${database}
-          objectClass = [ "olcdatabaseconfig" "olc${cfg.database}config" ];
-          olcDatabase = "{1}${cfg.database}";
-        } // (lib.optionalAttrs (cfg.suffix != null) {
-          olcSuffix = cfg.suffix;
-        }) // (lib.optionalAttrs (cfg.dataDir != null) {
-          olcDbDirectory = cfg.dataDir;
-        }) // (lib.optionalAttrs (cfg.rootdn != null) {
-          olcRootDN = cfg.rootdn; # TODO: Optional
-        }) // (lib.optionalAttrs (cfg.rootpw != null || cfg.rootpwFile != null) {
-          olcRootPW = (if cfg.rootpwFile != null then { path = cfg.rootpwFile; } else cfg.rootpw); # TODO: Optional
-        });
-      });
+      };
     };
 
     systemd.services.openldap = {
@@ -376,10 +274,19 @@ in {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       preStart = let
+        settingsFile = pkgs.writeText "config.ldif" (lib.concatStringsSep "\n" (attrsToLdif "cn=config" cfg.settings));
+
         dbSettings = lib.filterAttrs (name: value: lib.hasPrefix "olcDatabase=" name) cfg.settings.children;
         dataDirs = lib.mapAttrs' (name: value: lib.nameValuePair value.attrs.olcSuffix value.attrs.olcDbDirectory)
           (lib.filterAttrs (_: value: value.attrs ? olcDbDirectory) dbSettings);
-        settingsFile = pkgs.writeText "config.ldif" (lib.concatStringsSep "\n" (attrsToLdif "cn=config" cfg.settings));
+        dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents;
+        mkLoadScript = dn: let
+          dataDir = lib.escapeShellArg (getAttr dn dataDirs);
+        in  ''
+          rm -rf ${dataDir}/*
+          ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -b ${dn} -l ${getAttr dn dataFiles}
+          chown -R "${cfg.user}:${cfg.group}" ${dataDir}
+        '';
       in ''
         mkdir -p /run/slapd
         chown -R "${cfg.user}:${cfg.group}" /run/slapd
@@ -393,27 +300,7 @@ in {
         '')}
         chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg configDir}
 
-        ${if types.lines.check cfg.declarativeContents
-          then (let
-            dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents;
-          in ''
-            rm -rf ${lib.escapeShellArg cfg.dataDir}/*
-            ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -l ${dataFile}
-            chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg cfg.dataDir}
-          '')
-          else (let
-            dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents;
-          in ''
-            ${lib.concatStrings (lib.mapAttrsToList (dn: file: let
-              dataDir = lib.escapeShellArg (getAttr dn dataDirs);
-            in ''
-              rm -rf ${dataDir}/*
-              ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -b ${dn} -l ${file}
-              chown -R "${cfg.user}:${cfg.group}" ${dataDir}
-            '') dataFiles)}
-          '')
-         }
-
+        ${lib.concatStrings (map mkLoadScript (lib.attrNames cfg.declarativeContents))}
         ${openldap}/bin/slaptest -u -F ${lib.escapeShellArg configDir}
       '';
       serviceConfig = {
diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix
index beaff9164744..ac1e1a7596f2 100644
--- a/nixos/tests/openldap.nix
+++ b/nixos/tests/openldap.nix
@@ -24,9 +24,6 @@ in {
       environment.etc."openldap/root_password".text = "notapassword";
       services.openldap = {
         enable = true;
-        defaultSchemas = null;
-        dataDir = null;
-        database = null;
         settings = {
           children = {
             "cn=schema" = {
@@ -61,17 +58,21 @@ in {
   };
 
   # Old-style configuration
-  shortOptions = import ./make-test-python.nix {
+  oldOptions = import ./make-test-python.nix {
     inherit testScript;
     name = "openldap";
 
     machine = { pkgs, ... }: {
       services.openldap = {
         enable = true;
+        logLevel = "stats acl";
+        defaultSchemas = true;
+        database = "mdb";
         suffix = "dc=example";
         rootdn = "cn=root,dc=example";
         rootpw = "notapassword";
-        declarativeContents = dbContents;
+        dataDir = "/var/db/openldap";
+        declarativeContents."dc=example" = dbContents;
       };
     };
   };
@@ -84,10 +85,6 @@ in {
       services.openldap = {
         enable = true;
         configDir = "/var/db/slapd.d";
-        # Silence warnings
-        defaultSchemas = null;
-        dataDir = null;
-        database = null;
       };
     };
 

From db5bb4e26bb1cdc8a79dd639c2585722fdf2ce18 Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 27 Sep 2020 23:19:01 +0100
Subject: [PATCH 3245/3942] nixos/openldap: Fix sssd-ldap test

Use this as a test of the migration warnings/functionality.
---
 nixos/modules/services/databases/openldap.nix | 49 ++++++++---------
 nixos/tests/openldap.nix                      |  1 -
 nixos/tests/sssd-ldap.nix                     | 52 ++++++++++---------
 3 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index aedf3873b049..94a5c573768b 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -3,6 +3,7 @@
 with lib;
 let
   cfg = config.services.openldap;
+  legacyOptions = [ "rootpwFile" "suffix" "dataDir" "rootdn" "rootpw" ];
   openldap = cfg.package;
   configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d";
 
@@ -77,6 +78,12 @@ let
 in {
   imports = let
     deprecationNote = "This option is removed due to the deprecation of `slapd.conf` upstream. Please migrate to `services.openldap.settings`, see the release notes for advice with this process.";
+    mkDatabaseOption = old: new:
+      lib.mkChangedOptionModule [ "services" "openldap" old ] [ "services" "openldap" "settings" "children" ]
+        (config: let
+          database = lib.getAttrFromPath [ "services" "openldap" "database" ] config;
+          value = lib.getAttrFromPath [ "services" "openldap" old ] config;
+        in lib.setAttrByPath ([ "olcDatabase={1}${database}" "attrs" ] ++ new) value);
   in [
     (lib.mkRemovedOptionModule [ "services" "openldap" "extraConfig" ] deprecationNote)
     (lib.mkRemovedOptionModule [ "services" "openldap" "extraDatabaseConfig" ] deprecationNote)
@@ -85,7 +92,7 @@ in {
       (config: lib.splitString " " (lib.getAttrFromPath [ "services" "openldap" "logLevel" ] config)))
     (lib.mkChangedOptionModule [ "services" "openldap" "defaultSchemas" ] [ "services" "openldap" "settings" "children" "cn=schema" "includes"]
       (config: lib.optionals (lib.getAttrFromPath [ "services" "openldap" "defaultSchemas" ] config) (
-        map (schema: "${pkgs.openldap}/etc/schema/${schema}.ldif") [ "core" "cosine" "inetorgperson" "nis" ])))
+        map (schema: "${openldap}/etc/schema/${schema}.ldif") [ "core" "cosine" "inetorgperson" "nis" ])))
 
     (lib.mkChangedOptionModule [ "services" "openldap" "database" ] [ "services" "openldap" "settings" "children" ]
       (config: let
@@ -97,17 +104,15 @@ in {
           olcDatabase = "{1}${database}";
           olcDbDirectory = lib.mkDefault "/var/db/openldap";
         };
+        "cn=schema".includes = lib.mkDefault (
+          map (schema: "${openldap}/etc/schema/${schema}.ldif") [ "core" "cosine" "inetorgperson" "nis" ]
+        );
       }))
-    (lib.mkRenamedOptionModule [ "services" "openldap" "rootpwFile" ]
-      [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcRootPW" "path"])
-    (lib.mkRenamedOptionModule [ "services" "openldap" "suffix" ]
-      [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcSuffix"])
-    (lib.mkRenamedOptionModule [ "services" "openldap" "dataDir" ]
-      [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcDbDirectory"])
-    (lib.mkRenamedOptionModule [ "services" "openldap" "rootdn" ]
-      [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcRootDN"])
-    (lib.mkRenamedOptionModule [ "services" "openldap" "rootpw" ]
-      [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcRootPW"])
+    (mkDatabaseOption "rootpwFile" [ "olcRootPW" "path" ])
+    (mkDatabaseOption "suffix" [ "olcSuffix" ])
+    (mkDatabaseOption "dataDir" [ "olcDbDirectory" ])
+    (mkDatabaseOption "rootdn" [ "olcRootDN" ])
+    (mkDatabaseOption "rootpw" [ "olcRootPW" ])
   ];
   options = {
     services.openldap = {
@@ -242,14 +247,10 @@ in {
   meta.maintainers = with lib.maintainters; [ mic92 kwohlfahrt ];
 
   config = mkIf cfg.enable {
-    assertions = [{
-      assertion = lib.length (lib.attrNames cfg.settings.children) >= 2 || cfg ? database;
-      message = ''
-        No OpenLDAP database is defined. Configure one with `services.openldap.settings`
-        or `services.openldap.database` (legacy).
-      '';
-    }];
-
+    assertions = map (opt: {
+      assertion = ((getAttr opt cfg) != "_mkMergedOptionModule") -> (cfg.database != "_mkMergedOptionModule");
+      message = "Legacy OpenLDAP option `services.openldap.${opt}` requires `services.openldap.database` (use value \"mdb\" if unsure)";
+    }) legacyOptions;
     environment.systemPackages = [ openldap ];
 
     # Literal attributes must always be set
@@ -259,13 +260,9 @@ in {
         cn = "config";
         olcPidFile = "/run/slapd/slapd.pid";
       };
-      children = {
-        "cn=schema" = {
-          attrs = {
-            cn = "schema";
-            objectClass = "olcSchemaConfig";
-          };
-        };
+      children."cn=schema".attrs = {
+        cn = "schema";
+        objectClass = "olcSchemaConfig";
       };
     };
 
diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix
index ac1e1a7596f2..e9339523ca9f 100644
--- a/nixos/tests/openldap.nix
+++ b/nixos/tests/openldap.nix
@@ -71,7 +71,6 @@ in {
         suffix = "dc=example";
         rootdn = "cn=root,dc=example";
         rootpw = "notapassword";
-        dataDir = "/var/db/openldap";
         declarativeContents."dc=example" = dbContents;
       };
     };
diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix
index b68403a0102a..8cb398d0e170 100644
--- a/nixos/tests/sssd-ldap.nix
+++ b/nixos/tests/sssd-ldap.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ... }:
+({ pkgs, ... }:
   let
     dbDomain = "example.org";
     dbSuffix = "dc=example,dc=org";
@@ -7,8 +7,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
     ldapRootPassword = "foobar";
 
     testUser = "alice";
-  in
-  {
+  in import ./make-test-python.nix {
     name = "sssd-ldap";
 
     meta = with pkgs.stdenv.lib.maintainers; {
@@ -18,34 +17,37 @@ import ./make-test-python.nix ({ pkgs, ... }:
     machine = { pkgs, ... }: {
       services.openldap = {
         enable = true;
+        database = "mdb";
         rootdn = "cn=${ldapRootUser},${dbSuffix}";
         rootpw = ldapRootPassword;
         suffix = dbSuffix;
-        declarativeContents = ''
-          dn: ${dbSuffix}
-          objectClass: top
-          objectClass: dcObject
-          objectClass: organization
-          o: ${dbDomain}
+        declarativeContents = {
+          ${dbSuffix} = ''
+            dn: ${dbSuffix}
+            objectClass: top
+            objectClass: dcObject
+            objectClass: organization
+            o: ${dbDomain}
 
-          dn: ou=posix,${dbSuffix}
-          objectClass: top
-          objectClass: organizationalUnit
+            dn: ou=posix,${dbSuffix}
+            objectClass: top
+            objectClass: organizationalUnit
 
-          dn: ou=accounts,ou=posix,${dbSuffix}
-          objectClass: top
-          objectClass: organizationalUnit
+            dn: ou=accounts,ou=posix,${dbSuffix}
+            objectClass: top
+            objectClass: organizationalUnit
 
-          dn: uid=${testUser},ou=accounts,ou=posix,${dbSuffix}
-          objectClass: person
-          objectClass: posixAccount
-          # userPassword: somePasswordHash
-          homeDirectory: /home/${testUser}
-          uidNumber: 1234
-          gidNumber: 1234
-          cn: ""
-          sn: ""
-        '';
+            dn: uid=${testUser},ou=accounts,ou=posix,${dbSuffix}
+            objectClass: person
+            objectClass: posixAccount
+            # userPassword: somePasswordHash
+            homeDirectory: /home/${testUser}
+            uidNumber: 1234
+            gidNumber: 1234
+            cn: ""
+            sn: ""
+          '';
+        };
       };
 
       services.sssd = {

From c96f18feee69f1bd621ba4ddeb180e95d4278f27 Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 27 Sep 2020 23:23:31 +0100
Subject: [PATCH 3246/3942] nixos/openldap: migrate sssd-ldap to new settings

---
 nixos/tests/openldap.nix  | 14 ++++++--------
 nixos/tests/sssd-ldap.nix | 24 ++++++++++++++++++++----
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix
index e9339523ca9f..392fae243467 100644
--- a/nixos/tests/openldap.nix
+++ b/nixos/tests/openldap.nix
@@ -26,14 +26,12 @@ in {
         enable = true;
         settings = {
           children = {
-            "cn=schema" = {
-              includes = [
-                "${pkgs.openldap}/etc/schema/core.ldif"
-                "${pkgs.openldap}/etc/schema/cosine.ldif"
-                "${pkgs.openldap}/etc/schema/inetorgperson.ldif"
-                "${pkgs.openldap}/etc/schema/nis.ldif"
-              ];
-            };
+            "cn=schema".includes = [
+              "${pkgs.openldap}/etc/schema/core.ldif"
+              "${pkgs.openldap}/etc/schema/cosine.ldif"
+              "${pkgs.openldap}/etc/schema/inetorgperson.ldif"
+              "${pkgs.openldap}/etc/schema/nis.ldif"
+            ];
             "olcDatabase={1}mdb" = {
               # This tests string, base64 and path values, as well as lists of string values
               attrs = {
diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix
index 8cb398d0e170..4831eaa4ba20 100644
--- a/nixos/tests/sssd-ldap.nix
+++ b/nixos/tests/sssd-ldap.nix
@@ -17,10 +17,26 @@
     machine = { pkgs, ... }: {
       services.openldap = {
         enable = true;
-        database = "mdb";
-        rootdn = "cn=${ldapRootUser},${dbSuffix}";
-        rootpw = ldapRootPassword;
-        suffix = dbSuffix;
+        settings = {
+          children = {
+            "cn=schema".includes = [
+              "${pkgs.openldap}/etc/schema/core.ldif"
+              "${pkgs.openldap}/etc/schema/cosine.ldif"
+              "${pkgs.openldap}/etc/schema/inetorgperson.ldif"
+              "${pkgs.openldap}/etc/schema/nis.ldif"
+            ];
+            "olcDatabase={1}mdb" = {
+              attrs = {
+                objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ];
+                olcDatabase = "{1}mdb";
+                olcDbDirectory = "/var/db/openldap";
+                olcSuffix = dbSuffix;
+                olcRootDN = "cn=${ldapRootUser},${dbSuffix}";
+                olcRootPW = ldapRootPassword;
+              };
+            };
+          };
+        };
         declarativeContents = {
           ${dbSuffix} = ''
             dn: ${dbSuffix}

From e6295fafa9f96f1df1010a8afeddc4d8fc97fa68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 21 Nov 2020 17:33:21 +0100
Subject: [PATCH 3247/3942] haskellPackages.{http-media,servant-auth-client}:
 fix builds

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index afe26660d084..a85687fb8155 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -937,8 +937,9 @@ self: super: {
   # Test suite depends on cabal-install
   doctest = dontCheck super.doctest;
 
-  # https://github.com/haskell-servant/servant-auth/issues/113
-  servant-auth-client = dontCheck super.servant-auth-client;
+  # dontCheck: https://github.com/haskell-servant/servant-auth/issues/113
+  # doJailbreak: waiting on revision 1 to hit hackage
+  servant-auth-client = doJailbreak (dontCheck super.servant-auth-client);
 
   # Generate cli completions for dhall.
   dhall = generateOptparseApplicativeCompletion "dhall" super.dhall;
@@ -1479,6 +1480,9 @@ self: super: {
   # Tests disabled because of: https://github.com/kowainik/stan/issues/409
   stan = doJailbreak (dontCheck super.stan);
 
+  # Due to tests restricting base in 0.8.0.0 release
+  http-media = doJailbreak super.http-media;
+
   # 2020-11-19: Disabling tests with this issue: https://github.com/cchalmers/pcg-random/issues/10
   # Issue has been fixed in 0.1.3.7, we can enable tests again, once stackage bumps the version
   pcg-random = assert super.pcg-random.version == "0.1.3.6"; dontCheck super.pcg-random;

From 74f76447710d7ddd21cfdf303d3d9543c78e6428 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sat, 21 Nov 2020 16:01:50 +0100
Subject: [PATCH 3248/3942] Revert "Revert "Revert "cachix: drop the build from
 the release jobset"""

This reverts commit e6c0c51ce8cce525094687ab9d1dfb374055615a.
---
 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 20eaffaf84ac..cacc77fea30d 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -62,7 +62,7 @@ let
               # jobs.stack.x86_64-darwin
               jobs.stdenv.x86_64-darwin
               jobs.vim.x86_64-darwin
-              # jobs.cachix.x86_64-darwin
+              jobs.cachix.x86_64-darwin
 
               # UI apps
               # jobs.firefox-unwrapped.x86_64-darwin
@@ -105,7 +105,7 @@ let
               jobs.nix-info-tested.x86_64-linux
               # Ensure that X11/GTK are in order.
               jobs.thunderbird.x86_64-linux
-              # jobs.cachix.x86_64-linux
+              jobs.cachix.x86_64-linux
 
               /*
               jobs.tests.cc-wrapper.x86_64-linux

From 264250f6e1e284d473797ac61ff4d5f09d379ed7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 17:26:57 +0000
Subject: [PATCH 3249/3942] cargo-udeps: 0.1.15 -> 0.1.16

---
 pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index cc3aa00b27d0..840f2ae27c3c 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-udeps";
-  version = "0.1.15";
+  version = "0.1.16";
 
   src = fetchFromGitHub {
     owner = "est31";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0qnmz7sxbwnjdsl17h876szxd04z0q9arbl1ib45b6346x7mq8n4";
+    sha256 = "1h89xq91gbnbagfmvig5lkxyl08qwgdaf9vr55p599pmv190xq8s";
   };
 
-  cargoSha256 = "1jnbf0a3bggjf0wapr9xdj9hwfpgki2csg7rhg5maqavm8m0mirm";
+  cargoSha256 = "17931z5nbigfzvvhr6k64s2j9p1sp9nvmy5fyf92j3ci02dplm5c";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 2c0a127cd691c661ff44e1b08f07225dbd272ca5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 17:43:49 +0000
Subject: [PATCH 3250/3942] cc65: 2.18 -> 2.19

---
 pkgs/development/compilers/cc65/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/development/compilers/cc65/default.nix
index 944e0f729002..1b5011365cf2 100644
--- a/pkgs/development/compilers/cc65/default.nix
+++ b/pkgs/development/compilers/cc65/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cc65";
-  version = "2.18";
+  version = "2.19";
 
   src = fetchFromGitHub {
     owner = "cc65";
     repo = pname;
     rev = "V${version}";
-    sha256 = "sha256-XRGhukYite1GtPkO9clmkwvvU62OnYphO8V1Rrr7yMg=";
+    sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4";
   };
 
   makeFlags = [ "PREFIX=${placeholder "out"}"];

From bd0ffc390c7b1a60eb4ed67c8a90e72d2b56656f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 17:52:32 +0000
Subject: [PATCH 3251/3942] chezmoi: 1.8.8 -> 1.8.9

---
 pkgs/tools/misc/chezmoi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index 95e1f0592eef..0722fca4370b 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "chezmoi";
-  version = "1.8.8";
+  version = "1.8.9";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     rev = "v${version}";
-    sha256 = "1ax0rq341k8mi7lghw1rkmlg802fd22zpql5v3g6lhgy6s1xq9wk";
+    sha256 = "07jsakihci98ww1hgppilq942raz05c5xi2pzq632vq5i11fi0nj";
   };
 
-  vendorSha256 = "08x81r9y2x1xcld1s6maspq94wr817w9aqjdv226058ran0492s8";
+  vendorSha256 = "0adva7crl6dachbf76920aniki3zcq9chdjjrzssasm89zqgwicf";
 
   doCheck = false;
 

From 86b1a89d8243aa7c4de71e029f3fab091e0ebe3f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 17:59:39 +0000
Subject: [PATCH 3252/3942] circleci-cli: 0.1.11458 -> 0.1.11508

---
 pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index 27fdb76cf82a..ac8a4c8bb7c9 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.11458";
+  version = "0.1.11508";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = pname;
     rev = "v${version}";
-    sha256 = "028qm25vhqp2a1jpvy4csgzqy5ijmsnzyh9696x660glrk5q2r1i";
+    sha256 = "1m0jy7h9mksgj85r4jcpb5nabcs9vrfbrky31acwbibzjxxw9afg";
   };
 
   vendorSha256 = "15l9f87vgspdsxhwqdm56z3dvrspc8k1bbyvhhhnvqf3fkiki2bw";

From 7275aa56ca44409da7d46707ee419eb6caef91e4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 18:16:18 +0000
Subject: [PATCH 3253/3942] clash: 1.2.0 -> 1.3.0

---
 pkgs/tools/networking/clash/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix
index 3a37f345c969..502a4b4bbd42 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/pkgs/tools/networking/clash/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "clash";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "Dreamacro";
     repo = pname;
     rev = "v${version}";
-    sha256 = "16dgpq67bcy9z5lqwykwh61kwxi164khxqc78i6a3dc9xyivwfya";
+    sha256 = "1y0im2xs6pibbfri2k7g9jqbzm90jd9a5lghrzasxmkzjfcimrnf";
   };
 
-  vendorSha256 = "0gmyq54h9zb4ry2p24nsp8ybqrmaq69zlyp220w16kamx790j07j";
+  vendorSha256 = "0lljm594xgcv7ylz7qn170r9526k9d1lh77m9f9zcnhdd2qw4rw1";
 
   doCheck = false;
 

From b3671eb6c5d495b84ab4f2c007193a41479d876e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 18:27:27 +0000
Subject: [PATCH 3254/3942] cloudflared: 2020.11.5 -> 2020.11.10

---
 pkgs/applications/networking/cloudflared/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 738917f37991..7bacb182a59b 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2020.11.5";
+  version = "2020.11.10";
 
   src = fetchFromGitHub {
     owner  = "cloudflare";
     repo   = "cloudflared";
     rev    = version;
-    sha256 = "09bjqcrz7s40m7afb80dpx7jncp5prn2p6bksspv5wqc84l2nn5d";
+    sha256 = "1jajjfbwbqvkr2cc9y4ryn8z1sh19hwydxidfdpgmq794ci8v4np";
   };
 
   vendorSha256 = null;

From e83b3f6866943cfd2c4e829c7c705babece47cfa Mon Sep 17 00:00:00 2001
From: Max Wittig <max.wittig@siemens.com>
Date: Sat, 21 Nov 2020 19:32:45 +0100
Subject: [PATCH 3255/3942] gitlab-runner: 13.5.0 -> 13.6.0 (#104498)

---
 .../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 3547da41f079..db2d228ce454 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 }:
 
 let
-  version = "13.5.0";
+  version = "13.6.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}/helper-images/prebuilt-x86_64.tar.xz";
-    sha256 = "1cahv98hhwcc0czg7c86sqk0r6kw3gxnx8j6mqp1zm19aa30sabk";
+    sha256 = "0q1f4dmdkqrdzs3mb5wk6k6x50li4c7js0blzfcz3f3n8gm925jw";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "1wk7xn8jap8699cpgqkpgxmd908qjxlsfjswknrha1n8y2c5bjgx";
+    sha256 = "1hxjqk4in1a2abcyxj7556fcscxq4cfy24cgcmh1qhvirnm5j6mc";
   };
 in
 buildGoPackage rec {
@@ -30,7 +30,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0qfzdbhj68lq5pa1hvb703yx9grh3hvnnw6jb4bj4fckncd3avgm";
+    sha256 = "0vwky4hdkh1qvd61zdf2avbbnn3ya6pdicqggh2fx7k04pnp05mh";
   };
 
   patches = [ ./fix-shell-path.patch ];

From 417f02b1b83eea17f7aec86a55597d1f3504f737 Mon Sep 17 00:00:00 2001
From: JesusMtnez <jesusmartinez93@gmail.com>
Date: Sat, 21 Nov 2020 19:51:16 +0100
Subject: [PATCH 3256/3942] vscode-extensions.scalameta.metals: 1.9.6 -> 1.9.7

---
 pkgs/misc/vscode-extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index d523e334018c..0228ee9a1e98 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -191,8 +191,8 @@ let
         mktplcRef = {
           name = "metals";
           publisher = "scalameta";
-          version = "1.9.6";
-          sha256 = "12sjzk64kz7z8zqh3zg1dyb3v4c5xxgi1ain1jvw8hwf0hicqlgi";
+          version = "1.9.7";
+          sha256 = "0v599yssvk358gxfxnyzzkyk0y5krsbp8n4rkp9wb2ncxqsqladr";
         };
         meta = {
           license = stdenv.lib.licenses.asl20;

From 8a58e4efe8867b7e77e1da7ba41fbd1a3afe2c9d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 18:53:08 +0000
Subject: [PATCH 3257/3942] croc: 8.6.5 -> 8.6.6

---
 pkgs/tools/networking/croc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index 6d6c08a1efe0..08eb3d69128b 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "croc";
-  version = "8.6.5";
+  version = "8.6.6";
 
   src = fetchFromGitHub {
     owner = "schollz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1lzprv4qbmv2jjjp02z87819k54wdlsf8i6zvl3vchkqvygdkk6v";
+    sha256 = "0bd7q3j2i0r3v4liv2xpqlvx4nrixpdhr1yy1c579bls7y4myv61";
   };
 
-  vendorSha256 = "02mai9bp9pizbq6b8dj05rngxp3lfm9gh37zs8jknx56gas90j9i";
+  vendorSha256 = "06hqb5r9p67zh0v5whdsb3rvax6461y2n6jkhjwmn6zzswpgkg7y";
 
   doCheck = false;
 

From 00593bdb64989e20d10f3ef62c0b02efe2644a72 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sat, 21 Nov 2020 16:04:08 +0100
Subject: [PATCH 3258/3942] cachix: Build from 8.10.2, fix build and activate
 on hydra

This removes the broken flag from everything depending on servant so it
can get a new chance to build following the servant fix.
---
 .../haskell-modules/configuration-common.nix  |  17 ++
 .../configuration-ghc-8.8.x.nix               |  14 -
 .../configuration-hackage2nix.yaml            | 134 ---------
 .../haskell-modules/hackage-packages.nix      | 268 ------------------
 pkgs/top-level/all-packages.nix               |   2 +-
 5 files changed, 18 insertions(+), 417 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a85687fb8155..aa1d0be1bb3b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1500,4 +1500,21 @@ self: super: {
   # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
   snap = doJailbreak super.snap;
 
+  # 2020-11-21: cachix + chachix-api needs a patch for ghc 8.10 compat. Can be removed once released
+  # https://github.com/cachix/cachix/pull/331
+  cachix-api = appendPatch super.cachix-api (pkgs.fetchpatch {
+    url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
+    sha256 = "0rglyd77g4j72l5g0sj9zpq2hy3v992bm6nhj58pmj4j2aj67y74";
+    stripLen = 2;
+    extraPrefix = "";
+    includes = [ "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" ];
+  });
+  cachix = appendPatch super.cachix (pkgs.fetchpatch {
+    url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
+    sha256 = "06jmpz8l5vh9cch5aqdbrln7bm3fghxsicwy1m93avli320kp8pp";
+    stripLen = 2;
+    extraPrefix = "";
+    excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ];
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 60a361250332..d1099c56b2c8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -86,20 +86,6 @@ self: super: {
   foundation = dontCheck super.foundation;
   vault = dontHaddock super.vault;
 
-  servant = unmarkBroken super.servant;
-  servant-auth = unmarkBroken super.servant-auth;
-  servant-conduit = unmarkBroken super.servant-conduit;
-  servant-auth-client = unmarkBroken super.servant-auth-client;
-  servant-client = unmarkBroken super.servant-client;
-  servant-client-core = unmarkBroken super.servant-client-core;
-  servant-auth-server = unmarkBroken super.servant-auth-server;
-  servant-auth-swagger = unmarkBroken super.servant-auth-swagger;
-  servant-swagger = unmarkBroken super.servant-swagger;
-  servant-blaze = unmarkBroken super.servant-blaze;
-  servant-swagger-ui-core = unmarkBroken super.servant-swagger-ui-core;
-  swagger2 = unmarkBroken super.swagger2;
-  cachix-api = unmarkBroken super.cachix-api;
-
   # https://github.com/snapframework/snap-core/issues/288
   snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail   = Fail.fail' ''"; });
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ca1e6b198b8b..ca49b17ee900 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3722,8 +3722,6 @@ broken-packages:
   - cache-polysemy
   - cached
   - caching
-  - cachix
-  - cachix-api
   - cacophony
   - cafeteria-prelude
   - caffegraph
@@ -6151,7 +6149,6 @@ broken-packages:
   - hedgehog-gen-json
   - hedgehog-generic
   - hedgehog-golden
-  - hedgehog-servant
   - Hedi
   - hedis-config
   - hedis-pile
@@ -6699,7 +6696,6 @@ broken-packages:
   - http-io-streams
   - http-kinder
   - http-listen
-  - http-media
   - http-monad
   - http-pony
   - http-pony-serve-wai
@@ -8009,7 +8005,6 @@ broken-packages:
   - mu-protobuf
   - mu-rpc
   - mu-schema
-  - mu-servant-server
   - mu-tracing
   - MuCheck
   - MuCheck-Hspec
@@ -8093,9 +8088,6 @@ broken-packages:
   - nagios-plugin-ekg
   - nakadi-client
   - named-lock
-  - named-servant
-  - named-servant-client
-  - named-servant-server
   - named-sop
   - namelist
   - namespace
@@ -9131,7 +9123,6 @@ broken-packages:
   - rclient
   - rdioh
   - react-flux
-  - react-flux-servant
   - react-haskell
   - react-tutorial-haskell-server
   - reaction-logic
@@ -9341,7 +9332,6 @@ broken-packages:
   - rfc-prelude
   - rfc-psql
   - rfc-redis
-  - rfc-servant
   - rg
   - rhythm-game-tutorial
   - rib
@@ -9379,7 +9369,6 @@ broken-packages:
   - rncryptor
   - rob
   - robin
-  - roboservant
   - robots-txt
   - roc-cluster
   - roc-cluster-demo
@@ -9607,124 +9596,6 @@ broken-packages:
   - serpentine
   - serv
   - serv-wai
-  - servant
-  - servant-aeson-specs
-  - servant-auth
-  - servant-auth-client
-  - servant-auth-cookie
-  - servant-auth-docs
-  - servant-auth-hmac
-  - servant-auth-server
-  - servant-auth-swagger
-  - servant-auth-token
-  - servant-auth-token-acid
-  - servant-auth-token-api
-  - servant-auth-token-leveldb
-  - servant-auth-token-persistent
-  - servant-auth-token-rocksdb
-  - servant-auth-wordpress
-  - servant-avro
-  - servant-blaze
-  - servant-cassava
-  - servant-checked-exceptions
-  - servant-checked-exceptions-core
-  - servant-cli
-  - servant-client
-  - servant-client-core
-  - servant-client-js
-  - servant-client-namedargs
-  - servant-conduit
-  - servant-csharp
-  - servant-db
-  - servant-db-postgresql
-  - servant-dhall
-  - servant-docs
-  - servant-docs-simple
-  - servant-ede
-  - servant-ekg
-  - servant-elm
-  - servant-errors
-  - servant-examples
-  - servant-exceptions
-  - servant-fiat-content
-  - servant-flatten
-  - servant-foreign
-  - servant-generate
-  - servant-generic
-  - servant-github
-  - servant-github-webhook
-  - servant-haxl-client
-  - servant-hmac-auth
-  - servant-http-streams
-  - servant-http2-client
-  - servant-iCalendar
-  - servant-jquery
-  - servant-js
-  - servant-jsonrpc
-  - servant-jsonrpc-client
-  - servant-jsonrpc-server
-  - servant-JuicyPixels
-  - servant-kotlin
-  - servant-lucid
-  - servant-machines
-  - servant-match
-  - servant-matrix-param
-  - servant-mock
-  - servant-multipart
-  - servant-named
-  - servant-namedargs
-  - servant-nix
-  - servant-openapi3
-  - servant-options
-  - servant-pagination
-  - servant-pandoc
-  - servant-pipes
-  - servant-pool
-  - servant-postgresql
-  - servant-proto-lens
-  - servant-purescript
-  - servant-pushbullet-client
-  - servant-py
-  - servant-quickcheck
-  - servant-rawm
-  - servant-rawm-client
-  - servant-rawm-docs
-  - servant-rawm-server
-  - servant-reason
-  - servant-reflex
-  - servant-router
-  - servant-ruby
-  - servant-scotty
-  - servant-seo
-  - servant-serf
-  - servant-server
-  - servant-server-namedargs
-  - servant-smsc-ru
-  - servant-snap
-  - servant-stache
-  - servant-static-th
-  - servant-streaming
-  - servant-streaming-client
-  - servant-streaming-docs
-  - servant-streaming-server
-  - servant-subscriber
-  - servant-swagger
-  - servant-swagger-tags
-  - servant-swagger-ui
-  - servant-swagger-ui-core
-  - servant-swagger-ui-jensoleg
-  - servant-swagger-ui-redoc
-  - servant-to-elm
-  - servant-tracing
-  - servant-waargonaut
-  - servant-wasm
-  - servant-websockets
-  - servant-xml
-  - servant-yaml
-  - servant-zeppelin
-  - servant-zeppelin-client
-  - servant-zeppelin-server
-  - servant-zeppelin-swagger
   - server-generic
   - serversession-backend-acid-state
   - serversession-backend-persistent
@@ -10291,7 +10162,6 @@ broken-packages:
   - svndump
   - swagger-petstore
   - swagger-test
-  - swagger2
   - swapper
   - swearjure
   - sweet-egison
@@ -10625,7 +10495,6 @@ broken-packages:
   - tomato-rubato-openal
   - toml
   - tonatona-google-server-api
-  - tonatona-servant
   - too-many-cells
   - toodles
   - top
@@ -10850,7 +10719,6 @@ broken-packages:
   - uniquely-represented-sets
   - units-attoparsec
   - unittyped
-  - unitym-servant
   - unitym-yesod
   - universal-binary
   - universe-th
@@ -10998,7 +10866,6 @@ broken-packages:
   - verilog
   - verismith
   - versioning
-  - versioning-servant
   - vflow-types
   - vfr-waypoints
   - vgrep
@@ -11335,7 +11202,6 @@ broken-packages:
   - yam-datasource
   - yam-logger
   - yam-redis
-  - yam-servant
   - yam-transaction
   - yam-transaction-odbc
   - yam-web
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 07f6321760f1..694ba6935b04 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -49158,8 +49158,6 @@ self: {
        ];
        description = "Command line client for Nix binary cache hosting https://cachix.org";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) boost; inherit (pkgs) nix;};
 
   "cachix-api" = callPackage
@@ -49192,8 +49190,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Servant HTTP API specification for https://cachix.org";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cacophony" = callPackage
@@ -122425,8 +122421,6 @@ self: {
        ];
        description = "Hedgehog property testing for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedis" = callPackage
@@ -137361,8 +137355,6 @@ self: {
        ];
        description = "Processing HTTP Content-Type and Accept headers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-mock" = callPackage
@@ -176283,8 +176275,6 @@ self: {
        ];
        description = "Servant servers for Mu definitions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mu-tracing" = callPackage
@@ -178746,8 +178736,6 @@ self: {
        sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53";
        libraryHaskellDepends = [ base named servant ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "named-servant-client" = callPackage
@@ -178763,8 +178751,6 @@ self: {
        ];
        description = "client support for named-servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "named-servant-server" = callPackage
@@ -178780,8 +178766,6 @@ self: {
        ];
        description = "server support for named-servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "named-sop" = callPackage
@@ -211492,8 +211476,6 @@ self: {
        libraryHaskellDepends = [ aeson base react-flux servant text ];
        description = "Allow react-flux stores to send requests to a servant server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "react-haskell" = callPackage
@@ -217605,8 +217587,6 @@ self: {
        ];
        description = "The Servant extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc1413-server" = callPackage
@@ -218659,8 +218639,6 @@ self: {
        ];
        description = "Automatic session-aware servant testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "robot" = callPackage
@@ -225447,8 +225425,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-JuicyPixels" = callPackage
@@ -225469,8 +225445,6 @@ self: {
        ];
        description = "Servant support for JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-aeson-specs" = callPackage
@@ -225496,8 +225470,6 @@ self: {
        ];
        description = "generic tests for aeson serialization in servant";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth" = callPackage
@@ -225513,8 +225485,6 @@ self: {
        ];
        description = "Authentication combinators for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-client" = callPackage
@@ -225539,8 +225509,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-client/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-cookie" = callPackage
@@ -225571,8 +225539,6 @@ self: {
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-docs" = callPackage
@@ -225597,8 +225563,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-docs/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-hmac" = callPackage
@@ -225634,8 +225598,6 @@ self: {
        ];
        description = "Authentication via HMAC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-server" = callPackage
@@ -225664,8 +225626,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-swagger" = callPackage
@@ -225686,8 +225646,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-swagger/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token" = callPackage
@@ -225707,8 +225665,6 @@ self: {
        ];
        description = "Servant based API and server for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-acid" = callPackage
@@ -225730,8 +225686,6 @@ self: {
        ];
        description = "Acid-state backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-api" = callPackage
@@ -225748,8 +225702,6 @@ self: {
        ];
        description = "Servant based API for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-leveldb" = callPackage
@@ -225771,8 +225723,6 @@ self: {
        ];
        description = "Leveldb backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-persistent" = callPackage
@@ -225792,8 +225742,6 @@ self: {
        ];
        description = "Persistent backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-rocksdb" = callPackage
@@ -225816,8 +225764,6 @@ self: {
        ];
        description = "RocksDB backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-wordpress" = callPackage
@@ -225833,8 +225779,6 @@ self: {
        ];
        description = "Authenticate Routes Using Wordpress Cookies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-avro" = callPackage
@@ -225852,8 +225796,6 @@ self: {
        ];
        description = "Avro content type for Servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-blaze" = callPackage
@@ -225868,8 +225810,6 @@ self: {
        testHaskellDepends = [ base blaze-html servant-server wai warp ];
        description = "Blaze-html support for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-cassava" = callPackage
@@ -225891,8 +225831,6 @@ self: {
        ];
        description = "Servant CSV content-type for cassava";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-checked-exceptions" = callPackage
@@ -225917,8 +225855,6 @@ self: {
        ];
        description = "Checked exceptions for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-checked-exceptions-core" = callPackage
@@ -225940,8 +225876,6 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "Checked exceptions for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-cli" = callPackage
@@ -225969,8 +225903,6 @@ self: {
        ];
        description = "Command line interface for Servant API clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-client" = callPackage
@@ -226003,8 +225935,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-client-core" = callPackage
@@ -226028,8 +225958,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Core functionality and class for client function generation for servant APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-client-js" = callPackage
@@ -226049,8 +225977,6 @@ self: {
        ];
        description = "A servant client for frontend JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-client-namedargs" = callPackage
@@ -226072,8 +225998,6 @@ self: {
        ];
        description = "Automatically derive API client functions with named and optional parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-conduit" = callPackage
@@ -226094,8 +226018,6 @@ self: {
        ];
        description = "Servant Stream support for conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-csharp" = callPackage
@@ -226115,8 +226037,6 @@ self: {
        ];
        description = "Generate servant client library for C#";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-db" = callPackage
@@ -226128,8 +226048,6 @@ self: {
        libraryHaskellDepends = [ base servant ];
        description = "Servant types for defining API with relational DBs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-db-postgresql" = callPackage
@@ -226155,8 +226073,6 @@ self: {
        ];
        description = "Derive a postgres client to database API specified by servant-db";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-dhall" = callPackage
@@ -226178,8 +226094,6 @@ self: {
        ];
        description = "Servant Dhall content-type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-docs" = callPackage
@@ -226208,8 +226122,6 @@ self: {
        ];
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-docs-simple" = callPackage
@@ -226232,8 +226144,6 @@ self: {
        ];
        description = "Generate endpoints overview for Servant API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-ede" = callPackage
@@ -226257,8 +226167,6 @@ self: {
        ];
        description = "Combinators for rendering EDE templates in servant web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-ekg" = callPackage
@@ -226285,8 +226193,6 @@ self: {
        ];
        description = "Helpers for using ekg with servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-elm" = callPackage
@@ -226309,8 +226215,6 @@ self: {
        ];
        description = "Automatically derive Elm functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-errors" = callPackage
@@ -226334,8 +226238,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Servant Errors wai-middlware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-examples" = callPackage
@@ -226358,8 +226260,6 @@ self: {
        ];
        description = "Example programs for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-exceptions" = callPackage
@@ -226380,8 +226280,6 @@ self: {
          aeson base exceptions http-types servant-server text warp
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-fiat-content" = callPackage
@@ -226395,8 +226293,6 @@ self: {
        ];
        description = "Fiat content types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-flatten" = callPackage
@@ -226408,8 +226304,6 @@ self: {
        libraryHaskellDepends = [ base servant ];
        description = "Utilities for flattening servant API types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-foreign" = callPackage
@@ -226427,8 +226321,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Helpers for generating clients for servant APIs in any programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-generate" = callPackage
@@ -226442,8 +226334,6 @@ self: {
        libraryHaskellDepends = [ base servant servant-server ];
        description = "Utilities for generating mock server implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-generic" = callPackage
@@ -226460,8 +226350,6 @@ self: {
        ];
        description = "Specify Servant APIs with records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-github" = callPackage
@@ -226485,8 +226373,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings to GitHub API using servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-github-webhook" = callPackage
@@ -226509,8 +226395,6 @@ self: {
        ];
        description = "Servant combinators to facilitate writing GitHub webhooks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-haxl-client" = callPackage
@@ -226538,8 +226422,6 @@ self: {
        ];
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-hmac-auth" = callPackage
@@ -226566,8 +226448,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Servant authentication with HMAC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-http-streams" = callPackage
@@ -226603,8 +226483,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-http2-client" = callPackage
@@ -226629,8 +226507,6 @@ self: {
        ];
        description = "Generate HTTP2 clients from Servant API descriptions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-iCalendar" = callPackage
@@ -226647,8 +226523,6 @@ self: {
        ];
        description = "Servant support for iCalendar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-jquery" = callPackage
@@ -226667,8 +226541,6 @@ self: {
        ];
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-js" = callPackage
@@ -226692,8 +226564,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Automatically derive javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-jsonrpc" = callPackage
@@ -226705,8 +226575,6 @@ self: {
        libraryHaskellDepends = [ aeson base servant ];
        description = "JSON-RPC messages and endpoints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-jsonrpc-client" = callPackage
@@ -226722,8 +226590,6 @@ self: {
        ];
        description = "Generate JSON-RPC servant clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-jsonrpc-server" = callPackage
@@ -226739,8 +226605,6 @@ self: {
        ];
        description = "JSON-RPC servant servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-kotlin" = callPackage
@@ -226766,8 +226630,6 @@ self: {
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-lucid" = callPackage
@@ -226782,8 +226644,6 @@ self: {
        testHaskellDepends = [ base lucid servant-server wai warp ];
        description = "Servant support for lucid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-machines" = callPackage
@@ -226802,8 +226662,6 @@ self: {
        ];
        description = "Servant Stream support for machines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-match" = callPackage
@@ -226820,8 +226678,6 @@ self: {
        testHaskellDepends = [ base hspec network-uri servant text ];
        description = "Standalone implementation of servant’s dispatching mechanism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-matrix-param" = callPackage
@@ -226842,8 +226698,6 @@ self: {
        ];
        description = "Matrix parameter combinator for servant";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-mock" = callPackage
@@ -226872,8 +226726,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-multipart" = callPackage
@@ -226906,8 +226758,6 @@ self: {
        ];
        description = "multipart/form-data (e.g file upload) support for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-named" = callPackage
@@ -226926,8 +226776,6 @@ self: {
        ];
        description = "Add named endpoints to servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-namedargs" = callPackage
@@ -226940,8 +226788,6 @@ self: {
        testHaskellDepends = [ base hspec named QuickCheck servant ];
        description = "Combinators for servant providing named parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-nix" = callPackage
@@ -226963,8 +226809,6 @@ self: {
        ];
        description = "Servant Nix content-type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-openapi3" = callPackage
@@ -226993,8 +226837,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-options" = callPackage
@@ -227010,8 +226852,6 @@ self: {
        ];
        description = "Provide responses to OPTIONS requests for Servant applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-pagination" = callPackage
@@ -227030,8 +226870,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck servant-server text ];
        description = "Type-safe pagination for Servant APIs";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-pandoc" = callPackage
@@ -227049,8 +226887,6 @@ self: {
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-pipes" = callPackage
@@ -227072,8 +226908,6 @@ self: {
        ];
        description = "Servant Stream support for pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-pool" = callPackage
@@ -227087,8 +226921,6 @@ self: {
        libraryHaskellDepends = [ base resource-pool servant time ];
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-postgresql" = callPackage
@@ -227105,8 +226937,6 @@ self: {
        ];
        description = "Useful functions and instances for using servant with a PostgreSQL context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-proto-lens" = callPackage
@@ -227129,8 +226959,6 @@ self: {
        ];
        description = "Servant Content-Type for proto-lens protobuf modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-purescript" = callPackage
@@ -227154,8 +226982,6 @@ self: {
        ];
        description = "Generate PureScript accessor functions for you servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-pushbullet-client" = callPackage
@@ -227175,8 +227001,6 @@ self: {
        ];
        description = "Bindings to the Pushbullet API using servant-client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-py" = callPackage
@@ -227198,8 +227022,6 @@ self: {
        ];
        description = "Automatically derive python functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-quickcheck" = callPackage
@@ -227228,8 +227050,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-rawm" = callPackage
@@ -227241,8 +227061,6 @@ self: {
        libraryHaskellDepends = [ base servant ];
        description = "Embed a raw 'Application' in a Servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-rawm-client" = callPackage
@@ -227254,8 +227072,6 @@ self: {
        libraryHaskellDepends = [ base servant-client-core servant-rawm ];
        description = "The client implementation of servant-rawm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-rawm-docs" = callPackage
@@ -227271,8 +227087,6 @@ self: {
        ];
        description = "Documentation generator for 'RawM' endpoints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-rawm-server" = callPackage
@@ -227289,8 +227103,6 @@ self: {
        ];
        description = "The server implementation of servant-rawm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-reason" = callPackage
@@ -227311,8 +227123,6 @@ self: {
        ];
        description = "Derive Reason types to interact with a Haskell backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-reflex" = callPackage
@@ -227335,8 +227145,6 @@ self: {
        ];
        description = "servant API generator for reflex apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-response" = callPackage
@@ -227369,8 +227177,6 @@ self: {
        ];
        description = "Servant router for non-server applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-ruby" = callPackage
@@ -227385,8 +227191,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Generate a Ruby client from a Servant API with Net::HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-scotty" = callPackage
@@ -227405,8 +227209,6 @@ self: {
        ];
        description = "Generate a web service for servant 'Resource's using scotty and JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-seo" = callPackage
@@ -227429,8 +227231,6 @@ self: {
        ];
        description = "Generate Robots.txt and Sitemap.xml specification for your servant API.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-serf" = callPackage
@@ -227450,8 +227250,6 @@ self: {
        doHaddock = false;
        description = "Generates a servant API module";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-server" = callPackage
@@ -227489,8 +227287,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-server-namedargs" = callPackage
@@ -227508,8 +227304,6 @@ self: {
        ];
        description = "Automatically derive API server functions with named and optional parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-smsc-ru" = callPackage
@@ -227532,8 +227326,6 @@ self: {
        ];
        description = "Servant client for smsc.ru service for sending SMS to cell phones";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-snap" = callPackage
@@ -227571,8 +227363,6 @@ self: {
        ];
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-stache" = callPackage
@@ -227595,8 +227385,6 @@ self: {
        ];
        description = "Content-Types for rendering Mustache in servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-static-th" = callPackage
@@ -227623,8 +227411,6 @@ self: {
        ];
        description = "Embed a directory of static files in your Servant server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-streaming" = callPackage
@@ -227639,8 +227425,6 @@ self: {
        testHaskellDepends = [ base hspec http-types QuickCheck servant ];
        description = "Servant combinators for the 'streaming' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-streaming-client" = callPackage
@@ -227666,8 +227450,6 @@ self: {
        ];
        description = "Client instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-streaming-docs" = callPackage
@@ -227685,8 +227467,6 @@ self: {
        ];
        description = "Client instances for the 'servant-docs' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-streaming-server" = callPackage
@@ -227713,8 +227493,6 @@ self: {
        ];
        description = "Server instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-subscriber" = callPackage
@@ -227741,8 +227519,6 @@ self: {
        executableHaskellDepends = [ base purescript-bridge ];
        description = "When REST is not enough ...";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-swagger" = callPackage
@@ -227771,8 +227547,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-swagger-tags" = callPackage
@@ -227789,8 +227563,6 @@ self: {
        ];
        description = "Swagger Tags for Servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-swagger-ui" = callPackage
@@ -227807,8 +227579,6 @@ self: {
        ];
        description = "Servant swagger ui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-swagger-ui-core" = callPackage
@@ -227829,8 +227599,6 @@ self: {
        ];
        description = "Servant swagger ui core components";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-swagger-ui-jensoleg" = callPackage
@@ -227849,8 +227617,6 @@ self: {
        ];
        description = "Servant swagger ui: Jens-Ole Graulund theme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-swagger-ui-redoc" = callPackage
@@ -227869,8 +227635,6 @@ self: {
        ];
        description = "Servant swagger ui: ReDoc theme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-to-elm" = callPackage
@@ -227893,8 +227657,6 @@ self: {
        ];
        description = "Automatically generate Elm clients for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-tracing" = callPackage
@@ -227925,8 +227687,6 @@ self: {
          transformers
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-waargonaut" = callPackage
@@ -227951,8 +227711,6 @@ self: {
        ];
        description = "Servant Integration for Waargonaut JSON Package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-wasm" = callPackage
@@ -227971,8 +227729,6 @@ self: {
        ];
        description = "Servant support for delivering WebAssembly";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-websockets" = callPackage
@@ -227995,8 +227751,6 @@ self: {
        ];
        description = "Small library providing WebSocket endpoints for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-xml" = callPackage
@@ -228012,8 +227766,6 @@ self: {
        ];
        description = "Servant support for the XML Content-Type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-yaml" = callPackage
@@ -228035,8 +227787,6 @@ self: {
        ];
        description = "Servant support for yaml";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-zeppelin" = callPackage
@@ -228048,8 +227798,6 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Types and definitions of servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-zeppelin-client" = callPackage
@@ -228073,8 +227821,6 @@ self: {
        ];
        description = "Client library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-zeppelin-server" = callPackage
@@ -228098,8 +227844,6 @@ self: {
        ];
        description = "Server library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-zeppelin-swagger" = callPackage
@@ -228121,8 +227865,6 @@ self: {
        ];
        description = "Swagger instances for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "server-generic" = callPackage
@@ -245167,8 +244909,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "swapper" = callPackage
@@ -256380,8 +256120,6 @@ self: {
        ];
        description = "tonatona plugin for servant";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "too-many-cells" = callPackage
@@ -263368,8 +263106,6 @@ self: {
        ];
        description = "Implementaation of unitym for Servant servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unitym-yesod" = callPackage
@@ -267676,8 +267412,6 @@ self: {
        ];
        description = "Servant combinators for the versioning library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "versions" = callPackage
@@ -277887,8 +277621,6 @@ self: {
          servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-transaction" = callPackage
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fa36d3fa40f..258f4642d2ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12301,7 +12301,7 @@ in
   c-blosc = callPackage ../development/libraries/c-blosc { };
 
   # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
-  cachix = haskell.lib.justStaticExecutables (haskell.lib.unmarkBroken haskell.packages.ghc883.cachix);
+  cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
 
   hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };
 

From 512130bffe3c402d7ed1c3cd0805b45924e15f70 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 19:16:37 +0000
Subject: [PATCH 3259/3942] dbmate: 1.10.0 -> 1.11.0

---
 pkgs/development/tools/database/dbmate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
index 4858b84abfa6..fe7721f5ed4c 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/pkgs/development/tools/database/dbmate/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dbmate";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "amacneil";
     repo = "dbmate";
     rev = "v${version}";
-    sha256 = "09zb7r8f6m1w9ax9ayaxjzwmqcgx5f6x4lclfi1wdn6f6qaans4w";
+    sha256 = "1q1hyrd1zlynyb0720fd1lwg22l3bwjbcak2aplh259p698gwyf5";
   };
 
-  vendorSha256 = "012kgdvw7hj3m40v3nnpg916n02nxv19zid07h8g4qwprzg49iq2";
+  vendorSha256 = "197zpjvvv9xpfbw443kbxvhjmjqmx1h2bj1xl2vwgf0w64mkk84z";
 
   doCheck = false;
 

From 2bfa21205afc1cf75271b4bcf32bb209b6e19bff Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 21 Nov 2020 15:54:30 +0100
Subject: [PATCH 3260/3942] packet-sd: init at 0.0.3

This is currently being used as part of the NixOS.org infrastructure [1]
and should probably be included here and not just "downstream" (in the
nixops configs).

[1] https://github.com/NixOS/nixos-org-configurations/blob/26105e7afac604d3e02f68e3985830dce21c405d/delft/prometheus/packet-sd.nix
---
 pkgs/development/tools/packet-sd/default.nix | 24 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/tools/packet-sd/default.nix

diff --git a/pkgs/development/tools/packet-sd/default.nix b/pkgs/development/tools/packet-sd/default.nix
new file mode 100644
index 000000000000..33d61eca718a
--- /dev/null
+++ b/pkgs/development/tools/packet-sd/default.nix
@@ -0,0 +1,24 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+buildGoModule rec {
+  pname = "prometheus-packet-sd";
+  version = "0.0.3";
+
+  src = fetchFromGitHub {
+    owner = "packethost";
+    repo = "prometheus-packet-sd";
+    rev = "v${version}";
+    sha256 = "sha256-2k8AsmyhQNNZCzpVt6JdgvI8IFb5pRi4ic6Yn2NqHMM=";
+  };
+
+  vendorSha256 = null;
+
+  subPackages = [ "." ];
+
+  meta = with lib; {
+    description = "Prometheus service discovery for Equinix Metal";
+    homepage = "https://github.com/packethost/prometheus-packet-sd";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.andir ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9dfa61291ae..e73e0dd05b5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22978,6 +22978,8 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
 
   packet = callPackage ../development/tools/packet { };
 
+  packet-sd = callPackage ../development/tools/packet-sd { };
+
   packet-cli = callPackage ../development/tools/packet-cli { };
 
   pb_cli = callPackage ../tools/misc/pb_cli {};

From de641a9dc4f8e49ea01bf702d5a267ae7a520d7d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 19:43:54 +0000
Subject: [PATCH 3261/3942] dua: 2.10.3 -> 2.10.5

---
 pkgs/tools/misc/dua/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix
index 0fdd73ff552c..a2f3938adec1 100644
--- a/pkgs/tools/misc/dua/default.nix
+++ b/pkgs/tools/misc/dua/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dua";
-  version = "2.10.3";
+  version = "2.10.5";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "dua-cli";
     rev = "v${version}";
-    sha256 = "0zzansnbry73h7b2i4rz4rxc86xiw037n7f3va5gkz0pfdfa9mzi";
+    sha256 = "0imf9ngmyhyj5jdr99g1xc3vqzr61fnz32bxhmy63n1szylig5zq";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     extraPostFetch = ''
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoSha256 = "0wky0b9sv4hsj56s001m5gh16r8ms421l7h7xjh117fs87aaj42w";
+  cargoSha256 = "1czc0jma5k6idv463kn5qrirq8apgfrcxwv2yjk0pxy6vkji6154";
 
   doCheck = false;
 

From 4904246f7dabd9d3847ba29aba5d28bc2e9e5b83 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 20:04:18 +0000
Subject: [PATCH 3262/3942] emplace: 0.3.8 -> 0.3.9

---
 pkgs/tools/package-management/emplace/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index a214c327fe6f..b00155028651 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "emplace";
-  version = "0.3.8";
+  version = "0.3.9";
 
   src = fetchFromGitHub {
     owner = "tversteeg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1g7xrsw0ji3nbrj1a2hywxwy7f33fgbvzp7k4l9ls2icg0xsw9a3";
+    sha256 = "173nj6fx2l15shy7s4dngnfqsa10m7qwhi2ia2rr421l7b24ixqq";
   };
 
-  cargoSha256 = "1phr0k05dxwdhj1i71v8lr91qanjvp2zgi9wjpppzixpnpcsrbrb";
+  cargoSha256 = "0bjw3fvc430b1jxla25clr75c94p2ms7d94j72d8mirxsiklgsp9";
 
   meta = with lib; {
     description = "Mirror installed software on multiple machines";

From 0e5158fa9da6ebc4ad4d2872eb43b78b3bbaba6e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 21 Nov 2020 21:29:11 +0100
Subject: [PATCH 3263/3942] pipewire: Fix screen sharing with Chromium
 (#104504)

See https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/270.
E.g. Fedora and Arch have already backported that patch.

This avoids errors like:
Chromium: [E][module-protocol-native.c:562 on_remote_data()] protocol-native 0x33df5483c780: got connection error
pipewire[1168]: [E][000002106.051912][module-protocol-native.c:305 connection_data()] protocol-native 0x1b96900: client 0x1d084f0 error -22 (Invalid argument)

I've successfully tested screen sharing with Chromium 87.0.4280.66.

cc https://github.com/NixOS/nixpkgs/issues/91218
---
 pkgs/development/libraries/pipewire/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 858f2f94db2a..c4b766b70930 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -65,6 +65,11 @@ stdenv.mkDerivation rec {
     ./alsa-profiles-use-libdir.patch
     # Move installed tests into their own output.
     ./installed-tests-path.patch
+    # Fix older clients (e.g. Chrome/Chromium):
+    (fetchpatch { # protocol-native: do version check on HELLO
+      url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b8c7b36d3b8be16593f554964cf2f852c21b5c2c.patch";
+      sha256 = "18461grisrgqbad6bfa1bm17mslddgfmjfprc9vjvab2mmpsjss9";
+    })
   ];
 
   nativeBuildInputs = [

From edc784b9d532c475a0613a84b35b54fa67382aec Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sat, 21 Nov 2020 21:44:05 +0100
Subject: [PATCH 3264/3942] salt: 3002.1 -> 3002.2

---
 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 b66911c9325b..ad0cae6ecde6 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -7,11 +7,11 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "salt";
-  version = "3002.1";
+  version = "3002.2";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "0pp7qcfwsvg4419hzfka1180pw3saa9mrhl0z9951zn9fw2nllsc";
+    sha256 = "vW0pYhzo4JlBJ3fNOWrzVHSqESuwmZtdqAQ4fYcpAHU=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 783b1c491a6ccc54d11359dad189909415a35a0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 20:50:42 +0000
Subject: [PATCH 3265/3942] flyctl: 0.0.149 -> 0.0.150

---
 pkgs/development/web/flyctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 0ba7784ab2ff..9ac8a2cc2a31 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.0.149";
+  version = "0.0.150";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    sha256 = "0wscyakl415504yzqb93mysi2n4gqrbfzg20mdj316r9krqcbzpg";
+    sha256 = "1wj3l32f9xpmqq91nzlxy8zgh1zkx4ckhc9r487agmv80bfjnzj2";
   };
 
   preBuild = ''

From 1a15a0b02d9018fa2dc1d81203ef7356bb17bc78 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 20:56:52 +0000
Subject: [PATCH 3266/3942] fmt: 7.0.3 -> 7.1.2

---
 pkgs/development/libraries/fmt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index 3b2a061153f2..40922bae47b2 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -42,7 +42,7 @@ let
 in
 {
   fmt_7 = generic {
-    version = "7.0.3";
-    sha256 = "17q2fdzakk5p0s3fx3724gs5k2b5ylp8f1d6j2m3wgvlfldx9k9a";
+    version = "7.1.2";
+    sha256 = "1ixwkqdbm01rcmqni15z4jj2rzhb3w7nlhkw2w4dzc4m101vr6yz";
   };
 }

From e92d758368c334630c5b0138376d328f1f2b2d82 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 22 Nov 2020 07:52:49 +1000
Subject: [PATCH 3267/3942] youtube-dl: 2020.11.19 -> 2020.11.21.1

https://github.com/ytdl-org/youtube-dl/releases/tag/2020.11.21
https://github.com/ytdl-org/youtube-dl/releases/tag/2020.11.21.1
---
 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 a2a316a575cf..c56862e5f09f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2020.11.19";
+  version = "2020.11.21.1";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "17my2k6ksj2gch2j85laa5y8c448j4n6zfg85ljfg3zxnag4vhgq";
+    sha256 = "0a9livib328z5j3kfndxys2193dvfs4hh38krx0idg0k26xp7cfl";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];

From 1276d49e9fbc27ea842f14c871d093e16c95d404 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 21:57:14 +0000
Subject: [PATCH 3268/3942] frp: 0.34.2 -> 0.34.3

---
 pkgs/tools/networking/frp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix
index fd454c3d7763..7ba943e338d1 100644
--- a/pkgs/tools/networking/frp/default.nix
+++ b/pkgs/tools/networking/frp/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "frp";
-  version = "0.34.2";
+  version = "0.34.3";
 
   src = fetchFromGitHub {
     owner = "fatedier";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0r7bp99kbp5nh5kqrxc4fb7pblpmcksbq67c6z922hvynpgnycj0";
+    sha256 = "1c5337yv7m4ad1mr73a38lbxg6b7sk8pxqkzws01jxrry2jahb35";
   };
 
-  vendorSha256 = "18d9478ndzywwmh0jsxcb4i2rqyn3vzrgwflqrsv7krijalknsc9";
+  vendorSha256 = "0srkvd1kvjabf3r391n6spv5n77r7dw4y982ynqsv5grp5f4zmm1";
 
   doCheck = false;
 

From 55da35fc61493c976f7a1807e3283cd0694ef9b8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 22:04:52 +0000
Subject: [PATCH 3269/3942] fselect: 0.7.1 -> 0.7.2

---
 pkgs/tools/misc/fselect/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix
index 4c30dc4b785c..587483f4ac41 100644
--- a/pkgs/tools/misc/fselect/default.nix
+++ b/pkgs/tools/misc/fselect/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fselect";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "jhspetersson";
     repo = "fselect";
     rev = version;
-    sha256 = "1q7y5agsi6wjb1dnyvdhm4qmdhpv30cx5a8m1blks8is9z2bblz0";
+    sha256 = "1cqa52n5y6g087w4yzc273jpxhzpinwkqd32azg03dkczbgx5b2v";
   };
 
-  cargoSha256 = "0r2zj0dvf6h4ph3b75z2rdlqwzkdjrjj2iad4dbf9nsr63giwd9n";
+  cargoSha256 = "00yhp2b74plrbi944apbxpkw2y6nbgf81sinfchw44ww1i58mfhj";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 080ad2b0c87fcdba9a9eb2bbbba8b2441391cb66 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 22:10:54 +0000
Subject: [PATCH 3270/3942] ft2-clone: 1.40 -> 1.41_fix

---
 pkgs/applications/audio/ft2-clone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index 05f24d84e353..24bc34089823 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ft2-clone";
-  version = "1.40";
+  version = "1.41_fix";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
     rev = "v${version}";
-    sha256 = "0qc3hai6fhn4amk5ixmxx3yswsi25qpax0r9nvvnyhbcb6crqcs1";
+    sha256 = "0c7jli79ckachl5n2rbhc4yzml8nc36pl9yzxcwgaz544q8pzmaa";
   };
 
   nativeBuildInputs = [ cmake ];

From e489a8bcfe974bf7ac19b33c953f9e644eba76fc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 22:43:54 +0000
Subject: [PATCH 3271/3942] goconst: 1.3.2 -> 1.4.0

---
 pkgs/development/tools/goconst/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix
index 50574923e49a..987a3285f8be 100644
--- a/pkgs/development/tools/goconst/default.nix
+++ b/pkgs/development/tools/goconst/default.nix
@@ -5,7 +5,7 @@
 
 buildGoPackage rec {
   pname = "goconst";
-  version = "1.3.2";
+  version = "1.4.0";
 
   goPackagePath = "github.com/jgautheron/goconst";
 
@@ -15,7 +15,7 @@ buildGoPackage rec {
     owner = "jgautheron";
     repo = "goconst";
     rev = version;
-    sha256 = "0bfiblp1498ic5jbdsm6mnc8s9drhasbqsw0asi6kmcz2kmslp9s";
+    sha256 = "0jp9vg5l4wcvnf653h3d8ay2n7y717l9z34rls1vrsaf0qdf1r6v";
   };
 
   meta = with lib; {

From 7a9f6e18d542831ce4934389f10bb4290745ec28 Mon Sep 17 00:00:00 2001
From: Matej Urbas <matej.urbas@gmail.com>
Date: Sat, 21 Nov 2020 22:46:25 +0000
Subject: [PATCH 3272/3942] maintainers: add urbas

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e273e90c2956..313c4a33e1f2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9041,6 +9041,12 @@
     githubId = 619015;
     name = "Svintsov Dmitry";
   };
+  urbas = {
+    email = "matej.urbas@gmail.com";
+    github = "urbas";
+    githubId = 771193;
+    name = "Matej Urbas";
+  };
   uri-canva = {
     email = "uri@canva.com";
     github = "uri-canva";

From fe4a7e365e4c220c74354989d7c70884c53f99ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 23:02:44 +0000
Subject: [PATCH 3273/3942] gping: 0.1.6 -> 0.1.7

---
 pkgs/tools/networking/gping/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix
index 76fdecf5e14c..56fe9b14687d 100644
--- a/pkgs/tools/networking/gping/default.nix
+++ b/pkgs/tools/networking/gping/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gping";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "orf";
     repo = "gping";
     rev = "v${version}";
-    sha256 = "1scwwrrj30ff9yr776gpn4jyl3lbrx2s2dv0pc8b1zj7mvwp3as2";
+    sha256 = "0sdv6mf7mrgsdinv94mhai5jaw04s6r9cq0wxkph9b4hhywi0lys";
   };
 
-  cargoSha256 = "1dsfrl5cajl9nmzl6p43j7j50xn1z7dymqaz8kqs7zalj9zadm8k";
+  cargoSha256 = "0rrqjlyn7k8f7ndzra16a9k4l6mjfim84lfi886q3irbn234b1va";
 
   meta = with lib; {
     description = "Ping, but with a graph";

From 4e332057618f75e3e29ca1a8d495f4fe7e97c241 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 23:08:48 +0000
Subject: [PATCH 3274/3942] gpx: 2.5.2 -> 2.6.7

---
 pkgs/applications/misc/gpx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix
index dcf022fc4453..70ff26784a86 100644
--- a/pkgs/applications/misc/gpx/default.nix
+++ b/pkgs/applications/misc/gpx/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gpx";
-  version = "2.5.2";
+  version = "2.6.7";
 
   nativeBuildInputs = [ autoreconfHook ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "markwal";
     repo = "GPX";
     rev = version;
-    sha256 = "1yab269x8qyf7rd04vaxyqyjv4pzz9lp4sc4dwh927k23avr3rw5";
+    sha256 = "1dl5vlsx05ipy10h18xigicb3k7m33sa9hfyd46hkpr2glx7jh4p";
   };
 
   meta = {

From 73786c3f6c79547551344a562b3d243670f15617 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 23:39:06 +0000
Subject: [PATCH 3275/3942] helmfile: 0.134.1 -> 0.135.0

---
 pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index fe68d90dd920..2516370430e3 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "helmfile";
-  version = "0.134.1";
+  version = "0.135.0";
 
   src = fetchFromGitHub {
     owner = "roboll";
     repo = "helmfile";
     rev = "v${version}";
-    sha256 = "14qlz6b4iddc5qxm4w4pvhkbzv60qzymn3bkyrpbx189b2yfvh6c";
+    sha256 = "1ky9mh5n6n84g77ax1dn1cisgxjwyrhnapaikyj4q53zcbyai3ng";
   };
 
-  vendorSha256 = "0nk2f38qjmhy45pw9yz53acmsdy2fdxswqnasvbmfzrb85b0fnfq";
+  vendorSha256 = "0dycngvk4nymcrkn6pn2q2h2zfvhc69m1zs2pspl58sa0mkakk2p";
 
   doCheck = false;
 

From 233e7d1a0f57a4f9bcbca0dc710b8357035a742e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 23:55:27 +0000
Subject: [PATCH 3276/3942] hstr: 2.2 -> 2.3

---
 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 81f931b11f8e..421d02e97b91 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hstr";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner  = "dvorka";
     repo   = "hstr";
     rev    = version;
-    sha256 = "07fkilqlkpygvf9kvxyvl58g3lfq0bwwdp3wczy4hk8qlbhmgihn";
+    sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 9d98d8ae2e8d7d614d25416cad96249357a39949 Mon Sep 17 00:00:00 2001
From: Maxwell L-T <maxwell.lt@live.com>
Date: Sat, 21 Nov 2020 19:20:47 -0500
Subject: [PATCH 3277/3942] mullvad-vpn: 2020.6 -> 2020.7

---
 pkgs/applications/networking/mullvad-vpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index da49ece4c68f..e6f5d6ac4ea2 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -41,11 +41,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "mullvad-vpn";
-  version = "2020.6";
+  version = "2020.7";
 
   src = fetchurl {
     url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
-    sha256 = "0d9rv874avx86jppl1dky0nfq1633as0z8yz3h3f69nhmcbwhlr3";
+    sha256 = "07vryz1nq8r4m5y9ry0d0v62ykz1cnnsv628x34yvwiyazbav4ri";
   };
 
   nativeBuildInputs = [

From 1f0f60b6d2cd16138f32bbaf7130b2099f028805 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 00:25:59 +0000
Subject: [PATCH 3278/3942] indilib: 1.8.6 -> 1.8.7

---
 pkgs/development/libraries/indilib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix
index 212b2f743d37..1635827340e2 100644
--- a/pkgs/development/libraries/indilib/default.nix
+++ b/pkgs/development/libraries/indilib/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "indilib";
-  version = "1.8.6";
+  version = "1.8.7";
 
   src = fetchFromGitHub {
     owner = "indilib";
     repo = "indi";
     rev = "v${version}";
-    sha256 = "1yzvcm7lwhwssnvv6gp8f7igmnvs35bpidmzz6z15awm5841yw30";
+    sha256 = "0cy9l1vpsnfilxslvmn88hhq8iw8cnx3xpbnl78c0dgjyfv5xmhz";
   };
 
   patches = [

From f8c3027812718db56b0cbdad137881f44bc1264a Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack@jackkelly.name>
Date: Sat, 21 Nov 2020 10:53:32 +1000
Subject: [PATCH 3279/3942] openstack-metadata-fetcher: stop lying in log
 message

---
 nixos/modules/virtualisation/openstack-metadata-fetcher.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix
index b531787c31a2..b8f78efb98ab 100644
--- a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix
+++ b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix
@@ -3,7 +3,7 @@
   metaDir=${targetRoot}etc/ec2-metadata
   mkdir -m 0755 -p "$metaDir"
 
-  echo "getting EC2 instance metadata..."
+  echo "getting instance metadata..."
 
   if ! [ -e "$metaDir/ami-manifest-path" ]; then
     wget ${wgetExtraOptions} -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path

From 8c39655de3f0ae5adbbfb3b9c5be412c4c3801d6 Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack@jackkelly.name>
Date: Sat, 21 Nov 2020 11:40:38 +1000
Subject: [PATCH 3280/3942] {ec2,openstack}-metadata-fetcher: introduce
 wget_imds function

---
 .../modules/virtualisation/ec2-metadata-fetcher.nix  | 12 ++++++++----
 .../virtualisation/openstack-metadata-fetcher.nix    | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
index 812e93ec4aab..0b110d375a41 100644
--- a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
+++ b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
@@ -61,19 +61,23 @@
 
   echo "getting EC2 instance metadata..."
 
+  wget_imds() {
+    wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" "$@";
+  }
+
   if ! [ -e "$metaDir/ami-manifest-path" ]; then
-    wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
+    wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
   fi
 
   if ! [ -e "$metaDir/user-data" ]; then
-    wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data"
+    wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data"
   fi
 
   if ! [ -e "$metaDir/hostname" ]; then
-    wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
+    wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
   fi
 
   if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then
-    wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+    wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
   fi
 ''
diff --git a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix
index b8f78efb98ab..2aff8ccd2c26 100644
--- a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix
+++ b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix
@@ -5,19 +5,23 @@
 
   echo "getting instance metadata..."
 
+  wget_imds() {
+    wget ${wgetExtraOptions} "$@"
+  }
+
   if ! [ -e "$metaDir/ami-manifest-path" ]; then
-    wget ${wgetExtraOptions} -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
+    wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
   fi
 
   if ! [ -e "$metaDir/user-data" ]; then
-    wget ${wgetExtraOptions} -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data"
+    wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data"
   fi
 
   if ! [ -e "$metaDir/hostname" ]; then
-    wget ${wgetExtraOptions} -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
+    wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
   fi
 
   if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then
-    wget ${wgetExtraOptions} -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+    wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
   fi
 ''

From 43bfd7e5b1a70fe4be9b9c077eccb15fd50f6edc Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack@jackkelly.name>
Date: Sat, 21 Nov 2020 11:44:25 +1000
Subject: [PATCH 3281/3942] {ec2,openstack}-metadata-fetcher: unconditionally
 fetch metadata

The metadata fetcher scripts run each time an instance starts, and it
is not safe to assume that responses from the instance metadata
service (IMDS) will be as they were on first boot.

Example: an EC2 instance can have its user data changed while
the instance is stopped. When the instance is restarted, we want to
see the new user data applied.
---
 .../virtualisation/ec2-metadata-fetcher.nix   | 24 +++++++------------
 .../openstack-metadata-fetcher.nix            | 24 +++++++------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
index 0b110d375a41..dca5c2abd4e0 100644
--- a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
+++ b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix
@@ -8,9 +8,14 @@
 # Make sure that every package you depend on here is already listed as
 # a channel blocker for both the full-sized and small channels.
 # Otherwise, we risk breaking user deploys in released channels.
+#
+# Also note: OpenStack's metadata service for its instances aims to be
+# compatible with the EC2 IMDS. Where possible, try to keep the set of
+# fetched metadata in sync with ./openstack-metadata-fetcher.nix .
 ''
   metaDir=${targetRoot}etc/ec2-metadata
   mkdir -m 0755 -p "$metaDir"
+  rm -f "$metaDir/*"
 
   get_imds_token() {
     # retry-delay of 1 selected to give the system a second to get going,
@@ -65,19 +70,8 @@
     wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" "$@";
   }
 
-  if ! [ -e "$metaDir/ami-manifest-path" ]; then
-    wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
-  fi
-
-  if ! [ -e "$metaDir/user-data" ]; then
-    wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data"
-  fi
-
-  if ! [ -e "$metaDir/hostname" ]; then
-    wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
-  fi
-
-  if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then
-    wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
-  fi
+  wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
+  wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data"
+  wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
+  wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
 ''
diff --git a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix
index 2aff8ccd2c26..8c191397cf9a 100644
--- a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix
+++ b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix
@@ -1,7 +1,12 @@
 { targetRoot, wgetExtraOptions }:
+
+# OpenStack's metadata service aims to be EC2-compatible. Where
+# possible, try to keep the set of fetched metadata in sync with
+# ./ec2-metadata-fetcher.nix .
 ''
   metaDir=${targetRoot}etc/ec2-metadata
   mkdir -m 0755 -p "$metaDir"
+  rm -f "$metaDir/*"
 
   echo "getting instance metadata..."
 
@@ -9,19 +14,8 @@
     wget ${wgetExtraOptions} "$@"
   }
 
-  if ! [ -e "$metaDir/ami-manifest-path" ]; then
-    wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
-  fi
-
-  if ! [ -e "$metaDir/user-data" ]; then
-    wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data"
-  fi
-
-  if ! [ -e "$metaDir/hostname" ]; then
-    wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
-  fi
-
-  if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then
-    wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
-  fi
+  wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
+  wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data"
+  wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
+  wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
 ''

From 2ab76856e4934fc75aa13139d64e9986f8f34d5f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 01:23:01 +0000
Subject: [PATCH 3282/3942] istioctl: 1.7.4 -> 1.7.5

---
 pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix
index 053035e629ea..19fc90ca9e46 100644
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "istioctl";
-  version = "1.7.4";
+  version = "1.7.5";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    sha256 = "1vy6y6gk7ljnrb7cxxaa60i4ycylsrd2yszbly1aaz5vnh1vsfz9";
+    sha256 = "10h2ak3s74xb1rjvc6bc5yiyq2k8qbv07wxnshiqp5cnd6pjni0w";
   };
-  vendorSha256 = "0f2n8mwnj9i4qifs0f63jrgr61mjs3c1arxnny723i5pialj3zdl";
+  vendorSha256 = "1xj77w2h7qg808v6ll8hm5nvnb2lwky789aikgxli2k6m0cy0c5k";
 
   doCheck = false;
 

From 5ee945ba3df146a4459594aff20c2bd2d2d3b908 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 17:35:04 -0800
Subject: [PATCH 3283/3942] argocd: 1.7.8 -> 1.7.10 (#104505)

---
 pkgs/applications/networking/cluster/argocd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index 2f884970fc1a..981e555462a3 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "1.7.8";
+  version = "1.7.10";
   commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    sha256 = "1pwk6mzmlsx43c75wl5lglpxgc2jkgzra4443hwp6n0wfgzajfp4";
+    sha256 = "1vkdny88lmxkm3iw8qv5rrl0g5xwi16hfm2f6dga8i8xl555m78c";
   };
 
   vendorSha256 = "0c5gykijwjrq3cx9qg9hm5j7axccngc1kp5qj3429a2ilw80l8pl";

From 634225b7befa19e7fbaee52fe7a4474921f345d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 17:39:08 -0800
Subject: [PATCH 3284/3942] bazel-kazel: 0.1.2 -> 0.1.3 (#103850)

---
 pkgs/development/tools/bazel-kazel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix
index 516ad2a64a09..c8127256a612 100644
--- a/pkgs/development/tools/bazel-kazel/default.nix
+++ b/pkgs/development/tools/bazel-kazel/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "bazel-kazel";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "repo-infra";
     rev = "v${version}";
-    sha256 = "1fn6ppyjgg3v80n9rc9712xms5yq3xkkd95zyd64l5gh9mshjn86";
+    sha256 = "1mmla4j30ka368gsf4v8h23f32rsc4fpyrqswafw98x07xngmmqr";
   };
 
   vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf";

From 6fd871dec4dba27611e6eade68f1d160af837dda Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack@jackkelly.name>
Date: Sat, 21 Nov 2020 11:59:30 +1000
Subject: [PATCH 3285/3942] rl-21.03: describe EC2 instance user/meta data
 reloading

---
 nixos/doc/manual/release-notes/rl-2103.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 55c1229a164d..5bdc44365ed5 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -211,6 +211,22 @@
       and <literal>slaptest</literal> is buggy with schemas directly in the config file.
     </para>
    </listitem>
+   <listitem>
+     <para>
+       Amazon EC2 and OpenStack Compute (nova) images now re-fetch instance meta data and user data from the instance
+       metadata service (IMDS) on each boot. For example: stopping an EC2 instance, changing its user data, and
+       restarting the instance will now cause it to fetch and apply the new user data.
+     </para>
+     <warning>
+       <para>
+         Specifically, <literal>/etc/ec2-metadata</literal> is re-populated on each boot. Some NixOS scripts that read
+         from this directory are guarded to only run if the files they want to manipulate do not already exist, and so
+         will not re-apply their changes if the IMDS response changes. Examples: <literal>root</literal>'s SSH key is
+         only added if <literal>/root/.ssh/authorized_keys</literal> does not exist, and SSH host keys are only set from
+         user data if they do not exist in <literal>/etc/ssh</literal>.
+       </para>
+     </warning>
+   </listitem>
   </itemizedlist>
  </section>
 

From 23195511fdb2e501983cc6084aad411bf13d7f8b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 02:55:32 +0000
Subject: [PATCH 3286/3942] mackerel-agent: 0.69.3 -> 0.70.2

---
 pkgs/servers/monitoring/mackerel-agent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix
index c5548fafd348..143db9e01b6c 100644
--- a/pkgs/servers/monitoring/mackerel-agent/default.nix
+++ b/pkgs/servers/monitoring/mackerel-agent/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "mackerel-agent";
-  version = "0.69.3";
+  version = "0.70.2";
 
   src = fetchFromGitHub {
     owner = "mackerelio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0jkvqqzk6wyjsdsmn2l2cdw8pjqzswlqb9p492czhgrfy065lrqp";
+    sha256 = "1c0smbyzwc101v7akaj21r7w0jpf1xcbikf1ljfa8f515ql5hs9r";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 82ca111efba63590c65e23019db1c1a6bb7f4bbd Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@gmail.com>
Date: Fri, 20 Nov 2020 15:58:33 -0500
Subject: [PATCH 3287/3942] ccache: 3.7.12 -> 4.0

Additional changes:
- Added myself as a maintainer
- Generalized ccacheStdenv to allow overriding stdenv
---
 .../development/tools/misc/ccache/default.nix | 60 ++++++++++++++++---
 .../misc/ccache/force-objdump-on-darwin.patch | 31 ++++++++++
 pkgs/top-level/all-packages.nix               | 27 +++++++--
 3 files changed, 103 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index d87de2e648ab..3d1c21c25baf 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,23 +1,64 @@
-{ stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoreconfHook, zlib, makeWrapper }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, substituteAll
+, binutils
+, asciidoc
+, cmake
+, perl
+, zstd
+, xcodebuild
+, makeWrapper
+}:
 
 let ccache = stdenv.mkDerivation rec {
   pname = "ccache";
-  version = "3.7.12";
+  version = "4.0";
 
   src = fetchFromGitHub {
-    owner = "ccache";
-    repo = "ccache";
+    owner = pname;
+    repo = pname;
     rev = "v${version}";
-    sha256 = "1xnv4g4n1jk1i98sa53k8w6q7hbwbw62svs30lssppysbrv8x3gz";
+    sha256 = "1frcplrv61m2iwc6jwycpbcz1101xl6s4sh8p87prdj98l60lyrx";
   };
 
-  nativeBuildInputs = [ asciidoc-full autoreconfHook gperf perl ];
+  # TODO: Remove patches from upstream in next release
+  patches = [
+    # Fix badly named man page filename
+    (fetchpatch {
+      url = "https://github.com/ccache/ccache/commit/223e706fb24ce86eb0ad86079a97e6f345b9ef40.patch";
+      sha256 = "1h7amp3ka45a79zwlxh8qnzx6n371gnfpfgijcqljps7skhl5gjg";
+    })
+    # Build and install man page by default
+    (fetchpatch {
+      url = "https://github.com/ccache/ccache/commit/294ff2face26448afa68e3ef7b68bf4898d6dc77.patch";
+      sha256 = "0rx69qn41bgksc4m3p59nk5d6rz72rwnfska9mh5j62pzfm8axja";
+    })
+    # Fixes use of undeclared identifier 'CLONE_NOOWNERCOPY' on darwin
+    (fetchpatch {
+      url = "https://github.com/ccache/ccache/commit/411c010c3a5ee690cd42b23ffcf026ae009e2897.patch";
+      sha256 = "062s424d0d0psp6wjhmfnfn1s5dsrz403hdid5drm6l2san0jhq0";
+    })
+  ] ++ lib.optional stdenv.isDarwin (substituteAll {
+    src = ./force-objdump-on-darwin.patch;
+    objdump = "${binutils.bintools}/bin/objdump";
+  });
 
-  buildInputs = [ zlib ];
+  nativeBuildInputs = [ asciidoc cmake perl ];
+
+  buildInputs = [ zstd ];
 
   outputs = [ "out" "man" ];
 
-  doCheck = !stdenv.isDarwin;
+  doCheck = true;
+  checkInputs = lib.optional stdenv.isDarwin xcodebuild;
+  checkPhase = ''
+    export HOME=$(mktemp -d)
+    ctest --output-on-failure ${lib.optionalString stdenv.isDarwin ''
+      -E '^(test.nocpp2|test.modules)$'
+    ''}
+  '';
 
   passthru = {
     # A derivation that provides gcc and g++ commands, but that
@@ -63,9 +104,10 @@ let ccache = stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Compiler cache for fast recompilation of C/C++ code";
-    homepage = "https://ccache.dev/";
+    homepage = "https://ccache.dev";
     downloadPage = "https://ccache.dev/download.html";
     license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ metadark r-burns ];
     platforms = platforms.unix;
   };
 };
diff --git a/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch b/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch
new file mode 100644
index 000000000000..81a4f27ab736
--- /dev/null
+++ b/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch
@@ -0,0 +1,31 @@
+diff --git a/test/run b/test/run
+index 9623e49d..3df1c5a8 100755
+--- a/test/run
++++ b/test/run
+@@ -126,23 +126,17 @@ file_size() {
+ objdump_cmd() {
+     local file="$1"
+ 
+-    if $HOST_OS_APPLE; then
+-        xcrun dwarfdump -r 0 "$file"
+-    elif $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then
++    if $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then
+         # For some reason objdump only shows the basename of the file, so fall
+         # back to brute force and ignorance.
+         strings "$1"
+     else
+-        objdump -W "$file"
++        @objdump@ -W "$file"
+     fi
+ }
+ 
+ objdump_grep_cmd() {
+-    if $HOST_OS_APPLE; then
+-        fgrep -q "\"$1\""
+-    else
+-        fgrep -q ": $1"
+-    fi
++    fgrep -q ": $1"
+ }
+ 
+ expect_stat() {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45bff7bd1890..ad9d4c43f9c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10972,7 +10972,9 @@ in
 
   cc-tool = callPackage ../development/tools/misc/cc-tool { };
 
-  ccache = callPackage ../development/tools/misc/ccache { };
+  ccache = callPackage ../development/tools/misc/ccache {
+    asciidoc = asciidoc-full;
+  };
 
   # Wrapper that works as gcc or g++
   # It can be used by setting in nixpkgs config like this, for example:
@@ -10994,12 +10996,25 @@ in
   #     };
   # You can use a different directory, but whichever directory you choose
   # should be owned by user root, group nixbld with permissions 0770.
-  ccacheWrapper = makeOverridable ({ extraConfig ? "", cc ? stdenv.cc }:
-    cc.override { cc = ccache.links {
+  ccacheWrapper = makeOverridable ({ extraConfig, cc }:
+    cc.override {
+      cc = ccache.links {
+        inherit extraConfig;
+        unwrappedCC = cc.cc;
+      };
+    }) {
+      extraConfig = "";
+      inherit (stdenv) cc;
+    };
+
+  ccacheStdenv = lowPrio (makeOverridable ({ extraConfig, stdenv }:
+    overrideCC stdenv (buildPackages.ccacheWrapper.override {
       inherit extraConfig;
-      unwrappedCC = cc.cc;
-    }; }) {};
-  ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper);
+      inherit (stdenv) cc;
+    })) {
+      extraConfig = "";
+      inherit stdenv;
+    });
 
   cccc = callPackage ../development/tools/analysis/cccc { };
 

From 11e1f2ee791f3bdb2f02ad5251328ac9b33d3450 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@gmail.com>
Date: Fri, 20 Nov 2020 16:51:36 -0500
Subject: [PATCH 3288/3942] baresip: removed ccache

ccache build is disabled with CCACHE_DISABLE=1, so it's unnecessary
---
 .../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 37d8adceae1c..c3479d1ee698 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1
 , cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg_3
-, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
+, gsm, speex, portaudio, spandsp, libuuid, libvpx
 }:
 stdenv.mkDerivation rec {
   version = "0.6.5";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [zlib openssl libre librem cairo mpg123
     alsaLib SDL libv4l celt libsndfile srtp ffmpeg_3 gsm speex portaudio spandsp libuuid
-    ccache libvpx
+    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"

From 6495c439f693d8e29841ae33ba467542425d7af6 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@gmail.com>
Date: Fri, 20 Nov 2020 16:57:19 -0500
Subject: [PATCH 3289/3942] webbrowser: removed ccache

ccache just adds unnecessary overhead when building in a sandboxed environment
---
 .../networking/browsers/webbrowser/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix
index d10758170784..5190f1a7b534 100644
--- a/pkgs/applications/networking/browsers/webbrowser/default.nix
+++ b/pkgs/applications/networking/browsers/webbrowser/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchgit, makeDesktopItem, pkgconfig, makeWrapper
 # Build
-, python2, autoconf213, yasm, perl, ccache
+, python2, autoconf213, yasm, perl
 , unzip, gnome2, gnum4
 
 # Runtime
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gnum4 makeWrapper perl pkgconfig python2 ccache
+    gnum4 makeWrapper perl pkgconfig python2
   ];
 
   buildInputs = [
@@ -54,7 +54,6 @@ in stdenv.mkDerivation rec {
   configurePhase = ''
     export MOZCONFIG=$PWD/.mozconfig
     export MOZ_NOSPAM=1
-    export HOME=$PWD # Needed by ccache
 
     cp $src/doc/mozconfig.example $MOZCONFIG
     # Need to modify it
@@ -65,7 +64,8 @@ in stdenv.mkDerivation rec {
       --replace "mk_add_options AUTOCONF=/usr/bin/autoconf-2.13" "mk_add_options AUTOCONF=${autoconf213}/bin/autoconf" \
       --replace 'mk_add_options MOZ_OBJDIR=$HOME/build/wbobjects/' "" \
       --replace "ac_add_options --x-libraries=/usr/lib64" "ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}" \
-      --replace "_BUILD_64=1" "_BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"}"
+      --replace "_BUILD_64=1" "_BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"}" \
+      --replace "--enable-ccache" "--disable-ccache"
 
     echo >> $MOZCONFIG '
     #

From c281582aebd8881891ee8b5014f8b0257a79e341 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 03:36:17 +0000
Subject: [PATCH 3290/3942] minikube: 1.15.0 -> 1.15.1

---
 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 6281d652d0c3..bd71f2f5c5ba 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "minikube";
-  version = "1.15.0";
+  version = "1.15.1";
 
   vendorSha256 = "1xkk4f8qjqx5x878iniclni3jm2f7ka47va756vc3vk8p5s6vpdk";
 
@@ -21,7 +21,7 @@ buildGoModule rec {
     owner = "kubernetes";
     repo = "minikube";
     rev = "v${version}";
-    sha256 = "1n1jhsa0lrfpqvl7m5il37l3f22ffgg4zv8g42xq24cgna951a1z";
+    sha256 = "03knkc8z3vri73j1aa9ry6p1rxql3d75kphd429x5am856mpnn6g";
   };
 
   nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];

From 888b9587edc4dca6c45a1c58e3aa8806bed4e62c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 22 Nov 2020 04:20:00 +0000
Subject: [PATCH 3291/3942] haskellPackages.ghc8102: add patch to allow Block.h
 compile with c++ compilers

---
 pkgs/development/compilers/ghc/8.10.2.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/8.10.2.nix b/pkgs/development/compilers/ghc/8.10.2.nix
index 41aa5e16ba14..fac12099d5db 100644
--- a/pkgs/development/compilers/ghc/8.10.2.nix
+++ b/pkgs/development/compilers/ghc/8.10.2.nix
@@ -2,7 +2,7 @@
 
 # build-tools
 , bootPkgs
-, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
+, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
 , bash
 
 , libiconv ? null, ncurses
@@ -110,6 +110,12 @@ stdenv.mkDerivation (rec {
   # https://gitlab.haskell.org/ghc/ghc/-/issues/18549
   patches = [
     ./issue-18549.patch
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    # Make Block.h compile with c++ compilers. Remove with the next release
+    (fetchpatch {
+      url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
+      sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5";
+    })
   ];
 
   postPatch = "patchShebangs .";

From c9d1aefbabbed970371322ef91d813a00aeee616 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 04:22:31 +0000
Subject: [PATCH 3292/3942] mtprotoproxy: 1.0.9 -> 1.1.0

---
 pkgs/servers/mtprotoproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix
index 9faa7ec56bf2..e8782050eeea 100644
--- a/pkgs/servers/mtprotoproxy/default.nix
+++ b/pkgs/servers/mtprotoproxy/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mtprotoproxy";
-  version = "1.0.9";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "alexbers";
     repo = "mtprotoproxy";
     rev = "v${version}";
-    sha256 = "16f9hzh4h41qb5962lxx04653ncar83znh872g2qh564b6f922z2";
+    sha256 = "15svvramxzl8q8xzs8g62gg8czdn46fjy6jhs5hqf5p83ycxsygz";
   };
 
   nativeBuildInputs = [ wrapPython ];

From 4555075d9ded3056e1e797e862e8951e562f1751 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 04:46:27 +0000
Subject: [PATCH 3293/3942] nfdump: 1.6.21 -> 1.6.22

---
 pkgs/tools/networking/nfdump/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix
index 11ba442393dd..0c9bc41099f2 100644
--- a/pkgs/tools/networking/nfdump/default.nix
+++ b/pkgs/tools/networking/nfdump/default.nix
@@ -2,7 +2,7 @@
 , autoconf, automake, libtool, pkg-config
 , bzip2, libpcap, flex, yacc }:
 
-let version = "1.6.21"; in
+let version = "1.6.22"; in
 
 stdenv.mkDerivation {
   pname = "nfdump";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "phaag";
     repo = "nfdump";
     rev = "v${version}";
-    sha256 = "1ifxnpyzyn8nd6n44pjcw0rwck392nzj1gwa4zzqvvgzj477m6ha";
+    sha256 = "14x2k85ard1kp99hhd90zsmvyw24g03m84rn13gb4grm9gjggzrj";
   };
 
   nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ];

From ef508ccfc7ca7c7cb84837af6f4760c089f9cdcb Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Wed, 4 Nov 2020 16:37:26 +0100
Subject: [PATCH 3294/3942] eureka-editor: mark broken on darwin

---
 pkgs/applications/misc/eureka-editor/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix
index d72aeb629c38..7cee0487ea82 100644
--- a/pkgs/applications/misc/eureka-editor/default.nix
+++ b/pkgs/applications/misc/eureka-editor/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
     description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen";
     license = licenses.gpl2;
     platforms = platforms.all;
+    broken = stdenv.isDarwin;
     maintainers = with maintainers; [ neonfuz ];
   };
 }

From 39bafbe21c04678f9157e991a730f25fa7cd6993 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 05:46:33 +0000
Subject: [PATCH 3295/3942] obsidian: 0.9.11 -> 0.9.15

---
 pkgs/applications/misc/obsidian/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index ae3d9181a3e8..ac28694c45e4 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -30,12 +30,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "obsidian";
-  version = "0.9.11";
+  version = "0.9.15";
 
   src = fetchurl {
     url =
       "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
-    sha256 = "11z22pglqsqjms1ykxmj7lfdwpcmkbdsd5r812m5gv94xsv38lnr";
+    sha256 = "0cfzci2l1bbjc5mqs3hjyy3grz5jk3qbna57vfcvxz36kcd5djv5";
   };
 
   nativeBuildInputs = [ makeWrapper graphicsmagick ];

From 69dfe8d67a962a38c358f053f993a6539a23d3bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 06:23:37 +0000
Subject: [PATCH 3296/3942] openlibm: 0.7.2 -> 0.7.3

---
 pkgs/development/libraries/science/math/openlibm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index 3553833443f7..8c3b03bd7c67 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "openlibm";
-  version = "0.7.2";
+  version = "0.7.3";
   src = fetchurl {
     url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
-    sha256 = "09fl7ij0p0js2sydjvmm9k4d0c83iwpb2sad9d9hin8sjdfyp4vp";
+    sha256 = "0m3khv7qidhfly634bf5w0ci5qnvndmihc4a836a0cy047pw9g6k";
   };
 
   makeFlags = [ "prefix=$(out)" ];

From 5eb3722b8b5492050b8b51fb154abc4f96cbc34f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 15 Nov 2020 06:04:36 +0100
Subject: [PATCH 3297/3942] ocamlPackages.tsort: use Dune 2

---
 pkgs/development/ocaml-modules/tsort/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/tsort/default.nix b/pkgs/development/ocaml-modules/tsort/default.nix
index d47236ba96b8..fdfe7a650e55 100644
--- a/pkgs/development/ocaml-modules/tsort/default.nix
+++ b/pkgs/development/ocaml-modules/tsort/default.nix
@@ -2,6 +2,7 @@
 
 buildDunePackage rec {
   pname = "tsort";
+  useDune2 = true;
   version = "2.0.0";
   src = fetchFromGitHub {
     owner = "dmbaturin";

From e286f0cf3bcffd5c0f006bb1831563d63b281fb2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 15 Nov 2020 06:04:44 +0100
Subject: [PATCH 3298/3942] =?UTF-8?q?ocamlPackages.containers:=203.0=20?=
 =?UTF-8?q?=E2=86=92=203.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/containers/data.nix    | 4 +++-
 pkgs/development/ocaml-modules/containers/default.nix | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/containers/data.nix b/pkgs/development/ocaml-modules/containers/data.nix
index 9cbaabd9cf1e..3694a7b2941b 100644
--- a/pkgs/development/ocaml-modules/containers/data.nix
+++ b/pkgs/development/ocaml-modules/containers/data.nix
@@ -1,12 +1,14 @@
 { buildDunePackage, containers
+, dune-configurator
 , gen, iter, qcheck
 }:
 
 buildDunePackage {
   pname = "containers-data";
 
-  inherit (containers) src version;
+  inherit (containers) src version useDune2;
 
+  buildInputs = [ dune-configurator ];
   doCheck = true;
   checkInputs = [ gen iter qcheck ];
 
diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix
index 970122dd79f3..c3847acb9594 100644
--- a/pkgs/development/ocaml-modules/containers/default.nix
+++ b/pkgs/development/ocaml-modules/containers/default.nix
@@ -1,19 +1,23 @@
 { lib, fetchFromGitHub, buildDunePackage, ocaml
+, dune-configurator
 , seq
 , gen, iter, ounit, qcheck, uutf
 }:
 
 buildDunePackage rec {
-  version = "3.0";
+  version = "3.0.1";
   pname = "containers";
 
+  useDune2 = true;
+
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-containers";
     rev = "v${version}";
-    sha256 = "0c75d5csgc68qqbsdz4279nlin111zrjbg4d47k32ska28myvpqn";
+    sha256 = "1m19cfcwks3xcj16nqldfb49dg0vdc7by1q1j8bpac3z2mjvks0l";
   };
 
+  buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [ seq ];
 
   checkInputs = [ gen iter ounit qcheck uutf ];

From e10ce84e27a0ef42b885102d61e2f1831cede091 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 21 Nov 2020 22:33:28 +0300
Subject: [PATCH 3299/3942] wsdd: init at 0.6.2

---
 pkgs/servers/wsdd/default.nix   | 30 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/servers/wsdd/default.nix

diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix
new file mode 100644
index 000000000000..059c401deadc
--- /dev/null
+++ b/pkgs/servers/wsdd/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, makeWrapper, python3 }:
+
+stdenv.mkDerivation rec {
+  pname = "wsdd";
+  version = "0.6.2";
+
+  src = fetchFromGitHub {
+    owner = "christgau";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0444xh1r5wd0zfch1hg1f9s4cw68srrm87hqx16qvlgx6jmz5j0p";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ python3 ];
+
+  installPhase = ''
+    install -Dm0755 src/wsdd.py $out/bin/wsdd
+    wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/christgau/wsdd";
+    description = "A Web Service Discovery (WSD) host daemon for SMB/Samba";
+    maintainers = with maintainers; [ izorkin ];
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43ced1f6b2e5..dff3f86497b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17581,6 +17581,8 @@ in
 
   webmetro = callPackage ../servers/webmetro { };
 
+  wsdd = callPackage ../servers/wsdd { };
+
   webhook = callPackage ../servers/http/webhook { };
 
   winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat.";

From f663f258c6c4a77d8c9422bf9beef4daa5dc61b7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 07:54:18 +0000
Subject: [PATCH 3300/3942] pistol: 0.1.7 -> 0.1.8

---
 pkgs/tools/misc/pistol/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix
index d5061d61f57b..fa3a9d01f312 100644
--- a/pkgs/tools/misc/pistol/default.nix
+++ b/pkgs/tools/misc/pistol/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "pistol";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "doronbehar";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0kspix7ac4fb0gblrlhnf8hi2ijc997qqkhmy47jibmj6120lmqk";
+    sha256 = "00vpl43m0zw6vqw8yjkaa7dnis9g169jfb48g2mr0hgyhsjr7jbj";
   };
 
-  vendorSha256 = "08fjavadx5mwibzc130mlhp4zph6iwv15xnd4rsniw6zldkzmczy";
+  vendorSha256 = "1rkyvcyrjnrgd3b05gjd4sv95j1b99q641f3n36kgf3sc3hp31ws";
 
   doCheck = false;
 

From 0f6a111e36843882236a22a0a74e046e5ab1970d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 08:14:42 +0000
Subject: [PATCH 3301/3942] powershell: 7.0.3 -> 7.1.0

---
 pkgs/shells/powershell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index 3d412a30afb2..d776e64fa49d 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -5,7 +5,7 @@ let platformString = if stdenv.isDarwin then "osx"
                      else if stdenv.isLinux then "linux"
                      else throw "unsupported platform";
     platformSha = if stdenv.isDarwin then "0zv02h3njphrs8kgmicy7w40mmhmigdfl38f2dpwrs6z67f8vrm2"
-                     else if stdenv.isLinux then "1zgdah397az0n3db6132h4bql0xzri7j98q5wg3s57sp4irlwx9w"
+                     else if stdenv.isLinux then "0dka2q8ijg3ryzwmxapf8aq55d0sgaj6jj0rzj2738in9g4w2hbh"
                      else throw "unsupported platform";
     platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
                      else if stdenv.isLinux then "LD_LIBRARY_PATH"
@@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx"
 in
 stdenv.mkDerivation rec {
   pname = "powershell";
-  version = "7.0.3";
+  version = "7.1.0";
 
   src = fetchzip {
     url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";

From 4d9367330e0c1c2278c3171a9b28efe1424d03bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 09:06:19 +0000
Subject: [PATCH 3302/3942] ptcollab: 0.3.5 -> 0.3.5.1

---
 pkgs/applications/audio/ptcollab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix
index da4db5f159a5..ff190fdcdd36 100644
--- a/pkgs/applications/audio/ptcollab/default.nix
+++ b/pkgs/applications/audio/ptcollab/default.nix
@@ -9,13 +9,13 @@
 
 mkDerivation rec {
   pname = "ptcollab";
-  version = "0.3.5";
+  version = "0.3.5.1";
 
   src = fetchFromGitHub {
     owner = "yuxshao";
     repo = "ptcollab";
     rev = "v${version}";
-    sha256 = "0mgn7lkpgj72hsybnnj0kpfyls4aha1qvv4nhdyclqdfbb6mldxg";
+    sha256 = "1ahfxjm1chz8k65rs7rgn4s2bgippq58fjcxl8fr21pzn718wqf1";
   };
 
   nativeBuildInputs = [ qmake ];

From 472b6f4f33082ff21bd62a7b39b41ca1d79bb212 Mon Sep 17 00:00:00 2001
From: LightDiscord <root@arnaud.sh>
Date: Fri, 6 Nov 2020 21:58:11 +0100
Subject: [PATCH 3303/3942] protonmail-bridge: 1.2.3-1 -> 1.5.0

Provide a minimal cli only version see #97991.

Reviewed-by: SuperSandro2000 <sandro.jaeckel@posteo.de>
Reviewed-by: kalbasit <github@kalbas.it>
---
 .../networking/protonmail-bridge/default.nix  | 85 ++++++-------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 28 insertions(+), 59 deletions(-)

diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index 7acf821dfcf4..9b86c0847e3c 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -1,73 +1,42 @@
-{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, qtgraphicaleffects, qtquickcontrols2, full
-, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, mkDerivation }:
+{ lib, buildGoModule, fetchFromGitHub, pkg-config, libsecret }:
 
-let
-  version = "1.2.3-1";
-
-  description = ''
-    An application that runs on your computer in the background and seamlessly encrypts
-    and decrypts your mail as it enters and leaves your computer.
-
-    To work, gnome-keyring service must be enabled.
-  '';
-in mkDerivation {
+buildGoModule rec {
   pname = "protonmail-bridge";
-  inherit version;
+  version = "1.5.0";
 
-  src = fetchurl {
-    url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
-    sha256 = "032ggk9fvd19fbsqkzwzwh0hpyg8gpkrin71di7zsx6ias5innw1";
+  src = fetchFromGitHub {
+    owner = "ProtonMail";
+    repo = "proton-bridge";
+    rev = "br-${version}";
+    sha256 = "lHqwKlFwz9iO7LJMGFTGCauw12z/BKnQte2sVoVkOaY=";
   };
 
-  sourceRoot = ".";
+  vendorSha256 = "eP+7fqBctX9XLCoHVJDI/qaa5tocgg3F5nfUM6dzNRg=";
 
-  unpackCmd = ''
-    ar p "$src" data.tar.xz | tar xJ
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ libsecret ];
+
+  buildPhase = ''
+    make BUILD_TIME= build-nogui
   '';
 
   installPhase = ''
-    mkdir -p $out/{bin,lib,share}
-
-    cp -r usr/lib/protonmail/bridge/protonmail-bridge $out/lib
-    cp -r usr/share $out
-
-    ln -s $out/lib/protonmail-bridge $out/bin/protonmail-bridge
+    install -Dm555 Desktop-Bridge $out/bin/protonmail-bridge
   '';
 
-  postFixup = let
-    rpath = lib.makeLibraryPath [
-      stdenv.cc.cc.lib
-      qtbase
-      qtquickcontrols2
-      qtgraphicaleffects
-      qtmultimedia
-      qtsvg
-      qtdeclarative
-      qttools
-      libGL
-      libsecret
-      libpulseaudio
-      glib
-    ];
-  in ''
-    patchelf \
-      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${rpath}" \
-      $out/lib/protonmail-bridge
-
-    substituteInPlace $out/share/applications/ProtonMail_Bridge.desktop \
-      --replace "/usr/" "$out/" \
-      --replace "Exec=protonmail-bridge" "Exec=$out/bin/protonmail-bridge"
-  '';
-
-  buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://www.protonmail.com/bridge";
-    license = licenses.mit;
-    platforms = [ "x86_64-linux" ];
+  meta = with lib; {
+    homepage = "https://github.com/ProtonMail/proton-bridge";
+    changelog = "https://github.com/ProtonMail/proton-bridge/blob/master/Changelog.md";
+    downloadPage = "https://github.com/ProtonMail/proton-bridge/releases";
+    license = licenses.gpl3;
     maintainers = with maintainers; [ lightdiscord ];
+    description = "Use your ProtonMail account with your local e-mail client";
+    longDescription = ''
+      An application that runs on your computer in the background and seamlessly encrypts
+      and decrypts your mail as it enters and leaves your computer.
 
-    inherit description;
+      To work, gnome-keyring service must be enabled.
+    '';
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43ced1f6b2e5..64781a61a8e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23185,7 +23185,7 @@ in
 
   properties-cpp = callPackage ../development/libraries/properties-cpp { };
 
-  protonmail-bridge = libsForQt5.callPackage ../applications/networking/protonmail-bridge { };
+  protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { };
 
   protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { };
 

From d7a8da0e46dc870d0a6d839831a0f31fd1908cae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 09:31:01 +0000
Subject: [PATCH 3304/3942] qogir-theme: 2020-02-26 -> 2020-11-16

---
 pkgs/data/themes/qogir/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix
index 23afcf5ece22..44bb220d404d 100644
--- a/pkgs/data/themes/qogir/default.nix
+++ b/pkgs/data/themes/qogir/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qogir-theme";
-  version = "2020-02-26";
+  version = "2020-11-16";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "1s14knj0ral5a62ymwbg5k5g94v8cq0acq0kyam8ay0rfi7wycdm";
+    sha256 = "0qp65py1p93f5bxbf0jgc1d2lwrjhb7d0vzkivm73haji197l9p5";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];

From b5d3cafb691c1b189b2edb93d5b4f247fba0ea9d Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Sun, 22 Nov 2020 10:32:57 +0100
Subject: [PATCH 3305/3942] enamlx: fix use of function that was removed
 upstream

---
 .../python-modules/enamlx/default.nix         |   6 +
 .../enamlx/replace-unicode-with-str.patch     | 274 ++++++++++++++++++
 2 files changed, 280 insertions(+)
 create mode 100644 pkgs/development/python-modules/enamlx/replace-unicode-with-str.patch

diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix
index a9cfafa020e2..344000fa118e 100644
--- a/pkgs/development/python-modules/enamlx/default.nix
+++ b/pkgs/development/python-modules/enamlx/default.nix
@@ -17,6 +17,12 @@ buildPythonPackage rec {
     sha256 = "1rlrx3cw6h1zl9svnqbzwdfy8469qa1y7w6576lbhdwpfhpipscy";
   };
 
+  patches = [
+    # Minimally modified version of https://github.com/frmdstryr/enamlx/commit/16df11227b8cee724624541d274e481802ea67e3
+    # (without the change to setup.py), already on master and expected in the first post-0.4.3 release
+    ./replace-unicode-with-str.patch
+  ];
+
   propagatedBuildInputs = [
     enaml
     # Until https://github.com/inkcut/inkcut/issues/105 perhaps
diff --git a/pkgs/development/python-modules/enamlx/replace-unicode-with-str.patch b/pkgs/development/python-modules/enamlx/replace-unicode-with-str.patch
new file mode 100644
index 000000000000..52df6e9a50e6
--- /dev/null
+++ b/pkgs/development/python-modules/enamlx/replace-unicode-with-str.patch
@@ -0,0 +1,274 @@
+From 16df11227b8cee724624541d274e481802ea67e3 Mon Sep 17 00:00:00 2001
+From: frmdstryr <frmdstryr@protonmail.com>
+Date: Tue, 3 Nov 2020 21:41:52 -0500
+Subject: [PATCH] Replace Unicode with Str
+
+---
+ enamlx/widgets/abstract_item.py      |  4 ++--
+ enamlx/widgets/console.py            |  4 ++--
+ enamlx/widgets/graphics_view.py      |  8 ++++----
+ enamlx/widgets/plot_area.py          | 14 +++++++-------
+ examples/occ_viewer/advanced.enaml   | 12 ++++++------
+ examples/occ_viewer/occ/part.py      |  6 +++---
+ examples/plot_area/plot_area.enaml   |  2 +-
+ examples/table_view/table_view.enaml |  6 +++---
+ examples/tree_view/tree_view.enaml   |  6 +++---
+ setup.py                             |  2 +-
+ 10 files changed, 32 insertions(+), 32 deletions(-)
+
+diff --git a/enamlx/widgets/abstract_item.py b/enamlx/widgets/abstract_item.py
+index 29a3d87..67a5c6e 100644
+--- a/enamlx/widgets/abstract_item.py
++++ b/enamlx/widgets/abstract_item.py
+@@ -6,7 +6,7 @@
+ Created on Aug 24, 2015
+ """
+ from atom.api import (
+-    Int, Enum, Bool, Unicode, Typed, 
++    Int, Enum, Bool, Str, Typed, 
+     Coerced, Event, Property, ForwardInstance, observe
+ )
+ from enaml.icon import Icon
+@@ -96,7 +96,7 @@ class AbstractWidgetItem(AbstractWidgetItemGroup):
+     column = d_(Int(), writable=False)
+     
+     #: Text to display within the cell
+-    text = d_(Unicode())
++    text = d_(Str())
+     
+     #: Text alignment within the cell
+     text_alignment = d_(Enum(*[(h, v)
+diff --git a/enamlx/widgets/console.py b/enamlx/widgets/console.py
+index bc61e90..2f1e981 100644
+--- a/enamlx/widgets/console.py
++++ b/enamlx/widgets/console.py
+@@ -7,7 +7,7 @@
+ """
+ 
+ from atom.api import (
+-    Instance, Coerced, Int, Enum, Unicode, Dict, Bool,
++    Instance, Coerced, Int, Enum, Str, Dict, Bool,
+     Typed, ForwardTyped, observe
+ )
+ from enaml.core.api import d_
+@@ -47,7 +47,7 @@ class Console(Container):
+     proxy = Typed(ProxyConsole)
+     
+     #: Font family, leave blank for default
+-    font_family = d_(Unicode())
++    font_family = d_(Str())
+     
+     #: Font size, leave 0 for default
+     font_size = d_(Int(0))
+diff --git a/enamlx/widgets/graphics_view.py b/enamlx/widgets/graphics_view.py
+index f7e3e47..e672c63 100644
+--- a/enamlx/widgets/graphics_view.py
++++ b/enamlx/widgets/graphics_view.py
+@@ -7,7 +7,7 @@
+ import sys
+ from atom.api import (
+     Atom, Float, Int, Typed, Bool, Coerced, ForwardTyped, Enum, List, IntEnum,
+-    Instance, Unicode, Value, Event, Property, observe, set_default
++    Instance, Str, Value, Event, Property, observe, set_default
+ )
+ from enaml.colors import ColorMember
+ from enaml.core.declarative import d_, d_func
+@@ -419,10 +419,10 @@ class GraphicsItem(ToolkitObject, ConstrainableMixin):
+     visible = d_(Bool(True))
+     
+     #: Tool tip
+-    tool_tip = d_(Unicode())
++    tool_tip = d_(Str())
+     
+     #: Status tip
+-    status_tip = d_(Unicode())
++    status_tip = d_(Str())
+     
+     # --------------------------------------------------------------------------
+     # Item interaction
+@@ -919,7 +919,7 @@ class GraphicsTextItem(AbstractGraphicsShapeItem):
+     proxy = Typed(ProxyGraphicsTextItem)
+     
+     #: Text
+-    text = d_(Unicode())
++    text = d_(Str())
+     
+     #: Font
+     font = d_(FontMember())
+diff --git a/enamlx/widgets/plot_area.py b/enamlx/widgets/plot_area.py
+index 5136693..383957b 100644
+--- a/enamlx/widgets/plot_area.py
++++ b/enamlx/widgets/plot_area.py
+@@ -8,7 +8,7 @@
+ import sys
+ from atom.atom import set_default
+ from atom.api import (Callable, Int, Tuple, Instance, Enum, Float,
+-                      ContainerList, Bool, FloatRange, Unicode, Dict, Typed,
++                      ContainerList, Bool, FloatRange, Str, Dict, Typed,
+                       ForwardTyped, observe)
+ from enaml.core.declarative import d_
+ from enaml.widgets.api import Container
+@@ -41,10 +41,10 @@ class PlotArea(Container):
+ 
+ class PlotItem(Control):
+     #: Title of data series
+-    title = d_(Unicode())
++    title = d_(Str())
+ 
+     #: Name
+-    name = d_(Unicode())
++    name = d_(Str())
+ 
+     #: Row in plot area
+     row = d_(Int(0))
+@@ -89,10 +89,10 @@ class PlotItem(Control):
+     #: Show legend
+     show_legend = d_(Bool(False))
+ 
+-    label_left = d_(Unicode())
+-    label_right = d_(Unicode())
+-    label_top = d_(Unicode())
+-    label_bottom = d_(Unicode())
++    label_left = d_(Str())
++    label_right = d_(Str())
++    label_top = d_(Str())
++    label_bottom = d_(Str())
+ 
+     # H, V
+     grid = d_(Tuple(bool, default=(False, False)))
+diff --git a/examples/occ_viewer/advanced.enaml b/examples/occ_viewer/advanced.enaml
+index 872d44d..f1c48d5 100644
+--- a/examples/occ_viewer/advanced.enaml
++++ b/examples/occ_viewer/advanced.enaml
+@@ -15,7 +15,7 @@ is then used to unroll a list of these controls into the body of a form.
+ 
+ << autodoc-me >>
+ """
+-from atom.api import Atom, Bool, Enum, Event, Float, Int, Str, Unicode
++from atom.api import Atom, Bool, Enum, Event, Float, Int, Str, Str
+ 
+ from enaml.core.api import DynamicTemplate
+ from enaml.stdlib.fields import FloatField
+@@ -73,8 +73,8 @@ template FormControl(Attr, MemberType: Str):
+         text :: setattr(model, Attr, str(text))
+ 
+ 
+-template FormControl(Attr, MemberType: Unicode):
+-    """ A form control template specialization for Unicode members.
++template FormControl(Attr, MemberType: Str):
++    """ A form control template specialization for Str members.
+ 
+     This control uses a Field to represent the value.
+ 
+@@ -174,7 +174,7 @@ def form_spec(obtype, model):
+     
+     typemap = {int:Int,
+                float:Float,
+-               unicode:Unicode,
++               unicode:Str,
+                str:Str}
+     for name, member in obtype.members().iteritems():
+         if (not name.startswith('_') 
+@@ -263,14 +263,14 @@ class FooModel(Atom):
+     ham = Int(42)
+     first = Str('first')
+     last = Str('last')
+-    owner = Unicode('owner')
++    owner = Str('owner')
+     time = Float(42.56)
+     click = Bool()
+     clack = Bool()
+ 
+ 
+ class BarModel(Atom):
+-    name = Unicode('name')
++    name = Str('name')
+     trigger = Event()
+     choices = Enum('first', 'second', 'third')
+     def _observe_trigger(self, change):
+diff --git a/examples/occ_viewer/occ/part.py b/examples/occ_viewer/occ/part.py
+index 1fe2b85..144354f 100644
+--- a/examples/occ_viewer/occ/part.py
++++ b/examples/occ_viewer/occ/part.py
+@@ -5,7 +5,7 @@
+ '''
+ 
+ from atom.api import (
+-    Typed, ForwardTyped, Unicode
++    Typed, ForwardTyped, Str
+ )
+ from enaml.core.declarative import d_
+ 
+@@ -26,10 +26,10 @@ class Part(ToolkitObject):
+     proxy = Typed(ProxyPart)
+     
+     #: Optional name of the part
+-    name = d_(Unicode())
++    name = d_(Str())
+     
+     #: Optional description of the part
+-    description = d_(Unicode())
++    description = d_(Str())
+     
+     @property
+     def shapes(self):
+diff --git a/examples/plot_area/plot_area.enaml b/examples/plot_area/plot_area.enaml
+index 2085c8f..b5cd3c4 100644
+--- a/examples/plot_area/plot_area.enaml
++++ b/examples/plot_area/plot_area.enaml
+@@ -2,7 +2,7 @@
+ Demonstrating the examples from pyqtgraph
+ """
+ 
+-from atom.api import (Atom, Unicode, Range, List, Bool)
++from atom.api import (Atom, Str, Range, List, Bool)
+ 
+ from enaml.widgets.api import (
+     Window, Container, DockArea,DockItem,PushButton, CheckBox, RadioButton
+diff --git a/examples/table_view/table_view.enaml b/examples/table_view/table_view.enaml
+index 6d7a35e..6fef544 100644
+--- a/examples/table_view/table_view.enaml
++++ b/examples/table_view/table_view.enaml
+@@ -2,7 +2,7 @@ import os
+ import time
+ import random
+ from threading import Thread
+-from atom.api import (Atom, Unicode, Range, ContainerList, Bool)
++from atom.api import (Atom, Str, Range, ContainerList, Bool)
+ 
+ from enamlx.widgets.table_view import (
+     TableView, TableViewRow, TableViewItem
+@@ -38,9 +38,9 @@ class Person(Atom):
+     """ A simple class representing a person object.
+ 
+     """
+-    last_name = Unicode()
++    last_name = Str()
+ 
+-    first_name = Unicode()
++    first_name = Str()
+ 
+     age = Range(low=0)
+ 
+diff --git a/examples/tree_view/tree_view.enaml b/examples/tree_view/tree_view.enaml
+index 37f991f..e88e1fd 100644
+--- a/examples/tree_view/tree_view.enaml
++++ b/examples/tree_view/tree_view.enaml
+@@ -1,5 +1,5 @@
+ import os
+-from atom.api import (Atom, Unicode, Range, List, Bool, ForwardInstance)
++from atom.api import (Atom, Str, Range, List, Bool, ForwardInstance)
+ 
+ from enamlx.widgets.api import (
+     TreeView, TreeViewItem, TreeViewColumn, 
+@@ -33,9 +33,9 @@ class Person(Atom):
+     """ A simple class representing a person object.
+ 
+     """
+-    last_name = Unicode()
++    last_name = Str()
+ 
+-    first_name = Unicode()
++    first_name = Str()
+     
+     children = List(ForwardInstance(lambda:Person))

From cdcc01a343ec3058c985cd3b92b9cb7fd40944e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 10:18:30 +0000
Subject: [PATCH 3306/3942] rocksdb: 6.12.7 -> 6.14.5

---
 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 0cb36fd02606..002c0a3c1a79 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rocksdb";
-  version = "6.12.7";
+  version = "6.14.5";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0cpi0v691xsh20hj5x2y2z7dmjvhd3brr0swszv0xqjg2q0f7zdb";
+    sha256 = "0k5385apwyhc3pzfq9104mphf6lf1lb33nhcfbpqiwwn9q14z6n3";
   };
 
   nativeBuildInputs = [ cmake ninja ];

From 6a7992fbc844613cbc0138dba864399e457560af Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 20 Nov 2020 12:36:11 +0100
Subject: [PATCH 3307/3942] ocamlPackages.mirage-clock: 3.0.1 -> 3.1.0

---
 pkgs/development/ocaml-modules/mirage-clock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mirage-clock/default.nix b/pkgs/development/ocaml-modules/mirage-clock/default.nix
index c5f0b1fc93c1..77d6b4ef7788 100644
--- a/pkgs/development/ocaml-modules/mirage-clock/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-clock/default.nix
@@ -2,11 +2,11 @@
 
 buildDunePackage rec {
   pname = "mirage-clock";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-clock/releases/download/v${version}/mirage-clock-v${version}.tbz";
-    sha256 = "12m2dph69r843clrbcgfjj2gcxmq2kdb7g5d91kfj16g13b0vsa3";
+    sha256 = "0cqa07aqkamw0dvis1fl46brvk81zvb92iy5076ik62gv9n5a0mn";
   };
 
   meta = {

From 1c7ce1827b8387023c76af3965768a7e19dfe071 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 11:02:06 +0000
Subject: [PATCH 3308/3942] sd-local: 1.0.12 -> 1.0.13

---
 pkgs/development/tools/sd-local/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix
index 54200c157153..b3dbd91c0ccb 100644
--- a/pkgs/development/tools/sd-local/default.nix
+++ b/pkgs/development/tools/sd-local/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "sd-local";
-  version = "1.0.12";
+  version = "1.0.13";
 
   src = fetchFromGitHub {
     owner = "screwdriver-cd";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1amj5qsnxf6ya2l5rigjia5qis8i7q0qnd9ci74r721nj95m9jvr";
+    sha256 = "1pgzxy9l1zh2qwq20ycqlxp9yj1mfchwc9179zd2v13rlraa8yph";
   };
 
   vendorSha256 = "1y4nyw7rpgipblxqaps2zsd07cin8d0i0g9gvsnc3vifi6g29s8z";

From c72d3b9afbf4af0785dd6ee970ebe51e9d0b39d2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 12:12:13 +0000
Subject: [PATCH 3309/3942] stripe-cli: 1.5.4 -> 1.5.5

---
 pkgs/tools/admin/stripe-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix
index 51f6499f8e36..f675e7518f58 100644
--- a/pkgs/tools/admin/stripe-cli/default.nix
+++ b/pkgs/tools/admin/stripe-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "stripe-cli";
-  version = "1.5.4";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "stripe";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1gb9xk40drj7z6sw6a2hva4kvim508q4f3cfjpmr7yjzspqy32p0";
+    sha256 = "0r0szzw3xl9cn5vcqgn6sc4wbk2j17r1rhg14qgix835lzp9wpdv";
   };
 
   vendorSha256 = "05cyn9cgmijj6dl075slwm5qc6fj6m5sm414wqm50xz2fjs0400r";

From ffeb2af9209b25c367fd39a7f693188e3715e51b Mon Sep 17 00:00:00 2001
From: snicket2100 <57048005+snicket2100@users.noreply.github.com>
Date: Sat, 21 Nov 2020 13:16:51 +0100
Subject: [PATCH 3310/3942] firejail: fixing the 'xdg-dbus-proxy' dependency

xdg-dbus-proxy path is hardcoded in the common.h file in the firejail
source code. if this binary is not found, dbus filtering capabilities
of firejail get limited i.e. you can only entirely disable or entirely
enable dbus communication.
---
 pkgs/os-specific/linux/firejail/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 497314a6d44a..fadf5df7140a 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchpatch, which, nixosTests}:
+{stdenv, fetchurl, fetchpatch, which, xdg-dbus-proxy, nixosTests}:
 let
   s = # Generated upstream information
   rec {
@@ -25,6 +25,10 @@ stdenv.mkDerivation {
     substituteInPlace etc/firejail.config --replace \
       '# follow-symlink-as-user yes' \
       'follow-symlink-as-user no'
+
+    # Fix the path to 'xdg-dbus-proxy' hardcoded in the 'common.h' file
+    substituteInPlace src/include/common.h \
+      --replace '/usr/bin/xdg-dbus-proxy' '${xdg-dbus-proxy}/bin/xdg-dbus-proxy'
   '';
 
   preConfigure = ''

From 938335142e1157514098662c92689771f20cf711 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 20 Nov 2020 15:05:19 +0800
Subject: [PATCH 3311/3942] nodePackages.poor-mans-t-sql-formatter-cli: init at
 1.6.10

---
 .../node-packages/node-packages.json          |  1 +
 .../node-packages/node-packages.nix           | 55 +++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 0216222136e3..045418f787ce 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -156,6 +156,7 @@
 , "peerflix-server"
 , "pm2"
 , "pnpm"
+, "poor-mans-t-sql-formatter-cli"
 , "postcss-cli"
 , "prettier"
 , "pscid"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 3782f5e8f5f4..5c9621809c99 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -22453,6 +22453,15 @@ let
         sha512 = "/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==";
       };
     };
+    "file-or-stdin-1.0.2" = {
+      name = "file-or-stdin";
+      packageName = "file-or-stdin";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-or-stdin/-/file-or-stdin-1.0.2.tgz";
+        sha1 = "48d578b93b8a8cc9c163d950cc9636e3fc8acc1c";
+      };
+    };
     "file-size-0.0.5" = {
       name = "file-size";
       packageName = "file-size";
@@ -27702,6 +27711,15 @@ let
         sha512 = "LgjHkRl9W6bj2n+kWrAOgvCYPTYt+LanE4rtd/vKNq6yEb+SvVV7UTLzoSPpDX6/U1cAz7VfqPr+lPAIz7wHaQ==";
       };
     };
+    "inspect-with-kind-1.0.5" = {
+      name = "inspect-with-kind";
+      packageName = "inspect-with-kind";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inspect-with-kind/-/inspect-with-kind-1.0.5.tgz";
+        sha512 = "MAQUJuIo7Xqk8EVNP+6d3CKq9c80hi4tjIbIAT6lmGW9W6WzlHiu9PS8uSuUYU+Do+j1baiFp3H25XEVxDIG2g==";
+      };
+    };
     "int53-1.0.0" = {
       name = "int53";
       packageName = "int53";
@@ -41593,6 +41611,15 @@ let
         sha512 = "b4OViUOihwV0icb9PHmWbR+vPqaSzSAEbgLskvb7ANPATVXGiYv/TQFHQo65S53WU9i5EQ1I03YDOJW7K0bmYg==";
       };
     };
+    "poor-mans-t-sql-formatter-1.6.10" = {
+      name = "poor-mans-t-sql-formatter";
+      packageName = "poor-mans-t-sql-formatter";
+      version = "1.6.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/poor-mans-t-sql-formatter/-/poor-mans-t-sql-formatter-1.6.10.tgz";
+        sha1 = "a93683ba41dc82fffccccb1c859ae40921f98229";
+      };
+    };
     "portfinder-1.0.28" = {
       name = "portfinder";
       packageName = "portfinder";
@@ -91385,6 +91412,34 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  poor-mans-t-sql-formatter-cli = nodeEnv.buildNodePackage {
+    name = "poor-mans-t-sql-formatter-cli";
+    packageName = "poor-mans-t-sql-formatter-cli";
+    version = "1.6.10";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/poor-mans-t-sql-formatter-cli/-/poor-mans-t-sql-formatter-cli-1.6.10.tgz";
+      sha1 = "472f6172a1e969a6793ea6fd5ad698b448946d77";
+    };
+    dependencies = [
+      sources."commander-2.11.0"
+      sources."file-or-stdin-1.0.2"
+      sources."get-stdin-5.0.1"
+      sources."graceful-fs-4.2.4"
+      sources."inspect-with-kind-1.0.5"
+      sources."kind-of-6.0.3"
+      sources."poor-mans-t-sql-formatter-1.6.10"
+      sources."strip-bom-3.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A T-SQL formatting utility in JS, transpiled from the C# library of the same name.";
+      homepage = "https://github.com/TaoK/poor-mans-t-sql-formatter-npm-cli#readme";
+      license = "AGPL-3.0";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   postcss-cli = nodeEnv.buildNodePackage {
     name = "postcss-cli";
     packageName = "postcss-cli";

From 31cf796be6026d5abe83d2431483fa553715986a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 6 Nov 2020 22:19:57 +0800
Subject: [PATCH 3312/3942] openvpn: 2.4.9 -> 2.5.0

---
 pkgs/tools/networking/openvpn/default.nix | 118 +++++++++++++---------
 pkgs/top-level/all-packages.nix           |   4 +-
 2 files changed, 76 insertions(+), 46 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index c5a15c2f87a8..1df6260a09c7 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -1,14 +1,23 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, makeWrapper
-, iproute, lzo, openssl, pam
-, useSystemd ? stdenv.isLinux, systemd ? null, utillinux ? null
-, pkcs11Support ? false, pkcs11helper ? null,
+{ stdenv
+, fetchurl
+, pkg-config
+, makeWrapper
+, runtimeShell
+, iproute ? null
+, lzo
+, openssl
+, pam
+, useSystemd ? stdenv.isLinux
+, systemd ? null
+, utillinux ? null
+, pkcs11Support ? false
+, pkcs11helper ? null
 }:
 
 assert useSystemd -> (systemd != null);
 assert pkcs11Support -> (pkcs11helper != null);
 
 with stdenv.lib;
-
 let
   # Check if the script needs to have other binaries wrapped when changing this.
   update-resolved = fetchurl {
@@ -16,49 +25,68 @@ let
     sha256 = "021qzv1k0zxgv1rmyfpqj3zlzqr28xa7zff1n7vrbjk36ijylpsc";
   };
 
-in stdenv.mkDerivation rec {
-  pname = "openvpn";
-  version = "2.4.9";
+  generic = { version, sha256 }:
+    let
+      withIpRoute = stdenv.isLinux && (versionOlder version "2.5");
+    in
+    stdenv.mkDerivation
+      rec {
+        pname = "openvpn";
+        inherit version;
 
-  src = fetchurl {
-    url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz";
+        src = fetchurl {
+          url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz";
+          inherit sha256;
+        };
+
+        nativeBuildInputs = [ makeWrapper pkg-config ];
+
+        buildInputs = [ lzo openssl ]
+          ++ optional stdenv.isLinux pam
+          ++ optional withIpRoute iproute
+          ++ optional useSystemd systemd
+          ++ optional pkcs11Support pkcs11helper;
+
+        configureFlags = optionals withIpRoute [
+          "--enable-iproute2"
+          "IPROUTE=${iproute}/sbin/ip"
+        ]
+        ++ optional useSystemd "--enable-systemd"
+        ++ optional pkcs11Support "--enable-pkcs11"
+        ++ optional stdenv.isDarwin "--disable-plugin-auth-pam";
+
+        postInstall = ''
+          mkdir -p $out/share/doc/openvpn/examples
+          cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples
+          cp -r sample/sample-keys/ $out/share/doc/openvpn/examples
+          cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples
+        '' + optionalString useSystemd ''
+          install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved
+          wrapProgram $out/libexec/update-systemd-resolved \
+            --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd utillinux ]}
+        '';
+
+        enableParallelBuilding = true;
+
+        meta = with stdenv.lib; {
+          description = "A robust and highly flexible tunneling application";
+          downloadPage = "https://openvpn.net/community-downloads/";
+          homepage = "https://openvpn.net/";
+          license = licenses.gpl2;
+          maintainers = with maintainers; [ viric peterhoeg ];
+          platforms = platforms.unix;
+        };
+      };
+
+in
+{
+  openvpn_24 = generic {
+    version = "2.4.9";
     sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4";
   };
 
-  nativeBuildInputs = [ makeWrapper pkgconfig ];
-
-  buildInputs = [ lzo openssl ]
-                  ++ optionals stdenv.isLinux [ pam iproute ]
-                  ++ optional useSystemd systemd
-                  ++ optional pkcs11Support pkcs11helper;
-
-  configureFlags = optionals stdenv.isLinux [
-    "--enable-iproute2"
-    "IPROUTE=${iproute}/sbin/ip" ]
-    ++ optional useSystemd "--enable-systemd"
-    ++ optional pkcs11Support "--enable-pkcs11"
-    ++ optional stdenv.isDarwin "--disable-plugin-auth-pam";
-
-  postInstall = ''
-    mkdir -p $out/share/doc/openvpn/examples
-    cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples
-    cp -r sample/sample-keys/ $out/share/doc/openvpn/examples
-    cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples
-  '' + optionalString useSystemd ''
-    install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved
-    wrapProgram $out/libexec/update-systemd-resolved \
-      --prefix PATH : ${makeBinPath [ stdenv.shell iproute systemd utillinux ]}
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "A robust and highly flexible tunneling application";
-    downloadPage = "https://openvpn.net/community-downloads/";
-    homepage = "https://openvpn.net/";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ viric ];
-    platforms = platforms.unix;
-    updateWalker = true;
+  openvpn = generic {
+    version = "2.5.0";
+    sha256 = "sha256-AppCbkTWVstOEYkxnJX+b8mGQkdyT1WZ2Z35xMNHj70=";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22db2f6cfeed..2b0603007c41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6209,7 +6209,9 @@ in
 
   opentsdb = callPackage ../tools/misc/opentsdb {};
 
-  openvpn = callPackage ../tools/networking/openvpn {};
+  inherit (callPackages ../tools/networking/openvpn {})
+    openvpn_24
+    openvpn;
 
   openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
 

From 3c8c57dc33cc45ae7695dd8e6846a78b5550abaf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 12:04:21 +0000
Subject: [PATCH 3313/3942] strawberry: 0.8.3 -> 0.8.4

---
 pkgs/applications/audio/strawberry/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index 9243bc66544e..712a3e37a476 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -35,13 +35,13 @@
 
 mkDerivation rec {
   pname = "strawberry";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "jonaski";
     repo = pname;
     rev = version;
-    sha256 = "0v3rbpaz6pqkam0cj86ydq8gc2rhas8mhwgvy31djvxng9nv3h5j";
+    sha256 = "145djlfvbkx2b1wqipk51mz82dhm27vmh9x00lkn24q1xz1y6h5n";
   };
 
   buildInputs = [

From 82abdf481fbbac7c3683c60fdb03967b8da332d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 12:57:45 +0000
Subject: [PATCH 3314/3942] tendermint: 0.33.8 -> 0.34.0

---
 pkgs/tools/networking/tendermint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix
index 4ca5529bdc60..2fedae4b7a79 100644
--- a/pkgs/tools/networking/tendermint/default.nix
+++ b/pkgs/tools/networking/tendermint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tendermint";
-  version = "0.33.8";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "tendermint";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1dcr60gmbkb6833n49mjmlr082ahlv7alaqycl8g3d4f93kdm5c3";
+    sha256 = "1fnykdk35937ld8dyzjs571klz187jr8wlj8ljn78pajx1cd84k6";
   };
 
-  vendorSha256 = "0i0n89lal99fqnzva51kp9f7wzqsfmncpshwxhq26kvykp7ji7sw";
+  vendorSha256 = "19qx7ab6ar609cxxdsb9i2c3h7icqgf5bhi28lnsdk3bdjxr27vz";
 
   doCheck = false;
 

From e1c7acfb639a494bb2a816a79d9274bf6c62dd37 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 13:14:11 +0000
Subject: [PATCH 3315/3942] thanos: 0.16.0 -> 0.17.0

---
 pkgs/servers/monitoring/thanos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index 68fb973038c2..7c2ac16399f8 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -1,16 +1,16 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "thanos";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "thanos-io";
     repo = "thanos";
-    sha256 = "0432pxpl071wjsijc5b7176mc4lr7sqdwyzqn7dvwkrvvq3n6g5k";
+    sha256 = "06pr9zqfd7nq13pgg02px2d9rp7phxlmnirpkdfgbw799zrfvpag";
   };
 
-  vendorSha256 = "0pbnkqwpp74vanyk3cljj4kgbcid16y9mb5my3iiimbrziw2dkwr";
+  vendorSha256 = "1j3gnzas0hpb5dljf5m97nw2v4r1bp3l99z36gbqkm6lqzr6hqk8";
 
   doCheck = false;
 

From 4b453515f1c1bd00f8f86c18fdb14896888826cb Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sun, 22 Nov 2020 15:27:10 +0200
Subject: [PATCH 3316/3942] pijul: 1.0.0-alpha.3 -> 1.0.0-alpha.5

---
 pkgs/applications/version-management/pijul/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 43890c92039a..fa7583a1e559 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pijul";
-  version = "1.0.0-alpha.3";
+  version = "1.0.0-alpha.5";
 
   src = fetchCrate {
     inherit version pname;
-    sha256 = "0bz38vvzjrplb2mgcypg2p4kq33v6m58yivg15s2ghr7ly9k5ybx";
+    sha256 = "150hm3kim8cszmycbr4rdpy2g3bfhghsya8hnnfkglzi8sprb5d8";
   };
 
-  cargoSha256 = "0p9djvdjzyjzsn3fyw6f74fix39s3y92246cgzcqhc1qlwwz67rl";
+  cargoSha256 = "0398bwjc2ib32nhbg4gjzwq6zwxql7llq8igl51nyr229m917im6";
 
   cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";
   LIBCLANG_PATH = "${libclang}/lib";

From bf3a700c5b906a57c2b23ef108c0ffa695c1b115 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 13:33:52 +0000
Subject: [PATCH 3317/3942] tiled: 1.4.2 -> 1.4.3

---
 pkgs/applications/editors/tiled/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 4b032d48ebf4..10c0ed9ea79b 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "tiled";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "bjorn";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0b3xjcc86vs9lfxr7xann9d43dz3v3x1g7j1mcn31sy2n68a1wx3";
+    sha256 = "0n8p7bp5pqq72c65av3v7wbazwphh78pw27nqvpiyp9y8k5w4pg0";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];

From ae782eea9553f5ac57fb2eac0cfdfb823c72cf39 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 13:43:03 +0000
Subject: [PATCH 3318/3942] tiledb: 2.1.2 -> 2.1.3

---
 pkgs/development/libraries/tiledb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix
index 5fe6b57f0444..eb65d07b2837 100644
--- a/pkgs/development/libraries/tiledb/default.nix
+++ b/pkgs/development/libraries/tiledb/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tiledb";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB";
     rev = version;
-    sha256 = "12f3jvb9b6ji5w2n2k3sjn156ikaf06mriwbqlc54ii1zznaw43r";
+    sha256 = "1ia00bk6dc1176arf84lx08x4c7c74q7ycn7dqjnmyxkg3kmr21g";
   };
 
   # (bundled) blosc headers have a warning on some archs that it will be using

From 27a63acd7ae1170c94775b5a9f8d6e97d92ffcbb Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Sun, 22 Nov 2020 15:13:40 +0100
Subject: [PATCH 3319/3942] pythonPackages.shapely: Set minimum python version
 to 3.5

---
 pkgs/development/python-modules/shapely/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index d4d52a9bf035..eb3b5b9e44d1 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, substituteAll
+{ stdenv, buildPythonPackage, fetchPypi, substituteAll, pythonOlder
 , geos, pytest, cython
 , numpy
 }:
@@ -11,6 +11,7 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "0adiz4jwmwxk7k1awqifb1a9bj5x4nx4gglb5dz9liam21674h8n";
   };
+  disabled = pythonOlder "3.5";
 
   nativeBuildInputs = [
     geos # for geos-config

From f9d14ca7b44b2b38e367fd5ab57a9b700cf10446 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 14:16:36 +0000
Subject: [PATCH 3320/3942] tpm2-tss: 3.0.1 -> 3.0.2

---
 pkgs/development/libraries/tpm2-tss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index c9160083d60f..6b83b5c051d6 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tpm2-tss";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = pname;
     rev = version;
-    sha256 = "10wayqk7h1v3hdyd09rkjjs9989r968dpgf8m0xjqgn7q3y78n61";
+    sha256 = "07yz459xnj7cs99mfhnq8wr9cvkrnbd479scqyxz55nlimrg8dc9";
   };
 
   nativeBuildInputs = [

From d0d86fc5dd8afdc2165ade3bf0bb1f2558d0c6f8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 14:32:32 +0000
Subject: [PATCH 3321/3942] traefik: 2.3.2 -> 2.3.3

---
 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 dffb92326b88..dbc59e982d8f 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "traefik";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchzip {
     url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
-    sha256 = "1h8wflkzjzz0nr81d99f8vksihqa6q4vmkqq40170a8js06fgizx";
+    sha256 = "0hzw4ahwl8hjd1qzv8fzls9m8pivyzrdcmchbqpjlwn83r8ywm0l";
     stripRoot = false;
   };
 
-  vendorSha256 = "16y6cyw4xipadwz7wlzl55sn81by9hc37crf143dfb4c3kmwb581";
+  vendorSha256 = "0y0yw648a6wm0da5x58xwa7k95ff3iddqhfwshhlb5phlnsiqllj";
 
   doCheck = false;
 

From 84b4bd65d7736dfacf17c851669bfe736c6435e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 14:57:37 +0000
Subject: [PATCH 3322/3942] ugrep: 3.0.4 -> 3.0.5

---
 pkgs/tools/text/ugrep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix
index 40266a5440bb..06c8b0d3d6a9 100644
--- a/pkgs/tools/text/ugrep/default.nix
+++ b/pkgs/tools/text/ugrep/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ugrep";
-  version = "3.0.4";
+  version = "3.0.5";
 
   src = fetchFromGitHub {
     owner = "Genivia";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0z3l6dm7v5fdki70nmz2qzrzqmkj3lngiwpswqmyygm7v8gvmimv";
+    sha256 = "17yrlgn18kkx7m03dr0hamv0jny6z4x6sk6an41l807i1xaqjyg6";
   };
 
   buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];

From ddbd25e593280d4afb1c316022c7b8dca284355c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 15:12:39 +0000
Subject: [PATCH 3323/3942] vale: 2.6.1 -> 2.6.2

---
 pkgs/tools/text/vale/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index 5ae858d79db7..9a394a986945 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "vale";
-  version = "2.6.1";
+  version = "2.6.2";
 
   subPackages = [ "." ];
   outputs = [ "out" "data" ];
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "errata-ai";
     repo   = "vale";
     rev    = "v${version}";
-    sha256 = "1xn3i1d8z2zlnykcz0z779naashn92kd7fnnssamjqblclr8dsp8";
+    sha256 = "0hsazxspszljf34i1v247ll8144dq7s1mfs67w8ppscs575ndf05";
   };
 
   vendorSha256 = null;

From b91a67a33ed8472b930544bf606f2c8ac83a5f2a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 15:22:01 +0000
Subject: [PATCH 3324/3942] vultr-cli: 0.4.0 -> 1.0.0

---
 pkgs/development/tools/vultr-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix
index 41f1524536e1..ef98d5603d0a 100644
--- a/pkgs/development/tools/vultr-cli/default.nix
+++ b/pkgs/development/tools/vultr-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "vultr-cli";
-  version = "0.4.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "vultr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0gp1v62iqh3hk46cc5sh8a1nw5nf98m969fdhgxdppwr5dhj9isp";
+    sha256 = "1604l36y6pggk72x4avdijq7c90w0as7xamh634a68ymjnd10jv4";
   };
 
   vendorSha256 = null;

From 08364dfbd50351020e536fcc3699324f04624791 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 15:51:58 +0000
Subject: [PATCH 3325/3942] xmrig: 6.2.2 -> 6.5.3

---
 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 99afc44d2b4d..16aa4f2f7303 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmrig";
-  version = "6.2.2";
+  version = "6.5.3";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "0ph9mrg8i6cv2xjx79118hlm1gcynfavcmp0x2mvvlraxmghfp7a";
+    sha256 = "0hywdb6zzkmiik93bnsw6pzir7189mnm46brg4v8fyn56vxskfmi";
   };
 
   nativeBuildInputs = [ cmake ];

From 97c0e0768b785dd6271d07d76d52767dd8881b36 Mon Sep 17 00:00:00 2001
From: Nicolas Martin <penguwin@penguwin.eu>
Date: Sun, 22 Nov 2020 16:54:09 +0100
Subject: [PATCH 3326/3942] glow: 1.1.0 -> 1.2.0

---
 pkgs/applications/editors/glow/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix
index 0ba13c996712..b9ec218b93ec 100644
--- a/pkgs/applications/editors/glow/default.nix
+++ b/pkgs/applications/editors/glow/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "glow";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "glow";
     rev = "v${version}";
-    sha256 = "016psbm93ni81k87i9gx3cjr59j1fmpq5x8vz0ydabczzdshd1py";
+    sha256 = "0gwzf2p67s0nsb7my5njcz4znlfl62s9gg7x9ywbk9jzsr9avkhv";
   };
 
-  vendorSha256 = "0gvlbj8b5sqk93ahg4b2krwrmr8ljz7cah77fxaxcd98apap0pw6";
+  vendorSha256 = "1p50qr7hbc8vyifa23z7xr43b4fpmwdzg7hqs503c124kpbpk45z";
 
   doCheck = false;
 

From 7620d4c67bbe10ccac3ba6db41d17e4e56d06e31 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 16:23:39 +0000
Subject: [PATCH 3327/3942] zef: 0.9.1 -> 0.9.4

---
 pkgs/development/interpreters/rakudo/zef.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix
index c72eaedef9d6..b2cea4ad473b 100644
--- a/pkgs/development/interpreters/rakudo/zef.nix
+++ b/pkgs/development/interpreters/rakudo/zef.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zef";
-  version = "0.9.1";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "ugexe";
     repo = "zef";
     rev = "v${version}";
-    sha256 = "1qw8g809gnr0s6hmj4qsd81g1dhsacml6n1fdgk4q45l1mxjfdmv";
+    sha256 = "0h3lbznzxqmsv2816vr6y244sfdchj13yhbav86zy2m79p8b5lgq";
   };
 
   buildInputs = [ rakudo makeWrapper ];

From 82cb429ee7769a28fbf222db835359ed38f0afb1 Mon Sep 17 00:00:00 2001
From: sevenfourk <sevenfourk@protonmail.ch>
Date: Sun, 22 Nov 2020 18:31:03 +0200
Subject: [PATCH 3328/3942] terraform-providers.kubernetes: 1.11.3 -> 1.13.2

---
 .../cluster/terraform-providers/providers.json           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 3136529baed4..a31df93c1efd 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -468,11 +468,12 @@
     "version": "1.0.0"
   },
   "kubernetes": {
-    "owner": "terraform-providers",
+    "owner": "hashicorp",
+    "provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
     "repo": "terraform-provider-kubernetes",
-    "rev": "v1.11.3",
-    "sha256": "13j4xwibjgiqpzwbwd0d3z1idv0lwz78ip38khhmhwa78mjjb4zz",
-    "version": "1.11.3"
+    "rev": "v1.13.3",
+    "sha256": "01hkbb81r3k630s3ww6379p66h1fsd5cd1dz14jm833nsr142c0i",
+    "version": "1.13.3"
   },
   "kubernetes-alpha": {
     "owner": "hashicorp",

From 34fb8f746e36c6d806a204a2d551a0a3475a8221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Thu, 19 Nov 2020 23:50:22 +0000
Subject: [PATCH 3329/3942] linux_zen: 5.9.6 -> 5.9.10

---
 pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index cfeaa6d1ec73..40d19d7237c1 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildLinux, ... } @ args:
 
 let
-  version = "5.9.6";
+  version = "5.9.10";
 in
 
 buildLinux (args // {
@@ -13,7 +13,7 @@ buildLinux (args // {
     owner = "zen-kernel";
     repo = "zen-kernel";
     rev = "v${version}-zen1";
-    sha256 = "0v8nc2zy75ij4hn8js23998spadbiid8qc9cib5d0apmzkhilqwq";
+    sha256 = "0836mclwr3r4hm4pn8hp21sk14avrfwiv2s8lqx3cjasgdbyi826";
   };
 
   extraMeta = {

From 348a86a7239f22fbc424fcbbc8ad5b8209cb43d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 22 Nov 2020 07:12:17 +0100
Subject: [PATCH 3330/3942] pythonPackages.hidapi: Fix compilation on darwin

---
 pkgs/development/python-modules/hidapi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix
index 070ad57c4f11..05557b096df7 100644
--- a/pkgs/development/python-modules/hidapi/default.nix
+++ b/pkgs/development/python-modules/hidapi/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs =
     stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ] ++
-    stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit darwin.apple_sdk.frameworks.CoreFoundation ] ++
+    stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++
     [ cython ];
 
   # Fix the USB backend library lookup

From 74c4a55e1076ecd93b2e44f44f402b8980cff464 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 20 Sep 2020 17:02:08 +0200
Subject: [PATCH 3331/3942] buildFHSUserEnvBubblewrap: use arrays for
 constructing argument list

Generally a cleaner way of doing it and prevents issues with spaces in paths

Used to fix #97234 but #101967 already didt this with a smaller scope
---
 .../build-fhs-userenv-bubblewrap/default.nix  | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
index 83d5d371b397..3a3c9e932fdb 100644
--- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
+++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
@@ -50,7 +50,7 @@ let
       "ssl/certs"
       "pki"
     ];
-  in concatStringsSep " \\\n  "
+  in concatStringsSep "\n  "
   (map (file: "--ro-bind-try /etc/${file} /etc/${file}") files);
 
   init = run: writeShellScriptBin "${name}-init" ''
@@ -59,21 +59,21 @@ let
   '';
 
   bwrapCmd = { initArgs ? "" }: ''
-    blacklist="/nix /dev /proc /etc"
-    ro_mounts=""
+    blacklist=(/nix /dev /proc /etc)
+    ro_mounts=()
     for i in ${env}/*; do
       path="/''${i##*/}"
       if [[ $path == '/etc' ]]; then
         continue
       fi
-      ro_mounts="$ro_mounts --ro-bind $i $path"
-      blacklist="$blacklist $path"
+      ro_mounts+=(--ro-bind "$i" "$path")
+      blacklist+=("$path")
     done
 
     if [[ -d ${env}/etc ]]; then
       for i in ${env}/etc/*; do
         path="/''${i##*/}"
-        ro_mounts="$ro_mounts --ro-bind $i /etc$path"
+        ro_mounts+=(--ro-bind "$i" "/etc$path")
       done
     fi
 
@@ -81,24 +81,27 @@ let
     # loop through all directories in the root
     for dir in /*; do
       # if it is a directory and it is not in the blacklist
-      if [[ -d "$dir" ]] && grep -v "$dir" <<< "$blacklist" >/dev/null; then
+      if [[ -d "$dir" ]] && [[ ! "''${blacklist[@]}" =~ "$dir" ]]; then
         # add it to the mount list
         auto_mounts+=(--bind "$dir" "$dir")
       fi
     done
 
-    exec ${bubblewrap}/bin/bwrap \
-      --dev-bind /dev /dev \
-      --proc /proc \
-      --chdir "$(pwd)" \
-      --unshare-all \
-      --share-net \
-      --die-with-parent \
-      --ro-bind /nix /nix \
-      ${etcBindFlags} \
-      $ro_mounts \
-      "''${auto_mounts[@]}" \
+    cmd=(
+      ${bubblewrap}/bin/bwrap
+      --dev-bind /dev /dev
+      --proc /proc
+      --chdir "$(pwd)"
+      --unshare-all
+      --share-net
+      --die-with-parent
+      --ro-bind /nix /nix
+      ${etcBindFlags}
+      "''${ro_mounts[@]}"
+      "''${auto_mounts[@]}"
       ${init runScript}/bin/${name}-init ${initArgs}
+    )
+    exec "''${cmd[@]}"
   '';
 
   bin = writeShellScriptBin name (bwrapCmd { initArgs = ''"$@"''; });

From 636df97496026ef4ce7ae49f53d78fdf72677a31 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 18:55:28 +0000
Subject: [PATCH 3332/3942] argo: 2.11.7 -> 2.11.8

---
 pkgs/applications/networking/cluster/argo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index 6f2344bd3e75..4009bf96cd4f 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -19,13 +19,13 @@ let
 in
 buildGoModule rec {
   pname = "argo";
-  version = "2.11.7";
+  version = "2.11.8";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo";
     rev = "v${version}";
-    sha256 = "1i7qgghnb39bibnk07f47k64qpkb1k8mi3bbfnx6mxl0jlq335af";
+    sha256 = "19nkkj69506759qjfrz6d7j57z8rqjslgfrdrkx01ri68cil4mfh";
   };
 
   vendorSha256 = "1ca0ssvbi4vrsn9ljc783hnh9bmf5p8nr1lz5wm8g3gbrrrf1ray";

From 8a4cf08d411858636df8053a4768ed717bc6ad18 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 22 Nov 2020 16:19:25 +0700
Subject: [PATCH 3333/3942] u9fs: 20110513 -> unstable-2020-11-21

---
 pkgs/servers/u9fs/default.nix | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix
index 3dea897971aa..97745b77ad2f 100644
--- a/pkgs/servers/u9fs/default.nix
+++ b/pkgs/servers/u9fs/default.nix
@@ -1,24 +1,26 @@
 { stdenv, fetchhg }:
 
 stdenv.mkDerivation {
-  name = "u9fs-20110513";
+  pname = "u9fs";
+  version = "unstable-2020-11-21";
+
   src = fetchhg {
-    url = "https://bitbucket.org/plan9-from-bell-labs/u9fs";
-    rev = "9474edb23b11";
+    url = "https://code.9front.org/hg/plan9front";
+    rev = "6eef4d6a9bce";
     sha256 = "0irwyk8vnvx0fmz8lmbdb2jrlvas8imr61jr76a1pkwi9wpf2wv6";
   };
 
-  installPhase =
-    ''
+  installPhase = ''
       mkdir -p $out/bin $out/share/man4
-      cp u9fs $out/bin; cp u9fs.man $out/share/man4
+      cp u9fs.man $out/share/man4
+      cp u9fs $out/bin
     '';
 
-  meta = with stdenv.lib;
-    { description = "Serve 9P from Unix";
-      homepage = "http://plan9.bell-labs.com/magic/man2html/4/u9fs";
-      license = licenses.free;
-      maintainers = [ maintainers.ehmry ];
-      platforms = platforms.unix;
-    };
+  meta = with stdenv.lib; {
+    description = "Serve 9P from Unix";
+    homepage = "http://plan9.bell-labs.com/magic/man2html/4/u9fs";
+    license = licenses.free;
+    maintainers = [ maintainers.ehmry ];
+    platforms = platforms.unix;
+  };
 }

From 87976cd2ef363a8fb1afc44fda6426fd10317a89 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 20:29:30 +0000
Subject: [PATCH 3334/3942] autorandr: 1.10.1 -> 1.11

---
 pkgs/tools/misc/autorandr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index b2bbb161f289..5a2387358d55 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -6,7 +6,7 @@
 
 let
   python = python3Packages.python;
-  version = "1.10.1";
+  version = "1.11";
 in
   stdenv.mkDerivation {
     pname = "autorandr";
@@ -49,7 +49,7 @@ in
       owner = "phillipberndt";
       repo = "autorandr";
       rev = version;
-      sha256 = "0msw9b1hdy3gbq9w5d04mfizhyirz1c648x84mlcbzl8salm7vpg";
+      sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5";
     };
 
     meta = with stdenv.lib; {

From 31c770d065fe4fce58131998e3a62000655332bc Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 22 Nov 2020 13:18:38 -0800
Subject: [PATCH 3335/3942] rage: 0.4.0 -> 0.5.0

* Upgrades to latest version
* Moves darwin security access into derivation,
  simplifying all-packages.nix
* Add RyanTM as maintainer
---
 pkgs/tools/security/rage/default.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix      |  4 +---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix
index 26ae27dff6b2..1e0164e10cf4 100644
--- a/pkgs/tools/security/rage/default.nix
+++ b/pkgs/tools/security/rage/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }:
+{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "rage";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "str4d";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1wwndzy4xxbar9r67z8g7pp0s1xsxk5xaarh4h6hc0kh411zglrq";
+    sha256 = "sha256-XSDfAsXfwSoe5JMdJtZlC324Sra+4fVJhE3/k2TthEc=";
   };
 
-  cargoSha256 = "08njl8irkqkfxj54pz4sx3l9aqb40h10wxb82zza52pqd4zapgn6";
+  cargoSha256 = "sha256-GPr5zxeODAjD+ynp/nned9gZUiReYcdzosuEbLIKZSs=";
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
   postBuild = ''
     cargo run --example generate-docs
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
     description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability";
     homepage = "https://github.com/str4d/rage";
     changelog = "https://github.com/str4d/rage/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.marsam ];
+    license = with licenses; [ asl20 mit ]; # either at your option
+    maintainers = with maintainers; [ marsam ryantm ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f25a6df78ede..5a4e623d213d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3510,9 +3510,7 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  rage = callPackage ../tools/security/rage {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  rage = callPackage ../tools/security/rage { };
 
   rar2fs = callPackage ../tools/filesystems/rar2fs { };
 

From bbcbaeb54d1d08783771f886e04cf8e8afc82651 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 22 Nov 2020 17:17:08 +1000
Subject: [PATCH 3336/3942] nixos/tests/fctix: remove trailing whitespace

---
 nixos/tests/fcitx/default.nix | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/nixos/tests/fcitx/default.nix b/nixos/tests/fcitx/default.nix
index d28a5801f97f..cbeb95d33b0c 100644
--- a/nixos/tests/fcitx/default.nix
+++ b/nixos/tests/fcitx/default.nix
@@ -1,15 +1,15 @@
-import ../make-test-python.nix ( 
+import ../make-test-python.nix (
   {
     pkgs, ...
-  }: 
+  }:
     # copy_from_host works only for store paths
     rec {
         name = "fcitx";
-        machine = 
-        { 
-          pkgs, 
-          ... 
-        }: 
+        machine =
+        {
+          pkgs,
+          ...
+        }:
           {
             virtualisation.memorySize = 1024;
 
@@ -19,11 +19,11 @@ import ../make-test-python.nix (
 
             environment.systemPackages = [
               # To avoid clashing with xfce4-terminal
-              pkgs.alacritty 
+              pkgs.alacritty
             ];
 
 
-            services.xserver = 
+            services.xserver =
             {
               enable = true;
 
@@ -37,7 +37,7 @@ import ../make-test-python.nix (
 
               desktopManager.xfce.enable = true;
             };
-              
+
             i18n = {
               inputMethod = {
                 enabled = "fcitx";
@@ -50,14 +50,14 @@ import ../make-test-python.nix (
           }
         ;
 
-        testScript = { nodes, ... }: 
-        let 
+        testScript = { nodes, ... }:
+        let
             user = nodes.machine.config.users.users.alice;
             userName      = user.name;
             userHome      = user.home;
             xauth         = "${userHome}/.Xauthority";
             fcitx_confdir = "${userHome}/.config/fcitx";
-        in 
+        in
         ''
             # We need config files before login session
             # So copy first thing
@@ -92,7 +92,7 @@ import ../make-test-python.nix (
             machine.send_key("ctrl-alt-shift-u")
             machine.sleep(5)
             machine.sleep(1)
-            
+
             ### Search for smiling face
             machine.send_chars("smil")
             machine.sleep(1)

From dbbd289982ba87aea30453b1e6fb37f33e6bdb72 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 22 Nov 2020 17:23:53 +1000
Subject: [PATCH 3337/3942] nixos/*: fix indentation

---
 .../services/databases/foundationdb.nix       |  2 +-
 nixos/modules/services/mail/rspamd.nix        |  2 +-
 nixos/modules/services/misc/siproxd.nix       | 18 +++++++--------
 nixos/modules/services/misc/svnserve.nix      |  2 +-
 .../services/network-filesystems/netatalk.nix | 12 +++++-----
 nixos/modules/services/networking/morty.nix   | 16 ++++++++------
 .../strongswan-swanctl/swanctl-params.nix     | 18 +++++++--------
 .../services/networking/wasabibackend.nix     |  2 +-
 .../services/security/oauth2_proxy.nix        |  4 ++--
 .../services/x11/window-managers/evilwm.nix   |  4 ++--
 .../virtualisation/nixos-containers.nix       | 22 +++++++++----------
 nixos/tests/morty.nix                         |  6 ++---
 nixos/tests/quorum.nix                        |  2 +-
 nixos/tests/rspamd.nix                        |  2 +-
 14 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index 18727acc7c75..e22127403e91 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -233,7 +233,7 @@ in
             type = types.str;
             default = "Check.Valid=1,Check.Unexpired=1";
             description = ''
-	      "Peer verification string". This may be used to adjust which TLS
+              "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.
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 86a3f52107d5..a6c19a2af73e 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -408,7 +408,7 @@ in
   };
   imports = [
     (mkRemovedOptionModule [ "services" "rspamd" "socketActivation" ]
-	     "Socket activation never worked correctly and could at this time not be fixed and so was removed")
+       "Socket activation never worked correctly and could at this time not be fixed and so was removed")
     (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ])
     (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ])
     (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")
diff --git a/nixos/modules/services/misc/siproxd.nix b/nixos/modules/services/misc/siproxd.nix
index 0e87fc461d3f..20fe0793b84b 100644
--- a/nixos/modules/services/misc/siproxd.nix
+++ b/nixos/modules/services/misc/siproxd.nix
@@ -39,7 +39,7 @@ in
         default = false;
         description = ''
           Whether to enable the Siproxd SIP
-	  proxy/masquerading daemon.
+          proxy/masquerading daemon.
         '';
       };
 
@@ -57,29 +57,29 @@ in
 
       hostsAllowReg = mkOption {
         type = types.listOf types.str;
-	default = [ ];
+        default = [ ];
         example = [ "192.168.1.0/24" "192.168.2.0/24" ];
-	description = ''
+        description = ''
           Acess control list for incoming SIP registrations.
         '';
       };
 
       hostsAllowSip = mkOption {
         type = types.listOf types.str;
-	default = [ ];
+        default = [ ];
         example = [ "123.45.0.0/16" "123.46.0.0/16" ];
-	description = ''
+        description = ''
           Acess control list for incoming SIP traffic.
         '';
       };
 
       hostsDenySip = mkOption {
         type = types.listOf types.str;
-	default = [ ];
+        default = [ ];
         example = [ "10.0.0.0/8" "11.0.0.0/8" ];
-	description = ''
+        description = ''
           Acess control list for denying incoming
-	   SIP registrations and traffic.
+          SIP registrations and traffic.
         '';
       };
 
@@ -87,7 +87,7 @@ in
         type = types.int;
         default = 5060;
         description = ''
-	  Port to listen for incoming SIP messages.
+          Port to listen for incoming SIP messages.
         '';
       };
 
diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix
index 3335ed09d40e..f70e3ca7fef0 100644
--- a/nixos/modules/services/misc/svnserve.nix
+++ b/nixos/modules/services/misc/svnserve.nix
@@ -25,7 +25,7 @@ in
 
       svnBaseDir = mkOption {
         default = "/repos";
-	description = "Base directory from which Subversion repositories are accessed.";
+        description = "Base directory from which Subversion repositories are accessed.";
       };
     };
 
diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix
index 7674c8f7fa8d..ca9d32311f5f 100644
--- a/nixos/modules/services/network-filesystems/netatalk.nix
+++ b/nixos/modules/services/network-filesystems/netatalk.nix
@@ -108,10 +108,10 @@ in
 
       extmap = mkOption {
         type = types.lines;
-	default = "";
-	description = ''
-	  File name extension mappings.
-	  See <literal>man extmap.conf</literal> for more information.
+        default = "";
+        description = ''
+          File name extension mappings.
+          See <literal>man extmap.conf</literal> for more information.
         '';
       };
 
@@ -132,10 +132,10 @@ in
         Type = "forking";
         GuessMainPID = "no";
         PIDFile = "/run/lock/netatalk";
-	ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID";
+        ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID";
         ExecStart  = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP  $MAINPID";
-	ExecStop   = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";
+        ExecStop   = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";
         Restart = "always";
         RestartSec = 1;
       };
diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix
index e3a6444c1163..e110a5c86101 100644
--- a/nixos/modules/services/networking/morty.nix
+++ b/nixos/modules/services/networking/morty.nix
@@ -29,9 +29,11 @@ in
       key = mkOption {
         type = types.str;
         default = "";
-        description = "HMAC url validation key (hexadecimal encoded).
-	Leave blank to disable. Without validation key, anyone can
-	submit proxy requests. Leave blank to disable.";
+        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";
       };
 
@@ -85,10 +87,10 @@ in
         serviceConfig = {
           User = "morty";
           ExecStart = ''${cfg.package}/bin/morty              \
-	    -listen ${cfg.listenAddress}:${toString cfg.port} \
-	    ${optionalString cfg.ipv6 "-ipv6"}                \
-	    ${optionalString (cfg.key != "") "-key " + cfg.key} \
-	  '';
+            -listen ${cfg.listenAddress}:${toString cfg.port} \
+            ${optionalString cfg.ipv6 "-ipv6"}                \
+            ${optionalString (cfg.key != "") "-key " + cfg.key} \
+          '';
         };
       };
     environment.systemPackages = [ cfg.package ];
diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
index 808cb863a9cf..1d1e0bd1ca19 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
@@ -1173,20 +1173,20 @@ in {
 
     ppk = mkPrefixedAttrsOfParams {
       secret = mkOptionalStrParam ''
-	      Value of the PPK. It may either be an ASCII string, a hex encoded string
-	      if it has a <literal>0x</literal> prefix or a Base64 encoded string if
-	      it has a <literal>0s</literal> prefix in its value. Should have at least
-	      256 bits of entropy for 128-bit security.
+        Value of the PPK. It may either be an ASCII string, a hex encoded string
+        if it has a <literal>0x</literal> prefix or a Base64 encoded string if
+        it has a <literal>0s</literal> prefix in its value. Should have at least
+        256 bits of entropy for 128-bit security.
       '';
 
       id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") ''
-	      PPK identity the PPK belongs to. Multiple unique identities may be
-	      specified, each having an <literal>id</literal> prefix, if a secret is
-	      shared between multiple peers.
+        PPK identity the PPK belongs to. Multiple unique identities may be
+        specified, each having an <literal>id</literal> prefix, if a secret is
+        shared between multiple peers.
       '';
     } ''
-	    Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is
-	    defined in a unique section having the <literal>ppk</literal> prefix.
+      Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is
+      defined in a unique section having the <literal>ppk</literal> prefix.
     '';
 
     private = mkPrefixedAttrsOfParams {
diff --git a/nixos/modules/services/networking/wasabibackend.nix b/nixos/modules/services/networking/wasabibackend.nix
index 6eacffe709b0..8482823e197f 100644
--- a/nixos/modules/services/networking/wasabibackend.nix
+++ b/nixos/modules/services/networking/wasabibackend.nix
@@ -21,7 +21,7 @@ let
       RegTestBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
   };
 
-	configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions);
+  configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions);
 
 in {
 
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index 2f9e94bd77ba..486f3ab05386 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -448,7 +448,7 @@ in
       default = false;
       description = ''
         In case when running behind a reverse proxy, controls whether headers
-	like <literal>X-Real-Ip</literal> are accepted. Usage behind a reverse
+        like <literal>X-Real-Ip</literal> are accepted. Usage behind a reverse
         proxy will require this flag to be set to avoid logging the reverse
         proxy IP address.
       '';
@@ -524,7 +524,7 @@ in
       type = types.nullOr types.str;
       default = null;
       description = ''
-      	Profile access endpoint.
+        Profile access endpoint.
       '';
     };
 
diff --git a/nixos/modules/services/x11/window-managers/evilwm.nix b/nixos/modules/services/x11/window-managers/evilwm.nix
index 6e19e3572c79..6f1db2110f87 100644
--- a/nixos/modules/services/x11/window-managers/evilwm.nix
+++ b/nixos/modules/services/x11/window-managers/evilwm.nix
@@ -16,8 +16,8 @@ in
     services.xserver.windowManager.session = singleton {
       name = "evilwm";
       start = ''
-	${pkgs.evilwm}/bin/evilwm &
-	waitPID=$!
+        ${pkgs.evilwm}/bin/evilwm &
+        waitPID=$!
       '';
     };
     environment.systemPackages = [ pkgs.evilwm ];
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index 8fbb4efd2019..26398afb3cf5 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -614,17 +614,17 @@ in
               '';
             };
 
-		    timeoutStartSec = mkOption {
-		      type = types.str;
-		      default = "1min";
-		      description = ''
-		        Time for the container to start. In case of a timeout,
-		        the container processes get killed.
-		        See <citerefentry><refentrytitle>systemd.time</refentrytitle>
-		        <manvolnum>7</manvolnum></citerefentry>
-		        for more information about the format.
-		       '';
-		    };
+            timeoutStartSec = mkOption {
+              type = types.str;
+              default = "1min";
+              description = ''
+                Time for the container to start. In case of a timeout,
+                the container processes get killed.
+                See <citerefentry><refentrytitle>systemd.time</refentrytitle>
+                <manvolnum>7</manvolnum></citerefentry>
+                for more information about the format.
+               '';
+            };
 
             bindMounts = mkOption {
               type = with types; attrsOf (submodule bindMountOpts);
diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix
index ff30b7c072bb..924dce2717e3 100644
--- a/nixos/tests/morty.nix
+++ b/nixos/tests/morty.nix
@@ -12,9 +12,9 @@ import ./make-test-python.nix ({ pkgs, ... }:
       { ... }:
       { services.morty = {
         enable = true;
-	key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";
-	port = 3001;
-	};
+        key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";
+        port = 3001;
+        };
       };
 
     };
diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix
index 846d2a930188..d5906806a0a2 100644
--- a/nixos/tests/quorum.nix
+++ b/nixos/tests/quorum.nix
@@ -55,7 +55,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
         parentHash =
           "0x0000000000000000000000000000000000000000000000000000000000000000";
         timestamp = "0x5cffc201";
-		  };
+      };
      };
     };
   };
diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix
index bf3f0de62044..6eaa02ef4291 100644
--- a/nixos/tests/rspamd.nix
+++ b/nixos/tests/rspamd.nix
@@ -209,7 +209,7 @@ in
               return false
             end,
             score = 5.0,
-	          description = 'Allow no cows',
+            description = 'Allow no cows',
             group = "cows",
           }
           rspamd_logger.infox(rspamd_config, 'Work dammit!!!')

From fe78178e097126bdb4f919c487c8399c2a4ccf8e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 22 Nov 2020 10:59:08 +1000
Subject: [PATCH 3338/3942] containerd: add passthru.tests

---
 pkgs/applications/virtualization/containerd/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index eded437a62db..f3bcefcf1739 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux }:
+{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux, nixosTests }:
 
 with lib;
 
@@ -42,6 +42,8 @@ buildGoPackage rec {
     installManPage man/*.[1-9]
   '';
 
+  passthru.tests = { inherit (nixosTests) docker; };
+
   meta = {
     homepage = "https://containerd.io/";
     description = "A daemon to control runC";

From cdf6ffdf2e8917c167b8201fac29687b5fa88d34 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 22 Nov 2020 10:59:08 +1000
Subject: [PATCH 3339/3942] docker: add passthru.tests

---
 pkgs/applications/virtualization/docker/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index dad5b43e5b05..d3200bba928c 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -4,6 +4,7 @@
 , sqlite, iproute, lvm2, systemd
 , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git
 , procps, libseccomp
+, nixosTests
 }:
 
 with lib;
@@ -184,6 +185,8 @@ rec {
       installManPage man/*/*.[1-9]
     '';
 
+    passthru.tests = { inherit (nixosTests) docker; };
+
     meta = {
       homepage = "https://www.docker.com/";
       description = "An open source project to pack, ship and run any application as a lightweight container";

From a82d8ca64df883bdad18cb20029faf87ac49e48f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 22 Nov 2020 10:59:08 +1000
Subject: [PATCH 3340/3942] runc: add docker to passthru.tests

---
 pkgs/applications/virtualization/runc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index fd3d914af662..1a7935dcf7d5 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -45,7 +45,7 @@ buildGoPackage rec {
     installManPage man/*/*.[1-9]
   '';
 
-  passthru.tests = { inherit (nixosTests) cri-o podman; };
+  passthru.tests = { inherit (nixosTests) cri-o docker podman; };
 
   meta = with lib; {
     homepage = "https://github.com/opencontainers/runc";

From 60d2f1a232c7a9c7cd5b1cc938aab74b45a11778 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 22:43:37 +0000
Subject: [PATCH 3341/3942] clinfo: 2.2.18.04.06 -> 3.0.20.11.20

---
 pkgs/tools/system/clinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix
index c50bfe4a0d04..9e9b4df80880 100644
--- a/pkgs/tools/system/clinfo/default.nix
+++ b/pkgs/tools/system/clinfo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "clinfo";
-  version = "2.2.18.04.06";
+  version = "3.0.20.11.20";
 
     src = fetchFromGitHub {
       owner = "Oblomov";
       repo = "clinfo";
       rev = version;
-      sha256 = "0y2q0lz5yzxy970b7w7340vp4fl25vndahsyvvrywcrn51ipgplx";
+      sha256 = "052xfkbmgfpalmhfwn0dj5114x2mzwz29y37qqhhsdpaxsz0y422";
     };
 
   buildInputs = [ ocl-icd opencl-headers ];

From 221f8ae3a311592d9930af4ac8e5ca1ad4c0768b Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sun, 22 Nov 2020 23:44:46 +0100
Subject: [PATCH 3342/3942] navidrome: 0.29.0 -> 0.38.0

---
 pkgs/servers/misc/navidrome/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix
index a14a5039721d..a31d7a9c6d88 100644
--- a/pkgs/servers/misc/navidrome/default.nix
+++ b/pkgs/servers/misc/navidrome/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "navidrome";
-  version = "0.29.0";
+  version = "0.38.0";
 
   src = fetchurl {
     url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz";
-    sha256 = "0dpv68wvrslgfgh18mb8ficji6k1i9jiid9bfw786andf4rwghyc";
+    sha256 = "01fkzsvdz1b43m8glxl01vw7d19w5fglk9x1rj5bab8fgrx149w8";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/navidrome \
       --prefix PATH : ${makeBinPath (optional ffmpegSupport ffmpeg)}
   '';
-  
+
   meta = {
     description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic";
     homepage = "https://www.navidrome.org/";

From 50e24b8e0aed6132d4d5a5768e85502314855834 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 22 Nov 2020 10:37:18 +1000
Subject: [PATCH 3343/3942] runc: add wrapper for procps, systemd

for cgroupsv2 it needs `busctl` and `systemctl` in its PATH.
---
 pkgs/applications/virtualization/runc/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 1a7935dcf7d5..c3882ae9472e 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -9,6 +9,8 @@
 , apparmor-parser
 , libseccomp
 , libselinux
+, makeWrapper
+, procps
 , nixosTests
 }:
 
@@ -26,7 +28,7 @@ buildGoPackage rec {
   goPackagePath = "github.com/opencontainers/runc";
   outputs = [ "out" "man" ];
 
-  nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ];
+  nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ];
 
   buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ];
 
@@ -43,6 +45,9 @@ buildGoPackage rec {
   installPhase = ''
     install -Dm755 runc $out/bin/runc
     installManPage man/*/*.[1-9]
+    wrapProgram $out/bin/runc \
+      --prefix PATH : ${lib.makeBinPath [ procps ]} \
+      --prefix PATH : /run/current-system/systemd/bin
   '';
 
   passthru.tests = { inherit (nixosTests) cri-o docker podman; };

From bfba7b9ca7be1e926871169248c7f05e8c81363a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 23 Nov 2020 00:07:45 +0100
Subject: [PATCH 3344/3942] vagrant: 2.2.13 -> 2.2.14

https://github.com/hashicorp/vagrant/blob/v2.2.14/CHANGELOG.md#2214-november-20-2020
---
 pkgs/development/tools/vagrant/default.nix |  4 ++--
 pkgs/development/tools/vagrant/gemset.nix  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 3d5fe88bfccd..b3f1bf1a5b8f 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -5,9 +5,9 @@
 let
   # NOTE: bumping the version and updating the hash is insufficient;
   # you must use bundix to generate a new gemset.nix in the Vagrant source.
-  version = "2.2.13";
+  version = "2.2.14";
   url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
-  sha256 = "sha256-NN+8t08yycINbtxOjhOWU96nJ0fZKDAopEr3WyAeG8U=";
+  sha256 = "sha256-vsb7RFjT9l4N6BzwIvVLcRtA4n/c8jk20B6RUMkyhJs=";
 
   deps = bundlerEnv rec {
     name = "${pname}-${version}";
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix
index c18b9818f33a..169c3533efcb 100644
--- a/pkgs/development/tools/vagrant/gemset.nix
+++ b/pkgs/development/tools/vagrant/gemset.nix
@@ -54,10 +54,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
+      sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.10.0";
   };
   excon = {
     groups = ["default"];
@@ -138,10 +138,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07q48aca4r782jh53znqq7ams4pcf1dhmq21dwhyxzjqfclcb48g";
+      sha256 = "0028p1fss6pvw4mlpjqdmxfzsm8ww79irsadbibrr7f23qfn8ykr";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "3.3.1";
   };
   little-plugger = {
     groups = ["default"];
@@ -347,10 +347,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0savhyfry7ii9axcmprvbzhrz4sd9byd8wifn74bd7y78asrbpdq";
+      sha256 = "1lmlaii8qapn84wxdg5d82gbailracgk67d0qsnbdnffcg8kswzd";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.2.3";
   };
   winrm-fs = {
     dependencies = ["erubi" "logging" "rubyzip" "winrm"];

From 2ea951480d629e6b329a30c14ea0b92be1ab5039 Mon Sep 17 00:00:00 2001
From: Nejc Zupan <nejc.zupan@gmail.com>
Date: Sun, 22 Nov 2020 13:08:47 +0000
Subject: [PATCH 3345/3942] pgweb: init at 0.11.7

Add pgweb, a light and fast web-based PostgreSQL database browser
---
 maintainers/maintainer-list.nix               |  6 +++++
 .../tools/database/pgweb/default.nix          | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/tools/database/pgweb/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f2e33938e051..c686510142c5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9998,4 +9998,10 @@
     github = "pulsation";
     githubId = 1838397;
   };
+  zupo = {
+    name = "Nejc Zupan";
+    email = "nejczupan+nix@gmail.com";
+    github = "zupo";
+    githubId = 311580;
+  };
 }
diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/development/tools/database/pgweb/default.nix
new file mode 100644
index 000000000000..de9d0847f8b6
--- /dev/null
+++ b/pkgs/development/tools/database/pgweb/default.nix
@@ -0,0 +1,26 @@
+{ buildGoPackage, fetchFromGitHub, lib }:
+
+buildGoPackage rec {
+  pname = "pgweb";
+  version = "0.11.7";
+
+  src = fetchFromGitHub {
+    owner = "sosedoff";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1df3vixxca80i040apbim80nqni94q882ykn3cglyccyl0iz59ix";
+  };
+
+  goPackagePath = "github.com/sosedoff/pgweb";
+
+  meta = with lib; {
+    description = "A web-based database browser for PostgreSQL";
+    longDescription = ''
+      A simple postgres browser that runs as a web server. You can view data,
+      run queries and examine tables and indexes.
+    '';
+    homepage = "https://sosedoff.github.io/pgweb/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ zupo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b0603007c41..e44b25615596 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13051,6 +13051,8 @@ in
 
   pgpkeyserver-lite = callPackage ../servers/web-apps/pgpkeyserver-lite {};
 
+  pgweb = callPackage ../development/tools/database/pgweb { };
+
   gpgstats = callPackage ../tools/security/gpgstats { };
 
   gpshell = callPackage ../development/tools/misc/gpshell { };

From 7d4a1d834894ec28b46f700394a82c1a18a737d5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Nov 2020 00:28:04 +0000
Subject: [PATCH 3346/3942] eternal-terminal: 6.0.11 -> 6.0.13

---
 pkgs/tools/networking/eternal-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 452a9873bece..fdad966c81b6 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "eternal-terminal";
-  version = "6.0.11";
+  version = "6.0.13";
 
   src = fetchFromGitHub {
     owner = "MisterTea";
     repo = "EternalTerminal";
     rev = "et-v${version}";
-    sha256 = "0yjf639ldfaxrw4pbg9avdkhhmcpnx58j3x70zskvgkajny8yqqr";
+    sha256 = "0sb1hypg2276y8c2a5vivrkcxp70swddvhnd9h273if3kv6j879r";
   };
 
   nativeBuildInputs = [ cmake ];

From 408236cd6a508f7f8990c247ada494cf0dcc82f3 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Fri, 20 Nov 2020 18:18:05 +0100
Subject: [PATCH 3347/3942] perldevel: 5.33.3 -> 5.33.4

dependencies:
perl-cross: 65e06e238ccb949e8399bdebc6d7fd798c34127b -> 6c115604fcbf01ceb3c6d7c13206a7590abf6c21
---
 pkgs/development/interpreters/perl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 77dc53cf8b32..ac41a63cef77 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -174,11 +174,11 @@ let
       priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
     };
   } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
-    crossVersion = "65e06e238ccb949e8399bdebc6d7fd798c34127b"; # Oct 21, 2020
+    crossVersion = "6c115604fcbf01ceb3c6d7c13206a7590abf6c21"; # Nov 22, 2020
 
     perl-cross-src = fetchurl {
       url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
-      sha256 = "1rk9kbvkj7cl3bvv6cph20f0hcb6y9ijgcd4rxj7aq98fxzvyhxx";
+      sha256 = "1xb3krm7m3f7lhq774pf48czyfa8378jahg1q0kkcz8alrl270w1";
     };
 
     depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@@ -214,7 +214,7 @@ in {
   perldevel = common {
     perl = pkgs.perldevel;
     buildPerl = buildPackages.perldevel;
-    version = "5.33.3";
-    sha256 = "1k9pyy8d3wx8cpp5ss7hjwf9sxgga5gd0x2nq3vnqblkxfna0jsg";
+    version = "5.33.4";
+    sha256 = "02r8d0wrwaj0vgqbbqidhqgck2xp5k9g49aslj9faqcmgpsj5kcz";
   };
 }

From d9dafe3b62336b1a18df7a8dbbecedee8d962963 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 23 Nov 2020 02:32:11 +0100
Subject: [PATCH 3348/3942] moarvm: 2020.10 -> 2020.11

---
 pkgs/development/interpreters/rakudo/moarvm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index a873bfd28f53..5cd0b50e6958 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "moarvm";
-  version = "2020.10";
+  version = "2020.11";
 
   src = fetchurl {
     url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
-    sha256 = "1i7jjjwv4av3rsfgbqb213fhb9ns25jfm19nzn7kki0n7w486y33";
+    sha256 = "1163zv1fglgwbk6pppzbjwcgzpp13ilg5cz7fawsfnzdnrrq40kd";
    };
 
   buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];

From e4977d49932d436c50b4f3bb0af5c703f57e5a3b Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 23 Nov 2020 02:32:29 +0100
Subject: [PATCH 3349/3942] nqp: 2020.10 -> 2020.11

---
 pkgs/development/interpreters/rakudo/nqp.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index e200b59b61c3..ad17808281fe 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nqp";
-  version = "2020.10";
+  version = "2020.11";
 
   src = fetchurl {
     url    = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
-    sha256 = "0nb0vdycz2wrd5yspvps2wy7a21066csr18v786085qim347830h";
+    sha256 = "03whmlc6bmwmwrddwd5vqmir0gzwnmf0apvl2q1na09qqj3zb1br";
   };
 
   buildInputs = [ perl ];

From f8e6583e6694747f39b7fb8441c5341e0755b71a Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 23 Nov 2020 02:32:48 +0100
Subject: [PATCH 3350/3942] rakudo: 2020.10 -> 2020.11

---
 pkgs/development/interpreters/rakudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index f06c51fce0d4..0d7707000418 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rakudo";
-  version = "2020.10";
+  version = "2020.11";
 
   src = fetchurl {
     url    = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
-    sha256 = "0wvsinmpz8icd0409f8rg93mqdb5ml76m0vb4r26ngz237ph69dn";
+    sha256 = "107sskgf0p6npm3vjpv5wrqgfa007af6bxxiv1wgiyzx7maqdw5n";
   };
 
   buildInputs = [ icu zlib gmp perl ];

From a9f8357e2e9a3a203243a2be924c374b700a77e0 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Mon, 23 Nov 2020 03:52:47 +0100
Subject: [PATCH 3351/3942] MIDIVisualizer: 5.1 -> 5.2 (#101006)

---
 pkgs/applications/audio/midi-visualizer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix
index c66771be1c9d..64c0cae7a648 100644
--- a/pkgs/applications/audio/midi-visualizer/default.nix
+++ b/pkgs/applications/audio/midi-visualizer/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "MIDIVisualizer";
-  version = "5.1";
+  version = "5.2";
 
   src = fetchFromGitHub {
     owner = "kosua20";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1fjlfa0qjpnjxl3bx5cq3dkswv9wihxmgfpkjijqp7kvf3q127rq";
+    sha256 = "19z8m6clirz8kwfjp0z1j69fjfna8ar7hkgqnlm3lrc84gyx2rpf";
   };
 
   nativeBuildInputs = [ cmake pkg-config makeWrapper];

From b61ca0219b28c07f2dd6d33f92ac9481f65ae8dd Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@gmail.com>
Date: Sun, 22 Nov 2020 23:16:23 -0500
Subject: [PATCH 3352/3942] ccache: 4.0 -> 4.1

---
 .../development/tools/misc/ccache/default.nix | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 3d1c21c25baf..f9254b2cf15e 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , substituteAll
 , binutils
 , asciidoc
@@ -14,33 +13,16 @@
 
 let ccache = stdenv.mkDerivation rec {
   pname = "ccache";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1frcplrv61m2iwc6jwycpbcz1101xl6s4sh8p87prdj98l60lyrx";
+    sha256 = "1az11q3wmr8wc7alx9l70wq9am41cm0y17g5gsaqmahws3dxfi8m";
   };
 
-  # TODO: Remove patches from upstream in next release
-  patches = [
-    # Fix badly named man page filename
-    (fetchpatch {
-      url = "https://github.com/ccache/ccache/commit/223e706fb24ce86eb0ad86079a97e6f345b9ef40.patch";
-      sha256 = "1h7amp3ka45a79zwlxh8qnzx6n371gnfpfgijcqljps7skhl5gjg";
-    })
-    # Build and install man page by default
-    (fetchpatch {
-      url = "https://github.com/ccache/ccache/commit/294ff2face26448afa68e3ef7b68bf4898d6dc77.patch";
-      sha256 = "0rx69qn41bgksc4m3p59nk5d6rz72rwnfska9mh5j62pzfm8axja";
-    })
-    # Fixes use of undeclared identifier 'CLONE_NOOWNERCOPY' on darwin
-    (fetchpatch {
-      url = "https://github.com/ccache/ccache/commit/411c010c3a5ee690cd42b23ffcf026ae009e2897.patch";
-      sha256 = "062s424d0d0psp6wjhmfnfn1s5dsrz403hdid5drm6l2san0jhq0";
-    })
-  ] ++ lib.optional stdenv.isDarwin (substituteAll {
+  patches = lib.optional stdenv.isDarwin (substituteAll {
     src = ./force-objdump-on-darwin.patch;
     objdump = "${binutils.bintools}/bin/objdump";
   });

From b2acf96e80752d91ed3d632132b36a67f6502ba6 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Tue, 10 Nov 2020 18:41:49 -0500
Subject: [PATCH 3353/3942] chars: init at 0.5.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ivar <41924494+IvarWithoutBones@users.noreply.github.com>
Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
---
 pkgs/tools/text/chars/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  4 ++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/text/chars/default.nix

diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix
new file mode 100644
index 000000000000..fa58d110550e
--- /dev/null
+++ b/pkgs/tools/text/chars/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "chars";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "antifuchs";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1pyda3b6svxzc98d7ggl7v9xd0xhilmpjrnajzh77zcwzq42s17l";
+  };
+
+  cargoSha256 = "1ampmw0l2wk2xp4q13aj5shxncqfh4dc3rsmpk2scaivanrsikn5";
+
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
+    description = "Commandline tool to display information about unicode characters";
+    homepage = "https://github.com/antifuchs/chars";
+    license = licenses.mit;
+    maintainers = with maintainers; [ bbigras ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65e7818736d3..1b328edaa8d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -955,6 +955,10 @@ in
 
   charm = callPackage ../applications/misc/charm { };
 
+  chars = callPackage ../tools/text/chars {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 
   ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };

From 8582f5dbc9b5cb4d70c099f7d6c9b45d5b9275cb Mon Sep 17 00:00:00 2001
From: Quentin Revel <qrevel@nottle.fr>
Date: Fri, 13 Nov 2020 16:44:16 +0100
Subject: [PATCH 3354/3942] awscli2: fix completion

Generate index file for shell completion

Fix #103709

See-also: https://github.com/Homebrew/homebrew-core/pull/57547/files
---
 pkgs/tools/admin/awscli2/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index 6a1c6d25983a..06e1487cfe94 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -69,6 +69,9 @@ with py.pkgs; buildPythonApplication rec {
   ];
 
   postInstall = ''
+    mkdir -p $out/${python3.sitePackages}/awscli/data
+    ${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index
+
     mkdir -p $out/share/bash-completion/completions
     echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli
 

From 74d0cdfd07bc2eb51700a69eea86b58a9093d06a Mon Sep 17 00:00:00 2001
From: Ilia Auerbach-Ziogas <ilia.auerbach.ziogas@gmail.com>
Date: Mon, 23 Nov 2020 00:00:05 -0500
Subject: [PATCH 3355/3942] dropbox: 83.4.152->111.3.447

---
 pkgs/applications/networking/dropbox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index b3655888e1d3..845d0f2779c2 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms;
 # Dropbox client to bootstrap installation.
 # The client is self-updating, so the actual version may be newer.
 let
-  version = "83.4.152";
+  version = "111.3.447";
 
   arch = {
     x86_64-linux = "x86_64";

From c476262dcd9109168c99f3de2e9e94504807c7c5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 22 Nov 2020 09:25:35 +0100
Subject: [PATCH 3356/3942] =?UTF-8?q?ocamlPackages.faraday:=200.7.0=20?=
 =?UTF-8?q?=E2=86=92=200.7.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/faraday/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix
index 0c3eb5459cb2..48a6a82a738c 100644
--- a/pkgs/development/ocaml-modules/faraday/default.nix
+++ b/pkgs/development/ocaml-modules/faraday/default.nix
@@ -2,7 +2,9 @@
 
 buildDunePackage rec {
   pname = "faraday";
-  version = "0.7.0";
+  version = "0.7.2";
+
+  useDune2 = true;
 
   minimumOCamlVersion = "4.02";
 
@@ -10,12 +12,12 @@ buildDunePackage rec {
     owner = "inhabitedtype";
     repo = pname;
     rev = version;
-    sha256 = "0z6ikwlqad91iac0q5z88p3wzq5k15y86ckzmhdq1aqwrcm14bq2";
+    sha256 = "0gdysszzk6b6npic4nhpdnz2nbq7rma6aml0rbn113bfh0rmb36x";
   };
 
-  checkInputs = lib.optional doCheck alcotest;
+  checkInputs = [ alcotest ];
   propagatedBuildInputs = [ bigstringaf ];
-  doCheck = lib.versions.majorMinor ocaml.version != "4.07";
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
 
   meta = {
     description = "Serialization library built for speed and memory efficiency";

From 3a6b2726c52d1c3329a5679ee222dc163db0af72 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Mon, 23 Nov 2020 05:20:38 +0000
Subject: [PATCH 3357/3942] codeowners: Add RaghavSood to blockchains

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3762b2eaf8f5..20668760d2d4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -213,7 +213,7 @@
 /doc/builders/images/dockertools.xml         @roberth
 
 # Blockchains
-/pkgs/applications/blockchains  @mmahut
+/pkgs/applications/blockchains  @mmahut @RaghavSood
 
 # Go
 /pkgs/development/compilers/go @kalbasit @Mic92 @zowoq

From f94ed4e9689dc84714889791ccee660be761b875 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 2 Oct 2020 22:25:16 +0200
Subject: [PATCH 3358/3942] luppp: 1.2.0 -> 1.2.1

drop upstreamed patch
---
 .../audio/luppp/build-install.patch           | 16 --------------
 pkgs/applications/audio/luppp/default.nix     | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/applications/audio/luppp/build-install.patch

diff --git a/pkgs/applications/audio/luppp/build-install.patch b/pkgs/applications/audio/luppp/build-install.patch
deleted file mode 100644
index 4dae65438cb5..000000000000
--- a/pkgs/applications/audio/luppp/build-install.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-commit 4ec09e6f6e00e40622a5207ed24dc657da9a9090
-Author: Pavol Rusnak <stick@gk2.sk>
-Date:   Tue Dec 4 12:06:22 2018 +0100
-
-    build: add install: true to executable in meson.build
-
-diff --git a/meson.build b/meson.build
-index 050e1b1..9224ed5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -39,4 +39,5 @@ endforeach
- 
- # compile the main project
- executable('luppp', luppp_src + [version_hxx],
-+    install: true,
-     dependencies: deps)
diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix
index c1494ffc3334..6cf2575b8e5f 100644
--- a/pkgs/applications/audio/luppp/default.nix
+++ b/pkgs/applications/audio/luppp/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub
+{ stdenv
+, fetchFromGitHub
 , meson
 , ninja
 , pkgconfig
@@ -12,26 +13,32 @@
 
 stdenv.mkDerivation rec {
   pname = "luppp";
-  version = "1.2.0";
-  patches = [ ./build-install.patch ];
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "openAVproductions";
     repo = "openAV-Luppp";
     rev = "release-${version}";
-    sha256 = "194yq0lqc2psq9vyxmzif40ccawcvd9jndcn18mkz4f8h5w5rc1a";
+    sha256 = "1ncbn099fyfnr7jw2bp3wf2g9k738lw53m6ssw6wji2wxwmghv78";
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig
+    meson
+    ninja
+    pkgconfig
   ];
 
   buildInputs = [
-    jack2 cairo liblo libsndfile libsamplerate ntk
+    jack2
+    cairo
+    liblo
+    libsndfile
+    libsamplerate
+    ntk
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://openavproductions.com/luppp/";
+    homepage = "http://openavproductions.com/luppp/";  # https does not work
     description = "A music creation tool, intended for live use";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ prusnak ];

From 8eea9bd9238734592b824cb68053a871f21597ee Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 3 Oct 2020 22:19:33 +0200
Subject: [PATCH 3359/3942] pioneers: 15.4 -> 15.6

---
 pkgs/games/pioneers/default.nix | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix
index a3a80d896c15..882303ab0232 100644
--- a/pkgs/games/pioneers/default.nix
+++ b/pkgs/games/pioneers/default.nix
@@ -1,20 +1,30 @@
-{stdenv, fetchurl, gtk3, pkgconfig, intltool } :
+{ stdenv
+, fetchurl
+, pkg-config
+, intltool
+, itstool
+, gtk3
+, libxml2
+}:
 
 stdenv.mkDerivation rec {
-  name = "pioneers-15.4";
+  pname = "pioneers";
+  version = "15.6";
+
   src = fetchurl {
-    url = "mirror://sourceforge/pio/${name}.tar.gz";
-    sha256 = "1p1d18hrfmqcnghip3shkzcs5qkz6j99jvkdkqfi7pqdvjc323cs";
+    url = "mirror://sourceforge/pio/${pname}-${version}.tar.gz";
+    sha256 = "07b3xdd81n8ybsb4fzc5lx0813y9crzp1hj69khncf4faj48sdcs";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
-  buildInputs = [ gtk3 ];
+  nativeBuildInputs = [ pkg-config intltool itstool ];
 
-  meta = {
-    homepage = "http://pio.sourceforge.net/";
-    license = stdenv.lib.licenses.gpl2Plus;
+  buildInputs = [ gtk3 libxml2 ];
+
+  meta = with stdenv.lib; {
     description = "Addicting game based on The Settlers of Catan";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    homepage = "http://pio.sourceforge.net/";  # https does not work
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ viric ];
+    platforms = platforms.linux;
   };
 }

From aca97840da9a85ddf65ea33fa778a35d8d88bb4b Mon Sep 17 00:00:00 2001
From: Jan Solanti <jhs@psonet.com>
Date: Sun, 22 Nov 2020 04:42:02 +0200
Subject: [PATCH 3360/3942] pipewire: 0.3.15 -> 0.3.16

This release replaces the libpulseaudio shim with a pipewire module that acts as a fake pulseaudio server along with a systemd service that loads that module on demand.
---
 nixos/modules/services/desktops/pipewire.nix  | 19 +++++++--------
 .../libraries/pipewire/default.nix            | 24 +++++++------------
 .../pipewire/pipewire-pulse-path.patch        | 24 +++++++++++++++++++
 3 files changed, 41 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/libraries/pipewire/pipewire-pulse-path.patch

diff --git a/nixos/modules/services/desktops/pipewire.nix b/nixos/modules/services/desktops/pipewire.nix
index 5179cbaf6bc2..c4923cfd3f00 100644
--- a/nixos/modules/services/desktops/pipewire.nix
+++ b/nixos/modules/services/desktops/pipewire.nix
@@ -17,10 +17,6 @@ let
     mkdir -p "$out/lib"
     ln -s "${pkgs.pipewire.jack}/lib" "$out/lib/pipewire"
   '';
-  pulse-libs = pkgs.runCommand "pulse-libs" {} ''
-    mkdir -p "$out/lib"
-    ln -s "${pkgs.pipewire.pulse}/lib" "$out/lib/pipewire"
-  '';
 in {
 
   meta = {
@@ -50,7 +46,7 @@ in {
       };
 
       pulse = {
-        enable = mkEnableOption "PulseAudio emulation";
+        enable = mkEnableOption "PulseAudio server emulation";
       };
     };
   };
@@ -61,23 +57,24 @@ in {
     assertions = [
       {
         assertion = cfg.pulse.enable -> !config.hardware.pulseaudio.enable;
-        message = "PipeWire based PulseAudio emulation doesn't use the PulseAudio service";
+        message = "PipeWire based PulseAudio server emulation replaces PulseAudio";
       }
       {
         assertion = cfg.jack.enable -> !config.services.jack.jackd.enable;
-        message = "PIpeWire based JACK emulation doesn't use the JACK service";
+        message = "PipeWire based JACK emulation doesn't use the JACK service";
       }
     ];
 
     environment.systemPackages = [ pkgs.pipewire ]
-                                 ++ lib.optional cfg.jack.enable jack-libs
-                                 ++ lib.optional cfg.pulse.enable pulse-libs;
+                                 ++ lib.optional cfg.jack.enable jack-libs;
 
-    systemd.packages = [ pkgs.pipewire ];
+    systemd.packages = [ pkgs.pipewire ]
+                       ++ lib.optional cfg.pulse.enable pkgs.pipewire.pulse;
 
     # PipeWire depends on DBUS but doesn't list it. Without this booting
     # into a terminal results in the service crashing with an error.
     systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ];
+    systemd.user.sockets.pipewire-pulse.wantedBy = lib.mkIf (cfg.socketActivation && cfg.pulse.enable) ["sockets.target"];
     systemd.user.services.pipewire.bindsTo = [ "dbus.service" ];
     services.udev.packages = [ pkgs.pipewire ];
 
@@ -100,6 +97,6 @@ in {
       source = "${pkgs.pipewire}/share/alsa/alsa.conf.d/50-pipewire.conf";
     };
     environment.sessionVariables.LD_LIBRARY_PATH =
-      lib.optional (cfg.jack.enable || cfg.pulse.enable) "/run/current-system/sw/lib/pipewire";
+      lib.optional cfg.jack.enable "/run/current-system/sw/lib/pipewire";
   };
 }
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index c4b766b70930..f03f9ea88f40 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -19,7 +19,6 @@
 , libsndfile
 , vulkan-headers
 , vulkan-loader
-, libpulseaudio
 , makeFontsConf
 , callPackage
 , nixosTests
@@ -40,7 +39,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "pipewire";
-  version = "0.3.15";
+  version = "0.3.16";
 
   outputs = [
     "out"
@@ -57,7 +56,7 @@ stdenv.mkDerivation rec {
     owner = "pipewire";
     repo = "pipewire";
     rev = version;
-    sha256 = "1lmsn13pbr0cigb5ri9nd3102ffbaf8nsz5c8aawf6lsz7mhkx9x";
+    sha256 = "0ivfx3rbg2iwjdh412zjpk9y5mzw7zh6asv4sji8lq0dzhwbz1qc";
   };
 
   patches = [
@@ -65,11 +64,8 @@ stdenv.mkDerivation rec {
     ./alsa-profiles-use-libdir.patch
     # Move installed tests into their own output.
     ./installed-tests-path.patch
-    # Fix older clients (e.g. Chrome/Chromium):
-    (fetchpatch { # protocol-native: do version check on HELLO
-      url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b8c7b36d3b8be16593f554964cf2f852c21b5c2c.patch";
-      sha256 = "18461grisrgqbad6bfa1bm17mslddgfmjfprc9vjvab2mmpsjss9";
-    })
+    # Change the path of the pipewire-pulse binary in the service definition.
+    ./pipewire-pulse-path.patch
   ];
 
   nativeBuildInputs = [
@@ -78,7 +74,6 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkgconfig
-    removeReferencesTo
   ];
 
   buildInputs = [
@@ -86,7 +81,6 @@ stdenv.mkDerivation rec {
     dbus
     glib
     libjack2
-    libpulseaudio
     libsndfile
     udev
     vulkan-headers
@@ -104,7 +98,7 @@ stdenv.mkDerivation rec {
     "-Dudevrulesdir=lib/udev/rules.d"
     "-Dinstalled_tests=true"
     "-Dinstalled_test_prefix=${placeholder "installedTests"}"
-    "-Dlibpulse-path=${placeholder "pulse"}/lib"
+    "-Dpipewire_pulse_prefix=${placeholder "pulse"}"
     "-Dlibjack-path=${placeholder "jack"}/lib"
     "-Dgstreamer=${mesonBool gstreamerSupport}"
     "-Dffmpeg=${mesonBool ffmpegSupport}"
@@ -118,10 +112,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  # Pulseaudio asserts lead to dev references.
-  # TODO This should be fixed in the pulseaudio sources instead.
-  preFixup = ''
-    remove-references-to -t ${libpulseaudio.dev} "$(readlink -f $pulse/lib/libpulse.so)"
+  postInstall = ''
+    moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse"
+    moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse"
+    moveToOutput "bin/pipewire-pulse" "$pulse"
   '';
 
   passthru.tests = {
diff --git a/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch b/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch
new file mode 100644
index 000000000000..6ac86b111eef
--- /dev/null
+++ b/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch
@@ -0,0 +1,24 @@
+diff --git a/meson_options.txt b/meson_options.txt
+index 4b9e46b8..9d73ed06 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -147,3 +147,6 @@ option('pw-cat',
+ option('udevrulesdir',
+        type : 'string',
+        description : 'Directory for udev rules (defaults to /lib/udev/rules.d)')
++option('pipewire_pulse_prefix',
++       type : 'string',
++       description : 'Install directory for the pipewire-pulse daemon')
+diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
+index 29fc93d4..f78946f2 100644
+--- a/src/daemon/systemd/user/meson.build
++++ b/src/daemon/systemd/user/meson.build
+@@ -6,7 +6,7 @@ install_data(
+ 
+ systemd_config = configuration_data()
+ systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))
+-systemd_config.set('PW_PULSE_BINARY', join_paths(pipewire_bindir, 'pipewire-pulse'))
++systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse'))
+ 
+ configure_file(input : 'pipewire.service.in',
+                output : 'pipewire.service',

From 9ecc70c5f8e5a105ec0f354837e9f5bdff0e44a3 Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Mon, 23 Nov 2020 08:41:42 +0000
Subject: [PATCH 3361/3942] xteddy: fix src

---
 pkgs/applications/misc/xteddy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/applications/misc/xteddy/default.nix
index 856ddb8ff50c..34ec17b0b9a5 100644
--- a/pkgs/applications/misc/xteddy/default.nix
+++ b/pkgs/applications/misc/xteddy/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "games-team";
-    repo = "xteddy";
-    rev = "debian%2F${version}"; # %2F = urlquote("/");
+    repo = pname;
+    rev = "debian/${version}";
     sha256 = "0rm7w78d6qajq4fvi4agyqm0c70f3c1i0cy2jdb6kqql2k8w78qy";
   };
 

From e346aa39086424a65fdad9d761b1e3d8bea00e9d Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 23 Nov 2020 09:13:33 +0000
Subject: [PATCH 3362/3942] trivy: 0.12.0 -> 0.13.0

---
 pkgs/tools/admin/trivy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix
index 7af02e567c3d..df3aa7bd945e 100644
--- a/pkgs/tools/admin/trivy/default.nix
+++ b/pkgs/tools/admin/trivy/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "trivy";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0vgir7sc14lb0wqwr786sq77pda6rw7svwr6hxklckkn20d9z7z0";
+    sha256 = "0d9lb1wzvxywg88fy85bicixd8wipvbhnwfckwl3p8shh0s9sr22";
   };
 
-  vendorSha256 = "0k6n73im14gaayl8rday2fhhizsv3klza146gx0dqm0694rqph0r";
+  vendorSha256 = "0sashi3x3hccqm27dg6hjlvpgvx42jdxpgzigzm81md58zhk509x";
 
   subPackages = [ "cmd/trivy" ];
 

From 03760ab82efff292a790876fd73a4c4904a2cf92 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sun, 22 Nov 2020 15:26:08 +0300
Subject: [PATCH 3363/3942] nixos/samba-wsdd: init service samba-wsdd

---
 nixos/doc/manual/release-notes/rl-2103.xml    |   5 +
 nixos/modules/module-list.nix                 |   1 +
 .../network-filesystems/samba-wsdd.nix        | 124 ++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100644 nixos/modules/services/network-filesystems/samba-wsdd.nix

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 55c1229a164d..a77a60c46c20 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -56,6 +56,11 @@
        section of the NixOS manual</link> for more information.
      </para>
    </listitem>
+   <listitem>
+     <para>
+       <xref linkend="opt-services.samba-wsdd.enable" /> Web Services Dynamic Discovery host daemon
+     </para>
+   </listitem>
   </itemizedlist>
 
  </section>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0a38fa317305..214d9356aa6a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -583,6 +583,7 @@
   ./services/network-filesystems/orangefs/client.nix
   ./services/network-filesystems/rsyncd.nix
   ./services/network-filesystems/samba.nix
+  ./services/network-filesystems/samba-wsdd.nix
   ./services/network-filesystems/tahoe.nix
   ./services/network-filesystems/diod.nix
   ./services/network-filesystems/u9fs.nix
diff --git a/nixos/modules/services/network-filesystems/samba-wsdd.nix b/nixos/modules/services/network-filesystems/samba-wsdd.nix
new file mode 100644
index 000000000000..004d07064afd
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/samba-wsdd.nix
@@ -0,0 +1,124 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.samba-wsdd;
+
+in {
+  options = {
+    services.samba-wsdd = {
+      enable = mkEnableOption ''
+        Enable Web Services Dynamic Discovery host daemon. This enables (Samba) hosts, like your local NAS device,
+        to be found by Web Service Discovery Clients like Windows.
+        <note>
+          <para>If you use the firewall consider adding the following:</para>
+          <programlisting>
+            networking.firewall.allowedTCPPorts = [ 5357 ];
+            networking.firewall.allowedUDPPorts = [ 3702 ];
+          </programlisting>
+        </note>
+      '';
+      interface = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "eth0";
+        description = "Interface or address to use.";
+      };
+      hoplimit = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        example = 2;
+        description = "Hop limit for multicast packets (default = 1).";
+      };
+      workgroup = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "HOME";
+        description = "Set workgroup name (default WORKGROUP).";
+      };
+      hostname = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "FILESERVER";
+        description = "Override (NetBIOS) hostname to be used (default hostname).";
+      };
+      domain = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "Set domain name (disables workgroup).";
+      };
+      discovery = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable discovery operation mode.";
+      };
+      listen = mkOption {
+        type = types.str;
+        default = "/run/wsdd/wsdd.sock";
+        description = "Listen on path or localhost port in discovery mode.";
+      };
+      extraOptions = mkOption {
+        type = types.listOf types.str;
+        default = [ "--shortlog" ];
+        example = [ "--verbose" "--no-http" "--ipv4only" "--no-host" ];
+        description = "Additional wsdd options.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.wsdd ];
+
+    systemd.services.samba-wsdd = {
+      description = "Web Services Dynamic Discovery host daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        DynamicUser = true;
+        Type = "simple";
+        ExecStart = ''
+          ${pkgs.wsdd}/bin/wsdd ${optionalString (cfg.interface != null) "--interface '${cfg.interface}'"} \
+                                ${optionalString (cfg.hoplimit != null) "--hoplimit '${toString cfg.hoplimit}'"} \
+                                ${optionalString (cfg.workgroup != null) "--workgroup '${cfg.workgroup}'"} \
+                                ${optionalString (cfg.hostname != null) "--hostname '${cfg.hostname}'"} \
+                                ${optionalString (cfg.domain != null) "--domain '${cfg.domain}'"} \
+                                ${optionalString cfg.discovery "--discovery --listen '${cfg.listen}'"} \
+                                ${escapeShellArgs cfg.extraOptions}
+        '';
+        # Runtime directory and mode
+        RuntimeDirectory = "wsdd";
+        RuntimeDirectoryMode = "0750";
+        # Access write directories
+        UMask = "0027";
+        # Capabilities
+        CapabilityBoundingSet = "";
+        # Security
+        NoNewPrivileges = true;
+        # Sandboxing
+        ProtectSystem = "strict";
+        ProtectHome = true;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        PrivateUsers = false;
+        ProtectHostname = true;
+        ProtectClock = true;
+        ProtectKernelTunables = true;
+        ProtectKernelModules = true;
+        ProtectKernelLogs = true;
+        ProtectControlGroups = true;
+        RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
+        RestrictNamespaces = true;
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        PrivateMounts = true;
+        # System Call Filtering
+        SystemCallArchitectures = "native";
+        SystemCallFilter = "~@clock @cpu-emulation @debug @module @mount @obsolete @privileged @raw-io @reboot @resources @swap";
+      };
+    };
+  };
+}

From f85ea6e08d003365ccef0c302bc46e81112e02e9 Mon Sep 17 00:00:00 2001
From: Matej Urbas <matej.urbas@gmail.com>
Date: Sat, 21 Nov 2020 22:47:24 +0000
Subject: [PATCH 3364/3942] python3Packages.coapthon3: init at 1.0.1

---
 .../python-modules/coapthon3/default.nix      | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/coapthon3/default.nix

diff --git a/pkgs/development/python-modules/coapthon3/default.nix b/pkgs/development/python-modules/coapthon3/default.nix
new file mode 100644
index 000000000000..fbca43e4e715
--- /dev/null
+++ b/pkgs/development/python-modules/coapthon3/default.nix
@@ -0,0 +1,20 @@
+{ buildPythonPackage, cachetools, fetchPypi, lib }:
+
+buildPythonPackage rec {
+  pname = "CoAPthon3";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1w6bwwd3qjp4b4fscagqg9wqxpdgvf4sxgzbk2d2rjqwlkyr1lnx";
+  };
+
+  propagatedBuildInputs = [ cachetools ];
+
+  meta = with lib; {
+    description = "Python3 library to the CoAP protocol compliant with the RFC.";
+    homepage = "https://github.com/Tanganelli/${pname}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ urbas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4fef3c3946fc..09f1105d9796 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1254,6 +1254,8 @@ in {
 
   cnvkit = callPackage ../development/python-modules/cnvkit { };
 
+  coapthon3 = callPackage ../development/python-modules/coapthon3 { };
+
   coconut = callPackage ../development/python-modules/coconut { };
 
   cocotb = callPackage ../development/python-modules/cocotb { };

From b10d7f3bb3cf5587ed538215c238b1c79c5110ec Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 19 Nov 2020 22:33:37 +0100
Subject: [PATCH 3365/3942] bottom: 0.4.7 -> 0.5.1

---
 pkgs/tools/system/bottom/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix
index 498ab1136fa4..ac03bd4119fd 100644
--- a/pkgs/tools/system/bottom/default.nix
+++ b/pkgs/tools/system/bottom/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bottom";
-  version = "0.4.7";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "ClementTsang";
     repo = pname;
     rev = version;
-    sha256 = "rDcJ5XF7L13MKZ8/J4sYD+UqC+HkZvxRtDkY9IVLH50=";
+    sha256 = "0bw83l3s7yraxiwbwcm0nfqqhv2dkd208qz7nm89whzdjzf340gj";
   };
 
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
 
-  cargoSha256 = "XeX6QM0a628mcaptNZkKAvDnGfW5tx+aWNBpMyjz44M=";
+  cargoSha256 = "11ywms0vgrm4ildsgl99agjimk5f3l56hlr5aa70kagxam4k6vmn";
 
   doCheck = false;
 

From 8579a8cbd1a3836754684333e66ad12be0e958ae Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 23 Nov 2020 11:48:56 +0100
Subject: [PATCH 3366/3942] mamba: 1.7 -> 1.8

---
 pkgs/applications/audio/mamba/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix
index b8c5fe13a3f4..dc8620fdd4e1 100644
--- a/pkgs/applications/audio/mamba/default.nix
+++ b/pkgs/applications/audio/mamba/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mamba";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchFromGitHub {
     owner = "brummer10";
     repo = "Mamba";
     rev = "v${version}";
-    sha256 = "1i78snpyxap2r4899967nyfr8hg20k45nsbshs9h6hdxbfwhikbc";
+    sha256 = "049gvdvvv3hkh1b47h0bia02g1p71agwh6g7q0n4yxz4d81b8kha";
     fetchSubmodules = true;
   };
 

From d17400d335689b765b53ab79509a402343dd261f Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 23 Nov 2020 12:38:23 +0100
Subject: [PATCH 3367/3942] perlPackages.IOAIO: init at 4.72

---
 pkgs/top-level/perl-packages.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e81149f88649..bf3e7d3ac3ca 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9941,6 +9941,25 @@ let
     };
   };
 
+  IOAIO = buildPerlPackage {
+    pname = "IO-AIO";
+    version = "4.72";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/ML/MLEHMANN/IO-AIO-4.72.tar.gz";
+      sha256 = "17vfbqagpab8lsbf5nmp2frvxw7hvsyy2i87dpid8djzr615wnvf";
+    };
+    buildInputs = [ CanaryStability ];
+    propagatedBuildInputs = [ commonsense ];
+    nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
+    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      shortenPerlShebang $out/bin/treescan
+    '';
+    meta = {
+      description = "Asynchronous/Advanced Input/Output";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   IOAll = buildPerlPackage {
     pname = "IO-All";
     version = "0.87";

From a9f18c5783106ade605f8b5b2c87167f372c9914 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 23 Nov 2020 12:38:42 +0100
Subject: [PATCH 3368/3942] perlPackages.AnyEventAIO: init at 1.1

---
 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 bf3e7d3ac3ca..7df0d7add393 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -332,6 +332,20 @@ let
     };
   };
 
+  AnyEventAIO = buildPerlPackage {
+    pname ="AnyEvent-AIO";
+    version = "1.1";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-AIO-1.1.tar.gz";
+      sha256 = "0svh0mlp17g0ypq8bgs3h3axg8v7h0z45hryacgn6q8mcj65n43b";
+    };
+    propagatedBuildInputs = [ AnyEvent IOAIO ];
+    meta = {
+      description = "Truly asynchronous file and directory I/O";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   AnyEventCacheDNS = buildPerlModule {
     pname = "AnyEvent-CacheDNS";
     version = "0.08";

From 2fd0efd7cbe703c95954cea8c89ce91497f65e0d Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Mon, 23 Nov 2020 20:41:06 +0800
Subject: [PATCH 3369/3942] osu-lazer: 2020.1017.0 -> 2020.1121.0

---
 pkgs/games/osu-lazer/default.nix |   4 +-
 pkgs/games/osu-lazer/deps.nix    | 177 ++++++++++++++++++++++++++-----
 2 files changed, 153 insertions(+), 28 deletions(-)

diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index 9cd6475d1274..88f0c6abfc56 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -13,13 +13,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "osu-lazer";
-  version = "2020.1017.0";
+  version = "2020.1121.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     rev = version;
-    sha256 = "0sz3l8cxi9vlryjd7cb86dh3gcanim2pvhag3cg5sslqzrrinp2v";
+    sha256 = "54AP3NZv5Nov3CAJoxn5E5tO9HhtlEY36x8OHAV8YVE=";
   };
 
   patches = [ ./bypass-tamper-detection.patch ];
diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix
index eb9fa617d5be..42e5969dfc4a 100644
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/games/osu-lazer/deps.nix
@@ -281,8 +281,53 @@
   })
   (fetchNuGet {
     name = "Markdig";
-    version = "0.21.1";
-    sha256 = "119v22rvg51ifg54r1ndf2bw7hv1lf5wn3cd04ccg8d7r8c0yhbk";
+    version = "0.22.0";
+    sha256 = "0k7v4xlhfgyca8bb1g85062m22skmk6ay0hcyqlpi2cnvy7f61qf";
+  })
+  (fetchNuGet {
+    name = "Microsoft.AspNetCore.Connections.Abstractions";
+    version = "3.1.9";
+    sha256 = "0vsnc87fqh61mjl2zgv7nfx6wkrg055cq12ql6cxmcawv6qsl0lw";
+  })
+  (fetchNuGet {
+    name = "Microsoft.AspNetCore.Http.Connections.Client";
+    version = "3.1.9";
+    sha256 = "1m5w8pmm4bn7w1ml2xcs43kfr2hkicch46zr616ml8j6fsks6wmw";
+  })
+  (fetchNuGet {
+    name = "Microsoft.AspNetCore.Http.Connections.Common";
+    version = "3.1.9";
+    sha256 = "0ppzxfgnhn0jpn0rg72gcwb0hcjk1qbzpzk9aiykp8vnfvqlmb20";
+  })
+  (fetchNuGet {
+    name = "Microsoft.AspNetCore.Http.Features";
+    version = "3.1.9";
+    sha256 = "0xg0psas8k38yfd72q7m5sm00yyxj51j1fqg473za2kxf8z4p2wx";
+  })
+  (fetchNuGet {
+    name = "Microsoft.AspNetCore.SignalR.Client";
+    version = "3.1.9";
+    sha256 = "1yn5y3b51jcpw7szj3pfz79hk84kmypy465cm22khh5z34wy41jx";
+  })
+  (fetchNuGet {
+    name = "Microsoft.AspNetCore.SignalR.Client.Core";
+    version = "3.1.9";
+    sha256 = "0ld7hch240z7zc7ckrppd4yrwwdhx3nbc8fgf4qql8ld8bih223y";
+  })
+  (fetchNuGet {
+    name = "Microsoft.AspNetCore.SignalR.Common";
+    version = "3.1.9";
+    sha256 = "1kvp8y3fnhvfm7fpg1qsymwzch7jcfc9337zybwryfyzxjxq7aaj";
+  })
+  (fetchNuGet {
+    name = "Microsoft.AspNetCore.SignalR.Protocols.Json";
+    version = "3.1.9";
+    sha256 = "1gp6wjidhbbpibnam2fimm3pc5p70wv17zhis5qf6an49xvlmmmb";
+  })
+  (fetchNuGet {
+    name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson";
+    version = "3.1.9";
+    sha256 = "1hdmsfk5ymp2vi4saxiw19j83ykvz5jzv0f4060cgc8bafndakrr";
   })
   (fetchNuGet {
     name = "Microsoft.Bcl.AsyncInterfaces";
@@ -306,8 +351,8 @@
   })
   (fetchNuGet {
     name = "Microsoft.CodeAnalysis.BannedApiAnalyzers";
-    version = "3.3.0";
-    sha256 = "04z03ir9sal5h9ha97isbh660jijslb8zfiaa48w2r2l6pabz5kd";
+    version = "3.3.1";
+    sha256 = "0xh23x91xg8qwfam70wsn039sn5li0pkay36lds9dl15p1vbfasm";
   })
   (fetchNuGet {
     name = "Microsoft.CodeAnalysis.Common";
@@ -326,13 +371,13 @@
   })
   (fetchNuGet {
     name = "Microsoft.CodeAnalysis.FxCopAnalyzers";
-    version = "3.0.0";
-    sha256 = "0a17vb6jnj6kch70d7vki84728hlc3zpffsbv533yji6kf6x6d24";
+    version = "3.3.1";
+    sha256 = "0wkrxymb9si2v0rzqnr8mdi89fi7swd1vbbclccjp8645ha1nif0";
   })
   (fetchNuGet {
     name = "Microsoft.CodeAnalysis.VersionCheckAnalyzer";
-    version = "3.0.0";
-    sha256 = "11g3hj3p885zj7bn99qzh68m1xifbwzrgmx1pkvpi10rmgkpyh8j";
+    version = "3.3.1";
+    sha256 = "010fadvngp21yz1b4vk0bbx79p5yr6nji19w56ma9zp1hj7fn2y1";
   })
   (fetchNuGet {
     name = "Microsoft.CodeAnalysis.Workspaces.Common";
@@ -346,8 +391,8 @@
   })
   (fetchNuGet {
     name = "Microsoft.CodeQuality.Analyzers";
-    version = "3.0.0";
-    sha256 = "1x3yf21m41w2iv9nlwp03q6byqgivd48h2dlm5vgv5bd53xjfz77";
+    version = "3.3.1";
+    sha256 = "1ng91xf3shjl74xvckygh9aqccwqapia46gilddkb5kiqj847bik";
   })
   (fetchNuGet {
     name = "Microsoft.CSharp";
@@ -371,8 +416,8 @@
   })
   (fetchNuGet {
     name = "Microsoft.Diagnostics.Runtime";
-    version = "2.0.145301";
-    sha256 = "02gzyal13ilqdxzzdzdavw85xk4z8zp88waanr7b72zxhm0fzfj9";
+    version = "2.0.151903";
+    sha256 = "1y7hsgzjs6b3323fcq5km515knykfgvdx4x8l1g03sy5h3lwwhak";
   })
   (fetchNuGet {
     name = "Microsoft.DotNet.PlatformAbstractions";
@@ -429,26 +474,51 @@
     version = "2.2.0";
     sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl";
   })
+  (fetchNuGet {
+    name = "Microsoft.Extensions.Configuration";
+    version = "3.1.9";
+    sha256 = "01ci8nhv3ki93aa7a3vh9icl3jav7ikizq43kcgdjgsssi6xvdf9";
+  })
   (fetchNuGet {
     name = "Microsoft.Extensions.Configuration.Abstractions";
     version = "2.2.0";
     sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674";
   })
+  (fetchNuGet {
+    name = "Microsoft.Extensions.Configuration.Abstractions";
+    version = "3.1.9";
+    sha256 = "0skilj4gfzyn05mn74w2q4jp1ww2wwbsxw2i7v8bwk73nymsqpr8";
+  })
   (fetchNuGet {
     name = "Microsoft.Extensions.Configuration.Binder";
     version = "2.2.0";
     sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j";
   })
+  (fetchNuGet {
+    name = "Microsoft.Extensions.Configuration.Binder";
+    version = "3.1.9";
+    sha256 = "1n8fndd9vrd3d7041p42li8v129mgl3gi8sl1x8whhycy0ahqr78";
+  })
   (fetchNuGet {
     name = "Microsoft.Extensions.DependencyInjection";
     version = "2.2.0";
     sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck";
   })
+  (fetchNuGet {
+    name = "Microsoft.Extensions.DependencyInjection";
+    version = "3.1.9";
+    sha256 = "1ifjjzwfvd5igxaaxm124qv8afs1nb06rgdqy7l3jcfqr30xykbb";
+  })
   (fetchNuGet {
     name = "Microsoft.Extensions.DependencyInjection.Abstractions";
     version = "2.2.0";
     sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5";
   })
+  (fetchNuGet {
+    name = "Microsoft.Extensions.DependencyInjection.Abstractions";
+    version = "3.1.9";
+    sha256 = "1l7ng71y18fwdlyq2ycl12hmv9wrf7k7knz2jwv9w9w7spmp8jv6";
+  })
   (fetchNuGet {
     name = "Microsoft.Extensions.DependencyModel";
     version = "2.1.0";
@@ -459,26 +529,46 @@
     version = "2.2.0";
     sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm";
   })
+  (fetchNuGet {
+    name = "Microsoft.Extensions.Logging";
+    version = "3.1.9";
+    sha256 = "1x1bbkcq7ph9jgwv3yidipfqwdh6q3bsa2rxhfzmy64l7hc7r1wl";
+  })
   (fetchNuGet {
     name = "Microsoft.Extensions.Logging.Abstractions";
     version = "2.2.0";
     sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl";
   })
+  (fetchNuGet {
+    name = "Microsoft.Extensions.Logging.Abstractions";
+    version = "3.1.9";
+    sha256 = "1i24mz3v677bmdysxklm9a3qc87j72lpkfp0l16gh6yqpmhwg7vp";
+  })
   (fetchNuGet {
     name = "Microsoft.Extensions.ObjectPool";
-    version = "3.1.8";
-    sha256 = "00il5z4pwysii0di9lxx7a2hc9ca64rrvw3zvzfi4wgf05xm66ff";
+    version = "3.1.9";
+    sha256 = "1gq1i7rb50dzj9hp07q0w9siyqy3hl0zqpk8na37s4jq6ikb5q82";
   })
   (fetchNuGet {
     name = "Microsoft.Extensions.Options";
     version = "2.2.0";
     sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0";
   })
+  (fetchNuGet {
+    name = "Microsoft.Extensions.Options";
+    version = "3.1.9";
+    sha256 = "0rpix172cmwwbddh4gm0647x1ql0ly5n68bpz71v915j97anwg90";
+  })
   (fetchNuGet {
     name = "Microsoft.Extensions.Primitives";
     version = "2.2.0";
     sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c";
   })
+  (fetchNuGet {
+    name = "Microsoft.Extensions.Primitives";
+    version = "3.1.9";
+    sha256 = "0538fvjz9c27nvc6kv83b0912qvc71wz2w60svl0mscj86ds49wc";
+  })
   (fetchNuGet {
     name = "Microsoft.Net.Compilers.Toolset";
     version = "3.1.0";
@@ -486,8 +576,8 @@
   })
   (fetchNuGet {
     name = "Microsoft.NetCore.Analyzers";
-    version = "3.0.0";
-    sha256 = "0b8biyw7nymqfbg08g2vmpf1xm6g1mm6hz4gjxc5f3g72kd2nswj";
+    version = "3.3.1";
+    sha256 = "16cx0x5hcjs2ml5zjalfsp7n3rfyz75ihnvh1p10z96yaz43gdwn";
   })
   (fetchNuGet {
     name = "Microsoft.NETCore.Platforms";
@@ -526,8 +616,8 @@
   })
   (fetchNuGet {
     name = "Microsoft.NetFramework.Analyzers";
-    version = "3.0.0";
-    sha256 = "09dqizym3bca4281714yxrhhgryxpjhjfjnyfswlhyh42qi3ix2k";
+    version = "3.3.1";
+    sha256 = "06vjmjmqhrmfc57ndsc8jaybc8np06s797nhg40bf44603bx6159";
   })
   (fetchNuGet {
     name = "Microsoft.Win32.Primitives";
@@ -586,8 +676,8 @@
   })
   (fetchNuGet {
     name = "ppy.osu.Framework";
-    version = "2020.1009.0";
-    sha256 = "0mqx9wjp639k56f0cjlrk67mq7c4h4vlglvss93dnvbb20ljn54r";
+    version = "2020.1120.0";
+    sha256 = "13vm6qly09f9b9bnf8r4wkypbxz673x852fjllj33sz55qh6957m";
   })
   (fetchNuGet {
     name = "ppy.osu.Framework.NativeLibs";
@@ -596,8 +686,8 @@
   })
   (fetchNuGet {
     name = "ppy.osu.Game.Resources";
-    version = "2020.1016.0";
-    sha256 = "1zsqmmlxbb2ncrlvha33cz0inbd6ijbcvxn0y0cysfkg7zb9iisy";
+    version = "2020.1030.0";
+    sha256 = "1sxip1m5y7c5jblf9br8f0i5yhv0qjpidv9w6bbdxiy29mfwnz6d";
   })
   (fetchNuGet {
     name = "ppy.osuTK.NS20";
@@ -606,8 +696,8 @@
   })
   (fetchNuGet {
     name = "ppy.SDL2-CS";
-    version = "1.0.15";
-    sha256 = "0qld7sp7y7hwwxsdxc8m17nyb2zwfxym63j50icvf0rlawmrl7ca";
+    version = "1.0.40";
+    sha256 = "1pvc154nqdbhn0rm6id0710yh72wvd2s5xmqxx3935h1jxrjgk8s";
   })
   (fetchNuGet {
     name = "ppy.squirrel.windows";
@@ -796,8 +886,8 @@
   })
   (fetchNuGet {
     name = "StbiSharp";
-    version = "1.0.12";
-    sha256 = "044lyc6522s8q4kgvly0rsxghkiv4dwzycl2ibxf7q5dvws02qvp";
+    version = "1.0.13";
+    sha256 = "0yaspwlh4x93d7xnqj5w5pxlwzlv9lixvksyvdh176krfa4mjw3q";
   })
   (fetchNuGet {
     name = "System.AppContext";
@@ -1054,6 +1144,11 @@
     version = "4.7.0";
     sha256 = "1vivvf158ilcpp6bq70zyafimi0lng546b34csmjb09k19wgxpiv";
   })
+  (fetchNuGet {
+    name = "System.IO.Pipelines";
+    version = "4.7.3";
+    sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy";
+  })
   (fetchNuGet {
     name = "System.Linq";
     version = "4.1.0";
@@ -1084,6 +1179,11 @@
     version = "4.5.1";
     sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c";
   })
+  (fetchNuGet {
+    name = "System.Memory";
+    version = "4.5.2";
+    sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld";
+  })
   (fetchNuGet {
     name = "System.Memory";
     version = "4.5.3";
@@ -1259,6 +1359,11 @@
     version = "4.5.2";
     sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi";
   })
+  (fetchNuGet {
+    name = "System.Runtime.CompilerServices.Unsafe";
+    version = "4.5.3";
+    sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln";
+  })
   (fetchNuGet {
     name = "System.Runtime.CompilerServices.Unsafe";
     version = "4.7.0";
@@ -1434,6 +1539,16 @@
     version = "4.3.0";
     sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
   })
+  (fetchNuGet {
+    name = "System.Text.Encodings.Web";
+    version = "4.7.1";
+    sha256 = "1wj7r07mjwbf9a79kapy2l9m8mcq8b3nbhg0zaprlsav09k85fmb";
+  })
+  (fetchNuGet {
+    name = "System.Text.Json";
+    version = "4.7.2";
+    sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4";
+  })
   (fetchNuGet {
     name = "System.Text.RegularExpressions";
     version = "4.1.0";
@@ -1454,6 +1569,11 @@
     version = "4.3.0";
     sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
   })
+  (fetchNuGet {
+    name = "System.Threading.Channels";
+    version = "4.7.1";
+    sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2";
+  })
   (fetchNuGet {
     name = "System.Threading.Tasks";
     version = "4.0.11";
@@ -1479,6 +1599,11 @@
     version = "4.5.3";
     sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i";
   })
+  (fetchNuGet {
+    name = "System.Threading.Tasks.Extensions";
+    version = "4.5.4";
+    sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153";
+  })
   (fetchNuGet {
     name = "System.Threading.Thread";
     version = "4.0.0";

From c4ab2f4f7de305cf2cc4d271b4a3a39f2d774c69 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 21 Nov 2020 03:11:41 +0100
Subject: [PATCH 3370/3942] iannix: 2016-01-31 -> 0.9.20-b

---
 pkgs/applications/audio/iannix/default.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index fa779a7f0f4e..b0c7040ddcb2 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -1,14 +1,15 @@
-{ mkDerivation, stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
+{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
 }:
 
-mkDerivation {
+mkDerivation rec {
   pname = "iannix";
-  version = "2016-01-31";
+  version = "0.9.20-b";
+
   src = fetchFromGitHub {
     owner = "iannix";
     repo = "IanniX";
-    rev = "f84becdcbe154b20a53aa2622068cb8f6fda0755";
-    sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj";
+    rev = "v${version}";
+    sha256 = "6jjgMvD2VkR3ztU5LguqhtNd+4/ZqRy5pVW5xQ6K20Q=";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
@@ -20,11 +21,11 @@ mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = {
-    description = "Graphical open-source sequencer,";
+  meta = with lib; {
+    description = "Graphical open-source sequencer";
     homepage = "https://www.iannix.org/";
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.nico202 ];
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nico202 ];
   };
 }

From bfaf30c5e7d0120f740329090ee8e636c26b8859 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Mon, 23 Nov 2020 14:04:26 +0100
Subject: [PATCH 3371/3942] iannix: set myself as maintainer

---
 pkgs/applications/audio/iannix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index b0c7040ddcb2..3765d2ca6788 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -26,6 +26,6 @@ mkDerivation rec {
     homepage = "https://www.iannix.org/";
     license = licenses.lgpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nico202 ];
+    maintainers = with maintainers; [ freezeboy ];
   };
 }

From 0aa34a03d000515370086d81686f4110a894751d Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 23 Nov 2020 17:13:22 +0300
Subject: [PATCH 3372/3942] nixos/tests/samba-wsdd: add check WSD Discovery

---
 nixos/tests/all-tests.nix     |  1 +
 nixos/tests/samba-wsdd.nix    | 44 +++++++++++++++++++++++++++++++++++
 pkgs/servers/wsdd/default.nix |  6 ++++-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/samba-wsdd.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3c10d6215186..899509696e3c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -315,6 +315,7 @@ in
   runInMachine = handleTest ./run-in-machine.nix {};
   rxe = handleTest ./rxe.nix {};
   samba = handleTest ./samba.nix {};
+  samba-wsdd = handleTest ./samba-wsdd.nix {};
   sanoid = handleTest ./sanoid.nix {};
   sbt = handleTest ./sbt.nix {};
   sbt-extras = handleTest ./sbt-extras.nix {};
diff --git a/nixos/tests/samba-wsdd.nix b/nixos/tests/samba-wsdd.nix
new file mode 100644
index 000000000000..1edef6c0056d
--- /dev/null
+++ b/nixos/tests/samba-wsdd.nix
@@ -0,0 +1,44 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+{
+  name = "samba-wsdd";
+  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ];
+
+  nodes = {
+    client_wsdd = { pkgs, ... }: {
+      services.samba-wsdd = {
+        enable = true;
+        interface = "eth1";
+        workgroup = "WORKGROUP";
+        hostname = "CLIENT-WSDD";
+        discovery = true;
+        extraOptions = [ "--no-host" ];
+      };
+      networking.firewall.allowedTCPPorts = [ 5357 ];
+      networking.firewall.allowedUDPPorts = [ 3702 ];
+    };
+
+    server_wsdd = { ... }: {
+      services.samba-wsdd = {
+        enable = true;
+        interface = "eth1";
+        workgroup = "WORKGROUP";
+        hostname = "SERVER-WSDD";
+      };
+      networking.firewall.allowedTCPPorts = [ 5357 ];
+      networking.firewall.allowedUDPPorts = [ 3702 ];
+    };
+  };
+
+  testScript = ''
+    client_wsdd.start()
+    client_wsdd.wait_for_unit("samba-wsdd")
+
+    server_wsdd.start()
+    server_wsdd.wait_for_unit("samba-wsdd")
+
+    client_wsdd.wait_until_succeeds(
+        "echo list | ${pkgs.libressl.nc}/bin/nc -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD"
+    )
+  '';
+})
diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix
index 059c401deadc..1411b6f3adcf 100644
--- a/pkgs/servers/wsdd/default.nix
+++ b/pkgs/servers/wsdd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, python3 }:
+{ stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "wsdd";
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH"
   '';
 
+  passthru = {
+    tests.samba-wsdd = nixosTests.samba-wsdd;
+  };
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/christgau/wsdd";
     description = "A Web Service Discovery (WSD) host daemon for SMB/Samba";

From 77e00150baac819fc605e81a8828a1e76cf841b2 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Wed, 18 Nov 2020 09:48:08 +0700
Subject: [PATCH 3373/3942] Initial implementation of remarkable1 cross-compile

---
 lib/systems/examples.nix  |  5 +++++
 lib/systems/platforms.nix | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index b824bea6c20c..3bbe61ed33a5 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -34,6 +34,11 @@ rec {
     platform = platforms.raspberrypi;
   };
 
+  remarkable1 = {
+    config = "armv7l-unknown-linux-gnueabihf";
+    platform = platforms.zero-gravitas;
+  };
+
   armv7l-hf-multiplatform = {
     config = "armv7l-unknown-linux-gnueabihf";
     platform = platforms.armv7l-hf-multiplatform;
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index ab3cf1d54301..42d9809fd7d0 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -203,6 +203,20 @@ rec {
   # Legacy attribute, for compatibility with existing configs only.
   raspberrypi2 = armv7l-hf-multiplatform;
 
+  zero-gravitas = {
+    name = "zero-gravitas";
+    kernelBaseConfig = "zero-gravitas_defconfig";
+    kernelArch = "arm";
+    # kernelTarget verified by checking /boot on reMarkable 1 device
+    kernelTarget = "zImage";
+    kernelAutoModules = false;
+    kernelDTB = true;
+    gcc = {
+      fpu = "neon";
+      cpu = "cortex-a9";
+    };
+  };
+
   scaleway-c1 = armv7l-hf-multiplatform // {
     gcc = {
       cpu = "cortex-a9";

From 18f5b1c663ee8c53671a95b94e712ea7575fcab5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 05:45:36 +0000
Subject: [PATCH 3374/3942] python37Packages.flask-httpauth: 4.1.0 -> 4.2.0

---
 pkgs/development/python-modules/flask-httpauth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/pkgs/development/python-modules/flask-httpauth/default.nix
index ad3e42876d0f..e5d55a2b9b5f 100644
--- a/pkgs/development/python-modules/flask-httpauth/default.nix
+++ b/pkgs/development/python-modules/flask-httpauth/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "Flask-HTTPAuth";
-  version = "4.1.0";
+  version = "4.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9e028e4375039a49031eb9ecc40be4761f0540476040f6eff329a31dabd4d000";
+    sha256 = "8c7e49e53ce7dc14e66fe39b9334e4b7ceb8d0b99a6ba1c3562bb528ef9da84a";
   };
 
   propagatedBuildInputs = [ flask ];

From 645a14016804af2860344d40864f098e0a21f5de Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 06:49:06 +0000
Subject: [PATCH 3375/3942] python37Packages.mongoengine: 0.20.0 -> 0.21.0

---
 pkgs/development/python-modules/mongoengine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix
index a47438d5a700..3ac24f7430d9 100644
--- a/pkgs/development/python-modules/mongoengine/default.nix
+++ b/pkgs/development/python-modules/mongoengine/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "mongoengine";
-  version = "0.20.0";
+  version = "0.21.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "MongoEngine";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0wc0cvjanlszn09n61jj38pq9wdlphkjgrp3c8hvd16754is3n7f";
+    sha256 = "02amfdirdw3nc0kgiyax7yndk5b65g83kbjvwwxbgnlcrb9vjzcd";
   };
 
   propagatedBuildInputs = [

From c2c3c2eaa28e152aa3cc059a44b8720d422796e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 01:57:47 +0000
Subject: [PATCH 3376/3942] python37Packages.google_cloud_bigtable: 1.5.1 ->
 1.6.0

---
 .../python-modules/google_cloud_bigtable/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google_cloud_bigtable/default.nix
index 310663df3505..0ce4209857a6 100644
--- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix
+++ b/pkgs/development/python-modules/google_cloud_bigtable/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigtable";
-  version = "1.5.1";
+  version = "1.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "25b869bb20ad6ee9f6e7fc3c95d973011ade8176af9197468686335e216c088e";
+    sha256 = "e9b904ebe651c4699829f7379706a4cd00b19b6d72b24e78a4dca9bba3bb52ad";
   };
 
   checkInputs = [ pytest mock ];

From 4f322b7ef56ed760bd49833fdf09dabc596b4880 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 01:43:16 +0000
Subject: [PATCH 3377/3942] python37Packages.gidgethub: 4.1.1 -> 4.2.0

---
 pkgs/development/python-modules/gidgethub/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix
index f3b3c8d5df3d..a28bcfb0ec1b 100644
--- a/pkgs/development/python-modules/gidgethub/default.nix
+++ b/pkgs/development/python-modules/gidgethub/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "gidgethub";
-  version = "4.1.1";
+  version = "4.2.0";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cfabfa696d422ee91eaf1e3f01ea75e576721233cc3ea8badc7d86c30061df8e";
+    sha256 = "5526cc2a06bfad707d10ec118393e0d33c2aa524605255d96958c22c93e8e7aa";
   };
 
   nativeBuildInputs = [ setuptools pytestrunner ];

From eaf730c4f86eea68d0ef17d7912df078adef78e5 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 31 Oct 2020 22:46:56 +0100
Subject: [PATCH 3378/3942] python3Packages.nocaselist: init at 1.0.3

---
 .../python-modules/nocaselist/default.nix     | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/nocaselist/default.nix

diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix
new file mode 100644
index 000000000000..055b55da45d3
--- /dev/null
+++ b/pkgs/development/python-modules/nocaselist/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "nocaselist";
+  version = "1.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "fm3st9hVY7kESRPJCH70tpG8PaTXrR2IlozepAlVMyY=";
+  };
+
+  checkInputs = [
+    pytest
+  ];
+
+  pythonImportsCheck = [
+    "nocaselist"
+  ];
+
+  meta = with lib; {
+    description = "A case-insensitive list for Python";
+    homepage = "https://github.com/pywbem/nocaselist";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f4bd5bd3f631..dd0cd1342bd2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4105,6 +4105,8 @@ in {
 
   nmigen-soc = callPackage ../development/python-modules/nmigen-soc { };
 
+  nocaselist = callPackage ../development/python-modules/nocaselist { };
+
   nodeenv = callPackage ../development/python-modules/nodeenv { };
 
   node-semver = callPackage ../development/python-modules/node-semver { };

From 33c26604ae82618074b7122e0c0fc0e033c7cab5 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 31 Oct 2020 22:47:43 +0100
Subject: [PATCH 3379/3942] python3Packages.nocasedict: init at 1.0.1

---
 .../python-modules/nocasedict/default.nix     | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/nocasedict/default.nix

diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix
new file mode 100644
index 000000000000..ffa761f206e3
--- /dev/null
+++ b/pkgs/development/python-modules/nocasedict/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "nocasedict";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "bl1b0R3jP5PSJUXZ7SOguY+EDyzawNdJ0vqkYXrcd3I=";
+  };
+
+  checkInputs = [
+    pytest
+  ];
+
+  pythonImportsCheck = [
+    "nocasedict"
+  ];
+
+  meta = with lib; {
+    description = "A case-insensitive ordered dictionary for Python";
+    homepage = "https://github.com/pywbem/nocasedict";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd0cd1342bd2..1be929c37dd5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4105,6 +4105,8 @@ in {
 
   nmigen-soc = callPackage ../development/python-modules/nmigen-soc { };
 
+  nocasedict = callPackage ../development/python-modules/nocasedict { };
+
   nocaselist = callPackage ../development/python-modules/nocaselist { };
 
   nodeenv = callPackage ../development/python-modules/nodeenv { };

From 891863830d87316f53a7bae581a53361df78d39f Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 31 Oct 2020 22:49:02 +0100
Subject: [PATCH 3380/3942] python3Packages.yamlloader: init at 0.5.5

---
 .../python-modules/yamlloader/default.nix     | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/yamlloader/default.nix

diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix
new file mode 100644
index 000000000000..c8b2d5949cbf
--- /dev/null
+++ b/pkgs/development/python-modules/yamlloader/default.nix
@@ -0,0 +1,33 @@
+{ lib, buildPythonPackage, fetchPypi
+, pytest, pyyaml
+}:
+
+buildPythonPackage rec {
+  pname = "yamlloader";
+  version = "0.5.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3KtfFrObsD0Q3aTNTzDJQ2dexMd3GAf8Z+fxuzGb9Mg=";
+  };
+
+  propagatedBuildInputs = [
+    pyyaml
+  ];
+
+  checkInputs = [
+    pytest
+  ];
+
+  pythonImportsCheck = [
+    "yaml"
+    "yamlloader"
+  ];
+
+  meta = with lib; {
+    description = "A case-insensitive list for Python";
+    homepage = "https://github.com/Phynix/yamlloader";
+    license = licenses.mit;
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1be929c37dd5..ba7eadea2b79 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7826,6 +7826,8 @@ in {
 
   yamllint = callPackage ../development/python-modules/yamllint { };
 
+  yamlloader = callPackage ../development/python-modules/yamlloader { };
+
   yamlordereddictloader = callPackage ../development/python-modules/yamlordereddictloader { };
 
   yanc = callPackage ../development/python-modules/yanc { };

From b8ba234c8c931ab437dbb8262e119ddee054139a Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 31 Oct 2020 22:50:16 +0100
Subject: [PATCH 3381/3942] python3Packages.pywbem: 1.0.2 at 1.1.1

---
 .../python-modules/pywbem/default.nix         | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix
index e944f693503e..698e4ef94ca3 100644
--- a/pkgs/development/python-modules/pywbem/default.nix
+++ b/pkgs/development/python-modules/pywbem/default.nix
@@ -1,53 +1,44 @@
 { lib, buildPythonPackage, fetchPypi, libxml2
 , m2crypto, ply, pyyaml, six, pbr, pythonOlder, isPy37
+, nocasedict, nocaselist, yamlloader, requests-mock
 , httpretty, lxml, mock, pytest, requests, decorator, unittest2
+, FormEncode, testfixtures, pytz
 }:
 
 buildPythonPackage rec {
   pname = "pywbem";
-  version = "1.0.3";
-
-  # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release
-  disabled = isPy37;
+  version = "1.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a6c53d9426326e0e722a5b1af3a1d55810259cb3afa92ca5e4029a6d533cab37";
+    sha256 = "9GpxbgNsXZJj2M5MvosNnEe+9pY+Qz64RD/7ZIDqmII=";
   };
 
   propagatedBuildInputs = [
     mock
+    nocasedict
+    nocaselist
     pbr
     ply
     pyyaml
     six
+    yamlloader
   ] ++ lib.optionals (pythonOlder "3.0") [ m2crypto ];
 
   checkInputs = [
     decorator
+    FormEncode
     httpretty
     libxml2
     lxml
     pytest
+    pytz
     requests
+    requests-mock
+    testfixtures
     unittest2
   ];
 
-  postPatch = ''
-    # Uses deprecated library yamlordereddictloader
-    rm testsuite/test_client.py
-
-    # Wants `wbemcli` in PATH
-    rm testsuite/test_wbemcli.py
-
-    # Disables tests that use testfixtures which is currently broken by nonbuilding zope_component
-    rm testsuite/{test_logging,test_recorder,test_wbemconnection_mock}.*
-  '';
-
-  checkPhase = ''
-    pytest testsuite/
-  '';
-
   meta = with lib; {
     description = "Support for the WBEM standard for systems management";
     homepage = "https://pywbem.github.io";

From b29a031ca6ce51970d6114d2f8211441f2cd1af3 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 31 Oct 2020 22:51:43 +0100
Subject: [PATCH 3382/3942] check-esxi-hardware: 20181001 -> 20200710

---
 pkgs/servers/monitoring/plugins/esxi.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix
index 897d6395f95a..2dc355ecac3d 100644
--- a/pkgs/servers/monitoring/plugins/esxi.nix
+++ b/pkgs/servers/monitoring/plugins/esxi.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchFromGitHub, python2Packages }:
+{ stdenv, fetchFromGitHub, python3Packages }:
 
 let
   bName = "check_esxi_hardware";
-  pName = stdenv.lib.replaceStrings [ "_" ] [ "-" ] bName;
 
-in python2Packages.buildPythonApplication rec {
-  name = "${pName}-${version}";
-  version = "20181001";
+in python3Packages.buildPythonApplication rec {
+  pname = stdenv.lib.replaceStrings [ "_" ] [ "-" ] bName;
+  version = "20200710";
 
   src = fetchFromGitHub {
     owner  = "Napsty";
     repo   = bName;
     rev    = version;
-    sha256 = "0azfacxcnnxxfqzrhh29k8cnjyr88gz35bi6h8fq931fl3plv10l";
+    sha256 = "EC6np/01S+5SA2H9z5psJ9Pq/YoEyGdHL9wHUKKsNas=";
   };
 
   dontBuild = true;
@@ -21,13 +20,13 @@ in python2Packages.buildPythonApplication rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm755 -t $out/bin                ${bName}.py
-    install -Dm644 -t $out/share/doc/${pName} README.md
+    install -Dm755 ${bName}.py $out/bin/${bName}
+    install -Dm644 -t $out/share/doc/${pname} README.md
 
     runHook postInstall
   '';
 
-  propagatedBuildInputs = with python2Packages; [ pywbem ];
+  propagatedBuildInputs = with python3Packages; [ pywbem requests setuptools ];
 
   meta = with stdenv.lib; {
     homepage = "https://www.claudiokuenzler.com/nagios-plugins/";

From 6f6f2f2050ea1cbe22899053caa7f22077127d4d Mon Sep 17 00:00:00 2001
From: Artur Cygan <arczicygan@gmail.com>
Date: Wed, 19 Aug 2020 14:42:25 +0200
Subject: [PATCH 3383/3942] secp256k1: 2017-12-18 -> 2020-08-16

---
 pkgs/tools/security/secp256k1/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix
index b5e92a354541..d3b43d6adf69 100644
--- a/pkgs/tools/security/secp256k1/default.nix
+++ b/pkgs/tools/security/secp256k1/default.nix
@@ -20,13 +20,13 @@ stdenv.mkDerivation {
 
   # I can't find any version numbers, so we're just using the date of the
   # last commit.
-  version = "2017-12-18";
+  version = "2020-08-16";
 
   src = fetchFromGitHub {
     owner = "bitcoin-core";
     repo = "secp256k1";
-    rev = "f54c6c5083307b18224c953cf5870ea7ffce070b";
-    sha256 = "0bxqmimm627g9klalg1vdbspmn52588v4a6cli3p8bn84ibsnzbm";
+    rev = "670cdd3f8be25f81472b2d16dcd228b0d24a5c45";
+    sha256 = "0ak2hrr0wznl5d9s905qwn5yds7k22i28d2jp957l4a8yf8cqv3s";
   };
 
   buildInputs = optionals enableJNI [ jdk ];
@@ -34,11 +34,14 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ autoreconfHook ];
 
   configureFlags =
-    [ "--enable-benchmark=no" "--enable-tests=no" "--enable-exhaustive-tests=no" ] ++
+    [ "--enable-benchmark=no" "--enable-tests=yes" "--enable-exhaustive-tests=no" ] ++
     optionals enableECDH [ "--enable-module-ecdh" "--enable-experimental" ] ++
     optionals enableRecovery [ "--enable-module-recovery" ] ++
     optionals enableJNI [ "--enable-jni" ];
 
+  doCheck = true;
+  checkPhase = "./tests";
+
   meta = with stdenv.lib; {
     description = "Optimized C library for EC operations on curve secp256k1";
     longDescription = ''

From a3ab7a351893814f39c75d98a81208f2044f059d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 20 Nov 2020 13:00:02 -0800
Subject: [PATCH 3384/3942] python3Packages.astropy: fix build

---
 pkgs/development/python-modules/astropy/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 1affa4b50538..2658ba99b1f9 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -2,6 +2,8 @@
 , fetchPypi
 , buildPythonPackage
 , isPy3k
+, cython
+, jinja2
 , numpy
 , pytest
 , pytest-astropy
@@ -19,7 +21,7 @@ buildPythonPackage rec {
     sha256 = "cf69d1a3f140ca8fe1664202072201395495a73c334a69fc965fab6a6e1d281a";
   };
 
-  nativeBuildInputs = [ astropy-helpers ];
+  nativeBuildInputs = [ astropy-helpers cython jinja2 ];
 
   propagatedBuildInputs = [ numpy pytest ]; # yes it really has pytest in install_requires
 

From 9f2cc6f478aa7ad57450fee9fd1bc84535b3b6bd Mon Sep 17 00:00:00 2001
From: georgewhewell <georgerw@gmail.com>
Date: Thu, 19 Nov 2020 18:38:33 +0000
Subject: [PATCH 3385/3942] pythonPackages.pyro-api: init at 0.1.1

---
 .../python-modules/pyro-api/default.nix       | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyro-api/default.nix

diff --git a/pkgs/development/python-modules/pyro-api/default.nix b/pkgs/development/python-modules/pyro-api/default.nix
new file mode 100644
index 000000000000..78804941532a
--- /dev/null
+++ b/pkgs/development/python-modules/pyro-api/default.nix
@@ -0,0 +1,23 @@
+{ buildPythonPackage, fetchPypi, lib }:
+
+buildPythonPackage rec {
+  version = "0.1.1";
+  pname = "pyro-api";
+
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "0rhd7p61pf2vvflbdixp7sygblvvl9qbqavxj27910lr79vl4fdz";
+  };
+
+  pythonImportsCheck = [ "pyroapi" ];
+
+  # tests require pyro-ppl which depends on this package
+  doCheck = false;
+
+  meta = {
+    description = "Generic API for dispatch to Pyro backends.";
+    homepage = "http://pyro.ai";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ georgewhewell ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ba7eadea2b79..099fd106d2a3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5460,6 +5460,8 @@ in {
 
   pyroma = callPackage ../development/python-modules/pyroma { };
 
+  pyro-api = callPackage ../development/python-modules/pyro-api { };
+
   pyro-ppl = callPackage ../development/python-modules/pyro-ppl { };
 
   pyroute2 = callPackage ../development/python-modules/pyroute2 { };

From 5ee22cefe238a8b52d87946c796b45c2265898a8 Mon Sep 17 00:00:00 2001
From: georgewhewell <georgerw@gmail.com>
Date: Thu, 19 Nov 2020 18:38:44 +0000
Subject: [PATCH 3386/3942] pythonPackages.pyro-ppl: fix build, unmark as
 broken

---
 .../python-modules/pyro-ppl/default.nix       | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix
index c3157c3d301c..54c2155a51b5 100644
--- a/pkgs/development/python-modules/pyro-ppl/default.nix
+++ b/pkgs/development/python-modules/pyro-ppl/default.nix
@@ -1,15 +1,17 @@
 { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2
-, graphviz, networkx, six, opt-einsum, tqdm }:
+, graphviz, networkx, six, opt-einsum, tqdm, pyro-api }:
+
 buildPythonPackage rec {
-  version = "1.4.0";
+  version = "1.5.1";
   pname = "pyro-ppl";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "e863321bee141fb8d20d621aedc5925c472e06c08988447490115f54a31487ad";
+    sha256 = "00mprgf8pf9jq3kanxjldj00cg3nbfkb5yg0mdfbdi0b1rx3vnsa";
   };
 
   propagatedBuildInputs = [
+    pyro-api
     pytorch
     contextlib2
     # TODO(tom): graphviz pulls in a lot of dependencies - make
@@ -22,18 +24,19 @@ buildPythonPackage rec {
   ];
 
   # pyro not shipping tests do simple smoke test instead
-  checkPhase = ''
-    python -c "import pyro"
-    python -c "import pyro.distributions"
-    python -c "import pyro.infer"
-    python -c "import pyro.optim"
-  '';
+  pythonImportsCheck = [
+    "pyro"
+    "pyro.distributions"
+    "pyro.infer"
+    "pyro.optim"
+  ];
+
+  doCheck = false;
 
   meta = {
     description = "A Python library for probabilistic modeling and inference";
     homepage = "http://pyro.ai";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ teh ];
-    broken = true;
+    maintainers = with lib.maintainers; [ teh georgewhewell ];
   };
 }

From cfba07ba0443be90375ed70c46b4a358de3ced96 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 21 Nov 2020 00:19:13 +0100
Subject: [PATCH 3387/3942] supercollider: 3.11.0 -> 3.11.2

---
 pkgs/development/interpreters/supercollider/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index eed0bdc5807e..acdffba8d72b 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -9,12 +9,12 @@ in
 
 mkDerivation rec {
   pname = "supercollider";
-  version = "3.11.0";
+  version = "3.11.2";
 
 
   src = fetchurl {
     url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2";
-    sha256 = "0l5j7sqrjlm85ql91ybcrvdykfkkwfqd7w3m4llbymw720r2ln9p";
+    sha256 = "wiwyxrxIJnHU+49RZy33Etl6amJ3I1xNojEpEDA6BQY=";
   };
 
   hardeningDisable = [ "stackprotector" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccc5cdc5ec8d..eec0cc87b3a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10638,7 +10638,7 @@ in
   ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
   ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { };
 
-  supercollider = libsForQt514.callPackage ../development/interpreters/supercollider {
+  supercollider = libsForQt5.callPackage ../development/interpreters/supercollider {
     fftw = fftwSinglePrec;
   };
 

From a4a1d546ae3072d236d79b106f9f4d7f22ff6915 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 19 Nov 2020 00:45:01 +0100
Subject: [PATCH 3388/3942] python3Packages.zha-quirks: 0.0.45 -> 0.0.46

Also unbreak the tests
---
 .../python-modules/zha-quirks/default.nix        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index 959e7f9c0d83..4554ffa58e2f 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, aiohttp, zigpy
-, pytest }:
+{ lib, buildPythonPackage, fetchPypi
+, aiohttp, zigpy, conftest, asynctest
+, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "zha-quirks";
-  version = "0.0.45";
+  version = "0.0.46";
 
-  nativeBuildInputs = [ pytest ];
-  buildInputs = [ aiohttp zigpy ];
+  propagatedBuildInputs = [ aiohttp zigpy ];
+  checkInputs = [ pytestCheckHook conftest asynctest ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9f0640d2844939118c631d88df18d78adfa17d01cac3e04d7156e5f99e41bc7d";
+    sha256 = "OpkOMvxiPBCVagSv8Jxvth3gwVv4idFSlKoBaOO5JVg=";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ZHA Device Handlers are custom quirks implementations for Zigpy";
     homepage = "https://github.com/dmulcahey/zha-device-handlers";
     license = licenses.asl20;

From b11ca24578739b5446a8271b82097e65b980fdd8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 23 Nov 2020 15:55:04 +0100
Subject: [PATCH 3389/3942] EmptyEpsilon: 2020.08.25 -> 2020.11.23

https://github.com/daid/SeriousProton/releases/tag/EE-2020.11.23
---
 pkgs/games/empty-epsilon/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index c006adcb2719..dc761fb7d7a2 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -3,8 +3,8 @@
 let
 
   major = "2020";
-  minor = "08";
-  patch = "25";
+  minor = "11";
+  patch = "23";
 
   version = "${major}.${minor}.${patch}";
 
@@ -16,7 +16,7 @@ let
       owner = "daid";
       repo = "SeriousProton";
       rev = "EE-${version}";
-      sha256 = "sha256-LiMEgsUpNBtduFO85ct6NYr/Smbzd8yE8Vce3voErLY=";
+      sha256 = "sha256-/gwJPlvvOCv5XIsiVgZ8Eb/7vgwG/V+s/soGVCfYrwo=";
     };
 
     nativeBuildInputs = [ cmake ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     owner = "daid";
     repo = "EmptyEpsilon";
     rev = "EE-${version}";
-    sha256 = "sha256-3QREWTq1Jq9T/FtGFVU4MidZeUQvRSVChn9JKxv2SiQ=";
+    sha256 = "sha256-HbF6xThR+ogNHbAcXF03DaBhwVhNEr5BJO7jeeVZH/o=";
   };
 
   nativeBuildInputs = [ cmake ];

From e82c3b68e166fa71818ff8d5a16b4472cfdb2253 Mon Sep 17 00:00:00 2001
From: Max Wilson <max@maxwilson.dev>
Date: Thu, 19 Nov 2020 22:02:01 -0500
Subject: [PATCH 3390/3942] steam: http -> https

---
 pkgs/games/steam/steam.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index 830c97b2fb7d..20ccba641e4a 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
   inherit version;
 
   src = fetchurl {
-    url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
+    url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
     sha256 = "0c5xy57gwr14vp3wy3jpqi5dl6y7n01p2dy4jlgl9bf9x7616r6n";
   };
 

From 97178a01ed55d05dfc1396a719b4a8d4645323ee Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 20 Nov 2020 12:38:40 -0800
Subject: [PATCH 3391/3942] amoeba: fix build

---
 pkgs/games/amoeba/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix
index 0475a6b50b5a..945a9e8df212 100644
--- a/pkgs/games/amoeba/default.nix
+++ b/pkgs/games/amoeba/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, pkgconfig }:
+{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xlibs, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "amoeba-${version}-${debver}";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU ];
+  buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU xlibs.libXxf86vm ];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/man/man1/

From b485298c2549afb99788391f0a2a0d3c44ca1390 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 20 Nov 2020 21:50:47 +0100
Subject: [PATCH 3392/3942] homeassistant: 0.118.1 -> 0.118.3

---
 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 38b8cca170b2..856354562564 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.118.1";
+  version = "0.118.3";
   components = {
     "abode" = ps: with ps; [ abodepy ];
     "accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 018cf82b961b..132f9b13c60c 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -62,7 +62,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.118.1";
+  hassVersion = "0.118.3";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -78,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    sha256 = "1l2jqvq3amwdr4v6xq7df19bf75s1dpgcgnaacsx7k7pfwsyn63f";
+    sha256 = "1b58r3gn838naqcrvmzhqcnf2sdjfjwfapnn8v8cnc51pz58vazq";
   };
 
   # leave this in, so users don't have to constantly update their downstream patch handling

From b543ade35062a3455b24dfcf2b15ef9a3638306c Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Fri, 20 Nov 2020 16:39:31 -0800
Subject: [PATCH 3393/3942] pythonPackages.psycopg2cffi: init at 2.8.1

---
 .../python-modules/psycopg2cffi/default.nix   | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/psycopg2cffi/default.nix

diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix
new file mode 100644
index 000000000000..71c9017380ad
--- /dev/null
+++ b/pkgs/development/python-modules/psycopg2cffi/default.nix
@@ -0,0 +1,39 @@
+{ buildPythonPackage, cffi, fetchFromGitHub, lib, postgresql, pytestCheckHook, six }:
+
+buildPythonPackage rec {
+  pname = "psycopg2cffi";
+  version = "2.8.1";
+
+  # NB: This is a fork.
+  # The original repo exists at https://github.com/chtd/psycopg2cffi, however
+  # this is mostly unmaintained and does not build for PyPy. Given that the
+  # whole point of this cffi alternative to psycopg2 is to use it with PyPy, I
+  # chose to use a working fork instead, which was linked in the relevant issue:
+  # https://github.com/chtd/psycopg2cffi/issues/113#issuecomment-730548574
+  #
+  # If/when these changes get merged back upstream we should revert to using the
+  # original source as opposed to the fork.
+  src = fetchFromGitHub {
+    owner = "Omegapol";
+    repo = pname;
+    rev = "c202b25cd861d5e8f0f55c329764ff1da9f020c0";
+    sha256 = "09hsnjkix1c0vlhmfvrp8pchpnz2ya4xrchyq15czj527nx2dmy2";
+  };
+
+  nativeBuildInputs = [ postgresql ];
+  propagatedBuildInputs = [ six cffi ];
+  checkInputs = [ pytestCheckHook ];
+
+  # NB: The tests need a postgres instance running to test against, and so we
+  # disable them.
+  doCheck = false;
+
+  pythonImportsCheck = [ "psycopg2cffi" ];
+
+  meta = with lib; {
+    description = "An implementation of the psycopg2 module using cffi";
+    homepage = "https://pypi.org/project/psycopg2cffi/";
+    license = with licenses; [ lgpl3Plus ];
+    maintainers = with maintainers; [ lovesegfault ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 099fd106d2a3..125c27dcde8e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4779,6 +4779,8 @@ in {
 
   psycopg2 = callPackage ../development/python-modules/psycopg2 { };
 
+  psycopg2cffi = callPackage ../development/python-modules/psycopg2cffi { };
+
   ptable = callPackage ../development/python-modules/ptable { };
 
   ptest = callPackage ../development/python-modules/ptest { };

From fb3f81ba12ac1b5db9b2a30b873d3663dfeb8574 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Fri, 13 Nov 2020 21:46:24 +0000
Subject: [PATCH 3394/3942] starboard-octant-plugin: init at 0.4.0

---
 .../plugins/starboard-octant-plugin.nix       | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix

diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix
new file mode 100644
index 000000000000..df3821744a4b
--- /dev/null
+++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "starboard-octant-plugin";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "aquasecurity";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0rqlks2f7cwx14xynaq95dxlzh18rsdz1w8a2ia24lvfwf8b95rf";
+  };
+
+  vendorSha256 = "1fxb97wf69phhqwqg86wcx4dkzh67snzl1xfmj4wvfq16b9xj11j";
+
+  meta = with lib; {
+    description = "Octant plugin for viewing Starboard security information";
+    longDescription = ''
+      This is an Octant plugin for Starboard which provides visibility into vulnerability assessment reports for
+      Kubernetes workloads stored as custom security resources.
+    '';
+    homepage = src.meta.homepage;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eec0cc87b3a7..4a582107395b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -482,6 +482,7 @@ in
   ociTools = callPackage ../build-support/oci-tools { };
 
   octant = callPackage ../applications/networking/cluster/octant { };
+  starboard-octant-plugin = callPackage ../applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix { };
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
 

From d4de778e5b720acd6d2e5f14438f2bf35c500088 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 15:26:35 +0000
Subject: [PATCH 3395/3942] =?UTF-8?q?sbt:=201.4.3=20=E2=86=92=201.4.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 ec97ba4acb74..ebcae9e63eea 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   pname = "sbt";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchurl {
     url =
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
-    sha256 = "17h1lqnas276515y49fvpcysf8hkkrqq60kwbvyz68yvdrs5rrwr";
+    sha256 = "0ibdq8g2bcanc7gcjslia89khlccn11inqmkx3y7pbqrc63y1yif";
   };
 
   patchPhase = ''

From e0e4c2281c7aa9fa923d6b0c5a8f804ac9f222fe Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 15:26:40 +0000
Subject: [PATCH 3396/3942] =?UTF-8?q?oh-my-zsh:=202020-11-20=20=E2=86=92?=
 =?UTF-8?q?=202020-11-22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 f9cf4f54aad9..8a2a9902599a 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
 
 stdenv.mkDerivation rec {
-  version = "2020-11-20";
+  version = "2020-11-22";
   pname = "oh-my-zsh";
-  rev = "d57131dc49500a056c5b78b0fb444c7cb1ca83cd";
+  rev = "7a76afd61e5daab6fb33f955930efa7f4cf16021";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "073c6ni7a74gvb98y9z7xsc4x0i6p1r2sxp6bwdv3z8lsj8mfbd7";
+    sha256 = "0zcy8ydyk6ba497q7m0l24wqy8ri616304w76mcxmpv7hh6yfnqa";
   };
 
   installPhase = ''

From 5ba4b41db68ef4bc74af5bbcca14eee2bbcbfef6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 15:26:42 +0000
Subject: [PATCH 3397/3942] =?UTF-8?q?sbt-extras:=202020-11-20=20=E2=86=92?=
 =?UTF-8?q?=202020-11-23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/tools/build-managers/sbt-extras/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index c4228602871d..3b433ea5e77a 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "sbt-extras";
-  rev = "42d33338e52cee115cebc3e4ee2acc1ca766f319";
-  version = "2020-11-20";
+  rev = "be2f5d98f13884a18eaf5205458f985575dbe13a";
+  version = "2020-11-23";
 
   src = fetchFromGitHub {
     owner = "paulp";
     repo = "sbt-extras";
     inherit rev;
-    sha256 = "0k0n8q8695rdy1vas9n9m9819rpmf38d3bbkffnn7mf7qa01mxq1";
+    sha256 = "00acnj357fcwx7w25axaj0l5ync97ixsixg8s55r7hwibkxn0fa7";
   };
 
   dontBuild = true;

From 5cfb696a1a14330f2e13995636b28ad68be1cc7d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 10:33:07 -0500
Subject: [PATCH 3398/3942] linux: 4.14.207 -> 4.14.208

---
 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 2ab56a3c9302..b464ff04a62e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.207";
+  version = "4.14.208";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0a804hwh7cwbdd2gnr5n9i32b4s6gppd8iqihah4sn4q1nbm79vq";
+    sha256 = "0vzn5kprjlgpgnjr1drjq97x9xbyfgigpgs42xsfw61h2qjy3b1q";
   };
 } // (args.argsOverride or {}))

From 187e3bfa481a1486075e3aa2116e055f3bf1f7e6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 10:33:15 -0500
Subject: [PATCH 3399/3942] linux: 4.19.158 -> 4.19.159

---
 pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 1d3a837b1f14..c646387d4f15 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.158";
+  version = "4.19.159";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0p5pim9izcscnk1a1kdlxbvyvxnnq9lqr1kwl86kfskr7yqy8n6n";
+    sha256 = "195hlvr9zsa2km80rk71na1gl0222r2mk76rsqx0cxpgg7dhpjv0";
   };
 } // (args.argsOverride or {}))

From 5ba51e7343777b659451de8f4ae5754ad5c8bace Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 10:33:22 -0500
Subject: [PATCH 3400/3942] linux: 4.4.244 -> 4.4.245

---
 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 67a5fcd341b7..38a89bcc091e 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, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.244";
+  version = "4.4.245";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0brdj6z7flchig80ja0dhzcrpl743lh74s4r4r6prbgkksif9ahp";
+    sha256 = "0g1cnis8496kp1ln922gxa7skfr096mdvv89la6676yw7dd4lhyi";
   };
 } // (args.argsOverride or {}))

From 856d7ae12bf3c99567e1636c1329f8048dd9b626 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 10:33:32 -0500
Subject: [PATCH 3401/3942] linux: 4.9.244 -> 4.9.245

---
 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 ecedd3dc59f6..60d9a9c0244c 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, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.244";
+  version = "4.9.245";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "02givxp0y04qma5nlqbpyxdcl7xdb41p3gw7kgj2rmwdanhzaylr";
+    sha256 = "1vxsd3g96vbykrmfnj9qali0p868h678qzcqvf4yrhya47k6pnnb";
   };
 } // (args.argsOverride or {}))

From 716283fa3a9ed0d368d5bfff01702a98f3135ec0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 10:33:40 -0500
Subject: [PATCH 3402/3942] linux: 5.4.78 -> 5.4.79

---
 pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 25a5c05d8387..4c076a77cc9a 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.78";
+  version = "5.4.79";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0z8skj0w9jfrz9pfxaqfzqh82l13bz5lhza2wjsxk02cyhhnm226";
+    sha256 = "09ffj66wlp27vx799lnixq4zdkin3y4pqaw4lx2a6rpz13xr3455";
   };
 } // (args.argsOverride or {}))

From ca4d1602d767258b9c1be0187d4f872678d02fdc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 10:33:48 -0500
Subject: [PATCH 3403/3942] linux: 5.9.9 -> 5.9.10

---
 pkgs/os-specific/linux/kernel/linux-5.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix
index 95bb00a01427..9ac96d141149 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.9.9";
+  version = "5.9.10";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1b8zysy0br131ydhc7ycxhh8d88r44xrmkf2q2lffy0jmy3d60m3";
+    sha256 = "0c7hcqn1ld0axlipzpwmjr1jwizrhz5w6bdfbk9npbirx7rb54gm";
   };
 } // (args.argsOverride or {}))

From 62531fd4e2684657b54105d47a747d9a0a1ecc46 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 10:34:14 -0500
Subject: [PATCH 3404/3942] linux/hardened/patches/4.14: 4.14.207.a ->
 4.14.208.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 59dc1a61d425..3c6dc4e3f5b6 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,8 +1,8 @@
 {
     "4.14": {
-        "name": "linux-hardened-4.14.207.a.patch",
-        "sha256": "0rkpsp3hs8wypg8pgz804hgrncdchv2xmzy5ji7mkkjnasa6nr4w",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.207.a/linux-hardened-4.14.207.a.patch"
+        "name": "linux-hardened-4.14.208.a.patch",
+        "sha256": "09lmbfp6d4wpr2l7x1njq8q3sdiqz3rrjzkh6dqsdgwd9sdammb3",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.208.a/linux-hardened-4.14.208.a.patch"
     },
     "4.19": {
         "name": "linux-hardened-4.19.158.a.patch",

From dd721fc7b0f35c99399228a64d9d32b681d680f3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 10:34:16 -0500
Subject: [PATCH 3405/3942] linux/hardened/patches/4.19: 4.19.158.a ->
 4.19.159.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 3c6dc4e3f5b6..0688aa35fec6 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -5,9 +5,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.208.a/linux-hardened-4.14.208.a.patch"
     },
     "4.19": {
-        "name": "linux-hardened-4.19.158.a.patch",
-        "sha256": "0qjqnw3i6i6q80clfyrpid2gxg4r7vgskpxf1wk7x5wmfz9qahyn",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.158.a/linux-hardened-4.19.158.a.patch"
+        "name": "linux-hardened-4.19.159.a.patch",
+        "sha256": "0ma4lf97l625474xha5pfb8kph2lm3892g6z63fwd5s1vmva6ni6",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.159.a/linux-hardened-4.19.159.a.patch"
     },
     "5.4": {
         "name": "linux-hardened-5.4.78.a.patch",

From 640a842d578b33493a5108c23e2df864a0ef68b9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 10:34:18 -0500
Subject: [PATCH 3406/3942] linux/hardened/patches/5.4: 5.4.78.a -> 5.4.79.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 0688aa35fec6..0fabc3a9f332 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -10,9 +10,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.159.a/linux-hardened-4.19.159.a.patch"
     },
     "5.4": {
-        "name": "linux-hardened-5.4.78.a.patch",
-        "sha256": "1k98c9ija8s1ggs7jq1r02l7y1g276hrqdvx6sn66ldkspkx4vmr",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.78.a/linux-hardened-5.4.78.a.patch"
+        "name": "linux-hardened-5.4.79.a.patch",
+        "sha256": "154i6ggj27qgsw562jcd93abcd54b4jllkr87h4k2ia6c0mfq4yb",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.79.a/linux-hardened-5.4.79.a.patch"
     },
     "5.8": {
         "name": "linux-hardened-5.8.18.a.patch",

From fa6abb2b612d06540ceb12352f59e8a81ef00569 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 10:34:20 -0500
Subject: [PATCH 3407/3942] linux/hardened/patches/5.9: 5.9.9.a -> 5.9.10.a

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 0fabc3a9f332..c07c65d9be3f 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -20,8 +20,8 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch"
     },
     "5.9": {
-        "name": "linux-hardened-5.9.9.a.patch",
-        "sha256": "0qm4rs22rcclhcw691adwy939ch28ibq4ncngzp2x0wlvb2zggy2",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.9.a/linux-hardened-5.9.9.a.patch"
+        "name": "linux-hardened-5.9.10.a.patch",
+        "sha256": "08gdr5sq156lap08nirw4gjq26vr8k65kbjh4js2ndrb0v49f2lk",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.10.a/linux-hardened-5.9.10.a.patch"
     }
 }

From 4ef6aaef7dee4af685b3a513f4e6997d623f3bec Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 23 Nov 2020 16:23:12 +0000
Subject: [PATCH 3408/3942] kube3d: 3.2.1 -> 3.3.0

---
 pkgs/applications/networking/cluster/kube3d/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 69119673f308..9421951547cc 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,8 +2,8 @@
 
 buildGoModule rec {
   pname = "kube3d";
-  version = "3.2.1";
-  k3sVersion = "1.18.9-k3s1";
+  version = "3.3.0";
+  k3sVersion = "1.19.3-k3s3";
 
   excludedPackages = ''tools'';
 
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "rancher";
     repo   = "k3d";
     rev    = "v${version}";
-    sha256 = "1910vir9yc3xvb23260xljnfpznyhnk4gddy752rrndz7rk1b5c3";
+    sha256 = "1pq5x4fyn98f01mzfjv335gx29c61zd85qc5vhx9rk27hi825ima";
   };
 
   buildFlagsArray = ''

From d0225fcdae37b0f4822cce7ed64f9ae0b32d853e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 23 Nov 2020 11:31:31 -0500
Subject: [PATCH 3409/3942] linux: 5.10-rc4 -> 5.10-rc5

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 959d0f33d009..50c69deeb073 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.10-rc4";
+  version = "5.10-rc5";
   extraMeta.branch = "5.10";
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1fc68lka76n1dygyn914c4vhxqzwv951pp4kdkrr0jv5nvdnyplb";
+    sha256 = "117yvvzdbf8garx484zdp75qgldj8xhr2sqk6mza6lgv4h7v3f4g";
   };
 
   # Should the testing kernels ever be built on Hydra?

From ca021e9c32644142abcf2b1d9cfbae4829f20e1a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 23 Nov 2020 17:37:32 +0100
Subject: [PATCH 3410/3942] html-proofer: 3.17.0 -> 3.17.2

---
 pkgs/tools/misc/html-proofer/Gemfile.lock |  6 +++---
 pkgs/tools/misc/html-proofer/gemset.nix   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock
index c918577fded7..88e3eada9161 100644
--- a/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
     ethon (0.12.0)
       ffi (>= 1.3.0)
     ffi (1.13.1)
-    html-proofer (3.17.0)
+    html-proofer (3.17.2)
       addressable (~> 2.3)
       mercenary (~> 0.3)
       nokogumbo (~> 2.0)
@@ -18,9 +18,9 @@ GEM
     mini_portile2 (2.4.0)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.2)
+    nokogumbo (2.0.3)
       nokogiri (~> 1.8, >= 1.8.4)
-    parallel (1.20.0)
+    parallel (1.20.1)
     public_suffix (4.0.6)
     rainbow (3.0.0)
     typhoeus (1.4.0)
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix
index b617ebe7b0e5..c4974af034df 100644
--- a/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -37,10 +37,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vjy9r9lwr0rfxxadj4rfkl94b2rz6avgq4h54g6b7x1jmx6b3sd";
+      sha256 = "05h3liirjx6wvh97vdl59hmwzgji1ih61xq1w5nl87cmhpsxaqsf";
       type = "gem";
     };
-    version = "3.17.0";
+    version = "3.17.2";
   };
   mercenary = {
     groups = ["default"];
@@ -79,20 +79,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sxjnpjvrn10gdmfw2dimhch861lz00f28hvkkz0b1gc2rb65k9s";
+      sha256 = "1nif9bn7zlizfcsk464b8n5gvspdim34hl7ldw2y7w4lcnwgg4zg";
       type = "gem";
     };
-    version = "2.0.2";
+    version = "2.0.3";
   };
   parallel = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wci3dimgrap91nw5vnq4qa2vfmxga27m6sfmn8caskhzwxwv1dg";
+      sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
       type = "gem";
     };
-    version = "1.20.0";
+    version = "1.20.1";
   };
   public_suffix = {
     groups = ["default"];

From 2c721183f7a840247ac3da37bc0575f70b223393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20P=C3=A4tzel?=
 <david.paetzel@informatik.uni-augsburg.de>
Date: Mon, 23 Nov 2020 15:57:45 +0100
Subject: [PATCH 3411/3942] pythonPackages.mesa: unstable-2019-12-09 -> 0.8.7

---
 pkgs/development/python-modules/mesa/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix
index f8fc43808fb3..78c0f1656a3c 100644
--- a/pkgs/development/python-modules/mesa/default.nix
+++ b/pkgs/development/python-modules/mesa/default.nix
@@ -4,8 +4,7 @@
 
 buildPythonPackage rec {
   pname = "mesa";
-  # contains several fixes for networkx 2.4 bump
-  version = "unstable-2019-12-09";
+  version = "0.8.7";
 
   # According to their docs, this library is for Python 3+.
   disabled = isPy27;
@@ -13,8 +12,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "projectmesa";
     repo = "mesa";
-    rev = "86b343b42630e94d939029ff2cc609ff04ed40e9";
-    sha256 = "1y41s1vd89vcsm4aia18ayfff4w2af98lwn5l9fcwp157li985vw";
+    rev = "v${version}";
+    sha256 = "0i1bpdqjrx4avgrzyqxpwxx86j11yhrq1j4kca854xahvhmwis19";
   };
 
   checkInputs = [ pytest ];

From 48ba279287e544f77fb908c80e169ff9ea6e4148 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 23 Nov 2020 18:46:04 +0100
Subject: [PATCH 3412/3942] webkitgtk: 2.30.2 -> 2.30.3

Fixes processing of malicousliy crafted web content which could lead to
- CVE-2020-13584: arbitrary code execution due to a use after free issue
- CVE-2020-9983: code execution due to an out-of-bounds write issue

Advisory at https://webkitgtk.org/security/WSA-2020-0008.html

Fixes: CVE-2090-13584, CVE-2020-9983
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 8d52e8703a94..a3412e1b0b72 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -59,7 +59,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "webkitgtk";
-  version = "2.30.2";
+  version = "2.30.3";
 
   outputs = [ "out" "dev" ];
 
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "0ak8slddg7gpk6m096xzkiqw9bfsrrizvqr815bw44665fyf0ry4";
+    sha256 = "0zsy3say94d9bhaan0l6mfr59z03a5x4kngyy8b2i20n77q19skd";
   };
 
   patches = optionals stdenv.isLinux [

From 0f8801c8934022467382a0c4a68dc6d58e0949f2 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sat, 24 Oct 2020 14:54:46 +0200
Subject: [PATCH 3413/3942] nextpnr: unpin Qt version

The current version of nextpnr works fine with the latest QT version.
It was pinned to Qt 5.14 in 22167ae45fb27fac1e6aec7d1bf6ce82516fcb12.
---
 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 fb084b8ea013..157910a5e828 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9770,7 +9770,7 @@ in
 
   neko = callPackage ../development/compilers/neko { };
 
-  nextpnr = libsForQt514.callPackage ../development/compilers/nextpnr {
+  nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr {
     inherit (darwin.apple_sdk.frameworks) OpenGL;
   };
 

From c8d1e5d3d3420e5de897df3a91e800865257fed5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 23 Nov 2020 17:43:08 +0100
Subject: [PATCH 3414/3942] cargo-c: 0.6.15 -> 0.6.18

---
 pkgs/development/tools/rust/cargo-c/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix
index 41c03923ec05..ee0074f7d839 100644
--- a/pkgs/development/tools/rust/cargo-c/default.nix
+++ b/pkgs/development/tools/rust/cargo-c/default.nix
@@ -5,7 +5,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-c";
-  version = "0.6.15";
+  version = "0.6.18";
 
   src = stdenv.mkDerivation rec {
     name = "${pname}-source-${version}";
@@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec {
       owner = "lu-zero";
       repo = pname;
       rev = "v${version}";
-      sha256 = "04hrk3vy8294vxcsggdpcs8hg3ykzj2564ifsqc4zwz4b4wd1p8l";
+      sha256 = "1dh5z210nl8grjxb8zxch8h7799w61bah7r2j0s07091rcpfsrsb";
     };
     cargoLock = fetchurl {
       url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock";
-      sha256 = "0rqb6ssqsdlm8zbshbxkwxlyy7j7p2gyficavzz33cw9g6fpmzbd";
+      sha256 = "1h5wmfmm2a2ilyw3ar88rqm7yvdc2vhyx4pgg781615ax52fhjli";
     };
 
     installPhase = ''
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoSha256 = "1q2s28nqd6l9qmhmdksdjjlypxry5ff18i2pgwmgiilcry51mj4b";
+  cargoSha256 = "0ll9p2rbnw46zd9m2bmdmn99v9jjjf8i33xpkvd1rx42ki7sys62";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ]

From 552eb717c13d933f84c5a742b1316d498f040f7c Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Mon, 23 Nov 2020 19:59:34 +0200
Subject: [PATCH 3415/3942] pythonPackages.hcloud: 1.9.1 -> 1.10.0

---
 pkgs/development/python-modules/hcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index 9a99fb0953a2..8f9d69a8941d 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "hcloud";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "069bf78a3c6cd642aae0b1a562b443d2670e6d73d507ce77cbf8a2c16974ca29";
+    sha256 = "11sdyays90lmkbdxhllc8ccx0xhrafb7dknqgjlrfpzq04v67vyy";
   };
 
   propagatedBuildInputs = [ future requests python-dateutil ];

From 91e1cc12be1a08f5623735c95895cdcb6236e0d2 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 23 Nov 2020 13:16:49 -0500
Subject: [PATCH 3416/3942] yed: mark as broken if jre.gtk3 is not available

This cleans up nixpkgs-review report on darwin
---
 pkgs/applications/graphics/yed/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index 7eb0851834fc..fb74c3d2d1a7 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ];
   # For wrapGAppsHook setup hook
-  buildInputs = [ jre.gtk3 ];
+  buildInputs = [ (jre.gtk3 or null) ];
 
   dontConfigure = true;
   dontBuild = true;
@@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
     description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams";
     platforms = jre.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
+    broken = !("gtk3" ? jre);
   };
 }

From a319fd5d66bf760274ea13851b153335070afa05 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Tue, 17 Nov 2020 16:37:22 -0500
Subject: [PATCH 3417/3942] python3Packages.nilearn: 0.6.2 -> 0.7.0

---
 .../python-modules/nilearn/default.nix        | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index c01715470f60..e1efdf26de80 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -1,26 +1,17 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, nose
-, nibabel, numpy, pandas, scikitlearn, scipy, matplotlib, joblib }:
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, matplotlib
+, nibabel, numpy, pandas, scikitlearn, scipy, joblib, requests }:
 
 buildPythonPackage rec {
   pname = "nilearn";
-  version = "0.6.2";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cfc6cfda59a6f4247189f8ccf92e364de450460a15c0ec21bdb857c420dd198c";
+    sha256 = "1rhpy6na7hkhc211ri14zghvmb2fxkh995wi09pkc68klf1dzjg7";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py --replace "required_packages.append('sklearn')" ""
-  '';
-  # https://github.com/nilearn/nilearn/issues/2288
-
-  # disable some failing tests
-  checkPhase = ''
-    pytest nilearn/tests -k 'not test_cache_mixin_with_expand_user'  # accesses ~/
-  '';
-
-  checkInputs = [ pytest nose ];
+  checkInputs = [ pytestCheckHook ];
+  disabledTests = [ "test_clean_confounds" ];  # https://github.com/nilearn/nilearn/issues/2608
 
   propagatedBuildInputs = [
     joblib
@@ -28,12 +19,13 @@ buildPythonPackage rec {
     nibabel
     numpy
     pandas
+    requests
     scikitlearn
     scipy
   ];
 
-  meta = with stdenv.lib; {
-    homepage = "http://nilearn.github.io";
+  meta = with lib; {
+    homepage = "https://nilearn.github.io";
     description = "A module for statistical learning on neuroimaging data";
     license = licenses.bsd3;
   };

From 8330d131200a49643be8cd320b20d8e369c1f0e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 16:08:27 +0000
Subject: [PATCH 3418/3942] rootlesskit: 0.11.0 -> 0.11.1

---
 pkgs/tools/virtualization/rootlesskit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix
index 7edbeee88b51..61da0d86e33b 100644
--- a/pkgs/tools/virtualization/rootlesskit/default.nix
+++ b/pkgs/tools/virtualization/rootlesskit/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   pname = "rootlesskit";
-  version = "0.11.0";
+  version = "0.11.1";
   goPackagePath = "github.com/rootless-containers/rootlesskit";
 
   src = fetchFromGitHub {
     owner = "rootless-containers";
     repo = "rootlesskit";
     rev = "v${version}";
-    sha256 = "1x5f02yw5bzkjwg7lcsa7549d8fj13dnk596rgg90q0z6vqfarzj";
+    sha256 = "15k0503077ang9ywvmhpr1l7ax0v3wla0x8n6lqpmd71w0j2zm5r";
   };
 
   meta = with lib; {

From 00401a2f75e6286c9db6018748f1734485660d3c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 15:43:03 +0000
Subject: [PATCH 3419/3942] react-native-debugger: 0.11.4 -> 0.11.5

---
 pkgs/development/tools/react-native-debugger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index 3cb5ae2b9306..6ee5e884ea2d 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -38,10 +38,10 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "react-native-debugger";
-  version = "0.11.4";
+  version = "0.11.5";
   src = fetchurl {
     url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip";
-    sha256 = "1dnlxdqcn90r509ff5003fibkrprdr0ydpnwg5p0xzs6rz3k8698";
+    sha256 = "0b917lihypx7ansy64dmwvgi943yy0n6fs8myam635bsr4l1srzb";
   };
 
   buildInputs = [ unzip ];

From 7851e2309190b5c639bf0e31b0ef62cc847d7e28 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Nov 2020 08:50:20 +0000
Subject: [PATCH 3420/3942] leatherman: 1.12.2 -> 1.12.3

---
 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 75cb2db4f1b5..a1de88ef1ca4 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "leatherman";
-  version = "1.12.2";
+  version = "1.12.3";
 
   src = fetchFromGitHub {
-    sha256 = "1iz8w0q4m7dqshjqfbwxwrasabs4j8jlil4w3kxdr3v9ldkl4v3d";
+    sha256 = "1mhj29n40z7bvn1ns61wf8812ikm2mpc0d5ip0ha920z0anzqhwr";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";

From f1690744b335672104b7062358e6a6272ce5ad65 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 13:16:12 +0000
Subject: [PATCH 3421/3942] python27Packages.pyside2: 5.15.1 -> 5.15.2

---
 pkgs/development/python-modules/pyside2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix
index ed0ab2d533aa..8133b677db28 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/pkgs/development/python-modules/pyside2/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pyside2";
-  version = "5.15.1";
+  version = "5.15.2";
 
   src = fetchurl {
     url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz";
-    sha256 = "1yn3f414ql8rrvwxlfpp2sckpmb89zj5iszgy1690mrjh7cc2xgi";
+    sha256 = "060ljj1nzyp4zfz2vasbv2i7gs5rfkkjwxxbisd0fdw01d5m01mk";
   };
 
   patches = [

From 66be617434c7120c89ae33dc3c97a9de374c131d Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 21 Nov 2020 02:27:24 +0100
Subject: [PATCH 3422/3942] mellowplayer: migrate to Qt5.15

---
 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 60529b0c3e0e..f0c6dc170bf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2879,7 +2879,7 @@ in
 
   clementineUnfree = clementine.unfree;
 
-  mellowplayer = libsForQt514.callPackage ../applications/audio/mellowplayer { };
+  mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { };
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 

From d38656bc48c668760e3493e49a6b3958e4cf25bf Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 20 Nov 2020 23:44:17 +0100
Subject: [PATCH 3423/3942] obs-ndi: migrate to Qt5.15

---
 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 f0c6dc170bf9..7e32adfa668b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22914,7 +22914,7 @@ in
 
   obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { };
 
-  obs-ndi = libsForQt514.callPackage ../applications/video/obs-studio/obs-ndi.nix { };
+  obs-ndi = libsForQt5.callPackage ../applications/video/obs-studio/obs-ndi.nix { };
 
   obsidian = callPackage ../applications/misc/obsidian { };
 

From 1a3f5049fbe859712c8d95012ec9c1f05d222808 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Nov 2020 08:42:36 +0000
Subject: [PATCH 3424/3942] edbrowse: 3.7.6 -> 3.7.7

---
 pkgs/applications/editors/edbrowse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index c43640b65245..4e727e9a22a6 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "edbrowse";
-  version = "3.7.6";
+  version = "3.7.7";
 
   buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "CMB";
     repo = "edbrowse";
     rev = "v${version}";
-    sha256 = "0yk4djb9q8ll94fs57y706bsqlar4pfx6ysasvkzj146926lrh8a";
+    sha256 = "0cw9d60mdhwna57r1vxn53s8gl81rr3cxnvm769ifq3xyh49vfcf";
   };
   meta = with stdenv.lib; {
     description = "Command Line Editor Browser";

From 528831e57564f240aab76aa024f02d104315b25c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 11:07:52 +0000
Subject: [PATCH 3425/3942] wxsqlite3: 4.6.0 -> 4.6.1

---
 pkgs/development/libraries/wxsqlite3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix
index 9d80e5de4497..7bfc96fbf47c 100644
--- a/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/pkgs/development/libraries/wxsqlite3/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wxsqlite3";
-  version = "4.6.0";
+  version = "4.6.1";
 
   src = fetchFromGitHub {
     owner = "utelle";
     repo = "wxsqlite3";
     rev = "v${version}";
-    sha256 = "0snsysfrr5h66mybls8r8k781v732dlfn4jdnmk348jgvny275fj";
+    sha256 = "0q5glzr49rjnpp6iqrx7zr9bz4n2ca0q0i0phk7y27rmxzrgpxk1";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From a5da205cca0bca895bbeb4b2a7e66e888aa69393 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 10:48:46 +0000
Subject: [PATCH 3426/3942] windowchef: 0.5.1 -> 0.5.2

---
 pkgs/applications/window-managers/windowchef/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/windowchef/default.nix b/pkgs/applications/window-managers/windowchef/default.nix
index efba3863276d..0f65e4443ca4 100644
--- a/pkgs/applications/window-managers/windowchef/default.nix
+++ b/pkgs/applications/window-managers/windowchef/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "windowchef";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner  = "tudurom";
     repo   = "windowchef";
     rev    = "v${version}";
-    sha256 = "0fs5ss2z6qjxvmls0g2f3gmv8hshi81xsmmcjn9x7651rv9552pl";
+    sha256 = "1m4vly7w2f28lrj26rhh3x9xsp3d97m5cxj91fafgh5rds4ygyhp";
   };
 
   buildInputs = [ libxcb libXrandr xcbutil xcbutilkeysyms xcbutilwm xcbproto];

From 3b17793827c41c88421caa6600747226a5021402 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 05:07:17 +0000
Subject: [PATCH 3427/3942] star: 2.7.5c -> 2.7.6a

---
 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 c331acbfe705..f2e1a2a8fee5 100644
--- a/pkgs/applications/science/biology/star/default.nix
+++ b/pkgs/applications/science/biology/star/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "star";
-  version = "2.7.5c";
+  version = "2.7.6a";
 
   src = fetchFromGitHub {
     repo = "STAR";
     owner = "alexdobin";
     rev = version;
-    sha256 = "1plx9akrzwjk7f2j94l9ss0apg0asqmrf2bp0728d4bvlhnzmjyy";
+    sha256 = "1zw9f4jbhz0y51namnmid42pa7pviviy94q9db8w0774nksdf8is";
   };
 
   sourceRoot = "source/source";

From a748764be41952b0ecf291c28cd12ae5f7a746af Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 23 Nov 2020 08:55:01 -0800
Subject: [PATCH 3428/3942] amoeba: xlibs -> xorg, fix borg

---
 pkgs/games/amoeba/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix
index 945a9e8df212..8c4d9ef10926 100644
--- a/pkgs/games/amoeba/default.nix
+++ b/pkgs/games/amoeba/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xlibs, pkgconfig }:
+{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "amoeba-${version}-${debver}";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU xlibs.libXxf86vm ];
+  buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU xorg.libXxf86vm ];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/man/man1/

From ecbe92e57616a22f8c4ec50a7f3832f28972dd79 Mon Sep 17 00:00:00 2001
From: Dave Anderson <dave@natulte.net>
Date: Mon, 23 Nov 2020 11:40:42 -0800
Subject: [PATCH 3429/3942] influxdb2: init at v2.0.2 (#104484)

Signed-off-by: David Anderson <dave@natulte.net>
---
 pkgs/servers/nosql/influxdb2/default.nix | 123 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |   1 +
 2 files changed, 124 insertions(+)
 create mode 100644 pkgs/servers/nosql/influxdb2/default.nix

diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
new file mode 100644
index 000000000000..a0dee4cd5f13
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -0,0 +1,123 @@
+{ buildGoModule
+, buildGoPackage
+, fetchFromGitHub
+, go-bindata
+, lib
+, llvmPackages
+, mkYarnPackage
+, pkg-config
+, rustPlatform
+, ... }:
+let
+  version = "2.0.2";
+  shorthash = "84496e507a"; # git rev-parse HEAD with 2.0.2 checked out
+  libflux_version = "0.95.0";
+
+  src = fetchFromGitHub {
+    owner = "influxdata";
+    repo = "influxdb";
+    rev = "v${version}";
+    sha256 = "05s09crqgbyfdck33zwax5l47jpc4wh04yd8zsm658iksdgzpmnn";
+  };
+
+  ui = mkYarnPackage {
+    src = src;
+    packageJSON = "${src}/ui/package.json";
+    yarnLock = "${src}/ui/yarn.lock";
+    configurePhase = ''
+      cp -r $node_modules ui/node_modules
+      rsync -r $node_modules/../deps/chronograf-ui/node_modules/ ui/node_modules
+    '';
+    INFLUXDB_SHA = shorthash;
+    buildPhase = ''
+      pushd ui
+      yarn build:ci
+      popd
+    '';
+    installPhase = ''
+      mv ui/build $out
+    '';
+    distPhase = "true";
+  };
+
+  flux = rustPlatform.buildRustPackage {
+    pname = "libflux";
+    version = "v${libflux_version}";
+    src = fetchFromGitHub {
+      owner = "influxdata";
+      repo = "flux";
+      rev = "v${libflux_version}";
+      sha256 = "07jz2nw3zswg9f4p5sb5r4hpg3n4qibjcgs9sk9csns70h5rp9j3";
+    };
+    sourceRoot = "source/libflux";
+    cargoSha256 = "0y5xjkqpaxp9qq1qj39zw3mnvkbbb9g4fa5cli77nhfwz288xx6h";
+    nativeBuildInputs = [ llvmPackages.libclang ];
+    LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
+    pkgcfg = ''
+      Name: flux
+      Version: ${libflux_version}
+      Description: Library for the InfluxData Flux engine
+      Cflags: -I/out/include
+      Libs: -L/out/lib -lflux -ldl -lpthread
+    '';
+    passAsFile = [ "pkgcfg" ];
+    postInstall = ''
+      mkdir -p $out/include $out/pkgconfig
+      cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
+      substitute $pkgcfgPath $out/pkgconfig/flux.pc \
+        --replace /out $out
+    '';
+  };
+
+  # Can't use the nixpkgs version of go-bindata, it's an ancient
+  # ancestor of this more modern one.
+  bindata = buildGoPackage {
+    pname = "go-bindata";
+    version = "v3.22.0";
+    src = fetchFromGitHub {
+      owner = "kevinburke";
+      repo = "go-bindata";
+      rev = "v3.22.0";
+      sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x";
+    };
+
+    goPackagePath = "github.com/kevinburke/go-bindata";
+    subPackages = [ "go-bindata" ];
+  };
+in buildGoModule {
+  pname = "influxdb";
+  version = version;
+  src = src;
+
+  nativeBuildInputs = [ bindata pkg-config ];
+
+  vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a";
+  subPackages = [ "cmd/influxd" "cmd/influx" ];
+
+  PKG_CONFIG_PATH = "${flux}/pkgconfig";
+  # We have to run a bunch of go:generate commands to embed the UI
+  # assets into the source code. Ideally we'd run `make generate`, but
+  # that ends up running a ton of non-hermetic stuff. Instead, we find
+  # the relevant go:generate directives, and run them by hand without
+  # breaking hermeticity.
+  preBuild = ''
+    ln -s ${ui} ui/build
+    grep -RI -e 'go:generate.*go-bindata' | cut -f1 -d: | while read -r filename; do
+      sed -i -e 's/go:generate.*go-bindata/go:generate go-bindata/' $filename
+      pushd $(dirname $filename)
+      go generate
+      popd
+    done
+    export buildFlagsArray=(
+      -tags="assets"
+      -ldflags="-X main.commit=${shorthash} -X main.version=${version}"
+    )
+  '';
+
+  meta = with lib; {
+    description = "An open-source distributed time series database";
+    license = licenses.mit;
+    homepage = "https://influxdata.com/";
+    maintainers = with maintainers; [ danderson ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e32adfa668b..f5ec64155f0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17242,6 +17242,7 @@ in
   };
 
   influxdb = callPackage ../servers/nosql/influxdb { };
+  influxdb2 = callPackage ../servers/nosql/influxdb2 { };
 
   mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {
     inherit (darwin) cctools developer_cmds;

From 5651b121cf13d02d2461ea2ea0a0fbeded73bb26 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 02:21:13 +0000
Subject: [PATCH 3430/3942] seafile-shared: 7.0.8 -> 7.0.9

---
 pkgs/misc/seafile-shared/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 21a89e5f5f2e..8db6995b6fae 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "seafile-shared";
-  version = "7.0.8";
+  version = "7.0.9";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile";
     rev = "v${version}";
-    sha256 = "0q0zylv8hkhnfw0084bj1wmqwqvpflmdy1njxvvkjsbnflh8kc2y";
+    sha256 = "1n0jq6d6vgk58qmqgdr7w7jfgcrlicnaafz1za9qf76sbi5vc6fk";
   };
 
   nativeBuildInputs = [

From c6b859ccaba9a2eb47dd70495a83d71a4ea40127 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Nov 2020 15:52:04 +0000
Subject: [PATCH 3431/3942] asciidoctorj: 2.4.1 -> 2.4.2

---
 pkgs/tools/typesetting/asciidoctorj/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix
index 08351dd6f3e9..391c78814e77 100644
--- a/pkgs/tools/typesetting/asciidoctorj/default.nix
+++ b/pkgs/tools/typesetting/asciidoctorj/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "asciidoctorj";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchzip {
     url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
-    sha256 = "1m00cdg1520ampg3i2j64si8gmwph7j4189agjlimx3fjjsp3xrh";
+    sha256 = "1b4ivyzpg9p3idk48nfvgpz18qlxyycswkaab31j3dp1mniwvjla";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 297606f8e3febcb473acc3eb0ee93d9b73dc09e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Nov 2020 08:54:03 +0000
Subject: [PATCH 3432/3942] ibus-engines.bamboo: 0.6.6 -> 0.6.7

---
 pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
index b34206e6cf6d..2dc667277dd0 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-bamboo";
-  version = "0.6.6";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "BambooEngine";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0bjcc2dm6c6s0v271nyslmwf5z0xxpcbvmk4lyirs48hc1bzv3n6";
+    sha256 = "0w3z36p8d3a04fgzc12xnpdkg6h8alfgqy5rjxbwqwi25h3byj6k";
   };
 
   nativeBuildInputs = [

From bcadf391f24f796029c3642c19d84cdbad0628b5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 06:06:23 +0000
Subject: [PATCH 3433/3942] xmlbird: 1.2.11 -> 1.2.12

---
 pkgs/tools/misc/birdfont/xmlbird.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix
index eddcba1c9c89..2d0d43871e83 100644
--- a/pkgs/tools/misc/birdfont/xmlbird.nix
+++ b/pkgs/tools/misc/birdfont/xmlbird.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xmlbird";
-  version = "1.2.11";
+  version = "1.2.12";
 
   src = fetchurl {
     url = "https://birdfont.org/${pname}-releases/lib${pname}-${version}.tar.xz";
-    sha256 = "1ycbgjvywnlc0garw8qjqd18s0xnrwjvssdrb410yschv3wjq1i0";
+    sha256 = "15z4rvii3p54g2hasibjnf83c1702d84367fnl8pbisjqqrdcl04";
   };
 
   nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection ];

From 7dbda4fab8ce08b70f70cb0863579b48eaedbecb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 21 Oct 2020 18:13:16 +0000
Subject: [PATCH 3434/3942] ace: 6.5.10 -> 6.5.11

---
 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 b2a31edd0b63..49c8e14a74f4 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ace";
-  version = "6.5.10";
+  version = "6.5.11";
 
   src = fetchurl {
     url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
-    sha256 = "1qnq63r9cnaaqb5yrbb7apr7kjl6x31wfclizplri3lj4rwl7plh";
+    sha256 = "0fbbysy6aymys30zh5m2bygs84dwwjnbsdl9ipj1rvfrhq8jbylb";
   };
 
   enableParallelBuilding = true;

From 9590abfb8d5a01de93ca8c58e9338bef4d04c8c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Oct 2020 10:34:54 +0000
Subject: [PATCH 3435/3942] gpac: 1.0.0 -> 1.0.1

---
 pkgs/applications/video/gpac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix
index 4fcff75f0956..aa66155d17ac 100644
--- a/pkgs/applications/video/gpac/default.nix
+++ b/pkgs/applications/video/gpac/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pkgconfig, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.0.1";
   pname = "gpac";
 
   src = fetchFromGitHub {
     owner = "gpac";
     repo = "gpac";
     rev = "v${version}";
-    sha256 = "11jrklaahhdfqhci7f3lzv8wchh9bc91rg6w8ibh6varrk692vsb";
+    sha256 = "0gj46jpprfqv3wyagblv3a52chbplyzhvpra66v63czjibqsslm5";
   };
 
   postPatch = ''

From 7733a2c84c11dd1a7ad05d8575896606009cb103 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 17 Oct 2020 14:54:25 +0000
Subject: [PATCH 3436/3942] alembic: 1.7.14 -> 1.7.15

---
 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 1bb79a64ba10..b6914f944aa2 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec
 {
   pname = "alembic";
-  version = "1.7.14";
+  version = "1.7.15";
 
   src = fetchFromGitHub {
     owner = "alembic";
     repo = "alembic";
     rev = version;
-    sha256 = "0yri063v7j5jsvqbmlwr0hf2d1a55dgc1nj85rf10sxqhijwzk55";
+    sha256 = "1jqc98pc6gfxsbfdar7x3nlaywyibix8gl9gvs44zwrdi5mpiiyc";
   };
 
   outputs = [ "bin" "dev" "out" "lib" ];

From 05a2e9df787e70f54bafa0292e9e0393c5ae3260 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Nov 2020 05:30:02 +0000
Subject: [PATCH 3437/3942] profile-sync-daemon: 6.40 -> 6.42

---
 pkgs/tools/misc/profile-sync-daemon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index 7d68ada2c1bc..5c4a3301d272 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, utillinux, coreutils}:
 
 stdenv.mkDerivation rec {
-  version = "6.40";
+  version = "6.42";
   pname = "profile-sync-daemon";
 
   src = fetchurl {
     url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
-    sha256 = "1z1n7dqbkk0x9w2pq71nf93wp4hrzin4a0hcvfynj1khf12z369h";
+    sha256 = "1x47ydrwawkic5cgzp0ikd99g1hbpzc2aalq9z630vm13yw2adnp";
   };
 
   installPhase = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sed -i '/^HOME/d' $out/bin/profile-sync-daemon
     substituteInPlace $out/bin/psd-overlay-helper \
       --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin:${coreutils}/bin" \
-      --replace "sudo " "/run/wrappers/bin/sudo " 
+      --replace "sudo " "/run/wrappers/bin/sudo "
   '';
 
   preferLocalBuild = true;

From f54b45810bc8ca9b7c8c1c4a72b5ed470fa9ac33 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Nov 2020 08:18:26 +0000
Subject: [PATCH 3438/3942] knightos-mkrom: 1.0.2 -> 1.0.3

---
 pkgs/development/tools/knightos/mkrom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/knightos/mkrom/default.nix b/pkgs/development/tools/knightos/mkrom/default.nix
index 380bdc58d49b..46482a849134 100644
--- a/pkgs/development/tools/knightos/mkrom/default.nix
+++ b/pkgs/development/tools/knightos/mkrom/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mkrom";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "KnightOS";
     repo = "mkrom";
     rev = version;
-    sha256 = "1nx3787gvs04xdvvamzkjkn9nmy2w70ja8dnh4szk420mvpc85na";
+    sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2";
   };
 
   nativeBuildInputs = [

From c07793291e7176b581443d36fc717ac06e9de802 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 15 Oct 2020 06:25:43 +0000
Subject: [PATCH 3439/3942] vcstool: 0.2.9 -> 0.2.14

---
 pkgs/development/tools/vcstool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index 9657543e0c70..f86e2857feea 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -5,11 +5,11 @@ with python3Packages;
 
 buildPythonApplication rec {
   pname = "vcstool";
-  version = "0.2.9";
+  version = "0.2.14";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lb0j120sj76swi702ah6ryn770m1y7gh69237zxpyh897pn5paa";
+    sha256 = "c51300f074ea9c5da162ed8f3bc354c3fd69564895fee90abf1e1bd525919f2b";
   };
 
   propagatedBuildInputs = [ pyyaml setuptools ];

From fbc4af5725bb8e3449ac84bffb870a3f4047220b Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 23 Nov 2020 14:55:26 -0500
Subject: [PATCH 3440/3942] Revert "influxdb2: init at v2.0.2 (#104484)"

This reverts commit ecbe92e57616a22f8c4ec50a7f3832f28972dd79.
---
 pkgs/servers/nosql/influxdb2/default.nix | 123 -----------------------
 pkgs/top-level/all-packages.nix          |   1 -
 2 files changed, 124 deletions(-)
 delete mode 100644 pkgs/servers/nosql/influxdb2/default.nix

diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
deleted file mode 100644
index a0dee4cd5f13..000000000000
--- a/pkgs/servers/nosql/influxdb2/default.nix
+++ /dev/null
@@ -1,123 +0,0 @@
-{ buildGoModule
-, buildGoPackage
-, fetchFromGitHub
-, go-bindata
-, lib
-, llvmPackages
-, mkYarnPackage
-, pkg-config
-, rustPlatform
-, ... }:
-let
-  version = "2.0.2";
-  shorthash = "84496e507a"; # git rev-parse HEAD with 2.0.2 checked out
-  libflux_version = "0.95.0";
-
-  src = fetchFromGitHub {
-    owner = "influxdata";
-    repo = "influxdb";
-    rev = "v${version}";
-    sha256 = "05s09crqgbyfdck33zwax5l47jpc4wh04yd8zsm658iksdgzpmnn";
-  };
-
-  ui = mkYarnPackage {
-    src = src;
-    packageJSON = "${src}/ui/package.json";
-    yarnLock = "${src}/ui/yarn.lock";
-    configurePhase = ''
-      cp -r $node_modules ui/node_modules
-      rsync -r $node_modules/../deps/chronograf-ui/node_modules/ ui/node_modules
-    '';
-    INFLUXDB_SHA = shorthash;
-    buildPhase = ''
-      pushd ui
-      yarn build:ci
-      popd
-    '';
-    installPhase = ''
-      mv ui/build $out
-    '';
-    distPhase = "true";
-  };
-
-  flux = rustPlatform.buildRustPackage {
-    pname = "libflux";
-    version = "v${libflux_version}";
-    src = fetchFromGitHub {
-      owner = "influxdata";
-      repo = "flux";
-      rev = "v${libflux_version}";
-      sha256 = "07jz2nw3zswg9f4p5sb5r4hpg3n4qibjcgs9sk9csns70h5rp9j3";
-    };
-    sourceRoot = "source/libflux";
-    cargoSha256 = "0y5xjkqpaxp9qq1qj39zw3mnvkbbb9g4fa5cli77nhfwz288xx6h";
-    nativeBuildInputs = [ llvmPackages.libclang ];
-    LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
-    pkgcfg = ''
-      Name: flux
-      Version: ${libflux_version}
-      Description: Library for the InfluxData Flux engine
-      Cflags: -I/out/include
-      Libs: -L/out/lib -lflux -ldl -lpthread
-    '';
-    passAsFile = [ "pkgcfg" ];
-    postInstall = ''
-      mkdir -p $out/include $out/pkgconfig
-      cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
-      substitute $pkgcfgPath $out/pkgconfig/flux.pc \
-        --replace /out $out
-    '';
-  };
-
-  # Can't use the nixpkgs version of go-bindata, it's an ancient
-  # ancestor of this more modern one.
-  bindata = buildGoPackage {
-    pname = "go-bindata";
-    version = "v3.22.0";
-    src = fetchFromGitHub {
-      owner = "kevinburke";
-      repo = "go-bindata";
-      rev = "v3.22.0";
-      sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x";
-    };
-
-    goPackagePath = "github.com/kevinburke/go-bindata";
-    subPackages = [ "go-bindata" ];
-  };
-in buildGoModule {
-  pname = "influxdb";
-  version = version;
-  src = src;
-
-  nativeBuildInputs = [ bindata pkg-config ];
-
-  vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a";
-  subPackages = [ "cmd/influxd" "cmd/influx" ];
-
-  PKG_CONFIG_PATH = "${flux}/pkgconfig";
-  # We have to run a bunch of go:generate commands to embed the UI
-  # assets into the source code. Ideally we'd run `make generate`, but
-  # that ends up running a ton of non-hermetic stuff. Instead, we find
-  # the relevant go:generate directives, and run them by hand without
-  # breaking hermeticity.
-  preBuild = ''
-    ln -s ${ui} ui/build
-    grep -RI -e 'go:generate.*go-bindata' | cut -f1 -d: | while read -r filename; do
-      sed -i -e 's/go:generate.*go-bindata/go:generate go-bindata/' $filename
-      pushd $(dirname $filename)
-      go generate
-      popd
-    done
-    export buildFlagsArray=(
-      -tags="assets"
-      -ldflags="-X main.commit=${shorthash} -X main.version=${version}"
-    )
-  '';
-
-  meta = with lib; {
-    description = "An open-source distributed time series database";
-    license = licenses.mit;
-    homepage = "https://influxdata.com/";
-    maintainers = with maintainers; [ danderson ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5ec64155f0e..7e32adfa668b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17242,7 +17242,6 @@ in
   };
 
   influxdb = callPackage ../servers/nosql/influxdb { };
-  influxdb2 = callPackage ../servers/nosql/influxdb2 { };
 
   mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {
     inherit (darwin) cctools developer_cmds;

From 83352630d35824e954ee58dbb5e4fedb71ef5205 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Jun 2020 04:54:42 +0000
Subject: [PATCH 3441/3942] chrome-token-signing: 1.1.2 -> 1.1.2-1

---
 pkgs/tools/security/chrome-token-signing/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix
index 19dd9e9819af..0065758e1c3f 100644
--- a/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/pkgs/tools/security/chrome-token-signing/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "chrome-token-signing";
-  version = "1.1.2";
+  version = "1.1.2-1";
 
   src = fetchFromGitHub {
     owner = "open-eid";
     repo = "chrome-token-signing";
     rev = "v${version}";
-    sha256 = "0fqgci4336fbnd944zx9w37d5ky7i27n6wvlp5zv3hj955ldbh7g";
+    sha256 = "1vbghy12fjmq4m5l7hisq1ylnzy0rdnnd920xwamjamlx38jj3ln";
   };
 
   buildInputs = [ qmake pcsclite pkgconfig ];

From 9ac42658f96d5561f8c6f50ab06e7b43f9bf5196 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 23 Nov 2020 15:42:27 +0100
Subject: [PATCH 3442/3942] dash: add patch to prevent code execution when
 noexec is set

Dashs noexec flag `-n` did not work as documented, which could result in
code being inadvertently executed.
---
 pkgs/shells/dash/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix
index 030e5695b225..bc270daf09cf 100644
--- a/pkgs/shells/dash/default.nix
+++ b/pkgs/shells/dash/default.nix
@@ -1,17 +1,25 @@
 { stdenv, buildPackages, autoreconfHook, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dash-0.5.11.2";
+  pname = "dash";
+  version = "0.5.11.2";
 
   src = fetchurl {
-    url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
+    url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz";
     sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0";
   };
 
   hardeningDisable = [ "format" ];
 
   # Temporary fix until a proper one is accepted upstream
-  patches = stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch;
+  patches = [
+    (fetchurl {
+      # Dash executes code when noexec ("-n") is specified
+      # https://www.openwall.com/lists/oss-security/2020/11/11/3
+      url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e";
+      sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5";
+    })
+  ] ++ stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch;
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
 

From 3ec7527f6e75b84b4268ec1e0baf69f6ef57567c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Mon, 23 Nov 2020 12:54:41 -0600
Subject: [PATCH 3443/3942] recoll: refactor and 1.24.5 -> 1.27.12

Refactor Changes:

- name -> pname + version
- python2 -> python3
- add pkg-config (to find libxslt)
- patch /usr/share/recoll to $out/share/recoll
- remove Makefile patch for macOS that has been merged upstream (
  https://framagit.org/medoc92/recoll/-/commit/b5c5734d064c638b702601fd391037a35b5bb2a1 )
---
 pkgs/applications/search/recoll/default.nix | 102 +++++++++++++-------
 1 file changed, 65 insertions(+), 37 deletions(-)

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index fe9719efdef8..4939fcf56627 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -1,60 +1,88 @@
-{ mkDerivation, stdenv, fetchurl, lib, bison
-, qtbase, xapian, file, python, perl
-, djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx
-, libwpd, unrtf, untex
-, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv, zlib
-, withGui ? true }:
+{ stdenv
+, fetchurl
+, lib
+, mkDerivation
+, antiword
+, bison
+, catdoc
+, chmlib
+, djvulibre
+, file
+, gawk
+, ghostscript
+, gnugrep
+, gnused
+, gnutar
+, groff
+, gzip
+, libiconv
+, libwpd
+, libxslt
+, lyx
+, perl
+, pkg-config
+, poppler_utils
+, python3Packages
+, qtbase
+, unrtf
+, untex
+, unzip
+, which
+, xapian
+, zlib
+, withGui ? true
+}:
 
 assert stdenv.hostPlatform.system != "powerpc-linux";
 
 mkDerivation rec {
-  ver = "1.24.5";
-  name = "recoll-${ver}";
+  pname = "recoll";
+  version = "1.27.12";
 
   src = fetchurl {
-    url = "https://www.lesbonscomptes.com/recoll/${name}.tar.gz";
-    sha256 = "10m3a0ghnyipjcxapszlr8adyy2yaaxx4vgrkxrfmz13814z89cv";
+    url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "0bgadm8p319fws66ca4rpv9fx2bllbphgn892rh78db81lz20i5v";
   };
 
   configureFlags = [ "--enable-recollq" "--disable-webkit" ]
     ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ]
     ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]);
 
-  buildInputs = [ xapian file python bison zlib ]
-    ++ lib.optional withGui qtbase
-    ++ lib.optional stdenv.isDarwin libiconv;
+  nativeBuildInputs = [ pkg-config ];
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.am
-    sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.in
-  '';
+  buildInputs = with python3Packages; [
+    bison chmlib file python setuptools which xapian zlib
+  ] ++ lib.optional withGui qtbase
+    ++ lib.optional stdenv.isDarwin libiconv;
 
   # the filters search through ${PATH} using a sh proc 'checkcmds' for the
   # filtering utils. Short circuit this by replacing the filtering command with
   # the absolute path to the filtering command.
   postInstall = ''
+    substituteInPlace $out/lib/*/site-packages/recoll/rclconfig.py --replace /usr/share/recoll $out/share/recoll
+    substituteInPlace $out/share/recoll/filters/rclconfig.py       --replace /usr/share/recoll $out/share/recoll
     for f in $out/share/recoll/filters/* ; do
       if [[ ! "$f" =~ \.zip$ ]]; then
-        substituteInPlace  $f --replace '"antiword"'      '"${lib.getBin antiword}/bin/antiword"'
-        substituteInPlace  $f --replace '"awk"'           '"${lib.getBin gawk}/bin/awk"'
-        substituteInPlace  $f --replace '"catppt"'        '"${lib.getBin catdoc}/bin/catppt"'
-        substituteInPlace  $f --replace '"djvused"'       '"${lib.getBin djvulibre}/bin/djvused"'
-        substituteInPlace  $f --replace '"djvutxt"'       '"${lib.getBin djvulibre}/bin/djvutxt"'
-        substituteInPlace  $f --replace '"egrep"'         '"${lib.getBin gnugrep}/bin/egrep"'
-        substituteInPlace  $f --replace '"groff"'         '"${lib.getBin groff}/bin/groff"'
-        substituteInPlace  $f --replace '"gunzip"'        '"${lib.getBin gzip}/bin/gunzip"'
-        substituteInPlace  $f --replace '"iconv"'         '"${lib.getBin libiconv}/bin/iconv"'
-        substituteInPlace  $f --replace '"pdftotext"'     '"${lib.getBin poppler_utils}/bin/pdftotext"'
-        substituteInPlace  $f --replace '"pstotext"'      '"${lib.getBin ghostscript}/bin/ps2ascii"'
-        substituteInPlace  $f --replace '"sed"'           '"${lib.getBin gnused}/bin/sed"'
-        substituteInPlace  $f --replace '"tar"'           '"${lib.getBin gnutar}/bin/tar"'
-        substituteInPlace  $f --replace '"unzip"'         '"${lib.getBin unzip}/bin/unzip"'
-        substituteInPlace  $f --replace '"xls2csv"'       '"${lib.getBin catdoc}/bin/xls2csv"'
-        substituteInPlace  $f --replace '"xsltproc"'      '"${lib.getBin libxslt}/bin/xsltproc"'
-        substituteInPlace  $f --replace '"unrtf"'         '"${lib.getBin unrtf}/bin/unrtf"'
-        substituteInPlace  $f --replace '"untex"'         '"${lib.getBin untex}/bin/untex"'
-        substituteInPlace  $f --replace '"wpd2html"'      '"${lib.getBin libwpd}/bin/wpd2html"'
-        substituteInPlace  $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl
+        substituteInPlace $f --replace '"antiword"'  '"${lib.getBin antiword}/bin/antiword"'
+        substituteInPlace $f --replace '"awk"'       '"${lib.getBin gawk}/bin/awk"'
+        substituteInPlace $f --replace '"catppt"'    '"${lib.getBin catdoc}/bin/catppt"'
+        substituteInPlace $f --replace '"djvused"'   '"${lib.getBin djvulibre}/bin/djvused"'
+        substituteInPlace $f --replace '"djvutxt"'   '"${lib.getBin djvulibre}/bin/djvutxt"'
+        substituteInPlace $f --replace '"egrep"'     '"${lib.getBin gnugrep}/bin/egrep"'
+        substituteInPlace $f --replace '"groff"'     '"${lib.getBin groff}/bin/groff"'
+        substituteInPlace $f --replace '"gunzip"'    '"${lib.getBin gzip}/bin/gunzip"'
+        substituteInPlace $f --replace '"iconv"'     '"${lib.getBin libiconv}/bin/iconv"'
+        substituteInPlace $f --replace '"pdftotext"' '"${lib.getBin poppler_utils}/bin/pdftotext"'
+        substituteInPlace $f --replace '"pstotext"'  '"${lib.getBin ghostscript}/bin/ps2ascii"'
+        substituteInPlace $f --replace '"sed"'       '"${lib.getBin gnused}/bin/sed"'
+        substituteInPlace $f --replace '"tar"'       '"${lib.getBin gnutar}/bin/tar"'
+        substituteInPlace $f --replace '"unzip"'     '"${lib.getBin unzip}/bin/unzip"'
+        substituteInPlace $f --replace '"xls2csv"'   '"${lib.getBin catdoc}/bin/xls2csv"'
+        substituteInPlace $f --replace '"xsltproc"'  '"${lib.getBin libxslt}/bin/xsltproc"'
+        substituteInPlace $f --replace '"unrtf"'     '"${lib.getBin unrtf}/bin/unrtf"'
+        substituteInPlace $f --replace '"untex"'     '"${lib.getBin untex}/bin/untex"'
+        substituteInPlace $f --replace '"wpd2html"'  '"${lib.getBin libwpd}/bin/wpd2html"'
+        substituteInPlace $f --replace /usr/bin/perl   ${lib.getBin perl}/bin/perl
       fi
     done
   '' + stdenv.lib.optionalString stdenv.isLinux ''

From b741501c31f1ba6b74e62cfbb05d7bec5b8fcaa7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 23 Nov 2020 21:47:02 +0100
Subject: [PATCH 3444/3942] element-web: 1.7.13 -> 1.7.14

https://github.com/vector-im/element-web/releases/tag/v1.7.14
---
 .../networking/instant-messengers/element/element-web.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix
index 93f9e34f8671..46ac18af9ee5 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -12,11 +12,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "element-web";
-  version = "1.7.13";
+  version = "1.7.14";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "13ylzyr1kkrppvp86kih60pqxlsvqlcsgz2gj4azgmrf2bijfby3";
+    sha256 = "1wyk1si0dmlcskf25zmbijpz6505yzjxa7pvd3g2k9kxc49vi20j";
   };
 
   installPhase = ''

From 22acd9d2367d629f7c12f224c8aab83b8f64db7e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 23 Nov 2020 21:47:26 +0100
Subject: [PATCH 3445/3942] element-desktop: 1.7.13 -> 1.7.14

https://github.com/vector-im/element-desktop/releases/tag/v1.7.14
---
 .../instant-messengers/element/element-desktop-package.json   | 2 +-
 .../networking/instant-messengers/element/element-desktop.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index 871850fd6a69..f2d882ad75e4 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
   "name": "element-desktop",
   "productName": "Element",
   "main": "src/electron-main.js",
-  "version": "1.7.13",
+  "version": "1.7.14",
   "description": "A feature-rich client for Matrix.org",
   "author": "Element",
   "repository": {
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index 4f387045bb4b..9a3dab920f40 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -8,12 +8,12 @@
 
 let
   executableName = "element-desktop";
-  version = "1.7.13";
+  version = "1.7.14";
   src = fetchFromGitHub {
     owner = "vector-im";
     repo = "riot-desktop";
     rev = "v${version}";
-    sha256 = "04nm5amhc0bqqwcc1c9x88lnbjaaryfs0xhi4as65l5ac4jdkzjc";
+    sha256 = "04zqvj7n803dwp4jkhiihhynp82birb14vamm6ys39a0zgs91cnv";
   };
   electron = electron_9;
 

From aeadb4c3f5c04e35475428dd5079fcdf9225fd1f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 23 Nov 2020 22:03:13 +0100
Subject: [PATCH 3446/3942] trash-cli: 0.20.11.7 -> 0.20.11.23

---
 pkgs/tools/misc/trash-cli/default.nix | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 2f5a52531b9d..fce992acd31d 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -1,27 +1,17 @@
-{ stdenv, fetchFromGitHub, fetchpatch, coreutils
-, python3Packages, substituteAll }:
+{ stdenv, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "trash-cli";
-  version = "0.20.11.7";
+  version = "0.20.11.23";
 
   src = fetchFromGitHub {
     owner = "andreafrancia";
     repo = "trash-cli";
     rev = version;
-    sha256 = "0083vagy0jkahb5sw1il7r53ggk45zbjwwjsqd76v7ph3v1awf4v";
+    sha256 = "1fjkmpnbpzxniypql68cpwc2rrnih8b34p8pzabrf55f49wcmcph";
   };
 
-  patches = [
-    (substituteAll {
-      src = ./nix-paths.patch;
-      df = "${coreutils}/bin/df";
-      libc =
-        if stdenv.hostPlatform.isDarwin
-          then "/usr/lib/libSystem.dylib"
-          else "${stdenv.cc.libc}/lib/libc.so.6";
-    })
-  ];
+  propagatedBuildInputs = [ python3Packages.psutil ];
 
   checkInputs = with python3Packages; [
     nose

From 5e2e5d0dafdc9179336a63b20ef64d4e42749139 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 24 Nov 2020 08:01:26 +1000
Subject: [PATCH 3447/3942] youtube-dl: 2020.11.21.1 -> 2020.11.24

https://github.com/ytdl-org/youtube-dl/releases/tag/2020.11.24
---
 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 c56862e5f09f..739de18c5c9f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2020.11.21.1";
+  version = "2020.11.24";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0a9livib328z5j3kfndxys2193dvfs4hh38krx0idg0k26xp7cfl";
+    sha256 = "0yjkzv47vspl3hgz0dpvyikjv0w9bk6l91s1iaa7qbdlsvig4w3x";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];

From f7876c6bbffa47b2471c12c8889851aedf71155f Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 23 Nov 2020 17:02:44 +0000
Subject: [PATCH 3448/3942] bat: 0.16.0 -> 0.17.0

---
 pkgs/tools/misc/bat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index b84ef63edc92..b5fea3cc3a91 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bat";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "161pfix42j767ziyp4mslffdd20v9i0ncplvjw2pmpccwdm106kg";
+    sha256 = "118pqws32j2hx13vjda5wz1kfjfnb4h76wlj90q768na8b522kn0";
   };
 
-  cargoSha256 = "19vhhxfyx3nrngcs6dvwldnk9h4lvs7xjkb31aj1y0pyawz882h9";
+  cargoSha256 = "1r1gxpb0qsbl4245sqw3gsi33pigsj16z4cxii3fmsnq0y77yd5r";
 
   nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
 

From f54fa91b9aa47341fbd743572e82b80d75ac21c0 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 24 Nov 2020 01:11:29 +0300
Subject: [PATCH 3449/3942] =?UTF-8?q?josm:=2017084=20=E2=86=92=2017329?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/misc/josm/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index ea7672abf6e7..eab2519ad08e 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }:
 let
   pname = "josm";
-  version = "17084";
+  version = "17329";
   srcs = {
     jar = fetchurl {
       url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-      sha256 = "0avzpzmvv371jpbph9xpq0ia2nikha2aib9v10hr2f9q7vka9zx4";
+      sha256 = "0hra146akadqz9acj1xa2vzrmipfzf8li7sgsmk169xr991y653k";
     };
     macosx = fetchurl {
       url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip";
-      sha256 = "1vd2r4sshjpd6ic460cdil75skrm6f6q48lm6n3g1ywkn4mx63p1";
+      sha256 = "0i09jnfqbcirmic9vayrp78lnyk4mfh7ax3v3cs8kyqhk930pscf";
     };
     pkg = fetchsvn {
       url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
@@ -43,6 +43,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "An extensible editor for OpenStreetMap";
     homepage = "https://josm.openstreetmap.de/";
+    changelog = "https://josm.openstreetmap.de/wiki/Changelog";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ rycee sikmir ];
     platforms = platforms.all;

From 3d9ee22da3e3f8673981c39f854e1a538b2c247a Mon Sep 17 00:00:00 2001
From: Philipp <philipp+dev@xndr.de>
Date: Mon, 9 Nov 2020 22:04:35 +0100
Subject: [PATCH 3450/3942] wine{Unstable,Staging}: 5.20 -> 5.21

---
 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 c26b84ffa0aa..f36afbe4baa6 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 = "5.20";
+    version = "5.21";
     url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
-    sha256 = "sha256-j1Ui+M6+vbqhL1jhumcaEfZjcuCu33T7kyz1qJOQhhw=";
+    sha256 = "sha256-WhpcJUnRG84NZkAiDtb9MQQq/LyzZvR14My0eB0tKEA=";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "sha256-1oWoLb5w9g3wDghpvHpNsJCws7QoZ/E2dqxLuaIgi6o=";
+    sha256 = "sha256-8IIjdGyRZf2v0dVvinqA2gvjR5eCXxN3+tWj1eCjjWA=";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From dfcd45de58e124b401fc9c9497c4317433eb7243 Mon Sep 17 00:00:00 2001
From: Philipp <philipp+dev@xndr.de>
Date: Wed, 11 Nov 2020 09:48:38 +0100
Subject: [PATCH 3451/3942] wineStable: 5.0.2 -> 5.0.3

---
 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 f36afbe4baa6..8ea3ff183b0b 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 = "5.0.2";
+    version = "5.0.3";
     url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz";
-    sha256 = "1g7c5djbi262h6zivmxbk26rsflwq8mrghr7hci3ajw7f3s89hn2";
+    sha256 = "sha256-nBo1Ni/VE9/1yEW/dtpj6hBaeUrHFEqlA/cTYa820i8=";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {

From 152147a8f6548c83d9944a0e6aecd350becfeb09 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Thu, 29 Oct 2020 22:29:57 +0100
Subject: [PATCH 3452/3942] wine-mono: 4.9.4 -> 5.1.1

---
 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 8ea3ff183b0b..b722e697ee1e 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -31,9 +31,9 @@ in rec {
 
     ## see http://wiki.winehq.org/Mono
     mono = fetchurl rec {
-      version = "4.9.4";
-      url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
-      sha256 = "1p8g45xphxnns7dkg9rbaknarbjy5cjhrngaf0fsgk9z68wgz9ji";
+      version = "5.1.1";
+      url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
+      sha256 = "09wjrfxbw0072iv6d2vqnkc3y7dzj15vp8mv4ay44n1qp5ji4m3l";
     };
   };
 

From 22da5d92aff8f7c962b5d9da9c422b9071104cb3 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 23 Nov 2020 18:01:00 +0200
Subject: [PATCH 3453/3942] wine{Unstable,Staging}: 5.21 -> 5.22

---
 pkgs/misc/emulators/wine/cert-path.patch | 43 ++++++++++++------------
 pkgs/misc/emulators/wine/sources.nix     |  6 ++--
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/pkgs/misc/emulators/wine/cert-path.patch b/pkgs/misc/emulators/wine/cert-path.patch
index da01a4778102..18a90e1a9af8 100644
--- a/pkgs/misc/emulators/wine/cert-path.patch
+++ b/pkgs/misc/emulators/wine/cert-path.patch
@@ -1,24 +1,23 @@
-diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c
-index f795181..fb4926a 100644
---- a/dlls/crypt32/rootstore.c
-+++ b/dlls/crypt32/rootstore.c
-@@ -18,6 +18,7 @@
- #include "config.h"
- #include <stdarg.h>
- #include <stdio.h>
-+#include <stdlib.h> /* getenv */
- #include <sys/types.h>
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
-@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store)
+diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c
+index 035f2d936bb..959716d727a 100644
+--- a/dlls/crypt32/unixlib.c
++++ b/dlls/crypt32/unixlib.c
+@@ -24,6 +24,7 @@
+ #include "wine/port.h"
  
-         for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++)
-             ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE);
+ #include <stdarg.h>
++#include <stdlib.h>
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+@@ -605,6 +606,10 @@ static void load_root_certs(void)
+ 
+     for (i = 0; i < ARRAY_SIZE(CRYPT_knownLocations) && list_empty(&root_cert_list); i++)
+         import_certs_from_path( CRYPT_knownLocations[i], TRUE );
 +
-+        char *nix_cert_file = getenv("NIX_SSL_CERT_FILE");
-+        if (nix_cert_file != NULL)
-+            ret = import_certs_from_path(nix_cert_file, from, TRUE);
-+
-         check_and_store_certs(from, store);
-     }
-     CertCloseStore(from, 0);
++    char *nix_cert_file = getenv("NIX_SSL_CERT_FILE");
++    if (nix_cert_file != NULL)
++        import_certs_from_path(nix_cert_file, TRUE);
+ }
+ 
+ static BOOL WINAPI enum_root_certs( void *buffer, SIZE_T size, SIZE_T *needed )
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index b722e697ee1e..081594e62147 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 = "5.21";
+    version = "5.22";
     url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
-    sha256 = "sha256-WhpcJUnRG84NZkAiDtb9MQQq/LyzZvR14My0eB0tKEA=";
+    sha256 = "sha256-Cb0GyHyMl05q00UHzsh11yF+tW/Anfg41UU+DrvOTSE=";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "sha256-8IIjdGyRZf2v0dVvinqA2gvjR5eCXxN3+tWj1eCjjWA=";
+    sha256 = "sha256-witIBZB8LRNSGTbBB7Rkm9QGvkH4EMuLc6gUpcqVVGo=";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From d1487097ef215256ad886f041f9010c1529986ed Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 23 Nov 2020 23:54:46 +0100
Subject: [PATCH 3454/3942] mpv: 0.32.0 -> 0.33.0

https://github.com/mpv-player/mpv/releases/tag/v0.33.0
---
 pkgs/applications/video/mpv/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 4b7d78303b2f..22d34fb474c1 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -39,13 +39,8 @@
 , libpngSupport      ? true,           libpng        ? null
 , pulseSupport       ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
 , rubberbandSupport  ? stdenv.isLinux, rubberband    ? null
-# NOTE: samba support should be removed on the next mpv release, see also:
-# https://github.com/NixOS/nixpkgs/pull/89145#issuecomment-636424362
-# Please remove this line on the next mpv release.
-, sambaSupport       ? false,          samba         ? null
 , screenSaverSupport ? true,           libXScrnSaver ? null
 , sdl2Support        ? true,           SDL2          ? null
-, sndioSupport       ? true,           sndio         ? null
 , speexSupport       ? true,           speex         ? null
 , swiftSupport       ? false,          swift         ? null
 , theoraSupport      ? true,           libtheora     ? null
@@ -80,9 +75,7 @@ assert openalSupport      -> available openalSoft;
 assert pulseSupport       -> available libpulseaudio;
 assert rubberbandSupport  -> available rubberband;
 assert screenSaverSupport -> available libXScrnSaver;
-assert sambaSupport       -> available samba;
 assert sdl2Support        -> available SDL2;
-assert sndioSupport       -> available sndio;
 assert speexSupport       -> available speex;
 assert theoraSupport      -> available libtheora;
 assert vaapiSupport       -> available libva;
@@ -100,13 +93,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "mpv";
-  version = "0.32.0";
+  version = "0.33.0";
 
   src = fetchFromGitHub {
     owner  = "mpv-player";
     repo   = "mpv";
     rev    = "v${version}";
-    sha256 = "0kmy1q0hp87vq4rpv7py04x8bpg1wmlzaibavmkf713jqp6qy596";
+    sha256 = "sha256-3l32qQBpvWVjbLp5CZtO039oDQeH7C/cNAKtJxrzlRk=";
   };
 
   postPatch = ''
@@ -140,9 +133,7 @@ in stdenv.mkDerivation rec {
     (enableFeature cddaSupport     "cdda")
     (enableFeature dvdnavSupport   "dvdnav")
     (enableFeature openalSupport   "openal")
-    (enableFeature sambaSupport    "libsmbclient")
     (enableFeature sdl2Support     "sdl2")
-    (enableFeature sndioSupport    "sndio")
     (enableFeature vaapiSupport    "vaapi")
     (enableFeature waylandSupport  "wayland")
     (enableFeature stdenv.isLinux  "dvbin")
@@ -168,10 +159,8 @@ in stdenv.mkDerivation rec {
     ++ optional openalSupport      openalSoft
     ++ optional pulseSupport       libpulseaudio
     ++ optional rubberbandSupport  rubberband
-    ++ optional sambaSupport       samba
     ++ optional screenSaverSupport libXScrnSaver
     ++ optional sdl2Support        SDL2
-    ++ optional sndioSupport       sndio
     ++ optional speexSupport       speex
     ++ optional theoraSupport      libtheora
     ++ optional vaapiSupport       libva

From 6216c843ed79b5bc09a5f2cf522a0cfe7a21091b Mon Sep 17 00:00:00 2001
From: Viktor Kleen <viktor@kleen.org>
Date: Sun, 5 Nov 2017 09:42:40 -0800
Subject: [PATCH 3455/3942] nixos/postfix: make postfix.enableSmtp work again

This fixes issue #104715.
---
 nixos/modules/services/mail/postfix.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index fd4d16cdc37b..319b3b638444 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -834,12 +834,6 @@ in
       };
 
       services.postfix.masterConfig = {
-        smtp_inet = {
-          name = "smtp";
-          type = "inet";
-          private = false;
-          command = "smtpd";
-        };
         pickup = {
           private = false;
           wakeup = 60;
@@ -921,6 +915,12 @@ in
           in concatLists (mapAttrsToList mkKeyVal cfg.submissionOptions);
         };
       } // optionalAttrs cfg.enableSmtp {
+        smtp_inet = {
+          name = "smtp";
+          type = "inet";
+          private = false;
+          command = "smtpd";
+        };
         smtp = {};
         relay = {
           command = "smtp";

From cc5a3cb5470160520d60eabe65ebfdd60b9ec6a6 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 1 Nov 2020 12:06:25 -0800
Subject: [PATCH 3456/3942] pipreqs: use python3

---
 pkgs/tools/misc/pipreqs/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/pipreqs/default.nix b/pkgs/tools/misc/pipreqs/default.nix
index bbd4125c4b0e..3f27be2c9f94 100644
--- a/pkgs/tools/misc/pipreqs/default.nix
+++ b/pkgs/tools/misc/pipreqs/default.nix
@@ -1,16 +1,17 @@
-{ lib, python2Packages }:
+{ lib, python3 }:
 
-# Using python 2 because when packaging with python 3 pipreqs fails to parse python 2 code.
-python2Packages.buildPythonApplication rec {
+with python3.pkgs;
+
+buildPythonApplication rec {
   pname = "pipreqs";
   version = "0.4.10";
 
-  src = python2Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "0fdr3mbxjpmrxr7yfc1sn9kbpcyb0qwafimhhrrqvf989dj1sdcy";
   };
 
-  propagatedBuildInputs = with python2Packages; [ yarg docopt ];
+  propagatedBuildInputs = [ yarg docopt ];
 
   # Tests requires network access. Works fine without sandboxing
   doCheck = false;

From cde89e3ecf8f8361707c61f6b796f7c497e04f89 Mon Sep 17 00:00:00 2001
From: Joshua Skrzypek <jskrzypek@gmail.com>
Date: Mon, 23 Nov 2020 18:15:59 -0500
Subject: [PATCH 3457/3942] python3Packages.pyspark: Fix out of date postPatch

Pyspark switched to pinning py4j==0.10.9 with v3.0.0 - see this commit:
https://github.com/apache/spark/\
   commit/fc4e56a54c15e20baf085e6061d3d83f5ce1185d

This meant that since the bump to pyspark v3.0.0 - in this commit:
https://github.com/NixOS/nixpkgs/\
   commit/5181547ae6624b462919a806c4d0888e6e4630f4 -
the patch was no longer matching on the 'py4j==0.10.7' string that was
working previously.

The failing patch went unnoticed previously because the version of py4j
pinned by pyspark>=3.0.0 was the same as the py4j provided by nixpkgs.

However, a recent PR (#101636) bumped the version of py4j to 0.10.9.1 in
this commit:
https://github.com/NixOS/nixpkgs/\
   commit/43a91282d66223c5cb978d53fbe1033f56dd7f2b
which caused the version pinned by pyspark to no longer match the
version provided by nixpkgs. FWIW, @jonringer flagged this issue on
another PR that tried to bump py4j: #100623.

My solution here was to upgrade the patch's target string to match the
version found in pyspark's current setup.py.
---
 pkgs/development/python-modules/pyspark/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
index d71cf2a0f437..d181d6a29d90 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -13,8 +13,7 @@ buildPythonPackage rec {
   postPatch = ''
     sed -i "s/'pypandoc'//" setup.py
 
-    # Current release works fine with py4j 0.10.8.1
-    substituteInPlace setup.py --replace py4j==0.10.7 'py4j>=0.10.7,<0.11'
+    substituteInPlace setup.py --replace py4j==0.10.9 'py4j>=0.10.9,<0.11'
   '';
 
   propagatedBuildInputs = [ py4j ];

From abfd29cace6fbfdc2a13dd4fc3b48db95973d05d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 24 Nov 2020 01:03:56 +0100
Subject: [PATCH 3458/3942] pythonPackages.asyncssh: Switch PyTestCheckHook,
 disable failing tests

---
 .../development/python-modules/asyncssh/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index bc540b45de47..44b769636ca5 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchPypi, pythonOlder
 , cryptography
 , bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl
-, openssl, openssh }:
+, openssl, openssh, pytestCheckHook }:
 
 buildPythonPackage rec {
   pname = "asyncssh";
@@ -23,6 +23,11 @@ buildPythonPackage rec {
     ./fix-sftp-chmod-test-nixos.patch
   ];
 
+  # Disables windows specific test (specifically the GSSAPI wrapper for Windows)
+  postPatch = ''
+    rm tests/sspi_stub.py
+  '';
+
   propagatedBuildInputs = [
     bcrypt
     cryptography
@@ -36,12 +41,10 @@ buildPythonPackage rec {
   checkInputs = [
     openssh
     openssl
+    pytestCheckHook
   ];
 
-  # Disables windows specific test (specifically the GSSAPI wrapper for Windows)
-  postPatch = ''
-    rm tests/sspi_stub.py
-  '';
+  disabledTests = [ "test_expired_root" "test_confirm" ];
 
   meta = with stdenv.lib; {
     description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework";

From c3e79669db693d9d468af1cd0c68fe4f9f41d06d Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 23 Nov 2020 14:34:32 +0100
Subject: [PATCH 3459/3942] referencesByPopularity: Fix cross compilation

---
 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 92e68417e479..d01c7d662c9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -511,7 +511,7 @@ in
 
   nukeReferences = callPackage ../build-support/nuke-references { };
 
-  referencesByPopularity = callPackage ../build-support/references-by-popularity { };
+  referencesByPopularity = buildPackages.callPackage ../build-support/references-by-popularity { };
 
   removeReferencesTo = callPackage ../build-support/remove-references-to { };
 

From 86aa2a57d3a60d68af8689c4a1eb4da306f90c98 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Tue, 24 Nov 2020 01:27:34 +0000
Subject: [PATCH 3460/3942] factorio: fail fetch early if no credentials
 provided

The download URL will redirect to the login page if credentials are not
present, but will return an error if the credentials are wrong.

Since we know we always expect credentials, we can fail the fetch in
the preHook if they're not provided.

We can't use e.g. builtins.throw because we want the fetchurl derivation
to be evaluated in all cases - because that's the mechanism which allows
you to just manually add the tarball to the Nix store.
---
 pkgs/games/factorio/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 0226acf16046..e5527c9d4ef7 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -104,10 +104,15 @@ let
               ];
             })
             (_: { # This preHook hides the credentials from /proc
-                  preHook = ''
-                    echo -n "${username}" >username
-                    echo -n "${token}"    >token
-                  '';
+                  preHook =
+                    if username != "" && token != "" then ''
+                      echo -n "${username}" >username
+                      echo -n "${token}"    >token
+                    '' else ''
+                      # Deliberately failing since username/token was not provided, so we can't fetch.
+                      # We can't use builtins.throw since we want the result to be used if the tar is in the store already.
+                      exit 1
+                    '';
                   failureHook = ''
                     cat <<EOF
                     ${helpMsg}

From ba1fa0c60406a21b933f5cb1625e80ac0da84f50 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 3 Mar 2020 23:33:38 +0000
Subject: [PATCH 3461/3942] pam_ssh_agent_auth: Honour
 services.openssh.authorizedKeysFiles

If a system administrator has explicitly configured key locations this
should be taken into account by `sudo`.
---
 nixos/doc/manual/release-notes/rl-2103.xml     | 7 +++++++
 nixos/modules/security/pam.nix                 | 2 +-
 nixos/modules/services/networking/ssh/sshd.nix | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index fda0f8ea074d..3186eb7449fe 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -106,6 +106,13 @@
        for more info.
      </para>
    </listitem>
+   <listitem>
+     <para>
+       Setting <option>services.openssh.authorizedKeysFiles</option> now also affects which keys <option>security.pam.enableSSHAgentAuth</option> will use.
+
+       WARNING: If you are using these options in combination do make sure that any key paths you use are present in <option>services.openssh.authorizedKeysFiles</option>!
+     </para>
+   </listitem>
    <listitem>
     <para>
      The option <option>fonts.enableFontDir</option> has been renamed to
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index a517f9e51ce1..a428103eaa96 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -396,7 +396,7 @@ let
           ${optionalString cfg.logFailures
               "auth required pam_tally.so"}
           ${optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth)
-              "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"}
+              "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=${lib.concatStringsSep ":" config.services.openssh.authorizedKeysFiles}"}
           ${optionalString cfg.fprintAuth
               "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"}
           ${let p11 = config.security.pam.p11; in optionalString cfg.p11Auth
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 1b745931c4fa..3cc77e4cb938 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -477,7 +477,7 @@ in
     # https://github.com/NixOS/nixpkgs/pull/10155
     # https://github.com/NixOS/nixpkgs/pull/41745
     services.openssh.authorizedKeysFiles =
-      [ ".ssh/authorized_keys" ".ssh/authorized_keys2" "/etc/ssh/authorized_keys.d/%u" ];
+      [ "%h/.ssh/authorized_keys" "%h/.ssh/authorized_keys2" "/etc/ssh/authorized_keys.d/%u" ];
 
     services.openssh.extraConfig = mkOrder 0
       ''

From 6847a5c12dd59e29dbc939967646ba5ee3fe4537 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 24 Nov 2020 02:55:40 +0100
Subject: [PATCH 3462/3942] referencesByPopularity: Don't use buildPackages at
 call-site

It's cleaner to reference buildPackages directly in
build-support/docker directly.
---
 pkgs/build-support/docker/default.nix | 3 +--
 pkgs/top-level/all-packages.nix       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index e4e8f794bc4c..4da26ba7cfda 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -15,7 +15,6 @@
   moreutils,
   nix,
   pigz,
-  referencesByPopularity,
   rsync,
   runCommand,
   runtimeShell,
@@ -772,7 +771,7 @@ rec {
             then tag
             else
               lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath));
-        paths = referencesByPopularity overallClosure;
+        paths = buildPackages.referencesByPopularity overallClosure;
         nativeBuildInputs = [ jq ];
       } ''
         ${if (tag == null) then ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d01c7d662c9b..92e68417e479 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -511,7 +511,7 @@ in
 
   nukeReferences = callPackage ../build-support/nuke-references { };
 
-  referencesByPopularity = buildPackages.callPackage ../build-support/references-by-popularity { };
+  referencesByPopularity = callPackage ../build-support/references-by-popularity { };
 
   removeReferencesTo = callPackage ../build-support/remove-references-to { };
 

From ef052cf639319ccc9e95d33a3f4cbf61b021f7a1 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Fri, 30 Oct 2020 12:31:59 +0100
Subject: [PATCH 3463/3942] vimPlugins.idris2-vim: init at 2020-05-25

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e39fac50d89d..51bf6876aaf1 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1653,6 +1653,18 @@ let
     meta.homepage = "https://github.com/idris-hackers/idris-vim/";
   };
 
+  idris2-vim = buildVimPluginFrom2Nix {
+    pname = "idris2-vim";
+    version = "2020-05-25";
+    src = fetchFromGitHub {
+      owner = "edwinb";
+      repo = "idris2-vim";
+      rev = "099129e08c89d9526ad092b7980afa355ddaa24c";
+      sha256 = "1gip64ni2wdd5v4crl64f20pbrx24dmr3ci7w5c9da9hs85x1p29";
+    };
+    meta.homepage = "https://github.com/edwinb/idris2-vim/";
+  };
+
   Improved-AnsiEsc = buildVimPluginFrom2Nix {
     pname = "Improved-AnsiEsc";
     version = "2015-08-26";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 197f445bd357..06f50910643b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -94,6 +94,7 @@ eagletmt/ghcmod-vim
 eagletmt/neco-ghc
 easymotion/vim-easymotion
 editorconfig/editorconfig-vim
+edwinb/idris2-vim
 ehamberg/vim-cute-python
 eikenb/acp
 elixir-editors/vim-elixir

From 0508481dc96c1834d9afd90291c145fa27bff222 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Tue, 24 Nov 2020 00:21:08 +0000
Subject: [PATCH 3464/3942] factorio-experimental,
 factorio-headless-experimental: 1.0.0 -> 1.1.0

---
 pkgs/games/factorio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 0226acf16046..0e2592de919e 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -63,11 +63,11 @@ let
     x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
       alpha = {
         stable        = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; };
-        experimental  = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; };
+        experimental  = bdist { sha256 = "0n00nbh44nyf485jys6pkga3pb9j4zywk0liq6jq99pil6z7na3y"; version = "1.1.0"; withAuth = true; };
       };
       headless = {
         stable        = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; };
-        experimental  = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; };
+        experimental  = bdist { sha256 = "15qiwz3wvyaidndrrm1wfznbidnpf12wpzb8vlm9g0gaq3b0f6h6"; version = "1.1.0"; };
       };
       demo = {
         stable        = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; };

From 2263fa56988d448e7ff8eb019180b50e5725f7d7 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+nixpkgs@sourcephile.fr>
Date: Tue, 24 Nov 2020 04:21:44 +0100
Subject: [PATCH 3465/3942] nixos/network-interfaces: fix typo in udev rule
 syntax

---
 nixos/modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 53c54c2e3980..afb9c5404169 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1246,7 +1246,7 @@ in
             '';
 
             # Udev attributes for systemd to name the device and to create a .device target.
-            systemdAttrs = n: ''NAME:="${n}", ENV{INTERFACE}:="${n}", ENV{SYSTEMD_ALIAS}:="/sys/subsystem/net/devices/${n}", TAG+="systemd"'';
+            systemdAttrs = n: ''NAME:="${n}", ENV{INTERFACE}="${n}", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/${n}", TAG+="systemd"'';
           in
           flip (concatMapStringsSep "\n") (attrNames wlanDeviceInterfaces) (device:
             let

From fa9850e975db8652e42bf0c10be791b4400effc8 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Mon, 23 Nov 2020 20:00:24 -0800
Subject: [PATCH 3466/3942] yed: unmark broken

---
 pkgs/applications/graphics/yed/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index fb74c3d2d1a7..d7c83704dca4 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -35,6 +35,5 @@ stdenv.mkDerivation rec {
     description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams";
     platforms = jre.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
-    broken = !("gtk3" ? jre);
   };
 }

From 7a4b5238eb3c613854704c936193a70682b93e5b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 24 Nov 2020 04:20:00 +0000
Subject: [PATCH 3467/3942] mpv: fix build on darwin

---
 pkgs/applications/video/mpv/default.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 22d34fb474c1..73276f9a4616 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, fetchFromGitHub, fetchpatch
+{ config, stdenv, fetchFromGitHub
 , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which
 , ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs
 , nv-codec-headers, lua, libuchardet, libiconv ? null
@@ -185,14 +185,6 @@ in stdenv.mkDerivation rec {
     python3 TOOLS/osxbundle.py -s build/mpv
   '';
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
-    # Fix cocoa backend. Remove with the next release
-    (fetchpatch {
-      url = "https://github.com/mpv-player/mpv/commit/188169854313b99d01da8f69fe129f0a487eb7c4.patch";
-      sha256 = "062sz4666prb2wg1rn5q8brqkzlq6lxn8sxic78a8lb0125c01f7";
-    })
-  ];
-
   postInstall = ''
     # Use a standard font
     mkdir -p $out/share/mpv

From 0d2f29d6178b3fa4f044865b76da271c789c2979 Mon Sep 17 00:00:00 2001
From: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Date: Thu, 22 Oct 2020 15:45:26 +0900
Subject: [PATCH 3468/3942] pythonPackages.rpy2: 3.2.6 -> 3.3.6, fix test etc.

- This newer version is compatible with panda 1.0 without any patch.
- rPackages.lazyload is required to run tests.
- The official website is moved to GitHub Pages.

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
---
 pkgs/development/python-modules/rpy2/default.nix  | 15 ++++-----------
 .../rpy2/rpy2-3.x-r-libs-site.patch               |  8 ++++----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix
index c0c0420e925a..055341dfd1d3 100644
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -25,13 +25,13 @@
 }:
 
 buildPythonPackage rec {
-    version = "3.2.6";
+    version = "3.3.6";
     pname = "rpy2";
 
     disabled = isPyPy;
     src = fetchPypi {
       inherit version pname;
-      sha256 = "1p990cqx3p2pd1rc9wn66m56wahaq8dlr88frz49vb7nv4zw4a8q";
+      sha256 = "0xvfkxvh01r5ibd5mpisp8bz385hgpn27b988y8v65z7hqr3y1nf";
     };
 
     buildInputs = [
@@ -53,6 +53,7 @@ buildPythonPackage rec {
       DBI
       dbplyr
       hexbin
+      lazyeval
       lme4
       tidyr
     ]) ++ extraRPackages ++ rWrapper.recommendedPackages;
@@ -69,14 +70,6 @@ buildPythonPackage rec {
       # R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
       # This patch sets R_LIBS_SITE when rpy2 is imported.
       ./rpy2-3.x-r-libs-site.patch
-
-      # pandas 1.x compatibility, already merged upstream
-      # https://github.com/rpy2/rpy2/issues/636
-      (fetchpatch {
-        name = "pandas-1.x.patch";
-        url = "https://github.com/rpy2/rpy2/commit/fbd060e364b70012e8d26cc74df04ee53f769379.patch";
-        sha256 = "19rdqydwjmqg25ibmsbx7lggrr9fsyjn283zgvz1wj4iyfjwp1za";
-      })
     ];
     postPatch = ''
       substituteInPlace 'rpy2/rinterface_lib/embedded.py' --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE"
@@ -98,7 +91,7 @@ buildPythonPackage rec {
     ];
 
     meta = {
-      homepage = "http://rpy.sourceforge.net/rpy2";
+      homepage = "https://rpy2.github.io/";
       description = "Python interface to R";
       license = lib.licenses.gpl2Plus;
       platforms = lib.platforms.unix;
diff --git a/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch b/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch
index 177e4f9a83d1..a9e10f02b0bb 100644
--- a/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch
+++ b/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch
@@ -1,10 +1,10 @@
 diff --git a/rpy2/rinterface_lib/embedded.py b/rpy2/rinterface_lib/embedded.py
-index cc32b6d..3969ad0 100644
+index 1f4babbf..322363c5 100644
 --- a/rpy2/rinterface_lib/embedded.py
 +++ b/rpy2/rinterface_lib/embedded.py
-@@ -113,6 +113,16 @@ def _initr(interactive: bool = True,
-         if isinitialized():
-             return None
+@@ -118,6 +118,16 @@ def _initr(
+         if openrlib.R_HOME is None:
+             raise ValueError('openrlib.R_HOME cannot be None.')
          os.environ['R_HOME'] = openrlib.R_HOME
 +
 +        # path to libraries

From 156a9954d362e4772d6b667c063290c8e2cc81e4 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Mon, 23 Nov 2020 23:27:32 +0100
Subject: [PATCH 3469/3942] leo-editor: drop ramkromberg from maintainer

per https://github.com/NixOS/nixpkgs/pull/103444#issuecomment-727590668
---
 pkgs/applications/editors/leo-editor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index f09fd2ec2779..e583671bcb40 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -62,6 +62,6 @@ mkDerivation rec {
     description = "A powerful folding editor";
     longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers.";
     license = licenses.mit;
-    maintainers = with maintainers; [ leonardoce ramkromberg ];
+    maintainers = with maintainers; [ leonardoce ];
   };
 }

From 0851cfb063674d6d62397f3f947a1193b3cd2b20 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 23 Nov 2020 18:00:00 -0500
Subject: [PATCH 3470/3942] tflint: 0.20.3 -> 0.21.0

https://github.com/terraform-linters/tflint/releases/tag/v0.21.0
---
 pkgs/development/tools/analysis/tflint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 284a44c971ee..32c1fca634b6 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.20.3";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1zy6v1srm5v6bg2rqb3hb4cz8g7zwhraf91y810y9csh6r4fv29b";
+    sha256 = "0gdv2l10v19mjskv0f0aphxbzvdx6py0w6n9yg4wn6g7j7c61szd";
   };
 
-  vendorSha256 = "0s367ikq6y1izjim72lnqc98vypl072nimcwnw9y9d7nld5y77c8";
+  vendorSha256 = "0s5ingyl0m939k1qxc1qiyhiabi3ml0qz33s3rbd4hmcg907yjga";
 
   doCheck = false;
 

From e9a5187d1eaca74ad6dda41ff8294995484b5b36 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Mon, 23 Nov 2020 19:40:37 -0500
Subject: [PATCH 3471/3942] pythonPackages.pyqtgraph: convert to pyqt5

---
 pkgs/development/python-modules/pyqtgraph/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix
index d1850c1288d6..80f914294848 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -1,10 +1,10 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, scipy
 , numpy
-, pyqt4
 , pyopengl
+, pyqt5
+, scipy
 }:
 
 buildPythonPackage rec {
@@ -16,13 +16,16 @@ buildPythonPackage rec {
     sha256 = "0p5k73wjfh0zzjvby8b5107cx7x0c2rdj66zh1nc8y95i0anf2na";
   };
 
-  propagatedBuildInputs = [ scipy numpy pyqt4 pyopengl ];
+  propagatedBuildInputs = [ numpy pyopengl pyqt5 scipy ];
 
-  doCheck = false;  # "PyQtGraph requires either PyQt4 or PySide; neither package could be imported."
+  doCheck = false;  # tries to create windows (QApps) on collection, which fails (probably due to no display)
+
+  pythonImportsCheck = [ "pyqtgraph" ];
 
   meta = with stdenv.lib; {
     description = "Scientific Graphics and GUI Library for Python";
     homepage = "http://www.pyqtgraph.org/";
+    changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG";
     license = licenses.mit;
     platforms = platforms.unix;
     maintainers = with maintainers; [ koral ];

From 15f61a9b84e01900e1f291989882653705d2a5a9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 23 Nov 2020 18:00:00 -0500
Subject: [PATCH 3472/3942] python3Packages.scrapy: 2.4.0 -> 2.4.1

https://github.com/scrapy/scrapy/releases/tag/2.4.1
---
 pkgs/development/python-modules/scrapy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index a2db6b9cb3b2..c377ace69685 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -27,7 +27,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.4.0";
+  version = "2.4.1";
   pname = "Scrapy";
 
   disabled = isPy27;
@@ -83,7 +83,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4ea7fbc902ee0b0a79b154d07a5f4e747e2146f272a748557941946000728479";
+    sha256 = "68c48f01a58636bdf0f6fcd5035a19ecf277b58af24bd70c36dc6e556df3e005";
   };
 
   postInstall = ''

From 83c847c0c8c3dcfbbe9b32cff0e52bb1e6eabd11 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Tue, 24 Nov 2020 12:12:08 +0500
Subject: [PATCH 3473/3942] mpv: fix vapoursynth path

`mpv.vapoursynth.python3.sitePackages` expands to `/lib/python3.8/site-packages`, thus `/lib/lib/python3.8/site-packages` being produced in wrapper, which is wrong
---
 pkgs/applications/video/mpv/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix
index 5b3ad7a98311..4d61971956e9 100644
--- a/pkgs/applications/video/mpv/wrapper.nix
+++ b/pkgs/applications/video/mpv/wrapper.nix
@@ -37,7 +37,7 @@ let
       "--prefix" "LUA_CPATH" ";" "${mpv.luaEnv}/lib/lua/${mpv.lua.luaversion}/?.so"
       "--prefix" "LUA_PATH" ";" "${mpv.luaEnv}/share/lua/${mpv.lua.luaversion}/?.lua"
     ] ++ lib.optionals mpv.vapoursynthSupport [
-      "--prefix" "PYTHONPATH" ":" "${mpv.vapoursynth}/lib/${mpv.vapoursynth.python3.sitePackages}"
+      "--prefix" "PYTHONPATH" ":" "${mpv.vapoursynth}/${mpv.vapoursynth.python3.sitePackages}"
     ] ++ lib.optionals (binPath != "") [
       "--prefix" "PATH" ":" binPath
     ] ++ (lib.lists.flatten (map

From 5a6981654badf23e8c99c9c87bda6f60e46dde5f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 17 Nov 2020 08:16:53 +0100
Subject: [PATCH 3474/3942] =?UTF-8?q?ocamlPackages.camlp5:=207.12=20?=
 =?UTF-8?q?=E2=86=92=207.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/tools/ocaml/camlp5/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 7e7c185fbc7a..5fb76a526016 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation {
 
-  name = "camlp5-7.12";
+  name = "camlp5-7.13";
 
   src = fetchzip {
-    url = "https://github.com/camlp5/camlp5/archive/rel712.tar.gz";
-    sha256 = "12ix5g15bys932hyf9gs637iz76m0ji9075d83jfdmx85q30llgf";
+    url = "https://github.com/camlp5/camlp5/archive/rel713.tar.gz";
+    sha256 = "1d9spy3f5ahixm8nxxk086kpslzva669a5scn49am0s7vx4i71kp";
   };
 
   buildInputs = [ ocaml ];

From a21a64116901cb90fb762b2f193c5ba5affae43a Mon Sep 17 00:00:00 2001
From: Frank Doepper <fd@taz.de>
Date: Mon, 23 Nov 2020 16:55:49 +0100
Subject: [PATCH 3475/3942] shotcut: fix melt path

closes #104666
---
 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 188d49a791ec..fee41ed3ef08 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -34,7 +34,7 @@ mkDerivation rec {
   ];
 
   prePatch = ''
-    sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
+    sed 's_shotcutPath, "melt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
     sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp
     sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp
     NICE=$(type -P nice)

From b6b2b2f864b3ca74df5fe9eaa0d5036587334747 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 25 Oct 2020 15:29:21 +0700
Subject: [PATCH 3476/3942] aflplusplus: standardize description

- Remove package name from start
- Remove period from end
---
 pkgs/tools/security/aflplusplus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix
index a0ef58ae8b61..8e5db3cd22c9 100644
--- a/pkgs/tools/security/aflplusplus/default.nix
+++ b/pkgs/tools/security/aflplusplus/default.nix
@@ -124,8 +124,8 @@ let
 
     meta = {
       description = ''
-        AFL++ is a heavily enhanced version of AFL, incorporating many features and
-        improvements from the community.
+        A heavily enhanced version of AFL, incorporating many features
+        and improvements from the community
       '';
       homepage    = "https://aflplus.plus";
       license     = stdenv.lib.licenses.asl20;

From 96321c63f0753e35934ec493cdbbfd7720d18726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 24 Nov 2020 10:02:14 +0100
Subject: [PATCH 3477/3942] flashrom: mark broken on darwin

---
 pkgs/tools/misc/flashrom/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index 2f92dc6d9bf2..47d4fd127575 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = with maintainers; [ funfunctor fpletz ];
     platforms = platforms.all;
+    broken = stdenv.isDarwin; # requires DirectHW
   };
 }

From 52271f44b17671ce6b100eadf7cd7e9d04d608aa Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Tue, 24 Nov 2020 10:16:32 +0100
Subject: [PATCH 3478/3942] crun: 0.15.1 -> 0.16

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/applications/virtualization/crun/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index 62e5843d2439..ef506c01cfb6 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -35,13 +35,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "crun";
-  version = "0.15.1";
+  version = "0.16";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = version;
-    sha256 = "0qy4159wirkwzb48kp1jsnimlr1fyvxvv02j6mdbhjdhkwjic8v4";
+    sha256 = "03547axiwv161sbymh2vxqx591xr4nq6b9y8y45m15xvfv0f7vl8";
     fetchSubmodules = true;
   };
 

From f67c9a36f3889cca9af18257fe7d7a831fc8fbe1 Mon Sep 17 00:00:00 2001
From: Alvar Penning <post@0x21.biz>
Date: Thu, 1 Oct 2020 22:56:44 +0200
Subject: [PATCH 3479/3942] openrct2: 0.3.0 -> 0.3.1

---
 pkgs/games/openrct2/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index 45133be461ca..4896a7361621 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -1,23 +1,24 @@
 { stdenv, fetchFromGitHub
 , SDL2, cmake, curl, duktape, fontconfig, freetype, icu, jansson, libGLU
-, libiconv, libpng, libpthreadstubs, libzip, openssl, pkgconfig, speexdsp, zlib
+, libiconv, libpng, libpthreadstubs, libzip, nlohmann_json, openssl, pkgconfig
+, speexdsp, zlib
 }:
 
 let
-  version = "0.3.0";
+  version = "0.3.1";
 
   openrct2-src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "OpenRCT2";
     rev = "v${version}";
-    sha256 = "0xs8pnn3lq30iy76pv42hywsrabapcrrkl597dhjafwh1xaxxj91";
+    sha256 = "04z9dhin94qg42f458f0062zzjqlrzr8kllfkb21ag1l6bjfsk28";
   };
 
   objects-src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "objects";
-    rev = "v1.0.16";
-    sha256 = "1xz50ghiqj9rm0m6d65j09ich6dlhyj36zah6zvmmzr4kg6svnk5";
+    rev = "v1.0.17";
+    sha256 = "1cx9f8ih7f7q79v0jgqa7cbaz2xhjpp59b0m4rfbam1cx3awvz1j";
   };
 
   title-sequences-src = fetchFromGitHub {
@@ -51,6 +52,7 @@ stdenv.mkDerivation {
     libpng
     libpthreadstubs
     libzip
+    nlohmann_json
     openssl
     speexdsp
     zlib

From 6f88d6332d93363a65d6e23e83f6d50d370ad59f Mon Sep 17 00:00:00 2001
From: Alvar Penning <post@0x21.biz>
Date: Tue, 24 Nov 2020 11:26:57 +0100
Subject: [PATCH 3480/3942] openrct2: 0.3.1 -> 0.3.2

---
 pkgs/games/openrct2/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index 4896a7361621..4f3993973e26 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -5,20 +5,20 @@
 }:
 
 let
-  version = "0.3.1";
+  version = "0.3.2";
 
   openrct2-src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "OpenRCT2";
     rev = "v${version}";
-    sha256 = "04z9dhin94qg42f458f0062zzjqlrzr8kllfkb21ag1l6bjfsk28";
+    sha256 = "1fd32wniiy6qz2046ppqfj2sb3rf2qf086rf9v1bdhyj254d0b1z";
   };
 
   objects-src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "objects";
-    rev = "v1.0.17";
-    sha256 = "1cx9f8ih7f7q79v0jgqa7cbaz2xhjpp59b0m4rfbam1cx3awvz1j";
+    rev = "v1.0.18";
+    sha256 = "1v9424kxdppg8vszv0vyq91lzljkrjc3nmk58wbwlpcwj6dip07s";
   };
 
   title-sequences-src = fetchFromGitHub {

From 56437bfba4a30c5cc155c99d4c8ef0baf5b0739f Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 24 Nov 2020 12:59:29 +0100
Subject: [PATCH 3481/3942] hybridreverb2: 2.1.1 -> 2.1.2

---
 pkgs/applications/audio/hybridreverb2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix
index 3f1fac79623d..831df6ba3c8d 100644
--- a/pkgs/applications/audio/hybridreverb2/default.nix
+++ b/pkgs/applications/audio/hybridreverb2/default.nix
@@ -4,7 +4,7 @@
 
 let
   pname = "HybridReverb2";
-  version = "2.1.1";
+  version = "2.1.2";
   owner = "jpcima";
   DBversion = "1.0.0";
 in
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     inherit owner;
     repo = pname;
     rev = "v${version}";
-    sha256 = "15mba9qvlis0qrklr50wp3jdysvmk33m7pvclp0k1is9pirj97cb";
+    sha256 = "16r20plz1w068bgbkrydv01a991ygjybdya3ah7bhp3m5xafjwqb";
     fetchSubmodules = true;
   };
 

From f69e63d8d76b2183b0e41b15fd25120658fae6e7 Mon Sep 17 00:00:00 2001
From: Martin Hardselius <martin@hardselius.dev>
Date: Thu, 19 Nov 2020 08:59:40 +0100
Subject: [PATCH 3482/3942] nodePackages.gqlint: init at 1.8.0

---
 .../node-packages/node-packages.json          |    1 +
 .../node-packages/node-packages.nix           | 3423 +++++++++--------
 2 files changed, 1753 insertions(+), 1671 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 045418f787ce..10f740232441 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -88,6 +88,7 @@
 , "graphql-cli"
 , "grunt-cli"
 , "makam"
+, "gqlint"
 , "gtop"
 , "gulp"
 , "gulp-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 5c9621809c99..b8caf50b8553 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -22,13 +22,13 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.1100.1" = {
+    "@angular-devkit/architect-0.1100.2" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.1100.1";
+      version = "0.1100.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1100.1.tgz";
-        sha512 = "DIAvTRRY+k7T2xHf4RVV06P16D0V7wSf1MSpGSDWVpfWcA3HNOSGfsk1F+COMlbFehXuKztwieXarv5rXbBCng==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1100.2.tgz";
+        sha512 = "wSMMM8eBPol48OtvIyrIq2H9rOIiJmrPEtPbH0BSuPX0B8BckVImeTPzloqxSrpul4tY7Iwx0zwISDEgb59Vbw==";
       };
     };
     "@angular-devkit/core-11.0.0" = {
@@ -49,6 +49,15 @@ let
         sha512 = "ui3g7w/0SpU9oq8uwN9upR8Y1eOXZ+P2p3NyDydBrR7ZEfEkRLS1mhozN/ib8farrwK5N3kIIJxMb5t3187Hng==";
       };
     };
+    "@angular-devkit/core-11.0.2" = {
+      name = "_at_angular-devkit_slash_core";
+      packageName = "@angular-devkit/core";
+      version = "11.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.0.2.tgz";
+        sha512 = "vUmmUNmNM9oRcDmt0PunU/ayglo0apq4pGL9Z5jj6alf2WwEiTcGHjyuZSDIO9MOLi41519jp3mDx79qXvvyww==";
+      };
+    };
     "@angular-devkit/schematics-11.0.0" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
@@ -67,6 +76,15 @@ let
         sha512 = "rAOnAndcybEH398xf5wzmcUPCoCi0dKiOo/+1dkKU5aTxynw1OUnANt5K6A+ZZTGnJmfjtP0ovkZGYun9IUDxQ==";
       };
     };
+    "@angular-devkit/schematics-11.0.2" = {
+      name = "_at_angular-devkit_slash_schematics";
+      packageName = "@angular-devkit/schematics";
+      version = "11.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.0.2.tgz";
+        sha512 = "unNewc+Y9ofrdKxXNoSHKUL6wvV8Vgh2nJMTLI1VAw8nfqgWphI+s5XwbVzog65nhZ10xJeaUm9u5R8pxLDpQg==";
+      };
+    };
     "@angular-devkit/schematics-cli-0.1100.1" = {
       name = "_at_angular-devkit_slash_schematics-cli";
       packageName = "@angular-devkit/schematics-cli";
@@ -301,22 +319,22 @@ let
         sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==";
       };
     };
-    "@babel/compat-data-7.12.5" = {
+    "@babel/compat-data-7.12.7" = {
       name = "_at_babel_slash_compat-data";
       packageName = "@babel/compat-data";
-      version = "7.12.5";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz";
-        sha512 = "DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==";
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz";
+        sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==";
       };
     };
-    "@babel/core-7.12.3" = {
+    "@babel/core-7.12.8" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.12.3";
+      version = "7.12.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz";
-        sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.8.tgz";
+        sha512 = "ra28JXL+5z73r1IC/t+FT1ApXU5LsulFDnTDntNfLQaScJUJmcHL5Qxm/IWanCToQk3bPWQo5bflbplU5r15pg==";
       };
     };
     "@babel/core-7.9.0" = {
@@ -400,13 +418,13 @@ let
         sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==";
       };
     };
-    "@babel/helper-create-regexp-features-plugin-7.12.1" = {
+    "@babel/helper-create-regexp-features-plugin-7.12.7" = {
       name = "_at_babel_slash_helper-create-regexp-features-plugin";
       packageName = "@babel/helper-create-regexp-features-plugin";
-      version = "7.12.1";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz";
-        sha512 = "rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==";
+        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz";
+        sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==";
       };
     };
     "@babel/helper-define-map-7.10.5" = {
@@ -454,13 +472,13 @@ let
         sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==";
       };
     };
-    "@babel/helper-member-expression-to-functions-7.12.1" = {
+    "@babel/helper-member-expression-to-functions-7.12.7" = {
       name = "_at_babel_slash_helper-member-expression-to-functions";
       packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.12.1";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz";
-        sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==";
+        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz";
+        sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==";
       };
     };
     "@babel/helper-module-imports-7.12.5" = {
@@ -481,13 +499,13 @@ let
         sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
       };
     };
-    "@babel/helper-optimise-call-expression-7.10.4" = {
+    "@babel/helper-optimise-call-expression-7.12.7" = {
       name = "_at_babel_slash_helper-optimise-call-expression";
       packageName = "@babel/helper-optimise-call-expression";
-      version = "7.10.4";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz";
-        sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==";
+        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz";
+        sha512 = "I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==";
       };
     };
     "@babel/helper-plugin-utils-7.10.4" = {
@@ -499,15 +517,6 @@ let
         sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==";
       };
     };
-    "@babel/helper-regex-7.10.5" = {
-      name = "_at_babel_slash_helper-regex";
-      packageName = "@babel/helper-regex";
-      version = "7.10.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz";
-        sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==";
-      };
-    };
     "@babel/helper-remap-async-to-generator-7.12.1" = {
       name = "_at_babel_slash_helper-remap-async-to-generator";
       packageName = "@babel/helper-remap-async-to-generator";
@@ -598,13 +607,13 @@ let
         sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
       };
     };
-    "@babel/parser-7.12.5" = {
+    "@babel/parser-7.12.7" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.12.5";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz";
-        sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz";
+        sha512 = "oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==";
       };
     };
     "@babel/plugin-external-helpers-7.8.3" = {
@@ -688,13 +697,13 @@ let
         sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==";
       };
     };
-    "@babel/plugin-proposal-numeric-separator-7.12.5" = {
+    "@babel/plugin-proposal-numeric-separator-7.12.7" = {
       name = "_at_babel_slash_plugin-proposal-numeric-separator";
       packageName = "@babel/plugin-proposal-numeric-separator";
-      version = "7.12.5";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz";
-        sha512 = "UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz";
+        sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==";
       };
     };
     "@babel/plugin-proposal-object-rest-spread-7.12.1" = {
@@ -715,13 +724,13 @@ let
         sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==";
       };
     };
-    "@babel/plugin-proposal-optional-chaining-7.12.1" = {
+    "@babel/plugin-proposal-optional-chaining-7.12.7" = {
       name = "_at_babel_slash_plugin-proposal-optional-chaining";
       packageName = "@babel/plugin-proposal-optional-chaining";
-      version = "7.12.1";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz";
-        sha512 = "c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz";
+        sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==";
       };
     };
     "@babel/plugin-proposal-private-methods-7.12.1" = {
@@ -1138,13 +1147,13 @@ let
         sha512 = "cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w==";
       };
     };
-    "@babel/plugin-transform-react-jsx-7.12.5" = {
+    "@babel/plugin-transform-react-jsx-7.12.7" = {
       name = "_at_babel_slash_plugin-transform-react-jsx";
       packageName = "@babel/plugin-transform-react-jsx";
-      version = "7.12.5";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz";
-        sha512 = "2xkcPqqrYiOQgSlM/iwto1paPijjsDbUynN13tI6bosDz/jOW3CRzYguIE8wKX32h+msbBM22Dv5fwrFkUOZjQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz";
+        sha512 = "YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ==";
       };
     };
     "@babel/plugin-transform-react-jsx-source-7.12.1" = {
@@ -1201,13 +1210,13 @@ let
         sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==";
       };
     };
-    "@babel/plugin-transform-sticky-regex-7.12.1" = {
+    "@babel/plugin-transform-sticky-regex-7.12.7" = {
       name = "_at_babel_slash_plugin-transform-sticky-regex";
       packageName = "@babel/plugin-transform-sticky-regex";
-      version = "7.12.1";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz";
-        sha512 = "CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz";
+        sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==";
       };
     };
     "@babel/plugin-transform-template-literals-7.12.1" = {
@@ -1255,22 +1264,22 @@ let
         sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==";
       };
     };
-    "@babel/polyfill-7.11.5" = {
+    "@babel/polyfill-7.12.1" = {
       name = "_at_babel_slash_polyfill";
       packageName = "@babel/polyfill";
-      version = "7.11.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.11.5.tgz";
-        sha512 = "FunXnE0Sgpd61pKSj2OSOs1D44rKTD3pGOfGilZ6LGrrIH0QEtJlTjqOqdF8Bs98JmjfGhni2BBkTfv9KcKJ9g==";
-      };
-    };
-    "@babel/preset-env-7.12.1" = {
-      name = "_at_babel_slash_preset-env";
-      packageName = "@babel/preset-env";
       version = "7.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz";
-        sha512 = "H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==";
+        url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz";
+        sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==";
+      };
+    };
+    "@babel/preset-env-7.12.7" = {
+      name = "_at_babel_slash_preset-env";
+      packageName = "@babel/preset-env";
+      version = "7.12.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz";
+        sha512 = "OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==";
       };
     };
     "@babel/preset-flow-7.12.1" = {
@@ -1300,13 +1309,13 @@ let
         sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw==";
       };
     };
-    "@babel/preset-typescript-7.12.1" = {
+    "@babel/preset-typescript-7.12.7" = {
       name = "_at_babel_slash_preset-typescript";
       packageName = "@babel/preset-typescript";
-      version = "7.12.1";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.1.tgz";
-        sha512 = "hNK/DhmoJPsksdHuI/RVrcEws7GN5eamhi28JkO52MqIxU8Z0QpmiSOQxZHWOHV7I3P4UjHV97ay4TcamMA6Kw==";
+        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz";
+        sha512 = "nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw==";
       };
     };
     "@babel/register-7.12.1" = {
@@ -1318,15 +1327,6 @@ let
         sha512 = "XWcmseMIncOjoydKZnWvWi0/5CUCD+ZYKhRwgYlWOrA8fGZ/FjuLRpqtIhLOVD/fvR1b9DQHtZPn68VvhpYf+Q==";
       };
     };
-    "@babel/runtime-7.11.2" = {
-      name = "_at_babel_slash_runtime";
-      packageName = "@babel/runtime";
-      version = "7.11.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz";
-        sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==";
-      };
-    };
     "@babel/runtime-7.12.5" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
@@ -1345,22 +1345,22 @@ let
         sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA==";
       };
     };
-    "@babel/template-7.10.4" = {
+    "@babel/template-7.12.7" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
-      version = "7.10.4";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz";
-        sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==";
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz";
+        sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
       };
     };
-    "@babel/traverse-7.12.5" = {
+    "@babel/traverse-7.12.8" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.12.5";
+      version = "7.12.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz";
-        sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.8.tgz";
+        sha512 = "EIRQXPTwFEGRZyu6gXbjfpNORN1oZvwuzJbxcXjAgWV0iqXYDszN1Hx3FVm6YgZfu1ZQbCVAk3l+nIw95Xll9Q==";
       };
     };
     "@babel/types-7.10.4" = {
@@ -1372,13 +1372,13 @@ let
         sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==";
       };
     };
-    "@babel/types-7.12.6" = {
+    "@babel/types-7.12.7" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.12.6";
+      version = "7.12.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz";
-        sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz";
+        sha512 = "MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==";
       };
     };
     "@braintree/sanitize-url-3.1.0" = {
@@ -1642,15 +1642,6 @@ let
         sha512 = "ZHkXKq2XFFmAUdmSZrmqUSIrRM4O9gtkdpxMmV+LQl7kScUnbo6pMnXu6+FTDgZ12aW6SDoZoOJfS56WD+Eu6A==";
       };
     };
-    "@eslint/eslintrc-0.1.3" = {
-      name = "_at_eslint_slash_eslintrc";
-      packageName = "@eslint/eslintrc";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz";
-        sha512 = "4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==";
-      };
-    };
     "@eslint/eslintrc-0.2.1" = {
       name = "_at_eslint_slash_eslintrc";
       packageName = "@eslint/eslintrc";
@@ -2065,22 +2056,49 @@ let
         sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ==";
       };
     };
-    "@fluentui/react-7.150.1" = {
+    "@fluentui/react-7.152.2" = {
       name = "_at_fluentui_slash_react";
       packageName = "@fluentui/react";
-      version = "7.150.1";
+      version = "7.152.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.150.1.tgz";
-        sha512 = "DgK9eR7eo/dYUtutkmPBqq7EiBls2L/4yNQO5Sv9JgE7GQPPbMMGvsK4ZAHa42E3K01CC5XO5SnP0BWD62B/RA==";
+        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.152.2.tgz";
+        sha512 = "NQzXzwNLwPHdM7VbpRU4ZOzmGd3UElBikQtJcvqTV0wC605auiqS/s6S6v93/9rh+fOXbppY8tZmVXSXWCsLvA==";
       };
     };
-    "@fluentui/react-focus-7.16.18" = {
+    "@fluentui/react-compose-0.19.12" = {
+      name = "_at_fluentui_slash_react-compose";
+      packageName = "@fluentui/react-compose";
+      version = "0.19.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@fluentui/react-compose/-/react-compose-0.19.12.tgz";
+        sha512 = "GTcZ3kd2rTk3Q7xXJB8cTPfv0Q0vOdeIrLcJ02lXfjE9h3GPTE62rV4iFzBIZyXIKL8IdR6Jh8WNIBkVMWhhxw==";
+      };
+    };
+    "@fluentui/react-focus-7.16.19" = {
       name = "_at_fluentui_slash_react-focus";
       packageName = "@fluentui/react-focus";
-      version = "7.16.18";
+      version = "7.16.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.18.tgz";
-        sha512 = "3GXZXhEIyX0OF1rBZmpRbx/llcOuKQa6cq5JTEcg7aLy7DWzmyRPm1eJLD/5anPPF8R68W0gT0pd57nhFreatg==";
+        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.19.tgz";
+        sha512 = "BUnSJ7CRs0gfaEXVr5w9YQsZXB18J35k7H7eyB5wLLLgwdK/ogt6uYcu3p0q5ZEjju8C/wmJ2zgwFCMKiAyTUA==";
+      };
+    };
+    "@fluentui/react-stylesheets-0.2.4" = {
+      name = "_at_fluentui_slash_react-stylesheets";
+      packageName = "@fluentui/react-stylesheets";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@fluentui/react-stylesheets/-/react-stylesheets-0.2.4.tgz";
+        sha512 = "zTyDxBsQsm5iz59SXn83+BrC3tUnwQdJc/xcPYWWVISIyPby/75URbWK5uYJ5p5Qy0GrpgKDGYAbpXZlN89SRQ==";
+      };
+    };
+    "@fluentui/react-theme-provider-0.18.0" = {
+      name = "_at_fluentui_slash_react-theme-provider";
+      packageName = "@fluentui/react-theme-provider";
+      version = "0.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@fluentui/react-theme-provider/-/react-theme-provider-0.18.0.tgz";
+        sha512 = "dKSOZ1Sl2uVrDzjvfRtwHUluedU0MhEASukyeqGTpKTmg3ucPMYEZn+dgzFqRNpjs9trbb++N8R6Z19CWokXOw==";
       };
     };
     "@fluentui/react-window-provider-1.0.1" = {
@@ -2137,31 +2155,31 @@ let
         sha512 = "wkB/L9cRxlPB4m9k9WQJZYPbnRxfEu2bkxvI9pVGHMsmoQxMZiM2GkhCBHDTBYJb7cxCS6Wv3LJb1w0iEqw24w==";
       };
     };
-    "@graphql-tools/graphql-file-loader-6.2.5" = {
+    "@graphql-tools/graphql-file-loader-6.2.6" = {
       name = "_at_graphql-tools_slash_graphql-file-loader";
       packageName = "@graphql-tools/graphql-file-loader";
-      version = "6.2.5";
+      version = "6.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.5.tgz";
-        sha512 = "vYDn71FHqwCxWgw8swoVOsD5C0xGz/Lw4zUQnPcgZfAzhAAwl6e/rVWl/HF1UNNSf5CSZu+2oidjOWCI5Wl6Gg==";
+        url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.6.tgz";
+        sha512 = "L+RdYl5C6+X0zdOTUotY0K5zwqvSGpqI/qcZpVvCDenoAcVTyaNLmnd/ViErwedhCaGqAAV0wI1nPtyKFPlMUg==";
       };
     };
-    "@graphql-tools/import-6.2.4" = {
+    "@graphql-tools/import-6.2.5" = {
       name = "_at_graphql-tools_slash_import";
       packageName = "@graphql-tools/import";
-      version = "6.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.4.tgz";
-        sha512 = "Q6fk6hbtDevoEVcgwb3WRn7XOqGY4MnX3Mvc+x8/b8k4RZ4wT+0WSLRDXGAKiVKRxGhgouU2lZVnGE/LDrGSCg==";
-      };
-    };
-    "@graphql-tools/json-file-loader-6.2.5" = {
-      name = "_at_graphql-tools_slash_json-file-loader";
-      packageName = "@graphql-tools/json-file-loader";
       version = "6.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.5.tgz";
-        sha512 = "9LS7WuQdSHlRUvXD7ixt5aDpr3hWsueURHOaWe7T0xZ+KWMTw+LIRtWIliCRzbjNmZ+4ZhwHB3Vc1SO2bfYLgg==";
+        url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.5.tgz";
+        sha512 = "ZGXT5tDod7m+LO38fc+o0JzR1LstL0RF35HKEWoUdxRIVaaeYH9VMuan9Gn+9M9RDME3RnzEa9aGzf9ATj8bTA==";
+      };
+    };
+    "@graphql-tools/json-file-loader-6.2.6" = {
+      name = "_at_graphql-tools_slash_json-file-loader";
+      packageName = "@graphql-tools/json-file-loader";
+      version = "6.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.6.tgz";
+        sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA==";
       };
     };
     "@graphql-tools/load-6.2.4" = {
@@ -3370,6 +3388,15 @@ let
         sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A==";
       };
     };
+    "@mdn/browser-compat-data-2.0.5" = {
+      name = "_at_mdn_slash_browser-compat-data";
+      packageName = "@mdn/browser-compat-data";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-2.0.5.tgz";
+        sha512 = "JTosoRJrq5E8QYLwPfqB22zZxyBzUEx+1ooOPMcrFYgWplOeS8K8B6VD3WHD+9XV+R1X5vimruSL9ALYuxfD+A==";
+      };
+    };
     "@medv/blessed-2.0.1" = {
       name = "_at_medv_slash_blessed";
       packageName = "@medv/blessed";
@@ -3433,13 +3460,13 @@ let
         sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
       };
     };
-    "@netlify/build-5.3.1" = {
+    "@netlify/build-5.3.2" = {
       name = "_at_netlify_slash_build";
       packageName = "@netlify/build";
-      version = "5.3.1";
+      version = "5.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/build/-/build-5.3.1.tgz";
-        sha512 = "4Qb4TuqOoRP2fopebyAonjNu0Ay3GVjOQSqzJUcENPg7MNIwzqd/V7nY+OtQJyA8/1Xjd4cwdPP20SIoGoBvMQ==";
+        url = "https://registry.npmjs.org/@netlify/build/-/build-5.3.2.tgz";
+        sha512 = "haRUNAWfLpF/xFXFSpTB7GjzbvQRYsfu3lUHWXMsopWncIP507mfBnMrTj9sXPhmtiTGiDCZo96IbTbGWne+tw==";
       };
     };
     "@netlify/cache-utils-1.0.6" = {
@@ -3496,13 +3523,13 @@ let
         sha512 = "kkRCzA71HugJxmPOcWv2B4ArHhSMKjs2ArGBr10ndocVLdAHwCYoJm0X4Xt8IYaOcGD9Lm4fbLjpXDLDRGDzPw==";
       };
     };
-    "@netlify/plugin-edge-handlers-1.9.0" = {
+    "@netlify/plugin-edge-handlers-1.10.0" = {
       name = "_at_netlify_slash_plugin-edge-handlers";
       packageName = "@netlify/plugin-edge-handlers";
-      version = "1.9.0";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.9.0.tgz";
-        sha512 = "5JRVj9lVxG3VKI3vUk95AkS2ZatDHEcOBPZ5En4j+vKlfwQpn0oCbTbHQ5V45Zf0dKZv3rULAYZ//vHmVIH/Nw==";
+        url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.10.0.tgz";
+        sha512 = "ZgabL4Q+DfB5lqq36QYvGIhLifoiVz5oDfqLp1w7hRsJYwUhUPqeJx/0zph17ZaJB4CvHRadFOeyJeDSkzrERg==";
       };
     };
     "@netlify/run-utils-1.0.5" = {
@@ -3514,49 +3541,49 @@ let
         sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q==";
       };
     };
-    "@netlify/traffic-mesh-agent-0.24.0" = {
+    "@netlify/traffic-mesh-agent-0.26.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent";
       packageName = "@netlify/traffic-mesh-agent";
-      version = "0.24.0";
+      version = "0.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.24.0.tgz";
-        sha512 = "m3nfdolp8+jwy7sBKz6iuw1MRRZR27onrUtQz3Iwor7CE0+rIWJm+aPc5AFYUlISDM5zTCXgVGDeiPHJv5cOQQ==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.26.0.tgz";
+        sha512 = "FVmxKUxKoF9JY7qgZ93SwjhUkEYgod2dcsgVhYNuf2p/UbxZDJI0tCtaajj3XvHoaNRHq1tCuXmhH+oMZD5Wpw==";
       };
     };
-    "@netlify/traffic-mesh-agent-darwin-x64-0.24.0" = {
+    "@netlify/traffic-mesh-agent-darwin-x64-0.26.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64";
       packageName = "@netlify/traffic-mesh-agent-darwin-x64";
-      version = "0.24.0";
+      version = "0.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.24.0.tgz";
-        sha512 = "aFh/04aTRNI7BAyUbpXvH6AZ+XcJMxwroQWfMYjyVm7F+T4bg0XRcteoVjX/U2NhxkNhCXMqBgrHFsVNZLlJ7w==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.26.0.tgz";
+        sha512 = "F1eOp1kN3dd1z0iPdd3jI6gVpyrG5jhnq1pg7/ez29Y5P+E+kBE+9qkyRdP5Kq2EPxPFNtnNU8teug3gNpBI7g==";
       };
     };
-    "@netlify/traffic-mesh-agent-linux-x64-0.24.0" = {
+    "@netlify/traffic-mesh-agent-linux-x64-0.26.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent-linux-x64";
       packageName = "@netlify/traffic-mesh-agent-linux-x64";
-      version = "0.24.0";
+      version = "0.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.24.0.tgz";
-        sha512 = "cUHUpajpK3WrE78F29fEuOKuRG+mkXoPoe2SL9wO+sCrAw18A9px/tfWWFwC9iJLSr/WLHYAAOJhdm02ypa65A==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.26.0.tgz";
+        sha512 = "2+gzwcz9XhhX2DgOzIUxQOVDH58e8blbatdlQqwkZ8iLzmQq1UWws4WOPcierfSJv+m2QIoNkSubhZoI9M9DEg==";
       };
     };
-    "@netlify/traffic-mesh-agent-win32-x64-0.24.0" = {
+    "@netlify/traffic-mesh-agent-win32-x64-0.26.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent-win32-x64";
       packageName = "@netlify/traffic-mesh-agent-win32-x64";
-      version = "0.24.0";
+      version = "0.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.24.0.tgz";
-        sha512 = "9K4QA5VcJK9Wrx9BTKSaeOaX9es7lfS97iJMB1micSFuLIK5o/DS9oxaa4tMjzIy0Ck/Pa717XX9TGx9MpCexA==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.26.0.tgz";
+        sha512 = "s+rON64IkiD/Qp5KyNA3/D9kpnvEpWw3JTYR5NVw6qwg2exc5unXe+D5mCCSu2wBR2zsRKvL53hbiXEbQ6S3ug==";
       };
     };
-    "@netlify/zip-it-and-ship-it-1.4.0" = {
+    "@netlify/zip-it-and-ship-it-1.4.1" = {
       name = "_at_netlify_slash_zip-it-and-ship-it";
       packageName = "@netlify/zip-it-and-ship-it";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.4.0.tgz";
-        sha512 = "xPJDEMkHnIoHk19enEbg4qiIwszXS8XOUi8UpD4YMA81GXGT0xi16Z17kOACipDG6Tmmy5Jl6pe3cKqQvM/WyQ==";
+        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.4.1.tgz";
+        sha512 = "LlYqpKdaYdN8b2To8xS4Uye9ALOw0dXye/vwPvLYWY6nLTigJEajqPpt1D0YUJdV+4FD2KmzIhzgMU/l7jQSTQ==";
       };
     };
     "@node-red/editor-api-1.2.5" = {
@@ -3703,13 +3730,13 @@ let
         sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==";
       };
     };
-    "@npmcli/run-script-1.8.0" = {
+    "@npmcli/run-script-1.8.1" = {
       name = "_at_npmcli_slash_run-script";
       packageName = "@npmcli/run-script";
-      version = "1.8.0";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.0.tgz";
-        sha512 = "ljPLRbQM5byhqacWl9kIjt/yPMee0heaTskaMBFaFvYzOXNJ64h27xV96Sr+LnjJpqR0qJejG36QzJkXILvghQ==";
+        url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.1.tgz";
+        sha512 = "G8c86g9cQHyRINosIcpovzv0BkXQc3urhL1ORf3KTe4TS4UBsg2O4Z2feca/W3pfzdHEJzc83ETBW4aKbb3SaA==";
       };
     };
     "@oclif/color-0.1.2" = {
@@ -3721,15 +3748,6 @@ let
         sha512 = "M9o+DOrb8l603qvgz1FogJBUGLqcMFL1aFg2ZEL0FbXJofiNTLOWIeB4faeZTLwE6dt0xH9GpCVpzksMMzGbmA==";
       };
     };
-    "@oclif/command-1.6.1" = {
-      name = "_at_oclif_slash_command";
-      packageName = "@oclif/command";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/command/-/command-1.6.1.tgz";
-        sha512 = "pvmMmfGn+zm4e4RwVw63mg9sIaqKqmVsFbImQoUrCO/43UmWzoSHWNXKdgEGigOezWrkZfFucaeZcSbp149OWg==";
-      };
-    };
     "@oclif/command-1.8.0" = {
       name = "_at_oclif_slash_command";
       packageName = "@oclif/command";
@@ -3739,15 +3757,6 @@ let
         sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw==";
       };
     };
-    "@oclif/config-1.15.1" = {
-      name = "_at_oclif_slash_config";
-      packageName = "@oclif/config";
-      version = "1.15.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/config/-/config-1.15.1.tgz";
-        sha512 = "GdyHpEZuWlfU8GSaZoiywtfVBsPcfYn1KuSLT1JTfvZGpPG6vShcGr24YZ3HG2jXUFlIuAqDcYlTzOrqOdTPNQ==";
-      };
-    };
     "@oclif/config-1.17.0" = {
       name = "_at_oclif_slash_config";
       packageName = "@oclif/config";
@@ -3757,15 +3766,6 @@ let
         sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA==";
       };
     };
-    "@oclif/errors-1.2.2" = {
-      name = "_at_oclif_slash_errors";
-      packageName = "@oclif/errors";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.2.2.tgz";
-        sha512 = "Eq8BFuJUQcbAPVofDxwdE0bL14inIiwt5EaKRVY9ZDIG11jwdXZqiQEECJx0VfnLyUZdYfRd/znDI/MytdJoKg==";
-      };
-    };
     "@oclif/errors-1.3.3" = {
       name = "_at_oclif_slash_errors";
       packageName = "@oclif/errors";
@@ -3856,15 +3856,6 @@ let
         sha512 = "G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg==";
       };
     };
-    "@oclif/plugin-plugins-1.9.0" = {
-      name = "_at_oclif_slash_plugin-plugins";
-      packageName = "@oclif/plugin-plugins";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.0.tgz";
-        sha512 = "sq31nJk/n5pH5qGDioj2Z9x6MlRUrc/kkQrfCYKRPbQM80qewSP4RcPK3/gDvDSOAWD3wLAK9oMbDQO9lqImMA==";
-      };
-    };
     "@oclif/plugin-plugins-1.9.1" = {
       name = "_at_oclif_slash_plugin-plugins";
       packageName = "@oclif/plugin-plugins";
@@ -3874,6 +3865,15 @@ let
         sha512 = "/lE644CeLZ9ZNpDzHTKSadUtHjo86CbKZBazJiBEeH3LAzf90AeiX447slVByGIAHOglvPgWLKaTUGuWdF/iwQ==";
       };
     };
+    "@oclif/plugin-plugins-1.9.4" = {
+      name = "_at_oclif_slash_plugin-plugins";
+      packageName = "@oclif/plugin-plugins";
+      version = "1.9.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.4.tgz";
+        sha512 = "C5hEbX4zzTjzbym2RJUE4wxz2aL2ocb826HDs3suscsjMPA3mRHyu8/rWJW1Cgc2MeoIybNdrfyPU/zmpWkaWw==";
+      };
+    };
     "@oclif/plugin-warn-if-update-available-1.7.0" = {
       name = "_at_oclif_slash_plugin-warn-if-update-available";
       packageName = "@oclif/plugin-warn-if-update-available";
@@ -4027,310 +4027,310 @@ let
         sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A==";
       };
     };
-    "@ot-builder/bin-composite-types-0.10.33" = {
+    "@ot-builder/bin-composite-types-0.10.34" = {
       name = "_at_ot-builder_slash_bin-composite-types";
       packageName = "@ot-builder/bin-composite-types";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.33.tgz";
-        sha512 = "6Ls0hv6JRVzyeT3By9wl34B1d2exTKp6eilU7z4MZzGR78MU73H6nVDp9NTlwhA545K1dqAk6lAN2ApUo60UaQ==";
+        url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.34.tgz";
+        sha512 = "Tapb8mSXEZcmZNwB9KKo0CFLu8ZajAEAqxH07Py/lvS+2Rpe6LZWoPbLcHRwAP47cHbbO3IxZLWhvlWfOmaxHA==";
       };
     };
-    "@ot-builder/bin-util-0.10.33" = {
+    "@ot-builder/bin-util-0.10.34" = {
       name = "_at_ot-builder_slash_bin-util";
       packageName = "@ot-builder/bin-util";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.33.tgz";
-        sha512 = "ijm6023Wlv4l6jt04Zq/Ts2GJDtDN++NDD70VQ0PsKcX0N5/Ebzbn2v+2cNaTFirGY1O+H1tGtLcPFVR32aDLw==";
+        url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.34.tgz";
+        sha512 = "hyu0SLfWzMG9VKy54Nmxa723owd6o3miF1NR5FN/ff+ZkWbRqzSCm7haw40801ESC2DqMWjeZDyJBU4A+aHMFQ==";
       };
     };
-    "@ot-builder/cli-help-shower-0.10.33" = {
+    "@ot-builder/cli-help-shower-0.10.34" = {
       name = "_at_ot-builder_slash_cli-help-shower";
       packageName = "@ot-builder/cli-help-shower";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.33.tgz";
-        sha512 = "720ibT7AxqrTfcYdOuPC4/RTQV8HgOt3W5yz1Z7tF0Dtj7Oka5X3qiLHlBiaNQYfRlmvap84NG1JXI9KedYtQA==";
+        url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.34.tgz";
+        sha512 = "bCo9xNGvXSkEN7e8mK7sFHYLoCEsGIzPoZeyeWbEe4rWC6FQAAPWwlzCWldaNcbK/nGJsHYiHxLGO3LjeFl00A==";
       };
     };
-    "@ot-builder/cli-proc-0.10.33" = {
+    "@ot-builder/cli-proc-0.10.34" = {
       name = "_at_ot-builder_slash_cli-proc";
       packageName = "@ot-builder/cli-proc";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.33.tgz";
-        sha512 = "ou8I9QUwwttYreAmeTsdRHSJeudclIEQdDitKXTDJFB3qombH2n1509BHN+lod5TbDEO/L/Nhyz82xQxmEnvUw==";
+        url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.34.tgz";
+        sha512 = "nckPcf5wm1nGm2Aw+JXllYGp5MGdJzGqYoS7wAbkA2i371rhD8LM6j+hQNorZ07rb6rFc2v09MMtuNmO8CpoaA==";
       };
     };
-    "@ot-builder/cli-shared-0.10.33" = {
+    "@ot-builder/cli-shared-0.10.34" = {
       name = "_at_ot-builder_slash_cli-shared";
       packageName = "@ot-builder/cli-shared";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.33.tgz";
-        sha512 = "pZXxdWoIj/XntJ2+NbpW+N5IdRJzTRMa+0SQdKr/xqrLq9qIKkcBhaqeY8HzqKF8CXPDdwEsgtXrAvmrStE1VA==";
+        url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.34.tgz";
+        sha512 = "tCH4OJnc+9trMBffqZDW/tHmRj72+sqwE9JNCBRA4iabiL8rQQEKWLm3iYEygS7/X7oZSLU+idQK+gI/9rLy0Q==";
       };
     };
-    "@ot-builder/common-impl-0.10.33" = {
+    "@ot-builder/common-impl-0.10.34" = {
       name = "_at_ot-builder_slash_common-impl";
       packageName = "@ot-builder/common-impl";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.33.tgz";
-        sha512 = "5lZxnaoP2qQ5/57BDhdtY3y5qdUScUi9AOBb0xIEG2MbzSEqruoY01AbxhNG47oJGeVCTrgRP9u0xPOhWY+4+A==";
+        url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.34.tgz";
+        sha512 = "igfcrSnhHEJZdziq1XKFnb2ZV82t/+3Ez+1lE9N0V542CzhRsGKHDcd1X3msfhRqc88ykl+zW/sKWLWvsnseKA==";
       };
     };
-    "@ot-builder/errors-0.10.33" = {
+    "@ot-builder/errors-0.10.34" = {
       name = "_at_ot-builder_slash_errors";
       packageName = "@ot-builder/errors";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.33.tgz";
-        sha512 = "Eq3ghzkxLIZasfh2Sc49MDoaCwmW6c4xaqq9yZSmY1txd6s8WrzWisDBYdt7qwCHVW2EcbsJMNpSKECzAfegpA==";
+        url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.34.tgz";
+        sha512 = "p/vBXtzbFt34KC4fgAHxpbxTVI12rVcbyPvTu6dmwAkwaQG6gF22STwdc5rK9Qllr475Ppkojfp165udUo250g==";
       };
     };
-    "@ot-builder/io-bin-cff-0.10.33" = {
+    "@ot-builder/io-bin-cff-0.10.34" = {
       name = "_at_ot-builder_slash_io-bin-cff";
       packageName = "@ot-builder/io-bin-cff";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.33.tgz";
-        sha512 = "QffGC05YocTrzNDhNa2gF64/iZqarERvRM8EnGRyZM4THHE/LwWHVMtirDl/DI8V1Ex00XTpxfCPwRerhQWBvw==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.34.tgz";
+        sha512 = "GvL+LGXXgJtHoSr00Qkm/LI9dpMJXXkXzZFjpfIyjx5o74ao7zod85SjxfBqzVdRUFcNvVbOSIiM7xrW1IgiTA==";
       };
     };
-    "@ot-builder/io-bin-encoding-0.10.33" = {
+    "@ot-builder/io-bin-encoding-0.10.34" = {
       name = "_at_ot-builder_slash_io-bin-encoding";
       packageName = "@ot-builder/io-bin-encoding";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.33.tgz";
-        sha512 = "WUFSdfpv55uuiPTOepAPrcXqRLDeyLb3dY9OjUeX2bPbWTHoNH0n6SaKAf0PAKhCMeELoPibd6tXMe1BRtpVag==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.34.tgz";
+        sha512 = "euzzwHXtjVTiFa5RPonkYOOP/rX0vqeUfupW6SiGIPrp0YszrjHGbWk+pLxxkbTteA30o+Xc7IQ8sppXd+AGGw==";
       };
     };
-    "@ot-builder/io-bin-ext-private-0.10.33" = {
+    "@ot-builder/io-bin-ext-private-0.10.34" = {
       name = "_at_ot-builder_slash_io-bin-ext-private";
       packageName = "@ot-builder/io-bin-ext-private";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.33.tgz";
-        sha512 = "fq97OoqCT+sdZ0tfwpPeWHXbji5a3dxZLNw4WkRRJ1Ih8/IwL8NNZPpwv4MbgWvl18Bwsfeu0VHXkwiZKmlo6Q==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.34.tgz";
+        sha512 = "5TjCMXPLR6mfpG0E3h/EvKWuaLzoLOJQZxlnAeHh2zg5w0uzoMFArxhY08cE7iKlITQLlLwV5EgagcgjmD+xrw==";
       };
     };
-    "@ot-builder/io-bin-font-0.10.33" = {
+    "@ot-builder/io-bin-font-0.10.34" = {
       name = "_at_ot-builder_slash_io-bin-font";
       packageName = "@ot-builder/io-bin-font";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.33.tgz";
-        sha512 = "Kyf0e5g1ovpCX3ndbvyRUpdpNK227WWxr+KFRZzuy0vV+IJS+vbJ6TnLeYBCblIgrUGtGn12XJi7VL5wLN6eWg==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.34.tgz";
+        sha512 = "wfPhUDtg8f4WL/tAS031qVXR33HCa8zC4K+TfMWgLeVhApPGtT8qhPsUN7VMZwvu6L92YYVlG1BYLo/bQZtcdA==";
       };
     };
-    "@ot-builder/io-bin-glyph-store-0.10.33" = {
+    "@ot-builder/io-bin-glyph-store-0.10.34" = {
       name = "_at_ot-builder_slash_io-bin-glyph-store";
       packageName = "@ot-builder/io-bin-glyph-store";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.33.tgz";
-        sha512 = "0pMS9l8Ip+IWokPV90VC2x1Xqvm3oAmVxK+FUgY9kogbZAwnQXmMzkXSvNk+HDHv6yVXq73c/v9AzztPVzW3DQ==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.34.tgz";
+        sha512 = "0izykazfWE77KEN9N17fyrftUEiTMFiYZAV06mGDpOmHyRLM0oFAnGheWE7n5rRj5ft/9tuH/Yi3z1RPkM2LzQ==";
       };
     };
-    "@ot-builder/io-bin-layout-0.10.33" = {
+    "@ot-builder/io-bin-layout-0.10.34" = {
       name = "_at_ot-builder_slash_io-bin-layout";
       packageName = "@ot-builder/io-bin-layout";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.33.tgz";
-        sha512 = "GjGUw00uuPIownm+gQoF9ntBJuaInqofYtb43ScjS1gvQX+qcjg7ZMHoaOcF0N9MmbgQRoQYde0JFXuagHdlVg==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.34.tgz";
+        sha512 = "35689IuO84kKg25ltvzJemF49zoEYv/uT1CEEvPbI8vfsss32CVBDxVsyHoIMeCVz872i3q0LEMquZ4v7bQP1A==";
       };
     };
-    "@ot-builder/io-bin-metadata-0.10.33" = {
+    "@ot-builder/io-bin-metadata-0.10.34" = {
       name = "_at_ot-builder_slash_io-bin-metadata";
       packageName = "@ot-builder/io-bin-metadata";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.33.tgz";
-        sha512 = "0Wf5CVkJH3e6imQSsqMKuGV3xX//Vj8Mf3dRkuxCj9EC7C1W1dZoVwrBwKg8DS25uYyERQCHrjuJ4+hbArnfcQ==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.34.tgz";
+        sha512 = "hHvHgbW9q/rY7RLKUZ6bd15mjWuInyek1N+t81XeF58/W6AC50Ya65wxhG381wui1NGgUJrcwUcO6K36RQCyFA==";
       };
     };
-    "@ot-builder/io-bin-metric-0.10.33" = {
+    "@ot-builder/io-bin-metric-0.10.34" = {
       name = "_at_ot-builder_slash_io-bin-metric";
       packageName = "@ot-builder/io-bin-metric";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.33.tgz";
-        sha512 = "lJQWWJl5fZaB1/u+s8xp/5bOrG6WKdz6HV9C669HhiUF29RbeYVgHqUz7Mf4tlcXqulTUddDwDGS552GuyJEfw==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.34.tgz";
+        sha512 = "9MgzLr/GVWEF2aKDBu0UZ+9X6a84IxQw3Yhnw9MigMdK345We/rtuL1Q1Io5XW9XDcj89EqP/31cUSAr/bD0YQ==";
       };
     };
-    "@ot-builder/io-bin-name-0.10.33" = {
+    "@ot-builder/io-bin-name-0.10.34" = {
       name = "_at_ot-builder_slash_io-bin-name";
       packageName = "@ot-builder/io-bin-name";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.33.tgz";
-        sha512 = "rCuiBuln5t7e8CGHAFJqa8duCVFlPbhSXGb7TsOyrqyNbEwZPrCDx40grMVB46xjKdAj8ZeE1Y1jikxSNlPW7g==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.34.tgz";
+        sha512 = "s/PGAiUV/Qvz7b3dejSXrvk7g8H75yTKfa4HbmZDUPL9PB0+0+BEYbCeHeTTGD3EjZCA5tH1oi19IfuXzFWMsw==";
       };
     };
-    "@ot-builder/io-bin-sfnt-0.10.33" = {
+    "@ot-builder/io-bin-sfnt-0.10.34" = {
       name = "_at_ot-builder_slash_io-bin-sfnt";
       packageName = "@ot-builder/io-bin-sfnt";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.33.tgz";
-        sha512 = "vLRxvsh8LYOwLPqPEGdedG9/KqVpfeR6ceHa0zYc0Y/5FwOYjwbscIdr3SlyKJsPBFVvbOuzvmIBkKC7rASc8w==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.34.tgz";
+        sha512 = "/GcMw5E1fvZ5B67jUfLbDWzHzMxQRnAMx0OAXq3FseY4dr28OOppieKbHK6f7K+cuscyOxcY/sycpDPLgI21wA==";
       };
     };
-    "@ot-builder/io-bin-ttf-0.10.33" = {
+    "@ot-builder/io-bin-ttf-0.10.34" = {
       name = "_at_ot-builder_slash_io-bin-ttf";
       packageName = "@ot-builder/io-bin-ttf";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.33.tgz";
-        sha512 = "8yJoOjvwpRPyRMs45/uNNS9kBS3iQFLCSdLRlikH9cqxCHDpVH0vr74XHf0LCWwhnG/DJzcbB6L8LRnhl+QH2A==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.34.tgz";
+        sha512 = "X8xX76EP24H4DxQJO1kvIwmXfCuTyoCbvYB+6oXuITt4LbIjvbDoCn/PDKdxxUdDxDkcdN+5yZZAxc64Cinzew==";
       };
     };
-    "@ot-builder/ot-0.10.33" = {
+    "@ot-builder/ot-0.10.34" = {
       name = "_at_ot-builder_slash_ot";
       packageName = "@ot-builder/ot";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.33.tgz";
-        sha512 = "fFR3y7oFFmdOHSPQV0yU5hYj9Ahg+M0Y46rvcI8JaUDywIWeuDV0p0YBZ83x4p4wX5k571aiY5lxQtZrDAHSRA==";
+        url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.34.tgz";
+        sha512 = "TFEhsVLr7zqDVDCupvw0+OIDzeUry+g/csgmn+fUIx5NBlyDLF78CJytYUha/HhzIyh3NeTgIDDVTU0K04jo2Q==";
       };
     };
-    "@ot-builder/ot-encoding-0.10.33" = {
+    "@ot-builder/ot-encoding-0.10.34" = {
       name = "_at_ot-builder_slash_ot-encoding";
       packageName = "@ot-builder/ot-encoding";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.33.tgz";
-        sha512 = "rAt3lLA3sWtQCfGB1IPfkEzDpSjE4xom/qR7+xT38FXKu5SUqWQYLIqmtLmXX9oSo6oQ3z1Urx4rbdGYdwHpwQ==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.34.tgz";
+        sha512 = "InJjxEU008C4tfOvw+dZ3R+g5xIjOkwawPMYnSnWLJFII5uWLQKTcq7pzYiM4/vsVLvgUFBfpKvMxbf7Ul9l7g==";
       };
     };
-    "@ot-builder/ot-ext-private-0.10.33" = {
+    "@ot-builder/ot-ext-private-0.10.34" = {
       name = "_at_ot-builder_slash_ot-ext-private";
       packageName = "@ot-builder/ot-ext-private";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.33.tgz";
-        sha512 = "+cQV1aTbCFXX+OyEIvRohlLbHpXTlzPJ8E4PICOyfqe41fw1DHbDEdilyQRvdLQ6TJqvvxktBD4xt+IOluviPw==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.34.tgz";
+        sha512 = "+q1U1PhBIjc83SZhMgqIi9O9p85vW338MvWEwehxnIijT84XJJeiQ2kWektiz62rxGjL23YnPqLljFojMbG7/Q==";
       };
     };
-    "@ot-builder/ot-glyphs-0.10.33" = {
+    "@ot-builder/ot-glyphs-0.10.34" = {
       name = "_at_ot-builder_slash_ot-glyphs";
       packageName = "@ot-builder/ot-glyphs";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.33.tgz";
-        sha512 = "jpPxTDct01TTpJptMFDIuKzXYxhiNXpQIfikydKXQU+M7jDQJJLjIjAnz33MVzeMxR6+8og0F2qgG/OFcDMpTQ==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.34.tgz";
+        sha512 = "YzXak7LFJVekz/nyi8hPVipY3PTTM+tmPit875TX56+/OuhwuQWbT5HeM++kmlGc/VYxbFzndJybR87YsuNvjQ==";
       };
     };
-    "@ot-builder/ot-layout-0.10.33" = {
+    "@ot-builder/ot-layout-0.10.34" = {
       name = "_at_ot-builder_slash_ot-layout";
       packageName = "@ot-builder/ot-layout";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.33.tgz";
-        sha512 = "aa2b4Oa5B2YFZ//A+MAEEVBcLv0XEKTjtUARAj3bTthHNnPWJHjGjHUpNPMccBJNWysKwlz37cxAItpMXgpgOg==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.34.tgz";
+        sha512 = "ftGx58faieUlzWefhRrcR/m4gmAVvIge4SkBDVanIaFgPst8CsH01THkhtbIanzHoZARn+FcU5SXruRC0VhVdA==";
       };
     };
-    "@ot-builder/ot-metadata-0.10.33" = {
+    "@ot-builder/ot-metadata-0.10.34" = {
       name = "_at_ot-builder_slash_ot-metadata";
       packageName = "@ot-builder/ot-metadata";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.33.tgz";
-        sha512 = "pwwf49hCU3mjWkUUT4mIN7dtJr7fBtXozcOQ70vVAzTPE3kUOD/eun4Vs2UqHGkPRvOU89eEQQgQ+5941aH8rg==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.34.tgz";
+        sha512 = "w1uqzSQWfmIr1zP7s4tCfVzyc55s18D//QgkHHZAEEcO28pfslMSIRm70DiggXo1uYVARlUUT/BAcnK/U+qQBA==";
       };
     };
-    "@ot-builder/ot-name-0.10.33" = {
+    "@ot-builder/ot-name-0.10.34" = {
       name = "_at_ot-builder_slash_ot-name";
       packageName = "@ot-builder/ot-name";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.33.tgz";
-        sha512 = "32jR7zRnkMLWmkdiQzXryRaPycbiJNJiPY016/efcv4hYuHvrq/tpXA5P6bEV205njy7n5KA7txrkSWZP9+0JA==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.34.tgz";
+        sha512 = "1aw41J3vyAKaSyEBzRNlpRcBiSZkajp5MCy0hRaa68ZwEY/mPcQkSh4KjZEMyx+ndFmHKRdL3396ksVKftOgVg==";
       };
     };
-    "@ot-builder/ot-sfnt-0.10.33" = {
+    "@ot-builder/ot-sfnt-0.10.34" = {
       name = "_at_ot-builder_slash_ot-sfnt";
       packageName = "@ot-builder/ot-sfnt";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.33.tgz";
-        sha512 = "/T4TfeimVDhLMRXInKhz2EGKzzWLAgijNaQpc7OO+Cxy3z43g0B6d7EzlsAD8W9lauYpuMnXEItvznY0wBgi7A==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.34.tgz";
+        sha512 = "I88VMnJY0HxXLf2P+xnTIRheSsyCphnh8Vjj/zfroNHB98vdPIbE7d44cCv4C2u1zNRGwbhogMLBKghfhbqjuA==";
       };
     };
-    "@ot-builder/ot-standard-glyph-namer-0.10.33" = {
+    "@ot-builder/ot-standard-glyph-namer-0.10.34" = {
       name = "_at_ot-builder_slash_ot-standard-glyph-namer";
       packageName = "@ot-builder/ot-standard-glyph-namer";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.33.tgz";
-        sha512 = "PDz2ZupCN7DmIRSOvJWrv/uCUwUqEmWZSSrzu9vaSpIglbjSzKtQ9axi/SZIAMughky9YMxME8yiKFpHzI/FGw==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.34.tgz";
+        sha512 = "AjdOIfQxyN2dIlA8RAzFeu9ysGS9yMiZN1nVjHaTdHjl6nZx16Xjhtf1xEa5GbMORDaWkFeaXnYWM1kp/IYAhw==";
       };
     };
-    "@ot-builder/prelude-0.10.33" = {
+    "@ot-builder/prelude-0.10.34" = {
       name = "_at_ot-builder_slash_prelude";
       packageName = "@ot-builder/prelude";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.33.tgz";
-        sha512 = "3dUiOB4e4BUT4u6YssK1pe/W8wSMw2+XG9TqtW9ZRrnFAaVxmEnrh7okde5Y26Rq/TtMiMmd7zUaP+ut9x9VYg==";
+        url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.34.tgz";
+        sha512 = "z7OuMrGgr6sYn+UWOctyWDpCra2+nRPPpmUkbbP7RhTh3ANjJFePeMaOQiYogz7u7IKlDzlg5D4qY/F/gJNuPA==";
       };
     };
-    "@ot-builder/primitive-0.10.33" = {
+    "@ot-builder/primitive-0.10.34" = {
       name = "_at_ot-builder_slash_primitive";
       packageName = "@ot-builder/primitive";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.33.tgz";
-        sha512 = "0wNZRIgJ9j2fqF8m3ldGmqlRrR7JJesBJe1841pD/yY756A0aY0/mkqBB2SKo58YYZA+HZicUT8dlD1EgNCbXw==";
+        url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.34.tgz";
+        sha512 = "67yTVBkLzfQy0F3xfHA+NYAWy+A2Z6udWznK7nW0McK9PtOvCjCNl68UrW+vmohR8T4t0PGTC3lHX7dBkxyQTQ==";
       };
     };
-    "@ot-builder/rectify-0.10.33" = {
+    "@ot-builder/rectify-0.10.34" = {
       name = "_at_ot-builder_slash_rectify";
       packageName = "@ot-builder/rectify";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.33.tgz";
-        sha512 = "JqAcAgy2feCstg++bgeH9JofhOSc++Sx/ZjIGRNgtu8qiGRxRGP2MTZdn4zEy4etQYpRSgiuJbCx1K9XmwNXHA==";
+        url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.34.tgz";
+        sha512 = "rT9t9eYjRlx/EioSWwkrNHMSNlXr1UufB2+Tni6DRCWoTV0XjgFsAt1fjj+vTcxtvy7ZZuZKOdwkyxITiMPK4A==";
       };
     };
-    "@ot-builder/stat-glyphs-0.10.33" = {
+    "@ot-builder/stat-glyphs-0.10.34" = {
       name = "_at_ot-builder_slash_stat-glyphs";
       packageName = "@ot-builder/stat-glyphs";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.33.tgz";
-        sha512 = "fwvn4vnmQGKHVHOVrNUA56I++k8bbxyYrMh/ifdZhn7FrlCldeM5UvQfPbjsVoU1aIKGkr+WM6BBF1WkbXPsxg==";
+        url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.34.tgz";
+        sha512 = "cqWuTCGgelc6Dqg0nW3kkylFkP0dc7vvSlnSQr1eZaq6YD36o/ckWzXLc/caGY6GefFYVfGx+kpzx45f5MdCIQ==";
       };
     };
-    "@ot-builder/trace-0.10.33" = {
+    "@ot-builder/trace-0.10.34" = {
       name = "_at_ot-builder_slash_trace";
       packageName = "@ot-builder/trace";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.33.tgz";
-        sha512 = "8AKK0zw3z90ozZI/V2vByGc2QPTN3fJol/MwEsyY1wART7s0YIo2/Q4gFq72T2sTw10aBNH3CQ5cP8DPRFqCwg==";
+        url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.34.tgz";
+        sha512 = "EW9xYkpocQV0M+sdVlOhSAucs/tRoZogQ+NVZ+yLJTcPAEE+PFyvU81Rd0+R9Lp1LOpLmYDQFJpzh3n/z+i9aA==";
       };
     };
-    "@ot-builder/var-store-0.10.33" = {
+    "@ot-builder/var-store-0.10.34" = {
       name = "_at_ot-builder_slash_var-store";
       packageName = "@ot-builder/var-store";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.33.tgz";
-        sha512 = "3+9BBDVQ3FmG10XWsJwsVTh6ViNdiVej2Zw5h0aXtUkS9InaFkE4aRGSaqfm9zVhunTaxZ/cFNwZAXXLAJKSrQ==";
+        url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.34.tgz";
+        sha512 = "ldEosnnwcx/NDz+mb9Z2Ta9hlhhviK2QIrXY5PIdvhtlcj6U/dMPgmvHhZwF15+0f1r03V7EIq/v5Y3T78+Phw==";
       };
     };
-    "@ot-builder/variance-0.10.33" = {
+    "@ot-builder/variance-0.10.34" = {
       name = "_at_ot-builder_slash_variance";
       packageName = "@ot-builder/variance";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.33.tgz";
-        sha512 = "Fk4yLjEK1lcvfbUgLFfyepWyYToHtAPYjh/A7KgDPhnq1MYc5kNx8w3r9Pq9vHXr5csl36kyP7+iJC6z1HHPsQ==";
+        url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.34.tgz";
+        sha512 = "McAXf0TPT+GjAZS2iT5ULZq0FR9oOQK3Vbc0g5KXxxd9/wWsINT+nSuO/YFR1O9TT1lBf7cT3OUXrAM2tKlU5Q==";
       };
     };
     "@parcel/fs-1.11.0" = {
@@ -4531,13 +4531,13 @@ let
         sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570";
       };
     };
-    "@react-native-community/cli-debugger-ui-4.9.0" = {
+    "@react-native-community/cli-debugger-ui-4.13.1" = {
       name = "_at_react-native-community_slash_cli-debugger-ui";
       packageName = "@react-native-community/cli-debugger-ui";
-      version = "4.9.0";
+      version = "4.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-4.9.0.tgz";
-        sha512 = "fBFGamHm4VUrDqkBGnsrwQL8OC6Om7K6EBQb4xj0nWekpXt1HSa3ScylYHTTWwYcpRf9htGMRGiv4dQDY/odAw==";
+        url = "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-4.13.1.tgz";
+        sha512 = "UFnkg5RTq3s2X15fSkrWY9+5BKOFjihNSnJjTV2H5PtTUFbd55qnxxPw8CxSfK0bXb1IrSvCESprk2LEpqr5cg==";
       };
     };
     "@react-native-community/cli-platform-android-4.13.0" = {
@@ -4675,13 +4675,13 @@ let
         sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==";
       };
     };
-    "@schematics/angular-11.0.1" = {
+    "@schematics/angular-11.0.2" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "11.0.1";
+      version = "11.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.0.1.tgz";
-        sha512 = "cYq3NhFn4DLSXXtbYYU2w0sginkMfN1w7pXjZLT/+etXXbtANQAXSPrPrDQql004ZNMbuDKuC0aoXjv8hgXOfw==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.0.2.tgz";
+        sha512 = "tUIuCYJUzHYuiXGJ2KCuwxMocS56kPHaM8+neVYWwWbOxKzLZXv80gMm/pIWxrqUDCkIUi3yb4ienudFhgQLYg==";
       };
     };
     "@schematics/schematics-0.1100.1" = {
@@ -4693,13 +4693,13 @@ let
         sha512 = "Y5J/qafyZtsu6spEFywGLjYMqEgONSDx9m8c8KL4c45+KqqerQeh2QQHims3G0brKUFIK3nCw95zqw+RMsGcsA==";
       };
     };
-    "@schematics/update-0.1100.1" = {
+    "@schematics/update-0.1100.2" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.1100.1";
+      version = "0.1100.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.1100.1.tgz";
-        sha512 = "EVcqdM/d5rC5L1UYnwhFMk/TjHlNgL5LGfroE13C38A+WpKKJquAjgOQLj4nPvJ5csdEZqn3Sui9yeEWc3hklQ==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.1100.2.tgz";
+        sha512 = "pETCmQylIQ7RM+8uqDkI3KfOaX5H7nuzmMXby28zdLPMZniYti0gJxieiVFhvdz2Ot2Axj0hznfmraFgC9mQMw==";
       };
     };
     "@segment/loosely-validate-event-2.0.0" = {
@@ -4729,13 +4729,13 @@ let
         sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
       };
     };
-    "@serverless/components-3.3.1" = {
+    "@serverless/components-3.4.2" = {
       name = "_at_serverless_slash_components";
       packageName = "@serverless/components";
-      version = "3.3.1";
+      version = "3.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/components/-/components-3.3.1.tgz";
-        sha512 = "4oGHMepZ18WmnNPj+PQ0GHevGZ1jU+RtMiu1bGhqS9BLdc28UDUKiCBxOjCCm/8Sdsw6NXYIhu5DDIYCpFExJQ==";
+        url = "https://registry.npmjs.org/@serverless/components/-/components-3.4.2.tgz";
+        sha512 = "yBQwN4Z0LqsYzA+SCTh6/LaGEPAu6lNAr32j2pjjZWCnDwpV1TKaSCNDTAPNSVk5L2/8exRpiEQUNM0NyTGWqA==";
       };
     };
     "@serverless/core-1.1.2" = {
@@ -4828,24 +4828,6 @@ let
         sha512 = "raOPIoPSTrkWKBDuozkYWvLXP2W65K9Uk4ud+lPcbhhBSamO3uVW40nuAkC19MdIoAsFi5oTGYpcc9UDx8b+lg==";
       };
     };
-    "@shiftkey/node-abi-2.19.2-pre" = {
-      name = "_at_shiftkey_slash_node-abi";
-      packageName = "@shiftkey/node-abi";
-      version = "2.19.2-pre";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@shiftkey/node-abi/-/node-abi-2.19.2-pre.tgz";
-        sha512 = "+LfXo6nd2uZ8cGSJ66zL3OuddvG2oMWMc9GzpDoX2ZNMLmYpu+ReoEKXtmoKVwd6JSavDymldebCxSJh9NQ9cg==";
-      };
-    };
-    "@shiftkey/prebuild-install-6.0.1-pre2" = {
-      name = "_at_shiftkey_slash_prebuild-install";
-      packageName = "@shiftkey/prebuild-install";
-      version = "6.0.1-pre2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@shiftkey/prebuild-install/-/prebuild-install-6.0.1-pre2.tgz";
-        sha512 = "wDV1DgFxi0F+kTpyGNdnDctdw3Rb9aP8RBAGFE2wXr1+pXSCJRRA+Qh5ko5dKc0LeNIBZzjEECjmtAykajv+Xw==";
-      };
-    };
     "@sindresorhus/is-0.14.0" = {
       name = "_at_sindresorhus_slash_is";
       packageName = "@sindresorhus/is";
@@ -4999,6 +4981,15 @@ let
         sha512 = "tJF+dY/wTfexwYuCgFB3RpWl4RGcf2H9RT9yurkTVi5wwKfvcNwZMUMwSlTDEFOqwmAsJ7e0uNVRlkPQHekCcQ==";
       };
     };
+    "@snyk/java-call-graph-builder-1.16.5" = {
+      name = "_at_snyk_slash_java-call-graph-builder";
+      packageName = "@snyk/java-call-graph-builder";
+      version = "1.16.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.16.5.tgz";
+        sha512 = "6H4hkq/qYljJoH1QnZsTRPMqp9Kt5AOEZYGJAeSHkhJdfUYSLtqwN4WsU6yVR3vWAaDQ8Lllp3m6EL7nstMPZA==";
+      };
+    };
     "@snyk/rpm-parser-2.2.1" = {
       name = "_at_snyk_slash_rpm-parser";
       packageName = "@snyk/rpm-parser";
@@ -5422,6 +5413,15 @@ let
         sha512 = "AQI7X+ow3SaONl44JrHoL/5B+lCsJyG31UHZ5RP98Uh15hI/zjEkDsAb4EIm4P9TGfNhZLXw/nMc5w0u10+/fQ==";
       };
     };
+    "@types/classnames-2.2.11" = {
+      name = "_at_types_slash_classnames";
+      packageName = "@types/classnames";
+      version = "2.2.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.11.tgz";
+        sha512 = "2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw==";
+      };
+    };
     "@types/clone-2.1.0" = {
       name = "_at_types_slash_clone";
       packageName = "@types/clone";
@@ -5638,6 +5638,15 @@ let
         sha512 = "RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA==";
       };
     };
+    "@types/express-serve-static-core-4.17.14" = {
+      name = "_at_types_slash_express-serve-static-core";
+      packageName = "@types/express-serve-static-core";
+      version = "4.17.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.14.tgz";
+        sha512 = "uFTLwu94TfUFMToXNgRZikwPuZdOtDgs3syBtAIr/OXorL1kJqUJT9qCLnRZ5KBOWfZQikQ2xKgR2tnDj1OgDA==";
+      };
+    };
     "@types/fancy-log-1.3.0" = {
       name = "_at_types_slash_fancy-log";
       packageName = "@types/fancy-log";
@@ -6070,13 +6079,13 @@ let
         sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==";
       };
     };
-    "@types/node-10.17.45" = {
+    "@types/node-10.17.46" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.17.45";
+      version = "10.17.46";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.17.45.tgz";
-        sha512 = "a+oe0zGtwRsSDynACia/z1e4gKPNnDhAV3G6GWY6ZNCzaujNCdKC7dE2JFkGHAlUhCRHgXNmWbh417bi9dEXBw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.17.46.tgz";
+        sha512 = "Tice8a+sJtlP9C1EUo0DYyjq52T37b3LexVu3p871+kfIBIN+OQ7PKPei1oF3MgF39olEpUfxaLtD+QFc1k69Q==";
       };
     };
     "@types/node-12.7.12" = {
@@ -6088,13 +6097,13 @@ let
         sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==";
       };
     };
-    "@types/node-13.13.31" = {
+    "@types/node-13.13.32" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.13.31";
+      version = "13.13.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.13.31.tgz";
-        sha512 = "gBk54XbcRj8EKTi7Syo4JU4purbRJaZpkvMVs7+t+b9JaOtwsGo7vCbXdVJN3gH/wu/GyZGD8lAKo0qpQuNjOw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.13.32.tgz";
+        sha512 = "sPBvDnrwZE1uePhkCEyI/qQlgZM5kePPAhHIFDWNsOrWBFRBOk3LKJYmVCLeLZlL9Ub/FzMJb31OTWCg2F+06g==";
       };
     };
     "@types/node-14.11.1" = {
@@ -6106,13 +6115,13 @@ let
         sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==";
       };
     };
-    "@types/node-14.14.8" = {
+    "@types/node-14.14.9" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.8";
+      version = "14.14.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.8.tgz";
-        sha512 = "z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.9.tgz";
+        sha512 = "JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw==";
       };
     };
     "@types/node-6.14.13" = {
@@ -7447,6 +7456,15 @@ let
         sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
+    "abort-controller-3.0.0" = {
+      name = "abort-controller";
+      packageName = "abort-controller";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz";
+        sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==";
+      };
+    };
     "absolute-0.0.1" = {
       name = "absolute";
       packageName = "absolute";
@@ -7717,13 +7735,22 @@ let
         sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1";
       };
     };
-    "addons-linter-2.9.0" = {
+    "addons-linter-2.12.0" = {
       name = "addons-linter";
       packageName = "addons-linter";
-      version = "2.9.0";
+      version = "2.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.9.0.tgz";
-        sha512 = "OrkDQ9S/GAJzMe+izsFMFOtRq9geFFt3O5c7Fi6pehGi7RY2PSMpPmKjMK1j/rPa9jrG0e9zocptMrOi11uvug==";
+        url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.12.0.tgz";
+        sha512 = "Kv2Joa81UfxCWHYK13G9ZNKb/z5cJP1TlshCh9vA2dBH55szabIN+yIxujgNCIg2/k/wDya3OihBmyFNkFmFkw==";
+      };
+    };
+    "addons-scanner-utils-3.0.0" = {
+      name = "addons-scanner-utils";
+      packageName = "addons-scanner-utils";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-3.0.0.tgz";
+        sha512 = "bX8Sx5iwvG9bHZrfP4xv+3xFU93Mk6WnBmIHm+ep4DEiqUunRRpbrs7uEgAnlWnqC46VnrFsOJdCB/MY+pHG1g==";
       };
     };
     "addr-to-ip-port-1.5.1" = {
@@ -8869,6 +8896,15 @@ let
         sha512 = "Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg==";
       };
     };
+    "archiver-5.1.0" = {
+      name = "archiver";
+      packageName = "archiver";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/archiver/-/archiver-5.1.0.tgz";
+        sha512 = "iKuQUP1nuKzBC2PFlGet5twENzCfyODmvkxwDV0cEFXavwcLrIW5ssTuHi9dyTPvpWr6Faweo2eQaQiLIwyXTA==";
+      };
+    };
     "archiver-utils-2.1.0" = {
       name = "archiver-utils";
       packageName = "archiver-utils";
@@ -9976,13 +10012,22 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.794.0" = {
+    "aws-sdk-2.784.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.794.0";
+      version = "2.784.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.794.0.tgz";
-        sha512 = "Qqz8v0WfeGveaZTPo9+52nNUep/CTuo18OcdCwF4WrnNBv7bAxExUOwN9XkqhoxLjBDk/LuMmHGhOXRljFQgRw==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.784.0.tgz";
+        sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw==";
+      };
+    };
+    "aws-sdk-2.798.0" = {
+      name = "aws-sdk";
+      packageName = "aws-sdk";
+      version = "2.798.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.798.0.tgz";
+        sha512 = "7BMCH90yFpMmCF5uxZiiKMMzIAFibZz8b6CLGw/92FgMd86ZedpNqDyaikcGv1yOVtOlNCCnXN6OglC8/vwm4Q==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -10336,13 +10381,13 @@ let
         sha1 = "1bc6f15b87f7ab1085d42b330b717657a2156500";
       };
     };
-    "babel-plugin-styled-components-1.11.1" = {
+    "babel-plugin-styled-components-1.12.0" = {
       name = "babel-plugin-styled-components";
       packageName = "babel-plugin-styled-components";
-      version = "1.11.1";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz";
-        sha512 = "YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA==";
+        url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz";
+        sha512 = "FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA==";
       };
     };
     "babel-plugin-syntax-flow-6.18.0" = {
@@ -12271,13 +12316,13 @@ let
         sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==";
       };
     };
-    "buffer-6.0.2" = {
+    "buffer-6.0.3" = {
       name = "buffer";
       packageName = "buffer";
-      version = "6.0.2";
+      version = "6.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-6.0.2.tgz";
-        sha512 = "XeXCUm+F7uY7fIzq4pKy+BLbZk4SgYS5xwlZOFYD3UEcAD+PwOoTaFr/SaXvhR1yRa8SKyPSZ7LNX4N65w7h8A==";
+        url = "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz";
+        sha512 = "FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==";
       };
     };
     "buffer-alloc-1.2.0" = {
@@ -12415,15 +12460,6 @@ let
         sha512 = "95try3p/vMRkIAAnJDaGkFhGpT/65NoeW6XelEPjAomWYR58RQtW4khn0SwKj34kZoE7uxL7w2koZSwbnszvQQ==";
       };
     };
-    "buffer-queue-1.0.0" = {
-      name = "buffer-queue";
-      packageName = "buffer-queue";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-queue/-/buffer-queue-1.0.0.tgz";
-        sha1 = "3d253fe2f0ab70e851d728712e8cd6f914a8c002";
-      };
-    };
     "buffer-writer-2.0.0" = {
       name = "buffer-writer";
       packageName = "buffer-writer";
@@ -13045,13 +13081,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001159" = {
+    "caniuse-lite-1.0.30001161" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001159";
+      version = "1.0.30001161";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz";
-        sha512 = "w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz";
+        sha512 = "JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g==";
       };
     };
     "canvas-2.6.1" = {
@@ -13522,15 +13558,6 @@ let
         sha512 = "9vhoi1qXSBPn6//ZxIgSe3M2QhKHzIPZQzmrZgmPADsqW0Jxpe3db1e7aGSRUMXbxAQ04SfypdT8dGaSvIvKDw==";
       };
     };
-    "chmodr-1.2.0" = {
-      name = "chmodr";
-      packageName = "chmodr";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chmodr/-/chmodr-1.2.0.tgz";
-        sha512 = "Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA==";
-      };
-    };
     "chokidar-1.7.0" = {
       name = "chokidar";
       packageName = "chokidar";
@@ -13855,15 +13882,6 @@ let
         sha512 = "eDu0vN44ZBvoEU0oRIKwWPIccGWXtdnUNmKJuTukZ1de00Uoqavb5pfIMKiC7/r+knQ5RbvAjGuVZiN3JwJL4Q==";
       };
     };
-    "clean-stack-1.3.0" = {
-      name = "clean-stack";
-      packageName = "clean-stack";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz";
-        sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31";
-      };
-    };
     "clean-stack-2.2.0" = {
       name = "clean-stack";
       packageName = "clean-stack";
@@ -13873,13 +13891,13 @@ let
         sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==";
       };
     };
-    "clean-stack-3.0.0" = {
+    "clean-stack-3.0.1" = {
       name = "clean-stack";
       packageName = "clean-stack";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.0.tgz";
-        sha512 = "RHxtgFvXsRQ+1AM7dlozLDY7ssmvUUh0XEnfnyhYgJTO6beNZHBogiaCwGM9Q3rFrUkYxOtsZRC0zAturg5bjg==";
+        url = "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz";
+        sha512 = "lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg==";
       };
     };
     "clean-webpack-plugin-3.0.0" = {
@@ -14080,15 +14098,6 @@ let
         sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA==";
       };
     };
-    "cli-ux-5.4.6" = {
-      name = "cli-ux";
-      packageName = "cli-ux";
-      version = "5.4.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.6.tgz";
-        sha512 = "EeiS2TzEndRVknCqE+8Ri8g0bsP617a1nq6n+3Trwft1JCDzyUNlX2J1fl7fwTgRPWtmBmiF6xIyueL5YGs65g==";
-      };
-    };
     "cli-ux-5.5.0" = {
       name = "cli-ux";
       packageName = "cli-ux";
@@ -14098,6 +14107,15 @@ let
         sha512 = "aXoHgEOtkem8sJmQrU/jXsojCq8uOp8++9lybCbt9mFDyPouSNawSdoPjuM00PPaSPCJThvY0VNYOQNd6gGQCA==";
       };
     };
+    "cli-ux-5.5.1" = {
+      name = "cli-ux";
+      packageName = "cli-ux";
+      version = "5.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.5.1.tgz";
+        sha512 = "t3DT1U1C3rArLGYLpKa3m9dr/8uKZRI8HRm/rXKL7UTjm4c+Yd9zHNWg1tP8uaJkUbhmvx5SQHwb3VWpPUVdHQ==";
+      };
+    };
     "cli-width-1.1.1" = {
       name = "cli-width";
       packageName = "cli-width";
@@ -15214,13 +15232,13 @@ let
         sha512 = "FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg==";
       };
     };
-    "compress-commons-4.0.1" = {
+    "compress-commons-4.0.2" = {
       name = "compress-commons";
       packageName = "compress-commons";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.0.1.tgz";
-        sha512 = "xZm9o6iikekkI0GnXCmAl3LQGZj5TBDj0zLowsqi7tJtEa3FMGSEcHcqrSJIrOAk1UG/NBbDn/F1q+MG/p/EsA==";
+        url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.0.2.tgz";
+        sha512 = "qhd32a9xgzmpfoga1VQEiLEwdKZ6Plnpx5UCgIsf89FSolyJ7WnifY4Gtjgv5WR6hWAyRaHxC5MiEhU/38U70A==";
       };
     };
     "compressible-2.0.18" = {
@@ -15590,7 +15608,7 @@ let
       src = fetchgit {
         url = "https://github.com/wikimedia/content-type.git";
         rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b";
-        sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
+        sha256 = "18eb299165567b0a97e9d5576f7c189fe57072b8b8323ac179571c9e6a10fdd9";
       };
     };
     "content-types-0.1.0" = {
@@ -16178,13 +16196,13 @@ let
         sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w==";
       };
     };
-    "crc32-stream-4.0.0" = {
+    "crc32-stream-4.0.1" = {
       name = "crc32-stream";
       packageName = "crc32-stream";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.0.tgz";
-        sha512 = "tyMw2IeUX6t9jhgXI6um0eKfWq4EIDpfv5m7GX4Jzp7eVelQ360xd8EPXJhp2mHwLQIkqlnMLjzqSZI3a+0wRw==";
+        url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.1.tgz";
+        sha512 = "FN5V+weeO/8JaXsamelVYO1PHyeCsuL3HcG4cqsj0ceARcocxalaShCsohZMSAF+db7UYFwBy1rARK/0oFItUw==";
       };
     };
     "create-ecdh-4.0.4" = {
@@ -16574,13 +16592,13 @@ let
         sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==";
       };
     };
-    "css-tree-1.1.0" = {
+    "css-tree-1.1.1" = {
       name = "css-tree";
       packageName = "css-tree";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.0.tgz";
-        sha512 = "SKwwAnwRPotiopzQBpK4o+W6Uu8PA759iWdJ1EXy3zkj+sSUcsdhnhvdv4dy5AtjcX0OGXxS7h73YAMXu8QXBw==";
+        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.1.tgz";
+        sha512 = "NVN42M2fjszcUNpDbdkvutgQSlFYsr1z7kqeuCagHnNLBfYor6uP1WL1KrkmdYZ5Y1vTBCIOI/C/+8T98fJ71w==";
       };
     };
     "css-what-1.0.0" = {
@@ -17681,13 +17699,13 @@ let
         sha512 = "HngNLtPEBWRo8EFVmHFmSXAjtCX8rGNqeXQI0Gh7wCTSqwaKgPIDqu9m07wABVopNwzvOeCb+2711vQhDlcIXw==";
       };
     };
-    "deasync-0.1.15" = {
+    "deasync-0.1.20" = {
       name = "deasync";
       packageName = "deasync";
-      version = "0.1.15";
+      version = "0.1.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.15.tgz";
-        sha512 = "pxMaCYu8cQIbGkA4Y1R0PLSooPIpH1WgFBLeJ+zLxQgHfkZG86ViJSmZmONSjZJ/R3NjwkMcIWZAzpLB2G9/CA==";
+        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.20.tgz";
+        sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ==";
       };
     };
     "deasync-0.1.21" = {
@@ -17798,6 +17816,15 @@ let
         sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
       };
     };
+    "debug-3.2.7" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
+        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
+      };
+    };
     "debug-4.1.1" = {
       name = "debug";
       packageName = "debug";
@@ -17816,13 +17843,13 @@ let
         sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==";
       };
     };
-    "debug-4.3.0" = {
+    "debug-4.3.1" = {
       name = "debug";
       packageName = "debug";
-      version = "4.3.0";
+      version = "4.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz";
-        sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz";
+        sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==";
       };
     };
     "debug-fabulous-1.1.0" = {
@@ -18995,13 +19022,13 @@ let
         sha512 = "EAyaxl8hy4Ph07kzlzGTfpbZMNAAAHXSZtNEMwdlnSd1noHzvA6HsgKt4fEMSvaEXQYLSphe5rPMxN4WOj0hcQ==";
       };
     };
-    "dispensary-0.57.0" = {
+    "dispensary-0.59.0" = {
       name = "dispensary";
       packageName = "dispensary";
-      version = "0.57.0";
+      version = "0.59.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dispensary/-/dispensary-0.57.0.tgz";
-        sha512 = "vgRaZa9Ok8QdrAVtx+s6heBgI1RGT+Y6VA336oPWYADZZz83K+5NOTpLamEKRyJdRY5pYLaWhV2Js7bau1JyKg==";
+        url = "https://registry.npmjs.org/dispensary/-/dispensary-0.59.0.tgz";
+        sha512 = "JSnh4AhtYgwoyUHtunZbAhklkD9IeNacK1IDlrAJSZjzBMGFoTp9+Nggg+ITJ+F1geXc04DZ55ixnjFr5Ozknw==";
       };
     };
     "diveSync-0.3.0" = {
@@ -19823,15 +19850,6 @@ let
         sha1 = "ffdc56dcc35d02926dd50ad13439bbc54061d598";
       };
     };
-    "ejs-2.5.7" = {
-      name = "ejs";
-      packageName = "ejs";
-      version = "2.5.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz";
-        sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a";
-      };
-    };
     "ejs-2.7.4" = {
       name = "ejs";
       packageName = "ejs";
@@ -19850,13 +19868,13 @@ let
         sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
       };
     };
-    "electron-to-chromium-1.3.598" = {
+    "electron-to-chromium-1.3.606" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.598";
+      version = "1.3.606";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.598.tgz";
-        sha512 = "G5Ztk23/ubLYVPxPXnB1uu105uzIPd4xB/D8ld8x1GaSC9+vU9NZL16nYZya8H77/7CCKKN7dArzJL3pBs8N7A==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.606.tgz";
+        sha512 = "+/2yPHwtNf6NWKpaYt0KoqdSZ6Qddt6nDfH/pnhcrHq9hSb23e5LFy06Mlf0vF2ykXvj7avJ597psqcbKnG5YQ==";
       };
     };
     "electrum-client-git://github.com/janoside/electrum-client" = {
@@ -19866,7 +19884,7 @@ let
       src = fetchgit {
         url = "git://github.com/janoside/electrum-client";
         rev = "d98e929028d2b05c88a41fe37652737912bead79";
-        sha256 = "d6dfc396ae69eba6efa303039d6ebb46a5cd51d1b79a293f915609057b9062be";
+        sha256 = "db3e28ff127c4ffe0c5740e22266b345056f06462479ec07d6f5e9e833fea555";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -20239,13 +20257,13 @@ let
         sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==";
       };
     };
-    "enhanced-resolve-5.3.1" = {
+    "enhanced-resolve-5.3.2" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "5.3.1";
+      version = "5.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.3.1.tgz";
-        sha512 = "G1XD3MRGrGfNcf6Hg0LVZG7GIKcYkbfHa5QMxt1HDUTdYoXH0JR1xXyg+MaKLF73E9A27uWNVxvFivNRYeUB6w==";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.3.2.tgz";
+        sha512 = "G28GCrglCAH6+EqMN2D+Q2wCUS1O1vVQJBn8ME2I/Api41YBe4vLWWRBOUbwDH7vwzSZdljxwTRVqnf+sm6XqQ==";
       };
     };
     "enquirer-2.3.6" = {
@@ -20833,15 +20851,6 @@ let
         sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==";
       };
     };
-    "eslint-7.11.0" = {
-      name = "eslint";
-      packageName = "eslint";
-      version = "7.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz";
-        sha512 = "G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==";
-      };
-    };
     "eslint-7.13.0" = {
       name = "eslint";
       packageName = "eslint";
@@ -20851,6 +20860,15 @@ let
         sha512 = "uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==";
       };
     };
+    "eslint-7.14.0" = {
+      name = "eslint";
+      packageName = "eslint";
+      version = "7.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz";
+        sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==";
+      };
+    };
     "eslint-plugin-no-unsanitized-3.1.4" = {
       name = "eslint-plugin-no-unsanitized";
       packageName = "eslint-plugin-no-unsanitized";
@@ -21274,6 +21292,15 @@ let
         sha512 = "vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==";
       };
     };
+    "event-target-shim-5.0.1" = {
+      name = "event-target-shim";
+      packageName = "event-target-shim";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz";
+        sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==";
+      };
+    };
     "event-to-promise-0.8.0" = {
       name = "event-to-promise";
       packageName = "event-to-promise";
@@ -22165,15 +22192,6 @@ let
         sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
-    "fast-redact-2.1.0" = {
-      name = "fast-redact";
-      packageName = "fast-redact";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-redact/-/fast-redact-2.1.0.tgz";
-        sha512 = "0LkHpTLyadJavq9sRzzyqIoMZemWli77K2/MGOkafrR64B9ItrvZ9aT+jluvNDsv0YEHjSNhlMBtbokuoqii4A==";
-      };
-    };
     "fast-redact-3.0.0" = {
       name = "fast-redact";
       packageName = "fast-redact";
@@ -22264,13 +22282,14 @@ let
         sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==";
       };
     };
-    "faunadb-3.0.1" = {
+    "faunadb-git+https://github.com/fauna/faunadb-js.git#triage/bearer-to-basic" = {
       name = "faunadb";
       packageName = "faunadb";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/faunadb/-/faunadb-3.0.1.tgz";
-        sha512 = "WlfPjC0V9xHs4NTunOWmYZtJfbJ45Z1VAIKKka6+mRrmijWOFQzJVDY9CqS6X9kvepM36EjmtNkIvV0OJ1wTEA==";
+      version = "4.0.0";
+      src = fetchgit {
+        url = "https://github.com/fauna/faunadb-js.git";
+        rev = "135256ed60a8043201085f18ed6fd2032cc9dd88";
+        sha256 = "db68519d85618095fa9666496a51abf94981a38f4bcd406df5287cc1e1b10255";
       };
     };
     "faye-websocket-0.10.0" = {
@@ -22885,15 +22904,6 @@ let
         sha512 = "LNRvR4hr/S8cXXkIY5pTgVP7L3tq6LlYWcg9nWBuW7o1NMxKZo6oOVa/6GIekMGI0Iw7uC+HWimMe9u/VAeKqw==";
       };
     };
-    "first-chunk-stream-4.0.0" = {
-      name = "first-chunk-stream";
-      packageName = "first-chunk-stream";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-4.0.0.tgz";
-        sha512 = "8TOz/mJp7+zc2HN63vnJHotwceq4gQI1+/gdJVnJcG4dEB96oUxw7wV9We4QKjSFWUc/V0ADDfaGba5cDoG6EA==";
-      };
-    };
     "fkill-6.2.0" = {
       name = "fkill";
       packageName = "fkill";
@@ -23326,13 +23336,13 @@ let
         sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     };
-    "forever-monitor-3.0.1" = {
+    "forever-monitor-3.0.3" = {
       name = "forever-monitor";
       packageName = "forever-monitor";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-3.0.1.tgz";
-        sha512 = "47VfT5AYpxn1bnsnH6UfpBWKpMVnSz42MZwH+hwz/wACd9THyUu/fRoCRIT758fzCAbRoHIlkVUAL+WmlxSKeg==";
+        url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-3.0.3.tgz";
+        sha512 = "7YGDo0UlbMy++6G3lzncWISDaT5CVp+yPVAkZ7FDFF0ec+0HKgBOWOhPGKpMF0hjcm3Ps/HbtrETrQLYREZ7YQ==";
       };
     };
     "fork-ts-checker-webpack-plugin-3.1.1" = {
@@ -23470,22 +23480,22 @@ let
         sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
       };
     };
-    "fp-and-or-0.1.2" = {
+    "fp-and-or-0.1.3" = {
       name = "fp-and-or";
       packageName = "fp-and-or";
-      version = "0.1.2";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.2.tgz";
-        sha512 = "3P8x4W/BF5x5xreG06D28I1+sOKyNKo2rShYyEBg/0XJDGuocwcv2KnD4CeuK4OSokFQbuuTlkdb4NlWNHhcKQ==";
+        url = "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.3.tgz";
+        sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g==";
       };
     };
-    "fp-ts-2.8.6" = {
+    "fp-ts-2.9.0" = {
       name = "fp-ts";
       packageName = "fp-ts";
-      version = "2.8.6";
+      version = "2.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.6.tgz";
-        sha512 = "fGGpKf/Jy3UT4s16oM+hr/8F5QXFcZ+20NAvaZXH5Y5jsiLPMDCaNqffXq0z1Kr6ZUJj0346cH9tq+cI2SoJ4w==";
+        url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.9.0.tgz";
+        sha512 = "zYPaS+3BWy+hRhkCMJXLTHxdy7oshyKOfHge/S/n+LcLL5VIhctR9Xucxi3GwJbjwDZaz9IIbU1o+YjK0LsgYg==";
       };
     };
     "fragment-cache-0.2.1" = {
@@ -23803,13 +23813,13 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fs2-0.3.8" = {
+    "fs2-0.3.9" = {
       name = "fs2";
       packageName = "fs2";
-      version = "0.3.8";
+      version = "0.3.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs2/-/fs2-0.3.8.tgz";
-        sha512 = "HxOTRiFS3PqwAOmlp1mTwLA+xhQBdaP82b5aBamc/rHKFVyn4qL8YpngaAleD52PNMzBm6TsGOoU/Hq+bAfBhA==";
+        url = "https://registry.npmjs.org/fs2/-/fs2-0.3.9.tgz";
+        sha512 = "WsOqncODWRlkjwll+73bAxVW3JPChDgaPX3DT4iTTm73UmG4VgALa7LaFblP232/DN60itkOrPZ8kaP1feksGQ==";
       };
     };
     "fsevents-1.2.13" = {
@@ -24091,13 +24101,13 @@ let
         sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==";
       };
     };
-    "get-browser-rtc-1.0.2" = {
+    "get-browser-rtc-1.1.0" = {
       name = "get-browser-rtc";
       packageName = "get-browser-rtc";
-      version = "1.0.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz";
-        sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9";
+        url = "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.1.0.tgz";
+        sha512 = "MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ==";
       };
     };
     "get-caller-file-1.0.3" = {
@@ -26153,13 +26163,13 @@ let
         sha1 = "b86ce808598e8a9d1892c571f3cedd86fc9f0653";
       };
     };
-    "highlight.js-10.3.2" = {
+    "highlight.js-10.4.0" = {
       name = "highlight.js";
       packageName = "highlight.js";
-      version = "10.3.2";
+      version = "10.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz";
-        sha512 = "3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw==";
+        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.0.tgz";
+        sha512 = "EfrUGcQ63oLJbj0J0RI9ebX6TAITbsDBLbsjr881L/X5fMO9+oadKzEF21C7R3ULKG6Gv3uoab2HiqVJa/4+oA==";
       };
     };
     "highlight.js-8.2.0" = {
@@ -26180,13 +26190,13 @@ let
         sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e";
       };
     };
-    "highlight.js-9.18.3" = {
+    "highlight.js-9.18.5" = {
       name = "highlight.js";
       packageName = "highlight.js";
-      version = "9.18.3";
+      version = "9.18.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.3.tgz";
-        sha512 = "zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ==";
+        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz";
+        sha512 = "a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==";
       };
     };
     "hipchatter-0.3.2" = {
@@ -26637,7 +26647,7 @@ let
       src = fetchgit {
         url = "git://github.com/feross/http-node";
         rev = "342ef8624495343ffd050bd0808b3750cf0e3974";
-        sha256 = "d7408d01b05fcbd5bb4fb44fd3d7d71463bafd5124d7e69c6f3e97cef8c65368";
+        sha256 = "031176ff1f6ceb8f650cbf2c36863f417e699f0610f83fbd94a74159cb8eba8f";
       };
     };
     "http-parser-js-0.4.13" = {
@@ -30438,13 +30448,13 @@ let
         sha1 = "4fcd246dc5d0e38691907c44ab002f782d1d94cc";
       };
     };
-    "jsonlint-1.6.2" = {
+    "jsonlint-1.6.3" = {
       name = "jsonlint";
       packageName = "jsonlint";
-      version = "1.6.2";
+      version = "1.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz";
-        sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830";
+        url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz";
+        sha512 = "jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==";
       };
     };
     "jsonparse-0.0.5" = {
@@ -30760,7 +30770,7 @@ let
       src = fetchgit {
         url = "https://github.com/wikimedia/kad.git";
         rev = "96f8f5c8e5a88f5dffed47abc20756e93e16387e";
-        sha256 = "12e5b6430f57389c974e7a393f2c7ac9a26df06a58cfe1afbcb5a5f3f00249ea";
+        sha256 = "801c2201565fb46ad591d4cf717eb30842ca76725c1d19f301418796f39d668e";
       };
     };
     "kad-localstorage-0.0.7" = {
@@ -30871,13 +30881,13 @@ let
         sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
       };
     };
-    "keytar-7.1.0" = {
+    "keytar-7.2.0" = {
       name = "keytar";
       packageName = "keytar";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keytar/-/keytar-7.1.0.tgz";
-        sha512 = "ciDrtCcvhKpmVfPMVAiKSeKKQd+8S2VWOIcJP0Rdwz/ezSxHxYrycpwufDGpEHJqLyi/F7C7iwoz0eKGllzcMw==";
+        url = "https://registry.npmjs.org/keytar/-/keytar-7.2.0.tgz";
+        sha512 = "ECSaWvoLKI5SI0pGpZQeUV1/lpBYfkaxvoSp3zkiPOz05VavwSfLi8DdEaa9N2ekQZv3Chy+o7aP6n9mairBgw==";
       };
     };
     "keyv-3.0.0" = {
@@ -33004,15 +33014,6 @@ let
         sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805";
       };
     };
-    "lodash.sample-4.2.1" = {
-      name = "lodash.sample";
-      packageName = "lodash.sample";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.sample/-/lodash.sample-4.2.1.tgz";
-        sha1 = "5e4291b0c753fa1abeb0aab8fb29df1b66f07f6d";
-      };
-    };
     "lodash.set-4.3.2" = {
       name = "lodash.set";
       packageName = "lodash.set";
@@ -33022,15 +33023,6 @@ let
         sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23";
       };
     };
-    "lodash.snakecase-4.1.1" = {
-      name = "lodash.snakecase";
-      packageName = "lodash.snakecase";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz";
-        sha1 = "39d714a35357147837aefd64b5dcbb16becd8f8d";
-      };
-    };
     "lodash.some-4.6.0" = {
       name = "lodash.some";
       packageName = "lodash.some";
@@ -34129,13 +34121,13 @@ let
         sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw==";
       };
     };
-    "markdown-it-toc-done-right-4.1.0" = {
+    "markdown-it-toc-done-right-4.2.0" = {
       name = "markdown-it-toc-done-right";
       packageName = "markdown-it-toc-done-right";
-      version = "4.1.0";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-4.1.0.tgz";
-        sha512 = "UhD2Oj6cZV3ycYPoelt4hTkwKIK3zbPP1wjjdpCq7UGtWQOFalDFDv1s2zBYV6aR2gMs/X8kpJcOYsQmUbiXDw==";
+        url = "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-4.2.0.tgz";
+        sha512 = "UB/IbzjWazwTlNAX0pvWNlJS8NKsOQ4syrXZQ/C72j+jirrsjVRT627lCaylrKJFBQWfRsPmIVQie8x38DEhAQ==";
       };
     };
     "markdown-link-extractor-1.2.6" = {
@@ -34210,13 +34202,13 @@ let
         sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==";
       };
     };
-    "marked-1.2.4" = {
+    "marked-1.2.5" = {
       name = "marked";
       packageName = "marked";
-      version = "1.2.4";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-1.2.4.tgz";
-        sha512 = "6x5TFGCTKSQBLTZtOburGxCxFEBJEGYVLwCMTBCxzvyuisGcC20UNzDSJhCr/cJ/Kmh6ulfJm10g6WWEAJ3kvg==";
+        url = "https://registry.npmjs.org/marked/-/marked-1.2.5.tgz";
+        sha512 = "2AlqgYnVPOc9WDyWu7S5DJaEZsfk6dNh/neatQ3IHUW4QLutM/VPSH9lG7bif+XjFWc9K9XR3QvR+fXuECmfdA==";
       };
     };
     "marked-terminal-4.1.0" = {
@@ -34462,13 +34454,13 @@ let
         sha512 = "qJXNcFcuCSPqUF0Tb0uYcFDIq67qwB3sxo9RPdf9vG8T90ViKnksFqdB/Coq2a7sTnxL/Ify2y7aIQXDkQFH0w==";
       };
     };
-    "mdast-util-to-markdown-0.5.3" = {
+    "mdast-util-to-markdown-0.5.4" = {
       name = "mdast-util-to-markdown";
       packageName = "mdast-util-to-markdown";
-      version = "0.5.3";
+      version = "0.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.5.3.tgz";
-        sha512 = "sr8q7fQJ1xoCqZSXW6dO/MYu2Md+a4Hfk9uO+XHCfiBhVM0EgWtfAV7BuN+ff6otUeu2xDyt1o7vhZGwOG3+BA==";
+        url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.5.4.tgz";
+        sha512 = "0jQTkbWYx0HdEA/h++7faebJWr5JyBoBeiRf0u3F4F3QtnyyGaWIsOwo749kRb1ttKrLLr+wRtOkfou9yB0p6A==";
       };
     };
     "mdast-util-to-nlcst-4.0.1" = {
@@ -34489,6 +34481,15 @@ let
         sha512 = "jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==";
       };
     };
+    "mdast-util-to-string-2.0.0" = {
+      name = "mdast-util-to-string";
+      packageName = "mdast-util-to-string";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz";
+        sha512 = "AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==";
+      };
+    };
     "mdmanifest-1.0.8" = {
       name = "mdmanifest";
       packageName = "mdmanifest";
@@ -34498,15 +34499,6 @@ let
         sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8";
       };
     };
-    "mdn-browser-compat-data-1.0.40" = {
-      name = "mdn-browser-compat-data";
-      packageName = "mdn-browser-compat-data";
-      version = "1.0.40";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.40.tgz";
-        sha512 = "yjM/OG0krZIgi+XrhJWS3CJ9UQuGM4FfjIUIt2f65er6qczkM+WjtNEv/9ZF9DxDs/2GR3SO6hDaZLplTRrrfw==";
-      };
-    };
     "mdn-data-2.0.14" = {
       name = "mdn-data";
       packageName = "mdn-data";
@@ -35812,15 +35804,6 @@ let
         sha1 = "cf67e0b31c47ab9badb5c9c25651862127bb8317";
       };
     };
-    "moment-2.20.1" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.20.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz";
-        sha512 = "Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==";
-      };
-    };
     "moment-2.29.1" = {
       name = "moment";
       packageName = "moment";
@@ -36514,13 +36497,13 @@ let
         sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==";
       };
     };
-    "nanoid-3.1.16" = {
+    "nanoid-3.1.18" = {
       name = "nanoid";
       packageName = "nanoid";
-      version = "3.1.16";
+      version = "3.1.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.16.tgz";
-        sha512 = "+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w==";
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz";
+        sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA==";
       };
     };
     "nanolru-1.0.0" = {
@@ -36721,13 +36704,13 @@ let
         sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8";
       };
     };
-    "nearley-2.19.7" = {
+    "nearley-2.19.8" = {
       name = "nearley";
       packageName = "nearley";
-      version = "2.19.7";
+      version = "2.19.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nearley/-/nearley-2.19.7.tgz";
-        sha512 = "Y+KNwhBPcSJKeyQCFjn8B/MIe+DDlhaaDgjVldhy5xtFewIbiQgcbZV8k2gCVwkI1ZsKCnjIYZbR+0Fim5QYgg==";
+        url = "https://registry.npmjs.org/nearley/-/nearley-2.19.8.tgz";
+        sha512 = "te4JCrxbzLvVqUWfVOASgsbkWaFvJ6JlHTRQzfnU862bnyHGHEGX2s5OYvLAS4NDPmQvRtC2tBdV6THy6xHFyQ==";
       };
     };
     "neat-csv-2.1.0" = {
@@ -36854,7 +36837,7 @@ let
       src = fetchgit {
         url = "https://github.com/arlolra/negotiator.git";
         rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a";
-        sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
+        sha256 = "0cee71d4f5ad49a14f8ff9b33d1e5b1ac9fbcd3866ab7a95068283e1f7d860b6";
       };
     };
     "neo-async-2.6.2" = {
@@ -37197,7 +37180,7 @@ let
       src = fetchgit {
         url = "https://github.com/laurent22/node-emoji.git";
         rev = "9fa01eac463e94dde1316ef8c53089eeef4973b5";
-        sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406";
+        sha256 = "1499424a28a49687c150369075d5ea3794f18454291078760a6c761e6576d8a3";
       };
     };
     "node-environment-flags-1.0.6" = {
@@ -38037,15 +38020,6 @@ let
         sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
       };
     };
-    "npm-run-path-3.1.0" = {
-      name = "npm-run-path";
-      packageName = "npm-run-path";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz";
-        sha512 = "Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==";
-      };
-    };
     "npm-run-path-4.0.1" = {
       name = "npm-run-path";
       packageName = "npm-run-path";
@@ -38208,13 +38182,13 @@ let
         sha512 = "e5G6bbq3Nrfxm+SDPR5AiZ6n2smVUmhLA1OgI2/Bl8e2ywfWsKw/yuqrwiXXiNHb1wdM/GyPMX6QjCGJODlaaA==";
       };
     };
-    "oas-resolver-2.5.2" = {
+    "oas-resolver-2.5.3" = {
       name = "oas-resolver";
       packageName = "oas-resolver";
-      version = "2.5.2";
+      version = "2.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.2.tgz";
-        sha512 = "dEuG5nE9IMl0FQNQuROsoriP4/944PajSBKAoZMyp9b2eXfmPv9ZKeHRCKjf5RWLm0GezaPKcdCLbB0/Xiqtdw==";
+        url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.3.tgz";
+        sha512 = "y4gP5tabqP3YcNVHNAEJAlcqZ40Y9lxemzmXvt54evbrvuGiK5dEhuE33Rf+191TOwzlxMoIgbwMYeuOM7BwjA==";
       };
     };
     "oas-schema-walker-1.1.5" = {
@@ -38235,13 +38209,13 @@ let
         sha512 = "bIt8erTyclF7bkaySTtQ9sppqyVc+mAlPi7vPzCLVHJsL9nrivQjc/jHLX/o+eGbxHd6a6YBwuY/Vxa6wGsiuw==";
       };
     };
-    "oas-validator-5.0.3" = {
+    "oas-validator-5.0.4" = {
       name = "oas-validator";
       packageName = "oas-validator";
-      version = "5.0.3";
+      version = "5.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.3.tgz";
-        sha512 = "PYhenXnQr/T+MmrzBT+cTnyOcIZ4wVzvjS/gvbZZNexnhl1Gu/UiCg6rsEmBetE9CfthoxG0gfGTUSYPRmUlWA==";
+        url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.4.tgz";
+        sha512 = "/v+5BbPXl7JuKf1bYhEGIfbJZR7zBf5QJNM2RAe1e0bsABsp35nAfeptZq0hb+9RMecGSFxmzhuvlOT0/KioiQ==";
       };
     };
     "oauth-0.9.15" = {
@@ -38632,13 +38606,13 @@ let
         sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==";
       };
     };
-    "office-ui-fabric-react-7.150.1" = {
+    "office-ui-fabric-react-7.152.2" = {
       name = "office-ui-fabric-react";
       packageName = "office-ui-fabric-react";
-      version = "7.150.1";
+      version = "7.152.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.150.1.tgz";
-        sha512 = "S0ZtEyZs9lHdmVyT2Q9/4Y6XOmltndV4AtAB2dn4oanGMJQ1/o8jio9ZdE9Q2jc1YgK3EEYvXwck0E3kUfWU5w==";
+        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.152.2.tgz";
+        sha512 = "kAC40mQQZ3+W7ciUcsI2z66BFb/2dDkYuksMYvmjQ/RtSBw8ZMgsoIjTjgRpWKdEdvkbFwsjHK7fHOeR1OJOpA==";
       };
     };
     "omggif-1.0.10" = {
@@ -39433,22 +39407,22 @@ let
         sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
-    "ot-builder-0.10.33" = {
+    "ot-builder-0.10.34" = {
       name = "ot-builder";
       packageName = "ot-builder";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.33.tgz";
-        sha512 = "Xs2G7yDDlNcMOUTgBDHdtT4iLMs90uqwylB5T4l96+o9ePXSsa0TwtzrI7D5eFpiZY+u2PjXUNRcfvfh/HvQvw==";
+        url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.34.tgz";
+        sha512 = "KYSsffceh64QcSE4fBGrSBf2twXxkGQzHcPqGTWpz1PcJ56hHpZyhmWqtltorrH5sjOjLIVGUqvGO19/vTsb8g==";
       };
     };
-    "otb-ttc-bundle-0.10.33" = {
+    "otb-ttc-bundle-0.10.34" = {
       name = "otb-ttc-bundle";
       packageName = "otb-ttc-bundle";
-      version = "0.10.33";
+      version = "0.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.33.tgz";
-        sha512 = "xt7ZOSlNWN6DcWzH/2kYUVoB37FQjhe7ZZJ9JO7RysRQxlJWBciHpOK6oYHOm9rA1RGDbUYbVj9411yV5dqmXg==";
+        url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.34.tgz";
+        sha512 = "zMUBVgo7ARvdwlh/SfmEKwRrPMzqiAZKjR+FTvImBwNYj98aoDGxPk5QP2uiLcDneJjMlCiL08N/i7B0edypmg==";
       };
     };
     "p-all-2.1.0" = {
@@ -41242,15 +41216,6 @@ let
         sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
       };
     };
-    "pino-6.6.1" = {
-      name = "pino";
-      packageName = "pino";
-      version = "6.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pino/-/pino-6.6.1.tgz";
-        sha512 = "DOgm7rn6ctBkBYemHXSLj7+j3o3U1q1FWBXbHcprur8mA93QcJSycEkEqhqKiFB9Mx/3Qld2FGr6+9yfQza0kA==";
-      };
-    };
     "pino-6.7.0" = {
       name = "pino";
       packageName = "pino";
@@ -41485,6 +41450,15 @@ let
         sha1 = "72b726aa6fac1edeee42256c7d8dc256b335677f";
       };
     };
+    "pluralize-5.1.0" = {
+      name = "pluralize";
+      packageName = "pluralize";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pluralize/-/pluralize-5.1.0.tgz";
+        sha1 = "586a3944a76c481f89774f755652779f61d692b2";
+      };
+    };
     "pluralize-7.0.0" = {
       name = "pluralize";
       packageName = "pluralize";
@@ -41645,7 +41619,7 @@ let
       src = fetchgit {
         url = "git://github.com/anmonteiro/node-getopt";
         rev = "a3123885e3559c9b70903948d6e5c34852520d74";
-        sha256 = "0092766ac49279342f7d17677359880b44b245ad9d32237a11a5ea45cb0d03fa";
+        sha256 = "aec063ab02e2782e6587759b4c7dfd8d8e27f174bbc62dd65842658e30e56720";
       };
     };
     "postcss-5.2.18" = {
@@ -41693,13 +41667,13 @@ let
         sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==";
       };
     };
-    "postcss-8.1.1" = {
+    "postcss-8.1.7" = {
       name = "postcss";
       packageName = "postcss";
-      version = "8.1.1";
+      version = "8.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-8.1.1.tgz";
-        sha512 = "9DGLSsjooH3kSNjTZUOt2eIj2ZTW0VI2PZ/3My+8TC7KIbH2OKwUlISfDsf63EP4aiRUt3XkEWMWvyJHvJelEg==";
+        url = "https://registry.npmjs.org/postcss/-/postcss-8.1.7.tgz";
+        sha512 = "llCQW1Pz4MOPwbZLmOddGM9eIJ8Bh7SZ2Oj5sxZva77uVaotYDsYTch1WBTNu7fUY0fpWp0fdt7uW40D4sRiiQ==";
       };
     };
     "postcss-calc-7.0.5" = {
@@ -42404,13 +42378,13 @@ let
         sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==";
       };
     };
-    "prettier-2.1.2" = {
+    "prettier-2.2.0" = {
       name = "prettier";
       packageName = "prettier";
-      version = "2.1.2";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz";
-        sha512 = "16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==";
+        url = "https://registry.npmjs.org/prettier/-/prettier-2.2.0.tgz";
+        sha512 = "yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw==";
       };
     };
     "prettier-bytes-1.0.4" = {
@@ -44123,13 +44097,13 @@ let
         sha512 = "AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw==";
       };
     };
-    "queue-microtask-1.2.0" = {
+    "queue-microtask-1.2.2" = {
       name = "queue-microtask";
       packageName = "queue-microtask";
-      version = "1.2.0";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.0.tgz";
-        sha512 = "J95OVUiS4b8qqmpqhCodN8yPpHG2mpZUPQ8tDGyIY0VhM+kBHszOuvsMJVGNQ1OH2BnTFbqz45i+2jGpDw9H0w==";
+        url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz";
+        sha512 = "dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==";
       };
     };
     "quick-format-unescaped-4.0.1" = {
@@ -45104,13 +45078,13 @@ let
         sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==";
       };
     };
-    "reftools-1.1.6" = {
+    "reftools-1.1.7" = {
       name = "reftools";
       packageName = "reftools";
-      version = "1.1.6";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/reftools/-/reftools-1.1.6.tgz";
-        sha512 = "rQfJ025lvPjw9qyQuNPqE+cRs5qVs7BMrZwgRJnmuMcX/8r/eJE8f5/RCunJWViXKHmN5K2DFafYzglLOHE/tw==";
+        url = "https://registry.npmjs.org/reftools/-/reftools-1.1.7.tgz";
+        sha512 = "I+KZFkQvZjMZqVWxRezTC/kQ2kLhGRZ7C+4ARbgmb5WJbvFUlbrZ/6qlz6mb+cGcPNYib+xqL8kZlxCsSZ7Hew==";
       };
     };
     "regenerate-1.4.2" = {
@@ -45581,13 +45555,13 @@ let
         sha512 = "o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==";
       };
     };
-    "render-media-4.0.0" = {
+    "render-media-4.0.1" = {
       name = "render-media";
       packageName = "render-media";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/render-media/-/render-media-4.0.0.tgz";
-        sha512 = "HVvQP29EOTBSnj2CjjiNGhRTpvHM+kWf/AMf1rCB8Y2lKaYgvivTLrAHi9jrYs0EUkJ/7M98RgDI/7rguTnE+w==";
+        url = "https://registry.npmjs.org/render-media/-/render-media-4.0.1.tgz";
+        sha512 = "sQxUHqJMAEopS/UCdCQuhTJ6TUEp2P+bnEMCV3ZaFcGMoyc7he//XP6Zy9PwIjfm0nQ5D0Z6ZTGRkx8DXCXBEA==";
       };
     };
     "renderkid-2.0.4" = {
@@ -46733,15 +46707,6 @@ let
         sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==";
       };
     };
-    "s3-stream-upload-2.0.2" = {
-      name = "s3-stream-upload";
-      packageName = "s3-stream-upload";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/s3-stream-upload/-/s3-stream-upload-2.0.2.tgz";
-        sha1 = "60342f12d4aa06ea8f389fb761a5393aedca017f";
-      };
-    };
     "s3signed-0.1.0" = {
       name = "s3signed";
       packageName = "s3signed";
@@ -46805,6 +46770,15 @@ let
         sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
       };
     };
+    "safe-compare-1.1.4" = {
+      name = "safe-compare";
+      packageName = "safe-compare";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-compare/-/safe-compare-1.1.4.tgz";
+        sha512 = "b9wZ986HHCo/HbKrRpBJb2kqXMK9CEWIE1egeEvZsYn69ay3kdfl9nG3RyOcR+jInTDf7a86WQ1d4VJX7goSSQ==";
+      };
+    };
     "safe-join-0.1.3" = {
       name = "safe-join";
       packageName = "safe-join";
@@ -47984,13 +47958,13 @@ let
         sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg==";
       };
     };
-    "simple-git-2.22.0" = {
+    "simple-git-2.23.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "2.22.0";
+      version = "2.23.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-2.22.0.tgz";
-        sha512 = "/8WMNrQ5slYl05jYOpeh4BIyMQc84PkEvk9YAcBHVJaPoAgoxzLzdRzUzWDZJ9U6Z2pUjLxkGcQC0kU4pbRN5Q==";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-2.23.0.tgz";
+        sha512 = "s/gEkxFV2WGTN4kO1uQoA4cE4rq0FRzQPR5Yhgg8JUuA4IhOeccjlKSFhwF3rrpo7797ZvQc7L6hJJNA4szHCw==";
       };
     };
     "simple-markdown-0.4.4" = {
@@ -48389,22 +48363,22 @@ let
         sha512 = "HIXpMCRp5IdQDFH/CY6WqOUt5X5Ec55KC9dFVjlMLe/2zeqsImJn1vbjpE5uBoLYIdYi1SteTqtsJhyJZWRK8g==";
       };
     };
-    "snyk-cpp-plugin-2.1.0" = {
+    "snyk-cpp-plugin-2.2.1" = {
       name = "snyk-cpp-plugin";
       packageName = "snyk-cpp-plugin";
-      version = "2.1.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-2.1.0.tgz";
-        sha512 = "TcAlIkHtTvKdPIORxFRr/Ur//ucWK7eFBwlMR4gPeIhKbmEE/PZedBXW2IM8ZUdPIhG53lAP/Eq++1bVFSmZ9g==";
+        url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-2.2.1.tgz";
+        sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ==";
       };
     };
-    "snyk-docker-plugin-4.7.4" = {
+    "snyk-docker-plugin-4.9.0" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "4.7.4";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.7.4.tgz";
-        sha512 = "tGSuGCJjdhpW8Dpc6pvjISLPku6AOYUdJ8X98+6ntIeVeb974K9CpWeofWZIqTz5vKi+oFK5SbyVU9KDNAyHfQ==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.9.0.tgz";
+        sha512 = "vjUsat9NdP2kAicQWVuB7vJ0MnJ2e+Y59MzaXdJWkfrSyTnIeuMzTg1vJ8GUrfdG+l5KaYZTUy7p1r1dYbmrZw==";
       };
     };
     "snyk-go-parser-1.4.1" = {
@@ -48461,13 +48435,13 @@ let
         sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw==";
       };
     };
-    "snyk-mvn-plugin-2.23.1" = {
+    "snyk-mvn-plugin-2.23.4" = {
       name = "snyk-mvn-plugin";
       packageName = "snyk-mvn-plugin";
-      version = "2.23.1";
+      version = "2.23.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.23.1.tgz";
-        sha512 = "WPEZxCoUyZUs/vvsI3OF9nVQLbED8FlhrLG1HHtSM2JPZs4ashB2HqgM93zG0Vk5kxns3aiZcWL4q6vnZReyFA==";
+        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.23.4.tgz";
+        sha512 = "1dWqvFu6eo2KsXFDqRF28JFwrdzpc0k+GwpIqv7vF2kHarsMxnLnT/akhjbKzs+xlRTNFvqdKhEQxjdq2nSD1Q==";
       };
     };
     "snyk-nodejs-lockfile-parser-1.30.1" = {
@@ -50540,31 +50514,31 @@ let
         sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==";
       };
     };
-    "string.prototype.trim-1.2.2" = {
+    "string.prototype.trim-1.2.3" = {
       name = "string.prototype.trim";
       packageName = "string.prototype.trim";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.2.tgz";
-        sha512 = "b5yrbl3BXIjHau9Prk7U0RRYcUYdN4wGSVaqoBQS50CCE3KBuYU0TYRNPFCP7aVoNMX87HKThdMRVIP3giclKg==";
+        url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.3.tgz";
+        sha512 = "16IL9pIBA5asNOSukPfxX2W68BaBvxyiRK16H3RA/lWW9BDosh+w7f+LhomPHpXJ82QEe7w7/rY/S1CV97raLg==";
       };
     };
-    "string.prototype.trimend-1.0.2" = {
+    "string.prototype.trimend-1.0.3" = {
       name = "string.prototype.trimend";
       packageName = "string.prototype.trimend";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz";
-        sha512 = "8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==";
+        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
+        sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
       };
     };
-    "string.prototype.trimstart-1.0.2" = {
+    "string.prototype.trimstart-1.0.3" = {
       name = "string.prototype.trimstart";
       packageName = "string.prototype.trimstart";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz";
-        sha512 = "7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==";
+        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
+        sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
       };
     };
     "string2compact-1.3.0" = {
@@ -51404,13 +51378,13 @@ let
         sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw==";
       };
     };
-    "swagger-ui-dist-3.36.2" = {
+    "swagger-ui-dist-3.37.0" = {
       name = "swagger-ui-dist";
       packageName = "swagger-ui-dist";
-      version = "3.36.2";
+      version = "3.37.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.36.2.tgz";
-        sha512 = "jbxorhRC/FKk8yMx5zEbg1A1sXc/vsW2vrDTJ3clmaMr9F12zsy161kwnxjVt/vVkMglDOz+BC8ZMY01toxHwA==";
+        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.37.0.tgz";
+        sha512 = "ySYfsGTSxuyIAAynncQew9WLRsKu6bI3/tWTqcuXYSqTLCjz3ROtUbNj2zRNs7i37V8CteKE9CUMkYnNklGi2g==";
       };
     };
     "swagger2openapi-6.2.3" = {
@@ -51422,13 +51396,13 @@ let
         sha512 = "cUUktzLpK69UwpMbcTzjMw2ns9RZChfxh56AHv6+hTx3StPOX2foZjPgds3HlJcINbxosYYBn/D3cG8nwcCWwQ==";
       };
     };
-    "swagger2openapi-7.0.3" = {
+    "swagger2openapi-7.0.4" = {
       name = "swagger2openapi";
       packageName = "swagger2openapi";
-      version = "7.0.3";
+      version = "7.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.3.tgz";
-        sha512 = "JSFUmXSR7Qx9WwSKCEqaL4oQfhLLCU2r8Zgf30g15FdSkihItZ6fKFnqSsfqQ6MsmnLlcBf8+OhnQHbi1R0ydg==";
+        url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.4.tgz";
+        sha512 = "MGzJU44XSXHKxvtx/NbBnP3z5s1KzN5xhqIBERoZEKfRiZ56lNUo5TGOv0dJ8n7JGeheCeU0CydfvbSOh+DaXg==";
       };
     };
     "sway-1.0.0" = {
@@ -51575,13 +51549,13 @@ let
         sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
       };
     };
-    "table-6.0.3" = {
+    "table-6.0.4" = {
       name = "table";
       packageName = "table";
-      version = "6.0.3";
+      version = "6.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-6.0.3.tgz";
-        sha512 = "8321ZMcf1B9HvVX/btKv8mMZahCjn2aYrDlpqHaBFCfnox64edeH9kEid0vTLTRR8gWR2A20aDgeuTTea4sVtw==";
+        url = "https://registry.npmjs.org/table/-/table-6.0.4.tgz";
+        sha512 = "sBT4xRLdALd+NFBvwOz8bw4b15htyythha+q+DVZqy2RS08PPC8O2sZFgJYEY7bJvbCFKccs+WIZ/cd+xxTWCw==";
       };
     };
     "table-layout-0.4.5" = {
@@ -51627,7 +51601,7 @@ let
       src = fetchgit {
         url = "https://github.com/mixu/node-tabtab.git";
         rev = "94af2b878b174527b6636aec88acd46979247755";
-        sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272";
+        sha256 = "6e84c406481c826d85e946e9dc09ed1e71ecfa405f60dd6209e5c835aacf32c1";
       };
     };
     "tabula-1.10.0" = {
@@ -52026,13 +52000,13 @@ let
         sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==";
       };
     };
-    "terser-5.4.0" = {
+    "terser-5.5.0" = {
       name = "terser";
       packageName = "terser";
-      version = "5.4.0";
+      version = "5.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-5.4.0.tgz";
-        sha512 = "3dZunFLbCJis9TAF2VnX+VrQLctRUmt1p3W2kCsJuZE4ZgWqh//+1MZ62EanewrqKoUf4zIaDGZAvml4UDc0OQ==";
+        url = "https://registry.npmjs.org/terser/-/terser-5.5.0.tgz";
+        sha512 = "eopt1Gf7/AQyPhpygdKePTzaet31TvQxXvrf7xYUvD/d8qkCJm4SKPDzu+GHK5ZaYTn8rvttfqaZc3swK21e5g==";
       };
     };
     "terser-webpack-plugin-1.4.5" = {
@@ -53826,6 +53800,15 @@ let
         sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==";
       };
     };
+    "typescript-4.1.2" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz";
+        sha512 = "thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==";
+      };
+    };
     "typescript-eslint-parser-16.0.1" = {
       name = "typescript-eslint-parser";
       packageName = "typescript-eslint-parser";
@@ -53934,6 +53917,15 @@ let
         sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g==";
       };
     };
+    "uglify-js-3.12.0" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "3.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.0.tgz";
+        sha512 = "8lBMSkFZuAK7gGF8LswsXmir8eX8d2AAMOnxSDWjKBx/fBR6MypQjs78m6ML9zQVp1/hD4TBdfeMZMC7nW1TAA==";
+      };
+    };
     "uglify-js-3.4.10" = {
       name = "uglify-js";
       packageName = "uglify-js";
@@ -54123,13 +54115,13 @@ let
         sha512 = "N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==";
       };
     };
-    "underscore-1.11.0" = {
+    "underscore-1.12.0" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.11.0";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz";
-        sha512 = "xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw==";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz";
+        sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==";
       };
     };
     "underscore-1.2.1" = {
@@ -54879,6 +54871,15 @@ let
         sha512 = "ghi1XxsVYPOZPDsOZrfOJIwQU5I3JVYB3Q6IbBGn1KFeOa89i0nUy5tCEkY9pVm83U83qZ1QG40RQKGknllV4w==";
       };
     };
+    "upath-2.0.1" = {
+      name = "upath";
+      packageName = "upath";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz";
+        sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==";
+      };
+    };
     "update-check-1.5.2" = {
       name = "update-check";
       packageName = "update-check";
@@ -55219,7 +55220,7 @@ let
       src = fetchgit {
         url = "https://github.com/laurent22/uslug.git";
         rev = "ba2834d79beb0435318709958b2f5e817d96674d";
-        sha256 = "e23c172456a8fa0af48dba3f89ca0d525dd870408f7bd6ad1d776cdbe13f0489";
+        sha256 = "9f64413fac2052a07323c54475be269280ab1c5d174e88bd1542e24091be0259";
       };
     };
     "ut_metadata-3.5.2" = {
@@ -58570,6 +58571,15 @@ let
         sha512 = "z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g==";
       };
     };
+    "xmldom-0.4.0" = {
+      name = "xmldom";
+      packageName = "xmldom";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.4.0.tgz";
+        sha512 = "2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA==";
+      };
+    };
     "xmlhttprequest-1.8.0" = {
       name = "xmlhttprequest";
       packageName = "xmlhttprequest";
@@ -58922,6 +58932,15 @@ let
         sha512 = "6+nLw8xa9uK1BOEOykaiYAJVh6/CjxWXK/q9b5FpRgNslt8s22F2xMBqVIKgCRjNgGvGPBy8Vog7WN7yh4amtA==";
       };
     };
+    "yargs-16.1.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "16.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-16.1.0.tgz";
+        sha512 = "upWFJOmDdHN0syLuESuvXDmrRcWd1QafJolHskzaw79uZa7/x53gxQKiR07W59GWY1tFhhU/Th9DrtSfpS782g==";
+      };
+    };
     "yargs-16.1.1" = {
       name = "yargs";
       packageName = "yargs";
@@ -59273,13 +59292,13 @@ let
         sha512 = "r+JdDipt93ttDjsOVPU5zaq5bAyY+3H19bDrThkvuVxC0xMQzU1PJcS6D+KrP3u96gH9XLomcHPb+2skoDjulQ==";
       };
     };
-    "zip-stream-4.0.2" = {
+    "zip-stream-4.0.4" = {
       name = "zip-stream";
       packageName = "zip-stream";
-      version = "4.0.2";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zip-stream/-/zip-stream-4.0.2.tgz";
-        sha512 = "TGxB2g+1ur6MHkvM644DuZr8Uzyz0k0OYWtS3YlpfWBEmK4woaC2t3+pozEL3dBfIPmpgmClR5B2QRcMgGt22g==";
+        url = "https://registry.npmjs.org/zip-stream/-/zip-stream-4.0.4.tgz";
+        sha512 = "a65wQ3h5gcQ/nQGWV1mSZCEzCML6EK/vyVPcrPNynySP1j3VBbQKh3nhC8CbORb+jfl2vXvh56Ul5odP1bAHqw==";
       };
     };
     "zmq-2.15.3" = {
@@ -59315,17 +59334,17 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "11.0.1";
+    version = "11.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-11.0.1.tgz";
-      sha512 = "zB20jTLQxLpkJjhbYelhRyMcgGsjwbD8pSYYAO6QX656Tx1tCtJ2UskEtf4ePQvgzu0Ds2dnAEfco+tekIMRTA==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-11.0.2.tgz";
+      sha512 = "mebt4ikwXD3gsbHRxKCpn83yW3UVnhiVDEpSXljs1YxscZ1X1dXrxb2g6LdAJwVp9xY5ERqRQeZM7eChqLTrvg==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.1100.1"
-      sources."@angular-devkit/core-11.0.1"
-      sources."@angular-devkit/schematics-11.0.1"
-      sources."@schematics/angular-11.0.1"
-      sources."@schematics/update-0.1100.1"
+      sources."@angular-devkit/architect-0.1100.2"
+      sources."@angular-devkit/core-11.0.2"
+      sources."@angular-devkit/schematics-11.0.2"
+      sources."@schematics/angular-11.0.2"
+      sources."@schematics/update-0.1100.2"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONStream-1.3.5"
       sources."agent-base-4.3.0"
@@ -59426,7 +59445,7 @@ in
       sources."http-signature-1.2.0"
       (sources."https-proxy-agent-2.2.4" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."humanize-ms-1.2.1"
@@ -59957,7 +59976,7 @@ in
         ];
       })
       sources."to-utf8-0.0.1"
-      sources."uglify-js-3.11.6"
+      sources."uglify-js-3.12.0"
       sources."unc-path-regex-0.1.2"
       sources."unique-stream-2.3.1"
       sources."universalify-0.1.2"
@@ -60036,7 +60055,7 @@ in
       sources."cssstyle-1.4.0"
       sources."dashdash-1.14.1"
       sources."data-urls-1.1.0"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."deep-is-0.1.3"
       sources."delayed-stream-1.0.0"
       sources."domexception-1.0.1"
@@ -60197,7 +60216,7 @@ in
       sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
       sources."@types/json5-0.0.29"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/parse-json-4.0.0"
       sources."@types/source-list-map-0.1.2"
       sources."@types/tapable-1.0.6"
@@ -60248,7 +60267,7 @@ in
       sources."browserslist-4.14.7"
       sources."buffer-from-1.1.1"
       sources."callsites-3.1.0"
-      sources."caniuse-lite-1.0.30001159"
+      sources."caniuse-lite-1.0.30001161"
       sources."chalk-3.0.0"
       sources."chardet-0.7.0"
       sources."chokidar-3.4.3"
@@ -60269,7 +60288,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.3.598"
+      sources."electron-to-chromium-1.3.606"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enhanced-resolve-4.3.0"
@@ -60436,7 +60455,7 @@ in
       sources."supports-color-7.2.0"
       sources."symbol-observable-2.0.3"
       sources."tapable-1.1.3"
-      (sources."terser-5.4.0" // {
+      (sources."terser-5.5.0" // {
         dependencies = [
           sources."commander-2.20.3"
         ];
@@ -60473,7 +60492,7 @@ in
       sources."wcwidth-1.0.1"
       (sources."webpack-5.4.0" // {
         dependencies = [
-          sources."enhanced-resolve-5.3.1"
+          sources."enhanced-resolve-5.3.2"
           sources."schema-utils-3.0.0"
           sources."tapable-2.1.1"
         ];
@@ -60512,7 +60531,7 @@ in
       sources."@apollo/federation-0.20.4"
       (sources."@apollo/protobufjs-1.0.5" // {
         dependencies = [
-          sources."@types/node-10.17.45"
+          sources."@types/node-10.17.46"
         ];
       })
       sources."@apollographql/apollo-tools-0.4.8"
@@ -60522,16 +60541,17 @@ in
       sources."@apollographql/graphql-language-service-utils-2.0.2"
       sources."@apollographql/graphql-playground-html-1.6.26"
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/compat-data-7.12.5"
-      (sources."@babel/core-7.12.3" // {
+      sources."@babel/compat-data-7.12.7"
+      (sources."@babel/core-7.12.8" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/generator-7.12.5"
+          sources."@babel/types-7.12.7"
           sources."semver-5.7.1"
         ];
       })
       (sources."@babel/generator-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
         ];
       })
       sources."@babel/helper-annotate-as-pure-7.10.4"
@@ -60542,61 +60562,64 @@ in
         ];
       })
       sources."@babel/helper-create-class-features-plugin-7.12.1"
-      sources."@babel/helper-create-regexp-features-plugin-7.12.1"
+      sources."@babel/helper-create-regexp-features-plugin-7.12.7"
       (sources."@babel/helper-define-map-7.10.5" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
         ];
       })
       (sources."@babel/helper-explode-assignable-expression-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
         ];
       })
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-hoist-variables-7.10.4"
-      (sources."@babel/helper-member-expression-to-functions-7.12.1" // {
+      (sources."@babel/helper-member-expression-to-functions-7.12.7" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
         ];
       })
       (sources."@babel/helper-module-imports-7.12.5" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
         ];
       })
       (sources."@babel/helper-module-transforms-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
+        ];
+      })
+      (sources."@babel/helper-optimise-call-expression-7.12.7" // {
+        dependencies = [
+          sources."@babel/types-7.12.7"
         ];
       })
-      sources."@babel/helper-optimise-call-expression-7.10.4"
       sources."@babel/helper-plugin-utils-7.10.4"
-      sources."@babel/helper-regex-7.10.5"
       (sources."@babel/helper-remap-async-to-generator-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
         ];
       })
       (sources."@babel/helper-replace-supers-7.12.5" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
         ];
       })
       (sources."@babel/helper-simple-access-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
         ];
       })
       (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
         ];
       })
       (sources."@babel/helper-split-export-declaration-7.11.0" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
         ];
       })
       sources."@babel/helper-validator-identifier-7.10.4"
@@ -60604,11 +60627,11 @@ in
       sources."@babel/helper-wrap-function-7.12.3"
       (sources."@babel/helpers-7.12.5" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
         ];
       })
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.5"
+      sources."@babel/parser-7.12.7"
       sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
       sources."@babel/plugin-proposal-dynamic-import-7.12.1"
@@ -60616,10 +60639,10 @@ in
       sources."@babel/plugin-proposal-json-strings-7.12.1"
       sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-      sources."@babel/plugin-proposal-numeric-separator-7.12.5"
+      sources."@babel/plugin-proposal-numeric-separator-7.12.7"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
-      sources."@babel/plugin-proposal-optional-chaining-7.12.1"
+      sources."@babel/plugin-proposal-optional-chaining-7.12.7"
       sources."@babel/plugin-proposal-private-methods-7.12.1"
       sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -60664,21 +60687,21 @@ in
       sources."@babel/plugin-transform-reserved-words-7.12.1"
       sources."@babel/plugin-transform-shorthand-properties-7.12.1"
       sources."@babel/plugin-transform-spread-7.12.1"
-      sources."@babel/plugin-transform-sticky-regex-7.12.1"
+      sources."@babel/plugin-transform-sticky-regex-7.12.7"
       sources."@babel/plugin-transform-template-literals-7.12.1"
       sources."@babel/plugin-transform-typeof-symbol-7.12.1"
       sources."@babel/plugin-transform-typescript-7.12.1"
       sources."@babel/plugin-transform-unicode-escapes-7.12.1"
       sources."@babel/plugin-transform-unicode-regex-7.12.1"
-      (sources."@babel/preset-env-7.12.1" // {
+      (sources."@babel/preset-env-7.12.7" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
           sources."semver-5.7.1"
         ];
       })
       sources."@babel/preset-flow-7.12.1"
       sources."@babel/preset-modules-0.1.4"
-      sources."@babel/preset-typescript-7.12.1"
+      sources."@babel/preset-typescript-7.12.7"
       (sources."@babel/register-7.12.1" // {
         dependencies = [
           sources."make-dir-2.1.0"
@@ -60687,11 +60710,15 @@ in
         ];
       })
       sources."@babel/runtime-7.12.5"
-      sources."@babel/template-7.10.4"
-      (sources."@babel/traverse-7.12.5" // {
+      (sources."@babel/template-7.12.7" // {
+        dependencies = [
+          sources."@babel/types-7.12.7"
+        ];
+      })
+      (sources."@babel/traverse-7.12.8" // {
         dependencies = [
           sources."@babel/generator-7.12.5"
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
         ];
       })
       sources."@babel/types-7.10.4"
@@ -60735,7 +60762,7 @@ in
       (sources."@oclif/errors-1.3.3" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
-          sources."clean-stack-3.0.0"
+          sources."clean-stack-3.0.1"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
           sources."escape-string-regexp-4.0.0"
@@ -60828,7 +60855,7 @@ in
       sources."@types/long-4.0.1"
       sources."@types/mime-2.0.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       (sources."@types/node-fetch-2.5.7" // {
         dependencies = [
           sources."form-data-3.0.0"
@@ -60851,14 +60878,14 @@ in
       sources."@vue/cli-ui-addon-widgets-4.5.9"
       (sources."@vue/compiler-core-3.0.2" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
           sources."source-map-0.6.1"
         ];
       })
       sources."@vue/compiler-dom-3.0.2"
       (sources."@vue/compiler-sfc-3.0.2" // {
         dependencies = [
-          sources."@babel/types-7.12.6"
+          sources."@babel/types-7.12.7"
           sources."source-map-0.6.1"
         ];
       })
@@ -61069,7 +61096,7 @@ in
       sources."callsites-2.0.0"
       sources."camel-case-4.1.1"
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001159"
+      sources."caniuse-lite-1.0.30001161"
       sources."capital-case-1.0.3"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
@@ -61128,7 +61155,7 @@ in
           sources."ansi-escapes-4.3.1"
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
-          sources."clean-stack-3.0.0"
+          sources."clean-stack-3.0.1"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
           sources."escape-string-regexp-4.0.0"
@@ -61212,7 +61239,7 @@ in
       sources."csv-parser-1.12.1"
       sources."dashdash-1.14.1"
       sources."date-fns-1.30.1"
-      (sources."debug-4.3.0" // {
+      (sources."debug-4.3.1" // {
         dependencies = [
           sources."ms-2.1.2"
         ];
@@ -61278,7 +61305,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.598"
+      sources."electron-to-chromium-1.3.606"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
@@ -61564,7 +61591,6 @@ in
       sources."is-glob-4.0.1"
       sources."is-installed-globally-0.1.0"
       sources."is-natural-number-4.0.1"
-      sources."is-negative-zero-2.0.0"
       sources."is-npm-1.0.0"
       sources."is-number-7.0.0"
       sources."is-obj-1.0.1"
@@ -61767,7 +61793,7 @@ in
       sources."node-releases-1.1.67"
       (sources."nodemon-1.19.4" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."ms-2.1.2"
           sources."semver-5.7.1"
         ];
@@ -61868,7 +61894,7 @@ in
       sources."pkg-dir-3.0.0"
       (sources."portfinder-1.0.28" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."ms-2.1.2"
         ];
       })
@@ -62099,16 +62125,8 @@ in
       sources."strict-uri-encode-1.1.0"
       sources."string-hash-1.1.3"
       sources."string-width-4.2.0"
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -62482,9 +62500,9 @@ in
       sources."@babel/generator-7.12.5"
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.5"
-      sources."@babel/template-7.10.4"
-      sources."@babel/types-7.12.6"
+      sources."@babel/parser-7.12.7"
+      sources."@babel/template-7.12.7"
+      sources."@babel/types-7.12.7"
       sources."@webassemblyjs/ast-1.9.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.1"
       sources."@webassemblyjs/helper-api-error-1.9.1"
@@ -62557,14 +62575,14 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.15.2";
+    version = "1.15.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.15.2.tgz";
-      sha512 = "40tSBJENAo8bC9RA+IplD/OACRBiZbTBXdt/Q7qaTdDiaMz/ITXCYuALeY6cGK6bO3Frmw2B5djwGbjxlrLa6A==";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.15.3.tgz";
+      sha512 = "RYp9vX+/ojXMCpxMOsZu9e4X5+k3Nlq3vW4gdMkIVXIlk7hfvNcBfAYMeq3ao68cyYQFLJWVkFY0DlQfn0hQhQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      (sources."@babel/core-7.12.3" // {
+      (sources."@babel/core-7.12.8" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -62576,38 +62594,38 @@ in
       })
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
-      sources."@babel/helper-member-expression-to-functions-7.12.1"
+      sources."@babel/helper-member-expression-to-functions-7.12.7"
       sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
-      sources."@babel/helper-optimise-call-expression-7.10.4"
+      sources."@babel/helper-optimise-call-expression-7.12.7"
       sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-split-export-declaration-7.11.0"
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.5"
-      sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.6"
+      sources."@babel/parser-7.12.7"
+      sources."@babel/template-7.12.7"
+      sources."@babel/traverse-7.12.8"
+      sources."@babel/types-7.12.7"
       sources."JSV-4.0.2"
       sources."ansi-styles-3.2.1"
       sources."array-unique-0.3.2"
-      sources."async-2.6.3"
+      sources."async-3.2.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chalk-2.4.2"
-      sources."chmodr-1.2.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."colors-1.4.0"
       sources."commander-2.20.3"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.7.0"
-      sources."debug-4.3.0"
-      sources."ejs-2.5.7"
+      sources."debug-4.3.1"
+      sources."ejs-3.1.5"
       sources."ensure-posix-path-1.1.1"
       sources."escape-string-regexp-1.0.5"
+      sources."filelist-1.0.1"
       sources."fs-extra-5.0.0"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.2"
@@ -62633,16 +62651,21 @@ in
       sources."is-core-module-2.1.0"
       sources."is-windows-1.0.2"
       sources."isexe-2.0.0"
+      (sources."jake-10.8.2" // {
+        dependencies = [
+          sources."async-0.9.2"
+        ];
+      })
       sources."js-tokens-4.0.0"
       sources."jsesc-2.5.2"
       sources."json5-2.1.3"
       sources."jsonfile-4.0.0"
-      sources."jsonlint-1.6.2"
+      sources."jsonlint-1.6.3"
       sources."lodash-4.17.20"
       sources."matcher-collection-1.1.2"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      sources."moment-2.20.1"
+      sources."moment-2.29.1"
       sources."ms-2.1.2"
       sources."node.extend-2.0.2"
       (sources."nomnom-1.8.1" // {
@@ -62668,7 +62691,7 @@ in
       sources."which-1.3.1"
       sources."xml2js-0.2.8"
       sources."xml2tss-0.0.5"
-      sources."xmldom-0.1.31"
+      sources."xmldom-0.4.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -62691,7 +62714,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
@@ -63123,7 +63146,6 @@ in
       sources."is-core-module-2.1.0"
       sources."is-date-object-1.0.2"
       sources."is-generator-function-1.0.7"
-      sources."is-negative-zero-2.0.0"
       sources."is-regex-1.1.1"
       sources."is-symbol-1.0.3"
       sources."is-typed-array-1.1.3"
@@ -63197,16 +63219,8 @@ in
         ];
       })
       sources."stream-splicer-2.0.1"
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.3.0"
       sources."subarg-1.0.0"
       sources."syntax-error-1.4.0"
@@ -63704,7 +63718,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.31"
+      sources."@types/node-13.13.32"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
       sources."ajv-6.12.6"
@@ -63751,7 +63765,7 @@ in
       sources."caseless-0.12.0"
       (sources."castv2-0.1.10" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
         ];
       })
       sources."castv2-client-1.2.0"
@@ -63822,7 +63836,7 @@ in
       })
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
-      sources."get-browser-rtc-1.0.2"
+      sources."get-browser-rtc-1.1.0"
       sources."get-stdin-4.0.1"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
@@ -64162,7 +64176,7 @@ in
       sources."commander-2.20.3"
       sources."concat-map-0.0.1"
       sources."cycle-1.0.3"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decode-uri-component-0.2.0"
       sources."deep-equal-0.2.2"
       sources."encoding-0.1.13"
@@ -64322,10 +64336,10 @@ in
   coc-go = nodeEnv.buildNodePackage {
     name = "coc-go";
     packageName = "coc-go";
-    version = "0.12.0";
+    version = "0.12.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-go/-/coc-go-0.12.0.tgz";
-      sha512 = "1H9GKq8S1nqv6R3Y2ws+mK+GdVGu3SRsr5uEyRR1KGyfGCDjHyUJY9r4ISlD7DqQ0aq3ukphyv/vhi9uDlkvmA==";
+      url = "https://registry.npmjs.org/coc-go/-/coc-go-0.12.1.tgz";
+      sha512 = "DskyUQMQXxaHAAAcAzlEFAbxFQaSrRhHEVTsGGB6Q3naW7GvQFze2Otrd4FOxfzTYZlGio5yJpGB7a09K5Snrg==";
     };
     dependencies = [
       sources."isexe-2.0.0"
@@ -64369,7 +64383,7 @@ in
       sha512 = "qC1BifVAAuI5cPT6fEQuP0RIjwDWqhLCH+AUJrQ7lW2IghWInjOarhj9AHWS+1cZLnsVrMMYXL6i8HZLnkRDQQ==";
     };
     dependencies = [
-      sources."typescript-4.0.5"
+      sources."typescript-4.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -64401,10 +64415,10 @@ in
   coc-java = nodeEnv.buildNodePackage {
     name = "coc-java";
     packageName = "coc-java";
-    version = "1.5.0";
+    version = "1.5.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.0.tgz";
-      sha512 = "EvoHLu7a0H3NB8z3JqXUTggKNTCi28on2dsE7/EJ7AYT1i3SgPaDaU/M7lkK/mUqokbHhAKwcEZBcAr2PtRAgg==";
+      url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.3.tgz";
+      sha512 = "St4Vg5DSHaBW0zqXoSKlKL0KJiASSGMIKDUX2zp/l8ImJd6YI5+SoEwYjCxA2c5x01hZ7k3prXDdfgpKp304RA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64454,10 +64468,10 @@ in
   coc-lists = nodeEnv.buildNodePackage {
     name = "coc-lists";
     packageName = "coc-lists";
-    version = "1.3.11";
+    version = "1.3.13";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.11.tgz";
-      sha512 = "FG0sCSIbkOe+RRikjHuDp+lFJWXyKBcDSTXDbS7T6q4dNwpkpl4+wNSkvN0tWKnXwNFd2HJt5GuFn5xj9DFK8g==";
+      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.13.tgz";
+      sha512 = "D/3AiEE5Zhs7D9aDPdjX6radmiphWXIfprAyC9AMgMFfZU0KvcNavVWe74/z+G0imFrTt5EZdWlc+SGkkMi1RA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64472,10 +64486,10 @@ in
   coc-metals = nodeEnv.buildNodePackage {
     name = "coc-metals";
     packageName = "coc-metals";
-    version = "0.9.6";
+    version = "0.9.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.6.tgz";
-      sha512 = "5NSCyYUbOployL6Vfanw7LeIYAi9+8LTqXjKqmVCSRql/YpscZJj7Y3KnhUc4P6WYuORXTl7r9Wwau6T/McyQw==";
+      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.7.tgz";
+      sha512 = "XY4e1FWtaxw/ruaRBTVoJYzNIvI7J5YlYm+l/63adFKFk83fmu18fUa4IrkW4YMDP1rfbDSNTw6+99dI6x4zoA==";
     };
     dependencies = [
       sources."@chemzqm/neovim-5.2.10"
@@ -64509,7 +64523,7 @@ in
       })
       sources."date-format-3.0.0"
       sources."debounce-1.2.0"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."deep-extend-0.6.0"
       sources."define-properties-1.1.3"
       sources."duplexer2-0.1.4"
@@ -64522,7 +64536,7 @@ in
       sources."fb-watchman-2.0.1"
       sources."flatted-2.0.2"
       sources."follow-redirects-1.13.0"
-      sources."fp-ts-2.8.6"
+      sources."fp-ts-2.9.0"
       sources."fs-extra-8.1.0"
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
@@ -64549,7 +64563,6 @@ in
       sources."is-callable-1.2.2"
       sources."is-date-object-1.0.2"
       sources."is-docker-2.1.1"
-      sources."is-negative-zero-2.0.0"
       sources."is-regex-1.1.1"
       sources."is-stream-1.1.0"
       sources."is-symbol-1.0.3"
@@ -64615,16 +64628,8 @@ in
           sources."date-format-2.1.0"
         ];
       })
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
@@ -64674,10 +64679,10 @@ in
   coc-prettier = nodeEnv.buildNodePackage {
     name = "coc-prettier";
     packageName = "coc-prettier";
-    version = "1.1.18";
+    version = "1.1.19";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.18.tgz";
-      sha512 = "K2rny+Gy8TKZTWFpRqQ0cuH1QkrClml7cNh6A39vkQfbgmDXgaTbli/V0oWslSnVyPOtidGS3vIhZ09mukVhvw==";
+      url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.19.tgz";
+      sha512 = "449bRHSru5ESxrWjgnizpI2OIXmzXN1/nEoPIkawJIsM4RvWAZJsMmsrgqweBRrQmyHy1sih7eIV3AkeZWbg7g==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -64754,7 +64759,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
-      sources."caniuse-lite-1.0.30001159"
+      sources."caniuse-lite-1.0.30001161"
       sources."capture-stack-trace-1.0.1"
       sources."ccount-1.1.0"
       sources."chalk-2.4.2"
@@ -64821,7 +64826,7 @@ in
       })
       sources."crypto-random-string-1.0.0"
       sources."currently-unhandled-0.4.1"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decamelize-1.2.0"
       sources."decamelize-keys-1.1.0"
       sources."decode-uri-component-0.2.0"
@@ -64851,7 +64856,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.598"
+      sources."electron-to-chromium-1.3.606"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -65290,11 +65295,11 @@ in
       sources."prelude-ls-1.1.2"
       sources."prepend-http-1.0.4"
       sources."preserve-0.2.0"
-      sources."prettier-2.1.2"
+      sources."prettier-2.2.0"
       sources."prettier-eslint-11.0.0"
       (sources."prettier-stylelint-0.4.2" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."ignore-3.3.10"
           sources."prettier-1.19.1"
         ];
@@ -65477,7 +65482,7 @@ in
           sources."ansi-regex-3.0.0"
           sources."camelcase-4.1.0"
           sources."camelcase-keys-4.2.0"
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."file-entry-cache-2.0.0"
           sources."flat-cache-1.3.4"
           sources."globby-7.1.1"
@@ -65708,10 +65713,10 @@ in
   coc-smartf = nodeEnv.buildNodePackage {
     name = "coc-smartf";
     packageName = "coc-smartf";
-    version = "1.1.10";
+    version = "1.1.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-smartf/-/coc-smartf-1.1.10.tgz";
-      sha512 = "xjRDR+1qPw3KclL67v7y8D5l8mrUyYvCGWaLegZ3iLjYpRMwGI5oZKi4sHfRk8kFqrmVbHfvh6yDHiIUnTJWyA==";
+      url = "https://registry.npmjs.org/coc-smartf/-/coc-smartf-1.1.11.tgz";
+      sha512 = "srtsGTwfnrN47BAcafyThuv1eFvlPUFrSDZPJ4RtgxbpcPZCGa60rAPOkFELCjtt9EO0XuKxRJsXtL2PI+ft6A==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -65767,14 +65772,14 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/core-7.12.3"
+      sources."@babel/core-7.12.8"
       sources."@babel/generator-7.12.5"
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
-      sources."@babel/helper-member-expression-to-functions-7.12.1"
+      sources."@babel/helper-member-expression-to-functions-7.12.7"
       sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
-      sources."@babel/helper-optimise-call-expression-7.10.4"
+      sources."@babel/helper-optimise-call-expression-7.12.7"
       sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
       sources."@babel/helper-split-export-declaration-7.11.0"
@@ -65785,10 +65790,10 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.12.5"
-      sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.6"
+      sources."@babel/parser-7.12.7"
+      sources."@babel/template-7.12.7"
+      sources."@babel/traverse-7.12.8"
+      sources."@babel/types-7.12.7"
       sources."@nodelib/fs.scandir-2.1.3"
       sources."@nodelib/fs.stat-2.0.3"
       sources."@nodelib/fs.walk-1.2.4"
@@ -65814,7 +65819,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001159"
+      sources."caniuse-lite-1.0.30001161"
       (sources."chalk-4.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -65835,7 +65840,7 @@ in
       sources."convert-source-map-1.7.0"
       sources."cosmiconfig-7.0.0"
       sources."cssesc-3.0.0"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decamelize-1.2.0"
       (sources."decamelize-keys-1.1.0" // {
         dependencies = [
@@ -65852,7 +65857,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.598"
+      sources."electron-to-chromium-1.3.606"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -65933,7 +65938,11 @@ in
       sources."map-obj-4.1.0"
       sources."mathml-tag-names-2.1.3"
       sources."mdast-util-from-markdown-0.8.1"
-      sources."mdast-util-to-markdown-0.5.3"
+      (sources."mdast-util-to-markdown-0.5.4" // {
+        dependencies = [
+          sources."mdast-util-to-string-2.0.0"
+        ];
+      })
       sources."mdast-util-to-string-1.1.0"
       sources."meow-8.0.0"
       sources."merge2-1.4.1"
@@ -66047,7 +66056,7 @@ in
       sources."sugarss-2.0.0"
       sources."supports-color-5.5.0"
       sources."svg-tags-1.0.0"
-      sources."table-6.0.3"
+      sources."table-6.0.4"
       sources."to-fast-properties-2.0.0"
       sources."to-regex-range-5.0.1"
       sources."trim-newlines-3.0.0"
@@ -66206,13 +66215,13 @@ in
   coc-tsserver = nodeEnv.buildNodePackage {
     name = "coc-tsserver";
     packageName = "coc-tsserver";
-    version = "1.6.0";
+    version = "1.6.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.0.tgz";
-      sha512 = "mGqubDWL5kRHhcoCoAG5LyODhBEh7ORXhCTCZ1GLj7waEaHxtmFSoBlD0H4KwijvI/P+08ji/DLBfp842BPkgw==";
+      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.1.tgz";
+      sha512 = "Tys5fRAdzYfi2MyRQ8X5fKLw8vhluuT/0/Uac+eOzMnWSJ0zgMpxtXTo5AA1icsLgUTHHOXgq6CJHUbKs6xGVA==";
     };
     dependencies = [
-      sources."typescript-4.0.5"
+      sources."typescript-4.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -66265,13 +66274,13 @@ in
       sources."color-name-1.1.3"
       sources."concat-map-0.0.1"
       sources."cross-spawn-7.0.3"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."deep-is-0.1.3"
       sources."doctrine-3.0.0"
       sources."emoji-regex-7.0.3"
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-7.13.0"
+      sources."eslint-7.14.0"
       sources."eslint-plugin-vue-7.1.0"
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
@@ -66420,10 +66429,10 @@ in
   coc-yaml = nodeEnv.buildNodePackage {
     name = "coc-yaml";
     packageName = "coc-yaml";
-    version = "1.1.2";
+    version = "1.1.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.1.2.tgz";
-      sha512 = "schv9IuNXZIGJqoSUQf/zDTgtSG1Kqht5s9yrlWGPhByHofheyffW3jrXrI/yMY9CT/5/Mg37udFrAbx8WCpCg==";
+      url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.1.3.tgz";
+      sha512 = "BBDyx+KUBUcTOoE+E0sZ1pp0mMNWmrqHIeVykEvMN9bt/agtf4vvlJojv54sJETN9LHwbLNLl9pIQkM2HzoWmQ==";
     };
     dependencies = [
       sources."agent-base-4.3.0"
@@ -66437,6 +66446,7 @@ in
       sources."js-yaml-3.14.0"
       sources."jsonc-parser-2.3.1"
       sources."ms-2.0.0"
+      sources."prettier-2.2.0"
       (sources."request-light-0.2.5" // {
         dependencies = [
           sources."vscode-nls-4.1.2"
@@ -67073,7 +67083,7 @@ in
       sources."type-fest-0.8.1"
       sources."type-is-1.6.18"
       sources."typedarray-to-buffer-3.1.5"
-      sources."underscore-1.11.0"
+      sources."underscore-1.12.0"
       sources."unique-string-2.0.0"
       sources."universalify-1.0.0"
       sources."unpipe-1.0.0"
@@ -67146,7 +67156,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/normalize-package-data-2.4.0"
       sources."aggregate-error-3.1.0"
       sources."ansi-styles-3.2.1"
@@ -67517,7 +67527,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.2"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -67544,7 +67554,7 @@ in
       sources."custom-error-instance-2.1.1"
       sources."cycle-onionify-4.0.0"
       sources."d-1.0.1"
-      sources."debug-3.2.6"
+      sources."debug-3.2.7"
       sources."define-properties-1.1.3"
       sources."delayed-stream-1.0.0"
       sources."es5-ext-0.10.53"
@@ -67661,14 +67671,12 @@ in
   create-react-app = nodeEnv.buildNodePackage {
     name = "create-react-app";
     packageName = "create-react-app";
-    version = "4.0.0";
+    version = "4.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.0.tgz";
-      sha512 = "TonJ7eOtCbqURfE8VaHKXHPvsFMNrya+0XZMvpGAiQ8Snlig70BfZi0CUr0MNM8WQxap1xe3GivtKOBwuQsRCg==";
+      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.1.tgz";
+      sha512 = "ryEU58YUtn4gxaEQ/Zwt3Bbmkoc3MghLNbNKs1MUg8zDWyM+az1SvMmZ7QaXye9DNNwn5TS2/Ok+fpw2KKvZhA==";
     };
     dependencies = [
-      sources."ansi-escapes-4.3.1"
-      sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."at-least-node-1.0.0"
       sources."balanced-match-1.0.0"
@@ -67677,9 +67685,6 @@ in
       sources."buffer-from-0.1.2"
       sources."builtins-1.0.3"
       sources."chalk-4.1.0"
-      sources."chardet-0.7.0"
-      sources."cli-cursor-3.1.0"
-      sources."cli-width-3.0.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."commander-4.1.1"
@@ -67688,15 +67693,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."debug-2.6.9"
       sources."duplexer2-0.0.2"
-      sources."emoji-regex-8.0.0"
       sources."envinfo-7.7.3"
-      sources."escape-string-regexp-1.0.5"
-      (sources."external-editor-3.1.0" // {
-        dependencies = [
-          sources."tmp-0.0.33"
-        ];
-      })
-      sources."figures-3.2.0"
       sources."fs-extra-9.0.1"
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.12"
@@ -67705,11 +67702,8 @@ in
       sources."graceful-fs-4.2.4"
       sources."has-flag-4.0.0"
       sources."hyperquest-2.1.3"
-      sources."iconv-lite-0.4.24"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."inquirer-7.3.3"
-      sources."is-fullwidth-code-point-3.0.0"
       sources."isarray-0.0.1"
       sources."isexe-2.0.0"
       (sources."jsonfile-6.1.0" // {
@@ -67717,33 +67711,24 @@ in
           sources."universalify-2.0.0"
         ];
       })
-      sources."lodash-4.17.20"
-      sources."mimic-fn-2.1.0"
+      sources."kleur-3.0.3"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."mkdirp-0.5.5"
       sources."ms-2.0.0"
-      sources."mute-stream-0.0.8"
       sources."once-1.4.0"
-      sources."onetime-5.1.2"
-      sources."os-tmpdir-1.0.2"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
       sources."process-nextick-args-2.0.1"
+      sources."prompts-2.4.0"
       sources."readable-stream-1.1.14"
-      sources."restore-cursor-3.1.0"
       sources."rimraf-2.7.1"
-      sources."run-async-2.4.1"
-      sources."rxjs-6.6.3"
       sources."safe-buffer-5.1.2"
-      sources."safer-buffer-2.1.2"
       sources."semver-7.3.2"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
-      sources."signal-exit-3.0.3"
-      sources."string-width-4.2.0"
+      sources."sisteransi-1.0.5"
       sources."string_decoder-0.10.31"
-      sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
       sources."tar-2.2.2"
       (sources."tar-pack-3.4.1" // {
@@ -67753,7 +67738,6 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."through-2.3.8"
       (sources."through2-0.6.5" // {
         dependencies = [
           sources."readable-stream-1.0.34"
@@ -67764,8 +67748,6 @@ in
           sources."rimraf-3.0.2"
         ];
       })
-      sources."tslib-1.14.1"
-      sources."type-fest-0.11.0"
       sources."uid-number-0.0.6"
       sources."universalify-1.0.0"
       sources."util-deprecate-1.0.2"
@@ -67877,7 +67859,7 @@ in
       })
       (sources."bittorrent-dht-7.10.0" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."blake2b-2.1.3"
@@ -67966,7 +67948,7 @@ in
       sources."dat-secret-storage-4.0.1"
       sources."dat-storage-1.1.1"
       sources."dat-swarm-defaults-1.0.2"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decode-uri-component-0.2.0"
       sources."decompress-response-4.2.1"
       sources."deep-equal-0.2.2"
@@ -68095,7 +68077,7 @@ in
       sources."hyperdrive-http-4.4.0"
       (sources."hyperdrive-network-speed-2.1.0" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."i-0.3.6"
@@ -68619,29 +68601,28 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.43.0";
+    version = "6.54.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.43.0.tgz";
-      sha512 = "0xS3XRHG+6k2Si0+mbLIg1HOSmPkTR6cbzFaTS0u96QxrAPHqxHPC1FWZ2x4PcApLH7FI+KSDquU049Sja6kKw==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.54.0.tgz";
+      sha512 = "R1TL7LZi2s0HrtxpYJ169m/ALstWSk04e9YbwSLxrOI6o5dYqcE0KmoE3jzGmE56SHdxp8QrMBQInt6A2yz9Mg==";
     };
     dependencies = [
       sources."@fast-csv/format-4.3.5"
       sources."@fast-csv/parse-4.3.3"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."JSONStream-1.3.5"
       sources."ajv-6.12.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.794.0"
+      sources."aws-sdk-2.784.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
       sources."buffer-4.9.2"
-      sources."buffer-queue-1.0.0"
       sources."bytes-3.1.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.8"
@@ -68665,7 +68646,6 @@ in
       sources."http-signature-1.2.0"
       sources."http-status-1.5.0"
       sources."ieee754-1.1.13"
-      sources."inherits-2.0.4"
       sources."ini-1.3.5"
       (sources."ip-address-6.1.0" // {
         dependencies = [
@@ -68700,19 +68680,12 @@ in
       sources."p-queue-6.6.2"
       sources."p-timeout-3.2.0"
       sources."performance-now-2.1.0"
-      sources."process-nextick-args-2.0.1"
       sources."psl-1.8.0"
       sources."punycode-1.3.2"
       sources."qs-6.5.2"
       sources."querystring-0.2.0"
-      (sources."readable-stream-2.3.7" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
       sources."request-2.88.2"
       sources."requestretry-4.1.2"
-      sources."s3-stream-upload-2.0.2"
       sources."s3signed-0.1.0"
       sources."s3urls-1.5.2"
       sources."safe-buffer-5.2.1"
@@ -68724,11 +68697,6 @@ in
       sources."socks5-https-client-1.2.1"
       sources."sprintf-js-1.1.2"
       sources."sshpk-1.16.1"
-      (sources."string_decoder-1.1.1" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
       sources."through-2.3.8"
       (sources."tough-cookie-2.5.0" // {
         dependencies = [
@@ -68743,7 +68711,6 @@ in
         ];
       })
       sources."url-0.10.3"
-      sources."util-deprecate-1.0.2"
       sources."uuid-3.3.2"
       sources."verror-1.10.0"
       sources."when-3.7.8"
@@ -68788,17 +68755,17 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/core-7.12.3"
+      sources."@babel/core-7.12.8"
       sources."@babel/generator-7.12.5"
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-react-jsx-7.10.4"
       sources."@babel/helper-builder-react-jsx-experimental-7.12.4"
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
-      sources."@babel/helper-member-expression-to-functions-7.12.1"
+      sources."@babel/helper-member-expression-to-functions-7.12.7"
       sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
-      sources."@babel/helper-optimise-call-expression-7.10.4"
+      sources."@babel/helper-optimise-call-expression-7.12.7"
       sources."@babel/helper-plugin-utils-7.10.4"
       sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
@@ -68806,23 +68773,23 @@ in
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.5"
+      sources."@babel/parser-7.12.7"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-syntax-jsx-7.12.1"
       sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
       sources."@babel/plugin-transform-destructuring-7.12.1"
       sources."@babel/plugin-transform-parameters-7.12.1"
-      sources."@babel/plugin-transform-react-jsx-7.12.5"
-      sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.6"
+      sources."@babel/plugin-transform-react-jsx-7.12.7"
+      sources."@babel/template-7.12.7"
+      sources."@babel/traverse-7.12.8"
+      sources."@babel/types-7.12.7"
       sources."@sindresorhus/is-4.0.0"
       sources."@szmarczak/http-timer-4.0.5"
       sources."@types/cacheable-request-6.0.1"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/responselike-1.0.0"
       sources."@types/yoga-layout-1.9.2"
@@ -68877,7 +68844,7 @@ in
       sources."convert-to-spaces-1.0.2"
       sources."cross-spawn-6.0.5"
       sources."debounce-fn-4.0.0"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decamelize-1.2.0"
       (sources."decamelize-keys-1.1.0" // {
         dependencies = [
@@ -69147,8 +69114,11 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.150.1"
-      sources."@fluentui/react-focus-7.16.18"
+      sources."@fluentui/react-7.152.2"
+      sources."@fluentui/react-compose-0.19.12"
+      sources."@fluentui/react-focus-7.16.19"
+      sources."@fluentui/react-stylesheets-0.2.4"
+      sources."@fluentui/react-theme-provider-0.18.0"
       sources."@fluentui/react-window-provider-1.0.1"
       sources."@fluentui/theme-1.7.0"
       (sources."@gulp-sourcemaps/identity-map-1.0.2" // {
@@ -69172,10 +69142,11 @@ in
       sources."@types/body-parser-1.19.0"
       sources."@types/caseless-0.12.2"
       sources."@types/chart.js-2.9.24"
+      sources."@types/classnames-2.2.11"
       sources."@types/connect-3.4.33"
       sources."@types/engine.io-3.1.4"
       sources."@types/express-4.17.8"
-      sources."@types/express-serve-static-core-4.17.13"
+      sources."@types/express-serve-static-core-4.17.14"
       sources."@types/fancy-log-1.3.0"
       sources."@types/glob-7.1.3"
       sources."@types/hls.js-0.13.1"
@@ -69454,6 +69425,7 @@ in
           sources."kind-of-5.1.0"
         ];
       })
+      sources."classnames-2.2.6"
       sources."clean-css-4.2.3"
       sources."clean-stack-2.2.0"
       sources."cli-cursor-2.1.0"
@@ -69532,7 +69504,7 @@ in
       sources."debug-2.6.9"
       (sources."debug-fabulous-1.1.0" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."ms-2.1.2"
         ];
       })
@@ -69957,7 +69929,7 @@ in
       sources."lodash.some-4.6.0"
       (sources."log4js-6.3.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -70106,7 +70078,7 @@ in
       sources."nanomatch-1.2.13"
       (sources."needle-2.5.2" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."ms-2.1.2"
         ];
       })
@@ -70179,7 +70151,7 @@ in
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
       sources."object.reduce-1.0.1"
-      sources."office-ui-fabric-react-7.150.1"
+      sources."office-ui-fabric-react-7.152.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -70515,7 +70487,7 @@ in
       (sources."streamroller-2.2.4" // {
         dependencies = [
           sources."date-format-2.1.0"
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."fs-extra-8.1.0"
           sources."jsonfile-4.0.0"
           sources."ms-2.1.2"
@@ -70549,7 +70521,7 @@ in
           sources."mkdirp-0.5.5"
         ];
       })
-      (sources."terser-5.4.0" // {
+      (sources."terser-5.5.0" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -70778,10 +70750,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "7.13.0";
+    version = "7.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-7.13.0.tgz";
-      sha512 = "uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==";
+      url = "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz";
+      sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -70816,7 +70788,7 @@ in
       sources."color-name-1.1.3"
       sources."concat-map-0.0.1"
       sources."cross-spawn-7.0.3"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."deep-is-0.1.3"
       sources."doctrine-3.0.0"
       sources."emoji-regex-7.0.3"
@@ -70967,13 +70939,13 @@ in
       sources."concat-map-0.0.1"
       sources."core_d-2.0.0"
       sources."cross-spawn-7.0.3"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."deep-is-0.1.3"
       sources."doctrine-3.0.0"
       sources."emoji-regex-7.0.3"
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-7.13.0"
+      sources."eslint-7.14.0"
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
         dependencies = [
@@ -71088,7 +71060,7 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/compat-data-7.12.5"
+      sources."@babel/compat-data-7.12.7"
       sources."@babel/core-7.9.0"
       sources."@babel/generator-7.12.5"
       sources."@babel/helper-annotate-as-pure-7.10.4"
@@ -71097,7 +71069,7 @@ in
       sources."@babel/helper-builder-react-jsx-experimental-7.12.4"
       sources."@babel/helper-compilation-targets-7.12.5"
       sources."@babel/helper-create-class-features-plugin-7.12.1"
-      sources."@babel/helper-create-regexp-features-plugin-7.12.1"
+      sources."@babel/helper-create-regexp-features-plugin-7.12.7"
       (sources."@babel/helper-define-map-7.10.5" // {
         dependencies = [
           sources."lodash-4.17.20"
@@ -71107,20 +71079,15 @@ in
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-hoist-variables-7.10.4"
-      sources."@babel/helper-member-expression-to-functions-7.12.1"
+      sources."@babel/helper-member-expression-to-functions-7.12.7"
       sources."@babel/helper-module-imports-7.12.5"
       (sources."@babel/helper-module-transforms-7.12.1" // {
         dependencies = [
           sources."lodash-4.17.20"
         ];
       })
-      sources."@babel/helper-optimise-call-expression-7.10.4"
+      sources."@babel/helper-optimise-call-expression-7.12.7"
       sources."@babel/helper-plugin-utils-7.10.4"
-      (sources."@babel/helper-regex-7.10.5" // {
-        dependencies = [
-          sources."lodash-4.17.20"
-        ];
-      })
       sources."@babel/helper-remap-async-to-generator-7.12.1"
       sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
@@ -71135,7 +71102,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.12.5"
+      sources."@babel/parser-7.12.7"
       sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
       sources."@babel/plugin-proposal-dynamic-import-7.12.1"
@@ -71144,10 +71111,10 @@ in
       sources."@babel/plugin-proposal-json-strings-7.12.1"
       sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-      sources."@babel/plugin-proposal-numeric-separator-7.12.5"
+      sources."@babel/plugin-proposal-numeric-separator-7.12.7"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
-      sources."@babel/plugin-proposal-optional-chaining-7.12.1"
+      sources."@babel/plugin-proposal-optional-chaining-7.12.7"
       sources."@babel/plugin-proposal-private-methods-7.12.1"
       sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -71192,7 +71159,7 @@ in
       sources."@babel/plugin-transform-parameters-7.12.1"
       sources."@babel/plugin-transform-property-literals-7.12.1"
       sources."@babel/plugin-transform-react-display-name-7.12.1"
-      sources."@babel/plugin-transform-react-jsx-7.12.5"
+      sources."@babel/plugin-transform-react-jsx-7.12.7"
       sources."@babel/plugin-transform-react-jsx-source-7.12.1"
       sources."@babel/plugin-transform-regenerator-7.12.1"
       sources."@babel/plugin-transform-reserved-words-7.12.1"
@@ -71203,23 +71170,23 @@ in
       })
       sources."@babel/plugin-transform-shorthand-properties-7.12.1"
       sources."@babel/plugin-transform-spread-7.12.1"
-      sources."@babel/plugin-transform-sticky-regex-7.12.1"
+      sources."@babel/plugin-transform-sticky-regex-7.12.7"
       sources."@babel/plugin-transform-template-literals-7.12.1"
       sources."@babel/plugin-transform-typeof-symbol-7.12.1"
       sources."@babel/plugin-transform-typescript-7.12.1"
       sources."@babel/plugin-transform-unicode-escapes-7.12.1"
       sources."@babel/plugin-transform-unicode-regex-7.12.1"
-      sources."@babel/preset-env-7.12.1"
+      sources."@babel/preset-env-7.12.7"
       sources."@babel/preset-modules-0.1.4"
-      sources."@babel/preset-typescript-7.12.1"
+      sources."@babel/preset-typescript-7.12.7"
       sources."@babel/runtime-7.12.5"
-      sources."@babel/template-7.10.4"
-      (sources."@babel/traverse-7.12.5" // {
+      sources."@babel/template-7.12.7"
+      (sources."@babel/traverse-7.12.8" // {
         dependencies = [
           sources."lodash-4.17.20"
         ];
       })
-      (sources."@babel/types-7.12.6" // {
+      (sources."@babel/types-7.12.7" // {
         dependencies = [
           sources."lodash-4.17.20"
         ];
@@ -71444,9 +71411,9 @@ in
       })
       sources."@npmcli/node-gyp-1.0.1"
       sources."@npmcli/promise-spawn-1.3.2"
-      sources."@npmcli/run-script-1.8.0"
+      sources."@npmcli/run-script-1.8.1"
       sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3"
-      sources."@react-native-community/cli-debugger-ui-4.9.0"
+      sources."@react-native-community/cli-debugger-ui-4.13.1"
       (sources."@react-native-community/cli-platform-android-4.13.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -71769,7 +71736,7 @@ in
       })
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001159"
+      sources."caniuse-lite-1.0.30001161"
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       (sources."chalk-4.1.0" // {
@@ -71946,7 +71913,7 @@ in
       sources."cssnano-util-same-parent-4.0.1"
       (sources."csso-4.1.1" // {
         dependencies = [
-          sources."css-tree-1.1.0"
+          sources."css-tree-1.1.1"
           sources."mdn-data-2.0.14"
           sources."source-map-0.6.1"
         ];
@@ -71956,7 +71923,7 @@ in
       sources."dashdash-1.14.1"
       sources."dateformat-3.0.3"
       sources."dayjs-1.9.6"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."debuglog-1.0.1"
       sources."decache-4.4.0"
       sources."decamelize-1.2.0"
@@ -71999,7 +71966,7 @@ in
         dependencies = [
           sources."@types/glob-5.0.36"
           sources."@types/node-8.10.66"
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."rimraf-2.7.1"
           sources."sudo-prompt-8.2.5"
         ];
@@ -72028,7 +71995,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.598"
+      sources."electron-to-chromium-1.3.606"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -72871,7 +72838,7 @@ in
       (sources."portfinder-1.0.28" // {
         dependencies = [
           sources."async-2.6.3"
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."posix-character-classes-0.1.1"
@@ -73308,7 +73275,7 @@ in
       })
       (sources."sockjs-client-1.4.0" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."faye-websocket-0.11.3"
         ];
       })
@@ -73372,8 +73339,8 @@ in
           sources."is-fullwidth-code-point-3.0.0"
         ];
       })
-      sources."string.prototype.trimend-1.0.2"
-      sources."string.prototype.trimstart-1.0.2"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
       (sources."stringify-object-3.3.0" // {
         dependencies = [
@@ -74014,10 +73981,10 @@ in
   fauna-shell = nodeEnv.buildNodePackage {
     name = "fauna-shell";
     packageName = "fauna-shell";
-    version = "0.11.5";
+    version = "0.12.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.11.5.tgz";
-      sha512 = "0/PujreRi2BsZoyvp5N48xaMWLow2GsNz7AY7bdW+0/DAj6F++7kQY7OotmiPlVX2idYL9QJswAcgy1ksRtF9A==";
+      url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.1.tgz";
+      sha512 = "3mI3r9pj/8XOKXlBd/pcSALey1/XJpa/YMluuJQtRI2vwpuAVRi0XdgRXiKzdA2CJFi0o3gZpqEgn7+TMJm8ZA==";
     };
     dependencies = [
       (sources."@heroku-cli/color-1.1.14" // {
@@ -74057,7 +74024,7 @@ in
       sources."@oclif/parser-3.8.5"
       (sources."@oclif/plugin-autocomplete-0.1.5" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."fs-extra-6.0.1"
         ];
       })
@@ -74074,6 +74041,7 @@ in
       })
       sources."@oclif/screen-1.0.4"
       sources."@sindresorhus/is-0.7.0"
+      sources."abort-controller-3.0.0"
       sources."ajv-6.12.6"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-5.0.0"
@@ -74139,7 +74107,7 @@ in
           sources."kind-of-5.1.0"
         ];
       })
-      sources."clean-stack-3.0.0"
+      sources."clean-stack-3.0.1"
       sources."cli-table-0.3.1"
       (sources."cli-ux-4.9.3" // {
         dependencies = [
@@ -74173,7 +74141,7 @@ in
         ];
       })
       sources."dashdash-1.14.1"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decode-uri-component-0.2.0"
       sources."decompress-response-3.3.0"
       sources."deep-is-0.1.3"
@@ -74189,6 +74157,7 @@ in
       sources."esprima-4.0.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
+      sources."event-target-shim-5.0.1"
       sources."execa-0.10.0"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
@@ -74229,7 +74198,7 @@ in
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
       sources."fastq-1.9.0"
-      sources."faunadb-3.0.1"
+      sources."faunadb-git+https://github.com/fauna/faunadb-js.git#triage/bearer-to-basic"
       sources."fill-range-7.0.1"
       sources."fn-annotate-1.2.0"
       sources."for-in-1.0.2"
@@ -74368,7 +74337,7 @@ in
       sources."nanomatch-1.2.13"
       (sources."netrc-parser-3.1.6" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."nice-try-1.0.5"
@@ -74769,10 +74738,10 @@ in
   forever = nodeEnv.buildNodePackage {
     name = "forever";
     packageName = "forever";
-    version = "3.0.2";
+    version = "3.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/forever/-/forever-3.0.2.tgz";
-      sha512 = "GKZLVs3RQh52kF3kuCrlR1e5npaOqomQzTQryZOFJZ9GKNqLya75LSn1rdjFQ8XixwX3jT76pIJmtGN4XXv1aw==";
+      url = "https://registry.npmjs.org/forever/-/forever-3.0.4.tgz";
+      sha512 = "MZDQu9nxVavSOez+k0MGdoe9/0tGN/QfAj3Xn8OjJbRYlLghq/3isf5c2xt280x04EVKguU9/tmLE74259Xazw==";
     };
     dependencies = [
       sources."ansi-regex-2.1.1"
@@ -74808,8 +74777,8 @@ in
         dependencies = [
           sources."async-0.2.9"
           sources."cliff-0.1.9"
+          sources."eventemitter2-0.4.14"
           sources."nconf-0.6.9"
-          sources."utile-0.2.1"
           sources."winston-0.8.0"
         ];
       })
@@ -74862,7 +74831,7 @@ in
       sources."es-abstract-1.18.0-next.1"
       sources."es-to-primitive-1.2.1"
       sources."event-stream-3.3.4"
-      sources."eventemitter2-0.4.14"
+      sources."eventemitter2-6.4.3"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -74900,7 +74869,7 @@ in
       })
       sources."flatiron-0.4.3"
       sources."for-in-1.0.2"
-      sources."forever-monitor-3.0.1"
+      sources."forever-monitor-3.0.3"
       sources."fragment-cache-0.2.1"
       sources."from-0.1.7"
       sources."fs.realpath-1.0.0"
@@ -74976,7 +74945,11 @@ in
       sources."nconf-0.10.0"
       sources."ncp-0.4.2"
       sources."normalize-path-3.0.0"
-      sources."nssocket-0.6.0"
+      (sources."nssocket-0.6.0" // {
+        dependencies = [
+          sources."eventemitter2-0.4.14"
+        ];
+      })
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
@@ -75014,12 +74987,7 @@ in
         ];
       })
       sources."process-nextick-args-2.0.1"
-      (sources."prompt-0.2.14" // {
-        dependencies = [
-          sources."async-0.2.10"
-          sources."utile-0.2.1"
-        ];
-      })
+      sources."prompt-0.2.14"
       sources."ps-tree-1.2.0"
       sources."read-1.0.7"
       sources."readable-stream-2.3.7"
@@ -75102,8 +75070,8 @@ in
       })
       sources."stream-combiner-0.0.4"
       sources."string-width-1.0.2"
-      sources."string.prototype.trimend-1.0.2"
-      sources."string.prototype.trimstart-1.0.2"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-0.1.3"
@@ -75139,11 +75107,9 @@ in
       sources."urix-0.1.0"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
-      (sources."utile-0.3.0" // {
+      (sources."utile-0.2.1" // {
         dependencies = [
-          sources."async-0.9.2"
-          sources."deep-equal-0.2.2"
-          sources."ncp-1.0.1"
+          sources."async-0.2.10"
         ];
       })
       sources."window-size-0.1.4"
@@ -75243,7 +75209,7 @@ in
     };
     dependencies = [
       sources."async-2.6.3"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."lodash-4.17.20"
       sources."lodash.groupby-4.6.0"
       sources."microee-0.0.6"
@@ -75275,7 +75241,7 @@ in
       sources."chloride-2.3.0"
       sources."chloride-test-1.2.4"
       sources."commander-2.20.3"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."deep-extend-0.6.0"
       sources."diff-3.5.0"
       sources."discontinuous-range-1.0.0"
@@ -75288,7 +75254,7 @@ in
       sources."git-remote-ssb-2.0.4"
       sources."git-ssb-web-2.8.0"
       sources."hashlru-2.3.0"
-      sources."highlight.js-9.18.3"
+      sources."highlight.js-9.18.5"
       sources."increment-buffer-1.0.1"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
@@ -75320,7 +75286,7 @@ in
       sources."multiserver-address-1.0.1"
       sources."multiserver-scopes-1.0.0"
       sources."muxrpc-6.5.1"
-      sources."nearley-2.19.7"
+      sources."nearley-2.19.8"
       sources."node-gyp-build-4.2.3"
       sources."node-polyglot-1.0.0"
       sources."non-private-ip-1.4.4"
@@ -75778,13 +75744,13 @@ in
           sources."@graphql-tools/utils-7.0.2"
         ];
       })
-      (sources."@graphql-tools/graphql-file-loader-6.2.5" // {
+      (sources."@graphql-tools/graphql-file-loader-6.2.6" // {
         dependencies = [
           sources."@graphql-tools/utils-7.0.2"
         ];
       })
-      sources."@graphql-tools/import-6.2.4"
-      (sources."@graphql-tools/json-file-loader-6.2.5" // {
+      sources."@graphql-tools/import-6.2.5"
+      (sources."@graphql-tools/json-file-loader-6.2.6" // {
         dependencies = [
           sources."@graphql-tools/utils-7.0.2"
         ];
@@ -75818,7 +75784,7 @@ in
       sources."@nodelib/fs.walk-1.2.4"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/parse-json-4.0.0"
       sources."@types/websocket-1.0.1"
       sources."aggregate-error-3.1.0"
@@ -75863,7 +75829,6 @@ in
           sources."tslib-1.14.1"
         ];
       })
-      sources."camelcase-5.3.1"
       sources."caseless-0.12.0"
       sources."chalk-4.1.0"
       sources."chardet-0.7.0"
@@ -75872,7 +75837,7 @@ in
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-2.5.0"
       sources."cli-width-3.0.0"
-      (sources."cliui-6.0.0" // {
+      (sources."cliui-7.0.4" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."strip-ansi-6.0.0"
@@ -75902,8 +75867,7 @@ in
       sources."d-1.0.1"
       sources."dashdash-1.14.1"
       sources."dataloader-2.0.0"
-      sources."debug-4.3.0"
-      sources."decamelize-1.2.0"
+      sources."debug-4.3.1"
       sources."decompress-response-3.3.0"
       sources."deep-equal-2.0.4"
       sources."deep-extend-0.6.0"
@@ -75950,7 +75914,6 @@ in
       sources."figures-3.2.0"
       sources."fill-range-7.0.1"
       sources."filter-obj-2.0.1"
-      sources."find-up-4.1.0"
       sources."foreach-2.0.5"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -76065,7 +76028,6 @@ in
       sources."keyv-3.1.0"
       sources."latest-version-5.1.0"
       sources."lines-and-columns-1.1.6"
-      sources."locate-path-5.0.0"
       sources."lodash-4.17.20"
       sources."lodash.toarray-4.4.0"
       (sources."log-symbols-2.2.0" // {
@@ -76120,13 +76082,13 @@ in
       sources."npm-run-path-2.0.2"
       sources."oas-kit-common-1.0.8"
       sources."oas-linter-3.2.1"
-      (sources."oas-resolver-2.5.2" // {
+      (sources."oas-resolver-2.5.3" // {
         dependencies = [
-          sources."yargs-15.4.1"
+          sources."yargs-16.1.1"
         ];
       })
       sources."oas-schema-walker-1.1.5"
-      sources."oas-validator-5.0.3"
+      sources."oas-validator-5.0.4"
       sources."oauth-sign-0.9.0"
       sources."object-inspect-1.8.0"
       sources."object-is-1.1.3"
@@ -76154,11 +76116,6 @@ in
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
       sources."p-limit-3.0.2"
-      (sources."p-locate-4.1.0" // {
-        dependencies = [
-          sources."p-limit-2.3.0"
-        ];
-      })
       sources."p-some-4.1.0"
       sources."p-try-2.2.0"
       (sources."package-json-6.5.0" // {
@@ -76175,7 +76132,6 @@ in
         ];
       })
       sources."passwd-user-3.0.0"
-      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
       sources."path-type-4.0.0"
@@ -76188,7 +76144,7 @@ in
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."rc-1.2.8"
-      sources."reftools-1.1.6"
+      sources."reftools-1.1.7"
       (sources."regexp.prototype.flags-1.3.0" // {
         dependencies = [
           sources."es-abstract-1.17.7"
@@ -76199,7 +76155,6 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."request-2.88.2"
       sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
       sources."resolve-from-5.0.0"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
@@ -76215,7 +76170,6 @@ in
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."semver-5.7.1"
-      sources."set-blocking-2.0.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."should-13.2.3"
@@ -76237,16 +76191,16 @@ in
           sources."strip-ansi-6.0.0"
         ];
       })
-      sources."string.prototype.trimend-1.0.2"
-      sources."string.prototype.trimstart-1.0.2"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."strip-ansi-5.2.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."subscriptions-transport-ws-0.9.18"
       sources."supports-color-7.2.0"
-      (sources."swagger2openapi-7.0.3" // {
+      (sources."swagger2openapi-7.0.4" // {
         dependencies = [
-          sources."yargs-15.4.1"
+          sources."yargs-16.1.1"
         ];
       })
       sources."symbol-observable-1.2.0"
@@ -76281,13 +76235,12 @@ in
       sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.1"
       sources."which-collection-1.0.1"
-      sources."which-module-2.0.0"
       (sources."which-typed-array-1.1.2" // {
         dependencies = [
           sources."es-abstract-1.17.7"
         ];
       })
-      (sources."wrap-ansi-6.2.0" // {
+      (sources."wrap-ansi-7.0.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."strip-ansi-6.0.0"
@@ -76295,21 +76248,12 @@ in
       })
       sources."wrappy-1.0.2"
       sources."ws-5.2.2"
-      sources."y18n-4.0.0"
+      sources."y18n-5.0.5"
       sources."yaeti-0.0.6"
       sources."yallist-4.0.0"
       sources."yaml-1.10.0"
-      (sources."yargs-16.0.3" // {
-        dependencies = [
-          sources."ansi-regex-5.0.0"
-          sources."cliui-7.0.4"
-          sources."strip-ansi-6.0.0"
-          sources."wrap-ansi-7.0.0"
-          sources."y18n-5.0.5"
-          sources."yargs-parser-20.2.4"
-        ];
-      })
-      sources."yargs-parser-18.1.3"
+      sources."yargs-16.0.3"
+      sources."yargs-parser-20.2.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -76608,6 +76552,50 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  gqlint = nodeEnv.buildNodePackage {
+    name = "gqlint";
+    packageName = "gqlint";
+    version = "1.8.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/gqlint/-/gqlint-1.8.0.tgz";
+      sha512 = "X5tNjxscqbH8xHXubB8kY6yGt11krk+RuB6N/zI2B2RdRadzwavBRMAHkIJzp2RpFgliF08UqP/p+spS/aNd5w==";
+    };
+    dependencies = [
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."babel-code-frame-6.26.0"
+      sources."chalk-1.1.3"
+      sources."commander-2.20.3"
+      sources."encoding-0.1.13"
+      sources."escape-string-regexp-1.0.5"
+      sources."esutils-2.0.3"
+      sources."graphql-14.7.0"
+      sources."has-ansi-2.0.0"
+      sources."iconv-lite-0.6.2"
+      sources."is-stream-1.1.0"
+      sources."iterall-1.3.0"
+      sources."js-tokens-3.0.2"
+      sources."lodash-4.17.20"
+      sources."node-fetch-1.7.3"
+      sources."pad-component-0.0.1"
+      sources."pluralize-5.1.0"
+      sources."prettier-1.19.1"
+      sources."safer-buffer-2.1.2"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."text-table-0.2.0"
+      sources."wordwrap-1.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "GraphQL Linter";
+      homepage = "https://github.com/happylinks/gqlint#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   gtop = nodeEnv.buildNodePackage {
     name = "gtop";
     packageName = "gtop";
@@ -77557,7 +77545,7 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.6.1"
-      sources."uglify-js-3.11.6"
+      sources."uglify-js-3.12.0"
       sources."upper-case-1.1.3"
     ];
     buildInputs = globalBuildInputs;
@@ -77677,7 +77665,7 @@ in
       sources."basic-auth-1.1.0"
       sources."colors-1.4.0"
       sources."corser-2.0.1"
-      sources."debug-3.2.6"
+      sources."debug-3.2.7"
       sources."ecstatic-3.3.2"
       sources."eventemitter3-4.0.7"
       sources."follow-redirects-1.13.0"
@@ -78304,7 +78292,7 @@ in
       sources."core-util-is-1.0.2"
       sources."cross-spawn-7.0.3"
       sources."data-uri-to-buffer-3.0.1"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."deep-is-0.1.3"
       sources."degenerator-2.2.0"
       sources."delayed-stream-1.0.0"
@@ -78502,7 +78490,7 @@ in
       sources."superagent-4.1.0"
       (sources."superagent-proxy-2.1.0" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."supports-color-7.2.0"
@@ -78558,9 +78546,9 @@ in
     };
     dependencies = [
       sources."@iarna/toml-2.2.5"
-      sources."@ot-builder/bin-composite-types-0.10.33"
-      sources."@ot-builder/bin-util-0.10.33"
-      (sources."@ot-builder/cli-help-shower-0.10.33" // {
+      sources."@ot-builder/bin-composite-types-0.10.34"
+      sources."@ot-builder/bin-util-0.10.34"
+      (sources."@ot-builder/cli-help-shower-0.10.34" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
@@ -78570,7 +78558,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      (sources."@ot-builder/cli-proc-0.10.33" // {
+      (sources."@ot-builder/cli-proc-0.10.34" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
@@ -78580,7 +78568,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      (sources."@ot-builder/cli-shared-0.10.33" // {
+      (sources."@ot-builder/cli-shared-0.10.34" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
@@ -78590,35 +78578,35 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."@ot-builder/common-impl-0.10.33"
-      sources."@ot-builder/errors-0.10.33"
-      sources."@ot-builder/io-bin-cff-0.10.33"
-      sources."@ot-builder/io-bin-encoding-0.10.33"
-      sources."@ot-builder/io-bin-ext-private-0.10.33"
-      sources."@ot-builder/io-bin-font-0.10.33"
-      sources."@ot-builder/io-bin-glyph-store-0.10.33"
-      sources."@ot-builder/io-bin-layout-0.10.33"
-      sources."@ot-builder/io-bin-metadata-0.10.33"
-      sources."@ot-builder/io-bin-metric-0.10.33"
-      sources."@ot-builder/io-bin-name-0.10.33"
-      sources."@ot-builder/io-bin-sfnt-0.10.33"
-      sources."@ot-builder/io-bin-ttf-0.10.33"
-      sources."@ot-builder/ot-0.10.33"
-      sources."@ot-builder/ot-encoding-0.10.33"
-      sources."@ot-builder/ot-ext-private-0.10.33"
-      sources."@ot-builder/ot-glyphs-0.10.33"
-      sources."@ot-builder/ot-layout-0.10.33"
-      sources."@ot-builder/ot-metadata-0.10.33"
-      sources."@ot-builder/ot-name-0.10.33"
-      sources."@ot-builder/ot-sfnt-0.10.33"
-      sources."@ot-builder/ot-standard-glyph-namer-0.10.33"
-      sources."@ot-builder/prelude-0.10.33"
-      sources."@ot-builder/primitive-0.10.33"
-      sources."@ot-builder/rectify-0.10.33"
-      sources."@ot-builder/stat-glyphs-0.10.33"
-      sources."@ot-builder/trace-0.10.33"
-      sources."@ot-builder/var-store-0.10.33"
-      sources."@ot-builder/variance-0.10.33"
+      sources."@ot-builder/common-impl-0.10.34"
+      sources."@ot-builder/errors-0.10.34"
+      sources."@ot-builder/io-bin-cff-0.10.34"
+      sources."@ot-builder/io-bin-encoding-0.10.34"
+      sources."@ot-builder/io-bin-ext-private-0.10.34"
+      sources."@ot-builder/io-bin-font-0.10.34"
+      sources."@ot-builder/io-bin-glyph-store-0.10.34"
+      sources."@ot-builder/io-bin-layout-0.10.34"
+      sources."@ot-builder/io-bin-metadata-0.10.34"
+      sources."@ot-builder/io-bin-metric-0.10.34"
+      sources."@ot-builder/io-bin-name-0.10.34"
+      sources."@ot-builder/io-bin-sfnt-0.10.34"
+      sources."@ot-builder/io-bin-ttf-0.10.34"
+      sources."@ot-builder/ot-0.10.34"
+      sources."@ot-builder/ot-encoding-0.10.34"
+      sources."@ot-builder/ot-ext-private-0.10.34"
+      sources."@ot-builder/ot-glyphs-0.10.34"
+      sources."@ot-builder/ot-layout-0.10.34"
+      sources."@ot-builder/ot-metadata-0.10.34"
+      sources."@ot-builder/ot-name-0.10.34"
+      sources."@ot-builder/ot-sfnt-0.10.34"
+      sources."@ot-builder/ot-standard-glyph-namer-0.10.34"
+      sources."@ot-builder/prelude-0.10.34"
+      sources."@ot-builder/primitive-0.10.34"
+      sources."@ot-builder/rectify-0.10.34"
+      sources."@ot-builder/stat-glyphs-0.10.34"
+      sources."@ot-builder/trace-0.10.34"
+      sources."@ot-builder/var-store-0.10.34"
+      sources."@ot-builder/variance-0.10.34"
       sources."@unicode/unicode-13.0.0-1.0.2"
       sources."abbrev-1.1.1"
       sources."ajv-6.12.6"
@@ -78789,8 +78777,8 @@ in
       sources."os-locale-1.4.0"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
-      sources."ot-builder-0.10.33"
-      (sources."otb-ttc-bundle-0.10.33" // {
+      sources."ot-builder-0.10.34"
+      (sources."otb-ttc-bundle-0.10.34" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
@@ -79083,14 +79071,14 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.12.5"
-      sources."@babel/template-7.10.4"
-      (sources."@babel/traverse-7.12.5" // {
+      sources."@babel/parser-7.12.7"
+      sources."@babel/template-7.12.7"
+      (sources."@babel/traverse-7.12.8" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
         ];
       })
-      sources."@babel/types-7.12.6"
+      sources."@babel/types-7.12.7"
       sources."@braintree/sanitize-url-3.1.0"
       sources."@cronvel/get-pixels-3.4.0"
       sources."@joplinapp/fork-htmlparser2-4.1.8"
@@ -79103,12 +79091,6 @@ in
           sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support"
         ];
       })
-      (sources."@shiftkey/node-abi-2.19.2-pre" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
-      sources."@shiftkey/prebuild-install-6.0.1-pre2"
       sources."abab-2.0.5"
       sources."abbrev-1.1.1"
       sources."acorn-7.4.1"
@@ -79143,7 +79125,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.794.0" // {
+      (sources."aws-sdk-2.798.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -79251,7 +79233,7 @@ in
       sources."dagre-d3-0.6.4"
       sources."dashdash-1.14.1"
       sources."data-urls-1.1.0"
-      sources."debug-3.2.6"
+      sources."debug-3.2.7"
       sources."decode-uri-component-0.2.0"
       sources."decompress-response-4.2.1"
       sources."deep-extend-0.6.0"
@@ -79344,7 +79326,7 @@ in
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
       sources."he-1.2.0"
-      sources."highlight.js-10.3.2"
+      sources."highlight.js-10.4.0"
       sources."html-encoding-sniffer-1.0.2"
       sources."html-entities-1.3.1"
       sources."html-minifier-3.5.21"
@@ -79453,7 +79435,7 @@ in
           sources."commander-2.20.3"
         ];
       })
-      sources."keytar-7.1.0"
+      sources."keytar-7.2.0"
       sources."khroma-1.1.0"
       sources."klaw-1.3.1"
       sources."lazyness-1.2.0"
@@ -79497,7 +79479,7 @@ in
       })
       sources."markdown-it-sub-1.0.0"
       sources."markdown-it-sup-1.0.0"
-      sources."markdown-it-toc-done-right-4.1.0"
+      sources."markdown-it-toc-done-right-4.2.0"
       sources."md5-2.3.0"
       sources."md5-file-4.0.0"
       sources."mdurl-1.0.1"
@@ -79508,9 +79490,9 @@ in
       (sources."minify-4.1.3" // {
         dependencies = [
           sources."commander-2.20.3"
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."html-minifier-4.0.0"
-          sources."uglify-js-3.11.6"
+          sources."uglify-js-3.12.0"
         ];
       })
       sources."minimatch-3.0.4"
@@ -79525,7 +79507,7 @@ in
       sources."multiparty-4.2.2"
       sources."mustache-4.0.1"
       sources."nan-2.14.2"
-      sources."nanoid-3.1.16"
+      sources."nanoid-3.1.18"
       sources."napi-build-utils-1.0.2"
       sources."ndarray-1.0.19"
       sources."ndarray-pack-1.2.1"
@@ -79881,7 +79863,7 @@ in
       sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ==";
     };
     dependencies = [
-      sources."@babel/parser-7.12.5"
+      sources."@babel/parser-7.12.7"
       sources."argparse-1.0.10"
       sources."bluebird-3.7.2"
       sources."catharsis-0.8.11"
@@ -80026,7 +80008,7 @@ in
       sources."component-emitter-1.3.0"
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
-      sources."debug-3.2.6"
+      sources."debug-3.2.7"
       sources."delayed-stream-1.0.0"
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
@@ -80211,7 +80193,7 @@ in
         ];
       })
       sources."ms-2.0.0"
-      sources."nanoid-3.1.16"
+      sources."nanoid-3.1.18"
       sources."negotiator-0.6.2"
       sources."normalize-url-4.5.0"
       sources."object-assign-4.1.1"
@@ -80437,7 +80419,7 @@ in
       sources."lodash-4.17.20"
       (sources."log4js-6.3.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -80506,7 +80488,7 @@ in
       (sources."streamroller-2.2.4" // {
         dependencies = [
           sources."date-format-2.1.0"
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -81038,7 +81020,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/normalize-package-data-2.4.0"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
@@ -81458,7 +81440,6 @@ in
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
-      sources."is-negative-zero-2.0.0"
       (sources."is-number-3.0.0" // {
         dependencies = [
           sources."kind-of-3.2.2"
@@ -81817,16 +81798,8 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -81863,7 +81836,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.11.6"
+      sources."uglify-js-3.12.0"
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
       sources."union-value-1.0.1"
@@ -82848,25 +82821,24 @@ in
     src = ../interpreters/clojurescript/lumo;
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/compat-data-7.12.5"
-      sources."@babel/core-7.12.3"
+      sources."@babel/compat-data-7.12.7"
+      sources."@babel/core-7.12.8"
       sources."@babel/generator-7.12.5"
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
       sources."@babel/helper-compilation-targets-7.12.5"
       sources."@babel/helper-create-class-features-plugin-7.12.1"
-      sources."@babel/helper-create-regexp-features-plugin-7.12.1"
+      sources."@babel/helper-create-regexp-features-plugin-7.12.7"
       sources."@babel/helper-define-map-7.10.5"
       sources."@babel/helper-explode-assignable-expression-7.12.1"
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-hoist-variables-7.10.4"
-      sources."@babel/helper-member-expression-to-functions-7.12.1"
+      sources."@babel/helper-member-expression-to-functions-7.12.7"
       sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
-      sources."@babel/helper-optimise-call-expression-7.10.4"
+      sources."@babel/helper-optimise-call-expression-7.12.7"
       sources."@babel/helper-plugin-utils-7.10.4"
-      sources."@babel/helper-regex-7.10.5"
       sources."@babel/helper-remap-async-to-generator-7.12.1"
       sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
@@ -82881,7 +82853,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.12.5"
+      sources."@babel/parser-7.12.7"
       sources."@babel/plugin-external-helpers-7.8.3"
       sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
@@ -82890,10 +82862,10 @@ in
       sources."@babel/plugin-proposal-json-strings-7.12.1"
       sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-      sources."@babel/plugin-proposal-numeric-separator-7.12.5"
+      sources."@babel/plugin-proposal-numeric-separator-7.12.7"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
-      sources."@babel/plugin-proposal-optional-chaining-7.12.1"
+      sources."@babel/plugin-proposal-optional-chaining-7.12.7"
       sources."@babel/plugin-proposal-private-methods-7.12.1"
       sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -82938,18 +82910,18 @@ in
       sources."@babel/plugin-transform-runtime-7.12.1"
       sources."@babel/plugin-transform-shorthand-properties-7.12.1"
       sources."@babel/plugin-transform-spread-7.12.1"
-      sources."@babel/plugin-transform-sticky-regex-7.12.1"
+      sources."@babel/plugin-transform-sticky-regex-7.12.7"
       sources."@babel/plugin-transform-template-literals-7.12.1"
       sources."@babel/plugin-transform-typeof-symbol-7.12.1"
       sources."@babel/plugin-transform-unicode-escapes-7.12.1"
       sources."@babel/plugin-transform-unicode-regex-7.12.1"
-      sources."@babel/preset-env-7.12.1"
+      sources."@babel/preset-env-7.12.7"
       sources."@babel/preset-modules-0.1.4"
       sources."@babel/preset-stage-2-7.8.3"
       sources."@babel/runtime-7.12.5"
-      sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.6"
+      sources."@babel/template-7.12.7"
+      sources."@babel/traverse-7.12.8"
+      sources."@babel/types-7.12.7"
       sources."@cnakazawa/watch-1.0.4"
       sources."@comandeer/babel-plugin-banner-5.0.0"
       sources."@istanbuljs/load-nyc-config-1.1.0"
@@ -82970,7 +82942,7 @@ in
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-0.0.8"
       sources."@types/yargs-15.0.10"
@@ -83144,7 +83116,7 @@ in
       sources."cached-path-relative-1.0.2"
       sources."call-bind-1.0.0"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001159"
+      sources."caniuse-lite-1.0.30001161"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       (sources."chalk-3.0.0" // {
@@ -83248,7 +83220,7 @@ in
       sources."dash-ast-1.0.0"
       sources."dashdash-1.14.1"
       sources."death-1.1.0"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
       sources."define-properties-1.1.3"
@@ -83268,7 +83240,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.598"
+      sources."electron-to-chromium-1.3.606"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -84071,7 +84043,7 @@ in
       sources."link-check-4.5.2"
       sources."lodash-4.17.20"
       sources."markdown-link-extractor-1.2.6"
-      sources."marked-1.2.4"
+      sources."marked-1.2.5"
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
       sources."ms-2.1.2"
@@ -84106,10 +84078,10 @@ in
   mastodon-bot = nodeEnv.buildNodePackage {
     name = "mastodon-bot";
     packageName = "mastodon-bot";
-    version = "1.0.4";
+    version = "1.10.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.0.4.tgz";
-      sha512 = "gErqy0H3MtARqamwEvhTYfefesjgvDMohmrfF4PrOhh9iFa/LxKRoDJtpCEGWgcMnb+C1GlFRBzNkDJtwgUmyA==";
+      url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.10.0.tgz";
+      sha512 = "QRgdYB8llfN6iVpDXSXjJJ7b2fQRoT3hZJdPIUBX9aN1ci0mZlTX3mITcxXbmGtIyBHBhLavHwwxaBzYYuosqw==";
     };
     dependencies = [
       sources."acorn-5.7.4"
@@ -84137,7 +84109,7 @@ in
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."beeper-1.1.1"
-      sources."bindings-1.2.1"
+      sources."bindings-1.5.0"
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
       sources."bufferstreams-1.1.3"
@@ -84160,7 +84132,7 @@ in
       sources."d-1.0.1"
       sources."dashdash-1.14.1"
       sources."dateformat-2.2.0"
-      sources."deasync-0.1.15"
+      sources."deasync-0.1.20"
       sources."debug-2.6.9"
       sources."deep-extend-0.5.1"
       sources."deep-is-0.1.3"
@@ -84217,6 +84189,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."figures-1.7.0"
       sources."file-entry-cache-2.0.0"
+      sources."file-uri-to-path-1.0.0"
       sources."flat-cache-1.3.4"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -84461,7 +84434,7 @@ in
       sha512 = "X9I7gwvqKVdqVvqi9AVfUWXnHQQYjssWJ2asKfhBDAkQn0vPagKkx6EjzKcRgyIroWGXN6ZpwkQ/gMvTPFlx7g==";
     };
     dependencies = [
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/yauzl-2.9.1"
       sources."agent-base-5.1.1"
       sources."ansi-styles-4.3.0"
@@ -84477,7 +84450,7 @@ in
       sources."color-name-1.1.4"
       sources."commander-6.2.0"
       sources."concat-map-0.0.1"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."devtools-protocol-0.0.818844"
       sources."end-of-stream-1.4.4"
       sources."extract-zip-2.0.1"
@@ -84545,13 +84518,17 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.150.1"
-      sources."@fluentui/react-focus-7.16.18"
+      sources."@fluentui/react-7.152.2"
+      sources."@fluentui/react-compose-0.19.12"
+      sources."@fluentui/react-focus-7.16.19"
+      sources."@fluentui/react-stylesheets-0.2.4"
+      sources."@fluentui/react-theme-provider-0.18.0"
       sources."@fluentui/react-window-provider-1.0.1"
       sources."@fluentui/theme-1.7.0"
       sources."@microsoft/load-themed-styles-1.10.136"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
+      sources."@types/classnames-2.2.11"
       sources."@uifabric/foundation-7.9.20"
       sources."@uifabric/icons-7.5.17"
       sources."@uifabric/merge-styles-7.19.1"
@@ -84590,6 +84567,7 @@ in
       })
       sources."chalk-1.1.3"
       sources."chardet-0.4.2"
+      sources."classnames-2.2.6"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.1"
       sources."clone-response-1.0.2"
@@ -84684,7 +84662,7 @@ in
       sources."node-fetch-1.6.3"
       sources."normalize-url-4.5.0"
       sources."object-assign-4.1.1"
-      sources."office-ui-fabric-react-7.150.1"
+      sources."office-ui-fabric-react-7.152.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -84783,7 +84761,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
       sources."swagger-schema-official-2.0.0-bab6bed"
-      sources."swagger-ui-dist-3.36.2"
+      sources."swagger-ui-dist-3.37.0"
       sources."tail-2.0.4"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
@@ -84959,7 +84937,7 @@ in
       sources."component-emitter-1.3.0"
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
-      sources."debug-3.2.6"
+      sources."debug-3.2.7"
       sources."delayed-stream-1.0.0"
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
@@ -85070,15 +85048,15 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "2.68.5";
+    version = "2.68.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.68.5.tgz";
-      sha512 = "QEvYSfvIvMMN1are5UdbkSD95w6UAnyvC6EavB5nvdgCF65SzyOTPhe8zTmGzAspfzFP5/GnHrDlAsWOEM9IVg==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.68.7.tgz";
+      sha512 = "HbOaT0RL+AHXaeQYEiJlTC0IIYkaYgpCK8ByHrwUYCXunHW9/MWMSXs5Cg9grVMgD36qL1A5E7ljrJjWUFvwcA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/compat-data-7.12.5"
-      (sources."@babel/core-7.12.3" // {
+      sources."@babel/compat-data-7.12.7"
+      (sources."@babel/core-7.12.8" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
@@ -85092,18 +85070,17 @@ in
         ];
       })
       sources."@babel/helper-create-class-features-plugin-7.12.1"
-      sources."@babel/helper-create-regexp-features-plugin-7.12.1"
+      sources."@babel/helper-create-regexp-features-plugin-7.12.7"
       sources."@babel/helper-define-map-7.10.5"
       sources."@babel/helper-explode-assignable-expression-7.12.1"
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-hoist-variables-7.10.4"
-      sources."@babel/helper-member-expression-to-functions-7.12.1"
+      sources."@babel/helper-member-expression-to-functions-7.12.7"
       sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
-      sources."@babel/helper-optimise-call-expression-7.10.4"
+      sources."@babel/helper-optimise-call-expression-7.12.7"
       sources."@babel/helper-plugin-utils-7.10.4"
-      sources."@babel/helper-regex-7.10.5"
       sources."@babel/helper-remap-async-to-generator-7.12.1"
       sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
@@ -85114,7 +85091,7 @@ in
       sources."@babel/helper-wrap-function-7.12.3"
       sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.5"
+      sources."@babel/parser-7.12.7"
       sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
       sources."@babel/plugin-proposal-dynamic-import-7.12.1"
@@ -85122,10 +85099,10 @@ in
       sources."@babel/plugin-proposal-json-strings-7.12.1"
       sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-      sources."@babel/plugin-proposal-numeric-separator-7.12.5"
+      sources."@babel/plugin-proposal-numeric-separator-7.12.7"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
-      sources."@babel/plugin-proposal-optional-chaining-7.12.1"
+      sources."@babel/plugin-proposal-optional-chaining-7.12.7"
       sources."@babel/plugin-proposal-private-methods-7.12.1"
       sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -85167,21 +85144,21 @@ in
       sources."@babel/plugin-transform-reserved-words-7.12.1"
       sources."@babel/plugin-transform-shorthand-properties-7.12.1"
       sources."@babel/plugin-transform-spread-7.12.1"
-      sources."@babel/plugin-transform-sticky-regex-7.12.1"
+      sources."@babel/plugin-transform-sticky-regex-7.12.7"
       sources."@babel/plugin-transform-template-literals-7.12.1"
       sources."@babel/plugin-transform-typeof-symbol-7.12.1"
       sources."@babel/plugin-transform-unicode-escapes-7.12.1"
       sources."@babel/plugin-transform-unicode-regex-7.12.1"
-      (sources."@babel/preset-env-7.12.1" // {
+      (sources."@babel/preset-env-7.12.7" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
       })
       sources."@babel/preset-modules-0.1.4"
       sources."@babel/runtime-7.12.5"
-      sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.6"
+      sources."@babel/template-7.12.7"
+      sources."@babel/traverse-7.12.8"
+      sources."@babel/types-7.12.7"
       sources."@bugsnag/browser-7.5.1"
       sources."@bugsnag/core-7.3.5"
       sources."@bugsnag/cuid-3.0.0"
@@ -85191,7 +85168,7 @@ in
       sources."@dabh/diagnostics-2.0.2"
       sources."@jest/types-24.9.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      (sources."@netlify/build-5.3.1" // {
+      (sources."@netlify/build-5.3.2" // {
         dependencies = [
           sources."chalk-3.0.0"
           sources."resolve-2.0.0-next.2"
@@ -85214,13 +85191,13 @@ in
         ];
       })
       sources."@netlify/open-api-0.18.1"
-      sources."@netlify/plugin-edge-handlers-1.9.0"
+      sources."@netlify/plugin-edge-handlers-1.10.0"
       sources."@netlify/run-utils-1.0.5"
-      sources."@netlify/traffic-mesh-agent-0.24.0"
-      sources."@netlify/traffic-mesh-agent-darwin-x64-0.24.0"
-      sources."@netlify/traffic-mesh-agent-linux-x64-0.24.0"
-      sources."@netlify/traffic-mesh-agent-win32-x64-0.24.0"
-      (sources."@netlify/zip-it-and-ship-it-1.4.0" // {
+      sources."@netlify/traffic-mesh-agent-0.26.0"
+      sources."@netlify/traffic-mesh-agent-darwin-x64-0.26.0"
+      sources."@netlify/traffic-mesh-agent-linux-x64-0.26.0"
+      sources."@netlify/traffic-mesh-agent-win32-x64-0.26.0"
+      (sources."@netlify/zip-it-and-ship-it-1.4.1" // {
         dependencies = [
           sources."resolve-2.0.0-next.2"
         ];
@@ -85248,37 +85225,39 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      (sources."@oclif/command-1.6.1" // {
+      (sources."@oclif/command-1.8.0" // {
         dependencies = [
           sources."@oclif/plugin-help-3.2.0"
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
           sources."is-fullwidth-code-point-2.0.0"
-          sources."semver-5.7.1"
           sources."string-width-2.1.1"
           sources."strip-ansi-4.0.0"
           sources."wrap-ansi-4.0.0"
         ];
       })
-      sources."@oclif/config-1.15.1"
-      (sources."@oclif/errors-1.2.2" // {
+      (sources."@oclif/config-1.17.0" // {
         dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."ansi-styles-3.2.1"
-          sources."clean-stack-1.3.0"
-          sources."indent-string-3.2.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          (sources."string-width-2.1.1" // {
-            dependencies = [
-              sources."strip-ansi-4.0.0"
-            ];
-          })
-          sources."strip-ansi-5.2.0"
-          (sources."wrap-ansi-4.0.0" // {
-            dependencies = [
-              sources."strip-ansi-4.0.0"
-            ];
-          })
+          sources."@nodelib/fs.stat-2.0.3"
+          sources."array-union-2.1.0"
+          sources."braces-3.0.2"
+          sources."dir-glob-3.0.1"
+          sources."fast-glob-3.2.4"
+          sources."fill-range-7.0.1"
+          sources."glob-parent-5.1.1"
+          sources."globby-11.0.1"
+          sources."ignore-5.1.8"
+          sources."is-number-7.0.0"
+          sources."micromatch-4.0.2"
+          sources."slash-3.0.0"
+          sources."to-regex-range-5.0.1"
+          sources."tslib-2.0.3"
+        ];
+      })
+      (sources."@oclif/errors-1.3.4" // {
+        dependencies = [
+          sources."clean-stack-3.0.1"
+          sources."wrap-ansi-7.0.0"
         ];
       })
       sources."@oclif/linewrap-1.0.0"
@@ -85309,16 +85288,18 @@ in
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."cli-ux-4.9.3"
+          sources."fs-extra-7.0.1"
           sources."has-flag-3.0.0"
           sources."indent-string-3.2.0"
+          sources."is-wsl-1.1.0"
           sources."semver-5.7.1"
           sources."strip-ansi-5.2.0"
           sources."supports-color-5.5.0"
         ];
       })
-      (sources."@oclif/plugin-plugins-1.9.0" // {
+      (sources."@oclif/plugin-plugins-1.9.4" // {
         dependencies = [
-          sources."npm-run-path-3.1.0"
+          sources."npm-run-path-4.0.1"
           sources."path-key-3.1.1"
           sources."tslib-2.0.3"
         ];
@@ -85386,7 +85367,7 @@ in
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/node-fetch-2.5.7"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse5-5.0.3"
@@ -85456,7 +85437,7 @@ in
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
-      (sources."aws-sdk-2.794.0" // {
+      (sources."aws-sdk-2.798.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -85535,7 +85516,7 @@ in
       sources."call-bind-1.0.0"
       sources."call-me-maybe-1.0.1"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001159"
+      sources."caniuse-lite-1.0.30001161"
       sources."cardinal-2.1.1"
       sources."caw-2.0.1"
       sources."ccount-1.1.0"
@@ -85584,16 +85565,14 @@ in
       sources."cli-cursor-2.1.0"
       sources."cli-progress-3.8.2"
       sources."cli-spinners-2.5.0"
-      (sources."cli-ux-5.4.6" // {
+      (sources."cli-ux-5.5.1" // {
         dependencies = [
           sources."ansi-escapes-4.3.1"
-          sources."emoji-regex-7.0.3"
-          sources."has-flag-3.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."semver-5.7.1"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-          sources."supports-color-5.5.0"
+          sources."chalk-4.1.0"
+          sources."clean-stack-3.0.1"
+          sources."extract-stack-2.0.0"
+          sources."supports-hyperlinks-2.1.0"
+          sources."tslib-2.0.3"
           sources."type-fest-0.11.0"
         ];
       })
@@ -85680,7 +85659,7 @@ in
       sources."crypto-random-string-2.0.0"
       sources."cyclist-1.0.1"
       sources."date-time-2.1.0"
-      (sources."debug-4.3.0" // {
+      (sources."debug-4.3.1" // {
         dependencies = [
           sources."ms-2.1.2"
         ];
@@ -85787,7 +85766,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.598"
+      sources."electron-to-chromium-1.3.606"
       sources."elf-tools-1.1.2"
       (sources."elliptic-6.5.3" // {
         dependencies = [
@@ -85928,7 +85907,7 @@ in
       sources."from2-2.3.0"
       sources."from2-array-0.0.4"
       sources."fs-constants-1.0.0"
-      sources."fs-extra-7.0.1"
+      sources."fs-extra-8.1.0"
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.1.3"
       sources."function-bind-1.1.1"
@@ -86115,7 +86094,6 @@ in
       sources."is-interactive-1.0.0"
       sources."is-module-1.0.0"
       sources."is-natural-number-4.0.1"
-      sources."is-negative-zero-2.0.0"
       sources."is-npm-4.0.0"
       (sources."is-number-3.0.0" // {
         dependencies = [
@@ -86136,7 +86114,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."is-url-1.2.4"
       sources."is-windows-1.0.2"
-      sources."is-wsl-1.1.0"
+      sources."is-wsl-2.2.0"
       sources."is-yarn-global-0.3.0"
       sources."isarray-1.0.0"
       sources."isbuffer-0.0.0"
@@ -86229,7 +86207,6 @@ in
       sources."lodash._reinterpolate-3.0.0"
       sources."lodash.camelcase-4.3.0"
       sources."lodash.clonedeep-4.5.0"
-      sources."lodash.debounce-4.0.8"
       sources."lodash.deburr-4.1.0"
       sources."lodash.defaults-4.2.0"
       sources."lodash.difference-4.5.0"
@@ -86237,15 +86214,10 @@ in
       sources."lodash.flattendeep-4.4.0"
       sources."lodash.get-4.4.2"
       sources."lodash.isempty-4.4.0"
-      sources."lodash.isequal-4.5.0"
       sources."lodash.islength-4.0.1"
-      sources."lodash.isobject-3.0.2"
       sources."lodash.isplainobject-4.0.6"
       sources."lodash.merge-4.6.2"
-      sources."lodash.pick-4.4.0"
-      sources."lodash.sample-4.2.1"
       sources."lodash.set-4.3.2"
-      sources."lodash.snakecase-4.1.1"
       sources."lodash.template-4.5.0"
       sources."lodash.templatesettings-4.2.0"
       sources."lodash.transform-4.6.0"
@@ -86401,12 +86373,12 @@ in
           sources."mimic-fn-2.1.0"
         ];
       })
-      (sources."open-7.3.0" // {
+      sources."open-7.3.0"
+      (sources."opn-5.5.0" // {
         dependencies = [
-          sources."is-wsl-2.2.0"
+          sources."is-wsl-1.1.0"
         ];
       })
-      sources."opn-5.5.0"
       sources."optionator-0.8.3"
       (sources."ora-4.1.1" // {
         dependencies = [
@@ -86703,16 +86675,8 @@ in
       sources."strict-uri-encode-1.1.0"
       sources."string-range-1.2.2"
       sources."string-width-4.2.0"
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -86761,7 +86725,7 @@ in
         ];
       })
       sources."term-size-2.2.1"
-      (sources."terser-5.4.0" // {
+      (sources."terser-5.5.0" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -87395,7 +87359,7 @@ in
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      sources."debug-3.2.6"
+      sources."debug-3.2.7"
       sources."deep-extend-0.6.0"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
@@ -87493,7 +87457,7 @@ in
       sources."accepts-1.3.7"
       (sources."agent-base-6.0.2" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -87677,7 +87641,7 @@ in
       sources."http-signature-1.2.0"
       (sources."https-proxy-agent-5.0.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -87728,7 +87692,7 @@ in
       sources."media-typer-0.3.0"
       (sources."memorystore-1.6.4" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -87755,7 +87719,7 @@ in
       (sources."mqtt-4.2.5" // {
         dependencies = [
           sources."concat-stream-2.0.0"
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
           sources."readable-stream-3.6.0"
           sources."string_decoder-1.3.0"
@@ -87764,7 +87728,7 @@ in
       })
       (sources."mqtt-packet-6.6.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -87775,7 +87739,7 @@ in
       sources."nan-2.14.0"
       (sources."needle-2.5.2" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."ms-2.1.2"
         ];
       })
@@ -88190,7 +88154,7 @@ in
       sources."concat-map-0.0.1"
       sources."configstore-5.0.1"
       sources."crypto-random-string-2.0.0"
-      sources."debug-3.2.6"
+      sources."debug-3.2.7"
       sources."decompress-response-3.3.0"
       sources."deep-extend-0.6.0"
       sources."defer-to-connect-1.1.3"
@@ -88309,10 +88273,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "6.14.8";
+    version = "6.14.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-6.14.8.tgz";
-      sha512 = "HBZVBMYs5blsj94GTeQZel7s9odVuuSUHy1+AlZh7rPVux1os2ashvEGLy/STNK7vUjbrCg5Kq9/GXisJgdf6A==";
+      url = "https://registry.npmjs.org/npm/-/npm-6.14.9.tgz";
+      sha512 = "yHi1+i9LyAZF1gAmgyYtVk+HdABlLy94PMIDoK1TRKWvmFQAt5z3bodqVwKvzY0s6dLqQPVsRLiwhJfNtiHeCg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -88327,10 +88291,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "10.2.1";
+    version = "10.2.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.2.1.tgz";
-      sha512 = "p6FM1JXDs2ZfYZ5pyOPkiIWHi+dldjS26QoVYcfaBgF/SmGBqyU3m0WW/y3PSPvOdb610cnI+wzQxzFxTSx+5Q==";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.2.2.tgz";
+      sha512 = "xyE1PUTu4xarVDRXCA0HYd92rT3zd87GIixczM/TCkwN12/31yVD/8dOyXtgNA8fpIuvhjrfX7n4cV0OTCa9hg==";
     };
     dependencies = [
       sources."@npmcli/ci-detect-1.3.0"
@@ -88339,7 +88303,7 @@ in
       sources."@npmcli/move-file-1.0.1"
       sources."@npmcli/node-gyp-1.0.1"
       sources."@npmcli/promise-spawn-1.3.2"
-      sources."@npmcli/run-script-1.8.0"
+      sources."@npmcli/run-script-1.8.1"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@tootallnate/once-1.1.2"
@@ -88410,7 +88374,7 @@ in
       sources."core-util-is-1.0.2"
       sources."crypto-random-string-2.0.0"
       sources."dashdash-1.14.1"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."debuglog-1.0.1"
       sources."decompress-response-3.3.0"
       sources."deep-extend-0.6.0"
@@ -88437,7 +88401,7 @@ in
       sources."find-up-5.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
-      sources."fp-and-or-0.1.2"
+      sources."fp-and-or-0.1.3"
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
@@ -88661,7 +88625,7 @@ in
     src = fetchgit {
       url = "git://github.com/NixOS/npm2nix.git";
       rev = "0c06be7d278a7f64fc853a5fd42d2031d14496d5";
-      sha256 = "e1b252cd883fd8c5c4618b157d03b3fb869fa6aad4170ef51e34681069d50bf5";
+      sha256 = "ac58ebe43b62e42cdc1754f4d6c6795de9c33fe12b72a858522c9f0ba10b5cee";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -88879,8 +88843,8 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/compat-data-7.12.5"
-      (sources."@babel/core-7.12.3" // {
+      sources."@babel/compat-data-7.12.7"
+      (sources."@babel/core-7.12.8" // {
         dependencies = [
           sources."json5-2.1.3"
           sources."source-map-0.5.7"
@@ -88897,18 +88861,17 @@ in
       sources."@babel/helper-builder-react-jsx-experimental-7.12.4"
       sources."@babel/helper-compilation-targets-7.12.5"
       sources."@babel/helper-create-class-features-plugin-7.12.1"
-      sources."@babel/helper-create-regexp-features-plugin-7.12.1"
+      sources."@babel/helper-create-regexp-features-plugin-7.12.7"
       sources."@babel/helper-define-map-7.10.5"
       sources."@babel/helper-explode-assignable-expression-7.12.1"
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
       sources."@babel/helper-hoist-variables-7.10.4"
-      sources."@babel/helper-member-expression-to-functions-7.12.1"
+      sources."@babel/helper-member-expression-to-functions-7.12.7"
       sources."@babel/helper-module-imports-7.12.5"
       sources."@babel/helper-module-transforms-7.12.1"
-      sources."@babel/helper-optimise-call-expression-7.10.4"
+      sources."@babel/helper-optimise-call-expression-7.12.7"
       sources."@babel/helper-plugin-utils-7.10.4"
-      sources."@babel/helper-regex-7.10.5"
       sources."@babel/helper-remap-async-to-generator-7.12.1"
       sources."@babel/helper-replace-supers-7.12.5"
       sources."@babel/helper-simple-access-7.12.1"
@@ -88919,7 +88882,7 @@ in
       sources."@babel/helper-wrap-function-7.12.3"
       sources."@babel/helpers-7.12.5"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.5"
+      sources."@babel/parser-7.12.7"
       sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
       sources."@babel/plugin-proposal-class-properties-7.12.1"
       sources."@babel/plugin-proposal-dynamic-import-7.12.1"
@@ -88927,10 +88890,10 @@ in
       sources."@babel/plugin-proposal-json-strings-7.12.1"
       sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
-      sources."@babel/plugin-proposal-numeric-separator-7.12.5"
+      sources."@babel/plugin-proposal-numeric-separator-7.12.7"
       sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
       sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
-      sources."@babel/plugin-proposal-optional-chaining-7.12.1"
+      sources."@babel/plugin-proposal-optional-chaining-7.12.7"
       sources."@babel/plugin-proposal-private-methods-7.12.1"
       sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -88971,22 +88934,22 @@ in
       sources."@babel/plugin-transform-object-super-7.12.1"
       sources."@babel/plugin-transform-parameters-7.12.1"
       sources."@babel/plugin-transform-property-literals-7.12.1"
-      sources."@babel/plugin-transform-react-jsx-7.12.5"
+      sources."@babel/plugin-transform-react-jsx-7.12.7"
       sources."@babel/plugin-transform-regenerator-7.12.1"
       sources."@babel/plugin-transform-reserved-words-7.12.1"
       sources."@babel/plugin-transform-shorthand-properties-7.12.1"
       sources."@babel/plugin-transform-spread-7.12.1"
-      sources."@babel/plugin-transform-sticky-regex-7.12.1"
+      sources."@babel/plugin-transform-sticky-regex-7.12.7"
       sources."@babel/plugin-transform-template-literals-7.12.1"
       sources."@babel/plugin-transform-typeof-symbol-7.12.1"
       sources."@babel/plugin-transform-unicode-escapes-7.12.1"
       sources."@babel/plugin-transform-unicode-regex-7.12.1"
-      sources."@babel/preset-env-7.12.1"
+      sources."@babel/preset-env-7.12.7"
       sources."@babel/preset-modules-0.1.4"
       sources."@babel/runtime-7.12.5"
-      sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.6"
+      sources."@babel/template-7.12.7"
+      sources."@babel/traverse-7.12.8"
+      sources."@babel/types-7.12.7"
       sources."@iarna/toml-2.2.5"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
@@ -89101,7 +89064,7 @@ in
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001159"
+      sources."caniuse-lite-1.0.30001161"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -89176,7 +89139,7 @@ in
       sources."cssnano-util-same-parent-4.0.1"
       (sources."csso-4.1.1" // {
         dependencies = [
-          sources."css-tree-1.1.0"
+          sources."css-tree-1.1.1"
           sources."mdn-data-2.0.14"
         ];
       })
@@ -89185,7 +89148,7 @@ in
       sources."dashdash-1.14.1"
       sources."data-urls-1.1.0"
       sources."deasync-0.1.21"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decode-uri-component-0.2.0"
       sources."deep-is-0.1.3"
       (sources."defaults-1.0.3" // {
@@ -89236,7 +89199,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.598"
+      sources."electron-to-chromium-1.3.606"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -89389,7 +89352,6 @@ in
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.1"
       sources."is-html-1.1.0"
-      sources."is-negative-zero-2.0.0"
       sources."is-number-3.0.0"
       sources."is-obj-2.0.0"
       sources."is-plain-object-2.0.4"
@@ -89732,18 +89694,8 @@ in
       sources."stealthy-require-1.1.1"
       sources."stream-browserify-2.0.2"
       sources."stream-http-2.8.3"
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-          sources."object-inspect-1.8.0"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-          sources."object-inspect-1.8.0"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-4.0.0"
       (sources."stylehacks-4.0.3" // {
@@ -90100,7 +90052,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
-      sources."uglify-js-3.11.6"
+      sources."uglify-js-3.12.0"
       sources."unix-dgram-2.0.4"
       sources."unpipe-1.0.0"
       sources."uri-js-4.4.0"
@@ -90502,7 +90454,7 @@ in
       })
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
-      sources."get-browser-rtc-1.0.2"
+      sources."get-browser-rtc-1.1.0"
       sources."get-intrinsic-1.0.1"
       sources."get-stdin-4.0.1"
       sources."glob-7.1.6"
@@ -90673,8 +90625,8 @@ in
       sources."speedometer-0.1.4"
       sources."stream-buffers-2.2.0"
       sources."string-width-1.0.2"
-      sources."string.prototype.trimend-1.0.2"
-      sources."string.prototype.trimstart-1.0.2"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       (sources."string2compact-1.3.0" // {
         dependencies = [
           sources."ipaddr.js-1.9.1"
@@ -90866,7 +90818,7 @@ in
       sources."fs-chunk-store-1.7.0"
       sources."fs-constants-1.0.0"
       sources."fs.realpath-1.0.0"
-      sources."get-browser-rtc-1.0.2"
+      sources."get-browser-rtc-1.1.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."graceful-fs-4.2.4"
@@ -91135,12 +91087,12 @@ in
           sources."debug-4.1.1"
           (sources."pm2-axon-3.3.0" // {
             dependencies = [
-              sources."debug-3.2.6"
+              sources."debug-3.2.7"
             ];
           })
           (sources."pm2-axon-rpc-0.5.2" // {
             dependencies = [
-              sources."debug-3.2.6"
+              sources."debug-3.2.7"
             ];
           })
           sources."semver-7.2.3"
@@ -91148,7 +91100,7 @@ in
       })
       (sources."@pm2/agent-node-1.1.10" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."ws-6.2.1"
         ];
       })
@@ -91164,7 +91116,7 @@ in
       (sources."@pm2/js-api-0.6.1" // {
         dependencies = [
           sources."async-2.6.3"
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."eventemitter2-6.4.3"
         ];
       })
@@ -91210,7 +91162,7 @@ in
       sources."cron-1.8.2"
       sources."data-uri-to-buffer-1.2.0"
       sources."dayjs-1.8.36"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."deep-is-0.1.3"
       sources."degenerator-1.0.4"
       sources."depd-1.1.2"
@@ -91267,7 +91219,7 @@ in
       })
       (sources."https-proxy-agent-3.0.1" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."iconv-lite-0.4.24"
@@ -91294,7 +91246,7 @@ in
       sources."mute-stream-0.0.8"
       (sources."needle-2.4.0" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."netmask-1.0.6"
@@ -91319,7 +91271,7 @@ in
       sources."pm2-axon-4.0.0"
       (sources."pm2-axon-rpc-0.6.0" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."pm2-deploy-1.0.2"
@@ -91397,10 +91349,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "5.13.1";
+    version = "5.13.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.13.1.tgz";
-      sha512 = "FXdcPmd7hld2FrM+GvBwXH85T4iMQre0teZferGxm7xyzzfkCP0qkA/qaXqpCEJ4r3f24FyEgRl9WUvpxNHBEQ==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-5.13.4.tgz";
+      sha512 = "Q/1SlzLitcrggjTJN7Ooiu2y5ty+yTaxJYb7xGt6QpNijsIhxkGK58pP8IZYh04C7+8aI9MxNgppOTOyQG7k5g==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -91567,10 +91519,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "2.1.2";
+    version = "2.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz";
-      sha512 = "16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==";
+      url = "https://registry.npmjs.org/prettier/-/prettier-2.2.0.tgz";
+      sha512 = "yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -91953,10 +91905,10 @@ in
   pyright = nodeEnv.buildNodePackage {
     name = "pyright";
     packageName = "pyright";
-    version = "1.1.86";
+    version = "1.1.87";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.86.tgz";
-      sha512 = "/caEMnoD3tRPfrn/kVcZJ8gNV7NYnQEmnZYbzbVQlrdrbyMXNRXWOY/eDZizaMBYDm5FPV70A3hiA0BL9TqHdA==";
+      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.87.tgz";
+      sha512 = "yiZ79Jzv0bIAQW3rlJip8a4Wy8IRU1zABG1/eOOWN3s7yn8jTWTld5QhraIRVID/YhkzmNj3sox43SeCj6yelA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -92052,8 +92004,8 @@ in
       sources."semver-5.7.1"
       sources."side-channel-1.0.3"
       sources."stack-trace-0.0.10"
-      sources."string.prototype.trimend-1.0.2"
-      sources."string.prototype.trimstart-1.0.2"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."utile-0.2.1"
@@ -92288,18 +92240,18 @@ in
       sources."@babel/helper-split-export-declaration-7.11.0"
       sources."@babel/helper-validator-identifier-7.10.4"
       sources."@babel/highlight-7.10.4"
-      sources."@babel/parser-7.12.5"
+      sources."@babel/parser-7.12.7"
       sources."@babel/runtime-7.12.5"
-      sources."@babel/template-7.10.4"
-      sources."@babel/traverse-7.12.5"
-      sources."@babel/types-7.12.6"
+      sources."@babel/template-7.12.7"
+      sources."@babel/traverse-7.12.8"
+      sources."@babel/types-7.12.7"
       sources."@emotion/is-prop-valid-0.8.8"
       sources."@emotion/memoize-0.7.4"
       sources."@emotion/stylis-0.8.5"
       sources."@emotion/unitless-0.7.5"
       sources."@exodus/schemasafe-1.0.0-rc.3"
       sources."@redocly/react-dropdown-aria-2.0.11"
-      sources."@types/node-13.13.31"
+      sources."@types/node-13.13.32"
       sources."ajv-5.5.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
@@ -92315,7 +92267,7 @@ in
           sources."util-0.10.3"
         ];
       })
-      sources."babel-plugin-styled-components-1.11.1"
+      sources."babel-plugin-styled-components-1.12.0"
       sources."babel-plugin-syntax-jsx-6.18.0"
       sources."base64-js-1.5.1"
       sources."better-ajv-errors-0.6.7"
@@ -92349,7 +92301,7 @@ in
       sources."cipher-base-1.0.4"
       sources."classnames-2.2.6"
       sources."clipboard-2.0.6"
-      sources."cliui-6.0.0"
+      sources."cliui-7.0.4"
       sources."clsx-1.1.1"
       sources."co-4.6.0"
       sources."code-error-fragment-0.0.230"
@@ -92369,7 +92321,7 @@ in
       sources."crypto-browserify-3.12.0"
       sources."css-color-keywords-1.0.0"
       sources."css-to-react-native-3.0.0"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decamelize-1.2.0"
       sources."decko-1.2.0"
       sources."delegate-3.2.0"
@@ -92388,6 +92340,7 @@ in
       })
       sources."emoji-regex-8.0.0"
       sources."es6-promise-3.3.1"
+      sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."eventemitter3-4.0.7"
@@ -92468,7 +92421,11 @@ in
       sources."normalize-path-3.0.0"
       sources."oas-kit-common-1.0.8"
       sources."oas-linter-3.2.1"
-      sources."oas-resolver-2.5.2"
+      (sources."oas-resolver-2.5.3" // {
+        dependencies = [
+          sources."yargs-16.1.1"
+        ];
+      })
       sources."oas-schema-walker-1.1.5"
       sources."oas-validator-4.0.8"
       sources."object-assign-4.1.1"
@@ -92515,7 +92472,7 @@ in
       })
       sources."readdirp-3.5.0"
       sources."redoc-2.0.0-rc.47"
-      sources."reftools-1.1.6"
+      sources."reftools-1.1.7"
       sources."regenerator-runtime-0.13.7"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
@@ -92553,7 +92510,7 @@ in
       sources."to-regex-range-5.0.1"
       sources."tslib-2.0.3"
       sources."tty-browserify-0.0.0"
-      sources."uglify-js-3.11.6"
+      sources."uglify-js-3.12.0"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
@@ -92569,7 +92526,7 @@ in
       sources."vm-browserify-1.1.2"
       sources."which-module-2.0.0"
       sources."wordwrap-1.0.0"
-      (sources."wrap-ansi-6.2.0" // {
+      (sources."wrap-ansi-7.0.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."color-convert-2.0.1"
@@ -92577,10 +92534,20 @@ in
         ];
       })
       sources."xtend-4.0.2"
-      sources."y18n-4.0.0"
+      sources."y18n-5.0.5"
       sources."yaml-1.10.0"
-      sources."yargs-15.4.1"
-      sources."yargs-parser-18.1.3"
+      (sources."yargs-15.4.1" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."cliui-6.0.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."wrap-ansi-6.2.0"
+          sources."y18n-4.0.0"
+          sources."yargs-parser-18.1.3"
+        ];
+      })
+      sources."yargs-parser-20.2.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -92722,7 +92689,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."css-select-1.2.0"
       sources."css-what-2.1.3"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decamelize-1.2.0"
       sources."deep-freeze-0.0.1"
       sources."deep-is-0.1.3"
@@ -92746,7 +92713,7 @@ in
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-7.13.0" // {
+      (sources."eslint-7.14.0" // {
         dependencies = [
           sources."eslint-visitor-keys-2.0.0"
           sources."semver-7.3.2"
@@ -92802,7 +92769,7 @@ in
       })
       (sources."https-proxy-agent-2.2.4" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."ignore-4.0.6"
@@ -93031,7 +92998,7 @@ in
       sources."crc-0.2.0"
       sources."crypto-0.0.3"
       sources."dashdash-1.14.1"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.2"
       sources."events.node-0.4.9"
@@ -93291,16 +93258,16 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "2.11.1";
+    version = "2.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-2.11.1.tgz";
-      sha512 = "BQN53zkm/HWh+QtzaR/uXHRAxAcabHkstyRMo4+9JJc+DM7cQM9cyRBm15BW9PKMO9c3aCKYNTJSb5cegn7qmw==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-2.12.0.tgz";
+      sha512 = "T36JRXVwIqB0FNV7h8n9vG2EnfwuznQnIH4ICmnfIZ2UcfE+cF2IBU98W1j6Pebh1qYUIM4uDZ7SnyvaGfGImw==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
       (sources."@kwsites/file-exists-1.1.1" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -93326,7 +93293,7 @@ in
         ];
       })
       sources."@serverless/component-metrics-1.0.8"
-      (sources."@serverless/components-3.3.1" // {
+      (sources."@serverless/components-3.4.2" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."ramda-0.27.1"
@@ -93346,7 +93313,7 @@ in
       (sources."@serverless/platform-sdk-2.3.2" // {
         dependencies = [
           sources."chalk-2.4.2"
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."https-proxy-agent-4.0.0"
           sources."is-docker-1.1.0"
           sources."ms-2.1.2"
@@ -93371,7 +93338,7 @@ in
       sources."@types/keyv-3.1.1"
       sources."@types/lodash-4.14.165"
       sources."@types/long-4.0.1"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/request-2.48.5"
       sources."@types/request-promise-native-1.0.17"
       sources."@types/responselike-1.0.0"
@@ -93398,7 +93365,7 @@ in
           sources."file-type-4.4.0"
         ];
       })
-      (sources."archiver-5.0.2" // {
+      (sources."archiver-5.1.0" // {
         dependencies = [
           sources."async-3.2.0"
           sources."bl-4.0.3"
@@ -93428,7 +93395,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.794.0" // {
+      (sources."aws-sdk-2.798.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -93538,7 +93505,7 @@ in
       sources."component-bind-1.0.0"
       sources."component-emitter-1.3.0"
       sources."component-inherit-0.0.3"
-      sources."compress-commons-4.0.1"
+      sources."compress-commons-4.0.2"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       (sources."content-disposition-0.5.3" // {
@@ -93548,8 +93515,8 @@ in
       })
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
-      sources."crc-3.8.0"
-      sources."crc32-stream-4.0.0"
+      sources."crc-32-1.2.0"
+      sources."crc32-stream-4.0.1"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -93647,6 +93614,7 @@ in
       sources."essentials-1.1.1"
       sources."event-emitter-0.3.5"
       sources."events-1.1.1"
+      sources."exit-on-epipe-1.0.1"
       sources."expand-template-2.0.3"
       sources."ext-1.4.0"
       sources."ext-list-2.2.2"
@@ -93695,7 +93663,7 @@ in
       })
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
-      sources."fs2-0.3.8"
+      sources."fs2-0.3.9"
       sources."fsevents-2.1.3"
       (sources."gauge-2.7.4" // {
         dependencies = [
@@ -93746,7 +93714,7 @@ in
       (sources."https-proxy-agent-5.0.0" // {
         dependencies = [
           sources."agent-base-6.0.2"
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -93937,11 +93905,12 @@ in
       })
       sources."prepend-http-2.0.0"
       sources."prettyoutput-1.2.0"
+      sources."printj-1.1.2"
       sources."process-nextick-args-2.0.1"
       sources."promise-queue-2.2.5"
       (sources."protobufjs-6.10.2" // {
         dependencies = [
-          sources."@types/node-13.13.31"
+          sources."@types/node-13.13.32"
           sources."long-4.0.0"
         ];
       })
@@ -93991,9 +93960,9 @@ in
       sources."signal-exit-3.0.3"
       sources."simple-concat-1.0.1"
       sources."simple-get-2.8.1"
-      (sources."simple-git-2.22.0" // {
+      (sources."simple-git-2.23.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -94045,7 +94014,7 @@ in
           sources."chalk-2.4.2"
           sources."cli-cursor-2.1.0"
           sources."cli-width-2.2.1"
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."figures-2.0.0"
           sources."inquirer-6.5.2"
           sources."is-fullwidth-code-point-2.0.0"
@@ -94145,7 +94114,7 @@ in
       sources."yargs-parser-20.2.4"
       sources."yauzl-2.10.0"
       sources."yeast-0.1.2"
-      sources."zip-stream-4.0.2"
+      sources."zip-stream-4.0.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -94784,10 +94753,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.428.0";
+    version = "1.430.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.428.0.tgz";
-      sha512 = "yV1f28PPVG7sJ0c4GAMO3nhuJMIJNDagYJRQVwA0zLCr5u3UraE0qK2wRxo2j53ICkMBslp0b073EIoaB0lVkA==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.430.2.tgz";
+      sha512 = "EVIwMTcf4FbJ+/j5PoRQgMJdgZfgGaIsN8XorRu0+rXnB1TIAJnjqi1RoVee6j4MEVGMZgxV3H5uN66YRqfCPw==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -94817,7 +94786,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/js-yaml-3.12.5"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/responselike-1.0.0"
       sources."@types/semver-5.5.0"
       sources."@yarnpkg/lockfile-1.1.0"
@@ -94900,7 +94869,7 @@ in
       })
       sources."crypto-random-string-2.0.0"
       sources."data-uri-to-buffer-1.2.0"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       (sources."decompress-response-6.0.0" // {
         dependencies = [
           sources."mimic-response-3.1.0"
@@ -94986,7 +94955,7 @@ in
       sources."http2-wrapper-1.0.0-beta.5.2"
       (sources."https-proxy-agent-3.0.1" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."iconv-lite-0.4.24"
@@ -95067,7 +95036,7 @@ in
       sources."mute-stream-0.0.8"
       (sources."needle-2.5.0" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."netmask-1.0.6"
@@ -95156,7 +95125,7 @@ in
       sources."signal-exit-3.0.3"
       sources."smart-buffer-4.1.0"
       sources."snyk-config-4.0.0-rc.2"
-      (sources."snyk-cpp-plugin-2.1.0" // {
+      (sources."snyk-cpp-plugin-2.2.1" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.0"
@@ -95167,7 +95136,7 @@ in
           sources."tslib-2.0.3"
         ];
       })
-      (sources."snyk-docker-plugin-4.7.4" // {
+      (sources."snyk-docker-plugin-4.9.0" // {
         dependencies = [
           sources."rimraf-3.0.2"
           sources."tmp-0.2.1"
@@ -95200,10 +95169,20 @@ in
         ];
       })
       sources."snyk-module-3.1.0"
-      (sources."snyk-mvn-plugin-2.23.1" // {
+      (sources."snyk-mvn-plugin-2.23.4" // {
         dependencies = [
           sources."@snyk/cli-interface-2.9.1"
-          sources."tmp-0.1.0"
+          (sources."@snyk/java-call-graph-builder-1.16.5" // {
+            dependencies = [
+              sources."tmp-0.2.1"
+            ];
+          })
+          sources."rimraf-3.0.2"
+          (sources."tmp-0.1.0" // {
+            dependencies = [
+              sources."rimraf-2.7.1"
+            ];
+          })
           sources."tslib-1.11.1"
         ];
       })
@@ -95240,7 +95219,7 @@ in
           sources."hosted-git-info-2.8.8"
           (sources."snyk-module-2.1.0" // {
             dependencies = [
-              sources."debug-3.2.6"
+              sources."debug-3.2.7"
             ];
           })
         ];
@@ -95248,13 +95227,13 @@ in
       sources."snyk-python-plugin-1.19.1"
       (sources."snyk-resolve-1.0.1" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       (sources."snyk-resolve-deps-4.4.0" // {
         dependencies = [
           sources."@types/node-6.14.13"
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."hosted-git-info-2.8.8"
           sources."lru-cache-4.1.5"
           sources."semver-5.7.1"
@@ -95270,7 +95249,7 @@ in
       sources."snyk-tree-1.0.0"
       (sources."snyk-try-require-1.3.1" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."lru-cache-4.1.5"
           sources."yallist-2.1.2"
         ];
@@ -95383,10 +95362,10 @@ in
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
-    version = "3.0.2";
+    version = "3.0.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.2.tgz";
-      sha512 = "CFnVFhzOy6eHOnZhElG5dtacsEC3jO45KfIWwDSoKavBuWmuK4k4j1eSMj0RymrTA9WuXG5+yD+sxxtMK8rCIA==";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.3.tgz";
+      sha512 = "TC1GnSXhDVmd3bHji5aG7AgWB8UL7E6quACbKra8uFXBqlMwEDbrJFK+tjuIY5Pe9N0L+MAPPDv3pycnn0000A==";
     };
     dependencies = [
       sources."@types/body-parser-1.19.0"
@@ -95394,9 +95373,9 @@ in
       sources."@types/cookie-0.4.0"
       sources."@types/cors-2.8.8"
       sources."@types/express-4.17.9"
-      sources."@types/express-serve-static-core-4.17.13"
+      sources."@types/express-serve-static-core-4.17.14"
       sources."@types/mime-2.0.3"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
       sources."@types/serve-static-1.13.8"
@@ -95717,7 +95696,7 @@ in
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-6.0.5"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decode-uri-component-0.2.0"
       sources."deep-equal-1.1.1"
       sources."deep-extend-0.6.0"
@@ -95996,7 +95975,7 @@ in
       })
       sources."napi-macros-2.0.0"
       sources."ncp-2.0.0"
-      sources."nearley-2.19.7"
+      sources."nearley-2.19.8"
       sources."nice-try-1.0.5"
       sources."node-gyp-build-4.2.3"
       sources."non-private-ip-1.4.4"
@@ -96333,9 +96312,9 @@ in
         ];
       })
       sources."string-width-1.0.2"
-      sources."string.prototype.trim-1.2.2"
-      sources."string.prototype.trimend-1.0.2"
-      sources."string.prototype.trimstart-1.0.2"
+      sources."string.prototype.trim-1.2.3"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
       sources."stringify-entities-1.3.2"
       sources."strip-ansi-3.0.1"
@@ -96510,7 +96489,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.794.0" // {
+      (sources."aws-sdk-2.798.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -96718,7 +96697,7 @@ in
       sources."glob-6.0.4"
       (sources."gm-1.23.1" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
         ];
       })
       sources."graceful-fs-4.2.4"
@@ -97107,7 +97086,7 @@ in
       sources."strip-eof-1.0.0"
       (sources."superagent-3.8.3" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."form-data-2.5.1"
           sources."qs-6.9.4"
           sources."readable-stream-2.3.7"
@@ -97308,7 +97287,7 @@ in
       sources."css-what-3.4.2"
       (sources."csso-4.1.1" // {
         dependencies = [
-          sources."css-tree-1.1.0"
+          sources."css-tree-1.1.1"
           sources."mdn-data-2.0.14"
         ];
       })
@@ -97332,7 +97311,6 @@ in
       sources."has-symbols-1.0.1"
       sources."is-callable-1.2.2"
       sources."is-date-object-1.0.2"
-      sources."is-negative-zero-2.0.0"
       sources."is-regex-1.1.1"
       sources."is-symbol-1.0.3"
       sources."js-yaml-3.14.0"
@@ -97350,16 +97328,8 @@ in
       sources."source-map-0.6.1"
       sources."sprintf-js-1.0.3"
       sources."stable-0.1.8"
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."supports-color-5.5.0"
       sources."unquote-1.1.1"
       sources."util.promisify-1.0.1"
@@ -97729,7 +97699,7 @@ in
       sources."neo-async-2.6.2"
       (sources."nodemon-1.19.4" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."ms-2.1.2"
           sources."supports-color-5.5.0"
         ];
@@ -97767,7 +97737,7 @@ in
       sources."path-key-2.0.1"
       (sources."path-loader-1.0.10" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."ms-2.1.2"
           sources."qs-6.9.4"
           sources."superagent-3.8.3"
@@ -97946,7 +97916,7 @@ in
       sources."truncate-utf8-bytes-1.0.2"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.11.6"
+      sources."uglify-js-3.12.0"
       sources."undefsafe-2.0.3"
       (sources."union-value-1.0.1" // {
         dependencies = [
@@ -98010,7 +97980,7 @@ in
     src = fetchgit {
       url = "https://github.com/TediCross/TediCross.git";
       rev = "80ec2189cbda51eec9f3cd3f7f551b7a71474d38";
-      sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
+      sha256 = "1d3e9fb2a35f366e6fb4cf46699d21a58cbdde3b7a41130d0eb1aa1f4dceabb9";
     };
     dependencies = [
       sources."ajv-6.12.6"
@@ -98036,7 +98006,7 @@ in
       sources."combined-stream-1.0.8"
       sources."core-util-is-1.0.2"
       sources."dashdash-1.14.1"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decamelize-1.2.0"
       sources."delayed-stream-1.0.0"
       sources."discord.js-11.6.4"
@@ -98227,7 +98197,7 @@ in
       sources."concat-stream-1.6.2"
       sources."core-util-is-1.0.2"
       sources."crypt-0.0.2"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."deep-equal-1.1.1"
       sources."deep-is-0.1.3"
       sources."define-properties-1.1.3"
@@ -98357,8 +98327,8 @@ in
           sources."strip-ansi-3.0.1"
         ];
       })
-      sources."string.prototype.trimend-1.0.2"
-      sources."string.prototype.trimstart-1.0.2"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
       (sources."strip-ansi-6.0.0" // {
         dependencies = [
@@ -98455,7 +98425,6 @@ in
       sources."has-symbols-1.0.1"
       sources."is-callable-1.2.2"
       sources."is-date-object-1.0.2"
-      sources."is-negative-zero-2.0.0"
       sources."is-regex-1.1.1"
       sources."is-symbol-1.0.3"
       sources."match-index-1.0.3"
@@ -98463,16 +98432,8 @@ in
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.2"
       sources."regexp.prototype.flags-1.3.0"
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -98566,7 +98527,7 @@ in
       sources."core-util-is-1.0.2"
       sources."crypto-random-string-2.0.0"
       sources."cuss-1.21.0"
-      sources."debug-4.3.0"
+      sources."debug-4.3.1"
       sources."decamelize-1.2.0"
       (sources."decamelize-keys-1.1.0" // {
         dependencies = [
@@ -99042,7 +99003,6 @@ in
       sources."inherits-2.0.4"
       sources."is-callable-1.2.2"
       sources."is-date-object-1.0.2"
-      sources."is-negative-zero-2.0.0"
       sources."is-regex-1.1.1"
       sources."is-symbol-1.0.3"
       sources."object-assign-4.1.1"
@@ -99053,16 +99013,8 @@ in
       sources."readable-stream-3.6.0"
       sources."safe-buffer-5.2.1"
       sources."sentence-splitter-3.2.0"
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.3.0"
       sources."structured-source-3.0.2"
       sources."textlint-rule-helper-2.1.1"
@@ -99105,22 +99057,13 @@ in
       sources."has-symbols-1.0.1"
       sources."is-callable-1.2.2"
       sources."is-date-object-1.0.2"
-      sources."is-negative-zero-2.0.0"
       sources."is-regex-1.1.1"
       sources."is-symbol-1.0.3"
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.2"
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -99213,23 +99156,14 @@ in
       sources."is-callable-1.2.2"
       sources."is-capitalized-1.0.0"
       sources."is-date-object-1.0.2"
-      sources."is-negative-zero-2.0.0"
       sources."is-regex-1.1.1"
       sources."is-string-1.0.5"
       sources."is-symbol-1.0.3"
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.2"
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -99300,7 +99234,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
@@ -99308,7 +99242,7 @@ in
       sources."after-0.8.2"
       (sources."agent-base-6.0.2" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -99473,7 +99407,7 @@ in
       sources."http_ece-1.1.0"
       (sources."https-proxy-agent-5.0.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -99533,7 +99467,7 @@ in
       sources."mute-stream-0.0.8"
       (sources."needle-2.5.2" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."ms-2.1.2"
         ];
       })
@@ -100164,10 +100098,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "4.0.5";
+    version = "4.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz";
-      sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==";
+      url = "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz";
+      sha512 = "thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -100218,10 +100152,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.11.6";
+    version = "3.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.6.tgz";
-      sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g==";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.0.tgz";
+      sha512 = "8lBMSkFZuAK7gGF8LswsXmir8eX8d2AAMOnxSDWjKBx/fBR6MypQjs78m6ML9zQVp1/hD4TBdfeMZMC7nW1TAA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -100264,7 +100198,7 @@ in
       sources."@primer/octicons-11.0.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."after-0.8.2"
@@ -100415,7 +100349,7 @@ in
       sources."media-typer-0.3.0"
       (sources."memorystore-1.6.4" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -100621,7 +100555,7 @@ in
       sources."d3-time-2.0.0"
       sources."d3-time-format-3.0.0"
       sources."d3-timer-2.0.0"
-      sources."debug-3.2.6"
+      sources."debug-3.2.7"
       sources."decompress-response-4.2.1"
       sources."deep-extend-0.6.0"
       sources."delaunator-4.0.1"
@@ -100803,10 +100737,10 @@ in
   vim-language-server = nodeEnv.buildNodePackage {
     name = "vim-language-server";
     packageName = "vim-language-server";
-    version = "2.1.0";
+    version = "2.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.0.tgz";
-      sha512 = "i0PTJh2XEPEUvRn78j1nxTlNVcTOKr4FLwIwhkjaC0ovGGViwnBgRd7StM0NS3UCvcVzLNy78Hu31S7RHkiHbw==";
+      url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.1.tgz";
+      sha512 = "au7F9BKmsbBY8zaZ9LELonc0XbvutejtWcR4mlEIOQiDLl+2kDfAOaQoQ/EZSOKo/GaOgZURUk7uQknQlgivAA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -101342,7 +101276,6 @@ in
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
-      sources."is-negative-zero-2.0.0"
       sources."is-number-7.0.0"
       sources."is-plain-object-2.0.4"
       sources."is-regex-1.1.1"
@@ -101617,18 +101550,8 @@ in
       sources."stream-shift-1.0.1"
       sources."string-argv-0.3.1"
       sources."string-width-2.1.1"
-      (sources."string.prototype.trimend-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-          sources."object.assign-4.1.2"
-        ];
-      })
-      (sources."string.prototype.trimstart-1.0.2" // {
-        dependencies = [
-          sources."es-abstract-1.18.0-next.1"
-          sources."object.assign-4.1.2"
-        ];
-      })
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-4.0.0"
       sources."strip-json-comments-2.0.1"
@@ -102055,7 +101978,7 @@ in
       sources."tslib-1.14.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uglify-js-3.11.6"
+      sources."uglify-js-3.12.0"
       sources."uid-0.0.2"
       sources."unbzip2-stream-1.4.3"
       sources."unyield-0.0.1"
@@ -102114,7 +102037,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -102273,7 +102196,7 @@ in
       })
       sources."css-parse-2.0.0"
       sources."currently-unhandled-0.4.1"
-      sources."debug-3.2.6"
+      sources."debug-3.2.7"
       sources."decamelize-1.2.0"
       (sources."decamelize-keys-1.1.0" // {
         dependencies = [
@@ -102302,14 +102225,14 @@ in
       (sources."eslint-5.16.0" // {
         dependencies = [
           sources."cross-spawn-6.0.5"
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ignore-4.0.6"
         ];
       })
       (sources."eslint-plugin-vue-6.2.2" // {
         dependencies = [
           sources."acorn-7.4.1"
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."eslint-scope-5.1.1"
           sources."espree-6.2.1"
           sources."vue-eslint-parser-7.1.1"
@@ -102975,7 +102898,7 @@ in
       sources."vscode-uri-1.0.8"
       (sources."vue-eslint-parser-6.0.5" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
         ];
       })
       sources."vue-onsenui-helper-json-1.0.2"
@@ -103022,10 +102945,10 @@ in
   web-ext = nodeEnv.buildNodePackage {
     name = "web-ext";
     packageName = "web-ext";
-    version = "5.3.0";
+    version = "5.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/web-ext/-/web-ext-5.3.0.tgz";
-      sha512 = "LlOmVSddfBVHd9Liv3SL1Cvftr+YS6GNiKVIugDotUm3jVT9otHsw1SrCi11MGaGBw4g0s8ndjcbuttr1ZQjwg==";
+      url = "https://registry.npmjs.org/web-ext/-/web-ext-5.4.0.tgz";
+      sha512 = "95MVrsCRtmmu7YNTA8OconwTB7Y7rS6T5ABpv9c90A5tLfDV1+6/dRn8JhAMAi/UfIq0ZT5wklHwvRzDmD6cBA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -103040,54 +102963,81 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      sources."@babel/polyfill-7.11.5"
-      sources."@babel/runtime-7.11.2"
+      sources."@babel/polyfill-7.12.1"
+      sources."@babel/runtime-7.12.5"
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
       sources."@devicefarmer/adbkit-2.11.3"
       sources."@devicefarmer/adbkit-logcat-1.1.0"
       sources."@devicefarmer/adbkit-monkey-1.0.1"
-      (sources."@eslint/eslintrc-0.1.3" // {
+      (sources."@eslint/eslintrc-0.2.1" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
-      sources."@sindresorhus/is-0.14.0"
+      sources."@mdn/browser-compat-data-2.0.5"
+      sources."@sindresorhus/is-0.7.0"
       sources."@szmarczak/http-timer-1.1.2"
+      sources."@types/decompress-4.2.3"
+      sources."@types/download-6.2.4"
+      sources."@types/got-8.3.5"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
+      sources."@types/yauzl-2.9.1"
       sources."JSONSelect-0.2.1"
+      sources."accepts-1.3.7"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.1"
-      sources."addons-linter-2.9.0"
+      (sources."addons-linter-2.12.0" // {
+        dependencies = [
+          sources."yargs-16.1.0"
+        ];
+      })
+      (sources."addons-scanner-utils-3.0.0" // {
+        dependencies = [
+          sources."upath-2.0.0"
+        ];
+      })
       sources."adm-zip-0.4.16"
       sources."ajv-6.12.6"
       sources."ajv-merge-patch-4.1.0"
-      sources."ansi-align-3.0.0"
+      (sources."ansi-align-3.0.0" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."emoji-regex-7.0.3"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
       sources."ansi-colors-4.1.1"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-4.3.0"
       sources."any-promise-1.3.0"
       sources."anymatch-3.1.1"
+      (sources."archive-type-4.0.0" // {
+        dependencies = [
+          sources."file-type-4.4.0"
+        ];
+      })
       (sources."archiver-5.0.2" // {
         dependencies = [
           sources."async-3.2.0"
+          sources."bl-4.0.3"
+          sources."inherits-2.0.4"
+          sources."readable-stream-3.6.0"
+          sources."tar-stream-2.1.4"
         ];
       })
-      (sources."archiver-utils-2.1.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."archiver-utils-2.1.0"
       sources."argparse-1.0.10"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
       sources."array-differ-3.0.0"
       sources."array-filter-0.0.1"
+      sources."array-flatten-1.1.1"
       sources."array-map-0.0.0"
       sources."array-reduce-0.0.0"
       sources."array-union-2.1.0"
@@ -103116,35 +103066,36 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-extensions-2.1.0"
       sources."bindings-1.5.0"
-      sources."bl-4.0.3"
+      sources."bl-1.2.3"
       sources."bluebird-2.9.34"
+      sources."body-parser-1.19.0"
       sources."boolbase-1.0.0"
       (sources."boxen-4.2.0" // {
         dependencies = [
-          sources."ansi-regex-5.0.0"
           sources."camelcase-5.3.1"
           sources."chalk-3.0.0"
-          sources."emoji-regex-8.0.0"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."string-width-4.2.0"
-          sources."strip-ansi-6.0.0"
         ];
       })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."buffer-5.7.1"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
       sources."buffer-equal-constant-time-1.0.1"
+      sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
       sources."bunyan-1.8.14"
+      sources."bytes-3.1.0"
       (sources."cache-base-1.0.1" // {
         dependencies = [
           sources."isobject-3.0.1"
         ];
       })
-      (sources."cacheable-request-6.1.0" // {
+      (sources."cacheable-request-2.1.4" // {
         dependencies = [
-          sources."lowercase-keys-2.0.0"
+          sources."get-stream-3.0.0"
+          sources."lowercase-keys-1.0.0"
         ];
       })
       sources."call-bind-1.0.0"
@@ -103153,7 +103104,11 @@ in
       sources."caseless-0.12.0"
       sources."chalk-4.1.0"
       sources."cheerio-1.0.0-rc.3"
-      sources."chokidar-3.4.3"
+      (sources."chokidar-3.4.3" // {
+        dependencies = [
+          sources."fsevents-2.1.3"
+        ];
+      })
       (sources."chrome-launcher-0.13.4" // {
         dependencies = [
           sources."mkdirp-0.5.5"
@@ -103180,12 +103135,9 @@ in
         ];
       })
       sources."cli-boxes-2.2.1"
-      (sources."cliui-6.0.0" // {
+      (sources."cliui-7.0.4" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
-          sources."emoji-regex-8.0.0"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."string-width-4.2.0"
           sources."strip-ansi-6.0.0"
         ];
       })
@@ -103201,21 +103153,32 @@ in
       sources."commander-2.20.3"
       sources."common-tags-1.8.0"
       sources."component-emitter-1.3.0"
-      sources."compress-commons-4.0.1"
-      sources."concat-map-0.0.1"
-      (sources."concat-stream-1.6.2" // {
+      (sources."compress-commons-4.0.2" // {
         dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
+          sources."readable-stream-3.6.0"
         ];
       })
-      sources."configstore-5.0.1"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      (sources."configstore-5.0.1" // {
+        dependencies = [
+          sources."make-dir-3.1.0"
+          sources."semver-6.3.0"
+        ];
+      })
+      sources."content-disposition-0.5.3"
+      sources."content-type-1.0.4"
+      sources."cookie-0.4.0"
+      sources."cookie-signature-1.0.6"
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.6.11"
       sources."core-util-is-1.0.2"
-      sources."crc-3.8.0"
-      sources."crc32-stream-4.0.0"
+      sources."crc-32-1.2.0"
+      (sources."crc32-stream-4.0.1" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."cross-spawn-7.0.3"
       sources."crypto-random-string-2.0.0"
       sources."css-select-1.2.0"
@@ -103225,7 +103188,39 @@ in
       sources."debug-2.6.9"
       sources."decamelize-4.0.0"
       sources."decode-uri-component-0.2.0"
+      (sources."decompress-4.2.1" // {
+        dependencies = [
+          (sources."make-dir-1.3.0" // {
+            dependencies = [
+              sources."pify-3.0.0"
+            ];
+          })
+          sources."pify-2.3.0"
+        ];
+      })
       sources."decompress-response-3.3.0"
+      (sources."decompress-tar-4.1.1" // {
+        dependencies = [
+          sources."file-type-5.2.0"
+        ];
+      })
+      (sources."decompress-tarbz2-4.1.1" // {
+        dependencies = [
+          sources."file-type-6.2.0"
+        ];
+      })
+      (sources."decompress-targz-4.1.1" // {
+        dependencies = [
+          sources."file-type-5.2.0"
+        ];
+      })
+      (sources."decompress-unzip-4.0.1" // {
+        dependencies = [
+          sources."file-type-3.9.0"
+          sources."get-stream-2.3.1"
+          sources."pify-2.3.0"
+        ];
+      })
       sources."deep-equal-1.1.1"
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
@@ -103240,10 +103235,12 @@ in
         ];
       })
       sources."delayed-stream-1.0.0"
-      (sources."dispensary-0.57.0" // {
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      (sources."dispensary-0.59.0" // {
         dependencies = [
           sources."async-3.2.0"
-          sources."pino-6.6.1"
+          sources."yargs-16.1.1"
         ];
       })
       sources."doctrine-3.0.0"
@@ -103252,11 +103249,14 @@ in
       sources."domhandler-2.4.2"
       sources."domutils-1.5.1"
       sources."dot-prop-5.3.0"
+      sources."download-8.0.0"
       sources."dtrace-provider-0.8.8"
       sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ecdsa-sig-formatter-1.0.11"
-      sources."emoji-regex-7.0.3"
+      sources."ee-first-1.1.1"
+      sources."emoji-regex-8.0.0"
+      sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."enquirer-2.3.6"
       sources."entities-1.1.2"
@@ -103266,12 +103266,14 @@ in
       sources."es6-error-4.1.1"
       sources."es6-promise-2.3.0"
       sources."es6-promisify-6.1.1"
+      sources."escalade-3.1.1"
       sources."escape-goat-2.1.1"
+      sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-7.11.0" // {
+      (sources."eslint-7.13.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
           sources."strip-ansi-6.0.0"
         ];
@@ -103302,8 +103304,15 @@ in
       })
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
+      sources."etag-1.8.1"
       sources."event-to-promise-0.8.0"
-      sources."execa-4.1.0"
+      (sources."execa-4.1.0" // {
+        dependencies = [
+          sources."get-stream-5.2.0"
+          sources."is-stream-2.0.0"
+        ];
+      })
+      sources."exit-on-epipe-1.0.1"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -103322,6 +103331,9 @@ in
           sources."kind-of-5.1.0"
         ];
       })
+      sources."express-4.17.1"
+      sources."ext-list-2.2.2"
+      sources."ext-name-5.0.0"
       sources."extend-3.0.2"
       (sources."extend-shallow-3.0.2" // {
         dependencies = [
@@ -103343,12 +103355,16 @@ in
       })
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."fast-redact-2.1.0"
+      sources."fast-redact-3.0.0"
       sources."fast-safe-stringify-2.0.7"
       sources."fd-slicer-1.1.0"
       sources."file-entry-cache-5.0.1"
+      sources."file-type-11.1.0"
       sources."file-uri-to-path-1.0.0"
+      sources."filename-reserved-regex-2.0.0"
+      sources."filenamify-3.0.0"
       sources."fill-range-7.0.1"
+      sources."finalhandler-1.1.2"
       sources."find-up-4.1.0"
       (sources."firefox-profile-4.0.0" // {
         dependencies = [
@@ -103356,7 +103372,7 @@ in
           sources."fs-extra-4.0.3"
         ];
       })
-      sources."first-chunk-stream-4.0.0"
+      sources."first-chunk-stream-3.0.0"
       sources."flat-cache-2.0.1"
       sources."flatstr-1.0.12"
       sources."flatted-2.0.2"
@@ -103364,7 +103380,10 @@ in
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
+      sources."forwarded-0.1.2"
       sources."fragment-cache-0.2.1"
+      sources."fresh-0.5.2"
+      sources."from2-2.3.0"
       sources."fs-constants-1.0.0"
       (sources."fs-extra-9.0.1" // {
         dependencies = [
@@ -103377,7 +103396,7 @@ in
         ];
       })
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.3"
+      sources."fsevents-2.2.1"
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       (sources."fx-runner-1.0.13" // {
@@ -103389,16 +103408,17 @@ in
       })
       sources."get-caller-file-2.0.5"
       sources."get-intrinsic-1.0.1"
-      sources."get-stream-5.2.0"
+      sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."global-dirs-2.0.1"
       sources."globals-12.4.0"
-      (sources."got-9.6.0" // {
+      (sources."got-8.3.2" // {
         dependencies = [
-          sources."get-stream-4.1.0"
+          sources."get-stream-3.0.0"
+          sources."pify-3.0.0"
         ];
       })
       sources."graceful-fs-4.2.4"
@@ -103408,7 +103428,9 @@ in
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
+      sources."has-symbol-support-x-1.4.2"
       sources."has-symbols-1.0.1"
+      sources."has-to-string-tag-x-1.4.1"
       (sources."has-value-1.0.0" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -103425,19 +103447,27 @@ in
         ];
       })
       sources."has-yarn-2.1.0"
-      sources."htmlparser2-3.10.1"
-      sources."http-cache-semantics-4.1.0"
+      (sources."htmlparser2-3.10.1" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
+      sources."http-cache-semantics-3.8.1"
+      sources."http-errors-1.7.2"
       sources."http-signature-1.2.0"
       sources."human-signals-1.1.1"
+      sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
       sources."ignore-4.0.6"
       sources."import-fresh-3.2.1"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
+      sources."inherits-2.0.3"
       sources."ini-1.3.5"
+      sources."into-stream-3.1.0"
       sources."invert-kv-3.0.1"
+      sources."ipaddr.js-1.9.1"
       sources."is-absolute-0.1.7"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-arguments-1.0.4"
@@ -103452,15 +103482,18 @@ in
       sources."is-docker-2.1.1"
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.1"
       sources."is-installed-globally-0.3.2"
       sources."is-mergeable-object-1.1.1"
+      sources."is-natural-number-4.0.1"
       sources."is-negative-zero-2.0.0"
       sources."is-npm-5.0.0"
       sources."is-number-7.0.0"
       sources."is-obj-2.0.0"
+      sources."is-object-1.0.1"
       sources."is-path-inside-3.0.2"
+      sources."is-plain-obj-1.1.0"
       (sources."is-plain-object-2.0.4" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -103468,7 +103501,8 @@ in
       })
       sources."is-regex-1.1.1"
       sources."is-relative-0.1.3"
-      sources."is-stream-2.0.0"
+      sources."is-retry-allowed-1.2.0"
+      sources."is-stream-1.1.0"
       sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
@@ -103479,6 +103513,7 @@ in
       sources."isexe-2.0.0"
       sources."isobject-2.1.0"
       sources."isstream-0.1.2"
+      sources."isurl-1.0.0"
       sources."jed-1.1.1"
       sources."jetpack-id-1.0.0"
       sources."js-select-0.6.0"
@@ -103504,16 +103539,10 @@ in
       sources."jszip-2.6.1"
       sources."jwa-1.4.1"
       sources."jws-3.2.2"
-      sources."keyv-3.1.0"
+      sources."keyv-3.0.0"
       sources."kind-of-6.0.3"
       sources."latest-version-5.1.0"
-      (sources."lazystream-1.0.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."lazystream-1.0.0"
       sources."lcid-3.1.1"
       sources."levn-0.4.1"
       sources."lighthouse-logger-1.2.0"
@@ -103534,18 +103563,24 @@ in
       sources."lodash.sortby-4.7.0"
       sources."lodash.union-4.6.0"
       sources."lowercase-keys-1.0.1"
-      (sources."make-dir-3.1.0" // {
+      (sources."make-dir-2.1.0" // {
         dependencies = [
-          sources."semver-6.3.0"
+          sources."semver-5.7.1"
         ];
       })
       sources."map-age-cleaner-0.1.3"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."marky-1.2.1"
-      sources."mdn-browser-compat-data-1.0.40"
-      sources."mem-5.1.1"
+      sources."media-typer-0.3.0"
+      (sources."mem-5.1.1" // {
+        dependencies = [
+          sources."p-is-promise-2.1.0"
+        ];
+      })
+      sources."merge-descriptors-1.0.1"
       sources."merge-stream-2.0.0"
+      sources."methods-1.1.2"
       (sources."micromatch-3.1.10" // {
         dependencies = [
           (sources."braces-2.3.2" // {
@@ -103567,6 +103602,7 @@ in
           sources."to-regex-range-2.1.1"
         ];
       })
+      sources."mime-1.6.0"
       sources."mime-db-1.44.0"
       sources."mime-types-2.1.27"
       sources."mimic-fn-2.1.0"
@@ -103591,11 +103627,12 @@ in
       })
       sources."mz-2.7.0"
       sources."nan-2.14.2"
-      sources."nanoid-3.1.16"
+      sources."nanoid-3.1.18"
       sources."nanomatch-1.2.13"
       sources."natural-compare-1.4.0"
       sources."natural-compare-lite-1.4.0"
       sources."ncp-2.0.0"
+      sources."negotiator-0.6.2"
       sources."neo-async-2.6.2"
       sources."next-tick-1.1.0"
       sources."node-forge-0.10.0"
@@ -103605,7 +103642,11 @@ in
         ];
       })
       sources."normalize-path-3.0.0"
-      sources."normalize-url-4.5.0"
+      (sources."normalize-url-2.0.1" // {
+        dependencies = [
+          sources."sort-keys-2.0.0"
+        ];
+      })
       sources."npm-run-path-4.0.1"
       sources."nth-check-1.0.2"
       sources."oauth-sign-0.9.0"
@@ -103637,20 +103678,32 @@ in
           sources."isobject-3.0.1"
         ];
       })
+      sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
       sources."open-7.3.0"
       sources."optionator-0.9.1"
       sources."os-locale-5.0.0"
       sources."os-shim-0.1.3"
-      sources."p-cancelable-1.1.0"
+      sources."p-cancelable-0.4.1"
       sources."p-defer-1.0.0"
-      sources."p-is-promise-2.1.0"
+      sources."p-event-2.3.1"
+      sources."p-finally-1.0.0"
+      sources."p-is-promise-1.1.0"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
+      sources."p-timeout-2.0.1"
       sources."p-try-2.2.0"
       (sources."package-json-6.5.0" // {
         dependencies = [
+          sources."@sindresorhus/is-0.14.0"
+          sources."cacheable-request-6.1.0"
+          sources."get-stream-5.2.0"
+          sources."got-9.6.0"
+          sources."http-cache-semantics-4.1.0"
+          sources."lowercase-keys-2.0.0"
+          sources."normalize-url-4.5.0"
+          sources."p-cancelable-1.1.0"
           sources."semver-6.3.0"
         ];
       })
@@ -103658,39 +103711,45 @@ in
       sources."parent-module-1.0.1"
       sources."parse-json-5.0.1"
       sources."parse5-3.0.3"
+      sources."parseurl-1.3.3"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
+      sources."path-to-regexp-0.1.7"
       sources."pend-1.2.0"
       sources."performance-now-2.1.0"
       sources."picomatch-2.2.2"
-      (sources."pino-6.7.0" // {
-        dependencies = [
-          sources."fast-redact-3.0.0"
-        ];
-      })
+      sources."pify-4.0.1"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."pino-6.7.0"
       sources."pino-std-serializers-2.5.0"
       sources."posix-character-classes-0.1.1"
-      sources."postcss-8.1.1"
+      sources."postcss-8.1.7"
       sources."prelude-ls-1.2.1"
       sources."prepend-http-2.0.0"
+      sources."printj-1.1.2"
       sources."probe-image-size-5.0.0"
       sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
+      sources."proxy-addr-2.0.6"
       sources."psl-1.8.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."pupa-2.1.1"
-      sources."qs-6.5.2"
+      sources."qs-6.7.0"
+      sources."query-string-5.1.1"
       sources."quick-format-unescaped-4.0.1"
+      sources."range-parser-1.2.1"
+      sources."raw-body-2.4.0"
       (sources."rc-1.2.8" // {
         dependencies = [
           sources."strip-json-comments-2.0.1"
         ];
       })
-      sources."readable-stream-3.6.0"
+      sources."readable-stream-2.3.7"
       sources."readdir-glob-1.1.1"
       sources."readdirp-3.5.0"
       sources."regenerator-runtime-0.13.7"
@@ -103716,7 +103775,11 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."request-2.88.2"
+      (sources."request-2.88.2" // {
+        dependencies = [
+          sources."qs-6.5.2"
+        ];
+      })
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."resolve-from-4.0.0"
@@ -103724,23 +103787,32 @@ in
       sources."responselike-1.0.2"
       sources."ret-0.1.15"
       sources."rimraf-2.6.3"
-      sources."safe-buffer-5.2.1"
+      sources."safe-buffer-5.1.2"
+      sources."safe-compare-1.1.4"
       sources."safe-json-stringify-1.2.0"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
+      sources."seek-bzip-1.0.6"
       sources."semver-7.3.2"
       (sources."semver-diff-3.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
+      (sources."send-0.17.1" // {
+        dependencies = [
+          sources."ms-2.1.1"
+        ];
+      })
+      sources."serve-static-1.14.1"
       sources."set-blocking-2.0.0"
       (sources."set-value-2.0.1" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
         ];
       })
+      sources."setprototypeof-1.1.1"
       sources."sha.js-2.4.11"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
@@ -103757,6 +103829,7 @@ in
           sources."ansi-styles-3.2.1"
           sources."color-convert-1.9.3"
           sources."color-name-1.1.3"
+          sources."is-fullwidth-code-point-2.0.0"
         ];
       })
       (sources."snapdragon-0.8.2" // {
@@ -103790,6 +103863,8 @@ in
         ];
       })
       sources."sonic-boom-1.3.0"
+      sources."sort-keys-1.1.2"
+      sources."sort-keys-length-1.0.1"
       sources."source-map-0.6.1"
       sources."source-map-resolve-0.5.3"
       sources."source-map-support-0.5.19"
@@ -103816,41 +103891,51 @@ in
           sources."kind-of-5.1.0"
         ];
       })
+      sources."statuses-1.5.0"
       sources."stream-parser-0.3.1"
       sources."stream-to-array-2.3.0"
       sources."stream-to-promise-3.0.0"
-      (sources."string-width-3.1.0" // {
+      sources."strict-uri-encode-1.1.0"
+      (sources."string-width-4.2.0" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."strip-ansi-5.2.0"
+          sources."ansi-regex-5.0.0"
+          sources."strip-ansi-6.0.0"
         ];
       })
-      sources."string.prototype.trimend-1.0.2"
-      sources."string.prototype.trimstart-1.0.2"
-      sources."string_decoder-1.3.0"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
+      sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-4.0.0"
       sources."strip-bom-buf-2.0.0"
-      (sources."strip-bom-stream-4.0.0" // {
-        dependencies = [
-          sources."first-chunk-stream-3.0.0"
-        ];
-      })
+      sources."strip-bom-stream-4.0.0"
+      sources."strip-dirs-2.1.0"
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-3.1.1"
+      sources."strip-outer-1.0.1"
       sources."supports-color-7.2.0"
-      sources."table-5.4.6"
-      sources."tar-stream-2.1.4"
+      (sources."table-5.4.6" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."emoji-regex-7.0.3"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
+      sources."tar-stream-1.6.2"
       sources."term-size-2.2.1"
       sources."text-table-0.2.0"
       sources."thenify-3.3.1"
       sources."thenify-all-1.6.0"
       sources."through-2.3.8"
+      sources."timed-out-4.0.1"
       (sources."tmp-0.2.1" // {
         dependencies = [
           sources."rimraf-3.0.2"
         ];
       })
+      sources."to-buffer-1.1.1"
       (sources."to-object-path-0.3.0" // {
         dependencies = [
           sources."kind-of-3.2.2"
@@ -103859,20 +103944,25 @@ in
       sources."to-readable-stream-1.0.0"
       sources."to-regex-3.0.2"
       sources."to-regex-range-5.0.1"
+      sources."toidentifier-1.0.0"
       sources."tosource-1.0.0"
       sources."tough-cookie-2.5.0"
       sources."tr46-2.0.2"
       sources."traverse-0.4.6"
+      sources."trim-repeated-1.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.4.0"
       sources."type-detect-4.0.8"
       sources."type-fest-0.8.1"
+      sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."typedarray-to-buffer-3.1.5"
+      sources."unbzip2-stream-1.4.3"
       sources."union-value-1.0.1"
       sources."unique-string-2.0.0"
       sources."universalify-0.1.2"
+      sources."unpipe-1.0.0"
       (sources."unset-value-1.0.0" // {
         dependencies = [
           (sources."has-value-0.3.1" // {
@@ -103884,15 +103974,18 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."upath-2.0.0"
+      sources."upath-2.0.1"
       sources."update-notifier-5.0.0"
       sources."uri-js-4.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.1"
       sources."util-deprecate-1.0.2"
+      sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
       sources."v8-compile-cache-2.2.0"
+      sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."watchpack-1.7.4"
       (sources."watchpack-chokidar2-2.0.1" // {
@@ -103911,10 +104004,7 @@ in
           sources."isobject-3.0.1"
           sources."kind-of-3.2.2"
           sources."normalize-path-2.1.1"
-          sources."readable-stream-2.3.7"
           sources."readdirp-2.2.1"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
           sources."to-regex-range-2.1.1"
           sources."upath-1.2.0"
         ];
@@ -103925,23 +104015,12 @@ in
       sources."when-3.7.7"
       sources."which-2.0.2"
       sources."which-module-2.0.0"
-      (sources."widest-line-3.1.0" // {
-        dependencies = [
-          sources."ansi-regex-5.0.0"
-          sources."emoji-regex-8.0.0"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."string-width-4.2.0"
-          sources."strip-ansi-6.0.0"
-        ];
-      })
+      sources."widest-line-3.1.0"
       sources."winreg-0.0.12"
       sources."word-wrap-1.2.3"
-      (sources."wrap-ansi-6.2.0" // {
+      (sources."wrap-ansi-7.0.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
-          sources."emoji-regex-8.0.0"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."string-width-4.2.0"
           sources."strip-ansi-6.0.0"
         ];
       })
@@ -103956,30 +104035,32 @@ in
       sources."xdg-basedir-4.0.0"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
-      sources."y18n-4.0.0"
+      sources."xtend-4.0.2"
+      sources."y18n-5.0.5"
       (sources."yargs-15.4.1" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
-          sources."decamelize-1.2.0"
-          sources."emoji-regex-8.0.0"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."string-width-4.2.0"
-          sources."strip-ansi-6.0.0"
-        ];
-      })
-      (sources."yargs-parser-18.1.3" // {
-        dependencies = [
           sources."camelcase-5.3.1"
+          sources."cliui-6.0.0"
           sources."decamelize-1.2.0"
+          sources."strip-ansi-6.0.0"
+          sources."wrap-ansi-6.2.0"
+          sources."y18n-4.0.0"
+          sources."yargs-parser-18.1.3"
         ];
       })
+      sources."yargs-parser-20.2.4"
       sources."yauzl-2.10.0"
       (sources."zip-dir-1.0.2" // {
         dependencies = [
           sources."async-1.5.2"
         ];
       })
-      sources."zip-stream-4.0.2"
+      (sources."zip-stream-4.0.4" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -103994,17 +104075,17 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "5.5.0";
+    version = "5.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.5.0.tgz";
-      sha512 = "gyr7VE8zXJP81ZvS8+5dDphS2kaE0r8bpVWX6SxkBlzlX3hYfBS96kaltuf2cYK/BKJlUw5Aex/fKC34HUn+hA==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-5.6.0.tgz";
+      sha512 = "SIeFuBhuheKElRbd84O35UhKc0nxlgSwtzm2ksZ0BVhRJqxVJxEguT/pYhfiR0le/pxTa1VsCp7EOYyTsa6XOA==";
     };
     dependencies = [
       sources."@types/eslint-7.2.5"
       sources."@types/eslint-scope-3.7.0"
       sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
       sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -104030,12 +104111,12 @@ in
       sources."ajv-keywords-3.5.2"
       sources."browserslist-4.14.7"
       sources."buffer-from-1.1.1"
-      sources."caniuse-lite-1.0.30001159"
+      sources."caniuse-lite-1.0.30001161"
       sources."chrome-trace-event-1.0.2"
       sources."colorette-1.2.1"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.598"
-      sources."enhanced-resolve-5.3.1"
+      sources."electron-to-chromium-1.3.606"
+      sources."enhanced-resolve-5.3.2"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"
       (sources."esrecurse-4.3.0" // {
@@ -104076,7 +104157,7 @@ in
       sources."source-map-support-0.5.19"
       sources."supports-color-7.2.0"
       sources."tapable-2.1.1"
-      (sources."terser-5.4.0" // {
+      (sources."terser-5.5.0" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -104194,7 +104275,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
       sources."ajv-errors-1.0.1"
@@ -104300,7 +104381,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      (sources."debug-4.3.0" // {
+      (sources."debug-4.3.1" // {
         dependencies = [
           sources."ms-2.1.2"
         ];
@@ -104542,7 +104623,7 @@ in
       sources."pkg-dir-3.0.0"
       (sources."portfinder-1.0.28" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."ms-2.1.2"
         ];
       })
@@ -104655,7 +104736,7 @@ in
       sources."sockjs-0.3.20"
       (sources."sockjs-client-1.4.0" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."faye-websocket-0.11.3"
           sources."ms-2.1.2"
         ];
@@ -104694,8 +104775,8 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."string.prototype.trimend-1.0.2"
-      sources."string.prototype.trimstart-1.0.2"
+      sources."string.prototype.trimend-1.0.3"
+      sources."string.prototype.trimstart-1.0.3"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -104780,10 +104861,10 @@ in
   copy-webpack-plugin = nodeEnv.buildNodePackage {
     name = "copy-webpack-plugin";
     packageName = "copy-webpack-plugin";
-    version = "6.3.1";
+    version = "6.3.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.1.tgz";
-      sha512 = "SyIMdP6H3v+zPU+VIhKRsK0ZEF82KZ93JBlKOoIW8SkkuI84FSrHxG+aMTE1u4csbi9PLRqqWTIK+bfJ2xsFuQ==";
+      url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz";
+      sha512 = "MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA==";
     };
     dependencies = [
       sources."@nodelib/fs.scandir-2.1.3"
@@ -104894,10 +104975,10 @@ in
   webtorrent-cli = nodeEnv.buildNodePackage {
     name = "webtorrent-cli";
     packageName = "webtorrent-cli";
-    version = "3.2.0";
+    version = "3.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.2.0.tgz";
-      sha512 = "7XNNVzaGIoUuPouqLYNji+59kmNZSqeN0uqla4Z/i0x5XqlhocRGcm7gfhvBLXShyVcxyveUNjTOz3Z5NTTQTg==";
+      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.2.1.tgz";
+      sha512 = "DHUtDymD5ZGv/h35FY4n9YdlHoNOy07X7ibexi+19AL/+MFdGuIIQEEnJQT/wA05mrzR6ubeJmcLXXqZISwLFQ==";
     };
     dependencies = [
       sources."@protobufjs/aspromise-1.1.2"
@@ -104911,7 +104992,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.31"
+      sources."@types/node-13.13.32"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
       sources."balanced-match-1.0.0"
@@ -104922,26 +105003,26 @@ in
       sources."bitfield-4.0.0"
       (sources."bittorrent-dht-10.0.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
       (sources."bittorrent-lsd-1.1.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
       sources."bittorrent-peerid-1.3.3"
       (sources."bittorrent-protocol-3.2.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
       (sources."bittorrent-tracker-9.15.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."decompress-response-6.0.0"
           sources."mimic-response-3.1.0"
           sources."ms-2.1.2"
@@ -104953,7 +105034,7 @@ in
       sources."bn.js-5.1.3"
       sources."brace-expansion-1.1.11"
       sources."browserify-package-json-1.0.1"
-      sources."buffer-6.0.2"
+      sources."buffer-6.0.3"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-fill-1.0.0"
@@ -104962,7 +105043,7 @@ in
       sources."bufferutil-4.0.2"
       (sources."castv2-0.1.10" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -105014,7 +105095,7 @@ in
         ];
       })
       sources."fs.realpath-1.0.0"
-      sources."get-browser-rtc-1.0.2"
+      sources."get-browser-rtc-1.1.0"
       sources."get-stdin-7.0.0"
       sources."glob-7.1.6"
       sources."he-1.2.0"
@@ -105098,7 +105179,7 @@ in
       sources."protobufjs-6.10.2"
       sources."pump-3.0.0"
       sources."qap-3.3.1"
-      sources."queue-microtask-1.2.0"
+      sources."queue-microtask-1.2.2"
       sources."random-access-file-2.1.4"
       sources."random-access-storage-1.4.1"
       sources."random-iterate-1.0.1"
@@ -105107,9 +105188,9 @@ in
       sources."range-slice-stream-2.0.0"
       sources."readable-stream-3.6.0"
       sources."record-cache-1.1.0"
-      (sources."render-media-4.0.0" // {
+      (sources."render-media-4.0.1" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -105125,14 +105206,14 @@ in
       sources."simple-get-2.8.1"
       (sources."simple-peer-9.9.3" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
       sources."simple-sha1-3.0.1"
       (sources."simple-websocket-8.1.1" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -105154,7 +105235,7 @@ in
       sources."to-arraybuffer-1.0.1"
       (sources."torrent-discovery-9.4.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -105169,7 +105250,7 @@ in
       sources."url-join-4.0.1"
       (sources."ut_metadata-3.5.2" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."ms-2.1.2"
         ];
       })
@@ -105181,7 +105262,7 @@ in
       sources."vlc-command-1.2.0"
       (sources."webtorrent-0.111.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."decompress-response-6.0.0"
           sources."get-stdin-8.0.0"
           sources."magnet-uri-6.1.0"
@@ -105256,10 +105337,10 @@ in
   yaml-language-server = nodeEnv.buildNodePackage {
     name = "yaml-language-server";
     packageName = "yaml-language-server";
-    version = "0.12.0";
+    version = "0.13.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.12.0.tgz";
-      sha512 = "EAr9fJi05wVWsFVgc4s0AI74nT6D2oN7xcy7W+7JCkvirbm0L7aPDRAjSz6z/dXVyYyFlEAgRWVThXzqguFyTw==";
+      url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.13.0.tgz";
+      sha512 = "5FHW7dUAyIjEM3mRzIplE0pZut2K30cA+K7coaOxFxi82LTk/oiVLS4/AQFnOtGicSyoi4YOiRqpMZ04vgtuew==";
     };
     dependencies = [
       sources."agent-base-4.3.0"
@@ -105343,7 +105424,7 @@ in
       sources."@sindresorhus/is-0.7.0"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.8"
+      sources."@types/node-14.14.9"
       sources."@types/normalize-package-data-2.4.0"
       sources."JSONStream-1.3.5"
       sources."aggregate-error-3.1.0"
@@ -106190,7 +106271,7 @@ in
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
           sources."cross-spawn-7.0.3"
-          sources."debug-3.2.6"
+          sources."debug-3.2.7"
           sources."execa-4.1.0"
           sources."figures-3.2.0"
           sources."get-stream-5.2.0"
@@ -106229,7 +106310,7 @@ in
       })
       (sources."yeoman-generator-4.12.0" // {
         dependencies = [
-          sources."debug-4.3.0"
+          sources."debug-4.3.1"
           sources."diff-4.0.2"
           sources."dir-glob-2.2.2"
           sources."ejs-3.1.5"

From 4d51f95638a8ca1d1c8f911a9f6e6baf34b9a7c0 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 24 Nov 2020 13:55:04 +0100
Subject: [PATCH 3483/3942] appimage-run: parse readelf's output in C locale

fixes #101137
---
 pkgs/build-support/appimage/appimage-exec.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh
index 82ebdd0bbe4a..7986c589667b 100755
--- a/pkgs/build-support/appimage/appimage-exec.sh
+++ b/pkgs/build-support/appimage/appimage-exec.sh
@@ -1,4 +1,6 @@
 #!@shell@
+# shellcheck shell=bash
+
 if [ -n "$DEBUG" ] ; then
   set -x
 fi
@@ -13,8 +15,10 @@ unpack() {
   local out="$2"
 
   # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63
-  local appimageSignature=$(readelf -h "$src" | awk 'NR==2{print $10$11;}')
-  local appimageType=$(readelf -h "$src" | awk 'NR==2{print $12;}')
+  local appimageSignature;
+  appimageSignature="$(LC_ALL=C readelf -h "$src" | awk 'NR==2{print $10$11;}')"
+  local appimageType;
+  appimageType="$(LC_ALL=C readelf -h "$src" | awk 'NR==2{print $12;}')"
 
   # check AppImage signature
   if [ "$appimageSignature" != "4149" ]; then
@@ -35,7 +39,7 @@ unpack() {
 
       # multiarch offset one-liner using same method as AppImage
       # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93
-      offset=$(readelf -h "$src" | awk 'NR==13{e_shoff=$5} NR==18{e_shentsize=$5} NR==19{e_shnum=$5} END{print e_shoff+e_shentsize*e_shnum}')
+      offset=$(LC_ALL=C readelf -h "$src" | awk 'NR==13{e_shoff=$5} NR==18{e_shentsize=$5} NR==19{e_shnum=$5} END{print e_shoff+e_shentsize*e_shnum}')
       echo "Uncompress $(basename "$src") of type $appimageType @ offset $offset"
       unsquashfs -q -d "$out" -o "$offset" "$src"
       chmod go-w "$out"

From 53fa857092204f29f7058dba9c57bea012d18554 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Tue, 24 Nov 2020 14:30:15 +0100
Subject: [PATCH 3484/3942] moosefs: fix mfscli

python in buildInputs fixes automatically mfscli and mfscgiserv.
---
 pkgs/tools/filesystems/moosefs/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix
index 2be21cea3a57..48c005e1caaf 100644
--- a/pkgs/tools/filesystems/moosefs/default.nix
+++ b/pkgs/tools/filesystems/moosefs/default.nix
@@ -22,12 +22,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig makeWrapper ];
 
   buildInputs =
-    [ fuse libpcap zlib ];
+    [ fuse libpcap zlib python ];
 
   postInstall = ''
     substituteInPlace $out/sbin/mfscgiserv --replace "datapath=\"$out" "datapath=\""
-    wrapProgram $out/sbin/mfscgiserv \
-        --prefix PATH ":" "${python}/bin"
   '';
 
   meta = with stdenv.lib; {

From 85605c8a296bd54e9c12e1bd1c33bf1e100d40b7 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 24 Nov 2020 06:20:01 +0100
Subject: [PATCH 3485/3942] lib.lists.unique: Switch from recursive function to
 using a fold

This improves performance by ~30-40% for smaller test cases and makes
larger cases where my laptop would OOM pass in seconds.
---
 lib/lists.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 6c97e0686aa8..06cee2eb112a 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -640,13 +640,7 @@ rec {
        unique [ 3 2 3 4 ]
        => [ 3 2 4 ]
    */
-  unique = list:
-    if list == [] then
-      []
-    else
-      let
-        x = head list;
-      in [x] ++ unique (remove x list);
+ unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [];
 
   /* Intersects list 'e' and another list. O(nm) complexity.
 

From 160c5e93766a67d41452eb248d0d6f848d30f03b Mon Sep 17 00:00:00 2001
From: Alvar Penning <post@0x21.biz>
Date: Tue, 24 Nov 2020 14:36:19 +0100
Subject: [PATCH 3486/3942] platformio: 5.0.2 -> 5.0.3

In addition to the version change, the source is managed in a central
location, since previously the same change had to be made in two places.
---
 pkgs/development/arduino/platformio/chrootenv.nix | 12 ++----------
 pkgs/development/arduino/platformio/core.nix      | 13 +++----------
 pkgs/development/arduino/platformio/default.nix   | 14 ++++++++++++--
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix
index 81cc8f371f4f..72384c0994a2 100644
--- a/pkgs/development/arduino/platformio/chrootenv.nix
+++ b/pkgs/development/arduino/platformio/chrootenv.nix
@@ -1,11 +1,11 @@
-{ lib, buildFHSUserEnv, fetchFromGitHub }:
+{ lib, buildFHSUserEnv, version, src }:
 
 let
   pio-pkgs = pkgs:
     let
       python = pkgs.python3.override {
         packageOverrides = self: super: {
-          platformio = self.callPackage ./core.nix { };
+          platformio = self.callPackage ./core.nix { inherit version src; };
         };
       };
     in (with pkgs; [
@@ -19,14 +19,6 @@ let
       platformio
     ]);
 
-  src = fetchFromGitHub {
-    owner = "platformio";
-    repo = "platformio-core";
-    rev = "v5.0.2";
-    sha256 = "1hbw8nbllyj0xyx1rz2chx9vyqf9949dcdx4v9hnfbsjwwpcfi0a";
-  };
-
-
 in buildFHSUserEnv {
   name = "platformio";
 
diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix
index 42e1e49b41fb..a039314d753d 100644
--- a/pkgs/development/arduino/platformio/core.nix
+++ b/pkgs/development/arduino/platformio/core.nix
@@ -1,9 +1,10 @@
-{ stdenv, lib, buildPythonApplication, fetchFromGitHub, fetchpatch
+{ stdenv, lib, buildPythonApplication, fetchpatch
 , bottle, click, colorama, semantic-version
 , lockfile, pyserial, requests
 , tabulate, pyelftools, marshmallow
 , pytest, tox, jsondiff
 , git, spdx-license-list-data
+, version, src
 }:
 
 let
@@ -75,15 +76,7 @@ let
 
 in buildPythonApplication rec {
   pname = "platformio";
-  version = "5.0.2";
-
-  # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
-  src = fetchFromGitHub {
-    owner = "platformio";
-    repo = "platformio-core";
-    rev = "v${version}";
-    sha256 = "1hbw8nbllyj0xyx1rz2chx9vyqf9949dcdx4v9hnfbsjwwpcfi0a";
-  };
+  inherit version src;
 
   propagatedBuildInputs =  [
     bottle click colorama git lockfile
diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix
index 280fd496650c..248d07adf6e1 100644
--- a/pkgs/development/arduino/platformio/default.nix
+++ b/pkgs/development/arduino/platformio/default.nix
@@ -1,11 +1,21 @@
 
-{ newScope }:
+{ newScope, fetchFromGitHub }:
 
 let
   callPackage = newScope self;
 
+  version = "5.0.3";
+
+  # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
+  src = fetchFromGitHub {
+    owner = "platformio";
+    repo = "platformio-core";
+    rev = "v${version}";
+    sha256 = "0sf5dy0cmhy66rmk0hq1by7nrmf7qz0a99hrk55dpbp6r6vnk3hw";
+  };
+
   self = {
-      platformio-chrootenv = callPackage ./chrootenv.nix { };
+    platformio-chrootenv = callPackage ./chrootenv.nix { inherit version src; };
   };
 
 in self

From 31589fe918a19b09bc778ebbcd75b0ca1f445eaa Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Mon, 9 Nov 2020 22:33:46 +0000
Subject: [PATCH 3487/3942] terraform-providers: support providers with Go
 module

---
 .../cluster/terraform-providers/default.nix   | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 6ce7ad6092af..a66da4748c14 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -1,4 +1,5 @@
 { lib
+, buildGoModule
 , buildGoPackage
 , fetchFromGitHub
 , callPackage
@@ -7,7 +8,23 @@
 let
   list = lib.importJSON ./providers.json;
 
-  toDrv = name: data:
+  buildWithGoModule = data:
+    buildGoModule {
+      pname = data.repo;
+      version = data.version;
+      subPackages = [ "." ];
+      src = fetchFromGitHub {
+        inherit (data) owner repo rev sha256;
+      };
+      vendorSha256 = data.vendorSha256 or null;
+
+      # Terraform allow checking the provider versions, but this breaks
+      # if the versions are not provided via file paths.
+      postBuild = "mv $NIX_BUILD_TOP/go/bin/${data.repo}{,_v${data.version}}";
+      passthru = data;
+    };
+
+  buildWithGoPackage = data:
     buildGoPackage {
       pname = data.repo;
       version = data.version;
@@ -50,7 +67,9 @@ let
     });
 
   # These providers are managed with the ./update-all script
-  automated-providers = lib.mapAttrs (toDrv) list;
+  automated-providers = lib.mapAttrs (_: attrs:
+    (if (lib.hasAttr "vendorSha256" attrs) then buildWithGoModule else buildWithGoPackage)
+      attrs) list;
 
   # These are the providers that don't fall in line with the default model
   special-providers = {

From a35f2851d49fab3d28cd5f56e8059c7e0963ca8c Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sat, 14 Nov 2020 16:01:08 +0000
Subject: [PATCH 3488/3942] terraform-providers.aws: 2.65.0 -> 3.15.0

---
 .../cluster/terraform-providers/providers.json           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a31df93c1efd..8758f1c0cdd5 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -66,12 +66,13 @@
     "version": "2.14.1"
   },
   "aws": {
-    "owner": "terraform-providers",
+    "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/aws",
     "repo": "terraform-provider-aws",
-    "rev": "v2.65.0",
-    "sha256": "005vs1qd6payicxldc9lr4w6kzr58xw9b930j52g1q7hlddl5mbb",
-    "version": "2.65.0"
+    "rev": "v3.15.0",
+    "sha256": "0rxpdxg5p478sipbhq2x347gs5wrlwz4ggy9z007cbp34yhb2wka",
+    "vendorSha256": "0vapfnd4c8jb15pdjnnb97vgsvfakjvl1czccbfy0znhdk2ynz02",
+    "version": "3.15.0"
   },
   "azuread": {
     "owner": "terraform-providers",

From 214f9d2a519efd093b6c0c3d67b9b0a4bd750daf Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sat, 14 Nov 2020 16:35:36 +0000
Subject: [PATCH 3489/3942] terraform-providers.dns: 2.2.0 -> 3.0.0

---
 .../networking/cluster/terraform-providers/default.nix    | 8 --------
 .../networking/cluster/terraform-providers/providers.json | 7 ++++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index a66da4748c14..a91f352be54a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -96,14 +96,6 @@ let
       '';
     });
 
-    # https://github.com/hashicorp/terraform-provider-dns/pull/101
-    dns = automated-providers.dns.overrideAttrs (attrs: {
-      prePatch = attrs.prePatch or "" + ''
-        substituteInPlace go.mod --replace terraform-providers/terraform-provider-dns hashicorp/terraform-provider-dns
-        substituteInPlace main.go --replace terraform-providers/terraform-provider-dns hashicorp/terraform-provider-dns
-      '';
-    });
-
     # https://github.com/hashicorp/terraform-provider-external/pull/41
     external = automated-providers.external.overrideAttrs (attrs: {
       prePatch = attrs.prePatch or "" + ''
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 8758f1c0cdd5..bf5f9502c050 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -251,9 +251,10 @@
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/dns",
     "repo": "terraform-provider-dns",
-    "rev": "v2.2.0",
-    "sha256": "11xdxj6hfclaq9glbh14nihmrsk220crm9ld8bdv77w0bppmrrch",
-    "version": "2.2.0"
+    "rev": "v3.0.0",
+    "sha256": "160dbmg7xg7iyc70f66dphyiysrdbscwya2n28idi8wp5rjx8bid",
+    "vendorSha256": null,
+    "version": "3.0.0"
   },
   "dnsimple": {
     "owner": "terraform-providers",

From fca860edaab7c949f436f8757bf3845c979aa94e Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sat, 14 Nov 2020 16:41:56 +0000
Subject: [PATCH 3490/3942] terraform-providers.random: build with Go module

---
 .../networking/cluster/terraform-providers/default.nix    | 8 --------
 .../networking/cluster/terraform-providers/providers.json | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index a91f352be54a..06cc94701077 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -136,14 +136,6 @@ let
       '';
     });
 
-    # https://github.com/hashicorp/terraform-provider-random/pull/107
-    random = automated-providers.random.overrideAttrs (attrs: {
-      prePatch = attrs.prePatch or "" + ''
-        substituteInPlace go.mod --replace terraform-providers/terraform-provider-random hashicorp/terraform-provider-random
-        substituteInPlace main.go --replace terraform-providers/terraform-provider-random hashicorp/terraform-provider-random
-      '';
-    });
-
     # https://github.com/hashicorp/terraform-provider-template/pull/79
     template = automated-providers.template.overrideAttrs (attrs: {
       prePatch = attrs.prePatch or "" + ''
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index bf5f9502c050..ca46e7bdc262 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -787,6 +787,7 @@
     "repo": "terraform-provider-random",
     "rev": "v3.0.0",
     "sha256": "00dkpcri9ckp0kxwgh3p8175cyd44m8z13cb013pm4mrr61n4wq9",
+    "vendorSha256": null,
     "version": "3.0.0"
   },
   "rightscale": {

From d4f3c08e2626e250a16ee3c11e408300c7f44d13 Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sat, 14 Nov 2020 16:45:52 +0000
Subject: [PATCH 3491/3942] terraform-providers.null: build with Go module

---
 .../networking/cluster/terraform-providers/default.nix    | 8 --------
 .../networking/cluster/terraform-providers/providers.json | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 06cc94701077..a18c236096ff 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -128,14 +128,6 @@ let
       '';
     });
 
-    # https://github.com/hashicorp/terraform-provider-null/pull/43
-    null = automated-providers.null.overrideAttrs (attrs: {
-      prePatch = attrs.prePatch or "" + ''
-        substituteInPlace go.mod --replace terraform-providers/terraform-provider-null hashicorp/terraform-provider-null
-        substituteInPlace main.go --replace terraform-providers/terraform-provider-null hashicorp/terraform-provider-null
-      '';
-    });
-
     # https://github.com/hashicorp/terraform-provider-template/pull/79
     template = automated-providers.template.overrideAttrs (attrs: {
       prePatch = attrs.prePatch or "" + ''
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index ca46e7bdc262..d7a11e49d8ac 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -617,6 +617,7 @@
     "repo": "terraform-provider-null",
     "rev": "v3.0.0",
     "sha256": "0r1kvsc96922i85hdvf1pk8aicxjr6bc69gc63qi21hrl0jpvr7r",
+    "vendorSha256": null,
     "version": "3.0.0"
   },
   "nutanix": {

From b98455973d739d0de96f59b3edb128a6bf1ac1ae Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sat, 14 Nov 2020 16:47:02 +0000
Subject: [PATCH 3492/3942] terraform-providers.tls: build with Go module

---
 .../networking/cluster/terraform-providers/default.nix    | 8 --------
 .../networking/cluster/terraform-providers/providers.json | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index a18c236096ff..a50a78ccffba 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -136,14 +136,6 @@ let
       '';
     });
 
-    # https://github.com/hashicorp/terraform-provider-tls/pull/71
-    tls = automated-providers.tls.overrideAttrs (attrs: {
-      prePatch = attrs.prePatch or "" + ''
-        substituteInPlace go.mod --replace terraform-providers/terraform-provider-tls hashicorp/terraform-provider-tls
-        substituteInPlace main.go --replace terraform-providers/terraform-provider-tls hashicorp/terraform-provider-tls
-      '';
-    });
-
     # Packages that don't fit the default model
     ansible = callPackage ./ansible {};
     cloudfoundry = callPackage ./cloudfoundry {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index d7a11e49d8ac..41470953844f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -946,6 +946,7 @@
     "repo": "terraform-provider-tls",
     "rev": "v3.0.0",
     "sha256": "1p9d5wrr4xwf2i930zlcarm1zl8ysj3nyc6rrbhpxk04kr6ap0wz",
+    "vendorSha256": null,
     "version": "3.0.0"
   },
   "triton": {

From ba45f19dc714974fdba7bd59e6ab4c90b9e40c64 Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sat, 14 Nov 2020 16:49:59 +0000
Subject: [PATCH 3493/3942] terraform-providers.template: build with Go module

---
 .../networking/cluster/terraform-providers/default.nix    | 8 --------
 .../networking/cluster/terraform-providers/providers.json | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index a50a78ccffba..d51e53f9c9bc 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -128,14 +128,6 @@ let
       '';
     });
 
-    # https://github.com/hashicorp/terraform-provider-template/pull/79
-    template = automated-providers.template.overrideAttrs (attrs: {
-      prePatch = attrs.prePatch or "" + ''
-        substituteInPlace go.mod --replace terraform-providers/terraform-provider-template hashicorp/terraform-provider-template
-        substituteInPlace main.go --replace terraform-providers/terraform-provider-template hashicorp/terraform-provider-template
-      '';
-    });
-
     # Packages that don't fit the default model
     ansible = callPackage ./ansible {};
     cloudfoundry = callPackage ./cloudfoundry {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 41470953844f..00c9954ce785 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -909,6 +909,7 @@
     "repo": "terraform-provider-template",
     "rev": "v2.2.0",
     "sha256": "12pn1i06jz4xl50md94yfdggg3pg5bv1viwf35izizm5rnyksyv2",
+    "vendorSha256": null,
     "version": "2.2.0"
   },
   "tencentcloud": {

From 481cb9717df87880f490b969e7f291f860a6d628 Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sat, 14 Nov 2020 16:52:04 +0000
Subject: [PATCH 3494/3942] terraform-providers.local: build with Go module

---
 .../networking/cluster/terraform-providers/default.nix    | 8 --------
 .../networking/cluster/terraform-providers/providers.json | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index d51e53f9c9bc..f433e3b74f26 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -120,14 +120,6 @@ let
       '';
     });
 
-    # https://github.com/hashicorp/terraform-provider-local/pull/40
-    local = automated-providers.local.overrideAttrs (attrs: {
-      prePatch = attrs.prePatch or "" + ''
-        substituteInPlace go.mod --replace terraform-providers/terraform-provider-local hashicorp/terraform-provider-local
-        substituteInPlace main.go --replace terraform-providers/terraform-provider-local hashicorp/terraform-provider-local
-      '';
-    });
-
     # Packages that don't fit the default model
     ansible = callPackage ./ansible {};
     cloudfoundry = callPackage ./cloudfoundry {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 00c9954ce785..d6efd3959c5d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -511,6 +511,7 @@
     "repo": "terraform-provider-local",
     "rev": "v2.0.0",
     "sha256": "0c1mk63lh3qmj8pl80lyvvsgyg4gg7673abr8cfxrj45635h74z5",
+    "vendorSha256": null,
     "version": "2.0.0"
   },
   "logentries": {

From 4a8fbd2044ef66e11616951f8ec323713b6f302d Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sat, 14 Nov 2020 16:54:45 +0000
Subject: [PATCH 3495/3942] terraform-providers.http: 1.2.0 -> 2.0.0

---
 .../networking/cluster/terraform-providers/default.nix    | 8 --------
 .../networking/cluster/terraform-providers/providers.json | 7 ++++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index f433e3b74f26..2fd198d91406 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -112,14 +112,6 @@ let
       '';
     });
 
-    # https://github.com/hashicorp/terraform-provider-http/pull/40
-    http = automated-providers.http.overrideAttrs (attrs: {
-      prePatch = attrs.prePatch or "" + ''
-        substituteInPlace go.mod --replace terraform-providers/terraform-provider-http hashicorp/terraform-provider-http
-        substituteInPlace main.go --replace terraform-providers/terraform-provider-http hashicorp/terraform-provider-http
-      '';
-    });
-
     # Packages that don't fit the default model
     ansible = callPackage ./ansible {};
     cloudfoundry = callPackage ./cloudfoundry {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index d6efd3959c5d..49b9a3661cd3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -395,9 +395,10 @@
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/http",
     "repo": "terraform-provider-http",
-    "rev": "v1.2.0",
-    "sha256": "0q8ichbqrq62q1j0rc7sdz1jzfwg2l9v4ac9jqf6y485dblhmwqd",
-    "version": "1.2.0"
+    "rev": "v2.0.0",
+    "sha256": "0x6a9qf819g16dj9inyvhwff67xy0ixyy70ck56lkidrldara444",
+    "vendorSha256": null,
+    "version": "2.0.0"
   },
   "huaweicloud": {
     "owner": "terraform-providers",

From 6fc4083a2627bc95c78d78d04e04fabc7e48c61d Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sat, 14 Nov 2020 17:08:25 +0000
Subject: [PATCH 3496/3942] terraform-providers.archive: build with Go module

---
 .../networking/cluster/terraform-providers/default.nix    | 8 --------
 .../networking/cluster/terraform-providers/providers.json | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 2fd198d91406..cdf61270de79 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -88,14 +88,6 @@ let
     # providers that were moved to the `hashicorp` organization,
     # but haven't updated their references yet:
 
-    # https://github.com/hashicorp/terraform-provider-archive/pull/67
-    archive = automated-providers.archive.overrideAttrs (attrs: {
-      prePatch = attrs.prePatch or "" + ''
-        substituteInPlace go.mod --replace terraform-providers/terraform-provider-archive hashicorp/terraform-provider-archive
-        substituteInPlace main.go --replace terraform-providers/terraform-provider-archive hashicorp/terraform-provider-archive
-      '';
-    });
-
     # https://github.com/hashicorp/terraform-provider-external/pull/41
     external = automated-providers.external.overrideAttrs (attrs: {
       prePatch = attrs.prePatch or "" + ''
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 49b9a3661cd3..9a7430111e01 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -35,6 +35,7 @@
     "repo": "terraform-provider-archive",
     "rev": "v2.0.0",
     "sha256": "1d5n379zyjp2srg43g78a8h33qwcpkfkj7c35idvbyydi35vzlpl",
+    "vendorSha256": null,
     "version": "2.0.0"
   },
   "arukas": {

From 4377259a93d6e3cfaf89612508ab2ba396e9e9f5 Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sat, 14 Nov 2020 17:09:17 +0000
Subject: [PATCH 3497/3942] terraform-providers.external: build with Go module

---
 .../networking/cluster/terraform-providers/default.nix    | 8 --------
 .../networking/cluster/terraform-providers/providers.json | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index cdf61270de79..fbfdd7aa9606 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -88,14 +88,6 @@ let
     # providers that were moved to the `hashicorp` organization,
     # but haven't updated their references yet:
 
-    # https://github.com/hashicorp/terraform-provider-external/pull/41
-    external = automated-providers.external.overrideAttrs (attrs: {
-      prePatch = attrs.prePatch or "" + ''
-        substituteInPlace go.mod --replace terraform-providers/terraform-provider-external hashicorp/terraform-provider-external
-        substituteInPlace main.go --replace terraform-providers/terraform-provider-external hashicorp/terraform-provider-external
-      '';
-    });
-
     # https://github.com/hashicorp/terraform-provider-helm/pull/522
     helm = automated-providers.helm.overrideAttrs (attrs: {
       prePatch = attrs.prePatch or "" + ''
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 9a7430111e01..7d2a31cc66d4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -298,6 +298,7 @@
     "repo": "terraform-provider-external",
     "rev": "v2.0.0",
     "sha256": "16wciz08gicicsirij2ql0gy8dg0372jjsqmaigkl2n07mqz2b6a",
+    "vendorSha256": null,
     "version": "2.0.0"
   },
   "fastly": {

From 2aca345a59552737bd06685f8534a74d6e1ea32a Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sun, 15 Nov 2020 13:56:53 +0000
Subject: [PATCH 3498/3942] terraform-providers.helm: 1.2.2 -> 1.3.2

---
 .../cluster/terraform-providers/default.nix           | 11 -----------
 .../cluster/terraform-providers/providers.json        |  7 ++++---
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index fbfdd7aa9606..a304b66ecc1d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -85,17 +85,6 @@ let
       '';
     });
 
-    # providers that were moved to the `hashicorp` organization,
-    # but haven't updated their references yet:
-
-    # https://github.com/hashicorp/terraform-provider-helm/pull/522
-    helm = automated-providers.helm.overrideAttrs (attrs: {
-      prePatch = attrs.prePatch or "" + ''
-        substituteInPlace go.mod --replace terraform-providers/terraform-provider-helm hashicorp/terraform-provider-helm
-        substituteInPlace main.go --replace terraform-providers/terraform-provider-helm hashicorp/terraform-provider-helm
-      '';
-    });
-
     # Packages that don't fit the default model
     ansible = callPackage ./ansible {};
     cloudfoundry = callPackage ./cloudfoundry {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 7d2a31cc66d4..481d776d147f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -382,9 +382,10 @@
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/helm",
     "repo": "terraform-provider-helm",
-    "rev": "v1.2.2",
-    "sha256": "1hjlf0pzc9jkcvqi52kvqwmd8v0cvnhhcbahzxmv0zkdwh310c12",
-    "version": "1.2.2"
+    "rev": "v1.3.2",
+    "sha256": "0mpbf03483jqrwd9cx4pdn2pcv4swfs5nbp021gaqr0jf1w970x6",
+    "vendorSha256": null,
+    "version": "1.3.2"
   },
   "heroku": {
     "owner": "terraform-providers",

From 82ae6fc998f0e2d8fa7a00dab8ea3ee1efdf8f9e Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sun, 15 Nov 2020 13:58:06 +0000
Subject: [PATCH 3499/3942] terraform-providers.ibm: 1.7.0 -> 1.14.0

---
 .../networking/cluster/terraform-providers/default.nix    | 1 -
 .../networking/cluster/terraform-providers/providers.json | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index a304b66ecc1d..5cd6408017ba 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -76,7 +76,6 @@ let
     # Override providers that use Go modules + vendor/ folder
     google = patchGoModVendor automated-providers.google;
     google-beta = patchGoModVendor automated-providers.google-beta;
-    ibm = patchGoModVendor automated-providers.ibm;
 
     acme = automated-providers.acme.overrideAttrs (attrs: {
       prePatch = attrs.prePatch or "" + ''
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 481d776d147f..178aa8dc3880 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -419,10 +419,12 @@
   },
   "ibm": {
     "owner": "IBM-Cloud",
+    "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
     "repo": "terraform-provider-ibm",
-    "rev": "v1.7.0",
-    "sha256": "1kb2dxdygvph65hh7qiba9kl9k5aygxxvx3x1qi28jwny594j82a",
-    "version": "1.7.0"
+    "rev": "v1.14.0",
+    "sha256": "1r3y7r0mnbzd7xk6d5f7pvysl3p8vl5i5phya89dfwrk2x9xyw21",
+    "vendorSha256": null,
+    "version": "1.14.0"
   },
   "icinga2": {
     "owner": "terraform-providers",

From 1b413b1ca23207fd68e134a9dc71856c8a67aa70 Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sun, 15 Nov 2020 14:00:10 +0000
Subject: [PATCH 3500/3942] terraform-providers.digitalocean: 1.19.0 -> 2.2.0

---
 .../cluster/terraform-providers/providers.json         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 178aa8dc3880..421b109124a8 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -235,11 +235,13 @@
     "version": "2.7.0"
   },
   "digitalocean": {
-    "owner": "terraform-providers",
+    "owner": "digitalocean",
+    "provider-source-address": "registry.terraform.io/digitalocean/digitalocean",
     "repo": "terraform-provider-digitalocean",
-    "rev": "v1.19.0",
-    "sha256": "0plfkwkfb19f7bzky4jfa2kmkqvbah02c6j6applsd3jyiawpbgy",
-    "version": "1.19.0"
+    "rev": "v2.2.0",
+    "sha256": "14v9sh2qqdflzzp5mvkr7hd5c21hch8b8shxiwm0ar4qgdxq3wfy",
+    "vendorSha256": null,
+    "version": "2.2.0"
   },
   "dme": {
     "owner": "terraform-providers",

From 0fc33746c63ce1aa8d62b34c65bedbf82e95c779 Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sun, 15 Nov 2020 14:08:49 +0000
Subject: [PATCH 3501/3942] terraform-providers.google: 3.18.0 -> 3.47.0

---
 .../networking/cluster/terraform-providers/default.nix |  1 -
 .../cluster/terraform-providers/providers.json         | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 5cd6408017ba..e798dbbc41f4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -74,7 +74,6 @@ let
   # These are the providers that don't fall in line with the default model
   special-providers = {
     # Override providers that use Go modules + vendor/ folder
-    google = patchGoModVendor automated-providers.google;
     google-beta = patchGoModVendor automated-providers.google-beta;
 
     acme = automated-providers.acme.overrideAttrs (attrs: {
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 421b109124a8..4cbf25017b31 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -346,11 +346,13 @@
     "version": "2.9.0"
   },
   "google": {
-    "owner": "terraform-providers",
+    "owner": "hashicorp",
+    "provider-source-address": "registry.terraform.io/hashicorp/google",
     "repo": "terraform-provider-google",
-    "rev": "v3.18.0",
-    "sha256": "18cxl1qw1wyvzvhgjm1s3c19hbi5z9s6mipgazhrac70myw8dmy7",
-    "version": "3.18.0"
+    "rev": "v3.47.0",
+    "sha256": "05xb0q56y9088qbyaf3vzjm9im1s2azxffhjffjpzi0i79k0g2p0",
+    "vendorSha256": "1h83p7ncv7b4ci7qdig7hb81zk9458fq9aqqbkryawf1w7wbaq2a",
+    "version": "3.47.0"
   },
   "google-beta": {
     "owner": "terraform-providers",

From 0fb14ea4d36f9cf379ecc9a2ea04c7bf56c54984 Mon Sep 17 00:00:00 2001
From: Timothy Stott <stott.timothy@gmail.com>
Date: Sun, 15 Nov 2020 14:09:54 +0000
Subject: [PATCH 3502/3942] terraform-providers.google-beta: 3.18.0 -> 3.47.0

---
 .../cluster/terraform-providers/default.nix   | 30 -------------------
 .../terraform-providers/providers.json        | 10 ++++---
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index e798dbbc41f4..b7b6c8ad73b3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -39,33 +39,6 @@ let
       passthru = data;
     };
 
-  # Google is now using the vendored go modules, which works a bit differently
-  # and is not 100% compatible with the pre-modules vendored folders.
-  #
-  # Instead of switching to goModules which requires a goModSha256, patch the
-  # goPackage derivation so it can install the top-level.
-  patchGoModVendor = drv:
-    drv.overrideAttrs (attrs: {
-      buildFlags = "-mod=vendor";
-
-      # override configurePhase to not move the source into GOPATH
-      configurePhase = ''
-        export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
-        export GOCACHE=$TMPDIR/go-cache
-        export GO111MODULE=on
-      '';
-
-      # just build and install into $GOPATH/bin
-      buildPhase = ''
-        go install -mod=vendor -v -p 16 .
-
-        runHook postBuild
-      '';
-
-      # don't run the tests, they are broken in this setup
-      doCheck = false;
-    });
-
   # These providers are managed with the ./update-all script
   automated-providers = lib.mapAttrs (_: attrs:
     (if (lib.hasAttr "vendorSha256" attrs) then buildWithGoModule else buildWithGoPackage)
@@ -73,9 +46,6 @@ let
 
   # These are the providers that don't fall in line with the default model
   special-providers = {
-    # Override providers that use Go modules + vendor/ folder
-    google-beta = patchGoModVendor automated-providers.google-beta;
-
     acme = automated-providers.acme.overrideAttrs (attrs: {
       prePatch = attrs.prePatch or "" + ''
         substituteInPlace go.mod --replace terraform-providers/terraform-provider-acme getstackhead/terraform-provider-acme
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 4cbf25017b31..529eb7d34c8c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -355,11 +355,13 @@
     "version": "3.47.0"
   },
   "google-beta": {
-    "owner": "terraform-providers",
+    "owner": "hashicorp",
+    "provider-source-address": "registry.terraform.io/hashicorp/google-beta",
     "repo": "terraform-provider-google-beta",
-    "rev": "v3.18.0",
-    "sha256": "1rsaqrgr6ddgx1pala83y70dk32s0mvf6vi877awmimxjzsa1l4r",
-    "version": "3.18.0"
+    "rev": "v3.47.0",
+    "sha256": "1nk0bg2q7dg65rn3j5pkdjv07x0gs7bkv1bpfvlhi9p4fzx9g4by",
+    "vendorSha256": "0c2q4d2khsi3v9b659q1kmncnlshv4px6ch99jpcymwqg3xrxda2",
+    "version": "3.47.0"
   },
   "grafana": {
     "owner": "terraform-providers",

From 4db239272c36f394416253d6223c70f5391666f2 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 17 Nov 2020 03:23:55 +0200
Subject: [PATCH 3503/3942] mullvad-vpn: add iproute2

---
 nixos/modules/services/networking/mullvad-vpn.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix
index d9e6e57c92cc..6f595ca4be2b 100644
--- a/nixos/modules/services/networking/mullvad-vpn.nix
+++ b/nixos/modules/services/networking/mullvad-vpn.nix
@@ -15,6 +15,9 @@ with lib;
   config = mkIf cfg.enable {
     boot.kernelModules = [ "tun" ];
 
+    # mullvad-daemon writes to /etc/iproute2/rt_tables
+    networking.iproute2.enable = true;
+
     systemd.services.mullvad-daemon = {
       description = "Mullvad VPN daemon";
       wantedBy = [ "multi-user.target" ];

From 688c8c0333b3598c057582ce093fd4da8fa29a23 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Nov 2020 15:21:44 +0100
Subject: [PATCH 3504/3942] terraform-providers.postgresql: 1.6.0 -> 1.7.1

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 529eb7d34c8c..1862a17a84a9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -749,9 +749,9 @@
   "postgresql": {
     "owner": "terraform-providers",
     "repo": "terraform-provider-postgresql",
-    "rev": "v1.6.0",
-    "sha256": "0m9x60hrry0cqx4bhmql081wjcbay3750jwzqiph5vpj9717banf",
-    "version": "1.6.0"
+    "rev": "v1.7.1",
+    "sha256": "0qlz00svvbwxslp8v7bi7mx5mvnjmh2cvg33a006gh4fy5n75shy",
+    "version": "1.7.1"
   },
   "powerdns": {
     "owner": "terraform-providers",

From ce84cc06bf3a6311c67e73b6675fc5c1317dec23 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 24 Nov 2020 15:29:28 +0100
Subject: [PATCH 3505/3942] texlive: Use lib.unique for uniqueness checks

In 85605c8a296bd54e9c12e1bd1c33bf1e100d40b7 we got a really nice
performance improvement.

By using this implementation for texlive instantiation RSS is cut by
~2.6x with a similar wall time speedup.
---
 pkgs/tools/typesetting/tex/texlive/combine.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index fb3e6668a47c..891495c46cac 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -31,13 +31,7 @@ let
       ++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby;
   };
 
-  # TODO: replace by buitin once it exists
-  fastUnique = comparator: list: with lib;
-    let un_adj = l: if length l < 2 then l
-      else optional (head l != elemAt l 1) (head l) ++ un_adj (tail l);
-    in un_adj (lib.sort comparator list);
-
-  uniqueStrings = fastUnique (a: b: a < b);
+  uniqueStrings = list: lib.sort (a: b: a < b) (lib.unique list);
 
   mkUniqueOutPaths = pkgs: uniqueStrings
     (map (p: p.outPath) (builtins.filter lib.isDerivation pkgs));

From 22965d84d5e57307d4f6f02d32b50adac2cbb6bb Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 24 Nov 2020 09:48:34 -0500
Subject: [PATCH 3506/3942] sssd: fix build on glibc-2.32

For https://hydra.nixos.org/build/128488320 which errored with:

    src/responder/nss/nss_cmd.c:733:16: error: 'nss_setnetgrent' redeclared as different kind of symbol
      733 | static errno_t nss_setnetgrent(struct cli_ctx *cli_ctx,
          |                ^~~~~~~~~~~~~~~
    In file included from ./src/sss_client/sss_cli.h:28,
                     from ./src/db/sysdb.h:27,
                     from src/responder/nss/nss_cmd.c:26:
    /nix/store/a2n8nrsf215x01a7fv8l94crdjwf69pa-glibc-2.32-dev/include/nss.h:184:25: note: previous declaration of 'nss_setnetgrent' was here
      184 | typedef enum nss_status nss_setnetgrent (const char *, struct __netgrent *);
          |                         ^~~~~~~~~~~~~~~
    make[2]: *** [Makefile:17818: src/responder/nss/nss_cmd.o] Error 1
    make[2]: Leaving directory '/build/sssd-1.16.4'
    make[1]: *** [Makefile:33824: all-recursive] Error 1
    make[1]: Leaving directory '/build/sssd-1.16.4'
    make: *** [Makefile:10123: all] Error 2
---
 pkgs/os-specific/linux/sssd/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 22e2da79c8cd..537764e0c734 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -54,6 +54,16 @@ stdenv.mkDerivation rec {
     configureFlagsArray+=("--with-sudo")
   '';
 
+  preBuild = ''
+    # glibc-2.32 includes a full set of NSS stub module declarations
+    # that conflict with the ones in sssd source. Define _NSS_H to
+    # prevent them from breaking the compilation, but just for this
+    # one file.
+    cat >> Makefile <<EOF
+      src/responder/nss/nss_cmd.\$(OBJEXT) : DEFS = -DHAVE_CONFIG_H -D_NSS_H
+    EOF
+  '';
+
   enableParallelBuilding = true;
   buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss
                   samba nfs-utils doxygen python python3 popt

From c384c5409ac249d4913a21d5b6b8edda8876e26e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Nov 2020 09:47:00 -0500
Subject: [PATCH 3507/3942] linux: 4.14.208 -> 4.14.209

---
 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 b464ff04a62e..5a19e8d3cc93 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.208";
+  version = "4.14.209";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0vzn5kprjlgpgnjr1drjq97x9xbyfgigpgs42xsfw61h2qjy3b1q";
+    sha256 = "171b31c4rz9sn95s4s4yqchd4s46kivmvch78z0jr5zir1f4c0nb";
   };
 } // (args.argsOverride or {}))

From 06ba11d0b7003f3b1d6fe45b0b67cec555033cea Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Nov 2020 09:47:10 -0500
Subject: [PATCH 3508/3942] linux: 4.19.159 -> 4.19.160

---
 pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index c646387d4f15..7b01bdd8c608 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.159";
+  version = "4.19.160";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "195hlvr9zsa2km80rk71na1gl0222r2mk76rsqx0cxpgg7dhpjv0";
+    sha256 = "118maapizgqgrgawnw7xmbcz26c61g5d012jzbd8l7n6z4354d0q";
   };
 } // (args.argsOverride or {}))

From d17c554fdf2f96e8e907325bb3a612ac42c62d3e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Nov 2020 09:47:16 -0500
Subject: [PATCH 3509/3942] linux: 4.4.245 -> 4.4.246

---
 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 38a89bcc091e..d679969d5892 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, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.245";
+  version = "4.4.246";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0g1cnis8496kp1ln922gxa7skfr096mdvv89la6676yw7dd4lhyi";
+    sha256 = "15xd1dqw53kwqvsa71nr1ymp0jp22pkl4h2yks4hqbd132zxw2wy";
   };
 } // (args.argsOverride or {}))

From a17655a29163ecc668b8b0abda729789dd0c8b40 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Nov 2020 09:47:26 -0500
Subject: [PATCH 3510/3942] linux: 4.9.245 -> 4.9.246

---
 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 60d9a9c0244c..c5216f2c80e3 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, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.245";
+  version = "4.9.246";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1vxsd3g96vbykrmfnj9qali0p868h678qzcqvf4yrhya47k6pnnb";
+    sha256 = "1xd9vgc4yj2vrr5r76cy3fp9a1fc3086lj5aws68wf1dsz3ndqj9";
   };
 } // (args.argsOverride or {}))

From 53738d417f3e9291b514745722ab117bedfe6ff8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Nov 2020 09:47:35 -0500
Subject: [PATCH 3511/3942] linux: 5.4.79 -> 5.4.80

---
 pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 4c076a77cc9a..0b19291a7692 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.79";
+  version = "5.4.80";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "09ffj66wlp27vx799lnixq4zdkin3y4pqaw4lx2a6rpz13xr3455";
+    sha256 = "1iv4rsc9mr13xqzayzwz8mpdrdpnc425mn1izz9hylrw3xf45nj9";
   };
 } // (args.argsOverride or {}))

From 513afc731c0f86507e5da6ab72b12ec93ec41f44 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Nov 2020 09:47:45 -0500
Subject: [PATCH 3512/3942] linux: 5.9.10 -> 5.9.11

---
 pkgs/os-specific/linux/kernel/linux-5.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix
index 9ac96d141149..c32ee2844f9f 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.9.10";
+  version = "5.9.11";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0c7hcqn1ld0axlipzpwmjr1jwizrhz5w6bdfbk9npbirx7rb54gm";
+    sha256 = "0q6jlnigyjjnnxw6l724zv8acgs95s3pafabz4l9jrhhlijhmcjy";
   };
 } // (args.argsOverride or {}))

From 874e250009b7d7d56a27603b64c4c100f1b4377e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Nov 2020 09:48:03 -0500
Subject: [PATCH 3513/3942] linux-rt_5_4: 5.4.77-rt43 -> 5.4.78-rt44

---
 pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
index 53020a1ab8dd..3bb3ac7de27a 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "5.4.77-rt43"; # updated by ./update-rt.sh
+  version = "5.4.78-rt44"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -14,14 +14,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "1xyvml0mps7bsa11bgpa4l0w8x6pasdz9yab2z4ds394f1lkxq53";
+    sha256 = "0z8skj0w9jfrz9pfxaqfzqh82l13bz5lhza2wjsxk02cyhhnm226";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "1i0d52iq9n72i3dipskh2hwy2x19wsr9vsx5vvj2hvz21jv6z5m0";
+      sha256 = "0cvvk647cz7nckhyxrsvdnsc6hzhy09y3c1155xzhydiv5gxc56h";
     };
   }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
 

From 4de5d2b081c6232c44da91d05d1d7ae38acea34a Mon Sep 17 00:00:00 2001
From: Dave Anderson <dave@natulte.net>
Date: Tue, 24 Nov 2020 07:06:39 -0800
Subject: [PATCH 3514/3942] influxdb2: init at v2.0.2 (#104717)

Signed-off-by: David Anderson <dave@natulte.net>
---
 pkgs/servers/nosql/influxdb2/default.nix      |   128 +
 .../nosql/influxdb2/influx-ui-package.json    |   200 +
 .../nosql/influxdb2/influx-ui-yarndeps.nix    | 13389 ++++++++++++++++
 .../nosql/influxdb2/update-influxdb2.sh       |    17 +
 pkgs/top-level/all-packages.nix               |     1 +
 5 files changed, 13735 insertions(+)
 create mode 100644 pkgs/servers/nosql/influxdb2/default.nix
 create mode 100644 pkgs/servers/nosql/influxdb2/influx-ui-package.json
 create mode 100644 pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix
 create mode 100755 pkgs/servers/nosql/influxdb2/update-influxdb2.sh

diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
new file mode 100644
index 000000000000..627cd6d627d2
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -0,0 +1,128 @@
+{ buildGoModule
+, buildGoPackage
+, fetchFromGitHub
+, go-bindata
+, lib
+, llvmPackages
+, mkYarnPackage
+, pkg-config
+, rustPlatform
+}:
+
+# Note for maintainers: use ./update-influxdb2.sh to update the Yarn
+# dependencies nix expression.
+
+let
+  version = "2.0.2";
+  shorthash = "84496e507a"; # git rev-parse HEAD with 2.0.2 checked out
+  libflux_version = "0.95.0";
+
+  src = fetchFromGitHub {
+    owner = "influxdata";
+    repo = "influxdb";
+    rev = "v${version}";
+    sha256 = "05s09crqgbyfdck33zwax5l47jpc4wh04yd8zsm658iksdgzpmnn";
+  };
+
+  ui = mkYarnPackage {
+    src = src;
+    packageJSON = ./influx-ui-package.json;
+    yarnLock = "${src}/ui/yarn.lock";
+    yarnNix = ./influx-ui-yarndeps.nix;
+    configurePhase = ''
+      cp -r $node_modules ui/node_modules
+      rsync -r $node_modules/../deps/chronograf-ui/node_modules/ ui/node_modules
+    '';
+    INFLUXDB_SHA = shorthash;
+    buildPhase = ''
+      pushd ui
+      yarn build:ci
+      popd
+    '';
+    installPhase = ''
+      mv ui/build $out
+    '';
+    distPhase = "true";
+  };
+
+  flux = rustPlatform.buildRustPackage {
+    pname = "libflux";
+    version = "v${libflux_version}";
+    src = fetchFromGitHub {
+      owner = "influxdata";
+      repo = "flux";
+      rev = "v${libflux_version}";
+      sha256 = "07jz2nw3zswg9f4p5sb5r4hpg3n4qibjcgs9sk9csns70h5rp9j3";
+    };
+    sourceRoot = "source/libflux";
+    cargoSha256 = "0y5xjkqpaxp9qq1qj39zw3mnvkbbb9g4fa5cli77nhfwz288xx6h";
+    nativeBuildInputs = [ llvmPackages.libclang ];
+    LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
+    pkgcfg = ''
+      Name: flux
+      Version: ${libflux_version}
+      Description: Library for the InfluxData Flux engine
+      Cflags: -I/out/include
+      Libs: -L/out/lib -lflux -ldl -lpthread
+    '';
+    passAsFile = [ "pkgcfg" ];
+    postInstall = ''
+      mkdir -p $out/include $out/pkgconfig
+      cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
+      substitute $pkgcfgPath $out/pkgconfig/flux.pc \
+        --replace /out $out
+    '';
+  };
+
+  # Can't use the nixpkgs version of go-bindata, it's an ancient
+  # ancestor of this more modern one.
+  bindata = buildGoPackage {
+    pname = "go-bindata";
+    version = "v3.22.0";
+    src = fetchFromGitHub {
+      owner = "kevinburke";
+      repo = "go-bindata";
+      rev = "v3.22.0";
+      sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x";
+    };
+
+    goPackagePath = "github.com/kevinburke/go-bindata";
+    subPackages = [ "go-bindata" ];
+  };
+in buildGoModule {
+  pname = "influxdb";
+  version = version;
+  src = src;
+
+  nativeBuildInputs = [ bindata pkg-config ];
+
+  vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a";
+  subPackages = [ "cmd/influxd" "cmd/influx" ];
+
+  PKG_CONFIG_PATH = "${flux}/pkgconfig";
+  # We have to run a bunch of go:generate commands to embed the UI
+  # assets into the source code. Ideally we'd run `make generate`, but
+  # that ends up running a ton of non-hermetic stuff. Instead, we find
+  # the relevant go:generate directives, and run them by hand without
+  # breaking hermeticity.
+  preBuild = ''
+    ln -s ${ui} ui/build
+    grep -RI -e 'go:generate.*go-bindata' | cut -f1 -d: | while read -r filename; do
+      sed -i -e 's/go:generate.*go-bindata/go:generate go-bindata/' $filename
+      pushd $(dirname $filename)
+      go generate
+      popd
+    done
+    export buildFlagsArray=(
+      -tags="assets"
+      -ldflags="-X main.commit=${shorthash} -X main.version=${version}"
+    )
+  '';
+
+  meta = with lib; {
+    description = "An open-source distributed time series database";
+    license = licenses.mit;
+    homepage = "https://influxdata.com/";
+    maintainers = with maintainers; [ danderson ];
+  };
+}
diff --git a/pkgs/servers/nosql/influxdb2/influx-ui-package.json b/pkgs/servers/nosql/influxdb2/influx-ui-package.json
new file mode 100644
index 000000000000..d57813bf2a84
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb2/influx-ui-package.json
@@ -0,0 +1,200 @@
+{
+  "name": "chronograf-ui",
+  "version": "2.0.2",
+  "private": false,
+  "license": "AGPL-3.0",
+  "description": "",
+  "repository": {
+    "type": "git",
+    "url": "github:influxdata/chronograf"
+  },
+  "engines": {
+    "node": ">=10.5.0",
+    "yarn": ">=1.16.0"
+  },
+  "alias": {
+    "src": "./src"
+  },
+  "scripts": {
+    "start": "yarn install && yarn generate && cross-env TS_NODE_PROJECT=\"webpack.tsconfig.json\" && yarn run build:vendor && yarn run start:dev",
+    "start:cloud": "yarn install && yarn generate && cross-env TS_NODE_PROJECT=\"webpack.tsconfig.json\" && yarn run build:vendor && yarn run start:dev-cloud",
+    "start:dev": "webpack-dev-server --config ./webpack.dev.ts --progress false",
+    "start:dev-cloud": "cross-env CLOUD_LOGOUT_URL=http://localhost:8080/api/v2/signout CLOUD_URL=http://localhost:4000 webpack-dev-server --config ./webpack.dev.ts",
+    "start:docker": "yarn generate && yarn build:vendor && yarn run start:dev",
+    "build": "yarn install --silent && yarn build:ci",
+    "build:ci": "yarn generate && yarn build:vendor && webpack --config webpack.prod.ts --bail",
+    "build:vendor": "webpack --config webpack.vendor.ts",
+    "clean": "rm -rf ./build && rm -rf ./.cache && rm -rf node_modules && rm -rf cypress/screenshots && rm -rf cypress/videos && rm -f junit-results/* ",
+    "test": "jest --maxWorkers=2",
+    "test:watch": "jest --watch --verbose false",
+    "test:update": "jest --updateSnapshot",
+    "test:debug": "node --inspect-brk $(npm bin)/jest --runInBand --watch --verbose false",
+    "test:e2e": "CYPRESS_baseUrl=http://localhost:8086 cypress run --browser chrome --reporter junit --reporter-options 'mochaFile=junit-results/test-output-[hash].xml'",
+    "test:e2e:report": "junit-viewer --results=junit-results --save-file=cypress/site/junit-report.html",
+    "test:e2e:clean": "rm junit-results/*.xml",
+    "test:e2e:all": "yarn test:e2e:clean && yarn test:e2e; yarn test:e2e:report;",
+    "test:circleci": "yarn run test:ci --maxWorkers=2",
+    "test:ci": "JEST_JUNIT_OUTPUT_DIR=\"./coverage\" jest --ci --coverage",
+    "lint": "yarn tsc && yarn prettier && yarn eslint",
+    "eslint": "eslint '{src,cypress}/**/*.{ts,tsx}'",
+    "eslint:circleci": "eslint",
+    "eslint:fix": "eslint --fix '{src,cypress}/**/*.{ts,tsx}'",
+    "prettier": "prettier --config .prettierrc.json --check '{src,cypress}/**/*.{ts,tsx}'",
+    "prettier:fix": "prettier --config .prettierrc.json --write '{src,cypress}/**/*.{ts,tsx}'",
+    "tsc": "tsc -p ./tsconfig.json --noEmit --pretty --skipLibCheck",
+    "tsc:cypress": "tsc -p ./cypress/tsconfig.json --noEmit --pretty --skipLibCheck",
+    "cy": "CYPRESS_baseUrl=http://localhost:8086 cypress open",
+    "cy:dev": "CYPRESS_baseUrl=http://localhost:8080 cypress open",
+    "generate": "oats ../http/swagger.yml > ./src/client/generatedRoutes.ts"
+  },
+  "author": "",
+  "devDependencies": {
+    "@babel/core": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@influxdata/oats": "0.5.0",
+    "@testing-library/react": "^10.2.1",
+    "@types/chroma-js": "^1.3.4",
+    "@types/codemirror": "^0.0.56",
+    "@types/d3-color": "^1.2.1",
+    "@types/d3-scale": "^2.0.1",
+    "@types/enzyme": "^3.1.14",
+    "@types/history": "4.7.6",
+    "@types/jest": "^23.3.2",
+    "@types/lodash": "^4.14.116",
+    "@types/memoize-one": "^4.0.2",
+    "@types/node": "^12.6.8",
+    "@types/papaparse": "^4.5.9",
+    "@types/prop-types": "^15.5.2",
+    "@types/qs": "^6.5.1",
+    "@types/react": "^16.8.3",
+    "@types/react-datepicker": "^2.8.1",
+    "@types/react-dom": "^16.8.1",
+    "@types/react-grid-layout": "^0.16.5",
+    "@types/react-redux": "^7.1.9",
+    "@types/react-router-dom": "^5.1.5",
+    "@types/react-virtualized": "^9.18.3",
+    "@types/text-encoding": "^0.0.32",
+    "@types/uuid": "^3.4.3",
+    "@types/webpack": "^4.4.35",
+    "@types/webpack-env": "^1.15.2",
+    "@typescript-eslint/eslint-plugin": "^2.6.0",
+    "@typescript-eslint/parser": "^2.6.0",
+    "acorn": "^6.0.6",
+    "ajv": "^6.7.0",
+    "autoprefixer": "^6.3.1",
+    "babel-loader": "^8.0.6",
+    "clean-webpack-plugin": "^3.0.0",
+    "cross-env": "^5.2.0",
+    "css-loader": "^3.1.0",
+    "cypress": "4.12.1",
+    "cypress-file-upload": "^4.0.7",
+    "cypress-pipe": "^1.5.0",
+    "cypress-plugin-tab": "^1.0.5",
+    "enzyme": "^3.6.0",
+    "enzyme-adapter-react-16": "^1.6.0",
+    "enzyme-to-json": "^3.3.4",
+    "eslint": "^6.6.0",
+    "eslint-config-prettier": "^6.5.0",
+    "eslint-plugin-jest": "^23.0.2",
+    "eslint-plugin-react": "^7.16.0",
+    "eslint-plugin-react-hooks": "^4.0.5",
+    "express": "^4.14.0",
+    "file-loader": "^4.1.0",
+    "fork-ts-checker-webpack-plugin": "^1.4.3",
+    "html-webpack-plugin": "^3.2.0",
+    "http-proxy-middleware": "^0.18.0",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^24.8.0",
+    "jest-fetch-mock": "^3.0.3",
+    "jest-junit": "^10.0.0",
+    "jsdom": "^9.0.0",
+    "junit-viewer": "^4.11.1",
+    "mini-css-extract-plugin": "^0.8.0",
+    "mocha": "^5.2.0",
+    "mocha-junit-reporter": "^1.18.0",
+    "mutation-observer": "^1.0.3",
+    "optimize-css-assets-webpack-plugin": "^5.0.3",
+    "prettier": "^1.19.1",
+    "raw-loader": "^4.0.1",
+    "sass": "^1.22.7",
+    "sass-loader": "^7.1.0",
+    "source-map-loader": "^0.2.4",
+    "style-loader": "^0.23.1",
+    "terser-webpack-plugin": "2.2.1",
+    "ts-jest": "^24.0.0",
+    "ts-loader": "^5.3.3",
+    "ts-node": "^8.3.0",
+    "tslib": "^1.9.0",
+    "typescript": "3.8.3",
+    "webpack": "^4.41.4",
+    "webpack-cli": "^3.3.10",
+    "webpack-dev-server": "^3.7.2",
+    "webpack-merge": "^4.2.1"
+  },
+  "dependencies": {
+    "@influxdata/clockface": "2.3.4",
+    "@influxdata/flux": "^0.5.1",
+    "@influxdata/flux-lsp-browser": "^0.5.23",
+    "@influxdata/giraffe": "0.29.0",
+    "@influxdata/influx": "0.5.5",
+    "@influxdata/influxdb-templates": "0.9.0",
+    "@influxdata/react-custom-scrollbars": "4.3.8",
+    "abortcontroller-polyfill": "^1.3.0",
+    "auth0-js": "^9.12.2",
+    "axios": "^0.19.0",
+    "babel-polyfill": "^6.26.0",
+    "bignumber.js": "^4.0.2",
+    "calculate-size": "^1.1.1",
+    "chroma-js": "^1.3.6",
+    "classnames": "^2.2.3",
+    "codemirror": "^5.36.0",
+    "connected-react-router": "^6.8.0",
+    "d3-format": "^1.3.2",
+    "d3-scale": "^2.1.0",
+    "fast.js": "^0.1.1",
+    "history": "^4.7.2",
+    "honeybadger-js": "^1.0.2",
+    "immer": "^1.9.3",
+    "immutable": "^3.8.1",
+    "intersection-observer": "^0.7.0",
+    "jsonlint-mod": "^1.7.5",
+    "lodash": "^4.3.0",
+    "memoize-one": "^4.0.2",
+    "moment": "^2.13.0",
+    "monaco-editor": "^0.19.2",
+    "monaco-editor-textmate": "^2.2.1",
+    "monaco-editor-webpack-plugin": "^1.8.2",
+    "monaco-languageclient": "^0.11.0",
+    "monaco-textmate": "^3.0.1",
+    "normalizr": "^3.4.1",
+    "onigasm": "^2.2.4",
+    "papaparse": "^5.2.0",
+    "prop-types": "^15.6.1",
+    "qs": "^6.5.2",
+    "react": "^16.11.0",
+    "react-codemirror2": "^4.2.1",
+    "react-copy-to-clipboard": "^5.0.1",
+    "react-datepicker": "^2.1.0",
+    "react-dimensions": "^1.2.0",
+    "react-dnd": "^9.3.2",
+    "react-dnd-html5-backend": "^9.3.2",
+    "react-dom": "^16.8.2",
+    "react-grid-layout": "^0.16.6",
+    "react-loadable": "^5.5.0",
+    "react-markdown": "^4.0.3",
+    "react-monaco-editor": "^0.33.0",
+    "react-redux": "^7.2.0",
+    "react-router-dom": "^5.2.0",
+    "react-scrollbars-custom": "^4.0.0-alpha.8",
+    "react-virtualized": "^9.18.5",
+    "redux": "^4.0.0",
+    "redux-auth-wrapper": "^1.0.0",
+    "redux-thunk": "^2.3.0",
+    "reselect": "^4.0.0",
+    "rome": "^2.1.22",
+    "seamless-immutable": "^7.1.3",
+    "use-persisted-state": "^0.3.0",
+    "uuid": "^3.2.1",
+    "webpack-bundle-analyzer": "^3.6.0"
+  }
+}
diff --git a/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix b/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix
new file mode 100644
index 000000000000..1779d270cf1e
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix
@@ -0,0 +1,13389 @@
+{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
+  offline_cache = linkFarm "offline" packages;
+  packages = [
+    {
+      name = "_babel_code_frame___code_frame_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_code_frame___code_frame_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz";
+        sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d";
+      };
+    }
+    {
+      name = "_babel_core___core_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_core___core_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz";
+        sha1 = "17b2686ef0d6bc58f963dddd68ab669755582c30";
+      };
+    }
+    {
+      name = "_babel_generator___generator_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_generator___generator_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz";
+        sha1 = "873a7f936a3c89491b43536d12245b626664e3cf";
+      };
+    }
+    {
+      name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz";
+        sha1 = "323d39dd0b50e10c7c06ca7d7638e6864d8c5c32";
+      };
+    }
+    {
+      name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz";
+        sha1 = "6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f";
+      };
+    }
+    {
+      name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz";
+        sha1 = "87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43";
+      };
+    }
+    {
+      name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz";
+        sha1 = "3dec32c2046f37e09b28c93eb0b103fd2a25d369";
+      };
+    }
+    {
+      name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz";
+        sha1 = "537fa13f6f1674df745b0c00ec8fe4e99681c8f6";
+      };
+    }
+    {
+      name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz";
+        sha1 = "a0ceb01685f73355d4360c1247f582bfafc8ff53";
+      };
+    }
+    {
+      name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz";
+        sha1 = "83572d4320e2a4657263734113c42868b64e49c3";
+      };
+    }
+    {
+      name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz";
+        sha1 = "0298b5f25c8c09c53102d52ac4a98f773eb2850a";
+      };
+    }
+    {
+      name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz";
+        sha1 = "1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590";
+      };
+    }
+    {
+      name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz";
+        sha1 = "96081b7111e486da4d2cd971ad1a4fe216cc2e3d";
+      };
+    }
+    {
+      name = "_babel_helper_module_transforms___helper_module_transforms_7.2.2.tgz";
+      path = fetchurl {
+        name = "_babel_helper_module_transforms___helper_module_transforms_7.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz";
+        sha1 = "ab2f8e8d231409f8370c883d20c335190284b963";
+      };
+    }
+    {
+      name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz";
+        sha1 = "f84ff8a09038dcbca1fd4355661a500937165b4a";
+      };
+    }
+    {
+      name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz";
+        sha1 = "a2920c5702b073c15de51106200aa8cad20497d5";
+      };
+    }
+    {
+      name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz";
+        sha1 = "bbb3fbee98661c569034237cc03967ba99b4f250";
+      };
+    }
+    {
+      name = "_babel_helper_regex___helper_regex_7.0.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_regex___helper_regex_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz";
+        sha1 = "2c1718923b57f9bbe64705ffe5640ac64d9bdb27";
+      };
+    }
+    {
+      name = "_babel_helper_regex___helper_regex_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helper_regex___helper_regex_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz";
+        sha1 = "0aa6824f7100a2e0e89c1527c23936c152cab351";
+      };
+    }
+    {
+      name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz";
+        sha1 = "361d80821b6f38da75bd3f0785ece20a88c5fe7f";
+      };
+    }
+    {
+      name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz";
+        sha1 = "f84ce43df031222d2bad068d2626cb5799c34bc2";
+      };
+    }
+    {
+      name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz";
+        sha1 = "65eeb954c8c245beaa4e859da6188f39d71e585c";
+      };
+    }
+    {
+      name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz";
+        sha1 = "ff94894a340be78f53f06af038b205c49d993677";
+      };
+    }
+    {
+      name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz";
+        sha1 = "c4e0012445769e2815b55296ead43a958549f6fa";
+      };
+    }
+    {
+      name = "_babel_helpers___helpers_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_helpers___helpers_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz";
+        sha1 = "63908d2a73942229d1e6685bc2a0e730dde3b75e";
+      };
+    }
+    {
+      name = "_babel_highlight___highlight_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_highlight___highlight_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz";
+        sha1 = "56d11312bd9248fa619591d02472be6e8cb32540";
+      };
+    }
+    {
+      name = "_babel_parser___parser_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_parser___parser_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz";
+        sha1 = "02f077ac8817d3df4a832ef59de67565e71cca4b";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz";
+        sha1 = "b289b306669dce4ad20b0252889a15768c9d417e";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz";
+        sha1 = "e532202db4838723691b10a67b8ce509e397c506";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz";
+        sha1 = "568ecc446c6148ae6b267f02551130891e29f317";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz";
+        sha1 = "61939744f71ba76a3ae46b5eea18a54c16d22e58";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz";
+        sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5";
+      };
+    }
+    {
+      name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz";
+        sha1 = "501ffd9826c0b91da22690720722ac7cb1ca9c78";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz";
+        sha1 = "69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz";
+        sha1 = "69c159ffaf4998122161ad8ebc5e6d1f55df8612";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz";
+        sha1 = "72bd13f6ffe1d25938129d2a186b11fd62951470";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz";
+        sha1 = "3b7a3e733510c57e820b9142a6579ac8b0dfad2e";
+      };
+    }
+    {
+      name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz";
+        sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz";
+        sha1 = "9aeafbe4d6ffc6563bf8f8372091628f00779550";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz";
+        sha1 = "89a3848a0166623b5bc481164b5936ab947e887e";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz";
+        sha1 = "5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz";
+        sha1 = "a35f395e5402822f10d2119f6f8e045e3639a2ce";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz";
+        sha1 = "d094299d9bd680a14a2a0edae38305ad60fb4de9";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz";
+        sha1 = "83a7df6a658865b1c8f641d510c6f3af220216da";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz";
+        sha1 = "f6c09fdfe3f94516ff074fe877db7bc9ef05855a";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz";
+        sha1 = "361a148bc951444312c69446d76ed1ea8e4450c3";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz";
+        sha1 = "c5dbf5106bf84cdf691222c0974c12b1df931853";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz";
+        sha1 = "a63868289e5b4007f7054d46491af51435766008";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz";
+        sha1 = "0267fc735e24c808ba173866c6c4d1440fc3c556";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz";
+        sha1 = "e1436116abb0610c2259094848754ac5230922ad";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz";
+        sha1 = "690353e81f9267dad4fd8cfd77eafa86aba53ea1";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz";
+        sha1 = "fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz";
+        sha1 = "ef00435d46da0a5961aa728a1d2ecff063e4fb91";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz";
+        sha1 = "425127e6045231360858eeaa47a71d75eded7a74";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz";
+        sha1 = "e75266a13ef94202db2a0620977756f51d52d249";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz";
+        sha1 = "7678ce75169f0877b8eb2235538c074268dd01ae";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz";
+        sha1 = "9d269fd28a370258199b4294736813a60bbdd106";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz";
+        sha1 = "18d120438b0cc9ee95a47f2c72bc9768fbed60a5";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz";
+        sha1 = "c70021df834073c65eb613b8679cc4a381d1a9f9";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz";
+        sha1 = "7556cf03f318bd2719fe4c922d2d808be5571e16";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz";
+        sha1 = "03e33f653f5b25c4eb572c98b9485055b389e905";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz";
+        sha1 = "629dc82512c55cee01341fb27bdfcb210354680f";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz";
+        sha1 = "4792af87c998a49367597d07fedf02636d2e1634";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz";
+        sha1 = "6333aee2f8d6ee7e28615457298934a3b46198f0";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz";
+        sha1 = "3103a9abe22f742b6d406ecd3cd49b774919b406";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz";
+        sha1 = "a1e454b5995560a9c1e0d537dfc15061fd2687e1";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz";
+        sha1 = "9d28fea7bbce637fb7612a0750989d8321d4bcb0";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz";
+        sha1 = "117d2bcec2fbf64b4b59d1f9819894682d29f2b2";
+      };
+    }
+    {
+      name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz";
+        sha1 = "ab4634bb4f14d36728bf5978322b35587787970f";
+      };
+    }
+    {
+      name = "_babel_preset_env___preset_env_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_preset_env___preset_env_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz";
+        sha1 = "bc470b53acaa48df4b8db24a570d6da1fef53c9a";
+      };
+    }
+    {
+      name = "_babel_runtime_corejs3___runtime_corejs3_7.10.2.tgz";
+      path = fetchurl {
+        name = "_babel_runtime_corejs3___runtime_corejs3_7.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.2.tgz";
+        sha1 = "3511797ddf9a3d6f3ce46b99cc835184817eaa4e";
+      };
+    }
+    {
+      name = "_babel_runtime___runtime_7.7.7.tgz";
+      path = fetchurl {
+        name = "_babel_runtime___runtime_7.7.7.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.7.tgz";
+        sha1 = "194769ca8d6d7790ec23605af9ee3e42a0aa79cf";
+      };
+    }
+    {
+      name = "_babel_runtime___runtime_7.10.2.tgz";
+      path = fetchurl {
+        name = "_babel_runtime___runtime_7.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz";
+        sha1 = "d103f21f2602497d38348a32e008637d506db839";
+      };
+    }
+    {
+      name = "_babel_runtime___runtime_7.10.4.tgz";
+      path = fetchurl {
+        name = "_babel_runtime___runtime_7.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz";
+        sha1 = "a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99";
+      };
+    }
+    {
+      name = "_babel_template___template_7.4.4.tgz";
+      path = fetchurl {
+        name = "_babel_template___template_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz";
+        sha1 = "f4b88d1225689a08f5bc3a17483545be9e4ed237";
+      };
+    }
+    {
+      name = "_babel_traverse___traverse_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_traverse___traverse_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz";
+        sha1 = "f664f8f368ed32988cd648da9f72d5ca70f165bb";
+      };
+    }
+    {
+      name = "_babel_types___types_7.5.5.tgz";
+      path = fetchurl {
+        name = "_babel_types___types_7.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz";
+        sha1 = "97b9f728e182785909aa4ab56264f090a028d18a";
+      };
+    }
+    {
+      name = "_babel_types___types_7.2.2.tgz";
+      path = fetchurl {
+        name = "_babel_types___types_7.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.2.2.tgz";
+        sha1 = "44e10fc24e33af524488b716cdaee5360ea8ed1e";
+      };
+    }
+    {
+      name = "_cnakazawa_watch___watch_1.0.3.tgz";
+      path = fetchurl {
+        name = "_cnakazawa_watch___watch_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz";
+        sha1 = "099139eaec7ebf07a27c1786a3ff64f39464d2ef";
+      };
+    }
+    {
+      name = "_cypress_listr_verbose_renderer___listr_verbose_renderer_0.4.1.tgz";
+      path = fetchurl {
+        name = "_cypress_listr_verbose_renderer___listr_verbose_renderer_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz";
+        sha1 = "a77492f4b11dcc7c446a34b3e28721afd33c642a";
+      };
+    }
+    {
+      name = "_cypress_request___request_2.88.5.tgz";
+      path = fetchurl {
+        name = "_cypress_request___request_2.88.5.tgz";
+        url  = "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.5.tgz";
+        sha1 = "8d7ecd17b53a849cfd5ab06d5abe7d84976375d7";
+      };
+    }
+    {
+      name = "_cypress_xvfb___xvfb_1.2.4.tgz";
+      path = fetchurl {
+        name = "_cypress_xvfb___xvfb_1.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz";
+        sha1 = "2daf42e8275b39f4aa53c14214e557bd14e7748a";
+      };
+    }
+    {
+      name = "_influxdata_clockface___clockface_2.3.4.tgz";
+      path = fetchurl {
+        name = "_influxdata_clockface___clockface_2.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/@influxdata/clockface/-/clockface-2.3.4.tgz";
+        sha1 = "9c496601253e1d49cbeae29a7b9cfb54862785f6";
+      };
+    }
+    {
+      name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.23.tgz";
+      path = fetchurl {
+        name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.23.tgz";
+        url  = "https://registry.yarnpkg.com/@influxdata/flux-lsp-browser/-/flux-lsp-browser-0.5.23.tgz";
+        sha1 = "b3d1579e26ff21a11771003cbcaebe5fef82d73c";
+      };
+    }
+    {
+      name = "_influxdata_flux___flux_0.5.1.tgz";
+      path = fetchurl {
+        name = "_influxdata_flux___flux_0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/@influxdata/flux/-/flux-0.5.1.tgz";
+        sha1 = "e39e7a7af9163fc9494422c8fed77f3ae1b68f56";
+      };
+    }
+    {
+      name = "_influxdata_giraffe___giraffe_0.29.0.tgz";
+      path = fetchurl {
+        name = "_influxdata_giraffe___giraffe_0.29.0.tgz";
+        url  = "https://registry.yarnpkg.com/@influxdata/giraffe/-/giraffe-0.29.0.tgz";
+        sha1 = "0a6a3216b910ae3a1d834d682003f3894d7bc5d6";
+      };
+    }
+    {
+      name = "_influxdata_influx___influx_0.5.5.tgz";
+      path = fetchurl {
+        name = "_influxdata_influx___influx_0.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@influxdata/influx/-/influx-0.5.5.tgz";
+        sha1 = "ff30862ba3837df8e6e237634e7c844a00c03c08";
+      };
+    }
+    {
+      name = "_influxdata_influxdb_templates___influxdb_templates_0.9.0.tgz";
+      path = fetchurl {
+        name = "_influxdata_influxdb_templates___influxdb_templates_0.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/@influxdata/influxdb-templates/-/influxdb-templates-0.9.0.tgz";
+        sha1 = "d4b1f727c8949147d2ade63f5754425a0d1a0e9d";
+      };
+    }
+    {
+      name = "_influxdata_oats___oats_0.5.0.tgz";
+      path = fetchurl {
+        name = "_influxdata_oats___oats_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@influxdata/oats/-/oats-0.5.0.tgz";
+        sha1 = "0fdd308524fa407303ffa6a3d60fe959777dcfcb";
+      };
+    }
+    {
+      name = "_influxdata_react_custom_scrollbars___react_custom_scrollbars_4.3.8.tgz";
+      path = fetchurl {
+        name = "_influxdata_react_custom_scrollbars___react_custom_scrollbars_4.3.8.tgz";
+        url  = "https://registry.yarnpkg.com/@influxdata/react-custom-scrollbars/-/react-custom-scrollbars-4.3.8.tgz";
+        sha1 = "0e2a570860b0d9d8ef134069fe7e16e76e6765d9";
+      };
+    }
+    {
+      name = "_jest_console___console_24.7.1.tgz";
+      path = fetchurl {
+        name = "_jest_console___console_24.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz";
+        sha1 = "32a9e42535a97aedfe037e725bd67e954b459545";
+      };
+    }
+    {
+      name = "_jest_core___core_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_core___core_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/core/-/core-24.8.0.tgz";
+        sha1 = "fbbdcd42a41d0d39cddbc9f520c8bab0c33eed5b";
+      };
+    }
+    {
+      name = "_jest_environment___environment_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_environment___environment_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/environment/-/environment-24.8.0.tgz";
+        sha1 = "0342261383c776bdd652168f68065ef144af0eac";
+      };
+    }
+    {
+      name = "_jest_fake_timers___fake_timers_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_fake_timers___fake_timers_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.8.0.tgz";
+        sha1 = "2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1";
+      };
+    }
+    {
+      name = "_jest_reporters___reporters_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_reporters___reporters_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.8.0.tgz";
+        sha1 = "075169cd029bddec54b8f2c0fc489fd0b9e05729";
+      };
+    }
+    {
+      name = "_jest_source_map___source_map_24.3.0.tgz";
+      path = fetchurl {
+        name = "_jest_source_map___source_map_24.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz";
+        sha1 = "563be3aa4d224caf65ff77edc95cd1ca4da67f28";
+      };
+    }
+    {
+      name = "_jest_test_result___test_result_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_test_result___test_result_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz";
+        sha1 = "7675d0aaf9d2484caa65e048d9b467d160f8e9d3";
+      };
+    }
+    {
+      name = "_jest_test_sequencer___test_sequencer_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_test_sequencer___test_sequencer_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz";
+        sha1 = "2f993bcf6ef5eb4e65e8233a95a3320248cf994b";
+      };
+    }
+    {
+      name = "_jest_transform___transform_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_transform___transform_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz";
+        sha1 = "628fb99dce4f9d254c6fd9341e3eea262e06fef5";
+      };
+    }
+    {
+      name = "_jest_types___types_24.8.0.tgz";
+      path = fetchurl {
+        name = "_jest_types___types_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz";
+        sha1 = "f31e25948c58f0abd8c845ae26fcea1491dea7ad";
+      };
+    }
+    {
+      name = "_jest_types___types_24.9.0.tgz";
+      path = fetchurl {
+        name = "_jest_types___types_24.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz";
+        sha1 = "63cb26cb7500d069e5a389441a7c6ab5e909fc59";
+      };
+    }
+    {
+      name = "_jest_types___types_25.5.0.tgz";
+      path = fetchurl {
+        name = "_jest_types___types_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz";
+        sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d";
+      };
+    }
+    {
+      name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.0.tgz";
+      path = fetchurl {
+        name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz";
+        sha1 = "ecdf48d532c58ea477acfcab80348424f8d0662f";
+      };
+    }
+    {
+      name = "_testing_library_dom___dom_7.11.0.tgz";
+      path = fetchurl {
+        name = "_testing_library_dom___dom_7.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.11.0.tgz";
+        sha1 = "db8678bc55aef7cd6091d1510e8d0949d77d79fd";
+      };
+    }
+    {
+      name = "_testing_library_react___react_10.2.1.tgz";
+      path = fetchurl {
+        name = "_testing_library_react___react_10.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/@testing-library/react/-/react-10.2.1.tgz";
+        sha1 = "f0c5ac9072ad54c29672150943f35d6617263f26";
+      };
+    }
+    {
+      name = "_types_anymatch___anymatch_1.3.1.tgz";
+      path = fetchurl {
+        name = "_types_anymatch___anymatch_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz";
+        sha1 = "336badc1beecb9dacc38bea2cf32adf627a8421a";
+      };
+    }
+    {
+      name = "_types_asap___asap_2.0.0.tgz";
+      path = fetchurl {
+        name = "_types_asap___asap_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/asap/-/asap-2.0.0.tgz";
+        sha1 = "d529e9608c83499a62ae08c871c5e62271aa2963";
+      };
+    }
+    {
+      name = "_types_babel__core___babel__core_7.1.2.tgz";
+      path = fetchurl {
+        name = "_types_babel__core___babel__core_7.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz";
+        sha1 = "608c74f55928033fce18b99b213c16be4b3d114f";
+      };
+    }
+    {
+      name = "_types_babel__generator___babel__generator_7.0.2.tgz";
+      path = fetchurl {
+        name = "_types_babel__generator___babel__generator_7.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz";
+        sha1 = "d2112a6b21fad600d7674274293c85dce0cb47fc";
+      };
+    }
+    {
+      name = "_types_babel__template___babel__template_7.0.2.tgz";
+      path = fetchurl {
+        name = "_types_babel__template___babel__template_7.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz";
+        sha1 = "4ff63d6b52eddac1de7b975a5223ed32ecea9307";
+      };
+    }
+    {
+      name = "_types_babel__traverse___babel__traverse_7.0.7.tgz";
+      path = fetchurl {
+        name = "_types_babel__traverse___babel__traverse_7.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.7.tgz";
+        sha1 = "2496e9ff56196cc1429c72034e07eab6121b6f3f";
+      };
+    }
+    {
+      name = "_types_cheerio___cheerio_0.22.9.tgz";
+      path = fetchurl {
+        name = "_types_cheerio___cheerio_0.22.9.tgz";
+        url  = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.9.tgz";
+        sha1 = "b5990152604c2ada749b7f88cab3476f21f39d7b";
+      };
+    }
+    {
+      name = "_types_chroma_js___chroma_js_1.4.0.tgz";
+      path = fetchurl {
+        name = "_types_chroma_js___chroma_js_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/chroma-js/-/chroma-js-1.4.0.tgz";
+        sha1 = "1d215474b54e227bd0204572c0483b98593eabd0";
+      };
+    }
+    {
+      name = "_types_codemirror___codemirror_0.0.56.tgz";
+      path = fetchurl {
+        name = "_types_codemirror___codemirror_0.0.56.tgz";
+        url  = "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.56.tgz";
+        sha1 = "1fcf68df0d0a49791d843dadda7d94891ac88669";
+      };
+    }
+    {
+      name = "_types_color_name___color_name_1.1.1.tgz";
+      path = fetchurl {
+        name = "_types_color_name___color_name_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz";
+        sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0";
+      };
+    }
+    {
+      name = "_types_d3_color___d3_color_1.2.1.tgz";
+      path = fetchurl {
+        name = "_types_d3_color___d3_color_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.2.1.tgz";
+        sha1 = "26141c3c554e320edd40726b793570a3ae57397e";
+      };
+    }
+    {
+      name = "_types_d3_scale___d3_scale_2.0.2.tgz";
+      path = fetchurl {
+        name = "_types_d3_scale___d3_scale_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-2.0.2.tgz";
+        sha1 = "61145948aa1a52ab31384766cd013308699112b3";
+      };
+    }
+    {
+      name = "_types_d3_time___d3_time_1.0.9.tgz";
+      path = fetchurl {
+        name = "_types_d3_time___d3_time_1.0.9.tgz";
+        url  = "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-1.0.9.tgz";
+        sha1 = "c2cf05a3cd51f810b8d8a9bbca0c74030d4e535e";
+      };
+    }
+    {
+      name = "_types_enzyme___enzyme_3.1.14.tgz";
+      path = fetchurl {
+        name = "_types_enzyme___enzyme_3.1.14.tgz";
+        url  = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.1.14.tgz";
+        sha1 = "379c26205f6e0e272f3a51d6bbdd50071a9d03a6";
+      };
+    }
+    {
+      name = "_types_eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz";
+      path = fetchurl {
+        name = "_types_eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz";
+        sha1 = "1ee30d79544ca84d68d4b3cdb0af4f205663dd2d";
+      };
+    }
+    {
+      name = "_types_events___events_3.0.0.tgz";
+      path = fetchurl {
+        name = "_types_events___events_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz";
+        sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7";
+      };
+    }
+    {
+      name = "_types_glob___glob_7.1.1.tgz";
+      path = fetchurl {
+        name = "_types_glob___glob_7.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz";
+        sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575";
+      };
+    }
+    {
+      name = "_types_history___history_4.7.6.tgz";
+      path = fetchurl {
+        name = "_types_history___history_4.7.6.tgz";
+        url  = "https://registry.yarnpkg.com/@types/history/-/history-4.7.6.tgz";
+        sha1 = "ed8fc802c45b8e8f54419c2d054e55c9ea344356";
+      };
+    }
+    {
+      name = "_types_hoist_non_react_statics___hoist_non_react_statics_3.3.1.tgz";
+      path = fetchurl {
+        name = "_types_hoist_non_react_statics___hoist_non_react_statics_3.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz";
+        sha1 = "1124aafe5118cb591977aeb1ceaaed1070eb039f";
+      };
+    }
+    {
+      name = "_types_invariant___invariant_2.2.33.tgz";
+      path = fetchurl {
+        name = "_types_invariant___invariant_2.2.33.tgz";
+        url  = "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.33.tgz";
+        sha1 = "ec5eec29c63bf5e4ca164e9feb3ef7337cdcbadb";
+      };
+    }
+    {
+      name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz";
+      path = fetchurl {
+        name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz";
+        sha1 = "42995b446db9a48a11a07ec083499a860e9138ff";
+      };
+    }
+    {
+      name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz";
+      path = fetchurl {
+        name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz";
+        sha1 = "e5471e7fa33c61358dd38426189c037a58433b8c";
+      };
+    }
+    {
+      name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz";
+      path = fetchurl {
+        name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz";
+        sha1 = "7a8cbf6a406f36c8add871625b278eaf0b0d255a";
+      };
+    }
+    {
+      name = "_types_jest___jest_23.3.3.tgz";
+      path = fetchurl {
+        name = "_types_jest___jest_23.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.3.tgz";
+        sha1 = "246ebcc52771d2327bb8e37aa971b412d9dc4237";
+      };
+    }
+    {
+      name = "_types_json_schema___json_schema_7.0.3.tgz";
+      path = fetchurl {
+        name = "_types_json_schema___json_schema_7.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz";
+        sha1 = "bdfd69d61e464dcc81b25159c270d75a73c1a636";
+      };
+    }
+    {
+      name = "_types_json_schema___json_schema_7.0.5.tgz";
+      path = fetchurl {
+        name = "_types_json_schema___json_schema_7.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz";
+        sha1 = "dcce4430e64b443ba8945f0290fb564ad5bac6dd";
+      };
+    }
+    {
+      name = "_types_lodash___lodash_4.14.116.tgz";
+      path = fetchurl {
+        name = "_types_lodash___lodash_4.14.116.tgz";
+        url  = "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.116.tgz";
+        sha1 = "5ccf215653e3e8c786a58390751033a9adca0eb9";
+      };
+    }
+    {
+      name = "_types_memoize_one___memoize_one_4.1.0.tgz";
+      path = fetchurl {
+        name = "_types_memoize_one___memoize_one_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/memoize-one/-/memoize-one-4.1.0.tgz";
+        sha1 = "62119f26055b3193ae43ca1882c5b29b88b71ece";
+      };
+    }
+    {
+      name = "_types_minimatch___minimatch_3.0.3.tgz";
+      path = fetchurl {
+        name = "_types_minimatch___minimatch_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz";
+        sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d";
+      };
+    }
+    {
+      name = "_types_node___node_13.9.2.tgz";
+      path = fetchurl {
+        name = "_types_node___node_13.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-13.9.2.tgz";
+        sha1 = "ace1880c03594cc3e80206d96847157d8e7fa349";
+      };
+    }
+    {
+      name = "_types_node___node_12.6.8.tgz";
+      path = fetchurl {
+        name = "_types_node___node_12.6.8.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-12.6.8.tgz";
+        sha1 = "e469b4bf9d1c9832aee4907ba8a051494357c12c";
+      };
+    }
+    {
+      name = "_types_papaparse___papaparse_4.5.9.tgz";
+      path = fetchurl {
+        name = "_types_papaparse___papaparse_4.5.9.tgz";
+        url  = "https://registry.yarnpkg.com/@types/papaparse/-/papaparse-4.5.9.tgz";
+        sha1 = "ff887bd362f57cd0c87320d2de38ac232bb55e81";
+      };
+    }
+    {
+      name = "_types_prop_types___prop_types_15.5.6.tgz";
+      path = fetchurl {
+        name = "_types_prop_types___prop_types_15.5.6.tgz";
+        url  = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.6.tgz";
+        sha1 = "9c03d3fed70a8d517c191b7734da2879b50ca26c";
+      };
+    }
+    {
+      name = "_types_q___q_1.5.2.tgz";
+      path = fetchurl {
+        name = "_types_q___q_1.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz";
+        sha1 = "690a1475b84f2a884fd07cd797c00f5f31356ea8";
+      };
+    }
+    {
+      name = "_types_qs___qs_6.5.1.tgz";
+      path = fetchurl {
+        name = "_types_qs___qs_6.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/qs/-/qs-6.5.1.tgz";
+        sha1 = "a38f69c62528d56ba7bd1f91335a8004988d72f7";
+      };
+    }
+    {
+      name = "_types_react_datepicker___react_datepicker_2.8.1.tgz";
+      path = fetchurl {
+        name = "_types_react_datepicker___react_datepicker_2.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react-datepicker/-/react-datepicker-2.8.1.tgz";
+        sha1 = "37b52655695c2494810e7258528aace79f6a2a46";
+      };
+    }
+    {
+      name = "_types_react_dom___react_dom_16.8.2.tgz";
+      path = fetchurl {
+        name = "_types_react_dom___react_dom_16.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.2.tgz";
+        sha1 = "9bd7d33f908b243ff0692846ef36c81d4941ad12";
+      };
+    }
+    {
+      name = "_types_react_grid_layout___react_grid_layout_0.16.5.tgz";
+      path = fetchurl {
+        name = "_types_react_grid_layout___react_grid_layout_0.16.5.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react-grid-layout/-/react-grid-layout-0.16.5.tgz";
+        sha1 = "ee23e1f9a0f2d00fc0bf91a5ad12b5c9c6b548df";
+      };
+    }
+    {
+      name = "_types_react_redux___react_redux_7.1.9.tgz";
+      path = fetchurl {
+        name = "_types_react_redux___react_redux_7.1.9.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.9.tgz";
+        sha1 = "280c13565c9f13ceb727ec21e767abe0e9b4aec3";
+      };
+    }
+    {
+      name = "_types_react_router_dom___react_router_dom_5.1.5.tgz";
+      path = fetchurl {
+        name = "_types_react_router_dom___react_router_dom_5.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.5.tgz";
+        sha1 = "7c334a2ea785dbad2b2dcdd83d2cf3d9973da090";
+      };
+    }
+    {
+      name = "_types_react_router___react_router_5.1.8.tgz";
+      path = fetchurl {
+        name = "_types_react_router___react_router_5.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.8.tgz";
+        sha1 = "4614e5ba7559657438e17766bb95ef6ed6acc3fa";
+      };
+    }
+    {
+      name = "_types_react_virtualized___react_virtualized_9.18.7.tgz";
+      path = fetchurl {
+        name = "_types_react_virtualized___react_virtualized_9.18.7.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.18.7.tgz";
+        sha1 = "8703d8904236819facff90b8b320f29233160c90";
+      };
+    }
+    {
+      name = "_types_react___react_16.8.3.tgz";
+      path = fetchurl {
+        name = "_types_react___react_16.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react/-/react-16.8.3.tgz";
+        sha1 = "7b67956f682bea30a5a09b3242c0784ff196c848";
+      };
+    }
+    {
+      name = "_types_react___react_16.9.11.tgz";
+      path = fetchurl {
+        name = "_types_react___react_16.9.11.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react/-/react-16.9.11.tgz";
+        sha1 = "70e0b7ad79058a7842f25ccf2999807076ada120";
+      };
+    }
+    {
+      name = "_types_shallowequal___shallowequal_1.1.1.tgz";
+      path = fetchurl {
+        name = "_types_shallowequal___shallowequal_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/shallowequal/-/shallowequal-1.1.1.tgz";
+        sha1 = "aad262bb3f2b1257d94c71d545268d592575c9b1";
+      };
+    }
+    {
+      name = "_types_sinonjs__fake_timers___sinonjs__fake_timers_6.0.1.tgz";
+      path = fetchurl {
+        name = "_types_sinonjs__fake_timers___sinonjs__fake_timers_6.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.1.tgz";
+        sha1 = "681df970358c82836b42f989188d133e218c458e";
+      };
+    }
+    {
+      name = "_types_sizzle___sizzle_2.3.2.tgz";
+      path = fetchurl {
+        name = "_types_sizzle___sizzle_2.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz";
+        sha1 = "a811b8c18e2babab7d542b3365887ae2e4d9de47";
+      };
+    }
+    {
+      name = "_types_stack_utils___stack_utils_1.0.1.tgz";
+      path = fetchurl {
+        name = "_types_stack_utils___stack_utils_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz";
+        sha1 = "0a851d3bd96498fa25c33ab7278ed3bd65f06c3e";
+      };
+    }
+    {
+      name = "_types_tapable___tapable_1.0.4.tgz";
+      path = fetchurl {
+        name = "_types_tapable___tapable_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz";
+        sha1 = "b4ffc7dc97b498c969b360a41eee247f82616370";
+      };
+    }
+    {
+      name = "_types_text_encoding___text_encoding_0.0.32.tgz";
+      path = fetchurl {
+        name = "_types_text_encoding___text_encoding_0.0.32.tgz";
+        url  = "https://registry.yarnpkg.com/@types/text-encoding/-/text-encoding-0.0.32.tgz";
+        sha1 = "52289b320a406850b14f08f48b475ca021218048";
+      };
+    }
+    {
+      name = "_types_uglify_js___uglify_js_3.0.4.tgz";
+      path = fetchurl {
+        name = "_types_uglify_js___uglify_js_3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.4.tgz";
+        sha1 = "96beae23df6f561862a830b4288a49e86baac082";
+      };
+    }
+    {
+      name = "_types_uuid___uuid_3.4.4.tgz";
+      path = fetchurl {
+        name = "_types_uuid___uuid_3.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.4.tgz";
+        sha1 = "7af69360fa65ef0decb41fd150bf4ca5c0cefdf5";
+      };
+    }
+    {
+      name = "_types_webpack_env___webpack_env_1.15.2.tgz";
+      path = fetchurl {
+        name = "_types_webpack_env___webpack_env_1.15.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.2.tgz";
+        sha1 = "927997342bb9f4a5185a86e6579a0a18afc33b0a";
+      };
+    }
+    {
+      name = "_types_webpack___webpack_4.4.35.tgz";
+      path = fetchurl {
+        name = "_types_webpack___webpack_4.4.35.tgz";
+        url  = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.35.tgz";
+        sha1 = "b7088eb2d471d5645e5503d272783cafa753583b";
+      };
+    }
+    {
+      name = "_types_yargs_parser___yargs_parser_13.1.0.tgz";
+      path = fetchurl {
+        name = "_types_yargs_parser___yargs_parser_13.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz";
+        sha1 = "c563aa192f39350a1d18da36c5a8da382bbd8228";
+      };
+    }
+    {
+      name = "_types_yargs___yargs_12.0.12.tgz";
+      path = fetchurl {
+        name = "_types_yargs___yargs_12.0.12.tgz";
+        url  = "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz";
+        sha1 = "45dd1d0638e8c8f153e87d296907659296873916";
+      };
+    }
+    {
+      name = "_types_yargs___yargs_13.0.3.tgz";
+      path = fetchurl {
+        name = "_types_yargs___yargs_13.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.3.tgz";
+        sha1 = "76482af3981d4412d65371a318f992d33464a380";
+      };
+    }
+    {
+      name = "_types_yargs___yargs_15.0.5.tgz";
+      path = fetchurl {
+        name = "_types_yargs___yargs_15.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz";
+        sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79";
+      };
+    }
+    {
+      name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.6.0.tgz";
+      path = fetchurl {
+        name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.6.0.tgz";
+        sha1 = "e82ed43fc4527b21bfe35c20a2d6e4ed49fc7957";
+      };
+    }
+    {
+      name = "_typescript_eslint_experimental_utils___experimental_utils_2.6.0.tgz";
+      path = fetchurl {
+        name = "_typescript_eslint_experimental_utils___experimental_utils_2.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.6.0.tgz";
+        sha1 = "ed70bef72822bff54031ff0615fc888b9e2b6e8a";
+      };
+    }
+    {
+      name = "_typescript_eslint_parser___parser_2.6.0.tgz";
+      path = fetchurl {
+        name = "_typescript_eslint_parser___parser_2.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.6.0.tgz";
+        sha1 = "5106295c6a7056287b4719e24aae8d6293d5af49";
+      };
+    }
+    {
+      name = "_typescript_eslint_typescript_estree___typescript_estree_2.6.0.tgz";
+      path = fetchurl {
+        name = "_typescript_eslint_typescript_estree___typescript_estree_2.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.6.0.tgz";
+        sha1 = "d3e9d8e001492e2b9124c4d4bd4e7f03c0fd7254";
+      };
+    }
+    {
+      name = "_use_it_event_listener___event_listener_0.1.3.tgz";
+      path = fetchurl {
+        name = "_use_it_event_listener___event_listener_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/@use-it/event-listener/-/event-listener-0.1.3.tgz";
+        sha1 = "a9920b2819d211cf55e68e830997546eec6886d3";
+      };
+    }
+    {
+      name = "_webassemblyjs_ast___ast_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_ast___ast_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz";
+        sha1 = "51b1c5fe6576a34953bf4b253df9f0d490d9e359";
+      };
+    }
+    {
+      name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz";
+        sha1 = "1ba926a2923613edce496fd5b02e8ce8a5f49721";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz";
+        sha1 = "c49dad22f645227c5edb610bdb9697f1aab721f7";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz";
+        sha1 = "fea93e429863dd5e4338555f42292385a653f204";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz";
+        sha1 = "9a740ff48e3faa3022b1dff54423df9aa293c25e";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz";
+        sha1 = "ba0b7d3b3f7e4733da6059c9332275d860702452";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz";
+        sha1 = "def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz";
+        sha1 = "537a750eddf5c1e932f3744206551c91c1b93e61";
+      };
+    }
+    {
+      name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz";
+        sha1 = "74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf";
+      };
+    }
+    {
+      name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz";
+        sha1 = "712329dbef240f36bf57bd2f7b8fb9bf4154421e";
+      };
+    }
+    {
+      name = "_webassemblyjs_leb128___leb128_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_leb128___leb128_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz";
+        sha1 = "044edeb34ea679f3e04cd4fd9824d5e35767ae10";
+      };
+    }
+    {
+      name = "_webassemblyjs_utf8___utf8_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_utf8___utf8_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz";
+        sha1 = "a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc";
+      };
+    }
+    {
+      name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz";
+        sha1 = "962da12aa5acc1c131c81c4232991c82ce56e01a";
+      };
+    }
+    {
+      name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz";
+        sha1 = "54840766c2c1002eb64ed1abe720aded714f98bc";
+      };
+    }
+    {
+      name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz";
+        sha1 = "b24d9f6ba50394af1349f510afa8ffcb8a63d264";
+      };
+    }
+    {
+      name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz";
+        sha1 = "21576f0ec88b91427357b8536383668ef7c66b8d";
+      };
+    }
+    {
+      name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz";
+        sha1 = "e10eecd542d0e7bd394f6827c49f3df6d4eefb8c";
+      };
+    }
+    {
+      name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz";
+      path = fetchurl {
+        name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz";
+        sha1 = "114bbc481fd10ca0e23b3560fa812748b0bae5bc";
+      };
+    }
+    {
+      name = "_xtuc_ieee754___ieee754_1.2.0.tgz";
+      path = fetchurl {
+        name = "_xtuc_ieee754___ieee754_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz";
+        sha1 = "eef014a3145ae477a1cbc00cd1e552336dceb790";
+      };
+    }
+    {
+      name = "_xtuc_long___long_4.2.2.tgz";
+      path = fetchurl {
+        name = "_xtuc_long___long_4.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz";
+        sha1 = "d291c6a4e97989b5c61d9acf396ae4fe133a718d";
+      };
+    }
+    {
+      name = "JSV___JSV_4.0.2.tgz";
+      path = fetchurl {
+        name = "JSV___JSV_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz";
+        sha1 = "d077f6825571f82132f9dffaed587b4029feff57";
+      };
+    }
+    {
+      name = "abab___abab_1.0.4.tgz";
+      path = fetchurl {
+        name = "abab___abab_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz";
+        sha1 = "5faad9c2c07f60dd76770f71cf025b62a63cfd4e";
+      };
+    }
+    {
+      name = "abab___abab_2.0.0.tgz";
+      path = fetchurl {
+        name = "abab___abab_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz";
+        sha1 = "aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f";
+      };
+    }
+    {
+      name = "abortcontroller_polyfill___abortcontroller_polyfill_1.3.0.tgz";
+      path = fetchurl {
+        name = "abortcontroller_polyfill___abortcontroller_polyfill_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.3.0.tgz";
+        sha1 = "de69af32ae926c210b7efbcc29bf644ee4838b00";
+      };
+    }
+    {
+      name = "accepts___accepts_1.3.7.tgz";
+      path = fetchurl {
+        name = "accepts___accepts_1.3.7.tgz";
+        url  = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz";
+        sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd";
+      };
+    }
+    {
+      name = "acorn_globals___acorn_globals_3.1.0.tgz";
+      path = fetchurl {
+        name = "acorn_globals___acorn_globals_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz";
+        sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf";
+      };
+    }
+    {
+      name = "acorn_globals___acorn_globals_4.3.2.tgz";
+      path = fetchurl {
+        name = "acorn_globals___acorn_globals_4.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz";
+        sha1 = "4e2c2313a597fd589720395f6354b41cd5ec8006";
+      };
+    }
+    {
+      name = "acorn_jsx___acorn_jsx_5.1.0.tgz";
+      path = fetchurl {
+        name = "acorn_jsx___acorn_jsx_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz";
+        sha1 = "294adb71b57398b0680015f0a38c563ee1db5384";
+      };
+    }
+    {
+      name = "acorn_walk___acorn_walk_6.2.0.tgz";
+      path = fetchurl {
+        name = "acorn_walk___acorn_walk_6.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz";
+        sha1 = "123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c";
+      };
+    }
+    {
+      name = "acorn___acorn_4.0.13.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_4.0.13.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz";
+        sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
+      };
+    }
+    {
+      name = "acorn___acorn_5.7.3.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_5.7.3.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz";
+        sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279";
+      };
+    }
+    {
+      name = "acorn___acorn_6.2.1.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_6.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz";
+        sha1 = "3ed8422d6dec09e6121cc7a843ca86a330a86b51";
+      };
+    }
+    {
+      name = "acorn___acorn_6.0.6.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_6.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-6.0.6.tgz";
+        sha1 = "cd75181670d5b99bdb1b1c993941d3a239ab1f56";
+      };
+    }
+    {
+      name = "acorn___acorn_6.3.0.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_6.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz";
+        sha1 = "0087509119ffa4fc0a0041d1e93a417e68cb856e";
+      };
+    }
+    {
+      name = "acorn___acorn_6.4.1.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_6.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz";
+        sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474";
+      };
+    }
+    {
+      name = "acorn___acorn_7.1.0.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz";
+        sha1 = "949d36f2c292535da602283586c2477c57eb2d6c";
+      };
+    }
+    {
+      name = "add_px_to_style___add_px_to_style_1.0.0.tgz";
+      path = fetchurl {
+        name = "add_px_to_style___add_px_to_style_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/add-px-to-style/-/add-px-to-style-1.0.0.tgz";
+        sha1 = "d0c135441fa8014a8137904531096f67f28f263a";
+      };
+    }
+    {
+      name = "aggregate_error___aggregate_error_3.0.1.tgz";
+      path = fetchurl {
+        name = "aggregate_error___aggregate_error_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz";
+        sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0";
+      };
+    }
+    {
+      name = "ajv_errors___ajv_errors_1.0.1.tgz";
+      path = fetchurl {
+        name = "ajv_errors___ajv_errors_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz";
+        sha1 = "f35986aceb91afadec4102fbd85014950cefa64d";
+      };
+    }
+    {
+      name = "ajv_keywords___ajv_keywords_3.4.1.tgz";
+      path = fetchurl {
+        name = "ajv_keywords___ajv_keywords_3.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz";
+        sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da";
+      };
+    }
+    {
+      name = "ajv___ajv_6.12.0.tgz";
+      path = fetchurl {
+        name = "ajv___ajv_6.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz";
+        sha1 = "06d60b96d87b8454a5adaba86e7854da629db4b7";
+      };
+    }
+    {
+      name = "ajv___ajv_6.10.2.tgz";
+      path = fetchurl {
+        name = "ajv___ajv_6.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz";
+        sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52";
+      };
+    }
+    {
+      name = "ajv___ajv_6.12.2.tgz";
+      path = fetchurl {
+        name = "ajv___ajv_6.12.2.tgz";
+        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz";
+        sha1 = "c629c5eced17baf314437918d2da88c99d5958cd";
+      };
+    }
+    {
+      name = "ajv___ajv_6.7.0.tgz";
+      path = fetchurl {
+        name = "ajv___ajv_6.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz";
+        sha1 = "e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96";
+      };
+    }
+    {
+      name = "ajv___ajv_6.9.1.tgz";
+      path = fetchurl {
+        name = "ajv___ajv_6.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz";
+        sha1 = "a4d3683d74abc5670e75f0b16520f70a20ea8dc1";
+      };
+    }
+    {
+      name = "align_text___align_text_0.1.4.tgz";
+      path = fetchurl {
+        name = "align_text___align_text_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz";
+        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+      };
+    }
+    {
+      name = "ally.js___ally.js_1.4.1.tgz";
+      path = fetchurl {
+        name = "ally.js___ally.js_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/ally.js/-/ally.js-1.4.1.tgz";
+        sha1 = "9fb7e6ba58efac4ee9131cb29aa9ee3b540bcf1e";
+      };
+    }
+    {
+      name = "alphanum_sort___alphanum_sort_1.0.2.tgz";
+      path = fetchurl {
+        name = "alphanum_sort___alphanum_sort_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz";
+        sha1 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3";
+      };
+    }
+    {
+      name = "amdefine___amdefine_1.0.1.tgz";
+      path = fetchurl {
+        name = "amdefine___amdefine_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+      };
+    }
+    {
+      name = "ansi_colors___ansi_colors_3.2.4.tgz";
+      path = fetchurl {
+        name = "ansi_colors___ansi_colors_3.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz";
+        sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf";
+      };
+    }
+    {
+      name = "ansi_escapes___ansi_escapes_3.2.0.tgz";
+      path = fetchurl {
+        name = "ansi_escapes___ansi_escapes_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz";
+        sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b";
+      };
+    }
+    {
+      name = "ansi_escapes___ansi_escapes_4.2.1.tgz";
+      path = fetchurl {
+        name = "ansi_escapes___ansi_escapes_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.2.1.tgz";
+        sha1 = "4dccdb846c3eee10f6d64dea66273eab90c37228";
+      };
+    }
+    {
+      name = "ansi_html___ansi_html_0.0.7.tgz";
+      path = fetchurl {
+        name = "ansi_html___ansi_html_0.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz";
+        sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e";
+      };
+    }
+    {
+      name = "ansi_regex___ansi_regex_2.1.1.tgz";
+      path = fetchurl {
+        name = "ansi_regex___ansi_regex_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+      };
+    }
+    {
+      name = "ansi_regex___ansi_regex_3.0.0.tgz";
+      path = fetchurl {
+        name = "ansi_regex___ansi_regex_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz";
+        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
+      };
+    }
+    {
+      name = "ansi_regex___ansi_regex_4.1.0.tgz";
+      path = fetchurl {
+        name = "ansi_regex___ansi_regex_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz";
+        sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997";
+      };
+    }
+    {
+      name = "ansi_regex___ansi_regex_5.0.0.tgz";
+      path = fetchurl {
+        name = "ansi_regex___ansi_regex_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz";
+        sha1 = "388539f55179bf39339c81af30a654d69f87cb75";
+      };
+    }
+    {
+      name = "ansi_styles___ansi_styles_2.2.1.tgz";
+      path = fetchurl {
+        name = "ansi_styles___ansi_styles_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+      };
+    }
+    {
+      name = "ansi_styles___ansi_styles_3.2.1.tgz";
+      path = fetchurl {
+        name = "ansi_styles___ansi_styles_3.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz";
+        sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d";
+      };
+    }
+    {
+      name = "ansi_styles___ansi_styles_4.2.1.tgz";
+      path = fetchurl {
+        name = "ansi_styles___ansi_styles_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz";
+        sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359";
+      };
+    }
+    {
+      name = "any_observable___any_observable_0.3.0.tgz";
+      path = fetchurl {
+        name = "any_observable___any_observable_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz";
+        sha1 = "af933475e5806a67d0d7df090dd5e8bef65d119b";
+      };
+    }
+    {
+      name = "anymatch___anymatch_2.0.0.tgz";
+      path = fetchurl {
+        name = "anymatch___anymatch_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz";
+        sha1 = "bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb";
+      };
+    }
+    {
+      name = "anymatch___anymatch_3.0.3.tgz";
+      path = fetchurl {
+        name = "anymatch___anymatch_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.3.tgz";
+        sha1 = "2fb624fe0e84bccab00afee3d0006ed310f22f09";
+      };
+    }
+    {
+      name = "aproba___aproba_1.2.0.tgz";
+      path = fetchurl {
+        name = "aproba___aproba_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz";
+        sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a";
+      };
+    }
+    {
+      name = "arch___arch_2.1.2.tgz";
+      path = fetchurl {
+        name = "arch___arch_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/arch/-/arch-2.1.2.tgz";
+        sha1 = "0c52bbe7344bb4fa260c443d2cbad9c00ff2f0bf";
+      };
+    }
+    {
+      name = "arg___arg_4.1.1.tgz";
+      path = fetchurl {
+        name = "arg___arg_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/arg/-/arg-4.1.1.tgz";
+        sha1 = "485f8e7c390ce4c5f78257dbea80d4be11feda4c";
+      };
+    }
+    {
+      name = "argparse___argparse_1.0.10.tgz";
+      path = fetchurl {
+        name = "argparse___argparse_1.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz";
+        sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911";
+      };
+    }
+    {
+      name = "aria_query___aria_query_4.0.2.tgz";
+      path = fetchurl {
+        name = "aria_query___aria_query_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.0.2.tgz";
+        sha1 = "250687b4ccde1ab86d127da0432ae3552fc7b145";
+      };
+    }
+    {
+      name = "arr_diff___arr_diff_4.0.0.tgz";
+      path = fetchurl {
+        name = "arr_diff___arr_diff_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz";
+        sha1 = "d6461074febfec71e7e15235761a329a5dc7c520";
+      };
+    }
+    {
+      name = "arr_flatten___arr_flatten_1.1.0.tgz";
+      path = fetchurl {
+        name = "arr_flatten___arr_flatten_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz";
+        sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1";
+      };
+    }
+    {
+      name = "arr_union___arr_union_3.1.0.tgz";
+      path = fetchurl {
+        name = "arr_union___arr_union_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz";
+        sha1 = "e39b09aea9def866a8f206e288af63919bae39c4";
+      };
+    }
+    {
+      name = "array_equal___array_equal_1.0.0.tgz";
+      path = fetchurl {
+        name = "array_equal___array_equal_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz";
+        sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93";
+      };
+    }
+    {
+      name = "array_flatten___array_flatten_1.1.1.tgz";
+      path = fetchurl {
+        name = "array_flatten___array_flatten_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz";
+        sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
+      };
+    }
+    {
+      name = "array_flatten___array_flatten_2.1.2.tgz";
+      path = fetchurl {
+        name = "array_flatten___array_flatten_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz";
+        sha1 = "24ef80a28c1a893617e2149b0c6d0d788293b099";
+      };
+    }
+    {
+      name = "array_includes___array_includes_3.0.3.tgz";
+      path = fetchurl {
+        name = "array_includes___array_includes_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz";
+        sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d";
+      };
+    }
+    {
+      name = "array_union___array_union_1.0.2.tgz";
+      path = fetchurl {
+        name = "array_union___array_union_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz";
+        sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39";
+      };
+    }
+    {
+      name = "array_uniq___array_uniq_1.0.3.tgz";
+      path = fetchurl {
+        name = "array_uniq___array_uniq_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz";
+        sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6";
+      };
+    }
+    {
+      name = "array_unique___array_unique_0.3.2.tgz";
+      path = fetchurl {
+        name = "array_unique___array_unique_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz";
+        sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
+      };
+    }
+    {
+      name = "array.prototype.flat___array.prototype.flat_1.2.1.tgz";
+      path = fetchurl {
+        name = "array.prototype.flat___array.prototype.flat_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz";
+        sha1 = "812db8f02cad24d3fab65dd67eabe3b8903494a4";
+      };
+    }
+    {
+      name = "asap___asap_2.0.6.tgz";
+      path = fetchurl {
+        name = "asap___asap_2.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz";
+        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
+      };
+    }
+    {
+      name = "asn1.js___asn1.js_4.10.1.tgz";
+      path = fetchurl {
+        name = "asn1.js___asn1.js_4.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz";
+        sha1 = "b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0";
+      };
+    }
+    {
+      name = "asn1___asn1_0.2.4.tgz";
+      path = fetchurl {
+        name = "asn1___asn1_0.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz";
+        sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136";
+      };
+    }
+    {
+      name = "assert_plus___assert_plus_1.0.0.tgz";
+      path = fetchurl {
+        name = "assert_plus___assert_plus_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+      };
+    }
+    {
+      name = "assert___assert_1.5.0.tgz";
+      path = fetchurl {
+        name = "assert___assert_1.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz";
+        sha1 = "55c109aaf6e0aefdb3dc4b71240c70bf574b18eb";
+      };
+    }
+    {
+      name = "assign_symbols___assign_symbols_1.0.0.tgz";
+      path = fetchurl {
+        name = "assign_symbols___assign_symbols_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz";
+        sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
+      };
+    }
+    {
+      name = "astral_regex___astral_regex_1.0.0.tgz";
+      path = fetchurl {
+        name = "astral_regex___astral_regex_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz";
+        sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9";
+      };
+    }
+    {
+      name = "async_each___async_each_1.0.3.tgz";
+      path = fetchurl {
+        name = "async_each___async_each_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz";
+        sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf";
+      };
+    }
+    {
+      name = "async_limiter___async_limiter_1.0.0.tgz";
+      path = fetchurl {
+        name = "async_limiter___async_limiter_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz";
+        sha1 = "78faed8c3d074ab81f22b4e985d79e8738f720f8";
+      };
+    }
+    {
+      name = "async___async_2.6.3.tgz";
+      path = fetchurl {
+        name = "async___async_2.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz";
+        sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff";
+      };
+    }
+    {
+      name = "async___async_3.2.0.tgz";
+      path = fetchurl {
+        name = "async___async_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz";
+        sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720";
+      };
+    }
+    {
+      name = "async___async_0.2.10.tgz";
+      path = fetchurl {
+        name = "async___async_0.2.10.tgz";
+        url  = "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+      };
+    }
+    {
+      name = "asynckit___asynckit_0.4.0.tgz";
+      path = fetchurl {
+        name = "asynckit___asynckit_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+      };
+    }
+    {
+      name = "atoa___atoa_1.0.0.tgz";
+      path = fetchurl {
+        name = "atoa___atoa_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/atoa/-/atoa-1.0.0.tgz";
+        sha1 = "0cc0e91a480e738f923ebc103676471779b34a49";
+      };
+    }
+    {
+      name = "atob___atob_2.1.2.tgz";
+      path = fetchurl {
+        name = "atob___atob_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz";
+        sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9";
+      };
+    }
+    {
+      name = "auth0_js___auth0_js_9.12.2.tgz";
+      path = fetchurl {
+        name = "auth0_js___auth0_js_9.12.2.tgz";
+        url  = "https://registry.yarnpkg.com/auth0-js/-/auth0-js-9.12.2.tgz";
+        sha1 = "8227259a94e8a47eecf8d7a630d99669049833a6";
+      };
+    }
+    {
+      name = "autoprefixer___autoprefixer_6.7.7.tgz";
+      path = fetchurl {
+        name = "autoprefixer___autoprefixer_6.7.7.tgz";
+        url  = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz";
+        sha1 = "1dbd1c835658e35ce3f9984099db00585c782014";
+      };
+    }
+    {
+      name = "aws_sign2___aws_sign2_0.7.0.tgz";
+      path = fetchurl {
+        name = "aws_sign2___aws_sign2_0.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz";
+        sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
+      };
+    }
+    {
+      name = "aws4___aws4_1.8.0.tgz";
+      path = fetchurl {
+        name = "aws4___aws4_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz";
+        sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f";
+      };
+    }
+    {
+      name = "axios___axios_0.19.0.tgz";
+      path = fetchurl {
+        name = "axios___axios_0.19.0.tgz";
+        url  = "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz";
+        sha1 = "8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8";
+      };
+    }
+    {
+      name = "babel_code_frame___babel_code_frame_6.26.0.tgz";
+      path = fetchurl {
+        name = "babel_code_frame___babel_code_frame_6.26.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz";
+        sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b";
+      };
+    }
+    {
+      name = "babel_jest___babel_jest_24.8.0.tgz";
+      path = fetchurl {
+        name = "babel_jest___babel_jest_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz";
+        sha1 = "5c15ff2b28e20b0f45df43fe6b7f2aae93dba589";
+      };
+    }
+    {
+      name = "babel_loader___babel_loader_8.0.6.tgz";
+      path = fetchurl {
+        name = "babel_loader___babel_loader_8.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz";
+        sha1 = "e33bdb6f362b03f4bb141a0c21ab87c501b70dfb";
+      };
+    }
+    {
+      name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz";
+      path = fetchurl {
+        name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz";
+        sha1 = "f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f";
+      };
+    }
+    {
+      name = "babel_plugin_istanbul___babel_plugin_istanbul_5.2.0.tgz";
+      path = fetchurl {
+        name = "babel_plugin_istanbul___babel_plugin_istanbul_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz";
+        sha1 = "df4ade83d897a92df069c4d9a25cf2671293c854";
+      };
+    }
+    {
+      name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_24.6.0.tgz";
+      path = fetchurl {
+        name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_24.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz";
+        sha1 = "f7f7f7ad150ee96d7a5e8e2c5da8319579e78019";
+      };
+    }
+    {
+      name = "babel_polyfill___babel_polyfill_6.26.0.tgz";
+      path = fetchurl {
+        name = "babel_polyfill___babel_polyfill_6.26.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz";
+        sha1 = "379937abc67d7895970adc621f284cd966cf2153";
+      };
+    }
+    {
+      name = "babel_preset_jest___babel_preset_jest_24.6.0.tgz";
+      path = fetchurl {
+        name = "babel_preset_jest___babel_preset_jest_24.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz";
+        sha1 = "66f06136eefce87797539c0d63f1769cc3915984";
+      };
+    }
+    {
+      name = "babel_runtime___babel_runtime_6.26.0.tgz";
+      path = fetchurl {
+        name = "babel_runtime___babel_runtime_6.26.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz";
+        sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
+      };
+    }
+    {
+      name = "bail___bail_1.0.3.tgz";
+      path = fetchurl {
+        name = "bail___bail_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/bail/-/bail-1.0.3.tgz";
+        sha1 = "63cfb9ddbac829b02a3128cd53224be78e6c21a3";
+      };
+    }
+    {
+      name = "balanced_match___balanced_match_1.0.0.tgz";
+      path = fetchurl {
+        name = "balanced_match___balanced_match_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    }
+    {
+      name = "base64_js___base64_js_1.3.1.tgz";
+      path = fetchurl {
+        name = "base64_js___base64_js_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz";
+        sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1";
+      };
+    }
+    {
+      name = "base___base_0.11.2.tgz";
+      path = fetchurl {
+        name = "base___base_0.11.2.tgz";
+        url  = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz";
+        sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f";
+      };
+    }
+    {
+      name = "batch___batch_0.6.1.tgz";
+      path = fetchurl {
+        name = "batch___batch_0.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz";
+        sha1 = "dc34314f4e679318093fc760272525f94bf25c16";
+      };
+    }
+    {
+      name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz";
+      path = fetchurl {
+        name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
+      };
+    }
+    {
+      name = "bfj___bfj_6.1.2.tgz";
+      path = fetchurl {
+        name = "bfj___bfj_6.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz";
+        sha1 = "325c861a822bcb358a41c78a33b8e6e2086dde7f";
+      };
+    }
+    {
+      name = "big.js___big.js_3.2.0.tgz";
+      path = fetchurl {
+        name = "big.js___big.js_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz";
+        sha1 = "a5fc298b81b9e0dca2e458824784b65c52ba588e";
+      };
+    }
+    {
+      name = "big.js___big.js_5.2.2.tgz";
+      path = fetchurl {
+        name = "big.js___big.js_5.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz";
+        sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328";
+      };
+    }
+    {
+      name = "bignumber.js___bignumber.js_4.1.0.tgz";
+      path = fetchurl {
+        name = "bignumber.js___bignumber.js_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz";
+        sha1 = "db6f14067c140bd46624815a7916c92d9b6c24b1";
+      };
+    }
+    {
+      name = "binary_extensions___binary_extensions_1.13.1.tgz";
+      path = fetchurl {
+        name = "binary_extensions___binary_extensions_1.13.1.tgz";
+        url  = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz";
+        sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65";
+      };
+    }
+    {
+      name = "binary_extensions___binary_extensions_2.0.0.tgz";
+      path = fetchurl {
+        name = "binary_extensions___binary_extensions_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz";
+        sha1 = "23c0df14f6a88077f5f986c0d167ec03c3d5537c";
+      };
+    }
+    {
+      name = "bindings___bindings_1.5.0.tgz";
+      path = fetchurl {
+        name = "bindings___bindings_1.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz";
+        sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df";
+      };
+    }
+    {
+      name = "bluebird___bluebird_3.7.2.tgz";
+      path = fetchurl {
+        name = "bluebird___bluebird_3.7.2.tgz";
+        url  = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz";
+        sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f";
+      };
+    }
+    {
+      name = "bn.js___bn.js_4.11.8.tgz";
+      path = fetchurl {
+        name = "bn.js___bn.js_4.11.8.tgz";
+        url  = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz";
+        sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f";
+      };
+    }
+    {
+      name = "body_parser___body_parser_1.18.2.tgz";
+      path = fetchurl {
+        name = "body_parser___body_parser_1.18.2.tgz";
+        url  = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz";
+        sha1 = "87678a19d84b47d859b83199bd59bce222b10454";
+      };
+    }
+    {
+      name = "body_parser___body_parser_1.19.0.tgz";
+      path = fetchurl {
+        name = "body_parser___body_parser_1.19.0.tgz";
+        url  = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz";
+        sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a";
+      };
+    }
+    {
+      name = "bonjour___bonjour_3.5.0.tgz";
+      path = fetchurl {
+        name = "bonjour___bonjour_3.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz";
+        sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5";
+      };
+    }
+    {
+      name = "boolbase___boolbase_1.0.0.tgz";
+      path = fetchurl {
+        name = "boolbase___boolbase_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz";
+        sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
+      };
+    }
+    {
+      name = "brace_expansion___brace_expansion_1.1.11.tgz";
+      path = fetchurl {
+        name = "brace_expansion___brace_expansion_1.1.11.tgz";
+        url  = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd";
+      };
+    }
+    {
+      name = "braces___braces_2.3.2.tgz";
+      path = fetchurl {
+        name = "braces___braces_2.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz";
+        sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729";
+      };
+    }
+    {
+      name = "braces___braces_3.0.2.tgz";
+      path = fetchurl {
+        name = "braces___braces_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz";
+        sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107";
+      };
+    }
+    {
+      name = "brorand___brorand_1.1.0.tgz";
+      path = fetchurl {
+        name = "brorand___brorand_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz";
+        sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
+      };
+    }
+    {
+      name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz";
+      path = fetchurl {
+        name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz";
+        sha1 = "616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4";
+      };
+    }
+    {
+      name = "browser_resolve___browser_resolve_1.11.3.tgz";
+      path = fetchurl {
+        name = "browser_resolve___browser_resolve_1.11.3.tgz";
+        url  = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz";
+        sha1 = "9b7cbb3d0f510e4cb86bdbd796124d28b5890af6";
+      };
+    }
+    {
+      name = "browser_stdout___browser_stdout_1.3.1.tgz";
+      path = fetchurl {
+        name = "browser_stdout___browser_stdout_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz";
+        sha1 = "baa559ee14ced73452229bad7326467c61fabd60";
+      };
+    }
+    {
+      name = "browserify_aes___browserify_aes_1.2.0.tgz";
+      path = fetchurl {
+        name = "browserify_aes___browserify_aes_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz";
+        sha1 = "326734642f403dabc3003209853bb70ad428ef48";
+      };
+    }
+    {
+      name = "browserify_cipher___browserify_cipher_1.0.1.tgz";
+      path = fetchurl {
+        name = "browserify_cipher___browserify_cipher_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz";
+        sha1 = "8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0";
+      };
+    }
+    {
+      name = "browserify_des___browserify_des_1.0.2.tgz";
+      path = fetchurl {
+        name = "browserify_des___browserify_des_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz";
+        sha1 = "3af4f1f59839403572f1c66204375f7a7f703e9c";
+      };
+    }
+    {
+      name = "browserify_rsa___browserify_rsa_4.0.1.tgz";
+      path = fetchurl {
+        name = "browserify_rsa___browserify_rsa_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
+        sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
+      };
+    }
+    {
+      name = "browserify_sign___browserify_sign_4.0.4.tgz";
+      path = fetchurl {
+        name = "browserify_sign___browserify_sign_4.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz";
+        sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
+      };
+    }
+    {
+      name = "browserify_zlib___browserify_zlib_0.2.0.tgz";
+      path = fetchurl {
+        name = "browserify_zlib___browserify_zlib_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz";
+        sha1 = "2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f";
+      };
+    }
+    {
+      name = "browserslist___browserslist_1.7.7.tgz";
+      path = fetchurl {
+        name = "browserslist___browserslist_1.7.7.tgz";
+        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz";
+        sha1 = "0bd76704258be829b2398bb50e4b62d1a166b0b9";
+      };
+    }
+    {
+      name = "browserslist___browserslist_4.3.7.tgz";
+      path = fetchurl {
+        name = "browserslist___browserslist_4.3.7.tgz";
+        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.7.tgz";
+        sha1 = "f1de479a6466ea47a0a26dcc725e7504817e624a";
+      };
+    }
+    {
+      name = "browserslist___browserslist_4.6.6.tgz";
+      path = fetchurl {
+        name = "browserslist___browserslist_4.6.6.tgz";
+        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz";
+        sha1 = "6e4bf467cde520bc9dbdf3747dafa03531cec453";
+      };
+    }
+    {
+      name = "bs_logger___bs_logger_0.2.6.tgz";
+      path = fetchurl {
+        name = "bs_logger___bs_logger_0.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz";
+        sha1 = "eb7d365307a72cf974cc6cda76b68354ad336bd8";
+      };
+    }
+    {
+      name = "bser___bser_2.1.0.tgz";
+      path = fetchurl {
+        name = "bser___bser_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/bser/-/bser-2.1.0.tgz";
+        sha1 = "65fc784bf7f87c009b973c12db6546902fa9c7b5";
+      };
+    }
+    {
+      name = "buffer_crc32___buffer_crc32_0.2.13.tgz";
+      path = fetchurl {
+        name = "buffer_crc32___buffer_crc32_0.2.13.tgz";
+        url  = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz";
+        sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242";
+      };
+    }
+    {
+      name = "buffer_from___buffer_from_1.1.1.tgz";
+      path = fetchurl {
+        name = "buffer_from___buffer_from_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz";
+        sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef";
+      };
+    }
+    {
+      name = "buffer_indexof___buffer_indexof_1.1.1.tgz";
+      path = fetchurl {
+        name = "buffer_indexof___buffer_indexof_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz";
+        sha1 = "52fabcc6a606d1a00302802648ef68f639da268c";
+      };
+    }
+    {
+      name = "buffer_xor___buffer_xor_1.0.3.tgz";
+      path = fetchurl {
+        name = "buffer_xor___buffer_xor_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz";
+        sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9";
+      };
+    }
+    {
+      name = "buffer___buffer_4.9.2.tgz";
+      path = fetchurl {
+        name = "buffer___buffer_4.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz";
+        sha1 = "230ead344002988644841ab0244af8c44bbe3ef8";
+      };
+    }
+    {
+      name = "builtin_modules___builtin_modules_1.1.1.tgz";
+      path = fetchurl {
+        name = "builtin_modules___builtin_modules_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz";
+        sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
+      };
+    }
+    {
+      name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz";
+      path = fetchurl {
+        name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
+        sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
+      };
+    }
+    {
+      name = "bullseye___bullseye_1.4.6.tgz";
+      path = fetchurl {
+        name = "bullseye___bullseye_1.4.6.tgz";
+        url  = "https://registry.yarnpkg.com/bullseye/-/bullseye-1.4.6.tgz";
+        sha1 = "b73f606f7b4273be80ac65acd75295d62606fe24";
+      };
+    }
+    {
+      name = "bytes___bytes_3.0.0.tgz";
+      path = fetchurl {
+        name = "bytes___bytes_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz";
+        sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
+      };
+    }
+    {
+      name = "bytes___bytes_3.1.0.tgz";
+      path = fetchurl {
+        name = "bytes___bytes_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz";
+        sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6";
+      };
+    }
+    {
+      name = "cacache___cacache_12.0.3.tgz";
+      path = fetchurl {
+        name = "cacache___cacache_12.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz";
+        sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390";
+      };
+    }
+    {
+      name = "cacache___cacache_13.0.1.tgz";
+      path = fetchurl {
+        name = "cacache___cacache_13.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz";
+        sha1 = "a8000c21697089082f85287a1aec6e382024a71c";
+      };
+    }
+    {
+      name = "cache_base___cache_base_1.0.1.tgz";
+      path = fetchurl {
+        name = "cache_base___cache_base_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz";
+        sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2";
+      };
+    }
+    {
+      name = "cachedir___cachedir_2.3.0.tgz";
+      path = fetchurl {
+        name = "cachedir___cachedir_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz";
+        sha1 = "0c75892a052198f0b21c7c1804d8331edfcae0e8";
+      };
+    }
+    {
+      name = "calculate_size___calculate_size_1.1.1.tgz";
+      path = fetchurl {
+        name = "calculate_size___calculate_size_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/calculate-size/-/calculate-size-1.1.1.tgz";
+        sha1 = "ae7caa1c7795f82c4f035dc7be270e3581dae3ee";
+      };
+    }
+    {
+      name = "call_me_maybe___call_me_maybe_1.0.1.tgz";
+      path = fetchurl {
+        name = "call_me_maybe___call_me_maybe_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz";
+        sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b";
+      };
+    }
+    {
+      name = "caller_callsite___caller_callsite_2.0.0.tgz";
+      path = fetchurl {
+        name = "caller_callsite___caller_callsite_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz";
+        sha1 = "847e0fce0a223750a9a027c54b33731ad3154134";
+      };
+    }
+    {
+      name = "caller_path___caller_path_2.0.0.tgz";
+      path = fetchurl {
+        name = "caller_path___caller_path_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz";
+        sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4";
+      };
+    }
+    {
+      name = "callsites___callsites_2.0.0.tgz";
+      path = fetchurl {
+        name = "callsites___callsites_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz";
+        sha1 = "06eb84f00eea413da86affefacbffb36093b3c50";
+      };
+    }
+    {
+      name = "callsites___callsites_3.1.0.tgz";
+      path = fetchurl {
+        name = "callsites___callsites_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz";
+        sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73";
+      };
+    }
+    {
+      name = "camel_case___camel_case_3.0.0.tgz";
+      path = fetchurl {
+        name = "camel_case___camel_case_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz";
+        sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73";
+      };
+    }
+    {
+      name = "camelcase___camelcase_1.2.1.tgz";
+      path = fetchurl {
+        name = "camelcase___camelcase_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+    }
+    {
+      name = "camelcase___camelcase_4.1.0.tgz";
+      path = fetchurl {
+        name = "camelcase___camelcase_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+      };
+    }
+    {
+      name = "camelcase___camelcase_5.3.1.tgz";
+      path = fetchurl {
+        name = "camelcase___camelcase_5.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz";
+        sha1 = "e3c9b31569e106811df242f715725a1f4c494320";
+      };
+    }
+    {
+      name = "caniuse_api___caniuse_api_3.0.0.tgz";
+      path = fetchurl {
+        name = "caniuse_api___caniuse_api_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz";
+        sha1 = "5e4d90e2274961d46291997df599e3ed008ee4c0";
+      };
+    }
+    {
+      name = "caniuse_db___caniuse_db_1.0.30000890.tgz";
+      path = fetchurl {
+        name = "caniuse_db___caniuse_db_1.0.30000890.tgz";
+        url  = "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000890.tgz";
+        sha1 = "b406595db8b631975b8dc5fa174f32925c23778b";
+      };
+    }
+    {
+      name = "caniuse_lite___caniuse_lite_1.0.30000926.tgz";
+      path = fetchurl {
+        name = "caniuse_lite___caniuse_lite_1.0.30000926.tgz";
+        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000926.tgz";
+        sha1 = "4361a99d818ca6e521dbe89a732de62a194a789c";
+      };
+    }
+    {
+      name = "caniuse_lite___caniuse_lite_1.0.30000984.tgz";
+      path = fetchurl {
+        name = "caniuse_lite___caniuse_lite_1.0.30000984.tgz";
+        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz";
+        sha1 = "dc96c3c469e9bcfc6ad5bdd24c77ec918ea76fe0";
+      };
+    }
+    {
+      name = "capture_exit___capture_exit_2.0.0.tgz";
+      path = fetchurl {
+        name = "capture_exit___capture_exit_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz";
+        sha1 = "fb953bfaebeb781f62898239dabb426d08a509a4";
+      };
+    }
+    {
+      name = "caseless___caseless_0.12.0.tgz";
+      path = fetchurl {
+        name = "caseless___caseless_0.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz";
+        sha1 = "1b681c21ff84033c826543090689420d187151dc";
+      };
+    }
+    {
+      name = "center_align___center_align_0.1.3.tgz";
+      path = fetchurl {
+        name = "center_align___center_align_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz";
+        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+      };
+    }
+    {
+      name = "chalk___chalk_2.4.2.tgz";
+      path = fetchurl {
+        name = "chalk___chalk_2.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz";
+        sha1 = "cd42541677a54333cf541a49108c1432b44c9424";
+      };
+    }
+    {
+      name = "chalk___chalk_1.1.3.tgz";
+      path = fetchurl {
+        name = "chalk___chalk_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+      };
+    }
+    {
+      name = "chalk___chalk_2.4.1.tgz";
+      path = fetchurl {
+        name = "chalk___chalk_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz";
+        sha1 = "18c49ab16a037b6eb0152cc83e3471338215b66e";
+      };
+    }
+    {
+      name = "chalk___chalk_3.0.0.tgz";
+      path = fetchurl {
+        name = "chalk___chalk_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz";
+        sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4";
+      };
+    }
+    {
+      name = "character_entities_legacy___character_entities_legacy_1.1.2.tgz";
+      path = fetchurl {
+        name = "character_entities_legacy___character_entities_legacy_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz";
+        sha1 = "7c6defb81648498222c9855309953d05f4d63a9c";
+      };
+    }
+    {
+      name = "character_entities___character_entities_1.2.2.tgz";
+      path = fetchurl {
+        name = "character_entities___character_entities_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.2.tgz";
+        sha1 = "58c8f371c0774ef0ba9b2aca5f00d8f100e6e363";
+      };
+    }
+    {
+      name = "character_reference_invalid___character_reference_invalid_1.1.2.tgz";
+      path = fetchurl {
+        name = "character_reference_invalid___character_reference_invalid_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz";
+        sha1 = "21e421ad3d84055952dab4a43a04e73cd425d3ed";
+      };
+    }
+    {
+      name = "chardet___chardet_0.7.0.tgz";
+      path = fetchurl {
+        name = "chardet___chardet_0.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz";
+        sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e";
+      };
+    }
+    {
+      name = "charenc___charenc_0.0.2.tgz";
+      path = fetchurl {
+        name = "charenc___charenc_0.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz";
+        sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
+      };
+    }
+    {
+      name = "check_more_types___check_more_types_2.24.0.tgz";
+      path = fetchurl {
+        name = "check_more_types___check_more_types_2.24.0.tgz";
+        url  = "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz";
+        sha1 = "1420ffb10fd444dcfc79b43891bbfffd32a84600";
+      };
+    }
+    {
+      name = "check_types___check_types_8.0.3.tgz";
+      path = fetchurl {
+        name = "check_types___check_types_8.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz";
+        sha1 = "3356cca19c889544f2d7a95ed49ce508a0ecf552";
+      };
+    }
+    {
+      name = "cheerio___cheerio_1.0.0_rc.2.tgz";
+      path = fetchurl {
+        name = "cheerio___cheerio_1.0.0_rc.2.tgz";
+        url  = "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz";
+        sha1 = "4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db";
+      };
+    }
+    {
+      name = "chokidar___chokidar_3.0.2.tgz";
+      path = fetchurl {
+        name = "chokidar___chokidar_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz";
+        sha1 = "0d1cd6d04eb2df0327446188cd13736a3367d681";
+      };
+    }
+    {
+      name = "chokidar___chokidar_2.1.8.tgz";
+      path = fetchurl {
+        name = "chokidar___chokidar_2.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz";
+        sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917";
+      };
+    }
+    {
+      name = "chokidar___chokidar_2.1.6.tgz";
+      path = fetchurl {
+        name = "chokidar___chokidar_2.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz";
+        sha1 = "b6cad653a929e244ce8a834244164d241fa954c5";
+      };
+    }
+    {
+      name = "chownr___chownr_1.1.4.tgz";
+      path = fetchurl {
+        name = "chownr___chownr_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz";
+        sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b";
+      };
+    }
+    {
+      name = "chownr___chownr_1.1.3.tgz";
+      path = fetchurl {
+        name = "chownr___chownr_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz";
+        sha1 = "42d837d5239688d55f303003a508230fa6727142";
+      };
+    }
+    {
+      name = "chroma_js___chroma_js_1.4.0.tgz";
+      path = fetchurl {
+        name = "chroma_js___chroma_js_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/chroma-js/-/chroma-js-1.4.0.tgz";
+        sha1 = "695c52e7c97617e5f687db31913503d410481ae4";
+      };
+    }
+    {
+      name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz";
+      path = fetchurl {
+        name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz";
+        sha1 = "234090ee97c7d4ad1a2c4beae27505deffc608a4";
+      };
+    }
+    {
+      name = "ci_info___ci_info_2.0.0.tgz";
+      path = fetchurl {
+        name = "ci_info___ci_info_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz";
+        sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46";
+      };
+    }
+    {
+      name = "cipher_base___cipher_base_1.0.4.tgz";
+      path = fetchurl {
+        name = "cipher_base___cipher_base_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz";
+        sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de";
+      };
+    }
+    {
+      name = "class_utils___class_utils_0.3.6.tgz";
+      path = fetchurl {
+        name = "class_utils___class_utils_0.3.6.tgz";
+        url  = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz";
+        sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463";
+      };
+    }
+    {
+      name = "classnames___classnames_2.2.6.tgz";
+      path = fetchurl {
+        name = "classnames___classnames_2.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz";
+        sha1 = "43935bffdd291f326dad0a205309b38d00f650ce";
+      };
+    }
+    {
+      name = "clean_css___clean_css_4.2.1.tgz";
+      path = fetchurl {
+        name = "clean_css___clean_css_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz";
+        sha1 = "2d411ef76b8569b6d0c84068dabe85b0aa5e5c17";
+      };
+    }
+    {
+      name = "clean_css___clean_css_3.4.28.tgz";
+      path = fetchurl {
+        name = "clean_css___clean_css_3.4.28.tgz";
+        url  = "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz";
+        sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff";
+      };
+    }
+    {
+      name = "clean_stack___clean_stack_2.2.0.tgz";
+      path = fetchurl {
+        name = "clean_stack___clean_stack_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz";
+        sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b";
+      };
+    }
+    {
+      name = "clean_webpack_plugin___clean_webpack_plugin_3.0.0.tgz";
+      path = fetchurl {
+        name = "clean_webpack_plugin___clean_webpack_plugin_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz";
+        sha1 = "a99d8ec34c1c628a4541567aa7b457446460c62b";
+      };
+    }
+    {
+      name = "cli_cursor___cli_cursor_1.0.2.tgz";
+      path = fetchurl {
+        name = "cli_cursor___cli_cursor_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz";
+        sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987";
+      };
+    }
+    {
+      name = "cli_cursor___cli_cursor_2.1.0.tgz";
+      path = fetchurl {
+        name = "cli_cursor___cli_cursor_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz";
+        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
+      };
+    }
+    {
+      name = "cli_cursor___cli_cursor_3.1.0.tgz";
+      path = fetchurl {
+        name = "cli_cursor___cli_cursor_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz";
+        sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307";
+      };
+    }
+    {
+      name = "cli_table3___cli_table3_0.5.1.tgz";
+      path = fetchurl {
+        name = "cli_table3___cli_table3_0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz";
+        sha1 = "0252372d94dfc40dbd8df06005f48f31f656f202";
+      };
+    }
+    {
+      name = "cli_truncate___cli_truncate_0.2.1.tgz";
+      path = fetchurl {
+        name = "cli_truncate___cli_truncate_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz";
+        sha1 = "9f15cfbb0705005369216c626ac7d05ab90dd574";
+      };
+    }
+    {
+      name = "cli_width___cli_width_2.2.0.tgz";
+      path = fetchurl {
+        name = "cli_width___cli_width_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz";
+        sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639";
+      };
+    }
+    {
+      name = "cliui___cliui_2.1.0.tgz";
+      path = fetchurl {
+        name = "cliui___cliui_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz";
+        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+      };
+    }
+    {
+      name = "cliui___cliui_4.1.0.tgz";
+      path = fetchurl {
+        name = "cliui___cliui_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz";
+        sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49";
+      };
+    }
+    {
+      name = "cliui___cliui_5.0.0.tgz";
+      path = fetchurl {
+        name = "cliui___cliui_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz";
+        sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5";
+      };
+    }
+    {
+      name = "clone_deep___clone_deep_2.0.2.tgz";
+      path = fetchurl {
+        name = "clone_deep___clone_deep_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz";
+        sha1 = "00db3a1e173656730d1188c3d6aced6d7ea97713";
+      };
+    }
+    {
+      name = "cnbuilder___cnbuilder_1.0.8.tgz";
+      path = fetchurl {
+        name = "cnbuilder___cnbuilder_1.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/cnbuilder/-/cnbuilder-1.0.8.tgz";
+        sha1 = "2b5a700e4d541085df31709b5678c786d29967da";
+      };
+    }
+    {
+      name = "co___co_4.6.0.tgz";
+      path = fetchurl {
+        name = "co___co_4.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz";
+        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
+      };
+    }
+    {
+      name = "coa___coa_2.0.2.tgz";
+      path = fetchurl {
+        name = "coa___coa_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz";
+        sha1 = "43f6c21151b4ef2bf57187db0d73de229e3e7ec3";
+      };
+    }
+    {
+      name = "code_point_at___code_point_at_1.1.0.tgz";
+      path = fetchurl {
+        name = "code_point_at___code_point_at_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+      };
+    }
+    {
+      name = "codemirror___codemirror_5.40.2.tgz";
+      path = fetchurl {
+        name = "codemirror___codemirror_5.40.2.tgz";
+        url  = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.40.2.tgz";
+        sha1 = "f4a41fee2d84e679543591b3680af259d903330b";
+      };
+    }
+    {
+      name = "collapse_white_space___collapse_white_space_1.0.4.tgz";
+      path = fetchurl {
+        name = "collapse_white_space___collapse_white_space_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.4.tgz";
+        sha1 = "ce05cf49e54c3277ae573036a26851ba430a0091";
+      };
+    }
+    {
+      name = "collection_visit___collection_visit_1.0.0.tgz";
+      path = fetchurl {
+        name = "collection_visit___collection_visit_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz";
+        sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0";
+      };
+    }
+    {
+      name = "color_convert___color_convert_1.9.3.tgz";
+      path = fetchurl {
+        name = "color_convert___color_convert_1.9.3.tgz";
+        url  = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz";
+        sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8";
+      };
+    }
+    {
+      name = "color_convert___color_convert_2.0.1.tgz";
+      path = fetchurl {
+        name = "color_convert___color_convert_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz";
+        sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3";
+      };
+    }
+    {
+      name = "color_name___color_name_1.1.3.tgz";
+      path = fetchurl {
+        name = "color_name___color_name_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz";
+        sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
+      };
+    }
+    {
+      name = "color_name___color_name_1.1.4.tgz";
+      path = fetchurl {
+        name = "color_name___color_name_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz";
+        sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2";
+      };
+    }
+    {
+      name = "color_string___color_string_1.5.3.tgz";
+      path = fetchurl {
+        name = "color_string___color_string_1.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz";
+        sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc";
+      };
+    }
+    {
+      name = "color___color_3.1.1.tgz";
+      path = fetchurl {
+        name = "color___color_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/color/-/color-3.1.1.tgz";
+        sha1 = "7abf5c0d38e89378284e873c207ae2172dcc8a61";
+      };
+    }
+    {
+      name = "colors___colors_0.5.1.tgz";
+      path = fetchurl {
+        name = "colors___colors_0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz";
+        sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774";
+      };
+    }
+    {
+      name = "colors___colors_1.1.2.tgz";
+      path = fetchurl {
+        name = "colors___colors_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz";
+        sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
+      };
+    }
+    {
+      name = "combined_stream___combined_stream_1.0.8.tgz";
+      path = fetchurl {
+        name = "combined_stream___combined_stream_1.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz";
+        sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f";
+      };
+    }
+    {
+      name = "commander___commander_2.15.1.tgz";
+      path = fetchurl {
+        name = "commander___commander_2.15.1.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz";
+        sha1 = "df46e867d0fc2aec66a34662b406a9ccafff5b0f";
+      };
+    }
+    {
+      name = "commander___commander_2.17.1.tgz";
+      path = fetchurl {
+        name = "commander___commander_2.17.1.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz";
+        sha1 = "bd77ab7de6de94205ceacc72f1716d29f20a77bf";
+      };
+    }
+    {
+      name = "commander___commander_2.8.1.tgz";
+      path = fetchurl {
+        name = "commander___commander_2.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz";
+        sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
+      };
+    }
+    {
+      name = "commander___commander_2.20.3.tgz";
+      path = fetchurl {
+        name = "commander___commander_2.20.3.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz";
+        sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33";
+      };
+    }
+    {
+      name = "commander___commander_2.20.0.tgz";
+      path = fetchurl {
+        name = "commander___commander_2.20.0.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz";
+        sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422";
+      };
+    }
+    {
+      name = "commander___commander_4.1.1.tgz";
+      path = fetchurl {
+        name = "commander___commander_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz";
+        sha1 = "9fd602bd936294e9e9ef46a3f4d6964044b18068";
+      };
+    }
+    {
+      name = "commander___commander_2.19.0.tgz";
+      path = fetchurl {
+        name = "commander___commander_2.19.0.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz";
+        sha1 = "f6198aa84e5b83c46054b94ddedbfed5ee9ff12a";
+      };
+    }
+    {
+      name = "commander___commander_2.9.0.tgz";
+      path = fetchurl {
+        name = "commander___commander_2.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz";
+        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+      };
+    }
+    {
+      name = "common_tags___common_tags_1.8.0.tgz";
+      path = fetchurl {
+        name = "common_tags___common_tags_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz";
+        sha1 = "8e3153e542d4a39e9b10554434afaaf98956a937";
+      };
+    }
+    {
+      name = "commondir___commondir_1.0.1.tgz";
+      path = fetchurl {
+        name = "commondir___commondir_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz";
+        sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b";
+      };
+    }
+    {
+      name = "component_emitter___component_emitter_1.3.0.tgz";
+      path = fetchurl {
+        name = "component_emitter___component_emitter_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz";
+        sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0";
+      };
+    }
+    {
+      name = "compressible___compressible_2.0.18.tgz";
+      path = fetchurl {
+        name = "compressible___compressible_2.0.18.tgz";
+        url  = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz";
+        sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba";
+      };
+    }
+    {
+      name = "compression___compression_1.7.4.tgz";
+      path = fetchurl {
+        name = "compression___compression_1.7.4.tgz";
+        url  = "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz";
+        sha1 = "95523eff170ca57c29a0ca41e6fe131f41e5bb8f";
+      };
+    }
+    {
+      name = "concat_map___concat_map_0.0.1.tgz";
+      path = fetchurl {
+        name = "concat_map___concat_map_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    }
+    {
+      name = "concat_stream___concat_stream_1.6.2.tgz";
+      path = fetchurl {
+        name = "concat_stream___concat_stream_1.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz";
+        sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34";
+      };
+    }
+    {
+      name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz";
+      path = fetchurl {
+        name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz";
+        sha1 = "8b32089359308d111115d81cad3fceab888f97bc";
+      };
+    }
+    {
+      name = "connected_react_router___connected_react_router_6.8.0.tgz";
+      path = fetchurl {
+        name = "connected_react_router___connected_react_router_6.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.8.0.tgz";
+        sha1 = "ddc687b31d498322445d235d660798489fa56cae";
+      };
+    }
+    {
+      name = "console_browserify___console_browserify_1.2.0.tgz";
+      path = fetchurl {
+        name = "console_browserify___console_browserify_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz";
+        sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336";
+      };
+    }
+    {
+      name = "constants_browserify___constants_browserify_1.0.0.tgz";
+      path = fetchurl {
+        name = "constants_browserify___constants_browserify_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz";
+        sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
+      };
+    }
+    {
+      name = "content_disposition___content_disposition_0.5.2.tgz";
+      path = fetchurl {
+        name = "content_disposition___content_disposition_0.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz";
+        sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4";
+      };
+    }
+    {
+      name = "content_disposition___content_disposition_0.5.3.tgz";
+      path = fetchurl {
+        name = "content_disposition___content_disposition_0.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz";
+        sha1 = "e130caf7e7279087c5616c2007d0485698984fbd";
+      };
+    }
+    {
+      name = "content_type_parser___content_type_parser_1.0.2.tgz";
+      path = fetchurl {
+        name = "content_type_parser___content_type_parser_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz";
+        sha1 = "caabe80623e63638b2502fd4c7f12ff4ce2352e7";
+      };
+    }
+    {
+      name = "content_type___content_type_1.0.4.tgz";
+      path = fetchurl {
+        name = "content_type___content_type_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz";
+        sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b";
+      };
+    }
+    {
+      name = "contra___contra_1.9.1.tgz";
+      path = fetchurl {
+        name = "contra___contra_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/contra/-/contra-1.9.1.tgz";
+        sha1 = "60e498274b3d2d332896d60f82900aefa2ecac8c";
+      };
+    }
+    {
+      name = "convert_source_map___convert_source_map_1.6.0.tgz";
+      path = fetchurl {
+        name = "convert_source_map___convert_source_map_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz";
+        sha1 = "51b537a8c43e0f04dec1993bffcdd504e758ac20";
+      };
+    }
+    {
+      name = "cookie_signature___cookie_signature_1.0.6.tgz";
+      path = fetchurl {
+        name = "cookie_signature___cookie_signature_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz";
+        sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
+      };
+    }
+    {
+      name = "cookie___cookie_0.3.1.tgz";
+      path = fetchurl {
+        name = "cookie___cookie_0.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz";
+        sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
+      };
+    }
+    {
+      name = "cookie___cookie_0.4.0.tgz";
+      path = fetchurl {
+        name = "cookie___cookie_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz";
+        sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba";
+      };
+    }
+    {
+      name = "cookiejar___cookiejar_2.1.2.tgz";
+      path = fetchurl {
+        name = "cookiejar___cookiejar_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz";
+        sha1 = "dd8a235530752f988f9a0844f3fc589e3111125c";
+      };
+    }
+    {
+      name = "copy_concurrently___copy_concurrently_1.0.5.tgz";
+      path = fetchurl {
+        name = "copy_concurrently___copy_concurrently_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
+        sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0";
+      };
+    }
+    {
+      name = "copy_descriptor___copy_descriptor_0.1.1.tgz";
+      path = fetchurl {
+        name = "copy_descriptor___copy_descriptor_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz";
+        sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
+      };
+    }
+    {
+      name = "copy_to_clipboard___copy_to_clipboard_3.0.8.tgz";
+      path = fetchurl {
+        name = "copy_to_clipboard___copy_to_clipboard_3.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz";
+        sha1 = "f4e82f4a8830dce4666b7eb8ded0c9bcc313aba9";
+      };
+    }
+    {
+      name = "core_js_compat___core_js_compat_3.1.4.tgz";
+      path = fetchurl {
+        name = "core_js_compat___core_js_compat_3.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz";
+        sha1 = "e4d0c40fbd01e65b1d457980fe4112d4358a7408";
+      };
+    }
+    {
+      name = "core_js_pure___core_js_pure_3.1.4.tgz";
+      path = fetchurl {
+        name = "core_js_pure___core_js_pure_3.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz";
+        sha1 = "5fa17dc77002a169a3566cc48dc774d2e13e3769";
+      };
+    }
+    {
+      name = "core_js_pure___core_js_pure_3.6.5.tgz";
+      path = fetchurl {
+        name = "core_js_pure___core_js_pure_3.6.5.tgz";
+        url  = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz";
+        sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813";
+      };
+    }
+    {
+      name = "core_js___core_js_1.2.7.tgz";
+      path = fetchurl {
+        name = "core_js___core_js_1.2.7.tgz";
+        url  = "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz";
+        sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636";
+      };
+    }
+    {
+      name = "core_js___core_js_2.5.7.tgz";
+      path = fetchurl {
+        name = "core_js___core_js_2.5.7.tgz";
+        url  = "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz";
+        sha1 = "f972608ff0cead68b841a16a932d0b183791814e";
+      };
+    }
+    {
+      name = "core_js___core_js_2.6.9.tgz";
+      path = fetchurl {
+        name = "core_js___core_js_2.6.9.tgz";
+        url  = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz";
+        sha1 = "6b4b214620c834152e179323727fc19741b084f2";
+      };
+    }
+    {
+      name = "core_util_is___core_util_is_1.0.2.tgz";
+      path = fetchurl {
+        name = "core_util_is___core_util_is_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    }
+    {
+      name = "cosmiconfig___cosmiconfig_5.2.1.tgz";
+      path = fetchurl {
+        name = "cosmiconfig___cosmiconfig_5.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz";
+        sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a";
+      };
+    }
+    {
+      name = "create_ecdh___create_ecdh_4.0.3.tgz";
+      path = fetchurl {
+        name = "create_ecdh___create_ecdh_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz";
+        sha1 = "c9111b6f33045c4697f144787f9254cdc77c45ff";
+      };
+    }
+    {
+      name = "create_hash___create_hash_1.2.0.tgz";
+      path = fetchurl {
+        name = "create_hash___create_hash_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz";
+        sha1 = "889078af11a63756bcfb59bd221996be3a9ef196";
+      };
+    }
+    {
+      name = "create_hmac___create_hmac_1.1.7.tgz";
+      path = fetchurl {
+        name = "create_hmac___create_hmac_1.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz";
+        sha1 = "69170c78b3ab957147b2b8b04572e47ead2243ff";
+      };
+    }
+    {
+      name = "create_react_context___create_react_context_0.2.2.tgz";
+      path = fetchurl {
+        name = "create_react_context___create_react_context_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.2.tgz";
+        sha1 = "9836542f9aaa22868cd7d4a6f82667df38019dca";
+      };
+    }
+    {
+      name = "cross_env___cross_env_5.2.0.tgz";
+      path = fetchurl {
+        name = "cross_env___cross_env_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz";
+        sha1 = "6ecd4c015d5773e614039ee529076669b9d126f2";
+      };
+    }
+    {
+      name = "cross_fetch___cross_fetch_3.0.4.tgz";
+      path = fetchurl {
+        name = "cross_fetch___cross_fetch_3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.4.tgz";
+        sha1 = "7bef7020207e684a7638ef5f2f698e24d9eb283c";
+      };
+    }
+    {
+      name = "cross_spawn___cross_spawn_6.0.5.tgz";
+      path = fetchurl {
+        name = "cross_spawn___cross_spawn_6.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz";
+        sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4";
+      };
+    }
+    {
+      name = "crossvent___crossvent_1.5.0.tgz";
+      path = fetchurl {
+        name = "crossvent___crossvent_1.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/crossvent/-/crossvent-1.5.0.tgz";
+        sha1 = "3779c1242699e19417f0414e61b144753a52fd6d";
+      };
+    }
+    {
+      name = "crypt___crypt_0.0.2.tgz";
+      path = fetchurl {
+        name = "crypt___crypt_0.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz";
+        sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b";
+      };
+    }
+    {
+      name = "crypto_browserify___crypto_browserify_3.12.0.tgz";
+      path = fetchurl {
+        name = "crypto_browserify___crypto_browserify_3.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz";
+        sha1 = "396cf9f3137f03e4b8e532c58f698254e00f80ec";
+      };
+    }
+    {
+      name = "crypto_js___crypto_js_3.3.0.tgz";
+      path = fetchurl {
+        name = "crypto_js___crypto_js_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.3.0.tgz";
+        sha1 = "846dd1cce2f68aacfa156c8578f926a609b7976b";
+      };
+    }
+    {
+      name = "css_color_names___css_color_names_0.0.4.tgz";
+      path = fetchurl {
+        name = "css_color_names___css_color_names_0.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz";
+        sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0";
+      };
+    }
+    {
+      name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz";
+      path = fetchurl {
+        name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz";
+        sha1 = "c198940f63a76d7e36c1e71018b001721054cb22";
+      };
+    }
+    {
+      name = "css_loader___css_loader_3.1.0.tgz";
+      path = fetchurl {
+        name = "css_loader___css_loader_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.1.0.tgz";
+        sha1 = "6f008b993b8ce812e6bab57f3cbfdc7a7cf28685";
+      };
+    }
+    {
+      name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz";
+      path = fetchurl {
+        name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz";
+        sha1 = "3b2ff4972cc362ab88561507a95408a1432135d7";
+      };
+    }
+    {
+      name = "css_select___css_select_1.2.0.tgz";
+      path = fetchurl {
+        name = "css_select___css_select_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz";
+        sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
+      };
+    }
+    {
+      name = "css_select___css_select_2.0.2.tgz";
+      path = fetchurl {
+        name = "css_select___css_select_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz";
+        sha1 = "ab4386cec9e1f668855564b17c3733b43b2a5ede";
+      };
+    }
+    {
+      name = "css_tree___css_tree_1.0.0_alpha.28.tgz";
+      path = fetchurl {
+        name = "css_tree___css_tree_1.0.0_alpha.28.tgz";
+        url  = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.28.tgz";
+        sha1 = "8e8968190d886c9477bc8d61e96f61af3f7ffa7f";
+      };
+    }
+    {
+      name = "css_tree___css_tree_1.0.0_alpha.29.tgz";
+      path = fetchurl {
+        name = "css_tree___css_tree_1.0.0_alpha.29.tgz";
+        url  = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz";
+        sha1 = "3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39";
+      };
+    }
+    {
+      name = "css_unit_converter___css_unit_converter_1.1.1.tgz";
+      path = fetchurl {
+        name = "css_unit_converter___css_unit_converter_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz";
+        sha1 = "d9b9281adcfd8ced935bdbaba83786897f64e996";
+      };
+    }
+    {
+      name = "css_url_regex___css_url_regex_1.1.0.tgz";
+      path = fetchurl {
+        name = "css_url_regex___css_url_regex_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz";
+        sha1 = "83834230cc9f74c457de59eebd1543feeb83b7ec";
+      };
+    }
+    {
+      name = "css_what___css_what_2.1.0.tgz";
+      path = fetchurl {
+        name = "css_what___css_what_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz";
+        sha1 = "9467d032c38cfaefb9f2d79501253062f87fa1bd";
+      };
+    }
+    {
+      name = "css_what___css_what_2.1.3.tgz";
+      path = fetchurl {
+        name = "css_what___css_what_2.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz";
+        sha1 = "a6d7604573365fe74686c3f311c56513d88285f2";
+      };
+    }
+    {
+      name = "css.escape___css.escape_1.5.1.tgz";
+      path = fetchurl {
+        name = "css.escape___css.escape_1.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz";
+        sha1 = "42e27d4fa04ae32f931a4b4d4191fa9cddee97cb";
+      };
+    }
+    {
+      name = "cssesc___cssesc_2.0.0.tgz";
+      path = fetchurl {
+        name = "cssesc___cssesc_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz";
+        sha1 = "3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703";
+      };
+    }
+    {
+      name = "cssesc___cssesc_3.0.0.tgz";
+      path = fetchurl {
+        name = "cssesc___cssesc_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz";
+        sha1 = "37741919903b868565e1c09ea747445cd18983ee";
+      };
+    }
+    {
+      name = "cssnano_preset_default___cssnano_preset_default_4.0.7.tgz";
+      path = fetchurl {
+        name = "cssnano_preset_default___cssnano_preset_default_4.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz";
+        sha1 = "51ec662ccfca0f88b396dcd9679cdb931be17f76";
+      };
+    }
+    {
+      name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz";
+      path = fetchurl {
+        name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz";
+        sha1 = "ed3a08299f21d75741b20f3b81f194ed49cc150f";
+      };
+    }
+    {
+      name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz";
+      path = fetchurl {
+        name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz";
+        sha1 = "c0e4ca07f5386bb17ec5e52250b4f5961365156d";
+      };
+    }
+    {
+      name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz";
+      path = fetchurl {
+        name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz";
+        sha1 = "b26d5fd5f72a11dfe7a7846fb4c67260f96bf282";
+      };
+    }
+    {
+      name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz";
+      path = fetchurl {
+        name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz";
+        sha1 = "574082fb2859d2db433855835d9a8456ea18bbf3";
+      };
+    }
+    {
+      name = "cssnano___cssnano_4.1.10.tgz";
+      path = fetchurl {
+        name = "cssnano___cssnano_4.1.10.tgz";
+        url  = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz";
+        sha1 = "0ac41f0b13d13d465487e111b778d42da631b8b2";
+      };
+    }
+    {
+      name = "csso___csso_3.5.1.tgz";
+      path = fetchurl {
+        name = "csso___csso_3.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz";
+        sha1 = "7b9eb8be61628973c1b261e169d2f024008e758b";
+      };
+    }
+    {
+      name = "cssom___cssom_0.3.8.tgz";
+      path = fetchurl {
+        name = "cssom___cssom_0.3.8.tgz";
+        url  = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz";
+        sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a";
+      };
+    }
+    {
+      name = "cssstyle___cssstyle_0.2.37.tgz";
+      path = fetchurl {
+        name = "cssstyle___cssstyle_0.2.37.tgz";
+        url  = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz";
+        sha1 = "541097234cb2513c83ceed3acddc27ff27987d54";
+      };
+    }
+    {
+      name = "cssstyle___cssstyle_1.4.0.tgz";
+      path = fetchurl {
+        name = "cssstyle___cssstyle_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz";
+        sha1 = "9d31328229d3c565c61e586b02041a28fccdccf1";
+      };
+    }
+    {
+      name = "csstype___csstype_2.6.2.tgz";
+      path = fetchurl {
+        name = "csstype___csstype_2.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.2.tgz";
+        sha1 = "3043d5e065454579afc7478a18de41909c8a2f01";
+      };
+    }
+    {
+      name = "custom_event___custom_event_1.0.0.tgz";
+      path = fetchurl {
+        name = "custom_event___custom_event_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.0.tgz";
+        sha1 = "2e4628be19dc4b214b5c02630c5971e811618062";
+      };
+    }
+    {
+      name = "cyclist___cyclist_1.0.1.tgz";
+      path = fetchurl {
+        name = "cyclist___cyclist_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz";
+        sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9";
+      };
+    }
+    {
+      name = "cypress_file_upload___cypress_file_upload_4.0.7.tgz";
+      path = fetchurl {
+        name = "cypress_file_upload___cypress_file_upload_4.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-4.0.7.tgz";
+        sha1 = "1136139bb3c660b9c39a69f231ac1da7785acaae";
+      };
+    }
+    {
+      name = "cypress_pipe___cypress_pipe_1.5.0.tgz";
+      path = fetchurl {
+        name = "cypress_pipe___cypress_pipe_1.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/cypress-pipe/-/cypress-pipe-1.5.0.tgz";
+        sha1 = "bf8603a8eb6969b3ebad49080957192b03be85a0";
+      };
+    }
+    {
+      name = "cypress_plugin_tab___cypress_plugin_tab_1.0.5.tgz";
+      path = fetchurl {
+        name = "cypress_plugin_tab___cypress_plugin_tab_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/cypress-plugin-tab/-/cypress-plugin-tab-1.0.5.tgz";
+        sha1 = "a40714148104004bb05ed62b1bf46bb544f8eb4a";
+      };
+    }
+    {
+      name = "cypress___cypress_4.12.1.tgz";
+      path = fetchurl {
+        name = "cypress___cypress_4.12.1.tgz";
+        url  = "https://registry.yarnpkg.com/cypress/-/cypress-4.12.1.tgz";
+        sha1 = "0ead1b9f4c0917d69d8b57f996b6e01fe693b6ec";
+      };
+    }
+    {
+      name = "d3_array___d3_array_1.2.4.tgz";
+      path = fetchurl {
+        name = "d3_array___d3_array_1.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz";
+        sha1 = "635ce4d5eea759f6f605863dbcfc30edc737f71f";
+      };
+    }
+    {
+      name = "d3_collection___d3_collection_1.0.7.tgz";
+      path = fetchurl {
+        name = "d3_collection___d3_collection_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz";
+        sha1 = "349bd2aa9977db071091c13144d5e4f16b5b310e";
+      };
+    }
+    {
+      name = "d3_color___d3_color_1.2.3.tgz";
+      path = fetchurl {
+        name = "d3_color___d3_color_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/d3-color/-/d3-color-1.2.3.tgz";
+        sha1 = "6c67bb2af6df3cc8d79efcc4d3a3e83e28c8048f";
+      };
+    }
+    {
+      name = "d3_format___d3_format_1.3.2.tgz";
+      path = fetchurl {
+        name = "d3_format___d3_format_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/d3-format/-/d3-format-1.3.2.tgz";
+        sha1 = "6a96b5e31bcb98122a30863f7d92365c00603562";
+      };
+    }
+    {
+      name = "d3_interpolate___d3_interpolate_1.3.2.tgz";
+      path = fetchurl {
+        name = "d3_interpolate___d3_interpolate_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.3.2.tgz";
+        sha1 = "417d3ebdeb4bc4efcc8fd4361c55e4040211fd68";
+      };
+    }
+    {
+      name = "d3_scale___d3_scale_2.1.2.tgz";
+      path = fetchurl {
+        name = "d3_scale___d3_scale_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.1.2.tgz";
+        sha1 = "4e932b7b60182aee9073ede8764c98423e5f9a94";
+      };
+    }
+    {
+      name = "d3_time_format___d3_time_format_2.1.3.tgz";
+      path = fetchurl {
+        name = "d3_time_format___d3_time_format_2.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.3.tgz";
+        sha1 = "ae06f8e0126a9d60d6364eac5b1533ae1bac826b";
+      };
+    }
+    {
+      name = "d3_time___d3_time_1.0.10.tgz";
+      path = fetchurl {
+        name = "d3_time___d3_time_1.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.10.tgz";
+        sha1 = "8259dd71288d72eeacfd8de281c4bf5c7393053c";
+      };
+    }
+    {
+      name = "dashdash___dashdash_1.14.1.tgz";
+      path = fetchurl {
+        name = "dashdash___dashdash_1.14.1.tgz";
+        url  = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+      };
+    }
+    {
+      name = "data_urls___data_urls_1.1.0.tgz";
+      path = fetchurl {
+        name = "data_urls___data_urls_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz";
+        sha1 = "15ee0582baa5e22bb59c77140da8f9c76963bbfe";
+      };
+    }
+    {
+      name = "date_fns___date_fns_1.30.1.tgz";
+      path = fetchurl {
+        name = "date_fns___date_fns_1.30.1.tgz";
+        url  = "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz";
+        sha1 = "2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c";
+      };
+    }
+    {
+      name = "date_fns___date_fns_2.0.0_alpha.27.tgz";
+      path = fetchurl {
+        name = "date_fns___date_fns_2.0.0_alpha.27.tgz";
+        url  = "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-alpha.27.tgz";
+        sha1 = "5ecd4204ef0e7064264039570f6e8afbc014481c";
+      };
+    }
+    {
+      name = "date_fns___date_fns_2.0.0_beta.2.tgz";
+      path = fetchurl {
+        name = "date_fns___date_fns_2.0.0_beta.2.tgz";
+        url  = "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-beta.2.tgz";
+        sha1 = "ccd556df832ef761baa88c600f53d2e829245999";
+      };
+    }
+    {
+      name = "debug___debug_2.6.9.tgz";
+      path = fetchurl {
+        name = "debug___debug_2.6.9.tgz";
+        url  = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz";
+        sha1 = "5d128515df134ff327e90a4c93f4e077a536341f";
+      };
+    }
+    {
+      name = "debug___debug_3.1.0.tgz";
+      path = fetchurl {
+        name = "debug___debug_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz";
+        sha1 = "5bb5a0672628b64149566ba16819e61518c67261";
+      };
+    }
+    {
+      name = "debug___debug_3.2.6.tgz";
+      path = fetchurl {
+        name = "debug___debug_3.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz";
+        sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b";
+      };
+    }
+    {
+      name = "debug___debug_4.1.1.tgz";
+      path = fetchurl {
+        name = "debug___debug_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz";
+        sha1 = "3b72260255109c6b589cee050f1d516139664791";
+      };
+    }
+    {
+      name = "decamelize___decamelize_1.2.0.tgz";
+      path = fetchurl {
+        name = "decamelize___decamelize_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+      };
+    }
+    {
+      name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
+      path = fetchurl {
+        name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
+        sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
+      };
+    }
+    {
+      name = "deep_equal___deep_equal_1.1.1.tgz";
+      path = fetchurl {
+        name = "deep_equal___deep_equal_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz";
+        sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a";
+      };
+    }
+    {
+      name = "deep_is___deep_is_0.1.3.tgz";
+      path = fetchurl {
+        name = "deep_is___deep_is_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz";
+        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+      };
+    }
+    {
+      name = "default_gateway___default_gateway_4.2.0.tgz";
+      path = fetchurl {
+        name = "default_gateway___default_gateway_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz";
+        sha1 = "167104c7500c2115f6dd69b0a536bb8ed720552b";
+      };
+    }
+    {
+      name = "define_properties___define_properties_1.1.3.tgz";
+      path = fetchurl {
+        name = "define_properties___define_properties_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz";
+        sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1";
+      };
+    }
+    {
+      name = "define_property___define_property_0.2.5.tgz";
+      path = fetchurl {
+        name = "define_property___define_property_0.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz";
+        sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116";
+      };
+    }
+    {
+      name = "define_property___define_property_1.0.0.tgz";
+      path = fetchurl {
+        name = "define_property___define_property_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz";
+        sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6";
+      };
+    }
+    {
+      name = "define_property___define_property_2.0.2.tgz";
+      path = fetchurl {
+        name = "define_property___define_property_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz";
+        sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d";
+      };
+    }
+    {
+      name = "del___del_4.1.1.tgz";
+      path = fetchurl {
+        name = "del___del_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz";
+        sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4";
+      };
+    }
+    {
+      name = "delayed_stream___delayed_stream_1.0.0.tgz";
+      path = fetchurl {
+        name = "delayed_stream___delayed_stream_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    }
+    {
+      name = "depd___depd_1.1.1.tgz";
+      path = fetchurl {
+        name = "depd___depd_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz";
+        sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359";
+      };
+    }
+    {
+      name = "depd___depd_1.1.2.tgz";
+      path = fetchurl {
+        name = "depd___depd_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz";
+        sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
+      };
+    }
+    {
+      name = "des.js___des.js_1.0.1.tgz";
+      path = fetchurl {
+        name = "des.js___des.js_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz";
+        sha1 = "5382142e1bdc53f85d86d53e5f4aa7deb91e0843";
+      };
+    }
+    {
+      name = "destroy___destroy_1.0.4.tgz";
+      path = fetchurl {
+        name = "destroy___destroy_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz";
+        sha1 = "978857442c44749e4206613e37946205826abd80";
+      };
+    }
+    {
+      name = "detect_file___detect_file_1.0.0.tgz";
+      path = fetchurl {
+        name = "detect_file___detect_file_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz";
+        sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7";
+      };
+    }
+    {
+      name = "detect_newline___detect_newline_2.1.0.tgz";
+      path = fetchurl {
+        name = "detect_newline___detect_newline_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz";
+        sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2";
+      };
+    }
+    {
+      name = "detect_node___detect_node_2.0.4.tgz";
+      path = fetchurl {
+        name = "detect_node___detect_node_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz";
+        sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c";
+      };
+    }
+    {
+      name = "diff_sequences___diff_sequences_24.3.0.tgz";
+      path = fetchurl {
+        name = "diff_sequences___diff_sequences_24.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz";
+        sha1 = "0f20e8a1df1abddaf4d9c226680952e64118b975";
+      };
+    }
+    {
+      name = "diff___diff_3.5.0.tgz";
+      path = fetchurl {
+        name = "diff___diff_3.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz";
+        sha1 = "800c0dd1e0a8bfbc95835c202ad220fe317e5a12";
+      };
+    }
+    {
+      name = "diff___diff_4.0.1.tgz";
+      path = fetchurl {
+        name = "diff___diff_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz";
+        sha1 = "0c667cb467ebbb5cea7f14f135cc2dba7780a8ff";
+      };
+    }
+    {
+      name = "diffie_hellman___diffie_hellman_5.0.3.tgz";
+      path = fetchurl {
+        name = "diffie_hellman___diffie_hellman_5.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
+        sha1 = "40e8ee98f55a2149607146921c63e1ae5f3d2875";
+      };
+    }
+    {
+      name = "discontinuous_range___discontinuous_range_1.0.0.tgz";
+      path = fetchurl {
+        name = "discontinuous_range___discontinuous_range_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz";
+        sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a";
+      };
+    }
+    {
+      name = "dnd_core___dnd_core_9.5.1.tgz";
+      path = fetchurl {
+        name = "dnd_core___dnd_core_9.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/dnd-core/-/dnd-core-9.5.1.tgz";
+        sha1 = "e9ec02d33529b68fa528865704d40ac4b14f2baf";
+      };
+    }
+    {
+      name = "dns_equal___dns_equal_1.0.0.tgz";
+      path = fetchurl {
+        name = "dns_equal___dns_equal_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz";
+        sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d";
+      };
+    }
+    {
+      name = "dns_packet___dns_packet_1.3.1.tgz";
+      path = fetchurl {
+        name = "dns_packet___dns_packet_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz";
+        sha1 = "12aa426981075be500b910eedcd0b47dd7deda5a";
+      };
+    }
+    {
+      name = "dns_txt___dns_txt_2.0.2.tgz";
+      path = fetchurl {
+        name = "dns_txt___dns_txt_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz";
+        sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6";
+      };
+    }
+    {
+      name = "doctrine___doctrine_2.1.0.tgz";
+      path = fetchurl {
+        name = "doctrine___doctrine_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz";
+        sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d";
+      };
+    }
+    {
+      name = "doctrine___doctrine_3.0.0.tgz";
+      path = fetchurl {
+        name = "doctrine___doctrine_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz";
+        sha1 = "addebead72a6574db783639dc87a121773973961";
+      };
+    }
+    {
+      name = "dom_accessibility_api___dom_accessibility_api_0.4.5.tgz";
+      path = fetchurl {
+        name = "dom_accessibility_api___dom_accessibility_api_0.4.5.tgz";
+        url  = "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.4.5.tgz";
+        sha1 = "d9c1cefa89f509d8cf132ab5d250004d755e76e3";
+      };
+    }
+    {
+      name = "dom_converter___dom_converter_0.2.0.tgz";
+      path = fetchurl {
+        name = "dom_converter___dom_converter_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz";
+        sha1 = "6721a9daee2e293682955b6afe416771627bb768";
+      };
+    }
+    {
+      name = "dom_css___dom_css_2.1.0.tgz";
+      path = fetchurl {
+        name = "dom_css___dom_css_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/dom-css/-/dom-css-2.1.0.tgz";
+        sha1 = "fdbc2d5a015d0a3e1872e11472bbd0e7b9e6a202";
+      };
+    }
+    {
+      name = "dom_helpers___dom_helpers_3.3.1.tgz";
+      path = fetchurl {
+        name = "dom_helpers___dom_helpers_3.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz";
+        sha1 = "fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6";
+      };
+    }
+    {
+      name = "dom_serializer___dom_serializer_0.1.0.tgz";
+      path = fetchurl {
+        name = "dom_serializer___dom_serializer_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz";
+        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
+      };
+    }
+    {
+      name = "domain_browser___domain_browser_1.2.0.tgz";
+      path = fetchurl {
+        name = "domain_browser___domain_browser_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz";
+        sha1 = "3d31f50191a6749dd1375a7f522e823d42e54eda";
+      };
+    }
+    {
+      name = "domelementtype___domelementtype_1.3.0.tgz";
+      path = fetchurl {
+        name = "domelementtype___domelementtype_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz";
+        sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
+      };
+    }
+    {
+      name = "domelementtype___domelementtype_1.3.1.tgz";
+      path = fetchurl {
+        name = "domelementtype___domelementtype_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz";
+        sha1 = "d048c44b37b0d10a7f2a3d5fee3f4333d790481f";
+      };
+    }
+    {
+      name = "domelementtype___domelementtype_1.1.3.tgz";
+      path = fetchurl {
+        name = "domelementtype___domelementtype_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz";
+        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
+      };
+    }
+    {
+      name = "domexception___domexception_1.0.1.tgz";
+      path = fetchurl {
+        name = "domexception___domexception_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz";
+        sha1 = "937442644ca6a31261ef36e3ec677fe805582c90";
+      };
+    }
+    {
+      name = "domhandler___domhandler_2.4.2.tgz";
+      path = fetchurl {
+        name = "domhandler___domhandler_2.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz";
+        sha1 = "8805097e933d65e85546f726d60f5eb88b44f803";
+      };
+    }
+    {
+      name = "domutils___domutils_1.5.1.tgz";
+      path = fetchurl {
+        name = "domutils___domutils_1.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz";
+        sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
+      };
+    }
+    {
+      name = "domutils___domutils_1.7.0.tgz";
+      path = fetchurl {
+        name = "domutils___domutils_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz";
+        sha1 = "56ea341e834e06e6748af7a1cb25da67ea9f8c2a";
+      };
+    }
+    {
+      name = "dot_prop___dot_prop_4.2.0.tgz";
+      path = fetchurl {
+        name = "dot_prop___dot_prop_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz";
+        sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
+      };
+    }
+    {
+      name = "duplexer___duplexer_0.1.1.tgz";
+      path = fetchurl {
+        name = "duplexer___duplexer_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz";
+        sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+      };
+    }
+    {
+      name = "duplexify___duplexify_3.7.1.tgz";
+      path = fetchurl {
+        name = "duplexify___duplexify_3.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz";
+        sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309";
+      };
+    }
+    {
+      name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz";
+      path = fetchurl {
+        name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
+        sha1 = "3a83a904e54353287874c564b7549386849a98c9";
+      };
+    }
+    {
+      name = "ee_first___ee_first_1.1.1.tgz";
+      path = fetchurl {
+        name = "ee_first___ee_first_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz";
+        sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
+      };
+    }
+    {
+      name = "ejs___ejs_2.7.1.tgz";
+      path = fetchurl {
+        name = "ejs___ejs_2.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/ejs/-/ejs-2.7.1.tgz";
+        sha1 = "5b5ab57f718b79d4aca9254457afecd36fa80228";
+      };
+    }
+    {
+      name = "electron_to_chromium___electron_to_chromium_1.3.75.tgz";
+      path = fetchurl {
+        name = "electron_to_chromium___electron_to_chromium_1.3.75.tgz";
+        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.75.tgz";
+        sha1 = "dd04551739e7371862b0ac7f4ddaa9f3f95b7e68";
+      };
+    }
+    {
+      name = "electron_to_chromium___electron_to_chromium_1.3.194.tgz";
+      path = fetchurl {
+        name = "electron_to_chromium___electron_to_chromium_1.3.194.tgz";
+        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.194.tgz";
+        sha1 = "a96452a96d4539131957aade9f634a45721f2819";
+      };
+    }
+    {
+      name = "electron_to_chromium___electron_to_chromium_1.3.96.tgz";
+      path = fetchurl {
+        name = "electron_to_chromium___electron_to_chromium_1.3.96.tgz";
+        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.96.tgz";
+        sha1 = "25770ec99b8b07706dedf3a5f43fa50cb54c4f9a";
+      };
+    }
+    {
+      name = "elegant_spinner___elegant_spinner_1.0.1.tgz";
+      path = fetchurl {
+        name = "elegant_spinner___elegant_spinner_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz";
+        sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e";
+      };
+    }
+    {
+      name = "element_resize_event___element_resize_event_2.0.9.tgz";
+      path = fetchurl {
+        name = "element_resize_event___element_resize_event_2.0.9.tgz";
+        url  = "https://registry.yarnpkg.com/element-resize-event/-/element-resize-event-2.0.9.tgz";
+        sha1 = "2f5e1581a296eb5275210c141bc56342e218f876";
+      };
+    }
+    {
+      name = "elliptic___elliptic_6.5.2.tgz";
+      path = fetchurl {
+        name = "elliptic___elliptic_6.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz";
+        sha1 = "05c5678d7173c049d8ca433552224a495d0e3762";
+      };
+    }
+    {
+      name = "emoji_regex___emoji_regex_7.0.3.tgz";
+      path = fetchurl {
+        name = "emoji_regex___emoji_regex_7.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz";
+        sha1 = "933a04052860c85e83c122479c4748a8e4c72156";
+      };
+    }
+    {
+      name = "emoji_regex___emoji_regex_8.0.0.tgz";
+      path = fetchurl {
+        name = "emoji_regex___emoji_regex_8.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz";
+        sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37";
+      };
+    }
+    {
+      name = "emojis_list___emojis_list_2.1.0.tgz";
+      path = fetchurl {
+        name = "emojis_list___emojis_list_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz";
+        sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
+      };
+    }
+    {
+      name = "emojis_list___emojis_list_3.0.0.tgz";
+      path = fetchurl {
+        name = "emojis_list___emojis_list_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz";
+        sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78";
+      };
+    }
+    {
+      name = "encodeurl___encodeurl_1.0.2.tgz";
+      path = fetchurl {
+        name = "encodeurl___encodeurl_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz";
+        sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
+      };
+    }
+    {
+      name = "encoding___encoding_0.1.12.tgz";
+      path = fetchurl {
+        name = "encoding___encoding_0.1.12.tgz";
+        url  = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz";
+        sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
+      };
+    }
+    {
+      name = "end_of_stream___end_of_stream_1.4.4.tgz";
+      path = fetchurl {
+        name = "end_of_stream___end_of_stream_1.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz";
+        sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0";
+      };
+    }
+    {
+      name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz";
+      path = fetchurl {
+        name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz";
+        sha1 = "41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f";
+      };
+    }
+    {
+      name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz";
+      path = fetchurl {
+        name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz";
+        sha1 = "2937e2b8066cd0fe7ce0990a98f0d71a35189f66";
+      };
+    }
+    {
+      name = "entities___entities_1.1.1.tgz";
+      path = fetchurl {
+        name = "entities___entities_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz";
+        sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
+      };
+    }
+    {
+      name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.6.0.tgz";
+      path = fetchurl {
+        name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.6.0.tgz";
+        sha1 = "3fca28d3c32f3ff427495380fe2dd51494689073";
+      };
+    }
+    {
+      name = "enzyme_adapter_utils___enzyme_adapter_utils_1.8.1.tgz";
+      path = fetchurl {
+        name = "enzyme_adapter_utils___enzyme_adapter_utils_1.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.8.1.tgz";
+        sha1 = "a927d840ce2c14b42892a533aec836809d4e022b";
+      };
+    }
+    {
+      name = "enzyme_to_json___enzyme_to_json_3.3.4.tgz";
+      path = fetchurl {
+        name = "enzyme_to_json___enzyme_to_json_3.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.3.4.tgz";
+        sha1 = "67c6040e931182f183418af2eb9f4323258aa77f";
+      };
+    }
+    {
+      name = "enzyme___enzyme_3.7.0.tgz";
+      path = fetchurl {
+        name = "enzyme___enzyme_3.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/enzyme/-/enzyme-3.7.0.tgz";
+        sha1 = "9b499e8ca155df44fef64d9f1558961ba1385a46";
+      };
+    }
+    {
+      name = "errno___errno_0.1.7.tgz";
+      path = fetchurl {
+        name = "errno___errno_0.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz";
+        sha1 = "4684d71779ad39af177e3f007996f7c67c852618";
+      };
+    }
+    {
+      name = "error_ex___error_ex_1.3.2.tgz";
+      path = fetchurl {
+        name = "error_ex___error_ex_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz";
+        sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf";
+      };
+    }
+    {
+      name = "es_abstract___es_abstract_1.12.0.tgz";
+      path = fetchurl {
+        name = "es_abstract___es_abstract_1.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz";
+        sha1 = "9dbbdd27c6856f0001421ca18782d786bf8a6165";
+      };
+    }
+    {
+      name = "es_abstract___es_abstract_1.17.4.tgz";
+      path = fetchurl {
+        name = "es_abstract___es_abstract_1.17.4.tgz";
+        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz";
+        sha1 = "e3aedf19706b20e7c2594c35fc0d57605a79e184";
+      };
+    }
+    {
+      name = "es_abstract___es_abstract_1.13.0.tgz";
+      path = fetchurl {
+        name = "es_abstract___es_abstract_1.13.0.tgz";
+        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz";
+        sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9";
+      };
+    }
+    {
+      name = "es_to_primitive___es_to_primitive_1.2.0.tgz";
+      path = fetchurl {
+        name = "es_to_primitive___es_to_primitive_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
+        sha1 = "edf72478033456e8dda8ef09e00ad9650707f377";
+      };
+    }
+    {
+      name = "es_to_primitive___es_to_primitive_1.2.1.tgz";
+      path = fetchurl {
+        name = "es_to_primitive___es_to_primitive_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
+        sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a";
+      };
+    }
+    {
+      name = "es6_promise___es6_promise_4.2.8.tgz";
+      path = fetchurl {
+        name = "es6_promise___es6_promise_4.2.8.tgz";
+        url  = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz";
+        sha1 = "4eb21594c972bc40553d276e510539143db53e0a";
+      };
+    }
+    {
+      name = "escape_html___escape_html_1.0.3.tgz";
+      path = fetchurl {
+        name = "escape_html___escape_html_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz";
+        sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
+      };
+    }
+    {
+      name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
+      path = fetchurl {
+        name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+      };
+    }
+    {
+      name = "escodegen___escodegen_1.11.0.tgz";
+      path = fetchurl {
+        name = "escodegen___escodegen_1.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz";
+        sha1 = "b27a9389481d5bfd5bec76f7bb1eb3f8f4556589";
+      };
+    }
+    {
+      name = "escodegen___escodegen_1.11.1.tgz";
+      path = fetchurl {
+        name = "escodegen___escodegen_1.11.1.tgz";
+        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz";
+        sha1 = "c485ff8d6b4cdb89e27f4a856e91f118401ca510";
+      };
+    }
+    {
+      name = "eslint_config_prettier___eslint_config_prettier_6.5.0.tgz";
+      path = fetchurl {
+        name = "eslint_config_prettier___eslint_config_prettier_6.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.5.0.tgz";
+        sha1 = "aaf9a495e2a816865e541bfdbb73a65cc162b3eb";
+      };
+    }
+    {
+      name = "eslint_plugin_jest___eslint_plugin_jest_23.0.2.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_jest___eslint_plugin_jest_23.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.0.2.tgz";
+        sha1 = "54a59bfe77245186afe13711a297067aefefff0a";
+      };
+    }
+    {
+      name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.0.5.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.0.5.tgz";
+        sha1 = "4879003aa38e5d05d0312175beb6e4a1f617bfcf";
+      };
+    }
+    {
+      name = "eslint_plugin_react___eslint_plugin_react_7.16.0.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_react___eslint_plugin_react_7.16.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.16.0.tgz";
+        sha1 = "9928e4f3e2122ed3ba6a5b56d0303ba3e41d8c09";
+      };
+    }
+    {
+      name = "eslint_scope___eslint_scope_4.0.3.tgz";
+      path = fetchurl {
+        name = "eslint_scope___eslint_scope_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz";
+        sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848";
+      };
+    }
+    {
+      name = "eslint_scope___eslint_scope_5.0.0.tgz";
+      path = fetchurl {
+        name = "eslint_scope___eslint_scope_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz";
+        sha1 = "e87c8887c73e8d1ec84f1ca591645c358bfc8fb9";
+      };
+    }
+    {
+      name = "eslint_utils___eslint_utils_1.4.2.tgz";
+      path = fetchurl {
+        name = "eslint_utils___eslint_utils_1.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz";
+        sha1 = "166a5180ef6ab7eb462f162fd0e6f2463d7309ab";
+      };
+    }
+    {
+      name = "eslint_utils___eslint_utils_1.4.3.tgz";
+      path = fetchurl {
+        name = "eslint_utils___eslint_utils_1.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz";
+        sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f";
+      };
+    }
+    {
+      name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz";
+      path = fetchurl {
+        name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz";
+        sha1 = "3f3180fb2e291017716acb4c9d6d5b5c34a6a81d";
+      };
+    }
+    {
+      name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
+      path = fetchurl {
+        name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz";
+        sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2";
+      };
+    }
+    {
+      name = "eslint___eslint_6.6.0.tgz";
+      path = fetchurl {
+        name = "eslint___eslint_6.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint/-/eslint-6.6.0.tgz";
+        sha1 = "4a01a2fb48d32aacef5530ee9c5a78f11a8afd04";
+      };
+    }
+    {
+      name = "espree___espree_6.1.2.tgz";
+      path = fetchurl {
+        name = "espree___espree_6.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz";
+        sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d";
+      };
+    }
+    {
+      name = "esprima___esprima_3.1.3.tgz";
+      path = fetchurl {
+        name = "esprima___esprima_3.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+      };
+    }
+    {
+      name = "esprima___esprima_4.0.1.tgz";
+      path = fetchurl {
+        name = "esprima___esprima_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz";
+        sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71";
+      };
+    }
+    {
+      name = "esquery___esquery_1.0.1.tgz";
+      path = fetchurl {
+        name = "esquery___esquery_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz";
+        sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708";
+      };
+    }
+    {
+      name = "esrecurse___esrecurse_4.2.1.tgz";
+      path = fetchurl {
+        name = "esrecurse___esrecurse_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz";
+        sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf";
+      };
+    }
+    {
+      name = "estraverse___estraverse_4.2.0.tgz";
+      path = fetchurl {
+        name = "estraverse___estraverse_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz";
+        sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
+      };
+    }
+    {
+      name = "estraverse___estraverse_4.3.0.tgz";
+      path = fetchurl {
+        name = "estraverse___estraverse_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz";
+        sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d";
+      };
+    }
+    {
+      name = "esutils___esutils_2.0.2.tgz";
+      path = fetchurl {
+        name = "esutils___esutils_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz";
+        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
+      };
+    }
+    {
+      name = "etag___etag_1.8.1.tgz";
+      path = fetchurl {
+        name = "etag___etag_1.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz";
+        sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
+      };
+    }
+    {
+      name = "eventemitter2___eventemitter2_6.4.3.tgz";
+      path = fetchurl {
+        name = "eventemitter2___eventemitter2_6.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.3.tgz";
+        sha1 = "35c563619b13f3681e7eb05cbdaf50f56ba58820";
+      };
+    }
+    {
+      name = "eventemitter3___eventemitter3_3.1.2.tgz";
+      path = fetchurl {
+        name = "eventemitter3___eventemitter3_3.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz";
+        sha1 = "2d3d48f9c346698fce83a85d7d664e98535df6e7";
+      };
+    }
+    {
+      name = "eventemitter3___eventemitter3_4.0.0.tgz";
+      path = fetchurl {
+        name = "eventemitter3___eventemitter3_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz";
+        sha1 = "d65176163887ee59f386d64c82610b696a4a74eb";
+      };
+    }
+    {
+      name = "events___events_3.1.0.tgz";
+      path = fetchurl {
+        name = "events___events_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz";
+        sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59";
+      };
+    }
+    {
+      name = "eventsource___eventsource_1.0.7.tgz";
+      path = fetchurl {
+        name = "eventsource___eventsource_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz";
+        sha1 = "8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0";
+      };
+    }
+    {
+      name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz";
+      path = fetchurl {
+        name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz";
+        sha1 = "7fcbdb198dc71959432efe13842684e0525acb02";
+      };
+    }
+    {
+      name = "exec_sh___exec_sh_0.3.2.tgz";
+      path = fetchurl {
+        name = "exec_sh___exec_sh_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz";
+        sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b";
+      };
+    }
+    {
+      name = "execa___execa_1.0.0.tgz";
+      path = fetchurl {
+        name = "execa___execa_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz";
+        sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8";
+      };
+    }
+    {
+      name = "executable___executable_4.1.1.tgz";
+      path = fetchurl {
+        name = "executable___executable_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz";
+        sha1 = "41532bff361d3e57af4d763b70582db18f5d133c";
+      };
+    }
+    {
+      name = "exit_hook___exit_hook_1.1.1.tgz";
+      path = fetchurl {
+        name = "exit_hook___exit_hook_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz";
+        sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8";
+      };
+    }
+    {
+      name = "exit___exit_0.1.2.tgz";
+      path = fetchurl {
+        name = "exit___exit_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz";
+        sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
+      };
+    }
+    {
+      name = "expand_brackets___expand_brackets_2.1.4.tgz";
+      path = fetchurl {
+        name = "expand_brackets___expand_brackets_2.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz";
+        sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622";
+      };
+    }
+    {
+      name = "expand_tilde___expand_tilde_2.0.2.tgz";
+      path = fetchurl {
+        name = "expand_tilde___expand_tilde_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz";
+        sha1 = "97e801aa052df02454de46b02bf621642cdc8502";
+      };
+    }
+    {
+      name = "expect___expect_24.8.0.tgz";
+      path = fetchurl {
+        name = "expect___expect_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz";
+        sha1 = "471f8ec256b7b6129ca2524b2a62f030df38718d";
+      };
+    }
+    {
+      name = "express___express_4.16.3.tgz";
+      path = fetchurl {
+        name = "express___express_4.16.3.tgz";
+        url  = "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz";
+        sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53";
+      };
+    }
+    {
+      name = "express___express_4.17.1.tgz";
+      path = fetchurl {
+        name = "express___express_4.17.1.tgz";
+        url  = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz";
+        sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134";
+      };
+    }
+    {
+      name = "extend_shallow___extend_shallow_2.0.1.tgz";
+      path = fetchurl {
+        name = "extend_shallow___extend_shallow_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz";
+        sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
+      };
+    }
+    {
+      name = "extend_shallow___extend_shallow_3.0.2.tgz";
+      path = fetchurl {
+        name = "extend_shallow___extend_shallow_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz";
+        sha1 = "26a71aaf073b39fb2127172746131c2704028db8";
+      };
+    }
+    {
+      name = "extend___extend_3.0.2.tgz";
+      path = fetchurl {
+        name = "extend___extend_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz";
+        sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa";
+      };
+    }
+    {
+      name = "external_editor___external_editor_3.0.3.tgz";
+      path = fetchurl {
+        name = "external_editor___external_editor_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz";
+        sha1 = "5866db29a97826dbe4bf3afd24070ead9ea43a27";
+      };
+    }
+    {
+      name = "extglob___extglob_2.0.4.tgz";
+      path = fetchurl {
+        name = "extglob___extglob_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz";
+        sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543";
+      };
+    }
+    {
+      name = "extract_zip___extract_zip_1.7.0.tgz";
+      path = fetchurl {
+        name = "extract_zip___extract_zip_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz";
+        sha1 = "556cc3ae9df7f452c493a0cfb51cc30277940927";
+      };
+    }
+    {
+      name = "extsprintf___extsprintf_1.3.0.tgz";
+      path = fetchurl {
+        name = "extsprintf___extsprintf_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+      };
+    }
+    {
+      name = "extsprintf___extsprintf_1.4.0.tgz";
+      path = fetchurl {
+        name = "extsprintf___extsprintf_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz";
+        sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f";
+      };
+    }
+    {
+      name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz";
+      path = fetchurl {
+        name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
+        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+      };
+    }
+    {
+      name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
+      path = fetchurl {
+        name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
+        sha1 = "545145077c501491e33b15ec408c294376e94ae4";
+      };
+    }
+    {
+      name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz";
+      path = fetchurl {
+        name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+      };
+    }
+    {
+      name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz";
+      path = fetchurl {
+        name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+        sha1 = "874bf69c6f404c2b5d99c481341399fd55892633";
+      };
+    }
+    {
+      name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz";
+      path = fetchurl {
+        name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+      };
+    }
+    {
+      name = "fast_plist___fast_plist_0.1.2.tgz";
+      path = fetchurl {
+        name = "fast_plist___fast_plist_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/fast-plist/-/fast-plist-0.1.2.tgz";
+        sha1 = "a45aff345196006d406ca6cdcd05f69051ef35b8";
+      };
+    }
+    {
+      name = "fast.js___fast.js_0.1.1.tgz";
+      path = fetchurl {
+        name = "fast.js___fast.js_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/fast.js/-/fast.js-0.1.1.tgz";
+        sha1 = "7c024d55ae144882fbcee44b79005fe2dcabd9fe";
+      };
+    }
+    {
+      name = "faye_websocket___faye_websocket_0.10.0.tgz";
+      path = fetchurl {
+        name = "faye_websocket___faye_websocket_0.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz";
+        sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
+      };
+    }
+    {
+      name = "faye_websocket___faye_websocket_0.11.3.tgz";
+      path = fetchurl {
+        name = "faye_websocket___faye_websocket_0.11.3.tgz";
+        url  = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz";
+        sha1 = "5c0e9a8968e8912c286639fde977a8b209f2508e";
+      };
+    }
+    {
+      name = "fb_watchman___fb_watchman_2.0.0.tgz";
+      path = fetchurl {
+        name = "fb_watchman___fb_watchman_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz";
+        sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58";
+      };
+    }
+    {
+      name = "fbjs___fbjs_0.8.17.tgz";
+      path = fetchurl {
+        name = "fbjs___fbjs_0.8.17.tgz";
+        url  = "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz";
+        sha1 = "c4d598ead6949112653d6588b01a5cdcd9f90fdd";
+      };
+    }
+    {
+      name = "fd_slicer___fd_slicer_1.1.0.tgz";
+      path = fetchurl {
+        name = "fd_slicer___fd_slicer_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz";
+        sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e";
+      };
+    }
+    {
+      name = "figgy_pudding___figgy_pudding_3.5.1.tgz";
+      path = fetchurl {
+        name = "figgy_pudding___figgy_pudding_3.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz";
+        sha1 = "862470112901c727a0e495a80744bd5baa1d6790";
+      };
+    }
+    {
+      name = "figures___figures_1.7.0.tgz";
+      path = fetchurl {
+        name = "figures___figures_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz";
+        sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e";
+      };
+    }
+    {
+      name = "figures___figures_2.0.0.tgz";
+      path = fetchurl {
+        name = "figures___figures_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz";
+        sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
+      };
+    }
+    {
+      name = "figures___figures_3.1.0.tgz";
+      path = fetchurl {
+        name = "figures___figures_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz";
+        sha1 = "4b198dd07d8d71530642864af2d45dd9e459c4ec";
+      };
+    }
+    {
+      name = "file_entry_cache___file_entry_cache_5.0.1.tgz";
+      path = fetchurl {
+        name = "file_entry_cache___file_entry_cache_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz";
+        sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c";
+      };
+    }
+    {
+      name = "file_loader___file_loader_4.1.0.tgz";
+      path = fetchurl {
+        name = "file_loader___file_loader_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/file-loader/-/file-loader-4.1.0.tgz";
+        sha1 = "3a763391bc9502da7c59612fe348e38fc1980336";
+      };
+    }
+    {
+      name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz";
+      path = fetchurl {
+        name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
+        sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd";
+      };
+    }
+    {
+      name = "filesize___filesize_3.6.1.tgz";
+      path = fetchurl {
+        name = "filesize___filesize_3.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz";
+        sha1 = "090bb3ee01b6f801a8a8be99d31710b3422bb317";
+      };
+    }
+    {
+      name = "fill_range___fill_range_4.0.0.tgz";
+      path = fetchurl {
+        name = "fill_range___fill_range_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz";
+        sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7";
+      };
+    }
+    {
+      name = "fill_range___fill_range_7.0.1.tgz";
+      path = fetchurl {
+        name = "fill_range___fill_range_7.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz";
+        sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40";
+      };
+    }
+    {
+      name = "finalhandler___finalhandler_1.1.1.tgz";
+      path = fetchurl {
+        name = "finalhandler___finalhandler_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz";
+        sha1 = "eebf4ed840079c83f4249038c9d703008301b105";
+      };
+    }
+    {
+      name = "finalhandler___finalhandler_1.1.2.tgz";
+      path = fetchurl {
+        name = "finalhandler___finalhandler_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz";
+        sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d";
+      };
+    }
+    {
+      name = "find_cache_dir___find_cache_dir_2.0.0.tgz";
+      path = fetchurl {
+        name = "find_cache_dir___find_cache_dir_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz";
+        sha1 = "4c1faed59f45184530fb9d7fa123a4d04a98472d";
+      };
+    }
+    {
+      name = "find_cache_dir___find_cache_dir_2.1.0.tgz";
+      path = fetchurl {
+        name = "find_cache_dir___find_cache_dir_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz";
+        sha1 = "8d0f94cd13fe43c6c7c261a0d86115ca918c05f7";
+      };
+    }
+    {
+      name = "find_cache_dir___find_cache_dir_3.1.0.tgz";
+      path = fetchurl {
+        name = "find_cache_dir___find_cache_dir_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.1.0.tgz";
+        sha1 = "9935894999debef4cf9f677fdf646d002c4cdecb";
+      };
+    }
+    {
+      name = "find_up___find_up_3.0.0.tgz";
+      path = fetchurl {
+        name = "find_up___find_up_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz";
+        sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73";
+      };
+    }
+    {
+      name = "find_up___find_up_4.1.0.tgz";
+      path = fetchurl {
+        name = "find_up___find_up_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz";
+        sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19";
+      };
+    }
+    {
+      name = "findup_sync___findup_sync_3.0.0.tgz";
+      path = fetchurl {
+        name = "findup_sync___findup_sync_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz";
+        sha1 = "17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1";
+      };
+    }
+    {
+      name = "flat_cache___flat_cache_2.0.1.tgz";
+      path = fetchurl {
+        name = "flat_cache___flat_cache_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz";
+        sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0";
+      };
+    }
+    {
+      name = "flatted___flatted_2.0.0.tgz";
+      path = fetchurl {
+        name = "flatted___flatted_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz";
+        sha1 = "55122b6536ea496b4b44893ee2608141d10d9916";
+      };
+    }
+    {
+      name = "flush_write_stream___flush_write_stream_1.1.1.tgz";
+      path = fetchurl {
+        name = "flush_write_stream___flush_write_stream_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz";
+        sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8";
+      };
+    }
+    {
+      name = "follow_redirects___follow_redirects_1.5.10.tgz";
+      path = fetchurl {
+        name = "follow_redirects___follow_redirects_1.5.10.tgz";
+        url  = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz";
+        sha1 = "7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a";
+      };
+    }
+    {
+      name = "follow_redirects___follow_redirects_1.10.0.tgz";
+      path = fetchurl {
+        name = "follow_redirects___follow_redirects_1.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz";
+        sha1 = "01f5263aee921c6a54fb91667f08f4155ce169eb";
+      };
+    }
+    {
+      name = "for_in___for_in_0.1.8.tgz";
+      path = fetchurl {
+        name = "for_in___for_in_0.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz";
+        sha1 = "d8773908e31256109952b1fdb9b3fa867d2775e1";
+      };
+    }
+    {
+      name = "for_in___for_in_1.0.2.tgz";
+      path = fetchurl {
+        name = "for_in___for_in_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz";
+        sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80";
+      };
+    }
+    {
+      name = "for_own___for_own_1.0.0.tgz";
+      path = fetchurl {
+        name = "for_own___for_own_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz";
+        sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b";
+      };
+    }
+    {
+      name = "forever_agent___forever_agent_0.6.1.tgz";
+      path = fetchurl {
+        name = "forever_agent___forever_agent_0.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+      };
+    }
+    {
+      name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_1.4.3.tgz";
+      path = fetchurl {
+        name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_1.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.4.3.tgz";
+        sha1 = "2252c1f8ad1b25313e056835d939b423ea240cd6";
+      };
+    }
+    {
+      name = "form_data___form_data_2.5.1.tgz";
+      path = fetchurl {
+        name = "form_data___form_data_2.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz";
+        sha1 = "f2cbec57b5e59e23716e128fe44d4e5dd23895f4";
+      };
+    }
+    {
+      name = "form_data___form_data_2.3.3.tgz";
+      path = fetchurl {
+        name = "form_data___form_data_2.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz";
+        sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6";
+      };
+    }
+    {
+      name = "formidable___formidable_1.2.1.tgz";
+      path = fetchurl {
+        name = "formidable___formidable_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz";
+        sha1 = "70fb7ca0290ee6ff961090415f4b3df3d2082659";
+      };
+    }
+    {
+      name = "forwarded___forwarded_0.1.2.tgz";
+      path = fetchurl {
+        name = "forwarded___forwarded_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz";
+        sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
+      };
+    }
+    {
+      name = "fragment_cache___fragment_cache_0.2.1.tgz";
+      path = fetchurl {
+        name = "fragment_cache___fragment_cache_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz";
+        sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19";
+      };
+    }
+    {
+      name = "fresh___fresh_0.5.2.tgz";
+      path = fetchurl {
+        name = "fresh___fresh_0.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz";
+        sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
+      };
+    }
+    {
+      name = "from2___from2_2.3.0.tgz";
+      path = fetchurl {
+        name = "from2___from2_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz";
+        sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
+      };
+    }
+    {
+      name = "fs_extra___fs_extra_8.1.0.tgz";
+      path = fetchurl {
+        name = "fs_extra___fs_extra_8.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz";
+        sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0";
+      };
+    }
+    {
+      name = "fs_minipass___fs_minipass_2.0.0.tgz";
+      path = fetchurl {
+        name = "fs_minipass___fs_minipass_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz";
+        sha1 = "a6415edab02fae4b9e9230bc87ee2e4472003cd1";
+      };
+    }
+    {
+      name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz";
+      path = fetchurl {
+        name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz";
+        sha1 = "b47df53493ef911df75731e70a9ded0189db40c9";
+      };
+    }
+    {
+      name = "fs.realpath___fs.realpath_1.0.0.tgz";
+      path = fetchurl {
+        name = "fs.realpath___fs.realpath_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+      };
+    }
+    {
+      name = "fsevents___fsevents_1.2.12.tgz";
+      path = fetchurl {
+        name = "fsevents___fsevents_1.2.12.tgz";
+        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz";
+        sha1 = "db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c";
+      };
+    }
+    {
+      name = "fsevents___fsevents_2.0.7.tgz";
+      path = fetchurl {
+        name = "fsevents___fsevents_2.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz";
+        sha1 = "382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a";
+      };
+    }
+    {
+      name = "function_bind___function_bind_1.1.1.tgz";
+      path = fetchurl {
+        name = "function_bind___function_bind_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz";
+        sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d";
+      };
+    }
+    {
+      name = "function.prototype.name___function.prototype.name_1.1.0.tgz";
+      path = fetchurl {
+        name = "function.prototype.name___function.prototype.name_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.0.tgz";
+        sha1 = "8bd763cc0af860a859cc5d49384d74b932cd2327";
+      };
+    }
+    {
+      name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz";
+      path = fetchurl {
+        name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz";
+        sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
+      };
+    }
+    {
+      name = "get_caller_file___get_caller_file_1.0.3.tgz";
+      path = fetchurl {
+        name = "get_caller_file___get_caller_file_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz";
+        sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a";
+      };
+    }
+    {
+      name = "get_caller_file___get_caller_file_2.0.5.tgz";
+      path = fetchurl {
+        name = "get_caller_file___get_caller_file_2.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz";
+        sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e";
+      };
+    }
+    {
+      name = "get_stdin___get_stdin_6.0.0.tgz";
+      path = fetchurl {
+        name = "get_stdin___get_stdin_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz";
+        sha1 = "9e09bf712b360ab9225e812048f71fde9c89657b";
+      };
+    }
+    {
+      name = "get_stream___get_stream_4.1.0.tgz";
+      path = fetchurl {
+        name = "get_stream___get_stream_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz";
+        sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5";
+      };
+    }
+    {
+      name = "get_value___get_value_2.0.6.tgz";
+      path = fetchurl {
+        name = "get_value___get_value_2.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz";
+        sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28";
+      };
+    }
+    {
+      name = "getos___getos_3.2.1.tgz";
+      path = fetchurl {
+        name = "getos___getos_3.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz";
+        sha1 = "0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5";
+      };
+    }
+    {
+      name = "getpass___getpass_0.1.7.tgz";
+      path = fetchurl {
+        name = "getpass___getpass_0.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz";
+        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+      };
+    }
+    {
+      name = "glob_parent___glob_parent_3.1.0.tgz";
+      path = fetchurl {
+        name = "glob_parent___glob_parent_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz";
+        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
+      };
+    }
+    {
+      name = "glob_parent___glob_parent_5.0.0.tgz";
+      path = fetchurl {
+        name = "glob_parent___glob_parent_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz";
+        sha1 = "1dc99f0f39b006d3e92c2c284068382f0c20e954";
+      };
+    }
+    {
+      name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz";
+      path = fetchurl {
+        name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz";
+        sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab";
+      };
+    }
+    {
+      name = "glob___glob_7.1.2.tgz";
+      path = fetchurl {
+        name = "glob___glob_7.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz";
+        sha1 = "c19c9df9a028702d678612384a6552404c636d15";
+      };
+    }
+    {
+      name = "glob___glob_7.1.6.tgz";
+      path = fetchurl {
+        name = "glob___glob_7.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz";
+        sha1 = "141f33b81a7c2492e125594307480c46679278a6";
+      };
+    }
+    {
+      name = "glob___glob_7.1.4.tgz";
+      path = fetchurl {
+        name = "glob___glob_7.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz";
+        sha1 = "aa608a2f6c577ad357e1ae5a5c26d9a8d1969255";
+      };
+    }
+    {
+      name = "global_dirs___global_dirs_2.0.1.tgz";
+      path = fetchurl {
+        name = "global_dirs___global_dirs_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz";
+        sha1 = "acdf3bb6685bcd55cb35e8a052266569e9469201";
+      };
+    }
+    {
+      name = "global_modules___global_modules_2.0.0.tgz";
+      path = fetchurl {
+        name = "global_modules___global_modules_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz";
+        sha1 = "997605ad2345f27f51539bea26574421215c7780";
+      };
+    }
+    {
+      name = "global_modules___global_modules_1.0.0.tgz";
+      path = fetchurl {
+        name = "global_modules___global_modules_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz";
+        sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea";
+      };
+    }
+    {
+      name = "global_prefix___global_prefix_1.0.2.tgz";
+      path = fetchurl {
+        name = "global_prefix___global_prefix_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz";
+        sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
+      };
+    }
+    {
+      name = "global_prefix___global_prefix_3.0.0.tgz";
+      path = fetchurl {
+        name = "global_prefix___global_prefix_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz";
+        sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97";
+      };
+    }
+    {
+      name = "globals___globals_11.12.0.tgz";
+      path = fetchurl {
+        name = "globals___globals_11.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz";
+        sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e";
+      };
+    }
+    {
+      name = "globals___globals_11.9.0.tgz";
+      path = fetchurl {
+        name = "globals___globals_11.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz";
+        sha1 = "bde236808e987f290768a93d065060d78e6ab249";
+      };
+    }
+    {
+      name = "globby___globby_6.1.0.tgz";
+      path = fetchurl {
+        name = "globby___globby_6.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz";
+        sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c";
+      };
+    }
+    {
+      name = "graceful_fs___graceful_fs_4.2.3.tgz";
+      path = fetchurl {
+        name = "graceful_fs___graceful_fs_4.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha1 = "4a12ff1b60376ef09862c2093edd908328be8423";
+      };
+    }
+    {
+      name = "graceful_fs___graceful_fs_4.1.11.tgz";
+      path = fetchurl {
+        name = "graceful_fs___graceful_fs_4.1.11.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz";
+        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
+      };
+    }
+    {
+      name = "graceful_fs___graceful_fs_4.2.4.tgz";
+      path = fetchurl {
+        name = "graceful_fs___graceful_fs_4.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz";
+        sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb";
+      };
+    }
+    {
+      name = "graceful_readlink___graceful_readlink_1.0.1.tgz";
+      path = fetchurl {
+        name = "graceful_readlink___graceful_readlink_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+      };
+    }
+    {
+      name = "growl___growl_1.10.5.tgz";
+      path = fetchurl {
+        name = "growl___growl_1.10.5.tgz";
+        url  = "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz";
+        sha1 = "f2735dc2283674fa67478b10181059355c369e5e";
+      };
+    }
+    {
+      name = "growly___growly_1.3.0.tgz";
+      path = fetchurl {
+        name = "growly___growly_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz";
+        sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081";
+      };
+    }
+    {
+      name = "gud___gud_1.0.0.tgz";
+      path = fetchurl {
+        name = "gud___gud_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz";
+        sha1 = "a489581b17e6a70beca9abe3ae57de7a499852c0";
+      };
+    }
+    {
+      name = "gzip_size___gzip_size_5.1.1.tgz";
+      path = fetchurl {
+        name = "gzip_size___gzip_size_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz";
+        sha1 = "cb9bee692f87c0612b232840a873904e4c135274";
+      };
+    }
+    {
+      name = "handle_thing___handle_thing_2.0.0.tgz";
+      path = fetchurl {
+        name = "handle_thing___handle_thing_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz";
+        sha1 = "0e039695ff50c93fc288557d696f3c1dc6776754";
+      };
+    }
+    {
+      name = "handlebars___handlebars_4.1.2.tgz";
+      path = fetchurl {
+        name = "handlebars___handlebars_4.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz";
+        sha1 = "b6b37c1ced0306b221e094fc7aca3ec23b131b67";
+      };
+    }
+    {
+      name = "har_schema___har_schema_2.0.0.tgz";
+      path = fetchurl {
+        name = "har_schema___har_schema_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz";
+        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
+      };
+    }
+    {
+      name = "har_validator___har_validator_5.1.3.tgz";
+      path = fetchurl {
+        name = "har_validator___har_validator_5.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz";
+        sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080";
+      };
+    }
+    {
+      name = "harmony_reflect___harmony_reflect_1.6.1.tgz";
+      path = fetchurl {
+        name = "harmony_reflect___harmony_reflect_1.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz";
+        sha1 = "c108d4f2bb451efef7a37861fdbdae72c9bdefa9";
+      };
+    }
+    {
+      name = "has_ansi___has_ansi_2.0.0.tgz";
+      path = fetchurl {
+        name = "has_ansi___has_ansi_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz";
+        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+      };
+    }
+    {
+      name = "has_flag___has_flag_1.0.0.tgz";
+      path = fetchurl {
+        name = "has_flag___has_flag_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz";
+        sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa";
+      };
+    }
+    {
+      name = "has_flag___has_flag_3.0.0.tgz";
+      path = fetchurl {
+        name = "has_flag___has_flag_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz";
+        sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
+      };
+    }
+    {
+      name = "has_flag___has_flag_4.0.0.tgz";
+      path = fetchurl {
+        name = "has_flag___has_flag_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz";
+        sha1 = "944771fd9c81c81265c4d6941860da06bb59479b";
+      };
+    }
+    {
+      name = "has_symbols___has_symbols_1.0.0.tgz";
+      path = fetchurl {
+        name = "has_symbols___has_symbols_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz";
+        sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
+      };
+    }
+    {
+      name = "has_symbols___has_symbols_1.0.1.tgz";
+      path = fetchurl {
+        name = "has_symbols___has_symbols_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz";
+        sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8";
+      };
+    }
+    {
+      name = "has_value___has_value_0.3.1.tgz";
+      path = fetchurl {
+        name = "has_value___has_value_0.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz";
+        sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f";
+      };
+    }
+    {
+      name = "has_value___has_value_1.0.0.tgz";
+      path = fetchurl {
+        name = "has_value___has_value_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz";
+        sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177";
+      };
+    }
+    {
+      name = "has_values___has_values_0.1.4.tgz";
+      path = fetchurl {
+        name = "has_values___has_values_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz";
+        sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771";
+      };
+    }
+    {
+      name = "has_values___has_values_1.0.0.tgz";
+      path = fetchurl {
+        name = "has_values___has_values_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz";
+        sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
+      };
+    }
+    {
+      name = "has___has_1.0.3.tgz";
+      path = fetchurl {
+        name = "has___has_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz";
+        sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796";
+      };
+    }
+    {
+      name = "hash_base___hash_base_3.0.4.tgz";
+      path = fetchurl {
+        name = "hash_base___hash_base_3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz";
+        sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
+      };
+    }
+    {
+      name = "hash.js___hash.js_1.1.7.tgz";
+      path = fetchurl {
+        name = "hash.js___hash.js_1.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz";
+        sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42";
+      };
+    }
+    {
+      name = "he___he_1.1.1.tgz";
+      path = fetchurl {
+        name = "he___he_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz";
+        sha1 = "93410fd21b009735151f8868c2f271f3427e23fd";
+      };
+    }
+    {
+      name = "he___he_1.2.0.tgz";
+      path = fetchurl {
+        name = "he___he_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz";
+        sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f";
+      };
+    }
+    {
+      name = "hex_color_regex___hex_color_regex_1.1.0.tgz";
+      path = fetchurl {
+        name = "hex_color_regex___hex_color_regex_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz";
+        sha1 = "4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e";
+      };
+    }
+    {
+      name = "history___history_4.10.1.tgz";
+      path = fetchurl {
+        name = "history___history_4.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz";
+        sha1 = "33371a65e3a83b267434e2b3f3b1b4c58aad4cf3";
+      };
+    }
+    {
+      name = "hmac_drbg___hmac_drbg_1.0.1.tgz";
+      path = fetchurl {
+        name = "hmac_drbg___hmac_drbg_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz";
+        sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1";
+      };
+    }
+    {
+      name = "hoist_non_react_statics___hoist_non_react_statics_1.2.0.tgz";
+      path = fetchurl {
+        name = "hoist_non_react_statics___hoist_non_react_statics_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz";
+        sha1 = "aa448cf0986d55cc40773b17174b7dd066cb7cfb";
+      };
+    }
+    {
+      name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz";
+      path = fetchurl {
+        name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz";
+        sha1 = "ece0acaf71d62c2969c2ec59feff42a4b1a85b45";
+      };
+    }
+    {
+      name = "hoist_non_react_statics___hoist_non_react_statics_3.3.1.tgz";
+      path = fetchurl {
+        name = "hoist_non_react_statics___hoist_non_react_statics_3.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz";
+        sha1 = "101685d3aff3b23ea213163f6e8e12f4f111e19f";
+      };
+    }
+    {
+      name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz";
+      path = fetchurl {
+        name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz";
+        sha1 = "743298cef4e5af3e194161fbadcc2151d3a058e8";
+      };
+    }
+    {
+      name = "honeybadger_js___honeybadger_js_1.0.2.tgz";
+      path = fetchurl {
+        name = "honeybadger_js___honeybadger_js_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/honeybadger-js/-/honeybadger-js-1.0.2.tgz";
+        sha1 = "f5abb30c4d036773fe9b2c8c1b77dd855b158dab";
+      };
+    }
+    {
+      name = "hoopy___hoopy_0.1.4.tgz";
+      path = fetchurl {
+        name = "hoopy___hoopy_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz";
+        sha1 = "609207d661100033a9a9402ad3dea677381c1b1d";
+      };
+    }
+    {
+      name = "hosted_git_info___hosted_git_info_2.7.1.tgz";
+      path = fetchurl {
+        name = "hosted_git_info___hosted_git_info_2.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz";
+        sha1 = "97f236977bd6e125408930ff6de3eec6281ec047";
+      };
+    }
+    {
+      name = "hpack.js___hpack.js_2.1.6.tgz";
+      path = fetchurl {
+        name = "hpack.js___hpack.js_2.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz";
+        sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2";
+      };
+    }
+    {
+      name = "hsl_regex___hsl_regex_1.0.0.tgz";
+      path = fetchurl {
+        name = "hsl_regex___hsl_regex_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz";
+        sha1 = "d49330c789ed819e276a4c0d272dffa30b18fe6e";
+      };
+    }
+    {
+      name = "hsla_regex___hsla_regex_1.0.0.tgz";
+      path = fetchurl {
+        name = "hsla_regex___hsla_regex_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz";
+        sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38";
+      };
+    }
+    {
+      name = "html_comment_regex___html_comment_regex_1.1.2.tgz";
+      path = fetchurl {
+        name = "html_comment_regex___html_comment_regex_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz";
+        sha1 = "97d4688aeb5c81886a364faa0cad1dda14d433a7";
+      };
+    }
+    {
+      name = "html_encoding_sniffer___html_encoding_sniffer_1.0.2.tgz";
+      path = fetchurl {
+        name = "html_encoding_sniffer___html_encoding_sniffer_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz";
+        sha1 = "e70d84b94da53aa375e11fe3a351be6642ca46f8";
+      };
+    }
+    {
+      name = "html_entities___html_entities_1.2.1.tgz";
+      path = fetchurl {
+        name = "html_entities___html_entities_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz";
+        sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f";
+      };
+    }
+    {
+      name = "html_minifier___html_minifier_3.5.21.tgz";
+      path = fetchurl {
+        name = "html_minifier___html_minifier_3.5.21.tgz";
+        url  = "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz";
+        sha1 = "d0040e054730e354db008463593194015212d20c";
+      };
+    }
+    {
+      name = "html_minify___html_minify_0.3.2.tgz";
+      path = fetchurl {
+        name = "html_minify___html_minify_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/html-minify/-/html-minify-0.3.2.tgz";
+        sha1 = "32604b23b267ea2e67997e0814cdcd4250139df0";
+      };
+    }
+    {
+      name = "html_to_react___html_to_react_1.3.4.tgz";
+      path = fetchurl {
+        name = "html_to_react___html_to_react_1.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.3.4.tgz";
+        sha1 = "647b3a54fdec73a6461864b129fb0d1eec7d4589";
+      };
+    }
+    {
+      name = "html_webpack_plugin___html_webpack_plugin_3.2.0.tgz";
+      path = fetchurl {
+        name = "html_webpack_plugin___html_webpack_plugin_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz";
+        sha1 = "b01abbd723acaaa7b37b6af4492ebda03d9dd37b";
+      };
+    }
+    {
+      name = "htmlparser2___htmlparser2_3.10.0.tgz";
+      path = fetchurl {
+        name = "htmlparser2___htmlparser2_3.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.0.tgz";
+        sha1 = "5f5e422dcf6119c0d983ed36260ce9ded0bee464";
+      };
+    }
+    {
+      name = "htmlparser2___htmlparser2_3.10.1.tgz";
+      path = fetchurl {
+        name = "htmlparser2___htmlparser2_3.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz";
+        sha1 = "bd679dc3f59897b6a34bb10749c855bb53a9392f";
+      };
+    }
+    {
+      name = "htmlparser2___htmlparser2_3.9.2.tgz";
+      path = fetchurl {
+        name = "htmlparser2___htmlparser2_3.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz";
+        sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338";
+      };
+    }
+    {
+      name = "http_deceiver___http_deceiver_1.2.7.tgz";
+      path = fetchurl {
+        name = "http_deceiver___http_deceiver_1.2.7.tgz";
+        url  = "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz";
+        sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87";
+      };
+    }
+    {
+      name = "http_errors___http_errors_1.6.2.tgz";
+      path = fetchurl {
+        name = "http_errors___http_errors_1.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz";
+        sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
+      };
+    }
+    {
+      name = "http_errors___http_errors_1.7.2.tgz";
+      path = fetchurl {
+        name = "http_errors___http_errors_1.7.2.tgz";
+        url  = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz";
+        sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f";
+      };
+    }
+    {
+      name = "http_errors___http_errors_1.6.3.tgz";
+      path = fetchurl {
+        name = "http_errors___http_errors_1.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz";
+        sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d";
+      };
+    }
+    {
+      name = "http_errors___http_errors_1.7.3.tgz";
+      path = fetchurl {
+        name = "http_errors___http_errors_1.7.3.tgz";
+        url  = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz";
+        sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06";
+      };
+    }
+    {
+      name = "http_parser_js___http_parser_js_0.4.10.tgz";
+      path = fetchurl {
+        name = "http_parser_js___http_parser_js_0.4.10.tgz";
+        url  = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz";
+        sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4";
+      };
+    }
+    {
+      name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz";
+      path = fetchurl {
+        name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz";
+        url  = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz";
+        sha1 = "183c7dc4aa1479150306498c210cdaf96080a43a";
+      };
+    }
+    {
+      name = "http_proxy_middleware___http_proxy_middleware_0.18.0.tgz";
+      path = fetchurl {
+        name = "http_proxy_middleware___http_proxy_middleware_0.18.0.tgz";
+        url  = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz";
+        sha1 = "0987e6bb5a5606e5a69168d8f967a87f15dd8aab";
+      };
+    }
+    {
+      name = "http_proxy___http_proxy_1.17.0.tgz";
+      path = fetchurl {
+        name = "http_proxy___http_proxy_1.17.0.tgz";
+        url  = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz";
+        sha1 = "7ad38494658f84605e2f6db4436df410f4e5be9a";
+      };
+    }
+    {
+      name = "http_proxy___http_proxy_1.18.0.tgz";
+      path = fetchurl {
+        name = "http_proxy___http_proxy_1.18.0.tgz";
+        url  = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz";
+        sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a";
+      };
+    }
+    {
+      name = "http_signature___http_signature_1.2.0.tgz";
+      path = fetchurl {
+        name = "http_signature___http_signature_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz";
+        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
+      };
+    }
+    {
+      name = "https_browserify___https_browserify_1.0.0.tgz";
+      path = fetchurl {
+        name = "https_browserify___https_browserify_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz";
+        sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
+      };
+    }
+    {
+      name = "humps___humps_2.0.1.tgz";
+      path = fetchurl {
+        name = "humps___humps_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/humps/-/humps-2.0.1.tgz";
+        sha1 = "dd02ea6081bd0568dc5d073184463957ba9ef9aa";
+      };
+    }
+    {
+      name = "iconv_lite___iconv_lite_0.4.19.tgz";
+      path = fetchurl {
+        name = "iconv_lite___iconv_lite_0.4.19.tgz";
+        url  = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz";
+        sha1 = "f7468f60135f5e5dad3399c0a81be9a1603a082b";
+      };
+    }
+    {
+      name = "iconv_lite___iconv_lite_0.4.24.tgz";
+      path = fetchurl {
+        name = "iconv_lite___iconv_lite_0.4.24.tgz";
+        url  = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz";
+        sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b";
+      };
+    }
+    {
+      name = "icss_utils___icss_utils_4.1.1.tgz";
+      path = fetchurl {
+        name = "icss_utils___icss_utils_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz";
+        sha1 = "21170b53789ee27447c2f47dd683081403f9a467";
+      };
+    }
+    {
+      name = "identity_obj_proxy___identity_obj_proxy_3.0.0.tgz";
+      path = fetchurl {
+        name = "identity_obj_proxy___identity_obj_proxy_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz";
+        sha1 = "94d2bda96084453ef36fbc5aaec37e0f79f1fc14";
+      };
+    }
+    {
+      name = "idtoken_verifier___idtoken_verifier_2.0.2.tgz";
+      path = fetchurl {
+        name = "idtoken_verifier___idtoken_verifier_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/idtoken-verifier/-/idtoken-verifier-2.0.2.tgz";
+        sha1 = "7fd1c64c435abf07e92f137e7ac538a758fdc399";
+      };
+    }
+    {
+      name = "ieee754___ieee754_1.1.13.tgz";
+      path = fetchurl {
+        name = "ieee754___ieee754_1.1.13.tgz";
+        url  = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz";
+        sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84";
+      };
+    }
+    {
+      name = "iferr___iferr_0.1.5.tgz";
+      path = fetchurl {
+        name = "iferr___iferr_0.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz";
+        sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501";
+      };
+    }
+    {
+      name = "ignore___ignore_4.0.6.tgz";
+      path = fetchurl {
+        name = "ignore___ignore_4.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz";
+        sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc";
+      };
+    }
+    {
+      name = "immer___immer_1.9.3.tgz";
+      path = fetchurl {
+        name = "immer___immer_1.9.3.tgz";
+        url  = "https://registry.yarnpkg.com/immer/-/immer-1.9.3.tgz";
+        sha1 = "e88f8cbea730d2cde0f5e7e763000a8608bccdae";
+      };
+    }
+    {
+      name = "immutable___immutable_3.8.2.tgz";
+      path = fetchurl {
+        name = "immutable___immutable_3.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz";
+        sha1 = "c2439951455bb39913daf281376f1530e104adf3";
+      };
+    }
+    {
+      name = "import_fresh___import_fresh_2.0.0.tgz";
+      path = fetchurl {
+        name = "import_fresh___import_fresh_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz";
+        sha1 = "d81355c15612d386c61f9ddd3922d4304822a546";
+      };
+    }
+    {
+      name = "import_fresh___import_fresh_3.0.0.tgz";
+      path = fetchurl {
+        name = "import_fresh___import_fresh_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz";
+        sha1 = "a3d897f420cab0e671236897f75bc14b4885c390";
+      };
+    }
+    {
+      name = "import_local___import_local_2.0.0.tgz";
+      path = fetchurl {
+        name = "import_local___import_local_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz";
+        sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d";
+      };
+    }
+    {
+      name = "imurmurhash___imurmurhash_0.1.4.tgz";
+      path = fetchurl {
+        name = "imurmurhash___imurmurhash_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz";
+        sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
+      };
+    }
+    {
+      name = "indent_string___indent_string_3.2.0.tgz";
+      path = fetchurl {
+        name = "indent_string___indent_string_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz";
+        sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289";
+      };
+    }
+    {
+      name = "indent_string___indent_string_4.0.0.tgz";
+      path = fetchurl {
+        name = "indent_string___indent_string_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz";
+        sha1 = "624f8f4497d619b2d9768531d58f4122854d7251";
+      };
+    }
+    {
+      name = "indexes_of___indexes_of_1.0.1.tgz";
+      path = fetchurl {
+        name = "indexes_of___indexes_of_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz";
+        sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607";
+      };
+    }
+    {
+      name = "infer_owner___infer_owner_1.0.4.tgz";
+      path = fetchurl {
+        name = "infer_owner___infer_owner_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz";
+        sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467";
+      };
+    }
+    {
+      name = "inflight___inflight_1.0.6.tgz";
+      path = fetchurl {
+        name = "inflight___inflight_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    }
+    {
+      name = "inherits___inherits_2.0.4.tgz";
+      path = fetchurl {
+        name = "inherits___inherits_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz";
+        sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c";
+      };
+    }
+    {
+      name = "inherits___inherits_2.0.1.tgz";
+      path = fetchurl {
+        name = "inherits___inherits_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz";
+        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      };
+    }
+    {
+      name = "inherits___inherits_2.0.3.tgz";
+      path = fetchurl {
+        name = "inherits___inherits_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    }
+    {
+      name = "ini___ini_1.3.5.tgz";
+      path = fetchurl {
+        name = "ini___ini_1.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz";
+        sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927";
+      };
+    }
+    {
+      name = "inquirer___inquirer_7.0.0.tgz";
+      path = fetchurl {
+        name = "inquirer___inquirer_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz";
+        sha1 = "9e2b032dde77da1db5db804758b8fea3a970519a";
+      };
+    }
+    {
+      name = "internal_ip___internal_ip_4.3.0.tgz";
+      path = fetchurl {
+        name = "internal_ip___internal_ip_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz";
+        sha1 = "845452baad9d2ca3b69c635a137acb9a0dad0907";
+      };
+    }
+    {
+      name = "interpret___interpret_1.2.0.tgz";
+      path = fetchurl {
+        name = "interpret___interpret_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz";
+        sha1 = "d5061a6224be58e8083985f5014d844359576296";
+      };
+    }
+    {
+      name = "intersection_observer___intersection_observer_0.7.0.tgz";
+      path = fetchurl {
+        name = "intersection_observer___intersection_observer_0.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.7.0.tgz";
+        sha1 = "ee16bee978db53516ead2f0a8154b09b400bbdc9";
+      };
+    }
+    {
+      name = "invariant___invariant_2.2.4.tgz";
+      path = fetchurl {
+        name = "invariant___invariant_2.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz";
+        sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6";
+      };
+    }
+    {
+      name = "invert_kv___invert_kv_2.0.0.tgz";
+      path = fetchurl {
+        name = "invert_kv___invert_kv_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz";
+        sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02";
+      };
+    }
+    {
+      name = "ip_regex___ip_regex_2.1.0.tgz";
+      path = fetchurl {
+        name = "ip_regex___ip_regex_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz";
+        sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
+      };
+    }
+    {
+      name = "ip___ip_1.1.5.tgz";
+      path = fetchurl {
+        name = "ip___ip_1.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz";
+        sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a";
+      };
+    }
+    {
+      name = "ipaddr.js___ipaddr.js_1.8.0.tgz";
+      path = fetchurl {
+        name = "ipaddr.js___ipaddr.js_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz";
+        sha1 = "eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e";
+      };
+    }
+    {
+      name = "ipaddr.js___ipaddr.js_1.9.1.tgz";
+      path = fetchurl {
+        name = "ipaddr.js___ipaddr.js_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
+        sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3";
+      };
+    }
+    {
+      name = "is_absolute_url___is_absolute_url_2.1.0.tgz";
+      path = fetchurl {
+        name = "is_absolute_url___is_absolute_url_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz";
+        sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6";
+      };
+    }
+    {
+      name = "is_absolute_url___is_absolute_url_3.0.3.tgz";
+      path = fetchurl {
+        name = "is_absolute_url___is_absolute_url_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz";
+        sha1 = "96c6a22b6a23929b11ea0afb1836c36ad4a5d698";
+      };
+    }
+    {
+      name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz";
+      path = fetchurl {
+        name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz";
+        sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6";
+      };
+    }
+    {
+      name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz";
+        sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656";
+      };
+    }
+    {
+      name = "is_alphabetical___is_alphabetical_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_alphabetical___is_alphabetical_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.2.tgz";
+        sha1 = "1fa6e49213cb7885b75d15862fb3f3d96c884f41";
+      };
+    }
+    {
+      name = "is_alphanumerical___is_alphanumerical_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_alphanumerical___is_alphanumerical_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz";
+        sha1 = "1138e9ae5040158dc6ff76b820acd6b7a181fd40";
+      };
+    }
+    {
+      name = "is_arguments___is_arguments_1.0.4.tgz";
+      path = fetchurl {
+        name = "is_arguments___is_arguments_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz";
+        sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3";
+      };
+    }
+    {
+      name = "is_arrayish___is_arrayish_0.2.1.tgz";
+      path = fetchurl {
+        name = "is_arrayish___is_arrayish_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz";
+        sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
+      };
+    }
+    {
+      name = "is_arrayish___is_arrayish_0.3.2.tgz";
+      path = fetchurl {
+        name = "is_arrayish___is_arrayish_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz";
+        sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03";
+      };
+    }
+    {
+      name = "is_binary_path___is_binary_path_1.0.1.tgz";
+      path = fetchurl {
+        name = "is_binary_path___is_binary_path_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz";
+        sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
+      };
+    }
+    {
+      name = "is_binary_path___is_binary_path_2.1.0.tgz";
+      path = fetchurl {
+        name = "is_binary_path___is_binary_path_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz";
+        sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09";
+      };
+    }
+    {
+      name = "is_boolean_object___is_boolean_object_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_boolean_object___is_boolean_object_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz";
+        sha1 = "98f8b28030684219a95f375cfbd88ce3405dff93";
+      };
+    }
+    {
+      name = "is_buffer___is_buffer_1.1.6.tgz";
+      path = fetchurl {
+        name = "is_buffer___is_buffer_1.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz";
+        sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be";
+      };
+    }
+    {
+      name = "is_buffer___is_buffer_2.0.3.tgz";
+      path = fetchurl {
+        name = "is_buffer___is_buffer_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz";
+        sha1 = "4ecf3fcf749cbd1e472689e109ac66261a25e725";
+      };
+    }
+    {
+      name = "is_callable___is_callable_1.1.4.tgz";
+      path = fetchurl {
+        name = "is_callable___is_callable_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz";
+        sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75";
+      };
+    }
+    {
+      name = "is_callable___is_callable_1.1.5.tgz";
+      path = fetchurl {
+        name = "is_callable___is_callable_1.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz";
+        sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab";
+      };
+    }
+    {
+      name = "is_ci___is_ci_2.0.0.tgz";
+      path = fetchurl {
+        name = "is_ci___is_ci_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz";
+        sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c";
+      };
+    }
+    {
+      name = "is_color_stop___is_color_stop_1.1.0.tgz";
+      path = fetchurl {
+        name = "is_color_stop___is_color_stop_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz";
+        sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345";
+      };
+    }
+    {
+      name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz";
+      path = fetchurl {
+        name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz";
+        sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56";
+      };
+    }
+    {
+      name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz";
+        sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7";
+      };
+    }
+    {
+      name = "is_date_object___is_date_object_1.0.1.tgz";
+      path = fetchurl {
+        name = "is_date_object___is_date_object_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz";
+        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+      };
+    }
+    {
+      name = "is_decimal___is_decimal_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_decimal___is_decimal_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.2.tgz";
+        sha1 = "894662d6a8709d307f3a276ca4339c8fa5dff0ff";
+      };
+    }
+    {
+      name = "is_descriptor___is_descriptor_0.1.6.tgz";
+      path = fetchurl {
+        name = "is_descriptor___is_descriptor_0.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz";
+        sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca";
+      };
+    }
+    {
+      name = "is_descriptor___is_descriptor_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_descriptor___is_descriptor_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz";
+        sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec";
+      };
+    }
+    {
+      name = "is_directory___is_directory_0.3.1.tgz";
+      path = fetchurl {
+        name = "is_directory___is_directory_0.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz";
+        sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1";
+      };
+    }
+    {
+      name = "is_extendable___is_extendable_0.1.1.tgz";
+      path = fetchurl {
+        name = "is_extendable___is_extendable_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz";
+        sha1 = "62b110e289a471418e3ec36a617d472e301dfc89";
+      };
+    }
+    {
+      name = "is_extendable___is_extendable_1.0.1.tgz";
+      path = fetchurl {
+        name = "is_extendable___is_extendable_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz";
+        sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4";
+      };
+    }
+    {
+      name = "is_extglob___is_extglob_2.1.1.tgz";
+      path = fetchurl {
+        name = "is_extglob___is_extglob_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+      };
+    }
+    {
+      name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+      };
+    }
+    {
+      name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz";
+      path = fetchurl {
+        name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+      };
+    }
+    {
+      name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz";
+      path = fetchurl {
+        name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz";
+        sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d";
+      };
+    }
+    {
+      name = "is_generator_fn___is_generator_fn_2.1.0.tgz";
+      path = fetchurl {
+        name = "is_generator_fn___is_generator_fn_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz";
+        sha1 = "7d140adc389aaf3011a8f2a2a4cfa6faadffb118";
+      };
+    }
+    {
+      name = "is_glob___is_glob_3.1.0.tgz";
+      path = fetchurl {
+        name = "is_glob___is_glob_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz";
+        sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
+      };
+    }
+    {
+      name = "is_glob___is_glob_4.0.1.tgz";
+      path = fetchurl {
+        name = "is_glob___is_glob_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz";
+        sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc";
+      };
+    }
+    {
+      name = "is_hexadecimal___is_hexadecimal_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_hexadecimal___is_hexadecimal_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz";
+        sha1 = "b6e710d7d07bb66b98cb8cece5c9b4921deeb835";
+      };
+    }
+    {
+      name = "is_installed_globally___is_installed_globally_0.3.2.tgz";
+      path = fetchurl {
+        name = "is_installed_globally___is_installed_globally_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz";
+        sha1 = "fd3efa79ee670d1187233182d5b0a1dd00313141";
+      };
+    }
+    {
+      name = "is_number_object___is_number_object_1.0.3.tgz";
+      path = fetchurl {
+        name = "is_number_object___is_number_object_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz";
+        sha1 = "f265ab89a9f445034ef6aff15a8f00b00f551799";
+      };
+    }
+    {
+      name = "is_number___is_number_3.0.0.tgz";
+      path = fetchurl {
+        name = "is_number___is_number_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz";
+        sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
+      };
+    }
+    {
+      name = "is_number___is_number_7.0.0.tgz";
+      path = fetchurl {
+        name = "is_number___is_number_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz";
+        sha1 = "7535345b896734d5f80c4d06c50955527a14f12b";
+      };
+    }
+    {
+      name = "is_obj___is_obj_1.0.1.tgz";
+      path = fetchurl {
+        name = "is_obj___is_obj_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz";
+        sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
+      };
+    }
+    {
+      name = "is_observable___is_observable_1.1.0.tgz";
+      path = fetchurl {
+        name = "is_observable___is_observable_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz";
+        sha1 = "b3e986c8f44de950867cab5403f5a3465005975e";
+      };
+    }
+    {
+      name = "is_path_cwd___is_path_cwd_2.2.0.tgz";
+      path = fetchurl {
+        name = "is_path_cwd___is_path_cwd_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz";
+        sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb";
+      };
+    }
+    {
+      name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz";
+      path = fetchurl {
+        name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz";
+        sha1 = "bfe2dca26c69f397265a4009963602935a053acb";
+      };
+    }
+    {
+      name = "is_path_inside___is_path_inside_2.1.0.tgz";
+      path = fetchurl {
+        name = "is_path_inside___is_path_inside_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz";
+        sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2";
+      };
+    }
+    {
+      name = "is_path_inside___is_path_inside_3.0.2.tgz";
+      path = fetchurl {
+        name = "is_path_inside___is_path_inside_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz";
+        sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017";
+      };
+    }
+    {
+      name = "is_plain_obj___is_plain_obj_1.1.0.tgz";
+      path = fetchurl {
+        name = "is_plain_obj___is_plain_obj_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz";
+        sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e";
+      };
+    }
+    {
+      name = "is_plain_object___is_plain_object_2.0.4.tgz";
+      path = fetchurl {
+        name = "is_plain_object___is_plain_object_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz";
+        sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677";
+      };
+    }
+    {
+      name = "is_promise___is_promise_2.1.0.tgz";
+      path = fetchurl {
+        name = "is_promise___is_promise_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz";
+        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+      };
+    }
+    {
+      name = "is_regex___is_regex_1.0.4.tgz";
+      path = fetchurl {
+        name = "is_regex___is_regex_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz";
+        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+      };
+    }
+    {
+      name = "is_regex___is_regex_1.0.5.tgz";
+      path = fetchurl {
+        name = "is_regex___is_regex_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz";
+        sha1 = "39d589a358bf18967f726967120b8fc1aed74eae";
+      };
+    }
+    {
+      name = "is_resolvable___is_resolvable_1.1.0.tgz";
+      path = fetchurl {
+        name = "is_resolvable___is_resolvable_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz";
+        sha1 = "fb18f87ce1feb925169c9a407c19318a3206ed88";
+      };
+    }
+    {
+      name = "is_stream___is_stream_1.1.0.tgz";
+      path = fetchurl {
+        name = "is_stream___is_stream_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+      };
+    }
+    {
+      name = "is_string___is_string_1.0.4.tgz";
+      path = fetchurl {
+        name = "is_string___is_string_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz";
+        sha1 = "cc3a9b69857d621e963725a24caeec873b826e64";
+      };
+    }
+    {
+      name = "is_subset___is_subset_0.1.1.tgz";
+      path = fetchurl {
+        name = "is_subset___is_subset_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz";
+        sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6";
+      };
+    }
+    {
+      name = "is_svg___is_svg_3.0.0.tgz";
+      path = fetchurl {
+        name = "is_svg___is_svg_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz";
+        sha1 = "9321dbd29c212e5ca99c4fa9794c714bcafa2f75";
+      };
+    }
+    {
+      name = "is_symbol___is_symbol_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_symbol___is_symbol_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz";
+        sha1 = "a055f6ae57192caee329e7a860118b497a950f38";
+      };
+    }
+    {
+      name = "is_typedarray___is_typedarray_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_typedarray___is_typedarray_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz";
+        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+      };
+    }
+    {
+      name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz";
+        sha1 = "ede53b4c6f6fb3874533751ec9280d01928d03ed";
+      };
+    }
+    {
+      name = "is_windows___is_windows_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_windows___is_windows_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz";
+        sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d";
+      };
+    }
+    {
+      name = "is_word_character___is_word_character_1.0.2.tgz";
+      path = fetchurl {
+        name = "is_word_character___is_word_character_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.2.tgz";
+        sha1 = "46a5dac3f2a1840898b91e576cd40d493f3ae553";
+      };
+    }
+    {
+      name = "is_wsl___is_wsl_1.1.0.tgz";
+      path = fetchurl {
+        name = "is_wsl___is_wsl_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz";
+        sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
+      };
+    }
+    {
+      name = "isarray___isarray_0.0.1.tgz";
+      path = fetchurl {
+        name = "isarray___isarray_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz";
+        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+      };
+    }
+    {
+      name = "isarray___isarray_1.0.0.tgz";
+      path = fetchurl {
+        name = "isarray___isarray_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+      };
+    }
+    {
+      name = "isexe___isexe_2.0.0.tgz";
+      path = fetchurl {
+        name = "isexe___isexe_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz";
+        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+      };
+    }
+    {
+      name = "isobject___isobject_2.1.0.tgz";
+      path = fetchurl {
+        name = "isobject___isobject_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz";
+        sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
+      };
+    }
+    {
+      name = "isobject___isobject_3.0.1.tgz";
+      path = fetchurl {
+        name = "isobject___isobject_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz";
+        sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df";
+      };
+    }
+    {
+      name = "isomorphic_fetch___isomorphic_fetch_2.2.1.tgz";
+      path = fetchurl {
+        name = "isomorphic_fetch___isomorphic_fetch_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz";
+        sha1 = "611ae1acf14f5e81f729507472819fe9733558a9";
+      };
+    }
+    {
+      name = "isstream___isstream_0.1.2.tgz";
+      path = fetchurl {
+        name = "isstream___isstream_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz";
+        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+      };
+    }
+    {
+      name = "istanbul_lib_coverage___istanbul_lib_coverage_2.0.5.tgz";
+      path = fetchurl {
+        name = "istanbul_lib_coverage___istanbul_lib_coverage_2.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz";
+        sha1 = "675f0ab69503fad4b1d849f736baaca803344f49";
+      };
+    }
+    {
+      name = "istanbul_lib_instrument___istanbul_lib_instrument_3.3.0.tgz";
+      path = fetchurl {
+        name = "istanbul_lib_instrument___istanbul_lib_instrument_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz";
+        sha1 = "a5f63d91f0bbc0c3e479ef4c5de027335ec6d630";
+      };
+    }
+    {
+      name = "istanbul_lib_report___istanbul_lib_report_2.0.8.tgz";
+      path = fetchurl {
+        name = "istanbul_lib_report___istanbul_lib_report_2.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz";
+        sha1 = "5a8113cd746d43c4889eba36ab10e7d50c9b4f33";
+      };
+    }
+    {
+      name = "istanbul_lib_source_maps___istanbul_lib_source_maps_3.0.6.tgz";
+      path = fetchurl {
+        name = "istanbul_lib_source_maps___istanbul_lib_source_maps_3.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz";
+        sha1 = "284997c48211752ec486253da97e3879defba8c8";
+      };
+    }
+    {
+      name = "istanbul_reports___istanbul_reports_2.2.6.tgz";
+      path = fetchurl {
+        name = "istanbul_reports___istanbul_reports_2.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz";
+        sha1 = "7b4f2660d82b29303a8fe6091f8ca4bf058da1af";
+      };
+    }
+    {
+      name = "jest_changed_files___jest_changed_files_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_changed_files___jest_changed_files_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.8.0.tgz";
+        sha1 = "7e7eb21cf687587a85e50f3d249d1327e15b157b";
+      };
+    }
+    {
+      name = "jest_cli___jest_cli_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_cli___jest_cli_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz";
+        sha1 = "b075ac914492ed114fa338ade7362a301693e989";
+      };
+    }
+    {
+      name = "jest_config___jest_config_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_config___jest_config_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-config/-/jest-config-24.8.0.tgz";
+        sha1 = "77db3d265a6f726294687cbbccc36f8a76ee0f4f";
+      };
+    }
+    {
+      name = "jest_diff___jest_diff_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_diff___jest_diff_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz";
+        sha1 = "146435e7d1e3ffdf293d53ff97e193f1d1546172";
+      };
+    }
+    {
+      name = "jest_docblock___jest_docblock_24.3.0.tgz";
+      path = fetchurl {
+        name = "jest_docblock___jest_docblock_24.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz";
+        sha1 = "b9c32dac70f72e4464520d2ba4aec02ab14db5dd";
+      };
+    }
+    {
+      name = "jest_each___jest_each_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_each___jest_each_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-each/-/jest-each-24.8.0.tgz";
+        sha1 = "a05fd2bf94ddc0b1da66c6d13ec2457f35e52775";
+      };
+    }
+    {
+      name = "jest_environment_jsdom___jest_environment_jsdom_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_environment_jsdom___jest_environment_jsdom_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz";
+        sha1 = "300f6949a146cabe1c9357ad9e9ecf9f43f38857";
+      };
+    }
+    {
+      name = "jest_environment_node___jest_environment_node_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_environment_node___jest_environment_node_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.8.0.tgz";
+        sha1 = "d3f726ba8bc53087a60e7a84ca08883a4c892231";
+      };
+    }
+    {
+      name = "jest_fetch_mock___jest_fetch_mock_3.0.3.tgz";
+      path = fetchurl {
+        name = "jest_fetch_mock___jest_fetch_mock_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz";
+        sha1 = "31749c456ae27b8919d69824f1c2bd85fe0a1f3b";
+      };
+    }
+    {
+      name = "jest_get_type___jest_get_type_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_get_type___jest_get_type_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz";
+        sha1 = "a7440de30b651f5a70ea3ed7ff073a32dfe646fc";
+      };
+    }
+    {
+      name = "jest_get_type___jest_get_type_24.9.0.tgz";
+      path = fetchurl {
+        name = "jest_get_type___jest_get_type_24.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz";
+        sha1 = "1684a0c8a50f2e4901b6644ae861f579eed2ef0e";
+      };
+    }
+    {
+      name = "jest_haste_map___jest_haste_map_24.8.1.tgz";
+      path = fetchurl {
+        name = "jest_haste_map___jest_haste_map_24.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.1.tgz";
+        sha1 = "f39cc1d2b1d907e014165b4bd5a957afcb992982";
+      };
+    }
+    {
+      name = "jest_jasmine2___jest_jasmine2_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_jasmine2___jest_jasmine2_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz";
+        sha1 = "a9c7e14c83dd77d8b15e820549ce8987cc8cd898";
+      };
+    }
+    {
+      name = "jest_junit___jest_junit_10.0.0.tgz";
+      path = fetchurl {
+        name = "jest_junit___jest_junit_10.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-junit/-/jest-junit-10.0.0.tgz";
+        sha1 = "c94b91c24920a327c9d2a075e897b2dba4af494b";
+      };
+    }
+    {
+      name = "jest_leak_detector___jest_leak_detector_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_leak_detector___jest_leak_detector_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz";
+        sha1 = "c0086384e1f650c2d8348095df769f29b48e6980";
+      };
+    }
+    {
+      name = "jest_matcher_utils___jest_matcher_utils_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_matcher_utils___jest_matcher_utils_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz";
+        sha1 = "2bce42204c9af12bde46f83dc839efe8be832495";
+      };
+    }
+    {
+      name = "jest_message_util___jest_message_util_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_message_util___jest_message_util_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz";
+        sha1 = "0d6891e72a4beacc0292b638685df42e28d6218b";
+      };
+    }
+    {
+      name = "jest_mock___jest_mock_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_mock___jest_mock_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz";
+        sha1 = "2f9d14d37699e863f1febf4e4d5a33b7fdbbde56";
+      };
+    }
+    {
+      name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz";
+      path = fetchurl {
+        name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz";
+        sha1 = "ecdae604c077a7fbc70defb6d517c3c1c898923a";
+      };
+    }
+    {
+      name = "jest_regex_util___jest_regex_util_24.3.0.tgz";
+      path = fetchurl {
+        name = "jest_regex_util___jest_regex_util_24.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz";
+        sha1 = "d5a65f60be1ae3e310d5214a0307581995227b36";
+      };
+    }
+    {
+      name = "jest_resolve_dependencies___jest_resolve_dependencies_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_resolve_dependencies___jest_resolve_dependencies_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz";
+        sha1 = "19eec3241f2045d3f990dba331d0d7526acff8e0";
+      };
+    }
+    {
+      name = "jest_resolve___jest_resolve_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_resolve___jest_resolve_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz";
+        sha1 = "84b8e5408c1f6a11539793e2b5feb1b6e722439f";
+      };
+    }
+    {
+      name = "jest_runner___jest_runner_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_runner___jest_runner_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.8.0.tgz";
+        sha1 = "4f9ae07b767db27b740d7deffad0cf67ccb4c5bb";
+      };
+    }
+    {
+      name = "jest_runtime___jest_runtime_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_runtime___jest_runtime_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.8.0.tgz";
+        sha1 = "05f94d5b05c21f6dc54e427cd2e4980923350620";
+      };
+    }
+    {
+      name = "jest_serializer___jest_serializer_24.4.0.tgz";
+      path = fetchurl {
+        name = "jest_serializer___jest_serializer_24.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz";
+        sha1 = "f70c5918c8ea9235ccb1276d232e459080588db3";
+      };
+    }
+    {
+      name = "jest_snapshot___jest_snapshot_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_snapshot___jest_snapshot_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz";
+        sha1 = "3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6";
+      };
+    }
+    {
+      name = "jest_util___jest_util_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_util___jest_util_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz";
+        sha1 = "41f0e945da11df44cc76d64ffb915d0716f46cd1";
+      };
+    }
+    {
+      name = "jest_validate___jest_validate_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_validate___jest_validate_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz";
+        sha1 = "624c41533e6dfe356ffadc6e2423a35c2d3b4849";
+      };
+    }
+    {
+      name = "jest_validate___jest_validate_24.9.0.tgz";
+      path = fetchurl {
+        name = "jest_validate___jest_validate_24.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz";
+        sha1 = "0775c55360d173cd854e40180756d4ff52def8ab";
+      };
+    }
+    {
+      name = "jest_watcher___jest_watcher_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest_watcher___jest_watcher_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.8.0.tgz";
+        sha1 = "58d49915ceddd2de85e238f6213cef1c93715de4";
+      };
+    }
+    {
+      name = "jest_worker___jest_worker_24.6.0.tgz";
+      path = fetchurl {
+        name = "jest_worker___jest_worker_24.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz";
+        sha1 = "7f81ceae34b7cde0c9827a6980c35b7cdc0161b3";
+      };
+    }
+    {
+      name = "jest_worker___jest_worker_24.9.0.tgz";
+      path = fetchurl {
+        name = "jest_worker___jest_worker_24.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz";
+        sha1 = "5dbfdb5b2d322e98567898238a9697bcce67b3e5";
+      };
+    }
+    {
+      name = "jest___jest_24.8.0.tgz";
+      path = fetchurl {
+        name = "jest___jest_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz";
+        sha1 = "d5dff1984d0d1002196e9b7f12f75af1b2809081";
+      };
+    }
+    {
+      name = "js_base64___js_base64_2.4.9.tgz";
+      path = fetchurl {
+        name = "js_base64___js_base64_2.4.9.tgz";
+        url  = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz";
+        sha1 = "748911fb04f48a60c4771b375cac45a80df11c03";
+      };
+    }
+    {
+      name = "js_cookie___js_cookie_2.2.1.tgz";
+      path = fetchurl {
+        name = "js_cookie___js_cookie_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz";
+        sha1 = "69e106dc5d5806894562902aa5baec3744e9b2b8";
+      };
+    }
+    {
+      name = "js_levenshtein___js_levenshtein_1.1.6.tgz";
+      path = fetchurl {
+        name = "js_levenshtein___js_levenshtein_1.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz";
+        sha1 = "c6cee58eb3550372df8deb85fad5ce66ce01d59d";
+      };
+    }
+    {
+      name = "js_tokens___js_tokens_4.0.0.tgz";
+      path = fetchurl {
+        name = "js_tokens___js_tokens_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz";
+        sha1 = "19203fb59991df98e3a287050d4647cdeaf32499";
+      };
+    }
+    {
+      name = "js_tokens___js_tokens_3.0.2.tgz";
+      path = fetchurl {
+        name = "js_tokens___js_tokens_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz";
+        sha1 = "9866df395102130e38f7f996bceb65443209c25b";
+      };
+    }
+    {
+      name = "js_yaml___js_yaml_3.13.1.tgz";
+      path = fetchurl {
+        name = "js_yaml___js_yaml_3.13.1.tgz";
+        url  = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz";
+        sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847";
+      };
+    }
+    {
+      name = "jsbn___jsbn_1.1.0.tgz";
+      path = fetchurl {
+        name = "jsbn___jsbn_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz";
+        sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040";
+      };
+    }
+    {
+      name = "jsbn___jsbn_0.1.1.tgz";
+      path = fetchurl {
+        name = "jsbn___jsbn_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+      };
+    }
+    {
+      name = "jsdom___jsdom_11.12.0.tgz";
+      path = fetchurl {
+        name = "jsdom___jsdom_11.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz";
+        sha1 = "1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8";
+      };
+    }
+    {
+      name = "jsdom___jsdom_9.12.0.tgz";
+      path = fetchurl {
+        name = "jsdom___jsdom_9.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz";
+        sha1 = "e8c546fffcb06c00d4833ca84410fed7f8a097d4";
+      };
+    }
+    {
+      name = "jsesc___jsesc_2.5.2.tgz";
+      path = fetchurl {
+        name = "jsesc___jsesc_2.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz";
+        sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4";
+      };
+    }
+    {
+      name = "jsesc___jsesc_0.5.0.tgz";
+      path = fetchurl {
+        name = "jsesc___jsesc_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz";
+        sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d";
+      };
+    }
+    {
+      name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz";
+      path = fetchurl {
+        name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz";
+        sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9";
+      };
+    }
+    {
+      name = "json_schema_ref_parser___json_schema_ref_parser_7.1.0.tgz";
+      path = fetchurl {
+        name = "json_schema_ref_parser___json_schema_ref_parser_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-7.1.0.tgz";
+        sha1 = "987582b19fa06a37db4797d4e825879a7aea127c";
+      };
+    }
+    {
+      name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz";
+      path = fetchurl {
+        name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
+        sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660";
+      };
+    }
+    {
+      name = "json_schema___json_schema_0.2.3.tgz";
+      path = fetchurl {
+        name = "json_schema___json_schema_0.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz";
+        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+      };
+    }
+    {
+      name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz";
+      path = fetchurl {
+        name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz";
+        sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651";
+      };
+    }
+    {
+      name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz";
+      path = fetchurl {
+        name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+      };
+    }
+    {
+      name = "json3___json3_3.3.3.tgz";
+      path = fetchurl {
+        name = "json3___json3_3.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz";
+        sha1 = "7fc10e375fc5ae42c4705a5cc0aa6f62be305b81";
+      };
+    }
+    {
+      name = "json5___json5_2.1.0.tgz";
+      path = fetchurl {
+        name = "json5___json5_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz";
+        sha1 = "e7a0c62c48285c628d20a10b85c89bb807c32850";
+      };
+    }
+    {
+      name = "json5___json5_0.5.1.tgz";
+      path = fetchurl {
+        name = "json5___json5_0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz";
+        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
+      };
+    }
+    {
+      name = "json5___json5_1.0.1.tgz";
+      path = fetchurl {
+        name = "json5___json5_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz";
+        sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe";
+      };
+    }
+    {
+      name = "json5___json5_2.1.3.tgz";
+      path = fetchurl {
+        name = "json5___json5_2.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz";
+        sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43";
+      };
+    }
+    {
+      name = "jsonfile___jsonfile_4.0.0.tgz";
+      path = fetchurl {
+        name = "jsonfile___jsonfile_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz";
+        sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
+      };
+    }
+    {
+      name = "jsonlint_mod___jsonlint_mod_1.7.5.tgz";
+      path = fetchurl {
+        name = "jsonlint_mod___jsonlint_mod_1.7.5.tgz";
+        url  = "https://registry.yarnpkg.com/jsonlint-mod/-/jsonlint-mod-1.7.5.tgz";
+        sha1 = "678d2b600b9d350ec3448373d6f71dcbf09a0e3d";
+      };
+    }
+    {
+      name = "jsprim___jsprim_1.4.1.tgz";
+      path = fetchurl {
+        name = "jsprim___jsprim_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz";
+        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
+      };
+    }
+    {
+      name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz";
+      path = fetchurl {
+        name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz";
+        sha1 = "8a9364e402448a3ce7f14d357738310d9248054f";
+      };
+    }
+    {
+      name = "junit_viewer___junit_viewer_4.11.1.tgz";
+      path = fetchurl {
+        name = "junit_viewer___junit_viewer_4.11.1.tgz";
+        url  = "https://registry.yarnpkg.com/junit-viewer/-/junit-viewer-4.11.1.tgz";
+        sha1 = "31f712789a92a815605fb12bc2be9f6b377c34f7";
+      };
+    }
+    {
+      name = "killable___killable_1.0.1.tgz";
+      path = fetchurl {
+        name = "killable___killable_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz";
+        sha1 = "4c8ce441187a061c7474fb87ca08e2a638194892";
+      };
+    }
+    {
+      name = "kind_of___kind_of_3.2.2.tgz";
+      path = fetchurl {
+        name = "kind_of___kind_of_3.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz";
+        sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64";
+      };
+    }
+    {
+      name = "kind_of___kind_of_4.0.0.tgz";
+      path = fetchurl {
+        name = "kind_of___kind_of_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz";
+        sha1 = "20813df3d712928b207378691a45066fae72dd57";
+      };
+    }
+    {
+      name = "kind_of___kind_of_5.1.0.tgz";
+      path = fetchurl {
+        name = "kind_of___kind_of_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz";
+        sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d";
+      };
+    }
+    {
+      name = "kind_of___kind_of_6.0.3.tgz";
+      path = fetchurl {
+        name = "kind_of___kind_of_6.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz";
+        sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd";
+      };
+    }
+    {
+      name = "kleur___kleur_3.0.3.tgz";
+      path = fetchurl {
+        name = "kleur___kleur_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz";
+        sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e";
+      };
+    }
+    {
+      name = "last_call_webpack_plugin___last_call_webpack_plugin_3.0.0.tgz";
+      path = fetchurl {
+        name = "last_call_webpack_plugin___last_call_webpack_plugin_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz";
+        sha1 = "9742df0e10e3cf46e5c0381c2de90d3a7a2d7555";
+      };
+    }
+    {
+      name = "lazy_ass___lazy_ass_1.6.0.tgz";
+      path = fetchurl {
+        name = "lazy_ass___lazy_ass_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz";
+        sha1 = "7999655e8646c17f089fdd187d150d3324d54513";
+      };
+    }
+    {
+      name = "lazy_cache___lazy_cache_1.0.4.tgz";
+      path = fetchurl {
+        name = "lazy_cache___lazy_cache_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz";
+        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+      };
+    }
+    {
+      name = "lcid___lcid_2.0.0.tgz";
+      path = fetchurl {
+        name = "lcid___lcid_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz";
+        sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf";
+      };
+    }
+    {
+      name = "left_pad___left_pad_1.3.0.tgz";
+      path = fetchurl {
+        name = "left_pad___left_pad_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz";
+        sha1 = "5b8a3a7765dfe001261dde915589e782f8c94d1e";
+      };
+    }
+    {
+      name = "leven___leven_2.1.0.tgz";
+      path = fetchurl {
+        name = "leven___leven_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz";
+        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
+      };
+    }
+    {
+      name = "leven___leven_3.1.0.tgz";
+      path = fetchurl {
+        name = "leven___leven_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz";
+        sha1 = "77891de834064cccba82ae7842bb6b14a13ed7f2";
+      };
+    }
+    {
+      name = "levn___levn_0.3.0.tgz";
+      path = fetchurl {
+        name = "levn___levn_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz";
+        sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
+      };
+    }
+    {
+      name = "listr_silent_renderer___listr_silent_renderer_1.1.1.tgz";
+      path = fetchurl {
+        name = "listr_silent_renderer___listr_silent_renderer_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz";
+        sha1 = "924b5a3757153770bf1a8e3fbf74b8bbf3f9242e";
+      };
+    }
+    {
+      name = "listr_update_renderer___listr_update_renderer_0.5.0.tgz";
+      path = fetchurl {
+        name = "listr_update_renderer___listr_update_renderer_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz";
+        sha1 = "4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2";
+      };
+    }
+    {
+      name = "listr_verbose_renderer___listr_verbose_renderer_0.5.0.tgz";
+      path = fetchurl {
+        name = "listr_verbose_renderer___listr_verbose_renderer_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz";
+        sha1 = "f1132167535ea4c1261102b9f28dac7cba1e03db";
+      };
+    }
+    {
+      name = "listr___listr_0.14.3.tgz";
+      path = fetchurl {
+        name = "listr___listr_0.14.3.tgz";
+        url  = "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz";
+        sha1 = "2fea909604e434be464c50bddba0d496928fa586";
+      };
+    }
+    {
+      name = "load_json_file___load_json_file_4.0.0.tgz";
+      path = fetchurl {
+        name = "load_json_file___load_json_file_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz";
+        sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b";
+      };
+    }
+    {
+      name = "loader_runner___loader_runner_2.4.0.tgz";
+      path = fetchurl {
+        name = "loader_runner___loader_runner_2.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz";
+        sha1 = "ed47066bfe534d7e84c4c7b9998c2a75607d9357";
+      };
+    }
+    {
+      name = "loader_utils___loader_utils_1.2.3.tgz";
+      path = fetchurl {
+        name = "loader_utils___loader_utils_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz";
+        sha1 = "1ff5dc6911c9f0a062531a4c04b609406108c2c7";
+      };
+    }
+    {
+      name = "loader_utils___loader_utils_0.2.17.tgz";
+      path = fetchurl {
+        name = "loader_utils___loader_utils_0.2.17.tgz";
+        url  = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz";
+        sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348";
+      };
+    }
+    {
+      name = "loader_utils___loader_utils_1.4.0.tgz";
+      path = fetchurl {
+        name = "loader_utils___loader_utils_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz";
+        sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613";
+      };
+    }
+    {
+      name = "loader_utils___loader_utils_2.0.0.tgz";
+      path = fetchurl {
+        name = "loader_utils___loader_utils_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz";
+        sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0";
+      };
+    }
+    {
+      name = "locate_path___locate_path_3.0.0.tgz";
+      path = fetchurl {
+        name = "locate_path___locate_path_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz";
+        sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e";
+      };
+    }
+    {
+      name = "locate_path___locate_path_5.0.0.tgz";
+      path = fetchurl {
+        name = "locate_path___locate_path_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz";
+        sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0";
+      };
+    }
+    {
+      name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz";
+      path = fetchurl {
+        name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz";
+        sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6";
+      };
+    }
+    {
+      name = "lodash.escape___lodash.escape_4.0.1.tgz";
+      path = fetchurl {
+        name = "lodash.escape___lodash.escape_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz";
+        sha1 = "c9044690c21e04294beaa517712fded1fa88de98";
+      };
+    }
+    {
+      name = "lodash.flattendeep___lodash.flattendeep_4.4.0.tgz";
+      path = fetchurl {
+        name = "lodash.flattendeep___lodash.flattendeep_4.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz";
+        sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2";
+      };
+    }
+    {
+      name = "lodash.get___lodash.get_4.4.2.tgz";
+      path = fetchurl {
+        name = "lodash.get___lodash.get_4.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz";
+        sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99";
+      };
+    }
+    {
+      name = "lodash.isempty___lodash.isempty_4.4.0.tgz";
+      path = fetchurl {
+        name = "lodash.isempty___lodash.isempty_4.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz";
+        sha1 = "6f86cbedd8be4ec987be9aaf33c9684db1b31e7e";
+      };
+    }
+    {
+      name = "lodash.isequal___lodash.isequal_4.5.0.tgz";
+      path = fetchurl {
+        name = "lodash.isequal___lodash.isequal_4.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
+        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
+      };
+    }
+    {
+      name = "lodash.memoize___lodash.memoize_4.1.2.tgz";
+      path = fetchurl {
+        name = "lodash.memoize___lodash.memoize_4.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz";
+        sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe";
+      };
+    }
+    {
+      name = "lodash.once___lodash.once_4.1.1.tgz";
+      path = fetchurl {
+        name = "lodash.once___lodash.once_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz";
+        sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac";
+      };
+    }
+    {
+      name = "lodash.sortby___lodash.sortby_4.7.0.tgz";
+      path = fetchurl {
+        name = "lodash.sortby___lodash.sortby_4.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz";
+        sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438";
+      };
+    }
+    {
+      name = "lodash.tail___lodash.tail_4.1.1.tgz";
+      path = fetchurl {
+        name = "lodash.tail___lodash.tail_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz";
+        sha1 = "d2333a36d9e7717c8ad2f7cacafec7c32b444664";
+      };
+    }
+    {
+      name = "lodash.unescape___lodash.unescape_4.0.1.tgz";
+      path = fetchurl {
+        name = "lodash.unescape___lodash.unescape_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz";
+        sha1 = "bf2249886ce514cda112fae9218cdc065211fc9c";
+      };
+    }
+    {
+      name = "lodash.uniq___lodash.uniq_4.5.0.tgz";
+      path = fetchurl {
+        name = "lodash.uniq___lodash.uniq_4.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz";
+        sha1 = "d0225373aeb652adc1bc82e4945339a842754773";
+      };
+    }
+    {
+      name = "lodash___lodash_4.17.11.tgz";
+      path = fetchurl {
+        name = "lodash___lodash_4.17.11.tgz";
+        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz";
+        sha1 = "b39ea6229ef607ecd89e2c8df12536891cac9b8d";
+      };
+    }
+    {
+      name = "lodash___lodash_4.17.15.tgz";
+      path = fetchurl {
+        name = "lodash___lodash_4.17.15.tgz";
+        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz";
+        sha1 = "b447f6670a0455bbfeedd11392eff330ea097548";
+      };
+    }
+    {
+      name = "lodash___lodash_4.17.19.tgz";
+      path = fetchurl {
+        name = "lodash___lodash_4.17.19.tgz";
+        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz";
+        sha1 = "e48ddedbe30b3321783c5b4301fbd353bc1e4a4b";
+      };
+    }
+    {
+      name = "log_symbols___log_symbols_1.0.2.tgz";
+      path = fetchurl {
+        name = "log_symbols___log_symbols_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz";
+        sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
+      };
+    }
+    {
+      name = "log_symbols___log_symbols_3.0.0.tgz";
+      path = fetchurl {
+        name = "log_symbols___log_symbols_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz";
+        sha1 = "f3a08516a5dea893336a7dee14d18a1cfdab77c4";
+      };
+    }
+    {
+      name = "log_update___log_update_2.3.0.tgz";
+      path = fetchurl {
+        name = "log_update___log_update_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz";
+        sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708";
+      };
+    }
+    {
+      name = "loglevel___loglevel_1.6.7.tgz";
+      path = fetchurl {
+        name = "loglevel___loglevel_1.6.7.tgz";
+        url  = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz";
+        sha1 = "b3e034233188c68b889f5b862415306f565e2c56";
+      };
+    }
+    {
+      name = "longest___longest_1.0.1.tgz";
+      path = fetchurl {
+        name = "longest___longest_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz";
+        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+      };
+    }
+    {
+      name = "loose_envify___loose_envify_1.4.0.tgz";
+      path = fetchurl {
+        name = "loose_envify___loose_envify_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz";
+        sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf";
+      };
+    }
+    {
+      name = "lower_case___lower_case_1.1.4.tgz";
+      path = fetchurl {
+        name = "lower_case___lower_case_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz";
+        sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac";
+      };
+    }
+    {
+      name = "lru_cache___lru_cache_5.1.1.tgz";
+      path = fetchurl {
+        name = "lru_cache___lru_cache_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz";
+        sha1 = "1da27e6710271947695daf6848e847f01d84b920";
+      };
+    }
+    {
+      name = "make_dir___make_dir_1.3.0.tgz";
+      path = fetchurl {
+        name = "make_dir___make_dir_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz";
+        sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c";
+      };
+    }
+    {
+      name = "make_dir___make_dir_2.1.0.tgz";
+      path = fetchurl {
+        name = "make_dir___make_dir_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz";
+        sha1 = "5f0310e18b8be898cc07009295a30ae41e91e6f5";
+      };
+    }
+    {
+      name = "make_dir___make_dir_3.0.0.tgz";
+      path = fetchurl {
+        name = "make_dir___make_dir_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz";
+        sha1 = "1b5f39f6b9270ed33f9f054c5c0f84304989f801";
+      };
+    }
+    {
+      name = "make_error___make_error_1.3.5.tgz";
+      path = fetchurl {
+        name = "make_error___make_error_1.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz";
+        sha1 = "efe4e81f6db28cadd605c70f29c831b58ef776c8";
+      };
+    }
+    {
+      name = "makeerror___makeerror_1.0.11.tgz";
+      path = fetchurl {
+        name = "makeerror___makeerror_1.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz";
+        sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c";
+      };
+    }
+    {
+      name = "mamacro___mamacro_0.0.3.tgz";
+      path = fetchurl {
+        name = "mamacro___mamacro_0.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz";
+        sha1 = "ad2c9576197c9f1abf308d0787865bd975a3f3e4";
+      };
+    }
+    {
+      name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz";
+      path = fetchurl {
+        name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
+        sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a";
+      };
+    }
+    {
+      name = "map_cache___map_cache_0.2.2.tgz";
+      path = fetchurl {
+        name = "map_cache___map_cache_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz";
+        sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf";
+      };
+    }
+    {
+      name = "map_visit___map_visit_1.0.0.tgz";
+      path = fetchurl {
+        name = "map_visit___map_visit_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz";
+        sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
+      };
+    }
+    {
+      name = "markdown_escapes___markdown_escapes_1.0.2.tgz";
+      path = fetchurl {
+        name = "markdown_escapes___markdown_escapes_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.2.tgz";
+        sha1 = "e639cbde7b99c841c0bacc8a07982873b46d2122";
+      };
+    }
+    {
+      name = "md5.js___md5.js_1.3.5.tgz";
+      path = fetchurl {
+        name = "md5.js___md5.js_1.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz";
+        sha1 = "b5d07b8e3216e3e27cd728d72f70d1e6a342005f";
+      };
+    }
+    {
+      name = "md5___md5_2.2.1.tgz";
+      path = fetchurl {
+        name = "md5___md5_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz";
+        sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9";
+      };
+    }
+    {
+      name = "mdast_add_list_metadata___mdast_add_list_metadata_1.0.1.tgz";
+      path = fetchurl {
+        name = "mdast_add_list_metadata___mdast_add_list_metadata_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/mdast-add-list-metadata/-/mdast-add-list-metadata-1.0.1.tgz";
+        sha1 = "95e73640ce2fc1fa2dcb7ec443d09e2bfe7db4cf";
+      };
+    }
+    {
+      name = "mdn_data___mdn_data_1.1.4.tgz";
+      path = fetchurl {
+        name = "mdn_data___mdn_data_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz";
+        sha1 = "50b5d4ffc4575276573c4eedb8780812a8419f01";
+      };
+    }
+    {
+      name = "media_typer___media_typer_0.3.0.tgz";
+      path = fetchurl {
+        name = "media_typer___media_typer_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz";
+        sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+      };
+    }
+    {
+      name = "mem___mem_4.3.0.tgz";
+      path = fetchurl {
+        name = "mem___mem_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz";
+        sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178";
+      };
+    }
+    {
+      name = "memoize_one___memoize_one_4.0.2.tgz";
+      path = fetchurl {
+        name = "memoize_one___memoize_one_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/memoize-one/-/memoize-one-4.0.2.tgz";
+        sha1 = "3fb8db695aa14ab9c0f1644e1585a8806adc1aee";
+      };
+    }
+    {
+      name = "memory_fs___memory_fs_0.4.1.tgz";
+      path = fetchurl {
+        name = "memory_fs___memory_fs_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz";
+        sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
+      };
+    }
+    {
+      name = "memory_fs___memory_fs_0.5.0.tgz";
+      path = fetchurl {
+        name = "memory_fs___memory_fs_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz";
+        sha1 = "324c01288b88652966d161db77838720845a8e3c";
+      };
+    }
+    {
+      name = "merge_descriptors___merge_descriptors_1.0.1.tgz";
+      path = fetchurl {
+        name = "merge_descriptors___merge_descriptors_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz";
+        sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
+      };
+    }
+    {
+      name = "merge_stream___merge_stream_1.0.1.tgz";
+      path = fetchurl {
+        name = "merge_stream___merge_stream_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz";
+        sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
+      };
+    }
+    {
+      name = "merge_stream___merge_stream_2.0.0.tgz";
+      path = fetchurl {
+        name = "merge_stream___merge_stream_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz";
+        sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60";
+      };
+    }
+    {
+      name = "methods___methods_1.1.2.tgz";
+      path = fetchurl {
+        name = "methods___methods_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz";
+        sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
+      };
+    }
+    {
+      name = "microevent.ts___microevent.ts_0.1.1.tgz";
+      path = fetchurl {
+        name = "microevent.ts___microevent.ts_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz";
+        sha1 = "70b09b83f43df5172d0205a63025bce0f7357fa0";
+      };
+    }
+    {
+      name = "micromatch___micromatch_3.1.10.tgz";
+      path = fetchurl {
+        name = "micromatch___micromatch_3.1.10.tgz";
+        url  = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz";
+        sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23";
+      };
+    }
+    {
+      name = "miller_rabin___miller_rabin_4.0.1.tgz";
+      path = fetchurl {
+        name = "miller_rabin___miller_rabin_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz";
+        sha1 = "f080351c865b0dc562a8462966daa53543c78a4d";
+      };
+    }
+    {
+      name = "mime_db___mime_db_1.40.0.tgz";
+      path = fetchurl {
+        name = "mime_db___mime_db_1.40.0.tgz";
+        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz";
+        sha1 = "a65057e998db090f732a68f6c276d387d4126c32";
+      };
+    }
+    {
+      name = "mime_db___mime_db_1.43.0.tgz";
+      path = fetchurl {
+        name = "mime_db___mime_db_1.43.0.tgz";
+        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz";
+        sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58";
+      };
+    }
+    {
+      name = "mime_types___mime_types_2.1.24.tgz";
+      path = fetchurl {
+        name = "mime_types___mime_types_2.1.24.tgz";
+        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz";
+        sha1 = "b6f8d0b3e951efb77dedeca194cff6d16f676f81";
+      };
+    }
+    {
+      name = "mime_types___mime_types_2.1.26.tgz";
+      path = fetchurl {
+        name = "mime_types___mime_types_2.1.26.tgz";
+        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz";
+        sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06";
+      };
+    }
+    {
+      name = "mime___mime_1.4.1.tgz";
+      path = fetchurl {
+        name = "mime___mime_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz";
+        sha1 = "121f9ebc49e3766f311a76e1fa1c8003c4b03aa6";
+      };
+    }
+    {
+      name = "mime___mime_1.6.0.tgz";
+      path = fetchurl {
+        name = "mime___mime_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz";
+        sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1";
+      };
+    }
+    {
+      name = "mime___mime_2.4.4.tgz";
+      path = fetchurl {
+        name = "mime___mime_2.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz";
+        sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5";
+      };
+    }
+    {
+      name = "mimic_fn___mimic_fn_1.2.0.tgz";
+      path = fetchurl {
+        name = "mimic_fn___mimic_fn_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz";
+        sha1 = "820c86a39334640e99516928bd03fca88057d022";
+      };
+    }
+    {
+      name = "mimic_fn___mimic_fn_2.1.0.tgz";
+      path = fetchurl {
+        name = "mimic_fn___mimic_fn_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz";
+        sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b";
+      };
+    }
+    {
+      name = "mini_create_react_context___mini_create_react_context_0.4.0.tgz";
+      path = fetchurl {
+        name = "mini_create_react_context___mini_create_react_context_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz";
+        sha1 = "df60501c83151db69e28eac0ef08b4002efab040";
+      };
+    }
+    {
+      name = "mini_css_extract_plugin___mini_css_extract_plugin_0.8.0.tgz";
+      path = fetchurl {
+        name = "mini_css_extract_plugin___mini_css_extract_plugin_0.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz";
+        sha1 = "81d41ec4fe58c713a96ad7c723cdb2d0bd4d70e1";
+      };
+    }
+    {
+      name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz";
+      path = fetchurl {
+        name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
+        sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7";
+      };
+    }
+    {
+      name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz";
+      path = fetchurl {
+        name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz";
+        sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a";
+      };
+    }
+    {
+      name = "minimatch___minimatch_3.0.4.tgz";
+      path = fetchurl {
+        name = "minimatch___minimatch_3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz";
+        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
+      };
+    }
+    {
+      name = "minimist___minimist_0.0.8.tgz";
+      path = fetchurl {
+        name = "minimist___minimist_0.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    }
+    {
+      name = "minimist___minimist_1.2.0.tgz";
+      path = fetchurl {
+        name = "minimist___minimist_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz";
+        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+      };
+    }
+    {
+      name = "minimist___minimist_1.2.5.tgz";
+      path = fetchurl {
+        name = "minimist___minimist_1.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz";
+        sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602";
+      };
+    }
+    {
+      name = "minimist___minimist_0.0.10.tgz";
+      path = fetchurl {
+        name = "minimist___minimist_0.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz";
+        sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
+      };
+    }
+    {
+      name = "minipass_collect___minipass_collect_1.0.2.tgz";
+      path = fetchurl {
+        name = "minipass_collect___minipass_collect_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz";
+        sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617";
+      };
+    }
+    {
+      name = "minipass_flush___minipass_flush_1.0.5.tgz";
+      path = fetchurl {
+        name = "minipass_flush___minipass_flush_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz";
+        sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373";
+      };
+    }
+    {
+      name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz";
+      path = fetchurl {
+        name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz";
+        sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a";
+      };
+    }
+    {
+      name = "minipass___minipass_3.1.1.tgz";
+      path = fetchurl {
+        name = "minipass___minipass_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz";
+        sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5";
+      };
+    }
+    {
+      name = "mississippi___mississippi_3.0.0.tgz";
+      path = fetchurl {
+        name = "mississippi___mississippi_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz";
+        sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022";
+      };
+    }
+    {
+      name = "mixin_deep___mixin_deep_1.3.2.tgz";
+      path = fetchurl {
+        name = "mixin_deep___mixin_deep_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz";
+        sha1 = "1120b43dc359a785dce65b55b82e257ccf479566";
+      };
+    }
+    {
+      name = "mixin_object___mixin_object_2.0.1.tgz";
+      path = fetchurl {
+        name = "mixin_object___mixin_object_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz";
+        sha1 = "4fb949441dab182540f1fe035ba60e1947a5e57e";
+      };
+    }
+    {
+      name = "mkdirp___mkdirp_0.5.1.tgz";
+      path = fetchurl {
+        name = "mkdirp___mkdirp_0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      };
+    }
+    {
+      name = "mkdirp___mkdirp_0.5.3.tgz";
+      path = fetchurl {
+        name = "mkdirp___mkdirp_0.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz";
+        sha1 = "5a514b7179259287952881e94410ec5465659f8c";
+      };
+    }
+    {
+      name = "mkdirp___mkdirp_0.5.5.tgz";
+      path = fetchurl {
+        name = "mkdirp___mkdirp_0.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz";
+        sha1 = "d91cefd62d1436ca0f41620e251288d420099def";
+      };
+    }
+    {
+      name = "mocha_junit_reporter___mocha_junit_reporter_1.18.0.tgz";
+      path = fetchurl {
+        name = "mocha_junit_reporter___mocha_junit_reporter_1.18.0.tgz";
+        url  = "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.18.0.tgz";
+        sha1 = "9209a3fba30025ae3ae5e6bfe7f9c5bc3c2e8ee2";
+      };
+    }
+    {
+      name = "mocha___mocha_5.2.0.tgz";
+      path = fetchurl {
+        name = "mocha___mocha_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz";
+        sha1 = "6d8ae508f59167f940f2b5b3c4a612ae50c90ae6";
+      };
+    }
+    {
+      name = "moment___moment_2.22.2.tgz";
+      path = fetchurl {
+        name = "moment___moment_2.22.2.tgz";
+        url  = "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz";
+        sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66";
+      };
+    }
+    {
+      name = "moment___moment_2.27.0.tgz";
+      path = fetchurl {
+        name = "moment___moment_2.27.0.tgz";
+        url  = "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz";
+        sha1 = "8bff4e3e26a236220dfe3e36de756b6ebaa0105d";
+      };
+    }
+    {
+      name = "monaco_editor_textmate___monaco_editor_textmate_2.2.1.tgz";
+      path = fetchurl {
+        name = "monaco_editor_textmate___monaco_editor_textmate_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-editor-textmate/-/monaco-editor-textmate-2.2.1.tgz";
+        sha1 = "93f3f1932061dd2311b92a42ea1c027cfeb3e439";
+      };
+    }
+    {
+      name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.8.2.tgz";
+      path = fetchurl {
+        name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.8.2.tgz";
+        sha1 = "3721b8d9a3e2e41b154cf2a2955a7d7246c03714";
+      };
+    }
+    {
+      name = "monaco_editor___monaco_editor_0.19.3.tgz";
+      path = fetchurl {
+        name = "monaco_editor___monaco_editor_0.19.3.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.19.3.tgz";
+        sha1 = "1c994b3186c00650dbcd034d5370d46bf56c0663";
+      };
+    }
+    {
+      name = "monaco_languageclient___monaco_languageclient_0.11.0.tgz";
+      path = fetchurl {
+        name = "monaco_languageclient___monaco_languageclient_0.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-languageclient/-/monaco-languageclient-0.11.0.tgz";
+        sha1 = "0968ec143c98bf2c9fa69c2a84ac9ad5448e039d";
+      };
+    }
+    {
+      name = "monaco_textmate___monaco_textmate_3.0.1.tgz";
+      path = fetchurl {
+        name = "monaco_textmate___monaco_textmate_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-textmate/-/monaco-textmate-3.0.1.tgz";
+        sha1 = "b6d26d266aa12edaff7069dae0d6e3747cba5cd7";
+      };
+    }
+    {
+      name = "moo___moo_0.4.3.tgz";
+      path = fetchurl {
+        name = "moo___moo_0.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz";
+        sha1 = "3f847a26f31cf625a956a87f2b10fbc013bfd10e";
+      };
+    }
+    {
+      name = "move_concurrently___move_concurrently_1.0.1.tgz";
+      path = fetchurl {
+        name = "move_concurrently___move_concurrently_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz";
+        sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
+      };
+    }
+    {
+      name = "ms___ms_2.0.0.tgz";
+      path = fetchurl {
+        name = "ms___ms_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+      };
+    }
+    {
+      name = "ms___ms_2.1.1.tgz";
+      path = fetchurl {
+        name = "ms___ms_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz";
+        sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a";
+      };
+    }
+    {
+      name = "ms___ms_2.1.2.tgz";
+      path = fetchurl {
+        name = "ms___ms_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz";
+        sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009";
+      };
+    }
+    {
+      name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz";
+      path = fetchurl {
+        name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz";
+        sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901";
+      };
+    }
+    {
+      name = "multicast_dns___multicast_dns_6.2.3.tgz";
+      path = fetchurl {
+        name = "multicast_dns___multicast_dns_6.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz";
+        sha1 = "a0ec7bd9055c4282f790c3c82f4e28db3b31b229";
+      };
+    }
+    {
+      name = "mustache___mustache_2.3.2.tgz";
+      path = fetchurl {
+        name = "mustache___mustache_2.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz";
+        sha1 = "a6d4d9c3f91d13359ab889a812954f9230a3d0c5";
+      };
+    }
+    {
+      name = "mutation_observer___mutation_observer_1.0.3.tgz";
+      path = fetchurl {
+        name = "mutation_observer___mutation_observer_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/mutation-observer/-/mutation-observer-1.0.3.tgz";
+        sha1 = "42e9222b101bca82e5ba9d5a7acf4a14c0f263d0";
+      };
+    }
+    {
+      name = "mute_stream___mute_stream_0.0.8.tgz";
+      path = fetchurl {
+        name = "mute_stream___mute_stream_0.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz";
+        sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d";
+      };
+    }
+    {
+      name = "nan___nan_2.14.0.tgz";
+      path = fetchurl {
+        name = "nan___nan_2.14.0.tgz";
+        url  = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz";
+        sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c";
+      };
+    }
+    {
+      name = "nanomatch___nanomatch_1.2.13.tgz";
+      path = fetchurl {
+        name = "nanomatch___nanomatch_1.2.13.tgz";
+        url  = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz";
+        sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119";
+      };
+    }
+    {
+      name = "natural_compare___natural_compare_1.4.0.tgz";
+      path = fetchurl {
+        name = "natural_compare___natural_compare_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz";
+        sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7";
+      };
+    }
+    {
+      name = "nearley___nearley_2.15.1.tgz";
+      path = fetchurl {
+        name = "nearley___nearley_2.15.1.tgz";
+        url  = "https://registry.yarnpkg.com/nearley/-/nearley-2.15.1.tgz";
+        sha1 = "965e4e6ec9ed6b80fc81453e161efbcebb36d247";
+      };
+    }
+    {
+      name = "negotiator___negotiator_0.6.2.tgz";
+      path = fetchurl {
+        name = "negotiator___negotiator_0.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz";
+        sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb";
+      };
+    }
+    {
+      name = "neo_async___neo_async_2.6.1.tgz";
+      path = fetchurl {
+        name = "neo_async___neo_async_2.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz";
+        sha1 = "ac27ada66167fa8849a6addd837f6b189ad2081c";
+      };
+    }
+    {
+      name = "nice_try___nice_try_1.0.5.tgz";
+      path = fetchurl {
+        name = "nice_try___nice_try_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz";
+        sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366";
+      };
+    }
+    {
+      name = "no_case___no_case_2.3.2.tgz";
+      path = fetchurl {
+        name = "no_case___no_case_2.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz";
+        sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac";
+      };
+    }
+    {
+      name = "node_fetch___node_fetch_2.6.0.tgz";
+      path = fetchurl {
+        name = "node_fetch___node_fetch_2.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz";
+        sha1 = "e633456386d4aa55863f676a7ab0daa8fdecb0fd";
+      };
+    }
+    {
+      name = "node_fetch___node_fetch_1.7.3.tgz";
+      path = fetchurl {
+        name = "node_fetch___node_fetch_1.7.3.tgz";
+        url  = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz";
+        sha1 = "980f6f72d85211a5347c6b2bc18c5b84c3eb47ef";
+      };
+    }
+    {
+      name = "node_forge___node_forge_0.9.0.tgz";
+      path = fetchurl {
+        name = "node_forge___node_forge_0.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz";
+        sha1 = "d624050edbb44874adca12bb9a52ec63cb782579";
+      };
+    }
+    {
+      name = "node_int64___node_int64_0.4.0.tgz";
+      path = fetchurl {
+        name = "node_int64___node_int64_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz";
+        sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b";
+      };
+    }
+    {
+      name = "node_libs_browser___node_libs_browser_2.2.1.tgz";
+      path = fetchurl {
+        name = "node_libs_browser___node_libs_browser_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz";
+        sha1 = "b64f513d18338625f90346d27b0d235e631f6425";
+      };
+    }
+    {
+      name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz";
+      path = fetchurl {
+        name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz";
+        sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40";
+      };
+    }
+    {
+      name = "node_notifier___node_notifier_5.4.0.tgz";
+      path = fetchurl {
+        name = "node_notifier___node_notifier_5.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.0.tgz";
+        sha1 = "7b455fdce9f7de0c63538297354f3db468426e6a";
+      };
+    }
+    {
+      name = "node_releases___node_releases_1.1.25.tgz";
+      path = fetchurl {
+        name = "node_releases___node_releases_1.1.25.tgz";
+        url  = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.25.tgz";
+        sha1 = "0c2d7dbc7fed30fbe02a9ee3007b8c90bf0133d3";
+      };
+    }
+    {
+      name = "node_releases___node_releases_1.1.3.tgz";
+      path = fetchurl {
+        name = "node_releases___node_releases_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.3.tgz";
+        sha1 = "aad9ce0dcb98129c753f772c0aa01360fb90fbd2";
+      };
+    }
+    {
+      name = "nomnom___nomnom_1.6.2.tgz";
+      path = fetchurl {
+        name = "nomnom___nomnom_1.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/nomnom/-/nomnom-1.6.2.tgz";
+        sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971";
+      };
+    }
+    {
+      name = "normalize_package_data___normalize_package_data_2.5.0.tgz";
+      path = fetchurl {
+        name = "normalize_package_data___normalize_package_data_2.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
+        sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8";
+      };
+    }
+    {
+      name = "normalize_path___normalize_path_2.1.1.tgz";
+      path = fetchurl {
+        name = "normalize_path___normalize_path_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz";
+        sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
+      };
+    }
+    {
+      name = "normalize_path___normalize_path_3.0.0.tgz";
+      path = fetchurl {
+        name = "normalize_path___normalize_path_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz";
+        sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65";
+      };
+    }
+    {
+      name = "normalize_range___normalize_range_0.1.2.tgz";
+      path = fetchurl {
+        name = "normalize_range___normalize_range_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz";
+        sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942";
+      };
+    }
+    {
+      name = "normalize_url___normalize_url_1.9.1.tgz";
+      path = fetchurl {
+        name = "normalize_url___normalize_url_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz";
+        sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c";
+      };
+    }
+    {
+      name = "normalize_url___normalize_url_3.3.0.tgz";
+      path = fetchurl {
+        name = "normalize_url___normalize_url_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz";
+        sha1 = "b2e1c4dc4f7c6d57743df733a4f5978d18650559";
+      };
+    }
+    {
+      name = "normalizr___normalizr_3.4.1.tgz";
+      path = fetchurl {
+        name = "normalizr___normalizr_3.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/normalizr/-/normalizr-3.4.1.tgz";
+        sha1 = "cf4f8ac7a4a0dd7fe504b77cbe9dd533cb3e45b5";
+      };
+    }
+    {
+      name = "npm_run_path___npm_run_path_2.0.2.tgz";
+      path = fetchurl {
+        name = "npm_run_path___npm_run_path_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz";
+        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+      };
+    }
+    {
+      name = "nth_check___nth_check_1.0.2.tgz";
+      path = fetchurl {
+        name = "nth_check___nth_check_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz";
+        sha1 = "b2bd295c37e3dd58a3bf0700376663ba4d9cf05c";
+      };
+    }
+    {
+      name = "nth_check___nth_check_1.0.1.tgz";
+      path = fetchurl {
+        name = "nth_check___nth_check_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz";
+        sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
+      };
+    }
+    {
+      name = "num2fraction___num2fraction_1.2.2.tgz";
+      path = fetchurl {
+        name = "num2fraction___num2fraction_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz";
+        sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede";
+      };
+    }
+    {
+      name = "number_is_nan___number_is_nan_1.0.1.tgz";
+      path = fetchurl {
+        name = "number_is_nan___number_is_nan_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+      };
+    }
+    {
+      name = "nwmatcher___nwmatcher_1.4.4.tgz";
+      path = fetchurl {
+        name = "nwmatcher___nwmatcher_1.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz";
+        sha1 = "2285631f34a95f0d0395cd900c96ed39b58f346e";
+      };
+    }
+    {
+      name = "nwsapi___nwsapi_2.1.4.tgz";
+      path = fetchurl {
+        name = "nwsapi___nwsapi_2.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz";
+        sha1 = "e006a878db23636f8e8a67d33ca0e4edf61a842f";
+      };
+    }
+    {
+      name = "oauth_sign___oauth_sign_0.9.0.tgz";
+      path = fetchurl {
+        name = "oauth_sign___oauth_sign_0.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz";
+        sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455";
+      };
+    }
+    {
+      name = "object_assign___object_assign_4.1.1.tgz";
+      path = fetchurl {
+        name = "object_assign___object_assign_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+      };
+    }
+    {
+      name = "object_copy___object_copy_0.1.0.tgz";
+      path = fetchurl {
+        name = "object_copy___object_copy_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz";
+        sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
+      };
+    }
+    {
+      name = "object_inspect___object_inspect_1.6.0.tgz";
+      path = fetchurl {
+        name = "object_inspect___object_inspect_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz";
+        sha1 = "c70b6cbf72f274aab4c34c0c82f5167bf82cf15b";
+      };
+    }
+    {
+      name = "object_inspect___object_inspect_1.7.0.tgz";
+      path = fetchurl {
+        name = "object_inspect___object_inspect_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz";
+        sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67";
+      };
+    }
+    {
+      name = "object_is___object_is_1.0.1.tgz";
+      path = fetchurl {
+        name = "object_is___object_is_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz";
+        sha1 = "0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6";
+      };
+    }
+    {
+      name = "object_keys___object_keys_1.0.12.tgz";
+      path = fetchurl {
+        name = "object_keys___object_keys_1.0.12.tgz";
+        url  = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz";
+        sha1 = "09c53855377575310cca62f55bb334abff7b3ed2";
+      };
+    }
+    {
+      name = "object_keys___object_keys_1.1.1.tgz";
+      path = fetchurl {
+        name = "object_keys___object_keys_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz";
+        sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e";
+      };
+    }
+    {
+      name = "object_visit___object_visit_1.0.1.tgz";
+      path = fetchurl {
+        name = "object_visit___object_visit_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz";
+        sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
+      };
+    }
+    {
+      name = "object.assign___object.assign_4.1.0.tgz";
+      path = fetchurl {
+        name = "object.assign___object.assign_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz";
+        sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da";
+      };
+    }
+    {
+      name = "object.entries___object.entries_1.0.4.tgz";
+      path = fetchurl {
+        name = "object.entries___object.entries_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz";
+        sha1 = "1bf9a4dd2288f5b33f3a993d257661f05d161a5f";
+      };
+    }
+    {
+      name = "object.entries___object.entries_1.1.0.tgz";
+      path = fetchurl {
+        name = "object.entries___object.entries_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz";
+        sha1 = "2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519";
+      };
+    }
+    {
+      name = "object.fromentries___object.fromentries_2.0.0.tgz";
+      path = fetchurl {
+        name = "object.fromentries___object.fromentries_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz";
+        sha1 = "49a543d92151f8277b3ac9600f1e930b189d30ab";
+      };
+    }
+    {
+      name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz";
+      path = fetchurl {
+        name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
+        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
+      };
+    }
+    {
+      name = "object.pick___object.pick_1.3.0.tgz";
+      path = fetchurl {
+        name = "object.pick___object.pick_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz";
+        sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747";
+      };
+    }
+    {
+      name = "object.values___object.values_1.0.4.tgz";
+      path = fetchurl {
+        name = "object.values___object.values_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz";
+        sha1 = "e524da09b4f66ff05df457546ec72ac99f13069a";
+      };
+    }
+    {
+      name = "object.values___object.values_1.1.0.tgz";
+      path = fetchurl {
+        name = "object.values___object.values_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz";
+        sha1 = "bf6810ef5da3e5325790eaaa2be213ea84624da9";
+      };
+    }
+    {
+      name = "obuf___obuf_1.1.2.tgz";
+      path = fetchurl {
+        name = "obuf___obuf_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz";
+        sha1 = "09bea3343d41859ebd446292d11c9d4db619084e";
+      };
+    }
+    {
+      name = "on_finished___on_finished_2.3.0.tgz";
+      path = fetchurl {
+        name = "on_finished___on_finished_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz";
+        sha1 = "20f1336481b083cd75337992a16971aa2d906947";
+      };
+    }
+    {
+      name = "on_headers___on_headers_1.0.2.tgz";
+      path = fetchurl {
+        name = "on_headers___on_headers_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz";
+        sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f";
+      };
+    }
+    {
+      name = "once___once_1.4.0.tgz";
+      path = fetchurl {
+        name = "once___once_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+      };
+    }
+    {
+      name = "onetime___onetime_1.1.0.tgz";
+      path = fetchurl {
+        name = "onetime___onetime_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz";
+        sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789";
+      };
+    }
+    {
+      name = "onetime___onetime_2.0.1.tgz";
+      path = fetchurl {
+        name = "onetime___onetime_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz";
+        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
+      };
+    }
+    {
+      name = "onetime___onetime_5.1.0.tgz";
+      path = fetchurl {
+        name = "onetime___onetime_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz";
+        sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5";
+      };
+    }
+    {
+      name = "onigasm___onigasm_2.2.4.tgz";
+      path = fetchurl {
+        name = "onigasm___onigasm_2.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/onigasm/-/onigasm-2.2.4.tgz";
+        sha1 = "b0ad97e3d7c3080476a1e5daae4b4579a976cbba";
+      };
+    }
+    {
+      name = "ono___ono_5.0.1.tgz";
+      path = fetchurl {
+        name = "ono___ono_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/ono/-/ono-5.0.1.tgz";
+        sha1 = "a39e0af7ab2c2a143a06f08ad9d187e61f9da0c8";
+      };
+    }
+    {
+      name = "openapi_schemas___openapi_schemas_1.0.0.tgz";
+      path = fetchurl {
+        name = "openapi_schemas___openapi_schemas_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/openapi-schemas/-/openapi-schemas-1.0.0.tgz";
+        sha1 = "c23ae0ae990d867a608e06265cb1ba8c73136a8e";
+      };
+    }
+    {
+      name = "openapi_types___openapi_types_1.3.5.tgz";
+      path = fetchurl {
+        name = "openapi_types___openapi_types_1.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/openapi-types/-/openapi-types-1.3.5.tgz";
+        sha1 = "6718cfbc857fe6c6f1471f65b32bdebb9c10ce40";
+      };
+    }
+    {
+      name = "opener___opener_1.5.1.tgz";
+      path = fetchurl {
+        name = "opener___opener_1.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz";
+        sha1 = "6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed";
+      };
+    }
+    {
+      name = "opn___opn_5.5.0.tgz";
+      path = fetchurl {
+        name = "opn___opn_5.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz";
+        sha1 = "fc7164fab56d235904c51c3b27da6758ca3b9bfc";
+      };
+    }
+    {
+      name = "optimist___optimist_0.6.1.tgz";
+      path = fetchurl {
+        name = "optimist___optimist_0.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz";
+        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
+      };
+    }
+    {
+      name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz";
+      path = fetchurl {
+        name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz";
+        sha1 = "e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572";
+      };
+    }
+    {
+      name = "optionator___optionator_0.8.2.tgz";
+      path = fetchurl {
+        name = "optionator___optionator_0.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz";
+        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
+      };
+    }
+    {
+      name = "original___original_1.0.2.tgz";
+      path = fetchurl {
+        name = "original___original_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz";
+        sha1 = "e442a61cffe1c5fd20a65f3261c26663b303f25f";
+      };
+    }
+    {
+      name = "os_browserify___os_browserify_0.3.0.tgz";
+      path = fetchurl {
+        name = "os_browserify___os_browserify_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz";
+        sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27";
+      };
+    }
+    {
+      name = "os_locale___os_locale_3.1.0.tgz";
+      path = fetchurl {
+        name = "os_locale___os_locale_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz";
+        sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a";
+      };
+    }
+    {
+      name = "os_tmpdir___os_tmpdir_1.0.2.tgz";
+      path = fetchurl {
+        name = "os_tmpdir___os_tmpdir_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+      };
+    }
+    {
+      name = "ospath___ospath_1.2.2.tgz";
+      path = fetchurl {
+        name = "ospath___ospath_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz";
+        sha1 = "1276639774a3f8ef2572f7fe4280e0ea4550c07b";
+      };
+    }
+    {
+      name = "p_defer___p_defer_1.0.0.tgz";
+      path = fetchurl {
+        name = "p_defer___p_defer_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz";
+        sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
+      };
+    }
+    {
+      name = "p_each_series___p_each_series_1.0.0.tgz";
+      path = fetchurl {
+        name = "p_each_series___p_each_series_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz";
+        sha1 = "930f3d12dd1f50e7434457a22cd6f04ac6ad7f71";
+      };
+    }
+    {
+      name = "p_finally___p_finally_1.0.0.tgz";
+      path = fetchurl {
+        name = "p_finally___p_finally_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz";
+        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+      };
+    }
+    {
+      name = "p_is_promise___p_is_promise_2.1.0.tgz";
+      path = fetchurl {
+        name = "p_is_promise___p_is_promise_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz";
+        sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e";
+      };
+    }
+    {
+      name = "p_limit___p_limit_2.2.2.tgz";
+      path = fetchurl {
+        name = "p_limit___p_limit_2.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz";
+        sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e";
+      };
+    }
+    {
+      name = "p_limit___p_limit_2.2.1.tgz";
+      path = fetchurl {
+        name = "p_limit___p_limit_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz";
+        sha1 = "aa07a788cc3151c939b5131f63570f0dd2009537";
+      };
+    }
+    {
+      name = "p_locate___p_locate_3.0.0.tgz";
+      path = fetchurl {
+        name = "p_locate___p_locate_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz";
+        sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4";
+      };
+    }
+    {
+      name = "p_locate___p_locate_4.1.0.tgz";
+      path = fetchurl {
+        name = "p_locate___p_locate_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz";
+        sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07";
+      };
+    }
+    {
+      name = "p_map___p_map_2.1.0.tgz";
+      path = fetchurl {
+        name = "p_map___p_map_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz";
+        sha1 = "310928feef9c9ecc65b68b17693018a665cea175";
+      };
+    }
+    {
+      name = "p_map___p_map_3.0.0.tgz";
+      path = fetchurl {
+        name = "p_map___p_map_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz";
+        sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d";
+      };
+    }
+    {
+      name = "p_reduce___p_reduce_1.0.0.tgz";
+      path = fetchurl {
+        name = "p_reduce___p_reduce_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz";
+        sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa";
+      };
+    }
+    {
+      name = "p_retry___p_retry_3.0.1.tgz";
+      path = fetchurl {
+        name = "p_retry___p_retry_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz";
+        sha1 = "316b4c8893e2c8dc1cfa891f406c4b422bebf328";
+      };
+    }
+    {
+      name = "p_try___p_try_2.2.0.tgz";
+      path = fetchurl {
+        name = "p_try___p_try_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz";
+        sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6";
+      };
+    }
+    {
+      name = "pako___pako_1.0.11.tgz";
+      path = fetchurl {
+        name = "pako___pako_1.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz";
+        sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf";
+      };
+    }
+    {
+      name = "papaparse___papaparse_5.2.0.tgz";
+      path = fetchurl {
+        name = "papaparse___papaparse_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/papaparse/-/papaparse-5.2.0.tgz";
+        sha1 = "97976a1b135c46612773029153dc64995caa3b7b";
+      };
+    }
+    {
+      name = "parallel_transform___parallel_transform_1.2.0.tgz";
+      path = fetchurl {
+        name = "parallel_transform___parallel_transform_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz";
+        sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc";
+      };
+    }
+    {
+      name = "param_case___param_case_2.1.1.tgz";
+      path = fetchurl {
+        name = "param_case___param_case_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz";
+        sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
+      };
+    }
+    {
+      name = "parent_module___parent_module_1.0.0.tgz";
+      path = fetchurl {
+        name = "parent_module___parent_module_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz";
+        sha1 = "df250bdc5391f4a085fb589dad761f5ad6b865b5";
+      };
+    }
+    {
+      name = "parse_asn1___parse_asn1_5.1.5.tgz";
+      path = fetchurl {
+        name = "parse_asn1___parse_asn1_5.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz";
+        sha1 = "003271343da58dc94cace494faef3d2147ecea0e";
+      };
+    }
+    {
+      name = "parse_entities___parse_entities_1.2.0.tgz";
+      path = fetchurl {
+        name = "parse_entities___parse_entities_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.0.tgz";
+        sha1 = "9deac087661b2e36814153cb78d7e54a4c5fd6f4";
+      };
+    }
+    {
+      name = "parse_json___parse_json_4.0.0.tgz";
+      path = fetchurl {
+        name = "parse_json___parse_json_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz";
+        sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
+      };
+    }
+    {
+      name = "parse_passwd___parse_passwd_1.0.0.tgz";
+      path = fetchurl {
+        name = "parse_passwd___parse_passwd_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz";
+        sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
+      };
+    }
+    {
+      name = "parse5___parse5_4.0.0.tgz";
+      path = fetchurl {
+        name = "parse5___parse5_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz";
+        sha1 = "6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608";
+      };
+    }
+    {
+      name = "parse5___parse5_1.5.1.tgz";
+      path = fetchurl {
+        name = "parse5___parse5_1.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz";
+        sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
+      };
+    }
+    {
+      name = "parse5___parse5_3.0.3.tgz";
+      path = fetchurl {
+        name = "parse5___parse5_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz";
+        sha1 = "042f792ffdd36851551cf4e9e066b3874ab45b5c";
+      };
+    }
+    {
+      name = "parseurl___parseurl_1.3.3.tgz";
+      path = fetchurl {
+        name = "parseurl___parseurl_1.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz";
+        sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4";
+      };
+    }
+    {
+      name = "pascalcase___pascalcase_0.1.1.tgz";
+      path = fetchurl {
+        name = "pascalcase___pascalcase_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz";
+        sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14";
+      };
+    }
+    {
+      name = "path_browserify___path_browserify_0.0.1.tgz";
+      path = fetchurl {
+        name = "path_browserify___path_browserify_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz";
+        sha1 = "e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a";
+      };
+    }
+    {
+      name = "path_dirname___path_dirname_1.0.2.tgz";
+      path = fetchurl {
+        name = "path_dirname___path_dirname_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz";
+        sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
+      };
+    }
+    {
+      name = "path_exists___path_exists_3.0.0.tgz";
+      path = fetchurl {
+        name = "path_exists___path_exists_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz";
+        sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
+      };
+    }
+    {
+      name = "path_exists___path_exists_4.0.0.tgz";
+      path = fetchurl {
+        name = "path_exists___path_exists_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz";
+        sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3";
+      };
+    }
+    {
+      name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
+      path = fetchurl {
+        name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    }
+    {
+      name = "path_is_inside___path_is_inside_1.0.2.tgz";
+      path = fetchurl {
+        name = "path_is_inside___path_is_inside_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz";
+        sha1 = "365417dede44430d1c11af61027facf074bdfc53";
+      };
+    }
+    {
+      name = "path_key___path_key_2.0.1.tgz";
+      path = fetchurl {
+        name = "path_key___path_key_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz";
+        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
+      };
+    }
+    {
+      name = "path_parse___path_parse_1.0.6.tgz";
+      path = fetchurl {
+        name = "path_parse___path_parse_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz";
+        sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c";
+      };
+    }
+    {
+      name = "path_to_regexp___path_to_regexp_0.1.7.tgz";
+      path = fetchurl {
+        name = "path_to_regexp___path_to_regexp_0.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz";
+        sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
+      };
+    }
+    {
+      name = "path_to_regexp___path_to_regexp_1.8.0.tgz";
+      path = fetchurl {
+        name = "path_to_regexp___path_to_regexp_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz";
+        sha1 = "887b3ba9d84393e87a0a0b9f4cb756198b53548a";
+      };
+    }
+    {
+      name = "path_type___path_type_3.0.0.tgz";
+      path = fetchurl {
+        name = "path_type___path_type_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz";
+        sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f";
+      };
+    }
+    {
+      name = "pbkdf2___pbkdf2_3.0.17.tgz";
+      path = fetchurl {
+        name = "pbkdf2___pbkdf2_3.0.17.tgz";
+        url  = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz";
+        sha1 = "976c206530617b14ebb32114239f7b09336e93a6";
+      };
+    }
+    {
+      name = "pend___pend_1.2.0.tgz";
+      path = fetchurl {
+        name = "pend___pend_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz";
+        sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
+      };
+    }
+    {
+      name = "performance_now___performance_now_2.1.0.tgz";
+      path = fetchurl {
+        name = "performance_now___performance_now_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz";
+        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
+      };
+    }
+    {
+      name = "picomatch___picomatch_2.0.7.tgz";
+      path = fetchurl {
+        name = "picomatch___picomatch_2.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz";
+        sha1 = "514169d8c7cd0bdbeecc8a2609e34a7163de69f6";
+      };
+    }
+    {
+      name = "pify___pify_2.3.0.tgz";
+      path = fetchurl {
+        name = "pify___pify_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz";
+        sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
+      };
+    }
+    {
+      name = "pify___pify_3.0.0.tgz";
+      path = fetchurl {
+        name = "pify___pify_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz";
+        sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
+      };
+    }
+    {
+      name = "pify___pify_4.0.1.tgz";
+      path = fetchurl {
+        name = "pify___pify_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz";
+        sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231";
+      };
+    }
+    {
+      name = "pinkie_promise___pinkie_promise_2.0.1.tgz";
+      path = fetchurl {
+        name = "pinkie_promise___pinkie_promise_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+      };
+    }
+    {
+      name = "pinkie___pinkie_2.0.4.tgz";
+      path = fetchurl {
+        name = "pinkie___pinkie_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz";
+        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+      };
+    }
+    {
+      name = "pirates___pirates_4.0.1.tgz";
+      path = fetchurl {
+        name = "pirates___pirates_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz";
+        sha1 = "643a92caf894566f91b2b986d2c66950a8e2fb87";
+      };
+    }
+    {
+      name = "pkg_dir___pkg_dir_3.0.0.tgz";
+      path = fetchurl {
+        name = "pkg_dir___pkg_dir_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz";
+        sha1 = "2749020f239ed990881b1f71210d51eb6523bea3";
+      };
+    }
+    {
+      name = "pkg_dir___pkg_dir_4.2.0.tgz";
+      path = fetchurl {
+        name = "pkg_dir___pkg_dir_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz";
+        sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3";
+      };
+    }
+    {
+      name = "platform___platform_1.3.3.tgz";
+      path = fetchurl {
+        name = "platform___platform_1.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/platform/-/platform-1.3.3.tgz";
+        sha1 = "646c77011899870b6a0903e75e997e8e51da7461";
+      };
+    }
+    {
+      name = "pn___pn_1.1.0.tgz";
+      path = fetchurl {
+        name = "pn___pn_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz";
+        sha1 = "e2f4cef0e219f463c179ab37463e4e1ecdccbafb";
+      };
+    }
+    {
+      name = "popper.js___popper.js_1.15.0.tgz";
+      path = fetchurl {
+        name = "popper.js___popper.js_1.15.0.tgz";
+        url  = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz";
+        sha1 = "5560b99bbad7647e9faa475c6b8056621f5a4ff2";
+      };
+    }
+    {
+      name = "popper.js___popper.js_1.14.7.tgz";
+      path = fetchurl {
+        name = "popper.js___popper.js_1.14.7.tgz";
+        url  = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz";
+        sha1 = "e31ec06cfac6a97a53280c3e55e4e0c860e7738e";
+      };
+    }
+    {
+      name = "portfinder___portfinder_1.0.25.tgz";
+      path = fetchurl {
+        name = "portfinder___portfinder_1.0.25.tgz";
+        url  = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz";
+        sha1 = "254fd337ffba869f4b9d37edc298059cb4d35eca";
+      };
+    }
+    {
+      name = "posix_character_classes___posix_character_classes_0.1.1.tgz";
+      path = fetchurl {
+        name = "posix_character_classes___posix_character_classes_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz";
+        sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab";
+      };
+    }
+    {
+      name = "postcss_calc___postcss_calc_7.0.1.tgz";
+      path = fetchurl {
+        name = "postcss_calc___postcss_calc_7.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz";
+        sha1 = "36d77bab023b0ecbb9789d84dcb23c4941145436";
+      };
+    }
+    {
+      name = "postcss_colormin___postcss_colormin_4.0.3.tgz";
+      path = fetchurl {
+        name = "postcss_colormin___postcss_colormin_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz";
+        sha1 = "ae060bce93ed794ac71264f08132d550956bd381";
+      };
+    }
+    {
+      name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz";
+      path = fetchurl {
+        name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz";
+        sha1 = "ca3813ed4da0f812f9d43703584e449ebe189a7f";
+      };
+    }
+    {
+      name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz";
+        sha1 = "1fbabd2c246bff6aaad7997b2b0918f4d7af4033";
+      };
+    }
+    {
+      name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz";
+        sha1 = "3fe133cd3c82282e550fc9b239176a9207b784eb";
+      };
+    }
+    {
+      name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz";
+      path = fetchurl {
+        name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz";
+        sha1 = "c8c951e9f73ed9428019458444a02ad90bb9f765";
+      };
+    }
+    {
+      name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz";
+      path = fetchurl {
+        name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz";
+        sha1 = "652aef8a96726f029f5e3e00146ee7a4e755ff57";
+      };
+    }
+    {
+      name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz";
+      path = fetchurl {
+        name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz";
+        sha1 = "62f49a13e4a0ee04e7b98f42bb16062ca2549e24";
+      };
+    }
+    {
+      name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz";
+      path = fetchurl {
+        name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz";
+        sha1 = "362bea4ff5a1f98e4075a713c6cb25aefef9a650";
+      };
+    }
+    {
+      name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz";
+        sha1 = "cd4c344cce474343fac5d82206ab2cbcb8afd5a6";
+      };
+    }
+    {
+      name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz";
+        sha1 = "93b29c2ff5099c535eecda56c4aa6e665a663471";
+      };
+    }
+    {
+      name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz";
+        sha1 = "6b9cef030c11e35261f95f618c90036d680db874";
+      };
+    }
+    {
+      name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz";
+        sha1 = "e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8";
+      };
+    }
+    {
+      name = "postcss_modules_extract_imports___postcss_modules_extract_imports_2.0.0.tgz";
+      path = fetchurl {
+        name = "postcss_modules_extract_imports___postcss_modules_extract_imports_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz";
+        sha1 = "818719a1ae1da325f9832446b01136eeb493cd7e";
+      };
+    }
+    {
+      name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz";
+        sha1 = "e8a6561be914aaf3c052876377524ca90dbb7915";
+      };
+    }
+    {
+      name = "postcss_modules_scope___postcss_modules_scope_2.1.0.tgz";
+      path = fetchurl {
+        name = "postcss_modules_scope___postcss_modules_scope_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz";
+        sha1 = "ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb";
+      };
+    }
+    {
+      name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz";
+      path = fetchurl {
+        name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz";
+        sha1 = "5b5000d6ebae29b4255301b4a3a54574423e7f10";
+      };
+    }
+    {
+      name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz";
+      path = fetchurl {
+        name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz";
+        sha1 = "8b35add3aee83a136b0471e0d59be58a50285dd4";
+      };
+    }
+    {
+      name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz";
+        sha1 = "0dbe04a4ce9063d4667ed2be476bb830c825935a";
+      };
+    }
+    {
+      name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz";
+        sha1 = "05f757f84f260437378368a91f8932d4b102917f";
+      };
+    }
+    {
+      name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz";
+        sha1 = "c4ebbc289f3991a028d44751cbdd11918b17910c";
+      };
+    }
+    {
+      name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz";
+        sha1 = "cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c";
+      };
+    }
+    {
+      name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz";
+        sha1 = "8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9";
+      };
+    }
+    {
+      name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz";
+      path = fetchurl {
+        name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz";
+        sha1 = "841bd48fdcf3019ad4baa7493a3d363b52ae1cfb";
+      };
+    }
+    {
+      name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz";
+      path = fetchurl {
+        name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz";
+        sha1 = "10e437f86bc7c7e58f7b9652ed878daaa95faae1";
+      };
+    }
+    {
+      name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz";
+        sha1 = "bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82";
+      };
+    }
+    {
+      name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz";
+      path = fetchurl {
+        name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz";
+        sha1 = "0cf75c820ec7d5c4d280189559e0b571ebac0eee";
+      };
+    }
+    {
+      name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz";
+      path = fetchurl {
+        name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz";
+        sha1 = "7fd42ebea5e9c814609639e2c2e84ae270ba48df";
+      };
+    }
+    {
+      name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz";
+        sha1 = "17efa405eacc6e07be3414a5ca2d1074681d4e29";
+      };
+    }
+    {
+      name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz";
+      path = fetchurl {
+        name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz";
+        sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865";
+      };
+    }
+    {
+      name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz";
+      path = fetchurl {
+        name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz";
+        sha1 = "249044356697b33b64f1a8f7c80922dddee7195c";
+      };
+    }
+    {
+      name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz";
+        sha1 = "934cf799d016c83411859e09dcecade01286ec5c";
+      };
+    }
+    {
+      name = "postcss_svgo___postcss_svgo_4.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_svgo___postcss_svgo_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz";
+        sha1 = "17b997bc711b333bab143aaed3b8d3d6e3d38258";
+      };
+    }
+    {
+      name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz";
+      path = fetchurl {
+        name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz";
+        sha1 = "9446911f3289bfd64c6d680f073c03b1f9ee4bac";
+      };
+    }
+    {
+      name = "postcss_value_parser___postcss_value_parser_3.3.0.tgz";
+      path = fetchurl {
+        name = "postcss_value_parser___postcss_value_parser_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz";
+        sha1 = "87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15";
+      };
+    }
+    {
+      name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz";
+      path = fetchurl {
+        name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz";
+        sha1 = "9ff822547e2893213cf1c30efa51ac5fd1ba8281";
+      };
+    }
+    {
+      name = "postcss_value_parser___postcss_value_parser_4.0.0.tgz";
+      path = fetchurl {
+        name = "postcss_value_parser___postcss_value_parser_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz";
+        sha1 = "99a983d365f7b2ad8d0f9b8c3094926eab4b936d";
+      };
+    }
+    {
+      name = "postcss___postcss_5.2.18.tgz";
+      path = fetchurl {
+        name = "postcss___postcss_5.2.18.tgz";
+        url  = "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz";
+        sha1 = "badfa1497d46244f6390f58b319830d9107853c5";
+      };
+    }
+    {
+      name = "postcss___postcss_7.0.16.tgz";
+      path = fetchurl {
+        name = "postcss___postcss_7.0.16.tgz";
+        url  = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz";
+        sha1 = "48f64f1b4b558cb8b52c88987724359acb010da2";
+      };
+    }
+    {
+      name = "postcss___postcss_7.0.17.tgz";
+      path = fetchurl {
+        name = "postcss___postcss_7.0.17.tgz";
+        url  = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz";
+        sha1 = "4da1bdff5322d4a0acaab4d87f3e782436bad31f";
+      };
+    }
+    {
+      name = "prefix_style___prefix_style_2.0.1.tgz";
+      path = fetchurl {
+        name = "prefix_style___prefix_style_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/prefix-style/-/prefix-style-2.0.1.tgz";
+        sha1 = "66bba9a870cfda308a5dc20e85e9120932c95a06";
+      };
+    }
+    {
+      name = "prelude_ls___prelude_ls_1.1.2.tgz";
+      path = fetchurl {
+        name = "prelude_ls___prelude_ls_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz";
+        sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
+      };
+    }
+    {
+      name = "prepend_http___prepend_http_1.0.4.tgz";
+      path = fetchurl {
+        name = "prepend_http___prepend_http_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz";
+        sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
+      };
+    }
+    {
+      name = "prettier___prettier_1.19.1.tgz";
+      path = fetchurl {
+        name = "prettier___prettier_1.19.1.tgz";
+        url  = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz";
+        sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb";
+      };
+    }
+    {
+      name = "pretty_bytes___pretty_bytes_5.3.0.tgz";
+      path = fetchurl {
+        name = "pretty_bytes___pretty_bytes_5.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz";
+        sha1 = "f2849e27db79fb4d6cfe24764fc4134f165989f2";
+      };
+    }
+    {
+      name = "pretty_error___pretty_error_2.1.1.tgz";
+      path = fetchurl {
+        name = "pretty_error___pretty_error_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz";
+        sha1 = "5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3";
+      };
+    }
+    {
+      name = "pretty_format___pretty_format_24.8.0.tgz";
+      path = fetchurl {
+        name = "pretty_format___pretty_format_24.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz";
+        sha1 = "8dae7044f58db7cb8be245383b565a963e3c27f2";
+      };
+    }
+    {
+      name = "pretty_format___pretty_format_24.9.0.tgz";
+      path = fetchurl {
+        name = "pretty_format___pretty_format_24.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz";
+        sha1 = "12fac31b37019a4eea3c11aa9a959eb7628aa7c9";
+      };
+    }
+    {
+      name = "pretty_format___pretty_format_25.5.0.tgz";
+      path = fetchurl {
+        name = "pretty_format___pretty_format_25.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz";
+        sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a";
+      };
+    }
+    {
+      name = "private___private_0.1.8.tgz";
+      path = fetchurl {
+        name = "private___private_0.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz";
+        sha1 = "2381edb3689f7a53d653190060fcf822d2f368ff";
+      };
+    }
+    {
+      name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+      path = fetchurl {
+        name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
+        sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2";
+      };
+    }
+    {
+      name = "process___process_0.11.10.tgz";
+      path = fetchurl {
+        name = "process___process_0.11.10.tgz";
+        url  = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz";
+        sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182";
+      };
+    }
+    {
+      name = "progress___progress_2.0.3.tgz";
+      path = fetchurl {
+        name = "progress___progress_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz";
+        sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8";
+      };
+    }
+    {
+      name = "promise_inflight___promise_inflight_1.0.1.tgz";
+      path = fetchurl {
+        name = "promise_inflight___promise_inflight_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz";
+        sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
+      };
+    }
+    {
+      name = "promise_polyfill___promise_polyfill_8.1.3.tgz";
+      path = fetchurl {
+        name = "promise_polyfill___promise_polyfill_8.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz";
+        sha1 = "8c99b3cf53f3a91c68226ffde7bde81d7f904116";
+      };
+    }
+    {
+      name = "promise___promise_7.3.1.tgz";
+      path = fetchurl {
+        name = "promise___promise_7.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz";
+        sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf";
+      };
+    }
+    {
+      name = "prompts___prompts_2.1.0.tgz";
+      path = fetchurl {
+        name = "prompts___prompts_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/prompts/-/prompts-2.1.0.tgz";
+        sha1 = "bf90bc71f6065d255ea2bdc0fe6520485c1b45db";
+      };
+    }
+    {
+      name = "prop_types___prop_types_15.5.8.tgz";
+      path = fetchurl {
+        name = "prop_types___prop_types_15.5.8.tgz";
+        url  = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz";
+        sha1 = "6b7b2e141083be38c8595aa51fc55775c7199394";
+      };
+    }
+    {
+      name = "prop_types___prop_types_15.6.2.tgz";
+      path = fetchurl {
+        name = "prop_types___prop_types_15.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz";
+        sha1 = "05d5ca77b4453e985d60fc7ff8c859094a497102";
+      };
+    }
+    {
+      name = "prop_types___prop_types_15.7.2.tgz";
+      path = fetchurl {
+        name = "prop_types___prop_types_15.7.2.tgz";
+        url  = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz";
+        sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5";
+      };
+    }
+    {
+      name = "proxy_addr___proxy_addr_2.0.4.tgz";
+      path = fetchurl {
+        name = "proxy_addr___proxy_addr_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz";
+        sha1 = "ecfc733bf22ff8c6f407fa275327b9ab67e48b93";
+      };
+    }
+    {
+      name = "proxy_addr___proxy_addr_2.0.6.tgz";
+      path = fetchurl {
+        name = "proxy_addr___proxy_addr_2.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz";
+        sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf";
+      };
+    }
+    {
+      name = "prr___prr_1.0.1.tgz";
+      path = fetchurl {
+        name = "prr___prr_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz";
+        sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476";
+      };
+    }
+    {
+      name = "psl___psl_1.2.0.tgz";
+      path = fetchurl {
+        name = "psl___psl_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/psl/-/psl-1.2.0.tgz";
+        sha1 = "df12b5b1b3a30f51c329eacbdef98f3a6e136dc6";
+      };
+    }
+    {
+      name = "public_encrypt___public_encrypt_4.0.3.tgz";
+      path = fetchurl {
+        name = "public_encrypt___public_encrypt_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz";
+        sha1 = "4fcc9d77a07e48ba7527e7cbe0de33d0701331e0";
+      };
+    }
+    {
+      name = "pump___pump_2.0.1.tgz";
+      path = fetchurl {
+        name = "pump___pump_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz";
+        sha1 = "12399add6e4cf7526d973cbc8b5ce2e2908b3909";
+      };
+    }
+    {
+      name = "pump___pump_3.0.0.tgz";
+      path = fetchurl {
+        name = "pump___pump_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz";
+        sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64";
+      };
+    }
+    {
+      name = "pumpify___pumpify_1.5.1.tgz";
+      path = fetchurl {
+        name = "pumpify___pumpify_1.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz";
+        sha1 = "36513be246ab27570b1a374a5ce278bfd74370ce";
+      };
+    }
+    {
+      name = "punycode___punycode_1.3.2.tgz";
+      path = fetchurl {
+        name = "punycode___punycode_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz";
+        sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
+      };
+    }
+    {
+      name = "punycode___punycode_1.4.1.tgz";
+      path = fetchurl {
+        name = "punycode___punycode_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    }
+    {
+      name = "punycode___punycode_2.1.1.tgz";
+      path = fetchurl {
+        name = "punycode___punycode_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz";
+        sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec";
+      };
+    }
+    {
+      name = "q___q_1.5.1.tgz";
+      path = fetchurl {
+        name = "q___q_1.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz";
+        sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7";
+      };
+    }
+    {
+      name = "qs___qs_6.5.1.tgz";
+      path = fetchurl {
+        name = "qs___qs_6.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz";
+        sha1 = "349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8";
+      };
+    }
+    {
+      name = "qs___qs_6.7.0.tgz";
+      path = fetchurl {
+        name = "qs___qs_6.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz";
+        sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc";
+      };
+    }
+    {
+      name = "qs___qs_6.9.1.tgz";
+      path = fetchurl {
+        name = "qs___qs_6.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/qs/-/qs-6.9.1.tgz";
+        sha1 = "20082c65cb78223635ab1a9eaca8875a29bf8ec9";
+      };
+    }
+    {
+      name = "qs___qs_6.5.2.tgz";
+      path = fetchurl {
+        name = "qs___qs_6.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz";
+        sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36";
+      };
+    }
+    {
+      name = "query_string___query_string_4.3.4.tgz";
+      path = fetchurl {
+        name = "query_string___query_string_4.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz";
+        sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb";
+      };
+    }
+    {
+      name = "querystring_es3___querystring_es3_0.2.1.tgz";
+      path = fetchurl {
+        name = "querystring_es3___querystring_es3_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz";
+        sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
+      };
+    }
+    {
+      name = "querystring___querystring_0.2.0.tgz";
+      path = fetchurl {
+        name = "querystring___querystring_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz";
+        sha1 = "b209849203bb25df820da756e747005878521620";
+      };
+    }
+    {
+      name = "querystringify___querystringify_2.1.1.tgz";
+      path = fetchurl {
+        name = "querystringify___querystringify_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz";
+        sha1 = "60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e";
+      };
+    }
+    {
+      name = "raf___raf_3.4.0.tgz";
+      path = fetchurl {
+        name = "raf___raf_3.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz";
+        sha1 = "a28876881b4bc2ca9117d4138163ddb80f781575";
+      };
+    }
+    {
+      name = "railroad_diagrams___railroad_diagrams_1.0.0.tgz";
+      path = fetchurl {
+        name = "railroad_diagrams___railroad_diagrams_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz";
+        sha1 = "eb7e6267548ddedfb899c1b90e57374559cddb7e";
+      };
+    }
+    {
+      name = "ramda___ramda_0.26.1.tgz";
+      path = fetchurl {
+        name = "ramda___ramda_0.26.1.tgz";
+        url  = "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz";
+        sha1 = "8d41351eb8111c55353617fc3bbffad8e4d35d06";
+      };
+    }
+    {
+      name = "randexp___randexp_0.4.6.tgz";
+      path = fetchurl {
+        name = "randexp___randexp_0.4.6.tgz";
+        url  = "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz";
+        sha1 = "e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3";
+      };
+    }
+    {
+      name = "randombytes___randombytes_2.1.0.tgz";
+      path = fetchurl {
+        name = "randombytes___randombytes_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz";
+        sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a";
+      };
+    }
+    {
+      name = "randomfill___randomfill_1.0.4.tgz";
+      path = fetchurl {
+        name = "randomfill___randomfill_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz";
+        sha1 = "c92196fc86ab42be983f1bf31778224931d61458";
+      };
+    }
+    {
+      name = "range_parser___range_parser_1.2.1.tgz";
+      path = fetchurl {
+        name = "range_parser___range_parser_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz";
+        sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031";
+      };
+    }
+    {
+      name = "range_parser___range_parser_1.2.0.tgz";
+      path = fetchurl {
+        name = "range_parser___range_parser_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz";
+        sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e";
+      };
+    }
+    {
+      name = "raw_body___raw_body_2.3.2.tgz";
+      path = fetchurl {
+        name = "raw_body___raw_body_2.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz";
+        sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89";
+      };
+    }
+    {
+      name = "raw_body___raw_body_2.4.0.tgz";
+      path = fetchurl {
+        name = "raw_body___raw_body_2.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz";
+        sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332";
+      };
+    }
+    {
+      name = "raw_loader___raw_loader_4.0.1.tgz";
+      path = fetchurl {
+        name = "raw_loader___raw_loader_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.1.tgz";
+        sha1 = "14e1f726a359b68437e183d5a5b7d33a3eba6933";
+      };
+    }
+    {
+      name = "react_codemirror2___react_codemirror2_4.3.0.tgz";
+      path = fetchurl {
+        name = "react_codemirror2___react_codemirror2_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-4.3.0.tgz";
+        sha1 = "e79aedca4da60d22402d2cd74f2885a3e5c009fd";
+      };
+    }
+    {
+      name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.1.tgz";
+      path = fetchurl {
+        name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.1.tgz";
+        sha1 = "8eae107bb400be73132ed3b6a7b4fb156090208e";
+      };
+    }
+    {
+      name = "react_datepicker___react_datepicker_2.1.0.tgz";
+      path = fetchurl {
+        name = "react_datepicker___react_datepicker_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-2.1.0.tgz";
+        sha1 = "d9b9dfe78eaf4214e93a77d150cdafbc49ef522c";
+      };
+    }
+    {
+      name = "react_dimensions___react_dimensions_1.3.1.tgz";
+      path = fetchurl {
+        name = "react_dimensions___react_dimensions_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/react-dimensions/-/react-dimensions-1.3.1.tgz";
+        sha1 = "89c29bcd48828a74faeb07da1e461e1a354ccc48";
+      };
+    }
+    {
+      name = "react_dnd_html5_backend___react_dnd_html5_backend_9.5.1.tgz";
+      path = fetchurl {
+        name = "react_dnd_html5_backend___react_dnd_html5_backend_9.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-9.5.1.tgz";
+        sha1 = "e6a0aed3ece800c1abe004f9ed9991513e2e644c";
+      };
+    }
+    {
+      name = "react_dnd___react_dnd_9.5.1.tgz";
+      path = fetchurl {
+        name = "react_dnd___react_dnd_9.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/react-dnd/-/react-dnd-9.5.1.tgz";
+        sha1 = "907e55c791d6c50cbed1a4021c14b989b86ac467";
+      };
+    }
+    {
+      name = "react_dom___react_dom_16.8.2.tgz";
+      path = fetchurl {
+        name = "react_dom___react_dom_16.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.2.tgz";
+        sha1 = "7c8a69545dd554d45d66442230ba04a6a0a3c3d3";
+      };
+    }
+    {
+      name = "react_draggable___react_draggable_3.0.5.tgz";
+      path = fetchurl {
+        name = "react_draggable___react_draggable_3.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/react-draggable/-/react-draggable-3.0.5.tgz";
+        sha1 = "c031e0ed4313531f9409d6cd84c8ebcec0ddfe2d";
+      };
+    }
+    {
+      name = "react_draggable___react_draggable_3.3.0.tgz";
+      path = fetchurl {
+        name = "react_draggable___react_draggable_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-draggable/-/react-draggable-3.3.0.tgz";
+        sha1 = "2ed7ea3f92e7d742d747f9e6324860606cd4d997";
+      };
+    }
+    {
+      name = "react_grid_layout___react_grid_layout_0.16.6.tgz";
+      path = fetchurl {
+        name = "react_grid_layout___react_grid_layout_0.16.6.tgz";
+        url  = "https://registry.yarnpkg.com/react-grid-layout/-/react-grid-layout-0.16.6.tgz";
+        sha1 = "9b2407a2b946c2260ebaf66f13b556e1da4efeb2";
+      };
+    }
+    {
+      name = "react_is___react_is_16.13.1.tgz";
+      path = fetchurl {
+        name = "react_is___react_is_16.13.1.tgz";
+        url  = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz";
+        sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4";
+      };
+    }
+    {
+      name = "react_is___react_is_16.5.2.tgz";
+      path = fetchurl {
+        name = "react_is___react_is_16.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/react-is/-/react-is-16.5.2.tgz";
+        sha1 = "e2a7b7c3f5d48062eb769fcb123505eb928722e3";
+      };
+    }
+    {
+      name = "react_is___react_is_16.12.0.tgz";
+      path = fetchurl {
+        name = "react_is___react_is_16.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz";
+        sha1 = "2cc0fe0fba742d97fd527c42a13bec4eeb06241c";
+      };
+    }
+    {
+      name = "react_is___react_is_16.11.0.tgz";
+      path = fetchurl {
+        name = "react_is___react_is_16.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-is/-/react-is-16.11.0.tgz";
+        sha1 = "b85dfecd48ad1ce469ff558a882ca8e8313928fa";
+      };
+    }
+    {
+      name = "react_is___react_is_16.8.6.tgz";
+      path = fetchurl {
+        name = "react_is___react_is_16.8.6.tgz";
+        url  = "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz";
+        sha1 = "5bbc1e2d29141c9fbdfed456343fe2bc430a6a16";
+      };
+    }
+    {
+      name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz";
+      path = fetchurl {
+        name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz";
+        sha1 = "4f1a273afdfc8f3488a8c516bfda78f872352362";
+      };
+    }
+    {
+      name = "react_loadable___react_loadable_5.5.0.tgz";
+      path = fetchurl {
+        name = "react_loadable___react_loadable_5.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-loadable/-/react-loadable-5.5.0.tgz";
+        sha1 = "582251679d3da86c32aae2c8e689c59f1196d8c4";
+      };
+    }
+    {
+      name = "react_markdown___react_markdown_4.0.4.tgz";
+      path = fetchurl {
+        name = "react_markdown___react_markdown_4.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/react-markdown/-/react-markdown-4.0.4.tgz";
+        sha1 = "bdc882bc3eb4dfac45d57bfe58d8f482c5a85a64";
+      };
+    }
+    {
+      name = "react_monaco_editor___react_monaco_editor_0.33.0.tgz";
+      path = fetchurl {
+        name = "react_monaco_editor___react_monaco_editor_0.33.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-monaco-editor/-/react-monaco-editor-0.33.0.tgz";
+        sha1 = "822c331836ec39b1160faf22b0c722266f822460";
+      };
+    }
+    {
+      name = "react_onclickoutside___react_onclickoutside_6.7.1.tgz";
+      path = fetchurl {
+        name = "react_onclickoutside___react_onclickoutside_6.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.7.1.tgz";
+        sha1 = "6a5b5b8b4eae6b776259712c89c8a2b36b17be93";
+      };
+    }
+    {
+      name = "react_popper___react_popper_1.3.3.tgz";
+      path = fetchurl {
+        name = "react_popper___react_popper_1.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.3.tgz";
+        sha1 = "2c6cef7515a991256b4f0536cd4bdcb58a7b6af6";
+      };
+    }
+    {
+      name = "react_redux___react_redux_7.2.0.tgz";
+      path = fetchurl {
+        name = "react_redux___react_redux_7.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.0.tgz";
+        sha1 = "f970f62192b3981642fec46fd0db18a074fe879d";
+      };
+    }
+    {
+      name = "react_resizable___react_resizable_1.7.5.tgz";
+      path = fetchurl {
+        name = "react_resizable___react_resizable_1.7.5.tgz";
+        url  = "https://registry.yarnpkg.com/react-resizable/-/react-resizable-1.7.5.tgz";
+        sha1 = "83eb75bb3684da6989bbbf4f826e1470f0af902e";
+      };
+    }
+    {
+      name = "react_router_dom___react_router_dom_5.2.0.tgz";
+      path = fetchurl {
+        name = "react_router_dom___react_router_dom_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz";
+        sha1 = "9e65a4d0c45e13289e66c7b17c7e175d0ea15662";
+      };
+    }
+    {
+      name = "react_router___react_router_5.2.0.tgz";
+      path = fetchurl {
+        name = "react_router___react_router_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz";
+        sha1 = "424e75641ca8747fbf76e5ecca69781aa37ea293";
+      };
+    }
+    {
+      name = "react_scrollbars_custom___react_scrollbars_custom_4.0.0_alpha.8.tgz";
+      path = fetchurl {
+        name = "react_scrollbars_custom___react_scrollbars_custom_4.0.0_alpha.8.tgz";
+        url  = "https://registry.yarnpkg.com/react-scrollbars-custom/-/react-scrollbars-custom-4.0.0-alpha.8.tgz";
+        sha1 = "dc09b61831b59d93e24f0ec18dae84c9f3fc14e8";
+      };
+    }
+    {
+      name = "react_test_renderer___react_test_renderer_16.5.2.tgz";
+      path = fetchurl {
+        name = "react_test_renderer___react_test_renderer_16.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.5.2.tgz";
+        sha1 = "92e9d2c6f763b9821b2e0b22f994ee675068b5ae";
+      };
+    }
+    {
+      name = "react_virtualized___react_virtualized_9.20.1.tgz";
+      path = fetchurl {
+        name = "react_virtualized___react_virtualized_9.20.1.tgz";
+        url  = "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.20.1.tgz";
+        sha1 = "02dc08fe9070386b8c48e2ac56bce7af0208d22d";
+      };
+    }
+    {
+      name = "react___react_16.11.0.tgz";
+      path = fetchurl {
+        name = "react___react_16.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/react/-/react-16.11.0.tgz";
+        sha1 = "d294545fe62299ccee83363599bf904e4a07fdbb";
+      };
+    }
+    {
+      name = "read_pkg_up___read_pkg_up_4.0.0.tgz";
+      path = fetchurl {
+        name = "read_pkg_up___read_pkg_up_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz";
+        sha1 = "1b221c6088ba7799601c808f91161c66e58f8978";
+      };
+    }
+    {
+      name = "read_pkg___read_pkg_3.0.0.tgz";
+      path = fetchurl {
+        name = "read_pkg___read_pkg_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz";
+        sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389";
+      };
+    }
+    {
+      name = "readable_stream___readable_stream_2.3.7.tgz";
+      path = fetchurl {
+        name = "readable_stream___readable_stream_2.3.7.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz";
+        sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57";
+      };
+    }
+    {
+      name = "readable_stream___readable_stream_3.6.0.tgz";
+      path = fetchurl {
+        name = "readable_stream___readable_stream_3.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz";
+        sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198";
+      };
+    }
+    {
+      name = "readable_stream___readable_stream_3.4.0.tgz";
+      path = fetchurl {
+        name = "readable_stream___readable_stream_3.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz";
+        sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc";
+      };
+    }
+    {
+      name = "readdirp___readdirp_2.2.1.tgz";
+      path = fetchurl {
+        name = "readdirp___readdirp_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz";
+        sha1 = "0e87622a3325aa33e892285caf8b4e846529a525";
+      };
+    }
+    {
+      name = "readdirp___readdirp_3.1.1.tgz";
+      path = fetchurl {
+        name = "readdirp___readdirp_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.1.tgz";
+        sha1 = "b158123ac343c8b0f31d65680269cc0fc1025db1";
+      };
+    }
+    {
+      name = "realpath_native___realpath_native_1.1.0.tgz";
+      path = fetchurl {
+        name = "realpath_native___realpath_native_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz";
+        sha1 = "2003294fea23fb0672f2476ebe22fcf498a2d65c";
+      };
+    }
+    {
+      name = "redux_auth_wrapper___redux_auth_wrapper_1.1.0.tgz";
+      path = fetchurl {
+        name = "redux_auth_wrapper___redux_auth_wrapper_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/redux-auth-wrapper/-/redux-auth-wrapper-1.1.0.tgz";
+        sha1 = "ccd4a753fe2134eb93c44f4e5781054577f6244a";
+      };
+    }
+    {
+      name = "redux_thunk___redux_thunk_2.3.0.tgz";
+      path = fetchurl {
+        name = "redux_thunk___redux_thunk_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz";
+        sha1 = "51c2c19a185ed5187aaa9a2d08b666d0d6467622";
+      };
+    }
+    {
+      name = "redux___redux_4.0.0.tgz";
+      path = fetchurl {
+        name = "redux___redux_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/redux/-/redux-4.0.0.tgz";
+        sha1 = "aa698a92b729315d22b34a0553d7e6533555cc03";
+      };
+    }
+    {
+      name = "redux___redux_4.0.5.tgz";
+      path = fetchurl {
+        name = "redux___redux_4.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz";
+        sha1 = "4db5de5816e17891de8a80c424232d06f051d93f";
+      };
+    }
+    {
+      name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz";
+      path = fetchurl {
+        name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz";
+        sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e";
+      };
+    }
+    {
+      name = "regenerate___regenerate_1.4.0.tgz";
+      path = fetchurl {
+        name = "regenerate___regenerate_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz";
+        sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11";
+      };
+    }
+    {
+      name = "regenerator_runtime___regenerator_runtime_0.10.5.tgz";
+      path = fetchurl {
+        name = "regenerator_runtime___regenerator_runtime_0.10.5.tgz";
+        url  = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
+        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
+      };
+    }
+    {
+      name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz";
+      path = fetchurl {
+        name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz";
+        url  = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";
+        sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9";
+      };
+    }
+    {
+      name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz";
+      path = fetchurl {
+        name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz";
+        url  = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz";
+        sha1 = "7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5";
+      };
+    }
+    {
+      name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz";
+      path = fetchurl {
+        name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz";
+        url  = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz";
+        sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697";
+      };
+    }
+    {
+      name = "regenerator_transform___regenerator_transform_0.14.1.tgz";
+      path = fetchurl {
+        name = "regenerator_transform___regenerator_transform_0.14.1.tgz";
+        url  = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz";
+        sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb";
+      };
+    }
+    {
+      name = "regex_not___regex_not_1.0.2.tgz";
+      path = fetchurl {
+        name = "regex_not___regex_not_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz";
+        sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c";
+      };
+    }
+    {
+      name = "regexp_tree___regexp_tree_0.1.11.tgz";
+      path = fetchurl {
+        name = "regexp_tree___regexp_tree_0.1.11.tgz";
+        url  = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz";
+        sha1 = "c9c7f00fcf722e0a56c7390983a7a63dd6c272f3";
+      };
+    }
+    {
+      name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz";
+      path = fetchurl {
+        name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz";
+        sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75";
+      };
+    }
+    {
+      name = "regexpp___regexpp_2.0.1.tgz";
+      path = fetchurl {
+        name = "regexpp___regexpp_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz";
+        sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f";
+      };
+    }
+    {
+      name = "regexpu_core___regexpu_core_4.5.4.tgz";
+      path = fetchurl {
+        name = "regexpu_core___regexpu_core_4.5.4.tgz";
+        url  = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz";
+        sha1 = "080d9d02289aa87fe1667a4f5136bc98a6aebaae";
+      };
+    }
+    {
+      name = "regjsgen___regjsgen_0.5.0.tgz";
+      path = fetchurl {
+        name = "regjsgen___regjsgen_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz";
+        sha1 = "a7634dc08f89209c2049adda3525711fb97265dd";
+      };
+    }
+    {
+      name = "regjsparser___regjsparser_0.6.0.tgz";
+      path = fetchurl {
+        name = "regjsparser___regjsparser_0.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz";
+        sha1 = "f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c";
+      };
+    }
+    {
+      name = "relateurl___relateurl_0.2.7.tgz";
+      path = fetchurl {
+        name = "relateurl___relateurl_0.2.7.tgz";
+        url  = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz";
+        sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9";
+      };
+    }
+    {
+      name = "remark_parse___remark_parse_5.0.0.tgz";
+      path = fetchurl {
+        name = "remark_parse___remark_parse_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz";
+        sha1 = "4c077f9e499044d1d5c13f80d7a98cf7b9285d95";
+      };
+    }
+    {
+      name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
+      path = fetchurl {
+        name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz";
+        sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
+      };
+    }
+    {
+      name = "renderkid___renderkid_2.0.3.tgz";
+      path = fetchurl {
+        name = "renderkid___renderkid_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz";
+        sha1 = "380179c2ff5ae1365c522bf2fcfcff01c5b74149";
+      };
+    }
+    {
+      name = "repeat_element___repeat_element_1.1.3.tgz";
+      path = fetchurl {
+        name = "repeat_element___repeat_element_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz";
+        sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce";
+      };
+    }
+    {
+      name = "repeat_string___repeat_string_1.6.1.tgz";
+      path = fetchurl {
+        name = "repeat_string___repeat_string_1.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz";
+        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+      };
+    }
+    {
+      name = "replace_ext___replace_ext_1.0.0.tgz";
+      path = fetchurl {
+        name = "replace_ext___replace_ext_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz";
+        sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb";
+      };
+    }
+    {
+      name = "request_progress___request_progress_3.0.0.tgz";
+      path = fetchurl {
+        name = "request_progress___request_progress_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz";
+        sha1 = "4ca754081c7fec63f505e4faa825aa06cd669dbe";
+      };
+    }
+    {
+      name = "request_promise_core___request_promise_core_1.1.2.tgz";
+      path = fetchurl {
+        name = "request_promise_core___request_promise_core_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz";
+        sha1 = "339f6aababcafdb31c799ff158700336301d3346";
+      };
+    }
+    {
+      name = "request_promise_native___request_promise_native_1.0.7.tgz";
+      path = fetchurl {
+        name = "request_promise_native___request_promise_native_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz";
+        sha1 = "a49868a624bdea5069f1251d0a836e0d89aa2c59";
+      };
+    }
+    {
+      name = "request___request_2.88.0.tgz";
+      path = fetchurl {
+        name = "request___request_2.88.0.tgz";
+        url  = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz";
+        sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef";
+      };
+    }
+    {
+      name = "require_directory___require_directory_2.1.1.tgz";
+      path = fetchurl {
+        name = "require_directory___require_directory_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz";
+        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+      };
+    }
+    {
+      name = "require_main_filename___require_main_filename_1.0.1.tgz";
+      path = fetchurl {
+        name = "require_main_filename___require_main_filename_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+      };
+    }
+    {
+      name = "require_main_filename___require_main_filename_2.0.0.tgz";
+      path = fetchurl {
+        name = "require_main_filename___require_main_filename_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz";
+        sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b";
+      };
+    }
+    {
+      name = "requires_port___requires_port_1.0.0.tgz";
+      path = fetchurl {
+        name = "requires_port___requires_port_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz";
+        sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
+      };
+    }
+    {
+      name = "reselect___reselect_4.0.0.tgz";
+      path = fetchurl {
+        name = "reselect___reselect_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz";
+        sha1 = "f2529830e5d3d0e021408b246a206ef4ea4437f7";
+      };
+    }
+    {
+      name = "resolve_cwd___resolve_cwd_2.0.0.tgz";
+      path = fetchurl {
+        name = "resolve_cwd___resolve_cwd_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz";
+        sha1 = "00a9f7387556e27038eae232caa372a6a59b665a";
+      };
+    }
+    {
+      name = "resolve_dir___resolve_dir_1.0.1.tgz";
+      path = fetchurl {
+        name = "resolve_dir___resolve_dir_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz";
+        sha1 = "79a40644c362be82f26effe739c9bb5382046f43";
+      };
+    }
+    {
+      name = "resolve_from___resolve_from_3.0.0.tgz";
+      path = fetchurl {
+        name = "resolve_from___resolve_from_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz";
+        sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748";
+      };
+    }
+    {
+      name = "resolve_from___resolve_from_4.0.0.tgz";
+      path = fetchurl {
+        name = "resolve_from___resolve_from_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz";
+        sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6";
+      };
+    }
+    {
+      name = "resolve_pathname___resolve_pathname_3.0.0.tgz";
+      path = fetchurl {
+        name = "resolve_pathname___resolve_pathname_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz";
+        sha1 = "99d02224d3cf263689becbb393bc560313025dcd";
+      };
+    }
+    {
+      name = "resolve_url___resolve_url_0.2.1.tgz";
+      path = fetchurl {
+        name = "resolve_url___resolve_url_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz";
+        sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a";
+      };
+    }
+    {
+      name = "resolve___resolve_1.1.7.tgz";
+      path = fetchurl {
+        name = "resolve___resolve_1.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+      };
+    }
+    {
+      name = "resolve___resolve_1.8.1.tgz";
+      path = fetchurl {
+        name = "resolve___resolve_1.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz";
+        sha1 = "82f1ec19a423ac1fbd080b0bab06ba36e84a7a26";
+      };
+    }
+    {
+      name = "resolve___resolve_1.11.1.tgz";
+      path = fetchurl {
+        name = "resolve___resolve_1.11.1.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz";
+        sha1 = "ea10d8110376982fef578df8fc30b9ac30a07a3e";
+      };
+    }
+    {
+      name = "resolve___resolve_1.12.0.tgz";
+      path = fetchurl {
+        name = "resolve___resolve_1.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz";
+        sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6";
+      };
+    }
+    {
+      name = "restore_cursor___restore_cursor_1.0.1.tgz";
+      path = fetchurl {
+        name = "restore_cursor___restore_cursor_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz";
+        sha1 = "34661f46886327fed2991479152252df92daa541";
+      };
+    }
+    {
+      name = "restore_cursor___restore_cursor_2.0.0.tgz";
+      path = fetchurl {
+        name = "restore_cursor___restore_cursor_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz";
+        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
+      };
+    }
+    {
+      name = "restore_cursor___restore_cursor_3.1.0.tgz";
+      path = fetchurl {
+        name = "restore_cursor___restore_cursor_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz";
+        sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e";
+      };
+    }
+    {
+      name = "ret___ret_0.1.15.tgz";
+      path = fetchurl {
+        name = "ret___ret_0.1.15.tgz";
+        url  = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz";
+        sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc";
+      };
+    }
+    {
+      name = "retry___retry_0.12.0.tgz";
+      path = fetchurl {
+        name = "retry___retry_0.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz";
+        sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b";
+      };
+    }
+    {
+      name = "rgb_regex___rgb_regex_1.0.1.tgz";
+      path = fetchurl {
+        name = "rgb_regex___rgb_regex_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz";
+        sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1";
+      };
+    }
+    {
+      name = "rgba_regex___rgba_regex_1.0.0.tgz";
+      path = fetchurl {
+        name = "rgba_regex___rgba_regex_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz";
+        sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3";
+      };
+    }
+    {
+      name = "right_align___right_align_0.1.3.tgz";
+      path = fetchurl {
+        name = "right_align___right_align_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz";
+        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+      };
+    }
+    {
+      name = "rimraf___rimraf_2.6.3.tgz";
+      path = fetchurl {
+        name = "rimraf___rimraf_2.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz";
+        sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab";
+      };
+    }
+    {
+      name = "rimraf___rimraf_2.7.1.tgz";
+      path = fetchurl {
+        name = "rimraf___rimraf_2.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz";
+        sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec";
+      };
+    }
+    {
+      name = "ripemd160___ripemd160_2.0.2.tgz";
+      path = fetchurl {
+        name = "ripemd160___ripemd160_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz";
+        sha1 = "a1c1a6f624751577ba5d07914cbc92850585890c";
+      };
+    }
+    {
+      name = "rome___rome_2.1.22.tgz";
+      path = fetchurl {
+        name = "rome___rome_2.1.22.tgz";
+        url  = "https://registry.yarnpkg.com/rome/-/rome-2.1.22.tgz";
+        sha1 = "4bf25318cc0522ae92dd090472ce7a6e0b1f5e02";
+      };
+    }
+    {
+      name = "rst_selector_parser___rst_selector_parser_2.2.3.tgz";
+      path = fetchurl {
+        name = "rst_selector_parser___rst_selector_parser_2.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz";
+        sha1 = "81b230ea2fcc6066c89e3472de794285d9b03d91";
+      };
+    }
+    {
+      name = "rsvp___rsvp_4.8.5.tgz";
+      path = fetchurl {
+        name = "rsvp___rsvp_4.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz";
+        sha1 = "c8f155311d167f68f21e168df71ec5b083113734";
+      };
+    }
+    {
+      name = "run_async___run_async_2.3.0.tgz";
+      path = fetchurl {
+        name = "run_async___run_async_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz";
+        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+      };
+    }
+    {
+      name = "run_queue___run_queue_1.0.3.tgz";
+      path = fetchurl {
+        name = "run_queue___run_queue_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz";
+        sha1 = "e848396f057d223f24386924618e25694161ec47";
+      };
+    }
+    {
+      name = "rxjs___rxjs_6.5.5.tgz";
+      path = fetchurl {
+        name = "rxjs___rxjs_6.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz";
+        sha1 = "c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec";
+      };
+    }
+    {
+      name = "rxjs___rxjs_6.4.0.tgz";
+      path = fetchurl {
+        name = "rxjs___rxjs_6.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz";
+        sha1 = "f3bb0fe7bda7fb69deac0c16f17b50b0b8790504";
+      };
+    }
+    {
+      name = "safe_buffer___safe_buffer_5.1.1.tgz";
+      path = fetchurl {
+        name = "safe_buffer___safe_buffer_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz";
+        sha1 = "893312af69b2123def71f57889001671eeb2c853";
+      };
+    }
+    {
+      name = "safe_buffer___safe_buffer_5.1.2.tgz";
+      path = fetchurl {
+        name = "safe_buffer___safe_buffer_5.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
+      };
+    }
+    {
+      name = "safe_buffer___safe_buffer_5.2.0.tgz";
+      path = fetchurl {
+        name = "safe_buffer___safe_buffer_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz";
+        sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519";
+      };
+    }
+    {
+      name = "safe_regex___safe_regex_1.1.0.tgz";
+      path = fetchurl {
+        name = "safe_regex___safe_regex_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz";
+        sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e";
+      };
+    }
+    {
+      name = "safer_buffer___safer_buffer_2.1.2.tgz";
+      path = fetchurl {
+        name = "safer_buffer___safer_buffer_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a";
+      };
+    }
+    {
+      name = "sane___sane_4.1.0.tgz";
+      path = fetchurl {
+        name = "sane___sane_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz";
+        sha1 = "ed881fd922733a6c461bc189dc2b6c006f3ffded";
+      };
+    }
+    {
+      name = "sass_loader___sass_loader_7.1.0.tgz";
+      path = fetchurl {
+        name = "sass_loader___sass_loader_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz";
+        sha1 = "16fd5138cb8b424bf8a759528a1972d72aad069d";
+      };
+    }
+    {
+      name = "sass___sass_1.22.7.tgz";
+      path = fetchurl {
+        name = "sass___sass_1.22.7.tgz";
+        url  = "https://registry.yarnpkg.com/sass/-/sass-1.22.7.tgz";
+        sha1 = "5a1a77dc11aa659db4e782d238bf9f3d44a60546";
+      };
+    }
+    {
+      name = "sax___sax_1.2.4.tgz";
+      path = fetchurl {
+        name = "sax___sax_1.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz";
+        sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9";
+      };
+    }
+    {
+      name = "schedule___schedule_0.5.0.tgz";
+      path = fetchurl {
+        name = "schedule___schedule_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/schedule/-/schedule-0.5.0.tgz";
+        sha1 = "c128fffa0b402488b08b55ae74bb9df55cc29cc8";
+      };
+    }
+    {
+      name = "scheduler___scheduler_0.13.2.tgz";
+      path = fetchurl {
+        name = "scheduler___scheduler_0.13.2.tgz";
+        url  = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.2.tgz";
+        sha1 = "969eaee2764a51d2e97b20a60963b2546beff8fa";
+      };
+    }
+    {
+      name = "schema_utils___schema_utils_1.0.0.tgz";
+      path = fetchurl {
+        name = "schema_utils___schema_utils_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz";
+        sha1 = "0b79a93204d7b600d4b2850d1f66c2a34951c770";
+      };
+    }
+    {
+      name = "schema_utils___schema_utils_2.0.1.tgz";
+      path = fetchurl {
+        name = "schema_utils___schema_utils_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.0.1.tgz";
+        sha1 = "1eec2e059556af841b7f3a83b61af13d7a3f9196";
+      };
+    }
+    {
+      name = "schema_utils___schema_utils_2.5.0.tgz";
+      path = fetchurl {
+        name = "schema_utils___schema_utils_2.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz";
+        sha1 = "8f254f618d402cc80257486213c8970edfd7c22f";
+      };
+    }
+    {
+      name = "schema_utils___schema_utils_2.7.0.tgz";
+      path = fetchurl {
+        name = "schema_utils___schema_utils_2.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz";
+        sha1 = "17151f76d8eae67fbbf77960c33c676ad9f4efc7";
+      };
+    }
+    {
+      name = "seamless_immutable___seamless_immutable_7.1.4.tgz";
+      path = fetchurl {
+        name = "seamless_immutable___seamless_immutable_7.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/seamless-immutable/-/seamless-immutable-7.1.4.tgz";
+        sha1 = "6e9536def083ddc4dea0207d722e0e80d0f372f8";
+      };
+    }
+    {
+      name = "seleccion___seleccion_2.0.0.tgz";
+      path = fetchurl {
+        name = "seleccion___seleccion_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/seleccion/-/seleccion-2.0.0.tgz";
+        sha1 = "0984ac1e8df513e38b41a608e65042e8381e0a73";
+      };
+    }
+    {
+      name = "select_hose___select_hose_2.0.0.tgz";
+      path = fetchurl {
+        name = "select_hose___select_hose_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz";
+        sha1 = "625d8658f865af43ec962bfc376a37359a4994ca";
+      };
+    }
+    {
+      name = "selfsigned___selfsigned_1.10.7.tgz";
+      path = fetchurl {
+        name = "selfsigned___selfsigned_1.10.7.tgz";
+        url  = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz";
+        sha1 = "da5819fd049d5574f28e88a9bcc6dbc6e6f3906b";
+      };
+    }
+    {
+      name = "sell___sell_1.0.0.tgz";
+      path = fetchurl {
+        name = "sell___sell_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/sell/-/sell-1.0.0.tgz";
+        sha1 = "3baca7e51f78ddee9e22eea1ac747a6368bd1630";
+      };
+    }
+    {
+      name = "semver___semver_5.7.0.tgz";
+      path = fetchurl {
+        name = "semver___semver_5.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz";
+        sha1 = "790a7cf6fea5459bac96110b29b60412dc8ff96b";
+      };
+    }
+    {
+      name = "semver___semver_5.5.1.tgz";
+      path = fetchurl {
+        name = "semver___semver_5.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz";
+        sha1 = "7dfdd8814bdb7cabc7be0fb1d734cfb66c940477";
+      };
+    }
+    {
+      name = "semver___semver_5.7.1.tgz";
+      path = fetchurl {
+        name = "semver___semver_5.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz";
+        sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7";
+      };
+    }
+    {
+      name = "semver___semver_6.3.0.tgz";
+      path = fetchurl {
+        name = "semver___semver_6.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz";
+        sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d";
+      };
+    }
+    {
+      name = "send___send_0.16.2.tgz";
+      path = fetchurl {
+        name = "send___send_0.16.2.tgz";
+        url  = "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz";
+        sha1 = "6ecca1e0f8c156d141597559848df64730a6bbc1";
+      };
+    }
+    {
+      name = "send___send_0.17.1.tgz";
+      path = fetchurl {
+        name = "send___send_0.17.1.tgz";
+        url  = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz";
+        sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8";
+      };
+    }
+    {
+      name = "serialize_javascript___serialize_javascript_2.1.0.tgz";
+      path = fetchurl {
+        name = "serialize_javascript___serialize_javascript_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.0.tgz";
+        sha1 = "9310276819efd0eb128258bb341957f6eb2fc570";
+      };
+    }
+    {
+      name = "serialize_javascript___serialize_javascript_2.1.2.tgz";
+      path = fetchurl {
+        name = "serialize_javascript___serialize_javascript_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz";
+        sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61";
+      };
+    }
+    {
+      name = "serve_index___serve_index_1.9.1.tgz";
+      path = fetchurl {
+        name = "serve_index___serve_index_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz";
+        sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239";
+      };
+    }
+    {
+      name = "serve_static___serve_static_1.13.2.tgz";
+      path = fetchurl {
+        name = "serve_static___serve_static_1.13.2.tgz";
+        url  = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz";
+        sha1 = "095e8472fd5b46237db50ce486a43f4b86c6cec1";
+      };
+    }
+    {
+      name = "serve_static___serve_static_1.14.1.tgz";
+      path = fetchurl {
+        name = "serve_static___serve_static_1.14.1.tgz";
+        url  = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz";
+        sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9";
+      };
+    }
+    {
+      name = "set_blocking___set_blocking_2.0.0.tgz";
+      path = fetchurl {
+        name = "set_blocking___set_blocking_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz";
+        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+      };
+    }
+    {
+      name = "set_value___set_value_2.0.1.tgz";
+      path = fetchurl {
+        name = "set_value___set_value_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz";
+        sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b";
+      };
+    }
+    {
+      name = "setimmediate___setimmediate_1.0.5.tgz";
+      path = fetchurl {
+        name = "setimmediate___setimmediate_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz";
+        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
+      };
+    }
+    {
+      name = "setprototypeof___setprototypeof_1.0.3.tgz";
+      path = fetchurl {
+        name = "setprototypeof___setprototypeof_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz";
+        sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
+      };
+    }
+    {
+      name = "setprototypeof___setprototypeof_1.1.0.tgz";
+      path = fetchurl {
+        name = "setprototypeof___setprototypeof_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz";
+        sha1 = "d0bd85536887b6fe7c0d818cb962d9d91c54e656";
+      };
+    }
+    {
+      name = "setprototypeof___setprototypeof_1.1.1.tgz";
+      path = fetchurl {
+        name = "setprototypeof___setprototypeof_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz";
+        sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683";
+      };
+    }
+    {
+      name = "sha.js___sha.js_2.4.11.tgz";
+      path = fetchurl {
+        name = "sha.js___sha.js_2.4.11.tgz";
+        url  = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz";
+        sha1 = "37a5cf0b81ecbc6943de109ba2960d1b26584ae7";
+      };
+    }
+    {
+      name = "shallow_clone___shallow_clone_1.0.0.tgz";
+      path = fetchurl {
+        name = "shallow_clone___shallow_clone_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz";
+        sha1 = "4480cd06e882ef68b2ad88a3ea54832e2c48b571";
+      };
+    }
+    {
+      name = "shallowequal___shallowequal_1.1.0.tgz";
+      path = fetchurl {
+        name = "shallowequal___shallowequal_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz";
+        sha1 = "188d521de95b9087404fd4dcb68b13df0ae4e7f8";
+      };
+    }
+    {
+      name = "shebang_command___shebang_command_1.2.0.tgz";
+      path = fetchurl {
+        name = "shebang_command___shebang_command_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz";
+        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+      };
+    }
+    {
+      name = "shebang_regex___shebang_regex_1.0.0.tgz";
+      path = fetchurl {
+        name = "shebang_regex___shebang_regex_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz";
+        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
+      };
+    }
+    {
+      name = "shellwords___shellwords_0.1.1.tgz";
+      path = fetchurl {
+        name = "shellwords___shellwords_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz";
+        sha1 = "d6b9181c1a48d397324c84871efbcfc73fc0654b";
+      };
+    }
+    {
+      name = "signal_exit___signal_exit_3.0.2.tgz";
+      path = fetchurl {
+        name = "signal_exit___signal_exit_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+      };
+    }
+    {
+      name = "simple_swizzle___simple_swizzle_0.2.2.tgz";
+      path = fetchurl {
+        name = "simple_swizzle___simple_swizzle_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz";
+        sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a";
+      };
+    }
+    {
+      name = "sisteransi___sisteransi_1.0.2.tgz";
+      path = fetchurl {
+        name = "sisteransi___sisteransi_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.2.tgz";
+        sha1 = "ec57d64b6f25c4f26c0e2c7dd23f2d7f12f7e418";
+      };
+    }
+    {
+      name = "slash___slash_2.0.0.tgz";
+      path = fetchurl {
+        name = "slash___slash_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz";
+        sha1 = "de552851a1759df3a8f206535442f5ec4ddeab44";
+      };
+    }
+    {
+      name = "slice_ansi___slice_ansi_0.0.4.tgz";
+      path = fetchurl {
+        name = "slice_ansi___slice_ansi_0.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz";
+        sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35";
+      };
+    }
+    {
+      name = "slice_ansi___slice_ansi_2.1.0.tgz";
+      path = fetchurl {
+        name = "slice_ansi___slice_ansi_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz";
+        sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636";
+      };
+    }
+    {
+      name = "snapdragon_node___snapdragon_node_2.1.1.tgz";
+      path = fetchurl {
+        name = "snapdragon_node___snapdragon_node_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz";
+        sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b";
+      };
+    }
+    {
+      name = "snapdragon_util___snapdragon_util_3.0.1.tgz";
+      path = fetchurl {
+        name = "snapdragon_util___snapdragon_util_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz";
+        sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2";
+      };
+    }
+    {
+      name = "snapdragon___snapdragon_0.8.2.tgz";
+      path = fetchurl {
+        name = "snapdragon___snapdragon_0.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz";
+        sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d";
+      };
+    }
+    {
+      name = "sockjs_client___sockjs_client_1.4.0.tgz";
+      path = fetchurl {
+        name = "sockjs_client___sockjs_client_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz";
+        sha1 = "c9f2568e19c8fd8173b4997ea3420e0bb306c7d5";
+      };
+    }
+    {
+      name = "sockjs___sockjs_0.3.19.tgz";
+      path = fetchurl {
+        name = "sockjs___sockjs_0.3.19.tgz";
+        url  = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz";
+        sha1 = "d976bbe800af7bd20ae08598d582393508993c0d";
+      };
+    }
+    {
+      name = "sort_keys___sort_keys_1.1.2.tgz";
+      path = fetchurl {
+        name = "sort_keys___sort_keys_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz";
+        sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad";
+      };
+    }
+    {
+      name = "source_list_map___source_list_map_2.0.1.tgz";
+      path = fetchurl {
+        name = "source_list_map___source_list_map_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz";
+        sha1 = "3993bd873bfc48479cca9ea3a547835c7c154b34";
+      };
+    }
+    {
+      name = "source_map_loader___source_map_loader_0.2.4.tgz";
+      path = fetchurl {
+        name = "source_map_loader___source_map_loader_0.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz";
+        sha1 = "c18b0dc6e23bf66f6792437557c569a11e072271";
+      };
+    }
+    {
+      name = "source_map_resolve___source_map_resolve_0.5.3.tgz";
+      path = fetchurl {
+        name = "source_map_resolve___source_map_resolve_0.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz";
+        sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a";
+      };
+    }
+    {
+      name = "source_map_support___source_map_support_0.5.12.tgz";
+      path = fetchurl {
+        name = "source_map_support___source_map_support_0.5.12.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz";
+        sha1 = "b4f3b10d51857a5af0138d3ce8003b201613d599";
+      };
+    }
+    {
+      name = "source_map_support___source_map_support_0.5.16.tgz";
+      path = fetchurl {
+        name = "source_map_support___source_map_support_0.5.16.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz";
+        sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042";
+      };
+    }
+    {
+      name = "source_map_url___source_map_url_0.4.0.tgz";
+      path = fetchurl {
+        name = "source_map_url___source_map_url_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz";
+        sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
+      };
+    }
+    {
+      name = "source_map___source_map_0.4.4.tgz";
+      path = fetchurl {
+        name = "source_map___source_map_0.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz";
+        sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
+      };
+    }
+    {
+      name = "source_map___source_map_0.5.7.tgz";
+      path = fetchurl {
+        name = "source_map___source_map_0.5.7.tgz";
+        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz";
+        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+      };
+    }
+    {
+      name = "source_map___source_map_0.6.1.tgz";
+      path = fetchurl {
+        name = "source_map___source_map_0.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz";
+        sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263";
+      };
+    }
+    {
+      name = "spdx_correct___spdx_correct_3.1.0.tgz";
+      path = fetchurl {
+        name = "spdx_correct___spdx_correct_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz";
+        sha1 = "fb83e504445268f154b074e218c87c003cd31df4";
+      };
+    }
+    {
+      name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz";
+      path = fetchurl {
+        name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
+        sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977";
+      };
+    }
+    {
+      name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz";
+      path = fetchurl {
+        name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
+        sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0";
+      };
+    }
+    {
+      name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz";
+      path = fetchurl {
+        name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
+        sha1 = "3694b5804567a458d3c8045842a6358632f62654";
+      };
+    }
+    {
+      name = "spdy_transport___spdy_transport_3.0.0.tgz";
+      path = fetchurl {
+        name = "spdy_transport___spdy_transport_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz";
+        sha1 = "00d4863a6400ad75df93361a1608605e5dcdcf31";
+      };
+    }
+    {
+      name = "spdy___spdy_4.0.1.tgz";
+      path = fetchurl {
+        name = "spdy___spdy_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz";
+        sha1 = "6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2";
+      };
+    }
+    {
+      name = "split_string___split_string_3.1.0.tgz";
+      path = fetchurl {
+        name = "split_string___split_string_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz";
+        sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2";
+      };
+    }
+    {
+      name = "sprintf_js___sprintf_js_1.0.3.tgz";
+      path = fetchurl {
+        name = "sprintf_js___sprintf_js_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz";
+        sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+      };
+    }
+    {
+      name = "sshpk___sshpk_1.16.1.tgz";
+      path = fetchurl {
+        name = "sshpk___sshpk_1.16.1.tgz";
+        url  = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz";
+        sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877";
+      };
+    }
+    {
+      name = "ssri___ssri_6.0.1.tgz";
+      path = fetchurl {
+        name = "ssri___ssri_6.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz";
+        sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8";
+      };
+    }
+    {
+      name = "ssri___ssri_7.1.0.tgz";
+      path = fetchurl {
+        name = "ssri___ssri_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz";
+        sha1 = "92c241bf6de82365b5c7fb4bd76e975522e1294d";
+      };
+    }
+    {
+      name = "stable___stable_0.1.8.tgz";
+      path = fetchurl {
+        name = "stable___stable_0.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz";
+        sha1 = "836eb3c8382fe2936feaf544631017ce7d47a3cf";
+      };
+    }
+    {
+      name = "stack_utils___stack_utils_1.0.2.tgz";
+      path = fetchurl {
+        name = "stack_utils___stack_utils_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz";
+        sha1 = "33eba3897788558bebfc2db059dc158ec36cebb8";
+      };
+    }
+    {
+      name = "state_toggle___state_toggle_1.0.1.tgz";
+      path = fetchurl {
+        name = "state_toggle___state_toggle_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.1.tgz";
+        sha1 = "c3cb0974f40a6a0f8e905b96789eb41afa1cde3a";
+      };
+    }
+    {
+      name = "static_extend___static_extend_0.1.2.tgz";
+      path = fetchurl {
+        name = "static_extend___static_extend_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz";
+        sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6";
+      };
+    }
+    {
+      name = "statuses___statuses_1.4.0.tgz";
+      path = fetchurl {
+        name = "statuses___statuses_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz";
+        sha1 = "bb73d446da2796106efcc1b601a253d6c46bd087";
+      };
+    }
+    {
+      name = "statuses___statuses_1.5.0.tgz";
+      path = fetchurl {
+        name = "statuses___statuses_1.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz";
+        sha1 = "161c7dac177659fd9811f43771fa99381478628c";
+      };
+    }
+    {
+      name = "stealthy_require___stealthy_require_1.1.1.tgz";
+      path = fetchurl {
+        name = "stealthy_require___stealthy_require_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz";
+        sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b";
+      };
+    }
+    {
+      name = "stream_browserify___stream_browserify_2.0.2.tgz";
+      path = fetchurl {
+        name = "stream_browserify___stream_browserify_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz";
+        sha1 = "87521d38a44aa7ee91ce1cd2a47df0cb49dd660b";
+      };
+    }
+    {
+      name = "stream_each___stream_each_1.2.3.tgz";
+      path = fetchurl {
+        name = "stream_each___stream_each_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz";
+        sha1 = "ebe27a0c389b04fbcc233642952e10731afa9bae";
+      };
+    }
+    {
+      name = "stream_http___stream_http_2.8.3.tgz";
+      path = fetchurl {
+        name = "stream_http___stream_http_2.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz";
+        sha1 = "b2d242469288a5a27ec4fe8933acf623de6514fc";
+      };
+    }
+    {
+      name = "stream_shift___stream_shift_1.0.1.tgz";
+      path = fetchurl {
+        name = "stream_shift___stream_shift_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz";
+        sha1 = "d7088281559ab2778424279b0877da3c392d5a3d";
+      };
+    }
+    {
+      name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz";
+      path = fetchurl {
+        name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
+        sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
+      };
+    }
+    {
+      name = "string_length___string_length_2.0.0.tgz";
+      path = fetchurl {
+        name = "string_length___string_length_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz";
+        sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed";
+      };
+    }
+    {
+      name = "string_width___string_width_1.0.2.tgz";
+      path = fetchurl {
+        name = "string_width___string_width_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+      };
+    }
+    {
+      name = "string_width___string_width_2.1.1.tgz";
+      path = fetchurl {
+        name = "string_width___string_width_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz";
+        sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
+      };
+    }
+    {
+      name = "string_width___string_width_3.0.0.tgz";
+      path = fetchurl {
+        name = "string_width___string_width_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz";
+        sha1 = "5a1690a57cc78211fffd9bf24bbe24d090604eb1";
+      };
+    }
+    {
+      name = "string_width___string_width_3.1.0.tgz";
+      path = fetchurl {
+        name = "string_width___string_width_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz";
+        sha1 = "22767be21b62af1081574306f69ac51b62203961";
+      };
+    }
+    {
+      name = "string_width___string_width_4.1.0.tgz";
+      path = fetchurl {
+        name = "string_width___string_width_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz";
+        sha1 = "ba846d1daa97c3c596155308063e075ed1c99aff";
+      };
+    }
+    {
+      name = "string.prototype.trim___string.prototype.trim_1.1.2.tgz";
+      path = fetchurl {
+        name = "string.prototype.trim___string.prototype.trim_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz";
+        sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea";
+      };
+    }
+    {
+      name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
+      path = fetchurl {
+        name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
+        sha1 = "9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74";
+      };
+    }
+    {
+      name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
+      path = fetchurl {
+        name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
+        sha1 = "440314b15996c866ce8a0341894d45186200c5d9";
+      };
+    }
+    {
+      name = "string_decoder___string_decoder_1.3.0.tgz";
+      path = fetchurl {
+        name = "string_decoder___string_decoder_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz";
+        sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e";
+      };
+    }
+    {
+      name = "string_decoder___string_decoder_1.1.1.tgz";
+      path = fetchurl {
+        name = "string_decoder___string_decoder_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz";
+        sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8";
+      };
+    }
+    {
+      name = "strip_ansi___strip_ansi_3.0.1.tgz";
+      path = fetchurl {
+        name = "strip_ansi___strip_ansi_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+      };
+    }
+    {
+      name = "strip_ansi___strip_ansi_4.0.0.tgz";
+      path = fetchurl {
+        name = "strip_ansi___strip_ansi_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz";
+        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
+      };
+    }
+    {
+      name = "strip_ansi___strip_ansi_5.2.0.tgz";
+      path = fetchurl {
+        name = "strip_ansi___strip_ansi_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz";
+        sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae";
+      };
+    }
+    {
+      name = "strip_bom___strip_bom_3.0.0.tgz";
+      path = fetchurl {
+        name = "strip_bom___strip_bom_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz";
+        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
+      };
+    }
+    {
+      name = "strip_eof___strip_eof_1.0.0.tgz";
+      path = fetchurl {
+        name = "strip_eof___strip_eof_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz";
+        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+      };
+    }
+    {
+      name = "strip_json_comments___strip_json_comments_3.0.1.tgz";
+      path = fetchurl {
+        name = "strip_json_comments___strip_json_comments_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz";
+        sha1 = "85713975a91fb87bf1b305cca77395e40d2a64a7";
+      };
+    }
+    {
+      name = "style_loader___style_loader_0.23.1.tgz";
+      path = fetchurl {
+        name = "style_loader___style_loader_0.23.1.tgz";
+        url  = "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz";
+        sha1 = "cb9154606f3e771ab6c4ab637026a1049174d925";
+      };
+    }
+    {
+      name = "stylehacks___stylehacks_4.0.3.tgz";
+      path = fetchurl {
+        name = "stylehacks___stylehacks_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz";
+        sha1 = "6718fcaf4d1e07d8a1318690881e8d96726a71d5";
+      };
+    }
+    {
+      name = "superagent___superagent_3.8.3.tgz";
+      path = fetchurl {
+        name = "superagent___superagent_3.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz";
+        sha1 = "460ea0dbdb7d5b11bc4f78deba565f86a178e128";
+      };
+    }
+    {
+      name = "supports_color___supports_color_5.4.0.tgz";
+      path = fetchurl {
+        name = "supports_color___supports_color_5.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz";
+        sha1 = "1c6b337402c2137605efe19f10fec390f6faab54";
+      };
+    }
+    {
+      name = "supports_color___supports_color_6.1.0.tgz";
+      path = fetchurl {
+        name = "supports_color___supports_color_6.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz";
+        sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3";
+      };
+    }
+    {
+      name = "supports_color___supports_color_2.0.0.tgz";
+      path = fetchurl {
+        name = "supports_color___supports_color_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+      };
+    }
+    {
+      name = "supports_color___supports_color_3.2.3.tgz";
+      path = fetchurl {
+        name = "supports_color___supports_color_3.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz";
+        sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6";
+      };
+    }
+    {
+      name = "supports_color___supports_color_5.5.0.tgz";
+      path = fetchurl {
+        name = "supports_color___supports_color_5.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz";
+        sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f";
+      };
+    }
+    {
+      name = "supports_color___supports_color_7.1.0.tgz";
+      path = fetchurl {
+        name = "supports_color___supports_color_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz";
+        sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1";
+      };
+    }
+    {
+      name = "svgo___svgo_1.2.2.tgz";
+      path = fetchurl {
+        name = "svgo___svgo_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/svgo/-/svgo-1.2.2.tgz";
+        sha1 = "0253d34eccf2aed4ad4f283e11ee75198f9d7316";
+      };
+    }
+    {
+      name = "swagger_methods___swagger_methods_2.0.0.tgz";
+      path = fetchurl {
+        name = "swagger_methods___swagger_methods_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/swagger-methods/-/swagger-methods-2.0.0.tgz";
+        sha1 = "e1260876e7638b8a5d61ae5735ad9d5e97f4f09d";
+      };
+    }
+    {
+      name = "swagger_parser___swagger_parser_8.0.0.tgz";
+      path = fetchurl {
+        name = "swagger_parser___swagger_parser_8.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/swagger-parser/-/swagger-parser-8.0.0.tgz";
+        sha1 = "7a714c98a9a7a4ce81331336c1f53bb89f5d4e2f";
+      };
+    }
+    {
+      name = "symbol_observable___symbol_observable_1.2.0.tgz";
+      path = fetchurl {
+        name = "symbol_observable___symbol_observable_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz";
+        sha1 = "c22688aed4eab3cdc2dfeacbb561660560a00804";
+      };
+    }
+    {
+      name = "symbol_tree___symbol_tree_3.2.2.tgz";
+      path = fetchurl {
+        name = "symbol_tree___symbol_tree_3.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz";
+        sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6";
+      };
+    }
+    {
+      name = "symbol_tree___symbol_tree_3.2.4.tgz";
+      path = fetchurl {
+        name = "symbol_tree___symbol_tree_3.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz";
+        sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2";
+      };
+    }
+    {
+      name = "table___table_5.2.3.tgz";
+      path = fetchurl {
+        name = "table___table_5.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/table/-/table-5.2.3.tgz";
+        sha1 = "cde0cc6eb06751c009efab27e8c820ca5b67b7f2";
+      };
+    }
+    {
+      name = "tapable___tapable_1.1.3.tgz";
+      path = fetchurl {
+        name = "tapable___tapable_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz";
+        sha1 = "a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2";
+      };
+    }
+    {
+      name = "terser_webpack_plugin___terser_webpack_plugin_2.2.1.tgz";
+      path = fetchurl {
+        name = "terser_webpack_plugin___terser_webpack_plugin_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.1.tgz";
+        sha1 = "5569e6c7d8be79e5e43d6da23acc3b6ba77d22bd";
+      };
+    }
+    {
+      name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz";
+      path = fetchurl {
+        name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz";
+        sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c";
+      };
+    }
+    {
+      name = "terser___terser_4.6.7.tgz";
+      path = fetchurl {
+        name = "terser___terser_4.6.7.tgz";
+        url  = "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz";
+        sha1 = "478d7f9394ec1907f0e488c5f6a6a9a2bad55e72";
+      };
+    }
+    {
+      name = "terser___terser_4.4.0.tgz";
+      path = fetchurl {
+        name = "terser___terser_4.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/terser/-/terser-4.4.0.tgz";
+        sha1 = "22c46b4817cf4c9565434bfe6ad47336af259ac3";
+      };
+    }
+    {
+      name = "test_exclude___test_exclude_5.2.3.tgz";
+      path = fetchurl {
+        name = "test_exclude___test_exclude_5.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz";
+        sha1 = "c3d3e1e311eb7ee405e092dac10aefd09091eac0";
+      };
+    }
+    {
+      name = "text_table___text_table_0.2.0.tgz";
+      path = fetchurl {
+        name = "text_table___text_table_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz";
+        sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
+      };
+    }
+    {
+      name = "throat___throat_4.1.0.tgz";
+      path = fetchurl {
+        name = "throat___throat_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz";
+        sha1 = "89037cbc92c56ab18926e6ba4cbb200e15672a6a";
+      };
+    }
+    {
+      name = "throttleit___throttleit_1.0.0.tgz";
+      path = fetchurl {
+        name = "throttleit___throttleit_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz";
+        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
+      };
+    }
+    {
+      name = "through2___through2_2.0.5.tgz";
+      path = fetchurl {
+        name = "through2___through2_2.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz";
+        sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd";
+      };
+    }
+    {
+      name = "through___through_2.3.8.tgz";
+      path = fetchurl {
+        name = "through___through_2.3.8.tgz";
+        url  = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    }
+    {
+      name = "thunky___thunky_1.1.0.tgz";
+      path = fetchurl {
+        name = "thunky___thunky_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz";
+        sha1 = "5abaf714a9405db0504732bbccd2cedd9ef9537d";
+      };
+    }
+    {
+      name = "ticky___ticky_1.0.0.tgz";
+      path = fetchurl {
+        name = "ticky___ticky_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ticky/-/ticky-1.0.0.tgz";
+        sha1 = "e87f38ee0491ea32f62e8f0567ba9638b29f049c";
+      };
+    }
+    {
+      name = "timers_browserify___timers_browserify_2.0.11.tgz";
+      path = fetchurl {
+        name = "timers_browserify___timers_browserify_2.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz";
+        sha1 = "800b1f3eee272e5bc53ee465a04d0e804c31211f";
+      };
+    }
+    {
+      name = "timsort___timsort_0.3.0.tgz";
+      path = fetchurl {
+        name = "timsort___timsort_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz";
+        sha1 = "405411a8e7e6339fe64db9a234de11dc31e02bd4";
+      };
+    }
+    {
+      name = "tiny_invariant___tiny_invariant_1.1.0.tgz";
+      path = fetchurl {
+        name = "tiny_invariant___tiny_invariant_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz";
+        sha1 = "634c5f8efdc27714b7f386c35e6760991d230875";
+      };
+    }
+    {
+      name = "tiny_warning___tiny_warning_1.0.3.tgz";
+      path = fetchurl {
+        name = "tiny_warning___tiny_warning_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz";
+        sha1 = "94a30db453df4c643d0fd566060d60a875d84754";
+      };
+    }
+    {
+      name = "tmp___tmp_0.0.33.tgz";
+      path = fetchurl {
+        name = "tmp___tmp_0.0.33.tgz";
+        url  = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz";
+        sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9";
+      };
+    }
+    {
+      name = "tmp___tmp_0.1.0.tgz";
+      path = fetchurl {
+        name = "tmp___tmp_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz";
+        sha1 = "ee434a4e22543082e294ba6201dcc6eafefa2877";
+      };
+    }
+    {
+      name = "tmpl___tmpl_1.0.4.tgz";
+      path = fetchurl {
+        name = "tmpl___tmpl_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz";
+        sha1 = "23640dd7b42d00433911140820e5cf440e521dd1";
+      };
+    }
+    {
+      name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz";
+      path = fetchurl {
+        name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz";
+        sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
+      };
+    }
+    {
+      name = "to_camel_case___to_camel_case_1.0.0.tgz";
+      path = fetchurl {
+        name = "to_camel_case___to_camel_case_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/to-camel-case/-/to-camel-case-1.0.0.tgz";
+        sha1 = "1a56054b2f9d696298ce66a60897322b6f423e46";
+      };
+    }
+    {
+      name = "to_fast_properties___to_fast_properties_2.0.0.tgz";
+      path = fetchurl {
+        name = "to_fast_properties___to_fast_properties_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz";
+        sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e";
+      };
+    }
+    {
+      name = "to_no_case___to_no_case_1.0.2.tgz";
+      path = fetchurl {
+        name = "to_no_case___to_no_case_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/to-no-case/-/to-no-case-1.0.2.tgz";
+        sha1 = "c722907164ef6b178132c8e69930212d1b4aa16a";
+      };
+    }
+    {
+      name = "to_object_path___to_object_path_0.3.0.tgz";
+      path = fetchurl {
+        name = "to_object_path___to_object_path_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz";
+        sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af";
+      };
+    }
+    {
+      name = "to_regex_range___to_regex_range_2.1.1.tgz";
+      path = fetchurl {
+        name = "to_regex_range___to_regex_range_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz";
+        sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38";
+      };
+    }
+    {
+      name = "to_regex_range___to_regex_range_5.0.1.tgz";
+      path = fetchurl {
+        name = "to_regex_range___to_regex_range_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz";
+        sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4";
+      };
+    }
+    {
+      name = "to_regex___to_regex_3.0.2.tgz";
+      path = fetchurl {
+        name = "to_regex___to_regex_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz";
+        sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce";
+      };
+    }
+    {
+      name = "to_space_case___to_space_case_1.0.0.tgz";
+      path = fetchurl {
+        name = "to_space_case___to_space_case_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/to-space-case/-/to-space-case-1.0.0.tgz";
+        sha1 = "b052daafb1b2b29dc770cea0163e5ec0ebc9fc17";
+      };
+    }
+    {
+      name = "toggle_selection___toggle_selection_1.0.6.tgz";
+      path = fetchurl {
+        name = "toggle_selection___toggle_selection_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz";
+        sha1 = "6e45b1263f2017fa0acc7d89d78b15b8bf77da32";
+      };
+    }
+    {
+      name = "toidentifier___toidentifier_1.0.0.tgz";
+      path = fetchurl {
+        name = "toidentifier___toidentifier_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz";
+        sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553";
+      };
+    }
+    {
+      name = "toposort___toposort_1.0.7.tgz";
+      path = fetchurl {
+        name = "toposort___toposort_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz";
+        sha1 = "2e68442d9f64ec720b8cc89e6443ac6caa950029";
+      };
+    }
+    {
+      name = "tough_cookie___tough_cookie_2.4.3.tgz";
+      path = fetchurl {
+        name = "tough_cookie___tough_cookie_2.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz";
+        sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781";
+      };
+    }
+    {
+      name = "tough_cookie___tough_cookie_2.5.0.tgz";
+      path = fetchurl {
+        name = "tough_cookie___tough_cookie_2.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz";
+        sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2";
+      };
+    }
+    {
+      name = "tr46___tr46_1.0.1.tgz";
+      path = fetchurl {
+        name = "tr46___tr46_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz";
+        sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09";
+      };
+    }
+    {
+      name = "tr46___tr46_0.0.3.tgz";
+      path = fetchurl {
+        name = "tr46___tr46_0.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz";
+        sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a";
+      };
+    }
+    {
+      name = "trim_right___trim_right_1.0.1.tgz";
+      path = fetchurl {
+        name = "trim_right___trim_right_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz";
+        sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
+      };
+    }
+    {
+      name = "trim_trailing_lines___trim_trailing_lines_1.1.1.tgz";
+      path = fetchurl {
+        name = "trim_trailing_lines___trim_trailing_lines_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz";
+        sha1 = "e0ec0810fd3c3f1730516b45f49083caaf2774d9";
+      };
+    }
+    {
+      name = "trim___trim_0.0.1.tgz";
+      path = fetchurl {
+        name = "trim___trim_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz";
+        sha1 = "5858547f6b290757ee95cccc666fb50084c460dd";
+      };
+    }
+    {
+      name = "trough___trough_1.0.3.tgz";
+      path = fetchurl {
+        name = "trough___trough_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/trough/-/trough-1.0.3.tgz";
+        sha1 = "e29bd1614c6458d44869fc28b255ab7857ef7c24";
+      };
+    }
+    {
+      name = "tryer___tryer_1.0.1.tgz";
+      path = fetchurl {
+        name = "tryer___tryer_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz";
+        sha1 = "f2c85406800b9b0f74c9f7465b81eaad241252f8";
+      };
+    }
+    {
+      name = "ts_jest___ts_jest_24.0.0.tgz";
+      path = fetchurl {
+        name = "ts_jest___ts_jest_24.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.0.tgz";
+        sha1 = "3f26bf2ec1fa584863a5a9c29bd8717d549efbf6";
+      };
+    }
+    {
+      name = "ts_loader___ts_loader_5.3.3.tgz";
+      path = fetchurl {
+        name = "ts_loader___ts_loader_5.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.3.3.tgz";
+        sha1 = "8b4af042e773132d86b3c99ef0acf3b4d325f473";
+      };
+    }
+    {
+      name = "ts_node___ts_node_8.3.0.tgz";
+      path = fetchurl {
+        name = "ts_node___ts_node_8.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/ts-node/-/ts-node-8.3.0.tgz";
+        sha1 = "e4059618411371924a1fb5f3b125915f324efb57";
+      };
+    }
+    {
+      name = "tslib___tslib_1.10.0.tgz";
+      path = fetchurl {
+        name = "tslib___tslib_1.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz";
+        sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a";
+      };
+    }
+    {
+      name = "tslib___tslib_1.9.3.tgz";
+      path = fetchurl {
+        name = "tslib___tslib_1.9.3.tgz";
+        url  = "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz";
+        sha1 = "d7e4dd79245d85428c4d7e4822a79917954ca286";
+      };
+    }
+    {
+      name = "tslint___tslint_5.20.1.tgz";
+      path = fetchurl {
+        name = "tslint___tslint_5.20.1.tgz";
+        url  = "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz";
+        sha1 = "e401e8aeda0152bc44dd07e614034f3f80c67b7d";
+      };
+    }
+    {
+      name = "tsutils___tsutils_2.29.0.tgz";
+      path = fetchurl {
+        name = "tsutils___tsutils_2.29.0.tgz";
+        url  = "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz";
+        sha1 = "32b488501467acbedd4b85498673a0812aca0b99";
+      };
+    }
+    {
+      name = "tsutils___tsutils_3.17.1.tgz";
+      path = fetchurl {
+        name = "tsutils___tsutils_3.17.1.tgz";
+        url  = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz";
+        sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759";
+      };
+    }
+    {
+      name = "tty_browserify___tty_browserify_0.0.0.tgz";
+      path = fetchurl {
+        name = "tty_browserify___tty_browserify_0.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz";
+        sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6";
+      };
+    }
+    {
+      name = "tunnel_agent___tunnel_agent_0.6.0.tgz";
+      path = fetchurl {
+        name = "tunnel_agent___tunnel_agent_0.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
+      };
+    }
+    {
+      name = "tweetnacl___tweetnacl_0.14.5.tgz";
+      path = fetchurl {
+        name = "tweetnacl___tweetnacl_0.14.5.tgz";
+        url  = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+      };
+    }
+    {
+      name = "type_check___type_check_0.3.2.tgz";
+      path = fetchurl {
+        name = "type_check___type_check_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz";
+        sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
+      };
+    }
+    {
+      name = "type_fest___type_fest_0.5.2.tgz";
+      path = fetchurl {
+        name = "type_fest___type_fest_0.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz";
+        sha1 = "d6ef42a0356c6cd45f49485c3b6281fc148e48a2";
+      };
+    }
+    {
+      name = "type_is___type_is_1.6.16.tgz";
+      path = fetchurl {
+        name = "type_is___type_is_1.6.16.tgz";
+        url  = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz";
+        sha1 = "f89ce341541c672b25ee7ae3c73dee3b2be50194";
+      };
+    }
+    {
+      name = "type_is___type_is_1.6.18.tgz";
+      path = fetchurl {
+        name = "type_is___type_is_1.6.18.tgz";
+        url  = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz";
+        sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131";
+      };
+    }
+    {
+      name = "typed_styles___typed_styles_0.0.7.tgz";
+      path = fetchurl {
+        name = "typed_styles___typed_styles_0.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz";
+        sha1 = "93392a008794c4595119ff62dde6809dbc40a3d9";
+      };
+    }
+    {
+      name = "typedarray___typedarray_0.0.6.tgz";
+      path = fetchurl {
+        name = "typedarray___typedarray_0.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz";
+        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+      };
+    }
+    {
+      name = "typescript___typescript_3.8.3.tgz";
+      path = fetchurl {
+        name = "typescript___typescript_3.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz";
+        sha1 = "409eb8544ea0335711205869ec458ab109ee1061";
+      };
+    }
+    {
+      name = "ua_parser_js___ua_parser_js_0.7.18.tgz";
+      path = fetchurl {
+        name = "ua_parser_js___ua_parser_js_0.7.18.tgz";
+        url  = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz";
+        sha1 = "a7bfd92f56edfb117083b69e31d2aa8882d4b1ed";
+      };
+    }
+    {
+      name = "uglify_js___uglify_js_3.4.10.tgz";
+      path = fetchurl {
+        name = "uglify_js___uglify_js_3.4.10.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz";
+        sha1 = "9ad9563d8eb3acdfb8d38597d2af1d815f6a755f";
+      };
+    }
+    {
+      name = "uglify_js___uglify_js_3.6.0.tgz";
+      path = fetchurl {
+        name = "uglify_js___uglify_js_3.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz";
+        sha1 = "704681345c53a8b2079fb6cec294b05ead242ff5";
+      };
+    }
+    {
+      name = "uglify_js___uglify_js_2.6.4.tgz";
+      path = fetchurl {
+        name = "uglify_js___uglify_js_2.6.4.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.6.4.tgz";
+        sha1 = "65ea2fb3059c9394692f15fed87c2b36c16b9adf";
+      };
+    }
+    {
+      name = "uglify_to_browserify___uglify_to_browserify_1.0.2.tgz";
+      path = fetchurl {
+        name = "uglify_to_browserify___uglify_to_browserify_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+      };
+    }
+    {
+      name = "underscore___underscore_1.9.1.tgz";
+      path = fetchurl {
+        name = "underscore___underscore_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz";
+        sha1 = "06dce34a0e68a7babc29b365b8e74b8925203961";
+      };
+    }
+    {
+      name = "underscore___underscore_1.4.4.tgz";
+      path = fetchurl {
+        name = "underscore___underscore_1.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz";
+        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+      };
+    }
+    {
+      name = "unfetch___unfetch_4.1.0.tgz";
+      path = fetchurl {
+        name = "unfetch___unfetch_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz";
+        sha1 = "6ec2dd0de887e58a4dee83a050ded80ffc4137db";
+      };
+    }
+    {
+      name = "unherit___unherit_1.1.1.tgz";
+      path = fetchurl {
+        name = "unherit___unherit_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.1.tgz";
+        sha1 = "132748da3e88eab767e08fabfbb89c5e9d28628c";
+      };
+    }
+    {
+      name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz";
+      path = fetchurl {
+        name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz";
+        sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818";
+      };
+    }
+    {
+      name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz";
+      path = fetchurl {
+        name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz";
+        sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c";
+      };
+    }
+    {
+      name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz";
+      path = fetchurl {
+        name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz";
+        sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277";
+      };
+    }
+    {
+      name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.4.tgz";
+      path = fetchurl {
+        name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz";
+        sha1 = "5a533f31b4317ea76f17d807fa0d116546111dd0";
+      };
+    }
+    {
+      name = "unified___unified_6.2.0.tgz";
+      path = fetchurl {
+        name = "unified___unified_6.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz";
+        sha1 = "7fbd630f719126d67d40c644b7e3f617035f6dba";
+      };
+    }
+    {
+      name = "union_value___union_value_1.0.1.tgz";
+      path = fetchurl {
+        name = "union_value___union_value_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz";
+        sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847";
+      };
+    }
+    {
+      name = "uniq___uniq_1.0.1.tgz";
+      path = fetchurl {
+        name = "uniq___uniq_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz";
+        sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff";
+      };
+    }
+    {
+      name = "uniqs___uniqs_2.0.0.tgz";
+      path = fetchurl {
+        name = "uniqs___uniqs_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz";
+        sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02";
+      };
+    }
+    {
+      name = "unique_filename___unique_filename_1.1.1.tgz";
+      path = fetchurl {
+        name = "unique_filename___unique_filename_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz";
+        sha1 = "1d69769369ada0583103a1e6ae87681b56573230";
+      };
+    }
+    {
+      name = "unique_slug___unique_slug_2.0.2.tgz";
+      path = fetchurl {
+        name = "unique_slug___unique_slug_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz";
+        sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c";
+      };
+    }
+    {
+      name = "unist_util_is___unist_util_is_2.1.2.tgz";
+      path = fetchurl {
+        name = "unist_util_is___unist_util_is_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.2.tgz";
+        sha1 = "1193fa8f2bfbbb82150633f3a8d2eb9a1c1d55db";
+      };
+    }
+    {
+      name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz";
+      path = fetchurl {
+        name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz";
+        sha1 = "86b5dad104d0bbfbeb1db5f5c92f3570575c12cb";
+      };
+    }
+    {
+      name = "unist_util_stringify_position___unist_util_stringify_position_1.1.2.tgz";
+      path = fetchurl {
+        name = "unist_util_stringify_position___unist_util_stringify_position_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz";
+        sha1 = "3f37fcf351279dcbca7480ab5889bb8a832ee1c6";
+      };
+    }
+    {
+      name = "unist_util_visit_parents___unist_util_visit_parents_1.1.2.tgz";
+      path = fetchurl {
+        name = "unist_util_visit_parents___unist_util_visit_parents_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-1.1.2.tgz";
+        sha1 = "f6e3afee8bdbf961c0e6f028ea3c0480028c3d06";
+      };
+    }
+    {
+      name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz";
+      path = fetchurl {
+        name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz";
+        sha1 = "63fffc8929027bee04bfef7d2cce474f71cb6217";
+      };
+    }
+    {
+      name = "unist_util_visit___unist_util_visit_1.4.0.tgz";
+      path = fetchurl {
+        name = "unist_util_visit___unist_util_visit_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.0.tgz";
+        sha1 = "1cb763647186dc26f5e1df5db6bd1e48b3cc2fb1";
+      };
+    }
+    {
+      name = "universalify___universalify_0.1.2.tgz";
+      path = fetchurl {
+        name = "universalify___universalify_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz";
+        sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66";
+      };
+    }
+    {
+      name = "unpipe___unpipe_1.0.0.tgz";
+      path = fetchurl {
+        name = "unpipe___unpipe_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz";
+        sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
+      };
+    }
+    {
+      name = "unquote___unquote_1.1.1.tgz";
+      path = fetchurl {
+        name = "unquote___unquote_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz";
+        sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544";
+      };
+    }
+    {
+      name = "unset_value___unset_value_1.0.0.tgz";
+      path = fetchurl {
+        name = "unset_value___unset_value_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz";
+        sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559";
+      };
+    }
+    {
+      name = "untildify___untildify_4.0.0.tgz";
+      path = fetchurl {
+        name = "untildify___untildify_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz";
+        sha1 = "2bc947b953652487e4600949fb091e3ae8cd919b";
+      };
+    }
+    {
+      name = "upath___upath_1.2.0.tgz";
+      path = fetchurl {
+        name = "upath___upath_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz";
+        sha1 = "8f66dbcd55a883acdae4408af8b035a5044c1894";
+      };
+    }
+    {
+      name = "upper_case___upper_case_1.1.3.tgz";
+      path = fetchurl {
+        name = "upper_case___upper_case_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz";
+        sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598";
+      };
+    }
+    {
+      name = "uri_js___uri_js_4.2.2.tgz";
+      path = fetchurl {
+        name = "uri_js___uri_js_4.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz";
+        sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0";
+      };
+    }
+    {
+      name = "urix___urix_0.1.0.tgz";
+      path = fetchurl {
+        name = "urix___urix_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz";
+        sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
+      };
+    }
+    {
+      name = "url_join___url_join_4.0.1.tgz";
+      path = fetchurl {
+        name = "url_join___url_join_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz";
+        sha1 = "b642e21a2646808ffa178c4c5fda39844e12cde7";
+      };
+    }
+    {
+      name = "url_parse___url_parse_1.4.7.tgz";
+      path = fetchurl {
+        name = "url_parse___url_parse_1.4.7.tgz";
+        url  = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz";
+        sha1 = "a8a83535e8c00a316e403a5db4ac1b9b853ae278";
+      };
+    }
+    {
+      name = "url___url_0.11.0.tgz";
+      path = fetchurl {
+        name = "url___url_0.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz";
+        sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1";
+      };
+    }
+    {
+      name = "use_persisted_state___use_persisted_state_0.3.0.tgz";
+      path = fetchurl {
+        name = "use_persisted_state___use_persisted_state_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/use-persisted-state/-/use-persisted-state-0.3.0.tgz";
+        sha1 = "f8e3d2fd8eee67e0c86fd596c3ea3e8121c07402";
+      };
+    }
+    {
+      name = "use___use_3.1.1.tgz";
+      path = fetchurl {
+        name = "use___use_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz";
+        sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f";
+      };
+    }
+    {
+      name = "util_deprecate___util_deprecate_1.0.2.tgz";
+      path = fetchurl {
+        name = "util_deprecate___util_deprecate_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+      };
+    }
+    {
+      name = "util.promisify___util.promisify_1.0.0.tgz";
+      path = fetchurl {
+        name = "util.promisify___util.promisify_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz";
+        sha1 = "440f7165a459c9a16dc145eb8e72f35687097030";
+      };
+    }
+    {
+      name = "util___util_0.10.3.tgz";
+      path = fetchurl {
+        name = "util___util_0.10.3.tgz";
+        url  = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz";
+        sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+      };
+    }
+    {
+      name = "util___util_0.11.1.tgz";
+      path = fetchurl {
+        name = "util___util_0.11.1.tgz";
+        url  = "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz";
+        sha1 = "3236733720ec64bb27f6e26f421aaa2e1b588d61";
+      };
+    }
+    {
+      name = "utila___utila_0.4.0.tgz";
+      path = fetchurl {
+        name = "utila___utila_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz";
+        sha1 = "8a16a05d445657a3aea5eecc5b12a4fa5379772c";
+      };
+    }
+    {
+      name = "utils_merge___utils_merge_1.0.1.tgz";
+      path = fetchurl {
+        name = "utils_merge___utils_merge_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz";
+        sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
+      };
+    }
+    {
+      name = "uuid___uuid_3.4.0.tgz";
+      path = fetchurl {
+        name = "uuid___uuid_3.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz";
+        sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee";
+      };
+    }
+    {
+      name = "uuid___uuid_3.3.2.tgz";
+      path = fetchurl {
+        name = "uuid___uuid_3.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz";
+        sha1 = "1b4af4955eb3077c501c23872fc6513811587131";
+      };
+    }
+    {
+      name = "uuid___uuid_3.3.3.tgz";
+      path = fetchurl {
+        name = "uuid___uuid_3.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz";
+        sha1 = "4568f0216e78760ee1dbf3a4d2cf53e224112866";
+      };
+    }
+    {
+      name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz";
+      path = fetchurl {
+        name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz";
+        sha1 = "00f7494d2ae2b688cfe2899df6ed2c54bef91dbe";
+      };
+    }
+    {
+      name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz";
+      path = fetchurl {
+        name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz";
+        sha1 = "e14de37b31a6d194f5690d67efc4e7f6fc6ab30e";
+      };
+    }
+    {
+      name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz";
+      path = fetchurl {
+        name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
+        sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a";
+      };
+    }
+    {
+      name = "validator___validator_10.11.0.tgz";
+      path = fetchurl {
+        name = "validator___validator_10.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz";
+        sha1 = "003108ea6e9a9874d31ccc9e5006856ccd76b228";
+      };
+    }
+    {
+      name = "value_equal___value_equal_1.0.1.tgz";
+      path = fetchurl {
+        name = "value_equal___value_equal_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz";
+        sha1 = "1e0b794c734c5c0cade179c437d356d931a34d6c";
+      };
+    }
+    {
+      name = "vary___vary_1.1.2.tgz";
+      path = fetchurl {
+        name = "vary___vary_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz";
+        sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
+      };
+    }
+    {
+      name = "vendors___vendors_1.0.3.tgz";
+      path = fetchurl {
+        name = "vendors___vendors_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.3.tgz";
+        sha1 = "a6467781abd366217c050f8202e7e50cc9eef8c0";
+      };
+    }
+    {
+      name = "verror___verror_1.10.0.tgz";
+      path = fetchurl {
+        name = "verror___verror_1.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+      };
+    }
+    {
+      name = "vfile_location___vfile_location_2.0.4.tgz";
+      path = fetchurl {
+        name = "vfile_location___vfile_location_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.4.tgz";
+        sha1 = "2a5e7297dd0d9e2da4381464d04acc6b834d3e55";
+      };
+    }
+    {
+      name = "vfile_message___vfile_message_1.0.2.tgz";
+      path = fetchurl {
+        name = "vfile_message___vfile_message_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.0.2.tgz";
+        sha1 = "0f8a62584c5dff0f81760531b8e34f3cea554ebc";
+      };
+    }
+    {
+      name = "vfile___vfile_2.3.0.tgz";
+      path = fetchurl {
+        name = "vfile___vfile_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz";
+        sha1 = "e62d8e72b20e83c324bc6c67278ee272488bf84a";
+      };
+    }
+    {
+      name = "vm_browserify___vm_browserify_1.1.2.tgz";
+      path = fetchurl {
+        name = "vm_browserify___vm_browserify_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz";
+        sha1 = "78641c488b8e6ca91a75f511e7a3b32a86e5dda0";
+      };
+    }
+    {
+      name = "vscode_jsonrpc___vscode_jsonrpc_4.1.0_next.3.tgz";
+      path = fetchurl {
+        name = "vscode_jsonrpc___vscode_jsonrpc_4.1.0_next.3.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.3.tgz";
+        sha1 = "05fe742959a2726020d4d0bfbc3d3c97873c7fde";
+      };
+    }
+    {
+      name = "vscode_jsonrpc___vscode_jsonrpc_5.0.1.tgz";
+      path = fetchurl {
+        name = "vscode_jsonrpc___vscode_jsonrpc_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz";
+        sha1 = "9bab9c330d89f43fc8c1e8702b5c36e058a01794";
+      };
+    }
+    {
+      name = "vscode_languageclient___vscode_languageclient_5.3.0_next.9.tgz";
+      path = fetchurl {
+        name = "vscode_languageclient___vscode_languageclient_5.3.0_next.9.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.3.0-next.9.tgz";
+        sha1 = "34f58017647f15cd86015f7af45935dc750611f7";
+      };
+    }
+    {
+      name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.15.2.tgz";
+      path = fetchurl {
+        name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.15.2.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.2.tgz";
+        sha1 = "e52c62923140b2655ad2472f6f29cfb83bacf5b8";
+      };
+    }
+    {
+      name = "vscode_languageserver_types___vscode_languageserver_types_3.15.1.tgz";
+      path = fetchurl {
+        name = "vscode_languageserver_types___vscode_languageserver_types_3.15.1.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz";
+        sha1 = "17be71d78d2f6236d414f0001ce1ef4d23e6b6de";
+      };
+    }
+    {
+      name = "vscode_uri___vscode_uri_1.0.8.tgz";
+      path = fetchurl {
+        name = "vscode_uri___vscode_uri_1.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz";
+        sha1 = "9769aaececae4026fb6e22359cb38946580ded59";
+      };
+    }
+    {
+      name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz";
+      path = fetchurl {
+        name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz";
+        sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045";
+      };
+    }
+    {
+      name = "walker___walker_1.0.7.tgz";
+      path = fetchurl {
+        name = "walker___walker_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz";
+        sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb";
+      };
+    }
+    {
+      name = "warning___warning_4.0.3.tgz";
+      path = fetchurl {
+        name = "warning___warning_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz";
+        sha1 = "16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3";
+      };
+    }
+    {
+      name = "watchpack___watchpack_1.6.0.tgz";
+      path = fetchurl {
+        name = "watchpack___watchpack_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz";
+        sha1 = "4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00";
+      };
+    }
+    {
+      name = "wbuf___wbuf_1.7.3.tgz";
+      path = fetchurl {
+        name = "wbuf___wbuf_1.7.3.tgz";
+        url  = "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz";
+        sha1 = "c1d8d149316d3ea852848895cb6a0bfe887b87df";
+      };
+    }
+    {
+      name = "webidl_conversions___webidl_conversions_3.0.1.tgz";
+      path = fetchurl {
+        name = "webidl_conversions___webidl_conversions_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz";
+        sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871";
+      };
+    }
+    {
+      name = "webidl_conversions___webidl_conversions_4.0.2.tgz";
+      path = fetchurl {
+        name = "webidl_conversions___webidl_conversions_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz";
+        sha1 = "a855980b1f0b6b359ba1d5d9fb39ae941faa63ad";
+      };
+    }
+    {
+      name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.6.0.tgz";
+      path = fetchurl {
+        name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz";
+        sha1 = "39b3a8f829ca044682bc6f9e011c95deb554aefd";
+      };
+    }
+    {
+      name = "webpack_cli___webpack_cli_3.3.10.tgz";
+      path = fetchurl {
+        name = "webpack_cli___webpack_cli_3.3.10.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.10.tgz";
+        sha1 = "17b279267e9b4fb549023fae170da8e6e766da13";
+      };
+    }
+    {
+      name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz";
+      path = fetchurl {
+        name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz";
+        sha1 = "0019c3db716e3fa5cecbf64f2ab88a74bab331f3";
+      };
+    }
+    {
+      name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz";
+      path = fetchurl {
+        name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz";
+        sha1 = "f35945036813e57ef582c2420ef7b470e14d3af0";
+      };
+    }
+    {
+      name = "webpack_log___webpack_log_2.0.0.tgz";
+      path = fetchurl {
+        name = "webpack_log___webpack_log_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz";
+        sha1 = "5b7928e0637593f119d32f6227c1e0ac31e1b47f";
+      };
+    }
+    {
+      name = "webpack_merge___webpack_merge_4.2.1.tgz";
+      path = fetchurl {
+        name = "webpack_merge___webpack_merge_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz";
+        sha1 = "5e923cf802ea2ace4fd5af1d3247368a633489b4";
+      };
+    }
+    {
+      name = "webpack_sources___webpack_sources_1.3.0.tgz";
+      path = fetchurl {
+        name = "webpack_sources___webpack_sources_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz";
+        sha1 = "2a28dcb9f1f45fe960d8f1493252b5ee6530fa85";
+      };
+    }
+    {
+      name = "webpack_sources___webpack_sources_1.4.3.tgz";
+      path = fetchurl {
+        name = "webpack_sources___webpack_sources_1.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz";
+        sha1 = "eedd8ec0b928fbf1cbfe994e22d2d890f330a933";
+      };
+    }
+    {
+      name = "webpack___webpack_4.42.0.tgz";
+      path = fetchurl {
+        name = "webpack___webpack_4.42.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz";
+        sha1 = "b901635dd6179391d90740a63c93f76f39883eb8";
+      };
+    }
+    {
+      name = "websocket_driver___websocket_driver_0.7.3.tgz";
+      path = fetchurl {
+        name = "websocket_driver___websocket_driver_0.7.3.tgz";
+        url  = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz";
+        sha1 = "a2d4e0d4f4f116f1e6297eba58b05d430100e9f9";
+      };
+    }
+    {
+      name = "websocket_extensions___websocket_extensions_0.1.3.tgz";
+      path = fetchurl {
+        name = "websocket_extensions___websocket_extensions_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz";
+        sha1 = "5d2ff22977003ec687a4b87073dfbbac146ccf29";
+      };
+    }
+    {
+      name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz";
+      path = fetchurl {
+        name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz";
+        sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0";
+      };
+    }
+    {
+      name = "whatwg_fetch___whatwg_fetch_3.0.0.tgz";
+      path = fetchurl {
+        name = "whatwg_fetch___whatwg_fetch_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz";
+        sha1 = "fc804e458cc460009b1a2b966bc8817d2578aefb";
+      };
+    }
+    {
+      name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz";
+      path = fetchurl {
+        name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz";
+        sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf";
+      };
+    }
+    {
+      name = "whatwg_url___whatwg_url_4.8.0.tgz";
+      path = fetchurl {
+        name = "whatwg_url___whatwg_url_4.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz";
+        sha1 = "d2981aa9148c1e00a41c5a6131166ab4683bbcc0";
+      };
+    }
+    {
+      name = "whatwg_url___whatwg_url_6.5.0.tgz";
+      path = fetchurl {
+        name = "whatwg_url___whatwg_url_6.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz";
+        sha1 = "f2df02bff176fd65070df74ad5ccbb5a199965a8";
+      };
+    }
+    {
+      name = "whatwg_url___whatwg_url_7.0.0.tgz";
+      path = fetchurl {
+        name = "whatwg_url___whatwg_url_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz";
+        sha1 = "fde926fa54a599f3adf82dff25a9f7be02dc6edd";
+      };
+    }
+    {
+      name = "which_module___which_module_2.0.0.tgz";
+      path = fetchurl {
+        name = "which_module___which_module_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz";
+        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
+      };
+    }
+    {
+      name = "which___which_1.3.1.tgz";
+      path = fetchurl {
+        name = "which___which_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz";
+        sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a";
+      };
+    }
+    {
+      name = "winchan___winchan_0.2.2.tgz";
+      path = fetchurl {
+        name = "winchan___winchan_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/winchan/-/winchan-0.2.2.tgz";
+        sha1 = "6766917b88e5e1cb75f455ffc7cc13f51e5c834e";
+      };
+    }
+    {
+      name = "window_size___window_size_0.1.0.tgz";
+      path = fetchurl {
+        name = "window_size___window_size_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+      };
+    }
+    {
+      name = "wordwrap___wordwrap_0.0.2.tgz";
+      path = fetchurl {
+        name = "wordwrap___wordwrap_0.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      };
+    }
+    {
+      name = "wordwrap___wordwrap_0.0.3.tgz";
+      path = fetchurl {
+        name = "wordwrap___wordwrap_0.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz";
+        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+      };
+    }
+    {
+      name = "wordwrap___wordwrap_1.0.0.tgz";
+      path = fetchurl {
+        name = "wordwrap___wordwrap_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz";
+        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+      };
+    }
+    {
+      name = "worker_farm___worker_farm_1.7.0.tgz";
+      path = fetchurl {
+        name = "worker_farm___worker_farm_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz";
+        sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8";
+      };
+    }
+    {
+      name = "worker_rpc___worker_rpc_0.1.1.tgz";
+      path = fetchurl {
+        name = "worker_rpc___worker_rpc_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/worker-rpc/-/worker-rpc-0.1.1.tgz";
+        sha1 = "cb565bd6d7071a8f16660686051e969ad32f54d5";
+      };
+    }
+    {
+      name = "wrap_ansi___wrap_ansi_2.1.0.tgz";
+      path = fetchurl {
+        name = "wrap_ansi___wrap_ansi_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+      };
+    }
+    {
+      name = "wrap_ansi___wrap_ansi_3.0.1.tgz";
+      path = fetchurl {
+        name = "wrap_ansi___wrap_ansi_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz";
+        sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba";
+      };
+    }
+    {
+      name = "wrap_ansi___wrap_ansi_5.1.0.tgz";
+      path = fetchurl {
+        name = "wrap_ansi___wrap_ansi_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
+        sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09";
+      };
+    }
+    {
+      name = "wrappy___wrappy_1.0.2.tgz";
+      path = fetchurl {
+        name = "wrappy___wrappy_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+      };
+    }
+    {
+      name = "write_file_atomic___write_file_atomic_2.4.1.tgz";
+      path = fetchurl {
+        name = "write_file_atomic___write_file_atomic_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz";
+        sha1 = "d0b05463c188ae804396fd5ab2a370062af87529";
+      };
+    }
+    {
+      name = "write___write_1.0.3.tgz";
+      path = fetchurl {
+        name = "write___write_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz";
+        sha1 = "0800e14523b923a387e415123c865616aae0f5c3";
+      };
+    }
+    {
+      name = "ws___ws_5.2.2.tgz";
+      path = fetchurl {
+        name = "ws___ws_5.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz";
+        sha1 = "dffef14866b8e8dc9133582514d1befaf96e980f";
+      };
+    }
+    {
+      name = "ws___ws_6.2.1.tgz";
+      path = fetchurl {
+        name = "ws___ws_6.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz";
+        sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb";
+      };
+    }
+    {
+      name = "x_is_string___x_is_string_0.1.0.tgz";
+      path = fetchurl {
+        name = "x_is_string___x_is_string_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz";
+        sha1 = "474b50865af3a49a9c4657f05acd145458f77d82";
+      };
+    }
+    {
+      name = "xml_name_validator___xml_name_validator_2.0.1.tgz";
+      path = fetchurl {
+        name = "xml_name_validator___xml_name_validator_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz";
+        sha1 = "4d8b8f1eccd3419aa362061becef515e1e559635";
+      };
+    }
+    {
+      name = "xml_name_validator___xml_name_validator_3.0.0.tgz";
+      path = fetchurl {
+        name = "xml_name_validator___xml_name_validator_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz";
+        sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a";
+      };
+    }
+    {
+      name = "xml2js___xml2js_0.4.19.tgz";
+      path = fetchurl {
+        name = "xml2js___xml2js_0.4.19.tgz";
+        url  = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz";
+        sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7";
+      };
+    }
+    {
+      name = "xml___xml_1.0.1.tgz";
+      path = fetchurl {
+        name = "xml___xml_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz";
+        sha1 = "78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5";
+      };
+    }
+    {
+      name = "xmlbuilder___xmlbuilder_9.0.7.tgz";
+      path = fetchurl {
+        name = "xmlbuilder___xmlbuilder_9.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz";
+        sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d";
+      };
+    }
+    {
+      name = "xtend___xtend_4.0.2.tgz";
+      path = fetchurl {
+        name = "xtend___xtend_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz";
+        sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54";
+      };
+    }
+    {
+      name = "xtend___xtend_4.0.1.tgz";
+      path = fetchurl {
+        name = "xtend___xtend_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz";
+        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
+      };
+    }
+    {
+      name = "y18n___y18n_4.0.0.tgz";
+      path = fetchurl {
+        name = "y18n___y18n_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz";
+        sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b";
+      };
+    }
+    {
+      name = "yallist___yallist_3.1.1.tgz";
+      path = fetchurl {
+        name = "yallist___yallist_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz";
+        sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd";
+      };
+    }
+    {
+      name = "yallist___yallist_4.0.0.tgz";
+      path = fetchurl {
+        name = "yallist___yallist_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz";
+        sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72";
+      };
+    }
+    {
+      name = "yargs_parser___yargs_parser_10.1.0.tgz";
+      path = fetchurl {
+        name = "yargs_parser___yargs_parser_10.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz";
+        sha1 = "7202265b89f7e9e9f2e5765e0fe735a905edbaa8";
+      };
+    }
+    {
+      name = "yargs_parser___yargs_parser_11.1.1.tgz";
+      path = fetchurl {
+        name = "yargs_parser___yargs_parser_11.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz";
+        sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4";
+      };
+    }
+    {
+      name = "yargs_parser___yargs_parser_13.1.1.tgz";
+      path = fetchurl {
+        name = "yargs_parser___yargs_parser_13.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz";
+        sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0";
+      };
+    }
+    {
+      name = "yargs___yargs_12.0.5.tgz";
+      path = fetchurl {
+        name = "yargs___yargs_12.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz";
+        sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13";
+      };
+    }
+    {
+      name = "yargs___yargs_13.2.4.tgz";
+      path = fetchurl {
+        name = "yargs___yargs_13.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz";
+        sha1 = "0b562b794016eb9651b98bd37acf364aa5d6dc83";
+      };
+    }
+    {
+      name = "yargs___yargs_3.10.0.tgz";
+      path = fetchurl {
+        name = "yargs___yargs_3.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz";
+        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
+      };
+    }
+    {
+      name = "yauzl___yauzl_2.10.0.tgz";
+      path = fetchurl {
+        name = "yauzl___yauzl_2.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz";
+        sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9";
+      };
+    }
+    {
+      name = "yn___yn_3.1.0.tgz";
+      path = fetchurl {
+        name = "yn___yn_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/yn/-/yn-3.1.0.tgz";
+        sha1 = "fcbe2db63610361afcc5eb9e0ac91e976d046114";
+      };
+    }
+    {
+      name = "z_schema___z_schema_4.1.0.tgz";
+      path = fetchurl {
+        name = "z_schema___z_schema_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/z-schema/-/z-schema-4.1.0.tgz";
+        sha1 = "8f824eabffdf018875cbcfa9b92dc3a348140b76";
+      };
+    }
+  ];
+}
diff --git a/pkgs/servers/nosql/influxdb2/update-influxdb2.sh b/pkgs/servers/nosql/influxdb2/update-influxdb2.sh
new file mode 100755
index 000000000000..826fa9251577
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb2/update-influxdb2.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=../../../../ -i bash -p wget yarn2nix
+
+set -euo pipefail
+
+if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
+    echo "Regenerates the Yarn dependency lock files for the influxdb UI."
+    echo "Usage: $0 <git release tag>"
+    exit 1
+fi
+
+INFLUXDB_SRC="https://raw.githubusercontent.com/influxdata/influxdb/$1"
+
+wget "$INFLUXDB_SRC/ui/package.json" -O influx-ui-package.json
+wget "$INFLUXDB_SRC/ui/yarn.lock" -O influx-ui-yarndeps.lock
+yarn2nix --lockfile=influx-ui-yarndeps.lock > influx-ui-yarndeps.nix
+rm influx-ui-yarndeps.lock
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92e68417e479..b33ef46844b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17246,6 +17246,7 @@ in
   };
 
   influxdb = callPackage ../servers/nosql/influxdb { };
+  influxdb2 = callPackage ../servers/nosql/influxdb2 { };
 
   mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {
     inherit (darwin) cctools developer_cmds;

From 366791e9ca982c029c19fc2c923892a6e966e3f7 Mon Sep 17 00:00:00 2001
From: Alvar <8402811+oxzi@users.noreply.github.com>
Date: Tue, 24 Nov 2020 16:20:43 +0100
Subject: [PATCH 3515/3942] golangci-lint: 1.32.2 -> 1.33.0 (#104768)

---
 pkgs/development/tools/golangci-lint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index e65f45e647d0..ddcbbb127585 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "golangci-lint";
-  version = "1.32.2";
+  version = "1.33.0";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    sha256 = "14zy8sq5bc26hxb3hg4afd7dpnrw25qi3g6v8y2p05isdf55laww";
+    sha256 = "1yqq5jai0npkjzfk2h121nv3pgqfqi5c3vs22wyv6qwnlia97yin";
   };
 
-  vendorSha256 = "1l73qqpyn40z2czh2d8wgp3lpj6vnv8ll29yyryx0wm59ric732g";
+  vendorSha256 = "1kmsfsa5z41mjxi15a4zra1qhskm5pjcfbk09c99xbv27pin5yrj";
 
   doCheck = false;
 

From 54130aa9de04438f8f6877f2f188a2e1a95d5a7a Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 24 Nov 2020 16:48:11 +0100
Subject: [PATCH 3516/3942] dhallPackages.Prelude: 13.0.0 -> 19.0.0

---
 pkgs/development/dhall-modules/Prelude.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/dhall-modules/Prelude.nix b/pkgs/development/dhall-modules/Prelude.nix
index 36bfda403c8d..2fe084753e62 100644
--- a/pkgs/development/dhall-modules/Prelude.nix
+++ b/pkgs/development/dhall-modules/Prelude.nix
@@ -1,11 +1,11 @@
 { buildDhallGitHubPackage }:
 
 buildDhallGitHubPackage {
-  name      = "Prelude-13.0.0";
+  name      = "Prelude-19.0.0";
   owner     = "dhall-lang";
   repo      = "dhall-lang";
   directory = "Prelude";
   file      = "package.dhall";
-  rev       = "48db9e1ff1f8881fa4310085834fbc19e313ebf0";
-  sha256    = "0kg3rzag3irlcldck63rjspls614bc2sbs3zq44h0pzcz9v7z5h9";
+  rev       = "v19.0.0";
+  sha256    = "04m29f5xlks6rarv1gy909j68bsflwl18l9bg7kyy1vpwap0avkp";
 }

From 2545e3f370ce739aa50c9bcbe01517190d2e4d08 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 23 Nov 2020 16:26:26 -0800
Subject: [PATCH 3517/3942] python2Packages.cryptography: mark insecure,
 CVE-2020-25659

---
 pkgs/development/python-modules/cryptography/2.9.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/cryptography/2.9.nix b/pkgs/development/python-modules/cryptography/2.9.nix
index 6a6187e5693d..3bbb67c52405 100644
--- a/pkgs/development/python-modules/cryptography/2.9.nix
+++ b/pkgs/development/python-modules/cryptography/2.9.nix
@@ -70,5 +70,6 @@ buildPythonPackage rec {
       + replaceStrings [ "." ] [ "-" ] version;
     license = with licenses; [ asl20 bsd3 psfl ];
     maintainers = with maintainers; [ primeos ];
+    knownVulnerabilities = [ "CVE-2020-25659" "https://github.com/advisories/GHSA-hggm-jpg3-v476" ];
   };
 }

From 6993bd0b56979bdb258c8466cc9ae55e890f8594 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 24 Nov 2020 16:43:44 +0000
Subject: [PATCH 3518/3942] rustscan: 1.10.1 -> 2.0.1

---
 pkgs/tools/security/rustscan/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix
index f36565479512..43b6a3a0afd7 100644
--- a/pkgs/tools/security/rustscan/default.nix
+++ b/pkgs/tools/security/rustscan/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rustscan";
-  version = "1.10.1";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "RustScan";
     repo = pname;
     rev = version;
-    sha256 = "0dhy7b73ipsxsr7wlc3r5yy39i3cjrdszhsw9xwjj31692s3b605";
+    sha256 = "0fdbsz1v7bb5dm3zqjs1qf73lb1m4qzkqyb3h3hbyrp9vklgxsgw";
   };
 
-  cargoSha256 = "00s1iv8yw06647ijw9p3l5n7d899gsks5j8ljag6ha7hgl5vs4ci";
+  cargoSha256 = "039xarscwqndpyrr3sgzkhqna3c908zh06id8x2qaykm8l248zs9";
 
   postPatch = ''
     substituteInPlace src/main.rs \
@@ -25,6 +25,8 @@ rustPlatform.buildRustPackage rec {
     "--skip=google_dns_runs"
     "--skip=parse_correct_host_addresses"
     "--skip=parse_hosts_file_and_incorrect_hosts"
+    "--skip=run_perl_script"
+    "--skip=run_python_script"
   ];
 
   meta = with stdenv.lib; {

From 0a1c0fe6589abf7a8f04a97f94a32bf073fed316 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 24 Nov 2020 18:38:23 +0100
Subject: [PATCH 3519/3942] k9s: 0.23.10 -> 0.24.1

---
 pkgs/applications/networking/cluster/k9s/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index ec5b6f44c6f8..9e188c0f7e2d 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "k9s";
-  version = "0.23.10";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner  = "derailed";
     repo   = "k9s";
     rev    = "v${version}";
-    sha256 = "0nfgi67ja36mymhcyh4902680pkfnk4g8j8nbajksx9nfp53n91v";
+    sha256 = "1b67a417b0914ccl7drdfd7bq1qsfkw9haqz4m5j96qb0l5p71w2";
   };
 
   buildFlagsArray = ''
@@ -18,7 +18,7 @@ buildGoModule rec {
       -X github.com/derailed/k9s/cmd.commit=${src.rev}
   '';
 
-  vendorSha256 = "116aidry55917ays7rn5r5kj17nbgb9qi16bplml9kxfkjv072kz";
+  vendorSha256 = "01g50sfk0k7v60m3anfiq2w9pzl2wpa985s22ciq911h3fscka3f";
 
   doCheck = false;
 

From bc49a0815ae860010b4d593b02f00ab6f07d50ea Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 24 Nov 2020 10:29:28 -0500
Subject: [PATCH 3520/3942] utillinux: rename to util-linux

---
 nixos/lib/make-disk-image.nix                 |  4 +--
 nixos/modules/config/swap.nix                 |  2 +-
 nixos/modules/config/system-path.nix          |  2 +-
 nixos/modules/config/zram.nix                 |  4 +--
 nixos/modules/installer/cd-dvd/sd-image.nix   |  6 ++--
 .../cd-dvd/system-tarball-sheevaplug.nix      |  2 +-
 nixos/modules/programs/x2goserver.nix         |  2 +-
 nixos/modules/security/pam_mount.nix          |  2 +-
 nixos/modules/security/wrappers/default.nix   |  4 +--
 nixos/modules/services/admin/salt/master.nix  |  2 +-
 nixos/modules/services/admin/salt/minion.nix  |  2 +-
 nixos/modules/services/backup/tarsnap.nix     |  4 +--
 .../services/cluster/kubernetes/kubelet.nix   |  2 +-
 .../modules/services/computing/torque/mom.nix |  2 +-
 .../services/computing/torque/server.nix      |  2 +-
 .../continuous-integration/gitlab-runner.nix  |  2 +-
 nixos/modules/services/databases/riak.nix     |  2 +-
 .../services/desktops/profile-sync-daemon.nix |  4 +--
 nixos/modules/services/hardware/udev.nix      |  6 ++--
 nixos/modules/services/misc/fstrim.nix        |  2 +-
 nixos/modules/services/misc/gitlab.nix        |  2 +-
 .../modules/services/misc/matrix-synapse.nix  |  2 +-
 nixos/modules/services/misc/nix-daemon.nix    |  2 +-
 nixos/modules/services/monitoring/netdata.nix |  2 +-
 nixos/modules/services/monitoring/smartd.nix  |  2 +-
 .../network-filesystems/openafs/client.nix    |  2 +-
 .../services/network-filesystems/xtreemfs.nix |  6 ++--
 .../services/networking/networkmanager.nix    |  2 +-
 .../networking/strongswan-swanctl/module.nix  |  2 +-
 .../services/networking/strongswan.nix        |  2 +-
 nixos/modules/services/system/cloud-init.nix  |  2 +-
 .../modules/services/torrent/transmission.nix |  6 ++--
 nixos/modules/services/ttys/agetty.nix        |  2 +-
 nixos/modules/services/web-apps/gerrit.nix    |  2 +-
 .../web-servers/apache-httpd/default.nix      |  4 +--
 .../modules/services/x11/terminal-server.nix  |  2 +-
 .../system/activation/activation-script.nix   |  2 +-
 nixos/modules/system/activation/top-level.nix |  3 +-
 nixos/modules/system/boot/grow-partition.nix  |  4 +--
 .../modules/system/boot/loader/grub/grub.nix  |  4 +--
 nixos/modules/system/boot/shutdown.nix        |  2 +-
 nixos/modules/system/boot/stage-1.nix         |  6 ++--
 nixos/modules/system/boot/stage-2.nix         |  2 +-
 nixos/modules/tasks/filesystems.nix           |  2 +-
 .../tasks/filesystems/unionfs-fuse.nix        |  6 ++--
 nixos/modules/tasks/filesystems/zfs.nix       |  2 +-
 nixos/modules/virtualisation/amazon-image.nix |  2 +-
 nixos/modules/virtualisation/azure-agent.nix  |  2 +-
 .../virtualisation/brightbox-image.nix        |  2 +-
 nixos/modules/virtualisation/qemu-vm.nix      |  2 +-
 nixos/modules/virtualisation/xen-dom0.nix     |  4 +--
 nixos/tests/os-prober.nix                     |  2 +-
 nixos/tests/systemd.nix                       |  2 +-
 nixos/tests/virtualbox.nix                    |  6 ++--
 pkgs/applications/audio/clerk/default.nix     |  4 +--
 .../applications/audio/strawberry/default.nix |  4 +--
 pkgs/applications/audio/whipper/default.nix   |  4 +--
 pkgs/applications/blockchains/bitcoin-abc.nix |  4 +--
 .../blockchains/bitcoin-classic.nix           |  4 +--
 .../blockchains/bitcoin-knots.nix             |  4 +--
 .../blockchains/bitcoin-unlimited.nix         |  4 +--
 pkgs/applications/blockchains/bitcoin.nix     |  4 +--
 pkgs/applications/blockchains/dashpay.nix     |  4 +--
 pkgs/applications/blockchains/dogecoin.nix    |  4 +--
 .../blockchains/exodus/default.nix            |  4 +--
 pkgs/applications/blockchains/litecoin.nix    |  4 +--
 pkgs/applications/blockchains/pivx.nix        |  4 +--
 .../blockchains/zcash/default.nix             |  4 +--
 .../applications/graphics/comical/default.nix |  4 +--
 pkgs/applications/misc/clight/clightd.nix     |  4 +--
 pkgs/applications/misc/clipmenu/default.nix   |  4 +--
 pkgs/applications/misc/corectrl/default.nix   |  4 +--
 pkgs/applications/misc/imag/default.nix       |  4 +--
 pkgs/applications/misc/lutris/fhsenv.nix      |  2 +-
 .../misc/multibootusb/default.nix             |  4 +--
 .../misc/todoist-electron/default.nix         |  4 +--
 pkgs/applications/misc/udevil/default.nix     |  8 ++---
 pkgs/applications/misc/vifm/default.nix       |  4 +--
 .../networking/browsers/chromium/common.nix   |  4 +--
 .../browsers/google-chrome/default.nix        |  4 +--
 .../browsers/ungoogled-chromium/common.nix    |  4 +--
 .../networking/cluster/k3s/default.nix        |  4 +--
 .../networking/cluster/openshift/default.nix  |  2 +-
 .../cluster/spacegun/node-composition.nix     |  2 +-
 .../networking/firehol/default.nix            |  4 +--
 .../matrix-recorder/composition.nix           |  2 +-
 .../matrix-recorder/node-env.nix              |  8 ++---
 .../telegram/tdesktop/default.nix             |  4 +--
 .../instant-messengers/zoom-us/default.nix    |  4 +--
 .../networking/remote/x2goserver/default.nix  |  4 +--
 .../networking/testssl/default.nix            |  4 +--
 .../office/libreoffice/default.nix            |  4 +--
 .../applications/office/softmaker/generic.nix |  4 +--
 .../science/math/calc/default.nix             |  4 +--
 .../terminal-emulators/roxterm/default.nix    |  4 +--
 .../commitizen/node-composition.nix           |  2 +-
 .../commitizen/node-env.nix                   |  8 ++---
 .../git-and-tools/default.nix                 |  2 +-
 .../git-and-tools/git-recent/default.nix      |  6 ++--
 .../git-and-tools/hub/default.nix             |  4 +--
 .../git-and-tools/transcrypt/default.nix      |  6 ++--
 pkgs/applications/video/vcs/default.nix       |  4 +--
 pkgs/applications/video/vdr/plugins.nix       |  4 +--
 .../virtualization/OVMF/default.nix           |  4 +--
 .../virtualization/containerd/default.nix     |  4 +--
 .../virtualization/cri-o/wrapper.nix          |  4 +--
 .../virtualization/docker/default.nix         |  4 +--
 .../virtualization/podman/wrapper.nix         |  4 +--
 .../virtualization/singularity/default.nix    |  4 +--
 .../virtualization/virt-manager/qt.nix        |  4 +--
 .../virtualization/xen/generic.nix            |  8 ++---
 pkgs/build-support/docker/default.nix         |  4 +--
 .../singularity-tools/default.nix             |  4 +--
 pkgs/build-support/vm/default.nix             | 32 +++++++++----------
 pkgs/desktops/enlightenment/efl/default.nix   |  4 +--
 pkgs/desktops/plasma-5/discover.nix           |  4 +--
 .../plasma-5/plasma-desktop/default.nix       |  4 +--
 .../elm/packages/node-composition.nix         |  2 +-
 pkgs/development/compilers/osl/default.nix    |  4 +--
 .../haskell-modules/hackage-packages.nix      |  6 ++--
 pkgs/development/libraries/bobcat/default.nix |  4 +--
 pkgs/development/libraries/glib/default.nix   |  8 ++---
 pkgs/development/libraries/gnutls/default.nix |  4 +--
 .../libraries/hyperscan/default.nix           |  4 +--
 .../development/libraries/kpmcore/default.nix |  4 +--
 .../libraries/libblockdev/default.nix         |  4 +--
 .../libraries/libndctl/default.nix            |  4 +--
 .../libraries/libseccomp/default.nix          |  4 +--
 pkgs/development/libraries/libvirt/5.9.0.nix  |  4 +--
 .../development/libraries/libvirt/default.nix |  4 +--
 .../development/libraries/libxsmm/default.nix |  4 +--
 .../development/libraries/speechd/default.nix |  4 +--
 .../libraries/volume-key/default.nix          |  4 +--
 .../misc/google-clasp/google-clasp.nix        |  2 +-
 pkgs/development/mobile/abootimg/default.nix  |  4 +--
 .../development/node-packages/composition.nix |  2 +-
 pkgs/development/node-packages/node-env.nix   |  8 ++---
 .../python-modules/blivet/default.nix         |  6 ++--
 .../python-modules/coloredlogs/default.nix    |  4 +--
 .../git-annex-adapter/default.nix             |  4 +--
 .../python-modules/nuitka/default.nix         |  2 +-
 .../python-modules/pytorch/default.nix        |  4 +--
 .../python-modules/supervise_api/default.nix  |  4 +--
 .../python-modules/xlib/default.nix           |  4 +--
 .../development/r-modules/generic-builder.nix |  4 +--
 .../ruby-modules/gem-config/default.nix       |  6 ++--
 pkgs/development/tools/buildah/wrapper.nix    |  4 +--
 .../tools/git-quick-stats/default.nix         |  4 +--
 pkgs/development/tools/halfempty/default.nix  |  4 +--
 .../tools/misc/creduce/default.nix            |  4 +--
 .../tools/misc/usb-modeswitch/default.nix     |  4 +--
 pkgs/development/tools/misc/yodl/default.nix  |  4 +--
 .../web/newman/node-composition.nix           |  2 +-
 pkgs/development/web/newman/node-env.nix      |  8 ++---
 pkgs/development/web/nodejs/nodejs.nix        |  4 +--
 pkgs/development/web/remarkjs/nodepkgs.nix    |  2 +-
 pkgs/games/unnethack/default.nix              |  4 +--
 pkgs/misc/base16-builder/node-packages.nix    |  2 +-
 .../cups/drivers/mfcj6510dwlpr/default.nix    |  4 +--
 pkgs/misc/drivers/hplip/3.16.11.nix           |  4 +--
 pkgs/misc/drivers/hplip/3.18.5.nix            |  4 +--
 pkgs/misc/drivers/hplip/default.nix           |  4 +--
 pkgs/misc/emulators/cdemu/libmirage.nix       |  4 +--
 pkgs/misc/emulators/qmc2/default.nix          |  4 +--
 pkgs/misc/emulators/wine/staging.nix          |  2 +-
 .../ms-vsliveshare-vsliveshare/default.nix    |  4 +--
 .../os-specific/linux/displaylink/default.nix |  4 +--
 pkgs/os-specific/linux/eudev/default.nix      |  4 +--
 pkgs/os-specific/linux/fuse/common.nix        |  4 +--
 pkgs/os-specific/linux/fuse/default.nix       |  4 +--
 .../linux/kernel/linux-hardkernel-4.14.nix    |  2 +-
 .../linux/kernel/manual-config.nix            |  2 +-
 pkgs/os-specific/linux/ldm/default.nix        |  4 +--
 pkgs/os-specific/linux/lvm2/default.nix       |  2 +-
 pkgs/os-specific/linux/lxcfs/default.nix      |  6 ++--
 pkgs/os-specific/linux/mcelog/default.nix     |  4 +--
 pkgs/os-specific/linux/mdadm/default.nix      |  4 +--
 pkgs/os-specific/linux/nfs-utils/default.nix  |  4 +--
 pkgs/os-specific/linux/open-iscsi/default.nix |  4 +--
 pkgs/os-specific/linux/openrazer/driver.nix   |  4 +--
 .../os-specific/linux/openvswitch/default.nix |  4 +--
 pkgs/os-specific/linux/openvswitch/lts.nix    |  4 +--
 pkgs/os-specific/linux/pam_mount/default.nix  |  6 ++--
 pkgs/os-specific/linux/pktgen/default.nix     |  4 +--
 pkgs/os-specific/linux/pm-utils/default.nix   |  4 +--
 pkgs/os-specific/linux/pmount/default.nix     |  8 ++---
 pkgs/os-specific/linux/prl-tools/default.nix  |  4 +--
 pkgs/os-specific/linux/systemd/default.nix    | 16 +++++-----
 pkgs/os-specific/linux/tomb/default.nix       |  4 +--
 pkgs/os-specific/linux/udisks/1-default.nix   |  4 +--
 pkgs/os-specific/linux/udisks/2-default.nix   |  6 ++--
 pkgs/os-specific/linux/zfs/default.nix        | 14 ++++----
 pkgs/servers/apcupsd/default.nix              |  4 +--
 pkgs/servers/asterisk/default.nix             |  4 +--
 pkgs/servers/computing/torque/default.nix     |  4 +--
 pkgs/servers/hylafaxplus/default.nix          |  4 +--
 .../node-composition.nix                      |  2 +-
 .../node-composition.nix                      |  2 +-
 pkgs/servers/search/elasticsearch/6.x.nix     |  6 ++--
 pkgs/servers/search/elasticsearch/7.x.nix     |  6 ++--
 .../web-apps/cryptpad/node-packages.nix       |  2 +-
 pkgs/servers/xmpp/ejabberd/default.nix        |  4 +--
 pkgs/servers/zigbee2mqtt/node.nix             |  2 +-
 pkgs/servers/zoneminder/default.nix           |  4 +--
 pkgs/shells/bash/4.4.nix                      |  4 +--
 pkgs/shells/bash/5.0.nix                      |  4 +--
 pkgs/shells/fish/default.nix                  |  4 +--
 pkgs/tools/X11/xpra/default.nix               |  4 +--
 pkgs/tools/archivers/fsarchiver/default.nix   |  4 +--
 pkgs/tools/backup/btrbk/default.nix           |  4 +--
 pkgs/tools/backup/duplicity/default.nix       |  4 +--
 pkgs/tools/backup/ori/default.nix             |  4 +--
 pkgs/tools/bluetooth/blueberry/default.nix    |  8 ++---
 pkgs/tools/cd-dvd/bashburn/default.nix        |  6 ++--
 pkgs/tools/cd-dvd/unetbootin/default.nix      |  8 ++---
 pkgs/tools/compression/pigz/default.nix       |  4 +--
 .../filesystems/bcache-tools/default.nix      |  4 +--
 pkgs/tools/filesystems/bees/default.nix       |  7 ++--
 pkgs/tools/filesystems/ceph/default.nix       |  4 +--
 pkgs/tools/filesystems/fatresize/default.nix  |  6 ++--
 pkgs/tools/filesystems/glusterfs/default.nix  | 10 +++---
 pkgs/tools/filesystems/nixpart/0.4/blivet.nix |  6 ++--
 .../tools/filesystems/nixpart/0.4/default.nix |  6 ++--
 pkgs/tools/filesystems/nixpart/0.4/lvm2.nix   |  4 +--
 pkgs/tools/filesystems/nixpart/0.4/parted.nix |  4 +--
 pkgs/tools/filesystems/ntfs-3g/default.nix    |  6 ++--
 pkgs/tools/misc/calamares/default.nix         |  4 +--
 pkgs/tools/misc/cloud-utils/default.nix       |  4 +--
 pkgs/tools/misc/debootstrap/default.nix       |  4 +--
 pkgs/tools/misc/etcher/default.nix            |  4 +--
 pkgs/tools/misc/gparted/default.nix           |  4 +--
 pkgs/tools/misc/memtest86-efi/default.nix     |  4 +--
 pkgs/tools/misc/ostree/default.nix            |  4 +--
 pkgs/tools/misc/parted/default.nix            |  4 +--
 pkgs/tools/misc/partition-manager/default.nix |  4 +--
 .../misc/profile-sync-daemon/default.nix      |  4 +--
 pkgs/tools/misc/rmlint/default.nix            |  6 ++--
 pkgs/tools/misc/rpm-ostree/default.nix        |  4 +--
 pkgs/tools/misc/snapper/default.nix           |  4 +--
 pkgs/tools/misc/tlp/default.nix               |  4 +--
 pkgs/tools/misc/woeusb/default.nix            |  4 +--
 pkgs/tools/misc/xfstests/default.nix          |  4 +--
 pkgs/tools/misc/xvfb-run/default.nix          |  4 +--
 pkgs/tools/networking/airfield/node.nix       |  2 +-
 pkgs/tools/networking/bud/default.nix         |  4 +--
 pkgs/tools/networking/cjdns/default.nix       |  4 +--
 pkgs/tools/networking/openvpn/default.nix     |  4 +--
 .../openvpn/openvpn_learnaddress.nix          |  6 ++--
 .../openvpn/update-systemd-resolved.nix       |  4 +--
 pkgs/tools/networking/shorewall/default.nix   |  6 ++--
 pkgs/tools/networking/tgt/default.nix         |  2 +-
 pkgs/tools/package-management/nixui/nixui.nix |  2 +-
 pkgs/tools/security/ecryptfs/default.nix      |  6 ++--
 pkgs/tools/security/pass/rofi-pass.nix        |  4 +--
 pkgs/tools/security/scrypt/default.nix        |  4 +--
 pkgs/tools/system/facter/default.nix          |  4 +--
 pkgs/tools/system/inxi/default.nix            |  4 +--
 pkgs/tools/system/rofi-systemd/default.nix    |  4 +--
 .../alpine-make-vm-image/default.nix          |  4 +--
 .../google-compute-engine/default.nix         |  8 ++---
 .../nixos-container/default.nix               |  4 +--
 pkgs/top-level/aliases.nix                    |  3 +-
 pkgs/top-level/all-packages.nix               | 30 ++++++++---------
 pkgs/top-level/release-small.nix              |  4 +--
 pkgs/top-level/unix-tools.nix                 | 32 +++++++++----------
 265 files changed, 574 insertions(+), 571 deletions(-)

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index a4a488a1b3ea..0ad0cf1fef5a 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -134,7 +134,7 @@ let format' = format; in let
 
   binPath = with pkgs; makeBinPath (
     [ rsync
-      utillinux
+      util-linux
       parted
       e2fsprogs
       lkl
@@ -239,7 +239,7 @@ let format' = format; in let
 in pkgs.vmTools.runInLinuxVM (
   pkgs.runCommand name
     { preVM = prepareImage;
-      buildInputs = with pkgs; [ utillinux e2fsprogs dosfstools ];
+      buildInputs = with pkgs; [ util-linux e2fsprogs dosfstools ];
       postVM = ''
         ${if format == "raw" then ''
           mv $diskImage $out/${filename}
diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index adb4e2294213..4bb66e9b5144 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -187,7 +187,7 @@ in
             before = [ "${realDevice'}.swap" ];
             # If swap is encrypted, depending on rngd resolves a possible entropy starvation during boot
             after = mkIf (config.security.rngd.enable && sw.randomEncryption.enable) [ "rngd.service" ];
-            path = [ pkgs.utillinux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup;
+            path = [ pkgs.util-linux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup;
 
             script =
               ''
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index c65fa1a684f8..27d1cef849bc 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -37,7 +37,7 @@ let
       pkgs.procps
       pkgs.su
       pkgs.time
-      pkgs.utillinux
+      pkgs.util-linux
       pkgs.which
       pkgs.zstd
     ];
diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix
index 5e9870bf6b1c..341101bc184c 100644
--- a/nixos/modules/config/zram.nix
+++ b/nixos/modules/config/zram.nix
@@ -149,8 +149,8 @@ in
                   print int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024)
               }' /proc/meminfo)
 
-              ${pkgs.utillinux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev}
-              ${pkgs.utillinux}/sbin/mkswap /dev/${dev}
+              ${pkgs.util-linux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev}
+              ${pkgs.util-linux}/sbin/mkswap /dev/${dev}
             '';
             restartIfChanged = false;
           };
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index 231c7bf0a6c2..d9799aa69c95 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -147,10 +147,10 @@ in
     sdImage.storePaths = [ config.system.build.toplevel ];
 
     system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs,
-    mtools, libfaketime, utillinux, zstd }: stdenv.mkDerivation {
+    mtools, libfaketime, util-linux, zstd }: stdenv.mkDerivation {
       name = config.sdImage.imageName;
 
-      nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux zstd ];
+      nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime util-linux zstd ];
 
       inherit (config.sdImage) compressImage;
 
@@ -221,7 +221,7 @@ in
         set -euo pipefail
         set -x
         # Figure out device names for the boot device and root filesystem.
-        rootPart=$(${pkgs.utillinux}/bin/findmnt -n -o SOURCE /)
+        rootPart=$(${pkgs.util-linux}/bin/findmnt -n -o SOURCE /)
         bootDevice=$(lsblk -npo PKNAME $rootPart)
 
         # Resize the root partition and the filesystem to fit the disk
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 8408f56f94f9..0e67ae7de698 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -96,7 +96,7 @@ in
 
   boot.initrd.extraUtilsCommands =
     ''
-      copy_bin_and_libs ${pkgs.utillinux}/sbin/hwclock
+      copy_bin_and_libs ${pkgs.util-linux}/sbin/hwclock
     '';
 
   boot.initrd.postDeviceCommands =
diff --git a/nixos/modules/programs/x2goserver.nix b/nixos/modules/programs/x2goserver.nix
index 7d74231e956b..05707a56542f 100644
--- a/nixos/modules/programs/x2goserver.nix
+++ b/nixos/modules/programs/x2goserver.nix
@@ -110,7 +110,7 @@ in {
       "L+ /usr/local/bin/chmod - - - - ${coreutils}/bin/chmod"
       "L+ /usr/local/bin/cp - - - - ${coreutils}/bin/cp"
       "L+ /usr/local/bin/sed - - - - ${gnused}/bin/sed"
-      "L+ /usr/local/bin/setsid - - - - ${utillinux}/bin/setsid"
+      "L+ /usr/local/bin/setsid - - - - ${util-linux}/bin/setsid"
       "L+ /usr/local/bin/xrandr - - - - ${xorg.xrandr}/bin/xrandr"
       "L+ /usr/local/bin/xmodmap - - - - ${xorg.xmodmap}/bin/xmodmap"
     ];
diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix
index 89211bfbde48..9a0143c155c5 100644
--- a/nixos/modules/security/pam_mount.nix
+++ b/nixos/modules/security/pam_mount.nix
@@ -60,7 +60,7 @@ in
           <!-- if activated, requires ofl from hxtools to be present -->
           <logout wait="0" hup="no" term="no" kill="no" />
           <!-- set PATH variable for pam_mount module -->
-          <path>${pkgs.utillinux}/bin</path>
+          <path>${pkgs.util-linux}/bin</path>
           <!-- create mount point if not present -->
           <mkmountpoint enable="1" remove="true" />
 
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 52de21bca9bf..de6213714ac3 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -163,8 +163,8 @@ in
       # These are mount related wrappers that require the +s permission.
       fusermount.source = "${pkgs.fuse}/bin/fusermount";
       fusermount3.source = "${pkgs.fuse3}/bin/fusermount3";
-      mount.source = "${lib.getBin pkgs.utillinux}/bin/mount";
-      umount.source = "${lib.getBin pkgs.utillinux}/bin/umount";
+      mount.source = "${lib.getBin pkgs.util-linux}/bin/mount";
+      umount.source = "${lib.getBin pkgs.util-linux}/bin/umount";
     };
 
     boot.specialFileSystems.${parentWrapperDir} = {
diff --git a/nixos/modules/services/admin/salt/master.nix b/nixos/modules/services/admin/salt/master.nix
index cb803d323bbd..a3069c81c19a 100644
--- a/nixos/modules/services/admin/salt/master.nix
+++ b/nixos/modules/services/admin/salt/master.nix
@@ -45,7 +45,7 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       path = with pkgs; [
-        utillinux  # for dmesg
+        util-linux  # for dmesg
       ];
       serviceConfig = {
         ExecStart = "${pkgs.salt}/bin/salt-master";
diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixos/modules/services/admin/salt/minion.nix
index c8fa9461a209..ac124c570d8d 100644
--- a/nixos/modules/services/admin/salt/minion.nix
+++ b/nixos/modules/services/admin/salt/minion.nix
@@ -50,7 +50,7 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       path = with pkgs; [
-        utillinux
+        util-linux
       ];
       serviceConfig = {
         ExecStart = "${pkgs.salt}/bin/salt-minion";
diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 6d99a1efb613..e1200731c2ca 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -308,7 +308,7 @@ in
         requires    = [ "network-online.target" ];
         after       = [ "network-online.target" ];
 
-        path = with pkgs; [ iputils tarsnap utillinux ];
+        path = with pkgs; [ iputils tarsnap util-linux ];
 
         # In order for the persistent tarsnap timer to work reliably, we have to
         # make sure that the tarsnap server is reachable after systemd starts up
@@ -355,7 +355,7 @@ in
         description = "Tarsnap restore '${name}'";
         requires    = [ "network-online.target" ];
 
-        path = with pkgs; [ iputils tarsnap utillinux ];
+        path = with pkgs; [ iputils tarsnap util-linux ];
 
         script = let
           tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index c3d67552cc8c..2b6e45ba1b90 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -241,7 +241,7 @@ in
         description = "Kubernetes Kubelet Service";
         wantedBy = [ "kubernetes.target" ];
         after = [ "network.target" "docker.service" "kube-apiserver.service" ];
-        path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path;
+        path = with pkgs; [ gitMinimal openssh docker util-linux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path;
         preStart = ''
           ${concatMapStrings (img: ''
             echo "Seeding docker image: ${img}"
diff --git a/nixos/modules/services/computing/torque/mom.nix b/nixos/modules/services/computing/torque/mom.nix
index 0c5f43cf3e6a..6747bd4b0d5a 100644
--- a/nixos/modules/services/computing/torque/mom.nix
+++ b/nixos/modules/services/computing/torque/mom.nix
@@ -32,7 +32,7 @@ in
     environment.systemPackages = [ pkgs.torque ];
 
     systemd.services.torque-mom-init = {
-      path = with pkgs; [ torque utillinux procps inetutils ];
+      path = with pkgs; [ torque util-linux procps inetutils ];
 
       script = ''
         pbs_mkdirs -v aux
diff --git a/nixos/modules/services/computing/torque/server.nix b/nixos/modules/services/computing/torque/server.nix
index 21c5a4f46724..8d923fc04d46 100644
--- a/nixos/modules/services/computing/torque/server.nix
+++ b/nixos/modules/services/computing/torque/server.nix
@@ -21,7 +21,7 @@ in
     environment.systemPackages = [ pkgs.torque ];
 
     systemd.services.torque-server-init = {
-      path = with pkgs; [ torque utillinux procps inetutils ];
+      path = with pkgs; [ torque util-linux procps inetutils ];
 
       script = ''
         tmpsetup=$(mktemp -t torque-XXXX)
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 431555309cc9..c358a5db77c2 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -541,7 +541,7 @@ in
         jq
         moreutils
         remarshal
-        utillinux
+        util-linux
         cfg.package
       ] ++ cfg.extraPackages;
       reloadIfChanged = true;
diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix
index 885215209bdf..657eeea87bf4 100644
--- a/nixos/modules/services/databases/riak.nix
+++ b/nixos/modules/services/databases/riak.nix
@@ -118,7 +118,7 @@ in
       after = [ "network.target" ];
 
       path = [
-        pkgs.utillinux # for `logger`
+        pkgs.util-linux # for `logger`
         pkgs.bash
       ];
 
diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix
index a8ac22ac1276..6206295272fc 100644
--- a/nixos/modules/services/desktops/profile-sync-daemon.nix
+++ b/nixos/modules/services/desktops/profile-sync-daemon.nix
@@ -36,7 +36,7 @@ in {
             description = "Profile Sync daemon";
             wants = [ "psd-resync.service" ];
             wantedBy = [ "default.target" ];
-            path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
+            path = with pkgs; [ rsync kmod gawk nettools util-linux profile-sync-daemon ];
             unitConfig = {
               RequiresMountsFor = [ "/home/" ];
             };
@@ -55,7 +55,7 @@ in {
             wants = [ "psd-resync.timer" ];
             partOf = [ "psd.service" ];
             wantedBy = [ "default.target" ];
-            path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
+            path = with pkgs; [ rsync kmod gawk nettools util-linux profile-sync-daemon ];
             serviceConfig = {
               Type = "oneshot";
               ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync";
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 587b9b0234aa..a212adb7342d 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -57,8 +57,8 @@ let
         substituteInPlace $i \
           --replace \"/sbin/modprobe \"${pkgs.kmod}/bin/modprobe \
           --replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \
-          --replace \"/sbin/blkid \"${pkgs.utillinux}/sbin/blkid \
-          --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount \
+          --replace \"/sbin/blkid \"${pkgs.util-linux}/sbin/blkid \
+          --replace \"/bin/mount \"${pkgs.util-linux}/bin/mount \
           --replace /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \
           --replace /usr/bin/basename ${pkgs.coreutils}/bin/basename
       done
@@ -280,7 +280,7 @@ in
 
     services.udev.packages = [ extraUdevRules extraHwdbFile ];
 
-    services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux udev ];
+    services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.util-linux udev ];
 
     boot.kernelParams = mkIf (!config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ];
 
diff --git a/nixos/modules/services/misc/fstrim.nix b/nixos/modules/services/misc/fstrim.nix
index b8841a7fe74c..5258f5acb410 100644
--- a/nixos/modules/services/misc/fstrim.nix
+++ b/nixos/modules/services/misc/fstrim.nix
@@ -31,7 +31,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    systemd.packages = [ pkgs.utillinux ];
+    systemd.packages = [ pkgs.util-linux ];
 
     systemd.timers.fstrim = {
       timerConfig = {
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index c4037b49e7e2..934203992790 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -658,7 +658,7 @@ in {
       script = ''
         set -eu
 
-        PSQL="${pkgs.utillinux}/bin/runuser -u ${pgsql.superUser} -- psql --port=${toString pgsql.port}"
+        PSQL="${pkgs.util-linux}/bin/runuser -u ${pgsql.superUser} -- psql --port=${toString pgsql.port}"
 
         $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"'
         current_owner=$($PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'")
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 7f42184735c8..3abb9b7d69c8 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -713,7 +713,7 @@ in {
             ${ concatMapStringsSep "\n  " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
             --keys-directory ${cfg.dataDir}
         '';
-        ExecReload = "${pkgs.utillinux}/bin/kill -HUP $MAINPID";
+        ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";
         Restart = "on-failure";
       };
     };
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index ed05882a6343..0eeff31d6c4d 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -539,7 +539,7 @@ in
     systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
 
     systemd.services.nix-daemon =
-      { path = [ nix pkgs.utillinux config.programs.ssh.package ]
+      { path = [ nix pkgs.util-linux config.programs.ssh.package ]
           ++ optionals cfg.distributedBuilds [ pkgs.gzip ];
 
         environment = cfg.envVars
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index 2e73e15d3a86..db51fdbd2c61 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -142,7 +142,7 @@ in {
       serviceConfig = {
         Environment="PYTHONPATH=${cfg.package}/libexec/netdata/python.d/python_modules";
         ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c ${configFile}";
-        ExecReload = "${pkgs.utillinux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
+        ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
         TimeoutStopSec = 60;
         Restart = "on-failure";
         # User and group
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index c72b4abfcdce..3ea254371142 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -36,7 +36,7 @@ let
 
       $SMARTD_MESSAGE
       EOF
-      } | ${pkgs.utillinux}/bin/wall 2>/dev/null
+      } | ${pkgs.util-linux}/bin/wall 2>/dev/null
     ''}
     ${optionalString nx.enable ''
       export DISPLAY=${nx.display}
diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix
index 677111814a01..03884cb72976 100644
--- a/nixos/modules/services/network-filesystems/openafs/client.nix
+++ b/nixos/modules/services/network-filesystems/openafs/client.nix
@@ -244,7 +244,7 @@ in
       # postStop, then we get a hang + kernel oops, because AFS can't be
       # stopped simply by sending signals to processes.
       preStop = ''
-        ${pkgs.utillinux}/bin/umount ${cfg.mountPoint}
+        ${pkgs.util-linux}/bin/umount ${cfg.mountPoint}
         ${openafsBin}/sbin/afsd -shutdown
         ${pkgs.kmod}/sbin/rmmod libafs
       '';
diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix
index b8f8c1d71174..27a9fe847c58 100644
--- a/nixos/modules/services/network-filesystems/xtreemfs.nix
+++ b/nixos/modules/services/network-filesystems/xtreemfs.nix
@@ -112,7 +112,7 @@ in
           description = ''
             Must be set to a unique identifier, preferably a UUID according to
             RFC 4122. UUIDs can be generated with `uuidgen` command, found in
-            the `utillinux` package.
+            the `util-linux` package.
           '';
         };
         port = mkOption {
@@ -232,7 +232,7 @@ in
           description = ''
             Must be set to a unique identifier, preferably a UUID according to
             RFC 4122. UUIDs can be generated with `uuidgen` command, found in
-            the `utillinux` package.
+            the `util-linux` package.
           '';
         };
         port = mkOption {
@@ -370,7 +370,7 @@ in
           description = ''
             Must be set to a unique identifier, preferably a UUID according to
             RFC 4122. UUIDs can be generated with `uuidgen` command, found in
-            the `utillinux` package.
+            the `util-linux` package.
           '';
         };
         port = mkOption {
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 201a51ff70b1..2e680544ec24 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -465,7 +465,7 @@ in {
       restartTriggers = [ configFile overrideNameserversScript ];
 
       # useful binaries for user-specified hooks
-      path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
+      path = [ pkgs.iproute pkgs.util-linux pkgs.coreutils ];
       aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
     };
 
diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix
index 0fec3ef00ad9..f67eedac2961 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/module.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix
@@ -63,7 +63,7 @@ in  {
       description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl";
       wantedBy = [ "multi-user.target" ];
       after    = [ "network-online.target" ];
-      path     = with pkgs; [ kmod iproute iptables utillinux ];
+      path     = with pkgs; [ kmod iproute iptables util-linux ];
       environment = {
         STRONGSWAN_CONF = pkgs.writeTextFile {
           name = "strongswan.conf";
diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix
index 13a1a897c5ed..f6170b813654 100644
--- a/nixos/modules/services/networking/strongswan.nix
+++ b/nixos/modules/services/networking/strongswan.nix
@@ -152,7 +152,7 @@ in
     systemd.services.strongswan = {
       description = "strongSwan IPSec Service";
       wantedBy = [ "multi-user.target" ];
-      path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux
+      path = with pkgs; [ kmod iproute iptables util-linux ]; # XXX Linux
       after = [ "network-online.target" ];
       environment = {
         STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; };
diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix
index 15fe822aec67..3518e0ee9dca 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixos/modules/services/system/cloud-init.nix
@@ -9,7 +9,7 @@ let cfg = config.services.cloud-init;
       nettools
       openssh
       shadow
-      utillinux
+      util-linux
     ] ++ optional cfg.btrfs.enable btrfs-progs
       ++ optional cfg.ext4.enable e2fsprogs
     ;
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 717c18d367f0..7bec073e26f7 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -397,9 +397,9 @@ in
           mr ${getLib pkgs.openssl}/lib/libcrypto*.so*,
           mr ${getLib pkgs.openssl}/lib/libssl*.so*,
           mr ${getLib pkgs.systemd}/lib/libsystemd*.so*,
-          mr ${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so*,
-          mr ${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so*,
-          mr ${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so*,
+          mr ${getLib pkgs.util-linuxMinimal.out}/lib/libblkid.so*,
+          mr ${getLib pkgs.util-linuxMinimal.out}/lib/libmount.so*,
+          mr ${getLib pkgs.util-linuxMinimal.out}/lib/libuuid.so*,
           mr ${getLib pkgs.xz}/lib/liblzma*.so*,
           mr ${getLib pkgs.zlib}/lib/libz*.so*,
 
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index f3a629f7af70..d07746be2377 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -5,7 +5,7 @@ with lib;
 let
 
   autologinArg = optionalString (config.services.mingetty.autologinUser != null) "--autologin ${config.services.mingetty.autologinUser}";
-  gettyCmd = extraArgs: "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";
+  gettyCmd = extraArgs: "@${pkgs.util-linux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";
 
 in
 
diff --git a/nixos/modules/services/web-apps/gerrit.nix b/nixos/modules/services/web-apps/gerrit.nix
index 657b1a4fc5ba..864587aea565 100644
--- a/nixos/modules/services/web-apps/gerrit.nix
+++ b/nixos/modules/services/web-apps/gerrit.nix
@@ -143,7 +143,7 @@ in
           Set a UUID that uniquely identifies the server.
 
           This can be generated with
-          <literal>nix-shell -p utillinux --run uuidgen</literal>.
+          <literal>nix-shell -p util-linux --run uuidgen</literal>.
         '';
       };
     };
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 6ffda3d63614..dc78728d6636 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -750,8 +750,8 @@ in
             # Get rid of old semaphores.  These tend to accumulate across
             # server restarts, eventually preventing it from restarting
             # successfully.
-            for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${cfg.user} ' | cut -f2 -d ' '); do
-                ${pkgs.utillinux}/bin/ipcrm -s $i
+            for i in $(${pkgs.util-linux}/bin/ipcs -s | grep ' ${cfg.user} ' | cut -f2 -d ' '); do
+                ${pkgs.util-linux}/bin/ipcrm -s $i
             done
           '';
 
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index 503c14c9b624..e6b50c21a952 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
@@ -32,7 +32,7 @@ with lib;
 
         path =
           [ pkgs.xorg.xorgserver.out pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth
-            pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash
+            pkgs.nettools pkgs.shadow pkgs.procps pkgs.util-linux pkgs.bash
           ];
 
         environment.FD_GEOM = "1024x786x24";
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 18c77948cb90..3a6930314b1a 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -25,7 +25,7 @@ let
       stdenv.cc.libc # nscd in update-users-groups.pl
       shadow
       nettools # needed for hostname
-      utillinux # needed for mount and mountpoint
+      util-linux # needed for mount and mountpoint
     ];
 
   scriptType = with types;
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 2724d9f9cb6f..03d7e7493230 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -97,10 +97,11 @@ let
     allowSubstitutes = false;
     buildCommand = systemBuilder;
 
-    inherit (pkgs) utillinux coreutils;
+    inherit (pkgs) coreutils;
     systemd = config.systemd.package;
     shell = "${pkgs.bash}/bin/sh";
     su = "${pkgs.shadow.su}/bin/su";
+    utillinux = pkgs.util-linux;
 
     kernelParams = config.boot.kernelParams;
     installBootLoader =
diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix
index be70c4ad9c8d..87c981b24cec 100644
--- a/nixos/modules/system/boot/grow-partition.nix
+++ b/nixos/modules/system/boot/grow-partition.nix
@@ -20,8 +20,8 @@ with lib;
     boot.initrd.extraUtilsCommands = ''
       copy_bin_and_libs ${pkgs.gawk}/bin/gawk
       copy_bin_and_libs ${pkgs.gnused}/bin/sed
-      copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
-      copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
+      copy_bin_and_libs ${pkgs.util-linux}/sbin/sfdisk
+      copy_bin_and_libs ${pkgs.util-linux}/sbin/lsblk
 
       substitute "${pkgs.cloud-utils.guest}/bin/.growpart-wrapped" "$out/bin/growpart" \
         --replace "${pkgs.bash}/bin/sh" "/bin/sh" \
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 20e39628eabb..09f7641dc9d9 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -66,7 +66,7 @@ let
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels
         default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios gfxpayloadEfi gfxpayloadBios;
       path = with pkgs; makeBinPath (
-        [ coreutils gnused gnugrep findutils diffutils btrfs-progs utillinux mdadm ]
+        [ coreutils gnused gnugrep findutils diffutils btrfs-progs util-linux mdadm ]
         ++ optional (cfg.efiSupport && (cfg.version == 2)) efibootmgr
         ++ optionals cfg.useOSProber [ busybox os-prober ]);
       font = if cfg.font == null then ""
@@ -705,7 +705,7 @@ in
         let
           install-grub-pl = pkgs.substituteAll {
             src = ./install-grub.pl;
-            inherit (pkgs) utillinux;
+            utillinux = pkgs.util-linux;
             btrfsprogs = pkgs.btrfs-progs;
           };
         in pkgs.writeScript "install-grub.sh" (''
diff --git a/nixos/modules/system/boot/shutdown.nix b/nixos/modules/system/boot/shutdown.nix
index 11041066e07c..8cda7b3aabe8 100644
--- a/nixos/modules/system/boot/shutdown.nix
+++ b/nixos/modules/system/boot/shutdown.nix
@@ -18,7 +18,7 @@ with lib;
 
       serviceConfig = {
         Type = "oneshot";
-        ExecStart = "${pkgs.utillinux}/sbin/hwclock --systohc ${if config.time.hardwareClockInLocalTime then "--localtime" else "--utc"}";
+        ExecStart = "${pkgs.util-linux}/sbin/hwclock --systohc ${if config.time.hardwareClockInLocalTime then "--localtime" else "--utc"}";
       };
     };
 
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 6823e12847c2..0f5787a19210 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -107,8 +107,8 @@ let
         copy_bin_and_libs $BIN
       done
 
-      # Copy some utillinux stuff.
-      copy_bin_and_libs ${pkgs.utillinux}/sbin/blkid
+      # Copy some util-linux stuff.
+      copy_bin_and_libs ${pkgs.util-linux}/sbin/blkid
 
       # Copy dmsetup and lvm.
       copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup
@@ -235,7 +235,7 @@ let
             --replace scsi_id ${extraUtils}/bin/scsi_id \
             --replace cdrom_id ${extraUtils}/bin/cdrom_id \
             --replace ${pkgs.coreutils}/bin/basename ${extraUtils}/bin/basename \
-            --replace ${pkgs.utillinux}/bin/blkid ${extraUtils}/bin/blkid \
+            --replace ${pkgs.util-linux}/bin/blkid ${extraUtils}/bin/blkid \
             --replace ${getBin pkgs.lvm2}/bin ${extraUtils}/bin \
             --replace ${pkgs.mdadm}/sbin ${extraUtils}/sbin \
             --replace ${pkgs.bash}/bin/sh ${extraUtils}/bin/sh \
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index dd6d83ee0094..94bc34fea0db 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -17,7 +17,7 @@ let
     inherit (config.system.build) earlyMountScript;
     path = lib.makeBinPath ([
       pkgs.coreutils
-      pkgs.utillinux
+      pkgs.util-linux
     ] ++ lib.optional useHostResolvConf pkgs.openresolv);
     fsPackagesPath = lib.makeBinPath config.system.fsPackages;
     postBootCommands = pkgs.writeText "local-cmds"
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 3ea67dac7146..a055072f9c96 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -286,7 +286,7 @@ in
             before = [ mountPoint' "systemd-fsck@${device'}.service" ];
             requires = [ device'' ];
             after = [ device'' ];
-            path = [ pkgs.utillinux ] ++ config.system.fsPackages;
+            path = [ pkgs.util-linux ] ++ config.system.fsPackages;
             script =
               ''
                 if ! [ -e "${fs.device}" ]; then exit 1; fi
diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix
index 1dcc4c87e3ce..f54f3559c341 100644
--- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix
+++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix
@@ -18,9 +18,9 @@
 
       boot.initrd.postDeviceCommands = ''
           # Hacky!!! fuse hard-codes the path to mount
-          mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}-bin/bin
-          ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}-bin/bin
-          ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}-bin/bin
+          mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.util-linux.name}-bin/bin
+          ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.util-linux.name}-bin/bin
+          ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.util-linux.name}-bin/bin
         '';
     })
 
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 7b6c2277741b..6becc6962735 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -440,7 +440,7 @@ in
           pkgs.gnugrep
           pkgs.gnused
           pkgs.nettools
-          pkgs.utillinux
+          pkgs.util-linux
         ];
       };
 
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 819e93a43e57..26297a7d0f1f 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -124,7 +124,7 @@ in
     boot.initrd.extraUtilsCommands =
       ''
         # We need swapon in the initrd.
-        copy_bin_and_libs ${pkgs.utillinux}/sbin/swapon
+        copy_bin_and_libs ${pkgs.util-linux}/sbin/swapon
       '';
 
     # Don't put old configurations in the GRUB menu.  The user has no
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix
index e85482af8392..81413792eda0 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@@ -22,7 +22,7 @@ let
                     nettools # for hostname
                     procps # for pidof
                     shadow # for useradd, usermod
-                    utillinux # for (u)mount, fdisk, sfdisk, mkswap
+                    util-linux # for (u)mount, fdisk, sfdisk, mkswap
                     parted
                   ];
     pythonPath = [ pythonPackages.pyasn1 ];
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix
index d0efbcc808aa..4498e3a73618 100644
--- a/nixos/modules/virtualisation/brightbox-image.nix
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@@ -27,7 +27,7 @@ in
               popd
             '';
           diskImageBase = "nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw";
-          buildInputs = [ pkgs.utillinux pkgs.perl ];
+          buildInputs = [ pkgs.util-linux pkgs.perl ];
           exportReferencesGraph =
             [ "closure" config.system.build.toplevel ];
         }
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 33da920e94cc..447d1f091c8c 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -190,7 +190,7 @@ let
               '' else ''
               ''}
             '';
-          buildInputs = [ pkgs.utillinux ];
+          buildInputs = [ pkgs.util-linux ];
           QEMU_OPTS = "-nographic -serial stdio -monitor none"
                       + lib.optionalString cfg.useEFIBoot (
                         " -drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}"
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 7b2a66c43489..5ad647769bbd 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -201,8 +201,8 @@ in
       ''
         if [ -d /proc/xen ]; then
             ${pkgs.kmod}/bin/modprobe xenfs 2> /dev/null
-            ${pkgs.utillinux}/bin/mountpoint -q /proc/xen || \
-                ${pkgs.utillinux}/bin/mount -t xenfs none /proc/xen
+            ${pkgs.util-linux}/bin/mountpoint -q /proc/xen || \
+                ${pkgs.util-linux}/bin/mount -t xenfs none /proc/xen
         fi
       '';
 
diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix
index be0235a41753..f778d30bdc06 100644
--- a/nixos/tests/os-prober.nix
+++ b/nixos/tests/os-prober.nix
@@ -9,7 +9,7 @@ let
       ${parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
       mkdir /mnt
       ${e2fsprogs}/bin/mkfs.ext4 /dev/vda1
-      ${utillinux}/bin/mount -t ext4 /dev/vda1 /mnt
+      ${util-linux}/bin/mount -t ext4 /dev/vda1 /mnt
 
       if test -e /mnt/.debug; then
         exec ${bash}/bin/sh
diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index dfa16eecfad2..0fc788f860f7 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
 
     systemd.shutdown.test = pkgs.writeScript "test.shutdown" ''
       #!${pkgs.runtimeShell}
-      PATH=${lib.makeBinPath (with pkgs; [ utillinux coreutils ])}
+      PATH=${lib.makeBinPath (with pkgs; [ util-linux coreutils ])}
       mount -t 9p shared -o trans=virtio,version=9p2000.L /tmp/shared
       touch /tmp/shared/shutdown-test
       umount /tmp/shared
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 0d9eafa4a20f..900ee610a70b 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -24,7 +24,7 @@ let
 
     miniInit = ''
       #!${pkgs.runtimeShell} -xe
-      export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}"
+      export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.util-linux ]}"
 
       mkdir -p /run/dbus
       cat > /etc/passwd <<EOF
@@ -72,7 +72,7 @@ let
 
     boot.initrd.extraUtilsCommands = ''
       copy_bin_and_libs "${guestAdditions}/bin/mount.vboxsf"
-      copy_bin_and_libs "${pkgs.utillinux}/bin/unshare"
+      copy_bin_and_libs "${pkgs.util-linux}/bin/unshare"
       ${(attrs.extraUtilsCommands or (const "")) pkgs}
     '';
 
@@ -122,7 +122,7 @@ let
         "$diskImage" "$out/disk.vdi"
     '';
 
-    buildInputs = [ pkgs.utillinux pkgs.perl ];
+    buildInputs = [ pkgs.util-linux pkgs.perl ];
   } ''
     ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos
     ${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix
index 3c78295db674..912662b7726c 100644
--- a/pkgs/applications/audio/clerk/default.nix
+++ b/pkgs/applications/audio/clerk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl,
-utillinux, pythonPackages, libnotify }:
+util-linux, pythonPackages, libnotify }:
 
 stdenv.mkDerivation {
   name = "clerk-2016-10-14";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   installPhase = ''
     DESTDIR=$out PREFIX=/ make install
     wrapProgram $out/bin/clerk \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl utillinux libnotify ]}"
+      --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl util-linux libnotify ]}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index 712a3e37a476..c2f1a0db701c 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -23,7 +23,7 @@
 , libselinux ? null
 , libsepol ? null
 , p11-kit ? null
-, utillinux ? null
+, util-linux ? null
 , qtbase
 , qtx11extras
 , qttools
@@ -67,7 +67,7 @@ mkDerivation rec {
     libselinux
     libsepol
     p11-kit
-    utillinux
+    util-linux
   ]
   ++ lib.optionals withGstreamer (with gst_all_1; [
     gstreamer
diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix
index 5cbc9a07b6c7..3ff1368c9432 100644
--- a/pkgs/applications/audio/whipper/default.nix
+++ b/pkgs/applications/audio/whipper/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
-, sox, accuraterip-checksum, libsndfile, utillinux, substituteAll }:
+, sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "whipper";
@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   makeWrapperArgs = [
-    "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ])
+    "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ])
   ];
 
   preBuild = ''
diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix
index 1596ed2d3572..81825d3d5b02 100644
--- a/pkgs/applications/blockchains/bitcoin-abc.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc.nix
@@ -1,5 +1,5 @@
 { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost
-, zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent
+, zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent
 , withGui, python3, jemalloc, zeromq4 }:
 
 with stdenv.lib;
@@ -20,7 +20,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig cmake ];
   buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4
-                  miniupnpc utillinux protobuf libevent ]
+                  miniupnpc util-linux protobuf libevent ]
                   ++ optionals withGui [ qtbase qttools qrencode ];
 
   cmakeFlags = optionals (!withGui) [
diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix
index 01c1264567ce..417262f6f4d0 100644
--- a/pkgs/applications/blockchains/bitcoin-classic.nix
+++ b/pkgs/applications/blockchains/bitcoin-classic.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, qrencode, libevent
+, zlib, miniupnpc, qtbase ? null, qttools ? null, util-linux, protobuf, qrencode, libevent
 , withGui }:
 
 with stdenv.lib;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ openssl db48 boost zlib
-                  miniupnpc utillinux protobuf libevent ]
+                  miniupnpc util-linux protobuf libevent ]
                   ++ optionals withGui [ qtbase qttools qrencode ];
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
diff --git a/pkgs/applications/blockchains/bitcoin-knots.nix b/pkgs/applications/blockchains/bitcoin-knots.nix
index 384ac880fe14..dd0132df4d94 100644
--- a/pkgs/applications/blockchains/bitcoin-knots.nix
+++ b/pkgs/applications/blockchains/bitcoin-knots.nix
@@ -9,7 +9,7 @@
 , miniupnpc
 , libevent
 , protobuf
-, utillinux
+, util-linux
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [ openssl db5 openssl utillinux
+  buildInputs = [ openssl db5 openssl util-linux
                   protobuf boost zlib miniupnpc libevent ];
 
   configureFlags = [ "--with-incompatible-bdb"
diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix
index f8988af683d1..8a2b9e370f51 100644
--- a/pkgs/applications/blockchains/bitcoin-unlimited.nix
+++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, utillinux, protobuf, qrencode, libevent, python3
+, zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3
 , withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null
 , Foundation, ApplicationServices, AppKit }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig autoreconfHook python3 ]
     ++ optionals withGui [ wrapQtAppsHook qttools ];
   buildInputs = [ openssl db48 boost zlib
-                  miniupnpc utillinux protobuf libevent ]
+                  miniupnpc util-linux protobuf libevent ]
                   ++ optionals withGui [ qtbase qttools qrencode ]
                   ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ];
 
diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix
index 09dc59a051ad..80e935f2b1a8 100644
--- a/pkgs/applications/blockchains/bitcoin.nix
+++ b/pkgs/applications/blockchains/bitcoin.nix
@@ -11,7 +11,7 @@
 , qtbase ? null
 , qttools ? null
 , wrapQtAppsHook ? null
-, utillinux
+, util-linux
 , python3
 , qrencode
 , libevent
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isDarwin hexdump
     ++ optional withGui wrapQtAppsHook;
   buildInputs = [ db48 boost zlib zeromq miniupnpc libevent ]
-    ++ optionals stdenv.isLinux [ utillinux ]
+    ++ optionals stdenv.isLinux [ util-linux ]
     ++ optionals withGui [ qtbase qttools qrencode ];
 
   postInstall = optional withGui ''
diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix
index 7bdf93b2dacc..b55dd3b5b78d 100644
--- a/pkgs/applications/blockchains/dashpay.nix
+++ b/pkgs/applications/blockchains/dashpay.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv, pkgconfig, autoreconfHook
 , openssl, db48, boost, zlib, miniupnpc
 , qrencode, glib, protobuf, yasm, libevent
-, utillinux
+, util-linux
 , enable_Upnp ? false
 , disable_Wallet ? false
 , disable_Daemon ? false }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ glib openssl db48 yasm boost zlib libevent
-                  miniupnpc protobuf qrencode utillinux ];
+                  miniupnpc protobuf qrencode util-linux ];
 
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ]
diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix
index 27a1f6132f05..527b307042c3 100644
--- a/pkgs/applications/blockchains/dogecoin.nix
+++ b/pkgs/applications/blockchains/dogecoin.nix
@@ -1,7 +1,7 @@
 { stdenv , fetchFromGitHub
 , pkgconfig, autoreconfHook
 , db5, openssl, boost, zlib, miniupnpc, libevent
-, protobuf, utillinux, qt4, qrencode
+, protobuf, util-linux, qt4, qrencode
 , withGui }:
 
 with stdenv.lib;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [ openssl db5 openssl utillinux
+  buildInputs = [ openssl db5 openssl util-linux
                   protobuf boost zlib miniupnpc libevent ]
                   ++ optionals withGui [ qt4 qrencode ];
 
diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix
index 5630cb20d4de..ec5727a05be9 100644
--- a/pkgs/applications/blockchains/exodus/default.nix
+++ b/pkgs/applications/blockchains/exodus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango,
-atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
+atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsaLib, dbus, at-spi2-atk,
 cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }:
 
 stdenv.mkDerivation rec {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
       xorg.libXrender
       xorg.libXtst
       xorg_sys_opengl
-      utillinux
+      util-linux
       xorg.libXrandr
       xorg.libXScrnSaver
       alsaLib
diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix
index fa352652dbf9..85adbec718f3 100644
--- a/pkgs/applications/blockchains/litecoin.nix
+++ b/pkgs/applications/blockchains/litecoin.nix
@@ -1,7 +1,7 @@
 { stdenv, mkDerivation, fetchFromGitHub
 , pkgconfig, autoreconfHook
 , openssl, db48, boost, zlib, miniupnpc
-, glib, protobuf, utillinux, qrencode
+, glib, protobuf, util-linux, qrencode
 , AppKit
 , withGui ? true, libevent
 , qtbase, qttools
@@ -24,7 +24,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ openssl db48 boost zlib zeromq
-                  miniupnpc glib protobuf utillinux libevent ]
+                  miniupnpc glib protobuf util-linux libevent ]
                   ++ optionals stdenv.isDarwin [ AppKit ]
                   ++ optionals withGui [ qtbase qttools qrencode ];
 
diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix
index 5a59bb4b7de2..6d6f881ae65f 100644
--- a/pkgs/applications/blockchains/pivx.nix
+++ b/pkgs/applications/blockchains/pivx.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null
 , openssl, db48, boost, zlib, miniupnpc, gmp
 , qrencode, glib, protobuf, yasm, libevent
-, utillinux, qtbase ? null, qttools ? null
+, util-linux, qtbase ? null, qttools ? null
 , enableUpnp ? false
 , disableWallet ? false
 , disableDaemon ? false 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ];
-  buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf utillinux ]
+  buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ]
                   ++ optionals withGui [ qtbase qttools qrencode ];
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index e2c57d514cda..9cccbd7b7e46 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
@@ -1,5 +1,5 @@
 { stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost17x
-, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent }:
+, zlib, gtest, gmock, callPackage, gmp, qt4, util-linux, protobuf, qrencode, libevent }:
 
 let librustzcash = callPackage ./librustzcash {};
 in
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib
                   protobuf libevent libsodium librustzcash ]
-                  ++ optionals stdenv.isLinux [ utillinux ];
+                  ++ optionals stdenv.isLinux [ util-linux ];
 
   configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ];
 
diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix
index 8e6e151aff6a..800709de054a 100644
--- a/pkgs/applications/graphics/comical/default.nix
+++ b/pkgs/applications/graphics/comical/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, wxGTK, utillinux, zlib }:
+{stdenv, fetchurl, wxGTK, util-linux, zlib }:
 
 stdenv.mkDerivation rec {
   name = "comical-0.8";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/comical/${name}.tar.gz";
     sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e";
   };
-  buildInputs = [ wxGTK utillinux zlib ];
+  buildInputs = [ wxGTK util-linux zlib ];
   preBuild="makeFlags=\"prefix=$out\"";
 
   patches = [ ./wxgtk-2.8.patch ];
diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix
index c06d00ebb52e..e1f019ffa455 100644
--- a/pkgs/applications/misc/clight/clightd.nix
+++ b/pkgs/applications/misc/clight/clightd.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub
 , dbus, cmake, pkgconfig
 , glib, udev, polkit, libmodule
-, pcre, libXdmcp, utillinux, libpthreadstubs
+, pcre, libXdmcp, util-linux, libpthreadstubs
 , enableDdc ? true, ddcutil
 , enableDpms ? true, libXext
 , enableGamma ? true, libXrandr
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
     pcre
     libXdmcp
-    utillinux
+    util-linux
     libpthreadstubs
   ] ++ optional enableDdc ddcutil
     ++ optional enableDpms libXext
diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix
index 54c2ab48f656..3227792d6a2f 100644
--- a/pkgs/applications/misc/clipmenu/default.nix
+++ b/pkgs/applications/misc/clipmenu/default.nix
@@ -1,6 +1,6 @@
-{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }:
+{ clipnotify, makeWrapper, xsel, dmenu, util-linux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }:
 let
-  runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ];
+  runtimePath = lib.makeBinPath [ clipnotify xsel dmenu util-linux gawk ];
 in
 stdenv.mkDerivation rec {
   pname = "clipmenu";
diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix
index cee390d064d0..090a63a32e4f 100644
--- a/pkgs/applications/misc/corectrl/default.nix
+++ b/pkgs/applications/misc/corectrl/default.nix
@@ -7,7 +7,7 @@
 , libdrm
 , mesa-demos
 , procps
-, utillinux
+, util-linux
 , vulkan-tools
 , qtbase
 , qtcharts
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec{
     libdrm
     mesa-demos
     procps
-    utillinux
+    util-linux
     vulkan-tools
     qtbase
     qtcharts
diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix
index f00433a658f7..f3d4e156d6cd 100644
--- a/pkgs/applications/misc/imag/default.nix
+++ b/pkgs/applications/misc/imag/default.nix
@@ -7,7 +7,7 @@
 , installShellFiles
 , Security
 , gitMinimal
-, utillinuxMinimal
+, util-linuxMinimal
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ installShellFiles pkg-config ];
   buildInputs = [ openssl ]
     ++ stdenv.lib.optional stdenv.isDarwin Security;
-  checkInputs = [ gitMinimal utillinuxMinimal ];
+  checkInputs = [ gitMinimal util-linuxMinimal ];
 
   LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
 
diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
index 2b656775ab5c..d7eabae0e8e5 100644
--- a/pkgs/applications/misc/lutris/fhsenv.nix
+++ b/pkgs/applications/misc/lutris/fhsenv.nix
@@ -103,7 +103,7 @@ in buildFHSUserEnv {
 
     # WINE
     cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap
-    ocl-icd utillinux libkrb5
+    ocl-icd util-linux libkrb5
 
     # Proton
     libselinux
diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix
index 8f90c7a581d0..c1c7b5a2706e 100644
--- a/pkgs/applications/misc/multibootusb/default.nix
+++ b/pkgs/applications/misc/multibootusb/default.nix
@@ -1,6 +1,6 @@
 { fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip,
   coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk,
-  python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }:
+  python36Packages, qt5, runtimeShell, stdenv, util-linux, wrapQtAppsHook }:
 
 # Note: Multibootusb is tricky to maintain. It relies on the
 # $PYTHONPATH variable containing some of their code, so that
@@ -30,7 +30,7 @@ python36Packages.buildPythonApplication rec {
     gnugrep
     which
     parted
-    utillinux
+    util-linux
     qemu
     p7zip
     gnused
diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix
index e1d578edb0f5..6e59395f411e 100644
--- a/pkgs/applications/misc/todoist-electron/default.nix
+++ b/pkgs/applications/misc/todoist-electron/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf
 , gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat
-, udev, libpulseaudio, utillinux, makeWrapper }:
+, udev, libpulseaudio, util-linux, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "todoist-electron";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   installPhase = let
     libPath = lib.makeLibraryPath ([
       stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
-      nss nspr alsaLib libpulseaudio cups expat udev utillinux
+      nss nspr alsaLib libpulseaudio cups expat udev util-linux
     ] ++ (with xorg; [
       libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
       libXrender libX11 libXtst libXScrnSaver
diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix
index dbf721888df6..8e01f73f9675 100644
--- a/pkgs/applications/misc/udevil/default.nix
+++ b/pkgs/applications/misc/udevil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, utillinux, acl }:
+{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, util-linux, acl }:
 stdenv.mkDerivation {
   name = "udevil-0.4.4";
   src = fetchurl {
@@ -13,9 +13,9 @@ stdenv.mkDerivation {
     substituteInPlace src/Makefile.in --replace 4755 0755
     ./configure \
       --prefix=$out \
-      --with-mount-prog=${utillinux}/bin/mount \
-      --with-umount-prog=${utillinux}/bin/umount \
-      --with-losetup-prog=${utillinux}/bin/losetup \
+      --with-mount-prog=${util-linux}/bin/mount \
+      --with-umount-prog=${util-linux}/bin/umount \
+      --with-losetup-prog=${util-linux}/bin/losetup \
       --with-setfacl-prog=${acl.bin}/bin/setfacl \
       --sysconfdir=$prefix/etc
   '';
diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index b014543e8ceb..2c388e58fe11 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper
 , pkgconfig
 , ncurses, libX11
-, utillinux, file, which, groff
+, util-linux, file, which, groff
 
   # adds support for handling removable media (vifm-media). Linux only!
 , mediaSupport ? false, python3 ? null, udisks2 ? null, lib ? null
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
-  buildInputs = [ ncurses libX11 utillinux file which groff ];
+  buildInputs = [ ncurses libX11 util-linux file which groff ];
 
   postFixup = let
     path = lib.makeBinPath
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 7e453d6e0540..f167ab105d34 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -9,7 +9,7 @@
 
 , python2Packages, perl, pkgconfig
 , nspr, systemd, kerberos
-, utillinux, alsaLib
+, util-linux, alsaLib
 , bison, gperf
 , glib, gtk3, dbus-glib
 , glibc
@@ -134,7 +134,7 @@ let
 
     buildInputs = defaultDependencies ++ [
       nspr nss systemd
-      utillinux alsaLib
+      util-linux alsaLib
       bison gperf kerberos
       glib gtk3 dbus-glib
       libXScrnSaver libXcursor libXtst libGLU libGL
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 727090a4c5c3..f2e10f323305 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -22,7 +22,7 @@
 
 # Additional dependencies according to other distros.
 ## Ubuntu
-, liberation_ttf, curl, utillinux, xdg_utils, wget
+, liberation_ttf, curl, util-linux, xdg_utils, wget
 ## Arch Linux.
 , flac, harfbuzz, icu, libpng, libopus, snappy, speechd
 ## Gentoo
@@ -59,7 +59,7 @@ let
     dbus gdk-pixbuf gcc-unwrapped.lib
     systemd
     libexif
-    liberation_ttf curl utillinux xdg_utils wget
+    liberation_ttf curl util-linux xdg_utils wget
     flac harfbuzz icu libpng opusWithCustomModes snappy speechd
     bzip2 libcap at-spi2-atk at-spi2-core
     kerberos libdrm mesa coreutils
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
index 2b8dc83da508..2accb1a7ab21 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
@@ -9,7 +9,7 @@
 
 , python2Packages, perl, pkgconfig
 , nspr, systemd, kerberos
-, utillinux, alsaLib
+, util-linux, alsaLib
 , bison, gperf
 , glib, gtk3, dbus-glib
 , glibc
@@ -141,7 +141,7 @@ let
 
     buildInputs = defaultDependencies ++ [
       nspr nss systemd
-      utillinux alsaLib
+      util-linux alsaLib
       bison gperf kerberos
       glib gtk3 dbus-glib
       libXScrnSaver libXcursor libXtst libGLU libGL
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index 8fa288f04014..55d51a656d9c 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -13,7 +13,7 @@
 , libseccomp
 , pkgconfig
 , ethtool
-, utillinux
+, util-linux
 , ipset
 , fetchFromGitHub
 , fetchurl
@@ -234,7 +234,7 @@ stdenv.mkDerivation rec {
     iproute
     bridge-utils
     ethtool
-    utillinux
+    util-linux
     ipset
     conntrack-tools
   ];
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index b547434d8da1..34d362a4623b 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, utillinux
+{ stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux
 , coreutils, kerberos, ncurses, clang, installShellFiles
 , components ? [
   "cmd/oc"
diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
index 47cdb6942cec..712f62e8d4fd 100644
--- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix
+++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index 16b2b7454bf5..de523b14ba64 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, pkgs
 , autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils
-, kmod, nettools, procps, tcpdump, traceroute, utillinux, whois
+, kmod, nettools, procps, tcpdump, traceroute, util-linux, whois
 
 # If true, just install FireQOS without FireHOL
 , onlyQOS ? false
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf automake ];
   buildInputs = [
     curl iprange iproute ipset iptables iputils kmod
-    nettools procps tcpdump traceroute utillinux whois
+    nettools procps tcpdump traceroute util-linux whois
   ];
 
   preConfigure = "./autogen.sh";
diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
index e03bdd9909e8..92ddfe342982 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix
index 670556bf271a..ff5ca0d99b19 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix
@@ -1,6 +1,6 @@
 # This file originates from node2nix
 
-{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
 
 let
   python = if nodejs ? python then nodejs.python else python2;
@@ -396,7 +396,7 @@ let
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
-        ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+        ++ stdenv.lib.optional (stdenv.isLinux) util-linux
         ++ stdenv.lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
 
@@ -468,7 +468,7 @@ let
         name = "node-dependencies-${name}-${version}";
 
         buildInputs = [ tarWrapper python nodejs ]
-          ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+          ++ stdenv.lib.optional (stdenv.isLinux) util-linux
           ++ stdenv.lib.optional (stdenv.isDarwin) libtool
           ++ buildInputs;
 
@@ -514,7 +514,7 @@ let
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 3bd8ac58e8bc..6518f73a2299 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,7 +4,7 @@
 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
 , tl-expected, hunspell
 # TODO: Shouldn't be required:
-, pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
+, pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
 , xdg_utils
 }:
 
@@ -49,7 +49,7 @@ in mkDerivation rec {
     tl-expected hunspell
     tg_owt
     # TODO: Shouldn't be required:
-    pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst
+    pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy at-spi2-core libXtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index feac6ff8fa43..887e3f458bc4 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -6,7 +6,7 @@
 , qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel
 , qtwebengine
 # Runtime
-, coreutils, faac, pciutils, procps, utillinux
+, coreutils, faac, pciutils, procps, util-linux
 , pulseaudioSupport ? true, libpulseaudio ? null
 , alsaSupport ? stdenv.isLinux, alsaLib ? null
 }:
@@ -105,7 +105,7 @@ in mkDerivation {
   dontWrapQtApps = true;
 
   qtWrapperArgs = [
-    ''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}''
+    ''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev util-linux ]}''
     # --run "cd ${placeholder "out"}/share/zoom-us"
     # ^^ unfortunately, breaks run arg into multiple array elements, due to
     # some bad array propagation. We'll do that in bash below
diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/applications/networking/remote/x2goserver/default.nix
index f69d2326217d..1c20bd8b7a82 100644
--- a/pkgs/applications/networking/remote/x2goserver/default.nix
+++ b/pkgs/applications/networking/remote/x2goserver/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs
-, utillinux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg
+, util-linux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg
 , nettools, iproute, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash
 }:
 
@@ -30,7 +30,7 @@ let
   ]);
 
   binaryDeps = [
-    perlEnv which nx-libs utillinux coreutils glibc.bin gawk gnused gnugrep
+    perlEnv which nx-libs util-linux coreutils glibc.bin gawk gnused gnugrep
     findutils nettools iproute bc procps psmisc lsof pwgen openssh sshfs
     xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil
     xorg.xkbcomp xorg.setxkbmap
diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index 197756d8ace4..0e0727d464f8 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, lib
-, dnsutils, coreutils, openssl, nettools, utillinux, procps }:
+, dnsutils, coreutils, openssl, nettools, util-linux, procps }:
 
 stdenv.mkDerivation rec {
   pname = "testssl.sh";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     nettools  # for hostname
     openssl   # for openssl
     procps    # for ps
-    utillinux # for hexdump
+    util-linux # for hexdump
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 1023af9234c9..e0399a0cdf66 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -3,7 +3,7 @@
 , libxml2, db, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
-, openssl, gperf, cppunit, poppler, utillinux
+, openssl, gperf, cppunit, poppler, util-linux
 , librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, clucene_core, libcdr, lcms
@@ -405,7 +405,7 @@ in (mkDrv rec {
       neon nspr nss openldap openssl pam perl pkgconfig poppler
       python3 sane-backends unzip which zip zlib
       mdds bluez5 libcmis libwps libabw libzmf
-      libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
+      libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux
       librevenge libe-book libmwaw glm ncurses epoxy
       libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
     ]
diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix
index 56f3cb74363f..29ca574a4174 100644
--- a/pkgs/applications/office/softmaker/generic.nix
+++ b/pkgs/applications/office/softmaker/generic.nix
@@ -8,7 +8,7 @@
 , coreutils, libredirect
 
   # Extra utilities used by the SoftMaker applications.
-, gnugrep, utillinux, which
+, gnugrep, util-linux, which
 
 , pname, version, edition, suiteName, src, archive
 
@@ -72,7 +72,7 @@ in stdenv.mkDerivation {
     extraWrapperArgs = ''
       --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
       --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ coreutils gnugrep utillinux which ]}"
+      --prefix PATH : "${stdenv.lib.makeBinPath [ coreutils gnugrep util-linux which ]}"
     '';
   in ''
     runHook preInstall
diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index 8e50f48b286b..e770cff2da9c 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, utillinux, makeWrapper
+{ stdenv, lib, fetchurl, util-linux, makeWrapper
 , enableReadline ? true, readline, ncurses }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       --replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}'
   '';
 
-  buildInputs = [ utillinux makeWrapper ]
+  buildInputs = [ util-linux makeWrapper ]
              ++ lib.optionals enableReadline [ readline ncurses ];
 
   makeFlags = [
diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix
index d02296f0e16d..88ff0dc460ec 100644
--- a/pkgs/applications/terminal-emulators/roxterm/default.nix
+++ b/pkgs/applications/terminal-emulators/roxterm/default.nix
@@ -1,7 +1,7 @@
 { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub
 , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs
 , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2
-, pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto
+, pkgconfig, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto
 }:
 
 stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp
-      utillinuxMinimal glib docbook_xsl xmlto libselinux
+      util-linuxMinimal glib docbook_xsl xmlto libselinux
       libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit
     ];
 
diff --git a/pkgs/applications/version-management/commitizen/node-composition.nix b/pkgs/applications/version-management/commitizen/node-composition.nix
index c970861a86f0..17879f381d57 100644
--- a/pkgs/applications/version-management/commitizen/node-composition.nix
+++ b/pkgs/applications/version-management/commitizen/node-composition.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/applications/version-management/commitizen/node-env.nix b/pkgs/applications/version-management/commitizen/node-env.nix
index e1abf5304935..04e3ee097fae 100644
--- a/pkgs/applications/version-management/commitizen/node-env.nix
+++ b/pkgs/applications/version-management/commitizen/node-env.nix
@@ -1,6 +1,6 @@
 # This file originates from node2nix
 
-{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
 
 let
   python = if nodejs ? python then nodejs.python else python2;
@@ -396,7 +396,7 @@ let
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
-        ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+        ++ stdenv.lib.optional (stdenv.isLinux) util-linux
         ++ stdenv.lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
 
@@ -470,7 +470,7 @@ let
         name = "node-dependencies-${name}-${version}";
 
         buildInputs = [ tarWrapper python nodejs ]
-          ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+          ++ stdenv.lib.optional (stdenv.isLinux) util-linux
           ++ stdenv.lib.optional (stdenv.isDarwin) libtool
           ++ buildInputs;
 
@@ -516,7 +516,7 @@ let
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index f68a3c7728d6..03e81a91b87f 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -133,7 +133,7 @@ let
   git-radar = callPackage ./git-radar { };
 
   git-recent = callPackage ./git-recent {
-    utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux;
+    util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux;
   };
 
   git-remote-codecommit = python3Packages.callPackage ./git-remote-codecommit { };
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 99b64e012eae..a01b84a948ad 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,6 +1,6 @@
 {stdenv, git, less, fetchFromGitHub, makeWrapper
-# utillinuxMinimal is included because we need the column command
-, utillinux
+# util-linuxMinimal is included because we need the column command
+, util-linux
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp git-recent $out/bin
     wrapProgram $out/bin/git-recent \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ git less utillinux ]}"
+      --prefix PATH : "${stdenv.lib.makeBinPath [ git less util-linux ]}"
   '';
 
   meta = with stdenv.lib; {
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 22ffd442fdc9..be8136427971 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, utillinux }:
+{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, util-linux }:
 
 buildGoPackage rec {
   pname = "hub";
@@ -16,7 +16,7 @@ buildGoPackage rec {
     sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh";
   };
 
-  nativeBuildInputs = [ groff installShellFiles utillinux ];
+  nativeBuildInputs = [ groff installShellFiles util-linux ];
 
   postPatch = ''
     patchShebangs .
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 589d53b3cfaa..c99c70379df4 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }:
+{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk }:
 
 stdenv.mkDerivation rec {
   pname = "transcrypt";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam";
   };
 
-  buildInputs = [ makeWrapper git openssl coreutils utillinux gnugrep gnused gawk ];
+  buildInputs = [ makeWrapper git openssl coreutils util-linux gnugrep gnused gawk ];
 
   patches = [ ./helper-scripts_depspathprefix.patch ];
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt
 
     wrapProgram $out/bin/transcrypt \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils utillinux gnugrep gnused gawk ]}"
+      --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils util-linux gnugrep gnused gawk ]}"
 
     cat > $out/bin/transcrypt-depspathprefix << EOF
     #!${stdenv.shell}
diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix
index 0cbdeaaf6ff8..0280cfb3f1f4 100644
--- a/pkgs/applications/video/vcs/default.nix
+++ b/pkgs/applications/video/vcs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper
-, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, utillinux
+, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, util-linux
 , dejavu_fonts
 }:
 with stdenv.lib;
 let
   version = "1.13.4";
-  runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer utillinux ];
+  runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer util-linux ];
 in
 stdenv.mkDerivation {
   pname = "vcs";
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix
index 30cd93178c25..e72de8e61f20 100644
--- a/pkgs/applications/video/vdr/plugins.nix
+++ b/pkgs/applications/video/vdr/plugins.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub
 , libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3
-, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses
+, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses
 , callPackage
 }: let
   mkPlugin = name: stdenv.mkDerivation {
@@ -146,7 +146,7 @@ in {
 
     nativeBuildInputs = [
       perl # for pod2man and pos2html
-      utillinux
+      util-linux
       groff
     ];
 
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 94d0ae94dbde..6301182771fb 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, edk2, utillinux, nasm, iasl
+{ stdenv, lib, edk2, util-linux, nasm, iasl
 , csmSupport ? false, seabios ? null
 , secureBoot ? false
 }:
@@ -24,7 +24,7 @@ edk2.mkDerivation projectDscPath {
 
   outputs = [ "out" "fd" ];
 
-  buildInputs = [ utillinux nasm iasl ];
+  buildInputs = [ util-linux nasm iasl ];
 
   hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ];
 
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index f3bcefcf1739..c01586ce5c83 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux, nixosTests }:
+{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, util-linux, nixosTests }:
 
 with lib;
 
@@ -18,7 +18,7 @@ buildGoPackage rec {
   goPackagePath = "github.com/containerd/containerd";
   outputs = [ "out" "man" ];
 
-  nativeBuildInputs = [ go-md2man installShellFiles utillinux ];
+  nativeBuildInputs = [ go-md2man installShellFiles util-linux ];
 
   buildInputs = [ btrfs-progs ];
 
diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix
index 6d72623d86cb..5aca291a6018 100644
--- a/pkgs/applications/virtualization/cri-o/wrapper.nix
+++ b/pkgs/applications/virtualization/cri-o/wrapper.nix
@@ -7,7 +7,7 @@
 , runc # Default container runtime
 , crun # Container runtime (default with cgroups v2 for podman/buildah)
 , conmon # Container runtime monitor
-, utillinux # nsenter
+, util-linux # nsenter
 , cni-plugins # not added to path
 , iptables
 }:
@@ -19,7 +19,7 @@ let
     runc
     crun
     conmon
-    utillinux
+    util-linux
     iptables
   ] ++ extraPackages);
 
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index d3200bba928c..5df0ae39a251 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -2,7 +2,7 @@
 , makeWrapper, installShellFiles, pkgconfig
 , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
 , sqlite, iproute, lvm2, systemd
-, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git
+, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
 , procps, libseccomp
 , nixosTests
 }:
@@ -140,7 +140,7 @@ rec {
 
     outputs = ["out" "man"];
 
-    extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]);
+    extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]);
 
     installPhase = ''
       cd ./go/src/${goPackagePath}
diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix
index d97d182496a4..863888227b37 100644
--- a/pkgs/applications/virtualization/podman/wrapper.nix
+++ b/pkgs/applications/virtualization/podman/wrapper.nix
@@ -9,7 +9,7 @@
 , conmon # Container runtime monitor
 , slirp4netns # User-mode networking for unprivileged namespaces
 , fuse-overlayfs # CoW for images, much faster than default vfs
-, utillinux # nsenter
+, util-linux # nsenter
 , cni-plugins # not added to path
 , iptables
 }:
@@ -23,7 +23,7 @@ let
     conmon
     slirp4netns
     fuse-overlayfs
-    utillinux
+    util-linux
     iptables
   ] ++ extraPackages);
 
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 8d04b871e49b..21c978e1b0e3 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -1,7 +1,7 @@
 {stdenv
 , lib
 , fetchurl
-, utillinux
+, util-linux
 , gpgme
 , openssl
 , libuuid
@@ -27,7 +27,7 @@ buildGoPackage rec {
   goPackagePath = "github.com/sylabs/singularity";
 
   buildInputs = [ gpgme openssl libuuid ];
-  nativeBuildInputs = [ utillinux which makeWrapper cryptsetup ];
+  nativeBuildInputs = [ util-linux which makeWrapper cryptsetup ];
   propagatedBuildInputs = [ coreutils squashfsTools ];
 
   postPatch = ''
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index 45d1146f4300..1d2a32c54e3a 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig
 , qtbase, qtmultimedia, qtsvg, qttools, krdc
 , libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol
-, libselinux, libsepol, utillinux
+, libselinux, libsepol, util-linux
 }:
 
 mkDerivation rec {
@@ -32,7 +32,7 @@ mkDerivation rec {
   buildInputs = [
     qtbase qtmultimedia qtsvg krdc
     libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol
-    libselinux libsepol utillinux
+    libselinux libsepol util-linux
   ];
 
   nativeBuildInputs = [ cmake pkgconfig qttools ];
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 854debc458a3..53f556e3f0d6 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -14,7 +14,7 @@ config:
 # Scripts
 , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools
 , iproute, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd
-, lvm2, utillinux, procps, systemd
+, lvm2, util-linux, procps, systemd
 
 # Documentation
 # python2Packages.markdown
@@ -28,7 +28,7 @@ let
   #TODO: fix paths instead
   scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [
     which perl
-    coreutils gawk gnused gnugrep diffutils utillinux multipath-tools
+    coreutils gawk gnused gnugrep diffutils util-linux multipath-tools
     iproute inetutils iptables bridge-utils openvswitch nbd drbd
   ];
 
@@ -146,8 +146,8 @@ stdenv.mkDerivation (rec {
       --replace /usr/sbin/lvs ${lvm2}/bin/lvs
 
     substituteInPlace tools/misc/xenpvnetboot \
-      --replace /usr/sbin/mount ${utillinux}/bin/mount \
-      --replace /usr/sbin/umount ${utillinux}/bin/umount
+      --replace /usr/sbin/mount ${util-linux}/bin/mount \
+      --replace /usr/sbin/umount ${util-linux}/bin/umount
 
     substituteInPlace tools/xenmon/xenmon.py \
       --replace /usr/bin/pkill ${procps}/bin/pkill
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 4da26ba7cfda..db1062e1b5d8 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -24,7 +24,7 @@
   storeDir ? builtins.storeDir,
   substituteAll,
   symlinkJoin,
-  utillinux,
+  util-linux,
   vmTools,
   writeReferencesToFile,
   writeScript,
@@ -204,7 +204,7 @@ rec {
         };
         inherit fromImage fromImageName fromImageTag;
 
-        nativeBuildInputs = [ utillinux e2fsprogs jshon rsync jq ];
+        nativeBuildInputs = [ util-linux e2fsprogs jshon rsync jq ];
       } ''
       mkdir disk
       mkfs /dev/${vmTools.hd}
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index d937ec626682..4a54498d117c 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -7,7 +7,7 @@
 , bash
 , vmTools
 , gawk
-, utillinux
+, util-linux
 , runtimeShell
 , e2fsprogs }:
 
@@ -47,7 +47,7 @@ rec {
         runScriptFile = shellScript "run-script.sh" runScript;
         result = vmTools.runInLinuxVM (
           runCommand "singularity-image-${name}.img" {
-            buildInputs = [ singularity e2fsprogs utillinux gawk ];
+            buildInputs = [ singularity e2fsprogs util-linux gawk ];
             layerClosure = writeReferencesToFile layer;
             preVM = vmTools.createEmptyImage {
               size = diskSize;
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 909cdc6da044..2f18e96e4ce2 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -151,7 +151,7 @@ rec {
 
     # Set the system time from the hardware clock.  Works around an
     # apparent KVM > 1.5.2 bug.
-    ${pkgs.utillinux}/bin/hwclock -s
+    ${pkgs.util-linux}/bin/hwclock -s
 
     export NIX_STORE=${storeDir}
     export NIX_BUILD_TOP=/tmp
@@ -270,7 +270,7 @@ rec {
   defaultCreateRootFS = ''
     mkdir /mnt
     ${e2fsprogs}/bin/mkfs.ext4 /dev/${hd}
-    ${utillinux}/bin/mount -t ext4 /dev/${hd} /mnt
+    ${util-linux}/bin/mount -t ext4 /dev/${hd} /mnt
 
     if test -e /mnt/.debug; then
       exec ${bash}/bin/sh
@@ -317,7 +317,7 @@ rec {
     with pkgs; runInLinuxVM (
     stdenv.mkDerivation {
       name = "extract-file";
-      buildInputs = [ utillinux ];
+      buildInputs = [ util-linux ];
       buildCommand = ''
         ln -s ${kernel}/lib /lib
         ${kmod}/bin/modprobe loop
@@ -342,7 +342,7 @@ rec {
     with pkgs; runInLinuxVM (
     stdenv.mkDerivation {
       name = "extract-file-mtd";
-      buildInputs = [ utillinux mtdutils ];
+      buildInputs = [ util-linux mtdutils ];
       buildCommand = ''
         ln -s ${kernel}/lib /lib
         ${kmod}/bin/modprobe mtd
@@ -417,7 +417,7 @@ rec {
 
         # Make the Nix store available in /mnt, because that's where the RPMs live.
         mkdir -p /mnt${storeDir}
-        ${utillinux}/bin/mount -o bind ${storeDir} /mnt${storeDir}
+        ${util-linux}/bin/mount -o bind ${storeDir} /mnt${storeDir}
 
         # Newer distributions like Fedora 18 require /lib etc. to be
         # symlinked to /usr.
@@ -427,7 +427,7 @@ rec {
           ln -s /usr/sbin /mnt/sbin
           ln -s /usr/lib /mnt/lib
           ln -s /usr/lib64 /mnt/lib64
-          ${utillinux}/bin/mount -t proc none /mnt/proc
+          ${util-linux}/bin/mount -t proc none /mnt/proc
         ''}
 
         echo "unpacking RPMs..."
@@ -445,7 +445,7 @@ rec {
         PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
           rpm --initdb
 
-        ${utillinux}/bin/mount -o bind /tmp /mnt/tmp
+        ${util-linux}/bin/mount -o bind /tmp /mnt/tmp
 
         echo "installing RPMs..."
         PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
@@ -456,8 +456,8 @@ rec {
 
         rm /mnt/.debug
 
-        ${utillinux}/bin/umount /mnt${storeDir} /mnt/tmp ${lib.optionalString unifiedSystemDir "/mnt/proc"}
-        ${utillinux}/bin/umount /mnt
+        ${util-linux}/bin/umount /mnt${storeDir} /mnt/tmp ${lib.optionalString unifiedSystemDir "/mnt/proc"}
+        ${util-linux}/bin/umount /mnt
       '';
 
       passthru = { inherit fullName; };
@@ -587,9 +587,9 @@ rec {
 
         # Make the Nix store available in /mnt, because that's where the .debs live.
         mkdir -p /mnt/inst${storeDir}
-        ${utillinux}/bin/mount -o bind ${storeDir} /mnt/inst${storeDir}
-        ${utillinux}/bin/mount -o bind /proc /mnt/proc
-        ${utillinux}/bin/mount -o bind /dev /mnt/dev
+        ${util-linux}/bin/mount -o bind ${storeDir} /mnt/inst${storeDir}
+        ${util-linux}/bin/mount -o bind /proc /mnt/proc
+        ${util-linux}/bin/mount -o bind /dev /mnt/dev
 
         # Misc. files/directories assumed by various packages.
         echo "initialising Dpkg DB..."
@@ -635,10 +635,10 @@ rec {
 
         rm /mnt/.debug
 
-        ${utillinux}/bin/umount /mnt/inst${storeDir}
-        ${utillinux}/bin/umount /mnt/proc
-        ${utillinux}/bin/umount /mnt/dev
-        ${utillinux}/bin/umount /mnt
+        ${util-linux}/bin/umount /mnt/inst${storeDir}
+        ${util-linux}/bin/umount /mnt/proc
+        ${util-linux}/bin/umount /mnt/dev
+        ${util-linux}/bin/umount /mnt
       '';
 
       passthru = { inherit fullName; };
diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix
index f8cb1a1c7442..00ea83cb85c3 100644
--- a/pkgs/desktops/enlightenment/efl/default.nix
+++ b/pkgs/desktops/enlightenment/efl/default.nix
@@ -46,7 +46,7 @@
 , python3Packages
 , systemd
 , udev
-, utillinux
+, util-linux
 , wayland
 , wayland-protocols
 , writeText
@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
     mint-x-icons # Mint-X is a parent icon theme of Enlightenment-X
     openjpeg
     poppler
-    utillinux
+    util-linux
     wayland
     xorg.libXScrnSaver
     xorg.libXcomposite
diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix
index a859285e0789..ccfeaa4f63e3 100644
--- a/pkgs/desktops/plasma-5/discover.nix
+++ b/pkgs/desktops/plasma-5/discover.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation,
   extra-cmake-modules, gettext, kdoctools, python,
-  appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, utillinux,
+  appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, util-linux,
   qtquickcontrols2,
   karchive, kconfig, kcrash, kdbusaddons, kdeclarative, kio, kirigami2, kitemmodels,
   knewstuff, kwindowsystem, kxmlgui, plasma-framework
@@ -12,7 +12,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
   buildInputs = [
     # discount is needed for libmarkdown
-    appstream-qt discount flatpak fwupd ostree packagekit-qt pcre utillinux
+    appstream-qt discount flatpak fwupd ostree packagekit-qt pcre util-linux
     qtquickcontrols2
     karchive kconfig kcrash kdbusaddons kdeclarative kio kirigami2 kitemmodels knewstuff kwindowsystem kxmlgui
     plasma-framework
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 8ae48b21f7be..73e449a13624 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -4,7 +4,7 @@
 
   boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio,
   libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
-  xorgserver, utillinux,
+  xorgserver, util-linux,
 
   qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, qtx11extras,
 
@@ -39,7 +39,7 @@ mkDerivation {
   '';
   CXXFLAGS = [
     "-I${lib.getDev xorgserver}/include/xorg"
-    ''-DNIXPKGS_HWCLOCK=\"${lib.getBin utillinux}/sbin/hwclock\"''
+    ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"''
   ];
   cmakeFlags = [
     "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg"
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index 9c6bdb2006a1..1b2e11782cd1 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../../node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index e9ca1bf35b88..2c00420c3626 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -1,6 +1,6 @@
 { clangStdenv, stdenv, fetchFromGitHub, cmake, zlib, openexr,
 openimageio, llvm, boost165, flex, bison, partio, pugixml,
-utillinux, python
+util-linux, python
 }:
 
 let boost_static = boost165.override { enableStatic = true; };
@@ -25,7 +25,7 @@ in clangStdenv.mkDerivation rec {
   buildInputs = [
      cmake zlib openexr openimageio llvm
      boost_static flex bison partio pugixml
-     utillinux # needed just for hexdump
+     util-linux # needed just for hexdump
      python # CMake doesn't check this?
   ];
   # TODO: How important is partio? CMake doesn't seem to find it
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 694ba6935b04..a1fcd89803a9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -112584,7 +112584,7 @@ self: {
      , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
      , resourcet, scientific, tagsoup, tasty, tasty-hunit
      , tasty-quickcheck, template-haskell, text, time
-     , time-locale-compat, unordered-containers, utillinux, vector, wai
+     , time-locale-compat, unordered-containers, util-linux, vector, wai
      , wai-app-static, warp, yaml
      }:
      mkDerivation {
@@ -112608,12 +112608,12 @@ self: {
          base bytestring containers filepath QuickCheck tasty tasty-hunit
          tasty-quickcheck text unordered-containers yaml
        ];
-       testToolDepends = [ utillinux ];
+       testToolDepends = [ util-linux ];
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) utillinux;};
+     }) {inherit (pkgs) util-linux;};
 
   "hakyll-R" = callPackage
     ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index a95f131c00c6..5473801f85d2 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitLab, icmake
 , libmilter, libX11, openssl, readline
-, utillinux, yodl }:
+, util-linux, yodl }:
 
 stdenv.mkDerivation rec {
   pname = "bobcat";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "fbb-git";
   };
 
-  buildInputs = [ libmilter libX11 openssl readline utillinux ];
+  buildInputs = [ libmilter libX11 openssl readline util-linux ];
   nativeBuildInputs = [ icmake yodl ];
 
   setSourceRoot = ''
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index de874a798b2b..072a12410f48 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,7 +1,7 @@
 { config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3
 , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45
-# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
-, utillinuxMinimal ? null
+# use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib)
+, util-linuxMinimal ? null
 , buildPackages
 
 # this is just for tests (not in the closure of any regular package)
@@ -13,7 +13,7 @@
 
 with stdenv.lib;
 
-assert stdenv.isLinux -> utillinuxMinimal != null;
+assert stdenv.isLinux -> util-linuxMinimal != null;
 
 # TODO:
 # * Make it build without python
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
     bash gnum4 # install glib-gettextize and m4 macros for other apps to use
   ] ++ optionals stdenv.isLinux [
     libselinux
-    utillinuxMinimal # for libmount
+    util-linuxMinimal # for libmount
   ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     AppKit Carbon Cocoa CoreFoundation CoreServices Foundation
   ]);
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 2436fc4afcb2..d3d50fd6d652 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -1,6 +1,6 @@
 { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
 , perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv
-, unbound, dns-root-data, gettext, cacert, utillinux
+, unbound, dns-root-data, gettext, cacert, util-linux
 , guileBindings ? config.gnutls.guile or false, guile
 , tpmSupport ? false, trousers, which, nettools, libunistring
 , withSecurity ? false, Security  # darwin Security.framework
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ perl pkgconfig ]
     ++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ]
-    ++ lib.optionals doCheck [ which nettools utillinux ];
+    ++ lib.optionals doCheck [ which nettools util-linux ];
 
   propagatedBuildInputs = [ nettle ];
 
diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix
index 6e0d351b8bc8..17246f0aa0a9 100644
--- a/pkgs/development/libraries/hyperscan/default.nix
+++ b/pkgs/development/libraries/hyperscan/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, ragel, python3
-, coreutils, gnused, utillinux
+, coreutils, gnused, util-linux
 , boost
 , withStatic ? false # build only shared libs by default, build static+shared if true
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     cmake ragel python3
     # Consider simply using busybox for these
     # Need at least: rev, sed, cut, nm
-    coreutils gnused utillinux
+    coreutils gnused util-linux
   ];
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix
index 8cda52c4aecd..1c00b6be2f20 100644
--- a/pkgs/development/libraries/kpmcore/default.nix
+++ b/pkgs/development/libraries/kpmcore/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, extra-cmake-modules
 , qtbase, kio
 , libatasmart, parted
-, utillinux }:
+, util-linux }:
 
 stdenv.mkDerivation rec {
   pname = "kpmcore";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
     kio
 
-    utillinux # needs blkid (note that this is not provided by utillinux-compat)
+    util-linux # needs blkid (note that this is not provided by util-linux-compat)
   ];
 
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix
index 7628212800f4..39646db87ecd 100644
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ b/pkgs/development/libraries/libblockdev/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, gtk-doc
 , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted
-, cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key
+, cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key
 , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive
 , thin-provisioning-tools, makeWrapper
 }:
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid utillinux libbytesize
+    glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid util-linux libbytesize
     libndctl nss volume_key libyaml
   ];
 
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index c0800c991c45..6ca6c3018316 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook
 , asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
-, json_c, kmod, which, utillinux, udev, keyutils
+, json_c, kmod, which, util-linux, udev, keyutils
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ];
 
   buildInputs =
-    [ json_c kmod utillinux udev keyutils
+    [ json_c kmod util-linux udev keyutils
     ];
 
   configureFlags =
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 6ea0e6be465b..d3d73e46ac26 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, getopt, utillinux, gperf }:
+{ stdenv, fetchurl, getopt, util-linux, gperf }:
 
 stdenv.mkDerivation rec {
   pname = "libseccomp";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  checkInputs = [ utillinux ];
+  checkInputs = [ util-linux ];
   doCheck = false; # dependency cycle
 
   # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference.
diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix
index 7a023d9489ed..b880d3642745 100644
--- a/pkgs/development/libraries/libvirt/5.9.0.nix
+++ b/pkgs/development/libraries/libvirt/5.9.0.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchgit
 , pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch
 , coreutils, libxml2, gnutls, perl, python2, attr
-, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
+, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
 , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
   ] ++ optionals (!buildFromTarball) [
     libtool autoconf automake
   ] ++ optionals stdenv.isLinux [
-    libpciaccess lvm2 utillinux systemd libnl numad zfs
+    libpciaccess lvm2 util-linux systemd libnl numad zfs
     libapparmor libcap_ng numactl attr parted libtirpc
   ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
     xen
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 642baba43767..224168888c02 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchgit
 , pkgconfig, makeWrapper, autoreconfHook, fetchpatch
 , coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils
-, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
+, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
 , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
     libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
     libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus
   ] ++ optionals stdenv.isLinux [
-    libpciaccess lvm2 utillinux systemd libnl numad zfs
+    libpciaccess lvm2 util-linux systemd libnl numad zfs
     libapparmor libcap_ng numactl attr parted libtirpc
   ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
     xen
diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix
index 394347277f6a..30f060405f08 100644
--- a/pkgs/development/libraries/libxsmm/default.nix
+++ b/pkgs/development/libraries/libxsmm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, coreutils, gfortran, gnused
-, python3, utillinux, which
+, python3, util-linux, which
 
 , enableStatic ? false
 }:
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
     gfortran
     gnused
     python3
-    utillinux
+    util-linux
     which
   ];
 
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index fbf399cb246e..483b8eeb2065 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -7,7 +7,7 @@
 , itstool
 , libtool
 , texinfo
-, utillinux
+, util-linux
 , autoreconfHook
 , glib
 , dotconf
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
-      inherit utillinux;
+      utillinux = util-linux;
     })
   ];
 
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix
index 7ac5a4370107..084b42c9a2dc 100644
--- a/pkgs/development/libraries/volume-key/default.nix
+++ b/pkgs/development/libraries/volume-key/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3
-, ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme
+, ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme
 , autoconf, automake, libtool
 , buildPackages
 }:
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext swig ];
 
-  buildInputs = [ autoreconfHook glib cryptsetup nss utillinux gpgme ncurses ];
+  buildInputs = [ autoreconfHook glib cryptsetup nss util-linux gpgme ncurses ];
 
   configureFlags = [
     "--with-gpgme-prefix=${gpgme.dev}"
diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/pkgs/development/misc/google-clasp/google-clasp.nix
index a527491777bc..be260edb643a 100644
--- a/pkgs/development/misc/google-clasp/google-clasp.nix
+++ b/pkgs/development/misc/google-clasp/google-clasp.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix
index fb74d79e7a71..21d24004645c 100644
--- a/pkgs/development/mobile/abootimg/default.nix
+++ b/pkgs/development/mobile/abootimg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, utillinux }:
+{ stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, util-linux }:
 
 let
   version = "0.6";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     sha256 = "1qgx9fxwhylgnixzkz2mzv2707f65qq7rar2rsqak536vhig1z9a";
   };
 
-  nativeBuildInputs = [ makeWrapper utillinux ];
+  nativeBuildInputs = [ makeWrapper util-linux ];
 
   postPatch = ''
     cat <<EOF > version.h
diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix
index c970861a86f0..17879f381d57 100644
--- a/pkgs/development/node-packages/composition.nix
+++ b/pkgs/development/node-packages/composition.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index e1abf5304935..04e3ee097fae 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -1,6 +1,6 @@
 # This file originates from node2nix
 
-{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
 
 let
   python = if nodejs ? python then nodejs.python else python2;
@@ -396,7 +396,7 @@ let
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
-        ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+        ++ stdenv.lib.optional (stdenv.isLinux) util-linux
         ++ stdenv.lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
 
@@ -470,7 +470,7 @@ let
         name = "node-dependencies-${name}-${version}";
 
         buildInputs = [ tarWrapper python nodejs ]
-          ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+          ++ stdenv.lib.optional (stdenv.isLinux) util-linux
           ++ stdenv.lib.optional (stdenv.isDarwin) libtool
           ++ buildInputs;
 
@@ -516,7 +516,7 @@ let
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index b8d1b4670aea..d224f2bc22e1 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock
-, pyudev, six, libselinux, multipath-tools, lsof, utillinux
+, pyudev, six, libselinux, multipath-tools, lsof, util-linux
 }:
 
 buildPythonPackage rec {
@@ -19,11 +19,11 @@ buildPythonPackage rec {
       -e '/^def set_friendly_names/a \    return False' \
       blivet/devicelibs/mpath.py
     sed -i -e '/"wipefs"/ {
-      s|wipefs|${utillinux}/sbin/wipefs|
+      s|wipefs|${util-linux}/sbin/wipefs|
       s/-f/--force/
     }' blivet/formats/__init__.py
     sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
-    sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
+    sed -i -r -e 's|"(u?mount)"|"${util-linux}/bin/\1"|' blivet/util.py
   '';
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix
index c2a329e08f34..3005429658b9 100644
--- a/pkgs/development/python-modules/coloredlogs/default.nix
+++ b/pkgs/development/python-modules/coloredlogs/default.nix
@@ -6,7 +6,7 @@
 , capturer
 , pytest
 , mock
-, utillinux
+, util-linux
 }:
 
 buildPythonPackage rec {
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \
                                      and not test_auto_install"
   '';
-  checkInputs = [ pytest mock utillinux ];
+  checkInputs = [ pytest mock util-linux ];
 
   propagatedBuildInputs = [ humanfriendly verboselogs capturer ];
 
diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix
index 318bafb98efa..e5d9910024a5 100644
--- a/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll
-, python, utillinux, pygit2, gitMinimal, git-annex, cacert
+, python, util-linux, pygit2, gitMinimal, git-annex, cacert
 }:
 
 buildPythonPackage rec {
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     gitMinimal
-    utillinux # `rev` is needed in tests/test_process.py
+    util-linux # `rev` is needed in tests/test_process.py
   ];
 
   propagatedBuildInputs = [ pygit2 cacert ];
diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix
index f5726b91b9c1..890180d0dec9 100644
--- a/pkgs/development/python-modules/nuitka/default.nix
+++ b/pkgs/development/python-modules/nuitka/default.nix
@@ -27,7 +27,7 @@ in buildPythonPackage rec {
   postPatch = ''
     patchShebangs tests/run-tests
   '' + stdenv.lib.optionalString stdenv.isLinux ''
-    substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${pkgs.utillinux.out}/lib/libuuid.so"'
+    substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${pkgs.util-linux.out}/lib/libuuid.so"'
   '';
 
   # We do not want any wrappers here.
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index fc18c6e516c1..ff3f3335c87c 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -6,7 +6,7 @@
   cudaArchList ? null,
 
   # Native build inputs
-  cmake, utillinux, linkFarm, symlinkJoin, which,
+  cmake, util-linux, linkFarm, symlinkJoin, which,
 
   # Build inputs
   numactl,
@@ -207,7 +207,7 @@ in buildPythonPackage rec {
 
   nativeBuildInputs = [
     cmake
-    utillinux
+    util-linux
     which
     ninja
   ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ];
diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix
index 687aec08a017..6b10e838e5fb 100644
--- a/pkgs/development/python-modules/supervise_api/default.nix
+++ b/pkgs/development/python-modules/supervise_api/default.nix
@@ -5,7 +5,7 @@
 , supervise
 , isPy3k
 , whichcraft
-, utillinux
+, util-linux
 }:
 
 buildPythonPackage rec {
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = lib.optional (!isPy3k) whichcraft;
 
-  checkInputs = [ utillinux ];
+  checkInputs = [ util-linux ];
 
   meta = {
     description = "An API for running processes safely and securely";
diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix
index 3d82b599dc06..599abf1974cd 100644
--- a/pkgs/development/python-modules/xlib/default.nix
+++ b/pkgs/development/python-modules/xlib/default.nix
@@ -7,7 +7,7 @@
 , python
 , mock
 , nose
-, utillinux
+, util-linux
 }:
 
 buildPythonPackage rec {
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     ${python.interpreter} runtests.py
   '';
 
-  checkInputs = [ mock nose utillinux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];
+  checkInputs = [ mock nose util-linux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];
   nativeBuildInputs = [ setuptools_scm ];
   buildInputs = [ xorg.libX11 ];
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix
index 76bf29abc17c..3adb84a0ba58 100644
--- a/pkgs/development/r-modules/generic-builder.nix
+++ b/pkgs/development/r-modules/generic-builder.nix
@@ -1,10 +1,10 @@
-{ stdenv, R, libcxx, xvfb_run, utillinux, Cocoa, Foundation, gettext, gfortran }:
+{ stdenv, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }:
 
 { name, buildInputs ? [], requireX ? false, ... } @ attrs:
 
 stdenv.mkDerivation ({
   buildInputs = buildInputs ++ [R gettext] ++
-                stdenv.lib.optionals requireX [utillinux xvfb_run] ++
+                stdenv.lib.optionals requireX [util-linux xvfb_run] ++
                 stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran];
 
   NIX_CFLAGS_COMPILE =
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 04370a46b908..83749bd21a5d 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -19,7 +19,7 @@
 
 { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
 , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick
-, pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
+, pkgconfig , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi
 , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
@@ -196,7 +196,7 @@ in
 
   gio2 = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ];
+    buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ];
   };
 
   gitlab-markup = attrs: { meta.priority = 1; };
@@ -220,7 +220,7 @@ in
     nativeBuildInputs = [
       binutils pkgconfig
     ] ++ lib.optionals stdenv.isLinux [
-      utillinux libselinux libsepol
+      util-linux libselinux libsepol
     ];
     propagatedBuildInputs = [
       atk
diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix
index bdc48bd6b1f7..dfa465cfdea7 100644
--- a/pkgs/development/tools/buildah/wrapper.nix
+++ b/pkgs/development/tools/buildah/wrapper.nix
@@ -9,7 +9,7 @@
 , conmon # Container runtime monitor
 , slirp4netns # User-mode networking for unprivileged namespaces
 , fuse-overlayfs # CoW for images, much faster than default vfs
-, utillinux # nsenter
+, util-linux # nsenter
 , cni-plugins # not added to path
 , iptables
 }:
@@ -23,7 +23,7 @@ let
     conmon
     slirp4netns
     fuse-overlayfs
-    utillinux
+    util-linux
     iptables
   ] ++ extraPackages);
 
diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix
index 0ceb6f566a31..500c9a55c1d8 100644
--- a/pkgs/development/tools/git-quick-stats/default.nix
+++ b/pkgs/development/tools/git-quick-stats/default.nix
@@ -6,7 +6,7 @@
 , git
 , gnugrep
 , ncurses
-, utillinux
+, util-linux
 }:
 
 stdenv.mkDerivation rec {
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
         git
         gnugrep
         ncurses
-        utillinux
+        util-linux
       ];
     in
     ''
diff --git a/pkgs/development/tools/halfempty/default.nix b/pkgs/development/tools/halfempty/default.nix
index e576b2321c69..c8c267f91872 100644
--- a/pkgs/development/tools/halfempty/default.nix
+++ b/pkgs/development/tools/halfempty/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, utillinux, scowl }:
+{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, util-linux, scowl }:
 
 stdenv.mkDerivation rec {
   pname = "halfempty";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc";
   };
 
-  nativeBuildInputs = [ pkgconfig utillinux ];
+  nativeBuildInputs = [ pkgconfig util-linux ];
   buildInputs = [ glib ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index 943adf0e469b..fc6f7156a81b 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -3,7 +3,7 @@
 , flex
 , zlib
 , perlPackages
-, utillinux
+, util-linux
 }:
 
 stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   # so let's make sure it knows where to find it:
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''
     substituteInPlace creduce/creduce_utils.pm --replace \
-      lscpu ${utillinux}/bin/lscpu
+      lscpu ${util-linux}/bin/lscpu
   '';
 
 
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix
index 731ac836412a..18926a85528c 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, pkgconfig, makeWrapper
-, libusb1, tcl, utillinux, coreutils, bash }:
+, libusb1, tcl, util-linux, coreutils, bash }:
 
 stdenv.mkDerivation rec {
   pname = "usb-modeswitch";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapProgram $out/bin/usb_modeswitch_dispatcher \
-      --set PATH ${lib.makeBinPath [ utillinux coreutils bash ]}
+      --set PATH ${lib.makeBinPath [ util-linux coreutils bash ]}
   '';
 
   buildInputs = [ libusb1 tcl ];
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 758bebb57df8..6bb7e1377af3 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, perl, icmake, utillinux }:
+{ stdenv, fetchFromGitLab, perl, icmake, util-linux }:
 
 stdenv.mkDerivation rec {
   pname = "yodl";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     patchShebangs scripts/
     substituteInPlace INSTALL.im --replace /usr $out
     substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl
-    substituteInPlace scripts/yodl2whatever.in --replace getopt ${utillinux}/bin/getopt
+    substituteInPlace scripts/yodl2whatever.in --replace getopt ${util-linux}/bin/getopt
   '';
 
   # Set TERM because icmbuild calls tput.
diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix
index c970861a86f0..17879f381d57 100644
--- a/pkgs/development/web/newman/node-composition.nix
+++ b/pkgs/development/web/newman/node-composition.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/development/web/newman/node-env.nix b/pkgs/development/web/newman/node-env.nix
index e1abf5304935..04e3ee097fae 100644
--- a/pkgs/development/web/newman/node-env.nix
+++ b/pkgs/development/web/newman/node-env.nix
@@ -1,6 +1,6 @@
 # This file originates from node2nix
 
-{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
 
 let
   python = if nodejs ? python then nodejs.python else python2;
@@ -396,7 +396,7 @@ let
     stdenv.mkDerivation ({
       name = "node_${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
-        ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+        ++ stdenv.lib.optional (stdenv.isLinux) util-linux
         ++ stdenv.lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
 
@@ -470,7 +470,7 @@ let
         name = "node-dependencies-${name}-${version}";
 
         buildInputs = [ tarWrapper python nodejs ]
-          ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+          ++ stdenv.lib.optional (stdenv.isLinux) util-linux
           ++ stdenv.lib.optional (stdenv.isDarwin) libtool
           ++ buildInputs;
 
@@ -516,7 +516,7 @@ let
     stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 12754b6d4412..4358d6134e82 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, libuv, utillinux, http-parser
+{ stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
 , pkgconfig, which
 # Updater dependencies
 , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
@@ -55,7 +55,7 @@ in
     buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
       ++ [ zlib libuv openssl http-parser icu ];
 
-    nativeBuildInputs = [ which utillinux pkgconfig python ]
+    nativeBuildInputs = [ which util-linux pkgconfig python ]
       ++ optionals stdenv.isDarwin [ xcbuild ];
 
     configureFlags = let
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index a527491777bc..be260edb643a 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix
index 2dde86297e87..94f39a4b5789 100644
--- a/pkgs/games/unnethack/default.nix
+++ b/pkgs/games/unnethack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, utillinux, ncurses, flex, bison }:
+{ stdenv, fetchFromGitHub, fetchpatch, util-linux, ncurses, flex, bison }:
 
 stdenv.mkDerivation rec {
   pname = "unnethack";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses ];
 
-  nativeBuildInputs = [ utillinux flex bison ];
+  nativeBuildInputs = [ util-linux flex bison ];
 
   configureFlags = [ "--enable-curses-graphics"
                      "--disable-tty-graphics"
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index 052339d11ea0..bb6ff246daac 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -10,7 +10,7 @@ let
     inherit (pkgs) fetchurl fetchgit;
   });
   nodeEnv = import ../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
index 46ce7abb28e6..8f07d4b41970 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd, runtimeShell
+{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, util-linux, xxd, runtimeShell
 , ghostscript, a2ps }:
 
 # Why:
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     patchelf --set-interpreter ${pkgsi686Linux.stdenv.cc.libc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_mfcj6510dw
 
     #stripping the hardcoded path.
-    ${utillinux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj6510dw | \
+    ${util-linux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj6510dw | \
     sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F6272257366756E63.62726d66636a36353130647766756e63000000000000000000000000000000000000000000.' | \
     sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F627225737263.62726D66636A3635313064777263000000000000000000000000000000000000000000.' | \
     ${xxd}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix
index 452c2c425c1d..4b9f47d88f94 100644
--- a/pkgs/misc/drivers/hplip/3.16.11.nix
+++ b/pkgs/misc/drivers/hplip/3.16.11.nix
@@ -2,7 +2,7 @@
 , pkgconfig
 , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils
 , net-snmp, openssl, nettools
-, bash, coreutils, utillinux
+, bash, coreutils, util-linux
 , qtSupport ? true
 , withPlugin ? false
 }:
@@ -175,7 +175,7 @@ python2Packages.buildPythonApplication {
     substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \
       --replace {,${bash}}/bin/sh \
       --replace /usr/bin/nohup "" \
-      --replace {,${utillinux}/bin/}logger \
+      --replace {,${util-linux}/bin/}logger \
       --replace {/usr,$out}/bin
   '';
 
diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix
index f9064720fb64..59b3d2b9d634 100644
--- a/pkgs/misc/drivers/hplip/3.18.5.nix
+++ b/pkgs/misc/drivers/hplip/3.18.5.nix
@@ -3,7 +3,7 @@
 , cups, zlib, libjpeg, libusb1, python2Packages, sane-backends
 , dbus, file, ghostscript, usbutils
 , net-snmp, openssl, perl, nettools
-, bash, coreutils, utillinux
+, bash, coreutils, util-linux
 , withQt5 ? true
 , withPlugin ? false
 , withStaticPPDInstall ? false
@@ -212,7 +212,7 @@ python2Packages.buildPythonApplication {
     substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \
       --replace {,${bash}}/bin/sh \
       --replace /usr/bin/nohup "" \
-      --replace {,${utillinux}/bin/}logger \
+      --replace {,${util-linux}/bin/}logger \
       --replace {/usr,$out}/bin
   '';
 
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index afd1f8f6fe4f..b740f5091fa7 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -3,7 +3,7 @@
 , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends
 , dbus, file, ghostscript, usbutils
 , net-snmp, openssl, perl, nettools
-, bash, coreutils, utillinux
+, bash, coreutils, util-linux
 # To remove references to gcc-unwrapped
 , removeReferencesTo, qt5
 , withQt5 ? true
@@ -219,7 +219,7 @@ python3Packages.buildPythonApplication {
     substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \
       --replace {,${bash}}/bin/sh \
       --replace /usr/bin/nohup "" \
-      --replace {,${utillinux}/bin/}logger \
+      --replace {,${util-linux}/bin/}logger \
       --replace {/usr,$out}/bin
     remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so)
   '' + stdenv.lib.optionalString withQt5 ''
diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix
index cc3118ace151..e824e19347a6 100644
--- a/pkgs/misc/emulators/cdemu/libmirage.nix
+++ b/pkgs/misc/emulators/cdemu/libmirage.nix
@@ -1,6 +1,6 @@
 { callPackage, gobject-introspection, cmake, pkgconfig
 , glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool
-, pcre, utillinux, libselinux, libsepol }:
+, pcre, util-linux, libselinux, libsepol }:
 
 let pkg = import ./base.nix {
   version = "3.2.3";
@@ -13,6 +13,6 @@ in callPackage pkg {
     PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
     PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
     nativeBuildInputs = [ cmake gobject-introspection pkgconfig ];
-    propagatedBuildInputs = [ pcre utillinux libselinux libsepol ];
+    propagatedBuildInputs = [ pcre util-linux libselinux libsepol ];
   };
 }
diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix
index d089ddf2695b..5a813c5d2efe 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/pkgs/misc/emulators/qmc2/default.nix
@@ -3,7 +3,7 @@
 , minizip, zlib
 , qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns
 , rsync, SDL2, xwininfo
-, utillinux
+, util-linux
 , xorg
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ qttools pkgconfig ];
   buildInputs = [ minizip qtbase qtsvg qtmultimedia qtwebkit
                   qttranslations qtxmlpatterns rsync SDL2
-                  xwininfo zlib utillinux xorg.libxcb ];
+                  xwininfo zlib util-linux xorg.libxcb ];
 
   makeFlags = [ "DESTDIR=$(out)"
                 "PREFIX=/"
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index f3b9fa304204..a628f5ded58b 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging;
 in assert stdenv.lib.getVersion wineUnstable == patch.version;
 
 (stdenv.lib.overrideDerivation wineUnstable (self: {
-  buildInputs = build-inputs [ "perl" "utillinux" "autoconf" "gitMinimal" ] self.buildInputs;
+  buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs;
 
   name = "${self.name}-staging";
 
diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
index 446fedeffec4..c49f798899fe 100644
--- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
+++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
@@ -2,7 +2,7 @@
 #  -  <https://github.com/msteen/nixos-vsliveshare/blob/master/pkgs/vsliveshare/default.nix>
 #  -  <https://github.com/NixOS/nixpkgs/issues/41189>
 { lib, gccStdenv, vscode-utils, autoPatchelfHook, bash, file, makeWrapper, dotnet-sdk_3
-, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, utillinux, zlib
+, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, util-linux, zlib
 , desktop-file-utils, xprop
 }:
 
@@ -30,7 +30,7 @@ let
 
     # General
     gcc.cc.lib
-    utillinux # libuuid
+    util-linux # libuuid
   ];
 
 in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtension {
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 3db9a7d3005c..dcdafb98d707 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, unzip, utillinux,
+{ stdenv, lib, unzip, util-linux,
   libusb1, evdi, systemd, makeWrapper, requireFile, substituteAll }:
 
 let
@@ -7,7 +7,7 @@ let
     else if stdenv.hostPlatform.system == "i686-linux" then "x86"
     else throw "Unsupported architecture";
   bins = "${arch}-ubuntu-1604";
-  libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ];
+  libPath = lib.makeLibraryPath [ stdenv.cc.cc util-linux libusb1 evdi ];
 
 in stdenv.mkDerivation rec {
   pname = "displaylink";
diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index d087a9e2e26d..696dfd275c74 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, gperf, utillinux, kmod}:
+{stdenv, fetchurl, pkgconfig, glib, gperf, util-linux, kmod}:
 let
   s = # Generated upstream information
   rec {
@@ -11,7 +11,7 @@ let
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    glib gperf utillinux kmod
+    glib gperf util-linux kmod
   ];
 in
 stdenv.mkDerivation {
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index 19c64106701e..b40bd84cbb8d 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -1,7 +1,7 @@
 { version, sha256Hash }:
 
 { stdenv, fetchFromGitHub, fetchpatch
-, fusePackages, utillinux, gettext
+, fusePackages, util-linux, gettext
 , meson, ninja, pkg-config
 , autoreconfHook
 , python3Packages, which
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
     # $PATH, so it should also work on non-NixOS systems.
     export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers/bin\""
 
-    sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
+    sed -e 's@/bin/@${util-linux}/bin/@g' -i lib/mount_util.c
     '' + (if isFuse3 then ''
       # The configure phase will delete these files (temporary workaround for
       # ./fuse3-install_man.patch)
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 7549f379f8a7..f159a4cbf775 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -1,8 +1,8 @@
-{ callPackage, utillinux }:
+{ callPackage, util-linux }:
 
 let
   mkFuse = args: callPackage (import ./common.nix args) {
-    inherit utillinux;
+    inherit util-linux;
   };
 in {
   fuse_2 = mkFuse {
diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
index ba37c71d1345..a272bd286f32 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
+{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args:
 
 buildLinux (args // rec {
   version = "4.14.165-172";
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 961bdab12b58..3bdb8c4f2973 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -302,7 +302,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
   nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ]
       ++ optional  (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
       ++ optional  (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf
-      # Removed utillinuxMinimal since it should not be a dependency.
+      # Removed util-linuxMinimal since it should not be a dependency.
       ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
       ++ optional  (stdenv.lib.versionAtLeast version "5.2")  cpio
       ++ optional  (stdenv.lib.versionAtLeast version "5.8")  elfutils
diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix
index bbc341caf11f..352ce5353377 100644
--- a/pkgs/os-specific/linux/ldm/default.nix
+++ b/pkgs/os-specific/linux/ldm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, udev, utillinux, mountPath ? "/media/" }:
+{ stdenv, fetchgit, udev, util-linux, mountPath ? "/media/" }:
 
 assert mountPath != "";
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "0lxfypnbamfx6p9ar5k9wra20gvwn665l4pp2j4vsx4yi5q7rw2n";
   };
 
-  buildInputs = [ udev utillinux ];
+  buildInputs = [ udev util-linux ];
 
   postPatch = ''
     substituteInPlace ldm.c \
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 7bbd1768c043..6f1290cf0705 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -2,7 +2,7 @@
 , fetchpatch
 , fetchurl
 , pkgconfig
-, utillinux
+, util-linux
 , libuuid
 , thin-provisioning-tools, libaio
 , enableCmdlib ? false
diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index 0067f0881aea..8fdb72e060f7 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -1,5 +1,5 @@
 { config, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse
-, utillinux, makeWrapper
+, util-linux, makeWrapper
 , enableDebugBuild ? config.lxcfs.enableDebugBuild or false }:
 
 with stdenv.lib;
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
   installFlags = [ "SYSTEMD_UNIT_DIR=\${out}/lib/systemd" ];
 
   postInstall = ''
-    # `mount` hook requires access to the `mount` command from `utillinux`:
+    # `mount` hook requires access to the `mount` command from `util-linux`:
     wrapProgram "$out/share/lxcfs/lxc.mount.hook" \
-      --prefix PATH : "${utillinux}/bin"
+      --prefix PATH : "${util-linux}/bin"
   '';
 
   postFixup = ''
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 9ead1f6ad4bd..f0ef1126154a 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, utillinux }:
+{ stdenv, fetchFromGitHub, util-linux }:
 
 stdenv.mkDerivation rec {
   pname = "mcelog";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace '"unknown"' '"${version}"'
 
     for i in triggers/*; do
-      substituteInPlace $i --replace 'logger' '${utillinux}/bin/logger'
+      substituteInPlace $i --replace 'logger' '${util-linux}/bin/logger'
     done
   '';
 
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 6a71196157b7..2fbe05557a2f 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, utillinux, coreutils, fetchurl, groff, system-sendmail }:
+{ stdenv, util-linux, coreutils, fetchurl, groff, system-sendmail }:
 
 stdenv.mkDerivation rec {
   name = "mdadm-4.1";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
         -e 's@/usr/sbin/sendmail@${system-sendmail}/bin/sendmail@' -i Makefile
     sed -i \
         -e 's@/usr/bin/basename@${coreutils}/bin/basename@g' \
-        -e 's@BINDIR/blkid@${utillinux}/bin/blkid@g' \
+        -e 's@BINDIR/blkid@${util-linux}/bin/blkid@g' \
         *.rules
   '';
 
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 81ec7e5a661e..86b0981c5fa3 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent
+{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, util-linux, libcap, libtirpc, libevent
 , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
 , python3, buildPackages, nixosTests, rpcsvc-proto
 , enablePython ? true
 }:
 
 let
-  statdPath = lib.makeBinPath [ systemd utillinux coreutils ];
+  statdPath = lib.makeBinPath [ systemd util-linux coreutils ];
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index 6314dcea62d2..b8aa251489dc 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext
-, utillinux, openisns, openssl, kmod, perl, systemd, pkgconf
+, util-linux, openisns, openssl, kmod, perl, systemd, pkgconf
 }:
 
 stdenv.mkDerivation rec {
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "2.1.2";
 
   nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
-  buildInputs = [ kmod openisns.lib openssl systemd utillinux ];
+  buildInputs = [ kmod openisns.lib openssl systemd util-linux ];
 
   src = fetchFromGitHub {
     owner = "open-iscsi";
diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix
index a6bf67db0980..ef96c7697e77 100644
--- a/pkgs/os-specific/linux/openrazer/driver.nix
+++ b/pkgs/os-specific/linux/openrazer/driver.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , kernel
 , stdenv
-, utillinux
+, util-linux
 }:
 
 let
@@ -28,7 +28,7 @@ stdenv.mkDerivation (common // {
     substituteInPlace $RAZER_RULES_OUT \
       --replace razer_mount $RAZER_MOUNT_OUT
     substituteInPlace $RAZER_MOUNT_OUT \
-      --replace /usr/bin/logger ${utillinux}/bin/logger \
+      --replace /usr/bin/logger ${util-linux}/bin/logger \
       --replace chgrp ${coreutils}/bin/chgrp \
       --replace "PATH='/sbin:/bin:/usr/sbin:/usr/bin'" ""
   '';
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index 33b252a02254..84f8abf73b0f 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, utillinux, which
+{ stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which
 , procps, libcap_ng, openssl, python3 , perl
 , kernel ? null }:
 
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
   kernel = optional (_kernel != null) _kernel.dev;
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ makeWrapper utillinux openssl libcap_ng pythonEnv
+  buildInputs = [ makeWrapper util-linux openssl libcap_ng pythonEnv
                   perl procps which ];
 
   configureFlags = [
diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix
index 358a8b39917b..54ecefc54b2f 100644
--- a/pkgs/os-specific/linux/openvswitch/lts.nix
+++ b/pkgs/os-specific/linux/openvswitch/lts.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, utillinux, which
+{ stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which
 , procps, libcap_ng, openssl, python2, iproute , perl
 , automake, autoconf, libtool, kernel ? null }:
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   kernel = optional (_kernel != null) _kernel.dev;
 
   nativeBuildInputs = [ autoconf libtool automake pkgconfig  ];
-  buildInputs = [ makeWrapper utillinux openssl libcap_ng python2
+  buildInputs = [ makeWrapper util-linux openssl libcap_ng python2
                   perl procps which ];
 
   preConfigure = "./boot.sh";
diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix
index 3e026be6abb2..ebfd896555ae 100644
--- a/pkgs/os-specific/linux/pam_mount/default.nix
+++ b/pkgs/os-specific/linux/pam_mount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }:
 
 stdenv.mkDerivation rec {
   pname = "pam_mount";
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/mtcrypt.c \
-      --replace @@NIX_UTILLINUX@@ ${utillinux}/bin
+      --replace @@NIX_UTILLINUX@@ ${util-linux}/bin
   '';
 
   nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];
 
-  buildInputs = [ pam libHX utillinux libxml2 pcre perl openssl cryptsetup ];
+  buildInputs = [ pam libHX util-linux libxml2 pcre perl openssl cryptsetup ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index 41db6e936615..a883935b7b95 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, meson, ninja, pkgconfig
-, dpdk, libbsd, libpcap, lua5_3, numactl, utillinux
+, dpdk, libbsd, libpcap, lua5_3, numactl, util-linux
 , gtk2, which, withGtk ? false
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   patches = [ ./configure.patch ];
 
   postPatch = ''
-    substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu
+    substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${util-linux}/bin/lscpu
   '';
 
   postInstall = ''
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix
index 1d8314923d37..e685402d4739 100644
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/pkgs/os-specific/linux/pm-utils/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, coreutils, gnugrep, utillinux, kmod
+{ stdenv, fetchurl, coreutils, gnugrep, util-linux, kmod
 , procps, kbd, dbus }:
 
 let
 
   binPath = stdenv.lib.makeBinPath
-    [ coreutils gnugrep utillinux kmod procps kbd dbus ];
+    [ coreutils gnugrep util-linux kmod procps kbd dbus ];
 
   sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin"
     [ procps ];
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix
index 63d0c88c1f8e..01624bff5359 100644
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/pkgs/os-specific/linux/pmount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, ntfs3g, utillinux
+{ stdenv, fetchurl, intltool, ntfs3g, util-linux
 , mediaDir ? "/media/"
 , lockDir ? "/var/lock/pmount"
 , whiteList ? "/etc/pmount.allow"
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
     sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036";
   };
 
-  buildInputs = [ intltool utillinux ];
+  buildInputs = [ intltool util-linux ];
 
   configureFlags = [
     "--with-media-dir=${mediaDir}"
     "--with-lock-dir=${lockDir}"
     "--with-whitelist=${whiteList}"
-    "--with-mount-prog=${utillinux}/bin/mount"
-    "--with-umount-prog=${utillinux}/bin/umount"
+    "--with-mount-prog=${util-linux}/bin/mount"
+    "--with-umount-prog=${util-linux}/bin/umount"
     "--with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g"
   ];
 
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index e71dcb497a26..9b0e38198a33 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, makeWrapper, p7zip
-, gawk, utillinux, xorg, glib, dbus-glib, zlib
+, gawk, util-linux, xorg, glib, dbus-glib, zlib
 , kernel ? null, libsOnly ? false
 , undmg, fetchurl
 }:
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   kernelVersion = if libsOnly then "" else lib.getName kernel.name;
   kernelDir = if libsOnly then "" else "${kernel.dev}/lib/modules/${kernelVersion}";
-  scriptPath = lib.concatStringsSep ":" (lib.optionals (!libsOnly) [ "${utillinux}/bin" "${gawk}/bin" ]);
+  scriptPath = lib.concatStringsSep ":" (lib.optionals (!libsOnly) [ "${util-linux}/bin" "${gawk}/bin" ]);
 
   buildPhase = ''
     if test -z "$libsOnly"; then
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 85c78ce1421b..13b52b86ff43 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -18,7 +18,7 @@
 
   # Mandatory dependencies
 , libcap
-, utillinux
+, util-linux
 , kbd
 , kmod
 
@@ -277,9 +277,9 @@ stdenv.mkDerivation {
 
     "-Dkill-path=${coreutils}/bin/kill"
     "-Dkmod-path=${kmod}/bin/kmod"
-    "-Dsulogin-path=${utillinux}/bin/sulogin"
-    "-Dmount-path=${utillinux}/bin/mount"
-    "-Dumount-path=${utillinux}/bin/umount"
+    "-Dsulogin-path=${util-linux}/bin/sulogin"
+    "-Dmount-path=${util-linux}/bin/mount"
+    "-Dumount-path=${util-linux}/bin/umount"
     "-Dcreate-log-dirs=false"
     # Upstream uses cgroupsv2 by default. To support docker and other
     # container managers we still need v1.
@@ -326,12 +326,12 @@ stdenv.mkDerivation {
       test -e $i
       substituteInPlace $i \
         --replace /usr/bin/getent ${getent}/bin/getent \
-        --replace /sbin/mkswap ${lib.getBin utillinux}/sbin/mkswap \
-        --replace /sbin/swapon ${lib.getBin utillinux}/sbin/swapon \
-        --replace /sbin/swapoff ${lib.getBin utillinux}/sbin/swapoff \
+        --replace /sbin/mkswap ${lib.getBin util-linux}/sbin/mkswap \
+        --replace /sbin/swapon ${lib.getBin util-linux}/sbin/swapon \
+        --replace /sbin/swapoff ${lib.getBin util-linux}/sbin/swapoff \
         --replace /bin/echo ${coreutils}/bin/echo \
         --replace /bin/cat ${coreutils}/bin/cat \
-        --replace /sbin/sulogin ${lib.getBin utillinux}/sbin/sulogin \
+        --replace /sbin/sulogin ${lib.getBin util-linux}/sbin/sulogin \
         --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \
         --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
         --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index ccf341e212fe..9a21aab9f256 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper
-, gettext, zsh, pinentry, cryptsetup, gnupg, utillinux, e2fsprogs, sudo
+, gettext, zsh, pinentry, cryptsetup, gnupg, util-linux, e2fsprogs, sudo
 }:
 
 stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1
 
     wrapProgram $out/bin/tomb \
-      --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext gnupg pinentry utillinux e2fsprogs ]}
+      --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext gnupg pinentry util-linux e2fsprogs ]}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix
index f8876e5d155a..725706f9b0eb 100644
--- a/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/pkgs/os-specific/linux/udisks/1-default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib
 , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm
-, libxslt, docbook_xsl, utillinux, libgudev }:
+, libxslt, docbook_xsl, util-linux, libgudev }:
 
 stdenv.mkDerivation rec {
   name = "udisks-1.0.5";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
       substituteInPlace src/main.c --replace \
         "/sbin:/bin:/usr/sbin:/usr/bin" \
-        "${utillinux}/bin:${mdadm}/sbin:/run/current-system/sw/bin:/run/current-system/sw/bin"
+        "${util-linux}/bin:${mdadm}/sbin:/run/current-system/sw/bin:/run/current-system/sw/bin"
     '';
 
   buildInputs =
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 3b502dbe48f5..b47d31ab6fdc 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkgconfig, gettext, gnused
 , gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which
-, expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted
+, expat, libxslt, docbook_xsl, util-linux, mdadm, libgudev, libblockdev, parted
 , gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake
 , xfsprogs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g
 }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     (substituteAll {
       src = ./fix-paths.patch;
       bash = "${bash}/bin/bash";
-      blkid = "${utillinux}/bin/blkid";
+      blkid = "${util-linux}/bin/blkid";
       false = "${coreutils}/bin/false";
       mdadm = "${mdadm}/bin/mdadm";
       sed = "${gnused}/bin/sed";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       src = ./force-path.patch;
       path = stdenv.lib.makeBinPath [
         btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils
-        xfsprogs ntfs3g parted utillinux
+        xfsprogs ntfs3g parted util-linux
       ];
     })
 
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 80fb7389877a..5406dcf77eba 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch
-, autoreconfHook, utillinux, nukeReferences, coreutils
+, autoreconfHook, util-linux, nukeReferences, coreutils
 , perl, buildPackages
 , configFile ? "all"
 
@@ -50,11 +50,11 @@ let
         # The arrays must remain the same length, so we repeat a flag that is
         # already part of the command and therefore has no effect.
         substituteInPlace ./module/${optionalString isUnstable "os/linux/"}zfs/zfs_ctldir.c \
-          --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \
-          --replace '"/usr/bin/env", "mount"'  '"${utillinux}/bin/mount", "-n"'
+          --replace '"/usr/bin/env", "umount"' '"${util-linux}/bin/umount", "-n"' \
+          --replace '"/usr/bin/env", "mount"'  '"${util-linux}/bin/mount", "-n"'
       '' + optionalString buildUser ''
-        substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${utillinux}/bin/umount" \
-                                                      --replace "/bin/mount"              "${utillinux}/bin/mount"
+        substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${util-linux}/bin/umount" \
+                                                      --replace "/bin/mount"              "${util-linux}/bin/mount"
         substituteInPlace ./lib/libshare/${optionalString isUnstable "os/linux/"}nfs.c --replace "/usr/sbin/exportfs" "${
           # We don't *need* python support, but we set it like this to minimize closure size:
           # If it's disabled by default, no need to enable it, even if we have python enabled
@@ -142,7 +142,7 @@ let
       postInstall = optionalString buildKernel ''
         # Add reference that cannot be detected due to compressed kernel module
         mkdir -p "$out/nix-support"
-        echo "${utillinux}" >> "$out/nix-support/extra-refs"
+        echo "${util-linux}" >> "$out/nix-support/extra-refs"
       '' + optionalString buildUser ''
         # Remove provided services as they are buggy
         rm $out/etc/systemd/system/zfs-import-*.service
@@ -162,7 +162,7 @@ let
       '';
 
       postFixup = let
-        path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep utillinux smartmontools sysstat ]}:$PATH";
+        path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmontools sysstat ]}:$PATH";
       in ''
         for i in $out/libexec/zfs/zpool.d/*; do
           sed -i '2i${path}' $i
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index ad047ba31f86..bdbb77faf6c1 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, wall, hostname, man
+{ stdenv, fetchurl, pkgconfig, systemd, util-linux, coreutils, wall, hostname, man
 , enableCgiScripts ? true, gd
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;
+  buildInputs = [ util-linux man ] ++ stdenv.lib.optional enableCgiScripts gd;
 
   prePatch = ''
     sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 9a393cdeb009..6e960bd92fe9 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, fetchsvn,
   jansson, libedit, libxml2, libxslt, ncurses, openssl, sqlite,
-  utillinux, dmidecode, libuuid, newt,
+  util-linux, dmidecode, libuuid, newt,
   lua, speex,
   srtp, wget, curl, iksemel, pkgconfig
 }:
@@ -14,7 +14,7 @@ let
                     dmidecode libuuid newt
                     lua speex
                     srtp wget curl iksemel ];
-    nativeBuildInputs = [ utillinux pkgconfig ];
+    nativeBuildInputs = [ util-linux pkgconfig ];
 
     patches = [
       # We want the Makefile to install the default /var skeleton
diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix
index 0941ca969223..de358a5d66f8 100644
--- a/pkgs/servers/computing/torque/default.nix
+++ b/pkgs/servers/computing/torque/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux
+{ stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, util-linux
 , coreutils, file, libtool, which, boost, autoreconfHook
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   strictDeps = true;
   nativeBuildInputs = [ autoreconfHook pkgconfig flex bison libxml2 ];
   buildInputs = [
-    openssl groff libxml2 utillinux libtool
+    openssl groff libxml2 util-linux libtool
     which boost
   ];
 
diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix
index 9585ac46e5a3..1bbaacd58446 100644
--- a/pkgs/servers/hylafaxplus/default.nix
+++ b/pkgs/servers/hylafaxplus/default.nix
@@ -15,7 +15,7 @@
 , libtiff
 , psmisc
 , sharutils
-, utillinux
+, util-linux
 , zlib
 ## optional packages (using `null` disables some functionality)
 , jbigkit ? null
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
     libtiff
     psmisc  # for `fuser` command
     sharutils  # for `uuencode` command
-    utillinux  # for `agetty` command
+    util-linux  # for `agetty` command
     zlib
     jbigkit  # optional
     lcms2  # optional
diff --git a/pkgs/servers/matrix-appservice-discord/node-composition.nix b/pkgs/servers/matrix-appservice-discord/node-composition.nix
index 42b6358224cf..6080388b05e8 100644
--- a/pkgs/servers/matrix-appservice-discord/node-composition.nix
+++ b/pkgs/servers/matrix-appservice-discord/node-composition.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
index 36da6132423c..0f86a16aef50 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix
index 04e81fe150a9..673167030dc1 100644
--- a/pkgs/servers/search/elasticsearch/6.x.nix
+++ b/pkgs/servers/search/elasticsearch/6.x.nix
@@ -4,7 +4,7 @@
 , fetchurl
 , makeWrapper
 , jre_headless
-, utillinux, gnugrep, coreutils
+, util-linux, gnugrep, coreutils
 , autoPatchelfHook
 , zlib
 }:
@@ -35,7 +35,7 @@ stdenv.mkDerivation (rec {
       "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
   '';
 
-  buildInputs = [ makeWrapper jre_headless utillinux ]
+  buildInputs = [ makeWrapper jre_headless util-linux ]
              ++ optional enableUnfree zlib;
 
   installPhase = ''
@@ -45,7 +45,7 @@ stdenv.mkDerivation (rec {
     chmod -x $out/bin/*.*
 
     wrapProgram $out/bin/elasticsearch \
-      --prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \
+      --prefix PATH : "${makeBinPath [ util-linux gnugrep coreutils ]}" \
       --set JAVA_HOME "${jre_headless}"
 
     wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix
index 73a947066bfa..c3d50f8fbddd 100644
--- a/pkgs/servers/search/elasticsearch/7.x.nix
+++ b/pkgs/servers/search/elasticsearch/7.x.nix
@@ -4,7 +4,7 @@
 , fetchurl
 , makeWrapper
 , jre_headless
-, utillinux, gnugrep, coreutils
+, util-linux, gnugrep, coreutils
 , autoPatchelfHook
 , zlib
 }:
@@ -46,7 +46,7 @@ stdenv.mkDerivation (rec {
       "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
   '';
 
-  buildInputs = [ makeWrapper jre_headless utillinux ]
+  buildInputs = [ makeWrapper jre_headless util-linux ]
              ++ optional enableUnfree zlib;
 
   installPhase = ''
@@ -56,7 +56,7 @@ stdenv.mkDerivation (rec {
     chmod +x $out/bin/*
 
     wrapProgram $out/bin/elasticsearch \
-      --prefix PATH : "${makeBinPath [ utillinux coreutils gnugrep ]}" \
+      --prefix PATH : "${makeBinPath [ util-linux coreutils gnugrep ]}" \
       --set JAVA_HOME "${jre_headless}"
 
     wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
index 19c034aa78b3..208bb3c72c7f 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 2cf4d9465aec..f6a8f658039b 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, writeScriptBin, makeWrapper, lib, fetchurl, git, cacert, libpng, libjpeg, libwebp
-, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd
+, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, util-linux, procps, gd
 , flock
 , withMysql ? false
 , withPgsql ? false
@@ -21,7 +21,7 @@ let
     fi
   '';
 
-  ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
+  ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ];
 
 in stdenv.mkDerivation rec {
   version = "20.03";
diff --git a/pkgs/servers/zigbee2mqtt/node.nix b/pkgs/servers/zigbee2mqtt/node.nix
index 42b6358224cf..6080388b05e8 100644
--- a/pkgs/servers/zigbee2mqtt/node.nix
+++ b/pkgs/servers/zigbee2mqtt/node.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index 0bdaede49a5e..657bbc8d6648 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkgconfig
 , curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages
-, polkit, utillinuxMinimal, x264, zlib
+, polkit, util-linuxMinimal, x264, zlib
 , coreutils, procps, psmisc, nixosTests }:
 
 # NOTES:
@@ -148,7 +148,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mysql.client pcre perl polkit x264 zlib
-    utillinuxMinimal # for libmount
+    util-linuxMinimal # for libmount
   ] ++ (with perlPackages; [
     # build-time dependencies
     DateManip DBI DBDmysql LWP SysMmap
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index deeb4093c682..d06157fa77cc 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPackages
-, fetchurl, binutils ? null, bison, autoconf, utillinux
+, fetchurl, binutils ? null, bison, autoconf, util-linux
 
 # patch for cygwin requires readline support
 , interactive ? stdenv.isCygwin, readline70 ? null
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
     "SHOBJ_LIBS=-lbash"
   ];
 
-  checkInputs = [ utillinux ];
+  checkInputs = [ util-linux ];
   doCheck = false; # dependency cycle, needs to be interactive
 
   postInstall = ''
diff --git a/pkgs/shells/bash/5.0.nix b/pkgs/shells/bash/5.0.nix
index 09030493fb60..7120910d79e7 100644
--- a/pkgs/shells/bash/5.0.nix
+++ b/pkgs/shells/bash/5.0.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPackages
-, fetchurl, binutils ? null, bison, utillinux
+, fetchurl, binutils ? null, bison, util-linux
 
 # patch for cygwin requires readline support
 , interactive ? stdenv.isCygwin, readline80 ? null
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
     "SHOBJ_LIBS=-lbash"
   ];
 
-  checkInputs = [ utillinux ];
+  checkInputs = [ util-linux ];
   doCheck = false; # dependency cycle, needs to be interactive
 
   postInstall = ''
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 3faa7f996575..eabed40e8ebc 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchurl
 , coreutils
-, utillinux
+, util-linux
 , which
 , gnused
 , gnugrep
@@ -178,7 +178,7 @@ let
       EOF
 
     '' + optionalString stdenv.isLinux ''
-      sed -e "s| ul| ${utillinux}/bin/ul|" \
+      sed -e "s| ul| ${util-linux}/bin/ul|" \
           -i "$out/share/fish/functions/__fish_print_help.fish"
       for cur in $out/share/fish/functions/*.fish; do
         sed -e "s|/usr/bin/getent|${getent}/bin/getent|" \
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 7f46e017c367..3f1bf557ae8e 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText
 , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
-, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
+, wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which
 , ffmpeg, x264, libvpx, libwebp, x265
 , libfakeXinerama
 , gst_all_1, pulseaudio, gobject-introspection
@@ -97,7 +97,7 @@ in buildPythonApplication rec {
       --set XPRA_INSTALL_PREFIX "$out"
       --set XPRA_COMMAND "$out/bin/xpra"
       --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
-      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]}
+      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]}
     )
   '';
 
diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix
index 621e3f718e02..721accd93f03 100644
--- a/pkgs/tools/archivers/fsarchiver/default.nix
+++ b/pkgs/tools/archivers/fsarchiver/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
 , zlib, bzip2, lzma, lzo, lz4, zstd, xz
-, libgcrypt, e2fsprogs, utillinux, libgpgerror }:
+, libgcrypt, e2fsprogs, util-linux, libgpgerror }:
 
 let
   version = "0.8.5";
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
 
   buildInputs = [
     zlib bzip2 lzma lzo lz4 zstd xz
-    libgcrypt e2fsprogs utillinux libgpgerror
+    libgcrypt e2fsprogs util-linux libgpgerror
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index 0c528bcea1ec..6e450b11aa2b 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, asciidoctor, mbuffer, makeWrapper }:
+, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "btrbk";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
     # Fix SSH filter script
     sed -i '/^export PATH/d' ssh_filter_btrbk.sh
-    substituteInPlace ssh_filter_btrbk.sh --replace logger ${utillinux}/bin/logger
+    substituteInPlace ssh_filter_btrbk.sh --replace logger ${util-linux}/bin/logger
   '';
 
   preFixup = ''
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index c12cc1198c9c..1f62834e4d19 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -7,7 +7,7 @@
 , gnupg
 , gnutar
 , par2cmdline
-, utillinux
+, util-linux
 , rsync
 , backblaze-b2
 , makeWrapper
@@ -72,7 +72,7 @@ pythonPackages.buildPythonApplication rec {
     librsync # Add 'rdiff' to PATH.
     par2cmdline # Add 'par2' to PATH.
   ] ++ stdenv.lib.optionals stdenv.isLinux [
-    utillinux # Add 'setsid' to PATH.
+    util-linux # Add 'setsid' to PATH.
   ] ++ (with pythonPackages; [
     lockfile
     mock
diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix
index e3b4a0fb537e..9f00a7f2133a 100644
--- a/pkgs/tools/backup/ori/default.nix
+++ b/pkgs/tools/backup/ori/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, pkgconfig, scons, utillinux, fuse, libevent, openssl, zlib }:
+{ stdenv, fetchurl, boost, pkgconfig, scons, util-linux, fuse, libevent, openssl, zlib }:
 
 stdenv.mkDerivation {
   version = "0.8.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ 
-    boost pkgconfig scons utillinux fuse libevent openssl zlib
+    boost pkgconfig scons util-linux fuse libevent openssl zlib
   ];
 
   buildPhase = ''
diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix
index 16563c380998..25e72c1b880d 100644
--- a/pkgs/tools/bluetooth/blueberry/default.nix
+++ b/pkgs/tools/bluetooth/blueberry/default.nix
@@ -8,7 +8,7 @@
 , intltool
 , pavucontrol
 , python3Packages
-, utillinux
+, util-linux
 , wrapGAppsHook
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     cinnamon.xapps
     gnome3.gnome-bluetooth
     python3Packages.python
-    utillinux
+    util-linux
   ];
 
   pythonPath = with python3Packages; [
@@ -68,8 +68,8 @@ stdenv.mkDerivation rec {
       --replace /usr/lib/blueberry $out/lib/blueberry \
       --replace /usr/share $out/share
     substituteInPlace $out/lib/blueberry/rfkillMagic.py \
-      --replace /usr/bin/rfkill ${utillinux}/bin/rfkill \
-      --replace /usr/sbin/rfkill ${utillinux}/bin/rfkill \
+      --replace /usr/bin/rfkill ${util-linux}/bin/rfkill \
+      --replace /usr/sbin/rfkill ${util-linux}/bin/rfkill \
       --replace /usr/lib/blueberry $out/lib/blueberry
     substituteInPlace $out/share/applications/blueberry.desktop \
       --replace Exec=blueberry Exec=$out/bin/blueberry
diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix
index 9b232be8ce00..0acf55da7fe2 100644
--- a/pkgs/tools/cd-dvd/bashburn/default.nix
+++ b/pkgs/tools/cd-dvd/bashburn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, utillinux
+{ stdenv, fetchurl, util-linux
 , cdparanoia, cdrdao, dvdplusrwtools, flac, lame, mpg123, normalize
 , vorbis-tools, xorriso }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     name = "${pname}-${version}.tar.gz";
   };
 
-  nativeBuildInputs = [ utillinux ];
+  nativeBuildInputs = [ util-linux ];
 
   postPatch = ''
     for path in \
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       BB_OGGENC=${vorbis-tools}/bin/oggenc \
       BB_OGGDEC=${vorbis-tools}/bin/oggdec \
       BB_FLACCMD=${flac.bin}/bin/flac \
-      BB_EJECT=${utillinux}/bin/eject \
+      BB_EJECT=${util-linux}/bin/eject \
       BB_NORMCMD=${normalize}/bin/normalize \
     ; do
       echo $path
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index ae9e6724facc..b935bc02d150 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
+{ stdenv, fetchFromGitHub, makeWrapper, qt4, util-linux, coreutils, which, qmake4Hook
 , p7zip, mtools, syslinux }:
 
 stdenv.mkDerivation rec {
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace unetbootin.cpp \
       --replace /bin/df             ${coreutils}/bin/df \
-      --replace /sbin/blkid         ${utillinux}/sbin/blkid \
-      --replace /sbin/fdisk         ${utillinux}/sbin/fdisk \
-      --replace /sbin/sfdisk        ${utillinux}/sbin/sfdisk \
+      --replace /sbin/blkid         ${util-linux}/sbin/blkid \
+      --replace /sbin/fdisk         ${util-linux}/sbin/fdisk \
+      --replace /sbin/sfdisk        ${util-linux}/sbin/sfdisk \
       --replace /usr/bin/syslinux   ${syslinux}/bin/syslinux \
       --replace /usr/bin/extlinux   ${syslinux}/sbin/extlinux \
       --replace /usr/share/syslinux ${syslinux}/share/syslinux
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index 1953b793657e..07c7bf95607d 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, utillinux }:
+{ stdenv, fetchurl, zlib, util-linux }:
 
 let name = "pigz";
     version = "2.4";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux;
+  buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux util-linux;
 
   makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ];
 
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index c3b1759bcdd5..6e39ff174588 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, utillinux, bash }:
+{ stdenv, fetchurl, pkgconfig, util-linux, bash }:
 
 stdenv.mkDerivation rec {
   pname = "bcache-tools";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ utillinux ];
+  buildInputs = [ util-linux ];
 
   # * Remove broken install rules (they ignore $PREFIX) for stuff we don't need
   #   anyway (it's distro specific stuff).
diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index 82a9742c0717..bdca893a136c 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, utillinux }:
+{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }:
 
 let
 
@@ -15,7 +15,7 @@ let
 
     buildInputs = [
       btrfs-progs               # for btrfs/ioctl.h
-      utillinux                 # for uuid.h
+      util-linux                 # for uuid.h
     ];
 
     nativeBuildInputs = [
@@ -56,7 +56,8 @@ let
 in
 
 runCommand "bees-service" {
-  inherit bash bees coreutils utillinux;
+  inherit bash bees coreutils;
+  utillinux = util-linux; # needs to be a valid shell variable name
   btrfsProgs = btrfs-progs; # needs to be a valid shell variable name
 } ''
   mkdir -p -- "$out/bin"
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 7ada070aba68..07420bf22200 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -27,7 +27,7 @@
 , nss ? null, nspr ? null
 
 # Linux Only Dependencies
-, linuxHeaders, utillinux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
+, linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
 , libaio ? null, libxfs ? null, zfs ? null
 , ...
 }:
@@ -148,7 +148,7 @@ in rec {
       malloc zlib openldap lttng-ust babeltrace gperf gtest cunit
       snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka
     ] ++ optionals stdenv.isLinux [
-      linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs
+      linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs
       # ceph 14
       rdma-core rabbitmq-c
     ] ++ optionals hasRadosgw [
diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix
index 79551df00ee9..c8366a96f075 100644
--- a/pkgs/tools/filesystems/fatresize/default.nix
+++ b/pkgs/tools/filesystems/fatresize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, parted, utillinux, pkg-config }:
+{ stdenv, fetchFromGitHub, parted, util-linux, pkg-config }:
 
 stdenv.mkDerivation rec {
 
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "1vhz84kxfyl0q7mkqn68nvzzly0a4xgzv76m6db0bk7xyczv1qr2";
   };
 
-  buildInputs = [ parted utillinux ];
+  buildInputs = [ parted util-linux ];
   nativeBuildInputs = [ pkg-config ];
 
-  propagatedBuildInputs = [ parted utillinux ];
+  propagatedBuildInputs = [ parted util-linux ];
 
   meta = with stdenv.lib; {
     description = "The FAT16/FAT32 non-destructive resizer";
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index e7028ec12494..f495b56e3252 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
  autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
  liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
- openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
+ openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
  rsync, glibc, rpcsvc-proto, libtirpc
 }:
 let
@@ -24,7 +24,7 @@ let
   buildInputs = [
     fuse bison flex_2_5_35 openssl ncurses readline
     autoconf automake libtool pkgconfig zlib libaio libxml2
-    acl sqlite liburcu attr makeWrapper utillinux libtirpc
+    acl sqlite liburcu attr makeWrapper util-linux libtirpc
     (python3.withPackages (pkgs: [
       pkgs.flask
       pkgs.prettytable
@@ -56,7 +56,7 @@ let
     openssh # ssh
     rsync # rsync, e.g. for geo-replication
     systemd # systemctl
-    utillinux # mount umount
+    util-linux # mount umount
     which # which
     xfsprogs # xfs_info
   ];
@@ -76,9 +76,9 @@ stdenv.mkDerivation
     substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \
       --replace '/sbin/' '${lvm2}/bin/'
     substituteInPlace libglusterfs/src/glusterfs/compat.h \
-      --replace '/bin/umount' '${utillinux}/bin/umount'
+      --replace '/bin/umount' '${util-linux}/bin/umount'
     substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \
-      --replace '/bin/mount' '${utillinux}/bin/mount'
+      --replace '/bin/mount' '${util-linux}/bin/mount'
   '';
 
   # Note that the VERSION file is something that is present in release tarballs
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index 6ba29cb98d40..15d6686fbc33 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -1,7 +1,7 @@
 # FIXME: Unify with pkgs/development/python-modules/blivet/default.nix.
 
 { stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock
-, libselinux, cryptsetup, multipath_tools, lsof, utillinux
+, libselinux, cryptsetup, multipath_tools, lsof, util-linux
 , useNixUdev ? true, systemd ? null
 # useNixUdev is here for bw compatibility
 }:
@@ -24,11 +24,11 @@ buildPythonApplication rec {
     sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \
       blivet/devicelibs/mpath.py blivet/devices.py
     sed -i -e '/"wipefs"/ {
-      s|wipefs|${utillinux.bin}/sbin/wipefs|
+      s|wipefs|${util-linux.bin}/sbin/wipefs|
       s/-f/--force/
     }' blivet/formats/__init__.py
     sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
-    sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py
+    sed -i -r -e 's|"(u?mount)"|"${util-linux.bin}/bin/\1"|' blivet/util.py
     sed -i -e '/find_library/,/find_library/ {
       c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1"
     }' blivet/pyudev.py
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 1f672701d382..703d918f92a9 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -13,7 +13,7 @@ let
     inherit stdenv fetchurl buildPythonApplication;
     inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools;
     inherit useNixUdev;
-    inherit (pkgs) lsof utillinux systemd;
+    inherit (pkgs) lsof util-linux systemd;
   };
 
   cryptsetup = import ./cryptsetup.nix {
@@ -27,7 +27,7 @@ let
 
   lvm2 = import ./lvm2.nix {
     inherit stdenv fetchurl;
-    inherit (pkgs) fetchpatch pkgconfig utillinux systemd coreutils;
+    inherit (pkgs) fetchpatch pkgconfig util-linux systemd coreutils;
   };
 
   multipath_tools = import ./multipath-tools.nix {
@@ -37,7 +37,7 @@ let
 
   parted = import ./parted.nix {
     inherit stdenv fetchurl;
-    inherit (pkgs) fetchpatch utillinux readline libuuid gettext check lvm2;
+    inherit (pkgs) fetchpatch util-linux readline libuuid gettext check lvm2;
   };
 
   pyblock = import ./pyblock.nix {
diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
index fc0005a14d45..4369d659034e 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, utillinux, coreutils }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }:
 
 let
   v = "2.02.106";
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
   postInstall =
     ''
       substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \
-        --replace $out/sbin/blkid ${utillinux.bin}/sbin/blkid
+        --replace $out/sbin/blkid ${util-linux.bin}/sbin/blkid
 
       # Systemd stuff
       mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators
diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix
index 16f3a57ea147..7fe1b7454668 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline
-, utillinux, check, enableStatic ? false }:
+, util-linux, check, enableStatic ? false }:
 
 stdenv.mkDerivation rec {
   name = "parted-3.1";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional enableStatic "--enable-static";
 
   doCheck = true;
-  checkInputs = [ check utillinux ];
+  checkInputs = [ check util-linux ];
 
   meta = {
     description = "Create, destroy, resize, check, and copy partitions";
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index abe171170d41..2065e31e97a0 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, utillinux, libuuid
+{stdenv, fetchurl, util-linux, libuuid
 , crypto ? false, libgcrypt, gnutls, pkgconfig}:
 
 stdenv.mkDerivation rec {
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
     substituteInPlace src/Makefile.in --replace /sbin '@sbindir@'
     substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@'
     substituteInPlace libfuse-lite/mount_util.c \
-      --replace /bin/mount ${utillinux}/bin/mount \
-      --replace /bin/umount ${utillinux}/bin/umount
+      --replace /bin/mount ${util-linux}/bin/mount \
+      --replace /bin/umount ${util-linux}/bin/umount
   '';
 
   configureFlags = [
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index 8f365d023d2c..815129f7f0f7 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -1,6 +1,6 @@
 { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore
 , kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase
-, qtquickcontrols, qtsvg, qttools, qtwebengine, utillinux, glibc, tzdata
+, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, glibc, tzdata
 , ckbcomp, xkeyboard_config, mkDerivation
 }:
 
@@ -17,7 +17,7 @@ mkDerivation rec {
   buildInputs = [
     boost cmake extra-cmake-modules kparts.dev kpmcore.out kservice.dev
     libatasmart libxcb libyamlcpp parted polkit-qt python qtbase
-    qtquickcontrols qtsvg qttools qtwebengine.dev utillinux
+    qtquickcontrols qtsvg qttools qtwebengine.dev util-linux
   ];
 
   enableParallelBuilding = false;
diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index bd6d59c8a0ce..1bd3def87c41 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper
-, gawk, gnused, utillinux, file
+, gawk, gnused, util-linux, file
 , wget, python3, qemu-utils, euca2ools
 , e2fsprogs, cdrkit
 , gptfdisk }:
@@ -7,7 +7,7 @@
 let
   # according to https://packages.debian.org/sid/cloud-image-utils + https://packages.debian.org/sid/admin/cloud-guest-utils
   guestDeps = [
-    e2fsprogs gptfdisk gawk gnused utillinux
+    e2fsprogs gptfdisk gawk gnused util-linux
   ];
   binDeps = guestDeps ++ [
     wget file qemu-utils cdrkit
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 2940ff0a5738..4d4afb0b995f 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, gawk, perl, wget, coreutils, utillinux
+{ stdenv, fetchurl, dpkg, gawk, perl, wget, coreutils, util-linux
 , gnugrep, gnutar, gnused, gzip, makeWrapper }:
 # USAGE like this: debootstrap sid /tmp/target-chroot-directory
 # There is also cdebootstrap now. Is that easier to maintain?
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
     substituteInPlace debootstrap \
       --replace 'CHROOT_CMD="chroot '  'CHROOT_CMD="${coreutils}/bin/chroot ' \
-      --replace 'CHROOT_CMD="unshare ' 'CHROOT_CMD="${utillinux}/bin/unshare ' \
+      --replace 'CHROOT_CMD="unshare ' 'CHROOT_CMD="${util-linux}/bin/unshare ' \
       --replace /usr/bin/dpkg ${dpkg}/bin/dpkg \
       --replace '#!/bin/sh' '#!/bin/bash' \
       --subst-var-by VERSION ${version}
diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix
index fec78db979c0..6634d2d23ca2 100644
--- a/pkgs/tools/misc/etcher/default.nix
+++ b/pkgs/tools/misc/etcher/default.nix
@@ -3,7 +3,7 @@
 , gcc-unwrapped
 , dpkg
 , polkit
-, utillinux
+, util-linux
 , bash
 , nodePackages
 , makeWrapper
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     # use Nix(OS) paths
     sed -i "s|/usr/bin/pkexec|/usr/bin/pkexec', '/run/wrappers/bin/pkexec|" tmp/node_modules/sudo-prompt/index.js
     sed -i 's|/bin/bash|${bash}/bin/bash|' tmp/node_modules/sudo-prompt/index.js
-    sed -i "s|'lsblk'|'${utillinux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js
+    sed -i "s|'lsblk'|'${util-linux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js
     sed -i "s|process.resourcesPath|'$out/share/${pname}/resources/'|" tmp/generated/gui.js
     ${nodePackages.asar}/bin/asar pack tmp opt/balenaEtcher/resources/app.asar
     rm -rf tmp
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 6292fb4a7227..7d610416da47 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3
 , gnugrep, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2
-, gpart, hdparm, procps, utillinux, polkit, wrapGAppsHook, substituteAll
+, gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll
 }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     gappsWrapperArgs+=(
-       --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux procps coreutils gnused gnugrep ]}"
+       --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}"
     )
   '';
 
diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix
index c33aa074404f..dc29aad2a549 100644
--- a/pkgs/tools/misc/memtest86-efi/default.nix
+++ b/pkgs/tools/misc/memtest86-efi/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , lib
 , fetchzip
-, utillinux
+, util-linux
 , jq
 , mtools
 }:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    utillinux
+    util-linux
     jq
     mtools
   ];
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 56262d8171ee..28ac3a82f0aa 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -19,7 +19,7 @@
 , automake
 , libtool
 , fuse
-, utillinuxMinimal
+, util-linuxMinimal
 , libselinux
 , libsodium
 , libarchive
@@ -93,7 +93,7 @@ in stdenv.mkDerivation rec {
     libarchive
     bzip2
     xz
-    utillinuxMinimal # for libmount
+    util-linuxMinimal # for libmount
 
     # for installed tests
     testPython
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 808b0382f321..693e99c46452 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -9,7 +9,7 @@
 , e2fsprogs
 , perl
 , python2
-, utillinux
+, util-linux
 , check
 , enableStatic ? false
 }:
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   # Tests were previously failing due to Hydra running builds as uid 0.
   # That should hopefully be fixed now.
   doCheck = !stdenv.hostPlatform.isMusl; /* translation test */
-  checkInputs = [ check dosfstools e2fsprogs perl python2 utillinux ];
+  checkInputs = [ check dosfstools e2fsprogs perl python2 util-linux ];
 
   meta = {
     description = "Create, destroy, resize, check, and copy partitions";
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index 1b5f7dbdbece..1a779616ab83 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, fetchurl, lib
 , extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook
 , kconfig, kcrash, kinit, kpmcore
-, eject, libatasmart , utillinux, qtbase
+, eject, libatasmart , util-linux, qtbase
 }:
 
 let
@@ -20,7 +20,7 @@ in mkDerivation rec {
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook ];
 
   # refer to kpmcore for the use of eject
-  buildInputs = [ eject libatasmart utillinux ];
+  buildInputs = [ eject libatasmart util-linux ];
   propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index 5c4a3301d272..b4497c4d7c87 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, utillinux, coreutils}:
+{ stdenv, fetchurl, util-linux, coreutils}:
 
 stdenv.mkDerivation rec {
   version = "6.42";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     # $HOME detection fails (and is unnecessary)
     sed -i '/^HOME/d' $out/bin/profile-sync-daemon
     substituteInPlace $out/bin/psd-overlay-helper \
-      --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin:${coreutils}/bin" \
+      --replace "PATH=/usr/bin:/bin" "PATH=${util-linux.bin}/bin:${coreutils}/bin" \
       --replace "sudo " "/run/wrappers/bin/sudo "
   '';
 
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 936c78b695d1..36da8d0a463b 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -14,7 +14,7 @@
 , python3
 , scons
 , sphinx
-, utillinux
+, util-linux
 , wrapGAppsHook
 , withGui ? false }:
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x";
   };
 
-  CFLAGS="-I${stdenv.lib.getDev utillinux}/include";
+  CFLAGS="-I${stdenv.lib.getDev util-linux}/include";
 
   nativeBuildInputs = [
     pkgconfig
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     glib
     json-glib
     libelf
-    utillinux
+    util-linux
   ] ++ stdenv.lib.optionals withGui [
     cairo
     gobject-introspection
diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index 0ba72852c40f..abca71febb93 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -33,7 +33,7 @@
 , json_c
 , zchunk
 , libmodulemd
-, utillinux
+, util-linux
 , sqlite
 , cppunit
 }:
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
     json_c
     zchunk
     libmodulemd
-    utillinux # for smartcols.pc
+    util-linux # for smartcols.pc
     sqlite
     cppunit
   ];
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 576e1d780744..177580c099b6 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub
 , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45
 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
-, lvm2, pam, python, utillinux, fetchpatch, json_c, nixosTests }:
+, lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "snapper";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2
-    lvm2 pam python utillinux json_c
+    lvm2 pam python util-linux json_c
   ];
 
   passthru.tests.snapper = nixosTests.snapper;
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index a32e941ad849..b39f631f95bf 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -16,7 +16,7 @@
 , shellcheck
 , smartmontools
 , systemd
-, utillinux
+, util-linux
 , x86_energy_perf_policy
   # RDW only works with NetworkManager, and thus is optional with default off
 , enableRDW ? false
@@ -86,7 +86,7 @@
         perl
         smartmontools
         systemd
-        utillinux
+        util-linux
       ] ++ lib.optional enableRDW networkmanager
         ++ lib.optional (lib.any (lib.meta.platformMatch stdenv.hostPlatform) x86_energy_perf_policy.meta.platforms) x86_energy_perf_policy
     );
diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
index 4c235b4866f2..fddb98d8dc38 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper
-, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, utillinux, wget
+, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, util-linux, wget
 , wxGTK30 }:
 
 stdenv.mkDerivation rec {
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     # should be patched with a less useless default PATH, but for now
     # we add everything we need manually.
     wrapProgram "$out/bin/woeusb" \
-      --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget p7zip ]}'
+      --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted util-linux wget p7zip ]}'
   '';
 
   doInstallCheck = true;
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index 5f6d2bb1278d..3bc01048c1ed 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -1,7 +1,7 @@
 { stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs
 , fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool
 , libuuid, libxfs, lvm2, openssl, perl, procps, quota
-, time, utillinux, which, writeScript, xfsprogs, runtimeShell }:
+, time, util-linux, which, writeScript, xfsprogs, runtimeShell }:
 
 stdenv.mkDerivation {
   name = "xfstests-2019-09-08";
@@ -96,7 +96,7 @@ stdenv.mkDerivation {
 
     export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils
                                    libcap lvm2 perl procps killall quota
-                                   utillinux which xfsprogs]}:$PATH
+                                   util-linux which xfsprogs]}:$PATH
     exec ./check "$@"
   '';
 
diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index 04c1902f3a0b..02a2d67de53d 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, xorgserver, getopt
-, xauth, utillinux, which, fontsConf, gawk, coreutils }:
+, xauth, util-linux, which, fontsConf, gawk, coreutils }:
 let
   xvfb_run = fetchurl {
     name = "xvfb-run";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     patchShebangs $out/bin/xvfb-run
     wrapProgram $out/bin/xvfb-run \
       --set FONTCONFIG_FILE "${fontsConf}" \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]}
+      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index e306e49c8498..055fc5267c37 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix
index a79cbdc8bbd8..724d25d49f93 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/pkgs/tools/networking/bud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, python, gyp, utillinux }:
+{ stdenv, lib, fetchgit, python, gyp, util-linux }:
 
 stdenv.mkDerivation {
   pname = "bud";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     python gyp
-  ] ++ lib.optional stdenv.isLinux utillinux;
+  ] ++ lib.optional stdenv.isLinux util-linux;
 
   buildPhase = ''
     python ./gyp_bud -f make
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 438f107c27c4..28a418c27f28 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux, nixosTests }:
+{ stdenv, fetchFromGitHub, nodejs, which, python27, util-linux, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "cjdns";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ which python27 nodejs ] ++
     # for flock
-    stdenv.lib.optional stdenv.isLinux utillinux;
+    stdenv.lib.optional stdenv.isLinux util-linux;
 
   CFLAGS = "-O2 -Wno-error=stringop-truncation";
   buildPhase =
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 1df6260a09c7..04ac97003102 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -9,7 +9,7 @@
 , pam
 , useSystemd ? stdenv.isLinux
 , systemd ? null
-, utillinux ? null
+, util-linux ? null
 , pkcs11Support ? false
 , pkcs11helper ? null
 }:
@@ -63,7 +63,7 @@ let
         '' + optionalString useSystemd ''
           install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved
           wrapProgram $out/libexec/update-systemd-resolved \
-            --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd utillinux ]}
+            --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd util-linux ]}
         '';
 
         enableParallelBuilding = true;
diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
index d73b8e911b9d..f50d17eaf7de 100644
--- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
+++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeWrapper,  coreutils, gawk, utillinux }:
+{ stdenv, fetchgit, makeWrapper,  coreutils, gawk, util-linux }:
 
 stdenv.mkDerivation {
   name = "openvpn-learnaddress-19b03c3";
@@ -9,13 +9,13 @@ stdenv.mkDerivation {
     sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42";
   };
 
-  buildInputs = [ makeWrapper coreutils gawk utillinux ];
+  buildInputs = [ makeWrapper coreutils gawk util-linux ];
 
   installPhase = ''
     install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress
 
     wrapProgram $out/libexec/openvpn/openvpn-learnaddress \
-        --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk utillinux ]}
+        --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk util-linux ]}
   '';
 
   meta = {
diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
index 4d18372363b6..1a192ce6688a 100644
--- a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
+++ b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub
 , makeWrapper
-, iproute, systemd, coreutils, utillinux }:
+, iproute, systemd, coreutils, util-linux }:
 
 stdenv.mkDerivation rec {
   pname = "update-systemd-resolved";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     wrapProgram $out/libexec/openvpn/update-systemd-resolved \
-      --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils utillinux ]}
+      --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils util-linux ]}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/tools/networking/shorewall/default.nix
index 67f81b821053..c56f0eac7ff8 100644
--- a/pkgs/tools/networking/shorewall/default.nix
+++ b/pkgs/tools/networking/shorewall/default.nix
@@ -10,7 +10,7 @@
 , perlPackages
 , stdenv
 , tree
-, utillinux
+, util-linux
 }:
 let
   PATH = stdenv.lib.concatStringsSep ":"
@@ -19,7 +19,7 @@ let
              "${iptables}/bin"
              "${ipset}/bin"
              "${ebtables}/bin"
-             "${utillinux}/bin"
+             "${util-linux}/bin"
              "${gnugrep}/bin"
              "${gnused}/bin"
            ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     ipset
     iptables
     ebtables
-    utillinux
+    util-linux
     gnugrep
     gnused
     perl
diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix
index 478c1ed35f29..d9d8478e9856 100644
--- a/pkgs/tools/networking/tgt/default.nix
+++ b/pkgs/tools/networking/tgt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages
-, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, utillinux
+, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, util-linux
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index e306e49c8498..055fc5267c37 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index e4caa9c4e18d..1a8329885ba2 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python2, pam, enablePython ? false
+{ stdenv, fetchurl, pkgconfig, perl, util-linux, keyutils, nss, nspr, python2, pam, enablePython ? false
 , intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
 
 stdenv.mkDerivation rec {
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
     for file in $FILES; do
       substituteInPlace "$file" \
-        --replace /bin/mount ${utillinux}/bin/mount \
-        --replace /bin/umount ${utillinux}/bin/umount \
+        --replace /bin/mount ${util-linux}/bin/mount \
+        --replace /bin/umount ${util-linux}/bin/umount \
         --replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \
         --replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \
         --replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \
diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index b3c086488629..d46aac93e86b 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pass, rofi, coreutils, utillinux, xdotool, gnugrep
+{ stdenv, fetchFromGitHub, pass, rofi, coreutils, util-linux, xdotool, gnugrep
 , libnotify, pwgen, findutils, gawk, gnused, xclip, makeWrapper
 }:
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     (pass.withExtensions (ext: [ ext.pass-otp ]))
     pwgen
     rofi
-    utillinux
+    util-linux
     xclip
     xdotool
   ];
diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index 66b5afc9a9b7..e230b2ee4574 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, utillinux, getconf }:
+{ stdenv, fetchurl, openssl, util-linux, getconf }:
 
 stdenv.mkDerivation rec {
   pname = "scrypt";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   checkTarget = "test";
-  checkInputs = [ utillinux ];
+  checkInputs = [ util-linux ];
 
   meta = with stdenv.lib; {
     description = "Encryption utility";
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index f9ea99432bf0..2a101bba8865 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, utillinux }:
+{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, util-linux }:
 
 stdenv.mkDerivation rec {
   pname = "facter";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];
+  buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby util-linux ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
index 4257e2f2fd1b..e5747a09f9c5 100644
--- a/pkgs/tools/system/inxi/default.nix
+++ b/pkgs/tools/system/inxi/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper
 , ps, dnsutils # dig is recommended for multiple categories
 , withRecommends ? false # Install (almost) all recommended tools (see --recommends)
-, withRecommendedSystemPrograms ? withRecommends, utillinuxMinimal, dmidecode
+, withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode
 , file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools
 , binutils, tree, upower
 , withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg
@@ -11,7 +11,7 @@ let
   prefixPath = programs:
     "--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'";
   recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [
-    utillinuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod
+    util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod
     lm_sensors smartmontools binutils tree upower
   ];
   recommendedDisplayInformationPrograms = lib.optionals
diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix
index 92c13527c6fe..7d4ea120a8e6 100644
--- a/pkgs/tools/system/rofi-systemd/default.nix
+++ b/pkgs/tools/system/rofi-systemd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, utillinux, gawk, makeWrapper
+{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   wrapperPath = with stdenv.lib; makeBinPath [
     rofi
     coreutils
-    utillinux
+    util-linux
     gawk
     systemd
   ];
diff --git a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
index 08d37a1d53bc..d6dad6433e7a 100644
--- a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
+++ b/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper
 , apk-tools, coreutils, e2fsprogs, findutils, gnugrep, gnused, kmod, qemu-utils
-, utillinux
+, util-linux
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram $out/bin/alpine-make-vm-image --set PATH ${lib.makeBinPath [
       apk-tools coreutils e2fsprogs findutils gnugrep gnused kmod qemu-utils
-      utillinux
+      util-linux
     ]}
   '';
 
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 34f2bc9e1909..be62ace4797b 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -4,7 +4,7 @@
 , bash
 , bashInteractive
 , systemd
-, utillinux
+, util-linux
 , boto
 , setuptools
 , distro
@@ -31,14 +31,14 @@ buildPythonApplication rec {
       substituteInPlace "$file" \
         --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" \
         --replace /bin/bash "${bashInteractive}/bin/bash" \
-        --replace /sbin/hwclock "${utillinux}/bin/hwclock"
+        --replace /sbin/hwclock "${util-linux}/bin/hwclock"
       # SELinux tool ???  /sbin/restorecon
     done
 
     substituteInPlace google_config/udev/64-gce-disk-removal.rules \
       --replace /bin/sh "${bash}/bin/sh" \
-      --replace /bin/umount "${utillinux}/bin/umount" \
-      --replace /usr/bin/logger "${utillinux}/bin/logger"
+      --replace /bin/umount "${util-linux}/bin/umount" \
+      --replace /usr/bin/logger "${util-linux}/bin/logger"
   '';
 
   postInstall = ''
diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/tools/virtualization/nixos-container/default.nix
index 32a7c1e2c336..badd25b4e248 100644
--- a/pkgs/tools/virtualization/nixos-container/default.nix
+++ b/pkgs/tools/virtualization/nixos-container/default.nix
@@ -1,4 +1,4 @@
-{ substituteAll, perlPackages, shadow, utillinux }:
+{ substituteAll, perlPackages, shadow, util-linux }:
 
 substituteAll {
     name = "nixos-container";
@@ -7,7 +7,7 @@ substituteAll {
     src = ./nixos-container.pl;
     perl = "${perlPackages.perl}/bin/perl -I${perlPackages.FileSlurp}/${perlPackages.perl.libPrefix}";
     su = "${shadow.su}/bin/su";
-    inherit utillinux;
+    utillinux = util-linux;
 
     postInstall = ''
       t=$out/share/bash-completion/completions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 078d4bc2eca4..9187b127c93d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -491,7 +491,7 @@ mapAliases ({
   retroshare06 = retroshare;
   gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
   qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
-  rfkill = throw "rfkill has been removed, as it's included in utillinux"; # added 2020-08-23
+  rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
   riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
   rkt = throw "rkt was archived by upstream"; # added 2020-05-16
   ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby";
@@ -642,6 +642,7 @@ mapAliases ({
   unicorn-emu = unicorn; # added 2020-10-29
   usb_modeswitch = usb-modeswitch; # added 2016-05-10
   usbguard-nox = usbguard; # added 2019-09-04
+  utillinux = util-linux; # added 2020-11-24
   uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries";
   v4l_utils = v4l-utils; # added 2019-08-07
   v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92e68417e479..c6fbfb05243a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2647,7 +2647,7 @@ in
   mstflint = callPackage ../tools/misc/mstflint { };
 
   mcelog = callPackage ../os-specific/linux/mcelog {
-    utillinux = utillinuxMinimal;
+    util-linux = util-linuxMinimal;
   };
 
   sqlint = callPackage ../development/tools/sqlint { };
@@ -3631,21 +3631,21 @@ in
   elk7Version = "7.5.1";
 
   elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
-    utillinux = utillinuxMinimal;
+    util-linux = util-linuxMinimal;
     jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
   elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix {
     enableUnfree = false;
-    utillinux = utillinuxMinimal;
+    util-linux = util-linuxMinimal;
     jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
   elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix {
-    utillinux = utillinuxMinimal;
+    util-linux = util-linuxMinimal;
     jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
   elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix {
     enableUnfree = false;
-    utillinux = utillinuxMinimal;
+    util-linux = util-linuxMinimal;
     jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
   elasticsearch = elasticsearch6;
@@ -13064,7 +13064,7 @@ in
 
   gnutls = callPackage ../development/libraries/gnutls/default.nix {
     inherit (darwin.apple_sdk.frameworks) Security;
-    utillinux = utillinuxMinimal; # break the cyclic dependency
+    util-linux = util-linuxMinimal; # break the cyclic dependency
   };
 
   gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
@@ -17875,7 +17875,7 @@ in
   libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
 
   libuuid = if stdenv.isLinux
-    then utillinuxMinimal
+    then util-linuxMinimal
     else null;
 
   light = callPackage ../os-specific/linux/light { };
@@ -17908,7 +17908,7 @@ in
   };
 
   fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse {
-    utillinux = utillinuxMinimal;
+    util-linux = util-linuxMinimal;
   });
   fuse = lowPrio fusePackages.fuse_2;
   fuse3 = fusePackages.fuse_3;
@@ -18960,7 +18960,7 @@ in
 
   systemd = callPackage ../os-specific/linux/systemd {
     # break some cyclic dependencies
-    utillinux = utillinuxMinimal;
+    util-linux = util-linuxMinimal;
     # provide a super minimal gnupg used for systemd-machined
     gnupg = callPackage ../tools/security/gnupg/22.nix {
       enableMinimal = true;
@@ -19080,7 +19080,7 @@ in
     stdenv = crossLibcStdenv;
   };
 
-  eudev = callPackage ../os-specific/linux/eudev { utillinux = utillinuxMinimal; };
+  eudev = callPackage ../os-specific/linux/eudev { util-linux = util-linuxMinimal; };
 
   libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { };
 
@@ -19104,17 +19104,17 @@ in
 
   usermount = callPackage ../os-specific/linux/usermount { };
 
-  utillinux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { }
-              else unixtools.utillinux;
+  util-linux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { }
+              else unixtools.util-linux;
 
-  utillinuxCurses = utillinux;
+  util-linuxCurses = util-linux;
 
-  utillinuxMinimal = if stdenv.isLinux then appendToName "minimal" (utillinux.override {
+  util-linuxMinimal = if stdenv.isLinux then appendToName "minimal" (util-linux.override {
     minimal = true;
     ncurses = null;
     perl = null;
     systemd = null;
-  }) else utillinux;
+  }) else util-linux;
 
   v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
 
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 41aa86a8c463..5e591ec7a857 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -160,8 +160,8 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
   udev = linux;
   unzip = all;
   usbutils = linux;
-  utillinux = linux;
-  utillinuxMinimal = linux;
+  util-linux = linux;
+  util-linuxMinimal = linux;
   w3m = all;
   webkitgtk = linux;
   wget = all;
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index cdad9de61f41..b4f708ad5651 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -55,15 +55,15 @@ let
       darwin = pkgs.darwin.network_cmds;
     };
     col = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
       darwin = pkgs.darwin.text_cmds;
     };
     column = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
       darwin = pkgs.netbsd.column;
     };
     eject = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
     };
     getconf = {
       linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc
@@ -76,19 +76,19 @@ let
       darwin = pkgs.netbsd.getent;
     };
     getopt = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
       darwin = pkgs.getopt;
     };
     fdisk = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
       darwin = pkgs.darwin.diskdev_cmds;
     };
     fsck = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
       darwin = pkgs.darwin.diskdev_cmds;
     };
     hexdump = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
       darwin = pkgs.darwin.shell_cmds;
     };
     hostname = {
@@ -108,14 +108,14 @@ let
       darwin = pkgs.netbsd.locale;
     };
     logger = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
     };
     more = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
       darwin = more_compat;
     };
     mount = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
       darwin = pkgs.darwin.diskdev_cmds;
     };
     netstat = {
@@ -139,7 +139,7 @@ let
       darwin = pkgs.darwin.network_cmds;
     };
     script = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
       darwin = pkgs.darwin.shell_cmds;
     };
     sysctl = {
@@ -151,15 +151,15 @@ let
       darwin = pkgs.darwin.top;
     };
     umount = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
       darwin = pkgs.darwin.diskdev_cmds;
     };
     whereis = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
       darwin = pkgs.darwin.shell_cmds;
     };
     wall = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
     };
     watch = {
       linux = pkgs.procps;
@@ -169,7 +169,7 @@ let
       darwin = pkgs.callPackage ../os-specific/linux/procps-ng {};
     };
     write = {
-      linux = pkgs.utillinux;
+      linux = pkgs.util-linux;
       darwin = pkgs.darwin.basic_cmds;
     };
     xxd = {
@@ -188,7 +188,7 @@ let
   # Provided for old usage of these commands.
   compat = with bins; lib.mapAttrs makeCompat {
     procps = [ ps sysctl top watch ];
-    utillinux = [ fsck fdisk getopt hexdump mount
+    util-linux = [ fsck fdisk getopt hexdump mount
                   script umount whereis write col column ];
     nettools = [ arp hostname ifconfig netstat route ];
   };

From 4725ad214aa30b6186309c9d7c0301d03815d3dd Mon Sep 17 00:00:00 2001
From: Sebastien Braun <sebastien@sebbraun.de>
Date: Sat, 14 Nov 2020 21:35:40 +0100
Subject: [PATCH 3521/3942] batik: 1.6 -> 1.13

---
 pkgs/applications/graphics/batik/builder.sh  |  2 +-
 pkgs/applications/graphics/batik/default.nix | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/graphics/batik/builder.sh b/pkgs/applications/graphics/batik/builder.sh
index c6cf64bf3700..be8e6985ea26 100755
--- a/pkgs/applications/graphics/batik/builder.sh
+++ b/pkgs/applications/graphics/batik/builder.sh
@@ -2,6 +2,6 @@ set -e
 
 source $stdenv/setup
 
-unzip $src
+tar xzvf $src
 mkdir $out
 mv batik-* $out/batik
diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix
index 3c78c8b6dbd2..594508dfb043 100644
--- a/pkgs/applications/graphics/batik/default.nix
+++ b/pkgs/applications/graphics/batik/default.nix
@@ -1,25 +1,19 @@
 {stdenv, fetchurl, unzip}:
 
-stdenv.mkDerivation {
-  name = "batik-1.6";
+stdenv.mkDerivation rec {
+  pname = "batik";
+  version = "1.13";
+
   builder = ./builder.sh;
   src = fetchurl {
-    url = "http://tarballs.nixos.org/batik-1.6.zip";
-    sha256 = "0cf15dspmzcnfda8w5lbsdx28m4v2rpq1dv5zx0r0n99ihqd1sh6";
+    url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz";
+    sha256 = "16sq90nbs6psgm3xz30sbs6r5dnpd3qzsvr1xvnp4yipwjcmhmkw";
   };
 
-  buildInputs = [unzip];
-
   meta = with stdenv.lib; {
     description = "Java based toolkit for handling SVG";
     homepage = "https://xmlgraphics.apache.org/batik";
     license = licenses.asl20;
     platforms = platforms.unix;
-    knownVulnerabilities = [
-      # vulnerabilities as of 16th October 2018 from https://xmlgraphics.apache.org/security.html:
-      "CVE-2018-8013"
-      "CVE-2017-5662"
-      "CVE-2015-0250"
-    ];
   };
 }

From 26fa0edfd993df62b1beca1fce54ec402d4a13dc Mon Sep 17 00:00:00 2001
From: Sebastien Braun <sebastien@sebbraun.de>
Date: Tue, 24 Nov 2020 18:50:08 +0100
Subject: [PATCH 3522/3942] batik: replace builder script by installPhase

---
 pkgs/applications/graphics/batik/builder.sh  | 7 -------
 pkgs/applications/graphics/batik/default.nix | 8 ++++++--
 2 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100755 pkgs/applications/graphics/batik/builder.sh

diff --git a/pkgs/applications/graphics/batik/builder.sh b/pkgs/applications/graphics/batik/builder.sh
deleted file mode 100755
index be8e6985ea26..000000000000
--- a/pkgs/applications/graphics/batik/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-set -e
-
-source $stdenv/setup
-
-tar xzvf $src
-mkdir $out
-mv batik-* $out/batik
diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix
index 594508dfb043..52a2589b409c 100644
--- a/pkgs/applications/graphics/batik/default.nix
+++ b/pkgs/applications/graphics/batik/default.nix
@@ -1,10 +1,9 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   pname = "batik";
   version = "1.13";
 
-  builder = ./builder.sh;
   src = fetchurl {
     url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz";
     sha256 = "16sq90nbs6psgm3xz30sbs6r5dnpd3qzsvr1xvnp4yipwjcmhmkw";
@@ -16,4 +15,9 @@ stdenv.mkDerivation rec {
     license = licenses.asl20;
     platforms = platforms.unix;
   };
+
+  installPhase = ''
+    mkdir $out
+    cp -r * $out/
+  '';
 }

From a0f0927013eff2ac41b7a306978e1421c7d5721d Mon Sep 17 00:00:00 2001
From: Vincent Cui <wenvincent.cui@gmail.com>
Date: Tue, 24 Nov 2020 12:38:25 +0100
Subject: [PATCH 3523/3942] vscode: fix opening files with pcmanfm

---
 pkgs/applications/editors/vscode/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index d0933905bcd1..eea34cacfc04 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -24,7 +24,7 @@ in
       desktopName = longName;
       comment = "Code Editing. Redefined.";
       genericName = "Text Editor";
-      exec = "${executableName} %U";
+      exec = "${executableName} %F";
       icon = "code";
       startupNotify = "true";
       categories = "Utility;TextEditor;Development;IDE;";

From 3ebd278b2eb63c916d8569df0cd604faa34a0ee3 Mon Sep 17 00:00:00 2001
From: Merkhad Luigton <fusekai@outlook.com>
Date: Mon, 23 Nov 2020 13:36:22 -0300
Subject: [PATCH 3524/3942] ghc8102: bootstrap with ghc8102BinaryMinimal on
 aarch32

ghc refuses to evaluate on armhf even tho ghc does provide binaries for the arch
---
 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 e613b931d631..2d25ea149a92 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -96,7 +96,7 @@ in {
     };
     ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix {
       # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
-      bootPkgs = if stdenv.isAarch64 then
+      bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then
           packages.ghc8102BinaryMinimal
         else
           packages.ghc865Binary;

From 297d1d6b83c92c4f6942c6479f176d8004a819dd Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Mon, 14 Sep 2020 13:42:17 +0200
Subject: [PATCH 3525/3942] inkscape: add inkcut extension

---
 .../graphics/inkscape/extensions.nix          |  6 ++
 ...e-clash-between-inkcut-and-extension.patch | 85 +++++++++++++++++++
 pkgs/applications/misc/inkcut/default.nix     | 15 ++++
 3 files changed, 106 insertions(+)
 create mode 100644 pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch

diff --git a/pkgs/applications/graphics/inkscape/extensions.nix b/pkgs/applications/graphics/inkscape/extensions.nix
index 66a758f9fe51..013d3bec3527 100644
--- a/pkgs/applications/graphics/inkscape/extensions.nix
+++ b/pkgs/applications/graphics/inkscape/extensions.nix
@@ -1,5 +1,7 @@
 { stdenv
 , fetchFromGitHub
+, runCommand
+, inkcut
 }:
 
 {
@@ -34,4 +36,8 @@
       platforms = platforms.all;
     };
   };
+  inkcut = (runCommand "inkcut-inkscape-plugin" {} ''
+    mkdir -p $out/share/inkscape/extensions
+    cp ${inkcut}/share/inkscape/extensions/* $out/share/inkscape/extensions
+  '');
 }
diff --git a/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch b/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch
new file mode 100644
index 000000000000..34e4e6f0e7fb
--- /dev/null
+++ b/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch
@@ -0,0 +1,85 @@
+From ddc1f9e63e7a769c71131b56f6a2a011c649635c Mon Sep 17 00:00:00 2001
+From: Arnout Engelen <arnout@bzzt.net>
+Date: Tue, 24 Nov 2020 15:34:40 +0100
+Subject: [PATCH] Avoid name clash between inkscape plugin and inkcut itself
+
+Ohterwise, with an unfortunate PYTONPATH, inkcut would no longer
+start since it'd try to invoke the inkcut.py from the extension
+instead of the main application
+---
+ plugins/inkscape/{inkcut.py => inkcut4inkscape.py} | 2 +-
+ plugins/inkscape/inkcut_cut.inx                    | 2 +-
+ plugins/inkscape/inkcut_cut.py                     | 2 +-
+ plugins/inkscape/inkcut_open.inx                   | 2 +-
+ plugins/inkscape/inkcut_open.py                    | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+ rename plugins/inkscape/{inkcut.py => inkcut4inkscape.py} (98%)
+
+diff --git a/plugins/inkscape/inkcut.py b/plugins/inkscape/inkcut4inkscape.py
+similarity index 98%
+rename from plugins/inkscape/inkcut.py
+rename to plugins/inkscape/inkcut4inkscape.py
+index 5b90475..7dc8d86 100644
+--- a/plugins/inkscape/inkcut.py
++++ b/plugins/inkscape/inkcut4inkscape.py
+@@ -2,7 +2,7 @@
+ # -*- coding: utf-8 -*-
+ """
+ Inkcut, Plot HPGL directly from Inkscape.
+-   inkcut.py
++   inkcut4inkscape.py
+ 
+    Copyright 2018 The Inkcut Team
+ 
+diff --git a/plugins/inkscape/inkcut_cut.inx b/plugins/inkscape/inkcut_cut.inx
+index 4b44ae5..3db8721 100644
+--- a/plugins/inkscape/inkcut_cut.inx
++++ b/plugins/inkscape/inkcut_cut.inx
+@@ -2,7 +2,7 @@
+   <_name>Cut selection...</_name>
+   <id>org.ekips.filter.inkcut.cut</id>
+   <dependency type="executable" location="extensions">inkcut_cut.py</dependency>
+-  <dependency type="executable" location="extensions">inkcut.py</dependency>
++  <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency>
+   <dependency type="executable" location="extensions">inkex.py</dependency>  
+   <effect>
+     <object-type>all</object-type>
+diff --git a/plugins/inkscape/inkcut_cut.py b/plugins/inkscape/inkcut_cut.py
+index acaf812..777629a 100644
+--- a/plugins/inkscape/inkcut_cut.py
++++ b/plugins/inkscape/inkcut_cut.py
+@@ -37,7 +37,7 @@
+ else:
+     inkex.localize()
+ import subprocess
+-from inkcut import contains_text, convert_objects_to_paths
++from inkcut4inkscape import contains_text, convert_objects_to_paths
+ 
+ 
+ 
+diff --git a/plugins/inkscape/inkcut_open.inx b/plugins/inkscape/inkcut_open.inx
+index 45ee585..2dcd38e 100644
+--- a/plugins/inkscape/inkcut_open.inx
++++ b/plugins/inkscape/inkcut_open.inx
+@@ -2,7 +2,7 @@
+   <_name>Open current document...</_name>
+   <id>org.ekips.filter.inkcut.open</id>
+   <dependency type="executable" location="extensions">inkcut_open.py</dependency>
+-  <dependency type="executable" location="extensions">inkcut.py</dependency>
++  <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency>
+   <dependency type="executable" location="extensions">inkex.py</dependency>  
+   <effect>
+     <object-type>all</object-type>
+diff --git a/plugins/inkscape/inkcut_open.py b/plugins/inkscape/inkcut_open.py
+index b4652eb..e4c2d62 100644
+--- a/plugins/inkscape/inkcut_open.py
++++ b/plugins/inkscape/inkcut_open.py
+@@ -38,7 +38,7 @@
+     inkex.localize()
+ import subprocess
+ 
+-from inkcut import convert_objects_to_paths
++from inkcut4inkscape import convert_objects_to_paths
+ 
+ DEBUG = False
+ try:
diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix
index cfb10cfbe2f0..481069feac07 100644
--- a/pkgs/applications/misc/inkcut/default.nix
+++ b/pkgs/applications/misc/inkcut/default.nix
@@ -17,6 +17,12 @@ buildPythonApplication rec {
     sha256 = "1zn5i69f3kimcwdd2qkqd3hd1hq76a6i5wxxfb91ih2hj04vdbmx";
   };
 
+  patches = [
+    # https://github.com/inkcut/inkcut/pull/292 but downloaded
+    # because of https://github.com/NixOS/nixpkgs/issues/32084
+    ./avoid-name-clash-between-inkcut-and-extension.patch
+  ];
+
   nativeBuildInputs = [ wrapQtAppsHook ];
 
   propagatedBuildInputs = [
@@ -49,6 +55,15 @@ buildPythonApplication rec {
   dontWrapQtApps = true;
   makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
 
+  postInstall = ''
+    mkdir -p $out/share/inkscape/extensions
+
+    cp plugins/inkscape/* $out/share/inkscape/extensions
+
+    sed -i "s|cmd = \['inkcut'\]|cmd = \['$out/bin/inkcut'\]|" $out/share/inkscape/extensions/inkcut_cut.py
+    sed -i "s|cmd = \['inkcut'\]|cmd = \['$out/bin/inkcut'\]|" $out/share/inkscape/extensions/inkcut_open.py
+  '';
+
   meta = with lib; {
     homepage = "https://www.codelv.com/projects/inkcut/";
     description = "Control 2D plotters, cutters, engravers, and CNC machines";

From db43258354c4f01adecf6a99dcd8f61e08ea55a2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 24 Nov 2020 19:34:39 +0100
Subject: [PATCH 3526/3942] signal-desktop: 1.38.1 -> 1.38.2

---
 .../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 f8a3c4b4bf02..84f090228627 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -25,7 +25,7 @@ let
       else "");
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "1.38.1"; # Please backport all updates to the stable channel.
+  version = "1.38.2"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "0d146l1s37qxawh1k7yrkv78kxxfzf0yzzzcn1q1v1ndrwrvwhjz";
+    sha256 = "1lq830760y4kmhqd29hhgnab6lryiipb01y0c5bbl886zk3z35n4";
   };
 
   nativeBuildInputs = [

From 4e721164a807f2dd5ca8b3cdb962f5396afba11d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 24 Nov 2020 19:44:52 +0100
Subject: [PATCH 3527/3942] wlsunset: init at 0.1.0 (#103606)

---
 pkgs/tools/wayland/wlsunset/default.nix | 29 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/wayland/wlsunset/default.nix

diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/tools/wayland/wlsunset/default.nix
new file mode 100644
index 000000000000..2993f990aad5
--- /dev/null
+++ b/pkgs/tools/wayland/wlsunset/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, meson, pkg-config, ninja, wayland
+, wayland-protocols
+}:
+
+stdenv.mkDerivation rec {
+  pname = "wlsunset";
+  version = "0.1.0";
+
+  src = fetchurl {
+    url = "https://git.sr.ht/~kennylevinsen/wlsunset/archive/${version}.tar.gz";
+    sha256 = "0g7mk14hlbwbhq6nqr84452sbgcja3hdxsqf0vws4njhfjgqiv3q";
+  };
+
+  nativeBuildInputs = [ meson pkg-config ninja wayland ];
+  buildInputs = [ wayland wayland-protocols ];
+
+  meta = with stdenv.lib; {
+    description = "Day/night gamma adjustments for Wayland";
+    longDescription = ''
+      Day/night gamma adjustments for Wayland compositors supporting
+      wlr-gamma-control-unstable-v1.
+    '';
+    homepage = "https://sr.ht/~kennylevinsen/wlsunset/";
+    changelog = "https://git.sr.ht/~kennylevinsen/wlsunset/refs/${version}";
+    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 d34f01ef4fee..37e93ba26084 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3579,6 +3579,8 @@ in
 
   wl-clipboard = callPackage ../tools/misc/wl-clipboard { };
 
+  wlsunset = callPackage ../tools/wayland/wlsunset { };
+
   wob = callPackage ../tools/misc/wob { };
 
   wtype = callPackage ../tools/wayland/wtype { };

From 4d5ab8d9f72140348859a3180d98d1983927c070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 24 Nov 2020 19:49:42 +0100
Subject: [PATCH 3528/3942] autofs: fix compilation fail due to libtirpc
 changes

---
 pkgs/os-specific/linux/autofs/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index baf3cc6ad55e..ab78c590017f 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
-, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
+, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:
 
 let
   version = "5.1.6";
@@ -28,13 +28,16 @@ in stdenv.mkDerivation {
     unset STRIP # Makefile.rules defines a usable STRIP only without the env var.
   '';
 
+  # configure script is not finding the right path
+  NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
+
   installPhase = ''
     make install SUBDIRS="lib daemon modules man" # all but samples
     #make install SUBDIRS="samples" # impure!
   '';
 
   buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd
-                  openssl cyrus_sasl ];
+                  openssl cyrus_sasl rpcsvc-proto ];
 
   nativeBuildInputs = [ flex bison ];
 

From 32df78017b048729ae336c4c9e81b53c939f0c82 Mon Sep 17 00:00:00 2001
From: Sebastian Mandrean <sebastian.mandrean@gmail.com>
Date: Tue, 24 Nov 2020 15:10:01 +0100
Subject: [PATCH 3529/3942] svtplay-dl: 2.7 -> 2.8

---
 pkgs/tools/misc/svtplay-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index a3e973be544c..b420e470fdda 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -8,13 +8,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "svtplay-dl";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "0gcw7hwbr9jniwvqix37vvd2fiplsz70qab9w45d21i8jrfnhxb5";
+    sha256 = "1977xyxi9jfj7qra1sz7c9lk885cadpci66jvbzvnwm6d60m05lb";
   };
 
   pythonPaths = [ pycrypto pyyaml requests ];

From 18fab62368acb6f28b11cb2f37bf77ada0aa60c4 Mon Sep 17 00:00:00 2001
From: Sebastian Mandrean <sebastian.mandrean@gmail.com>
Date: Tue, 24 Nov 2020 16:00:25 +0100
Subject: [PATCH 3530/3942] svtplay-dl: Enable on macOS as well

---
 pkgs/tools/misc/svtplay-dl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index b420e470fdda..4bcbfb386c81 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
     homepage = "https://github.com/spaam/svtplay-dl";
     description = "Command-line tool to download videos from svtplay.se and other sites";
     license = licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ maintainers.rycee ];
   };
 }

From 9a515a9d458926c928f00d0bb67fc06e9b2dafbb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 24 Nov 2020 20:01:07 +0100
Subject: [PATCH 3531/3942] svtplay-dl: add ffmpeg as dependency

---
 pkgs/tools/misc/svtplay-dl/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 4bcbfb386c81..d06bb8b134db 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip
-, gitMinimal }:
+, gitMinimal, ffmpeg }:
 
 let
 
@@ -33,6 +33,7 @@ in stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram "$out/bin/svtplay-dl" \
+      --prefix PATH : "${ffmpeg}" \
       --prefix PYTHONPATH : "$PYTHONPATH"
   '';
 

From 2044fa172d75946ec4aceaf2af3f4f3baf0b8280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 24 Nov 2020 20:09:04 +0100
Subject: [PATCH 3532/3942] sssd: fix nss collision with upstream patch

---
 pkgs/os-specific/linux/sssd/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 537764e0c734..05866f942692 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/SSSD/sssd/commit/bc56b10aea999284458dcc293b54cf65288e325d.patch";
       sha256 = "0q74sx5n41srq3kdn55l5j1sq4xrjsnl5y4v8yh5mwsijj74yh4g";
     })
+    # Fix collision with external nss symbol
+    (fetchpatch {
+      url = "https://github.com/SSSD/sssd/commit/fe9eeb51be06059721e873f77092b1e9ba08e6c1.patch";
+      sha256 = "0b83b2w0rnvm26pg03a4lpmkmi7n3gqxg7lk751q61q79gnzrpz4";
+    })
   ];
 
   # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h>
@@ -54,16 +59,6 @@ stdenv.mkDerivation rec {
     configureFlagsArray+=("--with-sudo")
   '';
 
-  preBuild = ''
-    # glibc-2.32 includes a full set of NSS stub module declarations
-    # that conflict with the ones in sssd source. Define _NSS_H to
-    # prevent them from breaking the compilation, but just for this
-    # one file.
-    cat >> Makefile <<EOF
-      src/responder/nss/nss_cmd.\$(OBJEXT) : DEFS = -DHAVE_CONFIG_H -D_NSS_H
-    EOF
-  '';
-
   enableParallelBuilding = true;
   buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss
                   samba nfs-utils doxygen python python3 popt

From b214b29001989c37b311cbea8beb115e27510616 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Nov 2020 19:49:15 +0000
Subject: [PATCH 3533/3942] eksctl: 0.31.0 -> 0.32.0

---
 pkgs/tools/admin/eksctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 6de26c81e623..b6834551cee6 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.31.0";
+  version = "0.32.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    sha256 = "08vdcbgi0s9rm8rh025yifacqma2c0dxf6jdfnacrz1gj2s7s4rd";
+    sha256 = "0np11c4apyl7lmh4kjyi62bcf1kjf2fjjlli8aadvlli2ww8qrf2";
   };
 
-  vendorSha256 = "1lhs1h0x3ryq0bd5w9ny7i2j9d0x2904br1vlxy677w2xsa9213p";
+  vendorSha256 = "19fk2lw7m8kqwwhv3sqr0iix90sjcnh2mqqvr5p87hfjars4c55v";
 
   doCheck = false;
 

From b660fbbbd9cf28d517b24ad329052ed598048e0c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Nov 2020 20:09:04 +0000
Subject: [PATCH 3534/3942] exodus: 20.11.10 -> 20.11.21

---
 pkgs/applications/blockchains/exodus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix
index 5630cb20d4de..f6cf2fa63981 100644
--- a/pkgs/applications/blockchains/exodus/default.nix
+++ b/pkgs/applications/blockchains/exodus/default.nix
@@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }:
 
 stdenv.mkDerivation rec {
   pname = "exodus";
-  version = "20.11.10";
+  version = "20.11.21";
 
   src = fetchurl {
     url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
-    sha256 = "1a7qrh5mdkqpz5cpk5jdq0s2cfrvn7ja76r5cmhs70ba1xnzd8rq";
+    sha256 = "1q6sh2jhngvihkxjprkcd1php6r7m6qkxsijx8d3azzlgj9nbf2n";
   };
 
   sourceRoot = ".";

From fa0fd01569b61a32e1ba65ef541d34f526c8a252 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 24 Nov 2020 21:05:17 +0000
Subject: [PATCH 3535/3942] bat: 0.17.0 -> 0.17.1

---
 pkgs/tools/misc/bat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index b5fea3cc3a91..da1f0d54f6f0 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bat";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "118pqws32j2hx13vjda5wz1kfjfnb4h76wlj90q768na8b522kn0";
+    sha256 = "1kbziqm00skj65gpjq6m83hmfk9g3xyx88gai1r80pzsx8g239w1";
   };
 
-  cargoSha256 = "1r1gxpb0qsbl4245sqw3gsi33pigsj16z4cxii3fmsnq0y77yd5r";
+  cargoSha256 = "1pdja5jhk036hpgv77xc3fcvra1sw0z5jc1ry53i0r7362lnwapz";
 
   nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
 

From 9144ebaf1e4bb906218894d9954a2ecf0bbf1073 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 24 Nov 2020 22:02:24 +0200
Subject: [PATCH 3536/3942] wineStable: revert cert-path patch for stable

---
 pkgs/misc/emulators/wine/base.nix             |  7 +++---
 .../emulators/wine/cert-path-stable.patch     | 24 +++++++++++++++++++
 pkgs/misc/emulators/wine/packages.nix         |  6 ++---
 pkgs/misc/emulators/wine/sources.nix          |  5 ++++
 4 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/misc/emulators/wine/cert-path-stable.patch

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index c4858c6c579d..0be36daac9f9 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -2,6 +2,7 @@
   name, version, src, mingwGccs, monos, geckos, platforms,
   pkgconfig, fontforge, makeWrapper, flex, bison,
   supportFlags,
+  patches,
   buildScript ? null, configureFlags ? []
 }:
 
@@ -9,6 +10,7 @@ with import ./util.nix { inherit lib; };
 
 let
   vkd3d = callPackage ./vkd3d.nix {};
+  patches' = patches;
 in
 stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
   builder = buildScript;
@@ -73,10 +75,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
   ])
   ++ [ pkgs.xorg.libX11 pkgs.perl ]));
 
-  patches = [
-    # Also look for root certificates at $NIX_SSL_CERT_FILE
-    ./cert-path.patch
-  ];
+  patches = [ ] ++ patches';
 
   # 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
diff --git a/pkgs/misc/emulators/wine/cert-path-stable.patch b/pkgs/misc/emulators/wine/cert-path-stable.patch
new file mode 100644
index 000000000000..da01a4778102
--- /dev/null
+++ b/pkgs/misc/emulators/wine/cert-path-stable.patch
@@ -0,0 +1,24 @@
+diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c
+index f795181..fb4926a 100644
+--- a/dlls/crypt32/rootstore.c
++++ b/dlls/crypt32/rootstore.c
+@@ -18,6 +18,7 @@
+ #include "config.h"
+ #include <stdarg.h>
+ #include <stdio.h>
++#include <stdlib.h> /* getenv */
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store)
+ 
+         for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++)
+             ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE);
++
++        char *nix_cert_file = getenv("NIX_SSL_CERT_FILE");
++        if (nix_cert_file != NULL)
++            ret = import_certs_from_path(nix_cert_file, from, TRUE);
++
+         check_and_store_certs(from, store);
+     }
+     CertCloseStore(from, 0);
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index 31d21058e3aa..c4fec3360e1f 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -7,7 +7,7 @@ let src = lib.getAttr wineRelease (callPackage ./sources.nix {});
 in with src; {
   wine32 = pkgsi686Linux.callPackage ./base.nix {
     name = "wine-${version}";
-    inherit src version supportFlags;
+    inherit src version supportFlags patches;
     pkgArches = [ pkgsi686Linux ];
     geckos = [ gecko32 ];
     mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
@@ -16,7 +16,7 @@ in with src; {
   };
   wine64 = callPackage ./base.nix {
     name = "wine64-${version}";
-    inherit src version supportFlags;
+    inherit src version supportFlags patches;
     pkgArches = [ pkgs ];
     mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
     geckos = [ gecko64 ];
@@ -26,7 +26,7 @@ in with src; {
   };
   wineWow = callPackage ./base.nix {
     name = "wine-wow-${version}";
-    inherit src version supportFlags;
+    inherit src version supportFlags patches;
     stdenv = stdenv_32bit;
     pkgArches = [ pkgs pkgsi686Linux ];
     geckos = [ gecko32 gecko64 ];
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 081594e62147..5abfab2691df 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -35,6 +35,11 @@ in rec {
       url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
       sha256 = "09wjrfxbw0072iv6d2vqnkc3y7dzj15vp8mv4ay44n1qp5ji4m3l";
     };
+
+    patches = [
+      # Also look for root certificates at $NIX_SSL_CERT_FILE
+      ./cert-path-stable.patch
+    ];
   };
 
   unstable = fetchurl rec {

From 626f931022580d5afea8281f12a31d375fefb631 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 24 Nov 2020 22:02:46 +0200
Subject: [PATCH 3537/3942] wineUnstable: use own set of patches

Contain important hotfixes from wine's master and staging master.
---
 pkgs/misc/emulators/wine/sources.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 5abfab2691df..4b16e78cd736 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -48,15 +48,28 @@ in rec {
     url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
     sha256 = "sha256-Cb0GyHyMl05q00UHzsh11yF+tW/Anfg41UU+DrvOTSE=";
     inherit (stable) mono gecko32 gecko64;
+
+    patches = [
+      # Also look for root certificates at $NIX_SSL_CERT_FILE
+      ./cert-path.patch
+
+      # Hotfix picked from master for https://bugs.winehq.org/show_bug.cgi?id=50163
+      (pkgs.fetchpatch {
+        url = "https://bugs.winehq.org/attachment.cgi?id=68680";
+        sha256 = "sha256-GTPQhRWeu6DPadqgFiuVUjI6MzJPaTN4l//8DSG6hpo=";
+      })
+     ];
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "sha256-witIBZB8LRNSGTbBB7Rkm9QGvkH4EMuLc6gUpcqVVGo=";
+    sha256 = "sha256-HzAKLPlybO1lrkHo4Q1Y9H0vmjiqo9HiT05TcX08Ubk=";
     owner = "wine-staging";
     repo = "wine-staging";
-    rev = "v${version}";
+    #rev = "v${version}"; # revert back to this statement on next release
+    # Include hotfix for https://bugs.winehq.org/show_bug.cgi?id=50162
+    rev = "f257f37b92041fc718de04aa83ec3139b748ffa2";
 
     # Just keep list empty, if current release haven't broken patchsets
     disabledPatchsets = [ ];

From 285f69eb8014d43d787a8a784445cba7a7caeb77 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 10 Nov 2020 12:59:36 +0100
Subject: [PATCH 3538/3942] pythonPackages.gradient_statsd: Disable tests

---
 pkgs/development/python-modules/gradient_statsd/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix
index 0521b4a57d6f..14623ff625f5 100644
--- a/pkgs/development/python-modules/gradient_statsd/default.nix
+++ b/pkgs/development/python-modules/gradient_statsd/default.nix
@@ -16,6 +16,9 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "gradient_statsd" ];
 
+  # Pypi does not contain tests
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "Wrapper around the DogStatsd client";
     homepage    = "https://paperspace.com";

From 6794b7eed69c3309643efa9a09af896a1e9f9a04 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 25 Nov 2020 07:29:02 +1000
Subject: [PATCH 3539/3942] nix-update: 0.1 -> 0.2

https://github.com/Mic92/nix-update/releases/tag/0.2
---
 pkgs/tools/package-management/nix-update/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix
index bd4ff86c9949..54492d173e82 100644
--- a/pkgs/tools/package-management/nix-update/default.nix
+++ b/pkgs/tools/package-management/nix-update/default.nix
@@ -1,27 +1,27 @@
 { lib
 , buildPythonApplication
 , fetchFromGitHub
-, nix
+, nixFlakes
 , nix-prefetch
 }:
 
 buildPythonApplication rec {
   pname = "nix-update";
-  version = "0.1";
+  version = "0.2";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = pname;
     rev = version;
-    sha256 = "0mw31n7kqfr7fskkxp58b0wprxj1pj6n1zs6ymvvl548gs5rgn2s";
+    sha256 = "12fsxy2rv2dgk8l10ymp10j01jkcbn9w0fv5iyb5db85q4xsrsm5";
   };
 
   makeWrapperArgs = [
-    "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch ])
+    "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch ])
   ];
 
   checkPhase = ''
-    $out/bin/nix-update --help
+    $out/bin/nix-update --help >/dev/null
   '';
 
   meta = with lib; {

From 3873438b8f9379496dcf7600c0839f9a356d4b06 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Nov 2020 12:11:14 +0000
Subject: [PATCH 3540/3942] python3Packages.mss: 6.0.0 -> 6.1.0

---
 pkgs/development/python-modules/mss/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix
index 1604a006567e..a0d74719e794 100644
--- a/pkgs/development/python-modules/mss/default.nix
+++ b/pkgs/development/python-modules/mss/default.nix
@@ -2,16 +2,14 @@
 
 buildPythonPackage rec {
   pname = "mss";
-  version = "6.0.0";
+  version = "6.1.0";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dicp55adbqxb7hqlck95hngb1klv5s26lszw3xim30k18bwqaxl";
+    sha256 = "aebd069f3e05667fe9c7b9fa4b1771fe42a4710ce1058ce0236936ce06fa5394";
   };
 
-  propagatedBuildInputs = [ ];
-
   # By default it attempts to build Windows-only functionality
   prePatch = ''
     rm mss/windows.py
@@ -22,7 +20,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Cross-platform multiple screenshots module in pure Python";
-    homepage = "https://github.com/BoboTiG/mss/";
+    homepage = "https://github.com/BoboTiG/python-mss";
     license = licenses.mit;
     maintainers = with maintainers; [ austinbutler ];
   };

From 8d4af2e08c3d161fa482fe8e14af721e79ae7a09 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 25 Nov 2020 07:26:23 +1000
Subject: [PATCH 3541/3942] gitAndTools.gh: 1.2.1 -> 1.3.0

https://github.com/cli/cli/releases/tag/v1.3.0
---
 .../version-management/git-and-tools/gh/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 767e471f8a36..d6b976a29f45 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "1lk3lhw598v966c553a3j0bp6vhf03xg7ggv827vzs1s8gnhxshz";
+    sha256 = "1d15nrba53yk75n610wnyziq9x5v515i8pqi97iyrsz2gm2lbi3p";
   };
 
-  vendorSha256 = "0bkd2ndda6w8pdpvw8hhlb60g8r6gbyymgfb69dvanw5i5shsp5q";
+  vendorSha256 = "009dv2brr4h71z78cxikgm0az3hxh28mwm94kn2sgx3pd4r5gir5";
 
   nativeBuildInputs = [ installShellFiles ];
 

From ae61f8ac4ddbe73c0f80d1eca7e716c6d3f8197f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Nov 2020 20:32:58 +0000
Subject: [PATCH 3542/3942] gnome3.eog: 3.38.0 -> 3.38.1

---
 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 1e965b80528d..fb1b5f50c0e7 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -28,11 +28,11 @@
 
 stdenv.mkDerivation rec {
   pname = "eog";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0qyrs9cp4hsh64jfdpdi2v1hag8izw77qqnsvqwdb33871ya98z1";
+    sha256 = "1xqcfil3b68clafnxg1migp54psqh5x6arnlvdqgmvvpq9hwj7dp";
   };
 
   nativeBuildInputs = [

From d93434458bc85a6ceed303f6b0c58fb3f99d6e29 Mon Sep 17 00:00:00 2001
From: Stijn DW <stekke@airmail.cc>
Date: Sat, 14 Nov 2020 17:21:56 +0100
Subject: [PATCH 3543/3942] nixos/factorio: add openFirewall option

---
 nixos/modules/services/games/factorio.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index 4b2e1a3c07f0..7962a4c3baf9 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -49,8 +49,13 @@ in
         default = 34197;
         description = ''
           The port to which the service should bind.
-
-          This option will also open up the UDP port in the firewall configuration.
+        '';
+      };
+      openFirewall = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to automatically open the specified UDP port in the firewall.
         '';
       };
       saveName = mkOption {
@@ -237,6 +242,6 @@ in
       };
     };
 
-    networking.firewall.allowedUDPPorts = [ cfg.port ];
+    networking.firewall.allowedUDPPorts = if cfg.openFirewall then [ cfg.port ] else [];
   };
 }

From 3d3bcc5cc92541e3a63441a3d39f1176ef92c03b Mon Sep 17 00:00:00 2001
From: Stijn DW <stekke@airmail.cc>
Date: Tue, 24 Nov 2020 21:17:34 +0100
Subject: [PATCH 3544/3942] nixos/factorio: Don't open firewall ports by
 default

---
 nixos/modules/services/games/factorio.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index 7962a4c3baf9..73099ae33634 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -53,7 +53,7 @@ in
       };
       openFirewall = mkOption {
         type = types.bool;
-        default = true;
+        default = false;
         description = ''
           Whether to automatically open the specified UDP port in the firewall.
         '';

From edd823b713c688151b421709130e900813261559 Mon Sep 17 00:00:00 2001
From: va1entin <valh@mailbox.org>
Date: Tue, 24 Nov 2020 22:10:39 +0100
Subject: [PATCH 3545/3942] devede: move to GitLab, 4.8.8 -> 4.16.0

devede: 4.8.8 -> 4.16.0

use pname and version
---
 pkgs/applications/video/devede/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 9bb5518e80f7..921548b5c08c 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor
+{ stdenv, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor
 , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }:
 
 let
   inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3 setuptools;
-
-in buildPythonApplication {
-  name = "devede-4.8.8";
+in buildPythonApplication rec {
+  pname = "devede";
+  version = "4.16.0";
   namePrefix = "";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitLab {
     owner = "rastersoft";
     repo = "devedeng";
-    rev = "c518683fbcd793aa92249e4fecafc3c3fea7da68";
-    sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q";
+    rev = version;
+    sha256 = "1xb7acjphvn4ya8fgjsvag5gzi9a6c2famfl0ffr8nhb9y8ig9mg";
   };
 
   # Temporary fix

From c96656d306a11f70aac5089b967b295801cfa588 Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Sat, 31 Oct 2020 19:43:19 +0000
Subject: [PATCH 3546/3942] julius: 1.4.1 -> 1.5.1

Mark as broken on darwin
---
 pkgs/games/julius/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix
index d1dad86e1c54..435db5772ba0 100644
--- a/pkgs/games/julius/default.nix
+++ b/pkgs/games/julius/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "julius";
-  version = "1.4.1";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "bvschaik";
     repo = "julius";
     rev = "v${version}";
-    sha256 = "12hhnhdwgz7hd3hlndbnk15pxggm1375qs0764ija4nl1gbpb110";
+    sha256 = "10d6py1cmkq8lnb5h3w8rdpp4fmpd1wgqkgiabdghqxi7b2s0g4b";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/bvschaik/julius";
     license = licenses.agpl3;
     platforms = platforms.all;
+    broken = stdenv.isDarwin;
     maintainers = with maintainers; [ Thra11 ];
   };
 }

From 19036e0ca0605d855066a10b650815b45cd76155 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Tue, 24 Nov 2020 23:32:03 +0100
Subject: [PATCH 3547/3942] opensc: 0.20.0 -> 0.21.0

---
 pkgs/tools/security/opensc/default.nix | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index a9eea81c4e83..735f7558e7a8 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl
-, libiconv, pcsclite, libassuan, libXt, fetchpatch
+, libiconv, pcsclite, libassuan, libXt
 , docbook_xsl, libxslt, docbook_xml_dtd_412
 , Carbon, PCSC, buildPackages
 , withApplePCSC ? stdenv.isDarwin
@@ -7,30 +7,15 @@
 
 stdenv.mkDerivation rec {
   pname = "opensc";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "OpenSC";
     rev = version;
-    sha256 = "0mg8qmhww3li1isfgvn5hang1hq58zra057ilvgci88csfziv5lv";
+    sha256 = "sha256-OjOfA1pIu8NeN+hPuow5UVMKsg0PrsLojw5h05/Qm+o=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://nvd.nist.gov/vuln/detail/CVE-2020-26570
-      name = "CVE-2020-26570.patch";
-      url = "https://github.com/OpenSC/OpenSC/commit/6903aebfddc466d966c7b865fae34572bf3ed23e.patch";
-      sha256 = "sha256-aB9iCVcdp9zFhZiSv5A399Ttj7NUHRVgXr0EfmMwKN4=";
-    })
-    (fetchpatch {
-      # https://nvd.nist.gov/vuln/detail/CVE-2020-26572
-      name = "CVE-2020-26572.patch";
-      url = "https://github.com/OpenSC/OpenSC/commit/9d294de90d1cc66956389856e60b6944b27b4817.patch";
-      sha256 = "sha256-gKJaR5K+NaXh4NeTkGpzHzHCdpt6n54Hnt1GAq0tA9o=";
-    })
-  ];
-
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [
     zlib readline openssl libassuan

From a52c4f0f712bdc6f0d09cdbbd0b09f740229b498 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Nov 2020 22:14:44 +0000
Subject: [PATCH 3548/3942] gnome3.devhelp: 3.38.0 -> 3.38.1

---
 pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 52d0cefdc872..7de22f693d6c 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "devhelp";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0s938p1snkskn8np5xh5fzp3zrjrnsh99haiz92nvci264bzp3li";
+    sha256 = "13sa25mmlc49kn520hdfbskma65y7smvwmyhfggj0n9s3fazba2d";
   };
 
   nativeBuildInputs = [

From 50f6a123e5ae998bca3c56081dbee1adb091012d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 24 Nov 2020 18:00:00 -0500
Subject: [PATCH 3549/3942] nodejs-12_x: 12.19.1 -> 12.20.0

https://github.com/nodejs/node/releases/tag/v12.20.0
---
 pkgs/development/web/nodejs/v12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix
index c38944c5b562..8ce65181714a 100644
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/pkgs/development/web/nodejs/v12.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "12.19.1";
-    sha256 = "0zdis5wd84c57qjdiry8mmhpp009wqhb51f67iphl06vqc67w1vl";
+    version = "12.20.0";
+    sha256 = "12s2vjrlhgap2r12s7rqf0r2wzh9q2r5dkh3ak9fhrgmk9fgvqv1";
   }

From 46f22701be85c50d77f0e2d159cfd5193d31ca61 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 24 Nov 2020 18:01:00 -0500
Subject: [PATCH 3550/3942] nodejs-15_x: 15.2.1 -> 15.3.0

https://github.com/nodejs/node/releases/tag/v15.3.0
---
 pkgs/development/web/nodejs/v15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix
index 45e7b372e666..f5cd88c3d39b 100644
--- a/pkgs/development/web/nodejs/v15.nix
+++ b/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "15.2.1";
-    sha256 = "0gp8z68h888x2ql64aiicgs7k065lg755cbjlnkbzdih5bh32qjn";
+    version = "15.3.0";
+    sha256 = "0h625hhswwv5rpijacxiak28fy5br8kpxrihfcjdqwm3dvyvkc1v";
   }

From db17db5318fbb2520f55df888c7c34f570364ecb Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 25 Nov 2020 00:21:44 +0100
Subject: [PATCH 3551/3942] nginx: 1.19.4 -> 1.19.5

---
 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 7b7de1a00f4a..edb87258d6b7 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.19.4";
-  sha256 = "03h0hhrbfy3asla9gki2cp97zjn7idxbp5lk9xi0snlh4xlm9pv1";
+  version = "1.19.5";
+  sha256 = "173rv8gacd9bakb0r9jmkr4pqgjw9mzpdh3f7x2d8ln4ssplc2jw";
 }

From b92942f4668d9bf45df3aead90eddb636ec6db28 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 25 Nov 2020 00:11:56 +0100
Subject: [PATCH 3552/3942] systemd: use withPortabled in mesonFlags

No matter what withPortabled was being set, we always passed
-Dportabled=false in mesonFlags. Fix this.

Also, nixpkgs-fmt the file for consistency.
---
 pkgs/os-specific/linux/systemd/default.nix | 37 +++++++++++-----------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 13b52b86ff43..478791bded0f 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -57,11 +57,12 @@
 
 , withAnalyze ? true
 , withApparmor ? true
-, withCoredump ? true
 , withCompression ? true  # adds bzip2, lz4 and xz
+, withCoredump ? true
 , withCryptsetup ? true
 , withDocumentation ? true
 , withEfi ? stdenv.hostPlatform.isEfi
+, withHomed ? false
 , withHostnamed ? true
 , withHwdb ? true
 , withImportd ? true
@@ -72,14 +73,15 @@
 , withNss ? true
 , withPCRE2 ? true
 , withPolkit ? true
+, withPortabled ? false
 , withRemote ? true
 , withResolved ? true
 , withShellCompletions ? true
 , withTimedated ? true
 , withTimesyncd ? true
 , withUserDb ? true
-, withHomed ? false, p11-kit, libfido2
-# , withPortabled ? false TODO
+, p11-kit
+, libfido2
 
   # name argument
 , pname ? "systemd"
@@ -94,7 +96,7 @@
 assert withResolved -> (libgcrypt != null && libgpgerror != null);
 assert withImportd ->
 (curl.dev != null && zlib != null && xz != null && libgcrypt != null
-  && gnutar != null && gnupg != null && withCompression );
+  && gnutar != null && gnupg != null && withCompression);
 
 assert withEfi -> (gnu-efi != null);
 assert withRemote -> lib.getDev curl != null;
@@ -104,7 +106,6 @@ assert withHomed -> withCryptsetup;
 
 assert withCryptsetup ->
 (cryptsetup != null);
-
 let
   wantCurl = withRemote || withImportd;
 
@@ -196,20 +197,20 @@ stdenv.mkDerivation {
       pam
     ]
 
-    ++ lib.optional  withApparmor libapparmor
-    ++ lib.optional  wantCurl (lib.getDev curl)
+    ++ lib.optional withApparmor libapparmor
+    ++ lib.optional wantCurl (lib.getDev curl)
     ++ lib.optionals withCompression [ bzip2 lz4 xz ]
-    ++ lib.optional  withCryptsetup (lib.getDev cryptsetup.dev)
-    ++ lib.optional  withEfi gnu-efi
-    ++ lib.optional  withKexectools kexectools
-    ++ lib.optional  withLibseccomp libseccomp
-    ++ lib.optional  withNetworkd iptables
-    ++ lib.optional  withPCRE2 pcre2
-    ++ lib.optional  withResolved libgpgerror
-    ++ lib.optional  withSelinux libselinux
-    ++ lib.optional  withRemote libmicrohttpd
+    ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
+    ++ lib.optional withEfi gnu-efi
+    ++ lib.optional withKexectools kexectools
+    ++ lib.optional withLibseccomp libseccomp
+    ++ lib.optional withNetworkd iptables
+    ++ lib.optional withPCRE2 pcre2
+    ++ lib.optional withResolved libgpgerror
+    ++ lib.optional withSelinux libselinux
+    ++ lib.optional withRemote libmicrohttpd
     ++ lib.optionals withHomed [ p11-kit libfido2 ]
-    ;
+  ;
 
   #dontAddPrefix = true;
 
@@ -240,7 +241,7 @@ stdenv.mkDerivation {
     "-Dnetworkd=${lib.boolToString withNetworkd}"
     "-Dpolkit=${lib.boolToString withPolkit}"
     "-Dcryptsetup=${lib.boolToString withCryptsetup}"
-    "-Dportabled=false"
+    "-Dportabled=${lib.boolToString withPortabled}"
     "-Dhwdb=${lib.boolToString withHwdb}"
     "-Dremote=${lib.boolToString withRemote}"
     "-Dsysusers=false"

From 3af181d8a6119811936628fffe02a7d2beccee71 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Nov 2020 23:34:41 +0000
Subject: [PATCH 3553/3942] dislocker: 0.7.1 -> 0.7.3

---
 pkgs/tools/filesystems/dislocker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix
index 10e6e2f9c801..e1f28a0f2792 100644
--- a/pkgs/tools/filesystems/dislocker/default.nix
+++ b/pkgs/tools/filesystems/dislocker/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dislocker";
-  version = "0.7.1";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "aorimn";
     repo = "dislocker";
     rev = "v${version}";
-    sha256 = "1crh2sg5x1kgqmdrl1nmrqwxjykxa4zwnbggcpdn97mj2gvdw7sb";
+    sha256 = "1ak68s1v5dwh8y2dy5zjybmrh0pnqralmyqzis67y21m87g47h2k";
   };
 
   nativeBuildInputs = [ cmake ];

From 129c30e26dbe1873697fb73b29f1ee558f6e5b6e Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Tue, 10 Nov 2020 21:19:33 +0100
Subject: [PATCH 3554/3942] resilio-sync: add aarch64 support

---
 pkgs/applications/networking/resilio-sync/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index fe75268c0ecb..537e0fc81800 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -4,6 +4,7 @@ let
   arch = {
     x86_64-linux = "x64";
     i686-linux = "i386";
+    aarch64-linux = "arm64";
   }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
 
@@ -16,6 +17,7 @@ in stdenv.mkDerivation rec {
     sha256 = {
       x86_64-linux = "0gar5lzv1v4yqmypwqsjnfb64vffzn8mw9vnjr733fgf1pmr57hf";
       i686-linux   = "1bws7r86h1vysjkhyvp2zk8yvxazmlczvhjlcayldskwq48iyv6w";
+      aarch64-linux = "0j8wk5cf8bcaaqxi8gnqf1mpv8nyfjyr4ibls7jnn2biqq767af2";
     }.${stdenv.hostPlatform.system};
   };
 

From 7275a26ed50f1ffd12732b6c48067f8c9701a7ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 00:38:23 +0000
Subject: [PATCH 3555/3942] gcompris: 0.98 -> 1.0

---
 pkgs/games/gcompris/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix
index 67d52ac7bcb4..e4bc00793eb0 100644
--- a/pkgs/games/gcompris/default.nix
+++ b/pkgs/games/gcompris/default.nix
@@ -18,11 +18,11 @@
 
 mkDerivation rec {
   pname = "gcompris";
-  version = "0.98";
+  version = "1.0";
 
   src = fetchurl {
     url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
-    sha256 = "1jmjykn0lpk0v6hs2flmch8v4da5bgxl891nav7szxw9l7aqnf4y";
+    sha256 = "08dw1q0h4qz2q0ksa5pbmb9v60hr1zv9skx6z8dlq9b1i7harnds";
   };
 
   cmakeFlags = [

From 5451c908e22d779e34b7a120128e58c4b852ac99 Mon Sep 17 00:00:00 2001
From: Nicolas Martin <penguwin@penguwin.eu>
Date: Wed, 25 Nov 2020 02:08:35 +0100
Subject: [PATCH 3556/3942] glow: 1.2.0 -> 1.2.1

---
 pkgs/applications/editors/glow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix
index b9ec218b93ec..a54ce7345d04 100644
--- a/pkgs/applications/editors/glow/default.nix
+++ b/pkgs/applications/editors/glow/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "glow";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "glow";
     rev = "v${version}";
-    sha256 = "0gwzf2p67s0nsb7my5njcz4znlfl62s9gg7x9ywbk9jzsr9avkhv";
+    sha256 = "1jf9d8zwhvg9pc5g29lwz2r0lc59h1smwb5mjswxlvljpgbj7jwh";
   };
 
   vendorSha256 = "1p50qr7hbc8vyifa23z7xr43b4fpmwdzg7hqs503c124kpbpk45z";

From 77c7db03b2594184e6085ccda2601af48e0fe154 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 25 Nov 2020 02:27:16 +0100
Subject: [PATCH 3557/3942] python3Packages.pyHS100: 0.3.5.1 -> 0.3.5.2

---
 pkgs/development/python-modules/pyhs100/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyhs100/default.nix b/pkgs/development/python-modules/pyhs100/default.nix
index 2e6d7164b8bf..429f3a8ebb9f 100644
--- a/pkgs/development/python-modules/pyhs100/default.nix
+++ b/pkgs/development/python-modules/pyhs100/default.nix
@@ -4,14 +4,14 @@
 
 buildPythonPackage rec {
   pname = "pyHS100";
-  version = "0.3.5.1";
+  version = "0.3.5.2";
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "GadgetReactor";
     repo = pname;
     rev = version;
-    sha256 = "1vddr9sjn6337i1vx0mm7pb3qibvl2gx6nx18vm4fajgv9vcjxny";
+    sha256 = "0z98hzvkp6jmllyd4x4y0f5n6nnxrizw6g5l2clxdn93mifjavp0";
   };
 
   propagatedBuildInputs = [

From 7f5dfd2b84d68a9e9f40253c35fcba69e518048c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Nov 2020 23:56:21 +0000
Subject: [PATCH 3558/3942] evolution-data-server: 3.38.1 -> 3.38.2

---
 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 9c73bf0e182c..e52d466b0e4b 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.38.1";
+  version = "3.38.2";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1dz4ybhq5rf1hnaf1d6h60ldn9xpdaj9nw42c4iqbw9lqglpiwlg";
+    sha256 = "0mflr8a3f2q55rirvqhizji0zinic75jk8mksflszqzgcdcph85z";
   };
 
   patches = [

From 668e7a441a851cc1eb15bcf91b725b3b8ce7dd50 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 00:54:54 +0000
Subject: [PATCH 3559/3942] gnome3.gnome-getting-started-docs: 3.36.2 -> 3.38.0

---
 .../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 bd02a5f0cc60..79b3be3ae3db 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 {
   pname = "gnome-getting-started-docs";
-  version = "3.36.2";
+  version = "3.38.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1ihxa9g687rbb4s2gxd2pf726adx98ahq4kfad868swl7a8vi504";
+    sha256 = "0ficf4i4njqrx3dn5rdkvpvcys5mwfma4zkgfmfkq964jxpwzqvw";
   };
 
   passthru = {

From 1431c3cc601df3f2f10389e2a8fc4869ebb3bdd5 Mon Sep 17 00:00:00 2001
From: Red Davies <red@infect.me>
Date: Tue, 24 Nov 2020 21:21:56 -0500
Subject: [PATCH 3560/3942] cassandra_3_0: 3.0.17 -> 3.0.23

Reason: Fixes CVE-2020-13946 Apache Cassandra RMI Rebind Vulnerability

Description:
It is possible for a local attacker without access to the Apache Cassandra
process or configuration files to manipulate the RMI registry to perform a
man-in-the-middle attack and capture user names and passwords used to access
the JMX interface. The attacker can then use these credentials to access
the JMX interface and perform unauthorised operations.

Users should also be aware of CVE-2019-2684, a JRE vulnerability that enables
this issue to be exploited remotely.

3.0.x users should upgrade to 3.0.22
---
 pkgs/servers/nosql/cassandra/3.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix
index a1aad75ce3f6..bb81d0ca7917 100644
--- a/pkgs/servers/nosql/cassandra/3.0.nix
+++ b/pkgs/servers/nosql/cassandra/3.0.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "3.0.17";
-  sha256 = "0568r5xdy78pl29zby5g4m9qngf29cb9222sc1q1wisapb7zkl2p";
+  version = "3.0.23";
+  sha256 = "0cbia20bggq85q2p6gsybw045qdfqxd5xv8ihppq1hwl21sb2klz";
 })

From d14952311e5306073820f3e2dc13d6af81731659 Mon Sep 17 00:00:00 2001
From: Hunter Jones <hjones2199@gmail.com>
Date: Fri, 30 Oct 2020 18:46:57 -0500
Subject: [PATCH 3561/3942] phd2: init at 2.6.9dev1

---
 .../science/astronomy/phd2/default.nix        | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/science/astronomy/phd2/default.nix

diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix
new file mode 100644
index 000000000000..98afba77c4f0
--- /dev/null
+++ b/pkgs/applications/science/astronomy/phd2/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk3,
+  wxGTK30-gtk3, curl, gettext, glib, indilib, libnova }:
+
+stdenv.mkDerivation rec {
+  pname = "phd2";
+  version = "2.6.9dev1";
+
+  src = fetchFromGitHub {
+    owner = "OpenPHDGuiding";
+    repo = "phd2";
+    rev = "v${version}";
+    sha256 = "1ih7m9lilh12xbhmwm9kkicaqy72mi3firl6df7m5x38n2zj3zm4";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indilib libnova ];
+
+  cmakeFlags = [
+    "-DOPENSOURCE_ONLY=1"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://openphdguiding.org/";
+    description = "Telescope auto-guidance application";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ hjones2199 ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b33ef46844b6..8a2e199d79c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2489,6 +2489,8 @@ in
 
   pev = callPackage ../development/tools/analysis/pev { };
 
+  phd2 = callPackage ../applications/science/astronomy/phd2 { };
+
   phoronix-test-suite = callPackage ../tools/misc/phoronix-test-suite { };
 
   photon = callPackage ../tools/networking/photon { };

From f2b2eb23f1d600de0a008ee3d965e3f62871f975 Mon Sep 17 00:00:00 2001
From: Chris Forno <jekor@jekor.com>
Date: Wed, 25 Nov 2020 11:42:24 +0800
Subject: [PATCH 3562/3942] vips: add librsvg dependency

Some vips operations on SVG files require librsvg.
---
 pkgs/tools/graphics/vips/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index c85e89581243..2e745fc1a7c9 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -13,6 +13,7 @@
 , libgsf
 , libexif
 , libheif
+, librsvg
 , ApplicationServices
 , python27
 , libpng
@@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
     libexif
     libheif
     libpng
+    librsvg
     python27
     libpng
     expat

From 58b9e10a6ed32c9438b8c5b86d3753c1478a8733 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 04:28:50 +0000
Subject: [PATCH 3563/3942] flyway: 7.2.0 -> 7.2.1

---
 pkgs/development/tools/flyway/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index e6338d3e3f29..f6c7bef1dc8b 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, jre_headless, makeWrapper }:
   let
-    version = "7.2.0";
+    version = "7.2.1";
   in
     stdenv.mkDerivation {
       pname = "flyway";
       inherit version;
       src = fetchurl {
         url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
-        sha256 = "1rqj2aq1cwh9rsnnlwvg0b5jpyqsij9jamd873i18rf87q6cdsk4";
+        sha256 = "0b9pyy5avgr2wh3amnpwfc21i69mbw9a0xdxwg5wlrw83f5rx17w";
       };
       nativeBuildInputs = [ makeWrapper ];
       dontBuild = true;

From 80b1ecca9d0c82c66f794031fa703ffadb0e25ed Mon Sep 17 00:00:00 2001
From: Nicolas Berbiche <nicolas@normie.dev>
Date: Tue, 24 Nov 2020 23:49:45 -0500
Subject: [PATCH 3564/3942] cagebreak: 1.4.3 -> 1.4.4

---
 pkgs/applications/window-managers/cagebreak/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix
index 7464fc1b749b..36b3adb08e11 100644
--- a/pkgs/applications/window-managers/cagebreak/default.nix
+++ b/pkgs/applications/window-managers/cagebreak/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cagebreak";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "project-repo";
     repo = "cagebreak";
     rev = version;
-    hash = "sha256-iMoj++yjGK4hn3C675QntBYcsoBx0lEjjCM8fdvRJYo=";
+    hash = "sha256-YmUn5H0xNC/4MBGydrEk7dy5v+s2ja4VoA1neWrQ3VY=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];

From 79a91016914b345fb5c68b802638b329054e21df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 04:55:20 +0000
Subject: [PATCH 3565/3942] tmuxp: 1.6.2 -> 1.6.3

---
 pkgs/tools/misc/tmuxp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index a02c1d0f437d..cc910c8b41c1 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -4,11 +4,11 @@ with python.pkgs;
 
 buildPythonApplication rec {
   pname = "tmuxp";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "feec0be98a60c8cd8557bce388156202496dd9c8998e6913e595e939aeb0f735";
+    sha256 = "4bc52d6683235307c92ddbb164c84e3e892ee2d00afa16ed89eca0fa7f85029e";
   };
 
   postPatch = ''

From 72752ab88ec1835da553460f36e2e6f55da0a7f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 05:00:53 +0000
Subject: [PATCH 3566/3942] vimwiki-markdown: 0.3.2 -> 0.3.3

---
 pkgs/tools/misc/vimwiki-markdown/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix
index 6e6a985d44f4..7c8a723f41f0 100644
--- a/pkgs/tools/misc/vimwiki-markdown/default.nix
+++ b/pkgs/tools/misc/vimwiki-markdown/default.nix
@@ -6,12 +6,12 @@
 }:
 
 buildPythonApplication rec {
-  version = "0.3.2";
+  version = "0.3.3";
   pname = "vimwiki-markdown";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "e8dc7de7fc7f88480acb940aa51088464b9911c85cc3d5cca962a45e75ff9b81";
+    sha256 = "ee4ef08f7e4df27f67ffebb5fa413a7cf4fad967a248c1c75d48b00122a5b945";
   };
 
   propagatedBuildInputs= [

From 9c03664e4b08fbcc83293d082a00e225f6782195 Mon Sep 17 00:00:00 2001
From: Kyle Lacy <kylelacy+git@pm.me>
Date: Tue, 24 Nov 2020 21:12:06 -0800
Subject: [PATCH 3567/3942] plex-media-player: remove myself as a maintainer

---
 maintainers/maintainer-list.nix                       | 6 ------
 pkgs/applications/video/plex-media-player/default.nix | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a26605ad8f00..9bcb1c54957f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4801,12 +4801,6 @@
       fingerprint = "5A9A 1C9B 2369 8049 3B48  CF5B 81A1 5409 4816 2372";
     }];
   };
-  kylewlacy = {
-    email = "kylelacy+nix@pm.me";
-    github = "kylewlacy";
-    githubId = 1362179;
-    name = "Kyle Lacy";
-  };
   laikq = {
     email = "gwen@quasebarth.de";
     github = "laikq";
diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index 0530af6f222c..107fd5f599ab 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -41,7 +41,7 @@ in mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Streaming media player for Plex";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ kylewlacy ];
+    maintainers = with maintainers; [ ];
     homepage = "https://plex.tv";
   };
 }

From 6849c4a4c9b356ec1d8d8a02762a6e6dbf50700c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 05:32:43 +0000
Subject: [PATCH 3568/3942] urh: 2.8.9 -> 2.9.0

---
 pkgs/applications/radio/urh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix
index 008697211f75..5411571113d5 100644
--- a/pkgs/applications/radio/urh/default.nix
+++ b/pkgs/applications/radio/urh/default.nix
@@ -5,13 +5,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "urh";
-  version = "2.8.9";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0axzqyljbmpc4c9bnqmdrrz5la5r9qynp49fig645xyxs87vq6b0";
+    sha256 = "1pcyj1vzv51j8rgi0hh9chw3vfkfi03bg1rg7gs4nk95ffmwx4pd";
   };
 
   nativeBuildInputs = [ qt5.wrapQtAppsHook ];

From 3174ae1723f4eb6d249e88ff4fd02ef816b8b134 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 05:57:05 +0000
Subject: [PATCH 3569/3942] mavproxy: 1.8.24 -> 1.8.27

---
 pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix
index b245ae384ae6..6fdb7b8fcbe2 100644
--- a/pkgs/applications/science/robotics/mavproxy/default.nix
+++ b/pkgs/applications/science/robotics/mavproxy/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonApplication rec {
   pname = "MAVProxy";
-  version = "1.8.24";
+  version = "1.8.27";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "768deb3c1d96ed8d734a2fe2eb7cc3877309b17fb5353e9d7036830283806885";
+    sha256 = "f3c704e2d67b36e4932896abe00c89e7f3fb7458fc52849b5d7d6d83bd623adf";
   };
 
   propagatedBuildInputs = [

From d624e520d0dcb85ffc20d1e2e49331190ccd1404 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 06:31:26 +0000
Subject: [PATCH 3570/3942] vcstool: 0.2.14 -> 0.2.15

---
 pkgs/development/tools/vcstool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index f86e2857feea..e99f7dca9bf5 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -5,11 +5,11 @@ with python3Packages;
 
 buildPythonApplication rec {
   pname = "vcstool";
-  version = "0.2.14";
+  version = "0.2.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c51300f074ea9c5da162ed8f3bc354c3fd69564895fee90abf1e1bd525919f2b";
+    sha256 = "b1fce6fcef7b117b245a72dc8658a128635749d01dc7e9d1316490f89f9c2fde";
   };
 
   propagatedBuildInputs = [ pyyaml setuptools ];

From daff28982072a3eb75533ea8a04eec685ad86426 Mon Sep 17 00:00:00 2001
From: Rakesh Gupta <rakesh.gupta@formbay.com.au>
Date: Wed, 25 Nov 2020 12:20:46 +0530
Subject: [PATCH 3571/3942] pythonPackages.imantics: init at 0.1.12

---
 .../python-modules/imantics/default.nix       | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/imantics/default.nix

diff --git a/pkgs/development/python-modules/imantics/default.nix b/pkgs/development/python-modules/imantics/default.nix
new file mode 100644
index 000000000000..59eb3afaa0ec
--- /dev/null
+++ b/pkgs/development/python-modules/imantics/default.nix
@@ -0,0 +1,46 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+, numpy
+, opencv3
+, sphinx_rtd_theme
+, lxml
+, xmljson
+}:
+
+buildPythonPackage rec {
+  pname = "imantics";
+  version = "0.1.12";
+
+  src = fetchFromGitHub {
+    owner = "jsbroks";
+    repo = "imantics";
+    rev = "76d81036d8f92854d63ad9938dd76c718f8b482e";
+    sha256 = "1zv2gj8cbakhh2fyr2611cbqhfk37a56x973ny9n43y70n26pzm8";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    opencv3
+    sphinx_rtd_theme
+    lxml
+    xmljson
+  ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'opencv-python>=3'," ""
+  '';
+
+  # failing on NixOS
+  doCheck = false;
+
+  pythonImportsCheck = [ "imantics" ];
+
+  meta = with lib; {
+    description = "Convert and visualize many annotation formats for object dectection and localization";
+    homepage = "https://github.com/jsbroks/imantics";
+    license = with licenses; [ mit ];
+    maintainers = [ maintainers.rakesh4g ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d209c34bdd8f..52bf86ba2f94 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2875,6 +2875,8 @@ in {
 
   imagesize = callPackage ../development/python-modules/imagesize { };
 
+  imantics = callPackage ../development/python-modules/imantics { };
+
   IMAPClient = callPackage ../development/python-modules/imapclient { };
 
   imaplib2 = callPackage ../development/python-modules/imaplib2 { };

From 5603d2eb0222795d9b33302db59a563361dfe12f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 06:55:25 +0000
Subject: [PATCH 3572/3942] jira-cli: 2.2 -> 3.0

---
 pkgs/development/tools/jira_cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix
index 19d6fa392dd2..4040debf15ea 100644
--- a/pkgs/development/tools/jira_cli/default.nix
+++ b/pkgs/development/tools/jira_cli/default.nix
@@ -4,10 +4,10 @@ let
 in
   buildPythonApplication rec {
     pname = "jira-cli";
-    version = "2.2";
+    version = "3.0";
     src = fetchPypi {
       inherit pname version;
-      sha256 = "314118d5d851394ebf910122fd7ce871f63581393968c71456441eb56be3b112";
+      sha256 = "86f7d4ad7292c9a27bbc265d09e7bcd00ef8159f20172998d85f25aad53b0df6";
     };
 
     postPatch = ''

From e40f4acb2706513eda92e1c7c92f085162844e01 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 18 Nov 2020 08:10:35 +0100
Subject: [PATCH 3573/3942] ocaml: minor refactoring

---
 pkgs/development/compilers/ocaml/generic.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 1558756e16b1..79aab1ffe831 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -1,12 +1,8 @@
 { minor_version, major_version, patch_version
-, url ? null
-, sha256, ...}@args:
+, ...}@args:
 let
   versionNoPatch = "${toString major_version}.${toString minor_version}";
   version = "${versionNoPatch}.${toString patch_version}";
-  real_url = if url == null then
-    "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz"
-  else url;
   safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips);
 in
 
@@ -22,6 +18,13 @@ assert aflSupport -> stdenv.lib.versionAtLeast version "4.05";
 assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03";
 assert spaceTimeSupport -> stdenv.lib.versionAtLeast version "4.04";
 
+let
+  src = args.src or (fetchurl {
+    url = args.url or "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz";
+    inherit (args) sha256;
+  });
+in
+
 let
    useNativeCompilers = !stdenv.isMips;
    inherit (stdenv.lib) optional optionals optionalString;
@@ -39,10 +42,7 @@ stdenv.mkDerivation (args // {
   inherit name;
   inherit version;
 
-  src = fetchurl {
-    url = real_url;
-    inherit sha256;
-  };
+  inherit src;
 
   prefixKey = "-prefix ";
   configureFlags =

From 254f2bad97c4148aa1a6e2f484d9849a63c5dcfa Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 18 Nov 2020 08:10:53 +0100
Subject: [PATCH 3574/3942] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F12.ocaml?=
 =?UTF-8?q?:=20init=20at=204.12.0-=CE=B11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/ocaml/4.12.nix | 9 +++++++++
 pkgs/top-level/ocaml-packages.nix         | 2 ++
 2 files changed, 11 insertions(+)
 create mode 100644 pkgs/development/compilers/ocaml/4.12.nix

diff --git a/pkgs/development/compilers/ocaml/4.12.nix b/pkgs/development/compilers/ocaml/4.12.nix
new file mode 100644
index 000000000000..9fa5d62423cc
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/4.12.nix
@@ -0,0 +1,9 @@
+import ./generic.nix {
+  major_version = "4";
+  minor_version = "12";
+  patch_version = "0-alpha1";
+  src = fetchTarball {
+    url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha1.tar.xz";
+    sha256 = "1p9nnj7l43b697b6bm767znbf1h0s2lyc1qb8izr1vfpsmnm11ws";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 235ffb67c9b0..64a23c21fc30 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1257,6 +1257,8 @@ in let inherit (pkgs) callPackage; in rec
 
   ocamlPackages_4_11 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.11.nix { });
 
+  ocamlPackages_4_12 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.12.nix { });
+
   ocamlPackages_latest = ocamlPackages_4_11;
 
   ocamlPackages = ocamlPackages_4_10;

From 6cea12ccff6e279f0bc1f91aa6a898d642e03320 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Tue, 24 Nov 2020 17:16:54 -0800
Subject: [PATCH 3575/3942] alacritty: 0.6.0-rc1 -> 0.6.0

https://github.com/alacritty/alacritty/blob/master/CHANGELOG.md#060
---
 .../terminal-emulators/alacritty/default.nix             | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix
index 4e87c00434b7..cd372b79c26b 100644
--- a/pkgs/applications/terminal-emulators/alacritty/default.nix
+++ b/pkgs/applications/terminal-emulators/alacritty/default.nix
@@ -52,17 +52,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "alacritty";
-  # 0.5.0 is not compatible with gnome 3.38
-  version = "0.6.0-rc1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "alacritty";
     repo = pname;
     rev = "v${version}";
-    sha256 = "RuIJvB0J/BQFqemOkEUiqS1uz0gMS49Dd8UQt0nbrQ0=";
+    sha256 = "vQdNwNiUvoJWRT1foPRadirI2zWjnzU3sGnIxeHKlj8=";
   };
 
-  cargoSha256 = "+3iZywLvy+8C7j6g9bqij2DSLjBoE2u1GXgfV04cWRY=";
+  cargoSha256 = "1PQSg6EmwVMZj2ALw6qsbtPMCtALVHx5TR05FjGD/QE=";
 
   nativeBuildInputs = [
     cmake
@@ -75,7 +74,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   buildInputs = rpathLibs
-  ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.isDarwin [
     AppKit
     CoreGraphics
     CoreServices

From 89f3866548915b89cf9e584214b82043fbe01f29 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 07:19:09 +0000
Subject: [PATCH 3576/3942] python37Packages.Wand: 0.6.3 -> 0.6.4

---
 pkgs/development/python-modules/Wand/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
index 4f4dbbc2fd19..e82fd1d1391c 100644
--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/pkgs/development/python-modules/Wand/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "Wand";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d21429288fe0de63d829dbbfb26736ebaed9fd0792c2a0dc5943c5cab803a708";
+    sha256 = "6aeb0183d94762b37a8cdee97174f38ae21e626d44f62f1e2f0ab48a35026e98";
   };
 
   postPatch = ''

From af10cef5aab218fb6689b890f9ac21dfbbbc9faa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 07:31:42 +0000
Subject: [PATCH 3577/3942] python37Packages.thinc: 7.4.2 -> 7.4.3

---
 pkgs/development/python-modules/thinc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 5ac55f5f57dd..6e0fbcce37a6 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -23,11 +23,11 @@
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "7.4.2";
+  version = "7.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "772f1a27b9b31e51003d1d2a7476cc49cc81044dd87088112237f93bd2091f0b";
+    sha256 = "c98491b083165f48bda95f5533f7d9dbd3980d32ad621bfe579ff08ef625a4d3";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

From 5790bb073f8cfa5de29ce65ae4c6d15b21cccf7e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 25 Nov 2020 08:17:30 +0100
Subject: [PATCH 3578/3942] nixos auto-upgrade: remove flag when flake

The `--no-build-output` flag that is added by default is only valid
for the old cli, which is not used when flakes are used.

Follow-up to c9daa81eff922d9f77d136cfcff0ea05d40024e0.
---
 nixos/modules/tasks/auto-upgrade.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix
index 69385e5f2fe0..b19b688a1fb8 100644
--- a/nixos/modules/tasks/auto-upgrade.nix
+++ b/nixos/modules/tasks/auto-upgrade.nix
@@ -109,9 +109,8 @@ in {
       '';
     }];
 
-    system.autoUpgrade.flags = [ "--no-build-output" ]
-      ++ (if cfg.flake == null then
-        (if cfg.channel == null then
+    system.autoUpgrade.flags = (if cfg.flake == null then
+        [ "--no-build-output" ] ++ (if cfg.channel == null then
           [ "--upgrade" ]
         else [
           "-I"

From 35e50449a3f92632970bcca9aee26100f49c0bfb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 07:55:53 +0000
Subject: [PATCH 3579/3942] python37Packages.trimesh: 3.8.13 -> 3.8.14

---
 pkgs/development/python-modules/trimesh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index f5d6efff5e4a..2829c4e1901d 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "3.8.13";
+  version = "3.8.14";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b31dfd9d8cba0271a5a447250bc07cdb5c3b1fd21b76b88a63dcd4bcdcb80769";
+    sha256 = "dba3d9fa1d9488053fc7504c141fbb2258cf5f37377a3824b20bd0a93f7240a0";
   };
 
   propagatedBuildInputs = [ numpy ];

From c5389c5729dccdd7ac9883f929a5e4fd2482ef03 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 01:57:10 +0000
Subject: [PATCH 3580/3942] gnome-user-docs: 3.38.1 -> 3.38.2

---
 pkgs/data/documentation/gnome-user-docs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix
index 688c606519a0..a344dbca2f38 100644
--- a/pkgs/data/documentation/gnome-user-docs/default.nix
+++ b/pkgs/data/documentation/gnome-user-docs/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-user-docs";
-  version = "3.38.1";
+  version = "3.38.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0j4yfv6b31dwv3aky20bnap6gql1xpl3fz3qzjx1lmr3bngz92jf";
+    sha256 = "1h9lyn80zccmgi6gpymabgrcj7km0sb1axll5z490qnx74xbn37m";
   };
 
   nativeBuildInputs = [

From 3725f9ed9b08c73ee07d7f213abb2c1c22af2509 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Wed, 25 Nov 2020 10:12:05 +0100
Subject: [PATCH 3581/3942] iosevka: update location of parameters.toml

Since version 3.1.0, it has been moved to `params/parameters.toml`. Note
that an alternative to appending would be to use
`params/private-parameters.toml` but in our case, I don't think it
matters much as we don't keep the build directory.
---
 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 3d350796105a..989c2d39c19e 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -65,8 +65,8 @@ stdenv.mkDerivation rec {
       remarshal -i "$privateBuildPlanJSONPath" -o private-build-plans.toml -if json -of toml
     ''}
     ${lib.optionalString (extraParameters != null) ''
-      echo -e "\n" >> parameters.toml
-      cat "$extraParametersPath" >> parameters.toml
+      echo -e "\n" >> params/parameters.toml
+      cat "$extraParametersPath" >> params/parameters.toml
     ''}
     ln -s ${nodeIosevka}/lib/node_modules/iosevka/node_modules .
     runHook postConfigure

From e8ee6a408fa1869dc648db990eb515d30a764180 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 01:30:33 +0000
Subject: [PATCH 3582/3942] gnome3.gnome-music: 3.38.1 -> 3.38.2

---
 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 ca59c5556fe1..a682e3b4935a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -30,13 +30,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "3.38.1";
+  version = "3.38.2";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1sda943nd646nq2y5anj0d7aaxxddznva5bh5gsx6qx0mxhi5jrv";
+    sha256 = "0c2051wngf3jrifl5bv5kyqcci459n62vixxkryiryjcaqwbd1am";
   };
 
   nativeBuildInputs = [

From 03df9f54fc54a29d14a614bd29323076b5259588 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 25 Nov 2020 09:12:31 +0000
Subject: [PATCH 3583/3942] terragrunt: 0.26.4 -> 0.26.5

---
 pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index bacf9409bcce..cc6836b512f9 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "terragrunt";
-  version = "0.26.4";
+  version = "0.26.5";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0q1dzrjfg97bk1prknwpdgcf5vnpdi0f41wb5ni4550zzqsz3rnk";
+    sha256 = "0wnczg234jys54njaxbf9dd7b299dyl4spjpr5l40agz9cd8mkq3";
   };
 
   vendorSha256 = "0l85jx02dj9qvxs8l0ln5fln8vssi0fisblm5i1scz9x4a1jqg9n";

From 3ed220fd5f6c1519cfd3eb75b174c3c8997c9c2b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 02:31:26 +0000
Subject: [PATCH 3584/3942] gnome3.gedit: 3.38.0 -> 3.38.1

---
 pkgs/desktops/gnome-3/apps/gedit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 78dc7623e34e..f3219e74bcae 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gedit";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1y2n3325qvfiaz526vdf7l5wbh5js25djkz3jmg6x3z5dn00dks6";
+    sha256 = "0kc48a399achcz6vlqq0jk0b8ixbrzyv9xb22s5av76m5hyqalq0";
   };
 
   nativeBuildInputs = [

From 3716bb5e6cc562aa4a9c1b66463ac950e961d009 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 04:15:51 +0000
Subject: [PATCH 3585/3942] gnome3.gnome-calculator: 3.38.1 -> 3.38.2

---
 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index e92333642d40..2f22fd86a6f6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-calculator";
-  version = "3.38.1";
+  version = "3.38.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0jajgdl2338nwym980gqw77pcjkprzhnfg8asdjksiksgz8gzzvw";
+    sha256 = "0sri58cp6v07cqpdsf8dhf9dnykz305kvkx0l9dd25g06djcr0wc";
   };
 
   nativeBuildInputs = [

From b21d88c76b053b0fa5015dc68f1630b2779ef83a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 09:28:18 +0000
Subject: [PATCH 3586/3942] python37Packages.bellows: 0.20.3 -> 0.21.0

---
 pkgs/development/python-modules/bellows/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index b0c899cdd3b8..ab50a1acd8ef 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -5,14 +5,14 @@
 
 let
   pname = "bellows";
-  version = "0.20.3";
+  version = "0.21.0";
 
 in buildPythonPackage rec {
   inherit pname version;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9342b6b9423c818f99f7c6d9086fbb5e27d5c2efbb1f2a08f6f5a917c4991f86";
+    sha256 = "fd2ac40c1f3550580dc561ae58d7d15cfa12e6a7cc5d35ee80e7a1cb6a4cda4f";
   };
 
   propagatedBuildInputs = [

From a775974c8ac756d2293c4c9f8b2db887d3aa47e7 Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Tue, 24 Nov 2020 10:46:19 +0100
Subject: [PATCH 3587/3942] ghostscript: fix broken rpath on Darwin

Dynamic library name on Darwin contains only 'maj.min' eg "9.53";
the build however used $version to set rpath;
this broke on 2029ca37 when $version went from "9.52" to "9.53.3".

Add a call to 'gs' in installCheckPhase,
to break the build if dylib issues arise in the future.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
---
 pkgs/misc/ghostscript/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 5a7762640f73..6f113bcd99cb 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -103,8 +103,20 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  # dynamic library name only contains maj.min, eg. '9.53'
+  dylib_version = lib.versions.majorMinor version;
   preFixup = lib.optionalString stdenv.isDarwin ''
-    install_name_tool -change libgs.dylib.${version} $out/lib/libgs.dylib.${version} $out/bin/gs
+    install_name_tool -change libgs.dylib.$dylib_version $out/lib/libgs.dylib.$dylib_version $out/bin/gs
+  '';
+
+  # validate dynamic linkage
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $out/bin/gs --version
+
+    runHook postInstallCheck
   '';
 
   meta = {

From 3533c4f5176d70346a20ea1fe8a523cb063d2b43 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 21 Nov 2020 15:10:50 +0100
Subject: [PATCH 3588/3942] droopy: remove macpath to migrate to py3.8

---
 pkgs/applications/networking/droopy/default.nix | 9 ++++++++-
 pkgs/top-level/all-packages.nix                 | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix
index f3f5f54f4092..63afa5ce76f1 100644
--- a/pkgs/applications/networking/droopy/default.nix
+++ b/pkgs/applications/networking/droopy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, wrapPython }:
+{ stdenv, lib, fetchFromGitHub, wrapPython, fetchpatch }:
 
 with lib;
 
@@ -13,6 +13,13 @@ stdenv.mkDerivation {
     sha256 = "03i1arwyj9qpfyyvccl21lbpz3rnnp1hsadvc0b23nh1z2ng9sff";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/30.patch";
+      sha256 = "Y6jBraKvVQAiScbvLwezSKeWY3vaAbhaNXEGNaItigQ=";
+    })
+  ];
+
   nativeBuildInputs = [ wrapPython ];
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d97b6d880076..a2396976d05f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20714,7 +20714,7 @@ in
     buildServerGui = false;
   };
 
-  droopy = python37Packages.callPackage ../applications/networking/droopy { };
+  droopy = python3Packages.callPackage ../applications/networking/droopy { };
 
   drumgizmo = callPackage ../applications/audio/drumgizmo { };
 

From cd54ef201e7ce2b1e68d63043cee4649c894e923 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 02:37:35 +0000
Subject: [PATCH 3589/3942] glade: 3.38.1 -> 3.38.2

---
 pkgs/development/tools/glade/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix
index 4cc7dbd8a7c2..363e429b6baa 100644
--- a/pkgs/development/tools/glade/default.nix
+++ b/pkgs/development/tools/glade/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   pname = "glade";
-  version = "3.38.1";
+  version = "3.38.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1kfgs2dpjd8dnnjkfc4xdy8yjjavlzimqzyfr1pq1m1h96z506hp";
+    sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q";
   };
 
   nativeBuildInputs = [

From 2ea6e83af170edbfad0ce7e28f85c1f7275fb7cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 03:26:56 +0000
Subject: [PATCH 3590/3942] gnome3.gnome-devel-docs: 3.38.1 -> 3.38.2

---
 pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index f42d1a93e012..a3a69eb4e349 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-devel-docs";
-  version = "3.38.1";
+  version = "3.38.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "07849yhpc4l4jscskpsbjwsp5qs8f0jz3rmh3p1nj13vxmvgm5j5";
+    sha256 = "1h6481hbz1c5p69r6h96hbgf560lhp1jibszscgw0s2yikdh6q8n";
   };
 
   passthru = {

From d75276a28e60bd3105669eb0da1a13e418c518bd Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Wed, 25 Nov 2020 10:09:05 +0100
Subject: [PATCH 3591/3942] meli: fix runtime error with libnotmuch5

> libnotmuch5 was not found in your system. Make sure it is installed and in the library paths.
> notmuch is not a valid mail backend
---
 .../networking/mailreaders/meli/default.nix            | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix
index 1abaeb6f1656..4f3a1ef3901f 100644
--- a/pkgs/applications/networking/mailreaders/meli/default.nix
+++ b/pkgs/applications/networking/mailreaders/meli/default.nix
@@ -8,6 +8,7 @@
 , sqlite
 , file
 , gzip
+, makeWrapper
 , notmuch
   # Build with support for notmuch backend
 , withNotmuch ? true
@@ -27,7 +28,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = lib.optional withNotmuch "--features=notmuch";
 
-  nativeBuildInputs = [ pkgconfig gzip ];
+  nativeBuildInputs = [ pkgconfig gzip makeWrapper ];
 
   buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch;
 
@@ -39,6 +40,13 @@ rustPlatform.buildRustPackage rec {
     mkdir -p $out/share/man/man5
     gzip < docs/meli.conf.5 > $out/share/man/man5/meli.conf.5.gz
     gzip < docs/meli-themes.5 > $out/share/man/man5/meli-themes.5.gz
+  '' + lib.optionalString withNotmuch ''
+    # Fixes this runtime error when meli is started with notmuch configured:
+    # $ meli
+    # libnotmuch5 was not found in your system. Make sure it is installed and
+    # in the library paths.
+    # notmuch is not a valid mail backend
+    wrapProgram $out/bin/meli --set LD_LIBRARY_PATH ${notmuch}/lib
   '';
 
   meta = with stdenv.lib; {

From 118695a3500a95038eb9e6dcbf2f6bf09845497d Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Thu, 19 Nov 2020 17:57:48 +0800
Subject: [PATCH 3592/3942] pass: seperate dmenu from x11Support

---
 pkgs/tools/security/pass/default.nix | 17 ++++++++++-------
 pkgs/top-level/all-packages.nix      |  5 +++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 76b90d5b8858..9ba03fc74a2f 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -3,7 +3,7 @@
 , qrencode , makeWrapper, pass, symlinkJoin
 
 , xclip ? null, xdotool ? null, dmenu ? null
-, x11Support ? !stdenv.isDarwin
+, x11Support ? !stdenv.isDarwin , dmenuSupport ? x11Support
 , waylandSupport ? false, wl-clipboard ? null
 
 # For backwards-compatibility
@@ -12,9 +12,11 @@
 
 with lib;
 
-assert x11Support -> xclip != null
-                  && xdotool != null
-                  && dmenu != null;
+assert x11Support -> xclip != null;
+
+assert dmenuSupport -> dmenu != null
+                       && xdotool != null
+                       && x11Support;
 
 assert waylandSupport -> wl-clipboard != null;
 
@@ -72,7 +74,7 @@ stdenv.mkDerivation rec {
     # himself.
     mkdir -p "$out/share/emacs/site-lisp"
     cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/"
-  '' + optionalString x11Support ''
+  '' + optionalString dmenuSupport ''
     cp "contrib/dmenu/passmenu" "$out/bin/"
   '';
 
@@ -87,7 +89,8 @@ stdenv.mkDerivation rec {
     qrencode
     procps
   ] ++ optional stdenv.isDarwin openssl
-    ++ ifEnable x11Support [ dmenu xclip xdotool ]
+    ++ optional x11Support xclip
+    ++ optionals dmenuSupport [ xdotool dmenu ]
     ++ optional waylandSupport wl-clipboard);
 
   postFixup = ''
@@ -98,7 +101,7 @@ stdenv.mkDerivation rec {
     # Ensure all dependencies are in PATH
     wrapProgram $out/bin/pass \
       --prefix PATH : "${wrapperPath}"
-  '' + stdenv.lib.optionalString x11Support ''
+  '' + stdenv.lib.optionalString dmenuSupport ''
     # 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 \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a4e623d213d..b762c6160c4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1253,6 +1253,11 @@ in
 
   pass = callPackage ../tools/security/pass { };
 
+  pass-nodmenu = callPackage ../tools/security/pass {
+    dmenuSupport = false;
+    pass = pass-nodmenu;
+  };
+
   pass-wayland = callPackage ../tools/security/pass {
     waylandSupport = true;
     pass = pass-wayland;

From 8b91055223c735976b371f1957252dc420c55bb6 Mon Sep 17 00:00:00 2001
From: luc65r <lucas@ransan.tk>
Date: Tue, 27 Oct 2020 20:01:12 +0100
Subject: [PATCH 3593/3942] fasmg: init at j27m

---
 pkgs/development/compilers/fasmg/default.nix | 58 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/compilers/fasmg/default.nix

diff --git a/pkgs/development/compilers/fasmg/default.nix b/pkgs/development/compilers/fasmg/default.nix
new file mode 100644
index 000000000000..5233e248c074
--- /dev/null
+++ b/pkgs/development/compilers/fasmg/default.nix
@@ -0,0 +1,58 @@
+{ stdenv
+, fetchzip
+}:
+
+stdenv.mkDerivation rec {
+  pname = "fasmg";
+  version = "j27m";
+
+  src = fetchzip {
+    url = "https://flatassembler.net/fasmg.${version}.zip";
+    sha256 = "0qmklb24n3r0my2risid8r61pi88gqrvm1c0xvyd0bp1ans6d7zd";
+    stripRoot = false;
+  };
+
+  buildPhase = let
+    inherit (stdenv.hostPlatform) system;
+
+    path = {
+      x86_64-linux = {
+        bin = "fasmg.x64";
+        asm = "source/linux/x64/fasmg.asm";
+      };
+      x86_64-darwin = {
+        bin = "source/macos/x64/fasmg";
+        asm = "source/macos/x64/fasmg.asm";
+      };
+      x86-linux = {
+        bin = "fasmg";
+        asm = "source/linux/fasmg.asm";
+      };
+      x86-darwin = {
+        bin = "source/macos/fasmg";
+        asm = "source/macos/fasmg.asm";
+      };
+    }.${system} or (throw "Unsopported system: ${system}");
+
+  in ''
+    chmod +x ${path.bin}
+    ./${path.bin} ${path.asm} fasmg
+  '';
+
+  outputs = [ "out" "doc" ];
+
+  installPhase = ''
+    install -Dm755 fasmg $out/bin/fasmg
+
+    mkdir -p $doc/share/doc/fasmg
+    cp docs/*.txt $doc/share/doc/fasmg
+  '';
+
+  meta = with stdenv.lib; {
+    description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF";
+    homepage = "https://flatassembler.net";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ orivej luc65r ];
+    platforms = with platforms; intersectLists (linux ++ darwin) x86;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11a8a1ccae33..4b3c546f8116 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8770,6 +8770,8 @@ in
   };
   fasm-bin = callPackage ../development/compilers/fasm/bin.nix { };
 
+  fasmg = callPackage ../development/compilers/fasmg { };
+
   flyctl = callPackage ../development/web/flyctl { };
 
   flutterPackages =

From 0dbd4c98a98b9c3b362792ef23d54732e3d8ae53 Mon Sep 17 00:00:00 2001
From: sevenfourk <sevenfourk@protonmail.ch>
Date: Wed, 25 Nov 2020 11:33:11 +0200
Subject: [PATCH 3594/3942] viber: 7.0.0.1035 -> 13.3.1.22

---
 .../networking/instant-messengers/viber/default.nix  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index e53b8c7391e8..24ce75dc7974 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -1,15 +1,16 @@
 {fetchurl, stdenv, dpkg, makeWrapper,
- alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap,
- libpulseaudio, libxml2, libxslt, libGLU, libGL, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
+ alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1,
+ harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt,
+ nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
 }:
 
 stdenv.mkDerivation {
   pname = "viber";
-  version = "7.0.0.1035";
+  version = "13.3.1.22";
 
   src = fetchurl {
     url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
-    sha256 = "06mp2wvqx4y6rd5gs2mh442qcykjrrvwnkhlpx0lara331i2p0lj";
+    sha256 = "0rs26x0lycavybn6k1hbb5kzms0zzcmxlrmi4g8k7vyafj6s8dqh";
   };
 
   buildInputs = [ dpkg makeWrapper ];
@@ -29,10 +30,11 @@ stdenv.mkDerivation {
       gst_all_1.gstreamer
       harfbuzz
       libcap
+      libGLU libGL
       libpulseaudio
+      libxkbcommon
       libxml2
       libxslt
-      libGLU libGL
       nspr
       nss
       openssl

From f6dfcaa3c8d077f366c06670de6692a1d2fdccf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 25 Nov 2020 12:22:39 +0100
Subject: [PATCH 3595/3942] mdds: mark broken on darwin

---
 pkgs/development/libraries/mdds/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index a65e6b2153d7..d45e37753071 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.com/mdds/mdds";
     description = "A collection of multi-dimensional data structure and indexing algorithm";
     platforms = platforms.all;
+    broken = stdenv.isDarwin;
     license = licenses.mit;
   };
 }

From ff2afaced1bfc3a98a5e0b05aec7407183121178 Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <sebastian.neubauer@amd.com>
Date: Wed, 25 Nov 2020 12:47:26 +0100
Subject: [PATCH 3596/3942] rgp: 1.8 -> 1.9

---
 pkgs/development/tools/rgp/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix
index 8c3da159d64e..8beeccfa2fd1 100644
--- a/pkgs/development/tools/rgp/default.nix
+++ b/pkgs/development/tools/rgp/default.nix
@@ -7,6 +7,7 @@
 , fontconfig
 , freetype
 , glib
+, libGLU
 , libglvnd
 , libX11
 , libxcb
@@ -18,15 +19,15 @@
 }:
 
 let
-  buildNum = "2020-09-11-26";
+  buildNum = "2020-11-19-376";
 in
 stdenv.mkDerivation rec {
   pname = "rgp";
-  version = "1.8";
+  version = "1.9";
 
   src = fetchurl {
-    url = "https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/download/v${lib.versions.majorMinor version}/RadeonDeveloperTools-${buildNum}.tgz";
-    sha256 = "1lpkh7sfpq697lm4xnkpjfchh8zpy49f4mb3c5qcn7brav5iqwfh";
+    url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz";
+    sha256 = "f71ibuMerd0SmXKSDjaTj7xtyy1dWzkZ5s0PlGtQ1+k=";
   };
 
   nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
     fontconfig
     freetype
     glib
+    libGLU
     libglvnd
     libX11
     libxcb
@@ -54,12 +56,10 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/opt/rgp $out/bin
     cp -r . $out/opt/rgp/
-    # Breaks autoPatchelfHook and has no known usage
-    rm $out/opt/rgp/AMDToolsDownloader
 
-    for prog in RadeonGPUProfiler RadeonDeveloperPanel RadeonDeveloperService RadeonDeveloperServiceCLI; do
+    for prog in RadeonDeveloperPanel RadeonDeveloperService RadeonDeveloperServiceCLI RadeonGPUAnalyzer RadeonGPUProfiler rga rtda; do
       # makeWrapper is needed so that executables are started from the opt
-      # directory, where qt.conf is
+      # directory, where qt.conf and other tools are
       makeWrapper \
         $out/opt/rgp/$prog \
         $out/bin/$prog
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A tool from AMD that allows for deep inspection of GPU workloads";
-    homepage = "https://gpuopen.com/gaming-product/radeon-gpu-profiler-rgp/";
+    homepage = "https://gpuopen.com/rgp/";
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ Flakebi ];

From 04b7c0aff7c28aaddaba28f54614946e8ac7c3b2 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Thu, 1 Oct 2020 21:48:08 +0700
Subject: [PATCH 3597/3942] knightos-genkfs: init at 1.3.2

---
 .../tools/knightos/genkfs/default.nix         | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/tools/knightos/genkfs/default.nix

diff --git a/pkgs/development/tools/knightos/genkfs/default.nix b/pkgs/development/tools/knightos/genkfs/default.nix
new file mode 100644
index 000000000000..b826c1a58b99
--- /dev/null
+++ b/pkgs/development/tools/knightos/genkfs/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, asciidoc }:
+
+stdenv.mkDerivation rec {
+  pname = "genkfs";
+  version = "1.3.2";
+
+  src = fetchFromGitHub {
+    owner = "KnightOS";
+    repo = "genkfs";
+    rev = version;
+    sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp";
+  };
+
+  nativeBuildInputs = [ asciidoc cmake ];
+
+  hardeningDisable = [ "format" ];
+
+  meta = with stdenv.lib; {
+    homepage    = "https://knightos.org/";
+    description = "Utility to write a KFS filesystem into a ROM file";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ siraben ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3b4ebdcb940..ffcd84b4d26b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9323,6 +9323,10 @@ in
 
   jwasm =  callPackage ../development/compilers/jwasm { };
 
+  knightos-genkfs = callPackage ../development/tools/knightos/genkfs {
+    asciidoc = asciidoc-full;
+  };
+
   knightos-kcc = callPackage ../development/tools/knightos/kcc { };
 
   knightos-kimg = callPackage ../development/tools/knightos/kimg {

From 88bc9aba99d010495a9f45be6ed161d106b1cb1a Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Wed, 25 Nov 2020 13:22:23 +0100
Subject: [PATCH 3598/3942] firefox-beta-bin: 81.0b4 -> 84.0b4

---
 .../browsers/firefox-bin/beta_sources.nix     | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 7548eb94fa6d..98cf28ec3e18 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "81.0b4";
+  version = "84.0b4";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ach/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ach/firefox-84.0b4.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "4b133dd14e8ce1b934e482c4f7f7b5ca4b58751181bed89f6573ba5994ebe644";
+      sha256 = "da9290899d245d86b3d2d378072af403106596ae1e02a36d40a93deea9e57000";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/af/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/af/firefox-84.0b4.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "8e50a0845eb058ee853fe40b13c88d764e721f7f8ac2eb54695049ab2a66e3e9";
+      sha256 = "28810946bde4c2335714c0f8b0dffad1a1650c167370e38c6eb5e2ee5d2e54be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/an/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/an/firefox-84.0b4.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "3edf8e157cac424b1cbfff019240877e7b7c3bf5ed1b576580569c155c5dd660";
+      sha256 = "d32e9e13b2c1f484686d9394f20a87e2c1d833703e0115de1f9c8c552d1e9d8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ar/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ar/firefox-84.0b4.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "b2167ff357963e3295eed2ed423a1c3bcf62d645329b8f4cf817ad3c0e101c97";
+      sha256 = "de8348caf98ca0551f3f080eb32ef94c00706676bc8df1723377d98f10221e56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ast/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ast/firefox-84.0b4.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "805a87a99a417ff4b762c01a9a2b88c7963f53a04fc19b42015db304b15f4bbe";
+      sha256 = "104cc96b0e14c030848be4bc07a1b2b836a241e9ddba581b9ca24018c54356ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/az/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/az/firefox-84.0b4.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "79c61c9515a683731649bcb5d36b26b95dd56165765e5a952339910310c9d259";
+      sha256 = "e96087b52f1dc18c8bd29d486faa00ad06a2165d1e14cbd47e37cafb40602a87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/be/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/be/firefox-84.0b4.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "318fece7d1ad734f6a19faa7003e060b1254b31bf62e59580c70a64c4a167ec6";
+      sha256 = "d67c2c1556b6859e0acae5b69b3b7eeac77b3bb1594b48682a97a72742c79d05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bg/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bg/firefox-84.0b4.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "55616606306dbd0933240d718fef8e83004fd65e4f53dd18f1601f09d0b94e92";
+      sha256 = "b3bad1b330a5d4c515b37cddb3e89e538c5cd66ffce68dbf8d1e9adaf4881431";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bn/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bn/firefox-84.0b4.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "c38fdef89f6aee7bf03362d2edfe4dcc665d540b1e1dc1dad8c53db20d70087d";
+      sha256 = "9c50c4e12061279133177ade4b22b7e2bb7e14dcc1875464f57efb7c7e360bf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/br/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/br/firefox-84.0b4.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "c5ac1c8e9dc2f4c5a1a2b6e33bf699a823a9422bce46922bc36222700a29d2e5";
+      sha256 = "79eb76af707b26fa4d46acf11d0be25ccd144abda6c853373c9ec0cc872c2a8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bs/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bs/firefox-84.0b4.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "a18718ef7f467ed87c76816fb6797165db3e06bc166c5e88b526c9f2ce5c1d19";
+      sha256 = "2cbf15a604f90c4a6212f5da251372d09e2247f5ed338193ff93a94695bca308";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca-valencia/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ca-valencia/firefox-84.0b4.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "fcfccd0714c965801ce468f6817bf37eb074064e6e0b616c81be7218a6b632fc";
+      sha256 = "a9b6cacf6ee8a6a1f733f3ff3741c1bb12eff823664279205906e8e59b646679";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ca/firefox-84.0b4.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "5f08a2b2d357d5a6828865913b9e28fe90bda7a8ce17a0ea60effb25b8441b7a";
+      sha256 = "1ea49a5d59129c820f359fbad2253e051adbb260cedd4b62bb20122562466bfd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cak/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cak/firefox-84.0b4.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "db41156b75e1148527c51b915e3d9367d1c36a8d24a52132d1cc9cfe63bd9db6";
+      sha256 = "b18651df9ae2e16ea9855c30fa393dd34103cf338a515d41d3c1802e52fb92a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cs/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cs/firefox-84.0b4.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "d3287f28964581e63a3b1a5484e47e8ef33c136b39f13e07d6f3d555c27864cb";
+      sha256 = "4dca051e5349372d6caf5a7f6e8e6e12fe42bf96110a1c6e2f7f6e408f365b80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cy/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cy/firefox-84.0b4.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "f41fd34cf1cc72d5fc80113cdc9fae7f03f434e45e990e17a94dd68463464c49";
+      sha256 = "3117d47bcec1cf0f5a547a33c62ca5ecfee34435c13a478f23d1d9f0ac187f4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/da/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/da/firefox-84.0b4.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "dbbf1611913315ac5294f400c727cd5afbc832efbea56bd839b77cd4d6a5b823";
+      sha256 = "34a38c76997bdd41e6b12cebf08345e7cd19838bd92f5a8d082ba3087cb063c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/de/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/de/firefox-84.0b4.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "1047799de5b42b5cb0827371872b7e85b93a4474bde9288da54a573841e156bd";
+      sha256 = "65e417603cf383d92058b8976c1f6499dc5804d02a22bb639e416c4e730b4a62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/dsb/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/dsb/firefox-84.0b4.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "602eaa32d32db35d6a6d07f1c0cc53eaa4e432b7ab81d1f23b47d3125ac98d24";
+      sha256 = "08dacb91773d7b49eb8f08668627badae2967193c441ff2fb6b9d88063c5ffb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/el/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/el/firefox-84.0b4.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "8a460f9542e213b1605265c6497742e7d55213ac91b42d00a15b3123b47754ef";
+      sha256 = "78e870b673c204e4d9fca2a3fbab06031c724a8b0696a3b6e2dea5ac07a5bb88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-CA/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-CA/firefox-84.0b4.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "9bcc44ca3f4192a2a7a001f27db6884dd481551663b6d0c348ed0b9281dabe87";
+      sha256 = "4c862eb5c53e65af1ddc212a093eb23e33653341fa7db53d935ed8482637aed8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-GB/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-GB/firefox-84.0b4.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "9d241d56362ec52619ce02cdd2f11dc90c2e0f7c515c707ea56eca2e8f0eb306";
+      sha256 = "f505cf16328603d0164e330fcef60fcfeccdad186d1f91e0b4cee1b8cc7c740d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-US/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-US/firefox-84.0b4.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "28972b08f8b3f2d19f5d50a2c9275fc459fc3e57df11c884149d1fdb9d99300b";
+      sha256 = "f0561469f04ab83dd52ae4e3a8ca451d6569845e37d9e04c5a91085654661f8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eo/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/eo/firefox-84.0b4.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "013caa4590462b4bc5dc09cb963cfd85cba4b5419111cdc87316574ca5691e80";
+      sha256 = "c64d227d6b21876ea48182795d6fd8ec3ca486e5328629a0bbfb936e8463b0a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-AR/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-AR/firefox-84.0b4.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "d6970ccf4d58e2f1219cb0d43a8788084d0863f0f349ab3292e182fb0201e860";
+      sha256 = "73b45f6b8d1e53bef003b3e77cc1217b8a85dde49cb0900b4fa2991895e5c184";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-CL/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-CL/firefox-84.0b4.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "76fb3c865b3efa1da1d34c8caa7b56b5b6d0af2cbbaeaef873fa96d2b8c93bb1";
+      sha256 = "e7025e4c5fc311aae2798da99ec5e5863bca5ad8b8460981cef86e29ae37d74a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-ES/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-ES/firefox-84.0b4.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "7b41a2b297df4f0f6d4f44e1eb0ea0cbf02454382d0994f119a77876c578c4b6";
+      sha256 = "e819644eb6337255004fda8286e1f2ed898423c4b97694c8355c28f4d449da61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-MX/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-MX/firefox-84.0b4.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "733b90640a30df66700397ab0cc2045fcbc25af94ef9f36463a191228b511b77";
+      sha256 = "07de091ca3b06b94e35b84add7fbc5c8fa6ea84ddfe548e5f55b3bc7980a9bd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/et/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/et/firefox-84.0b4.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "027286d744b1d9f21157d8242445ccd7610a08d8d541d64635fc16549aac1b4d";
+      sha256 = "d6af9ab39f1a13efc772cbb63dd731dcf988c10f13649f348d7ddb3f6ab6ca60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eu/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/eu/firefox-84.0b4.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "ff555da3aaf1abb2c384772b309fb4129dad57b9fd523fcabef5b2743d3063ce";
+      sha256 = "110e667568429dd2b0c752962e1148884c44aaef9939926c6b0f49ba5bdb1182";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fa/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fa/firefox-84.0b4.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "c99f9297568f93eda17058d96dfaf83e587907be9b5005e8f649f693662e4fb6";
+      sha256 = "f7a783f12bb08ccb06074f903bb2eaaab13b348c6a2950a9699beee28ad97b5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ff/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ff/firefox-84.0b4.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "91658b195a622afa3c6fde535391eff1aa6b70f4c0cccc5c55e56e6d66459435";
+      sha256 = "b2e47bc8ae8d1e54a1b5799a87b4742d049696edd9913f0cc6beb52a89cc261d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fi/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fi/firefox-84.0b4.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "cbc70d2051c96813ab081251c339f6cacd29ff26bdd8174b35caf9905a874635";
+      sha256 = "f5ee09f1b9d41506ad1023ad05dbdee95ac049eb4bfd38dd99c06cf682e111a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fr/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fr/firefox-84.0b4.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "51890621c8c3c0e40103a10e705adbc860937e5dbbb8a3984eb71a5cae3ed63b";
+      sha256 = "f8c33819a6ceab041bed80f1663d94a80ee3bdb6e859eab1eb8ec9d0b67f4222";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fy-NL/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fy-NL/firefox-84.0b4.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "5c3a982a51951901732ec7684514be233fe1c44780531fb38f7205724c241387";
+      sha256 = "6ed233042e570e9a04ecc1e25f6211deb7685c117db75f32a541076d95d1cebf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ga-IE/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ga-IE/firefox-84.0b4.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "04b5d338c7557f12fc6fb2206d444a8a00be6814b1ca26de4923449a4425b57d";
+      sha256 = "b28337429a0c1d26653fda1d93b59ea0383061a253be5b763442166fdb21bbca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gd/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gd/firefox-84.0b4.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "6bc0de0ac627203b1ba035f7a7ba7dd19bd82a7730c526c217150cc5de668fd4";
+      sha256 = "546bf2f1a4a8a643b161554bc92e771644ff9ae46c6b10fb2a60b920a2454f44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gl/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gl/firefox-84.0b4.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "37522d032422af770e37a93e33de6c0b8b79b2d22c6e71f32107cc8808de4d35";
+      sha256 = "cfc32d3e7e3ba5379895a8b348d9399bd3962a819d0677f14a365f6e0c314676";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gn/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gn/firefox-84.0b4.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "f761db975c72d7e419601988c0674acc7fe17227d5569cac85a1fe2d91f5141c";
+      sha256 = "b2b5e826540d3f9b52d67e092fa755b26a34ea9acd0cb1c69eb6f0bc332354d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gu-IN/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gu-IN/firefox-84.0b4.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "8565c1965e09060ddc5b253fa126998f827d17dd58692ec4d17d194d29a464a5";
+      sha256 = "497b8a954ed2c9fa13e207462730dd39d2d0de10a38e3762dac3ef1fbd36282c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/he/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/he/firefox-84.0b4.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "c3cc5911103ce955f89c5104ceb1ee50f7c047e4ec761681c8693b643f5d91a8";
+      sha256 = "8cdac2e9d2cf10171f2744727ddd80e21a4d46e2082947e49f4a255f174db968";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hi-IN/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hi-IN/firefox-84.0b4.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "95463325675e56e700eaffb6e6690f4b398adb5cb77aaa34b87e16cb142f3533";
+      sha256 = "d37c55e60329220de3d792894d7b801adf7dc7ab8ff4ab39bd2e24b59443b973";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hr/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hr/firefox-84.0b4.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "6332ae812507f79baaed24e4fb79fc6c383418c4c9d41c0f3dbebc2fb72efef5";
+      sha256 = "bebb6709dd3be119be45d9fdb0bac41b81514d78a384a221e2ffbb51b46dbea8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hsb/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hsb/firefox-84.0b4.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "b18a7d31d3ce7373bcbd6bb7ff56adc023c58097126781d5f915828be8fef92b";
+      sha256 = "c43aea7fdd8a57653d6d9af4aa7c0be6e860f5292366ddd91c5860dfde2ee1bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hu/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hu/firefox-84.0b4.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "b1e4c6c9c21b2593f3fa111820a7e6a2e2e72e8b3065738f6a50df6ef4b7f18b";
+      sha256 = "71e6b509dd3a6937d9851c262fc7a1bc9e551cbe0515089586fc22098bc51151";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hy-AM/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hy-AM/firefox-84.0b4.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "562f4d9e094b688cb53860834e425997e65b78222724c48ff4ddd71ccca264fe";
+      sha256 = "c92eaf9f6bfa97651075d2342e45b988ae89c1a4cb55559dad71bfae5912ee83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ia/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ia/firefox-84.0b4.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "87299a8aeee6da57666a06cc2d4f479b0c74c220e2b22ddf5254a052f11edacd";
+      sha256 = "3c71aafb7dddcd3f9bcc8e169281614ac1087400d1d0ba02afb18c68b1914128";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/id/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/id/firefox-84.0b4.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "0cf1bae8def307d08e4c24fb44f7cfbebf150f1edfde2a3c0855a69775f26539";
+      sha256 = "8075ef0b1d7eb2fc6141262cbb0d3831c3d8508eb43d3e9e142d96946ed2036d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/is/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/is/firefox-84.0b4.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "6140d270e99173d995e42d32c0b696a51f72b1c6baa746549bdbbe7e2a08a811";
+      sha256 = "5ef96d77bea5c94e7147a5657d76eb5c7f206208a0464245242cca3fc7fb79f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/it/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/it/firefox-84.0b4.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "3583cf0223528929141879c085278354927ced41d71321fe8d832ebd356d4614";
+      sha256 = "eb76a1f3bd1ac065772d4ea4a435c53b5f7b1d5b643c7b62b7ccfee205ea4e81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ja/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ja/firefox-84.0b4.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "4a1bcf87b3cd09d7c3379bd922ede7a3c6c4a19bf11596e858634b408df95cad";
+      sha256 = "80b644648b9e40ed592ab9ea2b9d7f1e2abcf8d6b0f925aa57cd6cf28d53dcf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ka/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ka/firefox-84.0b4.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "320567daf4e4bb12c7209aff34d98efdbb2dead9b34f23d4a2181d2cdddeed71";
+      sha256 = "03c34e7b08a8b6140e612739118c35b05dcdef1257b4857d2fda87a1cf8852ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kab/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kab/firefox-84.0b4.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "5b9d60703b494a4eb5956e59bc2d6893bc70e8b890d0c940f25d25b605000c89";
+      sha256 = "419a4758cf2e2e24968f4da384dbfb03ef8398713c6070ab29ce379772168f18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kk/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kk/firefox-84.0b4.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "45580e0c3cbb265f718a69ac9de7220d3d89e52e3b8a5cfceb7363c20e63c83e";
+      sha256 = "cfe96420e125dd12c9a9e79e45a8d7ee260d1957abddab5ed887afd1a1e3f499";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/km/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/km/firefox-84.0b4.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "24b4879f22829a2a5d72219cba2c5658bf7c7e73ffdc9640f6e897ec613733c7";
+      sha256 = "4b3599a9b30132b6105e4bbda7de370e54e21d8e498bb3c4c3d9807282fbf246";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kn/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kn/firefox-84.0b4.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "905ed3fa762c73c5ba677b8ca5b620294cb1ad36dea2ac53fdfca5a739c0c0e6";
+      sha256 = "5da3ddc9d9824e3ba59e1cdc89ee3fb8900c661faec1f539c829d0917be5d4d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ko/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ko/firefox-84.0b4.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "a6a63ca4106ee9c710331ea50099e2a50842465095d38ea55a63dcb3ee3d80ad";
+      sha256 = "2db9a494693091832e578959144d172d5135b82bbf44c041949da8ffec2de9dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lij/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lij/firefox-84.0b4.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "b6fa42dc9bc68d4b71ae93eebfb1a19416f0cdd06d20fb344c0c0347aa2d4862";
+      sha256 = "2219d5235f0ed9d2015ead5782976727d2b7103afd987eb445f3f274856e6af6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lt/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lt/firefox-84.0b4.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "c70f6e7c20e252fdef6bf136c99095ebc27672719594df302e58be801a3f06d3";
+      sha256 = "a335e0d835bcc7ae9563bb3efe6b926ad71e08f3ccbd164aa2b9f257acd1341d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lv/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lv/firefox-84.0b4.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "c64d561be20fc8f0e7507a0b1dc2e5d79af407531a37cc7da3fd880789899fdb";
+      sha256 = "1f89f8f2715254ef335af9b01ca1503caecb1c93b1a900ee1643c3f9e00c6821";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mk/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/mk/firefox-84.0b4.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "aa38b13c6bc5288ab491f5ccee3a881474b1f42f1bd959435035782d1c39f407";
+      sha256 = "86eb9f1e8189ce45c03925337a90f1b204dbdc902c1c4a817a924410a26b0048";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mr/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/mr/firefox-84.0b4.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "e56eea60ca1cd447e30cccc82ce7a4797fa23e9bb4871a5e20e05d44ac35f720";
+      sha256 = "d5214647403f85c5f7a95871e8d6fb4d4c448af92e6475841fd8474857f21067";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ms/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ms/firefox-84.0b4.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "9d8445e2bda6a8cc8714a0eaf82e1b9ec03fbd94042c3557f07d9c8b25bc4b6f";
+      sha256 = "23af07562748448a35242a6cd77bce25a5576d2b71177fb682da58adb21671e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/my/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/my/firefox-84.0b4.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "4a7527e5e3e6ea0181cc8b9a2f206bbe162a4e1867faa75b4af261f08e89ae0d";
+      sha256 = "bfec2f3ad0853fb36ec4aac9ad97ba14d30a275eff2582c2e9df600b5940c004";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nb-NO/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nb-NO/firefox-84.0b4.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "c2ae9f5fb235541cc69cc3c4307dd4b7de51a9f4b6e038ef3091a773edec6c5a";
+      sha256 = "32be6fe8aa661f6098b4600d824846738664f254ecd4ab0d0a1e705b28a94e74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ne-NP/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ne-NP/firefox-84.0b4.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "05acc175b06ab7f5861a3a7e58e9a92c40e0660224426fc8225fba6c25888726";
+      sha256 = "dfa3e6b9f31fa716a2c80fda07c24717a526ef96033b5b1861fcdad43c99b29e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nl/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nl/firefox-84.0b4.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "640be4e631343c9f2a55c24a4d5c63908627e9ab2d39a5346d1842d8e4a57799";
+      sha256 = "e253d963b66855c44f41c43baba1b5c952b37dd1b83aac8243c60581ca674a49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nn-NO/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nn-NO/firefox-84.0b4.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "46a898f41e5c3c9853b05fda8f44be01b2fd5a7fe3dad281c21588c2deaaedce";
+      sha256 = "5d9b90cdee03a544a78f44d4f0566b5b59ae802af4fa60367a1a4836c01197f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/oc/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/oc/firefox-84.0b4.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "7481c8bad2e905a033f09ec4c20f8d4b184a0f90fce1c10648c4fc57a7a5f301";
+      sha256 = "b37f9a283d9dd2ff9e8998d83e0c147bfbb75e4b64b3936cb344243e1277c370";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pa-IN/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pa-IN/firefox-84.0b4.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "a460ed0241c569e1ac62727b17f8c8d0d4091e794900e2e2be7d8d8e2b90ada4";
+      sha256 = "68f6bae2e6f064e22503145b5fd57d027899f23fcf109010a98397dd8c0d7cf6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pl/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pl/firefox-84.0b4.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "d82e300cc8be61ddc2aa66bd4d4ec35cd18e47603bd19530cf48728c5fe67a5c";
+      sha256 = "789d6925c3b17f96bb92eef54c05fc8787f32ce2c9846931e185dc5a1de9f303";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-BR/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pt-BR/firefox-84.0b4.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "1ee1560d4597adbd230fb0c556a4d8fa6984ee86bb731f7a5a936d660897eb99";
+      sha256 = "329eecf74dc8d9d1d8f4578389553d92a368c972fcb2468e0b936f21508bd1bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-PT/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pt-PT/firefox-84.0b4.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "be7e484f8c3f4d8b7b894a437b70b2f4b448e3a7df518ce6906295df9be7749d";
+      sha256 = "b30ba75dbd5f5ff3ff709722acdf36acf4de9993d230eb27996e81406779dd0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/rm/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/rm/firefox-84.0b4.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "819cf6a13d1690dee4e4255aa0c3f551411e2b7076f8ce3447bba47f07c806db";
+      sha256 = "ad90ce4fbcd094bebf77b36a63e38326c613bffb580743c9a4c19df845907dfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ro/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ro/firefox-84.0b4.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "2baa8154f358962983c7e0b26c4a7cc8cf97587b646884527fafe46f5d8d92ae";
+      sha256 = "8f7864bc6577724f20829ad79901d92775200860dd8c43bb2443c7bf22d7a435";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ru/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ru/firefox-84.0b4.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "eaaa5338ff8ffbc9bad5321ee3eb7410feb9a26a06d3cc49707c0a048f4412e2";
+      sha256 = "8b52d5eaee53805422bb2fd6dd8b2e0c7a5b01feccbc6fb6c77e4fb8678d30a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/si/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/si/firefox-84.0b4.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "ce04721a96cea62eb7011c261f740e9e0ad6288ad9ff231538c3a6df86fb40ae";
+      sha256 = "a71df756e97f58271715f3d79a86c0407487dd5820500127cbd9373361bd016f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sk/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sk/firefox-84.0b4.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "4b19fef341d64f94ad97a0bb8821693b00e4e7e04454156f92f0c82f4fee0005";
+      sha256 = "71eefff1538a2978d9e4e65fdd5a2322ad81ddfee33464c0d70b95eda1649fda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sl/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sl/firefox-84.0b4.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "96192922f2012a3e6be634c7ed09017cebf9498c6fc2862336bfddbc4ea40840";
+      sha256 = "91b2938be8230b6301fe3d15c6d9ba3f031c1e5fca886da228f47a2e0a2cd144";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/son/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/son/firefox-84.0b4.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "dfb144edeb3712bc0a3bf7e0675de80315c78bea7d7c6ee5f6047c077acbddf9";
+      sha256 = "57e456cd14418c41c2e5f8eb0ec6b0807459f41e15207f6997c7742fd3dc8a1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sq/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sq/firefox-84.0b4.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "54dfab9e843dcde43cf188ae33922371fb90c1bfda53ef629df16576d6a0bac2";
+      sha256 = "0f343e2442523f0e422309cc36518484a242db4116f0e6b7dcfe251cdfea76cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sr/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sr/firefox-84.0b4.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "f00b5184ccb47223858128aa26481867fb33aa50a914a8c807235c9a2bdf74fa";
+      sha256 = "cf8fb723611506fff356cabd91a0ca3fdd9cc5d806167df6dd385438d467eeff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sv-SE/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sv-SE/firefox-84.0b4.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "d3884cf4a9ff23971badfb1a794c9489e0006e6851a0e501e290d8793054cc1e";
+      sha256 = "258020bbc7a75139fee340e50d41676d234be19c931f0228485f06fcab2eef81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ta/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ta/firefox-84.0b4.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "53584d2093feffd36a8a5249ee438b82d21af834a3c2c210944030c127b91cb2";
+      sha256 = "7783166c0f9ceed0f7d037c1e92b988818a70522945af2c96db958966eed8b66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/te/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/te/firefox-84.0b4.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "63b65440720bc492fc95d080b191ba452cc87c8501b195e02df66ea4487fb902";
+      sha256 = "02662946b3506da6432c48eb1c7e0f522ffaed2abcfcc474332a799ef3be2b92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/th/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/th/firefox-84.0b4.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "3b01fff09734f2206e4aee227ee7f0c13544fb1635f92a5221ee356117955446";
+      sha256 = "1592b372b8e767e5b7369f356fb733a2daf51b4f45c8c4c94041845d63b3c604";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tl/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/tl/firefox-84.0b4.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "00f1c65baf63246a9ff44d98171a6ceec6e276488f5d6fbdf6f97760509b3bc7";
+      sha256 = "2b831feaae729c674e8a9ee207dea007df100bbbd8cf7553791aee3eede37224";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tr/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/tr/firefox-84.0b4.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "064d6c6036fae215fcb50a87863e6808bd1626084d9144a18f7ea1f4c7072093";
+      sha256 = "aedf8b7684f204109e42a3797ba00bd7a8c5bd3f827c31ea3fd4eea1679d8af5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/trs/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/trs/firefox-84.0b4.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "73c892e0b0ab0bcdbcf6af88fdc8de335bcd5c56805675ba7b487ed3b620ed22";
+      sha256 = "232cae54f6120a47455fdd7e0d88dde1f64d5a1931bcd7d54f6bf8bd376583e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uk/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/uk/firefox-84.0b4.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "8ac48524702e3f177e78fe97e4fcf528752a3ea0ef08e9212037dbd0febea53e";
+      sha256 = "e00de7cbe1f00aa082f9a448857cc19f011bb1d5b579e79457bb0dfc72b7a12d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ur/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ur/firefox-84.0b4.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "154dd642021769aa67a081080f33d87d736686b9e6e46cdfa2bd2201605bda26";
+      sha256 = "7ece4d8af476eef174c0c175b65841da8d826702fb255587c2e1d259bb9ef3ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uz/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/uz/firefox-84.0b4.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "dd36910596d777f49de3dfe8e22f2838b76081cb259107047b9a98c3445c01eb";
+      sha256 = "09c7e7d641f703404aa7927860f2924e6be376b2e39b1f0fe012dc87469edb62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/vi/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/vi/firefox-84.0b4.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "3cef9f657f83bbfc68ab4a7c8ab84e1e937553cca98cfc30d3fbbec5c8be7907";
+      sha256 = "18121867e6b8c2a52c5324f653f82afbae97481b5ac3df811e881ec39bbb3b0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/xh/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/xh/firefox-84.0b4.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "30a98fa9218cbb07d792629e73a250659b321a3555eedca0a68e6ffb1d5191a7";
+      sha256 = "04f5bb96ef9002eeb0869236f70168e7cbd7842b8e12b66dd6d5d67db9acd28a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-CN/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/zh-CN/firefox-84.0b4.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "bf15e819d84a3cd3825df2046bd9ffc139008f45fdbbdc64e04cec6a549af3e4";
+      sha256 = "142286cf9136bcb9b6af7ea1df3cf77821c0793ab7b9fe533a2963c453f45a7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-TW/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/zh-TW/firefox-84.0b4.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "b194749cb05fe282f59f2f6621a5d04fba42406d7a3ea71242b667fe94a5a857";
+      sha256 = "fef32e5817140bbcb6d1b614a72a29523235606192078eb04420ff7a2453cb9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ach/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ach/firefox-84.0b4.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "203ca1a13f76935935daf2124c662329df93af0e44b4bcee7334ff60092c8027";
+      sha256 = "40e9b7a738e06cec731c69b659b14ca48b119ae20016e0214e1160edf03919b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/af/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/af/firefox-84.0b4.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "481d233552b0702a8b8092748b4c71da3c14c8df5e971c5b4662273cd8808022";
+      sha256 = "9bb05361a51f836b2de5614127f8df768e504f4d5bc136e3f169741098f0bcbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/an/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/an/firefox-84.0b4.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "a128b96a34eea409a8b5fa412e6a1a36bcc28f2fbed40ba9b474b9d86d23dbae";
+      sha256 = "ee62418444c76b709204962ed47af8ef3d61b80e628600201b5a12293651c70d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ar/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ar/firefox-84.0b4.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "a2ab8b556b6b477bb1aa287f630e7ae6aa902fd1b75968c01c2e2c76fe9cdf09";
+      sha256 = "10b5d4f1616e078bf83ab5ff942dabe89a8eaca63f24e96b53726dfb2bc9e36b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ast/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ast/firefox-84.0b4.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "193422cbafcaf5ed58f334a9d5b30f9a6181aa1cb649303df18626d9a3484088";
+      sha256 = "a4e5ccae125edaa0696b696a5342320707f0c39c8985437b6aed60faede71de0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/az/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/az/firefox-84.0b4.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "c206f5351f0ba474a5277e223514f032c7ff0b66029f570143f2d1d2b8ccf566";
+      sha256 = "c13d9ed183c7b9256801708014f38405749cdfcead9f243e80eef78d06a9b78e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/be/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/be/firefox-84.0b4.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "c3d7d04ea43230b6a6e4227b799d47348bc5c2ab6a60e93f4107efa6e7b34ef3";
+      sha256 = "57d8eafc3d45784dbad71eb49d5a4c0483d939719b43b0f16e4db1d5a96ff4a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bg/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bg/firefox-84.0b4.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "08edf0db8aebd41f25366ef4302214b4ef00540be39406fc780eec288b0de324";
+      sha256 = "0a65ad71cc9d97277535f07a8dbc7ca248508c24dea8520f92fecbb806f87a31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bn/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bn/firefox-84.0b4.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "a6d5dd5918d94e74ee8ffeb10c4caba65697ecdb81598b0bda815fa5d4830a78";
+      sha256 = "3cead08f4d746def6cfb909107f4739400498c970f10fbd542259c04b84b5852";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/br/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/br/firefox-84.0b4.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "4e7ffbc380b6f8716399ee9d7b9ffc5fcdcae72f48b63ae4bcd2011a85efa0b1";
+      sha256 = "40c6e963e8e52ef51cd4d4e63d501f2a6cecec1800541941458b896ad90e5b93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bs/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bs/firefox-84.0b4.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "ef36dae13dc3c943e5981a16d7ca61b4c6daa9a4873d2cd87022fbbcd01c8907";
+      sha256 = "1e9df53642c442ead4318b0cc886653fdfcecf5275d6e7218acb390bb13e0021";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca-valencia/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ca-valencia/firefox-84.0b4.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "584a0370f79011dd2691461acd573133348a94cc1323d6fb99dea9dd6df1e155";
+      sha256 = "3b5699dad93291921979fc6da21d16f94ef471e9a8ef3d877001400ba4abe316";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ca/firefox-84.0b4.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "e280fe05f4e9320fd354407811ea8664d50de3810298e5eb4922b2d3e549ad11";
+      sha256 = "c52b9cc25dc72eeb6ef3e7c3add4066c005399afdba2cd0964e695a891a1d314";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cak/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cak/firefox-84.0b4.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "3decca8b5b0d44db169abfa20f07b3c109bbea0a68ae3e44a35f97e3b989324b";
+      sha256 = "355df19615fddd85c51b033a413a3de524f19fb2d97a2ba77f3b8001b231338f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cs/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cs/firefox-84.0b4.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "efccc2a43f961179f61eb7858b1e17ffd069bf7a26027faaad09f1b529ade52c";
+      sha256 = "e10f35795f19ea10c4de34687eacad6f9bd863002e9d66b87cbace01b97c8628";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cy/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cy/firefox-84.0b4.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "dc8a1945d0230070e2bdf65b673a9aecc4868c9821f7f1e2f6e0d18bb98c912d";
+      sha256 = "f2fd90b19e8c4ac98bd6ee262084ef7842e52a304abe10cfcda2fc14ccb5ce30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/da/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/da/firefox-84.0b4.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "058b800e2c9fc464f2a75fa48542269056a88916b9474a953f0d29a3e9041257";
+      sha256 = "01e468f3a445276aea85425b4b8a58e44a2e4cf8552a02aa3d4d31775bff9575";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/de/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/de/firefox-84.0b4.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "7fbd0b27073b2c46829fc0d631ed11fd9a38a07d0ce474f6837ad1f5c2adff62";
+      sha256 = "9dd3d806a4ff60c9cfd5b81cdf212f72c281f75ce554555cfd443f0696f700d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/dsb/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/dsb/firefox-84.0b4.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "d0b6083098d416366040a877a92b163d469e2764af995c65fced49de23148624";
+      sha256 = "eb26cbad496bc1c4f97e6027a1f2cd9166d479a503a3f0ac566a766c86bdf8b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/el/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/el/firefox-84.0b4.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "104258b0e47b661d7c75c72f5a0d7750399a101a9996a3f8837f0f524e9820db";
+      sha256 = "e173622f06f64156d749d0f56d98be72f067077c3e41090aa16a3b0c6d7a5e43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-CA/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-CA/firefox-84.0b4.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "be6750a6946b7ef58869d0c9f0412febffcbe4955c823a573d02822f9a14266e";
+      sha256 = "c1c6aa503e1565cb0c0239d562f11322265a7bce4005211b8007579f8f56c318";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-GB/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-GB/firefox-84.0b4.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "e6d2c60c30aa90b6026cb85d6fc3a1d1b7266263980df652c9a1c158528cfc74";
+      sha256 = "57b2670f515e2a17c10df602d93a6960e5c4710462098d89568efd446e4480e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-US/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-US/firefox-84.0b4.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "be534d43126a7fdd297f3431b579495b6f22832a358a0c793a23bea8adce1c9d";
+      sha256 = "81cf4a4fe610de3342bdea340d450ff67c594e7e4924a08b6b69de75510da698";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eo/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/eo/firefox-84.0b4.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "6ffe84994fe7db178e59ea667495e95e6fba621cd0e4ec812d94dc3d98cf0a3e";
+      sha256 = "dd61c4bacfe39f7887c6d21d139df6a2df17f263c4be5689f5f9dd6bb4ee6e63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-AR/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-AR/firefox-84.0b4.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "982874a48791db0bc98559de45bb8884da93ee0a0738664c73ae5a08b3b1a2ef";
+      sha256 = "3ae8695c57befa3552033bcb867b48f9ba491a08e31168ba22901fcb3276a3af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-CL/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-CL/firefox-84.0b4.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "c21fcdeacdf570a9f8bba9c34c64a60776aa8a4de56b5f773b1d26eca6d65b70";
+      sha256 = "5ae14208cdbf0dd50edecb8a56bfe7dba0e7520f2ef135abb092761acc8630ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-ES/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-ES/firefox-84.0b4.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "bb34dda74d59c862ab24ad9ff0c5ad1e1fb5d73e6029b915f966d0913cf4506a";
+      sha256 = "d786cf3b623a05e5156b020a436897525e80117ab7fa9f25ca42fca9fb4c0eba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-MX/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-MX/firefox-84.0b4.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "53686263f77643ad4f769faac81697c7e1eca216ed0a7b051c2318b181318d7b";
+      sha256 = "c2ec749bb5befffd81189503d87a57bda462897bba858904924ae999923a4e42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/et/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/et/firefox-84.0b4.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "053d8ad6cf01be9f51cd133090e99230dfe797effc749e14c8a21ba712546776";
+      sha256 = "7a2e1078ff1a3bb975baa5488f89e8161e20354d7f55b98c964efa5bfce6f696";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eu/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/eu/firefox-84.0b4.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "77774b9126ccbca2b5716b1701f8eb7933ee67ec5437a00b8ab991f423888a80";
+      sha256 = "c635006a367f68bfabad7a3874f3333ac3f486f0001ca9641ac8ce12dd9bd01e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fa/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fa/firefox-84.0b4.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "4a0554bff8c11ca39f1de223537d595d298e6f61c2590543151e8ab1d8eca36e";
+      sha256 = "f897a5d316c436fc20d8c2737902e29dfd0ece3c9ffdb90fda2fa454ad398257";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ff/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ff/firefox-84.0b4.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "272784bfa53ddc48fa43590b3ebd2fce808786b4649efa1d5b417488efbb8911";
+      sha256 = "3a31d43cb5242a0aec516d8fe99dc916144e8b7250b81c7de0b1361b19f067fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fi/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fi/firefox-84.0b4.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "c389eb80f3cdd215549c7ce55402a7c03544eca2fa3c2074842af32755d14cac";
+      sha256 = "50261499bd4725f08684c9042056c9da2029f55b0dee4a856a9de661412c06e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fr/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fr/firefox-84.0b4.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "dc5a79229fbdd3e9fada6b6bbb35183c17a703b9c3f29d9172f2b56cd5c0d289";
+      sha256 = "7b793590a975a64b6fcfcccb4e6c07cd5346ec457af1ae31b5fb1032d4217c64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fy-NL/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fy-NL/firefox-84.0b4.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "3eb69867818f0a8448e4f421f0ded4ad1a172bd5c99048065bd4b6cf83e8b25c";
+      sha256 = "468c7463503a34de44a74ff6a751e8614abbe6bd23f39f50308f23000614331e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ga-IE/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ga-IE/firefox-84.0b4.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "b09208ca65279e393f512a04712f91b2b170ca6e32777479acb7a03db89e87dd";
+      sha256 = "92b49316d122c8c91995766e28387d5587955e022f844c7a85fe491ca602e222";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gd/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gd/firefox-84.0b4.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "011beadfc3e78ff216a13d55a9b54471ebf84bb1be852aa986ab5ba1648836f4";
+      sha256 = "4bd2901b705f99bd1889b21f4af9ba7dd022f608960807f96f115a110c96a80a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gl/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gl/firefox-84.0b4.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "c492314ad418a190484fce335d1dc5a28a515f630c59b1cf2d7e812b6d3c3bf4";
+      sha256 = "391d62de840d53d531130fef0018c71add0ef7134fbc758eb869da7c1cc3b5f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gn/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gn/firefox-84.0b4.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "25b03d5251a69631f5d0cbf9dd89d1ce1dd5355e05efcc233bcf62e5311d4d01";
+      sha256 = "d51f75a7718e78bfb1e9d0974db0a404294e577e186794d3480778c7facce418";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gu-IN/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gu-IN/firefox-84.0b4.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "1cc9a3b933b625a26beeb7c31eb062e22ff8dc98c4860bf6ef4aef5567552d63";
+      sha256 = "7cbbf4846153f79fc72e217872fd64b92ed8968aaf618eeededa375ac268a12e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/he/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/he/firefox-84.0b4.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "027cd01f51db3b4d27381870ddf95ca2f7252bf7c6588c3d073d303bebb45311";
+      sha256 = "44c0bfad535a4e3c225d948d87935e08e5d77ea22638e971cc833877462edc32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hi-IN/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hi-IN/firefox-84.0b4.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "99d6d2159ae34ce2154678e4913145ccb9c96572ef19a18db6a223647b7ec68e";
+      sha256 = "fc64673429972967238b5bb101beb2117cfdb0360e405d4d3b53f013791c0b8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hr/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hr/firefox-84.0b4.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "d9b2fbc6474bac73fe7fb5c4eb818f5dc0d74cbbd52c3aacbed0f17db8bce9eb";
+      sha256 = "f256eb4e655a14b1a084af7f72ef4673d33b42d1c23ffc1ff3b4ede42d966246";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hsb/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hsb/firefox-84.0b4.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "dcd0c254c542a50807cbf1d0036a4cab5463c237318fb1d1fec9826d052aef62";
+      sha256 = "9e1e478e501875ac259e22287aece77f1bbc1f898355ab1c29fa26543b38acbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hu/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hu/firefox-84.0b4.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "5a0a94eeb9c8d219b3e34e92fc51163e190c606f975735215177d521b7ed9656";
+      sha256 = "e8605e1b9d2c92c2eafa35cbe647bdda6af22eb030d8656262473b0b17650de9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hy-AM/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hy-AM/firefox-84.0b4.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "2ff26ab884697d226bcfe224ff5c068aed355f6bb00777fa6d9f3bd0b9f9b386";
+      sha256 = "be21fea69e27ce54498b6b003c1db20b42d7d52702ac56d1a1fc2c6fc24558f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ia/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ia/firefox-84.0b4.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "7bd9d940f81d76984886463cc10920896247084f91efedf99f787601a47abba6";
+      sha256 = "039f50fc10d95bdef4468174a8486f45bbf9313e1b9b6cecb0d094bb3766ca9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/id/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/id/firefox-84.0b4.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "c415b55ec7701219557cc4815ec0975d86f18312a2ef6a8abf3e82876edc5045";
+      sha256 = "ecd6f3e031529e1fed8fb7ae77bf6e0497c9ad0e4996e31a86c4b79489ba9811";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/is/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/is/firefox-84.0b4.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "3ee6e83bd9c244b123c1a1989fbcc0524c4101fefe697ea0a9ab7c6a05302ac5";
+      sha256 = "1f6fbf55f1384141826a4b6a39ec617cc798b0c0a0e1ee02d6cd65a79d6784a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/it/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/it/firefox-84.0b4.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "de141769375ff5da94ee1030f5af84b309917eeea48cde769419004ca5a015c6";
+      sha256 = "73eebb1d351b5d746d3447c7a68d7a906c4db6df8cd257c6a048ea16cf908e64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ja/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ja/firefox-84.0b4.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "69c5c01998a78c17ba55f262493c4e7bfa4fe03bd19a8ca605546f41f0c6f794";
+      sha256 = "ff1c630c6c41cd31c8ecab5fc48e8879dbc4aa295492368cae93061de6558b64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ka/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ka/firefox-84.0b4.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "4c37f22f1a20c79c1b391b0f86bde8535c0766980a1b9a42ef912cbf91752392";
+      sha256 = "b6976def40cfd05543b70597347ea7c632c591660a2dd08332f81411a6ce6723";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kab/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kab/firefox-84.0b4.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "1c6722e18e1eff26918de17454d8103929115f7f036a1c23247695f7fee13051";
+      sha256 = "403bd985ff7ab44324d12c8c7f1386eec9fbae97ac9a0597d12d09d387686db4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kk/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kk/firefox-84.0b4.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "9ef2e2142d2e6d49adf59e6dd190b4ff816cf566cd35e5d288f66794aa2d73c4";
+      sha256 = "3860b0e8d53655669afcb4bece7637e9a1c0daa66d453e9548b2336eb45d94ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/km/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/km/firefox-84.0b4.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "bf0899cad62f3331d157c557cbf3cf1f7faadaa7f9aeed3c6547b4533689dd7c";
+      sha256 = "5753474371c7b8663d45f7f9591958afb9e9e2777df3e89840f6f34894ddf491";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kn/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kn/firefox-84.0b4.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "cfea495b254e1ca8c1be94e95f0c1f126d5f1a1c9d54129562fbec5ded6dec58";
+      sha256 = "d0dbeceacf93c3a581cc581e09507e401636350b763c8c9f5342b33a0640bd8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ko/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ko/firefox-84.0b4.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "ba8c93f8567a4f6bbf7af3c38a2d2ee793b05c0246638ded86538f91e6e9112b";
+      sha256 = "095930063eae8e3d6a78a6d9adb3d28cff0bb0c9ccdec977c8c80765a4c60560";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lij/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lij/firefox-84.0b4.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "c093b95b291af78460396e87ad39aa142d9925a7253f74aef9640fac0134e397";
+      sha256 = "587bced8e4480eba25e8597ab6b838a4f18553dd44b4f0ff48f245406f78e896";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lt/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lt/firefox-84.0b4.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "b035e58bfe373138626d9c5a22e6b6a8c6f35e8ba30ce821f80a1a85fd16c35c";
+      sha256 = "e214c23914e05152973428f5ed1df20054df054848d99ff23e5eb09e19b4557c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lv/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lv/firefox-84.0b4.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "6dd5cf66db0207527966532a2728d37438f71d1e79caf9b97916d0e404c9509f";
+      sha256 = "67657d4abb394ef76d37c321625d99dcf228ee00cc109e6d1c80cb3659db9879";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mk/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/mk/firefox-84.0b4.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "1308f476d0052e1317b4c7db29d4d2218c60921a9ba7f619dde4455aee7978de";
+      sha256 = "bac0e98b7a68dda441195cbebcdbea583f104188112449b14723c1086c3c4f19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mr/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/mr/firefox-84.0b4.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "7336012a19cd650dfb8f842de37da8e29e7b0948cc707880667eca87bb31869a";
+      sha256 = "125a63c875f4be6e246fa01289386295172d999e0e523c1171578adea24b022e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ms/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ms/firefox-84.0b4.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "192e12151ed1be4c3f7ea12beedd2c50f6e7fa877ae8c448cc899cd0fa1c6d24";
+      sha256 = "6dc44f34449c915e93bf9c012ce7286b16d6418ca8f576d8a008b7ceb90bcb13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/my/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/my/firefox-84.0b4.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "08db2ff728d5bfcf751e95eb9bba34a94c435e53863790ae06daf803d56c227d";
+      sha256 = "af5e2f1f9dcca84f41d3701035a00fc6b581aee2bf00f9f926928b99ab42d06e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nb-NO/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nb-NO/firefox-84.0b4.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "22cfe518994fff77dc41e6f45550549593564ef2fa2dd34e31af17f5e42d636d";
+      sha256 = "d168631cc1518e17cc9cd85f481f1047f6ae7df593d9197de5710fca0d87965b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ne-NP/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ne-NP/firefox-84.0b4.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "605180e46adcaee8fb813dc41c4e7bbe5f509f181b607554137712405c0cc294";
+      sha256 = "4b6065882ddd9e02441eff830808b31e6104d076cefed8386cff4ec7cb12330a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nl/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nl/firefox-84.0b4.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "ba8b45685a1d428d5fa1e38e1a3ec024f55db2f3ce4221fd53b96b0e0801a6b4";
+      sha256 = "96298283a2dbd9e3242c27551ee29829b21c8b9a32ca33b85da3142c47084dd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nn-NO/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nn-NO/firefox-84.0b4.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "0b76c63f7942576a2deb29cf15b089d2e73aa0b25f07eb1a511ccf033c68234a";
+      sha256 = "19475301d3d93a633a1555b4436d63546a71160a992daa760a8c76a808791b89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/oc/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/oc/firefox-84.0b4.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "5de508b4039c395b594a0c78d25655113906b95a735d1e94f8e1171ca789da19";
+      sha256 = "48af4af195173b541d76bb623acc357c3a2a8d03227406a21de89ab2d6c8c757";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pa-IN/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pa-IN/firefox-84.0b4.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "0bf9e4751ef967f4c6f63cb6332fe3940698b3e67d0e4873ea6bf639487159f2";
+      sha256 = "582ec12fbe2f8b07f8f4ae11ddf05c62db2d84508ee63ad6bfead9493a1424cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pl/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pl/firefox-84.0b4.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "0fcece8a65132810cb297a599cd4b003604854f0af684b33c9de554fbf7b1e86";
+      sha256 = "df8fcb5fe32325d45fbc1c9349065cd2d7f283e6a33d944282f3ed948c1174ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-BR/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pt-BR/firefox-84.0b4.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "8363d209d1eb7e8053acb4805df119e230ab31e74b3389ddb01b53b032c12bf4";
+      sha256 = "fa48bc301c9b7dac4802b50980c573039648eb41bf0c0fb3ef75d0ba1dce9b67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-PT/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pt-PT/firefox-84.0b4.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "cf2ecf2a673f0a4f17cecb10b330bec530fd6e37aff9ed821aa68e202f59f864";
+      sha256 = "b0075346738d9a5f61fe4c3265c3a50f639f017551d3bdb2479e622d9561bd33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/rm/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/rm/firefox-84.0b4.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "8849e945e79f0f9605e288de967e9f5316c792b150654e23ca65f6c91bba8978";
+      sha256 = "c9ad20ff328c8c0693cab58fbfb1d6c1f85bb63fdd20eb8d371e82d4df5c2e50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ro/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ro/firefox-84.0b4.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "452496612b170e53423009a128f092a3d4a372e0e6fe352e649b3c989f6f254b";
+      sha256 = "7816302b6f70c0e24b848d3d396876ee0d870d90561c37e440bb8b7722f54ff2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ru/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ru/firefox-84.0b4.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "0e7787bee9fdbb1ca0bd3ef050b1ee5d6c6d8277da941232d6ef10c612003773";
+      sha256 = "8f4969a16f4e70b59dd2da78b73532ff39589c984512d16fcd7106d2cf503342";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/si/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/si/firefox-84.0b4.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "bfd6df7b86490aa941f5878ad749d7918bc3c907a177213ab8a60df0270eea69";
+      sha256 = "0dfc4c1c797366ac9e65489b07de756a1b03b5498c9e4a6a10ac0d3a60345471";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sk/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sk/firefox-84.0b4.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "87c4827968ac3de5fb7609b9d7685653ef279bafbbb8b15f15f93cc876d6e021";
+      sha256 = "5e16b451058d64ea0cb61fa92e17fd72e591009803170b0b220237cac7180167";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sl/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sl/firefox-84.0b4.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "6b272ee0cc91ba6114dc777f1833ed5201a96fd905a0d68a71cbafafe1a066cb";
+      sha256 = "36216a3b474d3fd1d27886495f92eca83d24a465690efe7356ca9e7e4c08163d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/son/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/son/firefox-84.0b4.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "342f9eedcb359409fb324c13120ed25421435b614e9b5e15585ccf1551c263c4";
+      sha256 = "1116bbb70b7ff8538d3ce4e7df190bd152c98889d1612fa8485cb0197a83868c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sq/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sq/firefox-84.0b4.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "ad11f5878139c46a2344d0bcf6b02ad2c19e59f9861e7ac74668801e14742b73";
+      sha256 = "006948f771f4964f5f4f078615cbb85aee23051e371ff7b871caee7c4659fe64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sr/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sr/firefox-84.0b4.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "5e555aafe353036537609b9ba997374d106bb5ecaaa386b5395b7d156ff89901";
+      sha256 = "20b0b9d605603e525d046424d290e6b2a0c963c0eae2a9a6c6ccdb72a9803e9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sv-SE/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sv-SE/firefox-84.0b4.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "cbd33b4fd20d8a7401e384196c28adf9fda6ee2bf24895d75e75f8b727d33e53";
+      sha256 = "a132b97019c75aa8929830f873974e1ab36b69ca7e3c9ab44dd2a5b11bbe4f7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ta/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ta/firefox-84.0b4.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "8e4e9919ec79c1847449cc75539f24801d972b67d6895727aafddf7485d95ed3";
+      sha256 = "3f24d965ee5c89edd447e8a52a0241a5d1cedb0aae6ed1ad1c212ba4dbed210a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/te/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/te/firefox-84.0b4.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "cb756aa758e69f26eb50d2e81bcb922c2a15a2304ef99debe67a57c44b2c3c52";
+      sha256 = "2b65c7bb7df93b2bdffa687bd4309352f0d73ecdd66767db0db860f33f17c6a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/th/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/th/firefox-84.0b4.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "8c2be1458aa4077264ec946181d7ab3160086d12c821dc3d5fa3bbba46de3574";
+      sha256 = "21e2dca4e194a38de97b9b717150441bdd32466ee43e721f41afde004bc8e3e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tl/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/tl/firefox-84.0b4.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "e51e4cf97b79b3720129ed9467b57d393a4ffd5698a9a941cd28feffa1d166fa";
+      sha256 = "9f4dc351f5244b0837a95d4afbfa0af373fe056e5eb106a2b177a57ba4c85ee7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tr/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/tr/firefox-84.0b4.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "9f0a494434bc3d78c43428bc535517b5d61743326fbdbf1836a84f353408a54e";
+      sha256 = "50cabe6fea43e2212d0b0a9a5a382e085fdabc3ff6b6b0694b8f9d3d327c3ffc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/trs/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/trs/firefox-84.0b4.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "24cadb7247a254595c29aebe60784d37061465f2c960a8d036096c6df71e4186";
+      sha256 = "c4db90a9a0677430fa591cc387bf1255f260208a4907cb760649cd7a6db03808";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uk/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/uk/firefox-84.0b4.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "6aa85e7119fd3ca00cd87d898eb93d954b1e58d01edf14106c41df98bdca4d99";
+      sha256 = "7c92d619dd827a9f7ef9297f784cff582aba44684dca91c3b9873337b4318fb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ur/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ur/firefox-84.0b4.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "6b188379acb89178d08e827a60244c2298eae62434991d53378327c36829fa01";
+      sha256 = "ef46130577072c6fe6b14aa0710c75344dea46124093f483db47cbc8c9cb4ec6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uz/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/uz/firefox-84.0b4.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "782ced50737f68a9fa6db854cde83ef7bbc6f95776a44918248efcedd95230ec";
+      sha256 = "34c28440a7772a7fcf7f920be760f92057d813648372fe7cb8ae9f2c3fb3a846";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/vi/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/vi/firefox-84.0b4.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "37b600b306c901080f659955163b1696f5129e71bc3c5f65dc74d280ee6e3024";
+      sha256 = "c02c1737b56e1ae4f20ffa9abd392fb69f19d68348341977d0f39bfefab465b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/xh/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/xh/firefox-84.0b4.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "ebdfb9a50a5a7cad0508ade647ef3f81e18837d6b84212de6393a854bbfc652f";
+      sha256 = "6be6defb443480c536639d99d124d8c636d70f049f126a793d627c131035c9c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-CN/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/zh-CN/firefox-84.0b4.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "fbc7b8952fa6d2d73b736abf4e60a10512eb983ea4588f7e746bff9512b953ce";
+      sha256 = "454af78f3ea4aa00676c4b97dff278dd404116e1da7993b5a2593167d11db885";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-TW/firefox-81.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/zh-TW/firefox-84.0b4.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "5c29c56ef6480703ef9b6a2dc3cae8bc45b2fc01495ba099bd1ee28bbcdce55a";
+      sha256 = "7e6b1b0ad56916759b01df06b23bb6a23b0c59815538cb1edb3e95edf7b772d7";
     }
     ];
 }

From 41c91ed03c3ddbbc42dde49dd05221b9b5542508 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Wed, 25 Nov 2020 13:23:32 +0100
Subject: [PATCH 3599/3942] firefox-devedition-bin: 80.0b8 -> 84.0b4

---
 .../firefox-bin/devedition_sources.nix        | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 5b61afe0241c..5f16fb1914ab 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "80.0b8";
+  version = "84.0b4";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ach/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ach/firefox-84.0b4.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "f9b686c12733f6be1c96fcc71727f55e9c79f417df64a4b703c7fadaaf3a85e6";
+      sha256 = "6b548e6e2753e4a0ad2ad5968c063b6f4c7866c297314ba9e807161f7c757275";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/af/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/af/firefox-84.0b4.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "dc73e323741c3612607812878d24450b0b5d5274a8e58d25a9c3957d457b2431";
+      sha256 = "f75bfba14ae1a248918c0e433c343328305eb6372dd80aa343506437f631f2b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/an/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/an/firefox-84.0b4.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "a84e966f8ac0373f63c7fd76148e16c56af645bb9b83cccee91e20065883f92d";
+      sha256 = "d2e972f7d345720a89081fce3b9257942c93bdeb2a5c7dcede3c30282407f159";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ar/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ar/firefox-84.0b4.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "9949f976617961c3853fc6e4596bac9a7c18d66b72df22b9b217dbccaea6b0c7";
+      sha256 = "2731722dbd097875bb797a555e9a0ba3843deb159f7917626d8e97c1a3005e7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ast/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ast/firefox-84.0b4.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "89f277e215e11c7efd270c6f0952292db5c85057a50b48a3753fb16c1322587d";
+      sha256 = "4d626c7f293226e9e18e28d069b40f75914f9387553d54588c34e7dd70ce1ae9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/az/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/az/firefox-84.0b4.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "44c84f6e00f5672c4f4b5d26d727da4aa0e8f5bbdcb4ab484be4015b5ea4bb55";
+      sha256 = "01a647694a6aa2bbd8ad531197565593783946ad248d34f86550d28b8be5b52b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/be/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/be/firefox-84.0b4.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "cbcb4dbf931214f01167705529ce410935a378ddf76f32c04a16a019a04dcec6";
+      sha256 = "49639180573943a4bd4d0672c5dec969850b4bfceca00c37575c6d0f2d589a7e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/bg/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/bg/firefox-84.0b4.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "6af931944901fc143d9958538aecfcfa5c8604aa928dcad7ff4062e4752b2861";
+      sha256 = "c575261553cbc6afcc60650e21605e1298a122b975f6b6b2845a35725fe2ff25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/bn/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/bn/firefox-84.0b4.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "5f44e1a8abf75708aed3c73c217ac6aa31520c32eae8c6a2c28838d4591fd779";
+      sha256 = "5c5ebe2bfaaa7ea16ca4285d9806f3ecef1b29b61e5018920db27e050a4ef521";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/br/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/br/firefox-84.0b4.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "7f345832f046770ff20457c902b499a6d2d3650e3cbad696d0a0ce81371b8710";
+      sha256 = "29c764eff10d3756f258f0ac5cc9bec14cc46bb66d804eaca5548cebbaa067d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/bs/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/bs/firefox-84.0b4.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "539e441b74c8897113d8fe36076473f61cd26f9be24d5197dfa8f92a5ce68169";
+      sha256 = "7730a4c1e7d4d791fe35f000bba72d3652fe7289eb95f5e77b426995a63ef412";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ca-valencia/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ca-valencia/firefox-84.0b4.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "8f8581a6888dbdce1d357e8a289a0befa20e1679a8cc7bff13ef237bb5498ec9";
+      sha256 = "fe90ef596de4262d803fa282cce7b30c1c9bde896b31d7e47d8e862e38ca1037";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ca/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ca/firefox-84.0b4.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "5f3b7553a62465e18e103ffce48f75cc58489349c3cf966e3ba0138ce14d7b8c";
+      sha256 = "f435a47a36affd5b59c7a6543f1c1c7e0dfead407138967a0f295dcd6093bed6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/cak/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/cak/firefox-84.0b4.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "a1269157c6ec005756c1e0f0bbbf61a524f03b4c69022a2c49661c0375a78839";
+      sha256 = "ec4968ccfaea0a975a4f56aaae8290387707570cf899d078438ac2cb98244fe7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/cs/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/cs/firefox-84.0b4.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "15a26b351b40964089c8eed80fd5cadafd66ef39abbf19ce50a8b7ef5bdc661d";
+      sha256 = "357c5372b6fade862671db66b90b3382749153c641bcd7c99f7b2a3c68c143fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/cy/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/cy/firefox-84.0b4.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "8400fc3e6192f2095d4a57bf354dbeee1b771a8aa61ab0d865956cdddfafcaf6";
+      sha256 = "5ce8f5e451fb2271635a2cada6c7b54a53936a1b912b777d54ce640cecb3d37e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/da/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/da/firefox-84.0b4.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "83c7818e65c32723c2bd0a4f65a33f19941fdcc5d84055cf2532cf8c4592020b";
+      sha256 = "ac790fdafd2875d180be2375937b38546dd77d6e9b8428f4d44a2b780b4db14f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/de/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/de/firefox-84.0b4.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "589b9249ffcff23c388716c24cd09baa8b309d771b97f4dfcf9c979ad9a3342a";
+      sha256 = "6c5205a4d74da62927648f95a069ed6a68ab012f2cbe0c4cded3de8d40c3d325";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/dsb/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/dsb/firefox-84.0b4.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "df57cc439fa74d93921c7c1265b7335e23c0df545e78eccce34e06fa528e75b3";
+      sha256 = "516308e19f0373b3ff75e2e114fc7f1d2d370cd4a0f63f8bf74704eced2e0d56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/el/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/el/firefox-84.0b4.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "7a2b0380cc8733e7d6eb5adc228fd543d8459d7b7d9ffbcb39b73dffd395e5de";
+      sha256 = "d35a67fcfc8c5c334f55d12810bdcbaab6b9cb5fd3aaa75c79977accf7429445";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/en-CA/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/en-CA/firefox-84.0b4.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "6e747524fb05aa987e0c24b21fc9ab27901f1cb205b7cffa100d5bdb7ba130c6";
+      sha256 = "e8d36d76d791108a6e514a649eebc9c4814aa8ccd4b21728e56a4e9839eef803";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/en-GB/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/en-GB/firefox-84.0b4.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "4e95f0c08c44e6d4830abaf9c2d25b10e63753f1dd48e192d4464a03b82a68de";
+      sha256 = "9bb695670d7ee7a3a35d9adeef579e33f076fc1eca717149a5078134f584bf70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/en-US/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/en-US/firefox-84.0b4.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "2b75be9a3961e734ae16e591c367e76828e9a3adc458629db69fe5fb32a8b476";
+      sha256 = "595b1004380ac96663c2d8889f02a681ad7c5c56e0f12cde4a26a6453d0a0ec5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/eo/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/eo/firefox-84.0b4.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "2fb71c60605c4c56432c262f62d72509d520787a7e86a45b496a68e55d08823b";
+      sha256 = "cb6ac56d074e91e2f5154c275c4c3a46e4392586451fdbba52fb419bbe085c64";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/es-AR/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/es-AR/firefox-84.0b4.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "3aefd418e20dbb7ae0b8aa87d15be140b4ddd7f6572ae0ca691b98f7f919361b";
+      sha256 = "920e2aa05414fb72be7f24240636e7ce7b431776cc919c5a07c1361da3f66289";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/es-CL/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/es-CL/firefox-84.0b4.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "7d650204f7f717cb39b218919b3654db5cced3fffa4d06fdcbd4eba5cea1263b";
+      sha256 = "9db297046da02c5c8e1f6d5ba0e4f6b35ec8b8d36335dd2f7933e49d86c207b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/es-ES/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/es-ES/firefox-84.0b4.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "5870182df6c69538ac1eaad0e61f580165e2e916cb76bbdee8b659a5a58dc68b";
+      sha256 = "ed94f3ded8f803f956290976cfa41a5c46b42da7f3158b4283445ded15fdd789";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/es-MX/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/es-MX/firefox-84.0b4.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "166dc0e61759c879737a10c3b709e5bc94493bfbf01a7997c2d38b48254d6af6";
+      sha256 = "11e2a8b7084ea002c6efd92fc86529e2dd09afbe4fe52285a3165733af95e132";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/et/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/et/firefox-84.0b4.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "b8b8ea33ad920876b36abd8d35a61f01548c5a482c7eab0998f83f066bb62e27";
+      sha256 = "0baa470895983b2c85f9ecc79f36fa1b6c8578c5bc22be76ef10d6e7f9e11ee9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/eu/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/eu/firefox-84.0b4.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "255637aa99002ea1f353098b19787077501efc915a74c2bc88a6ed6c05f12079";
+      sha256 = "271141d85b5a0338445945208d515ab9ec6452253abddb1860c31cd61458de4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/fa/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/fa/firefox-84.0b4.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "304144942ac8e71f4c29bf4bbc91f17a05bfd712e621cc0029909e0b65e09a95";
+      sha256 = "d467a6e1eff3b2edad56c6b8b58a7fe2d7fa5c07524fc0d567b660b29169ddf9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ff/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ff/firefox-84.0b4.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "7ce1b42078fe98783e2da541cdd69dd2083ada20254ef80fb53454950e77eddd";
+      sha256 = "4f117b8bd69c01cb6d38b927ab26cfe79fcd111fc9a4a2e53ae4ef936bc9806d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/fi/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/fi/firefox-84.0b4.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "af9271da2138c9c0d73fec09c5356a87b91aecc36a1211a9ce35e0ee1bcedda2";
+      sha256 = "6eb9d0c0d1ef84abf0af2a873334dea463d728ef5aff398417e2ea3104a4503e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/fr/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/fr/firefox-84.0b4.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "c7f347082b17060c7af21ef12f9fd8b210ee20f877e7e791379c482a63e04ace";
+      sha256 = "85d4b90fabcc03d3ac396bdba0749794bc3fe447c9f2ce793962a2acfc35918f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/fy-NL/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/fy-NL/firefox-84.0b4.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "51d42832b2f58e0d8f011762f9884dd49ab243d45b050258ceeae96bb92daad9";
+      sha256 = "462e14991e34122e2275bedcd6776d9f8a75242c2b06d84ef3dadab08428d48d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ga-IE/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ga-IE/firefox-84.0b4.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "33a50b14ff9d965deac611e0dd6a85de9caa9cde9b99a8dd955a28916e026d7e";
+      sha256 = "b0b7def94a250ec52fda4e4fe0de931209fe71eb06ce03de13bd7309c7f78d79";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/gd/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/gd/firefox-84.0b4.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "bd3469f5c101682a723eb5b261c591fa619b64dc99466ae919658cf44ae8fed4";
+      sha256 = "e3bc980f579132b68cdf06b06abe2303430df239444971010ef420f5fe1599f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/gl/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/gl/firefox-84.0b4.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "eedd3b89b26b6634827e07a5b20b57716f54a604b18d9849a4b2fe30ab7c366e";
+      sha256 = "66b9c65dedd1b57cfa2d960a40df72dca473f39f1cc585e1406abc64d68b1ce5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/gn/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/gn/firefox-84.0b4.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "206a292bdf13d98a502ff89ea57e94b37a528e57b88c1611c5094ed64aae2b0d";
+      sha256 = "ad707ad91336de1c0d1f26fddebb95d25a8ff405bc3d576660ad9be0f5643939";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/gu-IN/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/gu-IN/firefox-84.0b4.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "2ec91a2be77abc9b52e4d466cfaef70ef02b7b92e332fe572cdc3f4e53ac5276";
+      sha256 = "585c76f373ef5c3f3b86a6cef4dfcdbffe3e314ba737a3f514bcd871140e5aaf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/he/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/he/firefox-84.0b4.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "5f53772c8a24d4fe1be3cc21673a924a5d65e606168f079b8091f4502d1218b7";
+      sha256 = "8f9ed5eb32fe9272f5adc22753997292cd2dab7b1368864b4f001eb0fffd7526";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hi-IN/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hi-IN/firefox-84.0b4.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "15e74fb5124e1547f7eb776bd3b6d4096338731f1d97b6c0944e7f3af1b569c9";
+      sha256 = "22d8b3d494f3b0dc5e347c0fedd5ab2ba32690c02993bd2a9066a987bb87aea8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hr/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hr/firefox-84.0b4.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "5c4a0c766ed006e0f43856104aa8bd96e8d63ca618fda401370633b707e80374";
+      sha256 = "c3a70593633985fcc8974364db75f2998e450359d4a8b621f23e95df24cf8e6b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hsb/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hsb/firefox-84.0b4.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "6945e71a060bcbf8a329c65ddcba786beb4f955cc2105806bf5873c07daae988";
+      sha256 = "30701d1b25536a45a6a5613cbff8ac83bdec08d6421f1e37d9f0ae9c39ab6856";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hu/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hu/firefox-84.0b4.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "5da76038365922aff82c540652132c7763a07f4336ef003a434299240444b036";
+      sha256 = "bcb63dc6211b5c24536062ed6f8a424edf0ad553187b298874d97f75d363b1ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hy-AM/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hy-AM/firefox-84.0b4.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "4be5260452b39b707d271b5696710038174c397083f626b3fd877aad36c37142";
+      sha256 = "0278018d35f7be3e4c8da080bcd86e2bf08a544bfd452136483d2b21f91c582e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ia/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ia/firefox-84.0b4.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "94dac5899d0f2d5afa0dec53472afb329b956347d22581e1b9668a123d200278";
+      sha256 = "d5699f8b946bc551fea78389cc6e82a9ca58ca3a8a492cbe3b985ed655fd60d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/id/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/id/firefox-84.0b4.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "d4cade715292ed116c2605dd6a8c70854cad373641982283decbc1e2f0417490";
+      sha256 = "1e2c580382192e88094738a01bc99b7efda5a1010e1bb180e35b5701f03aef55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/is/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/is/firefox-84.0b4.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "5f4bf4e8bb2f5e72872e99f8415b864df457c93ddabbcd4377588895c83b1d7a";
+      sha256 = "a541657165e18212f97261b2aba391434246688451cc9f2b643a57891dc0eb1a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/it/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/it/firefox-84.0b4.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "5fa9251fd8c8e0d4aebc006ea1f8df15afada7276a1bd0517b89c2a6f8e488b6";
+      sha256 = "5ecf7a03bc8e8d6329db2bca4296cf0d07b943ec9c9e0cbb2ffdaa4ecffcdf3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ja/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ja/firefox-84.0b4.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "a1557fd84bb39786566b6c11d1efea9464a96b77a690b1b1c3b165283c031185";
+      sha256 = "80d6148dbfa8e95e5292699b5326171f6a44eaa30dc4c84b233191a8505a248b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ka/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ka/firefox-84.0b4.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "f9359c7eb9c6536ced999c18571babd932a1b1bd22565d6489bb43cb17893eb8";
+      sha256 = "9f15ef55fab16e0086466e696f35dc3107451c2b9ccab9452901cf66723bf688";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/kab/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/kab/firefox-84.0b4.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "9b34875edfbf6383b5bbddd110d969e32e448e47eaf48b7f41c215e6b3f8da62";
+      sha256 = "762be8a3bee38ea5b939611b4fbc9fd5bfe71e80b685cb0a8937373aa19f94d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/kk/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/kk/firefox-84.0b4.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "78bdac1a7f0bd82440e43c6079332624b1e7e60defe45d55493857b1f9e2c7ce";
+      sha256 = "65196c278a5a70c76315546465915626ed0c5f395af4ed1aed0ab2f27846aac4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/km/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/km/firefox-84.0b4.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "9fc753e4fa4a2a3a911dcfe9d8c7c993416833bedec4e94e85d95ef075209377";
+      sha256 = "530010cb0d3393e47324c032d048a377ac5c9da16e73888db026f6cec61c3533";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/kn/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/kn/firefox-84.0b4.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "1e45e618c6d4db4f870e4d3baf60676d2a76916ce0998ae33d671ab73e8c1bfa";
+      sha256 = "5233a8714e24a915404b3139aa3496812a4203b866cf4d870b013b940eba41ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ko/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ko/firefox-84.0b4.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "afe8410a5be470aa016720f411f33aa0b244fa34dacb138ab145b97a7e195db9";
+      sha256 = "5dfe6629926804ed0820d472e19e51223565b011dee3feb722a81faa58043744";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/lij/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/lij/firefox-84.0b4.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "094f4ad0a2b988f0d75938dd6439ad5dacb1eee42584e7d1b424289117512d49";
+      sha256 = "4bb4bd94ac7aa845a062c366ea47871293f7b5281a460d3547fc321b6430a3ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/lt/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/lt/firefox-84.0b4.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "69164a34e2cacc8f68e8e87defe713c4dcd1de278d449e1f9eb7b8cf42aae305";
+      sha256 = "162d3705cbb8ef0b8036520d59e17eefd8e94bf27b9c1df027e9c0b26b3ebcca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/lv/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/lv/firefox-84.0b4.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "10262da2e4d50f2e331b3bd0c4d064002a3a5f10719284b96cced812ca0551bb";
+      sha256 = "7498cb5bad8ccde4a82e2acf49e899a652086de5c2e0a63f833d5342e83bfa48";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/mk/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/mk/firefox-84.0b4.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "d310667e306b177191965b40b6cc8556e0fa749a3ebfa6120b0255e701d81ac1";
+      sha256 = "88ffd9ffb56000b42d3878654b6be2413189b93881d29809c5cfcbcd740349db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/mr/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/mr/firefox-84.0b4.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "2130fd9a56e2e4f4c09ea57cf0a566ade53c255c52e867c40316e14a04a59e0f";
+      sha256 = "cac6e4ea74b146d07afa79e85746d9678e6407c733a38367ed36e94821cc2f4a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ms/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ms/firefox-84.0b4.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "ac215f60d098eacfb4d03e857e0229d0368a113e5758f00044790953712cc4bf";
+      sha256 = "7e5eaf47c232fd25fb5c1e2de9d81351cfcf33c88c696a193219b0ff86a3c29f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/my/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/my/firefox-84.0b4.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "0f89f81cde40821463e9ddbd988616d019d73fc0a27cc3a427dad4c9bd6fc931";
+      sha256 = "20b1756847b2cbfc98153ac0d9a646f129b83f5c1383067d7547e9c70409abfc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/nb-NO/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/nb-NO/firefox-84.0b4.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "4d599136e6a8f430f21605895d2ea63aaa3542a2b9dff5fa44d3a618dff1be5b";
+      sha256 = "ac71d2e5520acaa352eba1f26576dc101b7b3a64971b36acbbfe7151b47e1344";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ne-NP/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ne-NP/firefox-84.0b4.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "859dc2201e76de7f08b2c29d11382f02bb2eb6f9ec48f65656f578da67cc10d3";
+      sha256 = "90ff28f5e3ed56f5472e524f37288bad57045dc5491bc84f5e76f33d1d2cb046";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/nl/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/nl/firefox-84.0b4.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "f9b7784f2c626f6bfe8a39a18a593d9f0d10d0f6407d1015969fd3744a483e88";
+      sha256 = "267c1d406006feae8bc350bcb58b4f73cc2403682c5786bb500bcafca4aa1ae9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/nn-NO/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/nn-NO/firefox-84.0b4.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "6c46d8b833423fe0eed0da6c162ae16f6969b569902c41fa21ee7e19ce7515fd";
+      sha256 = "815e84bf8acb3cec68dd7fc06d7849240f71e73cd710538b9f8a887df73f98da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/oc/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/oc/firefox-84.0b4.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "c359b9438f6065adb64baca086b7bed295ffccb825a96b4bcc5721ed4346a061";
+      sha256 = "14717ad07784d231333584150f04118d22a8616fec76aab800d3208c514904fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/pa-IN/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/pa-IN/firefox-84.0b4.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "6ae3b82728155e195747176188e30d4ddc3d5e9499ab018902e2e1289b19c171";
+      sha256 = "1c1470816615bb292f51cfd1a52002b5f2ed4444be41a3521ef1a40b4e64b2b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/pl/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/pl/firefox-84.0b4.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "45b97c17dcd1042eb205f6c59f5b679fcd224705cd5009dc2e39c8a22099ecb9";
+      sha256 = "872a505769aff03597c71de66121fd007559c3f1cbb22c67661930de6e193634";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/pt-BR/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/pt-BR/firefox-84.0b4.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "50b2309fc1b083f739b090729096fe82747dc3e889923d271aae500ee5f0c82d";
+      sha256 = "d0ef34afb32b0f6d1c266b99ea0f4a9015934112524eee0cadc66faa6898ae27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/pt-PT/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/pt-PT/firefox-84.0b4.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "aac403c497aa1bb9e37038ea7897f57074278d080e592bf1984f1712a80de632";
+      sha256 = "e0b17a97217c799e4e0067e91374e63a6a99df827442d0193fcf47320af8a737";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/rm/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/rm/firefox-84.0b4.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "b8330c7ef733c1d50e320376bdd9c5205fd56f58fc7baf46497f1b0902193dc5";
+      sha256 = "0c031b6ae10918e65274f5ce95fd03d68011e36ab626e03ad9484ff40b36bc7e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ro/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ro/firefox-84.0b4.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "ae7d39f56d162d7b8bfb4d55c6de9b46a40f45c1bf9a4191e65c7a99a36b22ab";
+      sha256 = "256b81200a5b92763d368b9c5d6f29e191aa4f11b097de1773bc5557d748c3ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ru/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ru/firefox-84.0b4.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "10e1adf60a23574fd5ccf9ae1be83710c92c902367174f73952d18412228814f";
+      sha256 = "734b7d94b896554d5fedfd94a84c827ad6737808cd1f7b5b13be20702d46315b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/si/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/si/firefox-84.0b4.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "fe02265dfb0bb12ad9a5739e802937540425789c8e36220f59001ef4fc256f16";
+      sha256 = "d2c9fee5e64b8063c834610c2671f9c3fa49a5e02fc7e3482890b534aeb66a7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sk/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sk/firefox-84.0b4.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "73c58bb35f204f875d2c8d293780810be6083d2934fa8d7d7e02a3bc8d41e5a3";
+      sha256 = "edcdf2a8a00e0402992862e28efb33614b9f1a4cdfed16316c5d4bbc229b298f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sl/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sl/firefox-84.0b4.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "90243b7a75889617085715d6cbb65c220f1fc5eba5d4a70612277dcb6a6df6b6";
+      sha256 = "d097a61adf0908041cb3cce76758f6da274cd7b3a006163b004f70e869947021";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/son/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/son/firefox-84.0b4.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "ba8ead8c649116edb7e168b25e6eb3735a85cf5c15a2a78ebe8340cd7071adc1";
+      sha256 = "d60731c5976825f0566502f6211d8e22388ec9d02bd122272f70a0830297e1fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sq/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sq/firefox-84.0b4.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "6466c44847b3b0370665e996582a2cbed9a8eb56a8b3f683582011cba77e918c";
+      sha256 = "5dffa799eec3baf2e55d7b690cf73c2b190e369bff32dd1800020c0fdf912c9d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sr/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sr/firefox-84.0b4.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "06869c6fc77aecdf48a991ebd65cc6052c8c3aca976b01cac5e39933c7aa9190";
+      sha256 = "abb5779af704c926ca90bd9b9a01eb8de1b1b4feae658d5911bc523739eda0d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sv-SE/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sv-SE/firefox-84.0b4.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "e763358e9672fbc8b990bacae8687c7558d9718cc9d1e80798ee9ad220f28b35";
+      sha256 = "2a228577a4d6c11a433b8c0340558aa638de175474491428b05509019920f8e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ta/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ta/firefox-84.0b4.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "1669e95f886a7adeac0489c072fb88f1ca09daf3b42027006305857bdbfced4f";
+      sha256 = "82f0bec91719e7b2a355c9b0398b924ce4cf429bb11e99d566af9836f5087acb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/te/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/te/firefox-84.0b4.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "3d5c9f1596291eba38fa5b5174674fdcfd335e4cff44ecc50ddc7f08ca254b97";
+      sha256 = "9e581d2dc107c385142c3bbb5476e3bd94e700cd8f9e36ead46d284d5708e9c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/th/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/th/firefox-84.0b4.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "d583744cc4d1099f23960b0ee7c80992233864c94f877623f0c566a65cd944fe";
+      sha256 = "096ce747a12c0b773d34517efce6aa4aaaf09385c5cf088046f7217639a7ce9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/tl/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/tl/firefox-84.0b4.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "cb6b8cdf1747e211cceeb07bda07573bc193574fa3603bfebaa537857953ce13";
+      sha256 = "3fc48cd9839ba88f246fb04fe34cc5760aa9e40c8fb782ea57347e32d66030f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/tr/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/tr/firefox-84.0b4.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "e2561f98607ac5dcc67ef825cfe73d1c2af4ef9c5c01ebf48ee4dc0f80b53d07";
+      sha256 = "087c629e5aea8fc698cbc5608c270a7099607b34c5852b3b3f4091af3b7c789f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/trs/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/trs/firefox-84.0b4.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "de1e1f83c439d17d5489d666f1772ac32e26d70a5b3309176b528de413fae39d";
+      sha256 = "4df467d46c5830a3d96f87294c3dfddcc397b73a372ba566900123f7ab86a6ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/uk/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/uk/firefox-84.0b4.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "7632b4734ffe3106e78ddfc9e5ed81dbd219045f4b954421be4629397436763c";
+      sha256 = "11090c8aa00533c456ce96cbb09691c816fa2f98ac421cf581c86bd2bef5f296";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ur/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ur/firefox-84.0b4.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "8e6c6d36546492ae93128c780c80bcae86ebaded38cc753db1f0401d4b5d31e3";
+      sha256 = "8e7a5cc3606dc6cf71de328863a9107c36024001a381baf00daab11bebb857d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/uz/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/uz/firefox-84.0b4.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "18c7827cc1337e0a2cb3a1e9603aff8e7c3ac8e5631cb791eb0b7a2de35bb487";
+      sha256 = "bb1846dd3b7bcf3b657d64bbd215301565dafee00eae96cee15fc71b40f49877";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/vi/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/vi/firefox-84.0b4.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "e78c922c13e0207c9cfb4d492e855543979e77b49a18fc63796c7e74cc4fcdeb";
+      sha256 = "375805742481f8f33adccbdc7e10f21ef0b1a0ab383c379e4dc13718c3f8fbf8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/xh/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/xh/firefox-84.0b4.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "bd30e089384bac81aacf68c52ac884712bd0c739f517faa6390090d112d9fcf7";
+      sha256 = "a8ce0836980441d1248f8bbd2e4bbc7a8269afe9bf8e3125bd9f4dd3acd06d7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/zh-CN/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/zh-CN/firefox-84.0b4.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "316ad740bbba808a66b6fa00a9b1391597c949fa217e721563c685ef9fa028f1";
+      sha256 = "8f491d8d1f61bf4a7f036efc047462bb04cf953e2a3a39cb5a326e49ed7a880e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/zh-TW/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/zh-TW/firefox-84.0b4.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "f92189c808903b314ff4cc30fdfa7d5e2085ce22b9763e95144a7d69e6af719d";
+      sha256 = "dc5a8ca6f8a3f40060d0d2abaf694a066960cbfea355678ac583c3977b37cbed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ach/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ach/firefox-84.0b4.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "aaf1bc4cda7e1f1182f701485f5cb186d4b731851aca70611cd478c923b2427b";
+      sha256 = "f5b5a500581e52dfe5192135cfa06bf283ff23ca0b1b569db1f1bdcd359ad0b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/af/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/af/firefox-84.0b4.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "1be25b19658c15a88031169c57acda5ebd49b63212f584da6f859370b493ad32";
+      sha256 = "f96a13006c272edf5f60d6c04011e48729b5078fbde2238a0e5c422eb1293372";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/an/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/an/firefox-84.0b4.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "d461a566f7efc35ac323b0e8e963b8332a349e1b317401c2975cf4c75f7ce8cd";
+      sha256 = "0bdbd429a512499dcd920ae695b61347196527ab30c601e1645385f3cdaff4ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ar/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ar/firefox-84.0b4.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "2051bf3ff16a6ebf15ed4fcd97adc2bef65c04500d09ff1f009785f41c0b02a2";
+      sha256 = "e0b6addd1b699c228aa353af879bbd263d1bd0e17aa033754abe864348adfc9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ast/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ast/firefox-84.0b4.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "97951d00f79bed031680ff9676201c9ff0fe79273e4f2697cd19ca9ccdfe95cc";
+      sha256 = "3ffbc1b67d9cae58c2b21227e6456d9e6ca8a387cdbe8b5bbae9b1db553a34b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/az/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/az/firefox-84.0b4.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "a461aa41658c34bef1bffba2d34619ea402fdda2e51aa1e0200002b2e9321c8d";
+      sha256 = "36c9ad3b07b6e032b38486e1d2a7a6b85b85dc84d8d0b9218fbd4c4a71e59e70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/be/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/be/firefox-84.0b4.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "ff1d2fa9203fce0aac5d91b38034910bbf7b0822b499fe522ed981f3365db8c3";
+      sha256 = "2ac1811463e482205f7dd27e4f98564146f089fb423405a8c3df8d2a10e45147";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/bg/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/bg/firefox-84.0b4.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "17553a8566afe02d916b18d76a8850295512d9514bc37bbac459bd28a3bf46ec";
+      sha256 = "174d0ab72bfb1a8ea811c1b77a9eb65871f68641b1703c3bbf02bad4d298460b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/bn/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/bn/firefox-84.0b4.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "9863e968594a556a7bd52a43cd3c965687d4116c9fbfb62bed38b1b7ee343728";
+      sha256 = "e6d1b74e56690abd5c2f0d2d1dae0b9ac6d16b28daf1964ecd87138a5de9fadf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/br/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/br/firefox-84.0b4.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "762f1f951560f8c85a44cc2a7c318e4f8e5a0b752011cf06f86235e3aedabebf";
+      sha256 = "2ad97986bcdcdc2b988f1d50fef1a71d767119e03065ddc3e51ad38efc7dd351";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/bs/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/bs/firefox-84.0b4.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "24fc8ac01417df1bbcec358c083f7627ed13bc76921bf0efc14e9f7653e9a819";
+      sha256 = "71c472c8dce7174ee8139360fd5b8528cba89f73dc186bdd08ed368917b8c41d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ca-valencia/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ca-valencia/firefox-84.0b4.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "b071e20fadfaa2c06baa1579343c18167f6adf88e1c98fc68413287f6a45225f";
+      sha256 = "4e5245f658f5bf6f47d40e2437841213b03b9f6d12e83766621f5b59fb258eaa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ca/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ca/firefox-84.0b4.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "e63fc27b2bd404ae9190035d5537822fe76213545d8dd076566abd12ea213e25";
+      sha256 = "4de924505b98c029dbba0762723a3310b3d171f18072a1a51d4f9636aaca8831";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/cak/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/cak/firefox-84.0b4.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "6f4fc3e51819d9d3914ad624593cfc755d9e8f78263700268dab46c38e8fdbcf";
+      sha256 = "11fa8468ca6b3c51ed615d0375e63d85443beab66c10cbdc95fca817ada02215";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/cs/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/cs/firefox-84.0b4.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "ee61413b6544ec56d13bebd08ee2ee69f8d1f16e886ba31d46c2a786c0984f7c";
+      sha256 = "c1bc48d54d0ea32731d4400c2b2fd817c5ed222cbe5fea20b3ee26ddeebab9d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/cy/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/cy/firefox-84.0b4.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "8f29a8b77732cb1387371538efdf970d0e93d3de866b103c836990a4f0a30933";
+      sha256 = "02cf2dc5bb97e9497655c53ef45dda3495f280a333c94fcc51048852bc993a53";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/da/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/da/firefox-84.0b4.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "b89854119e139a8e9347b262131ed5da62672f6d728b1017963a11d279861a45";
+      sha256 = "6d36d0aa1ce447770c9a149a1df2c27731a31f5784b9f20ef536836e6e42819a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/de/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/de/firefox-84.0b4.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "c453a0f5cf528c582a35997a963b944d31666018ffc912ee4e188f795066b925";
+      sha256 = "49eb555372658bf827adfc07b08c8ac46a6351f0ecd0fed0ad6d5c4975553c8e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/dsb/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/dsb/firefox-84.0b4.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "bf1f7ebef2aa4a5e0ed824a2c89a0b86101b5cc754feec482f0c39ef2ef3dea4";
+      sha256 = "1c358edc0e6248773103ab92ef0bf6103dfcbfa2945602bbd2f49153ebc7c690";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/el/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/el/firefox-84.0b4.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "b31ea72af96ecfd2b625d813bf32e08dfbffb9c0acb004e1f279b7937d675a90";
+      sha256 = "a445f9806285ef0b036364a618c8d7ca226da899dfa33adbda5b2e327fe63dcb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/en-CA/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/en-CA/firefox-84.0b4.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "31866007d8bc76202fcec3b9531afe237c9822025a14113051a9389cd9f81ec8";
+      sha256 = "6d2590c0cc0aa28a1443185aec54f84973a31e79beccd5ca5700abfd8deebe2c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/en-GB/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/en-GB/firefox-84.0b4.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "82b2e6cc268eefb687255fdc5170aa8ab6136d6a07b881d49c044e1700eb9190";
+      sha256 = "71c4040c1326133f18ec7a07ea021b061b0994cf92aa113b358c5c0c10ebc59b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/en-US/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/en-US/firefox-84.0b4.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "dcd29328d9b464c16bd034f635a16d1593f98e08becc6a278d265b07bdc208a2";
+      sha256 = "af3bcd19cd78dea23deaff0c2810282a68428eee4d45e2989c75cbce5ff97098";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/eo/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/eo/firefox-84.0b4.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "cfd6996e81513426d0534ba62e4f2d22fafcef51ed48da4a593b9d3ead2cb2fb";
+      sha256 = "641def17e0d004f81cb176ccf70cbaa1df50fb204c3ff45a80800b76c21ed006";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/es-AR/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/es-AR/firefox-84.0b4.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "9d4c24e1153f723a789c1934c15cf8b4d3925fd34e8fee98d7e5ad19c9f7a9d3";
+      sha256 = "0475e9de47c64b11470edf16f2819bfc1b1013f75ff6dd83da96bff1174db788";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/es-CL/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/es-CL/firefox-84.0b4.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "91364ba1a2ab6c8bdede117f45a855b5968bee492e054123433c0fc034d66415";
+      sha256 = "0f3c14175da4f59b745473df5f0256b582800b3c3dfabaa21e124b9ef100fc72";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/es-ES/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/es-ES/firefox-84.0b4.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "1cef40ebfb1b12813d85a975ac0620b3ed339acf5de8e4d0ff0aba6aadedcc7d";
+      sha256 = "9a33525bcb9d10a10630d4c470877c8698f6da32671cbc47450c7fa4d2cba7de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/es-MX/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/es-MX/firefox-84.0b4.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "e41ae370750f65e59470e05b2ed501a308f8743cde3291bae2fb8d17af553789";
+      sha256 = "ba397ac159b77c9346b58e5c9e4bdffd21b5ac3fd3d4b67a2b67931916b2f830";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/et/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/et/firefox-84.0b4.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "5a279c246cffd27f6c919f451161e87b30ac8743e1a22ac490496b28af7e75de";
+      sha256 = "664672b4f5f713bee16024845f16555da16f758d8db674dc5ec7f0022d2b7000";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/eu/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/eu/firefox-84.0b4.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "3530e6f3060fd133dfad72532319c6cdb5be5bdd2dc0395d02e379b203264d20";
+      sha256 = "3230da6f19116ccf848855218df3fbace86af2d9085f4109a3006476807f464d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/fa/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/fa/firefox-84.0b4.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "ae1b1fa06440f1038c97fa9d625a2b58ce5ffe11fb53a71afff632a18675f113";
+      sha256 = "faf07d08ce391b1043d4081fc650e3ee78ca067a3a11a6e3ff87916f3ac7a557";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ff/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ff/firefox-84.0b4.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "05b47dda3d1fbce0e3dcd79534aef247516e5ded783d1184975ba97b1abb09f8";
+      sha256 = "2c763d737cb112b77919594fe34061db5181a725cf518fc3cd9133be9bfd7cf6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/fi/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/fi/firefox-84.0b4.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "689eeeee1a769ec9bb53014044a615f0a5c05d8a15e6dcd408d18ef452c0b441";
+      sha256 = "5a631720534e03e211936255012270e04918461112411e787ea02f138087c6b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/fr/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/fr/firefox-84.0b4.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "c64e31adfc24ba1fca84922b33a71bb74150ddc9b4d5e52f3627d2aac3b11516";
+      sha256 = "2b86ce004a5c42fd6f5cdda28439263357ce5428b6469440046ce6fe4d6157c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/fy-NL/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/fy-NL/firefox-84.0b4.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "36765f1c9e1b15b43fd7d70c9f9dd1b977c4171ff920710346493214e08f9dc0";
+      sha256 = "e0e81fb1494d86abdcab4cc9feb0f789ab304172c67da013f0a09ab2c2e3e676";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ga-IE/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ga-IE/firefox-84.0b4.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "026c461de7bba74facc421a58028e46efe32e7e3f441a8ca030911e2e883f56a";
+      sha256 = "ffcf120a36f7268ab2ae03fb1eb6d458fb63b00d41198bf7997290c28997205b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/gd/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/gd/firefox-84.0b4.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "c2a21914b4f7cc71d6456e9c395fcf2ebbca12408563decc4a400e3d5d43c865";
+      sha256 = "a99d3471da7fa2e985fc562a4abe086de9096d2461a50841ad5c8e5d2891bf8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/gl/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/gl/firefox-84.0b4.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "888aaad1dba8db4d71785fee01c100aa1919d432e8ccaa044e386224abe9494e";
+      sha256 = "01412502c872561564e1dac95b12d27295be5c411d2bb1ebbd53cfb4dbadee3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/gn/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/gn/firefox-84.0b4.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "d5b1d103104c2e6e7b8198be649b0628acb4cfe6865422fc9e3db3b6ecc07cc6";
+      sha256 = "a73ee3448bb7888acec856e3e3369e28f5fbb9c5d203892e4992f73b319fa394";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/gu-IN/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/gu-IN/firefox-84.0b4.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "215b9df33e06685f9b264b06b512d325aa8353b3f3975699b77e9fc8d18531f1";
+      sha256 = "3b7904059b38eea27b7901de41be029ea8ec23c3d2a8bbe8941d8852c55cfb97";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/he/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/he/firefox-84.0b4.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "8a19ef1eb702a0083c7751cbd7f2437c5fa46ba3f61a5f5d07f797b8ca696d22";
+      sha256 = "0bf4d3aa4f217e12b1f204bdb189625c6daae24cf5253bf4b1cd6288f2717873";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hi-IN/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hi-IN/firefox-84.0b4.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "17a84efead836ce54c1c0f0f5486595753f97463fbc2031d78b01e33c7a7775d";
+      sha256 = "4f95852212b0b08aa420c88e2ec7825913e3e82c1d2891fffdb11a8583bf46b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hr/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hr/firefox-84.0b4.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "41bc47533991b818b26fa149a30825326879cdb3ba92eab0ae5171be595078bd";
+      sha256 = "e30d3274103e39241e233aee994b5b8c2b39dbd190ffa1a9da99f8494ae833b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hsb/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hsb/firefox-84.0b4.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "9ee8d0255eaaefe37f00960ed59c83a06b8356a8c6ea05d1f9697edb9880593e";
+      sha256 = "f401baba947e64ef4ef02cc5137c8623a99967ec8597e4e5c8987382dbc505a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hu/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hu/firefox-84.0b4.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "a9b6dfa44cc8d90a530aeb98ac96a0ac1e63b4a46b9af8ddfd4d6f268fc7eb5a";
+      sha256 = "70ac5b24deabcaf0b250575a0454a35e127cf15023a3546ae41c01942c64c59b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hy-AM/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hy-AM/firefox-84.0b4.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "e93f74803b536d3b12b6e41d064a7adc5dc16615d045a2e6cf792d25477fbdc6";
+      sha256 = "9dfa8b99f67ce66625e0c89c37f4ee36b23421ca89d4445deb5dc82eb0eb05a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ia/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ia/firefox-84.0b4.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "931dbb0817dd797c5af61bc683f3d95ed99ad9834efe2f66a50f9e444e708061";
+      sha256 = "4445dc874962b72f7d9096cb46ff98987b56d9c2d3e0acd814fc8c59261363b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/id/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/id/firefox-84.0b4.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "1e1afcecc3bcadfbd6989eefc191f8d5cfd0f4d29c1f6814927370aa647af854";
+      sha256 = "16c6550910555ddfc395b0c9626dd6e41a4bc9bd4a8ddbfb2867faa991cd4ae4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/is/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/is/firefox-84.0b4.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "4907987557a6a560557d417dcc31f9c7dd45dc0d2767ed050770f6fc6f308641";
+      sha256 = "1c208c0b99cd008d67e8c9c1d118f7b2c8c354b4dcf740554fc2474ff93b8a7c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/it/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/it/firefox-84.0b4.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "d895c87359cfb98e236c4b5bac92391528eef07a45dca2d067a7d55fed4ebe7c";
+      sha256 = "cac410ba1679d27565d63d3a70920d3ff262b6171dfe732c3ec7ee88d3386b14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ja/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ja/firefox-84.0b4.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "30dc7aee461930bea42c9f2985ff766f4aaf3ec0bd7f09562626b155bf80f202";
+      sha256 = "0b8c20ac0a4394c8c4a106e65d83718f639453e10c54906da04f4da536a218e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ka/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ka/firefox-84.0b4.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "d452668daf3b5a9f0602417822f7581183dfd5dbcc5d770afa20e1d61d557003";
+      sha256 = "978aad2d0855ed8e364faf4a0522d7271bbd134c699da515db7e5c58dca79d49";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/kab/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/kab/firefox-84.0b4.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "5e828a4f6abbb80c7b575db2a70ddcff0d734f11eb9bca55c2b8d00f08fa6497";
+      sha256 = "f32b2f9cd504a6d4d5b5d2ce47368cad4317cb1249dbd7d925d0c48098fba8be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/kk/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/kk/firefox-84.0b4.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "994e8ccd626f3e640b8a1b687a22ae6e3943b25995278f3333b6814ce61185c2";
+      sha256 = "38e2fef40b71d50b85be7a2d2c44bc0b0bc569410782119fbe07aba00c8193f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/km/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/km/firefox-84.0b4.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "a63ad9f77f01523dfb02eb6c2880a4046a556bae6d329a5e5480aa3eea0aec85";
+      sha256 = "c8a617eeaba39e138676c8412594329b00d372c40a0401a77e5bf974a407a3b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/kn/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/kn/firefox-84.0b4.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "5396452efe004c7cb57105bb7134875e073f822927a98db23e96994e11fc7155";
+      sha256 = "d1f19e2edfd1ee97b13b8e42c22f1409174c8fb4b024612d27cbb3ab9586ca1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ko/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ko/firefox-84.0b4.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "a0bd2586531902121344b7c70e9ec9ae4e08514d2c467a17664701735f8d74ab";
+      sha256 = "8e1f68d6bf97644616e8d8a39443061fe99df088b42e5218beb823d8cd18b8e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/lij/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/lij/firefox-84.0b4.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "ac4f16381c71e3a4f00c6ac615913cc7d5eda77dd9ca337b9a8ec0e63a2e9176";
+      sha256 = "ba22770bc65b0033f424ce30df69a7d21a728245230696b412baf44aa9a111a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/lt/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/lt/firefox-84.0b4.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "bbeda439051c1ff43ba08b95de57914237e7b9845fef0d92efa02265cdc81961";
+      sha256 = "27ab65ac4ee08e2714ca7c493a4575352df4a06532773197a2bb3da86e9a18c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/lv/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/lv/firefox-84.0b4.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "bb500de9c32241a7e28828e3f9b89427be1a54475d7b05b9c678d489a457c329";
+      sha256 = "4a8f6944d9b6134d664e08eb404e130a218497b4957437b56e4487a8bc205ca5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/mk/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/mk/firefox-84.0b4.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "5689b2805b30cece9f9757a1869906529a7094b4a9de5d5180a5bea7582606de";
+      sha256 = "885893b0a9ef75cd623f21c720aee07357ff3b4b21ccfbe456fc11928ef7037f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/mr/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/mr/firefox-84.0b4.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "fc5ec6938f33c548f52cfb90f8a40b342bc9b4a7b97c3fcc1b3cd2aa5a031270";
+      sha256 = "55aa8e1e4b61eb3b9a26fe9abafa804e7b6d34ac1f36efadf10ee13d2cd934a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ms/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ms/firefox-84.0b4.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "374e2a6ea3c59c7f985606f2e631294b57e20d7aff2bd8256ef9c91189e960b3";
+      sha256 = "61412fde864addb40fa2d0ab42f30cb9a7e1887cd130ab59880763d675b6f7fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/my/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/my/firefox-84.0b4.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "d9058df8893da03a707e549d9f133942fa71bf51e06c1a654f3ac588d79af82b";
+      sha256 = "cd7190acda6e20c22edcb99c88c15e87b4676b2dba7de0578d2ab32a22b2bc1b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/nb-NO/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/nb-NO/firefox-84.0b4.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "11019961c5378bb86b45b2c6d4b74ca1e41e86aed500ec0cd73fbe1785ef7742";
+      sha256 = "97f16d919eb8321c71864daba7accfcd9bd86d4948bc86df44fa86a52649ad8e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ne-NP/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ne-NP/firefox-84.0b4.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "de45c606c961a38c84196cab1827089b1b22e2dd0c23302ce57bf9fcbfcaf82e";
+      sha256 = "4ebbdfb4c75621a24b52853c3d94e178decfe3bcaaa1f8f92f42bf91eedd874f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/nl/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/nl/firefox-84.0b4.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "bc2d98ae8f0fcc608d55b394398c45c1bcfcd02956031ca4762cc98d265916d8";
+      sha256 = "4b14585bb554bc346565a69b6a4c10580345923f8e4dbda8b202e6b9e8cf1452";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/nn-NO/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/nn-NO/firefox-84.0b4.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "b7c1d390a8bdf295ad8951959fcb720f977139592ef0f669005dcca0e6cbb19b";
+      sha256 = "408f34fb48fe1fa93850857118fc4ed972139e273ed2521cd9f7169f8d4148cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/oc/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/oc/firefox-84.0b4.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "a61a765b698f48c15cf07ea424e8e69be7630261a94c6514fa739974b51243f0";
+      sha256 = "0f7e1e4df86a931152206159a9f4e99b4241377c5545fb343eff86cd21869bec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/pa-IN/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/pa-IN/firefox-84.0b4.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "6721ca2f49b60f5ff1d86e0b1c9a1d6107c5d701b319a2abec7b6fcb9f845d57";
+      sha256 = "c7f85ae2c46585cab0aed8c41117ffd686fe0dac6e0ba64eb41bc22d4b8f01c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/pl/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/pl/firefox-84.0b4.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "a77c0c05be64f027d25feaa75a788c630dd7af831c0c2fa334db7c36ac340144";
+      sha256 = "2669e61a0d7da09684230c67c6d43091b3b51e12f291259a62c72ce124fa4c3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/pt-BR/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/pt-BR/firefox-84.0b4.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "2baf74be32eec18bb235b57ee3816a3c9df916bbd4458aab1613af864581a072";
+      sha256 = "10ac3662c49611f73fb96a13ef464c27b4ce08c25f0f44e253e6e5ce2239a45c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/pt-PT/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/pt-PT/firefox-84.0b4.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "0103da6d53b4a9e9512b8e3b90e583d8592a5bd02f09aedb90f49b1ce73516e6";
+      sha256 = "a6e606c6d4ca032653b46966c0b90e001474907424f4fef46669e2363ffb89f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/rm/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/rm/firefox-84.0b4.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "5dc1ace0d108460d6a57f7b158a1640d822c4e07a2e4d108db9f17e63150e4a1";
+      sha256 = "a8a8ee42020f62b38c125002ff6b5ad975d1a24df4e64f354f58fd949517e3c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ro/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ro/firefox-84.0b4.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "1e2ee8f338625bf95da2914e54b22e1a052cce955a92102163e67cacc41129b8";
+      sha256 = "f405c06f8041e4c90caed14e7d6fac38467976fd71a214f06eab8c2113c386c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ru/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ru/firefox-84.0b4.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "c57cda1ba6e8895044fbc55b37eb5e241b02904f69337a6430b3b9fd47a57fea";
+      sha256 = "acd2c0812a24b301aafb1278246495b07e346fbd9cd699da406b988dc3d393ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/si/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/si/firefox-84.0b4.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "e31df32be4babb9b1eeb5f6a5a44d1c94b07fd5c4bf70d8cc78d4061e1e790a0";
+      sha256 = "d444818f1e76a01a1170209497349331175ab9a761c27b31ddb89ff4d542ab9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sk/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sk/firefox-84.0b4.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "0630c3c617d1a646ab0acdc0c18346ac29066a8a31be9995f96e5daecc74bb24";
+      sha256 = "f2f3c9c4888f0055c10d1aae6cb1c40cc7f4d2bd1653e846768326e11b6ef2c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sl/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sl/firefox-84.0b4.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "65cc9e3d0e6af8743a768cf23b1dcb281d5ee26cbdf0fb2f0639cfe032f8cc07";
+      sha256 = "aeff79d992488895e47d3682d6b3661cfd1a86d39aff8c91313f057838075068";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/son/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/son/firefox-84.0b4.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "7f25deb9d71b23647722745d813e8e115e0d08190811efa4fc0b6456ee5bc634";
+      sha256 = "860900ac8f3fde5511a294a4f41e553d4853c4592d4446441399fda78a91898a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sq/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sq/firefox-84.0b4.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "e103461a63337bd7905345091edde08056eb267a522a205d6308e33d477f7d49";
+      sha256 = "9122e1837c732b8cf242f211937b3fc445b6a48da3db01cbaa4a0d00117848a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sr/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sr/firefox-84.0b4.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "cfaead5b0913dd265c18e42793a2a845aeb6e421b6c54a0f979bc80cd7a6cb18";
+      sha256 = "a3c15061deb11e870d83138bf65beb5a838cc3ba96d067d3e72f816f818da3c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sv-SE/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sv-SE/firefox-84.0b4.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "7343ae52dc3f85d35264fb6cc86daea45deed4cc3b7c3dc3078afdfde9a48919";
+      sha256 = "cb3d2dcf7d80501a8fa38c50d0301af9562050bc64250cc1c6208467990795d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ta/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ta/firefox-84.0b4.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "389ae6d8db8280f74944c2c5d61dc031ba4ae4db792c1f851ff72ebfb123b17c";
+      sha256 = "4ece8a45e79aae6e535d56370f8890c5d3045d0ca78bec67fe848367e518339a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/te/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/te/firefox-84.0b4.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "e49d8a521ffc7087c8d75f5ecbb9f6c010966c9f92dd4c105278aeeee1eee865";
+      sha256 = "70996e39e5b38f7def90f1eadbdbb294992e4ad27a49d4941b3982a0d3f8421b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/th/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/th/firefox-84.0b4.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "a27ff17d3bd090cf5bf798465dbeb3e369ea03a738729b748a0b03bb2d0418f8";
+      sha256 = "36720f87e8b3ee23f15ff48514931747d05638194e9b13b30017e601b8a5c905";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/tl/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/tl/firefox-84.0b4.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "5826bcb2683e74bc5588c7b12099d9d2ac70ecb0026d375bea92d94a3f381f70";
+      sha256 = "d433a22f97bcb69570933b1f371c248ebd2eb83a217bcc1989897c08175cbcd0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/tr/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/tr/firefox-84.0b4.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "73d79d2dfc0c7ac86566c1d41a6cbf6367ff57a6c5dcd459e1994d5bb8290fe8";
+      sha256 = "0787dd09f287aab492610d2ce23d0be7bc3a2158e84d7e94345358a750ddb752";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/trs/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/trs/firefox-84.0b4.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "a8b7cab92a7b449ce57a2eaf6a447e4cec99fbd8dd43ffe36dd4b87cd04c19a7";
+      sha256 = "4d3bd35ed7c43eb502f482bb60da0dbf14714b35e2996362c835a0a35008308a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/uk/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/uk/firefox-84.0b4.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "af59707ac1141ed356a9bacfa116d0a65236352f6bbbddd69e8544a551064782";
+      sha256 = "8e1c371acd0bd1762c715c8e36dbc8df104351cbb3c37fab64c72b55bc98f006";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ur/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ur/firefox-84.0b4.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "4a6068c0384b69592312bde06631584e612fd1f17d0af4b71dbfe38fe19dd413";
+      sha256 = "14b6149229f49406755a5ee308e0e120964595a1f9a7f2f7e9cc2979a5cf561a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/uz/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/uz/firefox-84.0b4.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "a6f01fd45fc403dff8a97be0bcdcd2837eff7880ad039eab2cb31a2eca82c6e9";
+      sha256 = "a8adf840548ac5974654234956957b8e53f3e36c83cfad4fa5c840c16e9e4d5c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/vi/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/vi/firefox-84.0b4.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "b7cc325a09e7e5a6097c81055eec760452ebff160af5e5f9b7a790a2d3fba53d";
+      sha256 = "fc9b023caaabb3a5a18a21a2d65195a7dc7b2655a5d9a1f4c75434cb1f02e4da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/xh/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/xh/firefox-84.0b4.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "64e6d44ed8b07fefb110463e1003cab01503a52bcb72c76d6030325cd6c796d9";
+      sha256 = "940b4e34e92a0efa397d3944fb6b8c5afea57f29355c9f9621accb557efd9860";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/zh-CN/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/zh-CN/firefox-84.0b4.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "11312a9a212159bb929df04217292481b9aacdebc50ae941729b37f9c7c8312b";
+      sha256 = "b1284ea7ec8e42c6139249b1958380e672dd19e7b8c21d95e256e0d3265bd095";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/zh-TW/firefox-80.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/zh-TW/firefox-84.0b4.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "0b3f5974dd951fe9ec988c8608b186a2d5ebbc397fb017d587e869cbe4dcc74b";
+      sha256 = "ac76d109c7817b9c06356918860216a3e2f4f776a31a8690064593ffc43139d9";
     }
     ];
 }

From 7677449d51ed28162d91743a5badccc820d6809b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 25 Nov 2020 13:41:12 +0100
Subject: [PATCH 3600/3942] mpc-qt: Fix compilation failure due to mpv changes

---
 pkgs/applications/video/mpc-qt/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
index 07b4c79a5b3d..13c27879b190 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtx11extras, qttools, mpv }:
+{ stdenv, mkDerivation, fetchFromGitLab, fetchurl, pkg-config, qmake, qtx11extras, qttools, mpv }:
 
 mkDerivation rec {
   pname = "mpc-qt";
@@ -11,7 +11,14 @@ mkDerivation rec {
     sha256 = "1cis8dl9pm91mpnp696zvwsfp96gkwr8jgs45anbwd7ldw78w4x5";
   };
 
-  nativeBuildInputs = [ pkgconfig qmake qttools ];
+  patches = [
+    (fetchurl {
+      url = "https://gitlab.com/mpc-qt/mpc-qt/-/commit/02f2bc7a22e863a89ba322b9acb61cf1aef23ba0.diff";
+      sha256 = "15gcpcs54k09pndlpcfwb3fa0cg9fszyyb6vbp0hpgspy43183lx";
+    })
+  ];
+
+  nativeBuildInputs = [ pkg-config qmake qttools ];
 
   buildInputs = [ mpv qtx11extras ];
 

From 588cf724434748f7e75fc1b74097b0ff7c29a9cd Mon Sep 17 00:00:00 2001
From: Florian Engel <florianengel39@gmail.com>
Date: Wed, 25 Nov 2020 13:49:23 +0100
Subject: [PATCH 3601/3942] monetdb: 11.39.5 -> 11.39.7

---
 pkgs/servers/sql/monetdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 699fcf8569fe..04617943e269 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "monetdb";
-  version = "11.39.5";
+  version = "11.39.7";
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
-    sha256 = "1hdlab2gcj71yw6sb3yvl8s027blcsyvch3n5sgi0a2yz84wj765";
+    sha256 = "0qb2hlz42400diahmsbflfjmfnzd5slm6761xhgvh8s4rjfqm21w";
   };
 
   postPatch = ''

From 96ce7ccb9310438acb2400b76eac4ee70e957fe5 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Wed, 25 Nov 2020 13:49:26 +0100
Subject: [PATCH 3602/3942] slirp4netns: 1.1.6 -> 1.1.7

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/tools/networking/slirp4netns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix
index 39b361bd3020..143b25849de6 100644
--- a/pkgs/tools/networking/slirp4netns/default.nix
+++ b/pkgs/tools/networking/slirp4netns/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "slirp4netns";
-  version = "1.1.6";
+  version = "1.1.7";
 
   src = fetchFromGitHub {
     owner = "rootless-containers";
     repo = "slirp4netns";
     rev = "v${version}";
-    sha256 = "1nspvzcpwmaipdq49jm7z3ymdg95zqgcyv1cjfs1zb950knrrggr";
+    sha256 = "1zvmsin7pgfwafj5qr8fcixg01xfq1xhjd93klyxhmacfxirhkgw";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

From 9100dac4537d50d96401143c1196331f3e6cbe4a Mon Sep 17 00:00:00 2001
From: Nick Braga <nbr@users.noreply.github.com>
Date: Wed, 25 Nov 2020 08:10:45 -0500
Subject: [PATCH 3603/3942] chromedriver: 85.0.4183.87 -> 86.0.4240.22
 (#101974)

---
 pkgs/development/tools/selenium/chromedriver/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index fc743d560168..8bed549015c1 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -6,12 +6,12 @@ let
   allSpecs = {
     x86_64-linux = {
       system = "linux64";
-      sha256 = "0absr1fp2h87gpyw6jxj2f08sbhkkh3pf13145hfyzdvajj5rfjy";
+      sha256 = "0ndig3gq00nr3zs5f7wl1xw5vsnz1hwmjfrk73vbmb8lqjnfm66l";
     };
 
     x86_64-darwin = {
       system = "mac64";
-      sha256 = "1p9k92fgyx0xis6r50vhcpx3iws2gaspq3dnpigglv3bj9yg8zvi";
+      sha256 = "1ipxla0d8wa2rn3872xpc5akbmk2rnplk9clrdncmdzakw7f66im";
     };
   };
 
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "chromedriver";
-  version = "85.0.4183.87";
+  version = "86.0.4240.22";
 
   src = fetchurl {
     url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";

From bee90bae9a84305f4c0ac0fab4036ecf85114173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 25 Nov 2020 14:26:25 +0100
Subject: [PATCH 3604/3942] perlPackages.TermReadPassword: init at 0.11

---
 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 7df0d7add393..e922eb8884bb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -19278,6 +19278,22 @@ let
     };
   };
 
+  TermReadPassword = buildPerlPackage rec {
+    pname = "Term-ReadPassword";
+    version = "0.11";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PH/PHOENIX/${pname}-${version}.tar.gz";
+      sha256 = "08s3zdqbr01qf4h8ryc900qq1cjcdlyy2dq0gppzzy9mbcs6da71";
+    };
+
+    outputs = [ "out" ];
+
+    meta = {
+      description = "This module lets you ask the user for a password in the traditional way, from the keyboard, without echoing";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   TermShell = buildPerlModule {
     pname = "Term-Shell";
     version = "0.11";

From ad62155cb65a9aa0153dbde5be8698b715003473 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Thu, 5 Nov 2020 02:29:46 +0000
Subject: [PATCH 3605/3942] nixos/zram: add zramSwap.memoryMax option

This allows capping the total amount of memory that will be used for
zram-swap, in addition to the percentage-based calculation, which is
useful when blanket-applying a configuration to many machines.

This is based off the strategy used by Fedora for their rollout of
zram-swap-by-default in Fedora 33
(https://fedoraproject.org/wiki/Changes/SwapOnZRAM), which caps the
maximum amount of memory used for zram at 4GiB.

In future it might be good to port this to the systemd zram-generator,
instead of using this separate infrastructure.
---
 nixos/modules/config/zram.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix
index 341101bc184c..1f513b7e4dae 100644
--- a/nixos/modules/config/zram.nix
+++ b/nixos/modules/config/zram.nix
@@ -80,6 +80,15 @@ in
         '';
       };
 
+      memoryMax = mkOption {
+        default = null;
+        type = with types; nullOr int;
+        description = ''
+          Maximum total amount of memory (in bytes) that can be used by the zram
+          swap devices.
+        '';
+      };
+
       priority = mkOption {
         default = 5;
         type = types.int;
@@ -146,7 +155,12 @@ in
 
               # Calculate memory to use for zram
               mem=$(${pkgs.gawk}/bin/awk '/MemTotal: / {
-                  print int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024)
+                  value=int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024);
+                    ${lib.optionalString (cfg.memoryMax != null) ''
+                      memory_max=int(${toString cfg.memoryMax}/${toString devicesCount});
+                      if (value > memory_max) { value = memory_max }
+                    ''}
+                  print value
               }' /proc/meminfo)
 
               ${pkgs.util-linux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev}

From 6421a1b0ceaa820330b883645cb7eb2231b7182c Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Wed, 25 Nov 2020 12:28:28 +0000
Subject: [PATCH 3606/3942] factorio-experimental,
 factorio-headless-experimental: 1.1.0 -> 1.1.1

---
 pkgs/games/factorio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 6feac05309ca..07361f1c7428 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -63,11 +63,11 @@ let
     x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
       alpha = {
         stable        = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; };
-        experimental  = bdist { sha256 = "0n00nbh44nyf485jys6pkga3pb9j4zywk0liq6jq99pil6z7na3y"; version = "1.1.0"; withAuth = true; };
+        experimental  = bdist { sha256 = "0z7krilzk91sblik2i9lvsifwq9j5j6jv7jhmndkz4qmp845w1ax"; version = "1.1.1"; withAuth = true; };
       };
       headless = {
         stable        = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; };
-        experimental  = bdist { sha256 = "15qiwz3wvyaidndrrm1wfznbidnpf12wpzb8vlm9g0gaq3b0f6h6"; version = "1.1.0"; };
+        experimental  = bdist { sha256 = "1nb9w876dij3ar14s5y96k04nbh9i4a7rggbbck5xmr7pa6snqx4"; version = "1.1.1"; };
       };
       demo = {
         stable        = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; };

From 8406e0bcd18e24e6db6ddc409ff1dd735d18e809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Wed, 25 Nov 2020 15:21:35 +0100
Subject: [PATCH 3607/3942] yubioath-desktop: fix python git dependency
 (#104884)

fixes https://github.com/NixOS/nixpkgs/issues/104826
---
 ...place-git-with-normal-python-package.patch | 24 +++++++++++++++++++
 .../misc/yubioath-desktop/default.nix         |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch

diff --git a/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch b/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch
new file mode 100644
index 000000000000..d56a6cfab073
--- /dev/null
+++ b/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch
@@ -0,0 +1,24 @@
+From 5eb4d6a384753896d495b09d8651c48672ef234d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
+Date: Wed, 25 Nov 2020 11:26:49 +0100
+Subject: [PATCH] replace git with normal python package
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ requirements.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index ef25aad..b4246a4 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,2 +1,2 @@
+-git+https://github.com/Yubico/yubikey-manager.git
++yubikey-manager
+ ./py/qr
+-- 
+2.29.2
+
diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix
index c6a1022288f7..460b34416ff5 100644
--- a/pkgs/applications/misc/yubioath-desktop/default.nix
+++ b/pkgs/applications/misc/yubioath-desktop/default.nix
@@ -19,6 +19,10 @@ mkDerivation rec {
 
   nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ];
 
+  patches = [
+    ./0001-replace-git-with-normal-python-package.patch
+  ];
+
   postPatch = ''
     substituteInPlace deployment.pri \
       --replace '/usr/bin' "$out/bin"

From 3ae802b342dd308d6d836c69bd2c625f51066943 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 09:00:47 +0000
Subject: [PATCH 3608/3942] pwntools: 4.2.2 -> 4.3.0

---
 pkgs/development/python-modules/pwntools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix
index fa4e4cc94191..11c3f1dd8eb0 100644
--- a/pkgs/development/python-modules/pwntools/default.nix
+++ b/pkgs/development/python-modules/pwntools/default.nix
@@ -24,12 +24,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.2.2";
+  version = "4.3.0";
   pname = "pwntools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0iv802v67x2fy35q7m27j6xnz94l3w509z8c1286schgav1dw7f4";
+    sha256 = "007xbm4pg28bhv7j7m8gmzsmr9x7pdb7rkm5y80mca8kb7gw59xv";
   };
 
   # Upstream has set an upper bound on unicorn because of https://github.com/Gallopsled/pwntools/issues/1538,

From 13b8ff4ecf6c3a762965a1825e51de90058c4c9c Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Wed, 25 Nov 2020 16:21:09 +0100
Subject: [PATCH 3609/3942] fuse-overlayfs: 1.2.0 -> 1.3.0

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/tools/filesystems/fuse-overlayfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index 7e6bd7440b30..4aafe8d6d628 100644
--- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fuse-overlayfs";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ihibhj48fk1c89yh7vyb44mkywxphxqqgz7xks9caw05qw5ac1y";
+    sha256 = "00pzwxn5a7dwz9ngl98198lx1c3nlhalzajyqazw9ydjkxibfpay";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

From ac0ac4fe51080f0815a0bc4928dc2b23c802fdb2 Mon Sep 17 00:00:00 2001
From: tomberek <tomberek@users.noreply.github.com>
Date: Wed, 25 Nov 2020 10:27:28 -0500
Subject: [PATCH 3610/3942] dydisnix: init at unstable (#49366)

* dydisnix: init at unstable-2018-04-26

updated with suggestions from @xeji

* Update pkgs/tools/package-management/disnix/dydisnix/default.nix

Co-Authored-By: Ryan Mulligan <ryan@ryantm.com>

* Add dydisxnix and libnixxml

Co-authored-by: Ryan Mulligan <ryan@ryantm.com>
Co-authored-by: Tom Bereknyei <tom@rebelliondefense.com>
---
 .../libraries/libnixxml/default.nix           | 27 +++++++++++++++++++
 .../package-management/disnix/default.nix     |  4 +--
 .../disnix/dydisnix/default.nix               | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/libnixxml/default.nix
 create mode 100644 pkgs/tools/package-management/disnix/dydisnix/default.nix

diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix
new file mode 100644
index 000000000000..5741d4cb5b8a
--- /dev/null
+++ b/pkgs/development/libraries/libnixxml/default.nix
@@ -0,0 +1,27 @@
+{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, libxml2, gd, glib, getopt, libxslt, nix }:
+
+stdenv.mkDerivation {
+  name = "libnixxml";
+  src = fetchFromGitHub {
+    owner = "svanderburg";
+    repo = "libnixxml";
+    rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a";
+    sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ=";
+  };
+  configureFlags = [ "--with-gd" "--with-glib" ];
+  CFLAGS = "-Wall";
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ pkgconfig libxml2 gd.dev glib getopt libxslt nix ];
+  doCheck = false;
+  postPatch = ''
+    ./bootstrap
+  '';
+
+  meta = with stdenv.lib; {
+    description = "XML-based Nix-friendly data integration library";
+    homepage = https://github.com/svanderburg/libnixxml;
+    license = licenses.mit;
+    maintainers = with maintainers; [ tomberek ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index cc6072eb6dc8..310ddc9b84e0 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintl, libiconv }:
+{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }:
 
 stdenv.mkDerivation {
   name = "disnix-0.9.1";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A Nix-based distributed service deployment tool";
     license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [ stdenv.lib.maintainers.sander ];
+    maintainers = with stdenv.lib.maintainers; [ sander tomberek ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/tools/package-management/disnix/dydisnix/default.nix
new file mode 100644
index 000000000000..552d2a106fba
--- /dev/null
+++ b/pkgs/tools/package-management/disnix/dydisnix/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }:
+
+stdenv.mkDerivation rec {
+  version="2020-07-04";
+  name = "dydisnix-${version}";
+
+  src = fetchFromGitHub {
+    owner = "svanderburg";
+    repo = "dydisnix";
+    rev = "e99091f1c2329d562097e35faedee80622d387f0";
+    sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0=";
+  };
+
+  nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
+  buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ];
+  preConfigure = ''
+    ./bootstrap
+  '';
+
+  meta = {
+    description = "A toolset enabling self-adaptive redeployment on top of Disnix";
+    longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems.";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    maintainers = [ stdenv.lib.maintainers.tomberek ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6984ee0a757b..40c7e40adfed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5423,6 +5423,8 @@ in
 
   libngspice = callPackage ../development/libraries/libngspice { };
 
+  libnixxml = callPackage ../development/libraries/libnixxml { };
+
   libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
 
   libportal = callPackage ../development/libraries/libportal { };
@@ -27773,6 +27775,8 @@ in
 
   dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {});
 
+  dydisnix = callPackage ../tools/package-management/disnix/dydisnix { };
+
   disnixos = callPackage ../tools/package-management/disnix/disnixos { };
 
   DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { };

From 17b13546af84c33634bb966f81064de70a8a0801 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Mon, 23 Nov 2020 23:12:43 +0100
Subject: [PATCH 3611/3942] mosh: name -> pname

---
 pkgs/tools/networking/mosh/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
index 26c9035cd79b..dba75400f6fa 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -3,10 +3,11 @@
 , libutempter ? null, withUtempter ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
-  name = "mosh-1.3.2";
+  pname = "mosh";
+  version = "1.3.2";
 
   src = fetchurl {
-    url = "https://mosh.org/${name}.tar.gz";
+    url = "https://mosh.org/mosh-${version}.tar.gz";
     sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s";
   };
 

From dc83d21140cbf390a3afc8c17fbf75d7a2388c56 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Wed, 7 Oct 2020 16:35:07 -0400
Subject: [PATCH 3612/3942] envchain: init at 1.0.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jon <jonringer@users.noreply.github.com>
Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com>
Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
---
 pkgs/tools/misc/envchain/default.nix | 32 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/misc/envchain/default.nix

diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix
new file mode 100644
index 000000000000..1bafa4688ae8
--- /dev/null
+++ b/pkgs/tools/misc/envchain/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, libedit, libsecret, ncurses, pkg-config, readline, Security }:
+
+stdenv.mkDerivation rec {
+  pname = "envchain";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "sorah";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0qxwiqhb8cg0zbn5p0mvnbyxx1xwvgiricrkjlvxz13sf2ngq87p";
+  };
+
+  postPatch = ''
+    sed -i -e "s|-ltermcap|-lncurses|" Makefile
+  '';
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ libsecret readline ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libedit ncurses Security ];
+
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Set environment variables with macOS keychain or D-Bus secret service";
+    homepage = "https://github.com/sorah/envchain";
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bbigras ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab0a1cf5c2f5..e990df6384bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3510,6 +3510,8 @@ in
 
   entr = callPackage ../tools/misc/entr { };
 
+  envchain = callPackage ../tools/misc/envchain { inherit (pkgs.darwin.apple_sdk.frameworks) Security; };
+
   eot_utilities = callPackage ../tools/misc/eot-utilities { };
 
   eplot = callPackage ../tools/graphics/eplot { };

From cfac68c4506b3ce630db1f1d9d0fd0cc9a83a36d Mon Sep 17 00:00:00 2001
From: con-f-use <con-f-use@gmx.net>
Date: Wed, 25 Nov 2020 16:55:23 +0100
Subject: [PATCH 3613/3942] maintainers: add confus

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9bcb1c54957f..569c6de7a88c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1755,6 +1755,12 @@
     githubId = 1740337;
     name = "Chris Ostrouchov";
   };
+  confus = {
+    email = "con-f-use@gmx.net";
+    github = "con-f-use";
+    githubId = 11145016;
+    name = "J.C.";
+  };
   contrun = {
     email = "uuuuuu@protonmail.com";
     github = "contrun";

From e981d3a4484bc2dda7611b51a6528e95a95fde0b Mon Sep 17 00:00:00 2001
From: Raghav Sood <r@raghavsood.com>
Date: Wed, 25 Nov 2020 22:23:43 +0800
Subject: [PATCH 3614/3942] photoflow: 2018-08-28 -> 2020-08-28

---
 .../graphics/photoflow/CMakeLists.patch       | 13 ++++
 .../graphics/photoflow/default.nix            | 70 ++++++++++++++-----
 2 files changed, 65 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/applications/graphics/photoflow/CMakeLists.patch

diff --git a/pkgs/applications/graphics/photoflow/CMakeLists.patch b/pkgs/applications/graphics/photoflow/CMakeLists.patch
new file mode 100644
index 000000000000..7d3d62b41b42
--- /dev/null
+++ b/pkgs/applications/graphics/photoflow/CMakeLists.patch
@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9b48beea..078ba20d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -603,7 +603,7 @@ ENDIF(APPLE)
+ #
+ # photoflow executable
+ #
+-add_executable(photoflow main.cc ${RESOURCE_OBJECT})
++add_executable(photoflow main.cc version.cc ${RESOURCE_OBJECT})
+ IF(APPLE)
+   set_target_properties(photoflow PROPERTIES LINK_FLAGS " -framework ApplicationServices ")
+ ENDIF(APPLE)
diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix
index 9fec8b99c1bd..cb8ef65b2e9e 100644
--- a/pkgs/applications/graphics/photoflow/default.nix
+++ b/pkgs/applications/graphics/photoflow/default.nix
@@ -1,42 +1,75 @@
-{ stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobject-introspection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }:
+{ automake
+, cmake
+, exiv2
+, expat
+, fetchFromGitHub
+, fftw
+, fftwFloat
+, gettext
+, glib
+, gobject-introspection
+, gtkmm2
+, lcms2
+, lensfun
+, libexif
+, libiptcdata
+, libjpeg
+, libraw
+, libtiff
+, libxml2
+, ninja
+, openexr
+, pcre
+, pkgconfig
+, pugixml
+, stdenv
+, swig
+, vips
+}:
 
-stdenv.mkDerivation {
-  name = "photoflow-unstable-2018-08-28";
+stdenv.mkDerivation rec {
+  pname = "photoflow";
+  version = "2020-08-28";
 
   src = fetchFromGitHub {
     owner = "aferrero2707";
-    repo = "PhotoFlow";
-    rev = "df03f2538ddd232e693c307db4ab63eb5bdfea38";
-    sha256 = "08ybhv08h24y4li8wb4m89xgrz1szlwpksf6vjharp8cznn4y4x9";
+    repo = pname;
+    rev = "8472024fb91175791e0eb23c434c5b58ecd250eb";
+    sha256 = "1bq4733hbh15nwpixpyhqfn3bwkg38amdj2xc0my0pii8l9ln793";
   };
 
+  patches = [ ./CMakeLists.patch ];
+
   nativeBuildInputs = [
+    automake
+    cmake
     gettext
     glib
+    gobject-introspection
     libxml2
+    ninja
     pkgconfig
     swig
-    automake
-    gobject-introspection
-    cmake
-    ninja
   ];
 
   buildInputs = [
-    libtiff
-    libjpeg
-    fftw
     exiv2
-    lensfun
+    expat
+    fftw
+    fftwFloat
     gtkmm2  # Could be build with gtk3 but proper UI theme is missing and therefore not very usable with gtk3
             # See: https://discuss.pixls.us/t/help-needed-for-gtk3-theme/5803
-    libraw
     lcms2
+    lensfun
     libexif
-    vips
-    expat
+    libiptcdata
+    libjpeg
+    libraw
+    libtiff
+    openexr
     pcre
     pugixml
+    vips
   ];
 
   cmakeFlags = [
@@ -51,6 +84,7 @@ stdenv.mkDerivation {
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.MtP ];
     platforms = platforms.linux;
-    broken = true;
+    # sse3 is not supported on aarch64
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From d402d913d754469f421572284e00292f83de1af5 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Wed, 25 Nov 2020 07:25:25 -0600
Subject: [PATCH 3615/3942] bluespec: unstable-2020.02.09 ->
 unstable-2020.11.04

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../compilers/bluespec/default.nix            | 53 +++++++++++--------
 .../bluespec/libstp_stub_makefile.patch       | 28 ++++++++++
 .../development/libraries/incrtcl/default.nix |  2 +
 pkgs/development/libraries/itktcl/default.nix |  2 +
 pkgs/top-level/all-packages.nix               |  4 +-
 5 files changed, 67 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/compilers/bluespec/libstp_stub_makefile.patch

diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix
index e1728e8c9318..df7b6585205a 100644
--- a/pkgs/development/compilers/bluespec/default.nix
+++ b/pkgs/development/compilers/bluespec/default.nix
@@ -4,40 +4,45 @@
 , autoconf
 , automake
 , fontconfig
-, gmp
+, gmp-static
 , gperf
 , libX11
 , libpoly
 , perl
+, flex
+, bison
 , pkgconfig
+, itktcl
+, incrtcl
+, tcl
+, tk
 , verilog
 , xorg
+, yices
 , zlib
 , ghc
 }:
 
 let
-  # yices wants a libgmp.a and fails otherwise
-  gmpStatic = gmp.override { withStatic = true; };
-
-  ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb]));
+  ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb split ]));
 in stdenv.mkDerivation rec {
   pname = "bluespec";
-  version = "unstable-2020.02.09";
+  version = "unstable-2020.11.04";
 
   src = fetchFromGitHub {
-    owner  = "B-Lang-org";
-    repo   = "bsc";
-    rev    = "05c8afb08078e437c635b9c708124b428ac51b3d";
-    sha256 = "06yhpkz7wga1a0p9031cfjqbzw7205bj2jxgdghhfzmllaiphniy";
-    fetchSubmodules = true;
-  };
+      owner  = "B-Lang-org";
+      repo   = "bsc";
+      rev    = "103357f32cf63f2ca2b16ebc8e2c675ec5562464";
+      sha256 = "0iikzx0fxky0fmc31lyxfldy1wixr2mayzcn24b8d76wd4ix1vk3";
+    };
 
   enableParallelBuilding = true;
 
-  buildInputs = [
+  patches = [ ./libstp_stub_makefile.patch ];
+
+  buildInputs = yices.buildInputs ++ [
     zlib
-    gmpStatic gperf libpoly # yices
+    tcl tk
     libX11 # tcltk
     xorg.libXft
     fontconfig
@@ -46,6 +51,8 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     automake autoconf
     perl
+    flex
+    bison
     pkgconfig
     ghcWithPackages
   ];
@@ -54,13 +61,13 @@ in stdenv.mkDerivation rec {
     verilog
   ];
 
-  patches = [
-    # drop stp support https://github.com/B-Lang-org/bsc/pull/31
-    (fetchpatch {
-      url = "https://github.com/flokli/bsc/commit/0bd48ecc2561541dc1368918863c0b2f4915006f.patch";
-      sha256 = "0bam9anld33zfi9d4gs502g94w49zhl5iqmbs2d1p5i19aqpy38l";
-    })
-  ];
+
+  postUnpack = ''
+    mkdir -p $sourceRoot/src/vendor/yices/v2.6/yices2
+    # XXX: only works because yices.src isn't a tarball.
+    cp -av ${yices.src}/* $sourceRoot/src/vendor/yices/v2.6/yices2
+    chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2
+  '';
 
   preBuild = ''
     patchShebangs \
@@ -72,11 +79,15 @@ in stdenv.mkDerivation rec {
     substituteInPlace src/comp/Makefile \
       --replace 'BINDDIR' 'BINDIR' \
       --replace 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils'
+    # allow running bsc to bootstrap
+    export LD_LIBRARY_PATH=/build/source/inst/lib/SAT
   '';
 
   makeFlags = [
+    "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices.src instead of the subrepo)
     "NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12
     "LDCONFIG=ldconfig" # https://github.com/B-Lang-org/bsc/pull/43
+    "STP_STUB=1"
   ];
 
   installPhase = "mv inst $out";
diff --git a/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch b/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch
new file mode 100644
index 000000000000..c714afc670c5
--- /dev/null
+++ b/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch
@@ -0,0 +1,28 @@
+diff -ru bsc-orig/src/vendor/stp/Makefile bsc-new/src/vendor/stp/Makefile
+--- bsc-orig/src/vendor/stp/Makefile	1969-12-31 16:00:01.000000000 -0800
++++ bsc-new/src/vendor/stp/Makefile	2020-11-12 17:42:40.115143035 -0800
+@@ -9,12 +9,13 @@
+ SRC = src
+ else
+ SRC = src_stub
++SNAME += lib/libstp_stub.so
+ endif
+ 
+ ifeq ($(OSTYPE), Darwin)
+-SNAME=libstp.dylib
++SNAME = lib/libstp.dylib
+ else
+-SNAME=libstp.so.1
++SNAME += lib/libstp.so.1
+ endif
+ 
+ all: install
+@@ -23,7 +24,7 @@
+ 	$(MAKE) -C $(SRC) install
+ 	ln -fsn HaskellIfc include_hs
+ 	install -m 755 -d $(PREFIX)/lib/SAT
+-	install -m 644 lib/$(SNAME) $(PREFIX)/lib/SAT
++	install -m 644 $(SNAME) $(PREFIX)/lib/SAT
+ 
+ clean:
+ 	$(MAKE) -C $(SRC) clean
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index 614a8f048aa5..c08d5924b0c5 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
   postInstall = ''
     rmdir $out/bin
     mv $out/lib/itcl${version}/* $out/lib
+    ln -s libitcl${version}${stdenv.hostPlatform.extensions.sharedLibrary} \
+      $out/lib/libitcl${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary}
     rmdir $out/lib/itcl${version}
   '';
 
diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/libraries/itktcl/default.nix
index 36503fc1add9..3c70369eb91e 100644
--- a/pkgs/development/libraries/itktcl/default.nix
+++ b/pkgs/development/libraries/itktcl/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
   postInstall = ''
     rmdir $out/bin
     mv $out/lib/itk${version}/* $out/lib
+    ln -s libitk${version}${stdenv.hostPlatform.extensions.sharedLibrary} \
+      $out/lib/libitk${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary}
     rmdir $out/lib/itk${version}
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40c7e40adfed..e8ab277f035f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8730,7 +8730,9 @@ in
 
   binaryen = callPackage ../development/compilers/binaryen { };
 
-  bluespec = callPackage ../development/compilers/bluespec { };
+  bluespec = callPackage ../development/compilers/bluespec {
+    gmp-static = gmp.override { withStatic = true; };
+  };
 
   ciao = callPackage ../development/compilers/ciao { };
 

From 7afd50501b66f2faa4f884adbffff55da5f95ff8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 07:50:18 +0000
Subject: [PATCH 3616/3942] python37Packages.jupyterlab-git: 0.22.3 -> 0.23.1

---
 pkgs/development/python-modules/jupyterlab-git/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index b69572df7458..c2304dcf44df 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab_git";
-  version = "0.22.3";
+  version = "0.23.1";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "434ff9edd1190809e02e0cbf50090c28de48a51e151a1f904ac66e902244398d";
+    sha256 = "3c709c33df0b838e50f76fa2e7e0302bd3c32ec24e161ee0e8f436a3844e8b16";
   };
 
   propagatedBuildInputs = [ notebook nbdime git ];

From 3c72ba6898bc92170bc42de10494c86d5eaf36a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 25 Nov 2020 13:46:37 +0100
Subject: [PATCH 3617/3942] python3Packages.jupyterlab-git: Disable tests on
 darwin

---
 pkgs/development/python-modules/jupyterlab-git/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index c2304dcf44df..3e218a6b4a32 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -1,4 +1,4 @@
-{ lib
+{ stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -20,6 +20,9 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ notebook nbdime git ];
 
+  # all Tests on darwin fail or are skipped due to sandbox
+  doCheck = !stdenv.isDarwin;
+
   checkInputs = [ pytest ];
 
   checkPhase = ''
@@ -28,7 +31,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "jupyterlab_git" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Jupyter lab extension for version control with Git.";
     license = with licenses; [ bsd3 ];
     homepage = "https://github.com/jupyterlab/jupyterlab-git";

From 8fb4c68d7abdf22211ef76f5e57bcbbf64b8630c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 13:43:13 +0000
Subject: [PATCH 3618/3942] python37Packages.genanki: 0.9.0 -> 0.9.1

---
 pkgs/development/python-modules/genanki/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix
index 201f7646e010..43fc1a0f7a87 100644
--- a/pkgs/development/python-modules/genanki/default.nix
+++ b/pkgs/development/python-modules/genanki/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "genanki";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e8bd0d117b2ddfc6bfebe86344979134c7acbd9e4c6cd04578df2cd6077785c1";
+    sha256 = "c944b74a5735e30ce098149788b89192fb3ba162fefb30f62105451a4a5b4c62";
   };
 
   propagatedBuildInputs = [

From a120e5404a72506f5f77cd210d4332825e65b92e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 14:36:02 +0000
Subject: [PATCH 3619/3942] python37Packages.smart_open: 3.0.0 -> 4.0.0

---
 pkgs/development/python-modules/smart_open/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix
index d5177dfd2e97..5486fb419525 100644
--- a/pkgs/development/python-modules/smart_open/default.nix
+++ b/pkgs/development/python-modules/smart_open/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "smart_open";
-  version = "3.0.0";
+  version = "4.0.0";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7f4e85b71df5a3618f5447d0b417b7a3576308c839690a24a70338b8993684c3";
+    sha256 = "2ce157700821e285bbacd8d01ec7a4f2582765460e541f55b216cb135db8be24";
   };
 
   # nixpkgs version of moto is >=1.2.0, remove version pin to fix build

From a2242b21c1a8e3e3136a4a21627294de69c8f99c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 14:08:42 +0000
Subject: [PATCH 3620/3942] python37Packages.ha-ffmpeg: 2.0 -> 3.0.2

---
 pkgs/development/python-modules/ha-ffmpeg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix
index cf119c1dec56..01d0343b171f 100644
--- a/pkgs/development/python-modules/ha-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "ha-ffmpeg";
-  version = "2.0";
+  version = "3.0.2";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "230f2fa990c9caaff1c67c2227b64756062248083849651a9bec7d599e519a42";
+    sha256 = "8d92f2f5790da038d828ac862673e0bb43e8e972e4c70b1714dd9a0fb776c8d1";
   };
 
   buildInputs = [ ffmpeg_3 ];

From 800c9078d53e9723b55a8acec4f9fae04bb3c90c Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Wed, 25 Nov 2020 17:47:38 +0100
Subject: [PATCH 3621/3942] mastodon-bot: 1.10.0 -> 1.10.2

1.10.0 does not work due to https://github.com/yogthos/mastodon-bot/issues/59
---
 pkgs/development/node-packages/node-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index b8caf50b8553..064d06d0ac28 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -84078,10 +84078,10 @@ in
   mastodon-bot = nodeEnv.buildNodePackage {
     name = "mastodon-bot";
     packageName = "mastodon-bot";
-    version = "1.10.0";
+    version = "1.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.10.0.tgz";
-      sha512 = "QRgdYB8llfN6iVpDXSXjJJ7b2fQRoT3hZJdPIUBX9aN1ci0mZlTX3mITcxXbmGtIyBHBhLavHwwxaBzYYuosqw==";
+      url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.10.2.tgz";
+      sha512 = "1hljd0khxrskgjjm6mhj2s90x5xmwzfrnxzirnhrcrc5sbmrj0xrabwdfp23c9iqc5p1hp8q2a53pryhr58nhl8i53svsyzmsph3s6i";
     };
     dependencies = [
       sources."acorn-5.7.4"
@@ -106370,4 +106370,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}

From fd1ed8e9307accb7da5b958d5325a2668bcbff21 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 16:09:39 +0000
Subject: [PATCH 3622/3942] python37Packages.dogpile_cache: 1.1.0 -> 1.1.1

---
 pkgs/development/python-modules/dogpile.cache/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix
index 1bbe6da3a9c4..f36e1347be9f 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "dogpile.cache";
-  version = "1.1.0";
+  version = "1.1.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eba3eb532be75a930f7a70c40c9a66829a3f7281650ad3cd3a786b2e4ba68e83";
+    sha256 = "40147b19696f387415a7efaaa4cf8ea0b5d31bdd1b53e5187e75d48ddfee9f0e";
   };
 
   # Disable concurrency tests that often fail,

From b48d71446acbcf7563d64fa48e5d819a2bc4006c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 25 Nov 2020 18:01:25 +0100
Subject: [PATCH 3623/3942] mpc-qt: use fetchpatch instead of fetchurl

---
 pkgs/applications/video/mpc-qt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
index 13c27879b190..d9de3eb699d4 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitLab, fetchurl, pkg-config, qmake, qtx11extras, qttools, mpv }:
+{ stdenv, mkDerivation, fetchFromGitLab, fetchpatch, pkg-config, qmake, qtx11extras, qttools, mpv }:
 
 mkDerivation rec {
   pname = "mpc-qt";
@@ -12,9 +12,9 @@ mkDerivation rec {
   };
 
   patches = [
-    (fetchurl {
+    (fetchpatch {
       url = "https://gitlab.com/mpc-qt/mpc-qt/-/commit/02f2bc7a22e863a89ba322b9acb61cf1aef23ba0.diff";
-      sha256 = "15gcpcs54k09pndlpcfwb3fa0cg9fszyyb6vbp0hpgspy43183lx";
+      sha256 = "0khld55i194zgi18d0wch5459lfzzkbfdbl1im8akvq8ks5xijis";
     })
   ];
 

From b41f944eeb2972d3f072431846a2d06251bb62f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 15:09:04 +0000
Subject: [PATCH 3624/3942] python37Packages.spacy: 2.3.2 -> 2.3.3

---
 pkgs/development/python-modules/spacy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 077aea4dc9a3..e14af1b21c83 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -22,11 +22,11 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07zf7kivj4r1n6xwisld7n90bpi095bqbc9xpv668grq1rpf53c1";
+    sha256 = "799fa5fc172ff0a5bc8eb5dfcd1db200747c114320d2dc40060594a71efa3e53";
   };
 
   propagatedBuildInputs = [

From 1f1ac382b2a14b2ec24e62c999d2074d75537b24 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 14:18:48 +0000
Subject: [PATCH 3625/3942] python37Packages.cftime: 1.2.1 -> 1.3.0

---
 pkgs/development/python-modules/cftime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix
index 1a29e51b35f5..0fe692c90265 100644
--- a/pkgs/development/python-modules/cftime/default.nix
+++ b/pkgs/development/python-modules/cftime/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "cftime";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ab5d5076f7d3e699758a244ada7c66da96bae36e22b9e351ce0ececc36f0a57f";
+    sha256 = "8d6a1144f43b9d7a180d7ceb3aa8015b7133c615fbac231bed184a91129f0207";
   };
 
   checkInputs = [ pytest coveralls pytestcov ];

From e6e0d9887736f750332d50cadcd9880ae1c98ac3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 12:00:11 +0000
Subject: [PATCH 3626/3942] executor: 23.1 -> 23.2

---
 pkgs/development/python-modules/executor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix
index 3e14074f186c..610d9b0b096c 100644
--- a/pkgs/development/python-modules/executor/default.nix
+++ b/pkgs/development/python-modules/executor/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "executor";
-  version = "23.1";
+  version = "23.2";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-executor";
     rev = version;
-    sha256 = "1jfmagw126di0qd82bydwvryqcxc54pqja3rbx3ny3fv1ahi5s7k";
+    sha256 = "1mr0662c5l5zx0wjapcprp8p2xawfd0im3616df5sgv79fqzwfqs";
   };
 
   propagatedBuildInputs = [ coloredlogs property-manager fasteners ];

From c024d24d4f761d63ce8885e068609b0fc2227d2d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Nov 2020 18:37:18 +0000
Subject: [PATCH 3627/3942] consul: 1.8.5 -> 1.8.6

---
 pkgs/servers/consul/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 8912ce847883..eef9054ae701 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "consul";
-  version = "1.8.5";
+  version = "1.8.6";
   rev = "v${version}";
 
   # Note: Currently only release tags are supported, because they have the Consul UI
@@ -17,7 +17,7 @@ buildGoModule rec {
     owner = "hashicorp";
     repo = pname;
     inherit rev;
-    sha256 = "1cf3zvb3xh97hz5hav9f1q3b22lwryw6a7gcmm7cphk6bdrdiva5";
+    sha256 = "1jrvh4khxr12dzmsyfn8ch26rlk4cd65fqafsr7prjjbbjnpmgck";
   };
 
   passthru.tests.consul = nixosTests.consul;

From d26dae674840ed640ce5cff8382d1a031dc4aa81 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Nov 2020 05:59:26 +0000
Subject: [PATCH 3628/3942] omnisharp-roslyn: 1.37.3 -> 1.37.4

---
 pkgs/development/tools/omnisharp-roslyn/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
index 24631481fde2..9dd085b421fe 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   pname = "omnisharp-roslyn";
-  version = "1.37.3";
+  version = "1.37.4";
 
   src = fetchurl {
     url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz";
-    sha256 = "09h4yxswrpxw9w4wscarbv2gypk9bwwsmpqyjfp6b5bh1frx2i67";
+    sha256 = "0pknphydf194n7rjyax4mh8n7j8679j0jflw63gfgh37daxry0r2";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     cd ..
-		cp -r src $out/
+    cp -r src $out/
     ls -al $out/src
     makeWrapper ${mono5}/bin/mono $out/bin/omnisharp \
     --add-flags "$out/src/OmniSharp.exe"

From f9b2e8f5793b15709488d8c8fc517af4d27f727b Mon Sep 17 00:00:00 2001
From: Mrinal <github@mrinalpurohit.in>
Date: Wed, 25 Nov 2020 22:49:56 +0530
Subject: [PATCH 3629/3942] google-cloud-sdk: 315.0.0 -> 319.0.0 (#104886)

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 904cab312286..29592451734f 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,18 +21,18 @@ let
   sources = name: system: {
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "1lkmilj873ia8kigyfmqfjnlpi7jzq3q4m0ip3lr0a111nr3wi4m";
+      sha256 = "0kldvy63gba5k6ymybnggw3q3rlav1gcbpxiwnv6670lk5qzqdsw";
     };
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "0q20vaqr9rrzcp57jrskcmbdvqrfpr4lscki85824fdlpklc00ga";
+      sha256 = "1ifl4skwqhkapfwhymyz7v4jpwpd01n4x3956w5ci8c3zvw8l118";
     };
   }.${system};
 
 in stdenv.mkDerivation rec {
   pname = "google-cloud-sdk";
-  version = "315.0.0";
+  version = "319.0.0";
 
   src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
 

From 803b6b9ab64ba54db95864613fe255a50cf9a5b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 25 Nov 2020 18:30:52 +0100
Subject: [PATCH 3630/3942] mdds: fix compilation on darwin

---
 pkgs/development/libraries/mdds/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index e2115e84ff95..b69e99de414d 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost }:
+{ stdenv, fetchurl, boost, llvmPackages }:
 
 stdenv.mkDerivation rec {
   pname = "mdds";
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig"
   '';
 
+  buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
+
   checkInputs = [ boost ];
 
   meta = with stdenv.lib; {
@@ -21,7 +23,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.com/mdds/mdds";
     description = "A collection of multi-dimensional data structure and indexing algorithm";
     platforms = platforms.all;
-    broken = stdenv.isDarwin;
     license = licenses.mit;
   };
 }

From 1ff8d1b17266b1d16ecacee16207205f17cd8121 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 25 Nov 2020 12:45:06 -0500
Subject: [PATCH 3631/3942] python3Packages.botocore: 1.18.18 -> 1.19.25

---
 pkgs/development/python-modules/botocore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index d896367c7c6b..35d8113e831c 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.18.18"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.19.25"; # N.B: if you change this, change boto3 and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e224754230e7e015836ba20037cac6321e8e2ce9b8627c14d579fcb37249decd";
+    sha256 = "15hd5f2ars1hd3y2gh846fd0ydcgyjmkvncr6rdn4whbb5wkkbyc";
   };
 
   propagatedBuildInputs = [

From fce75e16c9152e9cabfc2bc61664e1d49b9780ce Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 25 Nov 2020 12:45:17 -0500
Subject: [PATCH 3632/3942] python3Packages.boto3: 1.15.18 -> 1.16.25

---
 pkgs/development/python-modules/boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 713b50c68291..889d829bee99 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.15.18"; # N.B: if you change this, change botocore too
+  version = "1.16.25"; # N.B: if you change this, change botocore too
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f56148e2c6b9a2d704218da42f07d72f00270bfddb13bc1bdea20d3327daa51e";
+    sha256 = "05qxcfis4rnkjxh8wyks3gcpg14cshpd2rrhb1adxd0hpq5aprhk";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

From 360a14dcf098642aba17221b698522af4c62aa0b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 25 Nov 2020 12:45:27 -0500
Subject: [PATCH 3633/3942] awscli: 1.18.150 -> 1.18.185

---
 pkgs/tools/admin/awscli/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 7c78587a05e5..bb7575118da6 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -14,16 +14,24 @@ let
           sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5";
         };
       });
+      # TODO: https://github.com/aws/aws-cli/pull/5712
+      colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
+        version = "0.4.3";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9";
+        };
+      });
     };
   };
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "awscli";
-  version = "1.18.150"; # N.B: if you change this, change botocore to a matching version too
+  version = "1.18.185"; # N.B: if you change this, change botocore to a matching version too
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jrxzr4dx2s6ychmrz19yz8i4kqcwj7f8ly82ydwvrr0ff62374g";
+    sha256 = "0yf8dmjgiib5s4dimc1896zxrrj0sl5kzrp7x8spm6xkcvwb02l1";
   };
 
   postPatch = ''

From ebeaae1454bf86197f1fb0ac8e0df19f687a0ad8 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sat, 7 Nov 2020 13:37:58 +0000
Subject: [PATCH 3634/3942] teamspeak_client: 3.5.3 -> 3.5.6

---
 .../instant-messengers/teamspeak/client.nix          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 7d2586c67081..ba726d5b3771 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -33,13 +33,13 @@ in
 stdenv.mkDerivation rec {
   pname = "teamspeak-client";
 
-  version = "3.5.3";
+  version = "3.5.6";
 
   src = fetchurl {
     url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run";
     sha256 = if stdenv.is64bit
-                then "0fp9v2rkxf0zgvf3wcx8nsmf93bzdc22xlqxk3r8cb0415adp76a"
-                else "0ni7hijprc8xygyz41568f1m9wwhl8lk5c3q28bm9m5r6qym39l6";
+                then "sha256:0hjai1bd4mq3g2dlyi0zkn8s4zlgxd38skw77mb78nc4di5gvgpg"
+                else "sha256:1y1c65nap91nv9xkvd96fagqbfl56p9n0rl6iac0i29bkysdmija";
   };
 
   # grab the plugin sdk for the desktop icon
@@ -99,15 +99,15 @@ stdenv.mkDerivation rec {
   dontStrip = true;
   dontPatchELF = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "The TeamSpeak voice communication tool";
     homepage = "https://teamspeak.com/";
     license = {
       fullName = "Teamspeak client license";
-      url = "http://sales.teamspeakusa.com/licensing.php";
+      url = "https://www.teamspeak.com/en/privacy-and-terms/";
       free = false;
     };
-    maintainers = [ stdenv.lib.maintainers.lhvwb ];
+    maintainers = with maintainers; [ lhvwb lukegb ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }

From 4196aa9660a3168ef28dd783a0fff4e11695506e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 25 Nov 2020 13:00:41 -0500
Subject: [PATCH 3635/3942] awscli: Add test

---
 nixos/tests/all-tests.nix           |  1 +
 nixos/tests/awscli.nix              | 17 +++++++++++++++++
 pkgs/tools/admin/awscli/default.nix |  7 ++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/awscli.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 899509696e3c..771ee9bdbd33 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -28,6 +28,7 @@ in
   atd = handleTest ./atd.nix {};
   avahi = handleTest ./avahi.nix {};
   avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };
+  awscli = handleTest ./awscli.nix { };
   babeld = handleTest ./babeld.nix {};
   bazarr = handleTest ./bazarr.nix {};
   bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64
diff --git a/nixos/tests/awscli.nix b/nixos/tests/awscli.nix
new file mode 100644
index 000000000000..35bdd6d99b1a
--- /dev/null
+++ b/nixos/tests/awscli.nix
@@ -0,0 +1,17 @@
+import ./make-test-python.nix ({ pkgs, ...} : {
+  name = "awscli";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  machine = { pkgs, ... }:
+    {
+      environment.systemPackages = [ pkgs.awscli ];
+    };
+
+  testScript =
+    ''
+      assert "${pkgs.python3Packages.botocore.version}" in machine.succeed("aws --version")
+      assert "${pkgs.awscli.version}" in machine.succeed("aws --version")
+    '';
+})
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index bb7575118da6..8bf242561b1c 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -1,4 +1,5 @@
 { lib
+, nixosTests
 , python3
 , groff
 , less
@@ -64,7 +65,11 @@ in with py.pkgs; buildPythonApplication rec {
     rm $out/bin/aws.cmd
   '';
 
-  passthru.python = py; # for aws_shell
+  passthru = {
+    python = py; # for aws_shell
+
+    tests = { inherit (nixosTests) awscli; };
+  };
 
   meta = with lib; {
     homepage = "https://aws.amazon.com/cli/";

From e204319c740020330cd657c352d7f29b3d432f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 25 Nov 2020 00:37:52 +0100
Subject: [PATCH 3636/3942] pythonPackages.pyscard: Remove patch that is
 included in 1.9.9 and 2.0.0

---
 .../python-modules/pyscard/default.nix            | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index fefeaf7ebb55..6007628d00de 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -30,21 +30,6 @@ buildPythonPackage rec {
   NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC)
     "-I ${getDev pcsclite}/include/PCSC";
 
-  # The error message differs depending on the macOS host version.
-  # Since Nix reports a constant host version, but proxies to the
-  # underlying library, it's not possible to determine the correct
-  # expected error message.  This patch allows both errors to be
-  # accepted.
-  # See: https://github.com/LudovicRousseau/pyscard/issues/77
-  # Building with python from nix on macOS version 10.13 or
-  # greater still causes this issue to occur.
-  patches = optionals withApplePCSC [
-    (fetchpatch {
-      url = "https://github.com/LudovicRousseau/pyscard/commit/945e9c4cd4036155691f6ce9706a84283206f2ef.patch";
-      sha256 = "19n8w1wzn85zywr6xf04d8nfg7sgzjyvxp1ccp3rgfr4mcc36plc";
-    })
-  ];
-
   propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ];
   nativeBuildInputs = [ swig ];
 

From 661712230656a31fdcb4b0e8f4406a2c41197929 Mon Sep 17 00:00:00 2001
From: Henri Menke <henri@henrimenke.de>
Date: Wed, 25 Nov 2020 14:12:17 +0100
Subject: [PATCH 3637/3942] gitAndTools.pass-git-helper: 0.4 -> 1.1.0

---
 .../git-and-tools/pass-git-helper/default.nix        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
index 5c4ece7c9e51..5914378f5b35 100644
--- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, pyxdg }:
+{ stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest }:
 
 buildPythonApplication rec {
   pname   = "pass-git-helper";
-  version = "0.4";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner  = "languitar";
     repo   = "pass-git-helper";
-    rev    = version;
-    sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap";
+    rev    = "v${version}";
+    sha256 = "18nvwlp0w4aqj268wly60rnjzqw2d8jl0hbs6bkwp3hpzzz5g6yd";
   };
 
   propagatedBuildInputs = [ pyxdg ];
+  checkInputs = [ pytest ];
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/languitar/pass-git-helper";

From 4e4d498ffcb2a1578624b199616b5b3b644d9246 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 24 Nov 2020 19:46:52 +0100
Subject: [PATCH 3638/3942] grafana: 7.3.3 -> 7.3.4

https://github.com/grafana/grafana/releases/tag/v7.3.4
---
 pkgs/servers/monitoring/grafana/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index f13759dcc0db..ccd7428eefcd 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "grafana";
-  version = "7.3.3";
+  version = "7.3.4";
 
   excludedPackages = [ "release_publisher" ];
 
@@ -10,15 +10,15 @@ buildGoModule rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "1891whg244s1lj8lm3sxsxaimjb1yr1n4v7kgjjz7hi9fkscswbw";
+    sha256 = "0vav3zhn4yw87z8xlcljs62xx4v3mxxvy0kgjh7w4njyqq1j3ayi";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "0ybzlnaq7j1v6valyb997wiydpbsgb2ycb8r92wyb901hd4frj7h";
+    sha256 = "1fmfscfbdg2wdzf5fbad83pln4azy2y3fcghcanafkvqr2vv4hwk";
   };
 
-  vendorSha256 = "09rb96fm7ij16r843lbwcxb26vmjyahs1bi5pnnqz0mnm0vvmsjb";
+  vendorSha256 = "0rn1zqczqa44k6g8rm9xdrd6hw5rbbvihcbzcdx758gv2lpbikxq";
 
   postPatch = ''
     substituteInPlace pkg/cmd/grafana-server/main.go \

From 9c2351cf277734af98220022cceac3c86c54da46 Mon Sep 17 00:00:00 2001
From: Nicolas Berbiche <nicolas@normie.dev>
Date: Wed, 25 Nov 2020 14:06:16 -0500
Subject: [PATCH 3639/3942] mpv: enable sixel support

---
 pkgs/applications/video/mpv/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 73276f9a4616..d7dc865c1694 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -31,28 +31,29 @@
   , mesa   ? null
 
 , alsaSupport        ? stdenv.isLinux, alsaLib       ? null
+, archiveSupport     ? true,           libarchive    ? null
 , bluraySupport      ? true,           libbluray     ? null
 , bs2bSupport        ? true,           libbs2b       ? null
 , cacaSupport        ? true,           libcaca       ? null
 , cmsSupport         ? true,           lcms2         ? null
 , dvdnavSupport      ? stdenv.isLinux, libdvdnav     ? null
+, jackaudioSupport   ? false,          libjack2      ? null
 , libpngSupport      ? true,           libpng        ? null
+, openalSupport      ? true,           openalSoft    ? null
 , pulseSupport       ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
 , rubberbandSupport  ? stdenv.isLinux, rubberband    ? null
 , screenSaverSupport ? true,           libXScrnSaver ? null
 , sdl2Support        ? true,           SDL2          ? null
+, sixelSupport       ? false,          libsixel      ? null
 , speexSupport       ? true,           speex         ? null
 , swiftSupport       ? false,          swift         ? null
 , theoraSupport      ? true,           libtheora     ? null
 , vaapiSupport       ? stdenv.isLinux, libva         ? null
+, vapoursynthSupport ? false,          vapoursynth   ? null
 , vdpauSupport       ? true,           libvdpau      ? null
 , xineramaSupport    ? stdenv.isLinux, libXinerama   ? null
 , xvSupport          ? stdenv.isLinux, libXv         ? null
 , zimgSupport        ? true,           zimg          ? null
-, archiveSupport     ? true,           libarchive    ? null
-, jackaudioSupport   ? false,          libjack2      ? null
-, openalSupport      ? true,           openalSoft    ? null
-, vapoursynthSupport ? false,          vapoursynth   ? null
 }:
 
 with stdenv.lib;
@@ -76,6 +77,7 @@ assert pulseSupport       -> available libpulseaudio;
 assert rubberbandSupport  -> available rubberband;
 assert screenSaverSupport -> available libXScrnSaver;
 assert sdl2Support        -> available SDL2;
+assert sixelSupport       -> available libsixel;
 assert speexSupport       -> available speex;
 assert theoraSupport      -> available libtheora;
 assert vaapiSupport       -> available libva;
@@ -134,6 +136,7 @@ in stdenv.mkDerivation rec {
     (enableFeature dvdnavSupport   "dvdnav")
     (enableFeature openalSupport   "openal")
     (enableFeature sdl2Support     "sdl2")
+    (enableFeature sixelSupport    "sixel")
     (enableFeature vaapiSupport    "vaapi")
     (enableFeature waylandSupport  "wayland")
     (enableFeature stdenv.isLinux  "dvbin")
@@ -161,6 +164,7 @@ in stdenv.mkDerivation rec {
     ++ optional rubberbandSupport  rubberband
     ++ optional screenSaverSupport libXScrnSaver
     ++ optional sdl2Support        SDL2
+    ++ optional sixelSupport       libsixel
     ++ optional speexSupport       speex
     ++ optional theoraSupport      libtheora
     ++ optional vaapiSupport       libva

From 2e4d714334d77a903fde2c72b69e8ff6e2bb32b8 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sarah@qtr.dk>
Date: Wed, 25 Nov 2020 20:08:03 +0100
Subject: [PATCH 3640/3942] nixos/tests/networking: Alleviate race in scripted
 test

---
 nixos/tests/networking.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 83d4f6465b68..4fc5d48e0e17 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -499,8 +499,8 @@ let
                 list, targetList
             )
         with subtest("Test MTU and MAC Address are configured"):
-            assert "mtu 1342" in machine.succeed("ip link show dev tap0")
-            assert "mtu 1343" in machine.succeed("ip link show dev tun0")
+            machine.wait_until_succeeds("ip link show dev tap0 | grep 'mtu 1342'")
+            machine.wait_until_succeeds("ip link show dev tun0 | grep 'mtu 1343'")
             assert "02:de:ad:be:ef:01" in machine.succeed("ip link show dev tap0")
       '' # network-addresses-* only exist in scripted networking
       + optionalString (!networkd) ''

From fb05770ac87f3b3c846948dbe780181d6c90612e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 25 Nov 2020 14:03:28 -0500
Subject: [PATCH 3641/3942] httpstat: 1.2.1 -> 1.3.0

---
 pkgs/tools/networking/httpstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix
index 29bd4c331eb8..e9987a51eaec 100644
--- a/pkgs/tools/networking/httpstat/default.nix
+++ b/pkgs/tools/networking/httpstat/default.nix
@@ -2,12 +2,12 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "httpstat";
-  version = "1.2.1";
+  version = "1.3.0";
   src = fetchFromGitHub {
     owner = "reorx";
     repo = pname;
     rev = version;
-    sha256 = "1vriibcsq4j1hvm5yigbbmmv21dc40y5c9gvd31dg9qkaz26hml6";
+    sha256 = "18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1";
   };
   doCheck = false; # No tests
   buildInputs = [ glibcLocales ];

From c46bb0cca1fff29a3684a493ee1ff096069a33fe Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 25 Nov 2020 14:11:04 -0500
Subject: [PATCH 3642/3942] scala: Fix test references

---
 pkgs/development/compilers/scala/2.x.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix
index 91fe0b07d2e9..6b9ab7d483fe 100644
--- a/pkgs/development/compilers/scala/2.x.nix
+++ b/pkgs/development/compilers/scala/2.x.nix
@@ -6,7 +6,7 @@ with lib;
 let
   repo = "git@github.com:scala/scala.git";
 
-  common = { version, sha256, test, pname }:
+  common = { version, sha256, tests, pname }:
     stdenv.mkDerivation rec {
       inherit version;
 
@@ -40,7 +40,7 @@ let
       '';
 
       passthru = {
-        tests = [ test ];
+        inherit tests;
 
         updateScript = writeScript "update.sh" ''
           #!${stdenv.shell}
@@ -90,28 +90,28 @@ in {
   scala_2_10 = common {
     version = "2.10.7";
     sha256 = "koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE=";
-    test = { inherit (nixosTests) scala_2_10; };
+    tests = [ nixosTests.scala.scala_2_10 ];
     pname = "scala_2_10";
   };
 
   scala_2_11 = common {
     version = "2.11.12";
     sha256 = "sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg=";
-    test = { inherit (nixosTests) scala_2_11; };
+    tests = [ nixosTests.scala.scala_2_11 ];
     pname = "scala_2_11";
   };
 
   scala_2_12 = common {
     version = "2.12.12";
     sha256 = "NSDNHzye//YrrudfMuUtHl3BIL4szzQGSeRw5I9Sfis=";
-    test = { inherit (nixosTests) scala_2_12; };
+    tests = [ nixosTests.scala.scala_2_12 ];
     pname = "scala_2_12";
   };
 
   scala_2_13 = common {
     version = "2.13.4";
     sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw";
-    test = { inherit (nixosTests) scala_2_13; };
+    tests = [ nixosTests.scala.scala_2_13 ];
     pname = "scala_2_13";
   };
 }

From 2b714a3d58229453766724e971aee9c9fe58a2b3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 18:36:37 +0000
Subject: [PATCH 3643/3942] python37Packages.timeout-decorator: 0.4.1 -> 0.5.0

---
 pkgs/development/python-modules/timeout-decorator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/timeout-decorator/default.nix b/pkgs/development/python-modules/timeout-decorator/default.nix
index bf37e671cd13..d3b4a58c17e3 100644
--- a/pkgs/development/python-modules/timeout-decorator/default.nix
+++ b/pkgs/development/python-modules/timeout-decorator/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "timeout-decorator";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1inkf68i2s2x27arpqwkdxigiqbpbpjbbnfv7jzsrif1fmp2fphs";
+    sha256 = "6a2f2f58db1c5b24a2cc79de6345760377ad8bdc13813f5265f6c3e63d16b3d7";
   };
 
   meta = with stdenv.lib; {

From d4e0e44ff2b5e1274789c1f1d1521b88bc7412ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 25 Nov 2020 20:08:31 +0100
Subject: [PATCH 3644/3942] pythonPackages.pyscard: Remove unused input

---
 pkgs/development/python-modules/pyscard/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index 6007628d00de..9798d94900b0 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }:
+{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }:
 
 let
   # Package does not support configuring the pcsc library.

From 2e3c491a00fd707099d7d9acfb44ad96bd977f59 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 25 Nov 2020 19:22:06 +0000
Subject: [PATCH 3645/3942] =?UTF-8?q?oh-my-zsh:=202020-11-22=20=E2=86=92?=
 =?UTF-8?q?=202020-11-25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 8a2a9902599a..7062fc607830 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
 
 stdenv.mkDerivation rec {
-  version = "2020-11-22";
+  version = "2020-11-25";
   pname = "oh-my-zsh";
-  rev = "7a76afd61e5daab6fb33f955930efa7f4cf16021";
+  rev = "d88887195fd5535ef2fd95180baa73af2a8c88f8";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "0zcy8ydyk6ba497q7m0l24wqy8ri616304w76mcxmpv7hh6yfnqa";
+    sha256 = "0p7j3y1g8x486g2fd2baap1nhfyg5hmcl9dyf4r4dj4l0xzb45wi";
   };
 
   installPhase = ''

From c6531761c9c5c86b14824eb263b317d4c34103d8 Mon Sep 17 00:00:00 2001
From: Andrey Kuznetsov <fear@loathing.in>
Date: Wed, 25 Nov 2020 16:27:06 +0000
Subject: [PATCH 3646/3942] telepresence: 1.105 -> 1.108

---
 pkgs/tools/networking/telepresence/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index 285a3764e038..a077ddb3de46 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -3,7 +3,7 @@
 , iptables, bash }:
 
 let
-  sshuttle-telepresence = 
+  sshuttle-telepresence =
     let
       sshuttleTelepresenceRev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269";
     in
@@ -22,13 +22,13 @@ let
       });
 in pythonPackages.buildPythonPackage rec {
   pname = "telepresence";
-  version = "0.105";
+  version = "0.108";
 
   src = fetchFromGitHub {
     owner = "telepresenceio";
     repo = "telepresence";
     rev = version;
-    sha256 = "0fccbd54ryd9rcbhfh5lx8qcc3kx3k9jads918rwnzwllqzjf7sg";
+    sha256 = "6V0sM0Z+2xNDgL0wIzJOdaUp2Ol4ejNTk9K/pllVa7g=";
   };
 
   buildInputs = [ makeWrapper ];

From ebff09994a6334faf79809cccadc8ae4ff3835ba Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Wed, 25 Nov 2020 19:30:11 +0100
Subject: [PATCH 3647/3942] unifont: 13.0.01 -> 13.0.04

---
 pkgs/data/fonts/unifont/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index 685b5c452f2d..ce2a92ce48ae 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -4,16 +4,16 @@
 
 stdenv.mkDerivation rec {
   pname = "unifont";
-  version = "13.0.01";
+  version = "13.0.04";
 
   ttf = fetchurl {
     url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
-    sha256 = "0y5bd7i5hp9ks6d3qq0bshywba7g90i3074wckpn9m8shh98ngcg";
+    sha256 = "sha256-p0wSTyXCXuWIw+hDZ4HZPxgdBJ6oOOqOuX6FzZJmwrE=";
   };
 
   pcf = fetchurl {
     url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
-    sha256 = "05zgz00n514cijqh9qcvr4iz0bla4hd028cvi1jlh0ic6fkafix8";
+    sha256 = "sha256-sKY2qshNV3zXfD2BSbfs0qom1gPt7vD5QmVEkACmx18=";
   };
 
   nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];

From ed0d6be5ec5dd9ef07ce9f49053814bced300754 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 25 Nov 2020 14:27:24 -0500
Subject: [PATCH 3648/3942] xterm: Add test reference

---
 pkgs/applications/terminal-emulators/xterm/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix
index d5113ebf8fa8..1ec704f5d438 100644
--- a/pkgs/applications/terminal-emulators/xterm/default.nix
+++ b/pkgs/applications/terminal-emulators/xterm/default.nix
@@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
+    tests = { inherit (nixosTests) xterm; };
+
     updateScript = let
       # Tags that end in letters are unstable
       suffixes = stdenv.lib.concatStringsSep " "

From e617a3143244723cc640ebe18a42119da28a4489 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@utzutzutz.net>
Date: Wed, 25 Nov 2020 19:31:33 +0000
Subject: [PATCH 3649/3942] graylog: 3.3.8 -> 3.3.9

Bumps Graylog and integration plugins to version 3.3.9.
---
 pkgs/tools/misc/graylog/default.nix | 4 ++--
 pkgs/tools/misc/graylog/plugins.nix | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 503b9bcd411a..f6a48364bfda 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "graylog";
-  version = "3.3.8";
+  version = "3.3.9";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "0y5c7sgdswh2p50plv78vkva0wwlyh2vh3qy3mymq48nqpzrbirp";
+    sha256 = "1wl9j2jgjg5gwcsh92qr5f68wx12nvwadc9xkaa9wwd7x3z825jq";
   };
 
   dontBuild = true;
diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
index 0499011cd111..5a9b692b1b8f 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -64,10 +64,10 @@ in {
   enterprise-integrations = glPlugin rec {
     name = "graylog-enterprise-integrations-${version}";
     pluginName = "graylog-plugin-enterprise-integrations";
-    version = "3.3.8";
+    version = "3.3.9";
     src = fetchurl {
       url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz";
-      sha256 = "1567q2pwgcwxvaa0qmbhgvnr9f9v3w7vgvnv8kvfvjhxlvm78g1q";
+      sha256 = "0yr2lmf50w8qw5amimmym6y4jxga4d7s7cbiqs5sqzvipgsknbwj";
     };
     installPhase = ''
       mkdir -p $out/bin
@@ -96,10 +96,10 @@ in {
   integrations = glPlugin rec {
     name = "graylog-integrations-${version}";
     pluginName = "graylog-plugin-integrations";
-    version = "3.3.8";
+    version = "3.3.9";
     src = fetchurl {
       url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz";
-      sha256 = "00ax3r24inzicak0dd77737qpfas455w5vmj980yfsz40vwnqlr2";
+      sha256 = "0q858ffmkinngyqqsaszcrx93zc4fg43ny0xb7vm0p4wd48hjyqc";
     };
     installPhase = ''
       mkdir -p $out/bin

From efe4ee67d0041843a00643781f491d00dec81af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 25 Nov 2020 20:41:31 +0100
Subject: [PATCH 3650/3942] maintainers: boothead -> commandodev

---
 maintainers/maintainer-list.nix                     | 4 ++--
 pkgs/development/libraries/rdkafka/default.nix      | 2 +-
 pkgs/development/libraries/zookeeper_mt/default.nix | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9bcb1c54957f..98f32552e118 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1152,9 +1152,9 @@
     githubId = 50839;
     name = "Brian Jones";
   };
-  boothead = {
+  commandodev = {
     email = "ben@perurbis.com";
-    github = "boothead";
+    github = "commandodev";
     githubId = 87764;
     name = "Ben Ford";
   };
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index a7774d1e5951..7b3d5b3db16f 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/edenhill/librdkafka";
     license = licenses.bsd2;
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ boothead ];
+    maintainers = with maintainers; [ commandodev ];
   };
 }
diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix
index b957253eebec..0015600f970f 100644
--- a/pkgs/development/libraries/zookeeper_mt/default.nix
+++ b/pkgs/development/libraries/zookeeper_mt/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     homepage = "http://zookeeper.apache.org";
     description = "Apache Zookeeper";
     license = licenses.asl20;
-    maintainers = [ maintainers.boothead ];
+    maintainers = [ maintainers.commandodev ];
     platforms = platforms.unix;
   };
 }

From 34e908df5473fd18b5e361bde2a7db6b75b81284 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Wed, 25 Nov 2020 21:09:14 +0100
Subject: [PATCH 3651/3942] youtube-dl: 2020.11.24 -> 2020.11.26

https://github.com/ytdl-org/youtube-dl/releases/tag/2020.11.26
---
 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 739de18c5c9f..234fa6cce921 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2020.11.24";
+  version = "2020.11.26";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0yjkzv47vspl3hgz0dpvyikjv0w9bk6l91s1iaa7qbdlsvig4w3x";
+    sha256 = "0zvgb1b5kzd2y97rvynxf7qvz3narllf1m26xsph1zll1zb6q47v";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];

From 40db8680486ab4d405072e3c127caf54b754362d Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Wed, 25 Nov 2020 12:23:45 -0800
Subject: [PATCH 3652/3942] horizon-eda: 1.2.1 -> 1.3.0

---
 pkgs/applications/science/electronics/horizon-eda/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix
index 3b6a4c7b7383..6b9f07ee68f1 100644
--- a/pkgs/applications/science/electronics/horizon-eda/default.nix
+++ b/pkgs/applications/science/electronics/horizon-eda/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "horizon-eda";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "horizon-eda";
     repo = "horizon";
     rev = "v${version}";
-    sha256 = "0b1bi99xdhbkb2vdb9y6kyqm0h8y0q168jf2xi8kd0z7kww8li2p";
+    sha256 = "13c4p60vrmwmnrv2jcr2gc1cxnimy7j8yp1p6434pbbk2py9k8mx";
   };
 
   buildInputs = [

From 169637aaec27b46d0f5916cc4ab545eed28e893c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 30 Oct 2020 21:26:35 +0100
Subject: [PATCH 3653/3942] xmlsec: fix build in darwin sandbox, make tests
 (more) reproducible

---
 pkgs/development/libraries/xmlsec/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index 18ee99804d3c..6d310443e70c 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
   doCheck = true;
   checkInputs = [ nss_3_53.tools ];
+  preCheck = ''
+  substituteInPlace tests/testrun.sh \
+    --replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' \
+    --replace 'TMPFOLDER=/tmp' '$(mktemp -d)'
+  '';
 
   # enable deprecated soap headers required by lasso
   # https://dev.entrouvert.org/issues/18771

From 5f2997686cdfc8872b2ed6874c5e60ae31eafe79 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Fri, 30 Oct 2020 09:42:10 +0100
Subject: [PATCH 3654/3942] deeptools: Fix tests

---
 .../science/biology/deeptools/default.nix          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/pkgs/applications/science/biology/deeptools/default.nix
index efa246a277fe..2621c5bbf037 100644
--- a/pkgs/applications/science/biology/deeptools/default.nix
+++ b/pkgs/applications/science/biology/deeptools/default.nix
@@ -1,14 +1,14 @@
-{ lib
-, python
-}:
+{ lib, python, fetchFromGitHub }:
 with python.pkgs;
 buildPythonApplication rec {
   pname = "deepTools";
   version = "3.5.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1a14a29e60be13eac11bd204dab9aef73cd72fe56a94c587333f21087584c0d8";
+  src = fetchFromGitHub {
+    owner = "deeptools";
+    repo = "deepTools";
+    rev = version;
+    sha256 = "1bz8ln32mfc9k8l9wgp034vw80dxh6f92dfqxhcrpggk4akwj6ml";
   };
 
   propagatedBuildInputs = [
@@ -23,7 +23,7 @@ buildPythonApplication rec {
     deeptoolsintervals
   ];
 
-  checkInputs = [ pytest ];
+  checkInputs = [ nose ];
 
   meta = with lib; {
     homepage = "https://deeptools.readthedocs.io/en/develop";

From e166f2275999940b4142c1f0f7b74f35db2c728a Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Fri, 30 Oct 2020 09:43:37 +0100
Subject: [PATCH 3655/3942] tebreak: Fix tests

---
 pkgs/applications/science/biology/tebreak/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/applications/science/biology/tebreak/default.nix
index 07669d097a44..82c624ba7cd9 100644
--- a/pkgs/applications/science/biology/tebreak/default.nix
+++ b/pkgs/applications/science/biology/tebreak/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa
-, samtools, findutils }:
+, samtools, findutils, python }:
 
 python3Packages.buildPythonApplication rec {
   pname = "tebreak";
@@ -32,6 +32,12 @@ python3Packages.buildPythonApplication rec {
     done
   '';
 
+  checkPhase = ''
+    $out/bin/tebreak -b test/data/example.ins.bam  -r test/data/Homo_sapiens_chr4_50000000-60000000_assembly19.fasta -p 4 --pickle test/example.pickle --detail_out test/example.tebreak.detail.out -i lib/teref.human.fa
+    pushd test
+    ${python.interpreter} checktest.py
+  '';
+
   meta = with stdenv.lib; {
     description = "Find and characterise transposable element insertions";
     homepage = "https://github.com/adamewing/tebreak";

From 0cbabf1a2dfc98337478346c39f77649dba37bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 30 Oct 2020 10:30:46 +0100
Subject: [PATCH 3656/3942] pythonPackages.cnvkit: Fix tests

---
 .../python-modules/cnvkit/default.nix         | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix
index 6677ab06334f..92af67fa183a 100644
--- a/pkgs/development/python-modules/cnvkit/default.nix
+++ b/pkgs/development/python-modules/cnvkit/default.nix
@@ -1,5 +1,6 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
+, fetchpatch
 , rPackages
 , rWrapper
 , buildPythonPackage
@@ -15,17 +16,29 @@
 , pillow
 , pomegranate
 , pyfaidx
+, python
+, R
 }:
 
 buildPythonPackage rec {
   pname = "CNVkit";
   version = "0.9.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d68adc0121e17c61a3aa28c0a9ba6526510a5a0df0f0a6eb1818bab71b7e927a";
+  src = fetchFromGitHub {
+    owner = "etal";
+    repo = "cnvkit";
+    rev = "v${version}";
+    sha256 = "022zplgqil5l76vri647cyjx427vnbg5r2gw6lw712d2janvdjm7";
   };
 
+  patches = [
+    # Fix: AttributeError: module 'pandas.io.common' has no attribute 'EmptyDataError'
+    (fetchpatch {
+      url = "https://github.com/etal/cnvkit/commit/392adfffedfa0415e635b72c5027835b0a8d7ab5.patch";
+      sha256 = "0s0gwyy0hybmhc3jij2v9l44b6lkcmclii8bkwsazzj2kc24m2rh";
+    })
+  ];
+
   propagatedBuildInputs = [
     biopython
     numpy
@@ -39,6 +52,7 @@ buildPythonPackage rec {
     future
     pillow
     pomegranate
+    rPackages.DNAcopy
   ];
 
   postPatch = ''
@@ -46,7 +60,16 @@ buildPythonPackage rec {
       --replace "pandas >= 0.20.1, < 0.25.0" "pandas"
   '';
 
-  pythonImportsCheck = [ "cnvlib" ];
+  checkInputs = [ R ];
+
+  checkPhase = ''
+    pushd test/
+    ${python.interpreter} test_io.py
+    ${python.interpreter} test_genome.py
+    ${python.interpreter} test_cnvlib.py
+    ${python.interpreter} test_commands.py
+    ${python.interpreter} test_r.py
+  '';
 
   meta = with lib; {
     homepage = "https://cnvkit.readthedocs.io";

From a163fde1a02a892e2e18ae55dd12dfc4cd58d0e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 30 Oct 2020 10:35:14 +0100
Subject: [PATCH 3657/3942] python3Packages.HTSeq: Fix tests

---
 .../python-modules/HTSeq/default.nix          | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/HTSeq/default.nix b/pkgs/development/python-modules/HTSeq/default.nix
index abb0c8520dd0..83263f734bd4 100644
--- a/pkgs/development/python-modules/HTSeq/default.nix
+++ b/pkgs/development/python-modules/HTSeq/default.nix
@@ -1,18 +1,26 @@
-{ stdenv, buildPythonPackage, fetchPypi, cython, numpy, pysam, matplotlib
-}:
+{ stdenv, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }:
 buildPythonPackage rec {
   version = "0.12.4";
   pname = "HTSeq";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e3980bb4f12899442b4fa6f24f0ba149090f71cedb1eaf7128249afe4eb921ff";
+  src = fetchFromGitHub {
+    owner = "htseq";
+    repo = "htseq";
+    rev = "release_${version}";
+    sha256 = "0y7vh249sljqjnv81060w4xkdx6f1y5zdqkh38yk926x6v9riijm";
   };
 
-  buildInputs = [ cython numpy pysam ];
+  nativeBuildInputs = [ cython ];
   propagatedBuildInputs = [ numpy pysam matplotlib ];
 
+  checkPhase = stdenv.lib.optionalString isPy27 ''
+    ${python.interpreter} python2/test/test_general.py
+  '' + stdenv.lib.optionalString isPy3k ''
+    ${python.interpreter} python3/test/test_general.py
+  '';
+
   meta = with stdenv.lib; {
+    homepage = "https://htseq.readthedocs.io/";
     description = "A framework to work with high-throughput sequencing data";
     maintainers = with maintainers; [ unode ];
     platforms = platforms.unix;

From 84f0c4bfa9509243a200b39ce7bb0d0fcefa6d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 31 Oct 2020 13:21:26 +0100
Subject: [PATCH 3658/3942] pythonPackages.pysaml2: Make tests pass in darwin
 sandbox

---
 pkgs/development/python-modules/pysaml2/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
index 593911c064ec..f30fddc1efd8 100644
--- a/pkgs/development/python-modules/pysaml2/default.nix
+++ b/pkgs/development/python-modules/pysaml2/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
   checkPhase = ''
     py.test -k "not test_load_extern_incommon \
             and not test_load_remote_encoding \
-            and not test_load_external"
+            and not test_load_external \
+            and not test_conf_syslog"
   '';
 
   meta = with stdenv.lib; {

From 57da6df40f770648d5694ccdcdd1bd4846bdcfd6 Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Wed, 25 Nov 2020 21:47:35 +0100
Subject: [PATCH 3659/3942] blender: 2.90.1 -> 2.91.0

---
 pkgs/applications/misc/blender/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 17f0ffdb92cd..718765e6efe9 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -9,7 +9,7 @@
 , colladaSupport ? true, opencollada
 , makeWrapper
 , pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL
-, embree
+, embree, gmp
 }:
 
 with lib;
@@ -18,11 +18,11 @@ let python = python3Packages.python; in
 
 stdenv.mkDerivation rec {
   pname = "blender";
-  version = "2.90.1";
+  version = "2.91.0";
 
   src = fetchurl {
     url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
-    sha256 = "169xcmm1zkvab14qdxggqc758xdkqs7r7imwi6yx2fl2djacr3g7";
+    sha256 = "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm";
   };
 
   patches = lib.optional stdenv.isDarwin ./darwin.patch;
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
       tbb
       makeWrapper
       embree
+      gmp
     ]
     ++ (if (!stdenv.isDarwin) then [
       libXi libX11 libXext libXrender

From cf1efe2c7e49177a9faaccbcd5ad0e6d8139d711 Mon Sep 17 00:00:00 2001
From: Thibault Polge <thibault@thb.lt>
Date: Wed, 25 Nov 2020 21:52:48 +0100
Subject: [PATCH 3660/3942] eduke32: fix version number, use string
 interpolation for src.url

This fixes mistakes I've introduced in 7798a4e19cc843874e6329e0a980de7515945923.
---
 pkgs/games/eduke32/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 51d0c713753b..df0950eb9376 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -4,7 +4,7 @@
 
 let
   version = "20200907";
-  rev = "9527";
+  rev = "9257";
   revExtra = "93f62bbad";
 
   desktopItem = makeDesktopItem {
@@ -23,8 +23,7 @@ in stdenv.mkDerivation {
   inherit version;
 
   src = fetchurl {
-    url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_20200907-9257-93f62bbad.tar.xz"; # Good
-    # url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}-${revExtra}.tar.xz";
+    url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}-${revExtra}.tar.xz";
     sha256 = "972630059be61ef9564a241b84ef2ee4f69fc85c19ee36ce46052ff2f1ce3bf9";
   };
 

From d585d999b5db0ceaa0613630e9a101951dee4a22 Mon Sep 17 00:00:00 2001
From: RonanMacF <macfhlar@tcd.ie>
Date: Tue, 3 Nov 2020 19:54:20 +0000
Subject: [PATCH 3661/3942] tmuxPlugins.vim-tmux-focus-events: init at unstable
 2010-10-06

---
 pkgs/misc/tmux-plugins/default.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index d47ab09e3c56..5610b2c694ca 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -392,6 +392,25 @@ in rec {
     dependencies = [ pkgs.urlview ];
   };
 
+  vim-tmux-focus-events = mkDerivation {
+    pluginName = "vim-tmux-focus-events";
+    version = "unstable-2020-10-05";
+    src = fetchFromGitHub {
+      owner = "tmux-plugins";
+      repo = "vim-tmux-focus-events";
+      rev = "a568192ca0de4ca0bd7b3cd0249aad491625c941";
+      sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events";
+      description = "Makes FocusGained and FocusLost autocommand events work in vim when using tmux";
+      license = licenses.mit;
+      platforms = platforms.unix;
+      maintainers = with maintainers; [ ronanmacf ];
+    };
+  };
+
   vim-tmux-navigator = mkDerivation {
     pluginName = "vim-tmux-navigator";
     rtpFilePath = "vim-tmux-navigator.tmux";

From bd11afec4ff257b076c3c54c2a99c76910bd51fb Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Nov 2020 11:03:58 -0800
Subject: [PATCH 3662/3942] vscode-extensions: fix aliases

---
 pkgs/misc/vscode-extensions/default.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 0228ee9a1e98..bc00f82f19b7 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -10,7 +10,7 @@ let
   # So an extension's attribute name should be of the form:
   # "${mktplcRef.publisher}.${mktplcRef.name}".
   #
-  self = stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs)
+  baseExtensions = self: stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs)
     {
 
       alanz.vscode-hie-server = buildVscodeMarketplaceExtension {
@@ -245,11 +245,19 @@ let
       llvm-org.lldb-vscode = llvmPackages_8.lldb;
 
       WakaTime.vscode-wakatime = callPackage ./wakatime {};
-    } // lib.optionalAttrs (config.allowAliases or true) (
-    with self; {
+    };
+
+    aliases = self: super: {
       # aliases
-      ms-vscode.Go = golang.Go;
-    }
-  );
+      ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; };
+    };
+
+    # TODO: add overrides overlay, so that we can have a generated.nix
+    # then apply extension specific modifcations to packages.
+
+    # overlays will be applied left to right, overrides should come after aliases.
+    overlays = lib.optionals (config.allowAliases or true) [ aliases ];
+
+    toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays;
 in
-self
+  lib.fix toFix

From 0b940b9977111ed18cd23d8cd4f14991b109636a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 24 Nov 2020 10:00:35 +0100
Subject: [PATCH 3663/3942] scripts/mark-broken: fix path

---
 pkgs/common-updater/scripts/mark-broken | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/common-updater/scripts/mark-broken b/pkgs/common-updater/scripts/mark-broken
index ee80616d0cbe..f132c86c5e8b 100755
--- a/pkgs/common-updater/scripts/mark-broken
+++ b/pkgs/common-updater/scripts/mark-broken
@@ -3,7 +3,7 @@
 # This script is meant to be used to mark failing hydra builds as broken in the meta attrs
 # To use the script, you should pass the list of failing attrs as arguments to the script.
 #
-# Example: `cat failing-attrs | xargs ./pkgs/common-update/scripts/mark-broken`
+# Example: `cat failing-attrs | xargs ./pkgs/common-updater/scripts/mark-broken`
 #
 # Generating a list of failing attrs: (this should be improved at a later date)
 #   - Go to the most recent hydra evaluation with all builds completed

From f9e72ad0470d6e0d822020cd257265bb80b0a7a6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 21:13:25 +0000
Subject: [PATCH 3664/3942] alembic: 1.7.15 -> 1.7.16

---
 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 b6914f944aa2..126300aa1945 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec
 {
   pname = "alembic";
-  version = "1.7.15";
+  version = "1.7.16";
 
   src = fetchFromGitHub {
     owner = "alembic";
     repo = "alembic";
     rev = version;
-    sha256 = "1jqc98pc6gfxsbfdar7x3nlaywyibix8gl9gvs44zwrdi5mpiiyc";
+    sha256 = "1vmhwjhppjv8m0ysk2qz0wl47cbl8i40bjjq5l4jmmp1ysvlbknf";
   };
 
   outputs = [ "bin" "dev" "out" "lib" ];

From a40100b6d78f7cc607e4c8eccb730ee023b08b92 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 25 Nov 2020 21:16:16 +0000
Subject: [PATCH 3665/3942] terragrunt: 0.26.5 -> 0.26.7

---
 pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index cc6836b512f9..a6a9631481f6 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "terragrunt";
-  version = "0.26.5";
+  version = "0.26.7";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0wnczg234jys54njaxbf9dd7b299dyl4spjpr5l40agz9cd8mkq3";
+    sha256 = "1431n6zs2mfkgh281xi0d7m9hxifrrsnd46fnpb54mr6lj9h0sdb";
   };
 
-  vendorSha256 = "0l85jx02dj9qvxs8l0ln5fln8vssi0fisblm5i1scz9x4a1jqg9n";
+  vendorSha256 = "18ix11g709fvh8h02k3p2bmzrq5fjzaqa50h3g74s3hyl2gc9s9h";
 
   doCheck = false;
 

From 99d99b97ff8ffac334e84b36b3f532855faea8f8 Mon Sep 17 00:00:00 2001
From: Samir Hafez <me@samirhafez.com>
Date: Wed, 25 Nov 2020 17:28:44 +0000
Subject: [PATCH 3666/3942] rescuetime: add an updateScript

---
 pkgs/applications/misc/rescuetime/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 3b989a75c9b0..fcdab3ddbc48 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver }:
+{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript }:
 
 let
   version = "2.16.4.2";
@@ -34,6 +34,15 @@ in mkDerivation {
       --set-rpath "${lib.makeLibraryPath [ qt5.qtbase libXtst libXext libX11 libXScrnSaver ]}" \
       $out/bin/rescuetime
   '';
+
+  passthru.updateScript = writeScript "rescuetime-updater" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -i bash -p curl pup common-updater-scripts
+    set -eu -o pipefail
+    latestVersion="$(curl -sS https://www.rescuetime.com/release-notes/linux | pup '.release:first-of-type h2 strong text{}' | tr -d '\n')"
+    update-source-version rescuetime "$latestVersion"
+  '';
+
   meta = with lib; {
     description = "Helps you understand your daily habits so you can focus and be more productive";
     homepage    = "https://www.rescuetime.com";

From a540fcdc2c55cc7bde4e10b01e2c963ead33e7df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 21:37:04 +0000
Subject: [PATCH 3667/3942] amber: 0.5.5 -> 0.5.8

---
 pkgs/tools/text/amber/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix
index c6ba6f98da1d..205efc414d59 100644
--- a/pkgs/tools/text/amber/default.nix
+++ b/pkgs/tools/text/amber/default.nix
@@ -4,16 +4,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "amber";
-  version = "0.5.5";
+  version = "0.5.8";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "083gpssnhjxp1gr5rn27k9j4pm42wqz76llrn5yh91rwcwvlg1l8";
+    sha256 = "0j9h9zzg6n4mhq2bqj71k5db595ilbgd9dn6ygmzsm74619q4454";
   };
 
-  cargoSha256 = "199wfc98vq6vgrz8xqqh8lz4j3ig7w66mrk1am9x0viyhj92fvx0";
+  cargoSha256 = "0h47xqqq8f8m28rl1s6r305cf3dvk94aa86j6m0rk535i2jqfvhp";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 590aa37109eb06a9cc00f7854edde670f4e66d1a Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 24 Oct 2020 12:00:00 +0000
Subject: [PATCH 3668/3942] check_systemd: init at 2.2.1

and remove pynagsystemd, which it replaces.
---
 .../nagios/plugins/check_systemd.nix          | 36 +++++++++++++++++++
 .../nagios/plugins/pynagsystemd.nix           | 22 ------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 38 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/servers/monitoring/nagios/plugins/check_systemd.nix
 delete mode 100644 pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix b/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix
new file mode 100644
index 000000000000..06cd0cf9b2d6
--- /dev/null
+++ b/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix
@@ -0,0 +1,36 @@
+{ fetchFromGitHub, python3Packages, lib }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "check_systemd";
+  version = "2.2.1";
+
+  src = fetchFromGitHub {
+    owner = "Josef-Friedrich";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "04r14dhqzrdndn235dvr6afy4s4g4asynsgvj99cmyq55nah4asn";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ nagiosplugin ];
+
+  postInstall = ''
+    # check_systemd is only a broken stub calling check_systemd.py
+    mv $out/bin/check_systemd{.py,}
+  '';
+
+  # the test scripts run ./check_systemd.py and check_systemd. Patch to
+  # the installed, patchShebanged executable in $out/bin
+  preCheck = ''
+    find test -name "*.py" -execdir sed -i "s@./check_systemd.py@$out/bin/check_systemd@" '{}' ";"
+    export PATH=$PATH:$out/bin
+  '';
+  checkInputs = [ python3Packages.pytestCheckHook ];
+
+  meta = with lib; {
+    description = "Nagios / Icinga monitoring plugin to check systemd for failed units";
+    inherit (src.meta) homepage;
+    maintainers = with maintainers; [ symphorien ];
+    license = licenses.lgpl2Only;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix b/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix
deleted file mode 100644
index 62f6bc96a523..000000000000
--- a/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ fetchFromGitHub, python3Packages, lib }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "pynagsystemd";
-  version = "1.2.0";
-
-  src = fetchFromGitHub {
-    owner = "kbytesys";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1xjhkhdpmqa7ngcpcfhrkmj4cid2wla3fzgr04wvw672ysffv2vz";
-  };
-
-  propagatedBuildInputs = with python3Packages; [ nagiosplugin ];
-
-  meta = with lib; {
-    description = "Simple and easy nagios check for systemd status";
-    homepage = "https://github.com/kbytesys/pynagsystemd";
-    maintainers = with maintainers; [ symphorien ];
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3538ac56ecfa..63b3447cc33d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -463,6 +463,7 @@ mapAliases ({
   phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22
   phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22
   phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22
+  pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24
   qca-qt5 = libsForQt5.qca-qt5;  # added 2015-12-19
   quake3game = ioquake3; # added 2016-01-14
   qvim = throw "qvim has been removed."; # added 2020-08-31
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b04ab9e25b5..6d861c4a1240 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16958,7 +16958,7 @@ in
 
   checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
 
-  pynagsystemd = callPackage ../servers/monitoring/nagios/plugins/pynagsystemd.nix { };
+  check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { };
 
   neo4j = callPackage ../servers/nosql/neo4j { };
 

From 2ddb0c7400df9e204ebae61a4f3411e17f53d8cf Mon Sep 17 00:00:00 2001
From: Red Davies <red@infect.me>
Date: Tue, 24 Nov 2020 23:07:13 -0500
Subject: [PATCH 3669/3942] corosync: 2.4.3 -> 2.4.5

Reason0: Changed name metadata to pname and version metadata.
Reason1: Fixes CVE-2018-1084

Corosync is prone to an integer-overflow vulnerability.

Attackers can exploit this issue to execute arbitrary code
in the context of the affected application. Failed exploit
attempts will likely cause a denial-of-service condition.

Fixed in 2.4.4

See issue: #90784
---
 pkgs/servers/corosync/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix
index 5a209549d352..693ab0042f3d 100644
--- a/pkgs/servers/corosync/default.nix
+++ b/pkgs/servers/corosync/default.nix
@@ -9,11 +9,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "corosync-2.4.3";
+  pname = "corosync";
+  version = "2.4.5";
 
   src = fetchurl {
-    url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz";
-    sha256 = "15y5la04qn2lh1gabyifygzpa4dx3ndk5yhmaf7azxyjx0if9rxi";
+    url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz";
+    sha256 = "0pxs18vci9kq3qnqsg5i1h35jrxxiccwbm0mzja3g8j3izdsyvmb";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];

From b74f7ce8f37ead93d5d317b25a1dc14a80fc3493 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 22:20:13 +0000
Subject: [PATCH 3670/3942] bazarr: 0.9.0.6 -> 0.9.0.7

---
 pkgs/servers/bazarr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix
index 2a835c346cea..375f33e5d601 100644
--- a/pkgs/servers/bazarr/default.nix
+++ b/pkgs/servers/bazarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bazarr";
-  version = "0.9.0.6";
+  version = "0.9.0.7";
 
   src = fetchurl {
     url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz";
-    sha256 = "1mgvsi8y3camj215vnbw20f1z6jvpbyrj1hrcj4szxfcjkxdg2hv";
+    sha256 = "1nskhdb1pcgwp39ld8zrnngzsq6g1pn59nb211qhf6rsj0nyahic";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From fdfc81bd4429fd9fd03db3cba142cb018ff7816c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 22:38:25 +0000
Subject: [PATCH 3671/3942] bear: 3.0.2 -> 3.0.3

---
 pkgs/development/tools/build-managers/bear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index 712778665d2a..756e68b56781 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bear";
-  version = "3.0.2";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "rizsotto";
     repo = pname;
     rev = version;
-    sha256 = "0x1an9sxcr0f45c9kdpgpcrc773cc28zsffbxddpqp0h1qh9s4ns";
+    sha256 = "1abx5h6xy0h3mz29ial5si8smkmjzla050d130pcc6dzr4ic642w";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 0bc520c79963cb68903ddaa3b31cb24a33373dae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Nov 2020 23:46:40 +0000
Subject: [PATCH 3672/3942] cargo-expand: 1.0.0 -> 1.0.4

---
 pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index c32a87e7839f..09650e8a3868 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-expand";
-  version = "1.0.0";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = pname;
     rev = version;
-    sha256 = "0bdv6h3mzmv46pdyvwl0v0bg719dlsxlx378ws6vgi1cga24g37i";
+    sha256 = "09jdqf1f8kl2c3k4cp8j3qqb96gclhncvfdwg2l3bmh5r10id9b3";
   };
 
-  cargoSha256 = "0qpihfgfqxw5fyhn124c5lbfaxr717bqf8mrbagh3vdgvk75j0qz";
+  cargoSha256 = "0mx01h2zv7mpyi8s1545b7hjxn9aslzpbngrq4ii9rfqznz3r8k9";
 
   meta = with lib; {
     description =

From 53dbd009450ec6cc26687c7b91c18f103366d37a Mon Sep 17 00:00:00 2001
From: Chuck <chuck@intelligence.org>
Date: Wed, 25 Nov 2020 16:13:08 -0800
Subject: [PATCH 3673/3942] =?UTF-8?q?tor-browser-bundle-bin:=2010.0.4=20?=
 =?UTF-8?q?=E2=86=92=2010.0.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../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 e340e3a052e9..222b1b5b767c 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -91,19 +91,19 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "10.0.4";
+  version = "10.0.5";
 
   lang = "en-US";
 
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
-      sha256 = "sha256-2Ye1+mhFnkZnAYQXgKZ5YIOiIVaiunTCyCOM+ZExw2I==";
+      sha256 = "1cxh39x69m4lgqin5k5p67gs9g26w7cnlbdpjqi8dw47y0bpr9xw";
     };
 
     i686-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
-      sha256 = "sha256-B0WGkIt8KDtma/WGyenQ04ctKE7AantUtYnwsjAZZb0=";
+      sha256 = "1cyg5ic7mrj6x1gxw5w609933d9ripa5b5gxyqnvnxfa23dkh608";
     };
   };
 in

From b0be68407d59f10d31f28c009a0af7f4b24f04a1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 00:23:21 +0000
Subject: [PATCH 3674/3942] clightning: 0.9.1 -> 0.9.2

---
 pkgs/applications/blockchains/clightning.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix
index 2467d3099220..b17876325d5e 100644
--- a/pkgs/applications/blockchains/clightning.nix
+++ b/pkgs/applications/blockchains/clightning.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "clightning";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    sha256 = "4923e2fa001cfc2403d1bed368710499d5def322e6384b8eea2bd39d3351a417";
+    sha256 = "022fw6rbn0chg0432h9q05w8qnys0hd9hf1qm2qlnnmamxw4dyfy";
   };
 
   enableParallelBuilding = true;

From e521c06b9211defa3e3a047e01fbb8c6132cd683 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 00:30:09 +0000
Subject: [PATCH 3675/3942] cloud-nuke: 0.1.23 -> 0.1.24

---
 pkgs/development/tools/cloud-nuke/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix
index e124f6c7ca54..5fcaa35378d7 100644
--- a/pkgs/development/tools/cloud-nuke/default.nix
+++ b/pkgs/development/tools/cloud-nuke/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "cloud-nuke";
-  version = "0.1.23";
+  version = "0.1.24";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0qqvjw6lqdrfg1mjfxljslcv9714cpxcnkf65wkf46r5g8fwzr1f";
+    sha256 = "11d335lx6pa8pvsiv9m00ig8b8y203rzad4krr0p9c04ppw0c966";
   };
 
-  vendorSha256 = "0bw0xcbyns94vy1abr962876zr7aq6q9qq7y9vr1yqw4hqmi3ndi";
+  vendorSha256 = "1dr1sql0ph3k6hylgikhiaaskxwnsynspp770p9i7y7fasmb53jw";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
 

From 86caffc41159bf141e7d9ddf994ecf21699d6667 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 26 Nov 2020 01:37:16 +0100
Subject: [PATCH 3676/3942] rnnoise-plugin: Deduplicated package

This was packaged twice by mistake.
---
 .../noise-suppression-for-voice/default.nix   | 26 -------------------
 .../libraries/rnnoise-plugin/default.nix      |  2 +-
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/noise-suppression-for-voice/default.nix

diff --git a/pkgs/development/libraries/noise-suppression-for-voice/default.nix b/pkgs/development/libraries/noise-suppression-for-voice/default.nix
deleted file mode 100644
index 27b77a3bd32e..000000000000
--- a/pkgs/development/libraries/noise-suppression-for-voice/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake }:
-
-stdenv.mkDerivation rec {
-  pname = "noise-suppression-for-voice-unstable";
-  version = "2020-10-10";
-
-  src = fetchFromGitHub {
-    owner = "werman";
-    repo = "noise-suppression-for-voice";
-    rev = "15bac8f34018184d7d4de1b3b2ba98c433705f6c";
-    sha256 = "11pwisbcks7g0mdgcrrv49v3ci1l6m26bbb7f67xz4pr1hai5dwc";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = with stdenv.lib; {
-    description = "A real-time noise suppression plugin for voice";
-    longDescription = ''
-The plugin is meant to suppress a wide range of noise origins (from original paper): computer fans, office, crowd, airplane, car, train, construction.
-    '';
-    homepage = "https://github.com/werman/noise-suppression-for-voice";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.henrikolsson ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix
index 6e2542e1db21..9ec9eabebebb 100644
--- a/pkgs/development/libraries/rnnoise-plugin/default.nix
+++ b/pkgs/development/libraries/rnnoise-plugin/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/werman/noise-suppression-for-voice";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ panaeon ];
+    maintainers = with maintainers; [ panaeon henrikolsson ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08c463ba8354..e0afa447ad8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14944,8 +14944,6 @@ in
 
   non = callPackage ../applications/audio/non { };
 
-  noise-suppression-for-voice = callPackage ../development/libraries/noise-suppression-for-voice { };
-
   ntl = callPackage ../development/libraries/ntl { };
 
   nspr = callPackage ../development/libraries/nspr {

From b7b6b668180579c417dde6ed8e6c4c029b96fbe1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 00:38:45 +0000
Subject: [PATCH 3677/3942] cloudflared: 2020.11.10 -> 2020.11.11

---
 pkgs/applications/networking/cloudflared/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 7bacb182a59b..3e19af619db3 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2020.11.10";
+  version = "2020.11.11";
 
   src = fetchFromGitHub {
     owner  = "cloudflare";
     repo   = "cloudflared";
     rev    = version;
-    sha256 = "1jajjfbwbqvkr2cc9y4ryn8z1sh19hwydxidfdpgmq794ci8v4np";
+    sha256 = "059q0k53n8cc78cg70pw7dnbc1cjzv3kdvw3cfamvkrmscqgczxd";
   };
 
   vendorSha256 = null;

From 8a3889e129963bad255753a34e283479a6287f25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 00:54:30 +0000
Subject: [PATCH 3678/3942] cordless: 2020-10-24 -> 2020-11-22

---
 .../networking/instant-messengers/cordless/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/applications/networking/instant-messengers/cordless/default.nix
index 1b475bdee846..d3633e2245ff 100644
--- a/pkgs/applications/networking/instant-messengers/cordless/default.nix
+++ b/pkgs/applications/networking/instant-messengers/cordless/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "cordless";
-  version = "2020-10-24";
+  version = "2020-11-22";
 
   src = fetchFromGitHub {
     owner = "Bios-Marcel";
     repo = pname;
     rev = version;
-    sha256 = "18j8yrnipiivc49jwbb0ipgqwdi249fs9zxxz8qx8jfq77imvwbq";
+    sha256 = "0avf09b73fs3wpb4fzmm6ka595aanfvp95m6xj1ccxvq8ciwpqcw";
   };
 
   subPackages = [ "." ];
 
-  vendorSha256 = "1h47aqf8bmyqvaayfj16br1402qzy7kf8rk96f3vnsyvsnkg5gw5";
+  vendorSha256 = "01anbhwgwam70dymcmvkia1xpw48658rq7wv4m7fiavxvnli6z2y";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/Bios-Marcel/cordless";

From 08814f5f27c26a99741d6912f10dfc4cb08042ef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 02:02:27 +0000
Subject: [PATCH 3679/3942] doctl: 1.52.0 -> 1.53.0

---
 pkgs/development/tools/doctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index 53d0f791a35d..bca11130c7e6 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.52.0";
+  version = "1.53.0";
 
   vendorSha256 = null;
 
@@ -32,7 +32,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     rev = "v${version}";
-    sha256 = "0x4ri36ivmhg42bvh62jvgawbwwypl3a4vr8m9gk19nndds9q5zv";
+    sha256 = "1zw6gdmy1jlwi7rrbdxg7pkiq54ha0h1gmzphn3mflfk7lmgyikm";
   };
 
   meta = with lib; {

From 0d589439a690c1ca5d60c2b19a4865f543c52222 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 02:08:48 +0000
Subject: [PATCH 3680/3942] dolt: 0.22.0 -> 0.22.1

---
 pkgs/servers/sql/dolt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index 24406d1c5c29..247fe588bfcf 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
     pname = "dolt";
-    version = "0.22.0";
+    version = "0.22.1";
 
     src = fetchFromGitHub {
         owner = "liquidata-inc";
         repo = "dolt";
         rev = "v${version}";
-        sha256 = "14km34wjhijfwxvqcplf2jmh69zj7llsrimafmz94jy8cy85cpa1";
+        sha256 = "1n0yxnjxlz2bvybdvba8cqqv702ry3crq114l2bni7q7llfs5y08";
     };
 
     modRoot = "./go";
     subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
-  vendorSha256 = "01lf5f2iigv8pihblwxyqx0pgj6gqir3b7rcna0xkirrfpvzd38c";
+  vendorSha256 = "0avk20g7ic1gw1qr8bp4rbl7m822q2kphwc9f6ld6p5yl6pwqv3h";
 
   doCheck = false;
 

From e9af64281d027fa806c9ba54efee342574df575e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 02:14:37 +0000
Subject: [PATCH 3681/3942] doppler: 3.17.0 -> 3.19.0

---
 pkgs/tools/security/doppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix
index 114807bf124a..0822828eb90b 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/tools/security/doppler/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "doppler";
-  version = "3.17.0";
+  version = "3.19.0";
 
   src = fetchFromGitHub {
     owner = "dopplerhq";
     repo = "cli";
     rev = version;
-    sha256 = "178kn9bn17xgv4vfg38mcb3gdnxxhjk09p8qywiwjypbjqg4zidi";
+    sha256 = "049x8y7zjvpd1gvkrld69dffnf4pawjwm7by71r6z408hwvfqjpa";
   };
 
   vendorSha256 = "1s8zwjfk9kcddn8cywr7llh9v5m140kvmi5lmy2glvwh3rwccgxf";

From 97904288cd205cefb9a9feb4d731151727c7806c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 02:22:11 +0000
Subject: [PATCH 3682/3942] drone-cli: 1.2.2 -> 1.2.4

---
 .../tools/continuous-integration/drone-cli/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
index 66fb878aa26e..2a8e10008c2b 100644
--- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, buildGoModule }:
 
-let version = "1.2.2";
+let version = "1.2.4";
 in buildGoModule rec {
   inherit version;
   pname = "drone-cli";
   revision = "v${version}";
 
-  vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi";
+  vendorSha256 = "0v94rwxkbj85l3brbm792xf1rfs3vgnwpgjczwqip1gm159dpnd7";
 
   doCheck = false;
 
@@ -18,7 +18,7 @@ in buildGoModule rec {
     owner = "drone";
     repo = "drone-cli";
     rev = revision;
-    sha256 = "082yqm72y8s3v06gkcg947p62sd63y3r2bmdsrfgdrzb5w5a75bl";
+    sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8";
   };
 
   meta = with stdenv.lib; {

From c2211b2d7a0c31e9fc6ddffd66fe9a305de51a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 3 Oct 2020 22:20:59 +0200
Subject: [PATCH 3683/3942] pythonPackages.libsass: init at 0.20.1

---
 .../python-modules/libsass/default.nix        | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/libsass/default.nix

diff --git a/pkgs/development/python-modules/libsass/default.nix b/pkgs/development/python-modules/libsass/default.nix
new file mode 100644
index 000000000000..9feb5b1d2425
--- /dev/null
+++ b/pkgs/development/python-modules/libsass/default.nix
@@ -0,0 +1,37 @@
+{ lib, buildPythonPackage, fetchFromGitHub, libsass, six, pytest, werkzeug }:
+
+buildPythonPackage rec {
+  pname = "libsass";
+  version = "0.20.1";
+
+  src = fetchFromGitHub {
+    owner = "sass";
+    repo = "libsass-python";
+    rev = version;
+    sha256 = "1r0kgl7i6nnhgjl44sjw57k08gh2qr7l8slqih550dyxbf1akbxh";
+  };
+
+  buildInputs = [ libsass ];
+
+  propagatedBuildInputs = [ six ];
+
+  preBuild = ''
+    export SYSTEM_SASS=true;
+  '';
+
+  checkInputs = [
+    pytest
+    werkzeug
+  ];
+
+  checkPhase = ''
+    pytest sasstests.py
+  '';
+
+  meta = with lib; {
+    description = "A straightforward binding of libsass for Python. Compile Sass/SCSS in Python with no Ruby stack at all!";
+    homepage = "https://sass.github.io/libsass-python/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 28092b35d84c..03b36ab11c7a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3386,6 +3386,8 @@ in {
 
   librosa = callPackage ../development/python-modules/librosa { };
 
+  libsass = (callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; });
+
   libsavitar = callPackage ../development/python-modules/libsavitar { };
 
   libselinux = pipe pkgs.libselinux [

From d68625546202ec45a123cffcceeced2dd7c17478 Mon Sep 17 00:00:00 2001
From: Nicolas Martin <penguwin@penguwin.eu>
Date: Thu, 26 Nov 2020 03:56:19 +0100
Subject: [PATCH 3684/3942] charm: 0.8.4 -> 0.8.5

---
 pkgs/applications/misc/charm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix
index 0799226866e1..becbbda8acff 100644
--- a/pkgs/applications/misc/charm/default.nix
+++ b/pkgs/applications/misc/charm/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "charm";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "charm";
     rev = "v${version}";
-    sha256 = "0wsh83kchqakvx7kgs2s31rzsvnfr47jk6pbmqzjv1kqmnlhc3rh";
+    sha256 = "0cgl5dpyzc4lciij9q9yghppiclrdnrl1jsbizfgh2an3s18ab8k";
   };
 
-  vendorSha256 = "1lg4bbdzgnw50v6m6p7clibwm8m82kdr1jizgbmhfmzy15d5sfll";
+  vendorSha256 = "1spzawnk2fslc1m14dp8lx4vpnxwz7xgm1hxbpz4bqlqz1hfd6ax";
 
   doCheck = false;
 

From deb49e104d80a4b669054c62f7bfaf5b14fa22b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 03:03:13 +0000
Subject: [PATCH 3685/3942] exoscale-cli: 1.20.2 -> 1.21.0

---
 pkgs/tools/admin/exoscale-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix
index 9fbedcdbf4ad..36a1cf97a146 100644
--- a/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "exoscale-cli";
-  version = "1.20.2";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner  = "exoscale";
     repo   = "cli";
     rev    = "v${version}";
-    sha256 = "1vawc3ba7p35gil57wz9s1mlp1x99imvwcxfzlkfhgizfa56vfrx";
+    sha256 = "12z5mbw7yzhyhzl6499xlhzpgysarjql4qlrpmwfpb8ij1hk8q6i";
   };
 
   goPackagePath = "github.com/exoscale/cli";

From 5e8bcbbfe2be495684963bc19060303b9c942253 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 03:27:18 +0000
Subject: [PATCH 3686/3942] fend: 0.1.9 -> 0.1.10

---
 pkgs/tools/misc/fend/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix
index ee91c66cc82a..9d5fbcba23f7 100644
--- a/pkgs/tools/misc/fend/default.nix
+++ b/pkgs/tools/misc/fend/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fend";
-  version = "0.1.9";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
     owner = "printfn";
     repo = pname;
     rev = "v${version}";
-    sha256 = "11cvpg7j2rvqri16cr3gb6dpm7dzgs3vywhdc91aa531f87qj16c";
+    sha256 = "1gs9hmkc25013nk8b7d7pcxcp4jmk4pa4gcki3wgvlrzjl1av7w4";
   };
 
-  cargoSha256 = "0q9gkvbay6rnb0nd14z71h3506yzn9610zc6g8wbpgmw6cpwvbg9";
+  cargoSha256 = "13lw7isg9lfn6dfngq15qbq619c644ixa5bvb1ja0l3hm3akrs5g";
 
   meta = with lib; {
     description = "Arbitrary-precision unit-aware calculator";

From 2e10bd8ee544731086135e6f8964396c4cf6b35d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 03:49:53 +0000
Subject: [PATCH 3687/3942] fluent-bit: 1.6.4 -> 1.6.5

---
 pkgs/tools/misc/fluent-bit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index f787ab1ef0ba..486bdfdaa89d 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "1hfkix5pjcrm68bm4k71dlkkdlnwffzlw4kxhiq9pmg09z8s6kq3";
+    sha256 = "0318fw04fman20hjdjsgix6fg4fp85mrsm3bb629kxn30xi6wsh3";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From ac6196fe2b860d4849689c0a4e81af6a4f07971b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 03:56:32 +0000
Subject: [PATCH 3688/3942] fmt: 7.1.2 -> 7.1.3

---
 pkgs/development/libraries/fmt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index 40922bae47b2..8eac88df796c 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -42,7 +42,7 @@ let
 in
 {
   fmt_7 = generic {
-    version = "7.1.2";
-    sha256 = "1ixwkqdbm01rcmqni15z4jj2rzhb3w7nlhkw2w4dzc4m101vr6yz";
+    version = "7.1.3";
+    sha256 = "08hyv73qp2ndbs0isk8pspsphdzz5qh8czl3wgyxy3mmif9xdg29";
   };
 }

From 587ef34841734ddfb8e4acdf03d9cba42876d034 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 26 Nov 2020 04:20:00 +0000
Subject: [PATCH 3689/3942] postgresqlPackages.pg_hll: 2.14 -> 2.15

---
 pkgs/servers/sql/postgresql/ext/pg_hll.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index 7630e2e32bac..28e3947f4b37 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "pg_hll";
-  version = "2.14";
+  version = "2.15";
 
   buildInputs = [ postgresql ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner  = "citusdata";
     repo   = "postgresql-hll";
     rev    = "refs/tags/v${version}";
-    sha256 = "13vphxkc9pn4bkpgab560bgdbl99li2b3p1n2rm5a78wswlsbsps";
+    sha256 = "19d50cvp3byjyr2dc5rjmyrlp97bb19mz0ykr3w4iyc6qi5d5qj2";
   };
 
   installPhase = ''

From a3e5e8c92c9c5f2915ca714a9efd7788264223cc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:35:54 +0100
Subject: [PATCH 3690/3942] ocamlPackages.duff: use Dune 2

---
 pkgs/development/ocaml-modules/duff/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/ocaml-modules/duff/default.nix b/pkgs/development/ocaml-modules/duff/default.nix
index 1c6b59961ef2..8c9dad42fd7a 100644
--- a/pkgs/development/ocaml-modules/duff/default.nix
+++ b/pkgs/development/ocaml-modules/duff/default.nix
@@ -7,6 +7,9 @@
 buildDunePackage rec {
   pname = "duff";
   version = "0.2";
+
+  useDune2 = true;
+
   src = fetchurl {
     url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz";
     sha256 = "0bi081w4349cqc1n9jsjh1lrcqlnv3nycmvh9fniscv8lz1c0gjq";

From 25b7d70531e7e26429aa366959c9a2b3c026391e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:35:59 +0100
Subject: [PATCH 3691/3942] ocamlPackages.tuntap: use Dune 2

---
 pkgs/development/ocaml-modules/tuntap/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/tuntap/default.nix b/pkgs/development/ocaml-modules/tuntap/default.nix
index a4536316ba41..981f05b01e38 100644
--- a/pkgs/development/ocaml-modules/tuntap/default.nix
+++ b/pkgs/development/ocaml-modules/tuntap/default.nix
@@ -6,6 +6,8 @@ buildDunePackage rec {
   pname = "tuntap";
   version = "2.0.0";
 
+  useDune2 = true;
+
   minimumOCamlVersion = "4.04.2";
 
   src = fetchurl {

From 8b1c1f66289db0eb38980796f2d7f53e261e1f5b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:36:03 +0100
Subject: [PATCH 3692/3942] ocamlPackages.randomconv: use Dune 2

---
 pkgs/development/ocaml-modules/randomconv/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/randomconv/default.nix b/pkgs/development/ocaml-modules/randomconv/default.nix
index 7abb153b9be3..078d50da895b 100644
--- a/pkgs/development/ocaml-modules/randomconv/default.nix
+++ b/pkgs/development/ocaml-modules/randomconv/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
   pname = "randomconv";
   version = "0.1.3";
 
+  useDune2 = true;
+
   src = fetchurl {
     url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-v${version}.tbz";
     sha256 = "1iv3r0s5kqxs893b0d55f0r62k777haiahfkkvvfbqwgqsm6la4v";

From d9068d18f5fd51cb745042a7365e6768cf23e4ef Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:36:07 +0100
Subject: [PATCH 3693/3942] ocamlPackages.mirage-stack: use Dune 2

---
 pkgs/development/ocaml-modules/mirage-stack/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/mirage-stack/default.nix b/pkgs/development/ocaml-modules/mirage-stack/default.nix
index 57e0f99ab1b6..dbcba59c4790 100644
--- a/pkgs/development/ocaml-modules/mirage-stack/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-stack/default.nix
@@ -3,6 +3,7 @@
 buildDunePackage rec {
   pname = "mirage-stack";
   version = "2.2.0";
+  useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz";

From 1f7c5f009c7b4730c2c05518a5cd62962567f3b6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:36:12 +0100
Subject: [PATCH 3694/3942] ocamlPackages.mirage-protocols: use Dune 2

---
 pkgs/development/ocaml-modules/mirage-protocols/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/mirage-protocols/default.nix b/pkgs/development/ocaml-modules/mirage-protocols/default.nix
index 47a534c21699..99b9c7e8633c 100644
--- a/pkgs/development/ocaml-modules/mirage-protocols/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-protocols/default.nix
@@ -3,6 +3,7 @@
 buildDunePackage rec {
   pname = "mirage-protocols";
   version = "4.0.1";
+  useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-protocols/releases/download/v${version}/mirage-protocols-v${version}.tbz";

From 6012e6dc0ec7a707fabd05aea6f85ac128721d1f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:36:15 +0100
Subject: [PATCH 3695/3942] ocamlPackages.mirage-flow: use Dune 2

---
 pkgs/development/ocaml-modules/mirage-flow/combinators.nix | 2 +-
 pkgs/development/ocaml-modules/mirage-flow/default.nix     | 1 +
 pkgs/development/ocaml-modules/mirage-flow/unix.nix        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix
index 2ad6e5b0b974..d4904e77430a 100644
--- a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix
+++ b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix
@@ -3,7 +3,7 @@
 buildDunePackage {
   pname = "mirage-flow-combinators";
 
-  inherit (mirage-flow) version src;
+  inherit (mirage-flow) version useDune2 src;
 
   propagatedBuildInputs = [ ocaml_lwt logs cstruct mirage-clock mirage-flow ];
 
diff --git a/pkgs/development/ocaml-modules/mirage-flow/default.nix b/pkgs/development/ocaml-modules/mirage-flow/default.nix
index 25bb5e0f32d4..d6ba6603596a 100644
--- a/pkgs/development/ocaml-modules/mirage-flow/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-flow/default.nix
@@ -4,6 +4,7 @@ buildDunePackage rec {
   pname = "mirage-flow";
   version = "2.0.1";
 
+  useDune2 = true;
   minimumOCamlVersion = "4.05";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/pkgs/development/ocaml-modules/mirage-flow/unix.nix
index 7a20ca87f8f3..3bd676b45fa0 100644
--- a/pkgs/development/ocaml-modules/mirage-flow/unix.nix
+++ b/pkgs/development/ocaml-modules/mirage-flow/unix.nix
@@ -4,7 +4,7 @@
 buildDunePackage {
   pname = "mirage-flow-unix";
 
-  inherit (mirage-flow) version src;
+  inherit (mirage-flow) version useDune2 src;
 
   propagatedBuildInputs = [ fmt logs mirage-flow ocaml_lwt cstruct ];
 

From 8555b46e2afd0b5bfcdf0ee56a696357a59479a2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:36:19 +0100
Subject: [PATCH 3696/3942] ocamlPackages.mirage-random: use Dune 2

---
 pkgs/development/ocaml-modules/mirage-random/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/mirage-random/default.nix b/pkgs/development/ocaml-modules/mirage-random/default.nix
index 535c9286948e..defde0ba89fb 100644
--- a/pkgs/development/ocaml-modules/mirage-random/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-random/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
   pname = "mirage-random";
   version = "2.0.0";
 
+  useDune2 = true;
+
   src = fetchurl {
     url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz";
     sha256 = "0qj41d5smkkkbjwsnz71bhhj94d2cwv53rf3j4rhky0pqbkidnv1";

From 97cdcf3e29a1edca8a56d8be8df1b8268aac6495 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:36:23 +0100
Subject: [PATCH 3697/3942] ocamlPackages.eqaf: use Dune 2

---
 pkgs/development/ocaml-modules/eqaf/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/eqaf/default.nix b/pkgs/development/ocaml-modules/eqaf/default.nix
index d86dc01dcb71..a3f64cb7bd95 100644
--- a/pkgs/development/ocaml-modules/eqaf/default.nix
+++ b/pkgs/development/ocaml-modules/eqaf/default.nix
@@ -4,6 +4,7 @@ buildDunePackage rec {
   minimumOCamlVersion = "4.03";
   pname = "eqaf";
   version = "0.7";
+  useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-v${version}.tbz";

From e1fe267f096535fb5d8ea7ce666e13da45a98f18 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:36:27 +0100
Subject: [PATCH 3698/3942] ocamlPackages.io-page: use Dune 2

---
 pkgs/development/ocaml-modules/io-page/default.nix | 1 +
 pkgs/development/ocaml-modules/io-page/unix.nix    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix
index 31ae0cfc19ed..46908369e571 100644
--- a/pkgs/development/ocaml-modules/io-page/default.nix
+++ b/pkgs/development/ocaml-modules/io-page/default.nix
@@ -4,6 +4,7 @@ buildDunePackage rec {
   pname = "io-page";
   version = "2.3.0";
 
+  useDune2 = true;
   minimumOCamlVersion = "4.02.3";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/io-page/unix.nix b/pkgs/development/ocaml-modules/io-page/unix.nix
index b3f7f878b276..843451b30866 100644
--- a/pkgs/development/ocaml-modules/io-page/unix.nix
+++ b/pkgs/development/ocaml-modules/io-page/unix.nix
@@ -3,7 +3,7 @@
 buildDunePackage {
   pname = "io-page-unix";
 
-  inherit (io-page) version src minimumOCamlVersion;
+  inherit (io-page) version src useDune2 minimumOCamlVersion;
 
   propagatedBuildInputs = [ cstruct io-page ];
   checkInputs = [ ounit ];

From ca737449c4601060b8d72c09048fc4c13e53ea3b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:36:30 +0100
Subject: [PATCH 3699/3942] ocamlPackages.macaddr-{cstruct,sexp}: use Dune 2

---
 pkgs/development/ocaml-modules/macaddr/cstruct.nix | 2 ++
 pkgs/development/ocaml-modules/macaddr/sexp.nix    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/pkgs/development/ocaml-modules/macaddr/cstruct.nix
index 991a77a6ba21..143230408920 100644
--- a/pkgs/development/ocaml-modules/macaddr/cstruct.nix
+++ b/pkgs/development/ocaml-modules/macaddr/cstruct.nix
@@ -7,6 +7,8 @@ buildDunePackage {
 
   inherit (macaddr) version src minimumOCamlVersion;
 
+  useDune2 = true;
+
   propagatedBuildInputs = [ macaddr cstruct ];
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/macaddr/sexp.nix b/pkgs/development/ocaml-modules/macaddr/sexp.nix
index 3d0305c4be38..35cc7c6b4401 100644
--- a/pkgs/development/ocaml-modules/macaddr/sexp.nix
+++ b/pkgs/development/ocaml-modules/macaddr/sexp.nix
@@ -7,6 +7,8 @@ buildDunePackage {
 
   inherit (macaddr) version src minimumOCamlVersion;
 
+  useDune2 = true;
+
   propagatedBuildInputs = [ ppx_sexp_conv ];
 
   checkInputs = [ macaddr-cstruct ounit ];

From 5cc1a8169283f17f856f45bf6f4ebd66278b71d1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:36:34 +0100
Subject: [PATCH 3700/3942] ocamlPackages.conduit: use Dune 2

---
 pkgs/development/ocaml-modules/conduit/default.nix | 1 +
 pkgs/development/ocaml-modules/conduit/lwt.nix     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
index 27b2a329b26e..b800d6b7ba4a 100644
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -6,6 +6,7 @@
 buildDunePackage rec {
   pname = "conduit";
   version = "2.2.2";
+  useDune2 = true;
 
   minimumOCamlVersion = "4.07";
 
diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix
index 9bcd98e06a49..6514586f9d93 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt.nix
@@ -2,7 +2,7 @@
 
 buildDunePackage {
 	pname = "conduit-lwt";
-	inherit (conduit) version src minimumOCamlVersion;
+	inherit (conduit) version src useDune2 minimumOCamlVersion;
 
 	buildInputs = [ ppx_sexp_conv ];
 

From 4d47330bef2115d8cb0ac81a48682924c5fe9f27 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:36:38 +0100
Subject: [PATCH 3701/3942] ocamlPackages.ipaddr: use Dune 2

---
 pkgs/development/ocaml-modules/ipaddr/cstruct.nix  | 2 +-
 pkgs/development/ocaml-modules/ipaddr/default.nix  | 2 +-
 pkgs/development/ocaml-modules/ipaddr/sexp.nix     | 2 +-
 pkgs/development/ocaml-modules/macaddr/default.nix | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix
index b6240d39ebd3..d1386230452c 100644
--- a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix
@@ -5,7 +5,7 @@
 buildDunePackage rec {
   pname = "ipaddr-cstruct";
 
-  inherit (ipaddr) version src minimumOCamlVersion;
+  inherit (ipaddr) version src useDune2 minimumOCamlVersion;
 
   propagatedBuildInputs = [ ipaddr cstruct ];
 
diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix
index a4a6f9fc7a14..3090066c2f4e 100644
--- a/pkgs/development/ocaml-modules/ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/default.nix
@@ -6,7 +6,7 @@
 buildDunePackage rec {
   pname = "ipaddr";
 
-  inherit (macaddr) version src minimumOCamlVersion;
+  inherit (macaddr) version src useDune2 minimumOCamlVersion;
 
   propagatedBuildInputs = [ macaddr domain-name stdlib-shims ];
 
diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix
index 8d6186d6338f..1ede3c064ada 100644
--- a/pkgs/development/ocaml-modules/ipaddr/sexp.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix
@@ -5,7 +5,7 @@
 buildDunePackage rec {
   pname = "ipaddr-sexp";
 
-  inherit (ipaddr) version src minimumOCamlVersion;
+  inherit (ipaddr) version src useDune2 minimumOCamlVersion;
 
   propagatedBuildInputs = [ ipaddr ];
 
diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix
index 08b486bb683a..5552393b4086 100644
--- a/pkgs/development/ocaml-modules/macaddr/default.nix
+++ b/pkgs/development/ocaml-modules/macaddr/default.nix
@@ -6,6 +6,8 @@ buildDunePackage rec {
   pname = "macaddr";
   version = "5.0.1";
 
+  useDune2 = true;
+
   minimumOCamlVersion = "4.04";
 
   src = fetchurl {

From 4a1ff5b3ce9acdcb2e1ea65e975a2fa757e1f58b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Nov 2020 07:36:41 +0100
Subject: [PATCH 3702/3942] =?UTF-8?q?ocamlPackages.cstruct:=204.0.0=20?=
 =?UTF-8?q?=E2=86=92=205.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/cstruct/default.nix | 12 +++++++++---
 pkgs/development/ocaml-modules/cstruct/lwt.nix     |  2 +-
 pkgs/development/ocaml-modules/cstruct/ppx.nix     |  6 +++---
 pkgs/development/ocaml-modules/cstruct/sexp.nix    |  2 +-
 pkgs/development/ocaml-modules/cstruct/unix.nix    |  2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index 01a32fc09a20..acd5d83e4f1e 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -1,14 +1,20 @@
-{ lib, fetchurl, buildDunePackage }:
+{ lib, fetchurl, buildDunePackage, bigarray-compat }:
 
 buildDunePackage rec {
   pname = "cstruct";
-  version = "4.0.0";
+  version = "5.0.0";
+
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.03";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz";
-    sha256 = "1q4fsc2m6d96yf42g3wb3gcnhpnxw800df5mh3yr25pprj8y4m1a";
+    sha256 = "1z403q2nkgz5x07j0ypy6q0mk2yxgqbp1jlqkngbajna7124x2pb";
   };
 
+  propagatedBuildInputs = [ bigarray-compat ];
+
   meta = {
     description = "Access C-like structures directly from OCaml";
     license = lib.licenses.isc;
diff --git a/pkgs/development/ocaml-modules/cstruct/lwt.nix b/pkgs/development/ocaml-modules/cstruct/lwt.nix
index 5a10d7cae48d..f340bfcda25e 100644
--- a/pkgs/development/ocaml-modules/cstruct/lwt.nix
+++ b/pkgs/development/ocaml-modules/cstruct/lwt.nix
@@ -6,7 +6,7 @@ else
 
 buildDunePackage {
 	pname = "cstruct-lwt";
-	inherit (cstruct) version src meta;
+	inherit (cstruct) version src useDune2 meta;
 
   minimumOCamlVersion = "4.02";
 
diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix
index 22fe4ac47cf3..feb8feac6b68 100644
--- a/pkgs/development/ocaml-modules/cstruct/ppx.nix
+++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned }:
+{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned, ppxlib }:
 
 if !lib.versionAtLeast (cstruct.version or "1") "3"
 then cstruct
@@ -6,9 +6,9 @@ else
 
 buildDunePackage {
 	pname = "ppx_cstruct";
-	inherit (cstruct) version src meta;
+	inherit (cstruct) version src useDune2 meta;
 
 	minimumOCamlVersion = "4.03";
 
-	propagatedBuildInputs = [ cstruct ppx_tools_versioned sexplib ];
+	propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ];
 }
diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix
index d0df442013ff..04bb10d6f75e 100644
--- a/pkgs/development/ocaml-modules/cstruct/sexp.nix
+++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix
@@ -6,7 +6,7 @@ else
 
 buildDunePackage rec {
 	pname = "cstruct-sexp";
-	inherit (cstruct) version src meta;
+	inherit (cstruct) version src useDune2 meta;
 
 	doCheck = lib.versionAtLeast ocaml.version "4.03";
 	checkInputs = lib.optional doCheck alcotest;
diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix
index 7cb5d6658696..b7e0df0185c1 100644
--- a/pkgs/development/ocaml-modules/cstruct/unix.nix
+++ b/pkgs/development/ocaml-modules/cstruct/unix.nix
@@ -6,7 +6,7 @@ else
 
 buildDunePackage {
 	pname = "cstruct-unix";
-	inherit (cstruct) version src meta;
+	inherit (cstruct) version src useDune2 meta;
 
 	minimumOCamlVersion = "4.06";
 

From d9768fece18bcefc63a3534d23050cc5cb958786 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 05:56:06 +0000
Subject: [PATCH 3703/3942] go-jsonnet: 0.16.0 -> 0.17.0

---
 pkgs/development/compilers/go-jsonnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix
index 04af8e912517..1d8b912a978b 100644
--- a/pkgs/development/compilers/go-jsonnet/default.nix
+++ b/pkgs/development/compilers/go-jsonnet/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "go-jsonnet";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "go-jsonnet";
     rev = "v${version}";
-    sha256 = "17606gc75wnkm64am4hmlv7m3fy2hi8rnzadp6nrgpcd6rl26m83";
+    sha256 = "1rprs8l15nbrx4dw4pdg81c5l22zhj80pl4zwqgsm4113wyyvc98";
   };
 
   vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1";

From a81c25a5b0390bfad181981ce3c540ba101e786e Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Fri, 20 Nov 2020 10:30:11 -0800
Subject: [PATCH 3704/3942] framac: 21.1 -> 22.0

---
 pkgs/development/tools/analysis/frama-c/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 4638427b3ed9..94012ce7ff68 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -7,7 +7,7 @@
 let
   mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
   runtimeDeps = with ocamlPackages; [
-    apron
+    apron.dev
     biniou
     camlzip
     easy-format
@@ -24,12 +24,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "frama-c";
-  version = "21.1";
-  slang   = "Scandium";
+  version = "22.0";
+  slang   = "Titanium";
 
   src = fetchurl {
     url    = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
-    sha256 = "0qq0d08dzr0dmdjysiimdqmwlzgnn932vp5kf8lfn3nl45ai09dy";
+    sha256 = "1mq1fijka95ydrla486yr4w6wdl9l7vmp512s1q00b0p6lmfwmkh";
   };
 
   preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")";

From beb87dff736d681fd5fbc1ea1b46b6cecfef1908 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 06:16:59 +0000
Subject: [PATCH 3705/3942] gortr: 0.14.6 -> 0.14.7

---
 pkgs/servers/gortr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix
index 2af795b2ca91..721570c5c0ae 100644
--- a/pkgs/servers/gortr/default.nix
+++ b/pkgs/servers/gortr/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "gortr";
-  version = "0.14.6";
+  version = "0.14.7";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1z1z4xl39qmd7df1zb2wsd2ycxr4aa9g23sfgp3ws4lhy5d6hyxw";
+    sha256 = "10dq42d3hb6a3ln3x1rag1lqzhwqb66xn4q8k4igjkn5my81nr6q";
   };
   vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp";
 

From e46ab91452b75a25a1a0149e29f02508d133f274 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 06:48:03 +0000
Subject: [PATCH 3706/3942] helmsman: 3.5.1 -> 3.6.2

---
 pkgs/applications/networking/cluster/helmsman/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix
index d044840637eb..21a9608db2c2 100644
--- a/pkgs/applications/networking/cluster/helmsman/default.nix
+++ b/pkgs/applications/networking/cluster/helmsman/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "helmsman";
-  version = "3.5.1";
+  version = "3.6.2";
 
   src = fetchFromGitHub {
     owner = "Praqma";
     repo = "helmsman";
     rev = "v${version}";
-    sha256 = "0vng0ra8bjxmfq6xvdxn72f5bcjrv8i72dams80lf0mq3l7wjl7c";
+    sha256 = "0a9f6745f17sws7fyhz0d8wnriv69d6nrci9j5nhysnzg97ky1np";
   };
 
-  vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl";
+  vendorSha256 = "04csmw5zpansb30amr3i6vlwxc3z38q4g69cklh44cr37glm04sm";
 
   doCheck = false;
 

From 739d528bebc72c68f66926abc4fcf771496d1933 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 06:56:44 +0000
Subject: [PATCH 3707/3942] hey: 0.1.3 -> 0.1.4

---
 pkgs/tools/networking/hey/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix
index 9add729cf2f0..edf91dd311d9 100644
--- a/pkgs/tools/networking/hey/default.nix
+++ b/pkgs/tools/networking/hey/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "hey";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "rakyll";
     repo = pname;
     rev = "v${version}";
-    sha256 = "06w5hf0np0ayvjnfy8zgy605yrs5j326nk2gm0fy7amhwx1fzkwv";
+    sha256 = "0gsdksrzlwpba14a43ayyy41l1hxpw4ayjpvqyd4ycakddlkvgzb";
   };
 
   vendorSha256 = null;

From 79698482665dbc0baffab28aa0b7604ea920f92d Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Wed, 25 Nov 2020 20:15:00 +0100
Subject: [PATCH 3708/3942] libfaketime: fix build with clang

The options -Wno-nonnull-compare, -Wno-error=cast-function-type and -Wno-error=format-truncation
are unsupported by clang, letting the build fail.
---
 .../0001-Remove-unsupported-clang-flags.patch | 25 +++++++++++++++++++
 .../libraries/libfaketime/default.nix         |  7 ++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch

diff --git a/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch
new file mode 100644
index 000000000000..84ee18084c29
--- /dev/null
+++ b/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch
@@ -0,0 +1,25 @@
+From f974fe07de9e6820bb1de50b31e480296d1d97b7 Mon Sep 17 00:00:00 2001
+From: Christian Kampka <christian@kampka.net>
+Date: Wed, 25 Nov 2020 20:09:50 +0100
+Subject: [PATCH] Remove unsupported clang flags
+
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index f13a6bb..b305150 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -69,7 +69,7 @@ PREFIX ?= /usr/local
+ LIBDIRNAME ?= /lib/faketime
+ PLATFORM ?=$(shell uname)
+ 
+-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
++CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
+ ifeq ($(PLATFORM),SunOS)
+ CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
+ endif
+-- 
+2.28.0
+
diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix
index 10cc5cace7b5..6c751e07b831 100644
--- a/pkgs/development/libraries/libfaketime/default.nix
+++ b/pkgs/development/libraries/libfaketime/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./no-date-in-gzip-man-page.patch
-  ];
+  ] ++ (stdenv.lib.optionals stdenv.cc.isClang [
+    # https://github.com/wolfcw/libfaketime/issues/277
+    ./0001-Remove-unsupported-clang-flags.patch
+  ]);
 
   postPatch = ''
     patchShebangs test src
@@ -24,7 +27,7 @@ stdenv.mkDerivation rec {
   PREFIX = placeholder "out";
   LIBDIRNAME = "/lib";
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type -Wno-error=format-truncation";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation";
 
   checkInputs = [ perl ];
 

From 213139a180604dc7342bd285dd6fa85c87d2cd01 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 07:19:23 +0000
Subject: [PATCH 3709/3942] hyper: 2.1.2 -> 3.0.2

---
 pkgs/applications/terminal-emulators/hyper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix
index 1535b1a2568e..e5ea0a67f93a 100644
--- a/pkgs/applications/terminal-emulators/hyper/default.nix
+++ b/pkgs/applications/terminal-emulators/hyper/default.nix
@@ -11,11 +11,11 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  version = "2.1.2";
+  version = "3.0.2";
   pname = "hyper";
   src = fetchurl {
     url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb";
-    sha256 = "1n4qlbk7q9zkhhg72mdks95g15xgyrc6ixf882ghvrqghd4zxplm";
+    sha256 = "0fv4wv5f8nc739bna83qxmgrvvbyq4w9ch764q2f12wjygrz336p";
   };
   buildInputs = [ dpkg ];
   unpackPhase = ''

From e4041869ddbb156d36a669858a6c6ee814af5a21 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 07:36:15 +0000
Subject: [PATCH 3710/3942] igraph: 0.8.3 -> 0.8.4

---
 pkgs/development/libraries/igraph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix
index 70b3d7e767c1..6019a69f3524 100644
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/pkgs/development/libraries/igraph/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "igraph";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "igraph";
     repo = pname;
     rev = version;
-    sha256 = "05k5ws1qgbfkxf6y923r61m42gy45l9awqqbfjqgrb3ricfr4wha";
+    sha256 = "159qd4al19k1i5a54m2q2mxvig4z2lz9h3rd5rq44bklybdc0i7j";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From 42e09c2134add3ae66c6579478c474aeffd8443d Mon Sep 17 00:00:00 2001
From: Joshua Tacoma <jtacoma@google.com>
Date: Thu, 26 Nov 2020 02:49:08 -0500
Subject: [PATCH 3711/3942] dart: support x86_64-darwin platform

---
 .../development/interpreters/dart/default.nix | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index b9485fdcab13..99e6d9662839 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -12,6 +12,10 @@ let
     aarch64 = "arm64";
 
   in {
+    "1.24.3-x86_64-darwin" = fetchurl {
+      url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
+      sha256 = "1n4cq4jrms4j0yl54b3w14agcgy8dbipv5788jziwk8q06a8c69l";
+    };
     "1.24.3-x86_64-linux" = fetchurl {
       url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
       sha256 = "16sm02wbkj328ni0z1z4n4msi12lb8ijxzmbbfamvg766mycj8z3";
@@ -24,6 +28,10 @@ let
       url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
       sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh";
     };
+    "2.7.2-x86_64-darwin" = fetchurl {
+      url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
+      sha256 = "111zl075qdk2zd4d4mmfkn30jmzsri9nq3nspnmc2l245gdq34jj";
+    };
     "2.7.2-x86_64-linux" = fetchurl {
       url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
       sha256 = "0vvsgda1smqdjn35yiq9pxx8f5haxb4hqnspcsfs6sn5c36k854v";
@@ -36,10 +44,18 @@ let
       url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
       sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p";
     };
+    "2.10.0-x86_64-darwin" = fetchurl {
+      url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
+      sha256 = "1n4qgsax5wi7krgvvs0dy7fz39nlykiw8gr0gdacc85hgyhqg09j";
+    };
     "2.10.0-x86_64-linux" = fetchurl {
       url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
       sha256 = "0dncmsfbwcn3ygflhp83i6z4bvc02fbpaq1vzdzw8xdk3sbynchb";
     };
+    "2.9.0-4.0.dev-x86_64-darwin" = fetchurl {
+      url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
+      sha256 = "0gj91pbvqrxsvxaj742cllqha2z65867gggzq9hq5139vkkpfj9s";
+    };
     "2.9.0-4.0.dev-x86_64-linux" = fetchurl {
       url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
       sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r";
@@ -52,6 +68,10 @@ let
       url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
       sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc";
     };
+    "2.11.0-161.0.dev-x86_64-darwin" = fetchurl {
+      url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
+      sha256 = "0mlwxp7jkkjafxkc4vqlgwl62y0hk1arhfrvc9hpm9dv98g3bdjj";
+    };
     "2.11.0-161.0.dev-x86_64-linux" = fetchurl {
       url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
       sha256 = "05difz4w2fyh2yq5p5pkrqk59jqljlxhc1i6lmy5kihh6z69r12i";
@@ -93,7 +113,7 @@ stdenv.mkDerivation {
       with C-style syntax. It offers compilation to JavaScript, interfaces,
       mixins, abstract classes, reified generics, and optional typing.
     '';
-    platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
+    platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ];
     license = licenses.bsd3;
   };
 }

From 1eece5da8617f04beb4d83bdcdc7b2259239b134 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 07:56:36 +0000
Subject: [PATCH 3712/3942] ipscan: 3.7.1 -> 3.7.3

---
 pkgs/tools/security/ipscan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix
index 80634b7d1a1c..4963f5774875 100644
--- a/pkgs/tools/security/ipscan/default.nix
+++ b/pkgs/tools/security/ipscan/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ipscan";
-  version = "3.7.1";
+  version = "3.7.3";
 
   src = fetchurl {
     url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_all.deb";
-    sha256 = "1l6l3nb1yq0f09ia3k9k1dcpzp9g1hxnf547pqmiyiqvd27n7shs";
+    sha256 = "18vvjqsxkz9g503k983cxdzzz6sdkv6qg3nwf8af9k34ynhhh0m7";
   };
 
   sourceRoot = ".";

From 109bcd82b0d7ca81a2a36fa1aac1f6abe0cce694 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 08:10:11 +0000
Subject: [PATCH 3713/3942] jackett: 0.16.2152 -> 0.16.2236

---
 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 497d1fa25409..baa1e6c1c6e3 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jackett";
-  version = "0.16.2152";
+  version = "0.16.2236";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "1q1bydyhddhz110xzbhhjj3gm0rwvjrjgc8j8wsj7xd9k0laygqd";
+    sha256 = "1qra5qcm7bwplkrmy6haf1kk3gpj9jjvgl0y7rs81jn15cjp6fmq";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From cd0c34811867a780e5d6ea63721038c0c1a2ba28 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 25 Nov 2020 15:58:30 -0800
Subject: [PATCH 3714/3942] selenium-server-standalone: 3.6.0 -> 3.141.59

---
 pkgs/development/tools/selenium/server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index a93275f6e2ed..a6d60e33ee36 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -4,8 +4,8 @@
 with stdenv.lib;
 
 let
-  minorVersion = "3.6";
-  patchVersion = "0";
+  minorVersion = "3.141";
+  patchVersion = "59";
 
 in stdenv.mkDerivation rec {
   pname = "selenium-server-standalone";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://selenium-release.storage.googleapis.com/${minorVersion}/selenium-server-standalone-${version}.jar";
-    sha256 = "11v340nm8vzqc2bkmbjfm9a7j4dj0bi9bfk8wdpfan0fb8prf772";
+    sha256 = "1jzkx0ahsb27zzzfvjqv660x9fz2pbcddgmhdzdmasxns5vipxxc";
   };
 
   dontUnpack = true;

From 729dee17b2d81fba053a2743b45f1b93617dd32a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 25 Nov 2020 16:02:11 -0800
Subject: [PATCH 3715/3942] chromedriver: 86.0.4240.22 -> 87.0.4280.20

---
 pkgs/development/tools/selenium/chromedriver/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 8bed549015c1..f7b2f926460a 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -6,12 +6,12 @@ let
   allSpecs = {
     x86_64-linux = {
       system = "linux64";
-      sha256 = "0ndig3gq00nr3zs5f7wl1xw5vsnz1hwmjfrk73vbmb8lqjnfm66l";
+      sha256 = "1cpk7mb32z3a7c7cbaaxskpv91il3i8kgsdp2q8zw9w762kql953";
     };
 
     x86_64-darwin = {
       system = "mac64";
-      sha256 = "1ipxla0d8wa2rn3872xpc5akbmk2rnplk9clrdncmdzakw7f66im";
+      sha256 = "06mx2yk6xy46azvkbyvhqm11prxbh67pfi50fcwxb0zqllbq7scr";
     };
   };
 
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "chromedriver";
-  version = "86.0.4240.22";
+  version = "87.0.4280.20";
 
   src = fetchurl {
     url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";

From 7e26b5456db0a03333776b7baa98caa3438c2b56 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 25 Nov 2020 16:05:43 -0800
Subject: [PATCH 3716/3942] chromium/doc: mention chromedriver when updating

---
 pkgs/applications/networking/browsers/chromium/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/README.md b/pkgs/applications/networking/browsers/chromium/README.md
index 5b7c9fe55040..8e4eae75f960 100644
--- a/pkgs/applications/networking/browsers/chromium/README.md
+++ b/pkgs/applications/networking/browsers/chromium/README.md
@@ -36,6 +36,9 @@ update `upstream-info.json`. After updates it is important to test at least
 `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which
 reuses `upstream-info.json`).
 
+After updating, please also update pkgs/development/tools/selenium/chromedriver/default.nix
+to a matching version.
+
 ## Backports
 
 All updates are considered security critical and should be ported to the stable

From 4cad7f6cfd7729261bf01b964e1a0230487dd981 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 08:26:57 +0000
Subject: [PATCH 3717/3942] jsonnet: 0.16.0 -> 0.17.0

---
 pkgs/development/compilers/jsonnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index 510fca1838ec..be03f53a76ee 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jsonnet";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "google";
     repo = "jsonnet";
-    sha256 = "0wxhc0ghjk88zrrn9a18h979ipkia2rx12489515gzhlplfx6724";
+    sha256 = "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim";
   };
 
   enableParallelBuilding = true;

From d92396d06a25dc3f88a6cab64b9f9a9f68c9f61c Mon Sep 17 00:00:00 2001
From: Samir Hafez <me@samirhafez.com>
Date: Thu, 26 Nov 2020 08:45:16 +0000
Subject: [PATCH 3718/3942] plex: Add aarch64 platform

---
 pkgs/servers/plex/raw.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 925c22091356..7ed3bf8bfecb 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -1,6 +1,6 @@
 { stdenv
 , fetchurl
-, rpmextract
+, dpkg
 }:
 
 # The raw package that fetches and extracts the Plex RPM. Override the source
@@ -12,19 +12,22 @@ stdenv.mkDerivation rec {
   pname = "plexmediaserver";
 
   # Fetch the source
-  src = fetchurl {
-    url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "0vqsmmgqcvvhxiqaw87qz9fdisyf9smp6ab069dz3nq39x7n9na0";
+  src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
+    url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
+    sha256 = "18zj4baa085gbgc0y5gx7gnwzl131xyk34m5xcipfvfb434y98cp";
+  } else fetchurl {
+    url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
+    sha256 = "01rq2q6avjsvnns7jsd2a9vnmd4584fwdkp833gjgrrrqkf6h45y";
   };
 
   outputs = [ "out" "basedb" ];
 
-  nativeBuildInputs = [ rpmextract ];
+  nativeBuildInputs = [ dpkg ];
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ];
 
   unpackPhase = ''
-    rpmextract $src
+    dpkg-deb -R $src .
   '';
 
   installPhase = ''
@@ -52,7 +55,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "https://plex.tv/";
     license = licenses.unfree;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "aarch64-linux" ];
     maintainers = with maintainers; [
       badmutex
       colemickens

From 579cba640d44fdbad68dc0376af35b6977b0f622 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 08:52:12 +0000
Subject: [PATCH 3719/3942] kotlin: 1.4.0 -> 1.4.20

---
 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 e07769967fb1..7f4c824686fe 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.4.0";
+  version = "1.4.20";
 in stdenv.mkDerivation {
   inherit version;
   pname = "kotlin";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "0qgiabpkisqjm9iryidrynqy452vzmpgaw54rd9blr9w7g8r20sr";
+    sha256 = "07q16yc7xfw5kzziwxyd7m4dc9msgqk9y2znqw3397kqssj97nqi";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 5183864d1863332188e0c1f8fb080beda886c2c3 Mon Sep 17 00:00:00 2001
From: Gaute Ravndal <gaute.ravndal@gmail.com>
Date: Tue, 24 Nov 2020 11:44:22 +0100
Subject: [PATCH 3720/3942] linux: explicitly enable RAS

This is needed for EDAC support.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 94558b890de1..47e49dbe01d7 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -775,6 +775,8 @@ let
       X86_CHECK_BIOS_CORRUPTION = yes;
       X86_MCE                   = yes;
 
+      RAS = yes; # Needed for EDAC support
+
       # Our initrd init uses shebang scripts, so can't be modular.
       BINFMT_SCRIPT = yes;
       # For systemd-binfmt

From 0e87647421a5f98ab08cd924b039faed7f932953 Mon Sep 17 00:00:00 2001
From: Yannick Markus <ym@ymarkus.dev>
Date: Thu, 26 Nov 2020 10:56:11 +0100
Subject: [PATCH 3721/3942] postfix: fix "cant find <mysql.h>"

---
 pkgs/servers/mail/postfix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 694d7044b8a2..0b6ed49737d2 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -12,7 +12,7 @@ let
     "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl"
     "-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
    ] ++ lib.optional withPgSQL "-DHAS_PGSQL"
-     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]
+     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient.dev}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]
      ++ lib.optional withSQLite "-DHAS_SQLITE"
      ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]);
    auxlibs = lib.concatStringsSep " " ([

From 1ed49e3ea9201a6f932bcbe79e3cc1c32a5f9fc6 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Mon, 23 Nov 2020 22:08:37 +0100
Subject: [PATCH 3722/3942] voxelands: 1512.00 -> 1704.00

---
 pkgs/games/voxelands/default.nix | 51 ++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix
index 93f7e9bffa67..5e52cba3b49c 100644
--- a/pkgs/games/voxelands/default.nix
+++ b/pkgs/games/voxelands/default.nix
@@ -1,13 +1,30 @@
-{ stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite
-, libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, xlibsWrapper, pkgconfig }:
+{ stdenv
+, fetchFromGitLab
+, bzip2
+, cmake
+, expat
+, irrlicht
+, libGL
+, libGLU
+, libXxf86vm
+, libjpeg
+, libpng
+, libvorbis
+, openal
+, pkg-config
+, sqlite
+, xlibsWrapper
+}:
 
 stdenv.mkDerivation rec {
   pname = "voxelands";
-  version = "1512.00";
+  version = "1704.00";
 
-  src = fetchurl {
-    url = "http://voxelands.com/downloads/${pname}-${version}-src.tar.bz2";
-    sha256 = "0bims0y0nyviv2f2nxfj37s3258cjbfp9xd97najz0yylnk3qdfw";
+  src = fetchFromGitLab {
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "0yj9z9nygpn0z63y739v72l3kg81wd71xgix5k045vfzhqsam5m0";
   };
 
   cmakeFlags = [
@@ -16,16 +33,32 @@ stdenv.mkDerivation rec {
     "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG"
   ];
 
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
   buildInputs = [
-    cmake irrlicht libpng bzip2 libjpeg sqlite
-    libXxf86vm libGLU libGL openal libvorbis xlibsWrapper pkgconfig
+    bzip2
+    expat
+    irrlicht
+    libGL
+    libGLU
+    libXxf86vm
+    libjpeg
+    libpng
+    libvorbis
+    openal
+    sqlite
+    xlibsWrapper
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://voxelands.com/";
+    homepage = "https://voxelands.net/";
     description = "Infinite-world block sandbox game based on Minetest";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ ];
+    broken = stdenv.isAarch64;  # build fails with "libIrrlicht.so: undefined reference to `png_init_filter_functions_neon'"
   };
 }

From 47f32762f77ae2fbe724a2f420787e4214cbebf4 Mon Sep 17 00:00:00 2001
From: mudrii <mudreac@gmail.com>
Date: Thu, 26 Nov 2020 18:00:00 +0800
Subject: [PATCH 3723/3942] maintainers: add mudrii

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 98f32552e118..fb8ba0352cbc 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6129,6 +6129,12 @@
     githubId = 5139265;
     name = "James Wood";
   };
+  mudrii = {
+    email = "mudreac@gmail.com";
+    github = "mudrii";
+    githubId = 220262;
+    name = "Ion Mudreac";
+  };
   muflax = {
     email = "mail@muflax.com";
     github = "muflax";

From 7ccd47f80e101dcc3406b071de2a51577e04fc26 Mon Sep 17 00:00:00 2001
From: Frank Doepper <woffs@woffs.de>
Date: Sun, 27 Sep 2020 21:21:55 +0200
Subject: [PATCH 3724/3942] shotcut: 20.10.31 -> 20.11.25

- see https://github.com/mltframework/shotcut/releases
- reformat
- remove qtwebkit
- qtquickcontrols -> qtquickcontrols2
---
 pkgs/applications/video/shotcut/default.nix | 43 ++++++++++++++++-----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index fee41ed3ef08..7db2d0df7381 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,6 +1,23 @@
-{ stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt
-, jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets
-, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools, genericUpdater
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, mkDerivation
+, SDL2
+, frei0r
+, gettext
+, mlt
+, jack1
+, pkgconfig
+, qtbase
+, qtmultimedia
+, qtx11extras
+, qtwebsockets
+, qtquickcontrols2
+, qtgraphicaleffects
+, libmlt
+, qmake
+, qttools
+, genericUpdater
 , common-updater-scripts
 }:
 
@@ -9,20 +26,28 @@ assert stdenv.lib.versionAtLeast mlt.version "6.22.1";
 
 mkDerivation rec {
   pname = "shotcut";
-  version = "20.10.31";
+  version = "20.11.25";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "16ypq1v396pibhh33nm78p6hr5fz3h74l0ykg9f72b8whw23jyz6";
+    sha256 = "1nm71gnjd082m7bxlmrkngn079m3fdrb059f7wy23qj7khgpi3iz";
   };
 
   enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [
-    SDL2 frei0r gettext mlt libmlt
-    qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols
+    SDL2
+    frei0r
+    gettext
+    mlt
+    libmlt
+    qtbase
+    qtmultimedia
+    qtx11extras
+    qtwebsockets
+    qtquickcontrols2
     qtgraphicaleffects
   ];
 
@@ -43,9 +68,9 @@ mkDerivation rec {
 
   qtWrapperArgs = [
     "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
-    "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2]}"
+    "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]}"
     "--prefix PATH : ${mlt}/bin"
-    ];
+  ];
 
   postInstall = ''
     mkdir -p $out/share/shotcut

From 0722158dba9c401354a53bb618e6e2b1903c7ea7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 10:20:17 +0000
Subject: [PATCH 3725/3942] light: 1.2.1 -> 1.2.2

---
 pkgs/os-specific/linux/light/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix
index 45af4e7ae8e4..b465b2243e1b 100644
--- a/pkgs/os-specific/linux/light/default.nix
+++ b/pkgs/os-specific/linux/light/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, autoreconfHook, coreutils }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.1";
+  version = "1.2.2";
   pname = "light";
   src = fetchFromGitHub {
     owner = "haikarainen";
     repo = "light";
     rev = "v${version}";
-    sha256 = "0zrjipd392bzjvxx0rjrb0cgi0ix1d83fwgw1mcy8kc4d16cgyjg";
+    sha256 = "1a70zcf88ifsnwll486aicjnh48zisdf8f7vi34ihw61kdadsq9s";
   };
 
   configureFlags = [ "--with-udev" ];

From 7231d738d4d69fa540618aa1e3113931d111cea0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 10:26:46 +0000
Subject: [PATCH 3726/3942] lightburn: 0.9.18 -> 0.9.19

---
 pkgs/applications/graphics/lightburn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix
index 6d5e9d9b9476..9d2c6c4dd59f 100644
--- a/pkgs/applications/graphics/lightburn/default.nix
+++ b/pkgs/applications/graphics/lightburn/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   pname = "lightburn";
-  version = "0.9.18";
+  version = "0.9.19";
 
   nativeBuildInputs = [
     p7zip
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
-    sha256 = "0inl6zmc1726gmj85jbvq3ra4zphd2ikhrnqphgy2b0c72yh4pf7";
+    sha256 = "0j3ydivd666fphmgi3ar48xabgi2dcky7p2fyfl7ghxjplflqs9q";
   };
 
   buildInputs = [

From 200ba04cfaadf6d3423cfce54cdab3d79260fec6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 10:36:33 +0000
Subject: [PATCH 3727/3942] lokalise2-cli: 2.6.1 -> 2.6.2

---
 pkgs/tools/misc/lokalise2-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix
index a823973bf9a4..ccf7a05907d1 100644
--- a/pkgs/tools/misc/lokalise2-cli/default.nix
+++ b/pkgs/tools/misc/lokalise2-cli/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "lokalise2-cli";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "lokalise";
     repo = "lokalise-cli-2-go";
     rev = "v${version}";
-    sha256 = "0a3bah5xa2vmxgqkqihbvcc8rpl64yhw3i0c30lhfdfza0jisaql";
+    sha256 = "1iizyr6bv17dpv05whcx34498wbrs0q3gn8s50srvdqrdk9hs4gj";
   };
 
-  vendorSha256 = "06y1v0v1kkbd5vxa8h0qvasm9ibwwhz0v4x03k3nb5xlwn0x9jx8";
+  vendorSha256 = "17nykcx47h1q55msh43mmf092y5cigarz5486yp6sqp79p6lbjk3";
 
   doCheck = false;
 

From 158e31a07ed89ebe12381ee55ea0f328bb16b6da Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 10:47:09 +0000
Subject: [PATCH 3728/3942] mackerel-agent: 0.70.2 -> 0.70.3

---
 pkgs/servers/monitoring/mackerel-agent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix
index 143db9e01b6c..6b8f01bad708 100644
--- a/pkgs/servers/monitoring/mackerel-agent/default.nix
+++ b/pkgs/servers/monitoring/mackerel-agent/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "mackerel-agent";
-  version = "0.70.2";
+  version = "0.70.3";
 
   src = fetchFromGitHub {
     owner = "mackerelio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1c0smbyzwc101v7akaj21r7w0jpf1xcbikf1ljfa8f515ql5hs9r";
+    sha256 = "1i02qmjinnwyi4aqczflj7skfsixn25id7fm760vr2dl2gmlfydg";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 63a60bf31a88ea3ecd51a88b19fd41d337e2d36a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 26 Nov 2020 11:52:20 +0100
Subject: [PATCH 3729/3942] zsh-powerlevel10k: 1.13.0 -> 1.14.3

Update gitstatus pin 1.2.0 -> 1.3.1.

https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.0
https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.1
https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.2
https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.3
---
 pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index a978ac93a9b0..c8e845eec99e 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -7,25 +7,25 @@ let
   # match gitstatus version with given `gitstatus_version`:
   # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info
   gitstatus = pkgs.gitAndTools.gitstatus.overrideAttrs (oldAtttrs: rec {
-    version = "1.2.0";
+    version = "1.3.1";
 
     src = fetchFromGitHub {
       owner = "romkatv";
       repo = "gitstatus";
       rev = "v${version}";
-      sha256 = "0xi5ab0rsj6xs4vqgn2j5rih1nncghr83yn395mk1is1f4bsmp0s";
+      sha256 = "03zaywncds7pjrl07rvdf3fh39gnp2zfvgsf0afqwv317sgmgpzf";
     };
   });
 in
 stdenv.mkDerivation rec {
   pname = "powerlevel10k";
-  version = "1.13.0";
+  version = "1.14.3";
 
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "powerlevel10k";
     rev = "v${version}";
-    sha256 = "0w5rv7z47nys3x113mdddpb2pf1d9pmz9myh4xjzrcy4hp4qv421";
+    sha256 = "073d9hlf6x1nq63mzpywc1b8cljbm1dd8qr07fdf0hsk2fcjiqg7";
   };
 
   patches = [

From 583bab4695c14736b15b65f77e3f1f4443834f27 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 10:57:24 +0000
Subject: [PATCH 3730/3942] matcha-gtk-theme: 2020-11-11-0 -> 2020-11-23

---
 pkgs/data/themes/matcha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 8adaa3b18350..df548052b83e 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matcha-gtk-theme";
-  version = "2020-11-11-0";
+  version = "2020-11-23";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "00nl887nm1syy23s9y590ycjlrl15h5scp9hp0yvg0n6jd78rsc7";
+    sha256 = "115nmzwpsaq8aa0p7ghfcw79n7h9ifvh0drv3dd4lj2dk33vkpv1";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];

From 9e3c598bb7943c0a8cf1bbde8211da4127adce1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 26 Nov 2020 11:57:44 +0100
Subject: [PATCH 3731/3942] nixpkgs-review: 2.4.2 -> 2.5.0

---
 pkgs/tools/package-management/nixpkgs-review/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix
index 89be8b5842ab..c093b2fab0ee 100644
--- a/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/pkgs/tools/package-management/nixpkgs-review/default.nix
@@ -1,24 +1,24 @@
 { stdenv
 , python3
 , fetchFromGitHub
-, nix
+, nixFlakes
 , git
 , lib
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nixpkgs-review";
-  version = "2.4.2";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixpkgs-review";
     rev = version;
-    sha256 = "0qc2m2nr7w7sgpg3yzwfxxpqi9acnw46kj2hlalg5ldjffiqdjxa";
+    sha256 = "1k4i54j5if86qf9dmwm8ybfc4j7ap40y82f03hxfxb7lzq5cqmcv";
   };
 
   makeWrapperArgs = [
-    "--prefix" "PATH" ":" (lib.makeBinPath [ nix git ])
+    "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ])
   ];
 
   meta = with stdenv.lib; {

From 707abc0fbe74655510e1c1914aeb36f3b74b33aa Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Thu, 26 Nov 2020 13:16:37 +0800
Subject: [PATCH 3732/3942] perlPackages.ParallelPipes: init at 0.005

---
 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 e922eb8884bb..36c8805c7dc6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15706,6 +15706,22 @@ let
     propagatedBuildInputs = [ Moo ];
   };
 
+  ParallelPipes = buildPerlModule {
+    pname = "Parallel-Pipes";
+    version = "0.005";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SK/SKAJI/Parallel-Pipes-0.005.tar.gz";
+      sha256 = "44bd9e2be33d7b314f81c9b886a95d53514689090635f9fad53181f2d3051fd5";
+    };
+    buildInputs = [ ModuleBuildTiny ];
+    meta = {
+      homepage = "https://github.com/skaji/Parallel-Pipes";
+      description = "Parallel processing using pipe(2) for communication and synchronization";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.zakame ];
+    };
+  };
+
   ParallelPrefork = buildPerlPackage {
     pname = "Parallel-Prefork";
     version = "0.18";

From c8251d458e6966678a614eb85b086c8fab206ef2 Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Thu, 26 Nov 2020 13:07:59 +0800
Subject: [PATCH 3733/3942] perlPackages.CommandRunner: init at 0.103

---
 pkgs/top-level/perl-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e922eb8884bb..b99fccfbe67d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3134,6 +3134,23 @@ let
      };
   };
 
+  CommandRunner = buildPerlModule {
+    pname = "Command-Runner";
+    version = "0.103";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SK/SKAJI/Command-Runner-0.103.tar.gz";
+      sha256 = "0f180b5c3b3fc9db7b83d4a5fdd959db34f7d6d2472f817dbf8b4b795a9dc82a";
+    };
+    buildInputs = [ ModuleBuildTiny ];
+    propagatedBuildInputs = [ CaptureTiny StringShellQuote Win32ShellQuote ];
+    meta = {
+      homepage = "https://github.com/skaji/Command-Runner";
+      description = "Run external commands and Perl code refs";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.zakame ];
+    };
+  };
+
   commonsense = buildPerlPackage {
     pname = "common-sense";
     version = "3.75";

From 7a95b9b6ae979f65eba21ea7716373f2e9bc0776 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 11:20:03 +0000
Subject: [PATCH 3734/3942] microserver: 0.1.8 -> 0.2.0

---
 pkgs/servers/microserver/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix
index 9132ef9672bd..09c64921ec63 100644
--- a/pkgs/servers/microserver/default.nix
+++ b/pkgs/servers/microserver/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
    pname = "microserver";
-   version = "0.1.8";
+   version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "robertohuertasm";
     repo = "microserver";
     rev = "v${version}";
-    sha256 = "1i9689ra5jnmhkxabrx4zcp5f422w9ql9m4xzldqwmpnckm736v6";
+    sha256 = "1bbbdajh74wh2fbidasim2mzmzqjrgi02v8b0g7vbhpdnlim6ixz";
   };
 
-  cargoSha256 = "1yn3xmmhpixiviayicl2szlzfjx5crffp3pq75d5nz6ky3miai9l";
+  cargoSha256 = "0cyxa200iz7knkma4zi3mzky3g0kibbxd5303psk2rl2rppir0f7";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/robertohuertasm/microserver";

From e242b77c17f844069b6a5f3562f8c8dd1f7cb075 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 26 Nov 2020 11:40:39 +0100
Subject: [PATCH 3735/3942] ocamlPackages.mirage-protocols: 4.0.1 -> 5.0.0

---
 pkgs/development/ocaml-modules/mirage-protocols/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mirage-protocols/default.nix b/pkgs/development/ocaml-modules/mirage-protocols/default.nix
index 99b9c7e8633c..9f144bd2d7ee 100644
--- a/pkgs/development/ocaml-modules/mirage-protocols/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-protocols/default.nix
@@ -2,12 +2,13 @@
 
 buildDunePackage rec {
   pname = "mirage-protocols";
-  version = "4.0.1";
+  version = "5.0.0";
+
   useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-protocols/releases/download/v${version}/mirage-protocols-v${version}.tbz";
-    sha256 = "188m8x6xdw1bllwrpa8f8bqbdqy20kjfk7q8p8jf8j0daf7kl3mi";
+    sha256 = "1bd6zgxhq2qliyzzarfvaj3ksr20ryghxq6h24i2hha7rwim63bk";
   };
 
   propagatedBuildInputs = [ duration ipaddr mirage-device mirage-flow ];

From 2bb9e7c18a6b920074a4fe8bbbfab0e73b066c16 Mon Sep 17 00:00:00 2001
From: Stephen OBrien <wayofthepie@gmail.com>
Date: Thu, 26 Nov 2020 09:38:46 +0000
Subject: [PATCH 3736/3942] doc: convert beam docs to commonmark

---
 doc/languages-frameworks/beam.section.md |  84 ++++++++++++
 doc/languages-frameworks/beam.xml        | 159 -----------------------
 doc/languages-frameworks/index.xml       |   2 +-
 3 files changed, 85 insertions(+), 160 deletions(-)
 create mode 100644 doc/languages-frameworks/beam.section.md
 delete mode 100644 doc/languages-frameworks/beam.xml

diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md
new file mode 100644
index 000000000000..ad3b94880b5c
--- /dev/null
+++ b/doc/languages-frameworks/beam.section.md
@@ -0,0 +1,84 @@
+# BEAM Languages (Erlang, Elixir & LFE) {#sec-beam}
+
+## Introduction {#beam-introduction}
+
+In this document and related Nix expressions, we use the term, *BEAM*, 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.
+
+## Structure {#beam-structure}
+
+All BEAM-related expressions are available via the top-level `beam` attribute, which includes:
+
+  - `interpreters`: a set of compilers running on the BEAM, including multiple Erlang/OTP versions (`beam.interpreters.erlangR19`, etc), Elixir (`beam.interpreters.elixir`) and LFE (`beam.interpreters.lfe`).
+
+  - `packages`: a set of package builders (Mix and rebar3), each compiled with a specific Erlang/OTP version, e.g.  `beam.packages.erlangR19`.
+
+The default Erlang compiler, defined by `beam.interpreters.erlang`, is aliased as `erlang`. The default BEAM package set is defined by `beam.packages.erlang` and aliased at the top level as `beamPackages`.
+
+To create a package builder built with a custom Erlang version, use the lambda, `beam.packagesWith`, which accepts an Erlang/OTP derivation and produces a package builder similar to `beam.packages.erlang`.
+
+Many Erlang/OTP distributions available in `beam.interpreters` have versions with ODBC and/or Java enabled or without wx (no observer support). For example, there's `beam.interpreters.erlangR22_odbc_javac`, which corresponds to `beam.interpreters.erlangR22` and `beam.interpreters.erlangR22_nox`, which corresponds to `beam.interpreters.erlangR22`.
+
+## Build Tools {#build-tools}
+
+### Rebar3 {#build-tools-rebar3}
+
+We provide a version of Rebar3, under `rebar3`. We also provide a helper to fetch Rebar3 dependencies from a lockfile under `fetchRebar3Deps`.
+
+### Mix & Erlang.mk {#build-tools-other}
+
+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 `buildMix` and `buildErlangMk` derivations, respectively.
+
+## How to Install BEAM Packages {#how-to-install-beam-packages}
+
+BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. To install any of those builders into your profile, refer to them by their attribute path `beamPackages.rebar3`:
+
+```ShellSession
+$ nix-env -f "<nixpkgs>" -iA beamPackages.rebar3
+```
+
+## Packaging BEAM Applications {#packaging-beam-applications}
+
+### Erlang Applications {#packaging-erlang-applications}
+
+#### Rebar3 Packages {#rebar3-packages}
+
+The Nix function, `buildRebar3`, defined in `beam.packages.erlang.buildRebar3` and aliased at the top level, can be used to build a derivation that understands how to build a Rebar3 project.
+
+If a package needs to compile native code via Rebar3's port compilation mechanism, add `compilePort = true;` to the derivation.
+
+#### Erlang.mk Packages {#erlang-mk-packages}
+
+Erlang.mk functions similarly to Rebar3, except we use `buildErlangMk` instead of `buildRebar3`.
+
+#### Mix Packages {#mix-packages}
+
+Mix functions similarly to Rebar3, except we use `buildMix` instead of `buildRebar3`.
+
+Alternatively, we can use `buildHex` as a shortcut:
+
+## How to Develop {#how-to-develop}
+
+### Creating a Shell {#creating-a-shell}
+
+Usually, we need to create a `shell.nix` file and do our development inside of the environment specified therein. Just install your version of erlang and other interpreter, and then user your normal build tools.  As an example with elixir:
+
+```nix
+{ pkgs ? import "<nixpkgs"> {} }:
+
+with pkgs;
+
+let
+
+  elixir = beam.packages.erlangR22.elixir_1_9;
+
+in
+mkShell {
+  buildInputs = [ elixir ];
+
+  ERL_INCLUDE_PATH="${erlang}/lib/erlang/usr/include";
+}
+```
+
+#### Building in a Shell (for Mix Projects) {#building-in-a-shell}
+
+Using a `shell.nix` as described (see <xref linkend="creating-a-shell"/>) should just work.
diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml
deleted file mode 100644
index addab24f7f6d..000000000000
--- a/doc/languages-frameworks/beam.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<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>
-
- <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 builders (Mix and rebar3), 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 builder built with a custom Erlang version, use the lambda, <literal>beam.packagesWith</literal>, which accepts an Erlang/OTP derivation and produces a package builder 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 or without wx (no observer support). For example, there's <literal>beam.interpreters.erlangR22_odbc_javac</literal>, which corresponds to <literal>beam.interpreters.erlangR22</literal> and <literal>beam.interpreters.erlangR22_nox</literal>, which corresponds to <literal>beam.interpreters.erlangR22</literal>.
-  </para>
- </section>
-
- <section xml:id="build-tools">
-  <title>Build Tools</title>
-
-  <section xml:id="build-tools-rebar3">
-   <title>Rebar3</title>
-
-   <para>
-    We provide a version of Rebar3, under <literal>rebar3</literal>. We also provide a helper to fetch Rebar3 dependencies from a lockfile under <literal>fetchRebar3Deps</literal>.
-   </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 builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users.
-   To install any of those builders into your profile, refer to them by their attribute path <literal>beamPackages.rebar3</literal>:
-  </para>
-
-<screen>
-<prompt>$ </prompt>nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.rebar3
-</screen>
-</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.
-    </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>
-
-   </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>
-
-    <para>
-     Alternatively, we can use <literal>buildHex</literal> as a shortcut:
-    </para>
-   </section>
-  </section>
- </section>
-
- <section xml:id="how-to-develop">
-  <title>How to Develop</title>
-
-  <section xml:id="creating-a-shell">
-   <title>Creating a Shell</title>
-
-  <para>
-    Usually, we need to create a <literal>shell.nix</literal> file and do our development inside of the environment specified therein. Just install your version of erlang and other interpreter, and then user your normal build tools.
-    As an example with elixir:
-  </para>
-
-<programlisting>
-{ pkgs ? import &quot;&lt;nixpkgs&quot;&gt; {} }:
-
-with pkgs;
-
-let
-
-  elixir = beam.packages.erlangR22.elixir_1_9;
-
-in
-mkShell {
-  buildInputs = [ elixir ];
-
-  ERL_INCLUDE_PATH="${erlang}/lib/erlang/usr/include";
-}
-</programlisting>
-
-   <section xml:id="building-in-a-shell">
-    <title>Building in a Shell (for Mix Projects)</title>
-
-    <para>
-     Using a <literal>shell.nix</literal> as described (see <xref
-      linkend="creating-a-shell"/>) should just work.
-    </para>
-   </section>
-  </section>
- </section>
-</section>
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 3366108cd938..300c4cd2687a 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -7,7 +7,7 @@
  </para>
  <xi:include href="agda.section.xml" />
  <xi:include href="android.section.xml" />
- <xi:include href="beam.xml" />
+ <xi:include href="beam.section.xml" />
  <xi:include href="bower.xml" />
  <xi:include href="coq.xml" />
  <xi:include href="crystal.section.xml" />

From 7d3209b8ea3fa7604a764efdb40e2bad907f0e67 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 11:41:55 +0000
Subject: [PATCH 3737/3942] mkcert: 1.4.2 -> 1.4.3

---
 pkgs/development/tools/misc/mkcert/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix
index 5cb1d9a38ace..0f110ae0b082 100644
--- a/pkgs/development/tools/misc/mkcert/default.nix
+++ b/pkgs/development/tools/misc/mkcert/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "mkcert";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "FiloSottile";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0g85vpkfgkc7nzjl3asl2f4ncsh12naf2fkr0mvyihfmfy9fz0fw";
+    sha256 = "0q0069ripnpb027krc4yk47552xl5rp0ymxf1j2mln9wdmfq65ba";
   };
 
-  vendorSha256 = "0b8ggdpbyxx5n2myhchhlwmm5nndwpykp1ylnzdyw12mdskfvn9h";
+  vendorSha256 = "133vlx825g4zay88ppylsz93q4gnd9ari12x1h57qvk45rwxqx95";
 
   doCheck = false;
 

From 23d71acbb6fc48c842e1122e05d17d09b7155320 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 12:03:31 +0000
Subject: [PATCH 3738/3942] mlkit: 4.5.1 -> 4.5.2

---
 pkgs/development/compilers/mlkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix
index ecb3362e77a1..45cb09d5a2a1 100644
--- a/pkgs/development/compilers/mlkit/default.nix
+++ b/pkgs/development/compilers/mlkit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mlkit";
-  version = "4.5.1";
+  version = "4.5.2";
 
   src = fetchFromGitHub {
     owner = "melsman";
     repo = "mlkit";
     rev = "v${version}";
-    sha256 = "1zigigp168737vjrw5vijgyw4k1bgz4sr7j3rwlibw52snsh4y1c";
+    sha256 = "1yk7phxnwkm94qs1gbxsr6sr11a0sgpcyjymmqwf0fsl5njgyb98";
   };
 
   nativeBuildInputs = [ autoreconfHook mlton ];

From bab529c9fffabc4abd21181f05a6be057219fc3b Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 26 Nov 2020 13:06:35 +0100
Subject: [PATCH 3739/3942] linuxPackages.akvcam: init at 1.1.1

---
 pkgs/os-specific/linux/akvcam/default.nix | 31 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 +++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/os-specific/linux/akvcam/default.nix

diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix
new file mode 100644
index 000000000000..9e7450775147
--- /dev/null
+++ b/pkgs/os-specific/linux/akvcam/default.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchFromGitHub, kernel, qmake }:
+
+stdenv.mkDerivation rec {
+  pname = "akvcam";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "webcamoid";
+    repo = "akvcam";
+    rev = version;
+    sha256 = "ULEhfF+uC/NcVUGAtmP1+BnrcgRgftNS97nLp81avQ8=";
+  };
+
+  nativeBuildInputs = [ qmake ];
+
+  qmakeFlags = [
+    "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  installPhase = ''
+    install -m644 -b -D src/akvcam.ko $out/lib/modules/${kernel.modDirVersion}/akvcam.ko
+  '';
+
+  meta = with lib; {
+    description = "Virtual camera driver for Linux";
+    homepage = "https://github.com/webcamoid/akvcam";
+    maintainers = with maintainers; [ freezeboy ];
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2aba74388a8..e471d42352e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18266,6 +18266,10 @@ in
 
     acpi_call = callPackage ../os-specific/linux/acpi-call {};
 
+    akvcam = callPackage ../os-specific/linux/akvcam {
+      inherit (qt5) qmake;
+    };
+
     amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { };
 
     anbox = callPackage ../os-specific/linux/anbox/kmod.nix { };

From 6e1aa2380b3e40d1ff9fc8c83bbc39452e4dcf8f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 12:34:41 +0000
Subject: [PATCH 3740/3942] nextdns: 1.8.8 -> 1.9.4

---
 pkgs/applications/networking/nextdns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix
index 16f1d7ebd1bb..dfe816fbf934 100644
--- a/pkgs/applications/networking/nextdns/default.nix
+++ b/pkgs/applications/networking/nextdns/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "nextdns";
-  version = "1.8.8";
+  version = "1.9.4";
 
   src = fetchFromGitHub {
     owner = "nextdns";
     repo = "nextdns";
     rev = "v${version}";
-    sha256 = "17grlia9vxjly7hnwdgw8xfrynibj9h839kxs3wbdgp86b4lf5xf";
+    sha256 = "0bd3nvisdg64wcy5syb1iyrv3vy4c6j8gy68dbf141hn1qiah1bg";
   };
 
   vendorSha256 = "09whpzsn16znyrknfm5zlhla253r69j6d751czza4c83m4r36swj";

From c36b5d5799ca53519f3a8938eaa63863d27e32c7 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sun, 4 Oct 2020 15:32:20 +0100
Subject: [PATCH 3741/3942] kube3d: nixpkgs-fmt the file to fit contributing
 guidelines

---
 pkgs/applications/networking/cluster/kube3d/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 9421951547cc..ee0c67c1d51d 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -8,9 +8,9 @@ buildGoModule rec {
   excludedPackages = ''tools'';
 
   src = fetchFromGitHub {
-    owner  = "rancher";
-    repo   = "k3d";
-    rev    = "v${version}";
+    owner = "rancher";
+    repo = "k3d";
+    rev = "v${version}";
     sha256 = "1pq5x4fyn98f01mzfjv335gx29c61zd85qc5vhx9rk27hi825ima";
   };
 

From 7a03c0f5feceb6aaf1da2c48af172086730f0704 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sun, 4 Oct 2020 15:35:35 +0100
Subject: [PATCH 3742/3942] kube3d: add a longDescription to provide detail and
 help searches

search.nixos.org was able to show me `deno` when searching for
"executable" which was in the longDescription
---
 pkgs/applications/networking/cluster/kube3d/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index ee0c67c1d51d..68be8614cb00 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -36,7 +36,12 @@ buildGoModule rec {
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/rancher/k3d";
-    description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
+    longDescription = ''
+      k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s
+
+      k3d creates containerized k3s clusters. This means, that you can spin up a
+      multi-node k3s cluster on a single machine using docker.
+    '';
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ];

From 168df5f4ffab1ad33e4a953712ce001aeed5ee94 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sun, 4 Oct 2020 15:46:48 +0100
Subject: [PATCH 3743/3942] kube3d: mention k3d in the short description

While I was able to find `deno` by searching for "executable" from it's
longDescription on search.nixos.org, I couldn't find it using `nix search`

`nix search` seems to only look at the short description so it's worth
including there too.
---
 pkgs/applications/networking/cluster/kube3d/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 68be8614cb00..31b23159054f 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -36,6 +36,7 @@ buildGoModule rec {
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/rancher/k3d";
+    description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";
     longDescription = ''
       k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s
 

From cdfa9b0c26184fc6850a5f27ab14514427f3a87a Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 17 Nov 2020 22:53:44 +0000
Subject: [PATCH 3744/3942] kube3d: re-order the derivation and general cleanup

Moved k3sVersion to be a variable.
Converted buildFlagsArray to an array
Moved vendorSha256 closer to src
Moved doCheck between build and install related bits (like where the
phase happens)
Replaced stdenv.lib with lib
---
 .../networking/cluster/kube3d/default.nix     | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 31b23159054f..9163347d7b22 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 
+let
+  k3sVersion = "1.19.3-k3s3";
+in
 buildGoModule rec {
   pname = "kube3d";
   version = "3.3.0";
-  k3sVersion = "1.19.3-k3s3";
 
-  excludedPackages = ''tools'';
+  excludedPackages = "tools";
 
   src = fetchFromGitHub {
     owner = "rancher";
@@ -14,15 +16,20 @@ buildGoModule rec {
     sha256 = "1pq5x4fyn98f01mzfjv335gx29c61zd85qc5vhx9rk27hi825ima";
   };
 
-  buildFlagsArray = ''
-    -ldflags=
-      -w -s
-      -X github.com/rancher/k3d/v3/version.Version=v${version}
-      -X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion}
-  '';
+  vendorSha256 = null;
 
   nativeBuildInputs = [ installShellFiles ];
 
+  buildFlagsArray = [
+    "-ldflags="
+    "-w"
+    "-s"
+    "-X github.com/rancher/k3d/v3/version.Version=v${version}"
+    "-X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion}"
+  ];
+
+  doCheck = false;
+
   postInstall = ''
     installShellCompletion --cmd k3d \
       --bash <($out/bin/k3d completion bash) \
@@ -30,11 +37,7 @@ buildGoModule rec {
       --zsh <($out/bin/k3d completion zsh)
   '';
 
-  vendorSha256 = null;
-
-  doCheck = false;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rancher/k3d";
     description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";
     longDescription = ''

From a6f770465e883f95cbc1ae096548499a03520da2 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Thu, 26 Nov 2020 14:30:31 +0100
Subject: [PATCH 3745/3942] execline: cleanup dependencies

---
 pkgs/tools/misc/execline/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index dfc2b1756feb..bf7853c11736 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -1,7 +1,4 @@
-{ lib, skawarePackages
-# for execlineb-with-builtins
-, coreutils, gnugrep, writeScriptBin, runCommand, runCommandCC
-}:
+{ skawarePackages }:
 
 with skawarePackages;
 

From d6d6dd1a68c53f61775b149100983bc00f24b7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 11 Oct 2020 02:33:01 +0200
Subject: [PATCH 3746/3942] FormEncode: 1.3.1 -> 2.0.0

---
 .../python-modules/FormEncode/default.nix     | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix
index f79e76b52c41..d91bef07d2ae 100644
--- a/pkgs/development/python-modules/FormEncode/default.nix
+++ b/pkgs/development/python-modules/FormEncode/default.nix
@@ -1,24 +1,28 @@
-{ stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose }:
+{ stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }:
 
 buildPythonPackage rec {
   pname = "FormEncode";
-  version = "1.3.1";
+  version = "2.0.0";
+
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xm77h2mds2prlaz0z4nzkx13g61rx5c2v3vpgjq9d5ij8bzb8md";
+    sha256 = "049pm276140h30xgzwylhpii24xcln1qfdlfmbj69sqpfhlr5szj";
   };
 
-  buildInputs = [ dnspython pycountry nose ];
-
-  patchPhase = ''
-    # dnspython3 has been superseded, see its PyPI page
-    substituteInPlace setup.py --replace dnspython3 dnspython
+  postPatch = ''
+    sed -i 's/setuptools_scm_git_archive//' setup.py
+    sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py
   '';
 
+  nativeBuildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [ dnspython pycountry nose ];
+
   preCheck = ''
-    # two tests require dns resolving
-    sed -i 's/test_cyrillic_email/noop/' formencode/tests/test_email.py
+    # requires dns resolving
     sed -i 's/test_unicode_ascii_subgroup/noop/' formencode/tests/test_email.py
   '';
 

From a77fa8d94c24ffdb81a688ba2fcbb989f088a7a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 14:09:58 +0000
Subject: [PATCH 3747/3942] nushell: 0.22.0 -> 0.23.0

---
 pkgs/shells/nushell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 411d6eba0000..44961696195f 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "1nj8cjj5db5r4wnxbcsd5z9n5kqf2p1j54l5z0m650370z41df1f";
+    sha256 = "0rbg0jchg59x0g4h0xahdm9qah8l8g4i2s8lkaqzdkm4yv29gqx4";
   };
 
-  cargoSha256 = "0sh6z8dclla3lrjzwfjb7avsbkagaq9d9q3d8ll8y0mahv1a135w";
+  cargoSha256 = "1sbgn68n0rqh1m98dm3r2a3pqqqx4v7axw5djw8qlx4gv7xw1ql0";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

From 0e2730ba72d97123719de40598d16bcc664a72ab Mon Sep 17 00:00:00 2001
From: Matt Votava <mvnetbiz@gmail.com>
Date: Thu, 26 Nov 2020 06:14:22 -0800
Subject: [PATCH 3748/3942] python3Packages.zigpy-zigate: propagate build
 inputs

---
 pkgs/development/python-modules/zigpy-zigate/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index e07451c26334..81512f755d63 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     sha256 = "0ycrsmp3n3awiyj0gbq6xnaa2s9mpc5l7mlmfc00rfnx7rr2z4ha";
   };
 
-  buildInputs = [
+  propagatedBuildInputs = [
     pyserial
     pyserial-asyncio
     pyusb

From e620b76ee88563eef7509a6533d09b376bb280a9 Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Thu, 26 Nov 2020 14:29:11 +0100
Subject: [PATCH 3749/3942] turbo-geth: 2020.11.03 -> 2020.11.04

---
 pkgs/applications/blockchains/turbo-geth.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix
index 59fd1e936d08..3ca62722f9ba 100644
--- a/pkgs/applications/blockchains/turbo-geth.nix
+++ b/pkgs/applications/blockchains/turbo-geth.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "turbo-geth";
-  version = "2020.11.03";
+  version = "2020.11.04";
 
   src = fetchFromGitHub {
     owner = "ledgerwatch";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0fhfrk0k8w1mx4kf81kyirdpa91fm4g5pnvhr9cybrvygc4yx1f7";
+    sha256 = "1iidj7cvpazk2v419l6k7h67rkx0mni3fcxfjpwrp0815fy1c2ri";
   };
 
   vendorSha256 = "16vawkky612zf45d8dhipjmhrprmi28z9wdcnjy07x3bxdyfbhfr";

From eec6063cc49819bf4b7f5549c78acd2af8eedecf Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 26 Nov 2020 15:28:51 +0100
Subject: [PATCH 3750/3942] php73: 7.3.24 -> 7.3.25

https://www.php.net/ChangeLog-7.php#7.3.25
---
 pkgs/development/interpreters/php/7.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/7.3.nix b/pkgs/development/interpreters/php/7.3.nix
index 832a8323d58b..30e26bf87a1b 100644
--- a/pkgs/development/interpreters/php/7.3.nix
+++ b/pkgs/development/interpreters/php/7.3.nix
@@ -4,8 +4,8 @@ let
   generic = (import ./generic.nix) _args;
 
   base = callPackage generic (_args // {
-    version = "7.3.24";
-    sha256 = "1655rj4w63n5fkvdj3kz9f5jfyjgvzw8a6j8zkzgic1p42xszdsm";
+    version = "7.3.25";
+    sha256 = "1yq2fwpg9jgcafcrq4ffqm52r0f80pi6zy7fj1yb1qwim96mlcb9";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

From 8f4677e222b4db24ff6a20cbacd241e6a76ff111 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 14:33:44 +0000
Subject: [PATCH 3751/3942] onefetch: 2.7.1 -> 2.7.3

---
 pkgs/tools/misc/onefetch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix
index 4bb8ff9ef350..165a49fad038 100644
--- a/pkgs/tools/misc/onefetch/default.nix
+++ b/pkgs/tools/misc/onefetch/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "onefetch";
-  version = "2.7.1";
+  version = "2.7.3";
 
   src = fetchFromGitHub {
     owner = "o2sh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1l4acikxkxvmdqn10ck4w4f100vz7kfrzghz5h4haj7ycrr35j3l";
+    sha256 = "0c56na9s3g7rdb4cc6ccsnfby2ihf5zrfs3lg9qxiqsfr7mcn4w9";
   };
 
-  cargoSha256 = "0rmy0jnf5rqd4dqyl6rinxb3n3rzqnixrybs4i27lcas9m753z40";
+  cargoSha256 = "05rrww53g3k2c8mpxvyc067qsgs7w9sxnzdlvmca1idbqa0k9060";
 
   buildInputs = with stdenv;
     lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];

From 3e48a6db49ad11244801b452d94060116da2596c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 25 Nov 2020 12:17:39 +0200
Subject: [PATCH 3752/3942] openjdk: Merge passthrus

Fixes #104680.
---
 pkgs/development/compilers/openjdk/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index fa96f7b3b0d9..1dcd3e23e6fa 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -31,10 +31,6 @@ let
       gtk3 gnome_vfs GConf glib
     ];
 
-    passthru = {
-      inherit gtk3;
-    };
-
     patches = [
       ./fix-java-home-jdk10.patch
       ./read-truststore-from-env-jdk10.patch
@@ -155,6 +151,7 @@ let
     passthru = {
       architecture = "";
       home = "${openjdk}/lib/openjdk";
+      inherit gtk3;
     };
   };
 in openjdk

From 8023e3c42a8a2dbeb91a1c27820013f34aaa4582 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 25 Nov 2020 12:21:08 +0200
Subject: [PATCH 3753/3942] openjdk*: Add gtk3 to passthru of all versions

---
 pkgs/development/compilers/openjdk/11.nix | 1 +
 pkgs/development/compilers/openjdk/12.nix | 1 +
 pkgs/development/compilers/openjdk/13.nix | 1 +
 pkgs/development/compilers/openjdk/8.nix  | 1 +
 4 files changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index b2093f2cf461..326aef1a562c 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -147,6 +147,7 @@ let
     passthru = {
       architecture = "";
       home = "${openjdk}/lib/openjdk";
+      inherit gtk3;
     };
   };
 in openjdk
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
index 3576608e13e6..1de5d84a13be 100644
--- a/pkgs/development/compilers/openjdk/12.nix
+++ b/pkgs/development/compilers/openjdk/12.nix
@@ -151,6 +151,7 @@ let
     passthru = {
       architecture = "";
       home = "${openjdk}/lib/openjdk";
+      inherit gtk3;
     };
   };
 in openjdk
diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix
index 31ffb4baf012..3c7ddfb8dd96 100644
--- a/pkgs/development/compilers/openjdk/13.nix
+++ b/pkgs/development/compilers/openjdk/13.nix
@@ -151,6 +151,7 @@ let
     passthru = {
       architecture = "";
       home = "${openjdk}/lib/openjdk";
+      inherit gtk3;
     };
   };
 in openjdk
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index a51b765fb602..050ca2a564a1 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -267,6 +267,7 @@ let
     passthru = {
       inherit architecture;
       home = "${openjdk8}/lib/openjdk";
+      inherit gtk2;
     };
   };
 in openjdk8

From f7c61658904b8f2e0a834cb8a15707526094364a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 15:04:20 +0000
Subject: [PATCH 3754/3942] ostree: 2020.7 -> 2020.8

---
 pkgs/tools/misc/ostree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 56262d8171ee..1c07c5d57935 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -39,13 +39,13 @@ let
   ]));
 in stdenv.mkDerivation rec {
   pname = "ostree";
-  version = "2020.7";
+  version = "2020.8";
 
   outputs = [ "out" "dev" "man" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
-    sha256 = "0clriq2ypz1fycd6mpjyrhzid44svzpzw0amnank593h69b216ax";
+    sha256 = "16v73v63h16ika73kgh2cvgm0v27r2d48m932mbj3xm6s295kapx";
   };
 
   patches = [

From f8bab20f015e6df8aa019e31bb220c4ac1e9a76d Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 25 Nov 2020 14:15:42 +0100
Subject: [PATCH 3755/3942] ocamlPackages.ocaml-migrate-parsetree: 1.7.3 ->
 1.8.0

---
 .../ocaml-migrate-parsetree/{default.nix => 1.8.x.nix}        | 4 ++--
 pkgs/development/ocaml-modules/sqlexpr/ppx.nix                | 2 ++
 pkgs/top-level/ocaml-packages.nix                             | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename pkgs/development/ocaml-modules/ocaml-migrate-parsetree/{default.nix => 1.8.x.nix} (84%)

diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
similarity index 84%
rename from pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
rename to pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
index bcd0a519899c..faadaf214f51 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
@@ -2,13 +2,13 @@
 
 buildDunePackage rec {
    pname = "ocaml-migrate-parsetree";
-   version = "1.7.3";
+   version = "1.8.0";
 
    src = fetchFromGitHub {
      owner = "ocaml-ppx";
      repo = pname;
      rev = "v${version}";
-     sha256 = "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx";
+     sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq";
    };
 
    propagatedBuildInputs = [ ppx_derivers result ];
diff --git a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
index 863bd21c90ef..572ff5936154 100644
--- a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
+++ b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
@@ -6,6 +6,8 @@ buildDunePackage {
   pname = "ppx_sqlexpr";
   inherit (sqlexpr) version src meta;
 
+  minimumOCamlVersion = "4.06";
+
   postPatch = ''
     substituteInPlace src/ppx/jbuild --replace ppx_core ppxlib
   '';
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 64a23c21fc30..b4bf6f7852e5 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -662,7 +662,9 @@ let
 
     ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { };
 
-    ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { };
+    ocaml-migrate-parsetree = ocaml-migrate-parsetree-1-8;
+
+    ocaml-migrate-parsetree-1-8 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix { };
 
     ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };
 

From 2c3ab49b293127f898fca2cb70a1ddb8ee65f922 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 15:32:13 +0000
Subject: [PATCH 3756/3942] page: 2.3.4 -> 2.3.5

---
 pkgs/tools/misc/page/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/tools/misc/page/default.nix
index c93084a16d7e..b1042d3ae550 100644
--- a/pkgs/tools/misc/page/default.nix
+++ b/pkgs/tools/misc/page/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "page";
-  version = "2.3.4";
+  version = "2.3.5";
 
   src = fetchFromGitHub {
     owner = "I60R";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0xcbnl8fbdfdmcbv5d7v830aa3vfhg7nlf768rbrfd5a0970pllh";
+    sha256 = "1pk3iclmwbkg4nvsgarq4qjpzapjhsl7b7z6zw6havp1zmx9h806";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     installShellCompletion --zsh $completions_dir/_page
   '';
 
-  cargoSha256 = "0ckfmqi6jvbvj99vbdp798mmy6gc54254n32br0ri842b04i26qf";
+  cargoSha256 = "0s1iwli5h6qkibi24v80izr38z84zfx1dv71fv06lzq38b6s4nd5";
 
   meta = with lib; {
     description = "Use neovim as pager";

From bf4d75a6e392917335c8a609c77c5d185896ce17 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 15:49:47 +0000
Subject: [PATCH 3757/3942] pdfsam-basic: 4.2.0 -> 4.2.1

---
 pkgs/applications/misc/pdfsam-basic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index d8e55e113b28..039967f41820 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pdfsam-basic";
-  version = "4.2.0";
+  version = "4.2.1";
 
   src = fetchurl {
     url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
-    sha256 = "0dhwaadk2qw7avpfnw0mgqv3yhjsm4qm88yyy4w24a3cqzrvb56g";
+    sha256 = "0d7pvl87ybkvcxk69fr35fz0w447hy2pm65bhvlril16ljm2izja";
   };
 
   unpackPhase = ''

From 3799d5ae214483b506cacb57eb8ed3007226fe7d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 16:32:35 +0000
Subject: [PATCH 3758/3942] procs: 0.10.7 -> 0.10.9

---
 pkgs/tools/admin/procs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 4e0a093ad51c..c8e8528cff1c 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.10.7";
+  version = "0.10.9";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0aaspzx8sna1m5zldql0ps3sldazwr32q0md0p8z3nimww24i3b3";
+    sha256 = "1bxzwcj7jxv1hkbq84wigshni1ivdga7g77k3h9fxzn7c223yccd";
   };
 
-  cargoSha256 = "1nb38nnmmc4hf8crp0bka029hlph15zm796nqziq25i26cgz4xvp";
+  cargoSha256 = "1bf0r9kymc1w1rxpc0bjgj5faagmad9vh404n9860rpganrdjvkx";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 6e10f43c6b918e040040df724440c9e034f412f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 17:26:49 +0000
Subject: [PATCH 3759/3942] pt2-clone: 1.24 -> 1.25_fix

---
 pkgs/applications/audio/pt2-clone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix
index 8a0cd99ff2ba..c7258261f198 100644
--- a/pkgs/applications/audio/pt2-clone/default.nix
+++ b/pkgs/applications/audio/pt2-clone/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pt2-clone";
-  version = "1.24";
+  version = "1.25_fix";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "pt2-clone";
     rev = "v${version}";
-    sha256 = "0lw18943dqgydgl4byk440j016m486s82k6hhqjn3w75108b7w1r";
+    sha256 = "1slv8qjxsj67z6984nl67g53mq0sdls2cbikvfjmgmad1wkh98ma";
   };
 
   nativeBuildInputs = [ cmake ];

From 8c1f644cc77c67e941582abe83165b99f8194191 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 17:48:20 +0000
Subject: [PATCH 3760/3942] qalculate-gtk: 3.14.0 -> 3.15.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 48c4b77c2ccd..09ead07dc09d 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qalculate-gtk";
-  version = "3.14.0";
+  version = "3.15.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     rev = "v${version}";
-    sha256 = "1pff3m5xnw9kai6n110j1grxzcf2r7pxi76jin1lxhm8q8gmnnz1";
+    sha256 = "1w0r9vv1h3zbfdvk8965g5plfkz5clf81riil5b394ms9vsw0bx5";
   };
 
   hardeningDisable = [ "format" ];

From 19f0fc9f2340bef9ae798cd8f929889901e6e262 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 17:56:36 +0000
Subject: [PATCH 3761/3942] qogir-icon-theme: 2020-06-22 -> 2020-11-22

---
 pkgs/data/icons/qogir-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix
index 2a9a895b6caf..1d677f1457df 100644
--- a/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/pkgs/data/icons/qogir-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qogir-icon-theme";
-  version = "2020-06-22";
+  version = "2020-11-22";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "0s5fhwfhn4qgk198jw736byxdrfm42l5m681pllbhg02j8ld4iik";
+    sha256 = "04rkpsiz8jg9i55mslsh7a6wgyp30ja3xss7qacqimdab236300d";
   };
 
   nativeBuildInputs = [ gtk3 ];

From c0fa30bbcf457202a636a9c24e2a19170ce3bd4f Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 22 Nov 2020 19:16:29 +0100
Subject: [PATCH 3762/3942] pythonPackages.pypandoc: fix tests for pandoc >=
 2.11.2

A change in the Markdown output of pandoc breaks the unicode input test
of pypandoc.

See also https://github.com/bebraw/pypandoc/pull/204
---
 pkgs/development/python-modules/pypandoc/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix
index b4788999a353..3da9c3ae0a7c 100644
--- a/pkgs/development/python-modules/pypandoc/default.nix
+++ b/pkgs/development/python-modules/pypandoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
 , pandoc, haskellPackages, texlive }:
 
 buildPythonPackage rec {
@@ -12,6 +12,14 @@ buildPythonPackage rec {
     sha256 = "1lpslfns6zxx7b0xr13bzg921lwrj5am8za0b2dviywk6iiib0ld";
   };
 
+  # https://github.com/bebraw/pypandoc/pull/204
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/sternenseemann/pypandoc/commit/e422e277dd667c77dae11fad931dbb6015e9a784.patch";
+      sha256 = "11l11kh2a4k0h1g4yvijb60076kzxlkrvda3x6dc1s8fz352bpg3";
+    })
+  ];
+
   postPatch = ''
     # set pandoc path statically
     sed -i '/^__pandoc_path = None$/c__pandoc_path = "${pandoc}/bin/pandoc"' pypandoc/__init__.py

From ffb8c1c4ec9b77d4acfa9b991d41ffd1f8f2d5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 26 Nov 2020 19:23:03 +0100
Subject: [PATCH 3763/3942] microserver: Fix compilation on Darwin

---
 pkgs/servers/microserver/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix
index 09c64921ec63..618b6f75e7b7 100644
--- a/pkgs/servers/microserver/default.nix
+++ b/pkgs/servers/microserver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform, darwin }:
 
 rustPlatform.buildRustPackage rec {
    pname = "microserver";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0cyxa200iz7knkma4zi3mzky3g0kibbxd5303psk2rl2rppir0f7";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]);
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/robertohuertasm/microserver";
     description = "Simple ad-hoc server with SPA support";

From 8f72150d9dbf71041ddf602e8398a3236bf88b7b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 18:24:29 +0000
Subject: [PATCH 3764/3942] qtox: 1.17.2 -> 1.17.3

---
 .../networking/instant-messengers/qtox/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 0df7a5d8e560..952182def26d 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -7,7 +7,7 @@
 , AVFoundation ? null }:
 
 let
-  version = "1.17.2";
+  version = "1.17.3";
   rev = "v${version}";
 
 in mkDerivation {
@@ -17,7 +17,7 @@ in mkDerivation {
   src = fetchFromGitHub {
     owner  = "qTox";
     repo   = "qTox";
-    sha256 = "04pbv1zsxy8dph2v0r9xc8lcm5g6604pwnppi3la5w46ihbwxlb9";
+    sha256 = "19xgw9bqirxbgvj5cdh20qxh61pkwk838lq1l78n6py1qrs7z5wp";
     inherit rev;
   };
 

From a94fd94d5c45fabae8202c0f90154a29193d12cb Mon Sep 17 00:00:00 2001
From: con-f-use <con-f-use@gmx.net>
Date: Wed, 25 Nov 2020 17:13:49 +0100
Subject: [PATCH 3765/3942] mcomix3: init at 20201123

closes #75028
---
 .../applications/graphics/mcomix3/default.nix | 99 +++++++++++++++++++
 pkgs/top-level/aliases.nix                    |  2 +-
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/graphics/mcomix3/default.nix

diff --git a/pkgs/applications/graphics/mcomix3/default.nix b/pkgs/applications/graphics/mcomix3/default.nix
new file mode 100644
index 000000000000..c9110cbea0b1
--- /dev/null
+++ b/pkgs/applications/graphics/mcomix3/default.nix
@@ -0,0 +1,99 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, python3
+, wrapGAppsHook
+, gobject-introspection
+, gtk3
+, gdk-pixbuf
+# Recommended Dependencies:
+, unrarSupport ? false
+, unrar
+, p7zip
+, lhasa
+, mupdf
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "mcomix3";
+  version = "unstable-2020-11-23";
+
+  # fetch from github because no official release on pypi/github and no build system
+  src = fetchFromGitHub {
+    repo   = "${pname}";
+    owner  = "multiSnow";
+    rev = "cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8";
+    sha256 = "0q9xgl60ryf7qmy5vgzgfry4rvw5j9rb4d1ilxmpjmvm7dd3fm2k";
+  };
+
+  buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ];
+  nativeBuildInputs = [ wrapGAppsHook ];
+  propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]);
+
+  format = "other";
+
+  # Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943
+  # until https://github.com/NixOS/nixpkgs/pull/102613
+  strictDeps = false;
+
+  preInstall = ''
+    libdir=$out/lib/${python3.libPrefix}/site-packages
+    mkdir -p $out/share/{icons/hicolor,man/man1,applications,metainfo,thumbnailers}
+    mkdir -p $out/bin $libdir
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    ${python3.executable} installer.py --srcdir=mcomix --target=$libdir
+    mv $libdir/mcomix/mcomixstarter.py $out/bin/${pname}
+    mv $libdir/mcomix/comicthumb.py $out/bin/comicthumb
+    mv $libdir/mcomix/mcomix/* $libdir/mcomix
+
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    rmdir $libdir/mcomix/mcomix
+    cp man/* $out/share/man/man1/
+    cp -r mime/icons/* $out/share/icons/hicolor/
+    cp mime/*.desktop $out/share/applications/
+    cp mime/*.appdata.xml $out/share/metainfo/
+    cp mime/*.thumbnailer $out/share/thumbnailers/
+    for folder in $out/share/icons/hicolor/*; do
+        mkdir $folder/{apps,mimetypes}
+        mv $folder/*.png $folder/mimetypes
+        cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbr.png
+        cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbz.png
+    done
+  '';
+
+  # to prevent double wrapping
+  dontWrapGApps = true;
+  preFixup = ''
+    makeWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}"
+      "--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip lhasa mupdf ] ++ lib.optional (unrarSupport) unrar)}"
+    )
+  '';
+
+  # real pytests seem to be broken upstream
+  checkPhase = ''
+    $out/bin/comicthumb --help > /dev/null
+    $out/bin/${pname} --help > /dev/null
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Comic book reader and image viewer; python3 fork of mcomix";
+    longDescription = ''
+      User-friendly, customizable image viewer, specifically designed to handle
+      comic books and manga supporting a variety of container formats
+      (including CBR, CBZ, CB7, CBT, LHA and PDF)
+    '';
+    homepage = "https://github.com/multiSnow/mcomix3";
+    changelog = "https://github.com/multiSnow/mcomix3/blob/gtk3/ChangeLog";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ confus ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9187b127c93d..f031dc741336 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -307,7 +307,7 @@ mapAliases ({
   mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08
   mess = mame; # added 2019-10-30
   mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23
-  mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10
+  mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25
   mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10
   mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18
   mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40c7e40adfed..4bf3749e11ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22368,6 +22368,8 @@ in
 
   mblaze = callPackage ../applications/networking/mailreaders/mblaze { };
 
+  mcomix3 = callPackage ../applications/graphics/mcomix3 {};
+
   mcpp = callPackage ../development/compilers/mcpp { };
 
   mda_lv2 = callPackage ../applications/audio/mda-lv2 { };

From 74cc6d2aa7dfd19d60578c5f609c2cd4e7e1be79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 26 Nov 2020 19:31:16 +0100
Subject: [PATCH 3766/3942] bctoolbox: Change license to GPL3Only

---
 pkgs/development/libraries/bctoolbox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix
index e9b561e16860..0b2047466498 100644
--- a/pkgs/development/libraries/bctoolbox/default.nix
+++ b/pkgs/development/libraries/bctoolbox/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.linphone.org/BC/public/bctoolbox";
     # Still using GPLv2 but as the rest of the Linphone projects have switched
     # to GPLv3, this might too, so check this when bumping the version number.
-    license = licenses.gpl2Plus;
+    license = licenses.gpl3Only;
     maintainers = with maintainers; [ raskin jluttine ];
     platforms = platforms.linux;
   };

From 979e2c252ac5a8b57bc3608dde475a011b4d2d24 Mon Sep 17 00:00:00 2001
From: Isaac van Bakel <ivb@vanbakel.io>
Date: Thu, 26 Nov 2020 16:10:07 +0000
Subject: [PATCH 3767/3942] logstash: fix missing package hooks

logstash packages were failing to run the pre/postInstall hooks, despite
running the install phase.
---
 pkgs/tools/misc/logstash/6.x.nix     | 2 ++
 pkgs/tools/misc/logstash/7.x.nix     | 2 ++
 pkgs/tools/misc/logstash/contrib.nix | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix
index 52e74e5babf5..b8008864bccf 100644
--- a/pkgs/tools/misc/logstash/6.x.nix
+++ b/pkgs/tools/misc/logstash/6.x.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out
     cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
 
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/bin/logstash-plugin \
        --set JAVA_HOME "${jre}"
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix
index e7872b0c4061..cd554167dda8 100644
--- a/pkgs/tools/misc/logstash/7.x.nix
+++ b/pkgs/tools/misc/logstash/7.x.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out
     cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
 
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/bin/logstash-plugin \
        --set JAVA_HOME "${jre}"
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix
index d03e031b7aee..d4fb6532ef59 100644
--- a/pkgs/tools/misc/logstash/contrib.nix
+++ b/pkgs/tools/misc/logstash/contrib.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchzip }:
 
 # Note that plugins are supposed to be installed as:
-#   $path/logstash/{inputs,codecs,filters,outputs}/*.rb 
+#   $path/logstash/{inputs,codecs,filters,outputs}/*.rb
 stdenv.mkDerivation rec {
   version = "1.4.2";
   pname = "logstash-contrib";
@@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
   dontPatchShebangs = true;
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/logstash
     cp -r lib/* $out
+    runHook postInstall
   '';
 
   meta = with lib; {

From baf92e2e6fe12ed3e4465ba6d6be857373b81ff4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 26 Nov 2020 12:22:37 +0800
Subject: [PATCH 3768/3942] autojump: py2 -> py3

---
 pkgs/tools/misc/autojump/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index 85e500388341..c1a55256b35a 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python, bash }:
+{ stdenv, fetchFromGitHub, python3, bash }:
 
 stdenv.mkDerivation rec {
   pname = "autojump";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws";
   };
 
-  buildInputs = [ python bash ];
+  buildInputs = [ python3 bash ];
   dontBuild = true;
 
   installPhase = ''

From eef03f8965c7f358380db395614574bb72993171 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 18:04:26 +0000
Subject: [PATCH 3769/3942] qpdf: 10.0.3 -> 10.0.4

---
 pkgs/development/libraries/qpdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index c098680d27a9..a427bd5d0518 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qpdf";
-  version = "10.0.3";
+  version = "10.0.4";
 
   src = fetchFromGitHub {
     owner = "qpdf";
     repo = "qpdf";
     rev = "release-qpdf-${version}";
-    sha256 = "14c4ig51hhrvrwhhriklylp40349xqgd3filajsvqk9vaww6na7f";
+    sha256 = "1jqijnni2pmbbdk2g3pi14178j7mls8dj2bcwf1lds5ar0ghsagc";
   };
 
   nativeBuildInputs = [ perl ];

From fdad84f0922febe425659d4357072eb354378b59 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Sat, 21 Nov 2020 15:50:37 +0100
Subject: [PATCH 3770/3942] tautulli: 2.2.4 -> 2.6.1

---
 pkgs/servers/tautulli/default.nix | 50 ++++++++++++++-----------------
 pkgs/top-level/all-packages.nix   |  2 +-
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index 1fbf94beb18b..c7e88eb0c463 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -1,54 +1,48 @@
-{stdenv, fetchFromGitHub, python }:
+{ lib, fetchFromGitHub, python, buildPythonApplication, bash, setuptools, wrapPython, makeWrapper }:
 
-stdenv.mkDerivation rec {
-  version = "2.2.4";
+buildPythonApplication rec {
   pname = "Tautulli";
+  version = "2.6.1";
+  format = "other";
 
-  pythonPath = [ python.pkgs.setuptools ];
-  buildInputs = [ python.pkgs.setuptools ];
-  nativeBuildInputs = [ python.pkgs.wrapPython ];
+  pythonPath = [ setuptools ];
+  nativeBuildInputs = [ wrapPython makeWrapper ];
 
   src = fetchFromGitHub {
     owner = "Tautulli";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0yg7r7yscx6jbs1lnl9nbax3v9r6ppvhr4igdm3gbvd2803j8fs7";
+    sha256 = "QHpVIOtGFzNqAEcBCv48YWO4pYatbTe/CWwcwjbj+34=";
   };
 
-  buildPhase = ":";
+  doBuild = false;
 
   installPhase = ''
-    mkdir -p $out
-    cp -R * $out/
+    mkdir -p $out/bin $out/libexec/tautulli
+    cp -R contrib data lib plexpy Tautulli.py $out/libexec/tautulli
 
-    # Remove the PlexPy.py compatibility file as it won't work after wrapping.
-    # We still have the plexpy executable in bin for compatibility.
-    rm $out/PlexPy.py
-
-    # Remove superfluous Python checks from main script;
-    # prepend shebang
-    echo "#!${python.interpreter}" > $out/Tautulli.py
-    tail -n +7 Tautulli.py >> $out/Tautulli.py
-
-
-    mkdir $out/bin
     # Can't just symlink to the main script, since it uses __file__ to
     # import bundled packages and manage the service
-    echo "#!/bin/bash" > $out/bin/tautulli
-    echo "$out/Tautulli.py \$*" >> $out/bin/tautulli
-    chmod +x $out/bin/tautulli
+    makeWrapper $out/libexec/tautulli/Tautulli.py $out/bin/tautulli
+    wrapPythonProgramsIn "$out/libexec/tautulli" "$pythonPath"
 
     # Creat backwards compatibility symlink to bin/plexpy
     ln -s $out/bin/tautulli $out/bin/plexpy
-
-    wrapPythonProgramsIn "$out" "$out $pythonPath"
   '';
 
-  meta  = with stdenv.lib; {
+  checkPhase = ''
+    runHook preCheck
+
+    $out/bin/tautulli --help
+
+    runHook postCheck
+  '';
+
+  meta  = with lib; {
     description = "A Python based monitoring and tracking tool for Plex Media Server";
     homepage = "https://tautulli.com/";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ csingley ];
+    maintainers = with maintainers; [ csingley ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a4e623d213d..1c1b319487a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6507,7 +6507,7 @@ in
 
   tab = callPackage ../tools/text/tab { };
 
-  tautulli = callPackage ../servers/tautulli { python = python2; };
+  tautulli = python3Packages.callPackage ../servers/tautulli { };
 
   ploticus = callPackage ../tools/graphics/ploticus {
     libpng = libpng12;

From c4cf80687a0dd44ece977bfd21b886a36abeb21f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 19:05:25 +0000
Subject: [PATCH 3771/3942] rofi-unwrapped: 1.6.0 -> 1.6.1

---
 pkgs/applications/misc/rofi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index d565e1874cd1..6ee2cb8c3495 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rofi-unwrapped";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz";
-    sha256 = "sha256-BS/ypMS/MfaiUizWVov8yYgGJjgwMWvz0PiH3sYYn50=";
+    sha256 = "04glljqbf9ckkc6x6fv4x1gqmy468n1agya0kd8rxdvz24wzf7cd";
   };
 
   preConfigure = ''

From 138a90ebc36cd4ddb32704035142a03dc34d324d Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sat, 17 Oct 2020 16:03:11 +0200
Subject: [PATCH 3772/3942] nim: 1.2.6 -> 1.4.0

Build Nim with a second fixed-input hash for 1.4.0.
The Nimble utility is no longer bundled with nim-unwrapped.
---
 pkgs/development/compilers/nim/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 0ec259b66084..30290eb83a6a 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -4,10 +4,10 @@
 , boehmgc, sqlite, nim-unwrapped, nim }:
 
 let
-  version = "1.2.6";
+  version = "1.4.0";
   src = fetchurl {
     url = "https://nim-lang.org/download/nim-${version}.tar.xz";
-    sha256 = "0zk5qzxayqjw7kq6p92j4008g9bbyilyymhdc5xq9sln5rqym26z";
+    sha256 = "0gf2lqkqzai6mg7mf4y04gdy1ddiavans09i8aisa88ssfza5ywx";
   };
 
   meta = with lib; {
@@ -139,7 +139,7 @@ let
         local HOME=$TMPDIR
         ./bin/nim c koch
         ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
-        ./koch tools $kochArgs --parallelBuild:$NIX_BUILD_CORES
+        ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES
         runHook postBuild
       '';
 

From bb7b1b59c860a23010473b0408f56c91f7d0c810 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Thu, 26 Nov 2020 14:10:47 +0100
Subject: [PATCH 3773/3942] nim: include nimble utility with wrapped compiler

---
 pkgs/development/compilers/nim/default.nix | 55 ++++++++++++++++++----
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 30290eb83a6a..59061c0a2f0c 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,7 +1,7 @@
 # https://nim-lang.github.io/Nim/packaging.html
 
-{ stdenv, lib, fetchgit, fetchurl, makeWrapper, gdb, openssl, pcre, readline
-, boehmgc, sqlite, nim-unwrapped, nim }:
+{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub, makeWrapper, gdb, openssl
+, pcre, readline, boehmgc, sqlite, nim-unwrapped, nimble-unwrapped }:
 
 let
   version = "1.4.0";
@@ -153,21 +153,52 @@ let
 
       inherit meta;
     };
+
+    nimble-unwrapped = stdenv.mkDerivation rec {
+      pname = "nimble-unwrapped";
+      version = "0.12.0";
+
+      src = fetchFromGitHub {
+        owner = "nim-lang";
+        repo = "nimble";
+        rev = "v" + version;
+        sha256 = "0vx0mdk31n00dr2rhiip6f4x7aa3z3mnblnmwk7f65ixd5hayq6y";
+      };
+
+      nativeBuildInputs = [ nim-unwrapped ];
+      buildInputs = [ openssl ];
+
+      nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ];
+
+      buildPhase = ''
+        runHook preBuild
+        HOME=$NIX_BUILD_TOP nim c $nimFlags src/nimble
+        runHook postBuild
+      '';
+
+      installPhase = ''
+        runHook preBuild
+        install -Dt $out/bin src/nimble
+        runHook postBuild
+      '';
+    };
+
   };
 
   wrapped = let
-    nim = nim-unwrapped;
+    nim' = nim-unwrapped;
+    nimble' = nimble-unwrapped;
     inherit (stdenv) targetPlatform;
   in stdenv.mkDerivation {
-    name = "${targetPlatform.config}-nim-wrapper-${nim.version}";
-    inherit (nim) version;
+    name = "${targetPlatform.config}-nim-wrapper-${nim'.version}";
+    inherit (nim') version;
     preferLocalBuild = true;
 
     nativeBuildInputs = [ makeWrapper ];
 
     unpackPhase = ''
       runHook preUnpack
-      tar xf ${nim.src} nim-$version/config/nim.cfg
+      tar xf ${nim'.src} nim-$version/config/nim.cfg
       cd nim-$version
       runHook postUnpack
     '';
@@ -210,7 +241,7 @@ let
         substituteAll config/nim.cfg $out/etc/nim/nim.cfg \
           --replace "cc = gcc" ""
 
-        for binpath in ${nim}/bin/nim?*; do
+        for binpath in ${nim'}/bin/nim?*; do
           local binname=`basename $binpath`
           makeWrapper \
             $binpath $out/bin/${targetPlatform.config}-$binname \
@@ -219,21 +250,25 @@ let
         done
 
         makeWrapper \
-          ${nim}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
+          ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
           $wrapperArgs
         ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
 
+        makeWrapper \
+          ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
+          --suffix PATH : $out/bin
+        ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble
+
         runHook postBuild
       '';
 
     dontInstall = true;
 
     meta = meta // {
-      description = nim.meta.description
+      description = nim'.meta.description
         + " (${targetPlatform.config} wrapper)";
       platforms = lib.platforms.unix;
     };
-
   };
 
 in wrapped // wrapperInputs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0dcdb8d6b84..55ebbab69b0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9794,6 +9794,7 @@ in
 
   nim = callPackage ../development/compilers/nim { };
   nim-unwrapped = nim.unwrapped;
+  nimble-unwrapped = nim.nimble-unwrapped;
 
   nrpl = callPackage ../development/tools/nrpl { };
 

From 524d11091282ce68210601506c9b63d7d3a1653c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 19:12:50 +0000
Subject: [PATCH 3774/3942] rssguard: 3.8.0 -> 3.8.2

---
 pkgs/applications/networking/feedreaders/rssguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index 9ed20d7da647..f9abd3fef3c0 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rssguard";
-  version = "3.8.0";
+  version = "3.8.2";
 
   src = fetchFromGitHub {
     owner = "martinrotter";
     repo = pname;
     rev = version;
-    sha256 = "1fkd5j4ppk36ly6b5pjgng2vksqj6jvpyysg1xz77h2rl4xkzmkw";
+    sha256 = "0vy89ih586s89s29dzzggk7bkaz70mzrc9islirk01s1jal1jn0v";
   };
 
   buildInputs =  [ qtwebengine qttools ];

From 1eb55d4c558e9fee455761920c28a1c6faaea73b Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 26 Nov 2020 15:31:15 +0100
Subject: [PATCH 3775/3942] php74: 7.4.12 -> 7.4.13

https://www.php.net/ChangeLog-7.php#7.4.13
---
 pkgs/development/interpreters/php/7.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix
index 571c7af8fc69..b45da1fb86cb 100644
--- a/pkgs/development/interpreters/php/7.4.nix
+++ b/pkgs/development/interpreters/php/7.4.nix
@@ -4,8 +4,8 @@ let
   generic = (import ./generic.nix) _args;
 
   base = callPackage generic (_args // {
-    version = "7.4.12";
-    sha256 = "0rwrl7xgfq2bbgmy34klgfsqa7v935074ibanmic9pwy4g676vvf";
+    version = "7.4.13";
+    sha256 = "1nhzldjp8jfd1hivfyn5wydim5daibz0vkfxgys2xj8igs2kk8qm";
   });
 
 in base.withExtensions ({ all, ... }: with all; ([

From c05b0c32afca61846c04ba4979f5e69fe42421c6 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Fri, 20 Nov 2020 16:05:03 -0800
Subject: [PATCH 3776/3942] zerotierone: 1.4.6 -> 1.6.0

---
 pkgs/tools/networking/zerotierone/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 666b30d2c8e7..69bf355802e1 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -2,22 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "zerotierone";
-  version = "1.4.6";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "zerotier";
     repo = "ZeroTierOne";
     rev = version;
-    sha256 = "1f8hh05wx59dc0fbzdzwq05x0gmrdfl4v103wbcyjmzsbazaw6p3";
+    sha256 = "0k0pirk5vg33s3vbzjjgyqpv57iz4qgm2jifpbr1kx40kgpf575a";
   };
 
   preConfigure = ''
-      substituteInPlace ./osdep/ManagedRoute.cpp \
-        --replace '/usr/sbin/ip' '${iproute}/bin/ip'
-
-      substituteInPlace ./osdep/ManagedRoute.cpp \
-        --replace '/sbin/ip' '${iproute}/bin/ip'
-
       patchShebangs ./doc/build.sh
       substituteInPlace ./doc/build.sh \
         --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \

From 4d15dd3a08d95d4bdacfb0aa7967b46bb000765a Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Thu, 26 Nov 2020 10:36:04 -0800
Subject: [PATCH 3777/3942] zerotierone: 1.6.0 -> 1.6.1

---
 pkgs/tools/networking/zerotierone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 69bf355802e1..9d254a055109 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zerotierone";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "zerotier";
     repo = "ZeroTierOne";
     rev = version;
-    sha256 = "0k0pirk5vg33s3vbzjjgyqpv57iz4qgm2jifpbr1kx40kgpf575a";
+    sha256 = "0zk1lvjramahjpq94axdic8sgvvmgyg1fmcb89lynqqvh66qsv12";
   };
 
   preConfigure = ''

From d9d8c8a7fc5c46aff67d500297e3c5a53e055d73 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 26 Nov 2020 14:49:33 -0500
Subject: [PATCH 3778/3942] blender: use ffmpeg instead of ffmpeg_3

build_files/cmake/Modules/FindFFmpeg.cmake currently searches for
libavcodec/ac3_parser.h which is not present in ffmpeg_3 (at least on
darwin).
---
 pkgs/applications/misc/blender/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 718765e6efe9..882139794c94 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg_3, gettext, glew
+{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
 , ilmbase, libXi, libX11, libXext, libXrender
 , libjpeg, libpng, libsamplerate, libsndfile
 , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath;
   buildInputs =
-    [ boost ffmpeg_3 gettext glew ilmbase
+    [ boost ffmpeg gettext glew ilmbase
       freetype libjpeg libpng libsamplerate libsndfile libtiff
       opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc
       alembic

From 492f3b80abad67261d1da0fbc415749f9a51c2ee Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 26 Nov 2020 14:51:18 -0500
Subject: [PATCH 3779/3942] blender: fix on darwin

---
 pkgs/applications/misc/blender/darwin.patch | 85 ++++++---------------
 pkgs/applications/misc/blender/default.nix  | 18 ++---
 2 files changed, 30 insertions(+), 73 deletions(-)

diff --git a/pkgs/applications/misc/blender/darwin.patch b/pkgs/applications/misc/blender/darwin.patch
index c426c0b66077..bfbfb5e48e02 100644
--- a/pkgs/applications/misc/blender/darwin.patch
+++ b/pkgs/applications/misc/blender/darwin.patch
@@ -1,24 +1,26 @@
 diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
 --- a/build_files/cmake/platform/platform_apple.cmake
 +++ b/build_files/cmake/platform/platform_apple.cmake
-@@ -35,7 +35,6 @@ else()
+@@ -80,7 +80,6 @@ else()
    message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
  endif()
  if(NOT EXISTS "${LIBDIR}/")
 -  message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
  endif()
  
- if(WITH_OPENAL)
-@@ -86,7 +85,7 @@ endif()
- if(WITH_CODEC_SNDFILE)
-   set(LIBSNDFILE ${LIBDIR}/sndfile)
-   set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
--  set(LIBSNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc)
-+  set(LIBSNDFILE_LIBRARIES sndfile)
-   set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib)  # TODO, deprecate
- endif()
+ # -------------------------------------------------------------------------
+@@ -112,10 +111,6 @@ if(WITH_CODEC_SNDFILE)
+   find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
+   find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
+   list(APPEND LIBSNDFILE_LIBRARIES
+-    ${_sndfile_FLAC_LIBRARY}
+-    ${_sndfile_OGG_LIBRARY}
+-    ${_sndfile_VORBIS_LIBRARY}
+-    ${_sndfile_VORBISENC_LIBRARY}
+   )
  
-@@ -97,7 +96,7 @@ if(WITH_PYTHON)
+   print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
+@@ -132,7 +127,7 @@ if(WITH_PYTHON)
      # normally cached but not since we include them with blender
      set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
      set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
@@ -27,40 +29,18 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
      set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
      # set(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
    else()
-@@ -162,10 +161,7 @@ if(WITH_CODEC_FFMPEG)
-   set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
-   set(FFMPEG_LIBRARIES
+@@ -173,9 +168,7 @@ endif()
+ if(WITH_CODEC_FFMPEG)
+   set(FFMPEG_FIND_COMPONENTS
      avcodec avdevice avformat avutil
--    mp3lame swscale x264 xvidcore
--    theora theoradec theoraenc
--    vorbis vorbisenc vorbisfile ogg opus
--    vpx swresample)
-+    swscale swresample)
-   set(FFMPEG_LIBPATH ${FFMPEG}/lib)
+-    mp3lame ogg opus swresample swscale
+-    theora theoradec theoraenc vorbis vorbisenc
+-    vorbisfile vpx x264 xvidcore)
++    swresample swscale)
+   find_package(FFmpeg)
  endif()
  
-@@ -206,14 +202,14 @@ if(WITH_OPENCOLLADA)
-   set(OPENCOLLADA ${LIBDIR}/opencollada)
- 
-   set(OPENCOLLADA_INCLUDE_DIRS
--    ${LIBDIR}/opencollada/include/COLLADAStreamWriter
--    ${LIBDIR}/opencollada/include/COLLADABaseUtils
--    ${LIBDIR}/opencollada/include/COLLADAFramework
--    ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader
--    ${LIBDIR}/opencollada/include/GeneratedSaxParser
-+    ${LIBDIR}/opencollada/include/opencollada/COLLADAStreamWriter
-+    ${LIBDIR}/opencollada/include/opencollada/COLLADABaseUtils
-+    ${LIBDIR}/opencollada/include/opencollada/COLLADAFramework
-+    ${LIBDIR}/opencollada/include/opencollada/COLLADASaxFrameworkLoader
-+    ${LIBDIR}/opencollada/include/opencollada/GeneratedSaxParser
-   )
- 
--  set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-+  set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada)
-   set(OPENCOLLADA_LIBRARIES
-     OpenCOLLADASaxFrameworkLoader
-     -lOpenCOLLADAFramework
-@@ -277,14 +273,13 @@ if(WITH_BOOST)
+@@ -266,7 +259,6 @@ if(WITH_BOOST)
  endif()
  
  if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
@@ -68,25 +48,8 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
  endif()
  
  if(WITH_OPENIMAGEIO)
-   set(OPENIMAGEIO ${LIBDIR}/openimageio)
-   set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
-   set(OPENIMAGEIO_LIBRARIES
--    ${OPENIMAGEIO}/lib/libOpenImageIO.a
-+    ${OPENIMAGEIO}/lib/libOpenImageIO.dylib
-     ${PNG_LIBRARIES}
-     ${JPEG_LIBRARIES}
-     ${TIFF_LIBRARY}
-@@ -307,7 +302,7 @@ endif()
- if(WITH_OPENCOLORIO)
-   set(OPENCOLORIO ${LIBDIR}/opencolorio)
-   set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
--  set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp)
-+  set(OPENCOLORIO_LIBRARIES OpenColorIO)
-   set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
- endif()
- 
-@@ -443,7 +438,7 @@ else()
-   set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
+@@ -439,7 +431,7 @@ else()
+   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
  endif()
  
 -if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 882139794c94..9796aef9b7cb 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -8,7 +8,7 @@
 , cudaSupport ? config.cudaSupport or false, cudatoolkit
 , colladaSupport ? true, opencollada
 , makeWrapper
-, pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL
+, pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL
 , embree, gmp
 }:
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
       openvdb
     ]
     else [
-      pugixml SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL
+      pugixml llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL
     ])
     ++ optional jackaudioSupport libjack2
     ++ optional cudaSupport cudatoolkit
@@ -61,7 +61,9 @@ stdenv.mkDerivation rec {
       : > build_files/cmake/platform/platform_apple_xcode.cmake
       substituteInPlace source/creator/CMakeLists.txt \
         --replace '${"$"}{LIBDIR}/python' \
-                  '${python}'
+                  '${python}' \
+        --replace '${"$"}{LIBDIR}/openmp' \
+                  '${llvmPackages.openmp}'
       substituteInPlace build_files/cmake/platform/platform_apple.cmake \
         --replace 'set(PYTHON_VERSION 3.7)' \
                   'set(PYTHON_VERSION ${python.pythonVersion})' \
@@ -72,15 +74,7 @@ stdenv.mkDerivation rec {
         --replace '${"$"}{LIBDIR}/opencollada' \
                   '${opencollada}' \
         --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \
-                  '${python3Packages.numpy}/${python.sitePackages}/numpy' \
-        --replace 'set(OPENJPEG_INCLUDE_DIRS ' \
-                  'set(OPENJPEG_INCLUDE_DIRS "'$(echo ${openjpeg.dev}/include/openjpeg-*)'") #' \
-        --replace 'set(OPENJPEG_LIBRARIES ' \
-                  'set(OPENJPEG_LIBRARIES "${openjpeg}/lib/libopenjp2.dylib") #' \
-        --replace 'set(OPENIMAGEIO ' \
-                  'set(OPENIMAGEIO "${openimageio2.out}") #' \
-        --replace 'set(OPENEXR_INCLUDE_DIRS ' \
-                  'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #'
+                  '${python3Packages.numpy}/${python.sitePackages}/numpy'
     '' else ''
       substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"'
     '');

From f81b87466bffe825defd52675dc6bf5ab288be08 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 19:52:06 +0000
Subject: [PATCH 3780/3942] seaweedfs: 2.10 -> 2.12

---
 pkgs/applications/networking/seaweedfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix
index 80e108b355f6..3fe3b6650755 100644
--- a/pkgs/applications/networking/seaweedfs/default.nix
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "seaweedfs";
-  version = "2.10";
+  version = "2.12";
 
   src = fetchFromGitHub {
     owner = "chrislusf";
     repo = "seaweedfs";
     rev = version;
-    sha256 = "0ymkkj7nf70rwlzfj6x78dx07mv32qvcb6dp8m92hc4s2ckdz3ly";
+    sha256 = "08jv8dbvdygcm6wzvncx89p8cn9mbjn4lj8rf5svq8lr7zk1rvpw";
   };
 
-  vendorSha256 = "1r7k0rzizs61r4gqqll7l2j7mdpi3w1ja6l4w6vxgzb45h2sjhi7";
+  vendorSha256 = "0g344dj325d35i0myrzhg5chspqnly40qp910ml6zrmp7iszc1mw";
 
   subPackages = [ "weed" ];
 

From 387e080c5985a5e3969a08190a1dde592424e249 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 20:02:44 +0000
Subject: [PATCH 3781/3942] sickgear: 0.23.0 -> 0.23.2

---
 pkgs/servers/sickbeard/sickgear.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
index c47980a577c5..1b75d5bfd7d1 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -4,13 +4,13 @@ let
   pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
 in stdenv.mkDerivation rec {
   pname = "sickgear";
-  version = "0.23.0";
+  version = "0.23.2";
 
   src = fetchFromGitHub {
     owner = "SickGear";
     repo = "SickGear";
     rev = "release_${version}";
-    sha256 = "1cn5335zpcqwra3widwnwqan2r1ardxc6ac7z5nn98r7kd3kll5v";
+    sha256 = "1nv8qcw6pvsma8hdnagl5c8lzz3b09g8nzz83amn9jdcn3ynn0qg";
   };
 
   dontBuild = true;

From b4b4919543e562eecd6171d2793cb0c6f92cd0ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 20:10:12 +0000
Subject: [PATCH 3782/3942] sigil: 1.4.0 -> 1.4.2

---
 pkgs/applications/editors/sigil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index a99659c7669e..fc87e98488b2 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -6,13 +6,13 @@
 
 mkDerivation rec {
   pname = "sigil";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     repo = "Sigil";
     owner = "Sigil-Ebook";
     rev = version;
-    sha256 = "1vywybnx2zy75mkx647fhq4xvh5k64b33w69hdjw2v7jz27h4sab";
+    sha256 = "1vn444ax5af1gbhkm9lz46jc7zi4grf16cb4wqyb6hvgj2gbl0iw";
   };
 
   pythonPath = with python3Packages; [ lxml ];

From fe79e0abed65402f0a7d49f6248b5548b5019ff4 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Thu, 26 Nov 2020 22:12:00 +0200
Subject: [PATCH 3783/3942] pijul: 1.0.0-alpha.5 -> 1.0.0-alpha.8

---
 pkgs/applications/version-management/pijul/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index fa7583a1e559..e90f47e51f31 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pijul";
-  version = "1.0.0-alpha.5";
+  version = "1.0.0-alpha.8";
 
   src = fetchCrate {
     inherit version pname;
-    sha256 = "150hm3kim8cszmycbr4rdpy2g3bfhghsya8hnnfkglzi8sprb5d8";
+    sha256 = "01wag3ckqsa7r6zc7cla428w8hr49n2ybp31s42dqmsbak3xbc14";
   };
 
-  cargoSha256 = "0398bwjc2ib32nhbg4gjzwq6zwxql7llq8igl51nyr229m917im6";
+  cargoSha256 = "1hh4xmkhbbbkag3v25vh6zpn0r4fmipxmkcr8ahgrxf71dvyxj8x";
 
   cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";
   LIBCLANG_PATH = "${libclang}/lib";

From ea84f9d409d0a2216b592591a14608d2148067dc Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 26 Nov 2020 20:15:05 +0000
Subject: [PATCH 3784/3942] littlegptracker: unstable-2019-04-14 ->
 unstable-2020-11-26, remove upstreamed patch (#105062)

---
 ...l-directory-to-the-current-directory.patch | 27 -------------------
 .../audio/littlegptracker/default.nix         |  9 +++----
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch

diff --git a/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch b/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch
deleted file mode 100644
index 3e1c822be2ae..000000000000
--- a/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c3865405ca707e3284a81709577d85ce2b3db72c Mon Sep 17 00:00:00 2001
-From: Francesco Gazzetta <fgaz@fgaz.me>
-Date: Wed, 19 Aug 2020 15:06:58 +0200
-Subject: [PATCH 2/2] Set the initial directory to the current directory
-
-otherwise the user has to navigate from the nix store, which makes the program
-crash due to its size
----
- sources/Adapters/DEB/System/DEBSystem.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sources/Adapters/DEB/System/DEBSystem.cpp b/sources/Adapters/DEB/System/DEBSystem.cpp
-index 6e86693..65d2cdd 100644
---- a/sources/Adapters/DEB/System/DEBSystem.cpp
-+++ b/sources/Adapters/DEB/System/DEBSystem.cpp
-@@ -54,7 +54,7 @@ void DEBSystem::Boot(int argc,char **argv) {
- 	}
- 	Path::SetAlias("bin",dirname(buff)) ;
- 
--	Path::SetAlias("root","bin:..") ;
-+	Path::SetAlias("root",".") ;
- 
- #ifdef _DEBUG
-   Trace::GetInstance()->SetLogger(*(new StdOutLogger()));
--- 
-2.25.4
-
diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix
index 91d709687949..9b1a1869c283 100644
--- a/pkgs/applications/audio/littlegptracker/default.nix
+++ b/pkgs/applications/audio/littlegptracker/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "littlegptracker";
-  version = "unstable-2019-04-14";
+  version = "unstable-2020-11-26";
 
   src = fetchFromGitHub {
     owner = "Mdashdotdashn";
     repo = "littlegptracker";
-    rev = "0ed729b46739e3df5e111c6fa4d548fde2d3b891";
-    sha256 = "1pc6lg2qp6xh7ahs5d5pb63ms4h2dz7ryp3c7mci4g37gbwbsj5b";
+    rev = "4aca8cd765e1ad586da62decd019e66cb64b45b8";
+    sha256 = "0f2ip8z5wxk8fvlw47mczsbcrzh4nh1hgw1fwf5gjrqnzm8v111x";
   };
 
   buildInputs = [
@@ -26,9 +26,6 @@ stdenv.mkDerivation rec {
     # Remove outdated (pre-64bit) checks that would fail on modern platforms
     # (see description in patch file)
     ./0001-Remove-coherency-checks.patch
-    # Set starting directory to cwd, default is in /nix/store and causes a crash
-    # (see description in patch file)
-    ./0002-Set-the-initial-directory-to-the-current-directory.patch
   ];
 
   preBuild = "cd projects";

From 8c08d2cc137ae69729b0c3392dfcf14136500e90 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 20:15:46 +0000
Subject: [PATCH 3785/3942] signal-cli: 0.6.11 -> 0.6.12

---
 .../networking/instant-messengers/signal-cli/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index 995c050d90ca..93ab78c439a6 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "signal-cli";
-  version = "0.6.11";
+  version = "0.6.12";
 
   # Building from source would be preferred, but is much more involved.
   src = fetchurl {
     url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
-    sha256 = "0gkaxhx87yn8gmkqjdn78m1axfnfkw07sw9qsn7821966fd5l5ax";
+    sha256 = "0i1y2p5qi2bwhkm8sv0wkb0lfi2vm26qalnpg6kn0ikcxkqkq5bc";
   };
 
   buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];

From a0da20e22d8f0e4c14166037c24bd2fa6a809074 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 20:21:51 +0000
Subject: [PATCH 3786/3942] simplenote: 2.0.0 -> 2.1.0

---
 pkgs/applications/misc/simplenote/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 455c08fb295c..9aaeca14a209 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -17,10 +17,10 @@ let
 
   pname = "simplenote";
 
-  version = "2.0.0";
+  version = "2.1.0";
 
   sha256 = {
-    x86_64-linux = "18alzsl1y9pvd5rs6gfnzv0py8ha0im33ylg7h6dicil5vii4l05";
+    x86_64-linux = "0lg48nq493anpnm20vw72y242nxa1g903bxzp4pngzxyi986jddz";
   }.${system} or throwSystem;
 
   meta = with stdenv.lib; {

From 1b0e3aa842215dd8d7006711836132eee17f6285 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 20:28:31 +0000
Subject: [PATCH 3787/3942] singularity: 3.6.4 -> 3.7.0

---
 pkgs/applications/virtualization/singularity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 8d04b871e49b..740647b6ae44 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -17,11 +17,11 @@ with lib;
 
 buildGoPackage rec {
   pname = "singularity";
-  version = "3.6.4";
+  version = "3.7.0";
 
   src = fetchurl {
     url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
-    sha256 = "17z7v7pjq1ibl64ir4h183sp58v2x7iv6dn6imnnhkdvss0kl8vi";
+    sha256 = "0y6lm23g6a2ljm78w8iyak7yivxvpj3i55fjbd56m9b2ykssm5pv";
   };
 
   goPackagePath = "github.com/sylabs/singularity";

From 05440fda6f0d922b9084b1f2a64cbc256e7e5ffb Mon Sep 17 00:00:00 2001
From: Frank Doepper <github@woffs.de>
Date: Thu, 26 Nov 2020 12:29:09 +0100
Subject: [PATCH 3788/3942] shotcut: use qt-5.15, rework

- use qt-5.15 for shotcut
- use qt mkDerivation for mlt/qt5
- use only mlt/qt5 for shotcut (libmlt -> mlt.dev)
- fix enabling ladspa (configure needs `which`), closes #47440
---
 pkgs/applications/video/shotcut/default.nix |  8 +--
 pkgs/development/libraries/mlt/qt-5.nix     | 63 +++++++++++++++++----
 pkgs/top-level/all-packages.nix             |  4 +-
 3 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 7db2d0df7381..b1db8cc57d2a 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -4,6 +4,7 @@
 , mkDerivation
 , SDL2
 , frei0r
+, ladspaPlugins
 , gettext
 , mlt
 , jack1
@@ -14,14 +15,12 @@
 , qtwebsockets
 , qtquickcontrols2
 , qtgraphicaleffects
-, libmlt
 , qmake
 , qttools
 , genericUpdater
 , common-updater-scripts
 }:
 
-assert stdenv.lib.versionAtLeast libmlt.version "6.22.1";
 assert stdenv.lib.versionAtLeast mlt.version "6.22.1";
 
 mkDerivation rec {
@@ -40,9 +39,9 @@ mkDerivation rec {
   buildInputs = [
     SDL2
     frei0r
+    ladspaPlugins
     gettext
     mlt
-    libmlt
     qtbase
     qtmultimedia
     qtx11extras
@@ -51,7 +50,7 @@ mkDerivation rec {
     qtgraphicaleffects
   ];
 
-  NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt";
+  NIX_CFLAGS_COMPILE = "-I${mlt.dev}/include/mlt++ -I${mlt.dev}/include/mlt";
   qmakeFlags = [
     "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease"
     "SHOTCUT_VERSION=${version}"
@@ -68,6 +67,7 @@ mkDerivation rec {
 
   qtWrapperArgs = [
     "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
+    "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"
     "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]}"
     "--prefix PATH : ${mlt}/bin"
   ];
diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix
index f1ed04aa9bca..7bcbff78767f 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@@ -1,11 +1,30 @@
-{ stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
-, libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg
-, fftw, vid-stab, opencv3, ladspa-sdk, genericUpdater, common-updater-scripts
+{ stdenv
+, fetchFromGitHub
+, SDL
+, ffmpeg
+, frei0r
+, libjack2
+, libdv
+, libsamplerate
+, libvorbis
+, libxml2
+, movit
+, pkgconfig
+, sox
+, qtbase
+, qtsvg
+, fftw
+, vid-stab
+, opencv3
+, ladspa-sdk
+, genericUpdater
+, common-updater-scripts
+, ladspaPlugins
+, mkDerivation
+, which
 }:
-
 let inherit (stdenv.lib) getDev; in
-
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "mlt";
   version = "6.22.1";
 
@@ -17,17 +36,36 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
-    makeWrapper movit pkgconfig qtbase qtsvg sox fftw vid-stab opencv3
+    SDL
+    ffmpeg
+    frei0r
+    libjack2
+    libdv
+    libsamplerate
+    libvorbis
+    libxml2
+    movit
+    pkgconfig
+    qtbase
+    qtsvg
+    sox
+    fftw
+    vid-stab
+    opencv3
     ladspa-sdk
+    ladspaPlugins
   ];
 
+  nativeBuildInputs = [ which ];
+
   outputs = [ "out" "dev" ];
 
   # Mostly taken from:
   # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
   configureFlags = [
-    "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3"
+    "--avformat-swscale"
+    "--enable-gpl"
+    "--enable-gpl3"
     "--enable-opengl"
   ];
 
@@ -39,9 +77,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = ''
-    wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
+  qtWrapperArgs = [
+    "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
+    "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"
+  ];
 
+  postInstall = ''
     # Remove an unnecessary reference to movit.dev.
     s=${movit.dev}/include
     t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55ebbab69b0b..1320b0c3d992 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22773,9 +22773,7 @@ in
 
   scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
 
-  shotcut = libsForQt514.callPackage ../applications/video/shotcut {
-    libmlt = mlt;
-  };
+  shotcut = libsForQt5.callPackage ../applications/video/shotcut { };
 
   shogun = callPackage ../applications/science/machine-learning/shogun {
     stdenv = gcc8Stdenv;

From d9d7a467eecb609148291d11fc15645dd57f8371 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 20:37:51 +0000
Subject: [PATCH 3789/3942] skaffold: 1.16.0 -> 1.17.0

---
 pkgs/development/tools/skaffold/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index e00bed451196..6fa3b1b6058c 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "skaffold";
-  version = "1.16.0";
+  version = "1.17.0";
 
   goPackagePath = "github.com/GoogleContainerTools/skaffold";
   subPackages = ["cmd/skaffold"];
@@ -19,7 +19,7 @@ buildGoPackage rec {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${version}";
-    sha256 = "18v1s1k05bq38aljazvpxvp543xchy9h4n531pis4w4jl47n387f";
+    sha256 = "0i86bymwfnqnvp6na6na5dmjzp3dp7l416irkllh3i5wgvppda7m";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 6b4daa616837029eff8c08eb54b783a88276d08d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 21:12:20 +0000
Subject: [PATCH 3790/3942] starboard-octant-plugin: 0.4.0 -> 0.6.0

---
 .../cluster/octant/plugins/starboard-octant-plugin.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix
index df3821744a4b..1c9f21afddfc 100644
--- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix
+++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "starboard-octant-plugin";
-  version = "0.4.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0rqlks2f7cwx14xynaq95dxlzh18rsdz1w8a2ia24lvfwf8b95rf";
+    sha256 = "1rgfk8l3yz7xwghr06vcgpi6zzjynxxvyg2r78fgp7wpw7bh3rmd";
   };
 
-  vendorSha256 = "1fxb97wf69phhqwqg86wcx4dkzh67snzl1xfmj4wvfq16b9xj11j";
+  vendorSha256 = "1f6x66zgrmm7x661d0d0qqharrpyb2bsi10swlgx68y5yz285296";
 
   meta = with lib; {
     description = "Octant plugin for viewing Starboard security information";

From cc1d963595cb7f5f9223820b661e723200606a38 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 21:36:49 +0000
Subject: [PATCH 3791/3942] svlint: 0.4.7 -> 0.4.8

---
 pkgs/development/tools/analysis/svlint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix
index adf17dabecee..51b363c6be33 100644
--- a/pkgs/development/tools/analysis/svlint/default.nix
+++ b/pkgs/development/tools/analysis/svlint/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "svlint";
-  version = "0.4.7";
+  version = "0.4.8";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = "svlint";
     rev = "v${version}";
-    sha256 = "0gn68achvhyxljvhw5rwraxjcgdwrl1bwbsn596ka15nrk4lwb34";
+    sha256 = "1anbanvaikj8g5jcmjd165krzvjdwj1cl8f3vm1nmy997x8vxihf";
   };
 
-  cargoSha256 = "0v94zsh4jhzjnqbkgwn8rjbs72i5cw2nmkwn7xhdbbwxh17a88x4";
+  cargoSha256 = "18xnqsrnf2gc9zny8ayzf1bah8mq1fy5k807cz039gqz36cvnma0";
 
   meta = with lib; {
     description = "SystemVerilog linter";

From 07dfadc89c47b6de05f8cd8d9a659b47f635f571 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 21:47:38 +0000
Subject: [PATCH 3792/3942] symengine: 0.5.0 -> 0.6.0

---
 pkgs/development/libraries/symengine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix
index 6ab463bea1dc..cc3abd80d6f6 100644
--- a/pkgs/development/libraries/symengine/default.nix
+++ b/pkgs/development/libraries/symengine/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "symengine";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "symengine";
     repo = "symengine";
     rev = "v${version}";
-    sha256 = "1zgfhqv43qcfkfdyf1p82bcfv05n6iix6yw6qx1y5bnb7dv74irw";
+    sha256 = "129iv9maabmb42ylfdv0l0g94mcbf3y4q3np175008rcqdr8z6h1";
   };
 
   nativeBuildInputs = [ cmake ];

From ec59d372233388524acd8927e68bf019cc11cf90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 26 Nov 2020 22:48:15 +0100
Subject: [PATCH 3793/3942] gollum: update dependencies

---
 pkgs/applications/misc/gollum/Gemfile.lock | 28 ++++++-------
 pkgs/applications/misc/gollum/gemset.nix   | 48 +++++++++-------------
 2 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index 91096ddc9173..7b1b20a1b78f 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -1,14 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.18.1)
     concurrent-ruby (1.1.7)
     crass (1.0.6)
     execjs (2.7.0)
     ffi (1.13.1)
     gemojione (4.3.3)
       json
-    github-markup (3.0.4)
+    github-markup (3.0.5)
     gollum (5.1.1)
       gemojione (~> 4.1)
       gollum-lib (~> 5.0)
@@ -25,7 +24,7 @@ GEM
       therubyrhino (~> 2.1.0)
       uglifier (~> 3.2)
       useragent (~> 0.16.2)
-    gollum-lib (5.0.5)
+    gollum-lib (5.0.6)
       gemojione (~> 4.1)
       github-markup (~> 3.0)
       gollum-rugged_adapter (~> 1.0)
@@ -42,12 +41,12 @@ GEM
       rexml
     kramdown-parser-gfm (1.0.1)
       kramdown (~> 2.0)
-    loofah (2.6.0)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mime-types-data (3.2020.1104)
     mini_portile2 (2.4.0)
     multi_json (1.15.0)
     mustache (0.99.8)
@@ -58,13 +57,13 @@ GEM
     octicons (8.5.0)
       nokogiri (>= 1.6.3.1)
     rack (2.2.3)
-    rack-protection (2.0.8.1)
+    rack-protection (2.1.0)
       rack
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.4)
-    rouge (3.22.0)
+    rouge (3.25.0)
     rss (0.2.9)
       rexml
     ruby2_keywords (0.0.2)
@@ -74,22 +73,21 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sinatra (2.0.8.1)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    sinatra-contrib (2.0.8.1)
-      backports (>= 2.8.2)
+    sinatra-contrib (2.1.0)
       multi_json
       mustermann (~> 1.0)
-      rack-protection (= 2.0.8.1)
-      sinatra (= 2.0.8.1)
+      rack-protection (= 2.1.0)
+      sinatra (= 2.1.0)
       tilt (~> 2.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-helpers (1.3.0)
+    sprockets-helpers (1.4.0)
       sprockets (>= 2.2)
     therubyrhino (2.1.2)
       therubyrhino_jar (>= 1.7.4, < 1.7.9)
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index 45bf0e04d07f..7d7c0ef3d5f0 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -1,14 +1,4 @@
 {
-  backports = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qagwshq7zyjgm6k53hbrf4gfrwn6qz5d6rrc83cl59q37v68zsc";
-      type = "gem";
-    };
-    version = "3.18.1";
-  };
   concurrent-ruby = {
     groups = ["default"];
     platforms = [];
@@ -65,10 +55,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14991x92v8s60hfqv7162jfmdqa20fifn2bz0km3k5cgi01pf9rs";
+      sha256 = "0rlq9hnvhhndqskl087xwabbvfbfnrvx8ac79iin35wmzpyagl96";
       type = "gem";
     };
-    version = "3.0.4";
+    version = "3.0.5";
   };
   gollum = {
     dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent"];
@@ -87,10 +77,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18f3g5px9zznyh6ppqlnjdp1ia8awgrix9lhbfh64rpgxg0b9xlr";
+      sha256 = "02mc1w4hn9kjrgvg0r46x1bd0h8hq7lqs432dgjfn2dw36kchja4";
       type = "gem";
     };
-    version = "5.0.5";
+    version = "5.0.6";
   };
   gollum-rugged_adapter = {
     dependencies = ["mime-types" "rugged"];
@@ -141,10 +131,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1s9hq8bpn6g5vqr3nzyirn3agn7x8agan6151zvq5vmkf6rvmyb2";
+      sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
       type = "gem";
     };
-    version = "2.6.0";
+    version = "2.8.0";
   };
   mime-types = {
     dependencies = ["mime-types-data"];
@@ -162,10 +152,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
+      sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
       type = "gem";
     };
-    version = "3.2020.0512";
+    version = "3.2020.1104";
   };
   mini_portile2 = {
     groups = ["default"];
@@ -246,10 +236,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zyj97bfr1shfgwk4ddmdbw0mdkm4qdyh9s1hl0k7accf3kxx1yi";
+      sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz";
       type = "gem";
     };
-    version = "2.0.8.1";
+    version = "2.1.0";
   };
   rb-fsevent = {
     groups = ["default"];
@@ -287,10 +277,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m";
+      sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn";
       type = "gem";
     };
-    version = "3.22.0";
+    version = "3.25.0";
   };
   rss = {
     dependencies = ["rexml"];
@@ -351,21 +341,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0riy3hwjab1mr73jcqx3brmbmwspnw3d193j06a5f0fy1w35z15q";
+      sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk";
       type = "gem";
     };
-    version = "2.0.8.1";
+    version = "2.1.0";
   };
   sinatra-contrib = {
-    dependencies = ["backports" "multi_json" "mustermann" "rack-protection" "sinatra" "tilt"];
+    dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mmrfm4pqh98f3irjpkvfpazhcx6q42bnx6bbms9dqvmck3mid28";
+      sha256 = "1rl1iiafz51yzjd0vchl2lni7lmwppjql6cn1fnfxbma707qlcja";
       type = "gem";
     };
-    version = "2.0.8.1";
+    version = "2.1.0";
   };
   sprockets = {
     dependencies = ["concurrent-ruby" "rack"];
@@ -384,10 +374,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14iq8v16l31bfq7pikfmgcv5x6pkc5lbdmwwg6zlzcy1bibcliar";
+      sha256 = "0513ma356g05lsskhsb363263177h6ccmp475il0p69y18his2ij";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.0";
   };
   therubyrhino = {
     dependencies = ["therubyrhino_jar"];

From 34730e0640710636b15338f20836165f29b3df86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 26 Nov 2020 23:20:50 +0100
Subject: [PATCH 3794/3942] pythonPackages.symengine: 0.4.0 -> 0.6.1, mark
 unbroken

---
 pkgs/development/python-modules/symengine/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix
index 9b1117a94a17..f225dd431e58 100644
--- a/pkgs/development/python-modules/symengine/default.nix
+++ b/pkgs/development/python-modules/symengine/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "symengine";
-  version = "0.4.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "symengine";
     repo = "symengine.py";
     rev = "v${version}";
-    sha256 = "07i9rwxphi4zgwc7y6f6qvq73iym2cx4k1bpd7rmd3wkpgrrfxqx";
+    sha256 = "13fy25qxn4xwzlr2w35v6jhlpd70lv9r6srv4dizc4brj63hnw50";
   };
 
   postConfigure = ''
@@ -28,7 +28,9 @@ buildPythonPackage rec {
       --replace "SET(CYTHON_BIN cython" "SET(CYTHON_BIN ${cython}/bin/cython"
   '';
 
-  buildInputs = [ cython cmake ];
+  nativeBuildUnputs = [ cmake ];
+
+  buildInputs = [ cython ];
 
   checkInputs = [ pytest sympy ];
 
@@ -48,6 +50,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/symengine/symengine.py";
     license = licenses.mit;
     maintainers = [ maintainers.costrouc ];
-    broken = true;
   };
 }

From 1af8465c4274540c3bafea7bc9dd0e814f08bc50 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 26 Nov 2020 19:15:27 +0100
Subject: [PATCH 3795/3942] python3Packages.zigpy-zigate: 0.7.2 -> 0.7.3

---
 pkgs/development/python-modules/zigpy-zigate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index 81512f755d63..018017c89a4c 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy-zigate";
-  version = "0.7.2";
+  version = "0.7.3";
   # https://github.com/Martiusweb/asynctest/issues/152
   # broken by upstream python bug with asynctest and
   # is used exclusively by home-assistant with python 3.8
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-zigate";
-    rev = "v${version}";
-    sha256 = "0ycrsmp3n3awiyj0gbq6xnaa2s9mpc5l7mlmfc00rfnx7rr2z4ha";
+    rev = version;
+    sha256 = "068v8n8yimmpnwqcdz5m9g35z1x0dir478cbc1s1nyhw1xn50vg1";
   };
 
   propagatedBuildInputs = [

From 1927e40d50528ce3f7a0ebb1138e9b99b7060085 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 26 Nov 2020 19:21:12 +0100
Subject: [PATCH 3796/3942] homeassistant: 0.118.3 -> 0.118.4

---
 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 856354562564..f813af5ff6e3 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.118.3";
+  version = "0.118.4";
   components = {
     "abode" = ps: with ps; [ abodepy ];
     "accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 132f9b13c60c..565a353cdca1 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -62,7 +62,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.118.3";
+  hassVersion = "0.118.4";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -78,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    sha256 = "1b58r3gn838naqcrvmzhqcnf2sdjfjwfapnn8v8cnc51pz58vazq";
+    sha256 = "0b289ijxpay6yb2ahkfm7n9k423f8xlbwg8z903iwakiqg54ghip";
   };
 
   # leave this in, so users don't have to constantly update their downstream patch handling

From 02885ae8e207c5c4c1d2f3e7ac02f7e72c99d13e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 21:34:38 +0000
Subject: [PATCH 3797/3942] minishift: 1.34.2 -> 1.34.3

---
 pkgs/applications/networking/cluster/minishift/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix
index cd11bcbb431c..f9391373b188 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@@ -4,10 +4,10 @@
 }:
 
 let
-  version = "1.34.2";
+  version = "1.34.3";
 
   # Update these on version bumps according to Makefile
-  centOsIsoVersion = "v1.15.0";
+  centOsIsoVersion = "v1.17.0";
   openshiftVersion = "v3.11.0";
 
 in buildGoPackage rec {
@@ -18,7 +18,7 @@ in buildGoPackage rec {
     owner = "minishift";
     repo = "minishift";
     rev = "v${version}";
-    sha256 = "1xzjzmjs2ijg7zzw53v02lgrg1j82jd7ljcn6lprg01hhvfrwgg7";
+    sha256 = "0yhln3kyc0098hbnjyxhbd915g6j7s692c0z8yrhh9gdpc5cr2aa";
   };
 
   nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];

From 6487eb735c3a46cfc9d2f126f5bfad3923168b2e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 22:55:58 +0000
Subject: [PATCH 3798/3942] tiny: 0.5.1 -> 0.7.0

---
 pkgs/applications/networking/irc/tiny/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix
index 980221afb61f..c51d93378c52 100644
--- a/pkgs/applications/networking/irc/tiny/default.nix
+++ b/pkgs/applications/networking/irc/tiny/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tiny";
-  version = "0.5.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "osa1";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1m57xsrc7lzkrm8k1wh3yx3in5bhd0qjzygxdwr8lvigpsiy5caa";
+    sha256 = "11kjndd4rzj83hzhcqvvp9nxjkana63m0h5r51xwp1ww9sn63km9";
   };
 
-  cargoSha256 = "1s93zxk85wa7zw8745ba1sgipal75w1y18nc9vca6sig4pzvvj41";
+  cargoSha256 = "079ns78acsff2qb59s7q0ck3j2fygcfqy8is6vfa71jyq7a0rjqm";
 
   RUSTC_BOOTSTRAP = 1;
 

From 80c78cc2e4f3e5441aca64184c64e4083bde0df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 23 Oct 2020 01:51:17 +0200
Subject: [PATCH 3799/3942] surf: 2.0 -> unstable-2019-02-08

---
 .../networking/browsers/surf/default.nix      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index 03571469da1f..57eb4fad76b0 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -1,21 +1,22 @@
-{ lib, stdenv, fetchurl
+{ lib, stdenv, fetchgit
 , pkgconfig, wrapGAppsHook
-, glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk
+, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk
 , xorg, dmenu, findutils, gnused, coreutils
 , patches ? null
 }:
 
 stdenv.mkDerivation rec {
   pname = "surf";
-  version = "2.0";
+  version = "unstable-2019-02-08";
 
-  src = fetchurl {
-    url = "https://dl.suckless.org/surf/surf-${version}.tar.gz";
-    sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps";
+  src = fetchgit {
+    url = "git://git.suckless.org/surf";
+    rev = "d068a3878b6b9f2841a49cd7948cdf9d62b55585";
+    sha256 = "0pjsv2q8c74sdmqsalym8wa2lv55lj4pd36miam5wd12769xw68m";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-  buildInputs = [ glib glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ];
+  buildInputs = [ glib gcr glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ];
 
   inherit patches;
 
@@ -32,9 +33,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A simple web browser based on WebKit/GTK";
+    description = "A simple web browser based on WebKitGTK";
     longDescription = ''
-      Surf is a simple web browser based on WebKit/GTK. It is able to display
+      surf is a simple web browser based on WebKitGTK. It is able to display
       websites and follow links. It supports the XEmbed protocol which makes it
       possible to embed it in another application. Furthermore, one can point
       surf to another URI by setting its XProperties.

From 31025b04d82a5ca4f42391c968bcede0615172cc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Oct 2020 22:23:58 +0000
Subject: [PATCH 3800/3942] mopidy-musicbox-webclient: 2.4.0 -> 3.1.0

---
 pkgs/applications/audio/mopidy/musicbox-webclient.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
index d628e5894a28..b10accedc6f8 100644
--- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix
+++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy-musicbox-webclient";
-  version = "2.4.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "pimusicbox";
     repo = "mopidy-musicbox-webclient";
     rev = "v${version}";
-    sha256 = "0784s32pap9rbki3f0f7swaf6946sdv4xzidns13jmw9ilifk5z4";
+    sha256 = "1lzarazq67gciyn6r8cdms0f7j0ayyfwhpf28z93ydb280mfrrb9";
   };
 
   propagatedBuildInputs = [ mopidy ];
@@ -18,6 +18,7 @@ pythonPackages.buildPythonApplication rec {
   meta = with stdenv.lib; {
     description = "Mopidy extension for playing music from SoundCloud";
     license = licenses.mit;
+    broken = stdenv.isDarwin;
     maintainers = [ maintainers.spwhitt ];
   };
 }

From 424b715c8af4c3d0d7abbfc0ae4092012f5aad4d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 24 Oct 2020 14:10:19 +0000
Subject: [PATCH 3801/3942] pantheon.elementary-calendar: 5.1.0 -> 5.1.1

---
 pkgs/desktops/pantheon/apps/elementary-calendar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index e8f0e37620e5..66bba6dfe793 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-calendar";
-  version = "5.1.0";
+  version = "5.1.1";
 
   repoName = "calendar";
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "sha256-b72BmChl/Ql0ljLRcPMNbJcOV4cVqz5D2j+5BGUi4Go=";
+    sha256 = "18npf4zzf2dywr1zkr6fqzcbb70297yvdp5wxw7zyam1xwa86v07";
   };
 
   passthru = {

From ae5764621df9499a28db96499b9dc8ddbda7f57c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 27 Nov 2020 01:16:24 +0100
Subject: [PATCH 3802/3942] make-desktopitem: desktop-file-utils is a
 nativeBuildInput

This fixes cross-compilation of a NixOS with the manual enabled.
---
 .../make-desktopitem/default.nix              | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix
index 8e51dc1b8480..329286bd3628 100644
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@@ -12,16 +12,16 @@
 , mimeType ? null
 , categories ? null
 , startupNotify ? null
-, extraDesktopEntries ? {} # Extra key-value pairs to add to the [Desktop Entry] section. This may override other values
+, extraDesktopEntries ? { } # Extra key-value pairs to add to the [Desktop Entry] section. This may override other values
 , extraEntries ? "" # Extra configuration. Will be appended to the end of the file and may thus contain extra sections
 , fileValidation ? true # whether to validate resulting desktop file.
 }:
-
 let
   # like builtins.toString, but null -> null instead of null -> ""
-  nullableToString = value: if value == null then null
-        else if builtins.isBool value then lib.boolToString value
-        else builtins.toString value;
+  nullableToString = value:
+    if value == null then null
+    else if builtins.isBool value then lib.boolToString value
+    else builtins.toString value;
 
   # The [Desktop entry] section of the desktop file, as attribute set.
   mainSection = {
@@ -39,16 +39,19 @@ let
 
   # Map all entries to a list of lines
   desktopFileStrings =
-    ["[Desktop Entry]"]
+    [ "[Desktop Entry]" ]
     ++ builtins.filter
       (v: v != null)
       (lib.mapAttrsToList
         (name: value: if value != null then "${name}=${value}" else null)
         mainSection
       )
-    ++ (if extraEntries == "" then [] else ["${extraEntries}"]);
+    ++ (if extraEntries == "" then [ ] else [ "${extraEntries}" ]);
 in
-runCommandLocal "${name}.desktop" {}
+runCommandLocal "${name}.desktop"
+{
+  nativeBuildInputs = [ desktop-file-utils ];
+}
   (''
     mkdir -p "$out/share/applications"
     cat > "$out/share/applications/${name}.desktop" <<EOF
@@ -56,5 +59,5 @@ runCommandLocal "${name}.desktop" {}
     EOF
   '' + lib.optionalString fileValidation ''
     echo "Running desktop-file validation"
-    ${desktop-file-utils}/bin/desktop-file-validate "$out/share/applications/${name}.desktop"
+    desktop-file-validate "$out/share/applications/${name}.desktop"
   '')

From a6b3bb24e4baf7312b343d361f3c07229ed1ded2 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Fri, 23 Oct 2020 15:05:17 +0200
Subject: [PATCH 3803/3942] treewide: ran
 ./maintainers/scripts/update_redirected_urls.sh

---
 pkgs/applications/misc/projectlibre/default.nix       | 2 +-
 pkgs/applications/radio/noaa-apt/default.nix          | 2 +-
 pkgs/applications/science/logic/z3/4.4.0.nix          | 2 +-
 pkgs/development/node-packages/node-packages.nix      | 2 +-
 pkgs/development/python-modules/larch/default.nix     | 2 +-
 pkgs/development/python-modules/pure-eval/default.nix | 2 +-
 pkgs/development/tools/rust/cargo-embed/default.nix   | 2 +-
 pkgs/development/tools/rust/cargo-flash/default.nix   | 2 +-
 pkgs/servers/irc/ircd-hybrid/default.nix              | 2 +-
 pkgs/servers/smcroute/default.nix                     | 2 +-
 pkgs/top-level/perl-packages.nix                      | 8 ++++----
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix
index 344c3d7168ac..2a7a82bc74a4 100644
--- a/pkgs/applications/misc/projectlibre/default.nix
+++ b/pkgs/applications/misc/projectlibre/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://www.projectlibre.com/";
+    homepage = "https://www.projectlibre.com/";
     description = "Project-Management Software similar to MS-Project";
     maintainers = [ maintainers.Mogria ];
     license = licenses.cpal10;
diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/applications/radio/noaa-apt/default.nix
index a81f2ea8f7d9..01dc7b5c30db 100644
--- a/pkgs/applications/radio/noaa-apt/default.nix
+++ b/pkgs/applications/radio/noaa-apt/default.nix
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "NOAA APT image decoder";
-    homepage = "http://noaa-apt.mbernardi.com.ar/";
+    homepage = "https://noaa-apt.mbernardi.com.ar/";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ trepetti ];
     platforms = platforms.all;
diff --git a/pkgs/applications/science/logic/z3/4.4.0.nix b/pkgs/applications/science/logic/z3/4.4.0.nix
index 1e3bcea42ef7..a5388572db61 100644
--- a/pkgs/applications/science/logic/z3/4.4.0.nix
+++ b/pkgs/applications/science/logic/z3/4.4.0.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A high-performance theorem prover and SMT solver";
-    homepage    = "http://github.com/Z3Prover/z3";
+    homepage    = "https://github.com/Z3Prover/z3";
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.x86_64;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ];
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 064d06d0ac28..bbec98b42cc3 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -91339,7 +91339,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Production process manager for Node.JS applications with a built-in load balancer.";
-      homepage = http://pm2.keymetrics.io/;
+      homepage = "https://pm2.keymetrics.io/";
       license = "AGPL-3.0";
     };
     production = true;
diff --git a/pkgs/development/python-modules/larch/default.nix b/pkgs/development/python-modules/larch/default.nix
index a94b076ded3d..3be8b2404192 100644
--- a/pkgs/development/python-modules/larch/default.nix
+++ b/pkgs/development/python-modules/larch/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = "http://liw.fi/larch/";
+    homepage = "https://liw.fi/larch/";
     description = "Python B-tree library";
     license = licenses.gpl3;
     maintainers = [];
diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix
index 2807611f4933..6e504951cdbe 100644
--- a/pkgs/development/python-modules/pure-eval/default.nix
+++ b/pkgs/development/python-modules/pure-eval/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Safely evaluate AST nodes without side effects";
-    homepage = "http://github.com/alexmojaki/pure_eval";
+    homepage = "https://github.com/alexmojaki/pure_eval";
     license = licenses.mit;
     maintainers = with maintainers; [ gebner ];
   };
diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix
index a9c18b021bf5..e4c5d8ab48c7 100644
--- a/pkgs/development/tools/rust/cargo-embed/default.nix
+++ b/pkgs/development/tools/rust/cargo-embed/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "A cargo extension for working with microcontrollers";
-    homepage = "http://probe.rs/";
+    homepage = "https://probe.rs/";
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ fooker ];
   };
diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix
index e5d23c9258cd..dbd79f179aa3 100644
--- a/pkgs/development/tools/rust/cargo-flash/default.nix
+++ b/pkgs/development/tools/rust/cargo-flash/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "A cargo extension for working with microcontrollers";
-    homepage = "http://probe.rs/";
+    homepage = "https://probe.rs/";
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ fooker ];
   };
diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index 8b65c7870f93..5499d2bb8cb8 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An IPv6-capable IRC server";
     platforms = stdenv.lib.platforms.unix;
-    homepage = "http://www.ircd-hybrid.org/";
+    homepage = "https://www.ircd-hybrid.org/";
   };
 }
diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
index e725e6243f00..b881c6007309 100644
--- a/pkgs/servers/smcroute/default.nix
+++ b/pkgs/servers/smcroute/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Static multicast routing daemon";
-    homepage = "http://troglobit.com/smcroute.html";
+    homepage = "https://troglobit.com/smcroute.html";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ fpletz ];
     platforms = with platforms; (linux ++ freebsd ++ netbsd ++ openbsd);
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8c869d43b39a..21df060b96d0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -861,7 +861,7 @@ let
       sha256 = "530d59ef0c0935f9862d187187a2d7583b12c639bb67db14f983322b161892d9";
     };
     meta = {
-      homepage = "http://github.com/timj/perl-Astro-FITS-Header/tree/master";
+      homepage = "https://github.com/timj/perl-Astro-FITS-Header/tree/master";
       description = "Object-oriented interface to FITS HDUs";
       license = stdenv.lib.licenses.free;
     };
@@ -1314,7 +1314,7 @@ let
     buildInputs = [ FileSlurp ];
     propagatedBuildInputs = [ ClassLoad DirSelf FileShareDir ModulePluggable MooseXGetopt namespaceclean  ];
     meta = {
-      homepage = "http://metacpan.org/release/Bot-Training";
+      homepage = "https://metacpan.org/release/Bot-Training";
       description = "Plain text training material for bots like Hailo and AI::MegaHAL";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -1330,7 +1330,7 @@ let
     buildInputs = [ FileShareDirInstall ];
     propagatedBuildInputs = [ BotTraining ];
     meta = {
-      homepage = "http://metacpan.org/release/Bot-Training-MegaHAL";
+      homepage = "https://metacpan.org/release/Bot-Training-MegaHAL";
       description = "Provide megahal.trn via Bot::Training";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -1346,7 +1346,7 @@ let
     buildInputs = [ FileShareDirInstall ];
     propagatedBuildInputs = [ BotTraining ];
     meta = {
-      homepage = "http://metacpan.org/release/Bot-Training-StarCraft";
+      homepage = "https://metacpan.org/release/Bot-Training-StarCraft";
       description = "Provide starcraft.trn via Bot::Training";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };

From 60c54866ede05a162cff0df0802aa8ac4dccf708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 27 Nov 2020 01:29:13 +0100
Subject: [PATCH 3804/3942] treewide: run
 ./maintainers/scripts/update_redirected_urls.sh

---
 pkgs/applications/audio/faust/faust1.nix                    | 2 +-
 pkgs/applications/audio/faust/faust2.nix                    | 2 +-
 pkgs/applications/audio/faust/faustlive.nix                 | 2 +-
 pkgs/development/compilers/wla-dx/default.nix               | 2 +-
 pkgs/development/python-modules/cliapp/default.nix          | 2 +-
 pkgs/development/python-modules/cmdtest/default.nix         | 2 +-
 pkgs/development/python-modules/pinboard/default.nix        | 2 +-
 pkgs/development/python-modules/pure-pcapy3/default.nix     | 2 +-
 pkgs/development/python-modules/tag-expressions/default.nix | 2 +-
 pkgs/development/python-modules/tracing/default.nix         | 2 +-
 pkgs/development/python-modules/ttystatus/default.nix       | 2 +-
 pkgs/development/python-modules/zigpy-xbee/default.nix      | 2 +-
 pkgs/development/python-modules/zope_interface/default.nix  | 2 +-
 pkgs/development/tools/ocaml/ocamlify/default.nix           | 2 +-
 pkgs/development/tools/ocaml/ocamlmod/default.nix           | 2 +-
 pkgs/tools/misc/staruml/default.nix                         | 2 +-
 pkgs/tools/networking/inadyn/default.nix                    | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index 64b8e7244311..16956433655c 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -17,7 +17,7 @@ let
   };
 
   meta = with stdenv.lib; {
-    homepage = "http://faust.grame.fr/";
+    homepage = "https://faust.grame.fr/";
     downloadPage = "https://sourceforge.net/projects/faudiostream/files/";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 515f8a6f9af2..1c096374a42b 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -31,7 +31,7 @@ let
   };
 
   meta = with stdenv.lib; {
-    homepage = "http://faust.grame.fr/";
+    homepage = "https://faust.grame.fr/";
     downloadPage = "https://github.com/grame-cncm/faust/";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix
index 03ca4ce8eb0c..00682b13bef0 100644
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       together the convenience of a standalone interpreted language with the
       efficiency of a compiled language. It's ideal for fast prototyping.
     '';
-    homepage = "http://faust.grame.fr/";
+    homepage = "https://faust.grame.fr/";
     license = licenses.gpl3;
   };
 }
diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix
index 2d3a527fa142..0cebbfa520f0 100644
--- a/pkgs/development/compilers/wla-dx/default.nix
+++ b/pkgs/development/compilers/wla-dx/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.villehelin.com/wla.html";
+    homepage = "https://www.villehelin.com/wla.html";
     description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package";
     license = licenses.gpl2;
     maintainers = with maintainers; [ matthewbauer ];
diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix
index 233028235b19..497306c293a4 100644
--- a/pkgs/development/python-modules/cliapp/default.nix
+++ b/pkgs/development/python-modules/cliapp/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = "http://liw.fi/cliapp/";
+    homepage = "https://liw.fi/cliapp/";
     description = "Python framework for Unix command line programs";
     license = licenses.gpl2;
     maintainers = [];
diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix
index ca2402cff6cd..5c53cafdb4e1 100644
--- a/pkgs/development/python-modules/cmdtest/default.nix
+++ b/pkgs/development/python-modules/cmdtest/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = "http://liw.fi/cmdtest/";
+    homepage = "https://liw.fi/cmdtest/";
     description = "Black box tests Unix command line tools";
     license = licenses.gpl3;
   };
diff --git a/pkgs/development/python-modules/pinboard/default.nix b/pkgs/development/python-modules/pinboard/default.nix
index af144e0a8669..8f177dab8bc3 100644
--- a/pkgs/development/python-modules/pinboard/default.nix
+++ b/pkgs/development/python-modules/pinboard/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
     description = "A Python wrapper for Pinboard.in";
     maintainers = with maintainers; [ djanatyn ];
     license = licenses.asl20;
-    homepage = "http://github.com/lionheart/pinboard.py";
+    homepage = "https://github.com/lionheart/pinboard.py";
   };
 }
diff --git a/pkgs/development/python-modules/pure-pcapy3/default.nix b/pkgs/development/python-modules/pure-pcapy3/default.nix
index 71673da7abe0..43d6244ebf0c 100644
--- a/pkgs/development/python-modules/pure-pcapy3/default.nix
+++ b/pkgs/development/python-modules/pure-pcapy3/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement.";
-    homepage = "http://bitbucket.org/viraptor/pure-pcapy";
+    homepage = "https://bitbucket.org/viraptor/pure-pcapy";
     license = licenses.bsd2;
     maintainers = with maintainers; [ etu ];
   };
diff --git a/pkgs/development/python-modules/tag-expressions/default.nix b/pkgs/development/python-modules/tag-expressions/default.nix
index 7082ca54154b..137759f5a54b 100644
--- a/pkgs/development/python-modules/tag-expressions/default.nix
+++ b/pkgs/development/python-modules/tag-expressions/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Package to parse logical tag expressions";
-    homepage = "http://github.com/timofurrer/tag-expressions";
+    homepage = "https://github.com/timofurrer/tag-expressions";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ kalbasit ];
   };
diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix
index 2d91ae6a1378..6f9091d8517f 100644
--- a/pkgs/development/python-modules/tracing/default.nix
+++ b/pkgs/development/python-modules/tracing/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = "http://liw.fi/tracing/";
+    homepage = "https://liw.fi/tracing/";
     description = "Python debug logging helper";
     license = licenses.gpl3;
     maintainers = [];
diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/pkgs/development/python-modules/ttystatus/default.nix
index 8cf8c426b3b9..a76a5f8df383 100644
--- a/pkgs/development/python-modules/ttystatus/default.nix
+++ b/pkgs/development/python-modules/ttystatus/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = "http://liw.fi/ttystatus/";
+    homepage = "https://liw.fi/ttystatus/";
     description = "Progress and status updates on terminals for Python";
     license = licenses.gpl3;
     maintainers = [];
diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix
index 697ae5bb92d3..1279bb804de6 100644
--- a/pkgs/development/python-modules/zigpy-xbee/default.nix
+++ b/pkgs/development/python-modules/zigpy-xbee/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A library which communicates with XBee radios for zigpy";
-    homepage = "http://github.com/zigpy/zigpy-xbee";
+    homepage = "https://github.com/zigpy/zigpy-xbee";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ etu mvnetbiz ];
     platforms = platforms.linux;
diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix
index acef337e782e..1d86d6a8f14e 100644
--- a/pkgs/development/python-modules/zope_interface/default.nix
+++ b/pkgs/development/python-modules/zope_interface/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Zope.Interface";
-    homepage = "http://zope.org/Products/ZopeInterface";
+    homepage = "https://zope.org/Products/ZopeInterface";
     license = licenses.zpl20;
     maintainers = [ maintainers.goibhniu ];
   };
diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix
index 42faa33fbe1c..9b06a55f07d0 100644
--- a/pkgs/development/tools/ocaml/ocamlify/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlify/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   dontStrip = true;
 
   meta = {
-    homepage = "http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod";
+    homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod";
     description = "Generate OCaml modules from source files";
     platforms = ocaml.meta.platforms or [];
     license = stdenv.lib.licenses.lgpl21;
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index 46a87dc3ffed..49342d7b8485 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   dontStrip = true;
 
   meta = {
-    homepage = "http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod";
+    homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod";
     description = "Generate OCaml modules from source files";
     platforms = ocaml.meta.platforms or [];
     maintainers = with stdenv.lib.maintainers; [
diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index 90c3c696526d..d0266cf30e28 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A sophisticated software modeler";
-    homepage = "http://staruml.io/";
+    homepage = "https://staruml.io/";
     license = licenses.unfree;
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 2a551c56768c..f01bffa76da5 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://troglobit.com/project/inadyn/";
+    homepage = "https://troglobit.com/project/inadyn/";
     description = "Free dynamic DNS client";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ ];

From 67c2129b75c5cfc7e4444da928129574025e62e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 27 Nov 2020 01:33:01 +0100
Subject: [PATCH 3805/3942] maintainers/scripts: remove sed script file,
 normalize name

---
 .../{update_redirected_urls.sh => update-redirected-urls.sh}     | 1 +
 1 file changed, 1 insertion(+)
 rename maintainers/scripts/{update_redirected_urls.sh => update-redirected-urls.sh} (97%)

diff --git a/maintainers/scripts/update_redirected_urls.sh b/maintainers/scripts/update-redirected-urls.sh
similarity index 97%
rename from maintainers/scripts/update_redirected_urls.sh
rename to maintainers/scripts/update-redirected-urls.sh
index b80275655946..5ffa9aca5f68 100755
--- a/maintainers/scripts/update_redirected_urls.sh
+++ b/maintainers/scripts/update-redirected-urls.sh
@@ -9,3 +9,4 @@ curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq -r '.[] | select(.type == "homepage_permanent_https_redirect") | .data | "s@\(.url)@\(.target)@"' \
    | sort | uniq | tee script.sed
 find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
+rm script.sed

From e4591eb1a223032ef2a88e32366039561da66882 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 01:00:59 +0000
Subject: [PATCH 3806/3942] vale: 2.6.2 -> 2.6.3

---
 pkgs/tools/text/vale/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index 9a394a986945..0a9ec734e3a0 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "vale";
-  version = "2.6.2";
+  version = "2.6.3";
 
   subPackages = [ "." ];
   outputs = [ "out" "data" ];
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "errata-ai";
     repo   = "vale";
     rev    = "v${version}";
-    sha256 = "0hsazxspszljf34i1v247ll8144dq7s1mfs67w8ppscs575ndf05";
+    sha256 = "1svzsm40jm694s5gxg807k0jib8pl5vk2rb2ih8qr9bb23a4h95x";
   };
 
   vendorSha256 = null;

From 5487927b06a12d7ece44141d4ec52448954c781b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 01:09:42 +0000
Subject: [PATCH 3807/3942] visualvm: 2.0.4 -> 2.0.5

---
 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 6cf97277bb5a..4c0ec3bc29d2 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, gawk }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.4";
+  version = "2.0.5";
   pname = "visualvm";
 
   src = fetchzip {
     url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""]  version}.zip";
-    sha256 = "1ic6gjsw90j7pr1yyplmk1zc319ld49i6d4zlgs7mlz1m4bn5jv3";
+    sha256 = "19xf79rbilslpibi1mi31jplrgf8anpm06s6sxqh8v1qs84vkxdm";
   };
 
   desktopItem = makeDesktopItem {

From c4a33bd9189b224e70310faf5c441a2aed91b8ad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 01:16:40 +0000
Subject: [PATCH 3808/3942] vultr-cli: 1.0.0 -> 2.0.0

---
 pkgs/development/tools/vultr-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix
index ef98d5603d0a..b3b3bd1b9f53 100644
--- a/pkgs/development/tools/vultr-cli/default.nix
+++ b/pkgs/development/tools/vultr-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "vultr-cli";
-  version = "1.0.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "vultr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1604l36y6pggk72x4avdijq7c90w0as7xamh634a68ymjnd10jv4";
+    sha256 = "05qxbqq9mlq2jmyj5m9vmgw6s6a3wj06hmxj74g9lgqg8xyfglnh";
   };
 
   vendorSha256 = null;

From f0dfa241905e18bf5d0bb64c911e65777606b771 Mon Sep 17 00:00:00 2001
From: Nicolas Berbiche <nicolas@normie.dev>
Date: Thu, 26 Nov 2020 20:14:14 -0500
Subject: [PATCH 3809/3942] bottom: 0.5.1 -> 0.5.3

---
 pkgs/tools/system/bottom/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix
index ac03bd4119fd..12367949e9e8 100644
--- a/pkgs/tools/system/bottom/default.nix
+++ b/pkgs/tools/system/bottom/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bottom";
-  version = "0.5.1";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "ClementTsang";
     repo = pname;
     rev = version;
-    sha256 = "0bw83l3s7yraxiwbwcm0nfqqhv2dkd208qz7nm89whzdjzf340gj";
+    sha256 = "sha256-Gc2bL7KqDqab0hCCOi2rtEw+5r0bSETzTipLLdX/ipk=";
   };
 
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
 
-  cargoSha256 = "11ywms0vgrm4ildsgl99agjimk5f3l56hlr5aa70kagxam4k6vmn";
+  cargoSha256 = "sha256-Bdkq3cTuziTQ7/BkvuBHbfuxRIXnz4h2OadoAGNTBc0=";
 
   doCheck = false;
 

From 82f8f6a1fce5d79bd8b3125af98cc76451abe778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 26 Nov 2020 22:22:21 -0300
Subject: [PATCH 3810/3942] marwaita-peppermint: 0.4 -> 0.5

---
 pkgs/data/themes/marwaita-peppermint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/marwaita-peppermint/default.nix b/pkgs/data/themes/marwaita-peppermint/default.nix
index 3b92b143c7fd..c7c4efa777bb 100644
--- a/pkgs/data/themes/marwaita-peppermint/default.nix
+++ b/pkgs/data/themes/marwaita-peppermint/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "marwaita-peppermint";
-  version = "0.4";
+  version = "0.5";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = pname;
     rev = version;
-    sha256 = "16jrkdkkg8vrzzdv23zbpwk4gi740gn6gj92m0yqv7d6whrbkcvp";
+    sha256 = "04j210nw9w4m8n49cd8y3l0qp60rn00i8wdr6kvc7lhkvqwhpnlg";
   };
 
   buildInputs = [

From b25018203b0aab7497412df07ad94eedd5f7d3f9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 01:53:34 +0000
Subject: [PATCH 3811/3942] workcraft: 3.3.1 -> 3.3.2

---
 pkgs/applications/science/logic/workcraft/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix
index 971eb93e2a14..9ce6592d9989 100644
--- a/pkgs/applications/science/logic/workcraft/default.nix
+++ b/pkgs/applications/science/logic/workcraft/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "workcraft";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchurl {
     url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
-    sha256 = "1xcdf3c8rlvjmhiah3g2j83c889qh9x04kv3kb4nsa2imrpsqaqk";
+    sha256 = "0v71x3fph2j3xrnysvkm7zsgnbxisfbdfgxzvzxxfdg59a6l3xid";
   };
 
   buildInputs = [ makeWrapper ];

From 686b2a2ac8d2fc46e22530880729342c338bf8d9 Mon Sep 17 00:00:00 2001
From: Francois Marier <francois@fmarier.org>
Date: Thu, 22 Oct 2020 07:48:32 -0700
Subject: [PATCH 3812/3942] safe-rm: Update git repository

Gitorious is long gone and the upstream repository is now on Launchpad: https://code.launchpad.net/safe-rm
---
 pkgs/tools/system/safe-rm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix
index a9fc44e8b40d..c188f066d180 100644
--- a/pkgs/tools/system/safe-rm/default.nix
+++ b/pkgs/tools/system/safe-rm/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.12";
 
   src = fetchgit {
-    url = "https://gitorious.org/safe-rm/mainline.git";
+    url = "https://git.launchpad.net/safe-rm";
     rev = "refs/tags/${pname}-${version}";
     sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq";
   };

From cab7e2cef6bd118adc6cd8b62c673a3b056ff3a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 02:25:37 +0000
Subject: [PATCH 3813/3942] xmrig: 6.5.3 -> 6.6.1

---
 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 16aa4f2f7303..35a19cb3063e 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmrig";
-  version = "6.5.3";
+  version = "6.6.1";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "0hywdb6zzkmiik93bnsw6pzir7189mnm46brg4v8fyn56vxskfmi";
+    sha256 = "03phq1c6fylvkg5x7l0bskspr9jdfx61jy67yx2lxhymqgpbf64z";
   };
 
   nativeBuildInputs = [ cmake ];

From 215337d484db4d981bd88ecf241fae2a263eacf2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 18:26:06 -0800
Subject: [PATCH 3814/3942] traefik: 2.3.3 -> 2.3.4 (#105097)

---
 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 dbc59e982d8f..9c576dd2bdfd 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "traefik";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchzip {
     url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
-    sha256 = "0hzw4ahwl8hjd1qzv8fzls9m8pivyzrdcmchbqpjlwn83r8ywm0l";
+    sha256 = "1vdnd6nb8bfiwd51rrqhrc9p8lh3fhny49lapgbzk36ynqc97bi5";
     stripRoot = false;
   };
 
-  vendorSha256 = "0y0yw648a6wm0da5x58xwa7k95ff3iddqhfwshhlb5phlnsiqllj";
+  vendorSha256 = "0h3j0b034yh70c9bscj1k1jy8igsr7p0i014yr0zl7wlc6s6c9bp";
 
   doCheck = false;
 

From 736db6273b4a9b5a9ce462c80e9bb8537e9a39a9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 27 Nov 2020 04:20:00 +0000
Subject: [PATCH 3815/3942] postgresqlPackages.pg_topn: 2.3.0 -> 2.3.1

---
 pkgs/servers/sql/postgresql/ext/pg_topn.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
index 0f8e2f61a6ec..03d571c03ba6 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "pg_topn";
-  version = "2.3.0";
+  version = "2.3.1";
 
   buildInputs = [ postgresql ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner  = "citusdata";
     repo   = "postgresql-topn";
     rev    = "refs/tags/v${version}";
-    sha256 = "05mjzm7rz5j7byzag23526hhsqsg4dsyxxsg8q9ray1rwxjbr392";
+    sha256 = "0ai07an90ywhk10q52hajgb33va5q76j7h8vj1r0rvq6dyii0wal";
   };
 
   installPhase = ''
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Efficient querying of 'top values' for PostgreSQL";
     homepage    = "https://github.com/citusdata/postgresql-topn";
+    changelog   = "https://github.com/citusdata/postgresql-topn/blob/v${version}/CHANGELOG.md";
     maintainers = with maintainers; [ thoughtpolice ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.agpl3;

From 8f46b51e86610892f642ccd51f97a72733d25f54 Mon Sep 17 00:00:00 2001
From: JesusMtnez <jesusmartinez93@gmail.com>
Date: Fri, 27 Nov 2020 06:38:46 +0100
Subject: [PATCH 3816/3942] ammonite: 2.2.0 -> 2.3.8

---
 pkgs/development/tools/ammonite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index c3a578f18b8c..87a7afde5ebc 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -9,7 +9,7 @@ let
   common = { scalaVersion, sha256 }:
     stdenv.mkDerivation rec {
       pname = "ammonite";
-      version = "2.2.0";
+      version = "2.3.8";
 
       src = fetchurl {
         url =
@@ -75,10 +75,10 @@ let
 in {
   ammonite_2_12 = common {
     scalaVersion = "2.12";
-    sha256 = "9xe4GT5YpVCtDPaZvi9PZwFW/wcNhg+QCdbJ4Tl2lFk=";
+    sha256 = "1kzk0437h2wd9jhwkvjkiaj6mscz4bh85iv266x9zz4zssb355hs";
   };
   ammonite_2_13 = common {
     scalaVersion = "2.13";
-    sha256 = "KRwh2YOcHpXLA9BlBKzkc9oswdOQbcm3WVqgYaGyi4A=";
+    sha256 = "0js84m6yqjd7d77md38z6nk3qzlm1ms8brzczaw05zq2c90pdbz7";
   };
 }

From 2f2166f40d39bdf062e47f459377c62cdc6e81ce Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 26 Nov 2020 16:27:31 +0100
Subject: [PATCH 3817/3942] gitAndTools.glab: init at 1.11.1

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/glab/default.nix            | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/glab/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 477d9ca3ea6f..bf6591a8cb9c 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -203,6 +203,8 @@ let
     inherit (darwin.apple_sdk.frameworks) Security AppKit;
   };
 
+  glab = callPackage ./glab { };
+
   grv = callPackage ./grv { };
 
   hub = callPackage ./hub { };
diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix
new file mode 100644
index 000000000000..9c2e4f00ca7a
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "glab";
+  version = "1.11.1";
+
+  src = fetchFromGitHub {
+    owner = "profclems";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "mmrTuldU2WDe9t2nC3DYfqwb28uh6qjAaaveR221mjw=";
+  };
+
+  vendorSha256 = "B4RKcKUTdGkonsKhL7NIKzVpZq6XD6cMMWed4wr/Moc=";
+  runVend = true;
+
+  # Tests are trying to access /homeless-shelter
+  doCheck = false;
+
+  subPackages = [ "cmd/glab" ];
+
+  meta = with lib; {
+    description = "An open-source GitLab command line tool";
+    license = licenses.mit;
+    homepage = "https://glab.readthedocs.io/";
+    maintainers = with maintainers; [ freezeboy ];
+  };
+}

From 2044e44cf4fe548ebeb9ded83d1a7d9bd4c99601 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 20 Nov 2020 06:40:45 +0100
Subject: [PATCH 3818/3942] =?UTF-8?q?ocamlPackages.ppx=5Fderiving=5Fprotob?=
 =?UTF-8?q?uf:=20disable=20for=20OCaml=20=E2=89=A5=204.11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/ppx_deriving_protobuf/default.nix       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix
index 4af711ce3950..f85e32d72c7f 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix
@@ -1,6 +1,10 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, cppo, ppx_tools, ppx_deriving
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo, ppx_tools, ppx_deriving
 , ppxfind }:
 
+if lib.versionAtLeast ocaml.version "4.11"
+then throw "ppx_deriving_protobuf is not available for OCaml ${ocaml.version}"
+else
+
 buildDunePackage rec {
   pname = "ppx_deriving_protobuf";
   version = "2.7";
@@ -14,7 +18,7 @@ buildDunePackage rec {
 
   buildInputs = [ cppo ppx_tools ppxfind ppx_deriving ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf";
     description = "A Protocol Buffers codec generator for OCaml";
     license = licenses.mit;

From 18370bce2f70681111462eed5479a659c031cb9f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 20 Nov 2020 06:40:50 +0100
Subject: [PATCH 3819/3942] =?UTF-8?q?ocamlPackages.ocaml-protoc:=201.2.0?=
 =?UTF-8?q?=20=E2=86=92=202.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/ocaml-protoc/default.nix    | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix
index 1ef7b6c2d40b..5abb026032be 100644
--- a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix
@@ -1,35 +1,27 @@
-{ stdenv, ocaml, fetchFromGitHub, ocamlbuild, findlib, ppx_deriving_protobuf }:
+{ lib, fetchFromGitHub, buildDunePackage
+, stdlib-shims
+}:
 
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-ocaml-protoc-${version}";
-  version = "1.2.0";
+buildDunePackage rec {
+  pname = "ocaml-protoc";
+  version = "2.0.2";
+
+  useDune2 = true;
 
   minimumOCamlVersion = "4.02";
 
   src = fetchFromGitHub {
     owner = "mransan";
     repo = "ocaml-protoc";
-    rev = "60d2d4dd55f73830e1bed603cc44d3420430632c";
-    sha256 = "1d1p8ch723z2qa9azmmnhbcpwxbpzk3imh1cgkjjq4p5jwzj8amj";
+    rev = version;
+    sha256 = "1vlnjqqpypmjhlyrxfzla79y4ilmc9ggz311giy6vmh4cyzl29h3";
   };
 
-  installPhase = ''
-    mkdir -p tmp/bin
-    export PREFIX=`pwd`/tmp
-    make all.install.build
-    make check_install
-    make lib.install
-    make bin.install
-  '';
-
-  buildInputs = [ ocaml findlib ocamlbuild ];
-  propagatedBuildInputs = [ ppx_deriving_protobuf ];
-
-  createFindlibDestdir = true;
+  buildInputs = [ stdlib-shims ];
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/mransan/ocaml-protoc";
     description = "A Protobuf Compiler for OCaml";
     license = licenses.mit;

From c6a8fcd945ae64c5875432dc7e8a6ff112a9c209 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 25 Nov 2020 14:16:07 +0100
Subject: [PATCH 3820/3942] ocamlPackages.ocaml-migrate-parsetree-2-1: init at
 2.1.0

---
 .../ocaml-migrate-parsetree/2.1.x.nix         | 20 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix

diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix
new file mode 100644
index 000000000000..afe3d34963ae
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix
@@ -0,0 +1,20 @@
+{ lib, fetchurl, buildDunePackage }:
+
+buildDunePackage rec {
+   pname = "ocaml-migrate-parsetree";
+   version = "2.1.0";
+
+   minimumOCamlVersion = "4.02";
+
+   src = fetchurl {
+     url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
+     sha256 = "07x7lm45kny0mi0fjvzw51445brm0dgy099cw0gpyly0wj77hyrq";
+   };
+
+   meta = {
+     description = "Convert OCaml parsetrees between different major versions";
+     license = lib.licenses.lgpl21;
+     maintainers = with lib.maintainers; [ vbgl sternenseemann ];
+     homepage = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree";
+   };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index b4bf6f7852e5..5e4f350099a6 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -666,6 +666,8 @@ let
 
     ocaml-migrate-parsetree-1-8 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix { };
 
+    ocaml-migrate-parsetree-2-1 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix { };
+
     ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };
 
     ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { };

From 4caeb90cd393fa889e59683f027db9e265a48aa5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 07:57:14 +0000
Subject: [PATCH 3821/3942] abcm2ps: 8.14.9 -> 8.14.10

---
 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 099ccc6f4cb8..5088cdeb9609 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abcm2ps";
-  version = "8.14.9";
+  version = "8.14.10";
 
   src = fetchFromGitHub {
     owner = "leesavide";
     repo = "abcm2ps";
     rev = "v${version}";
-    sha256 = "0h4qzj9k5ng09nbkfipvr82piq68c576akjwmhsqn05rvgirmhx7";
+    sha256 = "0x20vmf94n9s4r2q45543yi39fkc0jg9wd1imihjcqmb2sz3x3vm";
   };
 
   configureFlags = [

From 1b14ab86c25adab93d4f97113513efe70b812f49 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 08:20:42 +0000
Subject: [PATCH 3822/3942] _1password-gui: 0.9.4-1 -> 0.9.5-2

---
 pkgs/tools/security/1password-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix
index cce49acacd60..9761bf112b93 100644
--- a/pkgs/tools/security/1password-gui/default.nix
+++ b/pkgs/tools/security/1password-gui/default.nix
@@ -13,11 +13,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "1password";
-  version = "0.9.4-1";
+  version = "0.9.5-2";
 
   src = fetchurl {
     url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
-    sha256 = "1d5k7066hzc7j2nncrj6b85nklpjbn88izlyisznb3m1yxi8jm5i";
+    sha256 = "1fj8gab5frxnzx6cafkcxmic9z1wvfqi4v511wsg9dy4mn5dc6qw";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b3efb719406b95ab74141c8f71147e8c1dd9a51e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 09:00:10 +0000
Subject: [PATCH 3823/3942] avocode: 4.7.0 -> 4.10.3

---
 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 53779041fc90..fd94b4e26cfc 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "avocode";
-  version = "4.7.0";
+  version = "4.10.3";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "0kn0422k4vi2qifasnkd0cjf5l6z0rmkqv6l46ygxk3qyykjnqcm";
+    sha256 = "1ngyd3sfnhf8hpi015pgbms5bspc30lzrpfpw3jp992i4mzcjq0z";
   };
 
   libPath = stdenv.lib.makeLibraryPath (with xorg; [

From 12d78f746930d7282bcba8e1e48ff5f82db9adae Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 27 Nov 2020 10:16:57 +0100
Subject: [PATCH 3824/3942] goreleaser: 0.145.0 -> 0.147.2

---
 pkgs/tools/misc/goreleaser/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index 652dce15c42a..95944d566df2 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "goreleaser";
-  version = "0.145.0";
+  version = "0.147.2";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1w2mbyywr3zsn068cshkx502x0zrxrbrgaw23x4spfri0nk6v4fd";
+    sha256 = "1pzbwjqnb2l1845dqmx5s2xyxv7088yz2888bjwm0qs8pm1l6spi";
   };
 
-  vendorSha256 = "0drk58bhcvx75cd6s0xnyh6swph1vlvpzp2nngr7agvjdcrbady6";
+  vendorSha256 = "1qwggbgfvgx1anh55jx2lj0x59h5j3wixb8r2ylaynrrxx1b167w";
 
   buildFlagsArray = [
     "-ldflags="

From 92672cfff81e2cc227b237037746ef296c551503 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Fri, 27 Nov 2020 12:05:04 +0300
Subject: [PATCH 3825/3942] =?UTF-8?q?qmapshack:=201.15.0=20=E2=86=92=201.1?=
 =?UTF-8?q?5.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/{misc => gis}/qmapshack/default.nix | 8 +++-----
 pkgs/top-level/all-packages.nix                       | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/applications/{misc => gis}/qmapshack/default.nix (85%)

diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/gis/qmapshack/default.nix
similarity index 85%
rename from pkgs/applications/misc/qmapshack/default.nix
rename to pkgs/applications/gis/qmapshack/default.nix
index 1a8758955cef..bc7d888e2c15 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/gis/qmapshack/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "qmapshack";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "Maproom";
     repo = pname;
     rev = "V_${version}";
-    sha256 = "157bssrbwcc1w58b0v60jb3wrjf2ig4z6z6crjnpvflkqj5p8vwy";
+    sha256 = "1q8qczp9bgk3dzdswb1x64fcn3xg339s0yx31nablb518hcb8jkr";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -22,8 +22,6 @@ mkDerivation rec {
     "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"
   ];
 
-  enableParallelBuilding = true;
-
   patches = [
     "${src}/FindPROJ4.patch"
     "${src}/FindQuaZip5.patch"
@@ -36,7 +34,7 @@ mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/Maproom/qmapshack";
     description = "Consumer grade GIS software";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ dotlambda sikmir ];
     platforms = with platforms; linux;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ea78c5d1045..6aa71ede4783 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23365,7 +23365,7 @@ in
 
   garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {};
 
-  qmapshack = libsForQt514.callPackage ../applications/misc/qmapshack { };
+  qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };
 
   qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview {
     boost = boost17x;

From fcbedf65aa21e7fa8b437519dd599447f4d35aca Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 27 Nov 2020 11:04:17 +0100
Subject: [PATCH 3826/3942] Revert "nmap: 7.80 -> 7.90"

This reverts commit c426ccf116375f8eb17b3dafa78ed05af942fb89.

License has changed in 7.90 and we should decide first how to proceed.
See #105119 for further context.
---
 pkgs/tools/security/nmap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index f03a794b6800..bd543154494c 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
-  version = "7.90";
+  version = "7.80";
 
   src = fetchurl {
     url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
-    sha256 = "1s20i84m9bci70lrl0p2j7h3kpbi9snmvyhc3lzc9s3mh92w6msm";
+    sha256 = "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw";
   };
 
   patches = [ ./zenmap.patch ]

From 00afc85506c30cd901509aa825e6abf9ed702401 Mon Sep 17 00:00:00 2001
From: Graf_Blutwurst <dominicegger@bluewin.ch>
Date: Tue, 25 Aug 2020 16:19:57 +0200
Subject: [PATCH 3827/3942] gitter: 4.1.0 -> 5.0.1

Just an update to the underlying package version.
---
 .../instant-messengers/gitter/default.nix     | 54 +++++++++++++++----
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix
index 57b745057dce..69a198480668 100644
--- a/pkgs/applications/networking/instant-messengers/gitter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix
@@ -1,29 +1,61 @@
-{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl
-, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libX11
+{ stdenv, alsaLib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl
+, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3,  libdrm, libX11
 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
 , libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx
-, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss
+, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, mesa, nspr, nss
 , pango, systemd }:
 
 let gitterDirectorySuffix = "opt/gitter";
+   libPath = stdenv.lib.makeLibraryPath [
+     alsaLib
+     atk
+     at-spi2-core
+     cairo
+     cups
+     dbus
+     expat
+     fontconfig
+     freetype
+     gdk-pixbuf
+     glib
+     gnome2.GConf
+     gtk3
+     libX11
+     libXScrnSaver
+     libXcomposite
+     libXcursor
+     libXdamage
+     libXext
+     libXfixes
+     libXi
+     libXrandr
+     libXrender
+     libXtst
+     libappindicator-gtk3
+     libcxx
+     libdrm
+     libnotify
+     libpulseaudio
+     libxcb
+     mesa
+     nspr
+     nss
+     pango
+     stdenv.cc.cc
+     systemd
+  ];
     doELFPatch = target: ''
       patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
          --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \
          $out/${gitterDirectorySuffix}/${target}
        '';
-   libPath = stdenv.lib.makeLibraryPath [
-     alsaLib atk cairo cups dbus expat fontconfig freetype gdk-pixbuf glib
-     gnome2.GConf gtk3 libX11 libXScrnSaver libXcomposite libXcursor libXdamage
-     libXext libXfixes libXi libXrandr libXrender libXtst libappindicator-gtk3
-     libcxx libnotify libpulseaudio libxcb nspr nss pango stdenv.cc.cc systemd
-  ];
 in stdenv.mkDerivation rec {
   pname = "gitter";
-  version = "4.1.0";
+  version = "5.0.1";
 
   src = fetchurl {
     url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb";
-    sha256 = "1gny9i2pywvczzrs93k8krqn6hwm6c2zg8yr3xmjqs3p88817wbi";
+    sha256 = "1ps9akylqrril4902r8mi0mprm0hb5wra51ry6c1rb5xz5nrzgh1";
   };
 
   nativeBuildInputs = [ makeWrapper dpkg ];

From 63dd41f745e7dfcead935bcd5fa008906124d71e Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 27 Nov 2020 16:22:56 +0700
Subject: [PATCH 3828/3942] bombadillo: init at 2.3.3

---
 .../browsers/bombadillo/default.nix           | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/bombadillo/default.nix

diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/applications/networking/browsers/bombadillo/default.nix
new file mode 100644
index 000000000000..c24f91c4e103
--- /dev/null
+++ b/pkgs/applications/networking/browsers/bombadillo/default.nix
@@ -0,0 +1,21 @@
+{ lib, fetchgit, buildGoModule }:
+
+buildGoModule rec {
+  pname = "bombadillo";
+  version = "2.3.3";
+
+  src = fetchgit {
+    url = "https://tildegit.org/sloum/bombadillo.git";
+    rev = version;
+    sha256 = "02w6h44sxzmk3bkdidl8xla0i9rwwpdqljnvcbydx5kyixycmg0q";
+  };
+
+  vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
+
+  meta = with lib; {
+    description = "Non-web client for the terminal, supporting Gopher, Gemini and more";
+    homepage = "https://bombadillo.colorfield.space/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ehmry ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ea78c5d1045..f3bbed7d39b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20367,6 +20367,8 @@ in
 
   blugon = callPackage ../applications/misc/blugon { };
 
+  bombadillo = callPackage ../applications/networking/browsers/bombadillo { };
+
   bombono = callPackage ../applications/video/bombono {};
 
   bomi = libsForQt5.callPackage ../applications/video/bomi {

From 89f75b02f27ce84e8a402c6845b5bf09df395005 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 17 Oct 2020 15:27:52 +0200
Subject: [PATCH 3829/3942] geeqie: 1.4.0 -> 1.5.1

---
 pkgs/applications/graphics/geeqie/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 51c066196efd..629abb3321d5 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "geeqie";
-  version = "1.4";
+  version = "1.5.1";
 
   src = fetchurl {
     url = "http://geeqie.org/${pname}-${version}.tar.xz";
-    sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w";
+    sha256 = "02m1vqaasin249xx792cdj11xyag8lnanwzxd108y7y34g9xam28";
   };
 
   patches = [
@@ -19,12 +19,6 @@ stdenv.mkDerivation rec {
       url = "https://src.fedoraproject.org/rpms/geeqie/raw/132fb04a1a5e74ddb333d2474f7edb9a39dc8d27/f/geeqie-1.4-goodbye-changelog.patch";
       sha256 = "00a35dds44kjjdqsbbfk0x9y82jspvsbpm2makcm1ivzlhjjgszn";
     })
-    # Fixes build with exiv2 0.27.1
-    (fetchpatch {
-      name = "geeqie-exiv2-0.27.patch";
-      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/geeqie-exiv2-0.27.patch?h=packages/geeqie&id=dee28a8b3e9039b9cd6927b5a93ef2a07cd8271d";
-      sha256 = "05skpbyp8pcq92psgijyccc8liwfy2cpwprw6m186pf454yb5y9p";
-    })
   ];
 
   preConfigure = "./autogen.sh";
@@ -32,6 +26,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool
     wrapGAppsHook
   ];
+
   buildInputs = [
     gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida
   ];
@@ -63,7 +58,7 @@ stdenv.mkDerivation rec {
 
     homepage = "http://geeqie.sourceforge.net";
 
-    maintainers = with maintainers; [ jfrankenau pSub ];
+    maintainers = with maintainers; [ jfrankenau pSub markus1189 ];
     platforms = platforms.gnu ++ platforms.linux;
   };
 }

From 706ed34eb3321c97b9fdfb35768471537792b4ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 10:28:11 +0000
Subject: [PATCH 3830/3942] containerd: 1.4.1 -> 1.4.2

---
 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 f3bcefcf1739..627154e83fe5 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -4,7 +4,7 @@ with lib;
 
 buildGoPackage rec {
   pname = "containerd";
-  version = "1.4.1";
+  version = "1.4.2";
   # git commit for the above version's tag
   commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "1k6dqaidnldf7kpxdszf0wn6xb8m6vaizm2aza81fri1q0051213";
+    sha256 = "17ciyvqz0j1q2vyzwkz6bkvxpz2d7y1kk99fv68ar7l4mr8pyp78";
   };
 
   goPackagePath = "github.com/containerd/containerd";

From 3ed321dfabb152f7c72b6dbcef65374a1c6e7747 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 27 Nov 2020 11:52:07 +0100
Subject: [PATCH 3831/3942] z3: enable build on non-x86_64 unix; checked the
 build on aarch64-linux

---
 pkgs/applications/science/logic/z3/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index dd71cf2cb1a8..48512eff5300 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     description = "A high-performance theorem prover and SMT solver";
     homepage    = "https://github.com/Z3Prover/z3";
     license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.x86_64;
+    platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ];
   };
 }

From 06f2fd5fb9f7def14154a7b80e7676e641dd56f9 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Fri, 27 Nov 2020 12:04:23 +0100
Subject: [PATCH 3832/3942] jetbrains: updates

---
 .../editors/jetbrains/default.nix             | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 9fbab346907d..80528617d64d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -268,12 +268,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2020.2.4"; /* updated by script */
+    version = "2020.2.5"; /* 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 = "0xkra8l3ga8qsmzbvfisn99lxm5wxa8c4d4jzljjwn8855bs20a3"; /* updated by script */
+      sha256 = "0j7gxh8wqshn2i1f22bl9099sx8a4092qwkp4fwny4649rbkfyrz"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -281,12 +281,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2020.2.3"; /* updated by script */
+    version = "2020.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 = "0iv1zmdpbqk8f4cjd6dhgj9mrvxli4dg83jzkhv566sy8wrrx7kb"; /* updated by script */
+      sha256 = "1j0mlsiqh80mspi2x9mi0h5hxhg5gw6395hyl9w33q8dxm95mx2d"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
     update-channel = "DataGrip RELEASE";
@@ -307,12 +307,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2020.2.3"; /* updated by script */
+    version = "2020.2.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 = "092swkz7l1p3asrna6fxj6j324sh7pdbgzrlapdwka8kq9y40ajz"; /* updated by script */
+      sha256 = "1rlw01aq6ci46xv4d4877k30309jjws29kwhriy98xf804msyzyb"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IntelliJ IDEA RELEASE";
@@ -320,12 +320,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2020.2.3"; /* updated by script */
+    version = "2020.2.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-jbr.tar.gz";
-      sha256 = "1416ikna169d2hx77yd0bb8hpxkpnf27jgyq5yrgla1w6h1fp1p0"; /* updated by script */
+      sha256 = "05qr8jiasqxmkgi9v52g7hgpdf7pkkjcp42bbkh1f4zgvq81p5py"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IntelliJ IDEA RELEASE";
@@ -346,12 +346,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2020.2.3"; /* updated by script */
+    version = "2020.2.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 = "0bdxmxml6337cdpb2amhdqlvxicng50cgzlnmiw0wqnmwj5ihpih"; /* updated by script */
+      sha256 = "111dr1a6695msh13cd484yk671jnh2ps6q1k2dl0kmryk9dqnvhd"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
     update-channel = "PhpStorm RELEASE";
@@ -359,12 +359,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2020.2.3"; /* updated by script */
+    version = "2020.2.4"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0wqhcag32fxqxg6aml2a3d0rpds0d48rgbcl7cp0ah8xj6x72047"; /* updated by script */
+      sha256 = "196hhb4n52a50w50awx01ksyl5dkrbdmnz8sb9di5ihni7043p97"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm RELEASE";
@@ -372,12 +372,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2020.2.3"; /* updated by script */
+    version = "2020.2.4"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0g7bki4bzi3a1w3rlwik2w0ma10xb4g450qxm4fr4fp8dy2xaysc"; /* updated by script */
+      sha256 = "0dwd9gvi8n3igza95pil3mf7azxn131830rvfzdvnvrzj9yb2q8l"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm RELEASE";
@@ -398,12 +398,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2020.2.3"; /* updated by script */
+    version = "2020.2.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 = "03f1z7xhz90j9l8xp3il115yvb15kda0i6ba5ndhby7nf52vnphk"; /* updated by script */
+      sha256 = "0bpkl8phc16yjm7qjfbg42rm7sbfwbrjva7w0qiwiw9ibwvs90id"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "RubyMine RELEASE";
@@ -411,12 +411,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2020.2.3"; /* updated by script */
+    version = "2020.2.4"; /* 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 = "1c60k38ai63s4779fs55vaiswfc6bi7ki6p96hrmmkrnpzgsipg5"; /* updated by script */
+      sha256 = "0l97nk9psb8g0sxm148fcz0x2v9mwqblffigrz2rmac3gd275s7f"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WebStorm RELEASE";

From 6aea53c3ce3b20c12cbcb61c6f15a744592f3e10 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 27 Nov 2020 12:38:07 +0100
Subject: [PATCH 3833/3942] chromedriver: Switch to Chromium's
 upstream-info.json (#105054)

This enables automatic updates and fixes #85629.
---
 .../networking/browsers/chromium/update.py    | 16 ++++++++++
 .../browsers/chromium/upstream-info.json      |  5 ++++
 .../tools/selenium/chromedriver/default.nix   | 29 +++++++++++++------
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py
index b404ca555bff..9e1f0aec598d 100755
--- a/pkgs/applications/networking/browsers/chromium/update.py
+++ b/pkgs/applications/networking/browsers/chromium/update.py
@@ -38,6 +38,20 @@ def get_file_revision(revision, file_path):
     with urlopen(url) as http_response:
         return http_response.read()
 
+def get_matching_chromedriver(version):
+    # See https://chromedriver.chromium.org/downloads/version-selection
+    build = re.sub('.[0-9]+$', '', version)
+    chromedriver_version_url = f'https://chromedriver.storage.googleapis.com/LATEST_RELEASE_{build}'
+    with urlopen(chromedriver_version_url) as http_response:
+        chromedriver_version = http_response.read().decode()
+        def get_chromedriver_url(system):
+            return f'https://chromedriver.storage.googleapis.com/{chromedriver_version}/chromedriver_{system}.zip'
+        return {
+            'version': chromedriver_version,
+            'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')),
+            'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64'))
+        }
+
 def get_channel_dependencies(channel):
     deps = get_file_revision(channel['version'], 'DEPS')
     gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'"
@@ -85,6 +99,8 @@ with urlopen(HISTORY_URL) as resp:
             continue
 
         channel['deps'] = get_channel_dependencies(channel)
+        if channel_name == 'stable':
+            channel['chromedriver'] = get_matching_chromedriver(channel['version'])
 
         channels[channel_name] = channel
 
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index eb51135a2c6d..6281013a6814 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -10,6 +10,11 @@
         "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
         "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
       }
+    },
+    "chromedriver": {
+      "version": "87.0.4280.20",
+      "sha256_linux": "1cpk7mb32z3a7c7cbaaxskpv91il3i8kgsdp2q8zw9w762kql953",
+      "sha256_darwin": "06mx2yk6xy46azvkbyvhqm11prxbh67pfi50fcwxb0zqllbq7scr"
     }
   },
   "beta": {
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index f7b2f926460a..de1c9c9c11aa 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl, cairo, fontconfig, freetype, gdk-pixbuf, glib
-, glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf
+{ stdenv, fetchurl, unzip, makeWrapper
+, cairo, fontconfig, freetype, gdk-pixbuf, glib
+, glibc, gtk2, libX11, nspr, nss, pango, gconf
 , libxcb, libXi, libXrender, libXext
 }:
+
 let
+  upstream-info = (stdenv.lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver;
   allSpecs = {
     x86_64-linux = {
       system = "linux64";
-      sha256 = "1cpk7mb32z3a7c7cbaaxskpv91il3i8kgsdp2q8zw9w762kql953";
+      sha256 = upstream-info.sha256_linux;
     };
 
     x86_64-darwin = {
       system = "mac64";
-      sha256 = "06mx2yk6xy46azvkbyvhqm11prxbh67pfi50fcwxb0zqllbq7scr";
+      sha256 = upstream-info.sha256_darwin;
     };
   };
 
@@ -25,10 +28,10 @@ let
     libX11 nspr nss pango libXrender
     gconf libxcb libXext libXi
   ];
-in
-stdenv.mkDerivation rec {
+
+in stdenv.mkDerivation rec {
   pname = "chromedriver";
-  version = "87.0.4280.20";
+  version = upstream-info.version;
 
   src = fetchurl {
     url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";
@@ -47,10 +50,18 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://sites.google.com/a/chromium.org/chromedriver";
+    homepage = "https://chromedriver.chromium.org/";
     description = "A WebDriver server for running Selenium tests on Chrome";
+    longDescription = ''
+      WebDriver is an open source tool for automated testing of webapps across
+      many browsers. It provides capabilities for navigating to web pages, user
+      input, JavaScript execution, and more. ChromeDriver is a standalone
+      server that implements the W3C WebDriver standard.
+    '';
     license = licenses.bsd3;
-    maintainers = [ maintainers.goibhniu maintainers.marsam ];
+    maintainers = with maintainers; [ goibhniu marsam primeos ];
+    # Note from primeos: By updating Chromium I also update Google Chrome and
+    # ChromeDriver.
     platforms = attrNames allSpecs;
   };
 }

From abe1271fe241674afd0b354d6aabfe3bd7e73031 Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Fri, 27 Nov 2020 20:02:27 +0800
Subject: [PATCH 3834/3942] perlPackages.Appcpm: init at 0.994

---
 pkgs/top-level/perl-packages.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 21df060b96d0..f7878f1910e0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -596,6 +596,27 @@ let
     };
   };
 
+  Appcpm = buildPerlModule {
+    pname = "App-cpm";
+    version = "0.994";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.994.tar.gz";
+      sha256 = "4242ecb64aaae09034eddb1b338e005567ace29f2ac2d1bca4d4bcf4e15d21c4";
+    };
+    buildInputs = [ ModuleBuildTiny ];
+    propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy ModuleCPANfile ParallelPipes locallib ];
+    nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
+    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      shortenPerlShebang $out/bin/cpm
+    '';
+    meta = {
+      homepage = "https://github.com/skaji/cpm";
+      description = "A fast CPAN module installer";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.zakame ];
+    };
+  };
+
   Applify = buildPerlPackage {
     pname = "Applify";
     version = "0.21";

From 0229bebd37caf01cad975090895a5ba2c5973226 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 12:11:36 +0000
Subject: [PATCH 3835/3942] cimg: 2.9.3 -> 2.9.4

---
 pkgs/development/libraries/cimg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index 400326f6fcaf..61d3996a4f5b 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cimg";
-  version = "2.9.3";
+  version = "2.9.4";
 
   src = fetchFromGitHub {
     owner = "dtschump";
     repo = "CImg";
     rev = "v.${version}";
-    sha256 = "1pkjbwpi0047lbc55cva99rj6p70gbw09l14vrym0igwipnxxx0z";
+    sha256 = "1sb0z5ryh34y80ghlr2agsl64gayjmxpl96l9fjaylf5k2m3fg2b";
   };
 
   installPhase = ''

From 3546e47583573f7b63b38316bcd675e9856019e2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Oct 2020 07:50:13 +0000
Subject: [PATCH 3836/3942] fondo: 1.3.9 -> 1.3.10

---
 pkgs/applications/graphics/fondo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix
index e80fbee1b71e..edfe5ca2deed 100644
--- a/pkgs/applications/graphics/fondo/default.nix
+++ b/pkgs/applications/graphics/fondo/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fondo";
-  version = "1.3.9";
+  version = "1.3.10";
 
   src = fetchFromGitHub {
     owner = "calo001";
     repo = pname;
     rev = version;
-    sha256 = "1gyi80j2c38j62miv8a8nsx1pad169sa4fx0b85m2yv0x7fz492w";
+    sha256 = "0yrbcngmwhn5gl5if9w2cx8shh33zk5fd6iqwnapsq8y0lzq6ppr";
   };
 
   nativeBuildInputs = [

From 9c012584650fa17434617cdc082362ba60700e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= <kuba@kadziolka.net>
Date: Fri, 27 Nov 2020 14:20:41 +0100
Subject: [PATCH 3837/3942] racket: Update source hashes

Upstream has replaced the tarballs in place to fix racket/racket#3499.
---
 pkgs/development/interpreters/racket/default.nix | 2 +-
 pkgs/development/interpreters/racket/minimal.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 6de4ab6da31c..2c51c691a8b8 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     }
   )) {
     name = "${pname}-${version}";
-    sha256 = "18pz6gjzqy6a62xkcmjanhr7kgxpvpmc0blrk4igz8ldcybz44if";
+    sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m";
   };
 
   FONTCONFIG_FILE = fontsConf;
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index 656546dcb630..9fd220e5b98f 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
   name = "racket-minimal-${oldAttrs.version}";
   src = oldAttrs.src.override {
     inherit name;
-    sha256 = "0xvnd7afx058sg7j51bmbikqgn4sl0246nkhr8zlqcrbr3nqi6p4";
+    sha256 = "0yc5zkpq1bavj64h67pllw6mfjhmdp65fgdpyqcaan3syy6b5cia";
   };
 
   meta = oldAttrs.meta // {

From ac3f60095b51ab78b35aa445f2667d28d27b8650 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 27 Nov 2020 14:26:57 +0100
Subject: [PATCH 3838/3942] pythonPackages.browsermob-proxy: drop insecure
 python-cryptography transitive dependency; only used for Marionette anyway

---
 .../development/python-modules/browsermob-proxy/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix
index 68668fce0794..1c69d70a134a 100644
--- a/pkgs/development/python-modules/browsermob-proxy/default.nix
+++ b/pkgs/development/python-modules/browsermob-proxy/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , requests
+, urllib3
 }:
 
 buildPythonPackage rec {
@@ -13,7 +14,10 @@ buildPythonPackage rec {
     sha256 = "1bxvmghm834gsfz3pm69772wzhh15p8ci526b25dpk3z4315nd7v";
   };
 
-  propagatedBuildInputs = [ requests ];
+  propagatedBuildInputs = [ (requests.override { urllib3 = urllib3.override {
+    pyopenssl = null;
+    cryptography = null;
+  };}) ];
 
   meta = {
     description = "A library for interacting with Browsermob Proxy";

From 0d6bc2f7c25214ecd83806b38f781c8d3599ce85 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 13:43:34 +0000
Subject: [PATCH 3839/3942] broot: 1.0.5 -> 1.0.6

---
 pkgs/tools/misc/broot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index b46d6490c4c0..e5c528596b0d 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "0b28xdc3dwhr4vb3w19fsrbj2m82zwkg44l4an3r4mi2vgb25nv2";
+    sha256 = "1yzj1k09yd3q2dff6a6m0xv2v6z681x25g0x5ak41lm5rn3hj8vl";
   };
 
-  cargoSha256 = "07gsga5hf4l64kyjadqvmbg5bay7mad9kg2pi4grjxdw6lsxky0f";
+  cargoSha256 = "1axcnr7bzplchpz4cdy5872fmrnzrs1p665c0vmxzs9bgnml5sl8";
 
   nativeBuildInputs = [
     makeWrapper

From 9448602120730a5cec867a6e3704c7721c779745 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 13:52:08 +0000
Subject: [PATCH 3840/3942] enlightenment.evisum: 0.5.7 -> 0.5.8

---
 pkgs/desktops/enlightenment/evisum/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix
index fef15ce79fe5..f89ff2cee305 100644
--- a/pkgs/desktops/enlightenment/evisum/default.nix
+++ b/pkgs/desktops/enlightenment/evisum/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evisum";
-  version = "0.5.7";
+  version = "0.5.8";
 
   src = fetchurl {
     url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0pm63n3rls8vkjv3awq0f3zlqk33ddql3g0rl2bc46n48g2mcmbd";
+    sha256 = "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx";
   };
 
   nativeBuildInputs = [

From 58fd07cc7b7e38c24427ea2fed8f8d86b3ccc7f1 Mon Sep 17 00:00:00 2001
From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com>
Date: Fri, 27 Nov 2020 12:50:45 +0000
Subject: [PATCH 3841/3942] uwc: Init at 1.0.4

uwc is a Unicode-aware word counter with per-line mode written in Rust
If applied, users will be able to count the
number of unicode characters and words
(e.g. Chinese characters) from files or through the pipe.
---
 pkgs/tools/text/uwc/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/text/uwc/default.nix

diff --git a/pkgs/tools/text/uwc/default.nix b/pkgs/tools/text/uwc/default.nix
new file mode 100644
index 000000000000..cf8e5658f764
--- /dev/null
+++ b/pkgs/tools/text/uwc/default.nix
@@ -0,0 +1,24 @@
+{ rustPlatform, lib, fetchFromGitLab }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "uwc";
+  version = "1.0.4";
+
+  src = fetchFromGitLab {
+    owner = "dead10ck";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1ywqq9hrrm3frvd2sswknxygjlxi195kcy7g7phwq63j7hkyrn50";
+  };
+
+  cargoSha256 = "0ra62cf75b1c4knxxpbdg8m0sy2k02r52j606fp5l9crp0fml8l0";
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Like wc, but unicode-aware, and with per-line mode";
+    homepage = "https://gitlab.com/dead10ck/uwc";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ShamrockLee ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55ebbab69b0b..cdd740983919 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7901,6 +7901,8 @@ in
 
   usync = callPackage ../applications/misc/usync { };
 
+  uwc = callPackage ../tools/text/uwc { };
+
   uwsgi = callPackage ../servers/uwsgi { };
 
   v2ray = callPackage ../tools/networking/v2ray { };

From 64939cff96e1be0dd85ccdfe175e01ada23543ed Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 27 Nov 2020 15:10:02 +0100
Subject: [PATCH 3842/3942] neomutt: 20201120 -> 20201127

ChangeLog: https://github.com/neomutt/neomutt/releases/tag/20201127
---
 pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index c068357a0f65..cf78da9a5048 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -6,14 +6,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "20201120";
+  version = "20201127";
   pname = "neomutt";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = version;
-    sha256 = "0z6xavgd0zv9pqvfsdyvhhi1q3y7zxhgg24isbnn9r6mldafqwna";
+    sha256 = "sha256-BkDGKZmpwahDw1vD67CyWfxD93H83kcpv5JBGVL5F/o=";
   };
 
   buildInputs = [

From 6ad593d6d3756562c27dd60daa41bbb2b0de0af5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 14:14:05 +0000
Subject: [PATCH 3843/3942] dfu-util: 0.9 -> 0.10

---
 pkgs/development/tools/misc/dfu-util/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix
index ecd40f20fd4c..9af9ddc0df7c 100644
--- a/pkgs/development/tools/misc/dfu-util/default.nix
+++ b/pkgs/development/tools/misc/dfu-util/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "dfu-util";
-  version = "0.9";
+  version = "0.10";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libusb1 ];
 
   src = fetchurl {
     url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz";
-    sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin";
+    sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0";
   };
 
   meta = with stdenv.lib; {

From 763e838049c4d5d7e005ed3711998534bb7ea234 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 18 Oct 2020 03:58:56 +0000
Subject: [PATCH 3844/3942] ephemeral: 6.4.1 -> 7.0.4

---
 pkgs/applications/networking/browsers/ephemeral/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix
index 550076787788..6d8aa3649a90 100644
--- a/pkgs/applications/networking/browsers/ephemeral/default.nix
+++ b/pkgs/applications/networking/browsers/ephemeral/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ephemeral";
-  version = "6.4.1";
+  version = "7.0.4";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "ephemeral";
     rev = version;
-    sha256 = "1lzcwaczh601kwbx7fzg32nrzlg67asby7p86qy10qz86xf4g608";
+    sha256 = "18chvfdmka21zvjgqfpinm3nrj0ba09szxhhm39anpvpbj92ra8j";
   };
 
   nativeBuildInputs = [

From 34d2819831d356eb4353658fc7e290d2b0c26eec Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 27 Nov 2020 09:58:00 -0500
Subject: [PATCH 3845/3942] ammonite: Fix arguments

---
 pkgs/development/tools/ammonite/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 87a7afde5ebc..20b26437e75f 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -23,7 +23,7 @@ let
         install -Dm755 $src $out/bin/amm
         sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
       '' + optionalString (disableRemoteLogging) ''
-        sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
+        sed -i "0,/ammonite.Main/{s|ammonite.Main'|ammonite.Main' --no-remote-logging|}" $out/bin/amm
         sed -i '1i #!/bin/sh' $out/bin/amm
       '';
 

From 7dc96e90b129a8d1baddcc29651d373adb14b014 Mon Sep 17 00:00:00 2001
From: Christian Mainka <Christian.Mainka@rub.de>
Date: Fri, 27 Nov 2020 16:01:47 +0100
Subject: [PATCH 3846/3942] joplin-desktop: 1.3.18 -> 1.4.15

---
 pkgs/applications/misc/joplin-desktop/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix
index de68e90a4f14..fccf15c0241b 100644
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "joplin-desktop";
-  version = "1.3.18";
+  version = "1.4.15";
   name = "${pname}-${version}";
 
   inherit (stdenv.hostPlatform) system;
@@ -16,8 +16,8 @@ let
   src = fetchurl {
     url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
     sha256 = {
-      x86_64-linux = "1dldy137ia8qxhf7d5xzq5slm12bhnmw4kx7fm37n1ajjdcn5sf7";
-      x86_64-darwin = "0zm9vhxlfs1ldd8za4yha54psqwl0al4hzdfxjfp7ir98i9a4cj7";
+      x86_64-linux = "12wh7f1a9sn250lqnb8c9b5gqr8r76kxrhl0kgsm2lg93jgpvvbb";
+      x86_64-darwin = "1jzfqwyz3vkmmkdzx3iw36fbjq7fns46v8crmg5n09w9kvf22qil";
     }.${system} or throwSystem;
   };
 
@@ -52,9 +52,9 @@ let
     extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
     extraInstallCommands = ''
       mv $out/bin/{${name},${pname}}
-      install -Dm444 ${appimageContents}/joplin.desktop -t $out/share/applications
-      install -Dm444 ${appimageContents}/joplin.png -t $out/share/pixmaps
-      substituteInPlace $out/share/applications/joplin.desktop \
+      install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications
+      install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps
+      substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \
         --replace 'Exec=AppRun' 'Exec=${pname}'
     '';
   };

From f98df98db3bd87254c9e5d25f9ef032356b2a2fb Mon Sep 17 00:00:00 2001
From: msteen <emailmatthijs@gmail.com>
Date: Fri, 27 Nov 2020 16:44:59 +0100
Subject: [PATCH 3847/3942] google-chrome: Remove msteen from the list of
 maintainers (#105152)

---
 .../networking/browsers/google-chrome/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index f2e10f323305..543d59255472 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -150,10 +150,10 @@ in stdenv.mkDerivation {
     description = "A freeware web browser developed by Google";
     homepage = "https://www.google.com/chrome/browser/";
     license = licenses.unfree;
-    maintainers = with maintainers; [ primeos msteen ];
+    maintainers = with maintainers; [ primeos ];
     # Note from primeos: By updating Chromium I also update Google Chrome and
     # will try to merge PRs and respond to issues but I'm not actually using
-    # Google Chrome. msteen is the actual user/maintainer.
+    # Google Chrome.
     platforms = [ "x86_64-linux" ];
   };
 }

From d73a3ecdac582d3ef8beef3d7f61f7370bcc9a49 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 16:06:43 +0000
Subject: [PATCH 3848/3942] gnome3.evolution: 3.38.1 -> 3.38.2

---
 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 2390498ce78d..6bb2e139cba0 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution";
-  version = "3.38.1";
+  version = "3.38.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1z68vhbqnm34axx4zcrds45nz2ppwzr4z1lczxrdiq0zf0cmxyfh";
+    sha256 = "1whjgfhcxpb5yhhvyqb8pv71vprw6fv02czin4k4z6dxrxsq32qx";
   };
 
   nativeBuildInputs = [

From eb7d36720048f6df6f830ab61f143f823b43e073 Mon Sep 17 00:00:00 2001
From: iko <ilyakooo0@gmail.com>
Date: Fri, 27 Nov 2020 20:32:29 +0300
Subject: [PATCH 3849/3942] runLaTeX: rerun at least twice + refactor (#104185)

Building a simple LaTeX document without bibTeX with a table of contents yielded a document with an empty table of contents since LaTeX was only run once
---
 pkgs/tools/typesetting/tex/nix/run-latex.sh | 27 +++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/nix/run-latex.sh b/pkgs/tools/typesetting/tex/nix/run-latex.sh
index 7a5767f9c063..3f8a16580ea5 100644
--- a/pkgs/tools/typesetting/tex/nix/run-latex.sh
+++ b/pkgs/tools/typesetting/tex/nix/run-latex.sh
@@ -41,7 +41,11 @@ showError() {
     exit 1
 }
 
+pass=0
+
 runLaTeX() {
+    ((pass=pass+1))
+    echo "PASS $pass..."
     if ! $latex $latexFlags $rootName >$tmpFile 2>&1; then showError; fi
     runNeeded=
     if fgrep -q \
@@ -51,6 +55,7 @@ runLaTeX() {
         "$tmpFile"; then
         runNeeded=1
     fi
+    echo
 }
 
 echo
@@ -61,10 +66,7 @@ if test -n "$copySources"; then
 fi
 
 
-echo "PASS 1..."
 runLaTeX
-echo
-
 
 for auxFile in $(find . -name "*.aux"); do
     # Run bibtex to process all bibliographies.  There may be several
@@ -89,11 +91,8 @@ for auxFile in $(find . -name "*.aux"); do
     fi
 done
 
-
 if test "$runNeeded"; then
-    echo "PASS 2..."
     runLaTeX
-    echo
 fi
 
 
@@ -105,20 +104,18 @@ if test -f $rootNameBase.idx; then
     makeindex $makeindexFlags $rootNameBase.idx
     runNeeded=1
     echo
-fi    
-
-
-if test "$runNeeded"; then
-    echo "PASS 3..."
-    runLaTeX
-    echo
 fi
 
+# We check that pass is less than 2 to catch situations where the document is
+# simple enough (no bibtex, etc.) so that it would otherwise require only one
+# pass but also contains a ToC.
+# In essence this check ensures that we do at least two passes on all documents.
+if test "$runNeeded" = 1 -o "$pass" -lt 2 ; then
+    runLaTeX
+fi
 
 if test "$runNeeded"; then
-    echo "PASS 4..."
     runLaTeX
-    echo
 fi
 
 

From 77e367e9153d4e7b5cc91d5487e569ad85087404 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 17:38:55 +0000
Subject: [PATCH 3850/3942] datovka: 4.15.5 -> 4.15.6

---
 pkgs/applications/networking/datovka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix
index 2e598b1a7639..22bf982ec4cc 100644
--- a/pkgs/applications/networking/datovka/default.nix
+++ b/pkgs/applications/networking/datovka/default.nix
@@ -11,11 +11,11 @@
 
 mkDerivation rec {
   pname = "datovka";
-  version = "4.15.5";
+  version = "4.15.6";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz";
-    sha256 = "1mnw1m3wjkw8rfh6fwwrhfmkna6j19pza9cs7kyp8qj1fzzqi8my";
+    sha256 = "1qs1yd9qqsf56jm9w6sffkqb2l8s3i9qgi2q8vd59ss19ym6yky2";
   };
 
   buildInputs = [ libisds qmake qtbase qtsvg libxml2 ];

From 09a0f4ca312045fbd1a7962e74e271124ada3054 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 17:46:28 +0000
Subject: [PATCH 3851/3942] discord-ptb: 0.0.22 -> 0.0.23

---
 .../networking/instant-messengers/discord/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index bb37380a6822..9b89634f0b3a 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -17,20 +17,20 @@ in {
     pname = "discord-ptb";
     binaryName = "DiscordPTB";
     desktopName = "Discord PTB";
-    version = "0.0.22";
+    version = "0.0.23";
     src = fetchurl {
       url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-      sha256 = "06qyh8i9d7il6q7q7iaymbbcmdcgrj6rc4z4xik1ay3fr7qy299j";
+      sha256 = "0vxz68vldrbmmw1alpwl7blfcy6byd6zg9m0851dm0p0ldyhsp5j";
     };
   };
   canary = callPackage ./base.nix rec {
     pname = "discord-canary";
     binaryName = "DiscordCanary";
     desktopName = "Discord Canary";
-    version = "0.0.115";
+    version = "0.0.116";
     src = fetchurl {
       url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-      sha256 = "0w9i3plbiiy2kp4yahsdvz0f4wpszsgqdnlgzbnx7wj0xk4qrkcx";
+      sha256 = "14kg85gz91f9mvvnl5p1lwz40rm47bca3a8dwv4618zv6vncgmkp";
     };
   };
 }.${branch}

From df1c8e3f0f01b6b8996b52f62bfd1d01dcbf8855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 27 Nov 2020 10:42:23 +0100
Subject: [PATCH 3852/3942] python3Packages.snowflake-connector-python: Fix
 boto3 replace

---
 .../python-modules/snowflake-connector-python/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index c8f874d4c103..3e958a3076c3 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -57,7 +57,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "'boto3>=1.4.4,<1.15'," "'boto3~=1.15'," \
+      --replace "'boto3>=1.4.4,<1.16'," "'boto3~=1.16'," \
       --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \
       --replace "'idna<2.10'," "'idna'," \
       --replace "'requests<2.24.0'," "'requests',"

From 08c74a2d56261a34d5827ffebd820cff4a0bd733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 27 Nov 2020 10:42:40 +0100
Subject: [PATCH 3853/3942] python3Packages.snowflake-sqlalchemy: Disable
 running tests

---
 .../development/python-modules/snowflake-sqlalchemy/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
index 99c5822f3504..bccca3ee6b67 100644
--- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
@@ -19,6 +19,8 @@ buildPythonPackage rec {
     snowflake-connector-python
   ];
 
+  # Pypi does not include tests
+  doCheck = false;
   pythonImportsCheck = [ "snowflake.sqlalchemy" ];
 
   meta = with lib; {

From d0f04c7c82e3757bfe32940e284ab91bb00cc5b5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 19:05:47 +0000
Subject: [PATCH 3854/3942] frostwire-bin: 6.8.7 -> 6.8.8

---
 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 b9ee526bbe50..364aeac550e6 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.8.7";
+  version = "6.8.8";
   pname = "frostwire";
 
   src = fetchurl {
     url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
-    sha256 = "1m9v4abm8jbyz46hin63vi6irs32n1xzg85bdyb48vpdxh6iwv04";
+    sha256 = "0zxk0nv7m1k4n8n82h1rkh239a58s7j643lgqbw3qx45bdy4sf4k";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c5d585bab57912abe8ecda2860c41c86a1fb809d Mon Sep 17 00:00:00 2001
From: Massimo Redaelli <massimo@typish.io>
Date: Fri, 27 Nov 2020 19:32:36 +0100
Subject: [PATCH 3855/3942] tickrs: init at 0.7.1

---
 pkgs/applications/misc/tickrs/default.nix | 24 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/misc/tickrs/default.nix

diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix
new file mode 100644
index 000000000000..754de71f1ae7
--- /dev/null
+++ b/pkgs/applications/misc/tickrs/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, rustPlatform, fetchFromGitHub, perl }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tickrs";
+  version = "0.7.1";
+
+  src = fetchFromGitHub {
+    owner = "tarkah";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "159smcjrf5193yijfpvy1g9b1gin72xwbjghfyrrphwscwhb215z";
+  };
+
+  cargoSha256 = "1s95b3x7vs1z8xs7j6j80y6mfpy5bdgnzmzn3qa9zr6cghabbf6n";
+
+  nativeBuildInputs = [ perl ];
+
+  meta = with stdenv.lib; {
+    description = "Realtime ticker data in your terminal";
+    homepage = "https://github.com/tarkah/tickrs";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mredaelli ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3431e6bb33c1..f26dd50cc405 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24080,6 +24080,8 @@ in
 
   ticpp = callPackage ../development/libraries/ticpp { };
 
+  tickrs = callPackage ../applications/misc/tickrs { };
+
   tig = gitAndTools.tig;
 
   timbreid = callPackage ../applications/audio/pd-plugins/timbreid {

From de2188fc1cc67e315fe9f2089a8d70595d8c98bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 19:12:23 +0000
Subject: [PATCH 3856/3942] fetchmail: 6.4.13 -> 6.4.14

---
 pkgs/applications/misc/fetchmail/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index 83d4103bc0c1..ce6b7c64693c 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, openssl }:
 
 let
-  version = "6.4.13";
+  version = "6.4.14";
 in
 stdenv.mkDerivation {
   pname = "fetchmail";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
-    sha256 = "1qablzgwx3a516vdhckx3pv716x9r7nyfyr6fbncif861c3cya3x";
+    sha256 = "1jxxb3qyrh7118fwqa3bhirjh97j2w8r71s8vcb6vp3w1wwhfis2";
   };
 
   buildInputs = [ openssl ];

From 944e59be778b81ef3faf1eb3a571c4a3478d825a Mon Sep 17 00:00:00 2001
From: Alexandre Macabies <web+oss@zopieux.com>
Date: Sun, 25 Oct 2020 18:54:00 +0100
Subject: [PATCH 3857/3942] python3Packages.pycmarkgfm: init at v1.0.1

---
 .../python-modules/pycmarkgfm/default.nix     | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/pycmarkgfm/default.nix

diff --git a/pkgs/development/python-modules/pycmarkgfm/default.nix b/pkgs/development/python-modules/pycmarkgfm/default.nix
new file mode 100644
index 000000000000..f1d92a63d401
--- /dev/null
+++ b/pkgs/development/python-modules/pycmarkgfm/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27, cffi, pytest }:
+
+buildPythonPackage rec {
+  pname = "pycmarkgfm";
+  version = "1.0.1";
+  disabled = isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wkbbma214f927ikn3cijxsrzkmm5cqz1x4fimrwx9s2wfphj250";
+  };
+
+  propagatedBuildInputs = [ cffi ];
+
+  # I would gladly use pytestCheckHook, but pycmarkgfm relies on a native
+  # extension (cmark.so, built through setup.py), and pytestCheckHook runs
+  # pytest in an environment that does not contain this extension, which fails.
+  # cmarkgfm has virtually the same build setup as this package, and uses the
+  # same trick: pkgs/development/python-modules/cmarkgfm/default.nix
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/zopieux/pycmarkgfm";
+    description = "Bindings to GitHub's Flavored Markdown (cmark-gfm), with enhanced support for task lists";
+    platforms = platforms.linux ++ platforms.darwin;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ zopieux ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bcbc6a9ba987..f99578dc0ae4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4864,6 +4864,8 @@ in {
 
   pycm = callPackage ../development/python-modules/pycm { };
 
+  pycmarkgfm = callPackage ../development/python-modules/pycmarkgfm { };
+
   pycodestyle = callPackage ../development/python-modules/pycodestyle { };
 
   pycognito = callPackage ../development/python-modules/pycognito { };

From 67d7a671799c0d61a5393f2f1076fcbb0d99b5fb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Nov 2020 22:47:21 +0000
Subject: [PATCH 3858/3942] tilt: 0.17.11 -> 0.17.12

---
 pkgs/applications/networking/cluster/tilt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index ae47545ae4e7..d362500ff598 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,13 +5,13 @@ buildGoModule rec {
   /* Do not use "dev" as a version. If you do, Tilt will consider itself
     running in development environment and try to serve assets from the
     source tree, which is not there once build completes.  */
-  version = "0.17.11";
+  version = "0.17.12";
 
   src = fetchFromGitHub {
     owner  = "tilt-dev";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0ggr8l93xpfm4ljjxw0g6kbm0q64hviaamcb5r2vrx9nabz95n95";
+    sha256 = "0l70nmxvk30h56bs46cgakddzdf3laj1y88d0jchij0yy7ixa61f";
   };
   vendorSha256 = null;
 

From 2b6a4a9fd2b747267da1bef9f9dde5cbaa66a7ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Nov 2020 22:48:58 +0100
Subject: [PATCH 3859/3942] Stackage Nightly 2020-11-23

---
 .../configuration-hackage2nix.yaml            | 105 +++++++++++-------
 1 file changed, 66 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ca49b17ee900..f0d66e28121d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -76,7 +76,7 @@ default-package-overrides:
   # haskell-language-server 0.5.0.0 doesn't accept newer versions
   - fourmolu ==0.2.*
   - refinery ==0.2.*
-  # Stackage Nightly 2020-11-11
+  # Stackage Nightly 2020-11-23
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -91,6 +91,7 @@ default-package-overrides:
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.2.0.0
   - aeson-combinators ==0.0.4.0
+  - aeson-commit ==1.3
   - aeson-compat ==0.3.9
   - aeson-default ==0.9.1.0
   - aeson-diff ==1.1.0.9
@@ -273,7 +274,7 @@ default-package-overrides:
   - avro ==0.5.2.0
   - aws-cloudfront-signed-cookies ==0.2.0.6
   - backtracking ==0.1.0
-  - bank-holidays-england ==0.2.0.5
+  - bank-holidays-england ==0.2.0.6
   - barbies ==2.0.2.0
   - base-compat ==0.11.2
   - base-compat-batteries ==0.11.2
@@ -359,7 +360,7 @@ default-package-overrides:
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.5
-  - brick ==0.57
+  - brick ==0.57.1
   - broadcast-chan ==0.2.1.1
   - bsb-http-chunked ==0.0.0.4
   - bson ==0.4.0.1
@@ -368,10 +369,11 @@ default-package-overrides:
   - buffer-pipe ==0.0
   - bugsnag-hs ==0.2.0.3
   - bugzilla-redhat ==0.3.0
-  - burrito ==1.1.0.2
+  - burrito ==1.2.0.0
   - butcher ==1.3.3.2
   - bv ==0.5
   - bv-little ==1.1.1
+  - byte-count-reader ==0.10.1.2
   - byte-order ==0.1.2.0
   - byteable ==0.1.1
   - bytedump ==1.0
@@ -393,7 +395,7 @@ default-package-overrides:
   - ca-province-codes ==1.0.0.0
   - cabal-debian ==5.1
   - cabal-doctest ==1.0.8
-  - cabal-file ==0.1.0
+  - cabal-file ==0.1.1
   - cabal-flatpak ==0.1.0.2
   - cabal-plan ==0.7.2.0
   - cabal-rpm ==2.0.7
@@ -549,7 +551,7 @@ default-package-overrides:
   - crackNum ==2.4
   - crc32c ==0.0.0
   - credential-store ==0.1.2
-  - criterion ==1.5.7.0
+  - criterion ==1.5.9.0
   - criterion-measurement ==0.1.2.0
   - cron ==0.7.0
   - crypto-api ==0.13.3
@@ -725,7 +727,7 @@ default-package-overrides:
   - elm-bridge ==0.6.1
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
-  - elm2nix ==0.2
+  - elm2nix ==0.2.1
   - elynx ==0.5.0
   - elynx-markov ==0.5.0
   - elynx-nexus ==0.5.0
@@ -787,6 +789,8 @@ default-package-overrides:
   - failable ==1.2.4.0
   - fakedata ==0.8.0
   - fakedata-parser ==0.1.0.0
+  - fakefs ==0.3.0.2
+  - fakepull ==0.3.0.2
   - fast-digits ==0.3.0.0
   - fast-logger ==3.0.2
   - fast-math ==1.0.2
@@ -873,6 +877,7 @@ default-package-overrides:
   - gd ==3000.7.3
   - gdp ==0.0.3.0
   - general-games ==1.1.1
+  - generic-aeson ==0.2.0.11
   - generic-arbitrary ==0.1.0
   - generic-constraints ==1.1.1.1
   - generic-data ==0.9.2.0
@@ -913,10 +918,10 @@ default-package-overrides:
   - geojson ==4.0.2
   - getopt-generics ==0.13.0.4
   - ghc-byteorder ==4.11.0.0.10
-  - ghc-check ==0.5.0.2
+  - ghc-check ==0.5.0.3
   - ghc-core ==0.5.6
-  - ghc-events ==0.13.0
-  - ghc-exactprint ==0.6.3.2
+  - ghc-events ==0.14.0
+  - ghc-exactprint ==0.6.3.3
   - ghc-lib ==8.10.2.20200916
   - ghc-lib-parser ==8.10.2.20200916
   - ghc-lib-parser-ex ==8.10.0.16
@@ -956,7 +961,8 @@ default-package-overrides:
   - ginger ==0.10.1.0
   - gingersnap ==0.3.1.0
   - githash ==0.1.5.0
-  - github-release ==1.3.3
+  - github ==0.26
+  - github-release ==1.3.5
   - github-rest ==1.0.3
   - github-types ==0.2.1
   - github-webhooks ==0.15.0
@@ -992,6 +998,7 @@ default-package-overrides:
   - hackage-security ==0.6.0.1
   - haddock-library ==1.9.0
   - hadoop-streaming ==0.2.0.3
+  - hakyll-convert ==0.3.0.3
   - half ==0.3
   - hall-symbols ==0.1.0.6
   - hamtsolo ==1.0.3
@@ -1044,6 +1051,7 @@ default-package-overrides:
   - hedgehog-fn ==1.0
   - hedgehog-quickcheck ==0.1.1
   - hedis ==0.12.15
+  - hedn ==0.3.0.2
   - here ==1.2.13
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.5.4
@@ -1070,7 +1078,7 @@ default-package-overrides:
   - hlibcpuid ==0.2.0
   - hlibgit2 ==0.18.0.16
   - hlibsass ==0.1.10.1
-  - hmatrix ==0.20.0.0
+  - hmatrix ==0.20.1
   - hmatrix-gsl ==0.19.0.1
   - hmatrix-gsl-stats ==0.4.1.8
   - hmatrix-morpheus ==0.1.1.2
@@ -1215,7 +1223,7 @@ default-package-overrides:
   - hxt-tagsoup ==9.1.4
   - hxt-unicode ==9.0.2.4
   - hybrid-vectors ==0.2.2
-  - hyper ==0.1.0.3
+  - hyper ==0.2.1.0
   - hyperloglog ==0.4.3
   - hyphenation ==0.8
   - iconv ==0.4.1.3
@@ -1272,7 +1280,7 @@ default-package-overrides:
   - io-streams ==1.5.2.0
   - io-streams-haproxy ==1.0.1.0
   - ip6addr ==1.0.1
-  - iproute ==1.7.9
+  - iproute ==1.7.10
   - IPv6Addr ==1.1.5
   - ipynb ==0.1.0.1
   - ipython-kernel ==0.10.2.1
@@ -1280,7 +1288,7 @@ default-package-overrides:
   - irc-client ==1.1.2.0
   - irc-conduit ==0.3.0.4
   - irc-ctcp ==0.1.3.0
-  - isbn ==1.1.0.1
+  - isbn ==1.1.0.2
   - islink ==0.1.0.0
   - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
@@ -1293,9 +1301,11 @@ default-package-overrides:
   - ixset-typed-conversions ==0.1.2.0
   - ixset-typed-hashable-instance ==0.1.0.2
   - jack ==0.7.1.4
+  - jalaali ==1.0.0.0
   - jira-wiki-markup ==1.3.2
   - jose ==0.8.4
   - jose-jwt ==0.8.0
+  - js-chart ==2.9.4.1
   - js-dgtable ==0.5.2
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
@@ -1433,9 +1443,9 @@ default-package-overrides:
   - markdown ==0.1.17.4
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
-  - massiv ==0.5.5.0
+  - massiv ==0.5.6.0
   - massiv-io ==0.4.0.0
-  - massiv-test ==0.1.4
+  - massiv-test ==0.1.5
   - math-extras ==0.1.1.0
   - math-functions ==0.3.4.1
   - mathexpr ==0.3.0.0
@@ -1472,7 +1482,7 @@ default-package-overrides:
   - microlens-mtl ==0.2.0.1
   - microlens-platform ==0.4.1
   - microlens-process ==0.2.0.2
-  - microlens-th ==0.4.3.6
+  - microlens-th ==0.4.3.8
   - microspec ==0.2.1.3
   - microstache ==1.0.1.1
   - midair ==0.2.0.1
@@ -1519,6 +1529,7 @@ default-package-overrides:
   - monad-par-extras ==0.3.3
   - monad-parallel ==0.7.2.3
   - monad-peel ==0.2.1.2
+  - monad-primitive ==0.1
   - monad-products ==4.0.1
   - monad-resumption ==0.1.4.0
   - monad-skeleton ==0.1.5
@@ -1542,6 +1553,7 @@ default-package-overrides:
   - morpheus-graphql-client ==0.16.0
   - morpheus-graphql-core ==0.16.0
   - morpheus-graphql-subscriptions ==0.16.0
+  - moss ==0.2.0.0
   - mountpoints ==1.0.2
   - mpi-hs ==0.7.2.0
   - mpi-hs-binary ==0.1.1.0
@@ -1561,6 +1573,7 @@ default-package-overrides:
   - mutable-containers ==0.3.4
   - mwc-probability ==2.3.1
   - mwc-random ==0.14.0.0
+  - mwc-random-monad ==0.7.3.1
   - mx-state-codes ==1.0.0.0
   - mysql ==0.1.7.2
   - mysql-simple ==0.4.5
@@ -1609,7 +1622,7 @@ default-package-overrides:
   - nonce ==1.0.7
   - nondeterminism ==1.4
   - nonempty-containers ==0.3.4.1
-  - nonempty-vector ==0.2.0.2
+  - nonempty-vector ==0.2.1.0
   - nonemptymap ==0.0.6.0
   - not-gloss ==0.7.7.0
   - nowdoc ==0.1.1.0
@@ -1669,7 +1682,7 @@ default-package-overrides:
   - optparse-simple ==0.1.1.3
   - optparse-text ==0.1.1.0
   - ordered-containers ==0.2.2
-  - ormolu ==0.1.3.1
+  - ormolu ==0.1.4.1
   - overhang ==1.0.0
   - packcheck ==0.5.1
   - packdeps ==0.6.0.0
@@ -1677,9 +1690,10 @@ default-package-overrides:
   - pagination ==0.2.1
   - pagure-cli ==0.2
   - pandoc-types ==1.22
-  - pantry ==0.5.1.3
+  - pantry ==0.5.1.4
   - parallel ==3.2.2.0
   - parallel-io ==0.3.3
+  - parameterized ==0.5.0.0
   - paripari ==0.7.0.0
   - parseargs ==0.2.0.9
   - parsec-class ==1.0.0.0
@@ -1706,7 +1720,7 @@ default-package-overrides:
   - pathwalk ==0.3.1.2
   - pattern-arrows ==0.0.2
   - pava ==0.1.0.0
-  - pcg-random ==0.1.3.6
+  - pcg-random ==0.1.3.7
   - pcre-heavy ==1.0.0.2
   - pcre-light ==0.4.1.0
   - pcre-utils ==0.1.8.1.1
@@ -1774,7 +1788,7 @@ default-package-overrides:
   - postgresql-libpq ==0.9.4.3
   - postgresql-libpq-notify ==0.2.0.0
   - postgresql-orm ==0.5.1
-  - postgresql-simple ==0.6.2
+  - postgresql-simple ==0.6.3
   - postgresql-typed ==0.6.1.2
   - postgrest ==7.0.1
   - pptable ==0.3.0.0
@@ -1801,7 +1815,9 @@ default-package-overrides:
   - primes ==0.2.1.0
   - primitive ==0.7.1.0
   - primitive-addr ==0.1.0.2
+  - primitive-extras ==0.8
   - primitive-unaligned ==0.1.1.1
+  - primitive-unlifted ==0.1.3.0
   - print-console-colors ==0.1.0.0
   - probability ==0.2.7
   - process-extras ==0.7.4
@@ -1879,7 +1895,7 @@ default-package-overrides:
   - range-set-list ==0.1.3.1
   - Ranged-sets ==0.4.0
   - rank1dynamic ==0.4.1
-  - rank2classes ==1.4.0.1
+  - rank2classes ==1.4.1
   - Rasterific ==0.7.5.3
   - rasterific-svg ==0.3.3.2
   - rate-limit ==1.4.2
@@ -2028,20 +2044,22 @@ default-package-overrides:
   - sequenceTools ==1.4.0.5
   - serf ==0.1.1.0
   - serialise ==0.2.3.0
-  - servant ==0.18.1
+  - servant ==0.18.2
   - servant-blaze ==0.9.1
-  - servant-client ==0.18.1
-  - servant-client-core ==0.18.1
+  - servant-client ==0.18.2
+  - servant-client-core ==0.18.2
   - servant-conduit ==0.15.1
-  - servant-docs ==0.11.7
-  - servant-foreign ==0.15.2
-  - servant-http-streams ==0.18.1
+  - servant-docs ==0.11.8
+  - servant-errors ==0.1.6.0
+  - servant-foreign ==0.15.3
+  - servant-github-webhook ==0.4.2.0
+  - servant-http-streams ==0.18.2
   - servant-machines ==0.15.1
   - servant-multipart ==0.12
   - servant-openapi3 ==2.0.1.0
   - servant-pipes ==0.15.2
   - servant-rawm ==1.0.0.0
-  - servant-server ==0.18.1
+  - servant-server ==0.18.2
   - servant-swagger ==1.1.10
   - servant-swagger-ui ==0.3.4.3.36.1
   - servant-swagger-ui-core ==0.3.3
@@ -2151,8 +2169,11 @@ default-package-overrides:
   - step-function ==0.2
   - stm-chans ==3.0.0.4
   - stm-conduit ==4.0.1
+  - stm-containers ==1.2
   - stm-delay ==0.1.1.1
   - stm-extras ==0.1.0.3
+  - stm-hamt ==1.2.0.4
+  - stm-lifted ==2.5.0.0
   - stm-split ==0.0.2.1
   - STMonadTrans ==0.4.4
   - stopwatch ==0.1.0.6
@@ -2173,7 +2194,7 @@ default-package-overrides:
   - strict ==0.4
   - strict-concurrency ==0.2.4.3
   - strict-list ==0.1.5
-  - strict-tuple ==0.1.3
+  - strict-tuple ==0.1.4
   - strict-tuple-lens ==0.1.0.1
   - string-class ==0.1.7.0
   - string-combinators ==0.6.0.5
@@ -2233,7 +2254,7 @@ default-package-overrides:
   - tasty-expected-failure ==0.11.1.2
   - tasty-golden ==2.3.3.2
   - tasty-hedgehog ==1.0.0.2
-  - tasty-hspec ==1.1.5.1
+  - tasty-hspec ==1.1.6
   - tasty-hunit ==0.10.0.2
   - tasty-kat ==0.0.3
   - tasty-leancheck ==0.0.1
@@ -2282,7 +2303,7 @@ default-package-overrides:
   - text-regex-replace ==0.1.1.3
   - text-region ==0.3.1.0
   - text-short ==0.1.3
-  - text-show ==3.8.5
+  - text-show ==3.9
   - text-show-instances ==3.8.4
   - text-zipper ==0.10.1
   - textlocal ==0.1.0.5
@@ -2298,7 +2319,7 @@ default-package-overrides:
   - th-expand-syns ==0.4.6.0
   - th-extras ==0.0.0.4
   - th-lift ==0.8.2
-  - th-lift-instances ==0.1.17
+  - th-lift-instances ==0.1.18
   - th-nowq ==0.1.0.5
   - th-orphans ==0.13.11
   - th-printf ==0.7
@@ -2332,7 +2353,7 @@ default-package-overrides:
   - timeit ==2.0
   - timelens ==0.2.0.2
   - timer-wheel ==0.3.0
-  - timerep ==2.0.0.2
+  - timerep ==2.0.1.0
   - timezone-olson ==0.2.0
   - timezone-series ==0.1.9
   - tinylog ==0.15.0
@@ -2350,7 +2371,8 @@ default-package-overrides:
   - topograph ==1.0.0.1
   - torsor ==0.1
   - tostring ==0.2.1.1
-  - tracing ==0.0.5.1
+  - tracing ==0.0.5.2
+  - tracing-control ==0.0.6
   - transaction ==0.1.1.3
   - transformers-base ==0.4.5.2
   - transformers-bifunctors ==0.1
@@ -2381,6 +2403,7 @@ default-package-overrides:
   - type-map ==0.1.6.0
   - type-natural ==0.9.0.0
   - type-of-html ==1.6.1.2
+  - type-of-html-static ==0.1.0.2
   - type-operators ==0.2.0.0
   - type-spec ==0.4.0.0
   - TypeCompose ==0.9.14
@@ -2496,6 +2519,8 @@ default-package-overrides:
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-clacks ==0.1.0.1
   - wai-middleware-static ==0.9.0
+  - wai-rate-limit ==0.1.0.0
+  - wai-rate-limit-redis ==0.1.0.0
   - wai-saml2 ==0.2.1.2
   - wai-session ==0.3.3
   - wai-slack-middleware ==0.2.0
@@ -2521,6 +2546,7 @@ default-package-overrides:
   - Win32 ==2.6.1.0
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
+  - witch ==0.0.0.3
   - with-location ==0.1.0
   - with-utf8 ==1.0.2.1
   - witherable-class ==0
@@ -2581,7 +2607,7 @@ default-package-overrides:
   - yesod-auth ==1.6.10.1
   - yesod-auth-hashdb ==1.7.1.5
   - yesod-bin ==1.6.0.6
-  - yesod-core ==1.6.18.6
+  - yesod-core ==1.6.18.7
   - yesod-fb ==0.6.1
   - yesod-form ==1.6.7
   - yesod-gitrev ==0.2.1
@@ -2602,7 +2628,7 @@ default-package-overrides:
   - zeromq4-haskell ==0.8.0
   - zeromq4-patterns ==0.3.1.0
   - zim-parser ==0.2.1.0
-  - zio ==0.1.0.0
+  - zio ==0.1.0.2
   - zip ==1.6.0
   - zip-archive ==0.4.1
   - zip-stream ==0.2.0.1
@@ -2614,6 +2640,7 @@ default-package-overrides:
   - zot ==0.0.3
   - zstd ==0.1.2.0
   - ztail ==1.2.0.2
+  - zydiskell ==0.2.0.0
 
 extra-packages:
   - Cabal == 2.2.*                      # required for jailbreak-cabal etc.

From 88593d9c707a0a8188d1caf8d1e8f21d34c01ba9 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sat, 21 Nov 2020 20:47:18 +0100
Subject: [PATCH 3860/3942] haskellPackages.pcg-random: Activate tests

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index aa1d0be1bb3b..1854024ca592 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1483,10 +1483,6 @@ self: super: {
   # Due to tests restricting base in 0.8.0.0 release
   http-media = doJailbreak super.http-media;
 
-  # 2020-11-19: Disabling tests with this issue: https://github.com/cchalmers/pcg-random/issues/10
-  # Issue has been fixed in 0.1.3.7, we can enable tests again, once stackage bumps the version
-  pcg-random = assert super.pcg-random.version == "0.1.3.6"; dontCheck super.pcg-random;
-
   # Use an already merged upstream patch fixing the build with primitive >= 0.7.2
   # The version bounds were correctly specified before, so we need to jailbreak as well
   streamly = appendPatch (doJailbreak super.streamly) (pkgs.fetchpatch {

From 37e26436b69dd006ee4ebbc52659a064cb014f17 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 22 Nov 2020 01:23:10 +0100
Subject: [PATCH 3861/3942] haskellPackages: Fix a round of eval errors

---
 .../configuration-hackage2nix.yaml            | 21 ++++++++++
 .../haskell-modules/hackage-packages.nix      | 42 +++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f0d66e28121d..5c9111261459 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8032,6 +8032,7 @@ broken-packages:
   - mu-protobuf
   - mu-rpc
   - mu-schema
+  - mu-servant-server
   - mu-tracing
   - MuCheck
   - MuCheck-Hspec
@@ -9150,6 +9151,7 @@ broken-packages:
   - rclient
   - rdioh
   - react-flux
+  - react-flux-servant
   - react-haskell
   - react-tutorial-haskell-server
   - reaction-logic
@@ -9359,6 +9361,7 @@ broken-packages:
   - rfc-prelude
   - rfc-psql
   - rfc-redis
+  - rfc-servant
   - rg
   - rhythm-game-tutorial
   - rib
@@ -9623,6 +9626,23 @@ broken-packages:
   - serpentine
   - serv
   - serv-wai
+  - servant-auth-cookie
+  - servant-auth-token
+  - servant-auth-token-acid
+  - servant-auth-token-api
+  - servant-auth-token-leveldb
+  - servant-auth-token-persistent
+  - servant-auth-token-rocksdb
+  - servant-cli
+  - servant-csharp
+  - servant-db-postgresql
+  - servant-examples
+  - servant-iCalendar
+  - servant-jquery
+  - servant-js
+  - servant-openapi3
+  - servant-snap
+  - servant-waargonaut
   - server-generic
   - serversession-backend-acid-state
   - serversession-backend-persistent
@@ -10893,6 +10913,7 @@ broken-packages:
   - verilog
   - verismith
   - versioning
+  - versioning-servant
   - vflow-types
   - vfr-waypoints
   - vgrep
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a1fcd89803a9..2fb34b3f788c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -176275,6 +176275,8 @@ self: {
        ];
        description = "Servant servers for Mu definitions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-tracing" = callPackage
@@ -211476,6 +211478,8 @@ self: {
        libraryHaskellDepends = [ aeson base react-flux servant text ];
        description = "Allow react-flux stores to send requests to a servant server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "react-haskell" = callPackage
@@ -217587,6 +217591,8 @@ self: {
        ];
        description = "The Servant extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc1413-server" = callPackage
@@ -225539,6 +225545,8 @@ self: {
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-docs" = callPackage
@@ -225665,6 +225673,8 @@ self: {
        ];
        description = "Servant based API and server for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-acid" = callPackage
@@ -225686,6 +225696,8 @@ self: {
        ];
        description = "Acid-state backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-api" = callPackage
@@ -225702,6 +225714,8 @@ self: {
        ];
        description = "Servant based API for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-leveldb" = callPackage
@@ -225723,6 +225737,8 @@ self: {
        ];
        description = "Leveldb backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-persistent" = callPackage
@@ -225742,6 +225758,8 @@ self: {
        ];
        description = "Persistent backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-rocksdb" = callPackage
@@ -225764,6 +225782,8 @@ self: {
        ];
        description = "RocksDB backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-wordpress" = callPackage
@@ -225903,6 +225923,8 @@ self: {
        ];
        description = "Command line interface for Servant API clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-client" = callPackage
@@ -226037,6 +226059,8 @@ self: {
        ];
        description = "Generate servant client library for C#";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-db" = callPackage
@@ -226073,6 +226097,8 @@ self: {
        ];
        description = "Derive a postgres client to database API specified by servant-db";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-dhall" = callPackage
@@ -226260,6 +226286,8 @@ self: {
        ];
        description = "Example programs for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-exceptions" = callPackage
@@ -226523,6 +226551,8 @@ self: {
        ];
        description = "Servant support for iCalendar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-jquery" = callPackage
@@ -226541,6 +226571,8 @@ self: {
        ];
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-js" = callPackage
@@ -226564,6 +226596,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Automatically derive javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-jsonrpc" = callPackage
@@ -226837,6 +226871,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-options" = callPackage
@@ -227363,6 +227399,8 @@ self: {
        ];
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-stache" = callPackage
@@ -227711,6 +227749,8 @@ self: {
        ];
        description = "Servant Integration for Waargonaut JSON Package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-wasm" = callPackage
@@ -267412,6 +267452,8 @@ self: {
        ];
        description = "Servant combinators for the versioning library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "versions" = callPackage

From 07ae57e2b1ccb9db63dbfe1944602e10b23f1acf Mon Sep 17 00:00:00 2001
From: Arseniy Chekanov <senya@chekanov.net>
Date: Sat, 21 Nov 2020 19:48:25 +0300
Subject: [PATCH 3862/3942] haskellPackages.tart: unmark as broken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5c9111261459..08ca097d548a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -10306,7 +10306,6 @@ broken-packages:
   - Tape
   - tapioca
   - target
-  - tart
   - task
   - task-distribution
   - taskell

From 6c5f5cdb0fe53280adc41a9522b32634acef688f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 22 Nov 2020 07:23:39 +1000
Subject: [PATCH 3863/3942] Revert "haskellPackages.trifecta: dontCheck on
 darwin"

This reverts commit 10e961cdf942fb181bdb0bec8edbf0c6a95c17c1.

Fixed by 473b341fb1aa01c23eb0ed942a03463cf029e21b.
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1854024ca592..3ed5eac616f6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -394,9 +394,7 @@ self: super: {
   tickle = dontCheck super.tickle;
   tpdb = dontCheck super.tpdb;
   translatable-intset = dontCheck super.translatable-intset;
-  # Aarch64 affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461
-  # Darwin https://hydra.nixos.org/build/129070963/nixlog/1
-  trifecta = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.isDarwin) then dontCheck super.trifecta else super.trifecta;
+  trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461
   ua-parser = dontCheck super.ua-parser;
   unagi-chan = dontCheck super.unagi-chan;
   wai-logger = dontCheck super.wai-logger;

From 8bf26dad96c1d9906b334f9314c7a31013e38153 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 22 Nov 2020 14:31:47 +0100
Subject: [PATCH 3864/3942] haskellPackages.update-nix-fetchgit: Remove eval
 error

---
 .../haskell-modules/configuration-common.nix          | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3ed5eac616f6..878240229bac 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -85,11 +85,6 @@ self: super: {
     url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff";
     sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql";
   });
-  optparse-applicative_0_16_0_0 = appendPatch super.optparse-applicative_0_16_0_0 (pkgs.fetchpatch {
-    name = "optparse-applicative-0.15.1-hercules-ci-compgen.diff";
-    url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff";
-    sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql";
-  });
 
   # Fix test trying to access /home directory
   shell-conduit = overrideCabal super.shell-conduit (drv: {
@@ -1378,7 +1373,7 @@ self: super: {
   in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal
     (addTestToolDepends (super.update-nix-fetchgit.overrideScope (self: super: {
       optparse-generic = self.optparse-generic_1_4_4;
-      optparse-applicative = self.optparse-applicative_0_16_0_0;
+      optparse-applicative = self.optparse-applicative_0_16_1_0;
     })) deps) (drv: {
       buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ];
       postInstall = drv.postInstall or "" + ''
@@ -1388,10 +1383,6 @@ self: super: {
       '';
     }));
 
-  optparse-generic_1_4_4 = super.optparse-generic_1_4_4.override {
-    optparse-applicative = self.optparse-applicative_0_16_0_0;
-  };
-
   # Our quickcheck-instances is too old for the newer binary-instances, but
   # quickcheck-instances is only used in the tests of binary-instances.
   binary-instances = dontCheck super.binary-instances;

From 79e9ab2828eacba50ea524c4d9bd8fcbef765f83 Mon Sep 17 00:00:00 2001
From: Siva Mahadevan <me@svmhdvn.name>
Date: Mon, 23 Nov 2020 23:07:24 -0500
Subject: [PATCH 3865/3942] haskellPackages.pipes-text: unbreak

---
 pkgs/development/haskell-modules/configuration-common.nix      | 3 +++
 .../development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 878240229bac..b560deacb8c4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1502,4 +1502,7 @@ self: super: {
     excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ];
   });
 
+  # 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29
+  pipes-text = doJailbreak super.pipes-text;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 08ca097d548a..e9b0aeaf760c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8703,7 +8703,6 @@ broken-packages:
   - pipes-s3
   - pipes-shell
   - pipes-sqlite-simple
-  - pipes-text
   - pipes-transduce
   - pipes-vector
   - pipes-zeromq4

From b8896bc35dbb9218b404edb0223dfa7858decda5 Mon Sep 17 00:00:00 2001
From: Siva Mahadevan <me@svmhdvn.name>
Date: Tue, 24 Nov 2020 22:51:57 -0500
Subject: [PATCH 3866/3942] haskellPackages.blas-hs: unbreak

---
 pkgs/development/haskell-modules/configuration-common.nix      | 3 +++
 .../development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b560deacb8c4..23bcfb79b32c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1505,4 +1505,7 @@ self: super: {
   # 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29
   pipes-text = doJailbreak super.pipes-text;
 
+  # 2020-11-23: https://github.com/Rufflewind/blas-hs/issues/8
+  blas-hs = dontCheck super.blas-hs;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e9b0aeaf760c..de9249f3e06d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3545,7 +3545,6 @@ broken-packages:
   - blakesum
   - blakesum-demo
   - blas
-  - blas-hs
   - BlastHTTP
   - blastxml
   - blatex

From 9c3d2dda0125a140a4f1f070e73484cbdead028b Mon Sep 17 00:00:00 2001
From: Siva Mahadevan <me@svmhdvn.name>
Date: Tue, 24 Nov 2020 22:52:15 -0500
Subject: [PATCH 3867/3942] haskellPackages.fmt: unbreak

---
 pkgs/development/haskell-modules/configuration-common.nix      | 3 +++
 .../development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 23bcfb79b32c..63b7d9c79ade 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1508,4 +1508,7 @@ self: super: {
   # 2020-11-23: https://github.com/Rufflewind/blas-hs/issues/8
   blas-hs = dontCheck super.blas-hs;
 
+  # 2020-11-23: https://github.com/cdornan/fmt/issues/30
+  fmt = dontCheck super.fmt;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index de9249f3e06d..92e8fa316ccd 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5170,7 +5170,6 @@ broken-packages:
   - FM-SBLEX
   - fmark
   - FModExRaw
-  - fmt
   - fmt-for-rio
   - fmt-terminal-colors
   - fn-extra

From 0197ed239b26d844b75fa201c562630945af759d Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Tue, 24 Nov 2020 12:36:00 +0000
Subject: [PATCH 3868/3942] haskellPackages.irc-core: unbreak

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 92e8fa316ccd..82963663a891 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2694,6 +2694,7 @@ package-maintainers:
     # - pipes-mongodb
     - streaming-wai
   kiwi:
+    - irc-core
     - Unique
   psibi:
     - path-pieces
@@ -6994,7 +6995,6 @@ broken-packages:
   - iptadmin
   - IPv6DB
   - Irc
-  - irc-core
   - irc-dcc
   - irc-fun-bot
   - irc-fun-client

From 9d4ce7a57bbb53b2524bd1c32a44c346b099ed4b Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Tue, 24 Nov 2020 12:41:33 +0000
Subject: [PATCH 3869/3942] haskellPackages.random_1_2_0: unbreak

---
 pkgs/development/haskell-modules/configuration-common.nix       | 1 +
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 63b7d9c79ade..6ab43b67e414 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -399,6 +399,7 @@ self: super: {
   xsd = dontCheck super.xsd;
   zip-archive = dontCheck super.zip-archive;  # https://github.com/jgm/zip-archive/issues/57
 
+  random_1_2_0 = super.random_1_2_0.override ({ splitmix = self.splitmix_0_1_0_3; });
   # These test suites run for ages, even on a fast machine. This is nuts.
   Random123 = dontCheck super.Random123;
   systemd = dontCheck super.systemd;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 82963663a891..000c7cf90c16 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2695,6 +2695,7 @@ package-maintainers:
     - streaming-wai
   kiwi:
     - irc-core
+    - random_1_2_0
     - Unique
   psibi:
     - path-pieces

From 37d9f941e743372d5a7e70173b4c1dd5e63990e1 Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Tue, 24 Nov 2020 12:49:22 +0000
Subject: [PATCH 3870/3942] haskellPackages.QuickCheck_2_14_2: unbreak

---
 pkgs/development/haskell-modules/configuration-common.nix      | 3 +++
 .../development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6ab43b67e414..cda3504f04eb 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -366,6 +366,9 @@ self: super: {
   punycode = dontCheck super.punycode;
   pwstore-cli = dontCheck super.pwstore-cli;
   quantities = dontCheck super.quantities;
+  QuickCheck_2_14_2 = super.QuickCheck_2_14_2.override( {
+    splitmix = self.splitmix_0_1_0_3;
+  });
   redis-io = dontCheck super.redis-io;
   rethinkdb = dontCheck super.rethinkdb;
   Rlang-QQ = dontCheck super.Rlang-QQ;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 000c7cf90c16..a6a064b4675b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2695,6 +2695,7 @@ package-maintainers:
     - streaming-wai
   kiwi:
     - irc-core
+    - QuickCheck_2_14_2
     - random_1_2_0
     - Unique
   psibi:

From 29416adfe89da883b667f602d735ee28975e4efd Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Tue, 24 Nov 2020 12:56:04 +0000
Subject: [PATCH 3871/3942] haskellPackages.config-value: unbreak

haskellPackages.config-schema: unbreak
---
 .../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 a6a064b4675b..a53ceb4e12db 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2694,6 +2694,8 @@ package-maintainers:
     # - pipes-mongodb
     - streaming-wai
   kiwi:
+    - config-schema
+    - config-value
     - irc-core
     - QuickCheck_2_14_2
     - random_1_2_0
@@ -4142,9 +4144,7 @@ broken-packages:
   - conffmt
   - confide
   - config-parser
-  - config-schema
   - config-select
-  - config-value
   - config-value-getopt
   - ConfigFileTH
   - Configger

From 30c00260776e2c0aaf7565469939d08debe0ed2d Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Tue, 24 Nov 2020 13:10:43 +0000
Subject: [PATCH 3872/3942] haskellPackages.glirc: unbreak

---
 pkgs/development/haskell-modules/configuration-common.nix      | 3 +++
 .../development/haskell-modules/configuration-hackage2nix.yaml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cda3504f04eb..885ea2dde701 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -295,6 +295,9 @@ self: super: {
   github-rest = dontCheck super.github-rest;  # test suite needs the network
   gitlib-cmdline = dontCheck super.gitlib-cmdline;
   GLFW-b = dontCheck super.GLFW-b;                      # https://github.com/bsl/GLFW-b/issues/50
+  #next release supports random 1.1; jailbroken because i didn't know about vty when glguy was updating the bounds
+  #should be fixed soon. maybe even before this is merged. currently glirc is 2.37
+  glirc = doJailbreak (super.glirc.override { random = self.random_1_2_0; });
   hackport = dontCheck super.hackport;
   hadoop-formats = dontCheck super.hadoop-formats;
   haeredes = dontCheck super.haeredes;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index a53ceb4e12db..479dfb1374d7 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2696,6 +2696,7 @@ package-maintainers:
   kiwi:
     - config-schema
     - config-value
+    - glirc
     - irc-core
     - QuickCheck_2_14_2
     - random_1_2_0
@@ -5533,7 +5534,6 @@ broken-packages:
   - gli
   - glicko
   - glider-nlp
-  - glirc
   - GLMatrix
   - glob-posix
   - global

From 6d32709b2497316ad44bce185fc01828ac48babf Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Tue, 24 Nov 2020 13:17:26 +0000
Subject: [PATCH 3873/3942] haskellPackages.matterhorn: unbreak

haskellPackages.mattermost-api: unbreak
haskellPackages.mattermost-api-qc: unbreak
---
 pkgs/development/haskell-modules/configuration-common.nix   | 3 ++-
 .../haskell-modules/configuration-hackage2nix.yaml          | 6 +++---
 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 885ea2dde701..44af72af1cf7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -338,7 +338,8 @@ self: super: {
     then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63
     else super.math-functions;
   matplotlib = dontCheck super.matplotlib;
-
+  # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
+  matterhorn = doJailbreak super.matterhorn; # this is needed until the end of time :')
   memcache = dontCheck super.memcache;
   metrics = dontCheck super.metrics;
   milena = dontCheck super.milena;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 479dfb1374d7..b34826bf309b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2698,6 +2698,9 @@ package-maintainers:
     - config-value
     - glirc
     - irc-core
+    - matterhorn
+    - mattermost-api
+    - mattermost-api-qc
     - QuickCheck_2_14_2
     - random_1_2_0
     - Unique
@@ -7739,9 +7742,6 @@ broken-packages:
   - matrix-market
   - matrix-sized
   - matsuri
-  - matterhorn
-  - mattermost-api
-  - mattermost-api-qc
   - maude
   - maxent
   - maxent-learner-hw

From 69c69dfe9ad0d7553f7b2726044adc1f6899d854 Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Fri, 27 Nov 2020 10:28:20 +0900
Subject: [PATCH 3874/3942] haskellPackages: remove QuickCheck_2_14_2 and
 random_1_2_0 from kiwi maintainer

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b34826bf309b..a2df3f84670a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2701,8 +2701,6 @@ package-maintainers:
     - matterhorn
     - mattermost-api
     - mattermost-api-qc
-    - QuickCheck_2_14_2
-    - random_1_2_0
     - Unique
   psibi:
     - path-pieces

From 2cc48d915f708e022b9d8b830b0c4335a1faf8d7 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 27 Nov 2020 12:45:26 +0100
Subject: [PATCH 3875/3942] haskellPackages.servant-swagger: dontCheck
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tests did not compile.
Message:

test/Servant/SwaggerSpec.hs:44:14: error:
    • No instance for (HasSwagger
                         (Fragment Int :> Servant.Test.ComprehensiveAPI.GET))
        arising from a use of ‘toSwagger’
    • In the expression: toSwagger comprehensiveAPI
      In an equation for ‘_x’: _x = toSwagger comprehensiveAPI
      In the second argument of ‘($)’, namely
        ‘do let _x = toSwagger comprehensiveAPI
            True `shouldBe` True’
   |
44 |     let _x = toSwagger comprehensiveAPI
   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^
---
 pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 5080472666b4..0bea1287392e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -73,6 +73,9 @@ self: super: {
   shellmet = doJailbreak super.shellmet;
   shower = doJailbreak super.shower;
 
+  # Broken test compile
+  servant-swagger = dontCheck super.servant-swagger;
+
   # The shipped Setup.hs file is broken.
   csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; });
 

From 5598ed7480c0ac863536e12ae886dd3d322e3ea3 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 27 Nov 2020 13:19:31 +0100
Subject: [PATCH 3876/3942] haskellPackages.hercules-ci-agent: Update Cabal for
 Setup

---
 pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 0bea1287392e..3c628a7a453a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -96,4 +96,7 @@ self: super: {
   # Break out of "Cabal < 3.2" constraint.
   stylish-haskell = doJailbreak super.stylish-haskell;
 
+  # cxx-options is broken in Cabal 3.2.0.0
+  hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
+
 }

From f1f8539583051c5bb90121344041d978c9bf98da Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 27 Nov 2020 13:20:11 +0100
Subject: [PATCH 3877/3942] haskellPackages.hercules-ci-agent: Configure
 unbroken

---
 .../haskell-modules/configuration-hackage2nix.yaml          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index a2df3f84670a..da45b4124bfa 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2712,6 +2712,9 @@ package-maintainers:
     - Agda
   roberth:
     - arion-compose
+    - hercules-ci-agent
+    - hercules-ci-api-agent
+    - hercules-ci-api-core
   cdepillabout:
     - pretty-simple
     - spago
@@ -6208,9 +6211,6 @@ broken-packages:
   - HERA
   - herbalizer
   - HerbiePlugin
-  - hercules-ci-agent
-  - hercules-ci-api-agent
-  - hercules-ci-api-core
   - heredocs
   - Hermes
   - hermit

From 505d721c3c8fc8768db5ab0de11d980536593737 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 27 Nov 2020 17:32:13 +0100
Subject: [PATCH 3878/3942] haskellPackages: Move some overrides and update
 affected derivations

This is a follow-up to
https://github.com/NixOS/nixpkgs/pull/105140
---
 .../haskell-modules/configuration-common.nix        |  8 ++++++++
 .../haskell-modules/configuration-ghc-8.10.x.nix    |  7 -------
 .../haskell-modules/hackage-packages.nix            | 13 +++++--------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 44af72af1cf7..4d37668fd017 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1519,4 +1519,12 @@ self: super: {
   # 2020-11-23: https://github.com/cdornan/fmt/issues/30
   fmt = dontCheck super.fmt;
 
+
+  # 2020-11-27: Tests broken
+  # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
+  servant-swagger = dontCheck super.servant-swagger;
+
+  # 2020-11-27: cxx-options is broken in Cabal 3.2.0.0
+  hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 3c628a7a453a..60d3f4232464 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -73,9 +73,6 @@ self: super: {
   shellmet = doJailbreak super.shellmet;
   shower = doJailbreak super.shower;
 
-  # Broken test compile
-  servant-swagger = dontCheck super.servant-swagger;
-
   # The shipped Setup.hs file is broken.
   csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; });
 
@@ -95,8 +92,4 @@ self: super: {
 
   # Break out of "Cabal < 3.2" constraint.
   stylish-haskell = doJailbreak super.stylish-haskell;
-
-  # cxx-options is broken in Cabal 3.2.0.0
-  hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
-
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2fb34b3f788c..b3fc865fa8fd 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -123186,8 +123186,8 @@ self: {
      }:
      mkDerivation {
        pname = "hercules-ci-agent";
-       version = "0.7.4";
-       sha256 = "0yj9njd168xpj4har99mbb9rr5dqsbnzqs1061s3czrzlp229z3l";
+       version = "0.7.5";
+       sha256 = "0v3wyz8fm3n6rwanjgfxws6f18kp3qmgwx5g4f0xy00mxjzswjrq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123225,8 +123225,7 @@ self: {
        doHaddock = false;
        description = "Runs Continuous Integration tasks on your machines";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ roberth ];
      }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;};
 
   "hercules-ci-api-agent" = callPackage
@@ -123257,8 +123256,7 @@ self: {
        ];
        description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ roberth ];
      }) {};
 
   "hercules-ci-api-core" = callPackage
@@ -123281,8 +123279,7 @@ self: {
        ];
        description = "Types and convenience modules use across Hercules CI API packages";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ roberth ];
      }) {};
 
   "here" = callPackage

From 87ad0a0674227dc9aee689770d1c88b193c4d666 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Fri, 27 Nov 2020 21:01:32 +0100
Subject: [PATCH 3879/3942] metals: 0.9.6 -> 0.9.7

---
 pkgs/development/tools/metals/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index 37c99eaca857..0d8911e5b213 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "metals";
-  version = "0.9.6";
+  version = "0.9.7";
 
   deps = stdenv.mkDerivation {
     name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "0cjivkrykvp2m8bj3x9fsk7nsr5vxf87jfh4rjn24kfliljwfh2w";
+    outputHash     = "0aky4vbbm5hi6jnd2n1aimqznbbaya05c7vdgaqhy3630ks3w4k9";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 9ba2fb7994d6effc6fbc6d1dc8d0b51fecc51906 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 27 Nov 2020 19:59:38 +0100
Subject: [PATCH 3880/3942] hackage2nix: update list of broken packages to fix
 evaluation errors on Hydra

Ping @roberth because of broken package arion-compose.

Ping @rkrzr because of broken package icepeak.
---
 .../configuration-hackage2nix.yaml            | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index da45b4124bfa..93c4daac2247 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3177,6 +3177,7 @@ broken-packages:
   - arbor-monad-metric-datadog
   - arbtt
   - arch-hs
+  - archive-libarchive
   - archiver
   - archlinux
   - archlinux-web
@@ -3459,6 +3460,7 @@ broken-packages:
   - bindings-apr-util
   - bindings-bfd
   - bindings-cctools
+  - bindings-common
   - bindings-dc1394
   - bindings-eskit
   - bindings-EsounD
@@ -3780,6 +3782,7 @@ broken-packages:
   - call-haskell-from-anything
   - camfort
   - campfire
+  - candid
   - canon
   - canonical-filepath
   - canonical-json
@@ -3936,6 +3939,9 @@ broken-packages:
   - citeproc-hs-pandoc-filter
   - cj-token
   - cjk
+  - cl3
+  - cl3-hmatrix-interface
+  - cl3-linear-interface
   - clac
   - clafer
   - claferIG
@@ -4226,6 +4232,7 @@ broken-packages:
   - CoreDump
   - CoreErlang
   - CoreFoundation
+  - corenlp-parser
   - Coroutine
   - coroutine-enumerator
   - coroutine-iteratee
@@ -4243,6 +4250,7 @@ broken-packages:
   - cparsing
   - CPBrainfuck
   - cpio-conduit
+  - cpkg
   - CPL
   - cplusplus-th
   - cprng-aes-effect
@@ -4332,6 +4340,7 @@ broken-packages:
   - curry-frontend
   - CurryDB
   - cursedcsv
+  - cursor-fuzzy-time-gen
   - curves
   - custom-prelude
   - CV
@@ -5022,6 +5031,7 @@ broken-packages:
   - fastirc
   - fastly
   - FastPush
+  - fastsum
   - FastxPipe
   - fathead-util
   - fault-tree
@@ -5206,6 +5216,7 @@ broken-packages:
   - FormalGrammars
   - format
   - format-status
+  - formatn
   - formattable
   - forml
   - formlets
@@ -5323,6 +5334,7 @@ broken-packages:
   - fusion
   - futun
   - future
+  - fuzzy-time-gen
   - fuzzy-timings
   - fwgl
   - fwgl-glfw
@@ -6082,6 +6094,7 @@ broken-packages:
   - hasql-postgres-options
   - hasql-queue
   - hasql-simple
+  - hasql-th
   - hastache
   - hastache-aeson
   - haste
@@ -6163,6 +6176,7 @@ broken-packages:
   - hdr-histogram
   - HDRUtils
   - headergen
+  - heap-console
   - heapsort
   - heart-app
   - heart-core
@@ -6181,6 +6195,7 @@ broken-packages:
   - hedgehog-gen-json
   - hedgehog-generic
   - hedgehog-golden
+  - hedgehog-servant
   - Hedi
   - hedis-config
   - hedis-pile
@@ -6779,6 +6794,7 @@ broken-packages:
   - hw-json-simd
   - hw-json-simple-cursor
   - hw-json-standard-cursor
+  - hw-prim-bits
   - hw-simd
   - hw-uri
   - hwall-auth-iitk
@@ -7418,6 +7434,7 @@ broken-packages:
   - lhe
   - lhs2TeX-hl
   - lhslatex
+  - libarchive
   - LibClang
   - libconfig
   - libcspm
@@ -7835,6 +7852,10 @@ broken-packages:
   - midimory
   - midisurface
   - mighttpd
+  - migrant-core
+  - migrant-hdbc
+  - migrant-postgresql-simple
+  - migrant-sqlite-simple
   - mikmod
   - mikrokosmos
   - miku
@@ -7908,6 +7929,7 @@ broken-packages:
   - monad-log
   - monad-lrs
   - monad-mersenne-random
+  - monad-metrics-extensible
   - monad-mock
   - monad-open
   - monad-parallel-progressbar
@@ -8114,6 +8136,9 @@ broken-packages:
   - nagios-plugin-ekg
   - nakadi-client
   - named-lock
+  - named-servant
+  - named-servant-client
+  - named-servant-server
   - named-sop
   - namelist
   - namespace
@@ -8190,6 +8215,7 @@ broken-packages:
   - network-hans
   - network-house
   - network-interfacerequest
+  - network-messagepack-rpc-websocket
   - network-minihttp
   - network-msgpack-rpc
   - network-netpacket
@@ -8815,6 +8841,7 @@ broken-packages:
   - postgresql-simple-queue
   - postgresql-simple-sop
   - postgresql-simple-typed
+  - postgresql-syntax
   - postgresql-tx-query
   - postgresql-tx-squeal
   - postgresql-typed-lifted
@@ -9220,6 +9247,8 @@ broken-packages:
   - reflex-gloss
   - reflex-gloss-scene
   - reflex-libtelnet
+  - reflex-localize
+  - reflex-localize-dom
   - reflex-orphans
   - reflex-process
   - reflex-sdl2
@@ -9400,6 +9429,7 @@ broken-packages:
   - roc-cluster
   - roc-cluster-demo
   - rock
+  - rocksdb-haskell
   - roku-api
   - rollbar
   - rollbar-hs
@@ -9571,6 +9601,7 @@ broken-packages:
   - sdl2-cairo-image
   - sdl2-compositor
   - sdl2-fps
+  - sdr
   - seakale
   - seakale-postgresql
   - seakale-tests
@@ -9623,23 +9654,78 @@ broken-packages:
   - serpentine
   - serv
   - serv-wai
+  - servant-aeson-specs
   - servant-auth-cookie
+  - servant-auth-hmac
   - servant-auth-token
   - servant-auth-token-acid
   - servant-auth-token-api
   - servant-auth-token-leveldb
   - servant-auth-token-persistent
   - servant-auth-token-rocksdb
+  - servant-auth-wordpress
+  - servant-avro
+  - servant-cassava
   - servant-cli
+  - servant-client-js
+  - servant-client-namedargs
   - servant-csharp
+  - servant-db
   - servant-db-postgresql
+  - servant-dhall
+  - servant-docs-simple
+  - servant-ede
+  - servant-ekg
+  - servant-elm
   - servant-examples
+  - servant-fiat-content
+  - servant-generate
+  - servant-generic
+  - servant-github
+  - servant-haxl-client
+  - servant-hmac-auth
+  - servant-http2-client
   - servant-iCalendar
   - servant-jquery
   - servant-js
+  - servant-JuicyPixels
+  - servant-kotlin
+  - servant-matrix-param
+  - servant-mock
+  - servant-namedargs
+  - servant-nix
   - servant-openapi3
+  - servant-pagination
+  - servant-pandoc
+  - servant-pool
+  - servant-postgresql
+  - servant-proto-lens
+  - servant-purescript
+  - servant-pushbullet-client
+  - servant-py
+  - servant-quickcheck
+  - servant-rawm-client
+  - servant-reason
+  - servant-reflex
+  - servant-router
+  - servant-scotty
+  - servant-seo
+  - servant-serf
+  - servant-server-namedargs
+  - servant-smsc-ru
   - servant-snap
+  - servant-streaming
+  - servant-streaming-client
+  - servant-streaming-docs
+  - servant-streaming-server
+  - servant-swagger-tags
+  - servant-to-elm
   - servant-waargonaut
+  - servant-yaml
+  - servant-zeppelin
+  - servant-zeppelin-client
+  - servant-zeppelin-server
+  - servant-zeppelin-swagger
   - server-generic
   - serversession-backend-acid-state
   - serversession-backend-persistent
@@ -9795,6 +9881,7 @@ broken-packages:
   - skeletons
   - skell
   - skemmtun
+  - skews
   - skulk
   - skylark-client
   - skylighting-lucid
@@ -10538,6 +10625,7 @@ broken-packages:
   - tomato-rubato-openal
   - toml
   - tonatona-google-server-api
+  - tonatona-servant
   - too-many-cells
   - toodles
   - top
@@ -10720,6 +10808,9 @@ broken-packages:
   - typesafe-precure
   - typescript-docs
   - typograffiti
+  - typson-beam
+  - typson-esqueleto
+  - typson-selda
   - tyro
   - u2f
   - uber
@@ -11135,6 +11226,7 @@ broken-packages:
   - wsedit
   - wshterm
   - wsjtx-udp
+  - wss-client
   - wstunnel
   - wtk
   - wtk-gtk
@@ -11405,6 +11497,7 @@ broken-packages:
   - zeromq3-haskell
   - zeromq4-clone-pattern
   - zeromq4-conduit
+  - zeromq4-patterns
   - zeroth
   - zettelkast
   - ZFS

From e5f1bf5613808889a31c1ef88c4f658e3f8a57b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Nov 2020 22:50:02 +0100
Subject: [PATCH 3881/3942] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-28-gd194902 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/b5541c17abfc109ebcae8027b28b176a2966fa68.
---
 .../haskell-modules/hackage-packages.nix      | 2166 ++++++++++-------
 1 file changed, 1296 insertions(+), 870 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b3fc865fa8fd..154c9ec14cb7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -20659,8 +20659,8 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "VulkanMemoryAllocator";
-       version = "0.3.9";
-       sha256 = "1y4mchf317bkhwivnppnsk9r567c0cjymg3mc1n6h0cn799rx7bk";
+       version = "0.3.10";
+       sha256 = "16m08h11c8wwi159ppn698m60nk54k4dgxa2di2j02g58l16pmcn";
        libraryHaskellDepends = [
          base bytestring transformers vector vulkan
        ];
@@ -21834,24 +21834,25 @@ self: {
      }) {};
 
   "Z-IO" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, hashable, hspec
-     , hspec-discover, HUnit, primitive, QuickCheck
+    ({ mkDerivation, base, bytestring, containers, exceptions, hashable
+     , hspec, hspec-discover, HUnit, primitive, QuickCheck
      , quickcheck-instances, scientific, stm, time, unix-time
      , unordered-containers, word8, Z-Data, zlib
      }:
      mkDerivation {
        pname = "Z-IO";
-       version = "0.1.8.0";
-       sha256 = "14xh727r7zasm92ah0a6wccn1zksg0pmrvh8xdaldh4qkj706ga7";
+       version = "0.1.9.0";
+       sha256 = "1f9774065arknwm8f1avq7v769cfa610dy45winva3ys4345xcyy";
        libraryHaskellDepends = [
-         base exceptions primitive stm time unix-time unordered-containers
-         Z-Data
+         base containers exceptions primitive stm time unix-time
+         unordered-containers Z-Data
        ];
        libraryToolDepends = [ hspec-discover ];
        testHaskellDepends = [
          base bytestring hashable hspec HUnit primitive QuickCheck
          quickcheck-instances scientific word8 Z-Data zlib
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Simple and high performance IO toolkit for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24076,6 +24077,37 @@ self: {
        broken = true;
      }) {};
 
+  "advent-of-code-ocr" = callPackage
+    ({ mkDerivation, base, containers, criterion, data-default-class
+     , heredoc, hspec, optparse-applicative, template-haskell, th-lift
+     , th-lift-instances
+     }:
+     mkDerivation {
+       pname = "advent-of-code-ocr";
+       version = "0.1.0.0";
+       sha256 = "03qak7hic0kbmxz7krq5z2a8ah6z7pzr7r3sybd5h778m4sgvdca";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers data-default-class heredoc template-haskell th-lift
+         th-lift-instances
+       ];
+       executableHaskellDepends = [
+         base containers data-default-class heredoc optparse-applicative
+         template-haskell th-lift th-lift-instances
+       ];
+       testHaskellDepends = [
+         base containers data-default-class heredoc hspec template-haskell
+         th-lift th-lift-instances
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion data-default-class heredoc
+         template-haskell th-lift th-lift-instances
+       ];
+       description = "Parse Advent of Code ASCII art letters";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aern2-mp" = callPackage
     ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens
      , mixed-types-num, QuickCheck, regex-tdfa, rounded
@@ -31960,6 +31992,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Common interface using libarchive";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "archive-sig" = callPackage
@@ -33405,8 +33439,8 @@ self: {
     ({ mkDerivation, async, base, process, text }:
      mkDerivation {
        pname = "aspell-pipe";
-       version = "0.5";
-       sha256 = "19qgw7nwbbkw1p40ljmjgbb00i44nmqy41m2bcs74w076izz51mf";
+       version = "0.6";
+       sha256 = "09dw4v4j5pmqi8pdh3p7kk7f8pph5w33s7vd21fgvhv3arnrj6p8";
        libraryHaskellDepends = [ async base process text ];
        description = "Pipe-based interface to the Aspell program";
        license = stdenv.lib.licenses.bsd3;
@@ -37143,18 +37177,6 @@ self: {
      }) {};
 
   "bank-holidays-england" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
-     mkDerivation {
-       pname = "bank-holidays-england";
-       version = "0.2.0.5";
-       sha256 = "0n7q9s1vsmh5adkhpgycz8y6q49xqf77fpmm73cw0iqgjly4x9hp";
-       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_2_0_6" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
      mkDerivation {
        pname = "bank-holidays-england";
@@ -37164,7 +37186,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
@@ -37224,6 +37245,8 @@ self: {
        pname = "barbly";
        version = "0.1.0.0";
        sha256 = "1mmbvgw5g2jb8qv7vd00iym9xyb07jx03wi6x1ldqvzfn2vcc22l";
+       revision = "1";
+       editedCabalFile = "09xb9p2ik8kpa2gras9jqs4rr55bsbd7xnmgijxxzwf9hl00k0by";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -38599,8 +38622,8 @@ self: {
      }:
      mkDerivation {
        pname = "beam-automigrate";
-       version = "0.1.0.0";
-       sha256 = "1a9pjmzzyibp6fgrn0p9scczzc2afx5n1947qn5ifcz23hnwnj55";
+       version = "0.1.0.1";
+       sha256 = "0sjp09wfp6qlrbl6w8ddwngsnrwvp225msqgnv0l1x4nwxia5kpz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40606,6 +40629,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "This package is obsolete. Look for bindings-DSL instead.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings-dc1394" = callPackage
@@ -42522,6 +42547,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) gmp;};
 
+  "bitvec_1_1_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, gauge
+     , ghc-prim, integer-gmp, primitive, quickcheck-classes, random
+     , tasty, tasty-hunit, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "bitvec";
+       version = "1.1.0.0";
+       sha256 = "1blfi62immsx7hvg9krdbcp9n1p2a9qyhm9j30lc0g2jcl1n11mz";
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim integer-gmp primitive vector
+       ];
+       testHaskellDepends = [
+         base integer-gmp primitive quickcheck-classes tasty tasty-hunit
+         tasty-quickcheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers gauge integer-gmp random vector
+       ];
+       description = "Space-efficient bit vectors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bitwise" = callPackage
     ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }:
      mkDerivation {
@@ -42896,8 +42945,6 @@ self: {
        testHaskellDepends = [ base vector ];
        description = "Low-level Haskell bindings to Blas";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas;};
 
   "blastxml" = callPackage
@@ -44690,18 +44737,20 @@ self: {
   "box" = callPackage
     ({ mkDerivation, attoparsec, base, comonad, concurrency
      , contravariant, dejafu, doctest, exceptions, generic-lens, lens
-     , mmorph, mtl, numhask, optparse-generic, profunctors, random, text
-     , time, transformers, transformers-base, websockets
+     , mmorph, mtl, numhask, numhask-space, optparse-generic
+     , profunctors, random, text, time, transformers, transformers-base
+     , websockets
      }:
      mkDerivation {
        pname = "box";
-       version = "0.6.0";
-       sha256 = "0kv3j0fh2ahn4x2lgpghhkrbw5y1cy5mdlrriycqv4slrdzaqyks";
+       version = "0.6.2";
+       sha256 = "1mwmz97s8mvan8fn8ps0gnzsidar1ygjfkgrcjglfklh5bmm8823";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base comonad concurrency contravariant exceptions lens
-         mmorph numhask profunctors text time transformers transformers-base
+         mmorph numhask numhask-space profunctors text time transformers
+         transformers-base
        ];
        executableHaskellDepends = [
          base concurrency dejafu exceptions generic-lens lens mtl numhask
@@ -44720,8 +44769,8 @@ self: {
      }:
      mkDerivation {
        pname = "box-csv";
-       version = "0.0.2";
-       sha256 = "09qmxd9mxyag6zx8y5yv7bphycbs35zfkkf7kvkdmjqdk7l7b0fd";
+       version = "0.0.3";
+       sha256 = "16kg45hma04r6slw2fic5jbamkcbv6mgqybw081w76hckcg72522";
        libraryHaskellDepends = [
          attoparsec base box generic-lens lens numhask scientific text time
        ];
@@ -44733,18 +44782,19 @@ self: {
      }) {};
 
   "box-socket" = callPackage
-    ({ mkDerivation, base, box, concurrency, doctest, exceptions
-     , generic-lens, lens, numhask, optparse-generic, websockets
+    ({ mkDerivation, base, box, bytestring, concurrency, doctest
+     , exceptions, generic-lens, lens, network, network-simple, numhask
+     , optparse-generic, websockets
      }:
      mkDerivation {
        pname = "box-socket";
-       version = "0.0.2";
-       sha256 = "0wf7smpzczqm0yqnphmp46bgm67nyhj0swn0vxhdgb8z0362szsp";
+       version = "0.1.1";
+       sha256 = "162c3rnr5h5a8sixwnsbvf6fdbghsxx1ckvgdn4pd4b5xfa287j0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base box concurrency exceptions generic-lens lens numhask
-         websockets
+         base box bytestring concurrency exceptions generic-lens lens
+         network network-simple numhask websockets
        ];
        executableHaskellDepends = [
          base box concurrency generic-lens lens numhask optparse-generic
@@ -44954,34 +45004,6 @@ self: {
      }) {};
 
   "brick" = callPackage
-    ({ mkDerivation, base, bytestring, config-ini, containers
-     , contravariant, data-clist, deepseq, directory, dlist, exceptions
-     , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
-     , template-haskell, text, text-zipper, transformers, unix, vector
-     , vty, word-wrap
-     }:
-     mkDerivation {
-       pname = "brick";
-       version = "0.57";
-       sha256 = "15481cmm208gxcs96rcvg6qgx87b2fk7ws82675viasw64mhvmg1";
-       revision = "1";
-       editedCabalFile = "0vi6a3m6i4x6pndmcc39x37pyd9ar7m6z7b0lahnw6ayssxiq3pq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring config-ini containers contravariant data-clist
-         deepseq directory dlist exceptions filepath microlens microlens-mtl
-         microlens-th stm template-haskell text text-zipper transformers
-         unix vector vty word-wrap
-       ];
-       testHaskellDepends = [
-         base containers microlens QuickCheck vector
-       ];
-       description = "A declarative terminal user interface library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "brick_0_57_1" = callPackage
     ({ mkDerivation, base, bytestring, config-ini, containers
      , contravariant, data-clist, deepseq, directory, dlist, exceptions
      , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
@@ -45007,7 +45029,6 @@ self: {
        ];
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brick-dropdownmenu" = callPackage
@@ -46264,23 +46285,6 @@ self: {
      }) {};
 
   "burrito" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hspec, parsec
-     , QuickCheck, template-haskell, text, transformers
-     }:
-     mkDerivation {
-       pname = "burrito";
-       version = "1.1.0.2";
-       sha256 = "1k625j5syyiq66i88zy6q0mvwkjl5jsj79sxdmd1rbam3m39whx1";
-       libraryHaskellDepends = [
-         base bytestring containers parsec template-haskell text
-         transformers
-       ];
-       testHaskellDepends = [ base containers hspec QuickCheck text ];
-       description = "Parse and render URI templates";
-       license = stdenv.lib.licenses.isc;
-     }) {};
-
-  "burrito_1_2_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec, parsec
      , QuickCheck, template-haskell, text, transformers
      }:
@@ -46295,7 +46299,6 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck text ];
        description = "Parse and render URI templates";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "burst-detection" = callPackage
@@ -48006,29 +48009,6 @@ self: {
      }) {};
 
   "cabal-file" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, directory, extra
-     , filepath, hackage-security, optparse-applicative, simple-cabal
-     , simple-cmd, simple-cmd-args, time
-     }:
-     mkDerivation {
-       pname = "cabal-file";
-       version = "0.1.0";
-       sha256 = "1khf39awvpnqxs0rlqa6n5810x9kkn31975v6kbmwwdrjjp2qlqw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring Cabal directory extra filepath hackage-security
-         optparse-applicative simple-cabal simple-cmd time
-       ];
-       executableHaskellDepends = [
-         base bytestring Cabal directory extra filepath optparse-applicative
-         simple-cabal simple-cmd simple-cmd-args
-       ];
-       description = "Cabal file access";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cabal-file_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, extra
      , filepath, hackage-security, optparse-applicative, simple-cabal
      , simple-cmd, simple-cmd-args, time
@@ -48049,7 +48029,6 @@ self: {
        ];
        description = "Cabal file access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-file-th" = callPackage
@@ -49790,6 +49769,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "candid" = callPackage
+    ({ mkDerivation, base, base32, bytestring, cereal, constraints
+     , containers, crc, directory, dlist, doctest, filepath, hex-text
+     , leb128-cereal, megaparsec, mtl, optparse-applicative
+     , prettyprinter, row-types, scientific, smallcheck, split, tasty
+     , tasty-hunit, tasty-rerun, tasty-smallcheck, template-haskell
+     , text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "candid";
+       version = "0.1";
+       sha256 = "0mg7h936if93wdrhnri07530rnz7mnwlz5hpj1qp4bcwknsjs3b4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base32 bytestring cereal constraints containers crc dlist
+         hex-text leb128-cereal megaparsec mtl prettyprinter row-types
+         scientific split template-haskell text transformers
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         base bytestring hex-text optparse-applicative prettyprinter text
+       ];
+       testHaskellDepends = [
+         base bytestring directory doctest filepath leb128-cereal
+         prettyprinter row-types smallcheck tasty tasty-hunit tasty-rerun
+         tasty-smallcheck template-haskell text unordered-containers vector
+       ];
+       description = "Candid integration";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "canon" = callPackage
     ({ mkDerivation, arithmoi, array, base, containers, random }:
      mkDerivation {
@@ -50067,19 +50080,19 @@ self: {
      }) {};
 
   "capnp" = callPackage
-    ({ mkDerivation, async, base, bytes, bytestring, containers, cpu
-     , data-default, data-default-instances-vector, deepseq, directory
-     , exceptions, filepath, focus, hashable, heredoc, hspec, list-t
-     , monad-stm, mtl, network, network-simple, pretty-show, primitive
-     , process, process-extras, QuickCheck, quickcheck-instances
-     , quickcheck-io, reinterpret-cast, resourcet, safe-exceptions, stm
-     , stm-containers, supervisors, text, transformers, vector
-     , wl-pprint-text
+    ({ mkDerivation, async, base, bifunctors, bytes, bytestring
+     , containers, cpu, data-default, data-default-instances-vector
+     , deepseq, directory, exceptions, filepath, focus, hashable
+     , heredoc, hspec, list-t, monad-stm, mtl, network, network-simple
+     , pretty-show, primitive, process, process-extras, QuickCheck
+     , quickcheck-instances, quickcheck-io, reinterpret-cast, resourcet
+     , safe-exceptions, stm, stm-containers, supervisors, text
+     , transformers, vector, wl-pprint-text
      }:
      mkDerivation {
        pname = "capnp";
-       version = "0.7.0.0";
-       sha256 = "1mzs7f50840jbyzdipff47rwjmxv7i0rk6w4rdljzkw36yz4kj4v";
+       version = "0.8.0.0";
+       sha256 = "0jqq1yal41rnc8z66b24kiycyxdzwpqykx1p8v1rc3qbn4i3n255";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50090,9 +50103,9 @@ self: {
          text transformers vector
        ];
        executableHaskellDepends = [
-         base bytes bytestring containers data-default directory exceptions
-         filepath monad-stm mtl primitive reinterpret-cast safe-exceptions
-         text transformers vector wl-pprint-text
+         base bifunctors bytes bytestring containers data-default directory
+         exceptions filepath monad-stm mtl primitive reinterpret-cast
+         safe-exceptions text transformers vector wl-pprint-text
        ];
        testHaskellDepends = [
          async base bytes bytestring containers data-default deepseq
@@ -54305,6 +54318,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Clifford Algebra of three dimensional space";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cl3-hmatrix-interface" = callPackage
@@ -54316,6 +54331,8 @@ self: {
        libraryHaskellDepends = [ base cl3 hmatrix ];
        description = "Interface to/from Cl3 and HMatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cl3-linear-interface" = callPackage
@@ -54327,6 +54344,8 @@ self: {
        libraryHaskellDepends = [ base cl3 linear ];
        description = "Interface to/from Cl3 and Linear";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clac" = callPackage
@@ -55342,16 +55361,17 @@ self: {
 
   "cli-extras" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
-     , exceptions, io-streams, lens, logging-effect, monad-loops, mtl
-     , process, terminal-size, text, time, transformers, which
+     , exceptions, io-streams, lens, logging-effect, monad-logger
+     , monad-loops, mtl, process, terminal-size, text, time
+     , transformers, which
      }:
      mkDerivation {
        pname = "cli-extras";
-       version = "0.1.0.0";
-       sha256 = "14li1rkkaihklq62m9v9in2lbsr19v1h228a77ik25qarqw4xp9d";
+       version = "0.1.0.1";
+       sha256 = "1fggrnhdbr2ialdd93d0m81b85izs1gvcs8bkmwm8wdxgw4v7hsi";
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring containers exceptions
-         io-streams lens logging-effect monad-loops mtl process
+         io-streams lens logging-effect monad-logger monad-loops mtl process
          terminal-size text time transformers which
        ];
        description = "Miscellaneous utilities for building and working with command line interfaces";
@@ -55366,8 +55386,8 @@ self: {
      }:
      mkDerivation {
        pname = "cli-git";
-       version = "0.1.0.0";
-       sha256 = "1d9b8wyxzi233lq8qh3fh6v7icikjy4ryhhw033s5207biqqrifh";
+       version = "0.1.0.1";
+       sha256 = "0jchv1j7dgay6xzny9rinsybavs4ggk93450cka6sp7015z06ysr";
        libraryHaskellDepends = [
          base cli-extras containers data-default exceptions lens
          logging-effect megaparsec mtl text
@@ -55384,8 +55404,8 @@ self: {
      }:
      mkDerivation {
        pname = "cli-nix";
-       version = "0.1.0.0";
-       sha256 = "0z858fjsrnfb9cwzq8hxyhpwn61m50rjv1916c7zf8nrfsa82z0y";
+       version = "0.1.0.1";
+       sha256 = "1ynrni7zyhw8g70bdmd5vamnkw5vac4n5nmxwyka52nqy3zrrlwj";
        libraryHaskellDepends = [
          base cli-extras data-default exceptions lens logging-effect mtl
          text
@@ -55881,8 +55901,8 @@ self: {
      }:
      mkDerivation {
        pname = "cloudi";
-       version = "2.0.0";
-       sha256 = "0jkikp92k6pdqpa0c2mda81pplshyn7rdw1g2h2hhpjjg0g9npd1";
+       version = "2.0.1";
+       sha256 = "0s01582a2iyibwhlkmmf4n9h0fs3w0sjip65j78c4hldc91ylvqd";
        libraryHaskellDepends = [
          array base binary bytestring containers network time unix zlib
        ];
@@ -60127,6 +60147,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit_1_3_4" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , exceptions, filepath, gauge, hspec, kan-extensions
+     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
+     , resourcet, safe, silently, split, text, transformers, unix
+     , unliftio, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "conduit";
+       version = "1.3.4";
+       sha256 = "1w30chhqryhkv82mvwqi1q09fvfxva70280q3nf4h97amld860lz";
+       libraryHaskellDepends = [
+         base bytestring directory exceptions filepath mono-traversable mtl
+         primitive resourcet text transformers unix unliftio-core vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory exceptions filepath hspec
+         mono-traversable mtl QuickCheck resourcet safe silently split text
+         transformers unliftio vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers deepseq gauge hspec kan-extensions mwc-random
+         transformers vector
+       ];
+       description = "Streaming data processing library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-algorithms" = callPackage
     ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
      , conduit-combinators, conduit-extra, conduit-zstd, containers
@@ -60946,8 +60995,7 @@ self: {
        testHaskellDepends = [ base config-value text ];
        description = "Schema definitions for the config-value package";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ kiwi ];
      }) {};
 
   "config-select" = callPackage
@@ -60974,13 +61022,14 @@ self: {
        pname = "config-value";
        version = "0.8";
        sha256 = "1l2w2ylxx9d48pjnc9490kisawz48mf038f108g3zvb0j3iz9vyn";
+       revision = "1";
+       editedCabalFile = "0s121lvv1bv658ig1r3gdkf37wjyvgy958ll1497r8hsc6y73f4m";
        libraryHaskellDepends = [ array base containers pretty text ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [ base text ];
        description = "Simple, layout-based value language similar to YAML or JSON";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ kiwi ];
      }) {};
 
   "config-value-getopt" = callPackage
@@ -63092,6 +63141,8 @@ self: {
        librarySystemDepends = [ rocksdb ];
        description = "Launches CoreNLP and parses the JSON output";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) rocksdb;};
 
   "cornea" = callPackage
@@ -63499,6 +63550,8 @@ self: {
        testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ];
        description = "Build tool for C";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cplex-hs" = callPackage
@@ -64401,43 +64454,6 @@ self: {
      }) {};
 
   "criterion" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
-     , base-compat-batteries, binary, binary-orphans, bytestring
-     , cassava, code-page, containers, criterion-measurement, deepseq
-     , directory, exceptions, filepath, Glob, HUnit, js-flot, js-jquery
-     , microstache, mtl, mwc-random, optparse-applicative, parsec
-     , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck
-     , text, time, transformers, transformers-compat, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "criterion";
-       version = "1.5.7.0";
-       sha256 = "1qzn2k1b2all543v47p93p15a5y8lps002vbxmkr6xrinp91cvqk";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint base base-compat-batteries binary
-         binary-orphans bytestring cassava code-page containers
-         criterion-measurement deepseq directory exceptions filepath Glob
-         js-flot js-jquery microstache mtl mwc-random optparse-applicative
-         parsec statistics text time transformers transformers-compat vector
-         vector-algorithms
-       ];
-       executableHaskellDepends = [
-         base base-compat-batteries optparse-applicative
-       ];
-       testHaskellDepends = [
-         aeson base base-compat base-compat-batteries bytestring deepseq
-         directory HUnit QuickCheck statistics tasty tasty-hunit
-         tasty-quickcheck vector
-       ];
-       description = "Robust, reliable performance measurement and analysis";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "criterion_1_5_9_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
      , base-compat-batteries, binary, binary-orphans, bytestring
      , cassava, code-page, containers, criterion-measurement, deepseq
@@ -64472,7 +64488,6 @@ self: {
        ];
        description = "Robust, reliable performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "criterion-compare" = callPackage
@@ -66602,6 +66617,8 @@ self: {
          base criterion cursor-fuzzy-time genvalidity-criterion QuickCheck
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cursor-gen" = callPackage
@@ -67588,6 +67605,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-as" = callPackage
+    ({ mkDerivation, base, profunctors }:
+     mkDerivation {
+       pname = "data-as";
+       version = "0.0.0.2";
+       sha256 = "1rqdffwyxrnvsrqchnknjdmdz7afzhplyalnrclrm5zm6gj0dlia";
+       libraryHaskellDepends = [ base profunctors ];
+       description = "Simple extensible sum";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "data-ascii" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
      , hashable, semigroups, text
@@ -71050,6 +71078,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "deferred-folds_0_9_15" = callPackage
+    ({ mkDerivation, base, bytestring, containers, foldl, hashable
+     , primitive, QuickCheck, quickcheck-instances, rerebase, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "deferred-folds";
+       version = "0.9.15";
+       sha256 = "0jijnjy6x6f86dmlhiaj9gl13zbwzaz4gpb8svzdwwws48bwwyqr";
+       libraryHaskellDepends = [
+         base bytestring containers foldl hashable primitive text
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       description = "Abstractions over deferred folds";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "definitive-base" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector
@@ -71415,8 +71466,8 @@ self: {
      }:
      mkDerivation {
        pname = "dense";
-       version = "0.1.0.0";
-       sha256 = "1cyprx6z66cmg98j2zijjjznicfvybr678h4vaj4ppmfxgalkz99";
+       version = "0.1.0.1";
+       sha256 = "00hm40myj6m7hh9v5w75252wi7azf5fq6ldmpn7p0cv4sxj8mnmg";
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq ghc-prim hashable lens
          linear primitive semigroupoids template-haskell transformers
@@ -74970,8 +75021,8 @@ self: {
      }:
      mkDerivation {
        pname = "discord-haskell";
-       version = "1.8.0";
-       sha256 = "1zh4xf5a8ppfhcnkhai4mi0a7aj7m8qp8hcnyfi6s3nc86k7wj2w";
+       version = "1.8.1";
+       sha256 = "07rhg7r4v05q1y6rin4b5v49231r2w35jfwnrbg7b7s1skdld9g3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81666,8 +81717,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm2nix";
-       version = "0.2";
-       sha256 = "1bv2sid1adrg3327h9611kspfxkhgwcawjq59iapp776n74x2iq4";
+       version = "0.2.1";
+       sha256 = "1lgqbmd5419apak7hy22p0fpjzcki74snpgqsq2qmhpvyi5qbf3r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87521,6 +87572,8 @@ self: {
        ];
        description = "A fast open-union type suitable for 100+ contained alternatives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fathead-util" = callPackage
@@ -91723,8 +91776,6 @@ self: {
        ];
        description = "A new formatting library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fmt-for-rio" = callPackage
@@ -92500,6 +92551,25 @@ self: {
        broken = true;
      }) {};
 
+  "formatn" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, doctest, foldl
+     , generic-lens, numhask, scientific, tdigest, text, transformers
+     }:
+     mkDerivation {
+       pname = "formatn";
+       version = "0.0.1";
+       sha256 = "0rw1xli4df72wxylf211jhm0v2y842rfn8nalrp04yzklvyrri84";
+       libraryHaskellDepends = [
+         attoparsec base containers foldl generic-lens numhask scientific
+         tdigest text transformers
+       ];
+       testHaskellDepends = [ base doctest numhask ];
+       description = "Number text formatting";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "formattable" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class
      , double-conversion, hspec, HUnit, lens, old-locale, QuickCheck
@@ -95680,6 +95750,8 @@ self: {
          base criterion fuzzy-time genvalidity-criterion
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fuzzy-timings" = callPackage
@@ -98762,23 +98834,6 @@ self: {
      }) {};
 
   "ghc-check" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, ghc
-     , ghc-paths, process, safe-exceptions, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "ghc-check";
-       version = "0.5.0.2";
-       sha256 = "1pncxn9lvwcxlgwf18yr20xbh2qxf80samf2laaxjhx09d31w8h2";
-       libraryHaskellDepends = [
-         base containers directory filepath ghc ghc-paths process
-         safe-exceptions template-haskell transformers
-       ];
-       description = "detect mismatches between compile-time and run-time versions of the ghc api";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-check_0_5_0_3" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , ghc-paths, process, safe-exceptions, template-haskell
      , transformers
@@ -98793,7 +98848,6 @@ self: {
        ];
        description = "detect mismatches between compile-time and run-time versions of the ghc api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-clippy-plugin" = callPackage
@@ -98973,25 +99027,6 @@ self: {
      }) {};
 
   "ghc-events" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers, text
-     , vector
-     }:
-     mkDerivation {
-       pname = "ghc-events";
-       version = "0.13.0";
-       sha256 = "1b4d1h71czskm2vgbhkrkdkj5h218b34zn7pjhyp314wfqkmn935";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers text vector
-       ];
-       executableHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base ];
-       description = "Library and tool for parsing .eventlog files from GHC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-events_0_14_0" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers, text
      , vector
      }:
@@ -99008,7 +99043,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Library and tool for parsing .eventlog files from GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-events-analyze" = callPackage
@@ -99062,29 +99096,6 @@ self: {
      }) {};
 
   "ghc-exactprint" = callPackage
-    ({ mkDerivation, base, bytestring, containers, Diff, directory
-     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
-     , silently, syb
-     }:
-     mkDerivation {
-       pname = "ghc-exactprint";
-       version = "0.6.3.2";
-       sha256 = "1bzf8mafz20pn7cq2483b9w3hjrwfbb0ahbcb3y7xy5yy52qvmln";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers directory filepath free ghc ghc-boot
-         ghc-paths mtl syb
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff directory filemanip filepath ghc
-         ghc-boot ghc-paths HUnit mtl silently syb
-       ];
-       description = "ExactPrint for GHC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-exactprint_0_6_3_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
      , silently, syb
@@ -99105,7 +99116,6 @@ self: {
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -100929,6 +100939,26 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "gi-gobject_2_0_25" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-gobject";
+       version = "2.0.25";
+       sha256 = "0yz80wcxhy1mm441507qsj2f7380l2iwh4s1miwpd8kb5m147n9w";
+       setupHaskellDepends = [ base Cabal gi-glib haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ glib ];
+       description = "GObject bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
   "gi-graphene" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base
@@ -101133,7 +101163,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
-  "gi-gtk_4_0_2" = callPackage
+  "gi-gtk_4_0_3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-graphene, gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base
@@ -101141,8 +101171,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "4.0.2";
-       sha256 = "1lmbb3q4f73f7yihnl4qjv7qvzrys3jqsh3dg9wwdg9bxg900ghp";
+       version = "4.0.3";
+       sha256 = "1zfqnjnzlrry7cbrzfamrh5465h06y6px0b1xh1yz7iaacg0739z";
        setupHaskellDepends = [
          base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib
          gi-gobject gi-graphene gi-gsk gi-pango haskell-gi
@@ -101948,8 +101978,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "8.20201116";
-       sha256 = "0xv7n9f6l90l4k964675v0lgs22gcy97ic86mbfb40rl0fk0jalr";
+       version = "8.20201127";
+       sha256 = "0n9m5ffgbzms0nh9dskrc7vjgwwwi9f9gxyh498wnspf96729zz7";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -102574,26 +102604,6 @@ self: {
      }) {};
 
   "github-release" = callPackage
-    ({ mkDerivation, aeson, base, burrito, bytestring, http-client
-     , http-client-tls, http-types, mime-types, optparse-generic, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "github-release";
-       version = "1.3.3";
-       sha256 = "15im4vsz04sx0iq83xmvk5ak4p7rj33jawk5lxkmv1ajwvklbpk7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base burrito bytestring http-client http-client-tls
-         http-types mime-types optparse-generic text unordered-containers
-       ];
-       executableHaskellDepends = [ base ];
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-release_1_3_5" = callPackage
     ({ mkDerivation, aeson, base, burrito, bytestring, http-client
      , http-client-tls, http-types, mime-types, optparse-generic, text
      , unordered-containers
@@ -102611,7 +102621,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-rest" = callPackage
@@ -103521,6 +103530,8 @@ self: {
        pname = "glirc";
        version = "2.37";
        sha256 = "1222dz42lyk44xgs10wwjpd2qn4l0ak3v98vj103xh535hki9ibn";
+       revision = "1";
+       editedCabalFile = "19y9hhn24w6lqdwv1skijrvj5plqs3xqcz3h8wv1ax8g8ak07xsx";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -103535,8 +103546,7 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ kiwi ];
      }) {};
 
   "gll" = callPackage
@@ -112584,7 +112594,7 @@ self: {
      , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
      , resourcet, scientific, tagsoup, tasty, tasty-hunit
      , tasty-quickcheck, template-haskell, text, time
-     , time-locale-compat, unordered-containers, util-linux, vector, wai
+     , time-locale-compat, unordered-containers, utillinux, vector, wai
      , wai-app-static, warp, yaml
      }:
      mkDerivation {
@@ -112608,12 +112618,12 @@ self: {
          base bytestring containers filepath QuickCheck tasty tasty-hunit
          tasty-quickcheck text unordered-containers yaml
        ];
-       testToolDepends = [ util-linux ];
+       testToolDepends = [ utillinux ];
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) util-linux;};
+     }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
     ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
@@ -112748,6 +112758,31 @@ self: {
        broken = true;
      }) {};
 
+  "hakyll-contrib-i18n" = callPackage
+    ({ mkDerivation, base, binary-instances, bytestring, filepath
+     , hakyll, pandoc, pandoc-include-code, pandoc-types, text, time
+     , time-locale-compat, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "hakyll-contrib-i18n";
+       version = "0.1.1.0";
+       sha256 = "1jmw3ns8s0l974b2xb6ylwd0swjcq69fwpakb4g4k2rvhqnzd6jg";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base binary-instances bytestring filepath hakyll text time
+         time-locale-compat unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         base filepath hakyll pandoc pandoc-include-code pandoc-types
+         unordered-containers
+       ];
+       description = "A Hakyll library for internationalization";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hakyll-contrib-links" = callPackage
     ({ mkDerivation, base, binary, containers, hakyll, pandoc
      , pandoc-types, parsec, QuickCheck, test-framework
@@ -116391,6 +116426,29 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
 
+  "haskell-gi_0_24_7" = callPackage
+    ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, containers, directory, doctest, filepath, glib
+     , gobject-introspection, haskell-gi-base, mtl, pretty-show, process
+     , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit
+     }:
+     mkDerivation {
+       pname = "haskell-gi";
+       version = "0.24.7";
+       sha256 = "10xp6z6whfx3iad09l83mcszzj99cc9wcnvk593ypx6zhjv0r555";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         ansi-terminal 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 gobject-introspection ];
+       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) gobject-introspection;};
+
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
@@ -116403,6 +116461,19 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "haskell-gi-base_0_24_5" = callPackage
+    ({ mkDerivation, base, bytestring, containers, glib, text }:
+     mkDerivation {
+       pname = "haskell-gi-base";
+       version = "0.24.5";
+       sha256 = "0fd5bsf2bnjaq9j8zs9l5837z9x2iryivs57y96c7fx6vxxb9xai";
+       libraryHaskellDepends = [ base bytestring containers text ];
+       libraryPkgconfigDepends = [ glib ];
+       description = "Foundation for libraries generated by haskell-gi";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
   "haskell-gi-overloading" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -117834,19 +117905,26 @@ self: {
      }) {};
 
   "haskell-xmpp" = callPackage
-    ({ mkDerivation, array, base, HaXml, html, mtl, network, polyparse
-     , pretty, random, regex-compat, stm, utf8-string
+    ({ mkDerivation, aeson, array, base, blaze-markup, bytestring
+     , HaXml, hspec, hspec-discover, html, http-client, http-conduit
+     , mtl, network, network-bsd, polyparse, pretty, random
+     , regex-compat, singlethongs, stm, text, time, unliftio
+     , utf8-string, uuid, xml-conduit, xml-hamlet
      }:
      mkDerivation {
        pname = "haskell-xmpp";
-       version = "1.0.2";
-       sha256 = "1z4x4mn0vry8mwq6ily668ignmf4s9m92fmga15dr83y7aq5wd59";
+       version = "2.0.1";
+       sha256 = "0x06a43h930ad17shvc8iwibkpgbfk6lkkr9mnp0xnwaf6kzrf47";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base HaXml html mtl network polyparse pretty random
-         regex-compat stm utf8-string
+         aeson array base blaze-markup bytestring HaXml html http-client
+         http-conduit mtl network network-bsd polyparse pretty random
+         regex-compat singlethongs stm text time unliftio utf8-string uuid
+         xml-conduit xml-hamlet
        ];
+       executableHaskellDepends = [ base hspec text ];
+       executableToolDepends = [ hspec-discover ];
        description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120058,6 +120136,8 @@ self: {
        ];
        description = "Template Haskell utilities for Hasql";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-transaction" = callPackage
@@ -121885,6 +121965,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "headroom_0_3_2_0" = callPackage
+    ({ mkDerivation, aeson, base, data-default-class, doctest, either
+     , file-embed, hspec, hspec-discover, microlens, microlens-th
+     , mustache, optparse-applicative, pcre-heavy, pcre-light
+     , QuickCheck, rio, template-haskell, time, yaml
+     }:
+     mkDerivation {
+       pname = "headroom";
+       version = "0.3.2.0";
+       sha256 = "0770d1b8ikijkmqqnb6nygqj7cv6fphz1165x478ry61sr3i6hs3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base data-default-class either file-embed microlens
+         microlens-th mustache optparse-applicative pcre-heavy pcre-light
+         rio template-haskell time yaml
+       ];
+       executableHaskellDepends = [ base optparse-applicative rio ];
+       testHaskellDepends = [
+         aeson base doctest hspec optparse-applicative pcre-light QuickCheck
+         rio time
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "License Header Manager";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "heap" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -121897,6 +122005,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "heap-console" = callPackage
+    ({ mkDerivation, base, containers, exceptions, ghc-heap, ghc-prim
+     , haskeline, hspec, hspec-discover, mtl, show-combinators
+     }:
+     mkDerivation {
+       pname = "heap-console";
+       version = "0.1.0.1";
+       sha256 = "1z2sdw64w50q2353ccsjpahncdp8czihpkizclgvx1gkqiv9mv02";
+       libraryHaskellDepends = [
+         base containers exceptions ghc-heap ghc-prim haskeline mtl
+         show-combinators
+       ];
+       testHaskellDepends = [ base hspec ];
+       testToolDepends = [ hspec-discover ];
+       description = "interactively inspect Haskell values at runtime";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "heaps" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -122421,6 +122549,8 @@ self: {
        ];
        description = "Hedgehog property testing for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedis" = callPackage
@@ -127218,8 +127348,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "3.2.2";
-       sha256 = "1jb4yr9piyq2l4d6xxn6vywa1ghvws97qkzymnmldzxpyqiixnl8";
+       version = "3.2.3";
+       sha256 = "1y6drmvcz90cpih446k1kjbyhin652wi9b9x7xjylxxp8jksd8x0";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -127452,25 +127582,6 @@ self: {
      }) {};
 
   "hmatrix" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, deepseq
-     , openblasCompat, random, semigroups, split, storable-complex
-     , vector
-     }:
-     mkDerivation {
-       pname = "hmatrix";
-       version = "0.20.0.0";
-       sha256 = "1sqy1aci5zfagkb34mz3xdil7cl96z4b4cx28cha54vc5sx1lhpg";
-       configureFlags = [ "-fdisable-default-paths" "-fopenblas" ];
-       libraryHaskellDepends = [
-         array base binary bytestring deepseq random semigroups split
-         storable-complex vector
-       ];
-       librarySystemDepends = [ openblasCompat ];
-       description = "Numeric Linear Algebra";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) openblasCompat;};
-
-  "hmatrix_0_20_1" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, deepseq
      , openblasCompat, primitive, random, semigroups, split
      , storable-complex, vector
@@ -127487,7 +127598,6 @@ self: {
        librarySystemDepends = [ openblasCompat ];
        description = "Numeric Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openblasCompat;};
 
   "hmatrix-backprop" = callPackage
@@ -128249,6 +128359,8 @@ self: {
        pname = "hnn";
        version = "0.3";
        sha256 = "0hqmzl95riis1m6f0zfp303f2k0j8szkcb6rcfmx6d3grm38b7fr";
+       revision = "1";
+       editedCabalFile = "18lmh6fpkpxa9lfcygzag60nrxl5qab1gllpfamgz0l5ydph9f3z";
        libraryHaskellDepends = [
          base binary bytestring hmatrix mwc-random random vector
          vector-binary-instances zlib
@@ -128514,6 +128626,21 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "hocon" = callPackage
+    ({ mkDerivation, base, hspec, MissingH, parsec, split }:
+     mkDerivation {
+       pname = "hocon";
+       version = "0.1.0.1";
+       sha256 = "06xk118q1f5cik98w3swqw61nc7skx0bvf7mj8iyji8wm6sb1p1w";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base hspec MissingH parsec split ];
+       executableHaskellDepends = [ base hspec MissingH parsec split ];
+       testHaskellDepends = [ base hspec MissingH parsec split ];
+       description = "Small library for typesafe's configuration specification";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hodatime" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , directory, exceptions, filepath, fingertree, mtl, parsec
@@ -134527,8 +134654,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-hashable";
-       version = "0.1.0.0";
-       sha256 = "1gqlw2k6k37m25292dpm8j8k0f2jdqz7lmsisa2f1mqlqxpm9k0i";
+       version = "0.1.0.1";
+       sha256 = "0gvqi8600vm3ms1b45qvx32kw7g7pgwxkmbfbdmicxxlbp2da6qy";
        libraryHaskellDepends = [ base hashable hspec QuickCheck ];
        testHaskellDepends = [
          base hashable hspec hspec-core QuickCheck silently
@@ -134781,12 +134908,16 @@ self: {
      }) {};
 
   "hspec-slow" = callPackage
-    ({ mkDerivation, base, hspec, mtl, stm, time, transformers }:
+    ({ mkDerivation, base, hspec, hspec-core, mtl, stm, time
+     , transformers
+     }:
      mkDerivation {
        pname = "hspec-slow";
-       version = "0.1.0.0";
-       sha256 = "1nvhvxqmvlkg7zjh0b59rfdjghcinal7ncf3l1jin21zrjcwzfhq";
-       libraryHaskellDepends = [ base hspec mtl stm time transformers ];
+       version = "0.2.0.1";
+       sha256 = "1rik9r0y6zzc92dzdzhmxj05hr1yacvdrfvsxqqqavxd7v0pp6y6";
+       libraryHaskellDepends = [
+         base hspec hspec-core mtl stm time transformers
+       ];
        testHaskellDepends = [ base hspec mtl stm ];
        description = "Find slow test cases";
        license = stdenv.lib.licenses.bsd3;
@@ -139514,6 +139645,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Primitive support for bit manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-rankselect" = callPackage
@@ -140734,19 +140867,6 @@ self: {
      }) {};
 
   "hyper" = callPackage
-    ({ mkDerivation, base, blaze-html, deepseq, text }:
-     mkDerivation {
-       pname = "hyper";
-       version = "0.1.0.3";
-       sha256 = "0bc2mvxaggdyikdx51qc1li8idmnlw3ha2n3qli6jf1zz8mlqx0s";
-       revision = "1";
-       editedCabalFile = "1qfavgvdlmsip57grhxs0mawh82nxrq4m0mv9z3vam1b9j6nw2cc";
-       libraryHaskellDepends = [ base blaze-html deepseq text ];
-       description = "Display class for the HyperHaskell graphical Haskell interpreter";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hyper_0_2_1_0" = callPackage
     ({ mkDerivation, base, blaze-html, deepseq, text }:
      mkDerivation {
        pname = "hyper";
@@ -140755,7 +140875,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html deepseq text ];
        description = "Display class for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyper-extra" = callPackage
@@ -142914,8 +143033,8 @@ self: {
      }:
      mkDerivation {
        pname = "implicit-hie";
-       version = "0.1.2.3";
-       sha256 = "0gz2rrzlj6031w837whpsh932jjihf49yk7rh05dw13zxvn19fl8";
+       version = "0.1.2.4";
+       sha256 = "1jjw64pdz3jgd4jys1rg95bhrjyiizjdi0rwwqldc27a7misd2ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145896,8 +146015,8 @@ self: {
      }:
      mkDerivation {
        pname = "ipfs";
-       version = "1.1.5.0";
-       sha256 = "050zj21m4pg8jnpd594p2wc5m3nn4j6cmmv0069mi7kg473dqz2m";
+       version = "1.1.5.1";
+       sha256 = "0c93s1s3l72yw2lb28v37bnhmvcn5s2w1620fsx0z4ij1z8dnk19";
        libraryHaskellDepends = [
          aeson base bytestring envy flow Glob http-media ip lens
          monad-logger regex-compat rio servant servant-client servant-server
@@ -145910,7 +146029,7 @@ self: {
          text vector yaml
        ];
        description = "Access IPFS locally and remotely";
-       license = stdenv.lib.licenses.agpl3Plus;
+       license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -145992,27 +146111,6 @@ self: {
      }) {};
 
   "iproute" = callPackage
-    ({ mkDerivation, appar, base, byteorder, bytestring, containers
-     , doctest, hspec, network, QuickCheck, safe
-     }:
-     mkDerivation {
-       pname = "iproute";
-       version = "1.7.9";
-       sha256 = "1m306fi39ifqq53sklwn81q96wam8nvx7mr5hv4m9f26kiczlism";
-       revision = "1";
-       editedCabalFile = "1vbzch9lainl05ydym5z8x0kz0a0ywwba45d7xgg5fb8cp2n5zxh";
-       libraryHaskellDepends = [
-         appar base byteorder bytestring containers network
-       ];
-       testHaskellDepends = [
-         appar base byteorder bytestring containers doctest hspec network
-         QuickCheck safe
-       ];
-       description = "IP Routing Table";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "iproute_1_7_10" = callPackage
     ({ mkDerivation, appar, base, byteorder, bytestring, containers
      , doctest, hspec, network, QuickCheck, safe
      }:
@@ -146029,7 +146127,6 @@ self: {
        ];
        description = "IP Routing Table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iptables-helpers" = callPackage
@@ -146208,6 +146305,8 @@ self: {
        pname = "irc-core";
        version = "2.9";
        sha256 = "1n1fd46am795bsb96jnq2kj3gn787q5j41115g1smfp01zbnjp1b";
+       revision = "1";
+       editedCabalFile = "12z28f96iw9jni57rdzy8kz7sa1zwfs5k3fvfmf6sgx6wzhwcm6h";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring hashable primitive
          text time vector
@@ -146215,8 +146314,7 @@ self: {
        testHaskellDepends = [ base hashable HUnit text ];
        description = "IRC core library for glirc";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ kiwi ];
      }) {};
 
   "irc-ctcp" = callPackage
@@ -146508,18 +146606,6 @@ self: {
      }) {};
 
   "isbn" = callPackage
-    ({ mkDerivation, base, hspec, text }:
-     mkDerivation {
-       pname = "isbn";
-       version = "1.1.0.1";
-       sha256 = "0s7b06a0d37bhb38k2my6g6brn6bywxr59kw2c103dp4y4kzrcpn";
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [ base hspec text ];
-       description = "ISBN Validation and Manipulation";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "isbn_1_1_0_2" = callPackage
     ({ mkDerivation, base, hspec, text }:
      mkDerivation {
        pname = "isbn";
@@ -146529,7 +146615,6 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "ISBN Validation and Manipulation";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "isdicom" = callPackage
@@ -147571,6 +147656,8 @@ self: {
        pname = "j";
        version = "0.2.1.0";
        sha256 = "1r2lldy35sfzqrd82v2fj113l10mhvllf4yxbkrfy0y7wv0c5v8n";
+       revision = "1";
+       editedCabalFile = "022ah42q1ba8ank33jn5r9h7fbs3579mlrk6ks8q7vbcm4rnalj0";
        libraryHaskellDepends = [ base bytestring repa unix ];
        testHaskellDepends = [ base bytestring repa tasty tasty-hunit ];
        description = "J in Haskell";
@@ -154468,8 +154555,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-dickinson";
-       version = "1.4.0.0";
-       sha256 = "139y3kgbrjv8x16rda9ixhcdl6xs26blq0sgcz7zpzwgbp60yflb";
+       version = "1.4.1.1";
+       sha256 = "0bc3qzhyip8dq7w8gf3wxlrlfd8swd1n6y6nbj2pnp7710jj8gb9";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -157959,6 +158046,8 @@ self: {
        ];
        description = "Haskell interface to libarchive";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libarchive;};
 
   "libarchive-conduit" = callPackage
@@ -163565,10 +163654,8 @@ self: {
      }:
      mkDerivation {
        pname = "lsp";
-       version = "1.0.0.0";
-       sha256 = "05m9kxcf7g2xb4bhbn08bfbf09b8vvvw3nvpcfldpx180yz3n02r";
-       revision = "1";
-       editedCabalFile = "1pgxvwfn7avkpdl6f3p7rqaivdz438yqkzsz0rp1y0s80mymvz1i";
+       version = "1.0.0.1";
+       sha256 = "1h7ymzzm00dnvbqxz4g0zp3mvm6v9bjbgkazz514wqrcmma27cm1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -166755,8 +166842,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.5.5.0";
-       sha256 = "1nlx8lakwnpplmgiiv692jbs03b52wqvclfyvaxcaf8yqdjms3r9";
+       version = "0.5.6.0";
+       sha256 = "13vzprqhyjz1qvsq6b29d8h9xgsrifbpbs2c5cw702hi7mw5zjhp";
        libraryHaskellDepends = [
          base bytestring data-default-class deepseq exceptions primitive
          scheduler unliftio-core vector
@@ -166769,6 +166856,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "massiv_0_5_7_0" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, deepseq
+     , doctest, exceptions, mersenne-random-pure64, primitive
+     , QuickCheck, random, scheduler, splitmix, template-haskell
+     , unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "massiv";
+       version = "0.5.7.0";
+       sha256 = "04vv16h048gkfgqsdf3a42qrg62cik9j30p4s13rykq0shzcaf62";
+       libraryHaskellDepends = [
+         base bytestring data-default-class deepseq exceptions primitive
+         scheduler unliftio-core vector
+       ];
+       testHaskellDepends = [
+         base doctest mersenne-random-pure64 QuickCheck random splitmix
+         template-haskell
+       ];
+       description = "Massiv (Массив) is an Array Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "massiv-io" = callPackage
     ({ mkDerivation, base, bytestring, Color, data-default-class
      , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels
@@ -166819,8 +166929,10 @@ self: {
      }:
      mkDerivation {
        pname = "massiv-test";
-       version = "0.1.4";
-       sha256 = "1qhvph2s6bkw3zb43arq1zvrfyr09phqjwxhzsqxi2x2fcrdyvyn";
+       version = "0.1.5";
+       sha256 = "0n9fcdz9v7j1r2iln9h0wkjr7jkghi3r3a3lm0713p6hwy6cpgff";
+       revision = "1";
+       editedCabalFile = "0v6vnjsqklb8yaf63zhx9ni0ak83zyjq2l3mb8zazp54inyyfjr0";
        libraryHaskellDepends = [
          base bytestring data-default-class deepseq exceptions hspec massiv
          primitive QuickCheck scheduler unliftio vector
@@ -167455,8 +167567,7 @@ self: {
        ];
        description = "Terminal client for the Mattermost chat system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ kiwi ];
      }) {};
 
   "mattermost-api" = callPackage
@@ -167485,8 +167596,7 @@ self: {
        ];
        description = "Client API for Mattermost chat system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ kiwi ];
      }) {};
 
   "mattermost-api-qc" = callPackage
@@ -167502,8 +167612,7 @@ self: {
        ];
        description = "QuickCheck instances for the Mattermost client API library";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ kiwi ];
      }) {};
 
   "maude" = callPackage
@@ -169935,23 +170044,6 @@ self: {
      }) {};
 
   "microlens-th" = callPackage
-    ({ mkDerivation, base, containers, microlens, template-haskell
-     , th-abstraction, transformers
-     }:
-     mkDerivation {
-       pname = "microlens-th";
-       version = "0.4.3.6";
-       sha256 = "1pw0ljpyhpj4jsgs25i4mi1a07vpbwfik84fc2kip1pzajflrcql";
-       libraryHaskellDepends = [
-         base containers microlens template-haskell th-abstraction
-         transformers
-       ];
-       testHaskellDepends = [ base microlens ];
-       description = "Automatic generation of record lenses for microlens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-th_0_4_3_8" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell
      , th-abstraction, transformers
      }:
@@ -169966,7 +170058,6 @@ self: {
        testHaskellDepends = [ base microlens ];
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "micrologger" = callPackage
@@ -170319,6 +170410,85 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "migrant-core" = callPackage
+    ({ mkDerivation, base, HUnit, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "migrant-core";
+       version = "0.1.0.2";
+       sha256 = "1na0vcrmw3vy6v9qxxpprhga9ja7izwbp856pdpqiq98p4h8xmiw";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [
+         base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck text
+       ];
+       description = "Semi-automatic database schema migrations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "migrant-hdbc" = callPackage
+    ({ mkDerivation, base, HDBC, HDBC-sqlite3, HUnit, migrant-core
+     , process, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck
+     , text
+     }:
+     mkDerivation {
+       pname = "migrant-hdbc";
+       version = "0.1.0.2";
+       sha256 = "084vqb1z0ipxn07nswlcw0bbh0bfywm7hyvakb75xg8rv5kfak15";
+       libraryHaskellDepends = [ base HDBC migrant-core text ];
+       testHaskellDepends = [
+         base HDBC HDBC-sqlite3 HUnit migrant-core process QuickCheck random
+         tasty tasty-hunit tasty-quickcheck text
+       ];
+       description = "Semi-automatic database schema migrations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "migrant-postgresql-simple" = callPackage
+    ({ mkDerivation, base, HUnit, migrant-core, postgresql-simple
+     , process, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck
+     , text
+     }:
+     mkDerivation {
+       pname = "migrant-postgresql-simple";
+       version = "0.1.0.2";
+       sha256 = "1x1gsf0vp82n6dmyiamj1cvs9fww7j1ffh6d9qr075z5sj8zbhzx";
+       libraryHaskellDepends = [
+         base migrant-core postgresql-simple text
+       ];
+       testHaskellDepends = [
+         base HUnit migrant-core postgresql-simple process QuickCheck random
+         tasty tasty-hunit tasty-quickcheck text
+       ];
+       description = "Semi-automatic database schema migrations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "migrant-sqlite-simple" = callPackage
+    ({ mkDerivation, base, HUnit, migrant-core, QuickCheck
+     , sqlite-simple, tasty, tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "migrant-sqlite-simple";
+       version = "0.1.0.2";
+       sha256 = "140fchiid0kjp1cdw114w497h0fsrskn9195bkjv44sdmq2l8car";
+       libraryHaskellDepends = [ base migrant-core sqlite-simple text ];
+       testHaskellDepends = [
+         base HUnit migrant-core QuickCheck sqlite-simple tasty tasty-hunit
+         tasty-quickcheck text
+       ];
+       description = "Semi-automatic database schema migrations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "mikmod" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -172863,6 +173033,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_36" = 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.36";
+       sha256 = "12rw0k01gkhiqjm2fhxgkmribksmizhj14xphfn8fkd86wzl0vbh";
+       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
+       ];
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -173045,6 +173237,8 @@ self: {
        ];
        description = "An extensible and type-safe wrapper around EKG metrics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-mock" = callPackage
@@ -176194,8 +176388,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-protobuf";
-       version = "0.4.0.2";
-       sha256 = "0d33d7nw5rfmyyrahv0sc0mdwzp5ywm040hfm9c1wm9h1miahx4n";
+       version = "0.4.0.3";
+       sha256 = "0wc562fw89l3qmyf28axj41cyj88ppkg0jsif9rsrdgj4ypq2zrj";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -177724,18 +177918,19 @@ self: {
      }) {};
 
   "mutable-lens" = callPackage
-    ({ mkDerivation, base, containers, doctest, lens, primitive, stm
-     , tasty, tasty-hunit, transformers
+    ({ mkDerivation, base, containers, doctest, extra, lens, primitive
+     , stm, tasty, tasty-hunit, transformers
      }:
      mkDerivation {
        pname = "mutable-lens";
-       version = "0.4.0.0";
-       sha256 = "14mywx7lh3yw8gfqy8h2hml2vr3vjfnxnvfvcg37kfskkfyaf6lm";
+       version = "0.4.1.0";
+       sha256 = "013z1jj8g996vzwal7vlkfy4h3s67y03k5j1sg78dc9abpc87l2z";
        libraryHaskellDepends = [ base lens primitive stm ];
        testHaskellDepends = [
          base containers doctest lens primitive stm tasty tasty-hunit
          transformers
        ];
+       benchmarkHaskellDepends = [ base extra primitive ];
        description = "Interoperate mutable references with regular lens";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -178735,6 +178930,8 @@ self: {
        sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53";
        libraryHaskellDepends = [ base named servant ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "named-servant-client" = callPackage
@@ -178750,6 +178947,8 @@ self: {
        ];
        description = "client support for named-servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "named-servant-server" = callPackage
@@ -178765,6 +178964,8 @@ self: {
        ];
        description = "server support for named-servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "named-sop" = callPackage
@@ -180496,16 +180697,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "network_3_1_2_0" = callPackage
+  "network_3_1_2_1" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, hspec
      , hspec-discover, HUnit, QuickCheck, temporary
      }:
      mkDerivation {
        pname = "network";
-       version = "3.1.2.0";
-       sha256 = "07zbaaa4f0rnc4xqg5kbzqivmr9lqz2g6bw01gmqkmh9k9svsap0";
-       revision = "1";
-       editedCabalFile = "079svy0nr035xhz4gd6cila0wvsjl23hi3hq5407m3qdmcf4rkis";
+       version = "3.1.2.1";
+       sha256 = "0jlx8dls0h95znpcb66bd95k4mp3aaa733h89pq5ymyb8m29bapw";
        libraryHaskellDepends = [ base bytestring deepseq directory ];
        testHaskellDepends = [
          base bytestring directory hspec HUnit QuickCheck temporary
@@ -181020,6 +181219,8 @@ self: {
        ];
        description = "WebSocket backend for MessagePack RPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-metrics" = callPackage
@@ -182152,19 +182353,20 @@ self: {
   "ngx-export-tools-extra" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, array, base, base64, binary
      , bytestring, case-insensitive, containers, ede
-     , enclosed-exceptions, http-client, http-types, ngx-export
+     , enclosed-exceptions, http-client, http-types, network, ngx-export
      , ngx-export-tools, safe, snap-core, snap-server, template-haskell
      , text, time, trifecta, unordered-containers
      }:
      mkDerivation {
        pname = "ngx-export-tools-extra";
-       version = "0.5.8.0";
-       sha256 = "15jqvrbsabwcix1pkvqc1q9gwfskyil9v995109rzfasw9aihaqk";
+       version = "0.5.9.0";
+       sha256 = "073zzhrv9g7q8miqxws79h2hiqi3yssyb7smsb1mrx4y1rsmq4ss";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base base64 binary bytestring
          case-insensitive containers ede enclosed-exceptions http-client
-         http-types ngx-export ngx-export-tools safe snap-core snap-server
-         template-haskell text time trifecta unordered-containers
+         http-types network ngx-export ngx-export-tools safe snap-core
+         snap-server template-haskell text time trifecta
+         unordered-containers
        ];
        description = "More extra tools for Nginx haskell module";
        license = stdenv.lib.licenses.bsd3;
@@ -182584,22 +182786,23 @@ self: {
 
   "nix-thunk" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cli-extras
-     , cli-git, cli-nix, containers, data-default, directory, either
-     , exceptions, extra, filepath, git, github, here, lens
-     , logging-effect, megaparsec, modern-uri, mtl, optparse-applicative
-     , temporary, text, time, unix, which, yaml
+     , cli-git, cli-nix, containers, cryptonite, data-default, directory
+     , either, exceptions, extra, filepath, github, here, lens
+     , logging-effect, megaparsec, memory, modern-uri, monad-logger, mtl
+     , optparse-applicative, temporary, text, time, unix, which, yaml
      }:
      mkDerivation {
        pname = "nix-thunk";
-       version = "0.2.0.0";
-       sha256 = "1bkdcq4qvgnavpkvfvy6il691wwpw6lyba0hhxzjxbm132q46v2y";
+       version = "0.2.0.2";
+       sha256 = "1jxdxb8ri0cd7ni9z80xlb86d81bb83c6ki5wj7jx7sn9inzz8z7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring cli-extras cli-git cli-nix
-         containers data-default directory either exceptions extra filepath
-         git github here lens logging-effect megaparsec modern-uri mtl
-         optparse-applicative temporary text time unix which yaml
+         containers cryptonite data-default directory either exceptions
+         extra filepath github here lens logging-effect megaparsec memory
+         modern-uri monad-logger mtl optparse-applicative temporary text
+         time unix which yaml
        ];
        executableHaskellDepends = [
          base cli-extras optparse-applicative text
@@ -183370,21 +183573,6 @@ self: {
      }) {};
 
   "nonempty-vector" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest
-     , primitive, vector
-     }:
-     mkDerivation {
-       pname = "nonempty-vector";
-       version = "0.2.0.2";
-       sha256 = "1w7nmjqlrrymgpainzm7fx4fc6jfl45j7rx73xfcwjsdxl0fl3c2";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ base deepseq primitive vector ];
-       testHaskellDepends = [ base doctest ];
-       description = "Non-empty vectors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "nonempty-vector_0_2_1_0" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest
      , primitive, vector
      }:
@@ -183397,7 +183585,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Non-empty vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nonemptymap" = callPackage
@@ -184437,19 +184624,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "numhask_0_7_0_0" = callPackage
+    ({ mkDerivation, base, bifunctors, doctest, mmorph, protolude
+     , QuickCheck, random, text, transformers
+     }:
+     mkDerivation {
+       pname = "numhask";
+       version = "0.7.0.0";
+       sha256 = "03rf8yk30kqbmq4jdvm3jnqdfx09nmki0kd7y9g2v7g07j2y1qx9";
+       revision = "1";
+       editedCabalFile = "1n1kilds4c98swbjrybl18d7z82bq4m56nlv03an7b9002wv8xn4";
+       libraryHaskellDepends = [
+         base bifunctors mmorph protolude random text transformers
+       ];
+       testHaskellDepends = [ base doctest QuickCheck ];
+       description = "A numeric class hierarchy";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "numhask-array" = callPackage
     ({ mkDerivation, adjunctions, base, deepseq, distributive, doctest
-     , hmatrix, numhask, vector
+     , numhask, vector
      }:
      mkDerivation {
        pname = "numhask-array";
-       version = "0.7.0";
-       sha256 = "1izfym0y9920i2pbzil3z3sn8rzk23lj1rbgj0x0hc7y2p0w5lbm";
+       version = "0.8.0";
+       sha256 = "03c12d34s20f01vc9kpgrm3n4xi8h4kqzlndj1ncpqb69xx3fhc5";
        libraryHaskellDepends = [
-         adjunctions base deepseq distributive hmatrix numhask vector
+         adjunctions base deepseq distributive numhask vector
        ];
        testHaskellDepends = [ base doctest numhask ];
-       description = "n-dimensional arrays";
+       description = "Multi-dimensional array interface for numhask";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -184549,14 +184755,14 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-space";
-       version = "0.6.1";
-       sha256 = "0kqq2p0j7p7my33lw0alcc6il3chvsaj75cm1py0wa681jfmzxcv";
+       version = "0.7.0.0";
+       sha256 = "1vvm6px9wlqm07sc2p2df100x1pg2rgy363c59v1c910120lpdjd";
        libraryHaskellDepends = [
          adjunctions base containers distributive numhask semigroupoids
          tdigest text time
        ];
        testHaskellDepends = [ base doctest numhask ];
-       description = "numerical spaces";
+       description = "Numerical spaces";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -187798,18 +188004,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "optparse-applicative_0_16_0_0" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, process
-     , QuickCheck, transformers, transformers-compat
+  "optparse-applicative_0_16_1_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck
+     , transformers, transformers-compat
      }:
      mkDerivation {
        pname = "optparse-applicative";
-       version = "0.16.0.0";
-       sha256 = "0aybamakg9zjac0b78lhfa1bvilkb76yryis6h0pf5j1khrkri89";
+       version = "0.16.1.0";
+       sha256 = "16nnrkmgd28h540f17nb017ziq4gbzgkxpdraqicaczkca1jf1b2";
        libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
-       testHaskellDepends = [ base bytestring QuickCheck ];
+       testHaskellDepends = [ base QuickCheck ];
        description = "Utilities and combinators for parsing command line options";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188419,33 +188625,6 @@ self: {
      }) {};
 
   "ormolu" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dlist, exceptions
-     , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl
-     , optparse-applicative, path, path-io, syb, text
-     }:
-     mkDerivation {
-       pname = "ormolu";
-       version = "0.1.3.1";
-       sha256 = "1qad2s270rhgm2chhrmjd5zsv6bqykba978vn0hakm29mgck2zgw";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers dlist exceptions ghc-lib-parser mtl syb
-         text
-       ];
-       executableHaskellDepends = [
-         base ghc-lib-parser gitrev optparse-applicative text
-       ];
-       testHaskellDepends = [
-         base containers filepath hspec path path-io text
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A formatter for Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ormolu_0_1_4_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers, Diff
      , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec
      , hspec-discover, mtl, optparse-applicative, path, path-io, syb
@@ -188471,7 +188650,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A formatter for Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orthotope" = callPackage
@@ -189536,8 +189714,10 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.3.8.3";
-       sha256 = "0x6l3318g2x3q69drbnk2dkzn8l6c5m0msfnmwzbq6g6952gnsam";
+       version = "0.3.8.4";
+       sha256 = "098xp2n6rmg2vhaip8yyvrr534cllb1s6kj9p6r4iqqv4w3nc2sb";
+       revision = "1";
+       editedCabalFile = "1p1gkq4sgyxnfnna1avjmbw4ifrsmw920qhnaa4nkmbpgmccdca2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -190001,8 +190181,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "pandora";
-       version = "0.3.1";
-       sha256 = "0b6xh5fzxw5v9hh1xjksh2bwzmlnv7wra5l1s9gzfwl623xgh445";
+       version = "0.3.2";
+       sha256 = "1dj07dnljy1b7m9sq5dlxvvl8rbla8cf129s2wcw24x31j3ga96b";
        description = "A box of patterns and paradigms";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -190154,47 +190334,6 @@ self: {
      }) {};
 
   "pantry" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
-     , casa-client, casa-types, conduit, conduit-extra, containers
-     , cryptonite, cryptonite-conduit, digest, exceptions, filelock
-     , generic-deriving, hackage-security, hedgehog, hpack, hspec
-     , http-client, http-client-tls, http-conduit, http-download
-     , http-types, memory, mtl, network-uri, path, path-io, persistent
-     , persistent-sqlite, persistent-template, primitive, QuickCheck
-     , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint
-     , tar-conduit, text, text-metrics, time, transformers, unix-compat
-     , unliftio, unordered-containers, vector, yaml, zip-archive
-     }:
-     mkDerivation {
-       pname = "pantry";
-       version = "0.5.1.3";
-       sha256 = "0yx30zhyq0wbda6z8a9lvp8c83b3nj4l2s8lcxnvwgnzkanvlkss";
-       libraryHaskellDepends = [
-         aeson ansi-terminal base bytestring Cabal casa-client casa-types
-         conduit conduit-extra containers cryptonite cryptonite-conduit
-         digest filelock generic-deriving hackage-security hpack http-client
-         http-client-tls http-conduit http-download http-types memory mtl
-         network-uri path path-io persistent persistent-sqlite
-         persistent-template primitive resourcet rio rio-orphans
-         rio-prettyprint tar-conduit text text-metrics time transformers
-         unix-compat unliftio unordered-containers vector yaml zip-archive
-       ];
-       testHaskellDepends = [
-         aeson ansi-terminal base bytestring Cabal casa-client casa-types
-         conduit conduit-extra containers cryptonite cryptonite-conduit
-         digest exceptions filelock generic-deriving hackage-security
-         hedgehog hpack hspec http-client http-client-tls http-conduit
-         http-download http-types memory mtl network-uri path path-io
-         persistent persistent-sqlite persistent-template primitive
-         QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint
-         tar-conduit text text-metrics time transformers unix-compat
-         unliftio unordered-containers vector yaml zip-archive
-       ];
-       description = "Content addressable Haskell package management";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pantry_0_5_1_4" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
      , casa-client, casa-types, conduit, conduit-extra, containers
      , cryptonite, cryptonite-conduit, digest, exceptions, filelock
@@ -190233,7 +190372,6 @@ self: {
        ];
        description = "Content addressable Haskell package management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pantry-tmp" = callPackage
@@ -192770,23 +192908,6 @@ self: {
      }) {};
 
   "pcg-random" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest
-     , entropy, primitive, random
-     }:
-     mkDerivation {
-       pname = "pcg-random";
-       version = "0.1.3.6";
-       sha256 = "1m8xnic207ajbpz0q81h7xr9xmp1dzm6474vyvack6iidbzi4l08";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base bytestring entropy primitive random
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "Haskell bindings to the PCG random number generator";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pcg-random_0_1_3_7" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest
      , entropy, primitive, random
      }:
@@ -192801,7 +192922,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Haskell bindings to the PCG random number generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pcgen" = callPackage
@@ -195517,12 +195637,12 @@ self: {
      }) {};
 
   "phonetic-languages-common" = callPackage
-    ({ mkDerivation, base, subG, vector }:
+    ({ mkDerivation, base, subG, subG-instances, vector }:
      mkDerivation {
        pname = "phonetic-languages-common";
-       version = "0.1.1.0";
-       sha256 = "08i9g7yaiwryy9ndd0adbl3cskqva71mi45x55knc6r9wdhnprph";
-       libraryHaskellDepends = [ base subG vector ];
+       version = "0.1.2.0";
+       sha256 = "16m215rydybgn7wi5g3lh694z8zja2yr7b5p1rn33vgph2h5i8v7";
+       libraryHaskellDepends = [ base subG subG-instances vector ];
        description = "A generalization of the uniqueness-periods-vector-common package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -195539,12 +195659,12 @@ self: {
      }) {};
 
   "phonetic-languages-constraints" = callPackage
-    ({ mkDerivation, base, vector }:
+    ({ mkDerivation, base, subG, subG-instances, vector }:
      mkDerivation {
        pname = "phonetic-languages-constraints";
-       version = "0.3.2.0";
-       sha256 = "16gq0vr20bk3mg8b1w7gdlv32wr5vf9q0dj4f6x42x476fd4dcj3";
-       libraryHaskellDepends = [ base vector ];
+       version = "0.4.0.0";
+       sha256 = "11m389rpz7ddvmkf5wrasc41kmy67fki234fjcgi1djk8iawp5pw";
+       libraryHaskellDepends = [ base subG subG-instances vector ];
        description = "Constraints to filter the needed permutations";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -195560,8 +195680,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-examples";
-       version = "0.6.2.0";
-       sha256 = "1gjlbzd7hy280sy7qpzdrljpr59rmln8g0s7rsmkhzqbvfbyfgfj";
+       version = "0.6.2.1";
+       sha256 = "0k9cwvfdxf13izbww7g08p0x702xgmm7dck3mjk4maajjfia34zm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -195588,8 +195708,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-general";
-       version = "0.3.0.0";
-       sha256 = "0ay0814py6kxq4r64jlzpr1nkjdpkh5vdiw0kxn6ifzrh382681h";
+       version = "0.3.0.1";
+       sha256 = "1b99xf5glwdas2s8wsdgpwnzg5gmybdp6c3q547mi5xd7w6flh99";
        libraryHaskellDepends = [
          base phonetic-languages-common phonetic-languages-plus print-info
          subG vector
@@ -195635,8 +195755,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-properties";
-       version = "0.3.0.0";
-       sha256 = "1bf0k2wlypaiff84alnf94c5adbkbz1d3bkdbmd04bq937yc3rfq";
+       version = "0.3.0.1";
+       sha256 = "0b3wnzlka9dapk1478jr35pnd3ykj3mn5nkhvmwjdsxigzzaa1wf";
        libraryHaskellDepends = [
          base phonetic-languages-common phonetic-languages-rhythmicity
          phonetic-languages-vector ukrainian-phonetics-basic vector
@@ -195662,8 +195782,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-common";
-       version = "0.2.0.0";
-       sha256 = "0yksj6zinpyj1a61gikdkyh6f5xiqjlk66yywip3hgfigg809k8g";
+       version = "0.3.0.0";
+       sha256 = "1l5czk3ncwbv324k96gyc77lx8nvxxqpqggbyxw18wrwpmyn46i8";
        libraryHaskellDepends = [
          base phonetic-languages-permutations subG subG-instances vector
        ];
@@ -195671,6 +195791,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "phonetic-languages-simplified-properties-lists" = callPackage
+    ({ mkDerivation, base, phonetic-languages-rhythmicity
+     , phonetic-languages-simplified-common, ukrainian-phonetics-basic
+     , vector
+     }:
+     mkDerivation {
+       pname = "phonetic-languages-simplified-properties-lists";
+       version = "0.1.3.1";
+       sha256 = "1cbai5vi33fp7l3vpd4n0adjh0dbazhy7sms7716zd7vi4b2zm6s";
+       libraryHaskellDepends = [
+         base phonetic-languages-rhythmicity
+         phonetic-languages-simplified-common ukrainian-phonetics-basic
+         vector
+       ];
+       description = "A generalization of the uniqueness-periods-vector-properties package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "phonetic-languages-ukrainian" = callPackage
     ({ mkDerivation, base, mmsyn2, mmsyn5, vector }:
      mkDerivation {
@@ -197454,8 +197592,6 @@ self: {
        ];
        description = "properly streaming text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-transduce" = callPackage
@@ -200744,6 +200880,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "postgresql-binary_0_12_3_3" = 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.3.3";
+       sha256 = "0aivmhzs1cnr86j6xv6nix913walqfvgirydzrp09l5ppp5i2sps";
+       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 ];
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-common" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }:
      mkDerivation {
@@ -201060,36 +201226,6 @@ self: {
      }) {};
 
   "postgresql-simple" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , bytestring, bytestring-builder, case-insensitive, containers
-     , cryptohash-md5, filepath, hashable, HUnit, inspection-testing
-     , Only, postgresql-libpq, scientific, tasty, tasty-golden
-     , tasty-hunit, template-haskell, text, time, transformers
-     , uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "postgresql-simple";
-       version = "0.6.2";
-       sha256 = "15pkflx48mgv4fjmnagyfh06q065k8m8c98bysc3gm6m4srz5ypv";
-       revision = "4";
-       editedCabalFile = "03s0cbwqgkvzr1wkan7icfjb9qlz95pbs3pqv2mkpf117m3y1yb0";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring bytestring-builder
-         case-insensitive containers hashable Only postgresql-libpq
-         scientific template-haskell text time transformers uuid-types
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base base16-bytestring bytestring case-insensitive containers
-         cryptohash-md5 filepath HUnit inspection-testing postgresql-libpq
-         tasty tasty-golden tasty-hunit text time vector
-       ];
-       benchmarkHaskellDepends = [ base vector ];
-       description = "Mid-Level PostgreSQL client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "postgresql-simple_0_6_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, bytestring-builder, case-insensitive, containers
      , cryptohash-md5, filepath, hashable, HUnit, inspection-testing
@@ -201115,7 +201251,6 @@ self: {
        benchmarkHaskellDepends = [ base vector ];
        description = "Mid-Level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-bind" = callPackage
@@ -201324,6 +201459,8 @@ self: {
        ];
        description = "PostgreSQL AST parsing and rendering";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-transactional" = callPackage
@@ -202197,26 +202334,23 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
      , comonad, containers, deepseq, directory, doctest, hashable, lens
      , lens-action, pcre-heavy, pcre-light, pretty-terminal, QuickCheck
-     , safe, stm, string-conversions, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, th-lift
-     , th-lift-instances, these, time
+     , safe, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , text, these, time
      }:
      mkDerivation {
        pname = "predicate-typed";
-       version = "0.7.4.4";
-       sha256 = "0ynlwwh8x5zmr8i3vijdava61ixyv7c0cqb2i9y89pbc4nn72pcm";
+       version = "0.7.4.5";
+       sha256 = "00q5q7s4b208lr3r8nlnchi3racmdcbvqrr7xyzslz6fr4dih112";
        libraryHaskellDepends = [
          aeson aeson-pretty base binary bytestring comonad containers
          deepseq directory hashable lens pcre-heavy pcre-light
-         pretty-terminal QuickCheck safe string-conversions template-haskell
-         text th-lift th-lift-instances these time
+         pretty-terminal QuickCheck safe template-haskell text these time
        ];
        testHaskellDepends = [
          aeson aeson-pretty base binary bytestring comonad containers
          deepseq directory doctest hashable lens lens-action pcre-heavy
-         pcre-light pretty-terminal QuickCheck safe stm string-conversions
-         tasty tasty-hunit tasty-quickcheck template-haskell text th-lift
-         th-lift-instances these time
+         pcre-light pretty-terminal QuickCheck safe tasty tasty-hunit
+         tasty-quickcheck template-haskell text these time
        ];
        description = "Predicates, Refinement types and Dsl";
        license = stdenv.lib.licenses.bsd3;
@@ -203581,6 +203715,18 @@ self: {
      }) {};
 
   "primitive-unlifted" = callPackage
+    ({ mkDerivation, base, bytestring, primitive, stm, text-short }:
+     mkDerivation {
+       pname = "primitive-unlifted";
+       version = "0.1.3.0";
+       sha256 = "1q7scarsdv51x74g6ahvc5znk9h628s984a7bawig0lnx67wzwih";
+       libraryHaskellDepends = [ base bytestring primitive text-short ];
+       testHaskellDepends = [ base primitive stm ];
+       description = "Primitive GHC types with unlifted types inside";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "primitive-unlifted_1_0_0_0" = callPackage
     ({ mkDerivation, array, base, bytestring, primitive, QuickCheck
      , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short
      }:
@@ -203597,6 +203743,7 @@ self: {
        ];
        description = "Primitive GHC types with unlifted types inside";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primula-board" = callPackage
@@ -204825,18 +204972,18 @@ self: {
 
   "prolude" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, containers
-     , generic-random, mongoDB, persistent, persistent-mongoDB
+     , generic-random, mongoDB, mtl, persistent, persistent-mongoDB
      , QuickCheck, quickcheck-instances, safe-exceptions, scientific
-     , text, time, vector
+     , swagger2, text, time, vector
      }:
      mkDerivation {
        pname = "prolude";
-       version = "0.0.0.9";
-       sha256 = "0fnahs81xv2nx6cv6avp8bkhbprhy9vyhq5y3d0mna8iw06s0xfs";
+       version = "0.0.0.11";
+       sha256 = "0y9x5layrwd1na7rzrpc9syngcpg4h5cyd6lgg10xvbjkxqjz19v";
        libraryHaskellDepends = [
-         aeson base bytestring cassava containers generic-random mongoDB
+         aeson base bytestring cassava containers generic-random mongoDB mtl
          persistent persistent-mongoDB QuickCheck quickcheck-instances
-         safe-exceptions scientific text time vector
+         safe-exceptions scientific swagger2 text time vector
        ];
        description = "ITProTV's custom prelude";
        license = stdenv.lib.licenses.mit;
@@ -205949,8 +206096,8 @@ self: {
        pname = "pseudo-boolean";
        version = "0.1.9.0";
        sha256 = "00n5mf7abprhr9xvh3k1mw40jn4l94wwxpc2h0546h0n9v7srb1b";
-       revision = "2";
-       editedCabalFile = "1njlypxh9p0dfqywgqgyzgx9h822d37jbnnd9zbl0ci99k1247g6";
+       revision = "3";
+       editedCabalFile = "0x0a5rjylmh4pdmr9iyadywzh06qxypq48b78skvm09bkkvrxghq";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable megaparsec parsec void
@@ -208282,8 +208429,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-arbitrary-template";
-       version = "0.2.1.0";
-       sha256 = "1g9b39bhjcx44l8mwj5hwbjkd575prd46v16jz895q4f3ibqnfvp";
+       version = "0.2.1.1";
+       sha256 = "0cmk6kp895qrirdavbfp96k9yggs83bjcknyvwbkfzx5zbdc87y7";
        libraryHaskellDepends = [ base QuickCheck safe template-haskell ];
        testHaskellDepends = [
          base QuickCheck safe tasty tasty-golden tasty-hunit
@@ -210531,27 +210678,6 @@ self: {
      }) {};
 
   "rank2classes" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest
-     , markdown-unlit, tasty, tasty-hunit, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "rank2classes";
-       version = "1.4.0.1";
-       sha256 = "1r72z98jvnih16x074izb0wp9gwbsjs2ihvj8a72xxyakdad71r9";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base distributive template-haskell transformers
-       ];
-       testHaskellDepends = [
-         base distributive doctest tasty tasty-hunit
-       ];
-       testToolDepends = [ markdown-unlit ];
-       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rank2classes_1_4_1" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest
      , markdown-unlit, tasty, tasty-hunit, template-haskell
      , transformers
@@ -210570,7 +210696,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "standard type constructor class hierarchy, only with methods of rank 2 types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rapid" = callPackage
@@ -212051,22 +212176,22 @@ self: {
 
   "readme-lhs" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, containers, doctest
-     , foldl, numhask, pandoc, pandoc-types, scientific, tdigest, text
+     , foldl, generic-lens, numhask, pandoc, pandoc-types, text
      , transformers
      }:
      mkDerivation {
        pname = "readme-lhs";
-       version = "0.7.0";
-       sha256 = "0sgfqx34yzlvn2999wh2681gk6dan9nrlkzd3indybkmal9mc80b";
+       version = "0.8.0";
+       sha256 = "1yircw8xhrzj40y6026bjb8jx7mm3zkkss7bzvbph1vbpgcazsc4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base blaze-html containers foldl numhask pandoc
-         pandoc-types scientific tdigest text transformers
+         attoparsec base blaze-html containers foldl generic-lens numhask
+         pandoc pandoc-types text transformers
        ];
-       executableHaskellDepends = [ base numhask text ];
-       testHaskellDepends = [ base containers doctest ];
-       description = "See readme.md";
+       executableHaskellDepends = [ base numhask ];
+       testHaskellDepends = [ base doctest numhask ];
+       description = "Literate programming support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -213498,8 +213623,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-dom-retractable";
-       version = "0.1.6.0";
-       sha256 = "0xmxbyf72jnlyyr1iqgms43has4z3qv7ini5jrn1xkyhjmdanrcw";
+       version = "0.1.7.0";
+       sha256 = "0f40hxnlv7fpdjws0c720dz91zjxg8fxjl9qsmlilhapjzrjz9d2";
        libraryHaskellDepends = [
          base containers jsaddle mtl ref-tf reflex reflex-dom
        ];
@@ -213550,6 +213675,17 @@ self: {
        broken = true;
      }) {};
 
+  "reflex-external-ref" = callPackage
+    ({ mkDerivation, base, deepseq, reflex }:
+     mkDerivation {
+       pname = "reflex-external-ref";
+       version = "1.0.3.1";
+       sha256 = "0mv17j5g0h7y1ym4563xr1vc0sdvw0g4wdpx0a9aryk3i0k0i4mx";
+       libraryHaskellDepends = [ base deepseq reflex ];
+       description = "External reference with reactivity support";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "reflex-fsnotify" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, fsnotify
      , reflex
@@ -213703,6 +213839,57 @@ self: {
        broken = true;
      }) {};
 
+  "reflex-localize" = callPackage
+    ({ mkDerivation, base, jsaddle, mtl, reflex, reflex-external-ref
+     , text
+     }:
+     mkDerivation {
+       pname = "reflex-localize";
+       version = "1.0.2.0";
+       sha256 = "0iwxj8shik06r1wdhl8p5spvvn43xswilzhid8mfc3hj5khpzdzm";
+       libraryHaskellDepends = [
+         base jsaddle mtl reflex reflex-external-ref text
+       ];
+       description = "Localization library for reflex";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "reflex-localize-dom" = callPackage
+    ({ mkDerivation, base, containers, reflex, reflex-dom
+     , reflex-localize, text
+     }:
+     mkDerivation {
+       pname = "reflex-localize-dom";
+       version = "1.0.0.0";
+       sha256 = "1y2m15l6xxcmhhpn5jq3dfvzd04s5d84pm5s7iff9s0gkikhz4ga";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers reflex reflex-dom reflex-localize text
+       ];
+       description = "Helper widgets for reflex-localize";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "reflex-monad-auth" = callPackage
+    ({ mkDerivation, base, jsaddle, mtl, reflex, reflex-external-ref }:
+     mkDerivation {
+       pname = "reflex-monad-auth";
+       version = "0.1.0.1";
+       sha256 = "1gfhh462rd401rmcnb7lgn9443y2fg16xpyp4kgkzi8c4l8ja4af";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base jsaddle mtl reflex reflex-external-ref
+       ];
+       description = "Utilities to split reflex app to authorized and not authorized contexts";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "reflex-orphans" = callPackage
     ({ mkDerivation, base, deepseq, dependent-map, mtl, ref-tf, reflex
      , tasty, tasty-hunit, these
@@ -216268,6 +216455,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "req_3_8_0" = callPackage
+    ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
+     , bytestring, case-insensitive, connection, exceptions, hspec
+     , hspec-core, hspec-discover, http-api-data, http-client
+     , http-client-tls, http-types, modern-uri, monad-control, mtl
+     , QuickCheck, retry, template-haskell, text, time, transformers
+     , transformers-base, unliftio-core, unordered-containers
+     }:
+     mkDerivation {
+       pname = "req";
+       version = "3.8.0";
+       sha256 = "1qd0bawdxig6sldlhqgj8cpkzfy7da9yy0wkvzs6mps6yk14kbap";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson authenticate-oauth base blaze-builder bytestring
+         case-insensitive connection exceptions http-api-data http-client
+         http-client-tls http-types modern-uri monad-control mtl retry
+         template-haskell text time transformers transformers-base
+         unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive hspec
+         hspec-core http-client http-types modern-uri monad-control mtl
+         QuickCheck retry template-haskell text time unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
+       doCheck = false;
+       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
@@ -216776,6 +216995,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "resourcet-pool" = callPackage
+    ({ mkDerivation, base, resource-pool, resourcet }:
+     mkDerivation {
+       pname = "resourcet-pool";
+       version = "0.1.0.0";
+       sha256 = "1jf6sbyhxrqbkdxiv330rk46kdvbrr0c4pybnm9cmij9wdqs15bd";
+       libraryHaskellDepends = [ base resource-pool resourcet ];
+       description = "A small library to convert a Pool into an Acquire";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "respond" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, containers
      , data-default-class, exceptions, fast-logger, formatting, HList
@@ -218780,6 +219010,8 @@ self: {
        ];
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) rocksdb;};
 
   "rocksdb-haskell-jprupp" = callPackage
@@ -219604,8 +219836,8 @@ self: {
     ({ mkDerivation, base, hspec, rowdy, yesod-core }:
      mkDerivation {
        pname = "rowdy-yesod";
-       version = "0.0.1.0";
-       sha256 = "17k9bbxwpmxpswkmax6jrlcfrp6qhgdkjixsp4d6rn7mj676010g";
+       version = "0.0.1.1";
+       sha256 = "120n4n17n3pkpc23bpjn2vc7w3zaifmyd4mr86n16hn993482b1s";
        libraryHaskellDepends = [ base rowdy yesod-core ];
        testHaskellDepends = [ base hspec rowdy yesod-core ];
        description = "An EDSL for web application routes";
@@ -219851,10 +220083,8 @@ self: {
      }:
      mkDerivation {
        pname = "rss-conduit";
-       version = "0.6.0.0";
-       sha256 = "0crp7z6s5xch5jggyyg1a2jcijgl5cg17wiiqkcfmwjdkraz7ax9";
-       revision = "1";
-       editedCabalFile = "1xgqfn7dlzz79j4krmqg4d2xlybm6x4b0s8gklphn3lccwpicfy8";
+       version = "0.6.0.1";
+       sha256 = "07fmf5d93ywgqz4fp0aw5n1vzqlphrhcmiqrc0xpcphi17ig9m7l";
        libraryHaskellDepends = [
          atom-conduit base base-compat-batteries conduit conduit-combinators
          containers dublincore-xml-conduit microlens microlens-th safe
@@ -223721,6 +223951,8 @@ self: {
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seacat" = callPackage
@@ -225413,8 +225645,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.18.1";
-       sha256 = "15brknvia5kd1fiyxlqghhhnajwrgai9yspkg5nd0v2k1g9dllky";
+       version = "0.18.2";
+       sha256 = "18mfjj9za8g9rgj7a6j0ly6lf1ykfwrlpy3cf53lv1gxvb19gmk5";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bifunctors bytestring
          case-insensitive deepseq http-api-data http-media http-types mmorph
@@ -225448,6 +225680,8 @@ self: {
        ];
        description = "Servant support for JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-aeson-specs" = callPackage
@@ -225473,6 +225707,8 @@ self: {
        ];
        description = "generic tests for aeson serialization in servant";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth" = callPackage
@@ -225501,6 +225737,8 @@ self: {
        pname = "servant-auth-client";
        version = "0.4.1.0";
        sha256 = "16rmwdrx0qyqa821ipayczzl3gv8gvqgx8k9q8qaw19w87hwkh83";
+       revision = "1";
+       editedCabalFile = "0q7bazq4ilijclpz23fshpjcspnrfalh7jhqi5gg03m00wwibn4n";
        libraryHaskellDepends = [
          base bytestring containers servant servant-auth servant-client-core
        ];
@@ -225603,6 +225841,8 @@ self: {
        ];
        description = "Authentication via HMAC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-server" = callPackage
@@ -225796,6 +226036,8 @@ self: {
        ];
        description = "Authenticate Routes Using Wordpress Cookies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-avro" = callPackage
@@ -225813,6 +226055,8 @@ self: {
        ];
        description = "Avro content type for Servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-blaze" = callPackage
@@ -225848,6 +226092,8 @@ self: {
        ];
        description = "Servant CSV content-type for cassava";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-checked-exceptions" = callPackage
@@ -225935,10 +226181,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.18.1";
-       sha256 = "0pv9xj5a6caqxsnlnv4ijzavgmsgi0n3zri4h84mrjki2h2z1837";
-       revision = "1";
-       editedCabalFile = "1d2f8l2zs2gy880g3i9l3jwjrxygb705qz1f81ral7ik56465m83";
+       version = "0.18.2";
+       sha256 = "0acwpjmi5r62jgmpw508jq942kq5dhdy5602w9v7g318inxzwwi1";
        libraryHaskellDepends = [
          base base-compat bytestring containers deepseq exceptions
          http-client http-media http-types kan-extensions monad-control mtl
@@ -225964,10 +226208,10 @@ self: {
      }:
      mkDerivation {
        pname = "servant-client-core";
-       version = "0.18.1";
-       sha256 = "1pp4r8l1130ph680kcw7zpk1p76z88ip21cf4dghckmj0lflyw9h";
+       version = "0.18.2";
+       sha256 = "0b449c28z20sx98pc2d4p65jr3m9glsa47jjc2w4gf90jisl173r";
        revision = "1";
-       editedCabalFile = "04lk4zwx5g652krn561fd02wbrsg9jrj93hw7gv6z2xay8dr05m1";
+       editedCabalFile = "0vwj97h6x7zwvyx3ra09yhpi37mnn2kw5m27wnkzwwvk487swqxd";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring containers
          deepseq exceptions free http-media http-types network-uri safe
@@ -225996,6 +226240,8 @@ self: {
        ];
        description = "A servant client for frontend JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-client-namedargs" = callPackage
@@ -226017,6 +226263,8 @@ self: {
        ];
        description = "Automatically derive API client functions with named and optional parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-conduit" = callPackage
@@ -226069,6 +226317,8 @@ self: {
        libraryHaskellDepends = [ base servant ];
        description = "Servant types for defining API with relational DBs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-db-postgresql" = callPackage
@@ -226117,6 +226367,8 @@ self: {
        ];
        description = "Servant Dhall content-type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-docs" = callPackage
@@ -226127,8 +226379,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.11.7";
-       sha256 = "01m8ixxs310mcmnd1c5na2ycbnc9xwizdnzzcjdbli5r1mngpgc8";
+       version = "0.11.8";
+       sha256 = "0zbsv75zyfg44l4822qnmvw2naxcxwgnpzc55jnvz766l2dydjrb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -226167,6 +226419,8 @@ self: {
        ];
        description = "Generate endpoints overview for Servant API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-ede" = callPackage
@@ -226190,6 +226444,8 @@ self: {
        ];
        description = "Combinators for rendering EDE templates in servant web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-ekg" = callPackage
@@ -226216,6 +226472,8 @@ self: {
        ];
        description = "Helpers for using ekg with servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-elm" = callPackage
@@ -226238,6 +226496,8 @@ self: {
        ];
        description = "Automatically derive Elm functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-errors" = callPackage
@@ -226288,22 +226548,32 @@ self: {
      }) {};
 
   "servant-exceptions" = callPackage
-    ({ mkDerivation, aeson, base, exceptions, http-media, http-types
-     , mtl, servant, servant-server, text, wai, warp
+    ({ mkDerivation, aeson, base, exceptions, http-types, servant, text
      }:
      mkDerivation {
        pname = "servant-exceptions";
-       version = "0.1.1";
-       sha256 = "1qdb6ins7l0ryyrmg9j5pw428rlhkmzpbq5jqawfn01j8vf9yav5";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.1";
+       sha256 = "1bzxac87x3nfg5hllqxfi2qrdkiy2zfxwzkcg6vyjirnwpqvn49b";
        libraryHaskellDepends = [
-         aeson base exceptions http-media http-types mtl servant
-         servant-server text wai
+         aeson base exceptions http-types servant text
        ];
-       executableHaskellDepends = [
-         aeson base exceptions http-types servant-server text warp
+       description = "Extensible exceptions for servant APIs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-exceptions-server" = callPackage
+    ({ mkDerivation, base, exceptions, http-media, http-types, mtl
+     , servant, servant-exceptions, servant-server, text, wai
+     }:
+     mkDerivation {
+       pname = "servant-exceptions-server";
+       version = "0.2.1";
+       sha256 = "1cx9d2hx09mx1kypdhwyqhl6s1aipvxi4ak4xy4jrd0fy8r8wy9g";
+       libraryHaskellDepends = [
+         base exceptions http-media http-types mtl servant
+         servant-exceptions servant-server text wai
        ];
+       description = "Extensible exceptions for servant API servers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -226318,6 +226588,8 @@ self: {
        ];
        description = "Fiat content types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-flatten" = callPackage
@@ -226337,8 +226609,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-foreign";
-       version = "0.15.2";
-       sha256 = "0vxm80cnd4w8zpyq7brnnjmcarb0vj7xgikwpc0il1w6hjgis7vl";
+       version = "0.15.3";
+       sha256 = "1bz2ry5pd8cx5pmsvg7q29r9gd5kqjjv9nd97f7abwjqi8as2413";
        libraryHaskellDepends = [
          base base-compat http-types lens servant text
        ];
@@ -226359,6 +226631,8 @@ self: {
        libraryHaskellDepends = [ base servant servant-server ];
        description = "Utilities for generating mock server implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-generic" = callPackage
@@ -226375,6 +226649,8 @@ self: {
        ];
        description = "Specify Servant APIs with records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-github" = callPackage
@@ -226398,6 +226674,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings to GitHub API using servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-github-webhook" = callPackage
@@ -226447,6 +226725,8 @@ self: {
        ];
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-hmac-auth" = callPackage
@@ -226473,6 +226753,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Servant authentication with HMAC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-http-streams" = callPackage
@@ -226487,10 +226769,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-http-streams";
-       version = "0.18.1";
-       sha256 = "05ji6zg6v8cysfbh0850cmwrian0n2clvqn3b348cz3qms0ijrpg";
-       revision = "1";
-       editedCabalFile = "0xpscs5y480n19n3i4sn7xmb6kra7cyjxq64ic18cpqijv1jwlm1";
+       version = "0.18.2";
+       sha256 = "1kyiv8qamw9dxv2ax7hx9n7w9507vjvwn89x4nvlsc87nq91hvg0";
        libraryHaskellDepends = [
          base base-compat bytestring case-insensitive containers deepseq
          exceptions http-common http-media http-streams http-types
@@ -226532,6 +226812,8 @@ self: {
        ];
        description = "Generate HTTP2 clients from Servant API descriptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-iCalendar" = callPackage
@@ -226661,6 +226943,8 @@ self: {
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-lucid" = callPackage
@@ -226729,6 +227013,8 @@ self: {
        ];
        description = "Matrix parameter combinator for servant";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-mock" = callPackage
@@ -226757,6 +227043,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-multipart" = callPackage
@@ -226819,6 +227107,8 @@ self: {
        testHaskellDepends = [ base hspec named QuickCheck servant ];
        description = "Combinators for servant providing named parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-nix" = callPackage
@@ -226840,6 +227130,8 @@ self: {
        ];
        description = "Servant Nix content-type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-openapi3" = callPackage
@@ -226872,6 +227164,36 @@ self: {
        broken = true;
      }) {};
 
+  "servant-openapi3_2_0_1_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
+     , Cabal, cabal-doctest, directory, doctest, filepath, hspec
+     , hspec-discover, http-media, insert-ordered-containers, lens
+     , lens-aeson, openapi3, QuickCheck, servant, singleton-bool
+     , template-haskell, text, time, unordered-containers, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "servant-openapi3";
+       version = "2.0.1.1";
+       sha256 = "1cyzyljmdfr3gigdszcpj1i7l698fnxpc9hr83mzspm6qcmbqmgf";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base-compat bytestring hspec http-media
+         insert-ordered-containers lens openapi3 QuickCheck servant
+         singleton-bool text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base base-compat directory doctest filepath hspec lens
+         lens-aeson openapi3 QuickCheck servant template-haskell text time
+         utf8-string vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "servant-options" = callPackage
     ({ mkDerivation, base, bytestring, http-types, servant-foreign
      , servant-server, text, wai
@@ -226903,6 +227225,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck servant-server text ];
        description = "Type-safe pagination for Servant APIs";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-pandoc" = callPackage
@@ -226920,6 +227244,8 @@ self: {
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-pipes" = callPackage
@@ -226954,6 +227280,8 @@ self: {
        libraryHaskellDepends = [ base resource-pool servant time ];
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-postgresql" = callPackage
@@ -226970,6 +227298,8 @@ self: {
        ];
        description = "Useful functions and instances for using servant with a PostgreSQL context";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-proto-lens" = callPackage
@@ -226992,6 +227322,8 @@ self: {
        ];
        description = "Servant Content-Type for proto-lens protobuf modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-purescript" = callPackage
@@ -227015,6 +227347,8 @@ self: {
        ];
        description = "Generate PureScript accessor functions for you servant API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-pushbullet-client" = callPackage
@@ -227034,6 +227368,8 @@ self: {
        ];
        description = "Bindings to the Pushbullet API using servant-client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-py" = callPackage
@@ -227055,6 +227391,8 @@ self: {
        ];
        description = "Automatically derive python functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-quickcheck" = callPackage
@@ -227083,6 +227421,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-rawm" = callPackage
@@ -227105,6 +227445,8 @@ self: {
        libraryHaskellDepends = [ base servant-client-core servant-rawm ];
        description = "The client implementation of servant-rawm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-rawm-docs" = callPackage
@@ -227156,6 +227498,8 @@ self: {
        ];
        description = "Derive Reason types to interact with a Haskell backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-reflex" = callPackage
@@ -227178,6 +227522,8 @@ self: {
        ];
        description = "servant API generator for reflex apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-response" = callPackage
@@ -227210,6 +227556,8 @@ self: {
        ];
        description = "Servant router for non-server applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-ruby" = callPackage
@@ -227242,6 +227590,8 @@ self: {
        ];
        description = "Generate a web service for servant 'Resource's using scotty and JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-seo" = callPackage
@@ -227264,6 +227614,8 @@ self: {
        ];
        description = "Generate Robots.txt and Sitemap.xml specification for your servant API.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-serf" = callPackage
@@ -227283,6 +227635,8 @@ self: {
        doHaddock = false;
        description = "Generates a servant API module";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-server" = callPackage
@@ -227296,10 +227650,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.18.1";
-       sha256 = "1azyaprki2mxqxb67h792qrjzxy8cy9m9f7zxg22g60l3j197df5";
-       revision = "1";
-       editedCabalFile = "1z136vqfbxliq141y4i6m9d3bif4k0ay34xximlnnfxjazx4r0ph";
+       version = "0.18.2";
+       sha256 = "05ricb3w1app6c094zwaq2jnqv53jpf4n89ffynm31dvf6h9qdih";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -227337,6 +227689,8 @@ self: {
        ];
        description = "Automatically derive API server functions with named and optional parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-smsc-ru" = callPackage
@@ -227359,6 +227713,8 @@ self: {
        ];
        description = "Servant client for smsc.ru service for sending SMS to cell phones";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-snap" = callPackage
@@ -227460,6 +227816,8 @@ self: {
        testHaskellDepends = [ base hspec http-types QuickCheck servant ];
        description = "Servant combinators for the 'streaming' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-streaming-client" = callPackage
@@ -227485,6 +227843,8 @@ self: {
        ];
        description = "Client instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-streaming-docs" = callPackage
@@ -227502,6 +227862,8 @@ self: {
        ];
        description = "Client instances for the 'servant-docs' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-streaming-server" = callPackage
@@ -227528,6 +227890,8 @@ self: {
        ];
        description = "Server instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-subscriber" = callPackage
@@ -227598,6 +227962,8 @@ self: {
        ];
        description = "Swagger Tags for Servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-swagger-ui" = callPackage
@@ -227692,6 +228058,8 @@ self: {
        ];
        description = "Automatically generate Elm clients for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-tracing" = callPackage
@@ -227824,6 +228192,8 @@ self: {
        ];
        description = "Servant support for yaml";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-zeppelin" = callPackage
@@ -227835,6 +228205,8 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Types and definitions of servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-zeppelin-client" = callPackage
@@ -227858,6 +228230,8 @@ self: {
        ];
        description = "Client library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-zeppelin-server" = callPackage
@@ -227881,6 +228255,8 @@ self: {
        ];
        description = "Server library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-zeppelin-swagger" = callPackage
@@ -227902,6 +228278,8 @@ self: {
        ];
        description = "Swagger instances for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "server-generic" = callPackage
@@ -232591,6 +232969,8 @@ self: {
        ];
        description = "A very quick-and-dirty WebSocket server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skip-list" = callPackage
@@ -232679,6 +233059,29 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "skylighting_0_10_1" = callPackage
+    ({ mkDerivation, base, binary, blaze-html, bytestring, containers
+     , directory, filepath, pretty-show, skylighting-core, text
+     }:
+     mkDerivation {
+       pname = "skylighting";
+       version = "0.10.1";
+       sha256 = "0zpf6p3c0byp3pv9bgg77ndq89n3fhcazyln44pq8lxnmjy0x15v";
+       configureFlags = [ "-fexecutable" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers skylighting-core
+       ];
+       executableHaskellDepends = [
+         base blaze-html bytestring containers directory filepath
+         pretty-show text
+       ];
+       description = "syntax highlighting library";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "skylighting-core" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
@@ -232710,6 +233113,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "skylighting-core_0_10_1" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+     , base64-bytestring, binary, blaze-html, bytestring
+     , case-insensitive, colour, containers, criterion, Diff, directory
+     , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random, safe
+     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text
+     , transformers, utf8-string
+     }:
+     mkDerivation {
+       pname = "skylighting-core";
+       version = "0.10.1";
+       sha256 = "10da31x6zj1b3kydr63g36zmmqpqmgcbwdalhxvbmxliw1m5kfvx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal attoparsec base base64-bytestring binary
+         blaze-html bytestring case-insensitive colour containers directory
+         filepath hxt mtl safe text transformers utf8-string
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers Diff directory filepath HUnit
+         pretty-show QuickCheck random tasty tasty-golden tasty-hunit
+         tasty-quickcheck text utf8-string
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion directory filepath text
+       ];
+       description = "syntax highlighting library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "skylighting-extensions" = callPackage
     ({ mkDerivation, base, containers, skylighting, skylighting-modding
      , text
@@ -238242,8 +238677,8 @@ self: {
      }:
      mkDerivation {
        pname = "sr-extra";
-       version = "1.80";
-       sha256 = "03xm9km8wzvz8g1czj320k00xf2dzdi8rm74l7xdr9h7bxcwyh84";
+       version = "1.85.1";
+       sha256 = "15x8d413m8ldl81b5yx13nprr4k0aszx33mjm880za0k90s8r65x";
        libraryHaskellDepends = [
          base base64-bytestring bytestring bzlib Cabal cereal containers
          Diff directory exceptions fgl filemanip filepath generic-data
@@ -242558,20 +242993,6 @@ self: {
      }) {};
 
   "strict-tuple" = callPackage
-    ({ mkDerivation, base, bifunctors, deepseq, hashable }:
-     mkDerivation {
-       pname = "strict-tuple";
-       version = "0.1.3";
-       sha256 = "0dyiwgkbr1d97jbri7a2q4by7g0wiszpw3hgfgqv4rfp25lsv39j";
-       revision = "1";
-       editedCabalFile = "1bkizfki8v5p0n8sy59s4zqjmv1mnv3s45327cig9cr081ibv9yy";
-       libraryHaskellDepends = [ base bifunctors deepseq hashable ];
-       testHaskellDepends = [ base ];
-       description = "Strict tuples";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "strict-tuple_0_1_4" = callPackage
     ({ mkDerivation, base, bifunctors, deepseq, hashable }:
      mkDerivation {
        pname = "strict-tuple";
@@ -242581,7 +243002,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Strict tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-tuple-lens" = callPackage
@@ -247825,8 +248245,8 @@ self: {
      }:
      mkDerivation {
        pname = "tart";
-       version = "0.2";
-       sha256 = "03pi46lr5b9qcc35ffwxwzv9ll51cyv526kjcvaags3ky917rxxn";
+       version = "0.3";
+       sha256 = "0zqj8cz4q1447an9fak73vzandd497xa745km3w4y3cffnc0zwyw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -247838,8 +248258,6 @@ self: {
        ];
        description = "Terminal Art";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "task" = callPackage
@@ -248270,24 +248688,6 @@ self: {
      }) {};
 
   "tasty-hspec" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
-     , tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "tasty-hspec";
-       version = "1.1.5.1";
-       sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y";
-       revision = "6";
-       editedCabalFile = "0xa7h0p5r41m2a3l5r9ggmm4bc2a6wzgb4qvcqfl0dd2yb922bkz";
-       libraryHaskellDepends = [
-         base hspec hspec-core QuickCheck tasty tasty-quickcheck
-         tasty-smallcheck
-       ];
-       description = "Hspec support for the Tasty test framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-hspec_1_1_6" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
      , tasty-quickcheck, tasty-smallcheck
      }:
@@ -248301,7 +248701,6 @@ self: {
        ];
        description = "Hspec support for the Tasty test framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-html" = callPackage
@@ -251936,38 +252335,6 @@ self: {
      }) {};
 
   "text-show" = callPackage
-    ({ mkDerivation, array, base, base-compat-batteries, base-orphans
-     , bifunctors, bytestring, bytestring-builder, containers, criterion
-     , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim
-     , hspec, hspec-discover, integer-gmp, QuickCheck
-     , quickcheck-instances, template-haskell, text, th-abstraction
-     , th-lift, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "text-show";
-       version = "3.8.5";
-       sha256 = "0xc2269v0bfcvlwm60l2zs6l6lwljfnq5n05n9kp580qybvynzjg";
-       revision = "3";
-       editedCabalFile = "13gqszvlbqpgb2am8ny8v1p56yx5l9vqs2w45g8ld53f50ll62rv";
-       libraryHaskellDepends = [
-         array base base-compat-batteries bifunctors bytestring
-         bytestring-builder containers generic-deriving ghc-boot-th ghc-prim
-         integer-gmp template-haskell text th-abstraction th-lift
-         transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         array base base-compat-batteries base-orphans bytestring
-         bytestring-builder deriving-compat generic-deriving ghc-prim hspec
-         QuickCheck quickcheck-instances template-haskell text transformers
-         transformers-compat
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
-       description = "Efficient conversion of values into Text";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-show_3_9" = callPackage
     ({ mkDerivation, array, base, base-compat-batteries, base-orphans
      , bifunctors, bytestring, bytestring-builder, containers, criterion
      , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim
@@ -251995,7 +252362,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-show-instances" = callPackage
@@ -252744,25 +253110,6 @@ self: {
      }) {};
 
   "th-lift-instances" = callPackage
-    ({ mkDerivation, base, bytestring, containers, QuickCheck
-     , template-haskell, text, th-lift, transformers, vector
-     }:
-     mkDerivation {
-       pname = "th-lift-instances";
-       version = "0.1.17";
-       sha256 = "0k59j460dcr9vidmww2has78g3zx2wl0cjlpqc1laqai9w8klda5";
-       libraryHaskellDepends = [
-         base bytestring containers template-haskell text th-lift
-         transformers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers QuickCheck template-haskell text vector
-       ];
-       description = "Lift instances for template-haskell for common data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-lift-instances_0_1_18" = callPackage
     ({ mkDerivation, base, bytestring, containers, QuickCheck
      , template-haskell, text, th-lift, transformers, vector
      }:
@@ -252779,7 +253126,6 @@ self: {
        ];
        description = "Lift instances for template-haskell for common data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-nowq" = callPackage
@@ -254091,14 +254437,14 @@ self: {
        broken = true;
      }) {};
 
-  "time_1_11" = callPackage
+  "time_1_11_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, QuickCheck, random
      , tasty, tasty-hunit, tasty-quickcheck, unix
      }:
      mkDerivation {
        pname = "time";
-       version = "1.11";
-       sha256 = "16kmc754gz73plwb7lnk206r9v99va8y4ilbm347h6xmi5z7avp9";
+       version = "1.11.1";
+       sha256 = "0l0nqqg38xz2q78pi4i4jsbrb1jkn9ch0xlq17kn7824dh0j21vw";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck
@@ -254735,8 +255081,8 @@ self: {
      }:
      mkDerivation {
        pname = "timerep";
-       version = "2.0.0.2";
-       sha256 = "0fakjs6fgva6i035jiyr8hcgnrivw601cy8n3ja232d07izl2khx";
+       version = "2.0.1.0";
+       sha256 = "1l67gbfjydq0xapry5k9pwzxmp6z7ixzyvwshnszryspcckagxif";
        libraryHaskellDepends = [
          attoparsec base monoid-subclasses text time
        ];
@@ -256157,6 +256503,8 @@ self: {
        ];
        description = "tonatona plugin for servant";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "too-many-cells" = callPackage
@@ -256788,26 +257136,6 @@ self: {
      }) {};
 
   "tracing" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , case-insensitive, containers, hspec, http-client, mtl, network
-     , random, stm, text, time, transformers, unliftio
-     }:
-     mkDerivation {
-       pname = "tracing";
-       version = "0.0.5.1";
-       sha256 = "06d4fik133jbwbznk6fccwhw21n750gnigw9gj25sgjkghydmllb";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring case-insensitive containers
-         http-client mtl network random stm text time transformers unliftio
-       ];
-       testHaskellDepends = [
-         base containers hspec mtl stm text unliftio
-       ];
-       description = "Distributed tracing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tracing_0_0_5_2" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , case-insensitive, containers, hspec, http-client, mtl, network
      , random, stm, text, time, transformers, unliftio
@@ -256825,7 +257153,6 @@ self: {
        ];
        description = "Distributed tracing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tracing-control" = callPackage
@@ -261283,8 +261610,8 @@ self: {
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.7.9.1";
-       sha256 = "0vw0mbkii7j5rr5fp370j8grq355cg0ddw55f24gbjw1z0wc71hx";
+       version = "0.7.10.1";
+       sha256 = "0zq0bl4j1hwf2q0ipl0vp0q19lhs0bnwmrh7qh1qn53g078aj5ga";
        libraryHaskellDepends = [
          aeson aeson-pretty autoexporter base bytestring dlist
          monad-skeleton template-haskell text th-data-compat
@@ -261372,6 +261699,95 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "typson-beam" = callPackage
+    ({ mkDerivation, aeson, base, beam-core, beam-migrate
+     , beam-postgres, bytestring, exceptions, hedgehog, HUnit, microlens
+     , postgresql-simple, tasty, tasty-hedgehog, tasty-hunit
+     , test-fixture, typson-core
+     }:
+     mkDerivation {
+       pname = "typson-beam";
+       version = "0.1.0.1";
+       sha256 = "0zhi81hvas561c1qxnnbyrdsc3di8iakrhyz59ppc551cgzf28da";
+       libraryHaskellDepends = [
+         aeson base beam-core beam-postgres postgresql-simple typson-core
+       ];
+       testHaskellDepends = [
+         aeson base beam-core beam-migrate beam-postgres bytestring
+         exceptions hedgehog HUnit microlens postgresql-simple tasty
+         tasty-hedgehog tasty-hunit test-fixture typson-core
+       ];
+       description = "Typson Beam Integration";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "typson-core" = callPackage
+    ({ mkDerivation, aeson, base, containers, profunctors, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "typson-core";
+       version = "0.1.0.1";
+       sha256 = "1mgpr6j1q18ky6acpg9zahvb07lr3902cwawizp399k25d7s7a9q";
+       libraryHaskellDepends = [
+         aeson base containers profunctors text unordered-containers vector
+       ];
+       description = "Type-safe PostgreSQL JSON Querying";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "typson-esqueleto" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, esqueleto, exceptions
+     , hedgehog, microlens, persistent, persistent-postgresql
+     , persistent-template, postgresql-simple, tasty, tasty-hedgehog
+     , tasty-hunit, test-fixture, text, typson-core
+     }:
+     mkDerivation {
+       pname = "typson-esqueleto";
+       version = "0.1.0.1";
+       sha256 = "15dw1vp676sg8d1iyfcr1psx4vaix8mi4mbp4p431138yqa56qx4";
+       libraryHaskellDepends = [
+         aeson base esqueleto persistent persistent-template text
+         typson-core
+       ];
+       testHaskellDepends = [
+         aeson base bytestring esqueleto exceptions hedgehog microlens
+         persistent persistent-postgresql persistent-template
+         postgresql-simple tasty tasty-hedgehog tasty-hunit test-fixture
+         text typson-core
+       ];
+       description = "Typson Esqueleto Integration";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "typson-selda" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, exceptions, hedgehog
+     , HUnit, microlens, selda, selda-json, selda-postgresql, tasty
+     , tasty-hedgehog, tasty-hunit, test-fixture, text, typson-core
+     }:
+     mkDerivation {
+       pname = "typson-selda";
+       version = "0.1.0.0";
+       sha256 = "09jp1p82d0vv879rnxmingbdph6qcfszlywrn6h8r26apmh9v5pr";
+       libraryHaskellDepends = [
+         aeson base bytestring selda selda-json selda-postgresql text
+         typson-core
+       ];
+       testHaskellDepends = [
+         aeson base bytestring exceptions hedgehog HUnit microlens selda
+         selda-json selda-postgresql tasty tasty-hedgehog tasty-hunit
+         test-fixture text typson-core
+       ];
+       description = "Typson Selda Integration";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "tyro" = callPackage
     ({ mkDerivation, aeson, base, bytestring, HUnit, protolude
      , reflection, singletons, test-framework, test-framework-hunit
@@ -261868,8 +262284,8 @@ self: {
     ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }:
      mkDerivation {
        pname = "ukrainian-phonetics-basic";
-       version = "0.2.0.2";
-       sha256 = "016q1wq4wbwxjd3a4fbj68h525q8gc2v1gn211mq3divhzc3rhwz";
+       version = "0.3.1.2";
+       sha256 = "0a4fdf64wv23kpnmz0jggm7vc0iazzsv8kpip3qjpnyfq2yqw06r";
        libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ];
        description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
        license = stdenv.lib.licenses.mit;
@@ -262083,6 +262499,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unbounded-delays_0_1_1_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "unbounded-delays";
+       version = "0.1.1.1";
+       sha256 = "11b1vmlfv4pmmpl4kva58w7cf50xsj819cq3wzqgnbz3px9pxbar";
+       libraryHaskellDepends = [ base ];
+       description = "Unbounded thread delays and timeouts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unbounded-delays-units" = callPackage
     ({ mkDerivation, base, unbounded-delays, units, units-defs }:
      mkDerivation {
@@ -265556,19 +265984,18 @@ self: {
      }) {};
 
   "uusi" = callPackage
-    ({ mkDerivation, base, Cabal, HUnit, microlens, microlens-th, text
+    ({ mkDerivation, base, Cabal, filepath, HUnit, microlens
+     , microlens-th, text
      }:
      mkDerivation {
        pname = "uusi";
-       version = "0.2.0.0";
-       sha256 = "0ycl5nml9v9dxksi2bcl5bff0nirn9g5cs8p0f09lxg81kis2zjl";
-       revision = "1";
-       editedCabalFile = "13w8xn1mqjjjb3ismi0l78xm7bkhrvyph0wgyfvf6pyn1866qzmn";
+       version = "0.2.1.0";
+       sha256 = "11r7p2g4pkxd57xvnbids3r6gwr76ar8c2kpdvpi9jlp01p0rfbm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal microlens microlens-th text ];
        executableHaskellDepends = [
-         base Cabal microlens microlens-th text
+         base Cabal filepath microlens microlens-th text
        ];
        testHaskellDepends = [
          base Cabal HUnit microlens microlens-th text
@@ -268506,8 +268933,8 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "vulkan";
-       version = "3.6.15";
-       sha256 = "1jg6d8k06dz2nnbddxis83hlrwjhdf735q8zr4gv7sx6wnl60f3n";
+       version = "3.7";
+       sha256 = "1d2fdlgnzrjhd59niw0qm4qiqa8zcpjxj340r82018n06w4v5vsy";
        libraryHaskellDepends = [ base bytestring transformers vector ];
        librarySystemDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
@@ -268535,8 +268962,8 @@ self: {
      }:
      mkDerivation {
        pname = "vulkan-utils";
-       version = "0.2";
-       sha256 = "0xzh76lmyhd43myghnw9w7cil38jiryrbz19myp5krr9r1g6rwyb";
+       version = "0.3";
+       sha256 = "1q5qy4ah75xq4imr28i97f07qmbwaaisb7zc25ms6vr0cz4ijg7w";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bytestring extra file-embed filepath resourcet
@@ -268956,6 +269383,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-extra_3_1_3" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , bytestring, call-stack, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, fast-logger, hspec
+     , http-types, http2, HUnit, iproute, network, old-locale, resourcet
+     , streaming-commons, text, time, transformers, unix, unix-compat
+     , vault, void, wai, wai-logger, word8, zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.1.3";
+       sha256 = "17s8cf0fdbkg9z2pvpsbhxg2cy5yy3c94513gkgf81lfl38zdrn7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring bytestring call-stack
+         case-insensitive containers cookie data-default-class deepseq
+         directory fast-logger http-types http2 HUnit iproute network
+         old-locale resourcet streaming-commons text time transformers unix
+         unix-compat vault void wai wai-logger word8 zlib
+       ];
+       testHaskellDepends = [
+         aeson base bytestring case-insensitive cookie fast-logger hspec
+         http-types http2 HUnit resourcet text time transformers wai zlib
+       ];
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-feature-flags" = callPackage
     ({ mkDerivation, aeson, base, bytestring, random, text
      , unordered-containers, wai, warp
@@ -274587,6 +275044,8 @@ self: {
        testHaskellDepends = [ base bytestring envy hspec skews text ];
        description = "A-little-higher-level WebSocket client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wstunnel" = callPackage
@@ -279292,43 +279751,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, bytestring, case-insensitive, cereal, clientsession
-     , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
-     , gauge, hspec, hspec-expectations, http-types, HUnit, memory
-     , monad-logger, mtl, network, parsec, path-pieces, primitive
-     , random, resourcet, 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.18.6";
-       sha256 = "1iay7lrc52krhnlkvr6bxchnwk9lj316fv2d47bh3bfay69wqc69";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq fast-logger http-types memory
-         monad-logger mtl parsec path-pieces primitive random resourcet
-         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 random resourcet shakespeare streaming-commons
-         template-haskell text transformers unliftio wai wai-extra warp
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text
-       ];
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_18_7" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, bytestring, case-insensitive, cereal, clientsession
      , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
@@ -279363,7 +279785,6 @@ self: {
        ];
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -281986,18 +282407,20 @@ self: {
 
   "zeolite-lang" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, hashable
-     , mtl, parsec, regex-tdfa, transformers, unix
+     , mtl, parsec, regex-tdfa, time, transformers, unix
      }:
      mkDerivation {
        pname = "zeolite-lang";
-       version = "0.8.0.0";
-       sha256 = "1ahr69w65hd70jc0jrc3dfz1gnjqxlg9w24djzm6826wskg31fa9";
+       version = "0.9.0.0";
+       sha256 = "0gcjjxavsc763a218rswzk7zrx917qg5sid7gpy81yw054kfp6ws";
+       revision = "1";
+       editedCabalFile = "0c76xxaxqwsh0ybvf5r6wza9gq7y7hiqm75pazmrhkzvm48q1dl8";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath hashable mtl parsec regex-tdfa
-         transformers unix
+         time transformers unix
        ];
        executableHaskellDepends = [
          base containers directory filepath unix
@@ -282228,6 +282651,8 @@ self: {
        ];
        description = "Haskell implementation of several ZeroMQ patterns";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeromq4-simple" = callPackage
@@ -282488,14 +282913,15 @@ self: {
      }:
      mkDerivation {
        pname = "zio";
-       version = "0.1.0.0";
-       sha256 = "001bkysr4n5azly7cmn7xbgw0bg00ib4yg83klz0k0b5217wg982";
+       version = "0.1.0.2";
+       sha256 = "15ka58l6xv3v4x5rcam75gq37mfcxjngm0frz9k0rmzqyf07l06k";
        libraryHaskellDepends = [
          base mtl transformers unexceptionalio unexceptionalio-trans
        ];
        testHaskellDepends = [
          base mtl transformers unexceptionalio unexceptionalio-trans
        ];
+       description = "App-centric Monad-transformer based on Scala ZIO (UIO + ReaderT + ExceptT)";
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
@@ -283291,18 +283717,18 @@ self: {
      }) {};
 
   "zydiskell" = callPackage
-    ({ mkDerivation, base, bytestring, fixed-vector, storable-record
-     , vector
+    ({ mkDerivation, base, bytestring, containers, fixed-vector
+     , storable-record
      }:
      mkDerivation {
        pname = "zydiskell";
-       version = "0.1.1.0";
-       sha256 = "16fc3k0m0aln0ssy6nl2fjgl6l8svpyddyr0hrvzm0h5lbnk3h0w";
+       version = "0.2.0.0";
+       sha256 = "0pbwhvl6mff5k0rvpjijqpncqbm5g53ij1bc3ckq66q2v5ikswk8";
        libraryHaskellDepends = [
-         base bytestring fixed-vector storable-record vector
+         base bytestring containers fixed-vector storable-record
        ];
        testHaskellDepends = [
-         base bytestring fixed-vector storable-record vector
+         base bytestring containers fixed-vector storable-record
        ];
        description = "Haskell language binding for the Zydis library, a x86/x86-64 disassembler";
        license = stdenv.lib.licenses.gpl3;

From 855c7fb6da9316caffe3f6395cb8c99091139d34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 27 Nov 2020 20:03:30 +0100
Subject: [PATCH 3882/3942] git-annex: update sha256 hash for the new
 8.20201127 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 4d37668fd017..272332e33eab 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -69,7 +69,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "13s6czv4p6n6s16kr5r255vldrn9038qjd5yl5xrh91xk6z410cd";
+      sha256 = "1l2syrslba4mrxjzj0iblflz72siw3ibqri6p5hf59fk7rmm30a8";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From c8c6cdb48bcc8b16028f58e45575b77980204b8b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 20:22:39 +0000
Subject: [PATCH 3883/3942] fastjet-contrib: 1.042 -> 1.045

---
 .../development/libraries/physics/fastjet-contrib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix
index 2bc5b12dfb77..68e07e7b42dd 100644
--- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix
+++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fastjet-contrib";
-  version = "1.042";
+  version = "1.045";
 
   src = fetchurl {
     url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz";
-    sha256 = "0cc8dn6g7adj2pgs8hvczg68i3xhlk6978m4gxamgibilf9jw1av";
+    sha256 = "1y45jx7i30ik2pjv33y16fi5i5jpmi0zp1jh32pwywd3diaiazv6";
   };
 
   buildInputs = [ fastjet ];

From 0ce6c50370bad08950e3c7824cecd0927bf56bd4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 27 Nov 2020 15:43:09 -0500
Subject: [PATCH 3884/3942] minecraft: Skip desktop file validation

---
 pkgs/games/minecraft/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 60f89bea0e8f..7ef2f533476f 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -37,6 +37,7 @@ let
     comment = "Official launcher for Minecraft, a sandbox-building game";
     desktopName = "Minecraft Launcher";
     categories = "Game;";
+    fileValidation = false;
   };
 
   envLibPath = stdenv.lib.makeLibraryPath [

From 00aabed73c73dd053ab182ca1a726b111db9ebf3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 21:27:37 +0000
Subject: [PATCH 3885/3942] inter: 3.11 -> 3.15

---
 pkgs/data/fonts/inter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix
index 9c7ef62c7690..ed8e9eb13a63 100644
--- a/pkgs/data/fonts/inter/default.nix
+++ b/pkgs/data/fonts/inter/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 
 let
-  version = "3.11";
+  version = "3.15";
 in fetchzip {
   name = "inter-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip {
     unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
-  sha256 = "1bk4q478jy84ylgm1mmh23n8cw1cd3k7gvfih77sd7ya1zv26vl1";
+  sha256 = "0dnxczy2avc47wq5fc3psd1zbxbsjz5w24rkh5ynrfgw6n0753n0";
 
   meta = with lib; {
     homepage = "https://rsms.me/inter/";

From e007728c922d468180e93e9ca5ce1a52a0076404 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 21:33:29 +0000
Subject: [PATCH 3886/3942] agave: 30 -> 35

---
 pkgs/data/fonts/agave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix
index ea64cf34578d..39ef6e34aaae 100644
--- a/pkgs/data/fonts/agave/default.nix
+++ b/pkgs/data/fonts/agave/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "agave";
-  version = "30";
+  version = "35";
 in fetchurl {
   name = "${pname}-${version}";
   url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf";
@@ -13,7 +13,7 @@ in fetchurl {
     install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf
   '';
 
-  sha256 = "1f2f1fycwi8xbf8x03yfq78nv11b2msl4ll9flw8rkg023h9vwg7";
+  sha256 = "10shwsl1illdafnc352j439lklrxksip1vlh4jc934cr9qf4c1fz";
 
   meta = with lib; {
     description = "truetype monospaced typeface designed for X environments";

From 0acf2268f33ffdb6c0fed4db89cbca6032c8134a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 21:42:59 +0000
Subject: [PATCH 3887/3942] gitAndTools.gitstatus: 1.3.1 -> 1.4.3

---
 .../version-management/git-and-tools/gitstatus/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
index 47d095b0f1c1..a99ff3c2e08c 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gitstatus";
-  version = "1.3.1";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "gitstatus";
     rev = "v${version}";
-    sha256 = "03zaywncds7pjrl07rvdf3fh39gnp2zfvgsf0afqwv317sgmgpzf";
+    sha256 = "0skpi22plzb9r9cgqfnjzpaz856q9f4n0gd5i97nv8bfny8hl30z";
   };
 
   buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];

From f4c44e6314fe429853f32ec259abf3e71467e42c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 14:05:32 +0000
Subject: [PATCH 3888/3942] etcd_3_4: 3.4.13 -> 3.4.14

---
 pkgs/servers/etcd/3.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix
index be52b1bf1a58..dc9fc0898dff 100644
--- a/pkgs/servers/etcd/3.4.nix
+++ b/pkgs/servers/etcd/3.4.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "etcd";
-  version = "3.4.13";
+  version = "3.4.14";
 
   deleteVendor = true;
   vendorSha256 = "0jlnh4789xa2dhbyp33k9r278kc588ykggamnnfqivb27s2646bc";
@@ -13,7 +13,7 @@ buildGoModule rec {
     owner = "etcd-io";
     repo = "etcd";
     rev = "v${version}";
-    sha256 = "0bvky593241i60qf6793sxzsxwfl3f56cgscnva9f2jfhk157wmy";
+    sha256 = "0s6xwc8yczjdf6xysb6m0pp31hxjqdqjw24bliq08094jprhj31f";
   };
 
   buildPhase = ''

From 831c700c5d04c791c9384991d38ac146067daa64 Mon Sep 17 00:00:00 2001
From: Roosembert Palacios <roosemberth@posteo.ch>
Date: Fri, 27 Nov 2020 22:42:03 +0100
Subject: [PATCH 3889/3942] firejail: fix -overlay and -build functionality on
 NixOS

- The `-overlay` flag runs the specified binary inside an OverlayFS,
  since the /nix store may be in a different mount point than the user
  home, this patch explicitly bind mounts it so it's available inside
  the overlay.

- profile builder: firejail provides facilities to build a new profiles.
  To do so, it execute the helper binary `fbuilder`, which in turn will
  execute firejail back with different options. This patch makes it use
  the binary available in PATH instead of the one produced at compile time.
  The compiled firejail binary doesn't have the necessary permissions,
  so the firejail NixOS module wraps it in a SUID wrapper available on
  PATH at runtime.

Signed-off-by: Roosembert Palacios <roosemberth@posteo.ch>
---
 pkgs/os-specific/linux/firejail/default.nix   |  9 +++++++
 .../fbuilder-call-firejail-on-path.patch      | 11 ++++++++
 .../firejail/mount-nix-dir-on-overlay.patch   | 27 +++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch
 create mode 100644 pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index fadf5df7140a..a3be5484a047 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -20,6 +20,15 @@ stdenv.mkDerivation {
     name = "${s.name}.tar.bz2";
   };
 
+  patches = [
+    # Adds the /nix directory when using an overlay.
+    # Required to run any programs under this mode.
+    ./mount-nix-dir-on-overlay.patch
+    # By default fbuilder hardcodes the firejail binary to the install path.
+    # On NixOS the firejail binary is a setuid wrapper available in $PATH.
+    ./fbuilder-call-firejail-on-path.patch
+  ];
+
   prePatch = ''
     # Allow whitelisting ~/.nix-profile
     substituteInPlace etc/firejail.config --replace \
diff --git a/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch b/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch
new file mode 100644
index 000000000000..6016891655b1
--- /dev/null
+++ b/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch
@@ -0,0 +1,11 @@
+--- a/src/fbuilder/build_profile.c
++++ b/src/fbuilder/build_profile.c
+@@ -67,7 +67,7 @@
+ 		errExit("asprintf");
+ 
+ 	char *cmdlist[] = {
+-	  BINDIR "/firejail",
++	  "firejail",
+ 	  "--quiet",
+ 	  "--noprofile",
+ 	  "--caps.drop=all",
diff --git a/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch b/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch
new file mode 100644
index 000000000000..685314f90758
--- /dev/null
+++ b/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch
@@ -0,0 +1,27 @@
+--- a/src/firejail/fs.c
++++ b/src/firejail/fs.c
+@@ -1143,6 +1143,16 @@
+ 		errExit("mounting /dev");
+ 	fs_logger("whitelist /dev");
+ 
++	// mount-bind /nix
++	if (arg_debug)
++		printf("Mounting /nix\n");
++	char *nix;
++	if (asprintf(&nix, "%s/nix", oroot) == -1)
++		errExit("asprintf");
++	if (mount("/nix", nix, NULL, MS_BIND|MS_REC, NULL) < 0)
++		errExit("mounting /nix");
++	fs_logger("whitelist /nix");
++
+ 	// mount-bind run directory
+ 	if (arg_debug)
+ 		printf("Mounting /run\n");
+@@ -1201,6 +1211,7 @@
+ 	free(odiff);
+ 	free(owork);
+ 	free(dev);
++	free(nix);
+ 	free(run);
+ 	free(tmp);
+ }

From d607ea474061e59f4e48ee873d4c0b73f0b357a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 27 Nov 2020 23:19:16 +0100
Subject: [PATCH 3890/3942] ursadb: mark broken on darwin

---
 pkgs/servers/ursadb/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix
index 8a2f768443f5..6a3a1cff5b56 100644
--- a/pkgs/servers/ursadb/default.nix
+++ b/pkgs/servers/ursadb/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation {
     license = licenses.bsd3;
     maintainers = with maintainers; [ msm ];
     platforms = platforms.unix;
+    broken = stdenv.isDarwin;
   };
 }

From 1d2d1271d6d7d2d2170fb00ba47d67ceb91c7d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 27 Nov 2020 23:19:26 +0100
Subject: [PATCH 3891/3942] irods: mark platforms.linux

cause upstream does not mention darwin anywhere
---
 pkgs/tools/filesystems/irods/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix
index fb90c3b0aebb..dfa7530ac64f 100644
--- a/pkgs/tools/filesystems/irods/common.nix
+++ b/pkgs/tools/filesystems/irods/common.nix
@@ -51,6 +51,6 @@ with stdenv;
     homepage = "https://irods.org";
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.bzizou ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 2197ec8e83c5ee6be5c7532ce1fd00ba6d62f629 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 22:13:21 +0000
Subject: [PATCH 3892/3942] gmic: 2.9.3 -> 2.9.4

---
 pkgs/tools/graphics/gmic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 6787ff2e8f8d..e8e9472cabdf 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gmic";
-  version = "2.9.3";
+  version = "2.9.4";
 
   outputs = [ "out" "lib" "dev" "man" ];
 
   src = fetchurl {
     url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
-    sha256 = "1pj3rwycwnspw2lm5j0w4647677y6s3446zsx9s6br9bc7v7w5s6";
+    sha256 = "1ixcdq16gmgh1brrb6mgdibypq9lvh8gnz86b5mmyxlnyi4fw2vr";
   };
 
   nativeBuildInputs = [

From ba38fdd8f4b50d2662c53d1c0ec4f2effe17fd10 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Wed, 25 Nov 2020 14:10:40 -0800
Subject: [PATCH 3893/3942] nodePackages: update

---
 .../development/node-packages/composition.nix |   2 +-
 .../node-packages/node-packages.nix           | 736 ++++++++++--------
 2 files changed, 414 insertions(+), 324 deletions(-)

diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix
index 17879f381d57..027a981ea57f 100644
--- a/pkgs/development/node-packages/composition.nix
+++ b/pkgs/development/node-packages/composition.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index bbec98b42cc3..c26a6e07f177 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -328,13 +328,13 @@ let
         sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==";
       };
     };
-    "@babel/core-7.12.8" = {
+    "@babel/core-7.12.9" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.12.8";
+      version = "7.12.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.8.tgz";
-        sha512 = "ra28JXL+5z73r1IC/t+FT1ApXU5LsulFDnTDntNfLQaScJUJmcHL5Qxm/IWanCToQk3bPWQo5bflbplU5r15pg==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz";
+        sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==";
       };
     };
     "@babel/core-7.9.0" = {
@@ -1354,13 +1354,13 @@ let
         sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
       };
     };
-    "@babel/traverse-7.12.8" = {
+    "@babel/traverse-7.12.9" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.12.8";
+      version = "7.12.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.8.tgz";
-        sha512 = "EIRQXPTwFEGRZyu6gXbjfpNORN1oZvwuzJbxcXjAgWV0iqXYDszN1Hx3FVm6YgZfu1ZQbCVAk3l+nIw95Xll9Q==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz";
+        sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==";
       };
     };
     "@babel/types-7.10.4" = {
@@ -2056,13 +2056,13 @@ let
         sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ==";
       };
     };
-    "@fluentui/react-7.152.2" = {
+    "@fluentui/react-7.153.1" = {
       name = "_at_fluentui_slash_react";
       packageName = "@fluentui/react";
-      version = "7.152.2";
+      version = "7.153.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.152.2.tgz";
-        sha512 = "NQzXzwNLwPHdM7VbpRU4ZOzmGd3UElBikQtJcvqTV0wC605auiqS/s6S6v93/9rh+fOXbppY8tZmVXSXWCsLvA==";
+        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.153.1.tgz";
+        sha512 = "+k1oPrvBTpmJ03PhfbaPB8oEhD57TWIGdxPajyvkJzSMgmcPOxVA5nAz2MiPdou1vtTuOgNSTDHsAQSeqVqtGA==";
       };
     };
     "@fluentui/react-compose-0.19.12" = {
@@ -3460,13 +3460,13 @@ let
         sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
       };
     };
-    "@netlify/build-5.3.2" = {
+    "@netlify/build-5.3.3" = {
       name = "_at_netlify_slash_build";
       packageName = "@netlify/build";
-      version = "5.3.2";
+      version = "5.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/build/-/build-5.3.2.tgz";
-        sha512 = "haRUNAWfLpF/xFXFSpTB7GjzbvQRYsfu3lUHWXMsopWncIP507mfBnMrTj9sXPhmtiTGiDCZo96IbTbGWne+tw==";
+        url = "https://registry.npmjs.org/@netlify/build/-/build-5.3.3.tgz";
+        sha512 = "PgAPLFZeHeR45mM2km/UHXfg/3K9NtrGKAaoG7vwU36XYEaVaB/psBp0PzrfJbRiBER+vqnxrDTOyHJc4Z0w1g==";
       };
     };
     "@netlify/cache-utils-1.0.6" = {
@@ -3541,103 +3541,103 @@ let
         sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q==";
       };
     };
-    "@netlify/traffic-mesh-agent-0.26.0" = {
+    "@netlify/traffic-mesh-agent-0.27.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent";
       packageName = "@netlify/traffic-mesh-agent";
-      version = "0.26.0";
+      version = "0.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.26.0.tgz";
-        sha512 = "FVmxKUxKoF9JY7qgZ93SwjhUkEYgod2dcsgVhYNuf2p/UbxZDJI0tCtaajj3XvHoaNRHq1tCuXmhH+oMZD5Wpw==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.0.tgz";
+        sha512 = "a+jXM75Ir9PavNTzDRkZWQT7jHc02wWF8mRYXWbvku+VLqmmkA61RyhAgSeo5dMWSdMofSRkoifnW7leyv7Obw==";
       };
     };
-    "@netlify/traffic-mesh-agent-darwin-x64-0.26.0" = {
+    "@netlify/traffic-mesh-agent-darwin-x64-0.27.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64";
       packageName = "@netlify/traffic-mesh-agent-darwin-x64";
-      version = "0.26.0";
+      version = "0.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.26.0.tgz";
-        sha512 = "F1eOp1kN3dd1z0iPdd3jI6gVpyrG5jhnq1pg7/ez29Y5P+E+kBE+9qkyRdP5Kq2EPxPFNtnNU8teug3gNpBI7g==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.0.tgz";
+        sha512 = "a0EDNrdLBjxp+GYj/WQSifuQZorFQkY6spO4wuOl3mQV3tKTkBmu09+FsfitYpgZHDMoPzfhvURJrUtJIHTgqQ==";
       };
     };
-    "@netlify/traffic-mesh-agent-linux-x64-0.26.0" = {
+    "@netlify/traffic-mesh-agent-linux-x64-0.27.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent-linux-x64";
       packageName = "@netlify/traffic-mesh-agent-linux-x64";
-      version = "0.26.0";
+      version = "0.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.26.0.tgz";
-        sha512 = "2+gzwcz9XhhX2DgOzIUxQOVDH58e8blbatdlQqwkZ8iLzmQq1UWws4WOPcierfSJv+m2QIoNkSubhZoI9M9DEg==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.0.tgz";
+        sha512 = "m7p/0eTXKILxCpTqQOmBkYdIjYKwSC2KZbPpDJ4sYfnMIF3qa9uMp8qrK9At/oGPckeiTq4Id775veldhwt2lw==";
       };
     };
-    "@netlify/traffic-mesh-agent-win32-x64-0.26.0" = {
+    "@netlify/traffic-mesh-agent-win32-x64-0.27.0" = {
       name = "_at_netlify_slash_traffic-mesh-agent-win32-x64";
       packageName = "@netlify/traffic-mesh-agent-win32-x64";
-      version = "0.26.0";
+      version = "0.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.26.0.tgz";
-        sha512 = "s+rON64IkiD/Qp5KyNA3/D9kpnvEpWw3JTYR5NVw6qwg2exc5unXe+D5mCCSu2wBR2zsRKvL53hbiXEbQ6S3ug==";
+        url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.0.tgz";
+        sha512 = "u6Beazs0KWRcEx9q2n417Sj7+WGrDTtDGmmKPTE6WexFt6uY1oiq3AR+ohCtu1lIIsmAfAYd8O5dSOnyAT8dFg==";
       };
     };
-    "@netlify/zip-it-and-ship-it-1.4.1" = {
+    "@netlify/zip-it-and-ship-it-1.4.2" = {
       name = "_at_netlify_slash_zip-it-and-ship-it";
       packageName = "@netlify/zip-it-and-ship-it";
-      version = "1.4.1";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.4.1.tgz";
-        sha512 = "LlYqpKdaYdN8b2To8xS4Uye9ALOw0dXye/vwPvLYWY6nLTigJEajqPpt1D0YUJdV+4FD2KmzIhzgMU/l7jQSTQ==";
+        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.4.2.tgz";
+        sha512 = "iwwKQrBnLONYm1x7g6GZvHmjeZ03/L2NUYL/2NcpNYtE4sWB+M5OTDdnlVsu8u65dR7wtH4hKjOO2ID6vS7rQQ==";
       };
     };
-    "@node-red/editor-api-1.2.5" = {
+    "@node-red/editor-api-1.2.6" = {
       name = "_at_node-red_slash_editor-api";
       packageName = "@node-red/editor-api";
-      version = "1.2.5";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.5.tgz";
-        sha512 = "ZoWCBDPtuP9wxKxC/SK5hzTMTg6QQlvouoZelZ5h2nS2UGL3Mk+udsJL56FwSYrb/w4JfqG58wmG+DEsmjBKGg==";
+        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.6.tgz";
+        sha512 = "RM243A8AgpoHEc8cu8STCYsJVx790clVxvRUCaLfbAyb+dKn+9b0TOKWsmLUW4fhrMqwwVlFOMulVHPhg0HhGg==";
       };
     };
-    "@node-red/editor-client-1.2.5" = {
+    "@node-red/editor-client-1.2.6" = {
       name = "_at_node-red_slash_editor-client";
       packageName = "@node-red/editor-client";
-      version = "1.2.5";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.5.tgz";
-        sha512 = "pqf+JSp0mNQ3o8fnEH6NKJQNj7/QJQKAHGKjmm1uAnaOJMGpOeO7Wap6/obPKzf0o67uVteYKD81LfhsI0afgQ==";
+        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.6.tgz";
+        sha512 = "2hMnMVcqhR77mHqHzVj3hNJGZ8VcaO+lhggNYhORJXEqYCeAULj92hMCeoA4pjHDqGBn2F+gldli1WOs1/JgJg==";
       };
     };
-    "@node-red/nodes-1.2.5" = {
+    "@node-red/nodes-1.2.6" = {
       name = "_at_node-red_slash_nodes";
       packageName = "@node-red/nodes";
-      version = "1.2.5";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.5.tgz";
-        sha512 = "4rHYyIGYrLSZWlxX/KWyOQ4+M6srPd/0i3Idw/68PMBCw9ygyn9DpcBGd6IEqbkSa4BRdcjkomOpmmGsRuCDkw==";
+        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.6.tgz";
+        sha512 = "1LlECIzKKBHUOsWGLw31FT1mWL2mSecr9gBh2FqwnP7gNejebYjwP2zuHKOYs9sPRm3550zOJ5mlutXiiFKwYg==";
       };
     };
-    "@node-red/registry-1.2.5" = {
+    "@node-red/registry-1.2.6" = {
       name = "_at_node-red_slash_registry";
       packageName = "@node-red/registry";
-      version = "1.2.5";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.5.tgz";
-        sha512 = "NPF+9abbj2bF/WKgV6sC+hskAJh1AUZPUx1aM/x6xk0tCtotOqx7KRDZlbzKMqT1hKb7V1tsBYtzdIMmCdJncQ==";
+        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.6.tgz";
+        sha512 = "+zwHxnMr9Adve627dtw2jl/KSjTY+a5JrwJN10TSKMxVLwYeBLm/ugRTA9tkGiCjr2w9pgsnMUZRFFLfdyRZCQ==";
       };
     };
-    "@node-red/runtime-1.2.5" = {
+    "@node-red/runtime-1.2.6" = {
       name = "_at_node-red_slash_runtime";
       packageName = "@node-red/runtime";
-      version = "1.2.5";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.5.tgz";
-        sha512 = "5RR90HtNAs194+hqh803MmaKZxmfUboGYHMO5dcAhv+e1Fh5SM2lDpGJDLM7j3QI4bWRqdi82qd1y2kXvLqgYA==";
+        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.6.tgz";
+        sha512 = "zfQGK4Hqssv5TV8S5WLZ77BHYmyylarZvEScVQpivhJHg6HeZL+MffqqtPIyTM1ulklPZvO6fPmq/f5T/CgAgw==";
       };
     };
-    "@node-red/util-1.2.5" = {
+    "@node-red/util-1.2.6" = {
       name = "_at_node-red_slash_util";
       packageName = "@node-red/util";
-      version = "1.2.5";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.5.tgz";
-        sha512 = "V+/bWsEg8PIZemgzpjqcpq+/zcjuj/fJ3qoJNRDWFYQ+6VU24W+cGiz795z1KfmyloeMLw3LPikp7lQGikTtIw==";
+        url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.6.tgz";
+        sha512 = "CYUCS8iqcaZFBf0vwtVPqqNXX0XY0ajFW69smtDItbxslyZL3A0qRMiTTv0qMPA1uvOCEw4wQRSIQV7j/nd0yw==";
       };
     };
     "@nodelib/fs.scandir-2.1.3" = {
@@ -5431,6 +5431,15 @@ let
         sha512 = "d/aS/lPOnUSruPhgNtT8jW39fHRVTLQy9sodysP1kkG8EdAtdZu1vt8NJaYA8w/6Z9j8izkAsx1A/yJhcYR1CA==";
       };
     };
+    "@types/component-emitter-1.2.10" = {
+      name = "_at_types_slash_component-emitter";
+      packageName = "@types/component-emitter";
+      version = "1.2.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz";
+        sha512 = "bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==";
+      };
+    };
     "@types/configstore-2.1.1" = {
       name = "_at_types_slash_configstore";
       packageName = "@types/configstore";
@@ -6079,13 +6088,13 @@ let
         sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==";
       };
     };
-    "@types/node-10.17.46" = {
+    "@types/node-10.17.47" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.17.46";
+      version = "10.17.47";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.17.46.tgz";
-        sha512 = "Tice8a+sJtlP9C1EUo0DYyjq52T37b3LexVu3p871+kfIBIN+OQ7PKPei1oF3MgF39olEpUfxaLtD+QFc1k69Q==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.17.47.tgz";
+        sha512 = "YZ1mMAdUPouBZCdeugjV8y1tqqr28OyL8DYbH5ePCfe9zcXtvbh1wDBy7uzlHkXo3Qi07kpzXfvycvrkby/jXw==";
       };
     };
     "@types/node-12.7.12" = {
@@ -6097,13 +6106,13 @@ let
         sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==";
       };
     };
-    "@types/node-13.13.32" = {
+    "@types/node-13.13.33" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.13.32";
+      version = "13.13.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.13.32.tgz";
-        sha512 = "sPBvDnrwZE1uePhkCEyI/qQlgZM5kePPAhHIFDWNsOrWBFRBOk3LKJYmVCLeLZlL9Ub/FzMJb31OTWCg2F+06g==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.13.33.tgz";
+        sha512 = "1B3GM1yuYsFyEvBb+ljBqWBOylsWDYioZ5wpu8AhXdIhq20neXS7eaSC8GkwHE0yQYGiOIV43lMsgRYTgKZefQ==";
       };
     };
     "@types/node-14.11.1" = {
@@ -6115,13 +6124,13 @@ let
         sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==";
       };
     };
-    "@types/node-14.14.9" = {
+    "@types/node-14.14.10" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.14.9";
+      version = "14.14.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.14.9.tgz";
-        sha512 = "JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz";
+        sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==";
       };
     };
     "@types/node-6.14.13" = {
@@ -6754,76 +6763,76 @@ let
         sha512 = "mFdUlfDGxoyreCQWO/SX4DvM/6epn37AimVGzLJLpSPJdWUerCnvxwzB6zL83SiYC6O6++cWEdzgz7EtKViFlA==";
       };
     };
-    "@vue/compiler-core-3.0.2" = {
+    "@vue/compiler-core-3.0.3" = {
       name = "_at_vue_slash_compiler-core";
       packageName = "@vue/compiler-core";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.2.tgz";
-        sha512 = "GOlEMTlC/OdzBkKaKOniYErbkjoKxkBOmulxGmMR10I2JJX6TvXd/peaO/kla2xhpliV/M6Z4TLJp0yjAvRIAw==";
+        url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.3.tgz";
+        sha512 = "iWlRT8RYLmz7zkg84pTOriNUzjH7XACWN++ImFkskWXWeev29IKi7p76T9jKDaMZoPiGcUZ0k9wayuASWVxOwg==";
       };
     };
-    "@vue/compiler-dom-3.0.2" = {
+    "@vue/compiler-dom-3.0.3" = {
       name = "_at_vue_slash_compiler-dom";
       packageName = "@vue/compiler-dom";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.2.tgz";
-        sha512 = "jvaL4QF2yXBJVD+JLbM2YA3e5fNfflJnfQ+GtfYk46ENGsEetqbkZqcX7fO+RHdG8tZBo7LCNBvgD0QLr+V4sg==";
+        url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.3.tgz";
+        sha512 = "6GdUbDPjsc0MDZGAgpi4lox+d+aW9/brscwBOLOFfy9wcI9b6yLPmBbjdIsJq3pYdJWbdvACdJ77avBBdHEP8A==";
       };
     };
-    "@vue/compiler-sfc-3.0.2" = {
+    "@vue/compiler-sfc-3.0.3" = {
       name = "_at_vue_slash_compiler-sfc";
       packageName = "@vue/compiler-sfc";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.2.tgz";
-        sha512 = "viYjT5ehDSLM3v0jQ9hbTs4I5e/7lSlYsDOp7TQ1qcwHRvzoTQMTkFpY/Iae+LFKM124Ld17tBfXgfrZl9dt+g==";
+        url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.3.tgz";
+        sha512 = "YocHSirye85kRVC4lU0+SE6uhrwGJzbhwkrqG4g6kmsAUopZ0qUjbICMlej5bYx2+AUz9yBIM7hpK8nIKFVFjg==";
       };
     };
-    "@vue/compiler-ssr-3.0.2" = {
+    "@vue/compiler-ssr-3.0.3" = {
       name = "_at_vue_slash_compiler-ssr";
       packageName = "@vue/compiler-ssr";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.2.tgz";
-        sha512 = "gOgK1lf+0bFl+kQj6TU0TU1jIDFlsPRlSBZaUUA16DGeeiJrFanhsMuIs/l9U0IBFr/VJcHgzYpTXqHp95luHw==";
+        url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.3.tgz";
+        sha512 = "IjJMoHCiDk939Ix7Q5wrex59TVJr6JFQ95gf36f4G4UrVau0GGY/3HudnWT/6eyWJ7267+odqQs1uCZgDfL/Ww==";
       };
     };
-    "@vue/reactivity-3.0.2" = {
+    "@vue/reactivity-3.0.3" = {
       name = "_at_vue_slash_reactivity";
       packageName = "@vue/reactivity";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.2.tgz";
-        sha512 = "GdRloNcBar4yqWGXOcba1t//j/WizwfthfPUYkjcIPHjYnA/vTEQYp0C9+ZjPdinv1WRK1BSMeN/xj31kQES4A==";
+        url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.3.tgz";
+        sha512 = "t39Qmc42MX7wJtf8L6tHlu17eP9Rc5w4aRnxpLHNWoaRxddv/7FBhWqusJ2Bwkk8ixFHOQeejcLMt5G469WYJw==";
       };
     };
-    "@vue/runtime-core-3.0.2" = {
+    "@vue/runtime-core-3.0.3" = {
       name = "_at_vue_slash_runtime-core";
       packageName = "@vue/runtime-core";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.2.tgz";
-        sha512 = "3m/jOs2xSipEFah9FgpEzvC9nERFonVGLN06+pf8iYPIy54Nlv7D2cyrk3Lhbjz4w3PbIrkxJnoTJYvJM7HDfA==";
+        url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.3.tgz";
+        sha512 = "Fd1JVnYI6at0W/2ERwJuTSq4S22gNt8bKEbICcvCAac7hJUZ1rylThlrhsvrgA+DVkWU01r0niNZQ4UddlNw7g==";
       };
     };
-    "@vue/runtime-dom-3.0.2" = {
+    "@vue/runtime-dom-3.0.3" = {
       name = "_at_vue_slash_runtime-dom";
       packageName = "@vue/runtime-dom";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.2.tgz";
-        sha512 = "vqC1KK1yWthTw1FKzajT0gYQaEqAq7bpeeXQC473nllGC5YHbJhNAJLSmrDun1tjXqGF0UNCWYljYm+++BJv6w==";
+        url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.3.tgz";
+        sha512 = "ytTvSlRaEYvLQUkkpruIBizWIwuIeHER0Ch/evO6kUaPLjZjX3NerVxA40cqJx8rRjb9keQso21U2Jcpk8GsTg==";
       };
     };
-    "@vue/shared-3.0.2" = {
+    "@vue/shared-3.0.3" = {
       name = "_at_vue_slash_shared";
       packageName = "@vue/shared";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.2.tgz";
-        sha512 = "Zx869zlNoujFOclKIoYmkh8ES2RcS/+Jn546yOiPyZ+3+Ejivnr+fb8l+DdXUEFjo+iVDNR3KyLzg03aBFfZ4Q==";
+        url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.3.tgz";
+        sha512 = "yGgkF7u4W0Dmwri9XdeY50kOowN4UIX7aBQ///jbxx37itpzVjK7QzvD3ltQtPfWaJDGBfssGL0wpAgwX9OJpQ==";
       };
     };
     "@webassemblyjs/ast-1.8.1" = {
@@ -9220,13 +9229,13 @@ let
         sha1 = "9e528762b4a9066ad163a6962a364418e9626ece";
       };
     };
-    "array-includes-3.1.1" = {
+    "array-includes-3.1.2" = {
       name = "array-includes";
       packageName = "array-includes";
-      version = "3.1.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz";
-        sha512 = "c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==";
+        url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.2.tgz";
+        sha512 = "w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==";
       };
     };
     "array-initial-1.1.0" = {
@@ -10021,13 +10030,13 @@ let
         sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw==";
       };
     };
-    "aws-sdk-2.798.0" = {
+    "aws-sdk-2.799.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.798.0";
+      version = "2.799.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.798.0.tgz";
-        sha512 = "7BMCH90yFpMmCF5uxZiiKMMzIAFibZz8b6CLGw/92FgMd86ZedpNqDyaikcGv1yOVtOlNCCnXN6OglC8/vwm4Q==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.799.0.tgz";
+        sha512 = "NYAoiNU+bJXhlJsC0rFqrmD5t5ho7/VxldmziP6HLPYHfOCI9Uvk6UVjfPmhLWPm0mHnIxhsHqmsNGyjhHNYmw==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -12460,6 +12469,15 @@ let
         sha512 = "95try3p/vMRkIAAnJDaGkFhGpT/65NoeW6XelEPjAomWYR58RQtW4khn0SwKj34kZoE7uxL7w2koZSwbnszvQQ==";
       };
     };
+    "buffer-queue-1.0.0" = {
+      name = "buffer-queue";
+      packageName = "buffer-queue";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-queue/-/buffer-queue-1.0.0.tgz";
+        sha1 = "3d253fe2f0ab70e851d728712e8cd6f914a8c002";
+      };
+    };
     "buffer-writer-2.0.0" = {
       name = "buffer-writer";
       packageName = "buffer-writer";
@@ -15608,7 +15626,7 @@ let
       src = fetchgit {
         url = "https://github.com/wikimedia/content-type.git";
         rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b";
-        sha256 = "18eb299165567b0a97e9d5576f7c189fe57072b8b8323ac179571c9e6a10fdd9";
+        sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
       };
     };
     "content-types-0.1.0" = {
@@ -15998,13 +16016,13 @@ let
         sha512 = "gzTLeBQzNP8aM/nG0/7sSfICfNazUgwvEU2kiDaybbYXmxwioo2v96h4tzE0XOyA64beyYwAyRYEEqWA4AMZjw==";
       };
     };
-    "core-js-2.6.11" = {
+    "core-js-2.6.12" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.6.11";
+      version = "2.6.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz";
-        sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz";
+        sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
       };
     };
     "core-js-3.6.5" = {
@@ -16016,22 +16034,22 @@ let
         sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==";
       };
     };
-    "core-js-3.7.0" = {
+    "core-js-3.8.0" = {
       name = "core-js";
       packageName = "core-js";
-      version = "3.7.0";
+      version = "3.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz";
-        sha512 = "NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.8.0.tgz";
+        sha512 = "W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA==";
       };
     };
-    "core-js-compat-3.7.0" = {
+    "core-js-compat-3.8.0" = {
       name = "core-js-compat";
       packageName = "core-js-compat";
-      version = "3.7.0";
+      version = "3.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz";
-        sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==";
+        url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.0.tgz";
+        sha512 = "o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -19868,13 +19886,13 @@ let
         sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
       };
     };
-    "electron-to-chromium-1.3.606" = {
+    "electron-to-chromium-1.3.607" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.606";
+      version = "1.3.607";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.606.tgz";
-        sha512 = "+/2yPHwtNf6NWKpaYt0KoqdSZ6Qddt6nDfH/pnhcrHq9hSb23e5LFy06Mlf0vF2ykXvj7avJ597psqcbKnG5YQ==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.607.tgz";
+        sha512 = "h2SYNaBnlplGS0YyXl8oJWokfcNxVjJANQfMCsQefG6OSuAuNIeW+A8yGT/ci+xRoBb3k2zq1FrOvkgoKBol8g==";
       };
     };
     "electrum-client-git://github.com/janoside/electrum-client" = {
@@ -19884,7 +19902,7 @@ let
       src = fetchgit {
         url = "git://github.com/janoside/electrum-client";
         rev = "d98e929028d2b05c88a41fe37652737912bead79";
-        sha256 = "db3e28ff127c4ffe0c5740e22266b345056f06462479ec07d6f5e9e833fea555";
+        sha256 = "d6dfc396ae69eba6efa303039d6ebb46a5cd51d1b79a293f915609057b9062be";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -19923,6 +19941,15 @@ let
         sha512 = "x+p+XNxLk8ittsYN7294mCnQ2i48udu3UGdHBv2gw1u1MVigXctcfbp5H9ebqTJnDxkbs6PdOSBOAdYGGDN7uA==";
       };
     };
+    "elfy-1.0.0" = {
+      name = "elfy";
+      packageName = "elfy";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/elfy/-/elfy-1.0.0.tgz";
+        sha512 = "4Kp3AA94jC085IJox+qnvrZ3PudqTi4gQNvIoTZfJJ9IqkRuCoqP60vCVYlIg00c5aYusi5Wjh2bf0cHYt+6gQ==";
+      };
+    };
     "elliptic-6.5.3" = {
       name = "elliptic";
       packageName = "elliptic";
@@ -20158,6 +20185,15 @@ let
         sha512 = "buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==";
       };
     };
+    "endian-reader-0.3.0" = {
+      name = "endian-reader";
+      packageName = "endian-reader";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/endian-reader/-/endian-reader-0.3.0.tgz";
+        sha1 = "84eca436b80aed0d0639c47291338b932efe50a0";
+      };
+    };
     "ends-with-0.2.0" = {
       name = "ends-with";
       packageName = "ends-with";
@@ -22289,7 +22325,7 @@ let
       src = fetchgit {
         url = "https://github.com/fauna/faunadb-js.git";
         rev = "135256ed60a8043201085f18ed6fd2032cc9dd88";
-        sha256 = "db68519d85618095fa9666496a51abf94981a38f4bcd406df5287cc1e1b10255";
+        sha256 = "0c7dae0478258a6cc72621ea148471492616b8b03e79cf975aee9fdc3bd480a0";
       };
     };
     "faye-websocket-0.10.0" = {
@@ -26647,7 +26683,7 @@ let
       src = fetchgit {
         url = "git://github.com/feross/http-node";
         rev = "342ef8624495343ffd050bd0808b3750cf0e3974";
-        sha256 = "031176ff1f6ceb8f650cbf2c36863f417e699f0610f83fbd94a74159cb8eba8f";
+        sha256 = "d7408d01b05fcbd5bb4fb44fd3d7d71463bafd5124d7e69c6f3e97cef8c65368";
       };
     };
     "http-parser-js-0.4.13" = {
@@ -30770,7 +30806,7 @@ let
       src = fetchgit {
         url = "https://github.com/wikimedia/kad.git";
         rev = "96f8f5c8e5a88f5dffed47abc20756e93e16387e";
-        sha256 = "801c2201565fb46ad591d4cf717eb30842ca76725c1d19f301418796f39d668e";
+        sha256 = "12e5b6430f57389c974e7a393f2c7ac9a26df06a58cfe1afbcb5a5f3f00249ea";
       };
     };
     "kad-localstorage-0.0.7" = {
@@ -33293,13 +33329,13 @@ let
         sha512 = "/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ==";
       };
     };
-    "loglevel-1.7.0" = {
+    "loglevel-1.7.1" = {
       name = "loglevel";
       packageName = "loglevel";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz";
-        sha512 = "i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==";
+        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz";
+        sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==";
       };
     };
     "loglevel-colored-level-prefix-1.0.0" = {
@@ -35939,13 +35975,13 @@ let
         sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw==";
       };
     };
-    "mqtt-4.2.5" = {
+    "mqtt-4.2.6" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "4.2.5";
+      version = "4.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.5.tgz";
-        sha512 = "l19iRa4en8qM19xYCsdkt2VWg/JPTQTUL0Gq//p1rRUSEBxywicylfGZQy4Ru2Pl/nN5gI0q5E66DIVybGSaRg==";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.6.tgz";
+        sha512 = "GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q==";
       };
     };
     "mqtt-packet-6.6.0" = {
@@ -36837,7 +36873,7 @@ let
       src = fetchgit {
         url = "https://github.com/arlolra/negotiator.git";
         rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a";
-        sha256 = "0cee71d4f5ad49a14f8ff9b33d1e5b1ac9fbcd3866ab7a95068283e1f7d860b6";
+        sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
       };
     };
     "neo-async-2.6.2" = {
@@ -37180,7 +37216,7 @@ let
       src = fetchgit {
         url = "https://github.com/laurent22/node-emoji.git";
         rev = "9fa01eac463e94dde1316ef8c53089eeef4973b5";
-        sha256 = "1499424a28a49687c150369075d5ea3794f18454291078760a6c761e6576d8a3";
+        sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406";
       };
     };
     "node-environment-flags-1.0.6" = {
@@ -38606,13 +38642,13 @@ let
         sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==";
       };
     };
-    "office-ui-fabric-react-7.152.2" = {
+    "office-ui-fabric-react-7.153.1" = {
       name = "office-ui-fabric-react";
       packageName = "office-ui-fabric-react";
-      version = "7.152.2";
+      version = "7.153.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.152.2.tgz";
-        sha512 = "kAC40mQQZ3+W7ciUcsI2z66BFb/2dDkYuksMYvmjQ/RtSBw8ZMgsoIjTjgRpWKdEdvkbFwsjHK7fHOeR1OJOpA==";
+        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.153.1.tgz";
+        sha512 = "g7FRbvG7LEDck+pgOpmuaQXYI95doypxmlDeDUcXs9XF6YBoIL3g6FUar92P4h1UXHxXQTe8ko/v7C2ef79o2Q==";
       };
     };
     "omggif-1.0.10" = {
@@ -39587,6 +39623,15 @@ let
         sha512 = "iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==";
       };
     };
+    "p-limit-3.1.0" = {
+      name = "p-limit";
+      packageName = "p-limit";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz";
+        sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==";
+      };
+    };
     "p-locate-2.0.0" = {
       name = "p-locate";
       packageName = "p-locate";
@@ -41619,7 +41664,7 @@ let
       src = fetchgit {
         url = "git://github.com/anmonteiro/node-getopt";
         rev = "a3123885e3559c9b70903948d6e5c34852520d74";
-        sha256 = "aec063ab02e2782e6587759b4c7dfd8d8e27f174bbc62dd65842658e30e56720";
+        sha256 = "0092766ac49279342f7d17677359880b44b245ad9d32237a11a5ea45cb0d03fa";
       };
     };
     "postcss-5.2.18" = {
@@ -46707,6 +46752,15 @@ let
         sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==";
       };
     };
+    "s3-stream-upload-2.0.2" = {
+      name = "s3-stream-upload";
+      packageName = "s3-stream-upload";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/s3-stream-upload/-/s3-stream-upload-2.0.2.tgz";
+        sha1 = "60342f12d4aa06ea8f389fb761a5393aedca017f";
+      };
+    };
     "s3signed-0.1.0" = {
       name = "s3signed";
       packageName = "s3signed";
@@ -47580,13 +47634,13 @@ let
         sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==";
       };
     };
-    "seventh-0.7.36" = {
+    "seventh-0.7.37" = {
       name = "seventh";
       packageName = "seventh";
-      version = "0.7.36";
+      version = "0.7.37";
       src = fetchurl {
-        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.36.tgz";
-        sha512 = "JeOf8Xybc1QeKhb0Hrj4w9WWYpmgGrjhvV48f0Ap/K2jra1TAnVYvKuJfpW01YFuRtwan6Jc3dN6t1JJrIPxcQ==";
+        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.37.tgz";
+        sha512 = "RvoWTZOzL2RpYZtqW+6QMkOqJY6ljiddSvT64lqvVawPCWJo8Se6EOY8jjpPAmUAB7IsnrvAuYRh7xxnn3a5mg==";
       };
     };
     "sha.js-2.4.11" = {
@@ -48372,13 +48426,13 @@ let
         sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ==";
       };
     };
-    "snyk-docker-plugin-4.9.0" = {
+    "snyk-docker-plugin-4.12.0" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "4.9.0";
+      version = "4.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.9.0.tgz";
-        sha512 = "vjUsat9NdP2kAicQWVuB7vJ0MnJ2e+Y59MzaXdJWkfrSyTnIeuMzTg1vJ8GUrfdG+l5KaYZTUy7p1r1dYbmrZw==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.12.0.tgz";
+        sha512 = "iN5GUTpMR4dx/hmjxh1GnJ9vrMpbOUhD8gsdWgFPZ5Qg+ImPQ2WBJBal/hyfkauM0TaKQEAgIwT6xZ1ovaIvWQ==";
       };
     };
     "snyk-go-parser-1.4.1" = {
@@ -48660,13 +48714,13 @@ let
         sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==";
       };
     };
-    "socket.io-parser-4.0.1" = {
+    "socket.io-parser-4.0.2" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.1.tgz";
-        sha512 = "5JfNykYptCwU2lkOI0ieoePWm+6stEhkZ2UnLDjqnE1YEjUlXXLd1lpxPZ+g+h3rtaytwWkWrLQCaJULlGqjOg==";
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.2.tgz";
+        sha512 = "Bs3IYHDivwf+bAAuW/8xwJgIiBNtlvnjYRc4PbXgniLmcP1BrakBoq/QhO24rgtgW7VZ7uAaswRGxutUnlAK7g==";
       };
     };
     "sockjs-0.3.20" = {
@@ -51495,13 +51549,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.30.1" = {
+    "systeminformation-4.30.4" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.30.1";
+      version = "4.30.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.1.tgz";
-        sha512 = "FrZISqs8G/oZfnzodPU/zCk41JIfa0os2WY6CJKuk9FwIVc9UWMJfRlgP307AkFu8IRjuVI/HiCNiP4dAnURTA==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.4.tgz";
+        sha512 = "hUkT0zOIJ8YfzbEierK7oTfTgDs+qjVihkbDlGRVYcBEUNr4XDcGd63lGgZ6RC5vDPkfbUgVrDrqor9NOIZxGA==";
       };
     };
     "syswide-cas-5.3.0" = {
@@ -51601,7 +51655,7 @@ let
       src = fetchgit {
         url = "https://github.com/mixu/node-tabtab.git";
         rev = "94af2b878b174527b6636aec88acd46979247755";
-        sha256 = "6e84c406481c826d85e946e9dc09ed1e71ecfa405f60dd6209e5c835aacf32c1";
+        sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272";
       };
     };
     "tabula-1.10.0" = {
@@ -55220,7 +55274,7 @@ let
       src = fetchgit {
         url = "https://github.com/laurent22/uslug.git";
         rev = "ba2834d79beb0435318709958b2f5e817d96674d";
-        sha256 = "9f64413fac2052a07323c54475be269280ab1c5d174e88bd1542e24091be0259";
+        sha256 = "e23c172456a8fa0af48dba3f89ca0d525dd870408f7bd6ad1d776cdbe13f0489";
       };
     };
     "ut_metadata-3.5.2" = {
@@ -56861,13 +56915,13 @@ let
         sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==";
       };
     };
-    "vue-3.0.2" = {
+    "vue-3.0.3" = {
       name = "vue";
       packageName = "vue";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vue/-/vue-3.0.2.tgz";
-        sha512 = "ciKFjutKRs+2Vbvgrist1oDd5wZQqtOel/K//ku54zLbf8tcTV+XbyAfanTHcTkML9CUj09vnC+y+5uaOz2/9g==";
+        url = "https://registry.npmjs.org/vue/-/vue-3.0.3.tgz";
+        sha512 = "BZG5meD5vLWdvfnRL5WqfDy+cnXO1X/SweModGUna78bdFPZW6+ZO1tU9p0acrskX3DKFcfSp2s4SZnMjABx6w==";
       };
     };
     "vue-cli-plugin-apollo-0.21.3" = {
@@ -59202,6 +59256,15 @@ let
         sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==";
       };
     };
+    "yocto-queue-0.1.0" = {
+      name = "yocto-queue";
+      packageName = "yocto-queue";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz";
+        sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==";
+      };
+    };
     "yoga-layout-prebuilt-1.10.0" = {
       name = "yoga-layout-prebuilt";
       packageName = "yoga-layout-prebuilt";
@@ -60216,7 +60279,7 @@ in
       sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
       sources."@types/json5-0.0.29"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/parse-json-4.0.0"
       sources."@types/source-list-map-0.1.2"
       sources."@types/tapable-1.0.6"
@@ -60288,7 +60351,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.3.606"
+      sources."electron-to-chromium-1.3.607"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enhanced-resolve-4.3.0"
@@ -60462,7 +60525,7 @@ in
       })
       (sources."terser-webpack-plugin-5.0.3" // {
         dependencies = [
-          sources."p-limit-3.0.2"
+          sources."p-limit-3.1.0"
           sources."schema-utils-3.0.0"
           sources."source-map-0.6.1"
         ];
@@ -60507,6 +60570,7 @@ in
       sources."windows-release-4.0.0"
       sources."wrappy-1.0.2"
       sources."yaml-1.10.0"
+      sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -60531,7 +60595,7 @@ in
       sources."@apollo/federation-0.20.4"
       (sources."@apollo/protobufjs-1.0.5" // {
         dependencies = [
-          sources."@types/node-10.17.46"
+          sources."@types/node-10.17.47"
         ];
       })
       sources."@apollographql/apollo-tools-0.4.8"
@@ -60542,7 +60606,7 @@ in
       sources."@apollographql/graphql-playground-html-1.6.26"
       sources."@babel/code-frame-7.10.4"
       sources."@babel/compat-data-7.12.7"
-      (sources."@babel/core-7.12.8" // {
+      (sources."@babel/core-7.12.9" // {
         dependencies = [
           sources."@babel/generator-7.12.5"
           sources."@babel/types-7.12.7"
@@ -60715,7 +60779,7 @@ in
           sources."@babel/types-7.12.7"
         ];
       })
-      (sources."@babel/traverse-7.12.8" // {
+      (sources."@babel/traverse-7.12.9" // {
         dependencies = [
           sources."@babel/generator-7.12.5"
           sources."@babel/types-7.12.7"
@@ -60855,7 +60919,7 @@ in
       sources."@types/long-4.0.1"
       sources."@types/mime-2.0.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       (sources."@types/node-fetch-2.5.7" // {
         dependencies = [
           sources."form-data-3.0.0"
@@ -60876,24 +60940,24 @@ in
       })
       sources."@vue/cli-ui-addon-webpack-4.5.9"
       sources."@vue/cli-ui-addon-widgets-4.5.9"
-      (sources."@vue/compiler-core-3.0.2" // {
+      (sources."@vue/compiler-core-3.0.3" // {
         dependencies = [
           sources."@babel/types-7.12.7"
           sources."source-map-0.6.1"
         ];
       })
-      sources."@vue/compiler-dom-3.0.2"
-      (sources."@vue/compiler-sfc-3.0.2" // {
+      sources."@vue/compiler-dom-3.0.3"
+      (sources."@vue/compiler-sfc-3.0.3" // {
         dependencies = [
           sources."@babel/types-7.12.7"
           sources."source-map-0.6.1"
         ];
       })
-      sources."@vue/compiler-ssr-3.0.2"
-      sources."@vue/reactivity-3.0.2"
-      sources."@vue/runtime-core-3.0.2"
-      sources."@vue/runtime-dom-3.0.2"
-      sources."@vue/shared-3.0.2"
+      sources."@vue/compiler-ssr-3.0.3"
+      sources."@vue/reactivity-3.0.3"
+      sources."@vue/runtime-core-3.0.3"
+      sources."@vue/runtime-dom-3.0.3"
+      sources."@vue/shared-3.0.3"
       sources."@wry/context-0.4.4"
       sources."@wry/equality-0.1.11"
       sources."abbrev-1.1.1"
@@ -61213,8 +61277,8 @@ in
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.7.0"
-      (sources."core-js-compat-3.7.0" // {
+      sources."core-js-3.8.0"
+      (sources."core-js-compat-3.8.0" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -61305,7 +61369,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.606"
+      sources."electron-to-chromium-1.3.607"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
@@ -61718,7 +61782,7 @@ in
           sources."wrap-ansi-3.0.1"
         ];
       })
-      sources."loglevel-1.7.0"
+      sources."loglevel-1.7.1"
       sources."long-4.0.0"
       sources."lowdb-1.0.0"
       sources."lower-case-2.0.1"
@@ -62312,7 +62376,7 @@ in
       (sources."vue-codemod-0.0.4" // {
         dependencies = [
           sources."globby-10.0.2"
-          sources."vue-3.0.2"
+          sources."vue-3.0.3"
         ];
       })
       sources."watch-1.0.2"
@@ -62582,7 +62646,7 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      (sources."@babel/core-7.12.8" // {
+      (sources."@babel/core-7.12.9" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -62606,7 +62670,7 @@ in
       sources."@babel/highlight-7.10.4"
       sources."@babel/parser-7.12.7"
       sources."@babel/template-7.12.7"
-      sources."@babel/traverse-7.12.8"
+      sources."@babel/traverse-7.12.9"
       sources."@babel/types-7.12.7"
       sources."JSV-4.0.2"
       sources."ansi-styles-3.2.1"
@@ -62714,7 +62778,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
@@ -63346,7 +63410,7 @@ in
       sources."cookie-0.4.0"
       sources."cookie-parser-1.4.5"
       sources."cookie-signature-1.0.6"
-      sources."core-js-2.6.11"
+      sources."core-js-2.6.12"
       sources."core-util-is-1.0.2"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
@@ -63718,7 +63782,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.32"
+      sources."@types/node-13.13.33"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
       sources."ajv-6.12.6"
@@ -64816,7 +64880,7 @@ in
         ];
       })
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.7.0"
+      sources."core-js-3.8.0"
       sources."cosmiconfig-3.1.0"
       sources."create-error-class-3.0.2"
       (sources."cross-spawn-6.0.5" // {
@@ -64856,7 +64920,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.606"
+      sources."electron-to-chromium-1.3.607"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -65130,7 +65194,7 @@ in
       sources."lodash-4.17.20"
       sources."lodash.merge-4.6.2"
       sources."log-symbols-2.2.0"
-      sources."loglevel-1.7.0"
+      sources."loglevel-1.7.1"
       (sources."loglevel-colored-level-prefix-1.0.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -65772,7 +65836,7 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/core-7.12.8"
+      sources."@babel/core-7.12.9"
       sources."@babel/generator-7.12.5"
       sources."@babel/helper-function-name-7.10.4"
       sources."@babel/helper-get-function-arity-7.10.4"
@@ -65792,7 +65856,7 @@ in
       })
       sources."@babel/parser-7.12.7"
       sources."@babel/template-7.12.7"
-      sources."@babel/traverse-7.12.8"
+      sources."@babel/traverse-7.12.9"
       sources."@babel/types-7.12.7"
       sources."@nodelib/fs.scandir-2.1.3"
       sources."@nodelib/fs.stat-2.0.3"
@@ -65857,7 +65921,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.606"
+      sources."electron-to-chromium-1.3.607"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -67069,7 +67133,7 @@ in
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.30.1"
+      sources."systeminformation-4.30.4"
       sources."term-size-2.2.1"
       sources."through-2.3.8"
       sources."tmp-0.2.1"
@@ -67156,7 +67220,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/normalize-package-data-2.4.0"
       sources."aggregate-error-3.1.0"
       sources."ansi-styles-3.2.1"
@@ -67527,7 +67591,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.2"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -68601,15 +68665,15 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.54.0";
+    version = "6.56.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.54.0.tgz";
-      sha512 = "R1TL7LZi2s0HrtxpYJ169m/ALstWSk04e9YbwSLxrOI6o5dYqcE0KmoE3jzGmE56SHdxp8QrMBQInt6A2yz9Mg==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.56.0.tgz";
+      sha512 = "xgJH1i6nINcRVAGW1ek+NQJOyOgsS9VDGsWW0sN51v3IUGbPgHSZXTpBtqykVjkb+KoiP1V3NkiKY76n7zd+Kw==";
     };
     dependencies = [
       sources."@fast-csv/format-4.3.5"
       sources."@fast-csv/parse-4.3.3"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."JSONStream-1.3.5"
       sources."ajv-6.12.6"
       sources."asn1-0.2.4"
@@ -68623,6 +68687,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
       sources."buffer-4.9.2"
+      sources."buffer-queue-1.0.0"
       sources."bytes-3.1.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.8"
@@ -68646,6 +68711,7 @@ in
       sources."http-signature-1.2.0"
       sources."http-status-1.5.0"
       sources."ieee754-1.1.13"
+      sources."inherits-2.0.4"
       sources."ini-1.3.5"
       (sources."ip-address-6.1.0" // {
         dependencies = [
@@ -68680,12 +68746,19 @@ in
       sources."p-queue-6.6.2"
       sources."p-timeout-3.2.0"
       sources."performance-now-2.1.0"
+      sources."process-nextick-args-2.0.1"
       sources."psl-1.8.0"
       sources."punycode-1.3.2"
       sources."qs-6.5.2"
       sources."querystring-0.2.0"
+      (sources."readable-stream-2.3.7" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."request-2.88.2"
       sources."requestretry-4.1.2"
+      sources."s3-stream-upload-2.0.2"
       sources."s3signed-0.1.0"
       sources."s3urls-1.5.2"
       sources."safe-buffer-5.2.1"
@@ -68697,6 +68770,11 @@ in
       sources."socks5-https-client-1.2.1"
       sources."sprintf-js-1.1.2"
       sources."sshpk-1.16.1"
+      (sources."string_decoder-1.1.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."through-2.3.8"
       (sources."tough-cookie-2.5.0" // {
         dependencies = [
@@ -68711,6 +68789,7 @@ in
         ];
       })
       sources."url-0.10.3"
+      sources."util-deprecate-1.0.2"
       sources."uuid-3.3.2"
       sources."verror-1.10.0"
       sources."when-3.7.8"
@@ -68755,7 +68834,7 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
-      sources."@babel/core-7.12.8"
+      sources."@babel/core-7.12.9"
       sources."@babel/generator-7.12.5"
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-react-jsx-7.10.4"
@@ -68781,7 +68860,7 @@ in
       sources."@babel/plugin-transform-parameters-7.12.1"
       sources."@babel/plugin-transform-react-jsx-7.12.7"
       sources."@babel/template-7.12.7"
-      sources."@babel/traverse-7.12.8"
+      sources."@babel/traverse-7.12.9"
       sources."@babel/types-7.12.7"
       sources."@sindresorhus/is-4.0.0"
       sources."@szmarczak/http-timer-4.0.5"
@@ -68789,7 +68868,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/responselike-1.0.0"
       sources."@types/yoga-layout-1.9.2"
@@ -69114,7 +69193,7 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.152.2"
+      sources."@fluentui/react-7.153.1"
       sources."@fluentui/react-compose-0.19.12"
       sources."@fluentui/react-focus-7.16.19"
       sources."@fluentui/react-stylesheets-0.2.4"
@@ -69484,7 +69563,7 @@ in
       })
       sources."copy-descriptor-0.1.1"
       sources."copy-props-2.0.4"
-      sources."core-js-2.6.11"
+      sources."core-js-2.6.12"
       sources."core-util-is-1.0.2"
       sources."crc-3.8.0"
       (sources."create-ecdh-4.0.4" // {
@@ -70151,7 +70230,7 @@ in
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
       sources."object.reduce-1.0.1"
-      sources."office-ui-fabric-react-7.152.2"
+      sources."office-ui-fabric-react-7.153.1"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -70185,7 +70264,7 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."p-cancelable-1.1.0"
-      sources."p-limit-3.0.2"
+      sources."p-limit-3.1.0"
       (sources."p-locate-4.1.0" // {
         dependencies = [
           sources."p-limit-2.3.0"
@@ -70718,6 +70797,7 @@ in
       })
       sources."yargs-parser-5.0.0-security.0"
       sources."yeast-0.1.2"
+      sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -71181,7 +71261,7 @@ in
       sources."@babel/preset-typescript-7.12.7"
       sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.12.7"
-      (sources."@babel/traverse-7.12.8" // {
+      (sources."@babel/traverse-7.12.9" // {
         dependencies = [
           sources."lodash-4.17.20"
         ];
@@ -71638,7 +71718,7 @@ in
       sources."babel-preset-fbjs-3.3.0"
       (sources."babel-runtime-6.26.0" // {
         dependencies = [
-          sources."core-js-2.6.11"
+          sources."core-js-2.6.12"
           sources."regenerator-runtime-0.11.1"
         ];
       })
@@ -71853,14 +71933,14 @@ in
           sources."globby-11.0.1"
           sources."loader-utils-2.0.0"
           sources."make-dir-3.1.0"
-          sources."p-limit-3.0.2"
+          sources."p-limit-3.1.0"
           sources."pkg-dir-4.2.0"
           sources."semver-6.3.0"
           sources."slash-3.0.0"
         ];
       })
-      sources."core-js-3.7.0"
-      (sources."core-js-compat-3.7.0" // {
+      sources."core-js-3.8.0"
+      (sources."core-js-compat-3.8.0" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -71995,7 +72075,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.606"
+      sources."electron-to-chromium-1.3.607"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -72502,7 +72582,7 @@ in
         ];
       })
       sources."logkitty-0.7.1"
-      sources."loglevel-1.7.0"
+      sources."loglevel-1.7.1"
       sources."loose-envify-1.4.0"
       sources."lower-case-2.0.1"
       sources."lowercase-keys-1.0.1"
@@ -73426,7 +73506,7 @@ in
         dependencies = [
           sources."find-cache-dir-3.3.1"
           sources."make-dir-3.1.0"
-          sources."p-limit-3.0.2"
+          sources."p-limit-3.1.0"
           sources."pkg-dir-4.2.0"
           sources."semver-6.3.0"
           sources."source-map-0.6.1"
@@ -73780,6 +73860,7 @@ in
       sources."yallist-4.0.0"
       sources."yargs-15.4.1"
       sources."yargs-parser-18.1.3"
+      sources."yocto-queue-0.1.0"
       sources."zen-observable-0.8.15"
       sources."zen-observable-ts-0.8.21"
     ];
@@ -75784,7 +75865,7 @@ in
       sources."@nodelib/fs.walk-1.2.4"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/parse-json-4.0.0"
       sources."@types/websocket-1.0.1"
       sources."aggregate-error-3.1.0"
@@ -76668,7 +76749,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."systeminformation-4.30.1"
+      sources."systeminformation-4.30.4"
       sources."term-canvas-0.0.5"
       sources."type-fest-0.11.0"
       sources."wordwrap-0.0.3"
@@ -79073,7 +79154,7 @@ in
       })
       sources."@babel/parser-7.12.7"
       sources."@babel/template-7.12.7"
-      (sources."@babel/traverse-7.12.8" // {
+      (sources."@babel/traverse-7.12.9" // {
         dependencies = [
           sources."debug-4.3.1"
         ];
@@ -79125,7 +79206,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.798.0" // {
+      (sources."aws-sdk-2.799.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -79623,7 +79704,7 @@ in
       sources."set-blocking-2.0.0"
       sources."setimmediate-1.0.5"
       sources."setprototypeof-1.2.0"
-      sources."seventh-0.7.36"
+      sources."seventh-0.7.37"
       (sources."sharp-0.26.3" // {
         dependencies = [
           sources."color-3.1.3"
@@ -81020,7 +81101,7 @@ in
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.1"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/normalize-package-data-2.4.0"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
@@ -82822,7 +82903,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.10.4"
       sources."@babel/compat-data-7.12.7"
-      sources."@babel/core-7.12.8"
+      sources."@babel/core-7.12.9"
       sources."@babel/generator-7.12.5"
       sources."@babel/helper-annotate-as-pure-7.10.4"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
@@ -82920,7 +83001,7 @@ in
       sources."@babel/preset-stage-2-7.8.3"
       sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.12.7"
-      sources."@babel/traverse-7.12.8"
+      sources."@babel/traverse-7.12.9"
       sources."@babel/types-7.12.7"
       sources."@cnakazawa/watch-1.0.4"
       sources."@comandeer/babel-plugin-banner-5.0.0"
@@ -82942,7 +83023,7 @@ in
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-0.0.8"
       sources."@types/yargs-15.0.10"
@@ -83188,8 +83269,8 @@ in
         ];
       })
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.6.11"
-      (sources."core-js-compat-3.7.0" // {
+      sources."core-js-2.6.12"
+      (sources."core-js-compat-3.8.0" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -83240,7 +83321,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.606"
+      sources."electron-to-chromium-1.3.607"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -84081,7 +84162,7 @@ in
     version = "1.10.2";
     src = fetchurl {
       url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.10.2.tgz";
-      sha512 = "1hljd0khxrskgjjm6mhj2s90x5xmwzfrnxzirnhrcrc5sbmrj0xrabwdfp23c9iqc5p1hp8q2a53pryhr58nhl8i53svsyzmsph3s6i";
+      sha512 = "0egBr67f661HiYhCi0qGPt9RlMDownALwzGxIa5rfKncgcx16cIyy9Dm+LvN7vPaSwdJCwmrqVK+qXOHEzRJYQ==";
     };
     dependencies = [
       sources."acorn-5.7.4"
@@ -84428,13 +84509,13 @@ in
   "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage {
     name = "_at_mermaid-js_slash_mermaid-cli";
     packageName = "@mermaid-js/mermaid-cli";
-    version = "8.8.2-beta.8";
+    version = "8.8.3-2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.2-beta.8.tgz";
-      sha512 = "X9I7gwvqKVdqVvqi9AVfUWXnHQQYjssWJ2asKfhBDAkQn0vPagKkx6EjzKcRgyIroWGXN6ZpwkQ/gMvTPFlx7g==";
+      url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.3-2.tgz";
+      sha512 = "8tXy9R4hcUKgyRS2EOOZzQYlM3jDBIrC04w8YiiTBhTUpm0UuDYpzO+VDjFjxEGBj+KyAzEI3/7oAdV6kYHUMg==";
     };
     dependencies = [
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/yauzl-2.9.1"
       sources."agent-base-5.1.1"
       sources."ansi-styles-4.3.0"
@@ -84518,7 +84599,7 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.152.2"
+      sources."@fluentui/react-7.153.1"
       sources."@fluentui/react-compose-0.19.12"
       sources."@fluentui/react-focus-7.16.19"
       sources."@fluentui/react-stylesheets-0.2.4"
@@ -84577,7 +84658,7 @@ in
       sources."content-type-1.0.4"
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."core-js-2.6.11"
+      sources."core-js-2.6.12"
       sources."crc-3.8.0"
       sources."debug-2.6.9"
       sources."decompress-response-3.3.0"
@@ -84662,7 +84743,7 @@ in
       sources."node-fetch-1.6.3"
       sources."normalize-url-4.5.0"
       sources."object-assign-4.1.1"
-      sources."office-ui-fabric-react-7.152.2"
+      sources."office-ui-fabric-react-7.153.1"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -84856,7 +84937,7 @@ in
       sources."nanoid-3.1.12"
       sources."normalize-path-3.0.0"
       sources."once-1.4.0"
-      sources."p-limit-3.0.2"
+      sources."p-limit-3.1.0"
       sources."p-locate-5.0.0"
       sources."p-try-2.2.0"
       sources."path-exists-4.0.0"
@@ -84910,6 +84991,7 @@ in
           sources."decamelize-4.0.0"
         ];
       })
+      sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -85048,15 +85130,15 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "2.68.7";
+    version = "2.69.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.68.7.tgz";
-      sha512 = "HbOaT0RL+AHXaeQYEiJlTC0IIYkaYgpCK8ByHrwUYCXunHW9/MWMSXs5Cg9grVMgD36qL1A5E7ljrJjWUFvwcA==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.69.0.tgz";
+      sha512 = "QFlOsS2wTEdAkFXMG5PWbR2SNALOv+n4z4+yQYFEt+TbAHn0NUwbpDT/UxR/NdQtwvzY0NpyjSZSQou5n4mpKg==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
       sources."@babel/compat-data-7.12.7"
-      (sources."@babel/core-7.12.8" // {
+      (sources."@babel/core-7.12.9" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
@@ -85157,7 +85239,7 @@ in
       sources."@babel/preset-modules-0.1.4"
       sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.12.7"
-      sources."@babel/traverse-7.12.8"
+      sources."@babel/traverse-7.12.9"
       sources."@babel/types-7.12.7"
       sources."@bugsnag/browser-7.5.1"
       sources."@bugsnag/core-7.3.5"
@@ -85168,7 +85250,7 @@ in
       sources."@dabh/diagnostics-2.0.2"
       sources."@jest/types-24.9.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      (sources."@netlify/build-5.3.2" // {
+      (sources."@netlify/build-5.3.3" // {
         dependencies = [
           sources."chalk-3.0.0"
           sources."resolve-2.0.0-next.2"
@@ -85193,11 +85275,11 @@ in
       sources."@netlify/open-api-0.18.1"
       sources."@netlify/plugin-edge-handlers-1.10.0"
       sources."@netlify/run-utils-1.0.5"
-      sources."@netlify/traffic-mesh-agent-0.26.0"
-      sources."@netlify/traffic-mesh-agent-darwin-x64-0.26.0"
-      sources."@netlify/traffic-mesh-agent-linux-x64-0.26.0"
-      sources."@netlify/traffic-mesh-agent-win32-x64-0.26.0"
-      (sources."@netlify/zip-it-and-ship-it-1.4.1" // {
+      sources."@netlify/traffic-mesh-agent-0.27.0"
+      sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.0"
+      sources."@netlify/traffic-mesh-agent-linux-x64-0.27.0"
+      sources."@netlify/traffic-mesh-agent-win32-x64-0.27.0"
+      (sources."@netlify/zip-it-and-ship-it-1.4.2" // {
         dependencies = [
           sources."resolve-2.0.0-next.2"
         ];
@@ -85367,7 +85449,7 @@ in
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/node-fetch-2.5.7"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/parse5-5.0.3"
@@ -85437,7 +85519,7 @@ in
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
-      (sources."aws-sdk-2.798.0" // {
+      (sources."aws-sdk-2.799.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -85624,7 +85706,7 @@ in
           sources."readdirp-2.2.1"
         ];
       })
-      (sources."core-js-compat-3.7.0" // {
+      (sources."core-js-compat-3.8.0" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -85766,7 +85848,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.606"
+      sources."electron-to-chromium-1.3.607"
       sources."elf-tools-1.1.2"
       (sources."elliptic-6.5.3" // {
         dependencies = [
@@ -87427,16 +87509,16 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "1.2.5";
+    version = "1.2.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-1.2.5.tgz";
-      sha512 = "Z/f5ZjZVQgQSP+UU/RN5mJvTR875R3Fgb1lWd2kBxy44gVxxbtfN66ndgV9oV2S1h8nDTj0s+UhXvEXgo0PlqQ==";
+      url = "https://registry.npmjs.org/node-red/-/node-red-1.2.6.tgz";
+      sha512 = "Sy6ZNRFxN4KwT/eGFBt9L6aMXK0XGRwBNlhoFMPObSujLJVMUKHxirHAMst5CvUYigijFXM6ILRC6p/XqYHZRg==";
     };
     dependencies = [
       sources."@babel/runtime-7.12.5"
-      sources."@node-red/editor-api-1.2.5"
-      sources."@node-red/editor-client-1.2.5"
-      (sources."@node-red/nodes-1.2.5" // {
+      sources."@node-red/editor-api-1.2.6"
+      sources."@node-red/editor-client-1.2.6"
+      (sources."@node-red/nodes-1.2.6" // {
         dependencies = [
           sources."cookie-0.4.1"
           sources."http-errors-1.7.3"
@@ -87450,9 +87532,9 @@ in
           })
         ];
       })
-      sources."@node-red/registry-1.2.5"
-      sources."@node-red/runtime-1.2.5"
-      sources."@node-red/util-1.2.5"
+      sources."@node-red/registry-1.2.6"
+      sources."@node-red/runtime-1.2.6"
+      sources."@node-red/util-1.2.6"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       (sources."agent-base-6.0.2" // {
@@ -87716,7 +87798,7 @@ in
       sources."mkdirp-0.5.5"
       sources."moment-2.29.1"
       sources."moment-timezone-0.5.32"
-      (sources."mqtt-4.2.5" // {
+      (sources."mqtt-4.2.6" // {
         dependencies = [
           sources."concat-stream-2.0.0"
           sources."debug-4.3.1"
@@ -88511,7 +88593,7 @@ in
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
       sources."p-cancelable-1.1.0"
-      sources."p-limit-3.0.2"
+      sources."p-limit-3.1.0"
       sources."p-locate-5.0.0"
       sources."p-map-4.0.0"
       sources."p-try-2.2.0"
@@ -88607,6 +88689,7 @@ in
       sources."write-file-atomic-3.0.3"
       sources."xdg-basedir-4.0.0"
       sources."yallist-4.0.0"
+      sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -88625,7 +88708,7 @@ in
     src = fetchgit {
       url = "git://github.com/NixOS/npm2nix.git";
       rev = "0c06be7d278a7f64fc853a5fd42d2031d14496d5";
-      sha256 = "ac58ebe43b62e42cdc1754f4d6c6795de9c33fe12b72a858522c9f0ba10b5cee";
+      sha256 = "e1b252cd883fd8c5c4618b157d03b3fb869fa6aad4170ef51e34681069d50bf5";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -88844,7 +88927,7 @@ in
     dependencies = [
       sources."@babel/code-frame-7.10.4"
       sources."@babel/compat-data-7.12.7"
-      (sources."@babel/core-7.12.8" // {
+      (sources."@babel/core-7.12.9" // {
         dependencies = [
           sources."json5-2.1.3"
           sources."source-map-0.5.7"
@@ -88948,7 +89031,7 @@ in
       sources."@babel/preset-modules-0.1.4"
       sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.12.7"
-      sources."@babel/traverse-7.12.8"
+      sources."@babel/traverse-7.12.9"
       sources."@babel/types-7.12.7"
       sources."@iarna/toml-2.2.5"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
@@ -89090,8 +89173,8 @@ in
       sources."constants-browserify-1.0.0"
       sources."convert-source-map-1.7.0"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.6.11"
-      (sources."core-js-compat-3.7.0" // {
+      sources."core-js-2.6.12"
+      (sources."core-js-compat-3.8.0" // {
         dependencies = [
           sources."semver-7.0.0"
         ];
@@ -89199,7 +89282,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.606"
+      sources."electron-to-chromium-1.3.607"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -89864,7 +89947,7 @@ in
       sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."core-js-2.6.11"
+      sources."core-js-2.6.12"
       sources."core-util-is-1.0.2"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
@@ -91314,7 +91397,7 @@ in
       sources."statuses-1.5.0"
       sources."string_decoder-0.10.31"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.30.1"
+      sources."systeminformation-4.30.4"
       sources."thunkify-2.1.2"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
@@ -91905,10 +91988,10 @@ in
   pyright = nodeEnv.buildNodePackage {
     name = "pyright";
     packageName = "pyright";
-    version = "1.1.87";
+    version = "1.1.88";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.87.tgz";
-      sha512 = "yiZ79Jzv0bIAQW3rlJip8a4Wy8IRU1zABG1/eOOWN3s7yn8jTWTld5QhraIRVID/YhkzmNj3sox43SeCj6yelA==";
+      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.88.tgz";
+      sha512 = "1bjnvqNd5xlqTzlwr1W0/WLj+fKItMpQuBr2fvI3OPnWz5iRNcIdj30pR5yCP5ddThSW8xHjQmutf/aked2I8w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -92243,7 +92326,7 @@ in
       sources."@babel/parser-7.12.7"
       sources."@babel/runtime-7.12.5"
       sources."@babel/template-7.12.7"
-      sources."@babel/traverse-7.12.8"
+      sources."@babel/traverse-7.12.9"
       sources."@babel/types-7.12.7"
       sources."@emotion/is-prop-valid-0.8.8"
       sources."@emotion/memoize-0.7.4"
@@ -92251,7 +92334,7 @@ in
       sources."@emotion/unitless-0.7.5"
       sources."@exodus/schemasafe-1.0.0-rc.3"
       sources."@redocly/react-dropdown-aria-2.0.11"
-      sources."@types/node-13.13.32"
+      sources."@types/node-13.13.33"
       sources."ajv-5.5.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
@@ -92309,7 +92392,7 @@ in
       sources."color-name-1.1.3"
       sources."console-browserify-1.2.0"
       sources."constants-browserify-1.0.0"
-      sources."core-js-3.7.0"
+      sources."core-js-3.8.0"
       sources."core-util-is-1.0.2"
       (sources."create-ecdh-4.0.4" // {
         dependencies = [
@@ -92832,7 +92915,7 @@ in
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
-      sources."p-limit-3.0.2"
+      sources."p-limit-3.1.0"
       sources."p-locate-5.0.0"
       sources."p-try-2.2.0"
       sources."parent-module-1.0.1"
@@ -92956,6 +93039,7 @@ in
       })
       sources."yauzl-2.10.0"
       sources."yazl-2.5.1"
+      sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -93338,7 +93422,7 @@ in
       sources."@types/keyv-3.1.1"
       sources."@types/lodash-4.14.165"
       sources."@types/long-4.0.1"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/request-2.48.5"
       sources."@types/request-promise-native-1.0.17"
       sources."@types/responselike-1.0.0"
@@ -93395,7 +93479,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.798.0" // {
+      (sources."aws-sdk-2.799.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -93876,9 +93960,8 @@ in
       sources."p-event-2.3.1"
       sources."p-finally-1.0.0"
       sources."p-is-promise-1.1.0"
-      sources."p-limit-3.0.2"
+      sources."p-limit-3.1.0"
       sources."p-timeout-2.0.1"
-      sources."p-try-2.2.0"
       (sources."package-json-6.5.0" // {
         dependencies = [
           sources."got-9.6.0"
@@ -93910,7 +93993,7 @@ in
       sources."promise-queue-2.2.5"
       (sources."protobufjs-6.10.2" // {
         dependencies = [
-          sources."@types/node-13.13.32"
+          sources."@types/node-13.13.33"
           sources."long-4.0.0"
         ];
       })
@@ -94114,6 +94197,7 @@ in
       sources."yargs-parser-20.2.4"
       sources."yauzl-2.10.0"
       sources."yeast-0.1.2"
+      sources."yocto-queue-0.1.0"
       sources."zip-stream-4.0.4"
     ];
     buildInputs = globalBuildInputs;
@@ -94753,10 +94837,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.430.2";
+    version = "1.431.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.430.2.tgz";
-      sha512 = "EVIwMTcf4FbJ+/j5PoRQgMJdgZfgGaIsN8XorRu0+rXnB1TIAJnjqi1RoVee6j4MEVGMZgxV3H5uN66YRqfCPw==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.431.1.tgz";
+      sha512 = "OW48lG89ffLsSZPHwsjfdqQcu3XG6aRQOkwASPCgTAGcVcnXzS9XHB89h0gLsDzk0fZRskEVgYpvXdh4RFjNqA==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -94786,7 +94870,7 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/js-yaml-3.12.5"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/responselike-1.0.0"
       sources."@types/semver-5.5.0"
       sources."@yarnpkg/lockfile-1.1.0"
@@ -94897,9 +94981,11 @@ in
       sources."dotnet-deps-parser-5.0.0"
       sources."duplexer3-0.1.4"
       sources."duplexify-3.7.1"
+      sources."elfy-1.0.0"
       sources."email-validator-2.0.4"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
+      sources."endian-reader-0.3.0"
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
       sources."escape-goat-2.1.1"
@@ -95136,7 +95222,7 @@ in
           sources."tslib-2.0.3"
         ];
       })
-      (sources."snyk-docker-plugin-4.9.0" // {
+      (sources."snyk-docker-plugin-4.12.0" // {
         dependencies = [
           sources."rimraf-3.0.2"
           sources."tmp-0.2.1"
@@ -95369,13 +95455,14 @@ in
     };
     dependencies = [
       sources."@types/body-parser-1.19.0"
+      sources."@types/component-emitter-1.2.10"
       sources."@types/connect-3.4.33"
       sources."@types/cookie-0.4.0"
       sources."@types/cors-2.8.8"
       sources."@types/express-4.17.9"
       sources."@types/express-serve-static-core-4.17.14"
       sources."@types/mime-2.0.3"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/qs-6.9.5"
       sources."@types/range-parser-1.2.3"
       sources."@types/serve-static-1.13.8"
@@ -95393,7 +95480,7 @@ in
       sources."negotiator-0.6.2"
       sources."object-assign-4.1.1"
       sources."socket.io-adapter-2.0.3"
-      sources."socket.io-parser-4.0.1"
+      sources."socket.io-parser-4.0.2"
       sources."vary-1.1.2"
       sources."ws-7.4.0"
     ];
@@ -96489,7 +96576,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.798.0" // {
+      (sources."aws-sdk-2.799.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -96583,7 +96670,7 @@ in
           sources."depd-2.0.0"
         ];
       })
-      sources."core-js-2.6.11"
+      sources."core-js-2.6.12"
       sources."core-util-is-1.0.2"
       sources."cors-2.8.5"
       sources."cross-spawn-4.0.2"
@@ -97458,7 +97545,7 @@ in
       sources."content-type-1.0.4"
       sources."cookiejar-2.1.2"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.6.11"
+      sources."core-js-2.6.12"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       (sources."cross-spawn-5.1.0" // {
@@ -97980,7 +98067,7 @@ in
     src = fetchgit {
       url = "https://github.com/TediCross/TediCross.git";
       rev = "80ec2189cbda51eec9f3cd3f7f551b7a71474d38";
-      sha256 = "1d3e9fb2a35f366e6fb4cf46699d21a58cbdde3b7a41130d0eb1aa1f4dceabb9";
+      sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
     };
     dependencies = [
       sources."ajv-6.12.6"
@@ -99144,10 +99231,10 @@ in
       sha512 = "F1kV06CdonOM2awtXjCSRYUsRJfDfZIujQQo4zEMqNqD6UwpkapxpZOiwcwbeaQz00+17ljbJEoGqIe2XeiU+w==";
     };
     dependencies = [
-      sources."array-includes-3.1.1"
+      sources."array-includes-3.1.2"
       sources."call-bind-1.0.0"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.17.7"
+      sources."es-abstract-1.18.0-next.1"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.0.1"
@@ -99156,6 +99243,7 @@ in
       sources."is-callable-1.2.2"
       sources."is-capitalized-1.0.0"
       sources."is-date-object-1.0.2"
+      sources."is-negative-zero-2.0.0"
       sources."is-regex-1.1.1"
       sources."is-string-1.0.5"
       sources."is-symbol-1.0.3"
@@ -99234,7 +99322,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
@@ -99310,7 +99398,7 @@ in
       sources."content-type-1.0.4"
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."core-js-3.7.0"
+      sources."core-js-3.8.0"
       sources."core-util-is-1.0.2"
       sources."css-select-1.2.0"
       sources."css-what-2.1.3"
@@ -99668,10 +99756,10 @@ in
   three = nodeEnv.buildNodePackage {
     name = "three";
     packageName = "three";
-    version = "0.122.0";
+    version = "0.123.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/three/-/three-0.122.0.tgz";
-      sha512 = "bgYMo0WdaQhf7DhLE8OSNN/rVFO5J4K1A2VeeKqoV4MjjuHjfCP6xLpg8Xedhns7NlEnN3sZ6VJROq19Qyl6Sg==";
+      url = "https://registry.npmjs.org/three/-/three-0.123.0.tgz";
+      sha512 = "KNnx/IbilvoHRkxOtL0ouozoDoElyuvAXhFB21RK7F5IPWSmqyFelICK6x3hJerLNSlAdHxR0hkuvMMhH9pqXg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -100198,7 +100286,7 @@ in
       sources."@primer/octicons-11.0.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."after-0.8.2"
@@ -102037,7 +102125,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -102185,7 +102273,7 @@ in
       sources."config-chain-1.1.12"
       sources."configstore-4.0.0"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.6.11"
+      sources."core-js-2.6.12"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
@@ -102445,7 +102533,7 @@ in
       sources."lodash.iteratee-4.7.0"
       sources."lodash.merge-4.6.2"
       sources."lodash.unescape-4.0.1"
-      sources."loglevel-1.7.0"
+      sources."loglevel-1.7.1"
       (sources."loglevel-colored-level-prefix-1.0.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -102983,7 +103071,7 @@ in
       sources."@types/download-6.2.4"
       sources."@types/got-8.3.5"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/yauzl-2.9.1"
       sources."JSONSelect-0.2.1"
       sources."accepts-1.3.7"
@@ -103171,7 +103259,7 @@ in
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.6.11"
+      sources."core-js-2.6.12"
       sources."core-util-is-1.0.2"
       sources."crc-32-1.2.0"
       (sources."crc32-stream-4.0.1" // {
@@ -104085,7 +104173,7 @@ in
       sources."@types/eslint-scope-3.7.0"
       sources."@types/estree-0.0.45"
       sources."@types/json-schema-7.0.6"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
       sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -104115,7 +104203,7 @@ in
       sources."chrome-trace-event-1.0.2"
       sources."colorette-1.2.1"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.606"
+      sources."electron-to-chromium-1.3.607"
       sources."enhanced-resolve-5.3.2"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"
@@ -104164,13 +104252,14 @@ in
       })
       (sources."terser-webpack-plugin-5.0.3" // {
         dependencies = [
-          sources."p-limit-3.0.2"
+          sources."p-limit-3.1.0"
         ];
       })
       sources."tslib-1.14.1"
       sources."uri-js-4.4.0"
       sources."watchpack-2.0.1"
       sources."webpack-sources-2.2.0"
+      sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -104275,7 +104364,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
       sources."ajv-errors-1.0.1"
@@ -104551,7 +104640,7 @@ in
       sources."kind-of-6.0.3"
       sources."locate-path-3.0.0"
       sources."lodash-4.17.20"
-      sources."loglevel-1.7.0"
+      sources."loglevel-1.7.1"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."media-typer-0.3.0"
@@ -104926,7 +105015,7 @@ in
       sources."mkdirp-1.0.4"
       sources."normalize-path-3.0.0"
       sources."once-1.4.0"
-      sources."p-limit-3.0.2"
+      sources."p-limit-3.1.0"
       (sources."p-locate-4.1.0" // {
         dependencies = [
           sources."p-limit-2.3.0"
@@ -104961,6 +105050,7 @@ in
       sources."webpack-sources-1.4.3"
       sources."wrappy-1.0.2"
       sources."yallist-4.0.0"
+      sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -104992,7 +105082,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-13.13.32"
+      sources."@types/node-13.13.33"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
       sources."balanced-match-1.0.0"
@@ -105424,7 +105514,7 @@ in
       sources."@sindresorhus/is-0.7.0"
       sources."@types/glob-7.1.3"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-14.14.9"
+      sources."@types/node-14.14.10"
       sources."@types/normalize-package-data-2.4.0"
       sources."JSONStream-1.3.5"
       sources."aggregate-error-3.1.0"
@@ -105544,7 +105634,7 @@ in
       sources."config-chain-1.1.12"
       sources."configstore-3.1.5"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-3.7.0"
+      sources."core-js-3.8.0"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-6.0.5"

From e0c286769750c246b1ac5ad23cd8ab9dad59bd52 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Wed, 25 Nov 2020 14:47:40 -0800
Subject: [PATCH 3894/3942] nodePackages.coc-vimlsp: init at 1.10.2

---
 .../node-packages/node-packages.json           |  1 +
 .../node-packages/node-packages.nix            | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 10f740232441..0fc819938e97 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -49,6 +49,7 @@
 , "coc-tslint-plugin"
 , "coc-tsserver"
 , "coc-vetur"
+, "coc-vimlsp"
 , "coc-vimtex"
 , "coc-wxml"
 , "coc-yaml"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index c26a6e07f177..f38a27df294f 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -66455,6 +66455,24 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  coc-vimlsp = nodeEnv.buildNodePackage {
+    name = "coc-vimlsp";
+    packageName = "coc-vimlsp";
+    version = "0.10.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.10.2.tgz";
+      sha512 = "g6jCDkNRJwuPmqMN2czK90BMLec8Sdnx6uR3RZDZO2NThIduezrSbsFBpICKW93vmIprk1CvC+Pry+kRY3Mhrw==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "vim language server extension for coc.nvim";
+      homepage = "https://github.com/iamcco/coc-vim#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   coc-vimtex = nodeEnv.buildNodePackage {
     name = "coc-vimtex";
     packageName = "coc-vimtex";

From 2e524698f6ec2ec9a1336243113b292213af8f1a Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Thu, 26 Nov 2020 13:05:57 -0800
Subject: [PATCH 3895/3942] nodePackages.coc-markdownlint: init at 1.8.0

---
 .../node-packages/node-packages.json           |  1 +
 .../node-packages/node-packages.nix            | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 0fc819938e97..4c3d20a6010f 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -33,6 +33,7 @@
 , "coc-jest"
 , "coc-json"
 , "coc-lists"
+, "coc-markdownlint"
 , "coc-metals"
 , "coc-pairs"
 , "coc-prettier"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index f38a27df294f..3526d4e35d7e 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -64547,6 +64547,24 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  coc-markdownlint = nodeEnv.buildNodePackage {
+    name = "coc-markdownlint";
+    packageName = "coc-markdownlint";
+    version = "1.8.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.8.0.tgz";
+      sha512 = "HgdVA3F61GPN4sPxVNyeVWQd0p8oykchGgpovcX5QAVveAcWpUpxYXquX1y2B+EhBFZYNEOQVsr5zdVPzrko6w==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Markdownlint extension for coc.nvim";
+      homepage = "https://github.com/fannheyward/coc-markdownlint#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   coc-metals = nodeEnv.buildNodePackage {
     name = "coc-metals";
     packageName = "coc-metals";

From 2c2ddbd819f489a9e2d7b87ad4df442d1701d3ec Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Fri, 27 Nov 2020 11:14:31 -0800
Subject: [PATCH 3896/3942] vimPlugins.coc-markdownlint: fix by using
 nodePackage override

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ------------
 pkgs/misc/vim-plugins/overrides.nix    |  3 ++-
 pkgs/misc/vim-plugins/vim-plugin-names |  1 -
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 56915741665f..400c9d3ffaa6 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -447,18 +447,6 @@ let
     meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
   };
 
-  coc-markdownlint = buildVimPluginFrom2Nix {
-    pname = "coc-markdownlint";
-    version = "2020-11-12";
-    src = fetchFromGitHub {
-      owner = "fannheyward";
-      repo = "coc-markdownlint";
-      rev = "a9304f7b096871e15c2992d0d09e7c7f3a3675d4";
-      sha256 = "0r7mr4qmw04hhxihfn4pndpv0dakwjcj6jf1jccgydxc35qv14vj";
-    };
-    meta.homepage = "https://github.com/fannheyward/coc-markdownlint/";
-  };
-
   coc-neco = buildVimPluginFrom2Nix {
     pname = "coc-neco";
     version = "2020-04-07";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 0ee45658a2ae..60d2fe919255 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -648,12 +648,12 @@ self: super: {
 } // (
   let
     nodePackageNames = [
-      "coc-go"
       "coc-css"
       "coc-diagnostic"
       "coc-emmet"
       "coc-eslint"
       "coc-git"
+      "coc-go"
       "coc-highlight"
       "coc-html"
       "coc-imselect"
@@ -661,6 +661,7 @@ self: super: {
       "coc-jest"
       "coc-json"
       "coc-lists"
+      "coc-markdownlint"
       "coc-metals"
       "coc-pairs"
       "coc-prettier"
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 6f8d82e27ecb..07aef3b38a0a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -109,7 +109,6 @@ ervandew/supertab
 esneider/YUNOcommit.vim
 euclidianAce/BetterLua.vim
 euclio/vim-markdown-composer
-fannheyward/coc-markdownlint
 farmergreg/vim-lastplace
 fatih/vim-go
 fcpg/vim-osc52

From da8bd7747d143d81718ea4fdff971479ad027b94 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Fri, 27 Nov 2020 11:21:43 -0800
Subject: [PATCH 3897/3942] vimPlugins.coc-vimlsp: fix by using nodePackage
 override

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ------------
 pkgs/misc/vim-plugins/overrides.nix    |  1 +
 pkgs/misc/vim-plugins/vim-plugin-names |  1 -
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 400c9d3ffaa6..9763da3b924e 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -471,18 +471,6 @@ let
     meta.homepage = "https://github.com/iamcco/coc-spell-checker/";
   };
 
-  coc-vimlsp = buildVimPluginFrom2Nix {
-    pname = "coc-vimlsp";
-    version = "2020-08-01";
-    src = fetchFromGitHub {
-      owner = "iamcco";
-      repo = "coc-vimlsp";
-      rev = "efb672fe82d8619d83d3978714393e13aee8e296";
-      sha256 = "16whzvyzbx8zh7z33w7pir264dmbapkanb15mkazfhkh0wm3sfvf";
-    };
-    meta.homepage = "https://github.com/iamcco/coc-vimlsp/";
-  };
-
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
     version = "2020-11-17";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 60d2fe919255..a5a40d5eeae9 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -678,6 +678,7 @@ self: super: {
       "coc-tslint-plugin"
       "coc-tsserver"
       "coc-vetur"
+      "coc-vimlsp"
       "coc-vimtex"
       "coc-wxml"
       "coc-yaml"
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 07aef3b38a0a..a9b028efb670 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -161,7 +161,6 @@ hsanson/vim-android
 hsitz/VimOrganizer
 hugolgst/vimsence
 iamcco/coc-spell-checker
-iamcco/coc-vimlsp
 ianks/vim-tsx
 idanarye/vim-merginal
 idris-hackers/idris-vim

From d595620c386706376d7ec9dcf8c983e3f83fe6a8 Mon Sep 17 00:00:00 2001
From: Reed <mrnitsuj1@gmail.com>
Date: Fri, 27 Nov 2020 18:10:18 -0500
Subject: [PATCH 3898/3942] papermc: 1.16.2r141 -> 1.16.4r296

---
 pkgs/games/papermc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix
index c5f7dc379259..15b05b56d843 100644
--- a/pkgs/games/papermc/default.nix
+++ b/pkgs/games/papermc/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, bash, jre }:
 let
-  mcVersion = "1.16.2";
-  buildNum = "141";
+  mcVersion = "1.16.4";
+  buildNum = "296";
   jar = fetchurl {
     url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download";
-    sha256 = "1qhhnaysw9r73fpvj9qcmjah722a6a4s6g4cblna56n1hpz4lw1s";
+    sha256 = "0885417w7qahk2fwlzvggbwrhvwgpd7xas8lzzb7ar469vyvd9dz";
   };
 in stdenv.mkDerivation {
   pname = "papermc";

From c0d38133dd350d08590b1854468716f9297410ba Mon Sep 17 00:00:00 2001
From: Matthew Piziak <matthew.piziak@gmail.com>
Date: Fri, 27 Nov 2020 19:13:42 -0500
Subject: [PATCH 3899/3942] mdl: 0.5.0 -> 0.11.0

---
 pkgs/development/tools/misc/mdl/Gemfile.lock | 25 +++++---
 pkgs/development/tools/misc/mdl/gemset.nix   | 67 ++++++++++++++++----
 2 files changed, 72 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/tools/misc/mdl/Gemfile.lock b/pkgs/development/tools/misc/mdl/Gemfile.lock
index 04268d3306c2..0e5b7b016722 100644
--- a/pkgs/development/tools/misc/mdl/Gemfile.lock
+++ b/pkgs/development/tools/misc/mdl/Gemfile.lock
@@ -1,15 +1,24 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    kramdown (1.17.0)
-    mdl (0.5.0)
-      kramdown (~> 1.12, >= 1.12.0)
-      mixlib-cli (~> 1.7, >= 1.7.0)
-      mixlib-config (~> 2.2, >= 2.2.1)
-    mixlib-cli (1.7.0)
-    mixlib-config (2.2.18)
+    chef-utils (16.7.61)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    mdl (0.11.0)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
+      mixlib-cli (~> 2.1, >= 2.1.1)
+      mixlib-config (>= 2.2.1, < 4)
+      mixlib-shellout
+    mixlib-cli (2.1.8)
+    mixlib-config (3.0.9)
       tomlrb
-    tomlrb (1.2.8)
+    mixlib-shellout (3.2.2)
+      chef-utils
+    rexml (3.2.4)
+    tomlrb (2.0.0)
 
 PLATFORMS
   ruby
diff --git a/pkgs/development/tools/misc/mdl/gemset.nix b/pkgs/development/tools/misc/mdl/gemset.nix
index 6d48be1cbcb0..f2d332a95bb8 100644
--- a/pkgs/development/tools/misc/mdl/gemset.nix
+++ b/pkgs/development/tools/misc/mdl/gemset.nix
@@ -1,34 +1,56 @@
 {
-  kramdown = {
+  chef-utils = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
+      sha256 = "14xd2md3cda42afl28hr5q4ng195zmqfn04w2bxr4s2fb0gglbrz";
       type = "gem";
     };
-    version = "1.17.0";
+    version = "16.7.61";
+  };
+  kramdown = {
+    dependencies = ["rexml"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  kramdown-parser-gfm = {
+    dependencies = ["kramdown"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
+      type = "gem";
+    };
+    version = "1.1.0";
   };
   mdl = {
-    dependencies = ["kramdown" "mixlib-cli" "mixlib-config"];
+    dependencies = ["kramdown" "kramdown-parser-gfm" "mixlib-cli" "mixlib-config" "mixlib-shellout"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i";
+      sha256 = "0vgzq6v2scd8n4cmx8rrypqmchnhg4wccrhiakg2i8fzv7wxplqq";
       type = "gem";
     };
-    version = "0.5.0";
+    version = "0.11.0";
   };
   mixlib-cli = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp";
+      sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "2.1.8";
   };
   mixlib-config = {
     dependencies = ["tomlrb"];
@@ -36,19 +58,40 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb";
+      sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq";
       type = "gem";
     };
-    version = "2.2.18";
+    version = "3.0.9";
+  };
+  mixlib-shellout = {
+    dependencies = ["chef-utils"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9";
+      type = "gem";
+    };
+    version = "3.2.2";
+  };
+  rexml = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
+      type = "gem";
+    };
+    version = "3.2.4";
   };
   tomlrb = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv";
+      sha256 = "0ssyvjcvaisv70f21arlmnw5a1ryzmxzz4538vdwfslz9xxl27sr";
       type = "gem";
     };
-    version = "1.2.8";
+    version = "2.0.0";
   };
 }
\ No newline at end of file

From 389fbdbec43446e4ca6b3d5d832e77e94f7744cd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Nov 2020 23:51:09 +0000
Subject: [PATCH 3900/3942] gnome3.gnome-tetravex: 3.38.1 -> 3.38.2

---
 pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index afa12f1cf17c..420943580c0d 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-tetravex";
-  version = "3.38.1";
+  version = "3.38.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0s70swm2acgydz77nxyzn9xv8p03la7sl3cq87s7b8g7lyw943mv";
+    sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z";
   };
 
   passthru = {

From 83215635d0b70fb26821e5d24ea943f3308baaa2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Nov 2020 00:27:56 +0000
Subject: [PATCH 3901/3942] hdparm: 9.58 -> 9.60

---
 pkgs/os-specific/linux/hdparm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix
index 8d3a967d6832..012cfb7e6032 100644
--- a/pkgs/os-specific/linux/hdparm/default.nix
+++ b/pkgs/os-specific/linux/hdparm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hdparm";
-  version = "9.58";
+  version = "9.60";
 
   src = fetchurl {
     url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz";
-    sha256 = "03z1qm8zbgpxagk3994lvp24yqsshjibkwg05v9p3q1w7y48xrws";
+    sha256 = "1k1mcv7naiacw1y6bdd1adnjfiq1kkx2ivsadjwmlkg4fff775w3";
   };
 
   preBuild = ''

From 21a4bdb00f3cfb43cf74aad9869780159688f2a2 Mon Sep 17 00:00:00 2001
From: alypeng <6505987+alypeng@users.noreply.github.com>
Date: Tue, 29 Sep 2020 21:01:04 +0100
Subject: [PATCH 3902/3942] nodePackages.stylelint: init at 13.8.0

---
 pkgs/development/node-packages/node-packages.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 4c3d20a6010f..8604015d88b3 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -189,6 +189,7 @@
 , "ssb-server"
 , "stackdriver-statsd-backend"
 , "stf"
+, "stylelint"
 , "svgo"
 , "swagger"
 , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}

From da98de7a7e17f2b41ffa9bf7dc09886e96120e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 28 Nov 2020 01:50:30 +0100
Subject: [PATCH 3903/3942] nodePackages: Regenerate

---
 .../node-packages/node-packages.nix           | 1739 +++++++++--------
 1 file changed, 963 insertions(+), 776 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 3526d4e35d7e..1c88382c29b6 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -310,15 +310,6 @@ let
         sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
       };
     };
-    "@babel/code-frame-7.8.3" = {
-      name = "_at_babel_slash_code-frame";
-      packageName = "@babel/code-frame";
-      version = "7.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz";
-        sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==";
-      };
-    };
     "@babel/compat-data-7.12.7" = {
       name = "_at_babel_slash_compat-data";
       packageName = "@babel/compat-data";
@@ -1705,22 +1696,31 @@ let
         sha512 = "y2IZFynVtRxMQ4uxXYUnrnXZa+pvSH1R1aSUAfC6RsUb2UNOxC6zRehdLGSOyF4s9Wy+j3/CPm6fC0T5UJYoQg==";
       };
     };
-    "@expo/bunyan-3.0.2" = {
+    "@expo/bunyan-4.0.0" = {
       name = "_at_expo_slash_bunyan";
       packageName = "@expo/bunyan";
-      version = "3.0.2";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/bunyan/-/bunyan-3.0.2.tgz";
-        sha512 = "fQRc4+RG+rEw1IdjFx/5t2AvOlJT8ktv2dfObD3aW838ohZxCx1QvFUY/Gdx5JA1JY/KrHRGuEqQLH9ayiexyg==";
+        url = "https://registry.npmjs.org/@expo/bunyan/-/bunyan-4.0.0.tgz";
+        sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA==";
       };
     };
-    "@expo/config-3.3.14" = {
+    "@expo/config-3.3.16" = {
       name = "_at_expo_slash_config";
       packageName = "@expo/config";
-      version = "3.3.14";
+      version = "3.3.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/config/-/config-3.3.14.tgz";
-        sha512 = "nYnnNJRr3UZlBsUk4esbeYS2AfR3EFw4x9bVZQbbWKgDapFj26QIjGYeolZrO0yFhllSC/TU+2YNIyt6sQwRpw==";
+        url = "https://registry.npmjs.org/@expo/config/-/config-3.3.16.tgz";
+        sha512 = "iEjyV8OfaA0fPPsKYkkcod6wCd6sAtWOxAAT+7xriGqJV5aYnpL1hcBxPkPKavYzWMJUEEOwajmqoJy1uVP6ig==";
+      };
+    };
+    "@expo/config-plugins-1.0.3" = {
+      name = "_at_expo_slash_config-plugins";
+      packageName = "@expo/config-plugins";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.3.tgz";
+        sha512 = "Tc17MLfNIHl7h+YmE4cEvIK4WZq5fFShdrXJGNoNmubJ6xPeqDTLL7qCVNSzckkU4+XgfV1qt5uU+qezZLvbCw==";
       };
     };
     "@expo/config-types-40.0.0-beta.1" = {
@@ -1741,22 +1741,22 @@ let
         sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ==";
       };
     };
-    "@expo/dev-server-0.1.39" = {
+    "@expo/dev-server-0.1.41" = {
       name = "_at_expo_slash_dev-server";
       packageName = "@expo/dev-server";
-      version = "0.1.39";
+      version = "0.1.41";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.39.tgz";
-        sha512 = "PTNrPQ7z3yYLijePiqOKTtjTtzpn9HECE0LQKFcf/IVHxxVe/ScRWJAu6xndL51sXWJgE3PXg8r47UMLHb7Y2w==";
+        url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.41.tgz";
+        sha512 = "Mgqm79SE01bXiOG5DsJyuP/FAszkGKC22rfvjGb0tCVHbcvuVLjxm2fnnylBj9FRcTW6Rz3hAB1RaC5RayqNcg==";
       };
     };
-    "@expo/dev-tools-0.13.58" = {
+    "@expo/dev-tools-0.13.62" = {
       name = "_at_expo_slash_dev-tools";
       packageName = "@expo/dev-tools";
-      version = "0.13.58";
+      version = "0.13.62";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.58.tgz";
-        sha512 = "CdlCPWEzvA69ZucdeCYFoM0fEBVufcSwOOs2xcEJo2cVHGJkCUFhEwASXHdPOGt773DF1ISF4mKQAUsLtmA7qw==";
+        url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.62.tgz";
+        sha512 = "6DeV6VxdJFPz7xYwNgIvb5GGRweHC9dS/XkkKic7Nm0c8FV+BPEm0Z/JThJ76fliTFiUPB6L7hNNCLbzObW9Zw==";
       };
     };
     "@expo/eas-build-job-0.1.2" = {
@@ -1768,31 +1768,31 @@ let
         sha512 = "hBYVWlEWi8Iu+jWmbzKy2bMsYoWvRwY7MZ+SdKpNvAl+sMpp8rwvxRyRs7cRTa6DuiQ2sdOxqemnw9MJ6S5cRA==";
       };
     };
-    "@expo/image-utils-0.3.7" = {
+    "@expo/image-utils-0.3.9" = {
       name = "_at_expo_slash_image-utils";
       packageName = "@expo/image-utils";
-      version = "0.3.7";
+      version = "0.3.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.7.tgz";
-        sha512 = "Vo1p5uv1JlRacgVIiVa+83oRoHfC7grSU8cypAtgvOYpbmdCWR8+3F4v+vaabHe6ktvIKRE78jh6vHMGwv2aOA==";
+        url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.9.tgz";
+        sha512 = "VarvpeNXtvPexmJSEllDF1RRHrjznsgf2Y0bZ2IehmOZwxdqz/YssGxY2ztMx5pn3utuhc9Enx140BHDBOp8UQ==";
       };
     };
-    "@expo/json-file-8.2.24" = {
+    "@expo/json-file-8.2.25" = {
       name = "_at_expo_slash_json-file";
       packageName = "@expo/json-file";
-      version = "8.2.24";
+      version = "8.2.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.24.tgz";
-        sha512 = "i34lfcMVt5Wv2Cf5apZUj3o9JlFt8WOPSZjrECryunBQ9/BsQQYY5NHgGjhhZnnRE+6JFf0CPQTjXdoQ1w3w0w==";
+        url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.25.tgz";
+        sha512 = "KFX6grWVzttaDskq/NK8ByqFPgpDZGFnyeZVeecGoKx5kU61zuR7/xQM04OvN6BNXq3jTUst1TyS8fXEfJuscA==";
       };
     };
-    "@expo/metro-config-0.1.39" = {
+    "@expo/metro-config-0.1.41" = {
       name = "_at_expo_slash_metro-config";
       packageName = "@expo/metro-config";
-      version = "0.1.39";
+      version = "0.1.41";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.39.tgz";
-        sha512 = "oCeBGyLPmo65HeUPKEBMiZCbh2RfEbH8AO7Apwitn1zs8LZf9DvVtpEh7mlYRJlmKCrxaM4NjuFZMcquh72aiQ==";
+        url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.41.tgz";
+        sha512 = "eq2FT7/KCwQSW5R5iMLu2a8amwZ7Oz3tUIKWZtbpj6LCPbRyrF+htnjsO1eIQJ02QDE1HIs2cxFeUHjoWJSh7g==";
       };
     };
     "@expo/ngrok-2.4.3" = {
@@ -1921,13 +1921,13 @@ let
         sha512 = "oqar3vmvxkVx1OBG7hTjTbCaVVUX2o+aEMLxZWLUiubL0ly1qxgQKEt5p3g3pzkxTft+b1oMf8bT7jMi6iOv+Q==";
       };
     };
-    "@expo/package-manager-0.0.33" = {
+    "@expo/package-manager-0.0.34" = {
       name = "_at_expo_slash_package-manager";
       packageName = "@expo/package-manager";
-      version = "0.0.33";
+      version = "0.0.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.33.tgz";
-        sha512 = "zhY1a67/Fsg9FjKj2AajNDywpcbERACA7kw9eR3uJEzQwdwYiqX9cmMO8K69UKJUY2kpba4edJY9/PEMJFfPiQ==";
+        url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.34.tgz";
+        sha512 = "/zxESSNAjeBI7BlrFlmmLbEDNblJhR0fd9rZGPOwNlRoeojCJ0yh+nTUWXQtBgolffQMYq0LkTTjTDszqs4M+g==";
       };
     };
     "@expo/plist-0.0.10" = {
@@ -1948,13 +1948,13 @@ let
         sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA==";
       };
     };
-    "@expo/schemer-1.3.21" = {
+    "@expo/schemer-1.3.22" = {
       name = "_at_expo_slash_schemer";
       packageName = "@expo/schemer";
-      version = "1.3.21";
+      version = "1.3.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.21.tgz";
-        sha512 = "8rk1P9bFmTLZa4yr/6rNMP5QOJy/BDu+73c/vKpAr/JXgJwxRnlaLYe/rZkwQFMl5aPyaa4JsattVBU4IdxAiA==";
+        url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.22.tgz";
+        sha512 = "ALB9FB0DwypyNT0sL4zlM6ncQxado8eT46MOTclGoWNkVWNeeZC8O0GYHoEXLOjvfNUP5j02ATtnXCqyXAz5Hg==";
       };
     };
     "@expo/simple-spinner-1.0.2" = {
@@ -1993,22 +1993,22 @@ let
         sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg==";
       };
     };
-    "@expo/webpack-config-0.12.43" = {
+    "@expo/webpack-config-0.12.46" = {
       name = "_at_expo_slash_webpack-config";
       packageName = "@expo/webpack-config";
-      version = "0.12.43";
+      version = "0.12.46";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.43.tgz";
-        sha512 = "2XNqppNrngC4WrJJRnKpST6Xzez6GbUxB+SwhKVef8qf4Uw2vE50p0zpGTcIzs+aAIaKW3cFSIRQnhxkVrGXww==";
+        url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.46.tgz";
+        sha512 = "lVOmaBAKrw2PO1TsEOkeCFLLxGuWcoHpAeN/SgVKcQCKZuSAYqTG5qf4Rino7TdVjbCOu+Apec4AIyg2oW6Y8w==";
       };
     };
-    "@expo/xdl-58.0.19" = {
+    "@expo/xdl-59.0.2" = {
       name = "_at_expo_slash_xdl";
       packageName = "@expo/xdl";
-      version = "58.0.19";
+      version = "59.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.19.tgz";
-        sha512 = "+YWCOSJi6CoBLSgktJfy8/ijQGK3WbPUmujndcxY/WPmCe+Wek6kajmxclMMuDVAjg4RFXdH/fuLwOb/abOU5g==";
+        url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.2.tgz";
+        sha512 = "hTwJkac/+y5arWDZnQCb3lbOsgiz5tyY+ikr1LHcO8emiPpctY98H9v7MKwsxu6GsXfmwrztqgtkVBRviKh56A==";
       };
     };
     "@fast-csv/format-4.3.5" = {
@@ -2056,13 +2056,13 @@ let
         sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ==";
       };
     };
-    "@fluentui/react-7.153.1" = {
+    "@fluentui/react-7.153.2" = {
       name = "_at_fluentui_slash_react";
       packageName = "@fluentui/react";
-      version = "7.153.1";
+      version = "7.153.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.153.1.tgz";
-        sha512 = "+k1oPrvBTpmJ03PhfbaPB8oEhD57TWIGdxPajyvkJzSMgmcPOxVA5nAz2MiPdou1vtTuOgNSTDHsAQSeqVqtGA==";
+        url = "https://registry.npmjs.org/@fluentui/react/-/react-7.153.2.tgz";
+        sha512 = "8D/zFzv9WaHqX5qu5oT20rjxkKf3GMhc40AOK+wloIfqzGe/OOXpg2zr0Hz+OXEijkGU7UPsjZ6uys/UAcXERQ==";
       };
     };
     "@fluentui/react-compose-0.19.12" = {
@@ -2200,13 +2200,13 @@ let
         sha512 = "T2UEm7L5MeS1ggbGKBkdV9kTqLqSHQM13RrjPzIAYzkFL/mK837sf+oq8h2+R8B+senuHX8akUhMTcU85kcMvw==";
       };
     };
-    "@graphql-tools/schema-7.0.0" = {
+    "@graphql-tools/schema-7.1.0" = {
       name = "_at_graphql-tools_slash_schema";
       packageName = "@graphql-tools/schema";
-      version = "7.0.0";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.0.0.tgz";
-        sha512 = "yDKgoT2+Uf3cdLYmiFB9lRIGsB6lZhILtCXHgZigYgURExrEPmfj3ZyszfEpPKYcPmKaO9FI4coDhIN0Toxl3w==";
+        url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.0.tgz";
+        sha512 = "1TwaRfWOfxtTqk8ckBrLi3283Sl0tQmUleAnelID1mql4YgYyArrKRkHfWZs9DbydngTxj/uV10aLYioJMR6tQ==";
       };
     };
     "@graphql-tools/url-loader-6.4.0" = {
@@ -2227,13 +2227,13 @@ let
         sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg==";
       };
     };
-    "@graphql-tools/utils-7.0.2" = {
+    "@graphql-tools/utils-7.1.0" = {
       name = "_at_graphql-tools_slash_utils";
       packageName = "@graphql-tools/utils";
-      version = "7.0.2";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.0.2.tgz";
-        sha512 = "VQQ7krHeoXO0FS3qbWsb/vZb8c8oyiCYPIH4RSgeK9SKOUpatWYt3DW4jmLmyHZLVVMk0yjUbsOhKTBEMejKSA==";
+        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.1.0.tgz";
+        sha512 = "lMTgy08BdqQ31zyyCRrxcKZ6gAKQB9amGKJGg0mb3b4I3iJQKeaw9a7T96yGe1frGak1UK9y7OoYqx8RG7KitA==";
       };
     };
     "@graphql-tools/wrap-7.0.1" = {
@@ -2524,283 +2524,283 @@ let
         sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==";
       };
     };
-    "@jimp/bmp-0.9.8" = {
+    "@jimp/bmp-0.12.1" = {
       name = "_at_jimp_slash_bmp";
       packageName = "@jimp/bmp";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.9.8.tgz";
-        sha512 = "CZYQPEC3iUBMuaGWrtIG+GKNl93q/PkdudrCKJR/B96dfNngsmoosEm3LuFgJHEcJIfvnJkNqKw74l+zEiqCbg==";
+        url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.12.1.tgz";
+        sha512 = "t16IamuBMv4GiGa1VAMzsgrVKVANxXG81wXECzbikOUkUv7pKJ2vHZDgkLBEsZQ9sAvFCneM1+yoSRpuENrfVQ==";
       };
     };
-    "@jimp/core-0.9.8" = {
+    "@jimp/core-0.12.1" = {
       name = "_at_jimp_slash_core";
       packageName = "@jimp/core";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/core/-/core-0.9.8.tgz";
-        sha512 = "N4GCjcXb0QwR5GBABDK2xQ3cKyaF7LlCYeJEG9mV7G/ynBoRqJe4JA6YKU9Ww9imGkci/4A594nQo8tUIqdcBw==";
+        url = "https://registry.npmjs.org/@jimp/core/-/core-0.12.1.tgz";
+        sha512 = "mWfjExYEjHxBal+1gPesGChOQBSpxO7WUQkrO9KM7orboitOdQ15G5UA75ce7XVZ+5t+FQPOLmVkVZzzTQSEJA==";
       };
     };
-    "@jimp/custom-0.9.8" = {
+    "@jimp/custom-0.12.1" = {
       name = "_at_jimp_slash_custom";
       packageName = "@jimp/custom";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.9.8.tgz";
-        sha512 = "1UpJjI7fhX02BWLJ/KEqPwkHH60eNkCNeD6hEd+IZdTwLXfZCfFiM5BVlpgiZYZJSsVoRiAL4ne2Q5mCiKPKyw==";
+        url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.12.1.tgz";
+        sha512 = "bVClp8FEJ/11GFTKeRTrfH7NgUWvVO5/tQzO/68aOwMIhbz9BOYQGh533K9+mSy29VjZJo8jxZ0C9ZwYHuFwfA==";
       };
     };
-    "@jimp/gif-0.9.8" = {
+    "@jimp/gif-0.12.1" = {
       name = "_at_jimp_slash_gif";
       packageName = "@jimp/gif";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.9.8.tgz";
-        sha512 = "LEbfpcO1sBJIQCJHchZjNlyNxzPjZQQ4X32klpQHZJG58n9FvL7Uuh1rpkrJRbqv3cU3P0ENNtTrsBDxsYwcfA==";
+        url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.12.1.tgz";
+        sha512 = "cGn/AcvMGUGcqR6ByClGSnrja4AYmTwsGVXTQ1+EmfAdTiy6ztGgZCTDpZ/tq4SpdHXwm9wDHez7damKhTrH0g==";
       };
     };
-    "@jimp/jpeg-0.9.8" = {
+    "@jimp/jpeg-0.12.1" = {
       name = "_at_jimp_slash_jpeg";
       packageName = "@jimp/jpeg";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.9.8.tgz";
-        sha512 = "5u29SUzbZ32ZMmOaz3gO0hXatwSCnsvEAXRCKZoPPgbsPoyFAiZKVxjfLzjkeQF6awkvJ8hZni5chM15SNMg+g==";
+        url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.12.1.tgz";
+        sha512 = "UoCUHbKLj2CDCETd7LrJnmK/ExDsSfJXmc1pKkfgomvepjXogdl2KTHf141wL6D+9CfSD2VBWQLC5TvjMvcr9A==";
       };
     };
-    "@jimp/plugin-blit-0.9.8" = {
+    "@jimp/plugin-blit-0.12.1" = {
       name = "_at_jimp_slash_plugin-blit";
       packageName = "@jimp/plugin-blit";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.9.8.tgz";
-        sha512 = "6xTDomxJybhBcby1IUVaPydZFhxf+V0DRgfDlVK81kR9kSCoshJpzWqDuWrMqjNEPspPE7jRQwHMs0FdU7mVwQ==";
+        url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.12.1.tgz";
+        sha512 = "VRBB6bx6EpQuaH0WX8ytlGNqUQcmuxXBbzL3e+cD0W6MluYibzQy089okvXcyUS72Q+qpSMmUDCVr3pDqLAsSA==";
       };
     };
-    "@jimp/plugin-blur-0.9.8" = {
+    "@jimp/plugin-blur-0.12.1" = {
       name = "_at_jimp_slash_plugin-blur";
       packageName = "@jimp/plugin-blur";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.9.8.tgz";
-        sha512 = "dqbxuNFBRbmt35iIRacdgma7nlXklmPThsKcGWNTDmqb/hniK5IC+0xSPzBV4qMI2fLGP39LWHqqDZ0xDz14dA==";
+        url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.12.1.tgz";
+        sha512 = "rTFY0yrwVJFNgNsAlYGn2GYCRLVEcPQ6cqAuhNylXuR/7oH3Acul+ZWafeKtvN8D8uMlth/6VP74gruXvwffZw==";
       };
     };
-    "@jimp/plugin-circle-0.9.8" = {
+    "@jimp/plugin-circle-0.12.1" = {
       name = "_at_jimp_slash_plugin-circle";
       packageName = "@jimp/plugin-circle";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.9.8.tgz";
-        sha512 = "+UStXUPCzPqzTixLC8eVqcFcEa6TS+BEM/6/hyM11TDb9sbiMGeUtgpwZP/euR5H5gfpAQDA1Ppzqhh5fuMDlw==";
+        url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.12.1.tgz";
+        sha512 = "+/OiBDjby7RBbQoDX8ZsqJRr1PaGPdTaaKUVGAsrE7KCNO9ODYNFAizB9lpidXkGgJ4Wx5R4mJy21i22oY/a4Q==";
       };
     };
-    "@jimp/plugin-color-0.9.8" = {
+    "@jimp/plugin-color-0.12.1" = {
       name = "_at_jimp_slash_plugin-color";
       packageName = "@jimp/plugin-color";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.9.8.tgz";
-        sha512 = "SDHxOQsJHpt75hk6+sSlCPc2B3UJlXosFW+iLZ11xX1Qr0IdDtbfYlIoPmjKQFIDUNzqLSue/z7sKQ1OMZr/QA==";
+        url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.12.1.tgz";
+        sha512 = "xlnK/msWN4uZ+Bu7+UrCs9oMzTSA9QE0jWFnF3h0aBsD8t1LGxozkckHe8nHtC/y/sxIa8BGKSfkiaW+r6FbnA==";
       };
     };
-    "@jimp/plugin-contain-0.9.8" = {
+    "@jimp/plugin-contain-0.12.1" = {
       name = "_at_jimp_slash_plugin-contain";
       packageName = "@jimp/plugin-contain";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.9.8.tgz";
-        sha512 = "oK52CPt7efozuLYCML7qOmpFeDt3zpU8qq8UZlnjsDs15reU6L8EiUbwYpJvzoEnEOh1ZqamB8F/gymViEO5og==";
+        url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.12.1.tgz";
+        sha512 = "WZ/D6G0jhnBh2bkBh610PEh/caGhAUIAxYLsQsfSSlOxPsDhbj3S6hMbFKRgnDvf0hsd5zTIA0j1B0UG4kh18A==";
       };
     };
-    "@jimp/plugin-cover-0.9.8" = {
+    "@jimp/plugin-cover-0.12.1" = {
       name = "_at_jimp_slash_plugin-cover";
       packageName = "@jimp/plugin-cover";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.9.8.tgz";
-        sha512 = "nnamtHzMrNd5j5HRSPd1VzpZ8v9YYtUJPtvCdHOOiIjqG72jxJ2kTBlsS3oG5XS64h/2MJwpl/fmmMs1Tj1CmQ==";
+        url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.12.1.tgz";
+        sha512 = "ddWwTQO40GcabJ2UwUYCeuNxnjV4rBTiLprnjGMqAJCzdz3q3Sp20FkRf+H+E22k2v2LHss8dIOFOF4i6ycr9Q==";
       };
     };
-    "@jimp/plugin-crop-0.9.8" = {
+    "@jimp/plugin-crop-0.12.1" = {
       name = "_at_jimp_slash_plugin-crop";
       packageName = "@jimp/plugin-crop";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.9.8.tgz";
-        sha512 = "Nv/6AIp4aJmbSIH2uiIqm+kSoShKM8eaX2fyrUTj811kio0hwD3f/vIxrWebvAqwDZjAFIAmMufFoFCVg6caoQ==";
+        url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.12.1.tgz";
+        sha512 = "CKjVkrNO8FDZKYVpMireQW4SgKBSOdF+Ip/1sWssHHe77+jGEKqOjhYju+VhT3dZJ3+75rJNI9II7Kethp+rTw==";
       };
     };
-    "@jimp/plugin-displace-0.9.8" = {
+    "@jimp/plugin-displace-0.12.1" = {
       name = "_at_jimp_slash_plugin-displace";
       packageName = "@jimp/plugin-displace";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.9.8.tgz";
-        sha512 = "0OgPjkOVa2xdbqI8P6gBKX/UK36RbaYVrFyXL8Jy9oNF69+LYWyTskuCu9YbGxzlCVjY/JFqQOvrKDbxgMYAKA==";
+        url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.12.1.tgz";
+        sha512 = "MQAw2iuf1/bVJ6P95WWTLA+WBjvIZ7TeGBerkvBaTK8oWdj+NSLNRIYOIoyPbZ7DTL8f1SN4Vd6KD6BZaoWrwg==";
       };
     };
-    "@jimp/plugin-dither-0.9.8" = {
+    "@jimp/plugin-dither-0.12.1" = {
       name = "_at_jimp_slash_plugin-dither";
       packageName = "@jimp/plugin-dither";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.9.8.tgz";
-        sha512 = "jGM/4ByniZJnmV2fv8hKwyyydXZe/YzvgBcnB8XxzCq8kVR3Imcn+qnd2PEPZzIPKOTH4Cig/zo9Vk9Bs+m5FQ==";
+        url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.12.1.tgz";
+        sha512 = "mCrBHdx2ViTLJDLcrobqGLlGhZF/Mq41bURWlElQ2ArvrQ3/xR52We9DNDfC08oQ2JVb6q3v1GnCCdn0KNojGQ==";
       };
     };
-    "@jimp/plugin-fisheye-0.9.8" = {
+    "@jimp/plugin-fisheye-0.12.1" = {
       name = "_at_jimp_slash_plugin-fisheye";
       packageName = "@jimp/plugin-fisheye";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.9.8.tgz";
-        sha512 = "VnsalrD05f4pxG1msjnkwIFi5QveOqRm4y7VkoZKNX+iqs4TvRnH5+HpBnfdMzX/RXBi+Lf/kpTtuZgbOu/QWw==";
+        url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.12.1.tgz";
+        sha512 = "CHvYSXtHNplzkkYzB44tENPDmvfUHiYCnAETTY+Hx58kZ0w8ERZ+OiLhUmiBcvH/QHm/US1iiNjgGUAfeQX6dg==";
       };
     };
-    "@jimp/plugin-flip-0.9.8" = {
+    "@jimp/plugin-flip-0.12.1" = {
       name = "_at_jimp_slash_plugin-flip";
       packageName = "@jimp/plugin-flip";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.9.8.tgz";
-        sha512 = "XbiZ4OfHD6woc0f6Sk7XxB6a7IyMjTRQ4pNU7APjaNxsl3L6qZC8qfCQphWVe3DHx7f3y7jEiPMvNnqRDP1xgA==";
+        url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.12.1.tgz";
+        sha512 = "xi+Yayrnln8A/C9E3yQBExjxwBSeCkt/ZQg1CxLgszVyX/3Zo8+nkV8MJYpkTpj8LCZGTOKlsE05mxu/a3lbJQ==";
       };
     };
-    "@jimp/plugin-gaussian-0.9.8" = {
+    "@jimp/plugin-gaussian-0.12.1" = {
       name = "_at_jimp_slash_plugin-gaussian";
       packageName = "@jimp/plugin-gaussian";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.8.tgz";
-        sha512 = "ZBl5RA6+4XAD+mtqLfiG7u+qd8W5yqq3RBNca8eFqUSVo1v+eB2tzeLel0CWfVC/z6cw93Awm/nVnm6/CL2Oew==";
+        url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.12.1.tgz";
+        sha512 = "7O6eKlhL37hsLfV6WAX1Cvce7vOqSwL1oWbBveC1agutDlrtvcTh1s2mQ4Pde654hCJu55mq1Ur10+ote5j3qw==";
       };
     };
-    "@jimp/plugin-invert-0.9.8" = {
+    "@jimp/plugin-invert-0.12.1" = {
       name = "_at_jimp_slash_plugin-invert";
       packageName = "@jimp/plugin-invert";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.9.8.tgz";
-        sha512 = "ESploqCoF6qUv5IWhVLaO5fEcrYZEsAWPFflh6ROiD2mmFKQxfeK+vHnk3IDLHtUwWTkAZQNbk89BVq7xvaNpQ==";
+        url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.12.1.tgz";
+        sha512 = "JTAs7A1Erbxwl+7ph7tgcb2PZ4WzB+3nb2WbfiWU8iCrKj17mMDSc5soaCCycn8wfwqvgB1vhRfGpseOLWxsuQ==";
       };
     };
-    "@jimp/plugin-mask-0.9.8" = {
+    "@jimp/plugin-mask-0.12.1" = {
       name = "_at_jimp_slash_plugin-mask";
       packageName = "@jimp/plugin-mask";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.9.8.tgz";
-        sha512 = "zSvEisTV4iGsBReitEdnQuGJq9/1xB5mPATadYZmIlp8r5HpD72HQb0WdEtb51/pu9Odt8KAxUf0ASg/PRVUiQ==";
+        url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.12.1.tgz";
+        sha512 = "bnDdY0RO/x5Mhqoy+056SN1wEj++sD4muAKqLD2CIT8Zq5M/0TA4hkdf/+lwFy3H2C0YTK39PSE9xyb4jPX3kA==";
       };
     };
-    "@jimp/plugin-normalize-0.9.8" = {
+    "@jimp/plugin-normalize-0.12.1" = {
       name = "_at_jimp_slash_plugin-normalize";
       packageName = "@jimp/plugin-normalize";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.9.8.tgz";
-        sha512 = "dPFBfwTa67K1tRw1leCidQT25R3ozrTUUOpO4jcGFHqXvBTWaR8sML1qxdfOBWs164mE5YpfdTvu6MM/junvCg==";
+        url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.12.1.tgz";
+        sha512 = "4kSaI4JLM/PNjHwbnAHgyh51V5IlPfPxYvsZyZ1US32pebWtocxSMaSuOaJUg7OGSkwSDBv81UR2h5D+Dz1b5A==";
       };
     };
-    "@jimp/plugin-print-0.9.8" = {
+    "@jimp/plugin-print-0.12.1" = {
       name = "_at_jimp_slash_plugin-print";
       packageName = "@jimp/plugin-print";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.9.8.tgz";
-        sha512 = "nLLPv1/faehRsOjecXXUb6kzhRcZzImO55XuFZ0c90ZyoiHm4UFREwO5sKxHGvpLXS6RnkhvSav4+IWD2qGbEQ==";
+        url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.12.1.tgz";
+        sha512 = "T0lNS3qU9SwCHOEz7AGrdp50+gqiWGZibOL3350/X/dqoFs1EvGDjKVeWncsGCyLlpfd7M/AibHZgu8Fx2bWng==";
       };
     };
-    "@jimp/plugin-resize-0.9.8" = {
+    "@jimp/plugin-resize-0.12.1" = {
       name = "_at_jimp_slash_plugin-resize";
       packageName = "@jimp/plugin-resize";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.9.8.tgz";
-        sha512 = "L80NZ+HKsiKFyeDc6AfneC4+5XACrdL2vnyAVfAAsb3pmamgT/jDInWvvGhyI0Y76vx2w6XikplzEznW/QQvWg==";
+        url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.12.1.tgz";
+        sha512 = "sbNn4tdBGcgGlPt9XFxCuDl4ZOoxa8/Re8nAikyxYhRss2Dqz91ARbBQxOf1vlUGeicQMsjEuWbPQAogTSJRug==";
       };
     };
-    "@jimp/plugin-rotate-0.9.8" = {
+    "@jimp/plugin-rotate-0.12.1" = {
       name = "_at_jimp_slash_plugin-rotate";
       packageName = "@jimp/plugin-rotate";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.9.8.tgz";
-        sha512 = "bpqzQheISYnBXKyU1lIj46uR7mRs0UhgEREWK70HnvFJSlRshdcoNMIrKamyrJeFdJrkYPSfR/a6D0d5zsWf1Q==";
+        url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.12.1.tgz";
+        sha512 = "RYkLzwG2ervG6hHy8iepbIVeWdT1kz4Qz044eloqo6c66MK0KAqp228YI8+CAKm0joQnVDC/A0FgRIj/K8uyAw==";
       };
     };
-    "@jimp/plugin-scale-0.9.8" = {
+    "@jimp/plugin-scale-0.12.1" = {
       name = "_at_jimp_slash_plugin-scale";
       packageName = "@jimp/plugin-scale";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.9.8.tgz";
-        sha512 = "QU3ZS4Lre8nN66U9dKCOC4FNfaOh/QJFYUmQPKpPS924oYbtnm4OlmsdfpK2hVMSVVyVOis8M+xpA1rDBnIp7w==";
+        url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.12.1.tgz";
+        sha512 = "zjNVI1fUj+ywfG78T1ZU33g9a5sk4rhEQkkhtny8koAscnVsDN2YaZEKoFli54kqaWh5kSS5DDL7a/9pEfXnFQ==";
       };
     };
-    "@jimp/plugin-shadow-0.9.8" = {
+    "@jimp/plugin-shadow-0.12.1" = {
       name = "_at_jimp_slash_plugin-shadow";
       packageName = "@jimp/plugin-shadow";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.9.8.tgz";
-        sha512 = "t/pE+QS3r1ZUxGIQNmwWDI3c5+/hLU+gxXD+C3EEC47/qk3gTBHpj/xDdGQBoObdT/HRjR048vC2BgBfzjj2hg==";
+        url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.12.1.tgz";
+        sha512 = "Z82IwvunXWQ2jXegd3W3TYUXpfJcEvNbHodr7Z+oVnwhM1OoQ5QC6RSRQwsj2qXIhbGffQjH8eguHgEgAV+u5w==";
       };
     };
-    "@jimp/plugin-threshold-0.9.8" = {
+    "@jimp/plugin-threshold-0.12.1" = {
       name = "_at_jimp_slash_plugin-threshold";
       packageName = "@jimp/plugin-threshold";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.9.8.tgz";
-        sha512 = "WWmC3lnIwOTPvkKu55w4DUY8Ehlzf3nU98bY0QtIzkqxkAOZU5m+lvgC/JxO5FyGiA57j9FLMIf0LsWkjARj7g==";
+        url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.12.1.tgz";
+        sha512 = "PFezt5fSk0q+xKvdpuv0eLggy2I7EgYotrK8TRZOT0jimuYFXPF0Z514c6szumoW5kEsRz04L1HkPT1FqI97Yg==";
       };
     };
-    "@jimp/plugins-0.9.8" = {
+    "@jimp/plugins-0.12.1" = {
       name = "_at_jimp_slash_plugins";
       packageName = "@jimp/plugins";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.9.8.tgz";
-        sha512 = "tD+cxS9SuEZaQ1hhAkNKw9TkUAqfoBAhdWPBrEZDr/GvGPrvJR4pYmmpSYhc5IZmMbXfQayHTTGqjj8D18bToA==";
+        url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.12.1.tgz";
+        sha512 = "7+Yp29T6BbYo+Oqnc+m7A5AH+O+Oy5xnxvxlfmsp48+SuwEZ4akJp13Gu2PSmRlylENzR7MlWOxzhas5ERNlIg==";
       };
     };
-    "@jimp/png-0.9.8" = {
+    "@jimp/png-0.12.1" = {
       name = "_at_jimp_slash_png";
       packageName = "@jimp/png";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/png/-/png-0.9.8.tgz";
-        sha512 = "9CqR8d40zQCDhbnXHqcwkAMnvlV0vk9xSyE6LHjkYHS7x18Unsz5txQdsaEkEcXxCrOQSoWyITfLezlrWXRJAA==";
+        url = "https://registry.npmjs.org/@jimp/png/-/png-0.12.1.tgz";
+        sha512 = "tOUSJMJzcMAN82F9/Q20IToquIVWzvOe/7NIpVQJn6m+Lq6TtVmd7d8gdcna9AEFm2FIza5lhq2Kta6Xj0KXhQ==";
       };
     };
-    "@jimp/tiff-0.9.8" = {
+    "@jimp/tiff-0.12.1" = {
       name = "_at_jimp_slash_tiff";
       packageName = "@jimp/tiff";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.9.8.tgz";
-        sha512 = "eMxcpJivJqMByn2dZxUHLeh6qvVs5J/52kBF3TFa3C922OJ97D9l1C1h0WKUCBqFMWzMYapQQ4vwnLgpJ5tkow==";
+        url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.12.1.tgz";
+        sha512 = "bzWDgv3202TKhaBGzV9OFF0PVQWEb4194h9kv5js348SSnbCusz/tzTE1EwKrnbDZThZPgTB1ryKs7D+Q9Mhmg==";
       };
     };
-    "@jimp/types-0.9.8" = {
+    "@jimp/types-0.12.1" = {
       name = "_at_jimp_slash_types";
       packageName = "@jimp/types";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/types/-/types-0.9.8.tgz";
-        sha512 = "H5y/uqt0lqJ/ZN8pWqFG+pv8jPAppMKkTMByuC8YBIjWSsornwv44hjiWl93sbYhduLZY8ubz/CbX9jH2X6EwA==";
+        url = "https://registry.npmjs.org/@jimp/types/-/types-0.12.1.tgz";
+        sha512 = "hg5OKXpWWeKGuDrfibrjWWhr7hqb7f552wqnPWSLQpVrdWgjH+hpOv6cOzdo9bsU78qGTelZJPxr0ERRoc+MhQ==";
       };
     };
-    "@jimp/utils-0.9.8" = {
+    "@jimp/utils-0.12.1" = {
       name = "_at_jimp_slash_utils";
       packageName = "@jimp/utils";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.9.8.tgz";
-        sha512 = "UK0Fu0eevQlpRXq5ff4o/71HJlpX9wJMddJjMYg9vUqCCl8ZnumRAljfShHFhGyO+Vc9IzN6dd8Y5JZZTp1KOw==";
+        url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.12.1.tgz";
+        sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ==";
       };
     };
     "@joplinapp/fork-htmlparser2-4.1.8" = {
@@ -4945,13 +4945,13 @@ let
         sha512 = "h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw==";
       };
     };
-    "@snyk/dep-graph-1.20.0" = {
+    "@snyk/dep-graph-1.21.0" = {
       name = "_at_snyk_slash_dep-graph";
       packageName = "@snyk/dep-graph";
-      version = "1.20.0";
+      version = "1.21.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.20.0.tgz";
-        sha512 = "/TOzXGh+JFgAu8pWdo1oLFKDNfFk99TnSQG2lbEu+vKLI2ZrGAk9oGO0geNogAN7Ib4EDQOEhgb7YwqwL7aA7w==";
+        url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.21.0.tgz";
+        sha512 = "+xwiU1zw+Z1V6RaIL7oWUqZo8jDIpoKfzvv8xGiq0hYxsiP9tGSUNuFXwQzAFEP60kJyD2a/nptdRPjsKD0jPw==";
       };
     };
     "@snyk/docker-registry-v2-client-1.13.9" = {
@@ -5350,13 +5350,13 @@ let
         sha512 = "NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==";
       };
     };
-    "@types/babel__traverse-7.0.15" = {
+    "@types/babel__traverse-7.0.16" = {
       name = "_at_types_slash_babel__traverse";
       packageName = "@types/babel__traverse";
-      version = "7.0.15";
+      version = "7.0.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz";
-        sha512 = "Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==";
+        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.16.tgz";
+        sha512 = "S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w==";
       };
     };
     "@types/babylon-6.16.5" = {
@@ -10255,13 +10255,13 @@ let
         sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==";
       };
     };
-    "babel-loader-8.2.1" = {
+    "babel-loader-8.2.2" = {
       name = "babel-loader";
       packageName = "babel-loader";
-      version = "8.2.1";
+      version = "8.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.1.tgz";
-        sha512 = "dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==";
+        url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz";
+        sha512 = "JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==";
       };
     };
     "babel-plugin-dynamic-import-node-2.3.3" = {
@@ -11047,13 +11047,13 @@ let
         sha512 = "2uhEl8FdjSBUyb69qDTgOEeeqDTa+n3yMQzLW0cOzNf1Ow5bwcg3idf+qsWisIKRH8Bk8oC7UXL8irRcPA8ZEQ==";
       };
     };
-    "bep53-range-1.0.0" = {
+    "bep53-range-1.1.0" = {
       name = "bep53-range";
       packageName = "bep53-range";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bep53-range/-/bep53-range-1.0.0.tgz";
-        sha512 = "CNsnREjxe2/wD559wzFXMycUnbmUDA9C2Bs6Z2tm++amSma7JowAAxAnaZJMuDq3cWSx9HSIbV04H06QQ11zTA==";
+        url = "https://registry.npmjs.org/bep53-range/-/bep53-range-1.1.0.tgz";
+        sha512 = "yGQTG4NtwTciX0Bkgk1FqQL4p+NiCQKpTSFho2lrxvUkXIlzyJDwraj8aYxAxRZMnnOhRr7QlIBoMRPEnIR34Q==";
       };
     };
     "better-ajv-errors-0.6.7" = {
@@ -12154,13 +12154,13 @@ let
         sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==";
       };
     };
-    "browserslist-4.10.0" = {
+    "browserslist-4.14.2" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.10.0";
+      version = "4.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.10.0.tgz";
-        sha512 = "TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz";
+        sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==";
       };
     };
     "browserslist-4.14.7" = {
@@ -14584,13 +14584,13 @@ let
         sha512 = "SPnx+ZHXVJ0qTInRXmnxuyu8PDvSzvop5MXp1BOr/urFQI3yL2n5ewE755skTklF/hKVlWj8cinGxdR2gvLvTA==";
       };
     };
-    "codecs-2.1.0" = {
+    "codecs-2.2.0" = {
       name = "codecs";
       packageName = "codecs";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/codecs/-/codecs-2.1.0.tgz";
-        sha512 = "nSWYToViFEpZXOxhtMQ6IDs76TN9xKIkHOu1KCr/iFiBcgzKuY1AFPZktuXN8r82FbZ/TXP9fwITszLgcp3eQg==";
+        url = "https://registry.npmjs.org/codecs/-/codecs-2.2.0.tgz";
+        sha512 = "+xi2ENsvchtUNa8oBUU58gHgmyN6BEEeZ8NIEgeQ0XnC+AoyihivgZYe+OOiNi+fLy/NUowugwV5gP8XWYDm0Q==";
       };
     };
     "codepage-1.4.0" = {
@@ -16349,15 +16349,6 @@ let
         sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
       };
     };
-    "cross-spawn-7.0.1" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "7.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz";
-        sha512 = "u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==";
-      };
-    };
     "cross-spawn-7.0.3" = {
       name = "cross-spawn";
       packageName = "cross-spawn";
@@ -16610,13 +16601,13 @@ let
         sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==";
       };
     };
-    "css-tree-1.1.1" = {
+    "css-tree-1.1.2" = {
       name = "css-tree";
       packageName = "css-tree";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.1.tgz";
-        sha512 = "NVN42M2fjszcUNpDbdkvutgQSlFYsr1z7kqeuCagHnNLBfYor6uP1WL1KrkmdYZ5Y1vTBCIOI/C/+8T98fJ71w==";
+        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz";
+        sha512 = "wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==";
       };
     };
     "css-what-1.0.0" = {
@@ -16736,13 +16727,13 @@ let
         sha1 = "178b43a44621221c27756086f531e02f42900ee8";
       };
     };
-    "csso-4.1.1" = {
+    "csso-4.2.0" = {
       name = "csso";
       packageName = "csso";
-      version = "4.1.1";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-4.1.1.tgz";
-        sha512 = "Rvq+e1e0TFB8E8X+8MQjHSY6vtol45s5gxtLI/018UsAn2IBMmwNEZRM/h+HVnAJRHjasLIKKUO3uvoMM28LvA==";
+        url = "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz";
+        sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==";
       };
     };
     "cssom-0.3.8" = {
@@ -19886,13 +19877,13 @@ let
         sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
       };
     };
-    "electron-to-chromium-1.3.607" = {
+    "electron-to-chromium-1.3.610" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.607";
+      version = "1.3.610";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.607.tgz";
-        sha512 = "h2SYNaBnlplGS0YyXl8oJWokfcNxVjJANQfMCsQefG6OSuAuNIeW+A8yGT/ci+xRoBb3k2zq1FrOvkgoKBol8g==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz";
+        sha512 = "eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g==";
       };
     };
     "electrum-client-git://github.com/janoside/electrum-client" = {
@@ -20050,15 +20041,6 @@ let
         sha512 = "5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==";
       };
     };
-    "emojis-list-2.1.0" = {
-      name = "emojis-list";
-      packageName = "emojis-list";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz";
-        sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
-      };
-    };
     "emojis-list-3.0.0" = {
       name = "emojis-list";
       packageName = "emojis-list";
@@ -20590,15 +20572,6 @@ let
         sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab";
       };
     };
-    "es6-error-3.2.0" = {
-      name = "es6-error";
-      packageName = "es6-error";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-error/-/es6-error-3.2.0.tgz";
-        sha1 = "e567cfdcb324d4e7ae5922a3700ada5de879a0ca";
-      };
-    };
     "es6-error-4.1.1" = {
       name = "es6-error";
       packageName = "es6-error";
@@ -21607,15 +21580,6 @@ let
         sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==";
       };
     };
-    "exeunt-1.1.0" = {
-      name = "exeunt";
-      packageName = "exeunt";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/exeunt/-/exeunt-1.1.0.tgz";
-        sha1 = "af72db6f94b3cb75e921aee375d513049843d284";
-      };
-    };
     "exif-parser-0.1.12" = {
       name = "exif-parser";
       packageName = "exif-parser";
@@ -21706,13 +21670,13 @@ let
         sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929";
       };
     };
-    "expo-pwa-0.0.49" = {
+    "expo-pwa-0.0.52" = {
       name = "expo-pwa";
       packageName = "expo-pwa";
-      version = "0.0.49";
+      version = "0.0.52";
       src = fetchurl {
-        url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.49.tgz";
-        sha512 = "HzwUGdnN9g5Ov/3r2uXwyjYP0xNtgOre1Z+Cywxg7GQWoFiklBfvYraIQFfwOjXVnsgo7bF4GFd4QW4v5vi9wA==";
+        url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.52.tgz";
+        sha512 = "LzpcL/nzFrBJqCCEaDOmWx4BfvmQFhAetUSG8/WcyMcTvqTC/WlboK+mlSj0mN5vw1/H/UCMqj6GoT07QIaUWQ==";
       };
     };
     "express-2.5.11" = {
@@ -22688,15 +22652,6 @@ let
         sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==";
       };
     };
-    "filesize-6.0.1" = {
-      name = "filesize";
-      packageName = "filesize";
-      version = "6.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/filesize/-/filesize-6.0.1.tgz";
-        sha512 = "u4AYWPgbI5GBhs6id1KdImZWn5yfyFrrQ8OWZdN7ZMfA8Bf4HcO0BGo9bmUIEV8yrp8I1xVfJ/dn90GtFNNJcg==";
-      };
-    };
     "filesize-6.1.0" = {
       name = "filesize";
       packageName = "filesize";
@@ -23381,13 +23336,13 @@ let
         sha512 = "7YGDo0UlbMy++6G3lzncWISDaT5CVp+yPVAkZ7FDFF0ec+0HKgBOWOhPGKpMF0hjcm3Ps/HbtrETrQLYREZ7YQ==";
       };
     };
-    "fork-ts-checker-webpack-plugin-3.1.1" = {
+    "fork-ts-checker-webpack-plugin-4.1.6" = {
       name = "fork-ts-checker-webpack-plugin";
       packageName = "fork-ts-checker-webpack-plugin";
-      version = "3.1.1";
+      version = "4.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz";
-        sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ==";
+        url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz";
+        sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==";
       };
     };
     "fork-ts-checker-webpack-plugin-6.0.2" = {
@@ -27235,15 +27190,6 @@ let
         sha512 = "y5AxkxqpPTj2dkaAEkDnrMuSX4JNicXHD6yTpLfFnflVejL6yJpzf27obrnlf2PSSQiWUf3735Y9tJEjxvqnoA==";
       };
     };
-    "immer-1.10.0" = {
-      name = "immer";
-      packageName = "immer";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz";
-        sha512 = "O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==";
-      };
-    };
     "immer-7.0.15" = {
       name = "immer";
       packageName = "immer";
@@ -27253,6 +27199,15 @@ let
         sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA==";
       };
     };
+    "immer-7.0.9" = {
+      name = "immer";
+      packageName = "immer";
+      version = "7.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/immer/-/immer-7.0.9.tgz";
+        sha512 = "Vs/gxoM4DqNAYR7pugIxi0Xc8XAun/uy7AQu4fLLqaTBHxjOP9pJ266Q9MWA/ly4z6rAFZbvViOtihxUZ7O28A==";
+      };
+    };
     "import-cwd-3.0.0" = {
       name = "import-cwd";
       packageName = "import-cwd";
@@ -27649,15 +27604,6 @@ let
         sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==";
       };
     };
-    "inquirer-7.0.4" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "7.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz";
-        sha512 = "Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==";
-      };
-    };
     "inquirer-7.3.3" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -28261,13 +28207,13 @@ let
         sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345";
       };
     };
-    "is-core-module-2.1.0" = {
+    "is-core-module-2.2.0" = {
       name = "is-core-module";
       packageName = "is-core-module";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz";
-        sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==";
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
+        sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
       };
     };
     "is-data-descriptor-0.1.4" = {
@@ -29755,13 +29701,13 @@ let
         sha1 = "2cf9fbae46d8074fc16b7de0071c8efebca473a6";
       };
     };
-    "jimp-0.9.8" = {
+    "jimp-0.12.1" = {
       name = "jimp";
       packageName = "jimp";
-      version = "0.9.8";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jimp/-/jimp-0.9.8.tgz";
-        sha512 = "DHN4apKMwLIvD/TKO9tFfPuankNuVK98vCwHm/Jv9z5cJnrd38xhi+4I7IAGmDU3jIDlrEVhzTkFH1Ymv5yTQQ==";
+        url = "https://registry.npmjs.org/jimp/-/jimp-0.12.1.tgz";
+        sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw==";
       };
     };
     "jju-1.4.0" = {
@@ -29827,15 +29773,6 @@ let
         sha512 = "qL4+1iycQjZ1fs8zk3jSRk7cg3ROBUHk7GKtiLAQLFzLPKErnILUvz5DLszSQvz3s1sTjPbywLDISVUtBY6HaA==";
       };
     };
-    "jpeg-js-0.3.7" = {
-      name = "jpeg-js";
-      packageName = "jpeg-js";
-      version = "0.3.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.7.tgz";
-        sha512 = "9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==";
-      };
-    };
     "jpeg-js-0.4.2" = {
       name = "jpeg-js";
       packageName = "jpeg-js";
@@ -29872,13 +29809,13 @@ let
         sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51";
       };
     };
-    "jquery.terminal-2.19.2" = {
+    "jquery.terminal-2.20.0" = {
       name = "jquery.terminal";
       packageName = "jquery.terminal";
-      version = "2.19.2";
+      version = "2.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.19.2.tgz";
-        sha512 = "oljqqqN19/tqmsSdr4exz75DlQQ35c/FhP0EkrmQUt1NCXtYGujb8G5uCATDV+EhbDpF6nleH8YsOmzpqpKT/g==";
+        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.0.tgz";
+        sha512 = "8Wq9i5mwj8MnkFHEFZebn+l4K4HEsRXSanrQwq/u6lEP39/44b1vJzmYsqJLq57JALrY6Cp9b5fC4hMlWhi1Zw==";
       };
     };
     "js-base64-2.6.4" = {
@@ -31898,15 +31835,6 @@ let
         sha512 = "oR4lB4WvwFoC70ocraKhn5nkKSs23t57h9udUgw8o0iH8hMXeEoRuUgfcvgUwAJ1ZpRqBvcou4N2SMvM1DwMrA==";
       };
     };
-    "loader-utils-1.2.3" = {
-      name = "loader-utils";
-      packageName = "loader-utils";
-      version = "1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz";
-        sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==";
-      };
-    };
     "loader-utils-1.4.0" = {
       name = "loader-utils";
       packageName = "loader-utils";
@@ -38408,13 +38336,13 @@ let
         sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==";
       };
     };
-    "object-is-1.1.3" = {
+    "object-is-1.1.4" = {
       name = "object-is";
       packageName = "object-is";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz";
-        sha512 = "teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==";
+        url = "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz";
+        sha512 = "1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==";
       };
     };
     "object-keys-0.2.0" = {
@@ -38462,13 +38390,13 @@ let
         sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w==";
       };
     };
-    "object-treeify-1.1.29" = {
+    "object-treeify-1.1.30" = {
       name = "object-treeify";
       packageName = "object-treeify";
-      version = "1.1.29";
+      version = "1.1.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.29.tgz";
-        sha512 = "XnPIMyiv6fJeb/z3Bz+u43Fcw3C9fs1uoRITd8x3mau/rsSAUhx7qpIO10Q/dzJeMleJesccUSMiFx8FF+ruBA==";
+        url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.30.tgz";
+        sha512 = "BhsTZj8kbeCnyBKWuAgAakbGgrcVV/IJhUAGF25lOSwDZoHoDmnynUtXfyrrDn8A1Xy3G9k5uLP+V5onOOq3WA==";
       };
     };
     "object-visit-1.0.1" = {
@@ -38507,22 +38435,22 @@ let
         sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf";
       };
     };
-    "object.entries-1.1.2" = {
+    "object.entries-1.1.3" = {
       name = "object.entries";
       packageName = "object.entries";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz";
-        sha512 = "BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==";
+        url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz";
+        sha512 = "ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==";
       };
     };
-    "object.getownpropertydescriptors-2.1.0" = {
+    "object.getownpropertydescriptors-2.1.1" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
-        sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==";
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz";
+        sha512 = "6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==";
       };
     };
     "object.map-1.0.1" = {
@@ -38561,13 +38489,13 @@ let
         sha1 = "6fe348f2ac7fa0f95ca621226599096825bb03ad";
       };
     };
-    "object.values-1.1.1" = {
+    "object.values-1.1.2" = {
       name = "object.values";
       packageName = "object.values";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz";
-        sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==";
+        url = "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz";
+        sha512 = "MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==";
       };
     };
     "objectorarray-1.0.4" = {
@@ -38642,13 +38570,13 @@ let
         sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==";
       };
     };
-    "office-ui-fabric-react-7.153.1" = {
+    "office-ui-fabric-react-7.153.2" = {
       name = "office-ui-fabric-react";
       packageName = "office-ui-fabric-react";
-      version = "7.153.1";
+      version = "7.153.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.153.1.tgz";
-        sha512 = "g7FRbvG7LEDck+pgOpmuaQXYI95doypxmlDeDUcXs9XF6YBoIL3g6FUar92P4h1UXHxXQTe8ko/v7C2ef79o2Q==";
+        url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.153.2.tgz";
+        sha512 = "IIGn6k5698tq8mAWNq1SfJjgTh6Aa1S/8jmR1rRlxJ1fwdAtzW09RxVc1f6R3akkE7sPEb3r3q+POSGGAZNXaQ==";
       };
     };
     "omggif-1.0.10" = {
@@ -44511,13 +44439,13 @@ let
         sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==";
       };
     };
-    "react-dev-utils-10.2.1" = {
+    "react-dev-utils-11.0.1" = {
       name = "react-dev-utils";
       packageName = "react-dev-utils";
-      version = "10.2.1";
+      version = "11.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz";
-        sha512 = "XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ==";
+        url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.1.tgz";
+        sha512 = "rlgpCupaW6qQqvu0hvv2FDv40QG427fjghV56XyPcP5aKtOAPzNAhQ7bHqk1YdS2vpW1W7aSV3JobedxuPlBAA==";
       };
     };
     "react-devtools-core-4.10.0" = {
@@ -45600,13 +45528,13 @@ let
         sha512 = "o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==";
       };
     };
-    "render-media-4.0.1" = {
+    "render-media-4.1.0" = {
       name = "render-media";
       packageName = "render-media";
-      version = "4.0.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/render-media/-/render-media-4.0.1.tgz";
-        sha512 = "sQxUHqJMAEopS/UCdCQuhTJ6TUEp2P+bnEMCV3ZaFcGMoyc7he//XP6Zy9PwIjfm0nQ5D0Z6ZTGRkx8DXCXBEA==";
+        url = "https://registry.npmjs.org/render-media/-/render-media-4.1.0.tgz";
+        sha512 = "F5BMWDmgATEoyPCtKjmGNTGN1ghoZlfRQ3MJh8dS/MrvIUIxupiof/Y9uahChipXcqQ57twVbgMmyQmuO1vokw==";
       };
     };
     "renderkid-2.0.4" = {
@@ -47634,13 +47562,13 @@ let
         sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==";
       };
     };
-    "seventh-0.7.37" = {
+    "seventh-0.7.38" = {
       name = "seventh";
       packageName = "seventh";
-      version = "0.7.37";
+      version = "0.7.38";
       src = fetchurl {
-        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.37.tgz";
-        sha512 = "RvoWTZOzL2RpYZtqW+6QMkOqJY6ljiddSvT64lqvVawPCWJo8Se6EOY8jjpPAmUAB7IsnrvAuYRh7xxnn3a5mg==";
+        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.38.tgz";
+        sha512 = "dYQGR+HQcuOtKytJ8/R4UFiPY3RIYLrniKRcqLjJCHOnccyJTpu52lBpPdyS6TpXNH13MJhtzh8GHUi/OmRUhw==";
       };
     };
     "sha.js-2.4.11" = {
@@ -48012,13 +47940,13 @@ let
         sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg==";
       };
     };
-    "simple-git-2.23.0" = {
+    "simple-git-2.24.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "2.23.0";
+      version = "2.24.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-2.23.0.tgz";
-        sha512 = "s/gEkxFV2WGTN4kO1uQoA4cE4rq0FRzQPR5Yhgg8JUuA4IhOeccjlKSFhwF3rrpo7797ZvQc7L6hJJNA4szHCw==";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-2.24.0.tgz";
+        sha512 = "nF31Xai5lTYgRCiSJ1lHzK0Vk9jWOvAFW12bdBaWy2bhodio04eOWYurvyM/nTBYsPIiQl3PFvdod5TRcPvzww==";
       };
     };
     "simple-markdown-0.4.4" = {
@@ -51432,13 +51360,13 @@ let
         sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw==";
       };
     };
-    "swagger-ui-dist-3.37.0" = {
+    "swagger-ui-dist-3.37.2" = {
       name = "swagger-ui-dist";
       packageName = "swagger-ui-dist";
-      version = "3.37.0";
+      version = "3.37.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.37.0.tgz";
-        sha512 = "ySYfsGTSxuyIAAynncQew9WLRsKu6bI3/tWTqcuXYSqTLCjz3ROtUbNj2zRNs7i37V8CteKE9CUMkYnNklGi2g==";
+        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.37.2.tgz";
+        sha512 = "XIT4asxgeL4GUNPPsqpEqLt20M/u6OhFYqTh42IoEAvAyv5e9EGw5uhP9dLAD10opcMYqdkJ5qU+MpN2HZ5xyA==";
       };
     };
     "swagger2openapi-6.2.3" = {
@@ -51549,13 +51477,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.30.4" = {
+    "systeminformation-4.30.6" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.30.4";
+      version = "4.30.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.4.tgz";
-        sha512 = "hUkT0zOIJ8YfzbEierK7oTfTgDs+qjVihkbDlGRVYcBEUNr4XDcGd63lGgZ6RC5vDPkfbUgVrDrqor9NOIZxGA==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.6.tgz";
+        sha512 = "NV7zo9NU7fWSuiCORZmMLe90cFrrTS6jfalrQ0/5B7JGQ2ei15c2gmfICBwWdmviyv/FXAFVReySxOtDDkppqw==";
       };
     };
     "syswide-cas-5.3.0" = {
@@ -52054,13 +51982,13 @@ let
         sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==";
       };
     };
-    "terser-5.5.0" = {
+    "terser-5.5.1" = {
       name = "terser";
       packageName = "terser";
-      version = "5.5.0";
+      version = "5.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-5.5.0.tgz";
-        sha512 = "eopt1Gf7/AQyPhpygdKePTzaet31TvQxXvrf7xYUvD/d8qkCJm4SKPDzu+GHK5ZaYTn8rvttfqaZc3swK21e5g==";
+        url = "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz";
+        sha512 = "6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==";
       };
     };
     "terser-webpack-plugin-1.4.5" = {
@@ -53593,13 +53521,13 @@ let
         sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25";
       };
     };
-    "twig-1.15.3" = {
+    "twig-1.15.4" = {
       name = "twig";
       packageName = "twig";
-      version = "1.15.3";
+      version = "1.15.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/twig/-/twig-1.15.3.tgz";
-        sha512 = "ePfzzS7vzzn/Kb8vs/IkCvCNZltBPeBW8B/1blN/Bxh5ubxnZEGI5ysgr8t1Dr0/We9ahLDfqC78fNzDvCMkpw==";
+        url = "https://registry.npmjs.org/twig/-/twig-1.15.4.tgz";
+        sha512 = "gRpGrpdf+MswqF6eSjEdYZTa/jt3ZWHK/NU59IbTYJMBQXJ1W+7IxaGEwLkQjd+mNT15j9sQTzQumxUBkuQueQ==";
       };
     };
     "twitter-1.7.1" = {
@@ -56393,13 +56321,13 @@ let
         sha512 = "gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w==";
       };
     };
-    "vls-0.5.9" = {
+    "vls-0.5.10" = {
       name = "vls";
       packageName = "vls";
-      version = "0.5.9";
+      version = "0.5.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vls/-/vls-0.5.9.tgz";
-        sha512 = "9IGH1YFto0XvLHRKzdOQmkzqnIQOO/yTe77ieaOTJM4Zrr5dDqZKEBwboJyEpx5jy4R1TNUh7HTI+DwhWUtiLQ==";
+        url = "https://registry.npmjs.org/vls/-/vls-0.5.10.tgz";
+        sha512 = "/zXdkUatCptsDGmrEVh0A/LEQ48qEwrKe+7HiIwUOmiz+0DkoHsyf/j6eppXMVRWMcHWopwd9/VTNCRlFf2NFw==";
       };
     };
     "vm-browserify-1.1.2" = {
@@ -57383,13 +57311,13 @@ let
         sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
       };
     };
-    "webtorrent-0.111.0" = {
+    "webtorrent-0.112.0" = {
       name = "webtorrent";
       packageName = "webtorrent";
-      version = "0.111.0";
+      version = "0.112.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.111.0.tgz";
-        sha512 = "DrQVuFSLEB54dm+5tuRclXaeuH5tx7qlp0DYE0mCK7vbYEmn1UJr5GLXztYW/y4Yxie4CSSGeo5LjTxy59z0og==";
+        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.112.0.tgz";
+        sha512 = "3Fe4tzeXhZKI0KXGGkr9gyzlx7eKjfU9Se2VJhdE1AcpHppxApuechaWu/KS24amUv4j+xPXE7f3Lc4wF+7QSQ==";
       };
     };
     "well-known-symbols-2.0.0" = {
@@ -59522,7 +59450,7 @@ in
       sources."ini-1.3.5"
       sources."inquirer-7.3.3"
       sources."ip-1.1.5"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-docker-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-interactive-1.0.0"
@@ -60351,7 +60279,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.3.607"
+      sources."electron-to-chromium-1.3.610"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enhanced-resolve-4.3.0"
@@ -60408,7 +60336,7 @@ in
       sources."interpret-1.4.0"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
@@ -60518,7 +60446,7 @@ in
       sources."supports-color-7.2.0"
       sources."symbol-observable-2.0.3"
       sources."tapable-1.1.3"
-      (sources."terser-5.5.0" // {
+      (sources."terser-5.5.1" // {
         dependencies = [
           sources."commander-2.20.3"
         ];
@@ -61369,7 +61297,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.607"
+      sources."electron-to-chromium-1.3.610"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
@@ -61643,7 +61571,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-ci-1.2.1"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -61655,6 +61583,7 @@ in
       sources."is-glob-4.0.1"
       sources."is-installed-globally-0.1.0"
       sources."is-natural-number-4.0.1"
+      sources."is-negative-zero-2.0.0"
       sources."is-npm-1.0.0"
       sources."is-number-7.0.0"
       sources."is-obj-1.0.1"
@@ -61891,10 +61820,14 @@ in
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object-path-0.11.5"
-      sources."object-treeify-1.1.29"
+      sources."object-treeify-1.1.30"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
-      sources."object.getownpropertydescriptors-2.1.0"
+      (sources."object.getownpropertydescriptors-2.1.1" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."object.pick-1.3.0"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
@@ -62712,7 +62645,7 @@ in
       sources."homedir-polyfill-1.0.3"
       sources."ini-1.3.5"
       sources."is-3.3.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-windows-1.0.2"
       sources."isexe-2.0.0"
       (sources."jake-10.8.2" // {
@@ -63007,7 +62940,7 @@ in
       sources."inherits-2.0.4"
       sources."intersect-1.0.1"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-finite-1.1.0"
       sources."is-plain-obj-1.1.0"
       sources."is-utf8-0.2.1"
@@ -63207,7 +63140,7 @@ in
       sources."is-arguments-1.0.4"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-date-object-1.0.2"
       sources."is-generator-function-1.0.7"
       sources."is-regex-1.1.1"
@@ -63518,7 +63451,7 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       (sources."is-expression-3.0.0" // {
         dependencies = [
           sources."acorn-4.0.13"
@@ -63802,7 +63735,7 @@ in
       sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bencode-2.0.1"
-      sources."bep53-range-1.0.0"
+      sources."bep53-range-1.1.0"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-6.4.2" // {
         dependencies = [
@@ -63924,7 +63857,7 @@ in
       sources."ip-set-1.0.2"
       sources."ipaddr.js-2.0.0"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-finite-1.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
@@ -64324,10 +64257,10 @@ in
   coc-diagnostic = nodeEnv.buildNodePackage {
     name = "coc-diagnostic";
     packageName = "coc-diagnostic";
-    version = "0.13.0";
+    version = "0.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.13.0.tgz";
-      sha512 = "09jUr50HgKBPxlK88p6CrJXGdu5owMT5c951Ajxwp2lhmFlo26NYn5eVo69shEaZvkpFvlskQWn5lqvrDox0Vw==";
+      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.14.0.tgz";
+      sha512 = "ccxtSRTqVIuIQrtS5SI0uevO2WC7cSA9dNtiZ/PveDKyxhqyQlfRs9n0bdOJdXteYt6BKUIiqFV8Q48Z71y89A==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64382,10 +64315,10 @@ in
   coc-git = nodeEnv.buildNodePackage {
     name = "coc-git";
     packageName = "coc-git";
-    version = "2.0.4";
+    version = "2.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.4.tgz";
-      sha512 = "Ej4dq5XOkMfnJkHIgUj2FlARz3sU3ACsrSq4YmLD3zj11uf/1nkPf5or89GOngQ1/KyCa1Llj1ai8+oTHyJAQw==";
+      url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.5.tgz";
+      sha512 = "MwoSWGr8mco+/Bth/4zr0kNRuG9rXYgyAEI1mGOuRsMqy2G9LEr4azSP68V2EuIPzYVcYx6ZZk2o5e8b/ux0/w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64532,10 +64465,10 @@ in
   coc-lists = nodeEnv.buildNodePackage {
     name = "coc-lists";
     packageName = "coc-lists";
-    version = "1.3.13";
+    version = "1.3.14";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.13.tgz";
-      sha512 = "D/3AiEE5Zhs7D9aDPdjX6radmiphWXIfprAyC9AMgMFfZU0KvcNavVWe74/z+G0imFrTt5EZdWlc+SGkkMi1RA==";
+      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.14.tgz";
+      sha512 = "vFv90gkUJr9xICYCT4NXFd1EQDGWjJfpcnHqTcgd8A8og5yKfL5cqoSxuwcT15nP4nx06sKBCmnkjMB2DPKn9g==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64568,10 +64501,10 @@ in
   coc-metals = nodeEnv.buildNodePackage {
     name = "coc-metals";
     packageName = "coc-metals";
-    version = "0.9.7";
+    version = "0.9.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.7.tgz";
-      sha512 = "XY4e1FWtaxw/ruaRBTVoJYzNIvI7J5YlYm+l/63adFKFk83fmu18fUa4IrkW4YMDP1rfbDSNTw6+99dI6x4zoA==";
+      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.8.tgz";
+      sha512 = "3mkLfoTaPWT7u2oELILGGtS8jofBsb1MzATB8T4tNJODbrZFXQf5KIV4GBk81RVM1MLGvNtvD/VO/pmwUhrSxQ==";
     };
     dependencies = [
       sources."@chemzqm/neovim-5.2.10"
@@ -64938,7 +64871,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.607"
+      sources."electron-to-chromium-1.3.610"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -65145,7 +65078,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-ci-1.2.1"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -65777,10 +65710,10 @@ in
   coc-rust-analyzer = nodeEnv.buildNodePackage {
     name = "coc-rust-analyzer";
     packageName = "coc-rust-analyzer";
-    version = "0.16.0";
+    version = "0.17.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.16.0.tgz";
-      sha512 = "fZk7sIDnex4PCibUZX14cIkJZvMb4ibZtdLHvSF1dtQsRvxxifSPHsnUsLwvHMm/rxStFTD2q27B20ZXaFbpgg==";
+      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.17.0.tgz";
+      sha512 = "fL8O5Is3mvXiWPckw0vrGTldP8oMiNB8pjN/YGiDd/o5M8gQPc0N8a6urSByEHzEoFaV9hf7Lm0ZjK7muS0hjg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -65939,7 +65872,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.607"
+      sources."electron-to-chromium-1.3.610"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -65993,7 +65926,7 @@ in
       sources."is-alphanumerical-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-2.0.5"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-decimal-1.0.4"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -66232,7 +66165,7 @@ in
       sources."has-flag-3.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.0"
       sources."minimatch-3.0.4"
@@ -66342,6 +66275,7 @@ in
       sources."astral-regex-1.0.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
+      sources."builtin-modules-1.1.1"
       sources."callsites-3.1.0"
       (sources."chalk-4.1.0" // {
         dependencies = [
@@ -66354,10 +66288,12 @@ in
       })
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
+      sources."commander-2.20.3"
       sources."concat-map-0.0.1"
       sources."cross-spawn-7.0.3"
       sources."debug-4.3.1"
       sources."deep-is-0.1.3"
+      sources."diff-4.0.2"
       sources."doctrine-3.0.0"
       sources."emoji-regex-7.0.3"
       sources."enquirer-2.3.6"
@@ -66396,16 +66332,19 @@ in
       sources."flat-cache-2.0.1"
       sources."flatted-2.0.2"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
       sources."globals-12.4.0"
+      sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."ignore-4.0.6"
       sources."import-fresh-3.2.2"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
+      sources."is-core-module-2.2.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
@@ -66426,10 +66365,13 @@ in
       sources."parent-module-1.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
+      sources."path-parse-1.0.6"
       sources."prelude-ls-1.2.1"
+      sources."prettier-2.2.0"
       sources."progress-2.0.3"
       sources."punycode-2.1.1"
       sources."regexpp-3.1.0"
+      sources."resolve-1.19.0"
       sources."resolve-from-4.0.0"
       sources."rimraf-2.6.3"
       sources."semver-7.3.2"
@@ -66448,11 +66390,20 @@ in
       sources."supports-color-5.5.0"
       sources."table-5.4.6"
       sources."text-table-0.2.0"
+      sources."tslib-1.14.1"
+      (sources."tslint-6.1.3" // {
+        dependencies = [
+          sources."chalk-2.4.2"
+          sources."semver-5.7.1"
+        ];
+      })
+      sources."tsutils-2.29.0"
       sources."type-check-0.4.0"
       sources."type-fest-0.8.1"
+      sources."typescript-4.1.2"
       sources."uri-js-4.4.0"
       sources."v8-compile-cache-2.2.0"
-      sources."vls-0.5.9"
+      sources."vls-0.5.10"
       (sources."vue-eslint-parser-7.1.1" // {
         dependencies = [
           sources."eslint-visitor-keys-1.3.0"
@@ -66476,10 +66427,10 @@ in
   coc-vimlsp = nodeEnv.buildNodePackage {
     name = "coc-vimlsp";
     packageName = "coc-vimlsp";
-    version = "0.10.2";
+    version = "0.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.10.2.tgz";
-      sha512 = "g6jCDkNRJwuPmqMN2czK90BMLec8Sdnx6uR3RZDZO2NThIduezrSbsFBpICKW93vmIprk1CvC+Pry+kRY3Mhrw==";
+      url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.11.0.tgz";
+      sha512 = "tcou7cmYgzjLLPfLEyuea5umVkITER0IqDsJCc/3IeuPFyL03D7EDyeXIcyR+fJwXpJ0AzO6rzoLBMqpt4hYGg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -66971,7 +66922,7 @@ in
       sources."ip-regex-2.1.0"
       sources."ipaddr.js-1.9.1"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-docker-2.1.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
@@ -67169,7 +67120,7 @@ in
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.30.4"
+      sources."systeminformation-4.30.6"
       sources."term-size-2.2.1"
       sources."through-2.3.8"
       sources."tmp-0.2.1"
@@ -67396,7 +67347,7 @@ in
       sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
@@ -68163,7 +68114,7 @@ in
       sources."http-signature-1.2.0"
       (sources."hypercore-7.7.1" // {
         dependencies = [
-          sources."codecs-2.1.0"
+          sources."codecs-2.2.0"
           sources."unordered-set-2.0.1"
         ];
       })
@@ -69024,7 +68975,7 @@ in
       })
       sources."is-arrayish-0.2.1"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-docker-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-obj-2.0.0"
@@ -69229,7 +69180,7 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.153.1"
+      sources."@fluentui/react-7.153.2"
       sources."@fluentui/react-compose-0.19.12"
       sources."@fluentui/react-focus-7.16.19"
       sources."@fluentui/react-stylesheets-0.2.4"
@@ -69970,7 +69921,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-dir-1.0.0"
@@ -70266,7 +70217,7 @@ in
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
       sources."object.reduce-1.0.1"
-      sources."office-ui-fabric-react-7.153.1"
+      sources."office-ui-fabric-react-7.153.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -70636,7 +70587,7 @@ in
           sources."mkdirp-0.5.5"
         ];
       })
-      (sources."terser-5.5.0" // {
+      (sources."terser-5.5.1" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -71169,10 +71120,10 @@ in
   expo-cli = nodeEnv.buildNodePackage {
     name = "expo-cli";
     packageName = "expo-cli";
-    version = "3.28.5";
+    version = "4.0.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.5.tgz";
-      sha512 = "Lam0JkBx57gs1xhlI+rXx3aJqOebIPBPf9sWAvUpTFDSVkyZN86rFXJWud6QnAFBLGqUgGFZJDC1tMq+l7Mgng==";
+      url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.0.3.tgz";
+      sha512 = "yoPZo7QCrjJY08r0YQtNQ+FzfTI0+PCoDf6Uqk/cLxLfTVc/LwXAn2RNXdjmz6+MnCtowjciYYrcuqaizDPOdg==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -71308,14 +71259,14 @@ in
         ];
       })
       sources."@expo/babel-preset-cli-0.2.18"
-      (sources."@expo/bunyan-3.0.2" // {
-        dependencies = [
-          sources."uuid-3.4.0"
-        ];
-      })
-      (sources."@expo/config-3.3.14" // {
+      sources."@expo/bunyan-4.0.0"
+      (sources."@expo/config-3.3.16" // {
         dependencies = [
           sources."semver-7.3.2"
+        ];
+      })
+      (sources."@expo/config-plugins-1.0.3" // {
+        dependencies = [
           sources."slash-3.0.0"
           sources."uuid-3.4.0"
           sources."xcode-2.1.0"
@@ -71328,7 +71279,7 @@ in
           sources."pngjs-5.0.0"
         ];
       })
-      (sources."@expo/dev-server-0.1.39" // {
+      (sources."@expo/dev-server-0.1.41" // {
         dependencies = [
           sources."body-parser-1.19.0"
           sources."bytes-3.1.0"
@@ -71345,20 +71296,20 @@ in
           sources."type-fest-0.12.0"
         ];
       })
-      sources."@expo/dev-tools-0.13.58"
+      sources."@expo/dev-tools-0.13.62"
       sources."@expo/eas-build-job-0.1.2"
-      (sources."@expo/image-utils-0.3.7" // {
+      (sources."@expo/image-utils-0.3.9" // {
         dependencies = [
           sources."semver-6.1.1"
           sources."tempy-0.3.0"
         ];
       })
-      (sources."@expo/json-file-8.2.24" // {
+      (sources."@expo/json-file-8.2.25" // {
         dependencies = [
           sources."json5-1.0.1"
         ];
       })
-      sources."@expo/metro-config-0.1.39"
+      sources."@expo/metro-config-0.1.41"
       (sources."@expo/ngrok-2.4.3" // {
         dependencies = [
           sources."uuid-3.4.0"
@@ -71377,7 +71328,7 @@ in
       sources."@expo/ngrok-bin-win32-ia32-2.2.8-beta.1"
       sources."@expo/ngrok-bin-win32-x64-2.2.8-beta.1"
       sources."@expo/osascript-2.0.24"
-      (sources."@expo/package-manager-0.0.33" // {
+      (sources."@expo/package-manager-0.0.34" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."npm-package-arg-7.0.0"
@@ -71391,10 +71342,9 @@ in
         ];
       })
       sources."@expo/results-1.0.0"
-      (sources."@expo/schemer-1.3.21" // {
+      (sources."@expo/schemer-1.3.22" // {
         dependencies = [
           sources."ajv-5.5.2"
-          sources."es6-error-4.1.1"
           sources."fast-deep-equal-1.1.0"
           sources."get-stream-3.0.0"
           sources."got-6.7.1"
@@ -71406,17 +71356,16 @@ in
       sources."@expo/spawn-async-1.5.0"
       sources."@expo/traveling-fastlane-darwin-1.15.1"
       sources."@expo/traveling-fastlane-linux-1.15.1"
-      (sources."@expo/webpack-config-0.12.43" // {
+      (sources."@expo/webpack-config-0.12.46" // {
         dependencies = [
           sources."@babel/runtime-7.9.0"
           sources."is-wsl-2.2.0"
           sources."react-refresh-0.8.3"
         ];
       })
-      (sources."@expo/xdl-58.0.19" // {
+      (sources."@expo/xdl-59.0.2" // {
         dependencies = [
           sources."chownr-1.1.4"
-          sources."es6-error-4.1.1"
           (sources."fs-minipass-1.2.7" // {
             dependencies = [
               sources."minipass-2.9.0"
@@ -71476,38 +71425,37 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."@jimp/bmp-0.9.8"
-      sources."@jimp/core-0.9.8"
-      sources."@jimp/custom-0.9.8"
-      sources."@jimp/gif-0.9.8"
-      sources."@jimp/jpeg-0.9.8"
-      sources."@jimp/plugin-blit-0.9.8"
-      sources."@jimp/plugin-blur-0.9.8"
-      sources."@jimp/plugin-circle-0.9.8"
-      sources."@jimp/plugin-color-0.9.8"
-      sources."@jimp/plugin-contain-0.9.8"
-      sources."@jimp/plugin-cover-0.9.8"
-      sources."@jimp/plugin-crop-0.9.8"
-      sources."@jimp/plugin-displace-0.9.8"
-      sources."@jimp/plugin-dither-0.9.8"
-      sources."@jimp/plugin-fisheye-0.9.8"
-      sources."@jimp/plugin-flip-0.9.8"
-      sources."@jimp/plugin-gaussian-0.9.8"
-      sources."@jimp/plugin-invert-0.9.8"
-      sources."@jimp/plugin-mask-0.9.8"
-      sources."@jimp/plugin-normalize-0.9.8"
-      sources."@jimp/plugin-print-0.9.8"
-      sources."@jimp/plugin-resize-0.9.8"
-      sources."@jimp/plugin-rotate-0.9.8"
-      sources."@jimp/plugin-scale-0.9.8"
-      sources."@jimp/plugin-shadow-0.9.8"
-      sources."@jimp/plugin-threshold-0.9.8"
-      sources."@jimp/plugins-0.9.8"
-      sources."@jimp/png-0.9.8"
-      sources."@jimp/tiff-0.9.8"
-      sources."@jimp/types-0.9.8"
-      sources."@jimp/utils-0.9.8"
-      sources."@mrmlnc/readdir-enhanced-2.2.1"
+      sources."@jimp/bmp-0.12.1"
+      sources."@jimp/core-0.12.1"
+      sources."@jimp/custom-0.12.1"
+      sources."@jimp/gif-0.12.1"
+      sources."@jimp/jpeg-0.12.1"
+      sources."@jimp/plugin-blit-0.12.1"
+      sources."@jimp/plugin-blur-0.12.1"
+      sources."@jimp/plugin-circle-0.12.1"
+      sources."@jimp/plugin-color-0.12.1"
+      sources."@jimp/plugin-contain-0.12.1"
+      sources."@jimp/plugin-cover-0.12.1"
+      sources."@jimp/plugin-crop-0.12.1"
+      sources."@jimp/plugin-displace-0.12.1"
+      sources."@jimp/plugin-dither-0.12.1"
+      sources."@jimp/plugin-fisheye-0.12.1"
+      sources."@jimp/plugin-flip-0.12.1"
+      sources."@jimp/plugin-gaussian-0.12.1"
+      sources."@jimp/plugin-invert-0.12.1"
+      sources."@jimp/plugin-mask-0.12.1"
+      sources."@jimp/plugin-normalize-0.12.1"
+      sources."@jimp/plugin-print-0.12.1"
+      sources."@jimp/plugin-resize-0.12.1"
+      sources."@jimp/plugin-rotate-0.12.1"
+      sources."@jimp/plugin-scale-0.12.1"
+      sources."@jimp/plugin-shadow-0.12.1"
+      sources."@jimp/plugin-threshold-0.12.1"
+      sources."@jimp/plugins-0.12.1"
+      sources."@jimp/png-0.12.1"
+      sources."@jimp/tiff-0.12.1"
+      sources."@jimp/types-0.12.1"
+      sources."@jimp/utils-0.12.1"
       sources."@nodelib/fs.scandir-2.1.3"
       sources."@nodelib/fs.stat-2.0.3"
       sources."@nodelib/fs.walk-1.2.4"
@@ -71683,7 +71631,6 @@ in
       sources."apollo-utilities-1.3.4"
       sources."application-config-path-0.1.0"
       sources."aproba-1.2.0"
-      sources."arch-2.2.0"
       sources."are-we-there-yet-1.1.5"
       sources."argparse-1.0.10"
       sources."arr-diff-4.0.0"
@@ -71735,16 +71682,6 @@ in
         ];
       })
       sources."axios-retry-3.1.9"
-      (sources."babel-code-frame-6.26.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."ansi-styles-2.2.1"
-          sources."chalk-1.1.3"
-          sources."js-tokens-3.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-        ];
-      })
       sources."babel-extract-comments-1.0.0"
       sources."babel-loader-8.1.0"
       sources."babel-plugin-dynamic-import-node-2.3.3"
@@ -71840,7 +71777,6 @@ in
         ];
       })
       sources."call-bind-1.0.0"
-      sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
       sources."callsite-1.0.0"
@@ -71864,7 +71800,6 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."chardet-0.4.2"
       sources."charenc-0.0.2"
       sources."chokidar-3.4.3"
       sources."chownr-2.0.0"
@@ -71899,13 +71834,14 @@ in
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-2.5.0"
       sources."cli-table3-0.6.0"
-      sources."cli-width-2.2.1"
-      (sources."clipboardy-2.3.0" // {
+      (sources."cliui-6.0.0" // {
         dependencies = [
-          sources."is-wsl-2.2.0"
+          sources."ansi-styles-4.3.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."wrap-ansi-6.2.0"
         ];
       })
-      sources."cliui-6.0.0"
       sources."clone-2.1.2"
       sources."clone-response-1.0.2"
       sources."co-4.6.0"
@@ -72027,9 +71963,9 @@ in
       sources."cssnano-util-get-match-4.0.0"
       sources."cssnano-util-raw-cache-4.0.1"
       sources."cssnano-util-same-parent-4.0.1"
-      (sources."csso-4.1.1" // {
+      (sources."csso-4.2.0" // {
         dependencies = [
-          sources."css-tree-1.1.1"
+          sources."css-tree-1.1.2"
           sources."mdn-data-2.0.14"
           sources."source-map-0.6.1"
         ];
@@ -72111,7 +72047,7 @@ in
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.607"
+      sources."electron-to-chromium-1.3.610"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -72148,7 +72084,6 @@ in
       sources."es-abstract-1.18.0-next.1"
       sources."es-get-iterator-1.1.1"
       sources."es-to-primitive-1.2.1"
-      sources."es6-error-3.2.0"
       sources."escalade-3.1.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
@@ -72168,7 +72103,6 @@ in
       sources."evp_bytestokey-1.0.3"
       sources."exec-async-2.2.0"
       sources."execa-1.0.0"
-      sources."exeunt-1.1.0"
       sources."exif-parser-0.1.12"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
@@ -72190,7 +72124,7 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."expo-pwa-0.0.49" // {
+      (sources."expo-pwa-0.0.52" // {
         dependencies = [
           sources."commander-2.20.0"
         ];
@@ -72207,7 +72141,6 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."external-editor-2.2.0"
       (sources."extglob-2.0.4" // {
         dependencies = [
           sources."define-property-1.0.0"
@@ -72229,7 +72162,7 @@ in
       })
       sources."file-type-9.0.0"
       sources."file-uri-to-path-1.0.0"
-      sources."filesize-6.0.1"
+      sources."filesize-6.1.0"
       sources."fill-range-7.0.1"
       (sources."finalhandler-1.1.1" // {
         dependencies = [
@@ -72245,7 +72178,7 @@ in
       sources."for-in-1.0.2"
       sources."foreach-2.0.5"
       sources."forever-agent-0.6.1"
-      (sources."fork-ts-checker-webpack-plugin-3.1.1" // {
+      (sources."fork-ts-checker-webpack-plugin-4.1.6" // {
         dependencies = [
           sources."braces-2.3.2"
           sources."chalk-2.4.2"
@@ -72306,7 +72239,6 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.1"
-      sources."glob-to-regexp-0.3.0"
       sources."global-4.3.2"
       sources."global-modules-2.0.0"
       sources."global-prefix-3.0.0"
@@ -72345,11 +72277,6 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
-      (sources."has-ansi-2.0.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.1"
       sources."has-unicode-2.0.1"
@@ -72435,7 +72362,7 @@ in
       sources."iferr-0.1.5"
       sources."ignore-5.1.8"
       sources."ignore-walk-3.0.3"
-      sources."immer-1.10.0"
+      sources."immer-7.0.9"
       (sources."import-fresh-2.0.0" // {
         dependencies = [
           sources."resolve-from-3.0.0"
@@ -72449,16 +72376,6 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      (sources."inquirer-5.2.0" // {
-        dependencies = [
-          sources."ansi-escapes-3.2.0"
-          sources."ansi-regex-3.0.0"
-          sources."chalk-2.4.2"
-          sources."figures-2.0.0"
-          sources."string-width-2.1.1"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
       sources."internal-ip-4.3.0"
       sources."invariant-2.2.4"
       sources."ip-1.1.5"
@@ -72474,7 +72391,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-color-stop-1.1.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -72549,10 +72466,10 @@ in
         ];
       })
       sources."jetifier-1.6.6"
-      sources."jimp-0.9.8"
+      sources."jimp-0.12.1"
       sources."joi-11.4.0"
       sources."join-component-1.1.0"
-      sources."jpeg-js-0.3.7"
+      sources."jpeg-js-0.4.2"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.0"
       sources."jsbn-0.1.1"
@@ -72579,7 +72496,6 @@ in
       sources."keyv-3.1.0"
       sources."killable-1.0.1"
       sources."kind-of-6.0.3"
-      sources."klaw-sync-6.0.0"
       sources."kleur-3.0.3"
       sources."last-call-webpack-plugin-3.0.0"
       sources."latest-version-5.1.0"
@@ -72721,7 +72637,6 @@ in
         ];
       })
       sources."mkdirp-0.5.5"
-      sources."moment-2.29.1"
       (sources."move-concurrently-1.0.1" // {
         dependencies = [
           sources."rimraf-2.7.1"
@@ -72730,7 +72645,6 @@ in
       sources."ms-2.1.2"
       sources."multicast-dns-6.2.3"
       sources."multicast-dns-service-types-1.1.0"
-      sources."mute-stream-0.0.7"
       sources."mv-2.1.1"
       sources."mz-2.7.0"
       sources."nan-2.14.2"
@@ -72811,26 +72725,14 @@ in
         ];
       })
       sources."object-inspect-1.8.0"
-      sources."object-is-1.1.3"
+      sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
-      (sources."object.entries-1.1.2" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
-      (sources."object.getownpropertydescriptors-2.1.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."object.entries-1.1.3"
+      sources."object.getownpropertydescriptors-2.1.1"
       sources."object.pick-1.3.0"
-      (sources."object.values-1.1.1" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."object.values-1.1.2"
       sources."obuf-1.1.2"
       sources."omggif-1.0.10"
       sources."on-finished-2.3.0"
@@ -73143,57 +73045,26 @@ in
       })
       sources."raw-body-2.3.3"
       sources."rc-1.2.8"
-      (sources."react-dev-utils-10.2.1" // {
+      (sources."react-dev-utils-11.0.1" // {
         dependencies = [
-          sources."@babel/code-frame-7.8.3"
-          sources."@nodelib/fs.stat-1.1.3"
-          sources."arrify-1.0.1"
-          sources."braces-2.3.2"
-          sources."browserslist-4.10.0"
+          sources."array-union-2.1.0"
+          sources."browserslist-4.14.2"
           (sources."chalk-2.4.2" // {
             dependencies = [
               sources."escape-string-regexp-1.0.5"
             ];
           })
-          sources."chardet-0.7.0"
-          sources."cli-cursor-3.1.0"
-          sources."cross-spawn-7.0.1"
-          sources."dir-glob-2.0.0"
-          sources."emojis-list-2.1.0"
+          sources."cross-spawn-7.0.3"
           sources."escape-string-regexp-2.0.0"
-          sources."extend-shallow-2.0.1"
-          sources."external-editor-3.1.0"
-          sources."fast-glob-2.2.7"
-          sources."fill-range-4.0.0"
-          sources."glob-parent-3.1.0"
-          sources."globby-8.0.2"
-          sources."iconv-lite-0.4.24"
-          sources."ignore-3.3.10"
-          (sources."inquirer-7.0.4" // {
-            dependencies = [
-              sources."strip-ansi-5.2.0"
-            ];
-          })
-          sources."is-glob-3.1.0"
-          sources."is-number-3.0.0"
+          sources."globby-11.0.1"
           sources."is-wsl-2.2.0"
-          sources."json5-1.0.1"
-          sources."kind-of-3.2.2"
-          sources."loader-utils-1.2.3"
-          sources."micromatch-3.1.10"
-          sources."mimic-fn-2.1.0"
-          sources."mute-stream-0.0.8"
-          sources."onetime-5.1.2"
+          sources."loader-utils-2.0.0"
           sources."open-7.3.0"
           sources."path-key-3.1.1"
-          sources."path-type-3.0.0"
-          sources."pify-3.0.0"
-          sources."restore-cursor-3.1.0"
-          sources."rxjs-6.6.3"
           sources."shebang-command-2.0.0"
           sources."shebang-regex-3.0.0"
           sources."shell-quote-1.7.2"
-          sources."to-regex-range-2.1.1"
+          sources."slash-3.0.0"
           sources."which-2.0.2"
         ];
       })
@@ -73287,14 +73158,8 @@ in
       })
       sources."ripemd160-2.0.2"
       sources."router-ips-1.0.0"
-      sources."run-async-2.4.1"
       sources."run-parallel-1.1.10"
       sources."run-queue-1.0.3"
-      (sources."rxjs-5.5.12" // {
-        dependencies = [
-          sources."symbol-observable-1.0.1"
-        ];
-      })
       sources."safe-buffer-5.1.2"
       sources."safe-json-stringify-1.2.0"
       sources."safe-regex-1.1.0"
@@ -73814,7 +73679,11 @@ in
       })
       (sources."webpackbar-4.0.0" // {
         dependencies = [
+          sources."ansi-styles-4.3.0"
           sources."chalk-2.4.2"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."wrap-ansi-6.2.0"
         ];
       })
       sources."websocket-driver-0.6.5"
@@ -73865,7 +73734,7 @@ in
         ];
       })
       sources."worker-rpc-0.1.1"
-      (sources."wrap-ansi-6.2.0" // {
+      (sources."wrap-ansi-7.0.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."color-convert-2.0.1"
@@ -73979,7 +73848,7 @@ in
       sources."indent-string-2.1.0"
       sources."inherits-2.0.4"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-finite-1.1.0"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
@@ -74735,7 +74604,7 @@ in
         ];
       })
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-plain-obj-1.1.0"
       sources."is-stream-2.0.0"
@@ -74945,7 +74814,7 @@ in
       sources."defined-0.0.0"
       sources."director-1.2.7"
       sources."duplexer-0.1.2"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.17.7"
       sources."es-to-primitive-1.2.1"
       sources."event-stream-3.3.4"
       sources."eventemitter2-6.4.3"
@@ -75026,7 +74895,6 @@ in
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-glob-4.0.1"
-      sources."is-negative-zero-2.0.0"
       (sources."is-number-3.0.0" // {
         dependencies = [
           sources."kind-of-3.2.2"
@@ -75083,7 +74951,7 @@ in
         ];
       })
       sources."object-inspect-1.8.0"
-      sources."object-is-1.1.3"
+      sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
@@ -75110,11 +74978,7 @@ in
       sources."readable-stream-2.3.7"
       sources."readdirp-2.2.1"
       sources."regex-not-1.0.2"
-      (sources."regexp.prototype.flags-1.3.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."regexp.prototype.flags-1.3.0"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
@@ -75667,7 +75531,7 @@ in
       sources."inquirer-autocomplete-prompt-1.3.0"
       sources."is-arrayish-0.2.1"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-installed-globally-0.3.2"
       sources."is-interactive-1.0.0"
@@ -75853,45 +75717,45 @@ in
       sources."@graphql-cli/init-4.1.0"
       (sources."@graphql-tools/batch-execute-7.0.0" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.0.2"
+          sources."@graphql-tools/utils-7.1.0"
         ];
       })
       (sources."@graphql-tools/delegate-7.0.5" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.0.2"
+          sources."@graphql-tools/utils-7.1.0"
         ];
       })
       (sources."@graphql-tools/graphql-file-loader-6.2.6" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.0.2"
+          sources."@graphql-tools/utils-7.1.0"
         ];
       })
       sources."@graphql-tools/import-6.2.5"
       (sources."@graphql-tools/json-file-loader-6.2.6" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.0.2"
+          sources."@graphql-tools/utils-7.1.0"
         ];
       })
       sources."@graphql-tools/load-6.2.4"
       (sources."@graphql-tools/merge-6.2.5" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.0.2"
+          sources."@graphql-tools/utils-7.1.0"
         ];
       })
-      (sources."@graphql-tools/schema-7.0.0" // {
+      (sources."@graphql-tools/schema-7.1.0" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.0.2"
+          sources."@graphql-tools/utils-7.1.0"
         ];
       })
       (sources."@graphql-tools/url-loader-6.4.0" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.0.2"
+          sources."@graphql-tools/utils-7.1.0"
         ];
       })
       sources."@graphql-tools/utils-6.2.4"
       (sources."@graphql-tools/wrap-7.0.1" // {
         dependencies = [
-          sources."@graphql-tools/utils-7.0.2"
+          sources."@graphql-tools/utils-7.1.0"
         ];
       })
       sources."@kwsites/file-exists-1.1.1"
@@ -76208,7 +76072,7 @@ in
       sources."oas-validator-5.0.4"
       sources."oauth-sign-0.9.0"
       sources."object-inspect-1.8.0"
-      sources."object-is-1.1.3"
+      sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.2"
       sources."once-1.4.0"
@@ -76495,7 +76359,7 @@ in
       sources."is-absolute-1.0.0"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
@@ -76785,7 +76649,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."systeminformation-4.30.4"
+      sources."systeminformation-4.30.6"
       sources."term-canvas-0.0.5"
       sources."type-fest-0.11.0"
       sources."wordwrap-0.0.3"
@@ -77019,7 +76883,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
@@ -77412,7 +77276,7 @@ in
       })
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -78317,7 +78181,7 @@ in
       sources."is-wsl-2.2.0"
       sources."isexe-2.0.0"
       sources."jquery-3.5.1"
-      sources."jquery.terminal-2.19.2"
+      sources."jquery.terminal-2.20.0"
       sources."jsonfile-2.4.0"
       sources."keyboardevent-key-polyfill-1.1.0"
       sources."line-reader-0.4.0"
@@ -78835,7 +78699,7 @@ in
       sources."inherits-2.0.4"
       sources."invert-kv-1.0.0"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
@@ -79167,10 +79031,10 @@ in
   joplin = nodeEnv.buildNodePackage {
     name = "joplin";
     packageName = "joplin";
-    version = "1.4.3";
+    version = "1.4.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/joplin/-/joplin-1.4.3.tgz";
-      sha512 = "29r23EaeUT0HupQVr5xNN1WuUpT+vn9agxrjbSwVJCYhV++kpkf2zvmuFe7fcTI3oAVu5yXLiK388DlJ7vaFPQ==";
+      url = "https://registry.npmjs.org/joplin/-/joplin-1.4.9.tgz";
+      sha512 = "4JjZOpv5WyJ3VbtcxrOf5FYQBYPjbBsrIGLG+DoYNFPLsOWEOJeZH24XO2UnNKb5YopcsCzR+iaTXVCPNQ2tAw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.10.4"
@@ -79509,7 +79373,7 @@ in
       sources."is-arrayish-0.3.2"
       sources."is-binary-path-2.1.0"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-docker-2.1.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-1.0.0"
@@ -79740,7 +79604,7 @@ in
       sources."set-blocking-2.0.0"
       sources."setimmediate-1.0.5"
       sources."setprototypeof-1.2.0"
-      sources."seventh-0.7.37"
+      sources."seventh-0.7.38"
       (sources."sharp-0.26.3" // {
         dependencies = [
           sources."color-3.1.3"
@@ -81334,7 +81198,7 @@ in
       sources."envinfo-7.7.3"
       sources."err-code-1.1.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.7"
+      sources."es-abstract-1.18.0-next.1"
       sources."es-to-primitive-1.2.1"
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
@@ -81547,7 +81411,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -81557,6 +81421,7 @@ in
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
+      sources."is-negative-zero-2.0.0"
       (sources."is-number-3.0.0" // {
         dependencies = [
           sources."kind-of-3.2.2"
@@ -81721,7 +81586,7 @@ in
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
-      sources."object.getownpropertydescriptors-2.1.0"
+      sources."object.getownpropertydescriptors-2.1.1"
       sources."object.pick-1.3.0"
       sources."octokit-pagination-methods-1.1.0"
       sources."once-1.4.0"
@@ -83052,7 +82917,7 @@ in
       sources."@types/babel__core-7.1.12"
       sources."@types/babel__generator-7.6.2"
       sources."@types/babel__template-7.4.0"
-      sources."@types/babel__traverse-7.0.15"
+      sources."@types/babel__traverse-7.0.16"
       sources."@types/estree-0.0.45"
       sources."@types/graceful-fs-4.1.4"
       sources."@types/istanbul-lib-coverage-2.0.3"
@@ -83133,11 +82998,7 @@ in
       sources."babel-helper-remove-or-void-0.4.3"
       sources."babel-helper-to-multiple-sequence-expressions-0.5.0"
       sources."babel-jest-25.5.1"
-      (sources."babel-loader-8.2.1" // {
-        dependencies = [
-          sources."make-dir-2.1.0"
-        ];
-      })
+      sources."babel-loader-8.2.2"
       sources."babel-plugin-dynamic-import-node-2.3.3"
       sources."babel-plugin-istanbul-6.0.0"
       sources."babel-plugin-jest-hoist-25.5.0"
@@ -83357,7 +83218,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.607"
+      sources."electron-to-chromium-1.3.610"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -83435,11 +83296,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      (sources."find-cache-dir-2.1.0" // {
-        dependencies = [
-          sources."make-dir-2.1.0"
-        ];
-      })
+      sources."find-cache-dir-3.3.1"
       sources."find-up-4.1.0"
       (sources."findup-sync-3.0.0" // {
         dependencies = [
@@ -83514,7 +83371,15 @@ in
       sources."https-browserify-1.0.0"
       sources."ieee754-1.2.1"
       sources."iferr-0.1.5"
-      sources."import-local-2.0.0"
+      (sources."import-local-2.0.0" // {
+        dependencies = [
+          sources."find-up-3.0.0"
+          sources."locate-path-3.0.0"
+          sources."p-locate-3.0.0"
+          sources."path-exists-3.0.0"
+          sources."pkg-dir-3.0.0"
+        ];
+      })
       sources."imurmurhash-0.1.4"
       sources."infer-owner-1.0.4"
       sources."inflight-1.0.6"
@@ -83528,7 +83393,7 @@ in
       sources."is-binary-path-2.1.0"
       sources."is-buffer-1.1.6"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-deflate-1.0.0"
       sources."is-descriptor-1.0.2"
@@ -83715,14 +83580,7 @@ in
       sources."pinkie-1.0.0"
       sources."pinkie-promise-1.0.0"
       sources."pirates-4.0.1"
-      (sources."pkg-dir-3.0.0" // {
-        dependencies = [
-          sources."find-up-3.0.0"
-          sources."locate-path-3.0.0"
-          sources."p-locate-3.0.0"
-          sources."path-exists-3.0.0"
-        ];
-      })
+      sources."pkg-dir-4.2.0"
       sources."posix-character-classes-0.1.1"
       sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master"
       sources."prettier-1.19.1"
@@ -83931,6 +83789,13 @@ in
       })
       (sources."terser-webpack-plugin-1.4.5" // {
         dependencies = [
+          sources."find-cache-dir-2.1.0"
+          sources."find-up-3.0.0"
+          sources."locate-path-3.0.0"
+          sources."make-dir-2.1.0"
+          sources."p-locate-3.0.0"
+          sources."path-exists-3.0.0"
+          sources."pkg-dir-3.0.0"
           sources."schema-utils-1.0.0"
           sources."source-map-0.6.1"
         ];
@@ -84342,7 +84207,7 @@ in
       sources."inherits-2.0.4"
       sources."inquirer-0.12.0"
       sources."interpret-1.4.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-my-ip-valid-1.0.0"
       sources."is-my-json-valid-2.20.5"
@@ -84635,7 +84500,7 @@ in
       sources."@fluentui/date-time-utilities-7.9.0"
       sources."@fluentui/dom-utilities-1.1.1"
       sources."@fluentui/keyboard-key-0.2.12"
-      sources."@fluentui/react-7.153.1"
+      sources."@fluentui/react-7.153.2"
       sources."@fluentui/react-compose-0.19.12"
       sources."@fluentui/react-focus-7.16.19"
       sources."@fluentui/react-stylesheets-0.2.4"
@@ -84779,7 +84644,7 @@ in
       sources."node-fetch-1.6.3"
       sources."normalize-url-4.5.0"
       sources."object-assign-4.1.1"
-      sources."office-ui-fabric-react-7.153.1"
+      sources."office-ui-fabric-react-7.153.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -84878,7 +84743,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
       sources."swagger-schema-official-2.0.0-bab6bed"
-      sources."swagger-ui-dist-3.37.0"
+      sources."swagger-ui-dist-3.37.2"
       sources."tail-2.0.4"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
@@ -85884,7 +85749,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.607"
+      sources."electron-to-chromium-1.3.610"
       sources."elf-tools-1.1.2"
       (sources."elliptic-6.5.3" // {
         dependencies = [
@@ -86199,7 +86064,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
@@ -86212,6 +86077,7 @@ in
       sources."is-interactive-1.0.0"
       sources."is-module-1.0.0"
       sources."is-natural-number-4.0.1"
+      sources."is-negative-zero-2.0.0"
       sources."is-npm-4.0.0"
       (sources."is-number-3.0.0" // {
         dependencies = [
@@ -86474,10 +86340,14 @@ in
       })
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
-      sources."object-treeify-1.1.29"
+      sources."object-treeify-1.1.30"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
-      sources."object.getownpropertydescriptors-2.1.0"
+      (sources."object.getownpropertydescriptors-2.1.1" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."object.pick-1.3.0"
       sources."octal-1.0.0"
       sources."octokit-pagination-methods-1.1.0"
@@ -86843,7 +86713,7 @@ in
         ];
       })
       sources."term-size-2.2.1"
-      (sources."terser-5.5.0" // {
+      (sources."terser-5.5.1" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -87271,7 +87141,7 @@ in
       sources."invert-kv-1.0.0"
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
@@ -88105,7 +87975,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
@@ -89256,9 +89126,9 @@ in
       sources."cssnano-util-get-match-4.0.0"
       sources."cssnano-util-raw-cache-4.0.1"
       sources."cssnano-util-same-parent-4.0.1"
-      (sources."csso-4.1.1" // {
+      (sources."csso-4.2.0" // {
         dependencies = [
-          sources."css-tree-1.1.1"
+          sources."css-tree-1.1.2"
           sources."mdn-data-2.0.14"
         ];
       })
@@ -89318,7 +89188,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.607"
+      sources."electron-to-chromium-1.3.610"
       (sources."elliptic-6.5.3" // {
         dependencies = [
           sources."bn.js-4.11.9"
@@ -89328,7 +89198,7 @@ in
       sources."entities-1.1.2"
       sources."envinfo-7.7.3"
       sources."error-ex-1.3.2"
-      (sources."es-abstract-1.17.7" // {
+      (sources."es-abstract-1.18.0-next.1" // {
         dependencies = [
           sources."object-inspect-1.8.0"
         ];
@@ -89454,7 +89324,7 @@ in
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
       sources."is-color-stop-1.1.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -89471,6 +89341,7 @@ in
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.1"
       sources."is-html-1.1.0"
+      sources."is-negative-zero-2.0.0"
       sources."is-number-3.0.0"
       sources."is-obj-2.0.0"
       sources."is-plain-object-2.0.4"
@@ -89584,9 +89455,9 @@ in
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
-      sources."object.getownpropertydescriptors-2.1.0"
+      sources."object.getownpropertydescriptors-2.1.1"
       sources."object.pick-1.3.0"
-      sources."object.values-1.1.1"
+      sources."object.values-1.1.2"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
@@ -89890,7 +89761,12 @@ in
         ];
       })
       sources."util-deprecate-1.0.2"
-      sources."util.promisify-1.0.1"
+      (sources."util.promisify-1.0.1" // {
+        dependencies = [
+          sources."es-abstract-1.17.7"
+          sources."object-inspect-1.8.0"
+        ];
+      })
       sources."uuid-3.4.0"
       sources."v8-compile-cache-2.2.0"
       sources."vendors-1.0.4"
@@ -90498,7 +90374,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bencode-2.0.1"
-      sources."bep53-range-1.0.0"
+      sources."bep53-range-1.1.0"
       sources."big-integer-1.6.48"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-6.4.2" // {
@@ -90558,7 +90434,7 @@ in
       sources."dns-txt-2.0.2"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.17.7"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."external-editor-2.2.0"
@@ -90610,11 +90486,10 @@ in
       sources."is-arguments-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-callable-1.2.2"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-date-object-1.0.2"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
-      sources."is-negative-zero-2.0.0"
       sources."is-regex-1.1.1"
       sources."is-symbol-1.0.3"
       sources."is-utf8-0.2.1"
@@ -90652,7 +90527,7 @@ in
       sources."numeral-2.0.6"
       sources."object-assign-4.1.1"
       sources."object-inspect-1.8.0"
-      sources."object-is-1.1.3"
+      sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.2"
       sources."once-1.4.0"
@@ -90706,11 +90581,7 @@ in
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.7"
       sources."redent-1.0.0"
-      (sources."regexp.prototype.flags-1.3.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."regexp.prototype.flags-1.3.0"
       sources."repeating-2.0.1"
       sources."resolve-1.19.0"
       sources."restore-cursor-2.0.0"
@@ -91346,7 +91217,7 @@ in
       sources."inherits-2.0.4"
       sources."ip-1.1.5"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
@@ -91433,7 +91304,7 @@ in
       sources."statuses-1.5.0"
       sources."string_decoder-0.10.31"
       sources."supports-color-7.2.0"
-      sources."systeminformation-4.30.4"
+      sources."systeminformation-4.30.6"
       sources."thunkify-2.1.2"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
@@ -91458,7 +91329,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Production process manager for Node.JS applications with a built-in load balancer.";
-      homepage = "https://pm2.keymetrics.io/";
+      homepage = http://pm2.keymetrics.io/;
       license = "AGPL-3.0";
     };
     production = true;
@@ -91638,10 +91509,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "2.2.0";
+    version = "2.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-2.2.0.tgz";
-      sha512 = "yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw==";
+      url = "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz";
+      sha512 = "PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -91819,7 +91690,7 @@ in
         ];
       })
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."json-stable-stringify-0.0.1"
@@ -92105,7 +91976,7 @@ in
       sources."mute-stream-0.0.8"
       sources."ncp-0.4.2"
       sources."object-inspect-1.8.0"
-      sources."object-is-1.1.3"
+      sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.2"
       sources."once-1.4.0"
@@ -92897,7 +92768,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
@@ -93378,10 +93249,10 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "2.12.0";
+    version = "2.13.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-2.12.0.tgz";
-      sha512 = "T36JRXVwIqB0FNV7h8n9vG2EnfwuznQnIH4ICmnfIZ2UcfE+cF2IBU98W1j6Pebh1qYUIM4uDZ7SnyvaGfGImw==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-2.13.0.tgz";
+      sha512 = "MOz0JYlPrWGwuyVUIncyaNRSlwOzVUFj5T/ITRjtO5PYXUWr+BB+yhZ97KoOhuL/hVnQ7ZjsmYgOvzo8hHwv9w==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
@@ -94079,7 +93950,7 @@ in
       sources."signal-exit-3.0.3"
       sources."simple-concat-1.0.1"
       sources."simple-get-2.8.1"
-      (sources."simple-git-2.23.0" // {
+      (sources."simple-git-2.24.0" // {
         dependencies = [
           sources."debug-4.3.1"
           sources."ms-2.1.2"
@@ -94873,10 +94744,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.431.1";
+    version = "1.431.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.431.1.tgz";
-      sha512 = "OW48lG89ffLsSZPHwsjfdqQcu3XG6aRQOkwASPCgTAGcVcnXzS9XHB89h0gLsDzk0fZRskEVgYpvXdh4RFjNqA==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.431.2.tgz";
+      sha512 = "DGm/bxtCSI/ReGK0vMphicQyZtVXiLgLvWkdDbRmsMb4Q7VRylAq9z+5lursLriED7eTjxlkgFMjOdGOuIoxpg==";
     };
     dependencies = [
       sources."@sindresorhus/is-2.1.1"
@@ -95327,7 +95198,7 @@ in
       })
       (sources."snyk-poetry-lockfile-parser-1.1.1" // {
         dependencies = [
-          (sources."@snyk/dep-graph-1.20.0" // {
+          (sources."@snyk/dep-graph-1.21.0" // {
             dependencies = [
               sources."tslib-1.14.1"
             ];
@@ -95597,7 +95468,7 @@ in
       sources."ini-1.3.5"
       sources."is-arrayish-0.2.1"
       sources."is-ci-1.2.1"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
@@ -95850,7 +95721,7 @@ in
       })
       sources."epidemic-broadcast-trees-7.0.0"
       sources."errno-0.1.7"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.17.7"
       (sources."es-get-iterator-1.1.1" // {
         dependencies = [
           sources."isarray-2.0.5"
@@ -95885,6 +95756,7 @@ in
       (sources."flumeview-links-1.0.1" // {
         dependencies = [
           sources."deep-equal-2.0.4"
+          sources."es-abstract-1.18.0-next.1"
           sources."isarray-2.0.5"
           sources."map-filter-reduce-3.2.2"
         ];
@@ -96007,11 +95879,7 @@ in
       sources."is-set-2.0.1"
       sources."is-string-1.0.5"
       sources."is-symbol-1.0.3"
-      (sources."is-typed-array-1.1.3" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."is-typed-array-1.1.3"
       sources."is-typedarray-1.0.0"
       sources."is-valid-domain-0.0.17"
       sources."is-weakmap-2.0.1"
@@ -96120,7 +95988,7 @@ in
         ];
       })
       sources."object-inspect-1.8.0"
-      sources."object-is-1.1.3"
+      sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       (sources."object-visit-1.0.1" // {
         dependencies = [
@@ -96286,11 +96154,7 @@ in
       })
       sources."regex-cache-0.4.4"
       sources."regex-not-1.0.2"
-      (sources."regexp.prototype.flags-1.3.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."regexp.prototype.flags-1.3.0"
       sources."relative-url-1.0.2"
       (sources."remark-3.2.3" // {
         dependencies = [
@@ -96330,7 +96194,11 @@ in
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."shellsubstitute-1.2.0"
-      sources."side-channel-1.0.3"
+      (sources."side-channel-1.0.3" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."smart-buffer-4.1.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
@@ -96435,7 +96303,11 @@ in
         ];
       })
       sources."string-width-1.0.2"
-      sources."string.prototype.trim-1.2.3"
+      (sources."string.prototype.trim-1.2.3" // {
+        dependencies = [
+          sources."es-abstract-1.18.0-next.1"
+        ];
+      })
       sources."string.prototype.trimend-1.0.3"
       sources."string.prototype.trimstart-1.0.3"
       sources."string_decoder-1.1.1"
@@ -96504,11 +96376,7 @@ in
       sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.1"
       sources."which-collection-1.0.1"
-      (sources."which-typed-array-1.1.2" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."which-typed-array-1.1.2"
       sources."word-wrap-1.2.3"
       sources."wrap-fn-0.1.5"
       sources."wrappy-1.0.2"
@@ -96867,7 +96735,7 @@ in
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       (sources."is-expression-3.0.0" // {
         dependencies = [
           sources."acorn-4.0.13"
@@ -97386,6 +97254,333 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  stylelint = nodeEnv.buildNodePackage {
+    name = "stylelint";
+    packageName = "stylelint";
+    version = "13.8.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz";
+      sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ==";
+    };
+    dependencies = [
+      sources."@babel/code-frame-7.10.4"
+      sources."@babel/core-7.12.9"
+      sources."@babel/generator-7.12.5"
+      sources."@babel/helper-function-name-7.10.4"
+      sources."@babel/helper-get-function-arity-7.10.4"
+      sources."@babel/helper-member-expression-to-functions-7.12.7"
+      sources."@babel/helper-module-imports-7.12.5"
+      sources."@babel/helper-module-transforms-7.12.1"
+      sources."@babel/helper-optimise-call-expression-7.12.7"
+      sources."@babel/helper-replace-supers-7.12.5"
+      sources."@babel/helper-simple-access-7.12.1"
+      sources."@babel/helper-split-export-declaration-7.11.0"
+      sources."@babel/helper-validator-identifier-7.10.4"
+      sources."@babel/helpers-7.12.5"
+      (sources."@babel/highlight-7.10.4" // {
+        dependencies = [
+          sources."chalk-2.4.2"
+        ];
+      })
+      sources."@babel/parser-7.12.7"
+      sources."@babel/template-7.12.7"
+      sources."@babel/traverse-7.12.9"
+      sources."@babel/types-7.12.7"
+      sources."@nodelib/fs.scandir-2.1.3"
+      sources."@nodelib/fs.stat-2.0.3"
+      sources."@nodelib/fs.walk-1.2.4"
+      sources."@stylelint/postcss-css-in-js-0.37.2"
+      sources."@stylelint/postcss-markdown-0.36.2"
+      sources."@types/mdast-3.0.3"
+      sources."@types/minimist-1.2.1"
+      sources."@types/normalize-package-data-2.4.0"
+      sources."@types/parse-json-4.0.0"
+      sources."@types/unist-2.0.3"
+      sources."ajv-6.12.6"
+      sources."ansi-regex-5.0.0"
+      sources."ansi-styles-3.2.1"
+      sources."array-union-2.1.0"
+      sources."arrify-1.0.1"
+      sources."astral-regex-2.0.0"
+      sources."autoprefixer-9.8.6"
+      sources."bail-1.0.5"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."braces-3.0.2"
+      sources."browserslist-4.14.7"
+      sources."callsites-3.1.0"
+      sources."camelcase-5.3.1"
+      sources."camelcase-keys-6.2.2"
+      sources."caniuse-lite-1.0.30001161"
+      (sources."chalk-4.1.0" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.2.0"
+        ];
+      })
+      sources."character-entities-1.2.4"
+      sources."character-entities-legacy-1.1.4"
+      sources."character-reference-invalid-1.1.4"
+      sources."clone-regexp-2.2.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."colorette-1.2.1"
+      sources."concat-map-0.0.1"
+      sources."convert-source-map-1.7.0"
+      sources."cosmiconfig-7.0.0"
+      sources."cssesc-3.0.0"
+      sources."debug-4.3.1"
+      sources."decamelize-1.2.0"
+      (sources."decamelize-keys-1.1.0" // {
+        dependencies = [
+          sources."map-obj-1.0.1"
+        ];
+      })
+      sources."dir-glob-3.0.1"
+      (sources."dom-serializer-0.2.2" // {
+        dependencies = [
+          sources."domelementtype-2.0.2"
+          sources."entities-2.1.0"
+        ];
+      })
+      sources."domelementtype-1.3.1"
+      sources."domhandler-2.4.2"
+      sources."domutils-1.7.0"
+      sources."electron-to-chromium-1.3.610"
+      sources."emoji-regex-8.0.0"
+      sources."entities-1.1.2"
+      sources."error-ex-1.3.2"
+      sources."escalade-3.1.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."execall-2.0.0"
+      sources."extend-3.0.2"
+      sources."fast-deep-equal-3.1.3"
+      sources."fast-glob-3.2.4"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."fastest-levenshtein-1.0.12"
+      sources."fastq-1.9.0"
+      sources."file-entry-cache-6.0.0"
+      sources."fill-range-7.0.1"
+      sources."find-up-4.1.0"
+      sources."flat-cache-3.0.4"
+      sources."flatted-3.1.0"
+      sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
+      sources."gensync-1.0.0-beta.2"
+      sources."get-stdin-8.0.0"
+      sources."glob-7.1.6"
+      sources."glob-parent-5.1.1"
+      sources."global-modules-2.0.0"
+      sources."global-prefix-3.0.0"
+      sources."globals-11.12.0"
+      sources."globby-11.0.1"
+      sources."globjoin-0.1.4"
+      sources."gonzales-pe-4.3.0"
+      sources."hard-rejection-2.1.0"
+      sources."has-1.0.3"
+      sources."has-flag-3.0.0"
+      sources."hosted-git-info-3.0.7"
+      sources."html-tags-3.1.0"
+      sources."htmlparser2-3.10.1"
+      sources."ignore-5.1.8"
+      (sources."import-fresh-3.2.2" // {
+        dependencies = [
+          sources."resolve-from-4.0.0"
+        ];
+      })
+      sources."import-lazy-4.0.0"
+      sources."imurmurhash-0.1.4"
+      sources."indent-string-4.0.0"
+      sources."indexes-of-1.0.1"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."ini-1.3.5"
+      sources."is-alphabetical-1.0.4"
+      sources."is-alphanumerical-1.0.4"
+      sources."is-arrayish-0.2.1"
+      sources."is-buffer-2.0.5"
+      sources."is-core-module-2.2.0"
+      sources."is-decimal-1.0.4"
+      sources."is-extglob-2.1.1"
+      sources."is-fullwidth-code-point-3.0.0"
+      sources."is-glob-4.0.1"
+      sources."is-hexadecimal-1.0.4"
+      sources."is-number-7.0.0"
+      sources."is-plain-obj-2.1.0"
+      sources."is-regexp-2.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."js-tokens-4.0.0"
+      sources."jsesc-2.5.2"
+      sources."json-parse-even-better-errors-2.3.1"
+      sources."json-schema-traverse-0.4.1"
+      sources."json5-2.1.3"
+      sources."kind-of-6.0.3"
+      sources."known-css-properties-0.20.0"
+      sources."lines-and-columns-1.1.6"
+      sources."locate-path-5.0.0"
+      sources."lodash-4.17.20"
+      sources."log-symbols-4.0.0"
+      sources."longest-streak-2.0.4"
+      sources."lru-cache-6.0.0"
+      sources."map-obj-4.1.0"
+      sources."mathml-tag-names-2.1.3"
+      sources."mdast-util-from-markdown-0.8.1"
+      (sources."mdast-util-to-markdown-0.5.4" // {
+        dependencies = [
+          sources."mdast-util-to-string-2.0.0"
+        ];
+      })
+      sources."mdast-util-to-string-1.1.0"
+      sources."meow-8.0.0"
+      sources."merge2-1.4.1"
+      sources."micromark-2.10.1"
+      sources."micromatch-4.0.2"
+      sources."min-indent-1.0.1"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.5"
+      (sources."minimist-options-4.1.0" // {
+        dependencies = [
+          sources."is-plain-obj-1.1.0"
+        ];
+      })
+      sources."ms-2.1.2"
+      sources."node-releases-1.1.67"
+      (sources."normalize-package-data-3.0.0" // {
+        dependencies = [
+          sources."semver-7.3.2"
+        ];
+      })
+      sources."normalize-range-0.1.2"
+      sources."normalize-selector-0.2.0"
+      sources."num2fraction-1.2.2"
+      sources."once-1.4.0"
+      sources."p-limit-2.3.0"
+      sources."p-locate-4.1.0"
+      sources."p-try-2.2.0"
+      sources."parent-module-1.0.1"
+      sources."parse-entities-2.0.0"
+      sources."parse-json-5.1.0"
+      sources."path-exists-4.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-parse-1.0.6"
+      sources."path-type-4.0.0"
+      sources."picomatch-2.2.2"
+      (sources."postcss-7.0.35" // {
+        dependencies = [
+          (sources."chalk-2.4.2" // {
+            dependencies = [
+              sources."supports-color-5.5.0"
+            ];
+          })
+          sources."source-map-0.6.1"
+          sources."supports-color-6.1.0"
+        ];
+      })
+      sources."postcss-html-0.36.0"
+      sources."postcss-less-3.1.4"
+      sources."postcss-media-query-parser-0.2.3"
+      sources."postcss-resolve-nested-selector-0.1.1"
+      sources."postcss-safe-parser-4.0.2"
+      sources."postcss-sass-0.4.4"
+      sources."postcss-scss-2.1.1"
+      sources."postcss-selector-parser-6.0.4"
+      sources."postcss-syntax-0.36.2"
+      sources."postcss-value-parser-4.1.0"
+      sources."punycode-2.1.1"
+      sources."quick-lru-4.0.1"
+      (sources."read-pkg-5.2.0" // {
+        dependencies = [
+          sources."hosted-git-info-2.8.8"
+          sources."normalize-package-data-2.5.0"
+          sources."type-fest-0.6.0"
+        ];
+      })
+      (sources."read-pkg-up-7.0.1" // {
+        dependencies = [
+          sources."type-fest-0.8.1"
+        ];
+      })
+      sources."readable-stream-3.6.0"
+      sources."redent-3.0.0"
+      sources."remark-13.0.0"
+      sources."remark-parse-9.0.0"
+      sources."remark-stringify-9.0.0"
+      sources."repeat-string-1.6.1"
+      sources."replace-ext-1.0.0"
+      sources."resolve-1.19.0"
+      sources."resolve-from-5.0.0"
+      sources."reusify-1.0.4"
+      sources."rimraf-3.0.2"
+      sources."run-parallel-1.1.10"
+      sources."safe-buffer-5.1.2"
+      sources."semver-5.7.1"
+      sources."signal-exit-3.0.3"
+      sources."slash-3.0.0"
+      (sources."slice-ansi-4.0.0" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+        ];
+      })
+      sources."source-map-0.5.7"
+      sources."spdx-correct-3.1.1"
+      sources."spdx-exceptions-2.3.0"
+      sources."spdx-expression-parse-3.0.1"
+      sources."spdx-license-ids-3.0.6"
+      sources."specificity-0.4.1"
+      sources."string-width-4.2.0"
+      (sources."string_decoder-1.3.0" // {
+        dependencies = [
+          sources."safe-buffer-5.2.1"
+        ];
+      })
+      sources."strip-ansi-6.0.0"
+      sources."strip-indent-3.0.0"
+      sources."style-search-0.1.0"
+      sources."sugarss-2.0.0"
+      sources."supports-color-5.5.0"
+      sources."svg-tags-1.0.0"
+      sources."table-6.0.4"
+      sources."to-fast-properties-2.0.0"
+      sources."to-regex-range-5.0.1"
+      sources."trim-newlines-3.0.0"
+      sources."trough-1.0.5"
+      sources."type-fest-0.18.1"
+      sources."typedarray-to-buffer-3.1.5"
+      sources."unified-9.2.0"
+      sources."uniq-1.0.1"
+      sources."unist-util-find-all-after-3.0.2"
+      sources."unist-util-is-4.0.3"
+      sources."unist-util-stringify-position-2.0.3"
+      sources."uri-js-4.4.0"
+      sources."util-deprecate-1.0.2"
+      sources."v8-compile-cache-2.2.0"
+      sources."validate-npm-package-license-3.0.4"
+      sources."vfile-4.2.0"
+      sources."vfile-message-2.0.4"
+      sources."which-1.3.1"
+      sources."wrappy-1.0.2"
+      sources."write-file-atomic-3.0.3"
+      sources."yallist-4.0.0"
+      sources."yaml-1.10.0"
+      sources."yargs-parser-20.2.4"
+      sources."zwitch-1.0.5"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A mighty, modern CSS linter.";
+      homepage = https://stylelint.io/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   svgo = nodeEnv.buildNodePackage {
     name = "svgo";
     packageName = "svgo";
@@ -97408,9 +97603,9 @@ in
       sources."css-select-base-adapter-0.1.1"
       sources."css-tree-1.0.0-alpha.37"
       sources."css-what-3.4.2"
-      (sources."csso-4.1.1" // {
+      (sources."csso-4.2.0" // {
         dependencies = [
-          sources."css-tree-1.1.1"
+          sources."css-tree-1.1.2"
           sources."mdn-data-2.0.14"
         ];
       })
@@ -97423,7 +97618,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domutils-1.7.0"
       sources."entities-2.1.0"
-      sources."es-abstract-1.17.7"
+      sources."es-abstract-1.18.0-next.1"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
@@ -97434,6 +97629,7 @@ in
       sources."has-symbols-1.0.1"
       sources."is-callable-1.2.2"
       sources."is-date-object-1.0.2"
+      sources."is-negative-zero-2.0.0"
       sources."is-regex-1.1.1"
       sources."is-symbol-1.0.3"
       sources."js-yaml-3.14.0"
@@ -97444,8 +97640,8 @@ in
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.2"
-      sources."object.getownpropertydescriptors-2.1.0"
-      sources."object.values-1.1.1"
+      sources."object.getownpropertydescriptors-2.1.1"
+      sources."object.values-1.1.2"
       sources."q-1.5.1"
       sources."sax-1.2.4"
       sources."source-map-0.6.1"
@@ -97455,7 +97651,11 @@ in
       sources."string.prototype.trimstart-1.0.3"
       sources."supports-color-5.5.0"
       sources."unquote-1.1.1"
-      sources."util.promisify-1.0.1"
+      (sources."util.promisify-1.0.1" // {
+        dependencies = [
+          sources."es-abstract-1.17.7"
+        ];
+      })
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -98326,7 +98526,7 @@ in
       sources."define-properties-1.1.3"
       sources."diff-4.0.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.17.7"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
@@ -98356,13 +98556,12 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.2"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-date-object-1.0.2"
       sources."is-decimal-1.0.4"
       sources."is-file-1.0.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-hexadecimal-1.0.4"
-      sources."is-negative-zero-2.0.0"
       sources."is-plain-obj-1.1.0"
       sources."is-regex-1.1.1"
       sources."is-symbol-1.0.3"
@@ -98390,7 +98589,7 @@ in
       sources."normalize-package-data-2.5.0"
       sources."number-is-nan-1.0.1"
       sources."object-inspect-1.8.0"
-      sources."object-is-1.1.3"
+      sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.2"
       sources."once-1.4.0"
@@ -98424,11 +98623,7 @@ in
         ];
       })
       sources."readable-stream-2.3.7"
-      (sources."regexp.prototype.flags-1.3.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."regexp.prototype.flags-1.3.0"
       sources."remark-frontmatter-1.3.3"
       sources."remark-parse-5.0.0"
       sources."repeat-string-1.6.1"
@@ -98720,7 +98915,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-2.0.5"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-decimal-1.0.4"
       sources."is-empty-1.2.0"
       sources."is-fullwidth-code-point-2.0.0"
@@ -99117,7 +99312,7 @@ in
       sources."call-bind-1.0.0"
       sources."concat-stream-2.0.0"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.17.7"
+      sources."es-abstract-1.18.0-next.1"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.0.1"
@@ -99126,13 +99321,14 @@ in
       sources."inherits-2.0.4"
       sources."is-callable-1.2.2"
       sources."is-date-object-1.0.2"
+      sources."is-negative-zero-2.0.0"
       sources."is-regex-1.1.1"
       sources."is-symbol-1.0.3"
       sources."object-assign-4.1.1"
       sources."object-inspect-1.8.0"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.2"
-      sources."object.values-1.1.1"
+      sources."object.values-1.1.2"
       sources."readable-stream-3.6.0"
       sources."safe-buffer-5.2.1"
       sources."sentence-splitter-3.2.0"
@@ -100700,7 +100896,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."isarray-1.0.0"
       sources."mimic-response-2.1.0"
@@ -100861,10 +101057,10 @@ in
   vim-language-server = nodeEnv.buildNodePackage {
     name = "vim-language-server";
     packageName = "vim-language-server";
-    version = "2.1.1";
+    version = "2.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.1.tgz";
-      sha512 = "au7F9BKmsbBY8zaZ9LELonc0XbvutejtWcR4mlEIOQiDLl+2kDfAOaQoQ/EZSOKo/GaOgZURUk7uQknQlgivAA==";
+      url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.2.tgz";
+      sha512 = "i+IVvvla+7oyXU3Mb1Vc4hCymCEUbRRhJE7/So+wZNZZgtVH4SNWwhtjzNV2l9egYAyCqJnJKKtErwgJnfAHsA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -101242,7 +101438,7 @@ in
       sources."enhanced-resolve-4.3.0"
       sources."entities-1.1.2"
       sources."errno-0.1.7"
-      (sources."es-abstract-1.17.7" // {
+      (sources."es-abstract-1.18.0-next.1" // {
         dependencies = [
           sources."object.assign-4.1.2"
         ];
@@ -101400,6 +101596,7 @@ in
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
+      sources."is-negative-zero-2.0.0"
       sources."is-number-7.0.0"
       sources."is-plain-object-2.0.4"
       sources."is-regex-1.1.1"
@@ -101505,7 +101702,7 @@ in
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.0"
-      sources."object.getownpropertydescriptors-2.1.0"
+      sources."object.getownpropertydescriptors-2.1.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."os-0.1.1"
@@ -102510,7 +102707,7 @@ in
       sources."is-binary-path-2.1.0"
       sources."is-buffer-2.0.5"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-decimal-1.0.4"
       sources."is-descriptor-1.0.2"
@@ -103385,7 +103582,7 @@ in
       sources."enquirer-2.3.6"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.17.7"
       sources."es-to-primitive-1.2.1"
       sources."es6-error-4.1.1"
       sources."es6-promise-2.3.0"
@@ -103611,7 +103808,6 @@ in
       sources."is-installed-globally-0.3.2"
       sources."is-mergeable-object-1.1.1"
       sources."is-natural-number-4.0.1"
-      sources."is-negative-zero-2.0.0"
       sources."is-npm-5.0.0"
       sources."is-number-7.0.0"
       sources."is-obj-2.0.0"
@@ -103789,7 +103985,7 @@ in
         ];
       })
       sources."object-inspect-1.8.0"
-      sources."object-is-1.1.3"
+      sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       (sources."object-visit-1.0.1" // {
         dependencies = [
@@ -103878,11 +104074,7 @@ in
       sources."readdirp-3.5.0"
       sources."regenerator-runtime-0.13.7"
       sources."regex-not-1.0.2"
-      (sources."regexp.prototype.flags-1.3.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."regexp.prototype.flags-1.3.0"
       sources."regexpp-3.1.0"
       sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
@@ -104199,10 +104391,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "5.6.0";
+    version = "5.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.6.0.tgz";
-      sha512 = "SIeFuBhuheKElRbd84O35UhKc0nxlgSwtzm2ksZ0BVhRJqxVJxEguT/pYhfiR0le/pxTa1VsCp7EOYyTsa6XOA==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-5.8.0.tgz";
+      sha512 = "X2yosPiHip3L0TE+ylruzrOqSgEgsdGyBOGFWKYChcwlKChaw9VodZIUovG1oo7s0ss6e3ZxBMn9tXR+nkPThA==";
     };
     dependencies = [
       sources."@types/eslint-7.2.5"
@@ -104239,7 +104431,7 @@ in
       sources."chrome-trace-event-1.0.2"
       sources."colorette-1.2.1"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.607"
+      sources."electron-to-chromium-1.3.610"
       sources."enhanced-resolve-5.3.2"
       sources."escalade-3.1.1"
       sources."eslint-scope-5.1.1"
@@ -104281,7 +104473,7 @@ in
       sources."source-map-support-0.5.19"
       sources."supports-color-7.2.0"
       sources."tapable-2.1.1"
-      (sources."terser-5.5.0" // {
+      (sources."terser-5.5.1" // {
         dependencies = [
           sources."source-map-0.7.3"
         ];
@@ -104342,7 +104534,7 @@ in
       sources."human-signals-1.1.1"
       sources."import-local-3.0.2"
       sources."interpret-2.2.0"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-stream-2.0.0"
       sources."isexe-2.0.0"
       sources."leven-3.1.0"
@@ -104529,7 +104721,7 @@ in
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."errno-0.1.7"
-      sources."es-abstract-1.18.0-next.1"
+      sources."es-abstract-1.17.7"
       sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
@@ -104652,7 +104844,6 @@ in
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
-      sources."is-negative-zero-2.0.0"
       (sources."is-number-3.0.0" // {
         dependencies = [
           sources."kind-of-3.2.2"
@@ -104717,7 +104908,7 @@ in
         ];
       })
       sources."object-inspect-1.8.0"
-      sources."object-is-1.1.3"
+      sources."object-is-1.1.4"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.2"
@@ -104774,11 +104965,7 @@ in
       })
       sources."readdirp-2.2.1"
       sources."regex-not-1.0.2"
-      (sources."regexp.prototype.flags-1.3.0" // {
-        dependencies = [
-          sources."es-abstract-1.17.7"
-        ];
-      })
+      sources."regexp.prototype.flags-1.3.0"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
@@ -105124,7 +105311,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-1.5.1"
       sources."bencode-2.0.1"
-      sources."bep53-range-1.0.0"
+      sources."bep53-range-1.1.0"
       sources."binary-search-1.3.6"
       sources."bitfield-4.0.0"
       (sources."bittorrent-dht-10.0.0" // {
@@ -105314,7 +105501,7 @@ in
       sources."range-slice-stream-2.0.0"
       sources."readable-stream-3.6.0"
       sources."record-cache-1.1.0"
-      (sources."render-media-4.0.1" // {
+      (sources."render-media-4.1.0" // {
         dependencies = [
           sources."debug-4.3.1"
           sources."ms-2.1.2"
@@ -105386,7 +105573,7 @@ in
       sources."utp-native-2.2.1"
       sources."videostream-3.2.2"
       sources."vlc-command-1.2.0"
-      (sources."webtorrent-0.111.0" // {
+      (sources."webtorrent-0.112.0" // {
         dependencies = [
           sources."debug-4.3.1"
           sources."decompress-response-6.0.0"
@@ -105863,7 +106050,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-ci-1.2.1"
-      sources."is-core-module-2.1.0"
+      sources."is-core-module-2.2.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-docker-1.1.0"
@@ -106324,7 +106511,7 @@ in
       sources."tunnel-0.0.6"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."twig-1.15.3"
+      sources."twig-1.15.4"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
       sources."union-value-1.0.1"
@@ -106496,4 +106683,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
+}
\ No newline at end of file

From 5dfefc39c5dec743346c51a52498c1594a612840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 28 Nov 2020 03:08:50 +0100
Subject: [PATCH 3904/3942] thin-provisioning-tools: remove unused input

---
 pkgs/tools/misc/thin-provisioning-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 8df030eafadb..3eccb4883618 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, fetchpatch, autoreconfHook, expat, libaio, boost, binutils }:
+{ stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost, binutils }:
 
 stdenv.mkDerivation rec {
   pname = "thin-provisioning-tools";

From 212ba486d67e078ad8e31a7ca53de964d8bae826 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Nov 2020 02:18:00 +0000
Subject: [PATCH 3905/3942] igv: 2.8.12 -> 2.8.13

---
 pkgs/applications/science/biology/igv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index 86a16c4f0474..3f9cb1a288b3 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "igv";
-  version = "2.8.12";
+  version = "2.8.13";
   src = fetchzip {
     url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip";
-    sha256 = "0zxmk417j9s5nms0np1fsip7r0jhwkj1d1x424ljr9krcb2zwcyq";
+    sha256 = "0sab478jq96iw3fv0560hrrj8qbh40r8m4ncypdb7991j9haxl09";
   };
 
   installPhase = ''

From 495c2b5112b51faab8f5999b1cdab85f6b6de32b Mon Sep 17 00:00:00 2001
From: Kamron Mahmoodzadeh <kzadeh1@gmail.com>
Date: Sun, 9 Aug 2020 18:16:58 -0700
Subject: [PATCH 3906/3942] doc: use newer ruby documentation

With the addition of ruby.withPackages, manveru rewrote the nixpkgs
manual section for the ruby language but did not add it to the manual.
This commit replaces the previous documentation with manveru's updated
version.
---
 doc/languages-frameworks/index.xml       |  2 +-
 doc/languages-frameworks/ruby.section.md | 26 ++++++++++--------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 300c4cd2687a..7342877fc5c5 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -27,7 +27,7 @@
  <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="ruby.section.xml" />
  <xi:include href="rust.section.xml" />
  <xi:include href="texlive.xml" />
  <xi:include href="titanium.section.xml" />
diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md
index e4c4ffce0432..61550ddfbbbf 100644
--- a/doc/languages-frameworks/ruby.section.md
+++ b/doc/languages-frameworks/ruby.section.md
@@ -6,11 +6,7 @@ date: 2019-05-23
 
 # Ruby
 
-## User Guide
-
-### Using Ruby
-
-#### Overview
+## Using Ruby
 
 Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby.
 The attribute `ruby` refers to the default Ruby interpreter, which is currently
@@ -37,7 +33,7 @@ Ruby in your environment will be able to find the gem and it can be used in your
 Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"`
 as usual.
 
-#### Temporary Ruby environment with `nix-shell`
+### Temporary Ruby environment with `nix-shell`
 
 Rather than having a single Ruby environment shared by all Ruby
 development projects on a system, Nix allows you to create separate
@@ -64,7 +60,7 @@ Again, it's possible to launch the interpreter from the shell. The Ruby
 interpreter has the attribute `gems` which contains all Ruby gems for that
 specific interpreter.
 
-##### Load environment from `.nix` expression
+#### Load Ruby environment from `.nix` expression
 
 As explained in the Nix manual, `nix-shell` can also load an expression from a
 `.nix` file. Say we want to have Ruby 2.5, `nokogori`, and `pry`. Consider a
@@ -87,7 +83,7 @@ What's happening here?
    in the environment. Here, we select the packages `nokogiri` and `pry` from
    the package set.
 
-##### Execute command with `--run`
+#### Execute command with `--run`
 
 A convenient flag for `nix-shell` is `--run`. It executes a command in the
 `nix-shell`. We can e.g. directly open a `pry` REPL:
@@ -108,7 +104,7 @@ Or run a script using this environment:
 nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "ruby example.rb"
 ```
 
-##### Using `nix-shell` as shebang
+#### Using `nix-shell` as shebang
 
 In fact, for the last case, there is a more convenient method. You can add a
 [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script
@@ -126,9 +122,9 @@ body = RestClient.get('http://example.com').body
 puts Nokogiri::HTML(body).at('h1').text
 ```
 
-### Developing with Ruby
+## Developing with Ruby
 
-#### Using an existing Gemfile
+### Using an existing Gemfile
 
 In most cases, you'll already have a `Gemfile.lock` listing all your dependencies.
 This can be used to generate a `gemset.nix` which is used to fetch the gems and
@@ -187,7 +183,7 @@ mkShell { buildInputs = [ gems (lowPrio gems.wrappedRuby) ]; }
 ```
 
 
-#### Gem-specific configurations and workarounds
+### Gem-specific configurations and workarounds
 
 In some cases, especially if the gem has native extensions, you might need to
 modify the way the gem is built.
@@ -276,7 +272,7 @@ Of course for this use-case one could also use overlays since the configuration
 for `pg` depends on the `postgresql` alias, but for demonstration purposes this
 has to suffice.
 
-#### Adding a gem to the default gemset
+### Adding a gem to the default gemset
 
 Now that you know how to get a working Ruby environment with Nix, it's time to
 go forward and start actually developing with Ruby.
@@ -297,7 +293,7 @@ To test that it works, you can then try using the gem with:
 NIX_PATH=nixpkgs=$PWD nix-shell -p "ruby.withPackages (ps: with ps; [ name-of-your-gem ])"
 ```
 
-#### Packaging applications
+### Packaging applications
 
 A common task is to add a ruby executable to nixpkgs, popular examples would be
 `chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp`
@@ -334,7 +330,7 @@ bundlerApp {
 All that's left to do is to generate the corresponding `Gemfile.lock` and
 `gemset.nix` as described above in the `Using an existing Gemfile` section.
 
-##### Packaging executables that require wrapping
+#### Packaging executables that require wrapping
 
 Sometimes your app will depend on other executables at runtime, and tries to
 find it through the `PATH` environment variable.

From 6c70fdfd07bbd2547b7788a29bfefbb922caae97 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 27 Nov 2020 17:26:10 -0800
Subject: [PATCH 3907/3942] doc: ruby improvements

* no hard wrapping
* use ShellSession and nix info strings
* preserve old section anchor link
* update references to present default version
---
 doc/languages-frameworks/ruby.section.md | 195 ++++++-----------------
 doc/languages-frameworks/ruby.xml        | 107 -------------
 2 files changed, 52 insertions(+), 250 deletions(-)
 delete mode 100644 doc/languages-frameworks/ruby.xml

diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md
index 61550ddfbbbf..e292b3110ff4 100644
--- a/doc/languages-frameworks/ruby.section.md
+++ b/doc/languages-frameworks/ruby.section.md
@@ -1,70 +1,38 @@
----
-title: Ruby
-author: Michael Fellinger
-date: 2019-05-23
----
-
-# Ruby
+# Ruby {#sec-language-ruby}
 
 ## Using Ruby
 
-Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby.
-The attribute `ruby` refers to the default Ruby interpreter, which is currently
-MRI 2.5. It's also possible to refer to specific versions, e.g. `ruby_2_6`, `jruby`, or `mruby`.
+Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby. The attribute `ruby` refers to the default Ruby interpreter, which is currently MRI 2.6. It's also possible to refer to specific versions, e.g. `ruby_2_y`, `jruby`, or `mruby`.
 
-In the nixpkgs tree, Ruby packages can be found throughout, depending on what
-they do, and are called from the main package set. Ruby gems, however are
-separate sets, and there's one default set for each interpreter (currently MRI
-only).
+In the Nixpkgs tree, Ruby packages can be found throughout, depending on what they do, and are called from the main package set. Ruby gems, however are separate sets, and there's one default set for each interpreter (currently MRI only).
 
-There are two main approaches for using Ruby with gems.
-One is to use a specifically locked `Gemfile` for an application that has very strict dependencies.
-The other is to depend on the common gems, which we'll explain further down, and
-rely on them being updated regularly.
+There are two main approaches for using Ruby with gems. One is to use a specifically locked `Gemfile` for an application that has very strict dependencies. The other is to depend on the common gems, which we'll explain further down, and rely on them being updated regularly.
 
-The interpreters have common attributes, namely `gems`, and `withPackages`. So
-you can refer to `ruby.gems.nokogiri`, or `ruby_2_5.gems.nokogiri` to get the
-Nokogiri gem already compiled and ready to use.
+The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_2_6.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use.
 
-Since not all gems have executables like `nokogiri`, it's usually more
-convenient to use the `withPackages` function like this:
-`ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the
-Ruby in your environment will be able to find the gem and it can be used in your
-Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"`
-as usual.
+Since not all gems have executables like `nokogiri`, it's usually more convenient to use the `withPackages` function like this: `ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the Ruby in your environment will be able to find the gem and it can be used in your Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` as usual.
 
 ### Temporary Ruby environment with `nix-shell`
 
-Rather than having a single Ruby environment shared by all Ruby
-development projects on a system, Nix allows you to create separate
-environments per project.  `nix-shell` gives you the possibility to
-temporarily load another environment akin to a combined `chruby` or
-`rvm` and `bundle exec`.
+Rather than having a single Ruby environment shared by all Ruby development projects on a system, Nix allows you to create separate environments per project. `nix-shell` gives you the possibility to temporarily load another environment akin to a combined `chruby` or `rvm` and `bundle exec`.
 
-There are two methods for loading a shell with Ruby packages. The first and
-recommended method is to create an environment with `ruby.withPackages` and load
-that.
+There are two methods for loading a shell with Ruby packages. The first and recommended method is to create an environment with `ruby.withPackages` and load that.
 
-```shell
-nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])"
+```ShellSession
+$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])"
 ```
 
-The other method, which is not recommended, is to create an environment and list
-all the packages directly.
+The other method, which is not recommended, is to create an environment and list all the packages directly.
 
-```shell
-nix-shell -p ruby.gems.nokogiri ruby.gems.pry
+```ShellSession
+$ nix-shell -p ruby.gems.nokogiri ruby.gems.pry
 ```
 
-Again, it's possible to launch the interpreter from the shell. The Ruby
-interpreter has the attribute `gems` which contains all Ruby gems for that
-specific interpreter.
+Again, it's possible to launch the interpreter from the shell. The Ruby interpreter has the attribute `gems` which contains all Ruby gems for that specific interpreter.
 
 #### Load Ruby environment from `.nix` expression
 
-As explained in the Nix manual, `nix-shell` can also load an expression from a
-`.nix` file. Say we want to have Ruby 2.5, `nokogori`, and `pry`. Consider a
-`shell.nix` file with:
+As explained in the Nix manual, `nix-shell` can also load an expression from a `.nix` file. Say we want to have Ruby 2.6, `nokogori`, and `pry`. Consider a `shell.nix` file with:
 
 ```nix
 with import <nixpkgs> {};
@@ -73,43 +41,33 @@ ruby.withPackages (ps: with ps; [ nokogiri pry ])
 
 What's happening here?
 
-1. We begin with importing the Nix Packages collections. `import <nixpkgs>`
-   imports the `<nixpkgs>` function, `{}` calls it and the `with` statement
-   brings all attributes of `nixpkgs` in the local scope. These attributes form
-   the main package set.
+1. We begin with importing the Nix Packages collections. `import <nixpkgs>` imports the `<nixpkgs>` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set.
 2. Then we create a Ruby environment with the `withPackages` function.
-3. The `withPackages` function expects us to provide a function as an argument
-   that takes the set of all ruby gems and returns a list of packages to include
-   in the environment. Here, we select the packages `nokogiri` and `pry` from
-   the package set.
+3. The `withPackages` function expects us to provide a function as an argument that takes the set of all ruby gems and returns a list of packages to include in the environment. Here, we select the packages `nokogiri` and `pry` from the package set.
 
 #### Execute command with `--run`
 
-A convenient flag for `nix-shell` is `--run`. It executes a command in the
-`nix-shell`. We can e.g. directly open a `pry` REPL:
+A convenient flag for `nix-shell` is `--run`. It executes a command in the `nix-shell`. We can e.g. directly open a `pry` REPL:
 
-```shell
-nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry"
+```ShellSession
+$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry"
 ```
 
 Or immediately require `nokogiri` in pry:
 
-```shell
-nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry -rnokogiri"
+```ShellSession
+$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry -rnokogiri"
 ```
 
 Or run a script using this environment:
 
-```shell
-nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "ruby example.rb"
+```ShellSession
+$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "ruby example.rb"
 ```
 
 #### Using `nix-shell` as shebang
 
-In fact, for the last case, there is a more convenient method. You can add a
-[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script
-specifying which dependencies `nix-shell` needs. With the following shebang, you
-can just execute `./example.rb`, and it will run with all dependencies.
+In fact, for the last case, there is a more convenient method. You can add a [shebang](<https://en.wikipedia.org/wiki/Shebang_(Unix)>) to your script specifying which dependencies `nix-shell` needs. With the following shebang, you can just execute `./example.rb`, and it will run with all dependencies.
 
 ```ruby
 #! /usr/bin/env nix-shell
@@ -126,31 +84,20 @@ puts Nokogiri::HTML(body).at('h1').text
 
 ### Using an existing Gemfile
 
-In most cases, you'll already have a `Gemfile.lock` listing all your dependencies.
-This can be used to generate a `gemset.nix` which is used to fetch the gems and
-combine them into a single environment.
-The reason why you need to have a separate file for this, is that Nix requires
-you to have a checksum for each input to your build.
-Since the `Gemfile.lock` that `bundler` generates doesn't provide us with
-checksums, we have to first download each gem, calculate its SHA256, and store
-it in this separate file.
+In most cases, you'll already have a `Gemfile.lock` listing all your dependencies. This can be used to generate a `gemset.nix` which is used to fetch the gems and combine them into a single environment. The reason why you need to have a separate file for this, is that Nix requires you to have a checksum for each input to your build. Since the `Gemfile.lock` that `bundler` generates doesn't provide us with checksums, we have to first download each gem, calculate its SHA256, and store it in this separate file.
 
 So the steps from having just a `Gemfile` to a `gemset.nix` are:
 
-```shell
-bundle lock
-bundix
+```ShellSession
+$ bundle lock
+$ bundix
 ```
 
-If you already have a `Gemfile.lock`, you can simply run `bundix` and it will
-work the same.
+If you already have a `Gemfile.lock`, you can simply run `bundix` and it will work the same.
 
-To update the gems in your `Gemfile.lock`, you may use the `bundix -l` flag,
-which will create a new `Gemfile.lock` in case the `Gemfile` has a more recent
-time of modification.
+To update the gems in your `Gemfile.lock`, you may use the `bundix -l` flag, which will create a new `Gemfile.lock` in case the `Gemfile` has a more recent time of modification.
 
-Once the `gemset.nix` is generated, it can be used in a
-`bundlerEnv` derivation. Here is an example you could use for your `shell.nix`:
+Once the `gemset.nix` is generated, it can be used in a `bundlerEnv` derivation. Here is an example you could use for your `shell.nix`:
 
 ```nix
 # ...
@@ -162,41 +109,26 @@ let
 in mkShell { buildInputs = [ gems gems.wrappedRuby ]; }
 ```
 
-With this file in your directory, you can run `nix-shell` to build and use the gems.
-The important parts here are `bundlerEnv` and `wrappedRuby`.
+With this file in your directory, you can run `nix-shell` to build and use the gems. The important parts here are `bundlerEnv` and `wrappedRuby`.
 
-The `bundlerEnv` is a wrapper over all the gems in your gemset. This means that
-all the `/lib` and `/bin` directories will be available, and the executables of
-all gems (even of indirect dependencies) will end up in your `$PATH`.
-The `wrappedRuby` provides you with all executables that come with Ruby itself,
-but wrapped so they can easily find the gems in your gemset.
+The `bundlerEnv` is a wrapper over all the gems in your gemset. This means that all the `/lib` and `/bin` directories will be available, and the executables of all gems (even of indirect dependencies) will end up in your `$PATH`. The `wrappedRuby` provides you with all executables that come with Ruby itself, but wrapped so they can easily find the gems in your gemset.
 
-One common issue that you might have is that you have Ruby 2.6, but also
-`bundler` in your gemset. That leads to a conflict for `/bin/bundle` and
-`/bin/bundler`. You can resolve this by wrapping either your Ruby or your gems
-in a `lowPrio` call. So in order to give the `bundler` from your gemset
-priority, it would be used like this:
+One common issue that you might have is that you have Ruby 2.6, but also `bundler` in your gemset. That leads to a conflict for `/bin/bundle` and `/bin/bundler`. You can resolve this by wrapping either your Ruby or your gems in a `lowPrio` call. So in order to give the `bundler` from your gemset priority, it would be used like this:
 
 ```nix
 # ...
 mkShell { buildInputs = [ gems (lowPrio gems.wrappedRuby) ]; }
 ```
 
-
 ### Gem-specific configurations and workarounds
 
-In some cases, especially if the gem has native extensions, you might need to
-modify the way the gem is built.
+In some cases, especially if the gem has native extensions, you might need to modify the way the gem is built.
 
-This is done via a common configuration file that includes all of the
-workarounds for each gem.
+This is done via a common configuration file that includes all of the workarounds for each gem.
 
-This file lives at `/pkgs/development/ruby-modules/gem-config/default.nix`,
-since it already contains a lot of entries, it should be pretty easy to add the
-modifications you need for your needs.
+This file lives at `/pkgs/development/ruby-modules/gem-config/default.nix`, since it already contains a lot of entries, it should be pretty easy to add the modifications you need for your needs.
 
-In the meanwhile, or if the modification is for a private gem, you can also add
-the configuration to only your own environment.
+In the meanwhile, or if the modification is for a private gem, you can also add the configuration to only your own environment.
 
 Two places that allow this modification are the `ruby` derivation, or `bundlerEnv`.
 
@@ -257,10 +189,9 @@ let
 in pkgs.ruby.withPackages (ps: with ps; [ pg ])
 ```
 
-Then we can get whichever postgresql version we desire and the `pg` gem will
-always reference it correctly:
+Then we can get whichever postgresql version we desire and the `pg` gem will always reference it correctly:
 
-```shell
+```ShellSession
 $ nix-shell --argstr pg_version 9_4 --run 'ruby -rpg -e "puts PG.library_version"'
 90421
 
@@ -268,24 +199,15 @@ $ nix-shell --run 'ruby -rpg -e "puts PG.library_version"'
 100007
 ```
 
-Of course for this use-case one could also use overlays since the configuration
-for `pg` depends on the `postgresql` alias, but for demonstration purposes this
-has to suffice.
+Of course for this use-case one could also use overlays since the configuration for `pg` depends on the `postgresql` alias, but for demonstration purposes this has to suffice.
 
 ### Adding a gem to the default gemset
 
-Now that you know how to get a working Ruby environment with Nix, it's time to
-go forward and start actually developing with Ruby.
-We will first have a look at how Ruby gems are packaged on Nix. Then, we will
-look at how you can use development mode with your code.
+Now that you know how to get a working Ruby environment with Nix, it's time to go forward and start actually developing with Ruby. We will first have a look at how Ruby gems are packaged on Nix. Then, we will look at how you can use development mode with your code.
 
-All gems in the standard set are automatically generated from a single
-`Gemfile`. The dependency resolution is done with `bundler` and makes it more
-likely that all gems are compatible to each other.
+All gems in the standard set are automatically generated from a single `Gemfile`. The dependency resolution is done with `bundler` and makes it more likely that all gems are compatible to each other.
 
-In order to add a new gem to nixpkgs, you can put it into the
-`/pkgs/development/ruby-modules/with-packages/Gemfile` and run
-`./maintainers/scripts/update-ruby-packages`.
+In order to add a new gem to nixpkgs, you can put it into the `/pkgs/development/ruby-modules/with-packages/Gemfile` and run `./maintainers/scripts/update-ruby-packages`.
 
 To test that it works, you can then try using the gem with:
 
@@ -295,14 +217,9 @@ NIX_PATH=nixpkgs=$PWD nix-shell -p "ruby.withPackages (ps: with ps; [ name-of-yo
 
 ### Packaging applications
 
-A common task is to add a ruby executable to nixpkgs, popular examples would be
-`chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp`
-function, that allows you to make a package that only exposes the listed
-executables, otherwise the package may cause conflicts through common paths like
-`bin/rake` or `bin/bundler` that aren't meant to be used.
+A common task is to add a ruby executable to nixpkgs, popular examples would be `chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp` function, that allows you to make a package that only exposes the listed executables, otherwise the package may cause conflicts through common paths like `bin/rake` or `bin/bundler` that aren't meant to be used.
 
-The absolute easiest way to do that is to write a
-`Gemfile` along these lines:
+The absolute easiest way to do that is to write a `Gemfile` along these lines:
 
 ```ruby
 source 'https://rubygems.org' do
@@ -310,10 +227,7 @@ source 'https://rubygems.org' do
 end
 ```
 
-If you want to package a specific version, you can use the standard Gemfile
-syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable
-version anyway, it's easier to update by simply running the `bundle lock` and
-`bundix` steps again.
+If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by simply running the `bundle lock` and `bundix` steps again.
 
 Now you can also also make a `default.nix` that looks like this:
 
@@ -327,20 +241,15 @@ bundlerApp {
 }
 ```
 
-All that's left to do is to generate the corresponding `Gemfile.lock` and
-`gemset.nix` as described above in the `Using an existing Gemfile` section.
+All that's left to do is to generate the corresponding `Gemfile.lock` and `gemset.nix` as described above in the `Using an existing Gemfile` section.
 
 #### Packaging executables that require wrapping
 
-Sometimes your app will depend on other executables at runtime, and tries to
-find it through the `PATH` environment variable.
+Sometimes your app will depend on other executables at runtime, and tries to find it through the `PATH` environment variable.
 
-In this case, you can provide a `postBuild` hook to `bundlerApp` that wraps the
-gem in another script that prefixes the `PATH`.
+In this case, you can provide a `postBuild` hook to `bundlerApp` that wraps the gem in another script that prefixes the `PATH`.
 
-Of course you could also make a custom `gemConfig` if you know exactly how to
-patch it, but it's usually much easier to maintain with a simple wrapper so the
-patch doesn't have to be adjusted for each version.
+Of course you could also make a custom `gemConfig` if you know exactly how to patch it, but it's usually much easier to maintain with a simple wrapper so the patch doesn't have to be adjusted for each version.
 
 Here's another example:
 
diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
deleted file mode 100644
index 9b579d6804f4..000000000000
--- a/doc/languages-frameworks/ruby.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="sec-language-ruby">
- <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>
-  For example, to package sensu, we did:
- </para>
-
-<screen>
-<prompt>$ </prompt>cd pkgs/servers/monitoring
-<prompt>$ </prompt>mkdir sensu
-<prompt>$ </prompt>cd sensu
-<prompt>$ </prompt>cat > Gemfile
-source 'https://rubygems.org'
-gem 'sensu'
-<prompt>$ </prompt>$(nix-build '&lt;nixpkgs>' -A bundix --no-out-link)/bin/bundix --magic
-<prompt>$ </prompt>cat > default.nix
-{ lib, bundlerEnv, ruby }:
-
-bundlerEnv rec {
-  name = "sensu-${version}";
-
-  version = (import gemset).sensu.version;
-  inherit ruby;
-  # expects Gemfile, Gemfile.lock and gemset.nix in the same directory
-  gemdir = ./.;
-
-  meta = with lib; {
-    description = "A monitoring framework that aims to be simple, malleable, and scalable";
-    homepage    = "http://sensuapp.org/";
-    license     = with licenses; mit;
-    maintainers = with maintainers; [ theuni ];
-    platforms   = platforms.unix;
-  };
-}
-</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>
-  Updating Ruby packages can then be done like this:
- </para>
-
-<screen>
-<prompt>$ </prompt>cd pkgs/servers/monitoring/sensu
-<prompt>$ </prompt>nix-shell -p bundler --run 'bundle lock --update'
-<prompt>$ </prompt>nix-shell -p bundix --run 'bundix'
-</screen>
-
- <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>
-
-<programlisting>
-<![CDATA[{ lib, bundlerApp }:
-
-bundlerApp {
-  pname = "corundum";
-  gemdir = ./.;
-  exes = [ "corundum-skel" ];
-
-  meta = with lib; {
-    description = "Tool and libraries for maintaining Ruby gems.";
-    homepage    = "https://github.com/nyarly/corundum";
-    license     = licenses.mit;
-    maintainers = [ maintainers.nyarly ];
-    platforms   = platforms.unix;
-  };
-}]]>
-</programlisting>
-
- <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>
-
-<programlisting>
-<![CDATA[let env = bundlerEnv {
-  name = "my-script-env";
-
-  inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
-};
-
-in stdenv.mkDerivation {
-  name = "my-script";
-  buildInputs = [ env.wrappedRuby ];
-  script = ./my-script.rb;
-  buildCommand = ''
-    install -D -m755 $script $out/bin/my-script
-    patchShebangs $out/bin/my-script
-  '';
-}]]>
-</programlisting>
-</section>

From 698111962ec18eff348cf660c01b4bebe945a1ce Mon Sep 17 00:00:00 2001
From: applePrincess <appleprincess@appleprincess.io>
Date: Sat, 28 Nov 2020 12:06:50 +0900
Subject: [PATCH 3908/3942] doc/python: Fix shebang link (#105196)

---
 doc/languages-frameworks/python.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 59f7389b9ad3..8a2fe2711c7a 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -153,7 +153,7 @@ The dot product of [1 2] and [3 4] is: 11
 But if we maintain the script ourselves, and if there are more dependencies, it
 may be nice to encode those dependencies in source to make the script re-usable
 without that bit of knowledge. That can be done by using `nix-shell` as a
-[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix), like so:
+[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)), like so:
 
 ```python
 #!/usr/bin/env nix-shell

From 2b4b716984acfbc6e2b07a2c6bb7a1a4faa88d1d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Nov 2020 03:34:56 +0000
Subject: [PATCH 3909/3942] haproxy: 2.3.0 -> 2.3.1

---
 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 80b135e524bf..2c1732007b55 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
 
 stdenv.mkDerivation rec {
   pname = "haproxy";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
-    sha256 = "1z3qzwm2brpi36kxhvw2xvm1ld9yz9c373rcixw3z21pw1cxrfh8";
+    sha256 = "0jyaxwgghvgd599acxr91hr2v4wyv3bd1j45k0gb4q2v58jz2fwd";
   };
 
   buildInputs = [ openssl zlib ]

From 258bbbfa4012a1c5d29dfb1003a951ae4e9b90fb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Nov 2020 04:20:53 +0000
Subject: [PATCH 3910/3942] gpxsee: 7.36 -> 7.37

---
 pkgs/applications/misc/gpxsee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 11b373ac1311..a081076ac83f 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "gpxsee";
-  version = "7.36";
+  version = "7.37";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "18vsw6hw6kn5wmr4iarhx1v8q455j60fhf0hq69jkfyarl56b99j";
+    sha256 = "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8";
   };
 
   patches = (substituteAll {

From 646355184687f606e81bb1c09064baf96000fd5b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Nov 2020 04:41:04 +0000
Subject: [PATCH 3911/3942] ipset: 7.7 -> 7.9

---
 pkgs/os-specific/linux/ipset/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix
index dada5c35f715..647e5e3597df 100644
--- a/pkgs/os-specific/linux/ipset/default.nix
+++ b/pkgs/os-specific/linux/ipset/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ipset";
-  version = "7.7";
+  version = "7.9";
 
   src = fetchurl {
     url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
-    sha256 = "0ckc678l1431mb0q5ilfgy0ajjwi8n135c72h606imm43dc0v9a5";
+    sha256 = "02mkp7vmsh609dcp02xi290sxmsgq2fsch3875dxkwfxkrl16p5p";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From f373212ee356e5c0cc0e6363afb834995fd43fad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Nov 2020 04:05:10 +0000
Subject: [PATCH 3912/3942] gnome3.gnome-initial-setup: 3.38.1 -> 3.38.2

---
 pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
index b4771641adb8..eba9ed1334f1 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
@@ -38,11 +38,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-initial-setup";
-  version = "3.38.1";
+  version = "3.38.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-5V1PQHOZjg+3s9/MRw4qTH2VCpa+2rFQEbkITryBNnY=";
+    hash = "sha256-qliJJ0+LC23moFErR3Qrgqw0ANrsgt1O/+LuonRko7g=";
   };
 
   nativeBuildInputs = [

From d97bc34f5541a0df81e5f97d592e34e14bdc1b42 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Nov 2020 04:14:11 +0000
Subject: [PATCH 3913/3942] gnome3.gnome-maps: 3.38.1.1 -> 3.38.2

---
 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 ffc9c7cb4437..47e03c0b0707 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-maps";
-  version = "3.38.1.1";
+  version = "3.38.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1y59afvfrylkikqd0ax0nj41zs6b54219l7k5bp5gzh9lxq06xgk";
+    sha256 = "0pa6h3md688752l7cjggncnxv13c07nj584gbz9asdblljk3r9x1";
   };
 
   doCheck = true;

From 5b48bc8aae913c00b91968c47999cec725656c36 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 28 Nov 2020 14:50:21 +1000
Subject: [PATCH 3914/3942] fix eval

---
 pkgs/development/compilers/muon/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/muon/default.nix b/pkgs/development/compilers/muon/default.nix
index 275e308235cd..2e178f775b6e 100644
--- a/pkgs/development/compilers/muon/default.nix
+++ b/pkgs/development/compilers/muon/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "Modern low-level programming language";
     homepage = "https://github.com/nickmqb/muon";
     license = licenses.mit;
-    maintainers = with maintainers; [ filalex77 ];
+    maintainers = with maintainers; [ Br1ght0ne ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 57bd035ca68839f8dd7ff23870f35b1137398cf4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Nov 2020 05:03:25 +0000
Subject: [PATCH 3915/3942] ircdHybrid: 8.2.24 -> 8.2.35

---
 pkgs/servers/irc/ircd-hybrid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index 5499d2bb8cb8..582bf94b0de9 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "ircd-hybrid-8.2.24";
+  name = "ircd-hybrid-8.2.35";
 
   src = fetchurl {
     url = "mirror://sourceforge/ircd-hybrid/${name}.tgz";
-    sha256 = "03nmzrhqfsxwry316nm80m9p285v65fz75ns7fg623hcy65jv97a";
+    sha256 = "045wd3wa4i1hl7i4faksaj8l5r70ld55bggryaf1ml28ijwjwpca";
   };
 
   buildInputs = [ openssl zlib ];

From 1d1ae0f8a7219f4da805d6f6983865b8ee89ee5d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Nov 2020 05:33:01 +0000
Subject: [PATCH 3916/3942] jamulus: 3.6.0 -> 3.6.1

---
 pkgs/applications/audio/jamulus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix
index 1839aa9c7ada..4cc48b89f9c4 100644
--- a/pkgs/applications/audio/jamulus/default.nix
+++ b/pkgs/applications/audio/jamulus/default.nix
@@ -3,12 +3,12 @@
 
 mkDerivation rec {
   pname = "jamulus";
-  version = "3.6.0";
+  version = "3.6.1";
   src = fetchFromGitHub {
     owner = "corrados";
     repo = "jamulus";
     rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "06x9b2kjsgk8kddhif0x59nwzhnwjmq40x3w5nrphqaimqlrhlcf";
+    sha256 = "11rwgd2car7ziqa0vancb363m4ca94pj480jfxywd6d81139jl15";
   };
 
   nativeBuildInputs = [ pkg-config qmake ];

From 5df56b087d59b62cadb8e3e70f3c2ba87dac0e98 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Nov 2020 05:54:25 +0000
Subject: [PATCH 3917/3942] jetty: 9.4.34.v20201102 -> 9.4.35.v20201120

---
 pkgs/servers/http/jetty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index b8374d62ddfc..72e6c00278a4 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jetty";
-  version = "9.4.34.v20201102";
+  version = "9.4.35.v20201120";
   src = fetchurl {
     url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
     name = "jetty-distribution-${version}.tar.gz";
-    sha256 = "0c5zsnzcg2bz6z1s6hdzwzn813cgs26h1hwjjfhh1msfzyig30ma";
+    sha256 = "1cpdrqz6wi7fd228lh4ijs82jq51qr5aym6vff464w3y2sd0jbav";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From 80b395015b7813cd9adf3ae2d50db15453485bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 26 Nov 2020 12:31:42 +0100
Subject: [PATCH 3918/3942] doc/go: convert to markdown

---
 doc/languages-frameworks/go.section.md | 140 ++++++++++++++
 doc/languages-frameworks/go.xml        | 248 -------------------------
 doc/languages-frameworks/index.xml     |   2 +-
 3 files changed, 141 insertions(+), 249 deletions(-)
 create mode 100644 doc/languages-frameworks/go.section.md
 delete mode 100644 doc/languages-frameworks/go.xml

diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md
new file mode 100644
index 000000000000..b4228d9d313d
--- /dev/null
+++ b/doc/languages-frameworks/go.section.md
@@ -0,0 +1,140 @@
+# Go {#sec-language-go}
+
+## Go modules {#ssec-language-go}
+
+The function `buildGoModule` builds Go programs managed with Go modules. It builds a [Go Modules](https://github.com/golang/go/wiki/Modules) through a two phase build:
+
+- An intermediate fetcher derivation. This derivation will be used to fetch all of the dependencies of the Go module.
+- A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output.
+
+### Example for `buildGoModule` {#ex-buildGoModule}
+
+In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function:
+
+- `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;`
+- `runVend`: runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build.
+
+```nix
+pet = buildGoModule rec {
+  pname = "pet";
+  version = "0.3.4";
+
+  src = fetchFromGitHub {
+    owner = "knqyf263";
+    repo = "pet";
+    rev = "v${version}";
+    sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s";
+  };
+
+  vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j";
+
+  runVend = true;
+
+  meta = with lib; {
+    description = "Simple command-line snippet manager, written in Go";
+    homepage = "https://github.com/knqyf263/pet";
+    license = licenses.mit;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
+```
+
+## `buildGoPackage` (legacy) {#ssec-go-legacy}
+
+The function `buildGoPackage` builds legacy Go programs, not supporting Go modules.
+
+### Example for `buildGoPackage`
+
+In the following is an example expression using buildGoPackage, the following arguments are of special significance to the function:
+
+- `goPackagePath` specifies the package's canonical Go import path.
+- `goDeps` 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 `deps.nix` file for readability. The dependency data structure is described below.
+
+```nix
+deis = buildGoPackage rec {
+  pname = "deis";
+  version = "1.13.0";
+
+  goPackagePath = "github.com/deis/deis";
+
+  src = fetchFromGitHub {
+    owner = "deis";
+    repo = "deis";
+    rev = "v${version}";
+    sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw";
+  };
+
+  goDeps = ./deps.nix;
+}
+```
+
+The `goDeps` attribute can be imported from a separate `nix` file that defines which Go libraries are needed and should be included in `GOPATH` for `buildPhase`:
+
+```nix
+# deps.nix
+[ # goDeps is a list of Go dependencies.
+  {
+    # goPackagePath specifies Go package import path.
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      # `fetch type` that needs to be used to get package source.
+      # If `git` is used there should be `url`, `rev` and `sha256` defined next to it.
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
+      sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
+    };
+  }
+  {
+    goPackagePath = "github.com/docopt/docopt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docopt/docopt-go";
+      rev = "784ddc588536785e7299f7272f39101f7faccc3f";
+      sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj";
+    };
+  }
+]
+```
+
+To extract dependency information from a Go package in automated way use [go2nix](https://github.com/kamilchm/go2nix). It can produce complete derivation and `goDeps` file for Go programs.
+
+You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc:
+
+```bash
+for p in $NIX_PROFILES; do
+    GOPATH="$p/share/go:$GOPATH"
+done
+```
+
+## Attributes used by the builders {#ssec-go-common-attributes}
+
+Both `buildGoModule` and `buildGoPackage` can be tweaked to behave slightly differently, if the following attributes are used:
+
+### `buildFlagsArray` and `buildFlags`: {#ex-goBuildFlags-noarray}
+
+These attributes set build flags supported by `go build`. We recommend using `buildFlagsArray`. The most common use case of these attributes is to make the resulting executable aware of its own version. For example:
+
+```nix
+  buildFlagsArray = [
+    # Note: single quotes are not needed.
+    "-ldflags=-X main.Version=${version} -X main.Commit=${version}"
+  ];
+```
+
+```nix
+  buildFlagsArray = ''
+    -ldflags=
+    -X main.Version=${version}
+    -X main.Commit=${version}
+  '';
+```
+
+### `deleteVendor` {#var-go-deleteVendor}
+
+Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete.
+
+### `subPackages` {#var-go-subPackages}
+
+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.
diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
deleted file mode 100644
index ebdcf616054c..000000000000
--- a/doc/languages-frameworks/go.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="sec-language-go">
- <title>Go</title>
-
- <section xml:id="ssec-go-modules">
-  <title>Go modules</title>
-
-  <para>
-   The function <varname> buildGoModule </varname> builds Go programs managed with Go modules. It builds a <link xlink:href="https://github.com/golang/go/wiki/Modules">Go modules</link> through a two phase build:
-   <itemizedlist>
-    <listitem>
-     <para>
-      An intermediate fetcher derivation. This derivation will be used to fetch all of the dependencies of the Go module.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output.
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
-
-  <example xml:id='ex-buildGoModule'>
-   <title>buildGoModule</title>
-<programlisting>
-pet = buildGoModule rec {
-  pname = "pet";
-  version = "0.3.4";
-
-  src = fetchFromGitHub {
-    owner = "knqyf263";
-    repo = "pet";
-    rev = "v${version}";
-    sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s";
-  };
-
-  vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; <co xml:id='ex-buildGoModule-1' />
-
-  runVend = true; <co xml:id='ex-buildGoModule-2' />
-
-  meta = with lib; {
-    description = "Simple command-line snippet manager, written in Go";
-    homepage = "https://github.com/knqyf263/pet";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kalbasit ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
-</programlisting>
-  </example>
-
-  <para>
-   <xref linkend='ex-buildGoModule'/> is an example expression using buildGoModule, the following arguments are of special significance to the function:
-   <calloutlist>
-    <callout arearefs='ex-buildGoModule-1'>
-     <para>
-      <varname>vendorSha256</varname> is the hash of the output of the intermediate fetcher derivation.
-     </para>
-    </callout>
-    <callout arearefs='ex-buildGoModule-2'>
-     <para>
-      <varname>runVend</varname> runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build.
-     </para>
-    </callout>
-   </calloutlist>
-  </para>
-
-  <para>
-   <varname>vendorSha256</varname> can also take <varname>null</varname> as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set 'vendorSha256 = null;'
-  </para>
- </section>
-
- <section xml:id="ssec-go-legacy">
-  <title>Go legacy</title>
-
-  <para>
-   The function <varname> buildGoPackage </varname> builds legacy Go programs, not supporting Go modules.
-  </para>
-
-  <example xml:id='ex-buildGoPackage'>
-   <title>buildGoPackage</title>
-<programlisting>
-deis = buildGoPackage rec {
-  pname = "deis";
-  version = "1.13.0";
-
-  goPackagePath = "github.com/deis/deis"; <co xml:id='ex-buildGoPackage-1' />
-
-  src = fetchFromGitHub {
-    owner = "deis";
-    repo = "deis";
-    rev = "v${version}";
-    sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw";
-  };
-
-  goDeps = ./deps.nix; <co xml:id='ex-buildGoPackage-2' />
-}
-</programlisting>
-  </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>
-      <varname>goPackagePath</varname> specifies the package's canonical Go import path.
-     </para>
-    </callout>
-    <callout arearefs='ex-buildGoPackage-2'>
-     <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.
-     </para>
-    </callout>
-   </calloutlist>
-  </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>
-<programlisting>
-[ <co xml:id='ex-goDeps-1' />
-  {
-    goPackagePath = "gopkg.in/yaml.v2"; <co xml:id='ex-goDeps-2' />
-    fetch = {
-      type = "git"; <co xml:id='ex-goDeps-3' />
-      url = "https://gopkg.in/yaml.v2";
-      rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
-      sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
-    };
-  }
-  {
-    goPackagePath = "github.com/docopt/docopt-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docopt/docopt-go";
-      rev = "784ddc588536785e7299f7272f39101f7faccc3f";
-      sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj";
-    };
-  }
-]
-</programlisting>
-  </example>
-
-  <para>
-   <calloutlist>
-    <callout arearefs='ex-goDeps-1'>
-     <para>
-      <varname>goDeps</varname> is a list of Go dependencies.
-     </para>
-    </callout>
-    <callout arearefs='ex-goDeps-2'>
-     <para>
-      <varname>goPackagePath</varname> specifies Go package import path.
-     </para>
-    </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.
-     </para>
-    </callout>
-   </calloutlist>
-  </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>
-   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>
- </section>
-
- <section xml:id="ssec-go-common-attributes">
-  <title>Attributes used by the builders</title>
-
-  <para>
-   Both <link xlink:href="#ssec-go-modules"><varname>buildGoModule</varname></link> and <link xlink:href="#ssec-go-modules"><varname>buildGoPackage</varname></link> can be tweaked to behave slightly differently, if the following attributes are used:
-  </para>
-
-  <variablelist>
-   <varlistentry xml:id="var-go-buildFlagsArray">
-    <term>
-     <varname>buildFlagsArray</varname> and <varname>buildFlags</varname>
-    </term>
-    <listitem>
-     <para>
-      These attributes set build flags supported by <varname>go build</varname>. We recommend using <varname>buildFlagsArray</varname>. The most common use case of these attributes is to make the resulting executable aware of its own version. For example:
-     </para>
-     <example xml:id='ex-goBuildFlags-nospaces'>
-      <title>buildFlagsArray</title>
-<programlisting>
-  buildFlagsArray = [
-    "-ldflags=-X main.Version=${version} -X main.Commit=${version}" <co xml:id='ex-goBuildFlags-1' />
-  ];
-</programlisting>
-     </example>
-     <calloutlist>
-      <callout arearefs='ex-goBuildFlags-1'>
-       <para>
-        Note: single quotes are not needed.
-       </para>
-      </callout>
-     </calloutlist>
-     <example xml:id='ex-goBuildFlags-noarray'>
-      <title>buildFlagsArray</title>
-<programlisting>
-  buildFlagsArray = ''
-    -ldflags=
-    -X main.Version=${version}
-    -X main.Commit=${version}
-  '';
-</programlisting>
-     </example>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="var-go-deleteVendor">
-    <term>
-     <varname>deleteVendor</varname>
-    </term>
-    <listitem>
-     <para>
-      Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="var-go-subPackages">
-    <term>
-     <varname>subPackages</varname>
-    </term>
-    <listitem>
-     <para>
-      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>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </section>
-</section>
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 3366108cd938..7347de4f7048 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -13,7 +13,7 @@
  <xi:include href="crystal.section.xml" />
  <xi:include href="emscripten.section.xml" />
  <xi:include href="gnome.xml" />
- <xi:include href="go.xml" />
+ <xi:include href="go.section.xml" />
  <xi:include href="haskell.section.xml" />
  <xi:include href="idris.section.xml" />
  <xi:include href="ios.section.xml" />

From e5f757954a2602cd145c6fc158eeae46718187bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Nov 2020 06:51:19 +0000
Subject: [PATCH 3919/3942] jmol: 14.31.17 -> 14.31.18

---
 pkgs/applications/science/chemistry/jmol/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index 9adb8e3674b8..e09abccad121 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,14 +17,14 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "14.31.17";
+  version = "14.31.18";
   pname = "jmol";
 
   src = let
     baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
   in fetchurl {
     url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    sha256 = "1cg3a56bbvlq5wfjgwclg9vsj61kmj6fnqvgf7fdvklhdvnijla2";
+    sha256 = "0hkc7c08azbw3k91ygwz6r5y4yw6k8l7h4gcq5p71knd5k1fa5jd";
   };
 
   patchPhase = ''

From 2356095b78ddb928ef3e0eafa1b6e180ba2ec13b Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 20:43:18 +0100
Subject: [PATCH 3920/3942] manim: migrate to Python38

---
 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 4b35894772de..cdc31afd9ceb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21424,8 +21424,8 @@ in
 
   m32edit = callPackage ../applications/audio/midas/m32edit.nix {};
 
-  manim = python37Packages.callPackage ../applications/video/manim {
-    opencv = python37Packages.opencv3;
+  manim = python3Packages.callPackage ../applications/video/manim {
+    opencv = python3Packages.opencv3;
   };
 
   manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };

From fed997f561dfa7f22a4fe2df42168d767efc5d09 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 20:44:39 +0100
Subject: [PATCH 3921/3942] html5validator: migrate to Python38

---
 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 cdc31afd9ceb..9457ce295e98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -210,7 +210,7 @@ in
 
   hobbes = callPackage ../development/tools/hobbes { };
 
-  html5validator = python36Packages.callPackage ../applications/misc/html5validator { };
+  html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
 
   proto-contrib = callPackage ../development/tools/proto-contrib {};
 

From a35390d92b32a708390f52fde0e8bb888b2af473 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 21:00:39 +0100
Subject: [PATCH 3922/3942] azure-cli: migrate to Python38

---
 pkgs/tools/admin/azure-cli/default.nix | 8 +++++---
 pkgs/top-level/all-packages.nix        | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index 820fef1a74aa..dbd8de5fe55a 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, python, fetchFromGitHub, installShellFiles }:
+{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
 
 let
   version = "2.14.2";
@@ -10,12 +10,14 @@ let
   };
 
   # put packages that needs to be overriden in the py package scope
-  py = import ./python-packages.nix { inherit stdenv python lib src version; };
+  py = import ./python-packages.nix {
+    inherit stdenv lib src version;
+    python = python3;
+  };
 in
 py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
   pname = "azure-cli";
   inherit version src;
-  disabled = python.isPy27; # namespacing assumes PEP420, which isn't compat with py2
 
   sourceRoot = "source/src/azure-cli";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9457ce295e98..c38e68e1a3c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -944,7 +944,7 @@ in
 
   iamy = callPackage ../tools/admin/iamy { };
 
-  azure-cli = callPackage ../tools/admin/azure-cli { python = python37; };
+  azure-cli = callPackage ../tools/admin/azure-cli { };
 
   azure-storage-azcopy = callPackage ../development/tools/azcopy { };
 

From 3e8e10ab4f2fb651bb40707e9efe83c7b8d7ffd5 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 21:56:05 +0100
Subject: [PATCH 3923/3942] precice: migrate to Python38

---
 pkgs/development/libraries/precice/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix
index f0064dbd3623..e8ae15ed31f4 100644
--- a/pkgs/development/libraries/precice/default.nix
+++ b/pkgs/development/libraries/precice/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     "-DPRECICE_PETScMapping=OFF"
     "-DBUILD_SHARED_LIBS=ON"
     "-DPYTHON_LIBRARIES=${python3.libPrefix}"
-    "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}m"
+    "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
   ];
 
   NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c38e68e1a3c5..2f10898539d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2508,7 +2508,7 @@ in
 
   psstop = callPackage ../tools/system/psstop { };
 
-  precice = callPackage ../development/libraries/precice { python3 = python37; };
+  precice = callPackage ../development/libraries/precice { };
 
   pueue = callPackage ../applications/misc/pueue { };
 

From d47bd890e7d29f922a06704301b57dfcfc6ff1ef Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 13 Nov 2020 21:56:29 +0100
Subject: [PATCH 3924/3942] syncplay: migrate to Python38

---
 pkgs/top-level/all-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f10898539d6..d06e1d7f9e44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23934,8 +23934,7 @@ in
 
   symlinks = callPackage ../tools/system/symlinks { };
 
-  # this can be changed to python3 once pyside2 is updated to support the latest python version
-  syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { };
+  syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { };
 
   inherit (callPackages ../applications/networking/syncthing { })
     syncthing

From abfbb842b5e6a2301d0df5bc74d4a4cec022ae32 Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Tue, 24 Nov 2020 16:44:33 +0100
Subject: [PATCH 3925/3942] fixup sam

---
 pkgs/development/tools/aws-sam-cli/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
index f123aa79a107..52b1a26d8143 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -1,11 +1,11 @@
 { fetchFromGitHub
 , lib
-, python
+, python3
 , enableTelemetry ? false
 }:
 
 let
-  py = python.override {
+  py = python3.override {
     packageOverrides = self: super: {
       flask = super.flask.overridePythonAttrs (oldAttrs: rec {
         version = "1.0.2";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d06e1d7f9e44..fefdf4746ef9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -938,7 +938,7 @@ in
 
   aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { };
 
-  aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; };
+  aws-sam-cli = callPackage ../development/tools/aws-sam-cli { };
 
   aws-vault = callPackage ../tools/admin/aws-vault { };
 

From d6dfd173f93c8cb48e250627ac967cfca10385e1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 21 Nov 2020 09:01:01 +0100
Subject: [PATCH 3926/3942] =?UTF-8?q?ocamlPackages.rpclib:=207.0.0=20?=
 =?UTF-8?q?=E2=86=92=208.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ppx_deriving_rpc/default.nix              | 11 ++++++----
 .../ocaml-modules/rpclib/default.nix          | 22 ++++++++++---------
 pkgs/top-level/ocaml-packages.nix             |  4 +---
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
index 92d73e540f48..b7d1986c30d4 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
@@ -1,13 +1,16 @@
-{ lib, buildDunePackage, rpclib, ppxlib, ppx_deriving }:
+{ lib, buildDunePackage, rpclib, alcotest, ppxlib, ppx_deriving, yojson }:
 
 buildDunePackage rec {
   pname = "ppx_deriving_rpc";
 
-  inherit (rpclib) version src;
+  inherit (rpclib) version useDune2 src;
 
-  buildInputs = [ ppxlib ];
+  minimumOCamlVersion = "4.08";
 
-  propagatedBuildInputs = [ rpclib ppx_deriving ];
+  propagatedBuildInputs = [ ppxlib rpclib ppx_deriving ];
+
+  checkInputs = [ alcotest yojson ];
+  doCheck = true;
 
   meta = with lib; {
     homepage = "https://github.com/mirage/ocaml-rpc";
diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/pkgs/development/ocaml-modules/rpclib/default.nix
index 9216a489248b..53b559257bec 100644
--- a/pkgs/development/ocaml-modules/rpclib/default.nix
+++ b/pkgs/development/ocaml-modules/rpclib/default.nix
@@ -1,20 +1,22 @@
-{ lib, fetchFromGitHub, buildDunePackage, alcotest, cmdliner, rresult, result, xmlm, yojson }:
+{ lib, fetchurl, buildDunePackage
+, alcotest
+, base64, cmdliner, rresult, xmlm, yojson
+}:
 
 buildDunePackage rec {
   pname = "rpclib";
-  version = "7.0.0";
+  version = "8.0.0";
 
-  minimumOCamlVersion = "4.04";
+  useDune2 = true;
 
-  src = fetchFromGitHub {
-    owner = "mirage";
-    repo = "ocaml-rpc";
-    rev = "v${version}";
-    sha256 = "0d8nb272mjxkq5ddn65cy9gjpa8yvd0v3jv3wp5xfh9gj29wd2jj";
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-rpc/releases/download/v${version}/rpclib-v${version}.tbz";
+    sha256 = "1kqbixk4d9y15ns566fiyzid5jszkamm1kv7iks71invv33v7krz";
   };
 
-  buildInputs = [ alcotest cmdliner yojson ];
-  propagatedBuildInputs = [ rresult result xmlm ];
+  buildInputs = [ cmdliner yojson ];
+  propagatedBuildInputs = [ base64 rresult xmlm ];
+  checkInputs = [ alcotest ];
 
   doCheck = true;
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5e4f350099a6..316666ca6d8d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -878,9 +878,7 @@ let
 
     ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {};
 
-    ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc {
-      ppxlib = ppxlib.override { legacy = true; };
-    };
+    ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { };
 
     ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};
 

From 8256fc2da56b573411144030c48812c12798676b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 21 Nov 2020 09:01:06 +0100
Subject: [PATCH 3927/3942] ocamlPackages.rpclib-lwt: init at 8.0.0

---
 pkgs/development/ocaml-modules/rpclib/lwt.nix | 18 ++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/rpclib/lwt.nix

diff --git a/pkgs/development/ocaml-modules/rpclib/lwt.nix b/pkgs/development/ocaml-modules/rpclib/lwt.nix
new file mode 100644
index 000000000000..49f718474980
--- /dev/null
+++ b/pkgs/development/ocaml-modules/rpclib/lwt.nix
@@ -0,0 +1,18 @@
+{ lib, buildDunePackage, rpclib
+, lwt
+, alcotest-lwt, ppx_deriving_rpc, yojson
+}:
+
+buildDunePackage {
+  pname = "rpclib-lwt";
+  inherit (rpclib) version useDune2 src;
+
+  propagatedBuildInputs = [ lwt rpclib ];
+
+  checkInputs = [ alcotest-lwt ppx_deriving_rpc yojson ];
+  doCheck = true;
+
+  meta = rpclib.meta // {
+    description = "A library to deal with RPCs in OCaml - Lwt interface";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 316666ca6d8d..a72b52180705 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -936,6 +936,8 @@ let
 
     rpclib = callPackage ../development/ocaml-modules/rpclib { };
 
+    rpclib-lwt = callPackage ../development/ocaml-modules/rpclib/lwt.nix { };
+
     rresult = callPackage ../development/ocaml-modules/rresult { };
 
     safepass = callPackage ../development/ocaml-modules/safepass { };

From 56b9f8c4b38af141617c79481bddca54df042124 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 25 Nov 2020 15:38:34 +0100
Subject: [PATCH 3928/3942] ocamlPackages.lwt: use ocaml-migrate-parsetree
 2.1.0

---
 pkgs/top-level/ocaml-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a72b52180705..f35577c2b6f0 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -493,7 +493,9 @@ let
 
     lua-ml = callPackage ../development/ocaml-modules/lua-ml { };
 
-    lwt = callPackage ../development/ocaml-modules/lwt { };
+    lwt = callPackage ../development/ocaml-modules/lwt {
+      ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1;
+    };
 
     ocaml_lwt = lwt;
 

From 50898b3b071acc3009d124a0be3e18d080a10a3c Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 25 Nov 2020 15:38:45 +0100
Subject: [PATCH 3929/3942] ocamlPackages.ocaml-monadic: use
 ocaml-migrate-parsetree 2.1.0

---
 pkgs/top-level/ocaml-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f35577c2b6f0..ac48ade7206c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -672,7 +672,9 @@ let
 
     ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };
 
-    ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { };
+    ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic {
+      ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1;
+    };
 
     ocaml_mysql = callPackage ../development/ocaml-modules/mysql { };
 

From 78d2aa55ef3e473291b9d2addeeefadb54c4d70b Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 25 Nov 2020 15:39:00 +0100
Subject: [PATCH 3930/3942] ocamlPackages.sqlexpr: use ocaml-migrate-parsetree
 2.1.0

---
 pkgs/top-level/ocaml-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ac48ade7206c..c7d805d4c742 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -820,7 +820,9 @@ let
 
     spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
 
-    sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { };
+    sqlexpr = callPackage ../development/ocaml-modules/sqlexpr {
+      ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1;
+    };
 
     tsort = callPackage ../development/ocaml-modules/tsort { };
 

From 6771aa309328f5d46295d829ed24149b34e77e16 Mon Sep 17 00:00:00 2001
From: Graham Bennett <graham@grahambennett.org>
Date: Sat, 28 Nov 2020 10:25:13 +0100
Subject: [PATCH 3931/3942] doc: clarify whitelistedLicenses

see the following for more info:
https://github.com/NixOS/nixpkgs/blob/076860e0340a5e4a909b9a710e186508b14d1c90/pkgs/stdenv/generic/check-meta.nix#L229
---
 doc/using/configuration.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml
index 3e21b0e22843..336bdf5b2656 100644
--- a/doc/using/configuration.xml
+++ b/doc/using/configuration.xml
@@ -169,6 +169,9 @@
 }
 </programlisting>
     </para>
+    <para>
+      Note that <literal>whitelistedLicenses</literal> only applies to unfree licenses unless <literal>allowUnfree</literal> is enabled. It is not a generic whitelist for all types of licenses. <literal>blacklistedLicenses</literal> applies to all licenses.
+    </para>
    </listitem>
   </itemizedlist>
 

From 757ab447015123013fcbd0422b1317c18e0704bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Nov 2020 10:30:28 +0000
Subject: [PATCH 3932/3942] libavif: 0.8.3 -> 0.8.4

---
 pkgs/development/libraries/libavif/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix
index 09456433c1ac..25422c8b7d90 100644
--- a/pkgs/development/libraries/libavif/default.nix
+++ b/pkgs/development/libraries/libavif/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libavif";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "AOMediaCodec";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1d6ql4vq338dvz61d5im06dh8m9rqfk37f9i356j3njpq604i1f6";
+    sha256 = "1qvjd3xi9r89pcblxdgz4c6hqp67ss53b1x9zkg7lrik7g3lwq8d";
   };
 
   # reco: encode libaom slowest but best, decode dav1d fastest

From c3f2f8ff1cdb109d27c20b2706ad9e6340a31e52 Mon Sep 17 00:00:00 2001
From: nyanotech <nyanotechnology@gmail.com>
Date: Sat, 28 Nov 2020 14:28:47 +0000
Subject: [PATCH 3933/3942] factorio-experimental,
 factorio-headless-experimental: 1.1.1 -> 1.1.2

---
 pkgs/games/factorio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 07361f1c7428..f5f12b47dd72 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -63,11 +63,11 @@ let
     x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
       alpha = {
         stable        = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; };
-        experimental  = bdist { sha256 = "0z7krilzk91sblik2i9lvsifwq9j5j6jv7jhmndkz4qmp845w1ax"; version = "1.1.1"; withAuth = true; };
+        experimental  = bdist { sha256 = "0cmia16d5dhy3f8mck926d7rrnavxmvb6a72ymjllxm37slsx60j"; version = "1.1.2"; withAuth = true; };
       };
       headless = {
         stable        = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; };
-        experimental  = bdist { sha256 = "1nb9w876dij3ar14s5y96k04nbh9i4a7rggbbck5xmr7pa6snqx4"; version = "1.1.1"; };
+        experimental  = bdist { sha256 = "0x3lwz11z8cczqr5i799m4yg8x3yk6h5qz48pfzw4l2ikrrwgahd"; version = "1.1.2"; };
       };
       demo = {
         stable        = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; };

From cce2fd547be73f6a709d86751b67e9ae798f5d46 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 27 Nov 2020 16:24:42 +0100
Subject: [PATCH 3934/3942] Python: use pythonPackagesBuildHost instead of
 pythonForBuild

Follow-up to #104201, related to #105113.
---
 .../interpreters/python/cpython/2.7/default.nix | 11 ++++++-----
 .../interpreters/python/cpython/default.nix     | 11 +++++------
 .../development/interpreters/python/default.nix |  8 ++++----
 .../interpreters/python/pypy/default.nix        | 17 +++++++++++------
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 26bd8a8f3609..d7bc50948590 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -18,8 +18,8 @@
 , ucsEncoding ? 4
 # For the Python package set
 , packageOverrides ? (self: super: {})
-, buildPackages
 , pkgsBuildBuild
+, pkgsBuildHost
 , pkgsBuildTarget
 , pkgsHostHost
 , pkgsTargetTarget
@@ -28,6 +28,7 @@
 , passthruFun
 , static ? false
 , enableOptimizations ? (!stdenv.isDarwin)
+, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
 }:
 
 assert x11Support -> tcl != null
@@ -38,9 +39,8 @@ assert x11Support -> tcl != null
 with stdenv.lib;
 
 let
-
-  pythonAttr = "python${sourceVersion.major}${sourceVersion.minor}";
-  pythonForBuild = buildPackages.${pythonAttr};
+  buildPackages = pkgsBuildHost;
+  inherit (passthru) pythonForBuild;
 
   passthru = passthruFun rec {
     inherit self sourceVersion packageOverrides;
@@ -49,8 +49,9 @@ let
     executable = libPrefix;
     pythonVersion = with sourceVersion; "${major}.${minor}";
     sitePackages = "lib/${libPrefix}/site-packages";
-    inherit hasDistutilsCxxPatch pythonForBuild;
+    inherit hasDistutilsCxxPatch;
     pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
+    pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr};
     pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
     pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
     pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 02777063a772..5e7668deea39 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -19,12 +19,11 @@
 , nukeReferences
 # For the Python package set
 , packageOverrides ? (self: super: {})
-, buildPackages
 , pkgsBuildBuild
+, pkgsBuildHost
 , pkgsBuildTarget
 , pkgsHostHost
 , pkgsTargetTarget
-, pythonForBuild ? buildPackages.${pythonAttr}
 , sourceVersion
 , sha256
 , passthruFun
@@ -58,7 +57,8 @@ assert bluezSupport -> bluez != null;
 with stdenv.lib;
 
 let
-
+  buildPackages = pkgsBuildHost;
+  inherit (passthru) pythonForBuild;
 
   passthru = passthruFun rec {
     inherit self sourceVersion packageOverrides;
@@ -67,8 +67,9 @@ let
     executable = libPrefix;
     pythonVersion = with sourceVersion; "${major}.${minor}";
     sitePackages = "lib/${libPrefix}/site-packages";
-    inherit hasDistutilsCxxPatch pythonForBuild;
+    inherit hasDistutilsCxxPatch;
     pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
+    pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr};
     pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
     pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
     pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
@@ -95,8 +96,6 @@ let
 
   hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
 
-  inherit pythonForBuild;
-
   pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then
     "$out/bin/python"
   else pythonForBuild.interpreter;
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 19a7f44de369..876cfd20fb9e 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -15,7 +15,7 @@ with pkgs;
     , sitePackages
     , hasDistutilsCxxPatch
     , pythonPackagesBuildBuild
-    , pythonForBuild # provides pythonPackagesBuildHost
+    , pythonPackagesBuildHost
     , pythonPackagesBuildTarget
     , pythonPackagesHostHost
     , self # is pythonPackagesHostTarget
@@ -29,7 +29,7 @@ with pkgs;
           };
           otherSplices = {
             selfBuildBuild = pythonPackagesBuildBuild;
-            selfBuildHost = pythonForBuild.pkgs;
+            selfBuildHost = pythonPackagesBuildHost;
             selfBuildTarget = pythonPackagesBuildTarget;
             selfHostHost = pythonPackagesHostHost;
             selfTargetTarget = pythonPackagesTargetTarget;
@@ -99,7 +99,8 @@ with pkgs;
         inherit sourceVersion;
         pythonAtLeast = lib.versionAtLeast pythonVersion;
         pythonOlder = lib.versionOlder pythonVersion;
-        inherit hasDistutilsCxxPatch pythonForBuild;
+        inherit hasDistutilsCxxPatch;
+        pythonForBuild = pythonPackagesBuildHost;
 
         tests = callPackage ./tests.nix {
           python = self;
@@ -188,7 +189,6 @@ in {
   # Minimal versions of Python (built without optional dependencies)
   python3Minimal = (python38.override {
     self = python3Minimal;
-    pythonForBuild = pkgs.buildPackages.python3Minimal;
     # strip down that python version as much as possible
     openssl = null;
     readline = null;
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 0647ce878642..b941750eb4e5 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -5,10 +5,16 @@
 , python-setup-hook
 # For the Python package set
 , packageOverrides ? (self: super: {})
+, pkgsBuildBuild
+, pkgsBuildHost
+, pkgsBuildTarget
+, pkgsHostHost
+, pkgsTargetTarget
 , sourceVersion
 , pythonVersion
 , sha256
 , passthruFun
+, pythonAttr ? "pypy${stdenv.lib.substring 0 1 pythonVersion}${stdenv.lib.substring 2 3 pythonVersion}"
 }:
 
 assert zlibSupport -> zlib != null;
@@ -25,12 +31,11 @@ let
     sitePackages = "site-packages";
     hasDistutilsCxxPatch = false;
 
-    # No cross-compiling for now.
-    pythonForBuild = self;
-    pythonPackagesBuildBuild = {};
-    pythonPackagesBuildTarget = {};
-    pythonPackagesHostHost = {};
-    pythonPackagesTargetTarget = {};
+    pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
+    pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr};
+    pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
+    pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
+    pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
   };
   pname = passthru.executable;
   version = with sourceVersion; "${major}.${minor}.${patch}";

From 8220b0449cffd3c97597aa187b36d05c1257f68b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 22 Nov 2020 13:17:19 +0100
Subject: [PATCH 3935/3942] python.tests: use self.callPackage instead of
 super.callPackage

super was incorrectly possible until https://github.com/NixOS/nixpkgs/pull/104201
got merged.
---
 .../interpreters/python/tests/test_nix_pythonprefix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix
index 05798cbaf1b8..572cbdccbfb2 100644
--- a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix
+++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix
@@ -4,7 +4,7 @@ let
 
   python = let
     packageOverrides = self: super: {
-      typeddep = super.callPackage ./typeddep {};
+      typeddep = self.callPackage ./typeddep {};
     };
   in interpreter.override {inherit packageOverrides; self = python;};
 

From 54e419e076ec95b4b083e0738f1b1bdaecb68343 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 28 Nov 2020 17:00:26 +0100
Subject: [PATCH 3936/3942] electron: 9.3.4 -> 9.3.5

---
 pkgs/development/tools/electron/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index d394103cb703..81178393c0e6 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -70,12 +70,12 @@ rec {
     aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5";
   };
 
-  electron_9 = mkElectron "9.3.4" {
-    x86_64-linux = "4791d854886cba4f461f37db41e6be1fbd8e41e7da01f215324f1fe19ad18ebf";
-    x86_64-darwin = "d6878093683ef901727d3b557f1ac928de86b7fffd2abd2c8315d0a9cfe20375";
-    i686-linux = "bd3cc9ddab3a9e54499f98e68b12f0aa30554c6527e1434b78743041aaae9417";
-    armv7l-linux = "1b175fe3e83494015714afb298b756187053dd84604746c60649a2abbb49ee36";
-    aarch64-linux = "626e4f79e9de57aef9e33f9788bf64375095ef43089eda6c6a87835ba58a7aa3";
+  electron_9 = mkElectron "9.3.5" {
+    x86_64-linux = "9db6610289a4e0ce39c71501384baef5a58dde24d947fdead577f2a6b59123aa";
+    x86_64-darwin = "d30aca66a0280a47284a3625d781c62fd0bb9b7f318bb05b8b34751ee14a3a78";
+    i686-linux = "b69614b1d34f9a98e182cc43bf8d35626038d300ee9fb886f7501dbb597c7e61";
+    armv7l-linux = "d929dabe7a83df232ec08b138ed2b0540b86e7dfa33f2f45f60b9949fa1ca88f";
+    aarch64-linux = "41fafb72f0d18d3b9f34e6f4638f551d914aae6eb6f9ea463ace5ee4bf90bb30";
   };
 
   electron_10 = mkElectron "10.1.6" {

From 428582c6b928beb716a3f8b3b192e835863da15e Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 28 Nov 2020 17:01:33 +0100
Subject: [PATCH 3937/3942] electron: 11.0.2 -> 11.0.3

---
 pkgs/development/tools/electron/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 81178393c0e6..36c219bda003 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -86,11 +86,11 @@ rec {
     aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da";
   };
 
-  electron_11 = mkElectron "11.0.2" {
-    x86_64-linux = "a6e4f789d99e2ed879b48e7cbca2051805c3727360074edfe903231756eb5636";
-    x86_64-darwin = "4a562646440c3f4fa1ec4bbdb238da420158e19f294a0fbcdf32004465dbd516";
-    i686-linux = "ffcb2e40f98ee521ac50aa849cd911e62dae8a610bcca3f6d393b3f8d9bb85d8";
-    armv7l-linux = "7552f0c2aad05844ceacaaf13588b06b16e9aadd947084e8249214b24d1da38d";
-    aarch64-linux = "56b5ae4a33a9aa666fbe1463c7780d4c737c84119eff77d403fb969e8ff90ce0";
+  electron_11 = mkElectron "11.0.3" {
+    x86_64-linux = "e2b397142ea10f494c9922ee0176fef1ea4a1899a3064feb038c9505e57fb1ff";
+    x86_64-darwin = "32d5eeb03447203e1ae797bf273baf6fb7775ef0db9a3cfa875fdcddf7286027";
+    i686-linux = "c1a773140d251938e2a2acd2ef52f64fc4185ea0dcab1c34c8fa07e08ec25729";
+    armv7l-linux = "932e6499289b97c33ab239a72b4cf1d0a7152d1ff9ade01058d3219481da0c2e";
+    aarch64-linux = "db92e96c03dfbc56159dad5d87ff11f2a1ff208730e9821788bd45ddb5db63c0";
   };
 }

From 9e779b0a43c7f807e7c76d09af99c588eb587882 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jaka@x-truder.net>
Date: Sat, 28 Nov 2020 16:57:31 +0100
Subject: [PATCH 3938/3942] electron: passthru headers

---
 pkgs/development/tools/electron/generic.nix     | 6 ++++++
 pkgs/development/tools/electron/print-hashes.sh | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix
index 4e3f3511b961..ee3609783c29 100644
--- a/pkgs/development/tools/electron/generic.nix
+++ b/pkgs/development/tools/electron/generic.nix
@@ -33,6 +33,11 @@ let
     sha256 = hash;
   };
 
+  headersFetcher = vers: hash: fetchurl {
+    url = "https://atom.io/download/electron/v${vers}/node-v${vers}-headers.tar.gz";
+    sha256 = hash;
+  };
+
   tags = {
     i686-linux = "linux-ia32";
     x86_64-linux = "linux-x64";
@@ -47,6 +52,7 @@ let
   common = platform: {
     inherit name version meta;
     src = fetcher version (get tags platform) (get hashes platform);
+    passthru.headers = headersFetcher version hashes.headers;
   };
 
   electronLibPath = with stdenv.lib; makeLibraryPath (
diff --git a/pkgs/development/tools/electron/print-hashes.sh b/pkgs/development/tools/electron/print-hashes.sh
index de380fd52233..d6c5d94ec41e 100755
--- a/pkgs/development/tools/electron/print-hashes.sh
+++ b/pkgs/development/tools/electron/print-hashes.sh
@@ -20,6 +20,7 @@ SYSTEMS=(
 )
 
 hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null | tail -n1)"
+headers="$(nix-prefetch-url "https://atom.io/download/electron/v${VERSION}/node-v${VERSION}-headers.tar.gz")"
 
 # Entry similar to the following goes in default.nix:
 
@@ -30,4 +31,6 @@ for S in "${!SYSTEMS[@]}"; do
   echo "    $S = \"$hash\";"
 done
 
+echo "    headers = \"$headers\";"
+
 echo "  };"

From a3302065df7527c72329307757536a316f0c78f7 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 28 Nov 2020 17:18:13 +0100
Subject: [PATCH 3939/3942] electron: add header hashes

---
 pkgs/development/tools/electron/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 36c219bda003..48250d7ceb33 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -36,6 +36,7 @@ rec {
     i686-linux = "bf96b1736141737bb064e48bdb543302fd259de634b1790b7cf930525f47859f";
     armv7l-linux = "2d970b3020627e5381fd4916dd8fa50ca9556202c118ab4cba09c293960689e9";
     aarch64-linux = "938b7cc5f917247a120920df30374f86414b0c06f9f3dc7ab02be1cadc944e55";
+    headers = "0943wc2874s58pkpzm1l55ycgbhv60m62r8aix88gl45i6zngb2g";
   };
 
   electron_5 = mkElectron "5.0.13" {
@@ -44,6 +45,7 @@ rec {
     i686-linux = "ccf4a5ed226928a30bd3ea830913d99853abb089bd4a6299ffa9fa0daa8d026a";
     armv7l-linux = "96ad83802bc61d87bb952027d49e5dd297f58e4493e66e393b26e51e09065add";
     aarch64-linux = "01f0fd313b060fb28a1022d68fb224d415fa22986e2a8f4aded6424b65e35add";
+    headers = "0najajj1kjj0rbqzjvk9ipq0pgympwad77hs019cz2m8ssaxqfrv";
   };
 
   electron_6 = mkElectron "6.1.12" {
@@ -52,6 +54,7 @@ rec {
     i686-linux = "4e61dc4aed1c1b933b233e02833948f3b17f81f3444f02e9108a78c0540159ab";
     armv7l-linux = "06071b4dc59a6773ff604550ed9e7a7ae8722b5343cbb5d4b94942fe537211dc";
     aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b";
+    headers = "0im694h8wqp31yzncwfnhz5g1ijrmqnypcakl0h7xcn7v25yp7s3";
   };
 
   electron_7 = mkElectron "7.3.3" {
@@ -60,6 +63,7 @@ rec {
     i686-linux = "5fb756900af43a9daa6c63ccd0ac4752f5a479b8c6ae576323fd925dbe5ecbf5";
     armv7l-linux = "830678f6db27fa4852cf456d8b2828a3e4e3c63fe2bced6b358eae88d1063793";
     aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066";
+    headers = "0ink72nac345s54ws6vlij2mjixglyn5ygx14iizpskn4ka1vr4b";
   };
 
   electron_8 = mkElectron "8.5.5" {
@@ -68,6 +72,7 @@ rec {
     i686-linux = "c8ee6c3d86576fe7546fb31b9318cb55a9cd23c220357a567d1cb4bf1b8d7f74";
     armv7l-linux = "0130d1fcd741552d2823bc8166eae9f8fc9f17cd7c0b2a7a5889d753006c0874";
     aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5";
+    headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5";
   };
 
   electron_9 = mkElectron "9.3.5" {
@@ -76,6 +81,7 @@ rec {
     i686-linux = "b69614b1d34f9a98e182cc43bf8d35626038d300ee9fb886f7501dbb597c7e61";
     armv7l-linux = "d929dabe7a83df232ec08b138ed2b0540b86e7dfa33f2f45f60b9949fa1ca88f";
     aarch64-linux = "41fafb72f0d18d3b9f34e6f4638f551d914aae6eb6f9ea463ace5ee4bf90bb30";
+    headers = "10snhi8q0izd3aqdfymhidfja34n4xbmd7h3lzghcczp77is2i5b";
   };
 
   electron_10 = mkElectron "10.1.6" {
@@ -84,6 +90,7 @@ rec {
     i686-linux = "009bbee26ddbf748b33588714ccc565257ff697cde2110e6b6547e3f510da85e";
     armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951";
     aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da";
+    headers = "1qj6s0h612hwmh4nzafz406vybr1rhskal2mcm1ll62rnzf98k3z";
   };
 
   electron_11 = mkElectron "11.0.3" {
@@ -92,5 +99,6 @@ rec {
     i686-linux = "c1a773140d251938e2a2acd2ef52f64fc4185ea0dcab1c34c8fa07e08ec25729";
     armv7l-linux = "932e6499289b97c33ab239a72b4cf1d0a7152d1ff9ade01058d3219481da0c2e";
     aarch64-linux = "db92e96c03dfbc56159dad5d87ff11f2a1ff208730e9821788bd45ddb5db63c0";
+    headers = "1r2s7088g72nanjc0fqrz1gqrbf1akrq6b7a9w6x7wj95ysc85q0";
   };
 }

From 6cf25f9dbdef12c36748f322f7414a1d04c8dcd7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 28 Nov 2020 16:56:51 +0100
Subject: [PATCH 3940/3942] Python: rename parameters and arguments passed to
 passthru

As part of the splicing the build/host/target combinations of the interpreter
need to be passed around internally. The chosen names were not very clear,
implying they were package sets whereas actually there were derivations.
---
 .../python/cpython/2.7/default.nix            | 10 ++++----
 .../interpreters/python/cpython/default.nix   | 10 ++++----
 .../interpreters/python/default.nix           | 24 +++++++++----------
 .../interpreters/python/pypy/default.nix      | 10 ++++----
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index d7bc50948590..e6ab1f218795 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -50,11 +50,11 @@ let
     pythonVersion = with sourceVersion; "${major}.${minor}";
     sitePackages = "lib/${libPrefix}/site-packages";
     inherit hasDistutilsCxxPatch;
-    pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
-    pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr};
-    pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
-    pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
-    pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
+    pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr};
+    pythonOnBuildForHost = pkgsBuildHost.${pythonAttr};
+    pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr};
+    pythonOnHostForHost = pkgsHostHost.${pythonAttr};
+    pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {};
   } // {
     inherit ucsEncoding;
   };
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 5e7668deea39..cd06c2b63670 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -68,11 +68,11 @@ let
     pythonVersion = with sourceVersion; "${major}.${minor}";
     sitePackages = "lib/${libPrefix}/site-packages";
     inherit hasDistutilsCxxPatch;
-    pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
-    pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr};
-    pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
-    pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
-    pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
+    pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr};
+    pythonOnBuildForHost = pkgsBuildHost.${pythonAttr};
+    pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr};
+    pythonOnHostForHost = pkgsHostHost.${pythonAttr};
+    pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {};
   };
 
   version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 876cfd20fb9e..91a464ea4633 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -14,12 +14,12 @@ with pkgs;
     , packageOverrides
     , sitePackages
     , hasDistutilsCxxPatch
-    , pythonPackagesBuildBuild
-    , pythonPackagesBuildHost
-    , pythonPackagesBuildTarget
-    , pythonPackagesHostHost
-    , self # is pythonPackagesHostTarget
-    , pythonPackagesTargetTarget
+    , pythonOnBuildForBuild
+    , pythonOnBuildForHost
+    , pythonOnBuildForTarget
+    , pythonOnHostForHost
+    , pythonOnTargetForTarget
+    , self # is pythonOnHostForTarget
     }: let
       pythonPackages = callPackage
         ({ pkgs, stdenv, python, overrides }: let
@@ -28,11 +28,11 @@ with pkgs;
             python = self;
           };
           otherSplices = {
-            selfBuildBuild = pythonPackagesBuildBuild;
-            selfBuildHost = pythonPackagesBuildHost;
-            selfBuildTarget = pythonPackagesBuildTarget;
-            selfHostHost = pythonPackagesHostHost;
-            selfTargetTarget = pythonPackagesTargetTarget;
+            selfBuildBuild = pythonOnBuildForBuild;
+            selfBuildHost = pythonOnBuildForHost;
+            selfBuildTarget = pythonOnBuildForTarget;
+            selfHostHost = pythonOnHostForHost;
+            selfTargetTarget = pythonOnTargetForTarget;
           };
           keep = self: {
             # TODO maybe only define these here so nothing is needed to be kept in sync.
@@ -100,7 +100,7 @@ with pkgs;
         pythonAtLeast = lib.versionAtLeast pythonVersion;
         pythonOlder = lib.versionOlder pythonVersion;
         inherit hasDistutilsCxxPatch;
-        pythonForBuild = pythonPackagesBuildHost;
+        pythonForBuild = pythonOnBuildForHost;
 
         tests = callPackage ./tests.nix {
           python = self;
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index b941750eb4e5..8feeb3c51bf3 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -31,11 +31,11 @@ let
     sitePackages = "site-packages";
     hasDistutilsCxxPatch = false;
 
-    pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
-    pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr};
-    pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
-    pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
-    pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
+    pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr};
+    pythonOnBuildForHost = pkgsBuildHost.${pythonAttr};
+    pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr};
+    pythonOnHostForHost = pkgsHostHost.${pythonAttr};
+    pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {};
   };
   pname = passthru.executable;
   version = with sourceVersion; "${major}.${minor}.${patch}";

From 5804c8a7f5f0db0ebefb4aa612cc7a254debd57a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 28 Nov 2020 17:06:08 +0100
Subject: [PATCH 3941/3942] Python splicing: splice package sets, not Python
 derivation

In the original commit the various builds of Python were added to
`otherSplices`, instead of the intended Python package sets.
---
 pkgs/development/interpreters/python/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 91a464ea4633..e98cb89b77d5 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -28,11 +28,11 @@ with pkgs;
             python = self;
           };
           otherSplices = {
-            selfBuildBuild = pythonOnBuildForBuild;
-            selfBuildHost = pythonOnBuildForHost;
-            selfBuildTarget = pythonOnBuildForTarget;
-            selfHostHost = pythonOnHostForHost;
-            selfTargetTarget = pythonOnTargetForTarget;
+            selfBuildBuild = pythonOnBuildForBuild.pkgs;
+            selfBuildHost = pythonOnBuildForHost.pkgs;
+            selfBuildTarget = pythonOnBuildForTarget.pkgs;
+            selfHostHost = pythonOnHostForHost.pkgs;
+            selfTargetTarget = pythonOnTargetForTarget.pkgs or {}; # There is no Python TargetTarget.
           };
           keep = self: {
             # TODO maybe only define these here so nothing is needed to be kept in sync.

From 455774e5466681a90f864125424871bfe2a504d2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 28 Nov 2020 17:33:28 +0100
Subject: [PATCH 3942/3942] Python: add todo note regarding pythonForBuild

---
 pkgs/development/interpreters/python/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index e98cb89b77d5..2f350738238e 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -100,6 +100,8 @@ with pkgs;
         pythonAtLeast = lib.versionAtLeast pythonVersion;
         pythonOlder = lib.versionOlder pythonVersion;
         inherit hasDistutilsCxxPatch;
+        # TODO: rename to pythonOnBuild
+        # Not done immediately because its likely used outside Nixpkgs.
         pythonForBuild = pythonOnBuildForHost;
 
         tests = callPackage ./tests.nix {